diff --git a/go.mod b/go.mod
index 10294bbc..1bb4254e 100644
--- a/go.mod
+++ b/go.mod
@@ -6,56 +6,54 @@ require (
 	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.16.0
-	github.com/bwmarrin/discordgo v0.27.0
-	github.com/d5/tengo/v2 v2.13.0
+	github.com/bwmarrin/discordgo v0.27.1
+	github.com/d5/tengo/v2 v2.16.1
 	github.com/davecgh/go-spew v1.1.1
 	github.com/fsnotify/fsnotify v1.6.0
-	github.com/gomarkdown/markdown v0.0.0-20221013030248-663e2500819c
+	github.com/gomarkdown/markdown v0.0.0-20230716120725-531d2d74bc12
 	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.12
-	github.com/labstack/echo/v4 v4.10.2
-	github.com/lrstanley/girc v0.0.0-20221222153823-a92667a5c9b4
+	github.com/labstack/echo/v4 v4.11.1
+	github.com/lrstanley/girc v0.0.0-20230729130341-dd5853a5f1a6
 	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-20221106190440-8bcf49695e0d
+	github.com/matterbridge/matterclient v0.0.0-20230329213635-bc6e42a4a84a
 	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
 	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/olahol/melody v1.1.4
 	github.com/paulrosania/go-charset v0.0.0-20190326053356-55c9d7a5834c
-	github.com/rs/xid v1.4.0
+	github.com/rs/xid v1.5.0
 	github.com/russross/blackfriday v1.6.0
 	github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d
 	github.com/shazow/ssh-chat v1.10.1
-	github.com/sirupsen/logrus v1.9.0
-	github.com/slack-go/slack v0.12.1
-	github.com/spf13/viper v1.15.0
-	github.com/stretchr/testify v1.8.1
+	github.com/sirupsen/logrus v1.9.3
+	github.com/slack-go/slack v0.12.2
+	github.com/spf13/viper v1.16.0
+	github.com/stretchr/testify v1.8.4
 	github.com/vincent-petithory/dataurl v1.0.0
 	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-20230306190159-5caded34a872
-	golang.org/x/image v0.6.0
-	golang.org/x/oauth2 v0.6.0
-	golang.org/x/text v0.8.0
+	go.mau.fi/whatsmeow v0.0.0-20230805111647-405414b9b5c0
+	golang.org/x/image v0.11.0
+	golang.org/x/oauth2 v0.11.0
+	golang.org/x/text v0.12.0
 	gomod.garykim.dev/nc-talk v0.3.0
-	google.golang.org/protobuf v1.29.1
+	google.golang.org/protobuf v1.31.0
 	layeh.com/gumble v0.0.0-20221205141517-d1df60a3cc14
-	modernc.org/sqlite v1.21.0
+	modernc.org/sqlite v1.25.0
 )
 
 require (
@@ -65,17 +63,16 @@ require (
 	github.com/apex/log v1.9.0 // indirect
 	github.com/av-elier/go-decimal-to-rational v0.0.0-20191127152832-89e6aad02ecf // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
-	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/dyatlov/go-opengraph v0.0.0-20210112100619-dae8665a5b09 // indirect
 	github.com/francoispqt/gojay v1.2.13 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.3 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gopackage/ddp v0.0.3 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/graph-gophers/graphql-go v1.3.0 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
@@ -86,10 +83,9 @@ require (
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404 // indirect
 	github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d // indirect
-	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.17 // indirect
+	github.com/mattn/go-isatty v0.0.19 // 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
@@ -102,7 +98,7 @@ require (
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/pborman/uuid v1.2.1 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
 	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
@@ -113,8 +109,8 @@ require (
 	github.com/shazow/rateio v0.0.0-20200113175441-4461efc8bdc4 // indirect
 	github.com/sizeofint/webpanimation v0.0.0-20210809145948-1d2b32119882 // indirect
 	github.com/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9 // indirect
-	github.com/spf13/afero v1.9.3 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
+	github.com/spf13/afero v1.9.5 // indirect
+	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
@@ -123,18 +119,14 @@ require (
 	github.com/valyala/fasttemplate v1.2.2 // indirect
 	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	github.com/wiggin77/cfg v1.0.2 // indirect
 	github.com/wiggin77/merror v1.0.3 // indirect
 	github.com/wiggin77/srslog v1.0.1 // indirect
 	go.mau.fi/libsignal v0.1.0 // indirect
-	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.6.0 // indirect
+	golang.org/x/crypto v0.12.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/net v0.14.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/term v0.11.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
@@ -145,9 +137,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.3 // indirect
+	modernc.org/libc v1.24.1 // indirect
 	modernc.org/mathutil v1.5.0 // indirect
-	modernc.org/memory v1.5.0 // indirect
+	modernc.org/memory v1.6.0 // indirect
 	modernc.org/opt v0.1.3 // indirect
 	modernc.org/strutil v1.1.3 // indirect
 	modernc.org/token v1.0.1 // indirect
@@ -156,4 +148,4 @@ require (
 
 //replace github.com/matrix-org/gomatrix => github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419
 
-go 1.18
+go 1.19
diff --git a/go.sum b/go.sum
index e86bf961..db68f861 100644
--- a/go.sum
+++ b/go.sum
@@ -3,7 +3,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo=
-cloud.google.com/go v0.37.1/go.mod h1:SAbnLi6YTSPKSI0dTUEOVLCkyPfKXK8n4ibqiMoj4ok=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
 cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
@@ -17,8 +16,6 @@ cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bP
 cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
 cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
 cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.63.0/go.mod h1:GmezbQc7T2snqkEXWfZ0sy0VfkB/ivI2DdtJL2DEmlg=
-cloud.google.com/go v0.64.0/go.mod h1:xfORb36jGvE+6EexW71nMEtL025s3x6xvuYUKM4JLv4=
 cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
 cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
 cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
@@ -43,7 +40,6 @@ cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2k
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
 cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/spanner v1.9.0/go.mod h1:xvlEn0NZ5v1iJPYsBnUVRDNvccDxsBTEi16pJRKQVws=
 cloud.google.com/go/spanner v1.24.0/go.mod h1:EZI0yH1D/PrXK0XH9Ba5LGXTXWeqZv0ClOD/19a0Z58=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
@@ -51,9 +47,7 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-code.sajari.com/docconv v1.1.1-0.20210427001343-7b3472bc323a/go.mod h1:KPNt2zuWplps1W0TpOb6ltHj4Xu+j6h7a+YkqGHrxQE=
 code.sajari.com/docconv v1.2.0/go.mod h1:r8yfCP6OKbZ9Xkd87aBa4nfpk6ud/PoyLwex3n6cXSc=
-contrib.go.opencensus.io/exporter/ocagent v0.4.9/go.mod h1:ueLzZcP7LPhPulEBukGn4aLh7Mx9YJwpVJ9nL2FYltw=
 dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
@@ -63,16 +57,13 @@ filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
 filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
 gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
 git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
-git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k=
 github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v26.5.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
-github.com/Azure/go-autorest v11.5.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw=
 github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg=
@@ -94,7 +85,6 @@ github.com/Benau/tgsconverter v0.0.0-20210809170556-99f4a4f6337f/go.mod h1:AQiQK
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/ClickHouse/clickhouse-go v1.3.12/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
 github.com/ClickHouse/clickhouse-go v1.4.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
 github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
 github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo=
@@ -104,13 +94,8 @@ github.com/JalfResi/justext v0.0.0-20170829062021-c0282dea7198/go.mod h1:0SURuH1
 github.com/Jeffail/gabs v1.4.0 h1://5fYRRTq1edjfIrQGvdkcd22pkYUrHZ5YC/H2GJVAo=
 github.com/Jeffail/gabs v1.4.0/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc=
 github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
-github.com/Julusian/godocdown v0.0.0-20170816220326-6d19f8ff2df8/go.mod h1:INZr5t32rG59/5xeltqoCJoNY7e5x/3xoY9WSWVWg74=
-github.com/Masterminds/glide v0.13.2/go.mod h1:STyF5vcenH/rUqTEv+/hBXlSTo7KYwg2oc2f4tzPWic=
-github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
-github.com/Masterminds/squirrel v1.5.0/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10=
 github.com/Masterminds/squirrel v1.5.2/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10=
-github.com/Masterminds/vcs v1.13.0/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
@@ -132,28 +117,21 @@ github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5
 github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/PaulARoy/azurestoragecache v0.0.0-20170906084534-3c249a3ba788/go.mod h1:lY1dZd8HBzJ10eqKERHn3CU59tfhzcAVb2c0ZhIWSOk=
 github.com/Philipp15b/go-steam v1.0.1-0.20200727090957-6ae9b3c0a560 h1:ItnC9PEEMESzTbFayxrhKBbuFQOXDBI8yy7NudTcEWs=
 github.com/Philipp15b/go-steam v1.0.1-0.20200727090957-6ae9b3c0a560/go.mod h1:o38AwUFFS4gzbjSoyIgrZ1h9UeDrKwcci1Pj6baifvI=
 github.com/PuerkitoBio/goquery v1.4.1/go.mod h1:T9ezsOHcCrDCgA8aF1Cqr3sSYbO/xgdy8/R/XiIMAhA=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
-github.com/PuerkitoBio/goquery v1.7.0/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/Rhymen/go-whatsapp v0.1.2-0.20211102134409-31a2e740845c h1:4mIZQXKYBymQ9coA82nNyG/CjicMNLBZ8cPVrhNUM3g=
 github.com/Rhymen/go-whatsapp v0.1.2-0.20211102134409-31a2e740845c/go.mod h1:DNSFRLFDFIqm2+0aJzSOVfn25020vldM4SRqz6YtLgI=
-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.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=
-github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/advancedlogic/GoOse v0.0.0-20191112112754-e742535969c1/go.mod h1:f3HCSN1fBWjcpGtXyM119MJgeQl838v6so/PQOqvE1w=
-github.com/advancedlogic/GoOse v0.0.0-20200830213114-1225d531e0ad/go.mod h1:f3HCSN1fBWjcpGtXyM119MJgeQl838v6so/PQOqvE1w=
 github.com/advancedlogic/GoOse v0.0.0-20210820140952-9d5822d4a625/go.mod h1:f3HCSN1fBWjcpGtXyM119MJgeQl838v6so/PQOqvE1w=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
@@ -164,9 +142,7 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/alexcesaro/log v0.0.0-20150915221235-61e686294e58/go.mod h1:YNfsMyWSs+h+PaYkxGeMVmVCX75Zj/pqdjbu12ciCYE=
 github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
-github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
 github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
-github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
@@ -174,10 +150,8 @@ github.com/andybalholm/cascadia v1.2.0/go.mod h1:YCyR8vOZT9aZ1CHEd8ap0gMVm2aFgxB
 github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/apache/arrow/go/arrow v0.0.0-20200601151325-b2287a20f230/go.mod h1:QNYViu/X0HXDHw7m3KXzWSVXIbfUvJqBFe6Gj8/pYA0=
 github.com/apache/arrow/go/arrow v0.0.0-20210818145353-234c94e4ce64/go.mod h1:2qMFB56yOP3KzkB3PbYZ4AlUFg3a88F67TIx5lB/WwY=
 github.com/apache/arrow/go/arrow v0.0.0-20211013220434-5962184e7a30/go.mod h1:Q7yQnSMnLvcXlZ8RV+jwz/6y1rQTqbX6C82SndT52Zs=
-github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apex/log v1.9.0 h1:FHtw/xuaM8AgmvDDTI9fiwoAL25Sq2cxojnZICUU8l0=
 github.com/apex/log v1.9.0/go.mod h1:m82fZlWIuiWzWP04XCTXmnX0xRkYYbCdYn8jbJeLBEA=
 github.com/apex/logs v1.0.0/go.mod h1:XzxuLZ5myVHDy9SAmYpamKKRNApGj54PfYLcFrXqDwo=
@@ -189,7 +163,6 @@ github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoU
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
@@ -198,9 +171,7 @@ github.com/av-elier/go-decimal-to-rational v0.0.0-20191127152832-89e6aad02ecf/go
 github.com/avct/uasurfer v0.0.0-20191028135549-26b5daa857f1/go.mod h1:noBAuukeYOXa0aXGqxr24tADqkwDO2KRD15FsuaZ5a8=
 github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
 github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.19.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.38.67/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
 github.com/aws/aws-sdk-go-v2 v1.8.0/go.mod h1:xEFuWz+3TYdlPRuo+CqATbeDWIWyaT5uAPwPaWtgse0=
 github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4=
@@ -232,8 +203,6 @@ github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
 github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
-github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
-github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -249,11 +218,8 @@ github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqO
 github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
-github.com/blevesearch/bleve v1.0.14/go.mod h1:e/LJTr+E7EaoVdkQZTfoz7dt4KoDNvDbLb8MSKuNTLQ=
 github.com/blevesearch/bleve/v2 v2.3.2/go.mod h1:96+xE5pZUOsr3Y4vHzV1cBC837xZCpwLlX0hrrxnvIg=
 github.com/blevesearch/bleve_index_api v1.0.1/go.mod h1:fiwKS0xLEm+gBRgv5mumf0dhgFr2mDgZah1pqv1c1M4=
-github.com/blevesearch/blevex v1.0.0/go.mod h1:2rNVqoG2BZI8t1/P1awgTKnGlx5MP9ZbtEciQaNhswc=
-github.com/blevesearch/cld2 v0.0.0-20200327141045-8b5f551d37f5/go.mod h1:PN0QNTLs9+j1bKy3d/GB/59wsNBFC4sWLWG3k69lWbc=
 github.com/blevesearch/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:9eJDeqxJ3E7WnLebQUlPD7ZjSce7AnDb9vjGmMCbD0A=
 github.com/blevesearch/go-porterstemmer v1.0.3/go.mod h1:angGc5Ht+k2xhJdZi511LtmxuEf0OVpvUUNrwmM1P7M=
 github.com/blevesearch/goleveldb v1.0.1/go.mod h1:WrU8ltZbIp0wAoig/MHbrPCXSOLpe79nz5lv5nqfYrQ=
@@ -266,11 +232,6 @@ github.com/blevesearch/snowball v0.6.1/go.mod h1:ZF0IBg5vgpeoUhnMza2v0A/z8m1cWPl
 github.com/blevesearch/snowballstem v0.9.0/go.mod h1:PivSj3JMc8WuaFkTSRDW2SlrulNWPl4ABg1tC/hlgLs=
 github.com/blevesearch/upsidedown_store_api v1.0.1/go.mod h1:MQDVGpHZrpe3Uy26zJBf/a8h0FZY6xJbthIMm8myH2Q=
 github.com/blevesearch/vellum v1.0.7/go.mod h1:doBZpmRhwTsASB4QdUZANlJvqVAUdUyX0ZK7QJCTeBE=
-github.com/blevesearch/zap/v11 v11.0.14/go.mod h1:MUEZh6VHGXv1PKx3WnCbdP404LGG2IZVa/L66pyFwnY=
-github.com/blevesearch/zap/v12 v12.0.14/go.mod h1:rOnuZOiMKPQj18AEKEHJxuI14236tTQ1ZJz4PAnWlUg=
-github.com/blevesearch/zap/v13 v13.0.6/go.mod h1:L89gsjdRKGyGrRN6nCpIScCvvkyxvmeDCwZRcjjPCrw=
-github.com/blevesearch/zap/v14 v14.0.5/go.mod h1:bWe8S7tRrSBTIaZ6cLRbgNH4TUDaC9LZSpRGs85AsGY=
-github.com/blevesearch/zap/v15 v15.0.3/go.mod h1:iuwQrImsh1WjWJ0Ue2kBqY83a0rFtJTqfa9fp1rbVVU=
 github.com/blevesearch/zapx/v11 v11.3.3/go.mod h1:YzTfUm4kS3e8OmTXDHVV8OzC5MWPO/VPJZQgPNVb4Lc=
 github.com/blevesearch/zapx/v12 v12.3.3/go.mod h1:RMl6lOZqF+sTxKvhQDJ5yK2LT3Mu7E2p/jGdjAaiRxs=
 github.com/blevesearch/zapx/v13 v13.3.3/go.mod h1:eppobNM35U4C22yDvTuxV9xPqo10pwfP/jugL4INWG4=
@@ -285,10 +246,9 @@ github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7
 github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
 github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50=
 github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
-github.com/bwmarrin/discordgo v0.27.0 h1:4ZK9KN+rGIxZ0fdGTmgdCcliQeW8Zhu6MnlFI92nf0Q=
-github.com/bwmarrin/discordgo v0.27.0/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY=
+github.com/bwmarrin/discordgo v0.27.1 h1:ib9AIc/dom1E/fSIulrBwnez0CToJE113ZGt4HoliGY=
+github.com/bwmarrin/discordgo v0.27.1/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY=
 github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg=
-github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -316,11 +276,8 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
-github.com/cockroachdb/cockroach-go v0.0.0-20190925194419-606b3d062051/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk=
 github.com/cockroachdb/cockroach-go/v2 v2.1.1/go.mod h1:7NtUnP6eK+l6k483WSYNrq3Kb23bWV10IRV1TyeSpwM=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
-github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
-github.com/codegangsta/cli v1.20.0/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA=
 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
 github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
 github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
@@ -347,7 +304,6 @@ github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMX
 github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
-github.com/containerd/containerd v1.4.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.5.0-beta.1/go.mod h1:5HfvG1V2FsKesEGQ17k5/T7V960Tmcumvqn8Mc+pCYQ=
@@ -424,11 +380,8 @@ github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/corpix/uarand v0.1.1/go.mod h1:SFKZvkcRoLqVRFZ4u25xPmp6m9ktANfbpXZ7SJ0/FNU=
 github.com/couchbase/ghistogram v0.1.0/go.mod h1:s1Jhy76zqfEecpNWJfWUiKZookAFaiGOEoyzgHt9i7k=
-github.com/couchbase/moss v0.1.0/go.mod h1:9MaHIaRuy9pvLPUJxB8sh8OrLfyDczECVL37grCIubs=
 github.com/couchbase/moss v0.2.0/go.mod h1:9MaHIaRuy9pvLPUJxB8sh8OrLfyDczECVL37grCIubs=
-github.com/couchbase/vellum v1.0.2/go.mod h1:FcwrEivFpNi24R3jLOs3n+fs5RnuQnQqCLBJ1uAg1W4=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 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=
@@ -437,22 +390,18 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
-github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8=
 github.com/cznic/mathutil v0.0.0-20180504122225-ca4c9f2c1369/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM=
-github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM=
-github.com/cznic/strutil v0.0.0-20181122101858-275e90344537/go.mod h1:AHHPPPXTw0h6pVabbcbyGRK1DckRn7r/STdZEeIDzZc=
 github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ=
 github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s=
 github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8=
 github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I=
-github.com/d5/tengo/v2 v2.13.0 h1:4pZ5mR4vjOejpp+PMeIMpjZdObK7iwWoLTpVyhT+0Jk=
-github.com/d5/tengo/v2 v2.13.0/go.mod h1:XRGjEs5I9jYIKTxly6HCF8oiiilk5E/RYXOZ5b0DZC8=
+github.com/d5/tengo/v2 v2.16.1 h1:/N6dqiGu9toqANInZEOQMM8I06icdZnmb+81DG/lZdw=
+github.com/d5/tengo/v2 v2.16.1/go.mod h1:XRGjEs5I9jYIKTxly6HCF8oiiilk5E/RYXOZ5b0DZC8=
 github.com/dave/jennifer v1.4.1/go.mod h1:7jEdnm+qBcxl8PC0zyp7vxcpSRnzXSt9r39tpTVGlwA=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dchote/go-openal v0.0.0-20171116030048-f4a9a141d372/go.mod h1:74z+CYu2/mx4N+mcIS/rsvfAxBPBV9uv8zRAnwyFkdI=
-github.com/denisenkom/go-mssqldb v0.0.0-20200620013148-b91950f658ec/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/denisenkom/go-mssqldb v0.10.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
 github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
@@ -462,16 +411,12 @@ github.com/dgryski/dgoogauth v0.0.0-20190221195224-5a805980a5f3/go.mod h1:hEfFau
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/dhui/dktest v0.3.3/go.mod h1:EML9sP4sqJELHn4jV7B0TY8oF6077nk83/tz7M56jcQ=
 github.com/dhui/dktest v0.3.7/go.mod h1:nYMOkafiA07WchSwKnKFUSbGMb2hMm5DrCGiXYG6gwM=
-github.com/die-net/lrucache v0.0.0-20181227122439-19a39ef22a11/go.mod h1:ew0MSjCVDdtGMjF3kzLK9hwdgF5mOE8SbYVF3Rc7mkU=
-github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
 github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY=
 github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker v20.10.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
@@ -482,21 +427,16 @@ github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD
 github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5JflhBbQEHo=
 github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s=
 github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/dvyukov/go-fuzz v0.0.0-20210429054444-fca39067bc72/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/dyatlov/go-opengraph v0.0.0-20210112100619-dae8665a5b09 h1:AQLr//nh20BzN3hIWj2+/Gt3FwSs8Nwo/nz4hMIcLPg=
 github.com/dyatlov/go-opengraph v0.0.0-20210112100619-dae8665a5b09/go.mod h1:nYia/MIs9OyvXXYboPmNOj0gVWo97Wx0sde+ZuKkoM4=
-github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
-github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
-github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
-github.com/elazarl/go-bindata-assetfs v1.0.1/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
@@ -511,13 +451,8 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
 github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64=
-github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg=
-github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0=
-github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
-github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
@@ -532,7 +467,7 @@ github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHqu
 github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk=
 github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
-github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
+github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
@@ -543,20 +478,14 @@ github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXt
 github.com/gabriel-vasile/mimetype v1.3.1/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
 github.com/gabriel-vasile/mimetype v1.4.0/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
 github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
-github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
 github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
-github.com/getsentry/sentry-go v0.11.0/go.mod h1:KBQIxiZAetw62Cj8Ri964vAEWVdgfaUCn30Q3bCvANo=
 github.com/getsentry/sentry-go v0.13.0/go.mod h1:EOsfu5ZdvKPfeHYV6pTVQnsjfp30+XA7//UooKNumH0=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gigawattio/window v0.0.0-20180317192513-0f5467e35573/go.mod h1:eBvb3i++NHDH4Ugo9qCvMw8t0mTSctaEa5blJbWcNxs=
-github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
 github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
 github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
-github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
-github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24=
 github.com/go-asn1-ber/asn1-ber v1.3.2-0.20191121212151-29be175fc3a3/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
 github.com/go-asn1-ber/asn1-ber v1.5.3 h1:u7utq56RUFiynqUzgVMFDymapcOtQ/MZkh3H4QYkxag=
 github.com/go-asn1-ber/asn1-ber v1.5.3/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
@@ -594,11 +523,9 @@ github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTM
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/go-redis/redis/v8 v8.0.0/go.mod h1:isLoQT/NFSP7V67lyvM9GmdvLdyZ7pEhsXvvyQtnQTo=
-github.com/go-redis/redis/v8 v8.10.0/go.mod h1:vXLTvigok0VtUX0znvbcEW1SOt4OA9CU1ZfnOtKOaiM=
 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
 github.com/go-resty/resty/v2 v2.0.0/go.mod h1:dZGr0i9PLlaaTD4H/hoZIDjQ+r6xq8mgbRzHZf7f2J8=
 github.com/go-resty/resty/v2 v2.3.0/go.mod h1:UpN9CgLZNsv4e9XG50UU8xdI0F43UQ4HmxLBDwaroHU=
-github.com/go-resty/resty/v2 v2.6.0/go.mod h1:PwvJS6hvaPkjtjNg9ph+VrSD92bi5Zq73w/BIH7cC3Q=
 github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
@@ -635,7 +562,6 @@ github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY9
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4/go.mod h1:4Fw1eo5iaEhDUs8XyuhSVCVy52Jq3L+/3GJgYkwc+/0=
 github.com/gocql/gocql v0.0.0-20210515062232-b7ef815b4556/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY=
 github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
@@ -647,7 +573,6 @@ github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRx
 github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU=
 github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
@@ -655,7 +580,6 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
-github.com/golang-migrate/migrate/v4 v4.14.1/go.mod h1:l7Ks0Au6fYHuUIxUhQ0rcVX1uLlJg54C/VvW7tvxSz0=
 github.com/golang-migrate/migrate/v4 v4.15.1/go.mod h1:/CrBenUbcDqsW29jGTR/XFqCfVi/Y6mHXlooCcSOJMQ=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
@@ -692,22 +616,22 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/gomarkdown/markdown v0.0.0-20221013030248-663e2500819c h1:iyaGYbCmcYK0Ja9a3OUa2Fo+EaN0cbLu0eKpBwPFzc8=
-github.com/gomarkdown/markdown v0.0.0-20221013030248-663e2500819c/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
+github.com/gomarkdown/markdown v0.0.0-20230716120725-531d2d74bc12 h1:uK3X/2mt4tbSGoHvbLBHUny7CKiuwUip3MArtukol4E=
+github.com/gomarkdown/markdown v0.0.0-20230716120725-531d2d74bc12/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
 github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
-github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/flatbuffers v2.0.0+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -767,15 +691,11 @@ github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8
 github.com/gopackage/ddp v0.0.3 h1:fd0DxScoiS+ogq22ktey6DjDSDybtJPAn69geMpUtFc=
 github.com/gopackage/ddp v0.0.3/go.mod h1:3hUXYG6C/6JsoxKsQaK7st09+GP9RZBFPzyAlU/0SLg=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherjs v0.0.0-20210621113107-84c6004145de/go.mod h1:MtKwTfDNYAP5EtbQSMYjTSqvj1aXJKQRASWq3bwaP+g=
 github.com/gopherjs/gopherjs v0.0.0-20220221023154-0b2280d3ff96/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
-github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
 github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
-github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
@@ -792,14 +712,10 @@ github.com/graph-gophers/dataloader/v6 v6.0.0/go.mod h1:J15OZSnOoZgMkijpbZcwCmgl
 github.com/graph-gophers/graphql-go v1.3.0 h1:Eb9x/q6MFpCLz7jBCiP/WTxjSDrYLR1QY41SORZyNJ0=
 github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
-github.com/grpc-ecosystem/grpc-gateway v1.6.2/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
-github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
@@ -812,24 +728,19 @@ github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBt
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-hclog v0.16.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-msgpack v1.1.5/go.mod h1:gWVc3sv/wbDmR3rQsj1CAktEZzoz1YNK9NfGLXJ69/4=
 github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
-github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-plugin v1.4.2/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
 github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
@@ -850,18 +761,14 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
-github.com/hashicorp/memberlist v0.2.4/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
 github.com/hashicorp/memberlist v0.3.1/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
-github.com/hashicorp/yamux v0.0.0-20210316155119-a95892c5f864/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/howeyc/gopass v0.0.0-20190910152052-7cb4b85ec19c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/icrowley/fake v0.0.0-20180203215853-4178557ae428/go.mod h1:uhpZMVGznybq1itEKXj6RYw9I71qK4kH+OGMjRC4KEo=
-github.com/ikawaha/kagome.ipadic v1.1.2/go.mod h1:DPSBbU0czaJhAb/5uKQZHMc9MTVRpDugJfX+HddPHHg=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
@@ -881,7 +788,6 @@ github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgO
 github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
 github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
 github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=
-github.com/jackc/pgconn v1.3.2/go.mod h1:LvCquS3HbBKwgl7KbX9KyqEIumJAbm1UMcTvGaIf3bM=
 github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk=
 github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
 github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
@@ -919,7 +825,6 @@ github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0f
 github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jamiealquiza/envy v1.1.0/go.mod h1:MP36BriGCLwEHhi1OU8E9569JNZrjWfCvzG7RsPnHus=
 github.com/jaytaylor/html2text v0.0.0-20180606194806-57d518f124b0/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
 github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
 github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
@@ -933,13 +838,11 @@ github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ=
 github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
 github.com/jmoiron/sqlx v1.3.1/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ=
 github.com/jmoiron/sqlx v1.3.4/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
-github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
 github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
 github.com/jonboulle/clockwork v0.2.3/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
@@ -984,7 +887,6 @@ github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0
 github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.10.10/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
@@ -1001,13 +903,10 @@ github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgo
 github.com/klauspost/cpuid v1.3.1/go.mod h1:bYW4mA6ZgKPob1/Dlai2LviZJO7KGI3uoWLd42rAQw4=
 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/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=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -1016,8 +915,8 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
@@ -1028,16 +927,14 @@ 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.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.2 h1:n1jAhnq/elIFTHr1EYpiYtyKgx4RW9ccVgkqByZaN2M=
-github.com/labstack/echo/v4 v4.10.2/go.mod h1:OEyqf2//K1DFdE57vw2DRgWY0M7s65IVQO2FzvI4J5k=
+github.com/labstack/echo/v4 v4.11.1 h1:dEpLU2FLg4UVmvCGPuk/APjlH6GDpbEPti61srUUUs4=
+github.com/labstack/echo/v4 v4.11.1/go.mod h1:YuYRTSM3CHs2ybfrL8Px48bO6BAnYIN4l8wSTMP6BDQ=
 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=
 github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o=
 github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw=
-github.com/ledongthuc/pdf v0.0.0-20210621053716-e28cb8259002/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/levigross/exp-html v0.0.0-20120902181939-8df60c69a8f5/go.mod h1:QMe2wuKJ0o7zIVE8AqiT8rd8epmm6WDIZ2wyuBqYPzM=
@@ -1047,10 +944,9 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-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/lrstanley/girc v0.0.0-20230729130341-dd5853a5f1a6 h1:InzqHdpTHFBhVtlu9NB7Ot2p6Y4A9IcTjWBihkKE1JM=
+github.com/lrstanley/girc v0.0.0-20230729130341-dd5853a5f1a6/go.mod h1:lgrnhcF8bg/Bd5HA5DOb4Z+uGqUqGnp4skr+J2GwVgI=
 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=
@@ -1065,7 +961,6 @@ github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ
 github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
 github.com/markbates/pkger v0.15.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
 github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
-github.com/marstr/guid v0.0.0-20170427235115-8bdf7d1a087c/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho=
 github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho=
 github.com/matterbridge/Rocket.Chat.Go.SDK v0.0.0-20211016222428-79310a412696 h1:pmPKkN3RJM9wVMZidR99epzK0+gatQiqVtvP1FacZcQ=
 github.com/matterbridge/Rocket.Chat.Go.SDK v0.0.0-20211016222428-79310a412696/go.mod h1:c6MxwqHD+0HvtAJjsHMIdPCiAwGiQwPRPTp69ACMg8A=
@@ -1077,24 +972,18 @@ 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-20221106190440-8bcf49695e0d h1:aI0ANEzy3dMv3vEAMQ80AItNie0fBR9ZxE2sAedORmM=
-github.com/matterbridge/matterclient v0.0.0-20221106190440-8bcf49695e0d/go.mod h1:Zg8PH1P/1CNUxozQ8blnjAV9PA4Qn2qWf33cX5yNKGM=
+github.com/matterbridge/matterclient v0.0.0-20230329213635-bc6e42a4a84a h1:YqJXz220R0oUVJnrELYu2oTAmNR9XFmkF2II5Jq161c=
+github.com/matterbridge/matterclient v0.0.0-20230329213635-bc6e42a4a84a/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=
-github.com/mattermost/gorp v1.6.2-0.20210419141818-0904a6a388d3/go.mod h1:QCQ3U0M9T/BlAdjKFJo0I1oe/YAgbyjNdhU8bpOLafk=
 github.com/mattermost/gosaml2 v0.3.3/go.mod h1:Z429EIOiEi9kbq6yHoApfzlcXpa6dzRDc6pO+Vy2Ksk=
 github.com/mattermost/gziphandler v0.0.1/go.mod h1:CvvZR7sXqhj81V2swXuQY7T04Ccc89u7W7pHNPKev8g=
 github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d h1:/RJ/UV7M5c7L2TQ0KNm4yZxxFvC1nvRz/gY/Daa35aI=
 github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d/go.mod h1:HLbgMEI5K131jpxGazJ97AxfPDt31osq36YS1oxFQPQ=
-github.com/mattermost/logr v1.0.13 h1:6F/fM3csvH6Oy5sUpJuW7YyZSzZZAhJm5VcgKMxA2P8=
-github.com/mattermost/logr v1.0.13/go.mod h1:Mt4DPu1NXMe6JxPdwCC0XBoxXmN9eXOIRPoZarU2PXs=
 github.com/mattermost/logr/v2 v2.0.15 h1:+WNbGcsc3dBao65eXlceB6dTILNJRIrvubnsTl3zBew=
 github.com/mattermost/logr/v2 v2.0.15/go.mod h1:mpPp935r5dIkFDo2y9Q87cQWhFR/4xXpNh0k/y8Hmwg=
-github.com/mattermost/mattermost-server/v5 v5.39.3 h1:A5z/NlR4Xcwxx5UnlaNgUGP5hgj4KOV/CwpFg3OtlvQ=
-github.com/mattermost/mattermost-server/v5 v5.39.3/go.mod h1:MDmVSmsSsqwNkuZ7rQ0osuXVCzrR1IUqGR7I0QU91sY=
 github.com/mattermost/mattermost-server/v6 v6.7.2 h1:rRss2/R5LNbyc/P1OA4kSWuVq+rmnxwepuwGpTwL+U4=
 github.com/mattermost/mattermost-server/v6 v6.7.2/go.mod h1:b/iDf7Jn2Pd2jWGzaznoVNT811JZpemdmNGP7M/a7Ao=
 github.com/mattermost/morph v0.0.0-20220401091636-39f834798da8/go.mod h1:jxM3g1bx+k2Thz7jofcHguBS8TZn5Pc+o5MGmORObhw=
@@ -1119,11 +1008,10 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 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/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-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 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=
@@ -1134,7 +1022,6 @@ github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4
 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
@@ -1150,20 +1037,17 @@ github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI=
 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
-github.com/mholt/archiver/v3 v3.5.0/go.mod h1:qqTTPUK/HZPFgFQ/TJ3BzvTpF/dPtFVJXdQbCmeMxwc=
 github.com/mholt/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4=
 github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
 github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
 github.com/microcosm-cc/bluemonday v1.0.18/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
-github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
 github.com/miekg/dns v1.1.48/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
 github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
 github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
-github.com/minio/minio-go/v7 v7.0.11/go.mod h1:WoyW+ySKAKjY98B9+7ZbI8z8S3jaxaisdcvj9TGlazA=
 github.com/minio/minio-go/v7 v7.0.24 h1:HPlHiET6L5gIgrHRaw1xFo1OaN4bEP/082asWh3WJtI=
 github.com/minio/minio-go/v7 v7.0.24/go.mod h1:x81+AX5gHSfCSqw7jxRKHvxUXMlE5uKX0Vb75Xk5yYg=
 github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
@@ -1206,10 +1090,7 @@ github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJ
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
-github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
 github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
-github.com/muesli/smartcrop v0.2.1-0.20181030220600-548bbf0c0965/go.mod h1:i2fCI/UorTfgEpPPLWiFBv4pye+YAG78RwcQLUkocpI=
-github.com/muesli/smartcrop v0.3.0/go.mod h1:i2fCI/UorTfgEpPPLWiFBv4pye+YAG78RwcQLUkocpI=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mutecomm/go-sqlcipher/v4 v4.4.0/go.mod h1:PyN04SaWalavxRGH9E8ZftG6Ju7rsPrGmQRjrEaVpiY=
@@ -1228,8 +1109,6 @@ github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c/go.mod h1:Qr6/a
 github.com/nelsonken/gomf v0.0.0-20190423072027-c65cc0469e94 h1:GRBho7BMw6le5OVegxDeFX+Ul1WPykzQs9CVrifrjik=
 github.com/nelsonken/gomf v0.0.0-20190423072027-c65cc0469e94/go.mod h1:UT7a3UHzG7jEEeoW/AI2/e0RuLbkntdsiY94qt6Jv7Q=
 github.com/neo4j/neo4j-go-driver v1.8.1-0.20200803113522-b626aa943eba/go.mod h1:ncO5VaFWh0Nrt+4KT4mOZboaczBZcLuHrG+/sUeP8gI=
-github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
-github.com/ngdinhtoan/glide-cleanup v0.2.0/go.mod h1:UQzsmiDOb8YV3nOsCxK/c9zPpCZVNoHScRE3EO9pVMM=
 github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
 github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
@@ -1238,13 +1117,12 @@ 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/olahol/melody v1.1.4 h1:RQHfKZkQmDxI0+SLZRNBCn4LiXdqxLKRGSkT8Dyoe/E=
+github.com/olahol/melody v1.1.4/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=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
-github.com/olivere/elastic v6.2.35+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8=
 github.com/olivere/elastic v6.2.37+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8=
 github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -1255,9 +1133,7 @@ github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+
 github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0=
 github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
-github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
@@ -1272,11 +1148,9 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
-github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
 github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
-github.com/oov/psd v0.0.0-20210618170533-9fb823ddb631/go.mod h1:GHI1bnmAcbp96z6LNfBJvtrjxhaXGkbsk967utPlvL8=
 github.com/oov/psd v0.0.0-20220121172623-5db5eafcecbb/go.mod h1:GHI1bnmAcbp96z6LNfBJvtrjxhaXGkbsk967utPlvL8=
 github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
@@ -1305,8 +1179,6 @@ github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFSt
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
-github.com/openzipkin/zipkin-go v0.1.3/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
-github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
 github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs=
 github.com/otiai10/gosseract/v2 v2.2.4/go.mod h1:ahOp/kHojnOMGv1RaUnR0jwY5JVa6BYKhYAS8nbMLSo=
@@ -1327,22 +1199,18 @@ github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCko
 github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU=
-github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
-github.com/peterbourgon/diskv v0.0.0-20171120014656-2973218375c3/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
+github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
+github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
-github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
 github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ=
 github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
 github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY=
 github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pierrec/lz4/v4 v4.0.3/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pierrec/lz4/v4 v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
-github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
 github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
@@ -1360,25 +1228,21 @@ github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prY
 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=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
 github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_golang v1.4.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
 github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
@@ -1390,7 +1254,6 @@ github.com/prometheus/common v0.33.0/go.mod h1:gB3sOl7P0TvJabZpLY5uQMpUqRCPPCyRL
 github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
@@ -1402,8 +1265,6 @@ github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-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/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
@@ -1419,7 +1280,6 @@ github.com/rickb777/plural v1.2.0/go.mod h1:UdpyWFCGbo3mvK3f/PfZOAOrkjzJlYN/sD46
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/robertkrimen/godocdown v0.0.0-20130622164427-0bfa04905481/go.mod h1:C9WhFzY47SzYBIvzFqSvHIR6ROgDo4TtdTuRaOMjF/s=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
@@ -1427,19 +1287,16 @@ github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
-github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
-github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY=
 github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
+github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
-github.com/rudderlabs/analytics-go v3.3.1+incompatible/go.mod h1:LF8/ty9kUX4PTY3l5c97K3nZZaX5Hwsvt+NBaRL/f30=
 github.com/rudderlabs/analytics-go v3.3.2+incompatible/go.mod h1:LF8/ty9kUX4PTY3l5c97K3nZZaX5Hwsvt+NBaRL/f30=
-github.com/russellhaering/goxmldsig v1.1.0/go.mod h1:QK8GhXPB3+AfuCrfo0oRISa9NfzeCpWmxeGnqEpDF9o=
 github.com/russellhaering/goxmldsig v1.2.0/go.mod h1:gM4MDENBQf7M+V824SGfyIUVFWydB7n0KkEubVJl+Tw=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
@@ -1453,10 +1310,8 @@ github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFo
 github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
 github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d h1:hrujxIzL1woJ7AwssoOcM/tq5JjjG2yYOc8odClEiXA=
 github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d/go.mod h1:uugorj2VCxiV1x+LzaIdVa9b4S4qGAcH6cbhh4qVxOU=
-github.com/satori/go.uuid v0.0.0-20180103174451-36e9d2ebbde5/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=
-github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
 github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4/go.mod h1:C1a7PQSMz9NShzorzCiG2fk9+xuCgLkPeCvMHYR2OWg=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
@@ -1505,22 +1360,20 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/sizeofint/webpanimation v0.0.0-20210809145948-1d2b32119882 h1:A7o8tOERTtpD/poS+2VoassCjXpjHn916luXbf5QKD0=
 github.com/sizeofint/webpanimation v0.0.0-20210809145948-1d2b32119882/go.mod h1:5IwJoz9Pw7JsrCN4/skkxUtSWT7myuUPLhCgv6Q5vvQ=
 github.com/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9 h1:lpEzuenPuO1XNTeikEmvqYFcU37GVLl8SRNblzyvGBE=
 github.com/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9/go.mod h1:PLPIyL7ikehBD1OAjmKKiOEhbvWyHGaNDjquXMcYABo=
-github.com/slack-go/slack v0.12.1 h1:X97b9g2hnITDtNsNe5GkGx6O2/Sz/uC20ejRZN6QxOw=
-github.com/slack-go/slack v0.12.1/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw=
+github.com/slack-go/slack v0.12.2 h1:x3OppyMyGIbbiyFhsBmpf9pwkUzMhthJMRNmNlA4LaQ=
+github.com/slack-go/slack v0.12.2/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
 github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=
 github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/smartystreets/gunit v1.0.0/go.mod h1:qwPWnhz6pn0NnRBP++URONOVyNkPyr4SauJk4cUOwJs=
-github.com/snowflakedb/glog v0.0.0-20180824191149-f5055e6f21ce/go.mod h1:EB/w24pR5VKI60ecFnKqXzxX3dOorz1rnVicQTQrGM0=
-github.com/snowflakedb/gosnowflake v1.3.5/go.mod h1:13Ky+lxzIm3VqNDZJdyvu9MCGy+WgRdYFdXp96UcLZU=
 github.com/snowflakedb/gosnowflake v1.6.3/go.mod h1:6hLajn6yxuJ4xUHZegMekpq9rnQbGJ7TMwXjgTmA6lg=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE=
@@ -1529,12 +1382,12 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
-github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk=
-github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
+github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
+github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
-github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
+github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
+github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
 github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
@@ -1555,15 +1408,13 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
-github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU=
-github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA=
+github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc=
+github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg=
 github.com/splitio/go-client/v6 v6.1.0/go.mod h1:CEGAEFT99Fwb32ZIRcnZoXTMXddtB6IIpTmt3RP8mnM=
 github.com/splitio/go-split-commons/v3 v3.1.0/go.mod h1:29NCy20oAS4ZMy4qkwTd6277eieVDonx4V/aeDU/wUQ=
 github.com/splitio/go-toolkit/v4 v4.2.0/go.mod h1:EdIHN0yzB1GTXDYQc0KdKvnjkO/jfUM2YqHVYfhD3Wo=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM=
 github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8=
-github.com/stephens2424/writerset v1.0.2/go.mod h1:aS2JhsMn6eA7e82oNmW4rfsgAOp9COBTTl8mzkwADnc=
-github.com/steveyen/gtreap v0.1.0/go.mod h1:kl/5J7XbrOmlIbYIXdRHDDE5QxHqpk0cmkT7Z4dM9/Y=
 github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -1572,7 +1423,6 @@ github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoH
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -1581,29 +1431,22 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 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.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=
+github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
 github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
-github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
 github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I=
-github.com/tebeka/snowball v0.4.2/go.mod h1:4IfL14h1lvwZcp1sfXuuc7/7yCsvVffTWxWxCLfFpYg=
-github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8=
 github.com/throttled/throttled v2.2.5+incompatible/go.mod h1:0BjlrEGQmvxps+HuXLsyRdqpSRvJpq0PNIsOtqP9Nos=
-github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
 github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
 github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw=
 github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw=
 github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0=
@@ -1617,15 +1460,12 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1
 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=
 github.com/tylerb/graceful v1.2.15/go.mod h1:LPYTbOYmUTdabwRt0TGhLllQ0MUNbs0Y5q1WXJOI9II=
-github.com/uber/jaeger-client-go v2.29.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
 github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
 github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
-github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
@@ -1652,19 +1492,15 @@ github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:tw
 github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
-github.com/vmihailenco/msgpack/v5 v5.3.4/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
 github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU=
 github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
-github.com/wiggin77/cfg v1.0.2 h1:NBUX+iJRr+RTncTqTNvajHwzduqbhCQjEqxLHr6Fk7A=
-github.com/wiggin77/cfg v1.0.2/go.mod h1:b3gotba2e5bXTqTW48DwIFoLc+4lWKP7WPi/CdvZ4aE=
 github.com/wiggin77/merror v1.0.2/go.mod h1:uQTcIU0Z6jRK4OwqganPYerzQxSFJ4GSHM3aurxxQpg=
 github.com/wiggin77/merror v1.0.3 h1:8+ZHV+aSnJoYghE3EUThl15C6rvF2TYRSvOSBjdmNR8=
 github.com/wiggin77/merror v1.0.3/go.mod h1:H2ETSu7/bPE0Ymf4bEwdUoo73OOEkdClnoRisfw0Nm0=
 github.com/wiggin77/srslog v1.0.1 h1:gA2XjSMy3DrRdX9UqLuDtuVAAshb8bE1NhX1YK0Qe+8=
 github.com/wiggin77/srslog v1.0.1/go.mod h1:fehkyYDq1QfuYn60TDPu9YdY2bB85VUW2mvN1WynEls=
-github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
 github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
 github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
 github.com/writeas/go-strip-markdown v2.0.1+incompatible h1:IIqxTM5Jr7RzhigcL6FkrCNfXkvbR+Nbu1ls48pXYcw=
@@ -1674,8 +1510,6 @@ github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVT
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
 github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
-github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
-github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
@@ -1692,13 +1526,11 @@ github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmv
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
 github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
-github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.3.8/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 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=
@@ -1708,7 +1540,6 @@ github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 github.com/zfjagann/golang-ring v0.0.0-20220330170733-19bcea1b6289 h1:dEdcEes8Aki8XrgZFyrZvtazFlW4U7eNvX9NuyFJAtQ=
 github.com/zfjagann/golang-ring v0.0.0-20220330170733-19bcea1b6289/go.mod h1:0MsIttMJIF/8Y7x0XjonJP7K99t3sR6bjj4m5S4JmqU=
-github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
 gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
@@ -1720,14 +1551,11 @@ 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-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.mau.fi/whatsmeow v0.0.0-20230805111647-405414b9b5c0 h1:6kAOyrp8E9p99X1I3uj7BtEFspdcVjnYzUZpqcHo/mE=
+go.mau.fi/whatsmeow v0.0.0-20230805111647-405414b9b5c0/go.mod h1:+ObGpFE6cbbY4hKc1FmQH9MVfqaemmlXGXSnwDvCOyE=
 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=
 go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
-go.opencensus.io v0.19.1/go.mod h1:gug0GbSHa8Pafr0d2urOSgoXHZ6x/RUlaiT0d9pqb4A=
-go.opencensus.io v0.19.2/go.mod h1:NO/8qkisMZLZ1FCsKNqtJPwc8/TaclWyY0B6wcYNg9M=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -1736,40 +1564,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0=
-go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo=
-go.opentelemetry.io/otel v1.0.0-RC1/go.mod h1:x9tRa9HK4hSSq7jf2TKbqFbtt58/TGk0f9XiEYISI1I=
-go.opentelemetry.io/otel/internal/metric v0.21.0/go.mod h1:iOfAaY2YycsXfYD4kaRSbLx2LKmfpKObWBEv9QK5zFo=
-go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU=
-go.opentelemetry.io/otel/metric v0.21.0/go.mod h1:JWCt1bjivC4iCrz/aCrM1GSw+ZcvY44KCbaeeRhzHnc=
-go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw=
-go.opentelemetry.io/otel/oteltest v1.0.0-RC1/go.mod h1:+eoIG0gdEOaPNftuy1YScLr1Gb4mL/9lpDkZ0JjMRq4=
-go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw=
-go.opentelemetry.io/otel/trace v1.0.0-RC1/go.mod h1:86UHmyHWFEtWjfWPSbu0+d0Pf9Q6e1U+3ViBOc+NXAg=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.8.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
-go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
-go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
-go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
-go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=
-go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
 go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
 golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
-golang.org/x/build v0.0.0-20190314133821-5284462c4bec/go.mod h1:atTaCNAy0f16Ah5aV1gMSwgiKVHwu/JncqDpuRr7lS4=
 golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -1793,23 +1602,20 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 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.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
+golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
 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=
@@ -1827,7 +1633,6 @@ golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMk
 golang.org/x/exp v0.0.0-20200908183739-ae8ad444f925/go.mod h1:1phAWC201xIgDyaFpmDeZkgf70Q4Pd/CNqfRtVPtxNw=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -1836,13 +1641,11 @@ golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+o
 golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 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.6.0 h1:bR8b5okrPI3g/gyZakLZHeWxAR8Dn5CyxXv1hLH5g/4=
-golang.org/x/image v0.6.0/go.mod h1:MXLdDR43H7cDJq5GEGXEVeeNhPgi+YYEQ2pC1byI1x0=
+golang.org/x/image v0.11.0 h1:ds2RoQvBvYTiJkwpSFDwCcDFNX7DqjL2WsUgTNk0Ooo=
+golang.org/x/image v0.11.0/go.mod h1:bglhjqbqVuEb9e9+eNR45Jfu7D+T4Qan+NhQk8Ck2P8=
 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=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -1884,7 +1687,6 @@ golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190225153610-fe579d43d832/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -1920,15 +1722,11 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201029221708-28c70e62bb1d/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -1953,15 +1751,14 @@ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su
 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.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/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
+golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
 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=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1975,8 +1772,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.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw=
-golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
+golang.org/x/oauth2 v0.11.0 h1:vPL4xzxBM4niKCW6g9whtaWVXTJf1U5e4aZxxFx/gbU=
+golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk=
 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=
@@ -2002,9 +1799,7 @@ golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181218192612-074acd46bca6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -2069,7 +1864,6 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -2077,7 +1871,6 @@ golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201029080932-201ba4db2418/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201110211018-35f3e6cf4a65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -2091,7 +1884,6 @@ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -2127,14 +1919,15 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 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/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/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
+golang.org/x/sys v0.11.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/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/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0=
+golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
 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=
@@ -2145,8 +1938,8 @@ 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/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/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
+golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 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=
@@ -2161,7 +1954,6 @@ golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181219222714-6e267b5cc78e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -2221,13 +2013,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200731060945-b5fad4ed8dd6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200806022845-90696ccdc692/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200814230902-9882f1d1823d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200817023811-d00afeaade8f/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200818005847-188abfa75333/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-golang.org/x/tools v0.0.0-20200928182047-19e03678916f/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
 golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
@@ -2265,9 +2052,7 @@ gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY=
 google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
-google.golang.org/api v0.0.0-20181220000619-583d854617af/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y=
-google.golang.org/api v0.2.0/go.mod h1:IfRCZScioGtypHNTlz3gFk67J8uePVW7uDTBzXuIkhU=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -2311,10 +2096,8 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA
 google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg=
-google.golang.org/genproto v0.0.0-20181219182458-5a97ab628bfb/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg=
 google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190321212433-e79c0c59cdb5/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -2344,12 +2127,8 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY
 google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
 google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200815001618-f69a88009b70/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200911024640-645f7a48b24f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201030142918-24207fddd1c3/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
@@ -2381,7 +2160,6 @@ google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmE
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -2397,7 +2175,6 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
@@ -2426,8 +2203,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.29.1 h1:7QBf+IK2gx70Ap/hDsOmam3GE0v9HicjfEdAxE62UoM=
-google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.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=
@@ -2441,8 +2218,6 @@ gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qS
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
-gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
-gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
@@ -2457,7 +2232,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/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=
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
@@ -2490,7 +2264,6 @@ gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
 grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -2640,8 +2413,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.3 h1:D/g6O5ftAfavceqlLOFwaZuA5KYafKwmr30A6iSqoyY=
-modernc.org/libc v1.22.3/go.mod h1:MQrloYP209xa2zHome2a8HLiLm6k0UT8CoHpV74tOFw=
+modernc.org/libc v1.24.1 h1:uvJSeCKL/AgzBo2yYIPPTy82v21KgGnizcGYfBHaNuM=
+modernc.org/libc v1.24.1/go.mod h1:FmfO1RLrU3MHJfyi9eYYmZBfi/R+tqZ6+hQ3yQQUkak=
 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=
@@ -2652,8 +2425,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.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
-modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
+modernc.org/memory v1.6.0 h1:i6mzavxrE9a30whzMfwf7XWVODx2r5OYXvU46cirX7o=
+modernc.org/memory v1.6.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=
@@ -2661,22 +2434,22 @@ 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.21.0 h1:4aP4MdUf15i3R3M2mx6Q90WHKz3nZLoz96zlB6tNdow=
-modernc.org/sqlite v1.21.0/go.mod h1:XwQ0wZPIh1iKb5mkvCJ3szzbhk+tykC8ZWqTRTgYRwI=
+modernc.org/sqlite v1.25.0 h1:AFweiwPNd/b3BoKnBOfFm+Y260guGMF+0UFk0savqeA=
+modernc.org/sqlite v1.25.0/go.mod h1:FL3pVXie73rg3Rii6V/u5BoHlSoyeZeIgKZEgHARyCU=
 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.1 h1:mOQwiEK4p7HruMZcwKTZPw/aqtGM4aY00uzWhlKKYws=
+modernc.org/tcl v1.15.2 h1:C4ybAYCGJw968e+Me18oW55kD/FexcHbqH2xak1ROSY=
 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=
 modernc.org/z v1.0.1-0.20210308123920-1f282aa71362/go.mod h1:8/SRk5C/HgiQWCgXdfpb+1RvhORdkz5sw72d3jjtyqA=
 modernc.org/z v1.0.1/go.mod h1:8/SRk5C/HgiQWCgXdfpb+1RvhORdkz5sw72d3jjtyqA=
 modernc.org/z v1.2.20/go.mod h1:zU9FiF4PbHdOTUxw+IF8j7ArBMRPsHgq10uVPt6xTzo=
-modernc.org/z v1.7.0 h1:xkDw/KepgEjeizO2sNco+hqYkU12taxQFqPEmgm1GWE=
+modernc.org/z v1.7.3 h1:zDJf6iHjrnB+WRD88stbXokugjyc0/pB91ri1gO6LZY=
 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/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
@@ -2692,5 +2465,3 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
 sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
-willnorris.com/go/gifresize v1.0.0/go.mod h1:eBM8gogBGCcaH603vxSpnfjwXIpq6nmnj/jauBDKtAk=
-willnorris.com/go/imageproxy v0.10.0/go.mod h1:2tWdKRneln3E9X/zwH1RINpQAQWPeUiNynZ7UQ9OROk=
diff --git a/matterclient/README.md b/matterclient/README.md
new file mode 100644
index 00000000..0472dc73
--- /dev/null
+++ b/matterclient/README.md
@@ -0,0 +1 @@
+Find matterclient on https://github.com/matterbridge/matterclient
diff --git a/matterclient/channels.go b/matterclient/channels.go
deleted file mode 100644
index 13d3277d..00000000
--- a/matterclient/channels.go
+++ /dev/null
@@ -1,226 +0,0 @@
-package matterclient
-
-import (
-	"errors"
-	"strings"
-
-	"github.com/mattermost/mattermost-server/v5/model"
-)
-
-// GetChannels returns all channels we're members off
-func (m *MMClient) GetChannels() []*model.Channel {
-	m.RLock()
-	defer m.RUnlock()
-	var channels []*model.Channel
-	// our primary team channels first
-	channels = append(channels, m.Team.Channels...)
-	for _, t := range m.OtherTeams {
-		if t.Id != m.Team.Id {
-			channels = append(channels, t.Channels...)
-		}
-	}
-	return channels
-}
-
-func (m *MMClient) GetChannelHeader(channelId string) string { //nolint:golint
-	m.RLock()
-	defer m.RUnlock()
-	for _, t := range m.OtherTeams {
-		for _, channel := range append(t.Channels, t.MoreChannels...) {
-			if channel.Id == channelId {
-				return channel.Header
-			}
-
-		}
-	}
-	return ""
-}
-
-func getNormalisedName(channel *model.Channel) string {
-	if channel.Type == model.CHANNEL_GROUP {
-		// (deprecated in favor of ReplaceAll in go 1.12)
-		res := strings.Replace(channel.DisplayName, ", ", "-", -1) //nolint: gocritic
-		res = strings.Replace(res, " ", "_", -1)                   //nolint: gocritic
-		return res
-	}
-	return channel.Name
-}
-
-func (m *MMClient) GetChannelId(name string, teamId string) string { //nolint:golint
-	m.RLock()
-	defer m.RUnlock()
-	if teamId != "" {
-		return m.getChannelIdTeam(name, teamId)
-	}
-
-	for _, t := range m.OtherTeams {
-		for _, channel := range append(t.Channels, t.MoreChannels...) {
-			if getNormalisedName(channel) == name {
-				return channel.Id
-			}
-		}
-	}
-	return ""
-}
-
-func (m *MMClient) getChannelIdTeam(name string, teamId string) string { //nolint:golint
-	for _, t := range m.OtherTeams {
-		if t.Id == teamId {
-			for _, channel := range append(t.Channels, t.MoreChannels...) {
-				if getNormalisedName(channel) == name {
-					return channel.Id
-				}
-			}
-		}
-	}
-	return ""
-}
-
-func (m *MMClient) GetChannelName(channelId string) string { //nolint:golint
-	m.RLock()
-	defer m.RUnlock()
-	for _, t := range m.OtherTeams {
-		if t == nil {
-			continue
-		}
-		for _, channel := range append(t.Channels, t.MoreChannels...) {
-			if channel.Id == channelId {
-				return getNormalisedName(channel)
-			}
-		}
-	}
-	return ""
-}
-
-func (m *MMClient) GetChannelTeamId(id string) string { //nolint:golint
-	m.RLock()
-	defer m.RUnlock()
-	for _, t := range append(m.OtherTeams, m.Team) {
-		for _, channel := range append(t.Channels, t.MoreChannels...) {
-			if channel.Id == id {
-				return channel.TeamId
-			}
-		}
-	}
-	return ""
-}
-
-func (m *MMClient) GetLastViewedAt(channelId string) int64 { //nolint:golint
-	m.RLock()
-	defer m.RUnlock()
-	res, resp := m.Client.GetChannelMember(channelId, m.User.Id, "")
-	if resp.Error != nil {
-		return model.GetMillis()
-	}
-	return res.LastViewedAt
-}
-
-// GetMoreChannels returns existing channels where we're not a member off.
-func (m *MMClient) GetMoreChannels() []*model.Channel {
-	m.RLock()
-	defer m.RUnlock()
-	var channels []*model.Channel
-	for _, t := range m.OtherTeams {
-		channels = append(channels, t.MoreChannels...)
-	}
-	return channels
-}
-
-// GetTeamFromChannel returns teamId belonging to channel (DM channels have no teamId).
-func (m *MMClient) GetTeamFromChannel(channelId string) string { //nolint:golint
-	m.RLock()
-	defer m.RUnlock()
-	var channels []*model.Channel
-	for _, t := range m.OtherTeams {
-		channels = append(channels, t.Channels...)
-		if t.MoreChannels != nil {
-			channels = append(channels, t.MoreChannels...)
-		}
-		for _, c := range channels {
-			if c.Id == channelId {
-				if c.Type == model.CHANNEL_GROUP {
-					return "G"
-				}
-				return t.Id
-			}
-		}
-		channels = nil
-	}
-	return ""
-}
-
-func (m *MMClient) JoinChannel(channelId string) error { //nolint:golint
-	m.RLock()
-	defer m.RUnlock()
-	for _, c := range m.Team.Channels {
-		if c.Id == channelId {
-			m.logger.Debug("Not joining ", channelId, " already joined.")
-			return nil
-		}
-	}
-	m.logger.Debug("Joining ", channelId)
-	_, resp := m.Client.AddChannelMember(channelId, m.User.Id)
-	if resp.Error != nil {
-		return resp.Error
-	}
-	return nil
-}
-
-func (m *MMClient) UpdateChannelsTeam(teamID string) error {
-	mmchannels, resp := m.Client.GetChannelsForTeamForUser(teamID, m.User.Id, false, "")
-	if resp.Error != nil {
-		return errors.New(resp.Error.DetailedError)
-	}
-	for idx, t := range m.OtherTeams {
-		if t.Id == teamID {
-			m.Lock()
-			m.OtherTeams[idx].Channels = mmchannels
-			m.Unlock()
-		}
-	}
-
-	mmchannels, resp = m.Client.GetPublicChannelsForTeam(teamID, 0, 5000, "")
-	if resp.Error != nil {
-		return errors.New(resp.Error.DetailedError)
-	}
-	for idx, t := range m.OtherTeams {
-		if t.Id == teamID {
-			m.Lock()
-			m.OtherTeams[idx].MoreChannels = mmchannels
-			m.Unlock()
-		}
-	}
-	return nil
-}
-
-func (m *MMClient) UpdateChannels() error {
-	if err := m.UpdateChannelsTeam(m.Team.Id); err != nil {
-		return err
-	}
-	for _, t := range m.OtherTeams {
-		if err := m.UpdateChannelsTeam(t.Id); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (m *MMClient) UpdateChannelHeader(channelId string, header string) { //nolint:golint
-	channel := &model.Channel{Id: channelId, Header: header}
-	m.logger.Debugf("updating channelheader %#v, %#v", channelId, header)
-	_, resp := m.Client.UpdateChannel(channel)
-	if resp.Error != nil {
-		m.logger.Error(resp.Error)
-	}
-}
-
-func (m *MMClient) UpdateLastViewed(channelId string) error { //nolint:golint
-	m.logger.Debugf("posting lastview %#v", channelId)
-	view := &model.ChannelView{ChannelId: channelId}
-	_, resp := m.Client.ViewChannel(m.User.Id, view)
-	if resp.Error != nil {
-		m.logger.Errorf("ChannelView update for %s failed: %s", channelId, resp.Error)
-		return resp.Error
-	}
-	return nil
-}
diff --git a/matterclient/helpers.go b/matterclient/helpers.go
deleted file mode 100644
index 99743af0..00000000
--- a/matterclient/helpers.go
+++ /dev/null
@@ -1,297 +0,0 @@
-package matterclient
-
-import (
-	"crypto/md5" //nolint:gosec
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"net/http"
-	"net/http/cookiejar"
-	"net/url"
-	"strings"
-	"time"
-
-	"github.com/gorilla/websocket"
-	"github.com/jpillora/backoff"
-	"github.com/mattermost/mattermost-server/v5/model"
-)
-
-func (m *MMClient) doLogin(firstConnection bool, b *backoff.Backoff) error {
-	var resp *model.Response
-	var appErr *model.AppError
-	var logmsg = "trying login"
-	var err error
-	for {
-		m.logger.Debugf("%s %s %s %s", logmsg, m.Credentials.Team, m.Credentials.Login, m.Credentials.Server)
-		if m.Credentials.Token != "" {
-			resp, err = m.doLoginToken()
-			if err != nil {
-				return err
-			}
-		} else {
-			m.User, resp = m.Client.Login(m.Credentials.Login, m.Credentials.Pass)
-		}
-		appErr = resp.Error
-		if appErr != nil {
-			d := b.Duration()
-			m.logger.Debug(appErr.DetailedError)
-			if firstConnection {
-				if appErr.Message == "" {
-					return errors.New(appErr.DetailedError)
-				}
-				return errors.New(appErr.Message)
-			}
-			m.logger.Debugf("LOGIN: %s, reconnecting in %s", appErr, d)
-			time.Sleep(d)
-			logmsg = "retrying login"
-			continue
-		}
-		break
-	}
-	// reset timer
-	b.Reset()
-	return nil
-}
-
-func (m *MMClient) doLoginToken() (*model.Response, error) {
-	var resp *model.Response
-	var logmsg = "trying login"
-	m.Client.AuthType = model.HEADER_BEARER
-	m.Client.AuthToken = m.Credentials.Token
-	if m.Credentials.CookieToken {
-		m.logger.Debugf(logmsg + " with cookie (MMAUTH) token")
-		m.Client.HttpClient.Jar = m.createCookieJar(m.Credentials.Token)
-	} else {
-		m.logger.Debugf(logmsg + " with personal token")
-	}
-	m.User, resp = m.Client.GetMe("")
-	if resp.Error != nil {
-		return resp, resp.Error
-	}
-	if m.User == nil {
-		m.logger.Errorf("LOGIN TOKEN: %s is invalid", m.Credentials.Pass)
-		return resp, errors.New("invalid token")
-	}
-	return resp, nil
-}
-
-func (m *MMClient) handleLoginToken() error {
-	switch {
-	case strings.Contains(m.Credentials.Pass, model.SESSION_COOKIE_TOKEN):
-		token := strings.Split(m.Credentials.Pass, model.SESSION_COOKIE_TOKEN+"=")
-		if len(token) != 2 {
-			return errors.New("incorrect MMAUTHTOKEN. valid input is MMAUTHTOKEN=yourtoken")
-		}
-		m.Credentials.Token = token[1]
-		m.Credentials.CookieToken = true
-	case strings.Contains(m.Credentials.Pass, "token="):
-		token := strings.Split(m.Credentials.Pass, "token=")
-		if len(token) != 2 {
-			return errors.New("incorrect personal token. valid input is token=yourtoken")
-		}
-		m.Credentials.Token = token[1]
-	}
-	return nil
-}
-
-func (m *MMClient) initClient(firstConnection bool, b *backoff.Backoff) error {
-	uriScheme := "https://"
-	if m.NoTLS {
-		uriScheme = "http://"
-	}
-	// login to mattermost
-	m.Client = model.NewAPIv4Client(uriScheme + m.Credentials.Server)
-	m.Client.HttpClient.Transport = &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: m.SkipTLSVerify}, //nolint:gosec
-		Proxy:           http.ProxyFromEnvironment,
-	}
-	m.Client.HttpClient.Timeout = time.Second * 10
-
-	// handle MMAUTHTOKEN and personal token
-	if err := m.handleLoginToken(); err != nil {
-		return err
-	}
-
-	// check if server alive, retry until
-	if err := m.serverAlive(firstConnection, b); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// initialize user and teams
-func (m *MMClient) initUser() error {
-	m.Lock()
-	defer m.Unlock()
-	// we only load all team data on initial login.
-	// all other updates are for channels from our (primary) team only.
-	//m.logger.Debug("initUser(): loading all team data")
-	teams, resp := m.Client.GetTeamsForUser(m.User.Id, "")
-	if resp.Error != nil {
-		return resp.Error
-	}
-	for _, team := range teams {
-		idx := 0
-		max := 200
-		usermap := make(map[string]*model.User)
-		mmusers, resp := m.Client.GetUsersInTeam(team.Id, idx, max, "")
-		if resp.Error != nil {
-			return errors.New(resp.Error.DetailedError)
-		}
-		for len(mmusers) > 0 {
-			for _, user := range mmusers {
-				usermap[user.Id] = user
-			}
-			mmusers, resp = m.Client.GetUsersInTeam(team.Id, idx, max, "")
-			if resp.Error != nil {
-				return errors.New(resp.Error.DetailedError)
-			}
-			idx++
-			time.Sleep(time.Millisecond * 200)
-		}
-		m.logger.Infof("found %d users in team %s", len(usermap), team.Name)
-
-		t := &Team{Team: team, Users: usermap, Id: team.Id}
-
-		mmchannels, resp := m.Client.GetChannelsForTeamForUser(team.Id, m.User.Id, false, "")
-		if resp.Error != nil {
-			return resp.Error
-		}
-		t.Channels = mmchannels
-		mmchannels, resp = m.Client.GetPublicChannelsForTeam(team.Id, 0, 5000, "")
-		if resp.Error != nil {
-			return resp.Error
-		}
-		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 *MMClient) serverAlive(firstConnection bool, b *backoff.Backoff) error {
-	defer b.Reset()
-	for {
-		d := b.Duration()
-		// bogus call to get the serverversion
-		_, resp := m.Client.Logout()
-		if resp.Error != nil {
-			return fmt.Errorf("%#v", resp.Error.Error())
-		}
-		if firstConnection && !m.SkipVersionCheck && !supportedVersion(resp.ServerVersion) {
-			return fmt.Errorf("unsupported mattermost version: %s", resp.ServerVersion)
-		}
-		if !m.SkipVersionCheck {
-			m.ServerVersion = resp.ServerVersion
-			if m.ServerVersion == "" {
-				m.logger.Debugf("Server not up yet, reconnecting in %s", d)
-				time.Sleep(d)
-			} else {
-				m.logger.Infof("Found version %s", m.ServerVersion)
-				return nil
-			}
-		} else {
-			return nil
-		}
-	}
-}
-
-func (m *MMClient) wsConnect() {
-	b := &backoff.Backoff{
-		Min:    time.Second,
-		Max:    5 * time.Minute,
-		Jitter: true,
-	}
-
-	m.WsConnected = false
-	wsScheme := "wss://"
-	if m.NoTLS {
-		wsScheme = "ws://"
-	}
-
-	// setup websocket connection
-	wsurl := wsScheme + m.Credentials.Server + model.API_URL_SUFFIX_V4 + "/websocket"
-	header := http.Header{}
-	header.Set(model.HEADER_AUTH, "BEARER "+m.Client.AuthToken)
-
-	m.logger.Debugf("WsClient: making connection: %s", wsurl)
-	for {
-		wsDialer := &websocket.Dialer{
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: m.SkipTLSVerify}, //nolint:gosec
-			Proxy:           http.ProxyFromEnvironment,
-		}
-		var err error
-		m.WsClient, _, err = wsDialer.Dial(wsurl, header)
-		if err != nil {
-			d := b.Duration()
-			m.logger.Debugf("WSS: %s, reconnecting in %s", err, d)
-			time.Sleep(d)
-			continue
-		}
-		break
-	}
-
-	m.logger.Debug("WsClient: connected")
-	m.WsSequence = 1
-	m.WsPingChan = make(chan *model.WebSocketResponse)
-	// only start to parse WS messages when login is completely done
-	m.WsConnected = true
-}
-
-func (m *MMClient) createCookieJar(token string) *cookiejar.Jar {
-	var cookies []*http.Cookie
-	jar, _ := cookiejar.New(nil)
-	firstCookie := &http.Cookie{
-		Name:   "MMAUTHTOKEN",
-		Value:  token,
-		Path:   "/",
-		Domain: m.Credentials.Server,
-	}
-	cookies = append(cookies, firstCookie)
-	cookieURL, _ := url.Parse("https://" + m.Credentials.Server)
-	jar.SetCookies(cookieURL, cookies)
-	return jar
-}
-
-func (m *MMClient) checkAlive() error {
-	// check if session still is valid
-	_, resp := m.Client.GetMe("")
-	if resp.Error != nil {
-		return resp.Error
-	}
-	m.logger.Debug("WS PING")
-	return m.sendWSRequest("ping", nil)
-}
-
-func (m *MMClient) sendWSRequest(action string, data map[string]interface{}) error {
-	req := &model.WebSocketRequest{}
-	req.Seq = m.WsSequence
-	req.Action = action
-	req.Data = data
-	m.WsSequence++
-	m.logger.Debugf("sendWsRequest %#v", req)
-	return m.WsClient.WriteJSON(req)
-}
-
-func supportedVersion(version string) bool {
-	if strings.HasPrefix(version, "3.8.0") ||
-		strings.HasPrefix(version, "3.9.0") ||
-		strings.HasPrefix(version, "3.10.0") ||
-		strings.HasPrefix(version, "4.") ||
-		strings.HasPrefix(version, "5.") {
-		return true
-	}
-	return false
-}
-
-func digestString(s string) string {
-	return fmt.Sprintf("%x", md5.Sum([]byte(s))) //nolint:gosec
-}
diff --git a/matterclient/matterclient.go b/matterclient/matterclient.go
deleted file mode 100644
index ffe88aa4..00000000
--- a/matterclient/matterclient.go
+++ /dev/null
@@ -1,294 +0,0 @@
-package matterclient
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/gorilla/websocket"
-	lru "github.com/hashicorp/golang-lru"
-	"github.com/jpillora/backoff"
-	prefixed "github.com/matterbridge/logrus-prefixed-formatter"
-	"github.com/mattermost/mattermost-server/v5/model"
-	"github.com/sirupsen/logrus"
-)
-
-type Credentials struct {
-	Login            string
-	Team             string
-	Pass             string
-	Token            string
-	CookieToken      bool
-	Server           string
-	NoTLS            bool
-	SkipTLSVerify    bool
-	SkipVersionCheck bool
-}
-
-type Message struct {
-	Raw      *model.WebSocketEvent
-	Post     *model.Post
-	Team     string
-	Channel  string
-	Username string
-	Text     string
-	Type     string
-	UserID   string
-}
-
-//nolint:golint
-type Team struct {
-	Team         *model.Team
-	Id           string
-	Channels     []*model.Channel
-	MoreChannels []*model.Channel
-	Users        map[string]*model.User
-}
-
-type MMClient struct {
-	sync.RWMutex
-	*Credentials
-
-	Team          *Team
-	OtherTeams    []*Team
-	Client        *model.Client4
-	User          *model.User
-	Users         map[string]*model.User
-	MessageChan   chan *Message
-	WsClient      *websocket.Conn
-	WsQuit        bool
-	WsAway        bool
-	WsConnected   bool
-	WsSequence    int64
-	WsPingChan    chan *model.WebSocketResponse
-	ServerVersion string
-	OnWsConnect   func()
-
-	logger     *logrus.Entry
-	rootLogger *logrus.Logger
-	lruCache   *lru.Cache
-	allevents  bool
-}
-
-// New will instantiate a new Matterclient with the specified login details without connecting.
-func New(login string, pass string, team string, server string) *MMClient {
-	rootLogger := logrus.New()
-	rootLogger.SetFormatter(&prefixed.TextFormatter{
-		PrefixPadding: 13,
-		DisableColors: true,
-	})
-
-	cred := &Credentials{
-		Login:  login,
-		Pass:   pass,
-		Team:   team,
-		Server: server,
-	}
-
-	cache, _ := lru.New(500)
-	return &MMClient{
-		Credentials: cred,
-		MessageChan: make(chan *Message, 100),
-		Users:       make(map[string]*model.User),
-		rootLogger:  rootLogger,
-		lruCache:    cache,
-		logger:      rootLogger.WithFields(logrus.Fields{"prefix": "matterclient"}),
-	}
-}
-
-// SetDebugLog activates debugging logging on all Matterclient log output.
-func (m *MMClient) SetDebugLog() {
-	m.rootLogger.SetFormatter(&prefixed.TextFormatter{
-		PrefixPadding:   13,
-		DisableColors:   true,
-		FullTimestamp:   false,
-		ForceFormatting: true,
-	})
-}
-
-// SetLogLevel tries to parse the specified level and if successful sets
-// the log level accordingly. Accepted levels are: 'debug', 'info', 'warn',
-// 'error', 'fatal' and 'panic'.
-func (m *MMClient) SetLogLevel(level string) {
-	l, err := logrus.ParseLevel(level)
-	if err != nil {
-		m.logger.Warnf("Failed to parse specified log-level '%s': %#v", level, err)
-	} else {
-		m.rootLogger.SetLevel(l)
-	}
-}
-
-func (m *MMClient) EnableAllEvents() {
-	m.allevents = true
-}
-
-// Login tries to connect the client with the loging details with which it was initialized.
-func (m *MMClient) Login() error {
-	// check if this is a first connect or a reconnection
-	firstConnection := true
-	if m.WsConnected {
-		firstConnection = false
-	}
-	m.WsConnected = false
-	if m.WsQuit {
-		return nil
-	}
-	b := &backoff.Backoff{
-		Min:    time.Second,
-		Max:    5 * time.Minute,
-		Jitter: true,
-	}
-
-	// do initialization setup
-	if err := m.initClient(firstConnection, b); err != nil {
-		return err
-	}
-
-	if err := m.doLogin(firstConnection, b); err != nil {
-		return err
-	}
-
-	if err := m.initUser(); err != nil {
-		return err
-	}
-
-	if m.Team == nil {
-		validTeamNames := make([]string, len(m.OtherTeams))
-		for i, t := range m.OtherTeams {
-			validTeamNames[i] = t.Team.Name
-		}
-		return fmt.Errorf("Team '%s' not found in %v", m.Credentials.Team, validTeamNames)
-	}
-
-	m.wsConnect()
-
-	return nil
-}
-
-// Logout disconnects the client from the chat server.
-func (m *MMClient) Logout() error {
-	m.logger.Debugf("logout as %s (team: %s) on %s", m.Credentials.Login, m.Credentials.Team, m.Credentials.Server)
-	m.WsQuit = true
-	m.WsClient.Close()
-	m.WsClient.UnderlyingConn().Close()
-	if strings.Contains(m.Credentials.Pass, model.SESSION_COOKIE_TOKEN) {
-		m.logger.Debug("Not invalidating session in logout, credential is a token")
-		return nil
-	}
-	_, resp := m.Client.Logout()
-	if resp.Error != nil {
-		return resp.Error
-	}
-	return nil
-}
-
-// WsReceiver implements the core loop that manages the connection to the chat server. In
-// case of a disconnect it will try to reconnect. A call to this method is blocking until
-// the 'WsQuite' field of the MMClient object is set to 'true'.
-func (m *MMClient) WsReceiver() {
-	for {
-		var rawMsg json.RawMessage
-		var err error
-
-		if m.WsQuit {
-			m.logger.Debug("exiting WsReceiver")
-			return
-		}
-
-		if !m.WsConnected {
-			time.Sleep(time.Millisecond * 100)
-			continue
-		}
-
-		if _, rawMsg, err = m.WsClient.ReadMessage(); err != nil {
-			m.logger.Error("error:", err)
-			// reconnect
-			m.wsConnect()
-		}
-
-		var event model.WebSocketEvent
-		if err := json.Unmarshal(rawMsg, &event); err == nil && event.IsValid() {
-			m.logger.Debugf("WsReceiver event: %#v", event)
-			msg := &Message{Raw: &event, Team: m.Credentials.Team}
-			m.parseMessage(msg)
-			// check if we didn't empty the message
-			if msg.Text != "" {
-				m.MessageChan <- msg
-				continue
-			}
-			// if we have file attached but the message is empty, also send it
-			if msg.Post != nil {
-				if msg.Text != "" || len(msg.Post.FileIds) > 0 || msg.Post.Type == "slack_attachment" {
-					m.MessageChan <- msg
-					continue
-				}
-			}
-			if m.allevents {
-				m.MessageChan <- msg
-				continue
-			}
-			switch msg.Raw.Event {
-			case model.WEBSOCKET_EVENT_USER_ADDED,
-				model.WEBSOCKET_EVENT_USER_REMOVED,
-				model.WEBSOCKET_EVENT_CHANNEL_CREATED,
-				model.WEBSOCKET_EVENT_CHANNEL_DELETED:
-				m.MessageChan <- msg
-				continue
-			}
-		}
-
-		var response model.WebSocketResponse
-		if err := json.Unmarshal(rawMsg, &response); err == nil && response.IsValid() {
-			m.logger.Debugf("WsReceiver response: %#v", response)
-			m.parseResponse(response)
-		}
-	}
-}
-
-// StatusLoop implements a ping-cycle that ensures that the connection to the chat servers
-// remains alive. In case of a disconnect it will try to reconnect. A call to this method
-// is blocking until the 'WsQuite' field of the MMClient object is set to 'true'.
-func (m *MMClient) StatusLoop() {
-	retries := 0
-	backoff := time.Second * 60
-	if m.OnWsConnect != nil {
-		m.OnWsConnect()
-	}
-	m.logger.Debug("StatusLoop:", m.OnWsConnect != nil)
-	for {
-		if m.WsQuit {
-			return
-		}
-		if m.WsConnected {
-			if err := m.checkAlive(); err != nil {
-				m.logger.Errorf("Connection is not alive: %#v", err)
-			}
-			select {
-			case <-m.WsPingChan:
-				m.logger.Debug("WS PONG received")
-				backoff = time.Second * 60
-			case <-time.After(time.Second * 5):
-				if retries > 3 {
-					m.logger.Debug("StatusLoop() timeout")
-					m.Logout()
-					m.WsQuit = false
-					err := m.Login()
-					if err != nil {
-						m.logger.Errorf("Login failed: %#v", err)
-						break
-					}
-					if m.OnWsConnect != nil {
-						m.OnWsConnect()
-					}
-					go m.WsReceiver()
-				} else {
-					retries++
-					backoff = time.Second * 5
-				}
-			}
-		}
-		time.Sleep(backoff)
-	}
-}
diff --git a/matterclient/messages.go b/matterclient/messages.go
deleted file mode 100644
index 81c3ecbe..00000000
--- a/matterclient/messages.go
+++ /dev/null
@@ -1,207 +0,0 @@
-package matterclient
-
-import (
-	"strings"
-
-	"github.com/mattermost/mattermost-server/v5/model"
-)
-
-func (m *MMClient) parseActionPost(rmsg *Message) {
-	// add post to cache, if it already exists don't relay this again.
-	// this should fix reposts
-	if ok, _ := m.lruCache.ContainsOrAdd(digestString(rmsg.Raw.Data["post"].(string)), true); ok && rmsg.Raw.Event != model.WEBSOCKET_EVENT_POST_DELETED {
-		m.logger.Debugf("message %#v in cache, not processing again", rmsg.Raw.Data["post"].(string))
-		rmsg.Text = ""
-		return
-	}
-	data := model.PostFromJson(strings.NewReader(rmsg.Raw.Data["post"].(string)))
-	// we don't have the user, refresh the userlist
-	if m.GetUser(data.UserId) == nil {
-		m.logger.Infof("User '%v' is not known, ignoring message '%#v'",
-			data.UserId, data)
-		return
-	}
-	rmsg.Username = m.GetUserName(data.UserId)
-	rmsg.Channel = m.GetChannelName(data.ChannelId)
-	rmsg.UserID = data.UserId
-	rmsg.Type = data.Type
-	teamid, _ := rmsg.Raw.Data["team_id"].(string)
-	// edit messsages have no team_id for some reason
-	if teamid == "" {
-		// we can find the team_id from the channelid
-		teamid = m.GetChannelTeamId(data.ChannelId)
-		rmsg.Raw.Data["team_id"] = teamid
-	}
-	if teamid != "" {
-		rmsg.Team = m.GetTeamName(teamid)
-	}
-	// direct message
-	if rmsg.Raw.Data["channel_type"] == "D" {
-		rmsg.Channel = m.GetUser(data.UserId).Username
-	}
-	rmsg.Text = data.Message
-	rmsg.Post = data
-}
-
-func (m *MMClient) parseMessage(rmsg *Message) {
-	switch rmsg.Raw.Event {
-	case model.WEBSOCKET_EVENT_POSTED, model.WEBSOCKET_EVENT_POST_EDITED, model.WEBSOCKET_EVENT_POST_DELETED:
-		m.parseActionPost(rmsg)
-	case "user_updated":
-		user := rmsg.Raw.Data["user"].(map[string]interface{})
-		if _, ok := user["id"].(string); ok {
-			m.UpdateUser(user["id"].(string))
-		}
-	case "group_added":
-		if err := m.UpdateChannels(); err != nil {
-			m.logger.Errorf("failed to update channels: %#v", err)
-		}
-		/*
-			case model.ACTION_USER_REMOVED:
-				m.handleWsActionUserRemoved(&rmsg)
-			case model.ACTION_USER_ADDED:
-				m.handleWsActionUserAdded(&rmsg)
-		*/
-	}
-}
-
-func (m *MMClient) parseResponse(rmsg model.WebSocketResponse) {
-	if rmsg.Data != nil {
-		// ping reply
-		if rmsg.Data["text"].(string) == "pong" {
-			m.WsPingChan <- &rmsg
-		}
-	}
-}
-
-func (m *MMClient) DeleteMessage(postId string) error { //nolint:golint
-	_, resp := m.Client.DeletePost(postId)
-	if resp.Error != nil {
-		return resp.Error
-	}
-	return nil
-}
-
-func (m *MMClient) EditMessage(postId string, text string) (string, error) { //nolint:golint
-	post := &model.Post{Message: text, Id: postId}
-	res, resp := m.Client.UpdatePost(postId, post)
-	if resp.Error != nil {
-		return "", resp.Error
-	}
-	return res.Id, nil
-}
-
-func (m *MMClient) GetFileLinks(filenames []string) []string {
-	uriScheme := "https://"
-	if m.NoTLS {
-		uriScheme = "http://"
-	}
-
-	var output []string
-	for _, f := range filenames {
-		res, resp := m.Client.GetFileLink(f)
-		if resp.Error != nil {
-			// public links is probably disabled, create the link ourselves
-			output = append(output, uriScheme+m.Credentials.Server+model.API_URL_SUFFIX_V4+"/files/"+f)
-			continue
-		}
-		output = append(output, res)
-	}
-	return output
-}
-
-func (m *MMClient) GetPosts(channelId string, limit int) *model.PostList { //nolint:golint
-	res, resp := m.Client.GetPostsForChannel(channelId, 0, limit, "", true)
-	if resp.Error != nil {
-		return nil
-	}
-	return res
-}
-
-func (m *MMClient) GetPostsSince(channelId string, time int64) *model.PostList { //nolint:golint
-	res, resp := m.Client.GetPostsSince(channelId, time, true)
-	if resp.Error != nil {
-		return nil
-	}
-	return res
-}
-
-func (m *MMClient) GetPublicLink(filename string) string {
-	res, resp := m.Client.GetFileLink(filename)
-	if resp.Error != nil {
-		return ""
-	}
-	return res
-}
-
-func (m *MMClient) GetPublicLinks(filenames []string) []string {
-	var output []string
-	for _, f := range filenames {
-		res, resp := m.Client.GetFileLink(f)
-		if resp.Error != nil {
-			continue
-		}
-		output = append(output, res)
-	}
-	return output
-}
-
-func (m *MMClient) PostMessage(channelId string, text string, rootId string) (string, error) { //nolint:golint
-	post := &model.Post{ChannelId: channelId, Message: text, RootId: rootId}
-	res, resp := m.Client.CreatePost(post)
-	if resp.Error != nil {
-		return "", resp.Error
-	}
-	return res.Id, nil
-}
-
-func (m *MMClient) PostMessageWithFiles(channelId string, text string, rootId string, fileIds []string) (string, error) { //nolint:golint
-	post := &model.Post{ChannelId: channelId, Message: text, RootId: rootId, FileIds: fileIds}
-	res, resp := m.Client.CreatePost(post)
-	if resp.Error != nil {
-		return "", resp.Error
-	}
-	return res.Id, nil
-}
-
-func (m *MMClient) SearchPosts(query string) *model.PostList {
-	res, resp := m.Client.SearchPosts(m.Team.Id, query, false)
-	if resp.Error != nil {
-		return nil
-	}
-	return res
-}
-
-// SendDirectMessage sends a direct message to specified user
-func (m *MMClient) SendDirectMessage(toUserId string, msg string, rootId string) { //nolint:golint
-	m.SendDirectMessageProps(toUserId, msg, rootId, nil)
-}
-
-func (m *MMClient) SendDirectMessageProps(toUserId string, msg string, rootId string, props map[string]interface{}) { //nolint:golint
-	m.logger.Debugf("SendDirectMessage to %s, msg %s", toUserId, msg)
-	// create DM channel (only happens on first message)
-	_, resp := m.Client.CreateDirectChannel(m.User.Id, toUserId)
-	if resp.Error != nil {
-		m.logger.Debugf("SendDirectMessage to %#v failed: %s", toUserId, resp.Error)
-		return
-	}
-	channelName := model.GetDMNameFromIds(toUserId, m.User.Id)
-
-	// update our channels
-	if err := m.UpdateChannels(); err != nil {
-		m.logger.Errorf("failed to update channels: %#v", err)
-	}
-
-	// build & send the message
-	msg = strings.Replace(msg, "\r", "", -1)
-	post := &model.Post{ChannelId: m.GetChannelId(channelName, m.Team.Id), Message: msg, RootId: rootId, Props: props}
-	m.Client.CreatePost(post)
-}
-
-func (m *MMClient) UploadFile(data []byte, channelId string, filename string) (string, error) { //nolint:golint
-	f, resp := m.Client.UploadFile(data, channelId, filename)
-	if resp.Error != nil {
-		return "", resp.Error
-	}
-	return f.FileInfos[0].Id, nil
-}
diff --git a/matterclient/users.go b/matterclient/users.go
deleted file mode 100644
index 42c4162c..00000000
--- a/matterclient/users.go
+++ /dev/null
@@ -1,165 +0,0 @@
-package matterclient
-
-import (
-	"errors"
-	"time"
-
-	"github.com/mattermost/mattermost-server/v5/model"
-)
-
-func (m *MMClient) GetNickName(userId string) string { //nolint:golint
-	user := m.GetUser(userId)
-	if user != nil {
-		return user.Nickname
-	}
-	return ""
-}
-
-func (m *MMClient) GetStatus(userId string) string { //nolint:golint
-	res, resp := m.Client.GetUserStatus(userId, "")
-	if resp.Error != nil {
-		return ""
-	}
-	if res.Status == model.STATUS_AWAY {
-		return "away"
-	}
-	if res.Status == model.STATUS_ONLINE {
-		return "online"
-	}
-	return "offline"
-}
-
-func (m *MMClient) GetStatuses() map[string]string {
-	var ids []string
-	statuses := make(map[string]string)
-	for id := range m.Users {
-		ids = append(ids, id)
-	}
-	res, resp := m.Client.GetUsersStatusesByIds(ids)
-	if resp.Error != nil {
-		return statuses
-	}
-	for _, status := range res {
-		statuses[status.UserId] = "offline"
-		if status.Status == model.STATUS_AWAY {
-			statuses[status.UserId] = "away"
-		}
-		if status.Status == model.STATUS_ONLINE {
-			statuses[status.UserId] = "online"
-		}
-	}
-	return statuses
-}
-
-func (m *MMClient) GetTeamId() string { //nolint:golint
-	return m.Team.Id
-}
-
-// GetTeamName returns the name of the specified teamId
-func (m *MMClient) GetTeamName(teamId string) string { //nolint:golint
-	m.RLock()
-	defer m.RUnlock()
-	for _, t := range m.OtherTeams {
-		if t.Id == teamId {
-			return t.Team.Name
-		}
-	}
-	return ""
-}
-
-func (m *MMClient) GetUser(userId string) *model.User { //nolint:golint
-	m.Lock()
-	defer m.Unlock()
-	_, ok := m.Users[userId]
-	if !ok {
-		res, resp := m.Client.GetUser(userId, "")
-		if resp.Error != nil {
-			return nil
-		}
-		m.Users[userId] = res
-	}
-	return m.Users[userId]
-}
-
-func (m *MMClient) GetUserName(userId string) string { //nolint:golint
-	user := m.GetUser(userId)
-	if user != nil {
-		return user.Username
-	}
-	return ""
-}
-
-func (m *MMClient) GetUsers() map[string]*model.User {
-	users := make(map[string]*model.User)
-	m.RLock()
-	defer m.RUnlock()
-	for k, v := range m.Users {
-		users[k] = v
-	}
-	return users
-}
-
-func (m *MMClient) UpdateUsers() error {
-	idx := 0
-	max := 200
-	mmusers, resp := m.Client.GetUsers(idx, max, "")
-	if resp.Error != nil {
-		return errors.New(resp.Error.DetailedError)
-	}
-	for len(mmusers) > 0 {
-		m.Lock()
-		for _, user := range mmusers {
-			m.Users[user.Id] = user
-		}
-		m.Unlock()
-		mmusers, resp = m.Client.GetUsers(idx, max, "")
-		time.Sleep(time.Millisecond * 300)
-		if resp.Error != nil {
-			return errors.New(resp.Error.DetailedError)
-		}
-		idx++
-	}
-	return nil
-}
-
-func (m *MMClient) UpdateUserNick(nick string) error {
-	user := m.User
-	user.Nickname = nick
-	_, resp := m.Client.UpdateUser(user)
-	if resp.Error != nil {
-		return resp.Error
-	}
-	return nil
-}
-
-func (m *MMClient) UsernamesInChannel(channelId string) []string { //nolint:golint
-	res, resp := m.Client.GetChannelMembers(channelId, 0, 50000, "")
-	if resp.Error != nil {
-		m.logger.Errorf("UsernamesInChannel(%s) failed: %s", channelId, resp.Error)
-		return []string{}
-	}
-	allusers := m.GetUsers()
-	result := []string{}
-	for _, member := range *res {
-		result = append(result, allusers[member.UserId].Nickname)
-	}
-	return result
-}
-
-func (m *MMClient) UpdateStatus(userId string, status string) error { //nolint:golint
-	_, resp := m.Client.UpdateUserStatus(userId, &model.Status{Status: status})
-	if resp.Error != nil {
-		return resp.Error
-	}
-	return nil
-}
-
-func (m *MMClient) UpdateUser(userId string) { //nolint:golint
-	m.Lock()
-	defer m.Unlock()
-	res, resp := m.Client.GetUser(userId, "")
-	if resp.Error != nil {
-		return
-	}
-	m.Users[userId] = res
-}
diff --git a/vendor/github.com/bwmarrin/discordgo/discord.go b/vendor/github.com/bwmarrin/discordgo/discord.go
index 0b571764..5c0fea0c 100644
--- a/vendor/github.com/bwmarrin/discordgo/discord.go
+++ b/vendor/github.com/bwmarrin/discordgo/discord.go
@@ -22,7 +22,7 @@ import (
 )
 
 // VERSION of DiscordGo, follows Semantic Versioning. (http://semver.org/)
-const VERSION = "0.27.0"
+const VERSION = "0.27.1"
 
 // New creates a new Discord session with provided token.
 // If the token is for a bot, it must be prefixed with "Bot "
diff --git a/vendor/github.com/bwmarrin/discordgo/restapi.go b/vendor/github.com/bwmarrin/discordgo/restapi.go
index b7d323e7..fe4d2fe8 100644
--- a/vendor/github.com/bwmarrin/discordgo/restapi.go
+++ b/vendor/github.com/bwmarrin/discordgo/restapi.go
@@ -223,6 +223,7 @@ func (s *Session) RequestWithLockedBucket(method, urlStr, contentType string, b
 	for _, opt := range options {
 		opt(cfg)
 	}
+	req = cfg.Request
 
 	if s.Debug {
 		for k, v := range req.Header {
diff --git a/vendor/github.com/bwmarrin/discordgo/structs.go b/vendor/github.com/bwmarrin/discordgo/structs.go
index 1c29a7e9..2dad321c 100644
--- a/vendor/github.com/bwmarrin/discordgo/structs.go
+++ b/vendor/github.com/bwmarrin/discordgo/structs.go
@@ -527,7 +527,7 @@ type ThreadMember struct {
 	// The time the current user last joined the thread
 	JoinTimestamp time.Time `json:"join_timestamp"`
 	// Any user-thread settings, currently only used for notifications
-	Flags int
+	Flags int `json:"flags"`
 }
 
 // ThreadsList represents a list of threads alongisde with thread member objects for the current user.
@@ -622,6 +622,7 @@ const (
 	StickerFormatTypePNG    StickerFormat = 1
 	StickerFormatTypeAPNG   StickerFormat = 2
 	StickerFormatTypeLottie StickerFormat = 3
+	StickerFormatTypeGIF    StickerFormat = 4
 )
 
 // StickerType is the type of sticker.
diff --git a/vendor/github.com/bwmarrin/discordgo/voice.go b/vendor/github.com/bwmarrin/discordgo/voice.go
index 87e84b12..79ce18e2 100644
--- a/vendor/github.com/bwmarrin/discordgo/voice.go
+++ b/vendor/github.com/bwmarrin/discordgo/voice.go
@@ -599,44 +599,46 @@ func (v *VoiceConnection) udpOpen() (err error) {
 		return
 	}
 
-	// Create a 70 byte array and put the SSRC code from the Op 2 VoiceConnection event
-	// into it.  Then send that over the UDP connection to Discord
-	sb := make([]byte, 70)
-	binary.BigEndian.PutUint32(sb, v.op2.SSRC)
+	// Create a 74 byte array to store the packet data
+	sb := make([]byte, 74)
+	binary.BigEndian.PutUint16(sb, 1)              // Packet type (0x1 is request, 0x2 is response)
+	binary.BigEndian.PutUint16(sb[2:], 70)         // Packet length (excluding type and length fields)
+	binary.BigEndian.PutUint32(sb[4:], v.op2.SSRC) // The SSRC code from the Op 2 VoiceConnection event
+
+	// And send that data over the UDP connection to Discord.
 	_, err = v.udpConn.Write(sb)
 	if err != nil {
 		v.log(LogWarning, "udp write error to %s, %s", addr.String(), err)
 		return
 	}
 
-	// Create a 70 byte array and listen for the initial handshake response
+	// Create a 74 byte array and listen for the initial handshake response
 	// from Discord.  Once we get it parse the IP and PORT information out
 	// of the response.  This should be our public IP and PORT as Discord
 	// saw us.
-	rb := make([]byte, 70)
+	rb := make([]byte, 74)
 	rlen, _, err := v.udpConn.ReadFromUDP(rb)
 	if err != nil {
 		v.log(LogWarning, "udp read error, %s, %s", addr.String(), err)
 		return
 	}
 
-	if rlen < 70 {
+	if rlen < 74 {
 		v.log(LogWarning, "received udp packet too small")
 		return fmt.Errorf("received udp packet too small")
 	}
 
-	// Loop over position 4 through 20 to grab the IP address
-	// Should never be beyond position 20.
+	// Loop over position 8 through 71 to grab the IP address.
 	var ip string
-	for i := 4; i < 20; i++ {
+	for i := 8; i < len(rb)-2; i++ {
 		if rb[i] == 0 {
 			break
 		}
 		ip += string(rb[i])
 	}
 
-	// Grab port from position 68 and 69
-	port := binary.BigEndian.Uint16(rb[68:70])
+	// Grab port from position 72 and 73
+	port := binary.BigEndian.Uint16(rb[len(rb)-2:])
 
 	// Take the data from above and send it back to Discord to finalize
 	// the UDP connection handshake.
diff --git a/vendor/github.com/d5/tengo/v2/parser/parser.go b/vendor/github.com/d5/tengo/v2/parser/parser.go
index eaa9dc93..a12af614 100644
--- a/vendor/github.com/d5/tengo/v2/parser/parser.go
+++ b/vendor/github.com/d5/tengo/v2/parser/parser.go
@@ -143,6 +143,7 @@ func (p *Parser) ParseFile() (file *File, err error) {
 	}
 
 	stmts := p.parseStmtList()
+	p.expect(token.EOF)
 	if p.errors.Len() > 0 {
 		return nil, p.errors.Err()
 	}
diff --git a/vendor/github.com/d5/tengo/v2/script.go b/vendor/github.com/d5/tengo/v2/script.go
index 4cca4d04..16f2944b 100644
--- a/vendor/github.com/d5/tengo/v2/script.go
+++ b/vendor/github.com/d5/tengo/v2/script.go
@@ -247,8 +247,8 @@ func (c *Compiled) RunContext(ctx context.Context) (err error) {
 // Clone creates a new copy of Compiled. Cloned copies are safe for concurrent
 // use by multiple goroutines.
 func (c *Compiled) Clone() *Compiled {
-	c.lock.Lock()
-	defer c.lock.Unlock()
+	c.lock.RLock()
+	defer c.lock.RUnlock()
 
 	clone := &Compiled{
 		globalIndexes: c.globalIndexes,
diff --git a/vendor/github.com/d5/tengo/v2/stdlib/json/decode.go b/vendor/github.com/d5/tengo/v2/stdlib/json/decode.go
index 6d468ef0..557fb9ea 100644
--- a/vendor/github.com/d5/tengo/v2/stdlib/json/decode.go
+++ b/vendor/github.com/d5/tengo/v2/stdlib/json/decode.go
@@ -62,9 +62,12 @@ func (d *decodeState) scanNext() {
 
 // scanWhile processes bytes in d.data[d.off:] until it
 // receives a scan code not equal to op.
-func (d *decodeState) scanWhile(op int) {
+func (d *decodeState) scanWhile(op int) (isFloat bool) {
 	s, data, i := &d.scan, d.data, d.off
 	for i < len(data) {
+		if data[i] == '.' || data[i] == 'e' || data[i] == 'E' {
+			isFloat = true
+		}
 		newOp := s.step(s, data[i])
 		i++
 		if newOp != op {
@@ -76,6 +79,7 @@ func (d *decodeState) scanWhile(op int) {
 
 	d.off = len(data) + 1 // mark processed EOF with len+1
 	d.opcode = d.scan.eof()
+	return
 }
 
 func (d *decodeState) value() (tengo.Object, error) {
@@ -185,7 +189,7 @@ func (d *decodeState) object() (tengo.Object, error) {
 func (d *decodeState) literal() (tengo.Object, error) {
 	// All bytes inside literal return scanContinue op code.
 	start := d.readIndex()
-	d.scanWhile(scanContinue)
+	isFloat := d.scanWhile(scanContinue)
 
 	item := d.data[start:d.readIndex()]
 
@@ -210,8 +214,12 @@ func (d *decodeState) literal() (tengo.Object, error) {
 		if c != '-' && (c < '0' || c > '9') {
 			panic(phasePanicMsg)
 		}
-		n, _ := strconv.ParseFloat(string(item), 10)
-		return &tengo.Float{Value: n}, nil
+		if isFloat {
+			n, _ := strconv.ParseFloat(string(item), 10)
+			return &tengo.Float{Value: n}, nil
+		}
+		n, _ := strconv.ParseInt(string(item), 10, 64)
+		return &tengo.Int{Value: n}, nil
 	}
 }
 
diff --git a/vendor/github.com/d5/tengo/v2/stdlib/math.go b/vendor/github.com/d5/tengo/v2/stdlib/math.go
index 633ea09f..1bd9ba69 100644
--- a/vendor/github.com/d5/tengo/v2/stdlib/math.go
+++ b/vendor/github.com/d5/tengo/v2/stdlib/math.go
@@ -7,17 +7,31 @@ import (
 )
 
 var mathModule = map[string]tengo.Object{
-	"e":       &tengo.Float{Value: math.E},
-	"pi":      &tengo.Float{Value: math.Pi},
-	"phi":     &tengo.Float{Value: math.Phi},
-	"sqrt2":   &tengo.Float{Value: math.Sqrt2},
-	"sqrtE":   &tengo.Float{Value: math.SqrtE},
-	"sqrtPi":  &tengo.Float{Value: math.SqrtPi},
-	"sqrtPhi": &tengo.Float{Value: math.SqrtPhi},
-	"ln2":     &tengo.Float{Value: math.Ln2},
-	"log2E":   &tengo.Float{Value: math.Log2E},
-	"ln10":    &tengo.Float{Value: math.Ln10},
-	"log10E":  &tengo.Float{Value: math.Log10E},
+	"e":                      &tengo.Float{Value: math.E},
+	"pi":                     &tengo.Float{Value: math.Pi},
+	"phi":                    &tengo.Float{Value: math.Phi},
+	"sqrt2":                  &tengo.Float{Value: math.Sqrt2},
+	"sqrtE":                  &tengo.Float{Value: math.SqrtE},
+	"sqrtPi":                 &tengo.Float{Value: math.SqrtPi},
+	"sqrtPhi":                &tengo.Float{Value: math.SqrtPhi},
+	"ln2":                    &tengo.Float{Value: math.Ln2},
+	"log2E":                  &tengo.Float{Value: math.Log2E},
+	"ln10":                   &tengo.Float{Value: math.Ln10},
+	"log10E":                 &tengo.Float{Value: math.Log10E},
+	"maxFloat32":             &tengo.Float{Value: math.MaxFloat32},
+	"smallestNonzeroFloat32": &tengo.Float{Value: math.SmallestNonzeroFloat32},
+	"maxFloat64":             &tengo.Float{Value: math.MaxFloat64},
+	"smallestNonzeroFloat64": &tengo.Float{Value: math.SmallestNonzeroFloat64},
+	"maxInt":                 &tengo.Int{Value: math.MaxInt},
+	"minInt":                 &tengo.Int{Value: math.MinInt},
+	"maxInt8":                &tengo.Int{Value: math.MaxInt8},
+	"minInt8":                &tengo.Int{Value: math.MinInt8},
+	"maxInt16":               &tengo.Int{Value: math.MaxInt16},
+	"minInt16":               &tengo.Int{Value: math.MinInt16},
+	"maxInt32":               &tengo.Int{Value: math.MaxInt32},
+	"minInt32":               &tengo.Int{Value: math.MinInt32},
+	"maxInt64":               &tengo.Int{Value: math.MaxInt64},
+	"minInt64":               &tengo.Int{Value: math.MinInt64},
 	"abs": &tengo.UserFunction{
 		Name:  "abs",
 		Value: FuncAFRF(math.Abs),
diff --git a/vendor/github.com/d5/tengo/v2/stdlib/times.go b/vendor/github.com/d5/tengo/v2/stdlib/times.go
index 0b6f7bd4..dc9a1a56 100644
--- a/vendor/github.com/d5/tengo/v2/stdlib/times.go
+++ b/vendor/github.com/d5/tengo/v2/stdlib/times.go
@@ -180,6 +180,10 @@ var timesModule = map[string]tengo.Object{
 		Name:  "to_utc",
 		Value: timesToUTC,
 	}, // to_utc(time) => time
+	"in_location": &tengo.UserFunction{
+		Name:  "in_location",
+		Value: timesInLocation,
+	}, // in_location(time, location) => time
 }
 
 func timesSleep(args ...tengo.Object) (ret tengo.Object, err error) {
@@ -430,7 +434,7 @@ func timesDate(args ...tengo.Object) (
 	ret tengo.Object,
 	err error,
 ) {
-	if len(args) != 7 {
+	if len(args) < 7 || len(args) > 8 {
 		err = tengo.ErrWrongNumArguments
 		return
 	}
@@ -499,9 +503,29 @@ func timesDate(args ...tengo.Object) (
 		return
 	}
 
+	var loc *time.Location
+	if len(args) == 8 {
+		i8, ok := tengo.ToString(args[7])
+		if !ok {
+			err = tengo.ErrInvalidArgumentType{
+				Name:     "eighth",
+				Expected: "string(compatible)",
+				Found:    args[7].TypeName(),
+			}
+			return
+		}
+		loc, err = time.LoadLocation(i8)
+		if err != nil {
+			ret = wrapError(err)
+			return
+		}
+	} else {
+		loc = time.Now().Location()
+	}
+
 	ret = &tengo.Time{
 		Value: time.Date(i1,
-			time.Month(i2), i3, i4, i5, i6, i7, time.Now().Location()),
+			time.Month(i2), i3, i4, i5, i6, i7, loc),
 	}
 
 	return
@@ -1113,6 +1137,46 @@ func timesTimeLocation(args ...tengo.Object) (
 	return
 }
 
+func timesInLocation(args ...tengo.Object) (
+	ret tengo.Object,
+	err error,
+) {
+	if len(args) != 2 {
+		err = tengo.ErrWrongNumArguments
+		return
+	}
+
+	t1, ok := tengo.ToTime(args[0])
+	if !ok {
+		err = tengo.ErrInvalidArgumentType{
+			Name:     "first",
+			Expected: "time(compatible)",
+			Found:    args[0].TypeName(),
+		}
+		return
+	}
+
+	s2, ok := tengo.ToString(args[1])
+	if !ok {
+		err = tengo.ErrInvalidArgumentType{
+			Name:     "second",
+			Expected: "string(compatible)",
+			Found:    args[1].TypeName(),
+		}
+		return
+	}
+
+	location, err := time.LoadLocation(s2)
+	if err != nil {
+		ret = wrapError(err)
+		return
+	}
+
+	ret = &tengo.Time{Value: t1.In(location)}
+
+	return
+}
+
 func timesTimeString(args ...tengo.Object) (ret tengo.Object, err error) {
 	if len(args) != 1 {
 		err = tengo.ErrWrongNumArguments
diff --git a/vendor/github.com/dustin/go-humanize/.travis.yml b/vendor/github.com/dustin/go-humanize/.travis.yml
index ba95cdd1..ac12e485 100644
--- a/vendor/github.com/dustin/go-humanize/.travis.yml
+++ b/vendor/github.com/dustin/go-humanize/.travis.yml
@@ -1,12 +1,12 @@
 sudo: false
 language: go
+go_import_path: github.com/dustin/go-humanize
 go:
-  - 1.3.x
-  - 1.5.x
-  - 1.6.x
-  - 1.7.x
-  - 1.8.x
-  - 1.9.x
+  - 1.13.x
+  - 1.14.x
+  - 1.15.x
+  - 1.16.x
+  - stable
   - master
 matrix:
   allow_failures:
@@ -15,7 +15,7 @@ matrix:
 install:
   - # Do nothing. This is needed to prevent default install action "go get -t -v ./..." from happening here (we want it to happen inside script step).
 script:
-  - go get -t -v ./...
   - diff -u <(echo -n) <(gofmt -d -s .)
-  - go tool vet .
+  - go vet .
+  - go install -v -race ./...
   - go test -v -race ./...
diff --git a/vendor/github.com/dustin/go-humanize/README.markdown b/vendor/github.com/dustin/go-humanize/README.markdown
index 91b4ae56..7d0b16b3 100644
--- a/vendor/github.com/dustin/go-humanize/README.markdown
+++ b/vendor/github.com/dustin/go-humanize/README.markdown
@@ -5,7 +5,7 @@ Just a few functions for helping humanize times and sizes.
 `go get` it as `github.com/dustin/go-humanize`, import it as
 `"github.com/dustin/go-humanize"`, use it as `humanize`.
 
-See [godoc](https://godoc.org/github.com/dustin/go-humanize) for
+See [godoc](https://pkg.go.dev/github.com/dustin/go-humanize) for
 complete documentation.
 
 ## Sizes
diff --git a/vendor/github.com/dustin/go-humanize/bigbytes.go b/vendor/github.com/dustin/go-humanize/bigbytes.go
index 1a2bf617..3b015fd5 100644
--- a/vendor/github.com/dustin/go-humanize/bigbytes.go
+++ b/vendor/github.com/dustin/go-humanize/bigbytes.go
@@ -28,6 +28,10 @@ var (
 	BigZiByte = (&big.Int{}).Mul(BigEiByte, bigIECExp)
 	// BigYiByte is 1,024 z bytes in bit.Ints
 	BigYiByte = (&big.Int{}).Mul(BigZiByte, bigIECExp)
+	// BigRiByte is 1,024 y bytes in bit.Ints
+	BigRiByte = (&big.Int{}).Mul(BigYiByte, bigIECExp)
+	// BigQiByte is 1,024 r bytes in bit.Ints
+	BigQiByte = (&big.Int{}).Mul(BigRiByte, bigIECExp)
 )
 
 var (
@@ -51,6 +55,10 @@ var (
 	BigZByte = (&big.Int{}).Mul(BigEByte, bigSIExp)
 	// BigYByte is 1,000 SI z bytes in big.Ints
 	BigYByte = (&big.Int{}).Mul(BigZByte, bigSIExp)
+	// BigRByte is 1,000 SI y bytes in big.Ints
+	BigRByte = (&big.Int{}).Mul(BigYByte, bigSIExp)
+	// BigQByte is 1,000 SI r bytes in big.Ints
+	BigQByte = (&big.Int{}).Mul(BigRByte, bigSIExp)
 )
 
 var bigBytesSizeTable = map[string]*big.Int{
@@ -71,6 +79,10 @@ var bigBytesSizeTable = map[string]*big.Int{
 	"zb":  BigZByte,
 	"yib": BigYiByte,
 	"yb":  BigYByte,
+	"rib": BigRiByte,
+	"rb":  BigRByte,
+	"qib": BigQiByte,
+	"qb":  BigQByte,
 	// Without suffix
 	"":   BigByte,
 	"ki": BigKiByte,
@@ -89,6 +101,10 @@ var bigBytesSizeTable = map[string]*big.Int{
 	"zi": BigZiByte,
 	"y":  BigYByte,
 	"yi": BigYiByte,
+	"r":  BigRByte,
+	"ri": BigRiByte,
+	"q":  BigQByte,
+	"qi": BigQiByte,
 }
 
 var ten = big.NewInt(10)
@@ -115,7 +131,7 @@ func humanateBigBytes(s, base *big.Int, sizes []string) string {
 //
 // BigBytes(82854982) -> 83 MB
 func BigBytes(s *big.Int) string {
-	sizes := []string{"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"}
+	sizes := []string{"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB", "RB", "QB"}
 	return humanateBigBytes(s, bigSIExp, sizes)
 }
 
@@ -125,7 +141,7 @@ func BigBytes(s *big.Int) string {
 //
 // BigIBytes(82854982) -> 79 MiB
 func BigIBytes(s *big.Int) string {
-	sizes := []string{"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"}
+	sizes := []string{"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB", "RiB", "QiB"}
 	return humanateBigBytes(s, bigIECExp, sizes)
 }
 
diff --git a/vendor/github.com/dustin/go-humanize/commaf.go b/vendor/github.com/dustin/go-humanize/commaf.go
index 620690de..2bc83a03 100644
--- a/vendor/github.com/dustin/go-humanize/commaf.go
+++ b/vendor/github.com/dustin/go-humanize/commaf.go
@@ -1,3 +1,4 @@
+//go:build go1.6
 // +build go1.6
 
 package humanize
diff --git a/vendor/github.com/dustin/go-humanize/ftoa.go b/vendor/github.com/dustin/go-humanize/ftoa.go
index 1c62b640..bce923f3 100644
--- a/vendor/github.com/dustin/go-humanize/ftoa.go
+++ b/vendor/github.com/dustin/go-humanize/ftoa.go
@@ -6,6 +6,9 @@ import (
 )
 
 func stripTrailingZeros(s string) string {
+	if !strings.ContainsRune(s, '.') {
+		return s
+	}
 	offset := len(s) - 1
 	for offset > 0 {
 		if s[offset] == '.' {
diff --git a/vendor/github.com/dustin/go-humanize/number.go b/vendor/github.com/dustin/go-humanize/number.go
index dec61865..6470d0d4 100644
--- a/vendor/github.com/dustin/go-humanize/number.go
+++ b/vendor/github.com/dustin/go-humanize/number.go
@@ -73,7 +73,7 @@ func FormatFloat(format string, n float64) string {
 	if n > math.MaxFloat64 {
 		return "Infinity"
 	}
-	if n < -math.MaxFloat64 {
+	if n < (0.0 - math.MaxFloat64) {
 		return "-Infinity"
 	}
 
diff --git a/vendor/github.com/dustin/go-humanize/si.go b/vendor/github.com/dustin/go-humanize/si.go
index ae659e0e..8b850198 100644
--- a/vendor/github.com/dustin/go-humanize/si.go
+++ b/vendor/github.com/dustin/go-humanize/si.go
@@ -8,6 +8,8 @@ import (
 )
 
 var siPrefixTable = map[float64]string{
+	-30: "q", // quecto
+	-27: "r", // ronto
 	-24: "y", // yocto
 	-21: "z", // zepto
 	-18: "a", // atto
@@ -25,6 +27,8 @@ var siPrefixTable = map[float64]string{
 	18:  "E", // exa
 	21:  "Z", // zetta
 	24:  "Y", // yotta
+	27:  "R", // ronna
+	30:  "Q", // quetta
 }
 
 var revSIPrefixTable = revfmap(siPrefixTable)
diff --git a/vendor/github.com/gomarkdown/markdown/.gitpod.yml b/vendor/github.com/gomarkdown/markdown/.gitpod.yml
deleted file mode 100644
index dde1f1d9..00000000
--- a/vendor/github.com/gomarkdown/markdown/.gitpod.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# This configuration file was automatically generated by Gitpod.
-# Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file)
-# and commit this file to your remote git repository to share the goodness with others.
-
-tasks:
-  - init: go get && go build ./... && go test ./...
-    command: go run
-
-
diff --git a/vendor/github.com/gomarkdown/markdown/README.md b/vendor/github.com/gomarkdown/markdown/README.md
index a85ce69c..a60b8ba5 100644
--- a/vendor/github.com/gomarkdown/markdown/README.md
+++ b/vendor/github.com/gomarkdown/markdown/README.md
@@ -6,7 +6,16 @@ Package `github.com/gomarkdown/markdown` is a Go library for parsing Markdown te
 
 It's very fast and supports common extensions.
 
-Try code examples online: https://replit.com/@kjk1?path=folder/gomarkdown
+Tutorial: https://blog.kowalczyk.info/article/cxn3/advanced-markdown-processing-in-go.html
+
+Code examples:
+* https://onlinetool.io/goplayground/#txO7hJ-ibeU : basic markdown => HTML
+* https://onlinetool.io/goplayground/#yFRIWRiu-KL : customize HTML renderer
+* https://onlinetool.io/goplayground/#2yV5-HDKBUV : modify AST
+* https://onlinetool.io/goplayground/#9fqKwRbuJ04 : customize parser
+* https://onlinetool.io/goplayground/#Bk0zTvrzUDR : syntax highlight
+
+Those examples are also in [examples](./examples) directory.
 
 ## API Docs:
 
@@ -15,101 +24,58 @@ Try code examples online: https://replit.com/@kjk1?path=folder/gomarkdown
 - https://pkg.go.dev/github.com/gomarkdown/markdown/parser : parser
 - https://pkg.go.dev/github.com/gomarkdown/markdown/html : html renderer
 
-## Users
-
-Some tools using this package: https://pkg.go.dev/github.com/gomarkdown/markdown?tab=importedby
-
 ## Usage
 
 To convert markdown text to HTML using reasonable defaults:
 
 ```go
-md := []byte("## markdown document")
-output := markdown.ToHTML(md, nil, nil)
-```
+package main
 
-Try it online: https://replit.com/@kjk1/gomarkdown-basic
-
-## Customizing markdown parser
-
-Markdown format is loosely specified and there are multiple extensions invented after original specification was created.
-
-The parser supports several [extensions](https://pkg.go.dev/github.com/gomarkdown/markdown/parser#Extensions).
-
-Default parser uses most common `parser.CommonExtensions` but you can easily use parser with custom extension:
-
-```go
 import (
-    "github.com/gomarkdown/markdown"
-    "github.com/gomarkdown/markdown/parser"
+	"os"
+
+	"github.com/gomarkdown/markdown"
+	"github.com/gomarkdown/markdown/ast"
+	"github.com/gomarkdown/markdown/html"
+	"github.com/gomarkdown/markdown/parser"
+
+	"fmt"
 )
 
-extensions := parser.CommonExtensions | parser.AutoHeadingIDs
-parser := parser.NewWithExtensions(extensions)
+var mds = `# header
 
-md := []byte("markdown text")
-html := markdown.ToHTML(md, parser, nil)
-```
+Sample text.
 
-Try it online: https://replit.com/@kjk1/gomarkdown-customized-html-renderer
+[link](http://example.com)
+`
 
-## Customizing HTML renderer
+func mdToHTML(md []byte) []byte {
+	// create markdown parser with extensions
+	extensions := parser.CommonExtensions | parser.AutoHeadingIDs | parser.NoEmptyLineBeforeBlock
+	p := parser.NewWithExtensions(extensions)
+	doc := p.Parse(md)
 
-Similarly, HTML renderer can be configured with different [options](https://pkg.go.dev/github.com/gomarkdown/markdown/html#RendererOptions)
+	// create HTML renderer with extensions
+	htmlFlags := html.CommonFlags | html.HrefTargetBlank
+	opts := html.RendererOptions{Flags: htmlFlags}
+	renderer := html.NewRenderer(opts)
 
-Here's how to use a custom renderer:
-
-```go
-import (
-    "github.com/gomarkdown/markdown"
-    "github.com/gomarkdown/markdown/html"
-)
-
-htmlFlags := html.CommonFlags | html.HrefTargetBlank
-opts := html.RendererOptions{Flags: htmlFlags}
-renderer := html.NewRenderer(opts)
-
-md := []byte("markdown text")
-html := markdown.ToHTML(md, nil, renderer)
-```
-
-Try it online: https://replit.com/@kjk1/gomarkdown-customized-html-renderer
-
-HTML renderer also supports reusing most of the logic and overriding rendering of only specific nodes.
-
-You can provide [RenderNodeFunc](https://pkg.go.dev/github.com/gomarkdown/markdown/html#RenderNodeFunc) in [RendererOptions](https://pkg.go.dev/github.com/gomarkdown/markdown/html#RendererOptions).
-
-The function is called for each node in AST, you can implement custom rendering logic and tell HTML renderer to skip rendering this node.
-
-Here's the simplest example that drops all code blocks from the output:
-
-````go
-import (
-    "github.com/gomarkdown/markdown"
-    "github.com/gomarkdown/markdown/ast"
-    "github.com/gomarkdown/markdown/html"
-)
-
-// return (ast.GoToNext, true) to tell html renderer to skip rendering this node
-// (because you've rendered it)
-func renderHookDropCodeBlock(w io.Writer, node ast.Node, entering bool) (ast.WalkStatus, bool) {
-    // skip all nodes that are not CodeBlock nodes
-	if _, ok := node.(*ast.CodeBlock); !ok {
-		return ast.GoToNext, false
-    }
-    // custom rendering logic for ast.CodeBlock. By doing nothing it won't be
-    // present in the output
-	return ast.GoToNext, true
+	return markdown.Render(doc, renderer)
 }
 
-opts := html.RendererOptions{
-    Flags: html.CommonFlags,
-    RenderNodeHook: renderHookDropCodeBlock,
+func main() {
+	md := []byte(mds)
+	html := mdToHTML(md)
+
+	fmt.Printf("--- Markdown:\n%s\n\n--- HTML:\n%s\n", md, html)
 }
-renderer := html.NewRenderer(opts)
-md := "test\n```\nthis code block will be dropped from output\n```\ntext"
-html := markdown.ToHTML([]byte(md), nil, renderer)
-````
+```
+
+Try it online: https://onlinetool.io/goplayground/#txO7hJ-ibeU
+
+For more documentation read [this guide](https://blog.kowalczyk.info/article/cxn3/advanced-markdown-processing-in-go.html)
+
+Comparing to other markdown parsers: https://babelmark.github.io/
 
 ## Sanitize untrusted content
 
@@ -129,12 +95,6 @@ maybeUnsafeHTML := markdown.ToHTML(md, nil, nil)
 html := bluemonday.UGCPolicy().SanitizeBytes(maybeUnsafeHTML)
 ```
 
-## Windows / Mac newlines
-
-The library only supports Unix newlines. If you have markdown text with possibly
-Windows / Mac newlines, normalize newlines before calling this library using
-`d = markdown.NormalizeNewlines(d)`
-
 ## mdtohtml command-line tool
 
 https://github.com/gomarkdown/mdtohtml is a command-line markdown to html
@@ -323,26 +283,15 @@ implements the following extensions:
 
 - **Mmark support**, see <https://mmark.miek.nl/post/syntax/> for all new syntax elements this adds.
 
-## Todo
+## Users
 
-- port https://github.com/russross/blackfriday/issues/348
-- port [LaTeX output](https://github.com/Ambrevar/Blackfriday-LaTeX):
-  renders output as LaTeX.
-- port https://github.com/shurcooL/github_flavored_markdown to markdown
-- port [markdownfmt](https://github.com/shurcooL/markdownfmt): like gofmt,
-  but for markdown.
-- More unit testing
-- Improve unicode support. It does not understand all unicode
-  rules (about what constitutes a letter, a punctuation symbol,
-  etc.), so it may fail to detect word boundaries correctly in
-  some instances. It is safe on all utf-8 input.
+Some tools using this package: https://pkg.go.dev/github.com/gomarkdown/markdown?tab=importedby
 
 ## History
 
-markdown is a fork of v2 of https://github.com/russross/blackfriday that is:
+markdown is a fork of v2 of https://github.com/russross/blackfriday.
 
-- actively maintained (sadly in Feb 2018 blackfriday was inactive for 5 months with many bugs and pull requests accumulated)
-- refactored API (split into ast/parser/html sub-packages)
+I refactored the API (split into ast/parser/html sub-packages).
 
 Blackfriday itself was based on C implementation [sundown](https://github.com/vmg/sundown) which in turn was based on [libsoldout](http://fossil.instinctive.eu/libsoldout/home).
 
diff --git a/vendor/github.com/gomarkdown/markdown/ast/node.go b/vendor/github.com/gomarkdown/markdown/ast/node.go
index 1d558dd3..8f802db8 100644
--- a/vendor/github.com/gomarkdown/markdown/ast/node.go
+++ b/vendor/github.com/gomarkdown/markdown/ast/node.go
@@ -92,6 +92,12 @@ type Container struct {
 	*Attribute // Block level attribute
 }
 
+// return true if can contain children of a given node type
+// used by custom nodes to over-ride logic in canNodeContain
+type CanContain interface {
+	CanContain(Node) bool
+}
+
 // AsContainer returns itself as *Container
 func (c *Container) AsContainer() *Container {
 	return c
diff --git a/vendor/github.com/gomarkdown/markdown/ast/print.go b/vendor/github.com/gomarkdown/markdown/ast/print.go
index b186ec07..a4e3d624 100644
--- a/vendor/github.com/gomarkdown/markdown/ast/print.go
+++ b/vendor/github.com/gomarkdown/markdown/ast/print.go
@@ -157,6 +157,8 @@ func printRecur(w io.Writer, node Node, prefix string, depth int) {
 			content += "flags=" + flags + " "
 		}
 		printDefault(w, indent, typeName, content)
+	case *CodeBlock:
+		printDefault(w, indent, typeName + ":" + string(v.Info), content)
 	default:
 		printDefault(w, indent, typeName, content)
 	}
diff --git a/vendor/github.com/gomarkdown/markdown/codecov.yml b/vendor/github.com/gomarkdown/markdown/codecov.yml
deleted file mode 100644
index f681ff11..00000000
--- a/vendor/github.com/gomarkdown/markdown/codecov.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-coverage:
-  status:
-    project:
-      default:
-        # basic
-        target: 60%
-        threshold: 2%
-        base: auto
diff --git a/vendor/github.com/gomarkdown/markdown/html/renderer.go b/vendor/github.com/gomarkdown/markdown/html/renderer.go
index fc63c5fe..494e7540 100644
--- a/vendor/github.com/gomarkdown/markdown/html/renderer.go
+++ b/vendor/github.com/gomarkdown/markdown/html/renderer.go
@@ -88,13 +88,15 @@ type RendererOptions struct {
 	// FootnoteReturnLinks flag is enabled. If blank, the string
 	// <sup>[return]</sup> is used.
 	FootnoteReturnLinkContents string
-	// CitationFormatString defines how a citation is rendered. If blnck, the string
+	// CitationFormatString defines how a citation is rendered. If blank, the string
 	// <sup>[%s]</sup> is used. Where %s will be substituted with the citation target.
 	CitationFormatString string
 	// If set, add this text to the front of each Heading ID, to ensure uniqueness.
 	HeadingIDPrefix string
 	// If set, add this text to the back of each Heading ID, to ensure uniqueness.
 	HeadingIDSuffix string
+	// can over-write <p> for paragraph tag
+	ParagraphTag string
 
 	Title string // Document title (used if CompletePage is set)
 	CSS   string // Optional CSS file URL (used if CompletePage is set)
@@ -120,7 +122,7 @@ type RendererOptions struct {
 //
 // Do not create this directly, instead use the NewRenderer function.
 type Renderer struct {
-	opts RendererOptions
+	Opts RendererOptions
 
 	closeTag string // how to end singleton tags: either " />" or ">"
 
@@ -168,7 +170,7 @@ func EscapeHTML(w io.Writer, d []byte) {
 	}
 }
 
-func escLink(w io.Writer, text []byte) {
+func EscLink(w io.Writer, text []byte) {
 	unesc := html.UnescapeString(string(text))
 	EscapeHTML(w, []byte(unesc))
 }
@@ -207,7 +209,7 @@ func NewRenderer(opts RendererOptions) *Renderer {
 	}
 
 	return &Renderer{
-		opts: opts,
+		Opts: opts,
 
 		closeTag:   closeTag,
 		headingIDs: make(map[string]int),
@@ -250,12 +252,12 @@ func isRelativeLink(link []byte) (yes bool) {
 	return false
 }
 
-func (r *Renderer) addAbsPrefix(link []byte) []byte {
-	if len(link) == 0 {
+func AddAbsPrefix(link []byte, prefix string) []byte {
+	if len(link) == 0 || len(prefix) == 0 {
 		return link
 	}
-	if r.opts.AbsolutePrefix != "" && isRelativeLink(link) && link[0] != '.' {
-		newDest := r.opts.AbsolutePrefix
+	if isRelativeLink(link) && link[0] != '.' {
+		newDest := prefix
 		if link[0] != '/' {
 			newDest += "/"
 		}
@@ -294,7 +296,7 @@ func isMailto(link []byte) bool {
 }
 
 func needSkipLink(r *Renderer, dest []byte) bool {
-	flags := r.opts.Flags
+	flags := r.Opts.Flags
 	if flags&SkipLinks != 0 {
 		return true
 	}
@@ -317,7 +319,7 @@ func appendLanguageAttr(attrs []string, info []byte) []string {
 	return append(attrs, s)
 }
 
-func (r *Renderer) outTag(w io.Writer, name string, attrs []string) {
+func (r *Renderer) OutTag(w io.Writer, name string, attrs []string) {
 	s := name
 	if len(attrs) > 0 {
 		s += " " + strings.Join(attrs, " ")
@@ -326,22 +328,22 @@ func (r *Renderer) outTag(w io.Writer, name string, attrs []string) {
 	r.lastOutputLen = 1
 }
 
-func footnoteRef(prefix string, node *ast.Link) string {
-	urlFrag := prefix + string(slugify(node.Destination))
+func FootnoteRef(prefix string, node *ast.Link) string {
+	urlFrag := prefix + string(Slugify(node.Destination))
 	nStr := strconv.Itoa(node.NoteID)
 	anchor := `<a href="#fn:` + urlFrag + `">` + nStr + `</a>`
 	return `<sup class="footnote-ref" id="fnref:` + urlFrag + `">` + anchor + `</sup>`
 }
 
-func footnoteItem(prefix string, slug []byte) string {
+func FootnoteItem(prefix string, slug []byte) string {
 	return `<li id="fn:` + prefix + string(slug) + `">`
 }
 
-func footnoteReturnLink(prefix, returnLink string, slug []byte) string {
+func FootnoteReturnLink(prefix, returnLink string, slug []byte) string {
 	return ` <a class="footnote-return" href="#fnref:` + prefix + string(slug) + `">` + returnLink + `</a>`
 }
 
-func listItemOpenCR(listItem *ast.ListItem) bool {
+func ListItemOpenCR(listItem *ast.ListItem) bool {
 	if ast.GetPrevNode(listItem) == nil {
 		return false
 	}
@@ -349,13 +351,13 @@ func listItemOpenCR(listItem *ast.ListItem) bool {
 	return !ld.Tight && ld.ListFlags&ast.ListTypeDefinition == 0
 }
 
-func skipParagraphTags(para *ast.Paragraph) bool {
+func SkipParagraphTags(para *ast.Paragraph) bool {
 	parent := para.Parent
 	grandparent := parent.GetParent()
-	if grandparent == nil || !isList(grandparent) {
+	if grandparent == nil || !IsList(grandparent) {
 		return false
 	}
-	isParentTerm := isListItemTerm(parent)
+	isParentTerm := IsListItemTerm(parent)
 	grandparentListData := grandparent.(*ast.List)
 	tightOrTerm := grandparentListData.Tight || isParentTerm
 	return tightOrTerm
@@ -391,35 +393,35 @@ var (
 	closeHTags = []string{"</h1>", "</h2>", "</h3>", "</h4>", "</h5>"}
 )
 
-func headingOpenTagFromLevel(level int) string {
+func HeadingOpenTagFromLevel(level int) string {
 	if level < 1 || level > 5 {
 		return "<h6"
 	}
 	return openHTags[level-1]
 }
 
-func headingCloseTagFromLevel(level int) string {
+func HeadingCloseTagFromLevel(level int) string {
 	if level < 1 || level > 5 {
 		return "</h6>"
 	}
 	return closeHTags[level-1]
 }
 
-func (r *Renderer) outHRTag(w io.Writer, attrs []string) {
+func (r *Renderer) OutHRTag(w io.Writer, attrs []string) {
 	hr := TagWithAttributes("<hr", attrs)
-	r.OutOneOf(w, r.opts.Flags&UseXHTML == 0, hr, "<hr />")
+	r.OutOneOf(w, r.Opts.Flags&UseXHTML == 0, hr, "<hr />")
 }
 
 // Text writes ast.Text node
 func (r *Renderer) Text(w io.Writer, text *ast.Text) {
-	if r.opts.Flags&Smartypants != 0 {
+	if r.Opts.Flags&Smartypants != 0 {
 		var tmp bytes.Buffer
 		EscapeHTML(&tmp, text.Literal)
 		r.sr.Process(w, tmp.Bytes())
 	} else {
 		_, parentIsLink := text.Parent.(*ast.Link)
 		if parentIsLink {
-			escLink(w, text.Literal)
+			EscLink(w, text.Literal)
 		} else {
 			EscapeHTML(w, text.Literal)
 		}
@@ -428,7 +430,7 @@ func (r *Renderer) Text(w io.Writer, text *ast.Text) {
 
 // HardBreak writes ast.Hardbreak node
 func (r *Renderer) HardBreak(w io.Writer, node *ast.Hardbreak) {
-	r.OutOneOf(w, r.opts.Flags&UseXHTML == 0, "<br>", "<br />")
+	r.OutOneOf(w, r.Opts.Flags&UseXHTML == 0, "<br>", "<br />")
 	r.CR(w)
 }
 
@@ -459,7 +461,7 @@ func (r *Renderer) OutOneOfCr(w io.Writer, outFirst bool, first string, second s
 
 // HTMLSpan writes ast.HTMLSpan node
 func (r *Renderer) HTMLSpan(w io.Writer, span *ast.HTMLSpan) {
-	if r.opts.Flags&SkipHTML == 0 {
+	if r.Opts.Flags&SkipHTML == 0 {
 		r.Out(w, span.Literal)
 	}
 }
@@ -467,18 +469,18 @@ func (r *Renderer) HTMLSpan(w io.Writer, span *ast.HTMLSpan) {
 func (r *Renderer) linkEnter(w io.Writer, link *ast.Link) {
 	attrs := link.AdditionalAttributes
 	dest := link.Destination
-	dest = r.addAbsPrefix(dest)
+	dest = AddAbsPrefix(dest, r.Opts.AbsolutePrefix)
 	var hrefBuf bytes.Buffer
 	hrefBuf.WriteString("href=\"")
-	escLink(&hrefBuf, dest)
+	EscLink(&hrefBuf, dest)
 	hrefBuf.WriteByte('"')
 	attrs = append(attrs, hrefBuf.String())
 	if link.NoteID != 0 {
-		r.Outs(w, footnoteRef(r.opts.FootnoteAnchorPrefix, link))
+		r.Outs(w, FootnoteRef(r.Opts.FootnoteAnchorPrefix, link))
 		return
 	}
 
-	attrs = appendLinkAttrs(attrs, r.opts.Flags, dest)
+	attrs = appendLinkAttrs(attrs, r.Opts.Flags, dest)
 	if len(link.Title) > 0 {
 		var titleBuff bytes.Buffer
 		titleBuff.WriteString("title=\"")
@@ -486,7 +488,7 @@ func (r *Renderer) linkEnter(w io.Writer, link *ast.Link) {
 		titleBuff.WriteByte('"')
 		attrs = append(attrs, titleBuff.String())
 	}
-	r.outTag(w, "<a", attrs)
+	r.OutTag(w, "<a", attrs)
 }
 
 func (r *Renderer) linkExit(w io.Writer, link *ast.Link) {
@@ -511,33 +513,34 @@ func (r *Renderer) Link(w io.Writer, link *ast.Link, entering bool) {
 }
 
 func (r *Renderer) imageEnter(w io.Writer, image *ast.Image) {
-	dest := image.Destination
-	dest = r.addAbsPrefix(dest)
-	if r.DisableTags == 0 {
-		//if options.safe && potentiallyUnsafe(dest) {
-		//out(w, `<img src="" alt="`)
-		//} else {
-		if r.opts.Flags&LazyLoadImages != 0 {
-			r.Outs(w, `<img loading="lazy" src="`)
-		} else {
-			r.Outs(w, `<img src="`)
-		}
-		escLink(w, dest)
-		r.Outs(w, `" alt="`)
-		//}
-	}
 	r.DisableTags++
+	if r.DisableTags > 1 {
+		return
+	}
+	src := image.Destination
+	src = AddAbsPrefix(src, r.Opts.AbsolutePrefix)
+	attrs := BlockAttrs(image)
+	if r.Opts.Flags&LazyLoadImages != 0 {
+		attrs = append(attrs, `loading="lazy"`)
+	}
+
+	s := TagWithAttributes("<img", attrs)
+	s = s[:len(s)-1] // hackish: strip off ">" from end
+	r.Outs(w, s+` src="`)
+	EscLink(w, src)
+	r.Outs(w, `" alt="`)
 }
 
 func (r *Renderer) imageExit(w io.Writer, image *ast.Image) {
 	r.DisableTags--
-	if r.DisableTags == 0 {
-		if image.Title != nil {
-			r.Outs(w, `" title="`)
-			EscapeHTML(w, image.Title)
-		}
-		r.Outs(w, `" />`)
+	if r.DisableTags > 0 {
+		return
 	}
+	if image.Title != nil {
+		r.Outs(w, `" title="`)
+		EscapeHTML(w, image.Title)
+	}
+	r.Outs(w, `" />`)
 }
 
 // Image writes ast.Image node
@@ -571,20 +574,28 @@ func (r *Renderer) paragraphEnter(w io.Writer, para *ast.Paragraph) {
 		}
 	}
 
-	tag := TagWithAttributes("<p", BlockAttrs(para))
+	ptag := "<p"
+	if r.Opts.ParagraphTag != "" {
+		ptag = "<" + r.Opts.ParagraphTag
+	}
+	tag := TagWithAttributes(ptag, BlockAttrs(para))
 	r.Outs(w, tag)
 }
 
 func (r *Renderer) paragraphExit(w io.Writer, para *ast.Paragraph) {
-	r.Outs(w, "</p>")
-	if !(isListItem(para.Parent) && ast.GetNextNode(para) == nil) {
+	ptag := "</p>"
+	if r.Opts.ParagraphTag != "" {
+		ptag = "</" + r.Opts.ParagraphTag + ">"
+	}
+	r.Outs(w, ptag)
+	if !(IsListItem(para.Parent) && ast.GetNextNode(para) == nil) {
 		r.CR(w)
 	}
 }
 
 // Paragraph writes ast.Paragraph node
 func (r *Renderer) Paragraph(w io.Writer, para *ast.Paragraph, entering bool) {
-	if skipParagraphTags(para) {
+	if SkipParagraphTags(para) {
 		return
 	}
 	if entering {
@@ -603,7 +614,7 @@ func (r *Renderer) Code(w io.Writer, node *ast.Code) {
 
 // HTMLBlock write ast.HTMLBlock node
 func (r *Renderer) HTMLBlock(w io.Writer, node *ast.HTMLBlock) {
-	if r.opts.Flags&SkipHTML != 0 {
+	if r.Opts.Flags&SkipHTML != 0 {
 		return
 	}
 	r.CR(w)
@@ -611,6 +622,25 @@ func (r *Renderer) HTMLBlock(w io.Writer, node *ast.HTMLBlock) {
 	r.CR(w)
 }
 
+func (r *Renderer) EnsureUniqueHeadingID(id string) string {
+	for count, found := r.headingIDs[id]; found; count, found = r.headingIDs[id] {
+		tmp := fmt.Sprintf("%s-%d", id, count+1)
+
+		if _, tmpFound := r.headingIDs[tmp]; !tmpFound {
+			r.headingIDs[id] = count + 1
+			id = tmp
+		} else {
+			id = id + "-1"
+		}
+	}
+
+	if _, found := r.headingIDs[id]; !found {
+		r.headingIDs[id] = 0
+	}
+
+	return id
+}
+
 func (r *Renderer) headingEnter(w io.Writer, nodeData *ast.Heading) {
 	var attrs []string
 	var class string
@@ -629,44 +659,25 @@ func (r *Renderer) headingEnter(w io.Writer, nodeData *ast.Heading) {
 		attrs = []string{`class="` + class + `"`}
 	}
 
-	ensureUniqueHeadingID := func(id string) string {
-		for count, found := r.headingIDs[id]; found; count, found = r.headingIDs[id] {
-			tmp := fmt.Sprintf("%s-%d", id, count+1)
-
-			if _, tmpFound := r.headingIDs[tmp]; !tmpFound {
-				r.headingIDs[id] = count + 1
-				id = tmp
-			} else {
-				id = id + "-1"
-			}
-		}
-
-		if _, found := r.headingIDs[id]; !found {
-			r.headingIDs[id] = 0
-		}
-
-		return id
-	}
-
 	if nodeData.HeadingID != "" {
-		id := ensureUniqueHeadingID(nodeData.HeadingID)
-		if r.opts.HeadingIDPrefix != "" {
-			id = r.opts.HeadingIDPrefix + id
+		id := r.EnsureUniqueHeadingID(nodeData.HeadingID)
+		if r.Opts.HeadingIDPrefix != "" {
+			id = r.Opts.HeadingIDPrefix + id
 		}
-		if r.opts.HeadingIDSuffix != "" {
-			id = id + r.opts.HeadingIDSuffix
+		if r.Opts.HeadingIDSuffix != "" {
+			id = id + r.Opts.HeadingIDSuffix
 		}
 		attrID := `id="` + id + `"`
 		attrs = append(attrs, attrID)
 	}
 	attrs = append(attrs, BlockAttrs(nodeData)...)
 	r.CR(w)
-	r.outTag(w, headingOpenTagFromLevel(nodeData.Level), attrs)
+	r.OutTag(w, HeadingOpenTagFromLevel(nodeData.Level), attrs)
 }
 
 func (r *Renderer) headingExit(w io.Writer, heading *ast.Heading) {
-	r.Outs(w, headingCloseTagFromLevel(heading.Level))
-	if !(isListItem(heading.Parent) && ast.GetNextNode(heading) == nil) {
+	r.Outs(w, HeadingCloseTagFromLevel(heading.Level))
+	if !(IsListItem(heading.Parent) && ast.GetNextNode(heading) == nil) {
 		r.CR(w)
 	}
 }
@@ -683,7 +694,7 @@ func (r *Renderer) Heading(w io.Writer, node *ast.Heading, entering bool) {
 // HorizontalRule writes ast.HorizontalRule node
 func (r *Renderer) HorizontalRule(w io.Writer, node *ast.HorizontalRule) {
 	r.CR(w)
-	r.outHRTag(w, BlockAttrs(node))
+	r.OutHRTag(w, BlockAttrs(node))
 	r.CR(w)
 }
 
@@ -693,15 +704,15 @@ func (r *Renderer) listEnter(w io.Writer, nodeData *ast.List) {
 
 	if nodeData.IsFootnotesList {
 		r.Outs(w, "\n<div class=\"footnotes\">\n\n")
-		if r.opts.Flags&FootnoteNoHRTag == 0 {
-			r.outHRTag(w, nil)
+		if r.Opts.Flags&FootnoteNoHRTag == 0 {
+			r.OutHRTag(w, nil)
 			r.CR(w)
 		}
 	}
 	r.CR(w)
-	if isListItem(nodeData.Parent) {
+	if IsListItem(nodeData.Parent) {
 		grand := nodeData.Parent.GetParent()
-		if isListTight(grand) {
+		if IsListTight(grand) {
 			r.CR(w)
 		}
 	}
@@ -717,7 +728,7 @@ func (r *Renderer) listEnter(w io.Writer, nodeData *ast.List) {
 		openTag = "<dl"
 	}
 	attrs = append(attrs, BlockAttrs(nodeData)...)
-	r.outTag(w, openTag, attrs)
+	r.OutTag(w, openTag, attrs)
 	r.CR(w)
 }
 
@@ -760,12 +771,12 @@ func (r *Renderer) List(w io.Writer, list *ast.List, entering bool) {
 }
 
 func (r *Renderer) listItemEnter(w io.Writer, listItem *ast.ListItem) {
-	if listItemOpenCR(listItem) {
+	if ListItemOpenCR(listItem) {
 		r.CR(w)
 	}
 	if listItem.RefLink != nil {
-		slug := slugify(listItem.RefLink)
-		r.Outs(w, footnoteItem(r.opts.FootnoteAnchorPrefix, slug))
+		slug := Slugify(listItem.RefLink)
+		r.Outs(w, FootnoteItem(r.Opts.FootnoteAnchorPrefix, slug))
 		return
 	}
 
@@ -780,11 +791,11 @@ func (r *Renderer) listItemEnter(w io.Writer, listItem *ast.ListItem) {
 }
 
 func (r *Renderer) listItemExit(w io.Writer, listItem *ast.ListItem) {
-	if listItem.RefLink != nil && r.opts.Flags&FootnoteReturnLinks != 0 {
-		slug := slugify(listItem.RefLink)
-		prefix := r.opts.FootnoteAnchorPrefix
-		link := r.opts.FootnoteReturnLinkContents
-		s := footnoteReturnLink(prefix, link, slug)
+	if listItem.RefLink != nil && r.Opts.Flags&FootnoteReturnLinks != 0 {
+		slug := Slugify(listItem.RefLink)
+		prefix := r.Opts.FootnoteAnchorPrefix
+		link := r.Opts.FootnoteReturnLinkContents
+		s := FootnoteReturnLink(prefix, link, slug)
 		r.Outs(w, s)
 	}
 
@@ -815,7 +826,7 @@ func (r *Renderer) EscapeHTMLCallouts(w io.Writer, d []byte) {
 	ld := len(d)
 Parse:
 	for i := 0; i < ld; i++ {
-		for _, comment := range r.opts.Comments {
+		for _, comment := range r.Opts.Comments {
 			if !bytes.HasPrefix(d[i:], comment) {
 				break
 			}
@@ -853,14 +864,14 @@ func (r *Renderer) CodeBlock(w io.Writer, codeBlock *ast.CodeBlock) {
 	r.Outs(w, "<pre>")
 	code := TagWithAttributes("<code", attrs)
 	r.Outs(w, code)
-	if r.opts.Comments != nil {
+	if r.Opts.Comments != nil {
 		r.EscapeHTMLCallouts(w, codeBlock.Literal)
 	} else {
 		EscapeHTML(w, codeBlock.Literal)
 	}
 	r.Outs(w, "</code>")
 	r.Outs(w, "</pre>")
-	if !isListItem(codeBlock.Parent) {
+	if !IsListItem(codeBlock.Parent) {
 		r.CR(w)
 	}
 }
@@ -910,7 +921,7 @@ func (r *Renderer) TableCell(w io.Writer, tableCell *ast.TableCell, entering boo
 	if ast.GetPrevNode(tableCell) == nil {
 		r.CR(w)
 	}
-	r.outTag(w, openTag, attrs)
+	r.OutTag(w, openTag, attrs)
 }
 
 // TableBody writes ast.TableBody node
@@ -959,8 +970,8 @@ func (r *Renderer) Citation(w io.Writer, node *ast.Citation) {
 		case ast.CitationTypeSuppressed:
 			attr[0] = `class="suppressed"`
 		}
-		r.outTag(w, "<cite", attr)
-		r.Outs(w, fmt.Sprintf(`<a href="#%s">`+r.opts.CitationFormatString+`</a>`, c, c))
+		r.OutTag(w, "<cite", attr)
+		r.Outs(w, fmt.Sprintf(`<a href="#%s">`+r.Opts.CitationFormatString+`</a>`, c, c))
 		r.Outs(w, "</cite>")
 	}
 }
@@ -968,7 +979,7 @@ func (r *Renderer) Citation(w io.Writer, node *ast.Citation) {
 // Callout writes ast.Callout node
 func (r *Renderer) Callout(w io.Writer, node *ast.Callout) {
 	attr := []string{`class="callout"`}
-	r.outTag(w, "<span", attr)
+	r.OutTag(w, "<span", attr)
 	r.Out(w, node.ID)
 	r.Outs(w, "</span>")
 }
@@ -977,14 +988,14 @@ func (r *Renderer) Callout(w io.Writer, node *ast.Callout) {
 func (r *Renderer) Index(w io.Writer, node *ast.Index) {
 	// there is no in-text representation.
 	attr := []string{`class="index"`, fmt.Sprintf(`id="%s"`, node.ID)}
-	r.outTag(w, "<span", attr)
+	r.OutTag(w, "<span", attr)
 	r.Outs(w, "</span>")
 }
 
 // RenderNode renders a markdown node to HTML
 func (r *Renderer) RenderNode(w io.Writer, node ast.Node, entering bool) ast.WalkStatus {
-	if r.opts.RenderNodeHook != nil {
-		status, didHandle := r.opts.RenderNodeHook(w, node, entering)
+	if r.Opts.RenderNodeHook != nil {
+		status, didHandle := r.Opts.RenderNodeHook(w, node, entering)
 		if didHandle {
 			return status
 		}
@@ -1019,7 +1030,7 @@ func (r *Renderer) RenderNode(w io.Writer, node ast.Node, entering bool) ast.Wal
 	case *ast.Citation:
 		r.Citation(w, node)
 	case *ast.Image:
-		if r.opts.Flags&SkipImages != 0 {
+		if r.Opts.Flags&SkipImages != 0 {
 			return ast.SkipChildren
 		}
 		r.Image(w, node, entering)
@@ -1098,7 +1109,7 @@ func (r *Renderer) RenderNode(w io.Writer, node ast.Node, entering bool) ast.Wal
 // RenderHeader writes HTML document preamble and TOC if requested.
 func (r *Renderer) RenderHeader(w io.Writer, ast ast.Node) {
 	r.writeDocumentHeader(w)
-	if r.opts.Flags&TOC != 0 {
+	if r.Opts.Flags&TOC != 0 {
 		r.writeTOC(w, ast)
 	}
 }
@@ -1109,18 +1120,18 @@ func (r *Renderer) RenderFooter(w io.Writer, _ ast.Node) {
 		r.Outs(w, "</section>\n")
 	}
 
-	if r.opts.Flags&CompletePage == 0 {
+	if r.Opts.Flags&CompletePage == 0 {
 		return
 	}
 	io.WriteString(w, "\n</body>\n</html>\n")
 }
 
 func (r *Renderer) writeDocumentHeader(w io.Writer) {
-	if r.opts.Flags&CompletePage == 0 {
+	if r.Opts.Flags&CompletePage == 0 {
 		return
 	}
 	ending := ""
-	if r.opts.Flags&UseXHTML != 0 {
+	if r.Opts.Flags&UseXHTML != 0 {
 		io.WriteString(w, "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" ")
 		io.WriteString(w, "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n")
 		io.WriteString(w, "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n")
@@ -1131,35 +1142,35 @@ func (r *Renderer) writeDocumentHeader(w io.Writer) {
 	}
 	io.WriteString(w, "<head>\n")
 	io.WriteString(w, "  <title>")
-	if r.opts.Flags&Smartypants != 0 {
-		r.sr.Process(w, []byte(r.opts.Title))
+	if r.Opts.Flags&Smartypants != 0 {
+		r.sr.Process(w, []byte(r.Opts.Title))
 	} else {
-		EscapeHTML(w, []byte(r.opts.Title))
+		EscapeHTML(w, []byte(r.Opts.Title))
 	}
 	io.WriteString(w, "</title>\n")
-	io.WriteString(w, r.opts.Generator)
+	io.WriteString(w, r.Opts.Generator)
 	io.WriteString(w, "\"")
 	io.WriteString(w, ending)
 	io.WriteString(w, ">\n")
 	io.WriteString(w, "  <meta charset=\"utf-8\"")
 	io.WriteString(w, ending)
 	io.WriteString(w, ">\n")
-	if r.opts.CSS != "" {
+	if r.Opts.CSS != "" {
 		io.WriteString(w, "  <link rel=\"stylesheet\" type=\"text/css\" href=\"")
-		EscapeHTML(w, []byte(r.opts.CSS))
+		EscapeHTML(w, []byte(r.Opts.CSS))
 		io.WriteString(w, "\"")
 		io.WriteString(w, ending)
 		io.WriteString(w, ">\n")
 	}
-	if r.opts.Icon != "" {
+	if r.Opts.Icon != "" {
 		io.WriteString(w, "  <link rel=\"icon\" type=\"image/x-icon\" href=\"")
-		EscapeHTML(w, []byte(r.opts.Icon))
+		EscapeHTML(w, []byte(r.Opts.Icon))
 		io.WriteString(w, "\"")
 		io.WriteString(w, ending)
 		io.WriteString(w, ">\n")
 	}
-	if r.opts.Head != nil {
-		w.Write(r.opts.Head)
+	if r.Opts.Head != nil {
+		w.Write(r.Opts.Head)
 	}
 	io.WriteString(w, "</head>\n")
 	io.WriteString(w, "<body>\n\n")
@@ -1221,31 +1232,31 @@ func (r *Renderer) writeTOC(w io.Writer, doc ast.Node) {
 	r.lastOutputLen = buf.Len()
 }
 
-func isList(node ast.Node) bool {
+func IsList(node ast.Node) bool {
 	_, ok := node.(*ast.List)
 	return ok
 }
 
-func isListTight(node ast.Node) bool {
+func IsListTight(node ast.Node) bool {
 	if list, ok := node.(*ast.List); ok {
 		return list.Tight
 	}
 	return false
 }
 
-func isListItem(node ast.Node) bool {
+func IsListItem(node ast.Node) bool {
 	_, ok := node.(*ast.ListItem)
 	return ok
 }
 
-func isListItemTerm(node ast.Node) bool {
+func IsListItemTerm(node ast.Node) bool {
 	data, ok := node.(*ast.ListItem)
 	return ok && data.ListFlags&ast.ListTypeTerm != 0
 }
 
 // TODO: move to internal package
 // Create a url-safe slug for fragments
-func slugify(in []byte) []byte {
+func Slugify(in []byte) []byte {
 	if len(in) == 0 {
 		return in
 	}
diff --git a/vendor/github.com/gomarkdown/markdown/markdown.go b/vendor/github.com/gomarkdown/markdown/markdown.go
index 537eb27b..2fb73c1e 100644
--- a/vendor/github.com/gomarkdown/markdown/markdown.go
+++ b/vendor/github.com/gomarkdown/markdown/markdown.go
@@ -84,28 +84,7 @@ func ToHTML(markdown []byte, p *parser.Parser, renderer Renderer) []byte {
 	return Render(doc, renderer)
 }
 
-// NormalizeNewlines converts Windows and Mac newlines to Unix newlines
-// The parser only supports Unix newlines. If your mardown content
+// NormalizeNewlines converts Windows and Mac newlines to Unix newlines.
+// The parser only supports Unix newlines. If your markdown content
 // might contain Windows or Mac newlines, use this function to convert to Unix newlines
-func NormalizeNewlines(d []byte) []byte {
-	wi := 0
-	n := len(d)
-	for i := 0; i < n; i++ {
-		c := d[i]
-		// 13 is CR
-		if c != 13 {
-			d[wi] = c
-			wi++
-			continue
-		}
-		// replace CR (mac / win) with LF (unix)
-		d[wi] = 10
-		wi++
-		if i < n-1 && d[i+1] == 10 {
-			// this was CRLF, so skip the LF
-			i++
-		}
-
-	}
-	return d[:wi]
-}
+var NormalizeNewlines = parser.NormalizeNewlines
diff --git a/vendor/github.com/gomarkdown/markdown/parser/aside.go b/vendor/github.com/gomarkdown/markdown/parser/aside.go
index 96e25fe0..9d02ed04 100644
--- a/vendor/github.com/gomarkdown/markdown/parser/aside.go
+++ b/vendor/github.com/gomarkdown/markdown/parser/aside.go
@@ -25,13 +25,13 @@ func (p *Parser) asidePrefix(data []byte) int {
 // aside ends with at least one blank line
 // followed by something without a aside prefix
 func (p *Parser) terminateAside(data []byte, beg, end int) bool {
-	if p.isEmpty(data[beg:]) <= 0 {
+	if IsEmpty(data[beg:]) <= 0 {
 		return false
 	}
 	if end >= len(data) {
 		return true
 	}
-	return p.asidePrefix(data[end:]) == 0 && p.isEmpty(data[end:]) == 0
+	return p.asidePrefix(data[end:]) == 0 && IsEmpty(data[end:]) == 0
 }
 
 // parse a aside fragment
@@ -66,8 +66,8 @@ func (p *Parser) aside(data []byte) int {
 		beg = end
 	}
 
-	block := p.addBlock(&ast.Aside{})
-	p.block(raw.Bytes())
-	p.finalize(block)
+	block := p.AddBlock(&ast.Aside{})
+	p.Block(raw.Bytes())
+	p.Finalize(block)
 	return end
 }
diff --git a/vendor/github.com/gomarkdown/markdown/parser/block.go b/vendor/github.com/gomarkdown/markdown/parser/block.go
index 490871c7..028ae758 100644
--- a/vendor/github.com/gomarkdown/markdown/parser/block.go
+++ b/vendor/github.com/gomarkdown/markdown/parser/block.go
@@ -103,10 +103,10 @@ func sanitizeHeadingID(text string) string {
 	return string(anchorName)
 }
 
-// Parse block-level data.
+// Parse Block-level data.
 // Note: this function and many that it calls assume that
 // the input buffer ends with a newline.
-func (p *Parser) block(data []byte) {
+func (p *Parser) Block(data []byte) {
 	// this is called recursively: enforce a maximum depth
 	if p.nesting >= p.maxNesting {
 		return
@@ -142,7 +142,7 @@ func (p *Parser) block(data []byte) {
 					}
 				}
 				p.includeStack.Push(path)
-				p.block(included)
+				p.Block(included)
 				p.includeStack.Pop()
 				data = data[consumed:]
 				continue
@@ -156,10 +156,10 @@ func (p *Parser) block(data []byte) {
 				data = data[consumed:]
 
 				if node != nil {
-					p.addBlock(node)
+					p.AddBlock(node)
 					if blockdata != nil {
-						p.block(blockdata)
-						p.finalize(node)
+						p.Block(blockdata)
+						p.Finalize(node)
 					}
 				}
 				continue
@@ -213,7 +213,7 @@ func (p *Parser) block(data []byte) {
 		}
 
 		// blank lines.  note: returns the # of bytes to skip
-		if i := p.isEmpty(data); i > 0 {
+		if i := IsEmpty(data); i > 0 {
 			data = data[i:]
 			continue
 		}
@@ -255,11 +255,11 @@ func (p *Parser) block(data []byte) {
 		// ******
 		// or
 		// ______
-		if p.isHRule(data) {
+		if isHRule(data) {
 			i := skipUntilChar(data, 0, '\n')
 			hr := ast.HorizontalRule{}
 			hr.Literal = bytes.Trim(data[:i], " \n")
-			p.addBlock(&hr)
+			p.AddBlock(&hr)
 			data = data[i:]
 			continue
 		}
@@ -377,7 +377,7 @@ func (p *Parser) block(data []byte) {
 	p.nesting--
 }
 
-func (p *Parser) addBlock(n ast.Node) ast.Node {
+func (p *Parser) AddBlock(n ast.Node) ast.Node {
 	p.closeUnmatchedBlocks()
 
 	if p.attr != nil {
@@ -448,7 +448,7 @@ func (p *Parser) prefixHeading(data []byte) int {
 			p.allHeadingsWithAutoID = append(p.allHeadingsWithAutoID, block)
 		}
 		block.Content = data[i:end]
-		p.addBlock(block)
+		p.AddBlock(block)
 	}
 	return skip
 }
@@ -521,7 +521,7 @@ func (p *Parser) prefixSpecialHeading(data []byte) int {
 		}
 		block.Literal = data[i:end]
 		block.Content = data[i:end]
-		p.addBlock(block)
+		p.AddBlock(block)
 	}
 	return skip
 }
@@ -572,7 +572,7 @@ func (p *Parser) titleBlock(data []byte, doRender bool) int {
 		IsTitleblock: true,
 	}
 	block.Content = data
-	p.addBlock(block)
+	p.AddBlock(block)
 
 	return consumed
 }
@@ -617,14 +617,14 @@ func (p *Parser) html(data []byte, doRender bool) int {
 			}
 
 			// see if it is the only thing on the line
-			if skip := p.isEmpty(data[j:]); skip > 0 {
+			if skip := IsEmpty(data[j:]); skip > 0 {
 				// see if it is followed by a blank line/eof
 				j += skip
 				if j >= len(data) {
 					found = true
 					i = j
 				} else {
-					if skip := p.isEmpty(data[j:]); skip > 0 {
+					if skip := IsEmpty(data[j:]); skip > 0 {
 						j += skip
 						found = true
 						i = j
@@ -667,7 +667,7 @@ func (p *Parser) html(data []byte, doRender bool) int {
 		// trim newlines
 		end := backChar(data, i, '\n')
 		htmlBLock := &ast.HTMLBlock{Leaf: ast.Leaf{Content: data[:end]}}
-		p.addBlock(htmlBLock)
+		p.AddBlock(htmlBLock)
 		finalizeHTMLBlock(htmlBLock)
 	}
 
@@ -683,13 +683,13 @@ func finalizeHTMLBlock(block *ast.HTMLBlock) {
 func (p *Parser) htmlComment(data []byte, doRender bool) int {
 	i := p.inlineHTMLComment(data)
 	// needs to end with a blank line
-	if j := p.isEmpty(data[i:]); j > 0 {
+	if j := IsEmpty(data[i:]); j > 0 {
 		size := i + j
 		if doRender {
 			// trim trailing newlines
 			end := backChar(data, size, '\n')
 			htmlBLock := &ast.HTMLBlock{Leaf: ast.Leaf{Content: data[:end]}}
-			p.addBlock(htmlBLock)
+			p.AddBlock(htmlBLock)
 			finalizeHTMLBlock(htmlBLock)
 		}
 		return size
@@ -715,13 +715,13 @@ func (p *Parser) htmlHr(data []byte, doRender bool) int {
 	}
 	if i < len(data) && data[i] == '>' {
 		i++
-		if j := p.isEmpty(data[i:]); j > 0 {
+		if j := IsEmpty(data[i:]); j > 0 {
 			size := i + j
 			if doRender {
 				// trim newlines
 				end := backChar(data, size, '\n')
 				htmlBlock := &ast.HTMLBlock{Leaf: ast.Leaf{Content: data[:end]}}
-				p.addBlock(htmlBlock)
+				p.AddBlock(htmlBlock)
 				finalizeHTMLBlock(htmlBlock)
 			}
 			return size
@@ -753,7 +753,7 @@ func (p *Parser) htmlFindEnd(tag string, data []byte) int {
 
 	// check that the rest of the line is blank
 	skip := 0
-	if skip = p.isEmpty(data[i:]); skip == 0 {
+	if skip = IsEmpty(data[i:]); skip == 0 {
 		return 0
 	}
 	i += skip
@@ -766,7 +766,7 @@ func (p *Parser) htmlFindEnd(tag string, data []byte) int {
 	if p.extensions&LaxHTMLBlocks != 0 {
 		return i
 	}
-	if skip = p.isEmpty(data[i:]); skip == 0 {
+	if skip = IsEmpty(data[i:]); skip == 0 {
 		// following line must be blank
 		return 0
 	}
@@ -774,7 +774,7 @@ func (p *Parser) htmlFindEnd(tag string, data []byte) int {
 	return i + skip
 }
 
-func (*Parser) isEmpty(data []byte) int {
+func IsEmpty(data []byte) int {
 	// it is okay to call isEmpty on an empty buffer
 	if len(data) == 0 {
 		return 0
@@ -790,7 +790,7 @@ func (*Parser) isEmpty(data []byte) int {
 	return i
 }
 
-func (*Parser) isHRule(data []byte) bool {
+func isHRule(data []byte) bool {
 	i := 0
 
 	// skip up to three spaces
@@ -976,7 +976,7 @@ func (p *Parser) fencedCodeBlock(data []byte, doRender bool) int {
 		codeBlock.Content = work.Bytes() // TODO: get rid of temp buffer
 
 		if p.extensions&Mmark == 0 {
-			p.addBlock(codeBlock)
+			p.AddBlock(codeBlock)
 			finalizeCodeBlock(codeBlock)
 			return beg
 		}
@@ -988,12 +988,12 @@ func (p *Parser) fencedCodeBlock(data []byte, doRender bool) int {
 			figure.HeadingID = id
 			p.Inline(caption, captionContent)
 
-			p.addBlock(figure)
+			p.AddBlock(figure)
 			codeBlock.AsLeaf().Attribute = figure.AsContainer().Attribute
 			p.addChild(codeBlock)
 			finalizeCodeBlock(codeBlock)
 			p.addChild(caption)
-			p.finalize(figure)
+			p.Finalize(figure)
 
 			beg += consumed
 
@@ -1001,7 +1001,7 @@ func (p *Parser) fencedCodeBlock(data []byte, doRender bool) int {
 		}
 
 		// Still here, normal block
-		p.addBlock(codeBlock)
+		p.AddBlock(codeBlock)
 		finalizeCodeBlock(codeBlock)
 	}
 
@@ -1055,13 +1055,13 @@ func (p *Parser) quotePrefix(data []byte) int {
 // blockquote ends with at least one blank line
 // followed by something without a blockquote prefix
 func (p *Parser) terminateBlockquote(data []byte, beg, end int) bool {
-	if p.isEmpty(data[beg:]) <= 0 {
+	if IsEmpty(data[beg:]) <= 0 {
 		return false
 	}
 	if end >= len(data) {
 		return true
 	}
-	return p.quotePrefix(data[end:]) == 0 && p.isEmpty(data[end:]) == 0
+	return p.quotePrefix(data[end:]) == 0 && IsEmpty(data[end:]) == 0
 }
 
 // parse a blockquote fragment
@@ -1096,9 +1096,9 @@ func (p *Parser) quote(data []byte) int {
 	}
 
 	if p.extensions&Mmark == 0 {
-		block := p.addBlock(&ast.BlockQuote{})
-		p.block(raw.Bytes())
-		p.finalize(block)
+		block := p.AddBlock(&ast.BlockQuote{})
+		p.Block(raw.Bytes())
+		p.Finalize(block)
 		return end
 	}
 
@@ -1108,24 +1108,24 @@ func (p *Parser) quote(data []byte) int {
 		figure.HeadingID = id
 		p.Inline(caption, captionContent)
 
-		p.addBlock(figure) // this discard any attributes
+		p.AddBlock(figure) // this discard any attributes
 		block := &ast.BlockQuote{}
 		block.AsContainer().Attribute = figure.AsContainer().Attribute
 		p.addChild(block)
-		p.block(raw.Bytes())
-		p.finalize(block)
+		p.Block(raw.Bytes())
+		p.Finalize(block)
 
 		p.addChild(caption)
-		p.finalize(figure)
+		p.Finalize(figure)
 
 		end += consumed
 
 		return end
 	}
 
-	block := p.addBlock(&ast.BlockQuote{})
-	p.block(raw.Bytes())
-	p.finalize(block)
+	block := p.AddBlock(&ast.BlockQuote{})
+	p.Block(raw.Bytes())
+	p.Finalize(block)
 
 	return end
 }
@@ -1152,7 +1152,7 @@ func (p *Parser) code(data []byte) int {
 		i = skipUntilChar(data, i, '\n')
 		i = skipCharN(data, i, '\n', 1)
 
-		blankline := p.isEmpty(data[beg:i]) > 0
+		blankline := IsEmpty(data[beg:i]) > 0
 		if pre := p.codePrefix(data[beg:i]); pre > 0 {
 			beg += pre
 		} else if !blankline {
@@ -1185,7 +1185,7 @@ func (p *Parser) code(data []byte) int {
 	}
 	// TODO: get rid of temp buffer
 	codeBlock.Content = work.Bytes()
-	p.addBlock(codeBlock)
+	p.AddBlock(codeBlock)
 	finalizeCodeBlock(codeBlock)
 
 	return i
@@ -1237,10 +1237,29 @@ func (p *Parser) dliPrefix(data []byte) int {
 	if data[0] != ':' || !(data[1] == ' ' || data[1] == '\t') {
 		return 0
 	}
+	// TODO: this is a no-op (data[0] is ':' so not ' ').
+	// Maybe the intent was to eat spaces before ':' ?
+	// either way, no change in tests
 	i := skipChar(data, 0, ' ')
 	return i + 2
 }
 
+// TODO: maybe it was meant to be like below
+// either way, no change in tests
+/*
+func (p *Parser) dliPrefix(data []byte) int {
+	i := skipChar(data, 0, ' ')
+	if i+len(data) < 2 {
+		return 0
+	}
+	// need a ':' followed by a space or a tab
+	if data[i] != ':' || !(data[i+1] == ' ' || data[i+1] == '\t') {
+		return 0
+	}
+	return i + 2
+}
+*/
+
 // parse ordered or unordered list block
 func (p *Parser) list(data []byte, flags ast.ListType, start int, delim byte) int {
 	i := 0
@@ -1251,7 +1270,7 @@ func (p *Parser) list(data []byte, flags ast.ListType, start int, delim byte) in
 		Start:     start,
 		Delimiter: delim,
 	}
-	block := p.addBlock(list)
+	block := p.AddBlock(list)
 
 	for i < len(data) {
 		skip := p.listItem(data[i:], &flags)
@@ -1398,7 +1417,7 @@ gatherlines:
 
 		// if it is an empty line, guess that it is part of this item
 		// and move on to the next line
-		if p.isEmpty(data[line:i]) > 0 {
+		if IsEmpty(data[line:i]) > 0 {
 			containsBlankLine = true
 			line = i
 			continue
@@ -1432,7 +1451,7 @@ gatherlines:
 		// evaluate how this line fits in
 		switch {
 		// is this a nested list item?
-		case (p.uliPrefix(chunk) > 0 && !p.isHRule(chunk)) || p.oliPrefix(chunk) > 0 || p.dliPrefix(chunk) > 0:
+		case (p.uliPrefix(chunk) > 0 && !isHRule(chunk)) || p.oliPrefix(chunk) > 0 || p.dliPrefix(chunk) > 0:
 
 			// if indent is 4 or more spaces on unordered or ordered lists
 			// we need to add leadingWhiteSpaces + 1 spaces in the beginning of the chunk
@@ -1484,10 +1503,7 @@ gatherlines:
 		case containsBlankLine && indent < 4:
 			if *flags&ast.ListTypeDefinition != 0 && i < len(data)-1 {
 				// is the next item still a part of this list?
-				next := i
-				for next < len(data) && data[next] != '\n' {
-					next++
-				}
+				next := skipUntilChar(data, i, '\n')
 				for next < len(data)-1 && data[next] == '\n' {
 					next++
 				}
@@ -1526,16 +1542,16 @@ gatherlines:
 		BulletChar: bulletChar,
 		Delimiter:  delimiter,
 	}
-	p.addBlock(listItem)
+	p.AddBlock(listItem)
 
 	// render the contents of the list item
 	if *flags&ast.ListItemContainsBlock != 0 && *flags&ast.ListTypeTerm == 0 {
 		// intermediate render of block item, except for definition term
 		if sublist > 0 {
-			p.block(rawBytes[:sublist])
-			p.block(rawBytes[sublist:])
+			p.Block(rawBytes[:sublist])
+			p.Block(rawBytes[sublist:])
 		} else {
-			p.block(rawBytes)
+			p.Block(rawBytes)
 		}
 	} else {
 		// intermediate render of inline item
@@ -1547,7 +1563,7 @@ gatherlines:
 		}
 		p.addChild(para)
 		if sublist > 0 {
-			p.block(rawBytes[sublist:])
+			p.Block(rawBytes[sublist:])
 		}
 	}
 	return line
@@ -1574,7 +1590,7 @@ func (p *Parser) renderParagraph(data []byte) {
 	}
 	para := &ast.Paragraph{}
 	para.Content = data[beg:end]
-	p.addBlock(para)
+	p.AddBlock(para)
 }
 
 // blockMath handle block surround with $$
@@ -1596,7 +1612,7 @@ func (p *Parser) blockMath(data []byte) int {
 	// render the display math
 	mathBlock := &ast.MathBlock{}
 	mathBlock.Literal = data[2:end]
-	p.addBlock(mathBlock)
+	p.AddBlock(mathBlock)
 
 	return end + 2
 }
@@ -1626,7 +1642,7 @@ func (p *Parser) paragraph(data []byte) int {
 		}
 
 		// did we find a blank line marking the end of the paragraph?
-		if n := p.isEmpty(current); n > 0 {
+		if n := IsEmpty(current); n > 0 {
 			// did this blank line followed by a definition list item?
 			if p.extensions&DefinitionLists != 0 {
 				if i < len(data)-1 && data[i+1] == ':' {
@@ -1663,7 +1679,7 @@ func (p *Parser) paragraph(data []byte) int {
 				}
 
 				block.Content = data[prev:eol]
-				p.addBlock(block)
+				p.AddBlock(block)
 
 				// find the end of the underline
 				return skipUntilChar(data, i, '\n')
@@ -1680,7 +1696,7 @@ func (p *Parser) paragraph(data []byte) int {
 		}
 
 		// if there's a prefixed heading or a horizontal rule after this, paragraph is over
-		if p.isPrefixHeading(current) || p.isPrefixSpecialHeading(current) || p.isHRule(current) {
+		if p.isPrefixHeading(current) || p.isPrefixSpecialHeading(current) || isHRule(current) {
 			p.renderParagraph(data[:i])
 			return i
 		}
diff --git a/vendor/github.com/gomarkdown/markdown/parser/block_table.go b/vendor/github.com/gomarkdown/markdown/parser/block_table.go
index 0bf4f4ad..fa8efdf2 100644
--- a/vendor/github.com/gomarkdown/markdown/parser/block_table.go
+++ b/vendor/github.com/gomarkdown/markdown/parser/block_table.go
@@ -12,7 +12,7 @@ func isBackslashEscaped(data []byte, i int) bool {
 }
 
 func (p *Parser) tableRow(data []byte, columns []ast.CellAlignFlags, header bool) {
-	p.addBlock(&ast.TableRow{})
+	p.AddBlock(&ast.TableRow{})
 	col := 0
 
 	i := skipChar(data, 0, '|')
@@ -61,7 +61,7 @@ func (p *Parser) tableRow(data []byte, columns []ast.CellAlignFlags, header bool
 			// an empty cell that we should ignore, it exists because of colspan
 			colspans--
 		} else {
-			p.addBlock(block)
+			p.AddBlock(block)
 		}
 
 		if colspan > 0 {
@@ -75,7 +75,7 @@ func (p *Parser) tableRow(data []byte, columns []ast.CellAlignFlags, header bool
 			IsHeader: header,
 			Align:    columns[col],
 		}
-		p.addBlock(block)
+		p.AddBlock(block)
 	}
 
 	// silently ignore rows with too many cells
@@ -109,7 +109,7 @@ func (p *Parser) tableFooter(data []byte) bool {
 		return false
 	}
 
-	p.addBlock(&ast.TableFooter{})
+	p.AddBlock(&ast.TableFooter{})
 
 	return true
 }
@@ -217,7 +217,7 @@ func (p *Parser) tableHeader(data []byte, doRender bool) (size int, columns []as
 		}
 		// end of column test is messy
 		switch {
-		case dashes < 3:
+		case dashes < 1:
 			// not a valid column
 			return
 
@@ -253,9 +253,9 @@ func (p *Parser) tableHeader(data []byte, doRender bool) (size int, columns []as
 
 	if doRender {
 		table = &ast.Table{}
-		p.addBlock(table)
+		p.AddBlock(table)
 		if header != nil {
-			p.addBlock(&ast.TableHeader{})
+			p.AddBlock(&ast.TableHeader{})
 			p.tableRow(header, columns, true)
 		}
 	}
@@ -277,7 +277,7 @@ func (p *Parser) table(data []byte) int {
 		return 0
 	}
 
-	p.addBlock(&ast.TableBody{})
+	p.AddBlock(&ast.TableBody{})
 
 	for i < len(data) {
 		pipes, rowStart := 0, i
@@ -319,7 +319,7 @@ func (p *Parser) table(data []byte) int {
 		ast.AppendChild(figure, caption)
 
 		p.addChild(figure)
-		p.finalize(figure)
+		p.Finalize(figure)
 
 		i += consumed
 	}
diff --git a/vendor/github.com/gomarkdown/markdown/parser/caption.go b/vendor/github.com/gomarkdown/markdown/parser/caption.go
index fe31711a..08794504 100644
--- a/vendor/github.com/gomarkdown/markdown/parser/caption.go
+++ b/vendor/github.com/gomarkdown/markdown/parser/caption.go
@@ -11,7 +11,7 @@ func (p *Parser) caption(data, caption []byte) ([]byte, string, int) {
 	}
 	j := len(caption)
 	data = data[j:]
-	end := p.linesUntilEmpty(data)
+	end := LinesUntilEmpty(data)
 
 	data = data[:end]
 
@@ -23,8 +23,8 @@ func (p *Parser) caption(data, caption []byte) ([]byte, string, int) {
 	return data, "", end + j
 }
 
-// linesUntilEmpty scans lines up to the first empty line.
-func (p *Parser) linesUntilEmpty(data []byte) int {
+// LinesUntilEmpty scans lines up to the first empty line.
+func LinesUntilEmpty(data []byte) int {
 	line, i := 0, 0
 
 	for line < len(data) {
@@ -35,7 +35,7 @@ func (p *Parser) linesUntilEmpty(data []byte) int {
 			i++
 		}
 
-		if p.isEmpty(data[line:i]) == 0 {
+		if IsEmpty(data[line:i]) == 0 {
 			line = i
 			continue
 		}
diff --git a/vendor/github.com/gomarkdown/markdown/parser/figures.go b/vendor/github.com/gomarkdown/markdown/parser/figures.go
index 6615449c..0566c16e 100644
--- a/vendor/github.com/gomarkdown/markdown/parser/figures.go
+++ b/vendor/github.com/gomarkdown/markdown/parser/figures.go
@@ -98,10 +98,10 @@ func (p *Parser) figureBlock(data []byte, doRender bool) int {
 	}
 
 	figure := &ast.CaptionFigure{}
-	p.addBlock(figure)
-	p.block(raw.Bytes())
+	p.AddBlock(figure)
+	p.Block(raw.Bytes())
 
-	defer p.finalize(figure)
+	defer p.Finalize(figure)
 
 	if captionContent, id, consumed := p.caption(data[beg:], []byte("Figure: ")); consumed > 0 {
 		caption := &ast.Caption{}
@@ -113,7 +113,5 @@ func (p *Parser) figureBlock(data []byte, doRender bool) int {
 
 		beg += consumed
 	}
-
-	p.finalize(figure)
 	return beg
 }
diff --git a/vendor/github.com/gomarkdown/markdown/parser/matter.go b/vendor/github.com/gomarkdown/markdown/parser/matter.go
index 92686357..df284237 100644
--- a/vendor/github.com/gomarkdown/markdown/parser/matter.go
+++ b/vendor/github.com/gomarkdown/markdown/parser/matter.go
@@ -29,8 +29,8 @@ func (p *Parser) documentMatter(data []byte) int {
 		return 0
 	}
 	node := &ast.DocumentMatter{Matter: matter}
-	p.addBlock(node)
-	p.finalize(node)
+	p.AddBlock(node)
+	p.Finalize(node)
 
 	return consumed
 }
diff --git a/vendor/github.com/gomarkdown/markdown/parser/parser.go b/vendor/github.com/gomarkdown/markdown/parser/parser.go
index 07444cd8..91123e1b 100644
--- a/vendor/github.com/gomarkdown/markdown/parser/parser.go
+++ b/vendor/github.com/gomarkdown/markdown/parser/parser.go
@@ -42,7 +42,7 @@ const (
 	SuperSubscript                                // Super- and subscript support: 2^10^, H~2~O.
 	EmptyLinesBreakList                           // 2 empty lines break out of list
 	Includes                                      // Support including other files.
-	Mmark                                         // Support Mmark syntax, see https://mmark.nl/syntax
+	Mmark                                         // Support Mmark syntax, see https://mmark.miek.nl/post/syntax/
 
 	CommonExtensions Extensions = NoIntraEmphasis | Tables | FencedCode |
 		Autolink | Strikethrough | SpaceHeadings | HeadingIDs |
@@ -206,13 +206,13 @@ func (p *Parser) isFootnote(ref *reference) bool {
 	return ok
 }
 
-func (p *Parser) finalize(block ast.Node) {
+func (p *Parser) Finalize(block ast.Node) {
 	p.tip = block.GetParent()
 }
 
 func (p *Parser) addChild(node ast.Node) ast.Node {
 	for !canNodeContain(p.tip, node) {
-		p.finalize(p.tip)
+		p.Finalize(p.tip)
 	}
 	ast.AppendChild(p.tip, node)
 	p.tip = node
@@ -239,6 +239,18 @@ func canNodeContain(n ast.Node, v ast.Node) bool {
 		_, ok := v.(*ast.TableCell)
 		return ok
 	}
+	// for nodes implemented outside of ast package, allow them
+	// to implement this logic via CanContain interface
+	if o, ok := n.(ast.CanContain); ok {
+		return o.CanContain(v)
+	}
+	// for container nodes outside of ast package default to true
+	// because false is a bad default
+	typ := fmt.Sprintf("%T", n)
+	customNode := !strings.HasPrefix(typ, "*ast.")
+	if customNode {
+		return n.AsLeaf() == nil
+	}
 	return false
 }
 
@@ -248,7 +260,7 @@ func (p *Parser) closeUnmatchedBlocks() {
 	}
 	for p.oldTip != p.lastMatchedContainer {
 		parent := p.oldTip.GetParent()
-		p.finalize(p.oldTip)
+		p.Finalize(p.oldTip)
 		p.oldTip = parent
 	}
 	p.allClosed = true
@@ -273,10 +285,14 @@ type Reference struct {
 // You can then convert AST to html using html.Renderer, to some other format
 // using a custom renderer or transform the tree.
 func (p *Parser) Parse(input []byte) ast.Node {
-	p.block(input)
+	// the code only works with Unix CR newlines so to make life easy for
+	// callers normalize newlines
+	input = NormalizeNewlines(input)
+
+	p.Block(input)
 	// Walk the tree and finish up some of unfinished blocks
 	for p.tip != nil {
-		p.finalize(p.tip)
+		p.Finalize(p.tip)
 	}
 	// Walk the tree again and process inline markdown in each block
 	ast.WalkFunc(p.Doc, func(node ast.Node, entering bool) ast.WalkStatus {
@@ -322,8 +338,8 @@ func (p *Parser) parseRefsToAST() {
 		IsFootnotesList: true,
 		ListFlags:       ast.ListTypeOrdered,
 	}
-	p.addBlock(&ast.Footnotes{})
-	block := p.addBlock(list)
+	p.AddBlock(&ast.Footnotes{})
+	block := p.AddBlock(list)
 	flags := ast.ListItemBeginningOfList
 	// Note: this loop is intentionally explicit, not range-form. This is
 	// because the body of the loop will append nested footnotes to p.notes and
@@ -338,7 +354,7 @@ func (p *Parser) parseRefsToAST() {
 		listItem.RefLink = ref.link
 		if ref.hasBlock {
 			flags |= ast.ListItemContainsBlock
-			p.block(ref.title)
+			p.Block(ref.title)
 		} else {
 			p.Inline(block, ref.title)
 		}
@@ -660,7 +676,7 @@ gatherLines:
 
 		// if it is an empty line, guess that it is part of this item
 		// and move on to the next line
-		if p.isEmpty(data[blockEnd:i]) > 0 {
+		if IsEmpty(data[blockEnd:i]) > 0 {
 			containsBlankLine = true
 			blockEnd = i
 			continue
@@ -883,3 +899,26 @@ func isListItem(d ast.Node) bool {
 	_, ok := d.(*ast.ListItem)
 	return ok
 }
+
+func NormalizeNewlines(d []byte) []byte {
+	wi := 0
+	n := len(d)
+	for i := 0; i < n; i++ {
+		c := d[i]
+		// 13 is CR
+		if c != 13 {
+			d[wi] = c
+			wi++
+			continue
+		}
+		// replace CR (mac / win) with LF (unix)
+		d[wi] = 10
+		wi++
+		if i < n-1 && d[i+1] == 10 {
+			// this was CRLF, so skip the LF
+			i++
+		}
+
+	}
+	return d[:wi]
+}
diff --git a/vendor/github.com/gomarkdown/markdown/todo.md b/vendor/github.com/gomarkdown/markdown/todo.md
deleted file mode 100644
index be8bb55c..00000000
--- a/vendor/github.com/gomarkdown/markdown/todo.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Things to do
-
-[ ] docs: add examples like https://godoc.org/github.com/dgrijalva/jwt-go (put in foo_example_test.go). Or see https://github.com/garyburd/redigo/blob/master/redis/zpop_example_test.go#L5 / https://godoc.org/github.com/garyburd/redigo/redis or https://godoc.org/github.com/go-redis/redis
-
-[ ] figure out expandTabs and parser.TabSizeEight. Are those used?
-
-[ ] SoftbreakData is not used
diff --git a/vendor/github.com/hashicorp/errwrap/LICENSE b/vendor/github.com/hashicorp/errwrap/LICENSE
deleted file mode 100644
index c33dcc7c..00000000
--- a/vendor/github.com/hashicorp/errwrap/LICENSE
+++ /dev/null
@@ -1,354 +0,0 @@
-Mozilla Public License, version 2.0
-
-1. Definitions
-
-1.1. “Contributor”
-
-     means each individual or legal entity that creates, contributes to the
-     creation of, or owns Covered Software.
-
-1.2. “Contributor Version”
-
-     means the combination of the Contributions of others (if any) used by a
-     Contributor and that particular Contributor’s Contribution.
-
-1.3. “Contribution”
-
-     means Covered Software of a particular Contributor.
-
-1.4. “Covered Software”
-
-     means Source Code Form to which the initial Contributor has attached the
-     notice in Exhibit A, the Executable Form of such Source Code Form, and
-     Modifications of such Source Code Form, in each case including portions
-     thereof.
-
-1.5. “Incompatible With Secondary Licenses”
-     means
-
-     a. that the initial Contributor has attached the notice described in
-        Exhibit B to the Covered Software; or
-
-     b. that the Covered Software was made available under the terms of version
-        1.1 or earlier of the License, but not also under the terms of a
-        Secondary License.
-
-1.6. “Executable Form”
-
-     means any form of the work other than Source Code Form.
-
-1.7. “Larger Work”
-
-     means a work that combines Covered Software with other material, in a separate
-     file or files, that is not Covered Software.
-
-1.8. “License”
-
-     means this document.
-
-1.9. “Licensable”
-
-     means having the right to grant, to the maximum extent possible, whether at the
-     time of the initial grant or subsequently, any and all of the rights conveyed by
-     this License.
-
-1.10. “Modifications”
-
-     means any of the following:
-
-     a. any file in Source Code Form that results from an addition to, deletion
-        from, or modification of the contents of Covered Software; or
-
-     b. any new file in Source Code Form that contains any Covered Software.
-
-1.11. “Patent Claims” of a Contributor
-
-      means any patent claim(s), including without limitation, method, process,
-      and apparatus claims, in any patent Licensable by such Contributor that
-      would be infringed, but for the grant of the License, by the making,
-      using, selling, offering for sale, having made, import, or transfer of
-      either its Contributions or its Contributor Version.
-
-1.12. “Secondary License”
-
-      means either the GNU General Public License, Version 2.0, the GNU Lesser
-      General Public License, Version 2.1, the GNU Affero General Public
-      License, Version 3.0, or any later versions of those licenses.
-
-1.13. “Source Code Form”
-
-      means the form of the work preferred for making modifications.
-
-1.14. “You” (or “Your”)
-
-      means an individual or a legal entity exercising rights under this
-      License. For legal entities, “You” includes any entity that controls, is
-      controlled by, or is under common control with You. For purposes of this
-      definition, “control” means (a) the power, direct or indirect, to cause
-      the direction or management of such entity, whether by contract or
-      otherwise, or (b) ownership of more than fifty percent (50%) of the
-      outstanding shares or beneficial ownership of such entity.
-
-
-2. License Grants and Conditions
-
-2.1. Grants
-
-     Each Contributor hereby grants You a world-wide, royalty-free,
-     non-exclusive license:
-
-     a. under intellectual property rights (other than patent or trademark)
-        Licensable by such Contributor to use, reproduce, make available,
-        modify, display, perform, distribute, and otherwise exploit its
-        Contributions, either on an unmodified basis, with Modifications, or as
-        part of a Larger Work; and
-
-     b. under Patent Claims of such Contributor to make, use, sell, offer for
-        sale, have made, import, and otherwise transfer either its Contributions
-        or its Contributor Version.
-
-2.2. Effective Date
-
-     The licenses granted in Section 2.1 with respect to any Contribution become
-     effective for each Contribution on the date the Contributor first distributes
-     such Contribution.
-
-2.3. Limitations on Grant Scope
-
-     The licenses granted in this Section 2 are the only rights granted under this
-     License. No additional rights or licenses will be implied from the distribution
-     or licensing of Covered Software under this License. Notwithstanding Section
-     2.1(b) above, no patent license is granted by a Contributor:
-
-     a. for any code that a Contributor has removed from Covered Software; or
-
-     b. for infringements caused by: (i) Your and any other third party’s
-        modifications of Covered Software, or (ii) the combination of its
-        Contributions with other software (except as part of its Contributor
-        Version); or
-
-     c. under Patent Claims infringed by Covered Software in the absence of its
-        Contributions.
-
-     This License does not grant any rights in the trademarks, service marks, or
-     logos of any Contributor (except as may be necessary to comply with the
-     notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-     No Contributor makes additional grants as a result of Your choice to
-     distribute the Covered Software under a subsequent version of this License
-     (see Section 10.2) or under the terms of a Secondary License (if permitted
-     under the terms of Section 3.3).
-
-2.5. Representation
-
-     Each Contributor represents that the Contributor believes its Contributions
-     are its original creation(s) or it has sufficient rights to grant the
-     rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-     This License is not intended to limit any rights You have under applicable
-     copyright doctrines of fair use, fair dealing, or other equivalents.
-
-2.7. Conditions
-
-     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
-     Section 2.1.
-
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
-     All distribution of Covered Software in Source Code Form, including any
-     Modifications that You create or to which You contribute, must be under the
-     terms of this License. You must inform recipients that the Source Code Form
-     of the Covered Software is governed by the terms of this License, and how
-     they can obtain a copy of this License. You may not attempt to alter or
-     restrict the recipients’ rights in the Source Code Form.
-
-3.2. Distribution of Executable Form
-
-     If You distribute Covered Software in Executable Form then:
-
-     a. such Covered Software must also be made available in Source Code Form,
-        as described in Section 3.1, and You must inform recipients of the
-        Executable Form how they can obtain a copy of such Source Code Form by
-        reasonable means in a timely manner, at a charge no more than the cost
-        of distribution to the recipient; and
-
-     b. You may distribute such Executable Form under the terms of this License,
-        or sublicense it under different terms, provided that the license for
-        the Executable Form does not attempt to limit or alter the recipients’
-        rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-     You may create and distribute a Larger Work under terms of Your choice,
-     provided that You also comply with the requirements of this License for the
-     Covered Software. If the Larger Work is a combination of Covered Software
-     with a work governed by one or more Secondary Licenses, and the Covered
-     Software is not Incompatible With Secondary Licenses, this License permits
-     You to additionally distribute such Covered Software under the terms of
-     such Secondary License(s), so that the recipient of the Larger Work may, at
-     their option, further distribute the Covered Software under the terms of
-     either this License or such Secondary License(s).
-
-3.4. Notices
-
-     You may not remove or alter the substance of any license notices (including
-     copyright notices, patent notices, disclaimers of warranty, or limitations
-     of liability) contained within the Source Code Form of the Covered
-     Software, except that You may alter any license notices to the extent
-     required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-     You may choose to offer, and to charge a fee for, warranty, support,
-     indemnity or liability obligations to one or more recipients of Covered
-     Software. However, You may do so only on Your own behalf, and not on behalf
-     of any Contributor. You must make it absolutely clear that any such
-     warranty, support, indemnity, or liability obligation is offered by You
-     alone, and You hereby agree to indemnify every Contributor for any
-     liability incurred by such Contributor as a result of warranty, support,
-     indemnity or liability terms You offer. You may include additional
-     disclaimers of warranty and limitations of liability specific to any
-     jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
-   If it is impossible for You to comply with any of the terms of this License
-   with respect to some or all of the Covered Software due to statute, judicial
-   order, or regulation then You must: (a) comply with the terms of this License
-   to the maximum extent possible; and (b) describe the limitations and the code
-   they affect. Such description must be placed in a text file included with all
-   distributions of the Covered Software under this License. Except to the
-   extent prohibited by statute or regulation, such description must be
-   sufficiently detailed for a recipient of ordinary skill to be able to
-   understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You
-     fail to comply with any of its terms. However, if You become compliant,
-     then the rights granted under this License from a particular Contributor
-     are reinstated (a) provisionally, unless and until such Contributor
-     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
-     if such Contributor fails to notify You of the non-compliance by some
-     reasonable means prior to 60 days after You have come back into compliance.
-     Moreover, Your grants from a particular Contributor are reinstated on an
-     ongoing basis if such Contributor notifies You of the non-compliance by
-     some reasonable means, this is the first time You have received notice of
-     non-compliance with this License from such Contributor, and You become
-     compliant prior to 30 days after Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-     infringement claim (excluding declaratory judgment actions, counter-claims,
-     and cross-claims) alleging that a Contributor Version directly or
-     indirectly infringes any patent, then the rights granted to You by any and
-     all Contributors for the Covered Software under Section 2.1 of this License
-     shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
-     license agreements (excluding distributors and resellers) which have been
-     validly granted by You or Your distributors under this License prior to
-     termination shall survive termination.
-
-6. Disclaimer of Warranty
-
-   Covered Software is provided under this License on an “as is” basis, without
-   warranty of any kind, either expressed, implied, or statutory, including,
-   without limitation, warranties that the Covered Software is free of defects,
-   merchantable, fit for a particular purpose or non-infringing. The entire
-   risk as to the quality and performance of the Covered Software is with You.
-   Should any Covered Software prove defective in any respect, You (not any
-   Contributor) assume the cost of any necessary servicing, repair, or
-   correction. This disclaimer of warranty constitutes an essential part of this
-   License. No use of  any Covered Software is authorized under this License
-   except under this disclaimer.
-
-7. Limitation of Liability
-
-   Under no circumstances and under no legal theory, whether tort (including
-   negligence), contract, or otherwise, shall any Contributor, or anyone who
-   distributes Covered Software as permitted above, be liable to You for any
-   direct, indirect, special, incidental, or consequential damages of any
-   character including, without limitation, damages for lost profits, loss of
-   goodwill, work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses, even if such party shall have been
-   informed of the possibility of such damages. This limitation of liability
-   shall not apply to liability for death or personal injury resulting from such
-   party’s negligence to the extent applicable law prohibits such limitation.
-   Some jurisdictions do not allow the exclusion or limitation of incidental or
-   consequential damages, so this exclusion and limitation may not apply to You.
-
-8. Litigation
-
-   Any litigation relating to this License may be brought only in the courts of
-   a jurisdiction where the defendant maintains its principal place of business
-   and such litigation shall be governed by laws of that jurisdiction, without
-   reference to its conflict-of-law provisions. Nothing in this Section shall
-   prevent a party’s ability to bring cross-claims or counter-claims.
-
-9. Miscellaneous
-
-   This License represents the complete agreement concerning the subject matter
-   hereof. If any provision of this License is held to be unenforceable, such
-   provision shall be reformed only to the extent necessary to make it
-   enforceable. Any law or regulation which provides that the language of a
-   contract shall be construed against the drafter shall not be used to construe
-   this License against a Contributor.
-
-
-10. Versions of the License
-
-10.1. New Versions
-
-      Mozilla Foundation is the license steward. Except as provided in Section
-      10.3, no one other than the license steward has the right to modify or
-      publish new versions of this License. Each version will be given a
-      distinguishing version number.
-
-10.2. Effect of New Versions
-
-      You may distribute the Covered Software under the terms of the version of
-      the License under which You originally received the Covered Software, or
-      under the terms of any subsequent version published by the license
-      steward.
-
-10.3. Modified Versions
-
-      If you create software not governed by this License, and you want to
-      create a new license for such software, you may create and use a modified
-      version of this License if you rename the license and remove any
-      references to the name of the license steward (except to note that such
-      modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
-      If You choose to distribute Source Code Form that is Incompatible With
-      Secondary Licenses under the terms of this version of the License, the
-      notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
-
-      This Source Code Form is subject to the
-      terms of the Mozilla Public License, v.
-      2.0. If a copy of the MPL was not
-      distributed with this file, You can
-      obtain one at
-      http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file, then
-You may include the notice in a location (such as a LICENSE file in a relevant
-directory) where a recipient would be likely to look for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - “Incompatible With Secondary Licenses” Notice
-
-      This Source Code Form is “Incompatible
-      With Secondary Licenses”, as defined by
-      the Mozilla Public License, v. 2.0.
-
diff --git a/vendor/github.com/hashicorp/errwrap/README.md b/vendor/github.com/hashicorp/errwrap/README.md
deleted file mode 100644
index 444df08f..00000000
--- a/vendor/github.com/hashicorp/errwrap/README.md
+++ /dev/null
@@ -1,89 +0,0 @@
-# errwrap
-
-`errwrap` is a package for Go that formalizes the pattern of wrapping errors
-and checking if an error contains another error.
-
-There is a common pattern in Go of taking a returned `error` value and
-then wrapping it (such as with `fmt.Errorf`) before returning it. The problem
-with this pattern is that you completely lose the original `error` structure.
-
-Arguably the _correct_ approach is that you should make a custom structure
-implementing the `error` interface, and have the original error as a field
-on that structure, such [as this example](http://golang.org/pkg/os/#PathError).
-This is a good approach, but you have to know the entire chain of possible
-rewrapping that happens, when you might just care about one.
-
-`errwrap` formalizes this pattern (it doesn't matter what approach you use
-above) by giving a single interface for wrapping errors, checking if a specific
-error is wrapped, and extracting that error.
-
-## Installation and Docs
-
-Install using `go get github.com/hashicorp/errwrap`.
-
-Full documentation is available at
-http://godoc.org/github.com/hashicorp/errwrap
-
-## Usage
-
-#### Basic Usage
-
-Below is a very basic example of its usage:
-
-```go
-// A function that always returns an error, but wraps it, like a real
-// function might.
-func tryOpen() error {
-	_, err := os.Open("/i/dont/exist")
-	if err != nil {
-		return errwrap.Wrapf("Doesn't exist: {{err}}", err)
-	}
-
-	return nil
-}
-
-func main() {
-	err := tryOpen()
-
-	// We can use the Contains helpers to check if an error contains
-	// another error. It is safe to do this with a nil error, or with
-	// an error that doesn't even use the errwrap package.
-	if errwrap.Contains(err, "does not exist") {
-		// Do something
-	}
-	if errwrap.ContainsType(err, new(os.PathError)) {
-		// Do something
-	}
-
-	// Or we can use the associated `Get` functions to just extract
-	// a specific error. This would return nil if that specific error doesn't
-	// exist.
-	perr := errwrap.GetType(err, new(os.PathError))
-}
-```
-
-#### Custom Types
-
-If you're already making custom types that properly wrap errors, then
-you can get all the functionality of `errwraps.Contains` and such by
-implementing the `Wrapper` interface with just one function. Example:
-
-```go
-type AppError {
-  Code ErrorCode
-  Err  error
-}
-
-func (e *AppError) WrappedErrors() []error {
-  return []error{e.Err}
-}
-```
-
-Now this works:
-
-```go
-err := &AppError{Err: fmt.Errorf("an error")}
-if errwrap.ContainsType(err, fmt.Errorf("")) {
-	// This will work!
-}
-```
diff --git a/vendor/github.com/hashicorp/errwrap/errwrap.go b/vendor/github.com/hashicorp/errwrap/errwrap.go
deleted file mode 100644
index 44e368e5..00000000
--- a/vendor/github.com/hashicorp/errwrap/errwrap.go
+++ /dev/null
@@ -1,178 +0,0 @@
-// Package errwrap implements methods to formalize error wrapping in Go.
-//
-// All of the top-level functions that take an `error` are built to be able
-// to take any error, not just wrapped errors. This allows you to use errwrap
-// without having to type-check and type-cast everywhere.
-package errwrap
-
-import (
-	"errors"
-	"reflect"
-	"strings"
-)
-
-// WalkFunc is the callback called for Walk.
-type WalkFunc func(error)
-
-// Wrapper is an interface that can be implemented by custom types to
-// have all the Contains, Get, etc. functions in errwrap work.
-//
-// When Walk reaches a Wrapper, it will call the callback for every
-// wrapped error in addition to the wrapper itself. Since all the top-level
-// functions in errwrap use Walk, this means that all those functions work
-// with your custom type.
-type Wrapper interface {
-	WrappedErrors() []error
-}
-
-// Wrap defines that outer wraps inner, returning an error type that
-// can be cleanly used with the other methods in this package, such as
-// Contains, GetAll, etc.
-//
-// This function won't modify the error message at all (the outer message
-// will be used).
-func Wrap(outer, inner error) error {
-	return &wrappedError{
-		Outer: outer,
-		Inner: inner,
-	}
-}
-
-// Wrapf wraps an error with a formatting message. This is similar to using
-// `fmt.Errorf` to wrap an error. If you're using `fmt.Errorf` to wrap
-// errors, you should replace it with this.
-//
-// format is the format of the error message. The string '{{err}}' will
-// be replaced with the original error message.
-//
-// Deprecated: Use fmt.Errorf()
-func Wrapf(format string, err error) error {
-	outerMsg := "<nil>"
-	if err != nil {
-		outerMsg = err.Error()
-	}
-
-	outer := errors.New(strings.Replace(
-		format, "{{err}}", outerMsg, -1))
-
-	return Wrap(outer, err)
-}
-
-// Contains checks if the given error contains an error with the
-// message msg. If err is not a wrapped error, this will always return
-// false unless the error itself happens to match this msg.
-func Contains(err error, msg string) bool {
-	return len(GetAll(err, msg)) > 0
-}
-
-// ContainsType checks if the given error contains an error with
-// the same concrete type as v. If err is not a wrapped error, this will
-// check the err itself.
-func ContainsType(err error, v interface{}) bool {
-	return len(GetAllType(err, v)) > 0
-}
-
-// Get is the same as GetAll but returns the deepest matching error.
-func Get(err error, msg string) error {
-	es := GetAll(err, msg)
-	if len(es) > 0 {
-		return es[len(es)-1]
-	}
-
-	return nil
-}
-
-// GetType is the same as GetAllType but returns the deepest matching error.
-func GetType(err error, v interface{}) error {
-	es := GetAllType(err, v)
-	if len(es) > 0 {
-		return es[len(es)-1]
-	}
-
-	return nil
-}
-
-// GetAll gets all the errors that might be wrapped in err with the
-// given message. The order of the errors is such that the outermost
-// matching error (the most recent wrap) is index zero, and so on.
-func GetAll(err error, msg string) []error {
-	var result []error
-
-	Walk(err, func(err error) {
-		if err.Error() == msg {
-			result = append(result, err)
-		}
-	})
-
-	return result
-}
-
-// GetAllType gets all the errors that are the same type as v.
-//
-// The order of the return value is the same as described in GetAll.
-func GetAllType(err error, v interface{}) []error {
-	var result []error
-
-	var search string
-	if v != nil {
-		search = reflect.TypeOf(v).String()
-	}
-	Walk(err, func(err error) {
-		var needle string
-		if err != nil {
-			needle = reflect.TypeOf(err).String()
-		}
-
-		if needle == search {
-			result = append(result, err)
-		}
-	})
-
-	return result
-}
-
-// Walk walks all the wrapped errors in err and calls the callback. If
-// err isn't a wrapped error, this will be called once for err. If err
-// is a wrapped error, the callback will be called for both the wrapper
-// that implements error as well as the wrapped error itself.
-func Walk(err error, cb WalkFunc) {
-	if err == nil {
-		return
-	}
-
-	switch e := err.(type) {
-	case *wrappedError:
-		cb(e.Outer)
-		Walk(e.Inner, cb)
-	case Wrapper:
-		cb(err)
-
-		for _, err := range e.WrappedErrors() {
-			Walk(err, cb)
-		}
-	case interface{ Unwrap() error }:
-		cb(err)
-		Walk(e.Unwrap(), cb)
-	default:
-		cb(err)
-	}
-}
-
-// wrappedError is an implementation of error that has both the
-// outer and inner errors.
-type wrappedError struct {
-	Outer error
-	Inner error
-}
-
-func (w *wrappedError) Error() string {
-	return w.Outer.Error()
-}
-
-func (w *wrappedError) WrappedErrors() []error {
-	return []error{w.Outer, w.Inner}
-}
-
-func (w *wrappedError) Unwrap() error {
-	return w.Inner
-}
diff --git a/vendor/github.com/hashicorp/go-multierror/LICENSE b/vendor/github.com/hashicorp/go-multierror/LICENSE
deleted file mode 100644
index 82b4de97..00000000
--- a/vendor/github.com/hashicorp/go-multierror/LICENSE
+++ /dev/null
@@ -1,353 +0,0 @@
-Mozilla Public License, version 2.0
-
-1. Definitions
-
-1.1. “Contributor”
-
-     means each individual or legal entity that creates, contributes to the
-     creation of, or owns Covered Software.
-
-1.2. “Contributor Version”
-
-     means the combination of the Contributions of others (if any) used by a
-     Contributor and that particular Contributor’s Contribution.
-
-1.3. “Contribution”
-
-     means Covered Software of a particular Contributor.
-
-1.4. “Covered Software”
-
-     means Source Code Form to which the initial Contributor has attached the
-     notice in Exhibit A, the Executable Form of such Source Code Form, and
-     Modifications of such Source Code Form, in each case including portions
-     thereof.
-
-1.5. “Incompatible With Secondary Licenses”
-     means
-
-     a. that the initial Contributor has attached the notice described in
-        Exhibit B to the Covered Software; or
-
-     b. that the Covered Software was made available under the terms of version
-        1.1 or earlier of the License, but not also under the terms of a
-        Secondary License.
-
-1.6. “Executable Form”
-
-     means any form of the work other than Source Code Form.
-
-1.7. “Larger Work”
-
-     means a work that combines Covered Software with other material, in a separate
-     file or files, that is not Covered Software.
-
-1.8. “License”
-
-     means this document.
-
-1.9. “Licensable”
-
-     means having the right to grant, to the maximum extent possible, whether at the
-     time of the initial grant or subsequently, any and all of the rights conveyed by
-     this License.
-
-1.10. “Modifications”
-
-     means any of the following:
-
-     a. any file in Source Code Form that results from an addition to, deletion
-        from, or modification of the contents of Covered Software; or
-
-     b. any new file in Source Code Form that contains any Covered Software.
-
-1.11. “Patent Claims” of a Contributor
-
-      means any patent claim(s), including without limitation, method, process,
-      and apparatus claims, in any patent Licensable by such Contributor that
-      would be infringed, but for the grant of the License, by the making,
-      using, selling, offering for sale, having made, import, or transfer of
-      either its Contributions or its Contributor Version.
-
-1.12. “Secondary License”
-
-      means either the GNU General Public License, Version 2.0, the GNU Lesser
-      General Public License, Version 2.1, the GNU Affero General Public
-      License, Version 3.0, or any later versions of those licenses.
-
-1.13. “Source Code Form”
-
-      means the form of the work preferred for making modifications.
-
-1.14. “You” (or “Your”)
-
-      means an individual or a legal entity exercising rights under this
-      License. For legal entities, “You” includes any entity that controls, is
-      controlled by, or is under common control with You. For purposes of this
-      definition, “control” means (a) the power, direct or indirect, to cause
-      the direction or management of such entity, whether by contract or
-      otherwise, or (b) ownership of more than fifty percent (50%) of the
-      outstanding shares or beneficial ownership of such entity.
-
-
-2. License Grants and Conditions
-
-2.1. Grants
-
-     Each Contributor hereby grants You a world-wide, royalty-free,
-     non-exclusive license:
-
-     a. under intellectual property rights (other than patent or trademark)
-        Licensable by such Contributor to use, reproduce, make available,
-        modify, display, perform, distribute, and otherwise exploit its
-        Contributions, either on an unmodified basis, with Modifications, or as
-        part of a Larger Work; and
-
-     b. under Patent Claims of such Contributor to make, use, sell, offer for
-        sale, have made, import, and otherwise transfer either its Contributions
-        or its Contributor Version.
-
-2.2. Effective Date
-
-     The licenses granted in Section 2.1 with respect to any Contribution become
-     effective for each Contribution on the date the Contributor first distributes
-     such Contribution.
-
-2.3. Limitations on Grant Scope
-
-     The licenses granted in this Section 2 are the only rights granted under this
-     License. No additional rights or licenses will be implied from the distribution
-     or licensing of Covered Software under this License. Notwithstanding Section
-     2.1(b) above, no patent license is granted by a Contributor:
-
-     a. for any code that a Contributor has removed from Covered Software; or
-
-     b. for infringements caused by: (i) Your and any other third party’s
-        modifications of Covered Software, or (ii) the combination of its
-        Contributions with other software (except as part of its Contributor
-        Version); or
-
-     c. under Patent Claims infringed by Covered Software in the absence of its
-        Contributions.
-
-     This License does not grant any rights in the trademarks, service marks, or
-     logos of any Contributor (except as may be necessary to comply with the
-     notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-     No Contributor makes additional grants as a result of Your choice to
-     distribute the Covered Software under a subsequent version of this License
-     (see Section 10.2) or under the terms of a Secondary License (if permitted
-     under the terms of Section 3.3).
-
-2.5. Representation
-
-     Each Contributor represents that the Contributor believes its Contributions
-     are its original creation(s) or it has sufficient rights to grant the
-     rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-     This License is not intended to limit any rights You have under applicable
-     copyright doctrines of fair use, fair dealing, or other equivalents.
-
-2.7. Conditions
-
-     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
-     Section 2.1.
-
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
-     All distribution of Covered Software in Source Code Form, including any
-     Modifications that You create or to which You contribute, must be under the
-     terms of this License. You must inform recipients that the Source Code Form
-     of the Covered Software is governed by the terms of this License, and how
-     they can obtain a copy of this License. You may not attempt to alter or
-     restrict the recipients’ rights in the Source Code Form.
-
-3.2. Distribution of Executable Form
-
-     If You distribute Covered Software in Executable Form then:
-
-     a. such Covered Software must also be made available in Source Code Form,
-        as described in Section 3.1, and You must inform recipients of the
-        Executable Form how they can obtain a copy of such Source Code Form by
-        reasonable means in a timely manner, at a charge no more than the cost
-        of distribution to the recipient; and
-
-     b. You may distribute such Executable Form under the terms of this License,
-        or sublicense it under different terms, provided that the license for
-        the Executable Form does not attempt to limit or alter the recipients’
-        rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-     You may create and distribute a Larger Work under terms of Your choice,
-     provided that You also comply with the requirements of this License for the
-     Covered Software. If the Larger Work is a combination of Covered Software
-     with a work governed by one or more Secondary Licenses, and the Covered
-     Software is not Incompatible With Secondary Licenses, this License permits
-     You to additionally distribute such Covered Software under the terms of
-     such Secondary License(s), so that the recipient of the Larger Work may, at
-     their option, further distribute the Covered Software under the terms of
-     either this License or such Secondary License(s).
-
-3.4. Notices
-
-     You may not remove or alter the substance of any license notices (including
-     copyright notices, patent notices, disclaimers of warranty, or limitations
-     of liability) contained within the Source Code Form of the Covered
-     Software, except that You may alter any license notices to the extent
-     required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-     You may choose to offer, and to charge a fee for, warranty, support,
-     indemnity or liability obligations to one or more recipients of Covered
-     Software. However, You may do so only on Your own behalf, and not on behalf
-     of any Contributor. You must make it absolutely clear that any such
-     warranty, support, indemnity, or liability obligation is offered by You
-     alone, and You hereby agree to indemnify every Contributor for any
-     liability incurred by such Contributor as a result of warranty, support,
-     indemnity or liability terms You offer. You may include additional
-     disclaimers of warranty and limitations of liability specific to any
-     jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
-   If it is impossible for You to comply with any of the terms of this License
-   with respect to some or all of the Covered Software due to statute, judicial
-   order, or regulation then You must: (a) comply with the terms of this License
-   to the maximum extent possible; and (b) describe the limitations and the code
-   they affect. Such description must be placed in a text file included with all
-   distributions of the Covered Software under this License. Except to the
-   extent prohibited by statute or regulation, such description must be
-   sufficiently detailed for a recipient of ordinary skill to be able to
-   understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You
-     fail to comply with any of its terms. However, if You become compliant,
-     then the rights granted under this License from a particular Contributor
-     are reinstated (a) provisionally, unless and until such Contributor
-     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
-     if such Contributor fails to notify You of the non-compliance by some
-     reasonable means prior to 60 days after You have come back into compliance.
-     Moreover, Your grants from a particular Contributor are reinstated on an
-     ongoing basis if such Contributor notifies You of the non-compliance by
-     some reasonable means, this is the first time You have received notice of
-     non-compliance with this License from such Contributor, and You become
-     compliant prior to 30 days after Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-     infringement claim (excluding declaratory judgment actions, counter-claims,
-     and cross-claims) alleging that a Contributor Version directly or
-     indirectly infringes any patent, then the rights granted to You by any and
-     all Contributors for the Covered Software under Section 2.1 of this License
-     shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
-     license agreements (excluding distributors and resellers) which have been
-     validly granted by You or Your distributors under this License prior to
-     termination shall survive termination.
-
-6. Disclaimer of Warranty
-
-   Covered Software is provided under this License on an “as is” basis, without
-   warranty of any kind, either expressed, implied, or statutory, including,
-   without limitation, warranties that the Covered Software is free of defects,
-   merchantable, fit for a particular purpose or non-infringing. The entire
-   risk as to the quality and performance of the Covered Software is with You.
-   Should any Covered Software prove defective in any respect, You (not any
-   Contributor) assume the cost of any necessary servicing, repair, or
-   correction. This disclaimer of warranty constitutes an essential part of this
-   License. No use of  any Covered Software is authorized under this License
-   except under this disclaimer.
-
-7. Limitation of Liability
-
-   Under no circumstances and under no legal theory, whether tort (including
-   negligence), contract, or otherwise, shall any Contributor, or anyone who
-   distributes Covered Software as permitted above, be liable to You for any
-   direct, indirect, special, incidental, or consequential damages of any
-   character including, without limitation, damages for lost profits, loss of
-   goodwill, work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses, even if such party shall have been
-   informed of the possibility of such damages. This limitation of liability
-   shall not apply to liability for death or personal injury resulting from such
-   party’s negligence to the extent applicable law prohibits such limitation.
-   Some jurisdictions do not allow the exclusion or limitation of incidental or
-   consequential damages, so this exclusion and limitation may not apply to You.
-
-8. Litigation
-
-   Any litigation relating to this License may be brought only in the courts of
-   a jurisdiction where the defendant maintains its principal place of business
-   and such litigation shall be governed by laws of that jurisdiction, without
-   reference to its conflict-of-law provisions. Nothing in this Section shall
-   prevent a party’s ability to bring cross-claims or counter-claims.
-
-9. Miscellaneous
-
-   This License represents the complete agreement concerning the subject matter
-   hereof. If any provision of this License is held to be unenforceable, such
-   provision shall be reformed only to the extent necessary to make it
-   enforceable. Any law or regulation which provides that the language of a
-   contract shall be construed against the drafter shall not be used to construe
-   this License against a Contributor.
-
-
-10. Versions of the License
-
-10.1. New Versions
-
-      Mozilla Foundation is the license steward. Except as provided in Section
-      10.3, no one other than the license steward has the right to modify or
-      publish new versions of this License. Each version will be given a
-      distinguishing version number.
-
-10.2. Effect of New Versions
-
-      You may distribute the Covered Software under the terms of the version of
-      the License under which You originally received the Covered Software, or
-      under the terms of any subsequent version published by the license
-      steward.
-
-10.3. Modified Versions
-
-      If you create software not governed by this License, and you want to
-      create a new license for such software, you may create and use a modified
-      version of this License if you rename the license and remove any
-      references to the name of the license steward (except to note that such
-      modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
-      If You choose to distribute Source Code Form that is Incompatible With
-      Secondary Licenses under the terms of this version of the License, the
-      notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
-
-      This Source Code Form is subject to the
-      terms of the Mozilla Public License, v.
-      2.0. If a copy of the MPL was not
-      distributed with this file, You can
-      obtain one at
-      http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file, then
-You may include the notice in a location (such as a LICENSE file in a relevant
-directory) where a recipient would be likely to look for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - “Incompatible With Secondary Licenses” Notice
-
-      This Source Code Form is “Incompatible
-      With Secondary Licenses”, as defined by
-      the Mozilla Public License, v. 2.0.
diff --git a/vendor/github.com/hashicorp/go-multierror/Makefile b/vendor/github.com/hashicorp/go-multierror/Makefile
deleted file mode 100644
index b97cd6ed..00000000
--- a/vendor/github.com/hashicorp/go-multierror/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-TEST?=./...
-
-default: test
-
-# test runs the test suite and vets the code.
-test: generate
-	@echo "==> Running tests..."
-	@go list $(TEST) \
-		| grep -v "/vendor/" \
-		| xargs -n1 go test -timeout=60s -parallel=10 ${TESTARGS}
-
-# testrace runs the race checker
-testrace: generate
-	@echo "==> Running tests (race)..."
-	@go list $(TEST) \
-		| grep -v "/vendor/" \
-		| xargs -n1 go test -timeout=60s -race ${TESTARGS}
-
-# updatedeps installs all the dependencies needed to run and build.
-updatedeps:
-	@sh -c "'${CURDIR}/scripts/deps.sh' '${NAME}'"
-
-# generate runs `go generate` to build the dynamically generated source files.
-generate:
-	@echo "==> Generating..."
-	@find . -type f -name '.DS_Store' -delete
-	@go list ./... \
-		| grep -v "/vendor/" \
-		| xargs -n1 go generate
-
-.PHONY: default test testrace updatedeps generate
diff --git a/vendor/github.com/hashicorp/go-multierror/README.md b/vendor/github.com/hashicorp/go-multierror/README.md
deleted file mode 100644
index 71dd308e..00000000
--- a/vendor/github.com/hashicorp/go-multierror/README.md
+++ /dev/null
@@ -1,150 +0,0 @@
-# go-multierror
-
-[![CircleCI](https://img.shields.io/circleci/build/github/hashicorp/go-multierror/master)](https://circleci.com/gh/hashicorp/go-multierror)
-[![Go Reference](https://pkg.go.dev/badge/github.com/hashicorp/go-multierror.svg)](https://pkg.go.dev/github.com/hashicorp/go-multierror)
-![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/hashicorp/go-multierror)
-
-[circleci]: https://app.circleci.com/pipelines/github/hashicorp/go-multierror
-[godocs]: https://pkg.go.dev/github.com/hashicorp/go-multierror
-
-`go-multierror` is a package for Go that provides a mechanism for
-representing a list of `error` values as a single `error`.
-
-This allows a function in Go to return an `error` that might actually
-be a list of errors. If the caller knows this, they can unwrap the
-list and access the errors. If the caller doesn't know, the error
-formats to a nice human-readable format.
-
-`go-multierror` is fully compatible with the Go standard library
-[errors](https://golang.org/pkg/errors/) package, including the
-functions `As`, `Is`, and `Unwrap`. This provides a standardized approach
-for introspecting on error values.
-
-## Installation and Docs
-
-Install using `go get github.com/hashicorp/go-multierror`.
-
-Full documentation is available at
-https://pkg.go.dev/github.com/hashicorp/go-multierror
-
-### Requires go version 1.13 or newer
-
-`go-multierror` requires go version 1.13 or newer. Go 1.13 introduced
-[error wrapping](https://golang.org/doc/go1.13#error_wrapping), which
-this library takes advantage of.
-
-If you need to use an earlier version of go, you can use the
-[v1.0.0](https://github.com/hashicorp/go-multierror/tree/v1.0.0)
-tag, which doesn't rely on features in go 1.13.
-
-If you see compile errors that look like the below, it's likely that
-you're on an older version of go:
-
-```
-/go/src/github.com/hashicorp/go-multierror/multierror.go:112:9: undefined: errors.As
-/go/src/github.com/hashicorp/go-multierror/multierror.go:117:9: undefined: errors.Is
-```
-
-## Usage
-
-go-multierror is easy to use and purposely built to be unobtrusive in
-existing Go applications/libraries that may not be aware of it.
-
-**Building a list of errors**
-
-The `Append` function is used to create a list of errors. This function
-behaves a lot like the Go built-in `append` function: it doesn't matter
-if the first argument is nil, a `multierror.Error`, or any other `error`,
-the function behaves as you would expect.
-
-```go
-var result error
-
-if err := step1(); err != nil {
-	result = multierror.Append(result, err)
-}
-if err := step2(); err != nil {
-	result = multierror.Append(result, err)
-}
-
-return result
-```
-
-**Customizing the formatting of the errors**
-
-By specifying a custom `ErrorFormat`, you can customize the format
-of the `Error() string` function:
-
-```go
-var result *multierror.Error
-
-// ... accumulate errors here, maybe using Append
-
-if result != nil {
-	result.ErrorFormat = func([]error) string {
-		return "errors!"
-	}
-}
-```
-
-**Accessing the list of errors**
-
-`multierror.Error` implements `error` so if the caller doesn't know about
-multierror, it will work just fine. But if you're aware a multierror might
-be returned, you can use type switches to access the list of errors:
-
-```go
-if err := something(); err != nil {
-	if merr, ok := err.(*multierror.Error); ok {
-		// Use merr.Errors
-	}
-}
-```
-
-You can also use the standard [`errors.Unwrap`](https://golang.org/pkg/errors/#Unwrap)
-function. This will continue to unwrap into subsequent errors until none exist.
-
-**Extracting an error**
-
-The standard library [`errors.As`](https://golang.org/pkg/errors/#As)
-function can be used directly with a multierror to extract a specific error:
-
-```go
-// Assume err is a multierror value
-err := somefunc()
-
-// We want to know if "err" has a "RichErrorType" in it and extract it.
-var errRich RichErrorType
-if errors.As(err, &errRich) {
-	// It has it, and now errRich is populated.
-}
-```
-
-**Checking for an exact error value**
-
-Some errors are returned as exact errors such as the [`ErrNotExist`](https://golang.org/pkg/os/#pkg-variables)
-error in the `os` package. You can check if this error is present by using
-the standard [`errors.Is`](https://golang.org/pkg/errors/#Is) function.
-
-```go
-// Assume err is a multierror value
-err := somefunc()
-if errors.Is(err, os.ErrNotExist) {
-	// err contains os.ErrNotExist
-}
-```
-
-**Returning a multierror only if there are errors**
-
-If you build a `multierror.Error`, you can use the `ErrorOrNil` function
-to return an `error` implementation only if there are errors to return:
-
-```go
-var result *multierror.Error
-
-// ... accumulate errors here
-
-// Return the `error` only if errors were added to the multierror, otherwise
-// return nil since there are no errors.
-return result.ErrorOrNil()
-```
diff --git a/vendor/github.com/hashicorp/go-multierror/append.go b/vendor/github.com/hashicorp/go-multierror/append.go
deleted file mode 100644
index 3e2589bf..00000000
--- a/vendor/github.com/hashicorp/go-multierror/append.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package multierror
-
-// Append is a helper function that will append more errors
-// onto an Error in order to create a larger multi-error.
-//
-// If err is not a multierror.Error, then it will be turned into
-// one. If any of the errs are multierr.Error, they will be flattened
-// one level into err.
-// Any nil errors within errs will be ignored. If err is nil, a new
-// *Error will be returned.
-func Append(err error, errs ...error) *Error {
-	switch err := err.(type) {
-	case *Error:
-		// Typed nils can reach here, so initialize if we are nil
-		if err == nil {
-			err = new(Error)
-		}
-
-		// Go through each error and flatten
-		for _, e := range errs {
-			switch e := e.(type) {
-			case *Error:
-				if e != nil {
-					err.Errors = append(err.Errors, e.Errors...)
-				}
-			default:
-				if e != nil {
-					err.Errors = append(err.Errors, e)
-				}
-			}
-		}
-
-		return err
-	default:
-		newErrs := make([]error, 0, len(errs)+1)
-		if err != nil {
-			newErrs = append(newErrs, err)
-		}
-		newErrs = append(newErrs, errs...)
-
-		return Append(&Error{}, newErrs...)
-	}
-}
diff --git a/vendor/github.com/hashicorp/go-multierror/flatten.go b/vendor/github.com/hashicorp/go-multierror/flatten.go
deleted file mode 100644
index aab8e9ab..00000000
--- a/vendor/github.com/hashicorp/go-multierror/flatten.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package multierror
-
-// Flatten flattens the given error, merging any *Errors together into
-// a single *Error.
-func Flatten(err error) error {
-	// If it isn't an *Error, just return the error as-is
-	if _, ok := err.(*Error); !ok {
-		return err
-	}
-
-	// Otherwise, make the result and flatten away!
-	flatErr := new(Error)
-	flatten(err, flatErr)
-	return flatErr
-}
-
-func flatten(err error, flatErr *Error) {
-	switch err := err.(type) {
-	case *Error:
-		for _, e := range err.Errors {
-			flatten(e, flatErr)
-		}
-	default:
-		flatErr.Errors = append(flatErr.Errors, err)
-	}
-}
diff --git a/vendor/github.com/hashicorp/go-multierror/format.go b/vendor/github.com/hashicorp/go-multierror/format.go
deleted file mode 100644
index 47f13c49..00000000
--- a/vendor/github.com/hashicorp/go-multierror/format.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package multierror
-
-import (
-	"fmt"
-	"strings"
-)
-
-// ErrorFormatFunc is a function callback that is called by Error to
-// turn the list of errors into a string.
-type ErrorFormatFunc func([]error) string
-
-// ListFormatFunc is a basic formatter that outputs the number of errors
-// that occurred along with a bullet point list of the errors.
-func ListFormatFunc(es []error) string {
-	if len(es) == 1 {
-		return fmt.Sprintf("1 error occurred:\n\t* %s\n\n", es[0])
-	}
-
-	points := make([]string, len(es))
-	for i, err := range es {
-		points[i] = fmt.Sprintf("* %s", err)
-	}
-
-	return fmt.Sprintf(
-		"%d errors occurred:\n\t%s\n\n",
-		len(es), strings.Join(points, "\n\t"))
-}
diff --git a/vendor/github.com/hashicorp/go-multierror/group.go b/vendor/github.com/hashicorp/go-multierror/group.go
deleted file mode 100644
index 9c29efb7..00000000
--- a/vendor/github.com/hashicorp/go-multierror/group.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package multierror
-
-import "sync"
-
-// Group is a collection of goroutines which return errors that need to be
-// coalesced.
-type Group struct {
-	mutex sync.Mutex
-	err   *Error
-	wg    sync.WaitGroup
-}
-
-// Go calls the given function in a new goroutine.
-//
-// If the function returns an error it is added to the group multierror which
-// is returned by Wait.
-func (g *Group) Go(f func() error) {
-	g.wg.Add(1)
-
-	go func() {
-		defer g.wg.Done()
-
-		if err := f(); err != nil {
-			g.mutex.Lock()
-			g.err = Append(g.err, err)
-			g.mutex.Unlock()
-		}
-	}()
-}
-
-// Wait blocks until all function calls from the Go method have returned, then
-// returns the multierror.
-func (g *Group) Wait() *Error {
-	g.wg.Wait()
-	g.mutex.Lock()
-	defer g.mutex.Unlock()
-	return g.err
-}
diff --git a/vendor/github.com/hashicorp/go-multierror/multierror.go b/vendor/github.com/hashicorp/go-multierror/multierror.go
deleted file mode 100644
index f5457432..00000000
--- a/vendor/github.com/hashicorp/go-multierror/multierror.go
+++ /dev/null
@@ -1,121 +0,0 @@
-package multierror
-
-import (
-	"errors"
-	"fmt"
-)
-
-// Error is an error type to track multiple errors. This is used to
-// accumulate errors in cases and return them as a single "error".
-type Error struct {
-	Errors      []error
-	ErrorFormat ErrorFormatFunc
-}
-
-func (e *Error) Error() string {
-	fn := e.ErrorFormat
-	if fn == nil {
-		fn = ListFormatFunc
-	}
-
-	return fn(e.Errors)
-}
-
-// ErrorOrNil returns an error interface if this Error represents
-// a list of errors, or returns nil if the list of errors is empty. This
-// function is useful at the end of accumulation to make sure that the value
-// returned represents the existence of errors.
-func (e *Error) ErrorOrNil() error {
-	if e == nil {
-		return nil
-	}
-	if len(e.Errors) == 0 {
-		return nil
-	}
-
-	return e
-}
-
-func (e *Error) GoString() string {
-	return fmt.Sprintf("*%#v", *e)
-}
-
-// WrappedErrors returns the list of errors that this Error is wrapping. It is
-// an implementation of the errwrap.Wrapper interface so that multierror.Error
-// can be used with that library.
-//
-// This method is not safe to be called concurrently. Unlike accessing the
-// Errors field directly, this function also checks if the multierror is nil to
-// prevent a null-pointer panic. It satisfies the errwrap.Wrapper interface.
-func (e *Error) WrappedErrors() []error {
-	if e == nil {
-		return nil
-	}
-	return e.Errors
-}
-
-// Unwrap returns an error from Error (or nil if there are no errors).
-// This error returned will further support Unwrap to get the next error,
-// etc. The order will match the order of Errors in the multierror.Error
-// at the time of calling.
-//
-// The resulting error supports errors.As/Is/Unwrap so you can continue
-// to use the stdlib errors package to introspect further.
-//
-// This will perform a shallow copy of the errors slice. Any errors appended
-// to this error after calling Unwrap will not be available until a new
-// Unwrap is called on the multierror.Error.
-func (e *Error) Unwrap() error {
-	// If we have no errors then we do nothing
-	if e == nil || len(e.Errors) == 0 {
-		return nil
-	}
-
-	// If we have exactly one error, we can just return that directly.
-	if len(e.Errors) == 1 {
-		return e.Errors[0]
-	}
-
-	// Shallow copy the slice
-	errs := make([]error, len(e.Errors))
-	copy(errs, e.Errors)
-	return chain(errs)
-}
-
-// chain implements the interfaces necessary for errors.Is/As/Unwrap to
-// work in a deterministic way with multierror. A chain tracks a list of
-// errors while accounting for the current represented error. This lets
-// Is/As be meaningful.
-//
-// Unwrap returns the next error. In the cleanest form, Unwrap would return
-// the wrapped error here but we can't do that if we want to properly
-// get access to all the errors. Instead, users are recommended to use
-// Is/As to get the correct error type out.
-//
-// Precondition: []error is non-empty (len > 0)
-type chain []error
-
-// Error implements the error interface
-func (e chain) Error() string {
-	return e[0].Error()
-}
-
-// Unwrap implements errors.Unwrap by returning the next error in the
-// chain or nil if there are no more errors.
-func (e chain) Unwrap() error {
-	if len(e) == 1 {
-		return nil
-	}
-
-	return e[1:]
-}
-
-// As implements errors.As by attempting to map to the current value.
-func (e chain) As(target interface{}) bool {
-	return errors.As(e[0], target)
-}
-
-// Is implements errors.Is by comparing the current value directly.
-func (e chain) Is(target error) bool {
-	return errors.Is(e[0], target)
-}
diff --git a/vendor/github.com/hashicorp/go-multierror/prefix.go b/vendor/github.com/hashicorp/go-multierror/prefix.go
deleted file mode 100644
index 5c477abe..00000000
--- a/vendor/github.com/hashicorp/go-multierror/prefix.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package multierror
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/errwrap"
-)
-
-// Prefix is a helper function that will prefix some text
-// to the given error. If the error is a multierror.Error, then
-// it will be prefixed to each wrapped error.
-//
-// This is useful to use when appending multiple multierrors
-// together in order to give better scoping.
-func Prefix(err error, prefix string) error {
-	if err == nil {
-		return nil
-	}
-
-	format := fmt.Sprintf("%s {{err}}", prefix)
-	switch err := err.(type) {
-	case *Error:
-		// Typed nils can reach here, so initialize if we are nil
-		if err == nil {
-			err = new(Error)
-		}
-
-		// Wrap each of the errors
-		for i, e := range err.Errors {
-			err.Errors[i] = errwrap.Wrapf(format, e)
-		}
-
-		return err
-	default:
-		return errwrap.Wrapf(format, err)
-	}
-}
diff --git a/vendor/github.com/hashicorp/go-multierror/sort.go b/vendor/github.com/hashicorp/go-multierror/sort.go
deleted file mode 100644
index fecb14e8..00000000
--- a/vendor/github.com/hashicorp/go-multierror/sort.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package multierror
-
-// Len implements sort.Interface function for length
-func (err Error) Len() int {
-	return len(err.Errors)
-}
-
-// Swap implements sort.Interface function for swapping elements
-func (err Error) Swap(i, j int) {
-	err.Errors[i], err.Errors[j] = err.Errors[j], err.Errors[i]
-}
-
-// Less implements sort.Interface function for determining order
-func (err Error) Less(i, j int) bool {
-	return err.Errors[i].Error() < err.Errors[j].Error()
-}
diff --git a/vendor/github.com/labstack/echo/v4/CHANGELOG.md b/vendor/github.com/labstack/echo/v4/CHANGELOG.md
index 83184249..fef7bb98 100644
--- a/vendor/github.com/labstack/echo/v4/CHANGELOG.md
+++ b/vendor/github.com/labstack/echo/v4/CHANGELOG.md
@@ -1,5 +1,38 @@
 # Changelog
 
+## v4.11.1 - 2023-07-16
+
+**Fixes**
+
+* Fix `Gzip` middleware not sending response code for no content responses (404, 301/302 redirects etc) [#2481](https://github.com/labstack/echo/pull/2481)
+
+
+## v4.11.0 - 2023-07-14
+
+
+**Fixes**
+
+* Fixes the proxy middleware concurrency issue of calling the Next() proxy target on Round Robin Balancer [#2409](https://github.com/labstack/echo/pull/2409)
+* Fix `group.RouteNotFound` not working when group has attached middlewares [#2411](https://github.com/labstack/echo/pull/2411)
+* Fix global error handler return error message when message is an error [#2456](https://github.com/labstack/echo/pull/2456)
+* Do not use global timeNow variables [#2477](https://github.com/labstack/echo/pull/2477)
+
+
+**Enhancements**
+
+* Added a optional config variable to disable centralized error handler in recovery middleware [#2410](https://github.com/labstack/echo/pull/2410)
+* refactor: use `strings.ReplaceAll` directly [#2424](https://github.com/labstack/echo/pull/2424)
+* Add support for Go1.20 `http.rwUnwrapper` to Response struct [#2425](https://github.com/labstack/echo/pull/2425)
+* Check whether is nil before invoking centralized error handling [#2429](https://github.com/labstack/echo/pull/2429)
+* Proper colon support in `echo.Reverse` method [#2416](https://github.com/labstack/echo/pull/2416)
+* Fix misuses of a vs an in documentation comments [#2436](https://github.com/labstack/echo/pull/2436)
+* Add link to slog.Handler library for Echo logging into README.md [#2444](https://github.com/labstack/echo/pull/2444)
+* In proxy middleware Support retries of failed proxy requests [#2414](https://github.com/labstack/echo/pull/2414)
+* gofmt fixes to comments [#2452](https://github.com/labstack/echo/pull/2452)
+* gzip response only if it exceeds a minimal length [#2267](https://github.com/labstack/echo/pull/2267)
+* Upgrade packages [#2475](https://github.com/labstack/echo/pull/2475)
+
+
 ## v4.10.2 - 2023-02-22
 
 **Security**
diff --git a/vendor/github.com/labstack/echo/v4/README.md b/vendor/github.com/labstack/echo/v4/README.md
index fe78b6ed..ea8f30f6 100644
--- a/vendor/github.com/labstack/echo/v4/README.md
+++ b/vendor/github.com/labstack/echo/v4/README.md
@@ -110,6 +110,7 @@ of middlewares in this list.
 | [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/samber/slog-echo](https://github.com/samber/slog-echo)                                         | Go [slog](https://pkg.go.dev/golang.org/x/exp/slog) 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                                                                                                                                                                  |
diff --git a/vendor/github.com/labstack/echo/v4/bind.go b/vendor/github.com/labstack/echo/v4/bind.go
index c841ca01..374a2aec 100644
--- a/vendor/github.com/labstack/echo/v4/bind.go
+++ b/vendor/github.com/labstack/echo/v4/bind.go
@@ -114,7 +114,7 @@ func (b *DefaultBinder) Bind(i interface{}, c Context) (err error) {
 	// Only bind query parameters for GET/DELETE/HEAD to avoid unexpected behavior with destination struct binding from body.
 	// For example a request URL `&id=1&lang=en` with body `{"id":100,"lang":"de"}` would lead to precedence issues.
 	// The HTTP method check restores pre-v4.1.11 behavior to avoid these problems (see issue #1670)
-  method := c.Request().Method
+	method := c.Request().Method
 	if method == http.MethodGet || method == http.MethodDelete || method == http.MethodHead {
 		if err = b.BindQueryParams(c, i); err != nil {
 			return err
diff --git a/vendor/github.com/labstack/echo/v4/binder.go b/vendor/github.com/labstack/echo/v4/binder.go
index 5a6cf9d9..29cceca0 100644
--- a/vendor/github.com/labstack/echo/v4/binder.go
+++ b/vendor/github.com/labstack/echo/v4/binder.go
@@ -1236,7 +1236,7 @@ func (b *ValueBinder) durations(sourceParam string, values []string, dest *[]tim
 // Example: 1609180603 bind to 2020-12-28T18:36:43.000000000+00:00
 //
 // Note:
-//  * time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
+//   - time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
 func (b *ValueBinder) UnixTime(sourceParam string, dest *time.Time) *ValueBinder {
 	return b.unixTime(sourceParam, dest, false, time.Second)
 }
@@ -1247,7 +1247,7 @@ func (b *ValueBinder) UnixTime(sourceParam string, dest *time.Time) *ValueBinder
 // Example: 1609180603 bind to 2020-12-28T18:36:43.000000000+00:00
 //
 // Note:
-//  * time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
+//   - time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
 func (b *ValueBinder) MustUnixTime(sourceParam string, dest *time.Time) *ValueBinder {
 	return b.unixTime(sourceParam, dest, true, time.Second)
 }
@@ -1257,7 +1257,7 @@ func (b *ValueBinder) MustUnixTime(sourceParam string, dest *time.Time) *ValueBi
 // Example: 1647184410140 bind to 2022-03-13T15:13:30.140000000+00:00
 //
 // Note:
-//  * time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
+//   - time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
 func (b *ValueBinder) UnixTimeMilli(sourceParam string, dest *time.Time) *ValueBinder {
 	return b.unixTime(sourceParam, dest, false, time.Millisecond)
 }
@@ -1268,7 +1268,7 @@ func (b *ValueBinder) UnixTimeMilli(sourceParam string, dest *time.Time) *ValueB
 // Example: 1647184410140 bind to 2022-03-13T15:13:30.140000000+00:00
 //
 // Note:
-//  * time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
+//   - time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
 func (b *ValueBinder) MustUnixTimeMilli(sourceParam string, dest *time.Time) *ValueBinder {
 	return b.unixTime(sourceParam, dest, true, time.Millisecond)
 }
@@ -1280,8 +1280,8 @@ func (b *ValueBinder) MustUnixTimeMilli(sourceParam string, dest *time.Time) *Va
 // Example:           999999999 binds to 1970-01-01T00:00:00.999999999+00:00
 //
 // Note:
-//  * time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
-//  * Javascript's Number type only has about 53 bits of precision (Number.MAX_SAFE_INTEGER = 9007199254740991). Compare it to 1609180603123456789 in example.
+//   - time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
+//   - Javascript's Number type only has about 53 bits of precision (Number.MAX_SAFE_INTEGER = 9007199254740991). Compare it to 1609180603123456789 in example.
 func (b *ValueBinder) UnixTimeNano(sourceParam string, dest *time.Time) *ValueBinder {
 	return b.unixTime(sourceParam, dest, false, time.Nanosecond)
 }
@@ -1294,8 +1294,8 @@ func (b *ValueBinder) UnixTimeNano(sourceParam string, dest *time.Time) *ValueBi
 // Example:           999999999 binds to 1970-01-01T00:00:00.999999999+00:00
 //
 // Note:
-//  * time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
-//  * Javascript's Number type only has about 53 bits of precision (Number.MAX_SAFE_INTEGER = 9007199254740991). Compare it to 1609180603123456789 in example.
+//   - time.Time{} (param is empty) and time.Unix(0,0) (param = "0") are not equal
+//   - Javascript's Number type only has about 53 bits of precision (Number.MAX_SAFE_INTEGER = 9007199254740991). Compare it to 1609180603123456789 in example.
 func (b *ValueBinder) MustUnixTimeNano(sourceParam string, dest *time.Time) *ValueBinder {
 	return b.unixTime(sourceParam, dest, true, time.Nanosecond)
 }
diff --git a/vendor/github.com/labstack/echo/v4/context.go b/vendor/github.com/labstack/echo/v4/context.go
index b3a7ce8d..27da28a9 100644
--- a/vendor/github.com/labstack/echo/v4/context.go
+++ b/vendor/github.com/labstack/echo/v4/context.go
@@ -100,8 +100,8 @@ type (
 		// Set saves data in the context.
 		Set(key string, val interface{})
 
-		// Bind binds the request body into provided type `i`. The default binder
-		// does it based on Content-Type header.
+		// Bind binds path params, query params and the request body into provided type `i`. The default binder
+		// binds body based on Content-Type header.
 		Bind(i interface{}) error
 
 		// Validate validates provided `i`. It is usually called after `Context#Bind()`.
diff --git a/vendor/github.com/labstack/echo/v4/echo.go b/vendor/github.com/labstack/echo/v4/echo.go
index 085a3a7f..22a5b7af 100644
--- a/vendor/github.com/labstack/echo/v4/echo.go
+++ b/vendor/github.com/labstack/echo/v4/echo.go
@@ -39,6 +39,7 @@ package echo
 import (
 	stdContext "context"
 	"crypto/tls"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -258,7 +259,7 @@ const (
 
 const (
 	// Version of Echo
-	Version = "4.10.2"
+	Version = "4.11.1"
 	website = "https://echo.labstack.com"
 	// http://patorjk.com/software/taag/#p=display&f=Small%20Slant&t=Echo
 	banner = `
@@ -438,12 +439,18 @@ func (e *Echo) DefaultHTTPErrorHandler(err error, c Context) {
 	// Issue #1426
 	code := he.Code
 	message := he.Message
-	if m, ok := he.Message.(string); ok {
+
+	switch m := he.Message.(type) {
+	case string:
 		if e.Debug {
 			message = Map{"message": m, "error": err.Error()}
 		} else {
 			message = Map{"message": m}
 		}
+	case json.Marshaler:
+		// do nothing - this type knows how to format itself to JSON
+	case error:
+		message = Map{"message": m.Error()}
 	}
 
 	// Send response
@@ -614,7 +621,7 @@ func (e *Echo) URL(h HandlerFunc, params ...interface{}) string {
 	return e.URI(h, params...)
 }
 
-// Reverse generates an URL from route name and provided parameters.
+// Reverse generates a URL from route name and provided parameters.
 func (e *Echo) Reverse(name string, params ...interface{}) string {
 	return e.router.Reverse(name, params...)
 }
diff --git a/vendor/github.com/labstack/echo/v4/group.go b/vendor/github.com/labstack/echo/v4/group.go
index 28ce0dd9..749a5caa 100644
--- a/vendor/github.com/labstack/echo/v4/group.go
+++ b/vendor/github.com/labstack/echo/v4/group.go
@@ -23,10 +23,12 @@ func (g *Group) Use(middleware ...MiddlewareFunc) {
 	if len(g.middleware) == 0 {
 		return
 	}
-	// Allow all requests to reach the group as they might get dropped if router
-	// doesn't find a match, making none of the group middleware process.
-	g.Any("", NotFoundHandler)
-	g.Any("/*", NotFoundHandler)
+	// group level middlewares are different from Echo `Pre` and `Use` middlewares (those are global). Group level middlewares
+	// are only executed if they are added to the Router with route.
+	// So we register catch all route (404 is a safe way to emulate route match) for this group and now during routing the
+	// Router would find route to match our request path and therefore guarantee the middleware(s) will get executed.
+	g.RouteNotFound("", NotFoundHandler)
+	g.RouteNotFound("/*", NotFoundHandler)
 }
 
 // CONNECT implements `Echo#CONNECT()` for sub-routes within the Group.
diff --git a/vendor/github.com/labstack/echo/v4/middleware/basic_auth.go b/vendor/github.com/labstack/echo/v4/middleware/basic_auth.go
index 52ef1042..f9e8caaf 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/basic_auth.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/basic_auth.go
@@ -2,9 +2,9 @@ package middleware
 
 import (
 	"encoding/base64"
+	"net/http"
 	"strconv"
 	"strings"
-	"net/http"
 
 	"github.com/labstack/echo/v4"
 )
diff --git a/vendor/github.com/labstack/echo/v4/middleware/compress.go b/vendor/github.com/labstack/echo/v4/middleware/compress.go
index 9e5f6106..3e9bd320 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/compress.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/compress.go
@@ -2,6 +2,7 @@ package middleware
 
 import (
 	"bufio"
+	"bytes"
 	"compress/gzip"
 	"io"
 	"net"
@@ -21,12 +22,30 @@ type (
 		// Gzip compression level.
 		// Optional. Default value -1.
 		Level int `yaml:"level"`
+
+		// Length threshold before gzip compression is applied.
+		// Optional. Default value 0.
+		//
+		// Most of the time you will not need to change the default. Compressing
+		// a short response might increase the transmitted data because of the
+		// gzip format overhead. Compressing the response will also consume CPU
+		// and time on the server and the client (for decompressing). Depending on
+		// your use case such a threshold might be useful.
+		//
+		// See also:
+		// https://webmasters.stackexchange.com/questions/31750/what-is-recommended-minimum-object-size-for-gzip-performance-benefits
+		MinLength int
 	}
 
 	gzipResponseWriter struct {
 		io.Writer
 		http.ResponseWriter
-		wroteBody bool
+		wroteHeader       bool
+		wroteBody         bool
+		minLength         int
+		minLengthExceeded bool
+		buffer            *bytes.Buffer
+		code              int
 	}
 )
 
@@ -37,8 +56,9 @@ const (
 var (
 	// DefaultGzipConfig is the default Gzip middleware config.
 	DefaultGzipConfig = GzipConfig{
-		Skipper: DefaultSkipper,
-		Level:   -1,
+		Skipper:   DefaultSkipper,
+		Level:     -1,
+		MinLength: 0,
 	}
 )
 
@@ -58,8 +78,12 @@ func GzipWithConfig(config GzipConfig) echo.MiddlewareFunc {
 	if config.Level == 0 {
 		config.Level = DefaultGzipConfig.Level
 	}
+	if config.MinLength < 0 {
+		config.MinLength = DefaultGzipConfig.MinLength
+	}
 
 	pool := gzipCompressPool(config)
+	bpool := bufferPool()
 
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
@@ -70,7 +94,6 @@ func GzipWithConfig(config GzipConfig) echo.MiddlewareFunc {
 			res := c.Response()
 			res.Header().Add(echo.HeaderVary, echo.HeaderAcceptEncoding)
 			if strings.Contains(c.Request().Header.Get(echo.HeaderAcceptEncoding), gzipScheme) {
-				res.Header().Set(echo.HeaderContentEncoding, gzipScheme) // Issue #806
 				i := pool.Get()
 				w, ok := i.(*gzip.Writer)
 				if !ok {
@@ -78,19 +101,38 @@ func GzipWithConfig(config GzipConfig) echo.MiddlewareFunc {
 				}
 				rw := res.Writer
 				w.Reset(rw)
-				grw := &gzipResponseWriter{Writer: w, ResponseWriter: rw}
+
+				buf := bpool.Get().(*bytes.Buffer)
+				buf.Reset()
+
+				grw := &gzipResponseWriter{Writer: w, ResponseWriter: rw, minLength: config.MinLength, buffer: buf}
 				defer func() {
+					// There are different reasons for cases when we have not yet written response to the client and now need to do so.
+					// a) handler response had only response code and no response body (ala 404 or redirects etc). Response code need to be written now.
+					// b) body is shorter than our minimum length threshold and being buffered currently and needs to be written
 					if !grw.wroteBody {
 						if res.Header().Get(echo.HeaderContentEncoding) == gzipScheme {
 							res.Header().Del(echo.HeaderContentEncoding)
 						}
+						if grw.wroteHeader {
+							rw.WriteHeader(grw.code)
+						}
 						// We have to reset response to it's pristine state when
 						// nothing is written to body or error is returned.
 						// See issue #424, #407.
 						res.Writer = rw
 						w.Reset(io.Discard)
+					} else if !grw.minLengthExceeded {
+						// Write uncompressed response
+						res.Writer = rw
+						if grw.wroteHeader {
+							grw.ResponseWriter.WriteHeader(grw.code)
+						}
+						grw.buffer.WriteTo(rw)
+						w.Reset(io.Discard)
 					}
 					w.Close()
+					bpool.Put(buf)
 					pool.Put(w)
 				}()
 				res.Writer = grw
@@ -102,7 +144,11 @@ func GzipWithConfig(config GzipConfig) echo.MiddlewareFunc {
 
 func (w *gzipResponseWriter) WriteHeader(code int) {
 	w.Header().Del(echo.HeaderContentLength) // Issue #444
-	w.ResponseWriter.WriteHeader(code)
+
+	w.wroteHeader = true
+
+	// Delay writing of the header until we know if we'll actually compress the response
+	w.code = code
 }
 
 func (w *gzipResponseWriter) Write(b []byte) (int, error) {
@@ -110,10 +156,40 @@ func (w *gzipResponseWriter) Write(b []byte) (int, error) {
 		w.Header().Set(echo.HeaderContentType, http.DetectContentType(b))
 	}
 	w.wroteBody = true
+
+	if !w.minLengthExceeded {
+		n, err := w.buffer.Write(b)
+
+		if w.buffer.Len() >= w.minLength {
+			w.minLengthExceeded = true
+
+			// The minimum length is exceeded, add Content-Encoding header and write the header
+			w.Header().Set(echo.HeaderContentEncoding, gzipScheme) // Issue #806
+			if w.wroteHeader {
+				w.ResponseWriter.WriteHeader(w.code)
+			}
+
+			return w.Writer.Write(w.buffer.Bytes())
+		}
+
+		return n, err
+	}
+
 	return w.Writer.Write(b)
 }
 
 func (w *gzipResponseWriter) Flush() {
+	if !w.minLengthExceeded {
+		// Enforce compression because we will not know how much more data will come
+		w.minLengthExceeded = true
+		w.Header().Set(echo.HeaderContentEncoding, gzipScheme) // Issue #806
+		if w.wroteHeader {
+			w.ResponseWriter.WriteHeader(w.code)
+		}
+
+		w.Writer.Write(w.buffer.Bytes())
+	}
+
 	w.Writer.(*gzip.Writer).Flush()
 	if flusher, ok := w.ResponseWriter.(http.Flusher); ok {
 		flusher.Flush()
@@ -142,3 +218,12 @@ func gzipCompressPool(config GzipConfig) sync.Pool {
 		},
 	}
 }
+
+func bufferPool() sync.Pool {
+	return sync.Pool{
+		New: func() interface{} {
+			b := &bytes.Buffer{}
+			return b
+		},
+	}
+}
diff --git a/vendor/github.com/labstack/echo/v4/middleware/cors.go b/vendor/github.com/labstack/echo/v4/middleware/cors.go
index 149de347..6ddb540a 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/cors.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/cors.go
@@ -150,8 +150,8 @@ func CORSWithConfig(config CORSConfig) echo.MiddlewareFunc {
 	allowOriginPatterns := []string{}
 	for _, origin := range config.AllowOrigins {
 		pattern := regexp.QuoteMeta(origin)
-		pattern = strings.Replace(pattern, "\\*", ".*", -1)
-		pattern = strings.Replace(pattern, "\\?", ".", -1)
+		pattern = strings.ReplaceAll(pattern, "\\*", ".*")
+		pattern = strings.ReplaceAll(pattern, "\\?", ".")
 		pattern = "^" + pattern + "$"
 		allowOriginPatterns = append(allowOriginPatterns, pattern)
 	}
diff --git a/vendor/github.com/labstack/echo/v4/middleware/decompress.go b/vendor/github.com/labstack/echo/v4/middleware/decompress.go
index 88ec7098..a73c9738 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/decompress.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/decompress.go
@@ -20,7 +20,7 @@ type (
 	}
 )
 
-//GZIPEncoding content-encoding header if set to "gzip", decompress body contents.
+// GZIPEncoding content-encoding header if set to "gzip", decompress body contents.
 const GZIPEncoding string = "gzip"
 
 // Decompressor is used to get the sync.Pool used by the middleware to get Gzip readers
@@ -44,12 +44,12 @@ func (d *DefaultGzipDecompressPool) gzipDecompressPool() sync.Pool {
 	return sync.Pool{New: func() interface{} { return new(gzip.Reader) }}
 }
 
-//Decompress decompresses request body based if content encoding type is set to "gzip" with default config
+// Decompress decompresses request body based if content encoding type is set to "gzip" with default config
 func Decompress() echo.MiddlewareFunc {
 	return DecompressWithConfig(DefaultDecompressConfig)
 }
 
-//DecompressWithConfig decompresses request body based if content encoding type is set to "gzip" with config
+// DecompressWithConfig decompresses request body based if content encoding type is set to "gzip" with config
 func DecompressWithConfig(config DecompressConfig) echo.MiddlewareFunc {
 	// Defaults
 	if config.Skipper == nil {
diff --git a/vendor/github.com/labstack/echo/v4/middleware/middleware.go b/vendor/github.com/labstack/echo/v4/middleware/middleware.go
index f250ca49..664f71f4 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/middleware.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/middleware.go
@@ -38,9 +38,9 @@ func rewriteRulesRegex(rewrite map[string]string) map[*regexp.Regexp]string {
 	rulesRegex := map[*regexp.Regexp]string{}
 	for k, v := range rewrite {
 		k = regexp.QuoteMeta(k)
-		k = strings.Replace(k, `\*`, "(.*?)", -1)
+		k = strings.ReplaceAll(k, `\*`, "(.*?)")
 		if strings.HasPrefix(k, `\^`) {
-			k = strings.Replace(k, `\^`, "^", -1)
+			k = strings.ReplaceAll(k, `\^`, "^")
 		}
 		k = k + "$"
 		rulesRegex[regexp.MustCompile(k)] = v
diff --git a/vendor/github.com/labstack/echo/v4/middleware/proxy.go b/vendor/github.com/labstack/echo/v4/middleware/proxy.go
index d2cd2aa6..e4f98d9e 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/proxy.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/proxy.go
@@ -12,7 +12,6 @@ import (
 	"regexp"
 	"strings"
 	"sync"
-	"sync/atomic"
 	"time"
 
 	"github.com/labstack/echo/v4"
@@ -30,6 +29,33 @@ type (
 		// Required.
 		Balancer ProxyBalancer
 
+		// RetryCount defines the number of times a failed proxied request should be retried
+		// using the next available ProxyTarget. Defaults to 0, meaning requests are never retried.
+		RetryCount int
+
+		// RetryFilter defines a function used to determine if a failed request to a
+		// ProxyTarget should be retried. The RetryFilter will only be called when the number
+		// of previous retries is less than RetryCount. If the function returns true, the
+		// request will be retried. The provided error indicates the reason for the request
+		// failure. When the ProxyTarget is unavailable, the error will be an instance of
+		// echo.HTTPError with a Code of http.StatusBadGateway. In all other cases, the error
+		// will indicate an internal error in the Proxy middleware. When a RetryFilter is not
+		// specified, all requests that fail with http.StatusBadGateway will be retried. A custom
+		// RetryFilter can be provided to only retry specific requests. Note that RetryFilter is
+		// only called when the request to the target fails, or an internal error in the Proxy
+		// middleware has occurred. Successful requests that return a non-200 response code cannot
+		// be retried.
+		RetryFilter func(c echo.Context, e error) bool
+
+		// ErrorHandler defines a function which can be used to return custom errors from
+		// the Proxy middleware. ErrorHandler is only invoked when there has been
+		// either an internal error in the Proxy middleware or the ProxyTarget is
+		// unavailable. Due to the way requests are proxied, ErrorHandler is not invoked
+		// when a ProxyTarget returns a non-200 response. In these cases, the response
+		// is already written so errors cannot be modified. ErrorHandler is only
+		// invoked after all retry attempts have been exhausted.
+		ErrorHandler func(c echo.Context, err error) error
+
 		// Rewrite defines URL path rewrite rules. The values captured in asterisk can be
 		// retrieved by index e.g. $1, $2 and so on.
 		// Examples:
@@ -72,26 +98,28 @@ type (
 		Next(echo.Context) *ProxyTarget
 	}
 
-	// TargetProvider defines an interface that gives the opportunity for balancer to return custom errors when selecting target.
+	// TargetProvider defines an interface that gives the opportunity for balancer
+	// to return custom errors when selecting target.
 	TargetProvider interface {
 		NextTarget(echo.Context) (*ProxyTarget, error)
 	}
 
 	commonBalancer struct {
 		targets []*ProxyTarget
-		mutex   sync.RWMutex
+		mutex   sync.Mutex
 	}
 
 	// RandomBalancer implements a random load balancing technique.
 	randomBalancer struct {
-		*commonBalancer
+		commonBalancer
 		random *rand.Rand
 	}
 
 	// RoundRobinBalancer implements a round-robin load balancing technique.
 	roundRobinBalancer struct {
-		*commonBalancer
-		i uint32
+		commonBalancer
+		// tracking the index on `targets` slice for the next `*ProxyTarget` to be used
+		i int
 	}
 )
 
@@ -107,14 +135,14 @@ func proxyRaw(t *ProxyTarget, c echo.Context) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		in, _, err := c.Response().Hijack()
 		if err != nil {
-			c.Set("_error", fmt.Sprintf("proxy raw, hijack error=%v, url=%s", t.URL, err))
+			c.Set("_error", fmt.Errorf("proxy raw, hijack error=%w, url=%s", err, t.URL))
 			return
 		}
 		defer in.Close()
 
 		out, err := net.Dial("tcp", t.URL.Host)
 		if err != nil {
-			c.Set("_error", echo.NewHTTPError(http.StatusBadGateway, fmt.Sprintf("proxy raw, dial error=%v, url=%s", t.URL, err)))
+			c.Set("_error", echo.NewHTTPError(http.StatusBadGateway, fmt.Sprintf("proxy raw, dial error=%v, url=%s", err, t.URL)))
 			return
 		}
 		defer out.Close()
@@ -122,7 +150,7 @@ func proxyRaw(t *ProxyTarget, c echo.Context) http.Handler {
 		// Write header
 		err = r.Write(out)
 		if err != nil {
-			c.Set("_error", echo.NewHTTPError(http.StatusBadGateway, fmt.Sprintf("proxy raw, request header copy error=%v, url=%s", t.URL, err)))
+			c.Set("_error", echo.NewHTTPError(http.StatusBadGateway, fmt.Sprintf("proxy raw, request header copy error=%v, url=%s", err, t.URL)))
 			return
 		}
 
@@ -136,39 +164,44 @@ func proxyRaw(t *ProxyTarget, c echo.Context) http.Handler {
 		go cp(in, out)
 		err = <-errCh
 		if err != nil && err != io.EOF {
-			c.Set("_error", fmt.Errorf("proxy raw, copy body error=%v, url=%s", t.URL, err))
+			c.Set("_error", fmt.Errorf("proxy raw, copy body error=%w, url=%s", err, t.URL))
 		}
 	})
 }
 
 // NewRandomBalancer returns a random proxy balancer.
 func NewRandomBalancer(targets []*ProxyTarget) ProxyBalancer {
-	b := &randomBalancer{commonBalancer: new(commonBalancer)}
+	b := randomBalancer{}
 	b.targets = targets
-	return b
+	b.random = rand.New(rand.NewSource(int64(time.Now().Nanosecond())))
+	return &b
 }
 
 // NewRoundRobinBalancer returns a round-robin proxy balancer.
 func NewRoundRobinBalancer(targets []*ProxyTarget) ProxyBalancer {
-	b := &roundRobinBalancer{commonBalancer: new(commonBalancer)}
+	b := roundRobinBalancer{}
 	b.targets = targets
-	return b
+	return &b
 }
 
-// AddTarget adds an upstream target to the list.
+// AddTarget adds an upstream target to the list and returns `true`.
+//
+// However, if a target with the same name already exists then the operation is aborted returning `false`.
 func (b *commonBalancer) AddTarget(target *ProxyTarget) bool {
+	b.mutex.Lock()
+	defer b.mutex.Unlock()
 	for _, t := range b.targets {
 		if t.Name == target.Name {
 			return false
 		}
 	}
-	b.mutex.Lock()
-	defer b.mutex.Unlock()
 	b.targets = append(b.targets, target)
 	return true
 }
 
-// RemoveTarget removes an upstream target from the list.
+// RemoveTarget removes an upstream target from the list by name.
+//
+// Returns `true` on success, `false` if no target with the name is found.
 func (b *commonBalancer) RemoveTarget(name string) bool {
 	b.mutex.Lock()
 	defer b.mutex.Unlock()
@@ -182,21 +215,58 @@ func (b *commonBalancer) RemoveTarget(name string) bool {
 }
 
 // Next randomly returns an upstream target.
+//
+// Note: `nil` is returned in case upstream target list is empty.
 func (b *randomBalancer) Next(c echo.Context) *ProxyTarget {
-	if b.random == nil {
-		b.random = rand.New(rand.NewSource(int64(time.Now().Nanosecond())))
+	b.mutex.Lock()
+	defer b.mutex.Unlock()
+	if len(b.targets) == 0 {
+		return nil
+	} else if len(b.targets) == 1 {
+		return b.targets[0]
 	}
-	b.mutex.RLock()
-	defer b.mutex.RUnlock()
 	return b.targets[b.random.Intn(len(b.targets))]
 }
 
-// Next returns an upstream target using round-robin technique.
+// Next returns an upstream target using round-robin technique. In the case
+// where a previously failed request is being retried, the round-robin
+// balancer will attempt to use the next target relative to the original
+// request. If the list of targets held by the balancer is modified while a
+// failed request is being retried, it is possible that the balancer will
+// return the original failed target.
+//
+// Note: `nil` is returned in case upstream target list is empty.
 func (b *roundRobinBalancer) Next(c echo.Context) *ProxyTarget {
-	b.i = b.i % uint32(len(b.targets))
-	t := b.targets[b.i]
-	atomic.AddUint32(&b.i, 1)
-	return t
+	b.mutex.Lock()
+	defer b.mutex.Unlock()
+	if len(b.targets) == 0 {
+		return nil
+	} else if len(b.targets) == 1 {
+		return b.targets[0]
+	}
+
+	var i int
+	const lastIdxKey = "_round_robin_last_index"
+	// This request is a retry, start from the index of the previous
+	// target to ensure we don't attempt to retry the request with
+	// the same failed target
+	if c.Get(lastIdxKey) != nil {
+		i = c.Get(lastIdxKey).(int)
+		i++
+		if i >= len(b.targets) {
+			i = 0
+		}
+	} else {
+		// This is a first time request, use the global index
+		if b.i >= len(b.targets) {
+			b.i = 0
+		}
+		i = b.i
+		b.i++
+	}
+
+	c.Set(lastIdxKey, i)
+	return b.targets[i]
 }
 
 // Proxy returns a Proxy middleware.
@@ -211,14 +281,26 @@ func Proxy(balancer ProxyBalancer) echo.MiddlewareFunc {
 // ProxyWithConfig returns a Proxy middleware with config.
 // See: `Proxy()`
 func ProxyWithConfig(config ProxyConfig) echo.MiddlewareFunc {
+	if config.Balancer == nil {
+		panic("echo: proxy middleware requires balancer")
+	}
 	// Defaults
 	if config.Skipper == nil {
 		config.Skipper = DefaultProxyConfig.Skipper
 	}
-	if config.Balancer == nil {
-		panic("echo: proxy middleware requires balancer")
+	if config.RetryFilter == nil {
+		config.RetryFilter = func(c echo.Context, e error) bool {
+			if httpErr, ok := e.(*echo.HTTPError); ok {
+				return httpErr.Code == http.StatusBadGateway
+			}
+			return false
+		}
+	}
+	if config.ErrorHandler == nil {
+		config.ErrorHandler = func(c echo.Context, err error) error {
+			return err
+		}
 	}
-
 	if config.Rewrite != nil {
 		if config.RegexRewrite == nil {
 			config.RegexRewrite = make(map[*regexp.Regexp]string)
@@ -229,28 +311,17 @@ func ProxyWithConfig(config ProxyConfig) echo.MiddlewareFunc {
 	}
 
 	provider, isTargetProvider := config.Balancer.(TargetProvider)
+
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
-		return func(c echo.Context) (err error) {
+		return func(c echo.Context) error {
 			if config.Skipper(c) {
 				return next(c)
 			}
 
 			req := c.Request()
 			res := c.Response()
-
-			var tgt *ProxyTarget
-			if isTargetProvider {
-				tgt, err = provider.NextTarget(c)
-				if err != nil {
-					return err
-				}
-			} else {
-				tgt = config.Balancer.Next(c)
-			}
-			c.Set(config.ContextKey, tgt)
-
 			if err := rewriteURL(config.RegexRewrite, req); err != nil {
-				return err
+				return config.ErrorHandler(c, err)
 			}
 
 			// Fix header
@@ -266,19 +337,49 @@ func ProxyWithConfig(config ProxyConfig) echo.MiddlewareFunc {
 				req.Header.Set(echo.HeaderXForwardedFor, c.RealIP())
 			}
 
-			// Proxy
-			switch {
-			case c.IsWebSocket():
-				proxyRaw(tgt, c).ServeHTTP(res, req)
-			case req.Header.Get(echo.HeaderAccept) == "text/event-stream":
-			default:
-				proxyHTTP(tgt, c, config).ServeHTTP(res, req)
-			}
-			if e, ok := c.Get("_error").(error); ok {
-				err = e
-			}
+			retries := config.RetryCount
+			for {
+				var tgt *ProxyTarget
+				var err error
+				if isTargetProvider {
+					tgt, err = provider.NextTarget(c)
+					if err != nil {
+						return config.ErrorHandler(c, err)
+					}
+				} else {
+					tgt = config.Balancer.Next(c)
+				}
 
-			return
+				c.Set(config.ContextKey, tgt)
+
+				//If retrying a failed request, clear any previous errors from
+				//context here so that balancers have the option to check for
+				//errors that occurred using previous target
+				if retries < config.RetryCount {
+					c.Set("_error", nil)
+				}
+
+				// Proxy
+				switch {
+				case c.IsWebSocket():
+					proxyRaw(tgt, c).ServeHTTP(res, req)
+				case req.Header.Get(echo.HeaderAccept) == "text/event-stream":
+				default:
+					proxyHTTP(tgt, c, config).ServeHTTP(res, req)
+				}
+
+				err, hasError := c.Get("_error").(error)
+				if !hasError {
+					return nil
+				}
+
+				retry := retries > 0 && config.RetryFilter(c, err)
+				if !retry {
+					return config.ErrorHandler(c, err)
+				}
+
+				retries--
+			}
 		}
 	}
 }
diff --git a/vendor/github.com/labstack/echo/v4/middleware/rate_limiter.go b/vendor/github.com/labstack/echo/v4/middleware/rate_limiter.go
index f7fae83c..1d24df52 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/rate_limiter.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/rate_limiter.go
@@ -160,6 +160,8 @@ type (
 		burst       int
 		expiresIn   time.Duration
 		lastCleanup time.Time
+
+		timeNow func() time.Time
 	}
 	// Visitor signifies a unique user's limiter details
 	Visitor struct {
@@ -219,7 +221,8 @@ func NewRateLimiterMemoryStoreWithConfig(config RateLimiterMemoryStoreConfig) (s
 		store.burst = int(config.Rate)
 	}
 	store.visitors = make(map[string]*Visitor)
-	store.lastCleanup = now()
+	store.timeNow = time.Now
+	store.lastCleanup = store.timeNow()
 	return
 }
 
@@ -244,12 +247,13 @@ func (store *RateLimiterMemoryStore) Allow(identifier string) (bool, error) {
 		limiter.Limiter = rate.NewLimiter(store.rate, store.burst)
 		store.visitors[identifier] = limiter
 	}
-	limiter.lastSeen = now()
-	if now().Sub(store.lastCleanup) > store.expiresIn {
+	now := store.timeNow()
+	limiter.lastSeen = now
+	if now.Sub(store.lastCleanup) > store.expiresIn {
 		store.cleanupStaleVisitors()
 	}
 	store.mutex.Unlock()
-	return limiter.AllowN(now(), 1), nil
+	return limiter.AllowN(store.timeNow(), 1), nil
 }
 
 /*
@@ -258,14 +262,9 @@ of users who haven't visited again after the configured expiry time has elapsed
 */
 func (store *RateLimiterMemoryStore) cleanupStaleVisitors() {
 	for id, visitor := range store.visitors {
-		if now().Sub(visitor.lastSeen) > store.expiresIn {
+		if store.timeNow().Sub(visitor.lastSeen) > store.expiresIn {
 			delete(store.visitors, id)
 		}
 	}
-	store.lastCleanup = now()
+	store.lastCleanup = store.timeNow()
 }
-
-/*
-actual time method which is mocked in test file
-*/
-var now = time.Now
diff --git a/vendor/github.com/labstack/echo/v4/middleware/recover.go b/vendor/github.com/labstack/echo/v4/middleware/recover.go
index 7b612853..0466cfe5 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/recover.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/recover.go
@@ -37,19 +37,26 @@ type (
 
 		// LogErrorFunc defines a function for custom logging in the middleware.
 		// If it's set you don't need to provide LogLevel for config.
+		// If this function returns nil, the centralized HTTPErrorHandler will not be called.
 		LogErrorFunc LogErrorFunc
+
+		// DisableErrorHandler disables the call to centralized HTTPErrorHandler.
+		// The recovered error is then passed back to upstream middleware, instead of swallowing the error.
+		// Optional. Default value false.
+		DisableErrorHandler bool `yaml:"disable_error_handler"`
 	}
 )
 
 var (
 	// DefaultRecoverConfig is the default Recover middleware config.
 	DefaultRecoverConfig = RecoverConfig{
-		Skipper:           DefaultSkipper,
-		StackSize:         4 << 10, // 4 KB
-		DisableStackAll:   false,
-		DisablePrintStack: false,
-		LogLevel:          0,
-		LogErrorFunc:      nil,
+		Skipper:             DefaultSkipper,
+		StackSize:           4 << 10, // 4 KB
+		DisableStackAll:     false,
+		DisablePrintStack:   false,
+		LogLevel:            0,
+		LogErrorFunc:        nil,
+		DisableErrorHandler: false,
 	}
 )
 
@@ -71,7 +78,7 @@ func RecoverWithConfig(config RecoverConfig) echo.MiddlewareFunc {
 	}
 
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
-		return func(c echo.Context) error {
+		return func(c echo.Context) (returnErr error) {
 			if config.Skipper(c) {
 				return next(c)
 			}
@@ -113,7 +120,12 @@ func RecoverWithConfig(config RecoverConfig) echo.MiddlewareFunc {
 							c.Logger().Print(msg)
 						}
 					}
-					c.Error(err)
+
+					if err != nil && !config.DisableErrorHandler {
+						c.Error(err)
+					} else {
+						returnErr = err
+					}
 				}
 			}()
 			return next(c)
diff --git a/vendor/github.com/labstack/echo/v4/middleware/request_logger.go b/vendor/github.com/labstack/echo/v4/middleware/request_logger.go
index b9e36925..ce76230c 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/request_logger.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/request_logger.go
@@ -225,7 +225,7 @@ func (config RequestLoggerConfig) ToMiddleware() (echo.MiddlewareFunc, error) {
 	if config.Skipper == nil {
 		config.Skipper = DefaultSkipper
 	}
-	now = time.Now
+	now := time.Now
 	if config.timeNow != nil {
 		now = config.timeNow
 	}
@@ -257,7 +257,7 @@ func (config RequestLoggerConfig) ToMiddleware() (echo.MiddlewareFunc, error) {
 				config.BeforeNextFunc(c)
 			}
 			err := next(c)
-			if config.HandleError {
+			if err != nil && config.HandleError {
 				c.Error(err)
 			}
 
diff --git a/vendor/github.com/labstack/echo/v4/response.go b/vendor/github.com/labstack/echo/v4/response.go
index 84f7c9e7..d9c9aa6e 100644
--- a/vendor/github.com/labstack/echo/v4/response.go
+++ b/vendor/github.com/labstack/echo/v4/response.go
@@ -94,6 +94,13 @@ func (r *Response) Hijack() (net.Conn, *bufio.ReadWriter, error) {
 	return r.Writer.(http.Hijacker).Hijack()
 }
 
+// Unwrap returns the original http.ResponseWriter.
+// ResponseController can be used to access the original http.ResponseWriter.
+// See [https://go.dev/blog/go1.20]
+func (r *Response) Unwrap() http.ResponseWriter {
+	return r.Writer
+}
+
 func (r *Response) reset(w http.ResponseWriter) {
 	r.beforeFuncs = nil
 	r.afterFuncs = nil
diff --git a/vendor/github.com/labstack/echo/v4/router.go b/vendor/github.com/labstack/echo/v4/router.go
index 597660d3..ee6f3fa4 100644
--- a/vendor/github.com/labstack/echo/v4/router.go
+++ b/vendor/github.com/labstack/echo/v4/router.go
@@ -151,7 +151,7 @@ func (r *Router) Routes() []*Route {
 	return routes
 }
 
-// Reverse generates an URL from route name and provided parameters.
+// Reverse generates a URL from route name and provided parameters.
 func (r *Router) Reverse(name string, params ...interface{}) string {
 	uri := new(bytes.Buffer)
 	ln := len(params)
@@ -159,7 +159,12 @@ func (r *Router) Reverse(name string, params ...interface{}) string {
 	for _, route := range r.routes {
 		if route.Name == name {
 			for i, l := 0, len(route.Path); i < l; i++ {
-				if (route.Path[i] == ':' || route.Path[i] == '*') && n < ln {
+				hasBackslash := route.Path[i] == '\\'
+				if hasBackslash && i+1 < l && route.Path[i+1] == ':' {
+					i++ // backslash before colon escapes that colon. in that case skip backslash
+				}
+				if n < ln && (route.Path[i] == '*' || (!hasBackslash && route.Path[i] == ':')) {
+					// in case of `*` wildcard or `:` (unescaped colon) param we replace everything till next slash or end of path
 					for ; i < l && route.Path[i] != '/'; i++ {
 					}
 					uri.WriteString(fmt.Sprintf("%v", params[n]))
diff --git a/vendor/github.com/lrstanley/girc/.editorconfig b/vendor/github.com/lrstanley/girc/.editorconfig
index 32ecf3ee..4ae34fde 100644
--- a/vendor/github.com/lrstanley/girc/.editorconfig
+++ b/vendor/github.com/lrstanley/girc/.editorconfig
@@ -1,6 +1,9 @@
 # THIS FILE IS GENERATED! DO NOT EDIT! Maintained by Terraform.
 #
-# editorconfig.org
+# editorconfig:  https://editorconfig.org/
+# actual source: https://github.com/lrstanley/.github/blob/master/terraform/github-common-files/templates/.editorconfig
+#
+
 root = true
 
 [*]
diff --git a/vendor/github.com/lrstanley/girc/.golangci.yml b/vendor/github.com/lrstanley/girc/.golangci.yml
index 1a8320c9..1b4e7221 100644
--- a/vendor/github.com/lrstanley/girc/.golangci.yml
+++ b/vendor/github.com/lrstanley/girc/.golangci.yml
@@ -1,11 +1,33 @@
 # THIS FILE IS GENERATED! DO NOT EDIT! Maintained by Terraform.
+#
+# golangci-lint:       https://golangci-lint.run/
+# false-positives:     https://golangci-lint.run/usage/false-positives/
+# actual source:       https://github.com/lrstanley/.github/blob/master/terraform/github-common-files/templates/.golangci.yml
+# modified variant of: https://gist.github.com/maratori/47a4d00457a92aa426dbd48a18776322
+#
+
 run:
-  tests: False
   timeout: 3m
 
 issues:
   max-per-linter: 0
-  max-same-issues: 0
+  # max-same-issues: 0
+  max-same-issues: 50
+
+  exclude-rules:
+    - source: "(noinspection|TODO)"
+      linters: [godot]
+    - source: "//noinspection"
+      linters: [gocritic]
+    - path: "_test\\.go"
+      linters:
+        - bodyclose
+        - dupl
+        - funlen
+        - goconst
+        - gosec
+        - noctx
+        - wrapcheck
 
 severity:
   default-severity: error
@@ -16,17 +38,102 @@ severity:
       severity: warning
 
 linters:
+  disable-all: true
   enable:
-    - asciicheck
-    - exportloopref
-    - gci
-    - gocritic
-    - gofmt
-    - misspell
+    - asasalint # checks for pass []any as any in variadic func(...any)
+    - asciicheck # checks that your code does not contain non-ASCII identifiers
+    - bidichk # checks for dangerous unicode character sequences
+    - bodyclose # checks whether HTTP response body is closed successfully
+    - cyclop # checks function and package cyclomatic complexity
+    - dupl # tool for code clone detection
+    - durationcheck # checks for two durations multiplied together
+    - errcheck # checking for unchecked errors, these unchecked errors can be critical bugs in some cases
+    - errorlint # finds code that will cause problems with the error wrapping scheme introduced in Go 1.13
+    - execinquery # checks query string in Query function which reads your Go src files and warning it finds
+    - exportloopref # checks for pointers to enclosing loop variables
+    - forbidigo # forbids identifiers
+    - funlen # tool for detection of long functions
+    - gci # controls golang package import order and makes it always deterministic
+    - gocheckcompilerdirectives # validates go compiler directive comments (//go:)
+    - gochecknoinits # checks that no init functions are present in Go code
+    - goconst # finds repeated strings that could be replaced by a constant
+    - gocritic # provides diagnostics that check for bugs, performance and style issues
+    - gocyclo # computes and checks the cyclomatic complexity of functions
+    - godot # checks if comments end in a period
+    - godox # detects FIXME, TODO and other comment keywords
+    - goimports # in addition to fixing imports, goimports also formats your code in the same style as gofmt
+    - gomnd # detects magic numbers
+    - gomoddirectives # manages the use of 'replace', 'retract', and 'excludes' directives in go.mod
+    - gomodguard # allow and block lists linter for direct Go module dependencies. This is different from depguard where there are different block types for example version constraints and module recommendations
+    - goprintffuncname # checks that printf-like functions are named with f at the end
+    - gosec # inspects source code for security problems
+    - gosimple # specializes in simplifying a code
+    - govet # reports suspicious constructs, such as Printf calls whose arguments do not align with the format string
+    - ineffassign # detects when assignments to existing variables are not used
+    - loggercheck # checks key value pairs for common logger libraries (kitlog,klog,logr,zap)
+    - makezero # finds slice declarations with non-zero initial length
+    - misspell # finds commonly misspelled words
+    - musttag # enforces field tags in (un)marshaled structs
+    - nakedret # finds naked returns in functions greater than a specified function length
+    - nilerr # finds the code that returns nil even if it checks that the error is not nil
+    - nilnil # checks that there is no simultaneous return of nil error and an invalid value
+    - noctx # finds sending http request without context.Context
+    - nosprintfhostport # checks for misuse of Sprintf to construct a host with port in a URL
+    - predeclared # finds code that shadows one of Go's predeclared identifiers
+    - promlinter # checks Prometheus metrics naming via promlint
+    - reassign # checks that package variables are not reassigned
+    - revive # fast, configurable, extensible, flexible, and beautiful linter for Go, drop-in replacement of golint
+    - rowserrcheck # checks whether Err of rows is checked successfully
+    - sqlclosecheck # checks that sql.Rows and sql.Stmt are closed
+    - staticcheck # is a go vet on steroids, applying a ton of static analysis checks
+    - stylecheck # is a replacement for golint
+    - tenv # detects using os.Setenv instead of t.Setenv since Go1.17
+    - testableexamples # checks if examples are testable (have an expected output)
+    - tparallel # detects inappropriate usage of t.Parallel() method in your Go test codes
+    - typecheck # like the front-end of a Go compiler, parses and type-checks Go code
+    - unconvert # removes unnecessary type conversions
+    - unparam # reports unused function parameters
+    - unused # checks for unused constants, variables, functions and types
+    - usestdlibvars # detects the possibility to use variables/constants from the Go standard library
+    - wastedassign # finds wasted assignment statements
+    - whitespace # detects leading and trailing whitespace
+
+    # disabled for now:
+    # - errname # checks that sentinel errors are prefixed with the Err and error types are suffixed with the Error
+    # - gochecknoglobals # checks that no global variables exist
+    # - gocognit # computes and checks the cognitive complexity of functions
+    # - nestif # reports deeply nested if statements
+    # - nonamedreturns # reports all named returns
+    # - testpackage # makes you use a separate _test package
 
 linters-settings:
+  cyclop:
+    # The maximal code complexity to report.
+    max-complexity: 30
+    # The maximal average package complexity.
+    # If it's higher than 0.0 (float) the check is enabled
+    package-average: 10.0
+
+  errcheck:
+    # Report about not checking of errors in type assertions: `a := b.(MyStruct)`.
+    # Such cases aren't reported by default.
+    check-type-assertions: true
+
+  funlen:
+    # Checks the number of lines in a function.
+    # If lower than 0, disable the check.
+    lines: 150
+    # Checks the number of statements in a function.
+    # If lower than 0, disable the check.
+    statements: 75
+
+  # gocognit:
+  #   # Minimal code complexity to report.
+  #   min-complexity: 25
+
   gocritic:
     disabled-checks:
+      - whyNoLint
       - hugeParam
       - ifElseChain
     enabled-tags:
@@ -34,5 +141,71 @@ linters-settings:
       - opinionated
       - performance
       - style
+    # https://go-critic.github.io/overview.
+    settings:
+      captLocal:
+        # Whether to restrict checker to params only.
+        paramsOnly: false
+      underef:
+        # Whether to skip (*x).method() calls where x is a pointer receiver.
+        skipRecvDeref: false
+
+  gomnd:
+    # Values always ignored: `time.Date`,
+    # `strconv.FormatInt`, `strconv.FormatUint`, `strconv.FormatFloat`,
+    # `strconv.ParseInt`, `strconv.ParseUint`, `strconv.ParseFloat`.
+    ignored-functions:
+      - os.Chmod
+      - os.Mkdir
+      - os.MkdirAll
+      - os.OpenFile
+      - os.WriteFile
+      - prometheus.ExponentialBuckets
+      - prometheus.ExponentialBucketsRange
+      - prometheus.LinearBuckets
+
+  gomodguard:
+    blocked:
+      # List of blocked modules.
+      modules:
+        - github.com/golang/protobuf:
+            recommendations:
+              - google.golang.org/protobuf
+            reason: "see https://developers.google.com/protocol-buffers/docs/reference/go/faq#modules"
+        - github.com/satori/go.uuid:
+            recommendations:
+              - github.com/google/uuid
+            reason: "satori's package is not maintained"
+        - github.com/gofrs/uuid:
+            recommendations:
+              - github.com/google/uuid
+            reason: "gofrs' package is not go module"
+
   govet:
-    check-shadowing: true
+    enable-all: true
+    # Run `go tool vet help` to see all analyzers.
+    disable:
+      - fieldalignment # too strict
+    settings:
+      shadow:
+        # Whether to be strict about shadowing; can be noisy.
+        strict: true
+
+  nakedret:
+    # Make an issue if func has more lines of code than this setting, and it has naked returns.
+    max-func-lines: 0
+
+  rowserrcheck:
+    # database/sql is always checked
+    packages:
+      - github.com/jmoiron/sqlx
+
+  stylecheck:
+    checks:
+      - all
+      - -ST1008 # handled by revive already.
+
+  tenv:
+    # The option `all` will run against whole test files (`_test.go`) regardless of method/function signatures.
+    # Otherwise, only methods that take `*testing.T`, `*testing.B`, and `testing.TB` as arguments are checked.
+    all: true
diff --git a/vendor/github.com/lrstanley/girc/builtin.go b/vendor/github.com/lrstanley/girc/builtin.go
index e60c577a..345452e5 100644
--- a/vendor/github.com/lrstanley/girc/builtin.go
+++ b/vendor/github.com/lrstanley/girc/builtin.go
@@ -408,6 +408,48 @@ func handleISUPPORT(c *Client, e Event) {
 		c.state.serverOptions[name] = val
 	}
 	c.state.Unlock()
+
+	// Check for max line/nick/user/host lengths here.
+	c.state.RLock()
+	maxLineLength := c.state.maxLineLength
+	c.state.RUnlock()
+	maxNickLength := defaultNickLength
+	maxUserLength := defaultUserLength
+	maxHostLength := defaultHostLength
+
+	var ok bool
+	var tmp int
+
+	if tmp, ok = c.GetServerOptionInt("LINELEN"); ok {
+		maxLineLength = tmp
+		c.state.Lock()
+		c.state.maxLineLength = maxTagLength - 2 // -2 for CR-LF.
+		c.state.Unlock()
+	}
+
+	if tmp, ok = c.GetServerOptionInt("NICKLEN"); ok {
+		maxNickLength = tmp
+	}
+	if tmp, ok = c.GetServerOptionInt("MAXNICKLEN"); ok && tmp > maxNickLength {
+		maxNickLength = tmp
+	}
+	if tmp, ok = c.GetServerOptionInt("USERLEN"); ok && tmp > maxUserLength {
+		maxUserLength = tmp
+	}
+	if tmp, ok = c.GetServerOptionInt("HOSTLEN"); ok && tmp > maxHostLength {
+		maxHostLength = tmp
+	}
+
+	prefixLen := defaultPrefixPadding + maxNickLength + maxUserLength + maxHostLength
+	if prefixLen >= maxLineLength {
+		// Give up and go with defaults.
+		c.state.notify(c, UPDATE_GENERAL)
+		return
+	}
+	c.state.Lock()
+	c.state.maxPrefixLength = prefixLen
+	c.state.Unlock()
+
 	c.state.notify(c, UPDATE_GENERAL)
 }
 
diff --git a/vendor/github.com/lrstanley/girc/cap.go b/vendor/github.com/lrstanley/girc/cap.go
index 631b925b..f35f2ec4 100644
--- a/vendor/github.com/lrstanley/girc/cap.go
+++ b/vendor/github.com/lrstanley/girc/cap.go
@@ -267,9 +267,9 @@ func handleCAP(c *Client, e Event) {
 			}
 
 			if isError {
-				c.rx <- &Event{Command: ERROR, Params: []string{
+				c.receive(&Event{Command: ERROR, Params: []string{
 					fmt.Sprintf("closing connection: strict transport policy provided by server is invalid; possible MITM? config: %#v", sts),
-				}}
+				}})
 				return
 			}
 
diff --git a/vendor/github.com/lrstanley/girc/cap_sasl.go b/vendor/github.com/lrstanley/girc/cap_sasl.go
index d880316b..2a1e8417 100644
--- a/vendor/github.com/lrstanley/girc/cap_sasl.go
+++ b/vendor/github.com/lrstanley/girc/cap_sasl.go
@@ -95,9 +95,9 @@ func handleSASL(c *Client, e Event) {
 		// some reason. The SASL spec and IRCv3 spec do not define a clear
 		// way to abort a SASL exchange, other than to disconnect, or proceed
 		// with CAP END.
-		c.rx <- &Event{Command: ERROR, Params: []string{
+		c.receive(&Event{Command: ERROR, Params: []string{
 			fmt.Sprintf("closing connection: SASL %s failed: %s", c.Config.SASL.Method(), e.Last()),
-		}}
+		}})
 		return
 	}
 
@@ -131,5 +131,5 @@ func handleSASLError(c *Client, e Event) {
 	// Authentication failed. The SASL spec and IRCv3 spec do not define a
 	// clear way to abort a SASL exchange, other than to disconnect, or
 	// proceed with CAP END.
-	c.rx <- &Event{Command: ERROR, Params: []string{"closing connection: " + e.Last()}}
+	c.receive(&Event{Command: ERROR, Params: []string{"closing connection: " + e.Last()}})
 }
diff --git a/vendor/github.com/lrstanley/girc/cap_tags.go b/vendor/github.com/lrstanley/girc/cap_tags.go
index 42599f3a..3cc8887f 100644
--- a/vendor/github.com/lrstanley/girc/cap_tags.go
+++ b/vendor/github.com/lrstanley/girc/cap_tags.go
@@ -52,9 +52,12 @@ type Tags map[string]string
 
 // ParseTags parses out the key-value map of tags. raw should only be the tag
 // data, not a full message. For example:
-//   @aaa=bbb;ccc;example.com/ddd=eee
+//
+//	@aaa=bbb;ccc;example.com/ddd=eee
+//
 // NOT:
-//   @aaa=bbb;ccc;example.com/ddd=eee :nick!ident@host.com PRIVMSG me :Hello
+//
+//	@aaa=bbb;ccc;example.com/ddd=eee :nick!ident@host.com PRIVMSG me :Hello
 //
 // Technically, there is a length limit of 4096, but the server should reject
 // tag messages longer than this.
diff --git a/vendor/github.com/lrstanley/girc/client.go b/vendor/github.com/lrstanley/girc/client.go
index db6ec080..fa2d7f69 100644
--- a/vendor/github.com/lrstanley/girc/client.go
+++ b/vendor/github.com/lrstanley/girc/client.go
@@ -155,6 +155,10 @@ type Config struct {
 	// and the client. If this is set to -1, the client will not attempt to
 	// send client -> server PING requests.
 	PingDelay time.Duration
+	// PingTimeout specifies the duration at which girc will assume
+	// that the connection to the server has been lost if no PONG
+	// message has been received in reply to an outstanding PING.
+	PingTimeout time.Duration
 
 	// disableTracking disables all channel and user-level tracking. Useful
 	// for highly embedded scripts with single purposes. This has an exported
@@ -179,13 +183,13 @@ type Config struct {
 // server.
 //
 // Client expectations:
-//  - Perform any proxy resolution.
-//  - Check the reverse DNS and forward DNS match.
-//  - Check the IP against suitable access controls (ipaccess, dnsbl, etc).
+//   - Perform any proxy resolution.
+//   - Check the reverse DNS and forward DNS match.
+//   - Check the IP against suitable access controls (ipaccess, dnsbl, etc).
 //
 // More information:
-//  - https://ircv3.net/specs/extensions/webirc.html
-//  - https://kiwiirc.com/docs/webirc
+//   - https://ircv3.net/specs/extensions/webirc.html
+//   - https://kiwiirc.com/docs/webirc
 type WebIRC struct {
 	// Password that authenticates the WEBIRC command from this client.
 	Password string
@@ -262,6 +266,10 @@ func New(config Config) *Client {
 		c.Config.PingDelay = 600 * time.Second
 	}
 
+	if c.Config.PingTimeout == 0 {
+		c.Config.PingTimeout = 60 * time.Second
+	}
+
 	envDebug, _ := strconv.ParseBool(os.Getenv("GIRC_DEBUG"))
 	if c.Config.Debug == nil {
 		if envDebug {
@@ -300,6 +308,23 @@ func New(config Config) *Client {
 	return c
 }
 
+// receive is a wrapper for sending to the Client.rx channel. It will timeout if
+// the event can't be sent within 30s.
+func (c *Client) receive(e *Event) {
+	t := time.NewTimer(30 * time.Second)
+	defer func() {
+		if !t.Stop() {
+			<-t.C
+		}
+	}()
+
+	select {
+	case c.rx <- e:
+	case <-t.C:
+		c.debugLogEvent(e, true)
+	}
+}
+
 // String returns a brief description of the current client state.
 func (c *Client) String() string {
 	connected := c.IsConnected()
@@ -380,7 +405,7 @@ func (e *ErrEvent) Error() string {
 	return e.Event.Last()
 }
 
-func (c *Client) execLoop(ctx context.Context, errs chan error, wg *sync.WaitGroup) {
+func (c *Client) execLoop(ctx context.Context) error {
 	c.debug.Print("starting execLoop")
 	defer c.debug.Print("closing execLoop")
 
@@ -403,9 +428,10 @@ func (c *Client) execLoop(ctx context.Context, errs chan error, wg *sync.WaitGro
 			}
 
 		done:
-			wg.Done()
-			return
+			return nil
 		case event = <-c.rx:
+			c.RunHandlers(event)
+
 			if event != nil && event.Command == ERROR {
 				// Handles incoming ERROR responses. These are only ever sent
 				// by the server (with the exception that this library may use
@@ -415,13 +441,9 @@ func (c *Client) execLoop(ctx context.Context, errs chan error, wg *sync.WaitGro
 				// some reason the server doesn't disconnect the client, or
 				// if this library is the source of the error, this should
 				// signal back up to the main connect loop, to disconnect.
-				errs <- &ErrEvent{Event: event}
 
-				// Make sure to not actually exit, so we can let any handlers
-				// actually handle the ERROR event.
+				return &ErrEvent{Event: event}
 			}
-
-			c.RunHandlers(event)
 		}
 	}
 }
@@ -669,8 +691,7 @@ func (c *Client) IsInChannel(channel string) (in bool) {
 // during client connection. This is also known as ISUPPORT (or RPL_PROTOCTL).
 // Will panic if used when tracking has been disabled. Examples of usage:
 //
-//   nickLen, success := GetServerOption("MAXNICKLEN")
-//
+//	nickLen, success := GetServerOption("MAXNICKLEN")
 func (c *Client) GetServerOption(key string) (result string, ok bool) {
 	c.panicIfNotTracking()
 
@@ -680,6 +701,42 @@ func (c *Client) GetServerOption(key string) (result string, ok bool) {
 	return result, ok
 }
 
+// GetServerOptionInt retrieves a server capability setting (as an integer) that was
+// retrieved during client connection. This is also known as ISUPPORT (or RPL_PROTOCTL).
+// Will panic if used when tracking has been disabled. Examples of usage:
+//
+//	nickLen, success := GetServerOption("MAXNICKLEN")
+func (c *Client) GetServerOptionInt(key string) (result int, ok bool) {
+	var data string
+	var err error
+
+	data, ok = c.GetServerOption(key)
+	if !ok {
+		return result, ok
+	}
+	result, err = strconv.Atoi(data)
+	if err != nil {
+		ok = false
+	}
+
+	return result, ok
+}
+
+// MaxEventLength returns the maximum supported server length of an event. This is the
+// maximum length of the command and arguments, excluding the source/prefix supported
+// by the protocol. If state tracking is enabled, this will utilize ISUPPORT/IRCv3
+// information to more accurately calculate the maximum supported length (i.e. extended
+// length events).
+func (c *Client) MaxEventLength() (max int) {
+	if !c.Config.disableTracking {
+		c.state.RLock()
+		max = c.state.maxLineLength - c.state.maxPrefixLength
+		c.state.RUnlock()
+		return max
+	}
+	return DefaultMaxLineLength - DefaultMaxPrefixLength
+}
+
 // NetworkName returns the network identifier. E.g. "EsperNet", "ByteIRC".
 // May be empty if the server does not support RPL_ISUPPORT (or RPL_PROTOCTL).
 // Will panic if used when tracking has been disabled.
@@ -773,7 +830,7 @@ func (c *Client) debugLogEvent(e *Event, dropped bool) {
 	var prefix string
 
 	if dropped {
-		prefix = "dropping event (disconnected):"
+		prefix = "dropping event (disconnected or timeout):"
 	} else {
 		prefix = ">"
 	}
diff --git a/vendor/github.com/lrstanley/girc/commands.go b/vendor/github.com/lrstanley/girc/commands.go
index 91a8b96a..a3bec879 100644
--- a/vendor/github.com/lrstanley/girc/commands.go
+++ b/vendor/github.com/lrstanley/girc/commands.go
@@ -25,8 +25,8 @@ func (cmd *Commands) Nick(name string) {
 // prevent sending extensive JOIN commands.
 func (cmd *Commands) Join(channels ...string) {
 	// We can join multiple channels at once, however we need to ensure that
-	// we are not exceeding the line length. (see maxLength)
-	max := maxLength - len(JOIN) - 1
+	// we are not exceeding the line length (see Client.MaxEventLength()).
+	max := cmd.c.MaxEventLength() - len(JOIN) - 1
 
 	var buffer string
 
@@ -329,8 +329,8 @@ func (cmd *Commands) List(channels ...string) {
 	}
 
 	// We can LIST multiple channels at once, however we need to ensure that
-	// we are not exceeding the line length. (see maxLength)
-	max := maxLength - len(JOIN) - 1
+	// we are not exceeding the line length (see Client.MaxEventLength()).
+	max := cmd.c.MaxEventLength() - len(JOIN) - 1
 
 	var buffer string
 
diff --git a/vendor/github.com/lrstanley/girc/conn.go b/vendor/github.com/lrstanley/girc/conn.go
index 626a6dca..c32eca69 100644
--- a/vendor/github.com/lrstanley/girc/conn.go
+++ b/vendor/github.com/lrstanley/girc/conn.go
@@ -12,6 +12,8 @@ import (
 	"net"
 	"sync"
 	"time"
+
+	"github.com/lrstanley/girc/internal/ctxgroup"
 )
 
 // Messages are delimited with CR and LF line endings, we're using the last
@@ -142,17 +144,44 @@ type ErrParseEvent struct {
 
 func (e ErrParseEvent) Error() string { return "unable to parse event: " + e.Line }
 
-func (c *ircConn) decode() (event *Event, err error) {
-	line, err := c.io.ReadString(delim)
-	if err != nil {
-		return nil, err
-	}
+type decodedEvent struct {
+	event *Event
+	err   error
+}
 
-	if event = ParseEvent(line); event == nil {
-		return nil, ErrParseEvent{line}
-	}
+func (c *ircConn) decode() <-chan decodedEvent {
+	ch := make(chan decodedEvent)
 
-	return event, nil
+	go func() {
+		defer close(ch)
+
+		line, err := c.io.ReadString(delim)
+		if err != nil {
+			select {
+			case ch <- decodedEvent{err: err}:
+			default:
+			}
+
+			return
+		}
+
+		event := ParseEvent(line)
+		if event == nil {
+			select {
+			case ch <- decodedEvent{err: ErrParseEvent{Line: line}}:
+			default:
+			}
+
+			return
+		}
+
+		select {
+		case ch <- decodedEvent{event: event}:
+		default:
+		}
+	}()
+
+	return ch
 }
 
 func (c *ircConn) encode(event *Event) error {
@@ -291,20 +320,17 @@ startConn:
 	} else {
 		c.conn = newMockConn(mock)
 	}
+	c.mu.Unlock()
 
 	var ctx context.Context
 	ctx, c.stop = context.WithCancel(context.Background())
-	c.mu.Unlock()
 
-	errs := make(chan error, 4)
-	var wg sync.WaitGroup
-	// 4 being the number of goroutines we need to finish when this function
-	// returns.
-	wg.Add(4)
-	go c.execLoop(ctx, errs, &wg)
-	go c.readLoop(ctx, errs, &wg)
-	go c.sendLoop(ctx, errs, &wg)
-	go c.pingLoop(ctx, errs, &wg)
+	group := ctxgroup.New(ctx)
+
+	group.Go(c.execLoop)
+	group.Go(c.readLoop)
+	group.Go(c.sendLoop)
+	group.Go(c.pingLoop)
 
 	// Passwords first.
 
@@ -338,16 +364,15 @@ startConn:
 	c.RunHandlers(&Event{Command: INITIALIZED, Params: []string{addr}})
 
 	// Wait for the first error.
-	var result error
-	select {
-	case <-ctx.Done():
+	err := group.Wait()
+	if err != nil {
+		c.debug.Printf("received error, beginning cleanup: %v", err)
+	} else {
 		if !c.state.sts.beginUpgrade {
 			c.debug.Print("received request to close, beginning clean up")
 		}
+
 		c.RunHandlers(&Event{Command: CLOSED, Params: []string{addr}})
-	case err := <-errs:
-		c.debug.Printf("received error, beginning cleanup: %v", err)
-		result = err
 	}
 
 	// Make sure that the connection is closed if not already.
@@ -363,20 +388,13 @@ startConn:
 
 	c.RunHandlers(&Event{Command: DISCONNECTED, Params: []string{addr}})
 
-	// Once we have our error/result, let all other functions know we're done.
-	c.debug.Print("waiting for all routines to finish")
-
-	// Wait for all goroutines to finish.
-	wg.Wait()
-	close(errs)
-
 	// This helps ensure that the end user isn't improperly using the client
 	// more than once. If they want to do this, they should be using multiple
 	// clients, not multiple instances of Connect().
 	c.mu.Lock()
 	c.conn = nil
 
-	if result == nil {
+	if err == nil {
 		if c.state.sts.beginUpgrade {
 			c.state.sts.beginUpgrade = false
 			c.mu.Unlock()
@@ -389,76 +407,85 @@ startConn:
 	}
 	c.mu.Unlock()
 
-	return result
+	return err
 }
 
 // readLoop sets a timeout of 300 seconds, and then attempts to read from the
 // IRC server. If there is an error, it calls Reconnect.
-func (c *Client) readLoop(ctx context.Context, errs chan error, wg *sync.WaitGroup) {
+func (c *Client) readLoop(ctx context.Context) error {
 	c.debug.Print("starting readLoop")
 	defer c.debug.Print("closing readLoop")
 
-	var event *Event
-	var err error
+	var de decodedEvent
 
 	for {
 		select {
 		case <-ctx.Done():
-			wg.Done()
-			return
+			return nil
 		default:
 			_ = c.conn.sock.SetReadDeadline(time.Now().Add(300 * time.Second))
-			event, err = c.conn.decode()
-			if err != nil {
-				errs <- err
-				wg.Done()
-				return
+
+			select {
+			case <-ctx.Done():
+				return nil
+			case de = <-c.conn.decode():
+			}
+
+			if de.err != nil {
+				return de.err
 			}
 
 			// Check if it's an echo-message.
 			if !c.Config.disableTracking {
-				event.Echo = (event.Command == PRIVMSG || event.Command == NOTICE) &&
-					event.Source != nil && event.Source.ID() == c.GetID()
+				de.event.Echo = (de.event.Command == PRIVMSG || de.event.Command == NOTICE) &&
+					de.event.Source != nil && de.event.Source.ID() == c.GetID()
 			}
 
-			c.rx <- event
+			c.receive(de.event)
 		}
 	}
 }
 
-// Send sends an event to the server. Use Client.RunHandlers() if you are
-// simply looking to trigger handlers with an event.
+// Send sends an event to the server. Send will split events if the event is longer
+// than what the server supports, and is an event that supports splitting. Use
+// Client.RunHandlers() if you are simply looking to trigger handlers with an event.
 func (c *Client) Send(event *Event) {
 	var delay time.Duration
 
-	if !c.Config.AllowFlood {
-		c.mu.RLock()
-
-		// Drop the event early as we're disconnected, this way we don't have to wait
-		// the (potentially long) rate limit delay before dropping.
-		if c.conn == nil {
-			c.debugLogEvent(event, true)
-			c.mu.RUnlock()
-			return
-		}
-
-		c.conn.mu.Lock()
-		delay = c.conn.rate(event.Len())
-		c.conn.mu.Unlock()
-		c.mu.RUnlock()
-	}
-
 	if c.Config.GlobalFormat && len(event.Params) > 0 && event.Params[len(event.Params)-1] != "" &&
 		(event.Command == PRIVMSG || event.Command == TOPIC || event.Command == NOTICE) {
 		event.Params[len(event.Params)-1] = Fmt(event.Params[len(event.Params)-1])
 	}
 
-	<-time.After(delay)
-	c.write(event)
+	var events []*Event
+	events = event.split(c.MaxEventLength())
+
+	for _, e := range events {
+		if !c.Config.AllowFlood {
+			c.mu.RLock()
+
+			// Drop the event early as we're disconnected, this way we don't have to wait
+			// the (potentially long) rate limit delay before dropping.
+			if c.conn == nil {
+				c.debugLogEvent(e, true)
+				c.mu.RUnlock()
+				return
+			}
+
+			c.conn.mu.Lock()
+			delay = c.conn.rate(e.Len())
+			c.conn.mu.Unlock()
+			c.mu.RUnlock()
+		}
+
+		<-time.After(delay)
+		c.write(e)
+	}
 }
 
 // write is the lower level function to write an event. It does not have a
-// write-delay when sending events.
+// write-delay when sending events. write will timeout after 30s if the event
+// can't be sent.
 func (c *Client) write(event *Event) {
 	c.mu.RLock()
 	defer c.mu.RUnlock()
@@ -468,7 +495,19 @@ func (c *Client) write(event *Event) {
 		c.debugLogEvent(event, true)
 		return
 	}
-	c.tx <- event
+
+	t := time.NewTimer(30 * time.Second)
+	defer func() {
+		if !t.Stop() {
+			<-t.C
+		}
+	}()
+
+	select {
+	case c.tx <- event:
+	case <-t.C:
+		c.debugLogEvent(event, true)
+	}
 }
 
 // rate allows limiting events based on how frequent the event is being sent,
@@ -487,7 +526,7 @@ func (c *ircConn) rate(chars int) time.Duration {
 	return 0
 }
 
-func (c *Client) sendLoop(ctx context.Context, errs chan error, wg *sync.WaitGroup) {
+func (c *Client) sendLoop(ctx context.Context) error {
 	c.debug.Print("starting sendLoop")
 	defer c.debug.Print("closing sendLoop")
 
@@ -537,18 +576,14 @@ func (c *Client) sendLoop(ctx context.Context, errs chan error, wg *sync.WaitGro
 
 			if event.Command == QUIT {
 				c.Close()
-				wg.Done()
-				return
+				return nil
 			}
 
 			if err != nil {
-				errs <- err
-				wg.Done()
-				return
+				return err
 			}
 		case <-ctx.Done():
-			wg.Done()
-			return
+			return nil
 		}
 	}
 }
@@ -568,11 +603,10 @@ type ErrTimedOut struct {
 
 func (ErrTimedOut) Error() string { return "timed out waiting for a requested PING response" }
 
-func (c *Client) pingLoop(ctx context.Context, errs chan error, wg *sync.WaitGroup) {
+func (c *Client) pingLoop(ctx context.Context) error {
 	// Don't run the pingLoop if they want to disable it.
 	if c.Config.PingDelay <= 0 {
-		wg.Done()
-		return
+		return nil
 	}
 
 	c.debug.Print("starting pingLoop")
@@ -604,9 +638,8 @@ func (c *Client) pingLoop(ctx context.Context, errs chan error, wg *sync.WaitGro
 			}
 
 			c.conn.mu.RLock()
-			if pingSent && time.Since(c.conn.lastPong) > c.Config.PingDelay+(60*time.Second) {
-				// It's 60 seconds over what out ping delay is, connection
-				// has probably dropped.
+			if pingSent && time.Since(c.conn.lastPong) > c.Config.PingDelay+c.Config.PingTimeout {
+				// PingTimeout exceeded, connection has probably dropped.
 				err := ErrTimedOut{
 					TimeSinceSuccess: time.Since(c.conn.lastPong),
 					LastPong:         c.conn.lastPong,
@@ -615,9 +648,7 @@ func (c *Client) pingLoop(ctx context.Context, errs chan error, wg *sync.WaitGro
 				}
 
 				c.conn.mu.RUnlock()
-				errs <- err
-				wg.Done()
-				return
+				return err
 			}
 			c.conn.mu.RUnlock()
 
@@ -628,8 +659,7 @@ func (c *Client) pingLoop(ctx context.Context, errs chan error, wg *sync.WaitGro
 			c.Cmd.Ping(fmt.Sprintf("%d", time.Now().UnixNano()))
 			pingSent = true
 		case <-ctx.Done():
-			wg.Done()
-			return
+			return nil
 		}
 	}
 }
diff --git a/vendor/github.com/lrstanley/girc/event.go b/vendor/github.com/lrstanley/girc/event.go
index 7801615d..2622f89e 100644
--- a/vendor/github.com/lrstanley/girc/event.go
+++ b/vendor/github.com/lrstanley/girc/event.go
@@ -13,7 +13,41 @@ import (
 
 const (
 	eventSpace byte = ' ' // Separator.
-	maxLength  int  = 510 // Maximum length is 510 (2 for line endings).
+
+	// TODO: if state tracking is enabled, we SHOULD be able to use it's known length.
+
+	// Can be overridden by the NICKLEN (or MAXNICKLEN) ISUPPORT parameter. 30 or 31
+	// are typical values for this parameter advertised by servers today.
+	defaultNickLength = 30
+	// The maximum length of <username> may be specified by the USERLEN RPL_ISUPPORT
+	// parameter. If this length is advertised, the username MUST be silently truncated
+	// to the given length before being used.
+	defaultUserLength = 18
+	// If a looked-up domain name is longer than this length (or overridden by the
+	// HOSTLEN ISUPPORT parameter), the server SHOULD opt to use the IP address instead,
+	// so that the hostname is underneath this length.
+	defaultHostLength = 63
+
+	// defaultPrefixPadding defaults the estimated prefix padding length of a given
+	// event. See also:
+	//   [ ":" ( servername / ( nickname [ [ "!" user ] "@" host ] ) ) SPACE ]
+	defaultPrefixPadding = 4
+)
+
+var (
+	// DefaultMaxLineLength is the default maximum length for an event. 510 (+2 for line endings)
+	// is used as a default as this is used by many older implementations.
+	//
+	// See also: RFC 2812
+	//   IRC messages are always lines of characters terminated with a CR-LF
+	//   (Carriage Return - Line Feed) pair, and these messages SHALL NOT
+	//   exceed 512 characters in length, counting all characters including
+	//   the trailing CR-LF.
+	DefaultMaxLineLength = 510
+
+	// DefaultMaxPrefixLength defines the default max ":nickname!user@host " length
+	// that's used to calculate line splitting.
+	DefaultMaxPrefixLength = defaultPrefixPadding + defaultNickLength + defaultUserLength + defaultHostLength
 )
 
 // cutCRFunc is used to trim CR characters from prefixes/messages.
@@ -125,16 +159,16 @@ func ParseEvent(raw string) (e *Event) {
 
 // Event represents an IRC protocol message, see RFC1459 section 2.3.1
 //
-//    <message>  :: [':' <prefix> <SPACE>] <command> <params> <crlf>
-//    <prefix>   :: <servername> | <nick> ['!' <user>] ['@' <host>]
-//    <command>  :: <letter>{<letter>} | <number> <number> <number>
-//    <SPACE>    :: ' '{' '}
-//    <params>   :: <SPACE> [':' <trailing> | <middle> <params>]
-//    <middle>   :: <Any *non-empty* sequence of octets not including SPACE or NUL
-//                   or CR or LF, the first of which may not be ':'>
-//    <trailing> :: <Any, possibly empty, sequence of octets not including NUL or
-//                   CR or LF>
-//    <crlf>     :: CR LF
+//	<message>  :: [':' <prefix> <SPACE>] <command> <params> <crlf>
+//	<prefix>   :: <servername> | <nick> ['!' <user>] ['@' <host>]
+//	<command>  :: <letter>{<letter>} | <number> <number> <number>
+//	<SPACE>    :: ' '{' '}
+//	<params>   :: <SPACE> [':' <trailing> | <middle> <params>]
+//	<middle>   :: <Any *non-empty* sequence of octets not including SPACE or NUL
+//	               or CR or LF, the first of which may not be ':'>
+//	<trailing> :: <Any, possibly empty, sequence of octets not including NUL or
+//	               CR or LF>
+//	<crlf>     :: CR LF
 type Event struct {
 	// Source is the origin of the event.
 	Source *Source `json:"source"`
@@ -223,11 +257,80 @@ func (e *Event) Equals(ev *Event) bool {
 	return true
 }
 
-// Len calculates the length of the string representation of event. Note that
-// this will return the true length (even if longer than what IRC supports),
-// which may be useful if you are trying to check and see if a message is
-// too long, to trim it down yourself.
+// split will split a potentially large event that is larger than what the server
+// supports, into multiple events. split will ignore events that cannot be split, and
+// if the event isn't longer than what the server supports, it will just return an array
+// with 1 entry, the original event.
+func (e *Event) split(maxLength int) []*Event {
+	if len(e.Params) < 1 || (e.Command != PRIVMSG && e.Command != NOTICE) {
+		return []*Event{e}
+	}
+
+	// Exclude source, even if it does exist, because the server will likely ignore the
+	// sent source anyway.
+	event := e.Copy()
+	event.Source = nil
+
+	if event.LenOpts(false) < maxLength {
+		return []*Event{e}
+	}
+
+	results := []*Event{}
+
+	// Will force the length check to include " :". This will allow us to get the length
+	// of the commands and necessary prefixes.
+	text := event.Last()
+	event.Params[len(event.Params)-1] = ""
+	cmdLen := event.LenOpts(false)
+
+	var ok bool
+	var ctcp *CTCPEvent
+	if ok, ctcp = e.IsCTCP(); ok {
+		if text == "" {
+			return []*Event{e}
+		}
+
+		text = ctcp.Text
+
+		// ctcpDelim's at start and end, and space between command and trailing text.
+		maxLength -= len(ctcp.Command) + 4
+	}
+
+	// If the command itself is longer than the limit, there is a problem. PRIVMSG should
+	// be 1->1 per RFC. Just return the original message and let it be the user of the
+	// libraries problem.
+	if cmdLen > maxLength {
+		return []*Event{e}
+	}
+
+	// Split the text into correctly size segments, and make the necessary number of
+	// events that duplicate the original event.
+	for _, split := range splitMessage(text, maxLength-cmdLen) {
+		if ctcp != nil {
+			split = string(ctcpDelim) + ctcp.Command + string(eventSpace) + split + string(ctcpDelim)
+		}
+		clonedEvent := event.Copy()
+		clonedEvent.Source = e.Source
+		clonedEvent.Params[len(e.Params)-1] = split
+		results = append(results, clonedEvent)
+	}
+
+	return results
+}
+
+// Len calculates the length of the string representation of event (including tags).
+// Note that this will return the true length (even if longer than what IRC supports),
+// which may be useful if you are trying to check and see if a message is too long, to
+// trim it down yourself.
 func (e *Event) Len() (length int) {
+	return e.LenOpts(true)
+}
+
+// LenOpts calculates the length of the string representation of event (with a toggle
+// for tags). Note that this will return the true length (even if longer than what IRC
+// supports), which may be useful if you are trying to check and see if a message is
+// too long, to trim it down yourself.
+func (e *Event) LenOpts(includeTags bool) (length int) {
 	if e.Tags != nil {
 		// Include tags and trailing space.
 		length = e.Tags.Len() + 1
@@ -248,7 +351,7 @@ func (e *Event) Len() (length int) {
 
 			// If param contains a space or it's empty, it's trailing, so it should be
 			// prefixed with a colon (:).
-			if i == len(e.Params)-1 && (strings.Contains(e.Params[i], " ") || strings.HasPrefix(e.Params[i], ":") || e.Params[i] == "") {
+			if i == len(e.Params)-1 && (strings.Contains(e.Params[i], " ") || e.Params[i] == "" || strings.HasPrefix(e.Params[i], ":")) {
 				length++
 			}
 		}
@@ -259,10 +362,6 @@ func (e *Event) Len() (length int) {
 
 // Bytes returns a []byte representation of event. Strips all newlines and
 // carriage returns.
-//
-// Per RFC2812 section 2.3, messages should not exceed 512 characters in
-// length. This method forces that limit by discarding any characters
-// exceeding the length limit.
 func (e *Event) Bytes() []byte {
 	buffer := new(bytes.Buffer)
 
@@ -284,7 +383,7 @@ func (e *Event) Bytes() []byte {
 	// Space separated list of arguments.
 	if len(e.Params) > 0 {
 		for i := 0; i < len(e.Params); i++ {
-			if i == len(e.Params)-1 && (strings.Contains(e.Params[i], " ") || strings.HasPrefix(e.Params[i], ":") || e.Params[i] == "") {
+			if i == len(e.Params)-1 && (strings.Contains(e.Params[i], " ") || e.Params[i] == "" || strings.HasPrefix(e.Params[i], ":")) {
 				buffer.WriteString(string(eventSpace) + string(messagePrefix) + e.Params[i])
 				continue
 			}
@@ -292,11 +391,6 @@ func (e *Event) Bytes() []byte {
 		}
 	}
 
-	// We need the limit the buffer length.
-	if buffer.Len() > (maxLength) {
-		buffer.Truncate(maxLength)
-	}
-
 	// If we truncated in the middle of a utf8 character, we need to remove
 	// the other (now invalid) bytes.
 	out := bytes.ToValidUTF8(buffer.Bytes(), nil)
diff --git a/vendor/github.com/lrstanley/girc/format.go b/vendor/github.com/lrstanley/girc/format.go
index 85e3e387..3b9d60af 100644
--- a/vendor/github.com/lrstanley/girc/format.go
+++ b/vendor/github.com/lrstanley/girc/format.go
@@ -7,13 +7,21 @@ package girc
 import (
 	"bytes"
 	"fmt"
+	"net/url"
 	"regexp"
 	"strings"
+	"unicode/utf8"
 )
 
 const (
-	fmtOpenChar  = '{'
-	fmtCloseChar = '}'
+	fmtOpenChar        = '{'
+	fmtCloseChar       = '}'
+	maxWordSplitLength = 30
+)
+
+var (
+	reCode  = regexp.MustCompile(`(\x02|\x1d|\x0f|\x03|\x16|\x1f|\x01)`)
+	reColor = regexp.MustCompile(`\x03([019]?\d(,[019]?\d)?)`)
 )
 
 var fmtColors = map[string]int{
@@ -66,9 +74,9 @@ var fmtCodes = map[string]string{
 //
 // For example:
 //
-//   client.Message("#channel", Fmt("{red}{b}Hello {red,blue}World{c}"))
+//	client.Message("#channel", Fmt("{red}{b}Hello {red,blue}World{c}"))
 func Fmt(text string) string {
-	var last = -1
+	last := -1
 	for i := 0; i < len(text); i++ {
 		if text[i] == fmtOpenChar {
 			last = i
@@ -136,16 +144,12 @@ func TrimFmt(text string) string {
 	return text
 }
 
-// This is really the only fastest way of doing this (marginally better than
-// actually trying to parse it manually.)
-var reStripColor = regexp.MustCompile(`\x03([019]?\d(,[019]?\d)?)?`)
-
 // StripRaw tries to strip all ASCII format codes that are used for IRC.
 // Primarily, foreground/background colors, and other control bytes like
 // reset, bold, italic, reverse, etc. This also is done in a specific way
 // in order to ensure no truncation of other non-irc formatting.
 func StripRaw(text string) string {
-	text = reStripColor.ReplaceAllString(text, "")
+	text = reColor.ReplaceAllString(text, "")
 
 	for _, code := range fmtCodes {
 		text = strings.ReplaceAll(text, code, "")
@@ -164,12 +168,12 @@ func StripRaw(text string) string {
 // all ASCII printable chars. This function will NOT do that for
 // compatibility reasons.
 //
-//   channel    =  ( "#" / "+" / ( "!" channelid ) / "&" ) chanstring
-//                 [ ":" chanstring ]
-//   chanstring =  0x01-0x07 / 0x08-0x09 / 0x0B-0x0C / 0x0E-0x1F / 0x21-0x2B
-//   chanstring =  / 0x2D-0x39 / 0x3B-0xFF
-//                   ; any octet except NUL, BELL, CR, LF, " ", "," and ":"
-//   channelid  = 5( 0x41-0x5A / digit )   ; 5( A-Z / 0-9 )
+//	channel    =  ( "#" / "+" / ( "!" channelid ) / "&" ) chanstring
+//	              [ ":" chanstring ]
+//	chanstring =  0x01-0x07 / 0x08-0x09 / 0x0B-0x0C / 0x0E-0x1F / 0x21-0x2B
+//	chanstring =  / 0x2D-0x39 / 0x3B-0xFF
+//	                ; any octet except NUL, BELL, CR, LF, " ", "," and ":"
+//	channelid  = 5( 0x41-0x5A / digit )   ; 5( A-Z / 0-9 )
 func IsValidChannel(channel string) bool {
 	if len(channel) <= 1 || len(channel) > 50 {
 		return false
@@ -214,10 +218,10 @@ func IsValidChannel(channel string) bool {
 // IsValidNick validates an IRC nickname. Note that this does not validate
 // IRC nickname length.
 //
-//   nickname =  ( letter / special ) *8( letter / digit / special / "-" )
-//   letter   =  0x41-0x5A / 0x61-0x7A
-//   digit    =  0x30-0x39
-//   special  =  0x5B-0x60 / 0x7B-0x7D
+//	nickname =  ( letter / special ) *8( letter / digit / special / "-" )
+//	letter   =  0x41-0x5A / 0x61-0x7A
+//	digit    =  0x30-0x39
+//	special  =  0x5B-0x60 / 0x7B-0x7D
 func IsValidNick(nick string) bool {
 	if nick == "" {
 		return false
@@ -253,8 +257,9 @@ func IsValidNick(nick string) bool {
 // not be supported on all networks. Some limit this to only a single period.
 //
 // Per RFC:
-//   user =  1*( %x01-09 / %x0B-0C / %x0E-1F / %x21-3F / %x41-FF )
-//           ; any octet except NUL, CR, LF, " " and "@"
+//
+//	user =  1*( %x01-09 / %x0B-0C / %x0E-1F / %x21-3F / %x41-FF )
+//	        ; any octet except NUL, CR, LF, " " and "@"
 func IsValidUser(name string) bool {
 	if name == "" {
 		return false
@@ -350,3 +355,172 @@ func Glob(input, match string) bool {
 	// Check suffix last.
 	return trailingGlob || strings.HasSuffix(input, parts[last])
 }
+
+// sliceInsert inserts a string into a slice at a specific index, while trying
+// to avoid as many allocations as possible.
+func sliceInsert(input []string, i int, v ...string) []string {
+	total := len(input) + len(v)
+	if total <= cap(input) {
+		output := input[:total]
+		copy(output[i+len(v):], input[i:])
+		copy(output[i:], v)
+		return output
+	}
+	output := make([]string, total)
+	copy(output, input[:i])
+	copy(output[i:], v)
+	copy(output[i+len(v):], input[i:])
+	return output
+}
+
+// splitMessage is a text splitter that takes into consideration a few things:
+//   - Ensuring the returned text is no longer than maxWidth.
+//   - Attempting to split at the closest word boundary, while still staying inside
+//     of the specific maxWidth.
+//   - if there is no good word boundary for longer words (or e.g. links, raw data, etc)
+//     that are above maxWordSplitLength characters, split the word into chunks to fit the
+//
+// maximum width.
+func splitMessage(input string, maxWidth int) (output []string) {
+	input = strings.ToValidUTF8(input, "?")
+
+	words := strings.FieldsFunc(strings.TrimSpace(input), func(r rune) bool {
+		switch r { // Same as unicode.IsSpace, but without ctrl/lf.
+		case '\t', '\v', '\f', ' ', 0x85, 0xA0:
+			return true
+		}
+		return false
+	})
+
+	output = []string{""}
+	codes := []string{}
+
+	var lastColor string
+	var match []string
+
+	for i := 0; i < len(words); i++ {
+		j := strings.IndexAny(words[i], "\n\r")
+		if j == -1 {
+			continue
+		}
+
+		word := words[i]
+		words[i] = word[:j]
+
+		words = sliceInsert(words, i+1, "", strings.TrimLeft(word[j:], "\n\r"))
+	}
+
+	for _, word := range words {
+		// Used in place of a single newline.
+		if word == "" {
+			// Last line was already empty or already only had control characters.
+			if output[len(output)-1] == "" || output[len(output)-1] == lastColor+word {
+				continue
+			}
+
+			output = append(output, strings.Join(codes, "")+lastColor+word)
+			continue
+		}
+
+		// Keep track of the last used color codes.
+		match = reColor.FindAllString(word, -1)
+		if len(match) > 0 {
+			lastColor = match[len(match)-1]
+		}
+
+		// Find all sequence codes -- this approach isn't perfect (ideally, a lexer
+		// should be used to track each exact type of code), but it's good enough for
+		// most cases.
+		match = reCode.FindAllString(word, -1)
+		if len(match) > 0 {
+			for _, m := range match {
+				// Reset was used, so clear all codes.
+				if m == fmtCodes["reset"] {
+					lastColor = ""
+					codes = []string{}
+					continue
+				}
+
+				// Check if we already have the code, and if so, remove it (closing).
+				contains := false
+				for i := 0; i < len(codes); i++ {
+					if m == codes[i] {
+						contains = true
+						codes = append(codes[:i], codes[i+1:]...)
+
+						// If it's a closing color code, reset the last used color
+						// as well.
+						if m == fmtCodes["clear"] {
+							lastColor = ""
+						}
+
+						break
+					}
+				}
+
+				// Track the new code, unless it's a color clear but we aren't
+				// tracking a color right now.
+				if !contains && (lastColor == "" || m != fmtCodes["clear"]) {
+					codes = append(codes, m)
+				}
+			}
+		}
+
+	checkappend:
+
+		// Check if we can append, otherwise we must split.
+		if 1+utf8.RuneCountInString(word)+utf8.RuneCountInString(output[len(output)-1]) < maxWidth {
+			if output[len(output)-1] != "" {
+				output[len(output)-1] += " "
+			}
+			output[len(output)-1] += word
+			continue
+		}
+
+		// If the word can fit on a line by itself, check if it's a url. If it is,
+		// put it on it's own line.
+		if utf8.RuneCountInString(word+strings.Join(codes, "")+lastColor) < maxWidth {
+			if _, err := url.Parse(word); err == nil {
+				output = append(output, strings.Join(codes, "")+lastColor+word)
+				continue
+			}
+		}
+
+		// Check to see if we can split by misc symbols, but must be at least a few
+		// characters long to be split by it.
+		if j := strings.IndexAny(word, "-+_=|/~:;,."); j > 3 && 1+utf8.RuneCountInString(word[0:j])+utf8.RuneCountInString(output[len(output)-1]) < maxWidth {
+			if output[len(output)-1] != "" {
+				output[len(output)-1] += " "
+			}
+			output[len(output)-1] += word[0:j]
+			word = word[j+1:]
+			goto checkappend
+		}
+
+		// If the word is longer than is acceptable to just put on the next line,
+		// split it into chunks. Also don't split the word if only a few characters
+		// left of the word would be on the next line.
+		if 1+utf8.RuneCountInString(word) > maxWordSplitLength && maxWidth-utf8.RuneCountInString(output[len(output)-1]) > 5 {
+			left := maxWidth - utf8.RuneCountInString(output[len(output)-1]) - 1 // -1 for the space
+
+			if output[len(output)-1] != "" {
+				output[len(output)-1] += " "
+			}
+			output[len(output)-1] += word[0:left]
+			word = word[left:]
+			goto checkappend
+		}
+
+		left := maxWidth - utf8.RuneCountInString(output[len(output)-1])
+		output[len(output)-1] += word[0:left]
+
+		output = append(output, strings.Join(codes, "")+lastColor)
+		word = word[left:]
+		goto checkappend
+	}
+
+	for i := 0; i < len(output); i++ {
+		output[i] = strings.ToValidUTF8(output[i], "?")
+	}
+	return output
+}
diff --git a/vendor/github.com/lrstanley/girc/internal/ctxgroup/ctxgroup.go b/vendor/github.com/lrstanley/girc/internal/ctxgroup/ctxgroup.go
new file mode 100644
index 00000000..e66ed2b5
--- /dev/null
+++ b/vendor/github.com/lrstanley/girc/internal/ctxgroup/ctxgroup.go
@@ -0,0 +1,67 @@
+// Copyright (c) Liam Stanley <me@liamstanley.io>. All rights reserved. Use
+// of this source code is governed by the MIT license that can be found in
+// the LICENSE file.
+
+package ctxgroup
+
+import (
+	"context"
+	"sync"
+)
+
+// A Group is a collection of goroutines working on subtasks that are part of
+// the same overall task.
+type Group struct {
+	ctx    context.Context
+	cancel func()
+
+	wg sync.WaitGroup
+
+	errOnce sync.Once
+	err     error
+}
+
+// New returns a new Group and an associated context derived from ctx.
+// Obtain the derived context from calling Group.Context().
+//
+// The derived context is canceled the first time a function passed to Go
+// returns a non-nil error or the first time Wait returns, whichever occurs
+// first.
+func New(ctx context.Context) *Group {
+	nctx, cancel := context.WithCancel(ctx)
+	return &Group{ctx: nctx, cancel: cancel}
+}
+
+// Context returns the context for this group. It may be canceled by the first
+// function to return a non-nil error.
+func (g *Group) Context() context.Context {
+	return g.ctx
+}
+
+// Wait blocks until all function calls from the Go method have returned, then
+// returns the first non-nil error (if any) from them.
+func (g *Group) Wait() error {
+	g.wg.Wait()
+	if g.cancel != nil {
+		g.cancel()
+	}
+	return g.err
+}
+
+// Go calls the given function in a new goroutine. The first call to return a
+// non-nil error cancels the group; its error will be returned by Wait.
+func (g *Group) Go(f func(ctx context.Context) error) {
+	g.wg.Add(1)
+	go func() {
+		defer g.wg.Done()
+
+		if err := f(g.ctx); err != nil {
+			g.errOnce.Do(func() {
+				g.err = err
+				if g.cancel != nil {
+					g.cancel()
+				}
+			})
+		}
+	}()
+}
diff --git a/vendor/github.com/lrstanley/girc/modes.go b/vendor/github.com/lrstanley/girc/modes.go
index 35ff103a..127b0a79 100644
--- a/vendor/github.com/lrstanley/girc/modes.go
+++ b/vendor/github.com/lrstanley/girc/modes.go
@@ -118,13 +118,14 @@ func (c *CModes) Get(mode string) (args string, ok bool) {
 }
 
 // hasArg checks to see if the mode supports arguments. What ones support this?:
-//   A = Mode that adds or removes a nick or address to a list. Always has a parameter.
-//   B = Mode that changes a setting and always has a parameter.
-//   C = Mode that changes a setting and only has a parameter when set.
-//   D = Mode that changes a setting and never has a parameter.
-//   Note: Modes of type A return the list when there is no parameter present.
-//   Note: Some clients assumes that any mode not listed is of type D.
-//   Note: Modes in PREFIX are not listed but could be considered type B.
+//
+//	A = Mode that adds or removes a nick or address to a list. Always has a parameter.
+//	B = Mode that changes a setting and always has a parameter.
+//	C = Mode that changes a setting and only has a parameter when set.
+//	D = Mode that changes a setting and never has a parameter.
+//	Note: Modes of type A return the list when there is no parameter present.
+//	Note: Some clients assumes that any mode not listed is of type D.
+//	Note: Modes in PREFIX are not listed but could be considered type B.
 func (c *CModes) hasArg(set bool, mode byte) (hasArgs, isSetting bool) {
 	if len(c.raw) < 1 {
 		return false, true
diff --git a/vendor/github.com/lrstanley/girc/state.go b/vendor/github.com/lrstanley/girc/state.go
index d9e72981..96d2ef88 100644
--- a/vendor/github.com/lrstanley/girc/state.go
+++ b/vendor/github.com/lrstanley/girc/state.go
@@ -28,10 +28,21 @@ type state struct {
 	// last capability check. These will get sent once we have received the
 	// last capability list command from the server.
 	tmpCap map[string]map[string]string
+
 	// serverOptions are the standard capabilities and configurations
 	// supported by the server at connection time. This also includes
 	// RPL_ISUPPORT entries.
 	serverOptions map[string]string
+
+	// maxLineLength defines how long before we truncate (or split) messages.
+	// DefaultMaxLineLength is what is used by default, as this is going to be a common
+	// standard. However, protocols like IRCv3, or ISUPPORT can override this.
+	maxLineLength int
+
+	// maxPrefixLength defines the estimated prefix length (":nick!user@host ") that
+	// we can use to calculate line splits.
+	maxPrefixLength int
+
 	// motd is the servers message of the day.
 	motd string
 
@@ -51,9 +62,11 @@ func (s *state) reset(initial bool) {
 	s.host = ""
 	s.channels = make(map[string]*Channel)
 	s.users = make(map[string]*User)
-	s.serverOptions = make(map[string]string)
 	s.enabledCap = make(map[string]map[string]string)
 	s.tmpCap = make(map[string]map[string]string)
+	s.serverOptions = make(map[string]string)
+	s.maxLineLength = DefaultMaxLineLength
+	s.maxPrefixLength = DefaultMaxPrefixLength
 	s.motd = ""
 
 	if initial {
diff --git a/vendor/github.com/matterbridge/matterclient/matterclient.go b/vendor/github.com/matterbridge/matterclient/matterclient.go
index fe845efc..73d4290d 100644
--- a/vendor/github.com/matterbridge/matterclient/matterclient.go
+++ b/vendor/github.com/matterbridge/matterclient/matterclient.go
@@ -144,10 +144,6 @@ 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 {
@@ -157,6 +153,10 @@ func (m *Client) Login() error {
 		return fmt.Errorf("Team '%s' not found in %v", m.Credentials.Team, validTeamNames)
 	}
 
+	if err := m.initUserChannels(); err != nil {
+		return err
+	}
+
 	// connect websocket
 	m.wsConnect()
 
@@ -532,7 +532,7 @@ func (m *Client) wsConnect() {
 }
 
 func (m *Client) doCheckAlive() error {
-	if _, _, err := m.Client.GetMe(""); err != nil {
+	if _, _, err := m.Client.GetPing(); err != nil {
 		return err
 	}
 
diff --git a/vendor/github.com/mattermost/logr/.gitignore b/vendor/github.com/mattermost/logr/.gitignore
deleted file mode 100644
index c2c0a9e2..00000000
--- a/vendor/github.com/mattermost/logr/.gitignore
+++ /dev/null
@@ -1,36 +0,0 @@
-# Binaries for programs and plugins
-*.exe
-*.dll
-*.so
-*.dylib
-debug
-dynip
-
-# Test binary, build with `go test -c`
-*.test
-
-# Output of the go coverage tool, specifically when used with LiteIDE
-*.out
-
-# Output of profiler
-*.prof
-
-# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
-.glide/
-
-# IntelliJ config
-.idea
-
-# log files
-*.log
-
-# transient directories
-vendor
-output
-build
-app
-logs
-
-# test apps
-test/cmd/testapp1/testapp1
-test/cmd/simple/simple
diff --git a/vendor/github.com/mattermost/logr/.travis.yml b/vendor/github.com/mattermost/logr/.travis.yml
deleted file mode 100644
index e6c7caf1..00000000
--- a/vendor/github.com/mattermost/logr/.travis.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-language: go
-sudo: false
-go:
-  - 1.x
\ No newline at end of file
diff --git a/vendor/github.com/mattermost/logr/LICENSE b/vendor/github.com/mattermost/logr/LICENSE
deleted file mode 100644
index 3bea6788..00000000
--- a/vendor/github.com/mattermost/logr/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 wiggin77
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/vendor/github.com/mattermost/logr/README.md b/vendor/github.com/mattermost/logr/README.md
deleted file mode 100644
index a25d6de0..00000000
--- a/vendor/github.com/mattermost/logr/README.md
+++ /dev/null
@@ -1,193 +0,0 @@
-# logr
-
-[![GoDoc](https://godoc.org/github.com/mattermost/logr?status.svg)](http://godoc.org/github.com/mattermost/logr)
-[![Report Card](https://goreportcard.com/badge/github.com/mattermost/logr)](https://goreportcard.com/report/github.com/mattermost/logr)
-
-Logr is a fully asynchronous, contextual logger for Go.
-
-It is very much inspired by [Logrus](https://github.com/sirupsen/logrus) but addresses two issues:
-
-1. Logr is fully asynchronous, meaning that all formatting and writing is done in the background. Latency sensitive applications benefit from not waiting for logging to complete.
-
-2. Logr provides custom filters which provide more flexibility than Trace, Debug, Info... levels. If you need to temporarily increase verbosity of logging while tracking down a problem you can avoid the fire-hose that typically comes from Debug or Trace by using custom filters.
-
-## Concepts
-
-<!-- markdownlint-disable MD033 -->
-| entity | description |
-| ------ | ----------- |
-| Logr   | Engine instance typically instantiated once; used to configure logging.<br>```lgr := &Logr{}```|
-| Logger | Provides contextual logging via fields; lightweight, can be created once and accessed globally or create on demand.<br>```logger := lgr.NewLogger()```<br>```logger2 := logger.WithField("user", "Sam")```|
-| Target | A destination for log items such as console, file, database or just about anything that can be written to. Each target has its own filter/level and formatter, and any number of targets can be added to a Logr. Targets for syslog and any io.Writer are built-in and it is easy to create your own. You can also use any [Logrus hooks](https://github.com/sirupsen/logrus/wiki/Hooks) via a simple [adapter](https://github.com/wiggin77/logrus4logr).|
-| Filter | Determines which logging calls get written versus filtered out. Also determines which logging calls generate a stack trace.<br>```filter := &logr.StdFilter{Lvl: logr.Warn, Stacktrace: logr.Fatal}```|
-| Formatter | Formats the output. Logr includes built-in formatters for JSON and plain text with delimiters. It is easy to create your own formatters or you can also use any [Logrus formatters](https://github.com/sirupsen/logrus#formatters) via a simple [adapter](https://github.com/wiggin77/logrus4logr).<br>```formatter := &format.Plain{Delim: " \| "}```|
-
-## Usage
-
-```go
-// Create Logr instance.
-lgr := &logr.Logr{}
-
-// Create a filter and formatter. Both can be shared by multiple
-// targets.
-filter := &logr.StdFilter{Lvl: logr.Warn, Stacktrace: logr.Error}
-formatter := &format.Plain{Delim: " | "}
-
-// WriterTarget outputs to any io.Writer
-t := target.NewWriterTarget(filter, formatter, os.StdOut, 1000)
-lgr.AddTarget(t)
-
-// One or more Loggers can be created, shared, used concurrently,
-// or created on demand.
-logger := lgr.NewLogger().WithField("user", "Sarah")
-
-// Now we can log to the target(s).
-logger.Debug("login attempt")
-logger.Error("login failed")
-
-// Ensure targets are drained before application exit.
-lgr.Shutdown()
-```
-
-## Fields
-
-Fields allow for contextual logging, meaning information can be added to log statements without changing the statements themselves. Information can be shared across multiple logging statements thus allowing log analysis tools to group them.
-
-Fields are added via Loggers:
-
-```go
-lgr := &Logr{}
-// ... add targets ...
-logger := lgr.NewLogger().WithFields(logr.Fields{
-  "user": user,
-  "role": role})
-logger.Info("login attempt")
-// ... later ...
-logger.Info("login successful")
-```
-
-`Logger.WithFields` can be used to create additional Loggers that add more fields.
-
-Logr fields are inspired by and work the same as [Logrus fields](https://github.com/sirupsen/logrus#fields).
-
-## Filters
-
-Logr supports the traditional seven log levels via `logr.StdFilter`: Panic, Fatal, Error, Warning, Info, Debug, and Trace.
-
-```go
-// When added to a target, this filter will only allow
-// log statements with level severity Warn or higher.
-// It will also generate stack traces for Error or higher.
-filter := &logr.StdFilter{Lvl: logr.Warn, Stacktrace: logr.Error}
-```
-
-Logr also supports custom filters (logr.CustomFilter) which allow fine grained inclusion of log items without turning on the fire-hose.
-
-```go
-  // create custom levels; use IDs > 10.
-  LoginLevel := logr.Level{ID: 100, Name: "login ", Stacktrace: false}
-  LogoutLevel := logr.Level{ID: 101, Name: "logout", Stacktrace: false}
-
-  lgr := &logr.Logr{}
-
-  // create a custom filter with custom levels.
-  filter := &logr.CustomFilter{}
-  filter.Add(LoginLevel, LogoutLevel)
-
-  formatter := &format.Plain{Delim: " | "}
-  tgr := target.NewWriterTarget(filter, formatter, os.StdOut, 1000)
-  lgr.AddTarget(tgr)
-  logger := lgr.NewLogger().WithFields(logr.Fields{"user": "Bob", "role": "admin"})
-
-  logger.Log(LoginLevel, "this item will get logged")
-  logger.Debug("won't be logged since Debug wasn't added to custom filter")
-```
-
-Both filter types allow you to determine which levels require a stack trace to be output. Note that generating stack traces cannot happen fully asynchronously and thus add latency to the calling goroutine.
-
-## Targets
-
-There are built-in targets for outputting to syslog, file, or any `io.Writer`. More will be added.
-
-You can use any [Logrus hooks](https://github.com/sirupsen/logrus/wiki/Hooks) via a simple [adapter](https://github.com/wiggin77/logrus4logr).
-
-You can create your own target by implementing the [Target](./target.go) interface.
-
-An easier method is to use the [logr.Basic](./target.go) type target and build your functionality on that. Basic handles all the queuing and other plumbing so you only need to implement two methods. Example target that outputs to `io.Writer`:
-
-```go
-type Writer struct {
-  logr.Basic
-  out io.Writer
-}
-
-func NewWriterTarget(filter logr.Filter, formatter logr.Formatter, out io.Writer, maxQueue int) *Writer {
-  w := &Writer{out: out}
-  w.Basic.Start(w, w, filter, formatter, maxQueue)
-  return w
-}
-
-// Write will always be called by a single goroutine, so no locking needed.
-// Just convert a log record to a []byte using the formatter and output the
-// bytes to your sink.
-func (w *Writer) Write(rec *logr.LogRec) error {
-  _, stacktrace := w.IsLevelEnabled(rec.Level())
-
-  // take a buffer from the pool to avoid allocations or just allocate a new one.
-  buf := rec.Logger().Logr().BorrowBuffer()
-  defer rec.Logger().Logr().ReleaseBuffer(buf)
-
-  buf, err := w.Formatter().Format(rec, stacktrace, buf)
-  if err != nil {
-    return err
-  }
-  _, err = w.out.Write(buf.Bytes())
-  return err
-}
-```
-
-## Formatters
-
-Logr has two built-in formatters, one for JSON and the other plain, delimited text.
-
-You can use any [Logrus formatters](https://github.com/sirupsen/logrus#formatters) via a simple [adapter](https://github.com/wiggin77/logrus4logr).
-
-You can create your own formatter by implementing the [Formatter](./formatter.go) interface:
-
-```go
-Format(rec *LogRec, stacktrace bool, buf *bytes.Buffer) (*bytes.Buffer, error)
-```
-
-## Handlers
-
-When creating the Logr instance, you can add several handlers that get called when exceptional events occur:
-
-### ```Logr.OnLoggerError(err error)```
-
-Called any time an internal logging error occurs. For example, this can happen when a target cannot connect to its data sink.
-
-It may be tempting to log this error, however there is a danger that logging this will simply generate another error and so on. If you must log it, use a target and custom level specifically for this event and ensure it cannot generate more errors.
-
-### ```Logr.OnQueueFull func(rec *LogRec, maxQueueSize int) bool```
-
-Called on an attempt to add a log record to a full Logr queue. This generally means the Logr maximum queue size is too small, or at least one target is very slow.  Logr maximum queue size can be changed before adding any targets via:
-
-```go
-lgr := logr.Logr{MaxQueueSize: 10000}
-```
-
-Returning true will drop the log record. False will block until the log record can be added, which creates a natural throttle at the expense of latency for the calling goroutine. The default is to block.
-
-### ```Logr.OnTargetQueueFull func(target Target, rec *LogRec, maxQueueSize int) bool```
-
-Called on an attempt to add a log record to a full target queue. This generally means your target's max queue size is too small, or the target is very slow to output.
-
-As with the Logr queue, returning true will drop the log record. False will block until the log record can be added, which creates a natural throttle at the expense of latency for the calling goroutine. The default is to block.
-
-### ```Logr.OnExit func(code int)  and  Logr.OnPanic func(err interface{})```
-
-OnExit and OnPanic are called when the Logger.FatalXXX and Logger.PanicXXX functions are called respectively.
-
-In both cases the default behavior is to shut down gracefully, draining all targets, and calling `os.Exit` or `panic` respectively.
-
-When adding your own handlers, be sure to call `Logr.Shutdown` before exiting the application to avoid losing log records.
diff --git a/vendor/github.com/mattermost/logr/config.go b/vendor/github.com/mattermost/logr/config.go
deleted file mode 100644
index 83d4b0c1..00000000
--- a/vendor/github.com/mattermost/logr/config.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package logr
-
-import (
-	"fmt"
-
-	"github.com/wiggin77/cfg"
-)
-
-func ConfigLogger(config *cfg.Config) error {
-	return fmt.Errorf("Not implemented yet")
-}
diff --git a/vendor/github.com/mattermost/logr/const.go b/vendor/github.com/mattermost/logr/const.go
deleted file mode 100644
index 704d0507..00000000
--- a/vendor/github.com/mattermost/logr/const.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package logr
-
-import "time"
-
-// Defaults.
-const (
-	// DefaultMaxQueueSize is the default maximum queue size for Logr instances.
-	DefaultMaxQueueSize = 1000
-
-	// DefaultMaxStackFrames is the default maximum max number of stack frames collected
-	// when generating stack traces for logging.
-	DefaultMaxStackFrames = 30
-
-	// MaxLevelID is the maximum value of a level ID. Some level cache implementations will
-	// allocate a cache of this size. Cannot exceed uint.
-	MaxLevelID = 256
-
-	// DefaultEnqueueTimeout is the default amount of time a log record can take to be queued.
-	// This only applies to blocking enqueue which happen after `logr.OnQueueFull` is called
-	// and returns false.
-	DefaultEnqueueTimeout = time.Second * 30
-
-	// DefaultShutdownTimeout is the default amount of time `logr.Shutdown` can execute before
-	// timing out.
-	DefaultShutdownTimeout = time.Second * 30
-
-	// DefaultFlushTimeout is the default amount of time `logr.Flush` can execute before
-	// timing out.
-	DefaultFlushTimeout = time.Second * 30
-
-	// DefaultMaxPooledBuffer is the maximum size a pooled buffer can be.
-	// Buffers that grow beyond this size are garbage collected.
-	DefaultMaxPooledBuffer = 1024 * 1024
-)
diff --git a/vendor/github.com/mattermost/logr/filter.go b/vendor/github.com/mattermost/logr/filter.go
deleted file mode 100644
index 6e654cd7..00000000
--- a/vendor/github.com/mattermost/logr/filter.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package logr
-
-// LevelID is the unique id of each level.
-type LevelID uint
-
-// Level provides a mechanism to enable/disable specific log lines.
-type Level struct {
-	ID         LevelID
-	Name       string
-	Stacktrace bool
-}
-
-// String returns the name of this level.
-func (level Level) String() string {
-	return level.Name
-}
-
-// Filter allows targets to determine which Level(s) are active
-// for logging and which Level(s) require a stack trace to be output.
-// A default implementation using "panic, fatal..." is provided, and
-// a more flexible alternative implementation is also provided that
-// allows any number of custom levels.
-type Filter interface {
-	IsEnabled(Level) bool
-	IsStacktraceEnabled(Level) bool
-}
diff --git a/vendor/github.com/mattermost/logr/format/json.go b/vendor/github.com/mattermost/logr/format/json.go
deleted file mode 100644
index 8f56c6cb..00000000
--- a/vendor/github.com/mattermost/logr/format/json.go
+++ /dev/null
@@ -1,273 +0,0 @@
-package format
-
-import (
-	"bytes"
-	"fmt"
-	"runtime"
-	"sort"
-	"sync"
-	"time"
-
-	"github.com/francoispqt/gojay"
-	"github.com/mattermost/logr"
-)
-
-// ContextField is a name/value pair within the context fields.
-type ContextField struct {
-	Key string
-	Val interface{}
-}
-
-// JSON formats log records as JSON.
-type JSON struct {
-	// DisableTimestamp disables output of timestamp field.
-	DisableTimestamp bool
-	// DisableLevel disables output of level field.
-	DisableLevel bool
-	// DisableMsg disables output of msg field.
-	DisableMsg bool
-	// DisableContext disables output of all context fields.
-	DisableContext bool
-	// DisableStacktrace disables output of stack trace.
-	DisableStacktrace bool
-
-	// TimestampFormat is an optional format for timestamps. If empty
-	// then DefTimestampFormat is used.
-	TimestampFormat string
-
-	// Deprecated: this has no effect.
-	Indent string
-
-	// EscapeHTML determines if certain characters (e.g. `<`, `>`, `&`)
-	// are escaped.
-	EscapeHTML bool
-
-	// KeyTimestamp overrides the timestamp field key name.
-	KeyTimestamp string
-
-	// KeyLevel overrides the level field key name.
-	KeyLevel string
-
-	// KeyMsg overrides the msg field key name.
-	KeyMsg string
-
-	// KeyContextFields when not empty will group all context fields
-	// under this key.
-	KeyContextFields string
-
-	// KeyStacktrace overrides the stacktrace field key name.
-	KeyStacktrace string
-
-	// ContextSorter allows custom sorting for the context fields.
-	ContextSorter func(fields logr.Fields) []ContextField
-
-	once sync.Once
-}
-
-// Format converts a log record to bytes in JSON format.
-func (j *JSON) Format(rec *logr.LogRec, stacktrace bool, buf *bytes.Buffer) (*bytes.Buffer, error) {
-	j.once.Do(j.applyDefaultKeyNames)
-
-	if buf == nil {
-		buf = &bytes.Buffer{}
-	}
-	enc := gojay.BorrowEncoder(buf)
-	defer func() {
-		enc.Release()
-	}()
-
-	sorter := j.ContextSorter
-	if sorter == nil {
-		sorter = j.defaultContextSorter
-	}
-
-	jlr := JSONLogRec{
-		LogRec:     rec,
-		JSON:       j,
-		stacktrace: stacktrace,
-		sorter:     sorter,
-	}
-
-	err := enc.EncodeObject(jlr)
-	if err != nil {
-		return nil, err
-	}
-	buf.WriteByte('\n')
-	return buf, nil
-}
-
-func (j *JSON) applyDefaultKeyNames() {
-	if j.KeyTimestamp == "" {
-		j.KeyTimestamp = "timestamp"
-	}
-	if j.KeyLevel == "" {
-		j.KeyLevel = "level"
-	}
-	if j.KeyMsg == "" {
-		j.KeyMsg = "msg"
-	}
-	if j.KeyStacktrace == "" {
-		j.KeyStacktrace = "stacktrace"
-	}
-}
-
-// defaultContextSorter sorts the context fields alphabetically by key.
-func (j *JSON) defaultContextSorter(fields logr.Fields) []ContextField {
-	keys := make([]string, 0, len(fields))
-	for k := range fields {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-
-	cf := make([]ContextField, 0, len(keys))
-	for _, k := range keys {
-		cf = append(cf, ContextField{Key: k, Val: fields[k]})
-	}
-	return cf
-}
-
-// JSONLogRec decorates a LogRec adding JSON encoding.
-type JSONLogRec struct {
-	*logr.LogRec
-	*JSON
-	stacktrace bool
-	sorter     func(fields logr.Fields) []ContextField
-}
-
-// MarshalJSONObject encodes the LogRec as JSON.
-func (rec JSONLogRec) MarshalJSONObject(enc *gojay.Encoder) {
-	if !rec.DisableTimestamp {
-		timestampFmt := rec.TimestampFormat
-		if timestampFmt == "" {
-			timestampFmt = logr.DefTimestampFormat
-		}
-		time := rec.Time()
-		enc.AddTimeKey(rec.KeyTimestamp, &time, timestampFmt)
-	}
-	if !rec.DisableLevel {
-		enc.AddStringKey(rec.KeyLevel, rec.Level().Name)
-	}
-	if !rec.DisableMsg {
-		enc.AddStringKey(rec.KeyMsg, rec.Msg())
-	}
-	if !rec.DisableContext {
-		ctxFields := rec.sorter(rec.Fields())
-		if rec.KeyContextFields != "" {
-			enc.AddObjectKey(rec.KeyContextFields, jsonFields(ctxFields))
-		} else {
-			if len(ctxFields) > 0 {
-				for _, cf := range ctxFields {
-					key := rec.prefixCollision(cf.Key)
-					encodeField(enc, key, cf.Val)
-				}
-			}
-		}
-	}
-	if rec.stacktrace && !rec.DisableStacktrace {
-		frames := rec.StackFrames()
-		if len(frames) > 0 {
-			enc.AddArrayKey(rec.KeyStacktrace, stackFrames(frames))
-		}
-	}
-
-}
-
-// IsNil returns true if the LogRec pointer is nil.
-func (rec JSONLogRec) IsNil() bool {
-	return rec.LogRec == nil
-}
-
-func (rec JSONLogRec) prefixCollision(key string) string {
-	switch key {
-	case rec.KeyTimestamp, rec.KeyLevel, rec.KeyMsg, rec.KeyStacktrace:
-		return rec.prefixCollision("_" + key)
-	}
-	return key
-}
-
-type stackFrames []runtime.Frame
-
-// MarshalJSONArray encodes stackFrames slice as JSON.
-func (s stackFrames) MarshalJSONArray(enc *gojay.Encoder) {
-	for _, frame := range s {
-		enc.AddObject(stackFrame(frame))
-	}
-}
-
-// IsNil returns true if stackFrames is empty slice.
-func (s stackFrames) IsNil() bool {
-	return len(s) == 0
-}
-
-type stackFrame runtime.Frame
-
-// MarshalJSONArray encodes stackFrame as JSON.
-func (f stackFrame) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.AddStringKey("Function", f.Function)
-	enc.AddStringKey("File", f.File)
-	enc.AddIntKey("Line", f.Line)
-}
-
-func (f stackFrame) IsNil() bool {
-	return false
-}
-
-type jsonFields []ContextField
-
-// MarshalJSONObject encodes Fields map to JSON.
-func (f jsonFields) MarshalJSONObject(enc *gojay.Encoder) {
-	for _, ctxField := range f {
-		encodeField(enc, ctxField.Key, ctxField.Val)
-	}
-}
-
-// IsNil returns true if map is nil.
-func (f jsonFields) IsNil() bool {
-	return f == nil
-}
-
-func encodeField(enc *gojay.Encoder, key string, val interface{}) {
-	switch vt := val.(type) {
-	case gojay.MarshalerJSONObject:
-		enc.AddObjectKey(key, vt)
-	case gojay.MarshalerJSONArray:
-		enc.AddArrayKey(key, vt)
-	case string:
-		enc.AddStringKey(key, vt)
-	case error:
-		enc.AddStringKey(key, vt.Error())
-	case bool:
-		enc.AddBoolKey(key, vt)
-	case int:
-		enc.AddIntKey(key, vt)
-	case int64:
-		enc.AddInt64Key(key, vt)
-	case int32:
-		enc.AddIntKey(key, int(vt))
-	case int16:
-		enc.AddIntKey(key, int(vt))
-	case int8:
-		enc.AddIntKey(key, int(vt))
-	case uint64:
-		enc.AddIntKey(key, int(vt))
-	case uint32:
-		enc.AddIntKey(key, int(vt))
-	case uint16:
-		enc.AddIntKey(key, int(vt))
-	case uint8:
-		enc.AddIntKey(key, int(vt))
-	case float64:
-		enc.AddFloatKey(key, vt)
-	case float32:
-		enc.AddFloat32Key(key, vt)
-	case *gojay.EmbeddedJSON:
-		enc.AddEmbeddedJSONKey(key, vt)
-	case time.Time:
-		enc.AddTimeKey(key, &vt, logr.DefTimestampFormat)
-	case *time.Time:
-		enc.AddTimeKey(key, vt, logr.DefTimestampFormat)
-	default:
-		s := fmt.Sprintf("%v", vt)
-		enc.AddStringKey(key, s)
-	}
-}
diff --git a/vendor/github.com/mattermost/logr/format/plain.go b/vendor/github.com/mattermost/logr/format/plain.go
deleted file mode 100644
index 3fa92b49..00000000
--- a/vendor/github.com/mattermost/logr/format/plain.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package format
-
-import (
-	"bytes"
-	"fmt"
-
-	"github.com/mattermost/logr"
-)
-
-// Plain is the simplest formatter, outputting only text with
-// no colors.
-type Plain struct {
-	// DisableTimestamp disables output of timestamp field.
-	DisableTimestamp bool
-	// DisableLevel disables output of level field.
-	DisableLevel bool
-	// DisableMsg disables output of msg field.
-	DisableMsg bool
-	// DisableContext disables output of all context fields.
-	DisableContext bool
-	// DisableStacktrace disables output of stack trace.
-	DisableStacktrace bool
-
-	// Delim is an optional delimiter output between each log field.
-	// Defaults to a single space.
-	Delim string
-
-	// TimestampFormat is an optional format for timestamps. If empty
-	// then DefTimestampFormat is used.
-	TimestampFormat string
-}
-
-// Format converts a log record to bytes.
-func (p *Plain) Format(rec *logr.LogRec, stacktrace bool, buf *bytes.Buffer) (*bytes.Buffer, error) {
-	delim := p.Delim
-	if delim == "" {
-		delim = " "
-	}
-	if buf == nil {
-		buf = &bytes.Buffer{}
-	}
-
-	timestampFmt := p.TimestampFormat
-	if timestampFmt == "" {
-		timestampFmt = logr.DefTimestampFormat
-	}
-
-	if !p.DisableTimestamp {
-		var arr [128]byte
-		tbuf := rec.Time().AppendFormat(arr[:0], timestampFmt)
-		buf.Write(tbuf)
-		buf.WriteString(delim)
-	}
-	if !p.DisableLevel {
-		fmt.Fprintf(buf, "%v%s", rec.Level().Name, delim)
-	}
-	if !p.DisableMsg {
-		fmt.Fprint(buf, rec.Msg(), delim)
-	}
-	if !p.DisableContext {
-		ctx := rec.Fields()
-		if len(ctx) > 0 {
-			logr.WriteFields(buf, ctx, " ")
-		}
-	}
-	if stacktrace && !p.DisableStacktrace {
-		frames := rec.StackFrames()
-		if len(frames) > 0 {
-			buf.WriteString("\n")
-			logr.WriteStacktrace(buf, rec.StackFrames())
-		}
-	}
-	buf.WriteString("\n")
-	return buf, nil
-}
diff --git a/vendor/github.com/mattermost/logr/formatter.go b/vendor/github.com/mattermost/logr/formatter.go
deleted file mode 100644
index bb8df2d4..00000000
--- a/vendor/github.com/mattermost/logr/formatter.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package logr
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"runtime"
-	"sort"
-)
-
-// Formatter turns a LogRec into a formatted string.
-type Formatter interface {
-	// Format converts a log record to bytes. If buf is not nil then it will be
-	// be filled with the formatted results, otherwise a new buffer will be allocated.
-	Format(rec *LogRec, stacktrace bool, buf *bytes.Buffer) (*bytes.Buffer, error)
-}
-
-const (
-	// DefTimestampFormat is the default time stamp format used by
-	// Plain formatter and others.
-	DefTimestampFormat = "2006-01-02 15:04:05.000 Z07:00"
-)
-
-// DefaultFormatter is the default formatter, outputting only text with
-// no colors and a space delimiter. Use `format.Plain` instead.
-type DefaultFormatter struct {
-}
-
-// Format converts a log record to bytes.
-func (p *DefaultFormatter) Format(rec *LogRec, stacktrace bool, buf *bytes.Buffer) (*bytes.Buffer, error) {
-	if buf == nil {
-		buf = &bytes.Buffer{}
-	}
-	delim := " "
-	timestampFmt := DefTimestampFormat
-
-	fmt.Fprintf(buf, "%s%s", rec.Time().Format(timestampFmt), delim)
-	fmt.Fprintf(buf, "%v%s", rec.Level(), delim)
-	fmt.Fprint(buf, rec.Msg(), delim)
-
-	ctx := rec.Fields()
-	if len(ctx) > 0 {
-		WriteFields(buf, ctx, " ")
-	}
-
-	if stacktrace {
-		frames := rec.StackFrames()
-		if len(frames) > 0 {
-			buf.WriteString("\n")
-			WriteStacktrace(buf, rec.StackFrames())
-		}
-	}
-	buf.WriteString("\n")
-
-	return buf, nil
-}
-
-// WriteFields writes zero or more name value pairs to the io.Writer.
-// The pairs are sorted by key name and output in key=value format
-// with optional separator between fields.
-func WriteFields(w io.Writer, flds Fields, separator string) {
-	keys := make([]string, 0, len(flds))
-	for k := range flds {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-	sep := ""
-	for _, key := range keys {
-		writeField(w, key, flds[key], sep)
-		sep = separator
-	}
-}
-
-func writeField(w io.Writer, key string, val interface{}, sep string) {
-	var template string
-	switch v := val.(type) {
-	case error:
-		val := v.Error()
-		if shouldQuote(val) {
-			template = "%s%s=%q"
-		} else {
-			template = "%s%s=%s"
-		}
-	case string:
-		if shouldQuote(v) {
-			template = "%s%s=%q"
-		} else {
-			template = "%s%s=%s"
-		}
-	default:
-		template = "%s%s=%v"
-	}
-	fmt.Fprintf(w, template, sep, key, val)
-}
-
-// shouldQuote returns true if val contains any characters that might be unsafe
-// when injecting log output into an aggregator, viewer or report.
-func shouldQuote(val string) bool {
-	for _, c := range val {
-		if !((c >= '0' && c <= '9') ||
-			(c >= 'a' && c <= 'z') ||
-			(c >= 'A' && c <= 'Z')) {
-			return true
-		}
-	}
-	return false
-}
-
-// WriteStacktrace formats and outputs a stack trace to an io.Writer.
-func WriteStacktrace(w io.Writer, frames []runtime.Frame) {
-	for _, frame := range frames {
-		if frame.Function != "" {
-			fmt.Fprintf(w, "  %s\n", frame.Function)
-		}
-		if frame.File != "" {
-			fmt.Fprintf(w, "      %s:%d\n", frame.File, frame.Line)
-		}
-	}
-}
diff --git a/vendor/github.com/mattermost/logr/levelcache.go b/vendor/github.com/mattermost/logr/levelcache.go
deleted file mode 100644
index 2cefb61d..00000000
--- a/vendor/github.com/mattermost/logr/levelcache.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package logr
-
-import (
-	"fmt"
-	"sync"
-)
-
-// LevelStatus represents whether a level is enabled and
-// requires a stack trace.
-type LevelStatus struct {
-	Enabled    bool
-	Stacktrace bool
-	empty      bool
-}
-
-type levelCache interface {
-	setup()
-	get(id LevelID) (LevelStatus, bool)
-	put(id LevelID, status LevelStatus) error
-	clear()
-}
-
-// syncMapLevelCache uses sync.Map which may better handle large concurrency
-// scenarios.
-type syncMapLevelCache struct {
-	m sync.Map
-}
-
-func (c *syncMapLevelCache) setup() {
-	c.clear()
-}
-
-func (c *syncMapLevelCache) get(id LevelID) (LevelStatus, bool) {
-	if id > MaxLevelID {
-		return LevelStatus{}, false
-	}
-	s, _ := c.m.Load(id)
-	status := s.(LevelStatus)
-	return status, !status.empty
-}
-
-func (c *syncMapLevelCache) put(id LevelID, status LevelStatus) error {
-	if id > MaxLevelID {
-		return fmt.Errorf("level id cannot exceed MaxLevelID (%d)", MaxLevelID)
-	}
-	c.m.Store(id, status)
-	return nil
-}
-
-func (c *syncMapLevelCache) clear() {
-	var i LevelID
-	for i = 0; i < MaxLevelID; i++ {
-		c.m.Store(i, LevelStatus{empty: true})
-	}
-}
-
-// arrayLevelCache using array and a mutex.
-type arrayLevelCache struct {
-	arr [MaxLevelID + 1]LevelStatus
-	mux sync.RWMutex
-}
-
-func (c *arrayLevelCache) setup() {
-	c.clear()
-}
-
-//var dummy = LevelStatus{}
-
-func (c *arrayLevelCache) get(id LevelID) (LevelStatus, bool) {
-	if id > MaxLevelID {
-		return LevelStatus{}, false
-	}
-	c.mux.RLock()
-	status := c.arr[id]
-	ok := !status.empty
-	c.mux.RUnlock()
-	return status, ok
-}
-
-func (c *arrayLevelCache) put(id LevelID, status LevelStatus) error {
-	if id > MaxLevelID {
-		return fmt.Errorf("level id cannot exceed MaxLevelID (%d)", MaxLevelID)
-	}
-	c.mux.Lock()
-	defer c.mux.Unlock()
-
-	c.arr[id] = status
-	return nil
-}
-
-func (c *arrayLevelCache) clear() {
-	c.mux.Lock()
-	defer c.mux.Unlock()
-
-	for i := range c.arr {
-		c.arr[i] = LevelStatus{empty: true}
-	}
-}
diff --git a/vendor/github.com/mattermost/logr/levelcustom.go b/vendor/github.com/mattermost/logr/levelcustom.go
deleted file mode 100644
index 384fe4e9..00000000
--- a/vendor/github.com/mattermost/logr/levelcustom.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package logr
-
-import (
-	"sync"
-)
-
-// CustomFilter allows targets to enable logging via a list of levels.
-type CustomFilter struct {
-	mux    sync.RWMutex
-	levels map[LevelID]Level
-}
-
-// IsEnabled returns true if the specified Level exists in this list.
-func (st *CustomFilter) IsEnabled(level Level) bool {
-	st.mux.RLock()
-	defer st.mux.RUnlock()
-	_, ok := st.levels[level.ID]
-	return ok
-}
-
-// IsStacktraceEnabled returns true if the specified Level requires a stack trace.
-func (st *CustomFilter) IsStacktraceEnabled(level Level) bool {
-	st.mux.RLock()
-	defer st.mux.RUnlock()
-	lvl, ok := st.levels[level.ID]
-	if ok {
-		return lvl.Stacktrace
-	}
-	return false
-}
-
-// Add adds one or more levels to the list. Adding a level enables logging for
-// that level on any targets using this CustomFilter.
-func (st *CustomFilter) Add(levels ...Level) {
-	st.mux.Lock()
-	defer st.mux.Unlock()
-
-	if st.levels == nil {
-		st.levels = make(map[LevelID]Level)
-	}
-
-	for _, s := range levels {
-		st.levels[s.ID] = s
-	}
-}
diff --git a/vendor/github.com/mattermost/logr/levelstd.go b/vendor/github.com/mattermost/logr/levelstd.go
deleted file mode 100644
index f5e0fa46..00000000
--- a/vendor/github.com/mattermost/logr/levelstd.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package logr
-
-// StdFilter allows targets to filter via classic log levels where any level
-// beyond a certain verbosity/severity is enabled.
-type StdFilter struct {
-	Lvl        Level
-	Stacktrace Level
-}
-
-// IsEnabled returns true if the specified Level is at or above this verbosity. Also
-// determines if a stack trace is required.
-func (lt StdFilter) IsEnabled(level Level) bool {
-	return level.ID <= lt.Lvl.ID
-}
-
-// IsStacktraceEnabled returns true if the specified Level requires a stack trace.
-func (lt StdFilter) IsStacktraceEnabled(level Level) bool {
-	return level.ID <= lt.Stacktrace.ID
-}
-
-var (
-	// Panic is the highest level of severity. Logs the message and then panics.
-	Panic = Level{ID: 0, Name: "panic"}
-	// Fatal designates a catastrophic error. Logs the message and then calls
-	// `logr.Exit(1)`.
-	Fatal = Level{ID: 1, Name: "fatal"}
-	// Error designates a serious but possibly recoverable error.
-	Error = Level{ID: 2, Name: "error"}
-	// Warn designates non-critical error.
-	Warn = Level{ID: 3, Name: "warn"}
-	// Info designates information regarding application events.
-	Info = Level{ID: 4, Name: "info"}
-	// Debug designates verbose information typically used for debugging.
-	Debug = Level{ID: 5, Name: "debug"}
-	// Trace designates the highest verbosity of log output.
-	Trace = Level{ID: 6, Name: "trace"}
-)
diff --git a/vendor/github.com/mattermost/logr/logger.go b/vendor/github.com/mattermost/logr/logger.go
deleted file mode 100644
index c2386312..00000000
--- a/vendor/github.com/mattermost/logr/logger.go
+++ /dev/null
@@ -1,218 +0,0 @@
-package logr
-
-import (
-	"fmt"
-)
-
-// Fields type, used to pass to `WithFields`.
-type Fields map[string]interface{}
-
-// Logger provides context for logging via fields.
-type Logger struct {
-	logr   *Logr
-	fields Fields
-}
-
-// Logr returns the `Logr` instance that created this `Logger`.
-func (logger Logger) Logr() *Logr {
-	return logger.logr
-}
-
-// WithField creates a new `Logger` with any existing fields
-// plus the new one.
-func (logger Logger) WithField(key string, value interface{}) Logger {
-	return logger.WithFields(Fields{key: value})
-}
-
-// WithFields creates a new `Logger` with any existing fields
-// plus the new ones.
-func (logger Logger) WithFields(fields Fields) Logger {
-	l := Logger{logr: logger.logr}
-	// if parent has no fields then avoid creating a new map.
-	oldLen := len(logger.fields)
-	if oldLen == 0 {
-		l.fields = fields
-		return l
-	}
-
-	l.fields = make(Fields, len(fields)+oldLen)
-	for k, v := range logger.fields {
-		l.fields[k] = v
-	}
-	for k, v := range fields {
-		l.fields[k] = v
-	}
-	return l
-}
-
-// Log checks that the level matches one or more targets, and
-// if so, generates a log record that is added to the Logr queue.
-// Arguments are handled in the manner of fmt.Print.
-func (logger Logger) Log(lvl Level, args ...interface{}) {
-	status := logger.logr.IsLevelEnabled(lvl)
-	if status.Enabled {
-		rec := NewLogRec(lvl, logger, "", args, status.Stacktrace)
-		logger.logr.enqueue(rec)
-	}
-}
-
-// Trace is a convenience method equivalent to `Log(TraceLevel, args...)`.
-func (logger Logger) Trace(args ...interface{}) {
-	logger.Log(Trace, args...)
-}
-
-// Debug is a convenience method equivalent to `Log(DebugLevel, args...)`.
-func (logger Logger) Debug(args ...interface{}) {
-	logger.Log(Debug, args...)
-}
-
-// Print ensures compatibility with std lib logger.
-func (logger Logger) Print(args ...interface{}) {
-	logger.Info(args...)
-}
-
-// Info is a convenience method equivalent to `Log(InfoLevel, args...)`.
-func (logger Logger) Info(args ...interface{}) {
-	logger.Log(Info, args...)
-}
-
-// Warn is a convenience method equivalent to `Log(WarnLevel, args...)`.
-func (logger Logger) Warn(args ...interface{}) {
-	logger.Log(Warn, args...)
-}
-
-// Error is a convenience method equivalent to `Log(ErrorLevel, args...)`.
-func (logger Logger) Error(args ...interface{}) {
-	logger.Log(Error, args...)
-}
-
-// Fatal is a convenience method equivalent to `Log(FatalLevel, args...)`
-// followed by a call to os.Exit(1).
-func (logger Logger) Fatal(args ...interface{}) {
-	logger.Log(Fatal, args...)
-	logger.logr.exit(1)
-}
-
-// Panic is a convenience method equivalent to `Log(PanicLevel, args...)`
-// followed by a call to panic().
-func (logger Logger) Panic(args ...interface{}) {
-	logger.Log(Panic, args...)
-	panic(fmt.Sprint(args...))
-}
-
-//
-// Printf style
-//
-
-// Logf checks that the level matches one or more targets, and
-// if so, generates a log record that is added to the main
-// queue (channel). Arguments are handled in the manner of fmt.Printf.
-func (logger Logger) Logf(lvl Level, format string, args ...interface{}) {
-	status := logger.logr.IsLevelEnabled(lvl)
-	if status.Enabled {
-		rec := NewLogRec(lvl, logger, format, args, status.Stacktrace)
-		logger.logr.enqueue(rec)
-	}
-}
-
-// Tracef is a convenience method equivalent to `Logf(TraceLevel, args...)`.
-func (logger Logger) Tracef(format string, args ...interface{}) {
-	logger.Logf(Trace, format, args...)
-}
-
-// Debugf is a convenience method equivalent to `Logf(DebugLevel, args...)`.
-func (logger Logger) Debugf(format string, args ...interface{}) {
-	logger.Logf(Debug, format, args...)
-}
-
-// Infof is a convenience method equivalent to `Logf(InfoLevel, args...)`.
-func (logger Logger) Infof(format string, args ...interface{}) {
-	logger.Logf(Info, format, args...)
-}
-
-// Printf ensures compatibility with std lib logger.
-func (logger Logger) Printf(format string, args ...interface{}) {
-	logger.Infof(format, args...)
-}
-
-// Warnf is a convenience method equivalent to `Logf(WarnLevel, args...)`.
-func (logger Logger) Warnf(format string, args ...interface{}) {
-	logger.Logf(Warn, format, args...)
-}
-
-// Errorf is a convenience method equivalent to `Logf(ErrorLevel, args...)`.
-func (logger Logger) Errorf(format string, args ...interface{}) {
-	logger.Logf(Error, format, args...)
-}
-
-// Fatalf is a convenience method equivalent to `Logf(FatalLevel, args...)`
-// followed by a call to os.Exit(1).
-func (logger Logger) Fatalf(format string, args ...interface{}) {
-	logger.Logf(Fatal, format, args...)
-	logger.logr.exit(1)
-}
-
-// Panicf is a convenience method equivalent to `Logf(PanicLevel, args...)`
-// followed by a call to panic().
-func (logger Logger) Panicf(format string, args ...interface{}) {
-	logger.Logf(Panic, format, args...)
-}
-
-//
-// Println style
-//
-
-// Logln checks that the level matches one or more targets, and
-// if so, generates a log record that is added to the main
-// queue (channel). Arguments are handled in the manner of fmt.Println.
-func (logger Logger) Logln(lvl Level, args ...interface{}) {
-	status := logger.logr.IsLevelEnabled(lvl)
-	if status.Enabled {
-		rec := NewLogRec(lvl, logger, "", args, status.Stacktrace)
-		rec.newline = true
-		logger.logr.enqueue(rec)
-	}
-}
-
-// Traceln is a convenience method equivalent to `Logln(TraceLevel, args...)`.
-func (logger Logger) Traceln(args ...interface{}) {
-	logger.Logln(Trace, args...)
-}
-
-// Debugln is a convenience method equivalent to `Logln(DebugLevel, args...)`.
-func (logger Logger) Debugln(args ...interface{}) {
-	logger.Logln(Debug, args...)
-}
-
-// Infoln is a convenience method equivalent to `Logln(InfoLevel, args...)`.
-func (logger Logger) Infoln(args ...interface{}) {
-	logger.Logln(Info, args...)
-}
-
-// Println ensures compatibility with std lib logger.
-func (logger Logger) Println(args ...interface{}) {
-	logger.Infoln(args...)
-}
-
-// Warnln is a convenience method equivalent to `Logln(WarnLevel, args...)`.
-func (logger Logger) Warnln(args ...interface{}) {
-	logger.Logln(Warn, args...)
-}
-
-// Errorln is a convenience method equivalent to `Logln(ErrorLevel, args...)`.
-func (logger Logger) Errorln(args ...interface{}) {
-	logger.Logln(Error, args...)
-}
-
-// Fatalln is a convenience method equivalent to `Logln(FatalLevel, args...)`
-// followed by a call to os.Exit(1).
-func (logger Logger) Fatalln(args ...interface{}) {
-	logger.Logln(Fatal, args...)
-	logger.logr.exit(1)
-}
-
-// Panicln is a convenience method equivalent to `Logln(PanicLevel, args...)`
-// followed by a call to panic().
-func (logger Logger) Panicln(args ...interface{}) {
-	logger.Logln(Panic, args...)
-}
diff --git a/vendor/github.com/mattermost/logr/logr.go b/vendor/github.com/mattermost/logr/logr.go
deleted file mode 100644
index 631366a5..00000000
--- a/vendor/github.com/mattermost/logr/logr.go
+++ /dev/null
@@ -1,664 +0,0 @@
-package logr
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"os"
-	"sync"
-	"time"
-
-	"github.com/wiggin77/cfg"
-	"github.com/wiggin77/merror"
-)
-
-// Logr maintains a list of log targets and accepts incoming
-// log records.
-type Logr struct {
-	tmux    sync.RWMutex // target mutex
-	targets []Target
-
-	mux                sync.RWMutex
-	maxQueueSizeActual int
-	in                 chan *LogRec
-	done               chan struct{}
-	once               sync.Once
-	shutdown           bool
-	lvlCache           levelCache
-
-	metricsInitOnce  sync.Once
-	metricsCloseOnce sync.Once
-	metricsDone      chan struct{}
-	metrics          MetricsCollector
-	queueSizeGauge   Gauge
-	loggedCounter    Counter
-	errorCounter     Counter
-
-	bufferPool sync.Pool
-
-	// MaxQueueSize is the maximum number of log records that can be queued.
-	// If exceeded, `OnQueueFull` is called which determines if the log
-	// record will be dropped or block until add is successful.
-	// If this is modified, it must be done before `Configure` or
-	// `AddTarget`.  Defaults to DefaultMaxQueueSize.
-	MaxQueueSize int
-
-	// OnLoggerError, when not nil, is called any time an internal
-	// logging error occurs. For example, this can happen when a
-	// target cannot connect to its data sink.
-	OnLoggerError func(error)
-
-	// OnQueueFull, when not nil, is called on an attempt to add
-	// a log record to a full Logr queue.
-	// `MaxQueueSize` can be used to modify the maximum queue size.
-	// This function should return quickly, with a bool indicating whether
-	// the log record should be dropped (true) or block until the log record
-	// is successfully added (false). If nil then blocking (false) is assumed.
-	OnQueueFull func(rec *LogRec, maxQueueSize int) bool
-
-	// OnTargetQueueFull, when not nil, is called on an attempt to add
-	// a log record to a full target queue provided the target supports reporting
-	// this condition.
-	// This function should return quickly, with a bool indicating whether
-	// the log record should be dropped (true) or block until the log record
-	// is successfully added (false). If nil then blocking (false) is assumed.
-	OnTargetQueueFull func(target Target, rec *LogRec, maxQueueSize int) bool
-
-	// OnExit, when not nil, is called when a FatalXXX style log API is called.
-	// When nil, then the default behavior is to cleanly shut down this Logr and
-	// call `os.Exit(code)`.
-	OnExit func(code int)
-
-	// OnPanic, when not nil, is called when a PanicXXX style log API is called.
-	// When nil, then the default behavior is to cleanly shut down this Logr and
-	// call `panic(err)`.
-	OnPanic func(err interface{})
-
-	// EnqueueTimeout is the amount of time a log record can take to be queued.
-	// This only applies to blocking enqueue which happen after `logr.OnQueueFull`
-	// is called and returns false.
-	EnqueueTimeout time.Duration
-
-	// ShutdownTimeout is the amount of time `logr.Shutdown` can execute before
-	// timing out.
-	ShutdownTimeout time.Duration
-
-	// FlushTimeout is the amount of time `logr.Flush` can execute before
-	// timing out.
-	FlushTimeout time.Duration
-
-	// UseSyncMapLevelCache can be set to true before the first target is added
-	// when high concurrency (e.g. >32 cores) is expected. This may improve
-	// performance with large numbers of cores - benchmark for your use case.
-	UseSyncMapLevelCache bool
-
-	// MaxPooledFormatBuffer determines the maximum size of a buffer that can be
-	// pooled. To reduce allocations, the buffers needed during formatting (etc)
-	// are pooled. A very large log item will grow a buffer that could stay in
-	// memory indefinitely. This settings lets you control how big a pooled buffer
-	// can be - anything larger will be garbage collected after use.
-	// Defaults to 1MB.
-	MaxPooledBuffer int
-
-	// DisableBufferPool when true disables the buffer pool. See MaxPooledBuffer.
-	DisableBufferPool bool
-
-	// MetricsUpdateFreqMillis determines how often polled metrics are updated
-	// when metrics are enabled.
-	MetricsUpdateFreqMillis int64
-}
-
-// Configure adds/removes targets via the supplied `Config`.
-func (logr *Logr) Configure(config *cfg.Config) error {
-	// TODO
-	return fmt.Errorf("not implemented yet")
-}
-
-func (logr *Logr) ensureInit() {
-	logr.once.Do(func() {
-		defer func() {
-			go logr.start()
-		}()
-
-		logr.mux.Lock()
-		defer logr.mux.Unlock()
-
-		logr.maxQueueSizeActual = logr.MaxQueueSize
-		if logr.maxQueueSizeActual == 0 {
-			logr.maxQueueSizeActual = DefaultMaxQueueSize
-		}
-
-		if logr.maxQueueSizeActual < 0 {
-			logr.maxQueueSizeActual = 0
-		}
-
-		logr.in = make(chan *LogRec, logr.maxQueueSizeActual)
-		logr.done = make(chan struct{})
-
-		if logr.UseSyncMapLevelCache {
-			logr.lvlCache = &syncMapLevelCache{}
-		} else {
-			logr.lvlCache = &arrayLevelCache{}
-		}
-
-		if logr.MaxPooledBuffer == 0 {
-			logr.MaxPooledBuffer = DefaultMaxPooledBuffer
-		}
-		logr.bufferPool = sync.Pool{
-			New: func() interface{} {
-				return new(bytes.Buffer)
-			},
-		}
-
-		logr.lvlCache.setup()
-	})
-}
-
-// AddTarget adds one or more targets to the logger which will receive
-// log records for outputting.
-func (logr *Logr) AddTarget(targets ...Target) error {
-	if logr.IsShutdown() {
-		return fmt.Errorf("AddTarget called after Logr shut down")
-	}
-
-	logr.ensureInit()
-	metrics := logr.getMetricsCollector()
-	defer logr.ResetLevelCache() // call this after tmux is released
-
-	logr.tmux.Lock()
-	defer logr.tmux.Unlock()
-
-	errs := merror.New()
-	for _, t := range targets {
-		if t == nil {
-			continue
-		}
-
-		logr.targets = append(logr.targets, t)
-		if metrics != nil {
-			if tm, ok := t.(TargetWithMetrics); ok {
-				if err := tm.EnableMetrics(metrics, logr.MetricsUpdateFreqMillis); err != nil {
-					errs.Append(err)
-				}
-			}
-		}
-	}
-	return errs.ErrorOrNil()
-}
-
-// NewLogger creates a Logger using defaults. A `Logger` is light-weight
-// enough to create on-demand, but typically one or more Loggers are
-// created and re-used.
-func (logr *Logr) NewLogger() Logger {
-	logger := Logger{logr: logr}
-	return logger
-}
-
-var levelStatusDisabled = LevelStatus{}
-
-// IsLevelEnabled returns true if at least one target has the specified
-// level enabled. The result is cached so that subsequent checks are fast.
-func (logr *Logr) IsLevelEnabled(lvl Level) LevelStatus {
-	status, ok := logr.isLevelEnabledFromCache(lvl)
-	if ok {
-		return status
-	}
-
-	// Check each target.
-	logr.tmux.RLock()
-	for _, t := range logr.targets {
-		e, s := t.IsLevelEnabled(lvl)
-		if e {
-			status.Enabled = true
-			if s {
-				status.Stacktrace = true
-				break // if both enabled then no sense checking more targets
-			}
-		}
-	}
-	logr.tmux.RUnlock()
-
-	// Cache and return the result.
-	if err := logr.updateLevelCache(lvl.ID, status); err != nil {
-		logr.ReportError(err)
-		return LevelStatus{}
-	}
-	return status
-}
-
-func (logr *Logr) isLevelEnabledFromCache(lvl Level) (LevelStatus, bool) {
-	logr.mux.RLock()
-	defer logr.mux.RUnlock()
-
-	// Don't accept new log records after shutdown.
-	if logr.shutdown {
-		return levelStatusDisabled, true
-	}
-
-	// Check cache. lvlCache may still be nil if no targets added.
-	if logr.lvlCache == nil {
-		return levelStatusDisabled, true
-	}
-	status, ok := logr.lvlCache.get(lvl.ID)
-	if ok {
-		return status, true
-	}
-	return LevelStatus{}, false
-}
-
-func (logr *Logr) updateLevelCache(id LevelID, status LevelStatus) error {
-	logr.mux.RLock()
-	defer logr.mux.RUnlock()
-	if logr.lvlCache != nil {
-		return logr.lvlCache.put(id, status)
-	}
-	return nil
-}
-
-// HasTargets returns true only if at least one target exists within the Logr.
-func (logr *Logr) HasTargets() bool {
-	logr.tmux.RLock()
-	defer logr.tmux.RUnlock()
-	return len(logr.targets) > 0
-}
-
-// TargetInfo provides name and type for a Target.
-type TargetInfo struct {
-	Name string
-	Type string
-}
-
-// TargetInfos enumerates all the targets added to this Logr.
-// The resulting slice represents a snapshot at time of calling.
-func (logr *Logr) TargetInfos() []TargetInfo {
-	logr.tmux.RLock()
-	defer logr.tmux.RUnlock()
-
-	infos := make([]TargetInfo, 0)
-
-	for _, t := range logr.targets {
-		inf := TargetInfo{
-			Name: fmt.Sprintf("%v", t),
-			Type: fmt.Sprintf("%T", t),
-		}
-		infos = append(infos, inf)
-	}
-	return infos
-}
-
-// RemoveTargets safely removes one or more targets based on the filtering method.
-// f should return true to delete the target, false to keep it.
-// When removing a target, best effort is made to write any queued log records before
-// closing, with cxt determining how much time can be spent in total.
-// Note, keep the timeout short since this method blocks certain logging operations.
-func (logr *Logr) RemoveTargets(cxt context.Context, f func(ti TargetInfo) bool) error {
-	var removed bool
-	defer func() {
-		if removed {
-			// call this after tmux is released since
-			// it will lock mux and we don't want to
-			// introduce possible deadlock.
-			logr.ResetLevelCache()
-		}
-	}()
-
-	errs := merror.New()
-
-	logr.tmux.Lock()
-	defer logr.tmux.Unlock()
-
-	cp := make([]Target, 0)
-
-	for _, t := range logr.targets {
-		inf := TargetInfo{
-			Name: fmt.Sprintf("%v", t),
-			Type: fmt.Sprintf("%T", t),
-		}
-		if f(inf) {
-			if err := t.Shutdown(cxt); err != nil {
-				errs.Append(err)
-			}
-			removed = true
-		} else {
-			cp = append(cp, t)
-		}
-	}
-	logr.targets = cp
-	return errs.ErrorOrNil()
-}
-
-// ResetLevelCache resets the cached results of `IsLevelEnabled`. This is
-// called any time a Target is added or a target's level is changed.
-func (logr *Logr) ResetLevelCache() {
-	// Write lock so that new cache entries cannot be stored while we
-	// clear the cache.
-	logr.mux.Lock()
-	defer logr.mux.Unlock()
-	logr.resetLevelCache()
-}
-
-// resetLevelCache empties the level cache without locking.
-// mux.Lock must be held before calling this function.
-func (logr *Logr) resetLevelCache() {
-	// lvlCache may still be nil if no targets added.
-	if logr.lvlCache != nil {
-		logr.lvlCache.clear()
-	}
-}
-
-// enqueue adds a log record to the logr queue. If the queue is full then
-// this function either blocks or the log record is dropped, depending on
-// the result of calling `OnQueueFull`.
-func (logr *Logr) enqueue(rec *LogRec) {
-	if logr.in == nil {
-		logr.ReportError(fmt.Errorf("AddTarget or Configure must be called before enqueue"))
-	}
-
-	select {
-	case logr.in <- rec:
-	default:
-		if logr.OnQueueFull != nil && logr.OnQueueFull(rec, logr.maxQueueSizeActual) {
-			return // drop the record
-		}
-		select {
-		case <-time.After(logr.enqueueTimeout()):
-			logr.ReportError(fmt.Errorf("enqueue timed out for log rec [%v]", rec))
-		case logr.in <- rec: // block until success or timeout
-		}
-	}
-}
-
-// exit is called by one of the FatalXXX style APIS. If `logr.OnExit` is not nil
-// then that method is called, otherwise the default behavior is to shut down this
-// Logr cleanly then call `os.Exit(code)`.
-func (logr *Logr) exit(code int) {
-	if logr.OnExit != nil {
-		logr.OnExit(code)
-		return
-	}
-
-	if err := logr.Shutdown(); err != nil {
-		logr.ReportError(err)
-	}
-	os.Exit(code)
-}
-
-// panic is called by one of the PanicXXX style APIS. If `logr.OnPanic` is not nil
-// then that method is called, otherwise the default behavior is to shut down this
-// Logr cleanly then call `panic(err)`.
-func (logr *Logr) panic(err interface{}) {
-	if logr.OnPanic != nil {
-		logr.OnPanic(err)
-		return
-	}
-
-	if err := logr.Shutdown(); err != nil {
-		logr.ReportError(err)
-	}
-	panic(err)
-}
-
-// Flush blocks while flushing the logr queue and all target queues, by
-// writing existing log records to valid targets.
-// Any attempts to add new log records will block until flush is complete.
-// `logr.FlushTimeout` determines how long flush can execute before
-// timing out. Use `IsTimeoutError` to determine if the returned error is
-// due to a timeout.
-func (logr *Logr) Flush() error {
-	ctx, cancel := context.WithTimeout(context.Background(), logr.flushTimeout())
-	defer cancel()
-	return logr.FlushWithTimeout(ctx)
-}
-
-// Flush blocks while flushing the logr queue and all target queues, by
-// writing existing log records to valid targets.
-// Any attempts to add new log records will block until flush is complete.
-// Use `IsTimeoutError` to determine if the returned error is
-// due to a timeout.
-func (logr *Logr) FlushWithTimeout(ctx context.Context) error {
-	if !logr.HasTargets() {
-		return nil
-	}
-
-	if logr.IsShutdown() {
-		return errors.New("Flush called on shut down Logr")
-	}
-
-	rec := newFlushLogRec(logr.NewLogger())
-	logr.enqueue(rec)
-
-	select {
-	case <-ctx.Done():
-		return newTimeoutError("logr queue shutdown timeout")
-	case <-rec.flush:
-	}
-	return nil
-}
-
-// IsShutdown returns true if this Logr instance has been shut down.
-// No further log records can be enqueued and no targets added after
-// shutdown.
-func (logr *Logr) IsShutdown() bool {
-	logr.mux.Lock()
-	defer logr.mux.Unlock()
-	return logr.shutdown
-}
-
-// Shutdown cleanly stops the logging engine after making best efforts
-// to flush all targets. Call this function right before application
-// exit - logr cannot be restarted once shut down.
-// `logr.ShutdownTimeout` determines how long shutdown can execute before
-// timing out. Use `IsTimeoutError` to determine if the returned error is
-// due to a timeout.
-func (logr *Logr) Shutdown() error {
-	ctx, cancel := context.WithTimeout(context.Background(), logr.shutdownTimeout())
-	defer cancel()
-	return logr.ShutdownWithTimeout(ctx)
-}
-
-// Shutdown cleanly stops the logging engine after making best efforts
-// to flush all targets. Call this function right before application
-// exit - logr cannot be restarted once shut down.
-// Use `IsTimeoutError` to determine if the returned error is due to a
-// timeout.
-func (logr *Logr) ShutdownWithTimeout(ctx context.Context) error {
-	logr.mux.Lock()
-	if logr.shutdown {
-		logr.mux.Unlock()
-		return errors.New("Shutdown called again after shut down")
-	}
-	logr.shutdown = true
-	logr.resetLevelCache()
-	logr.mux.Unlock()
-
-	logr.metricsCloseOnce.Do(func() {
-		if logr.metricsDone != nil {
-			close(logr.metricsDone)
-		}
-	})
-
-	errs := merror.New()
-
-	// close the incoming channel and wait for read loop to exit.
-	if logr.in != nil {
-		close(logr.in)
-		select {
-		case <-ctx.Done():
-			errs.Append(newTimeoutError("logr queue shutdown timeout"))
-		case <-logr.done:
-		}
-	}
-
-	// logr.in channel should now be drained to targets and no more log records
-	// can be added.
-	logr.tmux.RLock()
-	defer logr.tmux.RUnlock()
-	for _, t := range logr.targets {
-		err := t.Shutdown(ctx)
-		if err != nil {
-			errs.Append(err)
-		}
-	}
-	return errs.ErrorOrNil()
-}
-
-// ReportError is used to notify the host application of any internal logging errors.
-// If `OnLoggerError` is not nil, it is called with the error, otherwise the error is
-// output to `os.Stderr`.
-func (logr *Logr) ReportError(err interface{}) {
-	logr.incErrorCounter()
-
-	if logr.OnLoggerError == nil {
-		fmt.Fprintln(os.Stderr, err)
-		return
-	}
-	logr.OnLoggerError(fmt.Errorf("%v", err))
-}
-
-// BorrowBuffer borrows a buffer from the pool. Release the buffer to reduce garbage collection.
-func (logr *Logr) BorrowBuffer() *bytes.Buffer {
-	if logr.DisableBufferPool {
-		return &bytes.Buffer{}
-	}
-	return logr.bufferPool.Get().(*bytes.Buffer)
-}
-
-// ReleaseBuffer returns a buffer to the pool to reduce garbage collection. The buffer is only
-// retained if less than MaxPooledBuffer.
-func (logr *Logr) ReleaseBuffer(buf *bytes.Buffer) {
-	if !logr.DisableBufferPool && buf.Cap() < logr.MaxPooledBuffer {
-		buf.Reset()
-		logr.bufferPool.Put(buf)
-	}
-}
-
-// enqueueTimeout returns amount of time a log record can take to be queued.
-// This only applies to blocking enqueue which happen after `logr.OnQueueFull` is called
-// and returns false.
-func (logr *Logr) enqueueTimeout() time.Duration {
-	if logr.EnqueueTimeout == 0 {
-		return DefaultEnqueueTimeout
-	}
-	return logr.EnqueueTimeout
-}
-
-// shutdownTimeout returns the timeout duration for `logr.Shutdown`.
-func (logr *Logr) shutdownTimeout() time.Duration {
-	if logr.ShutdownTimeout == 0 {
-		return DefaultShutdownTimeout
-	}
-	return logr.ShutdownTimeout
-}
-
-// flushTimeout returns the timeout duration for `logr.Flush`.
-func (logr *Logr) flushTimeout() time.Duration {
-	if logr.FlushTimeout == 0 {
-		return DefaultFlushTimeout
-	}
-	return logr.FlushTimeout
-}
-
-// start selects on incoming log records until done channel signals.
-// Incoming log records are fanned out to all log targets.
-func (logr *Logr) start() {
-	defer func() {
-		if r := recover(); r != nil {
-			logr.ReportError(r)
-			go logr.start()
-		}
-	}()
-
-	for rec := range logr.in {
-		if rec.flush != nil {
-			logr.flush(rec.flush)
-		} else {
-			rec.prep()
-			logr.fanout(rec)
-		}
-	}
-	close(logr.done)
-}
-
-// startMetricsUpdater updates the metrics for any polled values every `MetricsUpdateFreqSecs` seconds until
-// logr is closed.
-func (logr *Logr) startMetricsUpdater() {
-	for {
-		updateFreq := logr.getMetricsUpdateFreqMillis()
-		if updateFreq == 0 {
-			updateFreq = DefMetricsUpdateFreqMillis
-		}
-		if updateFreq < 250 {
-			updateFreq = 250 // don't peg the CPU
-		}
-
-		select {
-		case <-logr.metricsDone:
-			return
-		case <-time.After(time.Duration(updateFreq) * time.Millisecond):
-			logr.setQueueSizeGauge(float64(len(logr.in)))
-		}
-	}
-}
-
-func (logr *Logr) getMetricsUpdateFreqMillis() int64 {
-	logr.mux.RLock()
-	defer logr.mux.RUnlock()
-	return logr.MetricsUpdateFreqMillis
-}
-
-// fanout pushes a LogRec to all targets.
-func (logr *Logr) fanout(rec *LogRec) {
-	var target Target
-	defer func() {
-		if r := recover(); r != nil {
-			logr.ReportError(fmt.Errorf("fanout failed for target %s, %v", target, r))
-		}
-	}()
-
-	var logged bool
-	defer func() {
-		if logged {
-			logr.incLoggedCounter() // call this after tmux is released
-		}
-	}()
-
-	logr.tmux.RLock()
-	defer logr.tmux.RUnlock()
-	for _, target = range logr.targets {
-		if enabled, _ := target.IsLevelEnabled(rec.Level()); enabled {
-			target.Log(rec)
-			logged = true
-		}
-	}
-}
-
-// flush drains the queue and notifies when done.
-func (logr *Logr) flush(done chan<- struct{}) {
-	// first drain the logr queue.
-loop:
-	for {
-		var rec *LogRec
-		select {
-		case rec = <-logr.in:
-			if rec.flush == nil {
-				rec.prep()
-				logr.fanout(rec)
-			}
-		default:
-			break loop
-		}
-	}
-
-	logger := logr.NewLogger()
-
-	// drain all the targets; block until finished.
-	logr.tmux.RLock()
-	defer logr.tmux.RUnlock()
-	for _, target := range logr.targets {
-		rec := newFlushLogRec(logger)
-		target.Log(rec)
-		<-rec.flush
-	}
-	done <- struct{}{}
-}
diff --git a/vendor/github.com/mattermost/logr/logrec.go b/vendor/github.com/mattermost/logr/logrec.go
deleted file mode 100644
index 9428aaec..00000000
--- a/vendor/github.com/mattermost/logr/logrec.go
+++ /dev/null
@@ -1,189 +0,0 @@
-package logr
-
-import (
-	"fmt"
-	"runtime"
-	"strings"
-	"sync"
-	"time"
-)
-
-var (
-	logrPkg string
-)
-
-func init() {
-	// Calc current package name
-	pcs := make([]uintptr, 2)
-	_ = runtime.Callers(0, pcs)
-	tmp := runtime.FuncForPC(pcs[1]).Name()
-	logrPkg = getPackageName(tmp)
-}
-
-// LogRec collects raw, unformatted data to be logged.
-// TODO:  pool these?  how to reliably know when targets are done with them? Copy for each target?
-type LogRec struct {
-	mux  sync.RWMutex
-	time time.Time
-
-	level  Level
-	logger Logger
-
-	template string
-	newline  bool
-	args     []interface{}
-
-	stackPC    []uintptr
-	stackCount int
-
-	// flushes Logr and target queues when not nil.
-	flush chan struct{}
-
-	// remaining fields calculated by `prep`
-	msg    string
-	frames []runtime.Frame
-}
-
-// NewLogRec creates a new LogRec with the current time and optional stack trace.
-func NewLogRec(lvl Level, logger Logger, template string, args []interface{}, incStacktrace bool) *LogRec {
-	rec := &LogRec{time: time.Now(), logger: logger, level: lvl, template: template, args: args}
-	if incStacktrace {
-		rec.stackPC = make([]uintptr, DefaultMaxStackFrames)
-		rec.stackCount = runtime.Callers(2, rec.stackPC)
-	}
-	return rec
-}
-
-// newFlushLogRec creates a LogRec that flushes the Logr queue and
-// any target queues that support flushing.
-func newFlushLogRec(logger Logger) *LogRec {
-	return &LogRec{logger: logger, flush: make(chan struct{})}
-}
-
-// prep resolves all args and field values to strings, and
-// resolves stack trace to frames.
-func (rec *LogRec) prep() {
-	rec.mux.Lock()
-	defer rec.mux.Unlock()
-
-	// resolve args
-	if rec.template == "" {
-		if rec.newline {
-			rec.msg = fmt.Sprintln(rec.args...)
-		} else {
-			rec.msg = fmt.Sprint(rec.args...)
-		}
-	} else {
-		rec.msg = fmt.Sprintf(rec.template, rec.args...)
-	}
-
-	// resolve stack trace
-	if rec.stackCount > 0 {
-		frames := runtime.CallersFrames(rec.stackPC[:rec.stackCount])
-		for {
-			f, more := frames.Next()
-			rec.frames = append(rec.frames, f)
-			if !more {
-				break
-			}
-		}
-
-		// remove leading logr package entries.
-		var start int
-		for i, frame := range rec.frames {
-			pkg := getPackageName(frame.Function)
-			if pkg != "" && pkg != logrPkg {
-				start = i
-				break
-			}
-		}
-		rec.frames = rec.frames[start:]
-	}
-}
-
-// WithTime returns a shallow copy of the log record while replacing
-// the time. This can be used by targets and formatters to adjust
-// the time, or take ownership of the log record.
-func (rec *LogRec) WithTime(time time.Time) *LogRec {
-	rec.mux.RLock()
-	defer rec.mux.RUnlock()
-
-	return &LogRec{
-		time:       time,
-		level:      rec.level,
-		logger:     rec.logger,
-		template:   rec.template,
-		newline:    rec.newline,
-		args:       rec.args,
-		msg:        rec.msg,
-		stackPC:    rec.stackPC,
-		stackCount: rec.stackCount,
-		frames:     rec.frames,
-	}
-}
-
-// Logger returns the `Logger` that created this `LogRec`.
-func (rec *LogRec) Logger() Logger {
-	return rec.logger
-}
-
-// Time returns this log record's time stamp.
-func (rec *LogRec) Time() time.Time {
-	// no locking needed as this field is not mutated.
-	return rec.time
-}
-
-// Level returns this log record's Level.
-func (rec *LogRec) Level() Level {
-	// no locking needed as this field is not mutated.
-	return rec.level
-}
-
-// Fields returns this log record's Fields.
-func (rec *LogRec) Fields() Fields {
-	// no locking needed as this field is not mutated.
-	return rec.logger.fields
-}
-
-// Msg returns this log record's message text.
-func (rec *LogRec) Msg() string {
-	rec.mux.RLock()
-	defer rec.mux.RUnlock()
-	return rec.msg
-}
-
-// StackFrames returns this log record's stack frames or
-// nil if no stack trace was required.
-func (rec *LogRec) StackFrames() []runtime.Frame {
-	rec.mux.RLock()
-	defer rec.mux.RUnlock()
-	return rec.frames
-}
-
-// String returns a string representation of this log record.
-func (rec *LogRec) String() string {
-	if rec.flush != nil {
-		return "[flusher]"
-	}
-
-	f := &DefaultFormatter{}
-	buf := rec.logger.logr.BorrowBuffer()
-	defer rec.logger.logr.ReleaseBuffer(buf)
-	buf, _ = f.Format(rec, true, buf)
-	return strings.TrimSpace(buf.String())
-}
-
-// getPackageName reduces a fully qualified function name to the package name
-// By sirupsen: https://github.com/sirupsen/logrus/blob/master/entry.go
-func getPackageName(f string) string {
-	for {
-		lastPeriod := strings.LastIndex(f, ".")
-		lastSlash := strings.LastIndex(f, "/")
-		if lastPeriod > lastSlash {
-			f = f[:lastPeriod]
-		} else {
-			break
-		}
-	}
-	return f
-}
diff --git a/vendor/github.com/mattermost/logr/metrics.go b/vendor/github.com/mattermost/logr/metrics.go
deleted file mode 100644
index 24fe22b6..00000000
--- a/vendor/github.com/mattermost/logr/metrics.go
+++ /dev/null
@@ -1,117 +0,0 @@
-package logr
-
-import (
-	"errors"
-
-	"github.com/wiggin77/merror"
-)
-
-const (
-	DefMetricsUpdateFreqMillis = 15000 // 15 seconds
-)
-
-// Counter is a simple metrics sink that can only increment a value.
-// Implementations are external to Logr and provided via `MetricsCollector`.
-type Counter interface {
-	// Inc increments the counter by 1. Use Add to increment it by arbitrary non-negative values.
-	Inc()
-	// Add adds the given value to the counter. It panics if the value is < 0.
-	Add(float64)
-}
-
-// Gauge is a simple metrics sink that can receive values and increase or decrease.
-// Implementations are external to Logr and provided via `MetricsCollector`.
-type Gauge interface {
-	// Set sets the Gauge to an arbitrary value.
-	Set(float64)
-	// Add adds the given value to the Gauge. (The value can be negative, resulting in a decrease of the Gauge.)
-	Add(float64)
-	// Sub subtracts the given value from the Gauge. (The value can be negative, resulting in an increase of the Gauge.)
-	Sub(float64)
-}
-
-// MetricsCollector provides a way for users of this Logr package to have metrics pushed
-// in an efficient way to any backend, e.g. Prometheus.
-// For each target added to Logr, the supplied MetricsCollector will provide a Gauge
-// and Counters that will be called frequently as logging occurs.
-type MetricsCollector interface {
-	// QueueSizeGauge returns a Gauge that will be updated by the named target.
-	QueueSizeGauge(target string) (Gauge, error)
-	// LoggedCounter returns a Counter that will be incremented by the named target.
-	LoggedCounter(target string) (Counter, error)
-	// ErrorCounter returns a Counter that will be incremented by the named target.
-	ErrorCounter(target string) (Counter, error)
-	// DroppedCounter returns a Counter that will be incremented by the named target.
-	DroppedCounter(target string) (Counter, error)
-	// BlockedCounter returns a Counter that will be incremented by the named target.
-	BlockedCounter(target string) (Counter, error)
-}
-
-// TargetWithMetrics is a target that provides metrics.
-type TargetWithMetrics interface {
-	EnableMetrics(collector MetricsCollector, updateFreqMillis int64) error
-}
-
-func (logr *Logr) getMetricsCollector() MetricsCollector {
-	logr.mux.RLock()
-	defer logr.mux.RUnlock()
-	return logr.metrics
-}
-
-// SetMetricsCollector enables metrics collection by supplying a MetricsCollector.
-// The MetricsCollector provides counters and gauges that are updated by log targets.
-func (logr *Logr) SetMetricsCollector(collector MetricsCollector) error {
-	if collector == nil {
-		return errors.New("collector cannot be nil")
-	}
-
-	logr.mux.Lock()
-	logr.metrics = collector
-	logr.queueSizeGauge, _ = collector.QueueSizeGauge("_logr")
-	logr.loggedCounter, _ = collector.LoggedCounter("_logr")
-	logr.errorCounter, _ = collector.ErrorCounter("_logr")
-	logr.mux.Unlock()
-
-	logr.metricsInitOnce.Do(func() {
-		logr.metricsDone = make(chan struct{})
-		go logr.startMetricsUpdater()
-	})
-
-	merr := merror.New()
-
-	logr.tmux.RLock()
-	defer logr.tmux.RUnlock()
-	for _, target := range logr.targets {
-		if tm, ok := target.(TargetWithMetrics); ok {
-			if err := tm.EnableMetrics(collector, logr.MetricsUpdateFreqMillis); err != nil {
-				merr.Append(err)
-			}
-		}
-
-	}
-	return merr.ErrorOrNil()
-}
-
-func (logr *Logr) setQueueSizeGauge(val float64) {
-	logr.mux.RLock()
-	defer logr.mux.RUnlock()
-	if logr.queueSizeGauge != nil {
-		logr.queueSizeGauge.Set(val)
-	}
-}
-
-func (logr *Logr) incLoggedCounter() {
-	logr.mux.RLock()
-	defer logr.mux.RUnlock()
-	if logr.loggedCounter != nil {
-		logr.loggedCounter.Inc()
-	}
-}
-
-func (logr *Logr) incErrorCounter() {
-	logr.mux.RLock()
-	defer logr.mux.RUnlock()
-	if logr.errorCounter != nil {
-		logr.errorCounter.Inc()
-	}
-}
diff --git a/vendor/github.com/mattermost/logr/target.go b/vendor/github.com/mattermost/logr/target.go
deleted file mode 100644
index f8e7bf75..00000000
--- a/vendor/github.com/mattermost/logr/target.go
+++ /dev/null
@@ -1,299 +0,0 @@
-package logr
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"sync"
-	"time"
-)
-
-// Target represents a destination for log records such as file,
-// database, TCP socket, etc.
-type Target interface {
-	// SetName provides an optional name for the target.
-	SetName(name string)
-
-	// IsLevelEnabled returns true if this target should emit
-	// logs for the specified level. Also determines if
-	// a stack trace is required.
-	IsLevelEnabled(Level) (enabled bool, stacktrace bool)
-
-	// Formatter returns the Formatter associated with this Target.
-	Formatter() Formatter
-
-	// Log outputs the log record to this target's destination.
-	Log(rec *LogRec)
-
-	// Shutdown makes best effort to flush target queue and
-	// frees/closes all resources.
-	Shutdown(ctx context.Context) error
-}
-
-// RecordWriter can convert a LogRecord to bytes and output to some data sink.
-type RecordWriter interface {
-	Write(rec *LogRec) error
-}
-
-// Basic provides the basic functionality of a Target that can be used
-// to more easily compose your own Targets. To use, just embed Basic
-// in your target type, implement `RecordWriter`, and call `(*Basic).Start`.
-type Basic struct {
-	target Target
-
-	filter    Filter
-	formatter Formatter
-
-	in   chan *LogRec
-	done chan struct{}
-	w    RecordWriter
-
-	mux  sync.RWMutex
-	name string
-
-	metrics        bool
-	queueSizeGauge Gauge
-	loggedCounter  Counter
-	errorCounter   Counter
-	droppedCounter Counter
-	blockedCounter Counter
-
-	metricsUpdateFreqMillis int64
-}
-
-// Start initializes this target helper and starts accepting log records for processing.
-func (b *Basic) Start(target Target, rw RecordWriter, filter Filter, formatter Formatter, maxQueued int) {
-	if filter == nil {
-		filter = &StdFilter{Lvl: Fatal}
-	}
-	if formatter == nil {
-		formatter = &DefaultFormatter{}
-	}
-
-	b.target = target
-	b.filter = filter
-	b.formatter = formatter
-	b.in = make(chan *LogRec, maxQueued)
-	b.done = make(chan struct{}, 1)
-	b.w = rw
-	go b.start()
-
-	if b.hasMetrics() {
-		go b.startMetricsUpdater()
-	}
-}
-
-func (b *Basic) SetName(name string) {
-	b.mux.Lock()
-	defer b.mux.Unlock()
-	b.name = name
-}
-
-// IsLevelEnabled returns true if this target should emit
-// logs for the specified level. Also determines if
-// a stack trace is required.
-func (b *Basic) IsLevelEnabled(lvl Level) (enabled bool, stacktrace bool) {
-	return b.filter.IsEnabled(lvl), b.filter.IsStacktraceEnabled(lvl)
-}
-
-// Formatter returns the Formatter associated with this Target.
-func (b *Basic) Formatter() Formatter {
-	return b.formatter
-}
-
-// Shutdown stops processing log records after making best
-// effort to flush queue.
-func (b *Basic) Shutdown(ctx context.Context) error {
-	// close the incoming channel and wait for read loop to exit.
-	close(b.in)
-	select {
-	case <-ctx.Done():
-	case <-b.done:
-	}
-
-	// b.in channel should now be drained.
-	return nil
-}
-
-// Log outputs the log record to this targets destination.
-func (b *Basic) Log(rec *LogRec) {
-	lgr := rec.Logger().Logr()
-	select {
-	case b.in <- rec:
-	default:
-		handler := lgr.OnTargetQueueFull
-		if handler != nil && handler(b.target, rec, cap(b.in)) {
-			b.incDroppedCounter()
-			return // drop the record
-		}
-		b.incBlockedCounter()
-
-		select {
-		case <-time.After(lgr.enqueueTimeout()):
-			lgr.ReportError(fmt.Errorf("target enqueue timeout for log rec [%v]", rec))
-		case b.in <- rec: // block until success or timeout
-		}
-	}
-}
-
-// Metrics enables metrics collection using the provided MetricsCollector.
-func (b *Basic) EnableMetrics(collector MetricsCollector, updateFreqMillis int64) error {
-	name := fmt.Sprintf("%v", b)
-
-	b.mux.Lock()
-	defer b.mux.Unlock()
-
-	b.metrics = true
-	b.metricsUpdateFreqMillis = updateFreqMillis
-
-	var err error
-
-	if b.queueSizeGauge, err = collector.QueueSizeGauge(name); err != nil {
-		return err
-	}
-	if b.loggedCounter, err = collector.LoggedCounter(name); err != nil {
-		return err
-	}
-	if b.errorCounter, err = collector.ErrorCounter(name); err != nil {
-		return err
-	}
-	if b.droppedCounter, err = collector.DroppedCounter(name); err != nil {
-		return err
-	}
-	if b.blockedCounter, err = collector.BlockedCounter(name); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (b *Basic) hasMetrics() bool {
-	b.mux.RLock()
-	defer b.mux.RUnlock()
-	return b.metrics
-}
-
-func (b *Basic) setQueueSizeGauge(val float64) {
-	b.mux.RLock()
-	defer b.mux.RUnlock()
-	if b.queueSizeGauge != nil {
-		b.queueSizeGauge.Set(val)
-	}
-}
-
-func (b *Basic) incLoggedCounter() {
-	b.mux.RLock()
-	defer b.mux.RUnlock()
-	if b.loggedCounter != nil {
-		b.loggedCounter.Inc()
-	}
-}
-
-func (b *Basic) incErrorCounter() {
-	b.mux.RLock()
-	defer b.mux.RUnlock()
-	if b.errorCounter != nil {
-		b.errorCounter.Inc()
-	}
-}
-
-func (b *Basic) incDroppedCounter() {
-	b.mux.RLock()
-	defer b.mux.RUnlock()
-	if b.droppedCounter != nil {
-		b.droppedCounter.Inc()
-	}
-}
-
-func (b *Basic) incBlockedCounter() {
-	b.mux.RLock()
-	defer b.mux.RUnlock()
-	if b.blockedCounter != nil {
-		b.blockedCounter.Inc()
-	}
-}
-
-// String returns a name for this target. Use `SetName` to specify a name.
-func (b *Basic) String() string {
-	b.mux.RLock()
-	defer b.mux.RUnlock()
-
-	if b.name != "" {
-		return b.name
-	}
-	return fmt.Sprintf("%T", b.target)
-}
-
-// Start accepts log records via In channel and writes to the
-// supplied writer, until Done channel signaled.
-func (b *Basic) start() {
-	defer func() {
-		if r := recover(); r != nil {
-			fmt.Fprintln(os.Stderr, "Basic.start -- ", r)
-			go b.start()
-		}
-	}()
-
-	for rec := range b.in {
-		if rec.flush != nil {
-			b.flush(rec.flush)
-		} else {
-			err := b.w.Write(rec)
-			if err != nil {
-				b.incErrorCounter()
-				rec.Logger().Logr().ReportError(err)
-			} else {
-				b.incLoggedCounter()
-			}
-		}
-	}
-	close(b.done)
-}
-
-// startMetricsUpdater updates the metrics for any polled values every `MetricsUpdateFreqSecs` seconds until
-// target is closed.
-func (b *Basic) startMetricsUpdater() {
-	for {
-		updateFreq := b.getMetricsUpdateFreqMillis()
-		if updateFreq == 0 {
-			updateFreq = DefMetricsUpdateFreqMillis
-		}
-		if updateFreq < 250 {
-			updateFreq = 250 // don't peg the CPU
-		}
-
-		select {
-		case <-b.done:
-			return
-		case <-time.After(time.Duration(updateFreq) * time.Millisecond):
-			b.setQueueSizeGauge(float64(len(b.in)))
-		}
-	}
-}
-
-func (b *Basic) getMetricsUpdateFreqMillis() int64 {
-	b.mux.RLock()
-	defer b.mux.RUnlock()
-	return b.metricsUpdateFreqMillis
-}
-
-// flush drains the queue and notifies when done.
-func (b *Basic) flush(done chan<- struct{}) {
-	for {
-		var rec *LogRec
-		var err error
-		select {
-		case rec = <-b.in:
-			// ignore any redundant flush records.
-			if rec.flush == nil {
-				err = b.w.Write(rec)
-				if err != nil {
-					b.incErrorCounter()
-					rec.Logger().Logr().ReportError(err)
-				}
-			}
-		default:
-			done <- struct{}{}
-			return
-		}
-	}
-}
diff --git a/vendor/github.com/mattermost/logr/target/file.go b/vendor/github.com/mattermost/logr/target/file.go
deleted file mode 100644
index 0fd50768..00000000
--- a/vendor/github.com/mattermost/logr/target/file.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package target
-
-import (
-	"context"
-	"io"
-
-	"github.com/mattermost/logr"
-	"github.com/wiggin77/merror"
-	"gopkg.in/natefinch/lumberjack.v2"
-)
-
-type FileOptions struct {
-	// Filename is the file to write logs to.  Backup log files will be retained
-	// in the same directory.  It uses <processname>-lumberjack.log in
-	// os.TempDir() if empty.
-	Filename string
-
-	// MaxSize is the maximum size in megabytes of the log file before it gets
-	// rotated. It defaults to 100 megabytes.
-	MaxSize int
-
-	// MaxAge is the maximum number of days to retain old log files based on the
-	// timestamp encoded in their filename.  Note that a day is defined as 24
-	// hours and may not exactly correspond to calendar days due to daylight
-	// savings, leap seconds, etc. The default is not to remove old log files
-	// based on age.
-	MaxAge int
-
-	// MaxBackups is the maximum number of old log files to retain.  The default
-	// is to retain all old log files (though MaxAge may still cause them to get
-	// deleted.)
-	MaxBackups int
-
-	// Compress determines if the rotated log files should be compressed
-	// using gzip. The default is not to perform compression.
-	Compress bool
-}
-
-// File outputs log records to a file which can be log rotated based on size or age.
-// Uses `https://github.com/natefinch/lumberjack` for rotation.
-type File struct {
-	logr.Basic
-	out io.WriteCloser
-}
-
-// NewFileTarget creates a target capable of outputting log records to a rotated file.
-func NewFileTarget(filter logr.Filter, formatter logr.Formatter, opts FileOptions, maxQueue int) *File {
-	lumber := &lumberjack.Logger{
-		Filename:   opts.Filename,
-		MaxSize:    opts.MaxSize,
-		MaxBackups: opts.MaxBackups,
-		MaxAge:     opts.MaxAge,
-		Compress:   opts.Compress,
-	}
-	f := &File{out: lumber}
-	f.Basic.Start(f, f, filter, formatter, maxQueue)
-	return f
-}
-
-// Write converts the log record to bytes, via the Formatter,
-// and outputs to a file.
-func (f *File) Write(rec *logr.LogRec) error {
-	_, stacktrace := f.IsLevelEnabled(rec.Level())
-
-	buf := rec.Logger().Logr().BorrowBuffer()
-	defer rec.Logger().Logr().ReleaseBuffer(buf)
-
-	buf, err := f.Formatter().Format(rec, stacktrace, buf)
-	if err != nil {
-		return err
-	}
-	_, err = f.out.Write(buf.Bytes())
-	return err
-}
-
-// Shutdown flushes any remaining log records and closes the file.
-func (f *File) Shutdown(ctx context.Context) error {
-	errs := merror.New()
-
-	err := f.Basic.Shutdown(ctx)
-	errs.Append(err)
-
-	err = f.out.Close()
-	errs.Append(err)
-
-	return errs.ErrorOrNil()
-}
diff --git a/vendor/github.com/mattermost/logr/target/syslog.go b/vendor/github.com/mattermost/logr/target/syslog.go
deleted file mode 100644
index 1d2013b6..00000000
--- a/vendor/github.com/mattermost/logr/target/syslog.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// +build !windows,!nacl,!plan9
-
-package target
-
-import (
-	"context"
-	"fmt"
-	"log/syslog"
-
-	"github.com/mattermost/logr"
-	"github.com/wiggin77/merror"
-)
-
-// Syslog outputs log records to local or remote syslog.
-type Syslog struct {
-	logr.Basic
-	w *syslog.Writer
-}
-
-// SyslogParams provides parameters for dialing a syslog daemon.
-type SyslogParams struct {
-	Network  string
-	Raddr    string
-	Priority syslog.Priority
-	Tag      string
-}
-
-// NewSyslogTarget creates a target capable of outputting log records to remote or local syslog.
-func NewSyslogTarget(filter logr.Filter, formatter logr.Formatter, params *SyslogParams, maxQueue int) (*Syslog, error) {
-	writer, err := syslog.Dial(params.Network, params.Raddr, params.Priority, params.Tag)
-	if err != nil {
-		return nil, err
-	}
-
-	s := &Syslog{w: writer}
-	s.Basic.Start(s, s, filter, formatter, maxQueue)
-
-	return s, nil
-}
-
-// Shutdown stops processing log records after making best
-// effort to flush queue.
-func (s *Syslog) Shutdown(ctx context.Context) error {
-	errs := merror.New()
-
-	err := s.Basic.Shutdown(ctx)
-	errs.Append(err)
-
-	err = s.w.Close()
-	errs.Append(err)
-
-	return errs.ErrorOrNil()
-}
-
-// Write converts the log record to bytes, via the Formatter,
-// and outputs to syslog.
-func (s *Syslog) Write(rec *logr.LogRec) error {
-	_, stacktrace := s.IsLevelEnabled(rec.Level())
-
-	buf := rec.Logger().Logr().BorrowBuffer()
-	defer rec.Logger().Logr().ReleaseBuffer(buf)
-
-	buf, err := s.Formatter().Format(rec, stacktrace, buf)
-	if err != nil {
-		return err
-	}
-	txt := buf.String()
-
-	switch rec.Level() {
-	case logr.Panic, logr.Fatal:
-		err = s.w.Crit(txt)
-	case logr.Error:
-		err = s.w.Err(txt)
-	case logr.Warn:
-		err = s.w.Warning(txt)
-	case logr.Debug, logr.Trace:
-		err = s.w.Debug(txt)
-	default:
-		// logr.Info plus all custom levels.
-		err = s.w.Info(txt)
-	}
-
-	if err != nil {
-		reporter := rec.Logger().Logr().ReportError
-		reporter(fmt.Errorf("syslog write fail: %w", err))
-		// syslog writer will try to reconnect.
-	}
-	return err
-}
diff --git a/vendor/github.com/mattermost/logr/target/writer.go b/vendor/github.com/mattermost/logr/target/writer.go
deleted file mode 100644
index 2250da51..00000000
--- a/vendor/github.com/mattermost/logr/target/writer.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package target
-
-import (
-	"io"
-	"io/ioutil"
-
-	"github.com/mattermost/logr"
-)
-
-// Writer outputs log records to any `io.Writer`.
-type Writer struct {
-	logr.Basic
-	out io.Writer
-}
-
-// NewWriterTarget creates a target capable of outputting log records to an io.Writer.
-func NewWriterTarget(filter logr.Filter, formatter logr.Formatter, out io.Writer, maxQueue int) *Writer {
-	if out == nil {
-		out = ioutil.Discard
-	}
-	w := &Writer{out: out}
-	w.Basic.Start(w, w, filter, formatter, maxQueue)
-	return w
-}
-
-// Write converts the log record to bytes, via the Formatter,
-// and outputs to the io.Writer.
-func (w *Writer) Write(rec *logr.LogRec) error {
-	_, stacktrace := w.IsLevelEnabled(rec.Level())
-
-	buf := rec.Logger().Logr().BorrowBuffer()
-	defer rec.Logger().Logr().ReleaseBuffer(buf)
-
-	buf, err := w.Formatter().Format(rec, stacktrace, buf)
-	if err != nil {
-		return err
-	}
-	_, err = w.out.Write(buf.Bytes())
-	return err
-}
diff --git a/vendor/github.com/mattermost/logr/timeout.go b/vendor/github.com/mattermost/logr/timeout.go
deleted file mode 100644
index 37737bcf..00000000
--- a/vendor/github.com/mattermost/logr/timeout.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package logr
-
-import "github.com/wiggin77/merror"
-
-// timeoutError is returned from functions that can timeout.
-type timeoutError struct {
-	text string
-}
-
-// newTimeoutError returns a TimeoutError.
-func newTimeoutError(text string) timeoutError {
-	return timeoutError{text: text}
-}
-
-// IsTimeoutError returns true if err is a TimeoutError.
-func IsTimeoutError(err error) bool {
-	if _, ok := err.(timeoutError); ok {
-		return true
-	}
-	// if a multi-error, return true if any of the errors
-	// are TimeoutError
-	if merr, ok := err.(*merror.MError); ok {
-		for _, e := range merr.Errors() {
-			if IsTimeoutError(e) {
-				return true
-			}
-		}
-	}
-	return false
-}
-
-func (err timeoutError) Error() string {
-	return err.text
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/LICENSE.txt b/vendor/github.com/mattermost/mattermost-server/v5/LICENSE.txt
deleted file mode 100644
index 8382687d..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/LICENSE.txt
+++ /dev/null
@@ -1,897 +0,0 @@
-Mattermost Licensing
-
-SOFTWARE LICENSING
-
-You are licensed to use compiled versions of the Mattermost platform produced by Mattermost, Inc. under an MIT LICENSE
-
--	See MIT-COMPILED-LICENSE.md included in compiled versions for details
-
-You may be licensed to use source code to create compiled versions not produced by Mattermost, Inc. in one of two ways:
-
-1. Under the Free Software Foundation’s GNU AGPL v.3.0, subject to the exceptions outlined in this policy; or
-2. Under a commercial license available from Mattermost, Inc. by contacting commercial@mattermost.com
-
-You are licensed to use the source code in Admin Tools and Configuration Files (templates/, config/default.json, i18n/, model/,
-plugin/ and all subdirectories thereof) under the Apache License v2.0.
-
-We promise that we will not enforce the copyleft provisions in AGPL v3.0 against you if your application (a) does not
-link to the Mattermost Platform directly, but exclusively uses the Mattermost Admin Tools and Configuration Files, and
-(b) you have not modified, added to or adapted the source code of Mattermost in a way that results in the creation of
-a “modified version” or “work based on” Mattermost as these terms are defined in the AGPL v3.0 license.
-
-MATTERMOST TRADEMARK GUIDELINES
-
-Your use of the mark Mattermost is subject to Mattermost, Inc's prior written approval and our organization’s Trademark
-Standards of Use at http://www.mattermost.org/trademark-standards-of-use/. For trademark approval or any questions
-you have about using these trademarks, please email trademark@mattermost.com
-
-------------------------------------------------------------------------------------------------------------------------------
-
-                               Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-------------------------------------------------------------------------------
-
-The software is released under the terms of the GNU Affero General Public
-License, version 3.
-
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/NOTICE.txt b/vendor/github.com/mattermost/mattermost-server/v5/NOTICE.txt
deleted file mode 100644
index 0d3d8dd9..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/NOTICE.txt
+++ /dev/null
@@ -1,4844 +0,0 @@
-Mattermost Server
-© 2015-present Mattermost, Inc.  All Rights Reserved.  See LICENSE.txt for license information.
-
-NOTICES:
---------
-
-This document includes a list of open source components used in Mattermost Server, including those that have been modified.
-
------
-
-## Go
-
-This product uses the Go programming language by the Go authors.
-
-* HOMEPAGE:
-   * https://golang.org
-
-* LICENSE: BSD-style
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-## Masterminds/squirrel
-
-This product contains 'squirrel' by GitHub user "Masterminds".
-
-Fluent SQL generation for golang
-
-* HOMEPAGE:
-  * https://github.com/Masterminds/squirrel
-
-* LICENSE: MIT
-
-Squirrel
-The Masterminds
-Copyright (C) 2014-2015, Lann Martin
-Copyright (C) 2015-2016, Google
-Copyright (C) 2015, Matt Farina and Matt Butcher
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
----
-
-## NYTimes/gziphandler
-
-This product contains 'gziphandler' by The New York Times.
-
-Go middleware to gzip HTTP responses
-
-* HOMEPAGE:
-  * https://github.com/NYTimes/gziphandler
-
-* LICENSE: Apache-2.0
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2016-2017 The New York Times Company
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
----
-
-## avct/uasurfer
-
-This product contains 'uasurfer' by Avocet.
-
-Go package for fast and reliable abstraction of browser user agent strings.
-
-* HOMEPAGE:
-  * https://github.com/avct/uasurfer
-
-* LICENSE: Apache-2.0
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-                      Copyright 2015 Avocet Systems Ltd.
-                          http://avocet.io/opensource
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   Copyright 2015 Avocet Systems Ltd.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
----
-
-## blang/semver
-
-This product contains 'semver' by Benedikt Lang.
-
-Semantic Versioning (semver) library written in golang
-
-* HOMEPAGE:
-  * https://github.com/blang/semver
-
-* LICENSE: MIT
-
-The MIT License
-
-Copyright (c) 2014 Benedikt Lang <github at benediktlang.de>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
----
-
-## dgryski/dgoogauth
-
-This product contains 'dgoogauth' by Damian Gryski.
-
-Google Authenticator for Go
-
-* HOMEPAGE:
-  * https://github.com/dgryski/dgoogauth
-
-* LICENSE: Apache-2.0
-
-Note: An original license file for this dependency is not available. We determined the type of license based on the official project website. The following text has been prepared using a template from the SPDX Workgroup (https://spdx.org) for this type of license.
-
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-     (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
-
-     (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
-
-     (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-
-     (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
-
-     You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
-
-Copyright 2019 Damian Gryski
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
----
-
-## disintegration/imaging
-
-This product contains 'imaging' by Grigory Dryapak.
-
-Imaging is a simple image processing package for Go
-
-* HOMEPAGE:
-  * https://github.com/disintegration/imaging
-
-* LICENSE: MIT
-
-The MIT License (MIT)
-
-Copyright (c) 2012 Grigory Dryapak
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-## dyatlov/go-opengraph
-
-This product contains 'go-opengraph' by Vitaly Dyatlov.
-
-Golang package for parsing OpenGraph data from HTML into regular structures
-
-* HOMEPAGE:
-  * https://github.com/dyatlov/go-opengraph
-
-* LICENSE: MIT
-
-The MIT License (MIT)
-
-Copyright (c) 2015 Vitaly Dyatlov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-## fsnotify/fsnotify
-
-This product contains 'fsnotify' by GitHub user "fsnotify".
-
-Cross-platform file system notifications for Go.
-
-* HOMEPAGE:
-  * https://github.com/fsnotify/fsnotify
-
-* LICENSE: BSD-3-Clause
-
-Copyright (c) 2012 The Go Authors. All rights reserved.
-Copyright (c) 2012 fsnotify Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-## go-ldap/ldap
-
-This product contains 'ldap' by GitHub user "go-ldap".
-
-Basic LDAP v3 functionality for the GO programming language.
-
-* HOMEPAGE:
-  * https://github.com/go-ldap/ldap
-
-* LICENSE: MIT
-
-The MIT License (MIT)
-
-Copyright (c) 2011-2015 Michael Mitton (mmitton@gmail.com)
-Portions copyright (c) 2015-2016 go-ldap Authors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-## go-redis/redis
-
-This product contains 'redis' by GitHub user "go-redis".
-
-Type-safe Redis client for Golang
-
-* HOMEPAGE:
-  * https://github.com/go-redis/redis
-
-* LICENSE: BSD-2-Clause
-
-Copyright (c) 2013 The github.com/go-redis/redis Authors.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-## go-sql-driver/mysql
-
-This product contains 'mysql' by Go SQL Drivers.
-
-Go MySQL Driver is a MySQL driver for Go's (golang) database/sql package
-
-* HOMEPAGE:
-  * https://github.com/go-sql-driver/mysql
-
-* LICENSE: MPL-2.0
-
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.
-
----
-
-## golang/freetype
-
-This product contains 'freetype' by Go.
-
-The Freetype font rasterizer in the Go programming language.
-
-* HOMEPAGE:
-  * https://github.com/golang/freetype
-
-* LICENSE: (FTL OR GPL-2.0)
-
-Use of the Freetype-Go software is subject to your choice of exactly one of
-the following two licenses:
-  * The FreeType License, which is similar to the original BSD license with
-    an advertising clause, or
-  * The GNU General Public License (GPL), version 2 or later.
-
-The text of these licenses are available in the licenses/ftl.txt and the
-licenses/gpl.txt files respectively. They are also available at
-http://freetype.sourceforge.net/license.html
-
-The Luxi fonts in the testdata directory are licensed separately. See the
-testdata/COPYING file for details.
-
----
-
-## gorilla/handlers
-
-This product contains 'handlers' by Gorilla web toolkit.
-
-A collection of useful handlers for Go's net/http package.
-
-* HOMEPAGE:
-  * https://github.com/gorilla/handlers
-
-* LICENSE: BSD-2-Clause
-
-Copyright (c) 2013 The Gorilla Handlers Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-  Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-## gorilla/mux
-
-This product contains 'mux' by Gorilla web toolkit.
-
-A powerful URL router and dispatcher for golang.
-
-* HOMEPAGE:
-  * https://github.com/gorilla/mux
-
-* LICENSE: BSD-3-Clause
-
-Copyright (c) 2012-2018 The Gorilla Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-	 * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-	 * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-	 * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-## gorilla/schema
-
-This product contains 'schema' by Gorilla web toolkit.
-
-Package gorilla/schema fills a struct with form values.
-
-* HOMEPAGE:
-  * https://github.com/gorilla/schema
-
-* LICENSE: BSD-3-Clause
-
-Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-	 * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-	 * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-	 * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-## gorilla/websocket
-
-This product contains 'websocket' by Gorilla web toolkit.
-
-A WebSocket implementation for Go.
-
-* HOMEPAGE:
-  * https://github.com/gorilla/websocket
-
-* LICENSE: BSD-2-Clause
-
-Copyright (c) 2013 The Gorilla WebSocket Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-  Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-## hako/durafmt
-
-This product contains 'durafmt' by Wesley Hill.
-
-:clock8: Better time duration formatting in Go!
-
-* HOMEPAGE:
-  * https://github.com/hako/durafmt
-
-* LICENSE: MIT
-
-The MIT License (MIT)
-
-Copyright (c) 2016 Wesley Hill
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-## hashicorp/go-hclog
-
-This product contains 'go-hclog' by HashiCorp.
-
-A common logging package for HashiCorp tools
-
-* HOMEPAGE:
-  * https://github.com/hashicorp/go-hclog
-
-* LICENSE: MIT
-
-MIT License
-
-Copyright (c) 2017 HashiCorp
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-## hashicorp/go-plugin
-
-This product contains 'go-plugin' by HashiCorp.
-
-Golang plugin system over RPC.
-
-* HOMEPAGE:
-  * https://github.com/hashicorp/go-plugin
-
-* LICENSE: MPL-2.0
-
-Mozilla Public License, version 2.0
-
-1. Definitions
-
-1.1. “Contributor”
-
-     means each individual or legal entity that creates, contributes to the
-     creation of, or owns Covered Software.
-
-1.2. “Contributor Version”
-
-     means the combination of the Contributions of others (if any) used by a
-     Contributor and that particular Contributor’s Contribution.
-
-1.3. “Contribution”
-
-     means Covered Software of a particular Contributor.
-
-1.4. “Covered Software”
-
-     means Source Code Form to which the initial Contributor has attached the
-     notice in Exhibit A, the Executable Form of such Source Code Form, and
-     Modifications of such Source Code Form, in each case including portions
-     thereof.
-
-1.5. “Incompatible With Secondary Licenses”
-     means
-
-     a. that the initial Contributor has attached the notice described in
-        Exhibit B to the Covered Software; or
-
-     b. that the Covered Software was made available under the terms of version
-        1.1 or earlier of the License, but not also under the terms of a
-        Secondary License.
-
-1.6. “Executable Form”
-
-     means any form of the work other than Source Code Form.
-
-1.7. “Larger Work”
-
-     means a work that combines Covered Software with other material, in a separate
-     file or files, that is not Covered Software.
-
-1.8. “License”
-
-     means this document.
-
-1.9. “Licensable”
-
-     means having the right to grant, to the maximum extent possible, whether at the
-     time of the initial grant or subsequently, any and all of the rights conveyed by
-     this License.
-
-1.10. “Modifications”
-
-     means any of the following:
-
-     a. any file in Source Code Form that results from an addition to, deletion
-        from, or modification of the contents of Covered Software; or
-
-     b. any new file in Source Code Form that contains any Covered Software.
-
-1.11. “Patent Claims” of a Contributor
-
-      means any patent claim(s), including without limitation, method, process,
-      and apparatus claims, in any patent Licensable by such Contributor that
-      would be infringed, but for the grant of the License, by the making,
-      using, selling, offering for sale, having made, import, or transfer of
-      either its Contributions or its Contributor Version.
-
-1.12. “Secondary License”
-
-      means either the GNU General Public License, Version 2.0, the GNU Lesser
-      General Public License, Version 2.1, the GNU Affero General Public
-      License, Version 3.0, or any later versions of those licenses.
-
-1.13. “Source Code Form”
-
-      means the form of the work preferred for making modifications.
-
-1.14. “You” (or “Your”)
-
-      means an individual or a legal entity exercising rights under this
-      License. For legal entities, “You” includes any entity that controls, is
-      controlled by, or is under common control with You. For purposes of this
-      definition, “control” means (a) the power, direct or indirect, to cause
-      the direction or management of such entity, whether by contract or
-      otherwise, or (b) ownership of more than fifty percent (50%) of the
-      outstanding shares or beneficial ownership of such entity.
-
-
-2. License Grants and Conditions
-
-2.1. Grants
-
-     Each Contributor hereby grants You a world-wide, royalty-free,
-     non-exclusive license:
-
-     a. under intellectual property rights (other than patent or trademark)
-        Licensable by such Contributor to use, reproduce, make available,
-        modify, display, perform, distribute, and otherwise exploit its
-        Contributions, either on an unmodified basis, with Modifications, or as
-        part of a Larger Work; and
-
-     b. under Patent Claims of such Contributor to make, use, sell, offer for
-        sale, have made, import, and otherwise transfer either its Contributions
-        or its Contributor Version.
-
-2.2. Effective Date
-
-     The licenses granted in Section 2.1 with respect to any Contribution become
-     effective for each Contribution on the date the Contributor first distributes
-     such Contribution.
-
-2.3. Limitations on Grant Scope
-
-     The licenses granted in this Section 2 are the only rights granted under this
-     License. No additional rights or licenses will be implied from the distribution
-     or licensing of Covered Software under this License. Notwithstanding Section
-     2.1(b) above, no patent license is granted by a Contributor:
-
-     a. for any code that a Contributor has removed from Covered Software; or
-
-     b. for infringements caused by: (i) Your and any other third party’s
-        modifications of Covered Software, or (ii) the combination of its
-        Contributions with other software (except as part of its Contributor
-        Version); or
-
-     c. under Patent Claims infringed by Covered Software in the absence of its
-        Contributions.
-
-     This License does not grant any rights in the trademarks, service marks, or
-     logos of any Contributor (except as may be necessary to comply with the
-     notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-     No Contributor makes additional grants as a result of Your choice to
-     distribute the Covered Software under a subsequent version of this License
-     (see Section 10.2) or under the terms of a Secondary License (if permitted
-     under the terms of Section 3.3).
-
-2.5. Representation
-
-     Each Contributor represents that the Contributor believes its Contributions
-     are its original creation(s) or it has sufficient rights to grant the
-     rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-     This License is not intended to limit any rights You have under applicable
-     copyright doctrines of fair use, fair dealing, or other equivalents.
-
-2.7. Conditions
-
-     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
-     Section 2.1.
-
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
-     All distribution of Covered Software in Source Code Form, including any
-     Modifications that You create or to which You contribute, must be under the
-     terms of this License. You must inform recipients that the Source Code Form
-     of the Covered Software is governed by the terms of this License, and how
-     they can obtain a copy of this License. You may not attempt to alter or
-     restrict the recipients’ rights in the Source Code Form.
-
-3.2. Distribution of Executable Form
-
-     If You distribute Covered Software in Executable Form then:
-
-     a. such Covered Software must also be made available in Source Code Form,
-        as described in Section 3.1, and You must inform recipients of the
-        Executable Form how they can obtain a copy of such Source Code Form by
-        reasonable means in a timely manner, at a charge no more than the cost
-        of distribution to the recipient; and
-
-     b. You may distribute such Executable Form under the terms of this License,
-        or sublicense it under different terms, provided that the license for
-        the Executable Form does not attempt to limit or alter the recipients’
-        rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-     You may create and distribute a Larger Work under terms of Your choice,
-     provided that You also comply with the requirements of this License for the
-     Covered Software. If the Larger Work is a combination of Covered Software
-     with a work governed by one or more Secondary Licenses, and the Covered
-     Software is not Incompatible With Secondary Licenses, this License permits
-     You to additionally distribute such Covered Software under the terms of
-     such Secondary License(s), so that the recipient of the Larger Work may, at
-     their option, further distribute the Covered Software under the terms of
-     either this License or such Secondary License(s).
-
-3.4. Notices
-
-     You may not remove or alter the substance of any license notices (including
-     copyright notices, patent notices, disclaimers of warranty, or limitations
-     of liability) contained within the Source Code Form of the Covered
-     Software, except that You may alter any license notices to the extent
-     required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-     You may choose to offer, and to charge a fee for, warranty, support,
-     indemnity or liability obligations to one or more recipients of Covered
-     Software. However, You may do so only on Your own behalf, and not on behalf
-     of any Contributor. You must make it absolutely clear that any such
-     warranty, support, indemnity, or liability obligation is offered by You
-     alone, and You hereby agree to indemnify every Contributor for any
-     liability incurred by such Contributor as a result of warranty, support,
-     indemnity or liability terms You offer. You may include additional
-     disclaimers of warranty and limitations of liability specific to any
-     jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
-   If it is impossible for You to comply with any of the terms of this License
-   with respect to some or all of the Covered Software due to statute, judicial
-   order, or regulation then You must: (a) comply with the terms of this License
-   to the maximum extent possible; and (b) describe the limitations and the code
-   they affect. Such description must be placed in a text file included with all
-   distributions of the Covered Software under this License. Except to the
-   extent prohibited by statute or regulation, such description must be
-   sufficiently detailed for a recipient of ordinary skill to be able to
-   understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You
-     fail to comply with any of its terms. However, if You become compliant,
-     then the rights granted under this License from a particular Contributor
-     are reinstated (a) provisionally, unless and until such Contributor
-     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
-     if such Contributor fails to notify You of the non-compliance by some
-     reasonable means prior to 60 days after You have come back into compliance.
-     Moreover, Your grants from a particular Contributor are reinstated on an
-     ongoing basis if such Contributor notifies You of the non-compliance by
-     some reasonable means, this is the first time You have received notice of
-     non-compliance with this License from such Contributor, and You become
-     compliant prior to 30 days after Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-     infringement claim (excluding declaratory judgment actions, counter-claims,
-     and cross-claims) alleging that a Contributor Version directly or
-     indirectly infringes any patent, then the rights granted to You by any and
-     all Contributors for the Covered Software under Section 2.1 of this License
-     shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
-     license agreements (excluding distributors and resellers) which have been
-     validly granted by You or Your distributors under this License prior to
-     termination shall survive termination.
-
-6. Disclaimer of Warranty
-
-   Covered Software is provided under this License on an “as is” basis, without
-   warranty of any kind, either expressed, implied, or statutory, including,
-   without limitation, warranties that the Covered Software is free of defects,
-   merchantable, fit for a particular purpose or non-infringing. The entire
-   risk as to the quality and performance of the Covered Software is with You.
-   Should any Covered Software prove defective in any respect, You (not any
-   Contributor) assume the cost of any necessary servicing, repair, or
-   correction. This disclaimer of warranty constitutes an essential part of this
-   License. No use of  any Covered Software is authorized under this License
-   except under this disclaimer.
-
-7. Limitation of Liability
-
-   Under no circumstances and under no legal theory, whether tort (including
-   negligence), contract, or otherwise, shall any Contributor, or anyone who
-   distributes Covered Software as permitted above, be liable to You for any
-   direct, indirect, special, incidental, or consequential damages of any
-   character including, without limitation, damages for lost profits, loss of
-   goodwill, work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses, even if such party shall have been
-   informed of the possibility of such damages. This limitation of liability
-   shall not apply to liability for death or personal injury resulting from such
-   party’s negligence to the extent applicable law prohibits such limitation.
-   Some jurisdictions do not allow the exclusion or limitation of incidental or
-   consequential damages, so this exclusion and limitation may not apply to You.
-
-8. Litigation
-
-   Any litigation relating to this License may be brought only in the courts of
-   a jurisdiction where the defendant maintains its principal place of business
-   and such litigation shall be governed by laws of that jurisdiction, without
-   reference to its conflict-of-law provisions. Nothing in this Section shall
-   prevent a party’s ability to bring cross-claims or counter-claims.
-
-9. Miscellaneous
-
-   This License represents the complete agreement concerning the subject matter
-   hereof. If any provision of this License is held to be unenforceable, such
-   provision shall be reformed only to the extent necessary to make it
-   enforceable. Any law or regulation which provides that the language of a
-   contract shall be construed against the drafter shall not be used to construe
-   this License against a Contributor.
-
-
-10. Versions of the License
-
-10.1. New Versions
-
-      Mozilla Foundation is the license steward. Except as provided in Section
-      10.3, no one other than the license steward has the right to modify or
-      publish new versions of this License. Each version will be given a
-      distinguishing version number.
-
-10.2. Effect of New Versions
-
-      You may distribute the Covered Software under the terms of the version of
-      the License under which You originally received the Covered Software, or
-      under the terms of any subsequent version published by the license
-      steward.
-
-10.3. Modified Versions
-
-      If you create software not governed by this License, and you want to
-      create a new license for such software, you may create and use a modified
-      version of this License if you rename the license and remove any
-      references to the name of the license steward (except to note that such
-      modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
-      If You choose to distribute Source Code Form that is Incompatible With
-      Secondary Licenses under the terms of this version of the License, the
-      notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
-
-      This Source Code Form is subject to the
-      terms of the Mozilla Public License, v.
-      2.0. If a copy of the MPL was not
-      distributed with this file, You can
-      obtain one at
-      http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file, then
-You may include the notice in a location (such as a LICENSE file in a relevant
-directory) where a recipient would be likely to look for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - “Incompatible With Secondary Licenses” Notice
-
-      This Source Code Form is “Incompatible
-      With Secondary Licenses”, as defined by
-      the Mozilla Public License, v. 2.0.
-
----
-
-## hashicorp/memberlist
-
-This product contains 'memberlist' by HashiCorp.
-
-Golang package for gossip based membership and failure detection
-
-* HOMEPAGE:
-  * https://github.com/hashicorp/memberlist
-
-* LICENSE: MPL-2.0
-
-Mozilla Public License, version 2.0
-
-1. Definitions
-
-1.1. “Contributor”
-
-     means each individual or legal entity that creates, contributes to the
-     creation of, or owns Covered Software.
-
-1.2. “Contributor Version”
-
-     means the combination of the Contributions of others (if any) used by a
-     Contributor and that particular Contributor’s Contribution.
-
-1.3. “Contribution”
-
-     means Covered Software of a particular Contributor.
-
-1.4. “Covered Software”
-
-     means Source Code Form to which the initial Contributor has attached the
-     notice in Exhibit A, the Executable Form of such Source Code Form, and
-     Modifications of such Source Code Form, in each case including portions
-     thereof.
-
-1.5. “Incompatible With Secondary Licenses”
-     means
-
-     a. that the initial Contributor has attached the notice described in
-        Exhibit B to the Covered Software; or
-
-     b. that the Covered Software was made available under the terms of version
-        1.1 or earlier of the License, but not also under the terms of a
-        Secondary License.
-
-1.6. “Executable Form”
-
-     means any form of the work other than Source Code Form.
-
-1.7. “Larger Work”
-
-     means a work that combines Covered Software with other material, in a separate
-     file or files, that is not Covered Software.
-
-1.8. “License”
-
-     means this document.
-
-1.9. “Licensable”
-
-     means having the right to grant, to the maximum extent possible, whether at the
-     time of the initial grant or subsequently, any and all of the rights conveyed by
-     this License.
-
-1.10. “Modifications”
-
-     means any of the following:
-
-     a. any file in Source Code Form that results from an addition to, deletion
-        from, or modification of the contents of Covered Software; or
-
-     b. any new file in Source Code Form that contains any Covered Software.
-
-1.11. “Patent Claims” of a Contributor
-
-      means any patent claim(s), including without limitation, method, process,
-      and apparatus claims, in any patent Licensable by such Contributor that
-      would be infringed, but for the grant of the License, by the making,
-      using, selling, offering for sale, having made, import, or transfer of
-      either its Contributions or its Contributor Version.
-
-1.12. “Secondary License”
-
-      means either the GNU General Public License, Version 2.0, the GNU Lesser
-      General Public License, Version 2.1, the GNU Affero General Public
-      License, Version 3.0, or any later versions of those licenses.
-
-1.13. “Source Code Form”
-
-      means the form of the work preferred for making modifications.
-
-1.14. “You” (or “Your”)
-
-      means an individual or a legal entity exercising rights under this
-      License. For legal entities, “You” includes any entity that controls, is
-      controlled by, or is under common control with You. For purposes of this
-      definition, “control” means (a) the power, direct or indirect, to cause
-      the direction or management of such entity, whether by contract or
-      otherwise, or (b) ownership of more than fifty percent (50%) of the
-      outstanding shares or beneficial ownership of such entity.
-
-
-2. License Grants and Conditions
-
-2.1. Grants
-
-     Each Contributor hereby grants You a world-wide, royalty-free,
-     non-exclusive license:
-
-     a. under intellectual property rights (other than patent or trademark)
-        Licensable by such Contributor to use, reproduce, make available,
-        modify, display, perform, distribute, and otherwise exploit its
-        Contributions, either on an unmodified basis, with Modifications, or as
-        part of a Larger Work; and
-
-     b. under Patent Claims of such Contributor to make, use, sell, offer for
-        sale, have made, import, and otherwise transfer either its Contributions
-        or its Contributor Version.
-
-2.2. Effective Date
-
-     The licenses granted in Section 2.1 with respect to any Contribution become
-     effective for each Contribution on the date the Contributor first distributes
-     such Contribution.
-
-2.3. Limitations on Grant Scope
-
-     The licenses granted in this Section 2 are the only rights granted under this
-     License. No additional rights or licenses will be implied from the distribution
-     or licensing of Covered Software under this License. Notwithstanding Section
-     2.1(b) above, no patent license is granted by a Contributor:
-
-     a. for any code that a Contributor has removed from Covered Software; or
-
-     b. for infringements caused by: (i) Your and any other third party’s
-        modifications of Covered Software, or (ii) the combination of its
-        Contributions with other software (except as part of its Contributor
-        Version); or
-
-     c. under Patent Claims infringed by Covered Software in the absence of its
-        Contributions.
-
-     This License does not grant any rights in the trademarks, service marks, or
-     logos of any Contributor (except as may be necessary to comply with the
-     notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-     No Contributor makes additional grants as a result of Your choice to
-     distribute the Covered Software under a subsequent version of this License
-     (see Section 10.2) or under the terms of a Secondary License (if permitted
-     under the terms of Section 3.3).
-
-2.5. Representation
-
-     Each Contributor represents that the Contributor believes its Contributions
-     are its original creation(s) or it has sufficient rights to grant the
-     rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-     This License is not intended to limit any rights You have under applicable
-     copyright doctrines of fair use, fair dealing, or other equivalents.
-
-2.7. Conditions
-
-     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
-     Section 2.1.
-
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
-     All distribution of Covered Software in Source Code Form, including any
-     Modifications that You create or to which You contribute, must be under the
-     terms of this License. You must inform recipients that the Source Code Form
-     of the Covered Software is governed by the terms of this License, and how
-     they can obtain a copy of this License. You may not attempt to alter or
-     restrict the recipients’ rights in the Source Code Form.
-
-3.2. Distribution of Executable Form
-
-     If You distribute Covered Software in Executable Form then:
-
-     a. such Covered Software must also be made available in Source Code Form,
-        as described in Section 3.1, and You must inform recipients of the
-        Executable Form how they can obtain a copy of such Source Code Form by
-        reasonable means in a timely manner, at a charge no more than the cost
-        of distribution to the recipient; and
-
-     b. You may distribute such Executable Form under the terms of this License,
-        or sublicense it under different terms, provided that the license for
-        the Executable Form does not attempt to limit or alter the recipients’
-        rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-     You may create and distribute a Larger Work under terms of Your choice,
-     provided that You also comply with the requirements of this License for the
-     Covered Software. If the Larger Work is a combination of Covered Software
-     with a work governed by one or more Secondary Licenses, and the Covered
-     Software is not Incompatible With Secondary Licenses, this License permits
-     You to additionally distribute such Covered Software under the terms of
-     such Secondary License(s), so that the recipient of the Larger Work may, at
-     their option, further distribute the Covered Software under the terms of
-     either this License or such Secondary License(s).
-
-3.4. Notices
-
-     You may not remove or alter the substance of any license notices (including
-     copyright notices, patent notices, disclaimers of warranty, or limitations
-     of liability) contained within the Source Code Form of the Covered
-     Software, except that You may alter any license notices to the extent
-     required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-     You may choose to offer, and to charge a fee for, warranty, support,
-     indemnity or liability obligations to one or more recipients of Covered
-     Software. However, You may do so only on Your own behalf, and not on behalf
-     of any Contributor. You must make it absolutely clear that any such
-     warranty, support, indemnity, or liability obligation is offered by You
-     alone, and You hereby agree to indemnify every Contributor for any
-     liability incurred by such Contributor as a result of warranty, support,
-     indemnity or liability terms You offer. You may include additional
-     disclaimers of warranty and limitations of liability specific to any
-     jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
-   If it is impossible for You to comply with any of the terms of this License
-   with respect to some or all of the Covered Software due to statute, judicial
-   order, or regulation then You must: (a) comply with the terms of this License
-   to the maximum extent possible; and (b) describe the limitations and the code
-   they affect. Such description must be placed in a text file included with all
-   distributions of the Covered Software under this License. Except to the
-   extent prohibited by statute or regulation, such description must be
-   sufficiently detailed for a recipient of ordinary skill to be able to
-   understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You
-     fail to comply with any of its terms. However, if You become compliant,
-     then the rights granted under this License from a particular Contributor
-     are reinstated (a) provisionally, unless and until such Contributor
-     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
-     if such Contributor fails to notify You of the non-compliance by some
-     reasonable means prior to 60 days after You have come back into compliance.
-     Moreover, Your grants from a particular Contributor are reinstated on an
-     ongoing basis if such Contributor notifies You of the non-compliance by
-     some reasonable means, this is the first time You have received notice of
-     non-compliance with this License from such Contributor, and You become
-     compliant prior to 30 days after Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-     infringement claim (excluding declaratory judgment actions, counter-claims,
-     and cross-claims) alleging that a Contributor Version directly or
-     indirectly infringes any patent, then the rights granted to You by any and
-     all Contributors for the Covered Software under Section 2.1 of this License
-     shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
-     license agreements (excluding distributors and resellers) which have been
-     validly granted by You or Your distributors under this License prior to
-     termination shall survive termination.
-
-6. Disclaimer of Warranty
-
-   Covered Software is provided under this License on an “as is” basis, without
-   warranty of any kind, either expressed, implied, or statutory, including,
-   without limitation, warranties that the Covered Software is free of defects,
-   merchantable, fit for a particular purpose or non-infringing. The entire
-   risk as to the quality and performance of the Covered Software is with You.
-   Should any Covered Software prove defective in any respect, You (not any
-   Contributor) assume the cost of any necessary servicing, repair, or
-   correction. This disclaimer of warranty constitutes an essential part of this
-   License. No use of  any Covered Software is authorized under this License
-   except under this disclaimer.
-
-7. Limitation of Liability
-
-   Under no circumstances and under no legal theory, whether tort (including
-   negligence), contract, or otherwise, shall any Contributor, or anyone who
-   distributes Covered Software as permitted above, be liable to You for any
-   direct, indirect, special, incidental, or consequential damages of any
-   character including, without limitation, damages for lost profits, loss of
-   goodwill, work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses, even if such party shall have been
-   informed of the possibility of such damages. This limitation of liability
-   shall not apply to liability for death or personal injury resulting from such
-   party’s negligence to the extent applicable law prohibits such limitation.
-   Some jurisdictions do not allow the exclusion or limitation of incidental or
-   consequential damages, so this exclusion and limitation may not apply to You.
-
-8. Litigation
-
-   Any litigation relating to this License may be brought only in the courts of
-   a jurisdiction where the defendant maintains its principal place of business
-   and such litigation shall be governed by laws of that jurisdiction, without
-   reference to its conflict-of-law provisions. Nothing in this Section shall
-   prevent a party’s ability to bring cross-claims or counter-claims.
-
-9. Miscellaneous
-
-   This License represents the complete agreement concerning the subject matter
-   hereof. If any provision of this License is held to be unenforceable, such
-   provision shall be reformed only to the extent necessary to make it
-   enforceable. Any law or regulation which provides that the language of a
-   contract shall be construed against the drafter shall not be used to construe
-   this License against a Contributor.
-
-
-10. Versions of the License
-
-10.1. New Versions
-
-      Mozilla Foundation is the license steward. Except as provided in Section
-      10.3, no one other than the license steward has the right to modify or
-      publish new versions of this License. Each version will be given a
-      distinguishing version number.
-
-10.2. Effect of New Versions
-
-      You may distribute the Covered Software under the terms of the version of
-      the License under which You originally received the Covered Software, or
-      under the terms of any subsequent version published by the license
-      steward.
-
-10.3. Modified Versions
-
-      If you create software not governed by this License, and you want to
-      create a new license for such software, you may create and use a modified
-      version of this License if you rename the license and remove any
-      references to the name of the license steward (except to note that such
-      modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
-      If You choose to distribute Source Code Form that is Incompatible With
-      Secondary Licenses under the terms of this version of the License, the
-      notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
-
-      This Source Code Form is subject to the
-      terms of the Mozilla Public License, v.
-      2.0. If a copy of the MPL was not
-      distributed with this file, You can
-      obtain one at
-      http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file, then
-You may include the notice in a location (such as a LICENSE file in a relevant
-directory) where a recipient would be likely to look for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - “Incompatible With Secondary Licenses” Notice
-
-      This Source Code Form is “Incompatible
-      With Secondary Licenses”, as defined by
-      the Mozilla Public License, v. 2.0.
-
----
-
-## icrowley/fake
-
-This product contains 'fake' by GitHub user "icrowley".
-
-Fake data generator for Go (Golang)
-
-* HOMEPAGE:
-  * https://github.com/icrowley/fake
-
-* LICENSE: MIT
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Dmitry Afanasyev
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-## jaytaylor/html2text
-
-This product contains 'html2text' by J. Elliot Taylor.
-
-Golang HTML to plaintext conversion library
-
-* HOMEPAGE:
-  * https://github.com/jaytaylor/html2text
-
-* LICENSE: MIT
-
-The MIT License (MIT)
-
-Copyright (c) 2015 Jay Taylor
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-## lib/pq
-
-This product contains 'pq' by GitHub user "lib".
-
-Pure Go Postgres driver for database/sql
-
-* HOMEPAGE:
-  * https://github.com/lib/pq
-
-* LICENSE: MIT
-
-Copyright (c) 2011-2013, 'pq' Contributors
-Portions Copyright (C) 2011 Blake Mizerany
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-## mattermost/gorp
-
-This product contains 'gorp' by Mattermost (forked from original GitHub repo 'go-gorp/gorp' owned by GitHub user "go-gorp").
-
-Go Relational Persistence - an ORM-ish library for Go
-
-* HOMEPAGE:
-  * https://github.com/mattermost/gorp
-
-* LICENSE: MIT
-
-(The MIT License)
-
-Copyright (c) 2012 James Cooper <james@bitmechanic.com>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-## mattermost/rsc
-
-This product contains 'rsc' by Mattermost (forked from original GitHub repo 'petar/rsc' owned by Petar Maymounkov).
-
-fork of Russ Cox's code.google.com/p/rsc
-
-* HOMEPAGE:
-  * https://github.com/mattermost/rsc
-
-* LICENSE: BSD-3-Clause
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-## mattermost/viper
-
-This product contains 'viper' by Mattermost (forked from original GitHub repo 'spf13/viper' owned by Steve Francia).
-
-Go configuration with fangs
-
-* HOMEPAGE:
-  * https://github.com/mattermost/viper
-
-* LICENSE: MIT
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Steve Francia
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-## minio/minio-go
-
-This product contains 'minio-go' by Object Storage for AI.
-
-MinIO Client SDK for Go
-
-* HOMEPAGE:
-  * https://github.com/minio/minio-go
-
-* LICENSE: Apache-2.0
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-* This package includes the following NOTICE:
-
-minio-go
-Copyright 2015-2017 MinIO, Inc.
-
----
-
-## nicksnyder/go-i18n
-
-This product contains 'go-i18n' by Mattermost, modified (forked) from original GitHub repo 'nicksnyder/go-i18n' owned by Nick Snyder.
-
-Translate your Go program into multiple languages.
-
-* HOMEPAGE:
-  * https://github.com/mattermost/go-i18n
-
-* LICENSE: MIT
-
-Copyright (c) 2014 Nick Snyder https://github.com/nicksnyder
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
----
-
-## pborman/uuid
-
-This product contains 'uuid' by GitHub user "pborman".
-
-Automatically exported from code.google.com/p/go-uuid
-
-* HOMEPAGE:
-  * https://github.com/pborman/uuid
-
-* LICENSE: BSD-3-Clause
-
-Copyright (c) 2009,2014 Google Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-## pkg/errors
-
-This product contains 'errors' by GitHub user "pkg".
-
-Simple error handling primitives
-
-* HOMEPAGE:
-  * https://github.com/pkg/errors
-
-* LICENSE: BSD-2-Clause
-
-Copyright (c) 2015, Dave Cheney <dave@cheney.net>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-## prometheus/client_golang
-
-This product contains 'client_golang' by Prometheus.
-
-Prometheus instrumentation library for Go applications
-
-* HOMEPAGE:
-  * https://github.com/prometheus/client_golang
-
-* LICENSE: Apache-2.0
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-* This package includes the following NOTICE:
-
-Prometheus instrumentation library for Go applications
-Copyright 2012-2015 The Prometheus Authors
-
-This product includes software developed at
-SoundCloud Ltd. (http://soundcloud.com/).
-
-
-The following components are included in this product:
-
-perks - a fork of https://github.com/bmizerany/perks
-https://github.com/beorn7/perks
-Copyright 2013-2015 Blake Mizerany, Björn Rabenstein
-See https://github.com/beorn7/perks/blob/master/README.md for license details.
-
-Go support for Protocol Buffers - Google's data interchange format
-http://github.com/golang/protobuf/
-Copyright 2010 The Go Authors
-See source code for license details.
-
-Support for streaming Protocol Buffer messages for the Go language (golang).
-https://github.com/matttproud/golang_protobuf_extensions
-Copyright 2013 Matt T. Proud
-Licensed under the Apache License, Version 2.0
-
----
-
-## rs/cors
-
-This product contains 'cors' by Olivier Poitrey.
-
-Go net/http configurable handler to handle CORS requests
-
-* HOMEPAGE:
-  * https://github.com/rs/cors
-
-* LICENSE: MIT
-
-Copyright (c) 2014 Olivier Poitrey <rs@dailymotion.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
----
-
-## rwcarlsen/goexif
-
-This product contains 'goexif' by Robert Carlsen.
-
-Decode embedded EXIF meta data from image files.
-
-* HOMEPAGE:
-  * https://github.com/rwcarlsen/goexif
-
-* LICENSE: BSD-2-Clause
-
-
-Copyright (c) 2012, Robert Carlsen & Contributors
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  * Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-## segmentio/analytics-go
-
-This product contains 'analytics-go' by Segment.
-
-Segment analytics client for Go
-
-* HOMEPAGE:
-  * https://github.com/segmentio/analytics-go
-
-* LICENSE: MIT
-
-The MIT License (MIT)
-
-Copyright (c) 2016 Segment, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-## sirupsen/logrus
-
-This product contains 'logrus' by Simon Eskildsen.
-
-Structured, pluggable logging for Go.
-
-* HOMEPAGE:
-  * https://github.com/sirupsen/logrus
-
-* LICENSE: MIT
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Simon Eskildsen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
----
-
-## spf13/cobra
-
-This product contains 'cobra' by Steve Francia.
-
-A Commander for modern Go CLI interactions
-
-* HOMEPAGE:
-  * https://github.com/spf13/cobra
-
-* LICENSE: Apache-2.0
-
-                                Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
----
-
-## jmoiron/sqlx
-
-This product contains 'sqlx' by Jason Moiron.
-
-general purpose extensions to golang's database/sql
-
-* HOMEPAGE:
-  * https://github.com/jmoiron/sqlx
-
-* LICENSE: MIT
-
- Copyright (c) 2013, Jason Moiron
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-## stretchr/testify
-
-This product contains 'testify' by Stretchr, Inc..
-
-A toolkit with common assertions and mocks that plays nicely with the standard library
-
-* HOMEPAGE:
-  * https://github.com/stretchr/testify
-
-* LICENSE: MIT
-
-MIT License
-
-Copyright (c) 2012-2018 Mat Ryer and Tyler Bunnell
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-## throttled/throttled
-
-This product contains 'throttled' by GitHub user "throttled".
-
-Package throttled implements rate limiting access to resources such as HTTP endpoints.
-
-* HOMEPAGE:
-  * https://github.com/throttled/throttled
-
-* LICENSE: BSD-3-Clause
-
-Copyright (c) 2018, Martin Angers and Contributors.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-* Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-## tylerb/graceful
-
-This product contains 'graceful' by Tyler Stillwater.
-
-Graceful is a Go package enabling graceful shutdown of an http.Handler server.
-
-* HOMEPAGE:
-  * https://github.com/tylerb/graceful
-
-* LICENSE: MIT
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Tyler Bunnell
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-## zap
-
-This product contains 'zap' by Uber Technologies, Inc..
-
-Blazing fast, structured, leveled logging in Go.
-
-* HOMEPAGE:
-  * https://github.com/uber-go/zap
-
-* LICENSE: MIT
-
-Copyright (c) 2016-2017 Uber Technologies, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
----
-
-## x/crypto
-
-This product contains 'crypto' by The Go Authors.
-
-[mirror] Go supplementary cryptography libraries
-
-* HOMEPAGE:
-  * https://github.com/golang/crypto
-
-* LICENSE: BSD-3-Clause
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-## x/image
-
-This product contains 'image' by The Go Authors.
-
-[mirror] Go supplementary image libraries
-
-* HOMEPAGE:
-  * https://github.com/golang/image
-
-* LICENSE: BSD-3-Clause
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-## x/net
-
-This product contains 'net' by The Go Authors.
-
-[mirror] Go supplementary network libraries
-
-* HOMEPAGE:
-  * https://github.com/golang/net
-
-* LICENSE: BSD-3-Clause
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-## x/text
-
-This product contains 'text' by The Go Authors.
-
-[mirror] Go text processing support
-
-* HOMEPAGE:
-  * https://github.com/golang/text
-
-* LICENSE: BSD-3-Clause
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-## mail
-
-This product contains 'mail' by GitHub user "go-mail", modified (forked) from original GitHub repo 'go-gomail/gomail' owned by Gomail.
-
-Actively maintained fork of gomail. The best way to send emails in Go.
-
-* HOMEPAGE:
-  * https://github.com/go-mail/mail
-
-* LICENSE: MIT
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Alexandre Cesaro
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-## natefinch/lumberjack
-
-This product contains 'lumberjack' by Nate Finch.
-
-lumberjack is a log rolling package for Go
-
-* HOMEPAGE:
-  * https://github.com/natefinch/lumberjack
-
-* LICENSE: MIT
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Nate Finch
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-## olivere/elastic
-
-This product contains 'elastic' by Oliver Eilhard.
-
-Elasticsearch client for Go.
-
-* HOMEPAGE:
-  * https://github.com/olivere/elastic
-
-* LICENSE: MIT
-
-The MIT License (MIT)
-Copyright © 2012-2015 Oliver Eilhard
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the “Software”), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
----
-
-## go-yaml/yaml
-
-This product contains 'yaml' by GitHub user "go-yaml".
-
-YAML support for the Go language.
-
-* HOMEPAGE:
-  * https://github.com/go-yaml/yaml
-
-* LICENSE: Apache-2.0
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-* This package includes the following NOTICE:
-
-Copyright 2011-2016 Canonical Ltd.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
----
-
-## go/imageproxy
-
-This product contains 'imageproxy' by Will Norris.
-
-A caching, resizing image proxy written in Go
-
-* HOMEPAGE:
-  * https://github.com/willnorris/imageproxy
-
-* LICENSE: Apache-2.0
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
----
-
-## oov/psd
-
-This product contains 'psd' by oov.
-
-A PSD/PSB file reader for go
-
-* HOMEPAGE:
-  * https://github.com/oov/psd
-
-* LICENSE: MIT
-
-MIT License
-
-Copyright (c) 2016 oov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-## gopherjs
-
-This product contains 'gopherjs' by Richard Musiol.
-
-A Go code to javascript code compiler.
-
-* HOMEPAGE:
-  * https://github.com/gopherjs/gopherjs
-
-* LICENSE:
-
-Copyright (c) 2013 Richard Musiol. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-## AWS SDK for Go
-
-This product contains 'aws-sdk' by Amazon.
-
-AWS-SDK support for the Go language.
-
-* HOMEPAGE:
-  * https://github.com/aws/aws-sdk-go
-
-* LICENSE:
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
----
-
-## semver
-
-This product contains 'semver' by Masterminds.
-
-The semver package provides the ability to work with Semantic Versions in Go.
-
-* HOMEPAGE:
-  * https://github.com/Masterminds/semver
-
-* LICENSE:
-
-Copyright (C) 2014-2019, Matt Butcher and Matt Farina
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
----
-
-## Date Constraints
-
-This product contains 'dateconstraints' by Eli Yukelzon.
-
-Go library to validate a date against constraints
-
-* HOMEPAGE:
-  * https://github.com/reflog/dateconstraints
-
-* LICENSE:
-
-MIT License
-
-Copyright (c) 2020 Eli Yukelzon
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-## Archiver
-
-This product contains 'archiver' by Matthew Holt
-
-A library to handle direferen archive files (zip, rar, tar.gz...)
-
-* HOMEPAGE:
-  * https://github.com/mholt/archiver
-
-* LICENSE:
-
-MIT License
-
-Copyright (c) 2016 Matthew Holt
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-## PDF Reader library
-
-This product contains 'pdf' by the Go team and modified by Thuc Le
-
-A library to provide pdf reading support
-
-* HOMEPAGE:
-  * https://github.com/ledongthuc/pdf
-
-* LICENSE:
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-## GoOse
-
-This product contains 'GoOse' by Antonio Linari
-
-A library to provide html text extraction support
-
-* HOMEPAGE:
-  * https://github.com/advancedlogic/GoOse
-
-* LICENSE:
-
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
----
-
-## Docconv
-
-This product contains 'docconv' by Sajari Pty Ltd
-
-A library to provide text extraction support for different documents
-
-* HOMEPAGE:
-  * https://github.com/sajari/docconv
-
-* LICENSE:
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Sajari Pty Ltd
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
----
-
-## JWT-Go
-
-This product contains `jwt-go` by Dave Grijalva
-
-* HOMEPAGE:
-  * https://github.com/dgrijalva/jwt-go
-
-* LICENSE:
-
-The MIT License (MIT)
-
-Copyright (c) 2012 Dave Grijalva
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
-persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of
-the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/access.go b/vendor/github.com/mattermost/mattermost-server/v5/model/access.go
deleted file mode 100644
index 6b60ea9e..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/access.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-)
-
-const (
-	ACCESS_TOKEN_GRANT_TYPE  = "authorization_code"
-	ACCESS_TOKEN_TYPE        = "bearer"
-	REFRESH_TOKEN_GRANT_TYPE = "refresh_token"
-)
-
-type AccessData struct {
-	ClientId     string `json:"client_id"`
-	UserId       string `json:"user_id"`
-	Token        string `json:"token"`
-	RefreshToken string `json:"refresh_token"`
-	RedirectUri  string `json:"redirect_uri"`
-	ExpiresAt    int64  `json:"expires_at"`
-	Scope        string `json:"scope"`
-}
-
-type AccessResponse struct {
-	AccessToken  string `json:"access_token"`
-	TokenType    string `json:"token_type"`
-	ExpiresIn    int32  `json:"expires_in"`
-	Scope        string `json:"scope"`
-	RefreshToken string `json:"refresh_token"`
-	IdToken      string `json:"id_token"`
-}
-
-// IsValid validates the AccessData and returns an error if it isn't configured
-// correctly.
-func (ad *AccessData) IsValid() *AppError {
-
-	if ad.ClientId == "" || len(ad.ClientId) > 26 {
-		return NewAppError("AccessData.IsValid", "model.access.is_valid.client_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if ad.UserId == "" || len(ad.UserId) > 26 {
-		return NewAppError("AccessData.IsValid", "model.access.is_valid.user_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(ad.Token) != 26 {
-		return NewAppError("AccessData.IsValid", "model.access.is_valid.access_token.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(ad.RefreshToken) > 26 {
-		return NewAppError("AccessData.IsValid", "model.access.is_valid.refresh_token.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if ad.RedirectUri == "" || len(ad.RedirectUri) > 256 || !IsValidHttpUrl(ad.RedirectUri) {
-		return NewAppError("AccessData.IsValid", "model.access.is_valid.redirect_uri.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (ad *AccessData) IsExpired() bool {
-
-	if ad.ExpiresAt <= 0 {
-		return false
-	}
-
-	if GetMillis() > ad.ExpiresAt {
-		return true
-	}
-
-	return false
-}
-
-func (ad *AccessData) ToJson() string {
-	b, _ := json.Marshal(ad)
-	return string(b)
-}
-
-func AccessDataFromJson(data io.Reader) *AccessData {
-	var ad *AccessData
-	json.NewDecoder(data).Decode(&ad)
-	return ad
-}
-
-func (ar *AccessResponse) ToJson() string {
-	b, _ := json.Marshal(ar)
-	return string(b)
-}
-
-func AccessResponseFromJson(data io.Reader) *AccessResponse {
-	var ar *AccessResponse
-	json.NewDecoder(data).Decode(&ar)
-	return ar
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/analytics_row.go b/vendor/github.com/mattermost/mattermost-server/v5/model/analytics_row.go
deleted file mode 100644
index d1216664..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/analytics_row.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type AnalyticsRow struct {
-	Name  string  `json:"name"`
-	Value float64 `json:"value"`
-}
-
-type AnalyticsRows []*AnalyticsRow
-
-func (ar *AnalyticsRow) ToJson() string {
-	b, _ := json.Marshal(ar)
-	return string(b)
-}
-
-func AnalyticsRowFromJson(data io.Reader) *AnalyticsRow {
-	var ar *AnalyticsRow
-	json.NewDecoder(data).Decode(&ar)
-	return ar
-}
-
-func (ar AnalyticsRows) ToJson() string {
-	b, err := json.Marshal(ar)
-	if err != nil {
-		return "[]"
-	}
-	return string(b)
-}
-
-func AnalyticsRowsFromJson(data io.Reader) AnalyticsRows {
-	var ar AnalyticsRows
-	json.NewDecoder(data).Decode(&ar)
-	return ar
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/at_mentions.go b/vendor/github.com/mattermost/mattermost-server/v5/model/at_mentions.go
deleted file mode 100644
index b5bfc0c7..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/at_mentions.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"regexp"
-	"strings"
-)
-
-var atMentionRegexp = regexp.MustCompile(`\B@[[:alnum:]][[:alnum:]\.\-_:]*`)
-
-const usernameSpecialChars = ".-_"
-
-// PossibleAtMentions returns all substrings in message that look like valid @
-// mentions.
-func PossibleAtMentions(message string) []string {
-	var names []string
-
-	if !strings.Contains(message, "@") {
-		return names
-	}
-
-	alreadyMentioned := make(map[string]bool)
-	for _, match := range atMentionRegexp.FindAllString(message, -1) {
-		name := NormalizeUsername(match[1:])
-		if !alreadyMentioned[name] && IsValidUsernameAllowRemote(name) {
-			names = append(names, name)
-			alreadyMentioned[name] = true
-		}
-	}
-
-	return names
-}
-
-// TrimUsernameSpecialChar tries to remove the last character from word if it
-// is a special character for usernames (dot, dash or underscore). If not, it
-// returns the same string.
-func TrimUsernameSpecialChar(word string) (string, bool) {
-	len := len(word)
-
-	if len > 0 && strings.LastIndexAny(word, usernameSpecialChars) == (len-1) {
-		return word[:len-1], true
-	}
-
-	return word, false
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/audit.go b/vendor/github.com/mattermost/mattermost-server/v5/model/audit.go
deleted file mode 100644
index dd1e0602..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/audit.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type Audit struct {
-	Id        string `json:"id"`
-	CreateAt  int64  `json:"create_at"`
-	UserId    string `json:"user_id"`
-	Action    string `json:"action"`
-	ExtraInfo string `json:"extra_info"`
-	IpAddress string `json:"ip_address"`
-	SessionId string `json:"session_id"`
-}
-
-func (o *Audit) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func AuditFromJson(data io.Reader) *Audit {
-	var o *Audit
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/auditconv.go b/vendor/github.com/mattermost/mattermost-server/v5/model/auditconv.go
deleted file mode 100644
index b3cf6062..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/auditconv.go
+++ /dev/null
@@ -1,713 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"github.com/francoispqt/gojay"
-)
-
-// AuditModelTypeConv converts key model types to something better suited for audit output.
-func AuditModelTypeConv(val interface{}) (newVal interface{}, converted bool) {
-	if val == nil {
-		return nil, false
-	}
-	switch v := val.(type) {
-	case *Channel:
-		return newAuditChannel(v), true
-	case *Team:
-		return newAuditTeam(v), true
-	case *User:
-		return newAuditUser(v), true
-	case *Command:
-		return newAuditCommand(v), true
-	case *CommandArgs:
-		return newAuditCommandArgs(v), true
-	case *Bot:
-		return newAuditBot(v), true
-	case *ChannelModerationPatch:
-		return newAuditChannelModerationPatch(v), true
-	case *Emoji:
-		return newAuditEmoji(v), true
-	case *FileInfo:
-		return newAuditFileInfo(v), true
-	case *Group:
-		return newAuditGroup(v), true
-	case *Job:
-		return newAuditJob(v), true
-	case *OAuthApp:
-		return newAuditOAuthApp(v), true
-	case *Post:
-		return newAuditPost(v), true
-	case *Role:
-		return newAuditRole(v), true
-	case *Scheme:
-		return newAuditScheme(v), true
-	case *SchemeRoles:
-		return newAuditSchemeRoles(v), true
-	case *Session:
-		return newAuditSession(v), true
-	case *IncomingWebhook:
-		return newAuditIncomingWebhook(v), true
-	case *OutgoingWebhook:
-		return newAuditOutgoingWebhook(v), true
-	case *RemoteCluster:
-		return newRemoteCluster(v), true
-	}
-	return val, false
-}
-
-type auditChannel struct {
-	ID   string
-	Name string
-	Type string
-}
-
-// newAuditChannel creates a simplified representation of Channel for output to audit log.
-func newAuditChannel(c *Channel) auditChannel {
-	var channel auditChannel
-	if c != nil {
-		channel.ID = c.Id
-		channel.Name = c.Name
-		channel.Type = c.Type
-	}
-	return channel
-}
-
-func (c auditChannel) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("id", c.ID)
-	enc.StringKey("name", c.Name)
-	enc.StringKey("type", c.Type)
-}
-
-func (c auditChannel) IsNil() bool {
-	return false
-}
-
-type auditTeam struct {
-	ID   string
-	Name string
-	Type string
-}
-
-// newAuditTeam creates a simplified representation of Team for output to audit log.
-func newAuditTeam(t *Team) auditTeam {
-	var team auditTeam
-	if t != nil {
-		team.ID = t.Id
-		team.Name = t.Name
-		team.Type = t.Type
-	}
-	return team
-}
-
-func (t auditTeam) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("id", t.ID)
-	enc.StringKey("name", t.Name)
-	enc.StringKey("type", t.Type)
-}
-
-func (t auditTeam) IsNil() bool {
-	return false
-}
-
-type auditUser struct {
-	ID    string
-	Name  string
-	Roles string
-}
-
-// newAuditUser creates a simplified representation of User for output to audit log.
-func newAuditUser(u *User) auditUser {
-	var user auditUser
-	if u != nil {
-		user.ID = u.Id
-		user.Name = u.Username
-		user.Roles = u.Roles
-	}
-	return user
-}
-
-func (u auditUser) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("id", u.ID)
-	enc.StringKey("name", u.Name)
-	enc.StringKey("roles", u.Roles)
-}
-
-func (u auditUser) IsNil() bool {
-	return false
-}
-
-type auditCommand struct {
-	ID               string
-	CreatorID        string
-	TeamID           string
-	Trigger          string
-	Method           string
-	Username         string
-	IconURL          string
-	AutoComplete     bool
-	AutoCompleteDesc string
-	AutoCompleteHint string
-	DisplayName      string
-	Description      string
-	URL              string
-}
-
-// newAuditCommand creates a simplified representation of Command for output to audit log.
-func newAuditCommand(c *Command) auditCommand {
-	var cmd auditCommand
-	if c != nil {
-		cmd.ID = c.Id
-		cmd.CreatorID = c.CreatorId
-		cmd.TeamID = c.TeamId
-		cmd.Trigger = c.Trigger
-		cmd.Method = c.Method
-		cmd.Username = c.Username
-		cmd.IconURL = c.IconURL
-		cmd.AutoComplete = c.AutoComplete
-		cmd.AutoCompleteDesc = c.AutoCompleteDesc
-		cmd.AutoCompleteHint = c.AutoCompleteHint
-		cmd.DisplayName = c.DisplayName
-		cmd.Description = c.Description
-		cmd.URL = c.URL
-	}
-	return cmd
-}
-
-func (cmd auditCommand) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("id", cmd.ID)
-	enc.StringKey("creator_id", cmd.CreatorID)
-	enc.StringKey("team_id", cmd.TeamID)
-	enc.StringKey("trigger", cmd.Trigger)
-	enc.StringKey("method", cmd.Method)
-	enc.StringKey("username", cmd.Username)
-	enc.StringKey("icon_url", cmd.IconURL)
-	enc.BoolKey("auto_complete", cmd.AutoComplete)
-	enc.StringKey("auto_complete_desc", cmd.AutoCompleteDesc)
-	enc.StringKey("auto_complete_hint", cmd.AutoCompleteHint)
-	enc.StringKey("display", cmd.DisplayName)
-	enc.StringKey("desc", cmd.Description)
-	enc.StringKey("url", cmd.URL)
-}
-
-func (cmd auditCommand) IsNil() bool {
-	return false
-}
-
-type auditCommandArgs struct {
-	ChannelID string
-	TeamID    string
-	TriggerID string
-	Command   string
-}
-
-// newAuditCommandArgs creates a simplified representation of CommandArgs for output to audit log.
-func newAuditCommandArgs(ca *CommandArgs) auditCommandArgs {
-	var cmdargs auditCommandArgs
-	if ca != nil {
-		cmdargs.ChannelID = ca.ChannelId
-		cmdargs.TeamID = ca.TeamId
-		cmdargs.TriggerID = ca.TriggerId
-		cmdargs.Command = ca.Command
-	}
-	return cmdargs
-}
-
-func (ca auditCommandArgs) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("channel_id", ca.ChannelID)
-	enc.StringKey("team_id", ca.TriggerID)
-	enc.StringKey("trigger_id", ca.TeamID)
-	enc.StringKey("command", ca.Command)
-}
-
-func (ca auditCommandArgs) IsNil() bool {
-	return false
-}
-
-type auditBot struct {
-	UserID      string
-	Username    string
-	Displayname string
-}
-
-// newAuditBot creates a simplified representation of Bot for output to audit log.
-func newAuditBot(b *Bot) auditBot {
-	var bot auditBot
-	if b != nil {
-		bot.UserID = b.UserId
-		bot.Username = b.Username
-		bot.Displayname = b.DisplayName
-	}
-	return bot
-}
-
-func (b auditBot) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("user_id", b.UserID)
-	enc.StringKey("username", b.Username)
-	enc.StringKey("display", b.Displayname)
-}
-
-func (b auditBot) IsNil() bool {
-	return false
-}
-
-type auditChannelModerationPatch struct {
-	Name        string
-	RoleGuests  bool
-	RoleMembers bool
-}
-
-// newAuditChannelModerationPatch creates a simplified representation of ChannelModerationPatch for output to audit log.
-func newAuditChannelModerationPatch(p *ChannelModerationPatch) auditChannelModerationPatch {
-	var patch auditChannelModerationPatch
-	if p != nil {
-		if p.Name != nil {
-			patch.Name = *p.Name
-		}
-		if p.Roles.Guests != nil {
-			patch.RoleGuests = *p.Roles.Guests
-		}
-		if p.Roles.Members != nil {
-			patch.RoleMembers = *p.Roles.Members
-		}
-	}
-	return patch
-}
-
-func (p auditChannelModerationPatch) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("name", p.Name)
-	enc.BoolKey("role_guests", p.RoleGuests)
-	enc.BoolKey("role_members", p.RoleMembers)
-}
-
-func (p auditChannelModerationPatch) IsNil() bool {
-	return false
-}
-
-type auditEmoji struct {
-	ID   string
-	Name string
-}
-
-// newAuditEmoji creates a simplified representation of Emoji for output to audit log.
-func newAuditEmoji(e *Emoji) auditEmoji {
-	var emoji auditEmoji
-	if e != nil {
-		emoji.ID = e.Id
-		emoji.Name = e.Name
-	}
-	return emoji
-}
-
-func (e auditEmoji) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("id", e.ID)
-	enc.StringKey("name", e.Name)
-}
-
-func (e auditEmoji) IsNil() bool {
-	return false
-}
-
-type auditFileInfo struct {
-	ID        string
-	PostID    string
-	Path      string
-	Name      string
-	Extension string
-	Size      int64
-}
-
-// newAuditFileInfo creates a simplified representation of FileInfo for output to audit log.
-func newAuditFileInfo(f *FileInfo) auditFileInfo {
-	var fi auditFileInfo
-	if f != nil {
-		fi.ID = f.Id
-		fi.PostID = f.PostId
-		fi.Path = f.Path
-		fi.Name = f.Name
-		fi.Extension = f.Extension
-		fi.Size = f.Size
-	}
-	return fi
-}
-
-func (fi auditFileInfo) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("id", fi.ID)
-	enc.StringKey("post_id", fi.PostID)
-	enc.StringKey("path", fi.Path)
-	enc.StringKey("name", fi.Name)
-	enc.StringKey("ext", fi.Extension)
-	enc.Int64Key("size", fi.Size)
-}
-
-func (fi auditFileInfo) IsNil() bool {
-	return false
-}
-
-type auditGroup struct {
-	ID          string
-	Name        string
-	DisplayName string
-	Description string
-}
-
-// newAuditGroup creates a simplified representation of Group for output to audit log.
-func newAuditGroup(g *Group) auditGroup {
-	var group auditGroup
-	if g != nil {
-		group.ID = g.Id
-		if g.Name == nil {
-			group.Name = ""
-		} else {
-			group.Name = *g.Name
-		}
-		group.DisplayName = g.DisplayName
-		group.Description = g.Description
-	}
-	return group
-}
-
-func (g auditGroup) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("id", g.ID)
-	enc.StringKey("name", g.Name)
-	enc.StringKey("display", g.DisplayName)
-	enc.StringKey("desc", g.Description)
-}
-
-func (g auditGroup) IsNil() bool {
-	return false
-}
-
-type auditJob struct {
-	ID       string
-	Type     string
-	Priority int64
-	StartAt  int64
-}
-
-// newAuditJob creates a simplified representation of Job for output to audit log.
-func newAuditJob(j *Job) auditJob {
-	var job auditJob
-	if j != nil {
-		job.ID = j.Id
-		job.Type = j.Type
-		job.Priority = j.Priority
-		job.StartAt = j.StartAt
-	}
-	return job
-}
-
-func (j auditJob) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("id", j.ID)
-	enc.StringKey("type", j.Type)
-	enc.Int64Key("priority", j.Priority)
-	enc.Int64Key("start_at", j.StartAt)
-}
-
-func (j auditJob) IsNil() bool {
-	return false
-}
-
-type auditOAuthApp struct {
-	ID          string
-	CreatorID   string
-	Name        string
-	Description string
-	IsTrusted   bool
-}
-
-// newAuditOAuthApp creates a simplified representation of OAuthApp for output to audit log.
-func newAuditOAuthApp(o *OAuthApp) auditOAuthApp {
-	var oauth auditOAuthApp
-	if o != nil {
-		oauth.ID = o.Id
-		oauth.CreatorID = o.CreatorId
-		oauth.Name = o.Name
-		oauth.Description = o.Description
-		oauth.IsTrusted = o.IsTrusted
-	}
-	return oauth
-}
-
-func (o auditOAuthApp) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("id", o.ID)
-	enc.StringKey("creator_id", o.CreatorID)
-	enc.StringKey("name", o.Name)
-	enc.StringKey("desc", o.Description)
-	enc.BoolKey("trusted", o.IsTrusted)
-}
-
-func (o auditOAuthApp) IsNil() bool {
-	return false
-}
-
-type auditPost struct {
-	ID        string
-	ChannelID string
-	Type      string
-	IsPinned  bool
-}
-
-// newAuditPost creates a simplified representation of Post for output to audit log.
-func newAuditPost(p *Post) auditPost {
-	var post auditPost
-	if p != nil {
-		post.ID = p.Id
-		post.ChannelID = p.ChannelId
-		post.Type = p.Type
-		post.IsPinned = p.IsPinned
-	}
-	return post
-}
-
-func (p auditPost) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("id", p.ID)
-	enc.StringKey("channel_id", p.ChannelID)
-	enc.StringKey("type", p.Type)
-	enc.BoolKey("pinned", p.IsPinned)
-}
-
-func (p auditPost) IsNil() bool {
-	return false
-}
-
-type auditRole struct {
-	ID            string
-	Name          string
-	DisplayName   string
-	Permissions   []string
-	SchemeManaged bool
-	BuiltIn       bool
-}
-
-// newAuditRole creates a simplified representation of Role for output to audit log.
-func newAuditRole(r *Role) auditRole {
-	var role auditRole
-	if r != nil {
-		role.ID = r.Id
-		role.Name = r.Name
-		role.DisplayName = r.DisplayName
-		role.Permissions = append(role.Permissions, r.Permissions...)
-		role.SchemeManaged = r.SchemeManaged
-		role.BuiltIn = r.BuiltIn
-	}
-	return role
-}
-
-func (r auditRole) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("id", r.ID)
-	enc.StringKey("name", r.Name)
-	enc.StringKey("display", r.DisplayName)
-	enc.SliceStringKey("perms", r.Permissions)
-	enc.BoolKey("schemeManaged", r.SchemeManaged)
-	enc.BoolKey("builtin", r.BuiltIn)
-}
-
-func (r auditRole) IsNil() bool {
-	return false
-}
-
-type auditScheme struct {
-	ID          string
-	Name        string
-	DisplayName string
-	Scope       string
-}
-
-// newAuditScheme creates a simplified representation of Scheme for output to audit log.
-func newAuditScheme(s *Scheme) auditScheme {
-	var scheme auditScheme
-	if s != nil {
-		scheme.ID = s.Id
-		scheme.Name = s.Name
-		scheme.DisplayName = s.DisplayName
-		scheme.Scope = s.Scope
-	}
-	return scheme
-}
-
-func (s auditScheme) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("id", s.ID)
-	enc.StringKey("name", s.Name)
-	enc.StringKey("display", s.DisplayName)
-	enc.StringKey("scope", s.Scope)
-}
-
-func (s auditScheme) IsNil() bool {
-	return false
-}
-
-type auditSchemeRoles struct {
-	SchemeAdmin bool
-	SchemeUser  bool
-	SchemeGuest bool
-}
-
-// newAuditSchemeRoles creates a simplified representation of SchemeRoles for output to audit log.
-func newAuditSchemeRoles(s *SchemeRoles) auditSchemeRoles {
-	var roles auditSchemeRoles
-	if s != nil {
-		roles.SchemeAdmin = s.SchemeAdmin
-		roles.SchemeUser = s.SchemeUser
-		roles.SchemeGuest = s.SchemeGuest
-	}
-	return roles
-}
-
-func (s auditSchemeRoles) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.BoolKey("admin", s.SchemeAdmin)
-	enc.BoolKey("user", s.SchemeUser)
-	enc.BoolKey("guest", s.SchemeGuest)
-}
-
-func (s auditSchemeRoles) IsNil() bool {
-	return false
-}
-
-type auditSession struct {
-	ID       string
-	UserId   string
-	DeviceId string
-}
-
-// newAuditSession creates a simplified representation of Session for output to audit log.
-func newAuditSession(s *Session) auditSession {
-	var session auditSession
-	if s != nil {
-		session.ID = s.Id
-		session.UserId = s.UserId
-		session.DeviceId = s.DeviceId
-	}
-	return session
-}
-
-func (s auditSession) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("id", s.ID)
-	enc.StringKey("user_id", s.UserId)
-	enc.StringKey("device_id", s.DeviceId)
-}
-
-func (s auditSession) IsNil() bool {
-	return false
-}
-
-type auditIncomingWebhook struct {
-	ID          string
-	ChannelID   string
-	TeamId      string
-	DisplayName string
-	Description string
-}
-
-// newAuditIncomingWebhook creates a simplified representation of IncomingWebhook for output to audit log.
-func newAuditIncomingWebhook(h *IncomingWebhook) auditIncomingWebhook {
-	var hook auditIncomingWebhook
-	if h != nil {
-		hook.ID = h.Id
-		hook.ChannelID = h.ChannelId
-		hook.TeamId = h.TeamId
-		hook.DisplayName = h.DisplayName
-		hook.Description = h.Description
-	}
-	return hook
-}
-
-func (h auditIncomingWebhook) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("id", h.ID)
-	enc.StringKey("channel_id", h.ChannelID)
-	enc.StringKey("team_id", h.TeamId)
-	enc.StringKey("display", h.DisplayName)
-	enc.StringKey("desc", h.Description)
-}
-
-func (h auditIncomingWebhook) IsNil() bool {
-	return false
-}
-
-type auditOutgoingWebhook struct {
-	ID           string
-	ChannelID    string
-	TeamID       string
-	TriggerWords StringArray
-	TriggerWhen  int
-	DisplayName  string
-	Description  string
-	ContentType  string
-	Username     string
-}
-
-// newAuditOutgoingWebhook creates a simplified representation of OutgoingWebhook for output to audit log.
-func newAuditOutgoingWebhook(h *OutgoingWebhook) auditOutgoingWebhook {
-	var hook auditOutgoingWebhook
-	if h != nil {
-		hook.ID = h.Id
-		hook.ChannelID = h.ChannelId
-		hook.TeamID = h.TeamId
-		hook.TriggerWords = h.TriggerWords
-		hook.TriggerWhen = h.TriggerWhen
-		hook.DisplayName = h.DisplayName
-		hook.Description = h.Description
-		hook.ContentType = h.ContentType
-		hook.Username = h.Username
-	}
-	return hook
-}
-
-func (h auditOutgoingWebhook) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("id", h.ID)
-	enc.StringKey("channel_id", h.ChannelID)
-	enc.StringKey("team_id", h.TeamID)
-	enc.SliceStringKey("trigger_words", h.TriggerWords)
-	enc.IntKey("trigger_when", h.TriggerWhen)
-	enc.StringKey("display", h.DisplayName)
-	enc.StringKey("desc", h.Description)
-	enc.StringKey("content_type", h.ContentType)
-	enc.StringKey("username", h.Username)
-}
-
-func (h auditOutgoingWebhook) IsNil() bool {
-	return false
-}
-
-type auditRemoteCluster struct {
-	RemoteId     string
-	RemoteTeamId string
-	Name         string
-	DisplayName  string
-	SiteURL      string
-	CreateAt     int64
-	LastPingAt   int64
-	CreatorId    string
-}
-
-// newRemoteCluster creates a simplified representation of RemoteCluster for output to audit log.
-func newRemoteCluster(r *RemoteCluster) auditRemoteCluster {
-	var rc auditRemoteCluster
-	if r != nil {
-		rc.RemoteId = r.RemoteId
-		rc.RemoteTeamId = r.RemoteTeamId
-		rc.Name = r.Name
-		rc.DisplayName = r.DisplayName
-		rc.SiteURL = r.SiteURL
-		rc.CreateAt = r.CreateAt
-		rc.LastPingAt = r.LastPingAt
-		rc.CreatorId = r.CreatorId
-	}
-	return rc
-}
-
-func (r auditRemoteCluster) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.StringKey("remote_id", r.RemoteId)
-	enc.StringKey("remote_team_id", r.RemoteTeamId)
-	enc.StringKey("name", r.Name)
-	enc.StringKey("display_name", r.DisplayName)
-	enc.StringKey("site_url", r.SiteURL)
-	enc.Int64Key("create_at", r.CreateAt)
-	enc.Int64Key("last_ping_at", r.LastPingAt)
-	enc.StringKey("creator_id", r.CreatorId)
-}
-
-func (r auditRemoteCluster) IsNil() bool {
-	return false
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/audits.go b/vendor/github.com/mattermost/mattermost-server/v5/model/audits.go
deleted file mode 100644
index 54e361f9..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/audits.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type Audits []Audit
-
-func (o Audits) Etag() string {
-	if len(o) > 0 {
-		// the first in the list is always the most current
-		return Etag(o[0].CreateAt)
-	}
-	return ""
-}
-
-func (o Audits) ToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return "[]"
-	}
-	return string(b)
-}
-
-func AuditsFromJson(data io.Reader) Audits {
-	var o Audits
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/authorize.go b/vendor/github.com/mattermost/mattermost-server/v5/model/authorize.go
deleted file mode 100644
index f2a8e8dc..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/authorize.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-)
-
-const (
-	AUTHCODE_EXPIRE_TIME   = 60 * 10 // 10 minutes
-	AUTHCODE_RESPONSE_TYPE = "code"
-	IMPLICIT_RESPONSE_TYPE = "token"
-	DEFAULT_SCOPE          = "user"
-)
-
-type AuthData struct {
-	ClientId    string `json:"client_id"`
-	UserId      string `json:"user_id"`
-	Code        string `json:"code"`
-	ExpiresIn   int32  `json:"expires_in"`
-	CreateAt    int64  `json:"create_at"`
-	RedirectUri string `json:"redirect_uri"`
-	State       string `json:"state"`
-	Scope       string `json:"scope"`
-}
-
-type AuthorizeRequest struct {
-	ResponseType string `json:"response_type"`
-	ClientId     string `json:"client_id"`
-	RedirectUri  string `json:"redirect_uri"`
-	Scope        string `json:"scope"`
-	State        string `json:"state"`
-}
-
-// IsValid validates the AuthData and returns an error if it isn't configured
-// correctly.
-func (ad *AuthData) IsValid() *AppError {
-
-	if !IsValidId(ad.ClientId) {
-		return NewAppError("AuthData.IsValid", "model.authorize.is_valid.client_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !IsValidId(ad.UserId) {
-		return NewAppError("AuthData.IsValid", "model.authorize.is_valid.user_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if ad.Code == "" || len(ad.Code) > 128 {
-		return NewAppError("AuthData.IsValid", "model.authorize.is_valid.auth_code.app_error", nil, "client_id="+ad.ClientId, http.StatusBadRequest)
-	}
-
-	if ad.ExpiresIn == 0 {
-		return NewAppError("AuthData.IsValid", "model.authorize.is_valid.expires.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if ad.CreateAt <= 0 {
-		return NewAppError("AuthData.IsValid", "model.authorize.is_valid.create_at.app_error", nil, "client_id="+ad.ClientId, http.StatusBadRequest)
-	}
-
-	if len(ad.RedirectUri) > 256 || !IsValidHttpUrl(ad.RedirectUri) {
-		return NewAppError("AuthData.IsValid", "model.authorize.is_valid.redirect_uri.app_error", nil, "client_id="+ad.ClientId, http.StatusBadRequest)
-	}
-
-	if len(ad.State) > 1024 {
-		return NewAppError("AuthData.IsValid", "model.authorize.is_valid.state.app_error", nil, "client_id="+ad.ClientId, http.StatusBadRequest)
-	}
-
-	if len(ad.Scope) > 128 {
-		return NewAppError("AuthData.IsValid", "model.authorize.is_valid.scope.app_error", nil, "client_id="+ad.ClientId, http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-// IsValid validates the AuthorizeRequest and returns an error if it isn't configured
-// correctly.
-func (ar *AuthorizeRequest) IsValid() *AppError {
-
-	if !IsValidId(ar.ClientId) {
-		return NewAppError("AuthData.IsValid", "model.authorize.is_valid.client_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if ar.ResponseType == "" {
-		return NewAppError("AuthData.IsValid", "model.authorize.is_valid.response_type.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if ar.RedirectUri == "" || len(ar.RedirectUri) > 256 || !IsValidHttpUrl(ar.RedirectUri) {
-		return NewAppError("AuthData.IsValid", "model.authorize.is_valid.redirect_uri.app_error", nil, "client_id="+ar.ClientId, http.StatusBadRequest)
-	}
-
-	if len(ar.State) > 1024 {
-		return NewAppError("AuthData.IsValid", "model.authorize.is_valid.state.app_error", nil, "client_id="+ar.ClientId, http.StatusBadRequest)
-	}
-
-	if len(ar.Scope) > 128 {
-		return NewAppError("AuthData.IsValid", "model.authorize.is_valid.scope.app_error", nil, "client_id="+ar.ClientId, http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (ad *AuthData) PreSave() {
-	if ad.ExpiresIn == 0 {
-		ad.ExpiresIn = AUTHCODE_EXPIRE_TIME
-	}
-
-	if ad.CreateAt == 0 {
-		ad.CreateAt = GetMillis()
-	}
-
-	if ad.Scope == "" {
-		ad.Scope = DEFAULT_SCOPE
-	}
-}
-
-func (ad *AuthData) ToJson() string {
-	b, _ := json.Marshal(ad)
-	return string(b)
-}
-
-func AuthDataFromJson(data io.Reader) *AuthData {
-	var ad *AuthData
-	json.NewDecoder(data).Decode(&ad)
-	return ad
-}
-
-func (ar *AuthorizeRequest) ToJson() string {
-	b, _ := json.Marshal(ar)
-	return string(b)
-}
-
-func AuthorizeRequestFromJson(data io.Reader) *AuthorizeRequest {
-	var ar *AuthorizeRequest
-	json.NewDecoder(data).Decode(&ar)
-	return ar
-}
-
-func (ad *AuthData) IsExpired() bool {
-	return GetMillis() > ad.CreateAt+int64(ad.ExpiresIn*1000)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/bot.go b/vendor/github.com/mattermost/mattermost-server/v5/model/bot.go
deleted file mode 100644
index e58fc0be..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/bot.go
+++ /dev/null
@@ -1,254 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-	"unicode/utf8"
-)
-
-const (
-	BOT_DISPLAY_NAME_MAX_RUNES   = USER_FIRST_NAME_MAX_RUNES
-	BOT_DESCRIPTION_MAX_RUNES    = 1024
-	BOT_CREATOR_ID_MAX_RUNES     = KEY_VALUE_PLUGIN_ID_MAX_RUNES // UserId or PluginId
-	BOT_WARN_METRIC_BOT_USERNAME = "mattermost-advisor"
-	BOT_SYSTEM_BOT_USERNAME      = "system-bot"
-)
-
-// Bot is a special type of User meant for programmatic interactions.
-// Note that the primary key of a bot is the UserId, and matches the primary key of the
-// corresponding user.
-type Bot struct {
-	UserId         string `json:"user_id"`
-	Username       string `json:"username"`
-	DisplayName    string `json:"display_name,omitempty"`
-	Description    string `json:"description,omitempty"`
-	OwnerId        string `json:"owner_id"`
-	LastIconUpdate int64  `json:"last_icon_update,omitempty"`
-	CreateAt       int64  `json:"create_at"`
-	UpdateAt       int64  `json:"update_at"`
-	DeleteAt       int64  `json:"delete_at"`
-}
-
-// BotPatch is a description of what fields to update on an existing bot.
-type BotPatch struct {
-	Username    *string `json:"username"`
-	DisplayName *string `json:"display_name"`
-	Description *string `json:"description"`
-}
-
-// BotGetOptions acts as a filter on bulk bot fetching queries.
-type BotGetOptions struct {
-	OwnerId        string
-	IncludeDeleted bool
-	OnlyOrphaned   bool
-	Page           int
-	PerPage        int
-}
-
-// BotList is a list of bots.
-type BotList []*Bot
-
-// Trace describes the minimum information required to identify a bot for the purpose of logging.
-func (b *Bot) Trace() map[string]interface{} {
-	return map[string]interface{}{"user_id": b.UserId}
-}
-
-// Clone returns a shallow copy of the bot.
-func (b *Bot) Clone() *Bot {
-	copy := *b
-	return &copy
-}
-
-// IsValid validates the bot and returns an error if it isn't configured correctly.
-func (b *Bot) IsValid() *AppError {
-	if !IsValidId(b.UserId) {
-		return NewAppError("Bot.IsValid", "model.bot.is_valid.user_id.app_error", b.Trace(), "", http.StatusBadRequest)
-	}
-
-	if !IsValidUsername(b.Username) {
-		return NewAppError("Bot.IsValid", "model.bot.is_valid.username.app_error", b.Trace(), "", http.StatusBadRequest)
-	}
-
-	if utf8.RuneCountInString(b.DisplayName) > BOT_DISPLAY_NAME_MAX_RUNES {
-		return NewAppError("Bot.IsValid", "model.bot.is_valid.user_id.app_error", b.Trace(), "", http.StatusBadRequest)
-	}
-
-	if utf8.RuneCountInString(b.Description) > BOT_DESCRIPTION_MAX_RUNES {
-		return NewAppError("Bot.IsValid", "model.bot.is_valid.description.app_error", b.Trace(), "", http.StatusBadRequest)
-	}
-
-	if b.OwnerId == "" || utf8.RuneCountInString(b.OwnerId) > BOT_CREATOR_ID_MAX_RUNES {
-		return NewAppError("Bot.IsValid", "model.bot.is_valid.creator_id.app_error", b.Trace(), "", http.StatusBadRequest)
-	}
-
-	if b.CreateAt == 0 {
-		return NewAppError("Bot.IsValid", "model.bot.is_valid.create_at.app_error", b.Trace(), "", http.StatusBadRequest)
-	}
-
-	if b.UpdateAt == 0 {
-		return NewAppError("Bot.IsValid", "model.bot.is_valid.update_at.app_error", b.Trace(), "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-// PreSave should be run before saving a new bot to the database.
-func (b *Bot) PreSave() {
-	b.CreateAt = GetMillis()
-	b.UpdateAt = b.CreateAt
-	b.DeleteAt = 0
-}
-
-// PreUpdate should be run before saving an updated bot to the database.
-func (b *Bot) PreUpdate() {
-	b.UpdateAt = GetMillis()
-}
-
-// Etag generates an etag for caching.
-func (b *Bot) Etag() string {
-	return Etag(b.UserId, b.UpdateAt)
-}
-
-// ToJson serializes the bot to json.
-func (b *Bot) ToJson() []byte {
-	data, _ := json.Marshal(b)
-	return data
-}
-
-// BotFromJson deserializes a bot from json.
-func BotFromJson(data io.Reader) *Bot {
-	var bot *Bot
-	json.NewDecoder(data).Decode(&bot)
-	return bot
-}
-
-// Patch modifies an existing bot with optional fields from the given patch.
-// TODO 6.0: consider returning a boolean to indicate whether or not the patch
-// applied any changes.
-func (b *Bot) Patch(patch *BotPatch) {
-	if patch.Username != nil {
-		b.Username = *patch.Username
-	}
-
-	if patch.DisplayName != nil {
-		b.DisplayName = *patch.DisplayName
-	}
-
-	if patch.Description != nil {
-		b.Description = *patch.Description
-	}
-}
-
-// WouldPatch returns whether or not the given patch would be applied or not.
-func (b *Bot) WouldPatch(patch *BotPatch) bool {
-	if patch == nil {
-		return false
-	}
-	if patch.Username != nil && *patch.Username != b.Username {
-		return true
-	}
-	if patch.DisplayName != nil && *patch.DisplayName != b.DisplayName {
-		return true
-	}
-	if patch.Description != nil && *patch.Description != b.Description {
-		return true
-	}
-	return false
-}
-
-// ToJson serializes the bot patch to json.
-func (b *BotPatch) ToJson() []byte {
-	data, err := json.Marshal(b)
-	if err != nil {
-		return nil
-	}
-
-	return data
-}
-
-// BotPatchFromJson deserializes a bot patch from json.
-func BotPatchFromJson(data io.Reader) *BotPatch {
-	decoder := json.NewDecoder(data)
-	var botPatch BotPatch
-	err := decoder.Decode(&botPatch)
-	if err != nil {
-		return nil
-	}
-
-	return &botPatch
-}
-
-// UserFromBot returns a user model describing the bot fields stored in the User store.
-func UserFromBot(b *Bot) *User {
-	return &User{
-		Id:        b.UserId,
-		Username:  b.Username,
-		Email:     NormalizeEmail(fmt.Sprintf("%s@localhost", b.Username)),
-		FirstName: b.DisplayName,
-		Roles:     SYSTEM_USER_ROLE_ID,
-	}
-}
-
-// BotFromUser returns a bot model given a user model
-func BotFromUser(u *User) *Bot {
-	return &Bot{
-		OwnerId:     u.Id,
-		UserId:      u.Id,
-		Username:    u.Username,
-		DisplayName: u.GetDisplayName(SHOW_USERNAME),
-	}
-}
-
-// BotListFromJson deserializes a list of bots from json.
-func BotListFromJson(data io.Reader) BotList {
-	var bots BotList
-	json.NewDecoder(data).Decode(&bots)
-	return bots
-}
-
-// ToJson serializes a list of bots to json.
-func (l *BotList) ToJson() []byte {
-	b, _ := json.Marshal(l)
-	return b
-}
-
-// Etag computes the etag for a list of bots.
-func (l *BotList) Etag() string {
-	id := "0"
-	var t int64 = 0
-	var delta int64 = 0
-
-	for _, v := range *l {
-		if v.UpdateAt > t {
-			t = v.UpdateAt
-			id = v.UserId
-		}
-
-	}
-
-	return Etag(id, t, delta, len(*l))
-}
-
-// MakeBotNotFoundError creates the error returned when a bot does not exist, or when the user isn't allowed to query the bot.
-// The errors must the same in both cases to avoid leaking that a user is a bot.
-func MakeBotNotFoundError(userId string) *AppError {
-	return NewAppError("SqlBotStore.Get", "store.sql_bot.get.missing.app_error", map[string]interface{}{"user_id": userId}, "", http.StatusNotFound)
-}
-
-func IsBotDMChannel(channel *Channel, botUserID string) bool {
-	if channel.Type != CHANNEL_DIRECT {
-		return false
-	}
-
-	if !strings.HasPrefix(channel.Name, botUserID+"__") && !strings.HasSuffix(channel.Name, "__"+botUserID) {
-		return false
-	}
-
-	return true
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/builtin.go b/vendor/github.com/mattermost/mattermost-server/v5/model/builtin.go
deleted file mode 100644
index 38e01f8b..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/builtin.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-func NewBool(b bool) *bool       { return &b }
-func NewInt(n int) *int          { return &n }
-func NewInt64(n int64) *int64    { return &n }
-func NewString(s string) *string { return &s }
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/bundle_info.go b/vendor/github.com/mattermost/mattermost-server/v5/model/bundle_info.go
deleted file mode 100644
index e4cfe125..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/bundle_info.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"github.com/mattermost/mattermost-server/v5/shared/mlog"
-)
-
-type BundleInfo struct {
-	Path string
-
-	Manifest      *Manifest
-	ManifestPath  string
-	ManifestError error
-}
-
-func (b *BundleInfo) WrapLogger(logger *mlog.Logger) *mlog.Logger {
-	if b.Manifest != nil {
-		return logger.With(mlog.String("plugin_id", b.Manifest.Id))
-	}
-	return logger.With(mlog.String("plugin_path", b.Path))
-}
-
-// Returns bundle info for the given path. The return value is never nil.
-func BundleInfoForPath(path string) *BundleInfo {
-	m, mpath, err := FindManifest(path)
-	return &BundleInfo{
-		Path:          path,
-		Manifest:      m,
-		ManifestPath:  mpath,
-		ManifestError: err,
-	}
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/channel.go b/vendor/github.com/mattermost/mattermost-server/v5/model/channel.go
deleted file mode 100644
index 8dc3fa8d..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/channel.go
+++ /dev/null
@@ -1,387 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"crypto/sha1"
-	"encoding/hex"
-	"encoding/json"
-	"io"
-	"net/http"
-	"sort"
-	"strings"
-	"unicode/utf8"
-)
-
-const (
-	CHANNEL_OPEN                   = "O"
-	CHANNEL_PRIVATE                = "P"
-	CHANNEL_DIRECT                 = "D"
-	CHANNEL_GROUP                  = "G"
-	CHANNEL_GROUP_MAX_USERS        = 8
-	CHANNEL_GROUP_MIN_USERS        = 3
-	DEFAULT_CHANNEL                = "town-square"
-	CHANNEL_DISPLAY_NAME_MAX_RUNES = 64
-	CHANNEL_NAME_MIN_LENGTH        = 2
-	CHANNEL_NAME_MAX_LENGTH        = 64
-	CHANNEL_HEADER_MAX_RUNES       = 1024
-	CHANNEL_PURPOSE_MAX_RUNES      = 250
-	CHANNEL_CACHE_SIZE             = 25000
-
-	CHANNEL_SORT_BY_USERNAME = "username"
-	CHANNEL_SORT_BY_STATUS   = "status"
-)
-
-type Channel struct {
-	Id                string                 `json:"id"`
-	CreateAt          int64                  `json:"create_at"`
-	UpdateAt          int64                  `json:"update_at"`
-	DeleteAt          int64                  `json:"delete_at"`
-	TeamId            string                 `json:"team_id"`
-	Type              string                 `json:"type"`
-	DisplayName       string                 `json:"display_name"`
-	Name              string                 `json:"name"`
-	Header            string                 `json:"header"`
-	Purpose           string                 `json:"purpose"`
-	LastPostAt        int64                  `json:"last_post_at"`
-	TotalMsgCount     int64                  `json:"total_msg_count"`
-	ExtraUpdateAt     int64                  `json:"extra_update_at"`
-	CreatorId         string                 `json:"creator_id"`
-	SchemeId          *string                `json:"scheme_id"`
-	Props             map[string]interface{} `json:"props" db:"-"`
-	GroupConstrained  *bool                  `json:"group_constrained"`
-	Shared            *bool                  `json:"shared"`
-	TotalMsgCountRoot int64                  `json:"total_msg_count_root"`
-	PolicyID          *string                `json:"policy_id" db:"-"`
-}
-
-type ChannelWithTeamData struct {
-	Channel
-	TeamDisplayName string `json:"team_display_name"`
-	TeamName        string `json:"team_name"`
-	TeamUpdateAt    int64  `json:"team_update_at"`
-}
-
-type ChannelsWithCount struct {
-	Channels   *ChannelListWithTeamData `json:"channels"`
-	TotalCount int64                    `json:"total_count"`
-}
-
-type ChannelPatch struct {
-	DisplayName      *string `json:"display_name"`
-	Name             *string `json:"name"`
-	Header           *string `json:"header"`
-	Purpose          *string `json:"purpose"`
-	GroupConstrained *bool   `json:"group_constrained"`
-}
-
-type ChannelForExport struct {
-	Channel
-	TeamName   string
-	SchemeName *string
-}
-
-type DirectChannelForExport struct {
-	Channel
-	Members *[]string
-}
-
-type ChannelModeration struct {
-	Name  string                 `json:"name"`
-	Roles *ChannelModeratedRoles `json:"roles"`
-}
-
-type ChannelModeratedRoles struct {
-	Guests  *ChannelModeratedRole `json:"guests"`
-	Members *ChannelModeratedRole `json:"members"`
-}
-
-type ChannelModeratedRole struct {
-	Value   bool `json:"value"`
-	Enabled bool `json:"enabled"`
-}
-
-type ChannelModerationPatch struct {
-	Name  *string                     `json:"name"`
-	Roles *ChannelModeratedRolesPatch `json:"roles"`
-}
-
-type ChannelModeratedRolesPatch struct {
-	Guests  *bool `json:"guests"`
-	Members *bool `json:"members"`
-}
-
-// ChannelSearchOpts contains options for searching channels.
-//
-// NotAssociatedToGroup will exclude channels that have associated, active GroupChannels records.
-// ExcludeDefaultChannels will exclude the configured default channels (ex 'town-square' and 'off-topic').
-// IncludeDeleted will include channel records where DeleteAt != 0.
-// ExcludeChannelNames will exclude channels from the results by name.
-// Paginate whether to paginate the results.
-// Page page requested, if results are paginated.
-// PerPage number of results per page, if paginated.
-//
-type ChannelSearchOpts struct {
-	NotAssociatedToGroup     string
-	ExcludeDefaultChannels   bool
-	IncludeDeleted           bool
-	Deleted                  bool
-	ExcludeChannelNames      []string
-	TeamIds                  []string
-	GroupConstrained         bool
-	ExcludeGroupConstrained  bool
-	PolicyID                 string
-	ExcludePolicyConstrained bool
-	IncludePolicyID          bool
-	Public                   bool
-	Private                  bool
-	Page                     *int
-	PerPage                  *int
-}
-
-type ChannelMemberCountByGroup struct {
-	GroupId                     string `db:"-" json:"group_id"`
-	ChannelMemberCount          int64  `db:"-" json:"channel_member_count"`
-	ChannelMemberTimezonesCount int64  `db:"-" json:"channel_member_timezones_count"`
-}
-
-type ChannelOption func(channel *Channel)
-
-func WithID(ID string) ChannelOption {
-	return func(channel *Channel) {
-		channel.Id = ID
-	}
-}
-
-func (o *Channel) DeepCopy() *Channel {
-	copy := *o
-	if copy.SchemeId != nil {
-		copy.SchemeId = NewString(*o.SchemeId)
-	}
-	return &copy
-}
-
-func (o *Channel) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func (o *ChannelPatch) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func (o *ChannelsWithCount) ToJson() []byte {
-	b, _ := json.Marshal(o)
-	return b
-}
-
-func ChannelsWithCountFromJson(data io.Reader) *ChannelsWithCount {
-	var o *ChannelsWithCount
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func ChannelFromJson(data io.Reader) *Channel {
-	var o *Channel
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func ChannelPatchFromJson(data io.Reader) *ChannelPatch {
-	var o *ChannelPatch
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func ChannelModerationsFromJson(data io.Reader) []*ChannelModeration {
-	var o []*ChannelModeration
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func ChannelModerationsPatchFromJson(data io.Reader) []*ChannelModerationPatch {
-	var o []*ChannelModerationPatch
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func ChannelMemberCountsByGroupFromJson(data io.Reader) []*ChannelMemberCountByGroup {
-	var o []*ChannelMemberCountByGroup
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func (o *Channel) Etag() string {
-	return Etag(o.Id, o.UpdateAt)
-}
-
-func (o *Channel) IsValid() *AppError {
-	if !IsValidId(o.Id) {
-		return NewAppError("Channel.IsValid", "model.channel.is_valid.id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.CreateAt == 0 {
-		return NewAppError("Channel.IsValid", "model.channel.is_valid.create_at.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if o.UpdateAt == 0 {
-		return NewAppError("Channel.IsValid", "model.channel.is_valid.update_at.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if utf8.RuneCountInString(o.DisplayName) > CHANNEL_DISPLAY_NAME_MAX_RUNES {
-		return NewAppError("Channel.IsValid", "model.channel.is_valid.display_name.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if !IsValidChannelIdentifier(o.Name) {
-		return NewAppError("Channel.IsValid", "model.channel.is_valid.2_or_more.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if !(o.Type == CHANNEL_OPEN || o.Type == CHANNEL_PRIVATE || o.Type == CHANNEL_DIRECT || o.Type == CHANNEL_GROUP) {
-		return NewAppError("Channel.IsValid", "model.channel.is_valid.type.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if utf8.RuneCountInString(o.Header) > CHANNEL_HEADER_MAX_RUNES {
-		return NewAppError("Channel.IsValid", "model.channel.is_valid.header.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if utf8.RuneCountInString(o.Purpose) > CHANNEL_PURPOSE_MAX_RUNES {
-		return NewAppError("Channel.IsValid", "model.channel.is_valid.purpose.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if len(o.CreatorId) > 26 {
-		return NewAppError("Channel.IsValid", "model.channel.is_valid.creator_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	userIds := strings.Split(o.Name, "__")
-	if o.Type != CHANNEL_DIRECT && len(userIds) == 2 && IsValidId(userIds[0]) && IsValidId(userIds[1]) {
-		return NewAppError("Channel.IsValid", "model.channel.is_valid.name.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (o *Channel) PreSave() {
-	if o.Id == "" {
-		o.Id = NewId()
-	}
-
-	o.Name = SanitizeUnicode(o.Name)
-	o.DisplayName = SanitizeUnicode(o.DisplayName)
-
-	o.CreateAt = GetMillis()
-	o.UpdateAt = o.CreateAt
-	o.ExtraUpdateAt = 0
-}
-
-func (o *Channel) PreUpdate() {
-	o.UpdateAt = GetMillis()
-	o.Name = SanitizeUnicode(o.Name)
-	o.DisplayName = SanitizeUnicode(o.DisplayName)
-}
-
-func (o *Channel) IsGroupOrDirect() bool {
-	return o.Type == CHANNEL_DIRECT || o.Type == CHANNEL_GROUP
-}
-
-func (o *Channel) IsOpen() bool {
-	return o.Type == CHANNEL_OPEN
-}
-
-func (o *Channel) Patch(patch *ChannelPatch) {
-	if patch.DisplayName != nil {
-		o.DisplayName = *patch.DisplayName
-	}
-
-	if patch.Name != nil {
-		o.Name = *patch.Name
-	}
-
-	if patch.Header != nil {
-		o.Header = *patch.Header
-	}
-
-	if patch.Purpose != nil {
-		o.Purpose = *patch.Purpose
-	}
-
-	if patch.GroupConstrained != nil {
-		o.GroupConstrained = patch.GroupConstrained
-	}
-}
-
-func (o *Channel) MakeNonNil() {
-	if o.Props == nil {
-		o.Props = make(map[string]interface{})
-	}
-}
-
-func (o *Channel) AddProp(key string, value interface{}) {
-	o.MakeNonNil()
-
-	o.Props[key] = value
-}
-
-func (o *Channel) IsGroupConstrained() bool {
-	return o.GroupConstrained != nil && *o.GroupConstrained
-}
-
-func (o *Channel) IsShared() bool {
-	return o.Shared != nil && *o.Shared
-}
-
-func (o *Channel) GetOtherUserIdForDM(userId string) string {
-	if o.Type != CHANNEL_DIRECT {
-		return ""
-	}
-
-	userIds := strings.Split(o.Name, "__")
-
-	var otherUserId string
-
-	if userIds[0] != userIds[1] {
-		if userIds[0] == userId {
-			otherUserId = userIds[1]
-		} else {
-			otherUserId = userIds[0]
-		}
-	}
-
-	return otherUserId
-}
-
-func GetDMNameFromIds(userId1, userId2 string) string {
-	if userId1 > userId2 {
-		return userId2 + "__" + userId1
-	}
-	return userId1 + "__" + userId2
-}
-
-func GetGroupDisplayNameFromUsers(users []*User, truncate bool) string {
-	usernames := make([]string, len(users))
-	for index, user := range users {
-		usernames[index] = user.Username
-	}
-
-	sort.Strings(usernames)
-
-	name := strings.Join(usernames, ", ")
-
-	if truncate && len(name) > CHANNEL_NAME_MAX_LENGTH {
-		name = name[:CHANNEL_NAME_MAX_LENGTH]
-	}
-
-	return name
-}
-
-func GetGroupNameFromUserIds(userIds []string) string {
-	sort.Strings(userIds)
-
-	h := sha1.New()
-	for _, id := range userIds {
-		io.WriteString(h, id)
-	}
-
-	return hex.EncodeToString(h.Sum(nil))
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_count.go b/vendor/github.com/mattermost/mattermost-server/v5/model/channel_count.go
deleted file mode 100644
index 6230ab3d..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_count.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"crypto/md5"
-	"encoding/json"
-	"fmt"
-	"io"
-	"sort"
-	"strconv"
-)
-
-type ChannelCounts struct {
-	Counts      map[string]int64 `json:"counts"`
-	CountsRoot  map[string]int64 `json:"counts_root"`
-	UpdateTimes map[string]int64 `json:"update_times"`
-}
-
-func (o *ChannelCounts) Etag() string {
-	// we don't include CountsRoot in ETag calculation, since it's a deriviative
-	ids := []string{}
-	for id := range o.Counts {
-		ids = append(ids, id)
-	}
-	sort.Strings(ids)
-
-	str := ""
-	for _, id := range ids {
-		str += id + strconv.FormatInt(o.Counts[id], 10)
-	}
-
-	md5Counts := fmt.Sprintf("%x", md5.Sum([]byte(str)))
-
-	var update int64 = 0
-	for _, u := range o.UpdateTimes {
-		if u > update {
-			update = u
-		}
-	}
-
-	return Etag(md5Counts, update)
-}
-
-func (o *ChannelCounts) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func ChannelCountsFromJson(data io.Reader) *ChannelCounts {
-	var o *ChannelCounts
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_data.go b/vendor/github.com/mattermost/mattermost-server/v5/model/channel_data.go
deleted file mode 100644
index 0a1e0d57..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_data.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type ChannelData struct {
-	Channel *Channel       `json:"channel"`
-	Member  *ChannelMember `json:"member"`
-}
-
-func (o *ChannelData) Etag() string {
-	var mt int64 = 0
-	if o.Member != nil {
-		mt = o.Member.LastUpdateAt
-	}
-
-	return Etag(o.Channel.Id, o.Channel.UpdateAt, o.Channel.LastPostAt, mt)
-}
-
-func (o *ChannelData) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func ChannelDataFromJson(data io.Reader) *ChannelData {
-	var o *ChannelData
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_list.go b/vendor/github.com/mattermost/mattermost-server/v5/model/channel_list.go
deleted file mode 100644
index 4ba9e5c3..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_list.go
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type ChannelList []*Channel
-
-func (o *ChannelList) ToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return "[]"
-	}
-	return string(b)
-}
-
-func (o *ChannelList) Etag() string {
-
-	id := "0"
-	var t int64 = 0
-	var delta int64 = 0
-
-	for _, v := range *o {
-		if v.LastPostAt > t {
-			t = v.LastPostAt
-			id = v.Id
-		}
-
-		if v.UpdateAt > t {
-			t = v.UpdateAt
-			id = v.Id
-		}
-
-	}
-
-	return Etag(id, t, delta, len(*o))
-}
-
-func ChannelListFromJson(data io.Reader) *ChannelList {
-	var o *ChannelList
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func ChannelSliceFromJson(data io.Reader) []*Channel {
-	var o []*Channel
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-type ChannelListWithTeamData []*ChannelWithTeamData
-
-func (o *ChannelListWithTeamData) ToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return "[]"
-	}
-	return string(b)
-}
-
-func (o *ChannelListWithTeamData) Etag() string {
-
-	id := "0"
-	var t int64 = 0
-	var delta int64 = 0
-
-	for _, v := range *o {
-		if v.LastPostAt > t {
-			t = v.LastPostAt
-			id = v.Id
-		}
-
-		if v.UpdateAt > t {
-			t = v.UpdateAt
-			id = v.Id
-		}
-
-		if v.TeamUpdateAt > t {
-			t = v.TeamUpdateAt
-			id = v.Id
-		}
-	}
-
-	return Etag(id, t, delta, len(*o))
-}
-
-func ChannelListWithTeamDataFromJson(data io.Reader) *ChannelListWithTeamData {
-	var o *ChannelListWithTeamData
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_member.go b/vendor/github.com/mattermost/mattermost-server/v5/model/channel_member.go
deleted file mode 100644
index bc02881e..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_member.go
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-	"strings"
-)
-
-const (
-	CHANNEL_NOTIFY_DEFAULT              = "default"
-	CHANNEL_NOTIFY_ALL                  = "all"
-	CHANNEL_NOTIFY_MENTION              = "mention"
-	CHANNEL_NOTIFY_NONE                 = "none"
-	CHANNEL_MARK_UNREAD_ALL             = "all"
-	CHANNEL_MARK_UNREAD_MENTION         = "mention"
-	IGNORE_CHANNEL_MENTIONS_DEFAULT     = "default"
-	IGNORE_CHANNEL_MENTIONS_OFF         = "off"
-	IGNORE_CHANNEL_MENTIONS_ON          = "on"
-	IGNORE_CHANNEL_MENTIONS_NOTIFY_PROP = "ignore_channel_mentions"
-)
-
-type ChannelUnread struct {
-	TeamId           string    `json:"team_id"`
-	ChannelId        string    `json:"channel_id"`
-	MsgCount         int64     `json:"msg_count"`
-	MentionCount     int64     `json:"mention_count"`
-	MentionCountRoot int64     `json:"mention_count_root"`
-	MsgCountRoot     int64     `json:"msg_count_root"`
-	NotifyProps      StringMap `json:"-"`
-}
-
-type ChannelUnreadAt struct {
-	TeamId           string    `json:"team_id"`
-	UserId           string    `json:"user_id"`
-	ChannelId        string    `json:"channel_id"`
-	MsgCount         int64     `json:"msg_count"`
-	MentionCount     int64     `json:"mention_count"`
-	MentionCountRoot int64     `json:"mention_count_root"`
-	MsgCountRoot     int64     `json:"msg_count_root"`
-	LastViewedAt     int64     `json:"last_viewed_at"`
-	NotifyProps      StringMap `json:"-"`
-}
-
-type ChannelMember struct {
-	ChannelId        string    `json:"channel_id"`
-	UserId           string    `json:"user_id"`
-	Roles            string    `json:"roles"`
-	LastViewedAt     int64     `json:"last_viewed_at"`
-	MsgCount         int64     `json:"msg_count"`
-	MentionCount     int64     `json:"mention_count"`
-	MentionCountRoot int64     `json:"mention_count_root"`
-	MsgCountRoot     int64     `json:"msg_count_root"`
-	NotifyProps      StringMap `json:"notify_props"`
-	LastUpdateAt     int64     `json:"last_update_at"`
-	SchemeGuest      bool      `json:"scheme_guest"`
-	SchemeUser       bool      `json:"scheme_user"`
-	SchemeAdmin      bool      `json:"scheme_admin"`
-	ExplicitRoles    string    `json:"explicit_roles"`
-}
-
-type ChannelMembers []ChannelMember
-
-type ChannelMemberForExport struct {
-	ChannelMember
-	ChannelName string
-	Username    string
-}
-
-func (o *ChannelMembers) ToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return "[]"
-	}
-	return string(b)
-}
-
-func (o *ChannelUnread) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func (o *ChannelUnreadAt) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func ChannelMembersFromJson(data io.Reader) *ChannelMembers {
-	var o *ChannelMembers
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func ChannelUnreadFromJson(data io.Reader) *ChannelUnread {
-	var o *ChannelUnread
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func ChannelUnreadAtFromJson(data io.Reader) *ChannelUnreadAt {
-	var o *ChannelUnreadAt
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func (o *ChannelMember) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func ChannelMemberFromJson(data io.Reader) *ChannelMember {
-	var o *ChannelMember
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func (o *ChannelMember) IsValid() *AppError {
-
-	if !IsValidId(o.ChannelId) {
-		return NewAppError("ChannelMember.IsValid", "model.channel_member.is_valid.channel_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !IsValidId(o.UserId) {
-		return NewAppError("ChannelMember.IsValid", "model.channel_member.is_valid.user_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	notifyLevel := o.NotifyProps[DESKTOP_NOTIFY_PROP]
-	if len(notifyLevel) > 20 || !IsChannelNotifyLevelValid(notifyLevel) {
-		return NewAppError("ChannelMember.IsValid", "model.channel_member.is_valid.notify_level.app_error", nil, "notify_level="+notifyLevel, http.StatusBadRequest)
-	}
-
-	markUnreadLevel := o.NotifyProps[MARK_UNREAD_NOTIFY_PROP]
-	if len(markUnreadLevel) > 20 || !IsChannelMarkUnreadLevelValid(markUnreadLevel) {
-		return NewAppError("ChannelMember.IsValid", "model.channel_member.is_valid.unread_level.app_error", nil, "mark_unread_level="+markUnreadLevel, http.StatusBadRequest)
-	}
-
-	if pushLevel, ok := o.NotifyProps[PUSH_NOTIFY_PROP]; ok {
-		if len(pushLevel) > 20 || !IsChannelNotifyLevelValid(pushLevel) {
-			return NewAppError("ChannelMember.IsValid", "model.channel_member.is_valid.push_level.app_error", nil, "push_notification_level="+pushLevel, http.StatusBadRequest)
-		}
-	}
-
-	if sendEmail, ok := o.NotifyProps[EMAIL_NOTIFY_PROP]; ok {
-		if len(sendEmail) > 20 || !IsSendEmailValid(sendEmail) {
-			return NewAppError("ChannelMember.IsValid", "model.channel_member.is_valid.email_value.app_error", nil, "push_notification_level="+sendEmail, http.StatusBadRequest)
-		}
-	}
-
-	if ignoreChannelMentions, ok := o.NotifyProps[IGNORE_CHANNEL_MENTIONS_NOTIFY_PROP]; ok {
-		if len(ignoreChannelMentions) > 40 || !IsIgnoreChannelMentionsValid(ignoreChannelMentions) {
-			return NewAppError("ChannelMember.IsValid", "model.channel_member.is_valid.ignore_channel_mentions_value.app_error", nil, "ignore_channel_mentions="+ignoreChannelMentions, http.StatusBadRequest)
-		}
-	}
-
-	return nil
-}
-
-func (o *ChannelMember) PreSave() {
-	o.LastUpdateAt = GetMillis()
-}
-
-func (o *ChannelMember) PreUpdate() {
-	o.LastUpdateAt = GetMillis()
-}
-
-func (o *ChannelMember) GetRoles() []string {
-	return strings.Fields(o.Roles)
-}
-
-func (o *ChannelMember) SetChannelMuted(muted bool) {
-	if o.IsChannelMuted() {
-		o.NotifyProps[MARK_UNREAD_NOTIFY_PROP] = CHANNEL_MARK_UNREAD_ALL
-	} else {
-		o.NotifyProps[MARK_UNREAD_NOTIFY_PROP] = CHANNEL_MARK_UNREAD_MENTION
-	}
-}
-
-func (o *ChannelMember) IsChannelMuted() bool {
-	return o.NotifyProps[MARK_UNREAD_NOTIFY_PROP] == CHANNEL_MARK_UNREAD_MENTION
-}
-
-func IsChannelNotifyLevelValid(notifyLevel string) bool {
-	return notifyLevel == CHANNEL_NOTIFY_DEFAULT ||
-		notifyLevel == CHANNEL_NOTIFY_ALL ||
-		notifyLevel == CHANNEL_NOTIFY_MENTION ||
-		notifyLevel == CHANNEL_NOTIFY_NONE
-}
-
-func IsChannelMarkUnreadLevelValid(markUnreadLevel string) bool {
-	return markUnreadLevel == CHANNEL_MARK_UNREAD_ALL || markUnreadLevel == CHANNEL_MARK_UNREAD_MENTION
-}
-
-func IsSendEmailValid(sendEmail string) bool {
-	return sendEmail == CHANNEL_NOTIFY_DEFAULT || sendEmail == "true" || sendEmail == "false"
-}
-
-func IsIgnoreChannelMentionsValid(ignoreChannelMentions string) bool {
-	return ignoreChannelMentions == IGNORE_CHANNEL_MENTIONS_ON || ignoreChannelMentions == IGNORE_CHANNEL_MENTIONS_OFF || ignoreChannelMentions == IGNORE_CHANNEL_MENTIONS_DEFAULT
-}
-
-func GetDefaultChannelNotifyProps() StringMap {
-	return StringMap{
-		DESKTOP_NOTIFY_PROP:                 CHANNEL_NOTIFY_DEFAULT,
-		MARK_UNREAD_NOTIFY_PROP:             CHANNEL_MARK_UNREAD_ALL,
-		PUSH_NOTIFY_PROP:                    CHANNEL_NOTIFY_DEFAULT,
-		EMAIL_NOTIFY_PROP:                   CHANNEL_NOTIFY_DEFAULT,
-		IGNORE_CHANNEL_MENTIONS_NOTIFY_PROP: IGNORE_CHANNEL_MENTIONS_DEFAULT,
-	}
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_member_history.go b/vendor/github.com/mattermost/mattermost-server/v5/model/channel_member_history.go
deleted file mode 100644
index b77e0ff9..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_member_history.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-type ChannelMemberHistory struct {
-	ChannelId string
-	UserId    string
-	JoinTime  int64
-	LeaveTime *int64
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_member_history_result.go b/vendor/github.com/mattermost/mattermost-server/v5/model/channel_member_history_result.go
deleted file mode 100644
index 8f43ca4e..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_member_history_result.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-type ChannelMemberHistoryResult struct {
-	ChannelId string
-	UserId    string
-	JoinTime  int64
-	LeaveTime *int64
-
-	// these two fields are never set in the database - when we SELECT, we join on Users to get them
-	UserEmail    string `db:"Email"`
-	Username     string
-	IsBot        bool
-	UserDeleteAt int64
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_mentions.go b/vendor/github.com/mattermost/mattermost-server/v5/model/channel_mentions.go
deleted file mode 100644
index eb14e8ed..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_mentions.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"regexp"
-	"strings"
-)
-
-var channelMentionRegexp = regexp.MustCompile(`\B~[a-zA-Z0-9\-_]+`)
-
-func ChannelMentions(message string) []string {
-	var names []string
-
-	if strings.Contains(message, "~") {
-		alreadyMentioned := make(map[string]bool)
-		for _, match := range channelMentionRegexp.FindAllString(message, -1) {
-			name := match[1:]
-			if !alreadyMentioned[name] {
-				names = append(names, name)
-				alreadyMentioned[name] = true
-			}
-		}
-	}
-
-	return names
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_search.go b/vendor/github.com/mattermost/mattermost-server/v5/model/channel_search.go
deleted file mode 100644
index 51e11736..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_search.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-const CHANNEL_SEARCH_DEFAULT_LIMIT = 50
-
-type ChannelSearch struct {
-	Term                     string   `json:"term"`
-	ExcludeDefaultChannels   bool     `json:"exclude_default_channels"`
-	NotAssociatedToGroup     string   `json:"not_associated_to_group"`
-	TeamIds                  []string `json:"team_ids"`
-	GroupConstrained         bool     `json:"group_constrained"`
-	ExcludeGroupConstrained  bool     `json:"exclude_group_constrained"`
-	ExcludePolicyConstrained bool     `json:"exclude_policy_constrained"`
-	Public                   bool     `json:"public"`
-	Private                  bool     `json:"private"`
-	IncludeDeleted           bool     `json:"include_deleted"`
-	Deleted                  bool     `json:"deleted"`
-	Page                     *int     `json:"page,omitempty"`
-	PerPage                  *int     `json:"per_page,omitempty"`
-}
-
-// ToJson convert a Channel to a json string
-func (c *ChannelSearch) ToJson() string {
-	b, _ := json.Marshal(c)
-	return string(b)
-}
-
-// ChannelSearchFromJson will decode the input and return a Channel
-func ChannelSearchFromJson(data io.Reader) *ChannelSearch {
-	var cs *ChannelSearch
-	json.NewDecoder(data).Decode(&cs)
-	return cs
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_sidebar.go b/vendor/github.com/mattermost/mattermost-server/v5/model/channel_sidebar.go
deleted file mode 100644
index 35301d1e..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_sidebar.go
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"regexp"
-)
-
-type SidebarCategoryType string
-type SidebarCategorySorting string
-
-const (
-	// Each sidebar category has a 'type'. System categories are Channels, Favorites and DMs
-	// All user-created categories will have type Custom
-	SidebarCategoryChannels       SidebarCategoryType = "channels"
-	SidebarCategoryDirectMessages SidebarCategoryType = "direct_messages"
-	SidebarCategoryFavorites      SidebarCategoryType = "favorites"
-	SidebarCategoryCustom         SidebarCategoryType = "custom"
-	// Increment to use when adding/reordering things in the sidebar
-	MinimalSidebarSortDistance = 10
-	// Default Sort Orders for categories
-	DefaultSidebarSortOrderFavorites = 0
-	DefaultSidebarSortOrderChannels  = DefaultSidebarSortOrderFavorites + MinimalSidebarSortDistance
-	DefaultSidebarSortOrderDMs       = DefaultSidebarSortOrderChannels + MinimalSidebarSortDistance
-	// Sorting modes
-	// default for all categories except DMs (behaves like manual)
-	SidebarCategorySortDefault SidebarCategorySorting = ""
-	// sort manually
-	SidebarCategorySortManual SidebarCategorySorting = "manual"
-	// sort by recency (default for DMs)
-	SidebarCategorySortRecent SidebarCategorySorting = "recent"
-	// sort by display name alphabetically
-	SidebarCategorySortAlphabetical SidebarCategorySorting = "alpha"
-)
-
-// SidebarCategory represents the corresponding DB table
-// SortOrder is never returned to the user and only used for queries
-type SidebarCategory struct {
-	Id          string                 `json:"id"`
-	UserId      string                 `json:"user_id"`
-	TeamId      string                 `json:"team_id"`
-	SortOrder   int64                  `json:"-"`
-	Sorting     SidebarCategorySorting `json:"sorting"`
-	Type        SidebarCategoryType    `json:"type"`
-	DisplayName string                 `json:"display_name"`
-	Muted       bool                   `json:"muted"`
-	Collapsed   bool                   `json:"collapsed"`
-}
-
-// SidebarCategoryWithChannels combines data from SidebarCategory table with the Channel IDs that belong to that category
-type SidebarCategoryWithChannels struct {
-	SidebarCategory
-	Channels []string `json:"channel_ids"`
-}
-
-type SidebarCategoryOrder []string
-
-// OrderedSidebarCategories combines categories, their channel IDs and an array of Category IDs, sorted
-type OrderedSidebarCategories struct {
-	Categories SidebarCategoriesWithChannels `json:"categories"`
-	Order      SidebarCategoryOrder          `json:"order"`
-}
-
-type SidebarChannel struct {
-	ChannelId  string `json:"channel_id"`
-	UserId     string `json:"user_id"`
-	CategoryId string `json:"category_id"`
-	SortOrder  int64  `json:"-"`
-}
-
-type SidebarChannels []*SidebarChannel
-type SidebarCategoriesWithChannels []*SidebarCategoryWithChannels
-
-func SidebarCategoryFromJson(data io.Reader) (*SidebarCategoryWithChannels, error) {
-	var o *SidebarCategoryWithChannels
-	err := json.NewDecoder(data).Decode(&o)
-	return o, err
-}
-
-func SidebarCategoriesFromJson(data io.Reader) ([]*SidebarCategoryWithChannels, error) {
-	var o []*SidebarCategoryWithChannels
-	err := json.NewDecoder(data).Decode(&o)
-	return o, err
-}
-
-func OrderedSidebarCategoriesFromJson(data io.Reader) (*OrderedSidebarCategories, error) {
-	var o *OrderedSidebarCategories
-	err := json.NewDecoder(data).Decode(&o)
-	return o, err
-}
-
-func (o SidebarCategoryWithChannels) ToJson() []byte {
-	b, _ := json.Marshal(o)
-	return b
-}
-
-func SidebarCategoriesWithChannelsToJson(o []*SidebarCategoryWithChannels) []byte {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return []byte("[]")
-	}
-	return b
-}
-
-func (o OrderedSidebarCategories) ToJson() []byte {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return []byte("[]")
-	}
-	return b
-}
-
-var categoryIdPattern = regexp.MustCompile("(favorites|channels|direct_messages)_[a-z0-9]{26}_[a-z0-9]{26}")
-
-func IsValidCategoryId(s string) bool {
-	// Category IDs can either be regular IDs
-	if IsValidId(s) {
-		return true
-	}
-
-	// Or default categories can follow the pattern {type}_{userID}_{teamID}
-	return categoryIdPattern.MatchString(s)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_stats.go b/vendor/github.com/mattermost/mattermost-server/v5/model/channel_stats.go
deleted file mode 100644
index 76f682aa..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_stats.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type ChannelStats struct {
-	ChannelId       string `json:"channel_id"`
-	MemberCount     int64  `json:"member_count"`
-	GuestCount      int64  `json:"guest_count"`
-	PinnedPostCount int64  `json:"pinnedpost_count"`
-}
-
-func (o *ChannelStats) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func ChannelStatsFromJson(data io.Reader) *ChannelStats {
-	var o *ChannelStats
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_view.go b/vendor/github.com/mattermost/mattermost-server/v5/model/channel_view.go
deleted file mode 100644
index 2ba74434..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/channel_view.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type ChannelView struct {
-	ChannelId                 string `json:"channel_id"`
-	PrevChannelId             string `json:"prev_channel_id"`
-	CollapsedThreadsSupported bool   `json:"collapsed_threads_supported"`
-}
-
-func (o *ChannelView) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func ChannelViewFromJson(data io.Reader) *ChannelView {
-	var o *ChannelView
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-type ChannelViewResponse struct {
-	Status            string           `json:"status"`
-	LastViewedAtTimes map[string]int64 `json:"last_viewed_at_times"`
-}
-
-func (o *ChannelViewResponse) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func ChannelViewResponseFromJson(data io.Reader) *ChannelViewResponse {
-	var o *ChannelViewResponse
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/client4.go b/vendor/github.com/mattermost/mattermost-server/v5/model/client4.go
deleted file mode 100644
index 0b9e713a..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/client4.go
+++ /dev/null
@@ -1,6343 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"mime/multipart"
-	"net"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"time"
-)
-
-const (
-	HEADER_REQUEST_ID          = "X-Request-ID"
-	HEADER_VERSION_ID          = "X-Version-ID"
-	HEADER_CLUSTER_ID          = "X-Cluster-ID"
-	HEADER_ETAG_SERVER         = "ETag"
-	HEADER_ETAG_CLIENT         = "If-None-Match"
-	HEADER_FORWARDED           = "X-Forwarded-For"
-	HEADER_REAL_IP             = "X-Real-IP"
-	HEADER_FORWARDED_PROTO     = "X-Forwarded-Proto"
-	HEADER_TOKEN               = "token"
-	HEADER_CSRF_TOKEN          = "X-CSRF-Token"
-	HEADER_BEARER              = "BEARER"
-	HEADER_AUTH                = "Authorization"
-	HEADER_CLOUD_TOKEN         = "X-Cloud-Token"
-	HEADER_REMOTECLUSTER_TOKEN = "X-RemoteCluster-Token"
-	HEADER_REMOTECLUSTER_ID    = "X-RemoteCluster-Id"
-	HEADER_REQUESTED_WITH      = "X-Requested-With"
-	HEADER_REQUESTED_WITH_XML  = "XMLHttpRequest"
-	HEADER_RANGE               = "Range"
-	STATUS                     = "status"
-	STATUS_OK                  = "OK"
-	STATUS_FAIL                = "FAIL"
-	STATUS_UNHEALTHY           = "UNHEALTHY"
-	STATUS_REMOVE              = "REMOVE"
-
-	CLIENT_DIR = "client"
-
-	API_URL_SUFFIX_V1 = "/api/v1"
-	API_URL_SUFFIX_V4 = "/api/v4"
-	API_URL_SUFFIX    = API_URL_SUFFIX_V4
-)
-
-type Response struct {
-	StatusCode    int
-	Error         *AppError
-	RequestId     string
-	Etag          string
-	ServerVersion string
-	Header        http.Header
-}
-
-type Client4 struct {
-	Url        string       // The location of the server, for example  "http://localhost:8065"
-	ApiUrl     string       // The api location of the server, for example "http://localhost:8065/api/v4"
-	HttpClient *http.Client // The http client
-	AuthToken  string
-	AuthType   string
-	HttpHeader map[string]string // Headers to be copied over for each request
-
-	// TrueString is the string value sent to the server for true boolean query parameters.
-	trueString string
-
-	// FalseString is the string value sent to the server for false boolean query parameters.
-	falseString string
-}
-
-// SetBoolString is a helper method for overriding how true and false query string parameters are
-// sent to the server.
-//
-// This method is only exposed for testing. It is never necessary to configure these values
-// in production.
-func (c *Client4) SetBoolString(value bool, valueStr string) {
-	if value {
-		c.trueString = valueStr
-	} else {
-		c.falseString = valueStr
-	}
-}
-
-// boolString builds the query string parameter for boolean values.
-func (c *Client4) boolString(value bool) string {
-	if value && c.trueString != "" {
-		return c.trueString
-	} else if !value && c.falseString != "" {
-		return c.falseString
-	}
-
-	if value {
-		return "true"
-	}
-	return "false"
-}
-
-func closeBody(r *http.Response) {
-	if r.Body != nil {
-		_, _ = io.Copy(ioutil.Discard, r.Body)
-		_ = r.Body.Close()
-	}
-}
-
-// Must is a convenience function used for testing.
-func (c *Client4) Must(result interface{}, resp *Response) interface{} {
-	if resp.Error != nil {
-		time.Sleep(time.Second)
-		panic(resp.Error)
-	}
-
-	return result
-}
-
-func NewAPIv4Client(url string) *Client4 {
-	url = strings.TrimRight(url, "/")
-	return &Client4{url, url + API_URL_SUFFIX, &http.Client{}, "", "", map[string]string{}, "", ""}
-}
-
-func NewAPIv4SocketClient(socketPath string) *Client4 {
-	tr := &http.Transport{
-		Dial: func(network, addr string) (net.Conn, error) {
-			return net.Dial("unix", socketPath)
-		},
-	}
-
-	client := NewAPIv4Client("http://_")
-	client.HttpClient = &http.Client{Transport: tr}
-
-	return client
-}
-
-func BuildErrorResponse(r *http.Response, err *AppError) *Response {
-	var statusCode int
-	var header http.Header
-	if r != nil {
-		statusCode = r.StatusCode
-		header = r.Header
-	} else {
-		statusCode = 0
-		header = make(http.Header)
-	}
-
-	return &Response{
-		StatusCode: statusCode,
-		Error:      err,
-		Header:     header,
-	}
-}
-
-func BuildResponse(r *http.Response) *Response {
-	return &Response{
-		StatusCode:    r.StatusCode,
-		RequestId:     r.Header.Get(HEADER_REQUEST_ID),
-		Etag:          r.Header.Get(HEADER_ETAG_SERVER),
-		ServerVersion: r.Header.Get(HEADER_VERSION_ID),
-		Header:        r.Header,
-	}
-}
-
-func (c *Client4) SetToken(token string) {
-	c.AuthToken = token
-	c.AuthType = HEADER_BEARER
-}
-
-// MockSession is deprecated in favour of SetToken
-func (c *Client4) MockSession(token string) {
-	c.SetToken(token)
-}
-
-func (c *Client4) SetOAuthToken(token string) {
-	c.AuthToken = token
-	c.AuthType = HEADER_TOKEN
-}
-
-func (c *Client4) ClearOAuthToken() {
-	c.AuthToken = ""
-	c.AuthType = HEADER_BEARER
-}
-
-func (c *Client4) GetUsersRoute() string {
-	return "/users"
-}
-
-func (c *Client4) GetUserRoute(userId string) string {
-	return fmt.Sprintf(c.GetUsersRoute()+"/%v", userId)
-}
-
-func (c *Client4) GetUserThreadsRoute(userID, teamID string) string {
-	return c.GetUserRoute(userID) + c.GetTeamRoute(teamID) + "/threads"
-}
-
-func (c *Client4) GetUserThreadRoute(userId, teamId, threadId string) string {
-	return c.GetUserThreadsRoute(userId, teamId) + "/" + threadId
-}
-
-func (c *Client4) GetUserCategoryRoute(userID, teamID string) string {
-	return c.GetUserRoute(userID) + c.GetTeamRoute(teamID) + "/channels/categories"
-}
-
-func (c *Client4) GetUserAccessTokensRoute() string {
-	return fmt.Sprintf(c.GetUsersRoute() + "/tokens")
-}
-
-func (c *Client4) GetUserAccessTokenRoute(tokenId string) string {
-	return fmt.Sprintf(c.GetUsersRoute()+"/tokens/%v", tokenId)
-}
-
-func (c *Client4) GetUserByUsernameRoute(userName string) string {
-	return fmt.Sprintf(c.GetUsersRoute()+"/username/%v", userName)
-}
-
-func (c *Client4) GetUserByEmailRoute(email string) string {
-	return fmt.Sprintf(c.GetUsersRoute()+"/email/%v", email)
-}
-
-func (c *Client4) GetBotsRoute() string {
-	return "/bots"
-}
-
-func (c *Client4) GetBotRoute(botUserId string) string {
-	return fmt.Sprintf("%s/%s", c.GetBotsRoute(), botUserId)
-}
-
-func (c *Client4) GetTeamsRoute() string {
-	return "/teams"
-}
-
-func (c *Client4) GetTeamRoute(teamId string) string {
-	return fmt.Sprintf(c.GetTeamsRoute()+"/%v", teamId)
-}
-
-func (c *Client4) GetTeamAutoCompleteCommandsRoute(teamId string) string {
-	return fmt.Sprintf(c.GetTeamsRoute()+"/%v/commands/autocomplete", teamId)
-}
-
-func (c *Client4) GetTeamByNameRoute(teamName string) string {
-	return fmt.Sprintf(c.GetTeamsRoute()+"/name/%v", teamName)
-}
-
-func (c *Client4) GetTeamMemberRoute(teamId, userId string) string {
-	return fmt.Sprintf(c.GetTeamRoute(teamId)+"/members/%v", userId)
-}
-
-func (c *Client4) GetTeamMembersRoute(teamId string) string {
-	return fmt.Sprintf(c.GetTeamRoute(teamId) + "/members")
-}
-
-func (c *Client4) GetTeamStatsRoute(teamId string) string {
-	return fmt.Sprintf(c.GetTeamRoute(teamId) + "/stats")
-}
-
-func (c *Client4) GetTeamImportRoute(teamId string) string {
-	return fmt.Sprintf(c.GetTeamRoute(teamId) + "/import")
-}
-
-func (c *Client4) GetChannelsRoute() string {
-	return "/channels"
-}
-
-func (c *Client4) GetChannelsForTeamRoute(teamId string) string {
-	return fmt.Sprintf(c.GetTeamRoute(teamId) + "/channels")
-}
-
-func (c *Client4) GetChannelRoute(channelId string) string {
-	return fmt.Sprintf(c.GetChannelsRoute()+"/%v", channelId)
-}
-
-func (c *Client4) GetChannelByNameRoute(channelName, teamId string) string {
-	return fmt.Sprintf(c.GetTeamRoute(teamId)+"/channels/name/%v", channelName)
-}
-
-func (c *Client4) GetChannelsForTeamForUserRoute(teamId, userId string, includeDeleted bool) string {
-	route := fmt.Sprintf(c.GetUserRoute(userId) + c.GetTeamRoute(teamId) + "/channels")
-	if includeDeleted {
-		query := fmt.Sprintf("?include_deleted=%v", includeDeleted)
-		return route + query
-	}
-	return route
-}
-
-func (c *Client4) GetChannelByNameForTeamNameRoute(channelName, teamName string) string {
-	return fmt.Sprintf(c.GetTeamByNameRoute(teamName)+"/channels/name/%v", channelName)
-}
-
-func (c *Client4) GetChannelMembersRoute(channelId string) string {
-	return fmt.Sprintf(c.GetChannelRoute(channelId) + "/members")
-}
-
-func (c *Client4) GetChannelMemberRoute(channelId, userId string) string {
-	return fmt.Sprintf(c.GetChannelMembersRoute(channelId)+"/%v", userId)
-}
-
-func (c *Client4) GetPostsRoute() string {
-	return "/posts"
-}
-
-func (c *Client4) GetPostsEphemeralRoute() string {
-	return "/posts/ephemeral"
-}
-
-func (c *Client4) GetConfigRoute() string {
-	return "/config"
-}
-
-func (c *Client4) GetLicenseRoute() string {
-	return "/license"
-}
-
-func (c *Client4) GetPostRoute(postId string) string {
-	return fmt.Sprintf(c.GetPostsRoute()+"/%v", postId)
-}
-
-func (c *Client4) GetFilesRoute() string {
-	return "/files"
-}
-
-func (c *Client4) GetFileRoute(fileId string) string {
-	return fmt.Sprintf(c.GetFilesRoute()+"/%v", fileId)
-}
-
-func (c *Client4) GetUploadsRoute() string {
-	return "/uploads"
-}
-
-func (c *Client4) GetUploadRoute(uploadId string) string {
-	return fmt.Sprintf("%s/%s", c.GetUploadsRoute(), uploadId)
-}
-
-func (c *Client4) GetPluginsRoute() string {
-	return "/plugins"
-}
-
-func (c *Client4) GetPluginRoute(pluginId string) string {
-	return fmt.Sprintf(c.GetPluginsRoute()+"/%v", pluginId)
-}
-
-func (c *Client4) GetSystemRoute() string {
-	return "/system"
-}
-
-func (c *Client4) GetCloudRoute() string {
-	return "/cloud"
-}
-
-func (c *Client4) GetTestEmailRoute() string {
-	return "/email/test"
-}
-
-func (c *Client4) GetTestSiteURLRoute() string {
-	return "/site_url/test"
-}
-
-func (c *Client4) GetTestS3Route() string {
-	return "/file/s3_test"
-}
-
-func (c *Client4) GetDatabaseRoute() string {
-	return "/database"
-}
-
-func (c *Client4) GetCacheRoute() string {
-	return "/caches"
-}
-
-func (c *Client4) GetClusterRoute() string {
-	return "/cluster"
-}
-
-func (c *Client4) GetIncomingWebhooksRoute() string {
-	return "/hooks/incoming"
-}
-
-func (c *Client4) GetIncomingWebhookRoute(hookID string) string {
-	return fmt.Sprintf(c.GetIncomingWebhooksRoute()+"/%v", hookID)
-}
-
-func (c *Client4) GetComplianceReportsRoute() string {
-	return "/compliance/reports"
-}
-
-func (c *Client4) GetComplianceReportRoute(reportId string) string {
-	return fmt.Sprintf("%s/%s", c.GetComplianceReportsRoute(), reportId)
-}
-
-func (c *Client4) GetComplianceReportDownloadRoute(reportId string) string {
-	return fmt.Sprintf("%s/%s/download", c.GetComplianceReportsRoute(), reportId)
-}
-
-func (c *Client4) GetOutgoingWebhooksRoute() string {
-	return "/hooks/outgoing"
-}
-
-func (c *Client4) GetOutgoingWebhookRoute(hookID string) string {
-	return fmt.Sprintf(c.GetOutgoingWebhooksRoute()+"/%v", hookID)
-}
-
-func (c *Client4) GetPreferencesRoute(userId string) string {
-	return fmt.Sprintf(c.GetUserRoute(userId) + "/preferences")
-}
-
-func (c *Client4) GetUserStatusRoute(userId string) string {
-	return fmt.Sprintf(c.GetUserRoute(userId) + "/status")
-}
-
-func (c *Client4) GetUserStatusesRoute() string {
-	return fmt.Sprintf(c.GetUsersRoute() + "/status")
-}
-
-func (c *Client4) GetSamlRoute() string {
-	return "/saml"
-}
-
-func (c *Client4) GetLdapRoute() string {
-	return "/ldap"
-}
-
-func (c *Client4) GetBrandRoute() string {
-	return "/brand"
-}
-
-func (c *Client4) GetDataRetentionRoute() string {
-	return "/data_retention"
-}
-
-func (c *Client4) GetDataRetentionPolicyRoute(policyID string) string {
-	return fmt.Sprintf(c.GetDataRetentionRoute()+"/policies/%v", policyID)
-}
-
-func (c *Client4) GetElasticsearchRoute() string {
-	return "/elasticsearch"
-}
-
-func (c *Client4) GetBleveRoute() string {
-	return "/bleve"
-}
-
-func (c *Client4) GetCommandsRoute() string {
-	return "/commands"
-}
-
-func (c *Client4) GetCommandRoute(commandId string) string {
-	return fmt.Sprintf(c.GetCommandsRoute()+"/%v", commandId)
-}
-
-func (c *Client4) GetCommandMoveRoute(commandId string) string {
-	return fmt.Sprintf(c.GetCommandsRoute()+"/%v/move", commandId)
-}
-
-func (c *Client4) GetEmojisRoute() string {
-	return "/emoji"
-}
-
-func (c *Client4) GetEmojiRoute(emojiId string) string {
-	return fmt.Sprintf(c.GetEmojisRoute()+"/%v", emojiId)
-}
-
-func (c *Client4) GetEmojiByNameRoute(name string) string {
-	return fmt.Sprintf(c.GetEmojisRoute()+"/name/%v", name)
-}
-
-func (c *Client4) GetReactionsRoute() string {
-	return "/reactions"
-}
-
-func (c *Client4) GetOAuthAppsRoute() string {
-	return "/oauth/apps"
-}
-
-func (c *Client4) GetOAuthAppRoute(appId string) string {
-	return fmt.Sprintf("/oauth/apps/%v", appId)
-}
-
-func (c *Client4) GetOpenGraphRoute() string {
-	return "/opengraph"
-}
-
-func (c *Client4) GetJobsRoute() string {
-	return "/jobs"
-}
-
-func (c *Client4) GetRolesRoute() string {
-	return "/roles"
-}
-
-func (c *Client4) GetSchemesRoute() string {
-	return "/schemes"
-}
-
-func (c *Client4) GetSchemeRoute(id string) string {
-	return c.GetSchemesRoute() + fmt.Sprintf("/%v", id)
-}
-
-func (c *Client4) GetAnalyticsRoute() string {
-	return "/analytics"
-}
-
-func (c *Client4) GetTimezonesRoute() string {
-	return fmt.Sprintf(c.GetSystemRoute() + "/timezones")
-}
-
-func (c *Client4) GetChannelSchemeRoute(channelId string) string {
-	return fmt.Sprintf(c.GetChannelsRoute()+"/%v/scheme", channelId)
-}
-
-func (c *Client4) GetTeamSchemeRoute(teamId string) string {
-	return fmt.Sprintf(c.GetTeamsRoute()+"/%v/scheme", teamId)
-}
-
-func (c *Client4) GetTotalUsersStatsRoute() string {
-	return fmt.Sprintf(c.GetUsersRoute() + "/stats")
-}
-
-func (c *Client4) GetRedirectLocationRoute() string {
-	return "/redirect_location"
-}
-
-func (c *Client4) GetServerBusyRoute() string {
-	return "/server_busy"
-}
-
-func (c *Client4) GetUserTermsOfServiceRoute(userId string) string {
-	return c.GetUserRoute(userId) + "/terms_of_service"
-}
-
-func (c *Client4) GetTermsOfServiceRoute() string {
-	return "/terms_of_service"
-}
-
-func (c *Client4) GetGroupsRoute() string {
-	return "/groups"
-}
-
-func (c *Client4) GetPublishUserTypingRoute(userId string) string {
-	return c.GetUserRoute(userId) + "/typing"
-}
-
-func (c *Client4) GetGroupRoute(groupID string) string {
-	return fmt.Sprintf("%s/%s", c.GetGroupsRoute(), groupID)
-}
-
-func (c *Client4) GetGroupSyncableRoute(groupID, syncableID string, syncableType GroupSyncableType) string {
-	return fmt.Sprintf("%s/%ss/%s", c.GetGroupRoute(groupID), strings.ToLower(syncableType.String()), syncableID)
-}
-
-func (c *Client4) GetGroupSyncablesRoute(groupID string, syncableType GroupSyncableType) string {
-	return fmt.Sprintf("%s/%ss", c.GetGroupRoute(groupID), strings.ToLower(syncableType.String()))
-}
-
-func (c *Client4) GetImportsRoute() string {
-	return "/imports"
-}
-
-func (c *Client4) GetExportsRoute() string {
-	return "/exports"
-}
-
-func (c *Client4) GetExportRoute(name string) string {
-	return fmt.Sprintf(c.GetExportsRoute()+"/%v", name)
-}
-
-func (c *Client4) GetRemoteClusterRoute() string {
-	return "/remotecluster"
-}
-
-func (c *Client4) GetSharedChannelsRoute() string {
-	return "/sharedchannels"
-}
-
-func (c *Client4) GetPermissionsRoute() string {
-	return "/permissions"
-}
-
-func (c *Client4) DoApiGet(url string, etag string) (*http.Response, *AppError) {
-	return c.DoApiRequest(http.MethodGet, c.ApiUrl+url, "", etag)
-}
-
-func (c *Client4) DoApiPost(url string, data string) (*http.Response, *AppError) {
-	return c.DoApiRequest(http.MethodPost, c.ApiUrl+url, data, "")
-}
-
-func (c *Client4) doApiDeleteBytes(url string, data []byte) (*http.Response, *AppError) {
-	return c.doApiRequestBytes(http.MethodDelete, c.ApiUrl+url, data, "")
-}
-
-func (c *Client4) doApiPatchBytes(url string, data []byte) (*http.Response, *AppError) {
-	return c.doApiRequestBytes(http.MethodPatch, c.ApiUrl+url, data, "")
-}
-
-func (c *Client4) doApiPostBytes(url string, data []byte) (*http.Response, *AppError) {
-	return c.doApiRequestBytes(http.MethodPost, c.ApiUrl+url, data, "")
-}
-
-func (c *Client4) DoApiPut(url string, data string) (*http.Response, *AppError) {
-	return c.DoApiRequest(http.MethodPut, c.ApiUrl+url, data, "")
-}
-
-func (c *Client4) doApiPutBytes(url string, data []byte) (*http.Response, *AppError) {
-	return c.doApiRequestBytes(http.MethodPut, c.ApiUrl+url, data, "")
-}
-
-func (c *Client4) DoApiDelete(url string) (*http.Response, *AppError) {
-	return c.DoApiRequest(http.MethodDelete, c.ApiUrl+url, "", "")
-}
-
-func (c *Client4) DoApiRequest(method, url, data, etag string) (*http.Response, *AppError) {
-	return c.doApiRequestReader(method, url, strings.NewReader(data), map[string]string{HEADER_ETAG_CLIENT: etag})
-}
-
-func (c *Client4) DoApiRequestWithHeaders(method, url, data string, headers map[string]string) (*http.Response, *AppError) {
-	return c.doApiRequestReader(method, url, strings.NewReader(data), headers)
-}
-
-func (c *Client4) doApiRequestBytes(method, url string, data []byte, etag string) (*http.Response, *AppError) {
-	return c.doApiRequestReader(method, url, bytes.NewReader(data), map[string]string{HEADER_ETAG_CLIENT: etag})
-}
-
-func (c *Client4) doApiRequestReader(method, url string, data io.Reader, headers map[string]string) (*http.Response, *AppError) {
-	rq, err := http.NewRequest(method, url, data)
-	if err != nil {
-		return nil, NewAppError(url, "model.client.connecting.app_error", nil, err.Error(), http.StatusBadRequest)
-	}
-
-	for k, v := range headers {
-		rq.Header.Set(k, v)
-	}
-
-	if c.AuthToken != "" {
-		rq.Header.Set(HEADER_AUTH, c.AuthType+" "+c.AuthToken)
-	}
-
-	if c.HttpHeader != nil && len(c.HttpHeader) > 0 {
-		for k, v := range c.HttpHeader {
-			rq.Header.Set(k, v)
-		}
-	}
-
-	rp, err := c.HttpClient.Do(rq)
-	if err != nil || rp == nil {
-		return nil, NewAppError(url, "model.client.connecting.app_error", nil, err.Error(), 0)
-	}
-
-	if rp.StatusCode == 304 {
-		return rp, nil
-	}
-
-	if rp.StatusCode >= 300 {
-		defer closeBody(rp)
-		return rp, AppErrorFromJson(rp.Body)
-	}
-
-	return rp, nil
-}
-
-func (c *Client4) DoUploadFile(url string, data []byte, contentType string) (*FileUploadResponse, *Response) {
-	return c.doUploadFile(url, bytes.NewReader(data), contentType, 0)
-}
-
-func (c *Client4) doUploadFile(url string, body io.Reader, contentType string, contentLength int64) (*FileUploadResponse, *Response) {
-	rq, err := http.NewRequest("POST", c.ApiUrl+url, body)
-	if err != nil {
-		return nil, &Response{Error: NewAppError(url, "model.client.connecting.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-	if contentLength != 0 {
-		rq.ContentLength = contentLength
-	}
-	rq.Header.Set("Content-Type", contentType)
-
-	if c.AuthToken != "" {
-		rq.Header.Set(HEADER_AUTH, c.AuthType+" "+c.AuthToken)
-	}
-
-	rp, err := c.HttpClient.Do(rq)
-	if err != nil || rp == nil {
-		return nil, BuildErrorResponse(rp, NewAppError(url, "model.client.connecting.app_error", nil, err.Error(), 0))
-	}
-	defer closeBody(rp)
-
-	if rp.StatusCode >= 300 {
-		return nil, BuildErrorResponse(rp, AppErrorFromJson(rp.Body))
-	}
-
-	return FileUploadResponseFromJson(rp.Body), BuildResponse(rp)
-}
-
-func (c *Client4) DoEmojiUploadFile(url string, data []byte, contentType string) (*Emoji, *Response) {
-	rq, err := http.NewRequest("POST", c.ApiUrl+url, bytes.NewReader(data))
-	if err != nil {
-		return nil, &Response{Error: NewAppError(url, "model.client.connecting.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-	rq.Header.Set("Content-Type", contentType)
-
-	if c.AuthToken != "" {
-		rq.Header.Set(HEADER_AUTH, c.AuthType+" "+c.AuthToken)
-	}
-
-	rp, err := c.HttpClient.Do(rq)
-	if err != nil || rp == nil {
-		return nil, BuildErrorResponse(rp, NewAppError(url, "model.client.connecting.app_error", nil, err.Error(), 0))
-	}
-	defer closeBody(rp)
-
-	if rp.StatusCode >= 300 {
-		return nil, BuildErrorResponse(rp, AppErrorFromJson(rp.Body))
-	}
-
-	return EmojiFromJson(rp.Body), BuildResponse(rp)
-}
-
-func (c *Client4) DoUploadImportTeam(url string, data []byte, contentType string) (map[string]string, *Response) {
-	rq, err := http.NewRequest("POST", c.ApiUrl+url, bytes.NewReader(data))
-	if err != nil {
-		return nil, &Response{Error: NewAppError(url, "model.client.connecting.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-	rq.Header.Set("Content-Type", contentType)
-
-	if c.AuthToken != "" {
-		rq.Header.Set(HEADER_AUTH, c.AuthType+" "+c.AuthToken)
-	}
-
-	rp, err := c.HttpClient.Do(rq)
-	if err != nil || rp == nil {
-		return nil, BuildErrorResponse(rp, NewAppError(url, "model.client.connecting.app_error", nil, err.Error(), 0))
-	}
-	defer closeBody(rp)
-
-	if rp.StatusCode >= 300 {
-		return nil, BuildErrorResponse(rp, AppErrorFromJson(rp.Body))
-	}
-
-	return MapFromJson(rp.Body), BuildResponse(rp)
-}
-
-// CheckStatusOK is a convenience function for checking the standard OK response
-// from the web service.
-func CheckStatusOK(r *http.Response) bool {
-	m := MapFromJson(r.Body)
-	defer closeBody(r)
-
-	if m != nil && m[STATUS] == STATUS_OK {
-		return true
-	}
-
-	return false
-}
-
-// Authentication Section
-
-// LoginById authenticates a user by user id and password.
-func (c *Client4) LoginById(id string, password string) (*User, *Response) {
-	m := make(map[string]string)
-	m["id"] = id
-	m["password"] = password
-	return c.login(m)
-}
-
-// Login authenticates a user by login id, which can be username, email or some sort
-// of SSO identifier based on server configuration, and a password.
-func (c *Client4) Login(loginId string, password string) (*User, *Response) {
-	m := make(map[string]string)
-	m["login_id"] = loginId
-	m["password"] = password
-	return c.login(m)
-}
-
-// LoginByLdap authenticates a user by LDAP id and password.
-func (c *Client4) LoginByLdap(loginId string, password string) (*User, *Response) {
-	m := make(map[string]string)
-	m["login_id"] = loginId
-	m["password"] = password
-	m["ldap_only"] = c.boolString(true)
-	return c.login(m)
-}
-
-// LoginWithDevice authenticates a user by login id (username, email or some sort
-// of SSO identifier based on configuration), password and attaches a device id to
-// the session.
-func (c *Client4) LoginWithDevice(loginId string, password string, deviceId string) (*User, *Response) {
-	m := make(map[string]string)
-	m["login_id"] = loginId
-	m["password"] = password
-	m["device_id"] = deviceId
-	return c.login(m)
-}
-
-// LoginWithMFA logs a user in with a MFA token
-func (c *Client4) LoginWithMFA(loginId, password, mfaToken string) (*User, *Response) {
-	m := make(map[string]string)
-	m["login_id"] = loginId
-	m["password"] = password
-	m["token"] = mfaToken
-	return c.login(m)
-}
-
-func (c *Client4) login(m map[string]string) (*User, *Response) {
-	r, err := c.DoApiPost("/users/login", MapToJson(m))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	c.AuthToken = r.Header.Get(HEADER_TOKEN)
-	c.AuthType = HEADER_BEARER
-	return UserFromJson(r.Body), BuildResponse(r)
-}
-
-// Logout terminates the current user's session.
-func (c *Client4) Logout() (bool, *Response) {
-	r, err := c.DoApiPost("/users/logout", "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	c.AuthToken = ""
-	c.AuthType = HEADER_BEARER
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// SwitchAccountType changes a user's login type from one type to another.
-func (c *Client4) SwitchAccountType(switchRequest *SwitchRequest) (string, *Response) {
-	r, err := c.DoApiPost(c.GetUsersRoute()+"/login/switch", switchRequest.ToJson())
-	if err != nil {
-		return "", BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return MapFromJson(r.Body)["follow_link"], BuildResponse(r)
-}
-
-// User Section
-
-// CreateUser creates a user in the system based on the provided user struct.
-func (c *Client4) CreateUser(user *User) (*User, *Response) {
-	r, err := c.DoApiPost(c.GetUsersRoute(), user.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserFromJson(r.Body), BuildResponse(r)
-}
-
-// CreateUserWithToken creates a user in the system based on the provided tokenId.
-func (c *Client4) CreateUserWithToken(user *User, tokenId string) (*User, *Response) {
-	if tokenId == "" {
-		err := NewAppError("MissingHashOrData", "api.user.create_user.missing_token.app_error", nil, "", http.StatusBadRequest)
-		return nil, &Response{StatusCode: err.StatusCode, Error: err}
-	}
-
-	query := fmt.Sprintf("?t=%v", tokenId)
-	r, err := c.DoApiPost(c.GetUsersRoute()+query, user.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-
-	return UserFromJson(r.Body), BuildResponse(r)
-}
-
-// CreateUserWithInviteId creates a user in the system based on the provided invited id.
-func (c *Client4) CreateUserWithInviteId(user *User, inviteId string) (*User, *Response) {
-	if inviteId == "" {
-		err := NewAppError("MissingInviteId", "api.user.create_user.missing_invite_id.app_error", nil, "", http.StatusBadRequest)
-		return nil, &Response{StatusCode: err.StatusCode, Error: err}
-	}
-
-	query := fmt.Sprintf("?iid=%v", url.QueryEscape(inviteId))
-	r, err := c.DoApiPost(c.GetUsersRoute()+query, user.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-
-	return UserFromJson(r.Body), BuildResponse(r)
-}
-
-// GetMe returns the logged in user.
-func (c *Client4) GetMe(etag string) (*User, *Response) {
-	r, err := c.DoApiGet(c.GetUserRoute(ME), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUser returns a user based on the provided user id string.
-func (c *Client4) GetUser(userId, etag string) (*User, *Response) {
-	r, err := c.DoApiGet(c.GetUserRoute(userId), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUserByUsername returns a user based on the provided user name string.
-func (c *Client4) GetUserByUsername(userName, etag string) (*User, *Response) {
-	r, err := c.DoApiGet(c.GetUserByUsernameRoute(userName), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUserByEmail returns a user based on the provided user email string.
-func (c *Client4) GetUserByEmail(email, etag string) (*User, *Response) {
-	r, err := c.DoApiGet(c.GetUserByEmailRoute(email), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserFromJson(r.Body), BuildResponse(r)
-}
-
-// AutocompleteUsersInTeam returns the users on a team based on search term.
-func (c *Client4) AutocompleteUsersInTeam(teamId string, username string, limit int, etag string) (*UserAutocomplete, *Response) {
-	query := fmt.Sprintf("?in_team=%v&name=%v&limit=%d", teamId, username, limit)
-	r, err := c.DoApiGet(c.GetUsersRoute()+"/autocomplete"+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserAutocompleteFromJson(r.Body), BuildResponse(r)
-}
-
-// AutocompleteUsersInChannel returns the users in a channel based on search term.
-func (c *Client4) AutocompleteUsersInChannel(teamId string, channelId string, username string, limit int, etag string) (*UserAutocomplete, *Response) {
-	query := fmt.Sprintf("?in_team=%v&in_channel=%v&name=%v&limit=%d", teamId, channelId, username, limit)
-	r, err := c.DoApiGet(c.GetUsersRoute()+"/autocomplete"+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserAutocompleteFromJson(r.Body), BuildResponse(r)
-}
-
-// AutocompleteUsers returns the users in the system based on search term.
-func (c *Client4) AutocompleteUsers(username string, limit int, etag string) (*UserAutocomplete, *Response) {
-	query := fmt.Sprintf("?name=%v&limit=%d", username, limit)
-	r, err := c.DoApiGet(c.GetUsersRoute()+"/autocomplete"+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserAutocompleteFromJson(r.Body), BuildResponse(r)
-}
-
-// GetDefaultProfileImage gets the default user's profile image. Must be logged in.
-func (c *Client4) GetDefaultProfileImage(userId string) ([]byte, *Response) {
-	r, appErr := c.DoApiGet(c.GetUserRoute(userId)+"/image/default", "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	data, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("GetDefaultProfileImage", "model.client.read_file.app_error", nil, err.Error(), r.StatusCode))
-	}
-
-	return data, BuildResponse(r)
-}
-
-// GetProfileImage gets user's profile image. Must be logged in.
-func (c *Client4) GetProfileImage(userId, etag string) ([]byte, *Response) {
-	r, appErr := c.DoApiGet(c.GetUserRoute(userId)+"/image", etag)
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	data, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("GetProfileImage", "model.client.read_file.app_error", nil, err.Error(), r.StatusCode))
-	}
-	return data, BuildResponse(r)
-}
-
-// GetUsers returns a page of users on the system. Page counting starts at 0.
-func (c *Client4) GetUsers(page int, perPage int, etag string) ([]*User, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetUsersRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUsersInTeam returns a page of users on a team. Page counting starts at 0.
-func (c *Client4) GetUsersInTeam(teamId string, page int, perPage int, etag string) ([]*User, *Response) {
-	query := fmt.Sprintf("?in_team=%v&page=%v&per_page=%v", teamId, page, perPage)
-	r, err := c.DoApiGet(c.GetUsersRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetNewUsersInTeam returns a page of users on a team. Page counting starts at 0.
-func (c *Client4) GetNewUsersInTeam(teamId string, page int, perPage int, etag string) ([]*User, *Response) {
-	query := fmt.Sprintf("?sort=create_at&in_team=%v&page=%v&per_page=%v", teamId, page, perPage)
-	r, err := c.DoApiGet(c.GetUsersRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetRecentlyActiveUsersInTeam returns a page of users on a team. Page counting starts at 0.
-func (c *Client4) GetRecentlyActiveUsersInTeam(teamId string, page int, perPage int, etag string) ([]*User, *Response) {
-	query := fmt.Sprintf("?sort=last_activity_at&in_team=%v&page=%v&per_page=%v", teamId, page, perPage)
-	r, err := c.DoApiGet(c.GetUsersRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetActiveUsersInTeam returns a page of users on a team. Page counting starts at 0.
-func (c *Client4) GetActiveUsersInTeam(teamId string, page int, perPage int, etag string) ([]*User, *Response) {
-	query := fmt.Sprintf("?active=true&in_team=%v&page=%v&per_page=%v", teamId, page, perPage)
-	r, err := c.DoApiGet(c.GetUsersRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUsersNotInTeam returns a page of users who are not in a team. Page counting starts at 0.
-func (c *Client4) GetUsersNotInTeam(teamId string, page int, perPage int, etag string) ([]*User, *Response) {
-	query := fmt.Sprintf("?not_in_team=%v&page=%v&per_page=%v", teamId, page, perPage)
-	r, err := c.DoApiGet(c.GetUsersRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUsersInChannel returns a page of users in a channel. Page counting starts at 0.
-func (c *Client4) GetUsersInChannel(channelId string, page int, perPage int, etag string) ([]*User, *Response) {
-	query := fmt.Sprintf("?in_channel=%v&page=%v&per_page=%v", channelId, page, perPage)
-	r, err := c.DoApiGet(c.GetUsersRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUsersInChannelByStatus returns a page of users in a channel. Page counting starts at 0. Sorted by Status
-func (c *Client4) GetUsersInChannelByStatus(channelId string, page int, perPage int, etag string) ([]*User, *Response) {
-	query := fmt.Sprintf("?in_channel=%v&page=%v&per_page=%v&sort=status", channelId, page, perPage)
-	r, err := c.DoApiGet(c.GetUsersRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUsersNotInChannel returns a page of users not in a channel. Page counting starts at 0.
-func (c *Client4) GetUsersNotInChannel(teamId, channelId string, page int, perPage int, etag string) ([]*User, *Response) {
-	query := fmt.Sprintf("?in_team=%v&not_in_channel=%v&page=%v&per_page=%v", teamId, channelId, page, perPage)
-	r, err := c.DoApiGet(c.GetUsersRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUsersWithoutTeam returns a page of users on the system that aren't on any teams. Page counting starts at 0.
-func (c *Client4) GetUsersWithoutTeam(page int, perPage int, etag string) ([]*User, *Response) {
-	query := fmt.Sprintf("?without_team=1&page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetUsersRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUsersInGroup returns a page of users in a group. Page counting starts at 0.
-func (c *Client4) GetUsersInGroup(groupID string, page int, perPage int, etag string) ([]*User, *Response) {
-	query := fmt.Sprintf("?in_group=%v&page=%v&per_page=%v", groupID, page, perPage)
-	r, err := c.DoApiGet(c.GetUsersRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUsersByIds returns a list of users based on the provided user ids.
-func (c *Client4) GetUsersByIds(userIds []string) ([]*User, *Response) {
-	r, err := c.DoApiPost(c.GetUsersRoute()+"/ids", ArrayToJson(userIds))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUsersByIds returns a list of users based on the provided user ids.
-func (c *Client4) GetUsersByIdsWithOptions(userIds []string, options *UserGetByIdsOptions) ([]*User, *Response) {
-	v := url.Values{}
-	if options.Since != 0 {
-		v.Set("since", fmt.Sprintf("%d", options.Since))
-	}
-
-	url := c.GetUsersRoute() + "/ids"
-	if len(v) > 0 {
-		url += "?" + v.Encode()
-	}
-
-	r, err := c.DoApiPost(url, ArrayToJson(userIds))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUsersByUsernames returns a list of users based on the provided usernames.
-func (c *Client4) GetUsersByUsernames(usernames []string) ([]*User, *Response) {
-	r, err := c.DoApiPost(c.GetUsersRoute()+"/usernames", ArrayToJson(usernames))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUsersByGroupChannelIds returns a map with channel ids as keys
-// and a list of users as values based on the provided user ids.
-func (c *Client4) GetUsersByGroupChannelIds(groupChannelIds []string) (map[string][]*User, *Response) {
-	r, err := c.DoApiPost(c.GetUsersRoute()+"/group_channels", ArrayToJson(groupChannelIds))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-
-	usersByChannelId := map[string][]*User{}
-	json.NewDecoder(r.Body).Decode(&usersByChannelId)
-	return usersByChannelId, BuildResponse(r)
-}
-
-// SearchUsers returns a list of users based on some search criteria.
-func (c *Client4) SearchUsers(search *UserSearch) ([]*User, *Response) {
-	r, err := c.doApiPostBytes(c.GetUsersRoute()+"/search", search.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserListFromJson(r.Body), BuildResponse(r)
-}
-
-// UpdateUser updates a user in the system based on the provided user struct.
-func (c *Client4) UpdateUser(user *User) (*User, *Response) {
-	r, err := c.DoApiPut(c.GetUserRoute(user.Id), user.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserFromJson(r.Body), BuildResponse(r)
-}
-
-// PatchUser partially updates a user in the system. Any missing fields are not updated.
-func (c *Client4) PatchUser(userId string, patch *UserPatch) (*User, *Response) {
-	r, err := c.DoApiPut(c.GetUserRoute(userId)+"/patch", patch.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserFromJson(r.Body), BuildResponse(r)
-}
-
-// UpdateUserAuth updates a user AuthData (uthData, authService and password) in the system.
-func (c *Client4) UpdateUserAuth(userId string, userAuth *UserAuth) (*UserAuth, *Response) {
-	r, err := c.DoApiPut(c.GetUserRoute(userId)+"/auth", userAuth.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserAuthFromJson(r.Body), BuildResponse(r)
-}
-
-// UpdateUserMfa activates multi-factor authentication for a user if activate
-// is true and a valid code is provided. If activate is false, then code is not
-// required and multi-factor authentication is disabled for the user.
-func (c *Client4) UpdateUserMfa(userId, code string, activate bool) (bool, *Response) {
-	requestBody := make(map[string]interface{})
-	requestBody["activate"] = activate
-	requestBody["code"] = code
-
-	r, err := c.DoApiPut(c.GetUserRoute(userId)+"/mfa", StringInterfaceToJson(requestBody))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// CheckUserMfa checks whether a user has MFA active on their account or not based on the
-// provided login id.
-// Deprecated: Clients should use Login method and check for MFA Error
-func (c *Client4) CheckUserMfa(loginId string) (bool, *Response) {
-	requestBody := make(map[string]interface{})
-	requestBody["login_id"] = loginId
-	r, err := c.DoApiPost(c.GetUsersRoute()+"/mfa", StringInterfaceToJson(requestBody))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-
-	data := StringInterfaceFromJson(r.Body)
-	mfaRequired, ok := data["mfa_required"].(bool)
-	if !ok {
-		return false, BuildResponse(r)
-	}
-	return mfaRequired, BuildResponse(r)
-}
-
-// GenerateMfaSecret will generate a new MFA secret for a user and return it as a string and
-// as a base64 encoded image QR code.
-func (c *Client4) GenerateMfaSecret(userId string) (*MfaSecret, *Response) {
-	r, err := c.DoApiPost(c.GetUserRoute(userId)+"/mfa/generate", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return MfaSecretFromJson(r.Body), BuildResponse(r)
-}
-
-// UpdateUserPassword updates a user's password. Must be logged in as the user or be a system administrator.
-func (c *Client4) UpdateUserPassword(userId, currentPassword, newPassword string) (bool, *Response) {
-	requestBody := map[string]string{"current_password": currentPassword, "new_password": newPassword}
-	r, err := c.DoApiPut(c.GetUserRoute(userId)+"/password", MapToJson(requestBody))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// UpdateUserHashedPassword updates a user's password with an already-hashed password. Must be a system administrator.
-func (c *Client4) UpdateUserHashedPassword(userId, newHashedPassword string) (bool, *Response) {
-	requestBody := map[string]string{"already_hashed": "true", "new_password": newHashedPassword}
-	r, err := c.DoApiPut(c.GetUserRoute(userId)+"/password", MapToJson(requestBody))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// PromoteGuestToUser convert a guest into a regular user
-func (c *Client4) PromoteGuestToUser(guestId string) (bool, *Response) {
-	r, err := c.DoApiPost(c.GetUserRoute(guestId)+"/promote", "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// DemoteUserToGuest convert a regular user into a guest
-func (c *Client4) DemoteUserToGuest(guestId string) (bool, *Response) {
-	r, err := c.DoApiPost(c.GetUserRoute(guestId)+"/demote", "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// UpdateUserRoles updates a user's roles in the system. A user can have "system_user" and "system_admin" roles.
-func (c *Client4) UpdateUserRoles(userId, roles string) (bool, *Response) {
-	requestBody := map[string]string{"roles": roles}
-	r, err := c.DoApiPut(c.GetUserRoute(userId)+"/roles", MapToJson(requestBody))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// UpdateUserActive updates status of a user whether active or not.
-func (c *Client4) UpdateUserActive(userId string, active bool) (bool, *Response) {
-	requestBody := make(map[string]interface{})
-	requestBody["active"] = active
-	r, err := c.DoApiPut(c.GetUserRoute(userId)+"/active", StringInterfaceToJson(requestBody))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// DeleteUser deactivates a user in the system based on the provided user id string.
-func (c *Client4) DeleteUser(userId string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetUserRoute(userId))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// PermanentDeleteUser deletes a user in the system based on the provided user id string.
-func (c *Client4) PermanentDeleteUser(userId string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetUserRoute(userId) + "?permanent=" + c.boolString(true))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// ConvertUserToBot converts a user to a bot user.
-func (c *Client4) ConvertUserToBot(userId string) (*Bot, *Response) {
-	r, err := c.DoApiPost(c.GetUserRoute(userId)+"/convert_to_bot", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return BotFromJson(r.Body), BuildResponse(r)
-}
-
-// ConvertBotToUser converts a bot user to a user.
-func (c *Client4) ConvertBotToUser(userId string, userPatch *UserPatch, setSystemAdmin bool) (*User, *Response) {
-	var query string
-	if setSystemAdmin {
-		query = "?set_system_admin=true"
-	}
-	r, err := c.DoApiPost(c.GetBotRoute(userId)+"/convert_to_user"+query, userPatch.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserFromJson(r.Body), BuildResponse(r)
-}
-
-// PermanentDeleteAll permanently deletes all users in the system. This is a local only endpoint
-func (c *Client4) PermanentDeleteAllUsers() (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetUsersRoute())
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// SendPasswordResetEmail will send a link for password resetting to a user with the
-// provided email.
-func (c *Client4) SendPasswordResetEmail(email string) (bool, *Response) {
-	requestBody := map[string]string{"email": email}
-	r, err := c.DoApiPost(c.GetUsersRoute()+"/password/reset/send", MapToJson(requestBody))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// ResetPassword uses a recovery code to update reset a user's password.
-func (c *Client4) ResetPassword(token, newPassword string) (bool, *Response) {
-	requestBody := map[string]string{"token": token, "new_password": newPassword}
-	r, err := c.DoApiPost(c.GetUsersRoute()+"/password/reset", MapToJson(requestBody))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetSessions returns a list of sessions based on the provided user id string.
-func (c *Client4) GetSessions(userId, etag string) ([]*Session, *Response) {
-	r, err := c.DoApiGet(c.GetUserRoute(userId)+"/sessions", etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return SessionsFromJson(r.Body), BuildResponse(r)
-}
-
-// RevokeSession revokes a user session based on the provided user id and session id strings.
-func (c *Client4) RevokeSession(userId, sessionId string) (bool, *Response) {
-	requestBody := map[string]string{"session_id": sessionId}
-	r, err := c.DoApiPost(c.GetUserRoute(userId)+"/sessions/revoke", MapToJson(requestBody))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// RevokeAllSessions revokes all sessions for the provided user id string.
-func (c *Client4) RevokeAllSessions(userId string) (bool, *Response) {
-	r, err := c.DoApiPost(c.GetUserRoute(userId)+"/sessions/revoke/all", "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// RevokeAllSessions revokes all sessions for all the users.
-func (c *Client4) RevokeSessionsFromAllUsers() (bool, *Response) {
-	r, err := c.DoApiPost(c.GetUsersRoute()+"/sessions/revoke/all", "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// AttachDeviceId attaches a mobile device ID to the current session.
-func (c *Client4) AttachDeviceId(deviceId string) (bool, *Response) {
-	requestBody := map[string]string{"device_id": deviceId}
-	r, err := c.DoApiPut(c.GetUsersRoute()+"/sessions/device", MapToJson(requestBody))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetTeamsUnreadForUser will return an array with TeamUnread objects that contain the amount
-// of unread messages and mentions the current user has for the teams it belongs to.
-// An optional team ID can be set to exclude that team from the results.
-// An optional boolean can be set to include collapsed thread unreads. Must be authenticated.
-func (c *Client4) GetTeamsUnreadForUser(userId, teamIdToExclude string, includeCollapsedThreads bool) ([]*TeamUnread, *Response) {
-	query := url.Values{}
-
-	if teamIdToExclude != "" {
-		query.Set("exclude_team", teamIdToExclude)
-	}
-
-	if includeCollapsedThreads {
-		query.Set("include_collapsed_threads", "true")
-	}
-
-	r, err := c.DoApiGet(c.GetUserRoute(userId)+"/teams/unread?"+query.Encode(), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamsUnreadFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUserAudits returns a list of audit based on the provided user id string.
-func (c *Client4) GetUserAudits(userId string, page int, perPage int, etag string) (Audits, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetUserRoute(userId)+"/audits"+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return AuditsFromJson(r.Body), BuildResponse(r)
-}
-
-// VerifyUserEmail will verify a user's email using the supplied token.
-func (c *Client4) VerifyUserEmail(token string) (bool, *Response) {
-	requestBody := map[string]string{"token": token}
-	r, err := c.DoApiPost(c.GetUsersRoute()+"/email/verify", MapToJson(requestBody))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// VerifyUserEmailWithoutToken will verify a user's email by its Id. (Requires manage system role)
-func (c *Client4) VerifyUserEmailWithoutToken(userId string) (*User, *Response) {
-	r, err := c.DoApiPost(c.GetUserRoute(userId)+"/email/verify/member", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserFromJson(r.Body), BuildResponse(r)
-}
-
-// SendVerificationEmail will send an email to the user with the provided email address, if
-// that user exists. The email will contain a link that can be used to verify the user's
-// email address.
-func (c *Client4) SendVerificationEmail(email string) (bool, *Response) {
-	requestBody := map[string]string{"email": email}
-	r, err := c.DoApiPost(c.GetUsersRoute()+"/email/verify/send", MapToJson(requestBody))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// SetDefaultProfileImage resets the profile image to a default generated one.
-func (c *Client4) SetDefaultProfileImage(userId string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetUserRoute(userId) + "/image")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// SetProfileImage sets profile image of the user.
-func (c *Client4) SetProfileImage(userId string, data []byte) (bool, *Response) {
-	body := &bytes.Buffer{}
-	writer := multipart.NewWriter(body)
-
-	part, err := writer.CreateFormFile("image", "profile.png")
-	if err != nil {
-		return false, &Response{Error: NewAppError("SetProfileImage", "model.client.set_profile_user.no_file.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	if _, err = io.Copy(part, bytes.NewBuffer(data)); err != nil {
-		return false, &Response{Error: NewAppError("SetProfileImage", "model.client.set_profile_user.no_file.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	if err = writer.Close(); err != nil {
-		return false, &Response{Error: NewAppError("SetProfileImage", "model.client.set_profile_user.writer.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	rq, err := http.NewRequest("POST", c.ApiUrl+c.GetUserRoute(userId)+"/image", bytes.NewReader(body.Bytes()))
-	if err != nil {
-		return false, &Response{Error: NewAppError("SetProfileImage", "model.client.connecting.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-	rq.Header.Set("Content-Type", writer.FormDataContentType())
-
-	if c.AuthToken != "" {
-		rq.Header.Set(HEADER_AUTH, c.AuthType+" "+c.AuthToken)
-	}
-
-	rp, err := c.HttpClient.Do(rq)
-	if err != nil || rp == nil {
-		return false, &Response{StatusCode: http.StatusForbidden, Error: NewAppError(c.GetUserRoute(userId)+"/image", "model.client.connecting.app_error", nil, err.Error(), http.StatusForbidden)}
-	}
-	defer closeBody(rp)
-
-	if rp.StatusCode >= 300 {
-		return false, BuildErrorResponse(rp, AppErrorFromJson(rp.Body))
-	}
-
-	return CheckStatusOK(rp), BuildResponse(rp)
-}
-
-// CreateUserAccessToken will generate a user access token that can be used in place
-// of a session token to access the REST API. Must have the 'create_user_access_token'
-// permission and if generating for another user, must have the 'edit_other_users'
-// permission. A non-blank description is required.
-func (c *Client4) CreateUserAccessToken(userId, description string) (*UserAccessToken, *Response) {
-	requestBody := map[string]string{"description": description}
-	r, err := c.DoApiPost(c.GetUserRoute(userId)+"/tokens", MapToJson(requestBody))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserAccessTokenFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUserAccessTokens will get a page of access tokens' id, description, is_active
-// and the user_id in the system. The actual token will not be returned. Must have
-// the 'manage_system' permission.
-func (c *Client4) GetUserAccessTokens(page int, perPage int) ([]*UserAccessToken, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetUserAccessTokensRoute()+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserAccessTokenListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUserAccessToken will get a user access tokens' id, description, is_active
-// and the user_id of the user it is for. The actual token will not be returned.
-// Must have the 'read_user_access_token' permission and if getting for another
-// user, must have the 'edit_other_users' permission.
-func (c *Client4) GetUserAccessToken(tokenId string) (*UserAccessToken, *Response) {
-	r, err := c.DoApiGet(c.GetUserAccessTokenRoute(tokenId), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserAccessTokenFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUserAccessTokensForUser will get a paged list of user access tokens showing id,
-// description and user_id for each. The actual tokens will not be returned. Must have
-// the 'read_user_access_token' permission and if getting for another user, must have the
-// 'edit_other_users' permission.
-func (c *Client4) GetUserAccessTokensForUser(userId string, page, perPage int) ([]*UserAccessToken, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetUserRoute(userId)+"/tokens"+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserAccessTokenListFromJson(r.Body), BuildResponse(r)
-}
-
-// RevokeUserAccessToken will revoke a user access token by id. Must have the
-// 'revoke_user_access_token' permission and if revoking for another user, must have the
-// 'edit_other_users' permission.
-func (c *Client4) RevokeUserAccessToken(tokenId string) (bool, *Response) {
-	requestBody := map[string]string{"token_id": tokenId}
-	r, err := c.DoApiPost(c.GetUsersRoute()+"/tokens/revoke", MapToJson(requestBody))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// SearchUserAccessTokens returns user access tokens matching the provided search term.
-func (c *Client4) SearchUserAccessTokens(search *UserAccessTokenSearch) ([]*UserAccessToken, *Response) {
-	r, err := c.DoApiPost(c.GetUsersRoute()+"/tokens/search", search.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserAccessTokenListFromJson(r.Body), BuildResponse(r)
-}
-
-// DisableUserAccessToken will disable a user access token by id. Must have the
-// 'revoke_user_access_token' permission and if disabling for another user, must have the
-// 'edit_other_users' permission.
-func (c *Client4) DisableUserAccessToken(tokenId string) (bool, *Response) {
-	requestBody := map[string]string{"token_id": tokenId}
-	r, err := c.DoApiPost(c.GetUsersRoute()+"/tokens/disable", MapToJson(requestBody))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// EnableUserAccessToken will enable a user access token by id. Must have the
-// 'create_user_access_token' permission and if enabling for another user, must have the
-// 'edit_other_users' permission.
-func (c *Client4) EnableUserAccessToken(tokenId string) (bool, *Response) {
-	requestBody := map[string]string{"token_id": tokenId}
-	r, err := c.DoApiPost(c.GetUsersRoute()+"/tokens/enable", MapToJson(requestBody))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// Bots section
-
-// CreateBot creates a bot in the system based on the provided bot struct.
-func (c *Client4) CreateBot(bot *Bot) (*Bot, *Response) {
-	r, err := c.doApiPostBytes(c.GetBotsRoute(), bot.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return BotFromJson(r.Body), BuildResponse(r)
-}
-
-// PatchBot partially updates a bot. Any missing fields are not updated.
-func (c *Client4) PatchBot(userId string, patch *BotPatch) (*Bot, *Response) {
-	r, err := c.doApiPutBytes(c.GetBotRoute(userId), patch.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return BotFromJson(r.Body), BuildResponse(r)
-}
-
-// GetBot fetches the given, undeleted bot.
-func (c *Client4) GetBot(userId string, etag string) (*Bot, *Response) {
-	r, err := c.DoApiGet(c.GetBotRoute(userId), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return BotFromJson(r.Body), BuildResponse(r)
-}
-
-// GetBot fetches the given bot, even if it is deleted.
-func (c *Client4) GetBotIncludeDeleted(userId string, etag string) (*Bot, *Response) {
-	r, err := c.DoApiGet(c.GetBotRoute(userId)+"?include_deleted="+c.boolString(true), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return BotFromJson(r.Body), BuildResponse(r)
-}
-
-// GetBots fetches the given page of bots, excluding deleted.
-func (c *Client4) GetBots(page, perPage int, etag string) ([]*Bot, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetBotsRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return BotListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetBotsIncludeDeleted fetches the given page of bots, including deleted.
-func (c *Client4) GetBotsIncludeDeleted(page, perPage int, etag string) ([]*Bot, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v&include_deleted="+c.boolString(true), page, perPage)
-	r, err := c.DoApiGet(c.GetBotsRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return BotListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetBotsOrphaned fetches the given page of bots, only including orphanded bots.
-func (c *Client4) GetBotsOrphaned(page, perPage int, etag string) ([]*Bot, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v&only_orphaned="+c.boolString(true), page, perPage)
-	r, err := c.DoApiGet(c.GetBotsRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return BotListFromJson(r.Body), BuildResponse(r)
-}
-
-// DisableBot disables the given bot in the system.
-func (c *Client4) DisableBot(botUserId string) (*Bot, *Response) {
-	r, err := c.doApiPostBytes(c.GetBotRoute(botUserId)+"/disable", nil)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return BotFromJson(r.Body), BuildResponse(r)
-}
-
-// EnableBot disables the given bot in the system.
-func (c *Client4) EnableBot(botUserId string) (*Bot, *Response) {
-	r, err := c.doApiPostBytes(c.GetBotRoute(botUserId)+"/enable", nil)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return BotFromJson(r.Body), BuildResponse(r)
-}
-
-// AssignBot assigns the given bot to the given user
-func (c *Client4) AssignBot(botUserId, newOwnerId string) (*Bot, *Response) {
-	r, err := c.doApiPostBytes(c.GetBotRoute(botUserId)+"/assign/"+newOwnerId, nil)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return BotFromJson(r.Body), BuildResponse(r)
-}
-
-// SetBotIconImage sets LHS bot icon image.
-func (c *Client4) SetBotIconImage(botUserId string, data []byte) (bool, *Response) {
-	body := &bytes.Buffer{}
-	writer := multipart.NewWriter(body)
-
-	part, err := writer.CreateFormFile("image", "icon.svg")
-	if err != nil {
-		return false, &Response{Error: NewAppError("SetBotIconImage", "model.client.set_bot_icon_image.no_file.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	if _, err = io.Copy(part, bytes.NewBuffer(data)); err != nil {
-		return false, &Response{Error: NewAppError("SetBotIconImage", "model.client.set_bot_icon_image.no_file.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	if err = writer.Close(); err != nil {
-		return false, &Response{Error: NewAppError("SetBotIconImage", "model.client.set_bot_icon_image.writer.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	rq, err := http.NewRequest("POST", c.ApiUrl+c.GetBotRoute(botUserId)+"/icon", bytes.NewReader(body.Bytes()))
-	if err != nil {
-		return false, &Response{Error: NewAppError("SetBotIconImage", "model.client.connecting.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-	rq.Header.Set("Content-Type", writer.FormDataContentType())
-
-	if c.AuthToken != "" {
-		rq.Header.Set(HEADER_AUTH, c.AuthType+" "+c.AuthToken)
-	}
-
-	rp, err := c.HttpClient.Do(rq)
-	if err != nil || rp == nil {
-		return false, &Response{StatusCode: http.StatusForbidden, Error: NewAppError(c.GetBotRoute(botUserId)+"/icon", "model.client.connecting.app_error", nil, err.Error(), http.StatusForbidden)}
-	}
-	defer closeBody(rp)
-
-	if rp.StatusCode >= 300 {
-		return false, BuildErrorResponse(rp, AppErrorFromJson(rp.Body))
-	}
-
-	return CheckStatusOK(rp), BuildResponse(rp)
-}
-
-// GetBotIconImage gets LHS bot icon image. Must be logged in.
-func (c *Client4) GetBotIconImage(botUserId string) ([]byte, *Response) {
-	r, appErr := c.DoApiGet(c.GetBotRoute(botUserId)+"/icon", "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	data, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("GetBotIconImage", "model.client.read_file.app_error", nil, err.Error(), r.StatusCode))
-	}
-	return data, BuildResponse(r)
-}
-
-// DeleteBotIconImage deletes LHS bot icon image. Must be logged in.
-func (c *Client4) DeleteBotIconImage(botUserId string) (bool, *Response) {
-	r, appErr := c.DoApiDelete(c.GetBotRoute(botUserId) + "/icon")
-	if appErr != nil {
-		return false, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// Team Section
-
-// CreateTeam creates a team in the system based on the provided team struct.
-func (c *Client4) CreateTeam(team *Team) (*Team, *Response) {
-	r, err := c.DoApiPost(c.GetTeamsRoute(), team.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamFromJson(r.Body), BuildResponse(r)
-}
-
-// GetTeam returns a team based on the provided team id string.
-func (c *Client4) GetTeam(teamId, etag string) (*Team, *Response) {
-	r, err := c.DoApiGet(c.GetTeamRoute(teamId), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamFromJson(r.Body), BuildResponse(r)
-}
-
-// GetAllTeams returns all teams based on permissions.
-func (c *Client4) GetAllTeams(etag string, page int, perPage int) ([]*Team, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetTeamsRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetAllTeamsWithTotalCount returns all teams based on permissions.
-func (c *Client4) GetAllTeamsWithTotalCount(etag string, page int, perPage int) ([]*Team, int64, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v&include_total_count="+c.boolString(true), page, perPage)
-	r, err := c.DoApiGet(c.GetTeamsRoute()+query, etag)
-	if err != nil {
-		return nil, 0, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	teamsListWithCount := TeamsWithCountFromJson(r.Body)
-	return teamsListWithCount.Teams, teamsListWithCount.TotalCount, BuildResponse(r)
-}
-
-// GetAllTeamsExcludePolicyConstrained returns all teams which are not part of a data retention policy.
-// Must be a system administrator.
-func (c *Client4) GetAllTeamsExcludePolicyConstrained(etag string, page int, perPage int) ([]*Team, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v&exclude_policy_constrained=%v", page, perPage, true)
-	r, err := c.DoApiGet(c.GetTeamsRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetTeamByName returns a team based on the provided team name string.
-func (c *Client4) GetTeamByName(name, etag string) (*Team, *Response) {
-	r, err := c.DoApiGet(c.GetTeamByNameRoute(name), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamFromJson(r.Body), BuildResponse(r)
-}
-
-// SearchTeams returns teams matching the provided search term.
-func (c *Client4) SearchTeams(search *TeamSearch) ([]*Team, *Response) {
-	r, err := c.DoApiPost(c.GetTeamsRoute()+"/search", search.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamListFromJson(r.Body), BuildResponse(r)
-}
-
-// SearchTeamsPaged returns a page of teams and the total count matching the provided search term.
-func (c *Client4) SearchTeamsPaged(search *TeamSearch) ([]*Team, int64, *Response) {
-	if search.Page == nil {
-		search.Page = NewInt(0)
-	}
-	if search.PerPage == nil {
-		search.PerPage = NewInt(100)
-	}
-	r, err := c.DoApiPost(c.GetTeamsRoute()+"/search", search.ToJson())
-	if err != nil {
-		return nil, 0, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	twc := TeamsWithCountFromJson(r.Body)
-	return twc.Teams, twc.TotalCount, BuildResponse(r)
-}
-
-// TeamExists returns true or false if the team exist or not.
-func (c *Client4) TeamExists(name, etag string) (bool, *Response) {
-	r, err := c.DoApiGet(c.GetTeamByNameRoute(name)+"/exists", etag)
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return MapBoolFromJson(r.Body)["exists"], BuildResponse(r)
-}
-
-// GetTeamsForUser returns a list of teams a user is on. Must be logged in as the user
-// or be a system administrator.
-func (c *Client4) GetTeamsForUser(userId, etag string) ([]*Team, *Response) {
-	r, err := c.DoApiGet(c.GetUserRoute(userId)+"/teams", etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetTeamMember returns a team member based on the provided team and user id strings.
-func (c *Client4) GetTeamMember(teamId, userId, etag string) (*TeamMember, *Response) {
-	r, err := c.DoApiGet(c.GetTeamMemberRoute(teamId, userId), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamMemberFromJson(r.Body), BuildResponse(r)
-}
-
-// UpdateTeamMemberRoles will update the roles on a team for a user.
-func (c *Client4) UpdateTeamMemberRoles(teamId, userId, newRoles string) (bool, *Response) {
-	requestBody := map[string]string{"roles": newRoles}
-	r, err := c.DoApiPut(c.GetTeamMemberRoute(teamId, userId)+"/roles", MapToJson(requestBody))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// UpdateTeamMemberSchemeRoles will update the scheme-derived roles on a team for a user.
-func (c *Client4) UpdateTeamMemberSchemeRoles(teamId string, userId string, schemeRoles *SchemeRoles) (bool, *Response) {
-	r, err := c.DoApiPut(c.GetTeamMemberRoute(teamId, userId)+"/schemeRoles", schemeRoles.ToJson())
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// UpdateTeam will update a team.
-func (c *Client4) UpdateTeam(team *Team) (*Team, *Response) {
-	r, err := c.DoApiPut(c.GetTeamRoute(team.Id), team.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamFromJson(r.Body), BuildResponse(r)
-}
-
-// PatchTeam partially updates a team. Any missing fields are not updated.
-func (c *Client4) PatchTeam(teamId string, patch *TeamPatch) (*Team, *Response) {
-	r, err := c.DoApiPut(c.GetTeamRoute(teamId)+"/patch", patch.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamFromJson(r.Body), BuildResponse(r)
-}
-
-// RestoreTeam restores a previously deleted team.
-func (c *Client4) RestoreTeam(teamId string) (*Team, *Response) {
-	r, err := c.DoApiPost(c.GetTeamRoute(teamId)+"/restore", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamFromJson(r.Body), BuildResponse(r)
-}
-
-// RegenerateTeamInviteId requests a new invite ID to be generated.
-func (c *Client4) RegenerateTeamInviteId(teamId string) (*Team, *Response) {
-	r, err := c.DoApiPost(c.GetTeamRoute(teamId)+"/regenerate_invite_id", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamFromJson(r.Body), BuildResponse(r)
-}
-
-// SoftDeleteTeam deletes the team softly (archive only, not permanent delete).
-func (c *Client4) SoftDeleteTeam(teamId string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetTeamRoute(teamId))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// PermanentDeleteTeam deletes the team, should only be used when needed for
-// compliance and the like.
-func (c *Client4) PermanentDeleteTeam(teamId string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetTeamRoute(teamId) + "?permanent=" + c.boolString(true))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// UpdateTeamPrivacy modifies the team type (model.TEAM_OPEN <--> model.TEAM_INVITE) and sets
-// the corresponding AllowOpenInvite appropriately.
-func (c *Client4) UpdateTeamPrivacy(teamId string, privacy string) (*Team, *Response) {
-	requestBody := map[string]string{"privacy": privacy}
-	r, err := c.DoApiPut(c.GetTeamRoute(teamId)+"/privacy", MapToJson(requestBody))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamFromJson(r.Body), BuildResponse(r)
-}
-
-// GetTeamMembers returns team members based on the provided team id string.
-func (c *Client4) GetTeamMembers(teamId string, page int, perPage int, etag string) ([]*TeamMember, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetTeamMembersRoute(teamId)+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamMembersFromJson(r.Body), BuildResponse(r)
-}
-
-// GetTeamMembersWithoutDeletedUsers returns team members based on the provided team id string. Additional parameters of sort and exclude_deleted_users accepted as well
-// Could not add it to above function due to it be a breaking change.
-func (c *Client4) GetTeamMembersSortAndWithoutDeletedUsers(teamId string, page int, perPage int, sort string, exclude_deleted_users bool, etag string) ([]*TeamMember, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v&sort=%v&exclude_deleted_users=%v", page, perPage, sort, exclude_deleted_users)
-	r, err := c.DoApiGet(c.GetTeamMembersRoute(teamId)+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamMembersFromJson(r.Body), BuildResponse(r)
-}
-
-// GetTeamMembersForUser returns the team members for a user.
-func (c *Client4) GetTeamMembersForUser(userId string, etag string) ([]*TeamMember, *Response) {
-	r, err := c.DoApiGet(c.GetUserRoute(userId)+"/teams/members", etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamMembersFromJson(r.Body), BuildResponse(r)
-}
-
-// GetTeamMembersByIds will return an array of team members based on the
-// team id and a list of user ids provided. Must be authenticated.
-func (c *Client4) GetTeamMembersByIds(teamId string, userIds []string) ([]*TeamMember, *Response) {
-	r, err := c.DoApiPost(fmt.Sprintf("/teams/%v/members/ids", teamId), ArrayToJson(userIds))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamMembersFromJson(r.Body), BuildResponse(r)
-}
-
-// AddTeamMember adds user to a team and return a team member.
-func (c *Client4) AddTeamMember(teamId, userId string) (*TeamMember, *Response) {
-	member := &TeamMember{TeamId: teamId, UserId: userId}
-	r, err := c.DoApiPost(c.GetTeamMembersRoute(teamId), member.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamMemberFromJson(r.Body), BuildResponse(r)
-}
-
-// AddTeamMemberFromInvite adds a user to a team and return a team member using an invite id
-// or an invite token/data pair.
-func (c *Client4) AddTeamMemberFromInvite(token, inviteId string) (*TeamMember, *Response) {
-	var query string
-
-	if inviteId != "" {
-		query += fmt.Sprintf("?invite_id=%v", inviteId)
-	}
-
-	if token != "" {
-		query += fmt.Sprintf("?token=%v", token)
-	}
-
-	r, err := c.DoApiPost(c.GetTeamsRoute()+"/members/invite"+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamMemberFromJson(r.Body), BuildResponse(r)
-}
-
-// AddTeamMembers adds a number of users to a team and returns the team members.
-func (c *Client4) AddTeamMembers(teamId string, userIds []string) ([]*TeamMember, *Response) {
-	var members []*TeamMember
-	for _, userId := range userIds {
-		member := &TeamMember{TeamId: teamId, UserId: userId}
-		members = append(members, member)
-	}
-
-	r, err := c.DoApiPost(c.GetTeamMembersRoute(teamId)+"/batch", TeamMembersToJson(members))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamMembersFromJson(r.Body), BuildResponse(r)
-}
-
-// AddTeamMembers adds a number of users to a team and returns the team members.
-func (c *Client4) AddTeamMembersGracefully(teamId string, userIds []string) ([]*TeamMemberWithError, *Response) {
-	var members []*TeamMember
-	for _, userId := range userIds {
-		member := &TeamMember{TeamId: teamId, UserId: userId}
-		members = append(members, member)
-	}
-
-	r, err := c.DoApiPost(c.GetTeamMembersRoute(teamId)+"/batch?graceful="+c.boolString(true), TeamMembersToJson(members))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamMembersWithErrorFromJson(r.Body), BuildResponse(r)
-}
-
-// RemoveTeamMember will remove a user from a team.
-func (c *Client4) RemoveTeamMember(teamId, userId string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetTeamMemberRoute(teamId, userId))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetTeamStats returns a team stats based on the team id string.
-// Must be authenticated.
-func (c *Client4) GetTeamStats(teamId, etag string) (*TeamStats, *Response) {
-	r, err := c.DoApiGet(c.GetTeamStatsRoute(teamId), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamStatsFromJson(r.Body), BuildResponse(r)
-}
-
-// GetTotalUsersStats returns a total system user stats.
-// Must be authenticated.
-func (c *Client4) GetTotalUsersStats(etag string) (*UsersStats, *Response) {
-	r, err := c.DoApiGet(c.GetTotalUsersStatsRoute(), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UsersStatsFromJson(r.Body), BuildResponse(r)
-}
-
-// GetTeamUnread will return a TeamUnread object that contains the amount of
-// unread messages and mentions the user has for the specified team.
-// Must be authenticated.
-func (c *Client4) GetTeamUnread(teamId, userId string) (*TeamUnread, *Response) {
-	r, err := c.DoApiGet(c.GetUserRoute(userId)+c.GetTeamRoute(teamId)+"/unread", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamUnreadFromJson(r.Body), BuildResponse(r)
-}
-
-// ImportTeam will import an exported team from other app into a existing team.
-func (c *Client4) ImportTeam(data []byte, filesize int, importFrom, filename, teamId string) (map[string]string, *Response) {
-	body := &bytes.Buffer{}
-	writer := multipart.NewWriter(body)
-
-	part, err := writer.CreateFormFile("file", filename)
-	if err != nil {
-		return nil, &Response{Error: NewAppError("UploadImportTeam", "model.client.upload_post_attachment.file.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	if _, err = io.Copy(part, bytes.NewBuffer(data)); err != nil {
-		return nil, &Response{Error: NewAppError("UploadImportTeam", "model.client.upload_post_attachment.file.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	part, err = writer.CreateFormField("filesize")
-	if err != nil {
-		return nil, &Response{Error: NewAppError("UploadImportTeam", "model.client.upload_post_attachment.file_size.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	if _, err = io.Copy(part, strings.NewReader(strconv.Itoa(filesize))); err != nil {
-		return nil, &Response{Error: NewAppError("UploadImportTeam", "model.client.upload_post_attachment.file_size.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	part, err = writer.CreateFormField("importFrom")
-	if err != nil {
-		return nil, &Response{Error: NewAppError("UploadImportTeam", "model.client.upload_post_attachment.import_from.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	if _, err := io.Copy(part, strings.NewReader(importFrom)); err != nil {
-		return nil, &Response{Error: NewAppError("UploadImportTeam", "model.client.upload_post_attachment.import_from.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	if err := writer.Close(); err != nil {
-		return nil, &Response{Error: NewAppError("UploadImportTeam", "model.client.upload_post_attachment.writer.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	return c.DoUploadImportTeam(c.GetTeamImportRoute(teamId), body.Bytes(), writer.FormDataContentType())
-}
-
-// InviteUsersToTeam invite users by email to the team.
-func (c *Client4) InviteUsersToTeam(teamId string, userEmails []string) (bool, *Response) {
-	r, err := c.DoApiPost(c.GetTeamRoute(teamId)+"/invite/email", ArrayToJson(userEmails))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// InviteGuestsToTeam invite guest by email to some channels in a team.
-func (c *Client4) InviteGuestsToTeam(teamId string, userEmails []string, channels []string, message string) (bool, *Response) {
-	guestsInvite := GuestsInvite{
-		Emails:   userEmails,
-		Channels: channels,
-		Message:  message,
-	}
-	r, err := c.DoApiPost(c.GetTeamRoute(teamId)+"/invite-guests/email", guestsInvite.ToJson())
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// InviteUsersToTeam invite users by email to the team.
-func (c *Client4) InviteUsersToTeamGracefully(teamId string, userEmails []string) ([]*EmailInviteWithError, *Response) {
-	r, err := c.DoApiPost(c.GetTeamRoute(teamId)+"/invite/email?graceful="+c.boolString(true), ArrayToJson(userEmails))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return EmailInviteWithErrorFromJson(r.Body), BuildResponse(r)
-}
-
-// InviteGuestsToTeam invite guest by email to some channels in a team.
-func (c *Client4) InviteGuestsToTeamGracefully(teamId string, userEmails []string, channels []string, message string) ([]*EmailInviteWithError, *Response) {
-	guestsInvite := GuestsInvite{
-		Emails:   userEmails,
-		Channels: channels,
-		Message:  message,
-	}
-	r, err := c.DoApiPost(c.GetTeamRoute(teamId)+"/invite-guests/email?graceful="+c.boolString(true), guestsInvite.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return EmailInviteWithErrorFromJson(r.Body), BuildResponse(r)
-}
-
-// InvalidateEmailInvites will invalidate active email invitations that have not been accepted by the user.
-func (c *Client4) InvalidateEmailInvites() (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetTeamsRoute() + "/invites/email")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetTeamInviteInfo returns a team object from an invite id containing sanitized information.
-func (c *Client4) GetTeamInviteInfo(inviteId string) (*Team, *Response) {
-	r, err := c.DoApiGet(c.GetTeamsRoute()+"/invite/"+inviteId, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamFromJson(r.Body), BuildResponse(r)
-}
-
-// SetTeamIcon sets team icon of the team.
-func (c *Client4) SetTeamIcon(teamId string, data []byte) (bool, *Response) {
-	body := &bytes.Buffer{}
-	writer := multipart.NewWriter(body)
-
-	part, err := writer.CreateFormFile("image", "teamIcon.png")
-	if err != nil {
-		return false, &Response{Error: NewAppError("SetTeamIcon", "model.client.set_team_icon.no_file.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	if _, err = io.Copy(part, bytes.NewBuffer(data)); err != nil {
-		return false, &Response{Error: NewAppError("SetTeamIcon", "model.client.set_team_icon.no_file.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	if err = writer.Close(); err != nil {
-		return false, &Response{Error: NewAppError("SetTeamIcon", "model.client.set_team_icon.writer.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	rq, err := http.NewRequest("POST", c.ApiUrl+c.GetTeamRoute(teamId)+"/image", bytes.NewReader(body.Bytes()))
-	if err != nil {
-		return false, &Response{Error: NewAppError("SetTeamIcon", "model.client.connecting.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-	rq.Header.Set("Content-Type", writer.FormDataContentType())
-
-	if c.AuthToken != "" {
-		rq.Header.Set(HEADER_AUTH, c.AuthType+" "+c.AuthToken)
-	}
-
-	rp, err := c.HttpClient.Do(rq)
-	if err != nil || rp == nil {
-		// set to http.StatusForbidden(403)
-		return false, &Response{StatusCode: http.StatusForbidden, Error: NewAppError(c.GetTeamRoute(teamId)+"/image", "model.client.connecting.app_error", nil, err.Error(), 403)}
-	}
-	defer closeBody(rp)
-
-	if rp.StatusCode >= 300 {
-		return false, BuildErrorResponse(rp, AppErrorFromJson(rp.Body))
-	}
-
-	return CheckStatusOK(rp), BuildResponse(rp)
-}
-
-// GetTeamIcon gets the team icon of the team.
-func (c *Client4) GetTeamIcon(teamId, etag string) ([]byte, *Response) {
-	r, appErr := c.DoApiGet(c.GetTeamRoute(teamId)+"/image", etag)
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	data, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("GetTeamIcon", "model.client.get_team_icon.app_error", nil, err.Error(), r.StatusCode))
-	}
-	return data, BuildResponse(r)
-}
-
-// RemoveTeamIcon updates LastTeamIconUpdate to 0 which indicates team icon is removed.
-func (c *Client4) RemoveTeamIcon(teamId string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetTeamRoute(teamId) + "/image")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// Channel Section
-
-// GetAllChannels get all the channels. Must be a system administrator.
-func (c *Client4) GetAllChannels(page int, perPage int, etag string) (*ChannelListWithTeamData, *Response) {
-	return c.getAllChannels(page, perPage, etag, ChannelSearchOpts{})
-}
-
-// GetAllChannelsIncludeDeleted get all the channels. Must be a system administrator.
-func (c *Client4) GetAllChannelsIncludeDeleted(page int, perPage int, etag string) (*ChannelListWithTeamData, *Response) {
-	return c.getAllChannels(page, perPage, etag, ChannelSearchOpts{IncludeDeleted: true})
-}
-
-// GetAllChannelsExcludePolicyConstrained gets all channels which are not part of a data retention policy.
-// Must be a system administrator.
-func (c *Client4) GetAllChannelsExcludePolicyConstrained(page, perPage int, etag string) (*ChannelListWithTeamData, *Response) {
-	return c.getAllChannels(page, perPage, etag, ChannelSearchOpts{ExcludePolicyConstrained: true})
-}
-
-func (c *Client4) getAllChannels(page int, perPage int, etag string, opts ChannelSearchOpts) (*ChannelListWithTeamData, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v&include_deleted=%v&exclude_policy_constrained=%v",
-		page, perPage, opts.IncludeDeleted, opts.ExcludePolicyConstrained)
-	r, err := c.DoApiGet(c.GetChannelsRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelListWithTeamDataFromJson(r.Body), BuildResponse(r)
-}
-
-// GetAllChannelsWithCount get all the channels including the total count. Must be a system administrator.
-func (c *Client4) GetAllChannelsWithCount(page int, perPage int, etag string) (*ChannelListWithTeamData, int64, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v&include_total_count="+c.boolString(true), page, perPage)
-	r, err := c.DoApiGet(c.GetChannelsRoute()+query, etag)
-	if err != nil {
-		return nil, 0, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	cwc := ChannelsWithCountFromJson(r.Body)
-	return cwc.Channels, cwc.TotalCount, BuildResponse(r)
-}
-
-// CreateChannel creates a channel based on the provided channel struct.
-func (c *Client4) CreateChannel(channel *Channel) (*Channel, *Response) {
-	r, err := c.DoApiPost(c.GetChannelsRoute(), channel.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelFromJson(r.Body), BuildResponse(r)
-}
-
-// UpdateChannel updates a channel based on the provided channel struct.
-func (c *Client4) UpdateChannel(channel *Channel) (*Channel, *Response) {
-	r, err := c.DoApiPut(c.GetChannelRoute(channel.Id), channel.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelFromJson(r.Body), BuildResponse(r)
-}
-
-// PatchChannel partially updates a channel. Any missing fields are not updated.
-func (c *Client4) PatchChannel(channelId string, patch *ChannelPatch) (*Channel, *Response) {
-	r, err := c.DoApiPut(c.GetChannelRoute(channelId)+"/patch", patch.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelFromJson(r.Body), BuildResponse(r)
-}
-
-// ConvertChannelToPrivate converts public to private channel.
-func (c *Client4) ConvertChannelToPrivate(channelId string) (*Channel, *Response) {
-	r, err := c.DoApiPost(c.GetChannelRoute(channelId)+"/convert", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelFromJson(r.Body), BuildResponse(r)
-}
-
-// UpdateChannelPrivacy updates channel privacy
-func (c *Client4) UpdateChannelPrivacy(channelId string, privacy string) (*Channel, *Response) {
-	requestBody := map[string]string{"privacy": privacy}
-	r, err := c.DoApiPut(c.GetChannelRoute(channelId)+"/privacy", MapToJson(requestBody))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelFromJson(r.Body), BuildResponse(r)
-}
-
-// RestoreChannel restores a previously deleted channel. Any missing fields are not updated.
-func (c *Client4) RestoreChannel(channelId string) (*Channel, *Response) {
-	r, err := c.DoApiPost(c.GetChannelRoute(channelId)+"/restore", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelFromJson(r.Body), BuildResponse(r)
-}
-
-// CreateDirectChannel creates a direct message channel based on the two user
-// ids provided.
-func (c *Client4) CreateDirectChannel(userId1, userId2 string) (*Channel, *Response) {
-	requestBody := []string{userId1, userId2}
-	r, err := c.DoApiPost(c.GetChannelsRoute()+"/direct", ArrayToJson(requestBody))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelFromJson(r.Body), BuildResponse(r)
-}
-
-// CreateGroupChannel creates a group message channel based on userIds provided.
-func (c *Client4) CreateGroupChannel(userIds []string) (*Channel, *Response) {
-	r, err := c.DoApiPost(c.GetChannelsRoute()+"/group", ArrayToJson(userIds))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelFromJson(r.Body), BuildResponse(r)
-}
-
-// GetChannel returns a channel based on the provided channel id string.
-func (c *Client4) GetChannel(channelId, etag string) (*Channel, *Response) {
-	r, err := c.DoApiGet(c.GetChannelRoute(channelId), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelFromJson(r.Body), BuildResponse(r)
-}
-
-// GetChannelStats returns statistics for a channel.
-func (c *Client4) GetChannelStats(channelId string, etag string) (*ChannelStats, *Response) {
-	r, err := c.DoApiGet(c.GetChannelRoute(channelId)+"/stats", etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelStatsFromJson(r.Body), BuildResponse(r)
-}
-
-// GetChannelMembersTimezones gets a list of timezones for a channel.
-func (c *Client4) GetChannelMembersTimezones(channelId string) ([]string, *Response) {
-	r, err := c.DoApiGet(c.GetChannelRoute(channelId)+"/timezones", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ArrayFromJson(r.Body), BuildResponse(r)
-}
-
-// GetPinnedPosts gets a list of pinned posts.
-func (c *Client4) GetPinnedPosts(channelId string, etag string) (*PostList, *Response) {
-	r, err := c.DoApiGet(c.GetChannelRoute(channelId)+"/pinned", etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PostListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetPrivateChannelsForTeam returns a list of private channels based on the provided team id string.
-func (c *Client4) GetPrivateChannelsForTeam(teamId string, page int, perPage int, etag string) ([]*Channel, *Response) {
-	query := fmt.Sprintf("/private?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetChannelsForTeamRoute(teamId)+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelSliceFromJson(r.Body), BuildResponse(r)
-}
-
-// GetPublicChannelsForTeam returns a list of public channels based on the provided team id string.
-func (c *Client4) GetPublicChannelsForTeam(teamId string, page int, perPage int, etag string) ([]*Channel, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetChannelsForTeamRoute(teamId)+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelSliceFromJson(r.Body), BuildResponse(r)
-}
-
-// GetDeletedChannelsForTeam returns a list of public channels based on the provided team id string.
-func (c *Client4) GetDeletedChannelsForTeam(teamId string, page int, perPage int, etag string) ([]*Channel, *Response) {
-	query := fmt.Sprintf("/deleted?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetChannelsForTeamRoute(teamId)+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelSliceFromJson(r.Body), BuildResponse(r)
-}
-
-// GetPublicChannelsByIdsForTeam returns a list of public channels based on provided team id string.
-func (c *Client4) GetPublicChannelsByIdsForTeam(teamId string, channelIds []string) ([]*Channel, *Response) {
-	r, err := c.DoApiPost(c.GetChannelsForTeamRoute(teamId)+"/ids", ArrayToJson(channelIds))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelSliceFromJson(r.Body), BuildResponse(r)
-}
-
-// GetChannelsForTeamForUser returns a list channels of on a team for a user.
-func (c *Client4) GetChannelsForTeamForUser(teamId, userId string, includeDeleted bool, etag string) ([]*Channel, *Response) {
-	r, err := c.DoApiGet(c.GetChannelsForTeamForUserRoute(teamId, userId, includeDeleted), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelSliceFromJson(r.Body), BuildResponse(r)
-}
-
-// GetChannelsForTeamAndUserWithLastDeleteAt returns a list channels of a team for a user, additionally filtered with lastDeleteAt. This does not have any effect if includeDeleted is set to false.
-func (c *Client4) GetChannelsForTeamAndUserWithLastDeleteAt(teamId, userId string, includeDeleted bool, lastDeleteAt int, etag string) ([]*Channel, *Response) {
-	route := fmt.Sprintf(c.GetUserRoute(userId) + c.GetTeamRoute(teamId) + "/channels")
-	route += fmt.Sprintf("?include_deleted=%v&last_delete_at=%d", includeDeleted, lastDeleteAt)
-	r, err := c.DoApiGet(route, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelSliceFromJson(r.Body), BuildResponse(r)
-}
-
-// SearchChannels returns the channels on a team matching the provided search term.
-func (c *Client4) SearchChannels(teamId string, search *ChannelSearch) ([]*Channel, *Response) {
-	r, err := c.DoApiPost(c.GetChannelsForTeamRoute(teamId)+"/search", search.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelSliceFromJson(r.Body), BuildResponse(r)
-}
-
-// SearchArchivedChannels returns the archived channels on a team matching the provided search term.
-func (c *Client4) SearchArchivedChannels(teamId string, search *ChannelSearch) ([]*Channel, *Response) {
-	r, err := c.DoApiPost(c.GetChannelsForTeamRoute(teamId)+"/search_archived", search.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelSliceFromJson(r.Body), BuildResponse(r)
-}
-
-// SearchAllChannels search in all the channels. Must be a system administrator.
-func (c *Client4) SearchAllChannels(search *ChannelSearch) (*ChannelListWithTeamData, *Response) {
-	r, err := c.DoApiPost(c.GetChannelsRoute()+"/search", search.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelListWithTeamDataFromJson(r.Body), BuildResponse(r)
-}
-
-// SearchAllChannelsPaged searches all the channels and returns the results paged with the total count.
-func (c *Client4) SearchAllChannelsPaged(search *ChannelSearch) (*ChannelsWithCount, *Response) {
-	r, err := c.DoApiPost(c.GetChannelsRoute()+"/search", search.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelsWithCountFromJson(r.Body), BuildResponse(r)
-}
-
-// SearchGroupChannels returns the group channels of the user whose members' usernames match the search term.
-func (c *Client4) SearchGroupChannels(search *ChannelSearch) ([]*Channel, *Response) {
-	r, err := c.DoApiPost(c.GetChannelsRoute()+"/group/search", search.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelSliceFromJson(r.Body), BuildResponse(r)
-}
-
-// DeleteChannel deletes channel based on the provided channel id string.
-func (c *Client4) DeleteChannel(channelId string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetChannelRoute(channelId))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// PermanentDeleteChannel deletes a channel based on the provided channel id string.
-func (c *Client4) PermanentDeleteChannel(channelId string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetChannelRoute(channelId) + "?permanent=" + c.boolString(true))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// MoveChannel moves the channel to the destination team.
-func (c *Client4) MoveChannel(channelId, teamId string, force bool) (*Channel, *Response) {
-	requestBody := map[string]interface{}{
-		"team_id": teamId,
-		"force":   force,
-	}
-	r, err := c.DoApiPost(c.GetChannelRoute(channelId)+"/move", StringInterfaceToJson(requestBody))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelFromJson(r.Body), BuildResponse(r)
-}
-
-// GetChannelByName returns a channel based on the provided channel name and team id strings.
-func (c *Client4) GetChannelByName(channelName, teamId string, etag string) (*Channel, *Response) {
-	r, err := c.DoApiGet(c.GetChannelByNameRoute(channelName, teamId), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelFromJson(r.Body), BuildResponse(r)
-}
-
-// GetChannelByNameIncludeDeleted returns a channel based on the provided channel name and team id strings. Other then GetChannelByName it will also return deleted channels.
-func (c *Client4) GetChannelByNameIncludeDeleted(channelName, teamId string, etag string) (*Channel, *Response) {
-	r, err := c.DoApiGet(c.GetChannelByNameRoute(channelName, teamId)+"?include_deleted="+c.boolString(true), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelFromJson(r.Body), BuildResponse(r)
-}
-
-// GetChannelByNameForTeamName returns a channel based on the provided channel name and team name strings.
-func (c *Client4) GetChannelByNameForTeamName(channelName, teamName string, etag string) (*Channel, *Response) {
-	r, err := c.DoApiGet(c.GetChannelByNameForTeamNameRoute(channelName, teamName), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelFromJson(r.Body), BuildResponse(r)
-}
-
-// GetChannelByNameForTeamNameIncludeDeleted returns a channel based on the provided channel name and team name strings. Other then GetChannelByNameForTeamName it will also return deleted channels.
-func (c *Client4) GetChannelByNameForTeamNameIncludeDeleted(channelName, teamName string, etag string) (*Channel, *Response) {
-	r, err := c.DoApiGet(c.GetChannelByNameForTeamNameRoute(channelName, teamName)+"?include_deleted="+c.boolString(true), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelFromJson(r.Body), BuildResponse(r)
-}
-
-// GetChannelMembers gets a page of channel members.
-func (c *Client4) GetChannelMembers(channelId string, page, perPage int, etag string) (*ChannelMembers, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetChannelMembersRoute(channelId)+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelMembersFromJson(r.Body), BuildResponse(r)
-}
-
-// GetChannelMembersByIds gets the channel members in a channel for a list of user ids.
-func (c *Client4) GetChannelMembersByIds(channelId string, userIds []string) (*ChannelMembers, *Response) {
-	r, err := c.DoApiPost(c.GetChannelMembersRoute(channelId)+"/ids", ArrayToJson(userIds))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelMembersFromJson(r.Body), BuildResponse(r)
-}
-
-// GetChannelMember gets a channel member.
-func (c *Client4) GetChannelMember(channelId, userId, etag string) (*ChannelMember, *Response) {
-	r, err := c.DoApiGet(c.GetChannelMemberRoute(channelId, userId), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelMemberFromJson(r.Body), BuildResponse(r)
-}
-
-// GetChannelMembersForUser gets all the channel members for a user on a team.
-func (c *Client4) GetChannelMembersForUser(userId, teamId, etag string) (*ChannelMembers, *Response) {
-	r, err := c.DoApiGet(fmt.Sprintf(c.GetUserRoute(userId)+"/teams/%v/channels/members", teamId), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelMembersFromJson(r.Body), BuildResponse(r)
-}
-
-// ViewChannel performs a view action for a user. Synonymous with switching channels or marking channels as read by a user.
-func (c *Client4) ViewChannel(userId string, view *ChannelView) (*ChannelViewResponse, *Response) {
-	url := fmt.Sprintf(c.GetChannelsRoute()+"/members/%v/view", userId)
-	r, err := c.DoApiPost(url, view.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelViewResponseFromJson(r.Body), BuildResponse(r)
-}
-
-// GetChannelUnread will return a ChannelUnread object that contains the number of
-// unread messages and mentions for a user.
-func (c *Client4) GetChannelUnread(channelId, userId string) (*ChannelUnread, *Response) {
-	r, err := c.DoApiGet(c.GetUserRoute(userId)+c.GetChannelRoute(channelId)+"/unread", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelUnreadFromJson(r.Body), BuildResponse(r)
-}
-
-// UpdateChannelRoles will update the roles on a channel for a user.
-func (c *Client4) UpdateChannelRoles(channelId, userId, roles string) (bool, *Response) {
-	requestBody := map[string]string{"roles": roles}
-	r, err := c.DoApiPut(c.GetChannelMemberRoute(channelId, userId)+"/roles", MapToJson(requestBody))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// UpdateChannelMemberSchemeRoles will update the scheme-derived roles on a channel for a user.
-func (c *Client4) UpdateChannelMemberSchemeRoles(channelId string, userId string, schemeRoles *SchemeRoles) (bool, *Response) {
-	r, err := c.DoApiPut(c.GetChannelMemberRoute(channelId, userId)+"/schemeRoles", schemeRoles.ToJson())
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// UpdateChannelNotifyProps will update the notification properties on a channel for a user.
-func (c *Client4) UpdateChannelNotifyProps(channelId, userId string, props map[string]string) (bool, *Response) {
-	r, err := c.DoApiPut(c.GetChannelMemberRoute(channelId, userId)+"/notify_props", MapToJson(props))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// AddChannelMember adds user to channel and return a channel member.
-func (c *Client4) AddChannelMember(channelId, userId string) (*ChannelMember, *Response) {
-	requestBody := map[string]string{"user_id": userId}
-	r, err := c.DoApiPost(c.GetChannelMembersRoute(channelId)+"", MapToJson(requestBody))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelMemberFromJson(r.Body), BuildResponse(r)
-}
-
-// AddChannelMemberWithRootId adds user to channel and return a channel member. Post add to channel message has the postRootId.
-func (c *Client4) AddChannelMemberWithRootId(channelId, userId, postRootId string) (*ChannelMember, *Response) {
-	requestBody := map[string]string{"user_id": userId, "post_root_id": postRootId}
-	r, err := c.DoApiPost(c.GetChannelMembersRoute(channelId)+"", MapToJson(requestBody))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelMemberFromJson(r.Body), BuildResponse(r)
-}
-
-// RemoveUserFromChannel will delete the channel member object for a user, effectively removing the user from a channel.
-func (c *Client4) RemoveUserFromChannel(channelId, userId string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetChannelMemberRoute(channelId, userId))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// AutocompleteChannelsForTeam will return an ordered list of channels autocomplete suggestions.
-func (c *Client4) AutocompleteChannelsForTeam(teamId, name string) (*ChannelList, *Response) {
-	query := fmt.Sprintf("?name=%v", name)
-	r, err := c.DoApiGet(c.GetChannelsForTeamRoute(teamId)+"/autocomplete"+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelListFromJson(r.Body), BuildResponse(r)
-}
-
-// AutocompleteChannelsForTeamForSearch will return an ordered list of your channels autocomplete suggestions.
-func (c *Client4) AutocompleteChannelsForTeamForSearch(teamId, name string) (*ChannelList, *Response) {
-	query := fmt.Sprintf("?name=%v", name)
-	r, err := c.DoApiGet(c.GetChannelsForTeamRoute(teamId)+"/search_autocomplete"+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelListFromJson(r.Body), BuildResponse(r)
-}
-
-// Post Section
-
-// CreatePost creates a post based on the provided post struct.
-func (c *Client4) CreatePost(post *Post) (*Post, *Response) {
-	r, err := c.DoApiPost(c.GetPostsRoute(), post.ToUnsanitizedJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PostFromJson(r.Body), BuildResponse(r)
-}
-
-// CreatePostEphemeral creates a ephemeral post based on the provided post struct which is send to the given user id.
-func (c *Client4) CreatePostEphemeral(post *PostEphemeral) (*Post, *Response) {
-	r, err := c.DoApiPost(c.GetPostsEphemeralRoute(), post.ToUnsanitizedJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PostFromJson(r.Body), BuildResponse(r)
-}
-
-// UpdatePost updates a post based on the provided post struct.
-func (c *Client4) UpdatePost(postId string, post *Post) (*Post, *Response) {
-	r, err := c.DoApiPut(c.GetPostRoute(postId), post.ToUnsanitizedJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PostFromJson(r.Body), BuildResponse(r)
-}
-
-// PatchPost partially updates a post. Any missing fields are not updated.
-func (c *Client4) PatchPost(postId string, patch *PostPatch) (*Post, *Response) {
-	r, err := c.DoApiPut(c.GetPostRoute(postId)+"/patch", patch.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PostFromJson(r.Body), BuildResponse(r)
-}
-
-// SetPostUnread marks channel where post belongs as unread on the time of the provided post.
-func (c *Client4) SetPostUnread(userId string, postId string, collapsedThreadsSupported bool) *Response {
-	b, _ := json.Marshal(map[string]bool{"collapsed_threads_supported": collapsedThreadsSupported})
-	r, err := c.DoApiPost(c.GetUserRoute(userId)+c.GetPostRoute(postId)+"/set_unread", string(b))
-	if err != nil {
-		return BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return BuildResponse(r)
-}
-
-// PinPost pin a post based on provided post id string.
-func (c *Client4) PinPost(postId string) (bool, *Response) {
-	r, err := c.DoApiPost(c.GetPostRoute(postId)+"/pin", "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// UnpinPost unpin a post based on provided post id string.
-func (c *Client4) UnpinPost(postId string) (bool, *Response) {
-	r, err := c.DoApiPost(c.GetPostRoute(postId)+"/unpin", "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetPost gets a single post.
-func (c *Client4) GetPost(postId string, etag string) (*Post, *Response) {
-	r, err := c.DoApiGet(c.GetPostRoute(postId), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PostFromJson(r.Body), BuildResponse(r)
-}
-
-// DeletePost deletes a post from the provided post id string.
-func (c *Client4) DeletePost(postId string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetPostRoute(postId))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetPostThread gets a post with all the other posts in the same thread.
-func (c *Client4) GetPostThread(postId string, etag string, collapsedThreads bool) (*PostList, *Response) {
-	url := c.GetPostRoute(postId) + "/thread"
-	if collapsedThreads {
-		url += "?collapsedThreads=true"
-	}
-	r, err := c.DoApiGet(url, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PostListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetPostsForChannel gets a page of posts with an array for ordering for a channel.
-func (c *Client4) GetPostsForChannel(channelId string, page, perPage int, etag string, collapsedThreads bool) (*PostList, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v", page, perPage)
-	if collapsedThreads {
-		query += "&collapsedThreads=true"
-	}
-	r, err := c.DoApiGet(c.GetChannelRoute(channelId)+"/posts"+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PostListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetFlaggedPostsForUser returns flagged posts of a user based on user id string.
-func (c *Client4) GetFlaggedPostsForUser(userId string, page int, perPage int) (*PostList, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetUserRoute(userId)+"/posts/flagged"+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PostListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetFlaggedPostsForUserInTeam returns flagged posts in team of a user based on user id string.
-func (c *Client4) GetFlaggedPostsForUserInTeam(userId string, teamId string, page int, perPage int) (*PostList, *Response) {
-	if !IsValidId(teamId) {
-		return nil, &Response{StatusCode: http.StatusBadRequest, Error: NewAppError("GetFlaggedPostsForUserInTeam", "model.client.get_flagged_posts_in_team.missing_parameter.app_error", nil, "", http.StatusBadRequest)}
-	}
-
-	query := fmt.Sprintf("?team_id=%v&page=%v&per_page=%v", teamId, page, perPage)
-	r, err := c.DoApiGet(c.GetUserRoute(userId)+"/posts/flagged"+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PostListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetFlaggedPostsForUserInChannel returns flagged posts in channel of a user based on user id string.
-func (c *Client4) GetFlaggedPostsForUserInChannel(userId string, channelId string, page int, perPage int) (*PostList, *Response) {
-	if !IsValidId(channelId) {
-		return nil, &Response{StatusCode: http.StatusBadRequest, Error: NewAppError("GetFlaggedPostsForUserInChannel", "model.client.get_flagged_posts_in_channel.missing_parameter.app_error", nil, "", http.StatusBadRequest)}
-	}
-
-	query := fmt.Sprintf("?channel_id=%v&page=%v&per_page=%v", channelId, page, perPage)
-	r, err := c.DoApiGet(c.GetUserRoute(userId)+"/posts/flagged"+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PostListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetPostsSince gets posts created after a specified time as Unix time in milliseconds.
-func (c *Client4) GetPostsSince(channelId string, time int64, collapsedThreads bool) (*PostList, *Response) {
-	query := fmt.Sprintf("?since=%v", time)
-	if collapsedThreads {
-		query += "&collapsedThreads=true"
-	}
-	r, err := c.DoApiGet(c.GetChannelRoute(channelId)+"/posts"+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PostListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetPostsAfter gets a page of posts that were posted after the post provided.
-func (c *Client4) GetPostsAfter(channelId, postId string, page, perPage int, etag string, collapsedThreads bool) (*PostList, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v&after=%v", page, perPage, postId)
-	if collapsedThreads {
-		query += "&collapsedThreads=true"
-	}
-	r, err := c.DoApiGet(c.GetChannelRoute(channelId)+"/posts"+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PostListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetPostsBefore gets a page of posts that were posted before the post provided.
-func (c *Client4) GetPostsBefore(channelId, postId string, page, perPage int, etag string, collapsedThreads bool) (*PostList, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v&before=%v", page, perPage, postId)
-	if collapsedThreads {
-		query += "&collapsedThreads=true"
-	}
-	r, err := c.DoApiGet(c.GetChannelRoute(channelId)+"/posts"+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PostListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetPostsAroundLastUnread gets a list of posts around last unread post by a user in a channel.
-func (c *Client4) GetPostsAroundLastUnread(userId, channelId string, limitBefore, limitAfter int, collapsedThreads bool) (*PostList, *Response) {
-	query := fmt.Sprintf("?limit_before=%v&limit_after=%v", limitBefore, limitAfter)
-	if collapsedThreads {
-		query += "&collapsedThreads=true"
-	}
-	r, err := c.DoApiGet(c.GetUserRoute(userId)+c.GetChannelRoute(channelId)+"/posts/unread"+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PostListFromJson(r.Body), BuildResponse(r)
-}
-
-// SearchFiles returns any posts with matching terms string.
-func (c *Client4) SearchFiles(teamId string, terms string, isOrSearch bool) (*FileInfoList, *Response) {
-	params := SearchParameter{
-		Terms:      &terms,
-		IsOrSearch: &isOrSearch,
-	}
-	return c.SearchFilesWithParams(teamId, &params)
-}
-
-// SearchFilesWithParams returns any posts with matching terms string.
-func (c *Client4) SearchFilesWithParams(teamId string, params *SearchParameter) (*FileInfoList, *Response) {
-	r, err := c.DoApiPost(c.GetTeamRoute(teamId)+"/files/search", params.SearchParameterToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return FileInfoListFromJson(r.Body), BuildResponse(r)
-}
-
-// SearchPosts returns any posts with matching terms string.
-func (c *Client4) SearchPosts(teamId string, terms string, isOrSearch bool) (*PostList, *Response) {
-	params := SearchParameter{
-		Terms:      &terms,
-		IsOrSearch: &isOrSearch,
-	}
-	return c.SearchPostsWithParams(teamId, &params)
-}
-
-// SearchPostsWithParams returns any posts with matching terms string.
-func (c *Client4) SearchPostsWithParams(teamId string, params *SearchParameter) (*PostList, *Response) {
-	r, err := c.DoApiPost(c.GetTeamRoute(teamId)+"/posts/search", params.SearchParameterToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PostListFromJson(r.Body), BuildResponse(r)
-}
-
-// SearchPostsWithMatches returns any posts with matching terms string, including.
-func (c *Client4) SearchPostsWithMatches(teamId string, terms string, isOrSearch bool) (*PostSearchResults, *Response) {
-	requestBody := map[string]interface{}{"terms": terms, "is_or_search": isOrSearch}
-	r, err := c.DoApiPost(c.GetTeamRoute(teamId)+"/posts/search", StringInterfaceToJson(requestBody))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PostSearchResultsFromJson(r.Body), BuildResponse(r)
-}
-
-// DoPostAction performs a post action.
-func (c *Client4) DoPostAction(postId, actionId string) (bool, *Response) {
-	r, err := c.DoApiPost(c.GetPostRoute(postId)+"/actions/"+actionId, "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// DoPostActionWithCookie performs a post action with extra arguments
-func (c *Client4) DoPostActionWithCookie(postId, actionId, selected, cookieStr string) (bool, *Response) {
-	var body []byte
-	if selected != "" || cookieStr != "" {
-		body, _ = json.Marshal(DoPostActionRequest{
-			SelectedOption: selected,
-			Cookie:         cookieStr,
-		})
-	}
-	r, err := c.DoApiPost(c.GetPostRoute(postId)+"/actions/"+actionId, string(body))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// OpenInteractiveDialog sends a WebSocket event to a user's clients to
-// open interactive dialogs, based on the provided trigger ID and other
-// provided data. Used with interactive message buttons, menus and
-// slash commands.
-func (c *Client4) OpenInteractiveDialog(request OpenDialogRequest) (bool, *Response) {
-	b, _ := json.Marshal(request)
-	r, err := c.DoApiPost("/actions/dialogs/open", string(b))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// SubmitInteractiveDialog will submit the provided dialog data to the integration
-// configured by the URL. Used with the interactive dialogs integration feature.
-func (c *Client4) SubmitInteractiveDialog(request SubmitDialogRequest) (*SubmitDialogResponse, *Response) {
-	b, _ := json.Marshal(request)
-	r, err := c.DoApiPost("/actions/dialogs/submit", string(b))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-
-	var resp SubmitDialogResponse
-	json.NewDecoder(r.Body).Decode(&resp)
-	return &resp, BuildResponse(r)
-}
-
-// UploadFile will upload a file to a channel using a multipart request, to be later attached to a post.
-// This method is functionally equivalent to Client4.UploadFileAsRequestBody.
-func (c *Client4) UploadFile(data []byte, channelId string, filename string) (*FileUploadResponse, *Response) {
-	body := &bytes.Buffer{}
-	writer := multipart.NewWriter(body)
-
-	part, err := writer.CreateFormField("channel_id")
-	if err != nil {
-		return nil, &Response{Error: NewAppError("UploadPostAttachment", "model.client.upload_post_attachment.channel_id.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	_, err = io.Copy(part, strings.NewReader(channelId))
-	if err != nil {
-		return nil, &Response{Error: NewAppError("UploadPostAttachment", "model.client.upload_post_attachment.channel_id.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	part, err = writer.CreateFormFile("files", filename)
-	if err != nil {
-		return nil, &Response{Error: NewAppError("UploadPostAttachment", "model.client.upload_post_attachment.file.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-	_, err = io.Copy(part, bytes.NewBuffer(data))
-	if err != nil {
-		return nil, &Response{Error: NewAppError("UploadPostAttachment", "model.client.upload_post_attachment.file.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	err = writer.Close()
-	if err != nil {
-		return nil, &Response{Error: NewAppError("UploadPostAttachment", "model.client.upload_post_attachment.writer.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	return c.DoUploadFile(c.GetFilesRoute(), body.Bytes(), writer.FormDataContentType())
-}
-
-// UploadFileAsRequestBody will upload a file to a channel as the body of a request, to be later attached
-// to a post. This method is functionally equivalent to Client4.UploadFile.
-func (c *Client4) UploadFileAsRequestBody(data []byte, channelId string, filename string) (*FileUploadResponse, *Response) {
-	return c.DoUploadFile(c.GetFilesRoute()+fmt.Sprintf("?channel_id=%v&filename=%v", url.QueryEscape(channelId), url.QueryEscape(filename)), data, http.DetectContentType(data))
-}
-
-// GetFile gets the bytes for a file by id.
-func (c *Client4) GetFile(fileId string) ([]byte, *Response) {
-	r, appErr := c.DoApiGet(c.GetFileRoute(fileId), "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	data, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("GetFile", "model.client.read_file.app_error", nil, err.Error(), r.StatusCode))
-	}
-	return data, BuildResponse(r)
-}
-
-// DownloadFile gets the bytes for a file by id, optionally adding headers to force the browser to download it.
-func (c *Client4) DownloadFile(fileId string, download bool) ([]byte, *Response) {
-	r, appErr := c.DoApiGet(c.GetFileRoute(fileId)+fmt.Sprintf("?download=%v", download), "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	data, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("DownloadFile", "model.client.read_file.app_error", nil, err.Error(), r.StatusCode))
-	}
-	return data, BuildResponse(r)
-}
-
-// GetFileThumbnail gets the bytes for a file by id.
-func (c *Client4) GetFileThumbnail(fileId string) ([]byte, *Response) {
-	r, appErr := c.DoApiGet(c.GetFileRoute(fileId)+"/thumbnail", "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	data, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("GetFileThumbnail", "model.client.read_file.app_error", nil, err.Error(), r.StatusCode))
-	}
-	return data, BuildResponse(r)
-}
-
-// DownloadFileThumbnail gets the bytes for a file by id, optionally adding headers to force the browser to download it.
-func (c *Client4) DownloadFileThumbnail(fileId string, download bool) ([]byte, *Response) {
-	r, appErr := c.DoApiGet(c.GetFileRoute(fileId)+fmt.Sprintf("/thumbnail?download=%v", download), "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	data, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("DownloadFileThumbnail", "model.client.read_file.app_error", nil, err.Error(), r.StatusCode))
-	}
-	return data, BuildResponse(r)
-}
-
-// GetFileLink gets the public link of a file by id.
-func (c *Client4) GetFileLink(fileId string) (string, *Response) {
-	r, err := c.DoApiGet(c.GetFileRoute(fileId)+"/link", "")
-	if err != nil {
-		return "", BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return MapFromJson(r.Body)["link"], BuildResponse(r)
-}
-
-// GetFilePreview gets the bytes for a file by id.
-func (c *Client4) GetFilePreview(fileId string) ([]byte, *Response) {
-	r, appErr := c.DoApiGet(c.GetFileRoute(fileId)+"/preview", "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	data, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("GetFilePreview", "model.client.read_file.app_error", nil, err.Error(), r.StatusCode))
-	}
-	return data, BuildResponse(r)
-}
-
-// DownloadFilePreview gets the bytes for a file by id.
-func (c *Client4) DownloadFilePreview(fileId string, download bool) ([]byte, *Response) {
-	r, appErr := c.DoApiGet(c.GetFileRoute(fileId)+fmt.Sprintf("/preview?download=%v", download), "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	data, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("DownloadFilePreview", "model.client.read_file.app_error", nil, err.Error(), r.StatusCode))
-	}
-	return data, BuildResponse(r)
-}
-
-// GetFileInfo gets all the file info objects.
-func (c *Client4) GetFileInfo(fileId string) (*FileInfo, *Response) {
-	r, err := c.DoApiGet(c.GetFileRoute(fileId)+"/info", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return FileInfoFromJson(r.Body), BuildResponse(r)
-}
-
-// GetFileInfosForPost gets all the file info objects attached to a post.
-func (c *Client4) GetFileInfosForPost(postId string, etag string) ([]*FileInfo, *Response) {
-	r, err := c.DoApiGet(c.GetPostRoute(postId)+"/files/info", etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return FileInfosFromJson(r.Body), BuildResponse(r)
-}
-
-// General/System Section
-
-// GenerateSupportPacket downloads the generated support packet
-func (c *Client4) GenerateSupportPacket() ([]byte, *Response) {
-	r, appErr := c.DoApiGet(c.GetSystemRoute()+"/support_packet", "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	data, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("GetFile", "model.client.read_job_result_file.app_error", nil, err.Error(), r.StatusCode))
-	}
-	return data, BuildResponse(r)
-}
-
-// GetPing will return ok if the running goRoutines are below the threshold and unhealthy for above.
-func (c *Client4) GetPing() (string, *Response) {
-	r, err := c.DoApiGet(c.GetSystemRoute()+"/ping", "")
-	if r != nil && r.StatusCode == 500 {
-		defer r.Body.Close()
-		return STATUS_UNHEALTHY, BuildErrorResponse(r, err)
-	}
-	if err != nil {
-		return "", BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return MapFromJson(r.Body)["status"], BuildResponse(r)
-}
-
-// GetPingWithServerStatus will return ok if several basic server health checks
-// all pass successfully.
-func (c *Client4) GetPingWithServerStatus() (string, *Response) {
-	r, err := c.DoApiGet(c.GetSystemRoute()+"/ping?get_server_status="+c.boolString(true), "")
-	if r != nil && r.StatusCode == 500 {
-		defer r.Body.Close()
-		return STATUS_UNHEALTHY, BuildErrorResponse(r, err)
-	}
-	if err != nil {
-		return "", BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return MapFromJson(r.Body)["status"], BuildResponse(r)
-}
-
-// GetPingWithFullServerStatus will return the full status if several basic server
-// health checks all pass successfully.
-func (c *Client4) GetPingWithFullServerStatus() (map[string]string, *Response) {
-	r, err := c.DoApiGet(c.GetSystemRoute()+"/ping?get_server_status="+c.boolString(true), "")
-	if r != nil && r.StatusCode == 500 {
-		defer r.Body.Close()
-		return map[string]string{"status": STATUS_UNHEALTHY}, BuildErrorResponse(r, err)
-	}
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return MapFromJson(r.Body), BuildResponse(r)
-}
-
-// TestEmail will attempt to connect to the configured SMTP server.
-func (c *Client4) TestEmail(config *Config) (bool, *Response) {
-	r, err := c.DoApiPost(c.GetTestEmailRoute(), config.ToJson())
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// TestSiteURL will test the validity of a site URL.
-func (c *Client4) TestSiteURL(siteURL string) (bool, *Response) {
-	requestBody := make(map[string]string)
-	requestBody["site_url"] = siteURL
-	r, err := c.DoApiPost(c.GetTestSiteURLRoute(), MapToJson(requestBody))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// TestS3Connection will attempt to connect to the AWS S3.
-func (c *Client4) TestS3Connection(config *Config) (bool, *Response) {
-	r, err := c.DoApiPost(c.GetTestS3Route(), config.ToJson())
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetConfig will retrieve the server config with some sanitized items.
-func (c *Client4) GetConfig() (*Config, *Response) {
-	r, err := c.DoApiGet(c.GetConfigRoute(), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ConfigFromJson(r.Body), BuildResponse(r)
-}
-
-// ReloadConfig will reload the server configuration.
-func (c *Client4) ReloadConfig() (bool, *Response) {
-	r, err := c.DoApiPost(c.GetConfigRoute()+"/reload", "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetOldClientConfig will retrieve the parts of the server configuration needed by the
-// client, formatted in the old format.
-func (c *Client4) GetOldClientConfig(etag string) (map[string]string, *Response) {
-	r, err := c.DoApiGet(c.GetConfigRoute()+"/client?format=old", etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return MapFromJson(r.Body), BuildResponse(r)
-}
-
-// GetEnvironmentConfig will retrieve a map mirroring the server configuration where fields
-// are set to true if the corresponding config setting is set through an environment variable.
-// Settings that haven't been set through environment variables will be missing from the map.
-func (c *Client4) GetEnvironmentConfig() (map[string]interface{}, *Response) {
-	r, err := c.DoApiGet(c.GetConfigRoute()+"/environment", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return StringInterfaceFromJson(r.Body), BuildResponse(r)
-}
-
-// GetOldClientLicense will retrieve the parts of the server license needed by the
-// client, formatted in the old format.
-func (c *Client4) GetOldClientLicense(etag string) (map[string]string, *Response) {
-	r, err := c.DoApiGet(c.GetLicenseRoute()+"/client?format=old", etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return MapFromJson(r.Body), BuildResponse(r)
-}
-
-// DatabaseRecycle will recycle the connections. Discard current connection and get new one.
-func (c *Client4) DatabaseRecycle() (bool, *Response) {
-	r, err := c.DoApiPost(c.GetDatabaseRoute()+"/recycle", "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// InvalidateCaches will purge the cache and can affect the performance while is cleaning.
-func (c *Client4) InvalidateCaches() (bool, *Response) {
-	r, err := c.DoApiPost(c.GetCacheRoute()+"/invalidate", "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// UpdateConfig will update the server configuration.
-func (c *Client4) UpdateConfig(config *Config) (*Config, *Response) {
-	r, err := c.DoApiPut(c.GetConfigRoute(), config.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ConfigFromJson(r.Body), BuildResponse(r)
-}
-
-// MigrateConfig will migrate existing config to the new one.
-func (c *Client4) MigrateConfig(from, to string) (bool, *Response) {
-	m := make(map[string]string, 2)
-	m["from"] = from
-	m["to"] = to
-	r, err := c.DoApiPost(c.GetConfigRoute()+"/migrate", MapToJson(m))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return true, BuildResponse(r)
-}
-
-// UploadLicenseFile will add a license file to the system.
-func (c *Client4) UploadLicenseFile(data []byte) (bool, *Response) {
-	body := &bytes.Buffer{}
-	writer := multipart.NewWriter(body)
-
-	part, err := writer.CreateFormFile("license", "test-license.mattermost-license")
-	if err != nil {
-		return false, &Response{Error: NewAppError("UploadLicenseFile", "model.client.set_profile_user.no_file.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	if _, err = io.Copy(part, bytes.NewBuffer(data)); err != nil {
-		return false, &Response{Error: NewAppError("UploadLicenseFile", "model.client.set_profile_user.no_file.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	if err = writer.Close(); err != nil {
-		return false, &Response{Error: NewAppError("UploadLicenseFile", "model.client.set_profile_user.writer.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	rq, err := http.NewRequest("POST", c.ApiUrl+c.GetLicenseRoute(), bytes.NewReader(body.Bytes()))
-	if err != nil {
-		return false, &Response{Error: NewAppError("UploadLicenseFile", "model.client.connecting.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-	rq.Header.Set("Content-Type", writer.FormDataContentType())
-
-	if c.AuthToken != "" {
-		rq.Header.Set(HEADER_AUTH, c.AuthType+" "+c.AuthToken)
-	}
-
-	rp, err := c.HttpClient.Do(rq)
-	if err != nil || rp == nil {
-		return false, &Response{StatusCode: http.StatusForbidden, Error: NewAppError(c.GetLicenseRoute(), "model.client.connecting.app_error", nil, err.Error(), http.StatusForbidden)}
-	}
-	defer closeBody(rp)
-
-	if rp.StatusCode >= 300 {
-		return false, BuildErrorResponse(rp, AppErrorFromJson(rp.Body))
-	}
-
-	return CheckStatusOK(rp), BuildResponse(rp)
-}
-
-// RemoveLicenseFile will remove the server license it exists. Note that this will
-// disable all enterprise features.
-func (c *Client4) RemoveLicenseFile() (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetLicenseRoute())
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetAnalyticsOld will retrieve analytics using the old format. New format is not
-// available but the "/analytics" endpoint is reserved for it. The "name" argument is optional
-// and defaults to "standard". The "teamId" argument is optional and will limit results
-// to a specific team.
-func (c *Client4) GetAnalyticsOld(name, teamId string) (AnalyticsRows, *Response) {
-	query := fmt.Sprintf("?name=%v&team_id=%v", name, teamId)
-	r, err := c.DoApiGet(c.GetAnalyticsRoute()+"/old"+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return AnalyticsRowsFromJson(r.Body), BuildResponse(r)
-}
-
-// Webhooks Section
-
-// CreateIncomingWebhook creates an incoming webhook for a channel.
-func (c *Client4) CreateIncomingWebhook(hook *IncomingWebhook) (*IncomingWebhook, *Response) {
-	r, err := c.DoApiPost(c.GetIncomingWebhooksRoute(), hook.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return IncomingWebhookFromJson(r.Body), BuildResponse(r)
-}
-
-// UpdateIncomingWebhook updates an incoming webhook for a channel.
-func (c *Client4) UpdateIncomingWebhook(hook *IncomingWebhook) (*IncomingWebhook, *Response) {
-	r, err := c.DoApiPut(c.GetIncomingWebhookRoute(hook.Id), hook.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return IncomingWebhookFromJson(r.Body), BuildResponse(r)
-}
-
-// GetIncomingWebhooks returns a page of incoming webhooks on the system. Page counting starts at 0.
-func (c *Client4) GetIncomingWebhooks(page int, perPage int, etag string) ([]*IncomingWebhook, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetIncomingWebhooksRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return IncomingWebhookListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetIncomingWebhooksForTeam returns a page of incoming webhooks for a team. Page counting starts at 0.
-func (c *Client4) GetIncomingWebhooksForTeam(teamId string, page int, perPage int, etag string) ([]*IncomingWebhook, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v&team_id=%v", page, perPage, teamId)
-	r, err := c.DoApiGet(c.GetIncomingWebhooksRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return IncomingWebhookListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetIncomingWebhook returns an Incoming webhook given the hook ID.
-func (c *Client4) GetIncomingWebhook(hookID string, etag string) (*IncomingWebhook, *Response) {
-	r, err := c.DoApiGet(c.GetIncomingWebhookRoute(hookID), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return IncomingWebhookFromJson(r.Body), BuildResponse(r)
-}
-
-// DeleteIncomingWebhook deletes and Incoming Webhook given the hook ID.
-func (c *Client4) DeleteIncomingWebhook(hookID string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetIncomingWebhookRoute(hookID))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// CreateOutgoingWebhook creates an outgoing webhook for a team or channel.
-func (c *Client4) CreateOutgoingWebhook(hook *OutgoingWebhook) (*OutgoingWebhook, *Response) {
-	r, err := c.DoApiPost(c.GetOutgoingWebhooksRoute(), hook.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return OutgoingWebhookFromJson(r.Body), BuildResponse(r)
-}
-
-// UpdateOutgoingWebhook creates an outgoing webhook for a team or channel.
-func (c *Client4) UpdateOutgoingWebhook(hook *OutgoingWebhook) (*OutgoingWebhook, *Response) {
-	r, err := c.DoApiPut(c.GetOutgoingWebhookRoute(hook.Id), hook.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return OutgoingWebhookFromJson(r.Body), BuildResponse(r)
-}
-
-// GetOutgoingWebhooks returns a page of outgoing webhooks on the system. Page counting starts at 0.
-func (c *Client4) GetOutgoingWebhooks(page int, perPage int, etag string) ([]*OutgoingWebhook, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetOutgoingWebhooksRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return OutgoingWebhookListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetOutgoingWebhook outgoing webhooks on the system requested by Hook Id.
-func (c *Client4) GetOutgoingWebhook(hookId string) (*OutgoingWebhook, *Response) {
-	r, err := c.DoApiGet(c.GetOutgoingWebhookRoute(hookId), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return OutgoingWebhookFromJson(r.Body), BuildResponse(r)
-}
-
-// GetOutgoingWebhooksForChannel returns a page of outgoing webhooks for a channel. Page counting starts at 0.
-func (c *Client4) GetOutgoingWebhooksForChannel(channelId string, page int, perPage int, etag string) ([]*OutgoingWebhook, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v&channel_id=%v", page, perPage, channelId)
-	r, err := c.DoApiGet(c.GetOutgoingWebhooksRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return OutgoingWebhookListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetOutgoingWebhooksForTeam returns a page of outgoing webhooks for a team. Page counting starts at 0.
-func (c *Client4) GetOutgoingWebhooksForTeam(teamId string, page int, perPage int, etag string) ([]*OutgoingWebhook, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v&team_id=%v", page, perPage, teamId)
-	r, err := c.DoApiGet(c.GetOutgoingWebhooksRoute()+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return OutgoingWebhookListFromJson(r.Body), BuildResponse(r)
-}
-
-// RegenOutgoingHookToken regenerate the outgoing webhook token.
-func (c *Client4) RegenOutgoingHookToken(hookId string) (*OutgoingWebhook, *Response) {
-	r, err := c.DoApiPost(c.GetOutgoingWebhookRoute(hookId)+"/regen_token", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return OutgoingWebhookFromJson(r.Body), BuildResponse(r)
-}
-
-// DeleteOutgoingWebhook delete the outgoing webhook on the system requested by Hook Id.
-func (c *Client4) DeleteOutgoingWebhook(hookId string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetOutgoingWebhookRoute(hookId))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// Preferences Section
-
-// GetPreferences returns the user's preferences.
-func (c *Client4) GetPreferences(userId string) (Preferences, *Response) {
-	r, err := c.DoApiGet(c.GetPreferencesRoute(userId), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	preferences, _ := PreferencesFromJson(r.Body)
-	return preferences, BuildResponse(r)
-}
-
-// UpdatePreferences saves the user's preferences.
-func (c *Client4) UpdatePreferences(userId string, preferences *Preferences) (bool, *Response) {
-	r, err := c.DoApiPut(c.GetPreferencesRoute(userId), preferences.ToJson())
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return true, BuildResponse(r)
-}
-
-// DeletePreferences deletes the user's preferences.
-func (c *Client4) DeletePreferences(userId string, preferences *Preferences) (bool, *Response) {
-	r, err := c.DoApiPost(c.GetPreferencesRoute(userId)+"/delete", preferences.ToJson())
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return true, BuildResponse(r)
-}
-
-// GetPreferencesByCategory returns the user's preferences from the provided category string.
-func (c *Client4) GetPreferencesByCategory(userId string, category string) (Preferences, *Response) {
-	url := fmt.Sprintf(c.GetPreferencesRoute(userId)+"/%s", category)
-	r, err := c.DoApiGet(url, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	preferences, _ := PreferencesFromJson(r.Body)
-	return preferences, BuildResponse(r)
-}
-
-// GetPreferenceByCategoryAndName returns the user's preferences from the provided category and preference name string.
-func (c *Client4) GetPreferenceByCategoryAndName(userId string, category string, preferenceName string) (*Preference, *Response) {
-	url := fmt.Sprintf(c.GetPreferencesRoute(userId)+"/%s/name/%v", category, preferenceName)
-	r, err := c.DoApiGet(url, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PreferenceFromJson(r.Body), BuildResponse(r)
-}
-
-// SAML Section
-
-// GetSamlMetadata returns metadata for the SAML configuration.
-func (c *Client4) GetSamlMetadata() (string, *Response) {
-	r, err := c.DoApiGet(c.GetSamlRoute()+"/metadata", "")
-	if err != nil {
-		return "", BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	buf := new(bytes.Buffer)
-	_, _ = buf.ReadFrom(r.Body)
-	return buf.String(), BuildResponse(r)
-}
-
-func fileToMultipart(data []byte, filename string) ([]byte, *multipart.Writer, error) {
-	body := &bytes.Buffer{}
-	writer := multipart.NewWriter(body)
-
-	part, err := writer.CreateFormFile("certificate", filename)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if _, err = io.Copy(part, bytes.NewBuffer(data)); err != nil {
-		return nil, nil, err
-	}
-
-	if err := writer.Close(); err != nil {
-		return nil, nil, err
-	}
-
-	return body.Bytes(), writer, nil
-}
-
-// UploadSamlIdpCertificate will upload an IDP certificate for SAML and set the config to use it.
-// The filename parameter is deprecated and ignored: the server will pick a hard-coded filename when writing to disk.
-func (c *Client4) UploadSamlIdpCertificate(data []byte, filename string) (bool, *Response) {
-	body, writer, err := fileToMultipart(data, filename)
-	if err != nil {
-		return false, &Response{Error: NewAppError("UploadSamlIdpCertificate", "model.client.upload_saml_cert.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	_, resp := c.DoUploadFile(c.GetSamlRoute()+"/certificate/idp", body, writer.FormDataContentType())
-	return resp.Error == nil, resp
-}
-
-// UploadSamlPublicCertificate will upload a public certificate for SAML and set the config to use it.
-// The filename parameter is deprecated and ignored: the server will pick a hard-coded filename when writing to disk.
-func (c *Client4) UploadSamlPublicCertificate(data []byte, filename string) (bool, *Response) {
-	body, writer, err := fileToMultipart(data, filename)
-	if err != nil {
-		return false, &Response{Error: NewAppError("UploadSamlPublicCertificate", "model.client.upload_saml_cert.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	_, resp := c.DoUploadFile(c.GetSamlRoute()+"/certificate/public", body, writer.FormDataContentType())
-	return resp.Error == nil, resp
-}
-
-// UploadSamlPrivateCertificate will upload a private key for SAML and set the config to use it.
-// The filename parameter is deprecated and ignored: the server will pick a hard-coded filename when writing to disk.
-func (c *Client4) UploadSamlPrivateCertificate(data []byte, filename string) (bool, *Response) {
-	body, writer, err := fileToMultipart(data, filename)
-	if err != nil {
-		return false, &Response{Error: NewAppError("UploadSamlPrivateCertificate", "model.client.upload_saml_cert.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	_, resp := c.DoUploadFile(c.GetSamlRoute()+"/certificate/private", body, writer.FormDataContentType())
-	return resp.Error == nil, resp
-}
-
-// DeleteSamlIdpCertificate deletes the SAML IDP certificate from the server and updates the config to not use it and disable SAML.
-func (c *Client4) DeleteSamlIdpCertificate() (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetSamlRoute() + "/certificate/idp")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// DeleteSamlPublicCertificate deletes the SAML IDP certificate from the server and updates the config to not use it and disable SAML.
-func (c *Client4) DeleteSamlPublicCertificate() (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetSamlRoute() + "/certificate/public")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// DeleteSamlPrivateCertificate deletes the SAML IDP certificate from the server and updates the config to not use it and disable SAML.
-func (c *Client4) DeleteSamlPrivateCertificate() (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetSamlRoute() + "/certificate/private")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetSamlCertificateStatus returns metadata for the SAML configuration.
-func (c *Client4) GetSamlCertificateStatus() (*SamlCertificateStatus, *Response) {
-	r, err := c.DoApiGet(c.GetSamlRoute()+"/certificate/status", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return SamlCertificateStatusFromJson(r.Body), BuildResponse(r)
-}
-
-func (c *Client4) GetSamlMetadataFromIdp(samlMetadataURL string) (*SamlMetadataResponse, *Response) {
-	requestBody := make(map[string]string)
-	requestBody["saml_metadata_url"] = samlMetadataURL
-	r, err := c.DoApiPost(c.GetSamlRoute()+"/metadatafromidp", MapToJson(requestBody))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-
-	defer closeBody(r)
-	return SamlMetadataResponseFromJson(r.Body), BuildResponse(r)
-}
-
-// ResetSamlAuthDataToEmail resets the AuthData field of SAML users to their Email.
-func (c *Client4) ResetSamlAuthDataToEmail(includeDeleted bool, dryRun bool, userIDs []string) (int64, *Response) {
-	params := map[string]interface{}{
-		"include_deleted": includeDeleted,
-		"dry_run":         dryRun,
-		"user_ids":        userIDs,
-	}
-	b, _ := json.Marshal(params)
-	r, err := c.doApiPostBytes(c.GetSamlRoute()+"/reset_auth_data", b)
-	if err != nil {
-		return 0, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	respBody := map[string]int64{}
-	jsonErr := json.NewDecoder(r.Body).Decode(&respBody)
-	if jsonErr != nil {
-		appErr := NewAppError("Api4.ResetSamlAuthDataToEmail", "api.marshal_error", nil, err.Error(), http.StatusInternalServerError)
-		return 0, BuildErrorResponse(r, appErr)
-	}
-	return respBody["num_affected"], BuildResponse(r)
-}
-
-// Compliance Section
-
-// CreateComplianceReport creates an incoming webhook for a channel.
-func (c *Client4) CreateComplianceReport(report *Compliance) (*Compliance, *Response) {
-	r, err := c.DoApiPost(c.GetComplianceReportsRoute(), report.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ComplianceFromJson(r.Body), BuildResponse(r)
-}
-
-// GetComplianceReports returns list of compliance reports.
-func (c *Client4) GetComplianceReports(page, perPage int) (Compliances, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetComplianceReportsRoute()+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CompliancesFromJson(r.Body), BuildResponse(r)
-}
-
-// GetComplianceReport returns a compliance report.
-func (c *Client4) GetComplianceReport(reportId string) (*Compliance, *Response) {
-	r, err := c.DoApiGet(c.GetComplianceReportRoute(reportId), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ComplianceFromJson(r.Body), BuildResponse(r)
-}
-
-// DownloadComplianceReport returns a full compliance report as a file.
-func (c *Client4) DownloadComplianceReport(reportId string) ([]byte, *Response) {
-	rq, err := http.NewRequest("GET", c.ApiUrl+c.GetComplianceReportDownloadRoute(reportId), nil)
-	if err != nil {
-		return nil, &Response{Error: NewAppError("DownloadComplianceReport", "model.client.connecting.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	if c.AuthToken != "" {
-		rq.Header.Set(HEADER_AUTH, "BEARER "+c.AuthToken)
-	}
-
-	rp, err := c.HttpClient.Do(rq)
-	if err != nil || rp == nil {
-		return nil, &Response{Error: NewAppError("DownloadComplianceReport", "model.client.connecting.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-	defer closeBody(rp)
-
-	if rp.StatusCode >= 300 {
-		return nil, BuildErrorResponse(rp, AppErrorFromJson(rp.Body))
-	}
-
-	data, err := ioutil.ReadAll(rp.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(rp, NewAppError("DownloadComplianceReport", "model.client.read_file.app_error", nil, err.Error(), rp.StatusCode))
-	}
-
-	return data, BuildResponse(rp)
-}
-
-// Cluster Section
-
-// GetClusterStatus returns the status of all the configured cluster nodes.
-func (c *Client4) GetClusterStatus() ([]*ClusterInfo, *Response) {
-	r, err := c.DoApiGet(c.GetClusterRoute()+"/status", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ClusterInfosFromJson(r.Body), BuildResponse(r)
-}
-
-// LDAP Section
-
-// SyncLdap will force a sync with the configured LDAP server.
-// If includeRemovedMembers is true, then group members who left or were removed from a
-// synced team/channel will be re-joined; otherwise, they will be excluded.
-func (c *Client4) SyncLdap(includeRemovedMembers bool) (bool, *Response) {
-	reqBody, _ := json.Marshal(map[string]interface{}{
-		"include_removed_members": includeRemovedMembers,
-	})
-	r, err := c.doApiPostBytes(c.GetLdapRoute()+"/sync", reqBody)
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// TestLdap will attempt to connect to the configured LDAP server and return OK if configured
-// correctly.
-func (c *Client4) TestLdap() (bool, *Response) {
-	r, err := c.DoApiPost(c.GetLdapRoute()+"/test", "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetLdapGroups retrieves the immediate child groups of the given parent group.
-func (c *Client4) GetLdapGroups() ([]*Group, *Response) {
-	path := fmt.Sprintf("%s/groups", c.GetLdapRoute())
-
-	r, appErr := c.DoApiGet(path, "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	responseData := struct {
-		Count  int      `json:"count"`
-		Groups []*Group `json:"groups"`
-	}{}
-	if err := json.NewDecoder(r.Body).Decode(&responseData); err != nil {
-		appErr := NewAppError("Api4.GetLdapGroups", "api.marshal_error", nil, err.Error(), http.StatusInternalServerError)
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	for i := range responseData.Groups {
-		responseData.Groups[i].DisplayName = *responseData.Groups[i].Name
-	}
-
-	return responseData.Groups, BuildResponse(r)
-}
-
-// LinkLdapGroup creates or undeletes a Mattermost group and associates it to the given LDAP group DN.
-func (c *Client4) LinkLdapGroup(dn string) (*Group, *Response) {
-	path := fmt.Sprintf("%s/groups/%s/link", c.GetLdapRoute(), dn)
-
-	r, appErr := c.DoApiPost(path, "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	return GroupFromJson(r.Body), BuildResponse(r)
-}
-
-// UnlinkLdapGroup deletes the Mattermost group associated with the given LDAP group DN.
-func (c *Client4) UnlinkLdapGroup(dn string) (*Group, *Response) {
-	path := fmt.Sprintf("%s/groups/%s/link", c.GetLdapRoute(), dn)
-
-	r, appErr := c.DoApiDelete(path)
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	return GroupFromJson(r.Body), BuildResponse(r)
-}
-
-// MigrateIdLdap migrates the LDAP enabled users to given attribute
-func (c *Client4) MigrateIdLdap(toAttribute string) (bool, *Response) {
-	r, err := c.DoApiPost(c.GetLdapRoute()+"/migrateid", MapToJson(map[string]string{
-		"toAttribute": toAttribute,
-	}))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetGroupsByChannel retrieves the Mattermost Groups associated with a given channel
-func (c *Client4) GetGroupsByChannel(channelId string, opts GroupSearchOpts) ([]*GroupWithSchemeAdmin, int, *Response) {
-	path := fmt.Sprintf("%s/groups?q=%v&include_member_count=%v&filter_allow_reference=%v", c.GetChannelRoute(channelId), opts.Q, opts.IncludeMemberCount, opts.FilterAllowReference)
-	if opts.PageOpts != nil {
-		path = fmt.Sprintf("%s&page=%v&per_page=%v", path, opts.PageOpts.Page, opts.PageOpts.PerPage)
-	}
-	r, appErr := c.DoApiGet(path, "")
-	if appErr != nil {
-		return nil, 0, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	responseData := struct {
-		Groups []*GroupWithSchemeAdmin `json:"groups"`
-		Count  int                     `json:"total_group_count"`
-	}{}
-	if err := json.NewDecoder(r.Body).Decode(&responseData); err != nil {
-		appErr := NewAppError("Api4.GetGroupsByChannel", "api.marshal_error", nil, err.Error(), http.StatusInternalServerError)
-		return nil, 0, BuildErrorResponse(r, appErr)
-	}
-
-	return responseData.Groups, responseData.Count, BuildResponse(r)
-}
-
-// GetGroupsByTeam retrieves the Mattermost Groups associated with a given team
-func (c *Client4) GetGroupsByTeam(teamId string, opts GroupSearchOpts) ([]*GroupWithSchemeAdmin, int, *Response) {
-	path := fmt.Sprintf("%s/groups?q=%v&include_member_count=%v&filter_allow_reference=%v", c.GetTeamRoute(teamId), opts.Q, opts.IncludeMemberCount, opts.FilterAllowReference)
-	if opts.PageOpts != nil {
-		path = fmt.Sprintf("%s&page=%v&per_page=%v", path, opts.PageOpts.Page, opts.PageOpts.PerPage)
-	}
-	r, appErr := c.DoApiGet(path, "")
-	if appErr != nil {
-		return nil, 0, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	responseData := struct {
-		Groups []*GroupWithSchemeAdmin `json:"groups"`
-		Count  int                     `json:"total_group_count"`
-	}{}
-	if err := json.NewDecoder(r.Body).Decode(&responseData); err != nil {
-		appErr := NewAppError("Api4.GetGroupsByTeam", "api.marshal_error", nil, err.Error(), http.StatusInternalServerError)
-		return nil, 0, BuildErrorResponse(r, appErr)
-	}
-
-	return responseData.Groups, responseData.Count, BuildResponse(r)
-}
-
-// GetGroupsAssociatedToChannelsByTeam retrieves the Mattermost Groups associated with channels in a given team
-func (c *Client4) GetGroupsAssociatedToChannelsByTeam(teamId string, opts GroupSearchOpts) (map[string][]*GroupWithSchemeAdmin, *Response) {
-	path := fmt.Sprintf("%s/groups_by_channels?q=%v&filter_allow_reference=%v", c.GetTeamRoute(teamId), opts.Q, opts.FilterAllowReference)
-	if opts.PageOpts != nil {
-		path = fmt.Sprintf("%s&page=%v&per_page=%v", path, opts.PageOpts.Page, opts.PageOpts.PerPage)
-	}
-	r, appErr := c.DoApiGet(path, "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	responseData := struct {
-		GroupsAssociatedToChannels map[string][]*GroupWithSchemeAdmin `json:"groups"`
-	}{}
-	if err := json.NewDecoder(r.Body).Decode(&responseData); err != nil {
-		appErr := NewAppError("Api4.GetGroupsAssociatedToChannelsByTeam", "api.marshal_error", nil, err.Error(), http.StatusInternalServerError)
-		return nil, BuildErrorResponse(r, appErr)
-	}
-
-	return responseData.GroupsAssociatedToChannels, BuildResponse(r)
-}
-
-// GetGroups retrieves Mattermost Groups
-func (c *Client4) GetGroups(opts GroupSearchOpts) ([]*Group, *Response) {
-	path := fmt.Sprintf(
-		"%s?include_member_count=%v&not_associated_to_team=%v&not_associated_to_channel=%v&filter_allow_reference=%v&q=%v&filter_parent_team_permitted=%v",
-		c.GetGroupsRoute(),
-		opts.IncludeMemberCount,
-		opts.NotAssociatedToTeam,
-		opts.NotAssociatedToChannel,
-		opts.FilterAllowReference,
-		opts.Q,
-		opts.FilterParentTeamPermitted,
-	)
-	if opts.Since > 0 {
-		path = fmt.Sprintf("%s&since=%v", path, opts.Since)
-	}
-	if opts.PageOpts != nil {
-		path = fmt.Sprintf("%s&page=%v&per_page=%v", path, opts.PageOpts.Page, opts.PageOpts.PerPage)
-	}
-	r, appErr := c.DoApiGet(path, "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	return GroupsFromJson(r.Body), BuildResponse(r)
-}
-
-// GetGroupsByUserId retrieves Mattermost Groups for a user
-func (c *Client4) GetGroupsByUserId(userId string) ([]*Group, *Response) {
-	path := fmt.Sprintf(
-		"%s/%v/groups",
-		c.GetUsersRoute(),
-		userId,
-	)
-
-	r, appErr := c.DoApiGet(path, "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	return GroupsFromJson(r.Body), BuildResponse(r)
-}
-
-func (c *Client4) MigrateAuthToLdap(fromAuthService string, matchField string, force bool) (bool, *Response) {
-	r, err := c.DoApiPost(c.GetUsersRoute()+"/migrate_auth/ldap", StringInterfaceToJson(map[string]interface{}{
-		"from":        fromAuthService,
-		"force":       force,
-		"match_field": matchField,
-	}))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-func (c *Client4) MigrateAuthToSaml(fromAuthService string, usersMap map[string]string, auto bool) (bool, *Response) {
-	r, err := c.DoApiPost(c.GetUsersRoute()+"/migrate_auth/saml", StringInterfaceToJson(map[string]interface{}{
-		"from":    fromAuthService,
-		"auto":    auto,
-		"matches": usersMap,
-	}))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// UploadLdapPublicCertificate will upload a public certificate for LDAP and set the config to use it.
-func (c *Client4) UploadLdapPublicCertificate(data []byte) (bool, *Response) {
-	body, writer, err := fileToMultipart(data, LDAP_PUBLIC_CERTIFICATE_NAME)
-	if err != nil {
-		return false, &Response{Error: NewAppError("UploadLdapPublicCertificate", "model.client.upload_ldap_cert.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	_, resp := c.DoUploadFile(c.GetLdapRoute()+"/certificate/public", body, writer.FormDataContentType())
-	return resp.Error == nil, resp
-}
-
-// UploadLdapPrivateCertificate will upload a private key for LDAP and set the config to use it.
-func (c *Client4) UploadLdapPrivateCertificate(data []byte) (bool, *Response) {
-	body, writer, err := fileToMultipart(data, LDAP_PRIVATE_KEY_NAME)
-	if err != nil {
-		return false, &Response{Error: NewAppError("UploadLdapPrivateCertificate", "model.client.upload_Ldap_cert.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	_, resp := c.DoUploadFile(c.GetLdapRoute()+"/certificate/private", body, writer.FormDataContentType())
-	return resp.Error == nil, resp
-}
-
-// DeleteLdapPublicCertificate deletes the LDAP IDP certificate from the server and updates the config to not use it and disable LDAP.
-func (c *Client4) DeleteLdapPublicCertificate() (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetLdapRoute() + "/certificate/public")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// DeleteLDAPPrivateCertificate deletes the LDAP IDP certificate from the server and updates the config to not use it and disable LDAP.
-func (c *Client4) DeleteLdapPrivateCertificate() (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetLdapRoute() + "/certificate/private")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// Audits Section
-
-// GetAudits returns a list of audits for the whole system.
-func (c *Client4) GetAudits(page int, perPage int, etag string) (Audits, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet("/audits"+query, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return AuditsFromJson(r.Body), BuildResponse(r)
-}
-
-// Brand Section
-
-// GetBrandImage retrieves the previously uploaded brand image.
-func (c *Client4) GetBrandImage() ([]byte, *Response) {
-	r, appErr := c.DoApiGet(c.GetBrandRoute()+"/image", "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	if r.StatusCode >= 300 {
-		return nil, BuildErrorResponse(r, AppErrorFromJson(r.Body))
-	}
-
-	data, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("GetBrandImage", "model.client.read_file.app_error", nil, err.Error(), r.StatusCode))
-	}
-
-	return data, BuildResponse(r)
-}
-
-// DeleteBrandImage deletes the brand image for the system.
-func (c *Client4) DeleteBrandImage() *Response {
-	r, err := c.DoApiDelete(c.GetBrandRoute() + "/image")
-	if err != nil {
-		return BuildErrorResponse(r, err)
-	}
-	return BuildResponse(r)
-}
-
-// UploadBrandImage sets the brand image for the system.
-func (c *Client4) UploadBrandImage(data []byte) (bool, *Response) {
-	body := &bytes.Buffer{}
-	writer := multipart.NewWriter(body)
-
-	part, err := writer.CreateFormFile("image", "brand.png")
-	if err != nil {
-		return false, &Response{Error: NewAppError("UploadBrandImage", "model.client.set_profile_user.no_file.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	if _, err = io.Copy(part, bytes.NewBuffer(data)); err != nil {
-		return false, &Response{Error: NewAppError("UploadBrandImage", "model.client.set_profile_user.no_file.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	if err = writer.Close(); err != nil {
-		return false, &Response{Error: NewAppError("UploadBrandImage", "model.client.set_profile_user.writer.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-
-	rq, err := http.NewRequest("POST", c.ApiUrl+c.GetBrandRoute()+"/image", bytes.NewReader(body.Bytes()))
-	if err != nil {
-		return false, &Response{Error: NewAppError("UploadBrandImage", "model.client.connecting.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-	rq.Header.Set("Content-Type", writer.FormDataContentType())
-
-	if c.AuthToken != "" {
-		rq.Header.Set(HEADER_AUTH, c.AuthType+" "+c.AuthToken)
-	}
-
-	rp, err := c.HttpClient.Do(rq)
-	if err != nil || rp == nil {
-		return false, &Response{StatusCode: http.StatusForbidden, Error: NewAppError(c.GetBrandRoute()+"/image", "model.client.connecting.app_error", nil, err.Error(), http.StatusForbidden)}
-	}
-	defer closeBody(rp)
-
-	if rp.StatusCode >= 300 {
-		return false, BuildErrorResponse(rp, AppErrorFromJson(rp.Body))
-	}
-
-	return CheckStatusOK(rp), BuildResponse(rp)
-}
-
-// Logs Section
-
-// GetLogs page of logs as a string array.
-func (c *Client4) GetLogs(page, perPage int) ([]string, *Response) {
-	query := fmt.Sprintf("?page=%v&logs_per_page=%v", page, perPage)
-	r, err := c.DoApiGet("/logs"+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ArrayFromJson(r.Body), BuildResponse(r)
-}
-
-// PostLog is a convenience Web Service call so clients can log messages into
-// the server-side logs. For example we typically log javascript error messages
-// into the server-side. It returns the log message if the logging was successful.
-func (c *Client4) PostLog(message map[string]string) (map[string]string, *Response) {
-	r, err := c.DoApiPost("/logs", MapToJson(message))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return MapFromJson(r.Body), BuildResponse(r)
-}
-
-// OAuth Section
-
-// CreateOAuthApp will register a new OAuth 2.0 client application with Mattermost acting as an OAuth 2.0 service provider.
-func (c *Client4) CreateOAuthApp(app *OAuthApp) (*OAuthApp, *Response) {
-	r, err := c.DoApiPost(c.GetOAuthAppsRoute(), app.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return OAuthAppFromJson(r.Body), BuildResponse(r)
-}
-
-// UpdateOAuthApp updates a page of registered OAuth 2.0 client applications with Mattermost acting as an OAuth 2.0 service provider.
-func (c *Client4) UpdateOAuthApp(app *OAuthApp) (*OAuthApp, *Response) {
-	r, err := c.DoApiPut(c.GetOAuthAppRoute(app.Id), app.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return OAuthAppFromJson(r.Body), BuildResponse(r)
-}
-
-// GetOAuthApps gets a page of registered OAuth 2.0 client applications with Mattermost acting as an OAuth 2.0 service provider.
-func (c *Client4) GetOAuthApps(page, perPage int) ([]*OAuthApp, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetOAuthAppsRoute()+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return OAuthAppListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetOAuthApp gets a registered OAuth 2.0 client application with Mattermost acting as an OAuth 2.0 service provider.
-func (c *Client4) GetOAuthApp(appId string) (*OAuthApp, *Response) {
-	r, err := c.DoApiGet(c.GetOAuthAppRoute(appId), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return OAuthAppFromJson(r.Body), BuildResponse(r)
-}
-
-// GetOAuthAppInfo gets a sanitized version of a registered OAuth 2.0 client application with Mattermost acting as an OAuth 2.0 service provider.
-func (c *Client4) GetOAuthAppInfo(appId string) (*OAuthApp, *Response) {
-	r, err := c.DoApiGet(c.GetOAuthAppRoute(appId)+"/info", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return OAuthAppFromJson(r.Body), BuildResponse(r)
-}
-
-// DeleteOAuthApp deletes a registered OAuth 2.0 client application.
-func (c *Client4) DeleteOAuthApp(appId string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetOAuthAppRoute(appId))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// RegenerateOAuthAppSecret regenerates the client secret for a registered OAuth 2.0 client application.
-func (c *Client4) RegenerateOAuthAppSecret(appId string) (*OAuthApp, *Response) {
-	r, err := c.DoApiPost(c.GetOAuthAppRoute(appId)+"/regen_secret", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return OAuthAppFromJson(r.Body), BuildResponse(r)
-}
-
-// GetAuthorizedOAuthAppsForUser gets a page of OAuth 2.0 client applications the user has authorized to use access their account.
-func (c *Client4) GetAuthorizedOAuthAppsForUser(userId string, page, perPage int) ([]*OAuthApp, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetUserRoute(userId)+"/oauth/apps/authorized"+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return OAuthAppListFromJson(r.Body), BuildResponse(r)
-}
-
-// AuthorizeOAuthApp will authorize an OAuth 2.0 client application to access a user's account and provide a redirect link to follow.
-func (c *Client4) AuthorizeOAuthApp(authRequest *AuthorizeRequest) (string, *Response) {
-	r, err := c.DoApiRequest(http.MethodPost, c.Url+"/oauth/authorize", authRequest.ToJson(), "")
-	if err != nil {
-		return "", BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return MapFromJson(r.Body)["redirect"], BuildResponse(r)
-}
-
-// DeauthorizeOAuthApp will deauthorize an OAuth 2.0 client application from accessing a user's account.
-func (c *Client4) DeauthorizeOAuthApp(appId string) (bool, *Response) {
-	requestData := map[string]string{"client_id": appId}
-	r, err := c.DoApiRequest(http.MethodPost, c.Url+"/oauth/deauthorize", MapToJson(requestData), "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetOAuthAccessToken is a test helper function for the OAuth access token endpoint.
-func (c *Client4) GetOAuthAccessToken(data url.Values) (*AccessResponse, *Response) {
-	rq, err := http.NewRequest(http.MethodPost, c.Url+"/oauth/access_token", strings.NewReader(data.Encode()))
-	if err != nil {
-		return nil, &Response{Error: NewAppError(c.Url+"/oauth/access_token", "model.client.connecting.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-	rq.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-
-	if c.AuthToken != "" {
-		rq.Header.Set(HEADER_AUTH, c.AuthType+" "+c.AuthToken)
-	}
-
-	rp, err := c.HttpClient.Do(rq)
-	if err != nil || rp == nil {
-		return nil, &Response{StatusCode: http.StatusForbidden, Error: NewAppError(c.Url+"/oauth/access_token", "model.client.connecting.app_error", nil, err.Error(), 403)}
-	}
-	defer closeBody(rp)
-
-	if rp.StatusCode >= 300 {
-		return nil, BuildErrorResponse(rp, AppErrorFromJson(rp.Body))
-	}
-
-	return AccessResponseFromJson(rp.Body), BuildResponse(rp)
-}
-
-// Elasticsearch Section
-
-// TestElasticsearch will attempt to connect to the configured Elasticsearch server and return OK if configured.
-// correctly.
-func (c *Client4) TestElasticsearch() (bool, *Response) {
-	r, err := c.DoApiPost(c.GetElasticsearchRoute()+"/test", "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// PurgeElasticsearchIndexes immediately deletes all Elasticsearch indexes.
-func (c *Client4) PurgeElasticsearchIndexes() (bool, *Response) {
-	r, err := c.DoApiPost(c.GetElasticsearchRoute()+"/purge_indexes", "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// Bleve Section
-
-// PurgeBleveIndexes immediately deletes all Bleve indexes.
-func (c *Client4) PurgeBleveIndexes() (bool, *Response) {
-	r, err := c.DoApiPost(c.GetBleveRoute()+"/purge_indexes", "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// Data Retention Section
-
-// GetDataRetentionPolicy will get the current global data retention policy details.
-func (c *Client4) GetDataRetentionPolicy() (*GlobalRetentionPolicy, *Response) {
-	r, err := c.DoApiGet(c.GetDataRetentionRoute()+"/policy", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return GlobalRetentionPolicyFromJson(r.Body), BuildResponse(r)
-}
-
-// GetDataRetentionPolicyByID will get the details for the granular data retention policy with the specified ID.
-func (c *Client4) GetDataRetentionPolicyByID(policyID string) (*RetentionPolicyWithTeamAndChannelCounts, *Response) {
-	r, appErr := c.DoApiGet(c.GetDataRetentionPolicyRoute(policyID), "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	policy, err := RetentionPolicyWithTeamAndChannelCountsFromJson(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("Client4.GetDataRetentionPolicyByID", "model.utils.decode_json.app_error", nil, err.Error(), r.StatusCode))
-	}
-	return policy, BuildResponse(r)
-}
-
-// GetDataRetentionPoliciesCount will get the total number of granular data retention policies.
-func (c *Client4) GetDataRetentionPoliciesCount() (int64, *Response) {
-	type CountBody struct {
-		TotalCount int64 `json:"total_count"`
-	}
-	r, appErr := c.DoApiGet(c.GetDataRetentionRoute()+"/policies_count", "")
-	if appErr != nil {
-		return 0, BuildErrorResponse(r, appErr)
-	}
-	var countObj CountBody
-	jsonErr := json.NewDecoder(r.Body).Decode(&countObj)
-	if jsonErr != nil {
-		return 0, BuildErrorResponse(r, NewAppError("Client4.GetDataRetentionPoliciesCount", "model.utils.decode_json.app_error", nil, jsonErr.Error(), r.StatusCode))
-	}
-	return countObj.TotalCount, BuildResponse(r)
-}
-
-// GetDataRetentionPolicies will get the current granular data retention policies' details.
-func (c *Client4) GetDataRetentionPolicies(page, perPage int) (*RetentionPolicyWithTeamAndChannelCountsList, *Response) {
-	query := fmt.Sprintf("?page=%d&per_page=%d", page, perPage)
-	r, appErr := c.DoApiGet(c.GetDataRetentionRoute()+"/policies"+query, "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	policies, err := RetentionPolicyWithTeamAndChannelCountsListFromJson(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("Client4.GetDataRetentionPolicies", "model.utils.decode_json.app_error", nil, err.Error(), r.StatusCode))
-	}
-	return policies, BuildResponse(r)
-}
-
-// CreateDataRetentionPolicy will create a new granular data retention policy which will be applied to
-// the specified teams and channels. The Id field of `policy` must be empty.
-func (c *Client4) CreateDataRetentionPolicy(policy *RetentionPolicyWithTeamAndChannelIDs) (*RetentionPolicyWithTeamAndChannelCounts, *Response) {
-	r, appErr := c.doApiPostBytes(c.GetDataRetentionRoute()+"/policies", policy.ToJson())
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	newPolicy, err := RetentionPolicyWithTeamAndChannelCountsFromJson(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("Client4.CreateDataRetentionPolicy", "model.utils.decode_json.app_error", nil, err.Error(), r.StatusCode))
-	}
-	return newPolicy, BuildResponse(r)
-}
-
-// DeleteDataRetentionPolicy will delete the granular data retention policy with the specified ID.
-func (c *Client4) DeleteDataRetentionPolicy(policyID string) *Response {
-	r, appErr := c.DoApiDelete(c.GetDataRetentionPolicyRoute(policyID))
-	if appErr != nil {
-		return BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	return BuildResponse(r)
-}
-
-// PatchDataRetentionPolicy will patch the granular data retention policy with the specified ID.
-// The Id field of `patch` must be non-empty.
-func (c *Client4) PatchDataRetentionPolicy(patch *RetentionPolicyWithTeamAndChannelIDs) (*RetentionPolicyWithTeamAndChannelCounts, *Response) {
-	r, appErr := c.doApiPatchBytes(c.GetDataRetentionPolicyRoute(patch.ID), patch.ToJson())
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	policy, err := RetentionPolicyWithTeamAndChannelCountsFromJson(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("Client4.PatchDataRetentionPolicy", "model.utils.decode_json.app_error", nil, err.Error(), r.StatusCode))
-	}
-	return policy, BuildResponse(r)
-}
-
-// GetTeamsForRetentionPolicy will get the teams to which the specified policy is currently applied.
-func (c *Client4) GetTeamsForRetentionPolicy(policyID string, page, perPage int) (*TeamsWithCount, *Response) {
-	query := fmt.Sprintf("?page=%d&per_page=%d", page, perPage)
-	r, appErr := c.DoApiGet(c.GetDataRetentionPolicyRoute(policyID)+"/teams"+query, "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	var teams *TeamsWithCount
-	jsonErr := json.NewDecoder(r.Body).Decode(&teams)
-	if jsonErr != nil {
-		return nil, BuildErrorResponse(r, NewAppError("Client4.GetTeamsForRetentionPolicy", "model.utils.decode_json.app_error", nil, jsonErr.Error(), r.StatusCode))
-	}
-	return teams, BuildResponse(r)
-}
-
-// SearchTeamsForRetentionPolicy will search the teams to which the specified policy is currently applied.
-func (c *Client4) SearchTeamsForRetentionPolicy(policyID string, term string) ([]*Team, *Response) {
-	body, _ := json.Marshal(map[string]interface{}{"term": term})
-	r, appErr := c.doApiPostBytes(c.GetDataRetentionPolicyRoute(policyID)+"/teams/search", body)
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	var teams []*Team
-	jsonErr := json.NewDecoder(r.Body).Decode(&teams)
-	if jsonErr != nil {
-		return nil, BuildErrorResponse(r, NewAppError("Client4.SearchTeamsForRetentionPolicy", "model.utils.decode_json.app_error", nil, jsonErr.Error(), r.StatusCode))
-	}
-	return teams, BuildResponse(r)
-}
-
-// AddTeamsToRetentionPolicy will add the specified teams to the granular data retention policy
-// with the specified ID.
-func (c *Client4) AddTeamsToRetentionPolicy(policyID string, teamIDs []string) *Response {
-	body, _ := json.Marshal(teamIDs)
-	r, appErr := c.doApiPostBytes(c.GetDataRetentionPolicyRoute(policyID)+"/teams", body)
-	if appErr != nil {
-		return BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	return BuildResponse(r)
-}
-
-// RemoveTeamsFromRetentionPolicy will remove the specified teams from the granular data retention policy
-// with the specified ID.
-func (c *Client4) RemoveTeamsFromRetentionPolicy(policyID string, teamIDs []string) *Response {
-	body, _ := json.Marshal(teamIDs)
-	r, appErr := c.doApiDeleteBytes(c.GetDataRetentionPolicyRoute(policyID)+"/teams", body)
-	if appErr != nil {
-		return BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	return BuildResponse(r)
-}
-
-// GetChannelsForRetentionPolicy will get the channels to which the specified policy is currently applied.
-func (c *Client4) GetChannelsForRetentionPolicy(policyID string, page, perPage int) (*ChannelsWithCount, *Response) {
-	query := fmt.Sprintf("?page=%d&per_page=%d", page, perPage)
-	r, appErr := c.DoApiGet(c.GetDataRetentionPolicyRoute(policyID)+"/channels"+query, "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	var channels *ChannelsWithCount
-	jsonErr := json.NewDecoder(r.Body).Decode(&channels)
-	if jsonErr != nil {
-		return nil, BuildErrorResponse(r, NewAppError("Client4.GetChannelsForRetentionPolicy", "model.utils.decode_json.app_error", nil, jsonErr.Error(), r.StatusCode))
-	}
-	return channels, BuildResponse(r)
-}
-
-// SearchChannelsForRetentionPolicy will search the channels to which the specified policy is currently applied.
-func (c *Client4) SearchChannelsForRetentionPolicy(policyID string, term string) (ChannelListWithTeamData, *Response) {
-	body, _ := json.Marshal(map[string]interface{}{"term": term})
-	r, appErr := c.doApiPostBytes(c.GetDataRetentionPolicyRoute(policyID)+"/channels/search", body)
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	var channels ChannelListWithTeamData
-	jsonErr := json.NewDecoder(r.Body).Decode(&channels)
-	if jsonErr != nil {
-		return nil, BuildErrorResponse(r, NewAppError("Client4.SearchChannelsForRetentionPolicy", "model.utils.decode_json.app_error", nil, jsonErr.Error(), r.StatusCode))
-	}
-	return channels, BuildResponse(r)
-}
-
-// AddChannelsToRetentionPolicy will add the specified channels to the granular data retention policy
-// with the specified ID.
-func (c *Client4) AddChannelsToRetentionPolicy(policyID string, channelIDs []string) *Response {
-	body, _ := json.Marshal(channelIDs)
-	r, appErr := c.doApiPostBytes(c.GetDataRetentionPolicyRoute(policyID)+"/channels", body)
-	if appErr != nil {
-		return BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	return BuildResponse(r)
-}
-
-// RemoveChannelsFromRetentionPolicy will remove the specified channels from the granular data retention policy
-// with the specified ID.
-func (c *Client4) RemoveChannelsFromRetentionPolicy(policyID string, channelIDs []string) *Response {
-	body, _ := json.Marshal(channelIDs)
-	r, appErr := c.doApiDeleteBytes(c.GetDataRetentionPolicyRoute(policyID)+"/channels", body)
-	if appErr != nil {
-		return BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	return BuildResponse(r)
-}
-
-// GetTeamPoliciesForUser will get the data retention policies for the teams to which a user belongs.
-func (c *Client4) GetTeamPoliciesForUser(userID string, offset, limit int) (*RetentionPolicyForTeamList, *Response) {
-	r, appErr := c.DoApiGet(c.GetUserRoute(userID)+"/data_retention/team_policies", "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	var teams RetentionPolicyForTeamList
-	jsonErr := json.NewDecoder(r.Body).Decode(&teams)
-	if jsonErr != nil {
-		return nil, BuildErrorResponse(r, NewAppError("Client4.GetTeamPoliciesForUser", "model.utils.decode_json.app_error", nil, jsonErr.Error(), r.StatusCode))
-	}
-	return &teams, BuildResponse(r)
-}
-
-// GetChannelPoliciesForUser will get the data retention policies for the channels to which a user belongs.
-func (c *Client4) GetChannelPoliciesForUser(userID string, offset, limit int) (*RetentionPolicyForChannelList, *Response) {
-	r, appErr := c.DoApiGet(c.GetUserRoute(userID)+"/data_retention/channel_policies", "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	var channels RetentionPolicyForChannelList
-	jsonErr := json.NewDecoder(r.Body).Decode(&channels)
-	if jsonErr != nil {
-		return nil, BuildErrorResponse(r, NewAppError("Client4.GetChannelPoliciesForUser", "model.utils.decode_json.app_error", nil, jsonErr.Error(), r.StatusCode))
-	}
-	return &channels, BuildResponse(r)
-}
-
-// Commands Section
-
-// CreateCommand will create a new command if the user have the right permissions.
-func (c *Client4) CreateCommand(cmd *Command) (*Command, *Response) {
-	r, err := c.DoApiPost(c.GetCommandsRoute(), cmd.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CommandFromJson(r.Body), BuildResponse(r)
-}
-
-// UpdateCommand updates a command based on the provided Command struct.
-func (c *Client4) UpdateCommand(cmd *Command) (*Command, *Response) {
-	r, err := c.DoApiPut(c.GetCommandRoute(cmd.Id), cmd.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CommandFromJson(r.Body), BuildResponse(r)
-}
-
-// MoveCommand moves a command to a different team.
-func (c *Client4) MoveCommand(teamId string, commandId string) (bool, *Response) {
-	cmr := CommandMoveRequest{TeamId: teamId}
-	r, err := c.DoApiPut(c.GetCommandMoveRoute(commandId), cmr.ToJson())
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// DeleteCommand deletes a command based on the provided command id string.
-func (c *Client4) DeleteCommand(commandId string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetCommandRoute(commandId))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// ListCommands will retrieve a list of commands available in the team.
-func (c *Client4) ListCommands(teamId string, customOnly bool) ([]*Command, *Response) {
-	query := fmt.Sprintf("?team_id=%v&custom_only=%v", teamId, customOnly)
-	r, err := c.DoApiGet(c.GetCommandsRoute()+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CommandListFromJson(r.Body), BuildResponse(r)
-}
-
-// ListCommandAutocompleteSuggestions will retrieve a list of suggestions for a userInput.
-func (c *Client4) ListCommandAutocompleteSuggestions(userInput, teamId string) ([]AutocompleteSuggestion, *Response) {
-	query := fmt.Sprintf("/commands/autocomplete_suggestions?user_input=%v", userInput)
-	r, err := c.DoApiGet(c.GetTeamRoute(teamId)+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return AutocompleteSuggestionsFromJSON(r.Body), BuildResponse(r)
-}
-
-// GetCommandById will retrieve a command by id.
-func (c *Client4) GetCommandById(cmdId string) (*Command, *Response) {
-	url := fmt.Sprintf("%s/%s", c.GetCommandsRoute(), cmdId)
-	r, err := c.DoApiGet(url, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CommandFromJson(r.Body), BuildResponse(r)
-}
-
-// ExecuteCommand executes a given slash command.
-func (c *Client4) ExecuteCommand(channelId, command string) (*CommandResponse, *Response) {
-	commandArgs := &CommandArgs{
-		ChannelId: channelId,
-		Command:   command,
-	}
-	r, err := c.DoApiPost(c.GetCommandsRoute()+"/execute", commandArgs.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-
-	response, _ := CommandResponseFromJson(r.Body)
-	return response, BuildResponse(r)
-}
-
-// ExecuteCommandWithTeam executes a given slash command against the specified team.
-// Use this when executing slash commands in a DM/GM, since the team id cannot be inferred in that case.
-func (c *Client4) ExecuteCommandWithTeam(channelId, teamId, command string) (*CommandResponse, *Response) {
-	commandArgs := &CommandArgs{
-		ChannelId: channelId,
-		TeamId:    teamId,
-		Command:   command,
-	}
-	r, err := c.DoApiPost(c.GetCommandsRoute()+"/execute", commandArgs.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-
-	response, _ := CommandResponseFromJson(r.Body)
-	return response, BuildResponse(r)
-}
-
-// ListAutocompleteCommands will retrieve a list of commands available in the team.
-func (c *Client4) ListAutocompleteCommands(teamId string) ([]*Command, *Response) {
-	r, err := c.DoApiGet(c.GetTeamAutoCompleteCommandsRoute(teamId), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CommandListFromJson(r.Body), BuildResponse(r)
-}
-
-// RegenCommandToken will create a new token if the user have the right permissions.
-func (c *Client4) RegenCommandToken(commandId string) (string, *Response) {
-	r, err := c.DoApiPut(c.GetCommandRoute(commandId)+"/regen_token", "")
-	if err != nil {
-		return "", BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return MapFromJson(r.Body)["token"], BuildResponse(r)
-}
-
-// Status Section
-
-// GetUserStatus returns a user based on the provided user id string.
-func (c *Client4) GetUserStatus(userId, etag string) (*Status, *Response) {
-	r, err := c.DoApiGet(c.GetUserStatusRoute(userId), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return StatusFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUsersStatusesByIds returns a list of users status based on the provided user ids.
-func (c *Client4) GetUsersStatusesByIds(userIds []string) ([]*Status, *Response) {
-	r, err := c.DoApiPost(c.GetUserStatusesRoute()+"/ids", ArrayToJson(userIds))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return StatusListFromJson(r.Body), BuildResponse(r)
-}
-
-// UpdateUserStatus sets a user's status based on the provided user id string.
-func (c *Client4) UpdateUserStatus(userId string, userStatus *Status) (*Status, *Response) {
-	r, err := c.DoApiPut(c.GetUserStatusRoute(userId), userStatus.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return StatusFromJson(r.Body), BuildResponse(r)
-}
-
-// Emoji Section
-
-// CreateEmoji will save an emoji to the server if the current user has permission
-// to do so. If successful, the provided emoji will be returned with its Id field
-// filled in. Otherwise, an error will be returned.
-func (c *Client4) CreateEmoji(emoji *Emoji, image []byte, filename string) (*Emoji, *Response) {
-	body := &bytes.Buffer{}
-	writer := multipart.NewWriter(body)
-
-	part, err := writer.CreateFormFile("image", filename)
-	if err != nil {
-		return nil, &Response{StatusCode: http.StatusForbidden, Error: NewAppError("CreateEmoji", "model.client.create_emoji.image.app_error", nil, err.Error(), 0)}
-	}
-
-	if _, err := io.Copy(part, bytes.NewBuffer(image)); err != nil {
-		return nil, &Response{StatusCode: http.StatusForbidden, Error: NewAppError("CreateEmoji", "model.client.create_emoji.image.app_error", nil, err.Error(), 0)}
-	}
-
-	if err := writer.WriteField("emoji", emoji.ToJson()); err != nil {
-		return nil, &Response{StatusCode: http.StatusForbidden, Error: NewAppError("CreateEmoji", "model.client.create_emoji.emoji.app_error", nil, err.Error(), 0)}
-	}
-
-	if err := writer.Close(); err != nil {
-		return nil, &Response{StatusCode: http.StatusForbidden, Error: NewAppError("CreateEmoji", "model.client.create_emoji.writer.app_error", nil, err.Error(), 0)}
-	}
-
-	return c.DoEmojiUploadFile(c.GetEmojisRoute(), body.Bytes(), writer.FormDataContentType())
-}
-
-// GetEmojiList returns a page of custom emoji on the system.
-func (c *Client4) GetEmojiList(page, perPage int) ([]*Emoji, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v", page, perPage)
-	r, err := c.DoApiGet(c.GetEmojisRoute()+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return EmojiListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetSortedEmojiList returns a page of custom emoji on the system sorted based on the sort
-// parameter, blank for no sorting and "name" to sort by emoji names.
-func (c *Client4) GetSortedEmojiList(page, perPage int, sort string) ([]*Emoji, *Response) {
-	query := fmt.Sprintf("?page=%v&per_page=%v&sort=%v", page, perPage, sort)
-	r, err := c.DoApiGet(c.GetEmojisRoute()+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return EmojiListFromJson(r.Body), BuildResponse(r)
-}
-
-// DeleteEmoji delete an custom emoji on the provided emoji id string.
-func (c *Client4) DeleteEmoji(emojiId string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetEmojiRoute(emojiId))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetEmoji returns a custom emoji based on the emojiId string.
-func (c *Client4) GetEmoji(emojiId string) (*Emoji, *Response) {
-	r, err := c.DoApiGet(c.GetEmojiRoute(emojiId), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return EmojiFromJson(r.Body), BuildResponse(r)
-}
-
-// GetEmojiByName returns a custom emoji based on the name string.
-func (c *Client4) GetEmojiByName(name string) (*Emoji, *Response) {
-	r, err := c.DoApiGet(c.GetEmojiByNameRoute(name), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return EmojiFromJson(r.Body), BuildResponse(r)
-}
-
-// GetEmojiImage returns the emoji image.
-func (c *Client4) GetEmojiImage(emojiId string) ([]byte, *Response) {
-	r, apErr := c.DoApiGet(c.GetEmojiRoute(emojiId)+"/image", "")
-	if apErr != nil {
-		return nil, BuildErrorResponse(r, apErr)
-	}
-	defer closeBody(r)
-
-	data, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("GetEmojiImage", "model.client.read_file.app_error", nil, err.Error(), r.StatusCode))
-	}
-
-	return data, BuildResponse(r)
-}
-
-// SearchEmoji returns a list of emoji matching some search criteria.
-func (c *Client4) SearchEmoji(search *EmojiSearch) ([]*Emoji, *Response) {
-	r, err := c.DoApiPost(c.GetEmojisRoute()+"/search", search.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return EmojiListFromJson(r.Body), BuildResponse(r)
-}
-
-// AutocompleteEmoji returns a list of emoji starting with or matching name.
-func (c *Client4) AutocompleteEmoji(name string, etag string) ([]*Emoji, *Response) {
-	query := fmt.Sprintf("?name=%v", name)
-	r, err := c.DoApiGet(c.GetEmojisRoute()+"/autocomplete"+query, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return EmojiListFromJson(r.Body), BuildResponse(r)
-}
-
-// Reaction Section
-
-// SaveReaction saves an emoji reaction for a post. Returns the saved reaction if successful, otherwise an error will be returned.
-func (c *Client4) SaveReaction(reaction *Reaction) (*Reaction, *Response) {
-	r, err := c.DoApiPost(c.GetReactionsRoute(), reaction.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ReactionFromJson(r.Body), BuildResponse(r)
-}
-
-// GetReactions returns a list of reactions to a post.
-func (c *Client4) GetReactions(postId string) ([]*Reaction, *Response) {
-	r, err := c.DoApiGet(c.GetPostRoute(postId)+"/reactions", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ReactionsFromJson(r.Body), BuildResponse(r)
-}
-
-// DeleteReaction deletes reaction of a user in a post.
-func (c *Client4) DeleteReaction(reaction *Reaction) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetUserRoute(reaction.UserId) + c.GetPostRoute(reaction.PostId) + fmt.Sprintf("/reactions/%v", reaction.EmojiName))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// FetchBulkReactions returns a map of postIds and corresponding reactions
-func (c *Client4) GetBulkReactions(postIds []string) (map[string][]*Reaction, *Response) {
-	r, err := c.DoApiPost(c.GetPostsRoute()+"/ids/reactions", ArrayToJson(postIds))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return MapPostIdToReactionsFromJson(r.Body), BuildResponse(r)
-}
-
-// Timezone Section
-
-// GetSupportedTimezone returns a page of supported timezones on the system.
-func (c *Client4) GetSupportedTimezone() ([]string, *Response) {
-	r, err := c.DoApiGet(c.GetTimezonesRoute(), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	var timezones []string
-	json.NewDecoder(r.Body).Decode(&timezones)
-	return timezones, BuildResponse(r)
-}
-
-// Open Graph Metadata Section
-
-// OpenGraph return the open graph metadata for a particular url if the site have the metadata.
-func (c *Client4) OpenGraph(url string) (map[string]string, *Response) {
-	requestBody := make(map[string]string)
-	requestBody["url"] = url
-
-	r, err := c.DoApiPost(c.GetOpenGraphRoute(), MapToJson(requestBody))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return MapFromJson(r.Body), BuildResponse(r)
-}
-
-// Jobs Section
-
-// GetJob gets a single job.
-func (c *Client4) GetJob(id string) (*Job, *Response) {
-	r, err := c.DoApiGet(c.GetJobsRoute()+fmt.Sprintf("/%v", id), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return JobFromJson(r.Body), BuildResponse(r)
-}
-
-// GetJobs gets all jobs, sorted with the job that was created most recently first.
-func (c *Client4) GetJobs(page int, perPage int) ([]*Job, *Response) {
-	r, err := c.DoApiGet(c.GetJobsRoute()+fmt.Sprintf("?page=%v&per_page=%v", page, perPage), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return JobsFromJson(r.Body), BuildResponse(r)
-}
-
-// GetJobsByType gets all jobs of a given type, sorted with the job that was created most recently first.
-func (c *Client4) GetJobsByType(jobType string, page int, perPage int) ([]*Job, *Response) {
-	r, err := c.DoApiGet(c.GetJobsRoute()+fmt.Sprintf("/type/%v?page=%v&per_page=%v", jobType, page, perPage), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return JobsFromJson(r.Body), BuildResponse(r)
-}
-
-// CreateJob creates a job based on the provided job struct.
-func (c *Client4) CreateJob(job *Job) (*Job, *Response) {
-	r, err := c.DoApiPost(c.GetJobsRoute(), job.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return JobFromJson(r.Body), BuildResponse(r)
-}
-
-// CancelJob requests the cancellation of the job with the provided Id.
-func (c *Client4) CancelJob(jobId string) (bool, *Response) {
-	r, err := c.DoApiPost(c.GetJobsRoute()+fmt.Sprintf("/%v/cancel", jobId), "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// DownloadJob downloads the results of the job
-func (c *Client4) DownloadJob(jobId string) ([]byte, *Response) {
-	r, appErr := c.DoApiGet(c.GetJobsRoute()+fmt.Sprintf("/%v/download", jobId), "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	data, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("GetFile", "model.client.read_job_result_file.app_error", nil, err.Error(), r.StatusCode))
-	}
-	return data, BuildResponse(r)
-}
-
-// Roles Section
-
-// GetRole gets a single role by ID.
-func (c *Client4) GetRole(id string) (*Role, *Response) {
-	r, err := c.DoApiGet(c.GetRolesRoute()+fmt.Sprintf("/%v", id), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return RoleFromJson(r.Body), BuildResponse(r)
-}
-
-// GetRoleByName gets a single role by Name.
-func (c *Client4) GetRoleByName(name string) (*Role, *Response) {
-	r, err := c.DoApiGet(c.GetRolesRoute()+fmt.Sprintf("/name/%v", name), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return RoleFromJson(r.Body), BuildResponse(r)
-}
-
-// GetRolesByNames returns a list of roles based on the provided role names.
-func (c *Client4) GetRolesByNames(roleNames []string) ([]*Role, *Response) {
-	r, err := c.DoApiPost(c.GetRolesRoute()+"/names", ArrayToJson(roleNames))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return RoleListFromJson(r.Body), BuildResponse(r)
-}
-
-// PatchRole partially updates a role in the system. Any missing fields are not updated.
-func (c *Client4) PatchRole(roleId string, patch *RolePatch) (*Role, *Response) {
-	r, err := c.DoApiPut(c.GetRolesRoute()+fmt.Sprintf("/%v/patch", roleId), patch.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return RoleFromJson(r.Body), BuildResponse(r)
-}
-
-// Schemes Section
-
-// CreateScheme creates a new Scheme.
-func (c *Client4) CreateScheme(scheme *Scheme) (*Scheme, *Response) {
-	r, err := c.DoApiPost(c.GetSchemesRoute(), scheme.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return SchemeFromJson(r.Body), BuildResponse(r)
-}
-
-// GetScheme gets a single scheme by ID.
-func (c *Client4) GetScheme(id string) (*Scheme, *Response) {
-	r, err := c.DoApiGet(c.GetSchemeRoute(id), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return SchemeFromJson(r.Body), BuildResponse(r)
-}
-
-// GetSchemes gets all schemes, sorted with the most recently created first, optionally filtered by scope.
-func (c *Client4) GetSchemes(scope string, page int, perPage int) ([]*Scheme, *Response) {
-	r, err := c.DoApiGet(c.GetSchemesRoute()+fmt.Sprintf("?scope=%v&page=%v&per_page=%v", scope, page, perPage), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return SchemesFromJson(r.Body), BuildResponse(r)
-}
-
-// DeleteScheme deletes a single scheme by ID.
-func (c *Client4) DeleteScheme(id string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetSchemeRoute(id))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// PatchScheme partially updates a scheme in the system. Any missing fields are not updated.
-func (c *Client4) PatchScheme(id string, patch *SchemePatch) (*Scheme, *Response) {
-	r, err := c.DoApiPut(c.GetSchemeRoute(id)+"/patch", patch.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return SchemeFromJson(r.Body), BuildResponse(r)
-}
-
-// GetTeamsForScheme gets the teams using this scheme, sorted alphabetically by display name.
-func (c *Client4) GetTeamsForScheme(schemeId string, page int, perPage int) ([]*Team, *Response) {
-	r, err := c.DoApiGet(c.GetSchemeRoute(schemeId)+fmt.Sprintf("/teams?page=%v&per_page=%v", page, perPage), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TeamListFromJson(r.Body), BuildResponse(r)
-}
-
-// GetChannelsForScheme gets the channels using this scheme, sorted alphabetically by display name.
-func (c *Client4) GetChannelsForScheme(schemeId string, page int, perPage int) (ChannelList, *Response) {
-	r, err := c.DoApiGet(c.GetSchemeRoute(schemeId)+fmt.Sprintf("/channels?page=%v&per_page=%v", page, perPage), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return *ChannelListFromJson(r.Body), BuildResponse(r)
-}
-
-// Plugin Section
-
-// UploadPlugin takes an io.Reader stream pointing to the contents of a .tar.gz plugin.
-// WARNING: PLUGINS ARE STILL EXPERIMENTAL. THIS FUNCTION IS SUBJECT TO CHANGE.
-func (c *Client4) UploadPlugin(file io.Reader) (*Manifest, *Response) {
-	return c.uploadPlugin(file, false)
-}
-
-func (c *Client4) UploadPluginForced(file io.Reader) (*Manifest, *Response) {
-	return c.uploadPlugin(file, true)
-}
-
-func (c *Client4) uploadPlugin(file io.Reader, force bool) (*Manifest, *Response) {
-	body := new(bytes.Buffer)
-	writer := multipart.NewWriter(body)
-
-	if force {
-		err := writer.WriteField("force", c.boolString(true))
-		if err != nil {
-			return nil, &Response{Error: NewAppError("UploadPlugin", "model.client.writer.app_error", nil, err.Error(), 0)}
-		}
-	}
-
-	part, err := writer.CreateFormFile("plugin", "plugin.tar.gz")
-	if err != nil {
-		return nil, &Response{Error: NewAppError("UploadPlugin", "model.client.writer.app_error", nil, err.Error(), 0)}
-	}
-
-	if _, err = io.Copy(part, file); err != nil {
-		return nil, &Response{Error: NewAppError("UploadPlugin", "model.client.writer.app_error", nil, err.Error(), 0)}
-	}
-
-	if err = writer.Close(); err != nil {
-		return nil, &Response{Error: NewAppError("UploadPlugin", "model.client.writer.app_error", nil, err.Error(), 0)}
-	}
-
-	rq, err := http.NewRequest("POST", c.ApiUrl+c.GetPluginsRoute(), body)
-	if err != nil {
-		return nil, &Response{Error: NewAppError("UploadPlugin", "model.client.connecting.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-	rq.Header.Set("Content-Type", writer.FormDataContentType())
-
-	if c.AuthToken != "" {
-		rq.Header.Set(HEADER_AUTH, c.AuthType+" "+c.AuthToken)
-	}
-
-	rp, err := c.HttpClient.Do(rq)
-	if err != nil || rp == nil {
-		return nil, BuildErrorResponse(rp, NewAppError("UploadPlugin", "model.client.connecting.app_error", nil, err.Error(), 0))
-	}
-	defer closeBody(rp)
-
-	if rp.StatusCode >= 300 {
-		return nil, BuildErrorResponse(rp, AppErrorFromJson(rp.Body))
-	}
-
-	return ManifestFromJson(rp.Body), BuildResponse(rp)
-}
-
-func (c *Client4) InstallPluginFromUrl(downloadUrl string, force bool) (*Manifest, *Response) {
-	forceStr := c.boolString(force)
-
-	url := fmt.Sprintf("%s?plugin_download_url=%s&force=%s", c.GetPluginsRoute()+"/install_from_url", url.QueryEscape(downloadUrl), forceStr)
-	r, err := c.DoApiPost(url, "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ManifestFromJson(r.Body), BuildResponse(r)
-}
-
-// InstallMarketplacePlugin will install marketplace plugin.
-// WARNING: PLUGINS ARE STILL EXPERIMENTAL. THIS FUNCTION IS SUBJECT TO CHANGE.
-func (c *Client4) InstallMarketplacePlugin(request *InstallMarketplacePluginRequest) (*Manifest, *Response) {
-	json, err := request.ToJson()
-	if err != nil {
-		return nil, &Response{Error: NewAppError("InstallMarketplacePlugin", "model.client.plugin_request_to_json.app_error", nil, err.Error(), http.StatusBadRequest)}
-	}
-	r, appErr := c.DoApiPost(c.GetPluginsRoute()+"/marketplace", json)
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	return ManifestFromJson(r.Body), BuildResponse(r)
-}
-
-// GetPlugins will return a list of plugin manifests for currently active plugins.
-// WARNING: PLUGINS ARE STILL EXPERIMENTAL. THIS FUNCTION IS SUBJECT TO CHANGE.
-func (c *Client4) GetPlugins() (*PluginsResponse, *Response) {
-	r, err := c.DoApiGet(c.GetPluginsRoute(), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PluginsResponseFromJson(r.Body), BuildResponse(r)
-}
-
-// GetPluginStatuses will return the plugins installed on any server in the cluster, for reporting
-// to the administrator via the system console.
-// WARNING: PLUGINS ARE STILL EXPERIMENTAL. THIS FUNCTION IS SUBJECT TO CHANGE.
-func (c *Client4) GetPluginStatuses() (PluginStatuses, *Response) {
-	r, err := c.DoApiGet(c.GetPluginsRoute()+"/statuses", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return PluginStatusesFromJson(r.Body), BuildResponse(r)
-}
-
-// RemovePlugin will disable and delete a plugin.
-// WARNING: PLUGINS ARE STILL EXPERIMENTAL. THIS FUNCTION IS SUBJECT TO CHANGE.
-func (c *Client4) RemovePlugin(id string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetPluginRoute(id))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetWebappPlugins will return a list of plugins that the webapp should download.
-// WARNING: PLUGINS ARE STILL EXPERIMENTAL. THIS FUNCTION IS SUBJECT TO CHANGE.
-func (c *Client4) GetWebappPlugins() ([]*Manifest, *Response) {
-	r, err := c.DoApiGet(c.GetPluginsRoute()+"/webapp", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ManifestListFromJson(r.Body), BuildResponse(r)
-}
-
-// EnablePlugin will enable an plugin installed.
-// WARNING: PLUGINS ARE STILL EXPERIMENTAL. THIS FUNCTION IS SUBJECT TO CHANGE.
-func (c *Client4) EnablePlugin(id string) (bool, *Response) {
-	r, err := c.DoApiPost(c.GetPluginRoute(id)+"/enable", "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// DisablePlugin will disable an enabled plugin.
-// WARNING: PLUGINS ARE STILL EXPERIMENTAL. THIS FUNCTION IS SUBJECT TO CHANGE.
-func (c *Client4) DisablePlugin(id string) (bool, *Response) {
-	r, err := c.DoApiPost(c.GetPluginRoute(id)+"/disable", "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetMarketplacePlugins will return a list of plugins that an admin can install.
-// WARNING: PLUGINS ARE STILL EXPERIMENTAL. THIS FUNCTION IS SUBJECT TO CHANGE.
-func (c *Client4) GetMarketplacePlugins(filter *MarketplacePluginFilter) ([]*MarketplacePlugin, *Response) {
-	route := c.GetPluginsRoute() + "/marketplace"
-	u, parseErr := url.Parse(route)
-	if parseErr != nil {
-		return nil, &Response{Error: NewAppError("GetMarketplacePlugins", "model.client.parse_plugins.app_error", nil, parseErr.Error(), http.StatusBadRequest)}
-	}
-
-	filter.ApplyToURL(u)
-
-	r, err := c.DoApiGet(u.String(), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-
-	plugins, readerErr := MarketplacePluginsFromReader(r.Body)
-	if readerErr != nil {
-		return nil, BuildErrorResponse(r, NewAppError(route, "model.client.parse_plugins.app_error", nil, err.Error(), http.StatusBadRequest))
-	}
-
-	return plugins, BuildResponse(r)
-}
-
-// UpdateChannelScheme will update a channel's scheme.
-func (c *Client4) UpdateChannelScheme(channelId, schemeId string) (bool, *Response) {
-	sip := &SchemeIDPatch{SchemeID: &schemeId}
-	r, err := c.DoApiPut(c.GetChannelSchemeRoute(channelId), sip.ToJson())
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// UpdateTeamScheme will update a team's scheme.
-func (c *Client4) UpdateTeamScheme(teamId, schemeId string) (bool, *Response) {
-	sip := &SchemeIDPatch{SchemeID: &schemeId}
-	r, err := c.DoApiPut(c.GetTeamSchemeRoute(teamId), sip.ToJson())
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetRedirectLocation retrieves the value of the 'Location' header of an HTTP response for a given URL.
-func (c *Client4) GetRedirectLocation(urlParam, etag string) (string, *Response) {
-	url := fmt.Sprintf("%s?url=%s", c.GetRedirectLocationRoute(), url.QueryEscape(urlParam))
-	r, err := c.DoApiGet(url, etag)
-	if err != nil {
-		return "", BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return MapFromJson(r.Body)["location"], BuildResponse(r)
-}
-
-// SetServerBusy will mark the server as busy, which disables non-critical services for `secs` seconds.
-func (c *Client4) SetServerBusy(secs int) (bool, *Response) {
-	url := fmt.Sprintf("%s?seconds=%d", c.GetServerBusyRoute(), secs)
-	r, err := c.DoApiPost(url, "")
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// ClearServerBusy will mark the server as not busy.
-func (c *Client4) ClearServerBusy() (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetServerBusyRoute())
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetServerBusy returns the current ServerBusyState including the time when a server marked busy
-// will automatically have the flag cleared.
-func (c *Client4) GetServerBusy() (*ServerBusyState, *Response) {
-	r, err := c.DoApiGet(c.GetServerBusyRoute(), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-
-	sbs := ServerBusyStateFromJson(r.Body)
-	return sbs, BuildResponse(r)
-}
-
-// GetServerBusyExpires returns the time when a server marked busy
-// will automatically have the flag cleared.
-//
-// Deprecated: Use GetServerBusy instead.
-func (c *Client4) GetServerBusyExpires() (*time.Time, *Response) {
-	r, err := c.DoApiGet(c.GetServerBusyRoute(), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-
-	sbs := ServerBusyStateFromJson(r.Body)
-	expires := time.Unix(sbs.Expires, 0)
-	return &expires, BuildResponse(r)
-}
-
-// RegisterTermsOfServiceAction saves action performed by a user against a specific terms of service.
-func (c *Client4) RegisterTermsOfServiceAction(userId, termsOfServiceId string, accepted bool) (*bool, *Response) {
-	url := c.GetUserTermsOfServiceRoute(userId)
-	data := map[string]interface{}{"termsOfServiceId": termsOfServiceId, "accepted": accepted}
-	r, err := c.DoApiPost(url, StringInterfaceToJson(data))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return NewBool(CheckStatusOK(r)), BuildResponse(r)
-}
-
-// GetTermsOfService fetches the latest terms of service
-func (c *Client4) GetTermsOfService(etag string) (*TermsOfService, *Response) {
-	url := c.GetTermsOfServiceRoute()
-	r, err := c.DoApiGet(url, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TermsOfServiceFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUserTermsOfService fetches user's latest terms of service action if the latest action was for acceptance.
-func (c *Client4) GetUserTermsOfService(userId, etag string) (*UserTermsOfService, *Response) {
-	url := c.GetUserTermsOfServiceRoute(userId)
-	r, err := c.DoApiGet(url, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UserTermsOfServiceFromJson(r.Body), BuildResponse(r)
-}
-
-// CreateTermsOfService creates new terms of service.
-func (c *Client4) CreateTermsOfService(text, userId string) (*TermsOfService, *Response) {
-	url := c.GetTermsOfServiceRoute()
-	data := map[string]interface{}{"text": text}
-	r, err := c.DoApiPost(url, StringInterfaceToJson(data))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return TermsOfServiceFromJson(r.Body), BuildResponse(r)
-}
-
-func (c *Client4) GetGroup(groupID, etag string) (*Group, *Response) {
-	r, appErr := c.DoApiGet(c.GetGroupRoute(groupID), etag)
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	return GroupFromJson(r.Body), BuildResponse(r)
-}
-
-func (c *Client4) PatchGroup(groupID string, patch *GroupPatch) (*Group, *Response) {
-	payload, _ := json.Marshal(patch)
-	r, appErr := c.DoApiPut(c.GetGroupRoute(groupID)+"/patch", string(payload))
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	return GroupFromJson(r.Body), BuildResponse(r)
-}
-
-func (c *Client4) LinkGroupSyncable(groupID, syncableID string, syncableType GroupSyncableType, patch *GroupSyncablePatch) (*GroupSyncable, *Response) {
-	payload, _ := json.Marshal(patch)
-	url := fmt.Sprintf("%s/link", c.GetGroupSyncableRoute(groupID, syncableID, syncableType))
-	r, appErr := c.DoApiPost(url, string(payload))
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	return GroupSyncableFromJson(r.Body), BuildResponse(r)
-}
-
-func (c *Client4) UnlinkGroupSyncable(groupID, syncableID string, syncableType GroupSyncableType) *Response {
-	url := fmt.Sprintf("%s/link", c.GetGroupSyncableRoute(groupID, syncableID, syncableType))
-	r, appErr := c.DoApiDelete(url)
-	if appErr != nil {
-		return BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	return BuildResponse(r)
-}
-
-func (c *Client4) GetGroupSyncable(groupID, syncableID string, syncableType GroupSyncableType, etag string) (*GroupSyncable, *Response) {
-	r, appErr := c.DoApiGet(c.GetGroupSyncableRoute(groupID, syncableID, syncableType), etag)
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	return GroupSyncableFromJson(r.Body), BuildResponse(r)
-}
-
-func (c *Client4) GetGroupSyncables(groupID string, syncableType GroupSyncableType, etag string) ([]*GroupSyncable, *Response) {
-	r, appErr := c.DoApiGet(c.GetGroupSyncablesRoute(groupID, syncableType), etag)
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	return GroupSyncablesFromJson(r.Body), BuildResponse(r)
-}
-
-func (c *Client4) PatchGroupSyncable(groupID, syncableID string, syncableType GroupSyncableType, patch *GroupSyncablePatch) (*GroupSyncable, *Response) {
-	payload, _ := json.Marshal(patch)
-	r, appErr := c.DoApiPut(c.GetGroupSyncableRoute(groupID, syncableID, syncableType)+"/patch", string(payload))
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	return GroupSyncableFromJson(r.Body), BuildResponse(r)
-}
-
-func (c *Client4) TeamMembersMinusGroupMembers(teamID string, groupIDs []string, page, perPage int, etag string) ([]*UserWithGroups, int64, *Response) {
-	groupIDStr := strings.Join(groupIDs, ",")
-	query := fmt.Sprintf("?group_ids=%s&page=%d&per_page=%d", groupIDStr, page, perPage)
-	r, err := c.DoApiGet(c.GetTeamRoute(teamID)+"/members_minus_group_members"+query, etag)
-	if err != nil {
-		return nil, 0, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	ugc := UsersWithGroupsAndCountFromJson(r.Body)
-	return ugc.Users, ugc.Count, BuildResponse(r)
-}
-
-func (c *Client4) ChannelMembersMinusGroupMembers(channelID string, groupIDs []string, page, perPage int, etag string) ([]*UserWithGroups, int64, *Response) {
-	groupIDStr := strings.Join(groupIDs, ",")
-	query := fmt.Sprintf("?group_ids=%s&page=%d&per_page=%d", groupIDStr, page, perPage)
-	r, err := c.DoApiGet(c.GetChannelRoute(channelID)+"/members_minus_group_members"+query, etag)
-	if err != nil {
-		return nil, 0, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	ugc := UsersWithGroupsAndCountFromJson(r.Body)
-	return ugc.Users, ugc.Count, BuildResponse(r)
-}
-
-func (c *Client4) PatchConfig(config *Config) (*Config, *Response) {
-	r, err := c.DoApiPut(c.GetConfigRoute()+"/patch", config.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ConfigFromJson(r.Body), BuildResponse(r)
-}
-
-func (c *Client4) GetChannelModerations(channelID string, etag string) ([]*ChannelModeration, *Response) {
-	r, err := c.DoApiGet(c.GetChannelRoute(channelID)+"/moderations", etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelModerationsFromJson(r.Body), BuildResponse(r)
-}
-
-func (c *Client4) PatchChannelModerations(channelID string, patch []*ChannelModerationPatch) ([]*ChannelModeration, *Response) {
-	payload, _ := json.Marshal(patch)
-	r, err := c.DoApiPut(c.GetChannelRoute(channelID)+"/moderations/patch", string(payload))
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelModerationsFromJson(r.Body), BuildResponse(r)
-}
-
-func (c *Client4) GetKnownUsers() ([]string, *Response) {
-	r, err := c.DoApiGet(c.GetUsersRoute()+"/known", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	var userIds []string
-	json.NewDecoder(r.Body).Decode(&userIds)
-	return userIds, BuildResponse(r)
-}
-
-// PublishUserTyping publishes a user is typing websocket event based on the provided TypingRequest.
-func (c *Client4) PublishUserTyping(userID string, typingRequest TypingRequest) (bool, *Response) {
-	r, err := c.DoApiPost(c.GetPublishUserTypingRoute(userID), typingRequest.ToJson())
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-func (c *Client4) GetChannelMemberCountsByGroup(channelID string, includeTimezones bool, etag string) ([]*ChannelMemberCountByGroup, *Response) {
-	r, err := c.DoApiGet(c.GetChannelRoute(channelID)+"/member_counts_by_group?include_timezones="+strconv.FormatBool(includeTimezones), etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ChannelMemberCountsByGroupFromJson(r.Body), BuildResponse(r)
-}
-
-// RequestTrialLicense will request a trial license and install it in the server
-func (c *Client4) RequestTrialLicense(users int) (bool, *Response) {
-	b, _ := json.Marshal(map[string]interface{}{"users": users, "terms_accepted": true})
-	r, err := c.DoApiPost("/trial-license", string(b))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-// GetGroupStats retrieves stats for a Mattermost Group
-func (c *Client4) GetGroupStats(groupID string) (*GroupStats, *Response) {
-	r, appErr := c.DoApiGet(c.GetGroupRoute(groupID)+"/stats", "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	return GroupStatsFromJson(r.Body), BuildResponse(r)
-}
-
-func (c *Client4) GetSidebarCategoriesForTeamForUser(userID, teamID, etag string) (*OrderedSidebarCategories, *Response) {
-	route := c.GetUserCategoryRoute(userID, teamID)
-	r, appErr := c.DoApiGet(route, etag)
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	cat, err := OrderedSidebarCategoriesFromJson(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("Client4.GetSidebarCategoriesForTeamForUser", "model.utils.decode_json.app_error", nil, err.Error(), r.StatusCode))
-	}
-	return cat, BuildResponse(r)
-}
-
-func (c *Client4) CreateSidebarCategoryForTeamForUser(userID, teamID string, category *SidebarCategoryWithChannels) (*SidebarCategoryWithChannels, *Response) {
-	payload, _ := json.Marshal(category)
-	route := c.GetUserCategoryRoute(userID, teamID)
-	r, appErr := c.doApiPostBytes(route, payload)
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	cat, err := SidebarCategoryFromJson(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("Client4.CreateSidebarCategoryForTeamForUser", "model.utils.decode_json.app_error", nil, err.Error(), r.StatusCode))
-	}
-	return cat, BuildResponse(r)
-}
-
-func (c *Client4) UpdateSidebarCategoriesForTeamForUser(userID, teamID string, categories []*SidebarCategoryWithChannels) ([]*SidebarCategoryWithChannels, *Response) {
-	payload, _ := json.Marshal(categories)
-	route := c.GetUserCategoryRoute(userID, teamID)
-
-	r, appErr := c.doApiPutBytes(route, payload)
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	categories, err := SidebarCategoriesFromJson(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("Client4.UpdateSidebarCategoriesForTeamForUser", "model.utils.decode_json.app_error", nil, err.Error(), r.StatusCode))
-	}
-
-	return categories, BuildResponse(r)
-}
-
-func (c *Client4) GetSidebarCategoryOrderForTeamForUser(userID, teamID, etag string) ([]string, *Response) {
-	route := c.GetUserCategoryRoute(userID, teamID) + "/order"
-	r, err := c.DoApiGet(route, etag)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ArrayFromJson(r.Body), BuildResponse(r)
-}
-
-func (c *Client4) UpdateSidebarCategoryOrderForTeamForUser(userID, teamID string, order []string) ([]string, *Response) {
-	payload, _ := json.Marshal(order)
-	route := c.GetUserCategoryRoute(userID, teamID) + "/order"
-	r, err := c.doApiPutBytes(route, payload)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ArrayFromJson(r.Body), BuildResponse(r)
-}
-
-func (c *Client4) GetSidebarCategoryForTeamForUser(userID, teamID, categoryID, etag string) (*SidebarCategoryWithChannels, *Response) {
-	route := c.GetUserCategoryRoute(userID, teamID) + "/" + categoryID
-	r, appErr := c.DoApiGet(route, etag)
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	cat, err := SidebarCategoryFromJson(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("Client4.UpdateSidebarCategoriesForTeamForUser", "model.utils.decode_json.app_error", nil, err.Error(), r.StatusCode))
-	}
-
-	return cat, BuildResponse(r)
-}
-
-func (c *Client4) UpdateSidebarCategoryForTeamForUser(userID, teamID, categoryID string, category *SidebarCategoryWithChannels) (*SidebarCategoryWithChannels, *Response) {
-	payload, _ := json.Marshal(category)
-	route := c.GetUserCategoryRoute(userID, teamID) + "/" + categoryID
-	r, appErr := c.doApiPutBytes(route, payload)
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	cat, err := SidebarCategoryFromJson(r.Body)
-	if err != nil {
-		return nil, BuildErrorResponse(r, NewAppError("Client4.UpdateSidebarCategoriesForTeamForUser", "model.utils.decode_json.app_error", nil, err.Error(), r.StatusCode))
-	}
-
-	return cat, BuildResponse(r)
-}
-
-// CheckIntegrity performs a database integrity check.
-func (c *Client4) CheckIntegrity() ([]IntegrityCheckResult, *Response) {
-	r, err := c.DoApiPost("/integrity", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	var results []IntegrityCheckResult
-	if err := json.NewDecoder(r.Body).Decode(&results); err != nil {
-		appErr := NewAppError("Api4.CheckIntegrity", "api.marshal_error", nil, err.Error(), http.StatusInternalServerError)
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	return results, BuildResponse(r)
-}
-
-func (c *Client4) GetNotices(lastViewed int64, teamId string, client NoticeClientType, clientVersion, locale, etag string) (NoticeMessages, *Response) {
-	url := fmt.Sprintf("/system/notices/%s?lastViewed=%d&client=%s&clientVersion=%s&locale=%s", teamId, lastViewed, client, clientVersion, locale)
-	r, appErr := c.DoApiGet(url, etag)
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	notices, err := UnmarshalProductNoticeMessages(r.Body)
-	if err != nil {
-		return nil, &Response{StatusCode: http.StatusBadRequest, Error: NewAppError(url, "model.client.connecting.app_error", nil, err.Error(), http.StatusForbidden)}
-	}
-	return notices, BuildResponse(r)
-}
-
-func (c *Client4) MarkNoticesViewed(ids []string) *Response {
-	r, err := c.DoApiPut("/system/notices/view", ArrayToJson(ids))
-	if err != nil {
-		return BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return BuildResponse(r)
-}
-
-// CreateUpload creates a new upload session.
-func (c *Client4) CreateUpload(us *UploadSession) (*UploadSession, *Response) {
-	r, err := c.DoApiPost(c.GetUploadsRoute(), us.ToJson())
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UploadSessionFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUpload returns the upload session for the specified uploadId.
-func (c *Client4) GetUpload(uploadId string) (*UploadSession, *Response) {
-	r, err := c.DoApiGet(c.GetUploadRoute(uploadId), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UploadSessionFromJson(r.Body), BuildResponse(r)
-}
-
-// GetUploadsForUser returns the upload sessions created by the specified
-// userId.
-func (c *Client4) GetUploadsForUser(userId string) ([]*UploadSession, *Response) {
-	r, err := c.DoApiGet(c.GetUserRoute(userId)+"/uploads", "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return UploadSessionsFromJson(r.Body), BuildResponse(r)
-}
-
-// UploadData performs an upload. On success it returns
-// a FileInfo object.
-func (c *Client4) UploadData(uploadId string, data io.Reader) (*FileInfo, *Response) {
-	url := c.GetUploadRoute(uploadId)
-	r, err := c.doApiRequestReader("POST", c.ApiUrl+url, data, nil)
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return FileInfoFromJson(r.Body), BuildResponse(r)
-}
-
-func (c *Client4) UpdatePassword(userId, currentPassword, newPassword string) *Response {
-	requestBody := map[string]string{"current_password": currentPassword, "new_password": newPassword}
-	r, err := c.DoApiPut(c.GetUserRoute(userId)+"/password", MapToJson(requestBody))
-	if err != nil {
-		return BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return BuildResponse(r)
-}
-
-// Cloud Section
-
-func (c *Client4) GetCloudProducts() ([]*Product, *Response) {
-	r, appErr := c.DoApiGet(c.GetCloudRoute()+"/products", "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	var cloudProducts []*Product
-	json.NewDecoder(r.Body).Decode(&cloudProducts)
-
-	return cloudProducts, BuildResponse(r)
-}
-
-func (c *Client4) CreateCustomerPayment() (*StripeSetupIntent, *Response) {
-	r, appErr := c.DoApiPost(c.GetCloudRoute()+"/payment", "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	var setupIntent *StripeSetupIntent
-	json.NewDecoder(r.Body).Decode(&setupIntent)
-
-	return setupIntent, BuildResponse(r)
-}
-
-func (c *Client4) ConfirmCustomerPayment(confirmRequest *ConfirmPaymentMethodRequest) *Response {
-	json, _ := json.Marshal(confirmRequest)
-
-	r, appErr := c.doApiPostBytes(c.GetCloudRoute()+"/payment/confirm", json)
-	if appErr != nil {
-		return BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	return BuildResponse(r)
-}
-
-func (c *Client4) GetCloudCustomer() (*CloudCustomer, *Response) {
-	r, appErr := c.DoApiGet(c.GetCloudRoute()+"/customer", "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	var cloudCustomer *CloudCustomer
-	json.NewDecoder(r.Body).Decode(&cloudCustomer)
-
-	return cloudCustomer, BuildResponse(r)
-}
-
-func (c *Client4) GetSubscription() (*Subscription, *Response) {
-	r, appErr := c.DoApiGet(c.GetCloudRoute()+"/subscription", "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	var subscription *Subscription
-	json.NewDecoder(r.Body).Decode(&subscription)
-
-	return subscription, BuildResponse(r)
-}
-
-func (c *Client4) GetSubscriptionStats() (*SubscriptionStats, *Response) {
-	r, appErr := c.DoApiGet(c.GetCloudRoute()+"/subscription/stats", "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	var stats *SubscriptionStats
-	json.NewDecoder(r.Body).Decode(&stats)
-	return stats, BuildResponse(r)
-}
-
-func (c *Client4) GetInvoicesForSubscription() ([]*Invoice, *Response) {
-	r, appErr := c.DoApiGet(c.GetCloudRoute()+"/subscription/invoices", "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	var invoices []*Invoice
-	json.NewDecoder(r.Body).Decode(&invoices)
-
-	return invoices, BuildResponse(r)
-}
-
-func (c *Client4) UpdateCloudCustomer(customerInfo *CloudCustomerInfo) (*CloudCustomer, *Response) {
-	customerBytes, _ := json.Marshal(customerInfo)
-
-	r, appErr := c.doApiPutBytes(c.GetCloudRoute()+"/customer", customerBytes)
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	var customer *CloudCustomer
-	json.NewDecoder(r.Body).Decode(&customer)
-
-	return customer, BuildResponse(r)
-}
-
-func (c *Client4) UpdateCloudCustomerAddress(address *Address) (*CloudCustomer, *Response) {
-	addressBytes, _ := json.Marshal(address)
-
-	r, appErr := c.doApiPutBytes(c.GetCloudRoute()+"/customer/address", addressBytes)
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	var customer *CloudCustomer
-	json.NewDecoder(r.Body).Decode(&customer)
-
-	return customer, BuildResponse(r)
-}
-
-func (c *Client4) ListImports() ([]string, *Response) {
-	r, err := c.DoApiGet(c.GetImportsRoute(), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ArrayFromJson(r.Body), BuildResponse(r)
-}
-
-func (c *Client4) ListExports() ([]string, *Response) {
-	r, err := c.DoApiGet(c.GetExportsRoute(), "")
-	if err != nil {
-		return nil, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return ArrayFromJson(r.Body), BuildResponse(r)
-}
-
-func (c *Client4) DeleteExport(name string) (bool, *Response) {
-	r, err := c.DoApiDelete(c.GetExportRoute(name))
-	if err != nil {
-		return false, BuildErrorResponse(r, err)
-	}
-	defer closeBody(r)
-	return CheckStatusOK(r), BuildResponse(r)
-}
-
-func (c *Client4) DownloadExport(name string, wr io.Writer, offset int64) (int64, *Response) {
-	var headers map[string]string
-	if offset > 0 {
-		headers = map[string]string{
-			HEADER_RANGE: fmt.Sprintf("bytes=%d-", offset),
-		}
-	}
-	r, appErr := c.DoApiRequestWithHeaders(http.MethodGet, c.ApiUrl+c.GetExportRoute(name), "", headers)
-	if appErr != nil {
-		return 0, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	n, err := io.Copy(wr, r.Body)
-	if err != nil {
-		return n, BuildErrorResponse(r, NewAppError("DownloadExport", "model.client.copy.app_error", nil, err.Error(), r.StatusCode))
-	}
-	return n, BuildResponse(r)
-}
-
-func (c *Client4) GetUserThreads(userId, teamId string, options GetUserThreadsOpts) (*Threads, *Response) {
-	v := url.Values{}
-	if options.Since != 0 {
-		v.Set("since", fmt.Sprintf("%d", options.Since))
-	}
-	if options.Before != "" {
-		v.Set("before", options.Before)
-	}
-	if options.After != "" {
-		v.Set("after", options.After)
-	}
-	if options.PageSize != 0 {
-		v.Set("pageSize", fmt.Sprintf("%d", options.PageSize))
-	}
-	if options.Extended {
-		v.Set("extended", "true")
-	}
-	if options.Deleted {
-		v.Set("deleted", "true")
-	}
-	if options.Unread {
-		v.Set("unread", "true")
-	}
-	url := c.GetUserThreadsRoute(userId, teamId)
-	if len(v) > 0 {
-		url += "?" + v.Encode()
-	}
-
-	r, appErr := c.DoApiGet(url, "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	var threads Threads
-	json.NewDecoder(r.Body).Decode(&threads)
-
-	return &threads, BuildResponse(r)
-}
-
-func (c *Client4) GetUserThread(userId, teamId, threadId string, extended bool) (*ThreadResponse, *Response) {
-	url := c.GetUserThreadRoute(userId, teamId, threadId)
-	if extended {
-		url += "?extended=true"
-	}
-	r, appErr := c.DoApiGet(url, "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	var thread ThreadResponse
-	json.NewDecoder(r.Body).Decode(&thread)
-
-	return &thread, BuildResponse(r)
-}
-
-func (c *Client4) UpdateThreadsReadForUser(userId, teamId string) *Response {
-	r, appErr := c.DoApiPut(fmt.Sprintf("%s/read", c.GetUserThreadsRoute(userId, teamId)), "")
-	if appErr != nil {
-		return BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	return BuildResponse(r)
-}
-
-func (c *Client4) UpdateThreadReadForUser(userId, teamId, threadId string, timestamp int64) (*ThreadResponse, *Response) {
-	r, appErr := c.DoApiPut(fmt.Sprintf("%s/read/%d", c.GetUserThreadRoute(userId, teamId, threadId), timestamp), "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-	var thread ThreadResponse
-	json.NewDecoder(r.Body).Decode(&thread)
-
-	return &thread, BuildResponse(r)
-}
-
-func (c *Client4) UpdateThreadFollowForUser(userId, teamId, threadId string, state bool) *Response {
-	var appErr *AppError
-	var r *http.Response
-	if state {
-		r, appErr = c.DoApiPut(c.GetUserThreadRoute(userId, teamId, threadId)+"/following", "")
-	} else {
-		r, appErr = c.DoApiDelete(c.GetUserThreadRoute(userId, teamId, threadId) + "/following")
-	}
-	if appErr != nil {
-		return BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	return BuildResponse(r)
-}
-
-func (c *Client4) SendAdminUpgradeRequestEmail() *Response {
-	r, appErr := c.DoApiPost(c.GetCloudRoute()+"/subscription/limitreached/invite", "")
-	if appErr != nil {
-		return BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	return BuildResponse(r)
-}
-
-func (c *Client4) SendAdminUpgradeRequestEmailOnJoin() *Response {
-	r, appErr := c.DoApiPost(c.GetCloudRoute()+"/subscription/limitreached/join", "")
-	if appErr != nil {
-		return BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	return BuildResponse(r)
-}
-
-func (c *Client4) GetAllSharedChannels(teamID string, page, perPage int) ([]*SharedChannel, *Response) {
-	url := fmt.Sprintf("%s/%s?page=%d&per_page=%d", c.GetSharedChannelsRoute(), teamID, page, perPage)
-	r, appErr := c.DoApiGet(url, "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	var channels []*SharedChannel
-	json.NewDecoder(r.Body).Decode(&channels)
-
-	return channels, BuildResponse(r)
-}
-
-func (c *Client4) GetRemoteClusterInfo(remoteID string) (RemoteClusterInfo, *Response) {
-	url := fmt.Sprintf("%s/remote_info/%s", c.GetSharedChannelsRoute(), remoteID)
-	r, appErr := c.DoApiGet(url, "")
-	if appErr != nil {
-		return RemoteClusterInfo{}, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	var rci RemoteClusterInfo
-	json.NewDecoder(r.Body).Decode(&rci)
-
-	return rci, BuildResponse(r)
-}
-
-func (c *Client4) GetAncillaryPermissions(subsectionPermissions []string) ([]string, *Response) {
-	var returnedPermissions []string
-	url := fmt.Sprintf("%s/ancillary?subsection_permissions=%s", c.GetPermissionsRoute(), strings.Join(subsectionPermissions, ","))
-	r, appErr := c.DoApiGet(url, "")
-	if appErr != nil {
-		return returnedPermissions, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	json.NewDecoder(r.Body).Decode(&returnedPermissions)
-	return returnedPermissions, BuildResponse(r)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/cloud.go b/vendor/github.com/mattermost/mattermost-server/v5/model/cloud.go
deleted file mode 100644
index ffd85a2a..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/cloud.go
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import "strings"
-
-const (
-	EventTypeFailedPayment         = "failed-payment"
-	EventTypeFailedPaymentNoCard   = "failed-payment-no-card"
-	EventTypeSendAdminWelcomeEmail = "send-admin-welcome-email"
-	EventTypeTrialWillEnd          = "trial-will-end"
-	EventTypeTrialEnded            = "trial-ended"
-	JoinLimitation                 = "join"
-	InviteLimitation               = "invite"
-)
-
-var MockCWS string
-
-type BillingScheme string
-
-const (
-	BillingSchemePerSeat = BillingScheme("per_seat")
-	BillingSchemeFlatFee = BillingScheme("flat_fee")
-)
-
-type RecurringInterval string
-
-const (
-	RecurringIntervalYearly  = RecurringInterval("year")
-	RecurringIntervalMonthly = RecurringInterval("month")
-)
-
-type SubscriptionFamily string
-
-const (
-	SubscriptionFamilyCloud  = SubscriptionFamily("cloud")
-	SubscriptionFamilyOnPrem = SubscriptionFamily("on-prem")
-)
-
-// Product model represents a product on the cloud system.
-type Product struct {
-	ID                string             `json:"id"`
-	Name              string             `json:"name"`
-	Description       string             `json:"description"`
-	PricePerSeat      float64            `json:"price_per_seat"`
-	AddOns            []*AddOn           `json:"add_ons"`
-	SKU               string             `json:"sku"`
-	PriceID           string             `json:"price_id"`
-	Family            SubscriptionFamily `json:"product_family"`
-	RecurringInterval RecurringInterval  `json:"recurring_interval"`
-	BillingScheme     BillingScheme      `json:"billing_scheme"`
-}
-
-// AddOn represents an addon to a product.
-type AddOn struct {
-	ID           string  `json:"id"`
-	Name         string  `json:"name"`
-	DisplayName  string  `json:"display_name"`
-	PricePerSeat float64 `json:"price_per_seat"`
-}
-
-// StripeSetupIntent represents the SetupIntent model from Stripe for updating payment methods.
-type StripeSetupIntent struct {
-	ID           string `json:"id"`
-	ClientSecret string `json:"client_secret"`
-}
-
-// ConfirmPaymentMethodRequest contains the fields for the customer payment update API.
-type ConfirmPaymentMethodRequest struct {
-	StripeSetupIntentID string `json:"stripe_setup_intent_id"`
-}
-
-// Customer model represents a customer on the system.
-type CloudCustomer struct {
-	CloudCustomerInfo
-	ID             string         `json:"id"`
-	CreatorID      string         `json:"creator_id"`
-	CreateAt       int64          `json:"create_at"`
-	BillingAddress *Address       `json:"billing_address"`
-	CompanyAddress *Address       `json:"company_address"`
-	PaymentMethod  *PaymentMethod `json:"payment_method"`
-}
-
-// CloudCustomerInfo represents editable info of a customer.
-type CloudCustomerInfo struct {
-	Name             string `json:"name"`
-	Email            string `json:"email,omitempty"`
-	ContactFirstName string `json:"contact_first_name,omitempty"`
-	ContactLastName  string `json:"contact_last_name,omitempty"`
-	NumEmployees     int    `json:"num_employees"`
-}
-
-// Address model represents a customer's address.
-type Address struct {
-	City       string `json:"city"`
-	Country    string `json:"country"`
-	Line1      string `json:"line1"`
-	Line2      string `json:"line2"`
-	PostalCode string `json:"postal_code"`
-	State      string `json:"state"`
-}
-
-// PaymentMethod represents methods of payment for a customer.
-type PaymentMethod struct {
-	Type      string `json:"type"`
-	LastFour  int    `json:"last_four"`
-	ExpMonth  int    `json:"exp_month"`
-	ExpYear   int    `json:"exp_year"`
-	CardBrand string `json:"card_brand"`
-	Name      string `json:"name"`
-}
-
-// Subscription model represents a subscription on the system.
-type Subscription struct {
-	ID          string   `json:"id"`
-	CustomerID  string   `json:"customer_id"`
-	ProductID   string   `json:"product_id"`
-	AddOns      []string `json:"add_ons"`
-	StartAt     int64    `json:"start_at"`
-	EndAt       int64    `json:"end_at"`
-	CreateAt    int64    `json:"create_at"`
-	Seats       int      `json:"seats"`
-	Status      string   `json:"status"`
-	DNS         string   `json:"dns"`
-	IsPaidTier  string   `json:"is_paid_tier"`
-	LastInvoice *Invoice `json:"last_invoice"`
-	IsFreeTrial string   `json:"is_free_trial"`
-	TrialEndAt  int64    `json:"trial_end_at"`
-}
-
-// GetWorkSpaceNameFromDNS returns the work space name. For example from test.mattermost.cloud.com, it returns test
-func (s *Subscription) GetWorkSpaceNameFromDNS() string {
-	return strings.Split(s.DNS, ".")[0]
-}
-
-// Invoice model represents a cloud invoice
-type Invoice struct {
-	ID             string             `json:"id"`
-	Number         string             `json:"number"`
-	CreateAt       int64              `json:"create_at"`
-	Total          int64              `json:"total"`
-	Tax            int64              `json:"tax"`
-	Status         string             `json:"status"`
-	Description    string             `json:"description"`
-	PeriodStart    int64              `json:"period_start"`
-	PeriodEnd      int64              `json:"period_end"`
-	SubscriptionID string             `json:"subscription_id"`
-	Items          []*InvoiceLineItem `json:"line_items"`
-}
-
-// InvoiceLineItem model represents a cloud invoice lineitem tied to an invoice.
-type InvoiceLineItem struct {
-	PriceID      string                 `json:"price_id"`
-	Total        int64                  `json:"total"`
-	Quantity     int64                  `json:"quantity"`
-	PricePerUnit int64                  `json:"price_per_unit"`
-	Description  string                 `json:"description"`
-	Type         string                 `json:"type"`
-	Metadata     map[string]interface{} `json:"metadata"`
-}
-
-type CWSWebhookPayload struct {
-	Event                             string               `json:"event"`
-	FailedPayment                     *FailedPayment       `json:"failed_payment"`
-	CloudWorkspaceOwner               *CloudWorkspaceOwner `json:"cloud_workspace_owner"`
-	SubscriptionTrialEndUnixTimeStamp int64                `json:"trial_end_time_stamp"`
-}
-
-type FailedPayment struct {
-	CardBrand      string `json:"card_brand"`
-	LastFour       int    `json:"last_four"`
-	FailureMessage string `json:"failure_message"`
-}
-
-// CloudWorkspaceOwner is part of the CWS Webhook payload that contains information about the user that created the workspace from the CWS
-type CloudWorkspaceOwner struct {
-	UserName string `json:"username"`
-}
-type SubscriptionStats struct {
-	RemainingSeats int    `json:"remaining_seats"`
-	IsPaidTier     string `json:"is_paid_tier"`
-	IsFreeTrial    string `json:"is_free_trial"`
-}
-
-type SubscriptionChange struct {
-	ProductID string `json:"product_id"`
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/cluster_discovery.go b/vendor/github.com/mattermost/mattermost-server/v5/model/cluster_discovery.go
deleted file mode 100644
index 758e4980..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/cluster_discovery.go
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-	"os"
-)
-
-const (
-	CDS_OFFLINE_AFTER_MILLIS = 1000 * 60 * 30 // 30 minutes
-	CDS_TYPE_APP             = "mattermost_app"
-)
-
-type ClusterDiscovery struct {
-	Id          string `json:"id"`
-	Type        string `json:"type"`
-	ClusterName string `json:"cluster_name"`
-	Hostname    string `json:"hostname"`
-	GossipPort  int32  `json:"gossip_port"`
-	Port        int32  `json:"port"`
-	CreateAt    int64  `json:"create_at"`
-	LastPingAt  int64  `json:"last_ping_at"`
-}
-
-func (o *ClusterDiscovery) PreSave() {
-	if o.Id == "" {
-		o.Id = NewId()
-	}
-
-	if o.CreateAt == 0 {
-		o.CreateAt = GetMillis()
-		o.LastPingAt = o.CreateAt
-	}
-}
-
-func (o *ClusterDiscovery) AutoFillHostname() {
-	// attempt to set the hostname from the OS
-	if o.Hostname == "" {
-		if hn, err := os.Hostname(); err == nil {
-			o.Hostname = hn
-		}
-	}
-}
-
-func (o *ClusterDiscovery) AutoFillIpAddress(iface string, ipAddress string) {
-	// attempt to set the hostname to the first non-local IP address
-	if o.Hostname == "" {
-		if ipAddress != "" {
-			o.Hostname = ipAddress
-		} else {
-			o.Hostname = GetServerIpAddress(iface)
-		}
-	}
-}
-
-func (o *ClusterDiscovery) IsEqual(in *ClusterDiscovery) bool {
-	if in == nil {
-		return false
-	}
-
-	if o.Type != in.Type {
-		return false
-	}
-
-	if o.ClusterName != in.ClusterName {
-		return false
-	}
-
-	if o.Hostname != in.Hostname {
-		return false
-	}
-
-	return true
-}
-
-func FilterClusterDiscovery(vs []*ClusterDiscovery, f func(*ClusterDiscovery) bool) []*ClusterDiscovery {
-	copy := make([]*ClusterDiscovery, 0)
-	for _, v := range vs {
-		if f(v) {
-			copy = append(copy, v)
-		}
-	}
-
-	return copy
-}
-
-func (o *ClusterDiscovery) IsValid() *AppError {
-	if !IsValidId(o.Id) {
-		return NewAppError("ClusterDiscovery.IsValid", "model.cluster.is_valid.id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.ClusterName == "" {
-		return NewAppError("ClusterDiscovery.IsValid", "model.cluster.is_valid.name.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.Type == "" {
-		return NewAppError("ClusterDiscovery.IsValid", "model.cluster.is_valid.type.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.Hostname == "" {
-		return NewAppError("ClusterDiscovery.IsValid", "model.cluster.is_valid.hostname.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.CreateAt == 0 {
-		return NewAppError("ClusterDiscovery.IsValid", "model.cluster.is_valid.create_at.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.LastPingAt == 0 {
-		return NewAppError("ClusterDiscovery.IsValid", "model.cluster.is_valid.last_ping_at.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (o *ClusterDiscovery) ToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return ""
-	}
-
-	return string(b)
-}
-
-func ClusterDiscoveryFromJson(data io.Reader) *ClusterDiscovery {
-	decoder := json.NewDecoder(data)
-	var me ClusterDiscovery
-	err := decoder.Decode(&me)
-	if err == nil {
-		return &me
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/cluster_info.go b/vendor/github.com/mattermost/mattermost-server/v5/model/cluster_info.go
deleted file mode 100644
index fc15d38c..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/cluster_info.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type ClusterInfo struct {
-	Id         string `json:"id"`
-	Version    string `json:"version"`
-	ConfigHash string `json:"config_hash"`
-	IpAddress  string `json:"ipaddress"`
-	Hostname   string `json:"hostname"`
-}
-
-func (ci *ClusterInfo) ToJson() string {
-	b, _ := json.Marshal(ci)
-	return string(b)
-}
-
-func ClusterInfoFromJson(data io.Reader) *ClusterInfo {
-	var ci *ClusterInfo
-	json.NewDecoder(data).Decode(&ci)
-	return ci
-}
-
-func ClusterInfosToJson(objmap []*ClusterInfo) string {
-	b, _ := json.Marshal(objmap)
-	return string(b)
-}
-
-func ClusterInfosFromJson(data io.Reader) []*ClusterInfo {
-	decoder := json.NewDecoder(data)
-
-	var objmap []*ClusterInfo
-	if err := decoder.Decode(&objmap); err != nil {
-		return make([]*ClusterInfo, 0)
-	}
-	return objmap
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/cluster_message.go b/vendor/github.com/mattermost/mattermost-server/v5/model/cluster_message.go
deleted file mode 100644
index bd73ba8d..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/cluster_message.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-const (
-	CLUSTER_EVENT_PUBLISH                                           = "publish"
-	CLUSTER_EVENT_UPDATE_STATUS                                     = "update_status"
-	CLUSTER_EVENT_INVALIDATE_ALL_CACHES                             = "inv_all_caches"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_REACTIONS                    = "inv_reactions"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_WEBHOOK                      = "inv_webhook"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL_POSTS                = "inv_channel_posts"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL_MEMBERS_NOTIFY_PROPS = "inv_channel_members_notify_props"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL_MEMBERS              = "inv_channel_members"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL_BY_NAME              = "inv_channel_name"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL                      = "inv_channel"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL_GUEST_COUNT          = "inv_channel_guest_count"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_USER                         = "inv_user"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_USER_TEAMS                   = "inv_user_teams"
-	CLUSTER_EVENT_CLEAR_SESSION_CACHE_FOR_USER                      = "clear_session_user"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_ROLES                        = "inv_roles"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_ROLE_PERMISSIONS             = "inv_role_permissions"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_PROFILE_BY_IDS               = "inv_profile_ids"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_PROFILE_IN_CHANNEL           = "inv_profile_in_channel"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_SCHEMES                      = "inv_schemes"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_FILE_INFOS                   = "inv_file_infos"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_WEBHOOKS                     = "inv_webhooks"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_EMOJIS_BY_ID                 = "inv_emojis_by_id"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_EMOJIS_ID_BY_NAME            = "inv_emojis_id_by_name"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL_PINNEDPOSTS_COUNTS   = "inv_channel_pinnedposts_counts"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL_MEMBER_COUNTS        = "inv_channel_member_counts"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_LAST_POSTS                   = "inv_last_posts"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_LAST_POST_TIME               = "inv_last_post_time"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_TEAMS                        = "inv_teams"
-	CLUSTER_EVENT_CLEAR_SESSION_CACHE_FOR_ALL_USERS                 = "inv_all_user_sessions"
-	CLUSTER_EVENT_INSTALL_PLUGIN                                    = "install_plugin"
-	CLUSTER_EVENT_REMOVE_PLUGIN                                     = "remove_plugin"
-	CLUSTER_EVENT_PLUGIN_EVENT                                      = "plugin_event"
-	CLUSTER_EVENT_INVALIDATE_CACHE_FOR_TERMS_OF_SERVICE             = "inv_terms_of_service"
-	CLUSTER_EVENT_BUSY_STATE_CHANGED                                = "busy_state_change"
-
-	// Gossip communication
-	CLUSTER_GOSSIP_EVENT_REQUEST_GET_LOGS             = "gossip_request_get_logs"
-	CLUSTER_GOSSIP_EVENT_RESPONSE_GET_LOGS            = "gossip_response_get_logs"
-	CLUSTER_GOSSIP_EVENT_REQUEST_GET_CLUSTER_STATS    = "gossip_request_cluster_stats"
-	CLUSTER_GOSSIP_EVENT_RESPONSE_GET_CLUSTER_STATS   = "gossip_response_cluster_stats"
-	CLUSTER_GOSSIP_EVENT_REQUEST_GET_PLUGIN_STATUSES  = "gossip_request_plugin_statuses"
-	CLUSTER_GOSSIP_EVENT_RESPONSE_GET_PLUGIN_STATUSES = "gossip_response_plugin_statuses"
-	CLUSTER_GOSSIP_EVENT_REQUEST_SAVE_CONFIG          = "gossip_request_save_config"
-	CLUSTER_GOSSIP_EVENT_RESPONSE_SAVE_CONFIG         = "gossip_response_save_config"
-
-	// SendTypes for ClusterMessage.
-	CLUSTER_SEND_BEST_EFFORT = "best_effort"
-	CLUSTER_SEND_RELIABLE    = "reliable"
-)
-
-type ClusterMessage struct {
-	Event            string            `json:"event"`
-	SendType         string            `json:"-"`
-	WaitForAllToSend bool              `json:"-"`
-	Data             string            `json:"data,omitempty"`
-	Props            map[string]string `json:"props,omitempty"`
-}
-
-func (o *ClusterMessage) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func ClusterMessageFromJson(data io.Reader) *ClusterMessage {
-	var o *ClusterMessage
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/cluster_stats.go b/vendor/github.com/mattermost/mattermost-server/v5/model/cluster_stats.go
deleted file mode 100644
index 9e8c630c..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/cluster_stats.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type ClusterStats struct {
-	Id                        string `json:"id"`
-	TotalWebsocketConnections int    `json:"total_websocket_connections"`
-	TotalReadDbConnections    int    `json:"total_read_db_connections"`
-	TotalMasterDbConnections  int    `json:"total_master_db_connections"`
-}
-
-func (cs *ClusterStats) ToJson() string {
-	b, _ := json.Marshal(cs)
-	return string(b)
-}
-
-func ClusterStatsFromJson(data io.Reader) *ClusterStats {
-	var cs *ClusterStats
-	json.NewDecoder(data).Decode(&cs)
-	return cs
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/command.go b/vendor/github.com/mattermost/mattermost-server/v5/model/command.go
deleted file mode 100644
index 59a4eee4..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/command.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-	"strings"
-)
-
-const (
-	COMMAND_METHOD_POST = "P"
-	COMMAND_METHOD_GET  = "G"
-	MIN_TRIGGER_LENGTH  = 1
-	MAX_TRIGGER_LENGTH  = 128
-)
-
-type Command struct {
-	Id               string `json:"id"`
-	Token            string `json:"token"`
-	CreateAt         int64  `json:"create_at"`
-	UpdateAt         int64  `json:"update_at"`
-	DeleteAt         int64  `json:"delete_at"`
-	CreatorId        string `json:"creator_id"`
-	TeamId           string `json:"team_id"`
-	Trigger          string `json:"trigger"`
-	Method           string `json:"method"`
-	Username         string `json:"username"`
-	IconURL          string `json:"icon_url"`
-	AutoComplete     bool   `json:"auto_complete"`
-	AutoCompleteDesc string `json:"auto_complete_desc"`
-	AutoCompleteHint string `json:"auto_complete_hint"`
-	DisplayName      string `json:"display_name"`
-	Description      string `json:"description"`
-	URL              string `json:"url"`
-	// PluginId records the id of the plugin that created this Command. If it is blank, the Command
-	// was not created by a plugin.
-	PluginId         string            `json:"plugin_id"`
-	AutocompleteData *AutocompleteData `db:"-" json:"autocomplete_data,omitempty"`
-	// AutocompleteIconData is a base64 encoded svg
-	AutocompleteIconData string `db:"-" json:"autocomplete_icon_data,omitempty"`
-}
-
-func (o *Command) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func CommandFromJson(data io.Reader) *Command {
-	var o *Command
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func CommandListToJson(l []*Command) string {
-	b, _ := json.Marshal(l)
-	return string(b)
-}
-
-func CommandListFromJson(data io.Reader) []*Command {
-	var o []*Command
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func (o *Command) IsValid() *AppError {
-
-	if !IsValidId(o.Id) {
-		return NewAppError("Command.IsValid", "model.command.is_valid.id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(o.Token) != 26 {
-		return NewAppError("Command.IsValid", "model.command.is_valid.token.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.CreateAt == 0 {
-		return NewAppError("Command.IsValid", "model.command.is_valid.create_at.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.UpdateAt == 0 {
-		return NewAppError("Command.IsValid", "model.command.is_valid.update_at.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	// If the CreatorId is blank, this should be a command created by a plugin.
-	if o.CreatorId == "" && !IsValidPluginId(o.PluginId) {
-		return NewAppError("Command.IsValid", "model.command.is_valid.plugin_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	// If the PluginId is blank, this should be a command associated with a userId.
-	if o.PluginId == "" && !IsValidId(o.CreatorId) {
-		return NewAppError("Command.IsValid", "model.command.is_valid.user_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.CreatorId != "" && o.PluginId != "" {
-		return NewAppError("Command.IsValid", "model.command.is_valid.plugin_id.app_error", nil, "command cannot have both a CreatorId and a PluginId", http.StatusBadRequest)
-	}
-
-	if !IsValidId(o.TeamId) {
-		return NewAppError("Command.IsValid", "model.command.is_valid.team_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(o.Trigger) < MIN_TRIGGER_LENGTH || len(o.Trigger) > MAX_TRIGGER_LENGTH || strings.Index(o.Trigger, "/") == 0 || strings.Contains(o.Trigger, " ") {
-		return NewAppError("Command.IsValid", "model.command.is_valid.trigger.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.URL == "" || len(o.URL) > 1024 {
-		return NewAppError("Command.IsValid", "model.command.is_valid.url.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !IsValidHttpUrl(o.URL) {
-		return NewAppError("Command.IsValid", "model.command.is_valid.url_http.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !(o.Method == COMMAND_METHOD_GET || o.Method == COMMAND_METHOD_POST) {
-		return NewAppError("Command.IsValid", "model.command.is_valid.method.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(o.DisplayName) > 64 {
-		return NewAppError("Command.IsValid", "model.command.is_valid.display_name.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(o.Description) > 128 {
-		return NewAppError("Command.IsValid", "model.command.is_valid.description.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.AutocompleteData != nil {
-		if err := o.AutocompleteData.IsValid(); err != nil {
-			return NewAppError("Command.IsValid", "model.command.is_valid.autocomplete_data.app_error", nil, err.Error(), http.StatusBadRequest)
-		}
-	}
-
-	return nil
-}
-
-func (o *Command) PreSave() {
-	if o.Id == "" {
-		o.Id = NewId()
-	}
-
-	if o.Token == "" {
-		o.Token = NewId()
-	}
-
-	o.CreateAt = GetMillis()
-	o.UpdateAt = o.CreateAt
-}
-
-func (o *Command) PreUpdate() {
-	o.UpdateAt = GetMillis()
-}
-
-func (o *Command) Sanitize() {
-	o.Token = ""
-	o.CreatorId = ""
-	o.Method = ""
-	o.URL = ""
-	o.Username = ""
-	o.IconURL = ""
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/command_args.go b/vendor/github.com/mattermost/mattermost-server/v5/model/command_args.go
deleted file mode 100644
index 45239d2c..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/command_args.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-
-	"github.com/mattermost/mattermost-server/v5/shared/i18n"
-)
-
-type CommandArgs struct {
-	UserId          string             `json:"user_id"`
-	ChannelId       string             `json:"channel_id"`
-	TeamId          string             `json:"team_id"`
-	RootId          string             `json:"root_id"`
-	ParentId        string             `json:"parent_id"`
-	TriggerId       string             `json:"trigger_id,omitempty"`
-	Command         string             `json:"command"`
-	SiteURL         string             `json:"-"`
-	T               i18n.TranslateFunc `json:"-"`
-	UserMentions    UserMentionMap     `json:"-"`
-	ChannelMentions ChannelMentionMap  `json:"-"`
-
-	// DO NOT USE Session field is deprecated. MM-26398
-	Session Session `json:"-"`
-}
-
-func (o *CommandArgs) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func CommandArgsFromJson(data io.Reader) *CommandArgs {
-	var o *CommandArgs
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-// AddUserMention adds or overrides an entry in UserMentions with name username
-// and identifier userId
-func (o *CommandArgs) AddUserMention(username, userId string) {
-	if o.UserMentions == nil {
-		o.UserMentions = make(UserMentionMap)
-	}
-
-	o.UserMentions[username] = userId
-}
-
-// AddChannelMention adds or overrides an entry in ChannelMentions with name
-// channelName and identifier channelId
-func (o *CommandArgs) AddChannelMention(channelName, channelId string) {
-	if o.ChannelMentions == nil {
-		o.ChannelMentions = make(ChannelMentionMap)
-	}
-
-	o.ChannelMentions[channelName] = channelId
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/command_autocomplete.go b/vendor/github.com/mattermost/mattermost-server/v5/model/command_autocomplete.go
deleted file mode 100644
index f115ed24..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/command_autocomplete.go
+++ /dev/null
@@ -1,455 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"net/url"
-	"path"
-	"reflect"
-	"strings"
-
-	"github.com/pkg/errors"
-)
-
-// AutocompleteArgType describes autocomplete argument type
-type AutocompleteArgType string
-
-// Argument types
-const (
-	AutocompleteArgTypeText        AutocompleteArgType = "TextInput"
-	AutocompleteArgTypeStaticList  AutocompleteArgType = "StaticList"
-	AutocompleteArgTypeDynamicList AutocompleteArgType = "DynamicList"
-)
-
-// AutocompleteData describes slash command autocomplete information.
-type AutocompleteData struct {
-	// Trigger of the command
-	Trigger string
-	// Hint of a command
-	Hint string
-	// Text displayed to the user to help with the autocomplete description
-	HelpText string
-	// Role of the user who should be able to see the autocomplete info of this command
-	RoleID string
-	// Arguments of the command. Arguments can be named or positional.
-	// If they are positional order in the list matters, if they are named order does not matter.
-	// All arguments should be either named or positional, no mixing allowed.
-	Arguments []*AutocompleteArg
-	// Subcommands of the command
-	SubCommands []*AutocompleteData
-}
-
-// AutocompleteArg describes an argument of the command. Arguments can be named or positional.
-// If Name is empty string Argument is positional otherwise it is named argument.
-// Named arguments are passed as --Name Argument_Value.
-type AutocompleteArg struct {
-	// Name of the argument
-	Name string
-	// Text displayed to the user to help with the autocomplete
-	HelpText string
-	// Type of the argument
-	Type AutocompleteArgType
-	// Required determines if argument is optional or not.
-	Required bool
-	// Actual data of the argument (depends on the Type)
-	Data interface{}
-}
-
-// AutocompleteTextArg describes text user can input as an argument.
-type AutocompleteTextArg struct {
-	// Hint of the input text
-	Hint string
-	// Regex pattern to match
-	Pattern string
-}
-
-// AutocompleteListItem describes an item in the AutocompleteStaticListArg.
-type AutocompleteListItem struct {
-	Item     string
-	Hint     string
-	HelpText string
-}
-
-// AutocompleteStaticListArg is used to input one of the arguments from the list,
-// for example [yes, no], [on, off], and so on.
-type AutocompleteStaticListArg struct {
-	PossibleArguments []AutocompleteListItem
-}
-
-// AutocompleteDynamicListArg is used when user wants to download possible argument list from the URL.
-type AutocompleteDynamicListArg struct {
-	FetchURL string
-}
-
-// AutocompleteSuggestion describes a single suggestion item sent to the front-end
-// Example: for user input `/jira cre` -
-// Complete might be `/jira create`
-// Suggestion might be `create`,
-// Hint might be `[issue text]`,
-// Description might be `Create a new Issue`
-type AutocompleteSuggestion struct {
-	// Complete describes completed suggestion
-	Complete string
-	// Suggestion describes what user might want to input next
-	Suggestion string
-	// Hint describes a hint about the suggested input
-	Hint string
-	// Description of the command or a suggestion
-	Description string
-	// IconData is base64 encoded svg image
-	IconData string
-}
-
-// NewAutocompleteData returns new Autocomplete data.
-func NewAutocompleteData(trigger, hint, helpText string) *AutocompleteData {
-	return &AutocompleteData{
-		Trigger:     trigger,
-		Hint:        hint,
-		HelpText:    helpText,
-		RoleID:      SYSTEM_USER_ROLE_ID,
-		Arguments:   []*AutocompleteArg{},
-		SubCommands: []*AutocompleteData{},
-	}
-}
-
-// AddCommand adds a subcommand to the autocomplete data.
-func (ad *AutocompleteData) AddCommand(command *AutocompleteData) {
-	ad.SubCommands = append(ad.SubCommands, command)
-}
-
-// AddTextArgument adds positional AutocompleteArgTypeText argument to the command.
-func (ad *AutocompleteData) AddTextArgument(helpText, hint, pattern string) {
-	ad.AddNamedTextArgument("", helpText, hint, pattern, true)
-}
-
-// AddNamedTextArgument adds named AutocompleteArgTypeText argument to the command.
-func (ad *AutocompleteData) AddNamedTextArgument(name, helpText, hint, pattern string, required bool) {
-	argument := AutocompleteArg{
-		Name:     name,
-		HelpText: helpText,
-		Type:     AutocompleteArgTypeText,
-		Required: required,
-		Data:     &AutocompleteTextArg{Hint: hint, Pattern: pattern},
-	}
-	ad.Arguments = append(ad.Arguments, &argument)
-}
-
-// AddStaticListArgument adds positional AutocompleteArgTypeStaticList argument to the command.
-func (ad *AutocompleteData) AddStaticListArgument(helpText string, required bool, items []AutocompleteListItem) {
-	ad.AddNamedStaticListArgument("", helpText, required, items)
-}
-
-// AddNamedStaticListArgument adds named AutocompleteArgTypeStaticList argument to the command.
-func (ad *AutocompleteData) AddNamedStaticListArgument(name, helpText string, required bool, items []AutocompleteListItem) {
-	argument := AutocompleteArg{
-		Name:     name,
-		HelpText: helpText,
-		Type:     AutocompleteArgTypeStaticList,
-		Required: required,
-		Data:     &AutocompleteStaticListArg{PossibleArguments: items},
-	}
-	ad.Arguments = append(ad.Arguments, &argument)
-}
-
-// AddDynamicListArgument adds positional AutocompleteArgTypeDynamicList argument to the command.
-func (ad *AutocompleteData) AddDynamicListArgument(helpText, url string, required bool) {
-	ad.AddNamedDynamicListArgument("", helpText, url, required)
-}
-
-// AddNamedDynamicListArgument adds named AutocompleteArgTypeDynamicList argument to the command.
-func (ad *AutocompleteData) AddNamedDynamicListArgument(name, helpText, url string, required bool) {
-	argument := AutocompleteArg{
-		Name:     name,
-		HelpText: helpText,
-		Type:     AutocompleteArgTypeDynamicList,
-		Required: required,
-		Data:     &AutocompleteDynamicListArg{FetchURL: url},
-	}
-	ad.Arguments = append(ad.Arguments, &argument)
-}
-
-// Equals method checks if command is the same.
-func (ad *AutocompleteData) Equals(command *AutocompleteData) bool {
-	if !(ad.Trigger == command.Trigger && ad.HelpText == command.HelpText && ad.RoleID == command.RoleID && ad.Hint == command.Hint) {
-		return false
-	}
-	if len(ad.Arguments) != len(command.Arguments) || len(ad.SubCommands) != len(command.SubCommands) {
-		return false
-	}
-	for i := range ad.Arguments {
-		if !ad.Arguments[i].Equals(command.Arguments[i]) {
-			return false
-		}
-	}
-	for i := range ad.SubCommands {
-		if !ad.SubCommands[i].Equals(command.SubCommands[i]) {
-			return false
-		}
-	}
-	return true
-}
-
-// UpdateRelativeURLsForPluginCommands method updates relative urls for plugin commands
-func (ad *AutocompleteData) UpdateRelativeURLsForPluginCommands(baseURL *url.URL) error {
-	for _, arg := range ad.Arguments {
-		if arg.Type != AutocompleteArgTypeDynamicList {
-			continue
-		}
-		dynamicList, ok := arg.Data.(*AutocompleteDynamicListArg)
-		if !ok {
-			return errors.New("Not a proper DynamicList type argument")
-		}
-		dynamicListURL, err := url.Parse(dynamicList.FetchURL)
-		if err != nil {
-			return errors.Wrapf(err, "FetchURL is not a proper url")
-		}
-		if !dynamicListURL.IsAbs() {
-			absURL := &url.URL{}
-			*absURL = *baseURL
-			absURL.Path = path.Join(absURL.Path, dynamicList.FetchURL)
-			dynamicList.FetchURL = absURL.String()
-		}
-
-	}
-	for _, command := range ad.SubCommands {
-		err := command.UpdateRelativeURLsForPluginCommands(baseURL)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// IsValid method checks if autocomplete data is valid.
-func (ad *AutocompleteData) IsValid() error {
-	if ad == nil {
-		return errors.New("No nil commands are allowed in AutocompleteData")
-	}
-	if ad.Trigger == "" {
-		return errors.New("An empty command name in the autocomplete data")
-	}
-	if strings.ToLower(ad.Trigger) != ad.Trigger {
-		return errors.New("Command should be lowercase")
-	}
-	roles := []string{SYSTEM_ADMIN_ROLE_ID, SYSTEM_USER_ROLE_ID, ""}
-	if stringNotInSlice(ad.RoleID, roles) {
-		return errors.New("Wrong role in the autocomplete data")
-	}
-	if len(ad.Arguments) > 0 && len(ad.SubCommands) > 0 {
-		return errors.New("Command can't have arguments and subcommands")
-	}
-	if len(ad.Arguments) > 0 {
-		namedArgumentIndex := -1
-		for i, arg := range ad.Arguments {
-			if arg.Name != "" { // it's a named argument
-				if namedArgumentIndex == -1 { // first named argument
-					namedArgumentIndex = i
-				}
-			} else { // it's a positional argument
-				if namedArgumentIndex != -1 {
-					return errors.New("Named argument should not be before positional argument")
-				}
-			}
-			if arg.Type == AutocompleteArgTypeDynamicList {
-				dynamicList, ok := arg.Data.(*AutocompleteDynamicListArg)
-				if !ok {
-					return errors.New("Not a proper DynamicList type argument")
-				}
-				_, err := url.Parse(dynamicList.FetchURL)
-				if err != nil {
-					return errors.Wrapf(err, "FetchURL is not a proper url")
-				}
-			} else if arg.Type == AutocompleteArgTypeStaticList {
-				staticList, ok := arg.Data.(*AutocompleteStaticListArg)
-				if !ok {
-					return errors.New("Not a proper StaticList type argument")
-				}
-				for _, arg := range staticList.PossibleArguments {
-					if arg.Item == "" {
-						return errors.New("Possible argument name not set in StaticList argument")
-					}
-				}
-			} else if arg.Type == AutocompleteArgTypeText {
-				if _, ok := arg.Data.(*AutocompleteTextArg); !ok {
-					return errors.New("Not a proper TextInput type argument")
-				}
-				if arg.Name == "" && !arg.Required {
-					return errors.New("Positional argument can not be optional")
-				}
-			}
-		}
-	}
-	for _, command := range ad.SubCommands {
-		err := command.IsValid()
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// ToJSON encodes AutocompleteData struct to the json
-func (ad *AutocompleteData) ToJSON() ([]byte, error) {
-	b, err := json.Marshal(ad)
-	if err != nil {
-		return nil, errors.Wrapf(err, "can't marshal slash command %s", ad.Trigger)
-	}
-	return b, nil
-}
-
-// AutocompleteDataFromJSON decodes AutocompleteData struct from the json
-func AutocompleteDataFromJSON(data []byte) (*AutocompleteData, error) {
-	var ad AutocompleteData
-	if err := json.Unmarshal(data, &ad); err != nil {
-		return nil, errors.Wrap(err, "can't unmarshal AutocompleteData")
-	}
-	return &ad, nil
-}
-
-// Equals method checks if argument is the same.
-func (a *AutocompleteArg) Equals(arg *AutocompleteArg) bool {
-	if a.Name != arg.Name ||
-		a.HelpText != arg.HelpText ||
-		a.Type != arg.Type ||
-		a.Required != arg.Required ||
-		!reflect.DeepEqual(a.Data, arg.Data) {
-		return false
-	}
-	return true
-}
-
-// UnmarshalJSON will unmarshal argument
-func (a *AutocompleteArg) UnmarshalJSON(b []byte) error {
-	var arg map[string]interface{}
-	if err := json.Unmarshal(b, &arg); err != nil {
-		return errors.Wrapf(err, "Can't unmarshal argument %s", string(b))
-	}
-	var ok bool
-	a.Name, ok = arg["Name"].(string)
-	if !ok {
-		return errors.Errorf("No field Name in the argument %s", string(b))
-	}
-
-	a.HelpText, ok = arg["HelpText"].(string)
-	if !ok {
-		return errors.Errorf("No field HelpText in the argument %s", string(b))
-	}
-
-	t, ok := arg["Type"].(string)
-	if !ok {
-		return errors.Errorf("No field Type in the argument %s", string(b))
-	}
-	a.Type = AutocompleteArgType(t)
-
-	a.Required, ok = arg["Required"].(bool)
-	if !ok {
-		return errors.Errorf("No field Required in the argument %s", string(b))
-	}
-
-	data, ok := arg["Data"]
-	if !ok {
-		return errors.Errorf("No field Data in the argument %s", string(b))
-	}
-
-	if a.Type == AutocompleteArgTypeText {
-		m, ok := data.(map[string]interface{})
-		if !ok {
-			return errors.Errorf("Wrong Data type in the TextInput argument %s", string(b))
-		}
-		pattern, ok := m["Pattern"].(string)
-		if !ok {
-			return errors.Errorf("No field Pattern in the TextInput argument %s", string(b))
-		}
-		hint, ok := m["Hint"].(string)
-		if !ok {
-			return errors.Errorf("No field Hint in the TextInput argument %s", string(b))
-		}
-		a.Data = &AutocompleteTextArg{Hint: hint, Pattern: pattern}
-	} else if a.Type == AutocompleteArgTypeStaticList {
-		m, ok := data.(map[string]interface{})
-		if !ok {
-			return errors.Errorf("Wrong Data type in the StaticList argument %s", string(b))
-		}
-		list, ok := m["PossibleArguments"].([]interface{})
-		if !ok {
-			return errors.Errorf("No field PossibleArguments in the StaticList argument %s", string(b))
-		}
-
-		possibleArguments := []AutocompleteListItem{}
-		for i := range list {
-			args, ok := list[i].(map[string]interface{})
-			if !ok {
-				return errors.Errorf("Wrong AutocompleteStaticListItem type in the StaticList argument %s", string(b))
-			}
-			item, ok := args["Item"].(string)
-			if !ok {
-				return errors.Errorf("No field Item in the StaticList's possible arguments %s", string(b))
-			}
-
-			hint, ok := args["Hint"].(string)
-			if !ok {
-				return errors.Errorf("No field Hint in the StaticList's possible arguments %s", string(b))
-			}
-			helpText, ok := args["HelpText"].(string)
-			if !ok {
-				return errors.Errorf("No field Hint in the StaticList's possible arguments %s", string(b))
-			}
-
-			possibleArguments = append(possibleArguments, AutocompleteListItem{
-				Item:     item,
-				Hint:     hint,
-				HelpText: helpText,
-			})
-		}
-		a.Data = &AutocompleteStaticListArg{PossibleArguments: possibleArguments}
-	} else if a.Type == AutocompleteArgTypeDynamicList {
-		m, ok := data.(map[string]interface{})
-		if !ok {
-			return errors.Errorf("Wrong type in the DynamicList argument %s", string(b))
-		}
-		url, ok := m["FetchURL"].(string)
-		if !ok {
-			return errors.Errorf("No field FetchURL in the DynamicList's argument %s", string(b))
-		}
-		a.Data = &AutocompleteDynamicListArg{FetchURL: url}
-	}
-	return nil
-}
-
-// AutocompleteSuggestionsToJSON returns json for a list of AutocompleteSuggestion objects
-func AutocompleteSuggestionsToJSON(suggestions []AutocompleteSuggestion) []byte {
-	b, _ := json.Marshal(suggestions)
-	return b
-}
-
-// AutocompleteSuggestionsFromJSON returns list of AutocompleteSuggestions from json.
-func AutocompleteSuggestionsFromJSON(data io.Reader) []AutocompleteSuggestion {
-	var o []AutocompleteSuggestion
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-// AutocompleteStaticListItemsToJSON returns json for a list of AutocompleteStaticListItem objects
-func AutocompleteStaticListItemsToJSON(items []AutocompleteListItem) []byte {
-	b, _ := json.Marshal(items)
-	return b
-}
-
-// AutocompleteStaticListItemsFromJSON returns list of AutocompleteStaticListItem from json.
-func AutocompleteStaticListItemsFromJSON(data io.Reader) []AutocompleteListItem {
-	var o []AutocompleteListItem
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func stringNotInSlice(a string, slice []string) bool {
-	for _, b := range slice {
-		if b == a {
-			return false
-		}
-	}
-	return true
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/command_request.go b/vendor/github.com/mattermost/mattermost-server/v5/model/command_request.go
deleted file mode 100644
index 9a4e40c8..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/command_request.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type CommandMoveRequest struct {
-	TeamId string `json:"team_id"`
-}
-
-func CommandMoveRequestFromJson(data io.Reader) (*CommandMoveRequest, error) {
-	decoder := json.NewDecoder(data)
-	var cmr CommandMoveRequest
-	err := decoder.Decode(&cmr)
-	if err != nil {
-		return nil, err
-	}
-	return &cmr, nil
-}
-
-func (cmr *CommandMoveRequest) ToJson() string {
-	b, err := json.Marshal(cmr)
-	if err != nil {
-		return ""
-	}
-	return string(b)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/command_response.go b/vendor/github.com/mattermost/mattermost-server/v5/model/command_response.go
deleted file mode 100644
index 80cca5ab..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/command_response.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"io/ioutil"
-	"strings"
-
-	"github.com/mattermost/mattermost-server/v5/utils/jsonutils"
-)
-
-const (
-	COMMAND_RESPONSE_TYPE_IN_CHANNEL = "in_channel"
-	COMMAND_RESPONSE_TYPE_EPHEMERAL  = "ephemeral"
-)
-
-type CommandResponse struct {
-	ResponseType     string             `json:"response_type"`
-	Text             string             `json:"text"`
-	Username         string             `json:"username"`
-	ChannelId        string             `json:"channel_id"`
-	IconURL          string             `json:"icon_url"`
-	Type             string             `json:"type"`
-	Props            StringInterface    `json:"props"`
-	GotoLocation     string             `json:"goto_location"`
-	TriggerId        string             `json:"trigger_id"`
-	SkipSlackParsing bool               `json:"skip_slack_parsing"` // Set to `true` to skip the Slack-compatibility handling of Text.
-	Attachments      []*SlackAttachment `json:"attachments"`
-	ExtraResponses   []*CommandResponse `json:"extra_responses"`
-}
-
-func (o *CommandResponse) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func CommandResponseFromHTTPBody(contentType string, body io.Reader) (*CommandResponse, error) {
-	if strings.TrimSpace(strings.Split(contentType, ";")[0]) == "application/json" {
-		return CommandResponseFromJson(body)
-	}
-	if b, err := ioutil.ReadAll(body); err == nil {
-		return CommandResponseFromPlainText(string(b)), nil
-	}
-	return nil, nil
-}
-
-func CommandResponseFromPlainText(text string) *CommandResponse {
-	return &CommandResponse{
-		Text: text,
-	}
-}
-
-func CommandResponseFromJson(data io.Reader) (*CommandResponse, error) {
-	b, err := ioutil.ReadAll(data)
-	if err != nil {
-		return nil, err
-	}
-
-	var o CommandResponse
-	err = json.Unmarshal(b, &o)
-	if err != nil {
-		return nil, jsonutils.HumanizeJSONError(err, b)
-	}
-
-	o.Attachments = StringifySlackFieldValue(o.Attachments)
-
-	if o.ExtraResponses != nil {
-		for _, resp := range o.ExtraResponses {
-			resp.Attachments = StringifySlackFieldValue(resp.Attachments)
-		}
-	}
-
-	return &o, nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/command_webhook.go b/vendor/github.com/mattermost/mattermost-server/v5/model/command_webhook.go
deleted file mode 100644
index 3757ecc7..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/command_webhook.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"net/http"
-)
-
-type CommandWebhook struct {
-	Id        string
-	CreateAt  int64
-	CommandId string
-	UserId    string
-	ChannelId string
-	RootId    string
-	ParentId  string
-	UseCount  int
-}
-
-const (
-	COMMAND_WEBHOOK_LIFETIME = 1000 * 60 * 30
-)
-
-func (o *CommandWebhook) PreSave() {
-	if o.Id == "" {
-		o.Id = NewId()
-	}
-
-	if o.CreateAt == 0 {
-		o.CreateAt = GetMillis()
-	}
-}
-
-func (o *CommandWebhook) IsValid() *AppError {
-	if !IsValidId(o.Id) {
-		return NewAppError("CommandWebhook.IsValid", "model.command_hook.id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.CreateAt == 0 {
-		return NewAppError("CommandWebhook.IsValid", "model.command_hook.create_at.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if !IsValidId(o.CommandId) {
-		return NewAppError("CommandWebhook.IsValid", "model.command_hook.command_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !IsValidId(o.UserId) {
-		return NewAppError("CommandWebhook.IsValid", "model.command_hook.user_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !IsValidId(o.ChannelId) {
-		return NewAppError("CommandWebhook.IsValid", "model.command_hook.channel_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.RootId != "" && !IsValidId(o.RootId) {
-		return NewAppError("CommandWebhook.IsValid", "model.command_hook.root_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.ParentId != "" && !IsValidId(o.ParentId) {
-		return NewAppError("CommandWebhook.IsValid", "model.command_hook.parent_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/compliance.go b/vendor/github.com/mattermost/mattermost-server/v5/model/compliance.go
deleted file mode 100644
index 0211805e..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/compliance.go
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-	"strings"
-)
-
-const (
-	COMPLIANCE_STATUS_CREATED  = "created"
-	COMPLIANCE_STATUS_RUNNING  = "running"
-	COMPLIANCE_STATUS_FINISHED = "finished"
-	COMPLIANCE_STATUS_FAILED   = "failed"
-	COMPLIANCE_STATUS_REMOVED  = "removed"
-
-	COMPLIANCE_TYPE_DAILY = "daily"
-	COMPLIANCE_TYPE_ADHOC = "adhoc"
-)
-
-type Compliance struct {
-	Id       string `json:"id"`
-	CreateAt int64  `json:"create_at"`
-	UserId   string `json:"user_id"`
-	Status   string `json:"status"`
-	Count    int    `json:"count"`
-	Desc     string `json:"desc"`
-	Type     string `json:"type"`
-	StartAt  int64  `json:"start_at"`
-	EndAt    int64  `json:"end_at"`
-	Keywords string `json:"keywords"`
-	Emails   string `json:"emails"`
-}
-
-type Compliances []Compliance
-
-// ComplianceExportCursor is used for paginated iteration of posts
-// for compliance export.
-// We need to keep track of the last post ID in addition to the last post
-// CreateAt to break ties when two posts have the same CreateAt.
-type ComplianceExportCursor struct {
-	LastChannelsQueryPostCreateAt       int64
-	LastChannelsQueryPostID             string
-	ChannelsQueryCompleted              bool
-	LastDirectMessagesQueryPostCreateAt int64
-	LastDirectMessagesQueryPostID       string
-	DirectMessagesQueryCompleted        bool
-}
-
-func (c *Compliance) ToJson() string {
-	b, _ := json.Marshal(c)
-	return string(b)
-}
-
-func (c *Compliance) PreSave() {
-	if c.Id == "" {
-		c.Id = NewId()
-	}
-
-	if c.Status == "" {
-		c.Status = COMPLIANCE_STATUS_CREATED
-	}
-
-	c.Count = 0
-	c.Emails = NormalizeEmail(c.Emails)
-	c.Keywords = strings.ToLower(c.Keywords)
-
-	c.CreateAt = GetMillis()
-}
-
-func (c *Compliance) DeepCopy() *Compliance {
-	copy := *c
-	return &copy
-}
-
-func (c *Compliance) JobName() string {
-	jobName := c.Type
-	if c.Type == COMPLIANCE_TYPE_DAILY {
-		jobName += "-" + c.Desc
-	}
-
-	jobName += "-" + c.Id
-
-	return jobName
-}
-
-func (c *Compliance) IsValid() *AppError {
-
-	if !IsValidId(c.Id) {
-		return NewAppError("Compliance.IsValid", "model.compliance.is_valid.id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if c.CreateAt == 0 {
-		return NewAppError("Compliance.IsValid", "model.compliance.is_valid.create_at.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(c.Desc) > 512 || c.Desc == "" {
-		return NewAppError("Compliance.IsValid", "model.compliance.is_valid.desc.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if c.StartAt == 0 {
-		return NewAppError("Compliance.IsValid", "model.compliance.is_valid.start_at.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if c.EndAt == 0 {
-		return NewAppError("Compliance.IsValid", "model.compliance.is_valid.end_at.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if c.EndAt <= c.StartAt {
-		return NewAppError("Compliance.IsValid", "model.compliance.is_valid.start_end_at.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func ComplianceFromJson(data io.Reader) *Compliance {
-	var c *Compliance
-	json.NewDecoder(data).Decode(&c)
-	return c
-}
-
-func (c Compliances) ToJson() string {
-	b, err := json.Marshal(c)
-	if err != nil {
-		return "[]"
-	}
-	return string(b)
-}
-
-func CompliancesFromJson(data io.Reader) Compliances {
-	var o Compliances
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/compliance_post.go b/vendor/github.com/mattermost/mattermost-server/v5/model/compliance_post.go
deleted file mode 100644
index 5e18812b..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/compliance_post.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"regexp"
-	"time"
-)
-
-type CompliancePost struct {
-
-	// From Team
-	TeamName        string
-	TeamDisplayName string
-
-	// From Channel
-	ChannelName        string
-	ChannelDisplayName string
-	ChannelType        string
-
-	// From User
-	UserUsername string
-	UserEmail    string
-	UserNickname string
-
-	// From Post
-	PostId         string
-	PostCreateAt   int64
-	PostUpdateAt   int64
-	PostDeleteAt   int64
-	PostRootId     string
-	PostParentId   string
-	PostOriginalId string
-	PostMessage    string
-	PostType       string
-	PostProps      string
-	PostHashtags   string
-	PostFileIds    string
-
-	IsBot bool
-}
-
-func CompliancePostHeader() []string {
-	return []string{
-		"TeamName",
-		"TeamDisplayName",
-
-		"ChannelName",
-		"ChannelDisplayName",
-		"ChannelType",
-
-		"UserUsername",
-		"UserEmail",
-		"UserNickname",
-		"UserType",
-
-		"PostId",
-		"PostCreateAt",
-		"PostUpdateAt",
-		"PostDeleteAt",
-		"PostRootId",
-		"PostParentId",
-		"PostOriginalId",
-		"PostMessage",
-		"PostType",
-		"PostProps",
-		"PostHashtags",
-		"PostFileIds",
-	}
-}
-
-func cleanComplianceStrings(in string) string {
-	if matched, _ := regexp.MatchString("^\\s*(=|\\+|\\-)", in); matched {
-		return "'" + in
-	}
-	return in
-}
-
-func (cp *CompliancePost) Row() []string {
-
-	postDeleteAt := ""
-	if cp.PostDeleteAt > 0 {
-		postDeleteAt = time.Unix(0, cp.PostDeleteAt*int64(1000*1000)).Format(time.RFC3339)
-	}
-
-	postUpdateAt := ""
-	if cp.PostUpdateAt != cp.PostCreateAt {
-		postUpdateAt = time.Unix(0, cp.PostUpdateAt*int64(1000*1000)).Format(time.RFC3339)
-	}
-
-	userType := "user"
-	if cp.IsBot {
-		userType = "bot"
-	}
-
-	return []string{
-		cleanComplianceStrings(cp.TeamName),
-		cleanComplianceStrings(cp.TeamDisplayName),
-
-		cleanComplianceStrings(cp.ChannelName),
-		cleanComplianceStrings(cp.ChannelDisplayName),
-		cleanComplianceStrings(cp.ChannelType),
-
-		cleanComplianceStrings(cp.UserUsername),
-		cleanComplianceStrings(cp.UserEmail),
-		cleanComplianceStrings(cp.UserNickname),
-		userType,
-
-		cp.PostId,
-		time.Unix(0, cp.PostCreateAt*int64(1000*1000)).Format(time.RFC3339),
-		postUpdateAt,
-		postDeleteAt,
-
-		cp.PostRootId,
-		cp.PostParentId,
-		cp.PostOriginalId,
-		cleanComplianceStrings(cp.PostMessage),
-		cp.PostType,
-		cp.PostProps,
-		cp.PostHashtags,
-		cp.PostFileIds,
-	}
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/config.go b/vendor/github.com/mattermost/mattermost-server/v5/model/config.go
deleted file mode 100644
index 52722161..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/config.go
+++ /dev/null
@@ -1,3994 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"crypto/tls"
-	"encoding/json"
-	"io"
-	"math"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"reflect"
-	"regexp"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/mattermost/ldap"
-
-	"github.com/mattermost/mattermost-server/v5/shared/filestore"
-	"github.com/mattermost/mattermost-server/v5/shared/mlog"
-)
-
-const (
-	CONN_SECURITY_NONE     = ""
-	CONN_SECURITY_PLAIN    = "PLAIN"
-	CONN_SECURITY_TLS      = "TLS"
-	CONN_SECURITY_STARTTLS = "STARTTLS"
-
-	IMAGE_DRIVER_LOCAL = "local"
-	IMAGE_DRIVER_S3    = "amazons3"
-
-	DATABASE_DRIVER_MYSQL    = "mysql"
-	DATABASE_DRIVER_POSTGRES = "postgres"
-
-	SEARCHENGINE_ELASTICSEARCH = "elasticsearch"
-
-	MINIO_ACCESS_KEY = "minioaccesskey"
-	MINIO_SECRET_KEY = "miniosecretkey"
-	MINIO_BUCKET     = "mattermost-test"
-
-	PASSWORD_MAXIMUM_LENGTH = 64
-	PASSWORD_MINIMUM_LENGTH = 5
-
-	SERVICE_GITLAB    = "gitlab"
-	SERVICE_GOOGLE    = "google"
-	SERVICE_OFFICE365 = "office365"
-	SERVICE_OPENID    = "openid"
-
-	GENERIC_NO_CHANNEL_NOTIFICATION = "generic_no_channel"
-	GENERIC_NOTIFICATION            = "generic"
-	GENERIC_NOTIFICATION_SERVER     = "https://push-test.mattermost.com"
-	MM_SUPPORT_ADVISOR_ADDRESS      = "support-advisor@mattermost.com"
-	FULL_NOTIFICATION               = "full"
-	ID_LOADED_NOTIFICATION          = "id_loaded"
-
-	DIRECT_MESSAGE_ANY  = "any"
-	DIRECT_MESSAGE_TEAM = "team"
-
-	SHOW_USERNAME          = "username"
-	SHOW_NICKNAME_FULLNAME = "nickname_full_name"
-	SHOW_FULLNAME          = "full_name"
-
-	PERMISSIONS_ALL           = "all"
-	PERMISSIONS_CHANNEL_ADMIN = "channel_admin"
-	PERMISSIONS_TEAM_ADMIN    = "team_admin"
-	PERMISSIONS_SYSTEM_ADMIN  = "system_admin"
-
-	FAKE_SETTING = "********************************"
-
-	RESTRICT_EMOJI_CREATION_ALL          = "all"
-	RESTRICT_EMOJI_CREATION_ADMIN        = "admin"
-	RESTRICT_EMOJI_CREATION_SYSTEM_ADMIN = "system_admin"
-
-	PERMISSIONS_DELETE_POST_ALL          = "all"
-	PERMISSIONS_DELETE_POST_TEAM_ADMIN   = "team_admin"
-	PERMISSIONS_DELETE_POST_SYSTEM_ADMIN = "system_admin"
-
-	ALLOW_EDIT_POST_ALWAYS     = "always"
-	ALLOW_EDIT_POST_NEVER      = "never"
-	ALLOW_EDIT_POST_TIME_LIMIT = "time_limit"
-
-	GROUP_UNREAD_CHANNELS_DISABLED    = "disabled"
-	GROUP_UNREAD_CHANNELS_DEFAULT_ON  = "default_on"
-	GROUP_UNREAD_CHANNELS_DEFAULT_OFF = "default_off"
-
-	COLLAPSED_THREADS_DISABLED    = "disabled"
-	COLLAPSED_THREADS_DEFAULT_ON  = "default_on"
-	COLLAPSED_THREADS_DEFAULT_OFF = "default_off"
-
-	EMAIL_BATCHING_BUFFER_SIZE = 256
-	EMAIL_BATCHING_INTERVAL    = 30
-
-	EMAIL_NOTIFICATION_CONTENTS_FULL    = "full"
-	EMAIL_NOTIFICATION_CONTENTS_GENERIC = "generic"
-
-	SITENAME_MAX_LENGTH = 30
-
-	SERVICE_SETTINGS_DEFAULT_SITE_URL           = "http://localhost:8065"
-	SERVICE_SETTINGS_DEFAULT_TLS_CERT_FILE      = ""
-	SERVICE_SETTINGS_DEFAULT_TLS_KEY_FILE       = ""
-	SERVICE_SETTINGS_DEFAULT_READ_TIMEOUT       = 300
-	SERVICE_SETTINGS_DEFAULT_WRITE_TIMEOUT      = 300
-	SERVICE_SETTINGS_DEFAULT_IDLE_TIMEOUT       = 60
-	SERVICE_SETTINGS_DEFAULT_MAX_LOGIN_ATTEMPTS = 10
-	SERVICE_SETTINGS_DEFAULT_ALLOW_CORS_FROM    = ""
-	SERVICE_SETTINGS_DEFAULT_LISTEN_AND_ADDRESS = ":8065"
-	SERVICE_SETTINGS_DEFAULT_GFYCAT_API_KEY     = "2_KtH_W5"
-	SERVICE_SETTINGS_DEFAULT_GFYCAT_API_SECRET  = "3wLVZPiswc3DnaiaFoLkDvB4X0IV6CpMkj4tf2inJRsBY6-FnkT08zGmppWFgeof"
-
-	TEAM_SETTINGS_DEFAULT_SITE_NAME                = "Mattermost"
-	TEAM_SETTINGS_DEFAULT_MAX_USERS_PER_TEAM       = 50
-	TEAM_SETTINGS_DEFAULT_CUSTOM_BRAND_TEXT        = ""
-	TEAM_SETTINGS_DEFAULT_CUSTOM_DESCRIPTION_TEXT  = ""
-	TEAM_SETTINGS_DEFAULT_USER_STATUS_AWAY_TIMEOUT = 300
-
-	SQL_SETTINGS_DEFAULT_DATA_SOURCE = "postgres://mmuser:mostest@localhost/mattermost_test?sslmode=disable&connect_timeout=10"
-
-	FILE_SETTINGS_DEFAULT_DIRECTORY = "./data/"
-
-	IMPORT_SETTINGS_DEFAULT_DIRECTORY      = "./import"
-	IMPORT_SETTINGS_DEFAULT_RETENTION_DAYS = 30
-
-	EXPORT_SETTINGS_DEFAULT_DIRECTORY      = "./export"
-	EXPORT_SETTINGS_DEFAULT_RETENTION_DAYS = 30
-
-	EMAIL_SETTINGS_DEFAULT_FEEDBACK_ORGANIZATION = ""
-
-	SUPPORT_SETTINGS_DEFAULT_TERMS_OF_SERVICE_LINK = "https://mattermost.com/terms-of-service/"
-	SUPPORT_SETTINGS_DEFAULT_PRIVACY_POLICY_LINK   = "https://mattermost.com/privacy-policy/"
-	SUPPORT_SETTINGS_DEFAULT_ABOUT_LINK            = "https://about.mattermost.com/default-about/"
-	SUPPORT_SETTINGS_DEFAULT_HELP_LINK             = "https://about.mattermost.com/default-help/"
-	SUPPORT_SETTINGS_DEFAULT_REPORT_A_PROBLEM_LINK = "https://about.mattermost.com/default-report-a-problem/"
-	SUPPORT_SETTINGS_DEFAULT_SUPPORT_EMAIL         = ""
-	SUPPORT_SETTINGS_DEFAULT_RE_ACCEPTANCE_PERIOD  = 365
-
-	LDAP_SETTINGS_DEFAULT_FIRST_NAME_ATTRIBUTE         = ""
-	LDAP_SETTINGS_DEFAULT_LAST_NAME_ATTRIBUTE          = ""
-	LDAP_SETTINGS_DEFAULT_EMAIL_ATTRIBUTE              = ""
-	LDAP_SETTINGS_DEFAULT_USERNAME_ATTRIBUTE           = ""
-	LDAP_SETTINGS_DEFAULT_NICKNAME_ATTRIBUTE           = ""
-	LDAP_SETTINGS_DEFAULT_ID_ATTRIBUTE                 = ""
-	LDAP_SETTINGS_DEFAULT_POSITION_ATTRIBUTE           = ""
-	LDAP_SETTINGS_DEFAULT_LOGIN_FIELD_NAME             = ""
-	LDAP_SETTINGS_DEFAULT_GROUP_DISPLAY_NAME_ATTRIBUTE = ""
-	LDAP_SETTINGS_DEFAULT_GROUP_ID_ATTRIBUTE           = ""
-	LDAP_SETTINGS_DEFAULT_PICTURE_ATTRIBUTE            = ""
-
-	SAML_SETTINGS_DEFAULT_ID_ATTRIBUTE         = ""
-	SAML_SETTINGS_DEFAULT_GUEST_ATTRIBUTE      = ""
-	SAML_SETTINGS_DEFAULT_ADMIN_ATTRIBUTE      = ""
-	SAML_SETTINGS_DEFAULT_FIRST_NAME_ATTRIBUTE = ""
-	SAML_SETTINGS_DEFAULT_LAST_NAME_ATTRIBUTE  = ""
-	SAML_SETTINGS_DEFAULT_EMAIL_ATTRIBUTE      = ""
-	SAML_SETTINGS_DEFAULT_USERNAME_ATTRIBUTE   = ""
-	SAML_SETTINGS_DEFAULT_NICKNAME_ATTRIBUTE   = ""
-	SAML_SETTINGS_DEFAULT_LOCALE_ATTRIBUTE     = ""
-	SAML_SETTINGS_DEFAULT_POSITION_ATTRIBUTE   = ""
-
-	SAML_SETTINGS_SIGNATURE_ALGORITHM_SHA1    = "RSAwithSHA1"
-	SAML_SETTINGS_SIGNATURE_ALGORITHM_SHA256  = "RSAwithSHA256"
-	SAML_SETTINGS_SIGNATURE_ALGORITHM_SHA512  = "RSAwithSHA512"
-	SAML_SETTINGS_DEFAULT_SIGNATURE_ALGORITHM = SAML_SETTINGS_SIGNATURE_ALGORITHM_SHA1
-
-	SAML_SETTINGS_CANONICAL_ALGORITHM_C14N    = "Canonical1.0"
-	SAML_SETTINGS_CANONICAL_ALGORITHM_C14N11  = "Canonical1.1"
-	SAML_SETTINGS_DEFAULT_CANONICAL_ALGORITHM = SAML_SETTINGS_CANONICAL_ALGORITHM_C14N
-
-	NATIVEAPP_SETTINGS_DEFAULT_APP_DOWNLOAD_LINK         = "https://mattermost.com/download/#mattermostApps"
-	NATIVEAPP_SETTINGS_DEFAULT_ANDROID_APP_DOWNLOAD_LINK = "https://about.mattermost.com/mattermost-android-app/"
-	NATIVEAPP_SETTINGS_DEFAULT_IOS_APP_DOWNLOAD_LINK     = "https://about.mattermost.com/mattermost-ios-app/"
-
-	EXPERIMENTAL_SETTINGS_DEFAULT_LINK_METADATA_TIMEOUT_MILLISECONDS = 5000
-
-	ANALYTICS_SETTINGS_DEFAULT_MAX_USERS_FOR_STATISTICS = 2500
-
-	ANNOUNCEMENT_SETTINGS_DEFAULT_BANNER_COLOR                    = "#f2a93b"
-	ANNOUNCEMENT_SETTINGS_DEFAULT_BANNER_TEXT_COLOR               = "#333333"
-	ANNOUNCEMENT_SETTINGS_DEFAULT_NOTICES_JSON_URL                = "https://notices.mattermost.com/"
-	ANNOUNCEMENT_SETTINGS_DEFAULT_NOTICES_FETCH_FREQUENCY_SECONDS = 3600
-
-	TEAM_SETTINGS_DEFAULT_TEAM_TEXT = "default"
-
-	ELASTICSEARCH_SETTINGS_DEFAULT_CONNECTION_URL                    = "http://localhost:9200"
-	ELASTICSEARCH_SETTINGS_DEFAULT_USERNAME                          = "elastic"
-	ELASTICSEARCH_SETTINGS_DEFAULT_PASSWORD                          = "changeme"
-	ELASTICSEARCH_SETTINGS_DEFAULT_POST_INDEX_REPLICAS               = 1
-	ELASTICSEARCH_SETTINGS_DEFAULT_POST_INDEX_SHARDS                 = 1
-	ELASTICSEARCH_SETTINGS_DEFAULT_CHANNEL_INDEX_REPLICAS            = 1
-	ELASTICSEARCH_SETTINGS_DEFAULT_CHANNEL_INDEX_SHARDS              = 1
-	ELASTICSEARCH_SETTINGS_DEFAULT_USER_INDEX_REPLICAS               = 1
-	ELASTICSEARCH_SETTINGS_DEFAULT_USER_INDEX_SHARDS                 = 1
-	ELASTICSEARCH_SETTINGS_DEFAULT_AGGREGATE_POSTS_AFTER_DAYS        = 365
-	ELASTICSEARCH_SETTINGS_DEFAULT_POSTS_AGGREGATOR_JOB_START_TIME   = "03:00"
-	ELASTICSEARCH_SETTINGS_DEFAULT_INDEX_PREFIX                      = ""
-	ELASTICSEARCH_SETTINGS_DEFAULT_LIVE_INDEXING_BATCH_SIZE          = 1
-	ELASTICSEARCH_SETTINGS_DEFAULT_BULK_INDEXING_TIME_WINDOW_SECONDS = 3600
-	ELASTICSEARCH_SETTINGS_DEFAULT_REQUEST_TIMEOUT_SECONDS           = 30
-
-	BLEVE_SETTINGS_DEFAULT_INDEX_DIR                         = ""
-	BLEVE_SETTINGS_DEFAULT_BULK_INDEXING_TIME_WINDOW_SECONDS = 3600
-
-	DATA_RETENTION_SETTINGS_DEFAULT_MESSAGE_RETENTION_DAYS  = 365
-	DATA_RETENTION_SETTINGS_DEFAULT_FILE_RETENTION_DAYS     = 365
-	DATA_RETENTION_SETTINGS_DEFAULT_DELETION_JOB_START_TIME = "02:00"
-	DATA_RETENTION_SETTINGS_DEFAULT_BATCH_SIZE              = 3000
-
-	PLUGIN_SETTINGS_DEFAULT_DIRECTORY          = "./plugins"
-	PLUGIN_SETTINGS_DEFAULT_CLIENT_DIRECTORY   = "./client/plugins"
-	PLUGIN_SETTINGS_DEFAULT_ENABLE_MARKETPLACE = true
-	PLUGIN_SETTINGS_DEFAULT_MARKETPLACE_URL    = "https://api.integrations.mattermost.com"
-	PLUGIN_SETTINGS_OLD_MARKETPLACE_URL        = "https://marketplace.integrations.mattermost.com"
-
-	COMPLIANCE_EXPORT_TYPE_CSV             = "csv"
-	COMPLIANCE_EXPORT_TYPE_ACTIANCE        = "actiance"
-	COMPLIANCE_EXPORT_TYPE_GLOBALRELAY     = "globalrelay"
-	COMPLIANCE_EXPORT_TYPE_GLOBALRELAY_ZIP = "globalrelay-zip"
-	GLOBALRELAY_CUSTOMER_TYPE_A9           = "A9"
-	GLOBALRELAY_CUSTOMER_TYPE_A10          = "A10"
-
-	CLIENT_SIDE_CERT_CHECK_PRIMARY_AUTH   = "primary"
-	CLIENT_SIDE_CERT_CHECK_SECONDARY_AUTH = "secondary"
-
-	IMAGE_PROXY_TYPE_LOCAL      = "local"
-	IMAGE_PROXY_TYPE_ATMOS_CAMO = "atmos/camo"
-
-	GOOGLE_SETTINGS_DEFAULT_SCOPE             = "profile email"
-	GOOGLE_SETTINGS_DEFAULT_AUTH_ENDPOINT     = "https://accounts.google.com/o/oauth2/v2/auth"
-	GOOGLE_SETTINGS_DEFAULT_TOKEN_ENDPOINT    = "https://www.googleapis.com/oauth2/v4/token"
-	GOOGLE_SETTINGS_DEFAULT_USER_API_ENDPOINT = "https://people.googleapis.com/v1/people/me?personFields=names,emailAddresses,nicknames,metadata"
-
-	OFFICE365_SETTINGS_DEFAULT_SCOPE             = "User.Read"
-	OFFICE365_SETTINGS_DEFAULT_AUTH_ENDPOINT     = "https://login.microsoftonline.com/common/oauth2/v2.0/authorize"
-	OFFICE365_SETTINGS_DEFAULT_TOKEN_ENDPOINT    = "https://login.microsoftonline.com/common/oauth2/v2.0/token"
-	OFFICE365_SETTINGS_DEFAULT_USER_API_ENDPOINT = "https://graph.microsoft.com/v1.0/me"
-
-	CLOUD_SETTINGS_DEFAULT_CWS_URL     = "https://customers.mattermost.com"
-	CLOUD_SETTINGS_DEFAULT_CWS_API_URL = "https://portal.internal.prod.cloud.mattermost.com"
-	OPENID_SETTINGS_DEFAULT_SCOPE      = "profile openid email"
-
-	LOCAL_MODE_SOCKET_PATH = "/var/tmp/mattermost_local.socket"
-)
-
-func GetDefaultAppCustomURLSchemes() []string {
-	return []string{"mmauth://", "mmauthbeta://"}
-}
-
-var ServerTLSSupportedCiphers = map[string]uint16{
-	"TLS_RSA_WITH_RC4_128_SHA":                tls.TLS_RSA_WITH_RC4_128_SHA,
-	"TLS_RSA_WITH_3DES_EDE_CBC_SHA":           tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,
-	"TLS_RSA_WITH_AES_128_CBC_SHA":            tls.TLS_RSA_WITH_AES_128_CBC_SHA,
-	"TLS_RSA_WITH_AES_256_CBC_SHA":            tls.TLS_RSA_WITH_AES_256_CBC_SHA,
-	"TLS_RSA_WITH_AES_128_CBC_SHA256":         tls.TLS_RSA_WITH_AES_128_CBC_SHA256,
-	"TLS_RSA_WITH_AES_128_GCM_SHA256":         tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
-	"TLS_RSA_WITH_AES_256_GCM_SHA384":         tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
-	"TLS_ECDHE_ECDSA_WITH_RC4_128_SHA":        tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
-	"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA":    tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-	"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA":    tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-	"TLS_ECDHE_RSA_WITH_RC4_128_SHA":          tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA,
-	"TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA":     tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
-	"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA":      tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-	"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA":      tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-	"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256": tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
-	"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256":   tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
-	"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256":   tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-	"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256": tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-	"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384":   tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
-	"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384": tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
-	"TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305":    tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
-	"TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305":  tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
-}
-
-type ServiceSettings struct {
-	SiteURL                                           *string  `access:"environment_web_server,authentication_saml,write_restrictable"`
-	WebsocketURL                                      *string  `access:"write_restrictable,cloud_restrictable"`
-	LicenseFileLocation                               *string  `access:"write_restrictable,cloud_restrictable"`                        // telemetry: none
-	ListenAddress                                     *string  `access:"environment_web_server,write_restrictable,cloud_restrictable"` // telemetry: none
-	ConnectionSecurity                                *string  `access:"environment_web_server,write_restrictable,cloud_restrictable"`
-	TLSCertFile                                       *string  `access:"environment_web_server,write_restrictable,cloud_restrictable"`
-	TLSKeyFile                                        *string  `access:"environment_web_server,write_restrictable,cloud_restrictable"`
-	TLSMinVer                                         *string  `access:"write_restrictable,cloud_restrictable"` // telemetry: none
-	TLSStrictTransport                                *bool    `access:"write_restrictable,cloud_restrictable"`
-	TLSStrictTransportMaxAge                          *int64   `access:"write_restrictable,cloud_restrictable"` // telemetry: none
-	TLSOverwriteCiphers                               []string `access:"write_restrictable,cloud_restrictable"` // telemetry: none
-	UseLetsEncrypt                                    *bool    `access:"environment_web_server,write_restrictable,cloud_restrictable"`
-	LetsEncryptCertificateCacheFile                   *string  `access:"environment_web_server,write_restrictable,cloud_restrictable"` // telemetry: none
-	Forward80To443                                    *bool    `access:"environment_web_server,write_restrictable,cloud_restrictable"`
-	TrustedProxyIPHeader                              []string `access:"write_restrictable,cloud_restrictable"` // telemetry: none
-	ReadTimeout                                       *int     `access:"environment_web_server,write_restrictable,cloud_restrictable"`
-	WriteTimeout                                      *int     `access:"environment_web_server,write_restrictable,cloud_restrictable"`
-	IdleTimeout                                       *int     `access:"write_restrictable,cloud_restrictable"`
-	MaximumLoginAttempts                              *int     `access:"authentication_password,write_restrictable,cloud_restrictable"`
-	GoroutineHealthThreshold                          *int     `access:"write_restrictable,cloud_restrictable"` // telemetry: none
-	EnableOAuthServiceProvider                        *bool    `access:"integrations_integration_management"`
-	EnableIncomingWebhooks                            *bool    `access:"integrations_integration_management"`
-	EnableOutgoingWebhooks                            *bool    `access:"integrations_integration_management"`
-	EnableCommands                                    *bool    `access:"integrations_integration_management"`
-	EnablePostUsernameOverride                        *bool    `access:"integrations_integration_management"`
-	EnablePostIconOverride                            *bool    `access:"integrations_integration_management"`
-	GoogleDeveloperKey                                *string  `access:"site_posts,write_restrictable,cloud_restrictable"`
-	DEPRECATED_DO_NOT_USE_EnableOnlyAdminIntegrations *bool    `json:"EnableOnlyAdminIntegrations" mapstructure:"EnableOnlyAdminIntegrations"` // Deprecated: do not use
-	EnableLinkPreviews                                *bool    `access:"site_posts"`
-	RestrictLinkPreviews                              *string  `access:"site_posts"`
-	EnableTesting                                     *bool    `access:"environment_developer,write_restrictable,cloud_restrictable"`
-	EnableDeveloper                                   *bool    `access:"environment_developer,write_restrictable,cloud_restrictable"`
-	EnableOpenTracing                                 *bool    `access:"write_restrictable,cloud_restrictable"`
-	EnableSecurityFixAlert                            *bool    `access:"environment_smtp,write_restrictable,cloud_restrictable"`
-	EnableInsecureOutgoingConnections                 *bool    `access:"environment_web_server,write_restrictable,cloud_restrictable"`
-	AllowedUntrustedInternalConnections               *string  `access:"environment_web_server,write_restrictable,cloud_restrictable"`
-	EnableMultifactorAuthentication                   *bool    `access:"authentication_mfa"`
-	EnforceMultifactorAuthentication                  *bool    `access:"authentication_mfa"`
-	EnableUserAccessTokens                            *bool    `access:"integrations_integration_management"`
-	AllowCorsFrom                                     *string  `access:"integrations_cors,write_restrictable,cloud_restrictable"`
-	CorsExposedHeaders                                *string  `access:"integrations_cors,write_restrictable,cloud_restrictable"`
-	CorsAllowCredentials                              *bool    `access:"integrations_cors,write_restrictable,cloud_restrictable"`
-	CorsDebug                                         *bool    `access:"integrations_cors,write_restrictable,cloud_restrictable"`
-	AllowCookiesForSubdomains                         *bool    `access:"write_restrictable,cloud_restrictable"`
-	ExtendSessionLengthWithActivity                   *bool    `access:"environment_session_lengths,write_restrictable,cloud_restrictable"`
-	SessionLengthWebInDays                            *int     `access:"environment_session_lengths,write_restrictable,cloud_restrictable"`
-	SessionLengthMobileInDays                         *int     `access:"environment_session_lengths,write_restrictable,cloud_restrictable"`
-	SessionLengthSSOInDays                            *int     `access:"environment_session_lengths,write_restrictable,cloud_restrictable"`
-	SessionCacheInMinutes                             *int     `access:"environment_session_lengths,write_restrictable,cloud_restrictable"`
-	SessionIdleTimeoutInMinutes                       *int     `access:"environment_session_lengths,write_restrictable,cloud_restrictable"`
-	WebsocketSecurePort                               *int     `access:"write_restrictable,cloud_restrictable"` // telemetry: none
-	WebsocketPort                                     *int     `access:"write_restrictable,cloud_restrictable"` // telemetry: none
-	WebserverMode                                     *string  `access:"environment_web_server,write_restrictable,cloud_restrictable"`
-	EnableGifPicker                                   *bool    `access:"integrations_gif"`
-	GfycatApiKey                                      *string  `access:"integrations_gif"`
-	GfycatApiSecret                                   *string  `access:"integrations_gif"`
-	EnableCustomEmoji                                 *bool    `access:"site_emoji"`
-	EnableEmojiPicker                                 *bool    `access:"site_emoji"`
-	DEPRECATED_DO_NOT_USE_RestrictCustomEmojiCreation *string  `json:"RestrictCustomEmojiCreation" mapstructure:"RestrictCustomEmojiCreation"` // Deprecated: do not use
-	DEPRECATED_DO_NOT_USE_RestrictPostDelete          *string  `json:"RestrictPostDelete" mapstructure:"RestrictPostDelete"`                   // Deprecated: do not use
-	DEPRECATED_DO_NOT_USE_AllowEditPost               *string  `json:"AllowEditPost" mapstructure:"AllowEditPost"`                             // Deprecated: do not use
-	PostEditTimeLimit                                 *int     `access:"user_management_permissions"`
-	TimeBetweenUserTypingUpdatesMilliseconds          *int64   `access:"experimental_features,write_restrictable,cloud_restrictable"`
-	EnablePostSearch                                  *bool    `access:"write_restrictable,cloud_restrictable"`
-	EnableFileSearch                                  *bool    `access:"write_restrictable"`
-	MinimumHashtagLength                              *int     `access:"environment_database,write_restrictable,cloud_restrictable"`
-	EnableUserTypingMessages                          *bool    `access:"experimental_features,write_restrictable,cloud_restrictable"`
-	EnableChannelViewedMessages                       *bool    `access:"experimental_features,write_restrictable,cloud_restrictable"`
-	EnableUserStatuses                                *bool    `access:"write_restrictable,cloud_restrictable"`
-	ExperimentalEnableAuthenticationTransfer          *bool    `access:"experimental_features,write_restrictable,cloud_restrictable"`
-	ClusterLogTimeoutMilliseconds                     *int     `access:"write_restrictable,cloud_restrictable"`
-	CloseUnusedDirectMessages                         *bool    `access:"experimental_features"`
-	EnablePreviewFeatures                             *bool    `access:"experimental_features"`
-	EnableTutorial                                    *bool    `access:"experimental_features"`
-	ExperimentalEnableDefaultChannelLeaveJoinMessages *bool    `access:"experimental_features"`
-	ExperimentalGroupUnreadChannels                   *string  `access:"experimental_features"`
-	ExperimentalChannelOrganization                   *bool    `access:"experimental_features"`
-	DEPRECATED_DO_NOT_USE_ImageProxyType              *string  `json:"ImageProxyType" mapstructure:"ImageProxyType"`       // Deprecated: do not use
-	DEPRECATED_DO_NOT_USE_ImageProxyURL               *string  `json:"ImageProxyURL" mapstructure:"ImageProxyURL"`         // Deprecated: do not use
-	DEPRECATED_DO_NOT_USE_ImageProxyOptions           *string  `json:"ImageProxyOptions" mapstructure:"ImageProxyOptions"` // Deprecated: do not use
-	EnableAPITeamDeletion                             *bool
-	EnableAPIUserDeletion                             *bool
-	ExperimentalEnableHardenedMode                    *bool `access:"experimental_features"`
-	DisableLegacyMFA                                  *bool `access:"write_restrictable,cloud_restrictable"`
-	ExperimentalStrictCSRFEnforcement                 *bool `access:"experimental_features,write_restrictable,cloud_restrictable"`
-	EnableEmailInvitations                            *bool `access:"authentication_signup"`
-	DisableBotsWhenOwnerIsDeactivated                 *bool `access:"integrations_bot_accounts,write_restrictable,cloud_restrictable"`
-	EnableBotAccountCreation                          *bool `access:"integrations_bot_accounts"`
-	EnableSVGs                                        *bool `access:"site_posts"`
-	EnableLatex                                       *bool `access:"site_posts"`
-	EnableAPIChannelDeletion                          *bool
-	EnableLocalMode                                   *bool
-	LocalModeSocketLocation                           *string // telemetry: none
-	EnableAWSMetering                                 *bool   // telemetry: none
-	SplitKey                                          *string `access:"experimental_feature_flags,write_restrictable"` // telemetry: none
-	FeatureFlagSyncIntervalSeconds                    *int    `access:"experimental_feature_flags,write_restrictable"` // telemetry: none
-	DebugSplit                                        *bool   `access:"experimental_feature_flags,write_restrictable"` // telemetry: none
-	ThreadAutoFollow                                  *bool   `access:"experimental_features"`
-	CollapsedThreads                                  *string `access:"experimental_features"`
-	ManagedResourcePaths                              *string `access:"environment_web_server,write_restrictable,cloud_restrictable"`
-	EnableLegacySidebar                               *bool   `access:"experimental_features"`
-	EnableReliableWebSockets                          *bool   `access:"experimental_features"` // telemetry: none
-}
-
-func (s *ServiceSettings) SetDefaults(isUpdate bool) {
-	if s.EnableEmailInvitations == nil {
-		// If the site URL is also not present then assume this is a clean install
-		if s.SiteURL == nil {
-			s.EnableEmailInvitations = NewBool(false)
-		} else {
-			s.EnableEmailInvitations = NewBool(true)
-		}
-	}
-
-	if s.SiteURL == nil {
-		if s.EnableDeveloper != nil && *s.EnableDeveloper {
-			s.SiteURL = NewString(SERVICE_SETTINGS_DEFAULT_SITE_URL)
-		} else {
-			s.SiteURL = NewString("")
-		}
-	}
-
-	if s.WebsocketURL == nil {
-		s.WebsocketURL = NewString("")
-	}
-
-	if s.LicenseFileLocation == nil {
-		s.LicenseFileLocation = NewString("")
-	}
-
-	if s.ListenAddress == nil {
-		s.ListenAddress = NewString(SERVICE_SETTINGS_DEFAULT_LISTEN_AND_ADDRESS)
-	}
-
-	if s.EnableLinkPreviews == nil {
-		s.EnableLinkPreviews = NewBool(true)
-	}
-
-	if s.RestrictLinkPreviews == nil {
-		s.RestrictLinkPreviews = NewString("")
-	}
-
-	if s.EnableTesting == nil {
-		s.EnableTesting = NewBool(false)
-	}
-
-	if s.EnableDeveloper == nil {
-		s.EnableDeveloper = NewBool(false)
-	}
-
-	if s.EnableOpenTracing == nil {
-		s.EnableOpenTracing = NewBool(false)
-	}
-
-	if s.EnableSecurityFixAlert == nil {
-		s.EnableSecurityFixAlert = NewBool(true)
-	}
-
-	if s.EnableInsecureOutgoingConnections == nil {
-		s.EnableInsecureOutgoingConnections = NewBool(false)
-	}
-
-	if s.AllowedUntrustedInternalConnections == nil {
-		s.AllowedUntrustedInternalConnections = NewString("")
-	}
-
-	if s.EnableMultifactorAuthentication == nil {
-		s.EnableMultifactorAuthentication = NewBool(false)
-	}
-
-	if s.EnforceMultifactorAuthentication == nil {
-		s.EnforceMultifactorAuthentication = NewBool(false)
-	}
-
-	if s.EnableUserAccessTokens == nil {
-		s.EnableUserAccessTokens = NewBool(false)
-	}
-
-	if s.GoroutineHealthThreshold == nil {
-		s.GoroutineHealthThreshold = NewInt(-1)
-	}
-
-	if s.GoogleDeveloperKey == nil {
-		s.GoogleDeveloperKey = NewString("")
-	}
-
-	if s.EnableOAuthServiceProvider == nil {
-		s.EnableOAuthServiceProvider = NewBool(false)
-	}
-
-	if s.EnableIncomingWebhooks == nil {
-		s.EnableIncomingWebhooks = NewBool(true)
-	}
-
-	if s.EnableOutgoingWebhooks == nil {
-		s.EnableOutgoingWebhooks = NewBool(true)
-	}
-
-	if s.ConnectionSecurity == nil {
-		s.ConnectionSecurity = NewString("")
-	}
-
-	if s.TLSKeyFile == nil {
-		s.TLSKeyFile = NewString(SERVICE_SETTINGS_DEFAULT_TLS_KEY_FILE)
-	}
-
-	if s.TLSCertFile == nil {
-		s.TLSCertFile = NewString(SERVICE_SETTINGS_DEFAULT_TLS_CERT_FILE)
-	}
-
-	if s.TLSMinVer == nil {
-		s.TLSMinVer = NewString("1.2")
-	}
-
-	if s.TLSStrictTransport == nil {
-		s.TLSStrictTransport = NewBool(false)
-	}
-
-	if s.TLSStrictTransportMaxAge == nil {
-		s.TLSStrictTransportMaxAge = NewInt64(63072000)
-	}
-
-	if s.TLSOverwriteCiphers == nil {
-		s.TLSOverwriteCiphers = []string{}
-	}
-
-	if s.UseLetsEncrypt == nil {
-		s.UseLetsEncrypt = NewBool(false)
-	}
-
-	if s.LetsEncryptCertificateCacheFile == nil {
-		s.LetsEncryptCertificateCacheFile = NewString("./config/letsencrypt.cache")
-	}
-
-	if s.ReadTimeout == nil {
-		s.ReadTimeout = NewInt(SERVICE_SETTINGS_DEFAULT_READ_TIMEOUT)
-	}
-
-	if s.WriteTimeout == nil {
-		s.WriteTimeout = NewInt(SERVICE_SETTINGS_DEFAULT_WRITE_TIMEOUT)
-	}
-
-	if s.IdleTimeout == nil {
-		s.IdleTimeout = NewInt(SERVICE_SETTINGS_DEFAULT_IDLE_TIMEOUT)
-	}
-
-	if s.MaximumLoginAttempts == nil {
-		s.MaximumLoginAttempts = NewInt(SERVICE_SETTINGS_DEFAULT_MAX_LOGIN_ATTEMPTS)
-	}
-
-	if s.Forward80To443 == nil {
-		s.Forward80To443 = NewBool(false)
-	}
-
-	if isUpdate {
-		// When updating an existing configuration, ensure that defaults are set.
-		if s.TrustedProxyIPHeader == nil {
-			s.TrustedProxyIPHeader = []string{HEADER_FORWARDED, HEADER_REAL_IP}
-		}
-	} else {
-		// When generating a blank configuration, leave the list empty.
-		s.TrustedProxyIPHeader = []string{}
-	}
-
-	if s.TimeBetweenUserTypingUpdatesMilliseconds == nil {
-		s.TimeBetweenUserTypingUpdatesMilliseconds = NewInt64(5000)
-	}
-
-	if s.EnablePostSearch == nil {
-		s.EnablePostSearch = NewBool(true)
-	}
-
-	if s.EnableFileSearch == nil {
-		s.EnableFileSearch = NewBool(true)
-	}
-
-	if s.MinimumHashtagLength == nil {
-		s.MinimumHashtagLength = NewInt(3)
-	}
-
-	if s.EnableUserTypingMessages == nil {
-		s.EnableUserTypingMessages = NewBool(true)
-	}
-
-	if s.EnableChannelViewedMessages == nil {
-		s.EnableChannelViewedMessages = NewBool(true)
-	}
-
-	if s.EnableUserStatuses == nil {
-		s.EnableUserStatuses = NewBool(true)
-	}
-
-	if s.ClusterLogTimeoutMilliseconds == nil {
-		s.ClusterLogTimeoutMilliseconds = NewInt(2000)
-	}
-
-	if s.CloseUnusedDirectMessages == nil {
-		s.CloseUnusedDirectMessages = NewBool(false)
-	}
-
-	if s.EnableTutorial == nil {
-		s.EnableTutorial = NewBool(true)
-	}
-
-	// Must be manually enabled for existing installations.
-	if s.ExtendSessionLengthWithActivity == nil {
-		s.ExtendSessionLengthWithActivity = NewBool(!isUpdate)
-	}
-
-	if s.SessionLengthWebInDays == nil {
-		if isUpdate {
-			s.SessionLengthWebInDays = NewInt(180)
-		} else {
-			s.SessionLengthWebInDays = NewInt(30)
-		}
-	}
-
-	if s.SessionLengthMobileInDays == nil {
-		if isUpdate {
-			s.SessionLengthMobileInDays = NewInt(180)
-		} else {
-			s.SessionLengthMobileInDays = NewInt(30)
-		}
-	}
-
-	if s.SessionLengthSSOInDays == nil {
-		s.SessionLengthSSOInDays = NewInt(30)
-	}
-
-	if s.SessionCacheInMinutes == nil {
-		s.SessionCacheInMinutes = NewInt(10)
-	}
-
-	if s.SessionIdleTimeoutInMinutes == nil {
-		s.SessionIdleTimeoutInMinutes = NewInt(43200)
-	}
-
-	if s.EnableCommands == nil {
-		s.EnableCommands = NewBool(true)
-	}
-
-	if s.DEPRECATED_DO_NOT_USE_EnableOnlyAdminIntegrations == nil {
-		s.DEPRECATED_DO_NOT_USE_EnableOnlyAdminIntegrations = NewBool(true)
-	}
-
-	if s.EnablePostUsernameOverride == nil {
-		s.EnablePostUsernameOverride = NewBool(false)
-	}
-
-	if s.EnablePostIconOverride == nil {
-		s.EnablePostIconOverride = NewBool(false)
-	}
-
-	if s.WebsocketPort == nil {
-		s.WebsocketPort = NewInt(80)
-	}
-
-	if s.WebsocketSecurePort == nil {
-		s.WebsocketSecurePort = NewInt(443)
-	}
-
-	if s.AllowCorsFrom == nil {
-		s.AllowCorsFrom = NewString(SERVICE_SETTINGS_DEFAULT_ALLOW_CORS_FROM)
-	}
-
-	if s.CorsExposedHeaders == nil {
-		s.CorsExposedHeaders = NewString("")
-	}
-
-	if s.CorsAllowCredentials == nil {
-		s.CorsAllowCredentials = NewBool(false)
-	}
-
-	if s.CorsDebug == nil {
-		s.CorsDebug = NewBool(false)
-	}
-
-	if s.AllowCookiesForSubdomains == nil {
-		s.AllowCookiesForSubdomains = NewBool(false)
-	}
-
-	if s.WebserverMode == nil {
-		s.WebserverMode = NewString("gzip")
-	} else if *s.WebserverMode == "regular" {
-		*s.WebserverMode = "gzip"
-	}
-
-	if s.EnableCustomEmoji == nil {
-		s.EnableCustomEmoji = NewBool(true)
-	}
-
-	if s.EnableEmojiPicker == nil {
-		s.EnableEmojiPicker = NewBool(true)
-	}
-
-	if s.EnableGifPicker == nil {
-		s.EnableGifPicker = NewBool(true)
-	}
-
-	if s.GfycatApiKey == nil || *s.GfycatApiKey == "" {
-		s.GfycatApiKey = NewString(SERVICE_SETTINGS_DEFAULT_GFYCAT_API_KEY)
-	}
-
-	if s.GfycatApiSecret == nil || *s.GfycatApiSecret == "" {
-		s.GfycatApiSecret = NewString(SERVICE_SETTINGS_DEFAULT_GFYCAT_API_SECRET)
-	}
-
-	if s.DEPRECATED_DO_NOT_USE_RestrictCustomEmojiCreation == nil {
-		s.DEPRECATED_DO_NOT_USE_RestrictCustomEmojiCreation = NewString(RESTRICT_EMOJI_CREATION_ALL)
-	}
-
-	if s.DEPRECATED_DO_NOT_USE_RestrictPostDelete == nil {
-		s.DEPRECATED_DO_NOT_USE_RestrictPostDelete = NewString(PERMISSIONS_DELETE_POST_ALL)
-	}
-
-	if s.DEPRECATED_DO_NOT_USE_AllowEditPost == nil {
-		s.DEPRECATED_DO_NOT_USE_AllowEditPost = NewString(ALLOW_EDIT_POST_ALWAYS)
-	}
-
-	if s.ExperimentalEnableAuthenticationTransfer == nil {
-		s.ExperimentalEnableAuthenticationTransfer = NewBool(true)
-	}
-
-	if s.PostEditTimeLimit == nil {
-		s.PostEditTimeLimit = NewInt(-1)
-	}
-
-	if s.EnablePreviewFeatures == nil {
-		s.EnablePreviewFeatures = NewBool(true)
-	}
-
-	if s.ExperimentalEnableDefaultChannelLeaveJoinMessages == nil {
-		s.ExperimentalEnableDefaultChannelLeaveJoinMessages = NewBool(true)
-	}
-
-	if s.ExperimentalGroupUnreadChannels == nil {
-		s.ExperimentalGroupUnreadChannels = NewString(GROUP_UNREAD_CHANNELS_DISABLED)
-	} else if *s.ExperimentalGroupUnreadChannels == "0" {
-		s.ExperimentalGroupUnreadChannels = NewString(GROUP_UNREAD_CHANNELS_DISABLED)
-	} else if *s.ExperimentalGroupUnreadChannels == "1" {
-		s.ExperimentalGroupUnreadChannels = NewString(GROUP_UNREAD_CHANNELS_DEFAULT_ON)
-	}
-
-	if s.ExperimentalChannelOrganization == nil {
-		experimentalUnreadEnabled := *s.ExperimentalGroupUnreadChannels != GROUP_UNREAD_CHANNELS_DISABLED
-		s.ExperimentalChannelOrganization = NewBool(experimentalUnreadEnabled)
-	}
-
-	if s.DEPRECATED_DO_NOT_USE_ImageProxyType == nil {
-		s.DEPRECATED_DO_NOT_USE_ImageProxyType = NewString("")
-	}
-
-	if s.DEPRECATED_DO_NOT_USE_ImageProxyURL == nil {
-		s.DEPRECATED_DO_NOT_USE_ImageProxyURL = NewString("")
-	}
-
-	if s.DEPRECATED_DO_NOT_USE_ImageProxyOptions == nil {
-		s.DEPRECATED_DO_NOT_USE_ImageProxyOptions = NewString("")
-	}
-
-	if s.EnableAPITeamDeletion == nil {
-		s.EnableAPITeamDeletion = NewBool(false)
-	}
-
-	if s.EnableAPIUserDeletion == nil {
-		s.EnableAPIUserDeletion = NewBool(false)
-	}
-
-	if s.EnableAPIChannelDeletion == nil {
-		s.EnableAPIChannelDeletion = NewBool(false)
-	}
-
-	if s.ExperimentalEnableHardenedMode == nil {
-		s.ExperimentalEnableHardenedMode = NewBool(false)
-	}
-
-	if s.DisableLegacyMFA == nil {
-		s.DisableLegacyMFA = NewBool(!isUpdate)
-	}
-
-	if s.ExperimentalStrictCSRFEnforcement == nil {
-		s.ExperimentalStrictCSRFEnforcement = NewBool(false)
-	}
-
-	if s.DisableBotsWhenOwnerIsDeactivated == nil {
-		s.DisableBotsWhenOwnerIsDeactivated = NewBool(true)
-	}
-
-	if s.EnableBotAccountCreation == nil {
-		s.EnableBotAccountCreation = NewBool(false)
-	}
-
-	if s.EnableSVGs == nil {
-		if isUpdate {
-			s.EnableSVGs = NewBool(true)
-		} else {
-			s.EnableSVGs = NewBool(false)
-		}
-	}
-
-	if s.EnableLatex == nil {
-		if isUpdate {
-			s.EnableLatex = NewBool(true)
-		} else {
-			s.EnableLatex = NewBool(false)
-		}
-	}
-
-	if s.EnableLocalMode == nil {
-		s.EnableLocalMode = NewBool(false)
-	}
-
-	if s.LocalModeSocketLocation == nil {
-		s.LocalModeSocketLocation = NewString(LOCAL_MODE_SOCKET_PATH)
-	}
-
-	if s.EnableAWSMetering == nil {
-		s.EnableAWSMetering = NewBool(false)
-	}
-
-	if s.SplitKey == nil {
-		s.SplitKey = NewString("")
-	}
-
-	if s.FeatureFlagSyncIntervalSeconds == nil {
-		s.FeatureFlagSyncIntervalSeconds = NewInt(30)
-	}
-
-	if s.DebugSplit == nil {
-		s.DebugSplit = NewBool(false)
-	}
-
-	if s.ThreadAutoFollow == nil {
-		s.ThreadAutoFollow = NewBool(true)
-	}
-
-	if s.CollapsedThreads == nil {
-		s.CollapsedThreads = NewString(COLLAPSED_THREADS_DISABLED)
-	}
-
-	if s.ManagedResourcePaths == nil {
-		s.ManagedResourcePaths = NewString("")
-	}
-
-	if s.EnableLegacySidebar == nil {
-		s.EnableLegacySidebar = NewBool(false)
-	}
-
-	if s.EnableReliableWebSockets == nil {
-		s.EnableReliableWebSockets = NewBool(true)
-	}
-}
-
-type ClusterSettings struct {
-	Enable                                      *bool   `access:"environment_high_availability,write_restrictable"`
-	ClusterName                                 *string `access:"environment_high_availability,write_restrictable,cloud_restrictable"` // telemetry: none
-	OverrideHostname                            *string `access:"environment_high_availability,write_restrictable,cloud_restrictable"` // telemetry: none
-	NetworkInterface                            *string `access:"environment_high_availability,write_restrictable,cloud_restrictable"`
-	BindAddress                                 *string `access:"environment_high_availability,write_restrictable,cloud_restrictable"`
-	AdvertiseAddress                            *string `access:"environment_high_availability,write_restrictable,cloud_restrictable"`
-	UseIpAddress                                *bool   `access:"environment_high_availability,write_restrictable,cloud_restrictable"`
-	DEPRECATED_DO_NOT_USE_UseExperimentalGossip *bool   `json:"UseExperimentalGossip" access:"environment_high_availability,write_restrictable,cloud_restrictable"` // Deprecated: do not use
-	EnableGossipCompression                     *bool   `access:"environment_high_availability,write_restrictable,cloud_restrictable"`
-	EnableExperimentalGossipEncryption          *bool   `access:"environment_high_availability,write_restrictable,cloud_restrictable"`
-	ReadOnlyConfig                              *bool   `access:"environment_high_availability,write_restrictable,cloud_restrictable"`
-	GossipPort                                  *int    `access:"environment_high_availability,write_restrictable,cloud_restrictable"` // telemetry: none
-	StreamingPort                               *int    `access:"environment_high_availability,write_restrictable,cloud_restrictable"` // telemetry: none
-	MaxIdleConns                                *int    `access:"environment_high_availability,write_restrictable,cloud_restrictable"` // telemetry: none
-	MaxIdleConnsPerHost                         *int    `access:"environment_high_availability,write_restrictable,cloud_restrictable"` // telemetry: none
-	IdleConnTimeoutMilliseconds                 *int    `access:"environment_high_availability,write_restrictable,cloud_restrictable"` // telemetry: none
-}
-
-func (s *ClusterSettings) SetDefaults() {
-	if s.Enable == nil {
-		s.Enable = NewBool(false)
-	}
-
-	if s.ClusterName == nil {
-		s.ClusterName = NewString("")
-	}
-
-	if s.OverrideHostname == nil {
-		s.OverrideHostname = NewString("")
-	}
-
-	if s.NetworkInterface == nil {
-		s.NetworkInterface = NewString("")
-	}
-
-	if s.BindAddress == nil {
-		s.BindAddress = NewString("")
-	}
-
-	if s.AdvertiseAddress == nil {
-		s.AdvertiseAddress = NewString("")
-	}
-
-	if s.UseIpAddress == nil {
-		s.UseIpAddress = NewBool(true)
-	}
-
-	if s.DEPRECATED_DO_NOT_USE_UseExperimentalGossip == nil {
-		s.DEPRECATED_DO_NOT_USE_UseExperimentalGossip = NewBool(true)
-	}
-
-	if s.EnableExperimentalGossipEncryption == nil {
-		s.EnableExperimentalGossipEncryption = NewBool(false)
-	}
-
-	if s.EnableGossipCompression == nil {
-		s.EnableGossipCompression = NewBool(true)
-	}
-
-	if s.ReadOnlyConfig == nil {
-		s.ReadOnlyConfig = NewBool(true)
-	}
-
-	if s.GossipPort == nil {
-		s.GossipPort = NewInt(8074)
-	}
-
-	if s.StreamingPort == nil {
-		s.StreamingPort = NewInt(8075)
-	}
-
-	if s.MaxIdleConns == nil {
-		s.MaxIdleConns = NewInt(100)
-	}
-
-	if s.MaxIdleConnsPerHost == nil {
-		s.MaxIdleConnsPerHost = NewInt(128)
-	}
-
-	if s.IdleConnTimeoutMilliseconds == nil {
-		s.IdleConnTimeoutMilliseconds = NewInt(90000)
-	}
-}
-
-type MetricsSettings struct {
-	Enable           *bool   `access:"environment_performance_monitoring,write_restrictable,cloud_restrictable"`
-	BlockProfileRate *int    `access:"environment_performance_monitoring,write_restrictable,cloud_restrictable"`
-	ListenAddress    *string `access:"environment_performance_monitoring,write_restrictable,cloud_restrictable"` // telemetry: none
-}
-
-func (s *MetricsSettings) SetDefaults() {
-	if s.ListenAddress == nil {
-		s.ListenAddress = NewString(":8067")
-	}
-
-	if s.Enable == nil {
-		s.Enable = NewBool(false)
-	}
-
-	if s.BlockProfileRate == nil {
-		s.BlockProfileRate = NewInt(0)
-	}
-}
-
-type ExperimentalSettings struct {
-	ClientSideCertEnable            *bool   `access:"experimental_features,cloud_restrictable"`
-	ClientSideCertCheck             *string `access:"experimental_features,cloud_restrictable"`
-	EnableClickToReply              *bool   `access:"experimental_features,write_restrictable,cloud_restrictable"`
-	LinkMetadataTimeoutMilliseconds *int64  `access:"experimental_features,write_restrictable,cloud_restrictable"`
-	RestrictSystemAdmin             *bool   `access:"experimental_features,write_restrictable"`
-	UseNewSAMLLibrary               *bool   `access:"experimental_features,cloud_restrictable"`
-	CloudUserLimit                  *int64  `access:"experimental_features,write_restrictable"`
-	CloudBilling                    *bool   `access:"experimental_features,write_restrictable"`
-	EnableSharedChannels            *bool   `access:"experimental_features"`
-	EnableRemoteClusterService      *bool   `access:"experimental_features"`
-}
-
-func (s *ExperimentalSettings) SetDefaults() {
-	if s.ClientSideCertEnable == nil {
-		s.ClientSideCertEnable = NewBool(false)
-	}
-
-	if s.ClientSideCertCheck == nil {
-		s.ClientSideCertCheck = NewString(CLIENT_SIDE_CERT_CHECK_SECONDARY_AUTH)
-	}
-
-	if s.EnableClickToReply == nil {
-		s.EnableClickToReply = NewBool(false)
-	}
-
-	if s.LinkMetadataTimeoutMilliseconds == nil {
-		s.LinkMetadataTimeoutMilliseconds = NewInt64(EXPERIMENTAL_SETTINGS_DEFAULT_LINK_METADATA_TIMEOUT_MILLISECONDS)
-	}
-
-	if s.RestrictSystemAdmin == nil {
-		s.RestrictSystemAdmin = NewBool(false)
-	}
-
-	if s.CloudUserLimit == nil {
-		// User limit 0 is treated as no limit
-		s.CloudUserLimit = NewInt64(0)
-	}
-
-	if s.CloudBilling == nil {
-		s.CloudBilling = NewBool(false)
-	}
-
-	if s.UseNewSAMLLibrary == nil {
-		s.UseNewSAMLLibrary = NewBool(false)
-	}
-
-	if s.EnableSharedChannels == nil {
-		s.EnableSharedChannels = NewBool(false)
-	}
-
-	if s.EnableRemoteClusterService == nil {
-		s.EnableRemoteClusterService = NewBool(false)
-	}
-}
-
-type AnalyticsSettings struct {
-	MaxUsersForStatistics *int `access:"write_restrictable,cloud_restrictable"`
-}
-
-func (s *AnalyticsSettings) SetDefaults() {
-	if s.MaxUsersForStatistics == nil {
-		s.MaxUsersForStatistics = NewInt(ANALYTICS_SETTINGS_DEFAULT_MAX_USERS_FOR_STATISTICS)
-	}
-}
-
-type SSOSettings struct {
-	Enable            *bool   `access:"authentication_openid"`
-	Secret            *string `access:"authentication_openid"` // telemetry: none
-	Id                *string `access:"authentication_openid"` // telemetry: none
-	Scope             *string `access:"authentication_openid"` // telemetry: none
-	AuthEndpoint      *string `access:"authentication_openid"` // telemetry: none
-	TokenEndpoint     *string `access:"authentication_openid"` // telemetry: none
-	UserApiEndpoint   *string `access:"authentication_openid"` // telemetry: none
-	DiscoveryEndpoint *string `access:"authentication_openid"` // telemetry: none
-	ButtonText        *string `access:"authentication_openid"` // telemetry: none
-	ButtonColor       *string `access:"authentication_openid"` // telemetry: none
-}
-
-func (s *SSOSettings) setDefaults(scope, authEndpoint, tokenEndpoint, userApiEndpoint, buttonColor string) {
-	if s.Enable == nil {
-		s.Enable = NewBool(false)
-	}
-
-	if s.Secret == nil {
-		s.Secret = NewString("")
-	}
-
-	if s.Id == nil {
-		s.Id = NewString("")
-	}
-
-	if s.Scope == nil {
-		s.Scope = NewString(scope)
-	}
-
-	if s.DiscoveryEndpoint == nil {
-		s.DiscoveryEndpoint = NewString("")
-	}
-
-	if s.AuthEndpoint == nil {
-		s.AuthEndpoint = NewString(authEndpoint)
-	}
-
-	if s.TokenEndpoint == nil {
-		s.TokenEndpoint = NewString(tokenEndpoint)
-	}
-
-	if s.UserApiEndpoint == nil {
-		s.UserApiEndpoint = NewString(userApiEndpoint)
-	}
-
-	if s.ButtonText == nil {
-		s.ButtonText = NewString("")
-	}
-
-	if s.ButtonColor == nil {
-		s.ButtonColor = NewString(buttonColor)
-	}
-}
-
-type Office365Settings struct {
-	Enable            *bool   `access:"authentication_openid"`
-	Secret            *string `access:"authentication_openid"` // telemetry: none
-	Id                *string `access:"authentication_openid"` // telemetry: none
-	Scope             *string `access:"authentication_openid"`
-	AuthEndpoint      *string `access:"authentication_openid"` // telemetry: none
-	TokenEndpoint     *string `access:"authentication_openid"` // telemetry: none
-	UserApiEndpoint   *string `access:"authentication_openid"` // telemetry: none
-	DiscoveryEndpoint *string `access:"authentication_openid"` // telemetry: none
-	DirectoryId       *string `access:"authentication_openid"` // telemetry: none
-}
-
-func (s *Office365Settings) setDefaults() {
-	if s.Enable == nil {
-		s.Enable = NewBool(false)
-	}
-
-	if s.Id == nil {
-		s.Id = NewString("")
-	}
-
-	if s.Secret == nil {
-		s.Secret = NewString("")
-	}
-
-	if s.Scope == nil {
-		s.Scope = NewString(OFFICE365_SETTINGS_DEFAULT_SCOPE)
-	}
-
-	if s.DiscoveryEndpoint == nil {
-		s.DiscoveryEndpoint = NewString("")
-	}
-
-	if s.AuthEndpoint == nil {
-		s.AuthEndpoint = NewString(OFFICE365_SETTINGS_DEFAULT_AUTH_ENDPOINT)
-	}
-
-	if s.TokenEndpoint == nil {
-		s.TokenEndpoint = NewString(OFFICE365_SETTINGS_DEFAULT_TOKEN_ENDPOINT)
-	}
-
-	if s.UserApiEndpoint == nil {
-		s.UserApiEndpoint = NewString(OFFICE365_SETTINGS_DEFAULT_USER_API_ENDPOINT)
-	}
-
-	if s.DirectoryId == nil {
-		s.DirectoryId = NewString("")
-	}
-}
-
-func (s *Office365Settings) SSOSettings() *SSOSettings {
-	ssoSettings := SSOSettings{}
-	ssoSettings.Enable = s.Enable
-	ssoSettings.Secret = s.Secret
-	ssoSettings.Id = s.Id
-	ssoSettings.Scope = s.Scope
-	ssoSettings.DiscoveryEndpoint = s.DiscoveryEndpoint
-	ssoSettings.AuthEndpoint = s.AuthEndpoint
-	ssoSettings.TokenEndpoint = s.TokenEndpoint
-	ssoSettings.UserApiEndpoint = s.UserApiEndpoint
-	return &ssoSettings
-}
-
-type ReplicaLagSettings struct {
-	DataSource       *string `access:"environment,write_restrictable,cloud_restrictable"` // telemetry: none
-	QueryAbsoluteLag *string `access:"environment,write_restrictable,cloud_restrictable"` // telemetry: none
-	QueryTimeLag     *string `access:"environment,write_restrictable,cloud_restrictable"` // telemetry: none
-}
-
-type SqlSettings struct {
-	DriverName                  *string               `access:"environment_database,write_restrictable,cloud_restrictable"`
-	DataSource                  *string               `access:"environment_database,write_restrictable,cloud_restrictable"` // telemetry: none
-	DataSourceReplicas          []string              `access:"environment_database,write_restrictable,cloud_restrictable"`
-	DataSourceSearchReplicas    []string              `access:"environment_database,write_restrictable,cloud_restrictable"`
-	MaxIdleConns                *int                  `access:"environment_database,write_restrictable,cloud_restrictable"`
-	ConnMaxLifetimeMilliseconds *int                  `access:"environment_database,write_restrictable,cloud_restrictable"`
-	ConnMaxIdleTimeMilliseconds *int                  `access:"environment_database,write_restrictable,cloud_restrictable"`
-	MaxOpenConns                *int                  `access:"environment_database,write_restrictable,cloud_restrictable"`
-	Trace                       *bool                 `access:"environment_database,write_restrictable,cloud_restrictable"`
-	AtRestEncryptKey            *string               `access:"environment_database,write_restrictable,cloud_restrictable"` // telemetry: none
-	QueryTimeout                *int                  `access:"environment_database,write_restrictable,cloud_restrictable"`
-	DisableDatabaseSearch       *bool                 `access:"environment_database,write_restrictable,cloud_restrictable"`
-	ReplicaLagSettings          []*ReplicaLagSettings `access:"environment_database,write_restrictable,cloud_restrictable"` // telemetry: none
-}
-
-func (s *SqlSettings) SetDefaults(isUpdate bool) {
-	if s.DriverName == nil {
-		s.DriverName = NewString(DATABASE_DRIVER_POSTGRES)
-	}
-
-	if s.DataSource == nil {
-		s.DataSource = NewString(SQL_SETTINGS_DEFAULT_DATA_SOURCE)
-	}
-
-	if s.DataSourceReplicas == nil {
-		s.DataSourceReplicas = []string{}
-	}
-
-	if s.DataSourceSearchReplicas == nil {
-		s.DataSourceSearchReplicas = []string{}
-	}
-
-	if isUpdate {
-		// When updating an existing configuration, ensure an encryption key has been specified.
-		if s.AtRestEncryptKey == nil || *s.AtRestEncryptKey == "" {
-			s.AtRestEncryptKey = NewString(NewRandomString(32))
-		}
-	} else {
-		// When generating a blank configuration, leave this key empty to be generated on server start.
-		s.AtRestEncryptKey = NewString("")
-	}
-
-	if s.MaxIdleConns == nil {
-		s.MaxIdleConns = NewInt(20)
-	}
-
-	if s.MaxOpenConns == nil {
-		s.MaxOpenConns = NewInt(300)
-	}
-
-	if s.ConnMaxLifetimeMilliseconds == nil {
-		s.ConnMaxLifetimeMilliseconds = NewInt(3600000)
-	}
-
-	if s.ConnMaxIdleTimeMilliseconds == nil {
-		s.ConnMaxIdleTimeMilliseconds = NewInt(300000)
-	}
-
-	if s.Trace == nil {
-		s.Trace = NewBool(false)
-	}
-
-	if s.QueryTimeout == nil {
-		s.QueryTimeout = NewInt(30)
-	}
-
-	if s.DisableDatabaseSearch == nil {
-		s.DisableDatabaseSearch = NewBool(false)
-	}
-
-	if s.ReplicaLagSettings == nil {
-		s.ReplicaLagSettings = []*ReplicaLagSettings{}
-	}
-}
-
-type LogSettings struct {
-	EnableConsole          *bool   `access:"environment_logging,write_restrictable,cloud_restrictable"`
-	ConsoleLevel           *string `access:"environment_logging,write_restrictable,cloud_restrictable"`
-	ConsoleJson            *bool   `access:"environment_logging,write_restrictable,cloud_restrictable"`
-	EnableColor            *bool   `access:"environment_logging,write_restrictable,cloud_restrictable"` // telemetry: none
-	EnableFile             *bool   `access:"environment_logging,write_restrictable,cloud_restrictable"`
-	FileLevel              *string `access:"environment_logging,write_restrictable,cloud_restrictable"`
-	FileJson               *bool   `access:"environment_logging,write_restrictable,cloud_restrictable"`
-	FileLocation           *string `access:"environment_logging,write_restrictable,cloud_restrictable"`
-	EnableWebhookDebugging *bool   `access:"environment_logging,write_restrictable,cloud_restrictable"`
-	EnableDiagnostics      *bool   `access:"environment_logging,write_restrictable,cloud_restrictable"` // telemetry: none
-	EnableSentry           *bool   `access:"environment_logging,write_restrictable,cloud_restrictable"` // telemetry: none
-	AdvancedLoggingConfig  *string `access:"environment_logging,write_restrictable,cloud_restrictable"`
-}
-
-func (s *LogSettings) SetDefaults() {
-	if s.EnableConsole == nil {
-		s.EnableConsole = NewBool(true)
-	}
-
-	if s.ConsoleLevel == nil {
-		s.ConsoleLevel = NewString("DEBUG")
-	}
-
-	if s.EnableColor == nil {
-		s.EnableColor = NewBool(false)
-	}
-
-	if s.EnableFile == nil {
-		s.EnableFile = NewBool(true)
-	}
-
-	if s.FileLevel == nil {
-		s.FileLevel = NewString("INFO")
-	}
-
-	if s.FileLocation == nil {
-		s.FileLocation = NewString("")
-	}
-
-	if s.EnableWebhookDebugging == nil {
-		s.EnableWebhookDebugging = NewBool(true)
-	}
-
-	if s.EnableDiagnostics == nil {
-		s.EnableDiagnostics = NewBool(true)
-	}
-
-	if s.EnableSentry == nil {
-		s.EnableSentry = NewBool(*s.EnableDiagnostics)
-	}
-
-	if s.ConsoleJson == nil {
-		s.ConsoleJson = NewBool(true)
-	}
-
-	if s.FileJson == nil {
-		s.FileJson = NewBool(true)
-	}
-
-	if s.AdvancedLoggingConfig == nil {
-		s.AdvancedLoggingConfig = NewString("")
-	}
-}
-
-type ExperimentalAuditSettings struct {
-	FileEnabled           *bool   `access:"experimental_features,write_restrictable,cloud_restrictable"`
-	FileName              *string `access:"experimental_features,write_restrictable,cloud_restrictable"` // telemetry: none
-	FileMaxSizeMB         *int    `access:"experimental_features,write_restrictable,cloud_restrictable"`
-	FileMaxAgeDays        *int    `access:"experimental_features,write_restrictable,cloud_restrictable"`
-	FileMaxBackups        *int    `access:"experimental_features,write_restrictable,cloud_restrictable"`
-	FileCompress          *bool   `access:"experimental_features,write_restrictable,cloud_restrictable"`
-	FileMaxQueueSize      *int    `access:"experimental_features,write_restrictable,cloud_restrictable"`
-	AdvancedLoggingConfig *string `access:"experimental_features,write_restrictable,cloud_restrictable"`
-}
-
-func (s *ExperimentalAuditSettings) SetDefaults() {
-	if s.FileEnabled == nil {
-		s.FileEnabled = NewBool(false)
-	}
-
-	if s.FileName == nil {
-		s.FileName = NewString("")
-	}
-
-	if s.FileMaxSizeMB == nil {
-		s.FileMaxSizeMB = NewInt(100)
-	}
-
-	if s.FileMaxAgeDays == nil {
-		s.FileMaxAgeDays = NewInt(0) // no limit on age
-	}
-
-	if s.FileMaxBackups == nil { // no limit on number of backups
-		s.FileMaxBackups = NewInt(0)
-	}
-
-	if s.FileCompress == nil {
-		s.FileCompress = NewBool(false)
-	}
-
-	if s.FileMaxQueueSize == nil {
-		s.FileMaxQueueSize = NewInt(1000)
-	}
-
-	if s.AdvancedLoggingConfig == nil {
-		s.AdvancedLoggingConfig = NewString("")
-	}
-}
-
-type NotificationLogSettings struct {
-	EnableConsole         *bool   `access:"write_restrictable,cloud_restrictable"`
-	ConsoleLevel          *string `access:"write_restrictable,cloud_restrictable"`
-	ConsoleJson           *bool   `access:"write_restrictable,cloud_restrictable"`
-	EnableColor           *bool   `access:"write_restrictable,cloud_restrictable"` // telemetry: none
-	EnableFile            *bool   `access:"write_restrictable,cloud_restrictable"`
-	FileLevel             *string `access:"write_restrictable,cloud_restrictable"`
-	FileJson              *bool   `access:"write_restrictable,cloud_restrictable"`
-	FileLocation          *string `access:"write_restrictable,cloud_restrictable"`
-	AdvancedLoggingConfig *string `access:"write_restrictable,cloud_restrictable"`
-}
-
-func (s *NotificationLogSettings) SetDefaults() {
-	if s.EnableConsole == nil {
-		s.EnableConsole = NewBool(true)
-	}
-
-	if s.ConsoleLevel == nil {
-		s.ConsoleLevel = NewString("DEBUG")
-	}
-
-	if s.EnableFile == nil {
-		s.EnableFile = NewBool(true)
-	}
-
-	if s.FileLevel == nil {
-		s.FileLevel = NewString("INFO")
-	}
-
-	if s.FileLocation == nil {
-		s.FileLocation = NewString("")
-	}
-
-	if s.ConsoleJson == nil {
-		s.ConsoleJson = NewBool(true)
-	}
-
-	if s.EnableColor == nil {
-		s.EnableColor = NewBool(false)
-	}
-
-	if s.FileJson == nil {
-		s.FileJson = NewBool(true)
-	}
-
-	if s.AdvancedLoggingConfig == nil {
-		s.AdvancedLoggingConfig = NewString("")
-	}
-}
-
-type PasswordSettings struct {
-	MinimumLength *int  `access:"authentication_password"`
-	Lowercase     *bool `access:"authentication_password"`
-	Number        *bool `access:"authentication_password"`
-	Uppercase     *bool `access:"authentication_password"`
-	Symbol        *bool `access:"authentication_password"`
-}
-
-func (s *PasswordSettings) SetDefaults() {
-	if s.MinimumLength == nil {
-		s.MinimumLength = NewInt(10)
-	}
-
-	if s.Lowercase == nil {
-		s.Lowercase = NewBool(true)
-	}
-
-	if s.Number == nil {
-		s.Number = NewBool(true)
-	}
-
-	if s.Uppercase == nil {
-		s.Uppercase = NewBool(true)
-	}
-
-	if s.Symbol == nil {
-		s.Symbol = NewBool(true)
-	}
-}
-
-type FileSettings struct {
-	EnableFileAttachments   *bool   `access:"site_file_sharing_and_downloads,cloud_restrictable"`
-	EnableMobileUpload      *bool   `access:"site_file_sharing_and_downloads,cloud_restrictable"`
-	EnableMobileDownload    *bool   `access:"site_file_sharing_and_downloads,cloud_restrictable"`
-	MaxFileSize             *int64  `access:"environment_file_storage,cloud_restrictable"`
-	DriverName              *string `access:"environment_file_storage,write_restrictable,cloud_restrictable"`
-	Directory               *string `access:"environment_file_storage,write_restrictable,cloud_restrictable"`
-	EnablePublicLink        *bool   `access:"site_public_links,cloud_restrictable"`
-	ExtractContent          *bool   `access:"environment_file_storage,write_restrictable"`
-	ArchiveRecursion        *bool   `access:"environment_file_storage,write_restrictable"`
-	PublicLinkSalt          *string `access:"site_public_links,cloud_restrictable"`                           // telemetry: none
-	InitialFont             *string `access:"environment_file_storage,cloud_restrictable"`                    // telemetry: none
-	AmazonS3AccessKeyId     *string `access:"environment_file_storage,write_restrictable,cloud_restrictable"` // telemetry: none
-	AmazonS3SecretAccessKey *string `access:"environment_file_storage,write_restrictable,cloud_restrictable"` // telemetry: none
-	AmazonS3Bucket          *string `access:"environment_file_storage,write_restrictable,cloud_restrictable"` // telemetry: none
-	AmazonS3PathPrefix      *string `access:"environment_file_storage,write_restrictable,cloud_restrictable"` // telemetry: none
-	AmazonS3Region          *string `access:"environment_file_storage,write_restrictable,cloud_restrictable"` // telemetry: none
-	AmazonS3Endpoint        *string `access:"environment_file_storage,write_restrictable,cloud_restrictable"` // telemetry: none
-	AmazonS3SSL             *bool   `access:"environment_file_storage,write_restrictable,cloud_restrictable"`
-	AmazonS3SignV2          *bool   `access:"environment_file_storage,write_restrictable,cloud_restrictable"`
-	AmazonS3SSE             *bool   `access:"environment_file_storage,write_restrictable,cloud_restrictable"`
-	AmazonS3Trace           *bool   `access:"environment_file_storage,write_restrictable,cloud_restrictable"`
-}
-
-func (s *FileSettings) SetDefaults(isUpdate bool) {
-	if s.EnableFileAttachments == nil {
-		s.EnableFileAttachments = NewBool(true)
-	}
-
-	if s.EnableMobileUpload == nil {
-		s.EnableMobileUpload = NewBool(true)
-	}
-
-	if s.EnableMobileDownload == nil {
-		s.EnableMobileDownload = NewBool(true)
-	}
-
-	if s.MaxFileSize == nil {
-		s.MaxFileSize = NewInt64(MB * 100)
-	}
-
-	if s.DriverName == nil {
-		s.DriverName = NewString(IMAGE_DRIVER_LOCAL)
-	}
-
-	if s.Directory == nil || *s.Directory == "" {
-		s.Directory = NewString(FILE_SETTINGS_DEFAULT_DIRECTORY)
-	}
-
-	if s.EnablePublicLink == nil {
-		s.EnablePublicLink = NewBool(false)
-	}
-
-	if s.ExtractContent == nil {
-		s.ExtractContent = NewBool(true)
-	}
-
-	if s.ArchiveRecursion == nil {
-		s.ArchiveRecursion = NewBool(false)
-	}
-
-	if isUpdate {
-		// When updating an existing configuration, ensure link salt has been specified.
-		if s.PublicLinkSalt == nil || *s.PublicLinkSalt == "" {
-			s.PublicLinkSalt = NewString(NewRandomString(32))
-		}
-	} else {
-		// When generating a blank configuration, leave link salt empty to be generated on server start.
-		s.PublicLinkSalt = NewString("")
-	}
-
-	if s.InitialFont == nil {
-		// Defaults to "nunito-bold.ttf"
-		s.InitialFont = NewString("nunito-bold.ttf")
-	}
-
-	if s.AmazonS3AccessKeyId == nil {
-		s.AmazonS3AccessKeyId = NewString("")
-	}
-
-	if s.AmazonS3SecretAccessKey == nil {
-		s.AmazonS3SecretAccessKey = NewString("")
-	}
-
-	if s.AmazonS3Bucket == nil {
-		s.AmazonS3Bucket = NewString("")
-	}
-
-	if s.AmazonS3PathPrefix == nil {
-		s.AmazonS3PathPrefix = NewString("")
-	}
-
-	if s.AmazonS3Region == nil {
-		s.AmazonS3Region = NewString("")
-	}
-
-	if s.AmazonS3Endpoint == nil || *s.AmazonS3Endpoint == "" {
-		// Defaults to "s3.amazonaws.com"
-		s.AmazonS3Endpoint = NewString("s3.amazonaws.com")
-	}
-
-	if s.AmazonS3SSL == nil {
-		s.AmazonS3SSL = NewBool(true) // Secure by default.
-	}
-
-	if s.AmazonS3SignV2 == nil {
-		s.AmazonS3SignV2 = new(bool)
-		// Signature v2 is not enabled by default.
-	}
-
-	if s.AmazonS3SSE == nil {
-		s.AmazonS3SSE = NewBool(false) // Not Encrypted by default.
-	}
-
-	if s.AmazonS3Trace == nil {
-		s.AmazonS3Trace = NewBool(false)
-	}
-}
-
-func (s *FileSettings) ToFileBackendSettings(enableComplianceFeature bool) filestore.FileBackendSettings {
-	if *s.DriverName == IMAGE_DRIVER_LOCAL {
-		return filestore.FileBackendSettings{
-			DriverName: *s.DriverName,
-			Directory:  *s.Directory,
-		}
-	}
-	return filestore.FileBackendSettings{
-		DriverName:              *s.DriverName,
-		AmazonS3AccessKeyId:     *s.AmazonS3AccessKeyId,
-		AmazonS3SecretAccessKey: *s.AmazonS3SecretAccessKey,
-		AmazonS3Bucket:          *s.AmazonS3Bucket,
-		AmazonS3PathPrefix:      *s.AmazonS3PathPrefix,
-		AmazonS3Region:          *s.AmazonS3Region,
-		AmazonS3Endpoint:        *s.AmazonS3Endpoint,
-		AmazonS3SSL:             s.AmazonS3SSL == nil || *s.AmazonS3SSL,
-		AmazonS3SignV2:          s.AmazonS3SignV2 != nil && *s.AmazonS3SignV2,
-		AmazonS3SSE:             s.AmazonS3SSE != nil && *s.AmazonS3SSE && enableComplianceFeature,
-		AmazonS3Trace:           s.AmazonS3Trace != nil && *s.AmazonS3Trace,
-	}
-}
-
-type EmailSettings struct {
-	EnableSignUpWithEmail             *bool   `access:"authentication_email"`
-	EnableSignInWithEmail             *bool   `access:"authentication_email"`
-	EnableSignInWithUsername          *bool   `access:"authentication_email"`
-	SendEmailNotifications            *bool   `access:"site_notifications"`
-	UseChannelInEmailNotifications    *bool   `access:"experimental_features"`
-	RequireEmailVerification          *bool   `access:"authentication_email"`
-	FeedbackName                      *string `access:"site_notifications"`
-	FeedbackEmail                     *string `access:"site_notifications,cloud_restrictable"`
-	ReplyToAddress                    *string `access:"site_notifications,cloud_restrictable"`
-	FeedbackOrganization              *string `access:"site_notifications"`
-	EnableSMTPAuth                    *bool   `access:"environment_smtp,write_restrictable,cloud_restrictable"`
-	SMTPUsername                      *string `access:"environment_smtp,write_restrictable,cloud_restrictable"` // telemetry: none
-	SMTPPassword                      *string `access:"environment_smtp,write_restrictable,cloud_restrictable"` // telemetry: none
-	SMTPServer                        *string `access:"environment_smtp,write_restrictable,cloud_restrictable"` // telemetry: none
-	SMTPPort                          *string `access:"environment_smtp,write_restrictable,cloud_restrictable"` // telemetry: none
-	SMTPServerTimeout                 *int    `access:"cloud_restrictable"`
-	ConnectionSecurity                *string `access:"environment_smtp,write_restrictable,cloud_restrictable"`
-	SendPushNotifications             *bool   `access:"environment_push_notification_server"`
-	PushNotificationServer            *string `access:"environment_push_notification_server"` // telemetry: none
-	PushNotificationContents          *string `access:"site_notifications"`
-	PushNotificationBuffer            *int    // telemetry: none
-	EnableEmailBatching               *bool   `access:"site_notifications"`
-	EmailBatchingBufferSize           *int    `access:"experimental_features"`
-	EmailBatchingInterval             *int    `access:"experimental_features"`
-	EnablePreviewModeBanner           *bool   `access:"site_notifications"`
-	SkipServerCertificateVerification *bool   `access:"environment_smtp,write_restrictable,cloud_restrictable"`
-	EmailNotificationContentsType     *string `access:"site_notifications"`
-	LoginButtonColor                  *string `access:"experimental_features"`
-	LoginButtonBorderColor            *string `access:"experimental_features"`
-	LoginButtonTextColor              *string `access:"experimental_features"`
-}
-
-func (s *EmailSettings) SetDefaults(isUpdate bool) {
-	if s.EnableSignUpWithEmail == nil {
-		s.EnableSignUpWithEmail = NewBool(true)
-	}
-
-	if s.EnableSignInWithEmail == nil {
-		s.EnableSignInWithEmail = NewBool(*s.EnableSignUpWithEmail)
-	}
-
-	if s.EnableSignInWithUsername == nil {
-		s.EnableSignInWithUsername = NewBool(true)
-	}
-
-	if s.SendEmailNotifications == nil {
-		s.SendEmailNotifications = NewBool(true)
-	}
-
-	if s.UseChannelInEmailNotifications == nil {
-		s.UseChannelInEmailNotifications = NewBool(false)
-	}
-
-	if s.RequireEmailVerification == nil {
-		s.RequireEmailVerification = NewBool(false)
-	}
-
-	if s.FeedbackName == nil {
-		s.FeedbackName = NewString("")
-	}
-
-	if s.FeedbackEmail == nil {
-		s.FeedbackEmail = NewString("test@example.com")
-	}
-
-	if s.ReplyToAddress == nil {
-		s.ReplyToAddress = NewString("test@example.com")
-	}
-
-	if s.FeedbackOrganization == nil {
-		s.FeedbackOrganization = NewString(EMAIL_SETTINGS_DEFAULT_FEEDBACK_ORGANIZATION)
-	}
-
-	if s.EnableSMTPAuth == nil {
-		if s.ConnectionSecurity == nil || *s.ConnectionSecurity == CONN_SECURITY_NONE {
-			s.EnableSMTPAuth = NewBool(false)
-		} else {
-			s.EnableSMTPAuth = NewBool(true)
-		}
-	}
-
-	if s.SMTPUsername == nil {
-		s.SMTPUsername = NewString("")
-	}
-
-	if s.SMTPPassword == nil {
-		s.SMTPPassword = NewString("")
-	}
-
-	if s.SMTPServer == nil || *s.SMTPServer == "" {
-		s.SMTPServer = NewString("localhost")
-	}
-
-	if s.SMTPPort == nil || *s.SMTPPort == "" {
-		s.SMTPPort = NewString("10025")
-	}
-
-	if s.SMTPServerTimeout == nil || *s.SMTPServerTimeout == 0 {
-		s.SMTPServerTimeout = NewInt(10)
-	}
-
-	if s.ConnectionSecurity == nil || *s.ConnectionSecurity == CONN_SECURITY_PLAIN {
-		s.ConnectionSecurity = NewString(CONN_SECURITY_NONE)
-	}
-
-	if s.SendPushNotifications == nil {
-		s.SendPushNotifications = NewBool(!isUpdate)
-	}
-
-	if s.PushNotificationServer == nil {
-		if isUpdate {
-			s.PushNotificationServer = NewString("")
-		} else {
-			s.PushNotificationServer = NewString(GENERIC_NOTIFICATION_SERVER)
-		}
-	}
-
-	if s.PushNotificationContents == nil {
-		s.PushNotificationContents = NewString(FULL_NOTIFICATION)
-	}
-
-	if s.PushNotificationBuffer == nil {
-		s.PushNotificationBuffer = NewInt(1000)
-	}
-
-	if s.EnableEmailBatching == nil {
-		s.EnableEmailBatching = NewBool(false)
-	}
-
-	if s.EmailBatchingBufferSize == nil {
-		s.EmailBatchingBufferSize = NewInt(EMAIL_BATCHING_BUFFER_SIZE)
-	}
-
-	if s.EmailBatchingInterval == nil {
-		s.EmailBatchingInterval = NewInt(EMAIL_BATCHING_INTERVAL)
-	}
-
-	if s.EnablePreviewModeBanner == nil {
-		s.EnablePreviewModeBanner = NewBool(true)
-	}
-
-	if s.EnableSMTPAuth == nil {
-		if *s.ConnectionSecurity == CONN_SECURITY_NONE {
-			s.EnableSMTPAuth = NewBool(false)
-		} else {
-			s.EnableSMTPAuth = NewBool(true)
-		}
-	}
-
-	if *s.ConnectionSecurity == CONN_SECURITY_PLAIN {
-		*s.ConnectionSecurity = CONN_SECURITY_NONE
-	}
-
-	if s.SkipServerCertificateVerification == nil {
-		s.SkipServerCertificateVerification = NewBool(false)
-	}
-
-	if s.EmailNotificationContentsType == nil {
-		s.EmailNotificationContentsType = NewString(EMAIL_NOTIFICATION_CONTENTS_FULL)
-	}
-
-	if s.LoginButtonColor == nil {
-		s.LoginButtonColor = NewString("#0000")
-	}
-
-	if s.LoginButtonBorderColor == nil {
-		s.LoginButtonBorderColor = NewString("#2389D7")
-	}
-
-	if s.LoginButtonTextColor == nil {
-		s.LoginButtonTextColor = NewString("#2389D7")
-	}
-}
-
-type RateLimitSettings struct {
-	Enable           *bool  `access:"environment_rate_limiting,write_restrictable,cloud_restrictable"`
-	PerSec           *int   `access:"environment_rate_limiting,write_restrictable,cloud_restrictable"`
-	MaxBurst         *int   `access:"environment_rate_limiting,write_restrictable,cloud_restrictable"`
-	MemoryStoreSize  *int   `access:"environment_rate_limiting,write_restrictable,cloud_restrictable"`
-	VaryByRemoteAddr *bool  `access:"environment_rate_limiting,write_restrictable,cloud_restrictable"`
-	VaryByUser       *bool  `access:"environment_rate_limiting,write_restrictable,cloud_restrictable"`
-	VaryByHeader     string `access:"environment_rate_limiting,write_restrictable,cloud_restrictable"`
-}
-
-func (s *RateLimitSettings) SetDefaults() {
-	if s.Enable == nil {
-		s.Enable = NewBool(false)
-	}
-
-	if s.PerSec == nil {
-		s.PerSec = NewInt(10)
-	}
-
-	if s.MaxBurst == nil {
-		s.MaxBurst = NewInt(100)
-	}
-
-	if s.MemoryStoreSize == nil {
-		s.MemoryStoreSize = NewInt(10000)
-	}
-
-	if s.VaryByRemoteAddr == nil {
-		s.VaryByRemoteAddr = NewBool(true)
-	}
-
-	if s.VaryByUser == nil {
-		s.VaryByUser = NewBool(false)
-	}
-}
-
-type PrivacySettings struct {
-	ShowEmailAddress *bool `access:"site_users_and_teams"`
-	ShowFullName     *bool `access:"site_users_and_teams"`
-}
-
-func (s *PrivacySettings) setDefaults() {
-	if s.ShowEmailAddress == nil {
-		s.ShowEmailAddress = NewBool(true)
-	}
-
-	if s.ShowFullName == nil {
-		s.ShowFullName = NewBool(true)
-	}
-}
-
-type SupportSettings struct {
-	TermsOfServiceLink                     *string `access:"site_customization,write_restrictable,cloud_restrictable"`
-	PrivacyPolicyLink                      *string `access:"site_customization,write_restrictable,cloud_restrictable"`
-	AboutLink                              *string `access:"site_customization,write_restrictable,cloud_restrictable"`
-	HelpLink                               *string `access:"site_customization,write_restrictable,cloud_restrictable"`
-	ReportAProblemLink                     *string `access:"site_customization,write_restrictable,cloud_restrictable"`
-	SupportEmail                           *string `access:"site_customization"`
-	CustomTermsOfServiceEnabled            *bool   `access:"compliance_custom_terms_of_service"`
-	CustomTermsOfServiceReAcceptancePeriod *int    `access:"compliance_custom_terms_of_service"`
-	EnableAskCommunityLink                 *bool   `access:"site_customization"`
-}
-
-func (s *SupportSettings) SetDefaults() {
-	if !IsSafeLink(s.TermsOfServiceLink) {
-		*s.TermsOfServiceLink = SUPPORT_SETTINGS_DEFAULT_TERMS_OF_SERVICE_LINK
-	}
-
-	if s.TermsOfServiceLink == nil {
-		s.TermsOfServiceLink = NewString(SUPPORT_SETTINGS_DEFAULT_TERMS_OF_SERVICE_LINK)
-	}
-
-	if !IsSafeLink(s.PrivacyPolicyLink) {
-		*s.PrivacyPolicyLink = ""
-	}
-
-	if s.PrivacyPolicyLink == nil {
-		s.PrivacyPolicyLink = NewString(SUPPORT_SETTINGS_DEFAULT_PRIVACY_POLICY_LINK)
-	}
-
-	if !IsSafeLink(s.AboutLink) {
-		*s.AboutLink = ""
-	}
-
-	if s.AboutLink == nil {
-		s.AboutLink = NewString(SUPPORT_SETTINGS_DEFAULT_ABOUT_LINK)
-	}
-
-	if !IsSafeLink(s.HelpLink) {
-		*s.HelpLink = ""
-	}
-
-	if s.HelpLink == nil {
-		s.HelpLink = NewString(SUPPORT_SETTINGS_DEFAULT_HELP_LINK)
-	}
-
-	if !IsSafeLink(s.ReportAProblemLink) {
-		*s.ReportAProblemLink = ""
-	}
-
-	if s.ReportAProblemLink == nil {
-		s.ReportAProblemLink = NewString(SUPPORT_SETTINGS_DEFAULT_REPORT_A_PROBLEM_LINK)
-	}
-
-	if s.SupportEmail == nil {
-		s.SupportEmail = NewString(SUPPORT_SETTINGS_DEFAULT_SUPPORT_EMAIL)
-	}
-
-	if s.CustomTermsOfServiceEnabled == nil {
-		s.CustomTermsOfServiceEnabled = NewBool(false)
-	}
-
-	if s.CustomTermsOfServiceReAcceptancePeriod == nil {
-		s.CustomTermsOfServiceReAcceptancePeriod = NewInt(SUPPORT_SETTINGS_DEFAULT_RE_ACCEPTANCE_PERIOD)
-	}
-
-	if s.EnableAskCommunityLink == nil {
-		s.EnableAskCommunityLink = NewBool(true)
-	}
-}
-
-type AnnouncementSettings struct {
-	EnableBanner          *bool   `access:"site_announcement_banner"`
-	BannerText            *string `access:"site_announcement_banner"` // telemetry: none
-	BannerColor           *string `access:"site_announcement_banner"`
-	BannerTextColor       *string `access:"site_announcement_banner"`
-	AllowBannerDismissal  *bool   `access:"site_announcement_banner"`
-	AdminNoticesEnabled   *bool   `access:"site_notices"`
-	UserNoticesEnabled    *bool   `access:"site_notices"`
-	NoticesURL            *string `access:"site_notices,write_restrictable"` // telemetry: none
-	NoticesFetchFrequency *int    `access:"site_notices,write_restrictable"` // telemetry: none
-	NoticesSkipCache      *bool   `access:"site_notices,write_restrictable"` // telemetry: none
-}
-
-func (s *AnnouncementSettings) SetDefaults() {
-	if s.EnableBanner == nil {
-		s.EnableBanner = NewBool(false)
-	}
-
-	if s.BannerText == nil {
-		s.BannerText = NewString("")
-	}
-
-	if s.BannerColor == nil {
-		s.BannerColor = NewString(ANNOUNCEMENT_SETTINGS_DEFAULT_BANNER_COLOR)
-	}
-
-	if s.BannerTextColor == nil {
-		s.BannerTextColor = NewString(ANNOUNCEMENT_SETTINGS_DEFAULT_BANNER_TEXT_COLOR)
-	}
-
-	if s.AllowBannerDismissal == nil {
-		s.AllowBannerDismissal = NewBool(true)
-	}
-
-	if s.AdminNoticesEnabled == nil {
-		s.AdminNoticesEnabled = NewBool(true)
-	}
-
-	if s.UserNoticesEnabled == nil {
-		s.UserNoticesEnabled = NewBool(true)
-	}
-	if s.NoticesURL == nil {
-		s.NoticesURL = NewString(ANNOUNCEMENT_SETTINGS_DEFAULT_NOTICES_JSON_URL)
-	}
-	if s.NoticesSkipCache == nil {
-		s.NoticesSkipCache = NewBool(false)
-	}
-	if s.NoticesFetchFrequency == nil {
-		s.NoticesFetchFrequency = NewInt(ANNOUNCEMENT_SETTINGS_DEFAULT_NOTICES_FETCH_FREQUENCY_SECONDS)
-	}
-
-}
-
-type ThemeSettings struct {
-	EnableThemeSelection *bool   `access:"experimental_features"`
-	DefaultTheme         *string `access:"experimental_features"`
-	AllowCustomThemes    *bool   `access:"experimental_features"`
-	AllowedThemes        []string
-}
-
-func (s *ThemeSettings) SetDefaults() {
-	if s.EnableThemeSelection == nil {
-		s.EnableThemeSelection = NewBool(true)
-	}
-
-	if s.DefaultTheme == nil {
-		s.DefaultTheme = NewString(TEAM_SETTINGS_DEFAULT_TEAM_TEXT)
-	}
-
-	if s.AllowCustomThemes == nil {
-		s.AllowCustomThemes = NewBool(true)
-	}
-
-	if s.AllowedThemes == nil {
-		s.AllowedThemes = []string{}
-	}
-}
-
-type TeamSettings struct {
-	SiteName                                                  *string  `access:"site_customization"`
-	MaxUsersPerTeam                                           *int     `access:"site_users_and_teams"`
-	DEPRECATED_DO_NOT_USE_EnableTeamCreation                  *bool    `json:"EnableTeamCreation" mapstructure:"EnableTeamCreation"` // Deprecated: do not use
-	EnableUserCreation                                        *bool    `access:"authentication_signup"`
-	EnableOpenServer                                          *bool    `access:"authentication_signup"`
-	EnableUserDeactivation                                    *bool    `access:"experimental_features"`
-	RestrictCreationToDomains                                 *string  `access:"authentication_signup"` // telemetry: none
-	EnableCustomUserStatuses                                  *bool    `access:"site_users_and_teams"`
-	EnableCustomBrand                                         *bool    `access:"site_customization"`
-	CustomBrandText                                           *string  `access:"site_customization"`
-	CustomDescriptionText                                     *string  `access:"site_customization"`
-	RestrictDirectMessage                                     *string  `access:"site_users_and_teams"`
-	DEPRECATED_DO_NOT_USE_RestrictTeamInvite                  *string  `json:"RestrictTeamInvite" mapstructure:"RestrictTeamInvite"`                                   // Deprecated: do not use
-	DEPRECATED_DO_NOT_USE_RestrictPublicChannelManagement     *string  `json:"RestrictPublicChannelManagement" mapstructure:"RestrictPublicChannelManagement"`         // Deprecated: do not use
-	DEPRECATED_DO_NOT_USE_RestrictPrivateChannelManagement    *string  `json:"RestrictPrivateChannelManagement" mapstructure:"RestrictPrivateChannelManagement"`       // Deprecated: do not use
-	DEPRECATED_DO_NOT_USE_RestrictPublicChannelCreation       *string  `json:"RestrictPublicChannelCreation" mapstructure:"RestrictPublicChannelCreation"`             // Deprecated: do not use
-	DEPRECATED_DO_NOT_USE_RestrictPrivateChannelCreation      *string  `json:"RestrictPrivateChannelCreation" mapstructure:"RestrictPrivateChannelCreation"`           // Deprecated: do not use
-	DEPRECATED_DO_NOT_USE_RestrictPublicChannelDeletion       *string  `json:"RestrictPublicChannelDeletion" mapstructure:"RestrictPublicChannelDeletion"`             // Deprecated: do not use
-	DEPRECATED_DO_NOT_USE_RestrictPrivateChannelDeletion      *string  `json:"RestrictPrivateChannelDeletion" mapstructure:"RestrictPrivateChannelDeletion"`           // Deprecated: do not use
-	DEPRECATED_DO_NOT_USE_RestrictPrivateChannelManageMembers *string  `json:"RestrictPrivateChannelManageMembers" mapstructure:"RestrictPrivateChannelManageMembers"` // Deprecated: do not use
-	EnableXToLeaveChannelsFromLHS                             *bool    `access:"experimental_features"`
-	UserStatusAwayTimeout                                     *int64   `access:"experimental_features"`
-	MaxChannelsPerTeam                                        *int64   `access:"site_users_and_teams"`
-	MaxNotificationsPerChannel                                *int64   `access:"environment_push_notification_server"`
-	EnableConfirmNotificationsToChannel                       *bool    `access:"site_notifications"`
-	TeammateNameDisplay                                       *string  `access:"site_users_and_teams"`
-	ExperimentalViewArchivedChannels                          *bool    `access:"experimental_features,site_users_and_teams"`
-	ExperimentalEnableAutomaticReplies                        *bool    `access:"experimental_features"`
-	ExperimentalHideTownSquareinLHS                           *bool    `access:"experimental_features"`
-	ExperimentalTownSquareIsReadOnly                          *bool    `access:"experimental_features"`
-	LockTeammateNameDisplay                                   *bool    `access:"site_users_and_teams"`
-	ExperimentalPrimaryTeam                                   *string  `access:"experimental_features"`
-	ExperimentalDefaultChannels                               []string `access:"experimental_features"`
-}
-
-func (s *TeamSettings) SetDefaults() {
-
-	if s.SiteName == nil || *s.SiteName == "" {
-		s.SiteName = NewString(TEAM_SETTINGS_DEFAULT_SITE_NAME)
-	}
-
-	if s.MaxUsersPerTeam == nil {
-		s.MaxUsersPerTeam = NewInt(TEAM_SETTINGS_DEFAULT_MAX_USERS_PER_TEAM)
-	}
-
-	if s.DEPRECATED_DO_NOT_USE_EnableTeamCreation == nil {
-		s.DEPRECATED_DO_NOT_USE_EnableTeamCreation = NewBool(true)
-	}
-
-	if s.EnableUserCreation == nil {
-		s.EnableUserCreation = NewBool(true)
-	}
-
-	if s.EnableOpenServer == nil {
-		s.EnableOpenServer = NewBool(false)
-	}
-
-	if s.RestrictCreationToDomains == nil {
-		s.RestrictCreationToDomains = NewString("")
-	}
-
-	if s.EnableCustomUserStatuses == nil {
-		s.EnableCustomUserStatuses = NewBool(true)
-	}
-
-	if s.EnableCustomBrand == nil {
-		s.EnableCustomBrand = NewBool(false)
-	}
-
-	if s.EnableUserDeactivation == nil {
-		s.EnableUserDeactivation = NewBool(false)
-	}
-
-	if s.CustomBrandText == nil {
-		s.CustomBrandText = NewString(TEAM_SETTINGS_DEFAULT_CUSTOM_BRAND_TEXT)
-	}
-
-	if s.CustomDescriptionText == nil {
-		s.CustomDescriptionText = NewString(TEAM_SETTINGS_DEFAULT_CUSTOM_DESCRIPTION_TEXT)
-	}
-
-	if s.RestrictDirectMessage == nil {
-		s.RestrictDirectMessage = NewString(DIRECT_MESSAGE_ANY)
-	}
-
-	if s.DEPRECATED_DO_NOT_USE_RestrictTeamInvite == nil {
-		s.DEPRECATED_DO_NOT_USE_RestrictTeamInvite = NewString(PERMISSIONS_ALL)
-	}
-
-	if s.DEPRECATED_DO_NOT_USE_RestrictPublicChannelManagement == nil {
-		s.DEPRECATED_DO_NOT_USE_RestrictPublicChannelManagement = NewString(PERMISSIONS_ALL)
-	}
-
-	if s.DEPRECATED_DO_NOT_USE_RestrictPrivateChannelManagement == nil {
-		s.DEPRECATED_DO_NOT_USE_RestrictPrivateChannelManagement = NewString(PERMISSIONS_ALL)
-	}
-
-	if s.DEPRECATED_DO_NOT_USE_RestrictPublicChannelCreation == nil {
-		s.DEPRECATED_DO_NOT_USE_RestrictPublicChannelCreation = new(string)
-		// If this setting does not exist, assume migration from <3.6, so use management setting as default.
-		if *s.DEPRECATED_DO_NOT_USE_RestrictPublicChannelManagement == PERMISSIONS_CHANNEL_ADMIN {
-			*s.DEPRECATED_DO_NOT_USE_RestrictPublicChannelCreation = PERMISSIONS_TEAM_ADMIN
-		} else {
-			*s.DEPRECATED_DO_NOT_USE_RestrictPublicChannelCreation = *s.DEPRECATED_DO_NOT_USE_RestrictPublicChannelManagement
-		}
-	}
-
-	if s.DEPRECATED_DO_NOT_USE_RestrictPrivateChannelCreation == nil {
-		// If this setting does not exist, assume migration from <3.6, so use management setting as default.
-		if *s.DEPRECATED_DO_NOT_USE_RestrictPrivateChannelManagement == PERMISSIONS_CHANNEL_ADMIN {
-			s.DEPRECATED_DO_NOT_USE_RestrictPrivateChannelCreation = NewString(PERMISSIONS_TEAM_ADMIN)
-		} else {
-			s.DEPRECATED_DO_NOT_USE_RestrictPrivateChannelCreation = NewString(*s.DEPRECATED_DO_NOT_USE_RestrictPrivateChannelManagement)
-		}
-	}
-
-	if s.DEPRECATED_DO_NOT_USE_RestrictPublicChannelDeletion == nil {
-		// If this setting does not exist, assume migration from <3.6, so use management setting as default.
-		s.DEPRECATED_DO_NOT_USE_RestrictPublicChannelDeletion = NewString(*s.DEPRECATED_DO_NOT_USE_RestrictPublicChannelManagement)
-	}
-
-	if s.DEPRECATED_DO_NOT_USE_RestrictPrivateChannelDeletion == nil {
-		// If this setting does not exist, assume migration from <3.6, so use management setting as default.
-		s.DEPRECATED_DO_NOT_USE_RestrictPrivateChannelDeletion = NewString(*s.DEPRECATED_DO_NOT_USE_RestrictPrivateChannelManagement)
-	}
-
-	if s.DEPRECATED_DO_NOT_USE_RestrictPrivateChannelManageMembers == nil {
-		s.DEPRECATED_DO_NOT_USE_RestrictPrivateChannelManageMembers = NewString(PERMISSIONS_ALL)
-	}
-
-	if s.EnableXToLeaveChannelsFromLHS == nil {
-		s.EnableXToLeaveChannelsFromLHS = NewBool(false)
-	}
-
-	if s.UserStatusAwayTimeout == nil {
-		s.UserStatusAwayTimeout = NewInt64(TEAM_SETTINGS_DEFAULT_USER_STATUS_AWAY_TIMEOUT)
-	}
-
-	if s.MaxChannelsPerTeam == nil {
-		s.MaxChannelsPerTeam = NewInt64(2000)
-	}
-
-	if s.MaxNotificationsPerChannel == nil {
-		s.MaxNotificationsPerChannel = NewInt64(1000)
-	}
-
-	if s.EnableConfirmNotificationsToChannel == nil {
-		s.EnableConfirmNotificationsToChannel = NewBool(true)
-	}
-
-	if s.ExperimentalEnableAutomaticReplies == nil {
-		s.ExperimentalEnableAutomaticReplies = NewBool(false)
-	}
-
-	if s.ExperimentalHideTownSquareinLHS == nil {
-		s.ExperimentalHideTownSquareinLHS = NewBool(false)
-	}
-
-	if s.ExperimentalTownSquareIsReadOnly == nil {
-		s.ExperimentalTownSquareIsReadOnly = NewBool(false)
-	}
-
-	if s.ExperimentalPrimaryTeam == nil {
-		s.ExperimentalPrimaryTeam = NewString("")
-	}
-
-	if s.ExperimentalDefaultChannels == nil {
-		s.ExperimentalDefaultChannels = []string{}
-	}
-
-	if s.DEPRECATED_DO_NOT_USE_EnableTeamCreation == nil {
-		s.DEPRECATED_DO_NOT_USE_EnableTeamCreation = NewBool(true)
-	}
-
-	if s.EnableUserCreation == nil {
-		s.EnableUserCreation = NewBool(true)
-	}
-
-	if s.ExperimentalViewArchivedChannels == nil {
-		s.ExperimentalViewArchivedChannels = NewBool(true)
-	}
-
-	if s.LockTeammateNameDisplay == nil {
-		s.LockTeammateNameDisplay = NewBool(false)
-	}
-}
-
-type ClientRequirements struct {
-	AndroidLatestVersion string `access:"write_restrictable,cloud_restrictable"`
-	AndroidMinVersion    string `access:"write_restrictable,cloud_restrictable"`
-	DesktopLatestVersion string `access:"write_restrictable,cloud_restrictable"`
-	DesktopMinVersion    string `access:"write_restrictable,cloud_restrictable"`
-	IosLatestVersion     string `access:"write_restrictable,cloud_restrictable"`
-	IosMinVersion        string `access:"write_restrictable,cloud_restrictable"`
-}
-
-type LdapSettings struct {
-	// Basic
-	Enable             *bool   `access:"authentication_ldap"`
-	EnableSync         *bool   `access:"authentication_ldap"`
-	LdapServer         *string `access:"authentication_ldap"` // telemetry: none
-	LdapPort           *int    `access:"authentication_ldap"` // telemetry: none
-	ConnectionSecurity *string `access:"authentication_ldap"`
-	BaseDN             *string `access:"authentication_ldap"` // telemetry: none
-	BindUsername       *string `access:"authentication_ldap"` // telemetry: none
-	BindPassword       *string `access:"authentication_ldap"` // telemetry: none
-
-	// Filtering
-	UserFilter        *string `access:"authentication_ldap"` // telemetry: none
-	GroupFilter       *string `access:"authentication_ldap"`
-	GuestFilter       *string `access:"authentication_ldap"`
-	EnableAdminFilter *bool
-	AdminFilter       *string
-
-	// Group Mapping
-	GroupDisplayNameAttribute *string `access:"authentication_ldap"`
-	GroupIdAttribute          *string `access:"authentication_ldap"`
-
-	// User Mapping
-	FirstNameAttribute *string `access:"authentication_ldap"`
-	LastNameAttribute  *string `access:"authentication_ldap"`
-	EmailAttribute     *string `access:"authentication_ldap"`
-	UsernameAttribute  *string `access:"authentication_ldap"`
-	NicknameAttribute  *string `access:"authentication_ldap"`
-	IdAttribute        *string `access:"authentication_ldap"`
-	PositionAttribute  *string `access:"authentication_ldap"`
-	LoginIdAttribute   *string `access:"authentication_ldap"`
-	PictureAttribute   *string `access:"authentication_ldap"`
-
-	// Synchronization
-	SyncIntervalMinutes *int `access:"authentication_ldap"`
-
-	// Advanced
-	SkipCertificateVerification *bool   `access:"authentication_ldap"`
-	PublicCertificateFile       *string `access:"authentication_ldap"`
-	PrivateKeyFile              *string `access:"authentication_ldap"`
-	QueryTimeout                *int    `access:"authentication_ldap"`
-	MaxPageSize                 *int    `access:"authentication_ldap"`
-
-	// Customization
-	LoginFieldName *string `access:"authentication_ldap"`
-
-	LoginButtonColor       *string `access:"experimental_features"`
-	LoginButtonBorderColor *string `access:"experimental_features"`
-	LoginButtonTextColor   *string `access:"experimental_features"`
-
-	Trace *bool `access:"authentication_ldap"` // telemetry: none
-}
-
-func (s *LdapSettings) SetDefaults() {
-	if s.Enable == nil {
-		s.Enable = NewBool(false)
-	}
-
-	// When unset should default to LDAP Enabled
-	if s.EnableSync == nil {
-		s.EnableSync = NewBool(*s.Enable)
-	}
-
-	if s.EnableAdminFilter == nil {
-		s.EnableAdminFilter = NewBool(false)
-	}
-
-	if s.LdapServer == nil {
-		s.LdapServer = NewString("")
-	}
-
-	if s.LdapPort == nil {
-		s.LdapPort = NewInt(389)
-	}
-
-	if s.ConnectionSecurity == nil {
-		s.ConnectionSecurity = NewString("")
-	}
-
-	if s.PublicCertificateFile == nil {
-		s.PublicCertificateFile = NewString("")
-	}
-
-	if s.PrivateKeyFile == nil {
-		s.PrivateKeyFile = NewString("")
-	}
-
-	if s.BaseDN == nil {
-		s.BaseDN = NewString("")
-	}
-
-	if s.BindUsername == nil {
-		s.BindUsername = NewString("")
-	}
-
-	if s.BindPassword == nil {
-		s.BindPassword = NewString("")
-	}
-
-	if s.UserFilter == nil {
-		s.UserFilter = NewString("")
-	}
-
-	if s.GuestFilter == nil {
-		s.GuestFilter = NewString("")
-	}
-
-	if s.AdminFilter == nil {
-		s.AdminFilter = NewString("")
-	}
-
-	if s.GroupFilter == nil {
-		s.GroupFilter = NewString("")
-	}
-
-	if s.GroupDisplayNameAttribute == nil {
-		s.GroupDisplayNameAttribute = NewString(LDAP_SETTINGS_DEFAULT_GROUP_DISPLAY_NAME_ATTRIBUTE)
-	}
-
-	if s.GroupIdAttribute == nil {
-		s.GroupIdAttribute = NewString(LDAP_SETTINGS_DEFAULT_GROUP_ID_ATTRIBUTE)
-	}
-
-	if s.FirstNameAttribute == nil {
-		s.FirstNameAttribute = NewString(LDAP_SETTINGS_DEFAULT_FIRST_NAME_ATTRIBUTE)
-	}
-
-	if s.LastNameAttribute == nil {
-		s.LastNameAttribute = NewString(LDAP_SETTINGS_DEFAULT_LAST_NAME_ATTRIBUTE)
-	}
-
-	if s.EmailAttribute == nil {
-		s.EmailAttribute = NewString(LDAP_SETTINGS_DEFAULT_EMAIL_ATTRIBUTE)
-	}
-
-	if s.UsernameAttribute == nil {
-		s.UsernameAttribute = NewString(LDAP_SETTINGS_DEFAULT_USERNAME_ATTRIBUTE)
-	}
-
-	if s.NicknameAttribute == nil {
-		s.NicknameAttribute = NewString(LDAP_SETTINGS_DEFAULT_NICKNAME_ATTRIBUTE)
-	}
-
-	if s.IdAttribute == nil {
-		s.IdAttribute = NewString(LDAP_SETTINGS_DEFAULT_ID_ATTRIBUTE)
-	}
-
-	if s.PositionAttribute == nil {
-		s.PositionAttribute = NewString(LDAP_SETTINGS_DEFAULT_POSITION_ATTRIBUTE)
-	}
-
-	if s.PictureAttribute == nil {
-		s.PictureAttribute = NewString(LDAP_SETTINGS_DEFAULT_PICTURE_ATTRIBUTE)
-	}
-
-	// For those upgrading to the version when LoginIdAttribute was added
-	// they need IdAttribute == LoginIdAttribute not to break
-	if s.LoginIdAttribute == nil {
-		s.LoginIdAttribute = s.IdAttribute
-	}
-
-	if s.SyncIntervalMinutes == nil {
-		s.SyncIntervalMinutes = NewInt(60)
-	}
-
-	if s.SkipCertificateVerification == nil {
-		s.SkipCertificateVerification = NewBool(false)
-	}
-
-	if s.QueryTimeout == nil {
-		s.QueryTimeout = NewInt(60)
-	}
-
-	if s.MaxPageSize == nil {
-		s.MaxPageSize = NewInt(0)
-	}
-
-	if s.LoginFieldName == nil {
-		s.LoginFieldName = NewString(LDAP_SETTINGS_DEFAULT_LOGIN_FIELD_NAME)
-	}
-
-	if s.LoginButtonColor == nil {
-		s.LoginButtonColor = NewString("#0000")
-	}
-
-	if s.LoginButtonBorderColor == nil {
-		s.LoginButtonBorderColor = NewString("#2389D7")
-	}
-
-	if s.LoginButtonTextColor == nil {
-		s.LoginButtonTextColor = NewString("#2389D7")
-	}
-
-	if s.Trace == nil {
-		s.Trace = NewBool(false)
-	}
-}
-
-type ComplianceSettings struct {
-	Enable      *bool   `access:"compliance_compliance_monitoring"`
-	Directory   *string `access:"compliance_compliance_monitoring"` // telemetry: none
-	EnableDaily *bool   `access:"compliance_compliance_monitoring"`
-	BatchSize   *int    `access:"compliance_compliance_monitoring"` // telemetry: none
-}
-
-func (s *ComplianceSettings) SetDefaults() {
-	if s.Enable == nil {
-		s.Enable = NewBool(false)
-	}
-
-	if s.Directory == nil {
-		s.Directory = NewString("./data/")
-	}
-
-	if s.EnableDaily == nil {
-		s.EnableDaily = NewBool(false)
-	}
-
-	if s.BatchSize == nil {
-		s.BatchSize = NewInt(30000)
-	}
-}
-
-type LocalizationSettings struct {
-	DefaultServerLocale *string `access:"site_localization"`
-	DefaultClientLocale *string `access:"site_localization"`
-	AvailableLocales    *string `access:"site_localization"`
-}
-
-func (s *LocalizationSettings) SetDefaults() {
-	if s.DefaultServerLocale == nil {
-		s.DefaultServerLocale = NewString(DEFAULT_LOCALE)
-	}
-
-	if s.DefaultClientLocale == nil {
-		s.DefaultClientLocale = NewString(DEFAULT_LOCALE)
-	}
-
-	if s.AvailableLocales == nil {
-		s.AvailableLocales = NewString("")
-	}
-}
-
-type SamlSettings struct {
-	// Basic
-	Enable                        *bool `access:"authentication_saml"`
-	EnableSyncWithLdap            *bool `access:"authentication_saml"`
-	EnableSyncWithLdapIncludeAuth *bool `access:"authentication_saml"`
-	IgnoreGuestsLdapSync          *bool `access:"authentication_saml"`
-
-	Verify      *bool `access:"authentication_saml"`
-	Encrypt     *bool `access:"authentication_saml"`
-	SignRequest *bool `access:"authentication_saml"`
-
-	IdpUrl                      *string `access:"authentication_saml"` // telemetry: none
-	IdpDescriptorUrl            *string `access:"authentication_saml"` // telemetry: none
-	IdpMetadataUrl              *string `access:"authentication_saml"` // telemetry: none
-	ServiceProviderIdentifier   *string `access:"authentication_saml"` // telemetry: none
-	AssertionConsumerServiceURL *string `access:"authentication_saml"` // telemetry: none
-
-	SignatureAlgorithm *string `access:"authentication_saml"`
-	CanonicalAlgorithm *string `access:"authentication_saml"`
-
-	ScopingIDPProviderId *string `access:"authentication_saml"`
-	ScopingIDPName       *string `access:"authentication_saml"`
-
-	IdpCertificateFile    *string `access:"authentication_saml"` // telemetry: none
-	PublicCertificateFile *string `access:"authentication_saml"` // telemetry: none
-	PrivateKeyFile        *string `access:"authentication_saml"` // telemetry: none
-
-	// User Mapping
-	IdAttribute          *string `access:"authentication_saml"`
-	GuestAttribute       *string `access:"authentication_saml"`
-	EnableAdminAttribute *bool
-	AdminAttribute       *string
-	FirstNameAttribute   *string `access:"authentication_saml"`
-	LastNameAttribute    *string `access:"authentication_saml"`
-	EmailAttribute       *string `access:"authentication_saml"`
-	UsernameAttribute    *string `access:"authentication_saml"`
-	NicknameAttribute    *string `access:"authentication_saml"`
-	LocaleAttribute      *string `access:"authentication_saml"`
-	PositionAttribute    *string `access:"authentication_saml"`
-
-	LoginButtonText *string `access:"authentication_saml"`
-
-	LoginButtonColor       *string `access:"experimental_features"`
-	LoginButtonBorderColor *string `access:"experimental_features"`
-	LoginButtonTextColor   *string `access:"experimental_features"`
-}
-
-func (s *SamlSettings) SetDefaults() {
-	if s.Enable == nil {
-		s.Enable = NewBool(false)
-	}
-
-	if s.EnableSyncWithLdap == nil {
-		s.EnableSyncWithLdap = NewBool(false)
-	}
-
-	if s.EnableSyncWithLdapIncludeAuth == nil {
-		s.EnableSyncWithLdapIncludeAuth = NewBool(false)
-	}
-
-	if s.IgnoreGuestsLdapSync == nil {
-		s.IgnoreGuestsLdapSync = NewBool(false)
-	}
-
-	if s.EnableAdminAttribute == nil {
-		s.EnableAdminAttribute = NewBool(false)
-	}
-
-	if s.Verify == nil {
-		s.Verify = NewBool(true)
-	}
-
-	if s.Encrypt == nil {
-		s.Encrypt = NewBool(true)
-	}
-
-	if s.SignRequest == nil {
-		s.SignRequest = NewBool(false)
-	}
-
-	if s.SignatureAlgorithm == nil {
-		s.SignatureAlgorithm = NewString(SAML_SETTINGS_DEFAULT_SIGNATURE_ALGORITHM)
-	}
-
-	if s.CanonicalAlgorithm == nil {
-		s.CanonicalAlgorithm = NewString(SAML_SETTINGS_DEFAULT_CANONICAL_ALGORITHM)
-	}
-
-	if s.IdpUrl == nil {
-		s.IdpUrl = NewString("")
-	}
-
-	if s.IdpDescriptorUrl == nil {
-		s.IdpDescriptorUrl = NewString("")
-	}
-
-	if s.ServiceProviderIdentifier == nil {
-		if s.IdpDescriptorUrl != nil {
-			s.ServiceProviderIdentifier = NewString(*s.IdpDescriptorUrl)
-		} else {
-			s.ServiceProviderIdentifier = NewString("")
-		}
-	}
-
-	if s.IdpMetadataUrl == nil {
-		s.IdpMetadataUrl = NewString("")
-	}
-
-	if s.IdpCertificateFile == nil {
-		s.IdpCertificateFile = NewString("")
-	}
-
-	if s.PublicCertificateFile == nil {
-		s.PublicCertificateFile = NewString("")
-	}
-
-	if s.PrivateKeyFile == nil {
-		s.PrivateKeyFile = NewString("")
-	}
-
-	if s.AssertionConsumerServiceURL == nil {
-		s.AssertionConsumerServiceURL = NewString("")
-	}
-
-	if s.ScopingIDPProviderId == nil {
-		s.ScopingIDPProviderId = NewString("")
-	}
-
-	if s.ScopingIDPName == nil {
-		s.ScopingIDPName = NewString("")
-	}
-
-	if s.LoginButtonText == nil || *s.LoginButtonText == "" {
-		s.LoginButtonText = NewString(USER_AUTH_SERVICE_SAML_TEXT)
-	}
-
-	if s.IdAttribute == nil {
-		s.IdAttribute = NewString(SAML_SETTINGS_DEFAULT_ID_ATTRIBUTE)
-	}
-
-	if s.GuestAttribute == nil {
-		s.GuestAttribute = NewString(SAML_SETTINGS_DEFAULT_GUEST_ATTRIBUTE)
-	}
-	if s.AdminAttribute == nil {
-		s.AdminAttribute = NewString(SAML_SETTINGS_DEFAULT_ADMIN_ATTRIBUTE)
-	}
-	if s.FirstNameAttribute == nil {
-		s.FirstNameAttribute = NewString(SAML_SETTINGS_DEFAULT_FIRST_NAME_ATTRIBUTE)
-	}
-
-	if s.LastNameAttribute == nil {
-		s.LastNameAttribute = NewString(SAML_SETTINGS_DEFAULT_LAST_NAME_ATTRIBUTE)
-	}
-
-	if s.EmailAttribute == nil {
-		s.EmailAttribute = NewString(SAML_SETTINGS_DEFAULT_EMAIL_ATTRIBUTE)
-	}
-
-	if s.UsernameAttribute == nil {
-		s.UsernameAttribute = NewString(SAML_SETTINGS_DEFAULT_USERNAME_ATTRIBUTE)
-	}
-
-	if s.NicknameAttribute == nil {
-		s.NicknameAttribute = NewString(SAML_SETTINGS_DEFAULT_NICKNAME_ATTRIBUTE)
-	}
-
-	if s.PositionAttribute == nil {
-		s.PositionAttribute = NewString(SAML_SETTINGS_DEFAULT_POSITION_ATTRIBUTE)
-	}
-
-	if s.LocaleAttribute == nil {
-		s.LocaleAttribute = NewString(SAML_SETTINGS_DEFAULT_LOCALE_ATTRIBUTE)
-	}
-
-	if s.LoginButtonColor == nil {
-		s.LoginButtonColor = NewString("#34a28b")
-	}
-
-	if s.LoginButtonBorderColor == nil {
-		s.LoginButtonBorderColor = NewString("#2389D7")
-	}
-
-	if s.LoginButtonTextColor == nil {
-		s.LoginButtonTextColor = NewString("#ffffff")
-	}
-}
-
-type NativeAppSettings struct {
-	AppCustomURLSchemes    []string `access:"site_customization,write_restrictable,cloud_restrictable"` // telemetry: none
-	AppDownloadLink        *string  `access:"site_customization,write_restrictable,cloud_restrictable"`
-	AndroidAppDownloadLink *string  `access:"site_customization,write_restrictable,cloud_restrictable"`
-	IosAppDownloadLink     *string  `access:"site_customization,write_restrictable,cloud_restrictable"`
-}
-
-func (s *NativeAppSettings) SetDefaults() {
-	if s.AppDownloadLink == nil {
-		s.AppDownloadLink = NewString(NATIVEAPP_SETTINGS_DEFAULT_APP_DOWNLOAD_LINK)
-	}
-
-	if s.AndroidAppDownloadLink == nil {
-		s.AndroidAppDownloadLink = NewString(NATIVEAPP_SETTINGS_DEFAULT_ANDROID_APP_DOWNLOAD_LINK)
-	}
-
-	if s.IosAppDownloadLink == nil {
-		s.IosAppDownloadLink = NewString(NATIVEAPP_SETTINGS_DEFAULT_IOS_APP_DOWNLOAD_LINK)
-	}
-
-	if s.AppCustomURLSchemes == nil {
-		s.AppCustomURLSchemes = GetDefaultAppCustomURLSchemes()
-	}
-}
-
-type ElasticsearchSettings struct {
-	ConnectionUrl                 *string `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-	Username                      *string `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-	Password                      *string `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-	EnableIndexing                *bool   `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-	EnableSearching               *bool   `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-	EnableAutocomplete            *bool   `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-	Sniff                         *bool   `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-	PostIndexReplicas             *int    `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-	PostIndexShards               *int    `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-	ChannelIndexReplicas          *int    `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-	ChannelIndexShards            *int    `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-	UserIndexReplicas             *int    `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-	UserIndexShards               *int    `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-	AggregatePostsAfterDays       *int    `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"` // telemetry: none
-	PostsAggregatorJobStartTime   *string `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"` // telemetry: none
-	IndexPrefix                   *string `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-	LiveIndexingBatchSize         *int    `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-	BulkIndexingTimeWindowSeconds *int    `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-	RequestTimeoutSeconds         *int    `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-	SkipTLSVerification           *bool   `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-	Trace                         *string `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
-}
-
-func (s *ElasticsearchSettings) SetDefaults() {
-	if s.ConnectionUrl == nil {
-		s.ConnectionUrl = NewString(ELASTICSEARCH_SETTINGS_DEFAULT_CONNECTION_URL)
-	}
-
-	if s.Username == nil {
-		s.Username = NewString(ELASTICSEARCH_SETTINGS_DEFAULT_USERNAME)
-	}
-
-	if s.Password == nil {
-		s.Password = NewString(ELASTICSEARCH_SETTINGS_DEFAULT_PASSWORD)
-	}
-
-	if s.EnableIndexing == nil {
-		s.EnableIndexing = NewBool(false)
-	}
-
-	if s.EnableSearching == nil {
-		s.EnableSearching = NewBool(false)
-	}
-
-	if s.EnableAutocomplete == nil {
-		s.EnableAutocomplete = NewBool(false)
-	}
-
-	if s.Sniff == nil {
-		s.Sniff = NewBool(true)
-	}
-
-	if s.PostIndexReplicas == nil {
-		s.PostIndexReplicas = NewInt(ELASTICSEARCH_SETTINGS_DEFAULT_POST_INDEX_REPLICAS)
-	}
-
-	if s.PostIndexShards == nil {
-		s.PostIndexShards = NewInt(ELASTICSEARCH_SETTINGS_DEFAULT_POST_INDEX_SHARDS)
-	}
-
-	if s.ChannelIndexReplicas == nil {
-		s.ChannelIndexReplicas = NewInt(ELASTICSEARCH_SETTINGS_DEFAULT_CHANNEL_INDEX_REPLICAS)
-	}
-
-	if s.ChannelIndexShards == nil {
-		s.ChannelIndexShards = NewInt(ELASTICSEARCH_SETTINGS_DEFAULT_CHANNEL_INDEX_SHARDS)
-	}
-
-	if s.UserIndexReplicas == nil {
-		s.UserIndexReplicas = NewInt(ELASTICSEARCH_SETTINGS_DEFAULT_USER_INDEX_REPLICAS)
-	}
-
-	if s.UserIndexShards == nil {
-		s.UserIndexShards = NewInt(ELASTICSEARCH_SETTINGS_DEFAULT_USER_INDEX_SHARDS)
-	}
-
-	if s.AggregatePostsAfterDays == nil {
-		s.AggregatePostsAfterDays = NewInt(ELASTICSEARCH_SETTINGS_DEFAULT_AGGREGATE_POSTS_AFTER_DAYS)
-	}
-
-	if s.PostsAggregatorJobStartTime == nil {
-		s.PostsAggregatorJobStartTime = NewString(ELASTICSEARCH_SETTINGS_DEFAULT_POSTS_AGGREGATOR_JOB_START_TIME)
-	}
-
-	if s.IndexPrefix == nil {
-		s.IndexPrefix = NewString(ELASTICSEARCH_SETTINGS_DEFAULT_INDEX_PREFIX)
-	}
-
-	if s.LiveIndexingBatchSize == nil {
-		s.LiveIndexingBatchSize = NewInt(ELASTICSEARCH_SETTINGS_DEFAULT_LIVE_INDEXING_BATCH_SIZE)
-	}
-
-	if s.BulkIndexingTimeWindowSeconds == nil {
-		s.BulkIndexingTimeWindowSeconds = NewInt(ELASTICSEARCH_SETTINGS_DEFAULT_BULK_INDEXING_TIME_WINDOW_SECONDS)
-	}
-
-	if s.RequestTimeoutSeconds == nil {
-		s.RequestTimeoutSeconds = NewInt(ELASTICSEARCH_SETTINGS_DEFAULT_REQUEST_TIMEOUT_SECONDS)
-	}
-
-	if s.SkipTLSVerification == nil {
-		s.SkipTLSVerification = NewBool(false)
-	}
-
-	if s.Trace == nil {
-		s.Trace = NewString("")
-	}
-}
-
-type BleveSettings struct {
-	IndexDir                      *string `access:"experimental_bleve"` // telemetry: none
-	EnableIndexing                *bool   `access:"experimental_bleve"`
-	EnableSearching               *bool   `access:"experimental_bleve"`
-	EnableAutocomplete            *bool   `access:"experimental_bleve"`
-	BulkIndexingTimeWindowSeconds *int    `access:"experimental_bleve"`
-}
-
-func (bs *BleveSettings) SetDefaults() {
-	if bs.IndexDir == nil {
-		bs.IndexDir = NewString(BLEVE_SETTINGS_DEFAULT_INDEX_DIR)
-	}
-
-	if bs.EnableIndexing == nil {
-		bs.EnableIndexing = NewBool(false)
-	}
-
-	if bs.EnableSearching == nil {
-		bs.EnableSearching = NewBool(false)
-	}
-
-	if bs.EnableAutocomplete == nil {
-		bs.EnableAutocomplete = NewBool(false)
-	}
-
-	if bs.BulkIndexingTimeWindowSeconds == nil {
-		bs.BulkIndexingTimeWindowSeconds = NewInt(BLEVE_SETTINGS_DEFAULT_BULK_INDEXING_TIME_WINDOW_SECONDS)
-	}
-}
-
-type DataRetentionSettings struct {
-	EnableMessageDeletion *bool   `access:"compliance_data_retention_policy"`
-	EnableFileDeletion    *bool   `access:"compliance_data_retention_policy"`
-	MessageRetentionDays  *int    `access:"compliance_data_retention_policy"`
-	FileRetentionDays     *int    `access:"compliance_data_retention_policy"`
-	DeletionJobStartTime  *string `access:"compliance_data_retention_policy"`
-	BatchSize             *int    `access:"compliance_data_retention_policy"`
-}
-
-func (s *DataRetentionSettings) SetDefaults() {
-	if s.EnableMessageDeletion == nil {
-		s.EnableMessageDeletion = NewBool(false)
-	}
-
-	if s.EnableFileDeletion == nil {
-		s.EnableFileDeletion = NewBool(false)
-	}
-
-	if s.MessageRetentionDays == nil {
-		s.MessageRetentionDays = NewInt(DATA_RETENTION_SETTINGS_DEFAULT_MESSAGE_RETENTION_DAYS)
-	}
-
-	if s.FileRetentionDays == nil {
-		s.FileRetentionDays = NewInt(DATA_RETENTION_SETTINGS_DEFAULT_FILE_RETENTION_DAYS)
-	}
-
-	if s.DeletionJobStartTime == nil {
-		s.DeletionJobStartTime = NewString(DATA_RETENTION_SETTINGS_DEFAULT_DELETION_JOB_START_TIME)
-	}
-
-	if s.BatchSize == nil {
-		s.BatchSize = NewInt(DATA_RETENTION_SETTINGS_DEFAULT_BATCH_SIZE)
-	}
-}
-
-type JobSettings struct {
-	RunJobs      *bool `access:"write_restrictable,cloud_restrictable"`
-	RunScheduler *bool `access:"write_restrictable,cloud_restrictable"`
-}
-
-func (s *JobSettings) SetDefaults() {
-	if s.RunJobs == nil {
-		s.RunJobs = NewBool(true)
-	}
-
-	if s.RunScheduler == nil {
-		s.RunScheduler = NewBool(true)
-	}
-}
-
-type CloudSettings struct {
-	CWSUrl    *string `access:"write_restrictable"`
-	CWSAPIUrl *string `access:"write_restrictable"`
-}
-
-func (s *CloudSettings) SetDefaults() {
-	if s.CWSUrl == nil {
-		s.CWSUrl = NewString(CLOUD_SETTINGS_DEFAULT_CWS_URL)
-	}
-	if s.CWSAPIUrl == nil {
-		s.CWSAPIUrl = NewString(CLOUD_SETTINGS_DEFAULT_CWS_API_URL)
-	}
-}
-
-type PluginState struct {
-	Enable bool
-}
-
-type PluginSettings struct {
-	Enable                      *bool                             `access:"plugins,write_restrictable"`
-	EnableUploads               *bool                             `access:"plugins,write_restrictable,cloud_restrictable"`
-	AllowInsecureDownloadUrl    *bool                             `access:"plugins,write_restrictable,cloud_restrictable"`
-	EnableHealthCheck           *bool                             `access:"plugins,write_restrictable,cloud_restrictable"`
-	Directory                   *string                           `access:"plugins,write_restrictable,cloud_restrictable"` // telemetry: none
-	ClientDirectory             *string                           `access:"plugins,write_restrictable,cloud_restrictable"` // telemetry: none
-	Plugins                     map[string]map[string]interface{} `access:"plugins"`                                       // telemetry: none
-	PluginStates                map[string]*PluginState           `access:"plugins"`                                       // telemetry: none
-	EnableMarketplace           *bool                             `access:"plugins,write_restrictable,cloud_restrictable"`
-	EnableRemoteMarketplace     *bool                             `access:"plugins,write_restrictable,cloud_restrictable"`
-	AutomaticPrepackagedPlugins *bool                             `access:"plugins,write_restrictable,cloud_restrictable"`
-	RequirePluginSignature      *bool                             `access:"plugins,write_restrictable,cloud_restrictable"`
-	MarketplaceUrl              *string                           `access:"plugins,write_restrictable,cloud_restrictable"`
-	SignaturePublicKeyFiles     []string                          `access:"plugins,write_restrictable,cloud_restrictable"`
-	ChimeraOAuthProxyUrl        *string                           `access:"plugins,write_restrictable,cloud_restrictable"`
-}
-
-func (s *PluginSettings) SetDefaults(ls LogSettings) {
-	if s.Enable == nil {
-		s.Enable = NewBool(true)
-	}
-
-	if s.EnableUploads == nil {
-		s.EnableUploads = NewBool(false)
-	}
-
-	if s.AllowInsecureDownloadUrl == nil {
-		s.AllowInsecureDownloadUrl = NewBool(false)
-	}
-
-	if s.EnableHealthCheck == nil {
-		s.EnableHealthCheck = NewBool(true)
-	}
-
-	if s.Directory == nil || *s.Directory == "" {
-		s.Directory = NewString(PLUGIN_SETTINGS_DEFAULT_DIRECTORY)
-	}
-
-	if s.ClientDirectory == nil || *s.ClientDirectory == "" {
-		s.ClientDirectory = NewString(PLUGIN_SETTINGS_DEFAULT_CLIENT_DIRECTORY)
-	}
-
-	if s.Plugins == nil {
-		s.Plugins = make(map[string]map[string]interface{})
-	}
-
-	if s.PluginStates == nil {
-		s.PluginStates = make(map[string]*PluginState)
-	}
-
-	if s.PluginStates["com.mattermost.nps"] == nil {
-		// Enable the NPS plugin by default if diagnostics are enabled
-		s.PluginStates["com.mattermost.nps"] = &PluginState{Enable: ls.EnableDiagnostics == nil || *ls.EnableDiagnostics}
-	}
-
-	if s.PluginStates["com.mattermost.plugin-incident-management"] == nil && BuildEnterpriseReady == "true" {
-		// Enable the incident management plugin by default
-		s.PluginStates["com.mattermost.plugin-incident-management"] = &PluginState{Enable: true}
-	}
-
-	if s.PluginStates["com.mattermost.plugin-channel-export"] == nil && BuildEnterpriseReady == "true" {
-		// Enable the channel export plugin by default
-		s.PluginStates["com.mattermost.plugin-channel-export"] = &PluginState{Enable: true}
-	}
-
-	if s.EnableMarketplace == nil {
-		s.EnableMarketplace = NewBool(PLUGIN_SETTINGS_DEFAULT_ENABLE_MARKETPLACE)
-	}
-
-	if s.EnableRemoteMarketplace == nil {
-		s.EnableRemoteMarketplace = NewBool(true)
-	}
-
-	if s.AutomaticPrepackagedPlugins == nil {
-		s.AutomaticPrepackagedPlugins = NewBool(true)
-	}
-
-	if s.MarketplaceUrl == nil || *s.MarketplaceUrl == "" || *s.MarketplaceUrl == PLUGIN_SETTINGS_OLD_MARKETPLACE_URL {
-		s.MarketplaceUrl = NewString(PLUGIN_SETTINGS_DEFAULT_MARKETPLACE_URL)
-	}
-
-	if s.RequirePluginSignature == nil {
-		s.RequirePluginSignature = NewBool(false)
-	}
-
-	if s.SignaturePublicKeyFiles == nil {
-		s.SignaturePublicKeyFiles = []string{}
-	}
-
-	if s.ChimeraOAuthProxyUrl == nil {
-		s.ChimeraOAuthProxyUrl = NewString("")
-	}
-}
-
-type GlobalRelayMessageExportSettings struct {
-	CustomerType      *string `access:"compliance_compliance_export"` // must be either A9 or A10, dictates SMTP server url
-	SmtpUsername      *string `access:"compliance_compliance_export"`
-	SmtpPassword      *string `access:"compliance_compliance_export"`
-	EmailAddress      *string `access:"compliance_compliance_export"` // the address to send messages to
-	SMTPServerTimeout *int    `access:"compliance_compliance_export"`
-}
-
-func (s *GlobalRelayMessageExportSettings) SetDefaults() {
-	if s.CustomerType == nil {
-		s.CustomerType = NewString(GLOBALRELAY_CUSTOMER_TYPE_A9)
-	}
-	if s.SmtpUsername == nil {
-		s.SmtpUsername = NewString("")
-	}
-	if s.SmtpPassword == nil {
-		s.SmtpPassword = NewString("")
-	}
-	if s.EmailAddress == nil {
-		s.EmailAddress = NewString("")
-	}
-	if s.SMTPServerTimeout == nil || *s.SMTPServerTimeout == 0 {
-		s.SMTPServerTimeout = NewInt(1800)
-	}
-}
-
-type MessageExportSettings struct {
-	EnableExport          *bool   `access:"compliance_compliance_export"`
-	ExportFormat          *string `access:"compliance_compliance_export"`
-	DailyRunTime          *string `access:"compliance_compliance_export"`
-	ExportFromTimestamp   *int64  `access:"compliance_compliance_export"`
-	BatchSize             *int    `access:"compliance_compliance_export"`
-	DownloadExportResults *bool   `access:"compliance_compliance_export"`
-
-	// formatter-specific settings - these are only expected to be non-nil if ExportFormat is set to the associated format
-	GlobalRelaySettings *GlobalRelayMessageExportSettings `access:"compliance_compliance_export"`
-}
-
-func (s *MessageExportSettings) SetDefaults() {
-	if s.EnableExport == nil {
-		s.EnableExport = NewBool(false)
-	}
-
-	if s.DownloadExportResults == nil {
-		s.DownloadExportResults = NewBool(false)
-	}
-
-	if s.ExportFormat == nil {
-		s.ExportFormat = NewString(COMPLIANCE_EXPORT_TYPE_ACTIANCE)
-	}
-
-	if s.DailyRunTime == nil {
-		s.DailyRunTime = NewString("01:00")
-	}
-
-	if s.ExportFromTimestamp == nil {
-		s.ExportFromTimestamp = NewInt64(0)
-	}
-
-	if s.BatchSize == nil {
-		s.BatchSize = NewInt(10000)
-	}
-
-	if s.GlobalRelaySettings == nil {
-		s.GlobalRelaySettings = &GlobalRelayMessageExportSettings{}
-	}
-	s.GlobalRelaySettings.SetDefaults()
-}
-
-type DisplaySettings struct {
-	CustomUrlSchemes     []string `access:"site_customization"`
-	ExperimentalTimezone *bool    `access:"experimental_features"`
-}
-
-func (s *DisplaySettings) SetDefaults() {
-	if s.CustomUrlSchemes == nil {
-		customUrlSchemes := []string{}
-		s.CustomUrlSchemes = customUrlSchemes
-	}
-
-	if s.ExperimentalTimezone == nil {
-		s.ExperimentalTimezone = NewBool(true)
-	}
-}
-
-type GuestAccountsSettings struct {
-	Enable                           *bool   `access:"authentication_guest_access"`
-	AllowEmailAccounts               *bool   `access:"authentication_guest_access"`
-	EnforceMultifactorAuthentication *bool   `access:"authentication_guest_access"`
-	RestrictCreationToDomains        *string `access:"authentication_guest_access"`
-}
-
-func (s *GuestAccountsSettings) SetDefaults() {
-	if s.Enable == nil {
-		s.Enable = NewBool(false)
-	}
-
-	if s.AllowEmailAccounts == nil {
-		s.AllowEmailAccounts = NewBool(true)
-	}
-
-	if s.EnforceMultifactorAuthentication == nil {
-		s.EnforceMultifactorAuthentication = NewBool(false)
-	}
-
-	if s.RestrictCreationToDomains == nil {
-		s.RestrictCreationToDomains = NewString("")
-	}
-}
-
-type ImageProxySettings struct {
-	Enable                  *bool   `access:"environment_image_proxy"`
-	ImageProxyType          *string `access:"environment_image_proxy"`
-	RemoteImageProxyURL     *string `access:"environment_image_proxy"`
-	RemoteImageProxyOptions *string `access:"environment_image_proxy"`
-}
-
-func (s *ImageProxySettings) SetDefaults(ss ServiceSettings) {
-	if s.Enable == nil {
-		if ss.DEPRECATED_DO_NOT_USE_ImageProxyType == nil || *ss.DEPRECATED_DO_NOT_USE_ImageProxyType == "" {
-			s.Enable = NewBool(false)
-		} else {
-			s.Enable = NewBool(true)
-		}
-	}
-
-	if s.ImageProxyType == nil {
-		if ss.DEPRECATED_DO_NOT_USE_ImageProxyType == nil || *ss.DEPRECATED_DO_NOT_USE_ImageProxyType == "" {
-			s.ImageProxyType = NewString(IMAGE_PROXY_TYPE_LOCAL)
-		} else {
-			s.ImageProxyType = ss.DEPRECATED_DO_NOT_USE_ImageProxyType
-		}
-	}
-
-	if s.RemoteImageProxyURL == nil {
-		if ss.DEPRECATED_DO_NOT_USE_ImageProxyURL == nil {
-			s.RemoteImageProxyURL = NewString("")
-		} else {
-			s.RemoteImageProxyURL = ss.DEPRECATED_DO_NOT_USE_ImageProxyURL
-		}
-	}
-
-	if s.RemoteImageProxyOptions == nil {
-		if ss.DEPRECATED_DO_NOT_USE_ImageProxyOptions == nil {
-			s.RemoteImageProxyOptions = NewString("")
-		} else {
-			s.RemoteImageProxyOptions = ss.DEPRECATED_DO_NOT_USE_ImageProxyOptions
-		}
-	}
-}
-
-// ImportSettings defines configuration settings for file imports.
-type ImportSettings struct {
-	// The directory where to store the imported files.
-	Directory *string
-	// The number of days to retain the imported files before deleting them.
-	RetentionDays *int
-}
-
-func (s *ImportSettings) isValid() *AppError {
-	if *s.Directory == "" {
-		return NewAppError("Config.IsValid", "model.config.is_valid.import.directory.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.RetentionDays <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.import.retention_days_too_low.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-// SetDefaults applies the default settings to the struct.
-func (s *ImportSettings) SetDefaults() {
-	if s.Directory == nil || *s.Directory == "" {
-		s.Directory = NewString(IMPORT_SETTINGS_DEFAULT_DIRECTORY)
-	}
-
-	if s.RetentionDays == nil {
-		s.RetentionDays = NewInt(IMPORT_SETTINGS_DEFAULT_RETENTION_DAYS)
-	}
-}
-
-// ExportSettings defines configuration settings for file exports.
-type ExportSettings struct {
-	// The directory where to store the exported files.
-	Directory *string // telemetry: none
-	// The number of days to retain the exported files before deleting them.
-	RetentionDays *int
-}
-
-func (s *ExportSettings) isValid() *AppError {
-	if *s.Directory == "" {
-		return NewAppError("Config.IsValid", "model.config.is_valid.export.directory.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.RetentionDays <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.export.retention_days_too_low.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-// SetDefaults applies the default settings to the struct.
-func (s *ExportSettings) SetDefaults() {
-	if s.Directory == nil || *s.Directory == "" {
-		s.Directory = NewString(EXPORT_SETTINGS_DEFAULT_DIRECTORY)
-	}
-
-	if s.RetentionDays == nil {
-		s.RetentionDays = NewInt(EXPORT_SETTINGS_DEFAULT_RETENTION_DAYS)
-	}
-}
-
-type ConfigFunc func() *Config
-
-const ConfigAccessTagType = "access"
-const ConfigAccessTagWriteRestrictable = "write_restrictable"
-const ConfigAccessTagCloudRestrictable = "cloud_restrictable"
-
-// Allows read access if any PERMISSION_SYSCONSOLE_READ_* is allowed
-const ConfigAccessTagAnySysConsoleRead = "*_read"
-
-// Config fields support the 'access' tag with the following values corresponding to the suffix of the associated
-// PERMISSION_SYSCONSOLE_*_* permission Id: 'about', 'reporting', 'user_management_users',
-// 'user_management_groups', 'user_management_teams', 'user_management_channels',
-// 'user_management_permissions', 'environment_web_server', 'environment_database', 'environment_elasticsearch',
-// 'environment_file_storage', 'environment_image_proxy', 'environment_smtp', 'environment_push_notification_server',
-// 'environment_high_availability', 'environment_rate_limiting', 'environment_logging', 'environment_session_lengths',
-// 'environment_performance_monitoring', 'environment_developer', 'site', 'authentication', 'plugins',
-// 'integrations', 'compliance', 'plugins', and 'experimental'. They grant read and/or write access to the config field
-// to roles without PERMISSION_MANAGE_SYSTEM.
-//
-// The 'access' tag '*_read' checks for any SYSCONSOLE read permission and grants access if any read permission is allowed.
-//
-// By default config values can be written with PERMISSION_MANAGE_SYSTEM, but if ExperimentalSettings.RestrictSystemAdmin is true
-// and the access tag contains the value 'write_restrictable', then even PERMISSION_MANAGE_SYSTEM does not grant write access.
-//
-// PERMISSION_MANAGE_SYSTEM always grants read access.
-//
-// Config values with the access tag 'cloud_restrictable' mean that are marked to be filtered when it's used in a cloud licensed
-// environment with ExperimentalSettings.RestrictedSystemAdmin set to true.
-//
-// Example:
-//  type HairSettings struct {
-//      // Colour is writeable with either PERMISSION_SYSCONSOLE_WRITE_REPORTING or PERMISSION_SYSCONSOLE_WRITE_USER_MANAGEMENT_GROUPS.
-//      // It is readable by PERMISSION_SYSCONSOLE_READ_REPORTING and PERMISSION_SYSCONSOLE_READ_USER_MANAGEMENT_GROUPS permissions.
-//      // PERMISSION_MANAGE_SYSTEM grants read and write access.
-//      Colour string `access:"reporting,user_management_groups"`
-//
-//
-//      // Length is only readable and writable via PERMISSION_MANAGE_SYSTEM.
-//      Length string
-//
-//      // Product is only writeable by PERMISSION_MANAGE_SYSTEM if ExperimentalSettings.RestrictSystemAdmin is false.
-//      // PERMISSION_MANAGE_SYSTEM can always read the value.
-//      Product bool `access:write_restrictable`
-//  }
-type Config struct {
-	ServiceSettings           ServiceSettings
-	TeamSettings              TeamSettings
-	ClientRequirements        ClientRequirements
-	SqlSettings               SqlSettings
-	LogSettings               LogSettings
-	ExperimentalAuditSettings ExperimentalAuditSettings
-	NotificationLogSettings   NotificationLogSettings
-	PasswordSettings          PasswordSettings
-	FileSettings              FileSettings
-	EmailSettings             EmailSettings
-	RateLimitSettings         RateLimitSettings
-	PrivacySettings           PrivacySettings
-	SupportSettings           SupportSettings
-	AnnouncementSettings      AnnouncementSettings
-	ThemeSettings             ThemeSettings
-	GitLabSettings            SSOSettings
-	GoogleSettings            SSOSettings
-	Office365Settings         Office365Settings
-	OpenIdSettings            SSOSettings
-	LdapSettings              LdapSettings
-	ComplianceSettings        ComplianceSettings
-	LocalizationSettings      LocalizationSettings
-	SamlSettings              SamlSettings
-	NativeAppSettings         NativeAppSettings
-	ClusterSettings           ClusterSettings
-	MetricsSettings           MetricsSettings
-	ExperimentalSettings      ExperimentalSettings
-	AnalyticsSettings         AnalyticsSettings
-	ElasticsearchSettings     ElasticsearchSettings
-	BleveSettings             BleveSettings
-	DataRetentionSettings     DataRetentionSettings
-	MessageExportSettings     MessageExportSettings
-	JobSettings               JobSettings // telemetry: none
-	PluginSettings            PluginSettings
-	DisplaySettings           DisplaySettings
-	GuestAccountsSettings     GuestAccountsSettings
-	ImageProxySettings        ImageProxySettings
-	CloudSettings             CloudSettings  // telemetry: none
-	FeatureFlags              *FeatureFlags  `access:"*_read" json:",omitempty"`
-	ImportSettings            ImportSettings // telemetry: none
-	ExportSettings            ExportSettings
-}
-
-func (o *Config) Clone() *Config {
-	var ret Config
-	if err := json.Unmarshal([]byte(o.ToJson()), &ret); err != nil {
-		panic(err)
-	}
-	return &ret
-}
-
-func (o *Config) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func (o *Config) ToJsonFiltered(tagType, tagValue string) string {
-	filteredConfigMap := structToMapFilteredByTag(*o, tagType, tagValue)
-	for key, value := range filteredConfigMap {
-		v, ok := value.(map[string]interface{})
-		if ok && len(v) == 0 {
-			delete(filteredConfigMap, key)
-		}
-	}
-	b, _ := json.Marshal(filteredConfigMap)
-	return string(b)
-}
-
-func (o *Config) GetSSOService(service string) *SSOSettings {
-	switch service {
-	case SERVICE_GITLAB:
-		return &o.GitLabSettings
-	case SERVICE_GOOGLE:
-		return &o.GoogleSettings
-	case SERVICE_OFFICE365:
-		return o.Office365Settings.SSOSettings()
-	case SERVICE_OPENID:
-		return &o.OpenIdSettings
-	}
-
-	return nil
-}
-
-func ConfigFromJson(data io.Reader) *Config {
-	var o *Config
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-// isUpdate detects a pre-existing config based on whether SiteURL has been changed
-func (o *Config) isUpdate() bool {
-	return o.ServiceSettings.SiteURL != nil
-}
-
-func (o *Config) SetDefaults() {
-	isUpdate := o.isUpdate()
-
-	o.LdapSettings.SetDefaults()
-	o.SamlSettings.SetDefaults()
-
-	if o.TeamSettings.TeammateNameDisplay == nil {
-		o.TeamSettings.TeammateNameDisplay = NewString(SHOW_USERNAME)
-
-		if *o.SamlSettings.Enable || *o.LdapSettings.Enable {
-			*o.TeamSettings.TeammateNameDisplay = SHOW_FULLNAME
-		}
-	}
-
-	o.SqlSettings.SetDefaults(isUpdate)
-	o.FileSettings.SetDefaults(isUpdate)
-	o.EmailSettings.SetDefaults(isUpdate)
-	o.PrivacySettings.setDefaults()
-	o.Office365Settings.setDefaults()
-	o.Office365Settings.setDefaults()
-	o.GitLabSettings.setDefaults("", "", "", "", "")
-	o.GoogleSettings.setDefaults(GOOGLE_SETTINGS_DEFAULT_SCOPE, GOOGLE_SETTINGS_DEFAULT_AUTH_ENDPOINT, GOOGLE_SETTINGS_DEFAULT_TOKEN_ENDPOINT, GOOGLE_SETTINGS_DEFAULT_USER_API_ENDPOINT, "")
-	o.OpenIdSettings.setDefaults(OPENID_SETTINGS_DEFAULT_SCOPE, "", "", "", "#145DBF")
-	o.ServiceSettings.SetDefaults(isUpdate)
-	o.PasswordSettings.SetDefaults()
-	o.TeamSettings.SetDefaults()
-	o.MetricsSettings.SetDefaults()
-	o.ExperimentalSettings.SetDefaults()
-	o.SupportSettings.SetDefaults()
-	o.AnnouncementSettings.SetDefaults()
-	o.ThemeSettings.SetDefaults()
-	o.ClusterSettings.SetDefaults()
-	o.PluginSettings.SetDefaults(o.LogSettings)
-	o.AnalyticsSettings.SetDefaults()
-	o.ComplianceSettings.SetDefaults()
-	o.LocalizationSettings.SetDefaults()
-	o.ElasticsearchSettings.SetDefaults()
-	o.BleveSettings.SetDefaults()
-	o.NativeAppSettings.SetDefaults()
-	o.DataRetentionSettings.SetDefaults()
-	o.RateLimitSettings.SetDefaults()
-	o.LogSettings.SetDefaults()
-	o.ExperimentalAuditSettings.SetDefaults()
-	o.NotificationLogSettings.SetDefaults()
-	o.JobSettings.SetDefaults()
-	o.MessageExportSettings.SetDefaults()
-	o.DisplaySettings.SetDefaults()
-	o.GuestAccountsSettings.SetDefaults()
-	o.ImageProxySettings.SetDefaults(o.ServiceSettings)
-	o.CloudSettings.SetDefaults()
-	if o.FeatureFlags == nil {
-		o.FeatureFlags = &FeatureFlags{}
-		o.FeatureFlags.SetDefaults()
-	}
-	o.ImportSettings.SetDefaults()
-	o.ExportSettings.SetDefaults()
-}
-
-func (o *Config) IsValid() *AppError {
-	if *o.ServiceSettings.SiteURL == "" && *o.EmailSettings.EnableEmailBatching {
-		return NewAppError("Config.IsValid", "model.config.is_valid.site_url_email_batching.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *o.ClusterSettings.Enable && *o.EmailSettings.EnableEmailBatching {
-		return NewAppError("Config.IsValid", "model.config.is_valid.cluster_email_batching.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *o.ServiceSettings.SiteURL == "" && *o.ServiceSettings.AllowCookiesForSubdomains {
-		return NewAppError("Config.IsValid", "model.config.is_valid.allow_cookies_for_subdomains.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if err := o.TeamSettings.isValid(); err != nil {
-		return err
-	}
-
-	if err := o.SqlSettings.isValid(); err != nil {
-		return err
-	}
-
-	if err := o.FileSettings.isValid(); err != nil {
-		return err
-	}
-
-	if err := o.EmailSettings.isValid(); err != nil {
-		return err
-	}
-
-	if err := o.LdapSettings.isValid(); err != nil {
-		return err
-	}
-
-	if err := o.SamlSettings.isValid(); err != nil {
-		return err
-	}
-
-	if *o.PasswordSettings.MinimumLength < PASSWORD_MINIMUM_LENGTH || *o.PasswordSettings.MinimumLength > PASSWORD_MAXIMUM_LENGTH {
-		return NewAppError("Config.IsValid", "model.config.is_valid.password_length.app_error", map[string]interface{}{"MinLength": PASSWORD_MINIMUM_LENGTH, "MaxLength": PASSWORD_MAXIMUM_LENGTH}, "", http.StatusBadRequest)
-	}
-
-	if err := o.RateLimitSettings.isValid(); err != nil {
-		return err
-	}
-
-	if err := o.ServiceSettings.isValid(); err != nil {
-		return err
-	}
-
-	if err := o.ElasticsearchSettings.isValid(); err != nil {
-		return err
-	}
-
-	if err := o.BleveSettings.isValid(); err != nil {
-		return err
-	}
-
-	if err := o.DataRetentionSettings.isValid(); err != nil {
-		return err
-	}
-
-	if err := o.LocalizationSettings.isValid(); err != nil {
-		return err
-	}
-
-	if err := o.MessageExportSettings.isValid(); err != nil {
-		return err
-	}
-
-	if err := o.DisplaySettings.isValid(); err != nil {
-		return err
-	}
-
-	if err := o.ImageProxySettings.isValid(); err != nil {
-		return err
-	}
-
-	if err := o.ImportSettings.isValid(); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (s *TeamSettings) isValid() *AppError {
-	if *s.MaxUsersPerTeam <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.max_users.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.MaxChannelsPerTeam <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.max_channels.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.MaxNotificationsPerChannel <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.max_notify_per_channel.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !(*s.RestrictDirectMessage == DIRECT_MESSAGE_ANY || *s.RestrictDirectMessage == DIRECT_MESSAGE_TEAM) {
-		return NewAppError("Config.IsValid", "model.config.is_valid.restrict_direct_message.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !(*s.TeammateNameDisplay == SHOW_FULLNAME || *s.TeammateNameDisplay == SHOW_NICKNAME_FULLNAME || *s.TeammateNameDisplay == SHOW_USERNAME) {
-		return NewAppError("Config.IsValid", "model.config.is_valid.teammate_name_display.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(*s.SiteName) > SITENAME_MAX_LENGTH {
-		return NewAppError("Config.IsValid", "model.config.is_valid.sitename_length.app_error", map[string]interface{}{"MaxLength": SITENAME_MAX_LENGTH}, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (s *SqlSettings) isValid() *AppError {
-	if *s.AtRestEncryptKey != "" && len(*s.AtRestEncryptKey) < 32 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.encrypt_sql.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !(*s.DriverName == DATABASE_DRIVER_MYSQL || *s.DriverName == DATABASE_DRIVER_POSTGRES) {
-		return NewAppError("Config.IsValid", "model.config.is_valid.sql_driver.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.MaxIdleConns <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.sql_idle.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.ConnMaxLifetimeMilliseconds < 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.sql_conn_max_lifetime_milliseconds.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.ConnMaxIdleTimeMilliseconds < 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.sql_conn_max_idle_time_milliseconds.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.QueryTimeout <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.sql_query_timeout.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.DataSource == "" {
-		return NewAppError("Config.IsValid", "model.config.is_valid.sql_data_src.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.MaxOpenConns <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.sql_max_conn.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (s *FileSettings) isValid() *AppError {
-	if *s.MaxFileSize <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.max_file_size.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !(*s.DriverName == IMAGE_DRIVER_LOCAL || *s.DriverName == IMAGE_DRIVER_S3) {
-		return NewAppError("Config.IsValid", "model.config.is_valid.file_driver.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.PublicLinkSalt != "" && len(*s.PublicLinkSalt) < 32 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.file_salt.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.Directory == "" {
-		return NewAppError("Config.IsValid", "model.config.is_valid.directory.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (s *EmailSettings) isValid() *AppError {
-	if !(*s.ConnectionSecurity == CONN_SECURITY_NONE || *s.ConnectionSecurity == CONN_SECURITY_TLS || *s.ConnectionSecurity == CONN_SECURITY_STARTTLS || *s.ConnectionSecurity == CONN_SECURITY_PLAIN) {
-		return NewAppError("Config.IsValid", "model.config.is_valid.email_security.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.EmailBatchingBufferSize <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.email_batching_buffer_size.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.EmailBatchingInterval < 30 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.email_batching_interval.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !(*s.EmailNotificationContentsType == EMAIL_NOTIFICATION_CONTENTS_FULL || *s.EmailNotificationContentsType == EMAIL_NOTIFICATION_CONTENTS_GENERIC) {
-		return NewAppError("Config.IsValid", "model.config.is_valid.email_notification_contents_type.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (s *RateLimitSettings) isValid() *AppError {
-	if *s.MemoryStoreSize <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.rate_mem.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.PerSec <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.rate_sec.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.MaxBurst <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.max_burst.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (s *LdapSettings) isValid() *AppError {
-	if !(*s.ConnectionSecurity == CONN_SECURITY_NONE || *s.ConnectionSecurity == CONN_SECURITY_TLS || *s.ConnectionSecurity == CONN_SECURITY_STARTTLS) {
-		return NewAppError("Config.IsValid", "model.config.is_valid.ldap_security.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.SyncIntervalMinutes <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.ldap_sync_interval.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.MaxPageSize < 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.ldap_max_page_size.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.Enable {
-		if *s.LdapServer == "" {
-			return NewAppError("Config.IsValid", "model.config.is_valid.ldap_server", nil, "", http.StatusBadRequest)
-		}
-
-		if *s.BaseDN == "" {
-			return NewAppError("Config.IsValid", "model.config.is_valid.ldap_basedn", nil, "", http.StatusBadRequest)
-		}
-
-		if *s.EmailAttribute == "" {
-			return NewAppError("Config.IsValid", "model.config.is_valid.ldap_email", nil, "", http.StatusBadRequest)
-		}
-
-		if *s.UsernameAttribute == "" {
-			return NewAppError("Config.IsValid", "model.config.is_valid.ldap_username", nil, "", http.StatusBadRequest)
-		}
-
-		if *s.IdAttribute == "" {
-			return NewAppError("Config.IsValid", "model.config.is_valid.ldap_id", nil, "", http.StatusBadRequest)
-		}
-
-		if *s.LoginIdAttribute == "" {
-			return NewAppError("Config.IsValid", "model.config.is_valid.ldap_login_id", nil, "", http.StatusBadRequest)
-		}
-
-		if *s.UserFilter != "" {
-			if _, err := ldap.CompileFilter(*s.UserFilter); err != nil {
-				return NewAppError("ValidateFilter", "ent.ldap.validate_filter.app_error", nil, err.Error(), http.StatusBadRequest)
-			}
-		}
-
-		if *s.GuestFilter != "" {
-			if _, err := ldap.CompileFilter(*s.GuestFilter); err != nil {
-				return NewAppError("LdapSettings.isValid", "ent.ldap.validate_guest_filter.app_error", nil, err.Error(), http.StatusBadRequest)
-			}
-		}
-
-		if *s.AdminFilter != "" {
-			if _, err := ldap.CompileFilter(*s.AdminFilter); err != nil {
-				return NewAppError("LdapSettings.isValid", "ent.ldap.validate_admin_filter.app_error", nil, err.Error(), http.StatusBadRequest)
-			}
-		}
-	}
-
-	return nil
-}
-
-func (s *SamlSettings) isValid() *AppError {
-	if *s.Enable {
-		if *s.IdpUrl == "" || !IsValidHttpUrl(*s.IdpUrl) {
-			return NewAppError("Config.IsValid", "model.config.is_valid.saml_idp_url.app_error", nil, "", http.StatusBadRequest)
-		}
-
-		if *s.IdpDescriptorUrl == "" || !IsValidHttpUrl(*s.IdpDescriptorUrl) {
-			return NewAppError("Config.IsValid", "model.config.is_valid.saml_idp_descriptor_url.app_error", nil, "", http.StatusBadRequest)
-		}
-
-		if *s.IdpCertificateFile == "" {
-			return NewAppError("Config.IsValid", "model.config.is_valid.saml_idp_cert.app_error", nil, "", http.StatusBadRequest)
-		}
-
-		if *s.EmailAttribute == "" {
-			return NewAppError("Config.IsValid", "model.config.is_valid.saml_email_attribute.app_error", nil, "", http.StatusBadRequest)
-		}
-
-		if *s.UsernameAttribute == "" {
-			return NewAppError("Config.IsValid", "model.config.is_valid.saml_username_attribute.app_error", nil, "", http.StatusBadRequest)
-		}
-
-		if *s.ServiceProviderIdentifier == "" {
-			return NewAppError("Config.IsValid", "model.config.is_valid.saml_spidentifier_attribute.app_error", nil, "", http.StatusBadRequest)
-		}
-
-		if *s.Verify {
-			if *s.AssertionConsumerServiceURL == "" || !IsValidHttpUrl(*s.AssertionConsumerServiceURL) {
-				return NewAppError("Config.IsValid", "model.config.is_valid.saml_assertion_consumer_service_url.app_error", nil, "", http.StatusBadRequest)
-			}
-		}
-
-		if *s.Encrypt {
-			if *s.PrivateKeyFile == "" {
-				return NewAppError("Config.IsValid", "model.config.is_valid.saml_private_key.app_error", nil, "", http.StatusBadRequest)
-			}
-
-			if *s.PublicCertificateFile == "" {
-				return NewAppError("Config.IsValid", "model.config.is_valid.saml_public_cert.app_error", nil, "", http.StatusBadRequest)
-			}
-		}
-
-		if *s.EmailAttribute == "" {
-			return NewAppError("Config.IsValid", "model.config.is_valid.saml_email_attribute.app_error", nil, "", http.StatusBadRequest)
-		}
-
-		if !(*s.SignatureAlgorithm == SAML_SETTINGS_SIGNATURE_ALGORITHM_SHA1 || *s.SignatureAlgorithm == SAML_SETTINGS_SIGNATURE_ALGORITHM_SHA256 || *s.SignatureAlgorithm == SAML_SETTINGS_SIGNATURE_ALGORITHM_SHA512) {
-			return NewAppError("Config.IsValid", "model.config.is_valid.saml_signature_algorithm.app_error", nil, "", http.StatusBadRequest)
-		}
-		if !(*s.CanonicalAlgorithm == SAML_SETTINGS_CANONICAL_ALGORITHM_C14N || *s.CanonicalAlgorithm == SAML_SETTINGS_CANONICAL_ALGORITHM_C14N11) {
-			return NewAppError("Config.IsValid", "model.config.is_valid.saml_canonical_algorithm.app_error", nil, "", http.StatusBadRequest)
-		}
-
-		if *s.GuestAttribute != "" {
-			if !(strings.Contains(*s.GuestAttribute, "=")) {
-				return NewAppError("Config.IsValid", "model.config.is_valid.saml_guest_attribute.app_error", nil, "", http.StatusBadRequest)
-			}
-			if len(strings.Split(*s.GuestAttribute, "=")) != 2 {
-				return NewAppError("Config.IsValid", "model.config.is_valid.saml_guest_attribute.app_error", nil, "", http.StatusBadRequest)
-			}
-		}
-
-		if *s.AdminAttribute != "" {
-			if !(strings.Contains(*s.AdminAttribute, "=")) {
-				return NewAppError("Config.IsValid", "model.config.is_valid.saml_admin_attribute.app_error", nil, "", http.StatusBadRequest)
-			}
-			if len(strings.Split(*s.AdminAttribute, "=")) != 2 {
-				return NewAppError("Config.IsValid", "model.config.is_valid.saml_admin_attribute.app_error", nil, "", http.StatusBadRequest)
-			}
-		}
-	}
-
-	return nil
-}
-
-func (s *ServiceSettings) isValid() *AppError {
-	if !(*s.ConnectionSecurity == CONN_SECURITY_NONE || *s.ConnectionSecurity == CONN_SECURITY_TLS) {
-		return NewAppError("Config.IsValid", "model.config.is_valid.webserver_security.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.ConnectionSecurity == CONN_SECURITY_TLS && !*s.UseLetsEncrypt {
-		appErr := NewAppError("Config.IsValid", "model.config.is_valid.tls_cert_file_missing.app_error", nil, "", http.StatusBadRequest)
-
-		if *s.TLSCertFile == "" {
-			return appErr
-		} else if _, err := os.Stat(*s.TLSCertFile); os.IsNotExist(err) {
-			return appErr
-		}
-
-		appErr = NewAppError("Config.IsValid", "model.config.is_valid.tls_key_file_missing.app_error", nil, "", http.StatusBadRequest)
-
-		if *s.TLSKeyFile == "" {
-			return appErr
-		} else if _, err := os.Stat(*s.TLSKeyFile); os.IsNotExist(err) {
-			return appErr
-		}
-	}
-
-	if len(s.TLSOverwriteCiphers) > 0 {
-		for _, cipher := range s.TLSOverwriteCiphers {
-			if _, ok := ServerTLSSupportedCiphers[cipher]; !ok {
-				return NewAppError("Config.IsValid", "model.config.is_valid.tls_overwrite_cipher.app_error", map[string]interface{}{"name": cipher}, "", http.StatusBadRequest)
-			}
-		}
-	}
-
-	if *s.ReadTimeout <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.read_timeout.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.WriteTimeout <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.write_timeout.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.TimeBetweenUserTypingUpdatesMilliseconds < 1000 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.time_between_user_typing.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.MaximumLoginAttempts <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.login_attempts.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.SiteURL != "" {
-		if _, err := url.ParseRequestURI(*s.SiteURL); err != nil {
-			return NewAppError("Config.IsValid", "model.config.is_valid.site_url.app_error", nil, "", http.StatusBadRequest)
-		}
-	}
-
-	if *s.WebsocketURL != "" {
-		if _, err := url.ParseRequestURI(*s.WebsocketURL); err != nil {
-			return NewAppError("Config.IsValid", "model.config.is_valid.websocket_url.app_error", nil, "", http.StatusBadRequest)
-		}
-	}
-
-	host, port, _ := net.SplitHostPort(*s.ListenAddress)
-	var isValidHost bool
-	if host == "" {
-		isValidHost = true
-	} else {
-		isValidHost = (net.ParseIP(host) != nil) || IsDomainName(host)
-	}
-	portInt, err := strconv.Atoi(port)
-	if err != nil || !isValidHost || portInt < 0 || portInt > math.MaxUint16 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.listen_address.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.ExperimentalGroupUnreadChannels != GROUP_UNREAD_CHANNELS_DISABLED &&
-		*s.ExperimentalGroupUnreadChannels != GROUP_UNREAD_CHANNELS_DEFAULT_ON &&
-		*s.ExperimentalGroupUnreadChannels != GROUP_UNREAD_CHANNELS_DEFAULT_OFF {
-		return NewAppError("Config.IsValid", "model.config.is_valid.group_unread_channels.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.CollapsedThreads != COLLAPSED_THREADS_DISABLED && !*s.ThreadAutoFollow {
-		return NewAppError("Config.IsValid", "model.config.is_valid.collapsed_threads.autofollow.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.CollapsedThreads != COLLAPSED_THREADS_DISABLED &&
-		*s.CollapsedThreads != COLLAPSED_THREADS_DEFAULT_ON &&
-		*s.CollapsedThreads != COLLAPSED_THREADS_DEFAULT_OFF {
-		return NewAppError("Config.IsValid", "model.config.is_valid.collapsed_threads.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (s *ElasticsearchSettings) isValid() *AppError {
-	if *s.EnableIndexing {
-		if *s.ConnectionUrl == "" {
-			return NewAppError("Config.IsValid", "model.config.is_valid.elastic_search.connection_url.app_error", nil, "", http.StatusBadRequest)
-		}
-	}
-
-	if *s.EnableSearching && !*s.EnableIndexing {
-		return NewAppError("Config.IsValid", "model.config.is_valid.elastic_search.enable_searching.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.EnableAutocomplete && !*s.EnableIndexing {
-		return NewAppError("Config.IsValid", "model.config.is_valid.elastic_search.enable_autocomplete.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.AggregatePostsAfterDays < 1 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if _, err := time.Parse("15:04", *s.PostsAggregatorJobStartTime); err != nil {
-		return NewAppError("Config.IsValid", "model.config.is_valid.elastic_search.posts_aggregator_job_start_time.app_error", nil, err.Error(), http.StatusBadRequest)
-	}
-
-	if *s.LiveIndexingBatchSize < 1 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.elastic_search.live_indexing_batch_size.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.BulkIndexingTimeWindowSeconds < 1 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.elastic_search.bulk_indexing_time_window_seconds.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.RequestTimeoutSeconds < 1 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.elastic_search.request_timeout_seconds.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (bs *BleveSettings) isValid() *AppError {
-	if *bs.EnableIndexing {
-		if *bs.IndexDir == "" {
-			return NewAppError("Config.IsValid", "model.config.is_valid.bleve_search.filename.app_error", nil, "", http.StatusBadRequest)
-		}
-	} else {
-		if *bs.EnableSearching {
-			return NewAppError("Config.IsValid", "model.config.is_valid.bleve_search.enable_searching.app_error", nil, "", http.StatusBadRequest)
-		}
-		if *bs.EnableAutocomplete {
-			return NewAppError("Config.IsValid", "model.config.is_valid.bleve_search.enable_autocomplete.app_error", nil, "", http.StatusBadRequest)
-		}
-	}
-	if *bs.BulkIndexingTimeWindowSeconds < 1 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.bleve_search.bulk_indexing_time_window_seconds.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (s *DataRetentionSettings) isValid() *AppError {
-	if *s.MessageRetentionDays <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.data_retention.message_retention_days_too_low.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if *s.FileRetentionDays <= 0 {
-		return NewAppError("Config.IsValid", "model.config.is_valid.data_retention.file_retention_days_too_low.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if _, err := time.Parse("15:04", *s.DeletionJobStartTime); err != nil {
-		return NewAppError("Config.IsValid", "model.config.is_valid.data_retention.deletion_job_start_time.app_error", nil, err.Error(), http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (s *LocalizationSettings) isValid() *AppError {
-	if *s.AvailableLocales != "" {
-		if !strings.Contains(*s.AvailableLocales, *s.DefaultClientLocale) {
-			return NewAppError("Config.IsValid", "model.config.is_valid.localization.available_locales.app_error", nil, "", http.StatusBadRequest)
-		}
-	}
-
-	return nil
-}
-
-func (s *MessageExportSettings) isValid() *AppError {
-	if s.EnableExport == nil {
-		return NewAppError("Config.IsValid", "model.config.is_valid.message_export.enable.app_error", nil, "", http.StatusBadRequest)
-	}
-	if *s.EnableExport {
-		if s.ExportFromTimestamp == nil || *s.ExportFromTimestamp < 0 || *s.ExportFromTimestamp > GetMillis() {
-			return NewAppError("Config.IsValid", "model.config.is_valid.message_export.export_from.app_error", nil, "", http.StatusBadRequest)
-		} else if s.DailyRunTime == nil {
-			return NewAppError("Config.IsValid", "model.config.is_valid.message_export.daily_runtime.app_error", nil, "", http.StatusBadRequest)
-		} else if _, err := time.Parse("15:04", *s.DailyRunTime); err != nil {
-			return NewAppError("Config.IsValid", "model.config.is_valid.message_export.daily_runtime.app_error", nil, err.Error(), http.StatusBadRequest)
-		} else if s.BatchSize == nil || *s.BatchSize < 0 {
-			return NewAppError("Config.IsValid", "model.config.is_valid.message_export.batch_size.app_error", nil, "", http.StatusBadRequest)
-		} else if s.ExportFormat == nil || (*s.ExportFormat != COMPLIANCE_EXPORT_TYPE_ACTIANCE && *s.ExportFormat != COMPLIANCE_EXPORT_TYPE_GLOBALRELAY && *s.ExportFormat != COMPLIANCE_EXPORT_TYPE_CSV) {
-			return NewAppError("Config.IsValid", "model.config.is_valid.message_export.export_type.app_error", nil, "", http.StatusBadRequest)
-		}
-
-		if *s.ExportFormat == COMPLIANCE_EXPORT_TYPE_GLOBALRELAY {
-			if s.GlobalRelaySettings == nil {
-				return NewAppError("Config.IsValid", "model.config.is_valid.message_export.global_relay.config_missing.app_error", nil, "", http.StatusBadRequest)
-			} else if s.GlobalRelaySettings.CustomerType == nil || (*s.GlobalRelaySettings.CustomerType != GLOBALRELAY_CUSTOMER_TYPE_A9 && *s.GlobalRelaySettings.CustomerType != GLOBALRELAY_CUSTOMER_TYPE_A10) {
-				return NewAppError("Config.IsValid", "model.config.is_valid.message_export.global_relay.customer_type.app_error", nil, "", http.StatusBadRequest)
-			} else if s.GlobalRelaySettings.EmailAddress == nil || !strings.Contains(*s.GlobalRelaySettings.EmailAddress, "@") {
-				// validating email addresses is hard - just make sure it contains an '@' sign
-				// see https://stackoverflow.com/questions/201323/using-a-regular-expression-to-validate-an-email-address
-				return NewAppError("Config.IsValid", "model.config.is_valid.message_export.global_relay.email_address.app_error", nil, "", http.StatusBadRequest)
-			} else if s.GlobalRelaySettings.SmtpUsername == nil || *s.GlobalRelaySettings.SmtpUsername == "" {
-				return NewAppError("Config.IsValid", "model.config.is_valid.message_export.global_relay.smtp_username.app_error", nil, "", http.StatusBadRequest)
-			} else if s.GlobalRelaySettings.SmtpPassword == nil || *s.GlobalRelaySettings.SmtpPassword == "" {
-				return NewAppError("Config.IsValid", "model.config.is_valid.message_export.global_relay.smtp_password.app_error", nil, "", http.StatusBadRequest)
-			}
-		}
-	}
-	return nil
-}
-
-func (s *DisplaySettings) isValid() *AppError {
-	if len(s.CustomUrlSchemes) != 0 {
-		validProtocolPattern := regexp.MustCompile(`(?i)^\s*[A-Za-z][A-Za-z0-9.+-]*\s*$`)
-
-		for _, scheme := range s.CustomUrlSchemes {
-			if !validProtocolPattern.MatchString(scheme) {
-				return NewAppError(
-					"Config.IsValid",
-					"model.config.is_valid.display.custom_url_schemes.app_error",
-					map[string]interface{}{"Scheme": scheme},
-					"",
-					http.StatusBadRequest,
-				)
-			}
-		}
-	}
-
-	return nil
-}
-
-func (s *ImageProxySettings) isValid() *AppError {
-	if *s.Enable {
-		switch *s.ImageProxyType {
-		case IMAGE_PROXY_TYPE_LOCAL:
-			// No other settings to validate
-		case IMAGE_PROXY_TYPE_ATMOS_CAMO:
-			if *s.RemoteImageProxyURL == "" {
-				return NewAppError("Config.IsValid", "model.config.is_valid.atmos_camo_image_proxy_url.app_error", nil, "", http.StatusBadRequest)
-			}
-
-			if *s.RemoteImageProxyOptions == "" {
-				return NewAppError("Config.IsValid", "model.config.is_valid.atmos_camo_image_proxy_options.app_error", nil, "", http.StatusBadRequest)
-			}
-		default:
-			return NewAppError("Config.IsValid", "model.config.is_valid.image_proxy_type.app_error", nil, "", http.StatusBadRequest)
-		}
-	}
-
-	return nil
-}
-
-func (o *Config) GetSanitizeOptions() map[string]bool {
-	options := map[string]bool{}
-	options["fullname"] = *o.PrivacySettings.ShowFullName
-	options["email"] = *o.PrivacySettings.ShowEmailAddress
-
-	return options
-}
-
-func (o *Config) Sanitize() {
-	if o.LdapSettings.BindPassword != nil && *o.LdapSettings.BindPassword != "" {
-		*o.LdapSettings.BindPassword = FAKE_SETTING
-	}
-
-	if o.FileSettings.PublicLinkSalt != nil {
-		*o.FileSettings.PublicLinkSalt = FAKE_SETTING
-	}
-
-	if o.FileSettings.AmazonS3SecretAccessKey != nil && *o.FileSettings.AmazonS3SecretAccessKey != "" {
-		*o.FileSettings.AmazonS3SecretAccessKey = FAKE_SETTING
-	}
-
-	if o.EmailSettings.SMTPPassword != nil && *o.EmailSettings.SMTPPassword != "" {
-		*o.EmailSettings.SMTPPassword = FAKE_SETTING
-	}
-
-	if o.GitLabSettings.Secret != nil && *o.GitLabSettings.Secret != "" {
-		*o.GitLabSettings.Secret = FAKE_SETTING
-	}
-
-	if o.GoogleSettings.Secret != nil && *o.GoogleSettings.Secret != "" {
-		*o.GoogleSettings.Secret = FAKE_SETTING
-	}
-
-	if o.Office365Settings.Secret != nil && *o.Office365Settings.Secret != "" {
-		*o.Office365Settings.Secret = FAKE_SETTING
-	}
-
-	if o.OpenIdSettings.Secret != nil && *o.OpenIdSettings.Secret != "" {
-		*o.OpenIdSettings.Secret = FAKE_SETTING
-	}
-
-	if o.SqlSettings.DataSource != nil {
-		*o.SqlSettings.DataSource = FAKE_SETTING
-	}
-
-	if o.SqlSettings.AtRestEncryptKey != nil {
-		*o.SqlSettings.AtRestEncryptKey = FAKE_SETTING
-	}
-
-	if o.ElasticsearchSettings.Password != nil {
-		*o.ElasticsearchSettings.Password = FAKE_SETTING
-	}
-
-	for i := range o.SqlSettings.DataSourceReplicas {
-		o.SqlSettings.DataSourceReplicas[i] = FAKE_SETTING
-	}
-
-	for i := range o.SqlSettings.DataSourceSearchReplicas {
-		o.SqlSettings.DataSourceSearchReplicas[i] = FAKE_SETTING
-	}
-
-	if o.MessageExportSettings.GlobalRelaySettings != nil &&
-		o.MessageExportSettings.GlobalRelaySettings.SmtpPassword != nil &&
-		*o.MessageExportSettings.GlobalRelaySettings.SmtpPassword != "" {
-		*o.MessageExportSettings.GlobalRelaySettings.SmtpPassword = FAKE_SETTING
-	}
-
-	if o.ServiceSettings.GfycatApiSecret != nil && *o.ServiceSettings.GfycatApiSecret != "" {
-		*o.ServiceSettings.GfycatApiSecret = FAKE_SETTING
-	}
-
-	if o.ServiceSettings.SplitKey != nil {
-		*o.ServiceSettings.SplitKey = FAKE_SETTING
-	}
-}
-
-// structToMapFilteredByTag converts a struct into a map removing those fields that has the tag passed
-// as argument
-func structToMapFilteredByTag(t interface{}, typeOfTag, filterTag string) map[string]interface{} {
-	defer func() {
-		if r := recover(); r != nil {
-			mlog.Warn("Panicked in structToMapFilteredByTag. This should never happen.", mlog.Any("recover", r))
-		}
-	}()
-
-	val := reflect.ValueOf(t)
-	elemField := reflect.TypeOf(t)
-
-	if val.Kind() != reflect.Struct {
-		return nil
-	}
-
-	out := map[string]interface{}{}
-
-	for i := 0; i < val.NumField(); i++ {
-		field := val.Field(i)
-
-		structField := elemField.Field(i)
-		tagPermissions := strings.Split(structField.Tag.Get(typeOfTag), ",")
-		if isTagPresent(filterTag, tagPermissions) {
-			continue
-		}
-
-		var value interface{}
-
-		switch field.Kind() {
-		case reflect.Struct:
-			value = structToMapFilteredByTag(field.Interface(), typeOfTag, filterTag)
-		case reflect.Ptr:
-			indirectType := field.Elem()
-			if indirectType.Kind() == reflect.Struct {
-				value = structToMapFilteredByTag(indirectType.Interface(), typeOfTag, filterTag)
-			} else if indirectType.Kind() != reflect.Invalid {
-				value = indirectType.Interface()
-			}
-		default:
-			value = field.Interface()
-		}
-
-		out[val.Type().Field(i).Name] = value
-	}
-
-	return out
-}
-
-func isTagPresent(tag string, tags []string) bool {
-	for _, val := range tags {
-		tagValue := strings.TrimSpace(val)
-		if tagValue != "" && tagValue == tag {
-			return true
-		}
-	}
-
-	return false
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/custom_status.go b/vendor/github.com/mattermost/mattermost-server/v5/model/custom_status.go
deleted file mode 100644
index 9898ce6c..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/custom_status.go
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"time"
-)
-
-const (
-	UserPropsKeyCustomStatus = "customStatus"
-
-	CustomStatusTextMaxRunes = 100
-	MaxRecentCustomStatuses  = 5
-	DefaultCustomStatusEmoji = "speech_balloon"
-)
-
-var validCustomStatusDuration = map[string]bool{
-	"thirty_minutes": true,
-	"one_hour":       true,
-	"four_hours":     true,
-	"today":          true,
-	"this_week":      true,
-	"date_and_time":  true,
-}
-
-type CustomStatus struct {
-	Emoji     string    `json:"emoji"`
-	Text      string    `json:"text"`
-	Duration  string    `json:"duration"`
-	ExpiresAt time.Time `json:"expires_at"`
-}
-
-func (cs *CustomStatus) PreSave() {
-	if cs.Emoji == "" {
-		cs.Emoji = DefaultCustomStatusEmoji
-	}
-
-	if cs.Duration == "" && !cs.ExpiresAt.Before(time.Now()) {
-		cs.Duration = "date_and_time"
-	}
-
-	runes := []rune(cs.Text)
-	if len(runes) > CustomStatusTextMaxRunes {
-		cs.Text = string(runes[:CustomStatusTextMaxRunes])
-	}
-}
-
-func (cs *CustomStatus) ToJson() string {
-	csCopy := *cs
-	b, _ := json.Marshal(csCopy)
-	return string(b)
-}
-
-func (cs *CustomStatus) AreDurationAndExpirationTimeValid() bool {
-	if cs.Duration == "" && (cs.ExpiresAt.IsZero() || !cs.ExpiresAt.Before(time.Now())) {
-		return true
-	}
-
-	if validCustomStatusDuration[cs.Duration] && !cs.ExpiresAt.Before(time.Now()) {
-		return true
-	}
-
-	return false
-}
-
-func CustomStatusFromJson(data io.Reader) *CustomStatus {
-	var cs *CustomStatus
-	_ = json.NewDecoder(data).Decode(&cs)
-	return cs
-}
-
-func RuneToHexadecimalString(r rune) string {
-	return fmt.Sprintf("%04x", r)
-}
-
-type RecentCustomStatuses []CustomStatus
-
-func (rcs *RecentCustomStatuses) Contains(cs *CustomStatus) bool {
-	var csJSON = cs.ToJson()
-
-	// status is empty
-	if cs == nil || csJSON == "" || (cs.Emoji == "" && cs.Text == "") {
-		return false
-	}
-
-	for _, status := range *rcs {
-		if status.ToJson() == csJSON {
-			return true
-		}
-	}
-
-	return false
-}
-
-func (rcs *RecentCustomStatuses) Add(cs *CustomStatus) *RecentCustomStatuses {
-	newRCS := (*rcs)[:0]
-
-	// if same `text` exists in existing recent custom statuses, modify existing status
-	for _, status := range *rcs {
-		if status.Text != cs.Text {
-			newRCS = append(newRCS, status)
-		}
-	}
-	newRCS = append(RecentCustomStatuses{*cs}, newRCS...)
-	if len(newRCS) > MaxRecentCustomStatuses {
-		newRCS = newRCS[:MaxRecentCustomStatuses]
-	}
-	return &newRCS
-}
-
-func (rcs *RecentCustomStatuses) Remove(cs *CustomStatus) *RecentCustomStatuses {
-	var csJSON = cs.ToJson()
-	if csJSON == "" || (cs.Emoji == "" && cs.Text == "") {
-		return rcs
-	}
-
-	newRCS := (*rcs)[:0]
-	for _, status := range *rcs {
-		if status.ToJson() != csJSON {
-			newRCS = append(newRCS, status)
-		}
-	}
-
-	return &newRCS
-}
-
-func (rcs *RecentCustomStatuses) ToJson() string {
-	rcsCopy := *rcs
-	b, _ := json.Marshal(rcsCopy)
-	return string(b)
-}
-
-func RecentCustomStatusesFromJson(data io.Reader) *RecentCustomStatuses {
-	var rcs *RecentCustomStatuses
-	_ = json.NewDecoder(data).Decode(&rcs)
-	return rcs
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/data_retention_policy.go b/vendor/github.com/mattermost/mattermost-server/v5/model/data_retention_policy.go
deleted file mode 100644
index 3f984d1b..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/data_retention_policy.go
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type GlobalRetentionPolicy struct {
-	MessageDeletionEnabled bool  `json:"message_deletion_enabled"`
-	FileDeletionEnabled    bool  `json:"file_deletion_enabled"`
-	MessageRetentionCutoff int64 `json:"message_retention_cutoff"`
-	FileRetentionCutoff    int64 `json:"file_retention_cutoff"`
-}
-
-type RetentionPolicy struct {
-	ID           string `db:"Id" json:"id"`
-	DisplayName  string `json:"display_name"`
-	PostDuration *int64 `json:"post_duration"`
-}
-
-type RetentionPolicyWithTeamAndChannelIDs struct {
-	RetentionPolicy
-	TeamIDs    []string `json:"team_ids"`
-	ChannelIDs []string `json:"channel_ids"`
-}
-
-type RetentionPolicyWithTeamAndChannelCounts struct {
-	RetentionPolicy
-	ChannelCount int64 `json:"channel_count"`
-	TeamCount    int64 `json:"team_count"`
-}
-
-type RetentionPolicyChannel struct {
-	PolicyID  string `db:"PolicyId"`
-	ChannelID string `db:"ChannelId"`
-}
-
-type RetentionPolicyTeam struct {
-	PolicyID string `db:"PolicyId"`
-	TeamID   string `db:"TeamId"`
-}
-
-type RetentionPolicyWithTeamAndChannelCountsList struct {
-	Policies   []*RetentionPolicyWithTeamAndChannelCounts `json:"policies"`
-	TotalCount int64                                      `json:"total_count"`
-}
-
-type RetentionPolicyForTeam struct {
-	TeamID       string `db:"Id" json:"team_id"`
-	PostDuration int64  `json:"post_duration"`
-}
-
-type RetentionPolicyForTeamList struct {
-	Policies   []*RetentionPolicyForTeam `json:"policies"`
-	TotalCount int64                     `json:"total_count"`
-}
-
-type RetentionPolicyForChannel struct {
-	ChannelID    string `db:"Id" json:"channel_id"`
-	PostDuration int64  `json:"post_duration"`
-}
-
-type RetentionPolicyForChannelList struct {
-	Policies   []*RetentionPolicyForChannel `json:"policies"`
-	TotalCount int64                        `json:"total_count"`
-}
-
-type RetentionPolicyCursor struct {
-	ChannelPoliciesDone bool
-	TeamPoliciesDone    bool
-	GlobalPoliciesDone  bool
-}
-
-func (rp *GlobalRetentionPolicy) ToJson() []byte {
-	b, _ := json.Marshal(rp)
-	return b
-}
-
-func GlobalRetentionPolicyFromJson(data io.Reader) *GlobalRetentionPolicy {
-	var grp *GlobalRetentionPolicy
-	json.NewDecoder(data).Decode(&grp)
-	return grp
-}
-
-func RetentionPolicyWithTeamAndChannelCountsFromJson(data io.Reader) (*RetentionPolicyWithTeamAndChannelCounts, error) {
-	var rp RetentionPolicyWithTeamAndChannelCounts
-	err := json.NewDecoder(data).Decode(&rp)
-	return &rp, err
-}
-
-func (rp *RetentionPolicyWithTeamAndChannelCounts) ToJson() []byte {
-	b, _ := json.Marshal(rp)
-	return b
-}
-
-func RetentionPolicyWithTeamAndChannelCountsListFromJson(data io.Reader) (*RetentionPolicyWithTeamAndChannelCountsList, error) {
-	var rpList *RetentionPolicyWithTeamAndChannelCountsList
-	err := json.NewDecoder(data).Decode(&rpList)
-	if err != nil {
-		return nil, err
-	}
-	return rpList, nil
-}
-
-func (rpList *RetentionPolicyWithTeamAndChannelCountsList) ToJson() []byte {
-	b, _ := json.Marshal(rpList)
-	return b
-}
-
-func RetentionPolicyWithTeamAndChannelIdsFromJson(data io.Reader) (*RetentionPolicyWithTeamAndChannelIDs, error) {
-	var rp *RetentionPolicyWithTeamAndChannelIDs
-	err := json.NewDecoder(data).Decode(&rp)
-	return rp, err
-}
-
-func (rp *RetentionPolicyWithTeamAndChannelIDs) ToJson() []byte {
-	b, _ := json.Marshal(rp)
-	return b
-}
-
-func (lst *RetentionPolicyForTeamList) ToJson() []byte {
-	b, _ := json.Marshal(lst)
-	return b
-}
-
-func (lst *RetentionPolicyForChannelList) ToJson() []byte {
-	b, _ := json.Marshal(lst)
-	return b
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/emoji.go b/vendor/github.com/mattermost/mattermost-server/v5/model/emoji.go
deleted file mode 100644
index f990c670..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/emoji.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-	"regexp"
-	"sort"
-)
-
-const (
-	EMOJI_NAME_MAX_LENGTH = 64
-	EMOJI_SORT_BY_NAME    = "name"
-)
-
-var EMOJI_PATTERN = regexp.MustCompile(`:[a-zA-Z0-9_+-]+:`)
-
-var ReverseSystemEmojisMap = makeReverseEmojiMap()
-
-type Emoji struct {
-	Id        string `json:"id"`
-	CreateAt  int64  `json:"create_at"`
-	UpdateAt  int64  `json:"update_at"`
-	DeleteAt  int64  `json:"delete_at"`
-	CreatorId string `json:"creator_id"`
-	Name      string `json:"name"`
-}
-
-func inSystemEmoji(emojiName string) bool {
-	_, ok := SystemEmojis[emojiName]
-	return ok
-}
-
-func GetSystemEmojiId(emojiName string) (string, bool) {
-	id, found := SystemEmojis[emojiName]
-	return id, found
-}
-
-func makeReverseEmojiMap() map[string][]string {
-	reverseEmojiMap := make(map[string][]string)
-	for key, value := range SystemEmojis {
-		emojiNames := reverseEmojiMap[value]
-		emojiNames = append(emojiNames, key)
-		sort.Strings(emojiNames)
-		reverseEmojiMap[value] = emojiNames
-	}
-
-	return reverseEmojiMap
-}
-
-func GetEmojiNameFromUnicode(unicode string) (emojiName string, count int) {
-	if emojiNames, found := ReverseSystemEmojisMap[unicode]; found {
-		return emojiNames[0], len(emojiNames)
-	}
-
-	return "", 0
-}
-
-func (emoji *Emoji) IsValid() *AppError {
-	if !IsValidId(emoji.Id) {
-		return NewAppError("Emoji.IsValid", "model.emoji.id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if emoji.CreateAt == 0 {
-		return NewAppError("Emoji.IsValid", "model.emoji.create_at.app_error", nil, "id="+emoji.Id, http.StatusBadRequest)
-	}
-
-	if emoji.UpdateAt == 0 {
-		return NewAppError("Emoji.IsValid", "model.emoji.update_at.app_error", nil, "id="+emoji.Id, http.StatusBadRequest)
-	}
-
-	if len(emoji.CreatorId) > 26 {
-		return NewAppError("Emoji.IsValid", "model.emoji.user_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return IsValidEmojiName(emoji.Name)
-}
-
-func IsValidEmojiName(name string) *AppError {
-	if name == "" || len(name) > EMOJI_NAME_MAX_LENGTH || !IsValidAlphaNumHyphenUnderscorePlus(name) || inSystemEmoji(name) {
-		return NewAppError("Emoji.IsValid", "model.emoji.name.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (emoji *Emoji) PreSave() {
-	if emoji.Id == "" {
-		emoji.Id = NewId()
-	}
-
-	emoji.CreateAt = GetMillis()
-	emoji.UpdateAt = emoji.CreateAt
-}
-
-func (emoji *Emoji) ToJson() string {
-	b, _ := json.Marshal(emoji)
-	return string(b)
-}
-
-func EmojiFromJson(data io.Reader) *Emoji {
-	var emoji *Emoji
-	json.NewDecoder(data).Decode(&emoji)
-	return emoji
-}
-
-func EmojiListToJson(emojiList []*Emoji) string {
-	b, _ := json.Marshal(emojiList)
-	return string(b)
-}
-
-func EmojiListFromJson(data io.Reader) []*Emoji {
-	var emojiList []*Emoji
-	json.NewDecoder(data).Decode(&emojiList)
-	return emojiList
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/emoji_data.go b/vendor/github.com/mattermost/mattermost-server/v5/model/emoji_data.go
deleted file mode 100644
index 849c2046..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/emoji_data.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-// This file is automatically generated via `make emojis`. Do not modify it manually.
-
-package model
-
-var SystemEmojis = map[string]string{"grinning": "1f600", "smiley": "1f603", "smile": "1f604", "grin": "1f601", "laughing": "1f606", "satisfied": "1f606", "sweat_smile": "1f605", "rolling_on_the_floor_laughing": "1f923", "rofl": "1f923", "joy": "1f602", "slightly_smiling_face": "1f642", "upside_down_face": "1f643", "wink": "1f609", "blush": "1f60a", "innocent": "1f607", "smiling_face_with_3_hearts": "1f970", "heart_eyes": "1f60d", "star-struck": "1f929", "grinning_face_with_star_eyes": "1f929", "kissing_heart": "1f618", "kissing": "1f617", "relaxed": "263a-fe0f", "kissing_closed_eyes": "1f61a", "kissing_smiling_eyes": "1f619", "smiling_face_with_tear": "1f972", "yum": "1f60b", "stuck_out_tongue": "1f61b", "stuck_out_tongue_winking_eye": "1f61c", "zany_face": "1f92a", "grinning_face_with_one_large_and_one_small_eye": "1f92a", "stuck_out_tongue_closed_eyes": "1f61d", "money_mouth_face": "1f911", "hugging_face": "1f917", "hugs": "1f917", "face_with_hand_over_mouth": "1f92d", "smiling_face_with_smiling_eyes_and_hand_covering_mouth": "1f92d", "shushing_face": "1f92b", "face_with_finger_covering_closed_lips": "1f92b", "thinking_face": "1f914", "thinking": "1f914", "zipper_mouth_face": "1f910", "face_with_raised_eyebrow": "1f928", "face_with_one_eyebrow_raised": "1f928", "neutral_face": "1f610", "expressionless": "1f611", "no_mouth": "1f636", "smirk": "1f60f", "unamused": "1f612", "face_with_rolling_eyes": "1f644", "roll_eyes": "1f644", "grimacing": "1f62c", "lying_face": "1f925", "relieved": "1f60c", "pensive": "1f614", "sleepy": "1f62a", "drooling_face": "1f924", "sleeping": "1f634", "mask": "1f637", "face_with_thermometer": "1f912", "face_with_head_bandage": "1f915", "nauseated_face": "1f922", "face_vomiting": "1f92e", "face_with_open_mouth_vomiting": "1f92e", "sneezing_face": "1f927", "hot_face": "1f975", "cold_face": "1f976", "woozy_face": "1f974", "dizzy_face": "1f635", "exploding_head": "1f92f", "shocked_face_with_exploding_head": "1f92f", "face_with_cowboy_hat": "1f920", "cowboy_hat_face": "1f920", "partying_face": "1f973", "disguised_face": "1f978", "sunglasses": "1f60e", "nerd_face": "1f913", "face_with_monocle": "1f9d0", "confused": "1f615", "worried": "1f61f", "slightly_frowning_face": "1f641", "white_frowning_face": "2639-fe0f", "frowning_face": "2639-fe0f", "open_mouth": "1f62e", "hushed": "1f62f", "astonished": "1f632", "flushed": "1f633", "pleading_face": "1f97a", "frowning": "1f626", "anguished": "1f627", "fearful": "1f628", "cold_sweat": "1f630", "disappointed_relieved": "1f625", "cry": "1f622", "sob": "1f62d", "scream": "1f631", "confounded": "1f616", "persevere": "1f623", "disappointed": "1f61e", "sweat": "1f613", "weary": "1f629", "tired_face": "1f62b", "yawning_face": "1f971", "triumph": "1f624", "rage": "1f621", "pout": "1f621", "angry": "1f620", "face_with_symbols_on_mouth": "1f92c", "serious_face_with_symbols_covering_mouth": "1f92c", "smiling_imp": "1f608", "imp": "1f47f", "skull": "1f480", "skull_and_crossbones": "2620-fe0f", "hankey": "1f4a9", "poop": "1f4a9", "shit": "1f4a9", "clown_face": "1f921", "japanese_ogre": "1f479", "japanese_goblin": "1f47a", "ghost": "1f47b", "alien": "1f47d", "space_invader": "1f47e", "robot_face": "1f916", "robot": "1f916", "smiley_cat": "1f63a", "smile_cat": "1f638", "joy_cat": "1f639", "heart_eyes_cat": "1f63b", "smirk_cat": "1f63c", "kissing_cat": "1f63d", "scream_cat": "1f640", "crying_cat_face": "1f63f", "pouting_cat": "1f63e", "see_no_evil": "1f648", "hear_no_evil": "1f649", "speak_no_evil": "1f64a", "kiss": "1f48b", "love_letter": "1f48c", "cupid": "1f498", "gift_heart": "1f49d", "sparkling_heart": "1f496", "heartpulse": "1f497", "heartbeat": "1f493", "revolving_hearts": "1f49e", "two_hearts": "1f495", "heart_decoration": "1f49f", "heavy_heart_exclamation_mark_ornament": "2763-fe0f", "heavy_heart_exclamation": "2763-fe0f", "broken_heart": "1f494", "heart": "2764-fe0f", "orange_heart": "1f9e1", "yellow_heart": "1f49b", "green_heart": "1f49a", "blue_heart": "1f499", "purple_heart": "1f49c", "brown_heart": "1f90e", "black_heart": "1f5a4", "white_heart": "1f90d", "100": "1f4af", "anger": "1f4a2", "boom": "1f4a5", "collision": "1f4a5", "dizzy": "1f4ab", "sweat_drops": "1f4a6", "dash": "1f4a8", "hole": "1f573-fe0f", "bomb": "1f4a3", "speech_balloon": "1f4ac", "eye-in-speech-bubble": "1f441-fe0f-200d-1f5e8-fe0f", "left_speech_bubble": "1f5e8-fe0f", "right_anger_bubble": "1f5ef-fe0f", "thought_balloon": "1f4ad", "zzz": "1f4a4", "wave": "1f44b", "raised_back_of_hand": "1f91a", "raised_hand_with_fingers_splayed": "1f590-fe0f", "hand": "270b", "raised_hand": "270b", "spock-hand": "1f596", "vulcan_salute": "1f596", "ok_hand": "1f44c", "pinched_fingers": "1f90c", "pinching_hand": "1f90f", "v": "270c-fe0f", "crossed_fingers": "1f91e", "hand_with_index_and_middle_fingers_crossed": "1f91e", "i_love_you_hand_sign": "1f91f", "the_horns": "1f918", "sign_of_the_horns": "1f918", "metal": "1f918", "call_me_hand": "1f919", "point_left": "1f448", "point_right": "1f449", "point_up_2": "1f446", "middle_finger": "1f595", "reversed_hand_with_middle_finger_extended": "1f595", "fu": "1f595", "point_down": "1f447", "point_up": "261d-fe0f", "+1": "1f44d", "thumbsup": "1f44d", "-1": "1f44e", "thumbsdown": "1f44e", "fist": "270a", "fist_raised": "270a", "facepunch": "1f44a", "punch": "1f44a", "fist_oncoming": "1f44a", "left-facing_fist": "1f91b", "fist_left": "1f91b", "right-facing_fist": "1f91c", "fist_right": "1f91c", "clap": "1f44f", "raised_hands": "1f64c", "open_hands": "1f450", "palms_up_together": "1f932", "handshake": "1f91d", "pray": "1f64f", "writing_hand": "270d-fe0f", "nail_care": "1f485", "selfie": "1f933", "muscle": "1f4aa", "mechanical_arm": "1f9be", "mechanical_leg": "1f9bf", "leg": "1f9b5", "foot": "1f9b6", "ear": "1f442", "ear_with_hearing_aid": "1f9bb", "nose": "1f443", "brain": "1f9e0", "anatomical_heart": "1fac0", "lungs": "1fac1", "tooth": "1f9b7", "bone": "1f9b4", "eyes": "1f440", "eye": "1f441-fe0f", "tongue": "1f445", "lips": "1f444", "baby": "1f476", "child": "1f9d2", "boy": "1f466", "girl": "1f467", "adult": "1f9d1", "person_with_blond_hair": "1f471", "man": "1f468", "bearded_person": "1f9d4", "red_haired_man": "1f468-200d-1f9b0", "curly_haired_man": "1f468-200d-1f9b1", "white_haired_man": "1f468-200d-1f9b3", "bald_man": "1f468-200d-1f9b2", "woman": "1f469", "red_haired_woman": "1f469-200d-1f9b0", "red_haired_person": "1f9d1-200d-1f9b0", "curly_haired_woman": "1f469-200d-1f9b1", "curly_haired_person": "1f9d1-200d-1f9b1", "white_haired_woman": "1f469-200d-1f9b3", "white_haired_person": "1f9d1-200d-1f9b3", "bald_woman": "1f469-200d-1f9b2", "bald_person": "1f9d1-200d-1f9b2", "blond-haired-woman": "1f471-200d-2640-fe0f", "blonde_woman": "1f471-200d-2640-fe0f", "blond-haired-man": "1f471-200d-2642-fe0f", "blonde_man": "1f471-200d-2642-fe0f", "older_adult": "1f9d3", "older_man": "1f474", "older_woman": "1f475", "person_frowning": "1f64d", "man-frowning": "1f64d-200d-2642-fe0f", "frowning_man": "1f64d-200d-2642-fe0f", "woman-frowning": "1f64d-200d-2640-fe0f", "frowning_woman": "1f64d-200d-2640-fe0f", "person_with_pouting_face": "1f64e", "man-pouting": "1f64e-200d-2642-fe0f", "pouting_man": "1f64e-200d-2642-fe0f", "woman-pouting": "1f64e-200d-2640-fe0f", "pouting_woman": "1f64e-200d-2640-fe0f", "no_good": "1f645", "man-gesturing-no": "1f645-200d-2642-fe0f", "ng_man": "1f645-200d-2642-fe0f", "no_good_man": "1f645-200d-2642-fe0f", "woman-gesturing-no": "1f645-200d-2640-fe0f", "no_good_woman": "1f645-200d-2640-fe0f", "ng_woman": "1f645-200d-2640-fe0f", "ok_woman": "1f646", "man-gesturing-ok": "1f646-200d-2642-fe0f", "ok_man": "1f646-200d-2642-fe0f", "woman-gesturing-ok": "1f646-200d-2640-fe0f", "information_desk_person": "1f481", "man-tipping-hand": "1f481-200d-2642-fe0f", "tipping_hand_man": "1f481-200d-2642-fe0f", "woman-tipping-hand": "1f481-200d-2640-fe0f", "tipping_hand_woman": "1f481-200d-2640-fe0f", "raising_hand": "1f64b", "man-raising-hand": "1f64b-200d-2642-fe0f", "raising_hand_man": "1f64b-200d-2642-fe0f", "woman-raising-hand": "1f64b-200d-2640-fe0f", "raising_hand_woman": "1f64b-200d-2640-fe0f", "deaf_person": "1f9cf", "deaf_man": "1f9cf-200d-2642-fe0f", "deaf_woman": "1f9cf-200d-2640-fe0f", "bow": "1f647", "man-bowing": "1f647-200d-2642-fe0f", "bowing_man": "1f647-200d-2642-fe0f", "woman-bowing": "1f647-200d-2640-fe0f", "bowing_woman": "1f647-200d-2640-fe0f", "face_palm": "1f926", "man-facepalming": "1f926-200d-2642-fe0f", "man_facepalming": "1f926-200d-2642-fe0f", "woman-facepalming": "1f926-200d-2640-fe0f", "woman_facepalming": "1f926-200d-2640-fe0f", "shrug": "1f937", "man-shrugging": "1f937-200d-2642-fe0f", "man_shrugging": "1f937-200d-2642-fe0f", "woman-shrugging": "1f937-200d-2640-fe0f", "woman_shrugging": "1f937-200d-2640-fe0f", "health_worker": "1f9d1-200d-2695-fe0f", "male-doctor": "1f468-200d-2695-fe0f", "man_health_worker": "1f468-200d-2695-fe0f", "female-doctor": "1f469-200d-2695-fe0f", "woman_health_worker": "1f469-200d-2695-fe0f", "student": "1f9d1-200d-1f393", "male-student": "1f468-200d-1f393", "man_student": "1f468-200d-1f393", "female-student": "1f469-200d-1f393", "woman_student": "1f469-200d-1f393", "teacher": "1f9d1-200d-1f3eb", "male-teacher": "1f468-200d-1f3eb", "man_teacher": "1f468-200d-1f3eb", "female-teacher": "1f469-200d-1f3eb", "woman_teacher": "1f469-200d-1f3eb", "judge": "1f9d1-200d-2696-fe0f", "male-judge": "1f468-200d-2696-fe0f", "man_judge": "1f468-200d-2696-fe0f", "female-judge": "1f469-200d-2696-fe0f", "woman_judge": "1f469-200d-2696-fe0f", "farmer": "1f9d1-200d-1f33e", "male-farmer": "1f468-200d-1f33e", "man_farmer": "1f468-200d-1f33e", "female-farmer": "1f469-200d-1f33e", "woman_farmer": "1f469-200d-1f33e", "cook": "1f9d1-200d-1f373", "male-cook": "1f468-200d-1f373", "man_cook": "1f468-200d-1f373", "female-cook": "1f469-200d-1f373", "woman_cook": "1f469-200d-1f373", "mechanic": "1f9d1-200d-1f527", "male-mechanic": "1f468-200d-1f527", "man_mechanic": "1f468-200d-1f527", "female-mechanic": "1f469-200d-1f527", "woman_mechanic": "1f469-200d-1f527", "factory_worker": "1f9d1-200d-1f3ed", "male-factory-worker": "1f468-200d-1f3ed", "man_factory_worker": "1f468-200d-1f3ed", "female-factory-worker": "1f469-200d-1f3ed", "woman_factory_worker": "1f469-200d-1f3ed", "office_worker": "1f9d1-200d-1f4bc", "male-office-worker": "1f468-200d-1f4bc", "man_office_worker": "1f468-200d-1f4bc", "female-office-worker": "1f469-200d-1f4bc", "woman_office_worker": "1f469-200d-1f4bc", "scientist": "1f9d1-200d-1f52c", "male-scientist": "1f468-200d-1f52c", "man_scientist": "1f468-200d-1f52c", "female-scientist": "1f469-200d-1f52c", "woman_scientist": "1f469-200d-1f52c", "technologist": "1f9d1-200d-1f4bb", "male-technologist": "1f468-200d-1f4bb", "man_technologist": "1f468-200d-1f4bb", "female-technologist": "1f469-200d-1f4bb", "woman_technologist": "1f469-200d-1f4bb", "singer": "1f9d1-200d-1f3a4", "male-singer": "1f468-200d-1f3a4", "man_singer": "1f468-200d-1f3a4", "female-singer": "1f469-200d-1f3a4", "woman_singer": "1f469-200d-1f3a4", "artist": "1f9d1-200d-1f3a8", "male-artist": "1f468-200d-1f3a8", "man_artist": "1f468-200d-1f3a8", "female-artist": "1f469-200d-1f3a8", "woman_artist": "1f469-200d-1f3a8", "pilot": "1f9d1-200d-2708-fe0f", "male-pilot": "1f468-200d-2708-fe0f", "man_pilot": "1f468-200d-2708-fe0f", "female-pilot": "1f469-200d-2708-fe0f", "woman_pilot": "1f469-200d-2708-fe0f", "astronaut": "1f9d1-200d-1f680", "male-astronaut": "1f468-200d-1f680", "man_astronaut": "1f468-200d-1f680", "female-astronaut": "1f469-200d-1f680", "woman_astronaut": "1f469-200d-1f680", "firefighter": "1f9d1-200d-1f692", "male-firefighter": "1f468-200d-1f692", "man_firefighter": "1f468-200d-1f692", "female-firefighter": "1f469-200d-1f692", "woman_firefighter": "1f469-200d-1f692", "cop": "1f46e", "male-police-officer": "1f46e-200d-2642-fe0f", "policeman": "1f46e-200d-2642-fe0f", "female-police-officer": "1f46e-200d-2640-fe0f", "policewoman": "1f46e-200d-2640-fe0f", "sleuth_or_spy": "1f575-fe0f", "detective": "1f575-fe0f", "male-detective": "1f575-fe0f-200d-2642-fe0f", "male_detective": "1f575-fe0f-200d-2642-fe0f", "female-detective": "1f575-fe0f-200d-2640-fe0f", "female_detective": "1f575-fe0f-200d-2640-fe0f", "guardsman": "1f482", "male-guard": "1f482-200d-2642-fe0f", "female-guard": "1f482-200d-2640-fe0f", "guardswoman": "1f482-200d-2640-fe0f", "ninja": "1f977", "construction_worker": "1f477", "male-construction-worker": "1f477-200d-2642-fe0f", "construction_worker_man": "1f477-200d-2642-fe0f", "female-construction-worker": "1f477-200d-2640-fe0f", "construction_worker_woman": "1f477-200d-2640-fe0f", "prince": "1f934", "princess": "1f478", "man_with_turban": "1f473", "man-wearing-turban": "1f473-200d-2642-fe0f", "woman-wearing-turban": "1f473-200d-2640-fe0f", "woman_with_turban": "1f473-200d-2640-fe0f", "man_with_gua_pi_mao": "1f472", "person_with_headscarf": "1f9d5", "person_in_tuxedo": "1f935", "man_in_tuxedo": "1f935-200d-2642-fe0f", "woman_in_tuxedo": "1f935-200d-2640-fe0f", "bride_with_veil": "1f470", "man_with_veil": "1f470-200d-2642-fe0f", "woman_with_veil": "1f470-200d-2640-fe0f", "pregnant_woman": "1f930", "breast-feeding": "1f931", "woman_feeding_baby": "1f469-200d-1f37c", "man_feeding_baby": "1f468-200d-1f37c", "person_feeding_baby": "1f9d1-200d-1f37c", "angel": "1f47c", "santa": "1f385", "mrs_claus": "1f936", "mother_christmas": "1f936", "mx_claus": "1f9d1-200d-1f384", "superhero": "1f9b8", "male_superhero": "1f9b8-200d-2642-fe0f", "female_superhero": "1f9b8-200d-2640-fe0f", "supervillain": "1f9b9", "male_supervillain": "1f9b9-200d-2642-fe0f", "female_supervillain": "1f9b9-200d-2640-fe0f", "mage": "1f9d9", "male_mage": "1f9d9-200d-2642-fe0f", "female_mage": "1f9d9-200d-2640-fe0f", "fairy": "1f9da", "male_fairy": "1f9da-200d-2642-fe0f", "female_fairy": "1f9da-200d-2640-fe0f", "vampire": "1f9db", "male_vampire": "1f9db-200d-2642-fe0f", "female_vampire": "1f9db-200d-2640-fe0f", "merperson": "1f9dc", "merman": "1f9dc-200d-2642-fe0f", "mermaid": "1f9dc-200d-2640-fe0f", "elf": "1f9dd", "male_elf": "1f9dd-200d-2642-fe0f", "female_elf": "1f9dd-200d-2640-fe0f", "genie": "1f9de", "male_genie": "1f9de-200d-2642-fe0f", "female_genie": "1f9de-200d-2640-fe0f", "zombie": "1f9df", "male_zombie": "1f9df-200d-2642-fe0f", "female_zombie": "1f9df-200d-2640-fe0f", "massage": "1f486", "man-getting-massage": "1f486-200d-2642-fe0f", "massage_man": "1f486-200d-2642-fe0f", "woman-getting-massage": "1f486-200d-2640-fe0f", "massage_woman": "1f486-200d-2640-fe0f", "haircut": "1f487", "man-getting-haircut": "1f487-200d-2642-fe0f", "haircut_man": "1f487-200d-2642-fe0f", "woman-getting-haircut": "1f487-200d-2640-fe0f", "haircut_woman": "1f487-200d-2640-fe0f", "walking": "1f6b6", "man-walking": "1f6b6-200d-2642-fe0f", "walking_man": "1f6b6-200d-2642-fe0f", "woman-walking": "1f6b6-200d-2640-fe0f", "walking_woman": "1f6b6-200d-2640-fe0f", "standing_person": "1f9cd", "man_standing": "1f9cd-200d-2642-fe0f", "woman_standing": "1f9cd-200d-2640-fe0f", "kneeling_person": "1f9ce", "man_kneeling": "1f9ce-200d-2642-fe0f", "woman_kneeling": "1f9ce-200d-2640-fe0f", "person_with_probing_cane": "1f9d1-200d-1f9af", "man_with_probing_cane": "1f468-200d-1f9af", "woman_with_probing_cane": "1f469-200d-1f9af", "person_in_motorized_wheelchair": "1f9d1-200d-1f9bc", "man_in_motorized_wheelchair": "1f468-200d-1f9bc", "woman_in_motorized_wheelchair": "1f469-200d-1f9bc", "person_in_manual_wheelchair": "1f9d1-200d-1f9bd", "man_in_manual_wheelchair": "1f468-200d-1f9bd", "woman_in_manual_wheelchair": "1f469-200d-1f9bd", "runner": "1f3c3", "running": "1f3c3", "man-running": "1f3c3-200d-2642-fe0f", "running_man": "1f3c3-200d-2642-fe0f", "woman-running": "1f3c3-200d-2640-fe0f", "running_woman": "1f3c3-200d-2640-fe0f", "dancer": "1f483", "man_dancing": "1f57a", "man_in_business_suit_levitating": "1f574-fe0f", "business_suit_levitating": "1f574-fe0f", "dancers": "1f46f", "man-with-bunny-ears-partying": "1f46f-200d-2642-fe0f", "dancing_men": "1f46f-200d-2642-fe0f", "woman-with-bunny-ears-partying": "1f46f-200d-2640-fe0f", "dancing_women": "1f46f-200d-2640-fe0f", "person_in_steamy_room": "1f9d6", "man_in_steamy_room": "1f9d6-200d-2642-fe0f", "woman_in_steamy_room": "1f9d6-200d-2640-fe0f", "person_climbing": "1f9d7", "man_climbing": "1f9d7-200d-2642-fe0f", "woman_climbing": "1f9d7-200d-2640-fe0f", "fencer": "1f93a", "person_fencing": "1f93a", "horse_racing": "1f3c7", "skier": "26f7-fe0f", "snowboarder": "1f3c2", "golfer": "1f3cc-fe0f", "man-golfing": "1f3cc-fe0f-200d-2642-fe0f", "golfing_man": "1f3cc-fe0f-200d-2642-fe0f", "woman-golfing": "1f3cc-fe0f-200d-2640-fe0f", "golfing_woman": "1f3cc-fe0f-200d-2640-fe0f", "surfer": "1f3c4", "man-surfing": "1f3c4-200d-2642-fe0f", "surfing_man": "1f3c4-200d-2642-fe0f", "woman-surfing": "1f3c4-200d-2640-fe0f", "surfing_woman": "1f3c4-200d-2640-fe0f", "rowboat": "1f6a3", "man-rowing-boat": "1f6a3-200d-2642-fe0f", "rowing_man": "1f6a3-200d-2642-fe0f", "woman-rowing-boat": "1f6a3-200d-2640-fe0f", "rowing_woman": "1f6a3-200d-2640-fe0f", "swimmer": "1f3ca", "man-swimming": "1f3ca-200d-2642-fe0f", "swimming_man": "1f3ca-200d-2642-fe0f", "woman-swimming": "1f3ca-200d-2640-fe0f", "swimming_woman": "1f3ca-200d-2640-fe0f", "person_with_ball": "26f9-fe0f", "man-bouncing-ball": "26f9-fe0f-200d-2642-fe0f", "basketball_man": "26f9-fe0f-200d-2642-fe0f", "woman-bouncing-ball": "26f9-fe0f-200d-2640-fe0f", "basketball_woman": "26f9-fe0f-200d-2640-fe0f", "weight_lifter": "1f3cb-fe0f", "man-lifting-weights": "1f3cb-fe0f-200d-2642-fe0f", "weight_lifting_man": "1f3cb-fe0f-200d-2642-fe0f", "woman-lifting-weights": "1f3cb-fe0f-200d-2640-fe0f", "weight_lifting_woman": "1f3cb-fe0f-200d-2640-fe0f", "bicyclist": "1f6b4", "man-biking": "1f6b4-200d-2642-fe0f", "biking_man": "1f6b4-200d-2642-fe0f", "woman-biking": "1f6b4-200d-2640-fe0f", "biking_woman": "1f6b4-200d-2640-fe0f", "mountain_bicyclist": "1f6b5", "man-mountain-biking": "1f6b5-200d-2642-fe0f", "mountain_biking_man": "1f6b5-200d-2642-fe0f", "woman-mountain-biking": "1f6b5-200d-2640-fe0f", "mountain_biking_woman": "1f6b5-200d-2640-fe0f", "person_doing_cartwheel": "1f938", "man-cartwheeling": "1f938-200d-2642-fe0f", "man_cartwheeling": "1f938-200d-2642-fe0f", "woman-cartwheeling": "1f938-200d-2640-fe0f", "woman_cartwheeling": "1f938-200d-2640-fe0f", "wrestlers": "1f93c", "man-wrestling": "1f93c-200d-2642-fe0f", "men_wrestling": "1f93c-200d-2642-fe0f", "woman-wrestling": "1f93c-200d-2640-fe0f", "women_wrestling": "1f93c-200d-2640-fe0f", "water_polo": "1f93d", "man-playing-water-polo": "1f93d-200d-2642-fe0f", "man_playing_water_polo": "1f93d-200d-2642-fe0f", "woman-playing-water-polo": "1f93d-200d-2640-fe0f", "woman_playing_water_polo": "1f93d-200d-2640-fe0f", "handball": "1f93e", "man-playing-handball": "1f93e-200d-2642-fe0f", "man_playing_handball": "1f93e-200d-2642-fe0f", "woman-playing-handball": "1f93e-200d-2640-fe0f", "woman_playing_handball": "1f93e-200d-2640-fe0f", "juggling": "1f939", "man-juggling": "1f939-200d-2642-fe0f", "man_juggling": "1f939-200d-2642-fe0f", "woman-juggling": "1f939-200d-2640-fe0f", "woman_juggling": "1f939-200d-2640-fe0f", "person_in_lotus_position": "1f9d8", "man_in_lotus_position": "1f9d8-200d-2642-fe0f", "woman_in_lotus_position": "1f9d8-200d-2640-fe0f", "bath": "1f6c0", "sleeping_accommodation": "1f6cc", "sleeping_bed": "1f6cc", "people_holding_hands": "1f9d1-200d-1f91d-200d-1f9d1", "two_women_holding_hands": "1f46d", "women_holding_hands": "1f46d", "man_and_woman_holding_hands": "1f46b", "woman_and_man_holding_hands": "1f46b", "couple": "1f46b", "two_men_holding_hands": "1f46c", "men_holding_hands": "1f46c", "couplekiss": "1f48f", "woman-kiss-man": "1f469-200d-2764-fe0f-200d-1f48b-200d-1f468", "couplekiss_man_woman": "1f469-200d-2764-fe0f-200d-1f48b-200d-1f468", "man-kiss-man": "1f468-200d-2764-fe0f-200d-1f48b-200d-1f468", "couplekiss_man_man": "1f468-200d-2764-fe0f-200d-1f48b-200d-1f468", "woman-kiss-woman": "1f469-200d-2764-fe0f-200d-1f48b-200d-1f469", "couplekiss_woman_woman": "1f469-200d-2764-fe0f-200d-1f48b-200d-1f469", "couple_with_heart": "1f491", "woman-heart-man": "1f469-200d-2764-fe0f-200d-1f468", "couple_with_heart_woman_man": "1f469-200d-2764-fe0f-200d-1f468", "man-heart-man": "1f468-200d-2764-fe0f-200d-1f468", "couple_with_heart_man_man": "1f468-200d-2764-fe0f-200d-1f468", "woman-heart-woman": "1f469-200d-2764-fe0f-200d-1f469", "couple_with_heart_woman_woman": "1f469-200d-2764-fe0f-200d-1f469", "family": "1f46a", "man-woman-boy": "1f468-200d-1f469-200d-1f466", "family_man_woman_boy": "1f468-200d-1f469-200d-1f466", "man-woman-girl": "1f468-200d-1f469-200d-1f467", "family_man_woman_girl": "1f468-200d-1f469-200d-1f467", "man-woman-girl-boy": "1f468-200d-1f469-200d-1f467-200d-1f466", "family_man_woman_girl_boy": "1f468-200d-1f469-200d-1f467-200d-1f466", "man-woman-boy-boy": "1f468-200d-1f469-200d-1f466-200d-1f466", "family_man_woman_boy_boy": "1f468-200d-1f469-200d-1f466-200d-1f466", "man-woman-girl-girl": "1f468-200d-1f469-200d-1f467-200d-1f467", "family_man_woman_girl_girl": "1f468-200d-1f469-200d-1f467-200d-1f467", "man-man-boy": "1f468-200d-1f468-200d-1f466", "family_man_man_boy": "1f468-200d-1f468-200d-1f466", "man-man-girl": "1f468-200d-1f468-200d-1f467", "family_man_man_girl": "1f468-200d-1f468-200d-1f467", "man-man-girl-boy": "1f468-200d-1f468-200d-1f467-200d-1f466", "family_man_man_girl_boy": "1f468-200d-1f468-200d-1f467-200d-1f466", "man-man-boy-boy": "1f468-200d-1f468-200d-1f466-200d-1f466", "family_man_man_boy_boy": "1f468-200d-1f468-200d-1f466-200d-1f466", "man-man-girl-girl": "1f468-200d-1f468-200d-1f467-200d-1f467", "family_man_man_girl_girl": "1f468-200d-1f468-200d-1f467-200d-1f467", "woman-woman-boy": "1f469-200d-1f469-200d-1f466", "family_woman_woman_boy": "1f469-200d-1f469-200d-1f466", "woman-woman-girl": "1f469-200d-1f469-200d-1f467", "family_woman_woman_girl": "1f469-200d-1f469-200d-1f467", "woman-woman-girl-boy": "1f469-200d-1f469-200d-1f467-200d-1f466", "family_woman_woman_girl_boy": "1f469-200d-1f469-200d-1f467-200d-1f466", "woman-woman-boy-boy": "1f469-200d-1f469-200d-1f466-200d-1f466", "family_woman_woman_boy_boy": "1f469-200d-1f469-200d-1f466-200d-1f466", "woman-woman-girl-girl": "1f469-200d-1f469-200d-1f467-200d-1f467", "family_woman_woman_girl_girl": "1f469-200d-1f469-200d-1f467-200d-1f467", "man-boy": "1f468-200d-1f466", "family_man_boy": "1f468-200d-1f466", "man-boy-boy": "1f468-200d-1f466-200d-1f466", "family_man_boy_boy": "1f468-200d-1f466-200d-1f466", "man-girl": "1f468-200d-1f467", "family_man_girl": "1f468-200d-1f467", "man-girl-boy": "1f468-200d-1f467-200d-1f466", "family_man_girl_boy": "1f468-200d-1f467-200d-1f466", "man-girl-girl": "1f468-200d-1f467-200d-1f467", "family_man_girl_girl": "1f468-200d-1f467-200d-1f467", "woman-boy": "1f469-200d-1f466", "family_woman_boy": "1f469-200d-1f466", "woman-boy-boy": "1f469-200d-1f466-200d-1f466", "family_woman_boy_boy": "1f469-200d-1f466-200d-1f466", "woman-girl": "1f469-200d-1f467", "family_woman_girl": "1f469-200d-1f467", "woman-girl-boy": "1f469-200d-1f467-200d-1f466", "family_woman_girl_boy": "1f469-200d-1f467-200d-1f466", "woman-girl-girl": "1f469-200d-1f467-200d-1f467", "family_woman_girl_girl": "1f469-200d-1f467-200d-1f467", "speaking_head_in_silhouette": "1f5e3-fe0f", "speaking_head": "1f5e3-fe0f", "bust_in_silhouette": "1f464", "busts_in_silhouette": "1f465", "people_hugging": "1fac2", "footprints": "1f463", "skin-tone-2": "1f3fb", "skin-tone-3": "1f3fc", "skin-tone-4": "1f3fd", "skin-tone-5": "1f3fe", "skin-tone-6": "1f3ff", "monkey_face": "1f435", "monkey": "1f412", "gorilla": "1f98d", "orangutan": "1f9a7", "dog": "1f436", "dog2": "1f415", "guide_dog": "1f9ae", "service_dog": "1f415-200d-1f9ba", "poodle": "1f429", "wolf": "1f43a", "fox_face": "1f98a", "raccoon": "1f99d", "cat": "1f431", "cat2": "1f408", "black_cat": "1f408-200d-2b1b", "lion_face": "1f981", "lion": "1f981", "tiger": "1f42f", "tiger2": "1f405", "leopard": "1f406", "horse": "1f434", "racehorse": "1f40e", "unicorn_face": "1f984", "unicorn": "1f984", "zebra_face": "1f993", "deer": "1f98c", "bison": "1f9ac", "cow": "1f42e", "ox": "1f402", "water_buffalo": "1f403", "cow2": "1f404", "pig": "1f437", "pig2": "1f416", "boar": "1f417", "pig_nose": "1f43d", "ram": "1f40f", "sheep": "1f411", "goat": "1f410", "dromedary_camel": "1f42a", "camel": "1f42b", "llama": "1f999", "giraffe_face": "1f992", "elephant": "1f418", "mammoth": "1f9a3", "rhinoceros": "1f98f", "hippopotamus": "1f99b", "mouse": "1f42d", "mouse2": "1f401", "rat": "1f400", "hamster": "1f439", "rabbit": "1f430", "rabbit2": "1f407", "chipmunk": "1f43f-fe0f", "beaver": "1f9ab", "hedgehog": "1f994", "bat": "1f987", "bear": "1f43b", "polar_bear": "1f43b-200d-2744-fe0f", "koala": "1f428", "panda_face": "1f43c", "sloth": "1f9a5", "otter": "1f9a6", "skunk": "1f9a8", "kangaroo": "1f998", "badger": "1f9a1", "feet": "1f43e", "paw_prints": "1f43e", "turkey": "1f983", "chicken": "1f414", "rooster": "1f413", "hatching_chick": "1f423", "baby_chick": "1f424", "hatched_chick": "1f425", "bird": "1f426", "penguin": "1f427", "dove_of_peace": "1f54a-fe0f", "dove": "1f54a-fe0f", "eagle": "1f985", "duck": "1f986", "swan": "1f9a2", "owl": "1f989", "dodo": "1f9a4", "feather": "1fab6", "flamingo": "1f9a9", "peacock": "1f99a", "parrot": "1f99c", "frog": "1f438", "crocodile": "1f40a", "turtle": "1f422", "lizard": "1f98e", "snake": "1f40d", "dragon_face": "1f432", "dragon": "1f409", "sauropod": "1f995", "t-rex": "1f996", "whale": "1f433", "whale2": "1f40b", "dolphin": "1f42c", "flipper": "1f42c", "seal": "1f9ad", "fish": "1f41f", "tropical_fish": "1f420", "blowfish": "1f421", "shark": "1f988", "octopus": "1f419", "shell": "1f41a", "snail": "1f40c", "butterfly": "1f98b", "bug": "1f41b", "ant": "1f41c", "bee": "1f41d", "honeybee": "1f41d", "beetle": "1fab2", "ladybug": "1f41e", "lady_beetle": "1f41e", "cricket": "1f997", "cockroach": "1fab3", "spider": "1f577-fe0f", "spider_web": "1f578-fe0f", "scorpion": "1f982", "mosquito": "1f99f", "fly": "1fab0", "worm": "1fab1", "microbe": "1f9a0", "bouquet": "1f490", "cherry_blossom": "1f338", "white_flower": "1f4ae", "rosette": "1f3f5-fe0f", "rose": "1f339", "wilted_flower": "1f940", "hibiscus": "1f33a", "sunflower": "1f33b", "blossom": "1f33c", "tulip": "1f337", "seedling": "1f331", "potted_plant": "1fab4", "evergreen_tree": "1f332", "deciduous_tree": "1f333", "palm_tree": "1f334", "cactus": "1f335", "ear_of_rice": "1f33e", "herb": "1f33f", "shamrock": "2618-fe0f", "four_leaf_clover": "1f340", "maple_leaf": "1f341", "fallen_leaf": "1f342", "leaves": "1f343", "grapes": "1f347", "melon": "1f348", "watermelon": "1f349", "tangerine": "1f34a", "mandarin": "1f34a", "orange": "1f34a", "lemon": "1f34b", "banana": "1f34c", "pineapple": "1f34d", "mango": "1f96d", "apple": "1f34e", "green_apple": "1f34f", "pear": "1f350", "peach": "1f351", "cherries": "1f352", "strawberry": "1f353", "blueberries": "1fad0", "kiwifruit": "1f95d", "kiwi_fruit": "1f95d", "tomato": "1f345", "olive": "1fad2", "coconut": "1f965", "avocado": "1f951", "eggplant": "1f346", "potato": "1f954", "carrot": "1f955", "corn": "1f33d", "hot_pepper": "1f336-fe0f", "bell_pepper": "1fad1", "cucumber": "1f952", "leafy_green": "1f96c", "broccoli": "1f966", "garlic": "1f9c4", "onion": "1f9c5", "mushroom": "1f344", "peanuts": "1f95c", "chestnut": "1f330", "bread": "1f35e", "croissant": "1f950", "baguette_bread": "1f956", "flatbread": "1fad3", "pretzel": "1f968", "bagel": "1f96f", "pancakes": "1f95e", "waffle": "1f9c7", "cheese_wedge": "1f9c0", "cheese": "1f9c0", "meat_on_bone": "1f356", "poultry_leg": "1f357", "cut_of_meat": "1f969", "bacon": "1f953", "hamburger": "1f354", "fries": "1f35f", "pizza": "1f355", "hotdog": "1f32d", "sandwich": "1f96a", "taco": "1f32e", "burrito": "1f32f", "tamale": "1fad4", "stuffed_flatbread": "1f959", "falafel": "1f9c6", "egg": "1f95a", "fried_egg": "1f373", "cooking": "1f373", "shallow_pan_of_food": "1f958", "stew": "1f372", "fondue": "1fad5", "bowl_with_spoon": "1f963", "green_salad": "1f957", "popcorn": "1f37f", "butter": "1f9c8", "salt": "1f9c2", "canned_food": "1f96b", "bento": "1f371", "rice_cracker": "1f358", "rice_ball": "1f359", "rice": "1f35a", "curry": "1f35b", "ramen": "1f35c", "spaghetti": "1f35d", "sweet_potato": "1f360", "oden": "1f362", "sushi": "1f363", "fried_shrimp": "1f364", "fish_cake": "1f365", "moon_cake": "1f96e", "dango": "1f361", "dumpling": "1f95f", "fortune_cookie": "1f960", "takeout_box": "1f961", "crab": "1f980", "lobster": "1f99e", "shrimp": "1f990", "squid": "1f991", "oyster": "1f9aa", "icecream": "1f366", "shaved_ice": "1f367", "ice_cream": "1f368", "doughnut": "1f369", "cookie": "1f36a", "birthday": "1f382", "cake": "1f370", "cupcake": "1f9c1", "pie": "1f967", "chocolate_bar": "1f36b", "candy": "1f36c", "lollipop": "1f36d", "custard": "1f36e", "honey_pot": "1f36f", "baby_bottle": "1f37c", "glass_of_milk": "1f95b", "milk_glass": "1f95b", "coffee": "2615", "teapot": "1fad6", "tea": "1f375", "sake": "1f376", "champagne": "1f37e", "wine_glass": "1f377", "cocktail": "1f378", "tropical_drink": "1f379", "beer": "1f37a", "beers": "1f37b", "clinking_glasses": "1f942", "tumbler_glass": "1f943", "cup_with_straw": "1f964", "bubble_tea": "1f9cb", "beverage_box": "1f9c3", "mate_drink": "1f9c9", "ice_cube": "1f9ca", "chopsticks": "1f962", "knife_fork_plate": "1f37d-fe0f", "plate_with_cutlery": "1f37d-fe0f", "fork_and_knife": "1f374", "spoon": "1f944", "hocho": "1f52a", "knife": "1f52a", "amphora": "1f3fa", "earth_africa": "1f30d", "earth_americas": "1f30e", "earth_asia": "1f30f", "globe_with_meridians": "1f310", "world_map": "1f5fa-fe0f", "japan": "1f5fe", "compass": "1f9ed", "snow_capped_mountain": "1f3d4-fe0f", "mountain_snow": "1f3d4-fe0f", "mountain": "26f0-fe0f", "volcano": "1f30b", "mount_fuji": "1f5fb", "camping": "1f3d5-fe0f", "beach_with_umbrella": "1f3d6-fe0f", "beach_umbrella": "1f3d6-fe0f", "desert": "1f3dc-fe0f", "desert_island": "1f3dd-fe0f", "national_park": "1f3de-fe0f", "stadium": "1f3df-fe0f", "classical_building": "1f3db-fe0f", "building_construction": "1f3d7-fe0f", "bricks": "1f9f1", "rock": "1faa8", "wood": "1fab5", "hut": "1f6d6", "house_buildings": "1f3d8-fe0f", "houses": "1f3d8-fe0f", "derelict_house_building": "1f3da-fe0f", "derelict_house": "1f3da-fe0f", "house": "1f3e0", "house_with_garden": "1f3e1", "office": "1f3e2", "post_office": "1f3e3", "european_post_office": "1f3e4", "hospital": "1f3e5", "bank": "1f3e6", "hotel": "1f3e8", "love_hotel": "1f3e9", "convenience_store": "1f3ea", "school": "1f3eb", "department_store": "1f3ec", "factory": "1f3ed", "japanese_castle": "1f3ef", "european_castle": "1f3f0", "wedding": "1f492", "tokyo_tower": "1f5fc", "statue_of_liberty": "1f5fd", "church": "26ea", "mosque": "1f54c", "hindu_temple": "1f6d5", "synagogue": "1f54d", "shinto_shrine": "26e9-fe0f", "kaaba": "1f54b", "fountain": "26f2", "tent": "26fa", "foggy": "1f301", "night_with_stars": "1f303", "cityscape": "1f3d9-fe0f", "sunrise_over_mountains": "1f304", "sunrise": "1f305", "city_sunset": "1f306", "city_sunrise": "1f307", "bridge_at_night": "1f309", "hotsprings": "2668-fe0f", "carousel_horse": "1f3a0", "ferris_wheel": "1f3a1", "roller_coaster": "1f3a2", "barber": "1f488", "circus_tent": "1f3aa", "steam_locomotive": "1f682", "railway_car": "1f683", "bullettrain_side": "1f684", "bullettrain_front": "1f685", "train2": "1f686", "metro": "1f687", "light_rail": "1f688", "station": "1f689", "tram": "1f68a", "monorail": "1f69d", "mountain_railway": "1f69e", "train": "1f68b", "bus": "1f68c", "oncoming_bus": "1f68d", "trolleybus": "1f68e", "minibus": "1f690", "ambulance": "1f691", "fire_engine": "1f692", "police_car": "1f693", "oncoming_police_car": "1f694", "taxi": "1f695", "oncoming_taxi": "1f696", "car": "1f697", "red_car": "1f697", "oncoming_automobile": "1f698", "blue_car": "1f699", "pickup_truck": "1f6fb", "truck": "1f69a", "articulated_lorry": "1f69b", "tractor": "1f69c", "racing_car": "1f3ce-fe0f", "racing_motorcycle": "1f3cd-fe0f", "motorcycle": "1f3cd-fe0f", "motor_scooter": "1f6f5", "manual_wheelchair": "1f9bd", "motorized_wheelchair": "1f9bc", "auto_rickshaw": "1f6fa", "bike": "1f6b2", "scooter": "1f6f4", "kick_scooter": "1f6f4", "skateboard": "1f6f9", "roller_skate": "1f6fc", "busstop": "1f68f", "motorway": "1f6e3-fe0f", "railway_track": "1f6e4-fe0f", "oil_drum": "1f6e2-fe0f", "fuelpump": "26fd", "rotating_light": "1f6a8", "traffic_light": "1f6a5", "vertical_traffic_light": "1f6a6", "octagonal_sign": "1f6d1", "stop_sign": "1f6d1", "construction": "1f6a7", "anchor": "2693", "boat": "26f5", "sailboat": "26f5", "canoe": "1f6f6", "speedboat": "1f6a4", "passenger_ship": "1f6f3-fe0f", "ferry": "26f4-fe0f", "motor_boat": "1f6e5-fe0f", "ship": "1f6a2", "airplane": "2708-fe0f", "small_airplane": "1f6e9-fe0f", "airplane_departure": "1f6eb", "flight_departure": "1f6eb", "airplane_arriving": "1f6ec", "flight_arrival": "1f6ec", "parachute": "1fa82", "seat": "1f4ba", "helicopter": "1f681", "suspension_railway": "1f69f", "mountain_cableway": "1f6a0", "aerial_tramway": "1f6a1", "satellite": "1f6f0-fe0f", "artificial_satellite": "1f6f0-fe0f", "rocket": "1f680", "flying_saucer": "1f6f8", "bellhop_bell": "1f6ce-fe0f", "luggage": "1f9f3", "hourglass": "231b", "hourglass_flowing_sand": "23f3", "watch": "231a", "alarm_clock": "23f0", "stopwatch": "23f1-fe0f", "timer_clock": "23f2-fe0f", "mantelpiece_clock": "1f570-fe0f", "clock12": "1f55b", "clock1230": "1f567", "clock1": "1f550", "clock130": "1f55c", "clock2": "1f551", "clock230": "1f55d", "clock3": "1f552", "clock330": "1f55e", "clock4": "1f553", "clock430": "1f55f", "clock5": "1f554", "clock530": "1f560", "clock6": "1f555", "clock630": "1f561", "clock7": "1f556", "clock730": "1f562", "clock8": "1f557", "clock830": "1f563", "clock9": "1f558", "clock930": "1f564", "clock10": "1f559", "clock1030": "1f565", "clock11": "1f55a", "clock1130": "1f566", "new_moon": "1f311", "waxing_crescent_moon": "1f312", "first_quarter_moon": "1f313", "moon": "1f314", "waxing_gibbous_moon": "1f314", "full_moon": "1f315", "waning_gibbous_moon": "1f316", "last_quarter_moon": "1f317", "waning_crescent_moon": "1f318", "crescent_moon": "1f319", "new_moon_with_face": "1f31a", "first_quarter_moon_with_face": "1f31b", "last_quarter_moon_with_face": "1f31c", "thermometer": "1f321-fe0f", "sunny": "2600-fe0f", "full_moon_with_face": "1f31d", "sun_with_face": "1f31e", "ringed_planet": "1fa90", "star": "2b50", "star2": "1f31f", "stars": "1f320", "milky_way": "1f30c", "cloud": "2601-fe0f", "partly_sunny": "26c5", "thunder_cloud_and_rain": "26c8-fe0f", "cloud_with_lightning_and_rain": "26c8-fe0f", "mostly_sunny": "1f324-fe0f", "sun_small_cloud": "1f324-fe0f", "sun_behind_small_cloud": "1f324-fe0f", "barely_sunny": "1f325-fe0f", "sun_behind_cloud": "1f325-fe0f", "sun_behind_large_cloud": "1f325-fe0f", "partly_sunny_rain": "1f326-fe0f", "sun_behind_rain_cloud": "1f326-fe0f", "rain_cloud": "1f327-fe0f", "cloud_with_rain": "1f327-fe0f", "snow_cloud": "1f328-fe0f", "cloud_with_snow": "1f328-fe0f", "lightning": "1f329-fe0f", "lightning_cloud": "1f329-fe0f", "cloud_with_lightning": "1f329-fe0f", "tornado": "1f32a-fe0f", "tornado_cloud": "1f32a-fe0f", "fog": "1f32b-fe0f", "wind_blowing_face": "1f32c-fe0f", "wind_face": "1f32c-fe0f", "cyclone": "1f300", "rainbow": "1f308", "closed_umbrella": "1f302", "umbrella": "2602-fe0f", "open_umbrella": "2602-fe0f", "umbrella_with_rain_drops": "2614", "umbrella_on_ground": "26f1-fe0f", "parasol_on_ground": "26f1-fe0f", "zap": "26a1", "snowflake": "2744-fe0f", "snowman": "2603-fe0f", "snowman_with_snow": "2603-fe0f", "snowman_without_snow": "26c4", "comet": "2604-fe0f", "fire": "1f525", "droplet": "1f4a7", "ocean": "1f30a", "jack_o_lantern": "1f383", "christmas_tree": "1f384", "fireworks": "1f386", "sparkler": "1f387", "firecracker": "1f9e8", "sparkles": "2728", "balloon": "1f388", "tada": "1f389", "confetti_ball": "1f38a", "tanabata_tree": "1f38b", "bamboo": "1f38d", "dolls": "1f38e", "flags": "1f38f", "wind_chime": "1f390", "rice_scene": "1f391", "red_envelope": "1f9e7", "ribbon": "1f380", "gift": "1f381", "reminder_ribbon": "1f397-fe0f", "admission_tickets": "1f39f-fe0f", "tickets": "1f39f-fe0f", "ticket": "1f3ab", "medal": "1f396-fe0f", "medal_military": "1f396-fe0f", "trophy": "1f3c6", "sports_medal": "1f3c5", "medal_sports": "1f3c5", "first_place_medal": "1f947", "1st_place_medal": "1f947", "second_place_medal": "1f948", "2nd_place_medal": "1f948", "third_place_medal": "1f949", "3rd_place_medal": "1f949", "soccer": "26bd", "baseball": "26be", "softball": "1f94e", "basketball": "1f3c0", "volleyball": "1f3d0", "football": "1f3c8", "rugby_football": "1f3c9", "tennis": "1f3be", "flying_disc": "1f94f", "bowling": "1f3b3", "cricket_bat_and_ball": "1f3cf", "field_hockey_stick_and_ball": "1f3d1", "field_hockey": "1f3d1", "ice_hockey_stick_and_puck": "1f3d2", "ice_hockey": "1f3d2", "lacrosse": "1f94d", "table_tennis_paddle_and_ball": "1f3d3", "ping_pong": "1f3d3", "badminton_racquet_and_shuttlecock": "1f3f8", "badminton": "1f3f8", "boxing_glove": "1f94a", "martial_arts_uniform": "1f94b", "goal_net": "1f945", "golf": "26f3", "ice_skate": "26f8-fe0f", "fishing_pole_and_fish": "1f3a3", "diving_mask": "1f93f", "running_shirt_with_sash": "1f3bd", "ski": "1f3bf", "sled": "1f6f7", "curling_stone": "1f94c", "dart": "1f3af", "yo-yo": "1fa80", "kite": "1fa81", "8ball": "1f3b1", "crystal_ball": "1f52e", "magic_wand": "1fa84", "nazar_amulet": "1f9ff", "video_game": "1f3ae", "joystick": "1f579-fe0f", "slot_machine": "1f3b0", "game_die": "1f3b2", "jigsaw": "1f9e9", "teddy_bear": "1f9f8", "pinata": "1fa85", "nesting_dolls": "1fa86", "spades": "2660-fe0f", "hearts": "2665-fe0f", "diamonds": "2666-fe0f", "clubs": "2663-fe0f", "chess_pawn": "265f-fe0f", "black_joker": "1f0cf", "mahjong": "1f004", "flower_playing_cards": "1f3b4", "performing_arts": "1f3ad", "frame_with_picture": "1f5bc-fe0f", "framed_picture": "1f5bc-fe0f", "art": "1f3a8", "thread": "1f9f5", "sewing_needle": "1faa1", "yarn": "1f9f6", "knot": "1faa2", "eyeglasses": "1f453", "dark_sunglasses": "1f576-fe0f", "goggles": "1f97d", "lab_coat": "1f97c", "safety_vest": "1f9ba", "necktie": "1f454", "shirt": "1f455", "tshirt": "1f455", "jeans": "1f456", "scarf": "1f9e3", "gloves": "1f9e4", "coat": "1f9e5", "socks": "1f9e6", "dress": "1f457", "kimono": "1f458", "sari": "1f97b", "one-piece_swimsuit": "1fa71", "briefs": "1fa72", "shorts": "1fa73", "bikini": "1f459", "womans_clothes": "1f45a", "purse": "1f45b", "handbag": "1f45c", "pouch": "1f45d", "shopping_bags": "1f6cd-fe0f", "shopping": "1f6cd-fe0f", "school_satchel": "1f392", "thong_sandal": "1fa74", "mans_shoe": "1f45e", "shoe": "1f45e", "athletic_shoe": "1f45f", "hiking_boot": "1f97e", "womans_flat_shoe": "1f97f", "high_heel": "1f460", "sandal": "1f461", "ballet_shoes": "1fa70", "boot": "1f462", "crown": "1f451", "womans_hat": "1f452", "tophat": "1f3a9", "mortar_board": "1f393", "billed_cap": "1f9e2", "military_helmet": "1fa96", "helmet_with_white_cross": "26d1-fe0f", "rescue_worker_helmet": "26d1-fe0f", "prayer_beads": "1f4ff", "lipstick": "1f484", "ring": "1f48d", "gem": "1f48e", "mute": "1f507", "speaker": "1f508", "sound": "1f509", "loud_sound": "1f50a", "loudspeaker": "1f4e2", "mega": "1f4e3", "postal_horn": "1f4ef", "bell": "1f514", "no_bell": "1f515", "musical_score": "1f3bc", "musical_note": "1f3b5", "notes": "1f3b6", "studio_microphone": "1f399-fe0f", "level_slider": "1f39a-fe0f", "control_knobs": "1f39b-fe0f", "microphone": "1f3a4", "headphones": "1f3a7", "radio": "1f4fb", "saxophone": "1f3b7", "accordion": "1fa97", "guitar": "1f3b8", "musical_keyboard": "1f3b9", "trumpet": "1f3ba", "violin": "1f3bb", "banjo": "1fa95", "drum_with_drumsticks": "1f941", "drum": "1f941", "long_drum": "1fa98", "iphone": "1f4f1", "calling": "1f4f2", "phone": "260e-fe0f", "telephone": "260e-fe0f", "telephone_receiver": "1f4de", "pager": "1f4df", "fax": "1f4e0", "battery": "1f50b", "electric_plug": "1f50c", "computer": "1f4bb", "desktop_computer": "1f5a5-fe0f", "printer": "1f5a8-fe0f", "keyboard": "2328-fe0f", "three_button_mouse": "1f5b1-fe0f", "computer_mouse": "1f5b1-fe0f", "trackball": "1f5b2-fe0f", "minidisc": "1f4bd", "floppy_disk": "1f4be", "cd": "1f4bf", "dvd": "1f4c0", "abacus": "1f9ee", "movie_camera": "1f3a5", "film_frames": "1f39e-fe0f", "film_strip": "1f39e-fe0f", "film_projector": "1f4fd-fe0f", "clapper": "1f3ac", "tv": "1f4fa", "camera": "1f4f7", "camera_with_flash": "1f4f8", "camera_flash": "1f4f8", "video_camera": "1f4f9", "vhs": "1f4fc", "mag": "1f50d", "mag_right": "1f50e", "candle": "1f56f-fe0f", "bulb": "1f4a1", "flashlight": "1f526", "izakaya_lantern": "1f3ee", "lantern": "1f3ee", "diya_lamp": "1fa94", "notebook_with_decorative_cover": "1f4d4", "closed_book": "1f4d5", "book": "1f4d6", "open_book": "1f4d6", "green_book": "1f4d7", "blue_book": "1f4d8", "orange_book": "1f4d9", "books": "1f4da", "notebook": "1f4d3", "ledger": "1f4d2", "page_with_curl": "1f4c3", "scroll": "1f4dc", "page_facing_up": "1f4c4", "newspaper": "1f4f0", "rolled_up_newspaper": "1f5de-fe0f", "newspaper_roll": "1f5de-fe0f", "bookmark_tabs": "1f4d1", "bookmark": "1f516", "label": "1f3f7-fe0f", "moneybag": "1f4b0", "coin": "1fa99", "yen": "1f4b4", "dollar": "1f4b5", "euro": "1f4b6", "pound": "1f4b7", "money_with_wings": "1f4b8", "credit_card": "1f4b3", "receipt": "1f9fe", "chart": "1f4b9", "email": "2709-fe0f", "envelope": "2709-fe0f", "e-mail": "1f4e7", "incoming_envelope": "1f4e8", "envelope_with_arrow": "1f4e9", "outbox_tray": "1f4e4", "inbox_tray": "1f4e5", "package": "1f4e6", "mailbox": "1f4eb", "mailbox_closed": "1f4ea", "mailbox_with_mail": "1f4ec", "mailbox_with_no_mail": "1f4ed", "postbox": "1f4ee", "ballot_box_with_ballot": "1f5f3-fe0f", "ballot_box": "1f5f3-fe0f", "pencil2": "270f-fe0f", "black_nib": "2712-fe0f", "lower_left_fountain_pen": "1f58b-fe0f", "fountain_pen": "1f58b-fe0f", "lower_left_ballpoint_pen": "1f58a-fe0f", "pen": "1f58a-fe0f", "lower_left_paintbrush": "1f58c-fe0f", "paintbrush": "1f58c-fe0f", "lower_left_crayon": "1f58d-fe0f", "crayon": "1f58d-fe0f", "memo": "1f4dd", "pencil": "1f4dd", "briefcase": "1f4bc", "file_folder": "1f4c1", "open_file_folder": "1f4c2", "card_index_dividers": "1f5c2-fe0f", "date": "1f4c5", "calendar": "1f4c6", "spiral_note_pad": "1f5d2-fe0f", "spiral_notepad": "1f5d2-fe0f", "spiral_calendar_pad": "1f5d3-fe0f", "spiral_calendar": "1f5d3-fe0f", "card_index": "1f4c7", "chart_with_upwards_trend": "1f4c8", "chart_with_downwards_trend": "1f4c9", "bar_chart": "1f4ca", "clipboard": "1f4cb", "pushpin": "1f4cc", "round_pushpin": "1f4cd", "paperclip": "1f4ce", "linked_paperclips": "1f587-fe0f", "paperclips": "1f587-fe0f", "straight_ruler": "1f4cf", "triangular_ruler": "1f4d0", "scissors": "2702-fe0f", "card_file_box": "1f5c3-fe0f", "file_cabinet": "1f5c4-fe0f", "wastebasket": "1f5d1-fe0f", "lock": "1f512", "unlock": "1f513", "lock_with_ink_pen": "1f50f", "closed_lock_with_key": "1f510", "key": "1f511", "old_key": "1f5dd-fe0f", "hammer": "1f528", "axe": "1fa93", "pick": "26cf-fe0f", "hammer_and_pick": "2692-fe0f", "hammer_and_wrench": "1f6e0-fe0f", "dagger_knife": "1f5e1-fe0f", "dagger": "1f5e1-fe0f", "crossed_swords": "2694-fe0f", "gun": "1f52b", "boomerang": "1fa83", "bow_and_arrow": "1f3f9", "shield": "1f6e1-fe0f", "carpentry_saw": "1fa9a", "wrench": "1f527", "screwdriver": "1fa9b", "nut_and_bolt": "1f529", "gear": "2699-fe0f", "compression": "1f5dc-fe0f", "clamp": "1f5dc-fe0f", "scales": "2696-fe0f", "balance_scale": "2696-fe0f", "probing_cane": "1f9af", "link": "1f517", "chains": "26d3-fe0f", "hook": "1fa9d", "toolbox": "1f9f0", "magnet": "1f9f2", "ladder": "1fa9c", "alembic": "2697-fe0f", "test_tube": "1f9ea", "petri_dish": "1f9eb", "dna": "1f9ec", "microscope": "1f52c", "telescope": "1f52d", "satellite_antenna": "1f4e1", "syringe": "1f489", "drop_of_blood": "1fa78", "pill": "1f48a", "adhesive_bandage": "1fa79", "stethoscope": "1fa7a", "door": "1f6aa", "elevator": "1f6d7", "mirror": "1fa9e", "window": "1fa9f", "bed": "1f6cf-fe0f", "couch_and_lamp": "1f6cb-fe0f", "chair": "1fa91", "toilet": "1f6bd", "plunger": "1faa0", "shower": "1f6bf", "bathtub": "1f6c1", "mouse_trap": "1faa4", "razor": "1fa92", "lotion_bottle": "1f9f4", "safety_pin": "1f9f7", "broom": "1f9f9", "basket": "1f9fa", "roll_of_paper": "1f9fb", "bucket": "1faa3", "soap": "1f9fc", "toothbrush": "1faa5", "sponge": "1f9fd", "fire_extinguisher": "1f9ef", "shopping_trolley": "1f6d2", "shopping_cart": "1f6d2", "smoking": "1f6ac", "coffin": "26b0-fe0f", "headstone": "1faa6", "funeral_urn": "26b1-fe0f", "moyai": "1f5ff", "placard": "1faa7", "atm": "1f3e7", "put_litter_in_its_place": "1f6ae", "potable_water": "1f6b0", "wheelchair": "267f", "mens": "1f6b9", "womens": "1f6ba", "restroom": "1f6bb", "baby_symbol": "1f6bc", "wc": "1f6be", "passport_control": "1f6c2", "customs": "1f6c3", "baggage_claim": "1f6c4", "left_luggage": "1f6c5", "warning": "26a0-fe0f", "children_crossing": "1f6b8", "no_entry": "26d4", "no_entry_sign": "1f6ab", "no_bicycles": "1f6b3", "no_smoking": "1f6ad", "do_not_litter": "1f6af", "non-potable_water": "1f6b1", "no_pedestrians": "1f6b7", "no_mobile_phones": "1f4f5", "underage": "1f51e", "radioactive_sign": "2622-fe0f", "radioactive": "2622-fe0f", "biohazard_sign": "2623-fe0f", "biohazard": "2623-fe0f", "arrow_up": "2b06-fe0f", "arrow_upper_right": "2197-fe0f", "arrow_right": "27a1-fe0f", "arrow_lower_right": "2198-fe0f", "arrow_down": "2b07-fe0f", "arrow_lower_left": "2199-fe0f", "arrow_left": "2b05-fe0f", "arrow_upper_left": "2196-fe0f", "arrow_up_down": "2195-fe0f", "left_right_arrow": "2194-fe0f", "leftwards_arrow_with_hook": "21a9-fe0f", "arrow_right_hook": "21aa-fe0f", "arrow_heading_up": "2934-fe0f", "arrow_heading_down": "2935-fe0f", "arrows_clockwise": "1f503", "arrows_counterclockwise": "1f504", "back": "1f519", "end": "1f51a", "on": "1f51b", "soon": "1f51c", "top": "1f51d", "place_of_worship": "1f6d0", "atom_symbol": "269b-fe0f", "om_symbol": "1f549-fe0f", "om": "1f549-fe0f", "star_of_david": "2721-fe0f", "wheel_of_dharma": "2638-fe0f", "yin_yang": "262f-fe0f", "latin_cross": "271d-fe0f", "orthodox_cross": "2626-fe0f", "star_and_crescent": "262a-fe0f", "peace_symbol": "262e-fe0f", "menorah_with_nine_branches": "1f54e", "menorah": "1f54e", "six_pointed_star": "1f52f", "aries": "2648", "taurus": "2649", "gemini": "264a", "cancer": "264b", "leo": "264c", "virgo": "264d", "libra": "264e", "scorpius": "264f", "sagittarius": "2650", "capricorn": "2651", "aquarius": "2652", "pisces": "2653", "ophiuchus": "26ce", "twisted_rightwards_arrows": "1f500", "repeat": "1f501", "repeat_one": "1f502", "arrow_forward": "25b6-fe0f", "fast_forward": "23e9", "black_right_pointing_double_triangle_with_vertical_bar": "23ed-fe0f", "next_track_button": "23ed-fe0f", "black_right_pointing_triangle_with_double_vertical_bar": "23ef-fe0f", "play_or_pause_button": "23ef-fe0f", "arrow_backward": "25c0-fe0f", "rewind": "23ea", "black_left_pointing_double_triangle_with_vertical_bar": "23ee-fe0f", "previous_track_button": "23ee-fe0f", "arrow_up_small": "1f53c", "arrow_double_up": "23eb", "arrow_down_small": "1f53d", "arrow_double_down": "23ec", "double_vertical_bar": "23f8-fe0f", "pause_button": "23f8-fe0f", "black_square_for_stop": "23f9-fe0f", "stop_button": "23f9-fe0f", "black_circle_for_record": "23fa-fe0f", "record_button": "23fa-fe0f", "eject": "23cf-fe0f", "cinema": "1f3a6", "low_brightness": "1f505", "high_brightness": "1f506", "signal_strength": "1f4f6", "vibration_mode": "1f4f3", "mobile_phone_off": "1f4f4", "female_sign": "2640-fe0f", "male_sign": "2642-fe0f", "transgender_symbol": "26a7-fe0f", "heavy_multiplication_x": "2716-fe0f", "heavy_plus_sign": "2795", "heavy_minus_sign": "2796", "heavy_division_sign": "2797", "infinity": "267e-fe0f", "bangbang": "203c-fe0f", "interrobang": "2049-fe0f", "question": "2753", "grey_question": "2754", "grey_exclamation": "2755", "exclamation": "2757", "heavy_exclamation_mark": "2757", "wavy_dash": "3030-fe0f", "currency_exchange": "1f4b1", "heavy_dollar_sign": "1f4b2", "medical_symbol": "2695-fe0f", "staff_of_aesculapius": "2695-fe0f", "recycle": "267b-fe0f", "fleur_de_lis": "269c-fe0f", "trident": "1f531", "name_badge": "1f4db", "beginner": "1f530", "o": "2b55", "white_check_mark": "2705", "ballot_box_with_check": "2611-fe0f", "heavy_check_mark": "2714-fe0f", "x": "274c", "negative_squared_cross_mark": "274e", "curly_loop": "27b0", "loop": "27bf", "part_alternation_mark": "303d-fe0f", "eight_spoked_asterisk": "2733-fe0f", "eight_pointed_black_star": "2734-fe0f", "sparkle": "2747-fe0f", "copyright": "00a9-fe0f", "registered": "00ae-fe0f", "tm": "2122-fe0f", "hash": "0023-fe0f-20e3", "keycap_star": "002a-fe0f-20e3", "asterisk": "002a-fe0f-20e3", "zero": "0030-fe0f-20e3", "one": "0031-fe0f-20e3", "two": "0032-fe0f-20e3", "three": "0033-fe0f-20e3", "four": "0034-fe0f-20e3", "five": "0035-fe0f-20e3", "six": "0036-fe0f-20e3", "seven": "0037-fe0f-20e3", "eight": "0038-fe0f-20e3", "nine": "0039-fe0f-20e3", "keycap_ten": "1f51f", "capital_abcd": "1f520", "abcd": "1f521", "1234": "1f522", "symbols": "1f523", "abc": "1f524", "a": "1f170-fe0f", "ab": "1f18e", "b": "1f171-fe0f", "cl": "1f191", "cool": "1f192", "free": "1f193", "information_source": "2139-fe0f", "id": "1f194", "m": "24c2-fe0f", "new": "1f195", "ng": "1f196", "o2": "1f17e-fe0f", "ok": "1f197", "parking": "1f17f-fe0f", "sos": "1f198", "up": "1f199", "vs": "1f19a", "koko": "1f201", "sa": "1f202-fe0f", "u6708": "1f237-fe0f", "u6709": "1f236", "u6307": "1f22f", "ideograph_advantage": "1f250", "u5272": "1f239", "u7121": "1f21a", "u7981": "1f232", "accept": "1f251", "u7533": "1f238", "u5408": "1f234", "u7a7a": "1f233", "congratulations": "3297-fe0f", "secret": "3299-fe0f", "u55b6": "1f23a", "u6e80": "1f235", "red_circle": "1f534", "large_orange_circle": "1f7e0", "large_yellow_circle": "1f7e1", "large_green_circle": "1f7e2", "large_blue_circle": "1f535", "large_purple_circle": "1f7e3", "large_brown_circle": "1f7e4", "black_circle": "26ab", "white_circle": "26aa", "large_red_square": "1f7e5", "large_orange_square": "1f7e7", "large_yellow_square": "1f7e8", "large_green_square": "1f7e9", "large_blue_square": "1f7e6", "large_purple_square": "1f7ea", "large_brown_square": "1f7eb", "black_large_square": "2b1b", "white_large_square": "2b1c", "black_medium_square": "25fc-fe0f", "white_medium_square": "25fb-fe0f", "black_medium_small_square": "25fe", "white_medium_small_square": "25fd", "black_small_square": "25aa-fe0f", "white_small_square": "25ab-fe0f", "large_orange_diamond": "1f536", "large_blue_diamond": "1f537", "small_orange_diamond": "1f538", "small_blue_diamond": "1f539", "small_red_triangle": "1f53a", "small_red_triangle_down": "1f53b", "diamond_shape_with_a_dot_inside": "1f4a0", "radio_button": "1f518", "white_square_button": "1f533", "black_square_button": "1f532", "checkered_flag": "1f3c1", "triangular_flag_on_post": "1f6a9", "crossed_flags": "1f38c", "waving_black_flag": "1f3f4", "black_flag": "1f3f4", "waving_white_flag": "1f3f3-fe0f", "white_flag": "1f3f3-fe0f", "rainbow-flag": "1f3f3-fe0f-200d-1f308", "rainbow_flag": "1f3f3-fe0f-200d-1f308", "transgender_flag": "1f3f3-fe0f-200d-26a7-fe0f", "pirate_flag": "1f3f4-200d-2620-fe0f", "flag-ac": "1f1e6-1f1e8", "flag-ad": "1f1e6-1f1e9", "andorra": "1f1e6-1f1e9", "flag-ae": "1f1e6-1f1ea", "united_arab_emirates": "1f1e6-1f1ea", "flag-af": "1f1e6-1f1eb", "afghanistan": "1f1e6-1f1eb", "flag-ag": "1f1e6-1f1ec", "antigua_barbuda": "1f1e6-1f1ec", "flag-ai": "1f1e6-1f1ee", "anguilla": "1f1e6-1f1ee", "flag-al": "1f1e6-1f1f1", "albania": "1f1e6-1f1f1", "flag-am": "1f1e6-1f1f2", "armenia": "1f1e6-1f1f2", "flag-ao": "1f1e6-1f1f4", "angola": "1f1e6-1f1f4", "flag-aq": "1f1e6-1f1f6", "antarctica": "1f1e6-1f1f6", "flag-ar": "1f1e6-1f1f7", "argentina": "1f1e6-1f1f7", "flag-as": "1f1e6-1f1f8", "american_samoa": "1f1e6-1f1f8", "flag-at": "1f1e6-1f1f9", "austria": "1f1e6-1f1f9", "flag-au": "1f1e6-1f1fa", "australia": "1f1e6-1f1fa", "flag-aw": "1f1e6-1f1fc", "aruba": "1f1e6-1f1fc", "flag-ax": "1f1e6-1f1fd", "aland_islands": "1f1e6-1f1fd", "flag-az": "1f1e6-1f1ff", "azerbaijan": "1f1e6-1f1ff", "flag-ba": "1f1e7-1f1e6", "bosnia_herzegovina": "1f1e7-1f1e6", "flag-bb": "1f1e7-1f1e7", "barbados": "1f1e7-1f1e7", "flag-bd": "1f1e7-1f1e9", "bangladesh": "1f1e7-1f1e9", "flag-be": "1f1e7-1f1ea", "belgium": "1f1e7-1f1ea", "flag-bf": "1f1e7-1f1eb", "burkina_faso": "1f1e7-1f1eb", "flag-bg": "1f1e7-1f1ec", "bulgaria": "1f1e7-1f1ec", "flag-bh": "1f1e7-1f1ed", "bahrain": "1f1e7-1f1ed", "flag-bi": "1f1e7-1f1ee", "burundi": "1f1e7-1f1ee", "flag-bj": "1f1e7-1f1ef", "benin": "1f1e7-1f1ef", "flag-bl": "1f1e7-1f1f1", "st_barthelemy": "1f1e7-1f1f1", "flag-bm": "1f1e7-1f1f2", "bermuda": "1f1e7-1f1f2", "flag-bn": "1f1e7-1f1f3", "brunei": "1f1e7-1f1f3", "flag-bo": "1f1e7-1f1f4", "bolivia": "1f1e7-1f1f4", "flag-bq": "1f1e7-1f1f6", "caribbean_netherlands": "1f1e7-1f1f6", "flag-br": "1f1e7-1f1f7", "brazil": "1f1e7-1f1f7", "flag-bs": "1f1e7-1f1f8", "bahamas": "1f1e7-1f1f8", "flag-bt": "1f1e7-1f1f9", "bhutan": "1f1e7-1f1f9", "flag-bv": "1f1e7-1f1fb", "flag-bw": "1f1e7-1f1fc", "botswana": "1f1e7-1f1fc", "flag-by": "1f1e7-1f1fe", "belarus": "1f1e7-1f1fe", "flag-bz": "1f1e7-1f1ff", "belize": "1f1e7-1f1ff", "flag-ca": "1f1e8-1f1e6", "ca": "1f1e8-1f1e6", "canada": "1f1e8-1f1e6", "flag-cc": "1f1e8-1f1e8", "cocos_islands": "1f1e8-1f1e8", "flag-cd": "1f1e8-1f1e9", "congo_kinshasa": "1f1e8-1f1e9", "flag-cf": "1f1e8-1f1eb", "central_african_republic": "1f1e8-1f1eb", "flag-cg": "1f1e8-1f1ec", "congo_brazzaville": "1f1e8-1f1ec", "flag-ch": "1f1e8-1f1ed", "switzerland": "1f1e8-1f1ed", "flag-ci": "1f1e8-1f1ee", "cote_divoire": "1f1e8-1f1ee", "flag-ck": "1f1e8-1f1f0", "cook_islands": "1f1e8-1f1f0", "flag-cl": "1f1e8-1f1f1", "chile": "1f1e8-1f1f1", "flag-cm": "1f1e8-1f1f2", "cameroon": "1f1e8-1f1f2", "cn": "1f1e8-1f1f3", "flag-cn": "1f1e8-1f1f3", "flag-co": "1f1e8-1f1f4", "colombia": "1f1e8-1f1f4", "flag-cp": "1f1e8-1f1f5", "flag-cr": "1f1e8-1f1f7", "costa_rica": "1f1e8-1f1f7", "flag-cu": "1f1e8-1f1fa", "cuba": "1f1e8-1f1fa", "flag-cv": "1f1e8-1f1fb", "cape_verde": "1f1e8-1f1fb", "flag-cw": "1f1e8-1f1fc", "curacao": "1f1e8-1f1fc", "flag-cx": "1f1e8-1f1fd", "christmas_island": "1f1e8-1f1fd", "flag-cy": "1f1e8-1f1fe", "cyprus": "1f1e8-1f1fe", "flag-cz": "1f1e8-1f1ff", "czech_republic": "1f1e8-1f1ff", "de": "1f1e9-1f1ea", "flag-de": "1f1e9-1f1ea", "flag-dg": "1f1e9-1f1ec", "flag-dj": "1f1e9-1f1ef", "djibouti": "1f1e9-1f1ef", "flag-dk": "1f1e9-1f1f0", "denmark": "1f1e9-1f1f0", "flag-dm": "1f1e9-1f1f2", "dominica": "1f1e9-1f1f2", "flag-do": "1f1e9-1f1f4", "dominican_republic": "1f1e9-1f1f4", "flag-dz": "1f1e9-1f1ff", "algeria": "1f1e9-1f1ff", "flag-ea": "1f1ea-1f1e6", "flag-ec": "1f1ea-1f1e8", "ecuador": "1f1ea-1f1e8", "flag-ee": "1f1ea-1f1ea", "estonia": "1f1ea-1f1ea", "flag-eg": "1f1ea-1f1ec", "egypt": "1f1ea-1f1ec", "flag-eh": "1f1ea-1f1ed", "western_sahara": "1f1ea-1f1ed", "flag-er": "1f1ea-1f1f7", "eritrea": "1f1ea-1f1f7", "es": "1f1ea-1f1f8", "flag-es": "1f1ea-1f1f8", "flag-et": "1f1ea-1f1f9", "ethiopia": "1f1ea-1f1f9", "flag-eu": "1f1ea-1f1fa", "eu": "1f1ea-1f1fa", "european_union": "1f1ea-1f1fa", "flag-fi": "1f1eb-1f1ee", "finland": "1f1eb-1f1ee", "flag-fj": "1f1eb-1f1ef", "fiji": "1f1eb-1f1ef", "flag-fk": "1f1eb-1f1f0", "falkland_islands": "1f1eb-1f1f0", "flag-fm": "1f1eb-1f1f2", "micronesia": "1f1eb-1f1f2", "flag-fo": "1f1eb-1f1f4", "faroe_islands": "1f1eb-1f1f4", "fr": "1f1eb-1f1f7", "flag-fr": "1f1eb-1f1f7", "flag-ga": "1f1ec-1f1e6", "gabon": "1f1ec-1f1e6", "gb": "1f1ec-1f1e7", "uk": "1f1ec-1f1e7", "flag-gb": "1f1ec-1f1e7", "flag-gd": "1f1ec-1f1e9", "grenada": "1f1ec-1f1e9", "flag-ge": "1f1ec-1f1ea", "georgia": "1f1ec-1f1ea", "flag-gf": "1f1ec-1f1eb", "french_guiana": "1f1ec-1f1eb", "flag-gg": "1f1ec-1f1ec", "guernsey": "1f1ec-1f1ec", "flag-gh": "1f1ec-1f1ed", "ghana": "1f1ec-1f1ed", "flag-gi": "1f1ec-1f1ee", "gibraltar": "1f1ec-1f1ee", "flag-gl": "1f1ec-1f1f1", "greenland": "1f1ec-1f1f1", "flag-gm": "1f1ec-1f1f2", "gambia": "1f1ec-1f1f2", "flag-gn": "1f1ec-1f1f3", "guinea": "1f1ec-1f1f3", "flag-gp": "1f1ec-1f1f5", "guadeloupe": "1f1ec-1f1f5", "flag-gq": "1f1ec-1f1f6", "equatorial_guinea": "1f1ec-1f1f6", "flag-gr": "1f1ec-1f1f7", "greece": "1f1ec-1f1f7", "flag-gs": "1f1ec-1f1f8", "south_georgia_south_sandwich_islands": "1f1ec-1f1f8", "flag-gt": "1f1ec-1f1f9", "guatemala": "1f1ec-1f1f9", "flag-gu": "1f1ec-1f1fa", "guam": "1f1ec-1f1fa", "flag-gw": "1f1ec-1f1fc", "guinea_bissau": "1f1ec-1f1fc", "flag-gy": "1f1ec-1f1fe", "guyana": "1f1ec-1f1fe", "flag-hk": "1f1ed-1f1f0", "hong_kong": "1f1ed-1f1f0", "flag-hm": "1f1ed-1f1f2", "flag-hn": "1f1ed-1f1f3", "honduras": "1f1ed-1f1f3", "flag-hr": "1f1ed-1f1f7", "croatia": "1f1ed-1f1f7", "flag-ht": "1f1ed-1f1f9", "haiti": "1f1ed-1f1f9", "flag-hu": "1f1ed-1f1fa", "hungary": "1f1ed-1f1fa", "flag-ic": "1f1ee-1f1e8", "canary_islands": "1f1ee-1f1e8", "flag-id": "1f1ee-1f1e9", "indonesia": "1f1ee-1f1e9", "flag-ie": "1f1ee-1f1ea", "ireland": "1f1ee-1f1ea", "flag-il": "1f1ee-1f1f1", "israel": "1f1ee-1f1f1", "flag-im": "1f1ee-1f1f2", "isle_of_man": "1f1ee-1f1f2", "flag-in": "1f1ee-1f1f3", "india": "1f1ee-1f1f3", "flag-io": "1f1ee-1f1f4", "british_indian_ocean_territory": "1f1ee-1f1f4", "flag-iq": "1f1ee-1f1f6", "iraq": "1f1ee-1f1f6", "flag-ir": "1f1ee-1f1f7", "iran": "1f1ee-1f1f7", "flag-is": "1f1ee-1f1f8", "iceland": "1f1ee-1f1f8", "it": "1f1ee-1f1f9", "flag-it": "1f1ee-1f1f9", "flag-je": "1f1ef-1f1ea", "jersey": "1f1ef-1f1ea", "flag-jm": "1f1ef-1f1f2", "jamaica": "1f1ef-1f1f2", "flag-jo": "1f1ef-1f1f4", "jordan": "1f1ef-1f1f4", "jp": "1f1ef-1f1f5", "flag-jp": "1f1ef-1f1f5", "flag-ke": "1f1f0-1f1ea", "kenya": "1f1f0-1f1ea", "flag-kg": "1f1f0-1f1ec", "kyrgyzstan": "1f1f0-1f1ec", "flag-kh": "1f1f0-1f1ed", "cambodia": "1f1f0-1f1ed", "flag-ki": "1f1f0-1f1ee", "kiribati": "1f1f0-1f1ee", "flag-km": "1f1f0-1f1f2", "comoros": "1f1f0-1f1f2", "flag-kn": "1f1f0-1f1f3", "st_kitts_nevis": "1f1f0-1f1f3", "flag-kp": "1f1f0-1f1f5", "north_korea": "1f1f0-1f1f5", "kr": "1f1f0-1f1f7", "flag-kr": "1f1f0-1f1f7", "flag-kw": "1f1f0-1f1fc", "kuwait": "1f1f0-1f1fc", "flag-ky": "1f1f0-1f1fe", "cayman_islands": "1f1f0-1f1fe", "flag-kz": "1f1f0-1f1ff", "kazakhstan": "1f1f0-1f1ff", "flag-la": "1f1f1-1f1e6", "laos": "1f1f1-1f1e6", "flag-lb": "1f1f1-1f1e7", "lebanon": "1f1f1-1f1e7", "flag-lc": "1f1f1-1f1e8", "st_lucia": "1f1f1-1f1e8", "flag-li": "1f1f1-1f1ee", "liechtenstein": "1f1f1-1f1ee", "flag-lk": "1f1f1-1f1f0", "sri_lanka": "1f1f1-1f1f0", "flag-lr": "1f1f1-1f1f7", "liberia": "1f1f1-1f1f7", "flag-ls": "1f1f1-1f1f8", "lesotho": "1f1f1-1f1f8", "flag-lt": "1f1f1-1f1f9", "lithuania": "1f1f1-1f1f9", "flag-lu": "1f1f1-1f1fa", "luxembourg": "1f1f1-1f1fa", "flag-lv": "1f1f1-1f1fb", "latvia": "1f1f1-1f1fb", "flag-ly": "1f1f1-1f1fe", "libya": "1f1f1-1f1fe", "flag-ma": "1f1f2-1f1e6", "morocco": "1f1f2-1f1e6", "flag-mc": "1f1f2-1f1e8", "monaco": "1f1f2-1f1e8", "flag-md": "1f1f2-1f1e9", "moldova": "1f1f2-1f1e9", "flag-me": "1f1f2-1f1ea", "montenegro": "1f1f2-1f1ea", "flag-mf": "1f1f2-1f1eb", "flag-mg": "1f1f2-1f1ec", "madagascar": "1f1f2-1f1ec", "flag-mh": "1f1f2-1f1ed", "marshall_islands": "1f1f2-1f1ed", "flag-mk": "1f1f2-1f1f0", "macedonia": "1f1f2-1f1f0", "flag-ml": "1f1f2-1f1f1", "mali": "1f1f2-1f1f1", "flag-mm": "1f1f2-1f1f2", "myanmar": "1f1f2-1f1f2", "flag-mn": "1f1f2-1f1f3", "mongolia": "1f1f2-1f1f3", "flag-mo": "1f1f2-1f1f4", "macau": "1f1f2-1f1f4", "flag-mp": "1f1f2-1f1f5", "northern_mariana_islands": "1f1f2-1f1f5", "flag-mq": "1f1f2-1f1f6", "martinique": "1f1f2-1f1f6", "flag-mr": "1f1f2-1f1f7", "mauritania": "1f1f2-1f1f7", "flag-ms": "1f1f2-1f1f8", "montserrat": "1f1f2-1f1f8", "flag-mt": "1f1f2-1f1f9", "malta": "1f1f2-1f1f9", "flag-mu": "1f1f2-1f1fa", "mauritius": "1f1f2-1f1fa", "flag-mv": "1f1f2-1f1fb", "maldives": "1f1f2-1f1fb", "flag-mw": "1f1f2-1f1fc", "malawi": "1f1f2-1f1fc", "flag-mx": "1f1f2-1f1fd", "mexico": "1f1f2-1f1fd", "flag-my": "1f1f2-1f1fe", "malaysia": "1f1f2-1f1fe", "flag-mz": "1f1f2-1f1ff", "mozambique": "1f1f2-1f1ff", "flag-na": "1f1f3-1f1e6", "namibia": "1f1f3-1f1e6", "flag-nc": "1f1f3-1f1e8", "new_caledonia": "1f1f3-1f1e8", "flag-ne": "1f1f3-1f1ea", "niger": "1f1f3-1f1ea", "flag-nf": "1f1f3-1f1eb", "norfolk_island": "1f1f3-1f1eb", "flag-ng": "1f1f3-1f1ec", "nigeria": "1f1f3-1f1ec", "flag-ni": "1f1f3-1f1ee", "nicaragua": "1f1f3-1f1ee", "flag-nl": "1f1f3-1f1f1", "netherlands": "1f1f3-1f1f1", "flag-no": "1f1f3-1f1f4", "norway": "1f1f3-1f1f4", "flag-np": "1f1f3-1f1f5", "nepal": "1f1f3-1f1f5", "flag-nr": "1f1f3-1f1f7", "nauru": "1f1f3-1f1f7", "flag-nu": "1f1f3-1f1fa", "niue": "1f1f3-1f1fa", "flag-nz": "1f1f3-1f1ff", "new_zealand": "1f1f3-1f1ff", "flag-om": "1f1f4-1f1f2", "oman": "1f1f4-1f1f2", "flag-pa": "1f1f5-1f1e6", "panama": "1f1f5-1f1e6", "flag-pe": "1f1f5-1f1ea", "peru": "1f1f5-1f1ea", "flag-pf": "1f1f5-1f1eb", "french_polynesia": "1f1f5-1f1eb", "flag-pg": "1f1f5-1f1ec", "papua_new_guinea": "1f1f5-1f1ec", "flag-ph": "1f1f5-1f1ed", "philippines": "1f1f5-1f1ed", "flag-pk": "1f1f5-1f1f0", "pakistan": "1f1f5-1f1f0", "pk": "1f1f5-1f1f0", "flag-pl": "1f1f5-1f1f1", "poland": "1f1f5-1f1f1", "flag-pm": "1f1f5-1f1f2", "st_pierre_miquelon": "1f1f5-1f1f2", "flag-pn": "1f1f5-1f1f3", "pitcairn_islands": "1f1f5-1f1f3", "flag-pr": "1f1f5-1f1f7", "puerto_rico": "1f1f5-1f1f7", "flag-ps": "1f1f5-1f1f8", "palestinian_territories": "1f1f5-1f1f8", "flag-pt": "1f1f5-1f1f9", "portugal": "1f1f5-1f1f9", "flag-pw": "1f1f5-1f1fc", "palau": "1f1f5-1f1fc", "flag-py": "1f1f5-1f1fe", "paraguay": "1f1f5-1f1fe", "flag-qa": "1f1f6-1f1e6", "qatar": "1f1f6-1f1e6", "flag-re": "1f1f7-1f1ea", "reunion": "1f1f7-1f1ea", "flag-ro": "1f1f7-1f1f4", "romania": "1f1f7-1f1f4", "flag-rs": "1f1f7-1f1f8", "serbia": "1f1f7-1f1f8", "ru": "1f1f7-1f1fa", "flag-ru": "1f1f7-1f1fa", "flag-rw": "1f1f7-1f1fc", "rwanda": "1f1f7-1f1fc", "flag-sa": "1f1f8-1f1e6", "saudi_arabia": "1f1f8-1f1e6", "flag-sb": "1f1f8-1f1e7", "solomon_islands": "1f1f8-1f1e7", "flag-sc": "1f1f8-1f1e8", "seychelles": "1f1f8-1f1e8", "flag-sd": "1f1f8-1f1e9", "sudan": "1f1f8-1f1e9", "flag-se": "1f1f8-1f1ea", "sweden": "1f1f8-1f1ea", "flag-sg": "1f1f8-1f1ec", "singapore": "1f1f8-1f1ec", "flag-sh": "1f1f8-1f1ed", "st_helena": "1f1f8-1f1ed", "flag-si": "1f1f8-1f1ee", "slovenia": "1f1f8-1f1ee", "flag-sj": "1f1f8-1f1ef", "flag-sk": "1f1f8-1f1f0", "slovakia": "1f1f8-1f1f0", "flag-sl": "1f1f8-1f1f1", "sierra_leone": "1f1f8-1f1f1", "flag-sm": "1f1f8-1f1f2", "san_marino": "1f1f8-1f1f2", "flag-sn": "1f1f8-1f1f3", "senegal": "1f1f8-1f1f3", "flag-so": "1f1f8-1f1f4", "somalia": "1f1f8-1f1f4", "flag-sr": "1f1f8-1f1f7", "suriname": "1f1f8-1f1f7", "flag-ss": "1f1f8-1f1f8", "south_sudan": "1f1f8-1f1f8", "flag-st": "1f1f8-1f1f9", "sao_tome_principe": "1f1f8-1f1f9", "flag-sv": "1f1f8-1f1fb", "el_salvador": "1f1f8-1f1fb", "flag-sx": "1f1f8-1f1fd", "sint_maarten": "1f1f8-1f1fd", "flag-sy": "1f1f8-1f1fe", "syria": "1f1f8-1f1fe", "flag-sz": "1f1f8-1f1ff", "swaziland": "1f1f8-1f1ff", "flag-ta": "1f1f9-1f1e6", "flag-tc": "1f1f9-1f1e8", "turks_caicos_islands": "1f1f9-1f1e8", "flag-td": "1f1f9-1f1e9", "chad": "1f1f9-1f1e9", "flag-tf": "1f1f9-1f1eb", "french_southern_territories": "1f1f9-1f1eb", "flag-tg": "1f1f9-1f1ec", "togo": "1f1f9-1f1ec", "flag-th": "1f1f9-1f1ed", "thailand": "1f1f9-1f1ed", "flag-tj": "1f1f9-1f1ef", "tajikistan": "1f1f9-1f1ef", "flag-tk": "1f1f9-1f1f0", "tokelau": "1f1f9-1f1f0", "flag-tl": "1f1f9-1f1f1", "timor_leste": "1f1f9-1f1f1", "flag-tm": "1f1f9-1f1f2", "turkmenistan": "1f1f9-1f1f2", "flag-tn": "1f1f9-1f1f3", "tunisia": "1f1f9-1f1f3", "flag-to": "1f1f9-1f1f4", "tonga": "1f1f9-1f1f4", "flag-tr": "1f1f9-1f1f7", "tr": "1f1f9-1f1f7", "flag-tt": "1f1f9-1f1f9", "trinidad_tobago": "1f1f9-1f1f9", "flag-tv": "1f1f9-1f1fb", "tuvalu": "1f1f9-1f1fb", "flag-tw": "1f1f9-1f1fc", "taiwan": "1f1f9-1f1fc", "flag-tz": "1f1f9-1f1ff", "tanzania": "1f1f9-1f1ff", "flag-ua": "1f1fa-1f1e6", "ukraine": "1f1fa-1f1e6", "flag-ug": "1f1fa-1f1ec", "uganda": "1f1fa-1f1ec", "flag-um": "1f1fa-1f1f2", "flag-un": "1f1fa-1f1f3", "us": "1f1fa-1f1f8", "flag-us": "1f1fa-1f1f8", "flag-uy": "1f1fa-1f1fe", "uruguay": "1f1fa-1f1fe", "flag-uz": "1f1fa-1f1ff", "uzbekistan": "1f1fa-1f1ff", "flag-va": "1f1fb-1f1e6", "vatican_city": "1f1fb-1f1e6", "flag-vc": "1f1fb-1f1e8", "st_vincent_grenadines": "1f1fb-1f1e8", "flag-ve": "1f1fb-1f1ea", "venezuela": "1f1fb-1f1ea", "flag-vg": "1f1fb-1f1ec", "british_virgin_islands": "1f1fb-1f1ec", "flag-vi": "1f1fb-1f1ee", "us_virgin_islands": "1f1fb-1f1ee", "flag-vn": "1f1fb-1f1f3", "vietnam": "1f1fb-1f1f3", "flag-vu": "1f1fb-1f1fa", "vanuatu": "1f1fb-1f1fa", "flag-wf": "1f1fc-1f1eb", "wallis_futuna": "1f1fc-1f1eb", "flag-ws": "1f1fc-1f1f8", "samoa": "1f1fc-1f1f8", "flag-xk": "1f1fd-1f1f0", "kosovo": "1f1fd-1f1f0", "flag-ye": "1f1fe-1f1ea", "yemen": "1f1fe-1f1ea", "flag-yt": "1f1fe-1f1f9", "mayotte": "1f1fe-1f1f9", "flag-za": "1f1ff-1f1e6", "south_africa": "1f1ff-1f1e6", "za": "1f1ff-1f1e6", "flag-zm": "1f1ff-1f1f2", "zambia": "1f1ff-1f1f2", "flag-zw": "1f1ff-1f1fc", "zimbabwe": "1f1ff-1f1fc", "flag-england": "1f3f4-e0067-e0062-e0065-e006e-e0067-e007f", "flag-scotland": "1f3f4-e0067-e0062-e0073-e0063-e0074-e007f", "flag-wales": "1f3f4-e0067-e0062-e0077-e006c-e0073-e007f", "santa_light_skin_tone": "1f385-1f3fb", "santa_medium_light_skin_tone": "1f385-1f3fc", "santa_medium_skin_tone": "1f385-1f3fd", "santa_medium_dark_skin_tone": "1f385-1f3fe", "santa_dark_skin_tone": "1f385-1f3ff", "snowboarder_light_skin_tone": "1f3c2-1f3fb", "snowboarder_medium_light_skin_tone": "1f3c2-1f3fc", "snowboarder_medium_skin_tone": "1f3c2-1f3fd", "snowboarder_medium_dark_skin_tone": "1f3c2-1f3fe", "snowboarder_dark_skin_tone": "1f3c2-1f3ff", "woman-running_light_skin_tone": "1f3c3-1f3fb-200d-2640-fe0f", "running_woman_light_skin_tone": "1f3c3-1f3fb-200d-2640-fe0f", "woman-running_medium_light_skin_tone": "1f3c3-1f3fc-200d-2640-fe0f", "running_woman_medium_light_skin_tone": "1f3c3-1f3fc-200d-2640-fe0f", "woman-running_medium_skin_tone": "1f3c3-1f3fd-200d-2640-fe0f", "running_woman_medium_skin_tone": "1f3c3-1f3fd-200d-2640-fe0f", "woman-running_medium_dark_skin_tone": "1f3c3-1f3fe-200d-2640-fe0f", "running_woman_medium_dark_skin_tone": "1f3c3-1f3fe-200d-2640-fe0f", "woman-running_dark_skin_tone": "1f3c3-1f3ff-200d-2640-fe0f", "running_woman_dark_skin_tone": "1f3c3-1f3ff-200d-2640-fe0f", "man-running_light_skin_tone": "1f3c3-1f3fb-200d-2642-fe0f", "running_man_light_skin_tone": "1f3c3-1f3fb-200d-2642-fe0f", "man-running_medium_light_skin_tone": "1f3c3-1f3fc-200d-2642-fe0f", "running_man_medium_light_skin_tone": "1f3c3-1f3fc-200d-2642-fe0f", "man-running_medium_skin_tone": "1f3c3-1f3fd-200d-2642-fe0f", "running_man_medium_skin_tone": "1f3c3-1f3fd-200d-2642-fe0f", "man-running_medium_dark_skin_tone": "1f3c3-1f3fe-200d-2642-fe0f", "running_man_medium_dark_skin_tone": "1f3c3-1f3fe-200d-2642-fe0f", "man-running_dark_skin_tone": "1f3c3-1f3ff-200d-2642-fe0f", "running_man_dark_skin_tone": "1f3c3-1f3ff-200d-2642-fe0f", "runner_light_skin_tone": "1f3c3-1f3fb", "running_light_skin_tone": "1f3c3-1f3fb", "runner_medium_light_skin_tone": "1f3c3-1f3fc", "running_medium_light_skin_tone": "1f3c3-1f3fc", "runner_medium_skin_tone": "1f3c3-1f3fd", "running_medium_skin_tone": "1f3c3-1f3fd", "runner_medium_dark_skin_tone": "1f3c3-1f3fe", "running_medium_dark_skin_tone": "1f3c3-1f3fe", "runner_dark_skin_tone": "1f3c3-1f3ff", "running_dark_skin_tone": "1f3c3-1f3ff", "woman-surfing_light_skin_tone": "1f3c4-1f3fb-200d-2640-fe0f", "surfing_woman_light_skin_tone": "1f3c4-1f3fb-200d-2640-fe0f", "woman-surfing_medium_light_skin_tone": "1f3c4-1f3fc-200d-2640-fe0f", "surfing_woman_medium_light_skin_tone": "1f3c4-1f3fc-200d-2640-fe0f", "woman-surfing_medium_skin_tone": "1f3c4-1f3fd-200d-2640-fe0f", "surfing_woman_medium_skin_tone": "1f3c4-1f3fd-200d-2640-fe0f", "woman-surfing_medium_dark_skin_tone": "1f3c4-1f3fe-200d-2640-fe0f", "surfing_woman_medium_dark_skin_tone": "1f3c4-1f3fe-200d-2640-fe0f", "woman-surfing_dark_skin_tone": "1f3c4-1f3ff-200d-2640-fe0f", "surfing_woman_dark_skin_tone": "1f3c4-1f3ff-200d-2640-fe0f", "man-surfing_light_skin_tone": "1f3c4-1f3fb-200d-2642-fe0f", "surfing_man_light_skin_tone": "1f3c4-1f3fb-200d-2642-fe0f", "man-surfing_medium_light_skin_tone": "1f3c4-1f3fc-200d-2642-fe0f", "surfing_man_medium_light_skin_tone": "1f3c4-1f3fc-200d-2642-fe0f", "man-surfing_medium_skin_tone": "1f3c4-1f3fd-200d-2642-fe0f", "surfing_man_medium_skin_tone": "1f3c4-1f3fd-200d-2642-fe0f", "man-surfing_medium_dark_skin_tone": "1f3c4-1f3fe-200d-2642-fe0f", "surfing_man_medium_dark_skin_tone": "1f3c4-1f3fe-200d-2642-fe0f", "man-surfing_dark_skin_tone": "1f3c4-1f3ff-200d-2642-fe0f", "surfing_man_dark_skin_tone": "1f3c4-1f3ff-200d-2642-fe0f", "surfer_light_skin_tone": "1f3c4-1f3fb", "surfer_medium_light_skin_tone": "1f3c4-1f3fc", "surfer_medium_skin_tone": "1f3c4-1f3fd", "surfer_medium_dark_skin_tone": "1f3c4-1f3fe", "surfer_dark_skin_tone": "1f3c4-1f3ff", "horse_racing_light_skin_tone": "1f3c7-1f3fb", "horse_racing_medium_light_skin_tone": "1f3c7-1f3fc", "horse_racing_medium_skin_tone": "1f3c7-1f3fd", "horse_racing_medium_dark_skin_tone": "1f3c7-1f3fe", "horse_racing_dark_skin_tone": "1f3c7-1f3ff", "woman-swimming_light_skin_tone": "1f3ca-1f3fb-200d-2640-fe0f", "swimming_woman_light_skin_tone": "1f3ca-1f3fb-200d-2640-fe0f", "woman-swimming_medium_light_skin_tone": "1f3ca-1f3fc-200d-2640-fe0f", "swimming_woman_medium_light_skin_tone": "1f3ca-1f3fc-200d-2640-fe0f", "woman-swimming_medium_skin_tone": "1f3ca-1f3fd-200d-2640-fe0f", "swimming_woman_medium_skin_tone": "1f3ca-1f3fd-200d-2640-fe0f", "woman-swimming_medium_dark_skin_tone": "1f3ca-1f3fe-200d-2640-fe0f", "swimming_woman_medium_dark_skin_tone": "1f3ca-1f3fe-200d-2640-fe0f", "woman-swimming_dark_skin_tone": "1f3ca-1f3ff-200d-2640-fe0f", "swimming_woman_dark_skin_tone": "1f3ca-1f3ff-200d-2640-fe0f", "man-swimming_light_skin_tone": "1f3ca-1f3fb-200d-2642-fe0f", "swimming_man_light_skin_tone": "1f3ca-1f3fb-200d-2642-fe0f", "man-swimming_medium_light_skin_tone": "1f3ca-1f3fc-200d-2642-fe0f", "swimming_man_medium_light_skin_tone": "1f3ca-1f3fc-200d-2642-fe0f", "man-swimming_medium_skin_tone": "1f3ca-1f3fd-200d-2642-fe0f", "swimming_man_medium_skin_tone": "1f3ca-1f3fd-200d-2642-fe0f", "man-swimming_medium_dark_skin_tone": "1f3ca-1f3fe-200d-2642-fe0f", "swimming_man_medium_dark_skin_tone": "1f3ca-1f3fe-200d-2642-fe0f", "man-swimming_dark_skin_tone": "1f3ca-1f3ff-200d-2642-fe0f", "swimming_man_dark_skin_tone": "1f3ca-1f3ff-200d-2642-fe0f", "swimmer_light_skin_tone": "1f3ca-1f3fb", "swimmer_medium_light_skin_tone": "1f3ca-1f3fc", "swimmer_medium_skin_tone": "1f3ca-1f3fd", "swimmer_medium_dark_skin_tone": "1f3ca-1f3fe", "swimmer_dark_skin_tone": "1f3ca-1f3ff", "woman-lifting-weights_light_skin_tone": "1f3cb-1f3fb-200d-2640-fe0f", "weight_lifting_woman_light_skin_tone": "1f3cb-1f3fb-200d-2640-fe0f", "woman-lifting-weights_medium_light_skin_tone": "1f3cb-1f3fc-200d-2640-fe0f", "weight_lifting_woman_medium_light_skin_tone": "1f3cb-1f3fc-200d-2640-fe0f", "woman-lifting-weights_medium_skin_tone": "1f3cb-1f3fd-200d-2640-fe0f", "weight_lifting_woman_medium_skin_tone": "1f3cb-1f3fd-200d-2640-fe0f", "woman-lifting-weights_medium_dark_skin_tone": "1f3cb-1f3fe-200d-2640-fe0f", "weight_lifting_woman_medium_dark_skin_tone": "1f3cb-1f3fe-200d-2640-fe0f", "woman-lifting-weights_dark_skin_tone": "1f3cb-1f3ff-200d-2640-fe0f", "weight_lifting_woman_dark_skin_tone": "1f3cb-1f3ff-200d-2640-fe0f", "man-lifting-weights_light_skin_tone": "1f3cb-1f3fb-200d-2642-fe0f", "weight_lifting_man_light_skin_tone": "1f3cb-1f3fb-200d-2642-fe0f", "man-lifting-weights_medium_light_skin_tone": "1f3cb-1f3fc-200d-2642-fe0f", "weight_lifting_man_medium_light_skin_tone": "1f3cb-1f3fc-200d-2642-fe0f", "man-lifting-weights_medium_skin_tone": "1f3cb-1f3fd-200d-2642-fe0f", "weight_lifting_man_medium_skin_tone": "1f3cb-1f3fd-200d-2642-fe0f", "man-lifting-weights_medium_dark_skin_tone": "1f3cb-1f3fe-200d-2642-fe0f", "weight_lifting_man_medium_dark_skin_tone": "1f3cb-1f3fe-200d-2642-fe0f", "man-lifting-weights_dark_skin_tone": "1f3cb-1f3ff-200d-2642-fe0f", "weight_lifting_man_dark_skin_tone": "1f3cb-1f3ff-200d-2642-fe0f", "weight_lifter_light_skin_tone": "1f3cb-1f3fb", "weight_lifter_medium_light_skin_tone": "1f3cb-1f3fc", "weight_lifter_medium_skin_tone": "1f3cb-1f3fd", "weight_lifter_medium_dark_skin_tone": "1f3cb-1f3fe", "weight_lifter_dark_skin_tone": "1f3cb-1f3ff", "woman-golfing_light_skin_tone": "1f3cc-1f3fb-200d-2640-fe0f", "golfing_woman_light_skin_tone": "1f3cc-1f3fb-200d-2640-fe0f", "woman-golfing_medium_light_skin_tone": "1f3cc-1f3fc-200d-2640-fe0f", "golfing_woman_medium_light_skin_tone": "1f3cc-1f3fc-200d-2640-fe0f", "woman-golfing_medium_skin_tone": "1f3cc-1f3fd-200d-2640-fe0f", "golfing_woman_medium_skin_tone": "1f3cc-1f3fd-200d-2640-fe0f", "woman-golfing_medium_dark_skin_tone": "1f3cc-1f3fe-200d-2640-fe0f", "golfing_woman_medium_dark_skin_tone": "1f3cc-1f3fe-200d-2640-fe0f", "woman-golfing_dark_skin_tone": "1f3cc-1f3ff-200d-2640-fe0f", "golfing_woman_dark_skin_tone": "1f3cc-1f3ff-200d-2640-fe0f", "man-golfing_light_skin_tone": "1f3cc-1f3fb-200d-2642-fe0f", "golfing_man_light_skin_tone": "1f3cc-1f3fb-200d-2642-fe0f", "man-golfing_medium_light_skin_tone": "1f3cc-1f3fc-200d-2642-fe0f", "golfing_man_medium_light_skin_tone": "1f3cc-1f3fc-200d-2642-fe0f", "man-golfing_medium_skin_tone": "1f3cc-1f3fd-200d-2642-fe0f", "golfing_man_medium_skin_tone": "1f3cc-1f3fd-200d-2642-fe0f", "man-golfing_medium_dark_skin_tone": "1f3cc-1f3fe-200d-2642-fe0f", "golfing_man_medium_dark_skin_tone": "1f3cc-1f3fe-200d-2642-fe0f", "man-golfing_dark_skin_tone": "1f3cc-1f3ff-200d-2642-fe0f", "golfing_man_dark_skin_tone": "1f3cc-1f3ff-200d-2642-fe0f", "golfer_light_skin_tone": "1f3cc-1f3fb", "golfer_medium_light_skin_tone": "1f3cc-1f3fc", "golfer_medium_skin_tone": "1f3cc-1f3fd", "golfer_medium_dark_skin_tone": "1f3cc-1f3fe", "golfer_dark_skin_tone": "1f3cc-1f3ff", "ear_light_skin_tone": "1f442-1f3fb", "ear_medium_light_skin_tone": "1f442-1f3fc", "ear_medium_skin_tone": "1f442-1f3fd", "ear_medium_dark_skin_tone": "1f442-1f3fe", "ear_dark_skin_tone": "1f442-1f3ff", "nose_light_skin_tone": "1f443-1f3fb", "nose_medium_light_skin_tone": "1f443-1f3fc", "nose_medium_skin_tone": "1f443-1f3fd", "nose_medium_dark_skin_tone": "1f443-1f3fe", "nose_dark_skin_tone": "1f443-1f3ff", "point_up_2_light_skin_tone": "1f446-1f3fb", "point_up_2_medium_light_skin_tone": "1f446-1f3fc", "point_up_2_medium_skin_tone": "1f446-1f3fd", "point_up_2_medium_dark_skin_tone": "1f446-1f3fe", "point_up_2_dark_skin_tone": "1f446-1f3ff", "point_down_light_skin_tone": "1f447-1f3fb", "point_down_medium_light_skin_tone": "1f447-1f3fc", "point_down_medium_skin_tone": "1f447-1f3fd", "point_down_medium_dark_skin_tone": "1f447-1f3fe", "point_down_dark_skin_tone": "1f447-1f3ff", "point_left_light_skin_tone": "1f448-1f3fb", "point_left_medium_light_skin_tone": "1f448-1f3fc", "point_left_medium_skin_tone": "1f448-1f3fd", "point_left_medium_dark_skin_tone": "1f448-1f3fe", "point_left_dark_skin_tone": "1f448-1f3ff", "point_right_light_skin_tone": "1f449-1f3fb", "point_right_medium_light_skin_tone": "1f449-1f3fc", "point_right_medium_skin_tone": "1f449-1f3fd", "point_right_medium_dark_skin_tone": "1f449-1f3fe", "point_right_dark_skin_tone": "1f449-1f3ff", "facepunch_light_skin_tone": "1f44a-1f3fb", "punch_light_skin_tone": "1f44a-1f3fb", "fist_oncoming_light_skin_tone": "1f44a-1f3fb", "facepunch_medium_light_skin_tone": "1f44a-1f3fc", "punch_medium_light_skin_tone": "1f44a-1f3fc", "fist_oncoming_medium_light_skin_tone": "1f44a-1f3fc", "facepunch_medium_skin_tone": "1f44a-1f3fd", "punch_medium_skin_tone": "1f44a-1f3fd", "fist_oncoming_medium_skin_tone": "1f44a-1f3fd", "facepunch_medium_dark_skin_tone": "1f44a-1f3fe", "punch_medium_dark_skin_tone": "1f44a-1f3fe", "fist_oncoming_medium_dark_skin_tone": "1f44a-1f3fe", "facepunch_dark_skin_tone": "1f44a-1f3ff", "punch_dark_skin_tone": "1f44a-1f3ff", "fist_oncoming_dark_skin_tone": "1f44a-1f3ff", "wave_light_skin_tone": "1f44b-1f3fb", "wave_medium_light_skin_tone": "1f44b-1f3fc", "wave_medium_skin_tone": "1f44b-1f3fd", "wave_medium_dark_skin_tone": "1f44b-1f3fe", "wave_dark_skin_tone": "1f44b-1f3ff", "ok_hand_light_skin_tone": "1f44c-1f3fb", "ok_hand_medium_light_skin_tone": "1f44c-1f3fc", "ok_hand_medium_skin_tone": "1f44c-1f3fd", "ok_hand_medium_dark_skin_tone": "1f44c-1f3fe", "ok_hand_dark_skin_tone": "1f44c-1f3ff", "+1_light_skin_tone": "1f44d-1f3fb", "thumbsup_light_skin_tone": "1f44d-1f3fb", "+1_medium_light_skin_tone": "1f44d-1f3fc", "thumbsup_medium_light_skin_tone": "1f44d-1f3fc", "+1_medium_skin_tone": "1f44d-1f3fd", "thumbsup_medium_skin_tone": "1f44d-1f3fd", "+1_medium_dark_skin_tone": "1f44d-1f3fe", "thumbsup_medium_dark_skin_tone": "1f44d-1f3fe", "+1_dark_skin_tone": "1f44d-1f3ff", "thumbsup_dark_skin_tone": "1f44d-1f3ff", "-1_light_skin_tone": "1f44e-1f3fb", "thumbsdown_light_skin_tone": "1f44e-1f3fb", "-1_medium_light_skin_tone": "1f44e-1f3fc", "thumbsdown_medium_light_skin_tone": "1f44e-1f3fc", "-1_medium_skin_tone": "1f44e-1f3fd", "thumbsdown_medium_skin_tone": "1f44e-1f3fd", "-1_medium_dark_skin_tone": "1f44e-1f3fe", "thumbsdown_medium_dark_skin_tone": "1f44e-1f3fe", "-1_dark_skin_tone": "1f44e-1f3ff", "thumbsdown_dark_skin_tone": "1f44e-1f3ff", "clap_light_skin_tone": "1f44f-1f3fb", "clap_medium_light_skin_tone": "1f44f-1f3fc", "clap_medium_skin_tone": "1f44f-1f3fd", "clap_medium_dark_skin_tone": "1f44f-1f3fe", "clap_dark_skin_tone": "1f44f-1f3ff", "open_hands_light_skin_tone": "1f450-1f3fb", "open_hands_medium_light_skin_tone": "1f450-1f3fc", "open_hands_medium_skin_tone": "1f450-1f3fd", "open_hands_medium_dark_skin_tone": "1f450-1f3fe", "open_hands_dark_skin_tone": "1f450-1f3ff", "boy_light_skin_tone": "1f466-1f3fb", "boy_medium_light_skin_tone": "1f466-1f3fc", "boy_medium_skin_tone": "1f466-1f3fd", "boy_medium_dark_skin_tone": "1f466-1f3fe", "boy_dark_skin_tone": "1f466-1f3ff", "girl_light_skin_tone": "1f467-1f3fb", "girl_medium_light_skin_tone": "1f467-1f3fc", "girl_medium_skin_tone": "1f467-1f3fd", "girl_medium_dark_skin_tone": "1f467-1f3fe", "girl_dark_skin_tone": "1f467-1f3ff", "male-farmer_light_skin_tone": "1f468-1f3fb-200d-1f33e", "man_farmer_light_skin_tone": "1f468-1f3fb-200d-1f33e", "male-farmer_medium_light_skin_tone": "1f468-1f3fc-200d-1f33e", "man_farmer_medium_light_skin_tone": "1f468-1f3fc-200d-1f33e", "male-farmer_medium_skin_tone": "1f468-1f3fd-200d-1f33e", "man_farmer_medium_skin_tone": "1f468-1f3fd-200d-1f33e", "male-farmer_medium_dark_skin_tone": "1f468-1f3fe-200d-1f33e", "man_farmer_medium_dark_skin_tone": "1f468-1f3fe-200d-1f33e", "male-farmer_dark_skin_tone": "1f468-1f3ff-200d-1f33e", "man_farmer_dark_skin_tone": "1f468-1f3ff-200d-1f33e", "male-cook_light_skin_tone": "1f468-1f3fb-200d-1f373", "man_cook_light_skin_tone": "1f468-1f3fb-200d-1f373", "male-cook_medium_light_skin_tone": "1f468-1f3fc-200d-1f373", "man_cook_medium_light_skin_tone": "1f468-1f3fc-200d-1f373", "male-cook_medium_skin_tone": "1f468-1f3fd-200d-1f373", "man_cook_medium_skin_tone": "1f468-1f3fd-200d-1f373", "male-cook_medium_dark_skin_tone": "1f468-1f3fe-200d-1f373", "man_cook_medium_dark_skin_tone": "1f468-1f3fe-200d-1f373", "male-cook_dark_skin_tone": "1f468-1f3ff-200d-1f373", "man_cook_dark_skin_tone": "1f468-1f3ff-200d-1f373", "man_feeding_baby_light_skin_tone": "1f468-1f3fb-200d-1f37c", "man_feeding_baby_medium_light_skin_tone": "1f468-1f3fc-200d-1f37c", "man_feeding_baby_medium_skin_tone": "1f468-1f3fd-200d-1f37c", "man_feeding_baby_medium_dark_skin_tone": "1f468-1f3fe-200d-1f37c", "man_feeding_baby_dark_skin_tone": "1f468-1f3ff-200d-1f37c", "male-student_light_skin_tone": "1f468-1f3fb-200d-1f393", "man_student_light_skin_tone": "1f468-1f3fb-200d-1f393", "male-student_medium_light_skin_tone": "1f468-1f3fc-200d-1f393", "man_student_medium_light_skin_tone": "1f468-1f3fc-200d-1f393", "male-student_medium_skin_tone": "1f468-1f3fd-200d-1f393", "man_student_medium_skin_tone": "1f468-1f3fd-200d-1f393", "male-student_medium_dark_skin_tone": "1f468-1f3fe-200d-1f393", "man_student_medium_dark_skin_tone": "1f468-1f3fe-200d-1f393", "male-student_dark_skin_tone": "1f468-1f3ff-200d-1f393", "man_student_dark_skin_tone": "1f468-1f3ff-200d-1f393", "male-singer_light_skin_tone": "1f468-1f3fb-200d-1f3a4", "man_singer_light_skin_tone": "1f468-1f3fb-200d-1f3a4", "male-singer_medium_light_skin_tone": "1f468-1f3fc-200d-1f3a4", "man_singer_medium_light_skin_tone": "1f468-1f3fc-200d-1f3a4", "male-singer_medium_skin_tone": "1f468-1f3fd-200d-1f3a4", "man_singer_medium_skin_tone": "1f468-1f3fd-200d-1f3a4", "male-singer_medium_dark_skin_tone": "1f468-1f3fe-200d-1f3a4", "man_singer_medium_dark_skin_tone": "1f468-1f3fe-200d-1f3a4", "male-singer_dark_skin_tone": "1f468-1f3ff-200d-1f3a4", "man_singer_dark_skin_tone": "1f468-1f3ff-200d-1f3a4", "male-artist_light_skin_tone": "1f468-1f3fb-200d-1f3a8", "man_artist_light_skin_tone": "1f468-1f3fb-200d-1f3a8", "male-artist_medium_light_skin_tone": "1f468-1f3fc-200d-1f3a8", "man_artist_medium_light_skin_tone": "1f468-1f3fc-200d-1f3a8", "male-artist_medium_skin_tone": "1f468-1f3fd-200d-1f3a8", "man_artist_medium_skin_tone": "1f468-1f3fd-200d-1f3a8", "male-artist_medium_dark_skin_tone": "1f468-1f3fe-200d-1f3a8", "man_artist_medium_dark_skin_tone": "1f468-1f3fe-200d-1f3a8", "male-artist_dark_skin_tone": "1f468-1f3ff-200d-1f3a8", "man_artist_dark_skin_tone": "1f468-1f3ff-200d-1f3a8", "male-teacher_light_skin_tone": "1f468-1f3fb-200d-1f3eb", "man_teacher_light_skin_tone": "1f468-1f3fb-200d-1f3eb", "male-teacher_medium_light_skin_tone": "1f468-1f3fc-200d-1f3eb", "man_teacher_medium_light_skin_tone": "1f468-1f3fc-200d-1f3eb", "male-teacher_medium_skin_tone": "1f468-1f3fd-200d-1f3eb", "man_teacher_medium_skin_tone": "1f468-1f3fd-200d-1f3eb", "male-teacher_medium_dark_skin_tone": "1f468-1f3fe-200d-1f3eb", "man_teacher_medium_dark_skin_tone": "1f468-1f3fe-200d-1f3eb", "male-teacher_dark_skin_tone": "1f468-1f3ff-200d-1f3eb", "man_teacher_dark_skin_tone": "1f468-1f3ff-200d-1f3eb", "male-factory-worker_light_skin_tone": "1f468-1f3fb-200d-1f3ed", "man_factory_worker_light_skin_tone": "1f468-1f3fb-200d-1f3ed", "male-factory-worker_medium_light_skin_tone": "1f468-1f3fc-200d-1f3ed", "man_factory_worker_medium_light_skin_tone": "1f468-1f3fc-200d-1f3ed", "male-factory-worker_medium_skin_tone": "1f468-1f3fd-200d-1f3ed", "man_factory_worker_medium_skin_tone": "1f468-1f3fd-200d-1f3ed", "male-factory-worker_medium_dark_skin_tone": "1f468-1f3fe-200d-1f3ed", "man_factory_worker_medium_dark_skin_tone": "1f468-1f3fe-200d-1f3ed", "male-factory-worker_dark_skin_tone": "1f468-1f3ff-200d-1f3ed", "man_factory_worker_dark_skin_tone": "1f468-1f3ff-200d-1f3ed", "male-technologist_light_skin_tone": "1f468-1f3fb-200d-1f4bb", "man_technologist_light_skin_tone": "1f468-1f3fb-200d-1f4bb", "male-technologist_medium_light_skin_tone": "1f468-1f3fc-200d-1f4bb", "man_technologist_medium_light_skin_tone": "1f468-1f3fc-200d-1f4bb", "male-technologist_medium_skin_tone": "1f468-1f3fd-200d-1f4bb", "man_technologist_medium_skin_tone": "1f468-1f3fd-200d-1f4bb", "male-technologist_medium_dark_skin_tone": "1f468-1f3fe-200d-1f4bb", "man_technologist_medium_dark_skin_tone": "1f468-1f3fe-200d-1f4bb", "male-technologist_dark_skin_tone": "1f468-1f3ff-200d-1f4bb", "man_technologist_dark_skin_tone": "1f468-1f3ff-200d-1f4bb", "male-office-worker_light_skin_tone": "1f468-1f3fb-200d-1f4bc", "man_office_worker_light_skin_tone": "1f468-1f3fb-200d-1f4bc", "male-office-worker_medium_light_skin_tone": "1f468-1f3fc-200d-1f4bc", "man_office_worker_medium_light_skin_tone": "1f468-1f3fc-200d-1f4bc", "male-office-worker_medium_skin_tone": "1f468-1f3fd-200d-1f4bc", "man_office_worker_medium_skin_tone": "1f468-1f3fd-200d-1f4bc", "male-office-worker_medium_dark_skin_tone": "1f468-1f3fe-200d-1f4bc", "man_office_worker_medium_dark_skin_tone": "1f468-1f3fe-200d-1f4bc", "male-office-worker_dark_skin_tone": "1f468-1f3ff-200d-1f4bc", "man_office_worker_dark_skin_tone": "1f468-1f3ff-200d-1f4bc", "male-mechanic_light_skin_tone": "1f468-1f3fb-200d-1f527", "man_mechanic_light_skin_tone": "1f468-1f3fb-200d-1f527", "male-mechanic_medium_light_skin_tone": "1f468-1f3fc-200d-1f527", "man_mechanic_medium_light_skin_tone": "1f468-1f3fc-200d-1f527", "male-mechanic_medium_skin_tone": "1f468-1f3fd-200d-1f527", "man_mechanic_medium_skin_tone": "1f468-1f3fd-200d-1f527", "male-mechanic_medium_dark_skin_tone": "1f468-1f3fe-200d-1f527", "man_mechanic_medium_dark_skin_tone": "1f468-1f3fe-200d-1f527", "male-mechanic_dark_skin_tone": "1f468-1f3ff-200d-1f527", "man_mechanic_dark_skin_tone": "1f468-1f3ff-200d-1f527", "male-scientist_light_skin_tone": "1f468-1f3fb-200d-1f52c", "man_scientist_light_skin_tone": "1f468-1f3fb-200d-1f52c", "male-scientist_medium_light_skin_tone": "1f468-1f3fc-200d-1f52c", "man_scientist_medium_light_skin_tone": "1f468-1f3fc-200d-1f52c", "male-scientist_medium_skin_tone": "1f468-1f3fd-200d-1f52c", "man_scientist_medium_skin_tone": "1f468-1f3fd-200d-1f52c", "male-scientist_medium_dark_skin_tone": "1f468-1f3fe-200d-1f52c", "man_scientist_medium_dark_skin_tone": "1f468-1f3fe-200d-1f52c", "male-scientist_dark_skin_tone": "1f468-1f3ff-200d-1f52c", "man_scientist_dark_skin_tone": "1f468-1f3ff-200d-1f52c", "male-astronaut_light_skin_tone": "1f468-1f3fb-200d-1f680", "man_astronaut_light_skin_tone": "1f468-1f3fb-200d-1f680", "male-astronaut_medium_light_skin_tone": "1f468-1f3fc-200d-1f680", "man_astronaut_medium_light_skin_tone": "1f468-1f3fc-200d-1f680", "male-astronaut_medium_skin_tone": "1f468-1f3fd-200d-1f680", "man_astronaut_medium_skin_tone": "1f468-1f3fd-200d-1f680", "male-astronaut_medium_dark_skin_tone": "1f468-1f3fe-200d-1f680", "man_astronaut_medium_dark_skin_tone": "1f468-1f3fe-200d-1f680", "male-astronaut_dark_skin_tone": "1f468-1f3ff-200d-1f680", "man_astronaut_dark_skin_tone": "1f468-1f3ff-200d-1f680", "male-firefighter_light_skin_tone": "1f468-1f3fb-200d-1f692", "man_firefighter_light_skin_tone": "1f468-1f3fb-200d-1f692", "male-firefighter_medium_light_skin_tone": "1f468-1f3fc-200d-1f692", "man_firefighter_medium_light_skin_tone": "1f468-1f3fc-200d-1f692", "male-firefighter_medium_skin_tone": "1f468-1f3fd-200d-1f692", "man_firefighter_medium_skin_tone": "1f468-1f3fd-200d-1f692", "male-firefighter_medium_dark_skin_tone": "1f468-1f3fe-200d-1f692", "man_firefighter_medium_dark_skin_tone": "1f468-1f3fe-200d-1f692", "male-firefighter_dark_skin_tone": "1f468-1f3ff-200d-1f692", "man_firefighter_dark_skin_tone": "1f468-1f3ff-200d-1f692", "man_with_probing_cane_light_skin_tone": "1f468-1f3fb-200d-1f9af", "man_with_probing_cane_medium_light_skin_tone": "1f468-1f3fc-200d-1f9af", "man_with_probing_cane_medium_skin_tone": "1f468-1f3fd-200d-1f9af", "man_with_probing_cane_medium_dark_skin_tone": "1f468-1f3fe-200d-1f9af", "man_with_probing_cane_dark_skin_tone": "1f468-1f3ff-200d-1f9af", "red_haired_man_light_skin_tone": "1f468-1f3fb-200d-1f9b0", "red_haired_man_medium_light_skin_tone": "1f468-1f3fc-200d-1f9b0", "red_haired_man_medium_skin_tone": "1f468-1f3fd-200d-1f9b0", "red_haired_man_medium_dark_skin_tone": "1f468-1f3fe-200d-1f9b0", "red_haired_man_dark_skin_tone": "1f468-1f3ff-200d-1f9b0", "curly_haired_man_light_skin_tone": "1f468-1f3fb-200d-1f9b1", "curly_haired_man_medium_light_skin_tone": "1f468-1f3fc-200d-1f9b1", "curly_haired_man_medium_skin_tone": "1f468-1f3fd-200d-1f9b1", "curly_haired_man_medium_dark_skin_tone": "1f468-1f3fe-200d-1f9b1", "curly_haired_man_dark_skin_tone": "1f468-1f3ff-200d-1f9b1", "bald_man_light_skin_tone": "1f468-1f3fb-200d-1f9b2", "bald_man_medium_light_skin_tone": "1f468-1f3fc-200d-1f9b2", "bald_man_medium_skin_tone": "1f468-1f3fd-200d-1f9b2", "bald_man_medium_dark_skin_tone": "1f468-1f3fe-200d-1f9b2", "bald_man_dark_skin_tone": "1f468-1f3ff-200d-1f9b2", "white_haired_man_light_skin_tone": "1f468-1f3fb-200d-1f9b3", "white_haired_man_medium_light_skin_tone": "1f468-1f3fc-200d-1f9b3", "white_haired_man_medium_skin_tone": "1f468-1f3fd-200d-1f9b3", "white_haired_man_medium_dark_skin_tone": "1f468-1f3fe-200d-1f9b3", "white_haired_man_dark_skin_tone": "1f468-1f3ff-200d-1f9b3", "man_in_motorized_wheelchair_light_skin_tone": "1f468-1f3fb-200d-1f9bc", "man_in_motorized_wheelchair_medium_light_skin_tone": "1f468-1f3fc-200d-1f9bc", "man_in_motorized_wheelchair_medium_skin_tone": "1f468-1f3fd-200d-1f9bc", "man_in_motorized_wheelchair_medium_dark_skin_tone": "1f468-1f3fe-200d-1f9bc", "man_in_motorized_wheelchair_dark_skin_tone": "1f468-1f3ff-200d-1f9bc", "man_in_manual_wheelchair_light_skin_tone": "1f468-1f3fb-200d-1f9bd", "man_in_manual_wheelchair_medium_light_skin_tone": "1f468-1f3fc-200d-1f9bd", "man_in_manual_wheelchair_medium_skin_tone": "1f468-1f3fd-200d-1f9bd", "man_in_manual_wheelchair_medium_dark_skin_tone": "1f468-1f3fe-200d-1f9bd", "man_in_manual_wheelchair_dark_skin_tone": "1f468-1f3ff-200d-1f9bd", "male-doctor_light_skin_tone": "1f468-1f3fb-200d-2695-fe0f", "man_health_worker_light_skin_tone": "1f468-1f3fb-200d-2695-fe0f", "male-doctor_medium_light_skin_tone": "1f468-1f3fc-200d-2695-fe0f", "man_health_worker_medium_light_skin_tone": "1f468-1f3fc-200d-2695-fe0f", "male-doctor_medium_skin_tone": "1f468-1f3fd-200d-2695-fe0f", "man_health_worker_medium_skin_tone": "1f468-1f3fd-200d-2695-fe0f", "male-doctor_medium_dark_skin_tone": "1f468-1f3fe-200d-2695-fe0f", "man_health_worker_medium_dark_skin_tone": "1f468-1f3fe-200d-2695-fe0f", "male-doctor_dark_skin_tone": "1f468-1f3ff-200d-2695-fe0f", "man_health_worker_dark_skin_tone": "1f468-1f3ff-200d-2695-fe0f", "male-judge_light_skin_tone": "1f468-1f3fb-200d-2696-fe0f", "man_judge_light_skin_tone": "1f468-1f3fb-200d-2696-fe0f", "male-judge_medium_light_skin_tone": "1f468-1f3fc-200d-2696-fe0f", "man_judge_medium_light_skin_tone": "1f468-1f3fc-200d-2696-fe0f", "male-judge_medium_skin_tone": "1f468-1f3fd-200d-2696-fe0f", "man_judge_medium_skin_tone": "1f468-1f3fd-200d-2696-fe0f", "male-judge_medium_dark_skin_tone": "1f468-1f3fe-200d-2696-fe0f", "man_judge_medium_dark_skin_tone": "1f468-1f3fe-200d-2696-fe0f", "male-judge_dark_skin_tone": "1f468-1f3ff-200d-2696-fe0f", "man_judge_dark_skin_tone": "1f468-1f3ff-200d-2696-fe0f", "male-pilot_light_skin_tone": "1f468-1f3fb-200d-2708-fe0f", "man_pilot_light_skin_tone": "1f468-1f3fb-200d-2708-fe0f", "male-pilot_medium_light_skin_tone": "1f468-1f3fc-200d-2708-fe0f", "man_pilot_medium_light_skin_tone": "1f468-1f3fc-200d-2708-fe0f", "male-pilot_medium_skin_tone": "1f468-1f3fd-200d-2708-fe0f", "man_pilot_medium_skin_tone": "1f468-1f3fd-200d-2708-fe0f", "male-pilot_medium_dark_skin_tone": "1f468-1f3fe-200d-2708-fe0f", "man_pilot_medium_dark_skin_tone": "1f468-1f3fe-200d-2708-fe0f", "male-pilot_dark_skin_tone": "1f468-1f3ff-200d-2708-fe0f", "man_pilot_dark_skin_tone": "1f468-1f3ff-200d-2708-fe0f", "man_light_skin_tone": "1f468-1f3fb", "man_medium_light_skin_tone": "1f468-1f3fc", "man_medium_skin_tone": "1f468-1f3fd", "man_medium_dark_skin_tone": "1f468-1f3fe", "man_dark_skin_tone": "1f468-1f3ff", "female-farmer_light_skin_tone": "1f469-1f3fb-200d-1f33e", "woman_farmer_light_skin_tone": "1f469-1f3fb-200d-1f33e", "female-farmer_medium_light_skin_tone": "1f469-1f3fc-200d-1f33e", "woman_farmer_medium_light_skin_tone": "1f469-1f3fc-200d-1f33e", "female-farmer_medium_skin_tone": "1f469-1f3fd-200d-1f33e", "woman_farmer_medium_skin_tone": "1f469-1f3fd-200d-1f33e", "female-farmer_medium_dark_skin_tone": "1f469-1f3fe-200d-1f33e", "woman_farmer_medium_dark_skin_tone": "1f469-1f3fe-200d-1f33e", "female-farmer_dark_skin_tone": "1f469-1f3ff-200d-1f33e", "woman_farmer_dark_skin_tone": "1f469-1f3ff-200d-1f33e", "female-cook_light_skin_tone": "1f469-1f3fb-200d-1f373", "woman_cook_light_skin_tone": "1f469-1f3fb-200d-1f373", "female-cook_medium_light_skin_tone": "1f469-1f3fc-200d-1f373", "woman_cook_medium_light_skin_tone": "1f469-1f3fc-200d-1f373", "female-cook_medium_skin_tone": "1f469-1f3fd-200d-1f373", "woman_cook_medium_skin_tone": "1f469-1f3fd-200d-1f373", "female-cook_medium_dark_skin_tone": "1f469-1f3fe-200d-1f373", "woman_cook_medium_dark_skin_tone": "1f469-1f3fe-200d-1f373", "female-cook_dark_skin_tone": "1f469-1f3ff-200d-1f373", "woman_cook_dark_skin_tone": "1f469-1f3ff-200d-1f373", "woman_feeding_baby_light_skin_tone": "1f469-1f3fb-200d-1f37c", "woman_feeding_baby_medium_light_skin_tone": "1f469-1f3fc-200d-1f37c", "woman_feeding_baby_medium_skin_tone": "1f469-1f3fd-200d-1f37c", "woman_feeding_baby_medium_dark_skin_tone": "1f469-1f3fe-200d-1f37c", "woman_feeding_baby_dark_skin_tone": "1f469-1f3ff-200d-1f37c", "female-student_light_skin_tone": "1f469-1f3fb-200d-1f393", "woman_student_light_skin_tone": "1f469-1f3fb-200d-1f393", "female-student_medium_light_skin_tone": "1f469-1f3fc-200d-1f393", "woman_student_medium_light_skin_tone": "1f469-1f3fc-200d-1f393", "female-student_medium_skin_tone": "1f469-1f3fd-200d-1f393", "woman_student_medium_skin_tone": "1f469-1f3fd-200d-1f393", "female-student_medium_dark_skin_tone": "1f469-1f3fe-200d-1f393", "woman_student_medium_dark_skin_tone": "1f469-1f3fe-200d-1f393", "female-student_dark_skin_tone": "1f469-1f3ff-200d-1f393", "woman_student_dark_skin_tone": "1f469-1f3ff-200d-1f393", "female-singer_light_skin_tone": "1f469-1f3fb-200d-1f3a4", "woman_singer_light_skin_tone": "1f469-1f3fb-200d-1f3a4", "female-singer_medium_light_skin_tone": "1f469-1f3fc-200d-1f3a4", "woman_singer_medium_light_skin_tone": "1f469-1f3fc-200d-1f3a4", "female-singer_medium_skin_tone": "1f469-1f3fd-200d-1f3a4", "woman_singer_medium_skin_tone": "1f469-1f3fd-200d-1f3a4", "female-singer_medium_dark_skin_tone": "1f469-1f3fe-200d-1f3a4", "woman_singer_medium_dark_skin_tone": "1f469-1f3fe-200d-1f3a4", "female-singer_dark_skin_tone": "1f469-1f3ff-200d-1f3a4", "woman_singer_dark_skin_tone": "1f469-1f3ff-200d-1f3a4", "female-artist_light_skin_tone": "1f469-1f3fb-200d-1f3a8", "woman_artist_light_skin_tone": "1f469-1f3fb-200d-1f3a8", "female-artist_medium_light_skin_tone": "1f469-1f3fc-200d-1f3a8", "woman_artist_medium_light_skin_tone": "1f469-1f3fc-200d-1f3a8", "female-artist_medium_skin_tone": "1f469-1f3fd-200d-1f3a8", "woman_artist_medium_skin_tone": "1f469-1f3fd-200d-1f3a8", "female-artist_medium_dark_skin_tone": "1f469-1f3fe-200d-1f3a8", "woman_artist_medium_dark_skin_tone": "1f469-1f3fe-200d-1f3a8", "female-artist_dark_skin_tone": "1f469-1f3ff-200d-1f3a8", "woman_artist_dark_skin_tone": "1f469-1f3ff-200d-1f3a8", "female-teacher_light_skin_tone": "1f469-1f3fb-200d-1f3eb", "woman_teacher_light_skin_tone": "1f469-1f3fb-200d-1f3eb", "female-teacher_medium_light_skin_tone": "1f469-1f3fc-200d-1f3eb", "woman_teacher_medium_light_skin_tone": "1f469-1f3fc-200d-1f3eb", "female-teacher_medium_skin_tone": "1f469-1f3fd-200d-1f3eb", "woman_teacher_medium_skin_tone": "1f469-1f3fd-200d-1f3eb", "female-teacher_medium_dark_skin_tone": "1f469-1f3fe-200d-1f3eb", "woman_teacher_medium_dark_skin_tone": "1f469-1f3fe-200d-1f3eb", "female-teacher_dark_skin_tone": "1f469-1f3ff-200d-1f3eb", "woman_teacher_dark_skin_tone": "1f469-1f3ff-200d-1f3eb", "female-factory-worker_light_skin_tone": "1f469-1f3fb-200d-1f3ed", "woman_factory_worker_light_skin_tone": "1f469-1f3fb-200d-1f3ed", "female-factory-worker_medium_light_skin_tone": "1f469-1f3fc-200d-1f3ed", "woman_factory_worker_medium_light_skin_tone": "1f469-1f3fc-200d-1f3ed", "female-factory-worker_medium_skin_tone": "1f469-1f3fd-200d-1f3ed", "woman_factory_worker_medium_skin_tone": "1f469-1f3fd-200d-1f3ed", "female-factory-worker_medium_dark_skin_tone": "1f469-1f3fe-200d-1f3ed", "woman_factory_worker_medium_dark_skin_tone": "1f469-1f3fe-200d-1f3ed", "female-factory-worker_dark_skin_tone": "1f469-1f3ff-200d-1f3ed", "woman_factory_worker_dark_skin_tone": "1f469-1f3ff-200d-1f3ed", "female-technologist_light_skin_tone": "1f469-1f3fb-200d-1f4bb", "woman_technologist_light_skin_tone": "1f469-1f3fb-200d-1f4bb", "female-technologist_medium_light_skin_tone": "1f469-1f3fc-200d-1f4bb", "woman_technologist_medium_light_skin_tone": "1f469-1f3fc-200d-1f4bb", "female-technologist_medium_skin_tone": "1f469-1f3fd-200d-1f4bb", "woman_technologist_medium_skin_tone": "1f469-1f3fd-200d-1f4bb", "female-technologist_medium_dark_skin_tone": "1f469-1f3fe-200d-1f4bb", "woman_technologist_medium_dark_skin_tone": "1f469-1f3fe-200d-1f4bb", "female-technologist_dark_skin_tone": "1f469-1f3ff-200d-1f4bb", "woman_technologist_dark_skin_tone": "1f469-1f3ff-200d-1f4bb", "female-office-worker_light_skin_tone": "1f469-1f3fb-200d-1f4bc", "woman_office_worker_light_skin_tone": "1f469-1f3fb-200d-1f4bc", "female-office-worker_medium_light_skin_tone": "1f469-1f3fc-200d-1f4bc", "woman_office_worker_medium_light_skin_tone": "1f469-1f3fc-200d-1f4bc", "female-office-worker_medium_skin_tone": "1f469-1f3fd-200d-1f4bc", "woman_office_worker_medium_skin_tone": "1f469-1f3fd-200d-1f4bc", "female-office-worker_medium_dark_skin_tone": "1f469-1f3fe-200d-1f4bc", "woman_office_worker_medium_dark_skin_tone": "1f469-1f3fe-200d-1f4bc", "female-office-worker_dark_skin_tone": "1f469-1f3ff-200d-1f4bc", "woman_office_worker_dark_skin_tone": "1f469-1f3ff-200d-1f4bc", "female-mechanic_light_skin_tone": "1f469-1f3fb-200d-1f527", "woman_mechanic_light_skin_tone": "1f469-1f3fb-200d-1f527", "female-mechanic_medium_light_skin_tone": "1f469-1f3fc-200d-1f527", "woman_mechanic_medium_light_skin_tone": "1f469-1f3fc-200d-1f527", "female-mechanic_medium_skin_tone": "1f469-1f3fd-200d-1f527", "woman_mechanic_medium_skin_tone": "1f469-1f3fd-200d-1f527", "female-mechanic_medium_dark_skin_tone": "1f469-1f3fe-200d-1f527", "woman_mechanic_medium_dark_skin_tone": "1f469-1f3fe-200d-1f527", "female-mechanic_dark_skin_tone": "1f469-1f3ff-200d-1f527", "woman_mechanic_dark_skin_tone": "1f469-1f3ff-200d-1f527", "female-scientist_light_skin_tone": "1f469-1f3fb-200d-1f52c", "woman_scientist_light_skin_tone": "1f469-1f3fb-200d-1f52c", "female-scientist_medium_light_skin_tone": "1f469-1f3fc-200d-1f52c", "woman_scientist_medium_light_skin_tone": "1f469-1f3fc-200d-1f52c", "female-scientist_medium_skin_tone": "1f469-1f3fd-200d-1f52c", "woman_scientist_medium_skin_tone": "1f469-1f3fd-200d-1f52c", "female-scientist_medium_dark_skin_tone": "1f469-1f3fe-200d-1f52c", "woman_scientist_medium_dark_skin_tone": "1f469-1f3fe-200d-1f52c", "female-scientist_dark_skin_tone": "1f469-1f3ff-200d-1f52c", "woman_scientist_dark_skin_tone": "1f469-1f3ff-200d-1f52c", "female-astronaut_light_skin_tone": "1f469-1f3fb-200d-1f680", "woman_astronaut_light_skin_tone": "1f469-1f3fb-200d-1f680", "female-astronaut_medium_light_skin_tone": "1f469-1f3fc-200d-1f680", "woman_astronaut_medium_light_skin_tone": "1f469-1f3fc-200d-1f680", "female-astronaut_medium_skin_tone": "1f469-1f3fd-200d-1f680", "woman_astronaut_medium_skin_tone": "1f469-1f3fd-200d-1f680", "female-astronaut_medium_dark_skin_tone": "1f469-1f3fe-200d-1f680", "woman_astronaut_medium_dark_skin_tone": "1f469-1f3fe-200d-1f680", "female-astronaut_dark_skin_tone": "1f469-1f3ff-200d-1f680", "woman_astronaut_dark_skin_tone": "1f469-1f3ff-200d-1f680", "female-firefighter_light_skin_tone": "1f469-1f3fb-200d-1f692", "woman_firefighter_light_skin_tone": "1f469-1f3fb-200d-1f692", "female-firefighter_medium_light_skin_tone": "1f469-1f3fc-200d-1f692", "woman_firefighter_medium_light_skin_tone": "1f469-1f3fc-200d-1f692", "female-firefighter_medium_skin_tone": "1f469-1f3fd-200d-1f692", "woman_firefighter_medium_skin_tone": "1f469-1f3fd-200d-1f692", "female-firefighter_medium_dark_skin_tone": "1f469-1f3fe-200d-1f692", "woman_firefighter_medium_dark_skin_tone": "1f469-1f3fe-200d-1f692", "female-firefighter_dark_skin_tone": "1f469-1f3ff-200d-1f692", "woman_firefighter_dark_skin_tone": "1f469-1f3ff-200d-1f692", "woman_with_probing_cane_light_skin_tone": "1f469-1f3fb-200d-1f9af", "woman_with_probing_cane_medium_light_skin_tone": "1f469-1f3fc-200d-1f9af", "woman_with_probing_cane_medium_skin_tone": "1f469-1f3fd-200d-1f9af", "woman_with_probing_cane_medium_dark_skin_tone": "1f469-1f3fe-200d-1f9af", "woman_with_probing_cane_dark_skin_tone": "1f469-1f3ff-200d-1f9af", "red_haired_woman_light_skin_tone": "1f469-1f3fb-200d-1f9b0", "red_haired_woman_medium_light_skin_tone": "1f469-1f3fc-200d-1f9b0", "red_haired_woman_medium_skin_tone": "1f469-1f3fd-200d-1f9b0", "red_haired_woman_medium_dark_skin_tone": "1f469-1f3fe-200d-1f9b0", "red_haired_woman_dark_skin_tone": "1f469-1f3ff-200d-1f9b0", "curly_haired_woman_light_skin_tone": "1f469-1f3fb-200d-1f9b1", "curly_haired_woman_medium_light_skin_tone": "1f469-1f3fc-200d-1f9b1", "curly_haired_woman_medium_skin_tone": "1f469-1f3fd-200d-1f9b1", "curly_haired_woman_medium_dark_skin_tone": "1f469-1f3fe-200d-1f9b1", "curly_haired_woman_dark_skin_tone": "1f469-1f3ff-200d-1f9b1", "bald_woman_light_skin_tone": "1f469-1f3fb-200d-1f9b2", "bald_woman_medium_light_skin_tone": "1f469-1f3fc-200d-1f9b2", "bald_woman_medium_skin_tone": "1f469-1f3fd-200d-1f9b2", "bald_woman_medium_dark_skin_tone": "1f469-1f3fe-200d-1f9b2", "bald_woman_dark_skin_tone": "1f469-1f3ff-200d-1f9b2", "white_haired_woman_light_skin_tone": "1f469-1f3fb-200d-1f9b3", "white_haired_woman_medium_light_skin_tone": "1f469-1f3fc-200d-1f9b3", "white_haired_woman_medium_skin_tone": "1f469-1f3fd-200d-1f9b3", "white_haired_woman_medium_dark_skin_tone": "1f469-1f3fe-200d-1f9b3", "white_haired_woman_dark_skin_tone": "1f469-1f3ff-200d-1f9b3", "woman_in_motorized_wheelchair_light_skin_tone": "1f469-1f3fb-200d-1f9bc", "woman_in_motorized_wheelchair_medium_light_skin_tone": "1f469-1f3fc-200d-1f9bc", "woman_in_motorized_wheelchair_medium_skin_tone": "1f469-1f3fd-200d-1f9bc", "woman_in_motorized_wheelchair_medium_dark_skin_tone": "1f469-1f3fe-200d-1f9bc", "woman_in_motorized_wheelchair_dark_skin_tone": "1f469-1f3ff-200d-1f9bc", "woman_in_manual_wheelchair_light_skin_tone": "1f469-1f3fb-200d-1f9bd", "woman_in_manual_wheelchair_medium_light_skin_tone": "1f469-1f3fc-200d-1f9bd", "woman_in_manual_wheelchair_medium_skin_tone": "1f469-1f3fd-200d-1f9bd", "woman_in_manual_wheelchair_medium_dark_skin_tone": "1f469-1f3fe-200d-1f9bd", "woman_in_manual_wheelchair_dark_skin_tone": "1f469-1f3ff-200d-1f9bd", "female-doctor_light_skin_tone": "1f469-1f3fb-200d-2695-fe0f", "woman_health_worker_light_skin_tone": "1f469-1f3fb-200d-2695-fe0f", "female-doctor_medium_light_skin_tone": "1f469-1f3fc-200d-2695-fe0f", "woman_health_worker_medium_light_skin_tone": "1f469-1f3fc-200d-2695-fe0f", "female-doctor_medium_skin_tone": "1f469-1f3fd-200d-2695-fe0f", "woman_health_worker_medium_skin_tone": "1f469-1f3fd-200d-2695-fe0f", "female-doctor_medium_dark_skin_tone": "1f469-1f3fe-200d-2695-fe0f", "woman_health_worker_medium_dark_skin_tone": "1f469-1f3fe-200d-2695-fe0f", "female-doctor_dark_skin_tone": "1f469-1f3ff-200d-2695-fe0f", "woman_health_worker_dark_skin_tone": "1f469-1f3ff-200d-2695-fe0f", "female-judge_light_skin_tone": "1f469-1f3fb-200d-2696-fe0f", "woman_judge_light_skin_tone": "1f469-1f3fb-200d-2696-fe0f", "female-judge_medium_light_skin_tone": "1f469-1f3fc-200d-2696-fe0f", "woman_judge_medium_light_skin_tone": "1f469-1f3fc-200d-2696-fe0f", "female-judge_medium_skin_tone": "1f469-1f3fd-200d-2696-fe0f", "woman_judge_medium_skin_tone": "1f469-1f3fd-200d-2696-fe0f", "female-judge_medium_dark_skin_tone": "1f469-1f3fe-200d-2696-fe0f", "woman_judge_medium_dark_skin_tone": "1f469-1f3fe-200d-2696-fe0f", "female-judge_dark_skin_tone": "1f469-1f3ff-200d-2696-fe0f", "woman_judge_dark_skin_tone": "1f469-1f3ff-200d-2696-fe0f", "female-pilot_light_skin_tone": "1f469-1f3fb-200d-2708-fe0f", "woman_pilot_light_skin_tone": "1f469-1f3fb-200d-2708-fe0f", "female-pilot_medium_light_skin_tone": "1f469-1f3fc-200d-2708-fe0f", "woman_pilot_medium_light_skin_tone": "1f469-1f3fc-200d-2708-fe0f", "female-pilot_medium_skin_tone": "1f469-1f3fd-200d-2708-fe0f", "woman_pilot_medium_skin_tone": "1f469-1f3fd-200d-2708-fe0f", "female-pilot_medium_dark_skin_tone": "1f469-1f3fe-200d-2708-fe0f", "woman_pilot_medium_dark_skin_tone": "1f469-1f3fe-200d-2708-fe0f", "female-pilot_dark_skin_tone": "1f469-1f3ff-200d-2708-fe0f", "woman_pilot_dark_skin_tone": "1f469-1f3ff-200d-2708-fe0f", "woman_light_skin_tone": "1f469-1f3fb", "woman_medium_light_skin_tone": "1f469-1f3fc", "woman_medium_skin_tone": "1f469-1f3fd", "woman_medium_dark_skin_tone": "1f469-1f3fe", "woman_dark_skin_tone": "1f469-1f3ff", "man_and_woman_holding_hands_light_skin_tone": "1f46b-1f3fb", "woman_and_man_holding_hands_light_skin_tone": "1f46b-1f3fb", "couple_light_skin_tone": "1f46b-1f3fb", "man_and_woman_holding_hands_medium_light_skin_tone": "1f46b-1f3fc", "woman_and_man_holding_hands_medium_light_skin_tone": "1f46b-1f3fc", "couple_medium_light_skin_tone": "1f46b-1f3fc", "man_and_woman_holding_hands_medium_skin_tone": "1f46b-1f3fd", "woman_and_man_holding_hands_medium_skin_tone": "1f46b-1f3fd", "couple_medium_skin_tone": "1f46b-1f3fd", "man_and_woman_holding_hands_medium_dark_skin_tone": "1f46b-1f3fe", "woman_and_man_holding_hands_medium_dark_skin_tone": "1f46b-1f3fe", "couple_medium_dark_skin_tone": "1f46b-1f3fe", "man_and_woman_holding_hands_dark_skin_tone": "1f46b-1f3ff", "woman_and_man_holding_hands_dark_skin_tone": "1f46b-1f3ff", "couple_dark_skin_tone": "1f46b-1f3ff", "man_and_woman_holding_hands_light_skin_tone_medium_light_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f468-1f3fc", "woman_and_man_holding_hands_light_skin_tone_medium_light_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f468-1f3fc", "couple_light_skin_tone_medium_light_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f468-1f3fc", "man_and_woman_holding_hands_light_skin_tone_medium_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f468-1f3fd", "woman_and_man_holding_hands_light_skin_tone_medium_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f468-1f3fd", "couple_light_skin_tone_medium_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f468-1f3fd", "man_and_woman_holding_hands_light_skin_tone_medium_dark_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f468-1f3fe", "woman_and_man_holding_hands_light_skin_tone_medium_dark_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f468-1f3fe", "couple_light_skin_tone_medium_dark_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f468-1f3fe", "man_and_woman_holding_hands_light_skin_tone_dark_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f468-1f3ff", "woman_and_man_holding_hands_light_skin_tone_dark_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f468-1f3ff", "couple_light_skin_tone_dark_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f468-1f3ff", "man_and_woman_holding_hands_medium_light_skin_tone_light_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f468-1f3fb", "woman_and_man_holding_hands_medium_light_skin_tone_light_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f468-1f3fb", "couple_medium_light_skin_tone_light_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f468-1f3fb", "man_and_woman_holding_hands_medium_light_skin_tone_medium_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f468-1f3fd", "woman_and_man_holding_hands_medium_light_skin_tone_medium_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f468-1f3fd", "couple_medium_light_skin_tone_medium_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f468-1f3fd", "man_and_woman_holding_hands_medium_light_skin_tone_medium_dark_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f468-1f3fe", "woman_and_man_holding_hands_medium_light_skin_tone_medium_dark_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f468-1f3fe", "couple_medium_light_skin_tone_medium_dark_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f468-1f3fe", "man_and_woman_holding_hands_medium_light_skin_tone_dark_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f468-1f3ff", "woman_and_man_holding_hands_medium_light_skin_tone_dark_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f468-1f3ff", "couple_medium_light_skin_tone_dark_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f468-1f3ff", "man_and_woman_holding_hands_medium_skin_tone_light_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f468-1f3fb", "woman_and_man_holding_hands_medium_skin_tone_light_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f468-1f3fb", "couple_medium_skin_tone_light_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f468-1f3fb", "man_and_woman_holding_hands_medium_skin_tone_medium_light_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f468-1f3fc", "woman_and_man_holding_hands_medium_skin_tone_medium_light_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f468-1f3fc", "couple_medium_skin_tone_medium_light_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f468-1f3fc", "man_and_woman_holding_hands_medium_skin_tone_medium_dark_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f468-1f3fe", "woman_and_man_holding_hands_medium_skin_tone_medium_dark_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f468-1f3fe", "couple_medium_skin_tone_medium_dark_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f468-1f3fe", "man_and_woman_holding_hands_medium_skin_tone_dark_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f468-1f3ff", "woman_and_man_holding_hands_medium_skin_tone_dark_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f468-1f3ff", "couple_medium_skin_tone_dark_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f468-1f3ff", "man_and_woman_holding_hands_medium_dark_skin_tone_light_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f468-1f3fb", "woman_and_man_holding_hands_medium_dark_skin_tone_light_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f468-1f3fb", "couple_medium_dark_skin_tone_light_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f468-1f3fb", "man_and_woman_holding_hands_medium_dark_skin_tone_medium_light_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f468-1f3fc", "woman_and_man_holding_hands_medium_dark_skin_tone_medium_light_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f468-1f3fc", "couple_medium_dark_skin_tone_medium_light_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f468-1f3fc", "man_and_woman_holding_hands_medium_dark_skin_tone_medium_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f468-1f3fd", "woman_and_man_holding_hands_medium_dark_skin_tone_medium_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f468-1f3fd", "couple_medium_dark_skin_tone_medium_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f468-1f3fd", "man_and_woman_holding_hands_medium_dark_skin_tone_dark_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f468-1f3ff", "woman_and_man_holding_hands_medium_dark_skin_tone_dark_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f468-1f3ff", "couple_medium_dark_skin_tone_dark_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f468-1f3ff", "man_and_woman_holding_hands_dark_skin_tone_light_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f468-1f3fb", "woman_and_man_holding_hands_dark_skin_tone_light_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f468-1f3fb", "couple_dark_skin_tone_light_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f468-1f3fb", "man_and_woman_holding_hands_dark_skin_tone_medium_light_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f468-1f3fc", "woman_and_man_holding_hands_dark_skin_tone_medium_light_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f468-1f3fc", "couple_dark_skin_tone_medium_light_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f468-1f3fc", "man_and_woman_holding_hands_dark_skin_tone_medium_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f468-1f3fd", "woman_and_man_holding_hands_dark_skin_tone_medium_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f468-1f3fd", "couple_dark_skin_tone_medium_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f468-1f3fd", "man_and_woman_holding_hands_dark_skin_tone_medium_dark_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f468-1f3fe", "woman_and_man_holding_hands_dark_skin_tone_medium_dark_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f468-1f3fe", "couple_dark_skin_tone_medium_dark_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f468-1f3fe", "two_men_holding_hands_light_skin_tone": "1f46c-1f3fb", "men_holding_hands_light_skin_tone": "1f46c-1f3fb", "two_men_holding_hands_medium_light_skin_tone": "1f46c-1f3fc", "men_holding_hands_medium_light_skin_tone": "1f46c-1f3fc", "two_men_holding_hands_medium_skin_tone": "1f46c-1f3fd", "men_holding_hands_medium_skin_tone": "1f46c-1f3fd", "two_men_holding_hands_medium_dark_skin_tone": "1f46c-1f3fe", "men_holding_hands_medium_dark_skin_tone": "1f46c-1f3fe", "two_men_holding_hands_dark_skin_tone": "1f46c-1f3ff", "men_holding_hands_dark_skin_tone": "1f46c-1f3ff", "two_men_holding_hands_light_skin_tone_medium_light_skin_tone": "1f468-1f3fb-200d-1f91d-200d-1f468-1f3fc", "men_holding_hands_light_skin_tone_medium_light_skin_tone": "1f468-1f3fb-200d-1f91d-200d-1f468-1f3fc", "two_men_holding_hands_light_skin_tone_medium_skin_tone": "1f468-1f3fb-200d-1f91d-200d-1f468-1f3fd", "men_holding_hands_light_skin_tone_medium_skin_tone": "1f468-1f3fb-200d-1f91d-200d-1f468-1f3fd", "two_men_holding_hands_light_skin_tone_medium_dark_skin_tone": "1f468-1f3fb-200d-1f91d-200d-1f468-1f3fe", "men_holding_hands_light_skin_tone_medium_dark_skin_tone": "1f468-1f3fb-200d-1f91d-200d-1f468-1f3fe", "two_men_holding_hands_light_skin_tone_dark_skin_tone": "1f468-1f3fb-200d-1f91d-200d-1f468-1f3ff", "men_holding_hands_light_skin_tone_dark_skin_tone": "1f468-1f3fb-200d-1f91d-200d-1f468-1f3ff", "two_men_holding_hands_medium_light_skin_tone_light_skin_tone": "1f468-1f3fc-200d-1f91d-200d-1f468-1f3fb", "men_holding_hands_medium_light_skin_tone_light_skin_tone": "1f468-1f3fc-200d-1f91d-200d-1f468-1f3fb", "two_men_holding_hands_medium_light_skin_tone_medium_skin_tone": "1f468-1f3fc-200d-1f91d-200d-1f468-1f3fd", "men_holding_hands_medium_light_skin_tone_medium_skin_tone": "1f468-1f3fc-200d-1f91d-200d-1f468-1f3fd", "two_men_holding_hands_medium_light_skin_tone_medium_dark_skin_tone": "1f468-1f3fc-200d-1f91d-200d-1f468-1f3fe", "men_holding_hands_medium_light_skin_tone_medium_dark_skin_tone": "1f468-1f3fc-200d-1f91d-200d-1f468-1f3fe", "two_men_holding_hands_medium_light_skin_tone_dark_skin_tone": "1f468-1f3fc-200d-1f91d-200d-1f468-1f3ff", "men_holding_hands_medium_light_skin_tone_dark_skin_tone": "1f468-1f3fc-200d-1f91d-200d-1f468-1f3ff", "two_men_holding_hands_medium_skin_tone_light_skin_tone": "1f468-1f3fd-200d-1f91d-200d-1f468-1f3fb", "men_holding_hands_medium_skin_tone_light_skin_tone": "1f468-1f3fd-200d-1f91d-200d-1f468-1f3fb", "two_men_holding_hands_medium_skin_tone_medium_light_skin_tone": "1f468-1f3fd-200d-1f91d-200d-1f468-1f3fc", "men_holding_hands_medium_skin_tone_medium_light_skin_tone": "1f468-1f3fd-200d-1f91d-200d-1f468-1f3fc", "two_men_holding_hands_medium_skin_tone_medium_dark_skin_tone": "1f468-1f3fd-200d-1f91d-200d-1f468-1f3fe", "men_holding_hands_medium_skin_tone_medium_dark_skin_tone": "1f468-1f3fd-200d-1f91d-200d-1f468-1f3fe", "two_men_holding_hands_medium_skin_tone_dark_skin_tone": "1f468-1f3fd-200d-1f91d-200d-1f468-1f3ff", "men_holding_hands_medium_skin_tone_dark_skin_tone": "1f468-1f3fd-200d-1f91d-200d-1f468-1f3ff", "two_men_holding_hands_medium_dark_skin_tone_light_skin_tone": "1f468-1f3fe-200d-1f91d-200d-1f468-1f3fb", "men_holding_hands_medium_dark_skin_tone_light_skin_tone": "1f468-1f3fe-200d-1f91d-200d-1f468-1f3fb", "two_men_holding_hands_medium_dark_skin_tone_medium_light_skin_tone": "1f468-1f3fe-200d-1f91d-200d-1f468-1f3fc", "men_holding_hands_medium_dark_skin_tone_medium_light_skin_tone": "1f468-1f3fe-200d-1f91d-200d-1f468-1f3fc", "two_men_holding_hands_medium_dark_skin_tone_medium_skin_tone": "1f468-1f3fe-200d-1f91d-200d-1f468-1f3fd", "men_holding_hands_medium_dark_skin_tone_medium_skin_tone": "1f468-1f3fe-200d-1f91d-200d-1f468-1f3fd", "two_men_holding_hands_medium_dark_skin_tone_dark_skin_tone": "1f468-1f3fe-200d-1f91d-200d-1f468-1f3ff", "men_holding_hands_medium_dark_skin_tone_dark_skin_tone": "1f468-1f3fe-200d-1f91d-200d-1f468-1f3ff", "two_men_holding_hands_dark_skin_tone_light_skin_tone": "1f468-1f3ff-200d-1f91d-200d-1f468-1f3fb", "men_holding_hands_dark_skin_tone_light_skin_tone": "1f468-1f3ff-200d-1f91d-200d-1f468-1f3fb", "two_men_holding_hands_dark_skin_tone_medium_light_skin_tone": "1f468-1f3ff-200d-1f91d-200d-1f468-1f3fc", "men_holding_hands_dark_skin_tone_medium_light_skin_tone": "1f468-1f3ff-200d-1f91d-200d-1f468-1f3fc", "two_men_holding_hands_dark_skin_tone_medium_skin_tone": "1f468-1f3ff-200d-1f91d-200d-1f468-1f3fd", "men_holding_hands_dark_skin_tone_medium_skin_tone": "1f468-1f3ff-200d-1f91d-200d-1f468-1f3fd", "two_men_holding_hands_dark_skin_tone_medium_dark_skin_tone": "1f468-1f3ff-200d-1f91d-200d-1f468-1f3fe", "men_holding_hands_dark_skin_tone_medium_dark_skin_tone": "1f468-1f3ff-200d-1f91d-200d-1f468-1f3fe", "two_women_holding_hands_light_skin_tone": "1f46d-1f3fb", "women_holding_hands_light_skin_tone": "1f46d-1f3fb", "two_women_holding_hands_medium_light_skin_tone": "1f46d-1f3fc", "women_holding_hands_medium_light_skin_tone": "1f46d-1f3fc", "two_women_holding_hands_medium_skin_tone": "1f46d-1f3fd", "women_holding_hands_medium_skin_tone": "1f46d-1f3fd", "two_women_holding_hands_medium_dark_skin_tone": "1f46d-1f3fe", "women_holding_hands_medium_dark_skin_tone": "1f46d-1f3fe", "two_women_holding_hands_dark_skin_tone": "1f46d-1f3ff", "women_holding_hands_dark_skin_tone": "1f46d-1f3ff", "two_women_holding_hands_light_skin_tone_medium_light_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f469-1f3fc", "women_holding_hands_light_skin_tone_medium_light_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f469-1f3fc", "two_women_holding_hands_light_skin_tone_medium_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f469-1f3fd", "women_holding_hands_light_skin_tone_medium_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f469-1f3fd", "two_women_holding_hands_light_skin_tone_medium_dark_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f469-1f3fe", "women_holding_hands_light_skin_tone_medium_dark_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f469-1f3fe", "two_women_holding_hands_light_skin_tone_dark_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f469-1f3ff", "women_holding_hands_light_skin_tone_dark_skin_tone": "1f469-1f3fb-200d-1f91d-200d-1f469-1f3ff", "two_women_holding_hands_medium_light_skin_tone_light_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f469-1f3fb", "women_holding_hands_medium_light_skin_tone_light_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f469-1f3fb", "two_women_holding_hands_medium_light_skin_tone_medium_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f469-1f3fd", "women_holding_hands_medium_light_skin_tone_medium_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f469-1f3fd", "two_women_holding_hands_medium_light_skin_tone_medium_dark_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f469-1f3fe", "women_holding_hands_medium_light_skin_tone_medium_dark_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f469-1f3fe", "two_women_holding_hands_medium_light_skin_tone_dark_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f469-1f3ff", "women_holding_hands_medium_light_skin_tone_dark_skin_tone": "1f469-1f3fc-200d-1f91d-200d-1f469-1f3ff", "two_women_holding_hands_medium_skin_tone_light_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f469-1f3fb", "women_holding_hands_medium_skin_tone_light_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f469-1f3fb", "two_women_holding_hands_medium_skin_tone_medium_light_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f469-1f3fc", "women_holding_hands_medium_skin_tone_medium_light_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f469-1f3fc", "two_women_holding_hands_medium_skin_tone_medium_dark_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f469-1f3fe", "women_holding_hands_medium_skin_tone_medium_dark_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f469-1f3fe", "two_women_holding_hands_medium_skin_tone_dark_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f469-1f3ff", "women_holding_hands_medium_skin_tone_dark_skin_tone": "1f469-1f3fd-200d-1f91d-200d-1f469-1f3ff", "two_women_holding_hands_medium_dark_skin_tone_light_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f469-1f3fb", "women_holding_hands_medium_dark_skin_tone_light_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f469-1f3fb", "two_women_holding_hands_medium_dark_skin_tone_medium_light_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f469-1f3fc", "women_holding_hands_medium_dark_skin_tone_medium_light_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f469-1f3fc", "two_women_holding_hands_medium_dark_skin_tone_medium_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f469-1f3fd", "women_holding_hands_medium_dark_skin_tone_medium_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f469-1f3fd", "two_women_holding_hands_medium_dark_skin_tone_dark_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f469-1f3ff", "women_holding_hands_medium_dark_skin_tone_dark_skin_tone": "1f469-1f3fe-200d-1f91d-200d-1f469-1f3ff", "two_women_holding_hands_dark_skin_tone_light_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f469-1f3fb", "women_holding_hands_dark_skin_tone_light_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f469-1f3fb", "two_women_holding_hands_dark_skin_tone_medium_light_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f469-1f3fc", "women_holding_hands_dark_skin_tone_medium_light_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f469-1f3fc", "two_women_holding_hands_dark_skin_tone_medium_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f469-1f3fd", "women_holding_hands_dark_skin_tone_medium_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f469-1f3fd", "two_women_holding_hands_dark_skin_tone_medium_dark_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f469-1f3fe", "women_holding_hands_dark_skin_tone_medium_dark_skin_tone": "1f469-1f3ff-200d-1f91d-200d-1f469-1f3fe", "female-police-officer_light_skin_tone": "1f46e-1f3fb-200d-2640-fe0f", "policewoman_light_skin_tone": "1f46e-1f3fb-200d-2640-fe0f", "female-police-officer_medium_light_skin_tone": "1f46e-1f3fc-200d-2640-fe0f", "policewoman_medium_light_skin_tone": "1f46e-1f3fc-200d-2640-fe0f", "female-police-officer_medium_skin_tone": "1f46e-1f3fd-200d-2640-fe0f", "policewoman_medium_skin_tone": "1f46e-1f3fd-200d-2640-fe0f", "female-police-officer_medium_dark_skin_tone": "1f46e-1f3fe-200d-2640-fe0f", "policewoman_medium_dark_skin_tone": "1f46e-1f3fe-200d-2640-fe0f", "female-police-officer_dark_skin_tone": "1f46e-1f3ff-200d-2640-fe0f", "policewoman_dark_skin_tone": "1f46e-1f3ff-200d-2640-fe0f", "male-police-officer_light_skin_tone": "1f46e-1f3fb-200d-2642-fe0f", "policeman_light_skin_tone": "1f46e-1f3fb-200d-2642-fe0f", "male-police-officer_medium_light_skin_tone": "1f46e-1f3fc-200d-2642-fe0f", "policeman_medium_light_skin_tone": "1f46e-1f3fc-200d-2642-fe0f", "male-police-officer_medium_skin_tone": "1f46e-1f3fd-200d-2642-fe0f", "policeman_medium_skin_tone": "1f46e-1f3fd-200d-2642-fe0f", "male-police-officer_medium_dark_skin_tone": "1f46e-1f3fe-200d-2642-fe0f", "policeman_medium_dark_skin_tone": "1f46e-1f3fe-200d-2642-fe0f", "male-police-officer_dark_skin_tone": "1f46e-1f3ff-200d-2642-fe0f", "policeman_dark_skin_tone": "1f46e-1f3ff-200d-2642-fe0f", "cop_light_skin_tone": "1f46e-1f3fb", "cop_medium_light_skin_tone": "1f46e-1f3fc", "cop_medium_skin_tone": "1f46e-1f3fd", "cop_medium_dark_skin_tone": "1f46e-1f3fe", "cop_dark_skin_tone": "1f46e-1f3ff", "woman_with_veil_light_skin_tone": "1f470-1f3fb-200d-2640-fe0f", "woman_with_veil_medium_light_skin_tone": "1f470-1f3fc-200d-2640-fe0f", "woman_with_veil_medium_skin_tone": "1f470-1f3fd-200d-2640-fe0f", "woman_with_veil_medium_dark_skin_tone": "1f470-1f3fe-200d-2640-fe0f", "woman_with_veil_dark_skin_tone": "1f470-1f3ff-200d-2640-fe0f", "man_with_veil_light_skin_tone": "1f470-1f3fb-200d-2642-fe0f", "man_with_veil_medium_light_skin_tone": "1f470-1f3fc-200d-2642-fe0f", "man_with_veil_medium_skin_tone": "1f470-1f3fd-200d-2642-fe0f", "man_with_veil_medium_dark_skin_tone": "1f470-1f3fe-200d-2642-fe0f", "man_with_veil_dark_skin_tone": "1f470-1f3ff-200d-2642-fe0f", "bride_with_veil_light_skin_tone": "1f470-1f3fb", "bride_with_veil_medium_light_skin_tone": "1f470-1f3fc", "bride_with_veil_medium_skin_tone": "1f470-1f3fd", "bride_with_veil_medium_dark_skin_tone": "1f470-1f3fe", "bride_with_veil_dark_skin_tone": "1f470-1f3ff", "blond-haired-woman_light_skin_tone": "1f471-1f3fb-200d-2640-fe0f", "blonde_woman_light_skin_tone": "1f471-1f3fb-200d-2640-fe0f", "blond-haired-woman_medium_light_skin_tone": "1f471-1f3fc-200d-2640-fe0f", "blonde_woman_medium_light_skin_tone": "1f471-1f3fc-200d-2640-fe0f", "blond-haired-woman_medium_skin_tone": "1f471-1f3fd-200d-2640-fe0f", "blonde_woman_medium_skin_tone": "1f471-1f3fd-200d-2640-fe0f", "blond-haired-woman_medium_dark_skin_tone": "1f471-1f3fe-200d-2640-fe0f", "blonde_woman_medium_dark_skin_tone": "1f471-1f3fe-200d-2640-fe0f", "blond-haired-woman_dark_skin_tone": "1f471-1f3ff-200d-2640-fe0f", "blonde_woman_dark_skin_tone": "1f471-1f3ff-200d-2640-fe0f", "blond-haired-man_light_skin_tone": "1f471-1f3fb-200d-2642-fe0f", "blonde_man_light_skin_tone": "1f471-1f3fb-200d-2642-fe0f", "blond-haired-man_medium_light_skin_tone": "1f471-1f3fc-200d-2642-fe0f", "blonde_man_medium_light_skin_tone": "1f471-1f3fc-200d-2642-fe0f", "blond-haired-man_medium_skin_tone": "1f471-1f3fd-200d-2642-fe0f", "blonde_man_medium_skin_tone": "1f471-1f3fd-200d-2642-fe0f", "blond-haired-man_medium_dark_skin_tone": "1f471-1f3fe-200d-2642-fe0f", "blonde_man_medium_dark_skin_tone": "1f471-1f3fe-200d-2642-fe0f", "blond-haired-man_dark_skin_tone": "1f471-1f3ff-200d-2642-fe0f", "blonde_man_dark_skin_tone": "1f471-1f3ff-200d-2642-fe0f", "person_with_blond_hair_light_skin_tone": "1f471-1f3fb", "person_with_blond_hair_medium_light_skin_tone": "1f471-1f3fc", "person_with_blond_hair_medium_skin_tone": "1f471-1f3fd", "person_with_blond_hair_medium_dark_skin_tone": "1f471-1f3fe", "person_with_blond_hair_dark_skin_tone": "1f471-1f3ff", "man_with_gua_pi_mao_light_skin_tone": "1f472-1f3fb", "man_with_gua_pi_mao_medium_light_skin_tone": "1f472-1f3fc", "man_with_gua_pi_mao_medium_skin_tone": "1f472-1f3fd", "man_with_gua_pi_mao_medium_dark_skin_tone": "1f472-1f3fe", "man_with_gua_pi_mao_dark_skin_tone": "1f472-1f3ff", "woman-wearing-turban_light_skin_tone": "1f473-1f3fb-200d-2640-fe0f", "woman_with_turban_light_skin_tone": "1f473-1f3fb-200d-2640-fe0f", "woman-wearing-turban_medium_light_skin_tone": "1f473-1f3fc-200d-2640-fe0f", "woman_with_turban_medium_light_skin_tone": "1f473-1f3fc-200d-2640-fe0f", "woman-wearing-turban_medium_skin_tone": "1f473-1f3fd-200d-2640-fe0f", "woman_with_turban_medium_skin_tone": "1f473-1f3fd-200d-2640-fe0f", "woman-wearing-turban_medium_dark_skin_tone": "1f473-1f3fe-200d-2640-fe0f", "woman_with_turban_medium_dark_skin_tone": "1f473-1f3fe-200d-2640-fe0f", "woman-wearing-turban_dark_skin_tone": "1f473-1f3ff-200d-2640-fe0f", "woman_with_turban_dark_skin_tone": "1f473-1f3ff-200d-2640-fe0f", "man-wearing-turban_light_skin_tone": "1f473-1f3fb-200d-2642-fe0f", "man-wearing-turban_medium_light_skin_tone": "1f473-1f3fc-200d-2642-fe0f", "man-wearing-turban_medium_skin_tone": "1f473-1f3fd-200d-2642-fe0f", "man-wearing-turban_medium_dark_skin_tone": "1f473-1f3fe-200d-2642-fe0f", "man-wearing-turban_dark_skin_tone": "1f473-1f3ff-200d-2642-fe0f", "man_with_turban_light_skin_tone": "1f473-1f3fb", "man_with_turban_medium_light_skin_tone": "1f473-1f3fc", "man_with_turban_medium_skin_tone": "1f473-1f3fd", "man_with_turban_medium_dark_skin_tone": "1f473-1f3fe", "man_with_turban_dark_skin_tone": "1f473-1f3ff", "older_man_light_skin_tone": "1f474-1f3fb", "older_man_medium_light_skin_tone": "1f474-1f3fc", "older_man_medium_skin_tone": "1f474-1f3fd", "older_man_medium_dark_skin_tone": "1f474-1f3fe", "older_man_dark_skin_tone": "1f474-1f3ff", "older_woman_light_skin_tone": "1f475-1f3fb", "older_woman_medium_light_skin_tone": "1f475-1f3fc", "older_woman_medium_skin_tone": "1f475-1f3fd", "older_woman_medium_dark_skin_tone": "1f475-1f3fe", "older_woman_dark_skin_tone": "1f475-1f3ff", "baby_light_skin_tone": "1f476-1f3fb", "baby_medium_light_skin_tone": "1f476-1f3fc", "baby_medium_skin_tone": "1f476-1f3fd", "baby_medium_dark_skin_tone": "1f476-1f3fe", "baby_dark_skin_tone": "1f476-1f3ff", "female-construction-worker_light_skin_tone": "1f477-1f3fb-200d-2640-fe0f", "construction_worker_woman_light_skin_tone": "1f477-1f3fb-200d-2640-fe0f", "female-construction-worker_medium_light_skin_tone": "1f477-1f3fc-200d-2640-fe0f", "construction_worker_woman_medium_light_skin_tone": "1f477-1f3fc-200d-2640-fe0f", "female-construction-worker_medium_skin_tone": "1f477-1f3fd-200d-2640-fe0f", "construction_worker_woman_medium_skin_tone": "1f477-1f3fd-200d-2640-fe0f", "female-construction-worker_medium_dark_skin_tone": "1f477-1f3fe-200d-2640-fe0f", "construction_worker_woman_medium_dark_skin_tone": "1f477-1f3fe-200d-2640-fe0f", "female-construction-worker_dark_skin_tone": "1f477-1f3ff-200d-2640-fe0f", "construction_worker_woman_dark_skin_tone": "1f477-1f3ff-200d-2640-fe0f", "male-construction-worker_light_skin_tone": "1f477-1f3fb-200d-2642-fe0f", "construction_worker_man_light_skin_tone": "1f477-1f3fb-200d-2642-fe0f", "male-construction-worker_medium_light_skin_tone": "1f477-1f3fc-200d-2642-fe0f", "construction_worker_man_medium_light_skin_tone": "1f477-1f3fc-200d-2642-fe0f", "male-construction-worker_medium_skin_tone": "1f477-1f3fd-200d-2642-fe0f", "construction_worker_man_medium_skin_tone": "1f477-1f3fd-200d-2642-fe0f", "male-construction-worker_medium_dark_skin_tone": "1f477-1f3fe-200d-2642-fe0f", "construction_worker_man_medium_dark_skin_tone": "1f477-1f3fe-200d-2642-fe0f", "male-construction-worker_dark_skin_tone": "1f477-1f3ff-200d-2642-fe0f", "construction_worker_man_dark_skin_tone": "1f477-1f3ff-200d-2642-fe0f", "construction_worker_light_skin_tone": "1f477-1f3fb", "construction_worker_medium_light_skin_tone": "1f477-1f3fc", "construction_worker_medium_skin_tone": "1f477-1f3fd", "construction_worker_medium_dark_skin_tone": "1f477-1f3fe", "construction_worker_dark_skin_tone": "1f477-1f3ff", "princess_light_skin_tone": "1f478-1f3fb", "princess_medium_light_skin_tone": "1f478-1f3fc", "princess_medium_skin_tone": "1f478-1f3fd", "princess_medium_dark_skin_tone": "1f478-1f3fe", "princess_dark_skin_tone": "1f478-1f3ff", "angel_light_skin_tone": "1f47c-1f3fb", "angel_medium_light_skin_tone": "1f47c-1f3fc", "angel_medium_skin_tone": "1f47c-1f3fd", "angel_medium_dark_skin_tone": "1f47c-1f3fe", "angel_dark_skin_tone": "1f47c-1f3ff", "woman-tipping-hand_light_skin_tone": "1f481-1f3fb-200d-2640-fe0f", "tipping_hand_woman_light_skin_tone": "1f481-1f3fb-200d-2640-fe0f", "woman-tipping-hand_medium_light_skin_tone": "1f481-1f3fc-200d-2640-fe0f", "tipping_hand_woman_medium_light_skin_tone": "1f481-1f3fc-200d-2640-fe0f", "woman-tipping-hand_medium_skin_tone": "1f481-1f3fd-200d-2640-fe0f", "tipping_hand_woman_medium_skin_tone": "1f481-1f3fd-200d-2640-fe0f", "woman-tipping-hand_medium_dark_skin_tone": "1f481-1f3fe-200d-2640-fe0f", "tipping_hand_woman_medium_dark_skin_tone": "1f481-1f3fe-200d-2640-fe0f", "woman-tipping-hand_dark_skin_tone": "1f481-1f3ff-200d-2640-fe0f", "tipping_hand_woman_dark_skin_tone": "1f481-1f3ff-200d-2640-fe0f", "man-tipping-hand_light_skin_tone": "1f481-1f3fb-200d-2642-fe0f", "tipping_hand_man_light_skin_tone": "1f481-1f3fb-200d-2642-fe0f", "man-tipping-hand_medium_light_skin_tone": "1f481-1f3fc-200d-2642-fe0f", "tipping_hand_man_medium_light_skin_tone": "1f481-1f3fc-200d-2642-fe0f", "man-tipping-hand_medium_skin_tone": "1f481-1f3fd-200d-2642-fe0f", "tipping_hand_man_medium_skin_tone": "1f481-1f3fd-200d-2642-fe0f", "man-tipping-hand_medium_dark_skin_tone": "1f481-1f3fe-200d-2642-fe0f", "tipping_hand_man_medium_dark_skin_tone": "1f481-1f3fe-200d-2642-fe0f", "man-tipping-hand_dark_skin_tone": "1f481-1f3ff-200d-2642-fe0f", "tipping_hand_man_dark_skin_tone": "1f481-1f3ff-200d-2642-fe0f", "information_desk_person_light_skin_tone": "1f481-1f3fb", "information_desk_person_medium_light_skin_tone": "1f481-1f3fc", "information_desk_person_medium_skin_tone": "1f481-1f3fd", "information_desk_person_medium_dark_skin_tone": "1f481-1f3fe", "information_desk_person_dark_skin_tone": "1f481-1f3ff", "female-guard_light_skin_tone": "1f482-1f3fb-200d-2640-fe0f", "guardswoman_light_skin_tone": "1f482-1f3fb-200d-2640-fe0f", "female-guard_medium_light_skin_tone": "1f482-1f3fc-200d-2640-fe0f", "guardswoman_medium_light_skin_tone": "1f482-1f3fc-200d-2640-fe0f", "female-guard_medium_skin_tone": "1f482-1f3fd-200d-2640-fe0f", "guardswoman_medium_skin_tone": "1f482-1f3fd-200d-2640-fe0f", "female-guard_medium_dark_skin_tone": "1f482-1f3fe-200d-2640-fe0f", "guardswoman_medium_dark_skin_tone": "1f482-1f3fe-200d-2640-fe0f", "female-guard_dark_skin_tone": "1f482-1f3ff-200d-2640-fe0f", "guardswoman_dark_skin_tone": "1f482-1f3ff-200d-2640-fe0f", "male-guard_light_skin_tone": "1f482-1f3fb-200d-2642-fe0f", "male-guard_medium_light_skin_tone": "1f482-1f3fc-200d-2642-fe0f", "male-guard_medium_skin_tone": "1f482-1f3fd-200d-2642-fe0f", "male-guard_medium_dark_skin_tone": "1f482-1f3fe-200d-2642-fe0f", "male-guard_dark_skin_tone": "1f482-1f3ff-200d-2642-fe0f", "guardsman_light_skin_tone": "1f482-1f3fb", "guardsman_medium_light_skin_tone": "1f482-1f3fc", "guardsman_medium_skin_tone": "1f482-1f3fd", "guardsman_medium_dark_skin_tone": "1f482-1f3fe", "guardsman_dark_skin_tone": "1f482-1f3ff", "dancer_light_skin_tone": "1f483-1f3fb", "dancer_medium_light_skin_tone": "1f483-1f3fc", "dancer_medium_skin_tone": "1f483-1f3fd", "dancer_medium_dark_skin_tone": "1f483-1f3fe", "dancer_dark_skin_tone": "1f483-1f3ff", "nail_care_light_skin_tone": "1f485-1f3fb", "nail_care_medium_light_skin_tone": "1f485-1f3fc", "nail_care_medium_skin_tone": "1f485-1f3fd", "nail_care_medium_dark_skin_tone": "1f485-1f3fe", "nail_care_dark_skin_tone": "1f485-1f3ff", "woman-getting-massage_light_skin_tone": "1f486-1f3fb-200d-2640-fe0f", "massage_woman_light_skin_tone": "1f486-1f3fb-200d-2640-fe0f", "woman-getting-massage_medium_light_skin_tone": "1f486-1f3fc-200d-2640-fe0f", "massage_woman_medium_light_skin_tone": "1f486-1f3fc-200d-2640-fe0f", "woman-getting-massage_medium_skin_tone": "1f486-1f3fd-200d-2640-fe0f", "massage_woman_medium_skin_tone": "1f486-1f3fd-200d-2640-fe0f", "woman-getting-massage_medium_dark_skin_tone": "1f486-1f3fe-200d-2640-fe0f", "massage_woman_medium_dark_skin_tone": "1f486-1f3fe-200d-2640-fe0f", "woman-getting-massage_dark_skin_tone": "1f486-1f3ff-200d-2640-fe0f", "massage_woman_dark_skin_tone": "1f486-1f3ff-200d-2640-fe0f", "man-getting-massage_light_skin_tone": "1f486-1f3fb-200d-2642-fe0f", "massage_man_light_skin_tone": "1f486-1f3fb-200d-2642-fe0f", "man-getting-massage_medium_light_skin_tone": "1f486-1f3fc-200d-2642-fe0f", "massage_man_medium_light_skin_tone": "1f486-1f3fc-200d-2642-fe0f", "man-getting-massage_medium_skin_tone": "1f486-1f3fd-200d-2642-fe0f", "massage_man_medium_skin_tone": "1f486-1f3fd-200d-2642-fe0f", "man-getting-massage_medium_dark_skin_tone": "1f486-1f3fe-200d-2642-fe0f", "massage_man_medium_dark_skin_tone": "1f486-1f3fe-200d-2642-fe0f", "man-getting-massage_dark_skin_tone": "1f486-1f3ff-200d-2642-fe0f", "massage_man_dark_skin_tone": "1f486-1f3ff-200d-2642-fe0f", "massage_light_skin_tone": "1f486-1f3fb", "massage_medium_light_skin_tone": "1f486-1f3fc", "massage_medium_skin_tone": "1f486-1f3fd", "massage_medium_dark_skin_tone": "1f486-1f3fe", "massage_dark_skin_tone": "1f486-1f3ff", "woman-getting-haircut_light_skin_tone": "1f487-1f3fb-200d-2640-fe0f", "haircut_woman_light_skin_tone": "1f487-1f3fb-200d-2640-fe0f", "woman-getting-haircut_medium_light_skin_tone": "1f487-1f3fc-200d-2640-fe0f", "haircut_woman_medium_light_skin_tone": "1f487-1f3fc-200d-2640-fe0f", "woman-getting-haircut_medium_skin_tone": "1f487-1f3fd-200d-2640-fe0f", "haircut_woman_medium_skin_tone": "1f487-1f3fd-200d-2640-fe0f", "woman-getting-haircut_medium_dark_skin_tone": "1f487-1f3fe-200d-2640-fe0f", "haircut_woman_medium_dark_skin_tone": "1f487-1f3fe-200d-2640-fe0f", "woman-getting-haircut_dark_skin_tone": "1f487-1f3ff-200d-2640-fe0f", "haircut_woman_dark_skin_tone": "1f487-1f3ff-200d-2640-fe0f", "man-getting-haircut_light_skin_tone": "1f487-1f3fb-200d-2642-fe0f", "haircut_man_light_skin_tone": "1f487-1f3fb-200d-2642-fe0f", "man-getting-haircut_medium_light_skin_tone": "1f487-1f3fc-200d-2642-fe0f", "haircut_man_medium_light_skin_tone": "1f487-1f3fc-200d-2642-fe0f", "man-getting-haircut_medium_skin_tone": "1f487-1f3fd-200d-2642-fe0f", "haircut_man_medium_skin_tone": "1f487-1f3fd-200d-2642-fe0f", "man-getting-haircut_medium_dark_skin_tone": "1f487-1f3fe-200d-2642-fe0f", "haircut_man_medium_dark_skin_tone": "1f487-1f3fe-200d-2642-fe0f", "man-getting-haircut_dark_skin_tone": "1f487-1f3ff-200d-2642-fe0f", "haircut_man_dark_skin_tone": "1f487-1f3ff-200d-2642-fe0f", "haircut_light_skin_tone": "1f487-1f3fb", "haircut_medium_light_skin_tone": "1f487-1f3fc", "haircut_medium_skin_tone": "1f487-1f3fd", "haircut_medium_dark_skin_tone": "1f487-1f3fe", "haircut_dark_skin_tone": "1f487-1f3ff", "muscle_light_skin_tone": "1f4aa-1f3fb", "muscle_medium_light_skin_tone": "1f4aa-1f3fc", "muscle_medium_skin_tone": "1f4aa-1f3fd", "muscle_medium_dark_skin_tone": "1f4aa-1f3fe", "muscle_dark_skin_tone": "1f4aa-1f3ff", "man_in_business_suit_levitating_light_skin_tone": "1f574-1f3fb", "business_suit_levitating_light_skin_tone": "1f574-1f3fb", "man_in_business_suit_levitating_medium_light_skin_tone": "1f574-1f3fc", "business_suit_levitating_medium_light_skin_tone": "1f574-1f3fc", "man_in_business_suit_levitating_medium_skin_tone": "1f574-1f3fd", "business_suit_levitating_medium_skin_tone": "1f574-1f3fd", "man_in_business_suit_levitating_medium_dark_skin_tone": "1f574-1f3fe", "business_suit_levitating_medium_dark_skin_tone": "1f574-1f3fe", "man_in_business_suit_levitating_dark_skin_tone": "1f574-1f3ff", "business_suit_levitating_dark_skin_tone": "1f574-1f3ff", "female-detective_light_skin_tone": "1f575-1f3fb-200d-2640-fe0f", "female_detective_light_skin_tone": "1f575-1f3fb-200d-2640-fe0f", "female-detective_medium_light_skin_tone": "1f575-1f3fc-200d-2640-fe0f", "female_detective_medium_light_skin_tone": "1f575-1f3fc-200d-2640-fe0f", "female-detective_medium_skin_tone": "1f575-1f3fd-200d-2640-fe0f", "female_detective_medium_skin_tone": "1f575-1f3fd-200d-2640-fe0f", "female-detective_medium_dark_skin_tone": "1f575-1f3fe-200d-2640-fe0f", "female_detective_medium_dark_skin_tone": "1f575-1f3fe-200d-2640-fe0f", "female-detective_dark_skin_tone": "1f575-1f3ff-200d-2640-fe0f", "female_detective_dark_skin_tone": "1f575-1f3ff-200d-2640-fe0f", "male-detective_light_skin_tone": "1f575-1f3fb-200d-2642-fe0f", "male_detective_light_skin_tone": "1f575-1f3fb-200d-2642-fe0f", "male-detective_medium_light_skin_tone": "1f575-1f3fc-200d-2642-fe0f", "male_detective_medium_light_skin_tone": "1f575-1f3fc-200d-2642-fe0f", "male-detective_medium_skin_tone": "1f575-1f3fd-200d-2642-fe0f", "male_detective_medium_skin_tone": "1f575-1f3fd-200d-2642-fe0f", "male-detective_medium_dark_skin_tone": "1f575-1f3fe-200d-2642-fe0f", "male_detective_medium_dark_skin_tone": "1f575-1f3fe-200d-2642-fe0f", "male-detective_dark_skin_tone": "1f575-1f3ff-200d-2642-fe0f", "male_detective_dark_skin_tone": "1f575-1f3ff-200d-2642-fe0f", "sleuth_or_spy_light_skin_tone": "1f575-1f3fb", "sleuth_or_spy_medium_light_skin_tone": "1f575-1f3fc", "sleuth_or_spy_medium_skin_tone": "1f575-1f3fd", "sleuth_or_spy_medium_dark_skin_tone": "1f575-1f3fe", "sleuth_or_spy_dark_skin_tone": "1f575-1f3ff", "man_dancing_light_skin_tone": "1f57a-1f3fb", "man_dancing_medium_light_skin_tone": "1f57a-1f3fc", "man_dancing_medium_skin_tone": "1f57a-1f3fd", "man_dancing_medium_dark_skin_tone": "1f57a-1f3fe", "man_dancing_dark_skin_tone": "1f57a-1f3ff", "raised_hand_with_fingers_splayed_light_skin_tone": "1f590-1f3fb", "raised_hand_with_fingers_splayed_medium_light_skin_tone": "1f590-1f3fc", "raised_hand_with_fingers_splayed_medium_skin_tone": "1f590-1f3fd", "raised_hand_with_fingers_splayed_medium_dark_skin_tone": "1f590-1f3fe", "raised_hand_with_fingers_splayed_dark_skin_tone": "1f590-1f3ff", "middle_finger_light_skin_tone": "1f595-1f3fb", "reversed_hand_with_middle_finger_extended_light_skin_tone": "1f595-1f3fb", "middle_finger_medium_light_skin_tone": "1f595-1f3fc", "reversed_hand_with_middle_finger_extended_medium_light_skin_tone": "1f595-1f3fc", "middle_finger_medium_skin_tone": "1f595-1f3fd", "reversed_hand_with_middle_finger_extended_medium_skin_tone": "1f595-1f3fd", "middle_finger_medium_dark_skin_tone": "1f595-1f3fe", "reversed_hand_with_middle_finger_extended_medium_dark_skin_tone": "1f595-1f3fe", "middle_finger_dark_skin_tone": "1f595-1f3ff", "reversed_hand_with_middle_finger_extended_dark_skin_tone": "1f595-1f3ff", "spock-hand_light_skin_tone": "1f596-1f3fb", "vulcan_salute_light_skin_tone": "1f596-1f3fb", "spock-hand_medium_light_skin_tone": "1f596-1f3fc", "vulcan_salute_medium_light_skin_tone": "1f596-1f3fc", "spock-hand_medium_skin_tone": "1f596-1f3fd", "vulcan_salute_medium_skin_tone": "1f596-1f3fd", "spock-hand_medium_dark_skin_tone": "1f596-1f3fe", "vulcan_salute_medium_dark_skin_tone": "1f596-1f3fe", "spock-hand_dark_skin_tone": "1f596-1f3ff", "vulcan_salute_dark_skin_tone": "1f596-1f3ff", "woman-gesturing-no_light_skin_tone": "1f645-1f3fb-200d-2640-fe0f", "no_good_woman_light_skin_tone": "1f645-1f3fb-200d-2640-fe0f", "woman-gesturing-no_medium_light_skin_tone": "1f645-1f3fc-200d-2640-fe0f", "no_good_woman_medium_light_skin_tone": "1f645-1f3fc-200d-2640-fe0f", "woman-gesturing-no_medium_skin_tone": "1f645-1f3fd-200d-2640-fe0f", "no_good_woman_medium_skin_tone": "1f645-1f3fd-200d-2640-fe0f", "woman-gesturing-no_medium_dark_skin_tone": "1f645-1f3fe-200d-2640-fe0f", "no_good_woman_medium_dark_skin_tone": "1f645-1f3fe-200d-2640-fe0f", "woman-gesturing-no_dark_skin_tone": "1f645-1f3ff-200d-2640-fe0f", "no_good_woman_dark_skin_tone": "1f645-1f3ff-200d-2640-fe0f", "man-gesturing-no_light_skin_tone": "1f645-1f3fb-200d-2642-fe0f", "no_good_man_light_skin_tone": "1f645-1f3fb-200d-2642-fe0f", "man-gesturing-no_medium_light_skin_tone": "1f645-1f3fc-200d-2642-fe0f", "no_good_man_medium_light_skin_tone": "1f645-1f3fc-200d-2642-fe0f", "man-gesturing-no_medium_skin_tone": "1f645-1f3fd-200d-2642-fe0f", "no_good_man_medium_skin_tone": "1f645-1f3fd-200d-2642-fe0f", "man-gesturing-no_medium_dark_skin_tone": "1f645-1f3fe-200d-2642-fe0f", "no_good_man_medium_dark_skin_tone": "1f645-1f3fe-200d-2642-fe0f", "man-gesturing-no_dark_skin_tone": "1f645-1f3ff-200d-2642-fe0f", "no_good_man_dark_skin_tone": "1f645-1f3ff-200d-2642-fe0f", "no_good_light_skin_tone": "1f645-1f3fb", "no_good_medium_light_skin_tone": "1f645-1f3fc", "no_good_medium_skin_tone": "1f645-1f3fd", "no_good_medium_dark_skin_tone": "1f645-1f3fe", "no_good_dark_skin_tone": "1f645-1f3ff", "woman-gesturing-ok_light_skin_tone": "1f646-1f3fb-200d-2640-fe0f", "woman-gesturing-ok_medium_light_skin_tone": "1f646-1f3fc-200d-2640-fe0f", "woman-gesturing-ok_medium_skin_tone": "1f646-1f3fd-200d-2640-fe0f", "woman-gesturing-ok_medium_dark_skin_tone": "1f646-1f3fe-200d-2640-fe0f", "woman-gesturing-ok_dark_skin_tone": "1f646-1f3ff-200d-2640-fe0f", "man-gesturing-ok_light_skin_tone": "1f646-1f3fb-200d-2642-fe0f", "ok_man_light_skin_tone": "1f646-1f3fb-200d-2642-fe0f", "man-gesturing-ok_medium_light_skin_tone": "1f646-1f3fc-200d-2642-fe0f", "ok_man_medium_light_skin_tone": "1f646-1f3fc-200d-2642-fe0f", "man-gesturing-ok_medium_skin_tone": "1f646-1f3fd-200d-2642-fe0f", "ok_man_medium_skin_tone": "1f646-1f3fd-200d-2642-fe0f", "man-gesturing-ok_medium_dark_skin_tone": "1f646-1f3fe-200d-2642-fe0f", "ok_man_medium_dark_skin_tone": "1f646-1f3fe-200d-2642-fe0f", "man-gesturing-ok_dark_skin_tone": "1f646-1f3ff-200d-2642-fe0f", "ok_man_dark_skin_tone": "1f646-1f3ff-200d-2642-fe0f", "ok_woman_light_skin_tone": "1f646-1f3fb", "ok_woman_medium_light_skin_tone": "1f646-1f3fc", "ok_woman_medium_skin_tone": "1f646-1f3fd", "ok_woman_medium_dark_skin_tone": "1f646-1f3fe", "ok_woman_dark_skin_tone": "1f646-1f3ff", "woman-bowing_light_skin_tone": "1f647-1f3fb-200d-2640-fe0f", "bowing_woman_light_skin_tone": "1f647-1f3fb-200d-2640-fe0f", "woman-bowing_medium_light_skin_tone": "1f647-1f3fc-200d-2640-fe0f", "bowing_woman_medium_light_skin_tone": "1f647-1f3fc-200d-2640-fe0f", "woman-bowing_medium_skin_tone": "1f647-1f3fd-200d-2640-fe0f", "bowing_woman_medium_skin_tone": "1f647-1f3fd-200d-2640-fe0f", "woman-bowing_medium_dark_skin_tone": "1f647-1f3fe-200d-2640-fe0f", "bowing_woman_medium_dark_skin_tone": "1f647-1f3fe-200d-2640-fe0f", "woman-bowing_dark_skin_tone": "1f647-1f3ff-200d-2640-fe0f", "bowing_woman_dark_skin_tone": "1f647-1f3ff-200d-2640-fe0f", "man-bowing_light_skin_tone": "1f647-1f3fb-200d-2642-fe0f", "bowing_man_light_skin_tone": "1f647-1f3fb-200d-2642-fe0f", "man-bowing_medium_light_skin_tone": "1f647-1f3fc-200d-2642-fe0f", "bowing_man_medium_light_skin_tone": "1f647-1f3fc-200d-2642-fe0f", "man-bowing_medium_skin_tone": "1f647-1f3fd-200d-2642-fe0f", "bowing_man_medium_skin_tone": "1f647-1f3fd-200d-2642-fe0f", "man-bowing_medium_dark_skin_tone": "1f647-1f3fe-200d-2642-fe0f", "bowing_man_medium_dark_skin_tone": "1f647-1f3fe-200d-2642-fe0f", "man-bowing_dark_skin_tone": "1f647-1f3ff-200d-2642-fe0f", "bowing_man_dark_skin_tone": "1f647-1f3ff-200d-2642-fe0f", "bow_light_skin_tone": "1f647-1f3fb", "bow_medium_light_skin_tone": "1f647-1f3fc", "bow_medium_skin_tone": "1f647-1f3fd", "bow_medium_dark_skin_tone": "1f647-1f3fe", "bow_dark_skin_tone": "1f647-1f3ff", "woman-raising-hand_light_skin_tone": "1f64b-1f3fb-200d-2640-fe0f", "raising_hand_woman_light_skin_tone": "1f64b-1f3fb-200d-2640-fe0f", "woman-raising-hand_medium_light_skin_tone": "1f64b-1f3fc-200d-2640-fe0f", "raising_hand_woman_medium_light_skin_tone": "1f64b-1f3fc-200d-2640-fe0f", "woman-raising-hand_medium_skin_tone": "1f64b-1f3fd-200d-2640-fe0f", "raising_hand_woman_medium_skin_tone": "1f64b-1f3fd-200d-2640-fe0f", "woman-raising-hand_medium_dark_skin_tone": "1f64b-1f3fe-200d-2640-fe0f", "raising_hand_woman_medium_dark_skin_tone": "1f64b-1f3fe-200d-2640-fe0f", "woman-raising-hand_dark_skin_tone": "1f64b-1f3ff-200d-2640-fe0f", "raising_hand_woman_dark_skin_tone": "1f64b-1f3ff-200d-2640-fe0f", "man-raising-hand_light_skin_tone": "1f64b-1f3fb-200d-2642-fe0f", "raising_hand_man_light_skin_tone": "1f64b-1f3fb-200d-2642-fe0f", "man-raising-hand_medium_light_skin_tone": "1f64b-1f3fc-200d-2642-fe0f", "raising_hand_man_medium_light_skin_tone": "1f64b-1f3fc-200d-2642-fe0f", "man-raising-hand_medium_skin_tone": "1f64b-1f3fd-200d-2642-fe0f", "raising_hand_man_medium_skin_tone": "1f64b-1f3fd-200d-2642-fe0f", "man-raising-hand_medium_dark_skin_tone": "1f64b-1f3fe-200d-2642-fe0f", "raising_hand_man_medium_dark_skin_tone": "1f64b-1f3fe-200d-2642-fe0f", "man-raising-hand_dark_skin_tone": "1f64b-1f3ff-200d-2642-fe0f", "raising_hand_man_dark_skin_tone": "1f64b-1f3ff-200d-2642-fe0f", "raising_hand_light_skin_tone": "1f64b-1f3fb", "raising_hand_medium_light_skin_tone": "1f64b-1f3fc", "raising_hand_medium_skin_tone": "1f64b-1f3fd", "raising_hand_medium_dark_skin_tone": "1f64b-1f3fe", "raising_hand_dark_skin_tone": "1f64b-1f3ff", "raised_hands_light_skin_tone": "1f64c-1f3fb", "raised_hands_medium_light_skin_tone": "1f64c-1f3fc", "raised_hands_medium_skin_tone": "1f64c-1f3fd", "raised_hands_medium_dark_skin_tone": "1f64c-1f3fe", "raised_hands_dark_skin_tone": "1f64c-1f3ff", "woman-frowning_light_skin_tone": "1f64d-1f3fb-200d-2640-fe0f", "frowning_woman_light_skin_tone": "1f64d-1f3fb-200d-2640-fe0f", "woman-frowning_medium_light_skin_tone": "1f64d-1f3fc-200d-2640-fe0f", "frowning_woman_medium_light_skin_tone": "1f64d-1f3fc-200d-2640-fe0f", "woman-frowning_medium_skin_tone": "1f64d-1f3fd-200d-2640-fe0f", "frowning_woman_medium_skin_tone": "1f64d-1f3fd-200d-2640-fe0f", "woman-frowning_medium_dark_skin_tone": "1f64d-1f3fe-200d-2640-fe0f", "frowning_woman_medium_dark_skin_tone": "1f64d-1f3fe-200d-2640-fe0f", "woman-frowning_dark_skin_tone": "1f64d-1f3ff-200d-2640-fe0f", "frowning_woman_dark_skin_tone": "1f64d-1f3ff-200d-2640-fe0f", "man-frowning_light_skin_tone": "1f64d-1f3fb-200d-2642-fe0f", "frowning_man_light_skin_tone": "1f64d-1f3fb-200d-2642-fe0f", "man-frowning_medium_light_skin_tone": "1f64d-1f3fc-200d-2642-fe0f", "frowning_man_medium_light_skin_tone": "1f64d-1f3fc-200d-2642-fe0f", "man-frowning_medium_skin_tone": "1f64d-1f3fd-200d-2642-fe0f", "frowning_man_medium_skin_tone": "1f64d-1f3fd-200d-2642-fe0f", "man-frowning_medium_dark_skin_tone": "1f64d-1f3fe-200d-2642-fe0f", "frowning_man_medium_dark_skin_tone": "1f64d-1f3fe-200d-2642-fe0f", "man-frowning_dark_skin_tone": "1f64d-1f3ff-200d-2642-fe0f", "frowning_man_dark_skin_tone": "1f64d-1f3ff-200d-2642-fe0f", "person_frowning_light_skin_tone": "1f64d-1f3fb", "person_frowning_medium_light_skin_tone": "1f64d-1f3fc", "person_frowning_medium_skin_tone": "1f64d-1f3fd", "person_frowning_medium_dark_skin_tone": "1f64d-1f3fe", "person_frowning_dark_skin_tone": "1f64d-1f3ff", "woman-pouting_light_skin_tone": "1f64e-1f3fb-200d-2640-fe0f", "pouting_woman_light_skin_tone": "1f64e-1f3fb-200d-2640-fe0f", "woman-pouting_medium_light_skin_tone": "1f64e-1f3fc-200d-2640-fe0f", "pouting_woman_medium_light_skin_tone": "1f64e-1f3fc-200d-2640-fe0f", "woman-pouting_medium_skin_tone": "1f64e-1f3fd-200d-2640-fe0f", "pouting_woman_medium_skin_tone": "1f64e-1f3fd-200d-2640-fe0f", "woman-pouting_medium_dark_skin_tone": "1f64e-1f3fe-200d-2640-fe0f", "pouting_woman_medium_dark_skin_tone": "1f64e-1f3fe-200d-2640-fe0f", "woman-pouting_dark_skin_tone": "1f64e-1f3ff-200d-2640-fe0f", "pouting_woman_dark_skin_tone": "1f64e-1f3ff-200d-2640-fe0f", "man-pouting_light_skin_tone": "1f64e-1f3fb-200d-2642-fe0f", "pouting_man_light_skin_tone": "1f64e-1f3fb-200d-2642-fe0f", "man-pouting_medium_light_skin_tone": "1f64e-1f3fc-200d-2642-fe0f", "pouting_man_medium_light_skin_tone": "1f64e-1f3fc-200d-2642-fe0f", "man-pouting_medium_skin_tone": "1f64e-1f3fd-200d-2642-fe0f", "pouting_man_medium_skin_tone": "1f64e-1f3fd-200d-2642-fe0f", "man-pouting_medium_dark_skin_tone": "1f64e-1f3fe-200d-2642-fe0f", "pouting_man_medium_dark_skin_tone": "1f64e-1f3fe-200d-2642-fe0f", "man-pouting_dark_skin_tone": "1f64e-1f3ff-200d-2642-fe0f", "pouting_man_dark_skin_tone": "1f64e-1f3ff-200d-2642-fe0f", "person_with_pouting_face_light_skin_tone": "1f64e-1f3fb", "person_with_pouting_face_medium_light_skin_tone": "1f64e-1f3fc", "person_with_pouting_face_medium_skin_tone": "1f64e-1f3fd", "person_with_pouting_face_medium_dark_skin_tone": "1f64e-1f3fe", "person_with_pouting_face_dark_skin_tone": "1f64e-1f3ff", "pray_light_skin_tone": "1f64f-1f3fb", "pray_medium_light_skin_tone": "1f64f-1f3fc", "pray_medium_skin_tone": "1f64f-1f3fd", "pray_medium_dark_skin_tone": "1f64f-1f3fe", "pray_dark_skin_tone": "1f64f-1f3ff", "woman-rowing-boat_light_skin_tone": "1f6a3-1f3fb-200d-2640-fe0f", "rowing_woman_light_skin_tone": "1f6a3-1f3fb-200d-2640-fe0f", "woman-rowing-boat_medium_light_skin_tone": "1f6a3-1f3fc-200d-2640-fe0f", "rowing_woman_medium_light_skin_tone": "1f6a3-1f3fc-200d-2640-fe0f", "woman-rowing-boat_medium_skin_tone": "1f6a3-1f3fd-200d-2640-fe0f", "rowing_woman_medium_skin_tone": "1f6a3-1f3fd-200d-2640-fe0f", "woman-rowing-boat_medium_dark_skin_tone": "1f6a3-1f3fe-200d-2640-fe0f", "rowing_woman_medium_dark_skin_tone": "1f6a3-1f3fe-200d-2640-fe0f", "woman-rowing-boat_dark_skin_tone": "1f6a3-1f3ff-200d-2640-fe0f", "rowing_woman_dark_skin_tone": "1f6a3-1f3ff-200d-2640-fe0f", "man-rowing-boat_light_skin_tone": "1f6a3-1f3fb-200d-2642-fe0f", "rowing_man_light_skin_tone": "1f6a3-1f3fb-200d-2642-fe0f", "man-rowing-boat_medium_light_skin_tone": "1f6a3-1f3fc-200d-2642-fe0f", "rowing_man_medium_light_skin_tone": "1f6a3-1f3fc-200d-2642-fe0f", "man-rowing-boat_medium_skin_tone": "1f6a3-1f3fd-200d-2642-fe0f", "rowing_man_medium_skin_tone": "1f6a3-1f3fd-200d-2642-fe0f", "man-rowing-boat_medium_dark_skin_tone": "1f6a3-1f3fe-200d-2642-fe0f", "rowing_man_medium_dark_skin_tone": "1f6a3-1f3fe-200d-2642-fe0f", "man-rowing-boat_dark_skin_tone": "1f6a3-1f3ff-200d-2642-fe0f", "rowing_man_dark_skin_tone": "1f6a3-1f3ff-200d-2642-fe0f", "rowboat_light_skin_tone": "1f6a3-1f3fb", "rowboat_medium_light_skin_tone": "1f6a3-1f3fc", "rowboat_medium_skin_tone": "1f6a3-1f3fd", "rowboat_medium_dark_skin_tone": "1f6a3-1f3fe", "rowboat_dark_skin_tone": "1f6a3-1f3ff", "woman-biking_light_skin_tone": "1f6b4-1f3fb-200d-2640-fe0f", "biking_woman_light_skin_tone": "1f6b4-1f3fb-200d-2640-fe0f", "woman-biking_medium_light_skin_tone": "1f6b4-1f3fc-200d-2640-fe0f", "biking_woman_medium_light_skin_tone": "1f6b4-1f3fc-200d-2640-fe0f", "woman-biking_medium_skin_tone": "1f6b4-1f3fd-200d-2640-fe0f", "biking_woman_medium_skin_tone": "1f6b4-1f3fd-200d-2640-fe0f", "woman-biking_medium_dark_skin_tone": "1f6b4-1f3fe-200d-2640-fe0f", "biking_woman_medium_dark_skin_tone": "1f6b4-1f3fe-200d-2640-fe0f", "woman-biking_dark_skin_tone": "1f6b4-1f3ff-200d-2640-fe0f", "biking_woman_dark_skin_tone": "1f6b4-1f3ff-200d-2640-fe0f", "man-biking_light_skin_tone": "1f6b4-1f3fb-200d-2642-fe0f", "biking_man_light_skin_tone": "1f6b4-1f3fb-200d-2642-fe0f", "man-biking_medium_light_skin_tone": "1f6b4-1f3fc-200d-2642-fe0f", "biking_man_medium_light_skin_tone": "1f6b4-1f3fc-200d-2642-fe0f", "man-biking_medium_skin_tone": "1f6b4-1f3fd-200d-2642-fe0f", "biking_man_medium_skin_tone": "1f6b4-1f3fd-200d-2642-fe0f", "man-biking_medium_dark_skin_tone": "1f6b4-1f3fe-200d-2642-fe0f", "biking_man_medium_dark_skin_tone": "1f6b4-1f3fe-200d-2642-fe0f", "man-biking_dark_skin_tone": "1f6b4-1f3ff-200d-2642-fe0f", "biking_man_dark_skin_tone": "1f6b4-1f3ff-200d-2642-fe0f", "bicyclist_light_skin_tone": "1f6b4-1f3fb", "bicyclist_medium_light_skin_tone": "1f6b4-1f3fc", "bicyclist_medium_skin_tone": "1f6b4-1f3fd", "bicyclist_medium_dark_skin_tone": "1f6b4-1f3fe", "bicyclist_dark_skin_tone": "1f6b4-1f3ff", "woman-mountain-biking_light_skin_tone": "1f6b5-1f3fb-200d-2640-fe0f", "mountain_biking_woman_light_skin_tone": "1f6b5-1f3fb-200d-2640-fe0f", "woman-mountain-biking_medium_light_skin_tone": "1f6b5-1f3fc-200d-2640-fe0f", "mountain_biking_woman_medium_light_skin_tone": "1f6b5-1f3fc-200d-2640-fe0f", "woman-mountain-biking_medium_skin_tone": "1f6b5-1f3fd-200d-2640-fe0f", "mountain_biking_woman_medium_skin_tone": "1f6b5-1f3fd-200d-2640-fe0f", "woman-mountain-biking_medium_dark_skin_tone": "1f6b5-1f3fe-200d-2640-fe0f", "mountain_biking_woman_medium_dark_skin_tone": "1f6b5-1f3fe-200d-2640-fe0f", "woman-mountain-biking_dark_skin_tone": "1f6b5-1f3ff-200d-2640-fe0f", "mountain_biking_woman_dark_skin_tone": "1f6b5-1f3ff-200d-2640-fe0f", "man-mountain-biking_light_skin_tone": "1f6b5-1f3fb-200d-2642-fe0f", "mountain_biking_man_light_skin_tone": "1f6b5-1f3fb-200d-2642-fe0f", "man-mountain-biking_medium_light_skin_tone": "1f6b5-1f3fc-200d-2642-fe0f", "mountain_biking_man_medium_light_skin_tone": "1f6b5-1f3fc-200d-2642-fe0f", "man-mountain-biking_medium_skin_tone": "1f6b5-1f3fd-200d-2642-fe0f", "mountain_biking_man_medium_skin_tone": "1f6b5-1f3fd-200d-2642-fe0f", "man-mountain-biking_medium_dark_skin_tone": "1f6b5-1f3fe-200d-2642-fe0f", "mountain_biking_man_medium_dark_skin_tone": "1f6b5-1f3fe-200d-2642-fe0f", "man-mountain-biking_dark_skin_tone": "1f6b5-1f3ff-200d-2642-fe0f", "mountain_biking_man_dark_skin_tone": "1f6b5-1f3ff-200d-2642-fe0f", "mountain_bicyclist_light_skin_tone": "1f6b5-1f3fb", "mountain_bicyclist_medium_light_skin_tone": "1f6b5-1f3fc", "mountain_bicyclist_medium_skin_tone": "1f6b5-1f3fd", "mountain_bicyclist_medium_dark_skin_tone": "1f6b5-1f3fe", "mountain_bicyclist_dark_skin_tone": "1f6b5-1f3ff", "woman-walking_light_skin_tone": "1f6b6-1f3fb-200d-2640-fe0f", "walking_woman_light_skin_tone": "1f6b6-1f3fb-200d-2640-fe0f", "woman-walking_medium_light_skin_tone": "1f6b6-1f3fc-200d-2640-fe0f", "walking_woman_medium_light_skin_tone": "1f6b6-1f3fc-200d-2640-fe0f", "woman-walking_medium_skin_tone": "1f6b6-1f3fd-200d-2640-fe0f", "walking_woman_medium_skin_tone": "1f6b6-1f3fd-200d-2640-fe0f", "woman-walking_medium_dark_skin_tone": "1f6b6-1f3fe-200d-2640-fe0f", "walking_woman_medium_dark_skin_tone": "1f6b6-1f3fe-200d-2640-fe0f", "woman-walking_dark_skin_tone": "1f6b6-1f3ff-200d-2640-fe0f", "walking_woman_dark_skin_tone": "1f6b6-1f3ff-200d-2640-fe0f", "man-walking_light_skin_tone": "1f6b6-1f3fb-200d-2642-fe0f", "walking_man_light_skin_tone": "1f6b6-1f3fb-200d-2642-fe0f", "man-walking_medium_light_skin_tone": "1f6b6-1f3fc-200d-2642-fe0f", "walking_man_medium_light_skin_tone": "1f6b6-1f3fc-200d-2642-fe0f", "man-walking_medium_skin_tone": "1f6b6-1f3fd-200d-2642-fe0f", "walking_man_medium_skin_tone": "1f6b6-1f3fd-200d-2642-fe0f", "man-walking_medium_dark_skin_tone": "1f6b6-1f3fe-200d-2642-fe0f", "walking_man_medium_dark_skin_tone": "1f6b6-1f3fe-200d-2642-fe0f", "man-walking_dark_skin_tone": "1f6b6-1f3ff-200d-2642-fe0f", "walking_man_dark_skin_tone": "1f6b6-1f3ff-200d-2642-fe0f", "walking_light_skin_tone": "1f6b6-1f3fb", "walking_medium_light_skin_tone": "1f6b6-1f3fc", "walking_medium_skin_tone": "1f6b6-1f3fd", "walking_medium_dark_skin_tone": "1f6b6-1f3fe", "walking_dark_skin_tone": "1f6b6-1f3ff", "bath_light_skin_tone": "1f6c0-1f3fb", "bath_medium_light_skin_tone": "1f6c0-1f3fc", "bath_medium_skin_tone": "1f6c0-1f3fd", "bath_medium_dark_skin_tone": "1f6c0-1f3fe", "bath_dark_skin_tone": "1f6c0-1f3ff", "sleeping_accommodation_light_skin_tone": "1f6cc-1f3fb", "sleeping_accommodation_medium_light_skin_tone": "1f6cc-1f3fc", "sleeping_accommodation_medium_skin_tone": "1f6cc-1f3fd", "sleeping_accommodation_medium_dark_skin_tone": "1f6cc-1f3fe", "sleeping_accommodation_dark_skin_tone": "1f6cc-1f3ff", "pinched_fingers_light_skin_tone": "1f90c-1f3fb", "pinched_fingers_medium_light_skin_tone": "1f90c-1f3fc", "pinched_fingers_medium_skin_tone": "1f90c-1f3fd", "pinched_fingers_medium_dark_skin_tone": "1f90c-1f3fe", "pinched_fingers_dark_skin_tone": "1f90c-1f3ff", "pinching_hand_light_skin_tone": "1f90f-1f3fb", "pinching_hand_medium_light_skin_tone": "1f90f-1f3fc", "pinching_hand_medium_skin_tone": "1f90f-1f3fd", "pinching_hand_medium_dark_skin_tone": "1f90f-1f3fe", "pinching_hand_dark_skin_tone": "1f90f-1f3ff", "the_horns_light_skin_tone": "1f918-1f3fb", "sign_of_the_horns_light_skin_tone": "1f918-1f3fb", "metal_light_skin_tone": "1f918-1f3fb", "the_horns_medium_light_skin_tone": "1f918-1f3fc", "sign_of_the_horns_medium_light_skin_tone": "1f918-1f3fc", "metal_medium_light_skin_tone": "1f918-1f3fc", "the_horns_medium_skin_tone": "1f918-1f3fd", "sign_of_the_horns_medium_skin_tone": "1f918-1f3fd", "metal_medium_skin_tone": "1f918-1f3fd", "the_horns_medium_dark_skin_tone": "1f918-1f3fe", "sign_of_the_horns_medium_dark_skin_tone": "1f918-1f3fe", "metal_medium_dark_skin_tone": "1f918-1f3fe", "the_horns_dark_skin_tone": "1f918-1f3ff", "sign_of_the_horns_dark_skin_tone": "1f918-1f3ff", "metal_dark_skin_tone": "1f918-1f3ff", "call_me_hand_light_skin_tone": "1f919-1f3fb", "call_me_hand_medium_light_skin_tone": "1f919-1f3fc", "call_me_hand_medium_skin_tone": "1f919-1f3fd", "call_me_hand_medium_dark_skin_tone": "1f919-1f3fe", "call_me_hand_dark_skin_tone": "1f919-1f3ff", "raised_back_of_hand_light_skin_tone": "1f91a-1f3fb", "raised_back_of_hand_medium_light_skin_tone": "1f91a-1f3fc", "raised_back_of_hand_medium_skin_tone": "1f91a-1f3fd", "raised_back_of_hand_medium_dark_skin_tone": "1f91a-1f3fe", "raised_back_of_hand_dark_skin_tone": "1f91a-1f3ff", "left-facing_fist_light_skin_tone": "1f91b-1f3fb", "fist_left_light_skin_tone": "1f91b-1f3fb", "left-facing_fist_medium_light_skin_tone": "1f91b-1f3fc", "fist_left_medium_light_skin_tone": "1f91b-1f3fc", "left-facing_fist_medium_skin_tone": "1f91b-1f3fd", "fist_left_medium_skin_tone": "1f91b-1f3fd", "left-facing_fist_medium_dark_skin_tone": "1f91b-1f3fe", "fist_left_medium_dark_skin_tone": "1f91b-1f3fe", "left-facing_fist_dark_skin_tone": "1f91b-1f3ff", "fist_left_dark_skin_tone": "1f91b-1f3ff", "right-facing_fist_light_skin_tone": "1f91c-1f3fb", "fist_right_light_skin_tone": "1f91c-1f3fb", "right-facing_fist_medium_light_skin_tone": "1f91c-1f3fc", "fist_right_medium_light_skin_tone": "1f91c-1f3fc", "right-facing_fist_medium_skin_tone": "1f91c-1f3fd", "fist_right_medium_skin_tone": "1f91c-1f3fd", "right-facing_fist_medium_dark_skin_tone": "1f91c-1f3fe", "fist_right_medium_dark_skin_tone": "1f91c-1f3fe", "right-facing_fist_dark_skin_tone": "1f91c-1f3ff", "fist_right_dark_skin_tone": "1f91c-1f3ff", "crossed_fingers_light_skin_tone": "1f91e-1f3fb", "hand_with_index_and_middle_fingers_crossed_light_skin_tone": "1f91e-1f3fb", "crossed_fingers_medium_light_skin_tone": "1f91e-1f3fc", "hand_with_index_and_middle_fingers_crossed_medium_light_skin_tone": "1f91e-1f3fc", "crossed_fingers_medium_skin_tone": "1f91e-1f3fd", "hand_with_index_and_middle_fingers_crossed_medium_skin_tone": "1f91e-1f3fd", "crossed_fingers_medium_dark_skin_tone": "1f91e-1f3fe", "hand_with_index_and_middle_fingers_crossed_medium_dark_skin_tone": "1f91e-1f3fe", "crossed_fingers_dark_skin_tone": "1f91e-1f3ff", "hand_with_index_and_middle_fingers_crossed_dark_skin_tone": "1f91e-1f3ff", "i_love_you_hand_sign_light_skin_tone": "1f91f-1f3fb", "i_love_you_hand_sign_medium_light_skin_tone": "1f91f-1f3fc", "i_love_you_hand_sign_medium_skin_tone": "1f91f-1f3fd", "i_love_you_hand_sign_medium_dark_skin_tone": "1f91f-1f3fe", "i_love_you_hand_sign_dark_skin_tone": "1f91f-1f3ff", "woman-facepalming_light_skin_tone": "1f926-1f3fb-200d-2640-fe0f", "woman_facepalming_light_skin_tone": "1f926-1f3fb-200d-2640-fe0f", "woman-facepalming_medium_light_skin_tone": "1f926-1f3fc-200d-2640-fe0f", "woman_facepalming_medium_light_skin_tone": "1f926-1f3fc-200d-2640-fe0f", "woman-facepalming_medium_skin_tone": "1f926-1f3fd-200d-2640-fe0f", "woman_facepalming_medium_skin_tone": "1f926-1f3fd-200d-2640-fe0f", "woman-facepalming_medium_dark_skin_tone": "1f926-1f3fe-200d-2640-fe0f", "woman_facepalming_medium_dark_skin_tone": "1f926-1f3fe-200d-2640-fe0f", "woman-facepalming_dark_skin_tone": "1f926-1f3ff-200d-2640-fe0f", "woman_facepalming_dark_skin_tone": "1f926-1f3ff-200d-2640-fe0f", "man-facepalming_light_skin_tone": "1f926-1f3fb-200d-2642-fe0f", "man_facepalming_light_skin_tone": "1f926-1f3fb-200d-2642-fe0f", "man-facepalming_medium_light_skin_tone": "1f926-1f3fc-200d-2642-fe0f", "man_facepalming_medium_light_skin_tone": "1f926-1f3fc-200d-2642-fe0f", "man-facepalming_medium_skin_tone": "1f926-1f3fd-200d-2642-fe0f", "man_facepalming_medium_skin_tone": "1f926-1f3fd-200d-2642-fe0f", "man-facepalming_medium_dark_skin_tone": "1f926-1f3fe-200d-2642-fe0f", "man_facepalming_medium_dark_skin_tone": "1f926-1f3fe-200d-2642-fe0f", "man-facepalming_dark_skin_tone": "1f926-1f3ff-200d-2642-fe0f", "man_facepalming_dark_skin_tone": "1f926-1f3ff-200d-2642-fe0f", "face_palm_light_skin_tone": "1f926-1f3fb", "face_palm_medium_light_skin_tone": "1f926-1f3fc", "face_palm_medium_skin_tone": "1f926-1f3fd", "face_palm_medium_dark_skin_tone": "1f926-1f3fe", "face_palm_dark_skin_tone": "1f926-1f3ff", "pregnant_woman_light_skin_tone": "1f930-1f3fb", "pregnant_woman_medium_light_skin_tone": "1f930-1f3fc", "pregnant_woman_medium_skin_tone": "1f930-1f3fd", "pregnant_woman_medium_dark_skin_tone": "1f930-1f3fe", "pregnant_woman_dark_skin_tone": "1f930-1f3ff", "breast-feeding_light_skin_tone": "1f931-1f3fb", "breast-feeding_medium_light_skin_tone": "1f931-1f3fc", "breast-feeding_medium_skin_tone": "1f931-1f3fd", "breast-feeding_medium_dark_skin_tone": "1f931-1f3fe", "breast-feeding_dark_skin_tone": "1f931-1f3ff", "palms_up_together_light_skin_tone": "1f932-1f3fb", "palms_up_together_medium_light_skin_tone": "1f932-1f3fc", "palms_up_together_medium_skin_tone": "1f932-1f3fd", "palms_up_together_medium_dark_skin_tone": "1f932-1f3fe", "palms_up_together_dark_skin_tone": "1f932-1f3ff", "selfie_light_skin_tone": "1f933-1f3fb", "selfie_medium_light_skin_tone": "1f933-1f3fc", "selfie_medium_skin_tone": "1f933-1f3fd", "selfie_medium_dark_skin_tone": "1f933-1f3fe", "selfie_dark_skin_tone": "1f933-1f3ff", "prince_light_skin_tone": "1f934-1f3fb", "prince_medium_light_skin_tone": "1f934-1f3fc", "prince_medium_skin_tone": "1f934-1f3fd", "prince_medium_dark_skin_tone": "1f934-1f3fe", "prince_dark_skin_tone": "1f934-1f3ff", "woman_in_tuxedo_light_skin_tone": "1f935-1f3fb-200d-2640-fe0f", "woman_in_tuxedo_medium_light_skin_tone": "1f935-1f3fc-200d-2640-fe0f", "woman_in_tuxedo_medium_skin_tone": "1f935-1f3fd-200d-2640-fe0f", "woman_in_tuxedo_medium_dark_skin_tone": "1f935-1f3fe-200d-2640-fe0f", "woman_in_tuxedo_dark_skin_tone": "1f935-1f3ff-200d-2640-fe0f", "man_in_tuxedo_light_skin_tone": "1f935-1f3fb-200d-2642-fe0f", "man_in_tuxedo_medium_light_skin_tone": "1f935-1f3fc-200d-2642-fe0f", "man_in_tuxedo_medium_skin_tone": "1f935-1f3fd-200d-2642-fe0f", "man_in_tuxedo_medium_dark_skin_tone": "1f935-1f3fe-200d-2642-fe0f", "man_in_tuxedo_dark_skin_tone": "1f935-1f3ff-200d-2642-fe0f", "person_in_tuxedo_light_skin_tone": "1f935-1f3fb", "person_in_tuxedo_medium_light_skin_tone": "1f935-1f3fc", "person_in_tuxedo_medium_skin_tone": "1f935-1f3fd", "person_in_tuxedo_medium_dark_skin_tone": "1f935-1f3fe", "person_in_tuxedo_dark_skin_tone": "1f935-1f3ff", "mrs_claus_light_skin_tone": "1f936-1f3fb", "mother_christmas_light_skin_tone": "1f936-1f3fb", "mrs_claus_medium_light_skin_tone": "1f936-1f3fc", "mother_christmas_medium_light_skin_tone": "1f936-1f3fc", "mrs_claus_medium_skin_tone": "1f936-1f3fd", "mother_christmas_medium_skin_tone": "1f936-1f3fd", "mrs_claus_medium_dark_skin_tone": "1f936-1f3fe", "mother_christmas_medium_dark_skin_tone": "1f936-1f3fe", "mrs_claus_dark_skin_tone": "1f936-1f3ff", "mother_christmas_dark_skin_tone": "1f936-1f3ff", "woman-shrugging_light_skin_tone": "1f937-1f3fb-200d-2640-fe0f", "woman_shrugging_light_skin_tone": "1f937-1f3fb-200d-2640-fe0f", "woman-shrugging_medium_light_skin_tone": "1f937-1f3fc-200d-2640-fe0f", "woman_shrugging_medium_light_skin_tone": "1f937-1f3fc-200d-2640-fe0f", "woman-shrugging_medium_skin_tone": "1f937-1f3fd-200d-2640-fe0f", "woman_shrugging_medium_skin_tone": "1f937-1f3fd-200d-2640-fe0f", "woman-shrugging_medium_dark_skin_tone": "1f937-1f3fe-200d-2640-fe0f", "woman_shrugging_medium_dark_skin_tone": "1f937-1f3fe-200d-2640-fe0f", "woman-shrugging_dark_skin_tone": "1f937-1f3ff-200d-2640-fe0f", "woman_shrugging_dark_skin_tone": "1f937-1f3ff-200d-2640-fe0f", "man-shrugging_light_skin_tone": "1f937-1f3fb-200d-2642-fe0f", "man_shrugging_light_skin_tone": "1f937-1f3fb-200d-2642-fe0f", "man-shrugging_medium_light_skin_tone": "1f937-1f3fc-200d-2642-fe0f", "man_shrugging_medium_light_skin_tone": "1f937-1f3fc-200d-2642-fe0f", "man-shrugging_medium_skin_tone": "1f937-1f3fd-200d-2642-fe0f", "man_shrugging_medium_skin_tone": "1f937-1f3fd-200d-2642-fe0f", "man-shrugging_medium_dark_skin_tone": "1f937-1f3fe-200d-2642-fe0f", "man_shrugging_medium_dark_skin_tone": "1f937-1f3fe-200d-2642-fe0f", "man-shrugging_dark_skin_tone": "1f937-1f3ff-200d-2642-fe0f", "man_shrugging_dark_skin_tone": "1f937-1f3ff-200d-2642-fe0f", "shrug_light_skin_tone": "1f937-1f3fb", "shrug_medium_light_skin_tone": "1f937-1f3fc", "shrug_medium_skin_tone": "1f937-1f3fd", "shrug_medium_dark_skin_tone": "1f937-1f3fe", "shrug_dark_skin_tone": "1f937-1f3ff", "woman-cartwheeling_light_skin_tone": "1f938-1f3fb-200d-2640-fe0f", "woman_cartwheeling_light_skin_tone": "1f938-1f3fb-200d-2640-fe0f", "woman-cartwheeling_medium_light_skin_tone": "1f938-1f3fc-200d-2640-fe0f", "woman_cartwheeling_medium_light_skin_tone": "1f938-1f3fc-200d-2640-fe0f", "woman-cartwheeling_medium_skin_tone": "1f938-1f3fd-200d-2640-fe0f", "woman_cartwheeling_medium_skin_tone": "1f938-1f3fd-200d-2640-fe0f", "woman-cartwheeling_medium_dark_skin_tone": "1f938-1f3fe-200d-2640-fe0f", "woman_cartwheeling_medium_dark_skin_tone": "1f938-1f3fe-200d-2640-fe0f", "woman-cartwheeling_dark_skin_tone": "1f938-1f3ff-200d-2640-fe0f", "woman_cartwheeling_dark_skin_tone": "1f938-1f3ff-200d-2640-fe0f", "man-cartwheeling_light_skin_tone": "1f938-1f3fb-200d-2642-fe0f", "man_cartwheeling_light_skin_tone": "1f938-1f3fb-200d-2642-fe0f", "man-cartwheeling_medium_light_skin_tone": "1f938-1f3fc-200d-2642-fe0f", "man_cartwheeling_medium_light_skin_tone": "1f938-1f3fc-200d-2642-fe0f", "man-cartwheeling_medium_skin_tone": "1f938-1f3fd-200d-2642-fe0f", "man_cartwheeling_medium_skin_tone": "1f938-1f3fd-200d-2642-fe0f", "man-cartwheeling_medium_dark_skin_tone": "1f938-1f3fe-200d-2642-fe0f", "man_cartwheeling_medium_dark_skin_tone": "1f938-1f3fe-200d-2642-fe0f", "man-cartwheeling_dark_skin_tone": "1f938-1f3ff-200d-2642-fe0f", "man_cartwheeling_dark_skin_tone": "1f938-1f3ff-200d-2642-fe0f", "person_doing_cartwheel_light_skin_tone": "1f938-1f3fb", "person_doing_cartwheel_medium_light_skin_tone": "1f938-1f3fc", "person_doing_cartwheel_medium_skin_tone": "1f938-1f3fd", "person_doing_cartwheel_medium_dark_skin_tone": "1f938-1f3fe", "person_doing_cartwheel_dark_skin_tone": "1f938-1f3ff", "woman-juggling_light_skin_tone": "1f939-1f3fb-200d-2640-fe0f", "woman_juggling_light_skin_tone": "1f939-1f3fb-200d-2640-fe0f", "woman-juggling_medium_light_skin_tone": "1f939-1f3fc-200d-2640-fe0f", "woman_juggling_medium_light_skin_tone": "1f939-1f3fc-200d-2640-fe0f", "woman-juggling_medium_skin_tone": "1f939-1f3fd-200d-2640-fe0f", "woman_juggling_medium_skin_tone": "1f939-1f3fd-200d-2640-fe0f", "woman-juggling_medium_dark_skin_tone": "1f939-1f3fe-200d-2640-fe0f", "woman_juggling_medium_dark_skin_tone": "1f939-1f3fe-200d-2640-fe0f", "woman-juggling_dark_skin_tone": "1f939-1f3ff-200d-2640-fe0f", "woman_juggling_dark_skin_tone": "1f939-1f3ff-200d-2640-fe0f", "man-juggling_light_skin_tone": "1f939-1f3fb-200d-2642-fe0f", "man_juggling_light_skin_tone": "1f939-1f3fb-200d-2642-fe0f", "man-juggling_medium_light_skin_tone": "1f939-1f3fc-200d-2642-fe0f", "man_juggling_medium_light_skin_tone": "1f939-1f3fc-200d-2642-fe0f", "man-juggling_medium_skin_tone": "1f939-1f3fd-200d-2642-fe0f", "man_juggling_medium_skin_tone": "1f939-1f3fd-200d-2642-fe0f", "man-juggling_medium_dark_skin_tone": "1f939-1f3fe-200d-2642-fe0f", "man_juggling_medium_dark_skin_tone": "1f939-1f3fe-200d-2642-fe0f", "man-juggling_dark_skin_tone": "1f939-1f3ff-200d-2642-fe0f", "man_juggling_dark_skin_tone": "1f939-1f3ff-200d-2642-fe0f", "juggling_light_skin_tone": "1f939-1f3fb", "juggling_medium_light_skin_tone": "1f939-1f3fc", "juggling_medium_skin_tone": "1f939-1f3fd", "juggling_medium_dark_skin_tone": "1f939-1f3fe", "juggling_dark_skin_tone": "1f939-1f3ff", "woman-playing-water-polo_light_skin_tone": "1f93d-1f3fb-200d-2640-fe0f", "woman_playing_water_polo_light_skin_tone": "1f93d-1f3fb-200d-2640-fe0f", "woman-playing-water-polo_medium_light_skin_tone": "1f93d-1f3fc-200d-2640-fe0f", "woman_playing_water_polo_medium_light_skin_tone": "1f93d-1f3fc-200d-2640-fe0f", "woman-playing-water-polo_medium_skin_tone": "1f93d-1f3fd-200d-2640-fe0f", "woman_playing_water_polo_medium_skin_tone": "1f93d-1f3fd-200d-2640-fe0f", "woman-playing-water-polo_medium_dark_skin_tone": "1f93d-1f3fe-200d-2640-fe0f", "woman_playing_water_polo_medium_dark_skin_tone": "1f93d-1f3fe-200d-2640-fe0f", "woman-playing-water-polo_dark_skin_tone": "1f93d-1f3ff-200d-2640-fe0f", "woman_playing_water_polo_dark_skin_tone": "1f93d-1f3ff-200d-2640-fe0f", "man-playing-water-polo_light_skin_tone": "1f93d-1f3fb-200d-2642-fe0f", "man_playing_water_polo_light_skin_tone": "1f93d-1f3fb-200d-2642-fe0f", "man-playing-water-polo_medium_light_skin_tone": "1f93d-1f3fc-200d-2642-fe0f", "man_playing_water_polo_medium_light_skin_tone": "1f93d-1f3fc-200d-2642-fe0f", "man-playing-water-polo_medium_skin_tone": "1f93d-1f3fd-200d-2642-fe0f", "man_playing_water_polo_medium_skin_tone": "1f93d-1f3fd-200d-2642-fe0f", "man-playing-water-polo_medium_dark_skin_tone": "1f93d-1f3fe-200d-2642-fe0f", "man_playing_water_polo_medium_dark_skin_tone": "1f93d-1f3fe-200d-2642-fe0f", "man-playing-water-polo_dark_skin_tone": "1f93d-1f3ff-200d-2642-fe0f", "man_playing_water_polo_dark_skin_tone": "1f93d-1f3ff-200d-2642-fe0f", "water_polo_light_skin_tone": "1f93d-1f3fb", "water_polo_medium_light_skin_tone": "1f93d-1f3fc", "water_polo_medium_skin_tone": "1f93d-1f3fd", "water_polo_medium_dark_skin_tone": "1f93d-1f3fe", "water_polo_dark_skin_tone": "1f93d-1f3ff", "woman-playing-handball_light_skin_tone": "1f93e-1f3fb-200d-2640-fe0f", "woman_playing_handball_light_skin_tone": "1f93e-1f3fb-200d-2640-fe0f", "woman-playing-handball_medium_light_skin_tone": "1f93e-1f3fc-200d-2640-fe0f", "woman_playing_handball_medium_light_skin_tone": "1f93e-1f3fc-200d-2640-fe0f", "woman-playing-handball_medium_skin_tone": "1f93e-1f3fd-200d-2640-fe0f", "woman_playing_handball_medium_skin_tone": "1f93e-1f3fd-200d-2640-fe0f", "woman-playing-handball_medium_dark_skin_tone": "1f93e-1f3fe-200d-2640-fe0f", "woman_playing_handball_medium_dark_skin_tone": "1f93e-1f3fe-200d-2640-fe0f", "woman-playing-handball_dark_skin_tone": "1f93e-1f3ff-200d-2640-fe0f", "woman_playing_handball_dark_skin_tone": "1f93e-1f3ff-200d-2640-fe0f", "man-playing-handball_light_skin_tone": "1f93e-1f3fb-200d-2642-fe0f", "man_playing_handball_light_skin_tone": "1f93e-1f3fb-200d-2642-fe0f", "man-playing-handball_medium_light_skin_tone": "1f93e-1f3fc-200d-2642-fe0f", "man_playing_handball_medium_light_skin_tone": "1f93e-1f3fc-200d-2642-fe0f", "man-playing-handball_medium_skin_tone": "1f93e-1f3fd-200d-2642-fe0f", "man_playing_handball_medium_skin_tone": "1f93e-1f3fd-200d-2642-fe0f", "man-playing-handball_medium_dark_skin_tone": "1f93e-1f3fe-200d-2642-fe0f", "man_playing_handball_medium_dark_skin_tone": "1f93e-1f3fe-200d-2642-fe0f", "man-playing-handball_dark_skin_tone": "1f93e-1f3ff-200d-2642-fe0f", "man_playing_handball_dark_skin_tone": "1f93e-1f3ff-200d-2642-fe0f", "handball_light_skin_tone": "1f93e-1f3fb", "handball_medium_light_skin_tone": "1f93e-1f3fc", "handball_medium_skin_tone": "1f93e-1f3fd", "handball_medium_dark_skin_tone": "1f93e-1f3fe", "handball_dark_skin_tone": "1f93e-1f3ff", "ninja_light_skin_tone": "1f977-1f3fb", "ninja_medium_light_skin_tone": "1f977-1f3fc", "ninja_medium_skin_tone": "1f977-1f3fd", "ninja_medium_dark_skin_tone": "1f977-1f3fe", "ninja_dark_skin_tone": "1f977-1f3ff", "leg_light_skin_tone": "1f9b5-1f3fb", "leg_medium_light_skin_tone": "1f9b5-1f3fc", "leg_medium_skin_tone": "1f9b5-1f3fd", "leg_medium_dark_skin_tone": "1f9b5-1f3fe", "leg_dark_skin_tone": "1f9b5-1f3ff", "foot_light_skin_tone": "1f9b6-1f3fb", "foot_medium_light_skin_tone": "1f9b6-1f3fc", "foot_medium_skin_tone": "1f9b6-1f3fd", "foot_medium_dark_skin_tone": "1f9b6-1f3fe", "foot_dark_skin_tone": "1f9b6-1f3ff", "female_superhero_light_skin_tone": "1f9b8-1f3fb-200d-2640-fe0f", "female_superhero_medium_light_skin_tone": "1f9b8-1f3fc-200d-2640-fe0f", "female_superhero_medium_skin_tone": "1f9b8-1f3fd-200d-2640-fe0f", "female_superhero_medium_dark_skin_tone": "1f9b8-1f3fe-200d-2640-fe0f", "female_superhero_dark_skin_tone": "1f9b8-1f3ff-200d-2640-fe0f", "male_superhero_light_skin_tone": "1f9b8-1f3fb-200d-2642-fe0f", "male_superhero_medium_light_skin_tone": "1f9b8-1f3fc-200d-2642-fe0f", "male_superhero_medium_skin_tone": "1f9b8-1f3fd-200d-2642-fe0f", "male_superhero_medium_dark_skin_tone": "1f9b8-1f3fe-200d-2642-fe0f", "male_superhero_dark_skin_tone": "1f9b8-1f3ff-200d-2642-fe0f", "superhero_light_skin_tone": "1f9b8-1f3fb", "superhero_medium_light_skin_tone": "1f9b8-1f3fc", "superhero_medium_skin_tone": "1f9b8-1f3fd", "superhero_medium_dark_skin_tone": "1f9b8-1f3fe", "superhero_dark_skin_tone": "1f9b8-1f3ff", "female_supervillain_light_skin_tone": "1f9b9-1f3fb-200d-2640-fe0f", "female_supervillain_medium_light_skin_tone": "1f9b9-1f3fc-200d-2640-fe0f", "female_supervillain_medium_skin_tone": "1f9b9-1f3fd-200d-2640-fe0f", "female_supervillain_medium_dark_skin_tone": "1f9b9-1f3fe-200d-2640-fe0f", "female_supervillain_dark_skin_tone": "1f9b9-1f3ff-200d-2640-fe0f", "male_supervillain_light_skin_tone": "1f9b9-1f3fb-200d-2642-fe0f", "male_supervillain_medium_light_skin_tone": "1f9b9-1f3fc-200d-2642-fe0f", "male_supervillain_medium_skin_tone": "1f9b9-1f3fd-200d-2642-fe0f", "male_supervillain_medium_dark_skin_tone": "1f9b9-1f3fe-200d-2642-fe0f", "male_supervillain_dark_skin_tone": "1f9b9-1f3ff-200d-2642-fe0f", "supervillain_light_skin_tone": "1f9b9-1f3fb", "supervillain_medium_light_skin_tone": "1f9b9-1f3fc", "supervillain_medium_skin_tone": "1f9b9-1f3fd", "supervillain_medium_dark_skin_tone": "1f9b9-1f3fe", "supervillain_dark_skin_tone": "1f9b9-1f3ff", "ear_with_hearing_aid_light_skin_tone": "1f9bb-1f3fb", "ear_with_hearing_aid_medium_light_skin_tone": "1f9bb-1f3fc", "ear_with_hearing_aid_medium_skin_tone": "1f9bb-1f3fd", "ear_with_hearing_aid_medium_dark_skin_tone": "1f9bb-1f3fe", "ear_with_hearing_aid_dark_skin_tone": "1f9bb-1f3ff", "woman_standing_light_skin_tone": "1f9cd-1f3fb-200d-2640-fe0f", "woman_standing_medium_light_skin_tone": "1f9cd-1f3fc-200d-2640-fe0f", "woman_standing_medium_skin_tone": "1f9cd-1f3fd-200d-2640-fe0f", "woman_standing_medium_dark_skin_tone": "1f9cd-1f3fe-200d-2640-fe0f", "woman_standing_dark_skin_tone": "1f9cd-1f3ff-200d-2640-fe0f", "man_standing_light_skin_tone": "1f9cd-1f3fb-200d-2642-fe0f", "man_standing_medium_light_skin_tone": "1f9cd-1f3fc-200d-2642-fe0f", "man_standing_medium_skin_tone": "1f9cd-1f3fd-200d-2642-fe0f", "man_standing_medium_dark_skin_tone": "1f9cd-1f3fe-200d-2642-fe0f", "man_standing_dark_skin_tone": "1f9cd-1f3ff-200d-2642-fe0f", "standing_person_light_skin_tone": "1f9cd-1f3fb", "standing_person_medium_light_skin_tone": "1f9cd-1f3fc", "standing_person_medium_skin_tone": "1f9cd-1f3fd", "standing_person_medium_dark_skin_tone": "1f9cd-1f3fe", "standing_person_dark_skin_tone": "1f9cd-1f3ff", "woman_kneeling_light_skin_tone": "1f9ce-1f3fb-200d-2640-fe0f", "woman_kneeling_medium_light_skin_tone": "1f9ce-1f3fc-200d-2640-fe0f", "woman_kneeling_medium_skin_tone": "1f9ce-1f3fd-200d-2640-fe0f", "woman_kneeling_medium_dark_skin_tone": "1f9ce-1f3fe-200d-2640-fe0f", "woman_kneeling_dark_skin_tone": "1f9ce-1f3ff-200d-2640-fe0f", "man_kneeling_light_skin_tone": "1f9ce-1f3fb-200d-2642-fe0f", "man_kneeling_medium_light_skin_tone": "1f9ce-1f3fc-200d-2642-fe0f", "man_kneeling_medium_skin_tone": "1f9ce-1f3fd-200d-2642-fe0f", "man_kneeling_medium_dark_skin_tone": "1f9ce-1f3fe-200d-2642-fe0f", "man_kneeling_dark_skin_tone": "1f9ce-1f3ff-200d-2642-fe0f", "kneeling_person_light_skin_tone": "1f9ce-1f3fb", "kneeling_person_medium_light_skin_tone": "1f9ce-1f3fc", "kneeling_person_medium_skin_tone": "1f9ce-1f3fd", "kneeling_person_medium_dark_skin_tone": "1f9ce-1f3fe", "kneeling_person_dark_skin_tone": "1f9ce-1f3ff", "deaf_woman_light_skin_tone": "1f9cf-1f3fb-200d-2640-fe0f", "deaf_woman_medium_light_skin_tone": "1f9cf-1f3fc-200d-2640-fe0f", "deaf_woman_medium_skin_tone": "1f9cf-1f3fd-200d-2640-fe0f", "deaf_woman_medium_dark_skin_tone": "1f9cf-1f3fe-200d-2640-fe0f", "deaf_woman_dark_skin_tone": "1f9cf-1f3ff-200d-2640-fe0f", "deaf_man_light_skin_tone": "1f9cf-1f3fb-200d-2642-fe0f", "deaf_man_medium_light_skin_tone": "1f9cf-1f3fc-200d-2642-fe0f", "deaf_man_medium_skin_tone": "1f9cf-1f3fd-200d-2642-fe0f", "deaf_man_medium_dark_skin_tone": "1f9cf-1f3fe-200d-2642-fe0f", "deaf_man_dark_skin_tone": "1f9cf-1f3ff-200d-2642-fe0f", "deaf_person_light_skin_tone": "1f9cf-1f3fb", "deaf_person_medium_light_skin_tone": "1f9cf-1f3fc", "deaf_person_medium_skin_tone": "1f9cf-1f3fd", "deaf_person_medium_dark_skin_tone": "1f9cf-1f3fe", "deaf_person_dark_skin_tone": "1f9cf-1f3ff", "farmer_light_skin_tone": "1f9d1-1f3fb-200d-1f33e", "farmer_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f33e", "farmer_medium_skin_tone": "1f9d1-1f3fd-200d-1f33e", "farmer_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f33e", "farmer_dark_skin_tone": "1f9d1-1f3ff-200d-1f33e", "cook_light_skin_tone": "1f9d1-1f3fb-200d-1f373", "cook_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f373", "cook_medium_skin_tone": "1f9d1-1f3fd-200d-1f373", "cook_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f373", "cook_dark_skin_tone": "1f9d1-1f3ff-200d-1f373", "person_feeding_baby_light_skin_tone": "1f9d1-1f3fb-200d-1f37c", "person_feeding_baby_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f37c", "person_feeding_baby_medium_skin_tone": "1f9d1-1f3fd-200d-1f37c", "person_feeding_baby_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f37c", "person_feeding_baby_dark_skin_tone": "1f9d1-1f3ff-200d-1f37c", "mx_claus_light_skin_tone": "1f9d1-1f3fb-200d-1f384", "mx_claus_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f384", "mx_claus_medium_skin_tone": "1f9d1-1f3fd-200d-1f384", "mx_claus_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f384", "mx_claus_dark_skin_tone": "1f9d1-1f3ff-200d-1f384", "student_light_skin_tone": "1f9d1-1f3fb-200d-1f393", "student_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f393", "student_medium_skin_tone": "1f9d1-1f3fd-200d-1f393", "student_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f393", "student_dark_skin_tone": "1f9d1-1f3ff-200d-1f393", "singer_light_skin_tone": "1f9d1-1f3fb-200d-1f3a4", "singer_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f3a4", "singer_medium_skin_tone": "1f9d1-1f3fd-200d-1f3a4", "singer_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f3a4", "singer_dark_skin_tone": "1f9d1-1f3ff-200d-1f3a4", "artist_light_skin_tone": "1f9d1-1f3fb-200d-1f3a8", "artist_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f3a8", "artist_medium_skin_tone": "1f9d1-1f3fd-200d-1f3a8", "artist_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f3a8", "artist_dark_skin_tone": "1f9d1-1f3ff-200d-1f3a8", "teacher_light_skin_tone": "1f9d1-1f3fb-200d-1f3eb", "teacher_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f3eb", "teacher_medium_skin_tone": "1f9d1-1f3fd-200d-1f3eb", "teacher_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f3eb", "teacher_dark_skin_tone": "1f9d1-1f3ff-200d-1f3eb", "factory_worker_light_skin_tone": "1f9d1-1f3fb-200d-1f3ed", "factory_worker_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f3ed", "factory_worker_medium_skin_tone": "1f9d1-1f3fd-200d-1f3ed", "factory_worker_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f3ed", "factory_worker_dark_skin_tone": "1f9d1-1f3ff-200d-1f3ed", "technologist_light_skin_tone": "1f9d1-1f3fb-200d-1f4bb", "technologist_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f4bb", "technologist_medium_skin_tone": "1f9d1-1f3fd-200d-1f4bb", "technologist_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f4bb", "technologist_dark_skin_tone": "1f9d1-1f3ff-200d-1f4bb", "office_worker_light_skin_tone": "1f9d1-1f3fb-200d-1f4bc", "office_worker_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f4bc", "office_worker_medium_skin_tone": "1f9d1-1f3fd-200d-1f4bc", "office_worker_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f4bc", "office_worker_dark_skin_tone": "1f9d1-1f3ff-200d-1f4bc", "mechanic_light_skin_tone": "1f9d1-1f3fb-200d-1f527", "mechanic_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f527", "mechanic_medium_skin_tone": "1f9d1-1f3fd-200d-1f527", "mechanic_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f527", "mechanic_dark_skin_tone": "1f9d1-1f3ff-200d-1f527", "scientist_light_skin_tone": "1f9d1-1f3fb-200d-1f52c", "scientist_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f52c", "scientist_medium_skin_tone": "1f9d1-1f3fd-200d-1f52c", "scientist_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f52c", "scientist_dark_skin_tone": "1f9d1-1f3ff-200d-1f52c", "astronaut_light_skin_tone": "1f9d1-1f3fb-200d-1f680", "astronaut_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f680", "astronaut_medium_skin_tone": "1f9d1-1f3fd-200d-1f680", "astronaut_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f680", "astronaut_dark_skin_tone": "1f9d1-1f3ff-200d-1f680", "firefighter_light_skin_tone": "1f9d1-1f3fb-200d-1f692", "firefighter_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f692", "firefighter_medium_skin_tone": "1f9d1-1f3fd-200d-1f692", "firefighter_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f692", "firefighter_dark_skin_tone": "1f9d1-1f3ff-200d-1f692", "people_holding_hands_light_skin_tone_light_skin_tone": "1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fb", "people_holding_hands_light_skin_tone_medium_light_skin_tone": "1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fc", "people_holding_hands_light_skin_tone_medium_skin_tone": "1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fd", "people_holding_hands_light_skin_tone_medium_dark_skin_tone": "1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fe", "people_holding_hands_light_skin_tone_dark_skin_tone": "1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3ff", "people_holding_hands_medium_light_skin_tone_light_skin_tone": "1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fb", "people_holding_hands_medium_light_skin_tone_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fc", "people_holding_hands_medium_light_skin_tone_medium_skin_tone": "1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fd", "people_holding_hands_medium_light_skin_tone_medium_dark_skin_tone": "1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fe", "people_holding_hands_medium_light_skin_tone_dark_skin_tone": "1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3ff", "people_holding_hands_medium_skin_tone_light_skin_tone": "1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fb", "people_holding_hands_medium_skin_tone_medium_light_skin_tone": "1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fc", "people_holding_hands_medium_skin_tone_medium_skin_tone": "1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fd", "people_holding_hands_medium_skin_tone_medium_dark_skin_tone": "1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fe", "people_holding_hands_medium_skin_tone_dark_skin_tone": "1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3ff", "people_holding_hands_medium_dark_skin_tone_light_skin_tone": "1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fb", "people_holding_hands_medium_dark_skin_tone_medium_light_skin_tone": "1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fc", "people_holding_hands_medium_dark_skin_tone_medium_skin_tone": "1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fd", "people_holding_hands_medium_dark_skin_tone_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fe", "people_holding_hands_medium_dark_skin_tone_dark_skin_tone": "1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3ff", "people_holding_hands_dark_skin_tone_light_skin_tone": "1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fb", "people_holding_hands_dark_skin_tone_medium_light_skin_tone": "1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fc", "people_holding_hands_dark_skin_tone_medium_skin_tone": "1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fd", "people_holding_hands_dark_skin_tone_medium_dark_skin_tone": "1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fe", "people_holding_hands_dark_skin_tone_dark_skin_tone": "1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3ff", "person_with_probing_cane_light_skin_tone": "1f9d1-1f3fb-200d-1f9af", "person_with_probing_cane_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f9af", "person_with_probing_cane_medium_skin_tone": "1f9d1-1f3fd-200d-1f9af", "person_with_probing_cane_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f9af", "person_with_probing_cane_dark_skin_tone": "1f9d1-1f3ff-200d-1f9af", "red_haired_person_light_skin_tone": "1f9d1-1f3fb-200d-1f9b0", "red_haired_person_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f9b0", "red_haired_person_medium_skin_tone": "1f9d1-1f3fd-200d-1f9b0", "red_haired_person_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f9b0", "red_haired_person_dark_skin_tone": "1f9d1-1f3ff-200d-1f9b0", "curly_haired_person_light_skin_tone": "1f9d1-1f3fb-200d-1f9b1", "curly_haired_person_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f9b1", "curly_haired_person_medium_skin_tone": "1f9d1-1f3fd-200d-1f9b1", "curly_haired_person_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f9b1", "curly_haired_person_dark_skin_tone": "1f9d1-1f3ff-200d-1f9b1", "bald_person_light_skin_tone": "1f9d1-1f3fb-200d-1f9b2", "bald_person_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f9b2", "bald_person_medium_skin_tone": "1f9d1-1f3fd-200d-1f9b2", "bald_person_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f9b2", "bald_person_dark_skin_tone": "1f9d1-1f3ff-200d-1f9b2", "white_haired_person_light_skin_tone": "1f9d1-1f3fb-200d-1f9b3", "white_haired_person_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f9b3", "white_haired_person_medium_skin_tone": "1f9d1-1f3fd-200d-1f9b3", "white_haired_person_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f9b3", "white_haired_person_dark_skin_tone": "1f9d1-1f3ff-200d-1f9b3", "person_in_motorized_wheelchair_light_skin_tone": "1f9d1-1f3fb-200d-1f9bc", "person_in_motorized_wheelchair_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f9bc", "person_in_motorized_wheelchair_medium_skin_tone": "1f9d1-1f3fd-200d-1f9bc", "person_in_motorized_wheelchair_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f9bc", "person_in_motorized_wheelchair_dark_skin_tone": "1f9d1-1f3ff-200d-1f9bc", "person_in_manual_wheelchair_light_skin_tone": "1f9d1-1f3fb-200d-1f9bd", "person_in_manual_wheelchair_medium_light_skin_tone": "1f9d1-1f3fc-200d-1f9bd", "person_in_manual_wheelchair_medium_skin_tone": "1f9d1-1f3fd-200d-1f9bd", "person_in_manual_wheelchair_medium_dark_skin_tone": "1f9d1-1f3fe-200d-1f9bd", "person_in_manual_wheelchair_dark_skin_tone": "1f9d1-1f3ff-200d-1f9bd", "health_worker_light_skin_tone": "1f9d1-1f3fb-200d-2695-fe0f", "health_worker_medium_light_skin_tone": "1f9d1-1f3fc-200d-2695-fe0f", "health_worker_medium_skin_tone": "1f9d1-1f3fd-200d-2695-fe0f", "health_worker_medium_dark_skin_tone": "1f9d1-1f3fe-200d-2695-fe0f", "health_worker_dark_skin_tone": "1f9d1-1f3ff-200d-2695-fe0f", "judge_light_skin_tone": "1f9d1-1f3fb-200d-2696-fe0f", "judge_medium_light_skin_tone": "1f9d1-1f3fc-200d-2696-fe0f", "judge_medium_skin_tone": "1f9d1-1f3fd-200d-2696-fe0f", "judge_medium_dark_skin_tone": "1f9d1-1f3fe-200d-2696-fe0f", "judge_dark_skin_tone": "1f9d1-1f3ff-200d-2696-fe0f", "pilot_light_skin_tone": "1f9d1-1f3fb-200d-2708-fe0f", "pilot_medium_light_skin_tone": "1f9d1-1f3fc-200d-2708-fe0f", "pilot_medium_skin_tone": "1f9d1-1f3fd-200d-2708-fe0f", "pilot_medium_dark_skin_tone": "1f9d1-1f3fe-200d-2708-fe0f", "pilot_dark_skin_tone": "1f9d1-1f3ff-200d-2708-fe0f", "adult_light_skin_tone": "1f9d1-1f3fb", "adult_medium_light_skin_tone": "1f9d1-1f3fc", "adult_medium_skin_tone": "1f9d1-1f3fd", "adult_medium_dark_skin_tone": "1f9d1-1f3fe", "adult_dark_skin_tone": "1f9d1-1f3ff", "child_light_skin_tone": "1f9d2-1f3fb", "child_medium_light_skin_tone": "1f9d2-1f3fc", "child_medium_skin_tone": "1f9d2-1f3fd", "child_medium_dark_skin_tone": "1f9d2-1f3fe", "child_dark_skin_tone": "1f9d2-1f3ff", "older_adult_light_skin_tone": "1f9d3-1f3fb", "older_adult_medium_light_skin_tone": "1f9d3-1f3fc", "older_adult_medium_skin_tone": "1f9d3-1f3fd", "older_adult_medium_dark_skin_tone": "1f9d3-1f3fe", "older_adult_dark_skin_tone": "1f9d3-1f3ff", "bearded_person_light_skin_tone": "1f9d4-1f3fb", "bearded_person_medium_light_skin_tone": "1f9d4-1f3fc", "bearded_person_medium_skin_tone": "1f9d4-1f3fd", "bearded_person_medium_dark_skin_tone": "1f9d4-1f3fe", "bearded_person_dark_skin_tone": "1f9d4-1f3ff", "person_with_headscarf_light_skin_tone": "1f9d5-1f3fb", "person_with_headscarf_medium_light_skin_tone": "1f9d5-1f3fc", "person_with_headscarf_medium_skin_tone": "1f9d5-1f3fd", "person_with_headscarf_medium_dark_skin_tone": "1f9d5-1f3fe", "person_with_headscarf_dark_skin_tone": "1f9d5-1f3ff", "woman_in_steamy_room_light_skin_tone": "1f9d6-1f3fb-200d-2640-fe0f", "woman_in_steamy_room_medium_light_skin_tone": "1f9d6-1f3fc-200d-2640-fe0f", "woman_in_steamy_room_medium_skin_tone": "1f9d6-1f3fd-200d-2640-fe0f", "woman_in_steamy_room_medium_dark_skin_tone": "1f9d6-1f3fe-200d-2640-fe0f", "woman_in_steamy_room_dark_skin_tone": "1f9d6-1f3ff-200d-2640-fe0f", "man_in_steamy_room_light_skin_tone": "1f9d6-1f3fb-200d-2642-fe0f", "man_in_steamy_room_medium_light_skin_tone": "1f9d6-1f3fc-200d-2642-fe0f", "man_in_steamy_room_medium_skin_tone": "1f9d6-1f3fd-200d-2642-fe0f", "man_in_steamy_room_medium_dark_skin_tone": "1f9d6-1f3fe-200d-2642-fe0f", "man_in_steamy_room_dark_skin_tone": "1f9d6-1f3ff-200d-2642-fe0f", "person_in_steamy_room_light_skin_tone": "1f9d6-1f3fb", "person_in_steamy_room_medium_light_skin_tone": "1f9d6-1f3fc", "person_in_steamy_room_medium_skin_tone": "1f9d6-1f3fd", "person_in_steamy_room_medium_dark_skin_tone": "1f9d6-1f3fe", "person_in_steamy_room_dark_skin_tone": "1f9d6-1f3ff", "woman_climbing_light_skin_tone": "1f9d7-1f3fb-200d-2640-fe0f", "woman_climbing_medium_light_skin_tone": "1f9d7-1f3fc-200d-2640-fe0f", "woman_climbing_medium_skin_tone": "1f9d7-1f3fd-200d-2640-fe0f", "woman_climbing_medium_dark_skin_tone": "1f9d7-1f3fe-200d-2640-fe0f", "woman_climbing_dark_skin_tone": "1f9d7-1f3ff-200d-2640-fe0f", "man_climbing_light_skin_tone": "1f9d7-1f3fb-200d-2642-fe0f", "man_climbing_medium_light_skin_tone": "1f9d7-1f3fc-200d-2642-fe0f", "man_climbing_medium_skin_tone": "1f9d7-1f3fd-200d-2642-fe0f", "man_climbing_medium_dark_skin_tone": "1f9d7-1f3fe-200d-2642-fe0f", "man_climbing_dark_skin_tone": "1f9d7-1f3ff-200d-2642-fe0f", "person_climbing_light_skin_tone": "1f9d7-1f3fb", "person_climbing_medium_light_skin_tone": "1f9d7-1f3fc", "person_climbing_medium_skin_tone": "1f9d7-1f3fd", "person_climbing_medium_dark_skin_tone": "1f9d7-1f3fe", "person_climbing_dark_skin_tone": "1f9d7-1f3ff", "woman_in_lotus_position_light_skin_tone": "1f9d8-1f3fb-200d-2640-fe0f", "woman_in_lotus_position_medium_light_skin_tone": "1f9d8-1f3fc-200d-2640-fe0f", "woman_in_lotus_position_medium_skin_tone": "1f9d8-1f3fd-200d-2640-fe0f", "woman_in_lotus_position_medium_dark_skin_tone": "1f9d8-1f3fe-200d-2640-fe0f", "woman_in_lotus_position_dark_skin_tone": "1f9d8-1f3ff-200d-2640-fe0f", "man_in_lotus_position_light_skin_tone": "1f9d8-1f3fb-200d-2642-fe0f", "man_in_lotus_position_medium_light_skin_tone": "1f9d8-1f3fc-200d-2642-fe0f", "man_in_lotus_position_medium_skin_tone": "1f9d8-1f3fd-200d-2642-fe0f", "man_in_lotus_position_medium_dark_skin_tone": "1f9d8-1f3fe-200d-2642-fe0f", "man_in_lotus_position_dark_skin_tone": "1f9d8-1f3ff-200d-2642-fe0f", "person_in_lotus_position_light_skin_tone": "1f9d8-1f3fb", "person_in_lotus_position_medium_light_skin_tone": "1f9d8-1f3fc", "person_in_lotus_position_medium_skin_tone": "1f9d8-1f3fd", "person_in_lotus_position_medium_dark_skin_tone": "1f9d8-1f3fe", "person_in_lotus_position_dark_skin_tone": "1f9d8-1f3ff", "female_mage_light_skin_tone": "1f9d9-1f3fb-200d-2640-fe0f", "female_mage_medium_light_skin_tone": "1f9d9-1f3fc-200d-2640-fe0f", "female_mage_medium_skin_tone": "1f9d9-1f3fd-200d-2640-fe0f", "female_mage_medium_dark_skin_tone": "1f9d9-1f3fe-200d-2640-fe0f", "female_mage_dark_skin_tone": "1f9d9-1f3ff-200d-2640-fe0f", "male_mage_light_skin_tone": "1f9d9-1f3fb-200d-2642-fe0f", "male_mage_medium_light_skin_tone": "1f9d9-1f3fc-200d-2642-fe0f", "male_mage_medium_skin_tone": "1f9d9-1f3fd-200d-2642-fe0f", "male_mage_medium_dark_skin_tone": "1f9d9-1f3fe-200d-2642-fe0f", "male_mage_dark_skin_tone": "1f9d9-1f3ff-200d-2642-fe0f", "mage_light_skin_tone": "1f9d9-1f3fb", "mage_medium_light_skin_tone": "1f9d9-1f3fc", "mage_medium_skin_tone": "1f9d9-1f3fd", "mage_medium_dark_skin_tone": "1f9d9-1f3fe", "mage_dark_skin_tone": "1f9d9-1f3ff", "female_fairy_light_skin_tone": "1f9da-1f3fb-200d-2640-fe0f", "female_fairy_medium_light_skin_tone": "1f9da-1f3fc-200d-2640-fe0f", "female_fairy_medium_skin_tone": "1f9da-1f3fd-200d-2640-fe0f", "female_fairy_medium_dark_skin_tone": "1f9da-1f3fe-200d-2640-fe0f", "female_fairy_dark_skin_tone": "1f9da-1f3ff-200d-2640-fe0f", "male_fairy_light_skin_tone": "1f9da-1f3fb-200d-2642-fe0f", "male_fairy_medium_light_skin_tone": "1f9da-1f3fc-200d-2642-fe0f", "male_fairy_medium_skin_tone": "1f9da-1f3fd-200d-2642-fe0f", "male_fairy_medium_dark_skin_tone": "1f9da-1f3fe-200d-2642-fe0f", "male_fairy_dark_skin_tone": "1f9da-1f3ff-200d-2642-fe0f", "fairy_light_skin_tone": "1f9da-1f3fb", "fairy_medium_light_skin_tone": "1f9da-1f3fc", "fairy_medium_skin_tone": "1f9da-1f3fd", "fairy_medium_dark_skin_tone": "1f9da-1f3fe", "fairy_dark_skin_tone": "1f9da-1f3ff", "female_vampire_light_skin_tone": "1f9db-1f3fb-200d-2640-fe0f", "female_vampire_medium_light_skin_tone": "1f9db-1f3fc-200d-2640-fe0f", "female_vampire_medium_skin_tone": "1f9db-1f3fd-200d-2640-fe0f", "female_vampire_medium_dark_skin_tone": "1f9db-1f3fe-200d-2640-fe0f", "female_vampire_dark_skin_tone": "1f9db-1f3ff-200d-2640-fe0f", "male_vampire_light_skin_tone": "1f9db-1f3fb-200d-2642-fe0f", "male_vampire_medium_light_skin_tone": "1f9db-1f3fc-200d-2642-fe0f", "male_vampire_medium_skin_tone": "1f9db-1f3fd-200d-2642-fe0f", "male_vampire_medium_dark_skin_tone": "1f9db-1f3fe-200d-2642-fe0f", "male_vampire_dark_skin_tone": "1f9db-1f3ff-200d-2642-fe0f", "vampire_light_skin_tone": "1f9db-1f3fb", "vampire_medium_light_skin_tone": "1f9db-1f3fc", "vampire_medium_skin_tone": "1f9db-1f3fd", "vampire_medium_dark_skin_tone": "1f9db-1f3fe", "vampire_dark_skin_tone": "1f9db-1f3ff", "mermaid_light_skin_tone": "1f9dc-1f3fb-200d-2640-fe0f", "mermaid_medium_light_skin_tone": "1f9dc-1f3fc-200d-2640-fe0f", "mermaid_medium_skin_tone": "1f9dc-1f3fd-200d-2640-fe0f", "mermaid_medium_dark_skin_tone": "1f9dc-1f3fe-200d-2640-fe0f", "mermaid_dark_skin_tone": "1f9dc-1f3ff-200d-2640-fe0f", "merman_light_skin_tone": "1f9dc-1f3fb-200d-2642-fe0f", "merman_medium_light_skin_tone": "1f9dc-1f3fc-200d-2642-fe0f", "merman_medium_skin_tone": "1f9dc-1f3fd-200d-2642-fe0f", "merman_medium_dark_skin_tone": "1f9dc-1f3fe-200d-2642-fe0f", "merman_dark_skin_tone": "1f9dc-1f3ff-200d-2642-fe0f", "merperson_light_skin_tone": "1f9dc-1f3fb", "merperson_medium_light_skin_tone": "1f9dc-1f3fc", "merperson_medium_skin_tone": "1f9dc-1f3fd", "merperson_medium_dark_skin_tone": "1f9dc-1f3fe", "merperson_dark_skin_tone": "1f9dc-1f3ff", "female_elf_light_skin_tone": "1f9dd-1f3fb-200d-2640-fe0f", "female_elf_medium_light_skin_tone": "1f9dd-1f3fc-200d-2640-fe0f", "female_elf_medium_skin_tone": "1f9dd-1f3fd-200d-2640-fe0f", "female_elf_medium_dark_skin_tone": "1f9dd-1f3fe-200d-2640-fe0f", "female_elf_dark_skin_tone": "1f9dd-1f3ff-200d-2640-fe0f", "male_elf_light_skin_tone": "1f9dd-1f3fb-200d-2642-fe0f", "male_elf_medium_light_skin_tone": "1f9dd-1f3fc-200d-2642-fe0f", "male_elf_medium_skin_tone": "1f9dd-1f3fd-200d-2642-fe0f", "male_elf_medium_dark_skin_tone": "1f9dd-1f3fe-200d-2642-fe0f", "male_elf_dark_skin_tone": "1f9dd-1f3ff-200d-2642-fe0f", "elf_light_skin_tone": "1f9dd-1f3fb", "elf_medium_light_skin_tone": "1f9dd-1f3fc", "elf_medium_skin_tone": "1f9dd-1f3fd", "elf_medium_dark_skin_tone": "1f9dd-1f3fe", "elf_dark_skin_tone": "1f9dd-1f3ff", "point_up_light_skin_tone": "261d-1f3fb", "point_up_medium_light_skin_tone": "261d-1f3fc", "point_up_medium_skin_tone": "261d-1f3fd", "point_up_medium_dark_skin_tone": "261d-1f3fe", "point_up_dark_skin_tone": "261d-1f3ff", "woman-bouncing-ball_light_skin_tone": "26f9-1f3fb-200d-2640-fe0f", "basketball_woman_light_skin_tone": "26f9-1f3fb-200d-2640-fe0f", "woman-bouncing-ball_medium_light_skin_tone": "26f9-1f3fc-200d-2640-fe0f", "basketball_woman_medium_light_skin_tone": "26f9-1f3fc-200d-2640-fe0f", "woman-bouncing-ball_medium_skin_tone": "26f9-1f3fd-200d-2640-fe0f", "basketball_woman_medium_skin_tone": "26f9-1f3fd-200d-2640-fe0f", "woman-bouncing-ball_medium_dark_skin_tone": "26f9-1f3fe-200d-2640-fe0f", "basketball_woman_medium_dark_skin_tone": "26f9-1f3fe-200d-2640-fe0f", "woman-bouncing-ball_dark_skin_tone": "26f9-1f3ff-200d-2640-fe0f", "basketball_woman_dark_skin_tone": "26f9-1f3ff-200d-2640-fe0f", "man-bouncing-ball_light_skin_tone": "26f9-1f3fb-200d-2642-fe0f", "basketball_man_light_skin_tone": "26f9-1f3fb-200d-2642-fe0f", "man-bouncing-ball_medium_light_skin_tone": "26f9-1f3fc-200d-2642-fe0f", "basketball_man_medium_light_skin_tone": "26f9-1f3fc-200d-2642-fe0f", "man-bouncing-ball_medium_skin_tone": "26f9-1f3fd-200d-2642-fe0f", "basketball_man_medium_skin_tone": "26f9-1f3fd-200d-2642-fe0f", "man-bouncing-ball_medium_dark_skin_tone": "26f9-1f3fe-200d-2642-fe0f", "basketball_man_medium_dark_skin_tone": "26f9-1f3fe-200d-2642-fe0f", "man-bouncing-ball_dark_skin_tone": "26f9-1f3ff-200d-2642-fe0f", "basketball_man_dark_skin_tone": "26f9-1f3ff-200d-2642-fe0f", "person_with_ball_light_skin_tone": "26f9-1f3fb", "person_with_ball_medium_light_skin_tone": "26f9-1f3fc", "person_with_ball_medium_skin_tone": "26f9-1f3fd", "person_with_ball_medium_dark_skin_tone": "26f9-1f3fe", "person_with_ball_dark_skin_tone": "26f9-1f3ff", "fist_light_skin_tone": "270a-1f3fb", "fist_raised_light_skin_tone": "270a-1f3fb", "fist_medium_light_skin_tone": "270a-1f3fc", "fist_raised_medium_light_skin_tone": "270a-1f3fc", "fist_medium_skin_tone": "270a-1f3fd", "fist_raised_medium_skin_tone": "270a-1f3fd", "fist_medium_dark_skin_tone": "270a-1f3fe", "fist_raised_medium_dark_skin_tone": "270a-1f3fe", "fist_dark_skin_tone": "270a-1f3ff", "fist_raised_dark_skin_tone": "270a-1f3ff", "hand_light_skin_tone": "270b-1f3fb", "raised_hand_light_skin_tone": "270b-1f3fb", "hand_medium_light_skin_tone": "270b-1f3fc", "raised_hand_medium_light_skin_tone": "270b-1f3fc", "hand_medium_skin_tone": "270b-1f3fd", "raised_hand_medium_skin_tone": "270b-1f3fd", "hand_medium_dark_skin_tone": "270b-1f3fe", "raised_hand_medium_dark_skin_tone": "270b-1f3fe", "hand_dark_skin_tone": "270b-1f3ff", "raised_hand_dark_skin_tone": "270b-1f3ff", "v_light_skin_tone": "270c-1f3fb", "v_medium_light_skin_tone": "270c-1f3fc", "v_medium_skin_tone": "270c-1f3fd", "v_medium_dark_skin_tone": "270c-1f3fe", "v_dark_skin_tone": "270c-1f3ff", "writing_hand_light_skin_tone": "270d-1f3fb", "writing_hand_medium_light_skin_tone": "270d-1f3fc", "writing_hand_medium_skin_tone": "270d-1f3fd", "writing_hand_medium_dark_skin_tone": "270d-1f3fe", "writing_hand_dark_skin_tone": "270d-1f3ff", "mattermost": "mattermost"}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/emoji_search.go b/vendor/github.com/mattermost/mattermost-server/v5/model/emoji_search.go
deleted file mode 100644
index 71e2671c..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/emoji_search.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type EmojiSearch struct {
-	Term       string `json:"term"`
-	PrefixOnly bool   `json:"prefix_only"`
-}
-
-func (es *EmojiSearch) ToJson() string {
-	b, _ := json.Marshal(es)
-	return string(b)
-}
-
-func EmojiSearchFromJson(data io.Reader) *EmojiSearch {
-	var es *EmojiSearch
-	json.NewDecoder(data).Decode(&es)
-	return es
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/feature_flags.go b/vendor/github.com/mattermost/mattermost-server/v5/model/feature_flags.go
deleted file mode 100644
index 7d3d6680..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/feature_flags.go
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"reflect"
-	"strconv"
-)
-
-type FeatureFlags struct {
-	// Exists only for unit and manual testing.
-	// When set to a value, will be returned by the ping endpoint.
-	TestFeature string
-	// Exists only for testing bool functionality. Boolean feature flags interpret "on" or "true" as true and
-	// all other values as false.
-	TestBoolFeature bool
-
-	// Toggle on and off scheduled jobs for cloud user limit emails see MM-29999
-	CloudDelinquentEmailJobsEnabled bool
-
-	// Toggle on and off support for Collapsed Threads
-	CollapsedThreads bool
-
-	// Enable the remote cluster service for shared channels.
-	EnableRemoteClusterService bool
-
-	// AppsEnabled toggle the Apps framework functionalities both in server and client side
-	AppsEnabled bool
-
-	// Feature flags to control plugin versions
-	PluginIncidentManagement string `plugin_id:"com.mattermost.plugin-incident-management"`
-	PluginApps               string `plugin_id:"com.mattermost.apps"`
-	PluginFocalboard         string `plugin_id:"focalboard"`
-
-	// Enable timed dnd support for user status
-	TimedDND bool
-}
-
-func (f *FeatureFlags) SetDefaults() {
-	f.TestFeature = "off"
-	f.TestBoolFeature = false
-	f.CloudDelinquentEmailJobsEnabled = false
-	f.CollapsedThreads = true
-	f.EnableRemoteClusterService = false
-	f.AppsEnabled = false
-	f.PluginIncidentManagement = "1.16.1"
-	f.PluginApps = ""
-	f.PluginFocalboard = ""
-	f.TimedDND = false
-}
-
-func (f *FeatureFlags) Plugins() map[string]string {
-	rFFVal := reflect.ValueOf(f).Elem()
-	rFFType := reflect.TypeOf(f).Elem()
-
-	pluginVersions := make(map[string]string)
-	for i := 0; i < rFFVal.NumField(); i++ {
-		rFieldVal := rFFVal.Field(i)
-		rFieldType := rFFType.Field(i)
-
-		pluginId, hasPluginId := rFieldType.Tag.Lookup("plugin_id")
-		if !hasPluginId {
-			continue
-		}
-
-		pluginVersions[pluginId] = rFieldVal.String()
-	}
-
-	return pluginVersions
-}
-
-// ToMap returns the feature flags as a map[string]string
-// Supports boolean and string feature flags.
-func (f *FeatureFlags) ToMap() map[string]string {
-	refStructVal := reflect.ValueOf(*f)
-	refStructType := reflect.TypeOf(*f)
-	ret := make(map[string]string)
-	for i := 0; i < refStructVal.NumField(); i++ {
-		refFieldVal := refStructVal.Field(i)
-		if !refFieldVal.IsValid() {
-			continue
-		}
-		refFieldType := refStructType.Field(i)
-		switch refFieldType.Type.Kind() {
-		case reflect.Bool:
-			ret[refFieldType.Name] = strconv.FormatBool(refFieldVal.Bool())
-		default:
-			ret[refFieldType.Name] = refFieldVal.String()
-		}
-	}
-
-	return ret
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/file.go b/vendor/github.com/mattermost/mattermost-server/v5/model/file.go
deleted file mode 100644
index d2cb8f34..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/file.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-const (
-	MaxImageSize = int64(6048 * 4032) // 24 megapixels, roughly 36MB as a raw image
-)
-
-type FileUploadResponse struct {
-	FileInfos []*FileInfo `json:"file_infos"`
-	ClientIds []string    `json:"client_ids"`
-}
-
-func FileUploadResponseFromJson(data io.Reader) *FileUploadResponse {
-	var o *FileUploadResponse
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func (o *FileUploadResponse) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/file_info.go b/vendor/github.com/mattermost/mattermost-server/v5/model/file_info.go
deleted file mode 100644
index 2bad9023..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/file_info.go
+++ /dev/null
@@ -1,215 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"image"
-	"image/gif"
-	"io"
-	"mime"
-	"net/http"
-	"path/filepath"
-	"strings"
-)
-
-const (
-	FILEINFO_SORT_BY_CREATED = "CreateAt"
-	FILEINFO_SORT_BY_SIZE    = "Size"
-)
-
-// GetFileInfosOptions contains options for getting FileInfos
-type GetFileInfosOptions struct {
-	// UserIds optionally limits the FileInfos to those created by the given users.
-	UserIds []string `json:"user_ids"`
-	// ChannelIds optionally limits the FileInfos to those created in the given channels.
-	ChannelIds []string `json:"channel_ids"`
-	// Since optionally limits FileInfos to those created at or after the given time, specified as Unix time in milliseconds.
-	Since int64 `json:"since"`
-	// IncludeDeleted if set includes deleted FileInfos.
-	IncludeDeleted bool `json:"include_deleted"`
-	// SortBy sorts the FileInfos by this field. The default is to sort by date created.
-	SortBy string `json:"sort_by"`
-	// SortDescending changes the sort direction to descending order when true.
-	SortDescending bool `json:"sort_descending"`
-}
-
-type FileInfo struct {
-	Id              string  `json:"id"`
-	CreatorId       string  `json:"user_id"`
-	PostId          string  `json:"post_id,omitempty"`
-	ChannelId       string  `db:"-" json:"channel_id"`
-	CreateAt        int64   `json:"create_at"`
-	UpdateAt        int64   `json:"update_at"`
-	DeleteAt        int64   `json:"delete_at"`
-	Path            string  `json:"-"` // not sent back to the client
-	ThumbnailPath   string  `json:"-"` // not sent back to the client
-	PreviewPath     string  `json:"-"` // not sent back to the client
-	Name            string  `json:"name"`
-	Extension       string  `json:"extension"`
-	Size            int64   `json:"size"`
-	MimeType        string  `json:"mime_type"`
-	Width           int     `json:"width,omitempty"`
-	Height          int     `json:"height,omitempty"`
-	HasPreviewImage bool    `json:"has_preview_image,omitempty"`
-	MiniPreview     *[]byte `json:"mini_preview"` // declared as *[]byte to avoid postgres/mysql differences in deserialization
-	Content         string  `json:"-"`
-	RemoteId        *string `json:"remote_id"`
-}
-
-func (fi *FileInfo) ToJson() string {
-	b, _ := json.Marshal(fi)
-	return string(b)
-}
-
-func FileInfoFromJson(data io.Reader) *FileInfo {
-	decoder := json.NewDecoder(data)
-
-	var fi FileInfo
-	if err := decoder.Decode(&fi); err != nil {
-		return nil
-	}
-	return &fi
-}
-
-func FileInfosToJson(infos []*FileInfo) string {
-	b, _ := json.Marshal(infos)
-	return string(b)
-}
-
-func FileInfosFromJson(data io.Reader) []*FileInfo {
-	decoder := json.NewDecoder(data)
-
-	var infos []*FileInfo
-	if err := decoder.Decode(&infos); err != nil {
-		return nil
-	}
-	return infos
-}
-
-func (fi *FileInfo) PreSave() {
-	if fi.Id == "" {
-		fi.Id = NewId()
-	}
-
-	if fi.CreateAt == 0 {
-		fi.CreateAt = GetMillis()
-	}
-
-	if fi.UpdateAt < fi.CreateAt {
-		fi.UpdateAt = fi.CreateAt
-	}
-
-	if fi.RemoteId == nil {
-		fi.RemoteId = NewString("")
-	}
-}
-
-func (fi *FileInfo) IsValid() *AppError {
-	if !IsValidId(fi.Id) {
-		return NewAppError("FileInfo.IsValid", "model.file_info.is_valid.id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !IsValidId(fi.CreatorId) && fi.CreatorId != "nouser" {
-		return NewAppError("FileInfo.IsValid", "model.file_info.is_valid.user_id.app_error", nil, "id="+fi.Id, http.StatusBadRequest)
-	}
-
-	if fi.PostId != "" && !IsValidId(fi.PostId) {
-		return NewAppError("FileInfo.IsValid", "model.file_info.is_valid.post_id.app_error", nil, "id="+fi.Id, http.StatusBadRequest)
-	}
-
-	if fi.CreateAt == 0 {
-		return NewAppError("FileInfo.IsValid", "model.file_info.is_valid.create_at.app_error", nil, "id="+fi.Id, http.StatusBadRequest)
-	}
-
-	if fi.UpdateAt == 0 {
-		return NewAppError("FileInfo.IsValid", "model.file_info.is_valid.update_at.app_error", nil, "id="+fi.Id, http.StatusBadRequest)
-	}
-
-	if fi.Path == "" {
-		return NewAppError("FileInfo.IsValid", "model.file_info.is_valid.path.app_error", nil, "id="+fi.Id, http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (fi *FileInfo) IsImage() bool {
-	return strings.HasPrefix(fi.MimeType, "image")
-}
-
-func NewInfo(name string) *FileInfo {
-	info := &FileInfo{
-		Name: name,
-	}
-
-	extension := strings.ToLower(filepath.Ext(name))
-	info.MimeType = mime.TypeByExtension(extension)
-
-	if extension != "" && extension[0] == '.' {
-		// The client expects a file extension without the leading period
-		info.Extension = extension[1:]
-	} else {
-		info.Extension = extension
-	}
-
-	return info
-}
-
-func GetInfoForBytes(name string, data io.ReadSeeker, size int) (*FileInfo, *AppError) {
-	info := &FileInfo{
-		Name: name,
-		Size: int64(size),
-	}
-	var err *AppError
-
-	extension := strings.ToLower(filepath.Ext(name))
-	info.MimeType = mime.TypeByExtension(extension)
-
-	if extension != "" && extension[0] == '.' {
-		// The client expects a file extension without the leading period
-		info.Extension = extension[1:]
-	} else {
-		info.Extension = extension
-	}
-
-	if info.IsImage() {
-		// Only set the width and height if it's actually an image that we can understand
-		if config, _, err := image.DecodeConfig(data); err == nil {
-			info.Width = config.Width
-			info.Height = config.Height
-
-			if info.MimeType == "image/gif" {
-				// Just show the gif itself instead of a preview image for animated gifs
-				data.Seek(0, io.SeekStart)
-				gifConfig, err := gif.DecodeAll(data)
-				if err != nil {
-					// Still return the rest of the info even though it doesn't appear to be an actual gif
-					info.HasPreviewImage = true
-					return info, NewAppError("GetInfoForBytes", "model.file_info.get.gif.app_error", nil, err.Error(), http.StatusBadRequest)
-				}
-				info.HasPreviewImage = len(gifConfig.Image) == 1
-			} else {
-				info.HasPreviewImage = true
-			}
-		}
-	}
-
-	return info, err
-}
-
-func GetEtagForFileInfos(infos []*FileInfo) string {
-	if len(infos) == 0 {
-		return Etag()
-	}
-
-	var maxUpdateAt int64
-
-	for _, info := range infos {
-		if info.UpdateAt > maxUpdateAt {
-			maxUpdateAt = info.UpdateAt
-		}
-	}
-
-	return Etag(infos[0].PostId, maxUpdateAt)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/file_info_list.go b/vendor/github.com/mattermost/mattermost-server/v5/model/file_info_list.go
deleted file mode 100644
index cd9694f5..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/file_info_list.go
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"sort"
-)
-
-type FileInfoList struct {
-	Order          []string             `json:"order"`
-	FileInfos      map[string]*FileInfo `json:"file_infos"`
-	NextFileInfoId string               `json:"next_file_info_id"`
-	PrevFileInfoId string               `json:"prev_file_info_id"`
-}
-
-func NewFileInfoList() *FileInfoList {
-	return &FileInfoList{
-		Order:          make([]string, 0),
-		FileInfos:      make(map[string]*FileInfo),
-		NextFileInfoId: "",
-		PrevFileInfoId: "",
-	}
-}
-
-func (o *FileInfoList) ToSlice() []*FileInfo {
-	var fileInfos []*FileInfo
-	for _, id := range o.Order {
-		fileInfos = append(fileInfos, o.FileInfos[id])
-	}
-	return fileInfos
-}
-
-func (o *FileInfoList) ToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return ""
-	} else {
-		return string(b)
-	}
-}
-
-func (o *FileInfoList) MakeNonNil() {
-	if o.Order == nil {
-		o.Order = make([]string, 0)
-	}
-
-	if o.FileInfos == nil {
-		o.FileInfos = make(map[string]*FileInfo)
-	}
-}
-
-func (o *FileInfoList) AddOrder(id string) {
-	if o.Order == nil {
-		o.Order = make([]string, 0, 128)
-	}
-
-	o.Order = append(o.Order, id)
-}
-
-func (o *FileInfoList) AddFileInfo(fileInfo *FileInfo) {
-	if o.FileInfos == nil {
-		o.FileInfos = make(map[string]*FileInfo)
-	}
-
-	o.FileInfos[fileInfo.Id] = fileInfo
-}
-
-func (o *FileInfoList) UniqueOrder() {
-	keys := make(map[string]bool)
-	order := []string{}
-	for _, fileInfoId := range o.Order {
-		if _, value := keys[fileInfoId]; !value {
-			keys[fileInfoId] = true
-			order = append(order, fileInfoId)
-		}
-	}
-
-	o.Order = order
-}
-
-func (o *FileInfoList) Extend(other *FileInfoList) {
-	for fileInfoId := range other.FileInfos {
-		o.AddFileInfo(other.FileInfos[fileInfoId])
-	}
-
-	for _, fileInfoId := range other.Order {
-		o.AddOrder(fileInfoId)
-	}
-
-	o.UniqueOrder()
-}
-
-func (o *FileInfoList) SortByCreateAt() {
-	sort.Slice(o.Order, func(i, j int) bool {
-		return o.FileInfos[o.Order[i]].CreateAt > o.FileInfos[o.Order[j]].CreateAt
-	})
-}
-
-func (o *FileInfoList) Etag() string {
-	id := "0"
-	var t int64 = 0
-
-	for _, v := range o.FileInfos {
-		if v.UpdateAt > t {
-			t = v.UpdateAt
-			id = v.Id
-		} else if v.UpdateAt == t && v.Id > id {
-			t = v.UpdateAt
-			id = v.Id
-		}
-	}
-
-	orderId := ""
-	if len(o.Order) > 0 {
-		orderId = o.Order[0]
-	}
-
-	return Etag(orderId, id, t)
-}
-
-func FileInfoListFromJson(data io.Reader) *FileInfoList {
-	var o *FileInfoList
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/file_info_search_results.go b/vendor/github.com/mattermost/mattermost-server/v5/model/file_info_search_results.go
deleted file mode 100644
index 90f2922b..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/file_info_search_results.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type FileInfoSearchMatches map[string][]string
-
-type FileInfoSearchResults struct {
-	*FileInfoList
-	Matches FileInfoSearchMatches `json:"matches"`
-}
-
-func MakeFileInfoSearchResults(fileInfos *FileInfoList, matches FileInfoSearchMatches) *FileInfoSearchResults {
-	return &FileInfoSearchResults{
-		fileInfos,
-		matches,
-	}
-}
-
-func (o *FileInfoSearchResults) ToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return ""
-	}
-	return string(b)
-}
-
-func FileInfoSearchResultsFromJson(data io.Reader) *FileInfoSearchResults {
-	var o *FileInfoSearchResults
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/gitlab.go b/vendor/github.com/mattermost/mattermost-server/v5/model/gitlab.go
deleted file mode 100644
index 0b069cd6..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/gitlab.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-const (
-	USER_AUTH_SERVICE_GITLAB = "gitlab"
-)
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/group.go b/vendor/github.com/mattermost/mattermost-server/v5/model/group.go
deleted file mode 100644
index c70b7aa1..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/group.go
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-	"regexp"
-)
-
-const (
-	GroupSourceLdap GroupSource = "ldap"
-
-	GroupNameMaxLength        = 64
-	GroupSourceMaxLength      = 64
-	GroupDisplayNameMaxLength = 128
-	GroupDescriptionMaxLength = 1024
-	GroupRemoteIDMaxLength    = 48
-)
-
-type GroupSource string
-
-var allGroupSources = []GroupSource{
-	GroupSourceLdap,
-}
-
-var groupSourcesRequiringRemoteID = []GroupSource{
-	GroupSourceLdap,
-}
-
-type Group struct {
-	Id             string      `json:"id"`
-	Name           *string     `json:"name,omitempty"`
-	DisplayName    string      `json:"display_name"`
-	Description    string      `json:"description"`
-	Source         GroupSource `json:"source"`
-	RemoteId       string      `json:"remote_id"`
-	CreateAt       int64       `json:"create_at"`
-	UpdateAt       int64       `json:"update_at"`
-	DeleteAt       int64       `json:"delete_at"`
-	HasSyncables   bool        `db:"-" json:"has_syncables"`
-	MemberCount    *int        `db:"-" json:"member_count,omitempty"`
-	AllowReference bool        `json:"allow_reference"`
-}
-
-type GroupWithSchemeAdmin struct {
-	Group
-	SchemeAdmin *bool `db:"SyncableSchemeAdmin" json:"scheme_admin,omitempty"`
-}
-
-type GroupsAssociatedToChannelWithSchemeAdmin struct {
-	ChannelId string `json:"channel_id"`
-	Group
-	SchemeAdmin *bool `db:"SyncableSchemeAdmin" json:"scheme_admin,omitempty"`
-}
-type GroupsAssociatedToChannel struct {
-	ChannelId string                  `json:"channel_id"`
-	Groups    []*GroupWithSchemeAdmin `json:"groups"`
-}
-
-type GroupPatch struct {
-	Name           *string `json:"name"`
-	DisplayName    *string `json:"display_name"`
-	Description    *string `json:"description"`
-	AllowReference *bool   `json:"allow_reference"`
-}
-
-type LdapGroupSearchOpts struct {
-	Q            string
-	IsLinked     *bool
-	IsConfigured *bool
-}
-
-type GroupSearchOpts struct {
-	Q                      string
-	NotAssociatedToTeam    string
-	NotAssociatedToChannel string
-	IncludeMemberCount     bool
-	FilterAllowReference   bool
-	PageOpts               *PageOpts
-	Since                  int64
-
-	// FilterParentTeamPermitted filters the groups to the intersect of the
-	// set associated to the parent team and those returned by the query.
-	// If the parent team is not group-constrained or if NotAssociatedToChannel
-	// is not set then this option is ignored.
-	FilterParentTeamPermitted bool
-}
-
-type PageOpts struct {
-	Page    int
-	PerPage int
-}
-
-type GroupStats struct {
-	GroupID          string `json:"group_id"`
-	TotalMemberCount int64  `json:"total_member_count"`
-}
-
-func (group *Group) Patch(patch *GroupPatch) {
-	if patch.Name != nil {
-		group.Name = patch.Name
-	}
-	if patch.DisplayName != nil {
-		group.DisplayName = *patch.DisplayName
-	}
-	if patch.Description != nil {
-		group.Description = *patch.Description
-	}
-	if patch.AllowReference != nil {
-		group.AllowReference = *patch.AllowReference
-	}
-}
-
-func (group *Group) IsValidForCreate() *AppError {
-	err := group.IsValidName()
-	if err != nil {
-		return err
-	}
-
-	if l := len(group.DisplayName); l == 0 || l > GroupDisplayNameMaxLength {
-		return NewAppError("Group.IsValidForCreate", "model.group.display_name.app_error", map[string]interface{}{"GroupDisplayNameMaxLength": GroupDisplayNameMaxLength}, "", http.StatusBadRequest)
-	}
-
-	if len(group.Description) > GroupDescriptionMaxLength {
-		return NewAppError("Group.IsValidForCreate", "model.group.description.app_error", map[string]interface{}{"GroupDescriptionMaxLength": GroupDescriptionMaxLength}, "", http.StatusBadRequest)
-	}
-
-	isValidSource := false
-	for _, groupSource := range allGroupSources {
-		if group.Source == groupSource {
-			isValidSource = true
-			break
-		}
-	}
-	if !isValidSource {
-		return NewAppError("Group.IsValidForCreate", "model.group.source.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(group.RemoteId) > GroupRemoteIDMaxLength || (group.RemoteId == "" && group.requiresRemoteId()) {
-		return NewAppError("Group.IsValidForCreate", "model.group.remote_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (group *Group) requiresRemoteId() bool {
-	for _, groupSource := range groupSourcesRequiringRemoteID {
-		if groupSource == group.Source {
-			return true
-		}
-	}
-	return false
-}
-
-func (group *Group) IsValidForUpdate() *AppError {
-	if !IsValidId(group.Id) {
-		return NewAppError("Group.IsValidForUpdate", "app.group.id.app_error", nil, "", http.StatusBadRequest)
-	}
-	if group.CreateAt == 0 {
-		return NewAppError("Group.IsValidForUpdate", "model.group.create_at.app_error", nil, "", http.StatusBadRequest)
-	}
-	if group.UpdateAt == 0 {
-		return NewAppError("Group.IsValidForUpdate", "model.group.update_at.app_error", nil, "", http.StatusBadRequest)
-	}
-	if err := group.IsValidForCreate(); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (group *Group) ToJson() string {
-	b, _ := json.Marshal(group)
-	return string(b)
-}
-
-var validGroupnameChars = regexp.MustCompile(`^[a-z0-9\.\-_]+$`)
-
-func (group *Group) IsValidName() *AppError {
-
-	if group.Name == nil {
-		if group.AllowReference {
-			return NewAppError("Group.IsValidName", "model.group.name.app_error", map[string]interface{}{"GroupNameMaxLength": GroupNameMaxLength}, "", http.StatusBadRequest)
-		}
-	} else {
-		if l := len(*group.Name); l == 0 || l > GroupNameMaxLength {
-			return NewAppError("Group.IsValidName", "model.group.name.invalid_length.app_error", map[string]interface{}{"GroupNameMaxLength": GroupNameMaxLength}, "", http.StatusBadRequest)
-		}
-
-		if !validGroupnameChars.MatchString(*group.Name) {
-			return NewAppError("Group.IsValidName", "model.group.name.invalid_chars.app_error", nil, "", http.StatusBadRequest)
-		}
-	}
-	return nil
-}
-
-func GroupFromJson(data io.Reader) *Group {
-	var group *Group
-	json.NewDecoder(data).Decode(&group)
-	return group
-}
-
-func GroupsFromJson(data io.Reader) []*Group {
-	var groups []*Group
-	json.NewDecoder(data).Decode(&groups)
-	return groups
-}
-
-func GroupPatchFromJson(data io.Reader) *GroupPatch {
-	var groupPatch *GroupPatch
-	json.NewDecoder(data).Decode(&groupPatch)
-	return groupPatch
-}
-
-func GroupStatsFromJson(data io.Reader) *GroupStats {
-	var groupStats *GroupStats
-	json.NewDecoder(data).Decode(&groupStats)
-	return groupStats
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/group_member.go b/vendor/github.com/mattermost/mattermost-server/v5/model/group_member.go
deleted file mode 100644
index d18d7849..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/group_member.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import "net/http"
-
-type GroupMember struct {
-	GroupId  string `json:"group_id"`
-	UserId   string `json:"user_id"`
-	CreateAt int64  `json:"create_at"`
-	DeleteAt int64  `json:"delete_at"`
-}
-
-func (gm *GroupMember) IsValid() *AppError {
-	if !IsValidId(gm.GroupId) {
-		return NewAppError("GroupMember.IsValid", "model.group_member.group_id.app_error", nil, "", http.StatusBadRequest)
-	}
-	if !IsValidId(gm.UserId) {
-		return NewAppError("GroupMember.IsValid", "model.group_member.user_id.app_error", nil, "", http.StatusBadRequest)
-	}
-	return nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/group_syncable.go b/vendor/github.com/mattermost/mattermost-server/v5/model/group_syncable.go
deleted file mode 100644
index eb3bdf09..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/group_syncable.go
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-)
-
-type GroupSyncableType string
-
-const (
-	GroupSyncableTypeTeam    GroupSyncableType = "Team"
-	GroupSyncableTypeChannel GroupSyncableType = "Channel"
-)
-
-func (gst GroupSyncableType) String() string {
-	return string(gst)
-}
-
-type GroupSyncable struct {
-	GroupId string `json:"group_id"`
-
-	// SyncableId represents the Id of the model that is being synced with the group, for example a ChannelId or
-	// TeamId.
-	SyncableId string `db:"-" json:"-"`
-
-	AutoAdd     bool              `json:"auto_add"`
-	SchemeAdmin bool              `json:"scheme_admin"`
-	CreateAt    int64             `json:"create_at"`
-	DeleteAt    int64             `json:"delete_at"`
-	UpdateAt    int64             `json:"update_at"`
-	Type        GroupSyncableType `db:"-" json:"-"`
-
-	// Values joined in from the associated team and/or channel
-	ChannelDisplayName string `db:"-" json:"-"`
-	TeamDisplayName    string `db:"-" json:"-"`
-	TeamType           string `db:"-" json:"-"`
-	ChannelType        string `db:"-" json:"-"`
-	TeamID             string `db:"-" json:"-"`
-}
-
-func (syncable *GroupSyncable) IsValid() *AppError {
-	if !IsValidId(syncable.GroupId) {
-		return NewAppError("GroupSyncable.SyncableIsValid", "model.group_syncable.group_id.app_error", nil, "", http.StatusBadRequest)
-	}
-	if !IsValidId(syncable.SyncableId) {
-		return NewAppError("GroupSyncable.SyncableIsValid", "model.group_syncable.syncable_id.app_error", nil, "", http.StatusBadRequest)
-	}
-	return nil
-}
-
-func (syncable *GroupSyncable) UnmarshalJSON(b []byte) error {
-	var kvp map[string]interface{}
-	err := json.Unmarshal(b, &kvp)
-	if err != nil {
-		return err
-	}
-	var channelId string
-	var teamId string
-	for key, value := range kvp {
-		switch key {
-		case "team_id":
-			teamId = value.(string)
-		case "channel_id":
-			channelId = value.(string)
-		case "group_id":
-			syncable.GroupId = value.(string)
-		case "auto_add":
-			syncable.AutoAdd = value.(bool)
-		default:
-		}
-	}
-	if channelId != "" {
-		syncable.TeamID = teamId
-		syncable.SyncableId = channelId
-		syncable.Type = GroupSyncableTypeChannel
-	} else {
-		syncable.SyncableId = teamId
-		syncable.Type = GroupSyncableTypeTeam
-	}
-	return nil
-}
-
-func (syncable *GroupSyncable) MarshalJSON() ([]byte, error) {
-	type Alias GroupSyncable
-	switch syncable.Type {
-	case GroupSyncableTypeTeam:
-		return json.Marshal(&struct {
-			TeamID          string            `json:"team_id"`
-			TeamDisplayName string            `json:"team_display_name,omitempty"`
-			TeamType        string            `json:"team_type,omitempty"`
-			Type            GroupSyncableType `json:"type,omitempty"`
-			*Alias
-		}{
-			TeamDisplayName: syncable.TeamDisplayName,
-			TeamType:        syncable.TeamType,
-			TeamID:          syncable.SyncableId,
-			Type:            syncable.Type,
-			Alias:           (*Alias)(syncable),
-		})
-	case GroupSyncableTypeChannel:
-		return json.Marshal(&struct {
-			ChannelID          string            `json:"channel_id"`
-			ChannelDisplayName string            `json:"channel_display_name,omitempty"`
-			ChannelType        string            `json:"channel_type,omitempty"`
-			Type               GroupSyncableType `json:"type,omitempty"`
-
-			TeamID          string `json:"team_id,omitempty"`
-			TeamDisplayName string `json:"team_display_name,omitempty"`
-			TeamType        string `json:"team_type,omitempty"`
-
-			*Alias
-		}{
-			ChannelID:          syncable.SyncableId,
-			ChannelDisplayName: syncable.ChannelDisplayName,
-			ChannelType:        syncable.ChannelType,
-			Type:               syncable.Type,
-
-			TeamID:          syncable.TeamID,
-			TeamDisplayName: syncable.TeamDisplayName,
-			TeamType:        syncable.TeamType,
-
-			Alias: (*Alias)(syncable),
-		})
-	default:
-		return nil, &json.MarshalerError{
-			Err: fmt.Errorf("unknown syncable type: %s", syncable.Type),
-		}
-	}
-}
-
-type GroupSyncablePatch struct {
-	AutoAdd     *bool `json:"auto_add"`
-	SchemeAdmin *bool `json:"scheme_admin"`
-}
-
-func (syncable *GroupSyncable) Patch(patch *GroupSyncablePatch) {
-	if patch.AutoAdd != nil {
-		syncable.AutoAdd = *patch.AutoAdd
-	}
-	if patch.SchemeAdmin != nil {
-		syncable.SchemeAdmin = *patch.SchemeAdmin
-	}
-}
-
-type UserTeamIDPair struct {
-	UserID string
-	TeamID string
-}
-
-type UserChannelIDPair struct {
-	UserID    string
-	ChannelID string
-}
-
-func GroupSyncableFromJson(data io.Reader) *GroupSyncable {
-	groupSyncable := &GroupSyncable{}
-	bodyBytes, _ := ioutil.ReadAll(data)
-	json.Unmarshal(bodyBytes, groupSyncable)
-	return groupSyncable
-}
-
-func GroupSyncablesFromJson(data io.Reader) []*GroupSyncable {
-	groupSyncables := []*GroupSyncable{}
-	bodyBytes, _ := ioutil.ReadAll(data)
-	json.Unmarshal(bodyBytes, &groupSyncables)
-	return groupSyncables
-}
-
-func NewGroupTeam(groupID, teamID string, autoAdd bool) *GroupSyncable {
-	return &GroupSyncable{
-		GroupId:    groupID,
-		SyncableId: teamID,
-		Type:       GroupSyncableTypeTeam,
-		AutoAdd:    autoAdd,
-	}
-}
-
-func NewGroupChannel(groupID, channelID string, autoAdd bool) *GroupSyncable {
-	return &GroupSyncable{
-		GroupId:    groupID,
-		SyncableId: channelID,
-		Type:       GroupSyncableTypeChannel,
-		AutoAdd:    autoAdd,
-	}
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/guest_invite.go b/vendor/github.com/mattermost/mattermost-server/v5/model/guest_invite.go
deleted file mode 100644
index ac803a5d..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/guest_invite.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-)
-
-type GuestsInvite struct {
-	Emails   []string `json:"emails"`
-	Channels []string `json:"channels"`
-	Message  string   `json:"message"`
-}
-
-// IsValid validates the user and returns an error if it isn't configured
-// correctly.
-func (i *GuestsInvite) IsValid() *AppError {
-	if len(i.Emails) == 0 {
-		return NewAppError("GuestsInvite.IsValid", "model.guest.is_valid.emails.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	for _, email := range i.Emails {
-		if len(email) > USER_EMAIL_MAX_LENGTH || email == "" || !IsValidEmail(email) {
-			return NewAppError("GuestsInvite.IsValid", "model.guest.is_valid.email.app_error", nil, "email="+email, http.StatusBadRequest)
-		}
-	}
-
-	if len(i.Channels) == 0 {
-		return NewAppError("GuestsInvite.IsValid", "model.guest.is_valid.channels.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	for _, channel := range i.Channels {
-		if len(channel) != 26 {
-			return NewAppError("GuestsInvite.IsValid", "model.guest.is_valid.channel.app_error", nil, "channel="+channel, http.StatusBadRequest)
-		}
-	}
-	return nil
-}
-
-// GuestsInviteFromJson will decode the input and return a GuestsInvite
-func GuestsInviteFromJson(data io.Reader) *GuestsInvite {
-	var i *GuestsInvite
-	json.NewDecoder(data).Decode(&i)
-	return i
-}
-
-func (i *GuestsInvite) ToJson() string {
-	b, _ := json.Marshal(i)
-	return string(b)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/incoming_webhook.go b/vendor/github.com/mattermost/mattermost-server/v5/model/incoming_webhook.go
deleted file mode 100644
index f8fffe20..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/incoming_webhook.go
+++ /dev/null
@@ -1,215 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"bytes"
-	"encoding/json"
-	"io"
-	"net/http"
-	"regexp"
-)
-
-const (
-	DEFAULT_WEBHOOK_USERNAME = "webhook"
-)
-
-type IncomingWebhook struct {
-	Id            string `json:"id"`
-	CreateAt      int64  `json:"create_at"`
-	UpdateAt      int64  `json:"update_at"`
-	DeleteAt      int64  `json:"delete_at"`
-	UserId        string `json:"user_id"`
-	ChannelId     string `json:"channel_id"`
-	TeamId        string `json:"team_id"`
-	DisplayName   string `json:"display_name"`
-	Description   string `json:"description"`
-	Username      string `json:"username"`
-	IconURL       string `json:"icon_url"`
-	ChannelLocked bool   `json:"channel_locked"`
-}
-
-type IncomingWebhookRequest struct {
-	Text        string             `json:"text"`
-	Username    string             `json:"username"`
-	IconURL     string             `json:"icon_url"`
-	ChannelName string             `json:"channel"`
-	Props       StringInterface    `json:"props"`
-	Attachments []*SlackAttachment `json:"attachments"`
-	Type        string             `json:"type"`
-	IconEmoji   string             `json:"icon_emoji"`
-}
-
-func (o *IncomingWebhook) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func IncomingWebhookFromJson(data io.Reader) *IncomingWebhook {
-	var o *IncomingWebhook
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func IncomingWebhookListToJson(l []*IncomingWebhook) string {
-	b, _ := json.Marshal(l)
-	return string(b)
-}
-
-func IncomingWebhookListFromJson(data io.Reader) []*IncomingWebhook {
-	var o []*IncomingWebhook
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func (o *IncomingWebhook) IsValid() *AppError {
-
-	if !IsValidId(o.Id) {
-		return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.id.app_error", nil, "", http.StatusBadRequest)
-
-	}
-
-	if o.CreateAt == 0 {
-		return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.create_at.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if o.UpdateAt == 0 {
-		return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.update_at.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if !IsValidId(o.UserId) {
-		return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.user_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !IsValidId(o.ChannelId) {
-		return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.channel_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !IsValidId(o.TeamId) {
-		return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.team_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(o.DisplayName) > 64 {
-		return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.display_name.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(o.Description) > 500 {
-		return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.description.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(o.Username) > 64 {
-		return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.username.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(o.IconURL) > 1024 {
-		return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.icon_url.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (o *IncomingWebhook) PreSave() {
-	if o.Id == "" {
-		o.Id = NewId()
-	}
-
-	o.CreateAt = GetMillis()
-	o.UpdateAt = o.CreateAt
-}
-
-func (o *IncomingWebhook) PreUpdate() {
-	o.UpdateAt = GetMillis()
-}
-
-// escapeControlCharsFromPayload escapes control chars (\n, \t) from a byte slice.
-// Context:
-// JSON strings are not supposed to contain control characters such as \n, \t,
-// ... but some incoming webhooks might still send invalid JSON and we want to
-// try to handle that. An example invalid JSON string from an incoming webhook
-// might look like this (strings for both "text" and "fallback" attributes are
-// invalid JSON strings because they contain unescaped newlines and tabs):
-//  `{
-//    "text": "this is a test
-//						 that contains a newline and tabs",
-//    "attachments": [
-//      {
-//        "fallback": "Required plain-text summary of the attachment
-//										that contains a newline and tabs",
-//        "color": "#36a64f",
-//  			...
-//        "text": "Optional text that appears within the attachment
-//								 that contains a newline and tabs",
-//  			...
-//        "thumb_url": "http://example.com/path/to/thumb.png"
-//      }
-//    ]
-//  }`
-// This function will search for `"key": "value"` pairs, and escape \n, \t
-// from the value.
-func escapeControlCharsFromPayload(by []byte) []byte {
-	// we'll search for `"text": "..."` or `"fallback": "..."`, ...
-	keys := "text|fallback|pretext|author_name|title|value"
-
-	// the regexp reads like this:
-	// (?s): this flag let . match \n (default is false)
-	// "(keys)": we search for the keys defined above
-	// \s*:\s*: followed by 0..n spaces/tabs, a colon then 0..n spaces/tabs
-	// ": a double-quote
-	// (\\"|[^"])*: any number of times the `\"` string or any char but a double-quote
-	// ": a double-quote
-	r := `(?s)"(` + keys + `)"\s*:\s*"(\\"|[^"])*"`
-	re := regexp.MustCompile(r)
-
-	// the function that will escape \n and \t on the regexp matches
-	repl := func(b []byte) []byte {
-		if bytes.Contains(b, []byte("\n")) {
-			b = bytes.Replace(b, []byte("\n"), []byte("\\n"), -1)
-		}
-		if bytes.Contains(b, []byte("\t")) {
-			b = bytes.Replace(b, []byte("\t"), []byte("\\t"), -1)
-		}
-
-		return b
-	}
-
-	return re.ReplaceAllFunc(by, repl)
-}
-
-func decodeIncomingWebhookRequest(by []byte) (*IncomingWebhookRequest, error) {
-	decoder := json.NewDecoder(bytes.NewReader(by))
-	var o IncomingWebhookRequest
-	err := decoder.Decode(&o)
-	if err == nil {
-		return &o, nil
-	}
-	return nil, err
-}
-
-func IncomingWebhookRequestFromJson(data io.Reader) (*IncomingWebhookRequest, *AppError) {
-	buf := new(bytes.Buffer)
-	buf.ReadFrom(data)
-	by := buf.Bytes()
-
-	// Try to decode the JSON data. Only if it fails, try to escape control
-	// characters from the strings contained in the JSON data.
-	o, err := decodeIncomingWebhookRequest(by)
-	if err != nil {
-		o, err = decodeIncomingWebhookRequest(escapeControlCharsFromPayload(by))
-		if err != nil {
-			return nil, NewAppError("IncomingWebhookRequestFromJson", "model.incoming_hook.parse_data.app_error", nil, err.Error(), http.StatusBadRequest)
-		}
-	}
-
-	o.Attachments = StringifySlackFieldValue(o.Attachments)
-
-	return o, nil
-}
-
-func (o *IncomingWebhookRequest) ToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return ""
-	}
-	return string(b)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/initial_load.go b/vendor/github.com/mattermost/mattermost-server/v5/model/initial_load.go
deleted file mode 100644
index c533faa5..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/initial_load.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type InitialLoad struct {
-	User        *User             `json:"user"`
-	TeamMembers []*TeamMember     `json:"team_members"`
-	Teams       []*Team           `json:"teams"`
-	Preferences Preferences       `json:"preferences"`
-	ClientCfg   map[string]string `json:"client_cfg"`
-	LicenseCfg  map[string]string `json:"license_cfg"`
-	NoAccounts  bool              `json:"no_accounts"`
-}
-
-func (il *InitialLoad) ToJson() string {
-	b, _ := json.Marshal(il)
-	return string(b)
-}
-
-func InitialLoadFromJson(data io.Reader) *InitialLoad {
-	var il *InitialLoad
-	json.NewDecoder(data).Decode(&il)
-	return il
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/integration_action.go b/vendor/github.com/mattermost/mattermost-server/v5/model/integration_action.go
deleted file mode 100644
index 7124a7e3..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/integration_action.go
+++ /dev/null
@@ -1,532 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"crypto"
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/ecdsa"
-	"crypto/rand"
-	"encoding/asn1"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"math/big"
-	"net/http"
-	"reflect"
-	"strconv"
-	"strings"
-)
-
-const (
-	POST_ACTION_TYPE_BUTTON                         = "button"
-	POST_ACTION_TYPE_SELECT                         = "select"
-	INTERACTIVE_DIALOG_TRIGGER_TIMEOUT_MILLISECONDS = 3000
-)
-
-var PostActionRetainPropKeys = []string{"from_webhook", "override_username", "override_icon_url"}
-
-type DoPostActionRequest struct {
-	SelectedOption string `json:"selected_option,omitempty"`
-	Cookie         string `json:"cookie,omitempty"`
-}
-
-type PostAction struct {
-	// A unique Action ID. If not set, generated automatically.
-	Id string `json:"id,omitempty"`
-
-	// The type of the interactive element. Currently supported are
-	// "select" and "button".
-	Type string `json:"type,omitempty"`
-
-	// The text on the button, or in the select placeholder.
-	Name string `json:"name,omitempty"`
-
-	// If the action is disabled.
-	Disabled bool `json:"disabled,omitempty"`
-
-	// Style defines a text and border style.
-	// Supported values are "default", "primary", "success", "good", "warning", "danger"
-	// and any hex color.
-	Style string `json:"style,omitempty"`
-
-	// DataSource indicates the data source for the select action. If left
-	// empty, the select is populated from Options. Other supported values
-	// are "users" and "channels".
-	DataSource string `json:"data_source,omitempty"`
-
-	// Options contains the values listed in a select dropdown on the post.
-	Options []*PostActionOptions `json:"options,omitempty"`
-
-	// DefaultOption contains the option, if any, that will appear as the
-	// default selection in a select box. It has no effect when used with
-	// other types of actions.
-	DefaultOption string `json:"default_option,omitempty"`
-
-	// Defines the interaction with the backend upon a user action.
-	// Integration contains Context, which is private plugin data;
-	// Integrations are stripped from Posts when they are sent to the
-	// client, or are encrypted in a Cookie.
-	Integration *PostActionIntegration `json:"integration,omitempty"`
-	Cookie      string                 `json:"cookie,omitempty" db:"-"`
-}
-
-func (p *PostAction) Equals(input *PostAction) bool {
-	if p.Id != input.Id {
-		return false
-	}
-
-	if p.Type != input.Type {
-		return false
-	}
-
-	if p.Name != input.Name {
-		return false
-	}
-
-	if p.DataSource != input.DataSource {
-		return false
-	}
-
-	if p.DefaultOption != input.DefaultOption {
-		return false
-	}
-
-	if p.Cookie != input.Cookie {
-		return false
-	}
-
-	// Compare PostActionOptions
-	if len(p.Options) != len(input.Options) {
-		return false
-	}
-
-	for k := range p.Options {
-		if p.Options[k].Text != input.Options[k].Text {
-			return false
-		}
-
-		if p.Options[k].Value != input.Options[k].Value {
-			return false
-		}
-	}
-
-	// Compare PostActionIntegration
-	if p.Integration.URL != input.Integration.URL {
-		return false
-	}
-
-	if len(p.Integration.Context) != len(input.Integration.Context) {
-		return false
-	}
-
-	for key, value := range p.Integration.Context {
-		inputValue, ok := input.Integration.Context[key]
-		if !ok {
-			return false
-		}
-
-		switch inputValue.(type) {
-		case string, bool, int, float64:
-			if value != inputValue {
-				return false
-			}
-		default:
-			if !reflect.DeepEqual(value, inputValue) {
-				return false
-			}
-		}
-	}
-
-	return true
-}
-
-// PostActionCookie is set by the server, serialized and encrypted into
-// PostAction.Cookie. The clients should hold on to it, and include it with
-// subsequent DoPostAction requests.  This allows the server to access the
-// action metadata even when it's not available in the database, for ephemeral
-// posts.
-type PostActionCookie struct {
-	Type        string                 `json:"type,omitempty"`
-	PostId      string                 `json:"post_id,omitempty"`
-	RootPostId  string                 `json:"root_post_id,omitempty"`
-	ChannelId   string                 `json:"channel_id,omitempty"`
-	DataSource  string                 `json:"data_source,omitempty"`
-	Integration *PostActionIntegration `json:"integration,omitempty"`
-	RetainProps map[string]interface{} `json:"retain_props,omitempty"`
-	RemoveProps []string               `json:"remove_props,omitempty"`
-}
-
-type PostActionOptions struct {
-	Text  string `json:"text"`
-	Value string `json:"value"`
-}
-
-type PostActionIntegration struct {
-	URL     string                 `json:"url,omitempty"`
-	Context map[string]interface{} `json:"context,omitempty"`
-}
-
-type PostActionIntegrationRequest struct {
-	UserId      string                 `json:"user_id"`
-	UserName    string                 `json:"user_name"`
-	ChannelId   string                 `json:"channel_id"`
-	ChannelName string                 `json:"channel_name"`
-	TeamId      string                 `json:"team_id"`
-	TeamName    string                 `json:"team_domain"`
-	PostId      string                 `json:"post_id"`
-	TriggerId   string                 `json:"trigger_id"`
-	Type        string                 `json:"type"`
-	DataSource  string                 `json:"data_source"`
-	Context     map[string]interface{} `json:"context,omitempty"`
-}
-
-type PostActionIntegrationResponse struct {
-	Update           *Post  `json:"update"`
-	EphemeralText    string `json:"ephemeral_text"`
-	SkipSlackParsing bool   `json:"skip_slack_parsing"` // Set to `true` to skip the Slack-compatibility handling of Text.
-}
-
-type PostActionAPIResponse struct {
-	Status    string `json:"status"` // needed to maintain backwards compatibility
-	TriggerId string `json:"trigger_id"`
-}
-
-type Dialog struct {
-	CallbackId       string          `json:"callback_id"`
-	Title            string          `json:"title"`
-	IntroductionText string          `json:"introduction_text"`
-	IconURL          string          `json:"icon_url"`
-	Elements         []DialogElement `json:"elements"`
-	SubmitLabel      string          `json:"submit_label"`
-	NotifyOnCancel   bool            `json:"notify_on_cancel"`
-	State            string          `json:"state"`
-}
-
-type DialogElement struct {
-	DisplayName string               `json:"display_name"`
-	Name        string               `json:"name"`
-	Type        string               `json:"type"`
-	SubType     string               `json:"subtype"`
-	Default     string               `json:"default"`
-	Placeholder string               `json:"placeholder"`
-	HelpText    string               `json:"help_text"`
-	Optional    bool                 `json:"optional"`
-	MinLength   int                  `json:"min_length"`
-	MaxLength   int                  `json:"max_length"`
-	DataSource  string               `json:"data_source"`
-	Options     []*PostActionOptions `json:"options"`
-}
-
-type OpenDialogRequest struct {
-	TriggerId string `json:"trigger_id"`
-	URL       string `json:"url"`
-	Dialog    Dialog `json:"dialog"`
-}
-
-type SubmitDialogRequest struct {
-	Type       string                 `json:"type"`
-	URL        string                 `json:"url,omitempty"`
-	CallbackId string                 `json:"callback_id"`
-	State      string                 `json:"state"`
-	UserId     string                 `json:"user_id"`
-	ChannelId  string                 `json:"channel_id"`
-	TeamId     string                 `json:"team_id"`
-	Submission map[string]interface{} `json:"submission"`
-	Cancelled  bool                   `json:"cancelled"`
-}
-
-type SubmitDialogResponse struct {
-	Error  string            `json:"error,omitempty"`
-	Errors map[string]string `json:"errors,omitempty"`
-}
-
-func GenerateTriggerId(userId string, s crypto.Signer) (string, string, *AppError) {
-	clientTriggerId := NewId()
-	triggerData := strings.Join([]string{clientTriggerId, userId, strconv.FormatInt(GetMillis(), 10)}, ":") + ":"
-
-	h := crypto.SHA256
-	sum := h.New()
-	sum.Write([]byte(triggerData))
-	signature, err := s.Sign(rand.Reader, sum.Sum(nil), h)
-	if err != nil {
-		return "", "", NewAppError("GenerateTriggerId", "interactive_message.generate_trigger_id.signing_failed", nil, err.Error(), http.StatusInternalServerError)
-	}
-
-	base64Sig := base64.StdEncoding.EncodeToString(signature)
-
-	triggerId := base64.StdEncoding.EncodeToString([]byte(triggerData + base64Sig))
-	return clientTriggerId, triggerId, nil
-}
-
-func (r *PostActionIntegrationRequest) GenerateTriggerId(s crypto.Signer) (string, string, *AppError) {
-	clientTriggerId, triggerId, err := GenerateTriggerId(r.UserId, s)
-	if err != nil {
-		return "", "", err
-	}
-
-	r.TriggerId = triggerId
-	return clientTriggerId, triggerId, nil
-}
-
-func DecodeAndVerifyTriggerId(triggerId string, s *ecdsa.PrivateKey) (string, string, *AppError) {
-	triggerIdBytes, err := base64.StdEncoding.DecodeString(triggerId)
-	if err != nil {
-		return "", "", NewAppError("DecodeAndVerifyTriggerId", "interactive_message.decode_trigger_id.base64_decode_failed", nil, err.Error(), http.StatusBadRequest)
-	}
-
-	split := strings.Split(string(triggerIdBytes), ":")
-	if len(split) != 4 {
-		return "", "", NewAppError("DecodeAndVerifyTriggerId", "interactive_message.decode_trigger_id.missing_data", nil, "", http.StatusBadRequest)
-	}
-
-	clientTriggerId := split[0]
-	userId := split[1]
-	timestampStr := split[2]
-	timestamp, _ := strconv.ParseInt(timestampStr, 10, 64)
-
-	now := GetMillis()
-	if now-timestamp > INTERACTIVE_DIALOG_TRIGGER_TIMEOUT_MILLISECONDS {
-		return "", "", NewAppError("DecodeAndVerifyTriggerId", "interactive_message.decode_trigger_id.expired", map[string]interface{}{"Seconds": INTERACTIVE_DIALOG_TRIGGER_TIMEOUT_MILLISECONDS / 1000}, "", http.StatusBadRequest)
-	}
-
-	signature, err := base64.StdEncoding.DecodeString(split[3])
-	if err != nil {
-		return "", "", NewAppError("DecodeAndVerifyTriggerId", "interactive_message.decode_trigger_id.base64_decode_failed_signature", nil, err.Error(), http.StatusBadRequest)
-	}
-
-	var esig struct {
-		R, S *big.Int
-	}
-
-	if _, err := asn1.Unmarshal(signature, &esig); err != nil {
-		return "", "", NewAppError("DecodeAndVerifyTriggerId", "interactive_message.decode_trigger_id.signature_decode_failed", nil, err.Error(), http.StatusBadRequest)
-	}
-
-	triggerData := strings.Join([]string{clientTriggerId, userId, timestampStr}, ":") + ":"
-
-	h := crypto.SHA256
-	sum := h.New()
-	sum.Write([]byte(triggerData))
-
-	if !ecdsa.Verify(&s.PublicKey, sum.Sum(nil), esig.R, esig.S) {
-		return "", "", NewAppError("DecodeAndVerifyTriggerId", "interactive_message.decode_trigger_id.verify_signature_failed", nil, "", http.StatusBadRequest)
-	}
-
-	return clientTriggerId, userId, nil
-}
-
-func (r *OpenDialogRequest) DecodeAndVerifyTriggerId(s *ecdsa.PrivateKey) (string, string, *AppError) {
-	return DecodeAndVerifyTriggerId(r.TriggerId, s)
-}
-
-func (r *PostActionIntegrationRequest) ToJson() []byte {
-	b, _ := json.Marshal(r)
-	return b
-}
-
-func PostActionIntegrationRequestFromJson(data io.Reader) *PostActionIntegrationRequest {
-	var o *PostActionIntegrationRequest
-	err := json.NewDecoder(data).Decode(&o)
-	if err != nil {
-		return nil
-	}
-	return o
-}
-
-func (r *PostActionIntegrationResponse) ToJson() []byte {
-	b, _ := json.Marshal(r)
-	return b
-}
-
-func PostActionIntegrationResponseFromJson(data io.Reader) *PostActionIntegrationResponse {
-	var o *PostActionIntegrationResponse
-	err := json.NewDecoder(data).Decode(&o)
-	if err != nil {
-		return nil
-	}
-	return o
-}
-
-func SubmitDialogRequestFromJson(data io.Reader) *SubmitDialogRequest {
-	var o *SubmitDialogRequest
-	err := json.NewDecoder(data).Decode(&o)
-	if err != nil {
-		return nil
-	}
-	return o
-}
-
-func (r *SubmitDialogRequest) ToJson() []byte {
-	b, _ := json.Marshal(r)
-	return b
-}
-
-func SubmitDialogResponseFromJson(data io.Reader) *SubmitDialogResponse {
-	var o *SubmitDialogResponse
-	err := json.NewDecoder(data).Decode(&o)
-	if err != nil {
-		return nil
-	}
-	return o
-}
-
-func (r *SubmitDialogResponse) ToJson() []byte {
-	b, _ := json.Marshal(r)
-	return b
-}
-
-func (o *Post) StripActionIntegrations() {
-	attachments := o.Attachments()
-	if o.GetProp("attachments") != nil {
-		o.AddProp("attachments", attachments)
-	}
-	for _, attachment := range attachments {
-		for _, action := range attachment.Actions {
-			action.Integration = nil
-		}
-	}
-}
-
-func (o *Post) GetAction(id string) *PostAction {
-	for _, attachment := range o.Attachments() {
-		for _, action := range attachment.Actions {
-			if action != nil && action.Id == id {
-				return action
-			}
-		}
-	}
-	return nil
-}
-
-func (o *Post) GenerateActionIds() {
-	if o.GetProp("attachments") != nil {
-		o.AddProp("attachments", o.Attachments())
-	}
-	if attachments, ok := o.GetProp("attachments").([]*SlackAttachment); ok {
-		for _, attachment := range attachments {
-			for _, action := range attachment.Actions {
-				if action != nil && action.Id == "" {
-					action.Id = NewId()
-				}
-			}
-		}
-	}
-}
-
-func AddPostActionCookies(o *Post, secret []byte) *Post {
-	p := o.Clone()
-
-	// retainedProps carry over their value from the old post, including no value
-	retainProps := map[string]interface{}{}
-	removeProps := []string{}
-	for _, key := range PostActionRetainPropKeys {
-		value, ok := p.GetProps()[key]
-		if ok {
-			retainProps[key] = value
-		} else {
-			removeProps = append(removeProps, key)
-		}
-	}
-
-	attachments := p.Attachments()
-	for _, attachment := range attachments {
-		for _, action := range attachment.Actions {
-			c := &PostActionCookie{
-				Type:        action.Type,
-				ChannelId:   p.ChannelId,
-				DataSource:  action.DataSource,
-				Integration: action.Integration,
-				RetainProps: retainProps,
-				RemoveProps: removeProps,
-			}
-
-			c.PostId = p.Id
-			if p.RootId == "" {
-				c.RootPostId = p.Id
-			} else {
-				c.RootPostId = p.RootId
-			}
-
-			b, _ := json.Marshal(c)
-			action.Cookie, _ = encryptPostActionCookie(string(b), secret)
-		}
-	}
-
-	return p
-}
-
-func encryptPostActionCookie(plain string, secret []byte) (string, error) {
-	if len(secret) == 0 {
-		return plain, nil
-	}
-
-	block, err := aes.NewCipher(secret)
-	if err != nil {
-		return "", err
-	}
-
-	aesgcm, err := cipher.NewGCM(block)
-	if err != nil {
-		return "", err
-	}
-
-	nonce := make([]byte, aesgcm.NonceSize())
-	_, err = io.ReadFull(rand.Reader, nonce)
-	if err != nil {
-		return "", err
-	}
-
-	sealed := aesgcm.Seal(nil, nonce, []byte(plain), nil)
-
-	combined := append(nonce, sealed...)
-	encoded := make([]byte, base64.StdEncoding.EncodedLen(len(combined)))
-	base64.StdEncoding.Encode(encoded, combined)
-
-	return string(encoded), nil
-}
-
-func DecryptPostActionCookie(encoded string, secret []byte) (string, error) {
-	if len(secret) == 0 {
-		return encoded, nil
-	}
-
-	block, err := aes.NewCipher(secret)
-	if err != nil {
-		return "", err
-	}
-
-	aesgcm, err := cipher.NewGCM(block)
-	if err != nil {
-		return "", err
-	}
-
-	decoded := make([]byte, base64.StdEncoding.DecodedLen(len(encoded)))
-	n, err := base64.StdEncoding.Decode(decoded, []byte(encoded))
-	if err != nil {
-		return "", err
-	}
-	decoded = decoded[:n]
-
-	nonceSize := aesgcm.NonceSize()
-	if len(decoded) < nonceSize {
-		return "", fmt.Errorf("cookie too short")
-	}
-
-	nonce, decoded := decoded[:nonceSize], decoded[nonceSize:]
-	plain, err := aesgcm.Open(nil, nonce, decoded, nil)
-	if err != nil {
-		return "", err
-	}
-
-	return string(plain), nil
-}
-
-func DoPostActionRequestFromJson(data io.Reader) *DoPostActionRequest {
-	var o *DoPostActionRequest
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/integrity.go b/vendor/github.com/mattermost/mattermost-server/v5/model/integrity.go
deleted file mode 100644
index 744ad07c..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/integrity.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"errors"
-)
-
-type OrphanedRecord struct {
-	ParentId *string `json:"parent_id"`
-	ChildId  *string `json:"child_id"`
-}
-
-type RelationalIntegrityCheckData struct {
-	ParentName   string           `json:"parent_name"`
-	ChildName    string           `json:"child_name"`
-	ParentIdAttr string           `json:"parent_id_attr"`
-	ChildIdAttr  string           `json:"child_id_attr"`
-	Records      []OrphanedRecord `json:"records"`
-}
-
-type IntegrityCheckResult struct {
-	Data interface{} `json:"data"`
-	Err  error       `json:"err"`
-}
-
-func (r *IntegrityCheckResult) UnmarshalJSON(b []byte) error {
-	var data map[string]interface{}
-	if err := json.Unmarshal(b, &data); err != nil {
-		return err
-	}
-	if d, ok := data["data"]; ok && d != nil {
-		var rdata RelationalIntegrityCheckData
-		m := d.(map[string]interface{})
-		rdata.ParentName = m["parent_name"].(string)
-		rdata.ChildName = m["child_name"].(string)
-		rdata.ParentIdAttr = m["parent_id_attr"].(string)
-		rdata.ChildIdAttr = m["child_id_attr"].(string)
-		for _, recData := range m["records"].([]interface{}) {
-			var record OrphanedRecord
-			m := recData.(map[string]interface{})
-			if val := m["parent_id"]; val != nil {
-				record.ParentId = NewString(val.(string))
-			}
-			if val := m["child_id"]; val != nil {
-				record.ChildId = NewString(val.(string))
-			}
-			rdata.Records = append(rdata.Records, record)
-		}
-		r.Data = rdata
-	}
-	if err, ok := data["err"]; ok && err != nil {
-		r.Err = errors.New(data["err"].(string))
-	}
-	return nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/job.go b/vendor/github.com/mattermost/mattermost-server/v5/model/job.go
deleted file mode 100644
index 78d5a4ff..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/job.go
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-	"time"
-)
-
-const (
-	JOB_TYPE_DATA_RETENTION                 = "data_retention"
-	JOB_TYPE_MESSAGE_EXPORT                 = "message_export"
-	JOB_TYPE_ELASTICSEARCH_POST_INDEXING    = "elasticsearch_post_indexing"
-	JOB_TYPE_ELASTICSEARCH_POST_AGGREGATION = "elasticsearch_post_aggregation"
-	JOB_TYPE_BLEVE_POST_INDEXING            = "bleve_post_indexing"
-	JOB_TYPE_LDAP_SYNC                      = "ldap_sync"
-	JOB_TYPE_MIGRATIONS                     = "migrations"
-	JOB_TYPE_PLUGINS                        = "plugins"
-	JOB_TYPE_EXPIRY_NOTIFY                  = "expiry_notify"
-	JOB_TYPE_PRODUCT_NOTICES                = "product_notices"
-	JOB_TYPE_ACTIVE_USERS                   = "active_users"
-	JOB_TYPE_IMPORT_PROCESS                 = "import_process"
-	JOB_TYPE_IMPORT_DELETE                  = "import_delete"
-	JOB_TYPE_EXPORT_PROCESS                 = "export_process"
-	JOB_TYPE_EXPORT_DELETE                  = "export_delete"
-	JOB_TYPE_CLOUD                          = "cloud"
-	JOB_TYPE_RESEND_INVITATION_EMAIL        = "resend_invitation_email"
-
-	JOB_STATUS_PENDING          = "pending"
-	JOB_STATUS_IN_PROGRESS      = "in_progress"
-	JOB_STATUS_SUCCESS          = "success"
-	JOB_STATUS_ERROR            = "error"
-	JOB_STATUS_CANCEL_REQUESTED = "cancel_requested"
-	JOB_STATUS_CANCELED         = "canceled"
-	JOB_STATUS_WARNING          = "warning"
-)
-
-var ALL_JOB_TYPES = [...]string{
-	JOB_TYPE_DATA_RETENTION,
-	JOB_TYPE_MESSAGE_EXPORT,
-	JOB_TYPE_ELASTICSEARCH_POST_INDEXING,
-	JOB_TYPE_ELASTICSEARCH_POST_AGGREGATION,
-	JOB_TYPE_BLEVE_POST_INDEXING,
-	JOB_TYPE_LDAP_SYNC,
-	JOB_TYPE_MIGRATIONS,
-	JOB_TYPE_PLUGINS,
-	JOB_TYPE_EXPIRY_NOTIFY,
-	JOB_TYPE_PRODUCT_NOTICES,
-	JOB_TYPE_ACTIVE_USERS,
-	JOB_TYPE_IMPORT_PROCESS,
-	JOB_TYPE_IMPORT_DELETE,
-	JOB_TYPE_EXPORT_PROCESS,
-	JOB_TYPE_EXPORT_DELETE,
-	JOB_TYPE_CLOUD,
-}
-
-type Job struct {
-	Id             string            `json:"id"`
-	Type           string            `json:"type"`
-	Priority       int64             `json:"priority"`
-	CreateAt       int64             `json:"create_at"`
-	StartAt        int64             `json:"start_at"`
-	LastActivityAt int64             `json:"last_activity_at"`
-	Status         string            `json:"status"`
-	Progress       int64             `json:"progress"`
-	Data           map[string]string `json:"data"`
-}
-
-func (j *Job) IsValid() *AppError {
-	if !IsValidId(j.Id) {
-		return NewAppError("Job.IsValid", "model.job.is_valid.id.app_error", nil, "id="+j.Id, http.StatusBadRequest)
-	}
-
-	if j.CreateAt == 0 {
-		return NewAppError("Job.IsValid", "model.job.is_valid.create_at.app_error", nil, "id="+j.Id, http.StatusBadRequest)
-	}
-
-	switch j.Type {
-	case JOB_TYPE_DATA_RETENTION:
-	case JOB_TYPE_ELASTICSEARCH_POST_INDEXING:
-	case JOB_TYPE_ELASTICSEARCH_POST_AGGREGATION:
-	case JOB_TYPE_BLEVE_POST_INDEXING:
-	case JOB_TYPE_LDAP_SYNC:
-	case JOB_TYPE_MESSAGE_EXPORT:
-	case JOB_TYPE_MIGRATIONS:
-	case JOB_TYPE_PLUGINS:
-	case JOB_TYPE_PRODUCT_NOTICES:
-	case JOB_TYPE_EXPIRY_NOTIFY:
-	case JOB_TYPE_ACTIVE_USERS:
-	case JOB_TYPE_IMPORT_PROCESS:
-	case JOB_TYPE_IMPORT_DELETE:
-	case JOB_TYPE_EXPORT_PROCESS:
-	case JOB_TYPE_EXPORT_DELETE:
-	case JOB_TYPE_CLOUD:
-	case JOB_TYPE_RESEND_INVITATION_EMAIL:
-	default:
-		return NewAppError("Job.IsValid", "model.job.is_valid.type.app_error", nil, "id="+j.Id, http.StatusBadRequest)
-	}
-
-	switch j.Status {
-	case JOB_STATUS_PENDING:
-	case JOB_STATUS_IN_PROGRESS:
-	case JOB_STATUS_SUCCESS:
-	case JOB_STATUS_ERROR:
-	case JOB_STATUS_CANCEL_REQUESTED:
-	case JOB_STATUS_CANCELED:
-	default:
-		return NewAppError("Job.IsValid", "model.job.is_valid.status.app_error", nil, "id="+j.Id, http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (j *Job) ToJson() string {
-	b, _ := json.Marshal(j)
-	return string(b)
-}
-
-func JobFromJson(data io.Reader) *Job {
-	var job Job
-	if err := json.NewDecoder(data).Decode(&job); err == nil {
-		return &job
-	}
-	return nil
-}
-
-func JobsToJson(jobs []*Job) string {
-	b, _ := json.Marshal(jobs)
-	return string(b)
-}
-
-func JobsFromJson(data io.Reader) []*Job {
-	var jobs []*Job
-	if err := json.NewDecoder(data).Decode(&jobs); err == nil {
-		return jobs
-	}
-	return nil
-}
-
-func (j *Job) DataToJson() string {
-	b, _ := json.Marshal(j.Data)
-	return string(b)
-}
-
-type Worker interface {
-	Run()
-	Stop()
-	JobChannel() chan<- Job
-}
-
-type Scheduler interface {
-	Name() string
-	JobType() string
-	Enabled(cfg *Config) bool
-	NextScheduleTime(cfg *Config, now time.Time, pendingJobs bool, lastSuccessfulJob *Job) *time.Time
-	ScheduleJob(cfg *Config, pendingJobs bool, lastSuccessfulJob *Job) (*Job, *AppError)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/ldap.go b/vendor/github.com/mattermost/mattermost-server/v5/model/ldap.go
deleted file mode 100644
index 1262dfb8..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/ldap.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-const (
-	USER_AUTH_SERVICE_LDAP       = "ldap"
-	LDAP_PUBLIC_CERTIFICATE_NAME = "ldap-public.crt"
-	LDAP_PRIVATE_KEY_NAME        = "ldap-private.key"
-)
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/license.go b/vendor/github.com/mattermost/mattermost-server/v5/model/license.go
deleted file mode 100644
index ab9e481a..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/license.go
+++ /dev/null
@@ -1,350 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"time"
-)
-
-const (
-	EXPIRED_LICENSE_ERROR = "api.license.add_license.expired.app_error"
-	INVALID_LICENSE_ERROR = "api.license.add_license.invalid.app_error"
-	LICENSE_GRACE_PERIOD  = 1000 * 60 * 60 * 24 * 10 //10 days
-	LICENSE_RENEWAL_LINK  = "https://mattermost.com/renew/"
-)
-
-const (
-	SIXTY_DAYS                        = 60
-	FIFTY_EIGHT                       = 58
-	LICENSE_UP_FOR_RENEWAL_EMAIL_SENT = "LicenseUpForRenewalEmailSent"
-)
-
-var (
-	trialDuration      = 30*(time.Hour*24) + (time.Hour * 8)                                            // 720 hours (30 days) + 8 hours is trial license duration
-	adminTrialDuration = 30*(time.Hour*24) + (time.Hour * 23) + (time.Minute * 59) + (time.Second * 59) // 720 hours (30 days) + 23 hours, 59 mins and 59 seconds
-
-	// a sanctioned trial's duration is either more than the upper bound,
-	// or less than the lower bound
-	sanctionedTrialDurationLowerBound = 31*(time.Hour*24) + (time.Hour * 23) + (time.Minute * 59) + (time.Second * 59) // 744 hours (31 days) + 23 hours, 59 mins and 59 seconds
-	sanctionedTrialDurationUpperBound = 29*(time.Hour*24) + (time.Hour * 23) + (time.Minute * 59) + (time.Second * 59) // 696 hours (29 days) + 23 hours, 59 mins and 59 seconds
-)
-
-type LicenseRecord struct {
-	Id       string `json:"id"`
-	CreateAt int64  `json:"create_at"`
-	Bytes    string `json:"-"`
-}
-
-type License struct {
-	Id           string    `json:"id"`
-	IssuedAt     int64     `json:"issued_at"`
-	StartsAt     int64     `json:"starts_at"`
-	ExpiresAt    int64     `json:"expires_at"`
-	Customer     *Customer `json:"customer"`
-	Features     *Features `json:"features"`
-	SkuName      string    `json:"sku_name"`
-	SkuShortName string    `json:"sku_short_name"`
-	IsTrial      bool      `json:"is_trial"`
-}
-
-type Customer struct {
-	Id      string `json:"id"`
-	Name    string `json:"name"`
-	Email   string `json:"email"`
-	Company string `json:"company"`
-}
-
-type TrialLicenseRequest struct {
-	ServerID              string `json:"server_id"`
-	Email                 string `json:"email"`
-	Name                  string `json:"name"`
-	SiteURL               string `json:"site_url"`
-	SiteName              string `json:"site_name"`
-	Users                 int    `json:"users"`
-	TermsAccepted         bool   `json:"terms_accepted"`
-	ReceiveEmailsAccepted bool   `json:"receive_emails_accepted"`
-}
-
-func (tlr *TrialLicenseRequest) ToJson() string {
-	b, _ := json.Marshal(tlr)
-	return string(b)
-}
-
-type Features struct {
-	Users                     *int  `json:"users"`
-	LDAP                      *bool `json:"ldap"`
-	LDAPGroups                *bool `json:"ldap_groups"`
-	MFA                       *bool `json:"mfa"`
-	GoogleOAuth               *bool `json:"google_oauth"`
-	Office365OAuth            *bool `json:"office365_oauth"`
-	OpenId                    *bool `json:"openid"`
-	Compliance                *bool `json:"compliance"`
-	Cluster                   *bool `json:"cluster"`
-	Metrics                   *bool `json:"metrics"`
-	MHPNS                     *bool `json:"mhpns"`
-	SAML                      *bool `json:"saml"`
-	Elasticsearch             *bool `json:"elastic_search"`
-	Announcement              *bool `json:"announcement"`
-	ThemeManagement           *bool `json:"theme_management"`
-	EmailNotificationContents *bool `json:"email_notification_contents"`
-	DataRetention             *bool `json:"data_retention"`
-	MessageExport             *bool `json:"message_export"`
-	CustomPermissionsSchemes  *bool `json:"custom_permissions_schemes"`
-	CustomTermsOfService      *bool `json:"custom_terms_of_service"`
-	GuestAccounts             *bool `json:"guest_accounts"`
-	GuestAccountsPermissions  *bool `json:"guest_accounts_permissions"`
-	IDLoadedPushNotifications *bool `json:"id_loaded"`
-	LockTeammateNameDisplay   *bool `json:"lock_teammate_name_display"`
-	EnterprisePlugins         *bool `json:"enterprise_plugins"`
-	AdvancedLogging           *bool `json:"advanced_logging"`
-	Cloud                     *bool `json:"cloud"`
-	SharedChannels            *bool `json:"shared_channels"`
-	RemoteClusterService      *bool `json:"remote_cluster_service"`
-
-	// after we enabled more features we'll need to control them with this
-	FutureFeatures *bool `json:"future_features"`
-}
-
-func (f *Features) ToMap() map[string]interface{} {
-	return map[string]interface{}{
-		"ldap":                        *f.LDAP,
-		"ldap_groups":                 *f.LDAPGroups,
-		"mfa":                         *f.MFA,
-		"google":                      *f.GoogleOAuth,
-		"office365":                   *f.Office365OAuth,
-		"openid":                      *f.OpenId,
-		"compliance":                  *f.Compliance,
-		"cluster":                     *f.Cluster,
-		"metrics":                     *f.Metrics,
-		"mhpns":                       *f.MHPNS,
-		"saml":                        *f.SAML,
-		"elastic_search":              *f.Elasticsearch,
-		"email_notification_contents": *f.EmailNotificationContents,
-		"data_retention":              *f.DataRetention,
-		"message_export":              *f.MessageExport,
-		"custom_permissions_schemes":  *f.CustomPermissionsSchemes,
-		"guest_accounts":              *f.GuestAccounts,
-		"guest_accounts_permissions":  *f.GuestAccountsPermissions,
-		"id_loaded":                   *f.IDLoadedPushNotifications,
-		"lock_teammate_name_display":  *f.LockTeammateNameDisplay,
-		"enterprise_plugins":          *f.EnterprisePlugins,
-		"advanced_logging":            *f.AdvancedLogging,
-		"cloud":                       *f.Cloud,
-		"shared_channels":             *f.SharedChannels,
-		"remote_cluster_service":      *f.RemoteClusterService,
-		"future":                      *f.FutureFeatures,
-	}
-}
-
-func (f *Features) SetDefaults() {
-	if f.FutureFeatures == nil {
-		f.FutureFeatures = NewBool(true)
-	}
-
-	if f.Users == nil {
-		f.Users = NewInt(0)
-	}
-
-	if f.LDAP == nil {
-		f.LDAP = NewBool(*f.FutureFeatures)
-	}
-
-	if f.LDAPGroups == nil {
-		f.LDAPGroups = NewBool(*f.FutureFeatures)
-	}
-
-	if f.MFA == nil {
-		f.MFA = NewBool(*f.FutureFeatures)
-	}
-
-	if f.GoogleOAuth == nil {
-		f.GoogleOAuth = NewBool(*f.FutureFeatures)
-	}
-
-	if f.Office365OAuth == nil {
-		f.Office365OAuth = NewBool(*f.FutureFeatures)
-	}
-
-	if f.OpenId == nil {
-		f.OpenId = NewBool(*f.FutureFeatures)
-	}
-
-	if f.Compliance == nil {
-		f.Compliance = NewBool(*f.FutureFeatures)
-	}
-
-	if f.Cluster == nil {
-		f.Cluster = NewBool(*f.FutureFeatures)
-	}
-
-	if f.Metrics == nil {
-		f.Metrics = NewBool(*f.FutureFeatures)
-	}
-
-	if f.MHPNS == nil {
-		f.MHPNS = NewBool(*f.FutureFeatures)
-	}
-
-	if f.SAML == nil {
-		f.SAML = NewBool(*f.FutureFeatures)
-	}
-
-	if f.Elasticsearch == nil {
-		f.Elasticsearch = NewBool(*f.FutureFeatures)
-	}
-
-	if f.Announcement == nil {
-		f.Announcement = NewBool(true)
-	}
-
-	if f.ThemeManagement == nil {
-		f.ThemeManagement = NewBool(true)
-	}
-
-	if f.EmailNotificationContents == nil {
-		f.EmailNotificationContents = NewBool(*f.FutureFeatures)
-	}
-
-	if f.DataRetention == nil {
-		f.DataRetention = NewBool(*f.FutureFeatures)
-	}
-
-	if f.MessageExport == nil {
-		f.MessageExport = NewBool(*f.FutureFeatures)
-	}
-
-	if f.CustomPermissionsSchemes == nil {
-		f.CustomPermissionsSchemes = NewBool(*f.FutureFeatures)
-	}
-
-	if f.GuestAccounts == nil {
-		f.GuestAccounts = NewBool(*f.FutureFeatures)
-	}
-
-	if f.GuestAccountsPermissions == nil {
-		f.GuestAccountsPermissions = NewBool(*f.FutureFeatures)
-	}
-
-	if f.CustomTermsOfService == nil {
-		f.CustomTermsOfService = NewBool(*f.FutureFeatures)
-	}
-
-	if f.IDLoadedPushNotifications == nil {
-		f.IDLoadedPushNotifications = NewBool(*f.FutureFeatures)
-	}
-
-	if f.LockTeammateNameDisplay == nil {
-		f.LockTeammateNameDisplay = NewBool(*f.FutureFeatures)
-	}
-
-	if f.EnterprisePlugins == nil {
-		f.EnterprisePlugins = NewBool(*f.FutureFeatures)
-	}
-
-	if f.AdvancedLogging == nil {
-		f.AdvancedLogging = NewBool(*f.FutureFeatures)
-	}
-
-	if f.Cloud == nil {
-		f.Cloud = NewBool(false)
-	}
-
-	if f.SharedChannels == nil {
-		f.SharedChannels = NewBool(*f.FutureFeatures)
-	}
-
-	if f.RemoteClusterService == nil {
-		f.RemoteClusterService = NewBool(*f.FutureFeatures)
-	}
-}
-
-func (l *License) IsExpired() bool {
-	return l.ExpiresAt < GetMillis()
-}
-
-func (l *License) IsPastGracePeriod() bool {
-	timeDiff := GetMillis() - l.ExpiresAt
-	return timeDiff > LICENSE_GRACE_PERIOD
-}
-
-func (l *License) IsWithinExpirationPeriod() bool {
-	days := l.DaysToExpiration()
-	return days <= SIXTY_DAYS && days >= FIFTY_EIGHT
-}
-
-func (l *License) DaysToExpiration() int {
-	dif := l.ExpiresAt - GetMillis()
-	d, _ := time.ParseDuration(fmt.Sprint(dif) + "ms")
-	days := d.Hours() / 24
-	return int(days)
-}
-
-func (l *License) IsStarted() bool {
-	return l.StartsAt < GetMillis()
-}
-
-func (l *License) ToJson() string {
-	b, _ := json.Marshal(l)
-	return string(b)
-}
-
-func (l *License) IsTrialLicense() bool {
-	return l.IsTrial || (l.ExpiresAt-l.StartsAt) == trialDuration.Milliseconds() || (l.ExpiresAt-l.StartsAt) == adminTrialDuration.Milliseconds()
-}
-
-func (l *License) IsSanctionedTrial() bool {
-	duration := l.ExpiresAt - l.StartsAt
-
-	return l.IsTrialLicense() &&
-		(duration >= sanctionedTrialDurationLowerBound.Milliseconds() || duration <= sanctionedTrialDurationUpperBound.Milliseconds())
-}
-
-// NewTestLicense returns a license that expires in the future and has the given features.
-func NewTestLicense(features ...string) *License {
-	ret := &License{
-		ExpiresAt: GetMillis() + 90*24*60*60*1000,
-		Customer:  &Customer{},
-		Features:  &Features{},
-	}
-	ret.Features.SetDefaults()
-
-	featureMap := map[string]bool{}
-	for _, feature := range features {
-		featureMap[feature] = true
-	}
-	featureJson, _ := json.Marshal(featureMap)
-	json.Unmarshal(featureJson, &ret.Features)
-
-	return ret
-}
-
-func LicenseFromJson(data io.Reader) *License {
-	var o *License
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func (lr *LicenseRecord) IsValid() *AppError {
-	if !IsValidId(lr.Id) {
-		return NewAppError("LicenseRecord.IsValid", "model.license_record.is_valid.id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if lr.CreateAt == 0 {
-		return NewAppError("LicenseRecord.IsValid", "model.license_record.is_valid.create_at.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if lr.Bytes == "" || len(lr.Bytes) > 10000 {
-		return NewAppError("LicenseRecord.IsValid", "model.license_record.is_valid.create_at.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (lr *LicenseRecord) PreSave() {
-	lr.CreateAt = GetMillis()
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/link_metadata.go b/vendor/github.com/mattermost/mattermost-server/v5/model/link_metadata.go
deleted file mode 100644
index 6c3e0bd8..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/link_metadata.go
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/binary"
-	"encoding/json"
-	"fmt"
-	"hash/fnv"
-	"net/http"
-	"time"
-	"unicode/utf8"
-
-	"github.com/dyatlov/go-opengraph/opengraph"
-)
-
-const (
-	LINK_METADATA_TYPE_IMAGE     LinkMetadataType = "image"
-	LINK_METADATA_TYPE_NONE      LinkMetadataType = "none"
-	LINK_METADATA_TYPE_OPENGRAPH LinkMetadataType = "opengraph"
-	MAX_IMAGES                   int              = 5
-)
-
-type LinkMetadataType string
-
-// LinkMetadata stores arbitrary data about a link posted in a message. This includes dimensions of linked images
-// and OpenGraph metadata.
-type LinkMetadata struct {
-	// Hash is a value computed from the URL and Timestamp for use as a primary key in the database.
-	Hash int64
-
-	URL       string
-	Timestamp int64
-	Type      LinkMetadataType
-
-	// Data is the actual metadata for the link. It should contain data of one of the following types:
-	// - *model.PostImage if the linked content is an image
-	// - *opengraph.OpenGraph if the linked content is an HTML document
-	// - nil if the linked content has no metadata
-	Data interface{}
-}
-
-// truncateText ensure string is 300 chars, truncate and add ellipsis
-// if it was bigger.
-func truncateText(original string) string {
-	if utf8.RuneCountInString(original) > 300 {
-		return fmt.Sprintf("%.300s[...]", original)
-	}
-	return original
-}
-
-func firstNImages(images []*opengraph.Image, maxImages int) []*opengraph.Image {
-	if maxImages < 0 { // dont break stuff, if it's weird, go for sane defaults
-		maxImages = MAX_IMAGES
-	}
-	numImages := len(images)
-	if numImages > maxImages {
-		return images[0:maxImages]
-	}
-	return images
-}
-
-// TruncateOpenGraph ensure OpenGraph metadata doesn't grow too big by
-// shortening strings, trimming fields and reducing the number of
-// images.
-func TruncateOpenGraph(ogdata *opengraph.OpenGraph) *opengraph.OpenGraph {
-	if ogdata != nil {
-		empty := &opengraph.OpenGraph{}
-		ogdata.Title = truncateText(ogdata.Title)
-		ogdata.Description = truncateText(ogdata.Description)
-		ogdata.SiteName = truncateText(ogdata.SiteName)
-		ogdata.Article = empty.Article
-		ogdata.Book = empty.Book
-		ogdata.Profile = empty.Profile
-		ogdata.Determiner = empty.Determiner
-		ogdata.Locale = empty.Locale
-		ogdata.LocalesAlternate = empty.LocalesAlternate
-		ogdata.Images = firstNImages(ogdata.Images, MAX_IMAGES)
-		ogdata.Audios = empty.Audios
-		ogdata.Videos = empty.Videos
-	}
-	return ogdata
-}
-
-func (o *LinkMetadata) PreSave() {
-	o.Hash = GenerateLinkMetadataHash(o.URL, o.Timestamp)
-}
-
-func (o *LinkMetadata) IsValid() *AppError {
-	if o.URL == "" {
-		return NewAppError("LinkMetadata.IsValid", "model.link_metadata.is_valid.url.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.Timestamp == 0 || !isRoundedToNearestHour(o.Timestamp) {
-		return NewAppError("LinkMetadata.IsValid", "model.link_metadata.is_valid.timestamp.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	switch o.Type {
-	case LINK_METADATA_TYPE_IMAGE:
-		if o.Data == nil {
-			return NewAppError("LinkMetadata.IsValid", "model.link_metadata.is_valid.data.app_error", nil, "", http.StatusBadRequest)
-		}
-
-		if _, ok := o.Data.(*PostImage); !ok {
-			return NewAppError("LinkMetadata.IsValid", "model.link_metadata.is_valid.data_type.app_error", nil, "", http.StatusBadRequest)
-		}
-	case LINK_METADATA_TYPE_NONE:
-		if o.Data != nil {
-			return NewAppError("LinkMetadata.IsValid", "model.link_metadata.is_valid.data_type.app_error", nil, "", http.StatusBadRequest)
-		}
-	case LINK_METADATA_TYPE_OPENGRAPH:
-		if o.Data == nil {
-			return NewAppError("LinkMetadata.IsValid", "model.link_metadata.is_valid.data.app_error", nil, "", http.StatusBadRequest)
-		}
-
-		if _, ok := o.Data.(*opengraph.OpenGraph); !ok {
-			return NewAppError("LinkMetadata.IsValid", "model.link_metadata.is_valid.data_type.app_error", nil, "", http.StatusBadRequest)
-		}
-	default:
-		return NewAppError("LinkMetadata.IsValid", "model.link_metadata.is_valid.type.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-// DeserializeDataToConcreteType converts o.Data from JSON into properly structured data. This is intended to be used
-// after getting a LinkMetadata object that has been stored in the database.
-func (o *LinkMetadata) DeserializeDataToConcreteType() error {
-	var b []byte
-	switch t := o.Data.(type) {
-	case []byte:
-		// MySQL uses a byte slice for JSON
-		b = t
-	case string:
-		// Postgres uses a string for JSON
-		b = []byte(t)
-	}
-
-	if b == nil {
-		// Data doesn't need to be fixed
-		return nil
-	}
-
-	var data interface{}
-	var err error
-
-	switch o.Type {
-	case LINK_METADATA_TYPE_IMAGE:
-		image := &PostImage{}
-
-		err = json.Unmarshal(b, &image)
-
-		data = image
-	case LINK_METADATA_TYPE_OPENGRAPH:
-		og := &opengraph.OpenGraph{}
-
-		json.Unmarshal(b, &og)
-
-		data = og
-	}
-
-	if err != nil {
-		return err
-	}
-
-	o.Data = data
-
-	return nil
-}
-
-// FloorToNearestHour takes a timestamp (in milliseconds) and returns it rounded to the previous hour in UTC.
-func FloorToNearestHour(ms int64) int64 {
-	t := time.Unix(0, ms*int64(1000*1000)).UTC()
-
-	return time.Date(t.Year(), t.Month(), t.Day(), t.Hour(), 0, 0, 0, time.UTC).UnixNano() / int64(time.Millisecond)
-}
-
-// isRoundedToNearestHour returns true if the given timestamp (in milliseconds) has been rounded to the nearest hour in UTC.
-func isRoundedToNearestHour(ms int64) bool {
-	return FloorToNearestHour(ms) == ms
-}
-
-// GenerateLinkMetadataHash generates a unique hash for a given URL and timestamp for use as a database key.
-func GenerateLinkMetadataHash(url string, timestamp int64) int64 {
-	hash := fnv.New32()
-
-	// Note that we ignore write errors here because the Hash interface says that its Write will never return an error
-	binary.Write(hash, binary.LittleEndian, timestamp)
-	hash.Write([]byte(url))
-
-	return int64(hash.Sum32())
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/manifest.go b/vendor/github.com/mattermost/mattermost-server/v5/model/manifest.go
deleted file mode 100644
index 3fba0890..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/manifest.go
+++ /dev/null
@@ -1,570 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/blang/semver"
-	"github.com/pkg/errors"
-	"gopkg.in/yaml.v2"
-)
-
-type PluginOption struct {
-	// The display name for the option.
-	DisplayName string `json:"display_name" yaml:"display_name"`
-
-	// The string value for the option.
-	Value string `json:"value" yaml:"value"`
-}
-
-type PluginSettingType int
-
-const (
-	Bool PluginSettingType = iota
-	Dropdown
-	Generated
-	Radio
-	Text
-	LongText
-	Number
-	Username
-	Custom
-)
-
-type PluginSetting struct {
-	// The key that the setting will be assigned to in the configuration file.
-	Key string `json:"key" yaml:"key"`
-
-	// The display name for the setting.
-	DisplayName string `json:"display_name" yaml:"display_name"`
-
-	// The type of the setting.
-	//
-	// "bool" will result in a boolean true or false setting.
-	//
-	// "dropdown" will result in a string setting that allows the user to select from a list of
-	// pre-defined options.
-	//
-	// "generated" will result in a string setting that is set to a random, cryptographically secure
-	// string.
-	//
-	// "radio" will result in a string setting that allows the user to select from a short selection
-	// of pre-defined options.
-	//
-	// "text" will result in a string setting that can be typed in manually.
-	//
-	// "longtext" will result in a multi line string that can be typed in manually.
-	//
-	// "number" will result in in integer setting that can be typed in manually.
-	//
-	// "username" will result in a text setting that will autocomplete to a username.
-	//
-	// "custom" will result in a custom defined setting and will load the custom component registered for the Web App System Console.
-	Type string `json:"type" yaml:"type"`
-
-	// The help text to display to the user. Supports Markdown formatting.
-	HelpText string `json:"help_text" yaml:"help_text"`
-
-	// The help text to display alongside the "Regenerate" button for settings of the "generated" type.
-	RegenerateHelpText string `json:"regenerate_help_text,omitempty" yaml:"regenerate_help_text,omitempty"`
-
-	// The placeholder to display for "generated", "text", "longtext", "number" and "username" types when blank.
-	Placeholder string `json:"placeholder" yaml:"placeholder"`
-
-	// The default value of the setting.
-	Default interface{} `json:"default" yaml:"default"`
-
-	// For "radio" or "dropdown" settings, this is the list of pre-defined options that the user can choose
-	// from.
-	Options []*PluginOption `json:"options,omitempty" yaml:"options,omitempty"`
-}
-
-type PluginSettingsSchema struct {
-	// Optional text to display above the settings. Supports Markdown formatting.
-	Header string `json:"header" yaml:"header"`
-
-	// Optional text to display below the settings. Supports Markdown formatting.
-	Footer string `json:"footer" yaml:"footer"`
-
-	// A list of setting definitions.
-	Settings []*PluginSetting `json:"settings" yaml:"settings"`
-}
-
-// The plugin manifest defines the metadata required to load and present your plugin. The manifest
-// file should be named plugin.json or plugin.yaml and placed in the top of your
-// plugin bundle.
-//
-// Example plugin.json:
-//
-//
-//    {
-//      "id": "com.mycompany.myplugin",
-//      "name": "My Plugin",
-//      "description": "This is my plugin",
-//      "homepage_url": "https://example.com",
-//      "support_url": "https://example.com/support",
-//      "release_notes_url": "https://example.com/releases/v0.0.1",
-//      "icon_path": "assets/logo.svg",
-//      "version": "0.1.0",
-//      "min_server_version": "5.6.0",
-//      "server": {
-//        "executables": {
-//          "linux-amd64": "server/dist/plugin-linux-amd64",
-//          "darwin-amd64": "server/dist/plugin-darwin-amd64",
-//          "windows-amd64": "server/dist/plugin-windows-amd64.exe"
-//        }
-//      },
-//      "webapp": {
-//          "bundle_path": "webapp/dist/main.js"
-//      },
-//      "settings_schema": {
-//        "header": "Some header text",
-//        "footer": "Some footer text",
-//        "settings": [{
-//          "key": "someKey",
-//          "display_name": "Enable Extra Feature",
-//          "type": "bool",
-//          "help_text": "When true, an extra feature will be enabled!",
-//          "default": "false"
-//        }]
-//      },
-//      "props": {
-//        "someKey": "someData"
-//      }
-//    }
-type Manifest struct {
-	// The id is a globally unique identifier that represents your plugin. Ids must be at least
-	// 3 characters, at most 190 characters and must match ^[a-zA-Z0-9-_\.]+$.
-	// Reverse-DNS notation using a name you control is a good option, e.g. "com.mycompany.myplugin".
-	Id string `json:"id" yaml:"id"`
-
-	// The name to be displayed for the plugin.
-	Name string `json:"name" yaml:"name"`
-
-	// A description of what your plugin is and does.
-	Description string `json:"description,omitempty" yaml:"description,omitempty"`
-
-	// HomepageURL is an optional link to learn more about the plugin.
-	HomepageURL string `json:"homepage_url,omitempty" yaml:"homepage_url,omitempty"`
-
-	// SupportURL is an optional URL where plugin issues can be reported.
-	SupportURL string `json:"support_url,omitempty" yaml:"support_url,omitempty"`
-
-	// ReleaseNotesURL is an optional URL where a changelog for the release can be found.
-	ReleaseNotesURL string `json:"release_notes_url,omitempty" yaml:"release_notes_url,omitempty"`
-
-	// A relative file path in the bundle that points to the plugins svg icon for use with the Plugin Marketplace.
-	// This should be relative to the root of your bundle and the location of the manifest file. Bitmap image formats are not supported.
-	IconPath string `json:"icon_path,omitempty" yaml:"icon_path,omitempty"`
-
-	// A version number for your plugin. Semantic versioning is recommended: http://semver.org
-	Version string `json:"version" yaml:"version"`
-
-	// The minimum Mattermost server version required for your plugin.
-	//
-	// Minimum server version: 5.6
-	MinServerVersion string `json:"min_server_version,omitempty" yaml:"min_server_version,omitempty"`
-
-	// Server defines the server-side portion of your plugin.
-	Server *ManifestServer `json:"server,omitempty" yaml:"server,omitempty"`
-
-	// Backend is a deprecated flag for defining the server-side portion of your plugin. Going forward, use Server instead.
-	Backend *ManifestServer `json:"backend,omitempty" yaml:"backend,omitempty"`
-
-	// If your plugin extends the web app, you'll need to define webapp.
-	Webapp *ManifestWebapp `json:"webapp,omitempty" yaml:"webapp,omitempty"`
-
-	// To allow administrators to configure your plugin via the Mattermost system console, you can
-	// provide your settings schema.
-	SettingsSchema *PluginSettingsSchema `json:"settings_schema,omitempty" yaml:"settings_schema,omitempty"`
-
-	// Plugins can store any kind of data in Props to allow other plugins to use it.
-	Props map[string]interface{} `json:"props,omitempty" yaml:"props,omitempty"`
-
-	// RequiredConfig defines any required server configuration fields for the plugin to function properly.
-	//
-	// Use the plugin helpers CheckRequiredServerConfiguration method to enforce this.
-	RequiredConfig *Config `json:"required_configuration,omitempty" yaml:"required_configuration,omitempty"`
-}
-
-type ManifestServer struct {
-	// AllExecutables are the paths to your executable binaries, specifying multiple entry
-	// points for different platforms when bundled together in a single plugin.
-	AllExecutables map[string]string `json:"executables,omitempty" yaml:"executables,omitempty"`
-
-	// Executables is a legacy field populated with a subset of supported platform executables.
-	// When unmarshalling, Executables is authoritative for the platform executable paths it
-	// contains, overriding any values in AllExecutables. When marshalling, AllExecutables
-	// is authoritative.
-	//
-	// Code duplication is avoided when (un)marshalling by leveraging type aliases in the
-	// various (Un)Marshal(JSON|YAML) methods, since aliases don't inherit the aliased type's
-	// methods.
-	//
-	// In v6.0, we should remove this field and rename AllExecutables back to Executables.
-	Executables *ManifestExecutables `json:"-" yaml:"-"`
-
-	// Executable is the path to your executable binary. This should be relative to the root
-	// of your bundle and the location of the manifest file.
-	//
-	// On Windows, this file must have a ".exe" extension.
-	//
-	// If your plugin is compiled for multiple platforms, consider bundling them together
-	// and using the Executables field instead.
-	Executable string `json:"executable" yaml:"executable"`
-}
-
-func (ms *ManifestServer) MarshalJSON() ([]byte, error) {
-	type auxManifestServer ManifestServer
-
-	// Populate AllExecutables from Executables, if it exists.
-	if ms.Executables != nil {
-		if ms.AllExecutables == nil {
-			ms.AllExecutables = make(map[string]string)
-		}
-
-		ms.AllExecutables["linux-amd64"] = ms.Executables.LinuxAmd64
-		ms.AllExecutables["darwin-amd64"] = ms.Executables.DarwinAmd64
-		ms.AllExecutables["windows-amd64"] = ms.Executables.WindowsAmd64
-	}
-
-	return json.Marshal((*auxManifestServer)(ms))
-}
-
-func (ms *ManifestServer) UnmarshalJSON(data []byte) error {
-	type auxManifestServer ManifestServer
-
-	aux := (*auxManifestServer)(ms)
-	if err := json.Unmarshal(data, aux); err != nil {
-		return err
-	}
-
-	if len(aux.AllExecutables) > 0 {
-		ms.Executables = &ManifestExecutables{
-			LinuxAmd64:   aux.AllExecutables["linux-amd64"],
-			DarwinAmd64:  aux.AllExecutables["darwin-amd64"],
-			WindowsAmd64: aux.AllExecutables["windows-amd64"],
-		}
-	}
-
-	return nil
-}
-
-func (ms *ManifestServer) MarshalYAML() ([]byte, error) {
-	type auxManifestServer ManifestServer
-
-	// Populate AllExecutables from Executables, if it exists.
-	if ms.Executables != nil {
-		if ms.AllExecutables == nil {
-			ms.AllExecutables = make(map[string]string)
-		}
-
-		ms.AllExecutables["linux-amd64"] = ms.Executables.LinuxAmd64
-		ms.AllExecutables["darwin-amd64"] = ms.Executables.DarwinAmd64
-		ms.AllExecutables["windows-amd64"] = ms.Executables.WindowsAmd64
-	}
-
-	return yaml.Marshal((*auxManifestServer)(ms))
-}
-
-func (ms *ManifestServer) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	type auxManifestServer ManifestServer
-
-	aux := (*auxManifestServer)(ms)
-	if err := unmarshal(&aux); err != nil {
-		return err
-	}
-
-	if len(aux.AllExecutables) > 0 {
-		ms.Executables = &ManifestExecutables{
-			LinuxAmd64:   aux.AllExecutables["linux-amd64"],
-			DarwinAmd64:  aux.AllExecutables["darwin-amd64"],
-			WindowsAmd64: aux.AllExecutables["windows-amd64"],
-		}
-	}
-
-	return nil
-}
-
-// ManifestExecutables is a legacy structure capturing a subet of the known platform executables.
-type ManifestExecutables struct {
-	// LinuxAmd64 is the path to your executable binary for the corresponding platform
-	LinuxAmd64 string `json:"linux-amd64,omitempty" yaml:"linux-amd64,omitempty"`
-	// DarwinAmd64 is the path to your executable binary for the corresponding platform
-	DarwinAmd64 string `json:"darwin-amd64,omitempty" yaml:"darwin-amd64,omitempty"`
-	// WindowsAmd64 is the path to your executable binary for the corresponding platform
-	// This file must have a ".exe" extension
-	WindowsAmd64 string `json:"windows-amd64,omitempty" yaml:"windows-amd64,omitempty"`
-}
-
-type ManifestWebapp struct {
-	// The path to your webapp bundle. This should be relative to the root of your bundle and the
-	// location of the manifest file.
-	BundlePath string `json:"bundle_path" yaml:"bundle_path"`
-
-	// BundleHash is the 64-bit FNV-1a hash of the webapp bundle, computed when the plugin is loaded
-	BundleHash []byte `json:"-"`
-}
-
-func (m *Manifest) ToJson() string {
-	b, _ := json.Marshal(m)
-	return string(b)
-}
-
-func ManifestListToJson(m []*Manifest) string {
-	b, _ := json.Marshal(m)
-	return string(b)
-}
-
-func ManifestFromJson(data io.Reader) *Manifest {
-	var m *Manifest
-	json.NewDecoder(data).Decode(&m)
-	return m
-}
-
-func ManifestListFromJson(data io.Reader) []*Manifest {
-	var manifests []*Manifest
-	json.NewDecoder(data).Decode(&manifests)
-	return manifests
-}
-
-func (m *Manifest) HasClient() bool {
-	return m.Webapp != nil
-}
-
-func (m *Manifest) ClientManifest() *Manifest {
-	cm := new(Manifest)
-	*cm = *m
-	cm.Name = ""
-	cm.Description = ""
-	cm.Server = nil
-	if cm.Webapp != nil {
-		cm.Webapp = new(ManifestWebapp)
-		*cm.Webapp = *m.Webapp
-		cm.Webapp.BundlePath = "/static/" + m.Id + "/" + fmt.Sprintf("%s_%x_bundle.js", m.Id, m.Webapp.BundleHash)
-	}
-	return cm
-}
-
-// GetExecutableForRuntime returns the path to the executable for the given runtime architecture.
-//
-// If the manifest defines multiple executables, but none match, or if only a single executable
-// is defined, the Executable field will be returned. This method does not guarantee that the
-// resulting binary can actually execute on the given platform.
-func (m *Manifest) GetExecutableForRuntime(goOs, goArch string) string {
-	server := m.Server
-
-	// Support the deprecated backend parameter.
-	if server == nil {
-		server = m.Backend
-	}
-
-	if server == nil {
-		return ""
-	}
-
-	var executable string
-	if len(server.AllExecutables) > 0 {
-		osArch := fmt.Sprintf("%s-%s", goOs, goArch)
-		executable = server.AllExecutables[osArch]
-	}
-
-	if executable == "" {
-		executable = server.Executable
-	}
-
-	return executable
-}
-
-func (m *Manifest) HasServer() bool {
-	return m.Server != nil || m.Backend != nil
-}
-
-func (m *Manifest) HasWebapp() bool {
-	return m.Webapp != nil
-}
-
-func (m *Manifest) MeetMinServerVersion(serverVersion string) (bool, error) {
-	minServerVersion, err := semver.Parse(m.MinServerVersion)
-	if err != nil {
-		return false, errors.New("failed to parse MinServerVersion")
-	}
-	sv := semver.MustParse(serverVersion)
-	if sv.LT(minServerVersion) {
-		return false, nil
-	}
-	return true, nil
-}
-
-func (m *Manifest) IsValid() error {
-	if !IsValidPluginId(m.Id) {
-		return errors.New("invalid plugin ID")
-	}
-
-	if strings.TrimSpace(m.Name) == "" {
-		return errors.New("a plugin name is needed")
-	}
-
-	if m.HomepageURL != "" && !IsValidHttpUrl(m.HomepageURL) {
-		return errors.New("invalid HomepageURL")
-	}
-
-	if m.SupportURL != "" && !IsValidHttpUrl(m.SupportURL) {
-		return errors.New("invalid SupportURL")
-	}
-
-	if m.ReleaseNotesURL != "" && !IsValidHttpUrl(m.ReleaseNotesURL) {
-		return errors.New("invalid ReleaseNotesURL")
-	}
-
-	if m.Version != "" {
-		_, err := semver.Parse(m.Version)
-		if err != nil {
-			return errors.Wrap(err, "failed to parse Version")
-		}
-	}
-
-	if m.MinServerVersion != "" {
-		_, err := semver.Parse(m.MinServerVersion)
-		if err != nil {
-			return errors.Wrap(err, "failed to parse MinServerVersion")
-		}
-	}
-
-	if m.SettingsSchema != nil {
-		err := m.SettingsSchema.isValid()
-		if err != nil {
-			return errors.Wrap(err, "invalid settings schema")
-		}
-	}
-
-	return nil
-}
-
-func (s *PluginSettingsSchema) isValid() error {
-	for _, setting := range s.Settings {
-		err := setting.isValid()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (s *PluginSetting) isValid() error {
-	pluginSettingType, err := convertTypeToPluginSettingType(s.Type)
-	if err != nil {
-		return err
-	}
-
-	if s.RegenerateHelpText != "" && pluginSettingType != Generated {
-		return errors.New("should not set RegenerateHelpText for setting type that is not generated")
-	}
-
-	if s.Placeholder != "" && !(pluginSettingType == Generated ||
-		pluginSettingType == Text ||
-		pluginSettingType == LongText ||
-		pluginSettingType == Number ||
-		pluginSettingType == Username) {
-		return errors.New("should not set Placeholder for setting type not in text, generated or username")
-	}
-
-	if s.Options != nil {
-		if pluginSettingType != Radio && pluginSettingType != Dropdown {
-			return errors.New("should not set Options for setting type not in radio or dropdown")
-		}
-
-		for _, option := range s.Options {
-			if option.DisplayName == "" || option.Value == "" {
-				return errors.New("should not have empty Displayname or Value for any option")
-			}
-		}
-	}
-
-	return nil
-}
-
-func convertTypeToPluginSettingType(t string) (PluginSettingType, error) {
-	var settingType PluginSettingType
-	switch t {
-	case "bool":
-		return Bool, nil
-	case "dropdown":
-		return Dropdown, nil
-	case "generated":
-		return Generated, nil
-	case "radio":
-		return Radio, nil
-	case "text":
-		return Text, nil
-	case "number":
-		return Number, nil
-	case "longtext":
-		return LongText, nil
-	case "username":
-		return Username, nil
-	case "custom":
-		return Custom, nil
-	default:
-		return settingType, errors.New("invalid setting type: " + t)
-	}
-}
-
-// FindManifest will find and parse the manifest in a given directory.
-//
-// In all cases other than a does-not-exist error, path is set to the path of the manifest file that was
-// found.
-//
-// Manifests are JSON or YAML files named plugin.json, plugin.yaml, or plugin.yml.
-func FindManifest(dir string) (manifest *Manifest, path string, err error) {
-	for _, name := range []string{"plugin.yml", "plugin.yaml"} {
-		path = filepath.Join(dir, name)
-		f, ferr := os.Open(path)
-		if ferr != nil {
-			if !os.IsNotExist(ferr) {
-				return nil, "", ferr
-			}
-			continue
-		}
-		b, ioerr := ioutil.ReadAll(f)
-		f.Close()
-		if ioerr != nil {
-			return nil, path, ioerr
-		}
-		var parsed Manifest
-		err = yaml.Unmarshal(b, &parsed)
-		if err != nil {
-			return nil, path, err
-		}
-		manifest = &parsed
-		manifest.Id = strings.ToLower(manifest.Id)
-		return manifest, path, nil
-	}
-
-	path = filepath.Join(dir, "plugin.json")
-	f, ferr := os.Open(path)
-	if ferr != nil {
-		if os.IsNotExist(ferr) {
-			path = ""
-		}
-		return nil, path, ferr
-	}
-	defer f.Close()
-	var parsed Manifest
-	err = json.NewDecoder(f).Decode(&parsed)
-	if err != nil {
-		return nil, path, err
-	}
-	manifest = &parsed
-	manifest.Id = strings.ToLower(manifest.Id)
-	return manifest, path, nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/marketplace_plugin.go b/vendor/github.com/mattermost/mattermost-server/v5/model/marketplace_plugin.go
deleted file mode 100644
index cad93dfb..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/marketplace_plugin.go
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"bytes"
-	"encoding/base64"
-	"encoding/json"
-	"io"
-	"net/url"
-	"strconv"
-
-	"github.com/pkg/errors"
-)
-
-// BaseMarketplacePlugin is a Mattermost plugin received from the Marketplace server.
-type BaseMarketplacePlugin struct {
-	HomepageURL     string             `json:"homepage_url"`
-	IconData        string             `json:"icon_data"`
-	DownloadURL     string             `json:"download_url"`
-	ReleaseNotesURL string             `json:"release_notes_url"`
-	Labels          []MarketplaceLabel `json:"labels,omitempty"`
-	Hosting         string             `json:"hosting"`       // Indicated if the plugin is limited to a certain hosting type
-	AuthorType      string             `json:"author_type"`   // The maintainer of the plugin
-	ReleaseStage    string             `json:"release_stage"` // The stage in the software release cycle that the plugin is in
-	Enterprise      bool               `json:"enterprise"`    // Indicated if the plugin is an enterprise plugin
-	Signature       string             `json:"signature"`     // Signature represents a signature of a plugin saved in base64 encoding.
-	Manifest        *Manifest          `json:"manifest"`
-}
-
-// MarketplaceLabel represents a label shown in the Marketplace UI.
-type MarketplaceLabel struct {
-	Name        string `json:"name"`
-	Description string `json:"description"`
-	URL         string `json:"url"`
-	Color       string `json:"color"`
-}
-
-// MarketplacePlugin is a state aware Marketplace plugin.
-type MarketplacePlugin struct {
-	*BaseMarketplacePlugin
-	InstalledVersion string `json:"installed_version"`
-}
-
-// BaseMarketplacePluginsFromReader decodes a json-encoded list of plugins from the given io.Reader.
-func BaseMarketplacePluginsFromReader(reader io.Reader) ([]*BaseMarketplacePlugin, error) {
-	plugins := []*BaseMarketplacePlugin{}
-	decoder := json.NewDecoder(reader)
-
-	if err := decoder.Decode(&plugins); err != nil && err != io.EOF {
-		return nil, err
-	}
-
-	return plugins, nil
-}
-
-// MarketplacePluginsFromReader decodes a json-encoded list of plugins from the given io.Reader.
-func MarketplacePluginsFromReader(reader io.Reader) ([]*MarketplacePlugin, error) {
-	plugins := []*MarketplacePlugin{}
-	decoder := json.NewDecoder(reader)
-
-	if err := decoder.Decode(&plugins); err != nil && err != io.EOF {
-		return nil, err
-	}
-
-	return plugins, nil
-}
-
-// DecodeSignature Decodes signature and returns ReadSeeker.
-func (plugin *BaseMarketplacePlugin) DecodeSignature() (io.ReadSeeker, error) {
-	signatureBytes, err := base64.StdEncoding.DecodeString(plugin.Signature)
-	if err != nil {
-		return nil, errors.Wrap(err, "Unable to decode base64 signature.")
-	}
-	return bytes.NewReader(signatureBytes), nil
-}
-
-// MarketplacePluginFilter describes the parameters to request a list of plugins.
-type MarketplacePluginFilter struct {
-	Page                 int
-	PerPage              int
-	Filter               string
-	ServerVersion        string
-	BuildEnterpriseReady bool
-	EnterprisePlugins    bool
-	Cloud                bool
-	LocalOnly            bool
-	Platform             string
-	PluginId             string
-	ReturnAllVersions    bool
-}
-
-// ApplyToURL modifies the given url to include query string parameters for the request.
-func (filter *MarketplacePluginFilter) ApplyToURL(u *url.URL) {
-	q := u.Query()
-	q.Add("page", strconv.Itoa(filter.Page))
-	if filter.PerPage > 0 {
-		q.Add("per_page", strconv.Itoa(filter.PerPage))
-	}
-	q.Add("filter", filter.Filter)
-	q.Add("server_version", filter.ServerVersion)
-	q.Add("build_enterprise_ready", strconv.FormatBool(filter.BuildEnterpriseReady))
-	q.Add("enterprise_plugins", strconv.FormatBool(filter.EnterprisePlugins))
-	q.Add("cloud", strconv.FormatBool(filter.Cloud))
-	q.Add("local_only", strconv.FormatBool(filter.LocalOnly))
-	q.Add("platform", filter.Platform)
-	q.Add("plugin_id", filter.PluginId)
-	q.Add("return_all_versions", strconv.FormatBool(filter.ReturnAllVersions))
-	u.RawQuery = q.Encode()
-}
-
-// InstallMarketplacePluginRequest struct describes parameters of the requested plugin.
-type InstallMarketplacePluginRequest struct {
-	Id      string `json:"id"`
-	Version string `json:"version"`
-}
-
-// PluginRequestFromReader decodes a json-encoded plugin request from the given io.Reader.
-func PluginRequestFromReader(reader io.Reader) (*InstallMarketplacePluginRequest, error) {
-	var r *InstallMarketplacePluginRequest
-	err := json.NewDecoder(reader).Decode(&r)
-	if err != nil {
-		return nil, err
-	}
-	return r, nil
-}
-
-// ToJson method will return json from plugin request.
-func (r *InstallMarketplacePluginRequest) ToJson() (string, error) {
-	b, err := json.Marshal(r)
-	if err != nil {
-		return "", err
-	}
-	return string(b), nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/mention_map.go b/vendor/github.com/mattermost/mattermost-server/v5/model/mention_map.go
deleted file mode 100644
index 2f3444dd..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/mention_map.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"fmt"
-	"net/url"
-)
-
-type UserMentionMap map[string]string
-type ChannelMentionMap map[string]string
-
-const (
-	userMentionsKey       = "user_mentions"
-	userMentionsIdsKey    = "user_mentions_ids"
-	channelMentionsKey    = "channel_mentions"
-	channelMentionsIdsKey = "channel_mentions_ids"
-)
-
-func UserMentionMapFromURLValues(values url.Values) (UserMentionMap, error) {
-	return mentionsFromURLValues(values, userMentionsKey, userMentionsIdsKey)
-}
-
-func (m UserMentionMap) ToURLValues() url.Values {
-	return mentionsToURLValues(m, userMentionsKey, userMentionsIdsKey)
-}
-
-func ChannelMentionMapFromURLValues(values url.Values) (ChannelMentionMap, error) {
-	return mentionsFromURLValues(values, channelMentionsKey, channelMentionsIdsKey)
-}
-
-func (m ChannelMentionMap) ToURLValues() url.Values {
-	return mentionsToURLValues(m, channelMentionsKey, channelMentionsIdsKey)
-}
-
-func mentionsFromURLValues(values url.Values, mentionKey, idKey string) (map[string]string, error) {
-	mentions, mentionsOk := values[mentionKey]
-	ids, idsOk := values[idKey]
-
-	if !mentionsOk && !idsOk {
-		return map[string]string{}, nil
-	}
-
-	if !mentionsOk {
-		return nil, fmt.Errorf("%s key not found", mentionKey)
-	}
-
-	if !idsOk {
-		return nil, fmt.Errorf("%s key not found", idKey)
-	}
-
-	if len(mentions) != len(ids) {
-		return nil, fmt.Errorf("keys %s and %s have different length", mentionKey, idKey)
-	}
-
-	mentionsMap := make(map[string]string)
-	for i, mention := range mentions {
-		id := ids[i]
-
-		if oldId, ok := mentionsMap[mention]; ok && oldId != id {
-			return nil, fmt.Errorf("key %s has two different values: %s and %s", mention, oldId, id)
-		}
-
-		mentionsMap[mention] = id
-	}
-
-	return mentionsMap, nil
-}
-
-func mentionsToURLValues(mentions map[string]string, mentionKey, idKey string) url.Values {
-	values := url.Values{}
-
-	for mention, id := range mentions {
-		values.Add(mentionKey, mention)
-		values.Add(idKey, id)
-	}
-
-	return values
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/message_export.go b/vendor/github.com/mattermost/mattermost-server/v5/model/message_export.go
deleted file mode 100644
index f94d861f..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/message_export.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-type MessageExport struct {
-	TeamId          *string
-	TeamName        *string
-	TeamDisplayName *string
-
-	ChannelId          *string
-	ChannelName        *string
-	ChannelDisplayName *string
-	ChannelType        *string
-
-	UserId    *string
-	UserEmail *string
-	Username  *string
-	IsBot     bool
-
-	PostId         *string
-	PostCreateAt   *int64
-	PostUpdateAt   *int64
-	PostDeleteAt   *int64
-	PostMessage    *string
-	PostType       *string
-	PostRootId     *string
-	PostProps      *string
-	PostOriginalId *string
-	PostFileIds    StringArray
-}
-
-type MessageExportCursor struct {
-	LastPostUpdateAt int64
-	LastPostId       string
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/mfa_secret.go b/vendor/github.com/mattermost/mattermost-server/v5/model/mfa_secret.go
deleted file mode 100644
index b2293566..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/mfa_secret.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type MfaSecret struct {
-	Secret string `json:"secret"`
-	QRCode string `json:"qr_code"`
-}
-
-func (mfa *MfaSecret) ToJson() string {
-	b, _ := json.Marshal(mfa)
-	return string(b)
-}
-
-func MfaSecretFromJson(data io.Reader) *MfaSecret {
-	var mfa *MfaSecret
-	json.NewDecoder(data).Decode(&mfa)
-	return mfa
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/migration.go b/vendor/github.com/mattermost/mattermost-server/v5/model/migration.go
deleted file mode 100644
index 019ca7b5..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/migration.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-const (
-	ADVANCED_PERMISSIONS_MIGRATION_KEY         = "AdvancedPermissionsMigrationComplete"
-	MIGRATION_KEY_ADVANCED_PERMISSIONS_PHASE_2 = "migration_advanced_permissions_phase_2"
-
-	MIGRATION_KEY_EMOJI_PERMISSIONS_SPLIT                     = "emoji_permissions_split"
-	MIGRATION_KEY_WEBHOOK_PERMISSIONS_SPLIT                   = "webhook_permissions_split"
-	MIGRATION_KEY_LIST_JOIN_PUBLIC_PRIVATE_TEAMS              = "list_join_public_private_teams"
-	MIGRATION_KEY_REMOVE_PERMANENT_DELETE_USER                = "remove_permanent_delete_user"
-	MIGRATION_KEY_ADD_BOT_PERMISSIONS                         = "add_bot_permissions"
-	MIGRATION_KEY_APPLY_CHANNEL_MANAGE_DELETE_TO_CHANNEL_USER = "apply_channel_manage_delete_to_channel_user"
-	MIGRATION_KEY_REMOVE_CHANNEL_MANAGE_DELETE_FROM_TEAM_USER = "remove_channel_manage_delete_from_team_user"
-	MIGRATION_KEY_VIEW_MEMBERS_NEW_PERMISSION                 = "view_members_new_permission"
-	MIGRATION_KEY_ADD_MANAGE_GUESTS_PERMISSIONS               = "add_manage_guests_permissions"
-	MIGRATION_KEY_CHANNEL_MODERATIONS_PERMISSIONS             = "channel_moderations_permissions"
-	MIGRATION_KEY_ADD_USE_GROUP_MENTIONS_PERMISSION           = "add_use_group_mentions_permission"
-	MIGRATION_KEY_ADD_SYSTEM_CONSOLE_PERMISSIONS              = "add_system_console_permissions"
-	MIGRATION_KEY_SIDEBAR_CATEGORIES_PHASE_2                  = "migration_sidebar_categories_phase_2"
-	MIGRATION_KEY_ADD_CONVERT_CHANNEL_PERMISSIONS             = "add_convert_channel_permissions"
-	MIGRATION_KEY_ADD_SYSTEM_ROLES_PERMISSIONS                = "add_system_roles_permissions"
-	MIGRATION_KEY_ADD_BILLING_PERMISSIONS                     = "add_billing_permissions"
-	MIGRATION_KEY_ADD_MANAGE_SHARED_CHANNEL_PERMISSIONS       = "manage_shared_channel_permissions"
-	MIGRATION_KEY_ADD_MANAGE_SECURE_CONNECTIONS_PERMISSIONS   = "manage_secure_connections_permissions"
-	MIGRATION_KEY_ADD_DOWNLOAD_COMPLIANCE_EXPORT_RESULTS      = "download_compliance_export_results"
-	MIGRATION_KEY_ADD_COMPLIANCE_SUBSECTION_PERMISSIONS       = "compliance_subsection_permissions"
-	MIGRATION_KEY_ADD_EXPERIMENTAL_SUBSECTION_PERMISSIONS     = "experimental_subsection_permissions"
-	MIGRATION_KEY_ADD_AUTHENTICATION_SUBSECTION_PERMISSIONS   = "authentication_subsection_permissions"
-	MIGRATION_KEY_ADD_SITE_SUBSECTION_PERMISSIONS             = "site_subsection_permissions"
-	MIGRATION_KEY_ADD_ENVIRONMENT_SUBSECTION_PERMISSIONS      = "environment_subsection_permissions"
-	MIGRATION_KEY_ADD_REPORTING_SUBSECTION_PERMISSIONS        = "reporting_subsection_permissions"
-	MIGRATION_KEY_ADD_TEST_EMAIL_ANCILLARY_PERMISSION         = "test_email_ancillary_permission"
-	MIGRATION_KEY_ADD_ABOUT_SUBSECTION_PERMISSIONS            = "about_subsection_permissions"
-	MIGRATION_KEY_ADD_INTEGRATIONS_SUBSECTION_PERMISSIONS     = "integrations_subsection_permissions"
-)
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/oauth.go b/vendor/github.com/mattermost/mattermost-server/v5/model/oauth.go
deleted file mode 100644
index 07198116..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/oauth.go
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"unicode/utf8"
-)
-
-const (
-	OAUTH_ACTION_SIGNUP       = "signup"
-	OAUTH_ACTION_LOGIN        = "login"
-	OAUTH_ACTION_EMAIL_TO_SSO = "email_to_sso"
-	OAUTH_ACTION_SSO_TO_EMAIL = "sso_to_email"
-	OAUTH_ACTION_MOBILE       = "mobile"
-)
-
-type OAuthApp struct {
-	Id           string      `json:"id"`
-	CreatorId    string      `json:"creator_id"`
-	CreateAt     int64       `json:"create_at"`
-	UpdateAt     int64       `json:"update_at"`
-	ClientSecret string      `json:"client_secret"`
-	Name         string      `json:"name"`
-	Description  string      `json:"description"`
-	IconURL      string      `json:"icon_url"`
-	CallbackUrls StringArray `json:"callback_urls"`
-	Homepage     string      `json:"homepage"`
-	IsTrusted    bool        `json:"is_trusted"`
-}
-
-// IsValid validates the app and returns an error if it isn't configured
-// correctly.
-func (a *OAuthApp) IsValid() *AppError {
-
-	if !IsValidId(a.Id) {
-		return NewAppError("OAuthApp.IsValid", "model.oauth.is_valid.app_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if a.CreateAt == 0 {
-		return NewAppError("OAuthApp.IsValid", "model.oauth.is_valid.create_at.app_error", nil, "app_id="+a.Id, http.StatusBadRequest)
-	}
-
-	if a.UpdateAt == 0 {
-		return NewAppError("OAuthApp.IsValid", "model.oauth.is_valid.update_at.app_error", nil, "app_id="+a.Id, http.StatusBadRequest)
-	}
-
-	if !IsValidId(a.CreatorId) {
-		return NewAppError("OAuthApp.IsValid", "model.oauth.is_valid.creator_id.app_error", nil, "app_id="+a.Id, http.StatusBadRequest)
-	}
-
-	if a.ClientSecret == "" || len(a.ClientSecret) > 128 {
-		return NewAppError("OAuthApp.IsValid", "model.oauth.is_valid.client_secret.app_error", nil, "app_id="+a.Id, http.StatusBadRequest)
-	}
-
-	if a.Name == "" || len(a.Name) > 64 {
-		return NewAppError("OAuthApp.IsValid", "model.oauth.is_valid.name.app_error", nil, "app_id="+a.Id, http.StatusBadRequest)
-	}
-
-	if len(a.CallbackUrls) == 0 || len(fmt.Sprintf("%s", a.CallbackUrls)) > 1024 {
-		return NewAppError("OAuthApp.IsValid", "model.oauth.is_valid.callback.app_error", nil, "app_id="+a.Id, http.StatusBadRequest)
-	}
-
-	for _, callback := range a.CallbackUrls {
-		if !IsValidHttpUrl(callback) {
-			return NewAppError("OAuthApp.IsValid", "model.oauth.is_valid.callback.app_error", nil, "", http.StatusBadRequest)
-		}
-	}
-
-	if a.Homepage == "" || len(a.Homepage) > 256 || !IsValidHttpUrl(a.Homepage) {
-		return NewAppError("OAuthApp.IsValid", "model.oauth.is_valid.homepage.app_error", nil, "app_id="+a.Id, http.StatusBadRequest)
-	}
-
-	if utf8.RuneCountInString(a.Description) > 512 {
-		return NewAppError("OAuthApp.IsValid", "model.oauth.is_valid.description.app_error", nil, "app_id="+a.Id, http.StatusBadRequest)
-	}
-
-	if a.IconURL != "" {
-		if len(a.IconURL) > 512 || !IsValidHttpUrl(a.IconURL) {
-			return NewAppError("OAuthApp.IsValid", "model.oauth.is_valid.icon_url.app_error", nil, "app_id="+a.Id, http.StatusBadRequest)
-		}
-	}
-
-	return nil
-}
-
-// PreSave will set the Id and ClientSecret if missing.  It will also fill
-// in the CreateAt, UpdateAt times. It should be run before saving the app to the db.
-func (a *OAuthApp) PreSave() {
-	if a.Id == "" {
-		a.Id = NewId()
-	}
-
-	if a.ClientSecret == "" {
-		a.ClientSecret = NewId()
-	}
-
-	a.CreateAt = GetMillis()
-	a.UpdateAt = a.CreateAt
-}
-
-// PreUpdate should be run before updating the app in the db.
-func (a *OAuthApp) PreUpdate() {
-	a.UpdateAt = GetMillis()
-}
-
-func (a *OAuthApp) ToJson() string {
-	b, _ := json.Marshal(a)
-	return string(b)
-}
-
-// Generate a valid strong etag so the browser can cache the results
-func (a *OAuthApp) Etag() string {
-	return Etag(a.Id, a.UpdateAt)
-}
-
-// Remove any private data from the app object
-func (a *OAuthApp) Sanitize() {
-	a.ClientSecret = ""
-}
-
-func (a *OAuthApp) IsValidRedirectURL(url string) bool {
-	for _, u := range a.CallbackUrls {
-		if u == url {
-			return true
-		}
-	}
-
-	return false
-}
-
-func OAuthAppFromJson(data io.Reader) *OAuthApp {
-	var app *OAuthApp
-	json.NewDecoder(data).Decode(&app)
-	return app
-}
-
-func OAuthAppListToJson(l []*OAuthApp) string {
-	b, _ := json.Marshal(l)
-	return string(b)
-}
-
-func OAuthAppListFromJson(data io.Reader) []*OAuthApp {
-	var o []*OAuthApp
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/outgoing_webhook.go b/vendor/github.com/mattermost/mattermost-server/v5/model/outgoing_webhook.go
deleted file mode 100644
index 0d7a88fb..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/outgoing_webhook.go
+++ /dev/null
@@ -1,267 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-)
-
-type OutgoingWebhook struct {
-	Id           string      `json:"id"`
-	Token        string      `json:"token"`
-	CreateAt     int64       `json:"create_at"`
-	UpdateAt     int64       `json:"update_at"`
-	DeleteAt     int64       `json:"delete_at"`
-	CreatorId    string      `json:"creator_id"`
-	ChannelId    string      `json:"channel_id"`
-	TeamId       string      `json:"team_id"`
-	TriggerWords StringArray `json:"trigger_words"`
-	TriggerWhen  int         `json:"trigger_when"`
-	CallbackURLs StringArray `json:"callback_urls"`
-	DisplayName  string      `json:"display_name"`
-	Description  string      `json:"description"`
-	ContentType  string      `json:"content_type"`
-	Username     string      `json:"username"`
-	IconURL      string      `json:"icon_url"`
-}
-
-type OutgoingWebhookPayload struct {
-	Token       string `json:"token"`
-	TeamId      string `json:"team_id"`
-	TeamDomain  string `json:"team_domain"`
-	ChannelId   string `json:"channel_id"`
-	ChannelName string `json:"channel_name"`
-	Timestamp   int64  `json:"timestamp"`
-	UserId      string `json:"user_id"`
-	UserName    string `json:"user_name"`
-	PostId      string `json:"post_id"`
-	Text        string `json:"text"`
-	TriggerWord string `json:"trigger_word"`
-	FileIds     string `json:"file_ids"`
-}
-
-type OutgoingWebhookResponse struct {
-	Text         *string            `json:"text"`
-	Username     string             `json:"username"`
-	IconURL      string             `json:"icon_url"`
-	Props        StringInterface    `json:"props"`
-	Attachments  []*SlackAttachment `json:"attachments"`
-	Type         string             `json:"type"`
-	ResponseType string             `json:"response_type"`
-}
-
-const OUTGOING_HOOK_RESPONSE_TYPE_COMMENT = "comment"
-
-func (o *OutgoingWebhookPayload) ToJSON() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func (o *OutgoingWebhookPayload) ToFormValues() string {
-	v := url.Values{}
-	v.Set("token", o.Token)
-	v.Set("team_id", o.TeamId)
-	v.Set("team_domain", o.TeamDomain)
-	v.Set("channel_id", o.ChannelId)
-	v.Set("channel_name", o.ChannelName)
-	v.Set("timestamp", strconv.FormatInt(o.Timestamp/1000, 10))
-	v.Set("user_id", o.UserId)
-	v.Set("user_name", o.UserName)
-	v.Set("post_id", o.PostId)
-	v.Set("text", o.Text)
-	v.Set("trigger_word", o.TriggerWord)
-	v.Set("file_ids", o.FileIds)
-
-	return v.Encode()
-}
-
-func (o *OutgoingWebhook) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func OutgoingWebhookFromJson(data io.Reader) *OutgoingWebhook {
-	var o *OutgoingWebhook
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func OutgoingWebhookListToJson(l []*OutgoingWebhook) string {
-	b, _ := json.Marshal(l)
-	return string(b)
-}
-
-func OutgoingWebhookListFromJson(data io.Reader) []*OutgoingWebhook {
-	var o []*OutgoingWebhook
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func (o *OutgoingWebhookResponse) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func OutgoingWebhookResponseFromJson(data io.Reader) (*OutgoingWebhookResponse, error) {
-	var o *OutgoingWebhookResponse
-	err := json.NewDecoder(data).Decode(&o)
-	if err == io.EOF {
-		return nil, nil
-	}
-	return o, err
-}
-
-func (o *OutgoingWebhook) IsValid() *AppError {
-
-	if !IsValidId(o.Id) {
-		return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(o.Token) != 26 {
-		return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.token.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.CreateAt == 0 {
-		return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.create_at.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if o.UpdateAt == 0 {
-		return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.update_at.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if !IsValidId(o.CreatorId) {
-		return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.user_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.ChannelId != "" && !IsValidId(o.ChannelId) {
-		return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.channel_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !IsValidId(o.TeamId) {
-		return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.team_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(fmt.Sprintf("%s", o.TriggerWords)) > 1024 {
-		return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.words.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(o.TriggerWords) != 0 {
-		for _, triggerWord := range o.TriggerWords {
-			if triggerWord == "" {
-				return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.trigger_words.app_error", nil, "", http.StatusBadRequest)
-			}
-		}
-	}
-
-	if len(o.CallbackURLs) == 0 || len(fmt.Sprintf("%s", o.CallbackURLs)) > 1024 {
-		return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.callback.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	for _, callback := range o.CallbackURLs {
-		if !IsValidHttpUrl(callback) {
-			return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.url.app_error", nil, "", http.StatusBadRequest)
-		}
-	}
-
-	if len(o.DisplayName) > 64 {
-		return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.display_name.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(o.Description) > 500 {
-		return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.description.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(o.ContentType) > 128 {
-		return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.content_type.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.TriggerWhen > 1 {
-		return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.content_type.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(o.Username) > 64 {
-		return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.username.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(o.IconURL) > 1024 {
-		return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.icon_url.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (o *OutgoingWebhook) PreSave() {
-	if o.Id == "" {
-		o.Id = NewId()
-	}
-
-	if o.Token == "" {
-		o.Token = NewId()
-	}
-
-	o.CreateAt = GetMillis()
-	o.UpdateAt = o.CreateAt
-}
-
-func (o *OutgoingWebhook) PreUpdate() {
-	o.UpdateAt = GetMillis()
-}
-
-func (o *OutgoingWebhook) TriggerWordExactMatch(word string) bool {
-	if word == "" {
-		return false
-	}
-
-	for _, trigger := range o.TriggerWords {
-		if trigger == word {
-			return true
-		}
-	}
-
-	return false
-}
-
-func (o *OutgoingWebhook) TriggerWordStartsWith(word string) bool {
-	if word == "" {
-		return false
-	}
-
-	for _, trigger := range o.TriggerWords {
-		if strings.HasPrefix(word, trigger) {
-			return true
-		}
-	}
-
-	return false
-}
-
-func (o *OutgoingWebhook) GetTriggerWord(word string, isExactMatch bool) (triggerWord string) {
-	if word == "" {
-		return
-	}
-
-	if isExactMatch {
-		for _, trigger := range o.TriggerWords {
-			if trigger == word {
-				triggerWord = trigger
-				break
-			}
-		}
-	} else {
-		for _, trigger := range o.TriggerWords {
-			if strings.HasPrefix(word, trigger) {
-				triggerWord = trigger
-				break
-			}
-		}
-	}
-
-	return triggerWord
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/permission.go b/vendor/github.com/mattermost/mattermost-server/v5/model/permission.go
deleted file mode 100644
index bc4de236..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/permission.go
+++ /dev/null
@@ -1,2192 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-const (
-	PermissionScopeSystem  = "system_scope"
-	PermissionScopeTeam    = "team_scope"
-	PermissionScopeChannel = "channel_scope"
-)
-
-type Permission struct {
-	Id          string `json:"id"`
-	Name        string `json:"name"`
-	Description string `json:"description"`
-	Scope       string `json:"scope"`
-}
-
-var PERMISSION_INVITE_USER *Permission
-var PERMISSION_ADD_USER_TO_TEAM *Permission
-var PERMISSION_USE_SLASH_COMMANDS *Permission
-var PERMISSION_MANAGE_SLASH_COMMANDS *Permission
-var PERMISSION_MANAGE_OTHERS_SLASH_COMMANDS *Permission
-var PERMISSION_CREATE_PUBLIC_CHANNEL *Permission
-var PERMISSION_CREATE_PRIVATE_CHANNEL *Permission
-var PERMISSION_MANAGE_PUBLIC_CHANNEL_MEMBERS *Permission
-var PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS *Permission
-var PERMISSION_CONVERT_PUBLIC_CHANNEL_TO_PRIVATE *Permission
-var PERMISSION_CONVERT_PRIVATE_CHANNEL_TO_PUBLIC *Permission
-var PERMISSION_ASSIGN_SYSTEM_ADMIN_ROLE *Permission
-var PERMISSION_MANAGE_ROLES *Permission
-var PERMISSION_MANAGE_TEAM_ROLES *Permission
-var PERMISSION_MANAGE_CHANNEL_ROLES *Permission
-var PERMISSION_CREATE_DIRECT_CHANNEL *Permission
-var PERMISSION_CREATE_GROUP_CHANNEL *Permission
-var PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES *Permission
-var PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES *Permission
-var PERMISSION_LIST_PUBLIC_TEAMS *Permission
-var PERMISSION_JOIN_PUBLIC_TEAMS *Permission
-var PERMISSION_LIST_PRIVATE_TEAMS *Permission
-var PERMISSION_JOIN_PRIVATE_TEAMS *Permission
-var PERMISSION_LIST_TEAM_CHANNELS *Permission
-var PERMISSION_JOIN_PUBLIC_CHANNELS *Permission
-var PERMISSION_DELETE_PUBLIC_CHANNEL *Permission
-var PERMISSION_DELETE_PRIVATE_CHANNEL *Permission
-var PERMISSION_EDIT_OTHER_USERS *Permission
-var PERMISSION_READ_CHANNEL *Permission
-var PERMISSION_READ_PUBLIC_CHANNEL_GROUPS *Permission
-var PERMISSION_READ_PRIVATE_CHANNEL_GROUPS *Permission
-var PERMISSION_READ_PUBLIC_CHANNEL *Permission
-var PERMISSION_ADD_REACTION *Permission
-var PERMISSION_REMOVE_REACTION *Permission
-var PERMISSION_REMOVE_OTHERS_REACTIONS *Permission
-var PERMISSION_PERMANENT_DELETE_USER *Permission
-var PERMISSION_UPLOAD_FILE *Permission
-var PERMISSION_GET_PUBLIC_LINK *Permission
-var PERMISSION_MANAGE_WEBHOOKS *Permission
-var PERMISSION_MANAGE_OTHERS_WEBHOOKS *Permission
-var PERMISSION_MANAGE_INCOMING_WEBHOOKS *Permission
-var PERMISSION_MANAGE_OUTGOING_WEBHOOKS *Permission
-var PERMISSION_MANAGE_OTHERS_INCOMING_WEBHOOKS *Permission
-var PERMISSION_MANAGE_OTHERS_OUTGOING_WEBHOOKS *Permission
-var PERMISSION_MANAGE_OAUTH *Permission
-var PERMISSION_MANAGE_SYSTEM_WIDE_OAUTH *Permission
-var PERMISSION_MANAGE_EMOJIS *Permission
-var PERMISSION_MANAGE_OTHERS_EMOJIS *Permission
-var PERMISSION_CREATE_EMOJIS *Permission
-var PERMISSION_DELETE_EMOJIS *Permission
-var PERMISSION_DELETE_OTHERS_EMOJIS *Permission
-var PERMISSION_CREATE_POST *Permission
-var PERMISSION_CREATE_POST_PUBLIC *Permission
-var PERMISSION_CREATE_POST_EPHEMERAL *Permission
-var PERMISSION_EDIT_POST *Permission
-var PERMISSION_EDIT_OTHERS_POSTS *Permission
-var PERMISSION_DELETE_POST *Permission
-var PERMISSION_DELETE_OTHERS_POSTS *Permission
-var PERMISSION_REMOVE_USER_FROM_TEAM *Permission
-var PERMISSION_CREATE_TEAM *Permission
-var PERMISSION_MANAGE_TEAM *Permission
-var PERMISSION_IMPORT_TEAM *Permission
-var PERMISSION_VIEW_TEAM *Permission
-var PERMISSION_LIST_USERS_WITHOUT_TEAM *Permission
-var PERMISSION_READ_JOBS *Permission
-var PERMISSION_MANAGE_JOBS *Permission
-var PERMISSION_CREATE_USER_ACCESS_TOKEN *Permission
-var PERMISSION_READ_USER_ACCESS_TOKEN *Permission
-var PERMISSION_REVOKE_USER_ACCESS_TOKEN *Permission
-var PERMISSION_CREATE_BOT *Permission
-var PERMISSION_ASSIGN_BOT *Permission
-var PERMISSION_READ_BOTS *Permission
-var PERMISSION_READ_OTHERS_BOTS *Permission
-var PERMISSION_MANAGE_BOTS *Permission
-var PERMISSION_MANAGE_OTHERS_BOTS *Permission
-var PERMISSION_VIEW_MEMBERS *Permission
-var PERMISSION_INVITE_GUEST *Permission
-var PERMISSION_PROMOTE_GUEST *Permission
-var PERMISSION_DEMOTE_TO_GUEST *Permission
-var PERMISSION_USE_CHANNEL_MENTIONS *Permission
-var PERMISSION_USE_GROUP_MENTIONS *Permission
-var PERMISSION_READ_OTHER_USERS_TEAMS *Permission
-var PERMISSION_EDIT_BRAND *Permission
-var PERMISSION_MANAGE_SHARED_CHANNELS *Permission
-var PERMISSION_MANAGE_SECURE_CONNECTIONS *Permission
-var PERMISSION_DOWNLOAD_COMPLIANCE_EXPORT_RESULT *Permission
-var PERMISSION_CREATE_DATA_RETENTION_JOB *Permission
-var PERMISSION_READ_DATA_RETENTION_JOB *Permission
-var PERMISSION_CREATE_COMPLIANCE_EXPORT_JOB *Permission
-var PERMISSION_READ_COMPLIANCE_EXPORT_JOB *Permission
-var PERMISSION_READ_AUDITS *Permission
-var PERMISSION_TEST_ELASTICSEARCH *Permission
-var PERMISSION_TEST_SITE_URL *Permission
-var PERMISSION_TEST_S3 *Permission
-var PERMISSION_RELOAD_CONFIG *Permission
-var PERMISSION_INVALIDATE_CACHES *Permission
-var PERMISSION_RECYCLE_DATABASE_CONNECTIONS *Permission
-var PERMISSION_PURGE_ELASTICSEARCH_INDEXES *Permission
-var PERMISSION_TEST_EMAIL *Permission
-var PERMISSION_CREATE_ELASTICSEARCH_POST_INDEXING_JOB *Permission
-var PERMISSION_CREATE_ELASTICSEARCH_POST_AGGREGATION_JOB *Permission
-var PERMISSION_READ_ELASTICSEARCH_POST_INDEXING_JOB *Permission
-var PERMISSION_READ_ELASTICSEARCH_POST_AGGREGATION_JOB *Permission
-var PERMISSION_PURGE_BLEVE_INDEXES *Permission
-var PERMISSION_CREATE_POST_BLEVE_INDEXES_JOB *Permission
-var PERMISSION_CREATE_LDAP_SYNC_JOB *Permission
-var PERMISSION_READ_LDAP_SYNC_JOB *Permission
-var PERMISSION_TEST_LDAP *Permission
-var PERMISSION_INVALIDATE_EMAIL_INVITE *Permission
-var PERMISSION_GET_SAML_METADATA_FROM_IDP *Permission
-var PERMISSION_ADD_SAML_PUBLIC_CERT *Permission
-var PERMISSION_ADD_SAML_PRIVATE_CERT *Permission
-var PERMISSION_ADD_SAML_IDP_CERT *Permission
-var PERMISSION_REMOVE_SAML_PUBLIC_CERT *Permission
-var PERMISSION_REMOVE_SAML_PRIVATE_CERT *Permission
-var PERMISSION_REMOVE_SAML_IDP_CERT *Permission
-var PERMISSION_GET_SAML_CERT_STATUS *Permission
-var PERMISSION_ADD_LDAP_PUBLIC_CERT *Permission
-var PERMISSION_ADD_LDAP_PRIVATE_CERT *Permission
-var PERMISSION_REMOVE_LDAP_PUBLIC_CERT *Permission
-var PERMISSION_REMOVE_LDAP_PRIVATE_CERT *Permission
-var PERMISSION_GET_LOGS *Permission
-var PERMISSION_GET_ANALYTICS *Permission
-var PERMISSION_READ_LICENSE_INFORMATION *Permission
-var PERMISSION_MANAGE_LICENSE_INFORMATION *Permission
-
-var PERMISSION_SYSCONSOLE_READ_ABOUT *Permission
-var PERMISSION_SYSCONSOLE_WRITE_ABOUT *Permission
-
-var PERMISSION_SYSCONSOLE_READ_ABOUT_EDITION_AND_LICENSE *Permission
-var PERMISSION_SYSCONSOLE_WRITE_ABOUT_EDITION_AND_LICENSE *Permission
-
-var PERMISSION_SYSCONSOLE_READ_BILLING *Permission
-var PERMISSION_SYSCONSOLE_WRITE_BILLING *Permission
-
-var PERMISSION_SYSCONSOLE_READ_REPORTING *Permission
-var PERMISSION_SYSCONSOLE_WRITE_REPORTING *Permission
-
-var PERMISSION_SYSCONSOLE_READ_REPORTING_SITE_STATISTICS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_REPORTING_SITE_STATISTICS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_REPORTING_TEAM_STATISTICS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_REPORTING_TEAM_STATISTICS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_REPORTING_SERVER_LOGS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_REPORTING_SERVER_LOGS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_USERS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_USERS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_GROUPS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_GROUPS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_TEAMS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_TEAMS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_CHANNELS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_CHANNELS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_PERMISSIONS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_PERMISSIONS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_SYSTEM_ROLES *Permission
-var PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_SYSTEM_ROLES *Permission
-
-// DEPRECATED
-var PERMISSION_SYSCONSOLE_READ_ENVIRONMENT *Permission
-
-// DEPRECATED
-var PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT *Permission
-
-var PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_WEB_SERVER *Permission
-var PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_WEB_SERVER *Permission
-
-var PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_DATABASE *Permission
-var PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_DATABASE *Permission
-
-var PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_ELASTICSEARCH *Permission
-var PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_ELASTICSEARCH *Permission
-
-var PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_FILE_STORAGE *Permission
-var PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_FILE_STORAGE *Permission
-
-var PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_IMAGE_PROXY *Permission
-var PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_IMAGE_PROXY *Permission
-
-var PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_SMTP *Permission
-var PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_SMTP *Permission
-
-var PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_PUSH_NOTIFICATION_SERVER *Permission
-var PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_PUSH_NOTIFICATION_SERVER *Permission
-
-var PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_HIGH_AVAILABILITY *Permission
-var PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_HIGH_AVAILABILITY *Permission
-
-var PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_RATE_LIMITING *Permission
-var PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_RATE_LIMITING *Permission
-
-var PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_LOGGING *Permission
-var PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_LOGGING *Permission
-
-var PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_SESSION_LENGTHS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_SESSION_LENGTHS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_PERFORMANCE_MONITORING *Permission
-var PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_PERFORMANCE_MONITORING *Permission
-
-var PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_DEVELOPER *Permission
-var PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_DEVELOPER *Permission
-
-var PERMISSION_SYSCONSOLE_READ_SITE *Permission
-var PERMISSION_SYSCONSOLE_WRITE_SITE *Permission
-
-var PERMISSION_SYSCONSOLE_READ_SITE_CUSTOMIZATION *Permission
-var PERMISSION_SYSCONSOLE_WRITE_SITE_CUSTOMIZATION *Permission
-
-var PERMISSION_SYSCONSOLE_READ_SITE_LOCALIZATION *Permission
-var PERMISSION_SYSCONSOLE_WRITE_SITE_LOCALIZATION *Permission
-
-var PERMISSION_SYSCONSOLE_READ_SITE_USERS_AND_TEAMS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_SITE_USERS_AND_TEAMS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_SITE_NOTIFICATIONS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_SITE_NOTIFICATIONS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_SITE_ANNOUNCEMENT_BANNER *Permission
-var PERMISSION_SYSCONSOLE_WRITE_SITE_ANNOUNCEMENT_BANNER *Permission
-
-var PERMISSION_SYSCONSOLE_READ_SITE_EMOJI *Permission
-var PERMISSION_SYSCONSOLE_WRITE_SITE_EMOJI *Permission
-
-var PERMISSION_SYSCONSOLE_READ_SITE_POSTS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_SITE_POSTS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_SITE_FILE_SHARING_AND_DOWNLOADS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_SITE_FILE_SHARING_AND_DOWNLOADS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_SITE_PUBLIC_LINKS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_SITE_PUBLIC_LINKS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_SITE_NOTICES *Permission
-var PERMISSION_SYSCONSOLE_WRITE_SITE_NOTICES *Permission
-
-var PERMISSION_SYSCONSOLE_READ_AUTHENTICATION *Permission
-var PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION *Permission
-
-var PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_SIGNUP *Permission
-var PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_SIGNUP *Permission
-
-var PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_EMAIL *Permission
-var PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_EMAIL *Permission
-
-var PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_PASSWORD *Permission
-var PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_PASSWORD *Permission
-
-var PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_MFA *Permission
-var PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_MFA *Permission
-
-var PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_LDAP *Permission
-var PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_LDAP *Permission
-
-var PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_SAML *Permission
-var PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_SAML *Permission
-
-var PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_OPENID *Permission
-var PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_OPENID *Permission
-
-var PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_GUEST_ACCESS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_GUEST_ACCESS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_PLUGINS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_PLUGINS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_INTEGRATIONS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_INTEGRATION_MANAGEMENT *Permission
-var PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS_INTEGRATION_MANAGEMENT *Permission
-
-var PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_BOT_ACCOUNTS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS_BOT_ACCOUNTS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_GIF *Permission
-var PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS_GIF *Permission
-
-var PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_CORS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS_CORS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_COMPLIANCE *Permission
-var PERMISSION_SYSCONSOLE_WRITE_COMPLIANCE *Permission
-
-var PERMISSION_SYSCONSOLE_READ_COMPLIANCE_DATA_RETENTION_POLICY *Permission
-var PERMISSION_SYSCONSOLE_WRITE_COMPLIANCE_DATA_RETENTION_POLICY *Permission
-
-var PERMISSION_SYSCONSOLE_READ_COMPLIANCE_COMPLIANCE_EXPORT *Permission
-var PERMISSION_SYSCONSOLE_WRITE_COMPLIANCE_COMPLIANCE_EXPORT *Permission
-
-var PERMISSION_SYSCONSOLE_READ_COMPLIANCE_COMPLIANCE_MONITORING *Permission
-var PERMISSION_SYSCONSOLE_WRITE_COMPLIANCE_COMPLIANCE_MONITORING *Permission
-
-var PERMISSION_SYSCONSOLE_READ_COMPLIANCE_CUSTOM_TERMS_OF_SERVICE *Permission
-var PERMISSION_SYSCONSOLE_WRITE_COMPLIANCE_CUSTOM_TERMS_OF_SERVICE *Permission
-
-var PERMISSION_SYSCONSOLE_READ_EXPERIMENTAL *Permission
-var PERMISSION_SYSCONSOLE_WRITE_EXPERIMENTAL *Permission
-
-var PERMISSION_SYSCONSOLE_READ_EXPERIMENTAL_FEATURES *Permission
-var PERMISSION_SYSCONSOLE_WRITE_EXPERIMENTAL_FEATURES *Permission
-
-var PERMISSION_SYSCONSOLE_READ_EXPERIMENTAL_FEATURE_FLAGS *Permission
-var PERMISSION_SYSCONSOLE_WRITE_EXPERIMENTAL_FEATURE_FLAGS *Permission
-
-var PERMISSION_SYSCONSOLE_READ_EXPERIMENTAL_BLEVE *Permission
-var PERMISSION_SYSCONSOLE_WRITE_EXPERIMENTAL_BLEVE *Permission
-
-// General permission that encompasses all system admin functions
-// in the future this could be broken up to allow access to some
-// admin functions but not others
-var PERMISSION_MANAGE_SYSTEM *Permission
-
-var AllPermissions []*Permission
-var DeprecatedPermissions []*Permission
-
-var ChannelModeratedPermissions []string
-var ChannelModeratedPermissionsMap map[string]string
-
-var SysconsoleReadPermissions []*Permission
-var SysconsoleWritePermissions []*Permission
-
-func initializePermissions() {
-	PERMISSION_INVITE_USER = &Permission{
-		"invite_user",
-		"authentication.permissions.team_invite_user.name",
-		"authentication.permissions.team_invite_user.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_ADD_USER_TO_TEAM = &Permission{
-		"add_user_to_team",
-		"authentication.permissions.add_user_to_team.name",
-		"authentication.permissions.add_user_to_team.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_USE_SLASH_COMMANDS = &Permission{
-		"use_slash_commands",
-		"authentication.permissions.team_use_slash_commands.name",
-		"authentication.permissions.team_use_slash_commands.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_MANAGE_SLASH_COMMANDS = &Permission{
-		"manage_slash_commands",
-		"authentication.permissions.manage_slash_commands.name",
-		"authentication.permissions.manage_slash_commands.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_MANAGE_OTHERS_SLASH_COMMANDS = &Permission{
-		"manage_others_slash_commands",
-		"authentication.permissions.manage_others_slash_commands.name",
-		"authentication.permissions.manage_others_slash_commands.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_CREATE_PUBLIC_CHANNEL = &Permission{
-		"create_public_channel",
-		"authentication.permissions.create_public_channel.name",
-		"authentication.permissions.create_public_channel.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_CREATE_PRIVATE_CHANNEL = &Permission{
-		"create_private_channel",
-		"authentication.permissions.create_private_channel.name",
-		"authentication.permissions.create_private_channel.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_MANAGE_PUBLIC_CHANNEL_MEMBERS = &Permission{
-		"manage_public_channel_members",
-		"authentication.permissions.manage_public_channel_members.name",
-		"authentication.permissions.manage_public_channel_members.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS = &Permission{
-		"manage_private_channel_members",
-		"authentication.permissions.manage_private_channel_members.name",
-		"authentication.permissions.manage_private_channel_members.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_CONVERT_PUBLIC_CHANNEL_TO_PRIVATE = &Permission{
-		"convert_public_channel_to_private",
-		"authentication.permissions.convert_public_channel_to_private.name",
-		"authentication.permissions.convert_public_channel_to_private.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_CONVERT_PRIVATE_CHANNEL_TO_PUBLIC = &Permission{
-		"convert_private_channel_to_public",
-		"authentication.permissions.convert_private_channel_to_public.name",
-		"authentication.permissions.convert_private_channel_to_public.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_ASSIGN_SYSTEM_ADMIN_ROLE = &Permission{
-		"assign_system_admin_role",
-		"authentication.permissions.assign_system_admin_role.name",
-		"authentication.permissions.assign_system_admin_role.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_MANAGE_ROLES = &Permission{
-		"manage_roles",
-		"authentication.permissions.manage_roles.name",
-		"authentication.permissions.manage_roles.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_MANAGE_TEAM_ROLES = &Permission{
-		"manage_team_roles",
-		"authentication.permissions.manage_team_roles.name",
-		"authentication.permissions.manage_team_roles.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_MANAGE_CHANNEL_ROLES = &Permission{
-		"manage_channel_roles",
-		"authentication.permissions.manage_channel_roles.name",
-		"authentication.permissions.manage_channel_roles.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_MANAGE_SYSTEM = &Permission{
-		"manage_system",
-		"authentication.permissions.manage_system.name",
-		"authentication.permissions.manage_system.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_CREATE_DIRECT_CHANNEL = &Permission{
-		"create_direct_channel",
-		"authentication.permissions.create_direct_channel.name",
-		"authentication.permissions.create_direct_channel.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_CREATE_GROUP_CHANNEL = &Permission{
-		"create_group_channel",
-		"authentication.permissions.create_group_channel.name",
-		"authentication.permissions.create_group_channel.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES = &Permission{
-		"manage_public_channel_properties",
-		"authentication.permissions.manage_public_channel_properties.name",
-		"authentication.permissions.manage_public_channel_properties.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES = &Permission{
-		"manage_private_channel_properties",
-		"authentication.permissions.manage_private_channel_properties.name",
-		"authentication.permissions.manage_private_channel_properties.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_LIST_PUBLIC_TEAMS = &Permission{
-		"list_public_teams",
-		"authentication.permissions.list_public_teams.name",
-		"authentication.permissions.list_public_teams.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_JOIN_PUBLIC_TEAMS = &Permission{
-		"join_public_teams",
-		"authentication.permissions.join_public_teams.name",
-		"authentication.permissions.join_public_teams.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_LIST_PRIVATE_TEAMS = &Permission{
-		"list_private_teams",
-		"authentication.permissions.list_private_teams.name",
-		"authentication.permissions.list_private_teams.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_JOIN_PRIVATE_TEAMS = &Permission{
-		"join_private_teams",
-		"authentication.permissions.join_private_teams.name",
-		"authentication.permissions.join_private_teams.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_LIST_TEAM_CHANNELS = &Permission{
-		"list_team_channels",
-		"authentication.permissions.list_team_channels.name",
-		"authentication.permissions.list_team_channels.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_JOIN_PUBLIC_CHANNELS = &Permission{
-		"join_public_channels",
-		"authentication.permissions.join_public_channels.name",
-		"authentication.permissions.join_public_channels.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_DELETE_PUBLIC_CHANNEL = &Permission{
-		"delete_public_channel",
-		"authentication.permissions.delete_public_channel.name",
-		"authentication.permissions.delete_public_channel.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_DELETE_PRIVATE_CHANNEL = &Permission{
-		"delete_private_channel",
-		"authentication.permissions.delete_private_channel.name",
-		"authentication.permissions.delete_private_channel.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_EDIT_OTHER_USERS = &Permission{
-		"edit_other_users",
-		"authentication.permissions.edit_other_users.name",
-		"authentication.permissions.edit_other_users.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_READ_CHANNEL = &Permission{
-		"read_channel",
-		"authentication.permissions.read_channel.name",
-		"authentication.permissions.read_channel.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_READ_PUBLIC_CHANNEL_GROUPS = &Permission{
-		"read_public_channel_groups",
-		"authentication.permissions.read_public_channel_groups.name",
-		"authentication.permissions.read_public_channel_groups.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_READ_PRIVATE_CHANNEL_GROUPS = &Permission{
-		"read_private_channel_groups",
-		"authentication.permissions.read_private_channel_groups.name",
-		"authentication.permissions.read_private_channel_groups.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_READ_PUBLIC_CHANNEL = &Permission{
-		"read_public_channel",
-		"authentication.permissions.read_public_channel.name",
-		"authentication.permissions.read_public_channel.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_ADD_REACTION = &Permission{
-		"add_reaction",
-		"authentication.permissions.add_reaction.name",
-		"authentication.permissions.add_reaction.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_REMOVE_REACTION = &Permission{
-		"remove_reaction",
-		"authentication.permissions.remove_reaction.name",
-		"authentication.permissions.remove_reaction.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_REMOVE_OTHERS_REACTIONS = &Permission{
-		"remove_others_reactions",
-		"authentication.permissions.remove_others_reactions.name",
-		"authentication.permissions.remove_others_reactions.description",
-		PermissionScopeChannel,
-	}
-	// DEPRECATED
-	PERMISSION_PERMANENT_DELETE_USER = &Permission{
-		"permanent_delete_user",
-		"authentication.permissions.permanent_delete_user.name",
-		"authentication.permissions.permanent_delete_user.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_UPLOAD_FILE = &Permission{
-		"upload_file",
-		"authentication.permissions.upload_file.name",
-		"authentication.permissions.upload_file.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_GET_PUBLIC_LINK = &Permission{
-		"get_public_link",
-		"authentication.permissions.get_public_link.name",
-		"authentication.permissions.get_public_link.description",
-		PermissionScopeSystem,
-	}
-	// DEPRECATED
-	PERMISSION_MANAGE_WEBHOOKS = &Permission{
-		"manage_webhooks",
-		"authentication.permissions.manage_webhooks.name",
-		"authentication.permissions.manage_webhooks.description",
-		PermissionScopeTeam,
-	}
-	// DEPRECATED
-	PERMISSION_MANAGE_OTHERS_WEBHOOKS = &Permission{
-		"manage_others_webhooks",
-		"authentication.permissions.manage_others_webhooks.name",
-		"authentication.permissions.manage_others_webhooks.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_MANAGE_INCOMING_WEBHOOKS = &Permission{
-		"manage_incoming_webhooks",
-		"authentication.permissions.manage_incoming_webhooks.name",
-		"authentication.permissions.manage_incoming_webhooks.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_MANAGE_OUTGOING_WEBHOOKS = &Permission{
-		"manage_outgoing_webhooks",
-		"authentication.permissions.manage_outgoing_webhooks.name",
-		"authentication.permissions.manage_outgoing_webhooks.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_MANAGE_OTHERS_INCOMING_WEBHOOKS = &Permission{
-		"manage_others_incoming_webhooks",
-		"authentication.permissions.manage_others_incoming_webhooks.name",
-		"authentication.permissions.manage_others_incoming_webhooks.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_MANAGE_OTHERS_OUTGOING_WEBHOOKS = &Permission{
-		"manage_others_outgoing_webhooks",
-		"authentication.permissions.manage_others_outgoing_webhooks.name",
-		"authentication.permissions.manage_others_outgoing_webhooks.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_MANAGE_OAUTH = &Permission{
-		"manage_oauth",
-		"authentication.permissions.manage_oauth.name",
-		"authentication.permissions.manage_oauth.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_MANAGE_SYSTEM_WIDE_OAUTH = &Permission{
-		"manage_system_wide_oauth",
-		"authentication.permissions.manage_system_wide_oauth.name",
-		"authentication.permissions.manage_system_wide_oauth.description",
-		PermissionScopeSystem,
-	}
-	// DEPRECATED
-	PERMISSION_MANAGE_EMOJIS = &Permission{
-		"manage_emojis",
-		"authentication.permissions.manage_emojis.name",
-		"authentication.permissions.manage_emojis.description",
-		PermissionScopeTeam,
-	}
-	// DEPRECATED
-	PERMISSION_MANAGE_OTHERS_EMOJIS = &Permission{
-		"manage_others_emojis",
-		"authentication.permissions.manage_others_emojis.name",
-		"authentication.permissions.manage_others_emojis.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_CREATE_EMOJIS = &Permission{
-		"create_emojis",
-		"authentication.permissions.create_emojis.name",
-		"authentication.permissions.create_emojis.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_DELETE_EMOJIS = &Permission{
-		"delete_emojis",
-		"authentication.permissions.delete_emojis.name",
-		"authentication.permissions.delete_emojis.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_DELETE_OTHERS_EMOJIS = &Permission{
-		"delete_others_emojis",
-		"authentication.permissions.delete_others_emojis.name",
-		"authentication.permissions.delete_others_emojis.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_CREATE_POST = &Permission{
-		"create_post",
-		"authentication.permissions.create_post.name",
-		"authentication.permissions.create_post.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_CREATE_POST_PUBLIC = &Permission{
-		"create_post_public",
-		"authentication.permissions.create_post_public.name",
-		"authentication.permissions.create_post_public.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_CREATE_POST_EPHEMERAL = &Permission{
-		"create_post_ephemeral",
-		"authentication.permissions.create_post_ephemeral.name",
-		"authentication.permissions.create_post_ephemeral.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_EDIT_POST = &Permission{
-		"edit_post",
-		"authentication.permissions.edit_post.name",
-		"authentication.permissions.edit_post.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_EDIT_OTHERS_POSTS = &Permission{
-		"edit_others_posts",
-		"authentication.permissions.edit_others_posts.name",
-		"authentication.permissions.edit_others_posts.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_DELETE_POST = &Permission{
-		"delete_post",
-		"authentication.permissions.delete_post.name",
-		"authentication.permissions.delete_post.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_DELETE_OTHERS_POSTS = &Permission{
-		"delete_others_posts",
-		"authentication.permissions.delete_others_posts.name",
-		"authentication.permissions.delete_others_posts.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_MANAGE_SHARED_CHANNELS = &Permission{
-		"manage_shared_channels",
-		"authentication.permissions.manage_shared_channels.name",
-		"authentication.permissions.manage_shared_channels.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_MANAGE_SECURE_CONNECTIONS = &Permission{
-		"manage_secure_connections",
-		"authentication.permissions.manage_secure_connections.name",
-		"authentication.permissions.manage_secure_connections.description",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_CREATE_DATA_RETENTION_JOB = &Permission{
-		"create_data_retention_job",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_READ_DATA_RETENTION_JOB = &Permission{
-		"read_data_retention_job",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_CREATE_COMPLIANCE_EXPORT_JOB = &Permission{
-		"create_compliance_export_job",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_READ_COMPLIANCE_EXPORT_JOB = &Permission{
-		"read_compliance_export_job",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_READ_AUDITS = &Permission{
-		"read_audits",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_PURGE_BLEVE_INDEXES = &Permission{
-		"purge_bleve_indexes",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_CREATE_POST_BLEVE_INDEXES_JOB = &Permission{
-		"create_post_bleve_indexes_job",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_CREATE_LDAP_SYNC_JOB = &Permission{
-		"create_ldap_sync_job",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_READ_LDAP_SYNC_JOB = &Permission{
-		"read_ldap_sync_job",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_TEST_LDAP = &Permission{
-		"test_ldap",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_INVALIDATE_EMAIL_INVITE = &Permission{
-		"invalidate_email_invite",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_GET_SAML_METADATA_FROM_IDP = &Permission{
-		"get_saml_metadata_from_idp",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_ADD_SAML_PUBLIC_CERT = &Permission{
-		"add_saml_public_cert",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_ADD_SAML_PRIVATE_CERT = &Permission{
-		"add_saml_private_cert",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_ADD_SAML_IDP_CERT = &Permission{
-		"add_saml_idp_cert",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_REMOVE_SAML_PUBLIC_CERT = &Permission{
-		"remove_saml_public_cert",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_REMOVE_SAML_PRIVATE_CERT = &Permission{
-		"remove_saml_private_cert",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_REMOVE_SAML_IDP_CERT = &Permission{
-		"remove_saml_idp_cert",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_GET_SAML_CERT_STATUS = &Permission{
-		"get_saml_cert_status",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_ADD_LDAP_PUBLIC_CERT = &Permission{
-		"add_ldap_public_cert",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_ADD_LDAP_PRIVATE_CERT = &Permission{
-		"add_ldap_private_cert",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_REMOVE_LDAP_PUBLIC_CERT = &Permission{
-		"remove_ldap_public_cert",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_REMOVE_LDAP_PRIVATE_CERT = &Permission{
-		"remove_ldap_private_cert",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_GET_LOGS = &Permission{
-		"get_logs",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_READ_LICENSE_INFORMATION = &Permission{
-		"read_license_information",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_GET_ANALYTICS = &Permission{
-		"get_analytics",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_MANAGE_LICENSE_INFORMATION = &Permission{
-		"manage_license_information",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_DOWNLOAD_COMPLIANCE_EXPORT_RESULT = &Permission{
-		"download_compliance_export_result",
-		"authentication.permissions.download_compliance_export_result.name",
-		"authentication.permissions.download_compliance_export_result.description",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_TEST_SITE_URL = &Permission{
-		"test_site_url",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_TEST_ELASTICSEARCH = &Permission{
-		"test_elasticsearch",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_TEST_S3 = &Permission{
-		"test_s3",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_RELOAD_CONFIG = &Permission{
-		"reload_config",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_INVALIDATE_CACHES = &Permission{
-		"invalidate_caches",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_RECYCLE_DATABASE_CONNECTIONS = &Permission{
-		"recycle_database_connections",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_PURGE_ELASTICSEARCH_INDEXES = &Permission{
-		"purge_elasticsearch_indexes",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_TEST_EMAIL = &Permission{
-		"test_email",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_CREATE_ELASTICSEARCH_POST_INDEXING_JOB = &Permission{
-		"create_elasticsearch_post_indexing_job",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_CREATE_ELASTICSEARCH_POST_AGGREGATION_JOB = &Permission{
-		"create_elasticsearch_post_aggregation_job",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_READ_ELASTICSEARCH_POST_INDEXING_JOB = &Permission{
-		"read_elasticsearch_post_indexing_job",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_READ_ELASTICSEARCH_POST_AGGREGATION_JOB = &Permission{
-		"read_elasticsearch_post_aggregation_job",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_REMOVE_USER_FROM_TEAM = &Permission{
-		"remove_user_from_team",
-		"authentication.permissions.remove_user_from_team.name",
-		"authentication.permissions.remove_user_from_team.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_CREATE_TEAM = &Permission{
-		"create_team",
-		"authentication.permissions.create_team.name",
-		"authentication.permissions.create_team.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_MANAGE_TEAM = &Permission{
-		"manage_team",
-		"authentication.permissions.manage_team.name",
-		"authentication.permissions.manage_team.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_IMPORT_TEAM = &Permission{
-		"import_team",
-		"authentication.permissions.import_team.name",
-		"authentication.permissions.import_team.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_VIEW_TEAM = &Permission{
-		"view_team",
-		"authentication.permissions.view_team.name",
-		"authentication.permissions.view_team.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_LIST_USERS_WITHOUT_TEAM = &Permission{
-		"list_users_without_team",
-		"authentication.permissions.list_users_without_team.name",
-		"authentication.permissions.list_users_without_team.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_CREATE_USER_ACCESS_TOKEN = &Permission{
-		"create_user_access_token",
-		"authentication.permissions.create_user_access_token.name",
-		"authentication.permissions.create_user_access_token.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_READ_USER_ACCESS_TOKEN = &Permission{
-		"read_user_access_token",
-		"authentication.permissions.read_user_access_token.name",
-		"authentication.permissions.read_user_access_token.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_REVOKE_USER_ACCESS_TOKEN = &Permission{
-		"revoke_user_access_token",
-		"authentication.permissions.revoke_user_access_token.name",
-		"authentication.permissions.revoke_user_access_token.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_CREATE_BOT = &Permission{
-		"create_bot",
-		"authentication.permissions.create_bot.name",
-		"authentication.permissions.create_bot.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_ASSIGN_BOT = &Permission{
-		"assign_bot",
-		"authentication.permissions.assign_bot.name",
-		"authentication.permissions.assign_bot.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_READ_BOTS = &Permission{
-		"read_bots",
-		"authentication.permissions.read_bots.name",
-		"authentication.permissions.read_bots.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_READ_OTHERS_BOTS = &Permission{
-		"read_others_bots",
-		"authentication.permissions.read_others_bots.name",
-		"authentication.permissions.read_others_bots.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_MANAGE_BOTS = &Permission{
-		"manage_bots",
-		"authentication.permissions.manage_bots.name",
-		"authentication.permissions.manage_bots.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_MANAGE_OTHERS_BOTS = &Permission{
-		"manage_others_bots",
-		"authentication.permissions.manage_others_bots.name",
-		"authentication.permissions.manage_others_bots.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_READ_JOBS = &Permission{
-		"read_jobs",
-		"authentication.permisssions.read_jobs.name",
-		"authentication.permisssions.read_jobs.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_MANAGE_JOBS = &Permission{
-		"manage_jobs",
-		"authentication.permisssions.manage_jobs.name",
-		"authentication.permisssions.manage_jobs.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_VIEW_MEMBERS = &Permission{
-		"view_members",
-		"authentication.permisssions.view_members.name",
-		"authentication.permisssions.view_members.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_INVITE_GUEST = &Permission{
-		"invite_guest",
-		"authentication.permissions.invite_guest.name",
-		"authentication.permissions.invite_guest.description",
-		PermissionScopeTeam,
-	}
-	PERMISSION_PROMOTE_GUEST = &Permission{
-		"promote_guest",
-		"authentication.permissions.promote_guest.name",
-		"authentication.permissions.promote_guest.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_DEMOTE_TO_GUEST = &Permission{
-		"demote_to_guest",
-		"authentication.permissions.demote_to_guest.name",
-		"authentication.permissions.demote_to_guest.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_USE_CHANNEL_MENTIONS = &Permission{
-		"use_channel_mentions",
-		"authentication.permissions.use_channel_mentions.name",
-		"authentication.permissions.use_channel_mentions.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_USE_GROUP_MENTIONS = &Permission{
-		"use_group_mentions",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeChannel,
-	}
-	PERMISSION_READ_OTHER_USERS_TEAMS = &Permission{
-		"read_other_users_teams",
-		"authentication.permissions.read_other_users_teams.name",
-		"authentication.permissions.read_other_users_teams.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_EDIT_BRAND = &Permission{
-		"edit_brand",
-		"authentication.permissions.edit_brand.name",
-		"authentication.permissions.edit_brand.description",
-		PermissionScopeSystem,
-	}
-	// DEPRECATED
-	PERMISSION_SYSCONSOLE_READ_ABOUT = &Permission{
-		"sysconsole_read_about",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	// DEPRECATED
-	PERMISSION_SYSCONSOLE_WRITE_ABOUT = &Permission{
-		"sysconsole_write_about",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_ABOUT_EDITION_AND_LICENSE = &Permission{
-		"sysconsole_read_about_edition_and_license",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_ABOUT_EDITION_AND_LICENSE = &Permission{
-		"sysconsole_write_about_edition_and_license",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_BILLING = &Permission{
-		"sysconsole_read_billing",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_BILLING = &Permission{
-		"sysconsole_write_billing",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	// DEPRECATED
-	PERMISSION_SYSCONSOLE_READ_REPORTING = &Permission{
-		"sysconsole_read_reporting",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	// DEPRECATED
-	PERMISSION_SYSCONSOLE_WRITE_REPORTING = &Permission{
-		"sysconsole_write_reporting",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_REPORTING_SITE_STATISTICS = &Permission{
-		"sysconsole_read_reporting_site_statistics",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_REPORTING_SITE_STATISTICS = &Permission{
-		"sysconsole_write_reporting_site_statistics",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_REPORTING_TEAM_STATISTICS = &Permission{
-		"sysconsole_read_reporting_team_statistics",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_REPORTING_TEAM_STATISTICS = &Permission{
-		"sysconsole_write_reporting_team_statistics",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_REPORTING_SERVER_LOGS = &Permission{
-		"sysconsole_read_reporting_server_logs",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_REPORTING_SERVER_LOGS = &Permission{
-		"sysconsole_write_reporting_server_logs",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_USERS = &Permission{
-		"sysconsole_read_user_management_users",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_USERS = &Permission{
-		"sysconsole_write_user_management_users",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_GROUPS = &Permission{
-		"sysconsole_read_user_management_groups",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_GROUPS = &Permission{
-		"sysconsole_write_user_management_groups",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_TEAMS = &Permission{
-		"sysconsole_read_user_management_teams",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_TEAMS = &Permission{
-		"sysconsole_write_user_management_teams",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_CHANNELS = &Permission{
-		"sysconsole_read_user_management_channels",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_CHANNELS = &Permission{
-		"sysconsole_write_user_management_channels",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_PERMISSIONS = &Permission{
-		"sysconsole_read_user_management_permissions",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_PERMISSIONS = &Permission{
-		"sysconsole_write_user_management_permissions",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_SYSTEM_ROLES = &Permission{
-		"sysconsole_read_user_management_system_roles",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_SYSTEM_ROLES = &Permission{
-		"sysconsole_write_user_management_system_roles",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	// DEPRECATED
-	PERMISSION_SYSCONSOLE_READ_ENVIRONMENT = &Permission{
-		"sysconsole_read_environment",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	// DEPRECATED
-	PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT = &Permission{
-		"sysconsole_write_environment",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_WEB_SERVER = &Permission{
-		"sysconsole_read_environment_web_server",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_WEB_SERVER = &Permission{
-		"sysconsole_write_environment_web_server",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_DATABASE = &Permission{
-		"sysconsole_read_environment_database",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_DATABASE = &Permission{
-		"sysconsole_write_environment_database",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_ELASTICSEARCH = &Permission{
-		"sysconsole_read_environment_elasticsearch",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_ELASTICSEARCH = &Permission{
-		"sysconsole_write_environment_elasticsearch",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_FILE_STORAGE = &Permission{
-		"sysconsole_read_environment_file_storage",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_FILE_STORAGE = &Permission{
-		"sysconsole_write_environment_file_storage",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_IMAGE_PROXY = &Permission{
-		"sysconsole_read_environment_image_proxy",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_IMAGE_PROXY = &Permission{
-		"sysconsole_write_environment_image_proxy",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_SMTP = &Permission{
-		"sysconsole_read_environment_smtp",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_SMTP = &Permission{
-		"sysconsole_write_environment_smtp",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_PUSH_NOTIFICATION_SERVER = &Permission{
-		"sysconsole_read_environment_push_notification_server",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_PUSH_NOTIFICATION_SERVER = &Permission{
-		"sysconsole_write_environment_push_notification_server",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_HIGH_AVAILABILITY = &Permission{
-		"sysconsole_read_environment_high_availability",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_HIGH_AVAILABILITY = &Permission{
-		"sysconsole_write_environment_high_availability",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_RATE_LIMITING = &Permission{
-		"sysconsole_read_environment_rate_limiting",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_RATE_LIMITING = &Permission{
-		"sysconsole_write_environment_rate_limiting",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_LOGGING = &Permission{
-		"sysconsole_read_environment_logging",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_LOGGING = &Permission{
-		"sysconsole_write_environment_logging",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_SESSION_LENGTHS = &Permission{
-		"sysconsole_read_environment_session_lengths",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_SESSION_LENGTHS = &Permission{
-		"sysconsole_write_environment_session_lengths",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_PERFORMANCE_MONITORING = &Permission{
-		"sysconsole_read_environment_performance_monitoring",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_PERFORMANCE_MONITORING = &Permission{
-		"sysconsole_write_environment_performance_monitoring",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_DEVELOPER = &Permission{
-		"sysconsole_read_environment_developer",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_DEVELOPER = &Permission{
-		"sysconsole_write_environment_developer",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	// DEPRECATED
-	PERMISSION_SYSCONSOLE_READ_SITE = &Permission{
-		"sysconsole_read_site",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	// DEPRECATED
-	PERMISSION_SYSCONSOLE_WRITE_SITE = &Permission{
-		"sysconsole_write_site",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-
-	PERMISSION_SYSCONSOLE_READ_SITE_CUSTOMIZATION = &Permission{
-		"sysconsole_read_site_customization",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_SITE_CUSTOMIZATION = &Permission{
-		"sysconsole_write_site_customization",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_SITE_LOCALIZATION = &Permission{
-		"sysconsole_read_site_localization",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_SITE_LOCALIZATION = &Permission{
-		"sysconsole_write_site_localization",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_SITE_USERS_AND_TEAMS = &Permission{
-		"sysconsole_read_site_users_and_teams",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_SITE_USERS_AND_TEAMS = &Permission{
-		"sysconsole_write_site_users_and_teams",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_SITE_NOTIFICATIONS = &Permission{
-		"sysconsole_read_site_notifications",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_SITE_NOTIFICATIONS = &Permission{
-		"sysconsole_write_site_notifications",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_SITE_ANNOUNCEMENT_BANNER = &Permission{
-		"sysconsole_read_site_announcement_banner",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_SITE_ANNOUNCEMENT_BANNER = &Permission{
-		"sysconsole_write_site_announcement_banner",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_SITE_EMOJI = &Permission{
-		"sysconsole_read_site_emoji",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_SITE_EMOJI = &Permission{
-		"sysconsole_write_site_emoji",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_SITE_POSTS = &Permission{
-		"sysconsole_read_site_posts",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_SITE_POSTS = &Permission{
-		"sysconsole_write_site_posts",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_SITE_FILE_SHARING_AND_DOWNLOADS = &Permission{
-		"sysconsole_read_site_file_sharing_and_downloads",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_SITE_FILE_SHARING_AND_DOWNLOADS = &Permission{
-		"sysconsole_write_site_file_sharing_and_downloads",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_SITE_PUBLIC_LINKS = &Permission{
-		"sysconsole_read_site_public_links",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_SITE_PUBLIC_LINKS = &Permission{
-		"sysconsole_write_site_public_links",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_SITE_NOTICES = &Permission{
-		"sysconsole_read_site_notices",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_SITE_NOTICES = &Permission{
-		"sysconsole_write_site_notices",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	// Deprecated
-	PERMISSION_SYSCONSOLE_READ_AUTHENTICATION = &Permission{
-		"sysconsole_read_authentication",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	// Deprecated
-	PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION = &Permission{
-		"sysconsole_write_authentication",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_SIGNUP = &Permission{
-		"sysconsole_read_authentication_signup",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_SIGNUP = &Permission{
-		"sysconsole_write_authentication_signup",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_EMAIL = &Permission{
-		"sysconsole_read_authentication_email",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_EMAIL = &Permission{
-		"sysconsole_write_authentication_email",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_PASSWORD = &Permission{
-		"sysconsole_read_authentication_password",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_PASSWORD = &Permission{
-		"sysconsole_write_authentication_password",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_MFA = &Permission{
-		"sysconsole_read_authentication_mfa",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_MFA = &Permission{
-		"sysconsole_write_authentication_mfa",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_LDAP = &Permission{
-		"sysconsole_read_authentication_ldap",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_LDAP = &Permission{
-		"sysconsole_write_authentication_ldap",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_SAML = &Permission{
-		"sysconsole_read_authentication_saml",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_SAML = &Permission{
-		"sysconsole_write_authentication_saml",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_OPENID = &Permission{
-		"sysconsole_read_authentication_openid",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_OPENID = &Permission{
-		"sysconsole_write_authentication_openid",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_GUEST_ACCESS = &Permission{
-		"sysconsole_read_authentication_guest_access",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_GUEST_ACCESS = &Permission{
-		"sysconsole_write_authentication_guest_access",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_PLUGINS = &Permission{
-		"sysconsole_read_plugins",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_PLUGINS = &Permission{
-		"sysconsole_write_plugins",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	// DEPRECATED
-	PERMISSION_SYSCONSOLE_READ_INTEGRATIONS = &Permission{
-		"sysconsole_read_integrations",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	// DEPRECATED
-	PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS = &Permission{
-		"sysconsole_write_integrations",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_INTEGRATION_MANAGEMENT = &Permission{
-		"sysconsole_read_integrations_integration_management",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS_INTEGRATION_MANAGEMENT = &Permission{
-		"sysconsole_write_integrations_integration_management",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_BOT_ACCOUNTS = &Permission{
-		"sysconsole_read_integrations_bot_accounts",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS_BOT_ACCOUNTS = &Permission{
-		"sysconsole_write_integrations_bot_accounts",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_GIF = &Permission{
-		"sysconsole_read_integrations_gif",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS_GIF = &Permission{
-		"sysconsole_write_integrations_gif",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_CORS = &Permission{
-		"sysconsole_read_integrations_cors",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS_CORS = &Permission{
-		"sysconsole_write_integrations_cors",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	// DEPRECATED
-	PERMISSION_SYSCONSOLE_READ_COMPLIANCE = &Permission{
-		"sysconsole_read_compliance",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	// DEPRECATED
-	PERMISSION_SYSCONSOLE_WRITE_COMPLIANCE = &Permission{
-		"sysconsole_write_compliance",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_COMPLIANCE_DATA_RETENTION_POLICY = &Permission{
-		"sysconsole_read_compliance_data_retention_policy",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_COMPLIANCE_DATA_RETENTION_POLICY = &Permission{
-		"sysconsole_write_compliance_data_retention_policy",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_COMPLIANCE_COMPLIANCE_EXPORT = &Permission{
-		"sysconsole_read_compliance_compliance_export",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_COMPLIANCE_COMPLIANCE_EXPORT = &Permission{
-		"sysconsole_write_compliance_compliance_export",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_COMPLIANCE_COMPLIANCE_MONITORING = &Permission{
-		"sysconsole_read_compliance_compliance_monitoring",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_COMPLIANCE_COMPLIANCE_MONITORING = &Permission{
-		"sysconsole_write_compliance_compliance_monitoring",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_COMPLIANCE_CUSTOM_TERMS_OF_SERVICE = &Permission{
-		"sysconsole_read_compliance_custom_terms_of_service",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_COMPLIANCE_CUSTOM_TERMS_OF_SERVICE = &Permission{
-		"sysconsole_write_compliance_custom_terms_of_service",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	// DEPRECATED
-	PERMISSION_SYSCONSOLE_READ_EXPERIMENTAL = &Permission{
-		"sysconsole_read_experimental",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	// DEPRECATED
-	PERMISSION_SYSCONSOLE_WRITE_EXPERIMENTAL = &Permission{
-		"sysconsole_write_experimental",
-		"authentication.permissions.use_group_mentions.name",
-		"authentication.permissions.use_group_mentions.description",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_EXPERIMENTAL_FEATURES = &Permission{
-		"sysconsole_read_experimental_features",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_EXPERIMENTAL_FEATURES = &Permission{
-		"sysconsole_write_experimental_features",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_EXPERIMENTAL_FEATURE_FLAGS = &Permission{
-		"sysconsole_read_experimental_feature_flags",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_EXPERIMENTAL_FEATURE_FLAGS = &Permission{
-		"sysconsole_write_experimental_feature_flags",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_READ_EXPERIMENTAL_BLEVE = &Permission{
-		"sysconsole_read_experimental_bleve",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-	PERMISSION_SYSCONSOLE_WRITE_EXPERIMENTAL_BLEVE = &Permission{
-		"sysconsole_write_experimental_bleve",
-		"",
-		"",
-		PermissionScopeSystem,
-	}
-
-	SysconsoleReadPermissions = []*Permission{
-		PERMISSION_SYSCONSOLE_READ_ABOUT_EDITION_AND_LICENSE,
-		PERMISSION_SYSCONSOLE_READ_BILLING,
-		PERMISSION_SYSCONSOLE_READ_REPORTING_SITE_STATISTICS,
-		PERMISSION_SYSCONSOLE_READ_REPORTING_TEAM_STATISTICS,
-		PERMISSION_SYSCONSOLE_READ_REPORTING_SERVER_LOGS,
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_USERS,
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_GROUPS,
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_TEAMS,
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_CHANNELS,
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_PERMISSIONS,
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_SYSTEM_ROLES,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_WEB_SERVER,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_DATABASE,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_ELASTICSEARCH,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_FILE_STORAGE,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_IMAGE_PROXY,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_SMTP,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_PUSH_NOTIFICATION_SERVER,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_HIGH_AVAILABILITY,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_RATE_LIMITING,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_LOGGING,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_SESSION_LENGTHS,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_PERFORMANCE_MONITORING,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_DEVELOPER,
-		PERMISSION_SYSCONSOLE_READ_SITE_CUSTOMIZATION,
-		PERMISSION_SYSCONSOLE_READ_SITE_LOCALIZATION,
-		PERMISSION_SYSCONSOLE_READ_SITE_USERS_AND_TEAMS,
-		PERMISSION_SYSCONSOLE_READ_SITE_NOTIFICATIONS,
-		PERMISSION_SYSCONSOLE_READ_SITE_ANNOUNCEMENT_BANNER,
-		PERMISSION_SYSCONSOLE_READ_SITE_EMOJI,
-		PERMISSION_SYSCONSOLE_READ_SITE_POSTS,
-		PERMISSION_SYSCONSOLE_READ_SITE_FILE_SHARING_AND_DOWNLOADS,
-		PERMISSION_SYSCONSOLE_READ_SITE_PUBLIC_LINKS,
-		PERMISSION_SYSCONSOLE_READ_SITE_NOTICES,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_SIGNUP,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_EMAIL,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_PASSWORD,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_MFA,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_LDAP,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_SAML,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_OPENID,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_GUEST_ACCESS,
-		PERMISSION_SYSCONSOLE_READ_PLUGINS,
-		PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_INTEGRATION_MANAGEMENT,
-		PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_BOT_ACCOUNTS,
-		PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_GIF,
-		PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_CORS,
-		PERMISSION_SYSCONSOLE_READ_COMPLIANCE_DATA_RETENTION_POLICY,
-		PERMISSION_SYSCONSOLE_READ_COMPLIANCE_COMPLIANCE_EXPORT,
-		PERMISSION_SYSCONSOLE_READ_COMPLIANCE_COMPLIANCE_MONITORING,
-		PERMISSION_SYSCONSOLE_READ_COMPLIANCE_CUSTOM_TERMS_OF_SERVICE,
-		PERMISSION_SYSCONSOLE_READ_EXPERIMENTAL_FEATURES,
-		PERMISSION_SYSCONSOLE_READ_EXPERIMENTAL_FEATURE_FLAGS,
-		PERMISSION_SYSCONSOLE_READ_EXPERIMENTAL_BLEVE,
-	}
-
-	SysconsoleWritePermissions = []*Permission{
-		PERMISSION_SYSCONSOLE_WRITE_ABOUT_EDITION_AND_LICENSE,
-		PERMISSION_SYSCONSOLE_WRITE_BILLING,
-		PERMISSION_SYSCONSOLE_WRITE_REPORTING_SITE_STATISTICS,
-		PERMISSION_SYSCONSOLE_WRITE_REPORTING_TEAM_STATISTICS,
-		PERMISSION_SYSCONSOLE_WRITE_REPORTING_SERVER_LOGS,
-		PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_USERS,
-		PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_GROUPS,
-		PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_TEAMS,
-		PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_CHANNELS,
-		PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_PERMISSIONS,
-		PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_SYSTEM_ROLES,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_WEB_SERVER,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_DATABASE,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_ELASTICSEARCH,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_FILE_STORAGE,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_IMAGE_PROXY,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_SMTP,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_PUSH_NOTIFICATION_SERVER,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_HIGH_AVAILABILITY,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_RATE_LIMITING,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_LOGGING,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_SESSION_LENGTHS,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_PERFORMANCE_MONITORING,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_DEVELOPER,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_CUSTOMIZATION,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_LOCALIZATION,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_USERS_AND_TEAMS,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_NOTIFICATIONS,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_ANNOUNCEMENT_BANNER,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_EMOJI,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_POSTS,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_FILE_SHARING_AND_DOWNLOADS,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_PUBLIC_LINKS,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_NOTICES,
-		PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_SIGNUP,
-		PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_EMAIL,
-		PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_PASSWORD,
-		PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_MFA,
-		PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_LDAP,
-		PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_SAML,
-		PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_OPENID,
-		PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_GUEST_ACCESS,
-		PERMISSION_SYSCONSOLE_WRITE_PLUGINS,
-		PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS_INTEGRATION_MANAGEMENT,
-		PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS_BOT_ACCOUNTS,
-		PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS_GIF,
-		PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS_CORS,
-		PERMISSION_SYSCONSOLE_WRITE_COMPLIANCE_DATA_RETENTION_POLICY,
-		PERMISSION_SYSCONSOLE_WRITE_COMPLIANCE_COMPLIANCE_EXPORT,
-		PERMISSION_SYSCONSOLE_WRITE_COMPLIANCE_COMPLIANCE_MONITORING,
-		PERMISSION_SYSCONSOLE_WRITE_COMPLIANCE_CUSTOM_TERMS_OF_SERVICE,
-		PERMISSION_SYSCONSOLE_WRITE_EXPERIMENTAL_FEATURES,
-		PERMISSION_SYSCONSOLE_WRITE_EXPERIMENTAL_FEATURE_FLAGS,
-		PERMISSION_SYSCONSOLE_WRITE_EXPERIMENTAL_BLEVE,
-	}
-
-	SystemScopedPermissionsMinusSysconsole := []*Permission{
-		PERMISSION_ASSIGN_SYSTEM_ADMIN_ROLE,
-		PERMISSION_MANAGE_ROLES,
-		PERMISSION_MANAGE_SYSTEM,
-		PERMISSION_CREATE_DIRECT_CHANNEL,
-		PERMISSION_CREATE_GROUP_CHANNEL,
-		PERMISSION_LIST_PUBLIC_TEAMS,
-		PERMISSION_JOIN_PUBLIC_TEAMS,
-		PERMISSION_LIST_PRIVATE_TEAMS,
-		PERMISSION_JOIN_PRIVATE_TEAMS,
-		PERMISSION_EDIT_OTHER_USERS,
-		PERMISSION_READ_OTHER_USERS_TEAMS,
-		PERMISSION_GET_PUBLIC_LINK,
-		PERMISSION_MANAGE_OAUTH,
-		PERMISSION_MANAGE_SYSTEM_WIDE_OAUTH,
-		PERMISSION_CREATE_TEAM,
-		PERMISSION_LIST_USERS_WITHOUT_TEAM,
-		PERMISSION_CREATE_USER_ACCESS_TOKEN,
-		PERMISSION_READ_USER_ACCESS_TOKEN,
-		PERMISSION_REVOKE_USER_ACCESS_TOKEN,
-		PERMISSION_CREATE_BOT,
-		PERMISSION_ASSIGN_BOT,
-		PERMISSION_READ_BOTS,
-		PERMISSION_READ_OTHERS_BOTS,
-		PERMISSION_MANAGE_BOTS,
-		PERMISSION_MANAGE_OTHERS_BOTS,
-		PERMISSION_READ_JOBS,
-		PERMISSION_MANAGE_JOBS,
-		PERMISSION_PROMOTE_GUEST,
-		PERMISSION_DEMOTE_TO_GUEST,
-		PERMISSION_EDIT_BRAND,
-		PERMISSION_MANAGE_SHARED_CHANNELS,
-		PERMISSION_MANAGE_SECURE_CONNECTIONS,
-		PERMISSION_DOWNLOAD_COMPLIANCE_EXPORT_RESULT,
-		PERMISSION_CREATE_DATA_RETENTION_JOB,
-		PERMISSION_READ_DATA_RETENTION_JOB,
-		PERMISSION_CREATE_COMPLIANCE_EXPORT_JOB,
-		PERMISSION_READ_COMPLIANCE_EXPORT_JOB,
-		PERMISSION_READ_AUDITS,
-		PERMISSION_TEST_SITE_URL,
-		PERMISSION_TEST_ELASTICSEARCH,
-		PERMISSION_TEST_S3,
-		PERMISSION_RELOAD_CONFIG,
-		PERMISSION_INVALIDATE_CACHES,
-		PERMISSION_RECYCLE_DATABASE_CONNECTIONS,
-		PERMISSION_PURGE_ELASTICSEARCH_INDEXES,
-		PERMISSION_TEST_EMAIL,
-		PERMISSION_CREATE_ELASTICSEARCH_POST_INDEXING_JOB,
-		PERMISSION_CREATE_ELASTICSEARCH_POST_AGGREGATION_JOB,
-		PERMISSION_READ_ELASTICSEARCH_POST_INDEXING_JOB,
-		PERMISSION_READ_ELASTICSEARCH_POST_AGGREGATION_JOB,
-		PERMISSION_PURGE_BLEVE_INDEXES,
-		PERMISSION_CREATE_POST_BLEVE_INDEXES_JOB,
-		PERMISSION_CREATE_LDAP_SYNC_JOB,
-		PERMISSION_READ_LDAP_SYNC_JOB,
-		PERMISSION_TEST_LDAP,
-		PERMISSION_INVALIDATE_EMAIL_INVITE,
-		PERMISSION_GET_SAML_METADATA_FROM_IDP,
-		PERMISSION_ADD_SAML_PUBLIC_CERT,
-		PERMISSION_ADD_SAML_PRIVATE_CERT,
-		PERMISSION_ADD_SAML_IDP_CERT,
-		PERMISSION_REMOVE_SAML_PUBLIC_CERT,
-		PERMISSION_REMOVE_SAML_PRIVATE_CERT,
-		PERMISSION_REMOVE_SAML_IDP_CERT,
-		PERMISSION_GET_SAML_CERT_STATUS,
-		PERMISSION_ADD_LDAP_PUBLIC_CERT,
-		PERMISSION_ADD_LDAP_PRIVATE_CERT,
-		PERMISSION_REMOVE_LDAP_PUBLIC_CERT,
-		PERMISSION_REMOVE_LDAP_PRIVATE_CERT,
-		PERMISSION_GET_ANALYTICS,
-		PERMISSION_GET_LOGS,
-		PERMISSION_READ_LICENSE_INFORMATION,
-		PERMISSION_MANAGE_LICENSE_INFORMATION,
-	}
-
-	TeamScopedPermissions := []*Permission{
-		PERMISSION_INVITE_USER,
-		PERMISSION_ADD_USER_TO_TEAM,
-		PERMISSION_MANAGE_SLASH_COMMANDS,
-		PERMISSION_MANAGE_OTHERS_SLASH_COMMANDS,
-		PERMISSION_CREATE_PUBLIC_CHANNEL,
-		PERMISSION_CREATE_PRIVATE_CHANNEL,
-		PERMISSION_MANAGE_TEAM_ROLES,
-		PERMISSION_LIST_TEAM_CHANNELS,
-		PERMISSION_JOIN_PUBLIC_CHANNELS,
-		PERMISSION_READ_PUBLIC_CHANNEL,
-		PERMISSION_MANAGE_INCOMING_WEBHOOKS,
-		PERMISSION_MANAGE_OUTGOING_WEBHOOKS,
-		PERMISSION_MANAGE_OTHERS_INCOMING_WEBHOOKS,
-		PERMISSION_MANAGE_OTHERS_OUTGOING_WEBHOOKS,
-		PERMISSION_CREATE_EMOJIS,
-		PERMISSION_DELETE_EMOJIS,
-		PERMISSION_DELETE_OTHERS_EMOJIS,
-		PERMISSION_REMOVE_USER_FROM_TEAM,
-		PERMISSION_MANAGE_TEAM,
-		PERMISSION_IMPORT_TEAM,
-		PERMISSION_VIEW_TEAM,
-		PERMISSION_VIEW_MEMBERS,
-		PERMISSION_INVITE_GUEST,
-	}
-
-	ChannelScopedPermissions := []*Permission{
-		PERMISSION_USE_SLASH_COMMANDS,
-		PERMISSION_MANAGE_PUBLIC_CHANNEL_MEMBERS,
-		PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS,
-		PERMISSION_MANAGE_CHANNEL_ROLES,
-		PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES,
-		PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES,
-		PERMISSION_CONVERT_PUBLIC_CHANNEL_TO_PRIVATE,
-		PERMISSION_CONVERT_PRIVATE_CHANNEL_TO_PUBLIC,
-		PERMISSION_DELETE_PUBLIC_CHANNEL,
-		PERMISSION_DELETE_PRIVATE_CHANNEL,
-		PERMISSION_READ_CHANNEL,
-		PERMISSION_READ_PUBLIC_CHANNEL_GROUPS,
-		PERMISSION_READ_PRIVATE_CHANNEL_GROUPS,
-		PERMISSION_ADD_REACTION,
-		PERMISSION_REMOVE_REACTION,
-		PERMISSION_REMOVE_OTHERS_REACTIONS,
-		PERMISSION_UPLOAD_FILE,
-		PERMISSION_CREATE_POST,
-		PERMISSION_CREATE_POST_PUBLIC,
-		PERMISSION_CREATE_POST_EPHEMERAL,
-		PERMISSION_EDIT_POST,
-		PERMISSION_EDIT_OTHERS_POSTS,
-		PERMISSION_DELETE_POST,
-		PERMISSION_DELETE_OTHERS_POSTS,
-		PERMISSION_USE_CHANNEL_MENTIONS,
-		PERMISSION_USE_GROUP_MENTIONS,
-	}
-
-	DeprecatedPermissions = []*Permission{
-		PERMISSION_PERMANENT_DELETE_USER,
-		PERMISSION_MANAGE_WEBHOOKS,
-		PERMISSION_MANAGE_OTHERS_WEBHOOKS,
-		PERMISSION_MANAGE_EMOJIS,
-		PERMISSION_MANAGE_OTHERS_EMOJIS,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION,
-		PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION,
-		PERMISSION_SYSCONSOLE_READ_SITE,
-		PERMISSION_SYSCONSOLE_WRITE_SITE,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT,
-		PERMISSION_SYSCONSOLE_READ_REPORTING,
-		PERMISSION_SYSCONSOLE_WRITE_REPORTING,
-		PERMISSION_SYSCONSOLE_READ_ABOUT,
-		PERMISSION_SYSCONSOLE_WRITE_ABOUT,
-		PERMISSION_SYSCONSOLE_READ_EXPERIMENTAL,
-		PERMISSION_SYSCONSOLE_WRITE_EXPERIMENTAL,
-		PERMISSION_SYSCONSOLE_READ_INTEGRATIONS,
-		PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS,
-		PERMISSION_SYSCONSOLE_READ_COMPLIANCE,
-		PERMISSION_SYSCONSOLE_WRITE_COMPLIANCE,
-	}
-
-	AllPermissions = []*Permission{}
-	AllPermissions = append(AllPermissions, SystemScopedPermissionsMinusSysconsole...)
-	AllPermissions = append(AllPermissions, TeamScopedPermissions...)
-	AllPermissions = append(AllPermissions, ChannelScopedPermissions...)
-	AllPermissions = append(AllPermissions, SysconsoleReadPermissions...)
-	AllPermissions = append(AllPermissions, SysconsoleWritePermissions...)
-
-	ChannelModeratedPermissions = []string{
-		PERMISSION_CREATE_POST.Id,
-		"create_reactions",
-		"manage_members",
-		PERMISSION_USE_CHANNEL_MENTIONS.Id,
-	}
-
-	ChannelModeratedPermissionsMap = map[string]string{
-		PERMISSION_CREATE_POST.Id:                    ChannelModeratedPermissions[0],
-		PERMISSION_ADD_REACTION.Id:                   ChannelModeratedPermissions[1],
-		PERMISSION_REMOVE_REACTION.Id:                ChannelModeratedPermissions[1],
-		PERMISSION_MANAGE_PUBLIC_CHANNEL_MEMBERS.Id:  ChannelModeratedPermissions[2],
-		PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS.Id: ChannelModeratedPermissions[2],
-		PERMISSION_USE_CHANNEL_MENTIONS.Id:           ChannelModeratedPermissions[3],
-	}
-}
-
-func init() {
-	initializePermissions()
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/plugin_cluster_event.go b/vendor/github.com/mattermost/mattermost-server/v5/model/plugin_cluster_event.go
deleted file mode 100644
index ba5c8052..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/plugin_cluster_event.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-const (
-	PluginClusterEventSendTypeReliable   = CLUSTER_SEND_RELIABLE
-	PluginClusterEventSendTypeBestEffort = CLUSTER_SEND_BEST_EFFORT
-)
-
-// PluginClusterEvent is used to allow intra-cluster plugin communication.
-type PluginClusterEvent struct {
-	// Id is the unique identifier for the event.
-	Id string
-	// Data is the event payload.
-	Data []byte
-}
-
-// PluginClusterEventSendOptions defines some properties that apply when sending
-// plugin events across a cluster.
-type PluginClusterEventSendOptions struct {
-	// SendType defines the type of communication channel used to send the event.
-	SendType string
-	// TargetId identifies the cluster node to which the event should be sent.
-	// It should match the cluster id of the receiving instance.
-	// If empty, the event gets broadcasted to all other nodes.
-	TargetId string
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/plugin_event_data.go b/vendor/github.com/mattermost/mattermost-server/v5/model/plugin_event_data.go
deleted file mode 100644
index c704c993..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/plugin_event_data.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-// PluginEventData used to notify peers about plugin changes.
-type PluginEventData struct {
-	Id string `json:"id"`
-}
-
-func (p *PluginEventData) ToJson() string {
-	b, _ := json.Marshal(p)
-	return string(b)
-}
-
-func PluginEventDataFromJson(data io.Reader) PluginEventData {
-	var m PluginEventData
-	json.NewDecoder(data).Decode(&m)
-	return m
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/plugin_key_value.go b/vendor/github.com/mattermost/mattermost-server/v5/model/plugin_key_value.go
deleted file mode 100644
index 73ef2d23..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/plugin_key_value.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"net/http"
-	"unicode/utf8"
-)
-
-const (
-	KEY_VALUE_PLUGIN_ID_MAX_RUNES = 190
-	KEY_VALUE_KEY_MAX_RUNES       = 50
-)
-
-type PluginKeyValue struct {
-	PluginId string `json:"plugin_id"`
-	Key      string `json:"key" db:"PKey"`
-	Value    []byte `json:"value" db:"PValue"`
-	ExpireAt int64  `json:"expire_at"`
-}
-
-func (kv *PluginKeyValue) IsValid() *AppError {
-	if kv.PluginId == "" || utf8.RuneCountInString(kv.PluginId) > KEY_VALUE_PLUGIN_ID_MAX_RUNES {
-		return NewAppError("PluginKeyValue.IsValid", "model.plugin_key_value.is_valid.plugin_id.app_error", map[string]interface{}{"Max": KEY_VALUE_KEY_MAX_RUNES, "Min": 0}, "key="+kv.Key, http.StatusBadRequest)
-	}
-
-	if kv.Key == "" || utf8.RuneCountInString(kv.Key) > KEY_VALUE_KEY_MAX_RUNES {
-		return NewAppError("PluginKeyValue.IsValid", "model.plugin_key_value.is_valid.key.app_error", map[string]interface{}{"Max": KEY_VALUE_KEY_MAX_RUNES, "Min": 0}, "key="+kv.Key, http.StatusBadRequest)
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/plugin_kvset_options.go b/vendor/github.com/mattermost/mattermost-server/v5/model/plugin_kvset_options.go
deleted file mode 100644
index 1d374c80..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/plugin_kvset_options.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"net/http"
-)
-
-// PluginKVSetOptions contains information on how to store a value in the plugin KV store.
-type PluginKVSetOptions struct {
-	Atomic          bool   // Only store the value if the current value matches the oldValue
-	OldValue        []byte // The value to compare with the current value. Only used when Atomic is true
-	ExpireInSeconds int64  // Set an expire counter
-}
-
-// IsValid returns nil if the chosen options are valid.
-func (opt *PluginKVSetOptions) IsValid() *AppError {
-	if !opt.Atomic && opt.OldValue != nil {
-		return NewAppError(
-			"PluginKVSetOptions.IsValid",
-			"model.plugin_kvset_options.is_valid.old_value.app_error",
-			nil,
-			"",
-			http.StatusBadRequest,
-		)
-	}
-
-	return nil
-}
-
-// NewPluginKeyValueFromOptions return a PluginKeyValue given a pluginID, a KV pair and options.
-func NewPluginKeyValueFromOptions(pluginId, key string, value []byte, opt PluginKVSetOptions) (*PluginKeyValue, *AppError) {
-	expireAt := int64(0)
-	if opt.ExpireInSeconds != 0 {
-		expireAt = GetMillis() + (opt.ExpireInSeconds * 1000)
-	}
-
-	kv := &PluginKeyValue{
-		PluginId: pluginId,
-		Key:      key,
-		Value:    value,
-		ExpireAt: expireAt,
-	}
-
-	return kv, nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/plugin_status.go b/vendor/github.com/mattermost/mattermost-server/v5/model/plugin_status.go
deleted file mode 100644
index b4ba2e73..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/plugin_status.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-const (
-	PluginStateNotRunning          = 0
-	PluginStateStarting            = 1 // unused by server
-	PluginStateRunning             = 2
-	PluginStateFailedToStart       = 3
-	PluginStateFailedToStayRunning = 4
-	PluginStateStopping            = 5 // unused by server
-)
-
-// PluginStatus provides a cluster-aware view of installed plugins.
-type PluginStatus struct {
-	PluginId    string `json:"plugin_id"`
-	ClusterId   string `json:"cluster_id"`
-	PluginPath  string `json:"plugin_path"`
-	State       int    `json:"state"`
-	Name        string `json:"name"`
-	Description string `json:"description"`
-	Version     string `json:"version"`
-}
-
-type PluginStatuses []*PluginStatus
-
-func (m *PluginStatuses) ToJson() string {
-	b, _ := json.Marshal(m)
-	return string(b)
-}
-
-func PluginStatusesFromJson(data io.Reader) PluginStatuses {
-	var m PluginStatuses
-	json.NewDecoder(data).Decode(&m)
-	return m
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/plugin_valid.go b/vendor/github.com/mattermost/mattermost-server/v5/model/plugin_valid.go
deleted file mode 100644
index b6144513..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/plugin_valid.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"regexp"
-	"unicode/utf8"
-)
-
-const (
-	MinIdLength  = 3
-	MaxIdLength  = 190
-	ValidIdRegex = `^[a-zA-Z0-9-_\.]+$`
-)
-
-// ValidId constrains the set of valid plugin identifiers:
-//  ^[a-zA-Z0-9-_\.]+
-var validId *regexp.Regexp
-
-func init() {
-	validId = regexp.MustCompile(ValidIdRegex)
-}
-
-// IsValidPluginId verifies that the plugin id has a minimum length of 3, maximum length of 190, and
-// contains only alphanumeric characters, dashes, underscores and periods.
-//
-// These constraints are necessary since the plugin id is used as part of a filesystem path.
-func IsValidPluginId(id string) bool {
-	if utf8.RuneCountInString(id) < MinIdLength {
-		return false
-	}
-
-	if utf8.RuneCountInString(id) > MaxIdLength {
-		return false
-	}
-
-	return validId.MatchString(id)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/plugins_response.go b/vendor/github.com/mattermost/mattermost-server/v5/model/plugins_response.go
deleted file mode 100644
index 421ee2f5..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/plugins_response.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type PluginInfo struct {
-	Manifest
-}
-
-type PluginsResponse struct {
-	Active   []*PluginInfo `json:"active"`
-	Inactive []*PluginInfo `json:"inactive"`
-}
-
-func (m *PluginsResponse) ToJson() string {
-	b, _ := json.Marshal(m)
-	return string(b)
-}
-
-func PluginsResponseFromJson(data io.Reader) *PluginsResponse {
-	var m *PluginsResponse
-	json.NewDecoder(data).Decode(&m)
-	return m
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/post.go b/vendor/github.com/mattermost/mattermost-server/v5/model/post.go
deleted file mode 100644
index b7dff5bc..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/post.go
+++ /dev/null
@@ -1,751 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"errors"
-	"io"
-	"net/http"
-	"regexp"
-	"sort"
-	"strings"
-	"sync"
-	"unicode/utf8"
-
-	"github.com/mattermost/mattermost-server/v5/shared/markdown"
-)
-
-const (
-	POST_SYSTEM_MESSAGE_PREFIX  = "system_"
-	POST_DEFAULT                = ""
-	POST_SLACK_ATTACHMENT       = "slack_attachment"
-	POST_SYSTEM_GENERIC         = "system_generic"
-	POST_JOIN_LEAVE             = "system_join_leave" // Deprecated, use POST_JOIN_CHANNEL or POST_LEAVE_CHANNEL instead
-	POST_JOIN_CHANNEL           = "system_join_channel"
-	POST_GUEST_JOIN_CHANNEL     = "system_guest_join_channel"
-	POST_LEAVE_CHANNEL          = "system_leave_channel"
-	POST_JOIN_TEAM              = "system_join_team"
-	POST_LEAVE_TEAM             = "system_leave_team"
-	POST_AUTO_RESPONDER         = "system_auto_responder"
-	POST_ADD_REMOVE             = "system_add_remove" // Deprecated, use POST_ADD_TO_CHANNEL or POST_REMOVE_FROM_CHANNEL instead
-	POST_ADD_TO_CHANNEL         = "system_add_to_channel"
-	POST_ADD_GUEST_TO_CHANNEL   = "system_add_guest_to_chan"
-	POST_REMOVE_FROM_CHANNEL    = "system_remove_from_channel"
-	POST_MOVE_CHANNEL           = "system_move_channel"
-	POST_ADD_TO_TEAM            = "system_add_to_team"
-	POST_REMOVE_FROM_TEAM       = "system_remove_from_team"
-	POST_HEADER_CHANGE          = "system_header_change"
-	POST_DISPLAYNAME_CHANGE     = "system_displayname_change"
-	POST_CONVERT_CHANNEL        = "system_convert_channel"
-	POST_PURPOSE_CHANGE         = "system_purpose_change"
-	POST_CHANNEL_DELETED        = "system_channel_deleted"
-	POST_CHANNEL_RESTORED       = "system_channel_restored"
-	POST_EPHEMERAL              = "system_ephemeral"
-	POST_CHANGE_CHANNEL_PRIVACY = "system_change_chan_privacy"
-	POST_ADD_BOT_TEAMS_CHANNELS = "add_bot_teams_channels"
-	POST_FILEIDS_MAX_RUNES      = 300
-	POST_FILENAMES_MAX_RUNES    = 4000
-	POST_HASHTAGS_MAX_RUNES     = 1000
-	POST_MESSAGE_MAX_RUNES_V1   = 4000
-	POST_MESSAGE_MAX_BYTES_V2   = 65535                         // Maximum size of a TEXT column in MySQL
-	POST_MESSAGE_MAX_RUNES_V2   = POST_MESSAGE_MAX_BYTES_V2 / 4 // Assume a worst-case representation
-	POST_PROPS_MAX_RUNES        = 8000
-	POST_PROPS_MAX_USER_RUNES   = POST_PROPS_MAX_RUNES - 400 // Leave some room for system / pre-save modifications
-	POST_CUSTOM_TYPE_PREFIX     = "custom_"
-	POST_ME                     = "me"
-	PROPS_ADD_CHANNEL_MEMBER    = "add_channel_member"
-
-	POST_PROPS_ADDED_USER_ID       = "addedUserId"
-	POST_PROPS_DELETE_BY           = "deleteBy"
-	POST_PROPS_OVERRIDE_ICON_URL   = "override_icon_url"
-	POST_PROPS_OVERRIDE_ICON_EMOJI = "override_icon_emoji"
-
-	POST_PROPS_MENTION_HIGHLIGHT_DISABLED = "mentionHighlightDisabled"
-	POST_PROPS_GROUP_HIGHLIGHT_DISABLED   = "disable_group_highlight"
-	POST_SYSTEM_WARN_METRIC_STATUS        = "warn_metric_status"
-)
-
-var AT_MENTION_PATTEN = regexp.MustCompile(`\B@`)
-
-type Post struct {
-	Id         string `json:"id"`
-	CreateAt   int64  `json:"create_at"`
-	UpdateAt   int64  `json:"update_at"`
-	EditAt     int64  `json:"edit_at"`
-	DeleteAt   int64  `json:"delete_at"`
-	IsPinned   bool   `json:"is_pinned"`
-	UserId     string `json:"user_id"`
-	ChannelId  string `json:"channel_id"`
-	RootId     string `json:"root_id"`
-	ParentId   string `json:"parent_id"`
-	OriginalId string `json:"original_id"`
-
-	Message string `json:"message"`
-	// MessageSource will contain the message as submitted by the user if Message has been modified
-	// by Mattermost for presentation (e.g if an image proxy is being used). It should be used to
-	// populate edit boxes if present.
-	MessageSource string `json:"message_source,omitempty" db:"-"`
-
-	Type          string          `json:"type"`
-	propsMu       sync.RWMutex    `db:"-"`       // Unexported mutex used to guard Post.Props.
-	Props         StringInterface `json:"props"` // Deprecated: use GetProps()
-	Hashtags      string          `json:"hashtags"`
-	Filenames     StringArray     `json:"filenames,omitempty"` // Deprecated, do not use this field any more
-	FileIds       StringArray     `json:"file_ids,omitempty"`
-	PendingPostId string          `json:"pending_post_id" db:"-"`
-	HasReactions  bool            `json:"has_reactions,omitempty"`
-	RemoteId      *string         `json:"remote_id,omitempty"`
-
-	// Transient data populated before sending a post to the client
-	ReplyCount   int64         `json:"reply_count" db:"-"`
-	LastReplyAt  int64         `json:"last_reply_at" db:"-"`
-	Participants []*User       `json:"participants" db:"-"`
-	IsFollowing  *bool         `json:"is_following,omitempty" db:"-"` // for root posts in collapsed thread mode indicates if the current user is following this thread
-	Metadata     *PostMetadata `json:"metadata,omitempty" db:"-"`
-}
-
-type PostEphemeral struct {
-	UserID string `json:"user_id"`
-	Post   *Post  `json:"post"`
-}
-
-type PostPatch struct {
-	IsPinned     *bool            `json:"is_pinned"`
-	Message      *string          `json:"message"`
-	Props        *StringInterface `json:"props"`
-	FileIds      *StringArray     `json:"file_ids"`
-	HasReactions *bool            `json:"has_reactions"`
-}
-
-type SearchParameter struct {
-	Terms                  *string `json:"terms"`
-	IsOrSearch             *bool   `json:"is_or_search"`
-	TimeZoneOffset         *int    `json:"time_zone_offset"`
-	Page                   *int    `json:"page"`
-	PerPage                *int    `json:"per_page"`
-	IncludeDeletedChannels *bool   `json:"include_deleted_channels"`
-}
-
-type AnalyticsPostCountsOptions struct {
-	TeamId        string
-	BotsOnly      bool
-	YesterdayOnly bool
-}
-
-func (o *PostPatch) WithRewrittenImageURLs(f func(string) string) *PostPatch {
-	copy := *o
-	if copy.Message != nil {
-		*copy.Message = RewriteImageURLs(*o.Message, f)
-	}
-	return &copy
-}
-
-type PostForExport struct {
-	Post
-	TeamName    string
-	ChannelName string
-	Username    string
-	ReplyCount  int
-}
-
-type DirectPostForExport struct {
-	Post
-	User           string
-	ChannelMembers *[]string
-}
-
-type ReplyForExport struct {
-	Post
-	Username string
-}
-
-type PostForIndexing struct {
-	Post
-	TeamId         string `json:"team_id"`
-	ParentCreateAt *int64 `json:"parent_create_at"`
-}
-
-type FileForIndexing struct {
-	FileInfo
-	ChannelId string `json:"channel_id"`
-	Content   string `json:"content"`
-}
-
-// ShallowCopy is an utility function to shallow copy a Post to the given
-// destination without touching the internal RWMutex.
-func (o *Post) ShallowCopy(dst *Post) error {
-	if dst == nil {
-		return errors.New("dst cannot be nil")
-	}
-	o.propsMu.RLock()
-	defer o.propsMu.RUnlock()
-	dst.propsMu.Lock()
-	defer dst.propsMu.Unlock()
-	dst.Id = o.Id
-	dst.CreateAt = o.CreateAt
-	dst.UpdateAt = o.UpdateAt
-	dst.EditAt = o.EditAt
-	dst.DeleteAt = o.DeleteAt
-	dst.IsPinned = o.IsPinned
-	dst.UserId = o.UserId
-	dst.ChannelId = o.ChannelId
-	dst.RootId = o.RootId
-	dst.ParentId = o.ParentId
-	dst.OriginalId = o.OriginalId
-	dst.Message = o.Message
-	dst.MessageSource = o.MessageSource
-	dst.Type = o.Type
-	dst.Props = o.Props
-	dst.Hashtags = o.Hashtags
-	dst.Filenames = o.Filenames
-	dst.FileIds = o.FileIds
-	dst.PendingPostId = o.PendingPostId
-	dst.HasReactions = o.HasReactions
-	dst.ReplyCount = o.ReplyCount
-	dst.Participants = o.Participants
-	dst.LastReplyAt = o.LastReplyAt
-	dst.Metadata = o.Metadata
-	if o.IsFollowing != nil {
-		dst.IsFollowing = NewBool(*o.IsFollowing)
-	}
-	dst.RemoteId = o.RemoteId
-	return nil
-}
-
-// Clone shallowly copies the post and returns the copy.
-func (o *Post) Clone() *Post {
-	copy := &Post{}
-	o.ShallowCopy(copy)
-	return copy
-}
-
-func (o *Post) ToJson() string {
-	copy := o.Clone()
-	copy.StripActionIntegrations()
-	b, _ := json.Marshal(copy)
-	return string(b)
-}
-
-func (o *Post) ToUnsanitizedJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-type GetPostsSinceOptions struct {
-	UserId                   string
-	ChannelId                string
-	Time                     int64
-	SkipFetchThreads         bool
-	CollapsedThreads         bool
-	CollapsedThreadsExtended bool
-	SortAscending            bool
-}
-
-type GetPostsSinceForSyncCursor struct {
-	LastPostUpdateAt int64
-	LastPostId       string
-}
-
-type GetPostsSinceForSyncOptions struct {
-	ChannelId       string
-	ExcludeRemoteId string
-	IncludeDeleted  bool
-}
-
-type GetPostsOptions struct {
-	UserId                   string
-	ChannelId                string
-	PostId                   string
-	Page                     int
-	PerPage                  int
-	SkipFetchThreads         bool
-	CollapsedThreads         bool
-	CollapsedThreadsExtended bool
-}
-
-func PostFromJson(data io.Reader) *Post {
-	var o *Post
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func (o *Post) Etag() string {
-	return Etag(o.Id, o.UpdateAt)
-}
-
-func (o *Post) IsValid(maxPostSize int) *AppError {
-	if !IsValidId(o.Id) {
-		return NewAppError("Post.IsValid", "model.post.is_valid.id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.CreateAt == 0 {
-		return NewAppError("Post.IsValid", "model.post.is_valid.create_at.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if o.UpdateAt == 0 {
-		return NewAppError("Post.IsValid", "model.post.is_valid.update_at.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if !IsValidId(o.UserId) {
-		return NewAppError("Post.IsValid", "model.post.is_valid.user_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !IsValidId(o.ChannelId) {
-		return NewAppError("Post.IsValid", "model.post.is_valid.channel_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !(IsValidId(o.RootId) || o.RootId == "") {
-		return NewAppError("Post.IsValid", "model.post.is_valid.root_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !(IsValidId(o.ParentId) || o.ParentId == "") {
-		return NewAppError("Post.IsValid", "model.post.is_valid.parent_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(o.ParentId) == 26 && o.RootId == "" {
-		return NewAppError("Post.IsValid", "model.post.is_valid.root_parent.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !(len(o.OriginalId) == 26 || o.OriginalId == "") {
-		return NewAppError("Post.IsValid", "model.post.is_valid.original_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if utf8.RuneCountInString(o.Message) > maxPostSize {
-		return NewAppError("Post.IsValid", "model.post.is_valid.msg.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if utf8.RuneCountInString(o.Hashtags) > POST_HASHTAGS_MAX_RUNES {
-		return NewAppError("Post.IsValid", "model.post.is_valid.hashtags.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	switch o.Type {
-	case
-		POST_DEFAULT,
-		POST_SYSTEM_GENERIC,
-		POST_JOIN_LEAVE,
-		POST_AUTO_RESPONDER,
-		POST_ADD_REMOVE,
-		POST_JOIN_CHANNEL,
-		POST_GUEST_JOIN_CHANNEL,
-		POST_LEAVE_CHANNEL,
-		POST_JOIN_TEAM,
-		POST_LEAVE_TEAM,
-		POST_ADD_TO_CHANNEL,
-		POST_ADD_GUEST_TO_CHANNEL,
-		POST_REMOVE_FROM_CHANNEL,
-		POST_MOVE_CHANNEL,
-		POST_ADD_TO_TEAM,
-		POST_REMOVE_FROM_TEAM,
-		POST_SLACK_ATTACHMENT,
-		POST_HEADER_CHANGE,
-		POST_PURPOSE_CHANGE,
-		POST_DISPLAYNAME_CHANGE,
-		POST_CONVERT_CHANNEL,
-		POST_CHANNEL_DELETED,
-		POST_CHANNEL_RESTORED,
-		POST_CHANGE_CHANNEL_PRIVACY,
-		POST_ME,
-		POST_ADD_BOT_TEAMS_CHANNELS,
-		POST_SYSTEM_WARN_METRIC_STATUS:
-	default:
-		if !strings.HasPrefix(o.Type, POST_CUSTOM_TYPE_PREFIX) {
-			return NewAppError("Post.IsValid", "model.post.is_valid.type.app_error", nil, "id="+o.Type, http.StatusBadRequest)
-		}
-	}
-
-	if utf8.RuneCountInString(ArrayToJson(o.Filenames)) > POST_FILENAMES_MAX_RUNES {
-		return NewAppError("Post.IsValid", "model.post.is_valid.filenames.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if utf8.RuneCountInString(ArrayToJson(o.FileIds)) > POST_FILEIDS_MAX_RUNES {
-		return NewAppError("Post.IsValid", "model.post.is_valid.file_ids.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if utf8.RuneCountInString(StringInterfaceToJson(o.GetProps())) > POST_PROPS_MAX_RUNES {
-		return NewAppError("Post.IsValid", "model.post.is_valid.props.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (o *Post) SanitizeProps() {
-	if o == nil {
-		return
-	}
-	membersToSanitize := []string{
-		PROPS_ADD_CHANNEL_MEMBER,
-	}
-
-	for _, member := range membersToSanitize {
-		if _, ok := o.GetProps()[member]; ok {
-			o.DelProp(member)
-		}
-	}
-	for _, p := range o.Participants {
-		p.Sanitize(map[string]bool{})
-	}
-}
-
-func (o *Post) PreSave() {
-	if o.Id == "" {
-		o.Id = NewId()
-	}
-
-	o.OriginalId = ""
-
-	if o.CreateAt == 0 {
-		o.CreateAt = GetMillis()
-	}
-
-	o.UpdateAt = o.CreateAt
-	o.PreCommit()
-}
-
-func (o *Post) PreCommit() {
-	if o.GetProps() == nil {
-		o.SetProps(make(map[string]interface{}))
-	}
-
-	if o.Filenames == nil {
-		o.Filenames = []string{}
-	}
-
-	if o.FileIds == nil {
-		o.FileIds = []string{}
-	}
-
-	o.GenerateActionIds()
-
-	// There's a rare bug where the client sends up duplicate FileIds so protect against that
-	o.FileIds = RemoveDuplicateStrings(o.FileIds)
-}
-
-func (o *Post) MakeNonNil() {
-	if o.GetProps() == nil {
-		o.SetProps(make(map[string]interface{}))
-	}
-}
-
-func (o *Post) DelProp(key string) {
-	o.propsMu.Lock()
-	defer o.propsMu.Unlock()
-	propsCopy := make(map[string]interface{}, len(o.Props)-1)
-	for k, v := range o.Props {
-		propsCopy[k] = v
-	}
-	delete(propsCopy, key)
-	o.Props = propsCopy
-}
-
-func (o *Post) AddProp(key string, value interface{}) {
-	o.propsMu.Lock()
-	defer o.propsMu.Unlock()
-	propsCopy := make(map[string]interface{}, len(o.Props)+1)
-	for k, v := range o.Props {
-		propsCopy[k] = v
-	}
-	propsCopy[key] = value
-	o.Props = propsCopy
-}
-
-func (o *Post) GetProps() StringInterface {
-	o.propsMu.RLock()
-	defer o.propsMu.RUnlock()
-	return o.Props
-}
-
-func (o *Post) SetProps(props StringInterface) {
-	o.propsMu.Lock()
-	defer o.propsMu.Unlock()
-	o.Props = props
-}
-
-func (o *Post) GetProp(key string) interface{} {
-	o.propsMu.RLock()
-	defer o.propsMu.RUnlock()
-	return o.Props[key]
-}
-
-func (o *Post) IsSystemMessage() bool {
-	return len(o.Type) >= len(POST_SYSTEM_MESSAGE_PREFIX) && o.Type[:len(POST_SYSTEM_MESSAGE_PREFIX)] == POST_SYSTEM_MESSAGE_PREFIX
-}
-
-// IsRemote returns true if the post originated on a remote cluster.
-func (o *Post) IsRemote() bool {
-	return o.RemoteId != nil && *o.RemoteId != ""
-}
-
-// GetRemoteID safely returns the remoteID or empty string if not remote.
-func (o *Post) GetRemoteID() string {
-	if o.RemoteId != nil {
-		return *o.RemoteId
-	}
-	return ""
-}
-
-func (o *Post) IsJoinLeaveMessage() bool {
-	return o.Type == POST_JOIN_LEAVE ||
-		o.Type == POST_ADD_REMOVE ||
-		o.Type == POST_JOIN_CHANNEL ||
-		o.Type == POST_LEAVE_CHANNEL ||
-		o.Type == POST_JOIN_TEAM ||
-		o.Type == POST_LEAVE_TEAM ||
-		o.Type == POST_ADD_TO_CHANNEL ||
-		o.Type == POST_REMOVE_FROM_CHANNEL ||
-		o.Type == POST_ADD_TO_TEAM ||
-		o.Type == POST_REMOVE_FROM_TEAM
-}
-
-func (o *Post) Patch(patch *PostPatch) {
-	if patch.IsPinned != nil {
-		o.IsPinned = *patch.IsPinned
-	}
-
-	if patch.Message != nil {
-		o.Message = *patch.Message
-	}
-
-	if patch.Props != nil {
-		newProps := *patch.Props
-		o.SetProps(newProps)
-	}
-
-	if patch.FileIds != nil {
-		o.FileIds = *patch.FileIds
-	}
-
-	if patch.HasReactions != nil {
-		o.HasReactions = *patch.HasReactions
-	}
-}
-
-func (o *PostPatch) ToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return ""
-	}
-
-	return string(b)
-}
-
-func PostPatchFromJson(data io.Reader) *PostPatch {
-	decoder := json.NewDecoder(data)
-	var post PostPatch
-	err := decoder.Decode(&post)
-	if err != nil {
-		return nil
-	}
-
-	return &post
-}
-
-func (o *SearchParameter) SearchParameterToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return ""
-	}
-
-	return string(b)
-}
-
-func SearchParameterFromJson(data io.Reader) (*SearchParameter, error) {
-	decoder := json.NewDecoder(data)
-	var searchParam SearchParameter
-	if err := decoder.Decode(&searchParam); err != nil {
-		return nil, err
-	}
-
-	return &searchParam, nil
-}
-
-func (o *Post) ChannelMentions() []string {
-	return ChannelMentions(o.Message)
-}
-
-// DisableMentionHighlights disables a posts mention highlighting and returns the first channel mention that was present in the message.
-func (o *Post) DisableMentionHighlights() string {
-	mention, hasMentions := findAtChannelMention(o.Message)
-	if hasMentions {
-		o.AddProp(POST_PROPS_MENTION_HIGHLIGHT_DISABLED, true)
-	}
-	return mention
-}
-
-// DisableMentionHighlights disables mention highlighting for a post patch if required.
-func (o *PostPatch) DisableMentionHighlights() {
-	if o.Message == nil {
-		return
-	}
-	if _, hasMentions := findAtChannelMention(*o.Message); hasMentions {
-		if o.Props == nil {
-			o.Props = &StringInterface{}
-		}
-		(*o.Props)[POST_PROPS_MENTION_HIGHLIGHT_DISABLED] = true
-	}
-}
-
-func findAtChannelMention(message string) (mention string, found bool) {
-	re := regexp.MustCompile(`(?i)\B@(channel|all|here)\b`)
-	matched := re.FindStringSubmatch(message)
-	if found = (len(matched) > 0); found {
-		mention = strings.ToLower(matched[0])
-	}
-	return
-}
-
-func (o *Post) Attachments() []*SlackAttachment {
-	if attachments, ok := o.GetProp("attachments").([]*SlackAttachment); ok {
-		return attachments
-	}
-	var ret []*SlackAttachment
-	if attachments, ok := o.GetProp("attachments").([]interface{}); ok {
-		for _, attachment := range attachments {
-			if enc, err := json.Marshal(attachment); err == nil {
-				var decoded SlackAttachment
-				if json.Unmarshal(enc, &decoded) == nil {
-					// Ignoring nil actions
-					i := 0
-					for _, action := range decoded.Actions {
-						if action != nil {
-							decoded.Actions[i] = action
-							i++
-						}
-					}
-					decoded.Actions = decoded.Actions[:i]
-
-					// Ignoring nil fields
-					i = 0
-					for _, field := range decoded.Fields {
-						if field != nil {
-							decoded.Fields[i] = field
-							i++
-						}
-					}
-					decoded.Fields = decoded.Fields[:i]
-					ret = append(ret, &decoded)
-				}
-			}
-		}
-	}
-	return ret
-}
-
-func (o *Post) AttachmentsEqual(input *Post) bool {
-	attachments := o.Attachments()
-	inputAttachments := input.Attachments()
-
-	if len(attachments) != len(inputAttachments) {
-		return false
-	}
-
-	for i := range attachments {
-		if !attachments[i].Equals(inputAttachments[i]) {
-			return false
-		}
-	}
-
-	return true
-}
-
-var markdownDestinationEscaper = strings.NewReplacer(
-	`\`, `\\`,
-	`<`, `\<`,
-	`>`, `\>`,
-	`(`, `\(`,
-	`)`, `\)`,
-)
-
-// WithRewrittenImageURLs returns a new shallow copy of the post where the message has been
-// rewritten via RewriteImageURLs.
-func (o *Post) WithRewrittenImageURLs(f func(string) string) *Post {
-	copy := o.Clone()
-	copy.Message = RewriteImageURLs(o.Message, f)
-	if copy.MessageSource == "" && copy.Message != o.Message {
-		copy.MessageSource = o.Message
-	}
-	return copy
-}
-
-func (o *PostEphemeral) ToUnsanitizedJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-// RewriteImageURLs takes a message and returns a copy that has all of the image URLs replaced
-// according to the function f. For each image URL, f will be invoked, and the resulting markdown
-// will contain the URL returned by that invocation instead.
-//
-// Image URLs are destination URLs used in inline images or reference definitions that are used
-// anywhere in the input markdown as an image.
-func RewriteImageURLs(message string, f func(string) string) string {
-	if !strings.Contains(message, "![") {
-		return message
-	}
-
-	var ranges []markdown.Range
-
-	markdown.Inspect(message, func(blockOrInline interface{}) bool {
-		switch v := blockOrInline.(type) {
-		case *markdown.ReferenceImage:
-			ranges = append(ranges, v.ReferenceDefinition.RawDestination)
-		case *markdown.InlineImage:
-			ranges = append(ranges, v.RawDestination)
-		default:
-			return true
-		}
-		return true
-	})
-
-	if ranges == nil {
-		return message
-	}
-
-	sort.Slice(ranges, func(i, j int) bool {
-		return ranges[i].Position < ranges[j].Position
-	})
-
-	copyRanges := make([]markdown.Range, 0, len(ranges))
-	urls := make([]string, 0, len(ranges))
-	resultLength := len(message)
-
-	start := 0
-	for i, r := range ranges {
-		switch {
-		case i == 0:
-		case r.Position != ranges[i-1].Position:
-			start = ranges[i-1].End
-		default:
-			continue
-		}
-		original := message[r.Position:r.End]
-		replacement := markdownDestinationEscaper.Replace(f(markdown.Unescape(original)))
-		resultLength += len(replacement) - len(original)
-		copyRanges = append(copyRanges, markdown.Range{Position: start, End: r.Position})
-		urls = append(urls, replacement)
-	}
-
-	result := make([]byte, resultLength)
-
-	offset := 0
-	for i, r := range copyRanges {
-		offset += copy(result[offset:], message[r.Position:r.End])
-		offset += copy(result[offset:], urls[i])
-	}
-	copy(result[offset:], message[ranges[len(ranges)-1].End:])
-
-	return string(result)
-}
-
-func (o *Post) IsFromOAuthBot() bool {
-	props := o.GetProps()
-	return props["from_webhook"] == "true" && props["override_username"] != ""
-}
-
-func (o *Post) ToNilIfInvalid() *Post {
-	if o.Id == "" {
-		return nil
-	}
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/post_embed.go b/vendor/github.com/mattermost/mattermost-server/v5/model/post_embed.go
deleted file mode 100644
index 5c6efec1..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/post_embed.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-const (
-	POST_EMBED_IMAGE              PostEmbedType = "image"
-	POST_EMBED_MESSAGE_ATTACHMENT PostEmbedType = "message_attachment"
-	POST_EMBED_OPENGRAPH          PostEmbedType = "opengraph"
-	POST_EMBED_LINK               PostEmbedType = "link"
-)
-
-type PostEmbedType string
-
-type PostEmbed struct {
-	Type PostEmbedType `json:"type"`
-
-	// The URL of the embedded content. Used for image and OpenGraph embeds.
-	URL string `json:"url,omitempty"`
-
-	// Any additional data for the embedded content. Only used for OpenGraph embeds.
-	Data interface{} `json:"data,omitempty"`
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/post_list.go b/vendor/github.com/mattermost/mattermost-server/v5/model/post_list.go
deleted file mode 100644
index ba84f749..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/post_list.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"sort"
-)
-
-type PostList struct {
-	Order      []string         `json:"order"`
-	Posts      map[string]*Post `json:"posts"`
-	NextPostId string           `json:"next_post_id"`
-	PrevPostId string           `json:"prev_post_id"`
-}
-
-func NewPostList() *PostList {
-	return &PostList{
-		Order:      make([]string, 0),
-		Posts:      make(map[string]*Post),
-		NextPostId: "",
-		PrevPostId: "",
-	}
-}
-
-func (o *PostList) ToSlice() []*Post {
-	var posts []*Post
-
-	if l := len(o.Posts); l > 0 {
-		posts = make([]*Post, 0, l)
-	}
-
-	for _, id := range o.Order {
-		posts = append(posts, o.Posts[id])
-	}
-	return posts
-}
-
-func (o *PostList) WithRewrittenImageURLs(f func(string) string) *PostList {
-	copy := *o
-	copy.Posts = make(map[string]*Post)
-	for id, post := range o.Posts {
-		copy.Posts[id] = post.WithRewrittenImageURLs(f)
-	}
-	return &copy
-}
-
-func (o *PostList) StripActionIntegrations() {
-	posts := o.Posts
-	o.Posts = make(map[string]*Post)
-	for id, post := range posts {
-		pcopy := post.Clone()
-		pcopy.StripActionIntegrations()
-		o.Posts[id] = pcopy
-	}
-}
-
-func (o *PostList) ToJson() string {
-	copy := *o
-	copy.StripActionIntegrations()
-	b, err := json.Marshal(&copy)
-	if err != nil {
-		return ""
-	}
-	return string(b)
-}
-
-func (o *PostList) MakeNonNil() {
-	if o.Order == nil {
-		o.Order = make([]string, 0)
-	}
-
-	if o.Posts == nil {
-		o.Posts = make(map[string]*Post)
-	}
-
-	for _, v := range o.Posts {
-		v.MakeNonNil()
-	}
-}
-
-func (o *PostList) AddOrder(id string) {
-
-	if o.Order == nil {
-		o.Order = make([]string, 0, 128)
-	}
-
-	o.Order = append(o.Order, id)
-}
-
-func (o *PostList) AddPost(post *Post) {
-
-	if o.Posts == nil {
-		o.Posts = make(map[string]*Post)
-	}
-
-	o.Posts[post.Id] = post
-}
-
-func (o *PostList) UniqueOrder() {
-	keys := make(map[string]bool)
-	order := []string{}
-	for _, postId := range o.Order {
-		if _, value := keys[postId]; !value {
-			keys[postId] = true
-			order = append(order, postId)
-		}
-	}
-
-	o.Order = order
-}
-
-func (o *PostList) Extend(other *PostList) {
-	for postId := range other.Posts {
-		o.AddPost(other.Posts[postId])
-	}
-
-	for _, postId := range other.Order {
-		o.AddOrder(postId)
-	}
-
-	o.UniqueOrder()
-}
-
-func (o *PostList) SortByCreateAt() {
-	sort.Slice(o.Order, func(i, j int) bool {
-		return o.Posts[o.Order[i]].CreateAt > o.Posts[o.Order[j]].CreateAt
-	})
-}
-
-func (o *PostList) Etag() string {
-
-	id := "0"
-	var t int64 = 0
-
-	for _, v := range o.Posts {
-		if v.UpdateAt > t {
-			t = v.UpdateAt
-			id = v.Id
-		} else if v.UpdateAt == t && v.Id > id {
-			t = v.UpdateAt
-			id = v.Id
-		}
-	}
-
-	orderId := ""
-	if len(o.Order) > 0 {
-		orderId = o.Order[0]
-	}
-
-	return Etag(orderId, id, t)
-}
-
-func (o *PostList) IsChannelId(channelId string) bool {
-	for _, v := range o.Posts {
-		if v.ChannelId != channelId {
-			return false
-		}
-	}
-
-	return true
-}
-
-func PostListFromJson(data io.Reader) *PostList {
-	var o *PostList
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/post_metadata.go b/vendor/github.com/mattermost/mattermost-server/v5/model/post_metadata.go
deleted file mode 100644
index 7b0687ca..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/post_metadata.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-)
-
-type PostMetadata struct {
-	// Embeds holds information required to render content embedded in the post. This includes the OpenGraph metadata
-	// for links in the post.
-	Embeds []*PostEmbed `json:"embeds,omitempty"`
-
-	// Emojis holds all custom emojis used in the post or used in reaction to the post.
-	Emojis []*Emoji `json:"emojis,omitempty"`
-
-	// Files holds information about the file attachments on the post.
-	Files []*FileInfo `json:"files,omitempty"`
-
-	// Images holds the dimensions of all external images in the post as a map of the image URL to its diemsnions.
-	// This includes image embeds (when the message contains a plaintext link to an image), Markdown images, images
-	// contained in the OpenGraph metadata, and images contained in message attachments. It does not contain
-	// the dimensions of any file attachments as those are stored in FileInfos.
-	Images map[string]*PostImage `json:"images,omitempty"`
-
-	// Reactions holds reactions made to the post.
-	Reactions []*Reaction `json:"reactions,omitempty"`
-}
-
-type PostImage struct {
-	Width  int `json:"width"`
-	Height int `json:"height"`
-
-	// Format is the name of the image format as used by image/go such as "png", "gif", or "jpeg".
-	Format string `json:"format"`
-
-	// FrameCount stores the number of frames in this image, if it is an animated gif. It will be 0 for other formats.
-	FrameCount int `json:"frame_count"`
-}
-
-func (o *PostImage) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/post_search_results.go b/vendor/github.com/mattermost/mattermost-server/v5/model/post_search_results.go
deleted file mode 100644
index fc9ba083..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/post_search_results.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type PostSearchMatches map[string][]string
-
-type PostSearchResults struct {
-	*PostList
-	Matches PostSearchMatches `json:"matches"`
-}
-
-func MakePostSearchResults(posts *PostList, matches PostSearchMatches) *PostSearchResults {
-	return &PostSearchResults{
-		posts,
-		matches,
-	}
-}
-
-func (o *PostSearchResults) ToJson() string {
-	copy := *o
-	copy.PostList.StripActionIntegrations()
-	b, err := json.Marshal(&copy)
-	if err != nil {
-		return ""
-	}
-	return string(b)
-}
-
-func PostSearchResultsFromJson(data io.Reader) *PostSearchResults {
-	var o *PostSearchResults
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/preference.go b/vendor/github.com/mattermost/mattermost-server/v5/model/preference.go
deleted file mode 100644
index ee0d21aa..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/preference.go
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-	"regexp"
-	"strings"
-	"unicode/utf8"
-)
-
-const (
-	PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW = "direct_channel_show"
-	PREFERENCE_CATEGORY_GROUP_CHANNEL_SHOW  = "group_channel_show"
-	PREFERENCE_CATEGORY_TUTORIAL_STEPS      = "tutorial_step"
-	PREFERENCE_CATEGORY_ADVANCED_SETTINGS   = "advanced_settings"
-	PREFERENCE_CATEGORY_FLAGGED_POST        = "flagged_post"
-	PREFERENCE_CATEGORY_FAVORITE_CHANNEL    = "favorite_channel"
-	PREFERENCE_CATEGORY_SIDEBAR_SETTINGS    = "sidebar_settings"
-
-	PREFERENCE_CATEGORY_DISPLAY_SETTINGS      = "display_settings"
-	PREFERENCE_NAME_COLLAPSED_THREADS_ENABLED = "collapsed_reply_threads"
-	PREFERENCE_NAME_CHANNEL_DISPLAY_MODE      = "channel_display_mode"
-	PREFERENCE_NAME_COLLAPSE_SETTING          = "collapse_previews"
-	PREFERENCE_NAME_MESSAGE_DISPLAY           = "message_display"
-	PREFERENCE_NAME_NAME_FORMAT               = "name_format"
-	PREFERENCE_NAME_USE_MILITARY_TIME         = "use_military_time"
-	PREFERENCE_RECOMMENDED_NEXT_STEPS         = "recommended_next_steps"
-
-	PREFERENCE_CATEGORY_THEME = "theme"
-	// the name for theme props is the team id
-
-	PREFERENCE_CATEGORY_AUTHORIZED_OAUTH_APP = "oauth_app"
-	// the name for oauth_app is the client_id and value is the current scope
-
-	PREFERENCE_CATEGORY_LAST     = "last"
-	PREFERENCE_NAME_LAST_CHANNEL = "channel"
-	PREFERENCE_NAME_LAST_TEAM    = "team"
-
-	PREFERENCE_CATEGORY_CUSTOM_STATUS            = "custom_status"
-	PREFERENCE_NAME_RECENT_CUSTOM_STATUSES       = "recent_custom_statuses"
-	PREFERENCE_NAME_CUSTOM_STATUS_TUTORIAL_STATE = "custom_status_tutorial_state"
-
-	PREFERENCE_CUSTOM_STATUS_MODAL_VIEWED = "custom_status_modal_viewed"
-
-	PREFERENCE_CATEGORY_NOTIFICATIONS = "notifications"
-	PREFERENCE_NAME_EMAIL_INTERVAL    = "email_interval"
-
-	PREFERENCE_EMAIL_INTERVAL_NO_BATCHING_SECONDS = "30"  // the "immediate" setting is actually 30s
-	PREFERENCE_EMAIL_INTERVAL_BATCHING_SECONDS    = "900" // fifteen minutes is 900 seconds
-	PREFERENCE_EMAIL_INTERVAL_IMMEDIATELY         = "immediately"
-	PREFERENCE_EMAIL_INTERVAL_FIFTEEN             = "fifteen"
-	PREFERENCE_EMAIL_INTERVAL_FIFTEEN_AS_SECONDS  = "900"
-	PREFERENCE_EMAIL_INTERVAL_HOUR                = "hour"
-	PREFERENCE_EMAIL_INTERVAL_HOUR_AS_SECONDS     = "3600"
-)
-
-type Preference struct {
-	UserId   string `json:"user_id"`
-	Category string `json:"category"`
-	Name     string `json:"name"`
-	Value    string `json:"value"`
-}
-
-func (o *Preference) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func PreferenceFromJson(data io.Reader) *Preference {
-	var o *Preference
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func (o *Preference) IsValid() *AppError {
-	if !IsValidId(o.UserId) {
-		return NewAppError("Preference.IsValid", "model.preference.is_valid.id.app_error", nil, "user_id="+o.UserId, http.StatusBadRequest)
-	}
-
-	if o.Category == "" || len(o.Category) > 32 {
-		return NewAppError("Preference.IsValid", "model.preference.is_valid.category.app_error", nil, "category="+o.Category, http.StatusBadRequest)
-	}
-
-	if len(o.Name) > 32 {
-		return NewAppError("Preference.IsValid", "model.preference.is_valid.name.app_error", nil, "name="+o.Name, http.StatusBadRequest)
-	}
-
-	if utf8.RuneCountInString(o.Value) > 2000 {
-		return NewAppError("Preference.IsValid", "model.preference.is_valid.value.app_error", nil, "value="+o.Value, http.StatusBadRequest)
-	}
-
-	if o.Category == PREFERENCE_CATEGORY_THEME {
-		var unused map[string]string
-		if err := json.NewDecoder(strings.NewReader(o.Value)).Decode(&unused); err != nil {
-			return NewAppError("Preference.IsValid", "model.preference.is_valid.theme.app_error", nil, "value="+o.Value, http.StatusBadRequest)
-		}
-	}
-
-	return nil
-}
-
-func (o *Preference) PreUpdate() {
-	if o.Category == PREFERENCE_CATEGORY_THEME {
-		// decode the value of theme (a map of strings to string) and eliminate any invalid values
-		var props map[string]string
-		if err := json.NewDecoder(strings.NewReader(o.Value)).Decode(&props); err != nil {
-			// just continue, the invalid preference value should get caught by IsValid before saving
-			return
-		}
-
-		colorPattern := regexp.MustCompile(`^#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?$`)
-
-		// blank out any invalid theme values
-		for name, value := range props {
-			if name == "image" || name == "type" || name == "codeTheme" {
-				continue
-			}
-
-			if !colorPattern.MatchString(value) {
-				props[name] = "#ffffff"
-			}
-		}
-
-		if b, err := json.Marshal(props); err == nil {
-			o.Value = string(b)
-		}
-	}
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/preferences.go b/vendor/github.com/mattermost/mattermost-server/v5/model/preferences.go
deleted file mode 100644
index c2d24865..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/preferences.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type Preferences []Preference
-
-func (o *Preferences) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func PreferencesFromJson(data io.Reader) (Preferences, error) {
-	decoder := json.NewDecoder(data)
-	var o Preferences
-	err := decoder.Decode(&o)
-	if err != nil {
-		return nil, err
-	}
-	return o, nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/product_notices.go b/vendor/github.com/mattermost/mattermost-server/v5/model/product_notices.go
deleted file mode 100644
index 455ae475..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/product_notices.go
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-
-	"github.com/pkg/errors"
-)
-
-type ProductNotices []ProductNotice
-
-func (r *ProductNotices) Marshal() ([]byte, error) {
-	return json.Marshal(r)
-}
-
-func UnmarshalProductNotices(data []byte) (ProductNotices, error) {
-	var r ProductNotices
-	err := json.Unmarshal(data, &r)
-	return r, err
-}
-
-// List of product notices. Order is important and is used to resolve priorities.
-// Each notice will only be show if conditions are met.
-type ProductNotice struct {
-	Conditions        Conditions                       `json:"conditions"`
-	ID                string                           `json:"id"`                   // Unique identifier for this notice. Can be a running number. Used for storing 'viewed'; state on the server.
-	LocalizedMessages map[string]NoticeMessageInternal `json:"localizedMessages"`    // Notice message data, organized by locale.; Example:; "localizedMessages": {; "en": { "title": "English", description: "English description"},; "frFR": { "title": "Frances", description: "French description"}; }
-	Repeatable        *bool                            `json:"repeatable,omitempty"` // Configurable flag if the notice should reappear after it’s seen and dismissed
-}
-
-func (n *ProductNotice) SysAdminOnly() bool {
-	return n.Conditions.Audience != nil && *n.Conditions.Audience == NoticeAudience_Sysadmin
-}
-
-func (n *ProductNotice) TeamAdminOnly() bool {
-	return n.Conditions.Audience != nil && *n.Conditions.Audience == NoticeAudience_TeamAdmin
-}
-
-type Conditions struct {
-	Audience              *NoticeAudience        `json:"audience,omitempty"`
-	ClientType            *NoticeClientType      `json:"clientType,omitempty"`     // Only show the notice on specific clients. Defaults to 'all'
-	DesktopVersion        []string               `json:"desktopVersion,omitempty"` // What desktop client versions does this notice apply to.; Format: semver ranges (https://devhints.io/semver); Example: [">=1.2.3 < ~2.4.x"]; Example: ["<v5.19", "v5.20-v5.22"]
-	DisplayDate           *string                `json:"displayDate,omitempty"`    // When to display the notice.; Examples:; "2020-03-01T00:00:00Z" - show on specified date; ">= 2020-03-01T00:00:00Z" - show after specified date; "< 2020-03-01T00:00:00Z" - show before the specified date; "> 2020-03-01T00:00:00Z <= 2020-04-01T00:00:00Z" - show only between the specified dates
-	InstanceType          *NoticeInstanceType    `json:"instanceType,omitempty"`
-	MobileVersion         []string               `json:"mobileVersion,omitempty"` // What mobile client versions does this notice apply to.; Format: semver ranges (https://devhints.io/semver); Example: [">=1.2.3 < ~2.4.x"]; Example: ["<v5.19", "v5.20-v5.22"]
-	NumberOfPosts         *int64                 `json:"numberOfPosts,omitempty"` // Only show the notice when server has more than specified number of posts
-	NumberOfUsers         *int64                 `json:"numberOfUsers,omitempty"` // Only show the notice when server has more than specified number of users
-	ServerConfig          map[string]interface{} `json:"serverConfig,omitempty"`  // Map of mattermost server config paths and their values. Notice will be displayed only if; the values match the target server config; Example: serverConfig: { "PluginSettings.Enable": true, "GuestAccountsSettings.Enable":; false }
-	ServerVersion         []string               `json:"serverVersion,omitempty"` // What server versions does this notice apply to.; Format: semver ranges (https://devhints.io/semver); Example: [">=1.2.3 < ~2.4.x"]; Example: ["<v5.19", "v5.20-v5.22"]
-	Sku                   *NoticeSKU             `json:"sku,omitempty"`
-	UserConfig            map[string]interface{} `json:"userConfig,omitempty"`             // Map of user's settings and their values. Notice will be displayed only if the values; match the viewing users' config; Example: userConfig: { "new_sidebar.disabled": true }
-	DeprecatingDependency *ExternalDependency    `json:"deprecating_dependency,omitempty"` // External dependency which is going to be deprecated
-}
-
-type NoticeMessageInternal struct {
-	Action      *NoticeAction `json:"action,omitempty"`      // Optional action to perform on action button click. (defaults to closing the notice)
-	ActionParam *string       `json:"actionParam,omitempty"` // Optional action parameter.; Example: {"action": "url", actionParam: "/console/some-page"}
-	ActionText  *string       `json:"actionText,omitempty"`  // Optional override for the action button text (defaults to OK)
-	Description string        `json:"description"`           // Notice content. Use {{Mattermost}} instead of plain text to support white-labeling. Text; supports Markdown.
-	Image       *string       `json:"image,omitempty"`
-	Title       string        `json:"title"` // Notice title. Use {{Mattermost}} instead of plain text to support white-labeling. Text; supports Markdown.
-}
-type NoticeMessages []NoticeMessage
-
-type NoticeMessage struct {
-	NoticeMessageInternal
-	ID            string `json:"id"`
-	SysAdminOnly  bool   `json:"sysAdminOnly"`
-	TeamAdminOnly bool   `json:"teamAdminOnly"`
-}
-
-func (r *NoticeMessages) Marshal() ([]byte, error) {
-	return json.Marshal(r)
-}
-
-func UnmarshalProductNoticeMessages(data io.Reader) (NoticeMessages, error) {
-	var r NoticeMessages
-	err := json.NewDecoder(data).Decode(&r)
-	return r, err
-}
-
-// User role, i.e. who will see the notice. Defaults to "all"
-type NoticeAudience string
-
-func NewNoticeAudience(s NoticeAudience) *NoticeAudience {
-	return &s
-}
-
-func (a *NoticeAudience) Matches(sysAdmin bool, teamAdmin bool) bool {
-	switch *a {
-	case NoticeAudience_All:
-		return true
-	case NoticeAudience_Member:
-		return !sysAdmin && !teamAdmin
-	case NoticeAudience_Sysadmin:
-		return sysAdmin
-	case NoticeAudience_TeamAdmin:
-		return teamAdmin
-	}
-	return false
-}
-
-const (
-	NoticeAudience_All       NoticeAudience = "all"
-	NoticeAudience_Member    NoticeAudience = "member"
-	NoticeAudience_Sysadmin  NoticeAudience = "sysadmin"
-	NoticeAudience_TeamAdmin NoticeAudience = "teamadmin"
-)
-
-// Only show the notice on specific clients. Defaults to 'all'
-//
-// Client type. Defaults to "all"
-type NoticeClientType string
-
-func NewNoticeClientType(s NoticeClientType) *NoticeClientType { return &s }
-
-func (c *NoticeClientType) Matches(other NoticeClientType) bool {
-	switch *c {
-	case NoticeClientType_All:
-		return true
-	case NoticeClientType_Mobile:
-		return other == NoticeClientType_MobileIos || other == NoticeClientType_MobileAndroid
-	default:
-		return *c == other
-	}
-}
-
-const (
-	NoticeClientType_All           NoticeClientType = "all"
-	NoticeClientType_Desktop       NoticeClientType = "desktop"
-	NoticeClientType_Mobile        NoticeClientType = "mobile"
-	NoticeClientType_MobileAndroid NoticeClientType = "mobile-android"
-	NoticeClientType_MobileIos     NoticeClientType = "mobile-ios"
-	NoticeClientType_Web           NoticeClientType = "web"
-)
-
-func NoticeClientTypeFromString(s string) (NoticeClientType, error) {
-	switch s {
-	case "web":
-		return NoticeClientType_Web, nil
-	case "mobile-ios":
-		return NoticeClientType_MobileIos, nil
-	case "mobile-android":
-		return NoticeClientType_MobileAndroid, nil
-	case "desktop":
-		return NoticeClientType_Desktop, nil
-	}
-	return NoticeClientType_All, errors.New("Invalid client type supplied")
-}
-
-// Instance type. Defaults to "both"
-type NoticeInstanceType string
-
-func NewNoticeInstanceType(n NoticeInstanceType) *NoticeInstanceType { return &n }
-func (t *NoticeInstanceType) Matches(isCloud bool) bool {
-	if *t == NoticeInstanceType_Both {
-		return true
-	}
-	if *t == NoticeInstanceType_Cloud && !isCloud {
-		return false
-	}
-	if *t == NoticeInstanceType_OnPrem && isCloud {
-		return false
-	}
-	return true
-}
-
-const (
-	NoticeInstanceType_Both   NoticeInstanceType = "both"
-	NoticeInstanceType_Cloud  NoticeInstanceType = "cloud"
-	NoticeInstanceType_OnPrem NoticeInstanceType = "onprem"
-)
-
-// SKU. Defaults to "all"
-type NoticeSKU string
-
-func NewNoticeSKU(s NoticeSKU) *NoticeSKU { return &s }
-func (c *NoticeSKU) Matches(s string) bool {
-	switch *c {
-	case NoticeSKU_All:
-		return true
-	case NoticeSKU_E0, NoticeSKU_Team:
-		return s == ""
-	default:
-		return s == string(*c)
-	}
-}
-
-const (
-	NoticeSKU_E0   NoticeSKU = "e0"
-	NoticeSKU_E10  NoticeSKU = "e10"
-	NoticeSKU_E20  NoticeSKU = "e20"
-	NoticeSKU_All  NoticeSKU = "all"
-	NoticeSKU_Team NoticeSKU = "team"
-)
-
-// Optional action to perform on action button click. (defaults to closing the notice)
-//
-// Possible actions to execute on button press
-type NoticeAction string
-
-const (
-	URL NoticeAction = "url"
-)
-
-// Definition of the table keeping the 'viewed' state of each in-product notice per user
-type ProductNoticeViewState struct {
-	UserId    string
-	NoticeId  string
-	Viewed    int32
-	Timestamp int64
-}
-
-type ExternalDependency struct {
-	Name           string `json:"name"`
-	MinimumVersion string `json:"minimum_version"`
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/push_notification.go b/vendor/github.com/mattermost/mattermost-server/v5/model/push_notification.go
deleted file mode 100644
index 2a0dc658..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/push_notification.go
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"errors"
-	"io"
-	"strings"
-)
-
-const (
-	PUSH_NOTIFY_APPLE                = "apple"
-	PUSH_NOTIFY_ANDROID              = "android"
-	PUSH_NOTIFY_APPLE_REACT_NATIVE   = "apple_rn"
-	PUSH_NOTIFY_ANDROID_REACT_NATIVE = "android_rn"
-
-	PUSH_TYPE_MESSAGE      = "message"
-	PUSH_TYPE_CLEAR        = "clear"
-	PUSH_TYPE_UPDATE_BADGE = "update_badge"
-	PUSH_TYPE_SESSION      = "session"
-	PUSH_MESSAGE_V2        = "v2"
-
-	PUSH_SOUND_NONE = "none"
-
-	// The category is set to handle a set of interactive Actions
-	// with the push notifications
-	CATEGORY_CAN_REPLY = "CAN_REPLY"
-
-	MHPNS = "https://push.mattermost.com"
-
-	PUSH_SEND_PREPARE = "Prepared to send"
-	PUSH_SEND_SUCCESS = "Successful"
-	PUSH_NOT_SENT     = "Not Sent due to preferences"
-	PUSH_RECEIVED     = "Received by device"
-)
-
-type PushNotificationAck struct {
-	Id               string `json:"id"`
-	ClientReceivedAt int64  `json:"received_at"`
-	ClientPlatform   string `json:"platform"`
-	NotificationType string `json:"type"`
-	PostId           string `json:"post_id,omitempty"`
-	IsIdLoaded       bool   `json:"is_id_loaded"`
-}
-
-type PushNotification struct {
-	AckId            string `json:"ack_id"`
-	Platform         string `json:"platform"`
-	ServerId         string `json:"server_id"`
-	DeviceId         string `json:"device_id"`
-	PostId           string `json:"post_id"`
-	Category         string `json:"category,omitempty"`
-	Sound            string `json:"sound,omitempty"`
-	Message          string `json:"message,omitempty"`
-	Badge            int    `json:"badge,omitempty"`
-	ContentAvailable int    `json:"cont_ava,omitempty"`
-	TeamId           string `json:"team_id,omitempty"`
-	ChannelId        string `json:"channel_id,omitempty"`
-	RootId           string `json:"root_id,omitempty"`
-	ChannelName      string `json:"channel_name,omitempty"`
-	Type             string `json:"type,omitempty"`
-	SenderId         string `json:"sender_id,omitempty"`
-	SenderName       string `json:"sender_name,omitempty"`
-	OverrideUsername string `json:"override_username,omitempty"`
-	OverrideIconUrl  string `json:"override_icon_url,omitempty"`
-	FromWebhook      string `json:"from_webhook,omitempty"`
-	Version          string `json:"version,omitempty"`
-	IsIdLoaded       bool   `json:"is_id_loaded"`
-}
-
-func (pn *PushNotification) ToJson() string {
-	b, _ := json.Marshal(pn)
-	return string(b)
-}
-
-func (pn *PushNotification) DeepCopy() *PushNotification {
-	copy := *pn
-	return &copy
-}
-
-func (pn *PushNotification) SetDeviceIdAndPlatform(deviceId string) {
-
-	index := strings.Index(deviceId, ":")
-
-	if index > -1 {
-		pn.Platform = deviceId[:index]
-		pn.DeviceId = deviceId[index+1:]
-	}
-}
-
-func PushNotificationFromJson(data io.Reader) (*PushNotification, error) {
-	if data == nil {
-		return nil, errors.New("push notification data can't be nil")
-	}
-	var pn *PushNotification
-	if err := json.NewDecoder(data).Decode(&pn); err != nil {
-		return nil, err
-	}
-	return pn, nil
-}
-
-func PushNotificationAckFromJson(data io.Reader) (*PushNotificationAck, error) {
-	if data == nil {
-		return nil, errors.New("push notification data can't be nil")
-	}
-	var ack *PushNotificationAck
-	if err := json.NewDecoder(data).Decode(&ack); err != nil {
-		return nil, err
-	}
-	return ack, nil
-}
-
-func (ack *PushNotificationAck) ToJson() string {
-	b, _ := json.Marshal(ack)
-	return string(b)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/push_response.go b/vendor/github.com/mattermost/mattermost-server/v5/model/push_response.go
deleted file mode 100644
index 227a089b..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/push_response.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-const (
-	PUSH_STATUS           = "status"
-	PUSH_STATUS_OK        = "OK"
-	PUSH_STATUS_FAIL      = "FAIL"
-	PUSH_STATUS_REMOVE    = "REMOVE"
-	PUSH_STATUS_ERROR_MSG = "error"
-)
-
-type PushResponse map[string]string
-
-func NewOkPushResponse() PushResponse {
-	m := make(map[string]string)
-	m[PUSH_STATUS] = PUSH_STATUS_OK
-	return m
-}
-
-func NewRemovePushResponse() PushResponse {
-	m := make(map[string]string)
-	m[PUSH_STATUS] = PUSH_STATUS_REMOVE
-	return m
-}
-
-func NewErrorPushResponse(message string) PushResponse {
-	m := make(map[string]string)
-	m[PUSH_STATUS] = PUSH_STATUS_FAIL
-	m[PUSH_STATUS_ERROR_MSG] = message
-	return m
-}
-
-func (pr *PushResponse) ToJson() string {
-	b, _ := json.Marshal(pr)
-	return string(b)
-}
-
-func PushResponseFromJson(data io.Reader) PushResponse {
-	decoder := json.NewDecoder(data)
-
-	var objmap PushResponse
-	if err := decoder.Decode(&objmap); err != nil {
-		return make(map[string]string)
-	}
-	return objmap
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/reaction.go b/vendor/github.com/mattermost/mattermost-server/v5/model/reaction.go
deleted file mode 100644
index 6d0ea68d..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/reaction.go
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-	"regexp"
-)
-
-type Reaction struct {
-	UserId    string  `json:"user_id"`
-	PostId    string  `json:"post_id"`
-	EmojiName string  `json:"emoji_name"`
-	CreateAt  int64   `json:"create_at"`
-	UpdateAt  int64   `json:"update_at"`
-	DeleteAt  int64   `json:"delete_at"`
-	RemoteId  *string `json:"remote_id"`
-}
-
-func (o *Reaction) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func ReactionFromJson(data io.Reader) *Reaction {
-	var o Reaction
-
-	if err := json.NewDecoder(data).Decode(&o); err != nil {
-		return nil
-	}
-	return &o
-}
-
-func ReactionsToJson(o []*Reaction) string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func MapPostIdToReactionsToJson(o map[string][]*Reaction) string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func MapPostIdToReactionsFromJson(data io.Reader) map[string][]*Reaction {
-	decoder := json.NewDecoder(data)
-
-	var objmap map[string][]*Reaction
-	if err := decoder.Decode(&objmap); err != nil {
-		return make(map[string][]*Reaction)
-	}
-	return objmap
-}
-
-func ReactionsFromJson(data io.Reader) []*Reaction {
-	var o []*Reaction
-
-	if err := json.NewDecoder(data).Decode(&o); err != nil {
-		return nil
-	}
-	return o
-}
-
-func (o *Reaction) IsValid() *AppError {
-	if !IsValidId(o.UserId) {
-		return NewAppError("Reaction.IsValid", "model.reaction.is_valid.user_id.app_error", nil, "user_id="+o.UserId, http.StatusBadRequest)
-	}
-
-	if !IsValidId(o.PostId) {
-		return NewAppError("Reaction.IsValid", "model.reaction.is_valid.post_id.app_error", nil, "post_id="+o.PostId, http.StatusBadRequest)
-	}
-
-	validName := regexp.MustCompile(`^[a-zA-Z0-9\-\+_]+$`)
-
-	if o.EmojiName == "" || len(o.EmojiName) > EMOJI_NAME_MAX_LENGTH || !validName.MatchString(o.EmojiName) {
-		return NewAppError("Reaction.IsValid", "model.reaction.is_valid.emoji_name.app_error", nil, "emoji_name="+o.EmojiName, http.StatusBadRequest)
-	}
-
-	if o.CreateAt == 0 {
-		return NewAppError("Reaction.IsValid", "model.reaction.is_valid.create_at.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.UpdateAt == 0 {
-		return NewAppError("Reaction.IsValid", "model.reaction.is_valid.update_at.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (o *Reaction) PreSave() {
-	if o.CreateAt == 0 {
-		o.CreateAt = GetMillis()
-	}
-	o.UpdateAt = GetMillis()
-	o.DeleteAt = 0
-
-	if o.RemoteId == nil {
-		o.RemoteId = NewString("")
-	}
-}
-
-func (o *Reaction) PreUpdate() {
-	o.UpdateAt = GetMillis()
-
-	if o.RemoteId == nil {
-		o.RemoteId = NewString("")
-	}
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/remote_cluster.go b/vendor/github.com/mattermost/mattermost-server/v5/model/remote_cluster.go
deleted file mode 100644
index 2ec0cc9b..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/remote_cluster.go
+++ /dev/null
@@ -1,355 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/rand"
-	"encoding/json"
-	"errors"
-	"io"
-	"net/http"
-	"regexp"
-	"strings"
-
-	"golang.org/x/crypto/scrypt"
-)
-
-const (
-	RemoteOfflineAfterMillis = 1000 * 60 * 5 // 5 minutes
-	RemoteNameMinLength      = 1
-	RemoteNameMaxLength      = 64
-)
-
-var (
-	validRemoteNameChars = regexp.MustCompile(`^[a-zA-Z0-9\.\-\_]+$`)
-)
-
-type RemoteCluster struct {
-	RemoteId     string `json:"remote_id"`
-	RemoteTeamId string `json:"remote_team_id"`
-	Name         string `json:"name"`
-	DisplayName  string `json:"display_name"`
-	SiteURL      string `json:"site_url"`
-	CreateAt     int64  `json:"create_at"`
-	LastPingAt   int64  `json:"last_ping_at"`
-	Token        string `json:"token"`
-	RemoteToken  string `json:"remote_token"`
-	Topics       string `json:"topics"`
-	CreatorId    string `json:"creator_id"`
-}
-
-func (rc *RemoteCluster) PreSave() {
-	if rc.RemoteId == "" {
-		rc.RemoteId = NewId()
-	}
-
-	if rc.DisplayName == "" {
-		rc.DisplayName = rc.Name
-	}
-
-	rc.Name = SanitizeUnicode(rc.Name)
-	rc.DisplayName = SanitizeUnicode(rc.DisplayName)
-	rc.Name = NormalizeRemoteName(rc.Name)
-
-	if rc.Token == "" {
-		rc.Token = NewId()
-	}
-
-	if rc.CreateAt == 0 {
-		rc.CreateAt = GetMillis()
-	}
-	rc.fixTopics()
-}
-
-func (rc *RemoteCluster) IsValid() *AppError {
-	if !IsValidId(rc.RemoteId) {
-		return NewAppError("RemoteCluster.IsValid", "model.cluster.is_valid.id.app_error", nil, "id="+rc.RemoteId, http.StatusBadRequest)
-	}
-
-	if !IsValidRemoteName(rc.Name) {
-		return NewAppError("RemoteCluster.IsValid", "model.cluster.is_valid.name.app_error", nil, "name="+rc.Name, http.StatusBadRequest)
-	}
-
-	if rc.CreateAt == 0 {
-		return NewAppError("RemoteCluster.IsValid", "model.cluster.is_valid.create_at.app_error", nil, "create_at=0", http.StatusBadRequest)
-	}
-
-	if !IsValidId(rc.CreatorId) {
-		return NewAppError("RemoteCluster.IsValid", "model.cluster.is_valid.id.app_error", nil, "creator_id="+rc.CreatorId, http.StatusBadRequest)
-	}
-	return nil
-}
-
-func IsValidRemoteName(s string) bool {
-	if len(s) < RemoteNameMinLength || len(s) > RemoteNameMaxLength {
-		return false
-	}
-	return validRemoteNameChars.MatchString(s)
-}
-
-func (rc *RemoteCluster) PreUpdate() {
-	if rc.DisplayName == "" {
-		rc.DisplayName = rc.Name
-	}
-
-	rc.Name = SanitizeUnicode(rc.Name)
-	rc.DisplayName = SanitizeUnicode(rc.DisplayName)
-	rc.Name = NormalizeRemoteName(rc.Name)
-	rc.fixTopics()
-}
-
-func (rc *RemoteCluster) IsOnline() bool {
-	return rc.LastPingAt > GetMillis()-RemoteOfflineAfterMillis
-}
-
-// fixTopics ensures all topics are separated by one, and only one, space.
-func (rc *RemoteCluster) fixTopics() {
-	trimmed := strings.TrimSpace(rc.Topics)
-	if trimmed == "" || trimmed == "*" {
-		rc.Topics = trimmed
-		return
-	}
-
-	var sb strings.Builder
-	sb.WriteString(" ")
-
-	ss := strings.Split(rc.Topics, " ")
-	for _, c := range ss {
-		cc := strings.TrimSpace(c)
-		if cc != "" {
-			sb.WriteString(cc)
-			sb.WriteString(" ")
-		}
-	}
-	rc.Topics = sb.String()
-}
-
-func (rc *RemoteCluster) ToJSON() (string, error) {
-	b, err := json.Marshal(rc)
-	if err != nil {
-		return "", err
-	}
-	return string(b), nil
-}
-
-func (rc *RemoteCluster) ToRemoteClusterInfo() RemoteClusterInfo {
-	return RemoteClusterInfo{
-		Name:        rc.Name,
-		DisplayName: rc.DisplayName,
-		CreateAt:    rc.CreateAt,
-		LastPingAt:  rc.LastPingAt,
-	}
-}
-
-func NormalizeRemoteName(name string) string {
-	return strings.ToLower(name)
-}
-
-func RemoteClusterFromJSON(data io.Reader) (*RemoteCluster, *AppError) {
-	var rc RemoteCluster
-	err := json.NewDecoder(data).Decode(&rc)
-	if err != nil {
-		return nil, NewAppError("RemoteClusterFromJSON", "model.utils.decode_json.app_error", nil, err.Error(), http.StatusBadRequest)
-	}
-	return &rc, nil
-}
-
-// RemoteClusterInfo provides a subset of RemoteCluster fields suitable for sending to clients.
-type RemoteClusterInfo struct {
-	Name        string `json:"name"`
-	DisplayName string `json:"display_name"`
-	CreateAt    int64  `json:"create_at"`
-	LastPingAt  int64  `json:"last_ping_at"`
-}
-
-// RemoteClusterFrame wraps a `RemoteClusterMsg` with credentials specific to a remote cluster.
-type RemoteClusterFrame struct {
-	RemoteId string           `json:"remote_id"`
-	Msg      RemoteClusterMsg `json:"msg"`
-}
-
-func (f *RemoteClusterFrame) IsValid() *AppError {
-	if !IsValidId(f.RemoteId) {
-		return NewAppError("RemoteClusterFrame.IsValid", "api.remote_cluster.invalid_id.app_error", nil, "RemoteId="+f.RemoteId, http.StatusBadRequest)
-	}
-
-	if err := f.Msg.IsValid(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func RemoteClusterFrameFromJSON(data io.Reader) (*RemoteClusterFrame, *AppError) {
-	var frame RemoteClusterFrame
-	err := json.NewDecoder(data).Decode(&frame)
-	if err != nil {
-		return nil, NewAppError("RemoteClusterFrameFromJSON", "model.utils.decode_json.app_error", nil, err.Error(), http.StatusBadRequest)
-	}
-	return &frame, nil
-}
-
-// RemoteClusterMsg represents a message that is sent and received between clusters.
-// These are processed and routed via the RemoteClusters service.
-type RemoteClusterMsg struct {
-	Id       string          `json:"id"`
-	Topic    string          `json:"topic"`
-	CreateAt int64           `json:"create_at"`
-	Payload  json.RawMessage `json:"payload"`
-}
-
-func NewRemoteClusterMsg(topic string, payload json.RawMessage) RemoteClusterMsg {
-	return RemoteClusterMsg{
-		Id:       NewId(),
-		Topic:    topic,
-		CreateAt: GetMillis(),
-		Payload:  payload,
-	}
-}
-
-func (m RemoteClusterMsg) IsValid() *AppError {
-	if !IsValidId(m.Id) {
-		return NewAppError("RemoteClusterMsg.IsValid", "api.remote_cluster.invalid_id.app_error", nil, "Id="+m.Id, http.StatusBadRequest)
-	}
-
-	if m.Topic == "" {
-		return NewAppError("RemoteClusterMsg.IsValid", "api.remote_cluster.invalid_topic.app_error", nil, "Topic empty", http.StatusBadRequest)
-	}
-
-	if len(m.Payload) == 0 {
-		return NewAppError("RemoteClusterMsg.IsValid", "api.context.invalid_body_param.app_error", map[string]interface{}{"Name": "PayLoad"}, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func RemoteClusterMsgFromJSON(data io.Reader) (RemoteClusterMsg, *AppError) {
-	var msg RemoteClusterMsg
-	err := json.NewDecoder(data).Decode(&msg)
-	if err != nil {
-		return RemoteClusterMsg{}, NewAppError("RemoteClusterMsgFromJSON", "model.utils.decode_json.app_error", nil, err.Error(), http.StatusBadRequest)
-	}
-	return msg, nil
-}
-
-// RemoteClusterPing represents a ping that is sent and received between clusters
-// to indicate a connection is alive. This is the payload for a `RemoteClusterMsg`.
-type RemoteClusterPing struct {
-	SentAt int64 `json:"sent_at"`
-	RecvAt int64 `json:"recv_at"`
-}
-
-func RemoteClusterPingFromRawJSON(raw json.RawMessage) (RemoteClusterPing, *AppError) {
-	var ping RemoteClusterPing
-	err := json.Unmarshal(raw, &ping)
-	if err != nil {
-		return RemoteClusterPing{}, NewAppError("RemoteClusterPingFromRawJSON", "model.utils.decode_json.app_error", nil, err.Error(), http.StatusBadRequest)
-	}
-	return ping, nil
-}
-
-// RemoteClusterInvite represents an invitation to establish a simple trust with a remote cluster.
-type RemoteClusterInvite struct {
-	RemoteId     string `json:"remote_id"`
-	RemoteTeamId string `json:"remote_team_id"`
-	SiteURL      string `json:"site_url"`
-	Token        string `json:"token"`
-}
-
-func RemoteClusterInviteFromRawJSON(raw json.RawMessage) (*RemoteClusterInvite, *AppError) {
-	var invite RemoteClusterInvite
-	err := json.Unmarshal(raw, &invite)
-	if err != nil {
-		return nil, NewAppError("RemoteClusterInviteFromRawJSON", "model.utils.decode_json.app_error", nil, err.Error(), http.StatusBadRequest)
-	}
-	return &invite, nil
-}
-
-func (rci *RemoteClusterInvite) Encrypt(password string) ([]byte, error) {
-	raw, err := json.Marshal(&rci)
-	if err != nil {
-		return nil, err
-	}
-
-	// create random salt to be prepended to the blob.
-	salt := make([]byte, 16)
-	if _, err = io.ReadFull(rand.Reader, salt); err != nil {
-		return nil, err
-	}
-
-	key, err := scrypt.Key([]byte(password), salt, 32768, 8, 1, 32)
-	if err != nil {
-		return nil, err
-	}
-
-	block, err := aes.NewCipher(key[:])
-	if err != nil {
-		return nil, err
-	}
-
-	gcm, err := cipher.NewGCM(block)
-	if err != nil {
-		return nil, err
-	}
-
-	// create random nonce
-	nonce := make([]byte, gcm.NonceSize())
-	if _, err = io.ReadFull(rand.Reader, nonce); err != nil {
-		return nil, err
-	}
-
-	// prefix the nonce to the cyphertext so we don't need to keep track of it.
-	sealed := gcm.Seal(nonce, nonce, raw, nil)
-
-	return append(salt, sealed...), nil
-}
-
-func (rci *RemoteClusterInvite) Decrypt(encrypted []byte, password string) error {
-	if len(encrypted) <= 16 {
-		return errors.New("invalid length")
-	}
-
-	// first 16 bytes is the salt that was used to derive a key
-	salt := encrypted[:16]
-	encrypted = encrypted[16:]
-
-	key, err := scrypt.Key([]byte(password), salt, 32768, 8, 1, 32)
-	if err != nil {
-		return err
-	}
-
-	block, err := aes.NewCipher(key[:])
-	if err != nil {
-		return err
-	}
-
-	gcm, err := cipher.NewGCM(block)
-	if err != nil {
-		return err
-	}
-
-	// nonce was prefixed to the cyphertext when encrypting so we need to extract it.
-	nonceSize := gcm.NonceSize()
-	nonce, cyphertext := encrypted[:nonceSize], encrypted[nonceSize:]
-
-	plain, err := gcm.Open(nil, nonce, cyphertext, nil)
-	if err != nil {
-		return err
-	}
-
-	// try to unmarshall the decrypted JSON to this invite struct.
-	return json.Unmarshal(plain, &rci)
-}
-
-// RemoteClusterQueryFilter provides filter criteria for RemoteClusterStore.GetAll
-type RemoteClusterQueryFilter struct {
-	ExcludeOffline bool
-	InChannel      string
-	NotInChannel   string
-	Topic          string
-	CreatorId      string
-	OnlyConfirmed  bool
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/role.go b/vendor/github.com/mattermost/mattermost-server/v5/model/role.go
deleted file mode 100644
index fc1606ce..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/role.go
+++ /dev/null
@@ -1,952 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"strings"
-)
-
-// SysconsoleAncillaryPermissions maps the non-sysconsole permissions required by each sysconsole view.
-var SysconsoleAncillaryPermissions map[string][]*Permission
-var SystemManagerDefaultPermissions []string
-var SystemUserManagerDefaultPermissions []string
-var SystemReadOnlyAdminDefaultPermissions []string
-
-var BuiltInSchemeManagedRoleIDs []string
-
-var NewSystemRoleIDs []string
-
-func init() {
-	NewSystemRoleIDs = []string{
-		SYSTEM_USER_MANAGER_ROLE_ID,
-		SYSTEM_READ_ONLY_ADMIN_ROLE_ID,
-		SYSTEM_MANAGER_ROLE_ID,
-	}
-
-	BuiltInSchemeManagedRoleIDs = append([]string{
-		SYSTEM_GUEST_ROLE_ID,
-		SYSTEM_USER_ROLE_ID,
-		SYSTEM_ADMIN_ROLE_ID,
-		SYSTEM_POST_ALL_ROLE_ID,
-		SYSTEM_POST_ALL_PUBLIC_ROLE_ID,
-		SYSTEM_USER_ACCESS_TOKEN_ROLE_ID,
-
-		TEAM_GUEST_ROLE_ID,
-		TEAM_USER_ROLE_ID,
-		TEAM_ADMIN_ROLE_ID,
-		TEAM_POST_ALL_ROLE_ID,
-		TEAM_POST_ALL_PUBLIC_ROLE_ID,
-
-		CHANNEL_GUEST_ROLE_ID,
-		CHANNEL_USER_ROLE_ID,
-		CHANNEL_ADMIN_ROLE_ID,
-	}, NewSystemRoleIDs...)
-
-	// When updating the values here, the values in mattermost-redux must also be updated.
-	SysconsoleAncillaryPermissions = map[string][]*Permission{
-		PERMISSION_SYSCONSOLE_READ_ABOUT_EDITION_AND_LICENSE.Id: {
-			PERMISSION_READ_LICENSE_INFORMATION,
-		},
-		PERMISSION_SYSCONSOLE_WRITE_ABOUT_EDITION_AND_LICENSE.Id: {
-			PERMISSION_MANAGE_LICENSE_INFORMATION,
-		},
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_CHANNELS.Id: {
-			PERMISSION_READ_PUBLIC_CHANNEL,
-			PERMISSION_READ_CHANNEL,
-			PERMISSION_READ_PUBLIC_CHANNEL_GROUPS,
-			PERMISSION_READ_PRIVATE_CHANNEL_GROUPS,
-		},
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_USERS.Id: {
-			PERMISSION_READ_OTHER_USERS_TEAMS,
-			PERMISSION_GET_ANALYTICS,
-		},
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_TEAMS.Id: {
-			PERMISSION_LIST_PRIVATE_TEAMS,
-			PERMISSION_LIST_PUBLIC_TEAMS,
-			PERMISSION_VIEW_TEAM,
-		},
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_ELASTICSEARCH.Id: {
-			PERMISSION_READ_ELASTICSEARCH_POST_INDEXING_JOB,
-			PERMISSION_READ_ELASTICSEARCH_POST_AGGREGATION_JOB,
-		},
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_WEB_SERVER.Id: {
-			PERMISSION_TEST_SITE_URL,
-			PERMISSION_RELOAD_CONFIG,
-			PERMISSION_INVALIDATE_CACHES,
-		},
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_DATABASE.Id: {
-			PERMISSION_RECYCLE_DATABASE_CONNECTIONS,
-		},
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_ELASTICSEARCH.Id: {
-			PERMISSION_TEST_ELASTICSEARCH,
-			PERMISSION_CREATE_ELASTICSEARCH_POST_INDEXING_JOB,
-			PERMISSION_CREATE_ELASTICSEARCH_POST_AGGREGATION_JOB,
-			PERMISSION_PURGE_ELASTICSEARCH_INDEXES,
-		},
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_FILE_STORAGE.Id: {
-			PERMISSION_TEST_S3,
-		},
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_SMTP.Id: {
-			PERMISSION_TEST_EMAIL,
-		},
-		PERMISSION_SYSCONSOLE_READ_REPORTING_SERVER_LOGS.Id: {
-			PERMISSION_GET_LOGS,
-		},
-		PERMISSION_SYSCONSOLE_READ_REPORTING_SITE_STATISTICS.Id: {
-			PERMISSION_GET_ANALYTICS,
-		},
-		PERMISSION_SYSCONSOLE_READ_REPORTING_TEAM_STATISTICS.Id: {
-			PERMISSION_VIEW_TEAM,
-		},
-		PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_USERS.Id: {
-			PERMISSION_EDIT_OTHER_USERS,
-			PERMISSION_DEMOTE_TO_GUEST,
-			PERMISSION_PROMOTE_GUEST,
-		},
-		PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_CHANNELS.Id: {
-			PERMISSION_MANAGE_TEAM,
-			PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES,
-			PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES,
-			PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS,
-			PERMISSION_MANAGE_PUBLIC_CHANNEL_MEMBERS,
-			PERMISSION_DELETE_PRIVATE_CHANNEL,
-			PERMISSION_DELETE_PUBLIC_CHANNEL,
-			PERMISSION_MANAGE_CHANNEL_ROLES,
-			PERMISSION_CONVERT_PUBLIC_CHANNEL_TO_PRIVATE,
-			PERMISSION_CONVERT_PRIVATE_CHANNEL_TO_PUBLIC,
-		},
-		PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_TEAMS.Id: {
-			PERMISSION_MANAGE_TEAM,
-			PERMISSION_MANAGE_TEAM_ROLES,
-			PERMISSION_REMOVE_USER_FROM_TEAM,
-			PERMISSION_JOIN_PRIVATE_TEAMS,
-			PERMISSION_JOIN_PUBLIC_TEAMS,
-			PERMISSION_ADD_USER_TO_TEAM,
-		},
-		PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_GROUPS.Id: {
-			PERMISSION_MANAGE_TEAM,
-			PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS,
-			PERMISSION_MANAGE_PUBLIC_CHANNEL_MEMBERS,
-			PERMISSION_CONVERT_PUBLIC_CHANNEL_TO_PRIVATE,
-			PERMISSION_CONVERT_PRIVATE_CHANNEL_TO_PUBLIC,
-		},
-		PERMISSION_SYSCONSOLE_WRITE_SITE_CUSTOMIZATION.Id: {
-			PERMISSION_EDIT_BRAND,
-		},
-		PERMISSION_SYSCONSOLE_WRITE_COMPLIANCE_DATA_RETENTION_POLICY.Id: {
-			PERMISSION_CREATE_DATA_RETENTION_JOB,
-		},
-		PERMISSION_SYSCONSOLE_READ_COMPLIANCE_DATA_RETENTION_POLICY.Id: {
-			PERMISSION_READ_DATA_RETENTION_JOB,
-		},
-		PERMISSION_SYSCONSOLE_WRITE_COMPLIANCE_COMPLIANCE_EXPORT.Id: {
-			PERMISSION_CREATE_COMPLIANCE_EXPORT_JOB,
-			PERMISSION_DOWNLOAD_COMPLIANCE_EXPORT_RESULT,
-		},
-		PERMISSION_SYSCONSOLE_READ_COMPLIANCE_COMPLIANCE_EXPORT.Id: {
-			PERMISSION_READ_COMPLIANCE_EXPORT_JOB,
-			PERMISSION_DOWNLOAD_COMPLIANCE_EXPORT_RESULT,
-		},
-		PERMISSION_SYSCONSOLE_READ_COMPLIANCE_CUSTOM_TERMS_OF_SERVICE.Id: {
-			PERMISSION_READ_AUDITS,
-		},
-		PERMISSION_SYSCONSOLE_WRITE_EXPERIMENTAL_BLEVE.Id: {
-			PERMISSION_CREATE_POST_BLEVE_INDEXES_JOB,
-			PERMISSION_PURGE_BLEVE_INDEXES,
-		},
-		PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_LDAP.Id: {
-			PERMISSION_CREATE_LDAP_SYNC_JOB,
-			PERMISSION_ADD_LDAP_PUBLIC_CERT,
-			PERMISSION_REMOVE_LDAP_PUBLIC_CERT,
-			PERMISSION_ADD_LDAP_PRIVATE_CERT,
-			PERMISSION_REMOVE_LDAP_PRIVATE_CERT,
-		},
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_LDAP.Id: {
-			PERMISSION_TEST_LDAP,
-			PERMISSION_READ_LDAP_SYNC_JOB,
-		},
-		PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_EMAIL.Id: {
-			PERMISSION_INVALIDATE_EMAIL_INVITE,
-		},
-		PERMISSION_SYSCONSOLE_WRITE_AUTHENTICATION_SAML.Id: {
-			PERMISSION_GET_SAML_METADATA_FROM_IDP,
-			PERMISSION_ADD_SAML_PUBLIC_CERT,
-			PERMISSION_ADD_SAML_PRIVATE_CERT,
-			PERMISSION_ADD_SAML_IDP_CERT,
-			PERMISSION_REMOVE_SAML_PUBLIC_CERT,
-			PERMISSION_REMOVE_SAML_PRIVATE_CERT,
-			PERMISSION_REMOVE_SAML_IDP_CERT,
-			PERMISSION_GET_SAML_CERT_STATUS,
-		},
-	}
-
-	SystemUserManagerDefaultPermissions = []string{
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_GROUPS.Id,
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_TEAMS.Id,
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_CHANNELS.Id,
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_PERMISSIONS.Id,
-		PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_GROUPS.Id,
-		PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_TEAMS.Id,
-		PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_CHANNELS.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_SIGNUP.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_EMAIL.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_PASSWORD.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_MFA.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_LDAP.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_SAML.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_OPENID.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_GUEST_ACCESS.Id,
-	}
-
-	SystemReadOnlyAdminDefaultPermissions = []string{
-		PERMISSION_SYSCONSOLE_READ_ABOUT_EDITION_AND_LICENSE.Id,
-		PERMISSION_SYSCONSOLE_READ_REPORTING_SITE_STATISTICS.Id,
-		PERMISSION_SYSCONSOLE_READ_REPORTING_TEAM_STATISTICS.Id,
-		PERMISSION_SYSCONSOLE_READ_REPORTING_SERVER_LOGS.Id,
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_USERS.Id,
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_GROUPS.Id,
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_TEAMS.Id,
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_CHANNELS.Id,
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_PERMISSIONS.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_WEB_SERVER.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_DATABASE.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_ELASTICSEARCH.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_FILE_STORAGE.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_IMAGE_PROXY.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_SMTP.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_PUSH_NOTIFICATION_SERVER.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_HIGH_AVAILABILITY.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_RATE_LIMITING.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_LOGGING.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_SESSION_LENGTHS.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_PERFORMANCE_MONITORING.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_DEVELOPER.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_CUSTOMIZATION.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_LOCALIZATION.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_USERS_AND_TEAMS.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_NOTIFICATIONS.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_ANNOUNCEMENT_BANNER.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_EMOJI.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_POSTS.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_FILE_SHARING_AND_DOWNLOADS.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_PUBLIC_LINKS.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_NOTICES.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_SIGNUP.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_EMAIL.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_PASSWORD.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_MFA.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_LDAP.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_SAML.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_OPENID.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_GUEST_ACCESS.Id,
-		PERMISSION_SYSCONSOLE_READ_PLUGINS.Id,
-		PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_INTEGRATION_MANAGEMENT.Id,
-		PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_BOT_ACCOUNTS.Id,
-		PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_GIF.Id,
-		PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_CORS.Id,
-		PERMISSION_SYSCONSOLE_READ_COMPLIANCE_DATA_RETENTION_POLICY.Id,
-		PERMISSION_SYSCONSOLE_READ_COMPLIANCE_COMPLIANCE_EXPORT.Id,
-		PERMISSION_SYSCONSOLE_READ_COMPLIANCE_COMPLIANCE_MONITORING.Id,
-		PERMISSION_SYSCONSOLE_READ_COMPLIANCE_CUSTOM_TERMS_OF_SERVICE.Id,
-		PERMISSION_SYSCONSOLE_READ_EXPERIMENTAL_FEATURES.Id,
-		PERMISSION_SYSCONSOLE_READ_EXPERIMENTAL_FEATURE_FLAGS.Id,
-		PERMISSION_SYSCONSOLE_READ_EXPERIMENTAL_BLEVE.Id,
-	}
-
-	SystemManagerDefaultPermissions = []string{
-		PERMISSION_SYSCONSOLE_READ_ABOUT_EDITION_AND_LICENSE.Id,
-		PERMISSION_SYSCONSOLE_READ_REPORTING_SITE_STATISTICS.Id,
-		PERMISSION_SYSCONSOLE_READ_REPORTING_TEAM_STATISTICS.Id,
-		PERMISSION_SYSCONSOLE_READ_REPORTING_SERVER_LOGS.Id,
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_GROUPS.Id,
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_TEAMS.Id,
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_CHANNELS.Id,
-		PERMISSION_SYSCONSOLE_READ_USERMANAGEMENT_PERMISSIONS.Id,
-		PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_GROUPS.Id,
-		PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_TEAMS.Id,
-		PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_CHANNELS.Id,
-		PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_PERMISSIONS.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_WEB_SERVER.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_DATABASE.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_ELASTICSEARCH.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_FILE_STORAGE.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_IMAGE_PROXY.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_SMTP.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_PUSH_NOTIFICATION_SERVER.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_HIGH_AVAILABILITY.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_RATE_LIMITING.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_LOGGING.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_SESSION_LENGTHS.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_PERFORMANCE_MONITORING.Id,
-		PERMISSION_SYSCONSOLE_READ_ENVIRONMENT_DEVELOPER.Id,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_WEB_SERVER.Id,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_DATABASE.Id,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_ELASTICSEARCH.Id,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_FILE_STORAGE.Id,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_IMAGE_PROXY.Id,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_SMTP.Id,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_PUSH_NOTIFICATION_SERVER.Id,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_HIGH_AVAILABILITY.Id,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_RATE_LIMITING.Id,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_LOGGING.Id,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_SESSION_LENGTHS.Id,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_PERFORMANCE_MONITORING.Id,
-		PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT_DEVELOPER.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_CUSTOMIZATION.Id,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_CUSTOMIZATION.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_LOCALIZATION.Id,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_LOCALIZATION.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_USERS_AND_TEAMS.Id,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_USERS_AND_TEAMS.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_NOTIFICATIONS.Id,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_NOTIFICATIONS.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_ANNOUNCEMENT_BANNER.Id,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_ANNOUNCEMENT_BANNER.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_EMOJI.Id,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_EMOJI.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_POSTS.Id,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_POSTS.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_FILE_SHARING_AND_DOWNLOADS.Id,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_FILE_SHARING_AND_DOWNLOADS.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_PUBLIC_LINKS.Id,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_PUBLIC_LINKS.Id,
-		PERMISSION_SYSCONSOLE_READ_SITE_NOTICES.Id,
-		PERMISSION_SYSCONSOLE_WRITE_SITE_NOTICES.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_SIGNUP.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_EMAIL.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_PASSWORD.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_MFA.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_LDAP.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_SAML.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_OPENID.Id,
-		PERMISSION_SYSCONSOLE_READ_AUTHENTICATION_GUEST_ACCESS.Id,
-		PERMISSION_SYSCONSOLE_READ_PLUGINS.Id,
-		PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_INTEGRATION_MANAGEMENT.Id,
-		PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_BOT_ACCOUNTS.Id,
-		PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_GIF.Id,
-		PERMISSION_SYSCONSOLE_READ_INTEGRATIONS_CORS.Id,
-		PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS_INTEGRATION_MANAGEMENT.Id,
-		PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS_BOT_ACCOUNTS.Id,
-		PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS_GIF.Id,
-		PERMISSION_SYSCONSOLE_WRITE_INTEGRATIONS_CORS.Id,
-	}
-
-	// Add the ancillary permissions to each system role
-	SystemUserManagerDefaultPermissions = AddAncillaryPermissions(SystemUserManagerDefaultPermissions)
-	SystemReadOnlyAdminDefaultPermissions = AddAncillaryPermissions(SystemReadOnlyAdminDefaultPermissions)
-	SystemManagerDefaultPermissions = AddAncillaryPermissions(SystemManagerDefaultPermissions)
-}
-
-type RoleType string
-type RoleScope string
-
-const (
-	SYSTEM_GUEST_ROLE_ID             = "system_guest"
-	SYSTEM_USER_ROLE_ID              = "system_user"
-	SYSTEM_ADMIN_ROLE_ID             = "system_admin"
-	SYSTEM_POST_ALL_ROLE_ID          = "system_post_all"
-	SYSTEM_POST_ALL_PUBLIC_ROLE_ID   = "system_post_all_public"
-	SYSTEM_USER_ACCESS_TOKEN_ROLE_ID = "system_user_access_token"
-	SYSTEM_USER_MANAGER_ROLE_ID      = "system_user_manager"
-	SYSTEM_READ_ONLY_ADMIN_ROLE_ID   = "system_read_only_admin"
-	SYSTEM_MANAGER_ROLE_ID           = "system_manager"
-
-	TEAM_GUEST_ROLE_ID           = "team_guest"
-	TEAM_USER_ROLE_ID            = "team_user"
-	TEAM_ADMIN_ROLE_ID           = "team_admin"
-	TEAM_POST_ALL_ROLE_ID        = "team_post_all"
-	TEAM_POST_ALL_PUBLIC_ROLE_ID = "team_post_all_public"
-
-	CHANNEL_GUEST_ROLE_ID = "channel_guest"
-	CHANNEL_USER_ROLE_ID  = "channel_user"
-	CHANNEL_ADMIN_ROLE_ID = "channel_admin"
-
-	ROLE_NAME_MAX_LENGTH         = 64
-	ROLE_DISPLAY_NAME_MAX_LENGTH = 128
-	ROLE_DESCRIPTION_MAX_LENGTH  = 1024
-
-	RoleScopeSystem  RoleScope = "System"
-	RoleScopeTeam    RoleScope = "Team"
-	RoleScopeChannel RoleScope = "Channel"
-
-	RoleTypeGuest RoleType = "Guest"
-	RoleTypeUser  RoleType = "User"
-	RoleTypeAdmin RoleType = "Admin"
-)
-
-type Role struct {
-	Id            string   `json:"id"`
-	Name          string   `json:"name"`
-	DisplayName   string   `json:"display_name"`
-	Description   string   `json:"description"`
-	CreateAt      int64    `json:"create_at"`
-	UpdateAt      int64    `json:"update_at"`
-	DeleteAt      int64    `json:"delete_at"`
-	Permissions   []string `json:"permissions"`
-	SchemeManaged bool     `json:"scheme_managed"`
-	BuiltIn       bool     `json:"built_in"`
-}
-
-type RolePatch struct {
-	Permissions *[]string `json:"permissions"`
-}
-
-type RolePermissions struct {
-	RoleID      string
-	Permissions []string
-}
-
-func (r *Role) ToJson() string {
-	b, _ := json.Marshal(r)
-	return string(b)
-}
-
-func RoleFromJson(data io.Reader) *Role {
-	var r *Role
-	json.NewDecoder(data).Decode(&r)
-	return r
-}
-
-func RoleListToJson(r []*Role) string {
-	b, _ := json.Marshal(r)
-	return string(b)
-}
-
-func RoleListFromJson(data io.Reader) []*Role {
-	var roles []*Role
-	json.NewDecoder(data).Decode(&roles)
-	return roles
-}
-
-func (r *RolePatch) ToJson() string {
-	b, _ := json.Marshal(r)
-	return string(b)
-}
-
-func RolePatchFromJson(data io.Reader) *RolePatch {
-	var rolePatch *RolePatch
-	json.NewDecoder(data).Decode(&rolePatch)
-	return rolePatch
-}
-
-func (r *Role) Patch(patch *RolePatch) {
-	if patch.Permissions != nil {
-		r.Permissions = *patch.Permissions
-	}
-}
-
-// MergeChannelHigherScopedPermissions is meant to be invoked on a channel scheme's role and merges the higher-scoped
-// channel role's permissions.
-func (r *Role) MergeChannelHigherScopedPermissions(higherScopedPermissions *RolePermissions) {
-	mergedPermissions := []string{}
-
-	higherScopedPermissionsMap := AsStringBoolMap(higherScopedPermissions.Permissions)
-	rolePermissionsMap := AsStringBoolMap(r.Permissions)
-
-	for _, cp := range AllPermissions {
-		if cp.Scope != PermissionScopeChannel {
-			continue
-		}
-
-		_, presentOnHigherScope := higherScopedPermissionsMap[cp.Id]
-
-		// For the channel admin role always look to the higher scope to determine if the role has their permission.
-		// The channel admin is a special case because they're not part of the UI to be "channel moderated", only
-		// channel members and channel guests are.
-		if higherScopedPermissions.RoleID == CHANNEL_ADMIN_ROLE_ID && presentOnHigherScope {
-			mergedPermissions = append(mergedPermissions, cp.Id)
-			continue
-		}
-
-		_, permissionIsModerated := ChannelModeratedPermissionsMap[cp.Id]
-		if permissionIsModerated {
-			_, presentOnRole := rolePermissionsMap[cp.Id]
-			if presentOnRole && presentOnHigherScope {
-				mergedPermissions = append(mergedPermissions, cp.Id)
-			}
-		} else {
-			if presentOnHigherScope {
-				mergedPermissions = append(mergedPermissions, cp.Id)
-			}
-		}
-	}
-
-	r.Permissions = mergedPermissions
-}
-
-// Returns an array of permissions that are in either role.Permissions
-// or patch.Permissions, but not both.
-func PermissionsChangedByPatch(role *Role, patch *RolePatch) []string {
-	var result []string
-
-	if patch.Permissions == nil {
-		return result
-	}
-
-	roleMap := make(map[string]bool)
-	patchMap := make(map[string]bool)
-
-	for _, permission := range role.Permissions {
-		roleMap[permission] = true
-	}
-
-	for _, permission := range *patch.Permissions {
-		patchMap[permission] = true
-	}
-
-	for _, permission := range role.Permissions {
-		if !patchMap[permission] {
-			result = append(result, permission)
-		}
-	}
-
-	for _, permission := range *patch.Permissions {
-		if !roleMap[permission] {
-			result = append(result, permission)
-		}
-	}
-
-	return result
-}
-
-func ChannelModeratedPermissionsChangedByPatch(role *Role, patch *RolePatch) []string {
-	var result []string
-
-	if role == nil {
-		return result
-	}
-
-	if patch.Permissions == nil {
-		return result
-	}
-
-	roleMap := make(map[string]bool)
-	patchMap := make(map[string]bool)
-
-	for _, permission := range role.Permissions {
-		if channelModeratedPermissionName, found := ChannelModeratedPermissionsMap[permission]; found {
-			roleMap[channelModeratedPermissionName] = true
-		}
-	}
-
-	for _, permission := range *patch.Permissions {
-		if channelModeratedPermissionName, found := ChannelModeratedPermissionsMap[permission]; found {
-			patchMap[channelModeratedPermissionName] = true
-		}
-	}
-
-	for permissionKey := range roleMap {
-		if !patchMap[permissionKey] {
-			result = append(result, permissionKey)
-		}
-	}
-
-	for permissionKey := range patchMap {
-		if !roleMap[permissionKey] {
-			result = append(result, permissionKey)
-		}
-	}
-
-	return result
-}
-
-// GetChannelModeratedPermissions returns a map of channel moderated permissions that the role has access to
-func (r *Role) GetChannelModeratedPermissions(channelType string) map[string]bool {
-	moderatedPermissions := make(map[string]bool)
-	for _, permission := range r.Permissions {
-		if _, found := ChannelModeratedPermissionsMap[permission]; !found {
-			continue
-		}
-
-		for moderated, moderatedPermissionValue := range ChannelModeratedPermissionsMap {
-			// the moderated permission has already been found to be true so skip this iteration
-			if moderatedPermissions[moderatedPermissionValue] {
-				continue
-			}
-
-			if moderated == permission {
-				// Special case where the channel moderated permission for `manage_members` is different depending on whether the channel is private or public
-				if moderated == PERMISSION_MANAGE_PUBLIC_CHANNEL_MEMBERS.Id || moderated == PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS.Id {
-					canManagePublic := channelType == CHANNEL_OPEN && moderated == PERMISSION_MANAGE_PUBLIC_CHANNEL_MEMBERS.Id
-					canManagePrivate := channelType == CHANNEL_PRIVATE && moderated == PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS.Id
-					moderatedPermissions[moderatedPermissionValue] = canManagePublic || canManagePrivate
-				} else {
-					moderatedPermissions[moderatedPermissionValue] = true
-				}
-			}
-		}
-	}
-
-	return moderatedPermissions
-}
-
-// RolePatchFromChannelModerationsPatch Creates and returns a RolePatch based on a slice of ChannelModerationPatchs, roleName is expected to be either "members" or "guests".
-func (r *Role) RolePatchFromChannelModerationsPatch(channelModerationsPatch []*ChannelModerationPatch, roleName string) *RolePatch {
-	permissionsToAddToPatch := make(map[string]bool)
-
-	// Iterate through the list of existing permissions on the role and append permissions that we want to keep.
-	for _, permission := range r.Permissions {
-		// Permission is not moderated so dont add it to the patch and skip the channelModerationsPatch
-		if _, isModerated := ChannelModeratedPermissionsMap[permission]; !isModerated {
-			continue
-		}
-
-		permissionEnabled := true
-		// Check if permission has a matching moderated permission name inside the channel moderation patch
-		for _, channelModerationPatch := range channelModerationsPatch {
-			if *channelModerationPatch.Name == ChannelModeratedPermissionsMap[permission] {
-				// Permission key exists in patch with a value of false so skip over it
-				if roleName == "members" {
-					if channelModerationPatch.Roles.Members != nil && !*channelModerationPatch.Roles.Members {
-						permissionEnabled = false
-					}
-				} else if roleName == "guests" {
-					if channelModerationPatch.Roles.Guests != nil && !*channelModerationPatch.Roles.Guests {
-						permissionEnabled = false
-					}
-				}
-			}
-		}
-
-		if permissionEnabled {
-			permissionsToAddToPatch[permission] = true
-		}
-	}
-
-	// Iterate through the patch and add any permissions that dont already exist on the role
-	for _, channelModerationPatch := range channelModerationsPatch {
-		for permission, moderatedPermissionName := range ChannelModeratedPermissionsMap {
-			if roleName == "members" && channelModerationPatch.Roles.Members != nil && *channelModerationPatch.Roles.Members && *channelModerationPatch.Name == moderatedPermissionName {
-				permissionsToAddToPatch[permission] = true
-			}
-
-			if roleName == "guests" && channelModerationPatch.Roles.Guests != nil && *channelModerationPatch.Roles.Guests && *channelModerationPatch.Name == moderatedPermissionName {
-				permissionsToAddToPatch[permission] = true
-			}
-		}
-	}
-
-	patchPermissions := make([]string, 0, len(permissionsToAddToPatch))
-	for permission := range permissionsToAddToPatch {
-		patchPermissions = append(patchPermissions, permission)
-	}
-
-	return &RolePatch{Permissions: &patchPermissions}
-}
-
-func (r *Role) IsValid() bool {
-	if !IsValidId(r.Id) {
-		return false
-	}
-
-	return r.IsValidWithoutId()
-}
-
-func (r *Role) IsValidWithoutId() bool {
-	if !IsValidRoleName(r.Name) {
-		return false
-	}
-
-	if r.DisplayName == "" || len(r.DisplayName) > ROLE_DISPLAY_NAME_MAX_LENGTH {
-		return false
-	}
-
-	if len(r.Description) > ROLE_DESCRIPTION_MAX_LENGTH {
-		return false
-	}
-
-	check := func(perms []*Permission, permission string) bool {
-		for _, p := range perms {
-			if permission == p.Id {
-				return true
-			}
-		}
-		return false
-	}
-	for _, permission := range r.Permissions {
-		permissionValidated := check(AllPermissions, permission) || check(DeprecatedPermissions, permission)
-		if !permissionValidated {
-			return false
-		}
-	}
-
-	return true
-}
-
-func CleanRoleNames(roleNames []string) ([]string, bool) {
-	var cleanedRoleNames []string
-	for _, roleName := range roleNames {
-		if strings.TrimSpace(roleName) == "" {
-			continue
-		}
-
-		if !IsValidRoleName(roleName) {
-			return roleNames, false
-		}
-
-		cleanedRoleNames = append(cleanedRoleNames, roleName)
-	}
-
-	return cleanedRoleNames, true
-}
-
-func IsValidRoleName(roleName string) bool {
-	if roleName == "" || len(roleName) > ROLE_NAME_MAX_LENGTH {
-		return false
-	}
-
-	if strings.TrimLeft(roleName, "abcdefghijklmnopqrstuvwxyz0123456789_") != "" {
-		return false
-	}
-
-	return true
-}
-
-func MakeDefaultRoles() map[string]*Role {
-	roles := make(map[string]*Role)
-
-	roles[CHANNEL_GUEST_ROLE_ID] = &Role{
-		Name:        "channel_guest",
-		DisplayName: "authentication.roles.channel_guest.name",
-		Description: "authentication.roles.channel_guest.description",
-		Permissions: []string{
-			PERMISSION_READ_CHANNEL.Id,
-			PERMISSION_ADD_REACTION.Id,
-			PERMISSION_REMOVE_REACTION.Id,
-			PERMISSION_UPLOAD_FILE.Id,
-			PERMISSION_EDIT_POST.Id,
-			PERMISSION_CREATE_POST.Id,
-			PERMISSION_USE_CHANNEL_MENTIONS.Id,
-			PERMISSION_USE_SLASH_COMMANDS.Id,
-		},
-		SchemeManaged: true,
-		BuiltIn:       true,
-	}
-
-	roles[CHANNEL_USER_ROLE_ID] = &Role{
-		Name:        "channel_user",
-		DisplayName: "authentication.roles.channel_user.name",
-		Description: "authentication.roles.channel_user.description",
-		Permissions: []string{
-			PERMISSION_READ_CHANNEL.Id,
-			PERMISSION_ADD_REACTION.Id,
-			PERMISSION_REMOVE_REACTION.Id,
-			PERMISSION_MANAGE_PUBLIC_CHANNEL_MEMBERS.Id,
-			PERMISSION_UPLOAD_FILE.Id,
-			PERMISSION_GET_PUBLIC_LINK.Id,
-			PERMISSION_CREATE_POST.Id,
-			PERMISSION_USE_CHANNEL_MENTIONS.Id,
-			PERMISSION_USE_SLASH_COMMANDS.Id,
-		},
-		SchemeManaged: true,
-		BuiltIn:       true,
-	}
-
-	roles[CHANNEL_ADMIN_ROLE_ID] = &Role{
-		Name:        "channel_admin",
-		DisplayName: "authentication.roles.channel_admin.name",
-		Description: "authentication.roles.channel_admin.description",
-		Permissions: []string{
-			PERMISSION_MANAGE_CHANNEL_ROLES.Id,
-			PERMISSION_USE_GROUP_MENTIONS.Id,
-		},
-		SchemeManaged: true,
-		BuiltIn:       true,
-	}
-
-	roles[TEAM_GUEST_ROLE_ID] = &Role{
-		Name:        "team_guest",
-		DisplayName: "authentication.roles.team_guest.name",
-		Description: "authentication.roles.team_guest.description",
-		Permissions: []string{
-			PERMISSION_VIEW_TEAM.Id,
-		},
-		SchemeManaged: true,
-		BuiltIn:       true,
-	}
-
-	roles[TEAM_USER_ROLE_ID] = &Role{
-		Name:        "team_user",
-		DisplayName: "authentication.roles.team_user.name",
-		Description: "authentication.roles.team_user.description",
-		Permissions: []string{
-			PERMISSION_LIST_TEAM_CHANNELS.Id,
-			PERMISSION_JOIN_PUBLIC_CHANNELS.Id,
-			PERMISSION_READ_PUBLIC_CHANNEL.Id,
-			PERMISSION_VIEW_TEAM.Id,
-		},
-		SchemeManaged: true,
-		BuiltIn:       true,
-	}
-
-	roles[TEAM_POST_ALL_ROLE_ID] = &Role{
-		Name:        "team_post_all",
-		DisplayName: "authentication.roles.team_post_all.name",
-		Description: "authentication.roles.team_post_all.description",
-		Permissions: []string{
-			PERMISSION_CREATE_POST.Id,
-			PERMISSION_USE_CHANNEL_MENTIONS.Id,
-		},
-		SchemeManaged: false,
-		BuiltIn:       true,
-	}
-
-	roles[TEAM_POST_ALL_PUBLIC_ROLE_ID] = &Role{
-		Name:        "team_post_all_public",
-		DisplayName: "authentication.roles.team_post_all_public.name",
-		Description: "authentication.roles.team_post_all_public.description",
-		Permissions: []string{
-			PERMISSION_CREATE_POST_PUBLIC.Id,
-			PERMISSION_USE_CHANNEL_MENTIONS.Id,
-		},
-		SchemeManaged: false,
-		BuiltIn:       true,
-	}
-
-	roles[TEAM_ADMIN_ROLE_ID] = &Role{
-		Name:        "team_admin",
-		DisplayName: "authentication.roles.team_admin.name",
-		Description: "authentication.roles.team_admin.description",
-		Permissions: []string{
-			PERMISSION_REMOVE_USER_FROM_TEAM.Id,
-			PERMISSION_MANAGE_TEAM.Id,
-			PERMISSION_IMPORT_TEAM.Id,
-			PERMISSION_MANAGE_TEAM_ROLES.Id,
-			PERMISSION_MANAGE_CHANNEL_ROLES.Id,
-			PERMISSION_MANAGE_OTHERS_INCOMING_WEBHOOKS.Id,
-			PERMISSION_MANAGE_OTHERS_OUTGOING_WEBHOOKS.Id,
-			PERMISSION_MANAGE_SLASH_COMMANDS.Id,
-			PERMISSION_MANAGE_OTHERS_SLASH_COMMANDS.Id,
-			PERMISSION_MANAGE_INCOMING_WEBHOOKS.Id,
-			PERMISSION_MANAGE_OUTGOING_WEBHOOKS.Id,
-			PERMISSION_CONVERT_PUBLIC_CHANNEL_TO_PRIVATE.Id,
-			PERMISSION_CONVERT_PRIVATE_CHANNEL_TO_PUBLIC.Id,
-		},
-		SchemeManaged: true,
-		BuiltIn:       true,
-	}
-
-	roles[SYSTEM_GUEST_ROLE_ID] = &Role{
-		Name:        "system_guest",
-		DisplayName: "authentication.roles.global_guest.name",
-		Description: "authentication.roles.global_guest.description",
-		Permissions: []string{
-			PERMISSION_CREATE_DIRECT_CHANNEL.Id,
-			PERMISSION_CREATE_GROUP_CHANNEL.Id,
-		},
-		SchemeManaged: true,
-		BuiltIn:       true,
-	}
-
-	roles[SYSTEM_USER_ROLE_ID] = &Role{
-		Name:        "system_user",
-		DisplayName: "authentication.roles.global_user.name",
-		Description: "authentication.roles.global_user.description",
-		Permissions: []string{
-			PERMISSION_LIST_PUBLIC_TEAMS.Id,
-			PERMISSION_JOIN_PUBLIC_TEAMS.Id,
-			PERMISSION_CREATE_DIRECT_CHANNEL.Id,
-			PERMISSION_CREATE_GROUP_CHANNEL.Id,
-			PERMISSION_VIEW_MEMBERS.Id,
-		},
-		SchemeManaged: true,
-		BuiltIn:       true,
-	}
-
-	roles[SYSTEM_POST_ALL_ROLE_ID] = &Role{
-		Name:        "system_post_all",
-		DisplayName: "authentication.roles.system_post_all.name",
-		Description: "authentication.roles.system_post_all.description",
-		Permissions: []string{
-			PERMISSION_CREATE_POST.Id,
-			PERMISSION_USE_CHANNEL_MENTIONS.Id,
-		},
-		SchemeManaged: false,
-		BuiltIn:       true,
-	}
-
-	roles[SYSTEM_POST_ALL_PUBLIC_ROLE_ID] = &Role{
-		Name:        "system_post_all_public",
-		DisplayName: "authentication.roles.system_post_all_public.name",
-		Description: "authentication.roles.system_post_all_public.description",
-		Permissions: []string{
-			PERMISSION_CREATE_POST_PUBLIC.Id,
-			PERMISSION_USE_CHANNEL_MENTIONS.Id,
-		},
-		SchemeManaged: false,
-		BuiltIn:       true,
-	}
-
-	roles[SYSTEM_USER_ACCESS_TOKEN_ROLE_ID] = &Role{
-		Name:        "system_user_access_token",
-		DisplayName: "authentication.roles.system_user_access_token.name",
-		Description: "authentication.roles.system_user_access_token.description",
-		Permissions: []string{
-			PERMISSION_CREATE_USER_ACCESS_TOKEN.Id,
-			PERMISSION_READ_USER_ACCESS_TOKEN.Id,
-			PERMISSION_REVOKE_USER_ACCESS_TOKEN.Id,
-		},
-		SchemeManaged: false,
-		BuiltIn:       true,
-	}
-
-	roles[SYSTEM_USER_MANAGER_ROLE_ID] = &Role{
-		Name:          "system_user_manager",
-		DisplayName:   "authentication.roles.system_user_manager.name",
-		Description:   "authentication.roles.system_user_manager.description",
-		Permissions:   SystemUserManagerDefaultPermissions,
-		SchemeManaged: false,
-		BuiltIn:       true,
-	}
-
-	roles[SYSTEM_READ_ONLY_ADMIN_ROLE_ID] = &Role{
-		Name:          "system_read_only_admin",
-		DisplayName:   "authentication.roles.system_read_only_admin.name",
-		Description:   "authentication.roles.system_read_only_admin.description",
-		Permissions:   SystemReadOnlyAdminDefaultPermissions,
-		SchemeManaged: false,
-		BuiltIn:       true,
-	}
-
-	roles[SYSTEM_MANAGER_ROLE_ID] = &Role{
-		Name:          "system_manager",
-		DisplayName:   "authentication.roles.system_manager.name",
-		Description:   "authentication.roles.system_manager.description",
-		Permissions:   SystemManagerDefaultPermissions,
-		SchemeManaged: false,
-		BuiltIn:       true,
-	}
-
-	allPermissionIDs := []string{}
-	for _, permission := range AllPermissions {
-		allPermissionIDs = append(allPermissionIDs, permission.Id)
-	}
-
-	roles[SYSTEM_ADMIN_ROLE_ID] = &Role{
-		Name:        "system_admin",
-		DisplayName: "authentication.roles.global_admin.name",
-		Description: "authentication.roles.global_admin.description",
-		// System admins can do anything channel and team admins can do
-		// plus everything members of teams and channels can do to all teams
-		// and channels on the system
-		Permissions:   allPermissionIDs,
-		SchemeManaged: true,
-		BuiltIn:       true,
-	}
-
-	return roles
-}
-
-func AddAncillaryPermissions(permissions []string) []string {
-	for _, permission := range permissions {
-		if ancillaryPermissions, ok := SysconsoleAncillaryPermissions[permission]; ok {
-			for _, ancillaryPermission := range ancillaryPermissions {
-				permissions = append(permissions, ancillaryPermission.Id)
-			}
-		}
-	}
-	return permissions
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/saml.go b/vendor/github.com/mattermost/mattermost-server/v5/model/saml.go
deleted file mode 100644
index feaf325a..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/saml.go
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"encoding/xml"
-	"io"
-	"time"
-)
-
-const (
-	USER_AUTH_SERVICE_SAML      = "saml"
-	USER_AUTH_SERVICE_SAML_TEXT = "SAML"
-	USER_AUTH_SERVICE_IS_SAML   = "isSaml"
-	USER_AUTH_SERVICE_IS_MOBILE = "isMobile"
-	USER_AUTH_SERVICE_IS_OAUTH  = "isOAuthUser"
-)
-
-type SamlAuthRequest struct {
-	Base64AuthRequest string
-	URL               string
-	RelayState        string
-}
-
-type SamlCertificateStatus struct {
-	IdpCertificateFile    bool `json:"idp_certificate_file"`
-	PrivateKeyFile        bool `json:"private_key_file"`
-	PublicCertificateFile bool `json:"public_certificate_file"`
-}
-
-type SamlMetadataResponse struct {
-	IdpDescriptorUrl     string `json:"idp_descriptor_url"`
-	IdpUrl               string `json:"idp_url"`
-	IdpPublicCertificate string `json:"idp_public_certificate"`
-}
-
-type NameIDFormat struct {
-	XMLName xml.Name
-	Format  string `xml:",attr,omitempty"`
-	Value   string `xml:",innerxml"`
-}
-
-type NameID struct {
-	NameQualifier   string `xml:",attr"`
-	SPNameQualifier string `xml:",attr"`
-	Format          string `xml:",attr,omitempty"`
-	SPProvidedID    string `xml:",attr"`
-	Value           string `xml:",chardata"`
-}
-
-type AttributeValue struct {
-	Type   string `xml:"http://www.w3.org/2001/XMLSchema-instance type,attr"`
-	Value  string `xml:",chardata"`
-	NameID *NameID
-}
-
-type Attribute struct {
-	XMLName      xml.Name
-	FriendlyName string           `xml:",attr"`
-	Name         string           `xml:",attr"`
-	NameFormat   string           `xml:",attr"`
-	Values       []AttributeValue `xml:"AttributeValue"`
-}
-
-type Endpoint struct {
-	XMLName          xml.Name
-	Binding          string `xml:"Binding,attr"`
-	Location         string `xml:"Location,attr"`
-	ResponseLocation string `xml:"ResponseLocation,attr,omitempty"`
-}
-
-type IndexedEndpoint struct {
-	XMLName          xml.Name
-	Binding          string  `xml:"Binding,attr"`
-	Location         string  `xml:"Location,attr"`
-	ResponseLocation *string `xml:"ResponseLocation,attr,omitempty"`
-	Index            int     `xml:"index,attr"`
-	IsDefault        *bool   `xml:"isDefault,attr"`
-}
-
-type IDPSSODescriptor struct {
-	XMLName xml.Name `xml:"urn:oasis:names:tc:SAML:2.0:metadata IDPSSODescriptor"`
-	SSODescriptor
-	WantAuthnRequestsSigned *bool `xml:",attr"`
-
-	SingleSignOnServices       []Endpoint  `xml:"SingleSignOnService"`
-	NameIDMappingServices      []Endpoint  `xml:"NameIDMappingService"`
-	AssertionIDRequestServices []Endpoint  `xml:"AssertionIDRequestService"`
-	AttributeProfiles          []string    `xml:"AttributeProfile"`
-	Attributes                 []Attribute `xml:"Attribute"`
-}
-
-type SSODescriptor struct {
-	XMLName xml.Name
-	RoleDescriptor
-	ArtifactResolutionServices []IndexedEndpoint `xml:"ArtifactResolutionService"`
-	SingleLogoutServices       []Endpoint        `xml:"SingleLogoutService"`
-	ManageNameIDServices       []Endpoint        `xml:"ManageNameIDService"`
-	NameIDFormats              []NameIDFormat    `xml:"NameIDFormat"`
-}
-
-type X509Certificate struct {
-	XMLName xml.Name
-	Cert    string `xml:",innerxml"`
-}
-
-type X509Data struct {
-	XMLName         xml.Name
-	X509Certificate X509Certificate `xml:"X509Certificate"`
-}
-
-type KeyInfo struct {
-	XMLName  xml.Name
-	DS       string   `xml:"xmlns:ds,attr"`
-	X509Data X509Data `xml:"X509Data"`
-}
-type EncryptionMethod struct {
-	Algorithm string `xml:"Algorithm,attr"`
-}
-
-type KeyDescriptor struct {
-	XMLName xml.Name
-	Use     string  `xml:"use,attr,omitempty"`
-	KeyInfo KeyInfo `xml:"http://www.w3.org/2000/09/xmldsig# KeyInfo,omitempty"`
-}
-
-type RoleDescriptor struct {
-	XMLName                    xml.Name
-	ID                         string          `xml:",attr,omitempty"`
-	ValidUntil                 time.Time       `xml:"validUntil,attr,omitempty"`
-	CacheDuration              time.Duration   `xml:"cacheDuration,attr,omitempty"`
-	ProtocolSupportEnumeration string          `xml:"protocolSupportEnumeration,attr"`
-	ErrorURL                   string          `xml:"errorURL,attr,omitempty"`
-	KeyDescriptors             []KeyDescriptor `xml:"KeyDescriptor,omitempty"`
-	Organization               *Organization   `xml:"Organization,omitempty"`
-	ContactPersons             []ContactPerson `xml:"ContactPerson,omitempty"`
-}
-
-type ContactPerson struct {
-	XMLName          xml.Name
-	ContactType      string `xml:"contactType,attr"`
-	Company          string
-	GivenName        string
-	SurName          string
-	EmailAddresses   []string `xml:"EmailAddress"`
-	TelephoneNumbers []string `xml:"TelephoneNumber"`
-}
-
-type LocalizedName struct {
-	Lang  string `xml:"xml lang,attr"`
-	Value string `xml:",chardata"`
-}
-
-type LocalizedURI struct {
-	Lang  string `xml:"xml lang,attr"`
-	Value string `xml:",chardata"`
-}
-
-type Organization struct {
-	XMLName                  xml.Name
-	OrganizationNames        []LocalizedName `xml:"OrganizationName"`
-	OrganizationDisplayNames []LocalizedName `xml:"OrganizationDisplayName"`
-	OrganizationURLs         []LocalizedURI  `xml:"OrganizationURL"`
-}
-
-type EntityDescriptor struct {
-	XMLName           xml.Name           `xml:"urn:oasis:names:tc:SAML:2.0:metadata EntityDescriptor"`
-	EntityID          string             `xml:"entityID,attr"`
-	ID                string             `xml:",attr,omitempty"`
-	ValidUntil        time.Time          `xml:"validUntil,attr,omitempty"`
-	CacheDuration     time.Duration      `xml:"cacheDuration,attr,omitempty"`
-	RoleDescriptors   []RoleDescriptor   `xml:"RoleDescriptor"`
-	IDPSSODescriptors []IDPSSODescriptor `xml:"IDPSSODescriptor"`
-	Organization      Organization       `xml:"Organization"`
-	ContactPerson     ContactPerson      `xml:"ContactPerson"`
-}
-
-func (s *SamlCertificateStatus) ToJson() string {
-	b, _ := json.Marshal(s)
-	return string(b)
-}
-
-func SamlCertificateStatusFromJson(data io.Reader) *SamlCertificateStatus {
-	var status *SamlCertificateStatus
-	json.NewDecoder(data).Decode(&status)
-	return status
-}
-
-func (s *SamlMetadataResponse) ToJson() string {
-	b, _ := json.Marshal(s)
-	return string(b)
-}
-
-func SamlMetadataResponseFromJson(data io.Reader) *SamlMetadataResponse {
-	var status *SamlMetadataResponse
-	json.NewDecoder(data).Decode(&status)
-	return status
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/scheduled_task.go b/vendor/github.com/mattermost/mattermost-server/v5/model/scheduled_task.go
deleted file mode 100644
index cf20db63..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/scheduled_task.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"fmt"
-	"time"
-)
-
-type TaskFunc func()
-
-type ScheduledTask struct {
-	Name                 string        `json:"name"`
-	Interval             time.Duration `json:"interval"`
-	Recurring            bool          `json:"recurring"`
-	function             func()
-	cancel               chan struct{}
-	cancelled            chan struct{}
-	fromNextIntervalTime bool
-}
-
-func CreateTask(name string, function TaskFunc, timeToExecution time.Duration) *ScheduledTask {
-	return createTask(name, function, timeToExecution, false, false)
-}
-
-func CreateRecurringTask(name string, function TaskFunc, interval time.Duration) *ScheduledTask {
-	return createTask(name, function, interval, true, false)
-}
-
-func CreateRecurringTaskFromNextIntervalTime(name string, function TaskFunc, interval time.Duration) *ScheduledTask {
-	return createTask(name, function, interval, true, true)
-}
-
-func createTask(name string, function TaskFunc, interval time.Duration, recurring bool, fromNextIntervalTime bool) *ScheduledTask {
-	task := &ScheduledTask{
-		Name:                 name,
-		Interval:             interval,
-		Recurring:            recurring,
-		function:             function,
-		cancel:               make(chan struct{}),
-		cancelled:            make(chan struct{}),
-		fromNextIntervalTime: fromNextIntervalTime,
-	}
-
-	go func() {
-		defer close(task.cancelled)
-
-		var firstTick <-chan time.Time
-		var ticker *time.Ticker
-
-		if task.fromNextIntervalTime {
-			currTime := time.Now()
-			first := currTime.Truncate(interval)
-			if first.Before(currTime) {
-				first = first.Add(interval)
-			}
-			firstTick = time.After(time.Until(first))
-			ticker = &time.Ticker{C: nil}
-		} else {
-			firstTick = nil
-			ticker = time.NewTicker(interval)
-		}
-		defer func() {
-			ticker.Stop()
-		}()
-
-		for {
-			select {
-			case <-firstTick:
-				ticker = time.NewTicker(interval)
-				function()
-			case <-ticker.C:
-				function()
-			case <-task.cancel:
-				return
-			}
-
-			if !task.Recurring {
-				break
-			}
-		}
-	}()
-
-	return task
-}
-
-func (task *ScheduledTask) Cancel() {
-	close(task.cancel)
-	<-task.cancelled
-}
-
-func (task *ScheduledTask) String() string {
-	return fmt.Sprintf(
-		"%s\nInterval: %s\nRecurring: %t\n",
-		task.Name,
-		task.Interval.String(),
-		task.Recurring,
-	)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/scheme.go b/vendor/github.com/mattermost/mattermost-server/v5/model/scheme.go
deleted file mode 100644
index b5bbf34a..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/scheme.go
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"regexp"
-)
-
-const (
-	SCHEME_DISPLAY_NAME_MAX_LENGTH = 128
-	SCHEME_NAME_MAX_LENGTH         = 64
-	SCHEME_DESCRIPTION_MAX_LENGTH  = 1024
-	SCHEME_SCOPE_TEAM              = "team"
-	SCHEME_SCOPE_CHANNEL           = "channel"
-)
-
-type Scheme struct {
-	Id                      string `json:"id"`
-	Name                    string `json:"name"`
-	DisplayName             string `json:"display_name"`
-	Description             string `json:"description"`
-	CreateAt                int64  `json:"create_at"`
-	UpdateAt                int64  `json:"update_at"`
-	DeleteAt                int64  `json:"delete_at"`
-	Scope                   string `json:"scope"`
-	DefaultTeamAdminRole    string `json:"default_team_admin_role"`
-	DefaultTeamUserRole     string `json:"default_team_user_role"`
-	DefaultChannelAdminRole string `json:"default_channel_admin_role"`
-	DefaultChannelUserRole  string `json:"default_channel_user_role"`
-	DefaultTeamGuestRole    string `json:"default_team_guest_role"`
-	DefaultChannelGuestRole string `json:"default_channel_guest_role"`
-}
-
-type SchemePatch struct {
-	Name        *string `json:"name"`
-	DisplayName *string `json:"display_name"`
-	Description *string `json:"description"`
-}
-
-type SchemeIDPatch struct {
-	SchemeID *string `json:"scheme_id"`
-}
-
-// SchemeConveyor is used for importing and exporting a Scheme and its associated Roles.
-type SchemeConveyor struct {
-	Name         string  `json:"name"`
-	DisplayName  string  `json:"display_name"`
-	Description  string  `json:"description"`
-	Scope        string  `json:"scope"`
-	TeamAdmin    string  `json:"default_team_admin_role"`
-	TeamUser     string  `json:"default_team_user_role"`
-	TeamGuest    string  `json:"default_team_guest_role"`
-	ChannelAdmin string  `json:"default_channel_admin_role"`
-	ChannelUser  string  `json:"default_channel_user_role"`
-	ChannelGuest string  `json:"default_channel_guest_role"`
-	Roles        []*Role `json:"roles"`
-}
-
-func (sc *SchemeConveyor) Scheme() *Scheme {
-	return &Scheme{
-		DisplayName:             sc.DisplayName,
-		Name:                    sc.Name,
-		Description:             sc.Description,
-		Scope:                   sc.Scope,
-		DefaultTeamAdminRole:    sc.TeamAdmin,
-		DefaultTeamUserRole:     sc.TeamUser,
-		DefaultTeamGuestRole:    sc.TeamGuest,
-		DefaultChannelAdminRole: sc.ChannelAdmin,
-		DefaultChannelUserRole:  sc.ChannelUser,
-		DefaultChannelGuestRole: sc.ChannelGuest,
-	}
-}
-
-type SchemeRoles struct {
-	SchemeAdmin bool `json:"scheme_admin"`
-	SchemeUser  bool `json:"scheme_user"`
-	SchemeGuest bool `json:"scheme_guest"`
-}
-
-func (scheme *Scheme) ToJson() string {
-	b, _ := json.Marshal(scheme)
-	return string(b)
-}
-
-func SchemeFromJson(data io.Reader) *Scheme {
-	var scheme *Scheme
-	json.NewDecoder(data).Decode(&scheme)
-	return scheme
-}
-
-func SchemesToJson(schemes []*Scheme) string {
-	b, _ := json.Marshal(schemes)
-	return string(b)
-}
-
-func SchemesFromJson(data io.Reader) []*Scheme {
-	var schemes []*Scheme
-	if err := json.NewDecoder(data).Decode(&schemes); err == nil {
-		return schemes
-	}
-	return nil
-}
-
-func (scheme *Scheme) IsValid() bool {
-	if !IsValidId(scheme.Id) {
-		return false
-	}
-
-	return scheme.IsValidForCreate()
-}
-
-func (scheme *Scheme) IsValidForCreate() bool {
-	if scheme.DisplayName == "" || len(scheme.DisplayName) > SCHEME_DISPLAY_NAME_MAX_LENGTH {
-		return false
-	}
-
-	if !IsValidSchemeName(scheme.Name) {
-		return false
-	}
-
-	if len(scheme.Description) > SCHEME_DESCRIPTION_MAX_LENGTH {
-		return false
-	}
-
-	switch scheme.Scope {
-	case SCHEME_SCOPE_TEAM, SCHEME_SCOPE_CHANNEL:
-	default:
-		return false
-	}
-
-	if !IsValidRoleName(scheme.DefaultChannelAdminRole) {
-		return false
-	}
-
-	if !IsValidRoleName(scheme.DefaultChannelUserRole) {
-		return false
-	}
-
-	if !IsValidRoleName(scheme.DefaultChannelGuestRole) {
-		return false
-	}
-
-	if scheme.Scope == SCHEME_SCOPE_TEAM {
-		if !IsValidRoleName(scheme.DefaultTeamAdminRole) {
-			return false
-		}
-
-		if !IsValidRoleName(scheme.DefaultTeamUserRole) {
-			return false
-		}
-
-		if !IsValidRoleName(scheme.DefaultTeamGuestRole) {
-			return false
-		}
-	}
-
-	if scheme.Scope == SCHEME_SCOPE_CHANNEL {
-		if scheme.DefaultTeamAdminRole != "" {
-			return false
-		}
-
-		if scheme.DefaultTeamUserRole != "" {
-			return false
-		}
-
-		if scheme.DefaultTeamGuestRole != "" {
-			return false
-		}
-	}
-
-	return true
-}
-
-func (scheme *Scheme) Patch(patch *SchemePatch) {
-	if patch.DisplayName != nil {
-		scheme.DisplayName = *patch.DisplayName
-	}
-	if patch.Name != nil {
-		scheme.Name = *patch.Name
-	}
-	if patch.Description != nil {
-		scheme.Description = *patch.Description
-	}
-}
-
-func (patch *SchemePatch) ToJson() string {
-	b, _ := json.Marshal(patch)
-	return string(b)
-}
-
-func SchemePatchFromJson(data io.Reader) *SchemePatch {
-	var patch *SchemePatch
-	json.NewDecoder(data).Decode(&patch)
-	return patch
-}
-
-func SchemeIDFromJson(data io.Reader) *string {
-	var p *SchemeIDPatch
-	json.NewDecoder(data).Decode(&p)
-	return p.SchemeID
-}
-
-func (p *SchemeIDPatch) ToJson() string {
-	b, _ := json.Marshal(p)
-	return string(b)
-}
-
-func IsValidSchemeName(name string) bool {
-	re := regexp.MustCompile(fmt.Sprintf("^[a-z0-9_]{2,%d}$", SCHEME_NAME_MAX_LENGTH))
-	return re.MatchString(name)
-}
-
-func (schemeRoles *SchemeRoles) ToJson() string {
-	b, _ := json.Marshal(schemeRoles)
-	return string(b)
-}
-
-func SchemeRolesFromJson(data io.Reader) *SchemeRoles {
-	var schemeRoles *SchemeRoles
-	json.NewDecoder(data).Decode(&schemeRoles)
-	return schemeRoles
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/search_params.go b/vendor/github.com/mattermost/mattermost-server/v5/model/search_params.go
deleted file mode 100644
index 41a2db2a..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/search_params.go
+++ /dev/null
@@ -1,397 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"net/http"
-	"regexp"
-	"strings"
-	"time"
-)
-
-var searchTermPuncStart = regexp.MustCompile(`^[^\pL\d\s#"]+`)
-var searchTermPuncEnd = regexp.MustCompile(`[^\pL\d\s*"]+$`)
-
-type SearchParams struct {
-	Terms                  string
-	ExcludedTerms          string
-	IsHashtag              bool
-	InChannels             []string
-	ExcludedChannels       []string
-	FromUsers              []string
-	ExcludedUsers          []string
-	AfterDate              string
-	ExcludedAfterDate      string
-	BeforeDate             string
-	ExcludedBeforeDate     string
-	Extensions             []string
-	ExcludedExtensions     []string
-	OnDate                 string
-	ExcludedDate           string
-	OrTerms                bool
-	IncludeDeletedChannels bool
-	TimeZoneOffset         int
-	// True if this search doesn't originate from a "current user".
-	SearchWithoutUserId bool
-}
-
-// Returns the epoch timestamp of the start of the day specified by SearchParams.AfterDate
-func (p *SearchParams) GetAfterDateMillis() int64 {
-	date, err := time.Parse("2006-01-02", PadDateStringZeros(p.AfterDate))
-	if err != nil {
-		date = time.Now()
-	}
-
-	// travel forward 1 day
-	oneDay := time.Hour * 24
-	afterDate := date.Add(oneDay)
-	return GetStartOfDayMillis(afterDate, p.TimeZoneOffset)
-}
-
-// Returns the epoch timestamp of the start of the day specified by SearchParams.ExcludedAfterDate
-func (p *SearchParams) GetExcludedAfterDateMillis() int64 {
-	date, err := time.Parse("2006-01-02", PadDateStringZeros(p.ExcludedAfterDate))
-	if err != nil {
-		date = time.Now()
-	}
-
-	// travel forward 1 day
-	oneDay := time.Hour * 24
-	afterDate := date.Add(oneDay)
-	return GetStartOfDayMillis(afterDate, p.TimeZoneOffset)
-}
-
-// Returns the epoch timestamp of the end of the day specified by SearchParams.BeforeDate
-func (p *SearchParams) GetBeforeDateMillis() int64 {
-	date, err := time.Parse("2006-01-02", PadDateStringZeros(p.BeforeDate))
-	if err != nil {
-		return 0
-	}
-
-	// travel back 1 day
-	oneDay := time.Hour * -24
-	beforeDate := date.Add(oneDay)
-	return GetEndOfDayMillis(beforeDate, p.TimeZoneOffset)
-}
-
-// Returns the epoch timestamp of the end of the day specified by SearchParams.ExcludedBeforeDate
-func (p *SearchParams) GetExcludedBeforeDateMillis() int64 {
-	date, err := time.Parse("2006-01-02", PadDateStringZeros(p.ExcludedBeforeDate))
-	if err != nil {
-		return 0
-	}
-
-	// travel back 1 day
-	oneDay := time.Hour * -24
-	beforeDate := date.Add(oneDay)
-	return GetEndOfDayMillis(beforeDate, p.TimeZoneOffset)
-}
-
-// Returns the epoch timestamps of the start and end of the day specified by SearchParams.OnDate
-func (p *SearchParams) GetOnDateMillis() (int64, int64) {
-	date, err := time.Parse("2006-01-02", PadDateStringZeros(p.OnDate))
-	if err != nil {
-		return 0, 0
-	}
-
-	return GetStartOfDayMillis(date, p.TimeZoneOffset), GetEndOfDayMillis(date, p.TimeZoneOffset)
-}
-
-// Returns the epoch timestamps of the start and end of the day specified by SearchParams.ExcludedDate
-func (p *SearchParams) GetExcludedDateMillis() (int64, int64) {
-	date, err := time.Parse("2006-01-02", PadDateStringZeros(p.ExcludedDate))
-	if err != nil {
-		return 0, 0
-	}
-
-	return GetStartOfDayMillis(date, p.TimeZoneOffset), GetEndOfDayMillis(date, p.TimeZoneOffset)
-}
-
-var searchFlags = [...]string{"from", "channel", "in", "before", "after", "on", "ext"}
-
-type flag struct {
-	name    string
-	value   string
-	exclude bool
-}
-
-type searchWord struct {
-	value   string
-	exclude bool
-}
-
-func splitWords(text string) []string {
-	words := []string{}
-
-	foundQuote := false
-	location := 0
-	for i, char := range text {
-		if char == '"' {
-			if foundQuote {
-				// Grab the quoted section
-				word := text[location : i+1]
-				words = append(words, word)
-				foundQuote = false
-				location = i + 1
-			} else {
-				nextStart := i
-				if i > 0 && text[i-1] == '-' {
-					nextStart = i - 1
-				}
-				words = append(words, strings.Fields(text[location:nextStart])...)
-				foundQuote = true
-				location = nextStart
-			}
-		}
-	}
-
-	words = append(words, strings.Fields(text[location:])...)
-
-	return words
-}
-
-func parseSearchFlags(input []string) ([]searchWord, []flag) {
-	words := []searchWord{}
-	flags := []flag{}
-
-	skipNextWord := false
-	for i, word := range input {
-		if skipNextWord {
-			skipNextWord = false
-			continue
-		}
-
-		isFlag := false
-
-		if colon := strings.Index(word, ":"); colon != -1 {
-			var flagName string
-			var exclude bool
-			if strings.HasPrefix(word, "-") {
-				flagName = word[1:colon]
-				exclude = true
-			} else {
-				flagName = word[:colon]
-				exclude = false
-			}
-
-			value := word[colon+1:]
-
-			for _, searchFlag := range searchFlags {
-				// check for case insensitive equality
-				if strings.EqualFold(flagName, searchFlag) {
-					if value != "" {
-						flags = append(flags, flag{
-							searchFlag,
-							value,
-							exclude,
-						})
-						isFlag = true
-					} else if i < len(input)-1 {
-						flags = append(flags, flag{
-							searchFlag,
-							input[i+1],
-							exclude,
-						})
-						skipNextWord = true
-						isFlag = true
-					}
-
-					if isFlag {
-						break
-					}
-				}
-			}
-		}
-
-		if !isFlag {
-			exclude := false
-			if strings.HasPrefix(word, "-") {
-				exclude = true
-			}
-			// trim off surrounding punctuation (note that we leave trailing asterisks to allow wildcards)
-			word = searchTermPuncStart.ReplaceAllString(word, "")
-			word = searchTermPuncEnd.ReplaceAllString(word, "")
-
-			// and remove extra pound #s
-			word = hashtagStart.ReplaceAllString(word, "#")
-
-			if word != "" {
-				words = append(words, searchWord{
-					word,
-					exclude,
-				})
-			}
-		}
-	}
-
-	return words, flags
-}
-
-func ParseSearchParams(text string, timeZoneOffset int) []*SearchParams {
-	words, flags := parseSearchFlags(splitWords(text))
-
-	hashtagTermList := []string{}
-	excludedHashtagTermList := []string{}
-	plainTermList := []string{}
-	excludedPlainTermList := []string{}
-
-	for _, word := range words {
-		if validHashtag.MatchString(word.value) {
-			if word.exclude {
-				excludedHashtagTermList = append(excludedHashtagTermList, word.value)
-			} else {
-				hashtagTermList = append(hashtagTermList, word.value)
-			}
-		} else {
-			if word.exclude {
-				excludedPlainTermList = append(excludedPlainTermList, word.value)
-			} else {
-				plainTermList = append(plainTermList, word.value)
-			}
-		}
-	}
-
-	hashtagTerms := strings.Join(hashtagTermList, " ")
-	excludedHashtagTerms := strings.Join(excludedHashtagTermList, " ")
-	plainTerms := strings.Join(plainTermList, " ")
-	excludedPlainTerms := strings.Join(excludedPlainTermList, " ")
-
-	inChannels := []string{}
-	excludedChannels := []string{}
-	fromUsers := []string{}
-	excludedUsers := []string{}
-	afterDate := ""
-	excludedAfterDate := ""
-	beforeDate := ""
-	excludedBeforeDate := ""
-	onDate := ""
-	excludedDate := ""
-	excludedExtensions := []string{}
-	extensions := []string{}
-
-	for _, flag := range flags {
-		if flag.name == "in" || flag.name == "channel" {
-			if flag.exclude {
-				excludedChannels = append(excludedChannels, flag.value)
-			} else {
-				inChannels = append(inChannels, flag.value)
-			}
-		} else if flag.name == "from" {
-			if flag.exclude {
-				excludedUsers = append(excludedUsers, flag.value)
-			} else {
-				fromUsers = append(fromUsers, flag.value)
-			}
-		} else if flag.name == "after" {
-			if flag.exclude {
-				excludedAfterDate = flag.value
-			} else {
-				afterDate = flag.value
-			}
-		} else if flag.name == "before" {
-			if flag.exclude {
-				excludedBeforeDate = flag.value
-			} else {
-				beforeDate = flag.value
-			}
-		} else if flag.name == "on" {
-			if flag.exclude {
-				excludedDate = flag.value
-			} else {
-				onDate = flag.value
-			}
-		} else if flag.name == "ext" {
-			if flag.exclude {
-				excludedExtensions = append(excludedExtensions, flag.value)
-			} else {
-				extensions = append(extensions, flag.value)
-			}
-		}
-	}
-
-	paramsList := []*SearchParams{}
-
-	if plainTerms != "" || excludedPlainTerms != "" {
-		paramsList = append(paramsList, &SearchParams{
-			Terms:              plainTerms,
-			ExcludedTerms:      excludedPlainTerms,
-			IsHashtag:          false,
-			InChannels:         inChannels,
-			ExcludedChannels:   excludedChannels,
-			FromUsers:          fromUsers,
-			ExcludedUsers:      excludedUsers,
-			AfterDate:          afterDate,
-			ExcludedAfterDate:  excludedAfterDate,
-			BeforeDate:         beforeDate,
-			ExcludedBeforeDate: excludedBeforeDate,
-			Extensions:         extensions,
-			ExcludedExtensions: excludedExtensions,
-			OnDate:             onDate,
-			ExcludedDate:       excludedDate,
-			TimeZoneOffset:     timeZoneOffset,
-		})
-	}
-
-	if hashtagTerms != "" || excludedHashtagTerms != "" {
-		paramsList = append(paramsList, &SearchParams{
-			Terms:              hashtagTerms,
-			ExcludedTerms:      excludedHashtagTerms,
-			IsHashtag:          true,
-			InChannels:         inChannels,
-			ExcludedChannels:   excludedChannels,
-			FromUsers:          fromUsers,
-			ExcludedUsers:      excludedUsers,
-			AfterDate:          afterDate,
-			ExcludedAfterDate:  excludedAfterDate,
-			BeforeDate:         beforeDate,
-			ExcludedBeforeDate: excludedBeforeDate,
-			Extensions:         extensions,
-			ExcludedExtensions: excludedExtensions,
-			OnDate:             onDate,
-			ExcludedDate:       excludedDate,
-			TimeZoneOffset:     timeZoneOffset,
-		})
-	}
-
-	// special case for when no terms are specified but we still have a filter
-	if plainTerms == "" && hashtagTerms == "" &&
-		excludedPlainTerms == "" && excludedHashtagTerms == "" &&
-		(len(inChannels) != 0 || len(fromUsers) != 0 ||
-			len(excludedChannels) != 0 || len(excludedUsers) != 0 ||
-			len(extensions) != 0 || len(excludedExtensions) != 0 ||
-			afterDate != "" || excludedAfterDate != "" ||
-			beforeDate != "" || excludedBeforeDate != "" ||
-			onDate != "" || excludedDate != "") {
-		paramsList = append(paramsList, &SearchParams{
-			Terms:              "",
-			ExcludedTerms:      "",
-			IsHashtag:          false,
-			InChannels:         inChannels,
-			ExcludedChannels:   excludedChannels,
-			FromUsers:          fromUsers,
-			ExcludedUsers:      excludedUsers,
-			AfterDate:          afterDate,
-			ExcludedAfterDate:  excludedAfterDate,
-			BeforeDate:         beforeDate,
-			ExcludedBeforeDate: excludedBeforeDate,
-			Extensions:         extensions,
-			ExcludedExtensions: excludedExtensions,
-			OnDate:             onDate,
-			ExcludedDate:       excludedDate,
-			TimeZoneOffset:     timeZoneOffset,
-		})
-	}
-
-	return paramsList
-}
-
-func IsSearchParamsListValid(paramsList []*SearchParams) *AppError {
-	// All SearchParams should have same IncludeDeletedChannels value.
-	for _, params := range paramsList {
-		if params.IncludeDeletedChannels != paramsList[0].IncludeDeletedChannels {
-			return NewAppError("IsSearchParamsListValid", "model.search_params_list.is_valid.include_deleted_channels.app_error", nil, "", http.StatusInternalServerError)
-		}
-	}
-	return nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/security_bulletin.go b/vendor/github.com/mattermost/mattermost-server/v5/model/security_bulletin.go
deleted file mode 100644
index 66a65812..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/security_bulletin.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type SecurityBulletin struct {
-	Id               string `json:"id"`
-	AppliesToVersion string `json:"applies_to_version"`
-}
-
-type SecurityBulletins []SecurityBulletin
-
-func (sb *SecurityBulletin) ToJson() string {
-	b, _ := json.Marshal(sb)
-	return string(b)
-}
-
-func SecurityBulletinFromJson(data io.Reader) *SecurityBulletin {
-	var o *SecurityBulletin
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func (sb SecurityBulletins) ToJson() string {
-	b, err := json.Marshal(sb)
-	if err != nil {
-		return "[]"
-	}
-	return string(b)
-}
-
-func SecurityBulletinsFromJson(data io.Reader) SecurityBulletins {
-	var o SecurityBulletins
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/session.go b/vendor/github.com/mattermost/mattermost-server/v5/model/session.go
deleted file mode 100644
index 334c7175..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/session.go
+++ /dev/null
@@ -1,235 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"strconv"
-	"strings"
-
-	"github.com/mattermost/mattermost-server/v5/shared/mlog"
-)
-
-const (
-	SESSION_COOKIE_TOKEN              = "MMAUTHTOKEN"
-	SESSION_COOKIE_USER               = "MMUSERID"
-	SESSION_COOKIE_CSRF               = "MMCSRF"
-	SESSION_CACHE_SIZE                = 35000
-	SESSION_PROP_PLATFORM             = "platform"
-	SESSION_PROP_OS                   = "os"
-	SESSION_PROP_BROWSER              = "browser"
-	SESSION_PROP_TYPE                 = "type"
-	SESSION_PROP_USER_ACCESS_TOKEN_ID = "user_access_token_id"
-	SESSION_PROP_IS_BOT               = "is_bot"
-	SESSION_PROP_IS_BOT_VALUE         = "true"
-	SESSION_TYPE_USER_ACCESS_TOKEN    = "UserAccessToken"
-	SESSION_TYPE_CLOUD_KEY            = "CloudKey"
-	SESSION_TYPE_REMOTECLUSTER_TOKEN  = "RemoteClusterToken"
-	SESSION_PROP_IS_GUEST             = "is_guest"
-	SESSION_ACTIVITY_TIMEOUT          = 1000 * 60 * 5 // 5 minutes
-	SESSION_USER_ACCESS_TOKEN_EXPIRY  = 100 * 365     // 100 years
-)
-
-//msgp StringMap
-type StringMap map[string]string
-
-//msgp:tuple Session
-
-// Session contains the user session details.
-// This struct's serializer methods are auto-generated. If a new field is added/removed,
-// please run make gen-serialized.
-type Session struct {
-	Id             string        `json:"id"`
-	Token          string        `json:"token"`
-	CreateAt       int64         `json:"create_at"`
-	ExpiresAt      int64         `json:"expires_at"`
-	LastActivityAt int64         `json:"last_activity_at"`
-	UserId         string        `json:"user_id"`
-	DeviceId       string        `json:"device_id"`
-	Roles          string        `json:"roles"`
-	IsOAuth        bool          `json:"is_oauth"`
-	ExpiredNotify  bool          `json:"expired_notify"`
-	Props          StringMap     `json:"props"`
-	TeamMembers    []*TeamMember `json:"team_members" db:"-"`
-	Local          bool          `json:"local" db:"-"`
-}
-
-// Returns true if the session is unrestricted, which should grant it
-// with all permissions. This is used for local mode sessions
-func (s *Session) IsUnrestricted() bool {
-	return s.Local
-}
-
-func (s *Session) DeepCopy() *Session {
-	copySession := *s
-
-	if s.Props != nil {
-		copySession.Props = CopyStringMap(s.Props)
-	}
-
-	if s.TeamMembers != nil {
-		copySession.TeamMembers = make([]*TeamMember, len(s.TeamMembers))
-		for index, tm := range s.TeamMembers {
-			copySession.TeamMembers[index] = new(TeamMember)
-			*copySession.TeamMembers[index] = *tm
-		}
-	}
-
-	return &copySession
-}
-
-func (s *Session) ToJson() string {
-	b, _ := json.Marshal(s)
-	return string(b)
-}
-
-func SessionFromJson(data io.Reader) *Session {
-	var s *Session
-	json.NewDecoder(data).Decode(&s)
-	return s
-}
-
-func (s *Session) PreSave() {
-	if s.Id == "" {
-		s.Id = NewId()
-	}
-
-	if s.Token == "" {
-		s.Token = NewId()
-	}
-
-	s.CreateAt = GetMillis()
-	s.LastActivityAt = s.CreateAt
-
-	if s.Props == nil {
-		s.Props = make(map[string]string)
-	}
-}
-
-func (s *Session) Sanitize() {
-	s.Token = ""
-}
-
-func (s *Session) IsExpired() bool {
-
-	if s.ExpiresAt <= 0 {
-		return false
-	}
-
-	if GetMillis() > s.ExpiresAt {
-		return true
-	}
-
-	return false
-}
-
-// Deprecated: SetExpireInDays is deprecated and should not be used.
-//             Use (*App).SetSessionExpireInDays instead which handles the
-//			   cases where the new ExpiresAt is not relative to CreateAt.
-func (s *Session) SetExpireInDays(days int) {
-	if s.CreateAt == 0 {
-		s.ExpiresAt = GetMillis() + (1000 * 60 * 60 * 24 * int64(days))
-	} else {
-		s.ExpiresAt = s.CreateAt + (1000 * 60 * 60 * 24 * int64(days))
-	}
-}
-
-func (s *Session) AddProp(key string, value string) {
-
-	if s.Props == nil {
-		s.Props = make(map[string]string)
-	}
-
-	s.Props[key] = value
-}
-
-func (s *Session) GetTeamByTeamId(teamId string) *TeamMember {
-	for _, team := range s.TeamMembers {
-		if team.TeamId == teamId {
-			return team
-		}
-	}
-
-	return nil
-}
-
-func (s *Session) IsMobileApp() bool {
-	return s.DeviceId != "" || s.IsMobile()
-}
-
-func (s *Session) IsMobile() bool {
-	val, ok := s.Props[USER_AUTH_SERVICE_IS_MOBILE]
-	if !ok {
-		return false
-	}
-	isMobile, err := strconv.ParseBool(val)
-	if err != nil {
-		mlog.Debug("Error parsing boolean property from Session", mlog.Err(err))
-		return false
-	}
-	return isMobile
-}
-
-func (s *Session) IsSaml() bool {
-	val, ok := s.Props[USER_AUTH_SERVICE_IS_SAML]
-	if !ok {
-		return false
-	}
-	isSaml, err := strconv.ParseBool(val)
-	if err != nil {
-		mlog.Debug("Error parsing boolean property from Session", mlog.Err(err))
-		return false
-	}
-	return isSaml
-}
-
-func (s *Session) IsOAuthUser() bool {
-	val, ok := s.Props[USER_AUTH_SERVICE_IS_OAUTH]
-	if !ok {
-		return false
-	}
-	isOAuthUser, err := strconv.ParseBool(val)
-	if err != nil {
-		mlog.Debug("Error parsing boolean property from Session", mlog.Err(err))
-		return false
-	}
-	return isOAuthUser
-}
-
-func (s *Session) IsSSOLogin() bool {
-	return s.IsOAuthUser() || s.IsSaml()
-}
-
-func (s *Session) GetUserRoles() []string {
-	return strings.Fields(s.Roles)
-}
-
-func (s *Session) GenerateCSRF() string {
-	token := NewId()
-	s.AddProp("csrf", token)
-	return token
-}
-
-func (s *Session) GetCSRF() string {
-	if s.Props == nil {
-		return ""
-	}
-
-	return s.Props["csrf"]
-}
-
-func SessionsToJson(o []*Session) string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return "[]"
-	}
-	return string(b)
-}
-
-func SessionsFromJson(data io.Reader) []*Session {
-	var o []*Session
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/session_serial_gen.go b/vendor/github.com/mattermost/mattermost-server/v5/model/session_serial_gen.go
deleted file mode 100644
index 612bbb89..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/session_serial_gen.go
+++ /dev/null
@@ -1,540 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-// Code generated by github.com/tinylib/msgp DO NOT EDIT.
-
-import (
-	"github.com/tinylib/msgp/msgp"
-)
-
-// DecodeMsg implements msgp.Decodable
-func (z *Session) DecodeMsg(dc *msgp.Reader) (err error) {
-	var zb0001 uint32
-	zb0001, err = dc.ReadArrayHeader()
-	if err != nil {
-		err = msgp.WrapError(err)
-		return
-	}
-	if zb0001 != 13 {
-		err = msgp.ArrayError{Wanted: 13, Got: zb0001}
-		return
-	}
-	z.Id, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "Id")
-		return
-	}
-	z.Token, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "Token")
-		return
-	}
-	z.CreateAt, err = dc.ReadInt64()
-	if err != nil {
-		err = msgp.WrapError(err, "CreateAt")
-		return
-	}
-	z.ExpiresAt, err = dc.ReadInt64()
-	if err != nil {
-		err = msgp.WrapError(err, "ExpiresAt")
-		return
-	}
-	z.LastActivityAt, err = dc.ReadInt64()
-	if err != nil {
-		err = msgp.WrapError(err, "LastActivityAt")
-		return
-	}
-	z.UserId, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "UserId")
-		return
-	}
-	z.DeviceId, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "DeviceId")
-		return
-	}
-	z.Roles, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "Roles")
-		return
-	}
-	z.IsOAuth, err = dc.ReadBool()
-	if err != nil {
-		err = msgp.WrapError(err, "IsOAuth")
-		return
-	}
-	z.ExpiredNotify, err = dc.ReadBool()
-	if err != nil {
-		err = msgp.WrapError(err, "ExpiredNotify")
-		return
-	}
-	var zb0002 uint32
-	zb0002, err = dc.ReadMapHeader()
-	if err != nil {
-		err = msgp.WrapError(err, "Props")
-		return
-	}
-	if z.Props == nil {
-		z.Props = make(StringMap, zb0002)
-	} else if len(z.Props) > 0 {
-		for key := range z.Props {
-			delete(z.Props, key)
-		}
-	}
-	for zb0002 > 0 {
-		zb0002--
-		var za0001 string
-		var za0002 string
-		za0001, err = dc.ReadString()
-		if err != nil {
-			err = msgp.WrapError(err, "Props")
-			return
-		}
-		za0002, err = dc.ReadString()
-		if err != nil {
-			err = msgp.WrapError(err, "Props", za0001)
-			return
-		}
-		z.Props[za0001] = za0002
-	}
-	var zb0003 uint32
-	zb0003, err = dc.ReadArrayHeader()
-	if err != nil {
-		err = msgp.WrapError(err, "TeamMembers")
-		return
-	}
-	if cap(z.TeamMembers) >= int(zb0003) {
-		z.TeamMembers = (z.TeamMembers)[:zb0003]
-	} else {
-		z.TeamMembers = make([]*TeamMember, zb0003)
-	}
-	for za0003 := range z.TeamMembers {
-		if dc.IsNil() {
-			err = dc.ReadNil()
-			if err != nil {
-				err = msgp.WrapError(err, "TeamMembers", za0003)
-				return
-			}
-			z.TeamMembers[za0003] = nil
-		} else {
-			if z.TeamMembers[za0003] == nil {
-				z.TeamMembers[za0003] = new(TeamMember)
-			}
-			err = z.TeamMembers[za0003].DecodeMsg(dc)
-			if err != nil {
-				err = msgp.WrapError(err, "TeamMembers", za0003)
-				return
-			}
-		}
-	}
-	z.Local, err = dc.ReadBool()
-	if err != nil {
-		err = msgp.WrapError(err, "Local")
-		return
-	}
-	return
-}
-
-// EncodeMsg implements msgp.Encodable
-func (z *Session) EncodeMsg(en *msgp.Writer) (err error) {
-	// array header, size 13
-	err = en.Append(0x9d)
-	if err != nil {
-		return
-	}
-	err = en.WriteString(z.Id)
-	if err != nil {
-		err = msgp.WrapError(err, "Id")
-		return
-	}
-	err = en.WriteString(z.Token)
-	if err != nil {
-		err = msgp.WrapError(err, "Token")
-		return
-	}
-	err = en.WriteInt64(z.CreateAt)
-	if err != nil {
-		err = msgp.WrapError(err, "CreateAt")
-		return
-	}
-	err = en.WriteInt64(z.ExpiresAt)
-	if err != nil {
-		err = msgp.WrapError(err, "ExpiresAt")
-		return
-	}
-	err = en.WriteInt64(z.LastActivityAt)
-	if err != nil {
-		err = msgp.WrapError(err, "LastActivityAt")
-		return
-	}
-	err = en.WriteString(z.UserId)
-	if err != nil {
-		err = msgp.WrapError(err, "UserId")
-		return
-	}
-	err = en.WriteString(z.DeviceId)
-	if err != nil {
-		err = msgp.WrapError(err, "DeviceId")
-		return
-	}
-	err = en.WriteString(z.Roles)
-	if err != nil {
-		err = msgp.WrapError(err, "Roles")
-		return
-	}
-	err = en.WriteBool(z.IsOAuth)
-	if err != nil {
-		err = msgp.WrapError(err, "IsOAuth")
-		return
-	}
-	err = en.WriteBool(z.ExpiredNotify)
-	if err != nil {
-		err = msgp.WrapError(err, "ExpiredNotify")
-		return
-	}
-	err = en.WriteMapHeader(uint32(len(z.Props)))
-	if err != nil {
-		err = msgp.WrapError(err, "Props")
-		return
-	}
-	for za0001, za0002 := range z.Props {
-		err = en.WriteString(za0001)
-		if err != nil {
-			err = msgp.WrapError(err, "Props")
-			return
-		}
-		err = en.WriteString(za0002)
-		if err != nil {
-			err = msgp.WrapError(err, "Props", za0001)
-			return
-		}
-	}
-	err = en.WriteArrayHeader(uint32(len(z.TeamMembers)))
-	if err != nil {
-		err = msgp.WrapError(err, "TeamMembers")
-		return
-	}
-	for za0003 := range z.TeamMembers {
-		if z.TeamMembers[za0003] == nil {
-			err = en.WriteNil()
-			if err != nil {
-				return
-			}
-		} else {
-			err = z.TeamMembers[za0003].EncodeMsg(en)
-			if err != nil {
-				err = msgp.WrapError(err, "TeamMembers", za0003)
-				return
-			}
-		}
-	}
-	err = en.WriteBool(z.Local)
-	if err != nil {
-		err = msgp.WrapError(err, "Local")
-		return
-	}
-	return
-}
-
-// MarshalMsg implements msgp.Marshaler
-func (z *Session) MarshalMsg(b []byte) (o []byte, err error) {
-	o = msgp.Require(b, z.Msgsize())
-	// array header, size 13
-	o = append(o, 0x9d)
-	o = msgp.AppendString(o, z.Id)
-	o = msgp.AppendString(o, z.Token)
-	o = msgp.AppendInt64(o, z.CreateAt)
-	o = msgp.AppendInt64(o, z.ExpiresAt)
-	o = msgp.AppendInt64(o, z.LastActivityAt)
-	o = msgp.AppendString(o, z.UserId)
-	o = msgp.AppendString(o, z.DeviceId)
-	o = msgp.AppendString(o, z.Roles)
-	o = msgp.AppendBool(o, z.IsOAuth)
-	o = msgp.AppendBool(o, z.ExpiredNotify)
-	o = msgp.AppendMapHeader(o, uint32(len(z.Props)))
-	for za0001, za0002 := range z.Props {
-		o = msgp.AppendString(o, za0001)
-		o = msgp.AppendString(o, za0002)
-	}
-	o = msgp.AppendArrayHeader(o, uint32(len(z.TeamMembers)))
-	for za0003 := range z.TeamMembers {
-		if z.TeamMembers[za0003] == nil {
-			o = msgp.AppendNil(o)
-		} else {
-			o, err = z.TeamMembers[za0003].MarshalMsg(o)
-			if err != nil {
-				err = msgp.WrapError(err, "TeamMembers", za0003)
-				return
-			}
-		}
-	}
-	o = msgp.AppendBool(o, z.Local)
-	return
-}
-
-// UnmarshalMsg implements msgp.Unmarshaler
-func (z *Session) UnmarshalMsg(bts []byte) (o []byte, err error) {
-	var zb0001 uint32
-	zb0001, bts, err = msgp.ReadArrayHeaderBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err)
-		return
-	}
-	if zb0001 != 13 {
-		err = msgp.ArrayError{Wanted: 13, Got: zb0001}
-		return
-	}
-	z.Id, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "Id")
-		return
-	}
-	z.Token, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "Token")
-		return
-	}
-	z.CreateAt, bts, err = msgp.ReadInt64Bytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "CreateAt")
-		return
-	}
-	z.ExpiresAt, bts, err = msgp.ReadInt64Bytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "ExpiresAt")
-		return
-	}
-	z.LastActivityAt, bts, err = msgp.ReadInt64Bytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "LastActivityAt")
-		return
-	}
-	z.UserId, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "UserId")
-		return
-	}
-	z.DeviceId, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "DeviceId")
-		return
-	}
-	z.Roles, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "Roles")
-		return
-	}
-	z.IsOAuth, bts, err = msgp.ReadBoolBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "IsOAuth")
-		return
-	}
-	z.ExpiredNotify, bts, err = msgp.ReadBoolBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "ExpiredNotify")
-		return
-	}
-	var zb0002 uint32
-	zb0002, bts, err = msgp.ReadMapHeaderBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "Props")
-		return
-	}
-	if z.Props == nil {
-		z.Props = make(StringMap, zb0002)
-	} else if len(z.Props) > 0 {
-		for key := range z.Props {
-			delete(z.Props, key)
-		}
-	}
-	for zb0002 > 0 {
-		var za0001 string
-		var za0002 string
-		zb0002--
-		za0001, bts, err = msgp.ReadStringBytes(bts)
-		if err != nil {
-			err = msgp.WrapError(err, "Props")
-			return
-		}
-		za0002, bts, err = msgp.ReadStringBytes(bts)
-		if err != nil {
-			err = msgp.WrapError(err, "Props", za0001)
-			return
-		}
-		z.Props[za0001] = za0002
-	}
-	var zb0003 uint32
-	zb0003, bts, err = msgp.ReadArrayHeaderBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "TeamMembers")
-		return
-	}
-	if cap(z.TeamMembers) >= int(zb0003) {
-		z.TeamMembers = (z.TeamMembers)[:zb0003]
-	} else {
-		z.TeamMembers = make([]*TeamMember, zb0003)
-	}
-	for za0003 := range z.TeamMembers {
-		if msgp.IsNil(bts) {
-			bts, err = msgp.ReadNilBytes(bts)
-			if err != nil {
-				return
-			}
-			z.TeamMembers[za0003] = nil
-		} else {
-			if z.TeamMembers[za0003] == nil {
-				z.TeamMembers[za0003] = new(TeamMember)
-			}
-			bts, err = z.TeamMembers[za0003].UnmarshalMsg(bts)
-			if err != nil {
-				err = msgp.WrapError(err, "TeamMembers", za0003)
-				return
-			}
-		}
-	}
-	z.Local, bts, err = msgp.ReadBoolBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "Local")
-		return
-	}
-	o = bts
-	return
-}
-
-// Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message
-func (z *Session) Msgsize() (s int) {
-	s = 1 + msgp.StringPrefixSize + len(z.Id) + msgp.StringPrefixSize + len(z.Token) + msgp.Int64Size + msgp.Int64Size + msgp.Int64Size + msgp.StringPrefixSize + len(z.UserId) + msgp.StringPrefixSize + len(z.DeviceId) + msgp.StringPrefixSize + len(z.Roles) + msgp.BoolSize + msgp.BoolSize + msgp.MapHeaderSize
-	if z.Props != nil {
-		for za0001, za0002 := range z.Props {
-			_ = za0002
-			s += msgp.StringPrefixSize + len(za0001) + msgp.StringPrefixSize + len(za0002)
-		}
-	}
-	s += msgp.ArrayHeaderSize
-	for za0003 := range z.TeamMembers {
-		if z.TeamMembers[za0003] == nil {
-			s += msgp.NilSize
-		} else {
-			s += z.TeamMembers[za0003].Msgsize()
-		}
-	}
-	s += msgp.BoolSize
-	return
-}
-
-// DecodeMsg implements msgp.Decodable
-func (z *StringMap) DecodeMsg(dc *msgp.Reader) (err error) {
-	var zb0003 uint32
-	zb0003, err = dc.ReadMapHeader()
-	if err != nil {
-		err = msgp.WrapError(err)
-		return
-	}
-	if (*z) == nil {
-		(*z) = make(StringMap, zb0003)
-	} else if len((*z)) > 0 {
-		for key := range *z {
-			delete((*z), key)
-		}
-	}
-	for zb0003 > 0 {
-		zb0003--
-		var zb0001 string
-		var zb0002 string
-		zb0001, err = dc.ReadString()
-		if err != nil {
-			err = msgp.WrapError(err)
-			return
-		}
-		zb0002, err = dc.ReadString()
-		if err != nil {
-			err = msgp.WrapError(err, zb0001)
-			return
-		}
-		(*z)[zb0001] = zb0002
-	}
-	return
-}
-
-// EncodeMsg implements msgp.Encodable
-func (z StringMap) EncodeMsg(en *msgp.Writer) (err error) {
-	err = en.WriteMapHeader(uint32(len(z)))
-	if err != nil {
-		err = msgp.WrapError(err)
-		return
-	}
-	for zb0004, zb0005 := range z {
-		err = en.WriteString(zb0004)
-		if err != nil {
-			err = msgp.WrapError(err)
-			return
-		}
-		err = en.WriteString(zb0005)
-		if err != nil {
-			err = msgp.WrapError(err, zb0004)
-			return
-		}
-	}
-	return
-}
-
-// MarshalMsg implements msgp.Marshaler
-func (z StringMap) MarshalMsg(b []byte) (o []byte, err error) {
-	o = msgp.Require(b, z.Msgsize())
-	o = msgp.AppendMapHeader(o, uint32(len(z)))
-	for zb0004, zb0005 := range z {
-		o = msgp.AppendString(o, zb0004)
-		o = msgp.AppendString(o, zb0005)
-	}
-	return
-}
-
-// UnmarshalMsg implements msgp.Unmarshaler
-func (z *StringMap) UnmarshalMsg(bts []byte) (o []byte, err error) {
-	var zb0003 uint32
-	zb0003, bts, err = msgp.ReadMapHeaderBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err)
-		return
-	}
-	if (*z) == nil {
-		(*z) = make(StringMap, zb0003)
-	} else if len((*z)) > 0 {
-		for key := range *z {
-			delete((*z), key)
-		}
-	}
-	for zb0003 > 0 {
-		var zb0001 string
-		var zb0002 string
-		zb0003--
-		zb0001, bts, err = msgp.ReadStringBytes(bts)
-		if err != nil {
-			err = msgp.WrapError(err)
-			return
-		}
-		zb0002, bts, err = msgp.ReadStringBytes(bts)
-		if err != nil {
-			err = msgp.WrapError(err, zb0001)
-			return
-		}
-		(*z)[zb0001] = zb0002
-	}
-	o = bts
-	return
-}
-
-// Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message
-func (z StringMap) Msgsize() (s int) {
-	s = msgp.MapHeaderSize
-	if z != nil {
-		for zb0004, zb0005 := range z {
-			_ = zb0005
-			s += msgp.StringPrefixSize + len(zb0004) + msgp.StringPrefixSize + len(zb0005)
-		}
-	}
-	return
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/shared_channel.go b/vendor/github.com/mattermost/mattermost-server/v5/model/shared_channel.go
deleted file mode 100644
index e3643812..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/shared_channel.go
+++ /dev/null
@@ -1,273 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-	"unicode/utf8"
-)
-
-// SharedChannel represents a channel that can be synchronized with a remote cluster.
-// If "home" is true, then the shared channel is homed locally and "SharedChannelRemote"
-// table contains the remote clusters that have been invited.
-// If "home" is false, then the shared channel is homed remotely, and "RemoteId"
-// field points to the remote cluster connection in "RemoteClusters" table.
-type SharedChannel struct {
-	ChannelId        string `json:"id"`
-	TeamId           string `json:"team_id"`
-	Home             bool   `json:"home"`
-	ReadOnly         bool   `json:"readonly"`
-	ShareName        string `json:"name"`
-	ShareDisplayName string `json:"display_name"`
-	SharePurpose     string `json:"purpose"`
-	ShareHeader      string `json:"header"`
-	CreatorId        string `json:"creator_id"`
-	CreateAt         int64  `json:"create_at"`
-	UpdateAt         int64  `json:"update_at"`
-	RemoteId         string `json:"remote_id,omitempty"` // if not "home"
-	Type             string `db:"-"`
-}
-
-func (sc *SharedChannel) ToJson() string {
-	b, _ := json.Marshal(sc)
-	return string(b)
-}
-
-func SharedChannelFromJson(data io.Reader) (*SharedChannel, error) {
-	var sc *SharedChannel
-	err := json.NewDecoder(data).Decode(&sc)
-	return sc, err
-}
-
-func (sc *SharedChannel) IsValid() *AppError {
-	if !IsValidId(sc.ChannelId) {
-		return NewAppError("SharedChannel.IsValid", "model.channel.is_valid.id.app_error", nil, "ChannelId="+sc.ChannelId, http.StatusBadRequest)
-	}
-
-	if sc.Type != CHANNEL_DIRECT && !IsValidId(sc.TeamId) {
-		return NewAppError("SharedChannel.IsValid", "model.channel.is_valid.id.app_error", nil, "TeamId="+sc.TeamId, http.StatusBadRequest)
-	}
-
-	if sc.CreateAt == 0 {
-		return NewAppError("SharedChannel.IsValid", "model.channel.is_valid.create_at.app_error", nil, "id="+sc.ChannelId, http.StatusBadRequest)
-	}
-
-	if sc.UpdateAt == 0 {
-		return NewAppError("SharedChannel.IsValid", "model.channel.is_valid.update_at.app_error", nil, "id="+sc.ChannelId, http.StatusBadRequest)
-	}
-
-	if utf8.RuneCountInString(sc.ShareDisplayName) > CHANNEL_DISPLAY_NAME_MAX_RUNES {
-		return NewAppError("SharedChannel.IsValid", "model.channel.is_valid.display_name.app_error", nil, "id="+sc.ChannelId, http.StatusBadRequest)
-	}
-
-	if !IsValidChannelIdentifier(sc.ShareName) {
-		return NewAppError("SharedChannel.IsValid", "model.channel.is_valid.2_or_more.app_error", nil, "id="+sc.ChannelId, http.StatusBadRequest)
-	}
-
-	if utf8.RuneCountInString(sc.ShareHeader) > CHANNEL_HEADER_MAX_RUNES {
-		return NewAppError("SharedChannel.IsValid", "model.channel.is_valid.header.app_error", nil, "id="+sc.ChannelId, http.StatusBadRequest)
-	}
-
-	if utf8.RuneCountInString(sc.SharePurpose) > CHANNEL_PURPOSE_MAX_RUNES {
-		return NewAppError("SharedChannel.IsValid", "model.channel.is_valid.purpose.app_error", nil, "id="+sc.ChannelId, http.StatusBadRequest)
-	}
-
-	if !IsValidId(sc.CreatorId) {
-		return NewAppError("SharedChannel.IsValid", "model.channel.is_valid.creator_id.app_error", nil, "CreatorId="+sc.CreatorId, http.StatusBadRequest)
-	}
-
-	if !sc.Home {
-		if !IsValidId(sc.RemoteId) {
-			return NewAppError("SharedChannel.IsValid", "model.channel.is_valid.id.app_error", nil, "RemoteId="+sc.RemoteId, http.StatusBadRequest)
-		}
-	}
-	return nil
-}
-
-func (sc *SharedChannel) PreSave() {
-	sc.ShareName = SanitizeUnicode(sc.ShareName)
-	sc.ShareDisplayName = SanitizeUnicode(sc.ShareDisplayName)
-
-	sc.CreateAt = GetMillis()
-	sc.UpdateAt = sc.CreateAt
-}
-
-func (sc *SharedChannel) PreUpdate() {
-	sc.UpdateAt = GetMillis()
-	sc.ShareName = SanitizeUnicode(sc.ShareName)
-	sc.ShareDisplayName = SanitizeUnicode(sc.ShareDisplayName)
-}
-
-// SharedChannelRemote represents a remote cluster that has been invited
-// to a shared channel.
-type SharedChannelRemote struct {
-	Id                string `json:"id"`
-	ChannelId         string `json:"channel_id"`
-	CreatorId         string `json:"creator_id"`
-	CreateAt          int64  `json:"create_at"`
-	UpdateAt          int64  `json:"update_at"`
-	IsInviteAccepted  bool   `json:"is_invite_accepted"`
-	IsInviteConfirmed bool   `json:"is_invite_confirmed"`
-	RemoteId          string `json:"remote_id"`
-	LastPostUpdateAt  int64  `json:"last_post_update_at"`
-	LastPostId        string `json:"last_post_id"`
-}
-
-func (sc *SharedChannelRemote) ToJson() string {
-	b, _ := json.Marshal(sc)
-	return string(b)
-}
-
-func SharedChannelRemoteFromJson(data io.Reader) (*SharedChannelRemote, error) {
-	var sc *SharedChannelRemote
-	err := json.NewDecoder(data).Decode(&sc)
-	return sc, err
-}
-
-func (sc *SharedChannelRemote) IsValid() *AppError {
-	if !IsValidId(sc.Id) {
-		return NewAppError("SharedChannelRemote.IsValid", "model.channel.is_valid.id.app_error", nil, "Id="+sc.Id, http.StatusBadRequest)
-	}
-
-	if !IsValidId(sc.ChannelId) {
-		return NewAppError("SharedChannelRemote.IsValid", "model.channel.is_valid.id.app_error", nil, "ChannelId="+sc.ChannelId, http.StatusBadRequest)
-	}
-
-	if sc.CreateAt == 0 {
-		return NewAppError("SharedChannelRemote.IsValid", "model.channel.is_valid.create_at.app_error", nil, "id="+sc.ChannelId, http.StatusBadRequest)
-	}
-
-	if sc.UpdateAt == 0 {
-		return NewAppError("SharedChannelRemote.IsValid", "model.channel.is_valid.update_at.app_error", nil, "id="+sc.ChannelId, http.StatusBadRequest)
-	}
-
-	if !IsValidId(sc.CreatorId) {
-		return NewAppError("SharedChannelRemote.IsValid", "model.channel.is_valid.creator_id.app_error", nil, "id="+sc.CreatorId, http.StatusBadRequest)
-	}
-	return nil
-}
-
-func (sc *SharedChannelRemote) PreSave() {
-	if sc.Id == "" {
-		sc.Id = NewId()
-	}
-	sc.CreateAt = GetMillis()
-	sc.UpdateAt = sc.CreateAt
-}
-
-func (sc *SharedChannelRemote) PreUpdate() {
-	sc.UpdateAt = GetMillis()
-}
-
-type SharedChannelRemoteStatus struct {
-	ChannelId        string `json:"channel_id"`
-	DisplayName      string `json:"display_name"`
-	SiteURL          string `json:"site_url"`
-	LastPingAt       int64  `json:"last_ping_at"`
-	NextSyncAt       int64  `json:"next_sync_at"`
-	ReadOnly         bool   `json:"readonly"`
-	IsInviteAccepted bool   `json:"is_invite_accepted"`
-	Token            string `json:"token"`
-}
-
-// SharedChannelUser stores a lastSyncAt timestamp on behalf of a remote cluster for
-// each user that has been synchronized.
-type SharedChannelUser struct {
-	Id         string `json:"id"`
-	UserId     string `json:"user_id"`
-	ChannelId  string `json:"channel_id"`
-	RemoteId   string `json:"remote_id"`
-	CreateAt   int64  `json:"create_at"`
-	LastSyncAt int64  `json:"last_sync_at"`
-}
-
-func (scu *SharedChannelUser) PreSave() {
-	scu.Id = NewId()
-	scu.CreateAt = GetMillis()
-}
-
-func (scu *SharedChannelUser) IsValid() *AppError {
-	if !IsValidId(scu.Id) {
-		return NewAppError("SharedChannelUser.IsValid", "model.channel.is_valid.id.app_error", nil, "Id="+scu.Id, http.StatusBadRequest)
-	}
-
-	if !IsValidId(scu.UserId) {
-		return NewAppError("SharedChannelUser.IsValid", "model.channel.is_valid.id.app_error", nil, "UserId="+scu.UserId, http.StatusBadRequest)
-	}
-
-	if !IsValidId(scu.ChannelId) {
-		return NewAppError("SharedChannelUser.IsValid", "model.channel.is_valid.id.app_error", nil, "ChannelId="+scu.ChannelId, http.StatusBadRequest)
-	}
-
-	if !IsValidId(scu.RemoteId) {
-		return NewAppError("SharedChannelUser.IsValid", "model.channel.is_valid.id.app_error", nil, "RemoteId="+scu.RemoteId, http.StatusBadRequest)
-	}
-
-	if scu.CreateAt == 0 {
-		return NewAppError("SharedChannelUser.IsValid", "model.channel.is_valid.create_at.app_error", nil, "", http.StatusBadRequest)
-	}
-	return nil
-}
-
-type GetUsersForSyncFilter struct {
-	CheckProfileImage bool
-	ChannelID         string
-	Limit             uint64
-}
-
-// SharedChannelAttachment stores a lastSyncAt timestamp on behalf of a remote cluster for
-// each file attachment that has been synchronized.
-type SharedChannelAttachment struct {
-	Id         string `json:"id"`
-	FileId     string `json:"file_id"`
-	RemoteId   string `json:"remote_id"`
-	CreateAt   int64  `json:"create_at"`
-	LastSyncAt int64  `json:"last_sync_at"`
-}
-
-func (scf *SharedChannelAttachment) PreSave() {
-	if scf.Id == "" {
-		scf.Id = NewId()
-	}
-	if scf.CreateAt == 0 {
-		scf.CreateAt = GetMillis()
-		scf.LastSyncAt = scf.CreateAt
-	} else {
-		scf.LastSyncAt = GetMillis()
-	}
-}
-
-func (scf *SharedChannelAttachment) IsValid() *AppError {
-	if !IsValidId(scf.Id) {
-		return NewAppError("SharedChannelAttachment.IsValid", "model.channel.is_valid.id.app_error", nil, "Id="+scf.Id, http.StatusBadRequest)
-	}
-
-	if !IsValidId(scf.FileId) {
-		return NewAppError("SharedChannelAttachment.IsValid", "model.channel.is_valid.id.app_error", nil, "FileId="+scf.FileId, http.StatusBadRequest)
-	}
-
-	if !IsValidId(scf.RemoteId) {
-		return NewAppError("SharedChannelAttachment.IsValid", "model.channel.is_valid.id.app_error", nil, "RemoteId="+scf.RemoteId, http.StatusBadRequest)
-	}
-
-	if scf.CreateAt == 0 {
-		return NewAppError("SharedChannelAttachment.IsValid", "model.channel.is_valid.create_at.app_error", nil, "", http.StatusBadRequest)
-	}
-	return nil
-}
-
-type SharedChannelFilterOpts struct {
-	TeamId        string
-	CreatorId     string
-	ExcludeHome   bool
-	ExcludeRemote bool
-}
-
-type SharedChannelRemoteFilterOpts struct {
-	ChannelId       string
-	RemoteId        string
-	InclUnconfirmed bool
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/slack_attachment.go b/vendor/github.com/mattermost/mattermost-server/v5/model/slack_attachment.go
deleted file mode 100644
index 371baaab..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/slack_attachment.go
+++ /dev/null
@@ -1,196 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"fmt"
-	"regexp"
-)
-
-var linkWithTextRegex = regexp.MustCompile(`<([^<\|]+)\|([^>]+)>`)
-
-type SlackAttachment struct {
-	Id         int64                   `json:"id"`
-	Fallback   string                  `json:"fallback"`
-	Color      string                  `json:"color"`
-	Pretext    string                  `json:"pretext"`
-	AuthorName string                  `json:"author_name"`
-	AuthorLink string                  `json:"author_link"`
-	AuthorIcon string                  `json:"author_icon"`
-	Title      string                  `json:"title"`
-	TitleLink  string                  `json:"title_link"`
-	Text       string                  `json:"text"`
-	Fields     []*SlackAttachmentField `json:"fields"`
-	ImageURL   string                  `json:"image_url"`
-	ThumbURL   string                  `json:"thumb_url"`
-	Footer     string                  `json:"footer"`
-	FooterIcon string                  `json:"footer_icon"`
-	Timestamp  interface{}             `json:"ts"` // This is either a string or an int64
-	Actions    []*PostAction           `json:"actions,omitempty"`
-}
-
-func (s *SlackAttachment) Equals(input *SlackAttachment) bool {
-	// Direct comparison of simple types
-
-	if s.Id != input.Id {
-		return false
-	}
-
-	if s.Fallback != input.Fallback {
-		return false
-	}
-
-	if s.Color != input.Color {
-		return false
-	}
-
-	if s.Pretext != input.Pretext {
-		return false
-	}
-
-	if s.AuthorName != input.AuthorName {
-		return false
-	}
-
-	if s.AuthorLink != input.AuthorLink {
-		return false
-	}
-
-	if s.AuthorIcon != input.AuthorIcon {
-		return false
-	}
-
-	if s.Title != input.Title {
-		return false
-	}
-
-	if s.TitleLink != input.TitleLink {
-		return false
-	}
-
-	if s.Text != input.Text {
-		return false
-	}
-
-	if s.ImageURL != input.ImageURL {
-		return false
-	}
-
-	if s.ThumbURL != input.ThumbURL {
-		return false
-	}
-
-	if s.Footer != input.Footer {
-		return false
-	}
-
-	if s.FooterIcon != input.FooterIcon {
-		return false
-	}
-
-	// Compare length & slice values of fields
-	if len(s.Fields) != len(input.Fields) {
-		return false
-	}
-
-	for j := range s.Fields {
-		if !s.Fields[j].Equals(input.Fields[j]) {
-			return false
-		}
-	}
-
-	// Compare length & slice values of actions
-	if len(s.Actions) != len(input.Actions) {
-		return false
-	}
-
-	for j := range s.Actions {
-		if !s.Actions[j].Equals(input.Actions[j]) {
-			return false
-		}
-	}
-
-	return s.Timestamp == input.Timestamp
-}
-
-type SlackAttachmentField struct {
-	Title string              `json:"title"`
-	Value interface{}         `json:"value"`
-	Short SlackCompatibleBool `json:"short"`
-}
-
-func (s *SlackAttachmentField) Equals(input *SlackAttachmentField) bool {
-	if s.Title != input.Title {
-		return false
-	}
-
-	if s.Value != input.Value {
-		return false
-	}
-
-	if s.Short != input.Short {
-		return false
-	}
-
-	return true
-}
-
-func StringifySlackFieldValue(a []*SlackAttachment) []*SlackAttachment {
-	var nonNilAttachments []*SlackAttachment
-	for _, attachment := range a {
-		if attachment == nil {
-			continue
-		}
-		nonNilAttachments = append(nonNilAttachments, attachment)
-
-		var nonNilFields []*SlackAttachmentField
-		for _, field := range attachment.Fields {
-			if field == nil {
-				continue
-			}
-			nonNilFields = append(nonNilFields, field)
-
-			if field.Value != nil {
-				// Ensure the value is set to a string if it is set
-				field.Value = fmt.Sprintf("%v", field.Value)
-			}
-		}
-		attachment.Fields = nonNilFields
-	}
-	return nonNilAttachments
-}
-
-// This method only parses and processes the attachments,
-// all else should be set in the post which is passed
-func ParseSlackAttachment(post *Post, attachments []*SlackAttachment) {
-	if post.Type == "" {
-		post.Type = POST_SLACK_ATTACHMENT
-	}
-
-	postAttachments := []*SlackAttachment{}
-
-	for _, attachment := range attachments {
-		if attachment == nil {
-			continue
-		}
-
-		attachment.Text = ParseSlackLinksToMarkdown(attachment.Text)
-		attachment.Pretext = ParseSlackLinksToMarkdown(attachment.Pretext)
-
-		for _, field := range attachment.Fields {
-			if field == nil {
-				continue
-			}
-			if value, ok := field.Value.(string); ok {
-				field.Value = ParseSlackLinksToMarkdown(value)
-			}
-		}
-		postAttachments = append(postAttachments, attachment)
-	}
-	post.AddProp("attachments", postAttachments)
-}
-
-func ParseSlackLinksToMarkdown(text string) string {
-	return linkWithTextRegex.ReplaceAllString(text, "[${2}](${1})")
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/slack_compatibility.go b/vendor/github.com/mattermost/mattermost-server/v5/model/slack_compatibility.go
deleted file mode 100644
index 2d3e2878..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/slack_compatibility.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"fmt"
-	"strings"
-)
-
-// SlackCompatibleBool is an alias for bool that implements json.Unmarshaler
-type SlackCompatibleBool bool
-
-// UnmarshalJSON implements json.Unmarshaler
-//
-// Slack allows bool values to be represented as strings ("true"/"false") or
-// literals (true/false). To maintain compatibility, we define an Unmarshaler
-// that supports both.
-func (b *SlackCompatibleBool) UnmarshalJSON(data []byte) error {
-	value := strings.ToLower(string(data))
-	if value == "true" || value == `"true"` {
-		*b = true
-	} else if value == "false" || value == `"false"` {
-		*b = false
-	} else {
-		return fmt.Errorf("unmarshal: unable to convert %s to bool", data)
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/status.go b/vendor/github.com/mattermost/mattermost-server/v5/model/status.go
deleted file mode 100644
index f6f3a67a..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/status.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-const (
-	STATUS_OUT_OF_OFFICE   = "ooo"
-	STATUS_OFFLINE         = "offline"
-	STATUS_AWAY            = "away"
-	STATUS_DND             = "dnd"
-	STATUS_ONLINE          = "online"
-	STATUS_CACHE_SIZE      = SESSION_CACHE_SIZE
-	STATUS_CHANNEL_TIMEOUT = 20000  // 20 seconds
-	STATUS_MIN_UPDATE_TIME = 120000 // 2 minutes
-)
-
-type Status struct {
-	UserId         string `json:"user_id"`
-	Status         string `json:"status"`
-	Manual         bool   `json:"manual"`
-	LastActivityAt int64  `json:"last_activity_at"`
-	ActiveChannel  string `json:"active_channel,omitempty" db:"-"`
-	DNDEndTime     int64  `json:"dnd_end_time"`
-	PrevStatus     string `json:"-"`
-}
-
-func (o *Status) ToJson() string {
-	oCopy := *o
-	oCopy.ActiveChannel = ""
-	b, _ := json.Marshal(oCopy)
-	return string(b)
-}
-
-func (o *Status) ToClusterJson() string {
-	oCopy := *o
-	b, _ := json.Marshal(oCopy)
-	return string(b)
-}
-
-func StatusFromJson(data io.Reader) *Status {
-	var o *Status
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func StatusListToJson(u []*Status) string {
-	uCopy := make([]Status, len(u))
-	for i, s := range u {
-		sCopy := *s
-		sCopy.ActiveChannel = ""
-		uCopy[i] = sCopy
-	}
-
-	b, _ := json.Marshal(uCopy)
-	return string(b)
-}
-
-func StatusListFromJson(data io.Reader) []*Status {
-	var statuses []*Status
-	json.NewDecoder(data).Decode(&statuses)
-	return statuses
-}
-
-func StatusMapToInterfaceMap(statusMap map[string]*Status) map[string]interface{} {
-	interfaceMap := map[string]interface{}{}
-	for _, s := range statusMap {
-		// Omitted statues mean offline
-		if s.Status != STATUS_OFFLINE {
-			interfaceMap[s.UserId] = s.Status
-		}
-	}
-	return interfaceMap
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/suggest_command.go b/vendor/github.com/mattermost/mattermost-server/v5/model/suggest_command.go
deleted file mode 100644
index 45a7af38..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/suggest_command.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type SuggestCommand struct {
-	Suggestion  string `json:"suggestion"`
-	Description string `json:"description"`
-}
-
-func (o *SuggestCommand) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func SuggestCommandFromJson(data io.Reader) *SuggestCommand {
-	var o *SuggestCommand
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/switch_request.go b/vendor/github.com/mattermost/mattermost-server/v5/model/switch_request.go
deleted file mode 100644
index bdb90045..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/switch_request.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type SwitchRequest struct {
-	CurrentService string `json:"current_service"`
-	NewService     string `json:"new_service"`
-	Email          string `json:"email"`
-	Password       string `json:"password"`
-	NewPassword    string `json:"new_password"`
-	MfaCode        string `json:"mfa_code"`
-	LdapLoginId    string `json:"ldap_id"`
-}
-
-func (o *SwitchRequest) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func SwitchRequestFromJson(data io.Reader) *SwitchRequest {
-	var o *SwitchRequest
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func (o *SwitchRequest) EmailToOAuth() bool {
-	return o.CurrentService == USER_AUTH_SERVICE_EMAIL &&
-		(o.NewService == USER_AUTH_SERVICE_SAML ||
-			o.NewService == USER_AUTH_SERVICE_GITLAB ||
-			o.NewService == SERVICE_GOOGLE ||
-			o.NewService == SERVICE_OFFICE365 ||
-			o.NewService == SERVICE_OPENID)
-}
-
-func (o *SwitchRequest) OAuthToEmail() bool {
-	return (o.CurrentService == USER_AUTH_SERVICE_SAML ||
-		o.CurrentService == USER_AUTH_SERVICE_GITLAB ||
-		o.CurrentService == SERVICE_GOOGLE ||
-		o.CurrentService == SERVICE_OFFICE365 ||
-		o.CurrentService == SERVICE_OPENID) && o.NewService == USER_AUTH_SERVICE_EMAIL
-}
-
-func (o *SwitchRequest) EmailToLdap() bool {
-	return o.CurrentService == USER_AUTH_SERVICE_EMAIL && o.NewService == USER_AUTH_SERVICE_LDAP
-}
-
-func (o *SwitchRequest) LdapToEmail() bool {
-	return o.CurrentService == USER_AUTH_SERVICE_LDAP && o.NewService == USER_AUTH_SERVICE_EMAIL
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/system.go b/vendor/github.com/mattermost/mattermost-server/v5/model/system.go
deleted file mode 100644
index b7cda1ef..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/system.go
+++ /dev/null
@@ -1,235 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"math/big"
-)
-
-const (
-	SYSTEM_TELEMETRY_ID                           = "DiagnosticId"
-	SYSTEM_RAN_UNIT_TESTS                         = "RanUnitTests"
-	SYSTEM_LAST_SECURITY_TIME                     = "LastSecurityTime"
-	SYSTEM_ACTIVE_LICENSE_ID                      = "ActiveLicenseId"
-	SYSTEM_LICENSE_RENEWAL_TOKEN                  = "LicenseRenewalToken"
-	SYSTEM_LAST_COMPLIANCE_TIME                   = "LastComplianceTime"
-	SYSTEM_ASYMMETRIC_SIGNING_KEY                 = "AsymmetricSigningKey"
-	SYSTEM_POST_ACTION_COOKIE_SECRET              = "PostActionCookieSecret"
-	SYSTEM_INSTALLATION_DATE_KEY                  = "InstallationDate"
-	SYSTEM_FIRST_SERVER_RUN_TIMESTAMP_KEY         = "FirstServerRunTimestamp"
-	SYSTEM_CLUSTER_ENCRYPTION_KEY                 = "ClusterEncryptionKey"
-	SYSTEM_UPGRADED_FROM_TE_ID                    = "UpgradedFromTE"
-	SYSTEM_WARN_METRIC_NUMBER_OF_TEAMS_5          = "warn_metric_number_of_teams_5"
-	SYSTEM_WARN_METRIC_NUMBER_OF_CHANNELS_50      = "warn_metric_number_of_channels_50"
-	SYSTEM_WARN_METRIC_MFA                        = "warn_metric_mfa"
-	SYSTEM_WARN_METRIC_EMAIL_DOMAIN               = "warn_metric_email_domain"
-	SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_100 = "warn_metric_number_of_active_users_100"
-	SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_200 = "warn_metric_number_of_active_users_200"
-	SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_300 = "warn_metric_number_of_active_users_300"
-	SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_500 = "warn_metric_number_of_active_users_500"
-	SYSTEM_WARN_METRIC_NUMBER_OF_POSTS_2M         = "warn_metric_number_of_posts_2M"
-	SYSTEM_WARN_METRIC_LAST_RUN_TIMESTAMP_KEY     = "LastWarnMetricRunTimestamp"
-	SYSTEM_METRIC_SUPPORT_EMAIL_NOT_CONFIGURED    = "warn_metric_support_email_not_configured"
-	SYSTEM_FIRST_ADMIN_VISIT_MARKETPLACE          = "FirstAdminVisitMarketplace"
-	AWS_METERING_REPORT_INTERVAL                  = 1
-	AWS_METERING_DIMENSION_USAGE_HRS              = "UsageHrs"
-	USER_LIMIT_OVERAGE_CYCLE_END_DATE             = "UserLimitOverageCycleEndDate"
-	OVER_USER_LIMIT_FORGIVEN_COUNT                = "OverUserLimitForgivenCount"
-	OVER_USER_LIMIT_LAST_EMAIL_SENT               = "OverUserLimitLastEmailSent"
-)
-
-const (
-	WARN_METRIC_STATUS_LIMIT_REACHED      = "true"
-	WARN_METRIC_STATUS_RUNONCE            = "runonce"
-	WARN_METRIC_STATUS_ACK                = "ack"
-	WARN_METRIC_STATUS_STORE_PREFIX       = "warn_metric_"
-	WARN_METRIC_JOB_INTERVAL              = 24 * 7
-	WARN_METRIC_NUMBER_OF_ACTIVE_USERS_25 = 25
-	WARN_METRIC_JOB_WAIT_TIME             = 1000 * 3600 * 24 * 7 // 7 days
-)
-
-type System struct {
-	Name  string `json:"name"`
-	Value string `json:"value"`
-}
-
-func (o *System) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func SystemFromJson(data io.Reader) *System {
-	var o *System
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-type SystemPostActionCookieSecret struct {
-	Secret []byte `json:"key,omitempty"`
-}
-
-type SystemAsymmetricSigningKey struct {
-	ECDSAKey *SystemECDSAKey `json:"ecdsa_key,omitempty"`
-}
-
-type SystemECDSAKey struct {
-	Curve string   `json:"curve"`
-	X     *big.Int `json:"x"`
-	Y     *big.Int `json:"y"`
-	D     *big.Int `json:"d,omitempty"`
-}
-
-// ServerBusyState provides serialization for app.Busy.
-type ServerBusyState struct {
-	Busy       bool   `json:"busy"`
-	Expires    int64  `json:"expires"`
-	Expires_ts string `json:"expires_ts,omitempty"`
-}
-
-type SupportPacket struct {
-	ServerOS             string   `yaml:"server_os"`
-	ServerArchitecture   string   `yaml:"server_architecture"`
-	DatabaseType         string   `yaml:"database_type"`
-	DatabaseVersion      string   `yaml:"database_version"`
-	LdapVendorName       string   `yaml:"ldap_vendor_name,omitempty"`
-	LdapVendorVersion    string   `yaml:"ldap_vendor_version,omitempty"`
-	ElasticServerVersion string   `yaml:"elastic_server_version,omitempty"`
-	ElasticServerPlugins []string `yaml:"elastic_server_plugins,omitempty"`
-}
-
-type FileData struct {
-	Filename string
-	Body     []byte
-}
-
-func (sbs *ServerBusyState) ToJson() string {
-	b, _ := json.Marshal(sbs)
-	return string(b)
-}
-
-func ServerBusyStateFromJson(r io.Reader) *ServerBusyState {
-	var sbs *ServerBusyState
-	json.NewDecoder(r).Decode(&sbs)
-	return sbs
-}
-
-var WarnMetricsTable = map[string]WarnMetric{
-	SYSTEM_WARN_METRIC_MFA: {
-		Id:        SYSTEM_WARN_METRIC_MFA,
-		Limit:     -1,
-		IsBotOnly: true,
-		IsRunOnce: true,
-	},
-	SYSTEM_WARN_METRIC_EMAIL_DOMAIN: {
-		Id:        SYSTEM_WARN_METRIC_EMAIL_DOMAIN,
-		Limit:     -1,
-		IsBotOnly: true,
-		IsRunOnce: true,
-	},
-	SYSTEM_WARN_METRIC_NUMBER_OF_TEAMS_5: {
-		Id:        SYSTEM_WARN_METRIC_NUMBER_OF_TEAMS_5,
-		Limit:     5,
-		IsBotOnly: true,
-		IsRunOnce: true,
-	},
-	SYSTEM_WARN_METRIC_NUMBER_OF_CHANNELS_50: {
-		Id:        SYSTEM_WARN_METRIC_NUMBER_OF_CHANNELS_50,
-		Limit:     50,
-		IsBotOnly: true,
-		IsRunOnce: true,
-	},
-	SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_100: {
-		Id:        SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_100,
-		Limit:     100,
-		IsBotOnly: true,
-		IsRunOnce: true,
-	},
-	SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_200: {
-		Id:        SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_200,
-		Limit:     200,
-		IsBotOnly: true,
-		IsRunOnce: true,
-	},
-	SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_300: {
-		Id:        SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_300,
-		Limit:     300,
-		IsBotOnly: true,
-		IsRunOnce: true,
-	},
-	SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_500: {
-		Id:        SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_500,
-		Limit:     500,
-		IsBotOnly: false,
-		IsRunOnce: true,
-	},
-	SYSTEM_WARN_METRIC_NUMBER_OF_POSTS_2M: {
-		Id:        SYSTEM_WARN_METRIC_NUMBER_OF_POSTS_2M,
-		Limit:     2000000,
-		IsBotOnly: false,
-		IsRunOnce: true,
-	},
-	SYSTEM_METRIC_SUPPORT_EMAIL_NOT_CONFIGURED: {
-		Id:         SYSTEM_METRIC_SUPPORT_EMAIL_NOT_CONFIGURED,
-		Limit:      -1,
-		IsBotOnly:  true,
-		IsRunOnce:  false,
-		SkipAction: true,
-	},
-}
-
-type WarnMetric struct {
-	Id         string
-	Limit      int64
-	IsBotOnly  bool
-	IsRunOnce  bool
-	SkipAction bool
-}
-
-type WarnMetricDisplayTexts struct {
-	BotTitle          string
-	BotMessageBody    string
-	BotSuccessMessage string
-	EmailBody         string
-}
-type WarnMetricStatus struct {
-	Id          string `json:"id"`
-	Limit       int64  `json:"limit"`
-	Acked       bool   `json:"acked"`
-	StoreStatus string `json:"store_status,omitempty"`
-}
-
-func (wms *WarnMetricStatus) ToJson() string {
-	b, _ := json.Marshal(wms)
-	return string(b)
-}
-
-func WarnMetricStatusFromJson(data io.Reader) *WarnMetricStatus {
-	var o WarnMetricStatus
-	if err := json.NewDecoder(data).Decode(&o); err != nil {
-		return nil
-	}
-	return &o
-}
-
-func MapWarnMetricStatusToJson(o map[string]*WarnMetricStatus) string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-type SendWarnMetricAck struct {
-	ForceAck bool `json:"forceAck"`
-}
-
-func (swma *SendWarnMetricAck) ToJson() string {
-	b, _ := json.Marshal(swma)
-	return string(b)
-}
-
-func SendWarnMetricAckFromJson(r io.Reader) *SendWarnMetricAck {
-	var swma *SendWarnMetricAck
-	json.NewDecoder(r).Decode(&swma)
-	return swma
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/team.go b/vendor/github.com/mattermost/mattermost-server/v5/model/team.go
deleted file mode 100644
index fc752f30..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/team.go
+++ /dev/null
@@ -1,331 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"regexp"
-	"strings"
-	"unicode/utf8"
-)
-
-const (
-	TEAM_OPEN                       = "O"
-	TEAM_INVITE                     = "I"
-	TEAM_ALLOWED_DOMAINS_MAX_LENGTH = 500
-	TEAM_COMPANY_NAME_MAX_LENGTH    = 64
-	TEAM_DESCRIPTION_MAX_LENGTH     = 255
-	TEAM_DISPLAY_NAME_MAX_RUNES     = 64
-	TEAM_EMAIL_MAX_LENGTH           = 128
-	TEAM_NAME_MAX_LENGTH            = 64
-	TEAM_NAME_MIN_LENGTH            = 2
-)
-
-type Team struct {
-	Id                 string  `json:"id"`
-	CreateAt           int64   `json:"create_at"`
-	UpdateAt           int64   `json:"update_at"`
-	DeleteAt           int64   `json:"delete_at"`
-	DisplayName        string  `json:"display_name"`
-	Name               string  `json:"name"`
-	Description        string  `json:"description"`
-	Email              string  `json:"email"`
-	Type               string  `json:"type"`
-	CompanyName        string  `json:"company_name"`
-	AllowedDomains     string  `json:"allowed_domains"`
-	InviteId           string  `json:"invite_id"`
-	AllowOpenInvite    bool    `json:"allow_open_invite"`
-	LastTeamIconUpdate int64   `json:"last_team_icon_update,omitempty"`
-	SchemeId           *string `json:"scheme_id"`
-	GroupConstrained   *bool   `json:"group_constrained"`
-	PolicyID           *string `json:"policy_id" db:"-"`
-}
-
-type TeamPatch struct {
-	DisplayName      *string `json:"display_name"`
-	Description      *string `json:"description"`
-	CompanyName      *string `json:"company_name"`
-	AllowedDomains   *string `json:"allowed_domains"`
-	AllowOpenInvite  *bool   `json:"allow_open_invite"`
-	GroupConstrained *bool   `json:"group_constrained"`
-}
-
-type TeamForExport struct {
-	Team
-	SchemeName *string
-}
-
-type Invites struct {
-	Invites []map[string]string `json:"invites"`
-}
-
-type TeamsWithCount struct {
-	Teams      []*Team `json:"teams"`
-	TotalCount int64   `json:"total_count"`
-}
-
-func InvitesFromJson(data io.Reader) *Invites {
-	var o *Invites
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func (o *Invites) ToEmailList() []string {
-	emailList := make([]string, len(o.Invites))
-	for _, invite := range o.Invites {
-		emailList = append(emailList, invite["email"])
-	}
-	return emailList
-}
-
-func (o *Invites) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func (o *Team) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func TeamFromJson(data io.Reader) *Team {
-	var o *Team
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func TeamMapToJson(u map[string]*Team) string {
-	b, _ := json.Marshal(u)
-	return string(b)
-}
-
-func TeamMapFromJson(data io.Reader) map[string]*Team {
-	var teams map[string]*Team
-	json.NewDecoder(data).Decode(&teams)
-	return teams
-}
-
-func TeamListToJson(t []*Team) string {
-	b, _ := json.Marshal(t)
-	return string(b)
-}
-
-func TeamsWithCountToJson(tlc *TeamsWithCount) []byte {
-	b, _ := json.Marshal(tlc)
-	return b
-}
-
-func TeamsWithCountFromJson(data io.Reader) *TeamsWithCount {
-	var twc *TeamsWithCount
-	json.NewDecoder(data).Decode(&twc)
-	return twc
-}
-
-func TeamListFromJson(data io.Reader) []*Team {
-	var teams []*Team
-	json.NewDecoder(data).Decode(&teams)
-	return teams
-}
-
-func (o *Team) Etag() string {
-	return Etag(o.Id, o.UpdateAt)
-}
-
-func (o *Team) IsValid() *AppError {
-
-	if !IsValidId(o.Id) {
-		return NewAppError("Team.IsValid", "model.team.is_valid.id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if o.CreateAt == 0 {
-		return NewAppError("Team.IsValid", "model.team.is_valid.create_at.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if o.UpdateAt == 0 {
-		return NewAppError("Team.IsValid", "model.team.is_valid.update_at.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if len(o.Email) > TEAM_EMAIL_MAX_LENGTH {
-		return NewAppError("Team.IsValid", "model.team.is_valid.email.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if o.Email != "" && !IsValidEmail(o.Email) {
-		return NewAppError("Team.IsValid", "model.team.is_valid.email.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if utf8.RuneCountInString(o.DisplayName) == 0 || utf8.RuneCountInString(o.DisplayName) > TEAM_DISPLAY_NAME_MAX_RUNES {
-		return NewAppError("Team.IsValid", "model.team.is_valid.name.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if len(o.Name) > TEAM_NAME_MAX_LENGTH {
-		return NewAppError("Team.IsValid", "model.team.is_valid.url.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if len(o.Description) > TEAM_DESCRIPTION_MAX_LENGTH {
-		return NewAppError("Team.IsValid", "model.team.is_valid.description.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if o.InviteId == "" {
-		return NewAppError("Team.IsValid", "model.team.is_valid.invite_id.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if IsReservedTeamName(o.Name) {
-		return NewAppError("Team.IsValid", "model.team.is_valid.reserved.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if !IsValidTeamName(o.Name) {
-		return NewAppError("Team.IsValid", "model.team.is_valid.characters.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if !(o.Type == TEAM_OPEN || o.Type == TEAM_INVITE) {
-		return NewAppError("Team.IsValid", "model.team.is_valid.type.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if len(o.CompanyName) > TEAM_COMPANY_NAME_MAX_LENGTH {
-		return NewAppError("Team.IsValid", "model.team.is_valid.company.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	if len(o.AllowedDomains) > TEAM_ALLOWED_DOMAINS_MAX_LENGTH {
-		return NewAppError("Team.IsValid", "model.team.is_valid.domains.app_error", nil, "id="+o.Id, http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (o *Team) PreSave() {
-	if o.Id == "" {
-		o.Id = NewId()
-	}
-
-	o.CreateAt = GetMillis()
-	o.UpdateAt = o.CreateAt
-
-	o.Name = SanitizeUnicode(o.Name)
-	o.DisplayName = SanitizeUnicode(o.DisplayName)
-	o.Description = SanitizeUnicode(o.Description)
-	o.CompanyName = SanitizeUnicode(o.CompanyName)
-
-	if o.InviteId == "" {
-		o.InviteId = NewId()
-	}
-}
-
-func (o *Team) PreUpdate() {
-	o.UpdateAt = GetMillis()
-	o.Name = SanitizeUnicode(o.Name)
-	o.DisplayName = SanitizeUnicode(o.DisplayName)
-	o.Description = SanitizeUnicode(o.Description)
-	o.CompanyName = SanitizeUnicode(o.CompanyName)
-}
-
-func IsReservedTeamName(s string) bool {
-	s = strings.ToLower(s)
-
-	for _, value := range reservedName {
-		if strings.Index(s, value) == 0 {
-			return true
-		}
-	}
-
-	return false
-}
-
-func IsValidTeamName(s string) bool {
-	if !IsValidAlphaNum(s) {
-		return false
-	}
-
-	if len(s) < TEAM_NAME_MIN_LENGTH {
-		return false
-	}
-
-	return true
-}
-
-var validTeamNameCharacter = regexp.MustCompile(`^[a-z0-9-]$`)
-
-func CleanTeamName(s string) string {
-	s = strings.ToLower(strings.Replace(s, " ", "-", -1))
-
-	for _, value := range reservedName {
-		if strings.Index(s, value) == 0 {
-			s = strings.Replace(s, value, "", -1)
-		}
-	}
-
-	s = strings.TrimSpace(s)
-
-	for _, c := range s {
-		char := fmt.Sprintf("%c", c)
-		if !validTeamNameCharacter.MatchString(char) {
-			s = strings.Replace(s, char, "", -1)
-		}
-	}
-
-	s = strings.Trim(s, "-")
-
-	if !IsValidTeamName(s) {
-		s = NewId()
-	}
-
-	return s
-}
-
-func (o *Team) Sanitize() {
-	o.Email = ""
-	o.InviteId = ""
-}
-
-func (o *Team) Patch(patch *TeamPatch) {
-	if patch.DisplayName != nil {
-		o.DisplayName = *patch.DisplayName
-	}
-
-	if patch.Description != nil {
-		o.Description = *patch.Description
-	}
-
-	if patch.CompanyName != nil {
-		o.CompanyName = *patch.CompanyName
-	}
-
-	if patch.AllowedDomains != nil {
-		o.AllowedDomains = *patch.AllowedDomains
-	}
-
-	if patch.AllowOpenInvite != nil {
-		o.AllowOpenInvite = *patch.AllowOpenInvite
-	}
-
-	if patch.GroupConstrained != nil {
-		o.GroupConstrained = patch.GroupConstrained
-	}
-}
-
-func (o *Team) IsGroupConstrained() bool {
-	return o.GroupConstrained != nil && *o.GroupConstrained
-}
-
-func (t *TeamPatch) ToJson() string {
-	b, err := json.Marshal(t)
-	if err != nil {
-		return ""
-	}
-
-	return string(b)
-}
-
-func TeamPatchFromJson(data io.Reader) *TeamPatch {
-	decoder := json.NewDecoder(data)
-	var team TeamPatch
-	err := decoder.Decode(&team)
-	if err != nil {
-		return nil
-	}
-
-	return &team
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/team_member.go b/vendor/github.com/mattermost/mattermost-server/v5/model/team_member.go
deleted file mode 100644
index f5f1cc61..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/team_member.go
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-)
-
-const (
-	USERNAME = "Username"
-)
-
-//msgp:tuple TeamMember
-// This struct's serializer methods are auto-generated. If a new field is added/removed,
-// please run make gen-serialized.
-type TeamMember struct {
-	TeamId        string `json:"team_id"`
-	UserId        string `json:"user_id"`
-	Roles         string `json:"roles"`
-	DeleteAt      int64  `json:"delete_at"`
-	SchemeGuest   bool   `json:"scheme_guest"`
-	SchemeUser    bool   `json:"scheme_user"`
-	SchemeAdmin   bool   `json:"scheme_admin"`
-	ExplicitRoles string `json:"explicit_roles"`
-}
-
-//msgp:ignore TeamUnread
-type TeamUnread struct {
-	TeamId             string `json:"team_id"`
-	MsgCount           int64  `json:"msg_count"`
-	MentionCount       int64  `json:"mention_count"`
-	MentionCountRoot   int64  `json:"mention_count_root"`
-	MsgCountRoot       int64  `json:"msg_count_root"`
-	ThreadCount        int64  `json:"thread_count"`
-	ThreadMentionCount int64  `json:"thread_mention_count"`
-}
-
-//msgp:ignore TeamMemberForExport
-type TeamMemberForExport struct {
-	TeamMember
-	TeamName string
-}
-
-//msgp:ignore TeamMemberWithError
-type TeamMemberWithError struct {
-	UserId string      `json:"user_id"`
-	Member *TeamMember `json:"member"`
-	Error  *AppError   `json:"error"`
-}
-
-//msgp:ignore EmailInviteWithError
-type EmailInviteWithError struct {
-	Email string    `json:"email"`
-	Error *AppError `json:"error"`
-}
-
-//msgp:ignore TeamMembersGetOptions
-type TeamMembersGetOptions struct {
-	// Sort the team members. Accepts "Username", but defaults to "Id".
-	Sort string
-
-	// If true, exclude team members whose corresponding user is deleted.
-	ExcludeDeletedUsers bool
-
-	// Restrict to search in a list of teams and channels
-	ViewRestrictions *ViewUsersRestrictions
-}
-
-func (o *TeamMember) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func (o *TeamUnread) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func TeamMemberFromJson(data io.Reader) *TeamMember {
-	var o *TeamMember
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func TeamUnreadFromJson(data io.Reader) *TeamUnread {
-	var o *TeamUnread
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func EmailInviteWithErrorFromJson(data io.Reader) []*EmailInviteWithError {
-	var o []*EmailInviteWithError
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func EmailInviteWithErrorToEmails(o []*EmailInviteWithError) []string {
-	var ret []string
-	for _, o := range o {
-		if o.Error == nil {
-			ret = append(ret, o.Email)
-		}
-	}
-	return ret
-}
-
-func EmailInviteWithErrorToJson(o []*EmailInviteWithError) string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return "[]"
-	}
-	return string(b)
-}
-
-func EmailInviteWithErrorToString(o *EmailInviteWithError) string {
-	return fmt.Sprintf("%s:%s", o.Email, o.Error.Error())
-}
-
-func TeamMembersWithErrorToTeamMembers(o []*TeamMemberWithError) []*TeamMember {
-	var ret []*TeamMember
-	for _, o := range o {
-		if o.Error == nil {
-			ret = append(ret, o.Member)
-		}
-	}
-	return ret
-}
-
-func TeamMembersWithErrorToJson(o []*TeamMemberWithError) string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return "[]"
-	}
-	return string(b)
-}
-
-func TeamMemberWithErrorToString(o *TeamMemberWithError) string {
-	return fmt.Sprintf("%s:%s", o.UserId, o.Error.Error())
-}
-
-func TeamMembersWithErrorFromJson(data io.Reader) []*TeamMemberWithError {
-	var o []*TeamMemberWithError
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func TeamMembersToJson(o []*TeamMember) string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return "[]"
-	}
-	return string(b)
-}
-
-func TeamMembersFromJson(data io.Reader) []*TeamMember {
-	var o []*TeamMember
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func TeamsUnreadToJson(o []*TeamUnread) string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return "[]"
-	}
-	return string(b)
-}
-
-func TeamsUnreadFromJson(data io.Reader) []*TeamUnread {
-	var o []*TeamUnread
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func (o *TeamMember) IsValid() *AppError {
-
-	if !IsValidId(o.TeamId) {
-		return NewAppError("TeamMember.IsValid", "model.team_member.is_valid.team_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !IsValidId(o.UserId) {
-		return NewAppError("TeamMember.IsValid", "model.team_member.is_valid.user_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (o *TeamMember) PreUpdate() {
-}
-
-func (o *TeamMember) GetRoles() []string {
-	return strings.Fields(o.Roles)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/team_member_serial_gen.go b/vendor/github.com/mattermost/mattermost-server/v5/model/team_member_serial_gen.go
deleted file mode 100644
index 044a608a..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/team_member_serial_gen.go
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-// Code generated by github.com/tinylib/msgp DO NOT EDIT.
-
-import (
-	"github.com/tinylib/msgp/msgp"
-)
-
-// DecodeMsg implements msgp.Decodable
-func (z *TeamMember) DecodeMsg(dc *msgp.Reader) (err error) {
-	var zb0001 uint32
-	zb0001, err = dc.ReadArrayHeader()
-	if err != nil {
-		err = msgp.WrapError(err)
-		return
-	}
-	if zb0001 != 8 {
-		err = msgp.ArrayError{Wanted: 8, Got: zb0001}
-		return
-	}
-	z.TeamId, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "TeamId")
-		return
-	}
-	z.UserId, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "UserId")
-		return
-	}
-	z.Roles, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "Roles")
-		return
-	}
-	z.DeleteAt, err = dc.ReadInt64()
-	if err != nil {
-		err = msgp.WrapError(err, "DeleteAt")
-		return
-	}
-	z.SchemeGuest, err = dc.ReadBool()
-	if err != nil {
-		err = msgp.WrapError(err, "SchemeGuest")
-		return
-	}
-	z.SchemeUser, err = dc.ReadBool()
-	if err != nil {
-		err = msgp.WrapError(err, "SchemeUser")
-		return
-	}
-	z.SchemeAdmin, err = dc.ReadBool()
-	if err != nil {
-		err = msgp.WrapError(err, "SchemeAdmin")
-		return
-	}
-	z.ExplicitRoles, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "ExplicitRoles")
-		return
-	}
-	return
-}
-
-// EncodeMsg implements msgp.Encodable
-func (z *TeamMember) EncodeMsg(en *msgp.Writer) (err error) {
-	// array header, size 8
-	err = en.Append(0x98)
-	if err != nil {
-		return
-	}
-	err = en.WriteString(z.TeamId)
-	if err != nil {
-		err = msgp.WrapError(err, "TeamId")
-		return
-	}
-	err = en.WriteString(z.UserId)
-	if err != nil {
-		err = msgp.WrapError(err, "UserId")
-		return
-	}
-	err = en.WriteString(z.Roles)
-	if err != nil {
-		err = msgp.WrapError(err, "Roles")
-		return
-	}
-	err = en.WriteInt64(z.DeleteAt)
-	if err != nil {
-		err = msgp.WrapError(err, "DeleteAt")
-		return
-	}
-	err = en.WriteBool(z.SchemeGuest)
-	if err != nil {
-		err = msgp.WrapError(err, "SchemeGuest")
-		return
-	}
-	err = en.WriteBool(z.SchemeUser)
-	if err != nil {
-		err = msgp.WrapError(err, "SchemeUser")
-		return
-	}
-	err = en.WriteBool(z.SchemeAdmin)
-	if err != nil {
-		err = msgp.WrapError(err, "SchemeAdmin")
-		return
-	}
-	err = en.WriteString(z.ExplicitRoles)
-	if err != nil {
-		err = msgp.WrapError(err, "ExplicitRoles")
-		return
-	}
-	return
-}
-
-// MarshalMsg implements msgp.Marshaler
-func (z *TeamMember) MarshalMsg(b []byte) (o []byte, err error) {
-	o = msgp.Require(b, z.Msgsize())
-	// array header, size 8
-	o = append(o, 0x98)
-	o = msgp.AppendString(o, z.TeamId)
-	o = msgp.AppendString(o, z.UserId)
-	o = msgp.AppendString(o, z.Roles)
-	o = msgp.AppendInt64(o, z.DeleteAt)
-	o = msgp.AppendBool(o, z.SchemeGuest)
-	o = msgp.AppendBool(o, z.SchemeUser)
-	o = msgp.AppendBool(o, z.SchemeAdmin)
-	o = msgp.AppendString(o, z.ExplicitRoles)
-	return
-}
-
-// UnmarshalMsg implements msgp.Unmarshaler
-func (z *TeamMember) UnmarshalMsg(bts []byte) (o []byte, err error) {
-	var zb0001 uint32
-	zb0001, bts, err = msgp.ReadArrayHeaderBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err)
-		return
-	}
-	if zb0001 != 8 {
-		err = msgp.ArrayError{Wanted: 8, Got: zb0001}
-		return
-	}
-	z.TeamId, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "TeamId")
-		return
-	}
-	z.UserId, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "UserId")
-		return
-	}
-	z.Roles, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "Roles")
-		return
-	}
-	z.DeleteAt, bts, err = msgp.ReadInt64Bytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "DeleteAt")
-		return
-	}
-	z.SchemeGuest, bts, err = msgp.ReadBoolBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "SchemeGuest")
-		return
-	}
-	z.SchemeUser, bts, err = msgp.ReadBoolBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "SchemeUser")
-		return
-	}
-	z.SchemeAdmin, bts, err = msgp.ReadBoolBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "SchemeAdmin")
-		return
-	}
-	z.ExplicitRoles, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "ExplicitRoles")
-		return
-	}
-	o = bts
-	return
-}
-
-// Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message
-func (z *TeamMember) Msgsize() (s int) {
-	s = 1 + msgp.StringPrefixSize + len(z.TeamId) + msgp.StringPrefixSize + len(z.UserId) + msgp.StringPrefixSize + len(z.Roles) + msgp.Int64Size + msgp.BoolSize + msgp.BoolSize + msgp.BoolSize + msgp.StringPrefixSize + len(z.ExplicitRoles)
-	return
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/team_search.go b/vendor/github.com/mattermost/mattermost-server/v5/model/team_search.go
deleted file mode 100644
index e24b8438..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/team_search.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type TeamSearch struct {
-	Term                     string  `json:"term"`
-	Page                     *int    `json:"page,omitempty"`
-	PerPage                  *int    `json:"per_page,omitempty"`
-	AllowOpenInvite          *bool   `json:"allow_open_invite,omitempty"`
-	GroupConstrained         *bool   `json:"group_constrained,omitempty"`
-	IncludeGroupConstrained  *bool   `json:"include_group_constrained,omitempty"`
-	PolicyID                 *string `json:"policy_id,omitempty"`
-	ExcludePolicyConstrained *bool   `json:"exclude_policy_constrained,omitempty"`
-	IncludePolicyID          *bool   `json:"-"`
-	IncludeDeleted           *bool   `json:"-"`
-	TeamType                 *string `json:"-"`
-}
-
-func (t *TeamSearch) IsPaginated() bool {
-	return t.Page != nil && t.PerPage != nil
-}
-
-// ToJson convert a TeamSearch to json string
-func (t *TeamSearch) ToJson() string {
-	b, err := json.Marshal(t)
-	if err != nil {
-		return ""
-	}
-
-	return string(b)
-}
-
-// TeamSearchFromJson decodes the input and returns a TeamSearch
-func TeamSearchFromJson(data io.Reader) *TeamSearch {
-	decoder := json.NewDecoder(data)
-	var cs TeamSearch
-	err := decoder.Decode(&cs)
-	if err == nil {
-		return &cs
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/team_stats.go b/vendor/github.com/mattermost/mattermost-server/v5/model/team_stats.go
deleted file mode 100644
index 9209a0cf..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/team_stats.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type TeamStats struct {
-	TeamId            string `json:"team_id"`
-	TotalMemberCount  int64  `json:"total_member_count"`
-	ActiveMemberCount int64  `json:"active_member_count"`
-}
-
-func (o *TeamStats) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func TeamStatsFromJson(data io.Reader) *TeamStats {
-	var o *TeamStats
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/terms_of_service.go b/vendor/github.com/mattermost/mattermost-server/v5/model/terms_of_service.go
deleted file mode 100644
index 8ce5d350..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/terms_of_service.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"unicode/utf8"
-)
-
-const TERMS_OF_SERVICE_CACHE_SIZE = 1
-
-type TermsOfService struct {
-	Id       string `json:"id"`
-	CreateAt int64  `json:"create_at"`
-	UserId   string `json:"user_id"`
-	Text     string `json:"text"`
-}
-
-func (t *TermsOfService) IsValid() *AppError {
-	if !IsValidId(t.Id) {
-		return InvalidTermsOfServiceError("id", "")
-	}
-
-	if t.CreateAt == 0 {
-		return InvalidTermsOfServiceError("create_at", t.Id)
-	}
-
-	if !IsValidId(t.UserId) {
-		return InvalidTermsOfServiceError("user_id", t.Id)
-	}
-
-	if utf8.RuneCountInString(t.Text) > POST_MESSAGE_MAX_RUNES_V2 {
-		return InvalidTermsOfServiceError("text", t.Id)
-	}
-
-	return nil
-}
-
-func (t *TermsOfService) ToJson() string {
-	b, _ := json.Marshal(t)
-	return string(b)
-}
-
-func TermsOfServiceFromJson(data io.Reader) *TermsOfService {
-	var termsOfService *TermsOfService
-	json.NewDecoder(data).Decode(&termsOfService)
-	return termsOfService
-}
-
-func InvalidTermsOfServiceError(fieldName string, termsOfServiceId string) *AppError {
-	id := fmt.Sprintf("model.terms_of_service.is_valid.%s.app_error", fieldName)
-	details := ""
-	if termsOfServiceId != "" {
-		details = "terms_of_service_id=" + termsOfServiceId
-	}
-	return NewAppError("TermsOfService.IsValid", id, map[string]interface{}{"MaxLength": POST_MESSAGE_MAX_RUNES_V2}, details, http.StatusBadRequest)
-}
-
-func (t *TermsOfService) PreSave() {
-	if t.Id == "" {
-		t.Id = NewId()
-	}
-
-	t.CreateAt = GetMillis()
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/thread.go b/vendor/github.com/mattermost/mattermost-server/v5/model/thread.go
deleted file mode 100644
index fe4a4014..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/thread.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-)
-
-type Thread struct {
-	PostId       string      `json:"id"`
-	ChannelId    string      `json:"channel_id"`
-	ReplyCount   int64       `json:"reply_count"`
-	LastReplyAt  int64       `json:"last_reply_at"`
-	Participants StringArray `json:"participants"`
-}
-
-type ThreadResponse struct {
-	PostId         string  `json:"id"`
-	ReplyCount     int64   `json:"reply_count"`
-	LastReplyAt    int64   `json:"last_reply_at"`
-	LastViewedAt   int64   `json:"last_viewed_at"`
-	Participants   []*User `json:"participants"`
-	Post           *Post   `json:"post"`
-	UnreadReplies  int64   `json:"unread_replies"`
-	UnreadMentions int64   `json:"unread_mentions"`
-}
-
-type Threads struct {
-	Total               int64             `json:"total"`
-	TotalUnreadThreads  int64             `json:"total_unread_threads"`
-	TotalUnreadMentions int64             `json:"total_unread_mentions"`
-	Threads             []*ThreadResponse `json:"threads"`
-}
-
-type GetUserThreadsOpts struct {
-	// PageSize specifies the size of the returned chunk of results. Default = 30
-	PageSize uint64
-
-	// Extended will enrich the response with participant details. Default = false
-	Extended bool
-
-	// Deleted will specify that even deleted threads should be returned (For mobile sync). Default = false
-	Deleted bool
-
-	// Since filters the threads based on their LastUpdateAt timestamp.
-	Since uint64
-
-	// Before specifies thread id as a cursor for pagination and will return `PageSize` threads before the cursor
-	Before string
-
-	// After specifies thread id as a cursor for pagination and will return `PageSize` threads after the cursor
-	After string
-
-	// Unread will make sure that only threads with unread replies are returned
-	Unread bool
-
-	// TotalsOnly will not fetch any threads and just fetch the total counts
-	TotalsOnly bool
-
-	// TeamOnly will only fetch threads and unreads for the specified team and excludes DMs/GMs
-	TeamOnly bool
-}
-
-func (o *ThreadResponse) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func ThreadResponseFromJson(s string) (*ThreadResponse, error) {
-	var t ThreadResponse
-	err := json.Unmarshal([]byte(s), &t)
-	return &t, err
-}
-
-func (o *Threads) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func (o *Thread) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func ThreadFromJson(s string) (*Thread, error) {
-	var t Thread
-	err := json.Unmarshal([]byte(s), &t)
-	return &t, err
-}
-
-func (o *Thread) Etag() string {
-	return Etag(o.PostId, o.LastReplyAt)
-}
-
-type ThreadMembership struct {
-	PostId         string `json:"post_id"`
-	UserId         string `json:"user_id"`
-	Following      bool   `json:"following"`
-	LastViewed     int64  `json:"last_view_at"`
-	LastUpdated    int64  `json:"last_update_at"`
-	UnreadMentions int64  `json:"unread_mentions"`
-}
-
-func (o *ThreadMembership) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/token.go b/vendor/github.com/mattermost/mattermost-server/v5/model/token.go
deleted file mode 100644
index 2dcf4143..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/token.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"net/http"
-)
-
-const (
-	TOKEN_SIZE            = 64
-	MAX_TOKEN_EXIPRY_TIME = 1000 * 60 * 60 * 48 // 48 hour
-	TOKEN_TYPE_OAUTH      = "oauth"
-)
-
-type Token struct {
-	Token    string
-	CreateAt int64
-	Type     string
-	Extra    string
-}
-
-func NewToken(tokentype, extra string) *Token {
-	return &Token{
-		Token:    NewRandomString(TOKEN_SIZE),
-		CreateAt: GetMillis(),
-		Type:     tokentype,
-		Extra:    extra,
-	}
-}
-
-func (t *Token) IsValid() *AppError {
-	if len(t.Token) != TOKEN_SIZE {
-		return NewAppError("Token.IsValid", "model.token.is_valid.size", nil, "", http.StatusInternalServerError)
-	}
-
-	if t.CreateAt == 0 {
-		return NewAppError("Token.IsValid", "model.token.is_valid.expiry", nil, "", http.StatusInternalServerError)
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/typing_request.go b/vendor/github.com/mattermost/mattermost-server/v5/model/typing_request.go
deleted file mode 100644
index e2e9d3bf..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/typing_request.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type TypingRequest struct {
-	ChannelId string `json:"channel_id"`
-	ParentId  string `json:"parent_id"`
-}
-
-func (o *TypingRequest) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func TypingRequestFromJson(data io.Reader) *TypingRequest {
-	var o *TypingRequest
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/upload_session.go b/vendor/github.com/mattermost/mattermost-server/v5/model/upload_session.go
deleted file mode 100644
index c5f09083..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/upload_session.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-)
-
-// UploadType defines the type of an upload.
-type UploadType string
-
-const (
-	UploadTypeAttachment UploadType = "attachment"
-	UploadTypeImport     UploadType = "import"
-)
-
-// UploadNoUserID is a "fake" user id used by the API layer when in local mode.
-const UploadNoUserID = "nouser"
-
-// UploadSession contains information used to keep track of a file upload.
-type UploadSession struct {
-	// The unique identifier for the session.
-	Id string `json:"id"`
-	// The type of the upload.
-	Type UploadType `json:"type"`
-	// The timestamp of creation.
-	CreateAt int64 `json:"create_at"`
-	// The id of the user performing the upload.
-	UserId string `json:"user_id"`
-	// The id of the channel to upload to.
-	ChannelId string `json:"channel_id,omitempty"`
-	// The name of the file to upload.
-	Filename string `json:"filename"`
-	// The path where the file is stored.
-	Path string `json:"-"`
-	// The size of the file to upload.
-	FileSize int64 `json:"file_size"`
-	// The amount of received data in bytes. If equal to FileSize it means the
-	// upload has finished.
-	FileOffset int64 `json:"file_offset"`
-	// Id of remote cluster if uploading for shared channel
-	RemoteId string `json:"remote_id"`
-	// Requested file id if uploading for shared channel
-	ReqFileId string `json:"req_file_id"`
-}
-
-// ToJson serializes the UploadSession into JSON and returns it as string.
-func (us *UploadSession) ToJson() string {
-	b, _ := json.Marshal(us)
-	return string(b)
-}
-
-// UploadSessionsToJson serializes a list of UploadSession into JSON and
-// returns it as string.
-func UploadSessionsToJson(uss []*UploadSession) string {
-	b, _ := json.Marshal(uss)
-	return string(b)
-}
-
-// UploadSessionsFromJson deserializes a list of UploadSession from JSON data.
-func UploadSessionsFromJson(data io.Reader) []*UploadSession {
-	decoder := json.NewDecoder(data)
-	var uss []*UploadSession
-	if err := decoder.Decode(&uss); err != nil {
-		return nil
-	}
-	return uss
-}
-
-// UploadSessionFromJson deserializes the UploadSession from JSON data.
-func UploadSessionFromJson(data io.Reader) *UploadSession {
-	decoder := json.NewDecoder(data)
-	var us UploadSession
-	if err := decoder.Decode(&us); err != nil {
-		return nil
-	}
-	return &us
-}
-
-// PreSave is a utility function used to fill required information.
-func (us *UploadSession) PreSave() {
-	if us.Id == "" {
-		us.Id = NewId()
-	}
-
-	if us.CreateAt == 0 {
-		us.CreateAt = GetMillis()
-	}
-}
-
-// IsValid validates an UploadType. It returns an error in case of
-// failure.
-func (t UploadType) IsValid() error {
-	switch t {
-	case UploadTypeAttachment:
-		return nil
-	case UploadTypeImport:
-		return nil
-	default:
-	}
-	return fmt.Errorf("invalid UploadType %s", t)
-}
-
-// IsValid validates an UploadSession. It returns an error in case of
-// failure.
-func (us *UploadSession) IsValid() *AppError {
-	if !IsValidId(us.Id) {
-		return NewAppError("UploadSession.IsValid", "model.upload_session.is_valid.id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if err := us.Type.IsValid(); err != nil {
-		return NewAppError("UploadSession.IsValid", "model.upload_session.is_valid.type.app_error", nil, err.Error(), http.StatusBadRequest)
-	}
-
-	if !IsValidId(us.UserId) && us.UserId != UploadNoUserID {
-		return NewAppError("UploadSession.IsValid", "model.upload_session.is_valid.user_id.app_error", nil, "id="+us.Id, http.StatusBadRequest)
-	}
-
-	if us.Type == UploadTypeAttachment && !IsValidId(us.ChannelId) {
-		return NewAppError("UploadSession.IsValid", "model.upload_session.is_valid.channel_id.app_error", nil, "id="+us.Id, http.StatusBadRequest)
-	}
-
-	if us.CreateAt == 0 {
-		return NewAppError("UploadSession.IsValid", "model.upload_session.is_valid.create_at.app_error", nil, "id="+us.Id, http.StatusBadRequest)
-	}
-
-	if us.Filename == "" {
-		return NewAppError("UploadSession.IsValid", "model.upload_session.is_valid.filename.app_error", nil, "id="+us.Id, http.StatusBadRequest)
-	}
-
-	if us.FileSize <= 0 {
-		return NewAppError("UploadSession.IsValid", "model.upload_session.is_valid.file_size.app_error", nil, "id="+us.Id, http.StatusBadRequest)
-	}
-
-	if us.FileOffset < 0 || us.FileOffset > us.FileSize {
-		return NewAppError("UploadSession.IsValid", "model.upload_session.is_valid.file_offset.app_error", nil, "id="+us.Id, http.StatusBadRequest)
-	}
-
-	if us.Path == "" {
-		return NewAppError("UploadSession.IsValid", "model.upload_session.is_valid.path.app_error", nil, "id="+us.Id, http.StatusBadRequest)
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/user.go b/vendor/github.com/mattermost/mattermost-server/v5/model/user.go
deleted file mode 100644
index 1745d726..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/user.go
+++ /dev/null
@@ -1,1002 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"crypto/sha256"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"regexp"
-	"sort"
-	"strings"
-	"unicode/utf8"
-
-	"golang.org/x/crypto/bcrypt"
-	"golang.org/x/text/language"
-
-	"github.com/mattermost/mattermost-server/v5/services/timezones"
-	"github.com/mattermost/mattermost-server/v5/shared/mlog"
-)
-
-const (
-	ME                                 = "me"
-	USER_NOTIFY_ALL                    = "all"
-	USER_NOTIFY_HERE                   = "here"
-	USER_NOTIFY_MENTION                = "mention"
-	USER_NOTIFY_NONE                   = "none"
-	DESKTOP_NOTIFY_PROP                = "desktop"
-	DESKTOP_SOUND_NOTIFY_PROP          = "desktop_sound"
-	MARK_UNREAD_NOTIFY_PROP            = "mark_unread"
-	PUSH_NOTIFY_PROP                   = "push"
-	PUSH_STATUS_NOTIFY_PROP            = "push_status"
-	EMAIL_NOTIFY_PROP                  = "email"
-	CHANNEL_MENTIONS_NOTIFY_PROP       = "channel"
-	COMMENTS_NOTIFY_PROP               = "comments"
-	MENTION_KEYS_NOTIFY_PROP           = "mention_keys"
-	COMMENTS_NOTIFY_NEVER              = "never"
-	COMMENTS_NOTIFY_ROOT               = "root"
-	COMMENTS_NOTIFY_ANY                = "any"
-	FIRST_NAME_NOTIFY_PROP             = "first_name"
-	AUTO_RESPONDER_ACTIVE_NOTIFY_PROP  = "auto_responder_active"
-	AUTO_RESPONDER_MESSAGE_NOTIFY_PROP = "auto_responder_message"
-
-	DEFAULT_LOCALE          = "en"
-	USER_AUTH_SERVICE_EMAIL = "email"
-
-	USER_EMAIL_MAX_LENGTH     = 128
-	USER_NICKNAME_MAX_RUNES   = 64
-	USER_POSITION_MAX_RUNES   = 128
-	USER_FIRST_NAME_MAX_RUNES = 64
-	USER_LAST_NAME_MAX_RUNES  = 64
-	USER_AUTH_DATA_MAX_LENGTH = 128
-	USER_NAME_MAX_LENGTH      = 64
-	USER_NAME_MIN_LENGTH      = 1
-	USER_PASSWORD_MAX_LENGTH  = 72
-	USER_LOCALE_MAX_LENGTH    = 5
-	USER_TIMEZONE_MAX_RUNES   = 256
-)
-
-//msgp:tuple User
-
-// User contains the details about the user.
-// This struct's serializer methods are auto-generated. If a new field is added/removed,
-// please run make gen-serialized.
-type User struct {
-	Id                     string    `json:"id"`
-	CreateAt               int64     `json:"create_at,omitempty"`
-	UpdateAt               int64     `json:"update_at,omitempty"`
-	DeleteAt               int64     `json:"delete_at"`
-	Username               string    `json:"username"`
-	Password               string    `json:"password,omitempty"`
-	AuthData               *string   `json:"auth_data,omitempty"`
-	AuthService            string    `json:"auth_service"`
-	Email                  string    `json:"email"`
-	EmailVerified          bool      `json:"email_verified,omitempty"`
-	Nickname               string    `json:"nickname"`
-	FirstName              string    `json:"first_name"`
-	LastName               string    `json:"last_name"`
-	Position               string    `json:"position"`
-	Roles                  string    `json:"roles"`
-	AllowMarketing         bool      `json:"allow_marketing,omitempty"`
-	Props                  StringMap `json:"props,omitempty"`
-	NotifyProps            StringMap `json:"notify_props,omitempty"`
-	LastPasswordUpdate     int64     `json:"last_password_update,omitempty"`
-	LastPictureUpdate      int64     `json:"last_picture_update,omitempty"`
-	FailedAttempts         int       `json:"failed_attempts,omitempty"`
-	Locale                 string    `json:"locale"`
-	Timezone               StringMap `json:"timezone"`
-	MfaActive              bool      `json:"mfa_active,omitempty"`
-	MfaSecret              string    `json:"mfa_secret,omitempty"`
-	RemoteId               *string   `json:"remote_id,omitempty"`
-	LastActivityAt         int64     `db:"-" json:"last_activity_at,omitempty"`
-	IsBot                  bool      `db:"-" json:"is_bot,omitempty"`
-	BotDescription         string    `db:"-" json:"bot_description,omitempty"`
-	BotLastIconUpdate      int64     `db:"-" json:"bot_last_icon_update,omitempty"`
-	TermsOfServiceId       string    `db:"-" json:"terms_of_service_id,omitempty"`
-	TermsOfServiceCreateAt int64     `db:"-" json:"terms_of_service_create_at,omitempty"`
-	DisableWelcomeEmail    bool      `db:"-" json:"disable_welcome_email"`
-}
-
-//msgp UserMap
-
-// UserMap is a map from a userId to a user object.
-// It is used to generate methods which can be used for fast serialization/de-serialization.
-type UserMap map[string]*User
-
-//msgp:ignore UserUpdate
-type UserUpdate struct {
-	Old *User
-	New *User
-}
-
-//msgp:ignore UserPatch
-type UserPatch struct {
-	Username    *string   `json:"username"`
-	Password    *string   `json:"password,omitempty"`
-	Nickname    *string   `json:"nickname"`
-	FirstName   *string   `json:"first_name"`
-	LastName    *string   `json:"last_name"`
-	Position    *string   `json:"position"`
-	Email       *string   `json:"email"`
-	Props       StringMap `json:"props,omitempty"`
-	NotifyProps StringMap `json:"notify_props,omitempty"`
-	Locale      *string   `json:"locale"`
-	Timezone    StringMap `json:"timezone"`
-	RemoteId    *string   `json:"remote_id"`
-}
-
-//msgp:ignore UserAuth
-type UserAuth struct {
-	Password    string  `json:"password,omitempty"` // DEPRECATED: It is not used.
-	AuthData    *string `json:"auth_data,omitempty"`
-	AuthService string  `json:"auth_service,omitempty"`
-}
-
-//msgp:ignore UserForIndexing
-type UserForIndexing struct {
-	Id          string   `json:"id"`
-	Username    string   `json:"username"`
-	Nickname    string   `json:"nickname"`
-	FirstName   string   `json:"first_name"`
-	LastName    string   `json:"last_name"`
-	Roles       string   `json:"roles"`
-	CreateAt    int64    `json:"create_at"`
-	DeleteAt    int64    `json:"delete_at"`
-	TeamsIds    []string `json:"team_id"`
-	ChannelsIds []string `json:"channel_id"`
-}
-
-//msgp:ignore ViewUsersRestrictions
-type ViewUsersRestrictions struct {
-	Teams    []string
-	Channels []string
-}
-
-func (r *ViewUsersRestrictions) Hash() string {
-	if r == nil {
-		return ""
-	}
-	ids := append(r.Teams, r.Channels...)
-	sort.Strings(ids)
-	hash := sha256.New()
-	hash.Write([]byte(strings.Join(ids, "")))
-	return fmt.Sprintf("%x", hash.Sum(nil))
-}
-
-//msgp:ignore UserSlice
-type UserSlice []*User
-
-func (u UserSlice) Usernames() []string {
-	usernames := []string{}
-	for _, user := range u {
-		usernames = append(usernames, user.Username)
-	}
-	sort.Strings(usernames)
-	return usernames
-}
-
-func (u UserSlice) IDs() []string {
-	ids := []string{}
-	for _, user := range u {
-		ids = append(ids, user.Id)
-	}
-	return ids
-}
-
-func (u UserSlice) FilterWithoutBots() UserSlice {
-	var matches []*User
-
-	for _, user := range u {
-		if !user.IsBot {
-			matches = append(matches, user)
-		}
-	}
-	return UserSlice(matches)
-}
-
-func (u UserSlice) FilterByActive(active bool) UserSlice {
-	var matches []*User
-
-	for _, user := range u {
-		if user.DeleteAt == 0 && active {
-			matches = append(matches, user)
-		} else if user.DeleteAt != 0 && !active {
-			matches = append(matches, user)
-		}
-	}
-	return UserSlice(matches)
-}
-
-func (u UserSlice) FilterByID(ids []string) UserSlice {
-	var matches []*User
-	for _, user := range u {
-		for _, id := range ids {
-			if id == user.Id {
-				matches = append(matches, user)
-			}
-		}
-	}
-	return UserSlice(matches)
-}
-
-func (u UserSlice) FilterWithoutID(ids []string) UserSlice {
-	var keep []*User
-	for _, user := range u {
-		present := false
-		for _, id := range ids {
-			if id == user.Id {
-				present = true
-			}
-		}
-		if !present {
-			keep = append(keep, user)
-		}
-	}
-	return UserSlice(keep)
-}
-
-func (u *User) DeepCopy() *User {
-	copyUser := *u
-	if u.AuthData != nil {
-		copyUser.AuthData = NewString(*u.AuthData)
-	}
-	if u.Props != nil {
-		copyUser.Props = CopyStringMap(u.Props)
-	}
-	if u.NotifyProps != nil {
-		copyUser.NotifyProps = CopyStringMap(u.NotifyProps)
-	}
-	if u.Timezone != nil {
-		copyUser.Timezone = CopyStringMap(u.Timezone)
-	}
-	return &copyUser
-}
-
-// IsValid validates the user and returns an error if it isn't configured
-// correctly.
-func (u *User) IsValid() *AppError {
-
-	if !IsValidId(u.Id) {
-		return InvalidUserError("id", "")
-	}
-
-	if u.CreateAt == 0 {
-		return InvalidUserError("create_at", u.Id)
-	}
-
-	if u.UpdateAt == 0 {
-		return InvalidUserError("update_at", u.Id)
-	}
-
-	if u.IsRemote() {
-		if !IsValidUsernameAllowRemote(u.Username) {
-			return InvalidUserError("username", u.Id)
-		}
-	} else {
-		if !IsValidUsername(u.Username) {
-			return InvalidUserError("username", u.Id)
-		}
-	}
-
-	if len(u.Email) > USER_EMAIL_MAX_LENGTH || u.Email == "" || !IsValidEmail(u.Email) {
-		return InvalidUserError("email", u.Id)
-	}
-
-	if utf8.RuneCountInString(u.Nickname) > USER_NICKNAME_MAX_RUNES {
-		return InvalidUserError("nickname", u.Id)
-	}
-
-	if utf8.RuneCountInString(u.Position) > USER_POSITION_MAX_RUNES {
-		return InvalidUserError("position", u.Id)
-	}
-
-	if utf8.RuneCountInString(u.FirstName) > USER_FIRST_NAME_MAX_RUNES {
-		return InvalidUserError("first_name", u.Id)
-	}
-
-	if utf8.RuneCountInString(u.LastName) > USER_LAST_NAME_MAX_RUNES {
-		return InvalidUserError("last_name", u.Id)
-	}
-
-	if u.AuthData != nil && len(*u.AuthData) > USER_AUTH_DATA_MAX_LENGTH {
-		return InvalidUserError("auth_data", u.Id)
-	}
-
-	if u.AuthData != nil && *u.AuthData != "" && u.AuthService == "" {
-		return InvalidUserError("auth_data_type", u.Id)
-	}
-
-	if u.Password != "" && u.AuthData != nil && *u.AuthData != "" {
-		return InvalidUserError("auth_data_pwd", u.Id)
-	}
-
-	if len(u.Password) > USER_PASSWORD_MAX_LENGTH {
-		return InvalidUserError("password_limit", u.Id)
-	}
-
-	if !IsValidLocale(u.Locale) {
-		return InvalidUserError("locale", u.Id)
-	}
-
-	if len(u.Timezone) > 0 {
-		if tzJSON, err := json.Marshal(u.Timezone); err != nil {
-			return NewAppError("User.IsValid", "model.user.is_valid.marshal.app_error", nil, err.Error(), http.StatusInternalServerError)
-		} else if utf8.RuneCount(tzJSON) > USER_TIMEZONE_MAX_RUNES {
-			return InvalidUserError("timezone_limit", u.Id)
-		}
-	}
-
-	return nil
-}
-
-func InvalidUserError(fieldName string, userId string) *AppError {
-	id := fmt.Sprintf("model.user.is_valid.%s.app_error", fieldName)
-	details := ""
-	if userId != "" {
-		details = "user_id=" + userId
-	}
-	return NewAppError("User.IsValid", id, nil, details, http.StatusBadRequest)
-}
-
-func NormalizeUsername(username string) string {
-	return strings.ToLower(username)
-}
-
-func NormalizeEmail(email string) string {
-	return strings.ToLower(email)
-}
-
-// PreSave will set the Id and Username if missing.  It will also fill
-// in the CreateAt, UpdateAt times.  It will also hash the password.  It should
-// be run before saving the user to the db.
-func (u *User) PreSave() {
-	if u.Id == "" {
-		u.Id = NewId()
-	}
-
-	if u.Username == "" {
-		u.Username = NewId()
-	}
-
-	if u.AuthData != nil && *u.AuthData == "" {
-		u.AuthData = nil
-	}
-
-	u.Username = SanitizeUnicode(u.Username)
-	u.FirstName = SanitizeUnicode(u.FirstName)
-	u.LastName = SanitizeUnicode(u.LastName)
-	u.Nickname = SanitizeUnicode(u.Nickname)
-
-	u.Username = NormalizeUsername(u.Username)
-	u.Email = NormalizeEmail(u.Email)
-
-	u.CreateAt = GetMillis()
-	u.UpdateAt = u.CreateAt
-
-	u.LastPasswordUpdate = u.CreateAt
-
-	u.MfaActive = false
-
-	if u.Locale == "" {
-		u.Locale = DEFAULT_LOCALE
-	}
-
-	if u.Props == nil {
-		u.Props = make(map[string]string)
-	}
-
-	if u.NotifyProps == nil || len(u.NotifyProps) == 0 {
-		u.SetDefaultNotifications()
-	}
-
-	if u.Timezone == nil {
-		u.Timezone = timezones.DefaultUserTimezone()
-	}
-
-	if u.Password != "" {
-		u.Password = HashPassword(u.Password)
-	}
-}
-
-// PreUpdate should be run before updating the user in the db.
-func (u *User) PreUpdate() {
-	u.Username = SanitizeUnicode(u.Username)
-	u.FirstName = SanitizeUnicode(u.FirstName)
-	u.LastName = SanitizeUnicode(u.LastName)
-	u.Nickname = SanitizeUnicode(u.Nickname)
-	u.BotDescription = SanitizeUnicode(u.BotDescription)
-
-	u.Username = NormalizeUsername(u.Username)
-	u.Email = NormalizeEmail(u.Email)
-	u.UpdateAt = GetMillis()
-
-	u.FirstName = SanitizeUnicode(u.FirstName)
-	u.LastName = SanitizeUnicode(u.LastName)
-	u.Nickname = SanitizeUnicode(u.Nickname)
-	u.BotDescription = SanitizeUnicode(u.BotDescription)
-
-	if u.AuthData != nil && *u.AuthData == "" {
-		u.AuthData = nil
-	}
-
-	if u.NotifyProps == nil || len(u.NotifyProps) == 0 {
-		u.SetDefaultNotifications()
-	} else if _, ok := u.NotifyProps[MENTION_KEYS_NOTIFY_PROP]; ok {
-		// Remove any blank mention keys
-		splitKeys := strings.Split(u.NotifyProps[MENTION_KEYS_NOTIFY_PROP], ",")
-		goodKeys := []string{}
-		for _, key := range splitKeys {
-			if key != "" {
-				goodKeys = append(goodKeys, strings.ToLower(key))
-			}
-		}
-		u.NotifyProps[MENTION_KEYS_NOTIFY_PROP] = strings.Join(goodKeys, ",")
-	}
-}
-
-func (u *User) SetDefaultNotifications() {
-	u.NotifyProps = make(map[string]string)
-	u.NotifyProps[EMAIL_NOTIFY_PROP] = "true"
-	u.NotifyProps[PUSH_NOTIFY_PROP] = USER_NOTIFY_MENTION
-	u.NotifyProps[DESKTOP_NOTIFY_PROP] = USER_NOTIFY_MENTION
-	u.NotifyProps[DESKTOP_SOUND_NOTIFY_PROP] = "true"
-	u.NotifyProps[MENTION_KEYS_NOTIFY_PROP] = ""
-	u.NotifyProps[CHANNEL_MENTIONS_NOTIFY_PROP] = "true"
-	u.NotifyProps[PUSH_STATUS_NOTIFY_PROP] = STATUS_AWAY
-	u.NotifyProps[COMMENTS_NOTIFY_PROP] = COMMENTS_NOTIFY_NEVER
-	u.NotifyProps[FIRST_NAME_NOTIFY_PROP] = "false"
-}
-
-func (u *User) UpdateMentionKeysFromUsername(oldUsername string) {
-	nonUsernameKeys := []string{}
-	for _, key := range u.GetMentionKeys() {
-		if key != oldUsername && key != "@"+oldUsername {
-			nonUsernameKeys = append(nonUsernameKeys, key)
-		}
-	}
-
-	u.NotifyProps[MENTION_KEYS_NOTIFY_PROP] = ""
-	if len(nonUsernameKeys) > 0 {
-		u.NotifyProps[MENTION_KEYS_NOTIFY_PROP] += "," + strings.Join(nonUsernameKeys, ",")
-	}
-}
-
-func (u *User) GetMentionKeys() []string {
-	var keys []string
-
-	for _, key := range strings.Split(u.NotifyProps[MENTION_KEYS_NOTIFY_PROP], ",") {
-		trimmedKey := strings.TrimSpace(key)
-
-		if trimmedKey == "" {
-			continue
-		}
-
-		keys = append(keys, trimmedKey)
-	}
-
-	return keys
-}
-
-func (u *User) Patch(patch *UserPatch) {
-	if patch.Username != nil {
-		u.Username = *patch.Username
-	}
-
-	if patch.Nickname != nil {
-		u.Nickname = *patch.Nickname
-	}
-
-	if patch.FirstName != nil {
-		u.FirstName = *patch.FirstName
-	}
-
-	if patch.LastName != nil {
-		u.LastName = *patch.LastName
-	}
-
-	if patch.Position != nil {
-		u.Position = *patch.Position
-	}
-
-	if patch.Email != nil {
-		u.Email = *patch.Email
-	}
-
-	if patch.Props != nil {
-		u.Props = patch.Props
-	}
-
-	if patch.NotifyProps != nil {
-		u.NotifyProps = patch.NotifyProps
-	}
-
-	if patch.Locale != nil {
-		u.Locale = *patch.Locale
-	}
-
-	if patch.Timezone != nil {
-		u.Timezone = patch.Timezone
-	}
-
-	if patch.RemoteId != nil {
-		u.RemoteId = patch.RemoteId
-	}
-}
-
-// ToJson convert a User to a json string
-func (u *User) ToJson() string {
-	b, _ := json.Marshal(u)
-	return string(b)
-}
-
-func (u *UserPatch) ToJson() string {
-	b, _ := json.Marshal(u)
-	return string(b)
-}
-
-func (u *UserAuth) ToJson() string {
-	b, _ := json.Marshal(u)
-	return string(b)
-}
-
-// Generate a valid strong etag so the browser can cache the results
-func (u *User) Etag(showFullName, showEmail bool) string {
-	return Etag(u.Id, u.UpdateAt, u.TermsOfServiceId, u.TermsOfServiceCreateAt, showFullName, showEmail, u.BotLastIconUpdate)
-}
-
-// Remove any private data from the user object
-func (u *User) Sanitize(options map[string]bool) {
-	u.Password = ""
-	u.AuthData = NewString("")
-	u.MfaSecret = ""
-
-	if len(options) != 0 && !options["email"] {
-		u.Email = ""
-	}
-	if len(options) != 0 && !options["fullname"] {
-		u.FirstName = ""
-		u.LastName = ""
-	}
-	if len(options) != 0 && !options["passwordupdate"] {
-		u.LastPasswordUpdate = 0
-	}
-	if len(options) != 0 && !options["authservice"] {
-		u.AuthService = ""
-	}
-}
-
-// Remove any input data from the user object that is not user controlled
-func (u *User) SanitizeInput(isAdmin bool) {
-	if !isAdmin {
-		u.AuthData = NewString("")
-		u.AuthService = ""
-		u.EmailVerified = false
-	}
-	u.LastPasswordUpdate = 0
-	u.LastPictureUpdate = 0
-	u.FailedAttempts = 0
-	u.MfaActive = false
-	u.MfaSecret = ""
-	u.Email = strings.TrimSpace(u.Email)
-}
-
-func (u *User) ClearNonProfileFields() {
-	u.Password = ""
-	u.AuthData = NewString("")
-	u.MfaSecret = ""
-	u.EmailVerified = false
-	u.AllowMarketing = false
-	u.NotifyProps = StringMap{}
-	u.LastPasswordUpdate = 0
-	u.FailedAttempts = 0
-}
-
-func (u *User) SanitizeProfile(options map[string]bool) {
-	u.ClearNonProfileFields()
-
-	u.Sanitize(options)
-}
-
-func (u *User) MakeNonNil() {
-	if u.Props == nil {
-		u.Props = make(map[string]string)
-	}
-
-	if u.NotifyProps == nil {
-		u.NotifyProps = make(map[string]string)
-	}
-}
-
-func (u *User) AddNotifyProp(key string, value string) {
-	u.MakeNonNil()
-
-	u.NotifyProps[key] = value
-}
-
-func (u *User) SetCustomStatus(cs *CustomStatus) {
-	u.MakeNonNil()
-	u.Props[UserPropsKeyCustomStatus] = cs.ToJson()
-}
-
-func (u *User) ClearCustomStatus() {
-	u.MakeNonNil()
-	u.Props[UserPropsKeyCustomStatus] = ""
-}
-
-func (u *User) GetFullName() string {
-	if u.FirstName != "" && u.LastName != "" {
-		return u.FirstName + " " + u.LastName
-	} else if u.FirstName != "" {
-		return u.FirstName
-	} else if u.LastName != "" {
-		return u.LastName
-	} else {
-		return ""
-	}
-}
-
-func (u *User) getDisplayName(baseName, nameFormat string) string {
-	displayName := baseName
-
-	if nameFormat == SHOW_NICKNAME_FULLNAME {
-		if u.Nickname != "" {
-			displayName = u.Nickname
-		} else if fullName := u.GetFullName(); fullName != "" {
-			displayName = fullName
-		}
-	} else if nameFormat == SHOW_FULLNAME {
-		if fullName := u.GetFullName(); fullName != "" {
-			displayName = fullName
-		}
-	}
-
-	return displayName
-}
-
-func (u *User) GetDisplayName(nameFormat string) string {
-	displayName := u.Username
-
-	return u.getDisplayName(displayName, nameFormat)
-}
-
-func (u *User) GetDisplayNameWithPrefix(nameFormat, prefix string) string {
-	displayName := prefix + u.Username
-
-	return u.getDisplayName(displayName, nameFormat)
-}
-
-func (u *User) GetRoles() []string {
-	return strings.Fields(u.Roles)
-}
-
-func (u *User) GetRawRoles() string {
-	return u.Roles
-}
-
-func IsValidUserRoles(userRoles string) bool {
-
-	roles := strings.Fields(userRoles)
-
-	for _, r := range roles {
-		if !IsValidRoleName(r) {
-			return false
-		}
-	}
-
-	// Exclude just the system_admin role explicitly to prevent mistakes
-	if len(roles) == 1 && roles[0] == "system_admin" {
-		return false
-	}
-
-	return true
-}
-
-// Make sure you acually want to use this function. In context.go there are functions to check permissions
-// This function should not be used to check permissions.
-func (u *User) IsGuest() bool {
-	return IsInRole(u.Roles, SYSTEM_GUEST_ROLE_ID)
-}
-
-func (u *User) IsSystemAdmin() bool {
-	return IsInRole(u.Roles, SYSTEM_ADMIN_ROLE_ID)
-}
-
-// Make sure you acually want to use this function. In context.go there are functions to check permissions
-// This function should not be used to check permissions.
-func (u *User) IsInRole(inRole string) bool {
-	return IsInRole(u.Roles, inRole)
-}
-
-// Make sure you acually want to use this function. In context.go there are functions to check permissions
-// This function should not be used to check permissions.
-func IsInRole(userRoles string, inRole string) bool {
-	roles := strings.Split(userRoles, " ")
-
-	for _, r := range roles {
-		if r == inRole {
-			return true
-		}
-	}
-
-	return false
-}
-
-func (u *User) IsSSOUser() bool {
-	return u.AuthService != "" && u.AuthService != USER_AUTH_SERVICE_EMAIL
-}
-
-func (u *User) IsOAuthUser() bool {
-	return u.AuthService == SERVICE_GITLAB ||
-		u.AuthService == SERVICE_GOOGLE ||
-		u.AuthService == SERVICE_OFFICE365 ||
-		u.AuthService == SERVICE_OPENID
-}
-
-func (u *User) IsLDAPUser() bool {
-	return u.AuthService == USER_AUTH_SERVICE_LDAP
-}
-
-func (u *User) IsSAMLUser() bool {
-	return u.AuthService == USER_AUTH_SERVICE_SAML
-}
-
-func (u *User) GetPreferredTimezone() string {
-	return GetPreferredTimezone(u.Timezone)
-}
-
-// IsRemote returns true if the user belongs to a remote cluster (has RemoteId).
-func (u *User) IsRemote() bool {
-	return u.RemoteId != nil && *u.RemoteId != ""
-}
-
-// GetRemoteID returns the remote id for this user or "" if not a remote user.
-func (u *User) GetRemoteID() string {
-	if u.RemoteId != nil {
-		return *u.RemoteId
-	}
-	return ""
-}
-
-// GetProp fetches a prop value by name.
-func (u *User) GetProp(name string) (string, bool) {
-	val, ok := u.Props[name]
-	return val, ok
-}
-
-// SetProp sets a prop value by name, creating the map if nil.
-// Not thread safe.
-func (u *User) SetProp(name string, value string) {
-	if u.Props == nil {
-		u.Props = make(map[string]string)
-	}
-	u.Props[name] = value
-}
-
-func (u *User) ToPatch() *UserPatch {
-	return &UserPatch{
-		Username: &u.Username, Password: &u.Password,
-		Nickname: &u.Nickname, FirstName: &u.FirstName, LastName: &u.LastName,
-		Position: &u.Position, Email: &u.Email,
-		Props: u.Props, NotifyProps: u.NotifyProps,
-		Locale: &u.Locale, Timezone: u.Timezone,
-	}
-}
-
-func (u *UserPatch) SetField(fieldName string, fieldValue string) {
-	switch fieldName {
-	case "FirstName":
-		u.FirstName = &fieldValue
-	case "LastName":
-		u.LastName = &fieldValue
-	case "Nickname":
-		u.Nickname = &fieldValue
-	case "Email":
-		u.Email = &fieldValue
-	case "Position":
-		u.Position = &fieldValue
-	case "Username":
-		u.Username = &fieldValue
-	}
-}
-
-// UserFromJson will decode the input and return a User
-func UserFromJson(data io.Reader) *User {
-	var user *User
-	json.NewDecoder(data).Decode(&user)
-	return user
-}
-
-func UserPatchFromJson(data io.Reader) *UserPatch {
-	var user *UserPatch
-	json.NewDecoder(data).Decode(&user)
-	return user
-}
-
-func UserAuthFromJson(data io.Reader) *UserAuth {
-	var user *UserAuth
-	json.NewDecoder(data).Decode(&user)
-	return user
-}
-
-func UserMapToJson(u map[string]*User) string {
-	b, _ := json.Marshal(u)
-	return string(b)
-}
-
-func UserMapFromJson(data io.Reader) map[string]*User {
-	var users map[string]*User
-	json.NewDecoder(data).Decode(&users)
-	return users
-}
-
-func UserListToJson(u []*User) string {
-	b, _ := json.Marshal(u)
-	return string(b)
-}
-
-func UserListFromJson(data io.Reader) []*User {
-	var users []*User
-	json.NewDecoder(data).Decode(&users)
-	return users
-}
-
-// HashPassword generates a hash using the bcrypt.GenerateFromPassword
-func HashPassword(password string) string {
-	hash, err := bcrypt.GenerateFromPassword([]byte(password), 10)
-	if err != nil {
-		panic(err)
-	}
-
-	return string(hash)
-}
-
-// ComparePassword compares the hash
-// This function is deprecated and will be removed in a future release.
-func ComparePassword(hash string, password string) bool {
-
-	if password == "" || hash == "" {
-		return false
-	}
-
-	err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(password))
-	return err == nil
-}
-
-var validUsernameChars = regexp.MustCompile(`^[a-z0-9\.\-_]+$`)
-var validUsernameCharsForRemote = regexp.MustCompile(`^[a-z0-9\.\-_:]+$`)
-
-var restrictedUsernames = map[string]struct{}{
-	"all":       {},
-	"channel":   {},
-	"matterbot": {},
-	"system":    {},
-}
-
-func IsValidUsername(s string) bool {
-	if len(s) < USER_NAME_MIN_LENGTH || len(s) > USER_NAME_MAX_LENGTH {
-		return false
-	}
-
-	if !validUsernameChars.MatchString(s) {
-		return false
-	}
-
-	_, found := restrictedUsernames[s]
-	return !found
-}
-
-func IsValidUsernameAllowRemote(s string) bool {
-	if len(s) < USER_NAME_MIN_LENGTH || len(s) > USER_NAME_MAX_LENGTH {
-		return false
-	}
-
-	if !validUsernameCharsForRemote.MatchString(s) {
-		return false
-	}
-
-	_, found := restrictedUsernames[s]
-	return !found
-}
-
-func CleanUsername(username string) string {
-	s := NormalizeUsername(strings.Replace(username, " ", "-", -1))
-
-	for _, value := range reservedName {
-		if s == value {
-			s = strings.Replace(s, value, "", -1)
-		}
-	}
-
-	s = strings.TrimSpace(s)
-
-	for _, c := range s {
-		char := fmt.Sprintf("%c", c)
-		if !validUsernameChars.MatchString(char) {
-			s = strings.Replace(s, char, "-", -1)
-		}
-	}
-
-	s = strings.Trim(s, "-")
-
-	if !IsValidUsername(s) {
-		s = "a" + NewId()
-		mlog.Warn("Generating new username since provided username was invalid",
-			mlog.String("provided_username", username), mlog.String("new_username", s))
-	}
-
-	return s
-}
-
-func IsValidUserNotifyLevel(notifyLevel string) bool {
-	return notifyLevel == CHANNEL_NOTIFY_ALL ||
-		notifyLevel == CHANNEL_NOTIFY_MENTION ||
-		notifyLevel == CHANNEL_NOTIFY_NONE
-}
-
-func IsValidPushStatusNotifyLevel(notifyLevel string) bool {
-	return notifyLevel == STATUS_ONLINE ||
-		notifyLevel == STATUS_AWAY ||
-		notifyLevel == STATUS_OFFLINE
-}
-
-func IsValidCommentsNotifyLevel(notifyLevel string) bool {
-	return notifyLevel == COMMENTS_NOTIFY_ANY ||
-		notifyLevel == COMMENTS_NOTIFY_ROOT ||
-		notifyLevel == COMMENTS_NOTIFY_NEVER
-}
-
-func IsValidEmailBatchingInterval(emailInterval string) bool {
-	return emailInterval == PREFERENCE_EMAIL_INTERVAL_IMMEDIATELY ||
-		emailInterval == PREFERENCE_EMAIL_INTERVAL_FIFTEEN ||
-		emailInterval == PREFERENCE_EMAIL_INTERVAL_HOUR
-}
-
-func IsValidLocale(locale string) bool {
-	if locale != "" {
-		if len(locale) > USER_LOCALE_MAX_LENGTH {
-			return false
-		} else if _, err := language.Parse(locale); err != nil {
-			return false
-		}
-	}
-
-	return true
-}
-
-//msgp:ignore UserWithGroups
-type UserWithGroups struct {
-	User
-	GroupIDs    *string  `json:"-"`
-	Groups      []*Group `json:"groups"`
-	SchemeGuest bool     `json:"scheme_guest"`
-	SchemeUser  bool     `json:"scheme_user"`
-	SchemeAdmin bool     `json:"scheme_admin"`
-}
-
-func (u *UserWithGroups) GetGroupIDs() []string {
-	if u.GroupIDs == nil {
-		return nil
-	}
-	trimmed := strings.TrimSpace(*u.GroupIDs)
-	if trimmed == "" {
-		return nil
-	}
-	return strings.Split(trimmed, ",")
-}
-
-//msgp:ignore UsersWithGroupsAndCount
-type UsersWithGroupsAndCount struct {
-	Users []*UserWithGroups `json:"users"`
-	Count int64             `json:"total_count"`
-}
-
-func UsersWithGroupsAndCountFromJson(data io.Reader) *UsersWithGroupsAndCount {
-	uwg := &UsersWithGroupsAndCount{}
-	bodyBytes, _ := ioutil.ReadAll(data)
-	json.Unmarshal(bodyBytes, uwg)
-	return uwg
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/user_access_token.go b/vendor/github.com/mattermost/mattermost-server/v5/model/user_access_token.go
deleted file mode 100644
index f458a6d9..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/user_access_token.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-)
-
-type UserAccessToken struct {
-	Id          string `json:"id"`
-	Token       string `json:"token,omitempty"`
-	UserId      string `json:"user_id"`
-	Description string `json:"description"`
-	IsActive    bool   `json:"is_active"`
-}
-
-func (t *UserAccessToken) IsValid() *AppError {
-	if !IsValidId(t.Id) {
-		return NewAppError("UserAccessToken.IsValid", "model.user_access_token.is_valid.id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(t.Token) != 26 {
-		return NewAppError("UserAccessToken.IsValid", "model.user_access_token.is_valid.token.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if !IsValidId(t.UserId) {
-		return NewAppError("UserAccessToken.IsValid", "model.user_access_token.is_valid.user_id.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	if len(t.Description) > 255 {
-		return NewAppError("UserAccessToken.IsValid", "model.user_access_token.is_valid.description.app_error", nil, "", http.StatusBadRequest)
-	}
-
-	return nil
-}
-
-func (t *UserAccessToken) PreSave() {
-	t.Id = NewId()
-	t.IsActive = true
-}
-
-func (t *UserAccessToken) ToJson() string {
-	b, _ := json.Marshal(t)
-	return string(b)
-}
-
-func UserAccessTokenFromJson(data io.Reader) *UserAccessToken {
-	var t *UserAccessToken
-	json.NewDecoder(data).Decode(&t)
-	return t
-}
-
-func UserAccessTokenListToJson(t []*UserAccessToken) string {
-	b, _ := json.Marshal(t)
-	return string(b)
-}
-
-func UserAccessTokenListFromJson(data io.Reader) []*UserAccessToken {
-	var t []*UserAccessToken
-	json.NewDecoder(data).Decode(&t)
-	return t
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/user_access_token_search.go b/vendor/github.com/mattermost/mattermost-server/v5/model/user_access_token_search.go
deleted file mode 100644
index a692f692..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/user_access_token_search.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type UserAccessTokenSearch struct {
-	Term string `json:"term"`
-}
-
-// ToJson convert a UserAccessTokenSearch to json string
-func (c *UserAccessTokenSearch) ToJson() string {
-	b, err := json.Marshal(c)
-	if err != nil {
-		return ""
-	}
-
-	return string(b)
-}
-
-// UserAccessTokenSearchJson decodes the input and returns a UserAccessTokenSearch
-func UserAccessTokenSearchFromJson(data io.Reader) *UserAccessTokenSearch {
-	decoder := json.NewDecoder(data)
-	var cs UserAccessTokenSearch
-	err := decoder.Decode(&cs)
-	if err == nil {
-		return &cs
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/user_autocomplete.go b/vendor/github.com/mattermost/mattermost-server/v5/model/user_autocomplete.go
deleted file mode 100644
index 118e138d..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/user_autocomplete.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type UserAutocompleteInChannel struct {
-	InChannel    []*User `json:"in_channel"`
-	OutOfChannel []*User `json:"out_of_channel"`
-}
-
-type UserAutocompleteInTeam struct {
-	InTeam []*User `json:"in_team"`
-}
-
-type UserAutocomplete struct {
-	Users        []*User `json:"users"`
-	OutOfChannel []*User `json:"out_of_channel,omitempty"`
-}
-
-func (o *UserAutocomplete) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func UserAutocompleteFromJson(data io.Reader) *UserAutocomplete {
-	decoder := json.NewDecoder(data)
-	autocomplete := new(UserAutocomplete)
-	err := decoder.Decode(&autocomplete)
-	if err != nil {
-		return nil
-	}
-	return autocomplete
-}
-
-func (o *UserAutocompleteInChannel) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func UserAutocompleteInChannelFromJson(data io.Reader) *UserAutocompleteInChannel {
-	var o *UserAutocompleteInChannel
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
-
-func (o *UserAutocompleteInTeam) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func UserAutocompleteInTeamFromJson(data io.Reader) *UserAutocompleteInTeam {
-	var o *UserAutocompleteInTeam
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/user_count.go b/vendor/github.com/mattermost/mattermost-server/v5/model/user_count.go
deleted file mode 100644
index ee474883..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/user_count.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-// Options for counting users
-type UserCountOptions struct {
-	// Should include users that are bots
-	IncludeBotAccounts bool
-	// Should include deleted users (of any type)
-	IncludeDeleted bool
-	// Exclude regular users
-	ExcludeRegularUsers bool
-	// Only include users on a specific team. "" for any team.
-	TeamId string
-	// Only include users on a specific channel. "" for any channel.
-	ChannelId string
-	// Restrict to search in a list of teams and channels
-	ViewRestrictions *ViewUsersRestrictions
-	// Only include users matching any of the given system wide roles.
-	Roles []string
-	// Only include users matching any of the given channel roles, must be used with ChannelId.
-	ChannelRoles []string
-	// Only include users matching any of the given team roles, must be used with TeamId.
-	TeamRoles []string
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/user_get.go b/vendor/github.com/mattermost/mattermost-server/v5/model/user_get.go
deleted file mode 100644
index 2748d735..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/user_get.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-type UserGetOptions struct {
-	// Filters the users in the team
-	InTeamId string
-	// Filters the users not in the team
-	NotInTeamId string
-	// Filters the users in the channel
-	InChannelId string
-	// Filters the users not in the channel
-	NotInChannelId string
-	// Filters the users in the group
-	InGroupId string
-	// Filters the users group constrained
-	GroupConstrained bool
-	// Filters the users without a team
-	WithoutTeam bool
-	// Filters the inactive users
-	Inactive bool
-	// Filters the active users
-	Active bool
-	// Filters for the given role
-	Role string
-	// Filters for users matching any of the given system wide roles
-	Roles []string
-	// Filters for users matching any of the given channel roles, must be used with InChannelId
-	ChannelRoles []string
-	// Filters for users matching any of the given team roles, must be used with InTeamId
-	TeamRoles []string
-	// Sorting option
-	Sort string
-	// Restrict to search in a list of teams and channels
-	ViewRestrictions *ViewUsersRestrictions
-	// Page
-	Page int
-	// Page size
-	PerPage int
-}
-
-type UserGetByIdsOptions struct {
-	// Since filters the users based on their UpdateAt timestamp.
-	Since int64
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/user_search.go b/vendor/github.com/mattermost/mattermost-server/v5/model/user_search.go
deleted file mode 100644
index 0a721eac..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/user_search.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-const USER_SEARCH_MAX_LIMIT = 1000
-const USER_SEARCH_DEFAULT_LIMIT = 100
-
-// UserSearch captures the parameters provided by a client for initiating a user search.
-type UserSearch struct {
-	Term             string   `json:"term"`
-	TeamId           string   `json:"team_id"`
-	NotInTeamId      string   `json:"not_in_team_id"`
-	InChannelId      string   `json:"in_channel_id"`
-	NotInChannelId   string   `json:"not_in_channel_id"`
-	InGroupId        string   `json:"in_group_id"`
-	GroupConstrained bool     `json:"group_constrained"`
-	AllowInactive    bool     `json:"allow_inactive"`
-	WithoutTeam      bool     `json:"without_team"`
-	Limit            int      `json:"limit"`
-	Role             string   `json:"role"`
-	Roles            []string `json:"roles"`
-	ChannelRoles     []string `json:"channel_roles"`
-	TeamRoles        []string `json:"team_roles"`
-}
-
-// ToJson convert a User to a json string
-func (u *UserSearch) ToJson() []byte {
-	b, _ := json.Marshal(u)
-	return b
-}
-
-// UserSearchFromJson will decode the input and return a User
-func UserSearchFromJson(data io.Reader) *UserSearch {
-	us := UserSearch{}
-	json.NewDecoder(data).Decode(&us)
-
-	if us.Limit == 0 {
-		us.Limit = USER_SEARCH_DEFAULT_LIMIT
-	}
-
-	return &us
-}
-
-// UserSearchOptions captures internal parameters derived from the user's permissions and a
-// UserSearch request.
-type UserSearchOptions struct {
-	// IsAdmin tracks whether or not the search is being conducted by an administrator.
-	IsAdmin bool
-	// AllowEmails allows search to examine the emails of users.
-	AllowEmails bool
-	// AllowFullNames allows search to examine the full names of users, vs. just usernames and nicknames.
-	AllowFullNames bool
-	// AllowInactive configures whether or not to return inactive users in the search results.
-	AllowInactive bool
-	// Narrows the search to the group constrained users
-	GroupConstrained bool
-	// Limit limits the total number of results returned.
-	Limit int
-	// Filters for the given role
-	Role string
-	// Filters for users that have any of the given system roles
-	Roles []string
-	// Filters for users that have the given channel roles to be used when searching in a channel
-	ChannelRoles []string
-	// Filters for users that have the given team roles to be used when searching in a team
-	TeamRoles []string
-	// Restrict to search in a list of teams and channels
-	ViewRestrictions *ViewUsersRestrictions
-	// List of allowed channels
-	ListOfAllowedChannels []string
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/user_serial_gen.go b/vendor/github.com/mattermost/mattermost-server/v5/model/user_serial_gen.go
deleted file mode 100644
index fb40b577..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/user_serial_gen.go
+++ /dev/null
@@ -1,826 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-// Code generated by github.com/tinylib/msgp DO NOT EDIT.
-
-import (
-	"github.com/tinylib/msgp/msgp"
-)
-
-// DecodeMsg implements msgp.Decodable
-func (z *User) DecodeMsg(dc *msgp.Reader) (err error) {
-	var zb0001 uint32
-	zb0001, err = dc.ReadArrayHeader()
-	if err != nil {
-		err = msgp.WrapError(err)
-		return
-	}
-	if zb0001 != 32 {
-		err = msgp.ArrayError{Wanted: 32, Got: zb0001}
-		return
-	}
-	z.Id, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "Id")
-		return
-	}
-	z.CreateAt, err = dc.ReadInt64()
-	if err != nil {
-		err = msgp.WrapError(err, "CreateAt")
-		return
-	}
-	z.UpdateAt, err = dc.ReadInt64()
-	if err != nil {
-		err = msgp.WrapError(err, "UpdateAt")
-		return
-	}
-	z.DeleteAt, err = dc.ReadInt64()
-	if err != nil {
-		err = msgp.WrapError(err, "DeleteAt")
-		return
-	}
-	z.Username, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "Username")
-		return
-	}
-	z.Password, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "Password")
-		return
-	}
-	if dc.IsNil() {
-		err = dc.ReadNil()
-		if err != nil {
-			err = msgp.WrapError(err, "AuthData")
-			return
-		}
-		z.AuthData = nil
-	} else {
-		if z.AuthData == nil {
-			z.AuthData = new(string)
-		}
-		*z.AuthData, err = dc.ReadString()
-		if err != nil {
-			err = msgp.WrapError(err, "AuthData")
-			return
-		}
-	}
-	z.AuthService, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "AuthService")
-		return
-	}
-	z.Email, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "Email")
-		return
-	}
-	z.EmailVerified, err = dc.ReadBool()
-	if err != nil {
-		err = msgp.WrapError(err, "EmailVerified")
-		return
-	}
-	z.Nickname, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "Nickname")
-		return
-	}
-	z.FirstName, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "FirstName")
-		return
-	}
-	z.LastName, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "LastName")
-		return
-	}
-	z.Position, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "Position")
-		return
-	}
-	z.Roles, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "Roles")
-		return
-	}
-	z.AllowMarketing, err = dc.ReadBool()
-	if err != nil {
-		err = msgp.WrapError(err, "AllowMarketing")
-		return
-	}
-	err = z.Props.DecodeMsg(dc)
-	if err != nil {
-		err = msgp.WrapError(err, "Props")
-		return
-	}
-	err = z.NotifyProps.DecodeMsg(dc)
-	if err != nil {
-		err = msgp.WrapError(err, "NotifyProps")
-		return
-	}
-	z.LastPasswordUpdate, err = dc.ReadInt64()
-	if err != nil {
-		err = msgp.WrapError(err, "LastPasswordUpdate")
-		return
-	}
-	z.LastPictureUpdate, err = dc.ReadInt64()
-	if err != nil {
-		err = msgp.WrapError(err, "LastPictureUpdate")
-		return
-	}
-	z.FailedAttempts, err = dc.ReadInt()
-	if err != nil {
-		err = msgp.WrapError(err, "FailedAttempts")
-		return
-	}
-	z.Locale, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "Locale")
-		return
-	}
-	err = z.Timezone.DecodeMsg(dc)
-	if err != nil {
-		err = msgp.WrapError(err, "Timezone")
-		return
-	}
-	z.MfaActive, err = dc.ReadBool()
-	if err != nil {
-		err = msgp.WrapError(err, "MfaActive")
-		return
-	}
-	z.MfaSecret, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "MfaSecret")
-		return
-	}
-	if dc.IsNil() {
-		err = dc.ReadNil()
-		if err != nil {
-			err = msgp.WrapError(err, "RemoteId")
-			return
-		}
-		z.RemoteId = nil
-	} else {
-		if z.RemoteId == nil {
-			z.RemoteId = new(string)
-		}
-		*z.RemoteId, err = dc.ReadString()
-		if err != nil {
-			err = msgp.WrapError(err, "RemoteId")
-			return
-		}
-	}
-	z.LastActivityAt, err = dc.ReadInt64()
-	if err != nil {
-		err = msgp.WrapError(err, "LastActivityAt")
-		return
-	}
-	z.IsBot, err = dc.ReadBool()
-	if err != nil {
-		err = msgp.WrapError(err, "IsBot")
-		return
-	}
-	z.BotDescription, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "BotDescription")
-		return
-	}
-	z.BotLastIconUpdate, err = dc.ReadInt64()
-	if err != nil {
-		err = msgp.WrapError(err, "BotLastIconUpdate")
-		return
-	}
-	z.TermsOfServiceId, err = dc.ReadString()
-	if err != nil {
-		err = msgp.WrapError(err, "TermsOfServiceId")
-		return
-	}
-	z.TermsOfServiceCreateAt, err = dc.ReadInt64()
-	if err != nil {
-		err = msgp.WrapError(err, "TermsOfServiceCreateAt")
-		return
-	}
-	return
-}
-
-// EncodeMsg implements msgp.Encodable
-func (z *User) EncodeMsg(en *msgp.Writer) (err error) {
-	// array header, size 32
-	err = en.Append(0xdc, 0x0, 0x20)
-	if err != nil {
-		return
-	}
-	err = en.WriteString(z.Id)
-	if err != nil {
-		err = msgp.WrapError(err, "Id")
-		return
-	}
-	err = en.WriteInt64(z.CreateAt)
-	if err != nil {
-		err = msgp.WrapError(err, "CreateAt")
-		return
-	}
-	err = en.WriteInt64(z.UpdateAt)
-	if err != nil {
-		err = msgp.WrapError(err, "UpdateAt")
-		return
-	}
-	err = en.WriteInt64(z.DeleteAt)
-	if err != nil {
-		err = msgp.WrapError(err, "DeleteAt")
-		return
-	}
-	err = en.WriteString(z.Username)
-	if err != nil {
-		err = msgp.WrapError(err, "Username")
-		return
-	}
-	err = en.WriteString(z.Password)
-	if err != nil {
-		err = msgp.WrapError(err, "Password")
-		return
-	}
-	if z.AuthData == nil {
-		err = en.WriteNil()
-		if err != nil {
-			return
-		}
-	} else {
-		err = en.WriteString(*z.AuthData)
-		if err != nil {
-			err = msgp.WrapError(err, "AuthData")
-			return
-		}
-	}
-	err = en.WriteString(z.AuthService)
-	if err != nil {
-		err = msgp.WrapError(err, "AuthService")
-		return
-	}
-	err = en.WriteString(z.Email)
-	if err != nil {
-		err = msgp.WrapError(err, "Email")
-		return
-	}
-	err = en.WriteBool(z.EmailVerified)
-	if err != nil {
-		err = msgp.WrapError(err, "EmailVerified")
-		return
-	}
-	err = en.WriteString(z.Nickname)
-	if err != nil {
-		err = msgp.WrapError(err, "Nickname")
-		return
-	}
-	err = en.WriteString(z.FirstName)
-	if err != nil {
-		err = msgp.WrapError(err, "FirstName")
-		return
-	}
-	err = en.WriteString(z.LastName)
-	if err != nil {
-		err = msgp.WrapError(err, "LastName")
-		return
-	}
-	err = en.WriteString(z.Position)
-	if err != nil {
-		err = msgp.WrapError(err, "Position")
-		return
-	}
-	err = en.WriteString(z.Roles)
-	if err != nil {
-		err = msgp.WrapError(err, "Roles")
-		return
-	}
-	err = en.WriteBool(z.AllowMarketing)
-	if err != nil {
-		err = msgp.WrapError(err, "AllowMarketing")
-		return
-	}
-	err = z.Props.EncodeMsg(en)
-	if err != nil {
-		err = msgp.WrapError(err, "Props")
-		return
-	}
-	err = z.NotifyProps.EncodeMsg(en)
-	if err != nil {
-		err = msgp.WrapError(err, "NotifyProps")
-		return
-	}
-	err = en.WriteInt64(z.LastPasswordUpdate)
-	if err != nil {
-		err = msgp.WrapError(err, "LastPasswordUpdate")
-		return
-	}
-	err = en.WriteInt64(z.LastPictureUpdate)
-	if err != nil {
-		err = msgp.WrapError(err, "LastPictureUpdate")
-		return
-	}
-	err = en.WriteInt(z.FailedAttempts)
-	if err != nil {
-		err = msgp.WrapError(err, "FailedAttempts")
-		return
-	}
-	err = en.WriteString(z.Locale)
-	if err != nil {
-		err = msgp.WrapError(err, "Locale")
-		return
-	}
-	err = z.Timezone.EncodeMsg(en)
-	if err != nil {
-		err = msgp.WrapError(err, "Timezone")
-		return
-	}
-	err = en.WriteBool(z.MfaActive)
-	if err != nil {
-		err = msgp.WrapError(err, "MfaActive")
-		return
-	}
-	err = en.WriteString(z.MfaSecret)
-	if err != nil {
-		err = msgp.WrapError(err, "MfaSecret")
-		return
-	}
-	if z.RemoteId == nil {
-		err = en.WriteNil()
-		if err != nil {
-			return
-		}
-	} else {
-		err = en.WriteString(*z.RemoteId)
-		if err != nil {
-			err = msgp.WrapError(err, "RemoteId")
-			return
-		}
-	}
-	err = en.WriteInt64(z.LastActivityAt)
-	if err != nil {
-		err = msgp.WrapError(err, "LastActivityAt")
-		return
-	}
-	err = en.WriteBool(z.IsBot)
-	if err != nil {
-		err = msgp.WrapError(err, "IsBot")
-		return
-	}
-	err = en.WriteString(z.BotDescription)
-	if err != nil {
-		err = msgp.WrapError(err, "BotDescription")
-		return
-	}
-	err = en.WriteInt64(z.BotLastIconUpdate)
-	if err != nil {
-		err = msgp.WrapError(err, "BotLastIconUpdate")
-		return
-	}
-	err = en.WriteString(z.TermsOfServiceId)
-	if err != nil {
-		err = msgp.WrapError(err, "TermsOfServiceId")
-		return
-	}
-	err = en.WriteInt64(z.TermsOfServiceCreateAt)
-	if err != nil {
-		err = msgp.WrapError(err, "TermsOfServiceCreateAt")
-		return
-	}
-	return
-}
-
-// MarshalMsg implements msgp.Marshaler
-func (z *User) MarshalMsg(b []byte) (o []byte, err error) {
-	o = msgp.Require(b, z.Msgsize())
-	// array header, size 32
-	o = append(o, 0xdc, 0x0, 0x20)
-	o = msgp.AppendString(o, z.Id)
-	o = msgp.AppendInt64(o, z.CreateAt)
-	o = msgp.AppendInt64(o, z.UpdateAt)
-	o = msgp.AppendInt64(o, z.DeleteAt)
-	o = msgp.AppendString(o, z.Username)
-	o = msgp.AppendString(o, z.Password)
-	if z.AuthData == nil {
-		o = msgp.AppendNil(o)
-	} else {
-		o = msgp.AppendString(o, *z.AuthData)
-	}
-	o = msgp.AppendString(o, z.AuthService)
-	o = msgp.AppendString(o, z.Email)
-	o = msgp.AppendBool(o, z.EmailVerified)
-	o = msgp.AppendString(o, z.Nickname)
-	o = msgp.AppendString(o, z.FirstName)
-	o = msgp.AppendString(o, z.LastName)
-	o = msgp.AppendString(o, z.Position)
-	o = msgp.AppendString(o, z.Roles)
-	o = msgp.AppendBool(o, z.AllowMarketing)
-	o, err = z.Props.MarshalMsg(o)
-	if err != nil {
-		err = msgp.WrapError(err, "Props")
-		return
-	}
-	o, err = z.NotifyProps.MarshalMsg(o)
-	if err != nil {
-		err = msgp.WrapError(err, "NotifyProps")
-		return
-	}
-	o = msgp.AppendInt64(o, z.LastPasswordUpdate)
-	o = msgp.AppendInt64(o, z.LastPictureUpdate)
-	o = msgp.AppendInt(o, z.FailedAttempts)
-	o = msgp.AppendString(o, z.Locale)
-	o, err = z.Timezone.MarshalMsg(o)
-	if err != nil {
-		err = msgp.WrapError(err, "Timezone")
-		return
-	}
-	o = msgp.AppendBool(o, z.MfaActive)
-	o = msgp.AppendString(o, z.MfaSecret)
-	if z.RemoteId == nil {
-		o = msgp.AppendNil(o)
-	} else {
-		o = msgp.AppendString(o, *z.RemoteId)
-	}
-	o = msgp.AppendInt64(o, z.LastActivityAt)
-	o = msgp.AppendBool(o, z.IsBot)
-	o = msgp.AppendString(o, z.BotDescription)
-	o = msgp.AppendInt64(o, z.BotLastIconUpdate)
-	o = msgp.AppendString(o, z.TermsOfServiceId)
-	o = msgp.AppendInt64(o, z.TermsOfServiceCreateAt)
-	return
-}
-
-// UnmarshalMsg implements msgp.Unmarshaler
-func (z *User) UnmarshalMsg(bts []byte) (o []byte, err error) {
-	var zb0001 uint32
-	zb0001, bts, err = msgp.ReadArrayHeaderBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err)
-		return
-	}
-	if zb0001 != 32 {
-		err = msgp.ArrayError{Wanted: 32, Got: zb0001}
-		return
-	}
-	z.Id, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "Id")
-		return
-	}
-	z.CreateAt, bts, err = msgp.ReadInt64Bytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "CreateAt")
-		return
-	}
-	z.UpdateAt, bts, err = msgp.ReadInt64Bytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "UpdateAt")
-		return
-	}
-	z.DeleteAt, bts, err = msgp.ReadInt64Bytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "DeleteAt")
-		return
-	}
-	z.Username, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "Username")
-		return
-	}
-	z.Password, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "Password")
-		return
-	}
-	if msgp.IsNil(bts) {
-		bts, err = msgp.ReadNilBytes(bts)
-		if err != nil {
-			return
-		}
-		z.AuthData = nil
-	} else {
-		if z.AuthData == nil {
-			z.AuthData = new(string)
-		}
-		*z.AuthData, bts, err = msgp.ReadStringBytes(bts)
-		if err != nil {
-			err = msgp.WrapError(err, "AuthData")
-			return
-		}
-	}
-	z.AuthService, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "AuthService")
-		return
-	}
-	z.Email, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "Email")
-		return
-	}
-	z.EmailVerified, bts, err = msgp.ReadBoolBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "EmailVerified")
-		return
-	}
-	z.Nickname, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "Nickname")
-		return
-	}
-	z.FirstName, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "FirstName")
-		return
-	}
-	z.LastName, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "LastName")
-		return
-	}
-	z.Position, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "Position")
-		return
-	}
-	z.Roles, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "Roles")
-		return
-	}
-	z.AllowMarketing, bts, err = msgp.ReadBoolBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "AllowMarketing")
-		return
-	}
-	bts, err = z.Props.UnmarshalMsg(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "Props")
-		return
-	}
-	bts, err = z.NotifyProps.UnmarshalMsg(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "NotifyProps")
-		return
-	}
-	z.LastPasswordUpdate, bts, err = msgp.ReadInt64Bytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "LastPasswordUpdate")
-		return
-	}
-	z.LastPictureUpdate, bts, err = msgp.ReadInt64Bytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "LastPictureUpdate")
-		return
-	}
-	z.FailedAttempts, bts, err = msgp.ReadIntBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "FailedAttempts")
-		return
-	}
-	z.Locale, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "Locale")
-		return
-	}
-	bts, err = z.Timezone.UnmarshalMsg(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "Timezone")
-		return
-	}
-	z.MfaActive, bts, err = msgp.ReadBoolBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "MfaActive")
-		return
-	}
-	z.MfaSecret, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "MfaSecret")
-		return
-	}
-	if msgp.IsNil(bts) {
-		bts, err = msgp.ReadNilBytes(bts)
-		if err != nil {
-			return
-		}
-		z.RemoteId = nil
-	} else {
-		if z.RemoteId == nil {
-			z.RemoteId = new(string)
-		}
-		*z.RemoteId, bts, err = msgp.ReadStringBytes(bts)
-		if err != nil {
-			err = msgp.WrapError(err, "RemoteId")
-			return
-		}
-	}
-	z.LastActivityAt, bts, err = msgp.ReadInt64Bytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "LastActivityAt")
-		return
-	}
-	z.IsBot, bts, err = msgp.ReadBoolBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "IsBot")
-		return
-	}
-	z.BotDescription, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "BotDescription")
-		return
-	}
-	z.BotLastIconUpdate, bts, err = msgp.ReadInt64Bytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "BotLastIconUpdate")
-		return
-	}
-	z.TermsOfServiceId, bts, err = msgp.ReadStringBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "TermsOfServiceId")
-		return
-	}
-	z.TermsOfServiceCreateAt, bts, err = msgp.ReadInt64Bytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err, "TermsOfServiceCreateAt")
-		return
-	}
-	o = bts
-	return
-}
-
-// Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message
-func (z *User) Msgsize() (s int) {
-	s = 3 + msgp.StringPrefixSize + len(z.Id) + msgp.Int64Size + msgp.Int64Size + msgp.Int64Size + msgp.StringPrefixSize + len(z.Username) + msgp.StringPrefixSize + len(z.Password)
-	if z.AuthData == nil {
-		s += msgp.NilSize
-	} else {
-		s += msgp.StringPrefixSize + len(*z.AuthData)
-	}
-	s += msgp.StringPrefixSize + len(z.AuthService) + msgp.StringPrefixSize + len(z.Email) + msgp.BoolSize + msgp.StringPrefixSize + len(z.Nickname) + msgp.StringPrefixSize + len(z.FirstName) + msgp.StringPrefixSize + len(z.LastName) + msgp.StringPrefixSize + len(z.Position) + msgp.StringPrefixSize + len(z.Roles) + msgp.BoolSize + z.Props.Msgsize() + z.NotifyProps.Msgsize() + msgp.Int64Size + msgp.Int64Size + msgp.IntSize + msgp.StringPrefixSize + len(z.Locale) + z.Timezone.Msgsize() + msgp.BoolSize + msgp.StringPrefixSize + len(z.MfaSecret)
-	if z.RemoteId == nil {
-		s += msgp.NilSize
-	} else {
-		s += msgp.StringPrefixSize + len(*z.RemoteId)
-	}
-	s += msgp.Int64Size + msgp.BoolSize + msgp.StringPrefixSize + len(z.BotDescription) + msgp.Int64Size + msgp.StringPrefixSize + len(z.TermsOfServiceId) + msgp.Int64Size
-	return
-}
-
-// DecodeMsg implements msgp.Decodable
-func (z *UserMap) DecodeMsg(dc *msgp.Reader) (err error) {
-	var zb0003 uint32
-	zb0003, err = dc.ReadMapHeader()
-	if err != nil {
-		err = msgp.WrapError(err)
-		return
-	}
-	if (*z) == nil {
-		(*z) = make(UserMap, zb0003)
-	} else if len((*z)) > 0 {
-		for key := range *z {
-			delete((*z), key)
-		}
-	}
-	for zb0003 > 0 {
-		zb0003--
-		var zb0001 string
-		var zb0002 *User
-		zb0001, err = dc.ReadString()
-		if err != nil {
-			err = msgp.WrapError(err)
-			return
-		}
-		if dc.IsNil() {
-			err = dc.ReadNil()
-			if err != nil {
-				err = msgp.WrapError(err, zb0001)
-				return
-			}
-			zb0002 = nil
-		} else {
-			if zb0002 == nil {
-				zb0002 = new(User)
-			}
-			err = zb0002.DecodeMsg(dc)
-			if err != nil {
-				err = msgp.WrapError(err, zb0001)
-				return
-			}
-		}
-		(*z)[zb0001] = zb0002
-	}
-	return
-}
-
-// EncodeMsg implements msgp.Encodable
-func (z UserMap) EncodeMsg(en *msgp.Writer) (err error) {
-	err = en.WriteMapHeader(uint32(len(z)))
-	if err != nil {
-		err = msgp.WrapError(err)
-		return
-	}
-	for zb0004, zb0005 := range z {
-		err = en.WriteString(zb0004)
-		if err != nil {
-			err = msgp.WrapError(err)
-			return
-		}
-		if zb0005 == nil {
-			err = en.WriteNil()
-			if err != nil {
-				return
-			}
-		} else {
-			err = zb0005.EncodeMsg(en)
-			if err != nil {
-				err = msgp.WrapError(err, zb0004)
-				return
-			}
-		}
-	}
-	return
-}
-
-// MarshalMsg implements msgp.Marshaler
-func (z UserMap) MarshalMsg(b []byte) (o []byte, err error) {
-	o = msgp.Require(b, z.Msgsize())
-	o = msgp.AppendMapHeader(o, uint32(len(z)))
-	for zb0004, zb0005 := range z {
-		o = msgp.AppendString(o, zb0004)
-		if zb0005 == nil {
-			o = msgp.AppendNil(o)
-		} else {
-			o, err = zb0005.MarshalMsg(o)
-			if err != nil {
-				err = msgp.WrapError(err, zb0004)
-				return
-			}
-		}
-	}
-	return
-}
-
-// UnmarshalMsg implements msgp.Unmarshaler
-func (z *UserMap) UnmarshalMsg(bts []byte) (o []byte, err error) {
-	var zb0003 uint32
-	zb0003, bts, err = msgp.ReadMapHeaderBytes(bts)
-	if err != nil {
-		err = msgp.WrapError(err)
-		return
-	}
-	if (*z) == nil {
-		(*z) = make(UserMap, zb0003)
-	} else if len((*z)) > 0 {
-		for key := range *z {
-			delete((*z), key)
-		}
-	}
-	for zb0003 > 0 {
-		var zb0001 string
-		var zb0002 *User
-		zb0003--
-		zb0001, bts, err = msgp.ReadStringBytes(bts)
-		if err != nil {
-			err = msgp.WrapError(err)
-			return
-		}
-		if msgp.IsNil(bts) {
-			bts, err = msgp.ReadNilBytes(bts)
-			if err != nil {
-				return
-			}
-			zb0002 = nil
-		} else {
-			if zb0002 == nil {
-				zb0002 = new(User)
-			}
-			bts, err = zb0002.UnmarshalMsg(bts)
-			if err != nil {
-				err = msgp.WrapError(err, zb0001)
-				return
-			}
-		}
-		(*z)[zb0001] = zb0002
-	}
-	o = bts
-	return
-}
-
-// Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message
-func (z UserMap) Msgsize() (s int) {
-	s = msgp.MapHeaderSize
-	if z != nil {
-		for zb0004, zb0005 := range z {
-			_ = zb0005
-			s += msgp.StringPrefixSize + len(zb0004)
-			if zb0005 == nil {
-				s += msgp.NilSize
-			} else {
-				s += zb0005.Msgsize()
-			}
-		}
-	}
-	return
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/user_terms_of_service.go b/vendor/github.com/mattermost/mattermost-server/v5/model/user_terms_of_service.go
deleted file mode 100644
index 9a0f4f18..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/user_terms_of_service.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-)
-
-type UserTermsOfService struct {
-	UserId           string `json:"user_id"`
-	TermsOfServiceId string `json:"terms_of_service_id"`
-	CreateAt         int64  `json:"create_at"`
-}
-
-func (ut *UserTermsOfService) IsValid() *AppError {
-	if !IsValidId(ut.UserId) {
-		return InvalidUserTermsOfServiceError("user_id", ut.UserId)
-	}
-
-	if !IsValidId(ut.TermsOfServiceId) {
-		return InvalidUserTermsOfServiceError("terms_of_service_id", ut.UserId)
-	}
-
-	if ut.CreateAt == 0 {
-		return InvalidUserTermsOfServiceError("create_at", ut.UserId)
-	}
-
-	return nil
-}
-
-func (ut *UserTermsOfService) ToJson() string {
-	b, _ := json.Marshal(ut)
-	return string(b)
-}
-
-func (ut *UserTermsOfService) PreSave() {
-	if ut.UserId == "" {
-		ut.UserId = NewId()
-	}
-
-	ut.CreateAt = GetMillis()
-}
-
-func UserTermsOfServiceFromJson(data io.Reader) *UserTermsOfService {
-	var userTermsOfService *UserTermsOfService
-	json.NewDecoder(data).Decode(&userTermsOfService)
-	return userTermsOfService
-}
-
-func InvalidUserTermsOfServiceError(fieldName string, userTermsOfServiceId string) *AppError {
-	id := fmt.Sprintf("model.user_terms_of_service.is_valid.%s.app_error", fieldName)
-	details := ""
-	if userTermsOfServiceId != "" {
-		details = "user_terms_of_service_user_id=" + userTermsOfServiceId
-	}
-	return NewAppError("UserTermsOfService.IsValid", id, nil, details, http.StatusBadRequest)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/users_stats.go b/vendor/github.com/mattermost/mattermost-server/v5/model/users_stats.go
deleted file mode 100644
index 3e18296e..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/users_stats.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-)
-
-type UsersStats struct {
-	TotalUsersCount int64 `json:"total_users_count"`
-}
-
-func (o *UsersStats) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func UsersStatsFromJson(data io.Reader) *UsersStats {
-	var o *UsersStats
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/utils.go b/vendor/github.com/mattermost/mattermost-server/v5/model/utils.go
deleted file mode 100644
index 0c5a272c..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/utils.go
+++ /dev/null
@@ -1,726 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"bytes"
-	"crypto/rand"
-	"encoding/base32"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/mail"
-	"net/url"
-	"regexp"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-	"unicode"
-
-	"github.com/mattermost/mattermost-server/v5/shared/i18n"
-	"github.com/pborman/uuid"
-)
-
-const (
-	LOWERCASE_LETTERS = "abcdefghijklmnopqrstuvwxyz"
-	UPPERCASE_LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	NUMBERS           = "0123456789"
-	SYMBOLS           = " !\"\\#$%&'()*+,-./:;<=>?@[]^_`|~"
-	MB                = 1 << 20
-)
-
-type StringInterface map[string]interface{}
-type StringArray []string
-
-func (sa StringArray) Remove(input string) StringArray {
-	for index := range sa {
-		if sa[index] == input {
-			ret := make(StringArray, 0, len(sa)-1)
-			ret = append(ret, sa[:index]...)
-			return append(ret, sa[index+1:]...)
-		}
-	}
-	return sa
-}
-
-func (sa StringArray) Contains(input string) bool {
-	for index := range sa {
-		if sa[index] == input {
-			return true
-		}
-	}
-
-	return false
-}
-func (sa StringArray) Equals(input StringArray) bool {
-
-	if len(sa) != len(input) {
-		return false
-	}
-
-	for index := range sa {
-
-		if sa[index] != input[index] {
-			return false
-		}
-	}
-
-	return true
-}
-
-var translateFunc i18n.TranslateFunc
-var translateFuncOnce sync.Once
-
-func AppErrorInit(t i18n.TranslateFunc) {
-	translateFuncOnce.Do(func() {
-		translateFunc = t
-	})
-}
-
-type AppError struct {
-	Id            string `json:"id"`
-	Message       string `json:"message"`               // Message to be display to the end user without debugging information
-	DetailedError string `json:"detailed_error"`        // Internal error string to help the developer
-	RequestId     string `json:"request_id,omitempty"`  // The RequestId that's also set in the header
-	StatusCode    int    `json:"status_code,omitempty"` // The http status code
-	Where         string `json:"-"`                     // The function where it happened in the form of Struct.Func
-	IsOAuth       bool   `json:"is_oauth,omitempty"`    // Whether the error is OAuth specific
-	params        map[string]interface{}
-}
-
-func (er *AppError) Error() string {
-	return er.Where + ": " + er.Message + ", " + er.DetailedError
-}
-
-func (er *AppError) Translate(T i18n.TranslateFunc) {
-	if T == nil {
-		er.Message = er.Id
-		return
-	}
-
-	if er.params == nil {
-		er.Message = T(er.Id)
-	} else {
-		er.Message = T(er.Id, er.params)
-	}
-}
-
-func (er *AppError) SystemMessage(T i18n.TranslateFunc) string {
-	if er.params == nil {
-		return T(er.Id)
-	}
-	return T(er.Id, er.params)
-}
-
-func (er *AppError) ToJson() string {
-	b, _ := json.Marshal(er)
-	return string(b)
-}
-
-// AppErrorFromJson will decode the input and return an AppError
-func AppErrorFromJson(data io.Reader) *AppError {
-	str := ""
-	bytes, rerr := ioutil.ReadAll(data)
-	if rerr != nil {
-		str = rerr.Error()
-	} else {
-		str = string(bytes)
-	}
-
-	decoder := json.NewDecoder(strings.NewReader(str))
-	var er AppError
-	err := decoder.Decode(&er)
-	if err != nil {
-		return NewAppError("AppErrorFromJson", "model.utils.decode_json.app_error", nil, "body: "+str, http.StatusInternalServerError)
-	}
-	return &er
-}
-
-func NewAppError(where string, id string, params map[string]interface{}, details string, status int) *AppError {
-	ap := &AppError{}
-	ap.Id = id
-	ap.params = params
-	ap.Message = id
-	ap.Where = where
-	ap.DetailedError = details
-	ap.StatusCode = status
-	ap.IsOAuth = false
-	ap.Translate(translateFunc)
-	return ap
-}
-
-var encoding = base32.NewEncoding("ybndrfg8ejkmcpqxot1uwisza345h769")
-
-// NewId is a globally unique identifier.  It is a [A-Z0-9] string 26
-// characters long.  It is a UUID version 4 Guid that is zbased32 encoded
-// with the padding stripped off.
-func NewId() string {
-	var b bytes.Buffer
-	encoder := base32.NewEncoder(encoding, &b)
-	encoder.Write(uuid.NewRandom())
-	encoder.Close()
-	b.Truncate(26) // removes the '==' padding
-	return b.String()
-}
-
-// NewRandomTeamName is a NewId that will be a valid team name.
-func NewRandomTeamName() string {
-	teamName := NewId()
-	for IsReservedTeamName(teamName) {
-		teamName = NewId()
-	}
-	return teamName
-}
-
-// NewRandomString returns a random string of the given length.
-// The resulting entropy will be (5 * length) bits.
-func NewRandomString(length int) string {
-	data := make([]byte, 1+(length*5/8))
-	rand.Read(data)
-	return encoding.EncodeToString(data)[:length]
-}
-
-// GetMillis is a convenience method to get milliseconds since epoch.
-func GetMillis() int64 {
-	return time.Now().UnixNano() / int64(time.Millisecond)
-}
-
-// GetMillisForTime is a convenience method to get milliseconds since epoch for provided Time.
-func GetMillisForTime(thisTime time.Time) int64 {
-	return thisTime.UnixNano() / int64(time.Millisecond)
-}
-
-// GetTimeForMillis is a convenience method to get time.Time for milliseconds since epoch.
-func GetTimeForMillis(millis int64) time.Time {
-	return time.Unix(0, millis*int64(time.Millisecond))
-}
-
-// PadDateStringZeros is a convenience method to pad 2 digit date parts with zeros to meet ISO 8601 format
-func PadDateStringZeros(dateString string) string {
-	parts := strings.Split(dateString, "-")
-	for index, part := range parts {
-		if len(part) == 1 {
-			parts[index] = "0" + part
-		}
-	}
-	dateString = strings.Join(parts[:], "-")
-	return dateString
-}
-
-// GetStartOfDayMillis is a convenience method to get milliseconds since epoch for provided date's start of day
-func GetStartOfDayMillis(thisTime time.Time, timeZoneOffset int) int64 {
-	localSearchTimeZone := time.FixedZone("Local Search Time Zone", timeZoneOffset)
-	resultTime := time.Date(thisTime.Year(), thisTime.Month(), thisTime.Day(), 0, 0, 0, 0, localSearchTimeZone)
-	return GetMillisForTime(resultTime)
-}
-
-// GetEndOfDayMillis is a convenience method to get milliseconds since epoch for provided date's end of day
-func GetEndOfDayMillis(thisTime time.Time, timeZoneOffset int) int64 {
-	localSearchTimeZone := time.FixedZone("Local Search Time Zone", timeZoneOffset)
-	resultTime := time.Date(thisTime.Year(), thisTime.Month(), thisTime.Day(), 23, 59, 59, 999999999, localSearchTimeZone)
-	return GetMillisForTime(resultTime)
-}
-
-func CopyStringMap(originalMap map[string]string) map[string]string {
-	copyMap := make(map[string]string)
-	for k, v := range originalMap {
-		copyMap[k] = v
-	}
-	return copyMap
-}
-
-// MapToJson converts a map to a json string
-func MapToJson(objmap map[string]string) string {
-	b, _ := json.Marshal(objmap)
-	return string(b)
-}
-
-// MapBoolToJson converts a map to a json string
-func MapBoolToJson(objmap map[string]bool) string {
-	b, _ := json.Marshal(objmap)
-	return string(b)
-}
-
-// MapFromJson will decode the key/value pair map
-func MapFromJson(data io.Reader) map[string]string {
-	decoder := json.NewDecoder(data)
-
-	var objmap map[string]string
-	if err := decoder.Decode(&objmap); err != nil {
-		return make(map[string]string)
-	}
-	return objmap
-}
-
-// MapFromJson will decode the key/value pair map
-func MapBoolFromJson(data io.Reader) map[string]bool {
-	decoder := json.NewDecoder(data)
-
-	var objmap map[string]bool
-	if err := decoder.Decode(&objmap); err != nil {
-		return make(map[string]bool)
-	}
-	return objmap
-}
-
-func ArrayToJson(objmap []string) string {
-	b, _ := json.Marshal(objmap)
-	return string(b)
-}
-
-func ArrayFromJson(data io.Reader) []string {
-	decoder := json.NewDecoder(data)
-
-	var objmap []string
-	if err := decoder.Decode(&objmap); err != nil {
-		return make([]string, 0)
-	}
-	return objmap
-}
-
-func ArrayFromInterface(data interface{}) []string {
-	stringArray := []string{}
-
-	dataArray, ok := data.([]interface{})
-	if !ok {
-		return stringArray
-	}
-
-	for _, v := range dataArray {
-		if str, ok := v.(string); ok {
-			stringArray = append(stringArray, str)
-		}
-	}
-
-	return stringArray
-}
-
-func StringInterfaceToJson(objmap map[string]interface{}) string {
-	b, _ := json.Marshal(objmap)
-	return string(b)
-}
-
-func StringInterfaceFromJson(data io.Reader) map[string]interface{} {
-	decoder := json.NewDecoder(data)
-
-	var objmap map[string]interface{}
-	if err := decoder.Decode(&objmap); err != nil {
-		return make(map[string]interface{})
-	}
-	return objmap
-}
-
-func StringToJson(s string) string {
-	b, _ := json.Marshal(s)
-	return string(b)
-}
-
-func StringFromJson(data io.Reader) string {
-	decoder := json.NewDecoder(data)
-
-	var s string
-	if err := decoder.Decode(&s); err != nil {
-		return ""
-	}
-	return s
-}
-
-// ToJson serializes an arbitrary data type to JSON, discarding the error.
-func ToJson(v interface{}) []byte {
-	b, _ := json.Marshal(v)
-	return b
-}
-
-func GetServerIpAddress(iface string) string {
-	var addrs []net.Addr
-	if iface == "" {
-		var err error
-		addrs, err = net.InterfaceAddrs()
-		if err != nil {
-			return ""
-		}
-	} else {
-		interfaces, err := net.Interfaces()
-		if err != nil {
-			return ""
-		}
-		for _, i := range interfaces {
-			if i.Name == iface {
-				addrs, err = i.Addrs()
-				if err != nil {
-					return ""
-				}
-				break
-			}
-		}
-	}
-
-	for _, addr := range addrs {
-
-		if ip, ok := addr.(*net.IPNet); ok && !ip.IP.IsLoopback() && !ip.IP.IsLinkLocalUnicast() && !ip.IP.IsLinkLocalMulticast() {
-			if ip.IP.To4() != nil {
-				return ip.IP.String()
-			}
-		}
-	}
-
-	return ""
-}
-
-func IsLower(s string) bool {
-	return strings.ToLower(s) == s
-}
-
-func IsValidEmail(email string) bool {
-	if !IsLower(email) {
-		return false
-	}
-
-	if addr, err := mail.ParseAddress(email); err != nil {
-		return false
-	} else if addr.Name != "" {
-		// mail.ParseAddress accepts input of the form "Billy Bob <billy@example.com>" which we don't allow
-		return false
-	}
-
-	return true
-}
-
-var reservedName = []string{
-	"admin",
-	"api",
-	"channel",
-	"claim",
-	"error",
-	"files",
-	"help",
-	"landing",
-	"login",
-	"mfa",
-	"oauth",
-	"plug",
-	"plugins",
-	"post",
-	"signup",
-}
-
-func IsValidChannelIdentifier(s string) bool {
-
-	if !IsValidAlphaNumHyphenUnderscore(s, true) {
-		return false
-	}
-
-	if len(s) < CHANNEL_NAME_MIN_LENGTH {
-		return false
-	}
-
-	return true
-}
-
-func IsValidAlphaNum(s string) bool {
-	validAlphaNum := regexp.MustCompile(`^[a-z0-9]+([a-z\-0-9]+|(__)?)[a-z0-9]+$`)
-
-	return validAlphaNum.MatchString(s)
-}
-
-func IsValidAlphaNumHyphenUnderscore(s string, withFormat bool) bool {
-	if withFormat {
-		validAlphaNumHyphenUnderscore := regexp.MustCompile(`^[a-z0-9]+([a-z\-\_0-9]+|(__)?)[a-z0-9]+$`)
-		return validAlphaNumHyphenUnderscore.MatchString(s)
-	}
-
-	validSimpleAlphaNumHyphenUnderscore := regexp.MustCompile(`^[a-zA-Z0-9\-_]+$`)
-	return validSimpleAlphaNumHyphenUnderscore.MatchString(s)
-}
-
-func IsValidAlphaNumHyphenUnderscorePlus(s string) bool {
-
-	validSimpleAlphaNumHyphenUnderscorePlus := regexp.MustCompile(`^[a-zA-Z0-9+_-]+$`)
-	return validSimpleAlphaNumHyphenUnderscorePlus.MatchString(s)
-}
-
-func Etag(parts ...interface{}) string {
-
-	etag := CurrentVersion
-
-	for _, part := range parts {
-		etag += fmt.Sprintf(".%v", part)
-	}
-
-	return etag
-}
-
-var validHashtag = regexp.MustCompile(`^(#\pL[\pL\d\-_.]*[\pL\d])$`)
-var puncStart = regexp.MustCompile(`^[^\pL\d\s#]+`)
-var hashtagStart = regexp.MustCompile(`^#{2,}`)
-var puncEnd = regexp.MustCompile(`[^\pL\d\s]+$`)
-
-func ParseHashtags(text string) (string, string) {
-	words := strings.Fields(text)
-
-	hashtagString := ""
-	plainString := ""
-	for _, word := range words {
-		// trim off surrounding punctuation
-		word = puncStart.ReplaceAllString(word, "")
-		word = puncEnd.ReplaceAllString(word, "")
-
-		// and remove extra pound #s
-		word = hashtagStart.ReplaceAllString(word, "#")
-
-		if validHashtag.MatchString(word) {
-			hashtagString += " " + word
-		} else {
-			plainString += " " + word
-		}
-	}
-
-	if len(hashtagString) > 1000 {
-		hashtagString = hashtagString[:999]
-		lastSpace := strings.LastIndex(hashtagString, " ")
-		if lastSpace > -1 {
-			hashtagString = hashtagString[:lastSpace]
-		} else {
-			hashtagString = ""
-		}
-	}
-
-	return strings.TrimSpace(hashtagString), strings.TrimSpace(plainString)
-}
-
-func ClearMentionTags(post string) string {
-	post = strings.Replace(post, "<mention>", "", -1)
-	post = strings.Replace(post, "</mention>", "", -1)
-	return post
-}
-
-func IsValidHttpUrl(rawUrl string) bool {
-	if strings.Index(rawUrl, "http://") != 0 && strings.Index(rawUrl, "https://") != 0 {
-		return false
-	}
-
-	if u, err := url.ParseRequestURI(rawUrl); err != nil || u.Scheme == "" || u.Host == "" {
-		return false
-	}
-
-	return true
-}
-
-func IsValidTurnOrStunServer(rawUri string) bool {
-	if strings.Index(rawUri, "turn:") != 0 && strings.Index(rawUri, "stun:") != 0 {
-		return false
-	}
-
-	if _, err := url.ParseRequestURI(rawUri); err != nil {
-		return false
-	}
-
-	return true
-}
-
-func IsSafeLink(link *string) bool {
-	if link != nil {
-		if IsValidHttpUrl(*link) {
-			return true
-		} else if strings.HasPrefix(*link, "/") {
-			return true
-		} else {
-			return false
-		}
-	}
-
-	return true
-}
-
-func IsValidWebsocketUrl(rawUrl string) bool {
-	if strings.Index(rawUrl, "ws://") != 0 && strings.Index(rawUrl, "wss://") != 0 {
-		return false
-	}
-
-	if _, err := url.ParseRequestURI(rawUrl); err != nil {
-		return false
-	}
-
-	return true
-}
-
-func IsValidTrueOrFalseString(value string) bool {
-	return value == "true" || value == "false"
-}
-
-func IsValidNumberString(value string) bool {
-	if _, err := strconv.Atoi(value); err != nil {
-		return false
-	}
-
-	return true
-}
-
-func IsValidId(value string) bool {
-	if len(value) != 26 {
-		return false
-	}
-
-	for _, r := range value {
-		if !unicode.IsLetter(r) && !unicode.IsNumber(r) {
-			return false
-		}
-	}
-
-	return true
-}
-
-// Copied from https://golang.org/src/net/dnsclient.go#L119
-func IsDomainName(s string) bool {
-	// See RFC 1035, RFC 3696.
-	// Presentation format has dots before every label except the first, and the
-	// terminal empty label is optional here because we assume fully-qualified
-	// (absolute) input. We must therefore reserve space for the first and last
-	// labels' length octets in wire format, where they are necessary and the
-	// maximum total length is 255.
-	// So our _effective_ maximum is 253, but 254 is not rejected if the last
-	// character is a dot.
-	l := len(s)
-	if l == 0 || l > 254 || l == 254 && s[l-1] != '.' {
-		return false
-	}
-
-	last := byte('.')
-	ok := false // Ok once we've seen a letter.
-	partlen := 0
-	for i := 0; i < len(s); i++ {
-		c := s[i]
-		switch {
-		default:
-			return false
-		case 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || c == '_':
-			ok = true
-			partlen++
-		case '0' <= c && c <= '9':
-			// fine
-			partlen++
-		case c == '-':
-			// Byte before dash cannot be dot.
-			if last == '.' {
-				return false
-			}
-			partlen++
-		case c == '.':
-			// Byte before dot cannot be dot, dash.
-			if last == '.' || last == '-' {
-				return false
-			}
-			if partlen > 63 || partlen == 0 {
-				return false
-			}
-			partlen = 0
-		}
-		last = c
-	}
-	if last == '-' || partlen > 63 {
-		return false
-	}
-
-	return ok
-}
-
-func RemoveDuplicateStrings(in []string) []string {
-	out := []string{}
-	seen := make(map[string]bool, len(in))
-
-	for _, item := range in {
-		if !seen[item] {
-			out = append(out, item)
-
-			seen[item] = true
-		}
-	}
-
-	return out
-}
-
-func GetPreferredTimezone(timezone StringMap) string {
-	if timezone["useAutomaticTimezone"] == "true" {
-		return timezone["automaticTimezone"]
-	}
-
-	return timezone["manualTimezone"]
-}
-
-// IsSamlFile checks if filename is a SAML file.
-func IsSamlFile(saml *SamlSettings, filename string) bool {
-	return filename == *saml.PublicCertificateFile || filename == *saml.PrivateKeyFile || filename == *saml.IdpCertificateFile
-}
-
-func AsStringBoolMap(list []string) map[string]bool {
-	listMap := map[string]bool{}
-	for _, p := range list {
-		listMap[p] = true
-	}
-	return listMap
-}
-
-// SanitizeUnicode will remove undesirable Unicode characters from a string.
-func SanitizeUnicode(s string) string {
-	return strings.Map(filterBlocklist, s)
-}
-
-// filterBlocklist returns `r` if it is not in the blocklist, otherwise drop (-1).
-// Blocklist is taken from https://www.w3.org/TR/unicode-xml/#Charlist
-func filterBlocklist(r rune) rune {
-	const drop = -1
-	switch r {
-	case '\u0340', '\u0341': // clones of grave and acute; deprecated in Unicode
-		return drop
-	case '\u17A3', '\u17D3': // obsolete characters for Khmer; deprecated in Unicode
-		return drop
-	case '\u2028', '\u2029': // line and paragraph separator
-		return drop
-	case '\u202A', '\u202B', '\u202C', '\u202D', '\u202E': // BIDI embedding controls
-		return drop
-	case '\u206A', '\u206B': // activate/inhibit symmetric swapping; deprecated in Unicode
-		return drop
-	case '\u206C', '\u206D': // activate/inhibit Arabic form shaping; deprecated in Unicode
-		return drop
-	case '\u206E', '\u206F': // activate/inhibit national digit shapes; deprecated in Unicode
-		return drop
-	case '\uFFF9', '\uFFFA', '\uFFFB': // interlinear annotation characters
-		return drop
-	case '\uFEFF': // byte order mark
-		return drop
-	case '\uFFFC': // object replacement character
-		return drop
-	}
-
-	// Scoping for musical notation
-	if r >= 0x0001D173 && r <= 0x0001D17A {
-		return drop
-	}
-
-	// Language tag code points
-	if r >= 0x000E0000 && r <= 0x000E007F {
-		return drop
-	}
-
-	return r
-}
-
-// UniqueStrings returns a unique subset of the string slice provided.
-func UniqueStrings(input []string) []string {
-	u := make([]string, 0, len(input))
-	m := make(map[string]bool)
-
-	for _, val := range input {
-		if _, ok := m[val]; !ok {
-			m[val] = true
-			u = append(u, val)
-		}
-	}
-
-	return u
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/version.go b/vendor/github.com/mattermost/mattermost-server/v5/model/version.go
deleted file mode 100644
index 28904965..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/version.go
+++ /dev/null
@@ -1,194 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-// This is a list of all the current versions including any patches.
-// It should be maintained in chronological order with most current
-// release at the front of the list.
-var versions = []string{
-	"5.39.3",
-	"5.39.2",
-	"5.39.1",
-	"5.39.0",
-	"5.38.2",
-	"5.38.1",
-	"5.38.0",
-	"5.37.0",
-	"5.36.0",
-	"5.35.0",
-	"5.34.0",
-	"5.33.0",
-	"5.32.0",
-	"5.31.0",
-	"5.30.0",
-	"5.29.0",
-	"5.28.0",
-	"5.27.0",
-	"5.26.0",
-	"5.25.0",
-	"5.24.0",
-	"5.23.0",
-	"5.22.0",
-	"5.21.0",
-	"5.20.0",
-	"5.19.0",
-	"5.18.0",
-	"5.17.0",
-	"5.16.0",
-	"5.15.0",
-	"5.14.0",
-	"5.13.0",
-	"5.12.0",
-	"5.11.0",
-	"5.10.0",
-	"5.9.0",
-	"5.8.0",
-	"5.7.0",
-	"5.6.0",
-	"5.5.0",
-	"5.4.0",
-	"5.3.0",
-	"5.2.0",
-	"5.1.0",
-	"5.0.0",
-	"4.10.0",
-	"4.9.0",
-	"4.8.1",
-	"4.8.0",
-	"4.7.2",
-	"4.7.1",
-	"4.7.0",
-	"4.6.0",
-	"4.5.0",
-	"4.4.0",
-	"4.3.0",
-	"4.2.0",
-	"4.1.0",
-	"4.0.0",
-	"3.10.0",
-	"3.9.0",
-	"3.8.0",
-	"3.7.0",
-	"3.6.0",
-	"3.5.0",
-	"3.4.0",
-	"3.3.0",
-	"3.2.0",
-	"3.1.0",
-	"3.0.0",
-	"2.2.0",
-	"2.1.0",
-	"2.0.0",
-	"1.4.0",
-	"1.3.0",
-	"1.2.1",
-	"1.2.0",
-	"1.1.0",
-	"1.0.0",
-	"0.7.1",
-	"0.7.0",
-	"0.6.0",
-	"0.5.0",
-}
-
-var CurrentVersion string = versions[0]
-var BuildNumber string
-var BuildDate string
-var BuildHash string
-var BuildHashEnterprise string
-var BuildEnterpriseReady string
-var versionsWithoutHotFixes []string
-
-func init() {
-	versionsWithoutHotFixes = make([]string, 0, len(versions))
-	seen := make(map[string]string)
-
-	for _, version := range versions {
-		maj, min, _ := SplitVersion(version)
-		verStr := fmt.Sprintf("%v.%v.0", maj, min)
-
-		if seen[verStr] == "" {
-			versionsWithoutHotFixes = append(versionsWithoutHotFixes, verStr)
-			seen[verStr] = verStr
-		}
-	}
-}
-
-func SplitVersion(version string) (int64, int64, int64) {
-	parts := strings.Split(version, ".")
-
-	major := int64(0)
-	minor := int64(0)
-	patch := int64(0)
-
-	if len(parts) > 0 {
-		major, _ = strconv.ParseInt(parts[0], 10, 64)
-	}
-
-	if len(parts) > 1 {
-		minor, _ = strconv.ParseInt(parts[1], 10, 64)
-	}
-
-	if len(parts) > 2 {
-		patch, _ = strconv.ParseInt(parts[2], 10, 64)
-	}
-
-	return major, minor, patch
-}
-
-func GetPreviousVersion(version string) string {
-	verMajor, verMinor, _ := SplitVersion(version)
-	verStr := fmt.Sprintf("%v.%v.0", verMajor, verMinor)
-
-	for index, v := range versionsWithoutHotFixes {
-		if v == verStr && len(versionsWithoutHotFixes) > index+1 {
-			return versionsWithoutHotFixes[index+1]
-		}
-	}
-
-	return ""
-}
-
-func IsCurrentVersion(versionToCheck string) bool {
-	currentMajor, currentMinor, _ := SplitVersion(CurrentVersion)
-	toCheckMajor, toCheckMinor, _ := SplitVersion(versionToCheck)
-
-	if toCheckMajor == currentMajor && toCheckMinor == currentMinor {
-		return true
-	}
-	return false
-}
-
-func IsPreviousVersionsSupported(versionToCheck string) bool {
-	toCheckMajor, toCheckMinor, _ := SplitVersion(versionToCheck)
-	versionToCheckStr := fmt.Sprintf("%v.%v.0", toCheckMajor, toCheckMinor)
-
-	// Current Supported
-	if versionsWithoutHotFixes[0] == versionToCheckStr {
-		return true
-	}
-
-	// Current - 1 Supported
-	if versionsWithoutHotFixes[1] == versionToCheckStr {
-		return true
-	}
-
-	// Current - 2 Supported
-	if versionsWithoutHotFixes[2] == versionToCheckStr {
-		return true
-	}
-
-	// Current - 3 Supported
-	if versionsWithoutHotFixes[3] == versionToCheckStr {
-		return true
-	}
-
-	return false
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/websocket_client.go b/vendor/github.com/mattermost/mattermost-server/v5/model/websocket_client.go
deleted file mode 100644
index cd89e2d8..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/websocket_client.go
+++ /dev/null
@@ -1,321 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"bytes"
-	"encoding/json"
-	"net/http"
-	"sync/atomic"
-	"time"
-
-	"github.com/gorilla/websocket"
-)
-
-const (
-	SOCKET_MAX_MESSAGE_SIZE_KB  = 8 * 1024 // 8KB
-	PING_TIMEOUT_BUFFER_SECONDS = 5
-)
-
-type msgType int
-
-const (
-	msgTypeJSON msgType = iota + 1
-	msgTypePong
-)
-
-type writeMessage struct {
-	msgType msgType
-	data    interface{}
-}
-
-const avgReadMsgSizeBytes = 1024
-
-// WebSocketClient stores the necessary information required to
-// communicate with a WebSocket endpoint.
-// A client must read from PingTimeoutChannel, EventChannel and ResponseChannel to prevent
-// deadlocks from occurring in the program.
-type WebSocketClient struct {
-	Url                string                  // The location of the server like "ws://localhost:8065"
-	ApiUrl             string                  // The API location of the server like "ws://localhost:8065/api/v3"
-	ConnectUrl         string                  // The WebSocket URL to connect to like "ws://localhost:8065/api/v3/path/to/websocket"
-	Conn               *websocket.Conn         // The WebSocket connection
-	AuthToken          string                  // The token used to open the WebSocket connection
-	Sequence           int64                   // The ever-incrementing sequence attached to each WebSocket action
-	PingTimeoutChannel chan bool               // The channel used to signal ping timeouts
-	EventChannel       chan *WebSocketEvent    // The channel used to receive various events pushed from the server. For example: typing, posted
-	ResponseChannel    chan *WebSocketResponse // The channel used to receive responses for requests made to the server
-	ListenError        *AppError               // A field that is set if there was an abnormal closure of the WebSocket connection
-	writeChan          chan writeMessage
-
-	pingTimeoutTimer *time.Timer
-	quitPingWatchdog chan struct{}
-
-	quitWriterChan chan struct{}
-	resetTimerChan chan struct{}
-	closed         int32
-}
-
-// NewWebSocketClient constructs a new WebSocket client with convenience
-// methods for talking to the server.
-func NewWebSocketClient(url, authToken string) (*WebSocketClient, *AppError) {
-	return NewWebSocketClientWithDialer(websocket.DefaultDialer, url, authToken)
-}
-
-// NewWebSocketClientWithDialer constructs a new WebSocket client with convenience
-// methods for talking to the server using a custom dialer.
-func NewWebSocketClientWithDialer(dialer *websocket.Dialer, url, authToken string) (*WebSocketClient, *AppError) {
-	conn, _, err := dialer.Dial(url+API_URL_SUFFIX+"/websocket", nil)
-	if err != nil {
-		return nil, NewAppError("NewWebSocketClient", "model.websocket_client.connect_fail.app_error", nil, err.Error(), http.StatusInternalServerError)
-	}
-
-	client := &WebSocketClient{
-		Url:                url,
-		ApiUrl:             url + API_URL_SUFFIX,
-		ConnectUrl:         url + API_URL_SUFFIX + "/websocket",
-		Conn:               conn,
-		AuthToken:          authToken,
-		Sequence:           1,
-		PingTimeoutChannel: make(chan bool, 1),
-		EventChannel:       make(chan *WebSocketEvent, 100),
-		ResponseChannel:    make(chan *WebSocketResponse, 100),
-		writeChan:          make(chan writeMessage),
-		quitPingWatchdog:   make(chan struct{}),
-		quitWriterChan:     make(chan struct{}),
-		resetTimerChan:     make(chan struct{}),
-	}
-
-	client.configurePingHandling()
-	go client.writer()
-
-	client.SendMessage(WEBSOCKET_AUTHENTICATION_CHALLENGE, map[string]interface{}{"token": authToken})
-
-	return client, nil
-}
-
-// NewWebSocketClient4 constructs a new WebSocket client with convenience
-// methods for talking to the server. Uses the v4 endpoint.
-func NewWebSocketClient4(url, authToken string) (*WebSocketClient, *AppError) {
-	return NewWebSocketClient4WithDialer(websocket.DefaultDialer, url, authToken)
-}
-
-// NewWebSocketClient4WithDialer constructs a new WebSocket client with convenience
-// methods for talking to the server using a custom dialer. Uses the v4 endpoint.
-func NewWebSocketClient4WithDialer(dialer *websocket.Dialer, url, authToken string) (*WebSocketClient, *AppError) {
-	return NewWebSocketClientWithDialer(dialer, url, authToken)
-}
-
-// Connect creates a websocket connection with the given ConnectUrl.
-// This is racy and error-prone should not be used. Use any of the New* functions to create a websocket.
-func (wsc *WebSocketClient) Connect() *AppError {
-	return wsc.ConnectWithDialer(websocket.DefaultDialer)
-}
-
-// ConnectWithDialer creates a websocket connection with the given ConnectUrl using the dialer.
-// This is racy and error-prone and should not be used. Use any of the New* functions to create a websocket.
-func (wsc *WebSocketClient) ConnectWithDialer(dialer *websocket.Dialer) *AppError {
-	var err error
-	wsc.Conn, _, err = dialer.Dial(wsc.ConnectUrl, nil)
-	if err != nil {
-		return NewAppError("Connect", "model.websocket_client.connect_fail.app_error", nil, err.Error(), http.StatusInternalServerError)
-	}
-	// Super racy and should not be done anyways.
-	// All of this needs to be redesigned for v6.
-	wsc.configurePingHandling()
-	// If it has been closed before, we just restart the writer.
-	if atomic.CompareAndSwapInt32(&wsc.closed, 1, 0) {
-		wsc.writeChan = make(chan writeMessage)
-		wsc.quitWriterChan = make(chan struct{})
-		go wsc.writer()
-		wsc.resetTimerChan = make(chan struct{})
-		wsc.quitPingWatchdog = make(chan struct{})
-	}
-
-	wsc.EventChannel = make(chan *WebSocketEvent, 100)
-	wsc.ResponseChannel = make(chan *WebSocketResponse, 100)
-
-	wsc.SendMessage(WEBSOCKET_AUTHENTICATION_CHALLENGE, map[string]interface{}{"token": wsc.AuthToken})
-
-	return nil
-}
-
-// Close closes the websocket client. It is recommended that a closed client should not be
-// reused again. Rather a new client should be created anew.
-func (wsc *WebSocketClient) Close() {
-	// CAS to 1 and proceed. Return if already 1.
-	if !atomic.CompareAndSwapInt32(&wsc.closed, 0, 1) {
-		return
-	}
-	wsc.quitWriterChan <- struct{}{}
-	close(wsc.writeChan)
-	// We close the connection, which breaks the reader loop.
-	// Then we let the defer block in the reader do further cleanup.
-	wsc.Conn.Close()
-}
-
-// TODO: un-export the Conn so that Write methods go through the writer
-func (wsc *WebSocketClient) writer() {
-	for {
-		select {
-		case msg := <-wsc.writeChan:
-			switch msg.msgType {
-			case msgTypeJSON:
-				wsc.Conn.WriteJSON(msg.data)
-			case msgTypePong:
-				wsc.Conn.WriteMessage(websocket.PongMessage, []byte{})
-			}
-		case <-wsc.quitWriterChan:
-			return
-		}
-	}
-}
-
-// Listen starts the read loop of the websocket client.
-func (wsc *WebSocketClient) Listen() {
-	// This loop can exit in 2 conditions:
-	// 1. Either the connection breaks naturally.
-	// 2. Close was explicitly called, which closes the connection manually.
-	//
-	// Due to the way the API is written, there is a requirement that a client may NOT
-	// call Listen at all and can still call Close and Connect.
-	// Therefore, we let the cleanup of the reader stuff rely on closing the connection
-	// and then we do the cleanup in the defer block.
-	//
-	// First, we close some channels and then CAS to 1 and proceed to close the writer chan also.
-	// This is needed because then the defer clause does not double-close the writer when (2) happens.
-	// But if (1) happens, we set the closed bit, and close the rest of the stuff.
-	go func() {
-		defer func() {
-			close(wsc.EventChannel)
-			close(wsc.ResponseChannel)
-			close(wsc.quitPingWatchdog)
-			close(wsc.resetTimerChan)
-			// We CAS to 1 and proceed.
-			if !atomic.CompareAndSwapInt32(&wsc.closed, 0, 1) {
-				return
-			}
-			wsc.quitWriterChan <- struct{}{}
-			close(wsc.writeChan)
-			wsc.Conn.Close() // This can most likely be removed. Needs to be checked.
-		}()
-
-		var buf bytes.Buffer
-		buf.Grow(avgReadMsgSizeBytes)
-
-		for {
-			// Reset buffer.
-			buf.Reset()
-			_, r, err := wsc.Conn.NextReader()
-			if err != nil {
-				if !websocket.IsCloseError(err, websocket.CloseNormalClosure, websocket.CloseNoStatusReceived) {
-					wsc.ListenError = NewAppError("NewWebSocketClient", "model.websocket_client.connect_fail.app_error", nil, err.Error(), http.StatusInternalServerError)
-				}
-				return
-			}
-			// Use pre-allocated buffer.
-			_, err = buf.ReadFrom(r)
-			if err != nil {
-				// This should use a different error ID, but en.json is not imported anyways.
-				// It's a different bug altogether but we let it be for now.
-				// See MM-24520.
-				wsc.ListenError = NewAppError("NewWebSocketClient", "model.websocket_client.connect_fail.app_error", nil, err.Error(), http.StatusInternalServerError)
-				return
-			}
-
-			event := WebSocketEventFromJson(bytes.NewReader(buf.Bytes()))
-			if event == nil {
-				continue
-			}
-			if event.IsValid() {
-				wsc.EventChannel <- event
-				continue
-			}
-
-			var response WebSocketResponse
-			if err := json.Unmarshal(buf.Bytes(), &response); err == nil && response.IsValid() {
-				wsc.ResponseChannel <- &response
-				continue
-			}
-		}
-	}()
-}
-
-func (wsc *WebSocketClient) SendMessage(action string, data map[string]interface{}) {
-	req := &WebSocketRequest{}
-	req.Seq = wsc.Sequence
-	req.Action = action
-	req.Data = data
-
-	wsc.Sequence++
-	wsc.writeChan <- writeMessage{
-		msgType: msgTypeJSON,
-		data:    req,
-	}
-}
-
-// UserTyping will push a user_typing event out to all connected users
-// who are in the specified channel
-func (wsc *WebSocketClient) UserTyping(channelId, parentId string) {
-	data := map[string]interface{}{
-		"channel_id": channelId,
-		"parent_id":  parentId,
-	}
-
-	wsc.SendMessage("user_typing", data)
-}
-
-// GetStatuses will return a map of string statuses using user id as the key
-func (wsc *WebSocketClient) GetStatuses() {
-	wsc.SendMessage("get_statuses", nil)
-}
-
-// GetStatusesByIds will fetch certain user statuses based on ids and return
-// a map of string statuses using user id as the key
-func (wsc *WebSocketClient) GetStatusesByIds(userIds []string) {
-	data := map[string]interface{}{
-		"user_ids": userIds,
-	}
-	wsc.SendMessage("get_statuses_by_ids", data)
-}
-
-func (wsc *WebSocketClient) configurePingHandling() {
-	wsc.Conn.SetPingHandler(wsc.pingHandler)
-	wsc.pingTimeoutTimer = time.NewTimer(time.Second * (60 + PING_TIMEOUT_BUFFER_SECONDS))
-	go wsc.pingWatchdog()
-}
-
-func (wsc *WebSocketClient) pingHandler(appData string) error {
-	if atomic.LoadInt32(&wsc.closed) == 1 {
-		return nil
-	}
-	wsc.resetTimerChan <- struct{}{}
-	wsc.writeChan <- writeMessage{
-		msgType: msgTypePong,
-	}
-	return nil
-}
-
-// pingWatchdog is used to send values to the PingTimeoutChannel whenever a timeout occurs.
-// We use the resetTimerChan from the pingHandler to pass the signal, and then reset the timer
-// after draining it. And if the timer naturally expires, we also extend it to prevent it from
-// being deadlocked when the resetTimerChan case runs. Because timer.Stop would return false,
-// and the code would be forever stuck trying to read from C.
-func (wsc *WebSocketClient) pingWatchdog() {
-	for {
-		select {
-		case <-wsc.resetTimerChan:
-			if !wsc.pingTimeoutTimer.Stop() {
-				<-wsc.pingTimeoutTimer.C
-			}
-			wsc.pingTimeoutTimer.Reset(time.Second * (60 + PING_TIMEOUT_BUFFER_SECONDS))
-
-		case <-wsc.pingTimeoutTimer.C:
-			wsc.PingTimeoutChannel <- true
-			wsc.pingTimeoutTimer.Reset(time.Second * (60 + PING_TIMEOUT_BUFFER_SECONDS))
-		case <-wsc.quitPingWatchdog:
-			return
-		}
-	}
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/websocket_message.go b/vendor/github.com/mattermost/mattermost-server/v5/model/websocket_message.go
deleted file mode 100644
index 9a845d36..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/websocket_message.go
+++ /dev/null
@@ -1,287 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-)
-
-const (
-	WEBSOCKET_EVENT_TYPING                                   = "typing"
-	WEBSOCKET_EVENT_POSTED                                   = "posted"
-	WEBSOCKET_EVENT_POST_EDITED                              = "post_edited"
-	WEBSOCKET_EVENT_POST_DELETED                             = "post_deleted"
-	WEBSOCKET_EVENT_POST_UNREAD                              = "post_unread"
-	WEBSOCKET_EVENT_CHANNEL_CONVERTED                        = "channel_converted"
-	WEBSOCKET_EVENT_CHANNEL_CREATED                          = "channel_created"
-	WEBSOCKET_EVENT_CHANNEL_DELETED                          = "channel_deleted"
-	WEBSOCKET_EVENT_CHANNEL_RESTORED                         = "channel_restored"
-	WEBSOCKET_EVENT_CHANNEL_UPDATED                          = "channel_updated"
-	WEBSOCKET_EVENT_CHANNEL_MEMBER_UPDATED                   = "channel_member_updated"
-	WEBSOCKET_EVENT_CHANNEL_SCHEME_UPDATED                   = "channel_scheme_updated"
-	WEBSOCKET_EVENT_DIRECT_ADDED                             = "direct_added"
-	WEBSOCKET_EVENT_GROUP_ADDED                              = "group_added"
-	WEBSOCKET_EVENT_NEW_USER                                 = "new_user"
-	WEBSOCKET_EVENT_ADDED_TO_TEAM                            = "added_to_team"
-	WEBSOCKET_EVENT_LEAVE_TEAM                               = "leave_team"
-	WEBSOCKET_EVENT_UPDATE_TEAM                              = "update_team"
-	WEBSOCKET_EVENT_DELETE_TEAM                              = "delete_team"
-	WEBSOCKET_EVENT_RESTORE_TEAM                             = "restore_team"
-	WEBSOCKET_EVENT_UPDATE_TEAM_SCHEME                       = "update_team_scheme"
-	WEBSOCKET_EVENT_USER_ADDED                               = "user_added"
-	WEBSOCKET_EVENT_USER_UPDATED                             = "user_updated"
-	WEBSOCKET_EVENT_USER_ROLE_UPDATED                        = "user_role_updated"
-	WEBSOCKET_EVENT_MEMBERROLE_UPDATED                       = "memberrole_updated"
-	WEBSOCKET_EVENT_USER_REMOVED                             = "user_removed"
-	WEBSOCKET_EVENT_PREFERENCE_CHANGED                       = "preference_changed"
-	WEBSOCKET_EVENT_PREFERENCES_CHANGED                      = "preferences_changed"
-	WEBSOCKET_EVENT_PREFERENCES_DELETED                      = "preferences_deleted"
-	WEBSOCKET_EVENT_EPHEMERAL_MESSAGE                        = "ephemeral_message"
-	WEBSOCKET_EVENT_STATUS_CHANGE                            = "status_change"
-	WEBSOCKET_EVENT_HELLO                                    = "hello"
-	WEBSOCKET_AUTHENTICATION_CHALLENGE                       = "authentication_challenge"
-	WEBSOCKET_EVENT_REACTION_ADDED                           = "reaction_added"
-	WEBSOCKET_EVENT_REACTION_REMOVED                         = "reaction_removed"
-	WEBSOCKET_EVENT_RESPONSE                                 = "response"
-	WEBSOCKET_EVENT_EMOJI_ADDED                              = "emoji_added"
-	WEBSOCKET_EVENT_CHANNEL_VIEWED                           = "channel_viewed"
-	WEBSOCKET_EVENT_PLUGIN_STATUSES_CHANGED                  = "plugin_statuses_changed"
-	WEBSOCKET_EVENT_PLUGIN_ENABLED                           = "plugin_enabled"
-	WEBSOCKET_EVENT_PLUGIN_DISABLED                          = "plugin_disabled"
-	WEBSOCKET_EVENT_ROLE_UPDATED                             = "role_updated"
-	WEBSOCKET_EVENT_LICENSE_CHANGED                          = "license_changed"
-	WEBSOCKET_EVENT_CONFIG_CHANGED                           = "config_changed"
-	WEBSOCKET_EVENT_OPEN_DIALOG                              = "open_dialog"
-	WEBSOCKET_EVENT_GUESTS_DEACTIVATED                       = "guests_deactivated"
-	WEBSOCKET_EVENT_USER_ACTIVATION_STATUS_CHANGE            = "user_activation_status_change"
-	WEBSOCKET_EVENT_RECEIVED_GROUP                           = "received_group"
-	WEBSOCKET_EVENT_RECEIVED_GROUP_ASSOCIATED_TO_TEAM        = "received_group_associated_to_team"
-	WEBSOCKET_EVENT_RECEIVED_GROUP_NOT_ASSOCIATED_TO_TEAM    = "received_group_not_associated_to_team"
-	WEBSOCKET_EVENT_RECEIVED_GROUP_ASSOCIATED_TO_CHANNEL     = "received_group_associated_to_channel"
-	WEBSOCKET_EVENT_RECEIVED_GROUP_NOT_ASSOCIATED_TO_CHANNEL = "received_group_not_associated_to_channel"
-	WEBSOCKET_EVENT_SIDEBAR_CATEGORY_CREATED                 = "sidebar_category_created"
-	WEBSOCKET_EVENT_SIDEBAR_CATEGORY_UPDATED                 = "sidebar_category_updated"
-	WEBSOCKET_EVENT_SIDEBAR_CATEGORY_DELETED                 = "sidebar_category_deleted"
-	WEBSOCKET_EVENT_SIDEBAR_CATEGORY_ORDER_UPDATED           = "sidebar_category_order_updated"
-	WEBSOCKET_WARN_METRIC_STATUS_RECEIVED                    = "warn_metric_status_received"
-	WEBSOCKET_WARN_METRIC_STATUS_REMOVED                     = "warn_metric_status_removed"
-	WEBSOCKET_EVENT_CLOUD_PAYMENT_STATUS_UPDATED             = "cloud_payment_status_updated"
-	WEBSOCKET_EVENT_THREAD_UPDATED                           = "thread_updated"
-	WEBSOCKET_EVENT_THREAD_FOLLOW_CHANGED                    = "thread_follow_changed"
-	WEBSOCKET_EVENT_THREAD_READ_CHANGED                      = "thread_read_changed"
-	WEBSOCKET_FIRST_ADMIN_VISIT_MARKETPLACE_STATUS_RECEIVED  = "first_admin_visit_marketplace_status_received"
-)
-
-type WebSocketMessage interface {
-	ToJson() string
-	IsValid() bool
-	EventType() string
-}
-
-type WebsocketBroadcast struct {
-	OmitUsers             map[string]bool `json:"omit_users"` // broadcast is omitted for users listed here
-	UserId                string          `json:"user_id"`    // broadcast only occurs for this user
-	ChannelId             string          `json:"channel_id"` // broadcast only occurs for users in this channel
-	TeamId                string          `json:"team_id"`    // broadcast only occurs for users in this team
-	ContainsSanitizedData bool            `json:"-"`
-	ContainsSensitiveData bool            `json:"-"`
-}
-
-type precomputedWebSocketEventJSON struct {
-	Event     json.RawMessage
-	Data      json.RawMessage
-	Broadcast json.RawMessage
-}
-
-// webSocketEventJSON mirrors WebSocketEvent to make some of its unexported fields serializable
-type webSocketEventJSON struct {
-	Event     string                 `json:"event"`
-	Data      map[string]interface{} `json:"data"`
-	Broadcast *WebsocketBroadcast    `json:"broadcast"`
-	Sequence  int64                  `json:"seq"`
-}
-
-// **NOTE**: Direct access to WebSocketEvent fields is deprecated. They will be
-// made unexported in next major version release. Provided getter functions should be used instead.
-type WebSocketEvent struct {
-	Event           string                 // Deprecated: use EventType()
-	Data            map[string]interface{} // Deprecated: use GetData()
-	Broadcast       *WebsocketBroadcast    // Deprecated: use GetBroadcast()
-	Sequence        int64                  // Deprecated: use GetSequence()
-	precomputedJSON *precomputedWebSocketEventJSON
-}
-
-// PrecomputeJSON precomputes and stores the serialized JSON for all fields other than Sequence.
-// This makes ToJson much more efficient when sending the same event to multiple connections.
-func (ev *WebSocketEvent) PrecomputeJSON() *WebSocketEvent {
-	copy := ev.Copy()
-	event, _ := json.Marshal(copy.Event)
-	data, _ := json.Marshal(copy.Data)
-	broadcast, _ := json.Marshal(copy.Broadcast)
-	copy.precomputedJSON = &precomputedWebSocketEventJSON{
-		Event:     json.RawMessage(event),
-		Data:      json.RawMessage(data),
-		Broadcast: json.RawMessage(broadcast),
-	}
-	return copy
-}
-
-func (ev *WebSocketEvent) Add(key string, value interface{}) {
-	ev.Data[key] = value
-}
-
-func NewWebSocketEvent(event, teamId, channelId, userId string, omitUsers map[string]bool) *WebSocketEvent {
-	return &WebSocketEvent{Event: event, Data: make(map[string]interface{}),
-		Broadcast: &WebsocketBroadcast{TeamId: teamId, ChannelId: channelId, UserId: userId, OmitUsers: omitUsers}}
-}
-
-func (ev *WebSocketEvent) Copy() *WebSocketEvent {
-	copy := &WebSocketEvent{
-		Event:           ev.Event,
-		Data:            ev.Data,
-		Broadcast:       ev.Broadcast,
-		Sequence:        ev.Sequence,
-		precomputedJSON: ev.precomputedJSON,
-	}
-	return copy
-}
-
-func (ev *WebSocketEvent) GetData() map[string]interface{} {
-	return ev.Data
-}
-
-func (ev *WebSocketEvent) GetBroadcast() *WebsocketBroadcast {
-	return ev.Broadcast
-}
-
-func (ev *WebSocketEvent) GetSequence() int64 {
-	return ev.Sequence
-}
-
-func (ev *WebSocketEvent) SetEvent(event string) *WebSocketEvent {
-	copy := ev.Copy()
-	copy.Event = event
-	return copy
-}
-
-func (ev *WebSocketEvent) SetData(data map[string]interface{}) *WebSocketEvent {
-	copy := ev.Copy()
-	copy.Data = data
-	return copy
-}
-
-func (ev *WebSocketEvent) SetBroadcast(broadcast *WebsocketBroadcast) *WebSocketEvent {
-	copy := ev.Copy()
-	copy.Broadcast = broadcast
-	return copy
-}
-
-func (ev *WebSocketEvent) SetSequence(seq int64) *WebSocketEvent {
-	copy := ev.Copy()
-	copy.Sequence = seq
-	return copy
-}
-
-func (ev *WebSocketEvent) IsValid() bool {
-	return ev.Event != ""
-}
-
-func (ev *WebSocketEvent) EventType() string {
-	return ev.Event
-}
-
-func (ev *WebSocketEvent) ToJson() string {
-	if ev.precomputedJSON != nil {
-		return fmt.Sprintf(`{"event": %s, "data": %s, "broadcast": %s, "seq": %d}`, ev.precomputedJSON.Event, ev.precomputedJSON.Data, ev.precomputedJSON.Broadcast, ev.Sequence)
-	}
-	b, _ := json.Marshal(webSocketEventJSON{
-		ev.Event,
-		ev.Data,
-		ev.Broadcast,
-		ev.Sequence,
-	})
-	return string(b)
-}
-
-// Encode encodes the event to the given encoder.
-func (ev *WebSocketEvent) Encode(enc *json.Encoder) error {
-	if ev.precomputedJSON != nil {
-		return enc.Encode(json.RawMessage(
-			fmt.Sprintf(`{"event": %s, "data": %s, "broadcast": %s, "seq": %d}`, ev.precomputedJSON.Event, ev.precomputedJSON.Data, ev.precomputedJSON.Broadcast, ev.Sequence),
-		))
-	}
-
-	return enc.Encode(webSocketEventJSON{
-		ev.Event,
-		ev.Data,
-		ev.Broadcast,
-		ev.Sequence,
-	})
-}
-
-func WebSocketEventFromJson(data io.Reader) *WebSocketEvent {
-	var ev WebSocketEvent
-	var o webSocketEventJSON
-	if err := json.NewDecoder(data).Decode(&o); err != nil {
-		return nil
-	}
-	ev.Event = o.Event
-	if u, ok := o.Data["user"]; ok {
-		// We need to convert to and from JSON again
-		// because the user is in the form of a map[string]interface{}.
-		buf, err := json.Marshal(u)
-		if err != nil {
-			return nil
-		}
-		o.Data["user"] = UserFromJson(bytes.NewReader(buf))
-	}
-	ev.Data = o.Data
-	ev.Broadcast = o.Broadcast
-	ev.Sequence = o.Sequence
-	return &ev
-}
-
-// WebSocketResponse represents a response received through the WebSocket
-// for a request made to the server. This is available through the ResponseChannel
-// channel in WebSocketClient.
-type WebSocketResponse struct {
-	Status   string                 `json:"status"`              // The status of the response. For example: OK, FAIL.
-	SeqReply int64                  `json:"seq_reply,omitempty"` // A counter which is incremented for every response sent.
-	Data     map[string]interface{} `json:"data,omitempty"`      // The data contained in the response.
-	Error    *AppError              `json:"error,omitempty"`     // A field that is set if any error has occurred.
-}
-
-func (m *WebSocketResponse) Add(key string, value interface{}) {
-	m.Data[key] = value
-}
-
-func NewWebSocketResponse(status string, seqReply int64, data map[string]interface{}) *WebSocketResponse {
-	return &WebSocketResponse{Status: status, SeqReply: seqReply, Data: data}
-}
-
-func NewWebSocketError(seqReply int64, err *AppError) *WebSocketResponse {
-	return &WebSocketResponse{Status: STATUS_FAIL, SeqReply: seqReply, Error: err}
-}
-
-func (m *WebSocketResponse) IsValid() bool {
-	return m.Status != ""
-}
-
-func (m *WebSocketResponse) EventType() string {
-	return WEBSOCKET_EVENT_RESPONSE
-}
-
-func (m *WebSocketResponse) ToJson() string {
-	b, _ := json.Marshal(m)
-	return string(b)
-}
-
-func WebSocketResponseFromJson(data io.Reader) *WebSocketResponse {
-	var o *WebSocketResponse
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/websocket_request.go b/vendor/github.com/mattermost/mattermost-server/v5/model/websocket_request.go
deleted file mode 100644
index f18f1285..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/websocket_request.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import (
-	"encoding/json"
-	"io"
-
-	"github.com/mattermost/mattermost-server/v5/shared/i18n"
-)
-
-// WebSocketRequest represents a request made to the server through a websocket.
-type WebSocketRequest struct {
-	// Client-provided fields
-	Seq    int64                  `json:"seq"`    // A counter which is incremented for every request made.
-	Action string                 `json:"action"` // The action to perform for a request. For example: get_statuses, user_typing.
-	Data   map[string]interface{} `json:"data"`   // The metadata for an action.
-
-	// Server-provided fields
-	Session Session            `json:"-"`
-	T       i18n.TranslateFunc `json:"-"`
-	Locale  string             `json:"-"`
-}
-
-func (o *WebSocketRequest) ToJson() string {
-	b, _ := json.Marshal(o)
-	return string(b)
-}
-
-func WebSocketRequestFromJson(data io.Reader) *WebSocketRequest {
-	var o *WebSocketRequest
-	json.NewDecoder(data).Decode(&o)
-	return o
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/services/timezones/default.go b/vendor/github.com/mattermost/mattermost-server/v5/services/timezones/default.go
deleted file mode 100644
index 3d835f7d..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/services/timezones/default.go
+++ /dev/null
@@ -1,599 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package timezones
-
-var DefaultSupportedTimezones = []string{
-	"Africa/Abidjan",
-	"Africa/Accra",
-	"Africa/Addis_Ababa",
-	"Africa/Algiers",
-	"Africa/Asmara",
-	"Africa/Asmera",
-	"Africa/Bamako",
-	"Africa/Bangui",
-	"Africa/Banjul",
-	"Africa/Bissau",
-	"Africa/Blantyre",
-	"Africa/Brazzaville",
-	"Africa/Bujumbura",
-	"Africa/Cairo",
-	"Africa/Casablanca",
-	"Africa/Ceuta",
-	"Africa/Conakry",
-	"Africa/Dakar",
-	"Africa/Dar_es_Salaam",
-	"Africa/Djibouti",
-	"Africa/Douala",
-	"Africa/El_Aaiun",
-	"Africa/Freetown",
-	"Africa/Gaborone",
-	"Africa/Harare",
-	"Africa/Johannesburg",
-	"Africa/Juba",
-	"Africa/Kampala",
-	"Africa/Khartoum",
-	"Africa/Kigali",
-	"Africa/Kinshasa",
-	"Africa/Lagos",
-	"Africa/Libreville",
-	"Africa/Lome",
-	"Africa/Luanda",
-	"Africa/Lubumbashi",
-	"Africa/Lusaka",
-	"Africa/Malabo",
-	"Africa/Maputo",
-	"Africa/Maseru",
-	"Africa/Mbabane",
-	"Africa/Mogadishu",
-	"Africa/Monrovia",
-	"Africa/Nairobi",
-	"Africa/Ndjamena",
-	"Africa/Niamey",
-	"Africa/Nouakchott",
-	"Africa/Ouagadougou",
-	"Africa/Porto-Novo",
-	"Africa/Sao_Tome",
-	"Africa/Timbuktu",
-	"Africa/Tripoli",
-	"Africa/Tunis",
-	"Africa/Windhoek",
-	"America/Adak",
-	"America/Anchorage",
-	"America/Anguilla",
-	"America/Antigua",
-	"America/Araguaina",
-	"America/Argentina/Buenos_Aires",
-	"America/Argentina/Catamarca",
-	"America/Argentina/ComodRivadavia",
-	"America/Argentina/Cordoba",
-	"America/Argentina/Jujuy",
-	"America/Argentina/La_Rioja",
-	"America/Argentina/Mendoza",
-	"America/Argentina/Rio_Gallegos",
-	"America/Argentina/Salta",
-	"America/Argentina/San_Juan",
-	"America/Argentina/San_Luis",
-	"America/Argentina/Tucuman",
-	"America/Argentina/Ushuaia",
-	"America/Aruba",
-	"America/Asuncion",
-	"America/Atikokan",
-	"America/Atka",
-	"America/Bahia",
-	"America/Bahia_Banderas",
-	"America/Barbados",
-	"America/Belem",
-	"America/Belize",
-	"America/Blanc-Sablon",
-	"America/Boa_Vista",
-	"America/Bogota",
-	"America/Boise",
-	"America/Buenos_Aires",
-	"America/Cambridge_Bay",
-	"America/Campo_Grande",
-	"America/Cancun",
-	"America/Caracas",
-	"America/Catamarca",
-	"America/Cayenne",
-	"America/Cayman",
-	"America/Chicago",
-	"America/Chihuahua",
-	"America/Coral_Harbour",
-	"America/Cordoba",
-	"America/Costa_Rica",
-	"America/Creston",
-	"America/Cuiaba",
-	"America/Curacao",
-	"America/Danmarkshavn",
-	"America/Dawson",
-	"America/Dawson_Creek",
-	"America/Denver",
-	"America/Detroit",
-	"America/Dominica",
-	"America/Edmonton",
-	"America/Eirunepe",
-	"America/El_Salvador",
-	"America/Ensenada",
-	"America/Fort_Nelson",
-	"America/Fort_Wayne",
-	"America/Fortaleza",
-	"America/Glace_Bay",
-	"America/Godthab",
-	"America/Goose_Bay",
-	"America/Grand_Turk",
-	"America/Grenada",
-	"America/Guadeloupe",
-	"America/Guatemala",
-	"America/Guayaquil",
-	"America/Guyana",
-	"America/Halifax",
-	"America/Havana",
-	"America/Hermosillo",
-	"America/Indiana/Indianapolis",
-	"America/Indiana/Knox",
-	"America/Indiana/Marengo",
-	"America/Indiana/Petersburg",
-	"America/Indiana/Tell_City",
-	"America/Indiana/Vevay",
-	"America/Indiana/Vincennes",
-	"America/Indiana/Winamac",
-	"America/Indianapolis",
-	"America/Inuvik",
-	"America/Iqaluit",
-	"America/Jamaica",
-	"America/Jujuy",
-	"America/Juneau",
-	"America/Kentucky/Louisville",
-	"America/Kentucky/Monticello",
-	"America/Knox_IN",
-	"America/Kralendijk",
-	"America/La_Paz",
-	"America/Lima",
-	"America/Los_Angeles",
-	"America/Louisville",
-	"America/Lower_Princes",
-	"America/Maceio",
-	"America/Managua",
-	"America/Manaus",
-	"America/Marigot",
-	"America/Martinique",
-	"America/Matamoros",
-	"America/Mazatlan",
-	"America/Mendoza",
-	"America/Menominee",
-	"America/Merida",
-	"America/Metlakatla",
-	"America/Mexico_City",
-	"America/Miquelon",
-	"America/Moncton",
-	"America/Monterrey",
-	"America/Montevideo",
-	"America/Montreal",
-	"America/Montserrat",
-	"America/Nassau",
-	"America/New_York",
-	"America/Nipigon",
-	"America/Nome",
-	"America/Noronha",
-	"America/North_Dakota/Beulah",
-	"America/North_Dakota/Center",
-	"America/North_Dakota/New_Salem",
-	"America/Ojinaga",
-	"America/Panama",
-	"America/Pangnirtung",
-	"America/Paramaribo",
-	"America/Phoenix",
-	"America/Port-au-Prince",
-	"America/Port_of_Spain",
-	"America/Porto_Acre",
-	"America/Porto_Velho",
-	"America/Puerto_Rico",
-	"America/Punta_Arenas",
-	"America/Rainy_River",
-	"America/Rankin_Inlet",
-	"America/Recife",
-	"America/Regina",
-	"America/Resolute",
-	"America/Rio_Branco",
-	"America/Rosario",
-	"America/Santa_Isabel",
-	"America/Santarem",
-	"America/Santiago",
-	"America/Santo_Domingo",
-	"America/Sao_Paulo",
-	"America/Scoresbysund",
-	"America/Shiprock",
-	"America/Sitka",
-	"America/St_Barthelemy",
-	"America/St_Johns",
-	"America/St_Kitts",
-	"America/St_Lucia",
-	"America/St_Thomas",
-	"America/St_Vincent",
-	"America/Swift_Current",
-	"America/Tegucigalpa",
-	"America/Thule",
-	"America/Thunder_Bay",
-	"America/Tijuana",
-	"America/Toronto",
-	"America/Tortola",
-	"America/Vancouver",
-	"America/Virgin",
-	"America/Whitehorse",
-	"America/Winnipeg",
-	"America/Yakutat",
-	"America/Yellowknife",
-	"Antarctica/Casey",
-	"Antarctica/Davis",
-	"Antarctica/DumontDUrville",
-	"Antarctica/Macquarie",
-	"Antarctica/Mawson",
-	"Antarctica/McMurdo",
-	"Antarctica/Palmer",
-	"Antarctica/Rothera",
-	"Antarctica/South_Pole",
-	"Antarctica/Syowa",
-	"Antarctica/Troll",
-	"Antarctica/Vostok",
-	"Arctic/Longyearbyen",
-	"Asia/Aden",
-	"Asia/Almaty",
-	"Asia/Amman",
-	"Asia/Anadyr",
-	"Asia/Aqtau",
-	"Asia/Aqtobe",
-	"Asia/Ashgabat",
-	"Asia/Ashkhabad",
-	"Asia/Atyrau",
-	"Asia/Baghdad",
-	"Asia/Bahrain",
-	"Asia/Baku",
-	"Asia/Bangkok",
-	"Asia/Barnaul",
-	"Asia/Beirut",
-	"Asia/Bishkek",
-	"Asia/Brunei",
-	"Asia/Calcutta",
-	"Asia/Chita",
-	"Asia/Choibalsan",
-	"Asia/Chongqing",
-	"Asia/Chungking",
-	"Asia/Colombo",
-	"Asia/Dacca",
-	"Asia/Damascus",
-	"Asia/Dhaka",
-	"Asia/Dili",
-	"Asia/Dubai",
-	"Asia/Dushanbe",
-	"Asia/Famagusta",
-	"Asia/Gaza",
-	"Asia/Harbin",
-	"Asia/Hebron",
-	"Asia/Ho_Chi_Minh",
-	"Asia/Hong_Kong",
-	"Asia/Hovd",
-	"Asia/Irkutsk",
-	"Asia/Istanbul",
-	"Asia/Jakarta",
-	"Asia/Jayapura",
-	"Asia/Jerusalem",
-	"Asia/Kabul",
-	"Asia/Kamchatka",
-	"Asia/Karachi",
-	"Asia/Kashgar",
-	"Asia/Kathmandu",
-	"Asia/Katmandu",
-	"Asia/Khandyga",
-	"Asia/Kolkata",
-	"Asia/Krasnoyarsk",
-	"Asia/Kuala_Lumpur",
-	"Asia/Kuching",
-	"Asia/Kuwait",
-	"Asia/Macao",
-	"Asia/Macau",
-	"Asia/Magadan",
-	"Asia/Makassar",
-	"Asia/Manila",
-	"Asia/Muscat",
-	"Asia/Nicosia",
-	"Asia/Novokuznetsk",
-	"Asia/Novosibirsk",
-	"Asia/Omsk",
-	"Asia/Oral",
-	"Asia/Phnom_Penh",
-	"Asia/Pontianak",
-	"Asia/Pyongyang",
-	"Asia/Qatar",
-	"Asia/Qyzylorda",
-	"Asia/Rangoon",
-	"Asia/Riyadh",
-	"Asia/Saigon",
-	"Asia/Sakhalin",
-	"Asia/Samarkand",
-	"Asia/Seoul",
-	"Asia/Shanghai",
-	"Asia/Singapore",
-	"Asia/Srednekolymsk",
-	"Asia/Taipei",
-	"Asia/Tashkent",
-	"Asia/Tbilisi",
-	"Asia/Tehran",
-	"Asia/Tel_Aviv",
-	"Asia/Thimbu",
-	"Asia/Thimphu",
-	"Asia/Tokyo",
-	"Asia/Tomsk",
-	"Asia/Ujung_Pandang",
-	"Asia/Ulaanbaatar",
-	"Asia/Ulan_Bator",
-	"Asia/Urumqi",
-	"Asia/Ust-Nera",
-	"Asia/Vientiane",
-	"Asia/Vladivostok",
-	"Asia/Yakutsk",
-	"Asia/Yangon",
-	"Asia/Yekaterinburg",
-	"Asia/Yerevan",
-	"Atlantic/Azores",
-	"Atlantic/Bermuda",
-	"Atlantic/Canary",
-	"Atlantic/Cape_Verde",
-	"Atlantic/Faeroe",
-	"Atlantic/Faroe",
-	"Atlantic/Jan_Mayen",
-	"Atlantic/Madeira",
-	"Atlantic/Reykjavik",
-	"Atlantic/South_Georgia",
-	"Atlantic/St_Helena",
-	"Atlantic/Stanley",
-	"Australia/ACT",
-	"Australia/Adelaide",
-	"Australia/Brisbane",
-	"Australia/Broken_Hill",
-	"Australia/Canberra",
-	"Australia/Currie",
-	"Australia/Darwin",
-	"Australia/Eucla",
-	"Australia/Hobart",
-	"Australia/LHI",
-	"Australia/Lindeman",
-	"Australia/Lord_Howe",
-	"Australia/Melbourne",
-	"Australia/NSW",
-	"Australia/North",
-	"Australia/Perth",
-	"Australia/Queensland",
-	"Australia/South",
-	"Australia/Sydney",
-	"Australia/Tasmania",
-	"Australia/Victoria",
-	"Australia/West",
-	"Australia/Yancowinna",
-	"Brazil/Acre",
-	"Brazil/DeNoronha",
-	"Brazil/East",
-	"Brazil/West",
-	"CET",
-	"CST6CDT",
-	"Canada/Atlantic",
-	"Canada/Central",
-	"Canada/Eastern",
-	"Canada/Mountain",
-	"Canada/Newfoundland",
-	"Canada/Pacific",
-	"Canada/Saskatchewan",
-	"Canada/Yukon",
-	"Chile/Continental",
-	"Chile/EasterIsland",
-	"Cuba",
-	"EET",
-	"EST",
-	"EST5EDT",
-	"Egypt",
-	"Eire",
-	"Etc/GMT",
-	"Etc/GMT+0",
-	"Etc/GMT+1",
-	"Etc/GMT+10",
-	"Etc/GMT+11",
-	"Etc/GMT+12",
-	"Etc/GMT+2",
-	"Etc/GMT+3",
-	"Etc/GMT+4",
-	"Etc/GMT+5",
-	"Etc/GMT+6",
-	"Etc/GMT+7",
-	"Etc/GMT+8",
-	"Etc/GMT+9",
-	"Etc/GMT-0",
-	"Etc/GMT-1",
-	"Etc/GMT-10",
-	"Etc/GMT-11",
-	"Etc/GMT-12",
-	"Etc/GMT-13",
-	"Etc/GMT-14",
-	"Etc/GMT-2",
-	"Etc/GMT-3",
-	"Etc/GMT-4",
-	"Etc/GMT-5",
-	"Etc/GMT-6",
-	"Etc/GMT-7",
-	"Etc/GMT-8",
-	"Etc/GMT-9",
-	"Etc/GMT0",
-	"Etc/Greenwich",
-	"Etc/UCT",
-	"Etc/UTC",
-	"Etc/Universal",
-	"Etc/Zulu",
-	"Europe/Amsterdam",
-	"Europe/Andorra",
-	"Europe/Astrakhan",
-	"Europe/Athens",
-	"Europe/Belfast",
-	"Europe/Belgrade",
-	"Europe/Berlin",
-	"Europe/Bratislava",
-	"Europe/Brussels",
-	"Europe/Bucharest",
-	"Europe/Budapest",
-	"Europe/Busingen",
-	"Europe/Chisinau",
-	"Europe/Copenhagen",
-	"Europe/Dublin",
-	"Europe/Gibraltar",
-	"Europe/Guernsey",
-	"Europe/Helsinki",
-	"Europe/Isle_of_Man",
-	"Europe/Istanbul",
-	"Europe/Jersey",
-	"Europe/Kaliningrad",
-	"Europe/Kiev",
-	"Europe/Kirov",
-	"Europe/Lisbon",
-	"Europe/Ljubljana",
-	"Europe/London",
-	"Europe/Luxembourg",
-	"Europe/Madrid",
-	"Europe/Malta",
-	"Europe/Mariehamn",
-	"Europe/Minsk",
-	"Europe/Monaco",
-	"Europe/Moscow",
-	"Europe/Nicosia",
-	"Europe/Oslo",
-	"Europe/Paris",
-	"Europe/Podgorica",
-	"Europe/Prague",
-	"Europe/Riga",
-	"Europe/Rome",
-	"Europe/Samara",
-	"Europe/San_Marino",
-	"Europe/Sarajevo",
-	"Europe/Saratov",
-	"Europe/Simferopol",
-	"Europe/Skopje",
-	"Europe/Sofia",
-	"Europe/Stockholm",
-	"Europe/Tallinn",
-	"Europe/Tirane",
-	"Europe/Tiraspol",
-	"Europe/Ulyanovsk",
-	"Europe/Uzhgorod",
-	"Europe/Vaduz",
-	"Europe/Vatican",
-	"Europe/Vienna",
-	"Europe/Vilnius",
-	"Europe/Volgograd",
-	"Europe/Warsaw",
-	"Europe/Zagreb",
-	"Europe/Zaporozhye",
-	"Europe/Zurich",
-	"GB",
-	"GB-Eire",
-	"GMT",
-	"GMT+0",
-	"GMT-0",
-	"GMT0",
-	"Greenwich",
-	"HST",
-	"Hongkong",
-	"Iceland",
-	"Indian/Antananarivo",
-	"Indian/Chagos",
-	"Indian/Christmas",
-	"Indian/Cocos",
-	"Indian/Comoro",
-	"Indian/Kerguelen",
-	"Indian/Mahe",
-	"Indian/Maldives",
-	"Indian/Mauritius",
-	"Indian/Mayotte",
-	"Indian/Reunion",
-	"Iran",
-	"Israel",
-	"Jamaica",
-	"Japan",
-	"Kwajalein",
-	"Libya",
-	"MET",
-	"MST",
-	"MST7MDT",
-	"Mexico/BajaNorte",
-	"Mexico/BajaSur",
-	"Mexico/General",
-	"NZ",
-	"NZ-CHAT",
-	"Navajo",
-	"PRC",
-	"PST8PDT",
-	"Pacific/Apia",
-	"Pacific/Auckland",
-	"Pacific/Bougainville",
-	"Pacific/Chatham",
-	"Pacific/Chuuk",
-	"Pacific/Easter",
-	"Pacific/Efate",
-	"Pacific/Enderbury",
-	"Pacific/Fakaofo",
-	"Pacific/Fiji",
-	"Pacific/Funafuti",
-	"Pacific/Galapagos",
-	"Pacific/Gambier",
-	"Pacific/Guadalcanal",
-	"Pacific/Guam",
-	"Pacific/Honolulu",
-	"Pacific/Johnston",
-	"Pacific/Kiritimati",
-	"Pacific/Kosrae",
-	"Pacific/Kwajalein",
-	"Pacific/Majuro",
-	"Pacific/Marquesas",
-	"Pacific/Midway",
-	"Pacific/Nauru",
-	"Pacific/Niue",
-	"Pacific/Norfolk",
-	"Pacific/Noumea",
-	"Pacific/Pago_Pago",
-	"Pacific/Palau",
-	"Pacific/Pitcairn",
-	"Pacific/Pohnpei",
-	"Pacific/Ponape",
-	"Pacific/Port_Moresby",
-	"Pacific/Rarotonga",
-	"Pacific/Saipan",
-	"Pacific/Samoa",
-	"Pacific/Tahiti",
-	"Pacific/Tarawa",
-	"Pacific/Tongatapu",
-	"Pacific/Truk",
-	"Pacific/Wake",
-	"Pacific/Wallis",
-	"Pacific/Yap",
-	"Poland",
-	"Portugal",
-	"ROC",
-	"ROK",
-	"Singapore",
-	"Turkey",
-	"UCT",
-	"US/Alaska",
-	"US/Aleutian",
-	"US/Arizona",
-	"US/Central",
-	"US/East-Indiana",
-	"US/Eastern",
-	"US/Hawaii",
-	"US/Indiana-Starke",
-	"US/Michigan",
-	"US/Mountain",
-	"US/Pacific",
-	"US/Pacific-New",
-	"US/Samoa",
-	"UTC",
-	"Universal",
-	"W-SU",
-	"WET",
-	"Zulu",
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/services/timezones/timezones.go b/vendor/github.com/mattermost/mattermost-server/v5/services/timezones/timezones.go
deleted file mode 100644
index e211a4cd..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/services/timezones/timezones.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package timezones
-
-type Timezones struct {
-	supportedZones []string
-}
-
-func New() *Timezones {
-	timezones := Timezones{}
-
-	timezones.supportedZones = DefaultSupportedTimezones
-
-	return &timezones
-}
-
-func (t *Timezones) GetSupported() []string {
-	return t.supportedZones
-}
-
-func DefaultUserTimezone() map[string]string {
-	defaultTimezone := make(map[string]string)
-	defaultTimezone["useAutomaticTimezone"] = "true"
-	defaultTimezone["automaticTimezone"] = ""
-	defaultTimezone["manualTimezone"] = ""
-
-	return defaultTimezone
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/filestore/filesstore.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/filestore/filesstore.go
deleted file mode 100644
index ef02895d..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/filestore/filesstore.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package filestore
-
-import (
-	"io"
-	"time"
-
-	"github.com/pkg/errors"
-)
-
-const (
-	driverS3    = "amazons3"
-	driverLocal = "local"
-)
-
-type ReadCloseSeeker interface {
-	io.ReadCloser
-	io.Seeker
-}
-
-type FileBackend interface {
-	TestConnection() error
-
-	Reader(path string) (ReadCloseSeeker, error)
-	ReadFile(path string) ([]byte, error)
-	FileExists(path string) (bool, error)
-	FileSize(path string) (int64, error)
-	CopyFile(oldPath, newPath string) error
-	MoveFile(oldPath, newPath string) error
-	WriteFile(fr io.Reader, path string) (int64, error)
-	AppendFile(fr io.Reader, path string) (int64, error)
-	RemoveFile(path string) error
-	FileModTime(path string) (time.Time, error)
-
-	ListDirectory(path string) ([]string, error)
-	RemoveDirectory(path string) error
-}
-
-type FileBackendSettings struct {
-	DriverName              string
-	Directory               string
-	AmazonS3AccessKeyId     string
-	AmazonS3SecretAccessKey string
-	AmazonS3Bucket          string
-	AmazonS3PathPrefix      string
-	AmazonS3Region          string
-	AmazonS3Endpoint        string
-	AmazonS3SSL             bool
-	AmazonS3SignV2          bool
-	AmazonS3SSE             bool
-	AmazonS3Trace           bool
-}
-
-func (settings *FileBackendSettings) CheckMandatoryS3Fields() error {
-	if settings.AmazonS3Bucket == "" {
-		return errors.New("missing s3 bucket settings")
-	}
-
-	// if S3 endpoint is not set call the set defaults to set that
-	if settings.AmazonS3Endpoint == "" {
-		settings.AmazonS3Endpoint = "s3.amazonaws.com"
-	}
-
-	return nil
-}
-
-func NewFileBackend(settings FileBackendSettings) (FileBackend, error) {
-	switch settings.DriverName {
-	case driverS3:
-		backend, err := NewS3FileBackend(settings)
-		if err != nil {
-			return nil, errors.Wrap(err, "unable to connect to the s3 backend")
-		}
-		return backend, nil
-	case driverLocal:
-		return &LocalFileBackend{
-			directory: settings.Directory,
-		}, nil
-	}
-	return nil, errors.New("no valid filestorage driver found")
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/filestore/localstore.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/filestore/localstore.go
deleted file mode 100644
index 6cd8c4ca..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/filestore/localstore.go
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package filestore
-
-import (
-	"bytes"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"time"
-
-	"github.com/pkg/errors"
-
-	"github.com/mattermost/mattermost-server/v5/shared/mlog"
-)
-
-const (
-	TestFilePath = "/testfile"
-)
-
-type LocalFileBackend struct {
-	directory string
-}
-
-// copyFile will copy a file from src path to dst path.
-// Overwrites any existing files at dst.
-// Permissions are copied from file at src to the new file at dst.
-func copyFile(src, dst string) (err error) {
-	in, err := os.Open(src)
-	if err != nil {
-		return
-	}
-	defer in.Close()
-
-	if err = os.MkdirAll(filepath.Dir(dst), os.ModePerm); err != nil {
-		return
-	}
-	out, err := os.Create(dst)
-	if err != nil {
-		return
-	}
-	defer func() {
-		if e := out.Close(); e != nil {
-			err = e
-		}
-	}()
-
-	_, err = io.Copy(out, in)
-	if err != nil {
-		return
-	}
-
-	err = out.Sync()
-	if err != nil {
-		return
-	}
-
-	stat, err := os.Stat(src)
-	if err != nil {
-		return
-	}
-	err = os.Chmod(dst, stat.Mode())
-	if err != nil {
-		return
-	}
-
-	return
-}
-
-func (b *LocalFileBackend) TestConnection() error {
-	f := bytes.NewReader([]byte("testingwrite"))
-	if _, err := writeFileLocally(f, filepath.Join(b.directory, TestFilePath)); err != nil {
-		return errors.Wrap(err, "unable to write to the local filesystem storage")
-	}
-	os.Remove(filepath.Join(b.directory, TestFilePath))
-	mlog.Debug("Able to write files to local storage.")
-	return nil
-}
-
-func (b *LocalFileBackend) Reader(path string) (ReadCloseSeeker, error) {
-	f, err := os.Open(filepath.Join(b.directory, path))
-	if err != nil {
-		return nil, errors.Wrapf(err, "unable to open file %s", path)
-	}
-	return f, nil
-}
-
-func (b *LocalFileBackend) ReadFile(path string) ([]byte, error) {
-	f, err := ioutil.ReadFile(filepath.Join(b.directory, path))
-	if err != nil {
-		return nil, errors.Wrapf(err, "unable to read file %s", path)
-	}
-	return f, nil
-}
-
-func (b *LocalFileBackend) FileExists(path string) (bool, error) {
-	_, err := os.Stat(filepath.Join(b.directory, path))
-
-	if os.IsNotExist(err) {
-		return false, nil
-	}
-
-	if err != nil {
-		return false, errors.Wrapf(err, "unable to know if file %s exists", path)
-	}
-	return true, nil
-}
-
-func (b *LocalFileBackend) FileSize(path string) (int64, error) {
-	info, err := os.Stat(filepath.Join(b.directory, path))
-	if err != nil {
-		return 0, errors.Wrapf(err, "unable to get file size for %s", path)
-	}
-	return info.Size(), nil
-}
-
-func (b *LocalFileBackend) FileModTime(path string) (time.Time, error) {
-	info, err := os.Stat(filepath.Join(b.directory, path))
-	if err != nil {
-		return time.Time{}, errors.Wrapf(err, "unable to get modification time for file %s", path)
-	}
-	return info.ModTime(), nil
-}
-
-func (b *LocalFileBackend) CopyFile(oldPath, newPath string) error {
-	if err := copyFile(filepath.Join(b.directory, oldPath), filepath.Join(b.directory, newPath)); err != nil {
-		return errors.Wrapf(err, "unable to copy file from %s to %s", oldPath, newPath)
-	}
-	return nil
-}
-
-func (b *LocalFileBackend) MoveFile(oldPath, newPath string) error {
-	if err := os.MkdirAll(filepath.Dir(filepath.Join(b.directory, newPath)), 0750); err != nil {
-		return errors.Wrapf(err, "unable to create the new destination directory %s", filepath.Dir(newPath))
-	}
-
-	if err := os.Rename(filepath.Join(b.directory, oldPath), filepath.Join(b.directory, newPath)); err != nil {
-		return errors.Wrapf(err, "unable to move the file to %s to the destination directory", newPath)
-	}
-
-	return nil
-}
-
-func (b *LocalFileBackend) WriteFile(fr io.Reader, path string) (int64, error) {
-	return writeFileLocally(fr, filepath.Join(b.directory, path))
-}
-
-func writeFileLocally(fr io.Reader, path string) (int64, error) {
-	if err := os.MkdirAll(filepath.Dir(path), 0750); err != nil {
-		directory, _ := filepath.Abs(filepath.Dir(path))
-		return 0, errors.Wrapf(err, "unable to create the directory %s for the file %s", directory, path)
-	}
-	fw, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
-	if err != nil {
-		return 0, errors.Wrapf(err, "unable to open the file %s to write the data", path)
-	}
-	defer fw.Close()
-	written, err := io.Copy(fw, fr)
-	if err != nil {
-		return written, errors.Wrapf(err, "unable write the data in the file %s", path)
-	}
-	return written, nil
-}
-
-func (b *LocalFileBackend) AppendFile(fr io.Reader, path string) (int64, error) {
-	fp := filepath.Join(b.directory, path)
-	if _, err := os.Stat(fp); err != nil {
-		return 0, errors.Wrapf(err, "unable to find the file %s to append the data", path)
-	}
-	fw, err := os.OpenFile(fp, os.O_WRONLY|os.O_APPEND, 0600)
-	if err != nil {
-		return 0, errors.Wrapf(err, "unable to open the file %s to append the data", path)
-	}
-	defer fw.Close()
-	written, err := io.Copy(fw, fr)
-	if err != nil {
-		return written, errors.Wrapf(err, "unable append the data in the file %s", path)
-	}
-	return written, nil
-}
-
-func (b *LocalFileBackend) RemoveFile(path string) error {
-	if err := os.Remove(filepath.Join(b.directory, path)); err != nil {
-		return errors.Wrapf(err, "unable to remove the file %s", path)
-	}
-	return nil
-}
-
-func (b *LocalFileBackend) ListDirectory(path string) ([]string, error) {
-	var paths []string
-	fileInfos, err := ioutil.ReadDir(filepath.Join(b.directory, path))
-	if err != nil {
-		if os.IsNotExist(err) {
-			return paths, nil
-		}
-		return nil, errors.Wrapf(err, "unable to list the directory %s", path)
-	}
-	for _, fileInfo := range fileInfos {
-		paths = append(paths, filepath.Join(path, fileInfo.Name()))
-	}
-	return paths, nil
-}
-
-func (b *LocalFileBackend) RemoveDirectory(path string) error {
-	if err := os.RemoveAll(filepath.Join(b.directory, path)); err != nil {
-		return errors.Wrapf(err, "unable to remove the directory %s", path)
-	}
-	return nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/filestore/s3_overrides.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/filestore/s3_overrides.go
deleted file mode 100644
index e7b29b98..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/filestore/s3_overrides.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package filestore
-
-import (
-	"context"
-	"net/http"
-
-	"github.com/minio/minio-go/v7/pkg/credentials"
-)
-
-// customTransport is used to point the request to a different server.
-// This is helpful in situations where a different service is handling AWS S3 requests
-// from multiple Mattermost applications, and the Mattermost service itself does not
-// have any S3 credentials.
-type customTransport struct {
-	base   http.RoundTripper
-	host   string
-	scheme string
-	client http.Client
-}
-
-// RoundTrip implements the http.Roundtripper interface.
-func (t *customTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	// Rountrippers should not modify the original request.
-	newReq := req.Clone(context.Background())
-	*newReq.URL = *req.URL
-	req.URL.Scheme = t.scheme
-	req.URL.Host = t.host
-	return t.client.Do(req)
-}
-
-// customProvider is a dummy credentials provider for the minio client to work
-// without actually providing credentials. This is needed with a custom transport
-// in cases where the minio client does not actually have credentials with itself,
-// rather needs responses from another entity.
-//
-// It satisfies the credentials.Provider interface.
-type customProvider struct {
-	isSignV2 bool
-}
-
-// Retrieve just returns empty credentials.
-func (cp customProvider) Retrieve() (credentials.Value, error) {
-	sign := credentials.SignatureV4
-	if cp.isSignV2 {
-		sign = credentials.SignatureV2
-	}
-	return credentials.Value{
-		SignerType: sign,
-	}, nil
-}
-
-// IsExpired always returns false.
-func (cp customProvider) IsExpired() bool { return false }
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/filestore/s3store.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/filestore/s3store.go
deleted file mode 100644
index 5d0bf38e..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/filestore/s3store.go
+++ /dev/null
@@ -1,442 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package filestore
-
-import (
-	"context"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	s3 "github.com/minio/minio-go/v7"
-	"github.com/minio/minio-go/v7/pkg/credentials"
-	"github.com/minio/minio-go/v7/pkg/encrypt"
-	"github.com/pkg/errors"
-
-	"github.com/mattermost/mattermost-server/v5/shared/mlog"
-)
-
-// S3FileBackend contains all necessary information to communicate with
-// an AWS S3 compatible API backend.
-type S3FileBackend struct {
-	endpoint   string
-	accessKey  string
-	secretKey  string
-	secure     bool
-	signV2     bool
-	region     string
-	bucket     string
-	pathPrefix string
-	encrypt    bool
-	trace      bool
-	client     *s3.Client
-}
-
-type S3FileBackendAuthError struct {
-	DetailedError string
-}
-
-// S3FileBackendNoBucketError is returned when testing a connection and no S3 bucket is found
-type S3FileBackendNoBucketError struct{}
-
-const (
-	// This is not exported by minio. See: https://github.com/minio/minio-go/issues/1339
-	bucketNotFound = "NoSuchBucket"
-)
-
-var (
-	imageExtensions = map[string]bool{".jpg": true, ".jpeg": true, ".gif": true, ".bmp": true, ".png": true, ".tiff": true, "tif": true}
-	imageMimeTypes  = map[string]string{".jpg": "image/jpeg", ".jpeg": "image/jpeg", ".gif": "image/gif", ".bmp": "image/bmp", ".png": "image/png", ".tiff": "image/tiff", ".tif": "image/tif"}
-)
-
-func isFileExtImage(ext string) bool {
-	ext = strings.ToLower(ext)
-	return imageExtensions[ext]
-}
-
-func getImageMimeType(ext string) string {
-	ext = strings.ToLower(ext)
-	if imageMimeTypes[ext] == "" {
-		return "image"
-	}
-	return imageMimeTypes[ext]
-}
-
-func (s *S3FileBackendAuthError) Error() string {
-	return s.DetailedError
-}
-
-func (s *S3FileBackendNoBucketError) Error() string {
-	return "no such bucket"
-}
-
-// NewS3FileBackend returns an instance of an S3FileBackend.
-func NewS3FileBackend(settings FileBackendSettings) (*S3FileBackend, error) {
-	backend := &S3FileBackend{
-		endpoint:   settings.AmazonS3Endpoint,
-		accessKey:  settings.AmazonS3AccessKeyId,
-		secretKey:  settings.AmazonS3SecretAccessKey,
-		secure:     settings.AmazonS3SSL,
-		signV2:     settings.AmazonS3SignV2,
-		region:     settings.AmazonS3Region,
-		bucket:     settings.AmazonS3Bucket,
-		pathPrefix: settings.AmazonS3PathPrefix,
-		encrypt:    settings.AmazonS3SSE,
-		trace:      settings.AmazonS3Trace,
-	}
-	cli, err := backend.s3New()
-	if err != nil {
-		return nil, err
-	}
-	backend.client = cli
-	return backend, nil
-}
-
-// Similar to s3.New() but allows initialization of signature v2 or signature v4 client.
-// If signV2 input is false, function always returns signature v4.
-//
-// Additionally this function also takes a user defined region, if set
-// disables automatic region lookup.
-func (b *S3FileBackend) s3New() (*s3.Client, error) {
-	var creds *credentials.Credentials
-
-	isCloud := os.Getenv("MM_CLOUD_FILESTORE_BIFROST") != ""
-	if isCloud {
-		creds = credentials.New(customProvider{isSignV2: b.signV2})
-	} else if b.accessKey == "" && b.secretKey == "" {
-		creds = credentials.NewIAM("")
-	} else if b.signV2 {
-		creds = credentials.NewStatic(b.accessKey, b.secretKey, "", credentials.SignatureV2)
-	} else {
-		creds = credentials.NewStatic(b.accessKey, b.secretKey, "", credentials.SignatureV4)
-	}
-
-	opts := s3.Options{
-		Creds:  creds,
-		Secure: b.secure,
-		Region: b.region,
-	}
-
-	// If this is a cloud installation, we override the default transport.
-	if isCloud {
-		tr, err := s3.DefaultTransport(b.secure)
-		if err != nil {
-			return nil, err
-		}
-		scheme := "http"
-		if b.secure {
-			scheme = "https"
-		}
-		opts.Transport = &customTransport{
-			base:   tr,
-			host:   b.endpoint,
-			scheme: scheme,
-		}
-	}
-
-	s3Clnt, err := s3.New(b.endpoint, &opts)
-	if err != nil {
-		return nil, err
-	}
-
-	if b.trace {
-		s3Clnt.TraceOn(os.Stdout)
-	}
-
-	return s3Clnt, nil
-}
-
-func (b *S3FileBackend) TestConnection() error {
-	exists := true
-	var err error
-	// If a path prefix is present, we attempt to test the bucket by listing objects under the path
-	// and just checking the first response. This is because the BucketExists call is only at a bucket level
-	// and sometimes the user might only be allowed access to the specified path prefix.
-	if b.pathPrefix != "" {
-		obj := <-b.client.ListObjects(context.Background(), b.bucket, s3.ListObjectsOptions{Prefix: b.pathPrefix})
-		if obj.Err != nil {
-			typedErr := s3.ToErrorResponse(obj.Err)
-			if typedErr.Code != bucketNotFound {
-				return &S3FileBackendAuthError{DetailedError: "unable to list objects in the S3 bucket"}
-			}
-			exists = false
-		}
-	} else {
-		exists, err = b.client.BucketExists(context.Background(), b.bucket)
-		if err != nil {
-			return &S3FileBackendAuthError{DetailedError: "unable to check if the S3 bucket exists"}
-		}
-	}
-
-	if !exists {
-		return &S3FileBackendNoBucketError{}
-	}
-	mlog.Debug("Connection to S3 or minio is good. Bucket exists.")
-	return nil
-}
-
-func (b *S3FileBackend) MakeBucket() error {
-	err := b.client.MakeBucket(context.Background(), b.bucket, s3.MakeBucketOptions{Region: b.region})
-	if err != nil {
-		return errors.Wrap(err, "unable to create the s3 bucket")
-	}
-	return nil
-}
-
-// Caller must close the first return value
-func (b *S3FileBackend) Reader(path string) (ReadCloseSeeker, error) {
-	path = filepath.Join(b.pathPrefix, path)
-	minioObject, err := b.client.GetObject(context.Background(), b.bucket, path, s3.GetObjectOptions{})
-	if err != nil {
-		return nil, errors.Wrapf(err, "unable to open file %s", path)
-	}
-
-	return minioObject, nil
-}
-
-func (b *S3FileBackend) ReadFile(path string) ([]byte, error) {
-	path = filepath.Join(b.pathPrefix, path)
-	minioObject, err := b.client.GetObject(context.Background(), b.bucket, path, s3.GetObjectOptions{})
-	if err != nil {
-		return nil, errors.Wrapf(err, "unable to open file %s", path)
-	}
-
-	defer minioObject.Close()
-	f, err := ioutil.ReadAll(minioObject)
-	if err != nil {
-		return nil, errors.Wrapf(err, "unable to read file %s", path)
-	}
-	return f, nil
-}
-
-func (b *S3FileBackend) FileExists(path string) (bool, error) {
-	path = filepath.Join(b.pathPrefix, path)
-
-	_, err := b.client.StatObject(context.Background(), b.bucket, path, s3.StatObjectOptions{})
-	if err == nil {
-		return true, nil
-	}
-
-	var s3Err s3.ErrorResponse
-	if errors.As(err, &s3Err); s3Err.Code == "NoSuchKey" {
-		return false, nil
-	}
-
-	return false, errors.Wrapf(err, "unable to know if file %s exists", path)
-}
-
-func (b *S3FileBackend) FileSize(path string) (int64, error) {
-	path = filepath.Join(b.pathPrefix, path)
-
-	info, err := b.client.StatObject(context.Background(), b.bucket, path, s3.StatObjectOptions{})
-	if err != nil {
-		return 0, errors.Wrapf(err, "unable to get file size for %s", path)
-	}
-
-	return info.Size, nil
-}
-
-func (b *S3FileBackend) FileModTime(path string) (time.Time, error) {
-	path = filepath.Join(b.pathPrefix, path)
-
-	info, err := b.client.StatObject(context.Background(), b.bucket, path, s3.StatObjectOptions{})
-	if err != nil {
-		return time.Time{}, errors.Wrapf(err, "unable to get modification time for file %s", path)
-	}
-
-	return info.LastModified, nil
-}
-
-func (b *S3FileBackend) CopyFile(oldPath, newPath string) error {
-	oldPath = filepath.Join(b.pathPrefix, oldPath)
-	newPath = filepath.Join(b.pathPrefix, newPath)
-	srcOpts := s3.CopySrcOptions{
-		Bucket:     b.bucket,
-		Object:     oldPath,
-		Encryption: encrypt.NewSSE(),
-	}
-	dstOpts := s3.CopyDestOptions{
-		Bucket:     b.bucket,
-		Object:     newPath,
-		Encryption: encrypt.NewSSE(),
-	}
-	if _, err := b.client.CopyObject(context.Background(), dstOpts, srcOpts); err != nil {
-		return errors.Wrapf(err, "unable to copy file from %s to %s", oldPath, newPath)
-	}
-	return nil
-}
-
-func (b *S3FileBackend) MoveFile(oldPath, newPath string) error {
-	oldPath = filepath.Join(b.pathPrefix, oldPath)
-	newPath = filepath.Join(b.pathPrefix, newPath)
-	srcOpts := s3.CopySrcOptions{
-		Bucket:     b.bucket,
-		Object:     oldPath,
-		Encryption: encrypt.NewSSE(),
-	}
-	dstOpts := s3.CopyDestOptions{
-		Bucket:     b.bucket,
-		Object:     newPath,
-		Encryption: encrypt.NewSSE(),
-	}
-
-	if _, err := b.client.CopyObject(context.Background(), dstOpts, srcOpts); err != nil {
-		return errors.Wrapf(err, "unable to copy the file to %s to the new destionation", newPath)
-	}
-
-	if err := b.client.RemoveObject(context.Background(), b.bucket, oldPath, s3.RemoveObjectOptions{}); err != nil {
-		return errors.Wrapf(err, "unable to remove the file old file %s", oldPath)
-	}
-
-	return nil
-}
-
-func (b *S3FileBackend) WriteFile(fr io.Reader, path string) (int64, error) {
-	var contentType string
-	path = filepath.Join(b.pathPrefix, path)
-	if ext := filepath.Ext(path); isFileExtImage(ext) {
-		contentType = getImageMimeType(ext)
-	} else {
-		contentType = "binary/octet-stream"
-	}
-
-	options := s3PutOptions(b.encrypt, contentType)
-	info, err := b.client.PutObject(context.Background(), b.bucket, path, fr, -1, options)
-	if err != nil {
-		return info.Size, errors.Wrapf(err, "unable write the data in the file %s", path)
-	}
-
-	return info.Size, nil
-}
-
-func (b *S3FileBackend) AppendFile(fr io.Reader, path string) (int64, error) {
-	fp := filepath.Join(b.pathPrefix, path)
-	if _, err := b.client.StatObject(context.Background(), b.bucket, fp, s3.StatObjectOptions{}); err != nil {
-		return 0, errors.Wrapf(err, "unable to find the file %s to append the data", path)
-	}
-
-	var contentType string
-	if ext := filepath.Ext(fp); isFileExtImage(ext) {
-		contentType = getImageMimeType(ext)
-	} else {
-		contentType = "binary/octet-stream"
-	}
-
-	options := s3PutOptions(b.encrypt, contentType)
-	sse := options.ServerSideEncryption
-	partName := fp + ".part"
-	info, err := b.client.PutObject(context.Background(), b.bucket, partName, fr, -1, options)
-	defer b.client.RemoveObject(context.Background(), b.bucket, partName, s3.RemoveObjectOptions{})
-	if info.Size > 0 {
-		src1Opts := s3.CopySrcOptions{
-			Bucket: b.bucket,
-			Object: fp,
-		}
-		src2Opts := s3.CopySrcOptions{
-			Bucket: b.bucket,
-			Object: partName,
-		}
-		dstOpts := s3.CopyDestOptions{
-			Bucket:     b.bucket,
-			Object:     fp,
-			Encryption: sse,
-		}
-		_, err = b.client.ComposeObject(context.Background(), dstOpts, src1Opts, src2Opts)
-		if err != nil {
-			return 0, errors.Wrapf(err, "unable append the data in the file %s", path)
-		}
-		return info.Size, nil
-	}
-
-	return 0, errors.Wrapf(err, "unable append the data in the file %s", path)
-}
-
-func (b *S3FileBackend) RemoveFile(path string) error {
-	path = filepath.Join(b.pathPrefix, path)
-	if err := b.client.RemoveObject(context.Background(), b.bucket, path, s3.RemoveObjectOptions{}); err != nil {
-		return errors.Wrapf(err, "unable to remove the file %s", path)
-	}
-
-	return nil
-}
-
-func getPathsFromObjectInfos(in <-chan s3.ObjectInfo) <-chan s3.ObjectInfo {
-	out := make(chan s3.ObjectInfo, 1)
-
-	go func() {
-		defer close(out)
-
-		for {
-			info, done := <-in
-
-			if !done {
-				break
-			}
-
-			out <- info
-		}
-	}()
-
-	return out
-}
-
-func (b *S3FileBackend) ListDirectory(path string) ([]string, error) {
-	path = filepath.Join(b.pathPrefix, path)
-	if !strings.HasSuffix(path, "/") && path != "" {
-		// s3Clnt returns only the path itself when "/" is not present
-		// appending "/" to make it consistent across all filestores
-		path = path + "/"
-	}
-
-	opts := s3.ListObjectsOptions{
-		Prefix: path,
-	}
-	var paths []string
-	for object := range b.client.ListObjects(context.Background(), b.bucket, opts) {
-		if object.Err != nil {
-			return nil, errors.Wrapf(object.Err, "unable to list the directory %s", path)
-		}
-		// We strip the path prefix that gets applied,
-		// so that it remains transparent to the application.
-		object.Key = strings.TrimPrefix(object.Key, b.pathPrefix)
-		trimmed := strings.Trim(object.Key, "/")
-		if trimmed != "" {
-			paths = append(paths, trimmed)
-		}
-	}
-
-	return paths, nil
-}
-
-func (b *S3FileBackend) RemoveDirectory(path string) error {
-	opts := s3.ListObjectsOptions{
-		Prefix:    filepath.Join(b.pathPrefix, path),
-		Recursive: true,
-	}
-	list := b.client.ListObjects(context.Background(), b.bucket, opts)
-	objectsCh := b.client.RemoveObjects(context.Background(), b.bucket, getPathsFromObjectInfos(list), s3.RemoveObjectsOptions{})
-	for err := range objectsCh {
-		if err.Err != nil {
-			return errors.Wrapf(err.Err, "unable to remove the directory %s", path)
-		}
-	}
-
-	return nil
-}
-
-func s3PutOptions(encrypted bool, contentType string) s3.PutObjectOptions {
-	options := s3.PutObjectOptions{}
-	if encrypted {
-		options.ServerSideEncryption = encrypt.NewSSE()
-	}
-	options.ContentType = contentType
-	// We set the part size to the minimum allowed value of 5MBs
-	// to avoid an excessive allocation in minio.PutObject implementation.
-	options.PartSize = 1024 * 1024 * 5
-
-	return options
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/i18n/i18n.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/i18n/i18n.go
deleted file mode 100644
index a5de30bb..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/i18n/i18n.go
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package i18n
-
-import (
-	"fmt"
-	"html/template"
-	"io/ioutil"
-	"net/http"
-	"path/filepath"
-	"reflect"
-	"strings"
-
-	"github.com/mattermost/go-i18n/i18n"
-
-	"github.com/mattermost/mattermost-server/v5/shared/mlog"
-)
-
-const defaultLocale = "en"
-
-// TranslateFunc is the type of the translate functions
-type TranslateFunc func(translationID string, args ...interface{}) string
-
-// T is the translate function using the default server language as fallback language
-var T TranslateFunc
-
-// TDefault is the translate function using english as fallback language
-var TDefault TranslateFunc
-
-var locales map[string]string = make(map[string]string)
-var defaultServerLocale string
-var defaultClientLocale string
-
-// TranslationsPreInit loads translations from filesystem if they are not
-// loaded already and assigns english while loading server config
-func TranslationsPreInit(translationsDir string) error {
-	if T != nil {
-		return nil
-	}
-
-	// Set T even if we fail to load the translations. Lots of shutdown handling code will
-	// segfault trying to handle the error, and the untranslated IDs are strictly better.
-	T = tfuncWithFallback(defaultLocale)
-	TDefault = tfuncWithFallback(defaultLocale)
-
-	return initTranslationsWithDir(translationsDir)
-}
-
-// InitTranslations set the defaults configured in the server and initialize
-// the T function using the server default as fallback language
-func InitTranslations(serverLocale, clientLocale string) error {
-	defaultServerLocale = serverLocale
-	defaultClientLocale = clientLocale
-
-	var err error
-	T, err = getTranslationsBySystemLocale()
-	return err
-}
-
-func initTranslationsWithDir(dir string) error {
-	files, _ := ioutil.ReadDir(dir)
-	for _, f := range files {
-		if filepath.Ext(f.Name()) == ".json" {
-			filename := f.Name()
-			locales[strings.Split(filename, ".")[0]] = filepath.Join(dir, filename)
-
-			if err := i18n.LoadTranslationFile(filepath.Join(dir, filename)); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func getTranslationsBySystemLocale() (TranslateFunc, error) {
-	locale := defaultServerLocale
-	if _, ok := locales[locale]; !ok {
-		mlog.Warn("Failed to load system translations for", mlog.String("locale", locale), mlog.String("attempting to fall back to default locale", defaultLocale))
-		locale = defaultLocale
-	}
-
-	if locales[locale] == "" {
-		return nil, fmt.Errorf("failed to load system translations for '%v'", defaultLocale)
-	}
-
-	translations := tfuncWithFallback(locale)
-	if translations == nil {
-		return nil, fmt.Errorf("failed to load system translations")
-	}
-
-	mlog.Info("Loaded system translations", mlog.String("for locale", locale), mlog.String("from locale", locales[locale]))
-	return translations, nil
-}
-
-// GetUserTranslations get the translation function for an specific locale
-func GetUserTranslations(locale string) TranslateFunc {
-	if _, ok := locales[locale]; !ok {
-		locale = defaultLocale
-	}
-
-	translations := tfuncWithFallback(locale)
-	return translations
-}
-
-// GetTranslationsAndLocaleFromRequest return the translation function and the
-// locale based on a request headers
-func GetTranslationsAndLocaleFromRequest(r *http.Request) (TranslateFunc, string) {
-	// This is for checking against locales like pt_BR or zn_CN
-	headerLocaleFull := strings.Split(r.Header.Get("Accept-Language"), ",")[0]
-	// This is for checking against locales like en, es
-	headerLocale := strings.Split(strings.Split(r.Header.Get("Accept-Language"), ",")[0], "-")[0]
-	defaultLocale := defaultClientLocale
-	if locales[headerLocaleFull] != "" {
-		translations := tfuncWithFallback(headerLocaleFull)
-		return translations, headerLocaleFull
-	} else if locales[headerLocale] != "" {
-		translations := tfuncWithFallback(headerLocale)
-		return translations, headerLocale
-	} else if locales[defaultLocale] != "" {
-		translations := tfuncWithFallback(defaultLocale)
-		return translations, headerLocale
-	}
-
-	translations := tfuncWithFallback(defaultLocale)
-	return translations, defaultLocale
-}
-
-// GetSupportedLocales return a map of locale code and the file path with the
-// translations
-func GetSupportedLocales() map[string]string {
-	return locales
-}
-
-func tfuncWithFallback(pref string) TranslateFunc {
-	t, _ := i18n.Tfunc(pref)
-	return func(translationID string, args ...interface{}) string {
-		if translated := t(translationID, args...); translated != translationID {
-			return translated
-		}
-
-		t, _ := i18n.Tfunc(defaultLocale)
-		return t(translationID, args...)
-	}
-}
-
-// TranslateAsHTML translates the translationID provided and return a
-// template.HTML object
-func TranslateAsHTML(t TranslateFunc, translationID string, args map[string]interface{}) template.HTML {
-	message := t(translationID, escapeForHTML(args))
-	message = strings.Replace(message, "[[", "<strong>", -1)
-	message = strings.Replace(message, "]]", "</strong>", -1)
-	return template.HTML(message)
-}
-
-func escapeForHTML(arg interface{}) interface{} {
-	switch typedArg := arg.(type) {
-	case string:
-		return template.HTMLEscapeString(typedArg)
-	case *string:
-		return template.HTMLEscapeString(*typedArg)
-	case map[string]interface{}:
-		safeArg := make(map[string]interface{}, len(typedArg))
-		for key, value := range typedArg {
-			safeArg[key] = escapeForHTML(value)
-		}
-		return safeArg
-	default:
-		mlog.Warn(
-			"Unable to escape value for HTML template",
-			mlog.Any("html_template", arg),
-			mlog.String("template_type", reflect.ValueOf(arg).Type().String()),
-		)
-		return ""
-	}
-}
-
-// IdentityTfunc returns a translation function that don't translate, only
-// returns the same id
-func IdentityTfunc() TranslateFunc {
-	return func(translationID string, args ...interface{}) string {
-		return translationID
-	}
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/autolink.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/autolink.go
deleted file mode 100644
index 2eb05d90..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/autolink.go
+++ /dev/null
@@ -1,255 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package markdown
-
-import (
-	"regexp"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-)
-
-// Based off of extensions/autolink.c from https://github.com/github/cmark
-
-var (
-	DefaultURLSchemes = []string{"http", "https", "ftp", "mailto", "tel"}
-	wwwAutoLinkRegex  = regexp.MustCompile(`^www\d{0,3}\.`)
-)
-
-// Given a string with a w at the given position, tries to parse and return a range containing a www link.
-// if one exists. If the text at the given position isn't a link, returns an empty string. Equivalent to
-// www_match from the reference code.
-func parseWWWAutolink(data string, position int) (Range, bool) {
-	// Check that this isn't part of another word
-	if position > 1 {
-		prevChar := data[position-1]
-
-		if !isWhitespaceByte(prevChar) && !isAllowedBeforeWWWLink(prevChar) {
-			return Range{}, false
-		}
-	}
-
-	// Check that this starts with www
-	if len(data)-position < 4 || !wwwAutoLinkRegex.MatchString(data[position:]) {
-		return Range{}, false
-	}
-
-	end := checkDomain(data[position:], false)
-	if end == 0 {
-		return Range{}, false
-	}
-
-	end += position
-
-	// Grab all text until the end of the string or the next whitespace character
-	for end < len(data) && !isWhitespaceByte(data[end]) {
-		end += 1
-	}
-
-	// Trim trailing punctuation
-	end = trimTrailingCharactersFromLink(data, position, end)
-	if position == end {
-		return Range{}, false
-	}
-
-	return Range{position, end}, true
-}
-
-func isAllowedBeforeWWWLink(c byte) bool {
-	switch c {
-	case '*', '_', '~', ')':
-		return true
-	}
-	return false
-}
-
-// Given a string with a : at the given position, tried to parse and return a range containing a URL scheme
-// if one exists. If the text around the given position isn't a link, returns an empty string. Equivalent to
-// url_match from the reference code.
-func parseURLAutolink(data string, position int) (Range, bool) {
-	// Check that a :// exists. This doesn't match the clients that treat the slashes as optional.
-	if len(data)-position < 4 || data[position+1] != '/' || data[position+2] != '/' {
-		return Range{}, false
-	}
-
-	start := position - 1
-	for start > 0 && isAlphanumericByte(data[start-1]) {
-		start -= 1
-	}
-
-	if start < 0 || position >= len(data) {
-		return Range{}, false
-	}
-
-	// Ensure that the URL scheme is allowed and that at least one character after the scheme is valid.
-	scheme := data[start:position]
-	if !isSchemeAllowed(scheme) || !isValidHostCharacter(data[position+3:]) {
-		return Range{}, false
-	}
-
-	end := checkDomain(data[position+3:], true)
-	if end == 0 {
-		return Range{}, false
-	}
-
-	end += position
-
-	// Grab all text until the end of the string or the next whitespace character
-	for end < len(data) && !isWhitespaceByte(data[end]) {
-		end += 1
-	}
-
-	// Trim trailing punctuation
-	end = trimTrailingCharactersFromLink(data, start, end)
-	if start == end {
-		return Range{}, false
-	}
-
-	return Range{start, end}, true
-}
-
-func isSchemeAllowed(scheme string) bool {
-	// Note that this doesn't support the custom URL schemes implemented by the client
-	for _, allowed := range DefaultURLSchemes {
-		if strings.EqualFold(allowed, scheme) {
-			return true
-		}
-	}
-
-	return false
-}
-
-// Given a string starting with a URL, returns the number of valid characters that make up the URL's domain.
-// Returns 0 if the string doesn't start with a domain name. allowShort determines whether or not the domain
-// needs to contain a period to be considered valid. Equivalent to check_domain from the reference code.
-func checkDomain(data string, allowShort bool) int {
-	foundUnderscore := false
-	foundPeriod := false
-
-	i := 1
-	for ; i < len(data)-1; i++ {
-		if data[i] == '_' {
-			foundUnderscore = true
-			break
-		} else if data[i] == '.' {
-			foundPeriod = true
-		} else if !isValidHostCharacter(data[i:]) && data[i] != '-' {
-			break
-		}
-	}
-
-	if foundUnderscore {
-		return 0
-	}
-
-	if allowShort {
-		// If allowShort is set, accept any string of valid domain characters
-		return i
-	}
-
-	// If allowShort isn't set, a valid domain just requires at least a single period. Note that this
-	// logic isn't entirely necessary because we already know the string starts with "www." when
-	// this is called from parseWWWAutolink
-	if foundPeriod {
-		return i
-	}
-	return 0
-}
-
-// Returns true if the provided link starts with a valid character for a domain name. Equivalent to
-// is_valid_hostchar from the reference code.
-func isValidHostCharacter(link string) bool {
-	c, _ := utf8.DecodeRuneInString(link)
-	if c == utf8.RuneError {
-		return false
-	}
-
-	return !unicode.IsSpace(c) && !unicode.IsPunct(c)
-}
-
-// Removes any trailing characters such as punctuation or stray brackets that shouldn't be part of the link.
-// Returns a new end position for the link. Equivalent to autolink_delim from the reference code.
-func trimTrailingCharactersFromLink(markdown string, start int, end int) int {
-	runes := []rune(markdown[start:end])
-	linkEnd := len(runes)
-
-	// Cut off the link before an open angle bracket if it contains one
-	for i, c := range runes {
-		if c == '<' {
-			linkEnd = i
-			break
-		}
-	}
-
-	for linkEnd > 0 {
-		c := runes[linkEnd-1]
-
-		if !canEndAutolink(c) {
-			// Trim trailing quotes, periods, etc
-			linkEnd = linkEnd - 1
-		} else if c == ';' {
-			// Trim a trailing HTML entity
-			newEnd := linkEnd - 2
-
-			for newEnd > 0 && ((runes[newEnd] >= 'a' && runes[newEnd] <= 'z') || (runes[newEnd] >= 'A' && runes[newEnd] <= 'Z')) {
-				newEnd -= 1
-			}
-
-			if newEnd < linkEnd-2 && runes[newEnd] == '&' {
-				linkEnd = newEnd
-			} else {
-				// This isn't actually an HTML entity, so just trim the semicolon
-				linkEnd = linkEnd - 1
-			}
-		} else if c == ')' {
-			// Only allow an autolink ending with a bracket if that bracket is part of a matching pair of brackets.
-			// If there are more closing brackets than opening ones, remove the extra bracket
-
-			numClosing := 0
-			numOpening := 0
-
-			// Examples (input text => output linked portion):
-			//
-			//  http://www.pokemon.com/Pikachu_(Electric)
-			//    => http://www.pokemon.com/Pikachu_(Electric)
-			//
-			//  http://www.pokemon.com/Pikachu_((Electric)
-			//    => http://www.pokemon.com/Pikachu_((Electric)
-			//
-			//  http://www.pokemon.com/Pikachu_(Electric))
-			//    => http://www.pokemon.com/Pikachu_(Electric)
-			//
-			//  http://www.pokemon.com/Pikachu_((Electric))
-			//    => http://www.pokemon.com/Pikachu_((Electric))
-
-			for i := 0; i < linkEnd; i++ {
-				if runes[i] == '(' {
-					numOpening += 1
-				} else if runes[i] == ')' {
-					numClosing += 1
-				}
-			}
-
-			if numClosing <= numOpening {
-				// There's fewer or equal closing brackets, so we've found the end of the link
-				break
-			}
-
-			linkEnd -= 1
-		} else {
-			// There's no special characters at the end of the link, so we're at the end
-			break
-		}
-	}
-
-	return start + len(string(runes[:linkEnd]))
-}
-
-func canEndAutolink(c rune) bool {
-	switch c {
-	case '?', '!', '.', ',', ':', '*', '_', '~', '\'', '"':
-		return false
-	}
-	return true
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/block_quote.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/block_quote.go
deleted file mode 100644
index 5cf66d10..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/block_quote.go
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package markdown
-
-type BlockQuote struct {
-	blockBase
-	markdown string
-
-	Children []Block
-}
-
-func (b *BlockQuote) Continuation(indentation int, r Range) *continuation {
-	if indentation > 3 {
-		return nil
-	}
-	s := b.markdown[r.Position:r.End]
-	if s == "" || s[0] != '>' {
-		return nil
-	}
-	remaining := Range{r.Position + 1, r.End}
-	indentation, indentationBytes := countIndentation(b.markdown, remaining)
-	if indentation > 0 {
-		indentation--
-	}
-	return &continuation{
-		Indentation: indentation,
-		Remaining:   Range{remaining.Position + indentationBytes, remaining.End},
-	}
-}
-
-func (b *BlockQuote) AddChild(openBlocks []Block) []Block {
-	b.Children = append(b.Children, openBlocks[0])
-	return openBlocks
-}
-
-func blockQuoteStart(markdown string, indent int, r Range) []Block {
-	if indent > 3 {
-		return nil
-	}
-	s := markdown[r.Position:r.End]
-	if s == "" || s[0] != '>' {
-		return nil
-	}
-
-	block := &BlockQuote{
-		markdown: markdown,
-	}
-	r.Position++
-	if len(s) > 1 && s[1] == ' ' {
-		r.Position++
-	}
-
-	indent, bytes := countIndentation(markdown, r)
-
-	ret := []Block{block}
-	if descendants := blockStartOrParagraph(markdown, indent, Range{r.Position + bytes, r.End}, nil, nil); descendants != nil {
-		block.Children = append(block.Children, descendants[0])
-		ret = append(ret, descendants...)
-	}
-	return ret
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/blocks.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/blocks.go
deleted file mode 100644
index fe9e272f..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/blocks.go
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package markdown
-
-import (
-	"strings"
-)
-
-type continuation struct {
-	Indentation int
-	Remaining   Range
-}
-
-type Block interface {
-	Continuation(indentation int, r Range) *continuation
-	AddLine(indentation int, r Range) bool
-	Close()
-	AllowsBlockStarts() bool
-	HasTrailingBlankLine() bool
-}
-
-type blockBase struct{}
-
-func (*blockBase) AddLine(indentation int, r Range) bool { return false }
-func (*blockBase) Close()                                {}
-func (*blockBase) AllowsBlockStarts() bool               { return true }
-func (*blockBase) HasTrailingBlankLine() bool            { return false }
-
-type ContainerBlock interface {
-	Block
-	AddChild(openBlocks []Block) []Block
-}
-
-type Range struct {
-	Position int
-	End      int
-}
-
-func closeBlocks(blocks []Block, referenceDefinitions []*ReferenceDefinition) []*ReferenceDefinition {
-	for _, block := range blocks {
-		block.Close()
-		if p, ok := block.(*Paragraph); ok && len(p.ReferenceDefinitions) > 0 {
-			referenceDefinitions = append(referenceDefinitions, p.ReferenceDefinitions...)
-		}
-	}
-	return referenceDefinitions
-}
-
-func ParseBlocks(markdown string, lines []Line) (*Document, []*ReferenceDefinition) {
-	document := &Document{}
-	var referenceDefinitions []*ReferenceDefinition
-
-	openBlocks := []Block{document}
-
-	for _, line := range lines {
-		r := line.Range
-		lastMatchIndex := 0
-
-		indentation, indentationBytes := countIndentation(markdown, r)
-		r = Range{r.Position + indentationBytes, r.End}
-
-		for i, block := range openBlocks {
-			if continuation := block.Continuation(indentation, r); continuation != nil {
-				indentation = continuation.Indentation
-				r = continuation.Remaining
-				additionalIndentation, additionalIndentationBytes := countIndentation(markdown, r)
-				r = Range{r.Position + additionalIndentationBytes, r.End}
-				indentation += additionalIndentation
-				lastMatchIndex = i
-			} else {
-				break
-			}
-		}
-
-		if openBlocks[lastMatchIndex].AllowsBlockStarts() {
-			if newBlocks := blockStart(markdown, indentation, r, openBlocks[:lastMatchIndex+1], openBlocks[lastMatchIndex+1:]); newBlocks != nil {
-				didAdd := false
-				for i := lastMatchIndex; i >= 0; i-- {
-					if container, ok := openBlocks[i].(ContainerBlock); ok {
-						if addedBlocks := container.AddChild(newBlocks); addedBlocks != nil {
-							referenceDefinitions = closeBlocks(openBlocks[i+1:], referenceDefinitions)
-							openBlocks = openBlocks[:i+1]
-							openBlocks = append(openBlocks, addedBlocks...)
-							didAdd = true
-							break
-						}
-					}
-				}
-				if didAdd {
-					continue
-				}
-			}
-		}
-
-		isBlank := strings.TrimSpace(markdown[r.Position:r.End]) == ""
-		if paragraph, ok := openBlocks[len(openBlocks)-1].(*Paragraph); ok && !isBlank {
-			paragraph.Text = append(paragraph.Text, r)
-			continue
-		}
-
-		referenceDefinitions = closeBlocks(openBlocks[lastMatchIndex+1:], referenceDefinitions)
-		openBlocks = openBlocks[:lastMatchIndex+1]
-
-		if openBlocks[lastMatchIndex].AddLine(indentation, r) {
-			continue
-		}
-
-		if paragraph := newParagraph(markdown, r); paragraph != nil {
-			for i := lastMatchIndex; i >= 0; i-- {
-				if container, ok := openBlocks[i].(ContainerBlock); ok {
-					if newBlocks := container.AddChild([]Block{paragraph}); newBlocks != nil {
-						referenceDefinitions = closeBlocks(openBlocks[i+1:], referenceDefinitions)
-						openBlocks = openBlocks[:i+1]
-						openBlocks = append(openBlocks, newBlocks...)
-						break
-					}
-				}
-			}
-		}
-	}
-
-	referenceDefinitions = closeBlocks(openBlocks, referenceDefinitions)
-
-	return document, referenceDefinitions
-}
-
-func blockStart(markdown string, indentation int, r Range, matchedBlocks, unmatchedBlocks []Block) []Block {
-	if r.Position >= r.End {
-		return nil
-	}
-
-	if start := blockQuoteStart(markdown, indentation, r); start != nil {
-		return start
-	} else if start := listStart(markdown, indentation, r, matchedBlocks, unmatchedBlocks); start != nil {
-		return start
-	} else if start := indentedCodeStart(markdown, indentation, r, matchedBlocks, unmatchedBlocks); start != nil {
-		return start
-	} else if start := fencedCodeStart(markdown, indentation, r); start != nil {
-		return start
-	}
-
-	return nil
-}
-
-func blockStartOrParagraph(markdown string, indentation int, r Range, matchedBlocks, unmatchedBlocks []Block) []Block {
-	if start := blockStart(markdown, indentation, r, matchedBlocks, unmatchedBlocks); start != nil {
-		return start
-	}
-	if paragraph := newParagraph(markdown, r); paragraph != nil {
-		return []Block{paragraph}
-	}
-	return nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/document.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/document.go
deleted file mode 100644
index 306b93da..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/document.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package markdown
-
-type Document struct {
-	blockBase
-
-	Children []Block
-}
-
-func (b *Document) Continuation(indentation int, r Range) *continuation {
-	return &continuation{
-		Indentation: indentation,
-		Remaining:   r,
-	}
-}
-
-func (b *Document) AddChild(openBlocks []Block) []Block {
-	b.Children = append(b.Children, openBlocks[0])
-	return openBlocks
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/fenced_code.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/fenced_code.go
deleted file mode 100644
index c8caad55..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/fenced_code.go
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package markdown
-
-import (
-	"strings"
-)
-
-type FencedCodeLine struct {
-	Indentation int
-	Range       Range
-}
-
-type FencedCode struct {
-	blockBase
-	markdown           string
-	didSeeClosingFence bool
-
-	Indentation  int
-	OpeningFence Range
-	RawInfo      Range
-	RawCode      []FencedCodeLine
-}
-
-func (b *FencedCode) Code() (result string) {
-	for _, code := range b.RawCode {
-		result += strings.Repeat(" ", code.Indentation) + b.markdown[code.Range.Position:code.Range.End]
-	}
-	return
-}
-
-func (b *FencedCode) Info() string {
-	return Unescape(b.markdown[b.RawInfo.Position:b.RawInfo.End])
-}
-
-func (b *FencedCode) Continuation(indentation int, r Range) *continuation {
-	if b.didSeeClosingFence {
-		return nil
-	}
-	return &continuation{
-		Indentation: indentation,
-		Remaining:   r,
-	}
-}
-
-func (b *FencedCode) AddLine(indentation int, r Range) bool {
-	s := b.markdown[r.Position:r.End]
-	if indentation <= 3 && strings.HasPrefix(s, b.markdown[b.OpeningFence.Position:b.OpeningFence.End]) {
-		suffix := strings.TrimSpace(s[b.OpeningFence.End-b.OpeningFence.Position:])
-		isClosingFence := true
-		for _, c := range suffix {
-			if c != rune(s[0]) {
-				isClosingFence = false
-				break
-			}
-		}
-		if isClosingFence {
-			b.didSeeClosingFence = true
-			return true
-		}
-	}
-
-	if indentation >= b.Indentation {
-		indentation -= b.Indentation
-	} else {
-		indentation = 0
-	}
-
-	b.RawCode = append(b.RawCode, FencedCodeLine{
-		Indentation: indentation,
-		Range:       r,
-	})
-	return true
-}
-
-func (b *FencedCode) AllowsBlockStarts() bool {
-	return false
-}
-
-func fencedCodeStart(markdown string, indentation int, r Range) []Block {
-	s := markdown[r.Position:r.End]
-
-	if !strings.HasPrefix(s, "```") && !strings.HasPrefix(s, "~~~") {
-		return nil
-	}
-
-	fenceCharacter := rune(s[0])
-	fenceLength := 3
-	for _, c := range s[3:] {
-		if c == fenceCharacter {
-			fenceLength++
-		} else {
-			break
-		}
-	}
-
-	for i := r.Position + fenceLength; i < r.End; i++ {
-		if markdown[i] == '`' {
-			return nil
-		}
-	}
-
-	return []Block{
-		&FencedCode{
-			markdown:     markdown,
-			Indentation:  indentation,
-			RawInfo:      trimRightSpace(markdown, Range{r.Position + fenceLength, r.End}),
-			OpeningFence: Range{r.Position, r.Position + fenceLength},
-		},
-	}
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/html.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/html.go
deleted file mode 100644
index 52583074..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/html.go
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package markdown
-
-import (
-	"fmt"
-	"strings"
-)
-
-var htmlEscaper = strings.NewReplacer(
-	`&`, "&amp;",
-	`<`, "&lt;",
-	`>`, "&gt;",
-	`"`, "&quot;",
-)
-
-// RenderHTML produces HTML with the same behavior as the example renderer used in the CommonMark
-// reference materials except for one slight difference: for brevity, no unnecessary whitespace is
-// inserted between elements. The output is not defined by the CommonMark spec, and it exists
-// primarily as an aid in testing.
-func RenderHTML(markdown string) string {
-	return RenderBlockHTML(Parse(markdown))
-}
-
-func RenderBlockHTML(block Block, referenceDefinitions []*ReferenceDefinition) (result string) {
-	return renderBlockHTML(block, referenceDefinitions, false)
-}
-
-func renderBlockHTML(block Block, referenceDefinitions []*ReferenceDefinition, isTightList bool) (result string) {
-	switch v := block.(type) {
-	case *Document:
-		for _, block := range v.Children {
-			result += RenderBlockHTML(block, referenceDefinitions)
-		}
-	case *Paragraph:
-		if len(v.Text) == 0 {
-			return
-		}
-		if !isTightList {
-			result += "<p>"
-		}
-		for _, inline := range v.ParseInlines(referenceDefinitions) {
-			result += RenderInlineHTML(inline)
-		}
-		if !isTightList {
-			result += "</p>"
-		}
-	case *List:
-		if v.IsOrdered {
-			if v.OrderedStart != 1 {
-				result += fmt.Sprintf(`<ol start="%v">`, v.OrderedStart)
-			} else {
-				result += "<ol>"
-			}
-		} else {
-			result += "<ul>"
-		}
-		for _, block := range v.Children {
-			result += renderBlockHTML(block, referenceDefinitions, !v.IsLoose)
-		}
-		if v.IsOrdered {
-			result += "</ol>"
-		} else {
-			result += "</ul>"
-		}
-	case *ListItem:
-		result += "<li>"
-		for _, block := range v.Children {
-			result += renderBlockHTML(block, referenceDefinitions, isTightList)
-		}
-		result += "</li>"
-	case *BlockQuote:
-		result += "<blockquote>"
-		for _, block := range v.Children {
-			result += RenderBlockHTML(block, referenceDefinitions)
-		}
-		result += "</blockquote>"
-	case *FencedCode:
-		if info := v.Info(); info != "" {
-			language := strings.Fields(info)[0]
-			result += `<pre><code class="language-` + htmlEscaper.Replace(language) + `">`
-		} else {
-			result += "<pre><code>"
-		}
-		result += htmlEscaper.Replace(v.Code()) + "</code></pre>"
-	case *IndentedCode:
-		result += "<pre><code>" + htmlEscaper.Replace(v.Code()) + "</code></pre>"
-	default:
-		panic(fmt.Sprintf("missing case for type %T", v))
-	}
-	return
-}
-
-func escapeURL(url string) (result string) {
-	for i := 0; i < len(url); {
-		switch b := url[i]; b {
-		case ';', '/', '?', ':', '@', '&', '=', '+', '$', ',', '-', '_', '.', '!', '~', '*', '\'', '(', ')', '#':
-			result += string(b)
-			i++
-		default:
-			if b == '%' && i+2 < len(url) && isHexByte(url[i+1]) && isHexByte(url[i+2]) {
-				result += url[i : i+3]
-				i += 3
-			} else if (b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z') || (b >= '0' && b <= '9') {
-				result += string(b)
-				i++
-			} else {
-				result += fmt.Sprintf("%%%0X", b)
-				i++
-			}
-		}
-	}
-	return
-}
-
-func RenderInlineHTML(inline Inline) (result string) {
-	switch v := inline.(type) {
-	case *Text:
-		return htmlEscaper.Replace(v.Text)
-	case *HardLineBreak:
-		return "<br />"
-	case *SoftLineBreak:
-		return "\n"
-	case *CodeSpan:
-		return "<code>" + htmlEscaper.Replace(v.Code) + "</code>"
-	case *InlineImage:
-		result += `<img src="` + htmlEscaper.Replace(escapeURL(v.Destination())) + `" alt="` + htmlEscaper.Replace(renderImageAltText(v.Children)) + `"`
-		if title := v.Title(); title != "" {
-			result += ` title="` + htmlEscaper.Replace(title) + `"`
-		}
-		result += ` />`
-	case *ReferenceImage:
-		result += `<img src="` + htmlEscaper.Replace(escapeURL(v.Destination())) + `" alt="` + htmlEscaper.Replace(renderImageAltText(v.Children)) + `"`
-		if title := v.Title(); title != "" {
-			result += ` title="` + htmlEscaper.Replace(title) + `"`
-		}
-		result += ` />`
-	case *InlineLink:
-		result += `<a href="` + htmlEscaper.Replace(escapeURL(v.Destination())) + `"`
-		if title := v.Title(); title != "" {
-			result += ` title="` + htmlEscaper.Replace(title) + `"`
-		}
-		result += `>`
-		for _, inline := range v.Children {
-			result += RenderInlineHTML(inline)
-		}
-		result += "</a>"
-	case *ReferenceLink:
-		result += `<a href="` + htmlEscaper.Replace(escapeURL(v.Destination())) + `"`
-		if title := v.Title(); title != "" {
-			result += ` title="` + htmlEscaper.Replace(title) + `"`
-		}
-		result += `>`
-		for _, inline := range v.Children {
-			result += RenderInlineHTML(inline)
-		}
-		result += "</a>"
-	case *Autolink:
-		result += `<a href="` + htmlEscaper.Replace(escapeURL(v.Destination())) + `">`
-		for _, inline := range v.Children {
-			result += RenderInlineHTML(inline)
-		}
-		result += "</a>"
-	default:
-		panic(fmt.Sprintf("missing case for type %T", v))
-	}
-	return
-}
-
-func renderImageAltText(children []Inline) (result string) {
-	for _, inline := range children {
-		result += renderImageChildAltText(inline)
-	}
-	return
-}
-
-func renderImageChildAltText(inline Inline) (result string) {
-	switch v := inline.(type) {
-	case *Text:
-		return v.Text
-	case *InlineImage:
-		for _, inline := range v.Children {
-			result += renderImageChildAltText(inline)
-		}
-	case *InlineLink:
-		for _, inline := range v.Children {
-			result += renderImageChildAltText(inline)
-		}
-	}
-	return
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/html_entities.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/html_entities.go
deleted file mode 100644
index e94cebb9..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/html_entities.go
+++ /dev/null
@@ -1,2132 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package markdown
-
-var htmlEntities = map[string]string{
-	"AElig":                           "\u00C6",
-	"AMP":                             "\u0026",
-	"Aacute":                          "\u00C1",
-	"Abreve":                          "\u0102",
-	"Acirc":                           "\u00C2",
-	"Acy":                             "\u0410",
-	"Afr":                             "\U0001D504",
-	"Agrave":                          "\u00C0",
-	"Alpha":                           "\u0391",
-	"Amacr":                           "\u0100",
-	"And":                             "\u2A53",
-	"Aogon":                           "\u0104",
-	"Aopf":                            "\U0001D538",
-	"ApplyFunction":                   "\u2061",
-	"Aring":                           "\u00C5",
-	"Ascr":                            "\U0001D49C",
-	"Assign":                          "\u2254",
-	"Atilde":                          "\u00C3",
-	"Auml":                            "\u00C4",
-	"Backslash":                       "\u2216",
-	"Barv":                            "\u2AE7",
-	"Barwed":                          "\u2306",
-	"Bcy":                             "\u0411",
-	"Because":                         "\u2235",
-	"Bernoullis":                      "\u212C",
-	"Beta":                            "\u0392",
-	"Bfr":                             "\U0001D505",
-	"Bopf":                            "\U0001D539",
-	"Breve":                           "\u02D8",
-	"Bscr":                            "\u212C",
-	"Bumpeq":                          "\u224E",
-	"CHcy":                            "\u0427",
-	"COPY":                            "\u00A9",
-	"Cacute":                          "\u0106",
-	"Cap":                             "\u22D2",
-	"CapitalDifferentialD":            "\u2145",
-	"Cayleys":                         "\u212D",
-	"Ccaron":                          "\u010C",
-	"Ccedil":                          "\u00C7",
-	"Ccirc":                           "\u0108",
-	"Cconint":                         "\u2230",
-	"Cdot":                            "\u010A",
-	"Cedilla":                         "\u00B8",
-	"CenterDot":                       "\u00B7",
-	"Cfr":                             "\u212D",
-	"Chi":                             "\u03A7",
-	"CircleDot":                       "\u2299",
-	"CircleMinus":                     "\u2296",
-	"CirclePlus":                      "\u2295",
-	"CircleTimes":                     "\u2297",
-	"ClockwiseContourIntegral":        "\u2232",
-	"CloseCurlyDoubleQuote":           "\u201D",
-	"CloseCurlyQuote":                 "\u2019",
-	"Colon":                           "\u2237",
-	"Colone":                          "\u2A74",
-	"Congruent":                       "\u2261",
-	"Conint":                          "\u222F",
-	"ContourIntegral":                 "\u222E",
-	"Copf":                            "\u2102",
-	"Coproduct":                       "\u2210",
-	"CounterClockwiseContourIntegral": "\u2233",
-	"Cross":                           "\u2A2F",
-	"Cscr":                            "\U0001D49E",
-	"Cup":                             "\u22D3",
-	"CupCap":                          "\u224D",
-	"DD":                              "\u2145",
-	"DDotrahd":                        "\u2911",
-	"DJcy":                            "\u0402",
-	"DScy":                            "\u0405",
-	"DZcy":                            "\u040F",
-	"Dagger":                          "\u2021",
-	"Darr":                            "\u21A1",
-	"Dashv":                           "\u2AE4",
-	"Dcaron":                          "\u010E",
-	"Dcy":                             "\u0414",
-	"Del":                             "\u2207",
-	"Delta":                           "\u0394",
-	"Dfr":                             "\U0001D507",
-	"DiacriticalAcute":                "\u00B4",
-	"DiacriticalDot":                  "\u02D9",
-	"DiacriticalDoubleAcute":          "\u02DD",
-	"DiacriticalGrave":                "\u0060",
-	"DiacriticalTilde":                "\u02DC",
-	"Diamond":                         "\u22C4",
-	"DifferentialD":                   "\u2146",
-	"Dopf":                            "\U0001D53B",
-	"Dot":                             "\u00A8",
-	"DotDot":                          "\u20DC",
-	"DotEqual":                        "\u2250",
-	"DoubleContourIntegral":           "\u222F",
-	"DoubleDot":                       "\u00A8",
-	"DoubleDownArrow":                 "\u21D3",
-	"DoubleLeftArrow":                 "\u21D0",
-	"DoubleLeftRightArrow":            "\u21D4",
-	"DoubleLeftTee":                   "\u2AE4",
-	"DoubleLongLeftArrow":             "\u27F8",
-	"DoubleLongLeftRightArrow":        "\u27FA",
-	"DoubleLongRightArrow":            "\u27F9",
-	"DoubleRightArrow":                "\u21D2",
-	"DoubleRightTee":                  "\u22A8",
-	"DoubleUpArrow":                   "\u21D1",
-	"DoubleUpDownArrow":               "\u21D5",
-	"DoubleVerticalBar":               "\u2225",
-	"DownArrow":                       "\u2193",
-	"DownArrowBar":                    "\u2913",
-	"DownArrowUpArrow":                "\u21F5",
-	"DownBreve":                       "\u0311",
-	"DownLeftRightVector":             "\u2950",
-	"DownLeftTeeVector":               "\u295E",
-	"DownLeftVector":                  "\u21BD",
-	"DownLeftVectorBar":               "\u2956",
-	"DownRightTeeVector":              "\u295F",
-	"DownRightVector":                 "\u21C1",
-	"DownRightVectorBar":              "\u2957",
-	"DownTee":                         "\u22A4",
-	"DownTeeArrow":                    "\u21A7",
-	"Downarrow":                       "\u21D3",
-	"Dscr":                            "\U0001D49F",
-	"Dstrok":                          "\u0110",
-	"ENG":                             "\u014A",
-	"ETH":                             "\u00D0",
-	"Eacute":                          "\u00C9",
-	"Ecaron":                          "\u011A",
-	"Ecirc":                           "\u00CA",
-	"Ecy":                             "\u042D",
-	"Edot":                            "\u0116",
-	"Efr":                             "\U0001D508",
-	"Egrave":                          "\u00C8",
-	"Element":                         "\u2208",
-	"Emacr":                           "\u0112",
-	"EmptySmallSquare":                "\u25FB",
-	"EmptyVerySmallSquare":            "\u25AB",
-	"Eogon":                           "\u0118",
-	"Eopf":                            "\U0001D53C",
-	"Epsilon":                         "\u0395",
-	"Equal":                           "\u2A75",
-	"EqualTilde":                      "\u2242",
-	"Equilibrium":                     "\u21CC",
-	"Escr":                            "\u2130",
-	"Esim":                            "\u2A73",
-	"Eta":                             "\u0397",
-	"Euml":                            "\u00CB",
-	"Exists":                          "\u2203",
-	"ExponentialE":                    "\u2147",
-	"Fcy":                             "\u0424",
-	"Ffr":                             "\U0001D509",
-	"FilledSmallSquare":               "\u25FC",
-	"FilledVerySmallSquare":           "\u25AA",
-	"Fopf":                            "\U0001D53D",
-	"ForAll":                          "\u2200",
-	"Fouriertrf":                      "\u2131",
-	"Fscr":                            "\u2131",
-	"GJcy":                            "\u0403",
-	"GT":                              "\u003E",
-	"Gamma":                           "\u0393",
-	"Gammad":                          "\u03DC",
-	"Gbreve":                          "\u011E",
-	"Gcedil":                          "\u0122",
-	"Gcirc":                           "\u011C",
-	"Gcy":                             "\u0413",
-	"Gdot":                            "\u0120",
-	"Gfr":                             "\U0001D50A",
-	"Gg":                              "\u22D9",
-	"Gopf":                            "\U0001D53E",
-	"GreaterEqual":                    "\u2265",
-	"GreaterEqualLess":                "\u22DB",
-	"GreaterFullEqual":                "\u2267",
-	"GreaterGreater":                  "\u2AA2",
-	"GreaterLess":                     "\u2277",
-	"GreaterSlantEqual":               "\u2A7E",
-	"GreaterTilde":                    "\u2273",
-	"Gscr":                            "\U0001D4A2",
-	"Gt":                              "\u226B",
-	"HARDcy":                          "\u042A",
-	"Hacek":                           "\u02C7",
-	"Hat":                             "\u005E",
-	"Hcirc":                           "\u0124",
-	"Hfr":                             "\u210C",
-	"HilbertSpace":                    "\u210B",
-	"Hopf":                            "\u210D",
-	"HorizontalLine":                  "\u2500",
-	"Hscr":                            "\u210B",
-	"Hstrok":                          "\u0126",
-	"HumpDownHump":                    "\u224E",
-	"HumpEqual":                       "\u224F",
-	"IEcy":                            "\u0415",
-	"IJlig":                           "\u0132",
-	"IOcy":                            "\u0401",
-	"Iacute":                          "\u00CD",
-	"Icirc":                           "\u00CE",
-	"Icy":                             "\u0418",
-	"Idot":                            "\u0130",
-	"Ifr":                             "\u2111",
-	"Igrave":                          "\u00CC",
-	"Im":                              "\u2111",
-	"Imacr":                           "\u012A",
-	"ImaginaryI":                      "\u2148",
-	"Implies":                         "\u21D2",
-	"Int":                             "\u222C",
-	"Integral":                        "\u222B",
-	"Intersection":                    "\u22C2",
-	"InvisibleComma":                  "\u2063",
-	"InvisibleTimes":                  "\u2062",
-	"Iogon":                           "\u012E",
-	"Iopf":                            "\U0001D540",
-	"Iota":                            "\u0399",
-	"Iscr":                            "\u2110",
-	"Itilde":                          "\u0128",
-	"Iukcy":                           "\u0406",
-	"Iuml":                            "\u00CF",
-	"Jcirc":                           "\u0134",
-	"Jcy":                             "\u0419",
-	"Jfr":                             "\U0001D50D",
-	"Jopf":                            "\U0001D541",
-	"Jscr":                            "\U0001D4A5",
-	"Jsercy":                          "\u0408",
-	"Jukcy":                           "\u0404",
-	"KHcy":                            "\u0425",
-	"KJcy":                            "\u040C",
-	"Kappa":                           "\u039A",
-	"Kcedil":                          "\u0136",
-	"Kcy":                             "\u041A",
-	"Kfr":                             "\U0001D50E",
-	"Kopf":                            "\U0001D542",
-	"Kscr":                            "\U0001D4A6",
-	"LJcy":                            "\u0409",
-	"LT":                              "\u003C",
-	"Lacute":                          "\u0139",
-	"Lambda":                          "\u039B",
-	"Lang":                            "\u27EA",
-	"Laplacetrf":                      "\u2112",
-	"Larr":                            "\u219E",
-	"Lcaron":                          "\u013D",
-	"Lcedil":                          "\u013B",
-	"Lcy":                             "\u041B",
-	"LeftAngleBracket":                "\u27E8",
-	"LeftArrow":                       "\u2190",
-	"LeftArrowBar":                    "\u21E4",
-	"LeftArrowRightArrow":             "\u21C6",
-	"LeftCeiling":                     "\u2308",
-	"LeftDoubleBracket":               "\u27E6",
-	"LeftDownTeeVector":               "\u2961",
-	"LeftDownVector":                  "\u21C3",
-	"LeftDownVectorBar":               "\u2959",
-	"LeftFloor":                       "\u230A",
-	"LeftRightArrow":                  "\u2194",
-	"LeftRightVector":                 "\u294E",
-	"LeftTee":                         "\u22A3",
-	"LeftTeeArrow":                    "\u21A4",
-	"LeftTeeVector":                   "\u295A",
-	"LeftTriangle":                    "\u22B2",
-	"LeftTriangleBar":                 "\u29CF",
-	"LeftTriangleEqual":               "\u22B4",
-	"LeftUpDownVector":                "\u2951",
-	"LeftUpTeeVector":                 "\u2960",
-	"LeftUpVector":                    "\u21BF",
-	"LeftUpVectorBar":                 "\u2958",
-	"LeftVector":                      "\u21BC",
-	"LeftVectorBar":                   "\u2952",
-	"Leftarrow":                       "\u21D0",
-	"Leftrightarrow":                  "\u21D4",
-	"LessEqualGreater":                "\u22DA",
-	"LessFullEqual":                   "\u2266",
-	"LessGreater":                     "\u2276",
-	"LessLess":                        "\u2AA1",
-	"LessSlantEqual":                  "\u2A7D",
-	"LessTilde":                       "\u2272",
-	"Lfr":                             "\U0001D50F",
-	"Ll":                              "\u22D8",
-	"Lleftarrow":                      "\u21DA",
-	"Lmidot":                          "\u013F",
-	"LongLeftArrow":                   "\u27F5",
-	"LongLeftRightArrow":              "\u27F7",
-	"LongRightArrow":                  "\u27F6",
-	"Longleftarrow":                   "\u27F8",
-	"Longleftrightarrow":              "\u27FA",
-	"Longrightarrow":                  "\u27F9",
-	"Lopf":                            "\U0001D543",
-	"LowerLeftArrow":                  "\u2199",
-	"LowerRightArrow":                 "\u2198",
-	"Lscr":                            "\u2112",
-	"Lsh":                             "\u21B0",
-	"Lstrok":                          "\u0141",
-	"Lt":                              "\u226A",
-	"Map":                             "\u2905",
-	"Mcy":                             "\u041C",
-	"MediumSpace":                     "\u205F",
-	"Mellintrf":                       "\u2133",
-	"Mfr":                             "\U0001D510",
-	"MinusPlus":                       "\u2213",
-	"Mopf":                            "\U0001D544",
-	"Mscr":                            "\u2133",
-	"Mu":                              "\u039C",
-	"NJcy":                            "\u040A",
-	"Nacute":                          "\u0143",
-	"Ncaron":                          "\u0147",
-	"Ncedil":                          "\u0145",
-	"Ncy":                             "\u041D",
-	"NegativeMediumSpace":             "\u200B",
-	"NegativeThickSpace":              "\u200B",
-	"NegativeThinSpace":               "\u200B",
-	"NegativeVeryThinSpace":           "\u200B",
-	"NestedGreaterGreater":            "\u226B",
-	"NestedLessLess":                  "\u226A",
-	"NewLine":                         "\u000A",
-	"Nfr":                             "\U0001D511",
-	"NoBreak":                         "\u2060",
-	"NonBreakingSpace":                "\u00A0",
-	"Nopf":                            "\u2115",
-	"Not":                             "\u2AEC",
-	"NotCongruent":                    "\u2262",
-	"NotCupCap":                       "\u226D",
-	"NotDoubleVerticalBar":            "\u2226",
-	"NotElement":                      "\u2209",
-	"NotEqual":                        "\u2260",
-	"NotEqualTilde":                   "\u2242\u0338",
-	"NotExists":                       "\u2204",
-	"NotGreater":                      "\u226F",
-	"NotGreaterEqual":                 "\u2271",
-	"NotGreaterFullEqual":             "\u2267\u0338",
-	"NotGreaterGreater":               "\u226B\u0338",
-	"NotGreaterLess":                  "\u2279",
-	"NotGreaterSlantEqual":            "\u2A7E\u0338",
-	"NotGreaterTilde":                 "\u2275",
-	"NotHumpDownHump":                 "\u224E\u0338",
-	"NotHumpEqual":                    "\u224F\u0338",
-	"NotLeftTriangle":                 "\u22EA",
-	"NotLeftTriangleBar":              "\u29CF\u0338",
-	"NotLeftTriangleEqual":            "\u22EC",
-	"NotLess":                         "\u226E",
-	"NotLessEqual":                    "\u2270",
-	"NotLessGreater":                  "\u2278",
-	"NotLessLess":                     "\u226A\u0338",
-	"NotLessSlantEqual":               "\u2A7D\u0338",
-	"NotLessTilde":                    "\u2274",
-	"NotNestedGreaterGreater":         "\u2AA2\u0338",
-	"NotNestedLessLess":               "\u2AA1\u0338",
-	"NotPrecedes":                     "\u2280",
-	"NotPrecedesEqual":                "\u2AAF\u0338",
-	"NotPrecedesSlantEqual":           "\u22E0",
-	"NotReverseElement":               "\u220C",
-	"NotRightTriangle":                "\u22EB",
-	"NotRightTriangleBar":             "\u29D0\u0338",
-	"NotRightTriangleEqual":           "\u22ED",
-	"NotSquareSubset":                 "\u228F\u0338",
-	"NotSquareSubsetEqual":            "\u22E2",
-	"NotSquareSuperset":               "\u2290\u0338",
-	"NotSquareSupersetEqual":          "\u22E3",
-	"NotSubset":                       "\u2282\u20D2",
-	"NotSubsetEqual":                  "\u2288",
-	"NotSucceeds":                     "\u2281",
-	"NotSucceedsEqual":                "\u2AB0\u0338",
-	"NotSucceedsSlantEqual":           "\u22E1",
-	"NotSucceedsTilde":                "\u227F\u0338",
-	"NotSuperset":                     "\u2283\u20D2",
-	"NotSupersetEqual":                "\u2289",
-	"NotTilde":                        "\u2241",
-	"NotTildeEqual":                   "\u2244",
-	"NotTildeFullEqual":               "\u2247",
-	"NotTildeTilde":                   "\u2249",
-	"NotVerticalBar":                  "\u2224",
-	"Nscr":                            "\U0001D4A9",
-	"Ntilde":                          "\u00D1",
-	"Nu":                              "\u039D",
-	"OElig":                           "\u0152",
-	"Oacute":                          "\u00D3",
-	"Ocirc":                           "\u00D4",
-	"Ocy":                             "\u041E",
-	"Odblac":                          "\u0150",
-	"Ofr":                             "\U0001D512",
-	"Ograve":                          "\u00D2",
-	"Omacr":                           "\u014C",
-	"Omega":                           "\u03A9",
-	"Omicron":                         "\u039F",
-	"Oopf":                            "\U0001D546",
-	"OpenCurlyDoubleQuote":            "\u201C",
-	"OpenCurlyQuote":                  "\u2018",
-	"Or":                              "\u2A54",
-	"Oscr":                            "\U0001D4AA",
-	"Oslash":                          "\u00D8",
-	"Otilde":                          "\u00D5",
-	"Otimes":                          "\u2A37",
-	"Ouml":                            "\u00D6",
-	"OverBar":                         "\u203E",
-	"OverBrace":                       "\u23DE",
-	"OverBracket":                     "\u23B4",
-	"OverParenthesis":                 "\u23DC",
-	"PartialD":                        "\u2202",
-	"Pcy":                             "\u041F",
-	"Pfr":                             "\U0001D513",
-	"Phi":                             "\u03A6",
-	"Pi":                              "\u03A0",
-	"PlusMinus":                       "\u00B1",
-	"Poincareplane":                   "\u210C",
-	"Popf":                            "\u2119",
-	"Pr":                              "\u2ABB",
-	"Precedes":                        "\u227A",
-	"PrecedesEqual":                   "\u2AAF",
-	"PrecedesSlantEqual":              "\u227C",
-	"PrecedesTilde":                   "\u227E",
-	"Prime":                           "\u2033",
-	"Product":                         "\u220F",
-	"Proportion":                      "\u2237",
-	"Proportional":                    "\u221D",
-	"Pscr":                            "\U0001D4AB",
-	"Psi":                             "\u03A8",
-	"QUOT":                            "\u0022",
-	"Qfr":                             "\U0001D514",
-	"Qopf":                            "\u211A",
-	"Qscr":                            "\U0001D4AC",
-	"RBarr":                           "\u2910",
-	"REG":                             "\u00AE",
-	"Racute":                          "\u0154",
-	"Rang":                            "\u27EB",
-	"Rarr":                            "\u21A0",
-	"Rarrtl":                          "\u2916",
-	"Rcaron":                          "\u0158",
-	"Rcedil":                          "\u0156",
-	"Rcy":                             "\u0420",
-	"Re":                              "\u211C",
-	"ReverseElement":                  "\u220B",
-	"ReverseEquilibrium":              "\u21CB",
-	"ReverseUpEquilibrium":            "\u296F",
-	"Rfr":                             "\u211C",
-	"Rho":                             "\u03A1",
-	"RightAngleBracket":               "\u27E9",
-	"RightArrow":                      "\u2192",
-	"RightArrowBar":                   "\u21E5",
-	"RightArrowLeftArrow":             "\u21C4",
-	"RightCeiling":                    "\u2309",
-	"RightDoubleBracket":              "\u27E7",
-	"RightDownTeeVector":              "\u295D",
-	"RightDownVector":                 "\u21C2",
-	"RightDownVectorBar":              "\u2955",
-	"RightFloor":                      "\u230B",
-	"RightTee":                        "\u22A2",
-	"RightTeeArrow":                   "\u21A6",
-	"RightTeeVector":                  "\u295B",
-	"RightTriangle":                   "\u22B3",
-	"RightTriangleBar":                "\u29D0",
-	"RightTriangleEqual":              "\u22B5",
-	"RightUpDownVector":               "\u294F",
-	"RightUpTeeVector":                "\u295C",
-	"RightUpVector":                   "\u21BE",
-	"RightUpVectorBar":                "\u2954",
-	"RightVector":                     "\u21C0",
-	"RightVectorBar":                  "\u2953",
-	"Rightarrow":                      "\u21D2",
-	"Ropf":                            "\u211D",
-	"RoundImplies":                    "\u2970",
-	"Rrightarrow":                     "\u21DB",
-	"Rscr":                            "\u211B",
-	"Rsh":                             "\u21B1",
-	"RuleDelayed":                     "\u29F4",
-	"SHCHcy":                          "\u0429",
-	"SHcy":                            "\u0428",
-	"SOFTcy":                          "\u042C",
-	"Sacute":                          "\u015A",
-	"Sc":                              "\u2ABC",
-	"Scaron":                          "\u0160",
-	"Scedil":                          "\u015E",
-	"Scirc":                           "\u015C",
-	"Scy":                             "\u0421",
-	"Sfr":                             "\U0001D516",
-	"ShortDownArrow":                  "\u2193",
-	"ShortLeftArrow":                  "\u2190",
-	"ShortRightArrow":                 "\u2192",
-	"ShortUpArrow":                    "\u2191",
-	"Sigma":                           "\u03A3",
-	"SmallCircle":                     "\u2218",
-	"Sopf":                            "\U0001D54A",
-	"Sqrt":                            "\u221A",
-	"Square":                          "\u25A1",
-	"SquareIntersection":              "\u2293",
-	"SquareSubset":                    "\u228F",
-	"SquareSubsetEqual":               "\u2291",
-	"SquareSuperset":                  "\u2290",
-	"SquareSupersetEqual":             "\u2292",
-	"SquareUnion":                     "\u2294",
-	"Sscr":                            "\U0001D4AE",
-	"Star":                            "\u22C6",
-	"Sub":                             "\u22D0",
-	"Subset":                          "\u22D0",
-	"SubsetEqual":                     "\u2286",
-	"Succeeds":                        "\u227B",
-	"SucceedsEqual":                   "\u2AB0",
-	"SucceedsSlantEqual":              "\u227D",
-	"SucceedsTilde":                   "\u227F",
-	"SuchThat":                        "\u220B",
-	"Sum":                             "\u2211",
-	"Sup":                             "\u22D1",
-	"Superset":                        "\u2283",
-	"SupersetEqual":                   "\u2287",
-	"Supset":                          "\u22D1",
-	"THORN":                           "\u00DE",
-	"TRADE":                           "\u2122",
-	"TSHcy":                           "\u040B",
-	"TScy":                            "\u0426",
-	"Tab":                             "\u0009",
-	"Tau":                             "\u03A4",
-	"Tcaron":                          "\u0164",
-	"Tcedil":                          "\u0162",
-	"Tcy":                             "\u0422",
-	"Tfr":                             "\U0001D517",
-	"Therefore":                       "\u2234",
-	"Theta":                           "\u0398",
-	"ThickSpace":                      "\u205F\u200A",
-	"ThinSpace":                       "\u2009",
-	"Tilde":                           "\u223C",
-	"TildeEqual":                      "\u2243",
-	"TildeFullEqual":                  "\u2245",
-	"TildeTilde":                      "\u2248",
-	"Topf":                            "\U0001D54B",
-	"TripleDot":                       "\u20DB",
-	"Tscr":                            "\U0001D4AF",
-	"Tstrok":                          "\u0166",
-	"Uacute":                          "\u00DA",
-	"Uarr":                            "\u219F",
-	"Uarrocir":                        "\u2949",
-	"Ubrcy":                           "\u040E",
-	"Ubreve":                          "\u016C",
-	"Ucirc":                           "\u00DB",
-	"Ucy":                             "\u0423",
-	"Udblac":                          "\u0170",
-	"Ufr":                             "\U0001D518",
-	"Ugrave":                          "\u00D9",
-	"Umacr":                           "\u016A",
-	"UnderBar":                        "\u005F",
-	"UnderBrace":                      "\u23DF",
-	"UnderBracket":                    "\u23B5",
-	"UnderParenthesis":                "\u23DD",
-	"Union":                           "\u22C3",
-	"UnionPlus":                       "\u228E",
-	"Uogon":                           "\u0172",
-	"Uopf":                            "\U0001D54C",
-	"UpArrow":                         "\u2191",
-	"UpArrowBar":                      "\u2912",
-	"UpArrowDownArrow":                "\u21C5",
-	"UpDownArrow":                     "\u2195",
-	"UpEquilibrium":                   "\u296E",
-	"UpTee":                           "\u22A5",
-	"UpTeeArrow":                      "\u21A5",
-	"Uparrow":                         "\u21D1",
-	"Updownarrow":                     "\u21D5",
-	"UpperLeftArrow":                  "\u2196",
-	"UpperRightArrow":                 "\u2197",
-	"Upsi":                            "\u03D2",
-	"Upsilon":                         "\u03A5",
-	"Uring":                           "\u016E",
-	"Uscr":                            "\U0001D4B0",
-	"Utilde":                          "\u0168",
-	"Uuml":                            "\u00DC",
-	"VDash":                           "\u22AB",
-	"Vbar":                            "\u2AEB",
-	"Vcy":                             "\u0412",
-	"Vdash":                           "\u22A9",
-	"Vdashl":                          "\u2AE6",
-	"Vee":                             "\u22C1",
-	"Verbar":                          "\u2016",
-	"Vert":                            "\u2016",
-	"VerticalBar":                     "\u2223",
-	"VerticalLine":                    "\u007C",
-	"VerticalSeparator":               "\u2758",
-	"VerticalTilde":                   "\u2240",
-	"VeryThinSpace":                   "\u200A",
-	"Vfr":                             "\U0001D519",
-	"Vopf":                            "\U0001D54D",
-	"Vscr":                            "\U0001D4B1",
-	"Vvdash":                          "\u22AA",
-	"Wcirc":                           "\u0174",
-	"Wedge":                           "\u22C0",
-	"Wfr":                             "\U0001D51A",
-	"Wopf":                            "\U0001D54E",
-	"Wscr":                            "\U0001D4B2",
-	"Xfr":                             "\U0001D51B",
-	"Xi":                              "\u039E",
-	"Xopf":                            "\U0001D54F",
-	"Xscr":                            "\U0001D4B3",
-	"YAcy":                            "\u042F",
-	"YIcy":                            "\u0407",
-	"YUcy":                            "\u042E",
-	"Yacute":                          "\u00DD",
-	"Ycirc":                           "\u0176",
-	"Ycy":                             "\u042B",
-	"Yfr":                             "\U0001D51C",
-	"Yopf":                            "\U0001D550",
-	"Yscr":                            "\U0001D4B4",
-	"Yuml":                            "\u0178",
-	"ZHcy":                            "\u0416",
-	"Zacute":                          "\u0179",
-	"Zcaron":                          "\u017D",
-	"Zcy":                             "\u0417",
-	"Zdot":                            "\u017B",
-	"ZeroWidthSpace":                  "\u200B",
-	"Zeta":                            "\u0396",
-	"Zfr":                             "\u2128",
-	"Zopf":                            "\u2124",
-	"Zscr":                            "\U0001D4B5",
-	"aacute":                          "\u00E1",
-	"abreve":                          "\u0103",
-	"ac":                              "\u223E",
-	"acE":                             "\u223E\u0333",
-	"acd":                             "\u223F",
-	"acirc":                           "\u00E2",
-	"acute":                           "\u00B4",
-	"acy":                             "\u0430",
-	"aelig":                           "\u00E6",
-	"af":                              "\u2061",
-	"afr":                             "\U0001D51E",
-	"agrave":                          "\u00E0",
-	"alefsym":                         "\u2135",
-	"aleph":                           "\u2135",
-	"alpha":                           "\u03B1",
-	"amacr":                           "\u0101",
-	"amalg":                           "\u2A3F",
-	"amp":                             "\u0026",
-	"and":                             "\u2227",
-	"andand":                          "\u2A55",
-	"andd":                            "\u2A5C",
-	"andslope":                        "\u2A58",
-	"andv":                            "\u2A5A",
-	"ang":                             "\u2220",
-	"ange":                            "\u29A4",
-	"angle":                           "\u2220",
-	"angmsd":                          "\u2221",
-	"angmsdaa":                        "\u29A8",
-	"angmsdab":                        "\u29A9",
-	"angmsdac":                        "\u29AA",
-	"angmsdad":                        "\u29AB",
-	"angmsdae":                        "\u29AC",
-	"angmsdaf":                        "\u29AD",
-	"angmsdag":                        "\u29AE",
-	"angmsdah":                        "\u29AF",
-	"angrt":                           "\u221F",
-	"angrtvb":                         "\u22BE",
-	"angrtvbd":                        "\u299D",
-	"angsph":                          "\u2222",
-	"angst":                           "\u00C5",
-	"angzarr":                         "\u237C",
-	"aogon":                           "\u0105",
-	"aopf":                            "\U0001D552",
-	"ap":                              "\u2248",
-	"apE":                             "\u2A70",
-	"apacir":                          "\u2A6F",
-	"ape":                             "\u224A",
-	"apid":                            "\u224B",
-	"apos":                            "\u0027",
-	"approx":                          "\u2248",
-	"approxeq":                        "\u224A",
-	"aring":                           "\u00E5",
-	"ascr":                            "\U0001D4B6",
-	"ast":                             "\u002A",
-	"asymp":                           "\u2248",
-	"asympeq":                         "\u224D",
-	"atilde":                          "\u00E3",
-	"auml":                            "\u00E4",
-	"awconint":                        "\u2233",
-	"awint":                           "\u2A11",
-	"bNot":                            "\u2AED",
-	"backcong":                        "\u224C",
-	"backepsilon":                     "\u03F6",
-	"backprime":                       "\u2035",
-	"backsim":                         "\u223D",
-	"backsimeq":                       "\u22CD",
-	"barvee":                          "\u22BD",
-	"barwed":                          "\u2305",
-	"barwedge":                        "\u2305",
-	"bbrk":                            "\u23B5",
-	"bbrktbrk":                        "\u23B6",
-	"bcong":                           "\u224C",
-	"bcy":                             "\u0431",
-	"bdquo":                           "\u201E",
-	"becaus":                          "\u2235",
-	"because":                         "\u2235",
-	"bemptyv":                         "\u29B0",
-	"bepsi":                           "\u03F6",
-	"bernou":                          "\u212C",
-	"beta":                            "\u03B2",
-	"beth":                            "\u2136",
-	"between":                         "\u226C",
-	"bfr":                             "\U0001D51F",
-	"bigcap":                          "\u22C2",
-	"bigcirc":                         "\u25EF",
-	"bigcup":                          "\u22C3",
-	"bigodot":                         "\u2A00",
-	"bigoplus":                        "\u2A01",
-	"bigotimes":                       "\u2A02",
-	"bigsqcup":                        "\u2A06",
-	"bigstar":                         "\u2605",
-	"bigtriangledown":                 "\u25BD",
-	"bigtriangleup":                   "\u25B3",
-	"biguplus":                        "\u2A04",
-	"bigvee":                          "\u22C1",
-	"bigwedge":                        "\u22C0",
-	"bkarow":                          "\u290D",
-	"blacklozenge":                    "\u29EB",
-	"blacksquare":                     "\u25AA",
-	"blacktriangle":                   "\u25B4",
-	"blacktriangledown":               "\u25BE",
-	"blacktriangleleft":               "\u25C2",
-	"blacktriangleright":              "\u25B8",
-	"blank":                           "\u2423",
-	"blk12":                           "\u2592",
-	"blk14":                           "\u2591",
-	"blk34":                           "\u2593",
-	"block":                           "\u2588",
-	"bne":                             "\u003D\u20E5",
-	"bnequiv":                         "\u2261\u20E5",
-	"bnot":                            "\u2310",
-	"bopf":                            "\U0001D553",
-	"bot":                             "\u22A5",
-	"bottom":                          "\u22A5",
-	"bowtie":                          "\u22C8",
-	"boxDL":                           "\u2557",
-	"boxDR":                           "\u2554",
-	"boxDl":                           "\u2556",
-	"boxDr":                           "\u2553",
-	"boxH":                            "\u2550",
-	"boxHD":                           "\u2566",
-	"boxHU":                           "\u2569",
-	"boxHd":                           "\u2564",
-	"boxHu":                           "\u2567",
-	"boxUL":                           "\u255D",
-	"boxUR":                           "\u255A",
-	"boxUl":                           "\u255C",
-	"boxUr":                           "\u2559",
-	"boxV":                            "\u2551",
-	"boxVH":                           "\u256C",
-	"boxVL":                           "\u2563",
-	"boxVR":                           "\u2560",
-	"boxVh":                           "\u256B",
-	"boxVl":                           "\u2562",
-	"boxVr":                           "\u255F",
-	"boxbox":                          "\u29C9",
-	"boxdL":                           "\u2555",
-	"boxdR":                           "\u2552",
-	"boxdl":                           "\u2510",
-	"boxdr":                           "\u250C",
-	"boxh":                            "\u2500",
-	"boxhD":                           "\u2565",
-	"boxhU":                           "\u2568",
-	"boxhd":                           "\u252C",
-	"boxhu":                           "\u2534",
-	"boxminus":                        "\u229F",
-	"boxplus":                         "\u229E",
-	"boxtimes":                        "\u22A0",
-	"boxuL":                           "\u255B",
-	"boxuR":                           "\u2558",
-	"boxul":                           "\u2518",
-	"boxur":                           "\u2514",
-	"boxv":                            "\u2502",
-	"boxvH":                           "\u256A",
-	"boxvL":                           "\u2561",
-	"boxvR":                           "\u255E",
-	"boxvh":                           "\u253C",
-	"boxvl":                           "\u2524",
-	"boxvr":                           "\u251C",
-	"bprime":                          "\u2035",
-	"breve":                           "\u02D8",
-	"brvbar":                          "\u00A6",
-	"bscr":                            "\U0001D4B7",
-	"bsemi":                           "\u204F",
-	"bsim":                            "\u223D",
-	"bsime":                           "\u22CD",
-	"bsol":                            "\u005C",
-	"bsolb":                           "\u29C5",
-	"bsolhsub":                        "\u27C8",
-	"bull":                            "\u2022",
-	"bullet":                          "\u2022",
-	"bump":                            "\u224E",
-	"bumpE":                           "\u2AAE",
-	"bumpe":                           "\u224F",
-	"bumpeq":                          "\u224F",
-	"cacute":                          "\u0107",
-	"cap":                             "\u2229",
-	"capand":                          "\u2A44",
-	"capbrcup":                        "\u2A49",
-	"capcap":                          "\u2A4B",
-	"capcup":                          "\u2A47",
-	"capdot":                          "\u2A40",
-	"caps":                            "\u2229\uFE00",
-	"caret":                           "\u2041",
-	"caron":                           "\u02C7",
-	"ccaps":                           "\u2A4D",
-	"ccaron":                          "\u010D",
-	"ccedil":                          "\u00E7",
-	"ccirc":                           "\u0109",
-	"ccups":                           "\u2A4C",
-	"ccupssm":                         "\u2A50",
-	"cdot":                            "\u010B",
-	"cedil":                           "\u00B8",
-	"cemptyv":                         "\u29B2",
-	"cent":                            "\u00A2",
-	"centerdot":                       "\u00B7",
-	"cfr":                             "\U0001D520",
-	"chcy":                            "\u0447",
-	"check":                           "\u2713",
-	"checkmark":                       "\u2713",
-	"chi":                             "\u03C7",
-	"cir":                             "\u25CB",
-	"cirE":                            "\u29C3",
-	"circ":                            "\u02C6",
-	"circeq":                          "\u2257",
-	"circlearrowleft":                 "\u21BA",
-	"circlearrowright":                "\u21BB",
-	"circledR":                        "\u00AE",
-	"circledS":                        "\u24C8",
-	"circledast":                      "\u229B",
-	"circledcirc":                     "\u229A",
-	"circleddash":                     "\u229D",
-	"cire":                            "\u2257",
-	"cirfnint":                        "\u2A10",
-	"cirmid":                          "\u2AEF",
-	"cirscir":                         "\u29C2",
-	"clubs":                           "\u2663",
-	"clubsuit":                        "\u2663",
-	"colon":                           "\u003A",
-	"colone":                          "\u2254",
-	"coloneq":                         "\u2254",
-	"comma":                           "\u002C",
-	"commat":                          "\u0040",
-	"comp":                            "\u2201",
-	"compfn":                          "\u2218",
-	"complement":                      "\u2201",
-	"complexes":                       "\u2102",
-	"cong":                            "\u2245",
-	"congdot":                         "\u2A6D",
-	"conint":                          "\u222E",
-	"copf":                            "\U0001D554",
-	"coprod":                          "\u2210",
-	"copy":                            "\u00A9",
-	"copysr":                          "\u2117",
-	"crarr":                           "\u21B5",
-	"cross":                           "\u2717",
-	"cscr":                            "\U0001D4B8",
-	"csub":                            "\u2ACF",
-	"csube":                           "\u2AD1",
-	"csup":                            "\u2AD0",
-	"csupe":                           "\u2AD2",
-	"ctdot":                           "\u22EF",
-	"cudarrl":                         "\u2938",
-	"cudarrr":                         "\u2935",
-	"cuepr":                           "\u22DE",
-	"cuesc":                           "\u22DF",
-	"cularr":                          "\u21B6",
-	"cularrp":                         "\u293D",
-	"cup":                             "\u222A",
-	"cupbrcap":                        "\u2A48",
-	"cupcap":                          "\u2A46",
-	"cupcup":                          "\u2A4A",
-	"cupdot":                          "\u228D",
-	"cupor":                           "\u2A45",
-	"cups":                            "\u222A\uFE00",
-	"curarr":                          "\u21B7",
-	"curarrm":                         "\u293C",
-	"curlyeqprec":                     "\u22DE",
-	"curlyeqsucc":                     "\u22DF",
-	"curlyvee":                        "\u22CE",
-	"curlywedge":                      "\u22CF",
-	"curren":                          "\u00A4",
-	"curvearrowleft":                  "\u21B6",
-	"curvearrowright":                 "\u21B7",
-	"cuvee":                           "\u22CE",
-	"cuwed":                           "\u22CF",
-	"cwconint":                        "\u2232",
-	"cwint":                           "\u2231",
-	"cylcty":                          "\u232D",
-	"dArr":                            "\u21D3",
-	"dHar":                            "\u2965",
-	"dagger":                          "\u2020",
-	"daleth":                          "\u2138",
-	"darr":                            "\u2193",
-	"dash":                            "\u2010",
-	"dashv":                           "\u22A3",
-	"dbkarow":                         "\u290F",
-	"dblac":                           "\u02DD",
-	"dcaron":                          "\u010F",
-	"dcy":                             "\u0434",
-	"dd":                              "\u2146",
-	"ddagger":                         "\u2021",
-	"ddarr":                           "\u21CA",
-	"ddotseq":                         "\u2A77",
-	"deg":                             "\u00B0",
-	"delta":                           "\u03B4",
-	"demptyv":                         "\u29B1",
-	"dfisht":                          "\u297F",
-	"dfr":                             "\U0001D521",
-	"dharl":                           "\u21C3",
-	"dharr":                           "\u21C2",
-	"diam":                            "\u22C4",
-	"diamond":                         "\u22C4",
-	"diamondsuit":                     "\u2666",
-	"diams":                           "\u2666",
-	"die":                             "\u00A8",
-	"digamma":                         "\u03DD",
-	"disin":                           "\u22F2",
-	"div":                             "\u00F7",
-	"divide":                          "\u00F7",
-	"divideontimes":                   "\u22C7",
-	"divonx":                          "\u22C7",
-	"djcy":                            "\u0452",
-	"dlcorn":                          "\u231E",
-	"dlcrop":                          "\u230D",
-	"dollar":                          "\u0024",
-	"dopf":                            "\U0001D555",
-	"dot":                             "\u02D9",
-	"doteq":                           "\u2250",
-	"doteqdot":                        "\u2251",
-	"dotminus":                        "\u2238",
-	"dotplus":                         "\u2214",
-	"dotsquare":                       "\u22A1",
-	"doublebarwedge":                  "\u2306",
-	"downarrow":                       "\u2193",
-	"downdownarrows":                  "\u21CA",
-	"downharpoonleft":                 "\u21C3",
-	"downharpoonright":                "\u21C2",
-	"drbkarow":                        "\u2910",
-	"drcorn":                          "\u231F",
-	"drcrop":                          "\u230C",
-	"dscr":                            "\U0001D4B9",
-	"dscy":                            "\u0455",
-	"dsol":                            "\u29F6",
-	"dstrok":                          "\u0111",
-	"dtdot":                           "\u22F1",
-	"dtri":                            "\u25BF",
-	"dtrif":                           "\u25BE",
-	"duarr":                           "\u21F5",
-	"duhar":                           "\u296F",
-	"dwangle":                         "\u29A6",
-	"dzcy":                            "\u045F",
-	"dzigrarr":                        "\u27FF",
-	"eDDot":                           "\u2A77",
-	"eDot":                            "\u2251",
-	"eacute":                          "\u00E9",
-	"easter":                          "\u2A6E",
-	"ecaron":                          "\u011B",
-	"ecir":                            "\u2256",
-	"ecirc":                           "\u00EA",
-	"ecolon":                          "\u2255",
-	"ecy":                             "\u044D",
-	"edot":                            "\u0117",
-	"ee":                              "\u2147",
-	"efDot":                           "\u2252",
-	"efr":                             "\U0001D522",
-	"eg":                              "\u2A9A",
-	"egrave":                          "\u00E8",
-	"egs":                             "\u2A96",
-	"egsdot":                          "\u2A98",
-	"el":                              "\u2A99",
-	"elinters":                        "\u23E7",
-	"ell":                             "\u2113",
-	"els":                             "\u2A95",
-	"elsdot":                          "\u2A97",
-	"emacr":                           "\u0113",
-	"empty":                           "\u2205",
-	"emptyset":                        "\u2205",
-	"emptyv":                          "\u2205",
-	"emsp":                            "\u2003",
-	"emsp13":                          "\u2004",
-	"emsp14":                          "\u2005",
-	"eng":                             "\u014B",
-	"ensp":                            "\u2002",
-	"eogon":                           "\u0119",
-	"eopf":                            "\U0001D556",
-	"epar":                            "\u22D5",
-	"eparsl":                          "\u29E3",
-	"eplus":                           "\u2A71",
-	"epsi":                            "\u03B5",
-	"epsilon":                         "\u03B5",
-	"epsiv":                           "\u03F5",
-	"eqcirc":                          "\u2256",
-	"eqcolon":                         "\u2255",
-	"eqsim":                           "\u2242",
-	"eqslantgtr":                      "\u2A96",
-	"eqslantless":                     "\u2A95",
-	"equals":                          "\u003D",
-	"equest":                          "\u225F",
-	"equiv":                           "\u2261",
-	"equivDD":                         "\u2A78",
-	"eqvparsl":                        "\u29E5",
-	"erDot":                           "\u2253",
-	"erarr":                           "\u2971",
-	"escr":                            "\u212F",
-	"esdot":                           "\u2250",
-	"esim":                            "\u2242",
-	"eta":                             "\u03B7",
-	"eth":                             "\u00F0",
-	"euml":                            "\u00EB",
-	"euro":                            "\u20AC",
-	"excl":                            "\u0021",
-	"exist":                           "\u2203",
-	"expectation":                     "\u2130",
-	"exponentiale":                    "\u2147",
-	"fallingdotseq":                   "\u2252",
-	"fcy":                             "\u0444",
-	"female":                          "\u2640",
-	"ffilig":                          "\uFB03",
-	"fflig":                           "\uFB00",
-	"ffllig":                          "\uFB04",
-	"ffr":                             "\U0001D523",
-	"filig":                           "\uFB01",
-	"fjlig":                           "\u0066\u006A",
-	"flat":                            "\u266D",
-	"fllig":                           "\uFB02",
-	"fltns":                           "\u25B1",
-	"fnof":                            "\u0192",
-	"fopf":                            "\U0001D557",
-	"forall":                          "\u2200",
-	"fork":                            "\u22D4",
-	"forkv":                           "\u2AD9",
-	"fpartint":                        "\u2A0D",
-	"frac12":                          "\u00BD",
-	"frac13":                          "\u2153",
-	"frac14":                          "\u00BC",
-	"frac15":                          "\u2155",
-	"frac16":                          "\u2159",
-	"frac18":                          "\u215B",
-	"frac23":                          "\u2154",
-	"frac25":                          "\u2156",
-	"frac34":                          "\u00BE",
-	"frac35":                          "\u2157",
-	"frac38":                          "\u215C",
-	"frac45":                          "\u2158",
-	"frac56":                          "\u215A",
-	"frac58":                          "\u215D",
-	"frac78":                          "\u215E",
-	"frasl":                           "\u2044",
-	"frown":                           "\u2322",
-	"fscr":                            "\U0001D4BB",
-	"gE":                              "\u2267",
-	"gEl":                             "\u2A8C",
-	"gacute":                          "\u01F5",
-	"gamma":                           "\u03B3",
-	"gammad":                          "\u03DD",
-	"gap":                             "\u2A86",
-	"gbreve":                          "\u011F",
-	"gcirc":                           "\u011D",
-	"gcy":                             "\u0433",
-	"gdot":                            "\u0121",
-	"ge":                              "\u2265",
-	"gel":                             "\u22DB",
-	"geq":                             "\u2265",
-	"geqq":                            "\u2267",
-	"geqslant":                        "\u2A7E",
-	"ges":                             "\u2A7E",
-	"gescc":                           "\u2AA9",
-	"gesdot":                          "\u2A80",
-	"gesdoto":                         "\u2A82",
-	"gesdotol":                        "\u2A84",
-	"gesl":                            "\u22DB\uFE00",
-	"gesles":                          "\u2A94",
-	"gfr":                             "\U0001D524",
-	"gg":                              "\u226B",
-	"ggg":                             "\u22D9",
-	"gimel":                           "\u2137",
-	"gjcy":                            "\u0453",
-	"gl":                              "\u2277",
-	"glE":                             "\u2A92",
-	"gla":                             "\u2AA5",
-	"glj":                             "\u2AA4",
-	"gnE":                             "\u2269",
-	"gnap":                            "\u2A8A",
-	"gnapprox":                        "\u2A8A",
-	"gne":                             "\u2A88",
-	"gneq":                            "\u2A88",
-	"gneqq":                           "\u2269",
-	"gnsim":                           "\u22E7",
-	"gopf":                            "\U0001D558",
-	"grave":                           "\u0060",
-	"gscr":                            "\u210A",
-	"gsim":                            "\u2273",
-	"gsime":                           "\u2A8E",
-	"gsiml":                           "\u2A90",
-	"gt":                              "\u003E",
-	"gtcc":                            "\u2AA7",
-	"gtcir":                           "\u2A7A",
-	"gtdot":                           "\u22D7",
-	"gtlPar":                          "\u2995",
-	"gtquest":                         "\u2A7C",
-	"gtrapprox":                       "\u2A86",
-	"gtrarr":                          "\u2978",
-	"gtrdot":                          "\u22D7",
-	"gtreqless":                       "\u22DB",
-	"gtreqqless":                      "\u2A8C",
-	"gtrless":                         "\u2277",
-	"gtrsim":                          "\u2273",
-	"gvertneqq":                       "\u2269\uFE00",
-	"gvnE":                            "\u2269\uFE00",
-	"hArr":                            "\u21D4",
-	"hairsp":                          "\u200A",
-	"half":                            "\u00BD",
-	"hamilt":                          "\u210B",
-	"hardcy":                          "\u044A",
-	"harr":                            "\u2194",
-	"harrcir":                         "\u2948",
-	"harrw":                           "\u21AD",
-	"hbar":                            "\u210F",
-	"hcirc":                           "\u0125",
-	"hearts":                          "\u2665",
-	"heartsuit":                       "\u2665",
-	"hellip":                          "\u2026",
-	"hercon":                          "\u22B9",
-	"hfr":                             "\U0001D525",
-	"hksearow":                        "\u2925",
-	"hkswarow":                        "\u2926",
-	"hoarr":                           "\u21FF",
-	"homtht":                          "\u223B",
-	"hookleftarrow":                   "\u21A9",
-	"hookrightarrow":                  "\u21AA",
-	"hopf":                            "\U0001D559",
-	"horbar":                          "\u2015",
-	"hscr":                            "\U0001D4BD",
-	"hslash":                          "\u210F",
-	"hstrok":                          "\u0127",
-	"hybull":                          "\u2043",
-	"hyphen":                          "\u2010",
-	"iacute":                          "\u00ED",
-	"ic":                              "\u2063",
-	"icirc":                           "\u00EE",
-	"icy":                             "\u0438",
-	"iecy":                            "\u0435",
-	"iexcl":                           "\u00A1",
-	"iff":                             "\u21D4",
-	"ifr":                             "\U0001D526",
-	"igrave":                          "\u00EC",
-	"ii":                              "\u2148",
-	"iiiint":                          "\u2A0C",
-	"iiint":                           "\u222D",
-	"iinfin":                          "\u29DC",
-	"iiota":                           "\u2129",
-	"ijlig":                           "\u0133",
-	"imacr":                           "\u012B",
-	"image":                           "\u2111",
-	"imagline":                        "\u2110",
-	"imagpart":                        "\u2111",
-	"imath":                           "\u0131",
-	"imof":                            "\u22B7",
-	"imped":                           "\u01B5",
-	"in":                              "\u2208",
-	"incare":                          "\u2105",
-	"infin":                           "\u221E",
-	"infintie":                        "\u29DD",
-	"inodot":                          "\u0131",
-	"int":                             "\u222B",
-	"intcal":                          "\u22BA",
-	"integers":                        "\u2124",
-	"intercal":                        "\u22BA",
-	"intlarhk":                        "\u2A17",
-	"intprod":                         "\u2A3C",
-	"iocy":                            "\u0451",
-	"iogon":                           "\u012F",
-	"iopf":                            "\U0001D55A",
-	"iota":                            "\u03B9",
-	"iprod":                           "\u2A3C",
-	"iquest":                          "\u00BF",
-	"iscr":                            "\U0001D4BE",
-	"isin":                            "\u2208",
-	"isinE":                           "\u22F9",
-	"isindot":                         "\u22F5",
-	"isins":                           "\u22F4",
-	"isinsv":                          "\u22F3",
-	"isinv":                           "\u2208",
-	"it":                              "\u2062",
-	"itilde":                          "\u0129",
-	"iukcy":                           "\u0456",
-	"iuml":                            "\u00EF",
-	"jcirc":                           "\u0135",
-	"jcy":                             "\u0439",
-	"jfr":                             "\U0001D527",
-	"jmath":                           "\u0237",
-	"jopf":                            "\U0001D55B",
-	"jscr":                            "\U0001D4BF",
-	"jsercy":                          "\u0458",
-	"jukcy":                           "\u0454",
-	"kappa":                           "\u03BA",
-	"kappav":                          "\u03F0",
-	"kcedil":                          "\u0137",
-	"kcy":                             "\u043A",
-	"kfr":                             "\U0001D528",
-	"kgreen":                          "\u0138",
-	"khcy":                            "\u0445",
-	"kjcy":                            "\u045C",
-	"kopf":                            "\U0001D55C",
-	"kscr":                            "\U0001D4C0",
-	"lAarr":                           "\u21DA",
-	"lArr":                            "\u21D0",
-	"lAtail":                          "\u291B",
-	"lBarr":                           "\u290E",
-	"lE":                              "\u2266",
-	"lEg":                             "\u2A8B",
-	"lHar":                            "\u2962",
-	"lacute":                          "\u013A",
-	"laemptyv":                        "\u29B4",
-	"lagran":                          "\u2112",
-	"lambda":                          "\u03BB",
-	"lang":                            "\u27E8",
-	"langd":                           "\u2991",
-	"langle":                          "\u27E8",
-	"lap":                             "\u2A85",
-	"laquo":                           "\u00AB",
-	"larr":                            "\u2190",
-	"larrb":                           "\u21E4",
-	"larrbfs":                         "\u291F",
-	"larrfs":                          "\u291D",
-	"larrhk":                          "\u21A9",
-	"larrlp":                          "\u21AB",
-	"larrpl":                          "\u2939",
-	"larrsim":                         "\u2973",
-	"larrtl":                          "\u21A2",
-	"lat":                             "\u2AAB",
-	"latail":                          "\u2919",
-	"late":                            "\u2AAD",
-	"lates":                           "\u2AAD\uFE00",
-	"lbarr":                           "\u290C",
-	"lbbrk":                           "\u2772",
-	"lbrace":                          "\u007B",
-	"lbrack":                          "\u005B",
-	"lbrke":                           "\u298B",
-	"lbrksld":                         "\u298F",
-	"lbrkslu":                         "\u298D",
-	"lcaron":                          "\u013E",
-	"lcedil":                          "\u013C",
-	"lceil":                           "\u2308",
-	"lcub":                            "\u007B",
-	"lcy":                             "\u043B",
-	"ldca":                            "\u2936",
-	"ldquo":                           "\u201C",
-	"ldquor":                          "\u201E",
-	"ldrdhar":                         "\u2967",
-	"ldrushar":                        "\u294B",
-	"ldsh":                            "\u21B2",
-	"le":                              "\u2264",
-	"leftarrow":                       "\u2190",
-	"leftarrowtail":                   "\u21A2",
-	"leftharpoondown":                 "\u21BD",
-	"leftharpoonup":                   "\u21BC",
-	"leftleftarrows":                  "\u21C7",
-	"leftrightarrow":                  "\u2194",
-	"leftrightarrows":                 "\u21C6",
-	"leftrightharpoons":               "\u21CB",
-	"leftrightsquigarrow":             "\u21AD",
-	"leftthreetimes":                  "\u22CB",
-	"leg":                             "\u22DA",
-	"leq":                             "\u2264",
-	"leqq":                            "\u2266",
-	"leqslant":                        "\u2A7D",
-	"les":                             "\u2A7D",
-	"lescc":                           "\u2AA8",
-	"lesdot":                          "\u2A7F",
-	"lesdoto":                         "\u2A81",
-	"lesdotor":                        "\u2A83",
-	"lesg":                            "\u22DA\uFE00",
-	"lesges":                          "\u2A93",
-	"lessapprox":                      "\u2A85",
-	"lessdot":                         "\u22D6",
-	"lesseqgtr":                       "\u22DA",
-	"lesseqqgtr":                      "\u2A8B",
-	"lessgtr":                         "\u2276",
-	"lesssim":                         "\u2272",
-	"lfisht":                          "\u297C",
-	"lfloor":                          "\u230A",
-	"lfr":                             "\U0001D529",
-	"lg":                              "\u2276",
-	"lgE":                             "\u2A91",
-	"lhard":                           "\u21BD",
-	"lharu":                           "\u21BC",
-	"lharul":                          "\u296A",
-	"lhblk":                           "\u2584",
-	"ljcy":                            "\u0459",
-	"ll":                              "\u226A",
-	"llarr":                           "\u21C7",
-	"llcorner":                        "\u231E",
-	"llhard":                          "\u296B",
-	"lltri":                           "\u25FA",
-	"lmidot":                          "\u0140",
-	"lmoust":                          "\u23B0",
-	"lmoustache":                      "\u23B0",
-	"lnE":                             "\u2268",
-	"lnap":                            "\u2A89",
-	"lnapprox":                        "\u2A89",
-	"lne":                             "\u2A87",
-	"lneq":                            "\u2A87",
-	"lneqq":                           "\u2268",
-	"lnsim":                           "\u22E6",
-	"loang":                           "\u27EC",
-	"loarr":                           "\u21FD",
-	"lobrk":                           "\u27E6",
-	"longleftarrow":                   "\u27F5",
-	"longleftrightarrow":              "\u27F7",
-	"longmapsto":                      "\u27FC",
-	"longrightarrow":                  "\u27F6",
-	"looparrowleft":                   "\u21AB",
-	"looparrowright":                  "\u21AC",
-	"lopar":                           "\u2985",
-	"lopf":                            "\U0001D55D",
-	"loplus":                          "\u2A2D",
-	"lotimes":                         "\u2A34",
-	"lowast":                          "\u2217",
-	"lowbar":                          "\u005F",
-	"loz":                             "\u25CA",
-	"lozenge":                         "\u25CA",
-	"lozf":                            "\u29EB",
-	"lpar":                            "\u0028",
-	"lparlt":                          "\u2993",
-	"lrarr":                           "\u21C6",
-	"lrcorner":                        "\u231F",
-	"lrhar":                           "\u21CB",
-	"lrhard":                          "\u296D",
-	"lrm":                             "\u200E",
-	"lrtri":                           "\u22BF",
-	"lsaquo":                          "\u2039",
-	"lscr":                            "\U0001D4C1",
-	"lsh":                             "\u21B0",
-	"lsim":                            "\u2272",
-	"lsime":                           "\u2A8D",
-	"lsimg":                           "\u2A8F",
-	"lsqb":                            "\u005B",
-	"lsquo":                           "\u2018",
-	"lsquor":                          "\u201A",
-	"lstrok":                          "\u0142",
-	"lt":                              "\u003C",
-	"ltcc":                            "\u2AA6",
-	"ltcir":                           "\u2A79",
-	"ltdot":                           "\u22D6",
-	"lthree":                          "\u22CB",
-	"ltimes":                          "\u22C9",
-	"ltlarr":                          "\u2976",
-	"ltquest":                         "\u2A7B",
-	"ltrPar":                          "\u2996",
-	"ltri":                            "\u25C3",
-	"ltrie":                           "\u22B4",
-	"ltrif":                           "\u25C2",
-	"lurdshar":                        "\u294A",
-	"luruhar":                         "\u2966",
-	"lvertneqq":                       "\u2268\uFE00",
-	"lvnE":                            "\u2268\uFE00",
-	"mDDot":                           "\u223A",
-	"macr":                            "\u00AF",
-	"male":                            "\u2642",
-	"malt":                            "\u2720",
-	"maltese":                         "\u2720",
-	"map":                             "\u21A6",
-	"mapsto":                          "\u21A6",
-	"mapstodown":                      "\u21A7",
-	"mapstoleft":                      "\u21A4",
-	"mapstoup":                        "\u21A5",
-	"marker":                          "\u25AE",
-	"mcomma":                          "\u2A29",
-	"mcy":                             "\u043C",
-	"mdash":                           "\u2014",
-	"measuredangle":                   "\u2221",
-	"mfr":                             "\U0001D52A",
-	"mho":                             "\u2127",
-	"micro":                           "\u00B5",
-	"mid":                             "\u2223",
-	"midast":                          "\u002A",
-	"midcir":                          "\u2AF0",
-	"middot":                          "\u00B7",
-	"minus":                           "\u2212",
-	"minusb":                          "\u229F",
-	"minusd":                          "\u2238",
-	"minusdu":                         "\u2A2A",
-	"mlcp":                            "\u2ADB",
-	"mldr":                            "\u2026",
-	"mnplus":                          "\u2213",
-	"models":                          "\u22A7",
-	"mopf":                            "\U0001D55E",
-	"mp":                              "\u2213",
-	"mscr":                            "\U0001D4C2",
-	"mstpos":                          "\u223E",
-	"mu":                              "\u03BC",
-	"multimap":                        "\u22B8",
-	"mumap":                           "\u22B8",
-	"nGg":                             "\u22D9\u0338",
-	"nGt":                             "\u226B\u20D2",
-	"nGtv":                            "\u226B\u0338",
-	"nLeftarrow":                      "\u21CD",
-	"nLeftrightarrow":                 "\u21CE",
-	"nLl":                             "\u22D8\u0338",
-	"nLt":                             "\u226A\u20D2",
-	"nLtv":                            "\u226A\u0338",
-	"nRightarrow":                     "\u21CF",
-	"nVDash":                          "\u22AF",
-	"nVdash":                          "\u22AE",
-	"nabla":                           "\u2207",
-	"nacute":                          "\u0144",
-	"nang":                            "\u2220\u20D2",
-	"nap":                             "\u2249",
-	"napE":                            "\u2A70\u0338",
-	"napid":                           "\u224B\u0338",
-	"napos":                           "\u0149",
-	"napprox":                         "\u2249",
-	"natur":                           "\u266E",
-	"natural":                         "\u266E",
-	"naturals":                        "\u2115",
-	"nbsp":                            "\u00A0",
-	"nbump":                           "\u224E\u0338",
-	"nbumpe":                          "\u224F\u0338",
-	"ncap":                            "\u2A43",
-	"ncaron":                          "\u0148",
-	"ncedil":                          "\u0146",
-	"ncong":                           "\u2247",
-	"ncongdot":                        "\u2A6D\u0338",
-	"ncup":                            "\u2A42",
-	"ncy":                             "\u043D",
-	"ndash":                           "\u2013",
-	"ne":                              "\u2260",
-	"neArr":                           "\u21D7",
-	"nearhk":                          "\u2924",
-	"nearr":                           "\u2197",
-	"nearrow":                         "\u2197",
-	"nedot":                           "\u2250\u0338",
-	"nequiv":                          "\u2262",
-	"nesear":                          "\u2928",
-	"nesim":                           "\u2242\u0338",
-	"nexist":                          "\u2204",
-	"nexists":                         "\u2204",
-	"nfr":                             "\U0001D52B",
-	"ngE":                             "\u2267\u0338",
-	"nge":                             "\u2271",
-	"ngeq":                            "\u2271",
-	"ngeqq":                           "\u2267\u0338",
-	"ngeqslant":                       "\u2A7E\u0338",
-	"nges":                            "\u2A7E\u0338",
-	"ngsim":                           "\u2275",
-	"ngt":                             "\u226F",
-	"ngtr":                            "\u226F",
-	"nhArr":                           "\u21CE",
-	"nharr":                           "\u21AE",
-	"nhpar":                           "\u2AF2",
-	"ni":                              "\u220B",
-	"nis":                             "\u22FC",
-	"nisd":                            "\u22FA",
-	"niv":                             "\u220B",
-	"njcy":                            "\u045A",
-	"nlArr":                           "\u21CD",
-	"nlE":                             "\u2266\u0338",
-	"nlarr":                           "\u219A",
-	"nldr":                            "\u2025",
-	"nle":                             "\u2270",
-	"nleftarrow":                      "\u219A",
-	"nleftrightarrow":                 "\u21AE",
-	"nleq":                            "\u2270",
-	"nleqq":                           "\u2266\u0338",
-	"nleqslant":                       "\u2A7D\u0338",
-	"nles":                            "\u2A7D\u0338",
-	"nless":                           "\u226E",
-	"nlsim":                           "\u2274",
-	"nlt":                             "\u226E",
-	"nltri":                           "\u22EA",
-	"nltrie":                          "\u22EC",
-	"nmid":                            "\u2224",
-	"nopf":                            "\U0001D55F",
-	"not":                             "\u00AC",
-	"notin":                           "\u2209",
-	"notinE":                          "\u22F9\u0338",
-	"notindot":                        "\u22F5\u0338",
-	"notinva":                         "\u2209",
-	"notinvb":                         "\u22F7",
-	"notinvc":                         "\u22F6",
-	"notni":                           "\u220C",
-	"notniva":                         "\u220C",
-	"notnivb":                         "\u22FE",
-	"notnivc":                         "\u22FD",
-	"npar":                            "\u2226",
-	"nparallel":                       "\u2226",
-	"nparsl":                          "\u2AFD\u20E5",
-	"npart":                           "\u2202\u0338",
-	"npolint":                         "\u2A14",
-	"npr":                             "\u2280",
-	"nprcue":                          "\u22E0",
-	"npre":                            "\u2AAF\u0338",
-	"nprec":                           "\u2280",
-	"npreceq":                         "\u2AAF\u0338",
-	"nrArr":                           "\u21CF",
-	"nrarr":                           "\u219B",
-	"nrarrc":                          "\u2933\u0338",
-	"nrarrw":                          "\u219D\u0338",
-	"nrightarrow":                     "\u219B",
-	"nrtri":                           "\u22EB",
-	"nrtrie":                          "\u22ED",
-	"nsc":                             "\u2281",
-	"nsccue":                          "\u22E1",
-	"nsce":                            "\u2AB0\u0338",
-	"nscr":                            "\U0001D4C3",
-	"nshortmid":                       "\u2224",
-	"nshortparallel":                  "\u2226",
-	"nsim":                            "\u2241",
-	"nsime":                           "\u2244",
-	"nsimeq":                          "\u2244",
-	"nsmid":                           "\u2224",
-	"nspar":                           "\u2226",
-	"nsqsube":                         "\u22E2",
-	"nsqsupe":                         "\u22E3",
-	"nsub":                            "\u2284",
-	"nsubE":                           "\u2AC5\u0338",
-	"nsube":                           "\u2288",
-	"nsubset":                         "\u2282\u20D2",
-	"nsubseteq":                       "\u2288",
-	"nsubseteqq":                      "\u2AC5\u0338",
-	"nsucc":                           "\u2281",
-	"nsucceq":                         "\u2AB0\u0338",
-	"nsup":                            "\u2285",
-	"nsupE":                           "\u2AC6\u0338",
-	"nsupe":                           "\u2289",
-	"nsupset":                         "\u2283\u20D2",
-	"nsupseteq":                       "\u2289",
-	"nsupseteqq":                      "\u2AC6\u0338",
-	"ntgl":                            "\u2279",
-	"ntilde":                          "\u00F1",
-	"ntlg":                            "\u2278",
-	"ntriangleleft":                   "\u22EA",
-	"ntrianglelefteq":                 "\u22EC",
-	"ntriangleright":                  "\u22EB",
-	"ntrianglerighteq":                "\u22ED",
-	"nu":                              "\u03BD",
-	"num":                             "\u0023",
-	"numero":                          "\u2116",
-	"numsp":                           "\u2007",
-	"nvDash":                          "\u22AD",
-	"nvHarr":                          "\u2904",
-	"nvap":                            "\u224D\u20D2",
-	"nvdash":                          "\u22AC",
-	"nvge":                            "\u2265\u20D2",
-	"nvgt":                            "\u003E\u20D2",
-	"nvinfin":                         "\u29DE",
-	"nvlArr":                          "\u2902",
-	"nvle":                            "\u2264\u20D2",
-	"nvlt":                            "\u003C\u20D2",
-	"nvltrie":                         "\u22B4\u20D2",
-	"nvrArr":                          "\u2903",
-	"nvrtrie":                         "\u22B5\u20D2",
-	"nvsim":                           "\u223C\u20D2",
-	"nwArr":                           "\u21D6",
-	"nwarhk":                          "\u2923",
-	"nwarr":                           "\u2196",
-	"nwarrow":                         "\u2196",
-	"nwnear":                          "\u2927",
-	"oS":                              "\u24C8",
-	"oacute":                          "\u00F3",
-	"oast":                            "\u229B",
-	"ocir":                            "\u229A",
-	"ocirc":                           "\u00F4",
-	"ocy":                             "\u043E",
-	"odash":                           "\u229D",
-	"odblac":                          "\u0151",
-	"odiv":                            "\u2A38",
-	"odot":                            "\u2299",
-	"odsold":                          "\u29BC",
-	"oelig":                           "\u0153",
-	"ofcir":                           "\u29BF",
-	"ofr":                             "\U0001D52C",
-	"ogon":                            "\u02DB",
-	"ograve":                          "\u00F2",
-	"ogt":                             "\u29C1",
-	"ohbar":                           "\u29B5",
-	"ohm":                             "\u03A9",
-	"oint":                            "\u222E",
-	"olarr":                           "\u21BA",
-	"olcir":                           "\u29BE",
-	"olcross":                         "\u29BB",
-	"oline":                           "\u203E",
-	"olt":                             "\u29C0",
-	"omacr":                           "\u014D",
-	"omega":                           "\u03C9",
-	"omicron":                         "\u03BF",
-	"omid":                            "\u29B6",
-	"ominus":                          "\u2296",
-	"oopf":                            "\U0001D560",
-	"opar":                            "\u29B7",
-	"operp":                           "\u29B9",
-	"oplus":                           "\u2295",
-	"or":                              "\u2228",
-	"orarr":                           "\u21BB",
-	"ord":                             "\u2A5D",
-	"order":                           "\u2134",
-	"orderof":                         "\u2134",
-	"ordf":                            "\u00AA",
-	"ordm":                            "\u00BA",
-	"origof":                          "\u22B6",
-	"oror":                            "\u2A56",
-	"orslope":                         "\u2A57",
-	"orv":                             "\u2A5B",
-	"oscr":                            "\u2134",
-	"oslash":                          "\u00F8",
-	"osol":                            "\u2298",
-	"otilde":                          "\u00F5",
-	"otimes":                          "\u2297",
-	"otimesas":                        "\u2A36",
-	"ouml":                            "\u00F6",
-	"ovbar":                           "\u233D",
-	"par":                             "\u2225",
-	"para":                            "\u00B6",
-	"parallel":                        "\u2225",
-	"parsim":                          "\u2AF3",
-	"parsl":                           "\u2AFD",
-	"part":                            "\u2202",
-	"pcy":                             "\u043F",
-	"percnt":                          "\u0025",
-	"period":                          "\u002E",
-	"permil":                          "\u2030",
-	"perp":                            "\u22A5",
-	"pertenk":                         "\u2031",
-	"pfr":                             "\U0001D52D",
-	"phi":                             "\u03C6",
-	"phiv":                            "\u03D5",
-	"phmmat":                          "\u2133",
-	"phone":                           "\u260E",
-	"pi":                              "\u03C0",
-	"pitchfork":                       "\u22D4",
-	"piv":                             "\u03D6",
-	"planck":                          "\u210F",
-	"planckh":                         "\u210E",
-	"plankv":                          "\u210F",
-	"plus":                            "\u002B",
-	"plusacir":                        "\u2A23",
-	"plusb":                           "\u229E",
-	"pluscir":                         "\u2A22",
-	"plusdo":                          "\u2214",
-	"plusdu":                          "\u2A25",
-	"pluse":                           "\u2A72",
-	"plusmn":                          "\u00B1",
-	"plussim":                         "\u2A26",
-	"plustwo":                         "\u2A27",
-	"pm":                              "\u00B1",
-	"pointint":                        "\u2A15",
-	"popf":                            "\U0001D561",
-	"pound":                           "\u00A3",
-	"pr":                              "\u227A",
-	"prE":                             "\u2AB3",
-	"prap":                            "\u2AB7",
-	"prcue":                           "\u227C",
-	"pre":                             "\u2AAF",
-	"prec":                            "\u227A",
-	"precapprox":                      "\u2AB7",
-	"preccurlyeq":                     "\u227C",
-	"preceq":                          "\u2AAF",
-	"precnapprox":                     "\u2AB9",
-	"precneqq":                        "\u2AB5",
-	"precnsim":                        "\u22E8",
-	"precsim":                         "\u227E",
-	"prime":                           "\u2032",
-	"primes":                          "\u2119",
-	"prnE":                            "\u2AB5",
-	"prnap":                           "\u2AB9",
-	"prnsim":                          "\u22E8",
-	"prod":                            "\u220F",
-	"profalar":                        "\u232E",
-	"profline":                        "\u2312",
-	"profsurf":                        "\u2313",
-	"prop":                            "\u221D",
-	"propto":                          "\u221D",
-	"prsim":                           "\u227E",
-	"prurel":                          "\u22B0",
-	"pscr":                            "\U0001D4C5",
-	"psi":                             "\u03C8",
-	"puncsp":                          "\u2008",
-	"qfr":                             "\U0001D52E",
-	"qint":                            "\u2A0C",
-	"qopf":                            "\U0001D562",
-	"qprime":                          "\u2057",
-	"qscr":                            "\U0001D4C6",
-	"quaternions":                     "\u210D",
-	"quatint":                         "\u2A16",
-	"quest":                           "\u003F",
-	"questeq":                         "\u225F",
-	"quot":                            "\u0022",
-	"rAarr":                           "\u21DB",
-	"rArr":                            "\u21D2",
-	"rAtail":                          "\u291C",
-	"rBarr":                           "\u290F",
-	"rHar":                            "\u2964",
-	"race":                            "\u223D\u0331",
-	"racute":                          "\u0155",
-	"radic":                           "\u221A",
-	"raemptyv":                        "\u29B3",
-	"rang":                            "\u27E9",
-	"rangd":                           "\u2992",
-	"range":                           "\u29A5",
-	"rangle":                          "\u27E9",
-	"raquo":                           "\u00BB",
-	"rarr":                            "\u2192",
-	"rarrap":                          "\u2975",
-	"rarrb":                           "\u21E5",
-	"rarrbfs":                         "\u2920",
-	"rarrc":                           "\u2933",
-	"rarrfs":                          "\u291E",
-	"rarrhk":                          "\u21AA",
-	"rarrlp":                          "\u21AC",
-	"rarrpl":                          "\u2945",
-	"rarrsim":                         "\u2974",
-	"rarrtl":                          "\u21A3",
-	"rarrw":                           "\u219D",
-	"ratail":                          "\u291A",
-	"ratio":                           "\u2236",
-	"rationals":                       "\u211A",
-	"rbarr":                           "\u290D",
-	"rbbrk":                           "\u2773",
-	"rbrace":                          "\u007D",
-	"rbrack":                          "\u005D",
-	"rbrke":                           "\u298C",
-	"rbrksld":                         "\u298E",
-	"rbrkslu":                         "\u2990",
-	"rcaron":                          "\u0159",
-	"rcedil":                          "\u0157",
-	"rceil":                           "\u2309",
-	"rcub":                            "\u007D",
-	"rcy":                             "\u0440",
-	"rdca":                            "\u2937",
-	"rdldhar":                         "\u2969",
-	"rdquo":                           "\u201D",
-	"rdquor":                          "\u201D",
-	"rdsh":                            "\u21B3",
-	"real":                            "\u211C",
-	"realine":                         "\u211B",
-	"realpart":                        "\u211C",
-	"reals":                           "\u211D",
-	"rect":                            "\u25AD",
-	"reg":                             "\u00AE",
-	"rfisht":                          "\u297D",
-	"rfloor":                          "\u230B",
-	"rfr":                             "\U0001D52F",
-	"rhard":                           "\u21C1",
-	"rharu":                           "\u21C0",
-	"rharul":                          "\u296C",
-	"rho":                             "\u03C1",
-	"rhov":                            "\u03F1",
-	"rightarrow":                      "\u2192",
-	"rightarrowtail":                  "\u21A3",
-	"rightharpoondown":                "\u21C1",
-	"rightharpoonup":                  "\u21C0",
-	"rightleftarrows":                 "\u21C4",
-	"rightleftharpoons":               "\u21CC",
-	"rightrightarrows":                "\u21C9",
-	"rightsquigarrow":                 "\u219D",
-	"rightthreetimes":                 "\u22CC",
-	"ring":                            "\u02DA",
-	"risingdotseq":                    "\u2253",
-	"rlarr":                           "\u21C4",
-	"rlhar":                           "\u21CC",
-	"rlm":                             "\u200F",
-	"rmoust":                          "\u23B1",
-	"rmoustache":                      "\u23B1",
-	"rnmid":                           "\u2AEE",
-	"roang":                           "\u27ED",
-	"roarr":                           "\u21FE",
-	"robrk":                           "\u27E7",
-	"ropar":                           "\u2986",
-	"ropf":                            "\U0001D563",
-	"roplus":                          "\u2A2E",
-	"rotimes":                         "\u2A35",
-	"rpar":                            "\u0029",
-	"rpargt":                          "\u2994",
-	"rppolint":                        "\u2A12",
-	"rrarr":                           "\u21C9",
-	"rsaquo":                          "\u203A",
-	"rscr":                            "\U0001D4C7",
-	"rsh":                             "\u21B1",
-	"rsqb":                            "\u005D",
-	"rsquo":                           "\u2019",
-	"rsquor":                          "\u2019",
-	"rthree":                          "\u22CC",
-	"rtimes":                          "\u22CA",
-	"rtri":                            "\u25B9",
-	"rtrie":                           "\u22B5",
-	"rtrif":                           "\u25B8",
-	"rtriltri":                        "\u29CE",
-	"ruluhar":                         "\u2968",
-	"rx":                              "\u211E",
-	"sacute":                          "\u015B",
-	"sbquo":                           "\u201A",
-	"sc":                              "\u227B",
-	"scE":                             "\u2AB4",
-	"scap":                            "\u2AB8",
-	"scaron":                          "\u0161",
-	"sccue":                           "\u227D",
-	"sce":                             "\u2AB0",
-	"scedil":                          "\u015F",
-	"scirc":                           "\u015D",
-	"scnE":                            "\u2AB6",
-	"scnap":                           "\u2ABA",
-	"scnsim":                          "\u22E9",
-	"scpolint":                        "\u2A13",
-	"scsim":                           "\u227F",
-	"scy":                             "\u0441",
-	"sdot":                            "\u22C5",
-	"sdotb":                           "\u22A1",
-	"sdote":                           "\u2A66",
-	"seArr":                           "\u21D8",
-	"searhk":                          "\u2925",
-	"searr":                           "\u2198",
-	"searrow":                         "\u2198",
-	"sect":                            "\u00A7",
-	"semi":                            "\u003B",
-	"seswar":                          "\u2929",
-	"setminus":                        "\u2216",
-	"setmn":                           "\u2216",
-	"sext":                            "\u2736",
-	"sfr":                             "\U0001D530",
-	"sfrown":                          "\u2322",
-	"sharp":                           "\u266F",
-	"shchcy":                          "\u0449",
-	"shcy":                            "\u0448",
-	"shortmid":                        "\u2223",
-	"shortparallel":                   "\u2225",
-	"shy":                             "\u00AD",
-	"sigma":                           "\u03C3",
-	"sigmaf":                          "\u03C2",
-	"sigmav":                          "\u03C2",
-	"sim":                             "\u223C",
-	"simdot":                          "\u2A6A",
-	"sime":                            "\u2243",
-	"simeq":                           "\u2243",
-	"simg":                            "\u2A9E",
-	"simgE":                           "\u2AA0",
-	"siml":                            "\u2A9D",
-	"simlE":                           "\u2A9F",
-	"simne":                           "\u2246",
-	"simplus":                         "\u2A24",
-	"simrarr":                         "\u2972",
-	"slarr":                           "\u2190",
-	"smallsetminus":                   "\u2216",
-	"smashp":                          "\u2A33",
-	"smeparsl":                        "\u29E4",
-	"smid":                            "\u2223",
-	"smile":                           "\u2323",
-	"smt":                             "\u2AAA",
-	"smte":                            "\u2AAC",
-	"smtes":                           "\u2AAC\uFE00",
-	"softcy":                          "\u044C",
-	"sol":                             "\u002F",
-	"solb":                            "\u29C4",
-	"solbar":                          "\u233F",
-	"sopf":                            "\U0001D564",
-	"spades":                          "\u2660",
-	"spadesuit":                       "\u2660",
-	"spar":                            "\u2225",
-	"sqcap":                           "\u2293",
-	"sqcaps":                          "\u2293\uFE00",
-	"sqcup":                           "\u2294",
-	"sqcups":                          "\u2294\uFE00",
-	"sqsub":                           "\u228F",
-	"sqsube":                          "\u2291",
-	"sqsubset":                        "\u228F",
-	"sqsubseteq":                      "\u2291",
-	"sqsup":                           "\u2290",
-	"sqsupe":                          "\u2292",
-	"sqsupset":                        "\u2290",
-	"sqsupseteq":                      "\u2292",
-	"squ":                             "\u25A1",
-	"square":                          "\u25A1",
-	"squarf":                          "\u25AA",
-	"squf":                            "\u25AA",
-	"srarr":                           "\u2192",
-	"sscr":                            "\U0001D4C8",
-	"ssetmn":                          "\u2216",
-	"ssmile":                          "\u2323",
-	"sstarf":                          "\u22C6",
-	"star":                            "\u2606",
-	"starf":                           "\u2605",
-	"straightepsilon":                 "\u03F5",
-	"straightphi":                     "\u03D5",
-	"strns":                           "\u00AF",
-	"sub":                             "\u2282",
-	"subE":                            "\u2AC5",
-	"subdot":                          "\u2ABD",
-	"sube":                            "\u2286",
-	"subedot":                         "\u2AC3",
-	"submult":                         "\u2AC1",
-	"subnE":                           "\u2ACB",
-	"subne":                           "\u228A",
-	"subplus":                         "\u2ABF",
-	"subrarr":                         "\u2979",
-	"subset":                          "\u2282",
-	"subseteq":                        "\u2286",
-	"subseteqq":                       "\u2AC5",
-	"subsetneq":                       "\u228A",
-	"subsetneqq":                      "\u2ACB",
-	"subsim":                          "\u2AC7",
-	"subsub":                          "\u2AD5",
-	"subsup":                          "\u2AD3",
-	"succ":                            "\u227B",
-	"succapprox":                      "\u2AB8",
-	"succcurlyeq":                     "\u227D",
-	"succeq":                          "\u2AB0",
-	"succnapprox":                     "\u2ABA",
-	"succneqq":                        "\u2AB6",
-	"succnsim":                        "\u22E9",
-	"succsim":                         "\u227F",
-	"sum":                             "\u2211",
-	"sung":                            "\u266A",
-	"sup":                             "\u2283",
-	"sup1":                            "\u00B9",
-	"sup2":                            "\u00B2",
-	"sup3":                            "\u00B3",
-	"supE":                            "\u2AC6",
-	"supdot":                          "\u2ABE",
-	"supdsub":                         "\u2AD8",
-	"supe":                            "\u2287",
-	"supedot":                         "\u2AC4",
-	"suphsol":                         "\u27C9",
-	"suphsub":                         "\u2AD7",
-	"suplarr":                         "\u297B",
-	"supmult":                         "\u2AC2",
-	"supnE":                           "\u2ACC",
-	"supne":                           "\u228B",
-	"supplus":                         "\u2AC0",
-	"supset":                          "\u2283",
-	"supseteq":                        "\u2287",
-	"supseteqq":                       "\u2AC6",
-	"supsetneq":                       "\u228B",
-	"supsetneqq":                      "\u2ACC",
-	"supsim":                          "\u2AC8",
-	"supsub":                          "\u2AD4",
-	"supsup":                          "\u2AD6",
-	"swArr":                           "\u21D9",
-	"swarhk":                          "\u2926",
-	"swarr":                           "\u2199",
-	"swarrow":                         "\u2199",
-	"swnwar":                          "\u292A",
-	"szlig":                           "\u00DF",
-	"target":                          "\u2316",
-	"tau":                             "\u03C4",
-	"tbrk":                            "\u23B4",
-	"tcaron":                          "\u0165",
-	"tcedil":                          "\u0163",
-	"tcy":                             "\u0442",
-	"tdot":                            "\u20DB",
-	"telrec":                          "\u2315",
-	"tfr":                             "\U0001D531",
-	"there4":                          "\u2234",
-	"therefore":                       "\u2234",
-	"theta":                           "\u03B8",
-	"thetasym":                        "\u03D1",
-	"thetav":                          "\u03D1",
-	"thickapprox":                     "\u2248",
-	"thicksim":                        "\u223C",
-	"thinsp":                          "\u2009",
-	"thkap":                           "\u2248",
-	"thksim":                          "\u223C",
-	"thorn":                           "\u00FE",
-	"tilde":                           "\u02DC",
-	"times":                           "\u00D7",
-	"timesb":                          "\u22A0",
-	"timesbar":                        "\u2A31",
-	"timesd":                          "\u2A30",
-	"tint":                            "\u222D",
-	"toea":                            "\u2928",
-	"top":                             "\u22A4",
-	"topbot":                          "\u2336",
-	"topcir":                          "\u2AF1",
-	"topf":                            "\U0001D565",
-	"topfork":                         "\u2ADA",
-	"tosa":                            "\u2929",
-	"tprime":                          "\u2034",
-	"trade":                           "\u2122",
-	"triangle":                        "\u25B5",
-	"triangledown":                    "\u25BF",
-	"triangleleft":                    "\u25C3",
-	"trianglelefteq":                  "\u22B4",
-	"triangleq":                       "\u225C",
-	"triangleright":                   "\u25B9",
-	"trianglerighteq":                 "\u22B5",
-	"tridot":                          "\u25EC",
-	"trie":                            "\u225C",
-	"triminus":                        "\u2A3A",
-	"triplus":                         "\u2A39",
-	"trisb":                           "\u29CD",
-	"tritime":                         "\u2A3B",
-	"trpezium":                        "\u23E2",
-	"tscr":                            "\U0001D4C9",
-	"tscy":                            "\u0446",
-	"tshcy":                           "\u045B",
-	"tstrok":                          "\u0167",
-	"twixt":                           "\u226C",
-	"twoheadleftarrow":                "\u219E",
-	"twoheadrightarrow":               "\u21A0",
-	"uArr":                            "\u21D1",
-	"uHar":                            "\u2963",
-	"uacute":                          "\u00FA",
-	"uarr":                            "\u2191",
-	"ubrcy":                           "\u045E",
-	"ubreve":                          "\u016D",
-	"ucirc":                           "\u00FB",
-	"ucy":                             "\u0443",
-	"udarr":                           "\u21C5",
-	"udblac":                          "\u0171",
-	"udhar":                           "\u296E",
-	"ufisht":                          "\u297E",
-	"ufr":                             "\U0001D532",
-	"ugrave":                          "\u00F9",
-	"uharl":                           "\u21BF",
-	"uharr":                           "\u21BE",
-	"uhblk":                           "\u2580",
-	"ulcorn":                          "\u231C",
-	"ulcorner":                        "\u231C",
-	"ulcrop":                          "\u230F",
-	"ultri":                           "\u25F8",
-	"umacr":                           "\u016B",
-	"uml":                             "\u00A8",
-	"uogon":                           "\u0173",
-	"uopf":                            "\U0001D566",
-	"uparrow":                         "\u2191",
-	"updownarrow":                     "\u2195",
-	"upharpoonleft":                   "\u21BF",
-	"upharpoonright":                  "\u21BE",
-	"uplus":                           "\u228E",
-	"upsi":                            "\u03C5",
-	"upsih":                           "\u03D2",
-	"upsilon":                         "\u03C5",
-	"upuparrows":                      "\u21C8",
-	"urcorn":                          "\u231D",
-	"urcorner":                        "\u231D",
-	"urcrop":                          "\u230E",
-	"uring":                           "\u016F",
-	"urtri":                           "\u25F9",
-	"uscr":                            "\U0001D4CA",
-	"utdot":                           "\u22F0",
-	"utilde":                          "\u0169",
-	"utri":                            "\u25B5",
-	"utrif":                           "\u25B4",
-	"uuarr":                           "\u21C8",
-	"uuml":                            "\u00FC",
-	"uwangle":                         "\u29A7",
-	"vArr":                            "\u21D5",
-	"vBar":                            "\u2AE8",
-	"vBarv":                           "\u2AE9",
-	"vDash":                           "\u22A8",
-	"vangrt":                          "\u299C",
-	"varepsilon":                      "\u03F5",
-	"varkappa":                        "\u03F0",
-	"varnothing":                      "\u2205",
-	"varphi":                          "\u03D5",
-	"varpi":                           "\u03D6",
-	"varpropto":                       "\u221D",
-	"varr":                            "\u2195",
-	"varrho":                          "\u03F1",
-	"varsigma":                        "\u03C2",
-	"varsubsetneq":                    "\u228A\uFE00",
-	"varsubsetneqq":                   "\u2ACB\uFE00",
-	"varsupsetneq":                    "\u228B\uFE00",
-	"varsupsetneqq":                   "\u2ACC\uFE00",
-	"vartheta":                        "\u03D1",
-	"vartriangleleft":                 "\u22B2",
-	"vartriangleright":                "\u22B3",
-	"vcy":                             "\u0432",
-	"vdash":                           "\u22A2",
-	"vee":                             "\u2228",
-	"veebar":                          "\u22BB",
-	"veeeq":                           "\u225A",
-	"vellip":                          "\u22EE",
-	"verbar":                          "\u007C",
-	"vert":                            "\u007C",
-	"vfr":                             "\U0001D533",
-	"vltri":                           "\u22B2",
-	"vnsub":                           "\u2282\u20D2",
-	"vnsup":                           "\u2283\u20D2",
-	"vopf":                            "\U0001D567",
-	"vprop":                           "\u221D",
-	"vrtri":                           "\u22B3",
-	"vscr":                            "\U0001D4CB",
-	"vsubnE":                          "\u2ACB\uFE00",
-	"vsubne":                          "\u228A\uFE00",
-	"vsupnE":                          "\u2ACC\uFE00",
-	"vsupne":                          "\u228B\uFE00",
-	"vzigzag":                         "\u299A",
-	"wcirc":                           "\u0175",
-	"wedbar":                          "\u2A5F",
-	"wedge":                           "\u2227",
-	"wedgeq":                          "\u2259",
-	"weierp":                          "\u2118",
-	"wfr":                             "\U0001D534",
-	"wopf":                            "\U0001D568",
-	"wp":                              "\u2118",
-	"wr":                              "\u2240",
-	"wreath":                          "\u2240",
-	"wscr":                            "\U0001D4CC",
-	"xcap":                            "\u22C2",
-	"xcirc":                           "\u25EF",
-	"xcup":                            "\u22C3",
-	"xdtri":                           "\u25BD",
-	"xfr":                             "\U0001D535",
-	"xhArr":                           "\u27FA",
-	"xharr":                           "\u27F7",
-	"xi":                              "\u03BE",
-	"xlArr":                           "\u27F8",
-	"xlarr":                           "\u27F5",
-	"xmap":                            "\u27FC",
-	"xnis":                            "\u22FB",
-	"xodot":                           "\u2A00",
-	"xopf":                            "\U0001D569",
-	"xoplus":                          "\u2A01",
-	"xotime":                          "\u2A02",
-	"xrArr":                           "\u27F9",
-	"xrarr":                           "\u27F6",
-	"xscr":                            "\U0001D4CD",
-	"xsqcup":                          "\u2A06",
-	"xuplus":                          "\u2A04",
-	"xutri":                           "\u25B3",
-	"xvee":                            "\u22C1",
-	"xwedge":                          "\u22C0",
-	"yacute":                          "\u00FD",
-	"yacy":                            "\u044F",
-	"ycirc":                           "\u0177",
-	"ycy":                             "\u044B",
-	"yen":                             "\u00A5",
-	"yfr":                             "\U0001D536",
-	"yicy":                            "\u0457",
-	"yopf":                            "\U0001D56A",
-	"yscr":                            "\U0001D4CE",
-	"yucy":                            "\u044E",
-	"yuml":                            "\u00FF",
-	"zacute":                          "\u017A",
-	"zcaron":                          "\u017E",
-	"zcy":                             "\u0437",
-	"zdot":                            "\u017C",
-	"zeetrf":                          "\u2128",
-	"zeta":                            "\u03B6",
-	"zfr":                             "\U0001D537",
-	"zhcy":                            "\u0436",
-	"zigrarr":                         "\u21DD",
-	"zopf":                            "\U0001D56B",
-	"zscr":                            "\U0001D4CF",
-	"zwj":                             "\u200D",
-	"zwnj":                            "\u200C",
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/indented_code.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/indented_code.go
deleted file mode 100644
index a89ee6c7..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/indented_code.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package markdown
-
-import (
-	"strings"
-)
-
-type IndentedCodeLine struct {
-	Indentation int
-	Range       Range
-}
-
-type IndentedCode struct {
-	blockBase
-	markdown string
-
-	RawCode []IndentedCodeLine
-}
-
-func (b *IndentedCode) Code() (result string) {
-	for _, code := range b.RawCode {
-		result += strings.Repeat(" ", code.Indentation) + b.markdown[code.Range.Position:code.Range.End]
-	}
-	return
-}
-
-func (b *IndentedCode) Continuation(indentation int, r Range) *continuation {
-	if indentation >= 4 {
-		return &continuation{
-			Indentation: indentation - 4,
-			Remaining:   r,
-		}
-	}
-	s := b.markdown[r.Position:r.End]
-	if strings.TrimSpace(s) == "" {
-		return &continuation{
-			Remaining: r,
-		}
-	}
-	return nil
-}
-
-func (b *IndentedCode) AddLine(indentation int, r Range) bool {
-	b.RawCode = append(b.RawCode, IndentedCodeLine{
-		Indentation: indentation,
-		Range:       r,
-	})
-	return true
-}
-
-func (b *IndentedCode) Close() {
-	for {
-		last := b.RawCode[len(b.RawCode)-1]
-		s := b.markdown[last.Range.Position:last.Range.End]
-		if strings.TrimRight(s, "\r\n") == "" {
-			b.RawCode = b.RawCode[:len(b.RawCode)-1]
-		} else {
-			break
-		}
-	}
-}
-
-func (b *IndentedCode) AllowsBlockStarts() bool {
-	return false
-}
-
-func indentedCodeStart(markdown string, indentation int, r Range, matchedBlocks, unmatchedBlocks []Block) []Block {
-	if len(unmatchedBlocks) > 0 {
-		if _, ok := unmatchedBlocks[len(unmatchedBlocks)-1].(*Paragraph); ok {
-			return nil
-		}
-	} else if len(matchedBlocks) > 0 {
-		if _, ok := matchedBlocks[len(matchedBlocks)-1].(*Paragraph); ok {
-			return nil
-		}
-	}
-
-	if indentation < 4 {
-		return nil
-	}
-
-	s := markdown[r.Position:r.End]
-	if strings.TrimSpace(s) == "" {
-		return nil
-	}
-
-	return []Block{
-		&IndentedCode{
-			markdown: markdown,
-			RawCode: []IndentedCodeLine{{
-				Indentation: indentation - 4,
-				Range:       r,
-			}},
-		},
-	}
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/inlines.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/inlines.go
deleted file mode 100644
index 43dee3bd..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/inlines.go
+++ /dev/null
@@ -1,663 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package markdown
-
-import (
-	"container/list"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-)
-
-type Inline interface {
-	IsInline() bool
-}
-
-type inlineBase struct{}
-
-func (inlineBase) IsInline() bool { return true }
-
-type Text struct {
-	inlineBase
-
-	Text  string
-	Range Range
-}
-
-type CodeSpan struct {
-	inlineBase
-
-	Code string
-}
-
-type HardLineBreak struct {
-	inlineBase
-}
-
-type SoftLineBreak struct {
-	inlineBase
-}
-
-type InlineLinkOrImage struct {
-	inlineBase
-
-	Children []Inline
-
-	RawDestination Range
-
-	markdown string
-	rawTitle string
-}
-
-func (i *InlineLinkOrImage) Destination() string {
-	return Unescape(i.markdown[i.RawDestination.Position:i.RawDestination.End])
-}
-
-func (i *InlineLinkOrImage) Title() string {
-	return Unescape(i.rawTitle)
-}
-
-type InlineLink struct {
-	InlineLinkOrImage
-}
-
-type InlineImage struct {
-	InlineLinkOrImage
-}
-
-type ReferenceLinkOrImage struct {
-	inlineBase
-	*ReferenceDefinition
-
-	Children []Inline
-}
-
-type ReferenceLink struct {
-	ReferenceLinkOrImage
-}
-
-type ReferenceImage struct {
-	ReferenceLinkOrImage
-}
-
-type Autolink struct {
-	inlineBase
-
-	Children []Inline
-
-	RawDestination Range
-
-	markdown string
-}
-
-func (i *Autolink) Destination() string {
-	destination := Unescape(i.markdown[i.RawDestination.Position:i.RawDestination.End])
-
-	if strings.HasPrefix(destination, "www") {
-		destination = "http://" + destination
-	}
-
-	return destination
-}
-
-type delimiterType int
-
-const (
-	linkOpeningDelimiter delimiterType = iota
-	imageOpeningDelimiter
-)
-
-type delimiter struct {
-	Type       delimiterType
-	IsInactive bool
-	TextNode   int
-	Range      Range
-}
-
-type inlineParser struct {
-	markdown             string
-	ranges               []Range
-	referenceDefinitions []*ReferenceDefinition
-
-	raw            string
-	position       int
-	inlines        []Inline
-	delimiterStack *list.List
-}
-
-func newInlineParser(markdown string, ranges []Range, referenceDefinitions []*ReferenceDefinition) *inlineParser {
-	return &inlineParser{
-		markdown:             markdown,
-		ranges:               ranges,
-		referenceDefinitions: referenceDefinitions,
-		delimiterStack:       list.New(),
-	}
-}
-
-func (p *inlineParser) parseBackticks() {
-	count := 1
-	for i := p.position + 1; i < len(p.raw) && p.raw[i] == '`'; i++ {
-		count++
-	}
-	opening := p.raw[p.position : p.position+count]
-	search := p.position + count
-	for search < len(p.raw) {
-		end := strings.Index(p.raw[search:], opening)
-		if end == -1 {
-			break
-		}
-		if search+end+count < len(p.raw) && p.raw[search+end+count] == '`' {
-			search += end + count
-			for search < len(p.raw) && p.raw[search] == '`' {
-				search++
-			}
-			continue
-		}
-		code := strings.Join(strings.Fields(p.raw[p.position+count:search+end]), " ")
-		p.position = search + end + count
-		p.inlines = append(p.inlines, &CodeSpan{
-			Code: code,
-		})
-		return
-	}
-	p.position += len(opening)
-	absPos := relativeToAbsolutePosition(p.ranges, p.position-len(opening))
-	p.inlines = append(p.inlines, &Text{
-		Text:  opening,
-		Range: Range{absPos, absPos + len(opening)},
-	})
-}
-
-func (p *inlineParser) parseLineEnding() {
-	if p.position >= 1 && p.raw[p.position-1] == '\t' {
-		p.inlines = append(p.inlines, &HardLineBreak{})
-	} else if p.position >= 2 && p.raw[p.position-1] == ' ' && (p.raw[p.position-2] == '\t' || p.raw[p.position-1] == ' ') {
-		p.inlines = append(p.inlines, &HardLineBreak{})
-	} else {
-		p.inlines = append(p.inlines, &SoftLineBreak{})
-	}
-	p.position++
-	if p.position < len(p.raw) && p.raw[p.position] == '\n' {
-		p.position++
-	}
-}
-
-func (p *inlineParser) parseEscapeCharacter() {
-	if p.position+1 < len(p.raw) && isEscapableByte(p.raw[p.position+1]) {
-		absPos := relativeToAbsolutePosition(p.ranges, p.position+1)
-		p.inlines = append(p.inlines, &Text{
-			Text:  string(p.raw[p.position+1]),
-			Range: Range{absPos, absPos + len(string(p.raw[p.position+1]))},
-		})
-		p.position += 2
-	} else {
-		absPos := relativeToAbsolutePosition(p.ranges, p.position)
-		p.inlines = append(p.inlines, &Text{
-			Text:  `\`,
-			Range: Range{absPos, absPos + 1},
-		})
-		p.position++
-	}
-}
-
-func (p *inlineParser) parseText() {
-	if next := strings.IndexAny(p.raw[p.position:], "\r\n\\`&![]wW:"); next == -1 {
-		absPos := relativeToAbsolutePosition(p.ranges, p.position)
-		p.inlines = append(p.inlines, &Text{
-			Text:  strings.TrimRightFunc(p.raw[p.position:], isWhitespace),
-			Range: Range{absPos, absPos + len(p.raw[p.position:])},
-		})
-		p.position = len(p.raw)
-	} else {
-		absPos := relativeToAbsolutePosition(p.ranges, p.position)
-		if p.raw[p.position+next] == '\r' || p.raw[p.position+next] == '\n' {
-			s := strings.TrimRightFunc(p.raw[p.position:p.position+next], isWhitespace)
-			p.inlines = append(p.inlines, &Text{
-				Text:  s,
-				Range: Range{absPos, absPos + len(s)},
-			})
-		} else {
-			if next == 0 {
-				// Always read at least one character since 'w', 'W', and ':' may not actually match another
-				// type of node
-				next = 1
-			}
-
-			p.inlines = append(p.inlines, &Text{
-				Text:  p.raw[p.position : p.position+next],
-				Range: Range{absPos, absPos + next},
-			})
-		}
-		p.position += next
-	}
-}
-
-func (p *inlineParser) parseLinkOrImageDelimiter() {
-	absPos := relativeToAbsolutePosition(p.ranges, p.position)
-	if p.raw[p.position] == '[' {
-		p.inlines = append(p.inlines, &Text{
-			Text:  "[",
-			Range: Range{absPos, absPos + 1},
-		})
-		p.delimiterStack.PushBack(&delimiter{
-			Type:     linkOpeningDelimiter,
-			TextNode: len(p.inlines) - 1,
-			Range:    Range{p.position, p.position + 1},
-		})
-		p.position++
-	} else if p.raw[p.position] == '!' && p.position+1 < len(p.raw) && p.raw[p.position+1] == '[' {
-		p.inlines = append(p.inlines, &Text{
-			Text:  "![",
-			Range: Range{absPos, absPos + 2},
-		})
-		p.delimiterStack.PushBack(&delimiter{
-			Type:     imageOpeningDelimiter,
-			TextNode: len(p.inlines) - 1,
-			Range:    Range{p.position, p.position + 2},
-		})
-		p.position += 2
-	} else {
-		p.inlines = append(p.inlines, &Text{
-			Text:  "!",
-			Range: Range{absPos, absPos + 1},
-		})
-		p.position++
-	}
-}
-
-func (p *inlineParser) peekAtInlineLinkDestinationAndTitle(position int, isImage bool) (destination, title Range, end int, ok bool) {
-	if position >= len(p.raw) || p.raw[position] != '(' {
-		return
-	}
-	position++
-
-	destinationStart := nextNonWhitespace(p.raw, position)
-	if destinationStart >= len(p.raw) {
-		return
-	} else if p.raw[destinationStart] == ')' {
-		return Range{destinationStart, destinationStart}, Range{destinationStart, destinationStart}, destinationStart + 1, true
-	}
-
-	destination, end, ok = parseLinkDestination(p.raw, destinationStart)
-	if !ok {
-		return
-	}
-	position = end
-
-	if isImage && position < len(p.raw) && isWhitespaceByte(p.raw[position]) {
-		dimensionsStart := nextNonWhitespace(p.raw, position)
-		if dimensionsStart >= len(p.raw) {
-			return
-		}
-
-		if p.raw[dimensionsStart] == '=' {
-			// Read optional image dimensions even if we don't use them
-			_, end, ok = parseImageDimensions(p.raw, dimensionsStart)
-			if !ok {
-				return
-			}
-
-			position = end
-		}
-	}
-
-	if position < len(p.raw) && isWhitespaceByte(p.raw[position]) {
-		titleStart := nextNonWhitespace(p.raw, position)
-		if titleStart >= len(p.raw) {
-			return
-		} else if p.raw[titleStart] == ')' {
-			return destination, Range{titleStart, titleStart}, titleStart + 1, true
-		}
-
-		if p.raw[titleStart] == '"' || p.raw[titleStart] == '\'' || p.raw[titleStart] == '(' {
-			title, end, ok = parseLinkTitle(p.raw, titleStart)
-			if !ok {
-				return
-			}
-			position = end
-		}
-	}
-
-	closingPosition := nextNonWhitespace(p.raw, position)
-	if closingPosition >= len(p.raw) || p.raw[closingPosition] != ')' {
-		return Range{}, Range{}, 0, false
-	}
-
-	return destination, title, closingPosition + 1, true
-}
-
-func (p *inlineParser) referenceDefinition(label string) *ReferenceDefinition {
-	clean := strings.Join(strings.Fields(label), " ")
-	for _, d := range p.referenceDefinitions {
-		if strings.EqualFold(clean, strings.Join(strings.Fields(d.Label()), " ")) {
-			return d
-		}
-	}
-	return nil
-}
-
-func (p *inlineParser) lookForLinkOrImage() {
-	for element := p.delimiterStack.Back(); element != nil; element = element.Prev() {
-		d := element.Value.(*delimiter)
-		if d.Type != imageOpeningDelimiter && d.Type != linkOpeningDelimiter {
-			continue
-		}
-		if d.IsInactive {
-			p.delimiterStack.Remove(element)
-			break
-		}
-
-		isImage := d.Type == imageOpeningDelimiter
-
-		var inline Inline
-
-		if destination, title, next, ok := p.peekAtInlineLinkDestinationAndTitle(p.position+1, isImage); ok {
-			destinationMarkdownPosition := relativeToAbsolutePosition(p.ranges, destination.Position)
-			linkOrImage := InlineLinkOrImage{
-				Children:       append([]Inline(nil), p.inlines[d.TextNode+1:]...),
-				RawDestination: Range{destinationMarkdownPosition, destinationMarkdownPosition + destination.End - destination.Position},
-				markdown:       p.markdown,
-				rawTitle:       p.raw[title.Position:title.End],
-			}
-			if d.Type == imageOpeningDelimiter {
-				inline = &InlineImage{linkOrImage}
-			} else {
-				inline = &InlineLink{linkOrImage}
-			}
-			p.position = next
-		} else {
-			referenceLabel := ""
-			label, next, hasLinkLabel := parseLinkLabel(p.raw, p.position+1)
-			if hasLinkLabel && label.End > label.Position {
-				referenceLabel = p.raw[label.Position:label.End]
-			} else {
-				referenceLabel = p.raw[d.Range.End:p.position]
-				if !hasLinkLabel {
-					next = p.position + 1
-				}
-			}
-			if referenceLabel != "" {
-				if reference := p.referenceDefinition(referenceLabel); reference != nil {
-					linkOrImage := ReferenceLinkOrImage{
-						ReferenceDefinition: reference,
-						Children:            append([]Inline(nil), p.inlines[d.TextNode+1:]...),
-					}
-					if d.Type == imageOpeningDelimiter {
-						inline = &ReferenceImage{linkOrImage}
-					} else {
-						inline = &ReferenceLink{linkOrImage}
-					}
-					p.position = next
-				}
-			}
-		}
-
-		if inline != nil {
-			if d.Type == imageOpeningDelimiter {
-				p.inlines = append(p.inlines[:d.TextNode], inline)
-			} else {
-				p.inlines = append(p.inlines[:d.TextNode], inline)
-				for inlineElement := element.Prev(); inlineElement != nil; inlineElement = inlineElement.Prev() {
-					if d := inlineElement.Value.(*delimiter); d.Type == linkOpeningDelimiter {
-						d.IsInactive = true
-					}
-				}
-			}
-			p.delimiterStack.Remove(element)
-			return
-		}
-		p.delimiterStack.Remove(element)
-		break
-	}
-	absPos := relativeToAbsolutePosition(p.ranges, p.position)
-	p.inlines = append(p.inlines, &Text{
-		Text:  "]",
-		Range: Range{absPos, absPos + 1},
-	})
-	p.position++
-}
-
-func CharacterReference(ref string) string {
-	if ref == "" {
-		return ""
-	}
-	if ref[0] == '#' {
-		if len(ref) < 2 {
-			return ""
-		}
-		n := 0
-		if ref[1] == 'X' || ref[1] == 'x' {
-			if len(ref) < 3 {
-				return ""
-			}
-			for i := 2; i < len(ref); i++ {
-				if i > 9 {
-					return ""
-				}
-				d := ref[i]
-				switch {
-				case d >= '0' && d <= '9':
-					n = n*16 + int(d-'0')
-				case d >= 'a' && d <= 'f':
-					n = n*16 + 10 + int(d-'a')
-				case d >= 'A' && d <= 'F':
-					n = n*16 + 10 + int(d-'A')
-				default:
-					return ""
-				}
-			}
-		} else {
-			for i := 1; i < len(ref); i++ {
-				if i > 8 || ref[i] < '0' || ref[i] > '9' {
-					return ""
-				}
-				n = n*10 + int(ref[i]-'0')
-			}
-		}
-		c := rune(n)
-		if c == '\u0000' || !utf8.ValidRune(c) {
-			return string(unicode.ReplacementChar)
-		}
-		return string(c)
-	}
-	if entity, ok := htmlEntities[ref]; ok {
-		return entity
-	}
-	return ""
-}
-
-func (p *inlineParser) parseCharacterReference() {
-	absPos := relativeToAbsolutePosition(p.ranges, p.position)
-	p.position++
-	if semicolon := strings.IndexByte(p.raw[p.position:], ';'); semicolon == -1 {
-		p.inlines = append(p.inlines, &Text{
-			Text:  "&",
-			Range: Range{absPos, absPos + 1},
-		})
-	} else if s := CharacterReference(p.raw[p.position : p.position+semicolon]); s != "" {
-		p.position += semicolon + 1
-		p.inlines = append(p.inlines, &Text{
-			Text:  s,
-			Range: Range{absPos, absPos + len(s)},
-		})
-	} else {
-		p.inlines = append(p.inlines, &Text{
-			Text:  "&",
-			Range: Range{absPos, absPos + 1},
-		})
-	}
-}
-
-func (p *inlineParser) parseAutolink(c rune) bool {
-	for element := p.delimiterStack.Back(); element != nil; element = element.Prev() {
-		d := element.Value.(*delimiter)
-		if !d.IsInactive {
-			return false
-		}
-	}
-
-	var link Range
-	if c == ':' {
-		var ok bool
-		link, ok = parseURLAutolink(p.raw, p.position)
-
-		if !ok {
-			return false
-		}
-
-		// Since the current position is at the colon, we have to rewind the parsing slightly so that
-		// we don't duplicate the URL scheme
-		rewind := strings.Index(p.raw[link.Position:link.End], ":")
-		if rewind != -1 {
-			lastInline := p.inlines[len(p.inlines)-1]
-			lastText, ok := lastInline.(*Text)
-
-			if !ok {
-				// This should never occur since parseURLAutolink will only return a non-empty value
-				// when the previous text ends in a valid URL protocol which would mean that the previous
-				// node is a Text node
-				return false
-			}
-
-			p.inlines = p.inlines[0 : len(p.inlines)-1]
-			p.inlines = append(p.inlines, &Text{
-				Text:  lastText.Text[:len(lastText.Text)-rewind],
-				Range: Range{lastText.Range.Position, lastText.Range.End - rewind},
-			})
-			p.position -= rewind
-		}
-	} else if c == 'w' || c == 'W' {
-		var ok bool
-		link, ok = parseWWWAutolink(p.raw, p.position)
-
-		if !ok {
-			return false
-		}
-	}
-
-	linkMarkdownPosition := relativeToAbsolutePosition(p.ranges, link.Position)
-	linkRange := Range{linkMarkdownPosition, linkMarkdownPosition + link.End - link.Position}
-
-	p.inlines = append(p.inlines, &Autolink{
-		Children: []Inline{
-			&Text{
-				Text:  p.raw[link.Position:link.End],
-				Range: linkRange,
-			},
-		},
-		RawDestination: linkRange,
-		markdown:       p.markdown,
-	})
-	p.position += (link.End - link.Position)
-
-	return true
-}
-
-func (p *inlineParser) Parse() []Inline {
-	for _, r := range p.ranges {
-		p.raw += p.markdown[r.Position:r.End]
-	}
-
-	for p.position < len(p.raw) {
-		c, _ := utf8.DecodeRuneInString(p.raw[p.position:])
-
-		switch c {
-		case '\r', '\n':
-			p.parseLineEnding()
-		case '\\':
-			p.parseEscapeCharacter()
-		case '`':
-			p.parseBackticks()
-		case '&':
-			p.parseCharacterReference()
-		case '!', '[':
-			p.parseLinkOrImageDelimiter()
-		case ']':
-			p.lookForLinkOrImage()
-		case 'w', 'W', ':':
-			matched := p.parseAutolink(c)
-
-			if !matched {
-				p.parseText()
-			}
-		default:
-			p.parseText()
-		}
-	}
-
-	return p.inlines
-}
-
-func ParseInlines(markdown string, ranges []Range, referenceDefinitions []*ReferenceDefinition) (inlines []Inline) {
-	return newInlineParser(markdown, ranges, referenceDefinitions).Parse()
-}
-
-func MergeInlineText(inlines []Inline) []Inline {
-	ret := inlines[:0]
-	for i, v := range inlines {
-		// always add first node
-		if i == 0 {
-			ret = append(ret, v)
-			continue
-		}
-		// not a text node? nothing to merge
-		text, ok := v.(*Text)
-		if !ok {
-			ret = append(ret, v)
-			continue
-		}
-		// previous node is not a text node? nothing to merge
-		prevText, ok := ret[len(ret)-1].(*Text)
-		if !ok {
-			ret = append(ret, v)
-			continue
-		}
-		// previous node is not right before this one
-		if prevText.Range.End != text.Range.Position {
-			ret = append(ret, v)
-			continue
-		}
-		// we have two consecutive text nodes
-		ret[len(ret)-1] = &Text{
-			Text:  prevText.Text + text.Text,
-			Range: Range{prevText.Range.Position, text.Range.End},
-		}
-	}
-	return ret
-}
-
-func Unescape(markdown string) string {
-	ret := ""
-
-	position := 0
-	for position < len(markdown) {
-		c, cSize := utf8.DecodeRuneInString(markdown[position:])
-
-		switch c {
-		case '\\':
-			if position+1 < len(markdown) && isEscapableByte(markdown[position+1]) {
-				ret += string(markdown[position+1])
-				position += 2
-			} else {
-				ret += `\`
-				position++
-			}
-		case '&':
-			position++
-			if semicolon := strings.IndexByte(markdown[position:], ';'); semicolon == -1 {
-				ret += "&"
-			} else if s := CharacterReference(markdown[position : position+semicolon]); s != "" {
-				position += semicolon + 1
-				ret += s
-			} else {
-				ret += "&"
-			}
-		default:
-			ret += string(c)
-			position += cSize
-		}
-	}
-
-	return ret
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/inspect.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/inspect.go
deleted file mode 100644
index 3c7f2d1c..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/inspect.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package markdown
-
-// Inspect traverses the markdown tree in depth-first order. If f returns true, Inspect invokes f
-// recursively for each child of the block or inline, followed by a call of f(nil).
-func Inspect(markdown string, f func(interface{}) bool) {
-	document, referenceDefinitions := Parse(markdown)
-	InspectBlock(document, func(block Block) bool {
-		if !f(block) {
-			return false
-		}
-		switch v := block.(type) {
-		case *Paragraph:
-			for _, inline := range MergeInlineText(v.ParseInlines(referenceDefinitions)) {
-				InspectInline(inline, func(inline Inline) bool {
-					return f(inline)
-				})
-			}
-		}
-		return true
-	})
-}
-
-// InspectBlock traverses the blocks in depth-first order, starting with block. If f returns true,
-// InspectBlock invokes f recursively for each child of the block, followed by a call of f(nil).
-func InspectBlock(block Block, f func(Block) bool) {
-	if !f(block) {
-		return
-	}
-	switch v := block.(type) {
-	case *Document:
-		for _, child := range v.Children {
-			InspectBlock(child, f)
-		}
-	case *List:
-		for _, child := range v.Children {
-			InspectBlock(child, f)
-		}
-	case *ListItem:
-		for _, child := range v.Children {
-			InspectBlock(child, f)
-		}
-	case *BlockQuote:
-		for _, child := range v.Children {
-			InspectBlock(child, f)
-		}
-	}
-	f(nil)
-}
-
-// InspectInline traverses the blocks in depth-first order, starting with block. If f returns true,
-// InspectInline invokes f recursively for each child of the block, followed by a call of f(nil).
-func InspectInline(inline Inline, f func(Inline) bool) {
-	if !f(inline) {
-		return
-	}
-	switch v := inline.(type) {
-	case *InlineImage:
-		for _, child := range v.Children {
-			InspectInline(child, f)
-		}
-	case *InlineLink:
-		for _, child := range v.Children {
-			InspectInline(child, f)
-		}
-	case *ReferenceImage:
-		for _, child := range v.Children {
-			InspectInline(child, f)
-		}
-	case *ReferenceLink:
-		for _, child := range v.Children {
-			InspectInline(child, f)
-		}
-	}
-	f(nil)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/lines.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/lines.go
deleted file mode 100644
index f59e5afe..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/lines.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package markdown
-
-import (
-	"strings"
-)
-
-type Line struct {
-	Range
-}
-
-func ParseLines(markdown string) []Line {
-	lineStartPosition := 0
-	isAfterCarriageReturn := false
-	lines := make([]Line, 0, strings.Count(markdown, "\n"))
-	for position, r := range markdown {
-		if r == '\n' {
-			lines = append(lines, Line{Range{lineStartPosition, position + 1}})
-			lineStartPosition = position + 1
-		} else if isAfterCarriageReturn {
-			lines = append(lines, Line{Range{lineStartPosition, position}})
-			lineStartPosition = position
-		}
-		isAfterCarriageReturn = r == '\r'
-	}
-	if lineStartPosition < len(markdown) {
-		lines = append(lines, Line{Range{lineStartPosition, len(markdown)}})
-	}
-	return lines
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/links.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/links.go
deleted file mode 100644
index 6aa56f25..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/links.go
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package markdown
-
-import (
-	"unicode/utf8"
-)
-
-func parseLinkDestination(markdown string, position int) (raw Range, next int, ok bool) {
-	if position >= len(markdown) {
-		return
-	}
-
-	if markdown[position] == '<' {
-		isEscaped := false
-
-		for offset, c := range []byte(markdown[position+1:]) {
-			if isEscaped {
-				isEscaped = false
-				if isEscapableByte(c) {
-					continue
-				}
-			}
-
-			if c == '\\' {
-				isEscaped = true
-			} else if c == '<' {
-				break
-			} else if c == '>' {
-				return Range{position + 1, position + 1 + offset}, position + 1 + offset + 1, true
-			} else if isWhitespaceByte(c) {
-				break
-			}
-		}
-	}
-
-	openCount := 0
-	isEscaped := false
-	for offset, c := range []byte(markdown[position:]) {
-		if isEscaped {
-			isEscaped = false
-			if isEscapableByte(c) {
-				continue
-			}
-		}
-
-		switch c {
-		case '\\':
-			isEscaped = true
-		case '(':
-			openCount++
-		case ')':
-			if openCount < 1 {
-				return Range{position, position + offset}, position + offset, true
-			}
-			openCount--
-		default:
-			if isWhitespaceByte(c) {
-				return Range{position, position + offset}, position + offset, true
-			}
-		}
-	}
-	return Range{position, len(markdown)}, len(markdown), true
-}
-
-func parseLinkTitle(markdown string, position int) (raw Range, next int, ok bool) {
-	if position >= len(markdown) {
-		return
-	}
-
-	originalPosition := position
-
-	var closer byte
-	switch markdown[position] {
-	case '"', '\'':
-		closer = markdown[position]
-	case '(':
-		closer = ')'
-	default:
-		return
-	}
-	position++
-
-	for position < len(markdown) {
-		switch markdown[position] {
-		case '\\':
-			position++
-			if position < len(markdown) && isEscapableByte(markdown[position]) {
-				position++
-			}
-		case closer:
-			return Range{originalPosition + 1, position}, position + 1, true
-		default:
-			position++
-		}
-	}
-
-	return
-}
-
-func parseLinkLabel(markdown string, position int) (raw Range, next int, ok bool) {
-	if position >= len(markdown) || markdown[position] != '[' {
-		return
-	}
-
-	originalPosition := position
-	position++
-
-	for position < len(markdown) {
-		switch markdown[position] {
-		case '\\':
-			position++
-			if position < len(markdown) && isEscapableByte(markdown[position]) {
-				position++
-			}
-		case '[':
-			return
-		case ']':
-			if position-originalPosition >= 1000 && utf8.RuneCountInString(markdown[originalPosition:position]) >= 1000 {
-				return
-			}
-			return Range{originalPosition + 1, position}, position + 1, true
-		default:
-			position++
-		}
-	}
-
-	return
-}
-
-// As a non-standard feature, we allow image links to specify dimensions of the image by adding "=WIDTHxHEIGHT"
-// after the image destination but before the image title like ![alt](http://example.com/image.png =100x200 "title").
-// Both width and height are optional, but at least one of them must be specified.
-func parseImageDimensions(markdown string, position int) (raw Range, next int, ok bool) {
-	if position >= len(markdown) {
-		return
-	}
-
-	originalPosition := position
-
-	// Read =
-	position += 1
-	if position >= len(markdown) {
-		return
-	}
-
-	// Read width
-	hasWidth := false
-	for position < len(markdown)-1 && isNumericByte(markdown[position]) {
-		hasWidth = true
-		position += 1
-	}
-
-	// Look for early end of dimensions
-	if isWhitespaceByte(markdown[position]) || markdown[position] == ')' {
-		return Range{originalPosition, position - 1}, position, true
-	}
-
-	// Read the x
-	if (markdown[position] != 'x' && markdown[position] != 'X') || position == len(markdown)-1 {
-		return
-	}
-	position += 1
-
-	// Read height
-	hasHeight := false
-	for position < len(markdown)-1 && isNumericByte(markdown[position]) {
-		hasHeight = true
-		position += 1
-	}
-
-	// Make sure the there's no trailing characters
-	if !isWhitespaceByte(markdown[position]) && markdown[position] != ')' {
-		return
-	}
-
-	if !hasWidth && !hasHeight {
-		// At least one of width or height is required
-		return
-	}
-
-	return Range{originalPosition, position - 1}, position, true
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/list.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/list.go
deleted file mode 100644
index 39039295..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/list.go
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package markdown
-
-import (
-	"strings"
-)
-
-type ListItem struct {
-	blockBase
-	markdown                    string
-	hasTrailingBlankLine        bool
-	hasBlankLineBetweenChildren bool
-
-	Indentation int
-	Children    []Block
-}
-
-func (b *ListItem) Continuation(indentation int, r Range) *continuation {
-	s := b.markdown[r.Position:r.End]
-	if strings.TrimSpace(s) == "" {
-		if b.Children == nil {
-			return nil
-		}
-		return &continuation{
-			Remaining: r,
-		}
-	}
-	if indentation < b.Indentation {
-		return nil
-	}
-	return &continuation{
-		Indentation: indentation - b.Indentation,
-		Remaining:   r,
-	}
-}
-
-func (b *ListItem) AddChild(openBlocks []Block) []Block {
-	b.Children = append(b.Children, openBlocks[0])
-	if b.hasTrailingBlankLine {
-		b.hasBlankLineBetweenChildren = true
-	}
-	b.hasTrailingBlankLine = false
-	return openBlocks
-}
-
-func (b *ListItem) AddLine(indentation int, r Range) bool {
-	isBlank := strings.TrimSpace(b.markdown[r.Position:r.End]) == ""
-	if isBlank {
-		b.hasTrailingBlankLine = true
-	}
-	return false
-}
-
-func (b *ListItem) HasTrailingBlankLine() bool {
-	return b.hasTrailingBlankLine || (len(b.Children) > 0 && b.Children[len(b.Children)-1].HasTrailingBlankLine())
-}
-
-func (b *ListItem) isLoose() bool {
-	if b.hasBlankLineBetweenChildren {
-		return true
-	}
-	for i, child := range b.Children {
-		if i < len(b.Children)-1 && child.HasTrailingBlankLine() {
-			return true
-		}
-	}
-	return false
-}
-
-type List struct {
-	blockBase
-	markdown                    string
-	hasTrailingBlankLine        bool
-	hasBlankLineBetweenChildren bool
-
-	IsLoose           bool
-	IsOrdered         bool
-	OrderedStart      int
-	BulletOrDelimiter byte
-	Children          []*ListItem
-}
-
-func (b *List) Continuation(indentation int, r Range) *continuation {
-	s := b.markdown[r.Position:r.End]
-	if strings.TrimSpace(s) == "" {
-		return &continuation{
-			Remaining: r,
-		}
-	}
-	return &continuation{
-		Indentation: indentation,
-		Remaining:   r,
-	}
-}
-
-func (b *List) AddChild(openBlocks []Block) []Block {
-	if item, ok := openBlocks[0].(*ListItem); ok {
-		b.Children = append(b.Children, item)
-		if b.hasTrailingBlankLine {
-			b.hasBlankLineBetweenChildren = true
-		}
-		b.hasTrailingBlankLine = false
-		return openBlocks
-	} else if list, ok := openBlocks[0].(*List); ok {
-		if len(list.Children) == 1 && list.IsOrdered == b.IsOrdered && list.BulletOrDelimiter == b.BulletOrDelimiter {
-			return b.AddChild(openBlocks[1:])
-		}
-	}
-	return nil
-}
-
-func (b *List) AddLine(indentation int, r Range) bool {
-	isBlank := strings.TrimSpace(b.markdown[r.Position:r.End]) == ""
-	if isBlank {
-		b.hasTrailingBlankLine = true
-	}
-	return false
-}
-
-func (b *List) HasTrailingBlankLine() bool {
-	return b.hasTrailingBlankLine || (len(b.Children) > 0 && b.Children[len(b.Children)-1].HasTrailingBlankLine())
-}
-
-func (b *List) isLoose() bool {
-	if b.hasBlankLineBetweenChildren {
-		return true
-	}
-	for i, child := range b.Children {
-		if child.isLoose() || (i < len(b.Children)-1 && child.HasTrailingBlankLine()) {
-			return true
-		}
-	}
-	return false
-}
-
-func (b *List) Close() {
-	b.IsLoose = b.isLoose()
-}
-
-func parseListMarker(markdown string, r Range) (success, isOrdered bool, orderedStart int, bulletOrDelimiter byte, markerWidth int, remaining Range) {
-	digits := 0
-	n := 0
-	for i := r.Position; i < r.End && markdown[i] >= '0' && markdown[i] <= '9'; i++ {
-		digits++
-		n = n*10 + int(markdown[i]-'0')
-	}
-	if digits > 0 {
-		if digits > 9 || r.Position+digits >= r.End {
-			return
-		}
-		next := markdown[r.Position+digits]
-		if next != '.' && next != ')' {
-			return
-		}
-		return true, true, n, next, digits + 1, Range{r.Position + digits + 1, r.End}
-	}
-	if r.Position >= r.End {
-		return
-	}
-	next := markdown[r.Position]
-	if next != '-' && next != '+' && next != '*' {
-		return
-	}
-	return true, false, 0, next, 1, Range{r.Position + 1, r.End}
-}
-
-func listStart(markdown string, indent int, r Range, matchedBlocks, unmatchedBlocks []Block) []Block {
-	afterList := false
-	if len(matchedBlocks) > 0 {
-		_, afterList = matchedBlocks[len(matchedBlocks)-1].(*List)
-	}
-	if !afterList && indent > 3 {
-		return nil
-	}
-
-	success, isOrdered, orderedStart, bulletOrDelimiter, markerWidth, remaining := parseListMarker(markdown, r)
-	if !success {
-		return nil
-	}
-
-	isBlank := strings.TrimSpace(markdown[remaining.Position:remaining.End]) == ""
-	if len(matchedBlocks) > 0 && len(unmatchedBlocks) == 0 {
-		if _, ok := matchedBlocks[len(matchedBlocks)-1].(*Paragraph); ok {
-			if isBlank || (isOrdered && orderedStart != 1) {
-				return nil
-			}
-		}
-	}
-
-	indentAfterMarker, indentBytesAfterMarker := countIndentation(markdown, remaining)
-	if !isBlank && indentAfterMarker < 1 {
-		return nil
-	}
-
-	remaining = Range{remaining.Position + indentBytesAfterMarker, remaining.End}
-	consumedIndentAfterMarker := indentAfterMarker
-	if isBlank || indentAfterMarker >= 5 {
-		consumedIndentAfterMarker = 1
-	}
-
-	listItem := &ListItem{
-		markdown:    markdown,
-		Indentation: indent + markerWidth + consumedIndentAfterMarker,
-	}
-	list := &List{
-		markdown:          markdown,
-		IsOrdered:         isOrdered,
-		OrderedStart:      orderedStart,
-		BulletOrDelimiter: bulletOrDelimiter,
-		Children:          []*ListItem{listItem},
-	}
-	ret := []Block{list, listItem}
-	if descendants := blockStartOrParagraph(markdown, indentAfterMarker-consumedIndentAfterMarker, remaining, nil, nil); descendants != nil {
-		listItem.Children = append(listItem.Children, descendants[0])
-		ret = append(ret, descendants...)
-	}
-	return ret
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/markdown.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/markdown.go
deleted file mode 100644
index 5ccdad8c..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/markdown.go
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-// This package implements a parser for the subset of the CommonMark spec necessary for us to do
-// server-side processing. It is not a full implementation and lacks many features. But it is
-// complete enough to efficiently and accurately allow us to do what we need to like rewrite image
-// URLs for proxying.
-package markdown
-
-import (
-	"strings"
-)
-
-func isEscapable(c rune) bool {
-	return c > ' ' && (c < '0' || (c > '9' && (c < 'A' || (c > 'Z' && (c < 'a' || (c > 'z' && c <= '~'))))))
-}
-
-func isEscapableByte(c byte) bool {
-	return isEscapable(rune(c))
-}
-
-func isWhitespace(c rune) bool {
-	switch c {
-	case ' ', '\t', '\n', '\u000b', '\u000c', '\r':
-		return true
-	}
-	return false
-}
-
-func isWhitespaceByte(c byte) bool {
-	return isWhitespace(rune(c))
-}
-
-func isNumeric(c rune) bool {
-	return c >= '0' && c <= '9'
-}
-
-func isNumericByte(c byte) bool {
-	return isNumeric(rune(c))
-}
-
-func isHex(c rune) bool {
-	return isNumeric(c) || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F')
-}
-
-func isHexByte(c byte) bool {
-	return isHex(rune(c))
-}
-
-func isAlphanumeric(c rune) bool {
-	return isNumeric(c) || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
-}
-
-func isAlphanumericByte(c byte) bool {
-	return isAlphanumeric(rune(c))
-}
-
-func nextNonWhitespace(markdown string, position int) int {
-	for offset, c := range []byte(markdown[position:]) {
-		if !isWhitespaceByte(c) {
-			return position + offset
-		}
-	}
-	return len(markdown)
-}
-
-func nextLine(markdown string, position int) (linePosition int, skippedNonWhitespace bool) {
-	for i := position; i < len(markdown); i++ {
-		c := markdown[i]
-		if c == '\r' {
-			if i+1 < len(markdown) && markdown[i+1] == '\n' {
-				return i + 2, skippedNonWhitespace
-			}
-			return i + 1, skippedNonWhitespace
-		} else if c == '\n' {
-			return i + 1, skippedNonWhitespace
-		} else if !isWhitespaceByte(c) {
-			skippedNonWhitespace = true
-		}
-	}
-	return len(markdown), skippedNonWhitespace
-}
-
-func countIndentation(markdown string, r Range) (spaces, bytes int) {
-	for i := r.Position; i < r.End; i++ {
-		if markdown[i] == ' ' {
-			spaces++
-			bytes++
-		} else if markdown[i] == '\t' {
-			spaces += 4
-			bytes++
-		} else {
-			break
-		}
-	}
-	return
-}
-
-func trimLeftSpace(markdown string, r Range) Range {
-	s := markdown[r.Position:r.End]
-	trimmed := strings.TrimLeftFunc(s, isWhitespace)
-	return Range{r.Position, r.End - (len(s) - len(trimmed))}
-}
-
-func trimRightSpace(markdown string, r Range) Range {
-	s := markdown[r.Position:r.End]
-	trimmed := strings.TrimRightFunc(s, isWhitespace)
-	return Range{r.Position, r.End - (len(s) - len(trimmed))}
-}
-
-func relativeToAbsolutePosition(ranges []Range, position int) int {
-	rem := position
-	for _, r := range ranges {
-		l := r.End - r.Position
-		if rem < l {
-			return r.Position + rem
-		}
-		rem -= l
-	}
-	if len(ranges) == 0 {
-		return 0
-	}
-	return ranges[len(ranges)-1].End
-}
-
-func trimBytesFromRanges(ranges []Range, bytes int) (result []Range) {
-	rem := bytes
-	for _, r := range ranges {
-		if rem == 0 {
-			result = append(result, r)
-			continue
-		}
-		l := r.End - r.Position
-		if rem < l {
-			result = append(result, Range{r.Position + rem, r.End})
-			rem = 0
-			continue
-		}
-		rem -= l
-	}
-	return
-}
-
-func Parse(markdown string) (*Document, []*ReferenceDefinition) {
-	lines := ParseLines(markdown)
-	return ParseBlocks(markdown, lines)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/paragraph.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/paragraph.go
deleted file mode 100644
index aef01b5e..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/paragraph.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package markdown
-
-import (
-	"strings"
-)
-
-type Paragraph struct {
-	blockBase
-	markdown string
-
-	Text                 []Range
-	ReferenceDefinitions []*ReferenceDefinition
-}
-
-func (b *Paragraph) ParseInlines(referenceDefinitions []*ReferenceDefinition) []Inline {
-	return ParseInlines(b.markdown, b.Text, referenceDefinitions)
-}
-
-func (b *Paragraph) Continuation(indentation int, r Range) *continuation {
-	s := b.markdown[r.Position:r.End]
-	if strings.TrimSpace(s) == "" {
-		return nil
-	}
-	return &continuation{
-		Indentation: indentation,
-		Remaining:   r,
-	}
-}
-
-func (b *Paragraph) Close() {
-	for {
-		for i := 0; i < len(b.Text); i++ {
-			b.Text[i] = trimLeftSpace(b.markdown, b.Text[i])
-			if b.Text[i].Position < b.Text[i].End {
-				break
-			}
-		}
-
-		if len(b.Text) == 0 || b.Text[0].Position < b.Text[0].End && b.markdown[b.Text[0].Position] != '[' {
-			break
-		}
-
-		definition, remaining := parseReferenceDefinition(b.markdown, b.Text)
-		if definition == nil {
-			break
-		}
-		b.ReferenceDefinitions = append(b.ReferenceDefinitions, definition)
-		b.Text = remaining
-	}
-
-	for i := len(b.Text) - 1; i >= 0; i-- {
-		b.Text[i] = trimRightSpace(b.markdown, b.Text[i])
-		if b.Text[i].Position < b.Text[i].End {
-			break
-		}
-	}
-}
-
-func newParagraph(markdown string, r Range) *Paragraph {
-	s := markdown[r.Position:r.End]
-	if strings.TrimSpace(s) == "" {
-		return nil
-	}
-	return &Paragraph{
-		markdown: markdown,
-		Text:     []Range{r},
-	}
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/reference_definition.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/reference_definition.go
deleted file mode 100644
index 69e8ed94..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/markdown/reference_definition.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package markdown
-
-type ReferenceDefinition struct {
-	RawDestination Range
-
-	markdown string
-	rawLabel string
-	rawTitle string
-}
-
-func (d *ReferenceDefinition) Destination() string {
-	return Unescape(d.markdown[d.RawDestination.Position:d.RawDestination.End])
-}
-
-func (d *ReferenceDefinition) Label() string {
-	return d.rawLabel
-}
-
-func (d *ReferenceDefinition) Title() string {
-	return Unescape(d.rawTitle)
-}
-
-func parseReferenceDefinition(markdown string, ranges []Range) (*ReferenceDefinition, []Range) {
-	raw := ""
-	for _, r := range ranges {
-		raw += markdown[r.Position:r.End]
-	}
-
-	label, next, ok := parseLinkLabel(raw, 0)
-	if !ok {
-		return nil, nil
-	}
-	position := next
-
-	if position >= len(raw) || raw[position] != ':' {
-		return nil, nil
-	}
-	position++
-
-	destination, next, ok := parseLinkDestination(raw, nextNonWhitespace(raw, position))
-	if !ok {
-		return nil, nil
-	}
-	position = next
-
-	absoluteDestination := relativeToAbsolutePosition(ranges, destination.Position)
-	ret := &ReferenceDefinition{
-		RawDestination: Range{absoluteDestination, absoluteDestination + destination.End - destination.Position},
-		markdown:       markdown,
-		rawLabel:       raw[label.Position:label.End],
-	}
-
-	if position < len(raw) && isWhitespaceByte(raw[position]) {
-		title, next, ok := parseLinkTitle(raw, nextNonWhitespace(raw, position))
-		if !ok {
-			if nextLine, skippedNonWhitespace := nextLine(raw, position); !skippedNonWhitespace {
-				return ret, trimBytesFromRanges(ranges, nextLine)
-			}
-			return nil, nil
-		}
-		if nextLine, skippedNonWhitespace := nextLine(raw, next); !skippedNonWhitespace {
-			ret.rawTitle = raw[title.Position:title.End]
-			return ret, trimBytesFromRanges(ranges, nextLine)
-		}
-	}
-
-	if nextLine, skippedNonWhitespace := nextLine(raw, position); !skippedNonWhitespace {
-		return ret, trimBytesFromRanges(ranges, nextLine)
-	}
-
-	return nil, nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/default.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/default.go
deleted file mode 100644
index e7faa8c4..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/default.go
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package mlog
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"os"
-
-	"github.com/mattermost/logr"
-)
-
-// defaultLog manually encodes the log to STDERR, providing a basic, default logging implementation
-// before mlog is fully configured.
-func defaultLog(level, msg string, fields ...Field) {
-	log := struct {
-		Level   string  `json:"level"`
-		Message string  `json:"msg"`
-		Fields  []Field `json:"fields,omitempty"`
-	}{
-		level,
-		msg,
-		fields,
-	}
-
-	if b, err := json.Marshal(log); err != nil {
-		fmt.Fprintf(os.Stderr, `{"level":"error","msg":"failed to encode log message"}%s`, "\n")
-	} else {
-		fmt.Fprintf(os.Stderr, "%s\n", b)
-	}
-}
-
-func defaultIsLevelEnabled(level LogLevel) bool {
-	return true
-}
-
-func defaultDebugLog(msg string, fields ...Field) {
-	defaultLog("debug", msg, fields...)
-}
-
-func defaultInfoLog(msg string, fields ...Field) {
-	defaultLog("info", msg, fields...)
-}
-
-func defaultWarnLog(msg string, fields ...Field) {
-	defaultLog("warn", msg, fields...)
-}
-
-func defaultErrorLog(msg string, fields ...Field) {
-	defaultLog("error", msg, fields...)
-}
-
-func defaultCriticalLog(msg string, fields ...Field) {
-	// We map critical to error in zap, so be consistent.
-	defaultLog("error", msg, fields...)
-}
-
-func defaultCustomLog(lvl LogLevel, msg string, fields ...Field) {
-	// custom log levels are only output once log targets are configured.
-}
-
-func defaultCustomMultiLog(lvl []LogLevel, msg string, fields ...Field) {
-	// custom log levels are only output once log targets are configured.
-}
-
-func defaultFlush(ctx context.Context) error {
-	return nil
-}
-
-func defaultAdvancedConfig(cfg LogTargetCfg) error {
-	// mlog.ConfigAdvancedConfig should not be called until default
-	// logger is replaced with mlog.Logger instance.
-	return errors.New("cannot config advanced logging on default logger")
-}
-
-func defaultAdvancedShutdown(ctx context.Context) error {
-	return nil
-}
-
-func defaultAddTarget(targets ...logr.Target) error {
-	// mlog.AddTarget should not be called until default
-	// logger is replaced with mlog.Logger instance.
-	return errors.New("cannot AddTarget on default logger")
-}
-
-func defaultRemoveTargets(ctx context.Context, f func(TargetInfo) bool) error {
-	// mlog.RemoveTargets should not be called until default
-	// logger is replaced with mlog.Logger instance.
-	return errors.New("cannot RemoveTargets on default logger")
-}
-
-func defaultEnableMetrics(collector logr.MetricsCollector) error {
-	// mlog.EnableMetrics should not be called until default
-	// logger is replaced with mlog.Logger instance.
-	return errors.New("cannot EnableMetrics on default logger")
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/errors.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/errors.go
deleted file mode 100644
index 93762fda..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/errors.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package mlog
-
-import (
-	"github.com/mattermost/logr"
-)
-
-// onLoggerError is called when the logging system encounters an error,
-// such as a target not able to write records. The targets will keep trying
-// however the error will be logged with a dedicated level that can be output
-// to a safe/always available target for monitoring or alerting.
-func onLoggerError(err error) {
-	Log(LvlLogError, "advanced logging error", Err(err))
-}
-
-// onQueueFull is called when the main logger queue is full, indicating the
-// volume and frequency of log record creation is too high for the queue size
-// and/or the target latencies.
-func onQueueFull(rec *logr.LogRec, maxQueueSize int) bool {
-	Log(LvlLogError, "main queue full, dropping record", Any("rec", rec))
-	return true // drop record
-}
-
-// onTargetQueueFull is called when the main logger queue is full, indicating the
-// volume and frequency of log record creation is too high for the target's queue size
-// and/or the target latency.
-func onTargetQueueFull(target logr.Target, rec *logr.LogRec, maxQueueSize int) bool {
-	Log(LvlLogError, "target queue full, dropping record", String("target", ""), Any("rec", rec))
-	return true // drop record
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/global.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/global.go
deleted file mode 100644
index aba06646..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/global.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package mlog
-
-import (
-	"context"
-	"log"
-	"sync/atomic"
-
-	"github.com/mattermost/logr"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
-)
-
-var globalLogger *Logger
-
-func InitGlobalLogger(logger *Logger) {
-	// Clean up previous instance.
-	if globalLogger != nil && globalLogger.logrLogger != nil {
-		globalLogger.logrLogger.Logr().Shutdown()
-	}
-	glob := *logger
-	glob.zap = glob.zap.WithOptions(zap.AddCallerSkip(1))
-	globalLogger = &glob
-	IsLevelEnabled = globalLogger.IsLevelEnabled
-	Debug = globalLogger.Debug
-	Info = globalLogger.Info
-	Warn = globalLogger.Warn
-	Error = globalLogger.Error
-	Critical = globalLogger.Critical
-	Log = globalLogger.Log
-	LogM = globalLogger.LogM
-	Flush = globalLogger.Flush
-	ConfigAdvancedLogging = globalLogger.ConfigAdvancedLogging
-	ShutdownAdvancedLogging = globalLogger.ShutdownAdvancedLogging
-	AddTarget = globalLogger.AddTarget
-	RemoveTargets = globalLogger.RemoveTargets
-	EnableMetrics = globalLogger.EnableMetrics
-}
-
-// logWriterFunc provides access to mlog via io.Writer, so the standard logger
-// can be redirected to use mlog and whatever targets are defined.
-type logWriterFunc func([]byte) (int, error)
-
-func (lw logWriterFunc) Write(p []byte) (int, error) {
-	return lw(p)
-}
-
-func RedirectStdLog(logger *Logger) {
-	if atomic.LoadInt32(&disableZap) == 0 {
-		zap.RedirectStdLogAt(logger.zap.With(zap.String("source", "stdlog")).WithOptions(zap.AddCallerSkip(-2)), zapcore.ErrorLevel)
-		return
-	}
-
-	writer := func(p []byte) (int, error) {
-		Log(LvlStdLog, string(p))
-		return len(p), nil
-	}
-	log.SetOutput(logWriterFunc(writer))
-}
-
-type IsLevelEnabledFunc func(LogLevel) bool
-type LogFunc func(string, ...Field)
-type LogFuncCustom func(LogLevel, string, ...Field)
-type LogFuncCustomMulti func([]LogLevel, string, ...Field)
-type FlushFunc func(context.Context) error
-type ConfigFunc func(cfg LogTargetCfg) error
-type ShutdownFunc func(context.Context) error
-type AddTargetFunc func(...logr.Target) error
-type RemoveTargetsFunc func(context.Context, func(TargetInfo) bool) error
-type EnableMetricsFunc func(logr.MetricsCollector) error
-
-// DON'T USE THIS Modify the level on the app logger
-func GloballyDisableDebugLogForTest() {
-	globalLogger.consoleLevel.SetLevel(zapcore.ErrorLevel)
-}
-
-// DON'T USE THIS Modify the level on the app logger
-func GloballyEnableDebugLogForTest() {
-	globalLogger.consoleLevel.SetLevel(zapcore.DebugLevel)
-}
-
-var IsLevelEnabled IsLevelEnabledFunc = defaultIsLevelEnabled
-var Debug LogFunc = defaultDebugLog
-var Info LogFunc = defaultInfoLog
-var Warn LogFunc = defaultWarnLog
-var Error LogFunc = defaultErrorLog
-var Critical LogFunc = defaultCriticalLog
-var Log LogFuncCustom = defaultCustomLog
-var LogM LogFuncCustomMulti = defaultCustomMultiLog
-var Flush FlushFunc = defaultFlush
-
-var ConfigAdvancedLogging ConfigFunc = defaultAdvancedConfig
-var ShutdownAdvancedLogging ShutdownFunc = defaultAdvancedShutdown
-var AddTarget AddTargetFunc = defaultAddTarget
-var RemoveTargets RemoveTargetsFunc = defaultRemoveTargets
-var EnableMetrics EnableMetricsFunc = defaultEnableMetrics
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/levels.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/levels.go
deleted file mode 100644
index 24d29e0b..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/levels.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package mlog
-
-// Standard levels
-var (
-	LvlPanic = LogLevel{ID: 0, Name: "panic", Stacktrace: true}
-	LvlFatal = LogLevel{ID: 1, Name: "fatal", Stacktrace: true}
-	LvlError = LogLevel{ID: 2, Name: "error"}
-	LvlWarn  = LogLevel{ID: 3, Name: "warn"}
-	LvlInfo  = LogLevel{ID: 4, Name: "info"}
-	LvlDebug = LogLevel{ID: 5, Name: "debug"}
-	LvlTrace = LogLevel{ID: 6, Name: "trace"}
-	// used by redirected standard logger
-	LvlStdLog = LogLevel{ID: 10, Name: "stdlog"}
-	// used only by the logger
-	LvlLogError = LogLevel{ID: 11, Name: "logerror", Stacktrace: true}
-)
-
-// Register custom (discrete) levels here.
-// !!!!! ID's must not exceed 32,768 !!!!!!
-var (
-	// used by the audit system
-	LvlAuditAPI     = LogLevel{ID: 100, Name: "audit-api"}
-	LvlAuditContent = LogLevel{ID: 101, Name: "audit-content"}
-	LvlAuditPerms   = LogLevel{ID: 102, Name: "audit-permissions"}
-	LvlAuditCLI     = LogLevel{ID: 103, Name: "audit-cli"}
-
-	// used by the TCP log target
-	LvlTcpLogTarget = LogLevel{ID: 120, Name: "TcpLogTarget"}
-
-	// used by Remote Cluster Service
-	LvlRemoteClusterServiceDebug = LogLevel{ID: 130, Name: "RemoteClusterServiceDebug"}
-	LvlRemoteClusterServiceError = LogLevel{ID: 131, Name: "RemoteClusterServiceError"}
-	LvlRemoteClusterServiceWarn  = LogLevel{ID: 132, Name: "RemoteClusterServiceWarn"}
-
-	// used by Shared Channel Sync Service
-	LvlSharedChannelServiceDebug            = LogLevel{ID: 200, Name: "SharedChannelServiceDebug"}
-	LvlSharedChannelServiceError            = LogLevel{ID: 201, Name: "SharedChannelServiceError"}
-	LvlSharedChannelServiceWarn             = LogLevel{ID: 202, Name: "SharedChannelServiceWarn"}
-	LvlSharedChannelServiceMessagesInbound  = LogLevel{ID: 203, Name: "SharedChannelServiceMsgInbound"}
-	LvlSharedChannelServiceMessagesOutbound = LogLevel{ID: 204, Name: "SharedChannelServiceMsgOutbound"}
-
-	// add more here ...
-)
-
-// Combinations for LogM (log multi)
-var (
-	MLvlAuditAll = []LogLevel{LvlAuditAPI, LvlAuditContent, LvlAuditPerms, LvlAuditCLI}
-)
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/log.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/log.go
deleted file mode 100644
index d50fc123..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/log.go
+++ /dev/null
@@ -1,361 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package mlog
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/mattermost/logr"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
-	"gopkg.in/natefinch/lumberjack.v2"
-)
-
-const (
-	// Very verbose messages for debugging specific issues
-	LevelDebug = "debug"
-	// Default log level, informational
-	LevelInfo = "info"
-	// Warnings are messages about possible issues
-	LevelWarn = "warn"
-	// Errors are messages about things we know are problems
-	LevelError = "error"
-
-	// DefaultFlushTimeout is the default amount of time mlog.Flush will wait
-	// before timing out.
-	DefaultFlushTimeout = time.Second * 5
-)
-
-var (
-	// disableZap is set when Zap should be disabled and Logr used instead.
-	// This is needed for unit testing as Zap has no shutdown capabilities
-	// and holds file handles until process exit. Currently unit test create
-	// many server instances, and thus many Zap log files.
-	// This flag will be removed when Zap is permanently replaced.
-	disableZap int32
-)
-
-// Type and function aliases from zap to limit the libraries scope into MM code
-type Field = zapcore.Field
-
-var Int64 = zap.Int64
-var Int32 = zap.Int32
-var Int = zap.Int
-var Uint32 = zap.Uint32
-var String = zap.String
-var Any = zap.Any
-var Err = zap.Error
-var NamedErr = zap.NamedError
-var Bool = zap.Bool
-var Duration = zap.Duration
-
-type LoggerIFace interface {
-	IsLevelEnabled(LogLevel) bool
-	Debug(string, ...Field)
-	Info(string, ...Field)
-	Warn(string, ...Field)
-	Error(string, ...Field)
-	Critical(string, ...Field)
-	Log(LogLevel, string, ...Field)
-	LogM([]LogLevel, string, ...Field)
-}
-
-type TargetInfo logr.TargetInfo
-
-type LoggerConfiguration struct {
-	EnableConsole bool
-	ConsoleJson   bool
-	EnableColor   bool
-	ConsoleLevel  string
-	EnableFile    bool
-	FileJson      bool
-	FileLevel     string
-	FileLocation  string
-}
-
-type Logger struct {
-	zap          *zap.Logger
-	consoleLevel zap.AtomicLevel
-	fileLevel    zap.AtomicLevel
-	logrLogger   *logr.Logger
-	mutex        *sync.RWMutex
-}
-
-func getZapLevel(level string) zapcore.Level {
-	switch level {
-	case LevelInfo:
-		return zapcore.InfoLevel
-	case LevelWarn:
-		return zapcore.WarnLevel
-	case LevelDebug:
-		return zapcore.DebugLevel
-	case LevelError:
-		return zapcore.ErrorLevel
-	default:
-		return zapcore.InfoLevel
-	}
-}
-
-func makeEncoder(json, color bool) zapcore.Encoder {
-	encoderConfig := zap.NewProductionEncoderConfig()
-	if json {
-		return zapcore.NewJSONEncoder(encoderConfig)
-	}
-
-	if color {
-		encoderConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
-	}
-	encoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
-	return zapcore.NewConsoleEncoder(encoderConfig)
-}
-
-func NewLogger(config *LoggerConfiguration) *Logger {
-	cores := []zapcore.Core{}
-	logger := &Logger{
-		consoleLevel: zap.NewAtomicLevelAt(getZapLevel(config.ConsoleLevel)),
-		fileLevel:    zap.NewAtomicLevelAt(getZapLevel(config.FileLevel)),
-		logrLogger:   newLogr(),
-		mutex:        &sync.RWMutex{},
-	}
-
-	if config.EnableConsole {
-		writer := zapcore.Lock(os.Stderr)
-		core := zapcore.NewCore(makeEncoder(config.ConsoleJson, config.EnableColor), writer, logger.consoleLevel)
-		cores = append(cores, core)
-	}
-
-	if config.EnableFile {
-		if atomic.LoadInt32(&disableZap) != 0 {
-			t := &LogTarget{
-				Type:         "file",
-				Format:       "json",
-				Levels:       mlogLevelToLogrLevels(config.FileLevel),
-				MaxQueueSize: DefaultMaxTargetQueue,
-				Options: []byte(fmt.Sprintf(`{"Filename":"%s", "MaxSizeMB":%d, "Compress":%t}`,
-					config.FileLocation, 100, true)),
-			}
-			if !config.FileJson {
-				t.Format = "plain"
-			}
-			if tgt, err := NewLogrTarget("mlogFile", t); err == nil {
-				logger.logrLogger.Logr().AddTarget(tgt)
-			} else {
-				Error("error creating mlogFile", Err(err))
-			}
-		} else {
-			writer := zapcore.AddSync(&lumberjack.Logger{
-				Filename: config.FileLocation,
-				MaxSize:  100,
-				Compress: true,
-			})
-
-			core := zapcore.NewCore(makeEncoder(config.FileJson, false), writer, logger.fileLevel)
-			cores = append(cores, core)
-		}
-	}
-
-	combinedCore := zapcore.NewTee(cores...)
-
-	logger.zap = zap.New(combinedCore,
-		zap.AddCaller(),
-	)
-	return logger
-}
-
-func (l *Logger) ChangeLevels(config *LoggerConfiguration) {
-	l.consoleLevel.SetLevel(getZapLevel(config.ConsoleLevel))
-	l.fileLevel.SetLevel(getZapLevel(config.FileLevel))
-}
-
-func (l *Logger) SetConsoleLevel(level string) {
-	l.consoleLevel.SetLevel(getZapLevel(level))
-}
-
-func (l *Logger) With(fields ...Field) *Logger {
-	newLogger := *l
-	newLogger.zap = newLogger.zap.With(fields...)
-	if newLogger.getLogger() != nil {
-		ll := newLogger.getLogger().WithFields(zapToLogr(fields))
-		newLogger.logrLogger = &ll
-	}
-	return &newLogger
-}
-
-func (l *Logger) StdLog(fields ...Field) *log.Logger {
-	return zap.NewStdLog(l.With(fields...).zap.WithOptions(getStdLogOption()))
-}
-
-// StdLogAt returns *log.Logger which writes to supplied zap logger at required level.
-func (l *Logger) StdLogAt(level string, fields ...Field) (*log.Logger, error) {
-	return zap.NewStdLogAt(l.With(fields...).zap.WithOptions(getStdLogOption()), getZapLevel(level))
-}
-
-// StdLogWriter returns a writer that can be hooked up to the output of a golang standard logger
-// anything written will be interpreted as log entries accordingly
-func (l *Logger) StdLogWriter() io.Writer {
-	newLogger := *l
-	newLogger.zap = newLogger.zap.WithOptions(zap.AddCallerSkip(4), getStdLogOption())
-	f := newLogger.Info
-	return &loggerWriter{f}
-}
-
-func (l *Logger) WithCallerSkip(skip int) *Logger {
-	newLogger := *l
-	newLogger.zap = newLogger.zap.WithOptions(zap.AddCallerSkip(skip))
-	return &newLogger
-}
-
-// Made for the plugin interface, wraps mlog in a simpler interface
-// at the cost of performance
-func (l *Logger) Sugar() *SugarLogger {
-	return &SugarLogger{
-		wrappedLogger: l,
-		zapSugar:      l.zap.Sugar(),
-	}
-}
-
-func (l *Logger) IsLevelEnabled(level LogLevel) bool {
-	return isLevelEnabled(l.getLogger(), logr.Level(level))
-}
-
-func (l *Logger) Debug(message string, fields ...Field) {
-	l.zap.Debug(message, fields...)
-	if isLevelEnabled(l.getLogger(), logr.Debug) {
-		l.getLogger().WithFields(zapToLogr(fields)).Debug(message)
-	}
-}
-
-func (l *Logger) Info(message string, fields ...Field) {
-	l.zap.Info(message, fields...)
-	if isLevelEnabled(l.getLogger(), logr.Info) {
-		l.getLogger().WithFields(zapToLogr(fields)).Info(message)
-	}
-}
-
-func (l *Logger) Warn(message string, fields ...Field) {
-	l.zap.Warn(message, fields...)
-	if isLevelEnabled(l.getLogger(), logr.Warn) {
-		l.getLogger().WithFields(zapToLogr(fields)).Warn(message)
-	}
-}
-
-func (l *Logger) Error(message string, fields ...Field) {
-	l.zap.Error(message, fields...)
-	if isLevelEnabled(l.getLogger(), logr.Error) {
-		l.getLogger().WithFields(zapToLogr(fields)).Error(message)
-	}
-}
-
-func (l *Logger) Critical(message string, fields ...Field) {
-	l.zap.Error(message, fields...)
-	if isLevelEnabled(l.getLogger(), logr.Error) {
-		l.getLogger().WithFields(zapToLogr(fields)).Error(message)
-	}
-}
-
-func (l *Logger) Log(level LogLevel, message string, fields ...Field) {
-	l.getLogger().WithFields(zapToLogr(fields)).Log(logr.Level(level), message)
-}
-
-func (l *Logger) LogM(levels []LogLevel, message string, fields ...Field) {
-	var logger *logr.Logger
-	for _, lvl := range levels {
-		if isLevelEnabled(l.getLogger(), logr.Level(lvl)) {
-			// don't create logger with fields unless at least one level is active.
-			if logger == nil {
-				l := l.getLogger().WithFields(zapToLogr(fields))
-				logger = &l
-			}
-			logger.Log(logr.Level(lvl), message)
-		}
-	}
-}
-
-func (l *Logger) Flush(cxt context.Context) error {
-	return l.getLogger().Logr().FlushWithTimeout(cxt)
-}
-
-// ShutdownAdvancedLogging stops the logger from accepting new log records and tries to
-// flush queues within the context timeout. Once complete all targets are shutdown
-// and any resources released.
-func (l *Logger) ShutdownAdvancedLogging(cxt context.Context) error {
-	err := l.getLogger().Logr().ShutdownWithTimeout(cxt)
-	l.setLogger(newLogr())
-	return err
-}
-
-// ConfigAdvancedLoggingConfig (re)configures advanced logging based on the
-// specified log targets. This is the easiest way to get the advanced logger
-// configured via a config source such as file.
-func (l *Logger) ConfigAdvancedLogging(targets LogTargetCfg) error {
-	if err := l.ShutdownAdvancedLogging(context.Background()); err != nil {
-		Error("error shutting down previous logger", Err(err))
-	}
-
-	err := logrAddTargets(l.getLogger(), targets)
-	return err
-}
-
-// AddTarget adds one or more logr.Target to the advanced logger. This is the preferred method
-// to add custom targets or provide configuration that cannot be expressed via a
-// config source.
-func (l *Logger) AddTarget(targets ...logr.Target) error {
-	return l.getLogger().Logr().AddTarget(targets...)
-}
-
-// RemoveTargets selectively removes targets that were previously added to this logger instance
-// using the passed in filter function. The filter function should return true to remove the target
-// and false to keep it.
-func (l *Logger) RemoveTargets(ctx context.Context, f func(ti TargetInfo) bool) error {
-	// Use locally defined TargetInfo type so we don't spread Logr dependencies.
-	fc := func(tic logr.TargetInfo) bool {
-		return f(TargetInfo(tic))
-	}
-	return l.getLogger().Logr().RemoveTargets(ctx, fc)
-}
-
-// EnableMetrics enables metrics collection by supplying a MetricsCollector.
-// The MetricsCollector provides counters and gauges that are updated by log targets.
-func (l *Logger) EnableMetrics(collector logr.MetricsCollector) error {
-	return l.getLogger().Logr().SetMetricsCollector(collector)
-}
-
-// getLogger is a concurrent safe getter of the logr logger
-func (l *Logger) getLogger() *logr.Logger {
-	defer l.mutex.RUnlock()
-	l.mutex.RLock()
-	return l.logrLogger
-}
-
-// setLogger is a concurrent safe setter of the logr logger
-func (l *Logger) setLogger(logger *logr.Logger) {
-	defer l.mutex.Unlock()
-	l.mutex.Lock()
-	l.logrLogger = logger
-}
-
-// DisableZap is called to disable Zap, and Logr will be used instead. Any Logger
-// instances created after this call will only use Logr.
-//
-// This is needed for unit testing as Zap has no shutdown capabilities
-// and holds file handles until process exit. Currently unit tests create
-// many server instances, and thus many Zap log file handles.
-//
-// This method will be removed when Zap is permanently replaced.
-func DisableZap() {
-	atomic.StoreInt32(&disableZap, 1)
-}
-
-// EnableZap re-enables Zap such that any Logger instances created after this
-// call will allow Zap targets.
-func EnableZap() {
-	atomic.StoreInt32(&disableZap, 0)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/logr.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/logr.go
deleted file mode 100644
index c44fafa0..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/logr.go
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package mlog
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-
-	"github.com/hashicorp/go-multierror"
-	"github.com/mattermost/logr"
-	logrFmt "github.com/mattermost/logr/format"
-	"github.com/mattermost/logr/target"
-	"go.uber.org/zap/zapcore"
-)
-
-const (
-	DefaultMaxTargetQueue = 1000
-	DefaultSysLogPort     = 514
-)
-
-type LogLevel struct {
-	ID         logr.LevelID
-	Name       string
-	Stacktrace bool
-}
-
-type LogTarget struct {
-	Type         string // one of "console", "file", "tcp", "syslog", "none".
-	Format       string // one of "json", "plain"
-	Levels       []LogLevel
-	Options      json.RawMessage
-	MaxQueueSize int
-}
-
-type LogTargetCfg map[string]*LogTarget
-type LogrCleanup func() error
-
-func newLogr() *logr.Logger {
-	lgr := &logr.Logr{}
-	lgr.OnExit = func(int) {}
-	lgr.OnPanic = func(interface{}) {}
-	lgr.OnLoggerError = onLoggerError
-	lgr.OnQueueFull = onQueueFull
-	lgr.OnTargetQueueFull = onTargetQueueFull
-
-	logger := lgr.NewLogger()
-	return &logger
-}
-
-func logrAddTargets(logger *logr.Logger, targets LogTargetCfg) error {
-	lgr := logger.Logr()
-	var errs error
-	for name, t := range targets {
-		target, err := NewLogrTarget(name, t)
-		if err != nil {
-			errs = multierror.Append(err)
-			continue
-		}
-		if target != nil {
-			target.SetName(name)
-			lgr.AddTarget(target)
-		}
-	}
-	return errs
-}
-
-// NewLogrTarget creates a `logr.Target` based on a target config.
-// Can be used when parsing custom config files, or when programmatically adding
-// built-in targets. Use `mlog.AddTarget` to add custom targets.
-func NewLogrTarget(name string, t *LogTarget) (logr.Target, error) {
-	formatter, err := newFormatter(name, t.Format)
-	if err != nil {
-		return nil, err
-	}
-	filter := newFilter(t.Levels)
-
-	if t.MaxQueueSize == 0 {
-		t.MaxQueueSize = DefaultMaxTargetQueue
-	}
-
-	switch t.Type {
-	case "console":
-		return newConsoleTarget(name, t, filter, formatter)
-	case "file":
-		return newFileTarget(name, t, filter, formatter)
-	case "syslog":
-		return newSyslogTarget(name, t, filter, formatter)
-	case "tcp":
-		return newTCPTarget(name, t, filter, formatter)
-	case "none":
-		return nil, nil
-	}
-	return nil, fmt.Errorf("invalid type '%s' for target %s", t.Type, name)
-}
-
-func newFilter(levels []LogLevel) logr.Filter {
-	filter := &logr.CustomFilter{}
-	for _, lvl := range levels {
-		filter.Add(logr.Level(lvl))
-	}
-	return filter
-}
-
-func newFormatter(name string, format string) (logr.Formatter, error) {
-	switch format {
-	case "json", "":
-		return &logrFmt.JSON{}, nil
-	case "plain":
-		return &logrFmt.Plain{Delim: " | "}, nil
-	default:
-		return nil, fmt.Errorf("invalid format '%s' for target %s", format, name)
-	}
-}
-
-func newConsoleTarget(name string, t *LogTarget, filter logr.Filter, formatter logr.Formatter) (logr.Target, error) {
-	type consoleOptions struct {
-		Out string `json:"Out"`
-	}
-	options := &consoleOptions{}
-	if err := json.Unmarshal(t.Options, options); err != nil {
-		return nil, err
-	}
-
-	var w io.Writer
-	switch options.Out {
-	case "stdout", "":
-		w = os.Stdout
-	case "stderr":
-		w = os.Stderr
-	default:
-		return nil, fmt.Errorf("invalid out '%s' for target %s", options.Out, name)
-	}
-
-	newTarget := target.NewWriterTarget(filter, formatter, w, t.MaxQueueSize)
-	return newTarget, nil
-}
-
-func newFileTarget(name string, t *LogTarget, filter logr.Filter, formatter logr.Formatter) (logr.Target, error) {
-	type fileOptions struct {
-		Filename   string `json:"Filename"`
-		MaxSize    int    `json:"MaxSizeMB"`
-		MaxAge     int    `json:"MaxAgeDays"`
-		MaxBackups int    `json:"MaxBackups"`
-		Compress   bool   `json:"Compress"`
-	}
-	options := &fileOptions{}
-	if err := json.Unmarshal(t.Options, options); err != nil {
-		return nil, err
-	}
-	return newFileTargetWithOpts(name, t, target.FileOptions(*options), filter, formatter)
-}
-
-func newFileTargetWithOpts(name string, t *LogTarget, opts target.FileOptions, filter logr.Filter, formatter logr.Formatter) (logr.Target, error) {
-	if opts.Filename == "" {
-		return nil, fmt.Errorf("missing 'Filename' option for target %s", name)
-	}
-	if err := checkFileWritable(opts.Filename); err != nil {
-		return nil, fmt.Errorf("error writing to 'Filename' for target %s: %w", name, err)
-	}
-
-	newTarget := target.NewFileTarget(filter, formatter, opts, t.MaxQueueSize)
-	return newTarget, nil
-}
-
-func newSyslogTarget(name string, t *LogTarget, filter logr.Filter, formatter logr.Formatter) (logr.Target, error) {
-	options := &SyslogParams{}
-	if err := json.Unmarshal(t.Options, options); err != nil {
-		return nil, err
-	}
-
-	if options.IP == "" {
-		return nil, fmt.Errorf("missing 'IP' option for target %s", name)
-	}
-	if options.Port == 0 {
-		options.Port = DefaultSysLogPort
-	}
-	return NewSyslogTarget(filter, formatter, options, t.MaxQueueSize)
-}
-
-func newTCPTarget(name string, t *LogTarget, filter logr.Filter, formatter logr.Formatter) (logr.Target, error) {
-	options := &TcpParams{}
-	if err := json.Unmarshal(t.Options, options); err != nil {
-		return nil, err
-	}
-
-	if options.IP == "" {
-		return nil, fmt.Errorf("missing 'IP' option for target %s", name)
-	}
-	if options.Port == 0 {
-		return nil, fmt.Errorf("missing 'Port' option for target %s", name)
-	}
-	return NewTcpTarget(filter, formatter, options, t.MaxQueueSize)
-}
-
-func checkFileWritable(filename string) error {
-	// try opening/creating the file for writing
-	file, err := os.OpenFile(filename, os.O_RDWR|os.O_APPEND|os.O_CREATE, 0600)
-	if err != nil {
-		return err
-	}
-	file.Close()
-	return nil
-}
-
-func isLevelEnabled(logger *logr.Logger, level logr.Level) bool {
-	if logger == nil || logger.Logr() == nil {
-		return false
-	}
-
-	status := logger.Logr().IsLevelEnabled(level)
-	return status.Enabled
-}
-
-// zapToLogr converts Zap fields to Logr fields.
-// This will not be needed once Logr is used for all logging.
-func zapToLogr(zapFields []Field) logr.Fields {
-	encoder := zapcore.NewMapObjectEncoder()
-	for _, zapField := range zapFields {
-		zapField.AddTo(encoder)
-	}
-	return logr.Fields(encoder.Fields)
-}
-
-// mlogLevelToLogrLevel converts a mlog logger level to
-// an array of discrete Logr levels.
-func mlogLevelToLogrLevels(level string) []LogLevel {
-	levels := make([]LogLevel, 0)
-	levels = append(levels, LvlError, LvlPanic, LvlFatal, LvlStdLog)
-
-	switch level {
-	case LevelDebug:
-		levels = append(levels, LvlDebug)
-		fallthrough
-	case LevelInfo:
-		levels = append(levels, LvlInfo)
-		fallthrough
-	case LevelWarn:
-		levels = append(levels, LvlWarn)
-	}
-	return levels
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/stdlog.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/stdlog.go
deleted file mode 100644
index fd702abf..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/stdlog.go
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package mlog
-
-import (
-	"bytes"
-	"strings"
-
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
-)
-
-// Implementation of zapcore.Core to interpret log messages from a standard logger
-// and translate the levels to zapcore levels.
-type stdLogLevelInterpreterCore struct {
-	wrappedCore zapcore.Core
-}
-
-func stdLogInterpretZapEntry(entry zapcore.Entry) zapcore.Entry {
-	message := entry.Message
-	if strings.Index(message, "[DEBUG]") == 0 {
-		entry.Level = zapcore.DebugLevel
-		entry.Message = message[7:]
-	} else if strings.Index(message, "[DEBG]") == 0 {
-		entry.Level = zapcore.DebugLevel
-		entry.Message = message[6:]
-	} else if strings.Index(message, "[WARN]") == 0 {
-		entry.Level = zapcore.WarnLevel
-		entry.Message = message[6:]
-	} else if strings.Index(message, "[ERROR]") == 0 {
-		entry.Level = zapcore.ErrorLevel
-		entry.Message = message[7:]
-	} else if strings.Index(message, "[EROR]") == 0 {
-		entry.Level = zapcore.ErrorLevel
-		entry.Message = message[6:]
-	} else if strings.Index(message, "[ERR]") == 0 {
-		entry.Level = zapcore.ErrorLevel
-		entry.Message = message[5:]
-	} else if strings.Index(message, "[INFO]") == 0 {
-		entry.Level = zapcore.InfoLevel
-		entry.Message = message[6:]
-	}
-	return entry
-}
-
-func (s *stdLogLevelInterpreterCore) Enabled(lvl zapcore.Level) bool {
-	return s.wrappedCore.Enabled(lvl)
-}
-
-func (s *stdLogLevelInterpreterCore) With(fields []zapcore.Field) zapcore.Core {
-	return s.wrappedCore.With(fields)
-}
-
-func (s *stdLogLevelInterpreterCore) Check(entry zapcore.Entry, checkedEntry *zapcore.CheckedEntry) *zapcore.CheckedEntry {
-	entry = stdLogInterpretZapEntry(entry)
-	return s.wrappedCore.Check(entry, checkedEntry)
-}
-
-func (s *stdLogLevelInterpreterCore) Write(entry zapcore.Entry, fields []zapcore.Field) error {
-	entry = stdLogInterpretZapEntry(entry)
-	return s.wrappedCore.Write(entry, fields)
-}
-
-func (s *stdLogLevelInterpreterCore) Sync() error {
-	return s.wrappedCore.Sync()
-}
-
-func getStdLogOption() zap.Option {
-	return zap.WrapCore(
-		func(core zapcore.Core) zapcore.Core {
-			return &stdLogLevelInterpreterCore{core}
-		},
-	)
-}
-
-type loggerWriter struct {
-	logFunc func(msg string, fields ...Field)
-}
-
-func (l *loggerWriter) Write(p []byte) (int, error) {
-	trimmed := string(bytes.TrimSpace(p))
-	for _, line := range strings.Split(trimmed, "\n") {
-		l.logFunc(line)
-	}
-	return len(p), nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/sugar.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/sugar.go
deleted file mode 100644
index 2368b085..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/sugar.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package mlog
-
-import (
-	"go.uber.org/zap"
-)
-
-// Made for the plugin interface, use the regular logger for other uses
-type SugarLogger struct {
-	wrappedLogger *Logger
-	zapSugar      *zap.SugaredLogger
-}
-
-func (l *SugarLogger) Debug(msg string, keyValuePairs ...interface{}) {
-	l.zapSugar.Debugw(msg, keyValuePairs...)
-}
-
-func (l *SugarLogger) Info(msg string, keyValuePairs ...interface{}) {
-	l.zapSugar.Infow(msg, keyValuePairs...)
-}
-
-func (l *SugarLogger) Error(msg string, keyValuePairs ...interface{}) {
-	l.zapSugar.Errorw(msg, keyValuePairs...)
-}
-
-func (l *SugarLogger) Warn(msg string, keyValuePairs ...interface{}) {
-	l.zapSugar.Warnw(msg, keyValuePairs...)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/syslog.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/syslog.go
deleted file mode 100644
index 8766a964..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/syslog.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package mlog
-
-import (
-	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"io/ioutil"
-
-	"github.com/mattermost/logr"
-	"github.com/wiggin77/merror"
-	syslog "github.com/wiggin77/srslog"
-)
-
-// Syslog outputs log records to local or remote syslog.
-type Syslog struct {
-	logr.Basic
-	w *syslog.Writer
-}
-
-// SyslogParams provides parameters for dialing a syslog daemon.
-type SyslogParams struct {
-	IP       string `json:"IP"`
-	Port     int    `json:"Port"`
-	Tag      string `json:"Tag"`
-	TLS      bool   `json:"TLS"`
-	Cert     string `json:"Cert"`
-	Insecure bool   `json:"Insecure"`
-}
-
-// NewSyslogTarget creates a target capable of outputting log records to remote or local syslog, with or without TLS.
-func NewSyslogTarget(filter logr.Filter, formatter logr.Formatter, params *SyslogParams, maxQueue int) (*Syslog, error) {
-	network := "tcp"
-	var config *tls.Config
-
-	if params.TLS {
-		network = "tcp+tls"
-		config = &tls.Config{InsecureSkipVerify: params.Insecure}
-		if params.Cert != "" {
-			pool, err := getCertPool(params.Cert)
-			if err != nil {
-				return nil, err
-			}
-			config.RootCAs = pool
-		}
-	}
-	raddr := fmt.Sprintf("%s:%d", params.IP, params.Port)
-
-	writer, err := syslog.DialWithTLSConfig(network, raddr, syslog.LOG_INFO, params.Tag, config)
-	if err != nil {
-		return nil, err
-	}
-
-	s := &Syslog{w: writer}
-	s.Basic.Start(s, s, filter, formatter, maxQueue)
-
-	return s, nil
-}
-
-// Shutdown stops processing log records after making best effort to flush queue.
-func (s *Syslog) Shutdown(ctx context.Context) error {
-	errs := merror.New()
-
-	err := s.Basic.Shutdown(ctx)
-	errs.Append(err)
-
-	err = s.w.Close()
-	errs.Append(err)
-
-	return errs.ErrorOrNil()
-}
-
-// getCertPool returns a x509.CertPool containing the cert(s)
-// from `cert`, which can be a path to a .pem or .crt file,
-// or a base64 encoded cert.
-func getCertPool(cert string) (*x509.CertPool, error) {
-	if cert == "" {
-		return nil, errors.New("no cert provided")
-	}
-
-	// first treat as a file and try to read.
-	serverCert, err := ioutil.ReadFile(cert)
-	if err != nil {
-		// maybe it's a base64 encoded cert
-		serverCert, err = base64.StdEncoding.DecodeString(cert)
-		if err != nil {
-			return nil, errors.New("cert cannot be read")
-		}
-	}
-
-	pool := x509.NewCertPool()
-	if ok := pool.AppendCertsFromPEM(serverCert); ok {
-		return pool, nil
-	}
-	return nil, errors.New("cannot parse cert")
-}
-
-// Write converts the log record to bytes, via the Formatter,
-// and outputs to syslog.
-func (s *Syslog) Write(rec *logr.LogRec) error {
-	_, stacktrace := s.IsLevelEnabled(rec.Level())
-
-	buf := rec.Logger().Logr().BorrowBuffer()
-	defer rec.Logger().Logr().ReleaseBuffer(buf)
-
-	buf, err := s.Formatter().Format(rec, stacktrace, buf)
-	if err != nil {
-		return err
-	}
-	txt := buf.String()
-
-	switch rec.Level() {
-	case logr.Panic, logr.Fatal:
-		err = s.w.Crit(txt)
-	case logr.Error:
-		err = s.w.Err(txt)
-	case logr.Warn:
-		err = s.w.Warning(txt)
-	case logr.Debug, logr.Trace:
-		err = s.w.Debug(txt)
-	default:
-		// logr.Info plus all custom levels.
-		err = s.w.Info(txt)
-	}
-
-	if err != nil {
-		reporter := rec.Logger().Logr().ReportError
-		reporter(fmt.Errorf("syslog write fail: %w", err))
-		// syslog writer will try to reconnect.
-	}
-	return err
-}
-
-// String returns a string representation of this target.
-func (s *Syslog) String() string {
-	return "SyslogTarget"
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/tcp.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/tcp.go
deleted file mode 100644
index d65b43ee..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/tcp.go
+++ /dev/null
@@ -1,273 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package mlog
-
-import (
-	"context"
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"net"
-	_ "net/http/pprof"
-	"sync"
-	"time"
-
-	"github.com/hashicorp/go-multierror"
-	"github.com/mattermost/logr"
-)
-
-const (
-	DialTimeoutSecs             = 30
-	WriteTimeoutSecs            = 30
-	RetryBackoffMillis    int64 = 100
-	MaxRetryBackoffMillis int64 = 30 * 1000 // 30 seconds
-)
-
-// Tcp outputs log records to raw socket server.
-type Tcp struct {
-	logr.Basic
-
-	params *TcpParams
-	addy   string
-
-	mutex    sync.Mutex
-	conn     net.Conn
-	monitor  chan struct{}
-	shutdown chan struct{}
-}
-
-// TcpParams provides parameters for dialing a socket server.
-type TcpParams struct {
-	IP       string `json:"IP"`
-	Port     int    `json:"Port"`
-	TLS      bool   `json:"TLS"`
-	Cert     string `json:"Cert"`
-	Insecure bool   `json:"Insecure"`
-}
-
-// NewTcpTarget creates a target capable of outputting log records to a raw socket, with or without TLS.
-func NewTcpTarget(filter logr.Filter, formatter logr.Formatter, params *TcpParams, maxQueue int) (*Tcp, error) {
-	tcp := &Tcp{
-		params:   params,
-		addy:     fmt.Sprintf("%s:%d", params.IP, params.Port),
-		monitor:  make(chan struct{}),
-		shutdown: make(chan struct{}),
-	}
-	tcp.Basic.Start(tcp, tcp, filter, formatter, maxQueue)
-
-	return tcp, nil
-}
-
-// getConn provides a net.Conn.  If a connection already exists, it is returned immediately,
-// otherwise this method blocks until a new connection is created, timeout or shutdown.
-func (tcp *Tcp) getConn() (net.Conn, error) {
-	tcp.mutex.Lock()
-	defer tcp.mutex.Unlock()
-
-	Log(LvlTcpLogTarget, "getConn enter", String("addy", tcp.addy))
-	defer Log(LvlTcpLogTarget, "getConn exit", String("addy", tcp.addy))
-
-	if tcp.conn != nil {
-		Log(LvlTcpLogTarget, "reusing existing conn", String("addy", tcp.addy)) // use "With" once Zap is removed
-		return tcp.conn, nil
-	}
-
-	type result struct {
-		conn net.Conn
-		err  error
-	}
-
-	connChan := make(chan result)
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*DialTimeoutSecs)
-	defer cancel()
-
-	go func(ctx context.Context, ch chan result) {
-		Log(LvlTcpLogTarget, "dailing", String("addy", tcp.addy))
-		conn, err := tcp.dial(ctx)
-		if err == nil {
-			tcp.conn = conn
-			tcp.monitor = make(chan struct{})
-			go monitor(tcp.conn, tcp.monitor, Log)
-		}
-		ch <- result{conn: conn, err: err}
-	}(ctx, connChan)
-
-	select {
-	case <-tcp.shutdown:
-		return nil, errors.New("shutdown")
-	case res := <-connChan:
-		return res.conn, res.err
-	}
-}
-
-// dial connects to a TCP socket, and optionally performs a TLS handshake.
-// A non-nil context must be provided which can cancel the dial.
-func (tcp *Tcp) dial(ctx context.Context) (net.Conn, error) {
-	var dialer net.Dialer
-	dialer.Timeout = time.Second * DialTimeoutSecs
-	conn, err := dialer.DialContext(ctx, "tcp", fmt.Sprintf("%s:%d", tcp.params.IP, tcp.params.Port))
-	if err != nil {
-		return nil, err
-	}
-
-	if !tcp.params.TLS {
-		return conn, nil
-	}
-
-	Log(LvlTcpLogTarget, "TLS handshake", String("addy", tcp.addy))
-
-	tlsconfig := &tls.Config{
-		ServerName:         tcp.params.IP,
-		InsecureSkipVerify: tcp.params.Insecure,
-	}
-	if tcp.params.Cert != "" {
-		pool, err := getCertPool(tcp.params.Cert)
-		if err != nil {
-			return nil, err
-		}
-		tlsconfig.RootCAs = pool
-	}
-
-	tlsConn := tls.Client(conn, tlsconfig)
-	if err := tlsConn.Handshake(); err != nil {
-		return nil, err
-	}
-	return tlsConn, nil
-}
-
-func (tcp *Tcp) close() error {
-	tcp.mutex.Lock()
-	defer tcp.mutex.Unlock()
-
-	var err error
-	if tcp.conn != nil {
-		Log(LvlTcpLogTarget, "closing connection", String("addy", tcp.addy))
-		close(tcp.monitor)
-		err = tcp.conn.Close()
-		tcp.conn = nil
-	}
-	return err
-}
-
-// Shutdown stops processing log records after making best effort to flush queue.
-func (tcp *Tcp) Shutdown(ctx context.Context) error {
-	errs := &multierror.Error{}
-
-	Log(LvlTcpLogTarget, "shutting down", String("addy", tcp.addy))
-
-	if err := tcp.Basic.Shutdown(ctx); err != nil {
-		errs = multierror.Append(errs, err)
-	}
-
-	if err := tcp.close(); err != nil {
-		errs = multierror.Append(errs, err)
-	}
-
-	close(tcp.shutdown)
-	return errs.ErrorOrNil()
-}
-
-// Write converts the log record to bytes, via the Formatter, and outputs to the socket.
-// Called by dedicated target goroutine and will block until success or shutdown.
-func (tcp *Tcp) Write(rec *logr.LogRec) error {
-	_, stacktrace := tcp.IsLevelEnabled(rec.Level())
-
-	buf := rec.Logger().Logr().BorrowBuffer()
-	defer rec.Logger().Logr().ReleaseBuffer(buf)
-
-	buf, err := tcp.Formatter().Format(rec, stacktrace, buf)
-	if err != nil {
-		return err
-	}
-
-	try := 1
-	backoff := RetryBackoffMillis
-	for {
-		select {
-		case <-tcp.shutdown:
-			return err
-		default:
-		}
-
-		conn, err := tcp.getConn()
-		if err != nil {
-			Log(LvlTcpLogTarget, "failed getting connection", String("addy", tcp.addy), Err(err))
-			reporter := rec.Logger().Logr().ReportError
-			reporter(fmt.Errorf("log target %s connection error: %w", tcp.String(), err))
-			backoff = tcp.sleep(backoff)
-			continue
-		}
-
-		conn.SetWriteDeadline(time.Now().Add(time.Second * WriteTimeoutSecs))
-		_, err = buf.WriteTo(conn)
-		if err == nil {
-			return nil
-		}
-
-		Log(LvlTcpLogTarget, "write error", String("addy", tcp.addy), Err(err))
-		reporter := rec.Logger().Logr().ReportError
-		reporter(fmt.Errorf("log target %s write error: %w", tcp.String(), err))
-
-		_ = tcp.close()
-
-		backoff = tcp.sleep(backoff)
-		try++
-		Log(LvlTcpLogTarget, "retrying write", String("addy", tcp.addy), Int("try", try))
-	}
-}
-
-// monitor continuously tries to read from the connection to detect socket close.
-// This is needed because TCP target uses a write only socket and Linux systems
-// take a long time to detect a loss of connectivity on a socket when only writing;
-// the writes simply fail without an error returned.
-func monitor(conn net.Conn, done <-chan struct{}, logFunc LogFuncCustom) {
-	addy := conn.RemoteAddr().String()
-	defer logFunc(LvlTcpLogTarget, "monitor exiting", String("addy", addy))
-
-	buf := make([]byte, 1)
-	for {
-		logFunc(LvlTcpLogTarget, "monitor loop", String("addy", addy))
-
-		select {
-		case <-done:
-			return
-		case <-time.After(1 * time.Second):
-		}
-
-		err := conn.SetReadDeadline(time.Now().Add(time.Second * 30))
-		if err != nil {
-			continue
-		}
-
-		_, err = conn.Read(buf)
-
-		if errt, ok := err.(net.Error); ok && errt.Timeout() {
-			// read timeout is expected, keep looping.
-			continue
-		}
-
-		// Any other error closes the connection, forcing a reconnect.
-		logFunc(LvlTcpLogTarget, "monitor closing connection", Err(err))
-		conn.Close()
-		return
-	}
-}
-
-// String returns a string representation of this target.
-func (tcp *Tcp) String() string {
-	return fmt.Sprintf("TcpTarget[%s:%d]", tcp.params.IP, tcp.params.Port)
-}
-
-func (tcp *Tcp) sleep(backoff int64) int64 {
-	select {
-	case <-tcp.shutdown:
-	case <-time.After(time.Millisecond * time.Duration(backoff)):
-	}
-
-	nextBackoff := backoff + (backoff >> 1)
-	if nextBackoff > MaxRetryBackoffMillis {
-		nextBackoff = MaxRetryBackoffMillis
-	}
-	return nextBackoff
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/test-tls-client-cert.pem b/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/test-tls-client-cert.pem
deleted file mode 100644
index 6ce8d042..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/test-tls-client-cert.pem
+++ /dev/null
@@ -1,43 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDjzCCAnegAwIBAgIRAPYfRSwdzKopBKxYxKqslJUwDQYJKoZIhvcNAQELBQAw
-JzElMCMGA1UEAwwcTWF0dGVybW9zdCwgSW5jLiBJbnRlcm5hbCBDQTAeFw0xOTAz
-MjIwMDE0MTVaFw0yMjAzMDYwMDE0MTVaMDsxOTA3BgNVBAMTME1hdHRlcm1vc3Qs
-IEluYy4gSW50ZXJuYWwgSW50ZXJtZWRpYXRlIEF1dGhvcml0eTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMjliRdmvnNL4u/Jr/M2dPwQmTJXEBY/Vq9Q
-vAU52X3tRMCPxcaFz+x6ftuvdO2NdohXGAmtx9QU5LZcvFeTDpoVEBo9A+4jtLvD
-DZYaTNLpJmoSoJHaDbdWX+OAOqyDiWS741LuiMKWHhew9QOisat2ZINPxjmAd9wE
-xthTMgzsv7MUqnMer8U5OGQ0Qy7wAmNRc+2K3qPwkxe2RUvcte50DUFNgxEginsh
-vrkOXR383vUCZfu72qu8oggjiQpyTllu5je2Ap6JLjYLkEMiMqrYADuWor/ZHwa6
-WrFqVETxWfAV5u9Eh0wZM/KKYwRQuw9y+Nans77FmUl1tVWWNN8CAwEAAaOBoTCB
-njAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBQY4Uqswyr2hO/HetZt2RDxJdTIPjBi
-BgNVHSMEWzBZgBRFZXVg2Z5tNIsWeWjBLEy2yzKbMKErpCkwJzElMCMGA1UEAwwc
-TWF0dGVybW9zdCwgSW5jLiBJbnRlcm5hbCBDQYIUEifGUOM+bIFZo1tkjZB5YGBr
-0xEwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQAEdexL30Q0zBHmPAH8
-LhdK7dbzW1CmILbxRZlKAwRN+hKRXiMW3MHIkhNuoV9Aev602Q+ja4lWsRi/ktOL
-ni1FWx5gSScgdG8JGj47dOmoT3vXKX7+umiv4rQLPDl9/DKMuv204OYJq6VT+uNU
-6C6kL157jGJEO76H4fMZ8oYsD7Sq0zjiNKtuCYii0ngH3j3gB1jACLqRgveU7MdT
-pqOV2KfY31+h8VBtkUvljNztQ9xNY8Fjmt0SMf7E3FaUcaar3ZCr70G5aU3dKbe7
-47vGOBa5tCqw4YK0jgDKid3IJQul9a3J1mSsH8Wy3to9cAV4KGZBQLnzCX15a/+v
-3yVh
------END CERTIFICATE----- 
------BEGIN CERTIFICATE-----
-MIIDfjCCAmagAwIBAgIUEifGUOM+bIFZo1tkjZB5YGBr0xEwDQYJKoZIhvcNAQEL
-BQAwJzElMCMGA1UEAwwcTWF0dGVybW9zdCwgSW5jLiBJbnRlcm5hbCBDQTAeFw0x
-OTAzMjEyMTI4NDNaFw0yOTAzMTgyMTI4NDNaMCcxJTAjBgNVBAMMHE1hdHRlcm1v
-c3QsIEluYy4gSW50ZXJuYWwgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDH0Xq5rMBGpKOVWTpb5MnaJIWFP/vOtvEk+7hVrfOfe1/5x0Kk3UgAHj85
-otaEZD1Lhn/JLkEqCiE/UXMJFwJDlNcO4CkdKBSpYX4bKAqy5q/X3QwioMSNpJG1
-+YYrNGBH0sgKcKjyCaLhmqYLD0xZDVOmWIYBU9jUPyXw5U0tnsVrTqGMxVkm1xCY
-krCWN1ZoUrLvL0MCZc5qpxoPTopr9UO9cqSBSuy6BVWVuEWBZhpqHt+ul8VxhzzY
-q1k4l7r2qw+/wm1iJBedTeBVeWNag8JaVfLgu+/W7oJVlPO32Po7pnvHp8iJ3b4K
-zXyVHaTX4S6Em+6LV8855TYrShzlAgMBAAGjgaEwgZ4wHQYDVR0OBBYEFEVldWDZ
-nm00ixZ5aMEsTLbLMpswMGIGA1UdIwRbMFmAFEVldWDZnm00ixZ5aMEsTLbLMpsw
-oSukKTAnMSUwIwYDVQQDDBxNYXR0ZXJtb3N0LCBJbmMuIEludGVybmFsIENBghQS
-J8ZQ4z5sgVmjW2SNkHlgYGvTETAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjAN
-BgkqhkiG9w0BAQsFAAOCAQEAPiCWFmopyAkY2T3Zyo4yaRPhX1+VOTMKJtY6EUhq
-/GHz6kzEyvCUBf0N892cibGxekrEoItY9NqO6RQRfowg+Gn5kc13z4NyL2W8/eoT
-Xy0ZvfaQbU++fQ6pVtWtMblDMU9xiYd7/MDvJpO328l1Vhcdp8kEi+lCvpy0sCRc
-PxzPhbgCMAbZEGx+4TMQd4SZKzlRxW/2fflpReh6v1Dv0VDUSYQWwsUnaLpdKHfh
-a5k0vuySYcszE4YKlY0zakeFlJfp7fBp1xTwcdW8aTfw15EicPMwTc6xxA4JJUJx
-cddu817n1nayK5u6r9Qh1oIVkr0nC9YELMMy4dpPgJ88SA==
------END CERTIFICATE-----
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/testing.go b/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/testing.go
deleted file mode 100644
index 6b41a7e4..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/shared/mlog/testing.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package mlog
-
-import (
-	"io"
-	"strings"
-	"sync"
-	"testing"
-
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
-)
-
-// testingWriter is an io.Writer that writes through t.Log
-type testingWriter struct {
-	tb testing.TB
-}
-
-func (tw *testingWriter) Write(b []byte) (int, error) {
-	tw.tb.Log(strings.TrimSpace(string(b)))
-	return len(b), nil
-}
-
-// NewTestingLogger creates a Logger that proxies logs through a testing interface.
-// This allows tests that spin up App instances to avoid spewing logs unless the test fails or -verbose is specified.
-func NewTestingLogger(tb testing.TB, writer io.Writer) *Logger {
-	logWriter := &testingWriter{tb}
-	multiWriter := io.MultiWriter(logWriter, writer)
-	logWriterSync := zapcore.AddSync(multiWriter)
-
-	testingLogger := &Logger{
-		consoleLevel: zap.NewAtomicLevelAt(getZapLevel("debug")),
-		fileLevel:    zap.NewAtomicLevelAt(getZapLevel("info")),
-		logrLogger:   newLogr(),
-		mutex:        &sync.RWMutex{},
-	}
-
-	logWriterCore := zapcore.NewCore(makeEncoder(true, false), zapcore.Lock(logWriterSync), testingLogger.consoleLevel)
-
-	testingLogger.zap = zap.New(logWriterCore,
-		zap.AddCaller(),
-	)
-	return testingLogger
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/utils/jsonutils/json.go b/vendor/github.com/mattermost/mattermost-server/v5/utils/jsonutils/json.go
deleted file mode 100644
index 9d5e7872..00000000
--- a/vendor/github.com/mattermost/mattermost-server/v5/utils/jsonutils/json.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package jsonutils
-
-import (
-	"bytes"
-	"encoding/json"
-
-	"github.com/pkg/errors"
-)
-
-type HumanizedJSONError struct {
-	Err       error
-	Line      int
-	Character int
-}
-
-func (e *HumanizedJSONError) Error() string {
-	return e.Err.Error()
-}
-
-// HumanizeJSONError extracts error offsets and annotates the error with useful context
-func HumanizeJSONError(err error, data []byte) error {
-	if syntaxError, ok := err.(*json.SyntaxError); ok {
-		return NewHumanizedJSONError(syntaxError, data, syntaxError.Offset)
-	} else if unmarshalError, ok := err.(*json.UnmarshalTypeError); ok {
-		return NewHumanizedJSONError(unmarshalError, data, unmarshalError.Offset)
-	} else {
-		return err
-	}
-}
-
-func NewHumanizedJSONError(err error, data []byte, offset int64) *HumanizedJSONError {
-	if err == nil {
-		return nil
-	}
-
-	if offset < 0 || offset > int64(len(data)) {
-		return &HumanizedJSONError{
-			Err: errors.Wrapf(err, "invalid offset %d", offset),
-		}
-	}
-
-	lineSep := []byte{'\n'}
-
-	line := bytes.Count(data[:offset], lineSep) + 1
-	lastLineOffset := bytes.LastIndex(data[:offset], lineSep)
-	character := int(offset) - (lastLineOffset + 1) + 1
-
-	return &HumanizedJSONError{
-		Line:      line,
-		Character: character,
-		Err:       errors.Wrapf(err, "parsing error at line %d, character %d", line, character),
-	}
-}
diff --git a/vendor/github.com/olahol/melody/session.go b/vendor/github.com/olahol/melody/session.go
index 879a724d..ad79d54f 100644
--- a/vendor/github.com/olahol/melody/session.go
+++ b/vendor/github.com/olahol/melody/session.go
@@ -223,6 +223,15 @@ func (s *Session) MustGet(key string) interface{} {
 	panic("Key \"" + key + "\" does not exist")
 }
 
+// UnSet will delete the key and has no return value
+func (s *Session) UnSet(key string) {
+	s.rwmutex.Lock()
+	defer s.rwmutex.Unlock()
+	if s.Keys != nil {
+		delete(s.Keys, key)
+	}
+}
+
 // IsClosed returns the status of the connection.
 func (s *Session) IsClosed() bool {
 	return s.closed()
diff --git a/vendor/github.com/pelletier/go-toml/v2/README.md b/vendor/github.com/pelletier/go-toml/v2/README.md
index 9f8439cc..d53f4397 100644
--- a/vendor/github.com/pelletier/go-toml/v2/README.md
+++ b/vendor/github.com/pelletier/go-toml/v2/README.md
@@ -553,7 +553,7 @@ complete solutions exist out there.
 
 ## Versioning
 
-Go-toml follows [Semantic Versioning](http://semver.org/). The supported version
+Go-toml follows [Semantic Versioning](https://semver.org). The supported version
 of [TOML](https://github.com/toml-lang/toml) is indicated at the beginning of
 this document. The last two major versions of Go are supported
 (see [Go Release Policy](https://golang.org/doc/devel/release.html#policy)).
diff --git a/vendor/github.com/pelletier/go-toml/v2/ci.sh b/vendor/github.com/pelletier/go-toml/v2/ci.sh
index d916c5f2..05c76f29 100644
--- a/vendor/github.com/pelletier/go-toml/v2/ci.sh
+++ b/vendor/github.com/pelletier/go-toml/v2/ci.sh
@@ -77,7 +77,7 @@ cover() {
 
     pushd "$dir"
     go test -covermode=atomic  -coverpkg=./... -coverprofile=coverage.out.tmp ./...
-    cat coverage.out.tmp | grep -v testsuite | grep -v tomltestgen | grep -v gotoml-test-decoder > coverage.out
+    cat coverage.out.tmp | grep -v fuzz | grep -v testsuite | grep -v tomltestgen | grep -v gotoml-test-decoder > coverage.out
     go tool cover -func=coverage.out
     popd
 
diff --git a/vendor/github.com/pelletier/go-toml/v2/marshaler.go b/vendor/github.com/pelletier/go-toml/v2/marshaler.go
index 07aceb90..6ab1d823 100644
--- a/vendor/github.com/pelletier/go-toml/v2/marshaler.go
+++ b/vendor/github.com/pelletier/go-toml/v2/marshaler.go
@@ -357,9 +357,9 @@ func (enc *Encoder) encodeKv(b []byte, ctx encoderCtx, options valueOptions, v r
 
 	if !ctx.inline {
 		b = enc.encodeComment(ctx.indent, options.comment, b)
+		b = enc.indent(ctx.indent, b)
 	}
 
-	b = enc.indent(ctx.indent, b)
 	b = enc.encodeKey(b, ctx.key)
 	b = append(b, " = "...)
 
@@ -577,11 +577,23 @@ func (enc *Encoder) encodeKey(b []byte, k string) []byte {
 	}
 }
 
-func (enc *Encoder) encodeMap(b []byte, ctx encoderCtx, v reflect.Value) ([]byte, error) {
-	if v.Type().Key().Kind() != reflect.String {
-		return nil, fmt.Errorf("toml: type %s is not supported as a map key", v.Type().Key().Kind())
-	}
+func (enc *Encoder) keyToString(k reflect.Value) (string, error) {
+	keyType := k.Type()
+	switch {
+	case keyType.Kind() == reflect.String:
+		return k.String(), nil
 
+	case keyType.Implements(textMarshalerType):
+		keyB, err := k.Interface().(encoding.TextMarshaler).MarshalText()
+		if err != nil {
+			return "", fmt.Errorf("toml: error marshalling key %v from text: %w", k, err)
+		}
+		return string(keyB), nil
+	}
+	return "", fmt.Errorf("toml: type %s is not supported as a map key", keyType.Kind())
+}
+
+func (enc *Encoder) encodeMap(b []byte, ctx encoderCtx, v reflect.Value) ([]byte, error) {
 	var (
 		t                 table
 		emptyValueOptions valueOptions
@@ -589,13 +601,17 @@ func (enc *Encoder) encodeMap(b []byte, ctx encoderCtx, v reflect.Value) ([]byte
 
 	iter := v.MapRange()
 	for iter.Next() {
-		k := iter.Key().String()
 		v := iter.Value()
 
 		if isNil(v) {
 			continue
 		}
 
+		k, err := enc.keyToString(iter.Key())
+		if err != nil {
+			return nil, err
+		}
+
 		if willConvertToTableOrArrayTable(ctx, v) {
 			t.pushTable(k, v, emptyValueOptions)
 		} else {
diff --git a/vendor/github.com/pelletier/go-toml/v2/unmarshaler.go b/vendor/github.com/pelletier/go-toml/v2/unmarshaler.go
index 70f6ec57..39350343 100644
--- a/vendor/github.com/pelletier/go-toml/v2/unmarshaler.go
+++ b/vendor/github.com/pelletier/go-toml/v2/unmarshaler.go
@@ -60,7 +60,7 @@ func (d *Decoder) DisallowUnknownFields() *Decoder {
 // are ignored. See Decoder.DisallowUnknownFields() to change this behavior.
 //
 // When a TOML local date, time, or date-time is decoded into a time.Time, its
-// value is represented in time.Local timezone. Otherwise the approriate Local*
+// value is represented in time.Local timezone. Otherwise the appropriate Local*
 // structure is used. For time values, precision up to the nanosecond is
 // supported by truncating extra digits.
 //
@@ -417,7 +417,10 @@ func (d *decoder) handleKeyPart(key unstable.Iterator, v reflect.Value, nextFn h
 		vt := v.Type()
 
 		// Create the key for the map element. Convert to key type.
-		mk := reflect.ValueOf(string(key.Node().Data)).Convert(vt.Key())
+		mk, err := d.keyFromData(vt.Key(), key.Node().Data)
+		if err != nil {
+			return reflect.Value{}, err
+		}
 
 		// If the map does not exist, create it.
 		if v.IsNil() {
@@ -746,7 +749,7 @@ func (d *decoder) unmarshalInlineTable(itable *unstable.Node, v reflect.Value) e
 		}
 		return d.unmarshalInlineTable(itable, elem)
 	default:
-		return unstable.NewParserError(itable.Data, "cannot store inline table in Go type %s", v.Kind())
+		return unstable.NewParserError(d.p.Raw(itable.Raw), "cannot store inline table in Go type %s", v.Kind())
 	}
 
 	it := itable.Children()
@@ -887,6 +890,11 @@ func init() {
 }
 
 func (d *decoder) unmarshalInteger(value *unstable.Node, v reflect.Value) error {
+	kind := v.Kind()
+	if kind == reflect.Float32 || kind == reflect.Float64 {
+		return d.unmarshalFloat(value, v)
+	}
+
 	i, err := parseInteger(value.Data)
 	if err != nil {
 		return err
@@ -894,7 +902,7 @@ func (d *decoder) unmarshalInteger(value *unstable.Node, v reflect.Value) error
 
 	var r reflect.Value
 
-	switch v.Kind() {
+	switch kind {
 	case reflect.Int64:
 		v.SetInt(i)
 		return nil
@@ -1004,6 +1012,31 @@ func (d *decoder) handleKeyValueInner(key unstable.Iterator, value *unstable.Nod
 	return reflect.Value{}, d.handleValue(value, v)
 }
 
+func (d *decoder) keyFromData(keyType reflect.Type, data []byte) (reflect.Value, error) {
+	switch {
+	case stringType.AssignableTo(keyType):
+		return reflect.ValueOf(string(data)), nil
+
+	case stringType.ConvertibleTo(keyType):
+		return reflect.ValueOf(string(data)).Convert(keyType), nil
+
+	case keyType.Implements(textUnmarshalerType):
+		mk := reflect.New(keyType.Elem())
+		if err := mk.Interface().(encoding.TextUnmarshaler).UnmarshalText(data); err != nil {
+			return reflect.Value{}, fmt.Errorf("toml: error unmarshalling key type %s from text: %w", stringType, err)
+		}
+		return mk, nil
+
+	case reflect.PtrTo(keyType).Implements(textUnmarshalerType):
+		mk := reflect.New(keyType)
+		if err := mk.Interface().(encoding.TextUnmarshaler).UnmarshalText(data); err != nil {
+			return reflect.Value{}, fmt.Errorf("toml: error unmarshalling key type %s from text: %w", stringType, err)
+		}
+		return mk.Elem(), nil
+	}
+	return reflect.Value{}, fmt.Errorf("toml: cannot convert map key of type %s to expected type %s", stringType, keyType)
+}
+
 func (d *decoder) handleKeyValuePart(key unstable.Iterator, value *unstable.Node, v reflect.Value) (reflect.Value, error) {
 	// contains the replacement for v
 	var rv reflect.Value
@@ -1014,16 +1047,9 @@ func (d *decoder) handleKeyValuePart(key unstable.Iterator, value *unstable.Node
 	case reflect.Map:
 		vt := v.Type()
 
-		mk := reflect.ValueOf(string(key.Node().Data))
-		mkt := stringType
-
-		keyType := vt.Key()
-		if !mkt.AssignableTo(keyType) {
-			if !mkt.ConvertibleTo(keyType) {
-				return reflect.Value{}, fmt.Errorf("toml: cannot convert map key of type %s to expected type %s", mkt, keyType)
-			}
-
-			mk = mk.Convert(keyType)
+		mk, err := d.keyFromData(vt.Key(), key.Node().Data)
+		if err != nil {
+			return reflect.Value{}, err
 		}
 
 		// If the map does not exist, create it.
@@ -1034,15 +1060,9 @@ func (d *decoder) handleKeyValuePart(key unstable.Iterator, value *unstable.Node
 
 		mv := v.MapIndex(mk)
 		set := false
-		if !mv.IsValid() {
+		if !mv.IsValid() || key.IsLast() {
 			set = true
 			mv = reflect.New(v.Type().Elem()).Elem()
-		} else {
-			if key.IsLast() {
-				var x interface{}
-				mv = reflect.ValueOf(&x).Elem()
-				set = true
-			}
 		}
 
 		nv, err := d.handleKeyValueInner(key, value, mv)
@@ -1072,6 +1092,19 @@ func (d *decoder) handleKeyValuePart(key unstable.Iterator, value *unstable.Node
 		d.errorContext.Field = path
 
 		f := fieldByIndex(v, path)
+
+		if !f.CanSet() {
+			// If the field is not settable, need to take a slower path and make a copy of
+			// the struct itself to a new location.
+			nvp := reflect.New(v.Type())
+			nvp.Elem().Set(v)
+			v = nvp.Elem()
+			_, err := d.handleKeyValuePart(key, value, v)
+			if err != nil {
+				return reflect.Value{}, err
+			}
+			return nvp.Elem(), nil
+		}
 		x, err := d.handleKeyValueInner(key, value, f)
 		if err != nil {
 			return reflect.Value{}, err
diff --git a/vendor/github.com/pelletier/go-toml/v2/unstable/ast.go b/vendor/github.com/pelletier/go-toml/v2/unstable/ast.go
index b60d9bfd..f526bf2c 100644
--- a/vendor/github.com/pelletier/go-toml/v2/unstable/ast.go
+++ b/vendor/github.com/pelletier/go-toml/v2/unstable/ast.go
@@ -58,7 +58,7 @@ func (c *Iterator) Node() *Node {
 //   - Table and ArrayTable's children represent a dotted key (same as
 //     KeyValue, but without the first node being the value).
 //
-// When relevant, Raw describes the range of bytes this node is refering to in
+// When relevant, Raw describes the range of bytes this node is referring to in
 // the input document. Use Parser.Raw() to retrieve the actual bytes.
 type Node struct {
 	Kind Kind
diff --git a/vendor/github.com/pelletier/go-toml/v2/unstable/parser.go b/vendor/github.com/pelletier/go-toml/v2/unstable/parser.go
index 52db88e7..a8eb0529 100644
--- a/vendor/github.com/pelletier/go-toml/v2/unstable/parser.go
+++ b/vendor/github.com/pelletier/go-toml/v2/unstable/parser.go
@@ -49,8 +49,6 @@ func NewParserError(highlight []byte, format string, args ...interface{}) error
 // For performance reasons, go-toml doesn't make a copy of the input bytes to
 // the parser. Make sure to copy all the bytes you need to outlive the slice
 // given to the parser.
-//
-// The parser doesn't provide nodes for comments yet, nor for whitespace.
 type Parser struct {
 	data    []byte
 	builder builder
@@ -58,6 +56,8 @@ type Parser struct {
 	left    []byte
 	err     error
 	first   bool
+
+	KeepComments bool
 }
 
 // Data returns the slice provided to the last call to Reset.
@@ -132,16 +132,54 @@ func (p *Parser) NextExpression() bool {
 }
 
 // Expression returns a pointer to the node representing the last successfully
-// parsed expresion.
+// parsed expression.
 func (p *Parser) Expression() *Node {
 	return p.builder.NodeAt(p.ref)
 }
 
-// Error returns any error that has occured during parsing.
+// Error returns any error that has occurred during parsing.
 func (p *Parser) Error() error {
 	return p.err
 }
 
+// Position describes a position in the input.
+type Position struct {
+	// Number of bytes from the beginning of the input.
+	Offset int
+	// Line number, starting at 1.
+	Line int
+	// Column number, starting at 1.
+	Column int
+}
+
+// Shape describes the position of a range in the input.
+type Shape struct {
+	Start Position
+	End   Position
+}
+
+func (p *Parser) position(b []byte) Position {
+	offset := danger.SubsliceOffset(p.data, b)
+
+	lead := p.data[:offset]
+
+	return Position{
+		Offset: offset,
+		Line:   bytes.Count(lead, []byte{'\n'}) + 1,
+		Column: len(lead) - bytes.LastIndex(lead, []byte{'\n'}),
+	}
+}
+
+// Shape returns the shape of the given range in the input.  Will
+// panic if the range is not a subslice of the input.
+func (p *Parser) Shape(r Range) Shape {
+	raw := p.Raw(r)
+	return Shape{
+		Start: p.position(raw),
+		End:   p.position(raw[r.Length:]),
+	}
+}
+
 func (p *Parser) parseNewline(b []byte) ([]byte, error) {
 	if b[0] == '\n' {
 		return b[1:], nil
@@ -155,6 +193,19 @@ func (p *Parser) parseNewline(b []byte) ([]byte, error) {
 	return nil, NewParserError(b[0:1], "expected newline but got %#U", b[0])
 }
 
+func (p *Parser) parseComment(b []byte) (reference, []byte, error) {
+	ref := invalidReference
+	data, rest, err := scanComment(b)
+	if p.KeepComments && err == nil {
+		ref = p.builder.Push(Node{
+			Kind: Comment,
+			Raw:  p.Range(data),
+			Data: data,
+		})
+	}
+	return ref, rest, err
+}
+
 func (p *Parser) parseExpression(b []byte) (reference, []byte, error) {
 	// expression =  ws [ comment ]
 	// expression =/ ws keyval ws [ comment ]
@@ -168,7 +219,7 @@ func (p *Parser) parseExpression(b []byte) (reference, []byte, error) {
 	}
 
 	if b[0] == '#' {
-		_, rest, err := scanComment(b)
+		ref, rest, err := p.parseComment(b)
 		return ref, rest, err
 	}
 
@@ -190,7 +241,10 @@ func (p *Parser) parseExpression(b []byte) (reference, []byte, error) {
 	b = p.parseWhitespace(b)
 
 	if len(b) > 0 && b[0] == '#' {
-		_, rest, err := scanComment(b)
+		cref, rest, err := p.parseComment(b)
+		if cref != invalidReference {
+			p.builder.Chain(ref, cref)
+		}
 		return ref, rest, err
 	}
 
@@ -402,6 +456,7 @@ func (p *Parser) parseInlineTable(b []byte) (reference, []byte, error) {
 	// inline-table-keyvals = keyval [ inline-table-sep inline-table-keyvals ]
 	parent := p.builder.Push(Node{
 		Kind: InlineTable,
+		Raw:  p.Range(b[:1]),
 	})
 
 	first := true
@@ -470,17 +525,33 @@ func (p *Parser) parseValArray(b []byte) (reference, []byte, error) {
 		Kind: Array,
 	})
 
+	// First indicates whether the parser is looking for the first element
+	// (non-comment) of the array.
 	first := true
 
-	var lastChild reference
+	lastChild := invalidReference
+
+	addChild := func(valueRef reference) {
+		if lastChild == invalidReference {
+			p.builder.AttachChild(parent, valueRef)
+		} else {
+			p.builder.Chain(lastChild, valueRef)
+		}
+		lastChild = valueRef
+	}
 
 	var err error
 	for len(b) > 0 {
-		b, err = p.parseOptionalWhitespaceCommentNewline(b)
+		cref := invalidReference
+		cref, b, err = p.parseOptionalWhitespaceCommentNewline(b)
 		if err != nil {
 			return parent, nil, err
 		}
 
+		if cref != invalidReference {
+			addChild(cref)
+		}
+
 		if len(b) == 0 {
 			return parent, nil, NewParserError(arrayStart[:1], "array is incomplete")
 		}
@@ -495,10 +566,13 @@ func (p *Parser) parseValArray(b []byte) (reference, []byte, error) {
 			}
 			b = b[1:]
 
-			b, err = p.parseOptionalWhitespaceCommentNewline(b)
+			cref, b, err = p.parseOptionalWhitespaceCommentNewline(b)
 			if err != nil {
 				return parent, nil, err
 			}
+			if cref != invalidReference {
+				addChild(cref)
+			}
 		} else if !first {
 			return parent, nil, NewParserError(b[0:1], "array elements must be separated by commas")
 		}
@@ -514,17 +588,16 @@ func (p *Parser) parseValArray(b []byte) (reference, []byte, error) {
 			return parent, nil, err
 		}
 
-		if first {
-			p.builder.AttachChild(parent, valueRef)
-		} else {
-			p.builder.Chain(lastChild, valueRef)
-		}
-		lastChild = valueRef
+		addChild(valueRef)
 
-		b, err = p.parseOptionalWhitespaceCommentNewline(b)
+		cref, b, err = p.parseOptionalWhitespaceCommentNewline(b)
 		if err != nil {
 			return parent, nil, err
 		}
+		if cref != invalidReference {
+			addChild(cref)
+		}
+
 		first = false
 	}
 
@@ -533,15 +606,34 @@ func (p *Parser) parseValArray(b []byte) (reference, []byte, error) {
 	return parent, rest, err
 }
 
-func (p *Parser) parseOptionalWhitespaceCommentNewline(b []byte) ([]byte, error) {
+func (p *Parser) parseOptionalWhitespaceCommentNewline(b []byte) (reference, []byte, error) {
+	rootCommentRef := invalidReference
+	latestCommentRef := invalidReference
+
+	addComment := func(ref reference) {
+		if rootCommentRef == invalidReference {
+			rootCommentRef = ref
+		} else if latestCommentRef == invalidReference {
+			p.builder.AttachChild(rootCommentRef, ref)
+			latestCommentRef = ref
+		} else {
+			p.builder.Chain(latestCommentRef, ref)
+			latestCommentRef = ref
+		}
+	}
+
 	for len(b) > 0 {
 		var err error
 		b = p.parseWhitespace(b)
 
 		if len(b) > 0 && b[0] == '#' {
-			_, b, err = scanComment(b)
+			var ref reference
+			ref, b, err = p.parseComment(b)
 			if err != nil {
-				return nil, err
+				return invalidReference, nil, err
+			}
+			if ref != invalidReference {
+				addComment(ref)
 			}
 		}
 
@@ -552,14 +644,14 @@ func (p *Parser) parseOptionalWhitespaceCommentNewline(b []byte) ([]byte, error)
 		if b[0] == '\n' || b[0] == '\r' {
 			b, err = p.parseNewline(b)
 			if err != nil {
-				return nil, err
+				return invalidReference, nil, err
 			}
 		} else {
 			break
 		}
 	}
 
-	return b, nil
+	return rootCommentRef, b, nil
 }
 
 func (p *Parser) parseMultilineLiteralString(b []byte) ([]byte, []byte, []byte, error) {
diff --git a/vendor/github.com/pelletier/go-toml/v2/unstable/scanner.go b/vendor/github.com/pelletier/go-toml/v2/unstable/scanner.go
index af22ebbe..0512181d 100644
--- a/vendor/github.com/pelletier/go-toml/v2/unstable/scanner.go
+++ b/vendor/github.com/pelletier/go-toml/v2/unstable/scanner.go
@@ -151,7 +151,6 @@ func scanWhitespace(b []byte) ([]byte, []byte) {
 	return b, b[len(b):]
 }
 
-//nolint:unparam
 func scanComment(b []byte) ([]byte, []byte, error) {
 	// comment-start-symbol = %x23 ; #
 	// non-ascii = %x80-D7FF / %xE000-10FFFF
diff --git a/vendor/github.com/rs/xid/.golangci.yml b/vendor/github.com/rs/xid/.golangci.yml
new file mode 100644
index 00000000..7929600a
--- /dev/null
+++ b/vendor/github.com/rs/xid/.golangci.yml
@@ -0,0 +1,5 @@
+run:
+  tests: false
+
+output:
+  sort-results: true
diff --git a/vendor/github.com/rs/xid/README.md b/vendor/github.com/rs/xid/README.md
index 5bf462e8..974e67d2 100644
--- a/vendor/github.com/rs/xid/README.md
+++ b/vendor/github.com/rs/xid/README.md
@@ -70,6 +70,9 @@ References:
 - Ruby port by [Valar](https://github.com/valarpirai/): https://github.com/valarpirai/ruby_xid
 - Java port by [0xShamil](https://github.com/0xShamil/): https://github.com/0xShamil/java-xid
 - Dart port by [Peter Bwire](https://github.com/pitabwire): https://pub.dev/packages/xid
+- PostgreSQL port by [Rasmus Holm](https://github.com/crholm): https://github.com/modfin/pg-xid
+- Swift port by [Uditha Atukorala](https://github.com/uditha-atukorala): https://github.com/uditha-atukorala/swift-xid
+- C++ port by [Uditha Atukorala](https://github.com/uditha-atukorala): https://github.com/uditha-atukorala/libxid
 
 ## Install
 
diff --git a/vendor/github.com/rs/xid/id.go b/vendor/github.com/rs/xid/id.go
index 1f536b41..fcd7a041 100644
--- a/vendor/github.com/rs/xid/id.go
+++ b/vendor/github.com/rs/xid/id.go
@@ -43,7 +43,7 @@ package xid
 
 import (
 	"bytes"
-	"crypto/md5"
+	"crypto/sha256"
 	"crypto/rand"
 	"database/sql/driver"
 	"encoding/binary"
@@ -72,13 +72,11 @@ const (
 )
 
 var (
-	// objectIDCounter is atomically incremented when generating a new ObjectId
-	// using NewObjectId() function. It's used as a counter part of an id.
-	// This id is initialized with a random value.
+	// objectIDCounter is atomically incremented when generating a new ObjectId. It's
+	// used as the counter part of an id. This id is initialized with a random value.
 	objectIDCounter = randInt()
 
-	// machineId stores machine id generated once and used in subsequent calls
-	// to NewObjectId function.
+	// machineID is generated once and used in subsequent calls to the New* functions.
 	machineID = readMachineID()
 
 	// pid stores the current process id
@@ -107,9 +105,9 @@ func init() {
 	}
 }
 
-// readMachineId generates machine id and puts it into the machineId global
-// variable. If this function fails to get the hostname, it will cause
-// a runtime error.
+// readMachineID generates a machine ID, derived from a platform-specific machine ID
+// value, or else the machine's hostname, or else a randomly-generated number.
+// It panics if all of these methods fail.
 func readMachineID() []byte {
 	id := make([]byte, 3)
 	hid, err := readPlatformMachineID()
@@ -117,7 +115,7 @@ func readMachineID() []byte {
 		hid, err = os.Hostname()
 	}
 	if err == nil && len(hid) != 0 {
-		hw := md5.New()
+		hw := sha256.New()
 		hw.Write([]byte(hid))
 		copy(id, hw.Sum(nil))
 	} else {
@@ -148,7 +146,7 @@ func NewWithTime(t time.Time) ID {
 	var id ID
 	// Timestamp, 4 bytes, big endian
 	binary.BigEndian.PutUint32(id[:], uint32(t.Unix()))
-	// Machine, first 3 bytes of md5(hostname)
+	// Machine ID, 3 bytes
 	id[4] = machineID[0]
 	id[5] = machineID[1]
 	id[6] = machineID[2]
@@ -239,6 +237,7 @@ func (id *ID) UnmarshalText(text []byte) error {
 		}
 	}
 	if !decode(id, text) {
+		*id = nilID
 		return ErrInvalidID
 	}
 	return nil
@@ -264,6 +263,10 @@ func decode(id *ID, src []byte) bool {
 	_ = id[11]
 
 	id[11] = dec[src[17]]<<6 | dec[src[18]]<<1 | dec[src[19]]>>4
+	// check the last byte
+	if encoding[(id[11]<<4)&0x1F] != src[19] {
+		return false
+	}
 	id[10] = dec[src[16]]<<3 | dec[src[17]]>>2
 	id[9] = dec[src[14]]<<5 | dec[src[15]]
 	id[8] = dec[src[12]]<<7 | dec[src[13]]<<2 | dec[src[14]]>>3
@@ -275,16 +278,7 @@ func decode(id *ID, src []byte) bool {
 	id[2] = dec[src[3]]<<4 | dec[src[4]]>>1
 	id[1] = dec[src[1]]<<6 | dec[src[2]]<<1 | dec[src[3]]>>4
 	id[0] = dec[src[0]]<<3 | dec[src[1]]>>2
-
-	// Validate that there are no discarer bits (padding) in src that would
-	// cause the string-encoded id not to equal src.
-	var check [4]byte
-
-	check[3] = encoding[(id[11]<<4)&0x1F]
-	check[2] = encoding[(id[11]>>1)&0x1F]
-	check[1] = encoding[(id[11]>>6)&0x1F|(id[10]<<2)&0x1F]
-	check[0] = encoding[id[10]>>3]
-	return bytes.Equal([]byte(src[16:20]), check[:])
+	return true
 }
 
 // Time returns the timestamp part of the id.
@@ -344,6 +338,11 @@ func (id ID) IsNil() bool {
 	return id == nilID
 }
 
+// Alias of IsNil
+func (id ID) IsZero() bool {
+	return id.IsNil()
+}
+
 // NilID returns a zero value for `xid.ID`.
 func NilID() ID {
 	return nilID
diff --git a/vendor/github.com/sirupsen/logrus/README.md b/vendor/github.com/sirupsen/logrus/README.md
index b042c896..d1d4a85f 100644
--- a/vendor/github.com/sirupsen/logrus/README.md
+++ b/vendor/github.com/sirupsen/logrus/README.md
@@ -9,7 +9,7 @@ the last thing you want from your Logging library (again...).
 
 This does not mean Logrus is dead. Logrus will continue to be maintained for
 security, (backwards compatible) bug fixes, and performance (where we are
-limited by the interface). 
+limited by the interface).
 
 I believe Logrus' biggest contribution is to have played a part in today's
 widespread use of structured logging in Golang. There doesn't seem to be a
@@ -43,7 +43,7 @@ plain text):
 With `log.SetFormatter(&log.JSONFormatter{})`, for easy parsing by logstash
 or Splunk:
 
-```json
+```text
 {"animal":"walrus","level":"info","msg":"A group of walrus emerges from the
 ocean","size":10,"time":"2014-03-10 19:57:38.562264131 -0400 EDT"}
 
@@ -99,7 +99,7 @@ time="2015-03-26T01:27:38-04:00" level=fatal method=github.com/sirupsen/arcticcr
 ```
 Note that this does add measurable overhead - the cost will depend on the version of Go, but is
 between 20 and 40% in recent tests with 1.6 and 1.7.  You can validate this in your
-environment via benchmarks: 
+environment via benchmarks:
 ```
 go test -bench=.*CallerTracing
 ```
@@ -317,6 +317,8 @@ log.SetLevel(log.InfoLevel)
 It may be useful to set `log.Level = logrus.DebugLevel` in a debug or verbose
 environment if your application has that.
 
+Note: If you want different log levels for global (`log.SetLevel(...)`) and syslog logging, please check the [syslog hook README](hooks/syslog/README.md#different-log-levels-for-local-and-remote-logging).
+
 #### Entries
 
 Besides the fields added with `WithField` or `WithFields` some fields are
diff --git a/vendor/github.com/sirupsen/logrus/writer.go b/vendor/github.com/sirupsen/logrus/writer.go
index 72e8e3a1..074fd4b8 100644
--- a/vendor/github.com/sirupsen/logrus/writer.go
+++ b/vendor/github.com/sirupsen/logrus/writer.go
@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"io"
 	"runtime"
+	"strings"
 )
 
 // Writer at INFO level. See WriterLevel for details.
@@ -20,15 +21,18 @@ func (logger *Logger) WriterLevel(level Level) *io.PipeWriter {
 	return NewEntry(logger).WriterLevel(level)
 }
 
+// Writer returns an io.Writer that writes to the logger at the info log level
 func (entry *Entry) Writer() *io.PipeWriter {
 	return entry.WriterLevel(InfoLevel)
 }
 
+// WriterLevel returns an io.Writer that writes to the logger at the given log level
 func (entry *Entry) WriterLevel(level Level) *io.PipeWriter {
 	reader, writer := io.Pipe()
 
 	var printFunc func(args ...interface{})
 
+	// Determine which log function to use based on the specified log level
 	switch level {
 	case TraceLevel:
 		printFunc = entry.Trace
@@ -48,23 +52,51 @@ func (entry *Entry) WriterLevel(level Level) *io.PipeWriter {
 		printFunc = entry.Print
 	}
 
+	// Start a new goroutine to scan the input and write it to the logger using the specified print function.
+	// It splits the input into chunks of up to 64KB to avoid buffer overflows.
 	go entry.writerScanner(reader, printFunc)
+
+	// Set a finalizer function to close the writer when it is garbage collected
 	runtime.SetFinalizer(writer, writerFinalizer)
 
 	return writer
 }
 
+// writerScanner scans the input from the reader and writes it to the logger
 func (entry *Entry) writerScanner(reader *io.PipeReader, printFunc func(args ...interface{})) {
 	scanner := bufio.NewScanner(reader)
-	for scanner.Scan() {
-		printFunc(scanner.Text())
+
+	// Set the buffer size to the maximum token size to avoid buffer overflows
+	scanner.Buffer(make([]byte, bufio.MaxScanTokenSize), bufio.MaxScanTokenSize)
+
+	// Define a split function to split the input into chunks of up to 64KB
+	chunkSize := bufio.MaxScanTokenSize // 64KB
+	splitFunc := func(data []byte, atEOF bool) (int, []byte, error) {
+		if len(data) >= chunkSize {
+			return chunkSize, data[:chunkSize], nil
+		}
+
+		return bufio.ScanLines(data, atEOF)
 	}
+
+	// Use the custom split function to split the input
+	scanner.Split(splitFunc)
+
+	// Scan the input and write it to the logger using the specified print function
+	for scanner.Scan() {
+		printFunc(strings.TrimRight(scanner.Text(), "\r\n"))
+	}
+
+	// If there was an error while scanning the input, log an error
 	if err := scanner.Err(); err != nil {
 		entry.Errorf("Error while reading from Writer: %s", err)
 	}
+
+	// Close the reader when we are done
 	reader.Close()
 }
 
+// WriterFinalizer is a finalizer function that closes then given writer when it is garbage collected
 func writerFinalizer(writer *io.PipeWriter) {
 	writer.Close()
 }
diff --git a/vendor/github.com/slack-go/slack/block.go b/vendor/github.com/slack-go/slack/block.go
index 240f5527..18222bd2 100644
--- a/vendor/github.com/slack-go/slack/block.go
+++ b/vendor/github.com/slack-go/slack/block.go
@@ -50,6 +50,7 @@ type BlockAction struct {
 	SelectedConversations []string            `json:"selected_conversations"`
 	SelectedDate          string              `json:"selected_date"`
 	SelectedTime          string              `json:"selected_time"`
+	SelectedDateTime      int64               `json:"selected_date_time"`
 	InitialOption         OptionBlockObject   `json:"initial_option"`
 	InitialUser           string              `json:"initial_user"`
 	InitialChannel        string              `json:"initial_channel"`
diff --git a/vendor/github.com/slack-go/slack/block_conv.go b/vendor/github.com/slack-go/slack/block_conv.go
index 555e4811..4ab58de3 100644
--- a/vendor/github.com/slack-go/slack/block_conv.go
+++ b/vendor/github.com/slack-go/slack/block_conv.go
@@ -110,6 +110,8 @@ func (b *InputBlock) UnmarshalJSON(data []byte) error {
 		e = &DatePickerBlockElement{}
 	case "timepicker":
 		e = &TimePickerBlockElement{}
+	case "datetimepicker":
+		e = &DateTimePickerBlockElement{}
 	case "plain_text_input":
 		e = &PlainTextInputBlockElement{}
 	case "email_text_input":
@@ -190,6 +192,8 @@ func (b *BlockElements) UnmarshalJSON(data []byte) error {
 			blockElement = &DatePickerBlockElement{}
 		case "timepicker":
 			blockElement = &TimePickerBlockElement{}
+		case "datetimepicker":
+			blockElement = &DateTimePickerBlockElement{}
 		case "plain_text_input":
 			blockElement = &PlainTextInputBlockElement{}
 		case "email_text_input":
@@ -233,6 +237,7 @@ func (a *Accessory) MarshalJSON() ([]byte, error) {
 
 // UnmarshalJSON implements the Unmarshaller interface for Accessory, so that any JSON
 // unmarshalling is delegated and proper type determination can be made before unmarshal
+// Note: datetimepicker is not supported in Accessory
 func (a *Accessory) UnmarshalJSON(data []byte) error {
 	var r json.RawMessage
 
diff --git a/vendor/github.com/slack-go/slack/block_element.go b/vendor/github.com/slack-go/slack/block_element.go
index aba29c6b..a70d8f2d 100644
--- a/vendor/github.com/slack-go/slack/block_element.go
+++ b/vendor/github.com/slack-go/slack/block_element.go
@@ -9,6 +9,7 @@ const (
 	METOverflow       MessageElementType = "overflow"
 	METDatepicker     MessageElementType = "datepicker"
 	METTimepicker     MessageElementType = "timepicker"
+	METDatetimepicker MessageElementType = "datetimepicker"
 	METPlainTextInput MessageElementType = "plain_text_input"
 	METRadioButtons   MessageElementType = "radio_buttons"
 	METEmailTextInput MessageElementType = "email_text_input"
@@ -392,6 +393,29 @@ func NewTimePickerBlockElement(actionID string) *TimePickerBlockElement {
 	}
 }
 
+// DateTimePickerBlockElement defines an element that allows the selection of both
+// a date and a time of day formatted as a UNIX timestamp.
+// More Information: https://api.slack.com/reference/messaging/block-elements#datetimepicker
+type DateTimePickerBlockElement struct {
+	Type            MessageElementType       `json:"type"`
+	ActionID        string                   `json:"action_id,omitempty"`
+	InitialDateTime int64                    `json:"initial_date_time,omitempty"`
+	Confirm         *ConfirmationBlockObject `json:"confirm,omitempty"`
+}
+
+// ElementType returns the type of the Element
+func (s DateTimePickerBlockElement) ElementType() MessageElementType {
+	return s.Type
+}
+
+// NewDatePickerBlockElement returns an instance of a datetime picker element
+func NewDateTimePickerBlockElement(actionID string) *DateTimePickerBlockElement {
+	return &DateTimePickerBlockElement{
+		Type:     METDatetimepicker,
+		ActionID: actionID,
+	}
+}
+
 // EmailTextInputBlockElement creates a field where a user can enter email
 // data.
 // email-text-input elements are currently only available in modals.
diff --git a/vendor/github.com/slack-go/slack/block_rich_text.go b/vendor/github.com/slack-go/slack/block_rich_text.go
index 555a6198..01e5cdb9 100644
--- a/vendor/github.com/slack-go/slack/block_rich_text.go
+++ b/vendor/github.com/slack-go/slack/block_rich_text.go
@@ -294,7 +294,7 @@ func NewRichTextSectionLinkElement(url, text string, style *RichTextSectionTextS
 type RichTextSectionTeamElement struct {
 	Type   RichTextSectionElementType `json:"type"`
 	TeamID string                     `json:"team_id"`
-	Style  *RichTextSectionTextStyle  `json:"style.omitempty"`
+	Style  *RichTextSectionTextStyle  `json:"style,omitempty"`
 }
 
 func (r RichTextSectionTeamElement) RichTextSectionElementType() RichTextSectionElementType {
diff --git a/vendor/github.com/slack-go/slack/messages.go b/vendor/github.com/slack-go/slack/messages.go
index 33340456..13a1ede9 100644
--- a/vendor/github.com/slack-go/slack/messages.go
+++ b/vendor/github.com/slack-go/slack/messages.go
@@ -100,10 +100,11 @@ type Msg struct {
 	Members []string `json:"members,omitempty"`
 
 	// channels.replies, groups.replies, im.replies, mpim.replies
-	ReplyCount   int     `json:"reply_count,omitempty"`
-	Replies      []Reply `json:"replies,omitempty"`
-	ParentUserId string  `json:"parent_user_id,omitempty"`
-	LatestReply  string  `json:"latest_reply,omitempty"`
+	ReplyCount   int      `json:"reply_count,omitempty"`
+	ReplyUsers   []string `json:"reply_users,omitempty"`
+	Replies      []Reply  `json:"replies,omitempty"`
+	ParentUserId string   `json:"parent_user_id,omitempty"`
+	LatestReply  string   `json:"latest_reply,omitempty"`
 
 	// file_share, file_comment, file_mention
 	Files []File `json:"files,omitempty"`
diff --git a/vendor/github.com/slack-go/slack/users.go b/vendor/github.com/slack-go/slack/users.go
index 55f42118..a3b4c066 100644
--- a/vendor/github.com/slack-go/slack/users.go
+++ b/vendor/github.com/slack-go/slack/users.go
@@ -130,6 +130,7 @@ type User struct {
 	IsAppUser         bool           `json:"is_app_user"`
 	IsInvitedUser     bool           `json:"is_invited_user"`
 	Has2FA            bool           `json:"has_2fa"`
+	TwoFactorType     *string        `json:"two_factor_type"`
 	HasFiles          bool           `json:"has_files"`
 	Presence          string         `json:"presence"`
 	Locale            string         `json:"locale"`
diff --git a/vendor/github.com/spf13/afero/afero.go b/vendor/github.com/spf13/afero/afero.go
index 199480cd..39f65852 100644
--- a/vendor/github.com/spf13/afero/afero.go
+++ b/vendor/github.com/spf13/afero/afero.go
@@ -97,7 +97,7 @@ type Fs interface {
 	// Chown changes the uid and gid of the named file.
 	Chown(name string, uid, gid int) error
 
-	//Chtimes changes the access and modification times of the named file
+	// Chtimes changes the access and modification times of the named file
 	Chtimes(name string, atime time.Time, mtime time.Time) error
 }
 
diff --git a/vendor/github.com/spf13/afero/basepath.go b/vendor/github.com/spf13/afero/basepath.go
index 70a1d916..2e72793a 100644
--- a/vendor/github.com/spf13/afero/basepath.go
+++ b/vendor/github.com/spf13/afero/basepath.go
@@ -40,7 +40,6 @@ func (f *BasePathFile) Name() string {
 func (f *BasePathFile) ReadDir(n int) ([]fs.DirEntry, error) {
 	if rdf, ok := f.File.(fs.ReadDirFile); ok {
 		return rdf.ReadDir(n)
-
 	}
 	return readDirFile{f.File}.ReadDir(n)
 }
diff --git a/vendor/github.com/spf13/afero/copyOnWriteFs.go b/vendor/github.com/spf13/afero/copyOnWriteFs.go
index 6ff8f309..184d6dd7 100644
--- a/vendor/github.com/spf13/afero/copyOnWriteFs.go
+++ b/vendor/github.com/spf13/afero/copyOnWriteFs.go
@@ -223,7 +223,7 @@ func (u *CopyOnWriteFs) OpenFile(name string, flag int, perm os.FileMode) (File,
 			return nil, err
 		}
 		if isaDir {
-			if err = u.layer.MkdirAll(dir, 0777); err != nil {
+			if err = u.layer.MkdirAll(dir, 0o777); err != nil {
 				return nil, err
 			}
 			return u.layer.OpenFile(name, flag, perm)
@@ -247,8 +247,9 @@ func (u *CopyOnWriteFs) OpenFile(name string, flag int, perm os.FileMode) (File,
 
 // This function handles the 9 different possibilities caused
 // by the union which are the intersection of the following...
-//  layer: doesn't exist, exists as a file, and exists as a directory
-//  base:  doesn't exist, exists as a file, and exists as a directory
+//
+//	layer: doesn't exist, exists as a file, and exists as a directory
+//	base:  doesn't exist, exists as a file, and exists as a directory
 func (u *CopyOnWriteFs) Open(name string) (File, error) {
 	// Since the overlay overrides the base we check that first
 	b, err := u.isBaseFile(name)
@@ -322,5 +323,5 @@ func (u *CopyOnWriteFs) MkdirAll(name string, perm os.FileMode) error {
 }
 
 func (u *CopyOnWriteFs) Create(name string) (File, error) {
-	return u.OpenFile(name, os.O_CREATE|os.O_TRUNC|os.O_RDWR, 0666)
+	return u.OpenFile(name, os.O_CREATE|os.O_TRUNC|os.O_RDWR, 0o666)
 }
diff --git a/vendor/github.com/spf13/afero/ioutil.go b/vendor/github.com/spf13/afero/ioutil.go
index 386c9cdc..fa6abe1e 100644
--- a/vendor/github.com/spf13/afero/ioutil.go
+++ b/vendor/github.com/spf13/afero/ioutil.go
@@ -141,8 +141,10 @@ func WriteFile(fs Fs, filename string, data []byte, perm os.FileMode) error {
 // We generate random temporary file names so that there's a good
 // chance the file doesn't exist yet - keeps the number of tries in
 // TempFile to a minimum.
-var randNum uint32
-var randmu sync.Mutex
+var (
+	randNum uint32
+	randmu  sync.Mutex
+)
 
 func reseed() uint32 {
 	return uint32(time.Now().UnixNano() + int64(os.Getpid()))
@@ -190,7 +192,7 @@ func TempFile(fs Fs, dir, pattern string) (f File, err error) {
 	nconflict := 0
 	for i := 0; i < 10000; i++ {
 		name := filepath.Join(dir, prefix+nextRandom()+suffix)
-		f, err = fs.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600)
+		f, err = fs.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0o600)
 		if os.IsExist(err) {
 			if nconflict++; nconflict > 10 {
 				randmu.Lock()
@@ -214,6 +216,7 @@ func TempFile(fs Fs, dir, pattern string) (f File, err error) {
 func (a Afero) TempDir(dir, prefix string) (name string, err error) {
 	return TempDir(a.Fs, dir, prefix)
 }
+
 func TempDir(fs Fs, dir, prefix string) (name string, err error) {
 	if dir == "" {
 		dir = os.TempDir()
@@ -222,7 +225,7 @@ func TempDir(fs Fs, dir, prefix string) (name string, err error) {
 	nconflict := 0
 	for i := 0; i < 10000; i++ {
 		try := filepath.Join(dir, prefix+nextRandom())
-		err = fs.Mkdir(try, 0700)
+		err = fs.Mkdir(try, 0o700)
 		if os.IsExist(err) {
 			if nconflict++; nconflict > 10 {
 				randmu.Lock()
diff --git a/vendor/github.com/spf13/afero/mem/file.go b/vendor/github.com/spf13/afero/mem/file.go
index 3cf4693b..62fe4498 100644
--- a/vendor/github.com/spf13/afero/mem/file.go
+++ b/vendor/github.com/spf13/afero/mem/file.go
@@ -245,7 +245,7 @@ func (f *File) Truncate(size int64) error {
 	defer f.fileData.Unlock()
 	if size > int64(len(f.fileData.data)) {
 		diff := size - int64(len(f.fileData.data))
-		f.fileData.data = append(f.fileData.data, bytes.Repeat([]byte{00}, int(diff))...)
+		f.fileData.data = append(f.fileData.data, bytes.Repeat([]byte{0o0}, int(diff))...)
 	} else {
 		f.fileData.data = f.fileData.data[0:size]
 	}
@@ -285,7 +285,7 @@ func (f *File) Write(b []byte) (n int, err error) {
 		tail = f.fileData.data[n+int(cur):]
 	}
 	if diff > 0 {
-		f.fileData.data = append(f.fileData.data, append(bytes.Repeat([]byte{00}, int(diff)), b...)...)
+		f.fileData.data = append(f.fileData.data, append(bytes.Repeat([]byte{0o0}, int(diff)), b...)...)
 		f.fileData.data = append(f.fileData.data, tail...)
 	} else {
 		f.fileData.data = append(f.fileData.data[:cur], b...)
@@ -321,16 +321,19 @@ func (s *FileInfo) Name() string {
 	s.Unlock()
 	return name
 }
+
 func (s *FileInfo) Mode() os.FileMode {
 	s.Lock()
 	defer s.Unlock()
 	return s.mode
 }
+
 func (s *FileInfo) ModTime() time.Time {
 	s.Lock()
 	defer s.Unlock()
 	return s.modtime
 }
+
 func (s *FileInfo) IsDir() bool {
 	s.Lock()
 	defer s.Unlock()
diff --git a/vendor/github.com/spf13/afero/memmap.go b/vendor/github.com/spf13/afero/memmap.go
index d06975e7..e6b7d70b 100644
--- a/vendor/github.com/spf13/afero/memmap.go
+++ b/vendor/github.com/spf13/afero/memmap.go
@@ -15,6 +15,7 @@ package afero
 
 import (
 	"fmt"
+	"io"
 	"log"
 	"os"
 	"path/filepath"
@@ -43,7 +44,7 @@ func (m *MemMapFs) getData() map[string]*mem.FileData {
 		// Root should always exist, right?
 		// TODO: what about windows?
 		root := mem.CreateDir(FilePathSeparator)
-		mem.SetMode(root, os.ModeDir|0755)
+		mem.SetMode(root, os.ModeDir|0o755)
 		m.data[FilePathSeparator] = root
 	})
 	return m.data
@@ -96,12 +97,12 @@ func (m *MemMapFs) registerWithParent(f *mem.FileData, perm os.FileMode) {
 		pdir := filepath.Dir(filepath.Clean(f.Name()))
 		err := m.lockfreeMkdir(pdir, perm)
 		if err != nil {
-			//log.Println("Mkdir error:", err)
+			// log.Println("Mkdir error:", err)
 			return
 		}
 		parent, err = m.lockfreeOpen(pdir)
 		if err != nil {
-			//log.Println("Open after Mkdir error:", err)
+			// log.Println("Open after Mkdir error:", err)
 			return
 		}
 	}
@@ -237,7 +238,7 @@ func (m *MemMapFs) OpenFile(name string, flag int, perm os.FileMode) (File, erro
 		file = mem.NewReadOnlyFileHandle(file.(*mem.File).Data())
 	}
 	if flag&os.O_APPEND > 0 {
-		_, err = file.Seek(0, os.SEEK_END)
+		_, err = file.Seek(0, io.SeekEnd)
 		if err != nil {
 			file.Close()
 			return nil, err
@@ -319,6 +320,18 @@ func (m *MemMapFs) Rename(oldname, newname string) error {
 	} else {
 		return &os.PathError{Op: "rename", Path: oldname, Err: ErrFileNotFound}
 	}
+
+	for p, fileData := range m.getData() {
+		if strings.HasPrefix(p, oldname+FilePathSeparator) {
+			m.mu.RUnlock()
+			m.mu.Lock()
+			delete(m.getData(), p)
+			p := strings.Replace(p, oldname, newname, 1)
+			m.getData()[p] = fileData
+			m.mu.Unlock()
+			m.mu.RLock()
+		}
+	}
 	return nil
 }
 
diff --git a/vendor/github.com/spf13/afero/regexpfs.go b/vendor/github.com/spf13/afero/regexpfs.go
index ac359c62..218f3b23 100644
--- a/vendor/github.com/spf13/afero/regexpfs.go
+++ b/vendor/github.com/spf13/afero/regexpfs.go
@@ -10,7 +10,6 @@ import (
 // The RegexpFs filters files (not directories) by regular expression. Only
 // files matching the given regexp will be allowed, all others get a ENOENT error (
 // "No such file or directory").
-//
 type RegexpFs struct {
 	re     *regexp.Regexp
 	source Fs
diff --git a/vendor/github.com/spf13/afero/symlink.go b/vendor/github.com/spf13/afero/symlink.go
index d1c6ea53..aa6ae125 100644
--- a/vendor/github.com/spf13/afero/symlink.go
+++ b/vendor/github.com/spf13/afero/symlink.go
@@ -21,9 +21,9 @@ import (
 // filesystems saying so.
 // It indicates support for 3 symlink related interfaces that implement the
 // behaviors of the os methods:
-//    - Lstat
-//    - Symlink, and
-//    - Readlink
+//   - Lstat
+//   - Symlink, and
+//   - Readlink
 type Symlinker interface {
 	Lstater
 	Linker
diff --git a/vendor/github.com/spf13/afero/unionFile.go b/vendor/github.com/spf13/afero/unionFile.go
index 333d367f..62dd6c93 100644
--- a/vendor/github.com/spf13/afero/unionFile.go
+++ b/vendor/github.com/spf13/afero/unionFile.go
@@ -47,7 +47,7 @@ func (f *UnionFile) Read(s []byte) (int, error) {
 		if (err == nil || err == io.EOF) && f.Base != nil {
 			// advance the file position also in the base file, the next
 			// call may be a write at this position (or a seek with SEEK_CUR)
-			if _, seekErr := f.Base.Seek(int64(n), os.SEEK_CUR); seekErr != nil {
+			if _, seekErr := f.Base.Seek(int64(n), io.SeekCurrent); seekErr != nil {
 				// only overwrite err in case the seek fails: we need to
 				// report an eventual io.EOF to the caller
 				err = seekErr
@@ -130,7 +130,7 @@ func (f *UnionFile) Name() string {
 type DirsMerger func(lofi, bofi []os.FileInfo) ([]os.FileInfo, error)
 
 var defaultUnionMergeDirsFn = func(lofi, bofi []os.FileInfo) ([]os.FileInfo, error) {
-	var files = make(map[string]os.FileInfo)
+	files := make(map[string]os.FileInfo)
 
 	for _, fi := range lofi {
 		files[fi.Name()] = fi
@@ -151,7 +151,6 @@ var defaultUnionMergeDirsFn = func(lofi, bofi []os.FileInfo) ([]os.FileInfo, err
 	}
 
 	return rfi, nil
-
 }
 
 // Readdir will weave the two directories together and
@@ -275,7 +274,7 @@ func copyFile(base Fs, layer Fs, name string, bfh File) error {
 		return err
 	}
 	if !exists {
-		err = layer.MkdirAll(filepath.Dir(name), 0777) // FIXME?
+		err = layer.MkdirAll(filepath.Dir(name), 0o777) // FIXME?
 		if err != nil {
 			return err
 		}
diff --git a/vendor/github.com/spf13/afero/util.go b/vendor/github.com/spf13/afero/util.go
index cb7de23f..9e4cba27 100644
--- a/vendor/github.com/spf13/afero/util.go
+++ b/vendor/github.com/spf13/afero/util.go
@@ -43,7 +43,7 @@ func WriteReader(fs Fs, path string, r io.Reader) (err error) {
 	ospath := filepath.FromSlash(dir)
 
 	if ospath != "" {
-		err = fs.MkdirAll(ospath, 0777) // rwx, rw, r
+		err = fs.MkdirAll(ospath, 0o777) // rwx, rw, r
 		if err != nil {
 			if err != os.ErrExist {
 				return err
@@ -71,7 +71,7 @@ func SafeWriteReader(fs Fs, path string, r io.Reader) (err error) {
 	ospath := filepath.FromSlash(dir)
 
 	if ospath != "" {
-		err = fs.MkdirAll(ospath, 0777) // rwx, rw, r
+		err = fs.MkdirAll(ospath, 0o777) // rwx, rw, r
 		if err != nil {
 			return
 		}
@@ -124,7 +124,7 @@ func GetTempDir(fs Fs, subPath string) string {
 			return addSlash(dir)
 		}
 
-		err := fs.MkdirAll(dir, 0777)
+		err := fs.MkdirAll(dir, 0o777)
 		if err != nil {
 			panic(err)
 		}
@@ -197,7 +197,6 @@ func FileContainsAnyBytes(fs Fs, filename string, subslices [][]byte) (bool, err
 
 // readerContains reports whether any of the subslices is within r.
 func readerContainsAny(r io.Reader, subslices ...[]byte) bool {
-
 	if r == nil || len(subslices) == 0 {
 		return false
 	}
diff --git a/vendor/github.com/spf13/cast/README.md b/vendor/github.com/spf13/cast/README.md
index 120a5734..58141f02 100644
--- a/vendor/github.com/spf13/cast/README.md
+++ b/vendor/github.com/spf13/cast/README.md
@@ -1,7 +1,8 @@
-cast
-====
-[![GoDoc](https://godoc.org/github.com/spf13/cast?status.svg)](https://godoc.org/github.com/spf13/cast)
-[![Build Status](https://github.com/spf13/cast/actions/workflows/go.yml/badge.svg)](https://github.com/spf13/cast/actions/workflows/go.yml)
+# cast
+
+[![Build Status](https://github.com/spf13/cast/actions/workflows/ci.yml/badge.svg)](https://github.com/spf13/cast/actions/workflows/ci.yml)
+[![PkgGoDev](https://pkg.go.dev/badge/mod/github.com/spf13/cast)](https://pkg.go.dev/mod/github.com/spf13/cast)
+![Go Version](https://img.shields.io/badge/go%20version-%3E=1.16-61CFDD.svg?style=flat-square)
 [![Go Report Card](https://goreportcard.com/badge/github.com/spf13/cast)](https://goreportcard.com/report/github.com/spf13/cast)
 
 Easy and safe casting from one type to another in Go
@@ -17,7 +18,7 @@ interface into a bool, etc. Cast does this intelligently when an obvious
 conversion is possible. It doesn’t make any attempts to guess what you meant,
 for example you can only convert a string to an int when it is a string
 representation of an int such as “8”. Cast was developed for use in
-[Hugo](http://hugo.spf13.com), a website engine which uses YAML, TOML or JSON
+[Hugo](https://gohugo.io), a website engine which uses YAML, TOML or JSON
 for meta data.
 
 ## Why use Cast?
@@ -72,4 +73,3 @@ the code for a complete set.
 	var eight interface{} = 8
     cast.ToInt(eight)              // 8
     cast.ToInt(nil)                // 0
-
diff --git a/vendor/github.com/spf13/cast/caste.go b/vendor/github.com/spf13/cast/caste.go
index 514d759b..d49bbf83 100644
--- a/vendor/github.com/spf13/cast/caste.go
+++ b/vendor/github.com/spf13/cast/caste.go
@@ -98,10 +98,31 @@ func ToBoolE(i interface{}) (bool, error) {
 	case nil:
 		return false, nil
 	case int:
-		if i.(int) != 0 {
-			return true, nil
-		}
-		return false, nil
+		return b != 0, nil
+	case int64:
+		return b != 0, nil
+	case int32:
+		return b != 0, nil
+	case int16:
+		return b != 0, nil
+	case int8:
+		return b != 0, nil
+	case uint:
+		return b != 0, nil
+	case uint64:
+		return b != 0, nil
+	case uint32:
+		return b != 0, nil
+	case uint16:
+		return b != 0, nil
+	case uint8:
+		return b != 0, nil
+	case float64:
+		return b != 0, nil
+	case float32:
+		return b != 0, nil
+	case time.Duration:
+		return b != 0, nil
 	case string:
 		return strconv.ParseBool(i.(string))
 	case json.Number:
@@ -1385,6 +1406,8 @@ func (f timeFormat) hasTimezone() bool {
 
 var (
 	timeFormats = []timeFormat{
+		// Keep common formats at the top.
+		{"2006-01-02", timeFormatNoTimezone},
 		{time.RFC3339, timeFormatNumericTimezone},
 		{"2006-01-02T15:04:05", timeFormatNoTimezone}, // iso8601 without timezone
 		{time.RFC1123Z, timeFormatNumericTimezone},
@@ -1400,7 +1423,6 @@ var (
 		{time.UnixDate, timeFormatNamedTimezone},
 		{time.RubyDate, timeFormatNumericTimezone},
 		{"2006-01-02 15:04:05Z07:00", timeFormatNumericTimezone},
-		{"2006-01-02", timeFormatNoTimezone},
 		{"02 Jan 2006", timeFormatNoTimezone},
 		{"2006-01-02 15:04:05 -07:00", timeFormatNumericTimezone},
 		{"2006-01-02 15:04:05 -0700", timeFormatNumericTimezone},
diff --git a/vendor/github.com/spf13/viper/.golangci.yaml b/vendor/github.com/spf13/viper/.golangci.yaml
index 16e03965..acd9eeba 100644
--- a/vendor/github.com/spf13/viper/.golangci.yaml
+++ b/vendor/github.com/spf13/viper/.golangci.yaml
@@ -16,7 +16,6 @@ linters:
     disable-all: true
     enable:
         - bodyclose
-        - deadcode
         - dogsled
         - dupl
         - durationcheck
@@ -43,14 +42,12 @@ linters:
         - rowserrcheck
         - sqlclosecheck
         - staticcheck
-        - structcheck
         - stylecheck
         - tparallel
         - typecheck
         - unconvert
         - unparam
         - unused
-        - varcheck
         - wastedassign
         - whitespace
 
@@ -83,6 +80,11 @@ linters:
         # - goheader
         # - gomodguard
 
+        # deprecated
+        # - deadcode
+        # - structcheck
+        # - varcheck
+
         # don't enable:
         # - asciicheck
         # - funlen
diff --git a/vendor/github.com/spf13/viper/Makefile b/vendor/github.com/spf13/viper/Makefile
index 3f4234d3..e8d3baaa 100644
--- a/vendor/github.com/spf13/viper/Makefile
+++ b/vendor/github.com/spf13/viper/Makefile
@@ -15,8 +15,8 @@ TEST_FORMAT = short-verbose
 endif
 
 # Dependency versions
-GOTESTSUM_VERSION = 1.8.0
-GOLANGCI_VERSION = 1.50.1
+GOTESTSUM_VERSION = 1.9.0
+GOLANGCI_VERSION = 1.52.2
 
 # Add the ability to override some variables
 # Use with care
diff --git a/vendor/github.com/spf13/viper/README.md b/vendor/github.com/spf13/viper/README.md
index cd392905..4184d2a1 100644
--- a/vendor/github.com/spf13/viper/README.md
+++ b/vendor/github.com/spf13/viper/README.md
@@ -27,6 +27,9 @@ Many Go projects are built using Viper including:
 * [doctl](https://github.com/digitalocean/doctl)
 * [Clairctl](https://github.com/jgsqware/clairctl)
 * [Mercure](https://mercure.rocks)
+* [Meshery](https://github.com/meshery/meshery)
+* [Bearer](https://github.com/bearer/bearer)
+* [Coder](https://github.com/coder/coder)
 
 
 ## Install
diff --git a/vendor/github.com/spf13/viper/util.go b/vendor/github.com/spf13/viper/util.go
index 64e65750..95009a14 100644
--- a/vendor/github.com/spf13/viper/util.go
+++ b/vendor/github.com/spf13/viper/util.go
@@ -31,6 +31,11 @@ func (pe ConfigParseError) Error() string {
 	return fmt.Sprintf("While parsing config: %s", pe.err.Error())
 }
 
+// Unwrap returns the wrapped error.
+func (pe ConfigParseError) Unwrap() error {
+	return pe.err
+}
+
 // toCaseInsensitiveValue checks if the value is a  map;
 // if so, create a copy and lower-case the keys recursively.
 func toCaseInsensitiveValue(value interface{}) interface{} {
diff --git a/vendor/github.com/spf13/viper/viper.go b/vendor/github.com/spf13/viper/viper.go
index 06610fc5..7fb1e191 100644
--- a/vendor/github.com/spf13/viper/viper.go
+++ b/vendor/github.com/spf13/viper/viper.go
@@ -25,7 +25,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"log"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -206,6 +205,7 @@ type Viper struct {
 	envKeyReplacer      StringReplacer
 	allowEmptyEnv       bool
 
+	parents        []string
 	config         map[string]interface{}
 	override       map[string]interface{}
 	defaults       map[string]interface{}
@@ -232,6 +232,7 @@ func New() *Viper {
 	v.configPermissions = os.FileMode(0o644)
 	v.fs = afero.NewOsFs()
 	v.config = make(map[string]interface{})
+	v.parents = []string{}
 	v.override = make(map[string]interface{})
 	v.defaults = make(map[string]interface{})
 	v.kvstore = make(map[string]interface{})
@@ -439,13 +440,14 @@ func (v *Viper) WatchConfig() {
 	go func() {
 		watcher, err := newWatcher()
 		if err != nil {
-			log.Fatal(err)
+			v.logger.Error(fmt.Sprintf("failed to create watcher: %s", err))
+			os.Exit(1)
 		}
 		defer watcher.Close()
 		// we have to watch the entire directory to pick up renames/atomic saves in a cross-platform way
 		filename, err := v.getConfigFile()
 		if err != nil {
-			log.Printf("error: %v\n", err)
+			v.logger.Error(fmt.Sprintf("get config file: %s", err))
 			initWG.Done()
 			return
 		}
@@ -474,7 +476,7 @@ func (v *Viper) WatchConfig() {
 						realConfigFile = currentConfigFile
 						err := v.ReadInConfig()
 						if err != nil {
-							log.Printf("error reading config file: %v\n", err)
+							v.logger.Error(fmt.Sprintf("read config file: %s", err))
 						}
 						if v.onConfigChange != nil {
 							v.onConfigChange(event)
@@ -486,7 +488,7 @@ func (v *Viper) WatchConfig() {
 
 				case err, ok := <-watcher.Errors:
 					if ok { // 'Errors' channel is not closed
-						log.Printf("watcher error: %v\n", err)
+						v.logger.Error(fmt.Sprintf("watcher error: %s", err))
 					}
 					eventsWG.Done()
 					return
@@ -928,6 +930,8 @@ func (v *Viper) Get(key string) interface{} {
 			return cast.ToStringSlice(val)
 		case []int:
 			return cast.ToIntSlice(val)
+		case []time.Duration:
+			return cast.ToDurationSlice(val)
 		}
 	}
 
@@ -946,6 +950,10 @@ func (v *Viper) Sub(key string) *Viper {
 	}
 
 	if reflect.TypeOf(data).Kind() == reflect.Map {
+		subv.parents = append(v.parents, strings.ToLower(key))
+		subv.automaticEnvApplied = v.automaticEnvApplied
+		subv.envPrefix = v.envPrefix
+		subv.envKeyReplacer = v.envKeyReplacer
 		subv.config = cast.ToStringMap(data)
 		return subv
 	}
@@ -1099,7 +1107,7 @@ func (v *Viper) Unmarshal(rawVal interface{}, opts ...DecoderConfigOption) error
 	return decode(v.AllSettings(), defaultDecoderConfig(rawVal, opts...))
 }
 
-// defaultDecoderConfig returns default mapsstructure.DecoderConfig with suppot
+// defaultDecoderConfig returns default mapstructure.DecoderConfig with support
 // of time.Duration values & string slices
 func defaultDecoderConfig(output interface{}, opts ...DecoderConfigOption) *mapstructure.DecoderConfig {
 	c := &mapstructure.DecoderConfig{
@@ -1274,8 +1282,15 @@ func (v *Viper) find(lcaseKey string, flagDefault bool) interface{} {
 			s = strings.TrimSuffix(s, "]")
 			res, _ := readAsCSV(s)
 			return cast.ToIntSlice(res)
+		case "durationSlice":
+			s := strings.TrimPrefix(flag.ValueString(), "[")
+			s = strings.TrimSuffix(s, "]")
+			slice := strings.Split(s, ",")
+			return cast.ToDurationSlice(slice)
 		case "stringToString":
 			return stringToStringConv(flag.ValueString())
+		case "stringToInt":
+			return stringToIntConv(flag.ValueString())
 		default:
 			return flag.ValueString()
 		}
@@ -1286,9 +1301,10 @@ func (v *Viper) find(lcaseKey string, flagDefault bool) interface{} {
 
 	// Env override next
 	if v.automaticEnvApplied {
+		envKey := strings.Join(append(v.parents, lcaseKey), ".")
 		// even if it hasn't been registered, if automaticEnv is used,
 		// check any Get request
-		if val, ok := v.getEnv(v.mergeWithEnvPrefix(lcaseKey)); ok {
+		if val, ok := v.getEnv(v.mergeWithEnvPrefix(envKey)); ok {
 			return val
 		}
 		if nested && v.isPathShadowedInAutoEnv(path) != "" {
@@ -1355,6 +1371,13 @@ func (v *Viper) find(lcaseKey string, flagDefault bool) interface{} {
 				return cast.ToIntSlice(res)
 			case "stringToString":
 				return stringToStringConv(flag.ValueString())
+			case "stringToInt":
+				return stringToIntConv(flag.ValueString())
+			case "durationSlice":
+				s := strings.TrimPrefix(flag.ValueString(), "[")
+				s = strings.TrimSuffix(s, "]")
+				slice := strings.Split(s, ",")
+				return cast.ToDurationSlice(slice)
 			default:
 				return flag.ValueString()
 			}
@@ -1398,6 +1421,30 @@ func stringToStringConv(val string) interface{} {
 	return out
 }
 
+// mostly copied from pflag's implementation of this operation here https://github.com/spf13/pflag/blob/d5e0c0615acee7028e1e2740a11102313be88de1/string_to_int.go#L68
+// alterations are: errors are swallowed, map[string]interface{} is returned in order to enable cast.ToStringMap
+func stringToIntConv(val string) interface{} {
+	val = strings.Trim(val, "[]")
+	// An empty string would cause an empty map
+	if len(val) == 0 {
+		return map[string]interface{}{}
+	}
+	ss := strings.Split(val, ",")
+	out := make(map[string]interface{}, len(ss))
+	for _, pair := range ss {
+		kv := strings.SplitN(pair, "=", 2)
+		if len(kv) != 2 {
+			return nil
+		}
+		var err error
+		out[kv[0]], err = strconv.Atoi(kv[1])
+		if err != nil {
+			return nil
+		}
+	}
+	return out
+}
+
 // IsSet checks to see if the key has been set in any of the data locations.
 // IsSet is case-insensitive for a key.
 func IsSet(key string) bool { return v.IsSet(key) }
diff --git a/vendor/github.com/stretchr/testify/assert/assertion_compare.go b/vendor/github.com/stretchr/testify/assert/assertion_compare.go
index 95d8e59d..b774da88 100644
--- a/vendor/github.com/stretchr/testify/assert/assertion_compare.go
+++ b/vendor/github.com/stretchr/testify/assert/assertion_compare.go
@@ -352,9 +352,9 @@ func compare(obj1, obj2 interface{}, kind reflect.Kind) (CompareType, bool) {
 
 // Greater asserts that the first element is greater than the second
 //
-//    assert.Greater(t, 2, 1)
-//    assert.Greater(t, float64(2), float64(1))
-//    assert.Greater(t, "b", "a")
+//	assert.Greater(t, 2, 1)
+//	assert.Greater(t, float64(2), float64(1))
+//	assert.Greater(t, "b", "a")
 func Greater(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -364,10 +364,10 @@ func Greater(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface
 
 // GreaterOrEqual asserts that the first element is greater than or equal to the second
 //
-//    assert.GreaterOrEqual(t, 2, 1)
-//    assert.GreaterOrEqual(t, 2, 2)
-//    assert.GreaterOrEqual(t, "b", "a")
-//    assert.GreaterOrEqual(t, "b", "b")
+//	assert.GreaterOrEqual(t, 2, 1)
+//	assert.GreaterOrEqual(t, 2, 2)
+//	assert.GreaterOrEqual(t, "b", "a")
+//	assert.GreaterOrEqual(t, "b", "b")
 func GreaterOrEqual(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -377,9 +377,9 @@ func GreaterOrEqual(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...in
 
 // Less asserts that the first element is less than the second
 //
-//    assert.Less(t, 1, 2)
-//    assert.Less(t, float64(1), float64(2))
-//    assert.Less(t, "a", "b")
+//	assert.Less(t, 1, 2)
+//	assert.Less(t, float64(1), float64(2))
+//	assert.Less(t, "a", "b")
 func Less(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -389,10 +389,10 @@ func Less(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{})
 
 // LessOrEqual asserts that the first element is less than or equal to the second
 //
-//    assert.LessOrEqual(t, 1, 2)
-//    assert.LessOrEqual(t, 2, 2)
-//    assert.LessOrEqual(t, "a", "b")
-//    assert.LessOrEqual(t, "b", "b")
+//	assert.LessOrEqual(t, 1, 2)
+//	assert.LessOrEqual(t, 2, 2)
+//	assert.LessOrEqual(t, "a", "b")
+//	assert.LessOrEqual(t, "b", "b")
 func LessOrEqual(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -402,8 +402,8 @@ func LessOrEqual(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...inter
 
 // Positive asserts that the specified element is positive
 //
-//    assert.Positive(t, 1)
-//    assert.Positive(t, 1.23)
+//	assert.Positive(t, 1)
+//	assert.Positive(t, 1.23)
 func Positive(t TestingT, e interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -414,8 +414,8 @@ func Positive(t TestingT, e interface{}, msgAndArgs ...interface{}) bool {
 
 // Negative asserts that the specified element is negative
 //
-//    assert.Negative(t, -1)
-//    assert.Negative(t, -1.23)
+//	assert.Negative(t, -1)
+//	assert.Negative(t, -1.23)
 func Negative(t TestingT, e interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
diff --git a/vendor/github.com/stretchr/testify/assert/assertion_format.go b/vendor/github.com/stretchr/testify/assert/assertion_format.go
index 7880b8f9..84dbd6c7 100644
--- a/vendor/github.com/stretchr/testify/assert/assertion_format.go
+++ b/vendor/github.com/stretchr/testify/assert/assertion_format.go
@@ -22,9 +22,9 @@ func Conditionf(t TestingT, comp Comparison, msg string, args ...interface{}) bo
 // Containsf asserts that the specified string, list(array, slice...) or map contains the
 // specified substring or element.
 //
-//    assert.Containsf(t, "Hello World", "World", "error message %s", "formatted")
-//    assert.Containsf(t, ["Hello", "World"], "World", "error message %s", "formatted")
-//    assert.Containsf(t, {"Hello": "World"}, "Hello", "error message %s", "formatted")
+//	assert.Containsf(t, "Hello World", "World", "error message %s", "formatted")
+//	assert.Containsf(t, ["Hello", "World"], "World", "error message %s", "formatted")
+//	assert.Containsf(t, {"Hello": "World"}, "Hello", "error message %s", "formatted")
 func Containsf(t TestingT, s interface{}, contains interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -56,7 +56,7 @@ func ElementsMatchf(t TestingT, listA interface{}, listB interface{}, msg string
 // Emptyf asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
 // a slice or a channel with len == 0.
 //
-//  assert.Emptyf(t, obj, "error message %s", "formatted")
+//	assert.Emptyf(t, obj, "error message %s", "formatted")
 func Emptyf(t TestingT, object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -66,7 +66,7 @@ func Emptyf(t TestingT, object interface{}, msg string, args ...interface{}) boo
 
 // Equalf asserts that two objects are equal.
 //
-//    assert.Equalf(t, 123, 123, "error message %s", "formatted")
+//	assert.Equalf(t, 123, 123, "error message %s", "formatted")
 //
 // Pointer variable equality is determined based on the equality of the
 // referenced values (as opposed to the memory addresses). Function equality
@@ -81,8 +81,8 @@ func Equalf(t TestingT, expected interface{}, actual interface{}, msg string, ar
 // EqualErrorf asserts that a function returned an error (i.e. not `nil`)
 // and that it is equal to the provided error.
 //
-//   actualObj, err := SomeFunction()
-//   assert.EqualErrorf(t, err,  expectedErrorString, "error message %s", "formatted")
+//	actualObj, err := SomeFunction()
+//	assert.EqualErrorf(t, err,  expectedErrorString, "error message %s", "formatted")
 func EqualErrorf(t TestingT, theError error, errString string, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -90,10 +90,27 @@ func EqualErrorf(t TestingT, theError error, errString string, msg string, args
 	return EqualError(t, theError, errString, append([]interface{}{msg}, args...)...)
 }
 
+// EqualExportedValuesf asserts that the types of two objects are equal and their public
+// fields are also equal. This is useful for comparing structs that have private fields
+// that could potentially differ.
+//
+//	 type S struct {
+//		Exported     	int
+//		notExported   	int
+//	 }
+//	 assert.EqualExportedValuesf(t, S{1, 2}, S{1, 3}, "error message %s", "formatted") => true
+//	 assert.EqualExportedValuesf(t, S{1, 2}, S{2, 3}, "error message %s", "formatted") => false
+func EqualExportedValuesf(t TestingT, expected interface{}, actual interface{}, msg string, args ...interface{}) bool {
+	if h, ok := t.(tHelper); ok {
+		h.Helper()
+	}
+	return EqualExportedValues(t, expected, actual, append([]interface{}{msg}, args...)...)
+}
+
 // EqualValuesf asserts that two objects are equal or convertable to the same types
 // and equal.
 //
-//    assert.EqualValuesf(t, uint32(123), int32(123), "error message %s", "formatted")
+//	assert.EqualValuesf(t, uint32(123), int32(123), "error message %s", "formatted")
 func EqualValuesf(t TestingT, expected interface{}, actual interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -103,10 +120,10 @@ func EqualValuesf(t TestingT, expected interface{}, actual interface{}, msg stri
 
 // Errorf asserts that a function returned an error (i.e. not `nil`).
 //
-//   actualObj, err := SomeFunction()
-//   if assert.Errorf(t, err, "error message %s", "formatted") {
-// 	   assert.Equal(t, expectedErrorf, err)
-//   }
+//	  actualObj, err := SomeFunction()
+//	  if assert.Errorf(t, err, "error message %s", "formatted") {
+//		   assert.Equal(t, expectedErrorf, err)
+//	  }
 func Errorf(t TestingT, err error, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -126,8 +143,8 @@ func ErrorAsf(t TestingT, err error, target interface{}, msg string, args ...int
 // ErrorContainsf asserts that a function returned an error (i.e. not `nil`)
 // and that the error contains the specified substring.
 //
-//   actualObj, err := SomeFunction()
-//   assert.ErrorContainsf(t, err,  expectedErrorSubString, "error message %s", "formatted")
+//	actualObj, err := SomeFunction()
+//	assert.ErrorContainsf(t, err,  expectedErrorSubString, "error message %s", "formatted")
 func ErrorContainsf(t TestingT, theError error, contains string, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -147,7 +164,7 @@ func ErrorIsf(t TestingT, err error, target error, msg string, args ...interface
 // Eventuallyf asserts that given condition will be met in waitFor time,
 // periodically checking target function each tick.
 //
-//    assert.Eventuallyf(t, func() bool { return true; }, time.Second, 10*time.Millisecond, "error message %s", "formatted")
+//	assert.Eventuallyf(t, func() bool { return true; }, time.Second, 10*time.Millisecond, "error message %s", "formatted")
 func Eventuallyf(t TestingT, condition func() bool, waitFor time.Duration, tick time.Duration, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -155,9 +172,34 @@ func Eventuallyf(t TestingT, condition func() bool, waitFor time.Duration, tick
 	return Eventually(t, condition, waitFor, tick, append([]interface{}{msg}, args...)...)
 }
 
+// EventuallyWithTf asserts that given condition will be met in waitFor time,
+// periodically checking target function each tick. In contrast to Eventually,
+// it supplies a CollectT to the condition function, so that the condition
+// function can use the CollectT to call other assertions.
+// The condition is considered "met" if no errors are raised in a tick.
+// The supplied CollectT collects all errors from one tick (if there are any).
+// If the condition is not met before waitFor, the collected errors of
+// the last tick are copied to t.
+//
+//	externalValue := false
+//	go func() {
+//		time.Sleep(8*time.Second)
+//		externalValue = true
+//	}()
+//	assert.EventuallyWithTf(t, func(c *assert.CollectT, "error message %s", "formatted") {
+//		// add assertions as needed; any assertion failure will fail the current tick
+//		assert.True(c, externalValue, "expected 'externalValue' to be true")
+//	}, 1*time.Second, 10*time.Second, "external state has not changed to 'true'; still false")
+func EventuallyWithTf(t TestingT, condition func(collect *CollectT), waitFor time.Duration, tick time.Duration, msg string, args ...interface{}) bool {
+	if h, ok := t.(tHelper); ok {
+		h.Helper()
+	}
+	return EventuallyWithT(t, condition, waitFor, tick, append([]interface{}{msg}, args...)...)
+}
+
 // Exactlyf asserts that two objects are equal in value and type.
 //
-//    assert.Exactlyf(t, int32(123), int64(123), "error message %s", "formatted")
+//	assert.Exactlyf(t, int32(123), int64(123), "error message %s", "formatted")
 func Exactlyf(t TestingT, expected interface{}, actual interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -183,7 +225,7 @@ func FailNowf(t TestingT, failureMessage string, msg string, args ...interface{}
 
 // Falsef asserts that the specified value is false.
 //
-//    assert.Falsef(t, myBool, "error message %s", "formatted")
+//	assert.Falsef(t, myBool, "error message %s", "formatted")
 func Falsef(t TestingT, value bool, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -202,9 +244,9 @@ func FileExistsf(t TestingT, path string, msg string, args ...interface{}) bool
 
 // Greaterf asserts that the first element is greater than the second
 //
-//    assert.Greaterf(t, 2, 1, "error message %s", "formatted")
-//    assert.Greaterf(t, float64(2), float64(1), "error message %s", "formatted")
-//    assert.Greaterf(t, "b", "a", "error message %s", "formatted")
+//	assert.Greaterf(t, 2, 1, "error message %s", "formatted")
+//	assert.Greaterf(t, float64(2), float64(1), "error message %s", "formatted")
+//	assert.Greaterf(t, "b", "a", "error message %s", "formatted")
 func Greaterf(t TestingT, e1 interface{}, e2 interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -214,10 +256,10 @@ func Greaterf(t TestingT, e1 interface{}, e2 interface{}, msg string, args ...in
 
 // GreaterOrEqualf asserts that the first element is greater than or equal to the second
 //
-//    assert.GreaterOrEqualf(t, 2, 1, "error message %s", "formatted")
-//    assert.GreaterOrEqualf(t, 2, 2, "error message %s", "formatted")
-//    assert.GreaterOrEqualf(t, "b", "a", "error message %s", "formatted")
-//    assert.GreaterOrEqualf(t, "b", "b", "error message %s", "formatted")
+//	assert.GreaterOrEqualf(t, 2, 1, "error message %s", "formatted")
+//	assert.GreaterOrEqualf(t, 2, 2, "error message %s", "formatted")
+//	assert.GreaterOrEqualf(t, "b", "a", "error message %s", "formatted")
+//	assert.GreaterOrEqualf(t, "b", "b", "error message %s", "formatted")
 func GreaterOrEqualf(t TestingT, e1 interface{}, e2 interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -228,7 +270,7 @@ func GreaterOrEqualf(t TestingT, e1 interface{}, e2 interface{}, msg string, arg
 // HTTPBodyContainsf asserts that a specified handler returns a
 // body that contains a string.
 //
-//  assert.HTTPBodyContainsf(t, myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
+//	assert.HTTPBodyContainsf(t, myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPBodyContainsf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msg string, args ...interface{}) bool {
@@ -241,7 +283,7 @@ func HTTPBodyContainsf(t TestingT, handler http.HandlerFunc, method string, url
 // HTTPBodyNotContainsf asserts that a specified handler returns a
 // body that does not contain a string.
 //
-//  assert.HTTPBodyNotContainsf(t, myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
+//	assert.HTTPBodyNotContainsf(t, myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPBodyNotContainsf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msg string, args ...interface{}) bool {
@@ -253,7 +295,7 @@ func HTTPBodyNotContainsf(t TestingT, handler http.HandlerFunc, method string, u
 
 // HTTPErrorf asserts that a specified handler returns an error status code.
 //
-//  assert.HTTPErrorf(t, myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//	assert.HTTPErrorf(t, myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPErrorf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) bool {
@@ -265,7 +307,7 @@ func HTTPErrorf(t TestingT, handler http.HandlerFunc, method string, url string,
 
 // HTTPRedirectf asserts that a specified handler returns a redirect status code.
 //
-//  assert.HTTPRedirectf(t, myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//	assert.HTTPRedirectf(t, myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPRedirectf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) bool {
@@ -277,7 +319,7 @@ func HTTPRedirectf(t TestingT, handler http.HandlerFunc, method string, url stri
 
 // HTTPStatusCodef asserts that a specified handler returns a specified status code.
 //
-//  assert.HTTPStatusCodef(t, myHandler, "GET", "/notImplemented", nil, 501, "error message %s", "formatted")
+//	assert.HTTPStatusCodef(t, myHandler, "GET", "/notImplemented", nil, 501, "error message %s", "formatted")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPStatusCodef(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, statuscode int, msg string, args ...interface{}) bool {
@@ -289,7 +331,7 @@ func HTTPStatusCodef(t TestingT, handler http.HandlerFunc, method string, url st
 
 // HTTPSuccessf asserts that a specified handler returns a success status code.
 //
-//  assert.HTTPSuccessf(t, myHandler, "POST", "http://www.google.com", nil, "error message %s", "formatted")
+//	assert.HTTPSuccessf(t, myHandler, "POST", "http://www.google.com", nil, "error message %s", "formatted")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPSuccessf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) bool {
@@ -301,7 +343,7 @@ func HTTPSuccessf(t TestingT, handler http.HandlerFunc, method string, url strin
 
 // Implementsf asserts that an object is implemented by the specified interface.
 //
-//    assert.Implementsf(t, (*MyInterface)(nil), new(MyObject), "error message %s", "formatted")
+//	assert.Implementsf(t, (*MyInterface)(nil), new(MyObject), "error message %s", "formatted")
 func Implementsf(t TestingT, interfaceObject interface{}, object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -311,7 +353,7 @@ func Implementsf(t TestingT, interfaceObject interface{}, object interface{}, ms
 
 // InDeltaf asserts that the two numerals are within delta of each other.
 //
-// 	 assert.InDeltaf(t, math.Pi, 22/7.0, 0.01, "error message %s", "formatted")
+//	assert.InDeltaf(t, math.Pi, 22/7.0, 0.01, "error message %s", "formatted")
 func InDeltaf(t TestingT, expected interface{}, actual interface{}, delta float64, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -353,9 +395,9 @@ func InEpsilonSlicef(t TestingT, expected interface{}, actual interface{}, epsil
 
 // IsDecreasingf asserts that the collection is decreasing
 //
-//    assert.IsDecreasingf(t, []int{2, 1, 0}, "error message %s", "formatted")
-//    assert.IsDecreasingf(t, []float{2, 1}, "error message %s", "formatted")
-//    assert.IsDecreasingf(t, []string{"b", "a"}, "error message %s", "formatted")
+//	assert.IsDecreasingf(t, []int{2, 1, 0}, "error message %s", "formatted")
+//	assert.IsDecreasingf(t, []float{2, 1}, "error message %s", "formatted")
+//	assert.IsDecreasingf(t, []string{"b", "a"}, "error message %s", "formatted")
 func IsDecreasingf(t TestingT, object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -365,9 +407,9 @@ func IsDecreasingf(t TestingT, object interface{}, msg string, args ...interface
 
 // IsIncreasingf asserts that the collection is increasing
 //
-//    assert.IsIncreasingf(t, []int{1, 2, 3}, "error message %s", "formatted")
-//    assert.IsIncreasingf(t, []float{1, 2}, "error message %s", "formatted")
-//    assert.IsIncreasingf(t, []string{"a", "b"}, "error message %s", "formatted")
+//	assert.IsIncreasingf(t, []int{1, 2, 3}, "error message %s", "formatted")
+//	assert.IsIncreasingf(t, []float{1, 2}, "error message %s", "formatted")
+//	assert.IsIncreasingf(t, []string{"a", "b"}, "error message %s", "formatted")
 func IsIncreasingf(t TestingT, object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -377,9 +419,9 @@ func IsIncreasingf(t TestingT, object interface{}, msg string, args ...interface
 
 // IsNonDecreasingf asserts that the collection is not decreasing
 //
-//    assert.IsNonDecreasingf(t, []int{1, 1, 2}, "error message %s", "formatted")
-//    assert.IsNonDecreasingf(t, []float{1, 2}, "error message %s", "formatted")
-//    assert.IsNonDecreasingf(t, []string{"a", "b"}, "error message %s", "formatted")
+//	assert.IsNonDecreasingf(t, []int{1, 1, 2}, "error message %s", "formatted")
+//	assert.IsNonDecreasingf(t, []float{1, 2}, "error message %s", "formatted")
+//	assert.IsNonDecreasingf(t, []string{"a", "b"}, "error message %s", "formatted")
 func IsNonDecreasingf(t TestingT, object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -389,9 +431,9 @@ func IsNonDecreasingf(t TestingT, object interface{}, msg string, args ...interf
 
 // IsNonIncreasingf asserts that the collection is not increasing
 //
-//    assert.IsNonIncreasingf(t, []int{2, 1, 1}, "error message %s", "formatted")
-//    assert.IsNonIncreasingf(t, []float{2, 1}, "error message %s", "formatted")
-//    assert.IsNonIncreasingf(t, []string{"b", "a"}, "error message %s", "formatted")
+//	assert.IsNonIncreasingf(t, []int{2, 1, 1}, "error message %s", "formatted")
+//	assert.IsNonIncreasingf(t, []float{2, 1}, "error message %s", "formatted")
+//	assert.IsNonIncreasingf(t, []string{"b", "a"}, "error message %s", "formatted")
 func IsNonIncreasingf(t TestingT, object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -409,7 +451,7 @@ func IsTypef(t TestingT, expectedType interface{}, object interface{}, msg strin
 
 // JSONEqf asserts that two JSON strings are equivalent.
 //
-//  assert.JSONEqf(t, `{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`, "error message %s", "formatted")
+//	assert.JSONEqf(t, `{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`, "error message %s", "formatted")
 func JSONEqf(t TestingT, expected string, actual string, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -420,7 +462,7 @@ func JSONEqf(t TestingT, expected string, actual string, msg string, args ...int
 // Lenf asserts that the specified object has specific length.
 // Lenf also fails if the object has a type that len() not accept.
 //
-//    assert.Lenf(t, mySlice, 3, "error message %s", "formatted")
+//	assert.Lenf(t, mySlice, 3, "error message %s", "formatted")
 func Lenf(t TestingT, object interface{}, length int, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -430,9 +472,9 @@ func Lenf(t TestingT, object interface{}, length int, msg string, args ...interf
 
 // Lessf asserts that the first element is less than the second
 //
-//    assert.Lessf(t, 1, 2, "error message %s", "formatted")
-//    assert.Lessf(t, float64(1), float64(2), "error message %s", "formatted")
-//    assert.Lessf(t, "a", "b", "error message %s", "formatted")
+//	assert.Lessf(t, 1, 2, "error message %s", "formatted")
+//	assert.Lessf(t, float64(1), float64(2), "error message %s", "formatted")
+//	assert.Lessf(t, "a", "b", "error message %s", "formatted")
 func Lessf(t TestingT, e1 interface{}, e2 interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -442,10 +484,10 @@ func Lessf(t TestingT, e1 interface{}, e2 interface{}, msg string, args ...inter
 
 // LessOrEqualf asserts that the first element is less than or equal to the second
 //
-//    assert.LessOrEqualf(t, 1, 2, "error message %s", "formatted")
-//    assert.LessOrEqualf(t, 2, 2, "error message %s", "formatted")
-//    assert.LessOrEqualf(t, "a", "b", "error message %s", "formatted")
-//    assert.LessOrEqualf(t, "b", "b", "error message %s", "formatted")
+//	assert.LessOrEqualf(t, 1, 2, "error message %s", "formatted")
+//	assert.LessOrEqualf(t, 2, 2, "error message %s", "formatted")
+//	assert.LessOrEqualf(t, "a", "b", "error message %s", "formatted")
+//	assert.LessOrEqualf(t, "b", "b", "error message %s", "formatted")
 func LessOrEqualf(t TestingT, e1 interface{}, e2 interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -455,8 +497,8 @@ func LessOrEqualf(t TestingT, e1 interface{}, e2 interface{}, msg string, args .
 
 // Negativef asserts that the specified element is negative
 //
-//    assert.Negativef(t, -1, "error message %s", "formatted")
-//    assert.Negativef(t, -1.23, "error message %s", "formatted")
+//	assert.Negativef(t, -1, "error message %s", "formatted")
+//	assert.Negativef(t, -1.23, "error message %s", "formatted")
 func Negativef(t TestingT, e interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -467,7 +509,7 @@ func Negativef(t TestingT, e interface{}, msg string, args ...interface{}) bool
 // Neverf asserts that the given condition doesn't satisfy in waitFor time,
 // periodically checking the target function each tick.
 //
-//    assert.Neverf(t, func() bool { return false; }, time.Second, 10*time.Millisecond, "error message %s", "formatted")
+//	assert.Neverf(t, func() bool { return false; }, time.Second, 10*time.Millisecond, "error message %s", "formatted")
 func Neverf(t TestingT, condition func() bool, waitFor time.Duration, tick time.Duration, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -477,7 +519,7 @@ func Neverf(t TestingT, condition func() bool, waitFor time.Duration, tick time.
 
 // Nilf asserts that the specified object is nil.
 //
-//    assert.Nilf(t, err, "error message %s", "formatted")
+//	assert.Nilf(t, err, "error message %s", "formatted")
 func Nilf(t TestingT, object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -496,10 +538,10 @@ func NoDirExistsf(t TestingT, path string, msg string, args ...interface{}) bool
 
 // NoErrorf asserts that a function returned no error (i.e. `nil`).
 //
-//   actualObj, err := SomeFunction()
-//   if assert.NoErrorf(t, err, "error message %s", "formatted") {
-// 	   assert.Equal(t, expectedObj, actualObj)
-//   }
+//	  actualObj, err := SomeFunction()
+//	  if assert.NoErrorf(t, err, "error message %s", "formatted") {
+//		   assert.Equal(t, expectedObj, actualObj)
+//	  }
 func NoErrorf(t TestingT, err error, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -519,9 +561,9 @@ func NoFileExistsf(t TestingT, path string, msg string, args ...interface{}) boo
 // NotContainsf asserts that the specified string, list(array, slice...) or map does NOT contain the
 // specified substring or element.
 //
-//    assert.NotContainsf(t, "Hello World", "Earth", "error message %s", "formatted")
-//    assert.NotContainsf(t, ["Hello", "World"], "Earth", "error message %s", "formatted")
-//    assert.NotContainsf(t, {"Hello": "World"}, "Earth", "error message %s", "formatted")
+//	assert.NotContainsf(t, "Hello World", "Earth", "error message %s", "formatted")
+//	assert.NotContainsf(t, ["Hello", "World"], "Earth", "error message %s", "formatted")
+//	assert.NotContainsf(t, {"Hello": "World"}, "Earth", "error message %s", "formatted")
 func NotContainsf(t TestingT, s interface{}, contains interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -532,9 +574,9 @@ func NotContainsf(t TestingT, s interface{}, contains interface{}, msg string, a
 // NotEmptyf asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
 // a slice or a channel with len == 0.
 //
-//  if assert.NotEmptyf(t, obj, "error message %s", "formatted") {
-//    assert.Equal(t, "two", obj[1])
-//  }
+//	if assert.NotEmptyf(t, obj, "error message %s", "formatted") {
+//	  assert.Equal(t, "two", obj[1])
+//	}
 func NotEmptyf(t TestingT, object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -544,7 +586,7 @@ func NotEmptyf(t TestingT, object interface{}, msg string, args ...interface{})
 
 // NotEqualf asserts that the specified values are NOT equal.
 //
-//    assert.NotEqualf(t, obj1, obj2, "error message %s", "formatted")
+//	assert.NotEqualf(t, obj1, obj2, "error message %s", "formatted")
 //
 // Pointer variable equality is determined based on the equality of the
 // referenced values (as opposed to the memory addresses).
@@ -557,7 +599,7 @@ func NotEqualf(t TestingT, expected interface{}, actual interface{}, msg string,
 
 // NotEqualValuesf asserts that two objects are not equal even when converted to the same type
 //
-//    assert.NotEqualValuesf(t, obj1, obj2, "error message %s", "formatted")
+//	assert.NotEqualValuesf(t, obj1, obj2, "error message %s", "formatted")
 func NotEqualValuesf(t TestingT, expected interface{}, actual interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -576,7 +618,7 @@ func NotErrorIsf(t TestingT, err error, target error, msg string, args ...interf
 
 // NotNilf asserts that the specified object is not nil.
 //
-//    assert.NotNilf(t, err, "error message %s", "formatted")
+//	assert.NotNilf(t, err, "error message %s", "formatted")
 func NotNilf(t TestingT, object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -586,7 +628,7 @@ func NotNilf(t TestingT, object interface{}, msg string, args ...interface{}) bo
 
 // NotPanicsf asserts that the code inside the specified PanicTestFunc does NOT panic.
 //
-//   assert.NotPanicsf(t, func(){ RemainCalm() }, "error message %s", "formatted")
+//	assert.NotPanicsf(t, func(){ RemainCalm() }, "error message %s", "formatted")
 func NotPanicsf(t TestingT, f PanicTestFunc, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -596,8 +638,8 @@ func NotPanicsf(t TestingT, f PanicTestFunc, msg string, args ...interface{}) bo
 
 // NotRegexpf asserts that a specified regexp does not match a string.
 //
-//  assert.NotRegexpf(t, regexp.MustCompile("starts"), "it's starting", "error message %s", "formatted")
-//  assert.NotRegexpf(t, "^start", "it's not starting", "error message %s", "formatted")
+//	assert.NotRegexpf(t, regexp.MustCompile("starts"), "it's starting", "error message %s", "formatted")
+//	assert.NotRegexpf(t, "^start", "it's not starting", "error message %s", "formatted")
 func NotRegexpf(t TestingT, rx interface{}, str interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -607,7 +649,7 @@ func NotRegexpf(t TestingT, rx interface{}, str interface{}, msg string, args ..
 
 // NotSamef asserts that two pointers do not reference the same object.
 //
-//    assert.NotSamef(t, ptr1, ptr2, "error message %s", "formatted")
+//	assert.NotSamef(t, ptr1, ptr2, "error message %s", "formatted")
 //
 // Both arguments must be pointer variables. Pointer variable sameness is
 // determined based on the equality of both type and value.
@@ -621,7 +663,7 @@ func NotSamef(t TestingT, expected interface{}, actual interface{}, msg string,
 // NotSubsetf asserts that the specified list(array, slice...) contains not all
 // elements given in the specified subset(array, slice...).
 //
-//    assert.NotSubsetf(t, [1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]", "error message %s", "formatted")
+//	assert.NotSubsetf(t, [1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]", "error message %s", "formatted")
 func NotSubsetf(t TestingT, list interface{}, subset interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -639,7 +681,7 @@ func NotZerof(t TestingT, i interface{}, msg string, args ...interface{}) bool {
 
 // Panicsf asserts that the code inside the specified PanicTestFunc panics.
 //
-//   assert.Panicsf(t, func(){ GoCrazy() }, "error message %s", "formatted")
+//	assert.Panicsf(t, func(){ GoCrazy() }, "error message %s", "formatted")
 func Panicsf(t TestingT, f PanicTestFunc, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -651,7 +693,7 @@ func Panicsf(t TestingT, f PanicTestFunc, msg string, args ...interface{}) bool
 // panics, and that the recovered panic value is an error that satisfies the
 // EqualError comparison.
 //
-//   assert.PanicsWithErrorf(t, "crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
+//	assert.PanicsWithErrorf(t, "crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
 func PanicsWithErrorf(t TestingT, errString string, f PanicTestFunc, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -662,7 +704,7 @@ func PanicsWithErrorf(t TestingT, errString string, f PanicTestFunc, msg string,
 // PanicsWithValuef asserts that the code inside the specified PanicTestFunc panics, and that
 // the recovered panic value equals the expected panic value.
 //
-//   assert.PanicsWithValuef(t, "crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
+//	assert.PanicsWithValuef(t, "crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
 func PanicsWithValuef(t TestingT, expected interface{}, f PanicTestFunc, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -672,8 +714,8 @@ func PanicsWithValuef(t TestingT, expected interface{}, f PanicTestFunc, msg str
 
 // Positivef asserts that the specified element is positive
 //
-//    assert.Positivef(t, 1, "error message %s", "formatted")
-//    assert.Positivef(t, 1.23, "error message %s", "formatted")
+//	assert.Positivef(t, 1, "error message %s", "formatted")
+//	assert.Positivef(t, 1.23, "error message %s", "formatted")
 func Positivef(t TestingT, e interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -683,8 +725,8 @@ func Positivef(t TestingT, e interface{}, msg string, args ...interface{}) bool
 
 // Regexpf asserts that a specified regexp matches a string.
 //
-//  assert.Regexpf(t, regexp.MustCompile("start"), "it's starting", "error message %s", "formatted")
-//  assert.Regexpf(t, "start...$", "it's not starting", "error message %s", "formatted")
+//	assert.Regexpf(t, regexp.MustCompile("start"), "it's starting", "error message %s", "formatted")
+//	assert.Regexpf(t, "start...$", "it's not starting", "error message %s", "formatted")
 func Regexpf(t TestingT, rx interface{}, str interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -694,7 +736,7 @@ func Regexpf(t TestingT, rx interface{}, str interface{}, msg string, args ...in
 
 // Samef asserts that two pointers reference the same object.
 //
-//    assert.Samef(t, ptr1, ptr2, "error message %s", "formatted")
+//	assert.Samef(t, ptr1, ptr2, "error message %s", "formatted")
 //
 // Both arguments must be pointer variables. Pointer variable sameness is
 // determined based on the equality of both type and value.
@@ -708,7 +750,7 @@ func Samef(t TestingT, expected interface{}, actual interface{}, msg string, arg
 // Subsetf asserts that the specified list(array, slice...) contains all
 // elements given in the specified subset(array, slice...).
 //
-//    assert.Subsetf(t, [1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]", "error message %s", "formatted")
+//	assert.Subsetf(t, [1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]", "error message %s", "formatted")
 func Subsetf(t TestingT, list interface{}, subset interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -718,7 +760,7 @@ func Subsetf(t TestingT, list interface{}, subset interface{}, msg string, args
 
 // Truef asserts that the specified value is true.
 //
-//    assert.Truef(t, myBool, "error message %s", "formatted")
+//	assert.Truef(t, myBool, "error message %s", "formatted")
 func Truef(t TestingT, value bool, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -728,7 +770,7 @@ func Truef(t TestingT, value bool, msg string, args ...interface{}) bool {
 
 // WithinDurationf asserts that the two times are within duration delta of each other.
 //
-//   assert.WithinDurationf(t, time.Now(), time.Now(), 10*time.Second, "error message %s", "formatted")
+//	assert.WithinDurationf(t, time.Now(), time.Now(), 10*time.Second, "error message %s", "formatted")
 func WithinDurationf(t TestingT, expected time.Time, actual time.Time, delta time.Duration, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -738,7 +780,7 @@ func WithinDurationf(t TestingT, expected time.Time, actual time.Time, delta tim
 
 // WithinRangef asserts that a time is within a time range (inclusive).
 //
-//   assert.WithinRangef(t, time.Now(), time.Now().Add(-time.Second), time.Now().Add(time.Second), "error message %s", "formatted")
+//	assert.WithinRangef(t, time.Now(), time.Now().Add(-time.Second), time.Now().Add(time.Second), "error message %s", "formatted")
 func WithinRangef(t TestingT, actual time.Time, start time.Time, end time.Time, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
diff --git a/vendor/github.com/stretchr/testify/assert/assertion_forward.go b/vendor/github.com/stretchr/testify/assert/assertion_forward.go
index 339515b8..b1d94aec 100644
--- a/vendor/github.com/stretchr/testify/assert/assertion_forward.go
+++ b/vendor/github.com/stretchr/testify/assert/assertion_forward.go
@@ -30,9 +30,9 @@ func (a *Assertions) Conditionf(comp Comparison, msg string, args ...interface{}
 // Contains asserts that the specified string, list(array, slice...) or map contains the
 // specified substring or element.
 //
-//    a.Contains("Hello World", "World")
-//    a.Contains(["Hello", "World"], "World")
-//    a.Contains({"Hello": "World"}, "Hello")
+//	a.Contains("Hello World", "World")
+//	a.Contains(["Hello", "World"], "World")
+//	a.Contains({"Hello": "World"}, "Hello")
 func (a *Assertions) Contains(s interface{}, contains interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -43,9 +43,9 @@ func (a *Assertions) Contains(s interface{}, contains interface{}, msgAndArgs ..
 // Containsf asserts that the specified string, list(array, slice...) or map contains the
 // specified substring or element.
 //
-//    a.Containsf("Hello World", "World", "error message %s", "formatted")
-//    a.Containsf(["Hello", "World"], "World", "error message %s", "formatted")
-//    a.Containsf({"Hello": "World"}, "Hello", "error message %s", "formatted")
+//	a.Containsf("Hello World", "World", "error message %s", "formatted")
+//	a.Containsf(["Hello", "World"], "World", "error message %s", "formatted")
+//	a.Containsf({"Hello": "World"}, "Hello", "error message %s", "formatted")
 func (a *Assertions) Containsf(s interface{}, contains interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -98,7 +98,7 @@ func (a *Assertions) ElementsMatchf(listA interface{}, listB interface{}, msg st
 // Empty asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
 // a slice or a channel with len == 0.
 //
-//  a.Empty(obj)
+//	a.Empty(obj)
 func (a *Assertions) Empty(object interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -109,7 +109,7 @@ func (a *Assertions) Empty(object interface{}, msgAndArgs ...interface{}) bool {
 // Emptyf asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
 // a slice or a channel with len == 0.
 //
-//  a.Emptyf(obj, "error message %s", "formatted")
+//	a.Emptyf(obj, "error message %s", "formatted")
 func (a *Assertions) Emptyf(object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -119,7 +119,7 @@ func (a *Assertions) Emptyf(object interface{}, msg string, args ...interface{})
 
 // Equal asserts that two objects are equal.
 //
-//    a.Equal(123, 123)
+//	a.Equal(123, 123)
 //
 // Pointer variable equality is determined based on the equality of the
 // referenced values (as opposed to the memory addresses). Function equality
@@ -134,8 +134,8 @@ func (a *Assertions) Equal(expected interface{}, actual interface{}, msgAndArgs
 // EqualError asserts that a function returned an error (i.e. not `nil`)
 // and that it is equal to the provided error.
 //
-//   actualObj, err := SomeFunction()
-//   a.EqualError(err,  expectedErrorString)
+//	actualObj, err := SomeFunction()
+//	a.EqualError(err,  expectedErrorString)
 func (a *Assertions) EqualError(theError error, errString string, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -146,8 +146,8 @@ func (a *Assertions) EqualError(theError error, errString string, msgAndArgs ...
 // EqualErrorf asserts that a function returned an error (i.e. not `nil`)
 // and that it is equal to the provided error.
 //
-//   actualObj, err := SomeFunction()
-//   a.EqualErrorf(err,  expectedErrorString, "error message %s", "formatted")
+//	actualObj, err := SomeFunction()
+//	a.EqualErrorf(err,  expectedErrorString, "error message %s", "formatted")
 func (a *Assertions) EqualErrorf(theError error, errString string, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -155,10 +155,44 @@ func (a *Assertions) EqualErrorf(theError error, errString string, msg string, a
 	return EqualErrorf(a.t, theError, errString, msg, args...)
 }
 
+// EqualExportedValues asserts that the types of two objects are equal and their public
+// fields are also equal. This is useful for comparing structs that have private fields
+// that could potentially differ.
+//
+//	 type S struct {
+//		Exported     	int
+//		notExported   	int
+//	 }
+//	 a.EqualExportedValues(S{1, 2}, S{1, 3}) => true
+//	 a.EqualExportedValues(S{1, 2}, S{2, 3}) => false
+func (a *Assertions) EqualExportedValues(expected interface{}, actual interface{}, msgAndArgs ...interface{}) bool {
+	if h, ok := a.t.(tHelper); ok {
+		h.Helper()
+	}
+	return EqualExportedValues(a.t, expected, actual, msgAndArgs...)
+}
+
+// EqualExportedValuesf asserts that the types of two objects are equal and their public
+// fields are also equal. This is useful for comparing structs that have private fields
+// that could potentially differ.
+//
+//	 type S struct {
+//		Exported     	int
+//		notExported   	int
+//	 }
+//	 a.EqualExportedValuesf(S{1, 2}, S{1, 3}, "error message %s", "formatted") => true
+//	 a.EqualExportedValuesf(S{1, 2}, S{2, 3}, "error message %s", "formatted") => false
+func (a *Assertions) EqualExportedValuesf(expected interface{}, actual interface{}, msg string, args ...interface{}) bool {
+	if h, ok := a.t.(tHelper); ok {
+		h.Helper()
+	}
+	return EqualExportedValuesf(a.t, expected, actual, msg, args...)
+}
+
 // EqualValues asserts that two objects are equal or convertable to the same types
 // and equal.
 //
-//    a.EqualValues(uint32(123), int32(123))
+//	a.EqualValues(uint32(123), int32(123))
 func (a *Assertions) EqualValues(expected interface{}, actual interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -169,7 +203,7 @@ func (a *Assertions) EqualValues(expected interface{}, actual interface{}, msgAn
 // EqualValuesf asserts that two objects are equal or convertable to the same types
 // and equal.
 //
-//    a.EqualValuesf(uint32(123), int32(123), "error message %s", "formatted")
+//	a.EqualValuesf(uint32(123), int32(123), "error message %s", "formatted")
 func (a *Assertions) EqualValuesf(expected interface{}, actual interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -179,7 +213,7 @@ func (a *Assertions) EqualValuesf(expected interface{}, actual interface{}, msg
 
 // Equalf asserts that two objects are equal.
 //
-//    a.Equalf(123, 123, "error message %s", "formatted")
+//	a.Equalf(123, 123, "error message %s", "formatted")
 //
 // Pointer variable equality is determined based on the equality of the
 // referenced values (as opposed to the memory addresses). Function equality
@@ -193,10 +227,10 @@ func (a *Assertions) Equalf(expected interface{}, actual interface{}, msg string
 
 // Error asserts that a function returned an error (i.e. not `nil`).
 //
-//   actualObj, err := SomeFunction()
-//   if a.Error(err) {
-// 	   assert.Equal(t, expectedError, err)
-//   }
+//	  actualObj, err := SomeFunction()
+//	  if a.Error(err) {
+//		   assert.Equal(t, expectedError, err)
+//	  }
 func (a *Assertions) Error(err error, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -225,8 +259,8 @@ func (a *Assertions) ErrorAsf(err error, target interface{}, msg string, args ..
 // ErrorContains asserts that a function returned an error (i.e. not `nil`)
 // and that the error contains the specified substring.
 //
-//   actualObj, err := SomeFunction()
-//   a.ErrorContains(err,  expectedErrorSubString)
+//	actualObj, err := SomeFunction()
+//	a.ErrorContains(err,  expectedErrorSubString)
 func (a *Assertions) ErrorContains(theError error, contains string, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -237,8 +271,8 @@ func (a *Assertions) ErrorContains(theError error, contains string, msgAndArgs .
 // ErrorContainsf asserts that a function returned an error (i.e. not `nil`)
 // and that the error contains the specified substring.
 //
-//   actualObj, err := SomeFunction()
-//   a.ErrorContainsf(err,  expectedErrorSubString, "error message %s", "formatted")
+//	actualObj, err := SomeFunction()
+//	a.ErrorContainsf(err,  expectedErrorSubString, "error message %s", "formatted")
 func (a *Assertions) ErrorContainsf(theError error, contains string, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -266,10 +300,10 @@ func (a *Assertions) ErrorIsf(err error, target error, msg string, args ...inter
 
 // Errorf asserts that a function returned an error (i.e. not `nil`).
 //
-//   actualObj, err := SomeFunction()
-//   if a.Errorf(err, "error message %s", "formatted") {
-// 	   assert.Equal(t, expectedErrorf, err)
-//   }
+//	  actualObj, err := SomeFunction()
+//	  if a.Errorf(err, "error message %s", "formatted") {
+//		   assert.Equal(t, expectedErrorf, err)
+//	  }
 func (a *Assertions) Errorf(err error, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -280,7 +314,7 @@ func (a *Assertions) Errorf(err error, msg string, args ...interface{}) bool {
 // Eventually asserts that given condition will be met in waitFor time,
 // periodically checking target function each tick.
 //
-//    a.Eventually(func() bool { return true; }, time.Second, 10*time.Millisecond)
+//	a.Eventually(func() bool { return true; }, time.Second, 10*time.Millisecond)
 func (a *Assertions) Eventually(condition func() bool, waitFor time.Duration, tick time.Duration, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -288,10 +322,60 @@ func (a *Assertions) Eventually(condition func() bool, waitFor time.Duration, ti
 	return Eventually(a.t, condition, waitFor, tick, msgAndArgs...)
 }
 
+// EventuallyWithT asserts that given condition will be met in waitFor time,
+// periodically checking target function each tick. In contrast to Eventually,
+// it supplies a CollectT to the condition function, so that the condition
+// function can use the CollectT to call other assertions.
+// The condition is considered "met" if no errors are raised in a tick.
+// The supplied CollectT collects all errors from one tick (if there are any).
+// If the condition is not met before waitFor, the collected errors of
+// the last tick are copied to t.
+//
+//	externalValue := false
+//	go func() {
+//		time.Sleep(8*time.Second)
+//		externalValue = true
+//	}()
+//	a.EventuallyWithT(func(c *assert.CollectT) {
+//		// add assertions as needed; any assertion failure will fail the current tick
+//		assert.True(c, externalValue, "expected 'externalValue' to be true")
+//	}, 1*time.Second, 10*time.Second, "external state has not changed to 'true'; still false")
+func (a *Assertions) EventuallyWithT(condition func(collect *CollectT), waitFor time.Duration, tick time.Duration, msgAndArgs ...interface{}) bool {
+	if h, ok := a.t.(tHelper); ok {
+		h.Helper()
+	}
+	return EventuallyWithT(a.t, condition, waitFor, tick, msgAndArgs...)
+}
+
+// EventuallyWithTf asserts that given condition will be met in waitFor time,
+// periodically checking target function each tick. In contrast to Eventually,
+// it supplies a CollectT to the condition function, so that the condition
+// function can use the CollectT to call other assertions.
+// The condition is considered "met" if no errors are raised in a tick.
+// The supplied CollectT collects all errors from one tick (if there are any).
+// If the condition is not met before waitFor, the collected errors of
+// the last tick are copied to t.
+//
+//	externalValue := false
+//	go func() {
+//		time.Sleep(8*time.Second)
+//		externalValue = true
+//	}()
+//	a.EventuallyWithTf(func(c *assert.CollectT, "error message %s", "formatted") {
+//		// add assertions as needed; any assertion failure will fail the current tick
+//		assert.True(c, externalValue, "expected 'externalValue' to be true")
+//	}, 1*time.Second, 10*time.Second, "external state has not changed to 'true'; still false")
+func (a *Assertions) EventuallyWithTf(condition func(collect *CollectT), waitFor time.Duration, tick time.Duration, msg string, args ...interface{}) bool {
+	if h, ok := a.t.(tHelper); ok {
+		h.Helper()
+	}
+	return EventuallyWithTf(a.t, condition, waitFor, tick, msg, args...)
+}
+
 // Eventuallyf asserts that given condition will be met in waitFor time,
 // periodically checking target function each tick.
 //
-//    a.Eventuallyf(func() bool { return true; }, time.Second, 10*time.Millisecond, "error message %s", "formatted")
+//	a.Eventuallyf(func() bool { return true; }, time.Second, 10*time.Millisecond, "error message %s", "formatted")
 func (a *Assertions) Eventuallyf(condition func() bool, waitFor time.Duration, tick time.Duration, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -301,7 +385,7 @@ func (a *Assertions) Eventuallyf(condition func() bool, waitFor time.Duration, t
 
 // Exactly asserts that two objects are equal in value and type.
 //
-//    a.Exactly(int32(123), int64(123))
+//	a.Exactly(int32(123), int64(123))
 func (a *Assertions) Exactly(expected interface{}, actual interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -311,7 +395,7 @@ func (a *Assertions) Exactly(expected interface{}, actual interface{}, msgAndArg
 
 // Exactlyf asserts that two objects are equal in value and type.
 //
-//    a.Exactlyf(int32(123), int64(123), "error message %s", "formatted")
+//	a.Exactlyf(int32(123), int64(123), "error message %s", "formatted")
 func (a *Assertions) Exactlyf(expected interface{}, actual interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -353,7 +437,7 @@ func (a *Assertions) Failf(failureMessage string, msg string, args ...interface{
 
 // False asserts that the specified value is false.
 //
-//    a.False(myBool)
+//	a.False(myBool)
 func (a *Assertions) False(value bool, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -363,7 +447,7 @@ func (a *Assertions) False(value bool, msgAndArgs ...interface{}) bool {
 
 // Falsef asserts that the specified value is false.
 //
-//    a.Falsef(myBool, "error message %s", "formatted")
+//	a.Falsef(myBool, "error message %s", "formatted")
 func (a *Assertions) Falsef(value bool, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -391,9 +475,9 @@ func (a *Assertions) FileExistsf(path string, msg string, args ...interface{}) b
 
 // Greater asserts that the first element is greater than the second
 //
-//    a.Greater(2, 1)
-//    a.Greater(float64(2), float64(1))
-//    a.Greater("b", "a")
+//	a.Greater(2, 1)
+//	a.Greater(float64(2), float64(1))
+//	a.Greater("b", "a")
 func (a *Assertions) Greater(e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -403,10 +487,10 @@ func (a *Assertions) Greater(e1 interface{}, e2 interface{}, msgAndArgs ...inter
 
 // GreaterOrEqual asserts that the first element is greater than or equal to the second
 //
-//    a.GreaterOrEqual(2, 1)
-//    a.GreaterOrEqual(2, 2)
-//    a.GreaterOrEqual("b", "a")
-//    a.GreaterOrEqual("b", "b")
+//	a.GreaterOrEqual(2, 1)
+//	a.GreaterOrEqual(2, 2)
+//	a.GreaterOrEqual("b", "a")
+//	a.GreaterOrEqual("b", "b")
 func (a *Assertions) GreaterOrEqual(e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -416,10 +500,10 @@ func (a *Assertions) GreaterOrEqual(e1 interface{}, e2 interface{}, msgAndArgs .
 
 // GreaterOrEqualf asserts that the first element is greater than or equal to the second
 //
-//    a.GreaterOrEqualf(2, 1, "error message %s", "formatted")
-//    a.GreaterOrEqualf(2, 2, "error message %s", "formatted")
-//    a.GreaterOrEqualf("b", "a", "error message %s", "formatted")
-//    a.GreaterOrEqualf("b", "b", "error message %s", "formatted")
+//	a.GreaterOrEqualf(2, 1, "error message %s", "formatted")
+//	a.GreaterOrEqualf(2, 2, "error message %s", "formatted")
+//	a.GreaterOrEqualf("b", "a", "error message %s", "formatted")
+//	a.GreaterOrEqualf("b", "b", "error message %s", "formatted")
 func (a *Assertions) GreaterOrEqualf(e1 interface{}, e2 interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -429,9 +513,9 @@ func (a *Assertions) GreaterOrEqualf(e1 interface{}, e2 interface{}, msg string,
 
 // Greaterf asserts that the first element is greater than the second
 //
-//    a.Greaterf(2, 1, "error message %s", "formatted")
-//    a.Greaterf(float64(2), float64(1), "error message %s", "formatted")
-//    a.Greaterf("b", "a", "error message %s", "formatted")
+//	a.Greaterf(2, 1, "error message %s", "formatted")
+//	a.Greaterf(float64(2), float64(1), "error message %s", "formatted")
+//	a.Greaterf("b", "a", "error message %s", "formatted")
 func (a *Assertions) Greaterf(e1 interface{}, e2 interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -442,7 +526,7 @@ func (a *Assertions) Greaterf(e1 interface{}, e2 interface{}, msg string, args .
 // HTTPBodyContains asserts that a specified handler returns a
 // body that contains a string.
 //
-//  a.HTTPBodyContains(myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky")
+//	a.HTTPBodyContains(myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPBodyContains(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msgAndArgs ...interface{}) bool {
@@ -455,7 +539,7 @@ func (a *Assertions) HTTPBodyContains(handler http.HandlerFunc, method string, u
 // HTTPBodyContainsf asserts that a specified handler returns a
 // body that contains a string.
 //
-//  a.HTTPBodyContainsf(myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
+//	a.HTTPBodyContainsf(myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPBodyContainsf(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msg string, args ...interface{}) bool {
@@ -468,7 +552,7 @@ func (a *Assertions) HTTPBodyContainsf(handler http.HandlerFunc, method string,
 // HTTPBodyNotContains asserts that a specified handler returns a
 // body that does not contain a string.
 //
-//  a.HTTPBodyNotContains(myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky")
+//	a.HTTPBodyNotContains(myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPBodyNotContains(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msgAndArgs ...interface{}) bool {
@@ -481,7 +565,7 @@ func (a *Assertions) HTTPBodyNotContains(handler http.HandlerFunc, method string
 // HTTPBodyNotContainsf asserts that a specified handler returns a
 // body that does not contain a string.
 //
-//  a.HTTPBodyNotContainsf(myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
+//	a.HTTPBodyNotContainsf(myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPBodyNotContainsf(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msg string, args ...interface{}) bool {
@@ -493,7 +577,7 @@ func (a *Assertions) HTTPBodyNotContainsf(handler http.HandlerFunc, method strin
 
 // HTTPError asserts that a specified handler returns an error status code.
 //
-//  a.HTTPError(myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//	a.HTTPError(myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPError(handler http.HandlerFunc, method string, url string, values url.Values, msgAndArgs ...interface{}) bool {
@@ -505,7 +589,7 @@ func (a *Assertions) HTTPError(handler http.HandlerFunc, method string, url stri
 
 // HTTPErrorf asserts that a specified handler returns an error status code.
 //
-//  a.HTTPErrorf(myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//	a.HTTPErrorf(myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPErrorf(handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) bool {
@@ -517,7 +601,7 @@ func (a *Assertions) HTTPErrorf(handler http.HandlerFunc, method string, url str
 
 // HTTPRedirect asserts that a specified handler returns a redirect status code.
 //
-//  a.HTTPRedirect(myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//	a.HTTPRedirect(myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPRedirect(handler http.HandlerFunc, method string, url string, values url.Values, msgAndArgs ...interface{}) bool {
@@ -529,7 +613,7 @@ func (a *Assertions) HTTPRedirect(handler http.HandlerFunc, method string, url s
 
 // HTTPRedirectf asserts that a specified handler returns a redirect status code.
 //
-//  a.HTTPRedirectf(myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//	a.HTTPRedirectf(myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPRedirectf(handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) bool {
@@ -541,7 +625,7 @@ func (a *Assertions) HTTPRedirectf(handler http.HandlerFunc, method string, url
 
 // HTTPStatusCode asserts that a specified handler returns a specified status code.
 //
-//  a.HTTPStatusCode(myHandler, "GET", "/notImplemented", nil, 501)
+//	a.HTTPStatusCode(myHandler, "GET", "/notImplemented", nil, 501)
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPStatusCode(handler http.HandlerFunc, method string, url string, values url.Values, statuscode int, msgAndArgs ...interface{}) bool {
@@ -553,7 +637,7 @@ func (a *Assertions) HTTPStatusCode(handler http.HandlerFunc, method string, url
 
 // HTTPStatusCodef asserts that a specified handler returns a specified status code.
 //
-//  a.HTTPStatusCodef(myHandler, "GET", "/notImplemented", nil, 501, "error message %s", "formatted")
+//	a.HTTPStatusCodef(myHandler, "GET", "/notImplemented", nil, 501, "error message %s", "formatted")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPStatusCodef(handler http.HandlerFunc, method string, url string, values url.Values, statuscode int, msg string, args ...interface{}) bool {
@@ -565,7 +649,7 @@ func (a *Assertions) HTTPStatusCodef(handler http.HandlerFunc, method string, ur
 
 // HTTPSuccess asserts that a specified handler returns a success status code.
 //
-//  a.HTTPSuccess(myHandler, "POST", "http://www.google.com", nil)
+//	a.HTTPSuccess(myHandler, "POST", "http://www.google.com", nil)
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPSuccess(handler http.HandlerFunc, method string, url string, values url.Values, msgAndArgs ...interface{}) bool {
@@ -577,7 +661,7 @@ func (a *Assertions) HTTPSuccess(handler http.HandlerFunc, method string, url st
 
 // HTTPSuccessf asserts that a specified handler returns a success status code.
 //
-//  a.HTTPSuccessf(myHandler, "POST", "http://www.google.com", nil, "error message %s", "formatted")
+//	a.HTTPSuccessf(myHandler, "POST", "http://www.google.com", nil, "error message %s", "formatted")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPSuccessf(handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) bool {
@@ -589,7 +673,7 @@ func (a *Assertions) HTTPSuccessf(handler http.HandlerFunc, method string, url s
 
 // Implements asserts that an object is implemented by the specified interface.
 //
-//    a.Implements((*MyInterface)(nil), new(MyObject))
+//	a.Implements((*MyInterface)(nil), new(MyObject))
 func (a *Assertions) Implements(interfaceObject interface{}, object interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -599,7 +683,7 @@ func (a *Assertions) Implements(interfaceObject interface{}, object interface{},
 
 // Implementsf asserts that an object is implemented by the specified interface.
 //
-//    a.Implementsf((*MyInterface)(nil), new(MyObject), "error message %s", "formatted")
+//	a.Implementsf((*MyInterface)(nil), new(MyObject), "error message %s", "formatted")
 func (a *Assertions) Implementsf(interfaceObject interface{}, object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -609,7 +693,7 @@ func (a *Assertions) Implementsf(interfaceObject interface{}, object interface{}
 
 // InDelta asserts that the two numerals are within delta of each other.
 //
-// 	 a.InDelta(math.Pi, 22/7.0, 0.01)
+//	a.InDelta(math.Pi, 22/7.0, 0.01)
 func (a *Assertions) InDelta(expected interface{}, actual interface{}, delta float64, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -651,7 +735,7 @@ func (a *Assertions) InDeltaSlicef(expected interface{}, actual interface{}, del
 
 // InDeltaf asserts that the two numerals are within delta of each other.
 //
-// 	 a.InDeltaf(math.Pi, 22/7.0, 0.01, "error message %s", "formatted")
+//	a.InDeltaf(math.Pi, 22/7.0, 0.01, "error message %s", "formatted")
 func (a *Assertions) InDeltaf(expected interface{}, actual interface{}, delta float64, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -693,9 +777,9 @@ func (a *Assertions) InEpsilonf(expected interface{}, actual interface{}, epsilo
 
 // IsDecreasing asserts that the collection is decreasing
 //
-//    a.IsDecreasing([]int{2, 1, 0})
-//    a.IsDecreasing([]float{2, 1})
-//    a.IsDecreasing([]string{"b", "a"})
+//	a.IsDecreasing([]int{2, 1, 0})
+//	a.IsDecreasing([]float{2, 1})
+//	a.IsDecreasing([]string{"b", "a"})
 func (a *Assertions) IsDecreasing(object interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -705,9 +789,9 @@ func (a *Assertions) IsDecreasing(object interface{}, msgAndArgs ...interface{})
 
 // IsDecreasingf asserts that the collection is decreasing
 //
-//    a.IsDecreasingf([]int{2, 1, 0}, "error message %s", "formatted")
-//    a.IsDecreasingf([]float{2, 1}, "error message %s", "formatted")
-//    a.IsDecreasingf([]string{"b", "a"}, "error message %s", "formatted")
+//	a.IsDecreasingf([]int{2, 1, 0}, "error message %s", "formatted")
+//	a.IsDecreasingf([]float{2, 1}, "error message %s", "formatted")
+//	a.IsDecreasingf([]string{"b", "a"}, "error message %s", "formatted")
 func (a *Assertions) IsDecreasingf(object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -717,9 +801,9 @@ func (a *Assertions) IsDecreasingf(object interface{}, msg string, args ...inter
 
 // IsIncreasing asserts that the collection is increasing
 //
-//    a.IsIncreasing([]int{1, 2, 3})
-//    a.IsIncreasing([]float{1, 2})
-//    a.IsIncreasing([]string{"a", "b"})
+//	a.IsIncreasing([]int{1, 2, 3})
+//	a.IsIncreasing([]float{1, 2})
+//	a.IsIncreasing([]string{"a", "b"})
 func (a *Assertions) IsIncreasing(object interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -729,9 +813,9 @@ func (a *Assertions) IsIncreasing(object interface{}, msgAndArgs ...interface{})
 
 // IsIncreasingf asserts that the collection is increasing
 //
-//    a.IsIncreasingf([]int{1, 2, 3}, "error message %s", "formatted")
-//    a.IsIncreasingf([]float{1, 2}, "error message %s", "formatted")
-//    a.IsIncreasingf([]string{"a", "b"}, "error message %s", "formatted")
+//	a.IsIncreasingf([]int{1, 2, 3}, "error message %s", "formatted")
+//	a.IsIncreasingf([]float{1, 2}, "error message %s", "formatted")
+//	a.IsIncreasingf([]string{"a", "b"}, "error message %s", "formatted")
 func (a *Assertions) IsIncreasingf(object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -741,9 +825,9 @@ func (a *Assertions) IsIncreasingf(object interface{}, msg string, args ...inter
 
 // IsNonDecreasing asserts that the collection is not decreasing
 //
-//    a.IsNonDecreasing([]int{1, 1, 2})
-//    a.IsNonDecreasing([]float{1, 2})
-//    a.IsNonDecreasing([]string{"a", "b"})
+//	a.IsNonDecreasing([]int{1, 1, 2})
+//	a.IsNonDecreasing([]float{1, 2})
+//	a.IsNonDecreasing([]string{"a", "b"})
 func (a *Assertions) IsNonDecreasing(object interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -753,9 +837,9 @@ func (a *Assertions) IsNonDecreasing(object interface{}, msgAndArgs ...interface
 
 // IsNonDecreasingf asserts that the collection is not decreasing
 //
-//    a.IsNonDecreasingf([]int{1, 1, 2}, "error message %s", "formatted")
-//    a.IsNonDecreasingf([]float{1, 2}, "error message %s", "formatted")
-//    a.IsNonDecreasingf([]string{"a", "b"}, "error message %s", "formatted")
+//	a.IsNonDecreasingf([]int{1, 1, 2}, "error message %s", "formatted")
+//	a.IsNonDecreasingf([]float{1, 2}, "error message %s", "formatted")
+//	a.IsNonDecreasingf([]string{"a", "b"}, "error message %s", "formatted")
 func (a *Assertions) IsNonDecreasingf(object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -765,9 +849,9 @@ func (a *Assertions) IsNonDecreasingf(object interface{}, msg string, args ...in
 
 // IsNonIncreasing asserts that the collection is not increasing
 //
-//    a.IsNonIncreasing([]int{2, 1, 1})
-//    a.IsNonIncreasing([]float{2, 1})
-//    a.IsNonIncreasing([]string{"b", "a"})
+//	a.IsNonIncreasing([]int{2, 1, 1})
+//	a.IsNonIncreasing([]float{2, 1})
+//	a.IsNonIncreasing([]string{"b", "a"})
 func (a *Assertions) IsNonIncreasing(object interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -777,9 +861,9 @@ func (a *Assertions) IsNonIncreasing(object interface{}, msgAndArgs ...interface
 
 // IsNonIncreasingf asserts that the collection is not increasing
 //
-//    a.IsNonIncreasingf([]int{2, 1, 1}, "error message %s", "formatted")
-//    a.IsNonIncreasingf([]float{2, 1}, "error message %s", "formatted")
-//    a.IsNonIncreasingf([]string{"b", "a"}, "error message %s", "formatted")
+//	a.IsNonIncreasingf([]int{2, 1, 1}, "error message %s", "formatted")
+//	a.IsNonIncreasingf([]float{2, 1}, "error message %s", "formatted")
+//	a.IsNonIncreasingf([]string{"b", "a"}, "error message %s", "formatted")
 func (a *Assertions) IsNonIncreasingf(object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -805,7 +889,7 @@ func (a *Assertions) IsTypef(expectedType interface{}, object interface{}, msg s
 
 // JSONEq asserts that two JSON strings are equivalent.
 //
-//  a.JSONEq(`{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`)
+//	a.JSONEq(`{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`)
 func (a *Assertions) JSONEq(expected string, actual string, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -815,7 +899,7 @@ func (a *Assertions) JSONEq(expected string, actual string, msgAndArgs ...interf
 
 // JSONEqf asserts that two JSON strings are equivalent.
 //
-//  a.JSONEqf(`{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`, "error message %s", "formatted")
+//	a.JSONEqf(`{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`, "error message %s", "formatted")
 func (a *Assertions) JSONEqf(expected string, actual string, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -826,7 +910,7 @@ func (a *Assertions) JSONEqf(expected string, actual string, msg string, args ..
 // Len asserts that the specified object has specific length.
 // Len also fails if the object has a type that len() not accept.
 //
-//    a.Len(mySlice, 3)
+//	a.Len(mySlice, 3)
 func (a *Assertions) Len(object interface{}, length int, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -837,7 +921,7 @@ func (a *Assertions) Len(object interface{}, length int, msgAndArgs ...interface
 // Lenf asserts that the specified object has specific length.
 // Lenf also fails if the object has a type that len() not accept.
 //
-//    a.Lenf(mySlice, 3, "error message %s", "formatted")
+//	a.Lenf(mySlice, 3, "error message %s", "formatted")
 func (a *Assertions) Lenf(object interface{}, length int, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -847,9 +931,9 @@ func (a *Assertions) Lenf(object interface{}, length int, msg string, args ...in
 
 // Less asserts that the first element is less than the second
 //
-//    a.Less(1, 2)
-//    a.Less(float64(1), float64(2))
-//    a.Less("a", "b")
+//	a.Less(1, 2)
+//	a.Less(float64(1), float64(2))
+//	a.Less("a", "b")
 func (a *Assertions) Less(e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -859,10 +943,10 @@ func (a *Assertions) Less(e1 interface{}, e2 interface{}, msgAndArgs ...interfac
 
 // LessOrEqual asserts that the first element is less than or equal to the second
 //
-//    a.LessOrEqual(1, 2)
-//    a.LessOrEqual(2, 2)
-//    a.LessOrEqual("a", "b")
-//    a.LessOrEqual("b", "b")
+//	a.LessOrEqual(1, 2)
+//	a.LessOrEqual(2, 2)
+//	a.LessOrEqual("a", "b")
+//	a.LessOrEqual("b", "b")
 func (a *Assertions) LessOrEqual(e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -872,10 +956,10 @@ func (a *Assertions) LessOrEqual(e1 interface{}, e2 interface{}, msgAndArgs ...i
 
 // LessOrEqualf asserts that the first element is less than or equal to the second
 //
-//    a.LessOrEqualf(1, 2, "error message %s", "formatted")
-//    a.LessOrEqualf(2, 2, "error message %s", "formatted")
-//    a.LessOrEqualf("a", "b", "error message %s", "formatted")
-//    a.LessOrEqualf("b", "b", "error message %s", "formatted")
+//	a.LessOrEqualf(1, 2, "error message %s", "formatted")
+//	a.LessOrEqualf(2, 2, "error message %s", "formatted")
+//	a.LessOrEqualf("a", "b", "error message %s", "formatted")
+//	a.LessOrEqualf("b", "b", "error message %s", "formatted")
 func (a *Assertions) LessOrEqualf(e1 interface{}, e2 interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -885,9 +969,9 @@ func (a *Assertions) LessOrEqualf(e1 interface{}, e2 interface{}, msg string, ar
 
 // Lessf asserts that the first element is less than the second
 //
-//    a.Lessf(1, 2, "error message %s", "formatted")
-//    a.Lessf(float64(1), float64(2), "error message %s", "formatted")
-//    a.Lessf("a", "b", "error message %s", "formatted")
+//	a.Lessf(1, 2, "error message %s", "formatted")
+//	a.Lessf(float64(1), float64(2), "error message %s", "formatted")
+//	a.Lessf("a", "b", "error message %s", "formatted")
 func (a *Assertions) Lessf(e1 interface{}, e2 interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -897,8 +981,8 @@ func (a *Assertions) Lessf(e1 interface{}, e2 interface{}, msg string, args ...i
 
 // Negative asserts that the specified element is negative
 //
-//    a.Negative(-1)
-//    a.Negative(-1.23)
+//	a.Negative(-1)
+//	a.Negative(-1.23)
 func (a *Assertions) Negative(e interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -908,8 +992,8 @@ func (a *Assertions) Negative(e interface{}, msgAndArgs ...interface{}) bool {
 
 // Negativef asserts that the specified element is negative
 //
-//    a.Negativef(-1, "error message %s", "formatted")
-//    a.Negativef(-1.23, "error message %s", "formatted")
+//	a.Negativef(-1, "error message %s", "formatted")
+//	a.Negativef(-1.23, "error message %s", "formatted")
 func (a *Assertions) Negativef(e interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -920,7 +1004,7 @@ func (a *Assertions) Negativef(e interface{}, msg string, args ...interface{}) b
 // Never asserts that the given condition doesn't satisfy in waitFor time,
 // periodically checking the target function each tick.
 //
-//    a.Never(func() bool { return false; }, time.Second, 10*time.Millisecond)
+//	a.Never(func() bool { return false; }, time.Second, 10*time.Millisecond)
 func (a *Assertions) Never(condition func() bool, waitFor time.Duration, tick time.Duration, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -931,7 +1015,7 @@ func (a *Assertions) Never(condition func() bool, waitFor time.Duration, tick ti
 // Neverf asserts that the given condition doesn't satisfy in waitFor time,
 // periodically checking the target function each tick.
 //
-//    a.Neverf(func() bool { return false; }, time.Second, 10*time.Millisecond, "error message %s", "formatted")
+//	a.Neverf(func() bool { return false; }, time.Second, 10*time.Millisecond, "error message %s", "formatted")
 func (a *Assertions) Neverf(condition func() bool, waitFor time.Duration, tick time.Duration, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -941,7 +1025,7 @@ func (a *Assertions) Neverf(condition func() bool, waitFor time.Duration, tick t
 
 // Nil asserts that the specified object is nil.
 //
-//    a.Nil(err)
+//	a.Nil(err)
 func (a *Assertions) Nil(object interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -951,7 +1035,7 @@ func (a *Assertions) Nil(object interface{}, msgAndArgs ...interface{}) bool {
 
 // Nilf asserts that the specified object is nil.
 //
-//    a.Nilf(err, "error message %s", "formatted")
+//	a.Nilf(err, "error message %s", "formatted")
 func (a *Assertions) Nilf(object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -979,10 +1063,10 @@ func (a *Assertions) NoDirExistsf(path string, msg string, args ...interface{})
 
 // NoError asserts that a function returned no error (i.e. `nil`).
 //
-//   actualObj, err := SomeFunction()
-//   if a.NoError(err) {
-// 	   assert.Equal(t, expectedObj, actualObj)
-//   }
+//	  actualObj, err := SomeFunction()
+//	  if a.NoError(err) {
+//		   assert.Equal(t, expectedObj, actualObj)
+//	  }
 func (a *Assertions) NoError(err error, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -992,10 +1076,10 @@ func (a *Assertions) NoError(err error, msgAndArgs ...interface{}) bool {
 
 // NoErrorf asserts that a function returned no error (i.e. `nil`).
 //
-//   actualObj, err := SomeFunction()
-//   if a.NoErrorf(err, "error message %s", "formatted") {
-// 	   assert.Equal(t, expectedObj, actualObj)
-//   }
+//	  actualObj, err := SomeFunction()
+//	  if a.NoErrorf(err, "error message %s", "formatted") {
+//		   assert.Equal(t, expectedObj, actualObj)
+//	  }
 func (a *Assertions) NoErrorf(err error, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1024,9 +1108,9 @@ func (a *Assertions) NoFileExistsf(path string, msg string, args ...interface{})
 // NotContains asserts that the specified string, list(array, slice...) or map does NOT contain the
 // specified substring or element.
 //
-//    a.NotContains("Hello World", "Earth")
-//    a.NotContains(["Hello", "World"], "Earth")
-//    a.NotContains({"Hello": "World"}, "Earth")
+//	a.NotContains("Hello World", "Earth")
+//	a.NotContains(["Hello", "World"], "Earth")
+//	a.NotContains({"Hello": "World"}, "Earth")
 func (a *Assertions) NotContains(s interface{}, contains interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1037,9 +1121,9 @@ func (a *Assertions) NotContains(s interface{}, contains interface{}, msgAndArgs
 // NotContainsf asserts that the specified string, list(array, slice...) or map does NOT contain the
 // specified substring or element.
 //
-//    a.NotContainsf("Hello World", "Earth", "error message %s", "formatted")
-//    a.NotContainsf(["Hello", "World"], "Earth", "error message %s", "formatted")
-//    a.NotContainsf({"Hello": "World"}, "Earth", "error message %s", "formatted")
+//	a.NotContainsf("Hello World", "Earth", "error message %s", "formatted")
+//	a.NotContainsf(["Hello", "World"], "Earth", "error message %s", "formatted")
+//	a.NotContainsf({"Hello": "World"}, "Earth", "error message %s", "formatted")
 func (a *Assertions) NotContainsf(s interface{}, contains interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1050,9 +1134,9 @@ func (a *Assertions) NotContainsf(s interface{}, contains interface{}, msg strin
 // NotEmpty asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
 // a slice or a channel with len == 0.
 //
-//  if a.NotEmpty(obj) {
-//    assert.Equal(t, "two", obj[1])
-//  }
+//	if a.NotEmpty(obj) {
+//	  assert.Equal(t, "two", obj[1])
+//	}
 func (a *Assertions) NotEmpty(object interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1063,9 +1147,9 @@ func (a *Assertions) NotEmpty(object interface{}, msgAndArgs ...interface{}) boo
 // NotEmptyf asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
 // a slice or a channel with len == 0.
 //
-//  if a.NotEmptyf(obj, "error message %s", "formatted") {
-//    assert.Equal(t, "two", obj[1])
-//  }
+//	if a.NotEmptyf(obj, "error message %s", "formatted") {
+//	  assert.Equal(t, "two", obj[1])
+//	}
 func (a *Assertions) NotEmptyf(object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1075,7 +1159,7 @@ func (a *Assertions) NotEmptyf(object interface{}, msg string, args ...interface
 
 // NotEqual asserts that the specified values are NOT equal.
 //
-//    a.NotEqual(obj1, obj2)
+//	a.NotEqual(obj1, obj2)
 //
 // Pointer variable equality is determined based on the equality of the
 // referenced values (as opposed to the memory addresses).
@@ -1088,7 +1172,7 @@ func (a *Assertions) NotEqual(expected interface{}, actual interface{}, msgAndAr
 
 // NotEqualValues asserts that two objects are not equal even when converted to the same type
 //
-//    a.NotEqualValues(obj1, obj2)
+//	a.NotEqualValues(obj1, obj2)
 func (a *Assertions) NotEqualValues(expected interface{}, actual interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1098,7 +1182,7 @@ func (a *Assertions) NotEqualValues(expected interface{}, actual interface{}, ms
 
 // NotEqualValuesf asserts that two objects are not equal even when converted to the same type
 //
-//    a.NotEqualValuesf(obj1, obj2, "error message %s", "formatted")
+//	a.NotEqualValuesf(obj1, obj2, "error message %s", "formatted")
 func (a *Assertions) NotEqualValuesf(expected interface{}, actual interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1108,7 +1192,7 @@ func (a *Assertions) NotEqualValuesf(expected interface{}, actual interface{}, m
 
 // NotEqualf asserts that the specified values are NOT equal.
 //
-//    a.NotEqualf(obj1, obj2, "error message %s", "formatted")
+//	a.NotEqualf(obj1, obj2, "error message %s", "formatted")
 //
 // Pointer variable equality is determined based on the equality of the
 // referenced values (as opposed to the memory addresses).
@@ -1139,7 +1223,7 @@ func (a *Assertions) NotErrorIsf(err error, target error, msg string, args ...in
 
 // NotNil asserts that the specified object is not nil.
 //
-//    a.NotNil(err)
+//	a.NotNil(err)
 func (a *Assertions) NotNil(object interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1149,7 +1233,7 @@ func (a *Assertions) NotNil(object interface{}, msgAndArgs ...interface{}) bool
 
 // NotNilf asserts that the specified object is not nil.
 //
-//    a.NotNilf(err, "error message %s", "formatted")
+//	a.NotNilf(err, "error message %s", "formatted")
 func (a *Assertions) NotNilf(object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1159,7 +1243,7 @@ func (a *Assertions) NotNilf(object interface{}, msg string, args ...interface{}
 
 // NotPanics asserts that the code inside the specified PanicTestFunc does NOT panic.
 //
-//   a.NotPanics(func(){ RemainCalm() })
+//	a.NotPanics(func(){ RemainCalm() })
 func (a *Assertions) NotPanics(f PanicTestFunc, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1169,7 +1253,7 @@ func (a *Assertions) NotPanics(f PanicTestFunc, msgAndArgs ...interface{}) bool
 
 // NotPanicsf asserts that the code inside the specified PanicTestFunc does NOT panic.
 //
-//   a.NotPanicsf(func(){ RemainCalm() }, "error message %s", "formatted")
+//	a.NotPanicsf(func(){ RemainCalm() }, "error message %s", "formatted")
 func (a *Assertions) NotPanicsf(f PanicTestFunc, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1179,8 +1263,8 @@ func (a *Assertions) NotPanicsf(f PanicTestFunc, msg string, args ...interface{}
 
 // NotRegexp asserts that a specified regexp does not match a string.
 //
-//  a.NotRegexp(regexp.MustCompile("starts"), "it's starting")
-//  a.NotRegexp("^start", "it's not starting")
+//	a.NotRegexp(regexp.MustCompile("starts"), "it's starting")
+//	a.NotRegexp("^start", "it's not starting")
 func (a *Assertions) NotRegexp(rx interface{}, str interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1190,8 +1274,8 @@ func (a *Assertions) NotRegexp(rx interface{}, str interface{}, msgAndArgs ...in
 
 // NotRegexpf asserts that a specified regexp does not match a string.
 //
-//  a.NotRegexpf(regexp.MustCompile("starts"), "it's starting", "error message %s", "formatted")
-//  a.NotRegexpf("^start", "it's not starting", "error message %s", "formatted")
+//	a.NotRegexpf(regexp.MustCompile("starts"), "it's starting", "error message %s", "formatted")
+//	a.NotRegexpf("^start", "it's not starting", "error message %s", "formatted")
 func (a *Assertions) NotRegexpf(rx interface{}, str interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1201,7 +1285,7 @@ func (a *Assertions) NotRegexpf(rx interface{}, str interface{}, msg string, arg
 
 // NotSame asserts that two pointers do not reference the same object.
 //
-//    a.NotSame(ptr1, ptr2)
+//	a.NotSame(ptr1, ptr2)
 //
 // Both arguments must be pointer variables. Pointer variable sameness is
 // determined based on the equality of both type and value.
@@ -1214,7 +1298,7 @@ func (a *Assertions) NotSame(expected interface{}, actual interface{}, msgAndArg
 
 // NotSamef asserts that two pointers do not reference the same object.
 //
-//    a.NotSamef(ptr1, ptr2, "error message %s", "formatted")
+//	a.NotSamef(ptr1, ptr2, "error message %s", "formatted")
 //
 // Both arguments must be pointer variables. Pointer variable sameness is
 // determined based on the equality of both type and value.
@@ -1228,7 +1312,7 @@ func (a *Assertions) NotSamef(expected interface{}, actual interface{}, msg stri
 // NotSubset asserts that the specified list(array, slice...) contains not all
 // elements given in the specified subset(array, slice...).
 //
-//    a.NotSubset([1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]")
+//	a.NotSubset([1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]")
 func (a *Assertions) NotSubset(list interface{}, subset interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1239,7 +1323,7 @@ func (a *Assertions) NotSubset(list interface{}, subset interface{}, msgAndArgs
 // NotSubsetf asserts that the specified list(array, slice...) contains not all
 // elements given in the specified subset(array, slice...).
 //
-//    a.NotSubsetf([1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]", "error message %s", "formatted")
+//	a.NotSubsetf([1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]", "error message %s", "formatted")
 func (a *Assertions) NotSubsetf(list interface{}, subset interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1265,7 +1349,7 @@ func (a *Assertions) NotZerof(i interface{}, msg string, args ...interface{}) bo
 
 // Panics asserts that the code inside the specified PanicTestFunc panics.
 //
-//   a.Panics(func(){ GoCrazy() })
+//	a.Panics(func(){ GoCrazy() })
 func (a *Assertions) Panics(f PanicTestFunc, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1277,7 +1361,7 @@ func (a *Assertions) Panics(f PanicTestFunc, msgAndArgs ...interface{}) bool {
 // panics, and that the recovered panic value is an error that satisfies the
 // EqualError comparison.
 //
-//   a.PanicsWithError("crazy error", func(){ GoCrazy() })
+//	a.PanicsWithError("crazy error", func(){ GoCrazy() })
 func (a *Assertions) PanicsWithError(errString string, f PanicTestFunc, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1289,7 +1373,7 @@ func (a *Assertions) PanicsWithError(errString string, f PanicTestFunc, msgAndAr
 // panics, and that the recovered panic value is an error that satisfies the
 // EqualError comparison.
 //
-//   a.PanicsWithErrorf("crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
+//	a.PanicsWithErrorf("crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
 func (a *Assertions) PanicsWithErrorf(errString string, f PanicTestFunc, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1300,7 +1384,7 @@ func (a *Assertions) PanicsWithErrorf(errString string, f PanicTestFunc, msg str
 // PanicsWithValue asserts that the code inside the specified PanicTestFunc panics, and that
 // the recovered panic value equals the expected panic value.
 //
-//   a.PanicsWithValue("crazy error", func(){ GoCrazy() })
+//	a.PanicsWithValue("crazy error", func(){ GoCrazy() })
 func (a *Assertions) PanicsWithValue(expected interface{}, f PanicTestFunc, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1311,7 +1395,7 @@ func (a *Assertions) PanicsWithValue(expected interface{}, f PanicTestFunc, msgA
 // PanicsWithValuef asserts that the code inside the specified PanicTestFunc panics, and that
 // the recovered panic value equals the expected panic value.
 //
-//   a.PanicsWithValuef("crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
+//	a.PanicsWithValuef("crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
 func (a *Assertions) PanicsWithValuef(expected interface{}, f PanicTestFunc, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1321,7 +1405,7 @@ func (a *Assertions) PanicsWithValuef(expected interface{}, f PanicTestFunc, msg
 
 // Panicsf asserts that the code inside the specified PanicTestFunc panics.
 //
-//   a.Panicsf(func(){ GoCrazy() }, "error message %s", "formatted")
+//	a.Panicsf(func(){ GoCrazy() }, "error message %s", "formatted")
 func (a *Assertions) Panicsf(f PanicTestFunc, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1331,8 +1415,8 @@ func (a *Assertions) Panicsf(f PanicTestFunc, msg string, args ...interface{}) b
 
 // Positive asserts that the specified element is positive
 //
-//    a.Positive(1)
-//    a.Positive(1.23)
+//	a.Positive(1)
+//	a.Positive(1.23)
 func (a *Assertions) Positive(e interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1342,8 +1426,8 @@ func (a *Assertions) Positive(e interface{}, msgAndArgs ...interface{}) bool {
 
 // Positivef asserts that the specified element is positive
 //
-//    a.Positivef(1, "error message %s", "formatted")
-//    a.Positivef(1.23, "error message %s", "formatted")
+//	a.Positivef(1, "error message %s", "formatted")
+//	a.Positivef(1.23, "error message %s", "formatted")
 func (a *Assertions) Positivef(e interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1353,8 +1437,8 @@ func (a *Assertions) Positivef(e interface{}, msg string, args ...interface{}) b
 
 // Regexp asserts that a specified regexp matches a string.
 //
-//  a.Regexp(regexp.MustCompile("start"), "it's starting")
-//  a.Regexp("start...$", "it's not starting")
+//	a.Regexp(regexp.MustCompile("start"), "it's starting")
+//	a.Regexp("start...$", "it's not starting")
 func (a *Assertions) Regexp(rx interface{}, str interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1364,8 +1448,8 @@ func (a *Assertions) Regexp(rx interface{}, str interface{}, msgAndArgs ...inter
 
 // Regexpf asserts that a specified regexp matches a string.
 //
-//  a.Regexpf(regexp.MustCompile("start"), "it's starting", "error message %s", "formatted")
-//  a.Regexpf("start...$", "it's not starting", "error message %s", "formatted")
+//	a.Regexpf(regexp.MustCompile("start"), "it's starting", "error message %s", "formatted")
+//	a.Regexpf("start...$", "it's not starting", "error message %s", "formatted")
 func (a *Assertions) Regexpf(rx interface{}, str interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1375,7 +1459,7 @@ func (a *Assertions) Regexpf(rx interface{}, str interface{}, msg string, args .
 
 // Same asserts that two pointers reference the same object.
 //
-//    a.Same(ptr1, ptr2)
+//	a.Same(ptr1, ptr2)
 //
 // Both arguments must be pointer variables. Pointer variable sameness is
 // determined based on the equality of both type and value.
@@ -1388,7 +1472,7 @@ func (a *Assertions) Same(expected interface{}, actual interface{}, msgAndArgs .
 
 // Samef asserts that two pointers reference the same object.
 //
-//    a.Samef(ptr1, ptr2, "error message %s", "formatted")
+//	a.Samef(ptr1, ptr2, "error message %s", "formatted")
 //
 // Both arguments must be pointer variables. Pointer variable sameness is
 // determined based on the equality of both type and value.
@@ -1402,7 +1486,7 @@ func (a *Assertions) Samef(expected interface{}, actual interface{}, msg string,
 // Subset asserts that the specified list(array, slice...) contains all
 // elements given in the specified subset(array, slice...).
 //
-//    a.Subset([1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]")
+//	a.Subset([1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]")
 func (a *Assertions) Subset(list interface{}, subset interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1413,7 +1497,7 @@ func (a *Assertions) Subset(list interface{}, subset interface{}, msgAndArgs ...
 // Subsetf asserts that the specified list(array, slice...) contains all
 // elements given in the specified subset(array, slice...).
 //
-//    a.Subsetf([1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]", "error message %s", "formatted")
+//	a.Subsetf([1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]", "error message %s", "formatted")
 func (a *Assertions) Subsetf(list interface{}, subset interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1423,7 +1507,7 @@ func (a *Assertions) Subsetf(list interface{}, subset interface{}, msg string, a
 
 // True asserts that the specified value is true.
 //
-//    a.True(myBool)
+//	a.True(myBool)
 func (a *Assertions) True(value bool, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1433,7 +1517,7 @@ func (a *Assertions) True(value bool, msgAndArgs ...interface{}) bool {
 
 // Truef asserts that the specified value is true.
 //
-//    a.Truef(myBool, "error message %s", "formatted")
+//	a.Truef(myBool, "error message %s", "formatted")
 func (a *Assertions) Truef(value bool, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1443,7 +1527,7 @@ func (a *Assertions) Truef(value bool, msg string, args ...interface{}) bool {
 
 // WithinDuration asserts that the two times are within duration delta of each other.
 //
-//   a.WithinDuration(time.Now(), time.Now(), 10*time.Second)
+//	a.WithinDuration(time.Now(), time.Now(), 10*time.Second)
 func (a *Assertions) WithinDuration(expected time.Time, actual time.Time, delta time.Duration, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1453,7 +1537,7 @@ func (a *Assertions) WithinDuration(expected time.Time, actual time.Time, delta
 
 // WithinDurationf asserts that the two times are within duration delta of each other.
 //
-//   a.WithinDurationf(time.Now(), time.Now(), 10*time.Second, "error message %s", "formatted")
+//	a.WithinDurationf(time.Now(), time.Now(), 10*time.Second, "error message %s", "formatted")
 func (a *Assertions) WithinDurationf(expected time.Time, actual time.Time, delta time.Duration, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1463,7 +1547,7 @@ func (a *Assertions) WithinDurationf(expected time.Time, actual time.Time, delta
 
 // WithinRange asserts that a time is within a time range (inclusive).
 //
-//   a.WithinRange(time.Now(), time.Now().Add(-time.Second), time.Now().Add(time.Second))
+//	a.WithinRange(time.Now(), time.Now().Add(-time.Second), time.Now().Add(time.Second))
 func (a *Assertions) WithinRange(actual time.Time, start time.Time, end time.Time, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1473,7 +1557,7 @@ func (a *Assertions) WithinRange(actual time.Time, start time.Time, end time.Tim
 
 // WithinRangef asserts that a time is within a time range (inclusive).
 //
-//   a.WithinRangef(time.Now(), time.Now().Add(-time.Second), time.Now().Add(time.Second), "error message %s", "formatted")
+//	a.WithinRangef(time.Now(), time.Now().Add(-time.Second), time.Now().Add(time.Second), "error message %s", "formatted")
 func (a *Assertions) WithinRangef(actual time.Time, start time.Time, end time.Time, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
diff --git a/vendor/github.com/stretchr/testify/assert/assertion_order.go b/vendor/github.com/stretchr/testify/assert/assertion_order.go
index 75944878..00df62a0 100644
--- a/vendor/github.com/stretchr/testify/assert/assertion_order.go
+++ b/vendor/github.com/stretchr/testify/assert/assertion_order.go
@@ -46,36 +46,36 @@ func isOrdered(t TestingT, object interface{}, allowedComparesResults []CompareT
 
 // IsIncreasing asserts that the collection is increasing
 //
-//    assert.IsIncreasing(t, []int{1, 2, 3})
-//    assert.IsIncreasing(t, []float{1, 2})
-//    assert.IsIncreasing(t, []string{"a", "b"})
+//	assert.IsIncreasing(t, []int{1, 2, 3})
+//	assert.IsIncreasing(t, []float{1, 2})
+//	assert.IsIncreasing(t, []string{"a", "b"})
 func IsIncreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 	return isOrdered(t, object, []CompareType{compareLess}, "\"%v\" is not less than \"%v\"", msgAndArgs...)
 }
 
 // IsNonIncreasing asserts that the collection is not increasing
 //
-//    assert.IsNonIncreasing(t, []int{2, 1, 1})
-//    assert.IsNonIncreasing(t, []float{2, 1})
-//    assert.IsNonIncreasing(t, []string{"b", "a"})
+//	assert.IsNonIncreasing(t, []int{2, 1, 1})
+//	assert.IsNonIncreasing(t, []float{2, 1})
+//	assert.IsNonIncreasing(t, []string{"b", "a"})
 func IsNonIncreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 	return isOrdered(t, object, []CompareType{compareEqual, compareGreater}, "\"%v\" is not greater than or equal to \"%v\"", msgAndArgs...)
 }
 
 // IsDecreasing asserts that the collection is decreasing
 //
-//    assert.IsDecreasing(t, []int{2, 1, 0})
-//    assert.IsDecreasing(t, []float{2, 1})
-//    assert.IsDecreasing(t, []string{"b", "a"})
+//	assert.IsDecreasing(t, []int{2, 1, 0})
+//	assert.IsDecreasing(t, []float{2, 1})
+//	assert.IsDecreasing(t, []string{"b", "a"})
 func IsDecreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 	return isOrdered(t, object, []CompareType{compareGreater}, "\"%v\" is not greater than \"%v\"", msgAndArgs...)
 }
 
 // IsNonDecreasing asserts that the collection is not decreasing
 //
-//    assert.IsNonDecreasing(t, []int{1, 1, 2})
-//    assert.IsNonDecreasing(t, []float{1, 2})
-//    assert.IsNonDecreasing(t, []string{"a", "b"})
+//	assert.IsNonDecreasing(t, []int{1, 1, 2})
+//	assert.IsNonDecreasing(t, []float{1, 2})
+//	assert.IsNonDecreasing(t, []string{"a", "b"})
 func IsNonDecreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 	return isOrdered(t, object, []CompareType{compareLess, compareEqual}, "\"%v\" is not less than or equal to \"%v\"", msgAndArgs...)
 }
diff --git a/vendor/github.com/stretchr/testify/assert/assertions.go b/vendor/github.com/stretchr/testify/assert/assertions.go
index fa1245b1..a55d1bba 100644
--- a/vendor/github.com/stretchr/testify/assert/assertions.go
+++ b/vendor/github.com/stretchr/testify/assert/assertions.go
@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"math"
 	"os"
-	"path/filepath"
 	"reflect"
 	"regexp"
 	"runtime"
@@ -76,6 +75,77 @@ func ObjectsAreEqual(expected, actual interface{}) bool {
 	return bytes.Equal(exp, act)
 }
 
+// copyExportedFields iterates downward through nested data structures and creates a copy
+// that only contains the exported struct fields.
+func copyExportedFields(expected interface{}) interface{} {
+	if isNil(expected) {
+		return expected
+	}
+
+	expectedType := reflect.TypeOf(expected)
+	expectedKind := expectedType.Kind()
+	expectedValue := reflect.ValueOf(expected)
+
+	switch expectedKind {
+	case reflect.Struct:
+		result := reflect.New(expectedType).Elem()
+		for i := 0; i < expectedType.NumField(); i++ {
+			field := expectedType.Field(i)
+			isExported := field.IsExported()
+			if isExported {
+				fieldValue := expectedValue.Field(i)
+				if isNil(fieldValue) || isNil(fieldValue.Interface()) {
+					continue
+				}
+				newValue := copyExportedFields(fieldValue.Interface())
+				result.Field(i).Set(reflect.ValueOf(newValue))
+			}
+		}
+		return result.Interface()
+
+	case reflect.Ptr:
+		result := reflect.New(expectedType.Elem())
+		unexportedRemoved := copyExportedFields(expectedValue.Elem().Interface())
+		result.Elem().Set(reflect.ValueOf(unexportedRemoved))
+		return result.Interface()
+
+	case reflect.Array, reflect.Slice:
+		result := reflect.MakeSlice(expectedType, expectedValue.Len(), expectedValue.Len())
+		for i := 0; i < expectedValue.Len(); i++ {
+			index := expectedValue.Index(i)
+			if isNil(index) {
+				continue
+			}
+			unexportedRemoved := copyExportedFields(index.Interface())
+			result.Index(i).Set(reflect.ValueOf(unexportedRemoved))
+		}
+		return result.Interface()
+
+	case reflect.Map:
+		result := reflect.MakeMap(expectedType)
+		for _, k := range expectedValue.MapKeys() {
+			index := expectedValue.MapIndex(k)
+			unexportedRemoved := copyExportedFields(index.Interface())
+			result.SetMapIndex(k, reflect.ValueOf(unexportedRemoved))
+		}
+		return result.Interface()
+
+	default:
+		return expected
+	}
+}
+
+// ObjectsExportedFieldsAreEqual determines if the exported (public) fields of two objects are
+// considered equal. This comparison of only exported fields is applied recursively to nested data
+// structures.
+//
+// This function does no assertion of any kind.
+func ObjectsExportedFieldsAreEqual(expected, actual interface{}) bool {
+	expectedCleaned := copyExportedFields(expected)
+	actualCleaned := copyExportedFields(actual)
+	return ObjectsAreEqualValues(expectedCleaned, actualCleaned)
+}
+
 // ObjectsAreEqualValues gets whether two objects are equal, or if their
 // values are equal.
 func ObjectsAreEqualValues(expected, actual interface{}) bool {
@@ -141,12 +211,11 @@ func CallerInfo() []string {
 		}
 
 		parts := strings.Split(file, "/")
-		file = parts[len(parts)-1]
 		if len(parts) > 1 {
+			filename := parts[len(parts)-1]
 			dir := parts[len(parts)-2]
-			if (dir != "assert" && dir != "mock" && dir != "require") || file == "mock_test.go" {
-				path, _ := filepath.Abs(file)
-				callers = append(callers, fmt.Sprintf("%s:%d", path, line))
+			if (dir != "assert" && dir != "mock" && dir != "require") || filename == "mock_test.go" {
+				callers = append(callers, fmt.Sprintf("%s:%d", file, line))
 			}
 		}
 
@@ -273,7 +342,7 @@ type labeledContent struct {
 
 // labeledOutput returns a string consisting of the provided labeledContent. Each labeled output is appended in the following manner:
 //
-//   \t{{label}}:{{align_spaces}}\t{{content}}\n
+//	\t{{label}}:{{align_spaces}}\t{{content}}\n
 //
 // The initial carriage return is required to undo/erase any padding added by testing.T.Errorf. The "\t{{label}}:" is for the label.
 // If a label is shorter than the longest label provided, padding spaces are added to make all the labels match in length. Once this
@@ -296,7 +365,7 @@ func labeledOutput(content ...labeledContent) string {
 
 // Implements asserts that an object is implemented by the specified interface.
 //
-//    assert.Implements(t, (*MyInterface)(nil), new(MyObject))
+//	assert.Implements(t, (*MyInterface)(nil), new(MyObject))
 func Implements(t TestingT, interfaceObject interface{}, object interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -328,7 +397,7 @@ func IsType(t TestingT, expectedType interface{}, object interface{}, msgAndArgs
 
 // Equal asserts that two objects are equal.
 //
-//    assert.Equal(t, 123, 123)
+//	assert.Equal(t, 123, 123)
 //
 // Pointer variable equality is determined based on the equality of the
 // referenced values (as opposed to the memory addresses). Function equality
@@ -369,7 +438,7 @@ func validateEqualArgs(expected, actual interface{}) error {
 
 // Same asserts that two pointers reference the same object.
 //
-//    assert.Same(t, ptr1, ptr2)
+//	assert.Same(t, ptr1, ptr2)
 //
 // Both arguments must be pointer variables. Pointer variable sameness is
 // determined based on the equality of both type and value.
@@ -389,7 +458,7 @@ func Same(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) b
 
 // NotSame asserts that two pointers do not reference the same object.
 //
-//    assert.NotSame(t, ptr1, ptr2)
+//	assert.NotSame(t, ptr1, ptr2)
 //
 // Both arguments must be pointer variables. Pointer variable sameness is
 // determined based on the equality of both type and value.
@@ -457,7 +526,7 @@ func truncatingFormat(data interface{}) string {
 // EqualValues asserts that two objects are equal or convertable to the same types
 // and equal.
 //
-//    assert.EqualValues(t, uint32(123), int32(123))
+//	assert.EqualValues(t, uint32(123), int32(123))
 func EqualValues(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -475,9 +544,53 @@ func EqualValues(t TestingT, expected, actual interface{}, msgAndArgs ...interfa
 
 }
 
+// EqualExportedValues asserts that the types of two objects are equal and their public
+// fields are also equal. This is useful for comparing structs that have private fields
+// that could potentially differ.
+//
+//	 type S struct {
+//		Exported     	int
+//		notExported   	int
+//	 }
+//	 assert.EqualExportedValues(t, S{1, 2}, S{1, 3}) => true
+//	 assert.EqualExportedValues(t, S{1, 2}, S{2, 3}) => false
+func EqualExportedValues(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool {
+	if h, ok := t.(tHelper); ok {
+		h.Helper()
+	}
+
+	aType := reflect.TypeOf(expected)
+	bType := reflect.TypeOf(actual)
+
+	if aType != bType {
+		return Fail(t, fmt.Sprintf("Types expected to match exactly\n\t%v != %v", aType, bType), msgAndArgs...)
+	}
+
+	if aType.Kind() != reflect.Struct {
+		return Fail(t, fmt.Sprintf("Types expected to both be struct \n\t%v != %v", aType.Kind(), reflect.Struct), msgAndArgs...)
+	}
+
+	if bType.Kind() != reflect.Struct {
+		return Fail(t, fmt.Sprintf("Types expected to both be struct \n\t%v != %v", bType.Kind(), reflect.Struct), msgAndArgs...)
+	}
+
+	expected = copyExportedFields(expected)
+	actual = copyExportedFields(actual)
+
+	if !ObjectsAreEqualValues(expected, actual) {
+		diff := diff(expected, actual)
+		expected, actual = formatUnequalValues(expected, actual)
+		return Fail(t, fmt.Sprintf("Not equal (comparing only exported fields): \n"+
+			"expected: %s\n"+
+			"actual  : %s%s", expected, actual, diff), msgAndArgs...)
+	}
+
+	return true
+}
+
 // Exactly asserts that two objects are equal in value and type.
 //
-//    assert.Exactly(t, int32(123), int64(123))
+//	assert.Exactly(t, int32(123), int64(123))
 func Exactly(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -496,7 +609,7 @@ func Exactly(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}
 
 // NotNil asserts that the specified object is not nil.
 //
-//    assert.NotNil(t, err)
+//	assert.NotNil(t, err)
 func NotNil(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 	if !isNil(object) {
 		return true
@@ -530,7 +643,7 @@ func isNil(object interface{}) bool {
 		[]reflect.Kind{
 			reflect.Chan, reflect.Func,
 			reflect.Interface, reflect.Map,
-			reflect.Ptr, reflect.Slice},
+			reflect.Ptr, reflect.Slice, reflect.UnsafePointer},
 		kind)
 
 	if isNilableKind && value.IsNil() {
@@ -542,7 +655,7 @@ func isNil(object interface{}) bool {
 
 // Nil asserts that the specified object is nil.
 //
-//    assert.Nil(t, err)
+//	assert.Nil(t, err)
 func Nil(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 	if isNil(object) {
 		return true
@@ -585,7 +698,7 @@ func isEmpty(object interface{}) bool {
 // Empty asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
 // a slice or a channel with len == 0.
 //
-//  assert.Empty(t, obj)
+//	assert.Empty(t, obj)
 func Empty(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 	pass := isEmpty(object)
 	if !pass {
@@ -602,9 +715,9 @@ func Empty(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 // NotEmpty asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
 // a slice or a channel with len == 0.
 //
-//  if assert.NotEmpty(t, obj) {
-//    assert.Equal(t, "two", obj[1])
-//  }
+//	if assert.NotEmpty(t, obj) {
+//	  assert.Equal(t, "two", obj[1])
+//	}
 func NotEmpty(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 	pass := !isEmpty(object)
 	if !pass {
@@ -633,7 +746,7 @@ func getLen(x interface{}) (ok bool, length int) {
 // Len asserts that the specified object has specific length.
 // Len also fails if the object has a type that len() not accept.
 //
-//    assert.Len(t, mySlice, 3)
+//	assert.Len(t, mySlice, 3)
 func Len(t TestingT, object interface{}, length int, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -651,7 +764,7 @@ func Len(t TestingT, object interface{}, length int, msgAndArgs ...interface{})
 
 // True asserts that the specified value is true.
 //
-//    assert.True(t, myBool)
+//	assert.True(t, myBool)
 func True(t TestingT, value bool, msgAndArgs ...interface{}) bool {
 	if !value {
 		if h, ok := t.(tHelper); ok {
@@ -666,7 +779,7 @@ func True(t TestingT, value bool, msgAndArgs ...interface{}) bool {
 
 // False asserts that the specified value is false.
 //
-//    assert.False(t, myBool)
+//	assert.False(t, myBool)
 func False(t TestingT, value bool, msgAndArgs ...interface{}) bool {
 	if value {
 		if h, ok := t.(tHelper); ok {
@@ -681,7 +794,7 @@ func False(t TestingT, value bool, msgAndArgs ...interface{}) bool {
 
 // NotEqual asserts that the specified values are NOT equal.
 //
-//    assert.NotEqual(t, obj1, obj2)
+//	assert.NotEqual(t, obj1, obj2)
 //
 // Pointer variable equality is determined based on the equality of the
 // referenced values (as opposed to the memory addresses).
@@ -704,7 +817,7 @@ func NotEqual(t TestingT, expected, actual interface{}, msgAndArgs ...interface{
 
 // NotEqualValues asserts that two objects are not equal even when converted to the same type
 //
-//    assert.NotEqualValues(t, obj1, obj2)
+//	assert.NotEqualValues(t, obj1, obj2)
 func NotEqualValues(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -763,9 +876,9 @@ func containsElement(list interface{}, element interface{}) (ok, found bool) {
 // Contains asserts that the specified string, list(array, slice...) or map contains the
 // specified substring or element.
 //
-//    assert.Contains(t, "Hello World", "World")
-//    assert.Contains(t, ["Hello", "World"], "World")
-//    assert.Contains(t, {"Hello": "World"}, "Hello")
+//	assert.Contains(t, "Hello World", "World")
+//	assert.Contains(t, ["Hello", "World"], "World")
+//	assert.Contains(t, {"Hello": "World"}, "Hello")
 func Contains(t TestingT, s, contains interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -786,9 +899,9 @@ func Contains(t TestingT, s, contains interface{}, msgAndArgs ...interface{}) bo
 // NotContains asserts that the specified string, list(array, slice...) or map does NOT contain the
 // specified substring or element.
 //
-//    assert.NotContains(t, "Hello World", "Earth")
-//    assert.NotContains(t, ["Hello", "World"], "Earth")
-//    assert.NotContains(t, {"Hello": "World"}, "Earth")
+//	assert.NotContains(t, "Hello World", "Earth")
+//	assert.NotContains(t, ["Hello", "World"], "Earth")
+//	assert.NotContains(t, {"Hello": "World"}, "Earth")
 func NotContains(t TestingT, s, contains interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -796,10 +909,10 @@ func NotContains(t TestingT, s, contains interface{}, msgAndArgs ...interface{})
 
 	ok, found := containsElement(s, contains)
 	if !ok {
-		return Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", s), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("%#v could not be applied builtin len()", s), msgAndArgs...)
 	}
 	if found {
-		return Fail(t, fmt.Sprintf("\"%s\" should not contain \"%s\"", s, contains), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("%#v should not contain %#v", s, contains), msgAndArgs...)
 	}
 
 	return true
@@ -809,7 +922,7 @@ func NotContains(t TestingT, s, contains interface{}, msgAndArgs ...interface{})
 // Subset asserts that the specified list(array, slice...) contains all
 // elements given in the specified subset(array, slice...).
 //
-//    assert.Subset(t, [1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]")
+//	assert.Subset(t, [1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]")
 func Subset(t TestingT, list, subset interface{}, msgAndArgs ...interface{}) (ok bool) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -818,49 +931,44 @@ func Subset(t TestingT, list, subset interface{}, msgAndArgs ...interface{}) (ok
 		return true // we consider nil to be equal to the nil set
 	}
 
-	defer func() {
-		if e := recover(); e != nil {
-			ok = false
-		}
-	}()
-
 	listKind := reflect.TypeOf(list).Kind()
-	subsetKind := reflect.TypeOf(subset).Kind()
-
 	if listKind != reflect.Array && listKind != reflect.Slice && listKind != reflect.Map {
 		return Fail(t, fmt.Sprintf("%q has an unsupported type %s", list, listKind), msgAndArgs...)
 	}
 
+	subsetKind := reflect.TypeOf(subset).Kind()
 	if subsetKind != reflect.Array && subsetKind != reflect.Slice && listKind != reflect.Map {
 		return Fail(t, fmt.Sprintf("%q has an unsupported type %s", subset, subsetKind), msgAndArgs...)
 	}
 
-	subsetValue := reflect.ValueOf(subset)
 	if subsetKind == reflect.Map && listKind == reflect.Map {
-		listValue := reflect.ValueOf(list)
-		subsetKeys := subsetValue.MapKeys()
+		subsetMap := reflect.ValueOf(subset)
+		actualMap := reflect.ValueOf(list)
 
-		for i := 0; i < len(subsetKeys); i++ {
-			subsetKey := subsetKeys[i]
-			subsetElement := subsetValue.MapIndex(subsetKey).Interface()
-			listElement := listValue.MapIndex(subsetKey).Interface()
+		for _, k := range subsetMap.MapKeys() {
+			ev := subsetMap.MapIndex(k)
+			av := actualMap.MapIndex(k)
 
-			if !ObjectsAreEqual(subsetElement, listElement) {
-				return Fail(t, fmt.Sprintf("\"%s\" does not contain \"%s\"", list, subsetElement), msgAndArgs...)
+			if !av.IsValid() {
+				return Fail(t, fmt.Sprintf("%#v does not contain %#v", list, subset), msgAndArgs...)
+			}
+			if !ObjectsAreEqual(ev.Interface(), av.Interface()) {
+				return Fail(t, fmt.Sprintf("%#v does not contain %#v", list, subset), msgAndArgs...)
 			}
 		}
 
 		return true
 	}
 
-	for i := 0; i < subsetValue.Len(); i++ {
-		element := subsetValue.Index(i).Interface()
+	subsetList := reflect.ValueOf(subset)
+	for i := 0; i < subsetList.Len(); i++ {
+		element := subsetList.Index(i).Interface()
 		ok, found := containsElement(list, element)
 		if !ok {
-			return Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", list), msgAndArgs...)
+			return Fail(t, fmt.Sprintf("%#v could not be applied builtin len()", list), msgAndArgs...)
 		}
 		if !found {
-			return Fail(t, fmt.Sprintf("\"%s\" does not contain \"%s\"", list, element), msgAndArgs...)
+			return Fail(t, fmt.Sprintf("%#v does not contain %#v", list, element), msgAndArgs...)
 		}
 	}
 
@@ -870,7 +978,7 @@ func Subset(t TestingT, list, subset interface{}, msgAndArgs ...interface{}) (ok
 // NotSubset asserts that the specified list(array, slice...) contains not all
 // elements given in the specified subset(array, slice...).
 //
-//    assert.NotSubset(t, [1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]")
+//	assert.NotSubset(t, [1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]")
 func NotSubset(t TestingT, list, subset interface{}, msgAndArgs ...interface{}) (ok bool) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -879,34 +987,28 @@ func NotSubset(t TestingT, list, subset interface{}, msgAndArgs ...interface{})
 		return Fail(t, "nil is the empty set which is a subset of every set", msgAndArgs...)
 	}
 
-	defer func() {
-		if e := recover(); e != nil {
-			ok = false
-		}
-	}()
-
 	listKind := reflect.TypeOf(list).Kind()
-	subsetKind := reflect.TypeOf(subset).Kind()
-
 	if listKind != reflect.Array && listKind != reflect.Slice && listKind != reflect.Map {
 		return Fail(t, fmt.Sprintf("%q has an unsupported type %s", list, listKind), msgAndArgs...)
 	}
 
+	subsetKind := reflect.TypeOf(subset).Kind()
 	if subsetKind != reflect.Array && subsetKind != reflect.Slice && listKind != reflect.Map {
 		return Fail(t, fmt.Sprintf("%q has an unsupported type %s", subset, subsetKind), msgAndArgs...)
 	}
 
-	subsetValue := reflect.ValueOf(subset)
 	if subsetKind == reflect.Map && listKind == reflect.Map {
-		listValue := reflect.ValueOf(list)
-		subsetKeys := subsetValue.MapKeys()
+		subsetMap := reflect.ValueOf(subset)
+		actualMap := reflect.ValueOf(list)
 
-		for i := 0; i < len(subsetKeys); i++ {
-			subsetKey := subsetKeys[i]
-			subsetElement := subsetValue.MapIndex(subsetKey).Interface()
-			listElement := listValue.MapIndex(subsetKey).Interface()
+		for _, k := range subsetMap.MapKeys() {
+			ev := subsetMap.MapIndex(k)
+			av := actualMap.MapIndex(k)
 
-			if !ObjectsAreEqual(subsetElement, listElement) {
+			if !av.IsValid() {
+				return true
+			}
+			if !ObjectsAreEqual(ev.Interface(), av.Interface()) {
 				return true
 			}
 		}
@@ -914,8 +1016,9 @@ func NotSubset(t TestingT, list, subset interface{}, msgAndArgs ...interface{})
 		return Fail(t, fmt.Sprintf("%q is a subset of %q", subset, list), msgAndArgs...)
 	}
 
-	for i := 0; i < subsetValue.Len(); i++ {
-		element := subsetValue.Index(i).Interface()
+	subsetList := reflect.ValueOf(subset)
+	for i := 0; i < subsetList.Len(); i++ {
+		element := subsetList.Index(i).Interface()
 		ok, found := containsElement(list, element)
 		if !ok {
 			return Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", list), msgAndArgs...)
@@ -1060,7 +1163,7 @@ func didPanic(f PanicTestFunc) (didPanic bool, message interface{}, stack string
 
 // Panics asserts that the code inside the specified PanicTestFunc panics.
 //
-//   assert.Panics(t, func(){ GoCrazy() })
+//	assert.Panics(t, func(){ GoCrazy() })
 func Panics(t TestingT, f PanicTestFunc, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1076,7 +1179,7 @@ func Panics(t TestingT, f PanicTestFunc, msgAndArgs ...interface{}) bool {
 // PanicsWithValue asserts that the code inside the specified PanicTestFunc panics, and that
 // the recovered panic value equals the expected panic value.
 //
-//   assert.PanicsWithValue(t, "crazy error", func(){ GoCrazy() })
+//	assert.PanicsWithValue(t, "crazy error", func(){ GoCrazy() })
 func PanicsWithValue(t TestingT, expected interface{}, f PanicTestFunc, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1097,7 +1200,7 @@ func PanicsWithValue(t TestingT, expected interface{}, f PanicTestFunc, msgAndAr
 // panics, and that the recovered panic value is an error that satisfies the
 // EqualError comparison.
 //
-//   assert.PanicsWithError(t, "crazy error", func(){ GoCrazy() })
+//	assert.PanicsWithError(t, "crazy error", func(){ GoCrazy() })
 func PanicsWithError(t TestingT, errString string, f PanicTestFunc, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1117,7 +1220,7 @@ func PanicsWithError(t TestingT, errString string, f PanicTestFunc, msgAndArgs .
 
 // NotPanics asserts that the code inside the specified PanicTestFunc does NOT panic.
 //
-//   assert.NotPanics(t, func(){ RemainCalm() })
+//	assert.NotPanics(t, func(){ RemainCalm() })
 func NotPanics(t TestingT, f PanicTestFunc, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1132,7 +1235,7 @@ func NotPanics(t TestingT, f PanicTestFunc, msgAndArgs ...interface{}) bool {
 
 // WithinDuration asserts that the two times are within duration delta of each other.
 //
-//   assert.WithinDuration(t, time.Now(), time.Now(), 10*time.Second)
+//	assert.WithinDuration(t, time.Now(), time.Now(), 10*time.Second)
 func WithinDuration(t TestingT, expected, actual time.Time, delta time.Duration, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1148,7 +1251,7 @@ func WithinDuration(t TestingT, expected, actual time.Time, delta time.Duration,
 
 // WithinRange asserts that a time is within a time range (inclusive).
 //
-//   assert.WithinRange(t, time.Now(), time.Now().Add(-time.Second), time.Now().Add(time.Second))
+//	assert.WithinRange(t, time.Now(), time.Now().Add(-time.Second), time.Now().Add(time.Second))
 func WithinRange(t TestingT, actual, start, end time.Time, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1207,7 +1310,7 @@ func toFloat(x interface{}) (float64, bool) {
 
 // InDelta asserts that the two numerals are within delta of each other.
 //
-// 	 assert.InDelta(t, math.Pi, 22/7.0, 0.01)
+//	assert.InDelta(t, math.Pi, 22/7.0, 0.01)
 func InDelta(t TestingT, expected, actual interface{}, delta float64, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1380,10 +1483,10 @@ func InEpsilonSlice(t TestingT, expected, actual interface{}, epsilon float64, m
 
 // NoError asserts that a function returned no error (i.e. `nil`).
 //
-//   actualObj, err := SomeFunction()
-//   if assert.NoError(t, err) {
-//	   assert.Equal(t, expectedObj, actualObj)
-//   }
+//	  actualObj, err := SomeFunction()
+//	  if assert.NoError(t, err) {
+//		   assert.Equal(t, expectedObj, actualObj)
+//	  }
 func NoError(t TestingT, err error, msgAndArgs ...interface{}) bool {
 	if err != nil {
 		if h, ok := t.(tHelper); ok {
@@ -1397,10 +1500,10 @@ func NoError(t TestingT, err error, msgAndArgs ...interface{}) bool {
 
 // Error asserts that a function returned an error (i.e. not `nil`).
 //
-//   actualObj, err := SomeFunction()
-//   if assert.Error(t, err) {
-//	   assert.Equal(t, expectedError, err)
-//   }
+//	  actualObj, err := SomeFunction()
+//	  if assert.Error(t, err) {
+//		   assert.Equal(t, expectedError, err)
+//	  }
 func Error(t TestingT, err error, msgAndArgs ...interface{}) bool {
 	if err == nil {
 		if h, ok := t.(tHelper); ok {
@@ -1415,8 +1518,8 @@ func Error(t TestingT, err error, msgAndArgs ...interface{}) bool {
 // EqualError asserts that a function returned an error (i.e. not `nil`)
 // and that it is equal to the provided error.
 //
-//   actualObj, err := SomeFunction()
-//   assert.EqualError(t, err,  expectedErrorString)
+//	actualObj, err := SomeFunction()
+//	assert.EqualError(t, err,  expectedErrorString)
 func EqualError(t TestingT, theError error, errString string, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1438,8 +1541,8 @@ func EqualError(t TestingT, theError error, errString string, msgAndArgs ...inte
 // ErrorContains asserts that a function returned an error (i.e. not `nil`)
 // and that the error contains the specified substring.
 //
-//   actualObj, err := SomeFunction()
-//   assert.ErrorContains(t, err,  expectedErrorSubString)
+//	actualObj, err := SomeFunction()
+//	assert.ErrorContains(t, err,  expectedErrorSubString)
 func ErrorContains(t TestingT, theError error, contains string, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1472,8 +1575,8 @@ func matchRegexp(rx interface{}, str interface{}) bool {
 
 // Regexp asserts that a specified regexp matches a string.
 //
-//  assert.Regexp(t, regexp.MustCompile("start"), "it's starting")
-//  assert.Regexp(t, "start...$", "it's not starting")
+//	assert.Regexp(t, regexp.MustCompile("start"), "it's starting")
+//	assert.Regexp(t, "start...$", "it's not starting")
 func Regexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1490,8 +1593,8 @@ func Regexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interface
 
 // NotRegexp asserts that a specified regexp does not match a string.
 //
-//  assert.NotRegexp(t, regexp.MustCompile("starts"), "it's starting")
-//  assert.NotRegexp(t, "^start", "it's not starting")
+//	assert.NotRegexp(t, regexp.MustCompile("starts"), "it's starting")
+//	assert.NotRegexp(t, "^start", "it's not starting")
 func NotRegexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1603,7 +1706,7 @@ func NoDirExists(t TestingT, path string, msgAndArgs ...interface{}) bool {
 
 // JSONEq asserts that two JSON strings are equivalent.
 //
-//  assert.JSONEq(t, `{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`)
+//	assert.JSONEq(t, `{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`)
 func JSONEq(t TestingT, expected string, actual string, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1726,7 +1829,7 @@ type tHelper interface {
 // Eventually asserts that given condition will be met in waitFor time,
 // periodically checking target function each tick.
 //
-//    assert.Eventually(t, func() bool { return true; }, time.Second, 10*time.Millisecond)
+//	assert.Eventually(t, func() bool { return true; }, time.Second, 10*time.Millisecond)
 func Eventually(t TestingT, condition func() bool, waitFor time.Duration, tick time.Duration, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1756,10 +1859,93 @@ func Eventually(t TestingT, condition func() bool, waitFor time.Duration, tick t
 	}
 }
 
+// CollectT implements the TestingT interface and collects all errors.
+type CollectT struct {
+	errors []error
+}
+
+// Errorf collects the error.
+func (c *CollectT) Errorf(format string, args ...interface{}) {
+	c.errors = append(c.errors, fmt.Errorf(format, args...))
+}
+
+// FailNow panics.
+func (c *CollectT) FailNow() {
+	panic("Assertion failed")
+}
+
+// Reset clears the collected errors.
+func (c *CollectT) Reset() {
+	c.errors = nil
+}
+
+// Copy copies the collected errors to the supplied t.
+func (c *CollectT) Copy(t TestingT) {
+	if tt, ok := t.(tHelper); ok {
+		tt.Helper()
+	}
+	for _, err := range c.errors {
+		t.Errorf("%v", err)
+	}
+}
+
+// EventuallyWithT asserts that given condition will be met in waitFor time,
+// periodically checking target function each tick. In contrast to Eventually,
+// it supplies a CollectT to the condition function, so that the condition
+// function can use the CollectT to call other assertions.
+// The condition is considered "met" if no errors are raised in a tick.
+// The supplied CollectT collects all errors from one tick (if there are any).
+// If the condition is not met before waitFor, the collected errors of
+// the last tick are copied to t.
+//
+//	externalValue := false
+//	go func() {
+//		time.Sleep(8*time.Second)
+//		externalValue = true
+//	}()
+//	assert.EventuallyWithT(t, func(c *assert.CollectT) {
+//		// add assertions as needed; any assertion failure will fail the current tick
+//		assert.True(c, externalValue, "expected 'externalValue' to be true")
+//	}, 1*time.Second, 10*time.Second, "external state has not changed to 'true'; still false")
+func EventuallyWithT(t TestingT, condition func(collect *CollectT), waitFor time.Duration, tick time.Duration, msgAndArgs ...interface{}) bool {
+	if h, ok := t.(tHelper); ok {
+		h.Helper()
+	}
+
+	collect := new(CollectT)
+	ch := make(chan bool, 1)
+
+	timer := time.NewTimer(waitFor)
+	defer timer.Stop()
+
+	ticker := time.NewTicker(tick)
+	defer ticker.Stop()
+
+	for tick := ticker.C; ; {
+		select {
+		case <-timer.C:
+			collect.Copy(t)
+			return Fail(t, "Condition never satisfied", msgAndArgs...)
+		case <-tick:
+			tick = nil
+			collect.Reset()
+			go func() {
+				condition(collect)
+				ch <- len(collect.errors) == 0
+			}()
+		case v := <-ch:
+			if v {
+				return true
+			}
+			tick = ticker.C
+		}
+	}
+}
+
 // Never asserts that the given condition doesn't satisfy in waitFor time,
 // periodically checking the target function each tick.
 //
-//    assert.Never(t, func() bool { return false; }, time.Second, 10*time.Millisecond)
+//	assert.Never(t, func() bool { return false; }, time.Second, 10*time.Millisecond)
 func Never(t TestingT, condition func() bool, waitFor time.Duration, tick time.Duration, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
diff --git a/vendor/github.com/stretchr/testify/assert/doc.go b/vendor/github.com/stretchr/testify/assert/doc.go
index c9dccc4d..4953981d 100644
--- a/vendor/github.com/stretchr/testify/assert/doc.go
+++ b/vendor/github.com/stretchr/testify/assert/doc.go
@@ -1,39 +1,40 @@
 // Package assert provides a set of comprehensive testing tools for use with the normal Go testing system.
 //
-// Example Usage
+// # Example Usage
 //
 // The following is a complete example using assert in a standard test function:
-//    import (
-//      "testing"
-//      "github.com/stretchr/testify/assert"
-//    )
 //
-//    func TestSomething(t *testing.T) {
+//	import (
+//	  "testing"
+//	  "github.com/stretchr/testify/assert"
+//	)
 //
-//      var a string = "Hello"
-//      var b string = "Hello"
+//	func TestSomething(t *testing.T) {
 //
-//      assert.Equal(t, a, b, "The two words should be the same.")
+//	  var a string = "Hello"
+//	  var b string = "Hello"
 //
-//    }
+//	  assert.Equal(t, a, b, "The two words should be the same.")
+//
+//	}
 //
 // if you assert many times, use the format below:
 //
-//    import (
-//      "testing"
-//      "github.com/stretchr/testify/assert"
-//    )
+//	import (
+//	  "testing"
+//	  "github.com/stretchr/testify/assert"
+//	)
 //
-//    func TestSomething(t *testing.T) {
-//      assert := assert.New(t)
+//	func TestSomething(t *testing.T) {
+//	  assert := assert.New(t)
 //
-//      var a string = "Hello"
-//      var b string = "Hello"
+//	  var a string = "Hello"
+//	  var b string = "Hello"
 //
-//      assert.Equal(a, b, "The two words should be the same.")
-//    }
+//	  assert.Equal(a, b, "The two words should be the same.")
+//	}
 //
-// Assertions
+// # Assertions
 //
 // Assertions allow you to easily write test code, and are global funcs in the `assert` package.
 // All assertion functions take, as the first argument, the `*testing.T` object provided by the
diff --git a/vendor/github.com/stretchr/testify/assert/http_assertions.go b/vendor/github.com/stretchr/testify/assert/http_assertions.go
index 4ed341dd..d8038c28 100644
--- a/vendor/github.com/stretchr/testify/assert/http_assertions.go
+++ b/vendor/github.com/stretchr/testify/assert/http_assertions.go
@@ -23,7 +23,7 @@ func httpCode(handler http.HandlerFunc, method, url string, values url.Values) (
 
 // HTTPSuccess asserts that a specified handler returns a success status code.
 //
-//  assert.HTTPSuccess(t, myHandler, "POST", "http://www.google.com", nil)
+//	assert.HTTPSuccess(t, myHandler, "POST", "http://www.google.com", nil)
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPSuccess(t TestingT, handler http.HandlerFunc, method, url string, values url.Values, msgAndArgs ...interface{}) bool {
@@ -45,7 +45,7 @@ func HTTPSuccess(t TestingT, handler http.HandlerFunc, method, url string, value
 
 // HTTPRedirect asserts that a specified handler returns a redirect status code.
 //
-//  assert.HTTPRedirect(t, myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//	assert.HTTPRedirect(t, myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPRedirect(t TestingT, handler http.HandlerFunc, method, url string, values url.Values, msgAndArgs ...interface{}) bool {
@@ -67,7 +67,7 @@ func HTTPRedirect(t TestingT, handler http.HandlerFunc, method, url string, valu
 
 // HTTPError asserts that a specified handler returns an error status code.
 //
-//  assert.HTTPError(t, myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//	assert.HTTPError(t, myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPError(t TestingT, handler http.HandlerFunc, method, url string, values url.Values, msgAndArgs ...interface{}) bool {
@@ -89,7 +89,7 @@ func HTTPError(t TestingT, handler http.HandlerFunc, method, url string, values
 
 // HTTPStatusCode asserts that a specified handler returns a specified status code.
 //
-//  assert.HTTPStatusCode(t, myHandler, "GET", "/notImplemented", nil, 501)
+//	assert.HTTPStatusCode(t, myHandler, "GET", "/notImplemented", nil, 501)
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPStatusCode(t TestingT, handler http.HandlerFunc, method, url string, values url.Values, statuscode int, msgAndArgs ...interface{}) bool {
@@ -124,7 +124,7 @@ func HTTPBody(handler http.HandlerFunc, method, url string, values url.Values) s
 // HTTPBodyContains asserts that a specified handler returns a
 // body that contains a string.
 //
-//  assert.HTTPBodyContains(t, myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky")
+//	assert.HTTPBodyContains(t, myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPBodyContains(t TestingT, handler http.HandlerFunc, method, url string, values url.Values, str interface{}, msgAndArgs ...interface{}) bool {
@@ -144,7 +144,7 @@ func HTTPBodyContains(t TestingT, handler http.HandlerFunc, method, url string,
 // HTTPBodyNotContains asserts that a specified handler returns a
 // body that does not contain a string.
 //
-//  assert.HTTPBodyNotContains(t, myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky")
+//	assert.HTTPBodyNotContains(t, myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPBodyNotContains(t TestingT, handler http.HandlerFunc, method, url string, values url.Values, str interface{}, msgAndArgs ...interface{}) bool {
diff --git a/vendor/github.com/stretchr/testify/require/doc.go b/vendor/github.com/stretchr/testify/require/doc.go
index 169de392..96843472 100644
--- a/vendor/github.com/stretchr/testify/require/doc.go
+++ b/vendor/github.com/stretchr/testify/require/doc.go
@@ -1,24 +1,25 @@
 // Package require implements the same assertions as the `assert` package but
 // stops test execution when a test fails.
 //
-// Example Usage
+// # Example Usage
 //
 // The following is a complete example using require in a standard test function:
-//    import (
-//      "testing"
-//      "github.com/stretchr/testify/require"
-//    )
 //
-//    func TestSomething(t *testing.T) {
+//	import (
+//	  "testing"
+//	  "github.com/stretchr/testify/require"
+//	)
 //
-//      var a string = "Hello"
-//      var b string = "Hello"
+//	func TestSomething(t *testing.T) {
 //
-//      require.Equal(t, a, b, "The two words should be the same.")
+//	  var a string = "Hello"
+//	  var b string = "Hello"
 //
-//    }
+//	  require.Equal(t, a, b, "The two words should be the same.")
 //
-// Assertions
+//	}
+//
+// # Assertions
 //
 // The `require` package have same global functions as in the `assert` package,
 // but instead of returning a boolean result they call `t.FailNow()`.
diff --git a/vendor/github.com/stretchr/testify/require/require.go b/vendor/github.com/stretchr/testify/require/require.go
index 880853f5..63f85214 100644
--- a/vendor/github.com/stretchr/testify/require/require.go
+++ b/vendor/github.com/stretchr/testify/require/require.go
@@ -37,9 +37,9 @@ func Conditionf(t TestingT, comp assert.Comparison, msg string, args ...interfac
 // Contains asserts that the specified string, list(array, slice...) or map contains the
 // specified substring or element.
 //
-//    assert.Contains(t, "Hello World", "World")
-//    assert.Contains(t, ["Hello", "World"], "World")
-//    assert.Contains(t, {"Hello": "World"}, "Hello")
+//	assert.Contains(t, "Hello World", "World")
+//	assert.Contains(t, ["Hello", "World"], "World")
+//	assert.Contains(t, {"Hello": "World"}, "Hello")
 func Contains(t TestingT, s interface{}, contains interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -53,9 +53,9 @@ func Contains(t TestingT, s interface{}, contains interface{}, msgAndArgs ...int
 // Containsf asserts that the specified string, list(array, slice...) or map contains the
 // specified substring or element.
 //
-//    assert.Containsf(t, "Hello World", "World", "error message %s", "formatted")
-//    assert.Containsf(t, ["Hello", "World"], "World", "error message %s", "formatted")
-//    assert.Containsf(t, {"Hello": "World"}, "Hello", "error message %s", "formatted")
+//	assert.Containsf(t, "Hello World", "World", "error message %s", "formatted")
+//	assert.Containsf(t, ["Hello", "World"], "World", "error message %s", "formatted")
+//	assert.Containsf(t, {"Hello": "World"}, "Hello", "error message %s", "formatted")
 func Containsf(t TestingT, s interface{}, contains interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -123,7 +123,7 @@ func ElementsMatchf(t TestingT, listA interface{}, listB interface{}, msg string
 // Empty asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
 // a slice or a channel with len == 0.
 //
-//  assert.Empty(t, obj)
+//	assert.Empty(t, obj)
 func Empty(t TestingT, object interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -137,7 +137,7 @@ func Empty(t TestingT, object interface{}, msgAndArgs ...interface{}) {
 // Emptyf asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
 // a slice or a channel with len == 0.
 //
-//  assert.Emptyf(t, obj, "error message %s", "formatted")
+//	assert.Emptyf(t, obj, "error message %s", "formatted")
 func Emptyf(t TestingT, object interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -150,7 +150,7 @@ func Emptyf(t TestingT, object interface{}, msg string, args ...interface{}) {
 
 // Equal asserts that two objects are equal.
 //
-//    assert.Equal(t, 123, 123)
+//	assert.Equal(t, 123, 123)
 //
 // Pointer variable equality is determined based on the equality of the
 // referenced values (as opposed to the memory addresses). Function equality
@@ -168,8 +168,8 @@ func Equal(t TestingT, expected interface{}, actual interface{}, msgAndArgs ...i
 // EqualError asserts that a function returned an error (i.e. not `nil`)
 // and that it is equal to the provided error.
 //
-//   actualObj, err := SomeFunction()
-//   assert.EqualError(t, err,  expectedErrorString)
+//	actualObj, err := SomeFunction()
+//	assert.EqualError(t, err,  expectedErrorString)
 func EqualError(t TestingT, theError error, errString string, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -183,8 +183,8 @@ func EqualError(t TestingT, theError error, errString string, msgAndArgs ...inte
 // EqualErrorf asserts that a function returned an error (i.e. not `nil`)
 // and that it is equal to the provided error.
 //
-//   actualObj, err := SomeFunction()
-//   assert.EqualErrorf(t, err,  expectedErrorString, "error message %s", "formatted")
+//	actualObj, err := SomeFunction()
+//	assert.EqualErrorf(t, err,  expectedErrorString, "error message %s", "formatted")
 func EqualErrorf(t TestingT, theError error, errString string, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -195,10 +195,50 @@ func EqualErrorf(t TestingT, theError error, errString string, msg string, args
 	t.FailNow()
 }
 
+// EqualExportedValues asserts that the types of two objects are equal and their public
+// fields are also equal. This is useful for comparing structs that have private fields
+// that could potentially differ.
+//
+//	 type S struct {
+//		Exported     	int
+//		notExported   	int
+//	 }
+//	 assert.EqualExportedValues(t, S{1, 2}, S{1, 3}) => true
+//	 assert.EqualExportedValues(t, S{1, 2}, S{2, 3}) => false
+func EqualExportedValues(t TestingT, expected interface{}, actual interface{}, msgAndArgs ...interface{}) {
+	if h, ok := t.(tHelper); ok {
+		h.Helper()
+	}
+	if assert.EqualExportedValues(t, expected, actual, msgAndArgs...) {
+		return
+	}
+	t.FailNow()
+}
+
+// EqualExportedValuesf asserts that the types of two objects are equal and their public
+// fields are also equal. This is useful for comparing structs that have private fields
+// that could potentially differ.
+//
+//	 type S struct {
+//		Exported     	int
+//		notExported   	int
+//	 }
+//	 assert.EqualExportedValuesf(t, S{1, 2}, S{1, 3}, "error message %s", "formatted") => true
+//	 assert.EqualExportedValuesf(t, S{1, 2}, S{2, 3}, "error message %s", "formatted") => false
+func EqualExportedValuesf(t TestingT, expected interface{}, actual interface{}, msg string, args ...interface{}) {
+	if h, ok := t.(tHelper); ok {
+		h.Helper()
+	}
+	if assert.EqualExportedValuesf(t, expected, actual, msg, args...) {
+		return
+	}
+	t.FailNow()
+}
+
 // EqualValues asserts that two objects are equal or convertable to the same types
 // and equal.
 //
-//    assert.EqualValues(t, uint32(123), int32(123))
+//	assert.EqualValues(t, uint32(123), int32(123))
 func EqualValues(t TestingT, expected interface{}, actual interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -212,7 +252,7 @@ func EqualValues(t TestingT, expected interface{}, actual interface{}, msgAndArg
 // EqualValuesf asserts that two objects are equal or convertable to the same types
 // and equal.
 //
-//    assert.EqualValuesf(t, uint32(123), int32(123), "error message %s", "formatted")
+//	assert.EqualValuesf(t, uint32(123), int32(123), "error message %s", "formatted")
 func EqualValuesf(t TestingT, expected interface{}, actual interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -225,7 +265,7 @@ func EqualValuesf(t TestingT, expected interface{}, actual interface{}, msg stri
 
 // Equalf asserts that two objects are equal.
 //
-//    assert.Equalf(t, 123, 123, "error message %s", "formatted")
+//	assert.Equalf(t, 123, 123, "error message %s", "formatted")
 //
 // Pointer variable equality is determined based on the equality of the
 // referenced values (as opposed to the memory addresses). Function equality
@@ -242,10 +282,10 @@ func Equalf(t TestingT, expected interface{}, actual interface{}, msg string, ar
 
 // Error asserts that a function returned an error (i.e. not `nil`).
 //
-//   actualObj, err := SomeFunction()
-//   if assert.Error(t, err) {
-// 	   assert.Equal(t, expectedError, err)
-//   }
+//	  actualObj, err := SomeFunction()
+//	  if assert.Error(t, err) {
+//		   assert.Equal(t, expectedError, err)
+//	  }
 func Error(t TestingT, err error, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -283,8 +323,8 @@ func ErrorAsf(t TestingT, err error, target interface{}, msg string, args ...int
 // ErrorContains asserts that a function returned an error (i.e. not `nil`)
 // and that the error contains the specified substring.
 //
-//   actualObj, err := SomeFunction()
-//   assert.ErrorContains(t, err,  expectedErrorSubString)
+//	actualObj, err := SomeFunction()
+//	assert.ErrorContains(t, err,  expectedErrorSubString)
 func ErrorContains(t TestingT, theError error, contains string, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -298,8 +338,8 @@ func ErrorContains(t TestingT, theError error, contains string, msgAndArgs ...in
 // ErrorContainsf asserts that a function returned an error (i.e. not `nil`)
 // and that the error contains the specified substring.
 //
-//   actualObj, err := SomeFunction()
-//   assert.ErrorContainsf(t, err,  expectedErrorSubString, "error message %s", "formatted")
+//	actualObj, err := SomeFunction()
+//	assert.ErrorContainsf(t, err,  expectedErrorSubString, "error message %s", "formatted")
 func ErrorContainsf(t TestingT, theError error, contains string, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -336,10 +376,10 @@ func ErrorIsf(t TestingT, err error, target error, msg string, args ...interface
 
 // Errorf asserts that a function returned an error (i.e. not `nil`).
 //
-//   actualObj, err := SomeFunction()
-//   if assert.Errorf(t, err, "error message %s", "formatted") {
-// 	   assert.Equal(t, expectedErrorf, err)
-//   }
+//	  actualObj, err := SomeFunction()
+//	  if assert.Errorf(t, err, "error message %s", "formatted") {
+//		   assert.Equal(t, expectedErrorf, err)
+//	  }
 func Errorf(t TestingT, err error, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -353,7 +393,7 @@ func Errorf(t TestingT, err error, msg string, args ...interface{}) {
 // Eventually asserts that given condition will be met in waitFor time,
 // periodically checking target function each tick.
 //
-//    assert.Eventually(t, func() bool { return true; }, time.Second, 10*time.Millisecond)
+//	assert.Eventually(t, func() bool { return true; }, time.Second, 10*time.Millisecond)
 func Eventually(t TestingT, condition func() bool, waitFor time.Duration, tick time.Duration, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -364,10 +404,66 @@ func Eventually(t TestingT, condition func() bool, waitFor time.Duration, tick t
 	t.FailNow()
 }
 
+// EventuallyWithT asserts that given condition will be met in waitFor time,
+// periodically checking target function each tick. In contrast to Eventually,
+// it supplies a CollectT to the condition function, so that the condition
+// function can use the CollectT to call other assertions.
+// The condition is considered "met" if no errors are raised in a tick.
+// The supplied CollectT collects all errors from one tick (if there are any).
+// If the condition is not met before waitFor, the collected errors of
+// the last tick are copied to t.
+//
+//	externalValue := false
+//	go func() {
+//		time.Sleep(8*time.Second)
+//		externalValue = true
+//	}()
+//	assert.EventuallyWithT(t, func(c *assert.CollectT) {
+//		// add assertions as needed; any assertion failure will fail the current tick
+//		assert.True(c, externalValue, "expected 'externalValue' to be true")
+//	}, 1*time.Second, 10*time.Second, "external state has not changed to 'true'; still false")
+func EventuallyWithT(t TestingT, condition func(collect *assert.CollectT), waitFor time.Duration, tick time.Duration, msgAndArgs ...interface{}) {
+	if h, ok := t.(tHelper); ok {
+		h.Helper()
+	}
+	if assert.EventuallyWithT(t, condition, waitFor, tick, msgAndArgs...) {
+		return
+	}
+	t.FailNow()
+}
+
+// EventuallyWithTf asserts that given condition will be met in waitFor time,
+// periodically checking target function each tick. In contrast to Eventually,
+// it supplies a CollectT to the condition function, so that the condition
+// function can use the CollectT to call other assertions.
+// The condition is considered "met" if no errors are raised in a tick.
+// The supplied CollectT collects all errors from one tick (if there are any).
+// If the condition is not met before waitFor, the collected errors of
+// the last tick are copied to t.
+//
+//	externalValue := false
+//	go func() {
+//		time.Sleep(8*time.Second)
+//		externalValue = true
+//	}()
+//	assert.EventuallyWithTf(t, func(c *assert.CollectT, "error message %s", "formatted") {
+//		// add assertions as needed; any assertion failure will fail the current tick
+//		assert.True(c, externalValue, "expected 'externalValue' to be true")
+//	}, 1*time.Second, 10*time.Second, "external state has not changed to 'true'; still false")
+func EventuallyWithTf(t TestingT, condition func(collect *assert.CollectT), waitFor time.Duration, tick time.Duration, msg string, args ...interface{}) {
+	if h, ok := t.(tHelper); ok {
+		h.Helper()
+	}
+	if assert.EventuallyWithTf(t, condition, waitFor, tick, msg, args...) {
+		return
+	}
+	t.FailNow()
+}
+
 // Eventuallyf asserts that given condition will be met in waitFor time,
 // periodically checking target function each tick.
 //
-//    assert.Eventuallyf(t, func() bool { return true; }, time.Second, 10*time.Millisecond, "error message %s", "formatted")
+//	assert.Eventuallyf(t, func() bool { return true; }, time.Second, 10*time.Millisecond, "error message %s", "formatted")
 func Eventuallyf(t TestingT, condition func() bool, waitFor time.Duration, tick time.Duration, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -380,7 +476,7 @@ func Eventuallyf(t TestingT, condition func() bool, waitFor time.Duration, tick
 
 // Exactly asserts that two objects are equal in value and type.
 //
-//    assert.Exactly(t, int32(123), int64(123))
+//	assert.Exactly(t, int32(123), int64(123))
 func Exactly(t TestingT, expected interface{}, actual interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -393,7 +489,7 @@ func Exactly(t TestingT, expected interface{}, actual interface{}, msgAndArgs ..
 
 // Exactlyf asserts that two objects are equal in value and type.
 //
-//    assert.Exactlyf(t, int32(123), int64(123), "error message %s", "formatted")
+//	assert.Exactlyf(t, int32(123), int64(123), "error message %s", "formatted")
 func Exactlyf(t TestingT, expected interface{}, actual interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -450,7 +546,7 @@ func Failf(t TestingT, failureMessage string, msg string, args ...interface{}) {
 
 // False asserts that the specified value is false.
 //
-//    assert.False(t, myBool)
+//	assert.False(t, myBool)
 func False(t TestingT, value bool, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -463,7 +559,7 @@ func False(t TestingT, value bool, msgAndArgs ...interface{}) {
 
 // Falsef asserts that the specified value is false.
 //
-//    assert.Falsef(t, myBool, "error message %s", "formatted")
+//	assert.Falsef(t, myBool, "error message %s", "formatted")
 func Falsef(t TestingT, value bool, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -500,9 +596,9 @@ func FileExistsf(t TestingT, path string, msg string, args ...interface{}) {
 
 // Greater asserts that the first element is greater than the second
 //
-//    assert.Greater(t, 2, 1)
-//    assert.Greater(t, float64(2), float64(1))
-//    assert.Greater(t, "b", "a")
+//	assert.Greater(t, 2, 1)
+//	assert.Greater(t, float64(2), float64(1))
+//	assert.Greater(t, "b", "a")
 func Greater(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -515,10 +611,10 @@ func Greater(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface
 
 // GreaterOrEqual asserts that the first element is greater than or equal to the second
 //
-//    assert.GreaterOrEqual(t, 2, 1)
-//    assert.GreaterOrEqual(t, 2, 2)
-//    assert.GreaterOrEqual(t, "b", "a")
-//    assert.GreaterOrEqual(t, "b", "b")
+//	assert.GreaterOrEqual(t, 2, 1)
+//	assert.GreaterOrEqual(t, 2, 2)
+//	assert.GreaterOrEqual(t, "b", "a")
+//	assert.GreaterOrEqual(t, "b", "b")
 func GreaterOrEqual(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -531,10 +627,10 @@ func GreaterOrEqual(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...in
 
 // GreaterOrEqualf asserts that the first element is greater than or equal to the second
 //
-//    assert.GreaterOrEqualf(t, 2, 1, "error message %s", "formatted")
-//    assert.GreaterOrEqualf(t, 2, 2, "error message %s", "formatted")
-//    assert.GreaterOrEqualf(t, "b", "a", "error message %s", "formatted")
-//    assert.GreaterOrEqualf(t, "b", "b", "error message %s", "formatted")
+//	assert.GreaterOrEqualf(t, 2, 1, "error message %s", "formatted")
+//	assert.GreaterOrEqualf(t, 2, 2, "error message %s", "formatted")
+//	assert.GreaterOrEqualf(t, "b", "a", "error message %s", "formatted")
+//	assert.GreaterOrEqualf(t, "b", "b", "error message %s", "formatted")
 func GreaterOrEqualf(t TestingT, e1 interface{}, e2 interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -547,9 +643,9 @@ func GreaterOrEqualf(t TestingT, e1 interface{}, e2 interface{}, msg string, arg
 
 // Greaterf asserts that the first element is greater than the second
 //
-//    assert.Greaterf(t, 2, 1, "error message %s", "formatted")
-//    assert.Greaterf(t, float64(2), float64(1), "error message %s", "formatted")
-//    assert.Greaterf(t, "b", "a", "error message %s", "formatted")
+//	assert.Greaterf(t, 2, 1, "error message %s", "formatted")
+//	assert.Greaterf(t, float64(2), float64(1), "error message %s", "formatted")
+//	assert.Greaterf(t, "b", "a", "error message %s", "formatted")
 func Greaterf(t TestingT, e1 interface{}, e2 interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -563,7 +659,7 @@ func Greaterf(t TestingT, e1 interface{}, e2 interface{}, msg string, args ...in
 // HTTPBodyContains asserts that a specified handler returns a
 // body that contains a string.
 //
-//  assert.HTTPBodyContains(t, myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky")
+//	assert.HTTPBodyContains(t, myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPBodyContains(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msgAndArgs ...interface{}) {
@@ -579,7 +675,7 @@ func HTTPBodyContains(t TestingT, handler http.HandlerFunc, method string, url s
 // HTTPBodyContainsf asserts that a specified handler returns a
 // body that contains a string.
 //
-//  assert.HTTPBodyContainsf(t, myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
+//	assert.HTTPBodyContainsf(t, myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPBodyContainsf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msg string, args ...interface{}) {
@@ -595,7 +691,7 @@ func HTTPBodyContainsf(t TestingT, handler http.HandlerFunc, method string, url
 // HTTPBodyNotContains asserts that a specified handler returns a
 // body that does not contain a string.
 //
-//  assert.HTTPBodyNotContains(t, myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky")
+//	assert.HTTPBodyNotContains(t, myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPBodyNotContains(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msgAndArgs ...interface{}) {
@@ -611,7 +707,7 @@ func HTTPBodyNotContains(t TestingT, handler http.HandlerFunc, method string, ur
 // HTTPBodyNotContainsf asserts that a specified handler returns a
 // body that does not contain a string.
 //
-//  assert.HTTPBodyNotContainsf(t, myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
+//	assert.HTTPBodyNotContainsf(t, myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPBodyNotContainsf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msg string, args ...interface{}) {
@@ -626,7 +722,7 @@ func HTTPBodyNotContainsf(t TestingT, handler http.HandlerFunc, method string, u
 
 // HTTPError asserts that a specified handler returns an error status code.
 //
-//  assert.HTTPError(t, myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//	assert.HTTPError(t, myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPError(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, msgAndArgs ...interface{}) {
@@ -641,7 +737,7 @@ func HTTPError(t TestingT, handler http.HandlerFunc, method string, url string,
 
 // HTTPErrorf asserts that a specified handler returns an error status code.
 //
-//  assert.HTTPErrorf(t, myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//	assert.HTTPErrorf(t, myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPErrorf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) {
@@ -656,7 +752,7 @@ func HTTPErrorf(t TestingT, handler http.HandlerFunc, method string, url string,
 
 // HTTPRedirect asserts that a specified handler returns a redirect status code.
 //
-//  assert.HTTPRedirect(t, myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//	assert.HTTPRedirect(t, myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPRedirect(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, msgAndArgs ...interface{}) {
@@ -671,7 +767,7 @@ func HTTPRedirect(t TestingT, handler http.HandlerFunc, method string, url strin
 
 // HTTPRedirectf asserts that a specified handler returns a redirect status code.
 //
-//  assert.HTTPRedirectf(t, myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//	assert.HTTPRedirectf(t, myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPRedirectf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) {
@@ -686,7 +782,7 @@ func HTTPRedirectf(t TestingT, handler http.HandlerFunc, method string, url stri
 
 // HTTPStatusCode asserts that a specified handler returns a specified status code.
 //
-//  assert.HTTPStatusCode(t, myHandler, "GET", "/notImplemented", nil, 501)
+//	assert.HTTPStatusCode(t, myHandler, "GET", "/notImplemented", nil, 501)
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPStatusCode(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, statuscode int, msgAndArgs ...interface{}) {
@@ -701,7 +797,7 @@ func HTTPStatusCode(t TestingT, handler http.HandlerFunc, method string, url str
 
 // HTTPStatusCodef asserts that a specified handler returns a specified status code.
 //
-//  assert.HTTPStatusCodef(t, myHandler, "GET", "/notImplemented", nil, 501, "error message %s", "formatted")
+//	assert.HTTPStatusCodef(t, myHandler, "GET", "/notImplemented", nil, 501, "error message %s", "formatted")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPStatusCodef(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, statuscode int, msg string, args ...interface{}) {
@@ -716,7 +812,7 @@ func HTTPStatusCodef(t TestingT, handler http.HandlerFunc, method string, url st
 
 // HTTPSuccess asserts that a specified handler returns a success status code.
 //
-//  assert.HTTPSuccess(t, myHandler, "POST", "http://www.google.com", nil)
+//	assert.HTTPSuccess(t, myHandler, "POST", "http://www.google.com", nil)
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPSuccess(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, msgAndArgs ...interface{}) {
@@ -731,7 +827,7 @@ func HTTPSuccess(t TestingT, handler http.HandlerFunc, method string, url string
 
 // HTTPSuccessf asserts that a specified handler returns a success status code.
 //
-//  assert.HTTPSuccessf(t, myHandler, "POST", "http://www.google.com", nil, "error message %s", "formatted")
+//	assert.HTTPSuccessf(t, myHandler, "POST", "http://www.google.com", nil, "error message %s", "formatted")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func HTTPSuccessf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) {
@@ -746,7 +842,7 @@ func HTTPSuccessf(t TestingT, handler http.HandlerFunc, method string, url strin
 
 // Implements asserts that an object is implemented by the specified interface.
 //
-//    assert.Implements(t, (*MyInterface)(nil), new(MyObject))
+//	assert.Implements(t, (*MyInterface)(nil), new(MyObject))
 func Implements(t TestingT, interfaceObject interface{}, object interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -759,7 +855,7 @@ func Implements(t TestingT, interfaceObject interface{}, object interface{}, msg
 
 // Implementsf asserts that an object is implemented by the specified interface.
 //
-//    assert.Implementsf(t, (*MyInterface)(nil), new(MyObject), "error message %s", "formatted")
+//	assert.Implementsf(t, (*MyInterface)(nil), new(MyObject), "error message %s", "formatted")
 func Implementsf(t TestingT, interfaceObject interface{}, object interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -772,7 +868,7 @@ func Implementsf(t TestingT, interfaceObject interface{}, object interface{}, ms
 
 // InDelta asserts that the two numerals are within delta of each other.
 //
-// 	 assert.InDelta(t, math.Pi, 22/7.0, 0.01)
+//	assert.InDelta(t, math.Pi, 22/7.0, 0.01)
 func InDelta(t TestingT, expected interface{}, actual interface{}, delta float64, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -829,7 +925,7 @@ func InDeltaSlicef(t TestingT, expected interface{}, actual interface{}, delta f
 
 // InDeltaf asserts that the two numerals are within delta of each other.
 //
-// 	 assert.InDeltaf(t, math.Pi, 22/7.0, 0.01, "error message %s", "formatted")
+//	assert.InDeltaf(t, math.Pi, 22/7.0, 0.01, "error message %s", "formatted")
 func InDeltaf(t TestingT, expected interface{}, actual interface{}, delta float64, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -886,9 +982,9 @@ func InEpsilonf(t TestingT, expected interface{}, actual interface{}, epsilon fl
 
 // IsDecreasing asserts that the collection is decreasing
 //
-//    assert.IsDecreasing(t, []int{2, 1, 0})
-//    assert.IsDecreasing(t, []float{2, 1})
-//    assert.IsDecreasing(t, []string{"b", "a"})
+//	assert.IsDecreasing(t, []int{2, 1, 0})
+//	assert.IsDecreasing(t, []float{2, 1})
+//	assert.IsDecreasing(t, []string{"b", "a"})
 func IsDecreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -901,9 +997,9 @@ func IsDecreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) {
 
 // IsDecreasingf asserts that the collection is decreasing
 //
-//    assert.IsDecreasingf(t, []int{2, 1, 0}, "error message %s", "formatted")
-//    assert.IsDecreasingf(t, []float{2, 1}, "error message %s", "formatted")
-//    assert.IsDecreasingf(t, []string{"b", "a"}, "error message %s", "formatted")
+//	assert.IsDecreasingf(t, []int{2, 1, 0}, "error message %s", "formatted")
+//	assert.IsDecreasingf(t, []float{2, 1}, "error message %s", "formatted")
+//	assert.IsDecreasingf(t, []string{"b", "a"}, "error message %s", "formatted")
 func IsDecreasingf(t TestingT, object interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -916,9 +1012,9 @@ func IsDecreasingf(t TestingT, object interface{}, msg string, args ...interface
 
 // IsIncreasing asserts that the collection is increasing
 //
-//    assert.IsIncreasing(t, []int{1, 2, 3})
-//    assert.IsIncreasing(t, []float{1, 2})
-//    assert.IsIncreasing(t, []string{"a", "b"})
+//	assert.IsIncreasing(t, []int{1, 2, 3})
+//	assert.IsIncreasing(t, []float{1, 2})
+//	assert.IsIncreasing(t, []string{"a", "b"})
 func IsIncreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -931,9 +1027,9 @@ func IsIncreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) {
 
 // IsIncreasingf asserts that the collection is increasing
 //
-//    assert.IsIncreasingf(t, []int{1, 2, 3}, "error message %s", "formatted")
-//    assert.IsIncreasingf(t, []float{1, 2}, "error message %s", "formatted")
-//    assert.IsIncreasingf(t, []string{"a", "b"}, "error message %s", "formatted")
+//	assert.IsIncreasingf(t, []int{1, 2, 3}, "error message %s", "formatted")
+//	assert.IsIncreasingf(t, []float{1, 2}, "error message %s", "formatted")
+//	assert.IsIncreasingf(t, []string{"a", "b"}, "error message %s", "formatted")
 func IsIncreasingf(t TestingT, object interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -946,9 +1042,9 @@ func IsIncreasingf(t TestingT, object interface{}, msg string, args ...interface
 
 // IsNonDecreasing asserts that the collection is not decreasing
 //
-//    assert.IsNonDecreasing(t, []int{1, 1, 2})
-//    assert.IsNonDecreasing(t, []float{1, 2})
-//    assert.IsNonDecreasing(t, []string{"a", "b"})
+//	assert.IsNonDecreasing(t, []int{1, 1, 2})
+//	assert.IsNonDecreasing(t, []float{1, 2})
+//	assert.IsNonDecreasing(t, []string{"a", "b"})
 func IsNonDecreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -961,9 +1057,9 @@ func IsNonDecreasing(t TestingT, object interface{}, msgAndArgs ...interface{})
 
 // IsNonDecreasingf asserts that the collection is not decreasing
 //
-//    assert.IsNonDecreasingf(t, []int{1, 1, 2}, "error message %s", "formatted")
-//    assert.IsNonDecreasingf(t, []float{1, 2}, "error message %s", "formatted")
-//    assert.IsNonDecreasingf(t, []string{"a", "b"}, "error message %s", "formatted")
+//	assert.IsNonDecreasingf(t, []int{1, 1, 2}, "error message %s", "formatted")
+//	assert.IsNonDecreasingf(t, []float{1, 2}, "error message %s", "formatted")
+//	assert.IsNonDecreasingf(t, []string{"a", "b"}, "error message %s", "formatted")
 func IsNonDecreasingf(t TestingT, object interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -976,9 +1072,9 @@ func IsNonDecreasingf(t TestingT, object interface{}, msg string, args ...interf
 
 // IsNonIncreasing asserts that the collection is not increasing
 //
-//    assert.IsNonIncreasing(t, []int{2, 1, 1})
-//    assert.IsNonIncreasing(t, []float{2, 1})
-//    assert.IsNonIncreasing(t, []string{"b", "a"})
+//	assert.IsNonIncreasing(t, []int{2, 1, 1})
+//	assert.IsNonIncreasing(t, []float{2, 1})
+//	assert.IsNonIncreasing(t, []string{"b", "a"})
 func IsNonIncreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -991,9 +1087,9 @@ func IsNonIncreasing(t TestingT, object interface{}, msgAndArgs ...interface{})
 
 // IsNonIncreasingf asserts that the collection is not increasing
 //
-//    assert.IsNonIncreasingf(t, []int{2, 1, 1}, "error message %s", "formatted")
-//    assert.IsNonIncreasingf(t, []float{2, 1}, "error message %s", "formatted")
-//    assert.IsNonIncreasingf(t, []string{"b", "a"}, "error message %s", "formatted")
+//	assert.IsNonIncreasingf(t, []int{2, 1, 1}, "error message %s", "formatted")
+//	assert.IsNonIncreasingf(t, []float{2, 1}, "error message %s", "formatted")
+//	assert.IsNonIncreasingf(t, []string{"b", "a"}, "error message %s", "formatted")
 func IsNonIncreasingf(t TestingT, object interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1028,7 +1124,7 @@ func IsTypef(t TestingT, expectedType interface{}, object interface{}, msg strin
 
 // JSONEq asserts that two JSON strings are equivalent.
 //
-//  assert.JSONEq(t, `{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`)
+//	assert.JSONEq(t, `{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`)
 func JSONEq(t TestingT, expected string, actual string, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1041,7 +1137,7 @@ func JSONEq(t TestingT, expected string, actual string, msgAndArgs ...interface{
 
 // JSONEqf asserts that two JSON strings are equivalent.
 //
-//  assert.JSONEqf(t, `{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`, "error message %s", "formatted")
+//	assert.JSONEqf(t, `{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`, "error message %s", "formatted")
 func JSONEqf(t TestingT, expected string, actual string, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1055,7 +1151,7 @@ func JSONEqf(t TestingT, expected string, actual string, msg string, args ...int
 // Len asserts that the specified object has specific length.
 // Len also fails if the object has a type that len() not accept.
 //
-//    assert.Len(t, mySlice, 3)
+//	assert.Len(t, mySlice, 3)
 func Len(t TestingT, object interface{}, length int, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1069,7 +1165,7 @@ func Len(t TestingT, object interface{}, length int, msgAndArgs ...interface{})
 // Lenf asserts that the specified object has specific length.
 // Lenf also fails if the object has a type that len() not accept.
 //
-//    assert.Lenf(t, mySlice, 3, "error message %s", "formatted")
+//	assert.Lenf(t, mySlice, 3, "error message %s", "formatted")
 func Lenf(t TestingT, object interface{}, length int, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1082,9 +1178,9 @@ func Lenf(t TestingT, object interface{}, length int, msg string, args ...interf
 
 // Less asserts that the first element is less than the second
 //
-//    assert.Less(t, 1, 2)
-//    assert.Less(t, float64(1), float64(2))
-//    assert.Less(t, "a", "b")
+//	assert.Less(t, 1, 2)
+//	assert.Less(t, float64(1), float64(2))
+//	assert.Less(t, "a", "b")
 func Less(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1097,10 +1193,10 @@ func Less(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{})
 
 // LessOrEqual asserts that the first element is less than or equal to the second
 //
-//    assert.LessOrEqual(t, 1, 2)
-//    assert.LessOrEqual(t, 2, 2)
-//    assert.LessOrEqual(t, "a", "b")
-//    assert.LessOrEqual(t, "b", "b")
+//	assert.LessOrEqual(t, 1, 2)
+//	assert.LessOrEqual(t, 2, 2)
+//	assert.LessOrEqual(t, "a", "b")
+//	assert.LessOrEqual(t, "b", "b")
 func LessOrEqual(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1113,10 +1209,10 @@ func LessOrEqual(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...inter
 
 // LessOrEqualf asserts that the first element is less than or equal to the second
 //
-//    assert.LessOrEqualf(t, 1, 2, "error message %s", "formatted")
-//    assert.LessOrEqualf(t, 2, 2, "error message %s", "formatted")
-//    assert.LessOrEqualf(t, "a", "b", "error message %s", "formatted")
-//    assert.LessOrEqualf(t, "b", "b", "error message %s", "formatted")
+//	assert.LessOrEqualf(t, 1, 2, "error message %s", "formatted")
+//	assert.LessOrEqualf(t, 2, 2, "error message %s", "formatted")
+//	assert.LessOrEqualf(t, "a", "b", "error message %s", "formatted")
+//	assert.LessOrEqualf(t, "b", "b", "error message %s", "formatted")
 func LessOrEqualf(t TestingT, e1 interface{}, e2 interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1129,9 +1225,9 @@ func LessOrEqualf(t TestingT, e1 interface{}, e2 interface{}, msg string, args .
 
 // Lessf asserts that the first element is less than the second
 //
-//    assert.Lessf(t, 1, 2, "error message %s", "formatted")
-//    assert.Lessf(t, float64(1), float64(2), "error message %s", "formatted")
-//    assert.Lessf(t, "a", "b", "error message %s", "formatted")
+//	assert.Lessf(t, 1, 2, "error message %s", "formatted")
+//	assert.Lessf(t, float64(1), float64(2), "error message %s", "formatted")
+//	assert.Lessf(t, "a", "b", "error message %s", "formatted")
 func Lessf(t TestingT, e1 interface{}, e2 interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1144,8 +1240,8 @@ func Lessf(t TestingT, e1 interface{}, e2 interface{}, msg string, args ...inter
 
 // Negative asserts that the specified element is negative
 //
-//    assert.Negative(t, -1)
-//    assert.Negative(t, -1.23)
+//	assert.Negative(t, -1)
+//	assert.Negative(t, -1.23)
 func Negative(t TestingT, e interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1158,8 +1254,8 @@ func Negative(t TestingT, e interface{}, msgAndArgs ...interface{}) {
 
 // Negativef asserts that the specified element is negative
 //
-//    assert.Negativef(t, -1, "error message %s", "formatted")
-//    assert.Negativef(t, -1.23, "error message %s", "formatted")
+//	assert.Negativef(t, -1, "error message %s", "formatted")
+//	assert.Negativef(t, -1.23, "error message %s", "formatted")
 func Negativef(t TestingT, e interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1173,7 +1269,7 @@ func Negativef(t TestingT, e interface{}, msg string, args ...interface{}) {
 // Never asserts that the given condition doesn't satisfy in waitFor time,
 // periodically checking the target function each tick.
 //
-//    assert.Never(t, func() bool { return false; }, time.Second, 10*time.Millisecond)
+//	assert.Never(t, func() bool { return false; }, time.Second, 10*time.Millisecond)
 func Never(t TestingT, condition func() bool, waitFor time.Duration, tick time.Duration, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1187,7 +1283,7 @@ func Never(t TestingT, condition func() bool, waitFor time.Duration, tick time.D
 // Neverf asserts that the given condition doesn't satisfy in waitFor time,
 // periodically checking the target function each tick.
 //
-//    assert.Neverf(t, func() bool { return false; }, time.Second, 10*time.Millisecond, "error message %s", "formatted")
+//	assert.Neverf(t, func() bool { return false; }, time.Second, 10*time.Millisecond, "error message %s", "formatted")
 func Neverf(t TestingT, condition func() bool, waitFor time.Duration, tick time.Duration, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1200,7 +1296,7 @@ func Neverf(t TestingT, condition func() bool, waitFor time.Duration, tick time.
 
 // Nil asserts that the specified object is nil.
 //
-//    assert.Nil(t, err)
+//	assert.Nil(t, err)
 func Nil(t TestingT, object interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1213,7 +1309,7 @@ func Nil(t TestingT, object interface{}, msgAndArgs ...interface{}) {
 
 // Nilf asserts that the specified object is nil.
 //
-//    assert.Nilf(t, err, "error message %s", "formatted")
+//	assert.Nilf(t, err, "error message %s", "formatted")
 func Nilf(t TestingT, object interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1250,10 +1346,10 @@ func NoDirExistsf(t TestingT, path string, msg string, args ...interface{}) {
 
 // NoError asserts that a function returned no error (i.e. `nil`).
 //
-//   actualObj, err := SomeFunction()
-//   if assert.NoError(t, err) {
-// 	   assert.Equal(t, expectedObj, actualObj)
-//   }
+//	  actualObj, err := SomeFunction()
+//	  if assert.NoError(t, err) {
+//		   assert.Equal(t, expectedObj, actualObj)
+//	  }
 func NoError(t TestingT, err error, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1266,10 +1362,10 @@ func NoError(t TestingT, err error, msgAndArgs ...interface{}) {
 
 // NoErrorf asserts that a function returned no error (i.e. `nil`).
 //
-//   actualObj, err := SomeFunction()
-//   if assert.NoErrorf(t, err, "error message %s", "formatted") {
-// 	   assert.Equal(t, expectedObj, actualObj)
-//   }
+//	  actualObj, err := SomeFunction()
+//	  if assert.NoErrorf(t, err, "error message %s", "formatted") {
+//		   assert.Equal(t, expectedObj, actualObj)
+//	  }
 func NoErrorf(t TestingT, err error, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1307,9 +1403,9 @@ func NoFileExistsf(t TestingT, path string, msg string, args ...interface{}) {
 // NotContains asserts that the specified string, list(array, slice...) or map does NOT contain the
 // specified substring or element.
 //
-//    assert.NotContains(t, "Hello World", "Earth")
-//    assert.NotContains(t, ["Hello", "World"], "Earth")
-//    assert.NotContains(t, {"Hello": "World"}, "Earth")
+//	assert.NotContains(t, "Hello World", "Earth")
+//	assert.NotContains(t, ["Hello", "World"], "Earth")
+//	assert.NotContains(t, {"Hello": "World"}, "Earth")
 func NotContains(t TestingT, s interface{}, contains interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1323,9 +1419,9 @@ func NotContains(t TestingT, s interface{}, contains interface{}, msgAndArgs ...
 // NotContainsf asserts that the specified string, list(array, slice...) or map does NOT contain the
 // specified substring or element.
 //
-//    assert.NotContainsf(t, "Hello World", "Earth", "error message %s", "formatted")
-//    assert.NotContainsf(t, ["Hello", "World"], "Earth", "error message %s", "formatted")
-//    assert.NotContainsf(t, {"Hello": "World"}, "Earth", "error message %s", "formatted")
+//	assert.NotContainsf(t, "Hello World", "Earth", "error message %s", "formatted")
+//	assert.NotContainsf(t, ["Hello", "World"], "Earth", "error message %s", "formatted")
+//	assert.NotContainsf(t, {"Hello": "World"}, "Earth", "error message %s", "formatted")
 func NotContainsf(t TestingT, s interface{}, contains interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1339,9 +1435,9 @@ func NotContainsf(t TestingT, s interface{}, contains interface{}, msg string, a
 // NotEmpty asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
 // a slice or a channel with len == 0.
 //
-//  if assert.NotEmpty(t, obj) {
-//    assert.Equal(t, "two", obj[1])
-//  }
+//	if assert.NotEmpty(t, obj) {
+//	  assert.Equal(t, "two", obj[1])
+//	}
 func NotEmpty(t TestingT, object interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1355,9 +1451,9 @@ func NotEmpty(t TestingT, object interface{}, msgAndArgs ...interface{}) {
 // NotEmptyf asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
 // a slice or a channel with len == 0.
 //
-//  if assert.NotEmptyf(t, obj, "error message %s", "formatted") {
-//    assert.Equal(t, "two", obj[1])
-//  }
+//	if assert.NotEmptyf(t, obj, "error message %s", "formatted") {
+//	  assert.Equal(t, "two", obj[1])
+//	}
 func NotEmptyf(t TestingT, object interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1370,7 +1466,7 @@ func NotEmptyf(t TestingT, object interface{}, msg string, args ...interface{})
 
 // NotEqual asserts that the specified values are NOT equal.
 //
-//    assert.NotEqual(t, obj1, obj2)
+//	assert.NotEqual(t, obj1, obj2)
 //
 // Pointer variable equality is determined based on the equality of the
 // referenced values (as opposed to the memory addresses).
@@ -1386,7 +1482,7 @@ func NotEqual(t TestingT, expected interface{}, actual interface{}, msgAndArgs .
 
 // NotEqualValues asserts that two objects are not equal even when converted to the same type
 //
-//    assert.NotEqualValues(t, obj1, obj2)
+//	assert.NotEqualValues(t, obj1, obj2)
 func NotEqualValues(t TestingT, expected interface{}, actual interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1399,7 +1495,7 @@ func NotEqualValues(t TestingT, expected interface{}, actual interface{}, msgAnd
 
 // NotEqualValuesf asserts that two objects are not equal even when converted to the same type
 //
-//    assert.NotEqualValuesf(t, obj1, obj2, "error message %s", "formatted")
+//	assert.NotEqualValuesf(t, obj1, obj2, "error message %s", "formatted")
 func NotEqualValuesf(t TestingT, expected interface{}, actual interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1412,7 +1508,7 @@ func NotEqualValuesf(t TestingT, expected interface{}, actual interface{}, msg s
 
 // NotEqualf asserts that the specified values are NOT equal.
 //
-//    assert.NotEqualf(t, obj1, obj2, "error message %s", "formatted")
+//	assert.NotEqualf(t, obj1, obj2, "error message %s", "formatted")
 //
 // Pointer variable equality is determined based on the equality of the
 // referenced values (as opposed to the memory addresses).
@@ -1452,7 +1548,7 @@ func NotErrorIsf(t TestingT, err error, target error, msg string, args ...interf
 
 // NotNil asserts that the specified object is not nil.
 //
-//    assert.NotNil(t, err)
+//	assert.NotNil(t, err)
 func NotNil(t TestingT, object interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1465,7 +1561,7 @@ func NotNil(t TestingT, object interface{}, msgAndArgs ...interface{}) {
 
 // NotNilf asserts that the specified object is not nil.
 //
-//    assert.NotNilf(t, err, "error message %s", "formatted")
+//	assert.NotNilf(t, err, "error message %s", "formatted")
 func NotNilf(t TestingT, object interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1478,7 +1574,7 @@ func NotNilf(t TestingT, object interface{}, msg string, args ...interface{}) {
 
 // NotPanics asserts that the code inside the specified PanicTestFunc does NOT panic.
 //
-//   assert.NotPanics(t, func(){ RemainCalm() })
+//	assert.NotPanics(t, func(){ RemainCalm() })
 func NotPanics(t TestingT, f assert.PanicTestFunc, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1491,7 +1587,7 @@ func NotPanics(t TestingT, f assert.PanicTestFunc, msgAndArgs ...interface{}) {
 
 // NotPanicsf asserts that the code inside the specified PanicTestFunc does NOT panic.
 //
-//   assert.NotPanicsf(t, func(){ RemainCalm() }, "error message %s", "formatted")
+//	assert.NotPanicsf(t, func(){ RemainCalm() }, "error message %s", "formatted")
 func NotPanicsf(t TestingT, f assert.PanicTestFunc, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1504,8 +1600,8 @@ func NotPanicsf(t TestingT, f assert.PanicTestFunc, msg string, args ...interfac
 
 // NotRegexp asserts that a specified regexp does not match a string.
 //
-//  assert.NotRegexp(t, regexp.MustCompile("starts"), "it's starting")
-//  assert.NotRegexp(t, "^start", "it's not starting")
+//	assert.NotRegexp(t, regexp.MustCompile("starts"), "it's starting")
+//	assert.NotRegexp(t, "^start", "it's not starting")
 func NotRegexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1518,8 +1614,8 @@ func NotRegexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interf
 
 // NotRegexpf asserts that a specified regexp does not match a string.
 //
-//  assert.NotRegexpf(t, regexp.MustCompile("starts"), "it's starting", "error message %s", "formatted")
-//  assert.NotRegexpf(t, "^start", "it's not starting", "error message %s", "formatted")
+//	assert.NotRegexpf(t, regexp.MustCompile("starts"), "it's starting", "error message %s", "formatted")
+//	assert.NotRegexpf(t, "^start", "it's not starting", "error message %s", "formatted")
 func NotRegexpf(t TestingT, rx interface{}, str interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1532,7 +1628,7 @@ func NotRegexpf(t TestingT, rx interface{}, str interface{}, msg string, args ..
 
 // NotSame asserts that two pointers do not reference the same object.
 //
-//    assert.NotSame(t, ptr1, ptr2)
+//	assert.NotSame(t, ptr1, ptr2)
 //
 // Both arguments must be pointer variables. Pointer variable sameness is
 // determined based on the equality of both type and value.
@@ -1548,7 +1644,7 @@ func NotSame(t TestingT, expected interface{}, actual interface{}, msgAndArgs ..
 
 // NotSamef asserts that two pointers do not reference the same object.
 //
-//    assert.NotSamef(t, ptr1, ptr2, "error message %s", "formatted")
+//	assert.NotSamef(t, ptr1, ptr2, "error message %s", "formatted")
 //
 // Both arguments must be pointer variables. Pointer variable sameness is
 // determined based on the equality of both type and value.
@@ -1565,7 +1661,7 @@ func NotSamef(t TestingT, expected interface{}, actual interface{}, msg string,
 // NotSubset asserts that the specified list(array, slice...) contains not all
 // elements given in the specified subset(array, slice...).
 //
-//    assert.NotSubset(t, [1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]")
+//	assert.NotSubset(t, [1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]")
 func NotSubset(t TestingT, list interface{}, subset interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1579,7 +1675,7 @@ func NotSubset(t TestingT, list interface{}, subset interface{}, msgAndArgs ...i
 // NotSubsetf asserts that the specified list(array, slice...) contains not all
 // elements given in the specified subset(array, slice...).
 //
-//    assert.NotSubsetf(t, [1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]", "error message %s", "formatted")
+//	assert.NotSubsetf(t, [1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]", "error message %s", "formatted")
 func NotSubsetf(t TestingT, list interface{}, subset interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1614,7 +1710,7 @@ func NotZerof(t TestingT, i interface{}, msg string, args ...interface{}) {
 
 // Panics asserts that the code inside the specified PanicTestFunc panics.
 //
-//   assert.Panics(t, func(){ GoCrazy() })
+//	assert.Panics(t, func(){ GoCrazy() })
 func Panics(t TestingT, f assert.PanicTestFunc, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1629,7 +1725,7 @@ func Panics(t TestingT, f assert.PanicTestFunc, msgAndArgs ...interface{}) {
 // panics, and that the recovered panic value is an error that satisfies the
 // EqualError comparison.
 //
-//   assert.PanicsWithError(t, "crazy error", func(){ GoCrazy() })
+//	assert.PanicsWithError(t, "crazy error", func(){ GoCrazy() })
 func PanicsWithError(t TestingT, errString string, f assert.PanicTestFunc, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1644,7 +1740,7 @@ func PanicsWithError(t TestingT, errString string, f assert.PanicTestFunc, msgAn
 // panics, and that the recovered panic value is an error that satisfies the
 // EqualError comparison.
 //
-//   assert.PanicsWithErrorf(t, "crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
+//	assert.PanicsWithErrorf(t, "crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
 func PanicsWithErrorf(t TestingT, errString string, f assert.PanicTestFunc, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1658,7 +1754,7 @@ func PanicsWithErrorf(t TestingT, errString string, f assert.PanicTestFunc, msg
 // PanicsWithValue asserts that the code inside the specified PanicTestFunc panics, and that
 // the recovered panic value equals the expected panic value.
 //
-//   assert.PanicsWithValue(t, "crazy error", func(){ GoCrazy() })
+//	assert.PanicsWithValue(t, "crazy error", func(){ GoCrazy() })
 func PanicsWithValue(t TestingT, expected interface{}, f assert.PanicTestFunc, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1672,7 +1768,7 @@ func PanicsWithValue(t TestingT, expected interface{}, f assert.PanicTestFunc, m
 // PanicsWithValuef asserts that the code inside the specified PanicTestFunc panics, and that
 // the recovered panic value equals the expected panic value.
 //
-//   assert.PanicsWithValuef(t, "crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
+//	assert.PanicsWithValuef(t, "crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
 func PanicsWithValuef(t TestingT, expected interface{}, f assert.PanicTestFunc, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1685,7 +1781,7 @@ func PanicsWithValuef(t TestingT, expected interface{}, f assert.PanicTestFunc,
 
 // Panicsf asserts that the code inside the specified PanicTestFunc panics.
 //
-//   assert.Panicsf(t, func(){ GoCrazy() }, "error message %s", "formatted")
+//	assert.Panicsf(t, func(){ GoCrazy() }, "error message %s", "formatted")
 func Panicsf(t TestingT, f assert.PanicTestFunc, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1698,8 +1794,8 @@ func Panicsf(t TestingT, f assert.PanicTestFunc, msg string, args ...interface{}
 
 // Positive asserts that the specified element is positive
 //
-//    assert.Positive(t, 1)
-//    assert.Positive(t, 1.23)
+//	assert.Positive(t, 1)
+//	assert.Positive(t, 1.23)
 func Positive(t TestingT, e interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1712,8 +1808,8 @@ func Positive(t TestingT, e interface{}, msgAndArgs ...interface{}) {
 
 // Positivef asserts that the specified element is positive
 //
-//    assert.Positivef(t, 1, "error message %s", "formatted")
-//    assert.Positivef(t, 1.23, "error message %s", "formatted")
+//	assert.Positivef(t, 1, "error message %s", "formatted")
+//	assert.Positivef(t, 1.23, "error message %s", "formatted")
 func Positivef(t TestingT, e interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1726,8 +1822,8 @@ func Positivef(t TestingT, e interface{}, msg string, args ...interface{}) {
 
 // Regexp asserts that a specified regexp matches a string.
 //
-//  assert.Regexp(t, regexp.MustCompile("start"), "it's starting")
-//  assert.Regexp(t, "start...$", "it's not starting")
+//	assert.Regexp(t, regexp.MustCompile("start"), "it's starting")
+//	assert.Regexp(t, "start...$", "it's not starting")
 func Regexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1740,8 +1836,8 @@ func Regexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interface
 
 // Regexpf asserts that a specified regexp matches a string.
 //
-//  assert.Regexpf(t, regexp.MustCompile("start"), "it's starting", "error message %s", "formatted")
-//  assert.Regexpf(t, "start...$", "it's not starting", "error message %s", "formatted")
+//	assert.Regexpf(t, regexp.MustCompile("start"), "it's starting", "error message %s", "formatted")
+//	assert.Regexpf(t, "start...$", "it's not starting", "error message %s", "formatted")
 func Regexpf(t TestingT, rx interface{}, str interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1754,7 +1850,7 @@ func Regexpf(t TestingT, rx interface{}, str interface{}, msg string, args ...in
 
 // Same asserts that two pointers reference the same object.
 //
-//    assert.Same(t, ptr1, ptr2)
+//	assert.Same(t, ptr1, ptr2)
 //
 // Both arguments must be pointer variables. Pointer variable sameness is
 // determined based on the equality of both type and value.
@@ -1770,7 +1866,7 @@ func Same(t TestingT, expected interface{}, actual interface{}, msgAndArgs ...in
 
 // Samef asserts that two pointers reference the same object.
 //
-//    assert.Samef(t, ptr1, ptr2, "error message %s", "formatted")
+//	assert.Samef(t, ptr1, ptr2, "error message %s", "formatted")
 //
 // Both arguments must be pointer variables. Pointer variable sameness is
 // determined based on the equality of both type and value.
@@ -1787,7 +1883,7 @@ func Samef(t TestingT, expected interface{}, actual interface{}, msg string, arg
 // Subset asserts that the specified list(array, slice...) contains all
 // elements given in the specified subset(array, slice...).
 //
-//    assert.Subset(t, [1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]")
+//	assert.Subset(t, [1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]")
 func Subset(t TestingT, list interface{}, subset interface{}, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1801,7 +1897,7 @@ func Subset(t TestingT, list interface{}, subset interface{}, msgAndArgs ...inte
 // Subsetf asserts that the specified list(array, slice...) contains all
 // elements given in the specified subset(array, slice...).
 //
-//    assert.Subsetf(t, [1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]", "error message %s", "formatted")
+//	assert.Subsetf(t, [1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]", "error message %s", "formatted")
 func Subsetf(t TestingT, list interface{}, subset interface{}, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1814,7 +1910,7 @@ func Subsetf(t TestingT, list interface{}, subset interface{}, msg string, args
 
 // True asserts that the specified value is true.
 //
-//    assert.True(t, myBool)
+//	assert.True(t, myBool)
 func True(t TestingT, value bool, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1827,7 +1923,7 @@ func True(t TestingT, value bool, msgAndArgs ...interface{}) {
 
 // Truef asserts that the specified value is true.
 //
-//    assert.Truef(t, myBool, "error message %s", "formatted")
+//	assert.Truef(t, myBool, "error message %s", "formatted")
 func Truef(t TestingT, value bool, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1840,7 +1936,7 @@ func Truef(t TestingT, value bool, msg string, args ...interface{}) {
 
 // WithinDuration asserts that the two times are within duration delta of each other.
 //
-//   assert.WithinDuration(t, time.Now(), time.Now(), 10*time.Second)
+//	assert.WithinDuration(t, time.Now(), time.Now(), 10*time.Second)
 func WithinDuration(t TestingT, expected time.Time, actual time.Time, delta time.Duration, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1853,7 +1949,7 @@ func WithinDuration(t TestingT, expected time.Time, actual time.Time, delta time
 
 // WithinDurationf asserts that the two times are within duration delta of each other.
 //
-//   assert.WithinDurationf(t, time.Now(), time.Now(), 10*time.Second, "error message %s", "formatted")
+//	assert.WithinDurationf(t, time.Now(), time.Now(), 10*time.Second, "error message %s", "formatted")
 func WithinDurationf(t TestingT, expected time.Time, actual time.Time, delta time.Duration, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1866,7 +1962,7 @@ func WithinDurationf(t TestingT, expected time.Time, actual time.Time, delta tim
 
 // WithinRange asserts that a time is within a time range (inclusive).
 //
-//   assert.WithinRange(t, time.Now(), time.Now().Add(-time.Second), time.Now().Add(time.Second))
+//	assert.WithinRange(t, time.Now(), time.Now().Add(-time.Second), time.Now().Add(time.Second))
 func WithinRange(t TestingT, actual time.Time, start time.Time, end time.Time, msgAndArgs ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1879,7 +1975,7 @@ func WithinRange(t TestingT, actual time.Time, start time.Time, end time.Time, m
 
 // WithinRangef asserts that a time is within a time range (inclusive).
 //
-//   assert.WithinRangef(t, time.Now(), time.Now().Add(-time.Second), time.Now().Add(time.Second), "error message %s", "formatted")
+//	assert.WithinRangef(t, time.Now(), time.Now().Add(-time.Second), time.Now().Add(time.Second), "error message %s", "formatted")
 func WithinRangef(t TestingT, actual time.Time, start time.Time, end time.Time, msg string, args ...interface{}) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
diff --git a/vendor/github.com/stretchr/testify/require/require_forward.go b/vendor/github.com/stretchr/testify/require/require_forward.go
index 960bf6f2..3b5b0933 100644
--- a/vendor/github.com/stretchr/testify/require/require_forward.go
+++ b/vendor/github.com/stretchr/testify/require/require_forward.go
@@ -31,9 +31,9 @@ func (a *Assertions) Conditionf(comp assert.Comparison, msg string, args ...inte
 // Contains asserts that the specified string, list(array, slice...) or map contains the
 // specified substring or element.
 //
-//    a.Contains("Hello World", "World")
-//    a.Contains(["Hello", "World"], "World")
-//    a.Contains({"Hello": "World"}, "Hello")
+//	a.Contains("Hello World", "World")
+//	a.Contains(["Hello", "World"], "World")
+//	a.Contains({"Hello": "World"}, "Hello")
 func (a *Assertions) Contains(s interface{}, contains interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -44,9 +44,9 @@ func (a *Assertions) Contains(s interface{}, contains interface{}, msgAndArgs ..
 // Containsf asserts that the specified string, list(array, slice...) or map contains the
 // specified substring or element.
 //
-//    a.Containsf("Hello World", "World", "error message %s", "formatted")
-//    a.Containsf(["Hello", "World"], "World", "error message %s", "formatted")
-//    a.Containsf({"Hello": "World"}, "Hello", "error message %s", "formatted")
+//	a.Containsf("Hello World", "World", "error message %s", "formatted")
+//	a.Containsf(["Hello", "World"], "World", "error message %s", "formatted")
+//	a.Containsf({"Hello": "World"}, "Hello", "error message %s", "formatted")
 func (a *Assertions) Containsf(s interface{}, contains interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -99,7 +99,7 @@ func (a *Assertions) ElementsMatchf(listA interface{}, listB interface{}, msg st
 // Empty asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
 // a slice or a channel with len == 0.
 //
-//  a.Empty(obj)
+//	a.Empty(obj)
 func (a *Assertions) Empty(object interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -110,7 +110,7 @@ func (a *Assertions) Empty(object interface{}, msgAndArgs ...interface{}) {
 // Emptyf asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
 // a slice or a channel with len == 0.
 //
-//  a.Emptyf(obj, "error message %s", "formatted")
+//	a.Emptyf(obj, "error message %s", "formatted")
 func (a *Assertions) Emptyf(object interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -120,7 +120,7 @@ func (a *Assertions) Emptyf(object interface{}, msg string, args ...interface{})
 
 // Equal asserts that two objects are equal.
 //
-//    a.Equal(123, 123)
+//	a.Equal(123, 123)
 //
 // Pointer variable equality is determined based on the equality of the
 // referenced values (as opposed to the memory addresses). Function equality
@@ -135,8 +135,8 @@ func (a *Assertions) Equal(expected interface{}, actual interface{}, msgAndArgs
 // EqualError asserts that a function returned an error (i.e. not `nil`)
 // and that it is equal to the provided error.
 //
-//   actualObj, err := SomeFunction()
-//   a.EqualError(err,  expectedErrorString)
+//	actualObj, err := SomeFunction()
+//	a.EqualError(err,  expectedErrorString)
 func (a *Assertions) EqualError(theError error, errString string, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -147,8 +147,8 @@ func (a *Assertions) EqualError(theError error, errString string, msgAndArgs ...
 // EqualErrorf asserts that a function returned an error (i.e. not `nil`)
 // and that it is equal to the provided error.
 //
-//   actualObj, err := SomeFunction()
-//   a.EqualErrorf(err,  expectedErrorString, "error message %s", "formatted")
+//	actualObj, err := SomeFunction()
+//	a.EqualErrorf(err,  expectedErrorString, "error message %s", "formatted")
 func (a *Assertions) EqualErrorf(theError error, errString string, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -156,10 +156,44 @@ func (a *Assertions) EqualErrorf(theError error, errString string, msg string, a
 	EqualErrorf(a.t, theError, errString, msg, args...)
 }
 
+// EqualExportedValues asserts that the types of two objects are equal and their public
+// fields are also equal. This is useful for comparing structs that have private fields
+// that could potentially differ.
+//
+//	 type S struct {
+//		Exported     	int
+//		notExported   	int
+//	 }
+//	 a.EqualExportedValues(S{1, 2}, S{1, 3}) => true
+//	 a.EqualExportedValues(S{1, 2}, S{2, 3}) => false
+func (a *Assertions) EqualExportedValues(expected interface{}, actual interface{}, msgAndArgs ...interface{}) {
+	if h, ok := a.t.(tHelper); ok {
+		h.Helper()
+	}
+	EqualExportedValues(a.t, expected, actual, msgAndArgs...)
+}
+
+// EqualExportedValuesf asserts that the types of two objects are equal and their public
+// fields are also equal. This is useful for comparing structs that have private fields
+// that could potentially differ.
+//
+//	 type S struct {
+//		Exported     	int
+//		notExported   	int
+//	 }
+//	 a.EqualExportedValuesf(S{1, 2}, S{1, 3}, "error message %s", "formatted") => true
+//	 a.EqualExportedValuesf(S{1, 2}, S{2, 3}, "error message %s", "formatted") => false
+func (a *Assertions) EqualExportedValuesf(expected interface{}, actual interface{}, msg string, args ...interface{}) {
+	if h, ok := a.t.(tHelper); ok {
+		h.Helper()
+	}
+	EqualExportedValuesf(a.t, expected, actual, msg, args...)
+}
+
 // EqualValues asserts that two objects are equal or convertable to the same types
 // and equal.
 //
-//    a.EqualValues(uint32(123), int32(123))
+//	a.EqualValues(uint32(123), int32(123))
 func (a *Assertions) EqualValues(expected interface{}, actual interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -170,7 +204,7 @@ func (a *Assertions) EqualValues(expected interface{}, actual interface{}, msgAn
 // EqualValuesf asserts that two objects are equal or convertable to the same types
 // and equal.
 //
-//    a.EqualValuesf(uint32(123), int32(123), "error message %s", "formatted")
+//	a.EqualValuesf(uint32(123), int32(123), "error message %s", "formatted")
 func (a *Assertions) EqualValuesf(expected interface{}, actual interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -180,7 +214,7 @@ func (a *Assertions) EqualValuesf(expected interface{}, actual interface{}, msg
 
 // Equalf asserts that two objects are equal.
 //
-//    a.Equalf(123, 123, "error message %s", "formatted")
+//	a.Equalf(123, 123, "error message %s", "formatted")
 //
 // Pointer variable equality is determined based on the equality of the
 // referenced values (as opposed to the memory addresses). Function equality
@@ -194,10 +228,10 @@ func (a *Assertions) Equalf(expected interface{}, actual interface{}, msg string
 
 // Error asserts that a function returned an error (i.e. not `nil`).
 //
-//   actualObj, err := SomeFunction()
-//   if a.Error(err) {
-// 	   assert.Equal(t, expectedError, err)
-//   }
+//	  actualObj, err := SomeFunction()
+//	  if a.Error(err) {
+//		   assert.Equal(t, expectedError, err)
+//	  }
 func (a *Assertions) Error(err error, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -226,8 +260,8 @@ func (a *Assertions) ErrorAsf(err error, target interface{}, msg string, args ..
 // ErrorContains asserts that a function returned an error (i.e. not `nil`)
 // and that the error contains the specified substring.
 //
-//   actualObj, err := SomeFunction()
-//   a.ErrorContains(err,  expectedErrorSubString)
+//	actualObj, err := SomeFunction()
+//	a.ErrorContains(err,  expectedErrorSubString)
 func (a *Assertions) ErrorContains(theError error, contains string, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -238,8 +272,8 @@ func (a *Assertions) ErrorContains(theError error, contains string, msgAndArgs .
 // ErrorContainsf asserts that a function returned an error (i.e. not `nil`)
 // and that the error contains the specified substring.
 //
-//   actualObj, err := SomeFunction()
-//   a.ErrorContainsf(err,  expectedErrorSubString, "error message %s", "formatted")
+//	actualObj, err := SomeFunction()
+//	a.ErrorContainsf(err,  expectedErrorSubString, "error message %s", "formatted")
 func (a *Assertions) ErrorContainsf(theError error, contains string, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -267,10 +301,10 @@ func (a *Assertions) ErrorIsf(err error, target error, msg string, args ...inter
 
 // Errorf asserts that a function returned an error (i.e. not `nil`).
 //
-//   actualObj, err := SomeFunction()
-//   if a.Errorf(err, "error message %s", "formatted") {
-// 	   assert.Equal(t, expectedErrorf, err)
-//   }
+//	  actualObj, err := SomeFunction()
+//	  if a.Errorf(err, "error message %s", "formatted") {
+//		   assert.Equal(t, expectedErrorf, err)
+//	  }
 func (a *Assertions) Errorf(err error, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -281,7 +315,7 @@ func (a *Assertions) Errorf(err error, msg string, args ...interface{}) {
 // Eventually asserts that given condition will be met in waitFor time,
 // periodically checking target function each tick.
 //
-//    a.Eventually(func() bool { return true; }, time.Second, 10*time.Millisecond)
+//	a.Eventually(func() bool { return true; }, time.Second, 10*time.Millisecond)
 func (a *Assertions) Eventually(condition func() bool, waitFor time.Duration, tick time.Duration, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -289,10 +323,60 @@ func (a *Assertions) Eventually(condition func() bool, waitFor time.Duration, ti
 	Eventually(a.t, condition, waitFor, tick, msgAndArgs...)
 }
 
+// EventuallyWithT asserts that given condition will be met in waitFor time,
+// periodically checking target function each tick. In contrast to Eventually,
+// it supplies a CollectT to the condition function, so that the condition
+// function can use the CollectT to call other assertions.
+// The condition is considered "met" if no errors are raised in a tick.
+// The supplied CollectT collects all errors from one tick (if there are any).
+// If the condition is not met before waitFor, the collected errors of
+// the last tick are copied to t.
+//
+//	externalValue := false
+//	go func() {
+//		time.Sleep(8*time.Second)
+//		externalValue = true
+//	}()
+//	a.EventuallyWithT(func(c *assert.CollectT) {
+//		// add assertions as needed; any assertion failure will fail the current tick
+//		assert.True(c, externalValue, "expected 'externalValue' to be true")
+//	}, 1*time.Second, 10*time.Second, "external state has not changed to 'true'; still false")
+func (a *Assertions) EventuallyWithT(condition func(collect *assert.CollectT), waitFor time.Duration, tick time.Duration, msgAndArgs ...interface{}) {
+	if h, ok := a.t.(tHelper); ok {
+		h.Helper()
+	}
+	EventuallyWithT(a.t, condition, waitFor, tick, msgAndArgs...)
+}
+
+// EventuallyWithTf asserts that given condition will be met in waitFor time,
+// periodically checking target function each tick. In contrast to Eventually,
+// it supplies a CollectT to the condition function, so that the condition
+// function can use the CollectT to call other assertions.
+// The condition is considered "met" if no errors are raised in a tick.
+// The supplied CollectT collects all errors from one tick (if there are any).
+// If the condition is not met before waitFor, the collected errors of
+// the last tick are copied to t.
+//
+//	externalValue := false
+//	go func() {
+//		time.Sleep(8*time.Second)
+//		externalValue = true
+//	}()
+//	a.EventuallyWithTf(func(c *assert.CollectT, "error message %s", "formatted") {
+//		// add assertions as needed; any assertion failure will fail the current tick
+//		assert.True(c, externalValue, "expected 'externalValue' to be true")
+//	}, 1*time.Second, 10*time.Second, "external state has not changed to 'true'; still false")
+func (a *Assertions) EventuallyWithTf(condition func(collect *assert.CollectT), waitFor time.Duration, tick time.Duration, msg string, args ...interface{}) {
+	if h, ok := a.t.(tHelper); ok {
+		h.Helper()
+	}
+	EventuallyWithTf(a.t, condition, waitFor, tick, msg, args...)
+}
+
 // Eventuallyf asserts that given condition will be met in waitFor time,
 // periodically checking target function each tick.
 //
-//    a.Eventuallyf(func() bool { return true; }, time.Second, 10*time.Millisecond, "error message %s", "formatted")
+//	a.Eventuallyf(func() bool { return true; }, time.Second, 10*time.Millisecond, "error message %s", "formatted")
 func (a *Assertions) Eventuallyf(condition func() bool, waitFor time.Duration, tick time.Duration, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -302,7 +386,7 @@ func (a *Assertions) Eventuallyf(condition func() bool, waitFor time.Duration, t
 
 // Exactly asserts that two objects are equal in value and type.
 //
-//    a.Exactly(int32(123), int64(123))
+//	a.Exactly(int32(123), int64(123))
 func (a *Assertions) Exactly(expected interface{}, actual interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -312,7 +396,7 @@ func (a *Assertions) Exactly(expected interface{}, actual interface{}, msgAndArg
 
 // Exactlyf asserts that two objects are equal in value and type.
 //
-//    a.Exactlyf(int32(123), int64(123), "error message %s", "formatted")
+//	a.Exactlyf(int32(123), int64(123), "error message %s", "formatted")
 func (a *Assertions) Exactlyf(expected interface{}, actual interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -354,7 +438,7 @@ func (a *Assertions) Failf(failureMessage string, msg string, args ...interface{
 
 // False asserts that the specified value is false.
 //
-//    a.False(myBool)
+//	a.False(myBool)
 func (a *Assertions) False(value bool, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -364,7 +448,7 @@ func (a *Assertions) False(value bool, msgAndArgs ...interface{}) {
 
 // Falsef asserts that the specified value is false.
 //
-//    a.Falsef(myBool, "error message %s", "formatted")
+//	a.Falsef(myBool, "error message %s", "formatted")
 func (a *Assertions) Falsef(value bool, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -392,9 +476,9 @@ func (a *Assertions) FileExistsf(path string, msg string, args ...interface{}) {
 
 // Greater asserts that the first element is greater than the second
 //
-//    a.Greater(2, 1)
-//    a.Greater(float64(2), float64(1))
-//    a.Greater("b", "a")
+//	a.Greater(2, 1)
+//	a.Greater(float64(2), float64(1))
+//	a.Greater("b", "a")
 func (a *Assertions) Greater(e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -404,10 +488,10 @@ func (a *Assertions) Greater(e1 interface{}, e2 interface{}, msgAndArgs ...inter
 
 // GreaterOrEqual asserts that the first element is greater than or equal to the second
 //
-//    a.GreaterOrEqual(2, 1)
-//    a.GreaterOrEqual(2, 2)
-//    a.GreaterOrEqual("b", "a")
-//    a.GreaterOrEqual("b", "b")
+//	a.GreaterOrEqual(2, 1)
+//	a.GreaterOrEqual(2, 2)
+//	a.GreaterOrEqual("b", "a")
+//	a.GreaterOrEqual("b", "b")
 func (a *Assertions) GreaterOrEqual(e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -417,10 +501,10 @@ func (a *Assertions) GreaterOrEqual(e1 interface{}, e2 interface{}, msgAndArgs .
 
 // GreaterOrEqualf asserts that the first element is greater than or equal to the second
 //
-//    a.GreaterOrEqualf(2, 1, "error message %s", "formatted")
-//    a.GreaterOrEqualf(2, 2, "error message %s", "formatted")
-//    a.GreaterOrEqualf("b", "a", "error message %s", "formatted")
-//    a.GreaterOrEqualf("b", "b", "error message %s", "formatted")
+//	a.GreaterOrEqualf(2, 1, "error message %s", "formatted")
+//	a.GreaterOrEqualf(2, 2, "error message %s", "formatted")
+//	a.GreaterOrEqualf("b", "a", "error message %s", "formatted")
+//	a.GreaterOrEqualf("b", "b", "error message %s", "formatted")
 func (a *Assertions) GreaterOrEqualf(e1 interface{}, e2 interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -430,9 +514,9 @@ func (a *Assertions) GreaterOrEqualf(e1 interface{}, e2 interface{}, msg string,
 
 // Greaterf asserts that the first element is greater than the second
 //
-//    a.Greaterf(2, 1, "error message %s", "formatted")
-//    a.Greaterf(float64(2), float64(1), "error message %s", "formatted")
-//    a.Greaterf("b", "a", "error message %s", "formatted")
+//	a.Greaterf(2, 1, "error message %s", "formatted")
+//	a.Greaterf(float64(2), float64(1), "error message %s", "formatted")
+//	a.Greaterf("b", "a", "error message %s", "formatted")
 func (a *Assertions) Greaterf(e1 interface{}, e2 interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -443,7 +527,7 @@ func (a *Assertions) Greaterf(e1 interface{}, e2 interface{}, msg string, args .
 // HTTPBodyContains asserts that a specified handler returns a
 // body that contains a string.
 //
-//  a.HTTPBodyContains(myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky")
+//	a.HTTPBodyContains(myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPBodyContains(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msgAndArgs ...interface{}) {
@@ -456,7 +540,7 @@ func (a *Assertions) HTTPBodyContains(handler http.HandlerFunc, method string, u
 // HTTPBodyContainsf asserts that a specified handler returns a
 // body that contains a string.
 //
-//  a.HTTPBodyContainsf(myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
+//	a.HTTPBodyContainsf(myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPBodyContainsf(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msg string, args ...interface{}) {
@@ -469,7 +553,7 @@ func (a *Assertions) HTTPBodyContainsf(handler http.HandlerFunc, method string,
 // HTTPBodyNotContains asserts that a specified handler returns a
 // body that does not contain a string.
 //
-//  a.HTTPBodyNotContains(myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky")
+//	a.HTTPBodyNotContains(myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPBodyNotContains(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msgAndArgs ...interface{}) {
@@ -482,7 +566,7 @@ func (a *Assertions) HTTPBodyNotContains(handler http.HandlerFunc, method string
 // HTTPBodyNotContainsf asserts that a specified handler returns a
 // body that does not contain a string.
 //
-//  a.HTTPBodyNotContainsf(myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
+//	a.HTTPBodyNotContainsf(myHandler, "GET", "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPBodyNotContainsf(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msg string, args ...interface{}) {
@@ -494,7 +578,7 @@ func (a *Assertions) HTTPBodyNotContainsf(handler http.HandlerFunc, method strin
 
 // HTTPError asserts that a specified handler returns an error status code.
 //
-//  a.HTTPError(myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//	a.HTTPError(myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPError(handler http.HandlerFunc, method string, url string, values url.Values, msgAndArgs ...interface{}) {
@@ -506,7 +590,7 @@ func (a *Assertions) HTTPError(handler http.HandlerFunc, method string, url stri
 
 // HTTPErrorf asserts that a specified handler returns an error status code.
 //
-//  a.HTTPErrorf(myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//	a.HTTPErrorf(myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPErrorf(handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) {
@@ -518,7 +602,7 @@ func (a *Assertions) HTTPErrorf(handler http.HandlerFunc, method string, url str
 
 // HTTPRedirect asserts that a specified handler returns a redirect status code.
 //
-//  a.HTTPRedirect(myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//	a.HTTPRedirect(myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPRedirect(handler http.HandlerFunc, method string, url string, values url.Values, msgAndArgs ...interface{}) {
@@ -530,7 +614,7 @@ func (a *Assertions) HTTPRedirect(handler http.HandlerFunc, method string, url s
 
 // HTTPRedirectf asserts that a specified handler returns a redirect status code.
 //
-//  a.HTTPRedirectf(myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//	a.HTTPRedirectf(myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPRedirectf(handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) {
@@ -542,7 +626,7 @@ func (a *Assertions) HTTPRedirectf(handler http.HandlerFunc, method string, url
 
 // HTTPStatusCode asserts that a specified handler returns a specified status code.
 //
-//  a.HTTPStatusCode(myHandler, "GET", "/notImplemented", nil, 501)
+//	a.HTTPStatusCode(myHandler, "GET", "/notImplemented", nil, 501)
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPStatusCode(handler http.HandlerFunc, method string, url string, values url.Values, statuscode int, msgAndArgs ...interface{}) {
@@ -554,7 +638,7 @@ func (a *Assertions) HTTPStatusCode(handler http.HandlerFunc, method string, url
 
 // HTTPStatusCodef asserts that a specified handler returns a specified status code.
 //
-//  a.HTTPStatusCodef(myHandler, "GET", "/notImplemented", nil, 501, "error message %s", "formatted")
+//	a.HTTPStatusCodef(myHandler, "GET", "/notImplemented", nil, 501, "error message %s", "formatted")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPStatusCodef(handler http.HandlerFunc, method string, url string, values url.Values, statuscode int, msg string, args ...interface{}) {
@@ -566,7 +650,7 @@ func (a *Assertions) HTTPStatusCodef(handler http.HandlerFunc, method string, ur
 
 // HTTPSuccess asserts that a specified handler returns a success status code.
 //
-//  a.HTTPSuccess(myHandler, "POST", "http://www.google.com", nil)
+//	a.HTTPSuccess(myHandler, "POST", "http://www.google.com", nil)
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPSuccess(handler http.HandlerFunc, method string, url string, values url.Values, msgAndArgs ...interface{}) {
@@ -578,7 +662,7 @@ func (a *Assertions) HTTPSuccess(handler http.HandlerFunc, method string, url st
 
 // HTTPSuccessf asserts that a specified handler returns a success status code.
 //
-//  a.HTTPSuccessf(myHandler, "POST", "http://www.google.com", nil, "error message %s", "formatted")
+//	a.HTTPSuccessf(myHandler, "POST", "http://www.google.com", nil, "error message %s", "formatted")
 //
 // Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) HTTPSuccessf(handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) {
@@ -590,7 +674,7 @@ func (a *Assertions) HTTPSuccessf(handler http.HandlerFunc, method string, url s
 
 // Implements asserts that an object is implemented by the specified interface.
 //
-//    a.Implements((*MyInterface)(nil), new(MyObject))
+//	a.Implements((*MyInterface)(nil), new(MyObject))
 func (a *Assertions) Implements(interfaceObject interface{}, object interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -600,7 +684,7 @@ func (a *Assertions) Implements(interfaceObject interface{}, object interface{},
 
 // Implementsf asserts that an object is implemented by the specified interface.
 //
-//    a.Implementsf((*MyInterface)(nil), new(MyObject), "error message %s", "formatted")
+//	a.Implementsf((*MyInterface)(nil), new(MyObject), "error message %s", "formatted")
 func (a *Assertions) Implementsf(interfaceObject interface{}, object interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -610,7 +694,7 @@ func (a *Assertions) Implementsf(interfaceObject interface{}, object interface{}
 
 // InDelta asserts that the two numerals are within delta of each other.
 //
-// 	 a.InDelta(math.Pi, 22/7.0, 0.01)
+//	a.InDelta(math.Pi, 22/7.0, 0.01)
 func (a *Assertions) InDelta(expected interface{}, actual interface{}, delta float64, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -652,7 +736,7 @@ func (a *Assertions) InDeltaSlicef(expected interface{}, actual interface{}, del
 
 // InDeltaf asserts that the two numerals are within delta of each other.
 //
-// 	 a.InDeltaf(math.Pi, 22/7.0, 0.01, "error message %s", "formatted")
+//	a.InDeltaf(math.Pi, 22/7.0, 0.01, "error message %s", "formatted")
 func (a *Assertions) InDeltaf(expected interface{}, actual interface{}, delta float64, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -694,9 +778,9 @@ func (a *Assertions) InEpsilonf(expected interface{}, actual interface{}, epsilo
 
 // IsDecreasing asserts that the collection is decreasing
 //
-//    a.IsDecreasing([]int{2, 1, 0})
-//    a.IsDecreasing([]float{2, 1})
-//    a.IsDecreasing([]string{"b", "a"})
+//	a.IsDecreasing([]int{2, 1, 0})
+//	a.IsDecreasing([]float{2, 1})
+//	a.IsDecreasing([]string{"b", "a"})
 func (a *Assertions) IsDecreasing(object interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -706,9 +790,9 @@ func (a *Assertions) IsDecreasing(object interface{}, msgAndArgs ...interface{})
 
 // IsDecreasingf asserts that the collection is decreasing
 //
-//    a.IsDecreasingf([]int{2, 1, 0}, "error message %s", "formatted")
-//    a.IsDecreasingf([]float{2, 1}, "error message %s", "formatted")
-//    a.IsDecreasingf([]string{"b", "a"}, "error message %s", "formatted")
+//	a.IsDecreasingf([]int{2, 1, 0}, "error message %s", "formatted")
+//	a.IsDecreasingf([]float{2, 1}, "error message %s", "formatted")
+//	a.IsDecreasingf([]string{"b", "a"}, "error message %s", "formatted")
 func (a *Assertions) IsDecreasingf(object interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -718,9 +802,9 @@ func (a *Assertions) IsDecreasingf(object interface{}, msg string, args ...inter
 
 // IsIncreasing asserts that the collection is increasing
 //
-//    a.IsIncreasing([]int{1, 2, 3})
-//    a.IsIncreasing([]float{1, 2})
-//    a.IsIncreasing([]string{"a", "b"})
+//	a.IsIncreasing([]int{1, 2, 3})
+//	a.IsIncreasing([]float{1, 2})
+//	a.IsIncreasing([]string{"a", "b"})
 func (a *Assertions) IsIncreasing(object interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -730,9 +814,9 @@ func (a *Assertions) IsIncreasing(object interface{}, msgAndArgs ...interface{})
 
 // IsIncreasingf asserts that the collection is increasing
 //
-//    a.IsIncreasingf([]int{1, 2, 3}, "error message %s", "formatted")
-//    a.IsIncreasingf([]float{1, 2}, "error message %s", "formatted")
-//    a.IsIncreasingf([]string{"a", "b"}, "error message %s", "formatted")
+//	a.IsIncreasingf([]int{1, 2, 3}, "error message %s", "formatted")
+//	a.IsIncreasingf([]float{1, 2}, "error message %s", "formatted")
+//	a.IsIncreasingf([]string{"a", "b"}, "error message %s", "formatted")
 func (a *Assertions) IsIncreasingf(object interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -742,9 +826,9 @@ func (a *Assertions) IsIncreasingf(object interface{}, msg string, args ...inter
 
 // IsNonDecreasing asserts that the collection is not decreasing
 //
-//    a.IsNonDecreasing([]int{1, 1, 2})
-//    a.IsNonDecreasing([]float{1, 2})
-//    a.IsNonDecreasing([]string{"a", "b"})
+//	a.IsNonDecreasing([]int{1, 1, 2})
+//	a.IsNonDecreasing([]float{1, 2})
+//	a.IsNonDecreasing([]string{"a", "b"})
 func (a *Assertions) IsNonDecreasing(object interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -754,9 +838,9 @@ func (a *Assertions) IsNonDecreasing(object interface{}, msgAndArgs ...interface
 
 // IsNonDecreasingf asserts that the collection is not decreasing
 //
-//    a.IsNonDecreasingf([]int{1, 1, 2}, "error message %s", "formatted")
-//    a.IsNonDecreasingf([]float{1, 2}, "error message %s", "formatted")
-//    a.IsNonDecreasingf([]string{"a", "b"}, "error message %s", "formatted")
+//	a.IsNonDecreasingf([]int{1, 1, 2}, "error message %s", "formatted")
+//	a.IsNonDecreasingf([]float{1, 2}, "error message %s", "formatted")
+//	a.IsNonDecreasingf([]string{"a", "b"}, "error message %s", "formatted")
 func (a *Assertions) IsNonDecreasingf(object interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -766,9 +850,9 @@ func (a *Assertions) IsNonDecreasingf(object interface{}, msg string, args ...in
 
 // IsNonIncreasing asserts that the collection is not increasing
 //
-//    a.IsNonIncreasing([]int{2, 1, 1})
-//    a.IsNonIncreasing([]float{2, 1})
-//    a.IsNonIncreasing([]string{"b", "a"})
+//	a.IsNonIncreasing([]int{2, 1, 1})
+//	a.IsNonIncreasing([]float{2, 1})
+//	a.IsNonIncreasing([]string{"b", "a"})
 func (a *Assertions) IsNonIncreasing(object interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -778,9 +862,9 @@ func (a *Assertions) IsNonIncreasing(object interface{}, msgAndArgs ...interface
 
 // IsNonIncreasingf asserts that the collection is not increasing
 //
-//    a.IsNonIncreasingf([]int{2, 1, 1}, "error message %s", "formatted")
-//    a.IsNonIncreasingf([]float{2, 1}, "error message %s", "formatted")
-//    a.IsNonIncreasingf([]string{"b", "a"}, "error message %s", "formatted")
+//	a.IsNonIncreasingf([]int{2, 1, 1}, "error message %s", "formatted")
+//	a.IsNonIncreasingf([]float{2, 1}, "error message %s", "formatted")
+//	a.IsNonIncreasingf([]string{"b", "a"}, "error message %s", "formatted")
 func (a *Assertions) IsNonIncreasingf(object interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -806,7 +890,7 @@ func (a *Assertions) IsTypef(expectedType interface{}, object interface{}, msg s
 
 // JSONEq asserts that two JSON strings are equivalent.
 //
-//  a.JSONEq(`{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`)
+//	a.JSONEq(`{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`)
 func (a *Assertions) JSONEq(expected string, actual string, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -816,7 +900,7 @@ func (a *Assertions) JSONEq(expected string, actual string, msgAndArgs ...interf
 
 // JSONEqf asserts that two JSON strings are equivalent.
 //
-//  a.JSONEqf(`{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`, "error message %s", "formatted")
+//	a.JSONEqf(`{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`, "error message %s", "formatted")
 func (a *Assertions) JSONEqf(expected string, actual string, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -827,7 +911,7 @@ func (a *Assertions) JSONEqf(expected string, actual string, msg string, args ..
 // Len asserts that the specified object has specific length.
 // Len also fails if the object has a type that len() not accept.
 //
-//    a.Len(mySlice, 3)
+//	a.Len(mySlice, 3)
 func (a *Assertions) Len(object interface{}, length int, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -838,7 +922,7 @@ func (a *Assertions) Len(object interface{}, length int, msgAndArgs ...interface
 // Lenf asserts that the specified object has specific length.
 // Lenf also fails if the object has a type that len() not accept.
 //
-//    a.Lenf(mySlice, 3, "error message %s", "formatted")
+//	a.Lenf(mySlice, 3, "error message %s", "formatted")
 func (a *Assertions) Lenf(object interface{}, length int, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -848,9 +932,9 @@ func (a *Assertions) Lenf(object interface{}, length int, msg string, args ...in
 
 // Less asserts that the first element is less than the second
 //
-//    a.Less(1, 2)
-//    a.Less(float64(1), float64(2))
-//    a.Less("a", "b")
+//	a.Less(1, 2)
+//	a.Less(float64(1), float64(2))
+//	a.Less("a", "b")
 func (a *Assertions) Less(e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -860,10 +944,10 @@ func (a *Assertions) Less(e1 interface{}, e2 interface{}, msgAndArgs ...interfac
 
 // LessOrEqual asserts that the first element is less than or equal to the second
 //
-//    a.LessOrEqual(1, 2)
-//    a.LessOrEqual(2, 2)
-//    a.LessOrEqual("a", "b")
-//    a.LessOrEqual("b", "b")
+//	a.LessOrEqual(1, 2)
+//	a.LessOrEqual(2, 2)
+//	a.LessOrEqual("a", "b")
+//	a.LessOrEqual("b", "b")
 func (a *Assertions) LessOrEqual(e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -873,10 +957,10 @@ func (a *Assertions) LessOrEqual(e1 interface{}, e2 interface{}, msgAndArgs ...i
 
 // LessOrEqualf asserts that the first element is less than or equal to the second
 //
-//    a.LessOrEqualf(1, 2, "error message %s", "formatted")
-//    a.LessOrEqualf(2, 2, "error message %s", "formatted")
-//    a.LessOrEqualf("a", "b", "error message %s", "formatted")
-//    a.LessOrEqualf("b", "b", "error message %s", "formatted")
+//	a.LessOrEqualf(1, 2, "error message %s", "formatted")
+//	a.LessOrEqualf(2, 2, "error message %s", "formatted")
+//	a.LessOrEqualf("a", "b", "error message %s", "formatted")
+//	a.LessOrEqualf("b", "b", "error message %s", "formatted")
 func (a *Assertions) LessOrEqualf(e1 interface{}, e2 interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -886,9 +970,9 @@ func (a *Assertions) LessOrEqualf(e1 interface{}, e2 interface{}, msg string, ar
 
 // Lessf asserts that the first element is less than the second
 //
-//    a.Lessf(1, 2, "error message %s", "formatted")
-//    a.Lessf(float64(1), float64(2), "error message %s", "formatted")
-//    a.Lessf("a", "b", "error message %s", "formatted")
+//	a.Lessf(1, 2, "error message %s", "formatted")
+//	a.Lessf(float64(1), float64(2), "error message %s", "formatted")
+//	a.Lessf("a", "b", "error message %s", "formatted")
 func (a *Assertions) Lessf(e1 interface{}, e2 interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -898,8 +982,8 @@ func (a *Assertions) Lessf(e1 interface{}, e2 interface{}, msg string, args ...i
 
 // Negative asserts that the specified element is negative
 //
-//    a.Negative(-1)
-//    a.Negative(-1.23)
+//	a.Negative(-1)
+//	a.Negative(-1.23)
 func (a *Assertions) Negative(e interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -909,8 +993,8 @@ func (a *Assertions) Negative(e interface{}, msgAndArgs ...interface{}) {
 
 // Negativef asserts that the specified element is negative
 //
-//    a.Negativef(-1, "error message %s", "formatted")
-//    a.Negativef(-1.23, "error message %s", "formatted")
+//	a.Negativef(-1, "error message %s", "formatted")
+//	a.Negativef(-1.23, "error message %s", "formatted")
 func (a *Assertions) Negativef(e interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -921,7 +1005,7 @@ func (a *Assertions) Negativef(e interface{}, msg string, args ...interface{}) {
 // Never asserts that the given condition doesn't satisfy in waitFor time,
 // periodically checking the target function each tick.
 //
-//    a.Never(func() bool { return false; }, time.Second, 10*time.Millisecond)
+//	a.Never(func() bool { return false; }, time.Second, 10*time.Millisecond)
 func (a *Assertions) Never(condition func() bool, waitFor time.Duration, tick time.Duration, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -932,7 +1016,7 @@ func (a *Assertions) Never(condition func() bool, waitFor time.Duration, tick ti
 // Neverf asserts that the given condition doesn't satisfy in waitFor time,
 // periodically checking the target function each tick.
 //
-//    a.Neverf(func() bool { return false; }, time.Second, 10*time.Millisecond, "error message %s", "formatted")
+//	a.Neverf(func() bool { return false; }, time.Second, 10*time.Millisecond, "error message %s", "formatted")
 func (a *Assertions) Neverf(condition func() bool, waitFor time.Duration, tick time.Duration, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -942,7 +1026,7 @@ func (a *Assertions) Neverf(condition func() bool, waitFor time.Duration, tick t
 
 // Nil asserts that the specified object is nil.
 //
-//    a.Nil(err)
+//	a.Nil(err)
 func (a *Assertions) Nil(object interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -952,7 +1036,7 @@ func (a *Assertions) Nil(object interface{}, msgAndArgs ...interface{}) {
 
 // Nilf asserts that the specified object is nil.
 //
-//    a.Nilf(err, "error message %s", "formatted")
+//	a.Nilf(err, "error message %s", "formatted")
 func (a *Assertions) Nilf(object interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -980,10 +1064,10 @@ func (a *Assertions) NoDirExistsf(path string, msg string, args ...interface{})
 
 // NoError asserts that a function returned no error (i.e. `nil`).
 //
-//   actualObj, err := SomeFunction()
-//   if a.NoError(err) {
-// 	   assert.Equal(t, expectedObj, actualObj)
-//   }
+//	  actualObj, err := SomeFunction()
+//	  if a.NoError(err) {
+//		   assert.Equal(t, expectedObj, actualObj)
+//	  }
 func (a *Assertions) NoError(err error, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -993,10 +1077,10 @@ func (a *Assertions) NoError(err error, msgAndArgs ...interface{}) {
 
 // NoErrorf asserts that a function returned no error (i.e. `nil`).
 //
-//   actualObj, err := SomeFunction()
-//   if a.NoErrorf(err, "error message %s", "formatted") {
-// 	   assert.Equal(t, expectedObj, actualObj)
-//   }
+//	  actualObj, err := SomeFunction()
+//	  if a.NoErrorf(err, "error message %s", "formatted") {
+//		   assert.Equal(t, expectedObj, actualObj)
+//	  }
 func (a *Assertions) NoErrorf(err error, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1025,9 +1109,9 @@ func (a *Assertions) NoFileExistsf(path string, msg string, args ...interface{})
 // NotContains asserts that the specified string, list(array, slice...) or map does NOT contain the
 // specified substring or element.
 //
-//    a.NotContains("Hello World", "Earth")
-//    a.NotContains(["Hello", "World"], "Earth")
-//    a.NotContains({"Hello": "World"}, "Earth")
+//	a.NotContains("Hello World", "Earth")
+//	a.NotContains(["Hello", "World"], "Earth")
+//	a.NotContains({"Hello": "World"}, "Earth")
 func (a *Assertions) NotContains(s interface{}, contains interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1038,9 +1122,9 @@ func (a *Assertions) NotContains(s interface{}, contains interface{}, msgAndArgs
 // NotContainsf asserts that the specified string, list(array, slice...) or map does NOT contain the
 // specified substring or element.
 //
-//    a.NotContainsf("Hello World", "Earth", "error message %s", "formatted")
-//    a.NotContainsf(["Hello", "World"], "Earth", "error message %s", "formatted")
-//    a.NotContainsf({"Hello": "World"}, "Earth", "error message %s", "formatted")
+//	a.NotContainsf("Hello World", "Earth", "error message %s", "formatted")
+//	a.NotContainsf(["Hello", "World"], "Earth", "error message %s", "formatted")
+//	a.NotContainsf({"Hello": "World"}, "Earth", "error message %s", "formatted")
 func (a *Assertions) NotContainsf(s interface{}, contains interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1051,9 +1135,9 @@ func (a *Assertions) NotContainsf(s interface{}, contains interface{}, msg strin
 // NotEmpty asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
 // a slice or a channel with len == 0.
 //
-//  if a.NotEmpty(obj) {
-//    assert.Equal(t, "two", obj[1])
-//  }
+//	if a.NotEmpty(obj) {
+//	  assert.Equal(t, "two", obj[1])
+//	}
 func (a *Assertions) NotEmpty(object interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1064,9 +1148,9 @@ func (a *Assertions) NotEmpty(object interface{}, msgAndArgs ...interface{}) {
 // NotEmptyf asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
 // a slice or a channel with len == 0.
 //
-//  if a.NotEmptyf(obj, "error message %s", "formatted") {
-//    assert.Equal(t, "two", obj[1])
-//  }
+//	if a.NotEmptyf(obj, "error message %s", "formatted") {
+//	  assert.Equal(t, "two", obj[1])
+//	}
 func (a *Assertions) NotEmptyf(object interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1076,7 +1160,7 @@ func (a *Assertions) NotEmptyf(object interface{}, msg string, args ...interface
 
 // NotEqual asserts that the specified values are NOT equal.
 //
-//    a.NotEqual(obj1, obj2)
+//	a.NotEqual(obj1, obj2)
 //
 // Pointer variable equality is determined based on the equality of the
 // referenced values (as opposed to the memory addresses).
@@ -1089,7 +1173,7 @@ func (a *Assertions) NotEqual(expected interface{}, actual interface{}, msgAndAr
 
 // NotEqualValues asserts that two objects are not equal even when converted to the same type
 //
-//    a.NotEqualValues(obj1, obj2)
+//	a.NotEqualValues(obj1, obj2)
 func (a *Assertions) NotEqualValues(expected interface{}, actual interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1099,7 +1183,7 @@ func (a *Assertions) NotEqualValues(expected interface{}, actual interface{}, ms
 
 // NotEqualValuesf asserts that two objects are not equal even when converted to the same type
 //
-//    a.NotEqualValuesf(obj1, obj2, "error message %s", "formatted")
+//	a.NotEqualValuesf(obj1, obj2, "error message %s", "formatted")
 func (a *Assertions) NotEqualValuesf(expected interface{}, actual interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1109,7 +1193,7 @@ func (a *Assertions) NotEqualValuesf(expected interface{}, actual interface{}, m
 
 // NotEqualf asserts that the specified values are NOT equal.
 //
-//    a.NotEqualf(obj1, obj2, "error message %s", "formatted")
+//	a.NotEqualf(obj1, obj2, "error message %s", "formatted")
 //
 // Pointer variable equality is determined based on the equality of the
 // referenced values (as opposed to the memory addresses).
@@ -1140,7 +1224,7 @@ func (a *Assertions) NotErrorIsf(err error, target error, msg string, args ...in
 
 // NotNil asserts that the specified object is not nil.
 //
-//    a.NotNil(err)
+//	a.NotNil(err)
 func (a *Assertions) NotNil(object interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1150,7 +1234,7 @@ func (a *Assertions) NotNil(object interface{}, msgAndArgs ...interface{}) {
 
 // NotNilf asserts that the specified object is not nil.
 //
-//    a.NotNilf(err, "error message %s", "formatted")
+//	a.NotNilf(err, "error message %s", "formatted")
 func (a *Assertions) NotNilf(object interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1160,7 +1244,7 @@ func (a *Assertions) NotNilf(object interface{}, msg string, args ...interface{}
 
 // NotPanics asserts that the code inside the specified PanicTestFunc does NOT panic.
 //
-//   a.NotPanics(func(){ RemainCalm() })
+//	a.NotPanics(func(){ RemainCalm() })
 func (a *Assertions) NotPanics(f assert.PanicTestFunc, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1170,7 +1254,7 @@ func (a *Assertions) NotPanics(f assert.PanicTestFunc, msgAndArgs ...interface{}
 
 // NotPanicsf asserts that the code inside the specified PanicTestFunc does NOT panic.
 //
-//   a.NotPanicsf(func(){ RemainCalm() }, "error message %s", "formatted")
+//	a.NotPanicsf(func(){ RemainCalm() }, "error message %s", "formatted")
 func (a *Assertions) NotPanicsf(f assert.PanicTestFunc, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1180,8 +1264,8 @@ func (a *Assertions) NotPanicsf(f assert.PanicTestFunc, msg string, args ...inte
 
 // NotRegexp asserts that a specified regexp does not match a string.
 //
-//  a.NotRegexp(regexp.MustCompile("starts"), "it's starting")
-//  a.NotRegexp("^start", "it's not starting")
+//	a.NotRegexp(regexp.MustCompile("starts"), "it's starting")
+//	a.NotRegexp("^start", "it's not starting")
 func (a *Assertions) NotRegexp(rx interface{}, str interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1191,8 +1275,8 @@ func (a *Assertions) NotRegexp(rx interface{}, str interface{}, msgAndArgs ...in
 
 // NotRegexpf asserts that a specified regexp does not match a string.
 //
-//  a.NotRegexpf(regexp.MustCompile("starts"), "it's starting", "error message %s", "formatted")
-//  a.NotRegexpf("^start", "it's not starting", "error message %s", "formatted")
+//	a.NotRegexpf(regexp.MustCompile("starts"), "it's starting", "error message %s", "formatted")
+//	a.NotRegexpf("^start", "it's not starting", "error message %s", "formatted")
 func (a *Assertions) NotRegexpf(rx interface{}, str interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1202,7 +1286,7 @@ func (a *Assertions) NotRegexpf(rx interface{}, str interface{}, msg string, arg
 
 // NotSame asserts that two pointers do not reference the same object.
 //
-//    a.NotSame(ptr1, ptr2)
+//	a.NotSame(ptr1, ptr2)
 //
 // Both arguments must be pointer variables. Pointer variable sameness is
 // determined based on the equality of both type and value.
@@ -1215,7 +1299,7 @@ func (a *Assertions) NotSame(expected interface{}, actual interface{}, msgAndArg
 
 // NotSamef asserts that two pointers do not reference the same object.
 //
-//    a.NotSamef(ptr1, ptr2, "error message %s", "formatted")
+//	a.NotSamef(ptr1, ptr2, "error message %s", "formatted")
 //
 // Both arguments must be pointer variables. Pointer variable sameness is
 // determined based on the equality of both type and value.
@@ -1229,7 +1313,7 @@ func (a *Assertions) NotSamef(expected interface{}, actual interface{}, msg stri
 // NotSubset asserts that the specified list(array, slice...) contains not all
 // elements given in the specified subset(array, slice...).
 //
-//    a.NotSubset([1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]")
+//	a.NotSubset([1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]")
 func (a *Assertions) NotSubset(list interface{}, subset interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1240,7 +1324,7 @@ func (a *Assertions) NotSubset(list interface{}, subset interface{}, msgAndArgs
 // NotSubsetf asserts that the specified list(array, slice...) contains not all
 // elements given in the specified subset(array, slice...).
 //
-//    a.NotSubsetf([1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]", "error message %s", "formatted")
+//	a.NotSubsetf([1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]", "error message %s", "formatted")
 func (a *Assertions) NotSubsetf(list interface{}, subset interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1266,7 +1350,7 @@ func (a *Assertions) NotZerof(i interface{}, msg string, args ...interface{}) {
 
 // Panics asserts that the code inside the specified PanicTestFunc panics.
 //
-//   a.Panics(func(){ GoCrazy() })
+//	a.Panics(func(){ GoCrazy() })
 func (a *Assertions) Panics(f assert.PanicTestFunc, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1278,7 +1362,7 @@ func (a *Assertions) Panics(f assert.PanicTestFunc, msgAndArgs ...interface{}) {
 // panics, and that the recovered panic value is an error that satisfies the
 // EqualError comparison.
 //
-//   a.PanicsWithError("crazy error", func(){ GoCrazy() })
+//	a.PanicsWithError("crazy error", func(){ GoCrazy() })
 func (a *Assertions) PanicsWithError(errString string, f assert.PanicTestFunc, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1290,7 +1374,7 @@ func (a *Assertions) PanicsWithError(errString string, f assert.PanicTestFunc, m
 // panics, and that the recovered panic value is an error that satisfies the
 // EqualError comparison.
 //
-//   a.PanicsWithErrorf("crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
+//	a.PanicsWithErrorf("crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
 func (a *Assertions) PanicsWithErrorf(errString string, f assert.PanicTestFunc, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1301,7 +1385,7 @@ func (a *Assertions) PanicsWithErrorf(errString string, f assert.PanicTestFunc,
 // PanicsWithValue asserts that the code inside the specified PanicTestFunc panics, and that
 // the recovered panic value equals the expected panic value.
 //
-//   a.PanicsWithValue("crazy error", func(){ GoCrazy() })
+//	a.PanicsWithValue("crazy error", func(){ GoCrazy() })
 func (a *Assertions) PanicsWithValue(expected interface{}, f assert.PanicTestFunc, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1312,7 +1396,7 @@ func (a *Assertions) PanicsWithValue(expected interface{}, f assert.PanicTestFun
 // PanicsWithValuef asserts that the code inside the specified PanicTestFunc panics, and that
 // the recovered panic value equals the expected panic value.
 //
-//   a.PanicsWithValuef("crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
+//	a.PanicsWithValuef("crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
 func (a *Assertions) PanicsWithValuef(expected interface{}, f assert.PanicTestFunc, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1322,7 +1406,7 @@ func (a *Assertions) PanicsWithValuef(expected interface{}, f assert.PanicTestFu
 
 // Panicsf asserts that the code inside the specified PanicTestFunc panics.
 //
-//   a.Panicsf(func(){ GoCrazy() }, "error message %s", "formatted")
+//	a.Panicsf(func(){ GoCrazy() }, "error message %s", "formatted")
 func (a *Assertions) Panicsf(f assert.PanicTestFunc, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1332,8 +1416,8 @@ func (a *Assertions) Panicsf(f assert.PanicTestFunc, msg string, args ...interfa
 
 // Positive asserts that the specified element is positive
 //
-//    a.Positive(1)
-//    a.Positive(1.23)
+//	a.Positive(1)
+//	a.Positive(1.23)
 func (a *Assertions) Positive(e interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1343,8 +1427,8 @@ func (a *Assertions) Positive(e interface{}, msgAndArgs ...interface{}) {
 
 // Positivef asserts that the specified element is positive
 //
-//    a.Positivef(1, "error message %s", "formatted")
-//    a.Positivef(1.23, "error message %s", "formatted")
+//	a.Positivef(1, "error message %s", "formatted")
+//	a.Positivef(1.23, "error message %s", "formatted")
 func (a *Assertions) Positivef(e interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1354,8 +1438,8 @@ func (a *Assertions) Positivef(e interface{}, msg string, args ...interface{}) {
 
 // Regexp asserts that a specified regexp matches a string.
 //
-//  a.Regexp(regexp.MustCompile("start"), "it's starting")
-//  a.Regexp("start...$", "it's not starting")
+//	a.Regexp(regexp.MustCompile("start"), "it's starting")
+//	a.Regexp("start...$", "it's not starting")
 func (a *Assertions) Regexp(rx interface{}, str interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1365,8 +1449,8 @@ func (a *Assertions) Regexp(rx interface{}, str interface{}, msgAndArgs ...inter
 
 // Regexpf asserts that a specified regexp matches a string.
 //
-//  a.Regexpf(regexp.MustCompile("start"), "it's starting", "error message %s", "formatted")
-//  a.Regexpf("start...$", "it's not starting", "error message %s", "formatted")
+//	a.Regexpf(regexp.MustCompile("start"), "it's starting", "error message %s", "formatted")
+//	a.Regexpf("start...$", "it's not starting", "error message %s", "formatted")
 func (a *Assertions) Regexpf(rx interface{}, str interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1376,7 +1460,7 @@ func (a *Assertions) Regexpf(rx interface{}, str interface{}, msg string, args .
 
 // Same asserts that two pointers reference the same object.
 //
-//    a.Same(ptr1, ptr2)
+//	a.Same(ptr1, ptr2)
 //
 // Both arguments must be pointer variables. Pointer variable sameness is
 // determined based on the equality of both type and value.
@@ -1389,7 +1473,7 @@ func (a *Assertions) Same(expected interface{}, actual interface{}, msgAndArgs .
 
 // Samef asserts that two pointers reference the same object.
 //
-//    a.Samef(ptr1, ptr2, "error message %s", "formatted")
+//	a.Samef(ptr1, ptr2, "error message %s", "formatted")
 //
 // Both arguments must be pointer variables. Pointer variable sameness is
 // determined based on the equality of both type and value.
@@ -1403,7 +1487,7 @@ func (a *Assertions) Samef(expected interface{}, actual interface{}, msg string,
 // Subset asserts that the specified list(array, slice...) contains all
 // elements given in the specified subset(array, slice...).
 //
-//    a.Subset([1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]")
+//	a.Subset([1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]")
 func (a *Assertions) Subset(list interface{}, subset interface{}, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1414,7 +1498,7 @@ func (a *Assertions) Subset(list interface{}, subset interface{}, msgAndArgs ...
 // Subsetf asserts that the specified list(array, slice...) contains all
 // elements given in the specified subset(array, slice...).
 //
-//    a.Subsetf([1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]", "error message %s", "formatted")
+//	a.Subsetf([1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]", "error message %s", "formatted")
 func (a *Assertions) Subsetf(list interface{}, subset interface{}, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1424,7 +1508,7 @@ func (a *Assertions) Subsetf(list interface{}, subset interface{}, msg string, a
 
 // True asserts that the specified value is true.
 //
-//    a.True(myBool)
+//	a.True(myBool)
 func (a *Assertions) True(value bool, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1434,7 +1518,7 @@ func (a *Assertions) True(value bool, msgAndArgs ...interface{}) {
 
 // Truef asserts that the specified value is true.
 //
-//    a.Truef(myBool, "error message %s", "formatted")
+//	a.Truef(myBool, "error message %s", "formatted")
 func (a *Assertions) Truef(value bool, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1444,7 +1528,7 @@ func (a *Assertions) Truef(value bool, msg string, args ...interface{}) {
 
 // WithinDuration asserts that the two times are within duration delta of each other.
 //
-//   a.WithinDuration(time.Now(), time.Now(), 10*time.Second)
+//	a.WithinDuration(time.Now(), time.Now(), 10*time.Second)
 func (a *Assertions) WithinDuration(expected time.Time, actual time.Time, delta time.Duration, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1454,7 +1538,7 @@ func (a *Assertions) WithinDuration(expected time.Time, actual time.Time, delta
 
 // WithinDurationf asserts that the two times are within duration delta of each other.
 //
-//   a.WithinDurationf(time.Now(), time.Now(), 10*time.Second, "error message %s", "formatted")
+//	a.WithinDurationf(time.Now(), time.Now(), 10*time.Second, "error message %s", "formatted")
 func (a *Assertions) WithinDurationf(expected time.Time, actual time.Time, delta time.Duration, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1464,7 +1548,7 @@ func (a *Assertions) WithinDurationf(expected time.Time, actual time.Time, delta
 
 // WithinRange asserts that a time is within a time range (inclusive).
 //
-//   a.WithinRange(time.Now(), time.Now().Add(-time.Second), time.Now().Add(time.Second))
+//	a.WithinRange(time.Now(), time.Now().Add(-time.Second), time.Now().Add(time.Second))
 func (a *Assertions) WithinRange(actual time.Time, start time.Time, end time.Time, msgAndArgs ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1474,7 +1558,7 @@ func (a *Assertions) WithinRange(actual time.Time, start time.Time, end time.Tim
 
 // WithinRangef asserts that a time is within a time range (inclusive).
 //
-//   a.WithinRangef(time.Now(), time.Now().Add(-time.Second), time.Now().Add(time.Second), "error message %s", "formatted")
+//	a.WithinRangef(time.Now(), time.Now().Add(-time.Second), time.Now().Add(time.Second), "error message %s", "formatted")
 func (a *Assertions) WithinRangef(actual time.Time, start time.Time, end time.Time, msg string, args ...interface{}) {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
diff --git a/vendor/github.com/stretchr/testify/suite/doc.go b/vendor/github.com/stretchr/testify/suite/doc.go
index f91a245d..8d55a3aa 100644
--- a/vendor/github.com/stretchr/testify/suite/doc.go
+++ b/vendor/github.com/stretchr/testify/suite/doc.go
@@ -29,37 +29,38 @@
 // Suite object has assertion methods.
 //
 // A crude example:
-//     // Basic imports
-//     import (
-//         "testing"
-//         "github.com/stretchr/testify/assert"
-//         "github.com/stretchr/testify/suite"
-//     )
 //
-//     // Define the suite, and absorb the built-in basic suite
-//     // functionality from testify - including a T() method which
-//     // returns the current testing context
-//     type ExampleTestSuite struct {
-//         suite.Suite
-//         VariableThatShouldStartAtFive int
-//     }
+//	// Basic imports
+//	import (
+//	    "testing"
+//	    "github.com/stretchr/testify/assert"
+//	    "github.com/stretchr/testify/suite"
+//	)
 //
-//     // Make sure that VariableThatShouldStartAtFive is set to five
-//     // before each test
-//     func (suite *ExampleTestSuite) SetupTest() {
-//         suite.VariableThatShouldStartAtFive = 5
-//     }
+//	// Define the suite, and absorb the built-in basic suite
+//	// functionality from testify - including a T() method which
+//	// returns the current testing context
+//	type ExampleTestSuite struct {
+//	    suite.Suite
+//	    VariableThatShouldStartAtFive int
+//	}
 //
-//     // All methods that begin with "Test" are run as tests within a
-//     // suite.
-//     func (suite *ExampleTestSuite) TestExample() {
-//         assert.Equal(suite.T(), 5, suite.VariableThatShouldStartAtFive)
-//         suite.Equal(5, suite.VariableThatShouldStartAtFive)
-//     }
+//	// Make sure that VariableThatShouldStartAtFive is set to five
+//	// before each test
+//	func (suite *ExampleTestSuite) SetupTest() {
+//	    suite.VariableThatShouldStartAtFive = 5
+//	}
 //
-//     // In order for 'go test' to run this suite, we need to create
-//     // a normal test function and pass our suite to suite.Run
-//     func TestExampleTestSuite(t *testing.T) {
-//         suite.Run(t, new(ExampleTestSuite))
-//     }
+//	// All methods that begin with "Test" are run as tests within a
+//	// suite.
+//	func (suite *ExampleTestSuite) TestExample() {
+//	    assert.Equal(suite.T(), 5, suite.VariableThatShouldStartAtFive)
+//	    suite.Equal(5, suite.VariableThatShouldStartAtFive)
+//	}
+//
+//	// In order for 'go test' to run this suite, we need to create
+//	// a normal test function and pass our suite to suite.Run
+//	func TestExampleTestSuite(t *testing.T) {
+//	    suite.Run(t, new(ExampleTestSuite))
+//	}
 package suite
diff --git a/vendor/github.com/stretchr/testify/suite/interfaces.go b/vendor/github.com/stretchr/testify/suite/interfaces.go
index 8b98a8af..fed037d7 100644
--- a/vendor/github.com/stretchr/testify/suite/interfaces.go
+++ b/vendor/github.com/stretchr/testify/suite/interfaces.go
@@ -7,6 +7,7 @@ import "testing"
 type TestingSuite interface {
 	T() *testing.T
 	SetT(*testing.T)
+	SetS(suite TestingSuite)
 }
 
 // SetupAllSuite has a SetupSuite method, which will run before the
@@ -51,3 +52,15 @@ type AfterTest interface {
 type WithStats interface {
 	HandleStats(suiteName string, stats *SuiteInformation)
 }
+
+// SetupSubTest has a SetupSubTest method, which will run before each
+// subtest in the suite.
+type SetupSubTest interface {
+	SetupSubTest()
+}
+
+// TearDownSubTest has a TearDownSubTest method, which will run after
+// each subtest in the suite have been run.
+type TearDownSubTest interface {
+	TearDownSubTest()
+}
diff --git a/vendor/github.com/stretchr/testify/suite/suite.go b/vendor/github.com/stretchr/testify/suite/suite.go
index 89559187..8b4202d8 100644
--- a/vendor/github.com/stretchr/testify/suite/suite.go
+++ b/vendor/github.com/stretchr/testify/suite/suite.go
@@ -22,9 +22,13 @@ var matchMethod = flag.String("testify.m", "", "regular expression to select tes
 // retrieving the current *testing.T context.
 type Suite struct {
 	*assert.Assertions
+
 	mu      sync.RWMutex
 	require *require.Assertions
 	t       *testing.T
+
+	// Parent suite to have access to the implemented methods of parent struct
+	s TestingSuite
 }
 
 // T retrieves the current *testing.T context.
@@ -43,6 +47,12 @@ func (suite *Suite) SetT(t *testing.T) {
 	suite.require = require.New(t)
 }
 
+// SetS needs to set the current test suite as parent
+// to get access to the parent methods
+func (suite *Suite) SetS(s TestingSuite) {
+	suite.s = s
+}
+
 // Require returns a require context for suite.
 func (suite *Suite) Require() *require.Assertions {
 	suite.mu.Lock()
@@ -85,7 +95,18 @@ func failOnPanic(t *testing.T, r interface{}) {
 // Provides compatibility with go test pkg -run TestSuite/TestName/SubTestName.
 func (suite *Suite) Run(name string, subtest func()) bool {
 	oldT := suite.T()
-	defer suite.SetT(oldT)
+
+	if setupSubTest, ok := suite.s.(SetupSubTest); ok {
+		setupSubTest.SetupSubTest()
+	}
+
+	defer func() {
+		suite.SetT(oldT)
+		if tearDownSubTest, ok := suite.s.(TearDownSubTest); ok {
+			tearDownSubTest.TearDownSubTest()
+		}
+	}()
+
 	return oldT.Run(name, func(t *testing.T) {
 		suite.SetT(t)
 		subtest()
@@ -98,6 +119,7 @@ func Run(t *testing.T, suite TestingSuite) {
 	defer recoverAndFailOnPanic(t)
 
 	suite.SetT(t)
+	suite.SetS(suite)
 
 	var suiteSetupDone bool
 
diff --git a/vendor/github.com/wiggin77/cfg/.gitignore b/vendor/github.com/wiggin77/cfg/.gitignore
deleted file mode 100644
index f1c181ec..00000000
--- a/vendor/github.com/wiggin77/cfg/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-# Binaries for programs and plugins
-*.exe
-*.exe~
-*.dll
-*.so
-*.dylib
-
-# Test binary, build with `go test -c`
-*.test
-
-# Output of the go coverage tool, specifically when used with LiteIDE
-*.out
diff --git a/vendor/github.com/wiggin77/cfg/.travis.yml b/vendor/github.com/wiggin77/cfg/.travis.yml
deleted file mode 100644
index 9899b387..00000000
--- a/vendor/github.com/wiggin77/cfg/.travis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-language: go
-sudo: false
-before_script:
-  - go vet ./...
-  
\ No newline at end of file
diff --git a/vendor/github.com/wiggin77/cfg/LICENSE b/vendor/github.com/wiggin77/cfg/LICENSE
deleted file mode 100644
index 2b0bf7ef..00000000
--- a/vendor/github.com/wiggin77/cfg/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 wiggin77
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/vendor/github.com/wiggin77/cfg/README.md b/vendor/github.com/wiggin77/cfg/README.md
deleted file mode 100644
index 583a82cb..00000000
--- a/vendor/github.com/wiggin77/cfg/README.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# cfg
-
-[![GoDoc](https://godoc.org/github.com/wiggin77/cfg?status.svg)](https://godoc.org/github.com/wiggin77/cfg)
-[![Build Status](https://travis-ci.org/wiggin77/cfg.svg?branch=master)](https://travis-ci.org/wiggin77/cfg)
-
-Go package for app configuration. Supports chained configuration sources for multiple levels of defaults.
-Includes APIs for loading Linux style configuration files (name/value pairs) or INI files, map based properties,
-or easily create new configuration sources (e.g. load from database).
-
-Supports monitoring configuration sources for changes, hot loading properties, and notifying listeners of changes.
-
-## Usage
-
-```Go
-config := &cfg.Config{}
-defer config.Shutdown() // stops monitoring
-
-// load file via filespec string, os.File
-src, err := Config.NewSrcFileFromFilespec("./myfile.conf")
-if err != nil {
-    return err
-}
-// add src to top of chain, meaning first searched
-cfg.PrependSource(src)
-
-// fetch prop 'retries', default to 3 if not found
-val := config.Int("retries", 3)
-```
-
-See [example](./example_test.go) for more complete example, including listening for configuration changes.
-
-Config API parses the following data types:
-
-| type    | method | example property values |
-| ------- | ------ | -------- |
-| string  | Config.String  | test, "" |
-| int     | Config.Int     | -1, 77, 0  |
-| int64   | Config.Int64   | -9223372036854775, 372036854775808 |
-| float64 | Config.Float64 | -77.3456, 95642331.1 |
-| bool    | Config.Bool    | T,t,true,True,1,0,False,false,f,F |
-| time.Duration | Config.Duration | "10ms", "2 hours", "5 min" * |
-
-\* Units of measure supported: ms, sec, min, hour, day, week, year.
diff --git a/vendor/github.com/wiggin77/cfg/config.go b/vendor/github.com/wiggin77/cfg/config.go
deleted file mode 100644
index 0e958102..00000000
--- a/vendor/github.com/wiggin77/cfg/config.go
+++ /dev/null
@@ -1,366 +0,0 @@
-package cfg
-
-import (
-	"errors"
-	"fmt"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/wiggin77/cfg/timeconv"
-)
-
-// ErrNotFound returned when an operation is attempted on a
-// resource that doesn't exist, such as fetching a non-existing
-// property name.
-var ErrNotFound = errors.New("not found")
-
-type sourceEntry struct {
-	src   Source
-	props map[string]string
-}
-
-// Config provides methods for retrieving property values from one or more
-// configuration sources.
-type Config struct {
-	mutexSrc         sync.RWMutex
-	mutexListeners   sync.RWMutex
-	srcs             []*sourceEntry
-	chgListeners     []ChangedListener
-	shutdown         chan interface{}
-	wantPanicOnError bool
-}
-
-// PrependSource inserts one or more `Sources` at the beginning of
-// the list of sources such that the first source will be the
-// source checked first when resolving a property value.
-func (config *Config) PrependSource(srcs ...Source) {
-	arr := config.wrapSources(srcs...)
-
-	config.mutexSrc.Lock()
-	if config.shutdown == nil {
-		config.shutdown = make(chan interface{})
-	}
-	config.srcs = append(arr, config.srcs...)
-	config.mutexSrc.Unlock()
-
-	for _, se := range arr {
-		if _, ok := se.src.(SourceMonitored); ok {
-			config.monitor(se)
-		}
-	}
-}
-
-// AppendSource appends one or more `Sources` at the end of
-// the list of sources such that the last source will be the
-// source checked last when resolving a property value.
-func (config *Config) AppendSource(srcs ...Source) {
-	arr := config.wrapSources(srcs...)
-
-	config.mutexSrc.Lock()
-	if config.shutdown == nil {
-		config.shutdown = make(chan interface{})
-	}
-	config.srcs = append(config.srcs, arr...)
-	config.mutexSrc.Unlock()
-
-	for _, se := range arr {
-		if _, ok := se.src.(SourceMonitored); ok {
-			config.monitor(se)
-		}
-	}
-}
-
-// wrapSources wraps one or more Source's and returns
-// them as an array of `sourceEntry`.
-func (config *Config) wrapSources(srcs ...Source) []*sourceEntry {
-	arr := make([]*sourceEntry, 0, len(srcs))
-	for _, src := range srcs {
-		se := &sourceEntry{src: src}
-		config.reloadProps(se)
-		arr = append(arr, se)
-	}
-	return arr
-}
-
-// SetWantPanicOnError sets the flag determining if Config
-// should panic when `GetProps` or `GetLastModified` errors
-// for a `Source`.
-func (config *Config) SetWantPanicOnError(b bool) {
-	config.mutexSrc.Lock()
-	config.wantPanicOnError = b
-	config.mutexSrc.Unlock()
-}
-
-// ShouldPanicOnError gets the flag determining if Config
-// should panic when `GetProps` or `GetLastModified` errors
-// for a `Source`.
-func (config *Config) ShouldPanicOnError() (b bool) {
-	config.mutexSrc.RLock()
-	b = config.wantPanicOnError
-	config.mutexSrc.RUnlock()
-	return b
-}
-
-// getProp returns the value of a named property.
-// Each `Source` is checked, in the order created by adding via
-// `AppendSource` and `PrependSource`, until a value for the
-// property is found.
-func (config *Config) getProp(name string) (val string, ok bool) {
-	config.mutexSrc.RLock()
-	defer config.mutexSrc.RUnlock()
-
-	var s string
-	for _, se := range config.srcs {
-		if se.props != nil {
-			if s, ok = se.props[name]; ok {
-				val = strings.TrimSpace(s)
-				return
-			}
-		}
-	}
-	return
-}
-
-// String returns the value of the named prop as a string.
-// If the property is not found then the supplied default `def`
-// and `ErrNotFound` are returned.
-func (config *Config) String(name string, def string) (val string, err error) {
-	if v, ok := config.getProp(name); ok {
-		val = v
-		err = nil
-		return
-	}
-
-	err = ErrNotFound
-	val = def
-	return
-}
-
-// Int returns the value of the named prop as an `int`.
-// If the property is not found then the supplied default `def`
-// and `ErrNotFound` are returned.
-//
-// See config.String
-func (config *Config) Int(name string, def int) (val int, err error) {
-	var s string
-	if s, err = config.String(name, ""); err == nil {
-		var i int64
-		if i, err = strconv.ParseInt(s, 10, 32); err == nil {
-			val = int(i)
-		}
-	}
-	if err != nil {
-		val = def
-	}
-	return
-}
-
-// Int64 returns the value of the named prop as an `int64`.
-// If the property is not found then the supplied default `def`
-// and `ErrNotFound` are returned.
-//
-// See config.String
-func (config *Config) Int64(name string, def int64) (val int64, err error) {
-	var s string
-	if s, err = config.String(name, ""); err == nil {
-		val, err = strconv.ParseInt(s, 10, 64)
-	}
-	if err != nil {
-		val = def
-	}
-	return
-}
-
-// Float64 returns the value of the named prop as a `float64`.
-// If the property is not found then the supplied default `def`
-// and `ErrNotFound` are returned.
-//
-// See config.String
-func (config *Config) Float64(name string, def float64) (val float64, err error) {
-	var s string
-	if s, err = config.String(name, ""); err == nil {
-		val, err = strconv.ParseFloat(s, 64)
-	}
-	if err != nil {
-		val = def
-	}
-	return
-}
-
-// Bool returns the value of the named prop as a `bool`.
-// If the property is not found then the supplied default `def`
-// and `ErrNotFound` are returned.
-//
-// Supports (t, true, 1, y, yes) for true, and (f, false, 0, n, no) for false,
-// all case-insensitive.
-//
-// See config.String
-func (config *Config) Bool(name string, def bool) (val bool, err error) {
-	var s string
-	if s, err = config.String(name, ""); err == nil {
-		switch strings.ToLower(s) {
-		case "t", "true", "1", "y", "yes":
-			val = true
-		case "f", "false", "0", "n", "no":
-			val = false
-		default:
-			err = errors.New("invalid syntax")
-		}
-	}
-	if err != nil {
-		val = def
-	}
-	return
-}
-
-// Duration returns the value of the named prop as a `time.Duration`, representing
-// a span of time.
-//
-// Units of measure are supported: ms, sec, min, hour, day, week, year.
-// See config.UnitsToMillis for a complete list of units supported.
-//
-// If the property is not found then the supplied default `def`
-// and `ErrNotFound` are returned.
-//
-// See config.String
-func (config *Config) Duration(name string, def time.Duration) (val time.Duration, err error) {
-	var s string
-	if s, err = config.String(name, ""); err == nil {
-		var ms int64
-		ms, err = timeconv.ParseMilliseconds(s)
-		val = time.Duration(ms) * time.Millisecond
-	}
-	if err != nil {
-		val = def
-	}
-	return
-}
-
-// AddChangedListener adds a listener that will receive notifications
-// whenever one or more property values change within the config.
-func (config *Config) AddChangedListener(l ChangedListener) {
-	config.mutexListeners.Lock()
-	defer config.mutexListeners.Unlock()
-
-	config.chgListeners = append(config.chgListeners, l)
-}
-
-// RemoveChangedListener removes all instances of a ChangedListener.
-// Returns `ErrNotFound` if the listener was not present.
-func (config *Config) RemoveChangedListener(l ChangedListener) error {
-	config.mutexListeners.Lock()
-	defer config.mutexListeners.Unlock()
-
-	dest := make([]ChangedListener, 0, len(config.chgListeners))
-	err := ErrNotFound
-
-	// Remove all instances of the listener by
-	// copying list while filtering.
-	for _, s := range config.chgListeners {
-		if s != l {
-			dest = append(dest, s)
-		} else {
-			err = nil
-		}
-	}
-	config.chgListeners = dest
-	return err
-}
-
-// Shutdown can be called to stop monitoring of all config sources.
-func (config *Config) Shutdown() {
-	config.mutexSrc.RLock()
-	defer config.mutexSrc.RUnlock()
-	if config.shutdown != nil {
-		close(config.shutdown)
-	}
-}
-
-// onSourceChanged is called whenever one or more properties of a
-// config source has changed.
-func (config *Config) onSourceChanged(src SourceMonitored) {
-	defer func() {
-		if p := recover(); p != nil {
-			fmt.Println(p)
-		}
-	}()
-	config.mutexListeners.RLock()
-	defer config.mutexListeners.RUnlock()
-	for _, l := range config.chgListeners {
-		l.ConfigChanged(config, src)
-	}
-}
-
-// monitor periodically checks a config source for changes.
-func (config *Config) monitor(se *sourceEntry) {
-	go func(se *sourceEntry, shutdown <-chan interface{}) {
-		var src SourceMonitored
-		var ok bool
-		if src, ok = se.src.(SourceMonitored); !ok {
-			return
-		}
-		paused := false
-		last := time.Time{}
-		freq := src.GetMonitorFreq()
-		if freq <= 0 {
-			paused = true
-			freq = 10
-			last, _ = src.GetLastModified()
-		}
-		timer := time.NewTimer(freq)
-		for {
-			select {
-			case <-timer.C:
-				if !paused {
-					if latest, err := src.GetLastModified(); err != nil {
-						if config.ShouldPanicOnError() {
-							panic(fmt.Sprintf("error <%v> getting last modified for %v", err, src))
-						}
-					} else {
-						if last.Before(latest) {
-							last = latest
-							config.reloadProps(se)
-							// TODO: calc diff and provide detailed changes
-							config.onSourceChanged(src)
-						}
-					}
-				}
-				freq = src.GetMonitorFreq()
-				if freq <= 0 {
-					paused = true
-					freq = 10
-				} else {
-					paused = false
-				}
-				timer.Reset(freq)
-			case <-shutdown:
-				// stop the timer and exit
-				if !timer.Stop() {
-					<-timer.C
-				}
-				return
-			}
-		}
-	}(se, config.shutdown)
-}
-
-// reloadProps causes a Source to reload its properties.
-func (config *Config) reloadProps(se *sourceEntry) {
-	config.mutexSrc.Lock()
-	defer config.mutexSrc.Unlock()
-
-	m, err := se.src.GetProps()
-	if err != nil {
-		if config.wantPanicOnError {
-			panic(fmt.Sprintf("GetProps error for %v", se.src))
-		}
-		return
-	}
-
-	se.props = make(map[string]string)
-	for k, v := range m {
-		se.props[k] = v
-	}
-}
diff --git a/vendor/github.com/wiggin77/cfg/ini/ini.go b/vendor/github.com/wiggin77/cfg/ini/ini.go
deleted file mode 100644
index d28d7444..00000000
--- a/vendor/github.com/wiggin77/cfg/ini/ini.go
+++ /dev/null
@@ -1,167 +0,0 @@
-package ini
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"sync"
-	"time"
-)
-
-// Ini provides parsing and querying of INI format or simple name/value pairs
-// such as a simple config file.
-// A name/value pair format is just an INI with no sections, and properties can
-// be queried using an empty section name.
-type Ini struct {
-	mutex sync.RWMutex
-	m     map[string]*Section
-	lm    time.Time
-}
-
-// LoadFromFilespec loads an INI file from string containing path and filename.
-func (ini *Ini) LoadFromFilespec(filespec string) error {
-	f, err := os.Open(filespec)
-	if err != nil {
-		return err
-	}
-	return ini.LoadFromFile(f)
-}
-
-// LoadFromFile loads an INI file from `os.File`.
-func (ini *Ini) LoadFromFile(file *os.File) error {
-
-	fi, err := file.Stat()
-	if err != nil {
-		return err
-	}
-	lm := fi.ModTime()
-
-	if err := ini.LoadFromReader(file); err != nil {
-		return err
-	}
-	ini.lm = lm
-	return nil
-}
-
-// LoadFromReader loads an INI file from an `io.Reader`.
-func (ini *Ini) LoadFromReader(reader io.Reader) error {
-	data, err := ioutil.ReadAll(reader)
-	if err != nil {
-		return err
-	}
-	return ini.LoadFromString(string(data))
-}
-
-// LoadFromString parses an INI from a string .
-func (ini *Ini) LoadFromString(s string) error {
-	m, err := getSections(s)
-	if err != nil {
-		return err
-	}
-	ini.mutex.Lock()
-	ini.m = m
-	ini.lm = time.Now()
-	ini.mutex.Unlock()
-	return nil
-}
-
-// GetLastModified returns the last modified timestamp of the
-// INI contents.
-func (ini *Ini) GetLastModified() time.Time {
-	return ini.lm
-}
-
-// GetSectionNames returns the names of all sections in this INI.
-// Note, the returned section names are a snapshot in time, meaning
-// other goroutines may change the contents of this INI as soon as
-// the method returns.
-func (ini *Ini) GetSectionNames() []string {
-	ini.mutex.RLock()
-	defer ini.mutex.RUnlock()
-
-	arr := make([]string, 0, len(ini.m))
-	for key := range ini.m {
-		arr = append(arr, key)
-	}
-	return arr
-}
-
-// GetKeys returns the names of all keys in the specified section.
-// Note, the returned key names are a snapshot in time, meaning other
-// goroutines may change the contents of this INI as soon as the
-// method returns.
-func (ini *Ini) GetKeys(sectionName string) ([]string, error) {
-	sec, err := ini.getSection(sectionName)
-	if err != nil {
-		return nil, err
-	}
-	return sec.getKeys(), nil
-}
-
-// getSection returns the named section.
-func (ini *Ini) getSection(sectionName string) (*Section, error) {
-	ini.mutex.RLock()
-	defer ini.mutex.RUnlock()
-
-	sec, ok := ini.m[sectionName]
-	if !ok {
-		return nil, fmt.Errorf("section '%s' not found", sectionName)
-	}
-	return sec, nil
-}
-
-// GetFlattenedKeys returns all section names plus keys as one
-// flattened array.
-func (ini *Ini) GetFlattenedKeys() []string {
-	ini.mutex.RLock()
-	defer ini.mutex.RUnlock()
-
-	arr := make([]string, 0, len(ini.m)*2)
-	for _, section := range ini.m {
-		keys := section.getKeys()
-		for _, key := range keys {
-			name := section.GetName()
-			if name != "" {
-				key = name + "." + key
-			}
-			arr = append(arr, key)
-		}
-	}
-	return arr
-}
-
-// GetProp returns the value of the specified key in the named section.
-func (ini *Ini) GetProp(section string, key string) (val string, ok bool) {
-	sec, err := ini.getSection(section)
-	if err != nil {
-		return val, false
-	}
-	return sec.GetProp(key)
-}
-
-// ToMap returns a flattened map of the section name plus keys mapped
-// to values.
-func (ini *Ini) ToMap() map[string]string {
-	m := make(map[string]string)
-
-	ini.mutex.RLock()
-	defer ini.mutex.RUnlock()
-
-	for _, section := range ini.m {
-		for _, key := range section.getKeys() {
-			val, ok := section.GetProp(key)
-			if ok {
-				name := section.GetName()
-				var mapkey string
-				if name != "" {
-					mapkey = name + "." + key
-				} else {
-					mapkey = key
-				}
-				m[mapkey] = val
-			}
-		}
-	}
-	return m
-}
diff --git a/vendor/github.com/wiggin77/cfg/ini/parser.go b/vendor/github.com/wiggin77/cfg/ini/parser.go
deleted file mode 100644
index 28916409..00000000
--- a/vendor/github.com/wiggin77/cfg/ini/parser.go
+++ /dev/null
@@ -1,142 +0,0 @@
-package ini
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/wiggin77/merror"
-)
-
-// LF is linefeed
-const LF byte = 0x0A
-
-// CR is carriage return
-const CR byte = 0x0D
-
-// getSections parses an INI formatted string, or string containing just name/value pairs,
-// returns map of `Section`'s.
-//
-// Any name/value pairs appearing before a section name are added to the section named
-// with an empty string ("").  Also true for Linux-style config files where all props
-// are outside a named section.
-//
-// Any errors encountered are aggregated and returned, along with the partially parsed
-// sections.
-func getSections(str string) (map[string]*Section, error) {
-	merr := merror.New()
-	mapSections := make(map[string]*Section)
-	lines := buildLineArray(str)
-	section := newSection("")
-
-	for _, line := range lines {
-		name, ok := parseSection(line)
-		if ok {
-			// A section name encountered. Stop processing the current one.
-			// Don't add the current section to the map if the section name is blank
-			// and the prop map is empty.
-			nameCurr := section.GetName()
-			if nameCurr != "" || section.hasKeys() {
-				mapSections[nameCurr] = section
-			}
-			// Start processing a new section.
-			section = newSection(name)
-		} else {
-			// Parse the property and add to the current section, or ignore if comment.
-			if k, v, comment, err := parseProp(line); !comment && err == nil {
-				section.setProp(k, v)
-			} else if err != nil {
-				merr.Append(err) // aggregate errors
-			}
-		}
-
-	}
-	// If the current section is not empty, add it.
-	if section.hasKeys() {
-		mapSections[section.GetName()] = section
-	}
-	return mapSections, merr.ErrorOrNil()
-}
-
-// buildLineArray parses the given string buffer and creates a list of strings,
-// one for each line in the string buffer.
-//
-// A line is considered to be terminated by any one of a line feed ('\n'),
-// a carriage return ('\r'), or a carriage return followed immediately by a
-// linefeed.
-//
-// Lines prefixed with ';' or '#' are considered comments and skipped.
-func buildLineArray(str string) []string {
-	arr := make([]string, 0, 10)
-	str = str + "\n"
-
-	iLen := len(str)
-	iPos, iBegin := 0, 0
-	var ch byte
-
-	for iPos < iLen {
-		ch = str[iPos]
-		if ch == LF || ch == CR {
-			sub := str[iBegin:iPos]
-			sub = strings.TrimSpace(sub)
-			if sub != "" && !strings.HasPrefix(sub, ";") && !strings.HasPrefix(sub, "#") {
-				arr = append(arr, sub)
-			}
-			iPos++
-			if ch == CR && iPos < iLen && str[iPos] == LF {
-				iPos++
-			}
-			iBegin = iPos
-		} else {
-			iPos++
-		}
-	}
-	return arr
-}
-
-// parseSection parses the specified string for a section name enclosed in square brackets.
-// Returns the section name found, or `ok=false` if `str` is not a section header.
-func parseSection(str string) (name string, ok bool) {
-	str = strings.TrimSpace(str)
-	if !strings.HasPrefix(str, "[") {
-		return "", false
-	}
-	iCloser := strings.Index(str, "]")
-	if iCloser == -1 {
-		return "", false
-	}
-	return strings.TrimSpace(str[1:iCloser]), true
-}
-
-// parseProp parses the specified string and extracts a key/value pair.
-//
-// If the string is a comment (prefixed with ';' or '#') then `comment=true`
-// and key will be empty.
-func parseProp(str string) (key string, val string, comment bool, err error) {
-	iLen := len(str)
-	iEqPos := strings.Index(str, "=")
-	if iEqPos == -1 {
-		return "", "", false, fmt.Errorf("not a key/value pair:'%s'", str)
-	}
-
-	key = str[0:iEqPos]
-	key = strings.TrimSpace(key)
-	if iEqPos+1 < iLen {
-		val = str[iEqPos+1:]
-		val = strings.TrimSpace(val)
-	}
-
-	// Check that the key has at least 1 char.
-	if key == "" {
-		return "", "", false, fmt.Errorf("key is empty for '%s'", str)
-	}
-
-	// Check if this line is a comment that just happens
-	// to have an equals sign in it. Not an error, but not a
-	// useable line either.
-	if strings.HasPrefix(key, ";") || strings.HasPrefix(key, "#") {
-		key = ""
-		val = ""
-		comment = true
-	}
-	return key, val, comment, err
-}
diff --git a/vendor/github.com/wiggin77/cfg/ini/section.go b/vendor/github.com/wiggin77/cfg/ini/section.go
deleted file mode 100644
index 18c4c254..00000000
--- a/vendor/github.com/wiggin77/cfg/ini/section.go
+++ /dev/null
@@ -1,109 +0,0 @@
-package ini
-
-import (
-	"fmt"
-	"strings"
-	"sync"
-)
-
-// Section represents a section in an INI file. The section has a name, which is
-// enclosed in square brackets in the file. The section also has an array of
-// key/value pairs.
-type Section struct {
-	name  string
-	props map[string]string
-	mtx   sync.RWMutex
-}
-
-func newSection(name string) *Section {
-	sec := &Section{}
-	sec.name = name
-	sec.props = make(map[string]string)
-	return sec
-}
-
-// addLines addes an array of strings containing name/value pairs
-// of the format `key=value`.
-//func addLines(lines []string) {
-// TODO
-//}
-
-// GetName returns the name of the section.
-func (sec *Section) GetName() (name string) {
-	sec.mtx.RLock()
-	name = sec.name
-	sec.mtx.RUnlock()
-	return
-}
-
-// GetProp returns the value associated with the given key, or
-// `ok=false` if key does not exist.
-func (sec *Section) GetProp(key string) (val string, ok bool) {
-	sec.mtx.RLock()
-	val, ok = sec.props[key]
-	sec.mtx.RUnlock()
-	return
-}
-
-// SetProp sets the value associated with the given key.
-func (sec *Section) setProp(key string, val string) {
-	sec.mtx.Lock()
-	sec.props[key] = val
-	sec.mtx.Unlock()
-}
-
-// hasKeys returns true if there are one or more properties in
-// this section.
-func (sec *Section) hasKeys() (b bool) {
-	sec.mtx.RLock()
-	b = len(sec.props) > 0
-	sec.mtx.RUnlock()
-	return
-}
-
-// getKeys returns an array containing all keys in this section.
-func (sec *Section) getKeys() []string {
-	sec.mtx.RLock()
-	defer sec.mtx.RUnlock()
-
-	arr := make([]string, len(sec.props))
-	idx := 0
-	for k := range sec.props {
-		arr[idx] = k
-		idx++
-	}
-	return arr
-}
-
-// combine the given section with this one.
-func (sec *Section) combine(sec2 *Section) {
-	sec.mtx.Lock()
-	sec2.mtx.RLock()
-	defer sec.mtx.Unlock()
-	defer sec2.mtx.RUnlock()
-
-	for k, v := range sec2.props {
-		sec.props[k] = v
-	}
-}
-
-// String returns a string representation of this section.
-func (sec *Section) String() string {
-	return fmt.Sprintf("[%s]\n%s", sec.GetName(), sec.StringPropsOnly())
-}
-
-// StringPropsOnly returns a string representation of this section
-// without the section header.
-func (sec *Section) StringPropsOnly() string {
-	sec.mtx.RLock()
-	defer sec.mtx.RUnlock()
-	sb := &strings.Builder{}
-
-	for k, v := range sec.props {
-		sb.WriteString(k)
-		sb.WriteString("=")
-		sb.WriteString(v)
-		sb.WriteString("\n")
-	}
-	return sb.String()
-}
diff --git a/vendor/github.com/wiggin77/cfg/listener.go b/vendor/github.com/wiggin77/cfg/listener.go
deleted file mode 100644
index 12ea4e45..00000000
--- a/vendor/github.com/wiggin77/cfg/listener.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package cfg
-
-// ChangedListener interface is for receiving notifications
-// when one or more properties within monitored config sources
-// (SourceMonitored) have changed values.
-type ChangedListener interface {
-
-	// Changed is called when one or more properties in a `SourceMonitored` has a
-	// changed value.
-	ConfigChanged(cfg *Config, src SourceMonitored)
-}
diff --git a/vendor/github.com/wiggin77/cfg/nocopy.go b/vendor/github.com/wiggin77/cfg/nocopy.go
deleted file mode 100644
index f2450c0b..00000000
--- a/vendor/github.com/wiggin77/cfg/nocopy.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package cfg
-
-// noCopy may be embedded into structs which must not be copied
-// after the first use.
-//
-// See https://golang.org/issues/8005#issuecomment-190753527
-// for details.
-type noCopy struct{}
-
-// Lock is a no-op used by -copylocks checker from `go vet`.
-func (*noCopy) Lock() {}
diff --git a/vendor/github.com/wiggin77/cfg/source.go b/vendor/github.com/wiggin77/cfg/source.go
deleted file mode 100644
index 09083e97..00000000
--- a/vendor/github.com/wiggin77/cfg/source.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package cfg
-
-import (
-	"sync"
-	"time"
-)
-
-// Source is the interface required for any source of name/value pairs.
-type Source interface {
-
-	// GetProps fetches all the properties from a source and returns
-	// them as a map.
-	GetProps() (map[string]string, error)
-}
-
-// SourceMonitored is the interface required for any config source that is
-// monitored for changes.
-type SourceMonitored interface {
-	Source
-
-	// GetLastModified returns the time of the latest modification to any
-	// property value within the source. If a source does not support
-	// modifying properties at runtime then the zero value for `Time`
-	// should be returned to ensure reload events are not generated.
-	GetLastModified() (time.Time, error)
-
-	// GetMonitorFreq returns the frequency as a `time.Duration` between
-	// checks for changes to this config source.
-	//
-	// Returning zero (or less) will temporarily suspend calls to `GetLastModified`
-	// and `GetMonitorFreq` will be called every 10 seconds until resumed, after which
-	// `GetMontitorFreq` will be called at a frequency roughly equal to the `time.Duration`
-	// returned.
-	GetMonitorFreq() time.Duration
-}
-
-// AbstractSourceMonitor can be embedded in a custom `Source` to provide the
-// basic plumbing for monitor frequency.
-type AbstractSourceMonitor struct {
-	mutex sync.RWMutex
-	freq  time.Duration
-}
-
-// GetMonitorFreq returns the frequency as a `time.Duration` between
-// checks for changes to this config source.
-func (asm *AbstractSourceMonitor) GetMonitorFreq() (freq time.Duration) {
-	asm.mutex.RLock()
-	freq = asm.freq
-	asm.mutex.RUnlock()
-	return
-}
-
-// SetMonitorFreq sets the frequency between checks for changes to this config source.
-func (asm *AbstractSourceMonitor) SetMonitorFreq(freq time.Duration) {
-	asm.mutex.Lock()
-	asm.freq = freq
-	asm.mutex.Unlock()
-}
diff --git a/vendor/github.com/wiggin77/cfg/srcfile.go b/vendor/github.com/wiggin77/cfg/srcfile.go
deleted file mode 100644
index f42c69fa..00000000
--- a/vendor/github.com/wiggin77/cfg/srcfile.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package cfg
-
-import (
-	"os"
-	"time"
-
-	"github.com/wiggin77/cfg/ini"
-)
-
-// SrcFile is a configuration `Source` backed by a file containing
-// name/value pairs or INI format.
-type SrcFile struct {
-	AbstractSourceMonitor
-	ini  ini.Ini
-	file *os.File
-}
-
-// NewSrcFileFromFilespec creates a new SrcFile with the specified filespec.
-func NewSrcFileFromFilespec(filespec string) (*SrcFile, error) {
-	file, err := os.Open(filespec)
-	if err != nil {
-		return nil, err
-	}
-	return NewSrcFile(file)
-}
-
-// NewSrcFile creates a new SrcFile with the specified os.File.
-func NewSrcFile(file *os.File) (*SrcFile, error) {
-	sf := &SrcFile{}
-	sf.freq = time.Minute
-	sf.file = file
-	if err := sf.ini.LoadFromFile(file); err != nil {
-		return nil, err
-	}
-	return sf, nil
-}
-
-// GetProps fetches all the properties from a source and returns
-// them as a map.
-func (sf *SrcFile) GetProps() (map[string]string, error) {
-	lm, err := sf.GetLastModified()
-	if err != nil {
-		return nil, err
-	}
-
-	// Check if we need to reload.
-	if sf.ini.GetLastModified() != lm {
-		if err := sf.ini.LoadFromFile(sf.file); err != nil {
-			return nil, err
-		}
-	}
-	return sf.ini.ToMap(), nil
-}
-
-// GetLastModified returns the time of the latest modification to any
-// property value within the source.
-func (sf *SrcFile) GetLastModified() (time.Time, error) {
-	fi, err := sf.file.Stat()
-	if err != nil {
-		return time.Now(), err
-	}
-	return fi.ModTime(), nil
-}
diff --git a/vendor/github.com/wiggin77/cfg/srcmap.go b/vendor/github.com/wiggin77/cfg/srcmap.go
deleted file mode 100644
index 321db27a..00000000
--- a/vendor/github.com/wiggin77/cfg/srcmap.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package cfg
-
-import (
-	"time"
-)
-
-// SrcMap is a configuration `Source` backed by a simple map.
-type SrcMap struct {
-	AbstractSourceMonitor
-	m  map[string]string
-	lm time.Time
-}
-
-// NewSrcMap creates an empty `SrcMap`.
-func NewSrcMap() *SrcMap {
-	sm := &SrcMap{}
-	sm.m = make(map[string]string)
-	sm.lm = time.Now()
-	sm.freq = time.Minute
-	return sm
-}
-
-// NewSrcMapFromMap creates a `SrcMap` containing a copy of the
-// specified map.
-func NewSrcMapFromMap(mapIn map[string]string) *SrcMap {
-	sm := NewSrcMap()
-	sm.PutAll(mapIn)
-	return sm
-}
-
-// Put inserts or updates a value in the `SrcMap`.
-func (sm *SrcMap) Put(key string, val string) {
-	sm.mutex.Lock()
-	sm.m[key] = val
-	sm.lm = time.Now()
-	sm.mutex.Unlock()
-}
-
-// PutAll inserts a copy of `mapIn` into the `SrcMap`
-func (sm *SrcMap) PutAll(mapIn map[string]string) {
-	sm.mutex.Lock()
-	defer sm.mutex.Unlock()
-
-	for k, v := range mapIn {
-		sm.m[k] = v
-	}
-	sm.lm = time.Now()
-}
-
-// GetProps fetches all the properties from a source and returns
-// them as a map.
-func (sm *SrcMap) GetProps() (m map[string]string, err error) {
-	sm.mutex.RLock()
-	m = sm.m
-	sm.mutex.RUnlock()
-	return
-}
-
-// GetLastModified returns the time of the latest modification to any
-// property value within the source. If a source does not support
-// modifying properties at runtime then the zero value for `Time`
-// should be returned to ensure reload events are not generated.
-func (sm *SrcMap) GetLastModified() (last time.Time, err error) {
-	sm.mutex.RLock()
-	last = sm.lm
-	sm.mutex.RUnlock()
-	return
-}
-
-// GetMonitorFreq returns the frequency as a `time.Duration` between
-// checks for changes to this config source. Defaults to 1 minute
-// unless changed with `SetMonitorFreq`.
-func (sm *SrcMap) GetMonitorFreq() (freq time.Duration) {
-	sm.mutex.RLock()
-	freq = sm.freq
-	sm.mutex.RUnlock()
-	return
-}
diff --git a/vendor/github.com/wiggin77/cfg/timeconv/parse.go b/vendor/github.com/wiggin77/cfg/timeconv/parse.go
deleted file mode 100644
index 218ef43a..00000000
--- a/vendor/github.com/wiggin77/cfg/timeconv/parse.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package timeconv
-
-import (
-	"fmt"
-	"math"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-// MillisPerSecond is the number of millseconds per second.
-const MillisPerSecond int64 = 1000
-
-// MillisPerMinute is the number of millseconds per minute.
-const MillisPerMinute int64 = MillisPerSecond * 60
-
-// MillisPerHour is the number of millseconds per hour.
-const MillisPerHour int64 = MillisPerMinute * 60
-
-// MillisPerDay is the number of millseconds per day.
-const MillisPerDay int64 = MillisPerHour * 24
-
-// MillisPerWeek is the number of millseconds per week.
-const MillisPerWeek int64 = MillisPerDay * 7
-
-// MillisPerYear is the approximate number of millseconds per year.
-const MillisPerYear int64 = MillisPerDay*365 + int64((float64(MillisPerDay) * 0.25))
-
-// ParseMilliseconds parses a string containing a number plus
-// a unit of measure for time and returns the number of milliseconds
-// it represents.
-//
-// Example:
-// * "1 second" returns 1000
-// * "1 minute" returns 60000
-// * "1 hour" returns 3600000
-//
-// See config.UnitsToMillis for a list of supported units of measure.
-func ParseMilliseconds(str string) (int64, error) {
-	s := strings.TrimSpace(str)
-	reg := regexp.MustCompile("([0-9\\.\\-+]*)(.*)")
-	matches := reg.FindStringSubmatch(s)
-	if matches == nil || len(matches) < 1 || matches[1] == "" {
-		return 0, fmt.Errorf("invalid syntax - '%s'", s)
-	}
-	digits := matches[1]
-	units := "ms"
-	if len(matches) > 1 && matches[2] != "" {
-		units = matches[2]
-	}
-
-	fDigits, err := strconv.ParseFloat(digits, 64)
-	if err != nil {
-		return 0, err
-	}
-
-	msPerUnit, err := UnitsToMillis(units)
-	if err != nil {
-		return 0, err
-	}
-
-	// Check for overflow.
-	fms := float64(msPerUnit) * fDigits
-	if fms > math.MaxInt64 || fms < math.MinInt64 {
-		return 0, fmt.Errorf("out of range - '%s' overflows", s)
-	}
-	ms := int64(fms)
-	return ms, nil
-}
-
-// UnitsToMillis returns the number of milliseconds represented by the specified unit of measure.
-//
-// Example:
-// * "second" returns 1000	<br/>
-// * "minute" returns 60000	<br/>
-// * "hour" returns 3600000	<br/>
-//
-// Supported units of measure:
-// * "milliseconds", "millis", "ms", "millisecond"
-// * "seconds", "sec", "s", "second"
-// * "minutes", "mins", "min", "m", "minute"
-// * "hours", "h", "hour"
-// * "days", "d", "day"
-// * "weeks", "w", "week"
-// * "years", "y", "year"
-func UnitsToMillis(units string) (ms int64, err error) {
-	u := strings.TrimSpace(units)
-	u = strings.ToLower(u)
-	switch u {
-	case "milliseconds", "millisecond", "millis", "ms":
-		ms = 1
-	case "seconds", "second", "sec", "s":
-		ms = MillisPerSecond
-	case "minutes", "minute", "mins", "min", "m":
-		ms = MillisPerMinute
-	case "hours", "hour", "h":
-		ms = MillisPerHour
-	case "days", "day", "d":
-		ms = MillisPerDay
-	case "weeks", "week", "w":
-		ms = MillisPerWeek
-	case "years", "year", "y":
-		ms = MillisPerYear
-	default:
-		err = fmt.Errorf("invalid syntax - '%s' not a supported unit of measure", u)
-	}
-	return
-}
diff --git a/vendor/go.mau.fi/whatsmeow/.editorconfig b/vendor/go.mau.fi/whatsmeow/.editorconfig
new file mode 100644
index 00000000..d7ab7302
--- /dev/null
+++ b/vendor/go.mau.fi/whatsmeow/.editorconfig
@@ -0,0 +1,13 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{yaml,yml}]
+indent_style = space
+indent_size = 2
diff --git a/vendor/go.mau.fi/whatsmeow/README.md b/vendor/go.mau.fi/whatsmeow/README.md
index 123239b5..b0d36ffb 100644
--- a/vendor/go.mau.fi/whatsmeow/README.md
+++ b/vendor/go.mau.fi/whatsmeow/README.md
@@ -27,12 +27,11 @@ Most core features are already present:
 * Joining via invite messages, using and creating invite links
 * Sending and receiving typing notifications
 * Sending and receiving delivery and read receipts
-* Reading app state (contact list, chat pin/mute status, etc)
+* Reading and writing app state (contact list, chat pin/mute status, etc)
 * Sending and handling retry receipts if message decryption fails
 * Sending status messages (experimental, may not work for large contact lists)
 
 Things that are not yet implemented:
 
-* Writing app state (contact list, chat pin/mute status, etc)
 * Sending broadcast list messages (this is not supported on WhatsApp web either)
 * Calls
diff --git a/vendor/go.mau.fi/whatsmeow/appstate.go b/vendor/go.mau.fi/whatsmeow/appstate.go
index 7493a030..3c128db6 100644
--- a/vendor/go.mau.fi/whatsmeow/appstate.go
+++ b/vendor/go.mau.fi/whatsmeow/appstate.go
@@ -74,7 +74,7 @@ func (cli *Client) FetchAppState(name appstate.WAPatchName, fullSync, onlyIfNotS
 			}
 		}
 		for _, mutation := range mutations {
-			cli.dispatchAppState(mutation, !fullSync || cli.EmitAppStateEventsOnFullSync)
+			cli.dispatchAppState(mutation, fullSync, cli.EmitAppStateEventsOnFullSync)
 		}
 	}
 	if fullSync {
@@ -105,7 +105,10 @@ func (cli *Client) filterContacts(mutations []appstate.Mutation) ([]appstate.Mut
 	return filteredMutations, contacts
 }
 
-func (cli *Client) dispatchAppState(mutation appstate.Mutation, dispatchEvts bool) {
+func (cli *Client) dispatchAppState(mutation appstate.Mutation, fullSync bool, emitOnFullSync bool) {
+
+	dispatchEvts := !fullSync || emitOnFullSync
+
 	if mutation.Operation != waProto.SyncdMutation_SET {
 		return
 	}
@@ -118,87 +121,108 @@ func (cli *Client) dispatchAppState(mutation appstate.Mutation, dispatchEvts boo
 	if len(mutation.Index) > 1 {
 		jid, _ = types.ParseJID(mutation.Index[1])
 	}
-	ts := time.Unix(mutation.Action.GetTimestamp(), 0)
+	ts := time.UnixMilli(mutation.Action.GetTimestamp())
 
 	var storeUpdateError error
 	var eventToDispatch interface{}
 	switch mutation.Index[0] {
-	case "mute":
+	case appstate.IndexMute:
 		act := mutation.Action.GetMuteAction()
-		eventToDispatch = &events.Mute{JID: jid, Timestamp: ts, Action: act}
+		eventToDispatch = &events.Mute{JID: jid, Timestamp: ts, Action: act, FromFullSync: fullSync}
 		var mutedUntil time.Time
 		if act.GetMuted() {
-			mutedUntil = time.Unix(act.GetMuteEndTimestamp(), 0)
+			mutedUntil = time.UnixMilli(act.GetMuteEndTimestamp())
 		}
 		if cli.Store.ChatSettings != nil {
 			storeUpdateError = cli.Store.ChatSettings.PutMutedUntil(jid, mutedUntil)
 		}
-	case "pin_v1":
+	case appstate.IndexPin:
 		act := mutation.Action.GetPinAction()
-		eventToDispatch = &events.Pin{JID: jid, Timestamp: ts, Action: act}
+		eventToDispatch = &events.Pin{JID: jid, Timestamp: ts, Action: act, FromFullSync: fullSync}
 		if cli.Store.ChatSettings != nil {
 			storeUpdateError = cli.Store.ChatSettings.PutPinned(jid, act.GetPinned())
 		}
-	case "archive":
+	case appstate.IndexArchive:
 		act := mutation.Action.GetArchiveChatAction()
-		eventToDispatch = &events.Archive{JID: jid, Timestamp: ts, Action: act}
+		eventToDispatch = &events.Archive{JID: jid, Timestamp: ts, Action: act, FromFullSync: fullSync}
 		if cli.Store.ChatSettings != nil {
 			storeUpdateError = cli.Store.ChatSettings.PutArchived(jid, act.GetArchived())
 		}
-	case "contact":
+	case appstate.IndexContact:
 		act := mutation.Action.GetContactAction()
-		eventToDispatch = &events.Contact{JID: jid, Timestamp: ts, Action: act}
+		eventToDispatch = &events.Contact{JID: jid, Timestamp: ts, Action: act, FromFullSync: fullSync}
 		if cli.Store.Contacts != nil {
 			storeUpdateError = cli.Store.Contacts.PutContactName(jid, act.GetFirstName(), act.GetFullName())
 		}
-	case "deleteChat":
+	case appstate.IndexClearChat:
+		act := mutation.Action.GetClearChatAction()
+		eventToDispatch = &events.ClearChat{JID: jid, Timestamp: ts, Action: act, FromFullSync: fullSync}
+	case appstate.IndexDeleteChat:
 		act := mutation.Action.GetDeleteChatAction()
-		eventToDispatch = &events.DeleteChat{JID: jid, Timestamp: ts, Action: act}
-	case "star":
+		eventToDispatch = &events.DeleteChat{JID: jid, Timestamp: ts, Action: act, FromFullSync: fullSync}
+	case appstate.IndexStar:
 		if len(mutation.Index) < 5 {
 			return
 		}
 		evt := events.Star{
-			ChatJID:   jid,
-			MessageID: mutation.Index[2],
-			Timestamp: ts,
-			Action:    mutation.Action.GetStarAction(),
-			IsFromMe:  mutation.Index[3] == "1",
+			ChatJID:      jid,
+			MessageID:    mutation.Index[2],
+			Timestamp:    ts,
+			Action:       mutation.Action.GetStarAction(),
+			IsFromMe:     mutation.Index[3] == "1",
+			FromFullSync: fullSync,
 		}
 		if mutation.Index[4] != "0" {
 			evt.SenderJID, _ = types.ParseJID(mutation.Index[4])
 		}
 		eventToDispatch = &evt
-	case "deleteMessageForMe":
+	case appstate.IndexDeleteMessageForMe:
 		if len(mutation.Index) < 5 {
 			return
 		}
 		evt := events.DeleteForMe{
-			ChatJID:   jid,
-			MessageID: mutation.Index[2],
-			Timestamp: ts,
-			Action:    mutation.Action.GetDeleteMessageForMeAction(),
-			IsFromMe:  mutation.Index[3] == "1",
+			ChatJID:      jid,
+			MessageID:    mutation.Index[2],
+			Timestamp:    ts,
+			Action:       mutation.Action.GetDeleteMessageForMeAction(),
+			IsFromMe:     mutation.Index[3] == "1",
+			FromFullSync: fullSync,
 		}
 		if mutation.Index[4] != "0" {
 			evt.SenderJID, _ = types.ParseJID(mutation.Index[4])
 		}
 		eventToDispatch = &evt
-	case "markChatAsRead":
+	case appstate.IndexMarkChatAsRead:
 		eventToDispatch = &events.MarkChatAsRead{
-			JID:       jid,
-			Timestamp: ts,
-			Action:    mutation.Action.GetMarkChatAsReadAction(),
+			JID:          jid,
+			Timestamp:    ts,
+			Action:       mutation.Action.GetMarkChatAsReadAction(),
+			FromFullSync: fullSync,
+		}
+	case appstate.IndexSettingPushName:
+		eventToDispatch = &events.PushNameSetting{
+			Timestamp:    ts,
+			Action:       mutation.Action.GetPushNameSetting(),
+			FromFullSync: fullSync,
 		}
-	case "setting_pushName":
-		eventToDispatch = &events.PushNameSetting{Timestamp: ts, Action: mutation.Action.GetPushNameSetting()}
 		cli.Store.PushName = mutation.Action.GetPushNameSetting().GetName()
 		err := cli.Store.Save()
 		if err != nil {
 			cli.Log.Errorf("Failed to save device store after updating push name: %v", err)
 		}
-	case "setting_unarchiveChats":
-		eventToDispatch = &events.UnarchiveChatsSetting{Timestamp: ts, Action: mutation.Action.GetUnarchiveChatsSetting()}
+	case appstate.IndexSettingUnarchiveChats:
+		eventToDispatch = &events.UnarchiveChatsSetting{
+			Timestamp:    ts,
+			Action:       mutation.Action.GetUnarchiveChatsSetting(),
+			FromFullSync: fullSync,
+		}
+	case appstate.IndexUserStatusMute:
+		eventToDispatch = &events.UserStatusMute{
+			JID:          jid,
+			Timestamp:    ts,
+			Action:       mutation.Action.GetUserStatusMuteAction(),
+			FromFullSync: fullSync,
+		}
 	}
 	if storeUpdateError != nil {
 		cli.Log.Errorf("Failed to update device store after app state mutation: %v", storeUpdateError)
@@ -280,3 +304,63 @@ func (cli *Client) requestAppStateKeys(ctx context.Context, rawKeyIDs [][]byte)
 		cli.Log.Warnf("Failed to send app state key request: %v", err)
 	}
 }
+
+// SendAppState sends the given app state patch, then resyncs that app state type from the server
+// to update local caches and send events for the updates.
+//
+// You can use the Build methods in the appstate package to build the parameter for this method, e.g.
+//
+//	cli.SendAppState(appstate.BuildMute(targetJID, true, 24 * time.Hour))
+func (cli *Client) SendAppState(patch appstate.PatchInfo) error {
+	version, hash, err := cli.Store.AppState.GetAppStateVersion(string(patch.Type))
+	if err != nil {
+		return err
+	}
+	// TODO create new key instead of reusing the primary client's keys
+	latestKeyID, err := cli.Store.AppStateKeys.GetLatestAppStateSyncKeyID()
+	if err != nil {
+		return fmt.Errorf("failed to get latest app state key ID: %w", err)
+	} else if latestKeyID == nil {
+		return fmt.Errorf("no app state keys found, creating app state keys is not yet supported")
+	}
+
+	state := appstate.HashState{Version: version, Hash: hash}
+
+	encodedPatch, err := cli.appStateProc.EncodePatch(latestKeyID, state, patch)
+	if err != nil {
+		return err
+	}
+
+	resp, err := cli.sendIQ(infoQuery{
+		Namespace: "w:sync:app:state",
+		Type:      iqSet,
+		To:        types.ServerJID,
+		Content: []waBinary.Node{{
+			Tag: "sync",
+			Content: []waBinary.Node{{
+				Tag: "collection",
+				Attrs: waBinary.Attrs{
+					"name":            string(patch.Type),
+					"version":         version,
+					"return_snapshot": false,
+				},
+				Content: []waBinary.Node{{
+					Tag:     "patch",
+					Content: encodedPatch,
+				}},
+			}},
+		}},
+	})
+	if err != nil {
+		return err
+	}
+
+	respCollection := resp.GetChildByTag("sync", "collection")
+	respCollectionAttr := respCollection.AttrGetter()
+	if respCollectionAttr.OptionalString("type") == "error" {
+		// TODO parse error properly
+		return fmt.Errorf("%w: %s", ErrAppStateUpdate, respCollection.XMLString())
+	}
+
+	return cli.FetchAppState(patch.Type, false, false)
+}
diff --git a/vendor/go.mau.fi/whatsmeow/appstate/decode.go b/vendor/go.mau.fi/whatsmeow/appstate/decode.go
index 5c895470..980c20de 100644
--- a/vendor/go.mau.fi/whatsmeow/appstate/decode.go
+++ b/vendor/go.mau.fi/whatsmeow/appstate/decode.go
@@ -290,7 +290,7 @@ func (proc *Processor) DecodePatches(list *PatchList, initialState HashState, va
 			if err != nil {
 				return
 			}
-			patchMAC := generatePatchMAC(patch, list.Name, keys.PatchMAC)
+			patchMAC := generatePatchMAC(patch, list.Name, keys.PatchMAC, patch.GetVersion().GetVersion())
 			if !bytes.Equal(patchMAC, patch.GetPatchMac()) {
 				err = fmt.Errorf("failed to verify patch v%d: %w", version, ErrMismatchingPatchMAC)
 				return
diff --git a/vendor/go.mau.fi/whatsmeow/appstate/encode.go b/vendor/go.mau.fi/whatsmeow/appstate/encode.go
new file mode 100644
index 00000000..1cb7d659
--- /dev/null
+++ b/vendor/go.mau.fi/whatsmeow/appstate/encode.go
@@ -0,0 +1,200 @@
+package appstate
+
+import (
+	"crypto/sha256"
+	"encoding/json"
+	"fmt"
+	"time"
+
+	"google.golang.org/protobuf/proto"
+
+	waProto "go.mau.fi/whatsmeow/binary/proto"
+	"go.mau.fi/whatsmeow/types"
+	"go.mau.fi/whatsmeow/util/cbcutil"
+)
+
+// MutationInfo contains information about a single mutation to the app state.
+type MutationInfo struct {
+	// Index contains the thing being mutated (like `mute` or `pin_v1`), followed by parameters like the target JID.
+	Index []string
+	// Version is a static number that depends on the thing being mutated.
+	Version int32
+	// Value contains the data for the mutation.
+	Value *waProto.SyncActionValue
+}
+
+// PatchInfo contains information about a patch to the app state.
+// A patch can contain multiple mutations, as long as all mutations are in the same app state type.
+type PatchInfo struct {
+	// Timestamp is the time when the patch was created. This will be filled automatically in EncodePatch if it's zero.
+	Timestamp time.Time
+	// Type is the app state type being mutated.
+	Type WAPatchName
+	// Mutations contains the individual mutations to apply to the app state in this patch.
+	Mutations []MutationInfo
+}
+
+// BuildMute builds an app state patch for muting or unmuting a chat.
+//
+// If mute is true and the mute duration is zero, the chat is muted forever.
+func BuildMute(target types.JID, mute bool, muteDuration time.Duration) PatchInfo {
+	var muteEndTimestamp *int64
+	if muteDuration > 0 {
+		muteEndTimestamp = proto.Int64(time.Now().Add(muteDuration).UnixMilli())
+	}
+
+	return PatchInfo{
+		Type: WAPatchRegularHigh,
+		Mutations: []MutationInfo{{
+			Index:   []string{IndexMute, target.String()},
+			Version: 2,
+			Value: &waProto.SyncActionValue{
+				MuteAction: &waProto.MuteAction{
+					Muted:            proto.Bool(mute),
+					MuteEndTimestamp: muteEndTimestamp,
+				},
+			},
+		}},
+	}
+}
+
+func newPinMutationInfo(target types.JID, pin bool) MutationInfo {
+	return MutationInfo{
+		Index:   []string{IndexPin, target.String()},
+		Version: 5,
+		Value: &waProto.SyncActionValue{
+			PinAction: &waProto.PinAction{
+				Pinned: &pin,
+			},
+		},
+	}
+}
+
+// BuildPin builds an app state patch for pinning or unpinning a chat.
+func BuildPin(target types.JID, pin bool) PatchInfo {
+	return PatchInfo{
+		Type: WAPatchRegularLow,
+		Mutations: []MutationInfo{
+			newPinMutationInfo(target, pin),
+		},
+	}
+}
+
+// BuildArchive builds an app state patch for archiving or unarchiving a chat.
+//
+// The last message timestamp and last message key are optional and can be set to zero values (`time.Time{}` and `nil`).
+//
+// Archiving a chat will also unpin it automatically.
+func BuildArchive(target types.JID, archive bool, lastMessageTimestamp time.Time, lastMessageKey *waProto.MessageKey) PatchInfo {
+	if lastMessageTimestamp.IsZero() {
+		lastMessageTimestamp = time.Now()
+	}
+	archiveMutationInfo := MutationInfo{
+		Index:   []string{IndexArchive, target.String()},
+		Version: 3,
+		Value: &waProto.SyncActionValue{
+			ArchiveChatAction: &waProto.ArchiveChatAction{
+				Archived: &archive,
+				MessageRange: &waProto.SyncActionMessageRange{
+					LastMessageTimestamp: proto.Int64(lastMessageTimestamp.Unix()),
+					// TODO set LastSystemMessageTimestamp?
+				},
+			},
+		},
+	}
+
+	if lastMessageKey != nil {
+		archiveMutationInfo.Value.ArchiveChatAction.MessageRange.Messages = []*waProto.SyncActionMessage{{
+			Key:       lastMessageKey,
+			Timestamp: proto.Int64(lastMessageTimestamp.Unix()),
+		}}
+	}
+
+	mutations := []MutationInfo{archiveMutationInfo}
+	if archive {
+		mutations = append(mutations, newPinMutationInfo(target, false))
+	}
+
+	result := PatchInfo{
+		Type:      WAPatchRegularLow,
+		Mutations: mutations,
+	}
+
+	return result
+}
+
+func (proc *Processor) EncodePatch(keyID []byte, state HashState, patchInfo PatchInfo) ([]byte, error) {
+	keys, err := proc.getAppStateKey(keyID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get app state key details with key ID %x: %w", keyID, err)
+	}
+
+	if patchInfo.Timestamp.IsZero() {
+		patchInfo.Timestamp = time.Now()
+	}
+
+	mutations := make([]*waProto.SyncdMutation, 0, len(patchInfo.Mutations))
+	for _, mutationInfo := range patchInfo.Mutations {
+		mutationInfo.Value.Timestamp = proto.Int64(patchInfo.Timestamp.UnixMilli())
+
+		indexBytes, err := json.Marshal(mutationInfo.Index)
+		if err != nil {
+			return nil, fmt.Errorf("failed to marshal mutation index: %w", err)
+		}
+
+		pbObj := &waProto.SyncActionData{
+			Index:   indexBytes,
+			Value:   mutationInfo.Value,
+			Padding: []byte{},
+			Version: &mutationInfo.Version,
+		}
+
+		content, err := proto.Marshal(pbObj)
+		if err != nil {
+			return nil, fmt.Errorf("failed to marshal mutation: %w", err)
+		}
+
+		encryptedContent, err := cbcutil.Encrypt(keys.ValueEncryption, nil, content)
+		if err != nil {
+			return nil, fmt.Errorf("failed to encrypt mutation: %w", err)
+		}
+
+		valueMac := generateContentMAC(waProto.SyncdMutation_SET, encryptedContent, keyID, keys.ValueMAC)
+		indexMac := concatAndHMAC(sha256.New, keys.Index, indexBytes)
+
+		mutations = append(mutations, &waProto.SyncdMutation{
+			Operation: waProto.SyncdMutation_SET.Enum(),
+			Record: &waProto.SyncdRecord{
+				Index: &waProto.SyncdIndex{Blob: indexMac},
+				Value: &waProto.SyncdValue{Blob: append(encryptedContent, valueMac...)},
+				KeyId: &waProto.KeyId{Id: keyID},
+			},
+		})
+	}
+
+	warn, err := state.updateHash(mutations, func(indexMAC []byte, _ int) ([]byte, error) {
+		return proc.Store.AppState.GetAppStateMutationMAC(string(patchInfo.Type), indexMAC)
+	})
+	if len(warn) > 0 {
+		proc.Log.Warnf("Warnings while updating hash for %s (sending new app state): %+v", patchInfo.Type, warn)
+	}
+	if err != nil {
+		return nil, fmt.Errorf("failed to update state hash: %w", err)
+	}
+
+	state.Version += 1
+
+	syncdPatch := &waProto.SyncdPatch{
+		SnapshotMac: state.generateSnapshotMAC(patchInfo.Type, keys.SnapshotMAC),
+		KeyId:       &waProto.KeyId{Id: keyID},
+		Mutations:   mutations,
+	}
+	syncdPatch.PatchMac = generatePatchMAC(syncdPatch, patchInfo.Type, keys.PatchMAC, state.Version)
+
+	result, err := proto.Marshal(syncdPatch)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal compiled patch: %w", err)
+	}
+
+	return result, nil
+}
diff --git a/vendor/go.mau.fi/whatsmeow/appstate/hash.go b/vendor/go.mau.fi/whatsmeow/appstate/hash.go
index bb17eeac..2bb0924a 100644
--- a/vendor/go.mau.fi/whatsmeow/appstate/hash.go
+++ b/vendor/go.mau.fi/whatsmeow/appstate/hash.go
@@ -77,14 +77,14 @@ func (hs *HashState) generateSnapshotMAC(name WAPatchName, key []byte) []byte {
 	return concatAndHMAC(sha256.New, key, hs.Hash[:], uint64ToBytes(hs.Version), []byte(name))
 }
 
-func generatePatchMAC(patch *waProto.SyncdPatch, name WAPatchName, key []byte) []byte {
+func generatePatchMAC(patch *waProto.SyncdPatch, name WAPatchName, key []byte, version uint64) []byte {
 	dataToHash := make([][]byte, len(patch.GetMutations())+3)
 	dataToHash[0] = patch.GetSnapshotMac()
 	for i, mutation := range patch.Mutations {
 		val := mutation.GetRecord().GetValue().GetBlob()
 		dataToHash[i+1] = val[len(val)-32:]
 	}
-	dataToHash[len(dataToHash)-2] = uint64ToBytes(patch.GetVersion().GetVersion())
+	dataToHash[len(dataToHash)-2] = uint64ToBytes(version)
 	dataToHash[len(dataToHash)-1] = []byte(name)
 	return concatAndHMAC(sha256.New, key, dataToHash...)
 }
diff --git a/vendor/go.mau.fi/whatsmeow/appstate/keys.go b/vendor/go.mau.fi/whatsmeow/appstate/keys.go
index ec19dc26..95f7d134 100644
--- a/vendor/go.mau.fi/whatsmeow/appstate/keys.go
+++ b/vendor/go.mau.fi/whatsmeow/appstate/keys.go
@@ -35,6 +35,22 @@ const (
 // AllPatchNames contains all currently known patch state names.
 var AllPatchNames = [...]WAPatchName{WAPatchCriticalBlock, WAPatchCriticalUnblockLow, WAPatchRegularHigh, WAPatchRegular, WAPatchRegularLow}
 
+// Constants for the first part of app state indexes.
+const (
+	IndexMute                  = "mute"
+	IndexPin                   = "pin_v1"
+	IndexArchive               = "archive"
+	IndexContact               = "contact"
+	IndexClearChat             = "clearChat"
+	IndexDeleteChat            = "deleteChat"
+	IndexStar                  = "star"
+	IndexDeleteMessageForMe    = "deleteMessageForMe"
+	IndexMarkChatAsRead        = "markChatAsRead"
+	IndexSettingPushName       = "setting_pushName"
+	IndexSettingUnarchiveChats = "setting_unarchiveChats"
+	IndexUserStatusMute        = "userStatusMute"
+)
+
 type Processor struct {
 	keyCache     map[string]ExpandedAppStateKeys
 	keyCacheLock sync.Mutex
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 16a9928c..6e27370c 100644
--- a/vendor/go.mau.fi/whatsmeow/binary/proto/def.pb.go
+++ b/vendor/go.mau.fi/whatsmeow/binary/proto/def.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
+// 	protoc-gen-go v1.30.0
 // 	protoc        v3.21.12
 // source: binary/proto/def.proto
 
@@ -22,6 +22,62 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
+type ADVEncryptionType int32
+
+const (
+	ADVEncryptionType_E2EE   ADVEncryptionType = 0
+	ADVEncryptionType_HOSTED ADVEncryptionType = 1
+)
+
+// Enum value maps for ADVEncryptionType.
+var (
+	ADVEncryptionType_name = map[int32]string{
+		0: "E2EE",
+		1: "HOSTED",
+	}
+	ADVEncryptionType_value = map[string]int32{
+		"E2EE":   0,
+		"HOSTED": 1,
+	}
+)
+
+func (x ADVEncryptionType) Enum() *ADVEncryptionType {
+	p := new(ADVEncryptionType)
+	*p = x
+	return p
+}
+
+func (x ADVEncryptionType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (ADVEncryptionType) Descriptor() protoreflect.EnumDescriptor {
+	return file_binary_proto_def_proto_enumTypes[0].Descriptor()
+}
+
+func (ADVEncryptionType) Type() protoreflect.EnumType {
+	return &file_binary_proto_def_proto_enumTypes[0]
+}
+
+func (x ADVEncryptionType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *ADVEncryptionType) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = ADVEncryptionType(num)
+	return nil
+}
+
+// Deprecated: Use ADVEncryptionType.Descriptor instead.
+func (ADVEncryptionType) EnumDescriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{0}
+}
+
 type KeepType int32
 
 const (
@@ -55,11 +111,11 @@ func (x KeepType) String() string {
 }
 
 func (KeepType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[0].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[1].Descriptor()
 }
 
 func (KeepType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[0]
+	return &file_binary_proto_def_proto_enumTypes[1]
 }
 
 func (x KeepType) Number() protoreflect.EnumNumber {
@@ -78,7 +134,7 @@ 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}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{1}
 }
 
 type PeerDataOperationRequestType int32
@@ -88,6 +144,7 @@ const (
 	PeerDataOperationRequestType_SEND_RECENT_STICKER_BOOTSTRAP PeerDataOperationRequestType = 1
 	PeerDataOperationRequestType_GENERATE_LINK_PREVIEW         PeerDataOperationRequestType = 2
 	PeerDataOperationRequestType_HISTORY_SYNC_ON_DEMAND        PeerDataOperationRequestType = 3
+	PeerDataOperationRequestType_PLACEHOLDER_MESSAGE_RESEND    PeerDataOperationRequestType = 4
 )
 
 // Enum value maps for PeerDataOperationRequestType.
@@ -97,12 +154,14 @@ var (
 		1: "SEND_RECENT_STICKER_BOOTSTRAP",
 		2: "GENERATE_LINK_PREVIEW",
 		3: "HISTORY_SYNC_ON_DEMAND",
+		4: "PLACEHOLDER_MESSAGE_RESEND",
 	}
 	PeerDataOperationRequestType_value = map[string]int32{
 		"UPLOAD_STICKER":                0,
 		"SEND_RECENT_STICKER_BOOTSTRAP": 1,
 		"GENERATE_LINK_PREVIEW":         2,
 		"HISTORY_SYNC_ON_DEMAND":        3,
+		"PLACEHOLDER_MESSAGE_RESEND":    4,
 	}
 )
 
@@ -117,11 +176,11 @@ func (x PeerDataOperationRequestType) String() string {
 }
 
 func (PeerDataOperationRequestType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[1].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[2].Descriptor()
 }
 
 func (PeerDataOperationRequestType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[1]
+	return &file_binary_proto_def_proto_enumTypes[2]
 }
 
 func (x PeerDataOperationRequestType) Number() protoreflect.EnumNumber {
@@ -140,7 +199,7 @@ func (x *PeerDataOperationRequestType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use PeerDataOperationRequestType.Descriptor instead.
 func (PeerDataOperationRequestType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{2}
 }
 
 type MediaVisibility int32
@@ -176,11 +235,11 @@ func (x MediaVisibility) String() string {
 }
 
 func (MediaVisibility) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[2].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[3].Descriptor()
 }
 
 func (MediaVisibility) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[2]
+	return &file_binary_proto_def_proto_enumTypes[3]
 }
 
 func (x MediaVisibility) Number() protoreflect.EnumNumber {
@@ -199,7 +258,7 @@ func (x *MediaVisibility) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use MediaVisibility.Descriptor instead.
 func (MediaVisibility) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{3}
 }
 
 type DeviceProps_PlatformType int32
@@ -223,6 +282,11 @@ const (
 	DeviceProps_IOS_CATALYST      DeviceProps_PlatformType = 15
 	DeviceProps_ANDROID_PHONE     DeviceProps_PlatformType = 16
 	DeviceProps_ANDROID_AMBIGUOUS DeviceProps_PlatformType = 17
+	DeviceProps_WEAR_OS           DeviceProps_PlatformType = 18
+	DeviceProps_AR_WRIST          DeviceProps_PlatformType = 19
+	DeviceProps_AR_DEVICE         DeviceProps_PlatformType = 20
+	DeviceProps_UWP               DeviceProps_PlatformType = 21
+	DeviceProps_VR                DeviceProps_PlatformType = 22
 )
 
 // Enum value maps for DeviceProps_PlatformType.
@@ -246,6 +310,11 @@ var (
 		15: "IOS_CATALYST",
 		16: "ANDROID_PHONE",
 		17: "ANDROID_AMBIGUOUS",
+		18: "WEAR_OS",
+		19: "AR_WRIST",
+		20: "AR_DEVICE",
+		21: "UWP",
+		22: "VR",
 	}
 	DeviceProps_PlatformType_value = map[string]int32{
 		"UNKNOWN":           0,
@@ -266,6 +335,11 @@ var (
 		"IOS_CATALYST":      15,
 		"ANDROID_PHONE":     16,
 		"ANDROID_AMBIGUOUS": 17,
+		"WEAR_OS":           18,
+		"AR_WRIST":          19,
+		"AR_DEVICE":         20,
+		"UWP":               21,
+		"VR":                22,
 	}
 )
 
@@ -280,11 +354,11 @@ func (x DeviceProps_PlatformType) String() string {
 }
 
 func (DeviceProps_PlatformType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[3].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[4].Descriptor()
 }
 
 func (DeviceProps_PlatformType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[3]
+	return &file_binary_proto_def_proto_enumTypes[4]
 }
 
 func (x DeviceProps_PlatformType) Number() protoreflect.EnumNumber {
@@ -306,174 +380,6 @@ func (DeviceProps_PlatformType) EnumDescriptor() ([]byte, []int) {
 	return file_binary_proto_def_proto_rawDescGZIP(), []int{5, 0}
 }
 
-type PaymentInviteMessage_ServiceType int32
-
-const (
-	PaymentInviteMessage_UNKNOWN PaymentInviteMessage_ServiceType = 0
-	PaymentInviteMessage_FBPAY   PaymentInviteMessage_ServiceType = 1
-	PaymentInviteMessage_NOVI    PaymentInviteMessage_ServiceType = 2
-	PaymentInviteMessage_UPI     PaymentInviteMessage_ServiceType = 3
-)
-
-// Enum value maps for PaymentInviteMessage_ServiceType.
-var (
-	PaymentInviteMessage_ServiceType_name = map[int32]string{
-		0: "UNKNOWN",
-		1: "FBPAY",
-		2: "NOVI",
-		3: "UPI",
-	}
-	PaymentInviteMessage_ServiceType_value = map[string]int32{
-		"UNKNOWN": 0,
-		"FBPAY":   1,
-		"NOVI":    2,
-		"UPI":     3,
-	}
-)
-
-func (x PaymentInviteMessage_ServiceType) Enum() *PaymentInviteMessage_ServiceType {
-	p := new(PaymentInviteMessage_ServiceType)
-	*p = x
-	return p
-}
-
-func (x PaymentInviteMessage_ServiceType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (PaymentInviteMessage_ServiceType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[4].Descriptor()
-}
-
-func (PaymentInviteMessage_ServiceType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[4]
-}
-
-func (x PaymentInviteMessage_ServiceType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Do not use.
-func (x *PaymentInviteMessage_ServiceType) UnmarshalJSON(b []byte) error {
-	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
-	if err != nil {
-		return err
-	}
-	*x = PaymentInviteMessage_ServiceType(num)
-	return nil
-}
-
-// Deprecated: Use PaymentInviteMessage_ServiceType.Descriptor instead.
-func (PaymentInviteMessage_ServiceType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{7, 0}
-}
-
-type OrderMessage_OrderSurface int32
-
-const (
-	OrderMessage_CATALOG OrderMessage_OrderSurface = 1
-)
-
-// Enum value maps for OrderMessage_OrderSurface.
-var (
-	OrderMessage_OrderSurface_name = map[int32]string{
-		1: "CATALOG",
-	}
-	OrderMessage_OrderSurface_value = map[string]int32{
-		"CATALOG": 1,
-	}
-)
-
-func (x OrderMessage_OrderSurface) Enum() *OrderMessage_OrderSurface {
-	p := new(OrderMessage_OrderSurface)
-	*p = x
-	return p
-}
-
-func (x OrderMessage_OrderSurface) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (OrderMessage_OrderSurface) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[5].Descriptor()
-}
-
-func (OrderMessage_OrderSurface) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[5]
-}
-
-func (x OrderMessage_OrderSurface) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Do not use.
-func (x *OrderMessage_OrderSurface) UnmarshalJSON(b []byte) error {
-	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
-	if err != nil {
-		return err
-	}
-	*x = OrderMessage_OrderSurface(num)
-	return nil
-}
-
-// Deprecated: Use OrderMessage_OrderSurface.Descriptor instead.
-func (OrderMessage_OrderSurface) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{8, 0}
-}
-
-type OrderMessage_OrderStatus int32
-
-const (
-	OrderMessage_INQUIRY OrderMessage_OrderStatus = 1
-)
-
-// Enum value maps for OrderMessage_OrderStatus.
-var (
-	OrderMessage_OrderStatus_name = map[int32]string{
-		1: "INQUIRY",
-	}
-	OrderMessage_OrderStatus_value = map[string]int32{
-		"INQUIRY": 1,
-	}
-)
-
-func (x OrderMessage_OrderStatus) Enum() *OrderMessage_OrderStatus {
-	p := new(OrderMessage_OrderStatus)
-	*p = x
-	return p
-}
-
-func (x OrderMessage_OrderStatus) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (OrderMessage_OrderStatus) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[6].Descriptor()
-}
-
-func (OrderMessage_OrderStatus) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[6]
-}
-
-func (x OrderMessage_OrderStatus) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Do not use.
-func (x *OrderMessage_OrderStatus) UnmarshalJSON(b []byte) error {
-	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
-	if err != nil {
-		return err
-	}
-	*x = OrderMessage_OrderStatus(num)
-	return nil
-}
-
-// Deprecated: Use OrderMessage_OrderStatus.Descriptor instead.
-func (OrderMessage_OrderStatus) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{8, 1}
-}
-
 type ListResponseMessage_ListType int32
 
 const (
@@ -504,11 +410,11 @@ func (x ListResponseMessage_ListType) String() string {
 }
 
 func (ListResponseMessage_ListType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[7].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[5].Descriptor()
 }
 
 func (ListResponseMessage_ListType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[7]
+	return &file_binary_proto_def_proto_enumTypes[5]
 }
 
 func (x ListResponseMessage_ListType) Number() protoreflect.EnumNumber {
@@ -527,7 +433,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{11, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{7, 0}
 }
 
 type ListMessage_ListType int32
@@ -563,11 +469,11 @@ func (x ListMessage_ListType) String() string {
 }
 
 func (ListMessage_ListType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[8].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[6].Descriptor()
 }
 
 func (ListMessage_ListType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[8]
+	return &file_binary_proto_def_proto_enumTypes[6]
 }
 
 func (x ListMessage_ListType) Number() protoreflect.EnumNumber {
@@ -586,7 +492,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{12, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{8, 0}
 }
 
 type InvoiceMessage_AttachmentType int32
@@ -619,11 +525,11 @@ func (x InvoiceMessage_AttachmentType) String() string {
 }
 
 func (InvoiceMessage_AttachmentType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[9].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[7].Descriptor()
 }
 
 func (InvoiceMessage_AttachmentType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[9]
+	return &file_binary_proto_def_proto_enumTypes[7]
 }
 
 func (x InvoiceMessage_AttachmentType) Number() protoreflect.EnumNumber {
@@ -642,7 +548,63 @@ 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{14, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{10, 0}
+}
+
+type InteractiveResponseMessage_Body_Format int32
+
+const (
+	InteractiveResponseMessage_Body_DEFAULT      InteractiveResponseMessage_Body_Format = 0
+	InteractiveResponseMessage_Body_EXTENSIONS_1 InteractiveResponseMessage_Body_Format = 1
+)
+
+// Enum value maps for InteractiveResponseMessage_Body_Format.
+var (
+	InteractiveResponseMessage_Body_Format_name = map[int32]string{
+		0: "DEFAULT",
+		1: "EXTENSIONS_1",
+	}
+	InteractiveResponseMessage_Body_Format_value = map[string]int32{
+		"DEFAULT":      0,
+		"EXTENSIONS_1": 1,
+	}
+)
+
+func (x InteractiveResponseMessage_Body_Format) Enum() *InteractiveResponseMessage_Body_Format {
+	p := new(InteractiveResponseMessage_Body_Format)
+	*p = x
+	return p
+}
+
+func (x InteractiveResponseMessage_Body_Format) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (InteractiveResponseMessage_Body_Format) Descriptor() protoreflect.EnumDescriptor {
+	return file_binary_proto_def_proto_enumTypes[8].Descriptor()
+}
+
+func (InteractiveResponseMessage_Body_Format) Type() protoreflect.EnumType {
+	return &file_binary_proto_def_proto_enumTypes[8]
+}
+
+func (x InteractiveResponseMessage_Body_Format) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *InteractiveResponseMessage_Body_Format) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = InteractiveResponseMessage_Body_Format(num)
+	return nil
+}
+
+// Deprecated: Use InteractiveResponseMessage_Body_Format.Descriptor instead.
+func (InteractiveResponseMessage_Body_Format) EnumDescriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{11, 1, 0}
 }
 
 type InteractiveMessage_ShopMessage_Surface int32
@@ -681,11 +643,11 @@ func (x InteractiveMessage_ShopMessage_Surface) String() string {
 }
 
 func (InteractiveMessage_ShopMessage_Surface) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[10].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[9].Descriptor()
 }
 
 func (InteractiveMessage_ShopMessage_Surface) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[10]
+	return &file_binary_proto_def_proto_enumTypes[9]
 }
 
 func (x InteractiveMessage_ShopMessage_Surface) Number() protoreflect.EnumNumber {
@@ -704,7 +666,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{16, 0, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{12, 0, 0}
 }
 
 type HistorySyncNotification_HistorySyncType int32
@@ -752,11 +714,11 @@ func (x HistorySyncNotification_HistorySyncType) String() string {
 }
 
 func (HistorySyncNotification_HistorySyncType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[11].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[10].Descriptor()
 }
 
 func (HistorySyncNotification_HistorySyncType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[11]
+	return &file_binary_proto_def_proto_enumTypes[10]
 }
 
 func (x HistorySyncNotification_HistorySyncType) Number() protoreflect.EnumNumber {
@@ -775,7 +737,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{19, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{15, 0}
 }
 
 type HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_DayOfWeekType int32
@@ -823,11 +785,11 @@ func (x HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeC
 }
 
 func (HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_DayOfWeekType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[12].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[11].Descriptor()
 }
 
 func (HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_DayOfWeekType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[12]
+	return &file_binary_proto_def_proto_enumTypes[11]
 }
 
 func (x HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_DayOfWeekType) Number() protoreflect.EnumNumber {
@@ -846,7 +808,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{20, 0, 0, 1, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{16, 0, 0, 1, 0}
 }
 
 type HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_CalendarType int32
@@ -879,11 +841,11 @@ func (x HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeC
 }
 
 func (HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_CalendarType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[13].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[12].Descriptor()
 }
 
 func (HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_CalendarType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[13]
+	return &file_binary_proto_def_proto_enumTypes[12]
 }
 
 func (x HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_CalendarType) Number() protoreflect.EnumNumber {
@@ -902,7 +864,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{20, 0, 0, 1, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{16, 0, 0, 1, 1}
 }
 
 type GroupInviteMessage_GroupType int32
@@ -935,11 +897,11 @@ func (x GroupInviteMessage_GroupType) String() string {
 }
 
 func (GroupInviteMessage_GroupType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[14].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[13].Descriptor()
 }
 
 func (GroupInviteMessage_GroupType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[14]
+	return &file_binary_proto_def_proto_enumTypes[13]
 }
 
 func (x GroupInviteMessage_GroupType) Number() protoreflect.EnumNumber {
@@ -958,7 +920,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{21, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{17, 0}
 }
 
 type ExtendedTextMessage_PreviewType int32
@@ -991,11 +953,11 @@ func (x ExtendedTextMessage_PreviewType) String() string {
 }
 
 func (ExtendedTextMessage_PreviewType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[15].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[14].Descriptor()
 }
 
 func (ExtendedTextMessage_PreviewType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[15]
+	return &file_binary_proto_def_proto_enumTypes[14]
 }
 
 func (x ExtendedTextMessage_PreviewType) Number() protoreflect.EnumNumber {
@@ -1014,7 +976,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{23, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{19, 0}
 }
 
 type ExtendedTextMessage_InviteLinkGroupType int32
@@ -1053,11 +1015,11 @@ func (x ExtendedTextMessage_InviteLinkGroupType) String() string {
 }
 
 func (ExtendedTextMessage_InviteLinkGroupType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[16].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[15].Descriptor()
 }
 
 func (ExtendedTextMessage_InviteLinkGroupType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[16]
+	return &file_binary_proto_def_proto_enumTypes[15]
 }
 
 func (x ExtendedTextMessage_InviteLinkGroupType) Number() protoreflect.EnumNumber {
@@ -1076,19 +1038,16 @@ 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{23, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{19, 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_DAMION_REGULAR        ExtendedTextMessage_FontType = 6
+	ExtendedTextMessage_SYSTEM                ExtendedTextMessage_FontType = 0
+	ExtendedTextMessage_SYSTEM_TEXT           ExtendedTextMessage_FontType = 1
+	ExtendedTextMessage_FB_SCRIPT             ExtendedTextMessage_FontType = 2
+	ExtendedTextMessage_SYSTEM_BOLD           ExtendedTextMessage_FontType = 6
 	ExtendedTextMessage_MORNINGBREEZE_REGULAR ExtendedTextMessage_FontType = 7
 	ExtendedTextMessage_CALISTOGA_REGULAR     ExtendedTextMessage_FontType = 8
 	ExtendedTextMessage_EXO2_EXTRABOLD        ExtendedTextMessage_FontType = 9
@@ -1098,26 +1057,20 @@ const (
 // 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",
-		6:  "DAMION_REGULAR",
+		0:  "SYSTEM",
+		1:  "SYSTEM_TEXT",
+		2:  "FB_SCRIPT",
+		6:  "SYSTEM_BOLD",
 		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,
-		"DAMION_REGULAR":        6,
+		"SYSTEM":                0,
+		"SYSTEM_TEXT":           1,
+		"FB_SCRIPT":             2,
+		"SYSTEM_BOLD":           6,
 		"MORNINGBREEZE_REGULAR": 7,
 		"CALISTOGA_REGULAR":     8,
 		"EXO2_EXTRABOLD":        9,
@@ -1136,11 +1089,11 @@ func (x ExtendedTextMessage_FontType) String() string {
 }
 
 func (ExtendedTextMessage_FontType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[17].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[16].Descriptor()
 }
 
 func (ExtendedTextMessage_FontType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[17]
+	return &file_binary_proto_def_proto_enumTypes[16]
 }
 
 func (x ExtendedTextMessage_FontType) Number() protoreflect.EnumNumber {
@@ -1159,7 +1112,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{23, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{19, 2}
 }
 
 type ButtonsResponseMessage_Type int32
@@ -1192,11 +1145,11 @@ func (x ButtonsResponseMessage_Type) String() string {
 }
 
 func (ButtonsResponseMessage_Type) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[18].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[17].Descriptor()
 }
 
 func (ButtonsResponseMessage_Type) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[18]
+	return &file_binary_proto_def_proto_enumTypes[17]
 }
 
 func (x ButtonsResponseMessage_Type) Number() protoreflect.EnumNumber {
@@ -1215,7 +1168,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{33, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{30, 0}
 }
 
 type ButtonsMessage_HeaderType int32
@@ -1263,11 +1216,11 @@ func (x ButtonsMessage_HeaderType) String() string {
 }
 
 func (ButtonsMessage_HeaderType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[19].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[18].Descriptor()
 }
 
 func (ButtonsMessage_HeaderType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[19]
+	return &file_binary_proto_def_proto_enumTypes[18]
 }
 
 func (x ButtonsMessage_HeaderType) Number() protoreflect.EnumNumber {
@@ -1286,7 +1239,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{34, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{31, 0}
 }
 
 type ButtonsMessage_Button_Type int32
@@ -1322,11 +1275,11 @@ func (x ButtonsMessage_Button_Type) String() string {
 }
 
 func (ButtonsMessage_Button_Type) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[20].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[19].Descriptor()
 }
 
 func (ButtonsMessage_Button_Type) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[20]
+	return &file_binary_proto_def_proto_enumTypes[19]
 }
 
 func (x ButtonsMessage_Button_Type) Number() protoreflect.EnumNumber {
@@ -1345,7 +1298,140 @@ 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{34, 0, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{31, 0, 0}
+}
+
+type BotFeedbackMessage_BotFeedbackKind int32
+
+const (
+	BotFeedbackMessage_BOT_FEEDBACK_POSITIVE             BotFeedbackMessage_BotFeedbackKind = 0
+	BotFeedbackMessage_BOT_FEEDBACK_NEGATIVE_GENERIC     BotFeedbackMessage_BotFeedbackKind = 1
+	BotFeedbackMessage_BOT_FEEDBACK_NEGATIVE_HELPFUL     BotFeedbackMessage_BotFeedbackKind = 2
+	BotFeedbackMessage_BOT_FEEDBACK_NEGATIVE_INTERESTING BotFeedbackMessage_BotFeedbackKind = 3
+	BotFeedbackMessage_BOT_FEEDBACK_NEGATIVE_ACCURATE    BotFeedbackMessage_BotFeedbackKind = 4
+	BotFeedbackMessage_BOT_FEEDBACK_NEGATIVE_SAFE        BotFeedbackMessage_BotFeedbackKind = 5
+	BotFeedbackMessage_BOT_FEEDBACK_NEGATIVE_OTHER       BotFeedbackMessage_BotFeedbackKind = 6
+)
+
+// Enum value maps for BotFeedbackMessage_BotFeedbackKind.
+var (
+	BotFeedbackMessage_BotFeedbackKind_name = map[int32]string{
+		0: "BOT_FEEDBACK_POSITIVE",
+		1: "BOT_FEEDBACK_NEGATIVE_GENERIC",
+		2: "BOT_FEEDBACK_NEGATIVE_HELPFUL",
+		3: "BOT_FEEDBACK_NEGATIVE_INTERESTING",
+		4: "BOT_FEEDBACK_NEGATIVE_ACCURATE",
+		5: "BOT_FEEDBACK_NEGATIVE_SAFE",
+		6: "BOT_FEEDBACK_NEGATIVE_OTHER",
+	}
+	BotFeedbackMessage_BotFeedbackKind_value = map[string]int32{
+		"BOT_FEEDBACK_POSITIVE":             0,
+		"BOT_FEEDBACK_NEGATIVE_GENERIC":     1,
+		"BOT_FEEDBACK_NEGATIVE_HELPFUL":     2,
+		"BOT_FEEDBACK_NEGATIVE_INTERESTING": 3,
+		"BOT_FEEDBACK_NEGATIVE_ACCURATE":    4,
+		"BOT_FEEDBACK_NEGATIVE_SAFE":        5,
+		"BOT_FEEDBACK_NEGATIVE_OTHER":       6,
+	}
+)
+
+func (x BotFeedbackMessage_BotFeedbackKind) Enum() *BotFeedbackMessage_BotFeedbackKind {
+	p := new(BotFeedbackMessage_BotFeedbackKind)
+	*p = x
+	return p
+}
+
+func (x BotFeedbackMessage_BotFeedbackKind) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (BotFeedbackMessage_BotFeedbackKind) Descriptor() protoreflect.EnumDescriptor {
+	return file_binary_proto_def_proto_enumTypes[20].Descriptor()
+}
+
+func (BotFeedbackMessage_BotFeedbackKind) Type() protoreflect.EnumType {
+	return &file_binary_proto_def_proto_enumTypes[20]
+}
+
+func (x BotFeedbackMessage_BotFeedbackKind) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *BotFeedbackMessage_BotFeedbackKind) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = BotFeedbackMessage_BotFeedbackKind(num)
+	return nil
+}
+
+// Deprecated: Use BotFeedbackMessage_BotFeedbackKind.Descriptor instead.
+func (BotFeedbackMessage_BotFeedbackKind) EnumDescriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{32, 0}
+}
+
+type DisappearingMode_Trigger int32
+
+const (
+	DisappearingMode_UNKNOWN         DisappearingMode_Trigger = 0
+	DisappearingMode_CHAT_SETTING    DisappearingMode_Trigger = 1
+	DisappearingMode_ACCOUNT_SETTING DisappearingMode_Trigger = 2
+	DisappearingMode_BULK_CHANGE     DisappearingMode_Trigger = 3
+)
+
+// Enum value maps for DisappearingMode_Trigger.
+var (
+	DisappearingMode_Trigger_name = map[int32]string{
+		0: "UNKNOWN",
+		1: "CHAT_SETTING",
+		2: "ACCOUNT_SETTING",
+		3: "BULK_CHANGE",
+	}
+	DisappearingMode_Trigger_value = map[string]int32{
+		"UNKNOWN":         0,
+		"CHAT_SETTING":    1,
+		"ACCOUNT_SETTING": 2,
+		"BULK_CHANGE":     3,
+	}
+)
+
+func (x DisappearingMode_Trigger) Enum() *DisappearingMode_Trigger {
+	p := new(DisappearingMode_Trigger)
+	*p = x
+	return p
+}
+
+func (x DisappearingMode_Trigger) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (DisappearingMode_Trigger) Descriptor() protoreflect.EnumDescriptor {
+	return file_binary_proto_def_proto_enumTypes[21].Descriptor()
+}
+
+func (DisappearingMode_Trigger) Type() protoreflect.EnumType {
+	return &file_binary_proto_def_proto_enumTypes[21]
+}
+
+func (x DisappearingMode_Trigger) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *DisappearingMode_Trigger) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = DisappearingMode_Trigger(num)
+	return nil
+}
+
+// Deprecated: Use DisappearingMode_Trigger.Descriptor instead.
+func (DisappearingMode_Trigger) EnumDescriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{45, 0}
 }
 
 type DisappearingMode_Initiator int32
@@ -1381,11 +1467,11 @@ func (x DisappearingMode_Initiator) String() string {
 }
 
 func (DisappearingMode_Initiator) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[21].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[22].Descriptor()
 }
 
 func (DisappearingMode_Initiator) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[21]
+	return &file_binary_proto_def_proto_enumTypes[22]
 }
 
 func (x DisappearingMode_Initiator) Number() protoreflect.EnumNumber {
@@ -1404,7 +1490,7 @@ func (x *DisappearingMode_Initiator) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use DisappearingMode_Initiator.Descriptor instead.
 func (DisappearingMode_Initiator) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{47, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{45, 1}
 }
 
 type ContextInfo_ExternalAdReplyInfo_MediaType int32
@@ -1440,11 +1526,11 @@ func (x ContextInfo_ExternalAdReplyInfo_MediaType) String() string {
 }
 
 func (ContextInfo_ExternalAdReplyInfo_MediaType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[22].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[23].Descriptor()
 }
 
 func (ContextInfo_ExternalAdReplyInfo_MediaType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[22]
+	return &file_binary_proto_def_proto_enumTypes[23]
 }
 
 func (x ContextInfo_ExternalAdReplyInfo_MediaType) Number() protoreflect.EnumNumber {
@@ -1463,7 +1549,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, 1, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{47, 2, 0}
 }
 
 type ContextInfo_AdReplyInfo_MediaType int32
@@ -1499,11 +1585,11 @@ func (x ContextInfo_AdReplyInfo_MediaType) String() string {
 }
 
 func (ContextInfo_AdReplyInfo_MediaType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[23].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[24].Descriptor()
 }
 
 func (ContextInfo_AdReplyInfo_MediaType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[23]
+	return &file_binary_proto_def_proto_enumTypes[24]
 }
 
 func (x ContextInfo_AdReplyInfo_MediaType) Number() protoreflect.EnumNumber {
@@ -1522,7 +1608,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, 2, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{47, 4, 0}
 }
 
 type PaymentBackground_Type int32
@@ -1555,11 +1641,11 @@ func (x PaymentBackground_Type) String() string {
 }
 
 func (PaymentBackground_Type) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[24].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[25].Descriptor()
 }
 
 func (PaymentBackground_Type) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[24]
+	return &file_binary_proto_def_proto_enumTypes[25]
 }
 
 func (x PaymentBackground_Type) Number() protoreflect.EnumNumber {
@@ -1578,7 +1664,7 @@ func (x *PaymentBackground_Type) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use PaymentBackground_Type.Descriptor instead.
 func (PaymentBackground_Type) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{53, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{54, 0}
 }
 
 type VideoMessage_Attribution int32
@@ -1614,11 +1700,11 @@ func (x VideoMessage_Attribution) String() string {
 }
 
 func (VideoMessage_Attribution) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[25].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[26].Descriptor()
 }
 
 func (VideoMessage_Attribution) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[25]
+	return &file_binary_proto_def_proto_enumTypes[26]
 }
 
 func (x VideoMessage_Attribution) Number() protoreflect.EnumNumber {
@@ -1637,7 +1723,7 @@ func (x *VideoMessage_Attribution) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use VideoMessage_Attribution.Descriptor instead.
 func (VideoMessage_Attribution) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{57, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{59, 0}
 }
 
 type ScheduledCallEditMessage_EditType int32
@@ -1670,11 +1756,11 @@ func (x ScheduledCallEditMessage_EditType) String() string {
 }
 
 func (ScheduledCallEditMessage_EditType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[26].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[27].Descriptor()
 }
 
 func (ScheduledCallEditMessage_EditType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[26]
+	return &file_binary_proto_def_proto_enumTypes[27]
 }
 
 func (x ScheduledCallEditMessage_EditType) Number() protoreflect.EnumNumber {
@@ -1693,7 +1779,7 @@ func (x *ScheduledCallEditMessage_EditType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use ScheduledCallEditMessage_EditType.Descriptor instead.
 func (ScheduledCallEditMessage_EditType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{64, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{66, 0}
 }
 
 type ScheduledCallCreationMessage_CallType int32
@@ -1729,11 +1815,11 @@ func (x ScheduledCallCreationMessage_CallType) String() string {
 }
 
 func (ScheduledCallCreationMessage_CallType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[27].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[28].Descriptor()
 }
 
 func (ScheduledCallCreationMessage_CallType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[27]
+	return &file_binary_proto_def_proto_enumTypes[28]
 }
 
 func (x ScheduledCallCreationMessage_CallType) Number() protoreflect.EnumNumber {
@@ -1752,7 +1838,7 @@ func (x *ScheduledCallCreationMessage_CallType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use ScheduledCallCreationMessage_CallType.Descriptor instead.
 func (ScheduledCallCreationMessage_CallType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{65, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{67, 0}
 }
 
 type ProtocolMessage_Type int32
@@ -1771,6 +1857,8 @@ const (
 	ProtocolMessage_MESSAGE_EDIT                                 ProtocolMessage_Type = 14
 	ProtocolMessage_PEER_DATA_OPERATION_REQUEST_MESSAGE          ProtocolMessage_Type = 16
 	ProtocolMessage_PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE ProtocolMessage_Type = 17
+	ProtocolMessage_REQUEST_WELCOME_MESSAGE                      ProtocolMessage_Type = 18
+	ProtocolMessage_BOT_FEEDBACK_MESSAGE                         ProtocolMessage_Type = 19
 )
 
 // Enum value maps for ProtocolMessage_Type.
@@ -1789,6 +1877,8 @@ var (
 		14: "MESSAGE_EDIT",
 		16: "PEER_DATA_OPERATION_REQUEST_MESSAGE",
 		17: "PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE",
+		18: "REQUEST_WELCOME_MESSAGE",
+		19: "BOT_FEEDBACK_MESSAGE",
 	}
 	ProtocolMessage_Type_value = map[string]int32{
 		"REVOKE":                                       0,
@@ -1804,6 +1894,8 @@ var (
 		"MESSAGE_EDIT":                                 14,
 		"PEER_DATA_OPERATION_REQUEST_MESSAGE":          16,
 		"PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE": 17,
+		"REQUEST_WELCOME_MESSAGE":                      18,
+		"BOT_FEEDBACK_MESSAGE":                         19,
 	}
 )
 
@@ -1818,11 +1910,11 @@ func (x ProtocolMessage_Type) String() string {
 }
 
 func (ProtocolMessage_Type) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[28].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[29].Descriptor()
 }
 
 func (ProtocolMessage_Type) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[28]
+	return &file_binary_proto_def_proto_enumTypes[29]
 }
 
 func (x ProtocolMessage_Type) Number() protoreflect.EnumNumber {
@@ -1841,66 +1933,234 @@ 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{69, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{71, 0}
 }
 
-type PinMessage_PinMessageType int32
+type PinInChatMessage_Type int32
 
 const (
-	PinMessage_UNKNOWN_PIN_MESSAGE_TYPE PinMessage_PinMessageType = 0
-	PinMessage_PIN_FOR_ALL              PinMessage_PinMessageType = 1
-	PinMessage_UNPIN_FOR_ALL            PinMessage_PinMessageType = 2
+	PinInChatMessage_UNKNOWN_TYPE  PinInChatMessage_Type = 0
+	PinInChatMessage_PIN_FOR_ALL   PinInChatMessage_Type = 1
+	PinInChatMessage_UNPIN_FOR_ALL PinInChatMessage_Type = 2
 )
 
-// Enum value maps for PinMessage_PinMessageType.
+// Enum value maps for PinInChatMessage_Type.
 var (
-	PinMessage_PinMessageType_name = map[int32]string{
-		0: "UNKNOWN_PIN_MESSAGE_TYPE",
+	PinInChatMessage_Type_name = map[int32]string{
+		0: "UNKNOWN_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,
+	PinInChatMessage_Type_value = map[string]int32{
+		"UNKNOWN_TYPE":  0,
+		"PIN_FOR_ALL":   1,
+		"UNPIN_FOR_ALL": 2,
 	}
 )
 
-func (x PinMessage_PinMessageType) Enum() *PinMessage_PinMessageType {
-	p := new(PinMessage_PinMessageType)
+func (x PinInChatMessage_Type) Enum() *PinInChatMessage_Type {
+	p := new(PinInChatMessage_Type)
 	*p = x
 	return p
 }
 
-func (x PinMessage_PinMessageType) String() string {
+func (x PinInChatMessage_Type) 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 (PinInChatMessage_Type) Descriptor() protoreflect.EnumDescriptor {
+	return file_binary_proto_def_proto_enumTypes[30].Descriptor()
 }
 
-func (PinMessage_PinMessageType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[29]
+func (PinInChatMessage_Type) Type() protoreflect.EnumType {
+	return &file_binary_proto_def_proto_enumTypes[30]
 }
 
-func (x PinMessage_PinMessageType) Number() protoreflect.EnumNumber {
+func (x PinInChatMessage_Type) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
 // Deprecated: Do not use.
-func (x *PinMessage_PinMessageType) UnmarshalJSON(b []byte) error {
+func (x *PinInChatMessage_Type) UnmarshalJSON(b []byte) error {
 	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
 	if err != nil {
 		return err
 	}
-	*x = PinMessage_PinMessageType(num)
+	*x = PinInChatMessage_Type(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}
+// Deprecated: Use PinInChatMessage_Type.Descriptor instead.
+func (PinInChatMessage_Type) EnumDescriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{78, 0}
+}
+
+type PaymentInviteMessage_ServiceType int32
+
+const (
+	PaymentInviteMessage_UNKNOWN PaymentInviteMessage_ServiceType = 0
+	PaymentInviteMessage_FBPAY   PaymentInviteMessage_ServiceType = 1
+	PaymentInviteMessage_NOVI    PaymentInviteMessage_ServiceType = 2
+	PaymentInviteMessage_UPI     PaymentInviteMessage_ServiceType = 3
+)
+
+// Enum value maps for PaymentInviteMessage_ServiceType.
+var (
+	PaymentInviteMessage_ServiceType_name = map[int32]string{
+		0: "UNKNOWN",
+		1: "FBPAY",
+		2: "NOVI",
+		3: "UPI",
+	}
+	PaymentInviteMessage_ServiceType_value = map[string]int32{
+		"UNKNOWN": 0,
+		"FBPAY":   1,
+		"NOVI":    2,
+		"UPI":     3,
+	}
+)
+
+func (x PaymentInviteMessage_ServiceType) Enum() *PaymentInviteMessage_ServiceType {
+	p := new(PaymentInviteMessage_ServiceType)
+	*p = x
+	return p
+}
+
+func (x PaymentInviteMessage_ServiceType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (PaymentInviteMessage_ServiceType) Descriptor() protoreflect.EnumDescriptor {
+	return file_binary_proto_def_proto_enumTypes[31].Descriptor()
+}
+
+func (PaymentInviteMessage_ServiceType) Type() protoreflect.EnumType {
+	return &file_binary_proto_def_proto_enumTypes[31]
+}
+
+func (x PaymentInviteMessage_ServiceType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *PaymentInviteMessage_ServiceType) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = PaymentInviteMessage_ServiceType(num)
+	return nil
+}
+
+// Deprecated: Use PaymentInviteMessage_ServiceType.Descriptor instead.
+func (PaymentInviteMessage_ServiceType) EnumDescriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{81, 0}
+}
+
+type OrderMessage_OrderSurface int32
+
+const (
+	OrderMessage_CATALOG OrderMessage_OrderSurface = 1
+)
+
+// Enum value maps for OrderMessage_OrderSurface.
+var (
+	OrderMessage_OrderSurface_name = map[int32]string{
+		1: "CATALOG",
+	}
+	OrderMessage_OrderSurface_value = map[string]int32{
+		"CATALOG": 1,
+	}
+)
+
+func (x OrderMessage_OrderSurface) Enum() *OrderMessage_OrderSurface {
+	p := new(OrderMessage_OrderSurface)
+	*p = x
+	return p
+}
+
+func (x OrderMessage_OrderSurface) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (OrderMessage_OrderSurface) Descriptor() protoreflect.EnumDescriptor {
+	return file_binary_proto_def_proto_enumTypes[32].Descriptor()
+}
+
+func (OrderMessage_OrderSurface) Type() protoreflect.EnumType {
+	return &file_binary_proto_def_proto_enumTypes[32]
+}
+
+func (x OrderMessage_OrderSurface) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *OrderMessage_OrderSurface) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = OrderMessage_OrderSurface(num)
+	return nil
+}
+
+// Deprecated: Use OrderMessage_OrderSurface.Descriptor instead.
+func (OrderMessage_OrderSurface) EnumDescriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{82, 0}
+}
+
+type OrderMessage_OrderStatus int32
+
+const (
+	OrderMessage_INQUIRY OrderMessage_OrderStatus = 1
+)
+
+// Enum value maps for OrderMessage_OrderStatus.
+var (
+	OrderMessage_OrderStatus_name = map[int32]string{
+		1: "INQUIRY",
+	}
+	OrderMessage_OrderStatus_value = map[string]int32{
+		"INQUIRY": 1,
+	}
+)
+
+func (x OrderMessage_OrderStatus) Enum() *OrderMessage_OrderStatus {
+	p := new(OrderMessage_OrderStatus)
+	*p = x
+	return p
+}
+
+func (x OrderMessage_OrderStatus) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (OrderMessage_OrderStatus) Descriptor() protoreflect.EnumDescriptor {
+	return file_binary_proto_def_proto_enumTypes[33].Descriptor()
+}
+
+func (OrderMessage_OrderStatus) Type() protoreflect.EnumType {
+	return &file_binary_proto_def_proto_enumTypes[33]
+}
+
+func (x OrderMessage_OrderStatus) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *OrderMessage_OrderStatus) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = OrderMessage_OrderStatus(num)
+	return nil
+}
+
+// Deprecated: Use OrderMessage_OrderStatus.Descriptor instead.
+func (OrderMessage_OrderStatus) EnumDescriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{82, 1}
 }
 
 type PastParticipant_LeaveReason int32
@@ -1933,11 +2193,11 @@ func (x PastParticipant_LeaveReason) String() string {
 }
 
 func (PastParticipant_LeaveReason) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[30].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[34].Descriptor()
 }
 
 func (PastParticipant_LeaveReason) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[30]
+	return &file_binary_proto_def_proto_enumTypes[34]
 }
 
 func (x PastParticipant_LeaveReason) Number() protoreflect.EnumNumber {
@@ -1956,7 +2216,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{83, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{89, 0}
 }
 
 type HistorySync_HistorySyncType int32
@@ -2004,11 +2264,11 @@ func (x HistorySync_HistorySyncType) String() string {
 }
 
 func (HistorySync_HistorySyncType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[31].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[35].Descriptor()
 }
 
 func (HistorySync_HistorySyncType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[31]
+	return &file_binary_proto_def_proto_enumTypes[35]
 }
 
 func (x HistorySync_HistorySyncType) Number() protoreflect.EnumNumber {
@@ -2027,7 +2287,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{84, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{91, 0}
 }
 
 type GroupParticipant_Rank int32
@@ -2063,11 +2323,11 @@ func (x GroupParticipant_Rank) String() string {
 }
 
 func (GroupParticipant_Rank) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[32].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[36].Descriptor()
 }
 
 func (GroupParticipant_Rank) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[32]
+	return &file_binary_proto_def_proto_enumTypes[36]
 }
 
 func (x GroupParticipant_Rank) Number() protoreflect.EnumNumber {
@@ -2086,14 +2346,15 @@ 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{86, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{93, 0}
 }
 
 type Conversation_EndOfHistoryTransferType int32
 
 const (
-	Conversation_COMPLETE_BUT_MORE_MESSAGES_REMAIN_ON_PRIMARY   Conversation_EndOfHistoryTransferType = 0
-	Conversation_COMPLETE_AND_NO_MORE_MESSAGE_REMAIN_ON_PRIMARY Conversation_EndOfHistoryTransferType = 1
+	Conversation_COMPLETE_BUT_MORE_MESSAGES_REMAIN_ON_PRIMARY           Conversation_EndOfHistoryTransferType = 0
+	Conversation_COMPLETE_AND_NO_MORE_MESSAGE_REMAIN_ON_PRIMARY         Conversation_EndOfHistoryTransferType = 1
+	Conversation_COMPLETE_ON_DEMAND_SYNC_BUT_MORE_MSG_REMAIN_ON_PRIMARY Conversation_EndOfHistoryTransferType = 2
 )
 
 // Enum value maps for Conversation_EndOfHistoryTransferType.
@@ -2101,10 +2362,12 @@ var (
 	Conversation_EndOfHistoryTransferType_name = map[int32]string{
 		0: "COMPLETE_BUT_MORE_MESSAGES_REMAIN_ON_PRIMARY",
 		1: "COMPLETE_AND_NO_MORE_MESSAGE_REMAIN_ON_PRIMARY",
+		2: "COMPLETE_ON_DEMAND_SYNC_BUT_MORE_MSG_REMAIN_ON_PRIMARY",
 	}
 	Conversation_EndOfHistoryTransferType_value = map[string]int32{
-		"COMPLETE_BUT_MORE_MESSAGES_REMAIN_ON_PRIMARY":   0,
-		"COMPLETE_AND_NO_MORE_MESSAGE_REMAIN_ON_PRIMARY": 1,
+		"COMPLETE_BUT_MORE_MESSAGES_REMAIN_ON_PRIMARY":           0,
+		"COMPLETE_AND_NO_MORE_MESSAGE_REMAIN_ON_PRIMARY":         1,
+		"COMPLETE_ON_DEMAND_SYNC_BUT_MORE_MSG_REMAIN_ON_PRIMARY": 2,
 	}
 )
 
@@ -2119,11 +2382,11 @@ func (x Conversation_EndOfHistoryTransferType) String() string {
 }
 
 func (Conversation_EndOfHistoryTransferType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[33].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[37].Descriptor()
 }
 
 func (Conversation_EndOfHistoryTransferType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[33]
+	return &file_binary_proto_def_proto_enumTypes[37]
 }
 
 func (x Conversation_EndOfHistoryTransferType) Number() protoreflect.EnumNumber {
@@ -2142,7 +2405,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{88, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{95, 0}
 }
 
 type MediaRetryNotification_ResultType int32
@@ -2181,11 +2444,11 @@ func (x MediaRetryNotification_ResultType) String() string {
 }
 
 func (MediaRetryNotification_ResultType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[34].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[38].Descriptor()
 }
 
 func (MediaRetryNotification_ResultType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[34]
+	return &file_binary_proto_def_proto_enumTypes[38]
 }
 
 func (x MediaRetryNotification_ResultType) Number() protoreflect.EnumNumber {
@@ -2204,7 +2467,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{94, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{99, 0}
 }
 
 type SyncdMutation_SyncdOperation int32
@@ -2237,11 +2500,11 @@ func (x SyncdMutation_SyncdOperation) String() string {
 }
 
 func (SyncdMutation_SyncdOperation) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[35].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[39].Descriptor()
 }
 
 func (SyncdMutation_SyncdOperation) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[35]
+	return &file_binary_proto_def_proto_enumTypes[39]
 }
 
 func (x SyncdMutation_SyncdOperation) Number() protoreflect.EnumNumber {
@@ -2260,7 +2523,60 @@ 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{102, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{107, 0}
+}
+
+type MarketingMessageAction_MarketingMessagePrototypeType int32
+
+const (
+	MarketingMessageAction_PERSONALIZED MarketingMessageAction_MarketingMessagePrototypeType = 0
+)
+
+// Enum value maps for MarketingMessageAction_MarketingMessagePrototypeType.
+var (
+	MarketingMessageAction_MarketingMessagePrototypeType_name = map[int32]string{
+		0: "PERSONALIZED",
+	}
+	MarketingMessageAction_MarketingMessagePrototypeType_value = map[string]int32{
+		"PERSONALIZED": 0,
+	}
+)
+
+func (x MarketingMessageAction_MarketingMessagePrototypeType) Enum() *MarketingMessageAction_MarketingMessagePrototypeType {
+	p := new(MarketingMessageAction_MarketingMessagePrototypeType)
+	*p = x
+	return p
+}
+
+func (x MarketingMessageAction_MarketingMessagePrototypeType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (MarketingMessageAction_MarketingMessagePrototypeType) Descriptor() protoreflect.EnumDescriptor {
+	return file_binary_proto_def_proto_enumTypes[40].Descriptor()
+}
+
+func (MarketingMessageAction_MarketingMessagePrototypeType) Type() protoreflect.EnumType {
+	return &file_binary_proto_def_proto_enumTypes[40]
+}
+
+func (x MarketingMessageAction_MarketingMessagePrototypeType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *MarketingMessageAction_MarketingMessagePrototypeType) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = MarketingMessageAction_MarketingMessagePrototypeType(num)
+	return nil
+}
+
+// Deprecated: Use MarketingMessageAction_MarketingMessagePrototypeType.Descriptor instead.
+func (MarketingMessageAction_MarketingMessagePrototypeType) EnumDescriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{134, 0}
 }
 
 type BizIdentityInfo_VerifiedLevelValue int32
@@ -2296,11 +2612,11 @@ func (x BizIdentityInfo_VerifiedLevelValue) String() string {
 }
 
 func (BizIdentityInfo_VerifiedLevelValue) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[36].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[41].Descriptor()
 }
 
 func (BizIdentityInfo_VerifiedLevelValue) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[36]
+	return &file_binary_proto_def_proto_enumTypes[41]
 }
 
 func (x BizIdentityInfo_VerifiedLevelValue) Number() protoreflect.EnumNumber {
@@ -2319,7 +2635,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{145, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{154, 0}
 }
 
 type BizIdentityInfo_HostStorageType int32
@@ -2352,11 +2668,11 @@ func (x BizIdentityInfo_HostStorageType) String() string {
 }
 
 func (BizIdentityInfo_HostStorageType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[37].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[42].Descriptor()
 }
 
 func (BizIdentityInfo_HostStorageType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[37]
+	return &file_binary_proto_def_proto_enumTypes[42]
 }
 
 func (x BizIdentityInfo_HostStorageType) Number() protoreflect.EnumNumber {
@@ -2375,7 +2691,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{145, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{154, 1}
 }
 
 type BizIdentityInfo_ActualActorsType int32
@@ -2408,11 +2724,11 @@ func (x BizIdentityInfo_ActualActorsType) String() string {
 }
 
 func (BizIdentityInfo_ActualActorsType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[38].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[43].Descriptor()
 }
 
 func (BizIdentityInfo_ActualActorsType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[38]
+	return &file_binary_proto_def_proto_enumTypes[43]
 }
 
 func (x BizIdentityInfo_ActualActorsType) Number() protoreflect.EnumNumber {
@@ -2431,7 +2747,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{145, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{154, 2}
 }
 
 type BizAccountLinkInfo_HostStorageType int32
@@ -2464,11 +2780,11 @@ func (x BizAccountLinkInfo_HostStorageType) String() string {
 }
 
 func (BizAccountLinkInfo_HostStorageType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[39].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[44].Descriptor()
 }
 
 func (BizAccountLinkInfo_HostStorageType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[39]
+	return &file_binary_proto_def_proto_enumTypes[44]
 }
 
 func (x BizAccountLinkInfo_HostStorageType) Number() protoreflect.EnumNumber {
@@ -2487,7 +2803,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{147, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{156, 0}
 }
 
 type BizAccountLinkInfo_AccountType int32
@@ -2517,11 +2833,11 @@ func (x BizAccountLinkInfo_AccountType) String() string {
 }
 
 func (BizAccountLinkInfo_AccountType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[40].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[45].Descriptor()
 }
 
 func (BizAccountLinkInfo_AccountType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[40]
+	return &file_binary_proto_def_proto_enumTypes[45]
 }
 
 func (x BizAccountLinkInfo_AccountType) Number() protoreflect.EnumNumber {
@@ -2540,7 +2856,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{147, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{156, 1}
 }
 
 type ClientPayload_Product int32
@@ -2548,6 +2864,7 @@ type ClientPayload_Product int32
 const (
 	ClientPayload_WHATSAPP  ClientPayload_Product = 0
 	ClientPayload_MESSENGER ClientPayload_Product = 1
+	ClientPayload_INTEROP   ClientPayload_Product = 2
 )
 
 // Enum value maps for ClientPayload_Product.
@@ -2555,10 +2872,12 @@ var (
 	ClientPayload_Product_name = map[int32]string{
 		0: "WHATSAPP",
 		1: "MESSENGER",
+		2: "INTEROP",
 	}
 	ClientPayload_Product_value = map[string]int32{
 		"WHATSAPP":  0,
 		"MESSENGER": 1,
+		"INTEROP":   2,
 	}
 )
 
@@ -2573,11 +2892,11 @@ func (x ClientPayload_Product) String() string {
 }
 
 func (ClientPayload_Product) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[41].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[46].Descriptor()
 }
 
 func (ClientPayload_Product) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[41]
+	return &file_binary_proto_def_proto_enumTypes[46]
 }
 
 func (x ClientPayload_Product) Number() protoreflect.EnumNumber {
@@ -2596,7 +2915,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{152, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{161, 0}
 }
 
 type ClientPayload_IOSAppExtension int32
@@ -2632,11 +2951,11 @@ func (x ClientPayload_IOSAppExtension) String() string {
 }
 
 func (ClientPayload_IOSAppExtension) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[42].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[47].Descriptor()
 }
 
 func (ClientPayload_IOSAppExtension) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[42]
+	return &file_binary_proto_def_proto_enumTypes[47]
 }
 
 func (x ClientPayload_IOSAppExtension) Number() protoreflect.EnumNumber {
@@ -2655,7 +2974,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{152, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{161, 1}
 }
 
 type ClientPayload_ConnectType int32
@@ -2727,11 +3046,11 @@ func (x ClientPayload_ConnectType) String() string {
 }
 
 func (ClientPayload_ConnectType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[43].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[48].Descriptor()
 }
 
 func (ClientPayload_ConnectType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[43]
+	return &file_binary_proto_def_proto_enumTypes[48]
 }
 
 func (x ClientPayload_ConnectType) Number() protoreflect.EnumNumber {
@@ -2750,7 +3069,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{152, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{161, 2}
 }
 
 type ClientPayload_ConnectReason int32
@@ -2762,6 +3081,7 @@ const (
 	ClientPayload_ERROR_RECONNECT ClientPayload_ConnectReason = 3
 	ClientPayload_NETWORK_SWITCH  ClientPayload_ConnectReason = 4
 	ClientPayload_PING_RECONNECT  ClientPayload_ConnectReason = 5
+	ClientPayload_UNKNOWN         ClientPayload_ConnectReason = 6
 )
 
 // Enum value maps for ClientPayload_ConnectReason.
@@ -2773,6 +3093,7 @@ var (
 		3: "ERROR_RECONNECT",
 		4: "NETWORK_SWITCH",
 		5: "PING_RECONNECT",
+		6: "UNKNOWN",
 	}
 	ClientPayload_ConnectReason_value = map[string]int32{
 		"PUSH":            0,
@@ -2781,6 +3102,7 @@ var (
 		"ERROR_RECONNECT": 3,
 		"NETWORK_SWITCH":  4,
 		"PING_RECONNECT":  5,
+		"UNKNOWN":         6,
 	}
 )
 
@@ -2795,11 +3117,11 @@ func (x ClientPayload_ConnectReason) String() string {
 }
 
 func (ClientPayload_ConnectReason) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[44].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[49].Descriptor()
 }
 
 func (ClientPayload_ConnectReason) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[44]
+	return &file_binary_proto_def_proto_enumTypes[49]
 }
 
 func (x ClientPayload_ConnectReason) Number() protoreflect.EnumNumber {
@@ -2818,7 +3140,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{152, 3}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{161, 3}
 }
 
 type ClientPayload_WebInfo_WebSubPlatform int32
@@ -2860,11 +3182,11 @@ func (x ClientPayload_WebInfo_WebSubPlatform) String() string {
 }
 
 func (ClientPayload_WebInfo_WebSubPlatform) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[45].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[50].Descriptor()
 }
 
 func (ClientPayload_WebInfo_WebSubPlatform) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[45]
+	return &file_binary_proto_def_proto_enumTypes[50]
 }
 
 func (x ClientPayload_WebInfo_WebSubPlatform) Number() protoreflect.EnumNumber {
@@ -2883,7 +3205,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{152, 0, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{161, 0, 0}
 }
 
 type ClientPayload_UserAgent_ReleaseChannel int32
@@ -2922,11 +3244,11 @@ func (x ClientPayload_UserAgent_ReleaseChannel) String() string {
 }
 
 func (ClientPayload_UserAgent_ReleaseChannel) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[46].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[51].Descriptor()
 }
 
 func (ClientPayload_UserAgent_ReleaseChannel) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[46]
+	return &file_binary_proto_def_proto_enumTypes[51]
 }
 
 func (x ClientPayload_UserAgent_ReleaseChannel) Number() protoreflect.EnumNumber {
@@ -2945,7 +3267,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{152, 1, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{161, 1, 0}
 }
 
 type ClientPayload_UserAgent_Platform int32
@@ -2984,6 +3306,7 @@ const (
 	ClientPayload_UserAgent_ARDEVICE       ClientPayload_UserAgent_Platform = 30
 	ClientPayload_UserAgent_VRDEVICE       ClientPayload_UserAgent_Platform = 31
 	ClientPayload_UserAgent_BLUE_WEB       ClientPayload_UserAgent_Platform = 32
+	ClientPayload_UserAgent_IPAD           ClientPayload_UserAgent_Platform = 33
 )
 
 // Enum value maps for ClientPayload_UserAgent_Platform.
@@ -3022,6 +3345,7 @@ var (
 		30: "ARDEVICE",
 		31: "VRDEVICE",
 		32: "BLUE_WEB",
+		33: "IPAD",
 	}
 	ClientPayload_UserAgent_Platform_value = map[string]int32{
 		"ANDROID":        0,
@@ -3057,6 +3381,7 @@ var (
 		"ARDEVICE":       30,
 		"VRDEVICE":       31,
 		"BLUE_WEB":       32,
+		"IPAD":           33,
 	}
 )
 
@@ -3071,11 +3396,11 @@ func (x ClientPayload_UserAgent_Platform) String() string {
 }
 
 func (ClientPayload_UserAgent_Platform) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[47].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[52].Descriptor()
 }
 
 func (ClientPayload_UserAgent_Platform) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[47]
+	return &file_binary_proto_def_proto_enumTypes[52]
 }
 
 func (x ClientPayload_UserAgent_Platform) Number() protoreflect.EnumNumber {
@@ -3094,7 +3419,72 @@ 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{152, 1, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{161, 1, 1}
+}
+
+type ClientPayload_UserAgent_DeviceType int32
+
+const (
+	ClientPayload_UserAgent_PHONE    ClientPayload_UserAgent_DeviceType = 0
+	ClientPayload_UserAgent_TABLET   ClientPayload_UserAgent_DeviceType = 1
+	ClientPayload_UserAgent_DESKTOP  ClientPayload_UserAgent_DeviceType = 2
+	ClientPayload_UserAgent_WEARABLE ClientPayload_UserAgent_DeviceType = 3
+	ClientPayload_UserAgent_VR       ClientPayload_UserAgent_DeviceType = 4
+)
+
+// Enum value maps for ClientPayload_UserAgent_DeviceType.
+var (
+	ClientPayload_UserAgent_DeviceType_name = map[int32]string{
+		0: "PHONE",
+		1: "TABLET",
+		2: "DESKTOP",
+		3: "WEARABLE",
+		4: "VR",
+	}
+	ClientPayload_UserAgent_DeviceType_value = map[string]int32{
+		"PHONE":    0,
+		"TABLET":   1,
+		"DESKTOP":  2,
+		"WEARABLE": 3,
+		"VR":       4,
+	}
+)
+
+func (x ClientPayload_UserAgent_DeviceType) Enum() *ClientPayload_UserAgent_DeviceType {
+	p := new(ClientPayload_UserAgent_DeviceType)
+	*p = x
+	return p
+}
+
+func (x ClientPayload_UserAgent_DeviceType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (ClientPayload_UserAgent_DeviceType) Descriptor() protoreflect.EnumDescriptor {
+	return file_binary_proto_def_proto_enumTypes[53].Descriptor()
+}
+
+func (ClientPayload_UserAgent_DeviceType) Type() protoreflect.EnumType {
+	return &file_binary_proto_def_proto_enumTypes[53]
+}
+
+func (x ClientPayload_UserAgent_DeviceType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *ClientPayload_UserAgent_DeviceType) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = ClientPayload_UserAgent_DeviceType(num)
+	return nil
+}
+
+// Deprecated: Use ClientPayload_UserAgent_DeviceType.Descriptor instead.
+func (ClientPayload_UserAgent_DeviceType) EnumDescriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{161, 1, 2}
 }
 
 type ClientPayload_DNSSource_DNSResolutionMethod int32
@@ -3136,11 +3526,11 @@ func (x ClientPayload_DNSSource_DNSResolutionMethod) String() string {
 }
 
 func (ClientPayload_DNSSource_DNSResolutionMethod) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[48].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[54].Descriptor()
 }
 
 func (ClientPayload_DNSSource_DNSResolutionMethod) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[48]
+	return &file_binary_proto_def_proto_enumTypes[54]
 }
 
 func (x ClientPayload_DNSSource_DNSResolutionMethod) Number() protoreflect.EnumNumber {
@@ -3159,7 +3549,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{152, 3, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{161, 4, 0}
 }
 
 type WebMessageInfo_StubType int32
@@ -3327,6 +3717,30 @@ const (
 	WebMessageInfo_CAG_INVITE_AUTO_ADD                                      WebMessageInfo_StubType = 159
 	WebMessageInfo_BIZ_CHAT_ASSIGNMENT_UNASSIGN                             WebMessageInfo_StubType = 160
 	WebMessageInfo_CAG_INVITE_AUTO_JOINED                                   WebMessageInfo_StubType = 161
+	WebMessageInfo_SCHEDULED_CALL_START_MESSAGE                             WebMessageInfo_StubType = 162
+	WebMessageInfo_COMMUNITY_INVITE_RICH                                    WebMessageInfo_StubType = 163
+	WebMessageInfo_COMMUNITY_INVITE_AUTO_ADD_RICH                           WebMessageInfo_StubType = 164
+	WebMessageInfo_SUB_GROUP_INVITE_RICH                                    WebMessageInfo_StubType = 165
+	WebMessageInfo_SUB_GROUP_PARTICIPANT_ADD_RICH                           WebMessageInfo_StubType = 166
+	WebMessageInfo_COMMUNITY_LINK_PARENT_GROUP_RICH                         WebMessageInfo_StubType = 167
+	WebMessageInfo_COMMUNITY_PARTICIPANT_ADD_RICH                           WebMessageInfo_StubType = 168
+	WebMessageInfo_SILENCED_UNKNOWN_CALLER_AUDIO                            WebMessageInfo_StubType = 169
+	WebMessageInfo_SILENCED_UNKNOWN_CALLER_VIDEO                            WebMessageInfo_StubType = 170
+	WebMessageInfo_GROUP_MEMBER_ADD_MODE                                    WebMessageInfo_StubType = 171
+	WebMessageInfo_GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD     WebMessageInfo_StubType = 172
+	WebMessageInfo_COMMUNITY_CHANGE_DESCRIPTION                             WebMessageInfo_StubType = 173
+	WebMessageInfo_SENDER_INVITE                                            WebMessageInfo_StubType = 174
+	WebMessageInfo_RECEIVER_INVITE                                          WebMessageInfo_StubType = 175
+	WebMessageInfo_COMMUNITY_ALLOW_MEMBER_ADDED_GROUPS                      WebMessageInfo_StubType = 176
+	WebMessageInfo_PINNED_MESSAGE_IN_CHAT                                   WebMessageInfo_StubType = 177
+	WebMessageInfo_PAYMENT_INVITE_SETUP_INVITER                             WebMessageInfo_StubType = 178
+	WebMessageInfo_PAYMENT_INVITE_SETUP_INVITEE_RECEIVE_ONLY                WebMessageInfo_StubType = 179
+	WebMessageInfo_PAYMENT_INVITE_SETUP_INVITEE_SEND_AND_RECEIVE            WebMessageInfo_StubType = 180
+	WebMessageInfo_LINKED_GROUP_CALL_START                                  WebMessageInfo_StubType = 181
+	WebMessageInfo_REPORT_TO_ADMIN_ENABLED_STATUS                           WebMessageInfo_StubType = 182
+	WebMessageInfo_EMPTY_SUBGROUP_CREATE                                    WebMessageInfo_StubType = 183
+	WebMessageInfo_SCHEDULED_CALL_CANCEL                                    WebMessageInfo_StubType = 184
+	WebMessageInfo_SUBGROUP_ADMIN_TRIGGERED_AUTO_ADD_RICH                   WebMessageInfo_StubType = 185
 )
 
 // Enum value maps for WebMessageInfo_StubType.
@@ -3494,6 +3908,30 @@ var (
 		159: "CAG_INVITE_AUTO_ADD",
 		160: "BIZ_CHAT_ASSIGNMENT_UNASSIGN",
 		161: "CAG_INVITE_AUTO_JOINED",
+		162: "SCHEDULED_CALL_START_MESSAGE",
+		163: "COMMUNITY_INVITE_RICH",
+		164: "COMMUNITY_INVITE_AUTO_ADD_RICH",
+		165: "SUB_GROUP_INVITE_RICH",
+		166: "SUB_GROUP_PARTICIPANT_ADD_RICH",
+		167: "COMMUNITY_LINK_PARENT_GROUP_RICH",
+		168: "COMMUNITY_PARTICIPANT_ADD_RICH",
+		169: "SILENCED_UNKNOWN_CALLER_AUDIO",
+		170: "SILENCED_UNKNOWN_CALLER_VIDEO",
+		171: "GROUP_MEMBER_ADD_MODE",
+		172: "GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD",
+		173: "COMMUNITY_CHANGE_DESCRIPTION",
+		174: "SENDER_INVITE",
+		175: "RECEIVER_INVITE",
+		176: "COMMUNITY_ALLOW_MEMBER_ADDED_GROUPS",
+		177: "PINNED_MESSAGE_IN_CHAT",
+		178: "PAYMENT_INVITE_SETUP_INVITER",
+		179: "PAYMENT_INVITE_SETUP_INVITEE_RECEIVE_ONLY",
+		180: "PAYMENT_INVITE_SETUP_INVITEE_SEND_AND_RECEIVE",
+		181: "LINKED_GROUP_CALL_START",
+		182: "REPORT_TO_ADMIN_ENABLED_STATUS",
+		183: "EMPTY_SUBGROUP_CREATE",
+		184: "SCHEDULED_CALL_CANCEL",
+		185: "SUBGROUP_ADMIN_TRIGGERED_AUTO_ADD_RICH",
 	}
 	WebMessageInfo_StubType_value = map[string]int32{
 		"UNKNOWN":                                                  0,
@@ -3658,6 +4096,30 @@ var (
 		"CAG_INVITE_AUTO_ADD":                                      159,
 		"BIZ_CHAT_ASSIGNMENT_UNASSIGN":                             160,
 		"CAG_INVITE_AUTO_JOINED":                                   161,
+		"SCHEDULED_CALL_START_MESSAGE":                             162,
+		"COMMUNITY_INVITE_RICH":                                    163,
+		"COMMUNITY_INVITE_AUTO_ADD_RICH":                           164,
+		"SUB_GROUP_INVITE_RICH":                                    165,
+		"SUB_GROUP_PARTICIPANT_ADD_RICH":                           166,
+		"COMMUNITY_LINK_PARENT_GROUP_RICH":                         167,
+		"COMMUNITY_PARTICIPANT_ADD_RICH":                           168,
+		"SILENCED_UNKNOWN_CALLER_AUDIO":                            169,
+		"SILENCED_UNKNOWN_CALLER_VIDEO":                            170,
+		"GROUP_MEMBER_ADD_MODE":                                    171,
+		"GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD":     172,
+		"COMMUNITY_CHANGE_DESCRIPTION":                             173,
+		"SENDER_INVITE":                                            174,
+		"RECEIVER_INVITE":                                          175,
+		"COMMUNITY_ALLOW_MEMBER_ADDED_GROUPS":                      176,
+		"PINNED_MESSAGE_IN_CHAT":                                   177,
+		"PAYMENT_INVITE_SETUP_INVITER":                             178,
+		"PAYMENT_INVITE_SETUP_INVITEE_RECEIVE_ONLY":                179,
+		"PAYMENT_INVITE_SETUP_INVITEE_SEND_AND_RECEIVE":            180,
+		"LINKED_GROUP_CALL_START":                                  181,
+		"REPORT_TO_ADMIN_ENABLED_STATUS":                           182,
+		"EMPTY_SUBGROUP_CREATE":                                    183,
+		"SCHEDULED_CALL_CANCEL":                                    184,
+		"SUBGROUP_ADMIN_TRIGGERED_AUTO_ADD_RICH":                   185,
 	}
 )
 
@@ -3672,11 +4134,11 @@ func (x WebMessageInfo_StubType) String() string {
 }
 
 func (WebMessageInfo_StubType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[49].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[55].Descriptor()
 }
 
 func (WebMessageInfo_StubType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[49]
+	return &file_binary_proto_def_proto_enumTypes[55]
 }
 
 func (x WebMessageInfo_StubType) Number() protoreflect.EnumNumber {
@@ -3695,7 +4157,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{154, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{163, 0}
 }
 
 type WebMessageInfo_Status int32
@@ -3740,11 +4202,11 @@ func (x WebMessageInfo_Status) String() string {
 }
 
 func (WebMessageInfo_Status) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[50].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[56].Descriptor()
 }
 
 func (WebMessageInfo_Status) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[50]
+	return &file_binary_proto_def_proto_enumTypes[56]
 }
 
 func (x WebMessageInfo_Status) Number() protoreflect.EnumNumber {
@@ -3763,7 +4225,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{154, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{163, 1}
 }
 
 type WebMessageInfo_BizPrivacyStatus int32
@@ -3802,11 +4264,11 @@ func (x WebMessageInfo_BizPrivacyStatus) String() string {
 }
 
 func (WebMessageInfo_BizPrivacyStatus) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[51].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[57].Descriptor()
 }
 
 func (WebMessageInfo_BizPrivacyStatus) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[51]
+	return &file_binary_proto_def_proto_enumTypes[57]
 }
 
 func (x WebMessageInfo_BizPrivacyStatus) Number() protoreflect.EnumNumber {
@@ -3825,7 +4287,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{154, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{163, 2}
 }
 
 type WebFeatures_Flag int32
@@ -3864,11 +4326,11 @@ func (x WebFeatures_Flag) String() string {
 }
 
 func (WebFeatures_Flag) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[52].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[58].Descriptor()
 }
 
 func (WebFeatures_Flag) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[52]
+	return &file_binary_proto_def_proto_enumTypes[58]
 }
 
 func (x WebFeatures_Flag) Number() protoreflect.EnumNumber {
@@ -3887,7 +4349,66 @@ 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{155, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{164, 0}
+}
+
+type PinInChat_Type int32
+
+const (
+	PinInChat_UNKNOWN_TYPE  PinInChat_Type = 0
+	PinInChat_PIN_FOR_ALL   PinInChat_Type = 1
+	PinInChat_UNPIN_FOR_ALL PinInChat_Type = 2
+)
+
+// Enum value maps for PinInChat_Type.
+var (
+	PinInChat_Type_name = map[int32]string{
+		0: "UNKNOWN_TYPE",
+		1: "PIN_FOR_ALL",
+		2: "UNPIN_FOR_ALL",
+	}
+	PinInChat_Type_value = map[string]int32{
+		"UNKNOWN_TYPE":  0,
+		"PIN_FOR_ALL":   1,
+		"UNPIN_FOR_ALL": 2,
+	}
+)
+
+func (x PinInChat_Type) Enum() *PinInChat_Type {
+	p := new(PinInChat_Type)
+	*p = x
+	return p
+}
+
+func (x PinInChat_Type) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (PinInChat_Type) Descriptor() protoreflect.EnumDescriptor {
+	return file_binary_proto_def_proto_enumTypes[59].Descriptor()
+}
+
+func (PinInChat_Type) Type() protoreflect.EnumType {
+	return &file_binary_proto_def_proto_enumTypes[59]
+}
+
+func (x PinInChat_Type) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *PinInChat_Type) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = PinInChat_Type(num)
+	return nil
+}
+
+// Deprecated: Use PinInChat_Type.Descriptor instead.
+func (PinInChat_Type) EnumDescriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{170, 0}
 }
 
 type PaymentInfo_TxnStatus int32
@@ -4010,11 +4531,11 @@ func (x PaymentInfo_TxnStatus) String() string {
 }
 
 func (PaymentInfo_TxnStatus) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[53].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[60].Descriptor()
 }
 
 func (PaymentInfo_TxnStatus) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[53]
+	return &file_binary_proto_def_proto_enumTypes[60]
 }
 
 func (x PaymentInfo_TxnStatus) Number() protoreflect.EnumNumber {
@@ -4033,7 +4554,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{162, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{172, 0}
 }
 
 type PaymentInfo_Status int32
@@ -4096,11 +4617,11 @@ func (x PaymentInfo_Status) String() string {
 }
 
 func (PaymentInfo_Status) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[54].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[61].Descriptor()
 }
 
 func (PaymentInfo_Status) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[54]
+	return &file_binary_proto_def_proto_enumTypes[61]
 }
 
 func (x PaymentInfo_Status) Number() protoreflect.EnumNumber {
@@ -4119,7 +4640,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{162, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{172, 1}
 }
 
 type PaymentInfo_Currency int32
@@ -4152,11 +4673,11 @@ func (x PaymentInfo_Currency) String() string {
 }
 
 func (PaymentInfo_Currency) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[55].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[62].Descriptor()
 }
 
 func (PaymentInfo_Currency) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[55]
+	return &file_binary_proto_def_proto_enumTypes[62]
 }
 
 func (x PaymentInfo_Currency) Number() protoreflect.EnumNumber {
@@ -4175,7 +4696,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{162, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{172, 2}
 }
 
 type ADVSignedKeyIndexList struct {
@@ -4309,8 +4830,9 @@ type ADVSignedDeviceIdentityHMAC struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Details []byte `protobuf:"bytes,1,opt,name=details" json:"details,omitempty"`
-	Hmac    []byte `protobuf:"bytes,2,opt,name=hmac" json:"hmac,omitempty"`
+	Details     []byte             `protobuf:"bytes,1,opt,name=details" json:"details,omitempty"`
+	Hmac        []byte             `protobuf:"bytes,2,opt,name=hmac" json:"hmac,omitempty"`
+	AccountType *ADVEncryptionType `protobuf:"varint,3,opt,name=accountType,enum=proto.ADVEncryptionType" json:"accountType,omitempty"`
 }
 
 func (x *ADVSignedDeviceIdentityHMAC) Reset() {
@@ -4359,15 +4881,23 @@ func (x *ADVSignedDeviceIdentityHMAC) GetHmac() []byte {
 	return nil
 }
 
+func (x *ADVSignedDeviceIdentityHMAC) GetAccountType() ADVEncryptionType {
+	if x != nil && x.AccountType != nil {
+		return *x.AccountType
+	}
+	return ADVEncryptionType_E2EE
+}
+
 type ADVKeyIndexList struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	RawId        *uint32  `protobuf:"varint,1,opt,name=rawId" json:"rawId,omitempty"`
-	Timestamp    *uint64  `protobuf:"varint,2,opt,name=timestamp" json:"timestamp,omitempty"`
-	CurrentIndex *uint32  `protobuf:"varint,3,opt,name=currentIndex" json:"currentIndex,omitempty"`
-	ValidIndexes []uint32 `protobuf:"varint,4,rep,packed,name=validIndexes" json:"validIndexes,omitempty"`
+	RawId        *uint32            `protobuf:"varint,1,opt,name=rawId" json:"rawId,omitempty"`
+	Timestamp    *uint64            `protobuf:"varint,2,opt,name=timestamp" json:"timestamp,omitempty"`
+	CurrentIndex *uint32            `protobuf:"varint,3,opt,name=currentIndex" json:"currentIndex,omitempty"`
+	ValidIndexes []uint32           `protobuf:"varint,4,rep,packed,name=validIndexes" json:"validIndexes,omitempty"`
+	AccountType  *ADVEncryptionType `protobuf:"varint,5,opt,name=accountType,enum=proto.ADVEncryptionType" json:"accountType,omitempty"`
 }
 
 func (x *ADVKeyIndexList) Reset() {
@@ -4430,14 +4960,23 @@ func (x *ADVKeyIndexList) GetValidIndexes() []uint32 {
 	return nil
 }
 
+func (x *ADVKeyIndexList) GetAccountType() ADVEncryptionType {
+	if x != nil && x.AccountType != nil {
+		return *x.AccountType
+	}
+	return ADVEncryptionType_E2EE
+}
+
 type ADVDeviceIdentity struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	RawId     *uint32 `protobuf:"varint,1,opt,name=rawId" json:"rawId,omitempty"`
-	Timestamp *uint64 `protobuf:"varint,2,opt,name=timestamp" json:"timestamp,omitempty"`
-	KeyIndex  *uint32 `protobuf:"varint,3,opt,name=keyIndex" json:"keyIndex,omitempty"`
+	RawId       *uint32            `protobuf:"varint,1,opt,name=rawId" json:"rawId,omitempty"`
+	Timestamp   *uint64            `protobuf:"varint,2,opt,name=timestamp" json:"timestamp,omitempty"`
+	KeyIndex    *uint32            `protobuf:"varint,3,opt,name=keyIndex" json:"keyIndex,omitempty"`
+	AccountType *ADVEncryptionType `protobuf:"varint,4,opt,name=accountType,enum=proto.ADVEncryptionType" json:"accountType,omitempty"`
+	DeviceType  *ADVEncryptionType `protobuf:"varint,5,opt,name=deviceType,enum=proto.ADVEncryptionType" json:"deviceType,omitempty"`
 }
 
 func (x *ADVDeviceIdentity) Reset() {
@@ -4493,6 +5032,20 @@ func (x *ADVDeviceIdentity) GetKeyIndex() uint32 {
 	return 0
 }
 
+func (x *ADVDeviceIdentity) GetAccountType() ADVEncryptionType {
+	if x != nil && x.AccountType != nil {
+		return *x.AccountType
+	}
+	return ADVEncryptionType_E2EE
+}
+
+func (x *ADVDeviceIdentity) GetDeviceType() ADVEncryptionType {
+	if x != nil && x.DeviceType != nil {
+		return *x.DeviceType
+	}
+	return ADVEncryptionType_E2EE
+}
+
 type DeviceProps struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4572,402 +5125,6 @@ func (x *DeviceProps) GetHistorySyncConfig() *DeviceProps_HistorySyncConfig {
 	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"`
-	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[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeerDataOperationRequestMessage) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeerDataOperationRequestMessage) ProtoMessage() {}
-
-func (x *PeerDataOperationRequestMessage) 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 PeerDataOperationRequestMessage.ProtoReflect.Descriptor instead.
-func (*PeerDataOperationRequestMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *PeerDataOperationRequestMessage) GetPeerDataOperationRequestType() PeerDataOperationRequestType {
-	if x != nil && x.PeerDataOperationRequestType != nil {
-		return *x.PeerDataOperationRequestType
-	}
-	return PeerDataOperationRequestType_UPLOAD_STICKER
-}
-
-func (x *PeerDataOperationRequestMessage) GetRequestStickerReupload() []*PeerDataOperationRequestMessage_RequestStickerReupload {
-	if x != nil {
-		return x.RequestStickerReupload
-	}
-	return nil
-}
-
-func (x *PeerDataOperationRequestMessage) GetRequestUrlPreview() []*PeerDataOperationRequestMessage_RequestUrlPreview {
-	if x != nil {
-		return x.RequestUrlPreview
-	}
-	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
-	unknownFields protoimpl.UnknownFields
-
-	ServiceType     *PaymentInviteMessage_ServiceType `protobuf:"varint,1,opt,name=serviceType,enum=proto.PaymentInviteMessage_ServiceType" json:"serviceType,omitempty"`
-	ExpiryTimestamp *int64                            `protobuf:"varint,2,opt,name=expiryTimestamp" json:"expiryTimestamp,omitempty"`
-}
-
-func (x *PaymentInviteMessage) Reset() {
-	*x = PaymentInviteMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PaymentInviteMessage) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PaymentInviteMessage) ProtoMessage() {}
-
-func (x *PaymentInviteMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[7]
-	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 PaymentInviteMessage.ProtoReflect.Descriptor instead.
-func (*PaymentInviteMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *PaymentInviteMessage) GetServiceType() PaymentInviteMessage_ServiceType {
-	if x != nil && x.ServiceType != nil {
-		return *x.ServiceType
-	}
-	return PaymentInviteMessage_UNKNOWN
-}
-
-func (x *PaymentInviteMessage) GetExpiryTimestamp() int64 {
-	if x != nil && x.ExpiryTimestamp != nil {
-		return *x.ExpiryTimestamp
-	}
-	return 0
-}
-
-type OrderMessage struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	OrderId           *string                    `protobuf:"bytes,1,opt,name=orderId" json:"orderId,omitempty"`
-	Thumbnail         []byte                     `protobuf:"bytes,2,opt,name=thumbnail" json:"thumbnail,omitempty"`
-	ItemCount         *int32                     `protobuf:"varint,3,opt,name=itemCount" json:"itemCount,omitempty"`
-	Status            *OrderMessage_OrderStatus  `protobuf:"varint,4,opt,name=status,enum=proto.OrderMessage_OrderStatus" json:"status,omitempty"`
-	Surface           *OrderMessage_OrderSurface `protobuf:"varint,5,opt,name=surface,enum=proto.OrderMessage_OrderSurface" json:"surface,omitempty"`
-	Message           *string                    `protobuf:"bytes,6,opt,name=message" json:"message,omitempty"`
-	OrderTitle        *string                    `protobuf:"bytes,7,opt,name=orderTitle" json:"orderTitle,omitempty"`
-	SellerJid         *string                    `protobuf:"bytes,8,opt,name=sellerJid" json:"sellerJid,omitempty"`
-	Token             *string                    `protobuf:"bytes,9,opt,name=token" json:"token,omitempty"`
-	TotalAmount1000   *int64                     `protobuf:"varint,10,opt,name=totalAmount1000" json:"totalAmount1000,omitempty"`
-	TotalCurrencyCode *string                    `protobuf:"bytes,11,opt,name=totalCurrencyCode" json:"totalCurrencyCode,omitempty"`
-	ContextInfo       *ContextInfo               `protobuf:"bytes,17,opt,name=contextInfo" json:"contextInfo,omitempty"`
-}
-
-func (x *OrderMessage) Reset() {
-	*x = OrderMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OrderMessage) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OrderMessage) ProtoMessage() {}
-
-func (x *OrderMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[8]
-	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 OrderMessage.ProtoReflect.Descriptor instead.
-func (*OrderMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *OrderMessage) GetOrderId() string {
-	if x != nil && x.OrderId != nil {
-		return *x.OrderId
-	}
-	return ""
-}
-
-func (x *OrderMessage) GetThumbnail() []byte {
-	if x != nil {
-		return x.Thumbnail
-	}
-	return nil
-}
-
-func (x *OrderMessage) GetItemCount() int32 {
-	if x != nil && x.ItemCount != nil {
-		return *x.ItemCount
-	}
-	return 0
-}
-
-func (x *OrderMessage) GetStatus() OrderMessage_OrderStatus {
-	if x != nil && x.Status != nil {
-		return *x.Status
-	}
-	return OrderMessage_INQUIRY
-}
-
-func (x *OrderMessage) GetSurface() OrderMessage_OrderSurface {
-	if x != nil && x.Surface != nil {
-		return *x.Surface
-	}
-	return OrderMessage_CATALOG
-}
-
-func (x *OrderMessage) GetMessage() string {
-	if x != nil && x.Message != nil {
-		return *x.Message
-	}
-	return ""
-}
-
-func (x *OrderMessage) GetOrderTitle() string {
-	if x != nil && x.OrderTitle != nil {
-		return *x.OrderTitle
-	}
-	return ""
-}
-
-func (x *OrderMessage) GetSellerJid() string {
-	if x != nil && x.SellerJid != nil {
-		return *x.SellerJid
-	}
-	return ""
-}
-
-func (x *OrderMessage) GetToken() string {
-	if x != nil && x.Token != nil {
-		return *x.Token
-	}
-	return ""
-}
-
-func (x *OrderMessage) GetTotalAmount1000() int64 {
-	if x != nil && x.TotalAmount1000 != nil {
-		return *x.TotalAmount1000
-	}
-	return 0
-}
-
-func (x *OrderMessage) GetTotalCurrencyCode() string {
-	if x != nil && x.TotalCurrencyCode != nil {
-		return *x.TotalCurrencyCode
-	}
-	return ""
-}
-
-func (x *OrderMessage) GetContextInfo() *ContextInfo {
-	if x != nil {
-		return x.ContextInfo
-	}
-	return nil
-}
-
-type LocationMessage struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	DegreesLatitude                   *float64     `protobuf:"fixed64,1,opt,name=degreesLatitude" json:"degreesLatitude,omitempty"`
-	DegreesLongitude                  *float64     `protobuf:"fixed64,2,opt,name=degreesLongitude" json:"degreesLongitude,omitempty"`
-	Name                              *string      `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
-	Address                           *string      `protobuf:"bytes,4,opt,name=address" json:"address,omitempty"`
-	Url                               *string      `protobuf:"bytes,5,opt,name=url" json:"url,omitempty"`
-	IsLive                            *bool        `protobuf:"varint,6,opt,name=isLive" json:"isLive,omitempty"`
-	AccuracyInMeters                  *uint32      `protobuf:"varint,7,opt,name=accuracyInMeters" json:"accuracyInMeters,omitempty"`
-	SpeedInMps                        *float32     `protobuf:"fixed32,8,opt,name=speedInMps" json:"speedInMps,omitempty"`
-	DegreesClockwiseFromMagneticNorth *uint32      `protobuf:"varint,9,opt,name=degreesClockwiseFromMagneticNorth" json:"degreesClockwiseFromMagneticNorth,omitempty"`
-	Comment                           *string      `protobuf:"bytes,11,opt,name=comment" json:"comment,omitempty"`
-	JpegThumbnail                     []byte       `protobuf:"bytes,16,opt,name=jpegThumbnail" json:"jpegThumbnail,omitempty"`
-	ContextInfo                       *ContextInfo `protobuf:"bytes,17,opt,name=contextInfo" json:"contextInfo,omitempty"`
-}
-
-func (x *LocationMessage) Reset() {
-	*x = LocationMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LocationMessage) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LocationMessage) ProtoMessage() {}
-
-func (x *LocationMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[9]
-	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 LocationMessage.ProtoReflect.Descriptor instead.
-func (*LocationMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *LocationMessage) GetDegreesLatitude() float64 {
-	if x != nil && x.DegreesLatitude != nil {
-		return *x.DegreesLatitude
-	}
-	return 0
-}
-
-func (x *LocationMessage) GetDegreesLongitude() float64 {
-	if x != nil && x.DegreesLongitude != nil {
-		return *x.DegreesLongitude
-	}
-	return 0
-}
-
-func (x *LocationMessage) GetName() string {
-	if x != nil && x.Name != nil {
-		return *x.Name
-	}
-	return ""
-}
-
-func (x *LocationMessage) GetAddress() string {
-	if x != nil && x.Address != nil {
-		return *x.Address
-	}
-	return ""
-}
-
-func (x *LocationMessage) GetUrl() string {
-	if x != nil && x.Url != nil {
-		return *x.Url
-	}
-	return ""
-}
-
-func (x *LocationMessage) GetIsLive() bool {
-	if x != nil && x.IsLive != nil {
-		return *x.IsLive
-	}
-	return false
-}
-
-func (x *LocationMessage) GetAccuracyInMeters() uint32 {
-	if x != nil && x.AccuracyInMeters != nil {
-		return *x.AccuracyInMeters
-	}
-	return 0
-}
-
-func (x *LocationMessage) GetSpeedInMps() float32 {
-	if x != nil && x.SpeedInMps != nil {
-		return *x.SpeedInMps
-	}
-	return 0
-}
-
-func (x *LocationMessage) GetDegreesClockwiseFromMagneticNorth() uint32 {
-	if x != nil && x.DegreesClockwiseFromMagneticNorth != nil {
-		return *x.DegreesClockwiseFromMagneticNorth
-	}
-	return 0
-}
-
-func (x *LocationMessage) GetComment() string {
-	if x != nil && x.Comment != nil {
-		return *x.Comment
-	}
-	return ""
-}
-
-func (x *LocationMessage) GetJpegThumbnail() []byte {
-	if x != nil {
-		return x.JpegThumbnail
-	}
-	return nil
-}
-
-func (x *LocationMessage) GetContextInfo() *ContextInfo {
-	if x != nil {
-		return x.ContextInfo
-	}
-	return nil
-}
-
 type LiveLocationMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4988,7 +5145,7 @@ type LiveLocationMessage struct {
 func (x *LiveLocationMessage) Reset() {
 	*x = LiveLocationMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[10]
+		mi := &file_binary_proto_def_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5001,7 +5158,7 @@ func (x *LiveLocationMessage) String() string {
 func (*LiveLocationMessage) ProtoMessage() {}
 
 func (x *LiveLocationMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[10]
+	mi := &file_binary_proto_def_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5014,7 +5171,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{10}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *LiveLocationMessage) GetDegreesLatitude() float64 {
@@ -5102,7 +5259,7 @@ type ListResponseMessage struct {
 func (x *ListResponseMessage) Reset() {
 	*x = ListResponseMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[11]
+		mi := &file_binary_proto_def_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5115,7 +5272,7 @@ func (x *ListResponseMessage) String() string {
 func (*ListResponseMessage) ProtoMessage() {}
 
 func (x *ListResponseMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[11]
+	mi := &file_binary_proto_def_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5128,7 +5285,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{11}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *ListResponseMessage) GetTitle() string {
@@ -5184,7 +5341,7 @@ type ListMessage struct {
 func (x *ListMessage) Reset() {
 	*x = ListMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[12]
+		mi := &file_binary_proto_def_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5197,7 +5354,7 @@ func (x *ListMessage) String() string {
 func (*ListMessage) ProtoMessage() {}
 
 func (x *ListMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[12]
+	mi := &file_binary_proto_def_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5210,7 +5367,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{12}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *ListMessage) GetTitle() string {
@@ -5282,7 +5439,7 @@ type KeepInChatMessage struct {
 func (x *KeepInChatMessage) Reset() {
 	*x = KeepInChatMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[13]
+		mi := &file_binary_proto_def_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5295,7 +5452,7 @@ func (x *KeepInChatMessage) String() string {
 func (*KeepInChatMessage) ProtoMessage() {}
 
 func (x *KeepInChatMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[13]
+	mi := &file_binary_proto_def_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5308,7 +5465,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{13}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *KeepInChatMessage) GetKey() *MessageKey {
@@ -5352,7 +5509,7 @@ type InvoiceMessage struct {
 func (x *InvoiceMessage) Reset() {
 	*x = InvoiceMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[14]
+		mi := &file_binary_proto_def_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5365,7 +5522,7 @@ func (x *InvoiceMessage) String() string {
 func (*InvoiceMessage) ProtoMessage() {}
 
 func (x *InvoiceMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[14]
+	mi := &file_binary_proto_def_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5378,7 +5535,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{14}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *InvoiceMessage) GetNote() string {
@@ -5467,7 +5624,7 @@ type InteractiveResponseMessage struct {
 func (x *InteractiveResponseMessage) Reset() {
 	*x = InteractiveResponseMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[15]
+		mi := &file_binary_proto_def_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5480,7 +5637,7 @@ func (x *InteractiveResponseMessage) String() string {
 func (*InteractiveResponseMessage) ProtoMessage() {}
 
 func (x *InteractiveResponseMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[15]
+	mi := &file_binary_proto_def_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5493,7 +5650,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{15}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *InteractiveResponseMessage) GetBody() *InteractiveResponseMessage_Body {
@@ -5549,13 +5706,14 @@ type InteractiveMessage struct {
 	//	*InteractiveMessage_ShopStorefrontMessage
 	//	*InteractiveMessage_CollectionMessage_
 	//	*InteractiveMessage_NativeFlowMessage_
+	//	*InteractiveMessage_CarouselMessage_
 	InteractiveMessage isInteractiveMessage_InteractiveMessage `protobuf_oneof:"interactiveMessage"`
 }
 
 func (x *InteractiveMessage) Reset() {
 	*x = InteractiveMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[16]
+		mi := &file_binary_proto_def_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5568,7 +5726,7 @@ func (x *InteractiveMessage) String() string {
 func (*InteractiveMessage) ProtoMessage() {}
 
 func (x *InteractiveMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[16]
+	mi := &file_binary_proto_def_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5581,7 +5739,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{16}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *InteractiveMessage) GetHeader() *InteractiveMessage_Header {
@@ -5640,6 +5798,13 @@ func (x *InteractiveMessage) GetNativeFlowMessage() *InteractiveMessage_NativeFl
 	return nil
 }
 
+func (x *InteractiveMessage) GetCarouselMessage() *InteractiveMessage_CarouselMessage {
+	if x, ok := x.GetInteractiveMessage().(*InteractiveMessage_CarouselMessage_); ok {
+		return x.CarouselMessage
+	}
+	return nil
+}
+
 type isInteractiveMessage_InteractiveMessage interface {
 	isInteractiveMessage_InteractiveMessage()
 }
@@ -5656,12 +5821,18 @@ type InteractiveMessage_NativeFlowMessage_ struct {
 	NativeFlowMessage *InteractiveMessage_NativeFlowMessage `protobuf:"bytes,6,opt,name=nativeFlowMessage,oneof"`
 }
 
+type InteractiveMessage_CarouselMessage_ struct {
+	CarouselMessage *InteractiveMessage_CarouselMessage `protobuf:"bytes,7,opt,name=carouselMessage,oneof"`
+}
+
 func (*InteractiveMessage_ShopStorefrontMessage) isInteractiveMessage_InteractiveMessage() {}
 
 func (*InteractiveMessage_CollectionMessage_) isInteractiveMessage_InteractiveMessage() {}
 
 func (*InteractiveMessage_NativeFlowMessage_) isInteractiveMessage_InteractiveMessage() {}
 
+func (*InteractiveMessage_CarouselMessage_) isInteractiveMessage_InteractiveMessage() {}
+
 type InitialSecurityNotificationSettingSync struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5673,7 +5844,7 @@ type InitialSecurityNotificationSettingSync struct {
 func (x *InitialSecurityNotificationSettingSync) Reset() {
 	*x = InitialSecurityNotificationSettingSync{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[17]
+		mi := &file_binary_proto_def_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5686,7 +5857,7 @@ func (x *InitialSecurityNotificationSettingSync) String() string {
 func (*InitialSecurityNotificationSettingSync) ProtoMessage() {}
 
 func (x *InitialSecurityNotificationSettingSync) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[17]
+	mi := &file_binary_proto_def_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5699,7 +5870,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{17}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *InitialSecurityNotificationSettingSync) GetSecurityNotificationEnabled() bool {
@@ -5745,7 +5916,7 @@ type ImageMessage struct {
 func (x *ImageMessage) Reset() {
 	*x = ImageMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[18]
+		mi := &file_binary_proto_def_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5758,7 +5929,7 @@ func (x *ImageMessage) String() string {
 func (*ImageMessage) ProtoMessage() {}
 
 func (x *ImageMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[18]
+	mi := &file_binary_proto_def_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5771,7 +5942,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{18}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *ImageMessage) GetUrl() string {
@@ -5961,22 +6132,24 @@ type HistorySyncNotification struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	FileSha256                   []byte                                   `protobuf:"bytes,1,opt,name=fileSha256" json:"fileSha256,omitempty"`
-	FileLength                   *uint64                                  `protobuf:"varint,2,opt,name=fileLength" json:"fileLength,omitempty"`
-	MediaKey                     []byte                                   `protobuf:"bytes,3,opt,name=mediaKey" json:"mediaKey,omitempty"`
-	FileEncSha256                []byte                                   `protobuf:"bytes,4,opt,name=fileEncSha256" json:"fileEncSha256,omitempty"`
-	DirectPath                   *string                                  `protobuf:"bytes,5,opt,name=directPath" json:"directPath,omitempty"`
-	SyncType                     *HistorySyncNotification_HistorySyncType `protobuf:"varint,6,opt,name=syncType,enum=proto.HistorySyncNotification_HistorySyncType" json:"syncType,omitempty"`
-	ChunkOrder                   *uint32                                  `protobuf:"varint,7,opt,name=chunkOrder" json:"chunkOrder,omitempty"`
-	OriginalMessageId            *string                                  `protobuf:"bytes,8,opt,name=originalMessageId" json:"originalMessageId,omitempty"`
-	Progress                     *uint32                                  `protobuf:"varint,9,opt,name=progress" json:"progress,omitempty"`
-	OldestMsgInChunkTimestampSec *int64                                   `protobuf:"varint,10,opt,name=oldestMsgInChunkTimestampSec" json:"oldestMsgInChunkTimestampSec,omitempty"`
+	FileSha256                        []byte                                   `protobuf:"bytes,1,opt,name=fileSha256" json:"fileSha256,omitempty"`
+	FileLength                        *uint64                                  `protobuf:"varint,2,opt,name=fileLength" json:"fileLength,omitempty"`
+	MediaKey                          []byte                                   `protobuf:"bytes,3,opt,name=mediaKey" json:"mediaKey,omitempty"`
+	FileEncSha256                     []byte                                   `protobuf:"bytes,4,opt,name=fileEncSha256" json:"fileEncSha256,omitempty"`
+	DirectPath                        *string                                  `protobuf:"bytes,5,opt,name=directPath" json:"directPath,omitempty"`
+	SyncType                          *HistorySyncNotification_HistorySyncType `protobuf:"varint,6,opt,name=syncType,enum=proto.HistorySyncNotification_HistorySyncType" json:"syncType,omitempty"`
+	ChunkOrder                        *uint32                                  `protobuf:"varint,7,opt,name=chunkOrder" json:"chunkOrder,omitempty"`
+	OriginalMessageId                 *string                                  `protobuf:"bytes,8,opt,name=originalMessageId" json:"originalMessageId,omitempty"`
+	Progress                          *uint32                                  `protobuf:"varint,9,opt,name=progress" json:"progress,omitempty"`
+	OldestMsgInChunkTimestampSec      *int64                                   `protobuf:"varint,10,opt,name=oldestMsgInChunkTimestampSec" json:"oldestMsgInChunkTimestampSec,omitempty"`
+	InitialHistBootstrapInlinePayload []byte                                   `protobuf:"bytes,11,opt,name=initialHistBootstrapInlinePayload" json:"initialHistBootstrapInlinePayload,omitempty"`
+	PeerDataRequestSessionId          *string                                  `protobuf:"bytes,12,opt,name=peerDataRequestSessionId" json:"peerDataRequestSessionId,omitempty"`
 }
 
 func (x *HistorySyncNotification) Reset() {
 	*x = HistorySyncNotification{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[19]
+		mi := &file_binary_proto_def_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5989,7 +6162,7 @@ func (x *HistorySyncNotification) String() string {
 func (*HistorySyncNotification) ProtoMessage() {}
 
 func (x *HistorySyncNotification) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[19]
+	mi := &file_binary_proto_def_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6002,7 +6175,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{19}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *HistorySyncNotification) GetFileSha256() []byte {
@@ -6075,6 +6248,20 @@ func (x *HistorySyncNotification) GetOldestMsgInChunkTimestampSec() int64 {
 	return 0
 }
 
+func (x *HistorySyncNotification) GetInitialHistBootstrapInlinePayload() []byte {
+	if x != nil {
+		return x.InitialHistBootstrapInlinePayload
+	}
+	return nil
+}
+
+func (x *HistorySyncNotification) GetPeerDataRequestSessionId() string {
+	if x != nil && x.PeerDataRequestSessionId != nil {
+		return *x.PeerDataRequestSessionId
+	}
+	return ""
+}
+
 type HighlyStructuredMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -6094,7 +6281,7 @@ type HighlyStructuredMessage struct {
 func (x *HighlyStructuredMessage) Reset() {
 	*x = HighlyStructuredMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[20]
+		mi := &file_binary_proto_def_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6107,7 +6294,7 @@ func (x *HighlyStructuredMessage) String() string {
 func (*HighlyStructuredMessage) ProtoMessage() {}
 
 func (x *HighlyStructuredMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[20]
+	mi := &file_binary_proto_def_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6120,7 +6307,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{20}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{16}
 }
 
 func (x *HighlyStructuredMessage) GetNamespace() string {
@@ -6204,7 +6391,7 @@ type GroupInviteMessage struct {
 func (x *GroupInviteMessage) Reset() {
 	*x = GroupInviteMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[21]
+		mi := &file_binary_proto_def_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6217,7 +6404,7 @@ func (x *GroupInviteMessage) String() string {
 func (*GroupInviteMessage) ProtoMessage() {}
 
 func (x *GroupInviteMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[21]
+	mi := &file_binary_proto_def_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6230,7 +6417,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{21}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *GroupInviteMessage) GetGroupJid() string {
@@ -6300,7 +6487,7 @@ type FutureProofMessage struct {
 func (x *FutureProofMessage) Reset() {
 	*x = FutureProofMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[22]
+		mi := &file_binary_proto_def_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6313,7 +6500,7 @@ func (x *FutureProofMessage) String() string {
 func (*FutureProofMessage) ProtoMessage() {}
 
 func (x *FutureProofMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[22]
+	mi := &file_binary_proto_def_proto_msgTypes[18]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6326,7 +6513,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{22}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{18}
 }
 
 func (x *FutureProofMessage) GetMessage() *Message {
@@ -6370,7 +6557,7 @@ type ExtendedTextMessage struct {
 func (x *ExtendedTextMessage) Reset() {
 	*x = ExtendedTextMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[23]
+		mi := &file_binary_proto_def_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6383,7 +6570,7 @@ func (x *ExtendedTextMessage) String() string {
 func (*ExtendedTextMessage) ProtoMessage() {}
 
 func (x *ExtendedTextMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[23]
+	mi := &file_binary_proto_def_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6396,7 +6583,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{23}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{19}
 }
 
 func (x *ExtendedTextMessage) GetText() string {
@@ -6452,7 +6639,7 @@ func (x *ExtendedTextMessage) GetFont() ExtendedTextMessage_FontType {
 	if x != nil && x.Font != nil {
 		return *x.Font
 	}
-	return ExtendedTextMessage_SANS_SERIF
+	return ExtendedTextMessage_SYSTEM
 }
 
 func (x *ExtendedTextMessage) GetPreviewType() ExtendedTextMessage_PreviewType {
@@ -6580,7 +6767,7 @@ type EncReactionMessage struct {
 func (x *EncReactionMessage) Reset() {
 	*x = EncReactionMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[24]
+		mi := &file_binary_proto_def_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6593,7 +6780,7 @@ func (x *EncReactionMessage) String() string {
 func (*EncReactionMessage) ProtoMessage() {}
 
 func (x *EncReactionMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[24]
+	mi := &file_binary_proto_def_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6606,7 +6793,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{24}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{20}
 }
 
 func (x *EncReactionMessage) GetTargetMessageKey() *MessageKey {
@@ -6630,6 +6817,69 @@ func (x *EncReactionMessage) GetEncIv() []byte {
 	return nil
 }
 
+type EncCommentMessage struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	TargetMessageKey *MessageKey `protobuf:"bytes,1,opt,name=targetMessageKey" json:"targetMessageKey,omitempty"`
+	EncPayload       []byte      `protobuf:"bytes,2,opt,name=encPayload" json:"encPayload,omitempty"`
+	EncIv            []byte      `protobuf:"bytes,3,opt,name=encIv" json:"encIv,omitempty"`
+}
+
+func (x *EncCommentMessage) Reset() {
+	*x = EncCommentMessage{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[21]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *EncCommentMessage) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EncCommentMessage) ProtoMessage() {}
+
+func (x *EncCommentMessage) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[21]
+	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 EncCommentMessage.ProtoReflect.Descriptor instead.
+func (*EncCommentMessage) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{21}
+}
+
+func (x *EncCommentMessage) GetTargetMessageKey() *MessageKey {
+	if x != nil {
+		return x.TargetMessageKey
+	}
+	return nil
+}
+
+func (x *EncCommentMessage) GetEncPayload() []byte {
+	if x != nil {
+		return x.EncPayload
+	}
+	return nil
+}
+
+func (x *EncCommentMessage) GetEncIv() []byte {
+	if x != nil {
+		return x.EncIv
+	}
+	return nil
+}
+
 type DocumentMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -6660,7 +6910,7 @@ type DocumentMessage struct {
 func (x *DocumentMessage) Reset() {
 	*x = DocumentMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[25]
+		mi := &file_binary_proto_def_proto_msgTypes[22]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6673,7 +6923,7 @@ func (x *DocumentMessage) String() string {
 func (*DocumentMessage) ProtoMessage() {}
 
 func (x *DocumentMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[25]
+	mi := &file_binary_proto_def_proto_msgTypes[22]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6686,7 +6936,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{25}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{22}
 }
 
 func (x *DocumentMessage) GetUrl() string {
@@ -6842,7 +7092,7 @@ type DeviceSentMessage struct {
 func (x *DeviceSentMessage) Reset() {
 	*x = DeviceSentMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[26]
+		mi := &file_binary_proto_def_proto_msgTypes[23]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6855,7 +7105,7 @@ func (x *DeviceSentMessage) String() string {
 func (*DeviceSentMessage) ProtoMessage() {}
 
 func (x *DeviceSentMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[26]
+	mi := &file_binary_proto_def_proto_msgTypes[23]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6868,7 +7118,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{26}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{23}
 }
 
 func (x *DeviceSentMessage) GetDestinationJid() string {
@@ -6903,7 +7153,7 @@ type DeclinePaymentRequestMessage struct {
 func (x *DeclinePaymentRequestMessage) Reset() {
 	*x = DeclinePaymentRequestMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[27]
+		mi := &file_binary_proto_def_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6916,7 +7166,7 @@ func (x *DeclinePaymentRequestMessage) String() string {
 func (*DeclinePaymentRequestMessage) ProtoMessage() {}
 
 func (x *DeclinePaymentRequestMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[27]
+	mi := &file_binary_proto_def_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6929,7 +7179,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{27}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{24}
 }
 
 func (x *DeclinePaymentRequestMessage) GetKey() *MessageKey {
@@ -6952,7 +7202,7 @@ type ContactsArrayMessage struct {
 func (x *ContactsArrayMessage) Reset() {
 	*x = ContactsArrayMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[28]
+		mi := &file_binary_proto_def_proto_msgTypes[25]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6965,7 +7215,7 @@ func (x *ContactsArrayMessage) String() string {
 func (*ContactsArrayMessage) ProtoMessage() {}
 
 func (x *ContactsArrayMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[28]
+	mi := &file_binary_proto_def_proto_msgTypes[25]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6978,7 +7228,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{28}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{25}
 }
 
 func (x *ContactsArrayMessage) GetDisplayName() string {
@@ -7015,7 +7265,7 @@ type ContactMessage struct {
 func (x *ContactMessage) Reset() {
 	*x = ContactMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[29]
+		mi := &file_binary_proto_def_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7028,7 +7278,7 @@ func (x *ContactMessage) String() string {
 func (*ContactMessage) ProtoMessage() {}
 
 func (x *ContactMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[29]
+	mi := &file_binary_proto_def_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7041,7 +7291,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{29}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{26}
 }
 
 func (x *ContactMessage) GetDisplayName() string {
@@ -7077,7 +7327,7 @@ type Chat struct {
 func (x *Chat) Reset() {
 	*x = Chat{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[30]
+		mi := &file_binary_proto_def_proto_msgTypes[27]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7090,7 +7340,7 @@ func (x *Chat) String() string {
 func (*Chat) ProtoMessage() {}
 
 func (x *Chat) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[30]
+	mi := &file_binary_proto_def_proto_msgTypes[27]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7103,7 +7353,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{30}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{27}
 }
 
 func (x *Chat) GetDisplayName() string {
@@ -7131,7 +7381,7 @@ type CancelPaymentRequestMessage struct {
 func (x *CancelPaymentRequestMessage) Reset() {
 	*x = CancelPaymentRequestMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[31]
+		mi := &file_binary_proto_def_proto_msgTypes[28]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7144,7 +7394,7 @@ func (x *CancelPaymentRequestMessage) String() string {
 func (*CancelPaymentRequestMessage) ProtoMessage() {}
 
 func (x *CancelPaymentRequestMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[31]
+	mi := &file_binary_proto_def_proto_msgTypes[28]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7157,7 +7407,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{31}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{28}
 }
 
 func (x *CancelPaymentRequestMessage) GetKey() *MessageKey {
@@ -7181,7 +7431,7 @@ type Call struct {
 func (x *Call) Reset() {
 	*x = Call{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[32]
+		mi := &file_binary_proto_def_proto_msgTypes[29]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7194,7 +7444,7 @@ func (x *Call) String() string {
 func (*Call) ProtoMessage() {}
 
 func (x *Call) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[32]
+	mi := &file_binary_proto_def_proto_msgTypes[29]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7207,7 +7457,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{32}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{29}
 }
 
 func (x *Call) GetCallKey() []byte {
@@ -7255,7 +7505,7 @@ type ButtonsResponseMessage struct {
 func (x *ButtonsResponseMessage) Reset() {
 	*x = ButtonsResponseMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[33]
+		mi := &file_binary_proto_def_proto_msgTypes[30]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7268,7 +7518,7 @@ func (x *ButtonsResponseMessage) String() string {
 func (*ButtonsResponseMessage) ProtoMessage() {}
 
 func (x *ButtonsResponseMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[33]
+	mi := &file_binary_proto_def_proto_msgTypes[30]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7281,7 +7531,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{33}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{30}
 }
 
 func (x *ButtonsResponseMessage) GetSelectedButtonId() string {
@@ -7352,7 +7602,7 @@ type ButtonsMessage struct {
 func (x *ButtonsMessage) Reset() {
 	*x = ButtonsMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[34]
+		mi := &file_binary_proto_def_proto_msgTypes[31]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7365,7 +7615,7 @@ func (x *ButtonsMessage) String() string {
 func (*ButtonsMessage) ProtoMessage() {}
 
 func (x *ButtonsMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[34]
+	mi := &file_binary_proto_def_proto_msgTypes[31]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7378,7 +7628,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{34}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{31}
 }
 
 func (x *ButtonsMessage) GetContentText() string {
@@ -7492,6 +7742,69 @@ func (*ButtonsMessage_VideoMessage) isButtonsMessage_Header() {}
 
 func (*ButtonsMessage_LocationMessage) isButtonsMessage_Header() {}
 
+type BotFeedbackMessage struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	MessageKey *MessageKey                         `protobuf:"bytes,1,opt,name=messageKey" json:"messageKey,omitempty"`
+	Kind       *BotFeedbackMessage_BotFeedbackKind `protobuf:"varint,2,opt,name=kind,enum=proto.BotFeedbackMessage_BotFeedbackKind" json:"kind,omitempty"`
+	Text       *string                             `protobuf:"bytes,3,opt,name=text" json:"text,omitempty"`
+}
+
+func (x *BotFeedbackMessage) Reset() {
+	*x = BotFeedbackMessage{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[32]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *BotFeedbackMessage) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BotFeedbackMessage) ProtoMessage() {}
+
+func (x *BotFeedbackMessage) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[32]
+	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 BotFeedbackMessage.ProtoReflect.Descriptor instead.
+func (*BotFeedbackMessage) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{32}
+}
+
+func (x *BotFeedbackMessage) GetMessageKey() *MessageKey {
+	if x != nil {
+		return x.MessageKey
+	}
+	return nil
+}
+
+func (x *BotFeedbackMessage) GetKind() BotFeedbackMessage_BotFeedbackKind {
+	if x != nil && x.Kind != nil {
+		return *x.Kind
+	}
+	return BotFeedbackMessage_BOT_FEEDBACK_POSITIVE
+}
+
+func (x *BotFeedbackMessage) GetText() string {
+	if x != nil && x.Text != nil {
+		return *x.Text
+	}
+	return ""
+}
+
 type AudioMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -7517,7 +7830,7 @@ type AudioMessage struct {
 func (x *AudioMessage) Reset() {
 	*x = AudioMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[35]
+		mi := &file_binary_proto_def_proto_msgTypes[33]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7530,7 +7843,7 @@ func (x *AudioMessage) String() string {
 func (*AudioMessage) ProtoMessage() {}
 
 func (x *AudioMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[35]
+	mi := &file_binary_proto_def_proto_msgTypes[33]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7543,7 +7856,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{35}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{33}
 }
 
 func (x *AudioMessage) GetUrl() string {
@@ -7663,7 +7976,7 @@ type AppStateSyncKey struct {
 func (x *AppStateSyncKey) Reset() {
 	*x = AppStateSyncKey{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[36]
+		mi := &file_binary_proto_def_proto_msgTypes[34]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7676,7 +7989,7 @@ func (x *AppStateSyncKey) String() string {
 func (*AppStateSyncKey) ProtoMessage() {}
 
 func (x *AppStateSyncKey) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[36]
+	mi := &file_binary_proto_def_proto_msgTypes[34]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7689,7 +8002,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{36}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{34}
 }
 
 func (x *AppStateSyncKey) GetKeyId() *AppStateSyncKeyId {
@@ -7717,7 +8030,7 @@ type AppStateSyncKeyShare struct {
 func (x *AppStateSyncKeyShare) Reset() {
 	*x = AppStateSyncKeyShare{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[37]
+		mi := &file_binary_proto_def_proto_msgTypes[35]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7730,7 +8043,7 @@ func (x *AppStateSyncKeyShare) String() string {
 func (*AppStateSyncKeyShare) ProtoMessage() {}
 
 func (x *AppStateSyncKeyShare) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[37]
+	mi := &file_binary_proto_def_proto_msgTypes[35]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7743,7 +8056,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{37}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{35}
 }
 
 func (x *AppStateSyncKeyShare) GetKeys() []*AppStateSyncKey {
@@ -7764,7 +8077,7 @@ type AppStateSyncKeyRequest struct {
 func (x *AppStateSyncKeyRequest) Reset() {
 	*x = AppStateSyncKeyRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[38]
+		mi := &file_binary_proto_def_proto_msgTypes[36]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7777,7 +8090,7 @@ func (x *AppStateSyncKeyRequest) String() string {
 func (*AppStateSyncKeyRequest) ProtoMessage() {}
 
 func (x *AppStateSyncKeyRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[38]
+	mi := &file_binary_proto_def_proto_msgTypes[36]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7790,7 +8103,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{38}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{36}
 }
 
 func (x *AppStateSyncKeyRequest) GetKeyIds() []*AppStateSyncKeyId {
@@ -7811,7 +8124,7 @@ type AppStateSyncKeyId struct {
 func (x *AppStateSyncKeyId) Reset() {
 	*x = AppStateSyncKeyId{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[39]
+		mi := &file_binary_proto_def_proto_msgTypes[37]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7824,7 +8137,7 @@ func (x *AppStateSyncKeyId) String() string {
 func (*AppStateSyncKeyId) ProtoMessage() {}
 
 func (x *AppStateSyncKeyId) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[39]
+	mi := &file_binary_proto_def_proto_msgTypes[37]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7837,7 +8150,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{39}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{37}
 }
 
 func (x *AppStateSyncKeyId) GetKeyId() []byte {
@@ -7860,7 +8173,7 @@ type AppStateSyncKeyFingerprint struct {
 func (x *AppStateSyncKeyFingerprint) Reset() {
 	*x = AppStateSyncKeyFingerprint{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[40]
+		mi := &file_binary_proto_def_proto_msgTypes[38]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7873,7 +8186,7 @@ func (x *AppStateSyncKeyFingerprint) String() string {
 func (*AppStateSyncKeyFingerprint) ProtoMessage() {}
 
 func (x *AppStateSyncKeyFingerprint) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[40]
+	mi := &file_binary_proto_def_proto_msgTypes[38]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7886,7 +8199,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{40}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{38}
 }
 
 func (x *AppStateSyncKeyFingerprint) GetRawId() uint32 {
@@ -7923,7 +8236,7 @@ type AppStateSyncKeyData struct {
 func (x *AppStateSyncKeyData) Reset() {
 	*x = AppStateSyncKeyData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[41]
+		mi := &file_binary_proto_def_proto_msgTypes[39]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7936,7 +8249,7 @@ func (x *AppStateSyncKeyData) String() string {
 func (*AppStateSyncKeyData) ProtoMessage() {}
 
 func (x *AppStateSyncKeyData) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[41]
+	mi := &file_binary_proto_def_proto_msgTypes[39]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7949,7 +8262,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{41}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{39}
 }
 
 func (x *AppStateSyncKeyData) GetKeyData() []byte {
@@ -7985,7 +8298,7 @@ type AppStateFatalExceptionNotification struct {
 func (x *AppStateFatalExceptionNotification) Reset() {
 	*x = AppStateFatalExceptionNotification{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[42]
+		mi := &file_binary_proto_def_proto_msgTypes[40]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7998,7 +8311,7 @@ func (x *AppStateFatalExceptionNotification) String() string {
 func (*AppStateFatalExceptionNotification) ProtoMessage() {}
 
 func (x *AppStateFatalExceptionNotification) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[42]
+	mi := &file_binary_proto_def_proto_msgTypes[40]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8011,7 +8324,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{42}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{40}
 }
 
 func (x *AppStateFatalExceptionNotification) GetCollectionNames() []string {
@@ -8041,7 +8354,7 @@ type Location struct {
 func (x *Location) Reset() {
 	*x = Location{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[43]
+		mi := &file_binary_proto_def_proto_msgTypes[41]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8054,7 +8367,7 @@ func (x *Location) String() string {
 func (*Location) ProtoMessage() {}
 
 func (x *Location) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[43]
+	mi := &file_binary_proto_def_proto_msgTypes[41]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8067,7 +8380,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{43}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{41}
 }
 
 func (x *Location) GetDegreesLatitude() float64 {
@@ -8106,7 +8419,7 @@ type InteractiveAnnotation struct {
 func (x *InteractiveAnnotation) Reset() {
 	*x = InteractiveAnnotation{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[44]
+		mi := &file_binary_proto_def_proto_msgTypes[42]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8119,7 +8432,7 @@ func (x *InteractiveAnnotation) String() string {
 func (*InteractiveAnnotation) ProtoMessage() {}
 
 func (x *InteractiveAnnotation) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[44]
+	mi := &file_binary_proto_def_proto_msgTypes[42]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8132,7 +8445,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{44}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{42}
 }
 
 func (x *InteractiveAnnotation) GetPolygonVertices() []*Point {
@@ -8183,7 +8496,7 @@ type HydratedTemplateButton struct {
 func (x *HydratedTemplateButton) Reset() {
 	*x = HydratedTemplateButton{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[45]
+		mi := &file_binary_proto_def_proto_msgTypes[43]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8196,7 +8509,7 @@ func (x *HydratedTemplateButton) String() string {
 func (*HydratedTemplateButton) ProtoMessage() {}
 
 func (x *HydratedTemplateButton) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[45]
+	mi := &file_binary_proto_def_proto_msgTypes[43]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8209,7 +8522,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{45}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{43}
 }
 
 func (x *HydratedTemplateButton) GetIndex() uint32 {
@@ -8281,7 +8594,7 @@ type GroupMention struct {
 func (x *GroupMention) Reset() {
 	*x = GroupMention{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[46]
+		mi := &file_binary_proto_def_proto_msgTypes[44]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8294,7 +8607,7 @@ func (x *GroupMention) String() string {
 func (*GroupMention) ProtoMessage() {}
 
 func (x *GroupMention) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[46]
+	mi := &file_binary_proto_def_proto_msgTypes[44]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8307,7 +8620,7 @@ func (x *GroupMention) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GroupMention.ProtoReflect.Descriptor instead.
 func (*GroupMention) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{46}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{44}
 }
 
 func (x *GroupMention) GetGroupJid() string {
@@ -8329,13 +8642,15 @@ type DisappearingMode struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Initiator *DisappearingMode_Initiator `protobuf:"varint,1,opt,name=initiator,enum=proto.DisappearingMode_Initiator" json:"initiator,omitempty"`
+	Initiator          *DisappearingMode_Initiator `protobuf:"varint,1,opt,name=initiator,enum=proto.DisappearingMode_Initiator" json:"initiator,omitempty"`
+	Trigger            *DisappearingMode_Trigger   `protobuf:"varint,2,opt,name=trigger,enum=proto.DisappearingMode_Trigger" json:"trigger,omitempty"`
+	InitiatorDeviceJid *string                     `protobuf:"bytes,3,opt,name=initiatorDeviceJid" json:"initiatorDeviceJid,omitempty"`
 }
 
 func (x *DisappearingMode) Reset() {
 	*x = DisappearingMode{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[47]
+		mi := &file_binary_proto_def_proto_msgTypes[45]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8348,7 +8663,7 @@ func (x *DisappearingMode) String() string {
 func (*DisappearingMode) ProtoMessage() {}
 
 func (x *DisappearingMode) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[47]
+	mi := &file_binary_proto_def_proto_msgTypes[45]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8361,7 +8676,7 @@ func (x *DisappearingMode) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DisappearingMode.ProtoReflect.Descriptor instead.
 func (*DisappearingMode) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{47}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{45}
 }
 
 func (x *DisappearingMode) GetInitiator() DisappearingMode_Initiator {
@@ -8371,6 +8686,20 @@ func (x *DisappearingMode) GetInitiator() DisappearingMode_Initiator {
 	return DisappearingMode_CHANGED_IN_CHAT
 }
 
+func (x *DisappearingMode) GetTrigger() DisappearingMode_Trigger {
+	if x != nil && x.Trigger != nil {
+		return *x.Trigger
+	}
+	return DisappearingMode_UNKNOWN
+}
+
+func (x *DisappearingMode) GetInitiatorDeviceJid() string {
+	if x != nil && x.InitiatorDeviceJid != nil {
+		return *x.InitiatorDeviceJid
+	}
+	return ""
+}
+
 type DeviceListMetadata struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -8387,7 +8716,7 @@ type DeviceListMetadata struct {
 func (x *DeviceListMetadata) Reset() {
 	*x = DeviceListMetadata{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[48]
+		mi := &file_binary_proto_def_proto_msgTypes[46]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8400,7 +8729,7 @@ func (x *DeviceListMetadata) String() string {
 func (*DeviceListMetadata) ProtoMessage() {}
 
 func (x *DeviceListMetadata) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[48]
+	mi := &file_binary_proto_def_proto_msgTypes[46]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8413,7 +8742,7 @@ func (x *DeviceListMetadata) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeviceListMetadata.ProtoReflect.Descriptor instead.
 func (*DeviceListMetadata) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{48}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{46}
 }
 
 func (x *DeviceListMetadata) GetSenderKeyHash() []byte {
@@ -8463,40 +8792,43 @@ type ContextInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	StanzaId                         *string                          `protobuf:"bytes,1,opt,name=stanzaId" json:"stanzaId,omitempty"`
-	Participant                      *string                          `protobuf:"bytes,2,opt,name=participant" json:"participant,omitempty"`
-	QuotedMessage                    *Message                         `protobuf:"bytes,3,opt,name=quotedMessage" json:"quotedMessage,omitempty"`
-	RemoteJid                        *string                          `protobuf:"bytes,4,opt,name=remoteJid" json:"remoteJid,omitempty"`
-	MentionedJid                     []string                         `protobuf:"bytes,15,rep,name=mentionedJid" json:"mentionedJid,omitempty"`
-	ConversionSource                 *string                          `protobuf:"bytes,18,opt,name=conversionSource" json:"conversionSource,omitempty"`
-	ConversionData                   []byte                           `protobuf:"bytes,19,opt,name=conversionData" json:"conversionData,omitempty"`
-	ConversionDelaySeconds           *uint32                          `protobuf:"varint,20,opt,name=conversionDelaySeconds" json:"conversionDelaySeconds,omitempty"`
-	ForwardingScore                  *uint32                          `protobuf:"varint,21,opt,name=forwardingScore" json:"forwardingScore,omitempty"`
-	IsForwarded                      *bool                            `protobuf:"varint,22,opt,name=isForwarded" json:"isForwarded,omitempty"`
-	QuotedAd                         *ContextInfo_AdReplyInfo         `protobuf:"bytes,23,opt,name=quotedAd" json:"quotedAd,omitempty"`
-	PlaceholderKey                   *MessageKey                      `protobuf:"bytes,24,opt,name=placeholderKey" json:"placeholderKey,omitempty"`
-	Expiration                       *uint32                          `protobuf:"varint,25,opt,name=expiration" json:"expiration,omitempty"`
-	EphemeralSettingTimestamp        *int64                           `protobuf:"varint,26,opt,name=ephemeralSettingTimestamp" json:"ephemeralSettingTimestamp,omitempty"`
-	EphemeralSharedSecret            []byte                           `protobuf:"bytes,27,opt,name=ephemeralSharedSecret" json:"ephemeralSharedSecret,omitempty"`
-	ExternalAdReply                  *ContextInfo_ExternalAdReplyInfo `protobuf:"bytes,28,opt,name=externalAdReply" json:"externalAdReply,omitempty"`
-	EntryPointConversionSource       *string                          `protobuf:"bytes,29,opt,name=entryPointConversionSource" json:"entryPointConversionSource,omitempty"`
-	EntryPointConversionApp          *string                          `protobuf:"bytes,30,opt,name=entryPointConversionApp" json:"entryPointConversionApp,omitempty"`
-	EntryPointConversionDelaySeconds *uint32                          `protobuf:"varint,31,opt,name=entryPointConversionDelaySeconds" json:"entryPointConversionDelaySeconds,omitempty"`
-	DisappearingMode                 *DisappearingMode                `protobuf:"bytes,32,opt,name=disappearingMode" json:"disappearingMode,omitempty"`
-	ActionLink                       *ActionLink                      `protobuf:"bytes,33,opt,name=actionLink" json:"actionLink,omitempty"`
-	GroupSubject                     *string                          `protobuf:"bytes,34,opt,name=groupSubject" json:"groupSubject,omitempty"`
-	ParentGroupJid                   *string                          `protobuf:"bytes,35,opt,name=parentGroupJid" json:"parentGroupJid,omitempty"`
-	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"`
+	StanzaId                         *string                                     `protobuf:"bytes,1,opt,name=stanzaId" json:"stanzaId,omitempty"`
+	Participant                      *string                                     `protobuf:"bytes,2,opt,name=participant" json:"participant,omitempty"`
+	QuotedMessage                    *Message                                    `protobuf:"bytes,3,opt,name=quotedMessage" json:"quotedMessage,omitempty"`
+	RemoteJid                        *string                                     `protobuf:"bytes,4,opt,name=remoteJid" json:"remoteJid,omitempty"`
+	MentionedJid                     []string                                    `protobuf:"bytes,15,rep,name=mentionedJid" json:"mentionedJid,omitempty"`
+	ConversionSource                 *string                                     `protobuf:"bytes,18,opt,name=conversionSource" json:"conversionSource,omitempty"`
+	ConversionData                   []byte                                      `protobuf:"bytes,19,opt,name=conversionData" json:"conversionData,omitempty"`
+	ConversionDelaySeconds           *uint32                                     `protobuf:"varint,20,opt,name=conversionDelaySeconds" json:"conversionDelaySeconds,omitempty"`
+	ForwardingScore                  *uint32                                     `protobuf:"varint,21,opt,name=forwardingScore" json:"forwardingScore,omitempty"`
+	IsForwarded                      *bool                                       `protobuf:"varint,22,opt,name=isForwarded" json:"isForwarded,omitempty"`
+	QuotedAd                         *ContextInfo_AdReplyInfo                    `protobuf:"bytes,23,opt,name=quotedAd" json:"quotedAd,omitempty"`
+	PlaceholderKey                   *MessageKey                                 `protobuf:"bytes,24,opt,name=placeholderKey" json:"placeholderKey,omitempty"`
+	Expiration                       *uint32                                     `protobuf:"varint,25,opt,name=expiration" json:"expiration,omitempty"`
+	EphemeralSettingTimestamp        *int64                                      `protobuf:"varint,26,opt,name=ephemeralSettingTimestamp" json:"ephemeralSettingTimestamp,omitempty"`
+	EphemeralSharedSecret            []byte                                      `protobuf:"bytes,27,opt,name=ephemeralSharedSecret" json:"ephemeralSharedSecret,omitempty"`
+	ExternalAdReply                  *ContextInfo_ExternalAdReplyInfo            `protobuf:"bytes,28,opt,name=externalAdReply" json:"externalAdReply,omitempty"`
+	EntryPointConversionSource       *string                                     `protobuf:"bytes,29,opt,name=entryPointConversionSource" json:"entryPointConversionSource,omitempty"`
+	EntryPointConversionApp          *string                                     `protobuf:"bytes,30,opt,name=entryPointConversionApp" json:"entryPointConversionApp,omitempty"`
+	EntryPointConversionDelaySeconds *uint32                                     `protobuf:"varint,31,opt,name=entryPointConversionDelaySeconds" json:"entryPointConversionDelaySeconds,omitempty"`
+	DisappearingMode                 *DisappearingMode                           `protobuf:"bytes,32,opt,name=disappearingMode" json:"disappearingMode,omitempty"`
+	ActionLink                       *ActionLink                                 `protobuf:"bytes,33,opt,name=actionLink" json:"actionLink,omitempty"`
+	GroupSubject                     *string                                     `protobuf:"bytes,34,opt,name=groupSubject" json:"groupSubject,omitempty"`
+	ParentGroupJid                   *string                                     `protobuf:"bytes,35,opt,name=parentGroupJid" json:"parentGroupJid,omitempty"`
+	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"`
+	ForwardedNewsletterMessageInfo   *ContextInfo_ForwardedNewsletterMessageInfo `protobuf:"bytes,43,opt,name=forwardedNewsletterMessageInfo" json:"forwardedNewsletterMessageInfo,omitempty"`
+	BusinessMessageForwardInfo       *ContextInfo_BusinessMessageForwardInfo     `protobuf:"bytes,44,opt,name=businessMessageForwardInfo" json:"businessMessageForwardInfo,omitempty"`
+	SmbClientCampaignId              *string                                     `protobuf:"bytes,45,opt,name=smbClientCampaignId" json:"smbClientCampaignId,omitempty"`
 }
 
 func (x *ContextInfo) Reset() {
 	*x = ContextInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[49]
+		mi := &file_binary_proto_def_proto_msgTypes[47]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8509,7 +8841,7 @@ func (x *ContextInfo) String() string {
 func (*ContextInfo) ProtoMessage() {}
 
 func (x *ContextInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[49]
+	mi := &file_binary_proto_def_proto_msgTypes[47]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8522,7 +8854,7 @@ func (x *ContextInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ContextInfo.ProtoReflect.Descriptor instead.
 func (*ContextInfo) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{49}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{47}
 }
 
 func (x *ContextInfo) GetStanzaId() string {
@@ -8721,6 +9053,216 @@ func (x *ContextInfo) GetUtm() *ContextInfo_UTMInfo {
 	return nil
 }
 
+func (x *ContextInfo) GetForwardedNewsletterMessageInfo() *ContextInfo_ForwardedNewsletterMessageInfo {
+	if x != nil {
+		return x.ForwardedNewsletterMessageInfo
+	}
+	return nil
+}
+
+func (x *ContextInfo) GetBusinessMessageForwardInfo() *ContextInfo_BusinessMessageForwardInfo {
+	if x != nil {
+		return x.BusinessMessageForwardInfo
+	}
+	return nil
+}
+
+func (x *ContextInfo) GetSmbClientCampaignId() string {
+	if x != nil && x.SmbClientCampaignId != nil {
+		return *x.SmbClientCampaignId
+	}
+	return ""
+}
+
+type BotPluginMetadata struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	IsPlaceholder *bool `protobuf:"varint,1,opt,name=isPlaceholder" json:"isPlaceholder,omitempty"`
+}
+
+func (x *BotPluginMetadata) Reset() {
+	*x = BotPluginMetadata{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[48]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *BotPluginMetadata) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BotPluginMetadata) ProtoMessage() {}
+
+func (x *BotPluginMetadata) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[48]
+	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 BotPluginMetadata.ProtoReflect.Descriptor instead.
+func (*BotPluginMetadata) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{48}
+}
+
+func (x *BotPluginMetadata) GetIsPlaceholder() bool {
+	if x != nil && x.IsPlaceholder != nil {
+		return *x.IsPlaceholder
+	}
+	return false
+}
+
+type BotMetadata struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	AvatarMetadata *BotAvatarMetadata `protobuf:"bytes,1,opt,name=avatarMetadata" json:"avatarMetadata,omitempty"`
+	PersonaId      *string            `protobuf:"bytes,2,opt,name=personaId" json:"personaId,omitempty"`
+	PluginMetadata *BotPluginMetadata `protobuf:"bytes,3,opt,name=pluginMetadata" json:"pluginMetadata,omitempty"`
+}
+
+func (x *BotMetadata) Reset() {
+	*x = BotMetadata{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[49]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *BotMetadata) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BotMetadata) ProtoMessage() {}
+
+func (x *BotMetadata) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[49]
+	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 BotMetadata.ProtoReflect.Descriptor instead.
+func (*BotMetadata) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{49}
+}
+
+func (x *BotMetadata) GetAvatarMetadata() *BotAvatarMetadata {
+	if x != nil {
+		return x.AvatarMetadata
+	}
+	return nil
+}
+
+func (x *BotMetadata) GetPersonaId() string {
+	if x != nil && x.PersonaId != nil {
+		return *x.PersonaId
+	}
+	return ""
+}
+
+func (x *BotMetadata) GetPluginMetadata() *BotPluginMetadata {
+	if x != nil {
+		return x.PluginMetadata
+	}
+	return nil
+}
+
+type BotAvatarMetadata struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Sentiment     *uint32 `protobuf:"varint,1,opt,name=sentiment" json:"sentiment,omitempty"`
+	BehaviorGraph *string `protobuf:"bytes,2,opt,name=behaviorGraph" json:"behaviorGraph,omitempty"`
+	Action        *uint32 `protobuf:"varint,3,opt,name=action" json:"action,omitempty"`
+	Intensity     *uint32 `protobuf:"varint,4,opt,name=intensity" json:"intensity,omitempty"`
+	WordCount     *uint32 `protobuf:"varint,5,opt,name=wordCount" json:"wordCount,omitempty"`
+}
+
+func (x *BotAvatarMetadata) Reset() {
+	*x = BotAvatarMetadata{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[50]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *BotAvatarMetadata) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BotAvatarMetadata) ProtoMessage() {}
+
+func (x *BotAvatarMetadata) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[50]
+	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 BotAvatarMetadata.ProtoReflect.Descriptor instead.
+func (*BotAvatarMetadata) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{50}
+}
+
+func (x *BotAvatarMetadata) GetSentiment() uint32 {
+	if x != nil && x.Sentiment != nil {
+		return *x.Sentiment
+	}
+	return 0
+}
+
+func (x *BotAvatarMetadata) GetBehaviorGraph() string {
+	if x != nil && x.BehaviorGraph != nil {
+		return *x.BehaviorGraph
+	}
+	return ""
+}
+
+func (x *BotAvatarMetadata) GetAction() uint32 {
+	if x != nil && x.Action != nil {
+		return *x.Action
+	}
+	return 0
+}
+
+func (x *BotAvatarMetadata) GetIntensity() uint32 {
+	if x != nil && x.Intensity != nil {
+		return *x.Intensity
+	}
+	return 0
+}
+
+func (x *BotAvatarMetadata) GetWordCount() uint32 {
+	if x != nil && x.WordCount != nil {
+		return *x.WordCount
+	}
+	return 0
+}
+
 type ActionLink struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -8733,7 +9275,7 @@ type ActionLink struct {
 func (x *ActionLink) Reset() {
 	*x = ActionLink{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[50]
+		mi := &file_binary_proto_def_proto_msgTypes[51]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8746,7 +9288,7 @@ func (x *ActionLink) String() string {
 func (*ActionLink) ProtoMessage() {}
 
 func (x *ActionLink) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[50]
+	mi := &file_binary_proto_def_proto_msgTypes[51]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8759,7 +9301,7 @@ func (x *ActionLink) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ActionLink.ProtoReflect.Descriptor instead.
 func (*ActionLink) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{50}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{51}
 }
 
 func (x *ActionLink) GetUrl() string {
@@ -8793,7 +9335,7 @@ type TemplateButton struct {
 func (x *TemplateButton) Reset() {
 	*x = TemplateButton{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[51]
+		mi := &file_binary_proto_def_proto_msgTypes[52]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8806,7 +9348,7 @@ func (x *TemplateButton) String() string {
 func (*TemplateButton) ProtoMessage() {}
 
 func (x *TemplateButton) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[51]
+	mi := &file_binary_proto_def_proto_msgTypes[52]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8819,7 +9361,7 @@ func (x *TemplateButton) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TemplateButton.ProtoReflect.Descriptor instead.
 func (*TemplateButton) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{51}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{52}
 }
 
 func (x *TemplateButton) GetIndex() uint32 {
@@ -8893,7 +9435,7 @@ type Point struct {
 func (x *Point) Reset() {
 	*x = Point{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[52]
+		mi := &file_binary_proto_def_proto_msgTypes[53]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8906,7 +9448,7 @@ func (x *Point) String() string {
 func (*Point) ProtoMessage() {}
 
 func (x *Point) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[52]
+	mi := &file_binary_proto_def_proto_msgTypes[53]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8919,7 +9461,7 @@ func (x *Point) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Point.ProtoReflect.Descriptor instead.
 func (*Point) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{52}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{53}
 }
 
 func (x *Point) GetXDeprecated() int32 {
@@ -8970,7 +9512,7 @@ type PaymentBackground struct {
 func (x *PaymentBackground) Reset() {
 	*x = PaymentBackground{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[53]
+		mi := &file_binary_proto_def_proto_msgTypes[54]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8983,7 +9525,7 @@ func (x *PaymentBackground) String() string {
 func (*PaymentBackground) ProtoMessage() {}
 
 func (x *PaymentBackground) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[53]
+	mi := &file_binary_proto_def_proto_msgTypes[54]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8996,7 +9538,7 @@ func (x *PaymentBackground) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PaymentBackground.ProtoReflect.Descriptor instead.
 func (*PaymentBackground) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{53}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{54}
 }
 
 func (x *PaymentBackground) GetId() string {
@@ -9082,7 +9624,7 @@ type Money struct {
 func (x *Money) Reset() {
 	*x = Money{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[54]
+		mi := &file_binary_proto_def_proto_msgTypes[55]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -9095,7 +9637,7 @@ func (x *Money) String() string {
 func (*Money) ProtoMessage() {}
 
 func (x *Money) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[54]
+	mi := &file_binary_proto_def_proto_msgTypes[55]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -9108,7 +9650,7 @@ func (x *Money) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Money.ProtoReflect.Descriptor instead.
 func (*Money) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{54}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{55}
 }
 
 func (x *Money) GetValue() int64 {
@@ -9189,16 +9731,18 @@ type Message struct {
 	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"`
+	PinInChatMessage                           *PinInChatMessage             `protobuf:"bytes,63,opt,name=pinInChatMessage" json:"pinInChatMessage,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"`
+	BotInvokeMessage                           *FutureProofMessage           `protobuf:"bytes,67,opt,name=botInvokeMessage" json:"botInvokeMessage,omitempty"`
+	EncCommentMessage                          *EncCommentMessage            `protobuf:"bytes,68,opt,name=encCommentMessage" json:"encCommentMessage,omitempty"`
 }
 
 func (x *Message) Reset() {
 	*x = Message{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[55]
+		mi := &file_binary_proto_def_proto_msgTypes[56]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -9211,7 +9755,7 @@ func (x *Message) String() string {
 func (*Message) ProtoMessage() {}
 
 func (x *Message) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[55]
+	mi := &file_binary_proto_def_proto_msgTypes[56]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -9224,7 +9768,7 @@ func (x *Message) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Message.ProtoReflect.Descriptor instead.
 func (*Message) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{55}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{56}
 }
 
 func (x *Message) GetConversation() string {
@@ -9591,9 +10135,9 @@ func (x *Message) GetGroupMentionedMessage() *FutureProofMessage {
 	return nil
 }
 
-func (x *Message) GetPinMessage() *PinMessage {
+func (x *Message) GetPinInChatMessage() *PinInChatMessage {
 	if x != nil {
-		return x.PinMessage
+		return x.PinInChatMessage
 	}
 	return nil
 }
@@ -9619,21 +10163,101 @@ func (x *Message) GetPtvMessage() *VideoMessage {
 	return nil
 }
 
+func (x *Message) GetBotInvokeMessage() *FutureProofMessage {
+	if x != nil {
+		return x.BotInvokeMessage
+	}
+	return nil
+}
+
+func (x *Message) GetEncCommentMessage() *EncCommentMessage {
+	if x != nil {
+		return x.EncCommentMessage
+	}
+	return nil
+}
+
+type MessageSecretMessage struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Version    *int32 `protobuf:"fixed32,1,opt,name=version" json:"version,omitempty"`
+	EncIv      []byte `protobuf:"bytes,2,opt,name=encIv" json:"encIv,omitempty"`
+	EncPayload []byte `protobuf:"bytes,3,opt,name=encPayload" json:"encPayload,omitempty"`
+}
+
+func (x *MessageSecretMessage) Reset() {
+	*x = MessageSecretMessage{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[57]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MessageSecretMessage) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MessageSecretMessage) ProtoMessage() {}
+
+func (x *MessageSecretMessage) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[57]
+	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 MessageSecretMessage.ProtoReflect.Descriptor instead.
+func (*MessageSecretMessage) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{57}
+}
+
+func (x *MessageSecretMessage) GetVersion() int32 {
+	if x != nil && x.Version != nil {
+		return *x.Version
+	}
+	return 0
+}
+
+func (x *MessageSecretMessage) GetEncIv() []byte {
+	if x != nil {
+		return x.EncIv
+	}
+	return nil
+}
+
+func (x *MessageSecretMessage) GetEncPayload() []byte {
+	if x != nil {
+		return x.EncPayload
+	}
+	return nil
+}
+
 type MessageContextInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	DeviceListMetadata        *DeviceListMetadata `protobuf:"bytes,1,opt,name=deviceListMetadata" json:"deviceListMetadata,omitempty"`
-	DeviceListMetadataVersion *int32              `protobuf:"varint,2,opt,name=deviceListMetadataVersion" json:"deviceListMetadataVersion,omitempty"`
-	MessageSecret             []byte              `protobuf:"bytes,3,opt,name=messageSecret" json:"messageSecret,omitempty"`
-	PaddingBytes              []byte              `protobuf:"bytes,4,opt,name=paddingBytes" json:"paddingBytes,omitempty"`
+	DeviceListMetadata         *DeviceListMetadata `protobuf:"bytes,1,opt,name=deviceListMetadata" json:"deviceListMetadata,omitempty"`
+	DeviceListMetadataVersion  *int32              `protobuf:"varint,2,opt,name=deviceListMetadataVersion" json:"deviceListMetadataVersion,omitempty"`
+	MessageSecret              []byte              `protobuf:"bytes,3,opt,name=messageSecret" json:"messageSecret,omitempty"`
+	PaddingBytes               []byte              `protobuf:"bytes,4,opt,name=paddingBytes" json:"paddingBytes,omitempty"`
+	MessageAddOnDurationInSecs *uint32             `protobuf:"varint,5,opt,name=messageAddOnDurationInSecs" json:"messageAddOnDurationInSecs,omitempty"`
+	BotMessageSecret           []byte              `protobuf:"bytes,6,opt,name=botMessageSecret" json:"botMessageSecret,omitempty"`
+	BotMetadata                *BotMetadata        `protobuf:"bytes,7,opt,name=botMetadata" json:"botMetadata,omitempty"`
 }
 
 func (x *MessageContextInfo) Reset() {
 	*x = MessageContextInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[56]
+		mi := &file_binary_proto_def_proto_msgTypes[58]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -9646,7 +10270,7 @@ func (x *MessageContextInfo) String() string {
 func (*MessageContextInfo) ProtoMessage() {}
 
 func (x *MessageContextInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[56]
+	mi := &file_binary_proto_def_proto_msgTypes[58]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -9659,7 +10283,7 @@ func (x *MessageContextInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MessageContextInfo.ProtoReflect.Descriptor instead.
 func (*MessageContextInfo) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{56}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{58}
 }
 
 func (x *MessageContextInfo) GetDeviceListMetadata() *DeviceListMetadata {
@@ -9690,6 +10314,27 @@ func (x *MessageContextInfo) GetPaddingBytes() []byte {
 	return nil
 }
 
+func (x *MessageContextInfo) GetMessageAddOnDurationInSecs() uint32 {
+	if x != nil && x.MessageAddOnDurationInSecs != nil {
+		return *x.MessageAddOnDurationInSecs
+	}
+	return 0
+}
+
+func (x *MessageContextInfo) GetBotMessageSecret() []byte {
+	if x != nil {
+		return x.BotMessageSecret
+	}
+	return nil
+}
+
+func (x *MessageContextInfo) GetBotMetadata() *BotMetadata {
+	if x != nil {
+		return x.BotMetadata
+	}
+	return nil
+}
+
 type VideoMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -9723,7 +10368,7 @@ type VideoMessage struct {
 func (x *VideoMessage) Reset() {
 	*x = VideoMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[57]
+		mi := &file_binary_proto_def_proto_msgTypes[59]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -9736,7 +10381,7 @@ func (x *VideoMessage) String() string {
 func (*VideoMessage) ProtoMessage() {}
 
 func (x *VideoMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[57]
+	mi := &file_binary_proto_def_proto_msgTypes[59]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -9749,7 +10394,7 @@ func (x *VideoMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use VideoMessage.ProtoReflect.Descriptor instead.
 func (*VideoMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{57}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{59}
 }
 
 func (x *VideoMessage) GetUrl() string {
@@ -9932,7 +10577,7 @@ type TemplateMessage struct {
 func (x *TemplateMessage) Reset() {
 	*x = TemplateMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[58]
+		mi := &file_binary_proto_def_proto_msgTypes[60]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -9945,7 +10590,7 @@ func (x *TemplateMessage) String() string {
 func (*TemplateMessage) ProtoMessage() {}
 
 func (x *TemplateMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[58]
+	mi := &file_binary_proto_def_proto_msgTypes[60]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -9958,7 +10603,7 @@ func (x *TemplateMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TemplateMessage.ProtoReflect.Descriptor instead.
 func (*TemplateMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{58}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{60}
 }
 
 func (x *TemplateMessage) GetContextInfo() *ContextInfo {
@@ -10046,7 +10691,7 @@ type TemplateButtonReplyMessage struct {
 func (x *TemplateButtonReplyMessage) Reset() {
 	*x = TemplateButtonReplyMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[59]
+		mi := &file_binary_proto_def_proto_msgTypes[61]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -10059,7 +10704,7 @@ func (x *TemplateButtonReplyMessage) String() string {
 func (*TemplateButtonReplyMessage) ProtoMessage() {}
 
 func (x *TemplateButtonReplyMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[59]
+	mi := &file_binary_proto_def_proto_msgTypes[61]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -10072,7 +10717,7 @@ func (x *TemplateButtonReplyMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TemplateButtonReplyMessage.ProtoReflect.Descriptor instead.
 func (*TemplateButtonReplyMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{59}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{61}
 }
 
 func (x *TemplateButtonReplyMessage) GetSelectedId() string {
@@ -10116,7 +10761,7 @@ type StickerSyncRMRMessage struct {
 func (x *StickerSyncRMRMessage) Reset() {
 	*x = StickerSyncRMRMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[60]
+		mi := &file_binary_proto_def_proto_msgTypes[62]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -10129,7 +10774,7 @@ func (x *StickerSyncRMRMessage) String() string {
 func (*StickerSyncRMRMessage) ProtoMessage() {}
 
 func (x *StickerSyncRMRMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[60]
+	mi := &file_binary_proto_def_proto_msgTypes[62]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -10142,7 +10787,7 @@ func (x *StickerSyncRMRMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StickerSyncRMRMessage.ProtoReflect.Descriptor instead.
 func (*StickerSyncRMRMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{60}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{62}
 }
 
 func (x *StickerSyncRMRMessage) GetFilehash() []string {
@@ -10188,12 +10833,13 @@ type StickerMessage struct {
 	ContextInfo       *ContextInfo `protobuf:"bytes,17,opt,name=contextInfo" json:"contextInfo,omitempty"`
 	StickerSentTs     *int64       `protobuf:"varint,18,opt,name=stickerSentTs" json:"stickerSentTs,omitempty"`
 	IsAvatar          *bool        `protobuf:"varint,19,opt,name=isAvatar" json:"isAvatar,omitempty"`
+	IsAiSticker       *bool        `protobuf:"varint,20,opt,name=isAiSticker" json:"isAiSticker,omitempty"`
 }
 
 func (x *StickerMessage) Reset() {
 	*x = StickerMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[61]
+		mi := &file_binary_proto_def_proto_msgTypes[63]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -10206,7 +10852,7 @@ func (x *StickerMessage) String() string {
 func (*StickerMessage) ProtoMessage() {}
 
 func (x *StickerMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[61]
+	mi := &file_binary_proto_def_proto_msgTypes[63]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -10219,7 +10865,7 @@ func (x *StickerMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StickerMessage.ProtoReflect.Descriptor instead.
 func (*StickerMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{61}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{63}
 }
 
 func (x *StickerMessage) GetUrl() string {
@@ -10341,6 +10987,13 @@ func (x *StickerMessage) GetIsAvatar() bool {
 	return false
 }
 
+func (x *StickerMessage) GetIsAiSticker() bool {
+	if x != nil && x.IsAiSticker != nil {
+		return *x.IsAiSticker
+	}
+	return false
+}
+
 type SenderKeyDistributionMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -10353,7 +11006,7 @@ type SenderKeyDistributionMessage struct {
 func (x *SenderKeyDistributionMessage) Reset() {
 	*x = SenderKeyDistributionMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[62]
+		mi := &file_binary_proto_def_proto_msgTypes[64]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -10366,7 +11019,7 @@ func (x *SenderKeyDistributionMessage) String() string {
 func (*SenderKeyDistributionMessage) ProtoMessage() {}
 
 func (x *SenderKeyDistributionMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[62]
+	mi := &file_binary_proto_def_proto_msgTypes[64]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -10379,7 +11032,7 @@ func (x *SenderKeyDistributionMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SenderKeyDistributionMessage.ProtoReflect.Descriptor instead.
 func (*SenderKeyDistributionMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{62}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{64}
 }
 
 func (x *SenderKeyDistributionMessage) GetGroupId() string {
@@ -10409,7 +11062,7 @@ type SendPaymentMessage struct {
 func (x *SendPaymentMessage) Reset() {
 	*x = SendPaymentMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[63]
+		mi := &file_binary_proto_def_proto_msgTypes[65]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -10422,7 +11075,7 @@ func (x *SendPaymentMessage) String() string {
 func (*SendPaymentMessage) ProtoMessage() {}
 
 func (x *SendPaymentMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[63]
+	mi := &file_binary_proto_def_proto_msgTypes[65]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -10435,7 +11088,7 @@ func (x *SendPaymentMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SendPaymentMessage.ProtoReflect.Descriptor instead.
 func (*SendPaymentMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{63}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{65}
 }
 
 func (x *SendPaymentMessage) GetNoteMessage() *Message {
@@ -10471,7 +11124,7 @@ type ScheduledCallEditMessage struct {
 func (x *ScheduledCallEditMessage) Reset() {
 	*x = ScheduledCallEditMessage{}
 	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)
 	}
@@ -10484,7 +11137,7 @@ func (x *ScheduledCallEditMessage) String() string {
 func (*ScheduledCallEditMessage) ProtoMessage() {}
 
 func (x *ScheduledCallEditMessage) 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 {
@@ -10497,7 +11150,7 @@ func (x *ScheduledCallEditMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ScheduledCallEditMessage.ProtoReflect.Descriptor instead.
 func (*ScheduledCallEditMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{64}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{66}
 }
 
 func (x *ScheduledCallEditMessage) GetKey() *MessageKey {
@@ -10527,7 +11180,7 @@ type ScheduledCallCreationMessage struct {
 func (x *ScheduledCallCreationMessage) Reset() {
 	*x = ScheduledCallCreationMessage{}
 	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)
 	}
@@ -10540,7 +11193,7 @@ func (x *ScheduledCallCreationMessage) String() string {
 func (*ScheduledCallCreationMessage) ProtoMessage() {}
 
 func (x *ScheduledCallCreationMessage) 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 {
@@ -10553,7 +11206,7 @@ func (x *ScheduledCallCreationMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ScheduledCallCreationMessage.ProtoReflect.Descriptor instead.
 func (*ScheduledCallCreationMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{65}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{67}
 }
 
 func (x *ScheduledCallCreationMessage) GetScheduledTimestampMs() int64 {
@@ -10588,7 +11241,7 @@ type RequestPhoneNumberMessage struct {
 func (x *RequestPhoneNumberMessage) Reset() {
 	*x = RequestPhoneNumberMessage{}
 	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)
 	}
@@ -10601,7 +11254,7 @@ func (x *RequestPhoneNumberMessage) String() string {
 func (*RequestPhoneNumberMessage) ProtoMessage() {}
 
 func (x *RequestPhoneNumberMessage) 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 {
@@ -10614,7 +11267,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{66}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{68}
 }
 
 func (x *RequestPhoneNumberMessage) GetContextInfo() *ContextInfo {
@@ -10641,7 +11294,7 @@ type RequestPaymentMessage struct {
 func (x *RequestPaymentMessage) Reset() {
 	*x = RequestPaymentMessage{}
 	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)
 	}
@@ -10654,7 +11307,7 @@ func (x *RequestPaymentMessage) String() string {
 func (*RequestPaymentMessage) ProtoMessage() {}
 
 func (x *RequestPaymentMessage) 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 {
@@ -10667,7 +11320,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{67}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{69}
 }
 
 func (x *RequestPaymentMessage) GetNoteMessage() *Message {
@@ -10733,7 +11386,7 @@ type ReactionMessage struct {
 func (x *ReactionMessage) Reset() {
 	*x = ReactionMessage{}
 	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)
 	}
@@ -10746,7 +11399,7 @@ func (x *ReactionMessage) String() string {
 func (*ReactionMessage) ProtoMessage() {}
 
 func (x *ReactionMessage) 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 {
@@ -10759,7 +11412,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{68}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{70}
 }
 
 func (x *ReactionMessage) GetKey() *MessageKey {
@@ -10809,12 +11462,13 @@ type ProtocolMessage struct {
 	TimestampMs                             *int64                                   `protobuf:"varint,15,opt,name=timestampMs" json:"timestampMs,omitempty"`
 	PeerDataOperationRequestMessage         *PeerDataOperationRequestMessage         `protobuf:"bytes,16,opt,name=peerDataOperationRequestMessage" json:"peerDataOperationRequestMessage,omitempty"`
 	PeerDataOperationRequestResponseMessage *PeerDataOperationRequestResponseMessage `protobuf:"bytes,17,opt,name=peerDataOperationRequestResponseMessage" json:"peerDataOperationRequestResponseMessage,omitempty"`
+	BotFeedbackMessage                      *BotFeedbackMessage                      `protobuf:"bytes,18,opt,name=botFeedbackMessage" json:"botFeedbackMessage,omitempty"`
 }
 
 func (x *ProtocolMessage) Reset() {
 	*x = ProtocolMessage{}
 	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)
 	}
@@ -10827,7 +11481,7 @@ func (x *ProtocolMessage) String() string {
 func (*ProtocolMessage) ProtoMessage() {}
 
 func (x *ProtocolMessage) 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 {
@@ -10840,7 +11494,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{69}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{71}
 }
 
 func (x *ProtocolMessage) GetKey() *MessageKey {
@@ -10941,6 +11595,13 @@ func (x *ProtocolMessage) GetPeerDataOperationRequestResponseMessage() *PeerData
 	return nil
 }
 
+func (x *ProtocolMessage) GetBotFeedbackMessage() *BotFeedbackMessage {
+	if x != nil {
+		return x.BotFeedbackMessage
+	}
+	return nil
+}
+
 type ProductMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -10957,7 +11618,7 @@ type ProductMessage struct {
 func (x *ProductMessage) Reset() {
 	*x = ProductMessage{}
 	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)
 	}
@@ -10970,7 +11631,7 @@ func (x *ProductMessage) String() string {
 func (*ProductMessage) ProtoMessage() {}
 
 func (x *ProductMessage) 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 {
@@ -10983,7 +11644,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{70}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{72}
 }
 
 func (x *ProductMessage) GetProduct() *ProductMessage_ProductSnapshot {
@@ -11039,7 +11700,7 @@ type PollVoteMessage struct {
 func (x *PollVoteMessage) Reset() {
 	*x = PollVoteMessage{}
 	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)
 	}
@@ -11052,7 +11713,7 @@ func (x *PollVoteMessage) String() string {
 func (*PollVoteMessage) ProtoMessage() {}
 
 func (x *PollVoteMessage) 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 {
@@ -11065,7 +11726,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{71}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{73}
 }
 
 func (x *PollVoteMessage) GetSelectedOptions() [][]byte {
@@ -11089,7 +11750,7 @@ type PollUpdateMessage struct {
 func (x *PollUpdateMessage) Reset() {
 	*x = PollUpdateMessage{}
 	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)
 	}
@@ -11102,7 +11763,7 @@ func (x *PollUpdateMessage) String() string {
 func (*PollUpdateMessage) ProtoMessage() {}
 
 func (x *PollUpdateMessage) 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 {
@@ -11115,7 +11776,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{72}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{74}
 }
 
 func (x *PollUpdateMessage) GetPollCreationMessageKey() *MessageKey {
@@ -11155,7 +11816,7 @@ type PollUpdateMessageMetadata struct {
 func (x *PollUpdateMessageMetadata) Reset() {
 	*x = PollUpdateMessageMetadata{}
 	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)
 	}
@@ -11168,7 +11829,7 @@ func (x *PollUpdateMessageMetadata) String() string {
 func (*PollUpdateMessageMetadata) ProtoMessage() {}
 
 func (x *PollUpdateMessageMetadata) 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 {
@@ -11181,7 +11842,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{73}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{75}
 }
 
 type PollEncValue struct {
@@ -11196,7 +11857,7 @@ type PollEncValue struct {
 func (x *PollEncValue) Reset() {
 	*x = PollEncValue{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[74]
+		mi := &file_binary_proto_def_proto_msgTypes[76]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11209,7 +11870,7 @@ func (x *PollEncValue) String() string {
 func (*PollEncValue) ProtoMessage() {}
 
 func (x *PollEncValue) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[74]
+	mi := &file_binary_proto_def_proto_msgTypes[76]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11222,7 +11883,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{74}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{76}
 }
 
 func (x *PollEncValue) GetEncPayload() []byte {
@@ -11254,7 +11915,7 @@ type PollCreationMessage struct {
 func (x *PollCreationMessage) Reset() {
 	*x = PollCreationMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[75]
+		mi := &file_binary_proto_def_proto_msgTypes[77]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11267,7 +11928,7 @@ func (x *PollCreationMessage) String() string {
 func (*PollCreationMessage) ProtoMessage() {}
 
 func (x *PollCreationMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[75]
+	mi := &file_binary_proto_def_proto_msgTypes[77]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11280,7 +11941,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{75}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{77}
 }
 
 func (x *PollCreationMessage) GetEncKey() []byte {
@@ -11318,33 +11979,33 @@ func (x *PollCreationMessage) GetContextInfo() *ContextInfo {
 	return nil
 }
 
-type PinMessage struct {
+type PinInChatMessage 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"`
+	Key               *MessageKey            `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
+	Type              *PinInChatMessage_Type `protobuf:"varint,2,opt,name=type,enum=proto.PinInChatMessage_Type" json:"type,omitempty"`
+	SenderTimestampMs *int64                 `protobuf:"varint,3,opt,name=senderTimestampMs" json:"senderTimestampMs,omitempty"`
 }
 
-func (x *PinMessage) Reset() {
-	*x = PinMessage{}
+func (x *PinInChatMessage) Reset() {
+	*x = PinInChatMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[76]
+		mi := &file_binary_proto_def_proto_msgTypes[78]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
 }
 
-func (x *PinMessage) String() string {
+func (x *PinInChatMessage) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*PinMessage) ProtoMessage() {}
+func (*PinInChatMessage) ProtoMessage() {}
 
-func (x *PinMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[76]
+func (x *PinInChatMessage) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[78]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11355,26 +12016,26 @@ func (x *PinMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use PinMessage.ProtoReflect.Descriptor instead.
-func (*PinMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{76}
+// Deprecated: Use PinInChatMessage.ProtoReflect.Descriptor instead.
+func (*PinInChatMessage) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{78}
 }
 
-func (x *PinMessage) GetKey() *MessageKey {
+func (x *PinInChatMessage) 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
+func (x *PinInChatMessage) GetType() PinInChatMessage_Type {
+	if x != nil && x.Type != nil {
+		return *x.Type
 	}
-	return PinMessage_UNKNOWN_PIN_MESSAGE_TYPE
+	return PinInChatMessage_UNKNOWN_TYPE
 }
 
-func (x *PinMessage) GetSenderTimestampMs() int64 {
+func (x *PinInChatMessage) GetSenderTimestampMs() int64 {
 	if x != nil && x.SenderTimestampMs != nil {
 		return *x.SenderTimestampMs
 	}
@@ -11394,7 +12055,7 @@ type PeerDataOperationRequestResponseMessage struct {
 func (x *PeerDataOperationRequestResponseMessage) Reset() {
 	*x = PeerDataOperationRequestResponseMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[77]
+		mi := &file_binary_proto_def_proto_msgTypes[79]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11407,7 +12068,7 @@ func (x *PeerDataOperationRequestResponseMessage) String() string {
 func (*PeerDataOperationRequestResponseMessage) ProtoMessage() {}
 
 func (x *PeerDataOperationRequestResponseMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[77]
+	mi := &file_binary_proto_def_proto_msgTypes[79]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11420,7 +12081,7 @@ func (x *PeerDataOperationRequestResponseMessage) ProtoReflect() protoreflect.Me
 
 // Deprecated: Use PeerDataOperationRequestResponseMessage.ProtoReflect.Descriptor instead.
 func (*PeerDataOperationRequestResponseMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{77}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{79}
 }
 
 func (x *PeerDataOperationRequestResponseMessage) GetPeerDataOperationRequestType() PeerDataOperationRequestType {
@@ -11444,6 +12105,410 @@ func (x *PeerDataOperationRequestResponseMessage) GetPeerDataOperationResult() [
 	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"`
+	HistorySyncOnDemandRequest      *PeerDataOperationRequestMessage_HistorySyncOnDemandRequest        `protobuf:"bytes,4,opt,name=historySyncOnDemandRequest" json:"historySyncOnDemandRequest,omitempty"`
+	PlaceholderMessageResendRequest []*PeerDataOperationRequestMessage_PlaceholderMessageResendRequest `protobuf:"bytes,5,rep,name=placeholderMessageResendRequest" json:"placeholderMessageResendRequest,omitempty"`
+}
+
+func (x *PeerDataOperationRequestMessage) Reset() {
+	*x = PeerDataOperationRequestMessage{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[80]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeerDataOperationRequestMessage) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeerDataOperationRequestMessage) ProtoMessage() {}
+
+func (x *PeerDataOperationRequestMessage) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[80]
+	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.ProtoReflect.Descriptor instead.
+func (*PeerDataOperationRequestMessage) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{80}
+}
+
+func (x *PeerDataOperationRequestMessage) GetPeerDataOperationRequestType() PeerDataOperationRequestType {
+	if x != nil && x.PeerDataOperationRequestType != nil {
+		return *x.PeerDataOperationRequestType
+	}
+	return PeerDataOperationRequestType_UPLOAD_STICKER
+}
+
+func (x *PeerDataOperationRequestMessage) GetRequestStickerReupload() []*PeerDataOperationRequestMessage_RequestStickerReupload {
+	if x != nil {
+		return x.RequestStickerReupload
+	}
+	return nil
+}
+
+func (x *PeerDataOperationRequestMessage) GetRequestUrlPreview() []*PeerDataOperationRequestMessage_RequestUrlPreview {
+	if x != nil {
+		return x.RequestUrlPreview
+	}
+	return nil
+}
+
+func (x *PeerDataOperationRequestMessage) GetHistorySyncOnDemandRequest() *PeerDataOperationRequestMessage_HistorySyncOnDemandRequest {
+	if x != nil {
+		return x.HistorySyncOnDemandRequest
+	}
+	return nil
+}
+
+func (x *PeerDataOperationRequestMessage) GetPlaceholderMessageResendRequest() []*PeerDataOperationRequestMessage_PlaceholderMessageResendRequest {
+	if x != nil {
+		return x.PlaceholderMessageResendRequest
+	}
+	return nil
+}
+
+type PaymentInviteMessage struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ServiceType     *PaymentInviteMessage_ServiceType `protobuf:"varint,1,opt,name=serviceType,enum=proto.PaymentInviteMessage_ServiceType" json:"serviceType,omitempty"`
+	ExpiryTimestamp *int64                            `protobuf:"varint,2,opt,name=expiryTimestamp" json:"expiryTimestamp,omitempty"`
+}
+
+func (x *PaymentInviteMessage) Reset() {
+	*x = PaymentInviteMessage{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[81]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PaymentInviteMessage) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PaymentInviteMessage) ProtoMessage() {}
+
+func (x *PaymentInviteMessage) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[81]
+	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 PaymentInviteMessage.ProtoReflect.Descriptor instead.
+func (*PaymentInviteMessage) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{81}
+}
+
+func (x *PaymentInviteMessage) GetServiceType() PaymentInviteMessage_ServiceType {
+	if x != nil && x.ServiceType != nil {
+		return *x.ServiceType
+	}
+	return PaymentInviteMessage_UNKNOWN
+}
+
+func (x *PaymentInviteMessage) GetExpiryTimestamp() int64 {
+	if x != nil && x.ExpiryTimestamp != nil {
+		return *x.ExpiryTimestamp
+	}
+	return 0
+}
+
+type OrderMessage struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	OrderId           *string                    `protobuf:"bytes,1,opt,name=orderId" json:"orderId,omitempty"`
+	Thumbnail         []byte                     `protobuf:"bytes,2,opt,name=thumbnail" json:"thumbnail,omitempty"`
+	ItemCount         *int32                     `protobuf:"varint,3,opt,name=itemCount" json:"itemCount,omitempty"`
+	Status            *OrderMessage_OrderStatus  `protobuf:"varint,4,opt,name=status,enum=proto.OrderMessage_OrderStatus" json:"status,omitempty"`
+	Surface           *OrderMessage_OrderSurface `protobuf:"varint,5,opt,name=surface,enum=proto.OrderMessage_OrderSurface" json:"surface,omitempty"`
+	Message           *string                    `protobuf:"bytes,6,opt,name=message" json:"message,omitempty"`
+	OrderTitle        *string                    `protobuf:"bytes,7,opt,name=orderTitle" json:"orderTitle,omitempty"`
+	SellerJid         *string                    `protobuf:"bytes,8,opt,name=sellerJid" json:"sellerJid,omitempty"`
+	Token             *string                    `protobuf:"bytes,9,opt,name=token" json:"token,omitempty"`
+	TotalAmount1000   *int64                     `protobuf:"varint,10,opt,name=totalAmount1000" json:"totalAmount1000,omitempty"`
+	TotalCurrencyCode *string                    `protobuf:"bytes,11,opt,name=totalCurrencyCode" json:"totalCurrencyCode,omitempty"`
+	ContextInfo       *ContextInfo               `protobuf:"bytes,17,opt,name=contextInfo" json:"contextInfo,omitempty"`
+}
+
+func (x *OrderMessage) Reset() {
+	*x = OrderMessage{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[82]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *OrderMessage) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*OrderMessage) ProtoMessage() {}
+
+func (x *OrderMessage) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[82]
+	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 OrderMessage.ProtoReflect.Descriptor instead.
+func (*OrderMessage) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{82}
+}
+
+func (x *OrderMessage) GetOrderId() string {
+	if x != nil && x.OrderId != nil {
+		return *x.OrderId
+	}
+	return ""
+}
+
+func (x *OrderMessage) GetThumbnail() []byte {
+	if x != nil {
+		return x.Thumbnail
+	}
+	return nil
+}
+
+func (x *OrderMessage) GetItemCount() int32 {
+	if x != nil && x.ItemCount != nil {
+		return *x.ItemCount
+	}
+	return 0
+}
+
+func (x *OrderMessage) GetStatus() OrderMessage_OrderStatus {
+	if x != nil && x.Status != nil {
+		return *x.Status
+	}
+	return OrderMessage_INQUIRY
+}
+
+func (x *OrderMessage) GetSurface() OrderMessage_OrderSurface {
+	if x != nil && x.Surface != nil {
+		return *x.Surface
+	}
+	return OrderMessage_CATALOG
+}
+
+func (x *OrderMessage) GetMessage() string {
+	if x != nil && x.Message != nil {
+		return *x.Message
+	}
+	return ""
+}
+
+func (x *OrderMessage) GetOrderTitle() string {
+	if x != nil && x.OrderTitle != nil {
+		return *x.OrderTitle
+	}
+	return ""
+}
+
+func (x *OrderMessage) GetSellerJid() string {
+	if x != nil && x.SellerJid != nil {
+		return *x.SellerJid
+	}
+	return ""
+}
+
+func (x *OrderMessage) GetToken() string {
+	if x != nil && x.Token != nil {
+		return *x.Token
+	}
+	return ""
+}
+
+func (x *OrderMessage) GetTotalAmount1000() int64 {
+	if x != nil && x.TotalAmount1000 != nil {
+		return *x.TotalAmount1000
+	}
+	return 0
+}
+
+func (x *OrderMessage) GetTotalCurrencyCode() string {
+	if x != nil && x.TotalCurrencyCode != nil {
+		return *x.TotalCurrencyCode
+	}
+	return ""
+}
+
+func (x *OrderMessage) GetContextInfo() *ContextInfo {
+	if x != nil {
+		return x.ContextInfo
+	}
+	return nil
+}
+
+type LocationMessage struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	DegreesLatitude                   *float64     `protobuf:"fixed64,1,opt,name=degreesLatitude" json:"degreesLatitude,omitempty"`
+	DegreesLongitude                  *float64     `protobuf:"fixed64,2,opt,name=degreesLongitude" json:"degreesLongitude,omitempty"`
+	Name                              *string      `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Address                           *string      `protobuf:"bytes,4,opt,name=address" json:"address,omitempty"`
+	Url                               *string      `protobuf:"bytes,5,opt,name=url" json:"url,omitempty"`
+	IsLive                            *bool        `protobuf:"varint,6,opt,name=isLive" json:"isLive,omitempty"`
+	AccuracyInMeters                  *uint32      `protobuf:"varint,7,opt,name=accuracyInMeters" json:"accuracyInMeters,omitempty"`
+	SpeedInMps                        *float32     `protobuf:"fixed32,8,opt,name=speedInMps" json:"speedInMps,omitempty"`
+	DegreesClockwiseFromMagneticNorth *uint32      `protobuf:"varint,9,opt,name=degreesClockwiseFromMagneticNorth" json:"degreesClockwiseFromMagneticNorth,omitempty"`
+	Comment                           *string      `protobuf:"bytes,11,opt,name=comment" json:"comment,omitempty"`
+	JpegThumbnail                     []byte       `protobuf:"bytes,16,opt,name=jpegThumbnail" json:"jpegThumbnail,omitempty"`
+	ContextInfo                       *ContextInfo `protobuf:"bytes,17,opt,name=contextInfo" json:"contextInfo,omitempty"`
+}
+
+func (x *LocationMessage) Reset() {
+	*x = LocationMessage{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[83]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *LocationMessage) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*LocationMessage) ProtoMessage() {}
+
+func (x *LocationMessage) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[83]
+	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 LocationMessage.ProtoReflect.Descriptor instead.
+func (*LocationMessage) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{83}
+}
+
+func (x *LocationMessage) GetDegreesLatitude() float64 {
+	if x != nil && x.DegreesLatitude != nil {
+		return *x.DegreesLatitude
+	}
+	return 0
+}
+
+func (x *LocationMessage) GetDegreesLongitude() float64 {
+	if x != nil && x.DegreesLongitude != nil {
+		return *x.DegreesLongitude
+	}
+	return 0
+}
+
+func (x *LocationMessage) GetName() string {
+	if x != nil && x.Name != nil {
+		return *x.Name
+	}
+	return ""
+}
+
+func (x *LocationMessage) GetAddress() string {
+	if x != nil && x.Address != nil {
+		return *x.Address
+	}
+	return ""
+}
+
+func (x *LocationMessage) GetUrl() string {
+	if x != nil && x.Url != nil {
+		return *x.Url
+	}
+	return ""
+}
+
+func (x *LocationMessage) GetIsLive() bool {
+	if x != nil && x.IsLive != nil {
+		return *x.IsLive
+	}
+	return false
+}
+
+func (x *LocationMessage) GetAccuracyInMeters() uint32 {
+	if x != nil && x.AccuracyInMeters != nil {
+		return *x.AccuracyInMeters
+	}
+	return 0
+}
+
+func (x *LocationMessage) GetSpeedInMps() float32 {
+	if x != nil && x.SpeedInMps != nil {
+		return *x.SpeedInMps
+	}
+	return 0
+}
+
+func (x *LocationMessage) GetDegreesClockwiseFromMagneticNorth() uint32 {
+	if x != nil && x.DegreesClockwiseFromMagneticNorth != nil {
+		return *x.DegreesClockwiseFromMagneticNorth
+	}
+	return 0
+}
+
+func (x *LocationMessage) GetComment() string {
+	if x != nil && x.Comment != nil {
+		return *x.Comment
+	}
+	return ""
+}
+
+func (x *LocationMessage) GetJpegThumbnail() []byte {
+	if x != nil {
+		return x.JpegThumbnail
+	}
+	return nil
+}
+
+func (x *LocationMessage) GetContextInfo() *ContextInfo {
+	if x != nil {
+		return x.ContextInfo
+	}
+	return nil
+}
+
 type EphemeralSetting struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -11456,7 +12521,7 @@ type EphemeralSetting struct {
 func (x *EphemeralSetting) Reset() {
 	*x = EphemeralSetting{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[78]
+		mi := &file_binary_proto_def_proto_msgTypes[84]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11469,7 +12534,7 @@ func (x *EphemeralSetting) String() string {
 func (*EphemeralSetting) ProtoMessage() {}
 
 func (x *EphemeralSetting) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[78]
+	mi := &file_binary_proto_def_proto_msgTypes[84]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11482,7 +12547,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{78}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{84}
 }
 
 func (x *EphemeralSetting) GetDuration() int32 {
@@ -11511,7 +12576,7 @@ type WallpaperSettings struct {
 func (x *WallpaperSettings) Reset() {
 	*x = WallpaperSettings{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[79]
+		mi := &file_binary_proto_def_proto_msgTypes[85]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11524,7 +12589,7 @@ func (x *WallpaperSettings) String() string {
 func (*WallpaperSettings) ProtoMessage() {}
 
 func (x *WallpaperSettings) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[79]
+	mi := &file_binary_proto_def_proto_msgTypes[85]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11537,7 +12602,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{79}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{85}
 }
 
 func (x *WallpaperSettings) GetFilename() string {
@@ -11575,7 +12640,7 @@ type StickerMetadata struct {
 func (x *StickerMetadata) Reset() {
 	*x = StickerMetadata{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[80]
+		mi := &file_binary_proto_def_proto_msgTypes[86]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11588,7 +12653,7 @@ func (x *StickerMetadata) String() string {
 func (*StickerMetadata) ProtoMessage() {}
 
 func (x *StickerMetadata) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[80]
+	mi := &file_binary_proto_def_proto_msgTypes[86]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11601,7 +12666,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{80}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{86}
 }
 
 func (x *StickerMetadata) GetUrl() string {
@@ -11693,7 +12758,7 @@ type Pushname struct {
 func (x *Pushname) Reset() {
 	*x = Pushname{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[81]
+		mi := &file_binary_proto_def_proto_msgTypes[87]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11706,7 +12771,7 @@ func (x *Pushname) String() string {
 func (*Pushname) ProtoMessage() {}
 
 func (x *Pushname) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[81]
+	mi := &file_binary_proto_def_proto_msgTypes[87]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11719,7 +12784,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{81}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{87}
 }
 
 func (x *Pushname) GetId() string {
@@ -11748,7 +12813,7 @@ type PastParticipants struct {
 func (x *PastParticipants) Reset() {
 	*x = PastParticipants{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[82]
+		mi := &file_binary_proto_def_proto_msgTypes[88]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11761,7 +12826,7 @@ func (x *PastParticipants) String() string {
 func (*PastParticipants) ProtoMessage() {}
 
 func (x *PastParticipants) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[82]
+	mi := &file_binary_proto_def_proto_msgTypes[88]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11774,7 +12839,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{82}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{88}
 }
 
 func (x *PastParticipants) GetGroupJid() string {
@@ -11804,7 +12869,7 @@ type PastParticipant struct {
 func (x *PastParticipant) Reset() {
 	*x = PastParticipant{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[83]
+		mi := &file_binary_proto_def_proto_msgTypes[89]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11817,7 +12882,7 @@ func (x *PastParticipant) String() string {
 func (*PastParticipant) ProtoMessage() {}
 
 func (x *PastParticipant) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[83]
+	mi := &file_binary_proto_def_proto_msgTypes[89]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11830,7 +12895,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{83}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{89}
 }
 
 func (x *PastParticipant) GetUserJid() string {
@@ -11854,6 +12919,93 @@ func (x *PastParticipant) GetLeaveTs() uint64 {
 	return 0
 }
 
+type NotificationSettings struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	MessageVibrate           *string `protobuf:"bytes,1,opt,name=messageVibrate" json:"messageVibrate,omitempty"`
+	MessagePopup             *string `protobuf:"bytes,2,opt,name=messagePopup" json:"messagePopup,omitempty"`
+	MessageLight             *string `protobuf:"bytes,3,opt,name=messageLight" json:"messageLight,omitempty"`
+	LowPriorityNotifications *bool   `protobuf:"varint,4,opt,name=lowPriorityNotifications" json:"lowPriorityNotifications,omitempty"`
+	ReactionsMuted           *bool   `protobuf:"varint,5,opt,name=reactionsMuted" json:"reactionsMuted,omitempty"`
+	CallVibrate              *string `protobuf:"bytes,6,opt,name=callVibrate" json:"callVibrate,omitempty"`
+}
+
+func (x *NotificationSettings) Reset() {
+	*x = NotificationSettings{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[90]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *NotificationSettings) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*NotificationSettings) ProtoMessage() {}
+
+func (x *NotificationSettings) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[90]
+	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 NotificationSettings.ProtoReflect.Descriptor instead.
+func (*NotificationSettings) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{90}
+}
+
+func (x *NotificationSettings) GetMessageVibrate() string {
+	if x != nil && x.MessageVibrate != nil {
+		return *x.MessageVibrate
+	}
+	return ""
+}
+
+func (x *NotificationSettings) GetMessagePopup() string {
+	if x != nil && x.MessagePopup != nil {
+		return *x.MessagePopup
+	}
+	return ""
+}
+
+func (x *NotificationSettings) GetMessageLight() string {
+	if x != nil && x.MessageLight != nil {
+		return *x.MessageLight
+	}
+	return ""
+}
+
+func (x *NotificationSettings) GetLowPriorityNotifications() bool {
+	if x != nil && x.LowPriorityNotifications != nil {
+		return *x.LowPriorityNotifications
+	}
+	return false
+}
+
+func (x *NotificationSettings) GetReactionsMuted() bool {
+	if x != nil && x.ReactionsMuted != nil {
+		return *x.ReactionsMuted
+	}
+	return false
+}
+
+func (x *NotificationSettings) GetCallVibrate() string {
+	if x != nil && x.CallVibrate != nil {
+		return *x.CallVibrate
+	}
+	return ""
+}
+
 type HistorySync struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -11875,7 +13027,7 @@ type HistorySync struct {
 func (x *HistorySync) Reset() {
 	*x = HistorySync{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[84]
+		mi := &file_binary_proto_def_proto_msgTypes[91]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11888,7 +13040,7 @@ func (x *HistorySync) String() string {
 func (*HistorySync) ProtoMessage() {}
 
 func (x *HistorySync) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[84]
+	mi := &file_binary_proto_def_proto_msgTypes[91]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11901,7 +13053,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{84}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{91}
 }
 
 func (x *HistorySync) GetSyncType() HistorySync_HistorySyncType {
@@ -11993,7 +13145,7 @@ type HistorySyncMsg struct {
 func (x *HistorySyncMsg) Reset() {
 	*x = HistorySyncMsg{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[85]
+		mi := &file_binary_proto_def_proto_msgTypes[92]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -12006,7 +13158,7 @@ func (x *HistorySyncMsg) String() string {
 func (*HistorySyncMsg) ProtoMessage() {}
 
 func (x *HistorySyncMsg) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[85]
+	mi := &file_binary_proto_def_proto_msgTypes[92]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -12019,7 +13171,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{85}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{92}
 }
 
 func (x *HistorySyncMsg) GetMessage() *WebMessageInfo {
@@ -12048,7 +13200,7 @@ type GroupParticipant struct {
 func (x *GroupParticipant) Reset() {
 	*x = GroupParticipant{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[86]
+		mi := &file_binary_proto_def_proto_msgTypes[93]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -12061,7 +13213,7 @@ func (x *GroupParticipant) String() string {
 func (*GroupParticipant) ProtoMessage() {}
 
 func (x *GroupParticipant) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[86]
+	mi := &file_binary_proto_def_proto_msgTypes[93]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -12074,7 +13226,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{86}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{93}
 }
 
 func (x *GroupParticipant) GetUserJid() string {
@@ -12107,12 +13259,19 @@ type GlobalSettings struct {
 	DisappearingModeDuration           *int32                `protobuf:"varint,9,opt,name=disappearingModeDuration" json:"disappearingModeDuration,omitempty"`
 	DisappearingModeTimestamp          *int64                `protobuf:"varint,10,opt,name=disappearingModeTimestamp" json:"disappearingModeTimestamp,omitempty"`
 	AvatarUserSettings                 *AvatarUserSettings   `protobuf:"bytes,11,opt,name=avatarUserSettings" json:"avatarUserSettings,omitempty"`
+	FontSize                           *int32                `protobuf:"varint,12,opt,name=fontSize" json:"fontSize,omitempty"`
+	SecurityNotifications              *bool                 `protobuf:"varint,13,opt,name=securityNotifications" json:"securityNotifications,omitempty"`
+	AutoUnarchiveChats                 *bool                 `protobuf:"varint,14,opt,name=autoUnarchiveChats" json:"autoUnarchiveChats,omitempty"`
+	VideoQualityMode                   *int32                `protobuf:"varint,15,opt,name=videoQualityMode" json:"videoQualityMode,omitempty"`
+	PhotoQualityMode                   *int32                `protobuf:"varint,16,opt,name=photoQualityMode" json:"photoQualityMode,omitempty"`
+	IndividualNotificationSettings     *NotificationSettings `protobuf:"bytes,17,opt,name=individualNotificationSettings" json:"individualNotificationSettings,omitempty"`
+	GroupNotificationSettings          *NotificationSettings `protobuf:"bytes,18,opt,name=groupNotificationSettings" json:"groupNotificationSettings,omitempty"`
 }
 
 func (x *GlobalSettings) Reset() {
 	*x = GlobalSettings{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[87]
+		mi := &file_binary_proto_def_proto_msgTypes[94]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -12125,7 +13284,7 @@ func (x *GlobalSettings) String() string {
 func (*GlobalSettings) ProtoMessage() {}
 
 func (x *GlobalSettings) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[87]
+	mi := &file_binary_proto_def_proto_msgTypes[94]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -12138,7 +13297,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{87}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{94}
 }
 
 func (x *GlobalSettings) GetLightThemeWallpaper() *WallpaperSettings {
@@ -12218,6 +13377,55 @@ func (x *GlobalSettings) GetAvatarUserSettings() *AvatarUserSettings {
 	return nil
 }
 
+func (x *GlobalSettings) GetFontSize() int32 {
+	if x != nil && x.FontSize != nil {
+		return *x.FontSize
+	}
+	return 0
+}
+
+func (x *GlobalSettings) GetSecurityNotifications() bool {
+	if x != nil && x.SecurityNotifications != nil {
+		return *x.SecurityNotifications
+	}
+	return false
+}
+
+func (x *GlobalSettings) GetAutoUnarchiveChats() bool {
+	if x != nil && x.AutoUnarchiveChats != nil {
+		return *x.AutoUnarchiveChats
+	}
+	return false
+}
+
+func (x *GlobalSettings) GetVideoQualityMode() int32 {
+	if x != nil && x.VideoQualityMode != nil {
+		return *x.VideoQualityMode
+	}
+	return 0
+}
+
+func (x *GlobalSettings) GetPhotoQualityMode() int32 {
+	if x != nil && x.PhotoQualityMode != nil {
+		return *x.PhotoQualityMode
+	}
+	return 0
+}
+
+func (x *GlobalSettings) GetIndividualNotificationSettings() *NotificationSettings {
+	if x != nil {
+		return x.IndividualNotificationSettings
+	}
+	return nil
+}
+
+func (x *GlobalSettings) GetGroupNotificationSettings() *NotificationSettings {
+	if x != nil {
+		return x.GroupNotificationSettings
+	}
+	return nil
+}
+
 type Conversation struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -12270,7 +13478,7 @@ type Conversation struct {
 func (x *Conversation) Reset() {
 	*x = Conversation{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[88]
+		mi := &file_binary_proto_def_proto_msgTypes[95]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -12283,7 +13491,7 @@ func (x *Conversation) String() string {
 func (*Conversation) ProtoMessage() {}
 
 func (x *Conversation) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[88]
+	mi := &file_binary_proto_def_proto_msgTypes[95]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -12296,7 +13504,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{88}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{95}
 }
 
 func (x *Conversation) GetId() string {
@@ -12605,7 +13813,7 @@ type AvatarUserSettings struct {
 func (x *AvatarUserSettings) Reset() {
 	*x = AvatarUserSettings{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[89]
+		mi := &file_binary_proto_def_proto_msgTypes[96]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -12618,7 +13826,7 @@ func (x *AvatarUserSettings) String() string {
 func (*AvatarUserSettings) ProtoMessage() {}
 
 func (x *AvatarUserSettings) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[89]
+	mi := &file_binary_proto_def_proto_msgTypes[96]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -12631,7 +13839,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{89}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{96}
 }
 
 func (x *AvatarUserSettings) GetFbid() string {
@@ -12662,7 +13870,7 @@ type AutoDownloadSettings struct {
 func (x *AutoDownloadSettings) Reset() {
 	*x = AutoDownloadSettings{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[90]
+		mi := &file_binary_proto_def_proto_msgTypes[97]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -12675,7 +13883,7 @@ func (x *AutoDownloadSettings) String() string {
 func (*AutoDownloadSettings) ProtoMessage() {}
 
 func (x *AutoDownloadSettings) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[90]
+	mi := &file_binary_proto_def_proto_msgTypes[97]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -12688,7 +13896,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{90}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{97}
 }
 
 func (x *AutoDownloadSettings) GetDownloadImages() bool {
@@ -12719,308 +13927,6 @@ func (x *AutoDownloadSettings) GetDownloadDocuments() bool {
 	return false
 }
 
-type MsgRowOpaqueData struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	CurrentMsg *MsgOpaqueData `protobuf:"bytes,1,opt,name=currentMsg" json:"currentMsg,omitempty"`
-	QuotedMsg  *MsgOpaqueData `protobuf:"bytes,2,opt,name=quotedMsg" json:"quotedMsg,omitempty"`
-}
-
-func (x *MsgRowOpaqueData) Reset() {
-	*x = MsgRowOpaqueData{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[91]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MsgRowOpaqueData) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MsgRowOpaqueData) ProtoMessage() {}
-
-func (x *MsgRowOpaqueData) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[91]
-	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 MsgRowOpaqueData.ProtoReflect.Descriptor instead.
-func (*MsgRowOpaqueData) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{91}
-}
-
-func (x *MsgRowOpaqueData) GetCurrentMsg() *MsgOpaqueData {
-	if x != nil {
-		return x.CurrentMsg
-	}
-	return nil
-}
-
-func (x *MsgRowOpaqueData) GetQuotedMsg() *MsgOpaqueData {
-	if x != nil {
-		return x.QuotedMsg
-	}
-	return nil
-}
-
-type MsgOpaqueData struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Body                        *string                     `protobuf:"bytes,1,opt,name=body" json:"body,omitempty"`
-	Caption                     *string                     `protobuf:"bytes,3,opt,name=caption" json:"caption,omitempty"`
-	Lng                         *float64                    `protobuf:"fixed64,5,opt,name=lng" json:"lng,omitempty"`
-	IsLive                      *bool                       `protobuf:"varint,6,opt,name=isLive" json:"isLive,omitempty"`
-	Lat                         *float64                    `protobuf:"fixed64,7,opt,name=lat" json:"lat,omitempty"`
-	PaymentAmount1000           *int32                      `protobuf:"varint,8,opt,name=paymentAmount1000" json:"paymentAmount1000,omitempty"`
-	PaymentNoteMsgBody          *string                     `protobuf:"bytes,9,opt,name=paymentNoteMsgBody" json:"paymentNoteMsgBody,omitempty"`
-	CanonicalUrl                *string                     `protobuf:"bytes,10,opt,name=canonicalUrl" json:"canonicalUrl,omitempty"`
-	MatchedText                 *string                     `protobuf:"bytes,11,opt,name=matchedText" json:"matchedText,omitempty"`
-	Title                       *string                     `protobuf:"bytes,12,opt,name=title" json:"title,omitempty"`
-	Description                 *string                     `protobuf:"bytes,13,opt,name=description" json:"description,omitempty"`
-	FutureproofBuffer           []byte                      `protobuf:"bytes,14,opt,name=futureproofBuffer" json:"futureproofBuffer,omitempty"`
-	ClientUrl                   *string                     `protobuf:"bytes,15,opt,name=clientUrl" json:"clientUrl,omitempty"`
-	Loc                         *string                     `protobuf:"bytes,16,opt,name=loc" json:"loc,omitempty"`
-	PollName                    *string                     `protobuf:"bytes,17,opt,name=pollName" json:"pollName,omitempty"`
-	PollOptions                 []*MsgOpaqueData_PollOption `protobuf:"bytes,18,rep,name=pollOptions" json:"pollOptions,omitempty"`
-	PollSelectableOptionsCount  *uint32                     `protobuf:"varint,20,opt,name=pollSelectableOptionsCount" json:"pollSelectableOptionsCount,omitempty"`
-	MessageSecret               []byte                      `protobuf:"bytes,21,opt,name=messageSecret" json:"messageSecret,omitempty"`
-	OriginalSelfAuthor          *string                     `protobuf:"bytes,51,opt,name=originalSelfAuthor" json:"originalSelfAuthor,omitempty"`
-	SenderTimestampMs           *int64                      `protobuf:"varint,22,opt,name=senderTimestampMs" json:"senderTimestampMs,omitempty"`
-	PollUpdateParentKey         *string                     `protobuf:"bytes,23,opt,name=pollUpdateParentKey" json:"pollUpdateParentKey,omitempty"`
-	EncPollVote                 *PollEncValue               `protobuf:"bytes,24,opt,name=encPollVote" json:"encPollVote,omitempty"`
-	IsSentCagPollCreation       *bool                       `protobuf:"varint,28,opt,name=isSentCagPollCreation" json:"isSentCagPollCreation,omitempty"`
-	EncReactionTargetMessageKey *string                     `protobuf:"bytes,25,opt,name=encReactionTargetMessageKey" json:"encReactionTargetMessageKey,omitempty"`
-	EncReactionEncPayload       []byte                      `protobuf:"bytes,26,opt,name=encReactionEncPayload" json:"encReactionEncPayload,omitempty"`
-	EncReactionEncIv            []byte                      `protobuf:"bytes,27,opt,name=encReactionEncIv" json:"encReactionEncIv,omitempty"`
-}
-
-func (x *MsgOpaqueData) Reset() {
-	*x = MsgOpaqueData{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[92]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MsgOpaqueData) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MsgOpaqueData) ProtoMessage() {}
-
-func (x *MsgOpaqueData) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[92]
-	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 MsgOpaqueData.ProtoReflect.Descriptor instead.
-func (*MsgOpaqueData) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{92}
-}
-
-func (x *MsgOpaqueData) GetBody() string {
-	if x != nil && x.Body != nil {
-		return *x.Body
-	}
-	return ""
-}
-
-func (x *MsgOpaqueData) GetCaption() string {
-	if x != nil && x.Caption != nil {
-		return *x.Caption
-	}
-	return ""
-}
-
-func (x *MsgOpaqueData) GetLng() float64 {
-	if x != nil && x.Lng != nil {
-		return *x.Lng
-	}
-	return 0
-}
-
-func (x *MsgOpaqueData) GetIsLive() bool {
-	if x != nil && x.IsLive != nil {
-		return *x.IsLive
-	}
-	return false
-}
-
-func (x *MsgOpaqueData) GetLat() float64 {
-	if x != nil && x.Lat != nil {
-		return *x.Lat
-	}
-	return 0
-}
-
-func (x *MsgOpaqueData) GetPaymentAmount1000() int32 {
-	if x != nil && x.PaymentAmount1000 != nil {
-		return *x.PaymentAmount1000
-	}
-	return 0
-}
-
-func (x *MsgOpaqueData) GetPaymentNoteMsgBody() string {
-	if x != nil && x.PaymentNoteMsgBody != nil {
-		return *x.PaymentNoteMsgBody
-	}
-	return ""
-}
-
-func (x *MsgOpaqueData) GetCanonicalUrl() string {
-	if x != nil && x.CanonicalUrl != nil {
-		return *x.CanonicalUrl
-	}
-	return ""
-}
-
-func (x *MsgOpaqueData) GetMatchedText() string {
-	if x != nil && x.MatchedText != nil {
-		return *x.MatchedText
-	}
-	return ""
-}
-
-func (x *MsgOpaqueData) GetTitle() string {
-	if x != nil && x.Title != nil {
-		return *x.Title
-	}
-	return ""
-}
-
-func (x *MsgOpaqueData) GetDescription() string {
-	if x != nil && x.Description != nil {
-		return *x.Description
-	}
-	return ""
-}
-
-func (x *MsgOpaqueData) GetFutureproofBuffer() []byte {
-	if x != nil {
-		return x.FutureproofBuffer
-	}
-	return nil
-}
-
-func (x *MsgOpaqueData) GetClientUrl() string {
-	if x != nil && x.ClientUrl != nil {
-		return *x.ClientUrl
-	}
-	return ""
-}
-
-func (x *MsgOpaqueData) GetLoc() string {
-	if x != nil && x.Loc != nil {
-		return *x.Loc
-	}
-	return ""
-}
-
-func (x *MsgOpaqueData) GetPollName() string {
-	if x != nil && x.PollName != nil {
-		return *x.PollName
-	}
-	return ""
-}
-
-func (x *MsgOpaqueData) GetPollOptions() []*MsgOpaqueData_PollOption {
-	if x != nil {
-		return x.PollOptions
-	}
-	return nil
-}
-
-func (x *MsgOpaqueData) GetPollSelectableOptionsCount() uint32 {
-	if x != nil && x.PollSelectableOptionsCount != nil {
-		return *x.PollSelectableOptionsCount
-	}
-	return 0
-}
-
-func (x *MsgOpaqueData) GetMessageSecret() []byte {
-	if x != nil {
-		return x.MessageSecret
-	}
-	return nil
-}
-
-func (x *MsgOpaqueData) GetOriginalSelfAuthor() string {
-	if x != nil && x.OriginalSelfAuthor != nil {
-		return *x.OriginalSelfAuthor
-	}
-	return ""
-}
-
-func (x *MsgOpaqueData) GetSenderTimestampMs() int64 {
-	if x != nil && x.SenderTimestampMs != nil {
-		return *x.SenderTimestampMs
-	}
-	return 0
-}
-
-func (x *MsgOpaqueData) GetPollUpdateParentKey() string {
-	if x != nil && x.PollUpdateParentKey != nil {
-		return *x.PollUpdateParentKey
-	}
-	return ""
-}
-
-func (x *MsgOpaqueData) GetEncPollVote() *PollEncValue {
-	if x != nil {
-		return x.EncPollVote
-	}
-	return nil
-}
-
-func (x *MsgOpaqueData) GetIsSentCagPollCreation() bool {
-	if x != nil && x.IsSentCagPollCreation != nil {
-		return *x.IsSentCagPollCreation
-	}
-	return false
-}
-
-func (x *MsgOpaqueData) GetEncReactionTargetMessageKey() string {
-	if x != nil && x.EncReactionTargetMessageKey != nil {
-		return *x.EncReactionTargetMessageKey
-	}
-	return ""
-}
-
-func (x *MsgOpaqueData) GetEncReactionEncPayload() []byte {
-	if x != nil {
-		return x.EncReactionEncPayload
-	}
-	return nil
-}
-
-func (x *MsgOpaqueData) GetEncReactionEncIv() []byte {
-	if x != nil {
-		return x.EncReactionEncIv
-	}
-	return nil
-}
-
 type ServerErrorReceipt struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -13032,7 +13938,7 @@ type ServerErrorReceipt struct {
 func (x *ServerErrorReceipt) Reset() {
 	*x = ServerErrorReceipt{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[93]
+		mi := &file_binary_proto_def_proto_msgTypes[98]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13045,7 +13951,7 @@ func (x *ServerErrorReceipt) String() string {
 func (*ServerErrorReceipt) ProtoMessage() {}
 
 func (x *ServerErrorReceipt) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[93]
+	mi := &file_binary_proto_def_proto_msgTypes[98]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13058,7 +13964,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{93}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{98}
 }
 
 func (x *ServerErrorReceipt) GetStanzaId() string {
@@ -13081,7 +13987,7 @@ type MediaRetryNotification struct {
 func (x *MediaRetryNotification) Reset() {
 	*x = MediaRetryNotification{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[94]
+		mi := &file_binary_proto_def_proto_msgTypes[99]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13094,7 +14000,7 @@ func (x *MediaRetryNotification) String() string {
 func (*MediaRetryNotification) ProtoMessage() {}
 
 func (x *MediaRetryNotification) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[94]
+	mi := &file_binary_proto_def_proto_msgTypes[99]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13107,7 +14013,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{94}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{99}
 }
 
 func (x *MediaRetryNotification) GetStanzaId() string {
@@ -13145,7 +14051,7 @@ type MessageKey struct {
 func (x *MessageKey) Reset() {
 	*x = MessageKey{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[95]
+		mi := &file_binary_proto_def_proto_msgTypes[100]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13158,7 +14064,7 @@ func (x *MessageKey) String() string {
 func (*MessageKey) ProtoMessage() {}
 
 func (x *MessageKey) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[95]
+	mi := &file_binary_proto_def_proto_msgTypes[100]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13171,7 +14077,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{95}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{100}
 }
 
 func (x *MessageKey) GetRemoteJid() string {
@@ -13213,7 +14119,7 @@ type SyncdVersion struct {
 func (x *SyncdVersion) Reset() {
 	*x = SyncdVersion{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[96]
+		mi := &file_binary_proto_def_proto_msgTypes[101]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13226,7 +14132,7 @@ func (x *SyncdVersion) String() string {
 func (*SyncdVersion) ProtoMessage() {}
 
 func (x *SyncdVersion) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[96]
+	mi := &file_binary_proto_def_proto_msgTypes[101]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13239,7 +14145,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{96}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{101}
 }
 
 func (x *SyncdVersion) GetVersion() uint64 {
@@ -13260,7 +14166,7 @@ type SyncdValue struct {
 func (x *SyncdValue) Reset() {
 	*x = SyncdValue{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[97]
+		mi := &file_binary_proto_def_proto_msgTypes[102]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13273,7 +14179,7 @@ func (x *SyncdValue) String() string {
 func (*SyncdValue) ProtoMessage() {}
 
 func (x *SyncdValue) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[97]
+	mi := &file_binary_proto_def_proto_msgTypes[102]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13286,7 +14192,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{97}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{102}
 }
 
 func (x *SyncdValue) GetBlob() []byte {
@@ -13310,7 +14216,7 @@ type SyncdSnapshot struct {
 func (x *SyncdSnapshot) Reset() {
 	*x = SyncdSnapshot{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[98]
+		mi := &file_binary_proto_def_proto_msgTypes[103]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13323,7 +14229,7 @@ func (x *SyncdSnapshot) String() string {
 func (*SyncdSnapshot) ProtoMessage() {}
 
 func (x *SyncdSnapshot) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[98]
+	mi := &file_binary_proto_def_proto_msgTypes[103]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13336,7 +14242,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{98}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{103}
 }
 
 func (x *SyncdSnapshot) GetVersion() *SyncdVersion {
@@ -13380,7 +14286,7 @@ type SyncdRecord struct {
 func (x *SyncdRecord) Reset() {
 	*x = SyncdRecord{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[99]
+		mi := &file_binary_proto_def_proto_msgTypes[104]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13393,7 +14299,7 @@ func (x *SyncdRecord) String() string {
 func (*SyncdRecord) ProtoMessage() {}
 
 func (x *SyncdRecord) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[99]
+	mi := &file_binary_proto_def_proto_msgTypes[104]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13406,7 +14312,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{99}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{104}
 }
 
 func (x *SyncdRecord) GetIndex() *SyncdIndex {
@@ -13448,7 +14354,7 @@ type SyncdPatch struct {
 func (x *SyncdPatch) Reset() {
 	*x = SyncdPatch{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[100]
+		mi := &file_binary_proto_def_proto_msgTypes[105]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13461,7 +14367,7 @@ func (x *SyncdPatch) String() string {
 func (*SyncdPatch) ProtoMessage() {}
 
 func (x *SyncdPatch) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[100]
+	mi := &file_binary_proto_def_proto_msgTypes[105]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13474,7 +14380,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{100}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{105}
 }
 
 func (x *SyncdPatch) GetVersion() *SyncdVersion {
@@ -13544,7 +14450,7 @@ type SyncdMutations struct {
 func (x *SyncdMutations) Reset() {
 	*x = SyncdMutations{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[101]
+		mi := &file_binary_proto_def_proto_msgTypes[106]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13557,7 +14463,7 @@ func (x *SyncdMutations) String() string {
 func (*SyncdMutations) ProtoMessage() {}
 
 func (x *SyncdMutations) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[101]
+	mi := &file_binary_proto_def_proto_msgTypes[106]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13570,7 +14476,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{101}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{106}
 }
 
 func (x *SyncdMutations) GetMutations() []*SyncdMutation {
@@ -13592,7 +14498,7 @@ type SyncdMutation struct {
 func (x *SyncdMutation) Reset() {
 	*x = SyncdMutation{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[102]
+		mi := &file_binary_proto_def_proto_msgTypes[107]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13605,7 +14511,7 @@ func (x *SyncdMutation) String() string {
 func (*SyncdMutation) ProtoMessage() {}
 
 func (x *SyncdMutation) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[102]
+	mi := &file_binary_proto_def_proto_msgTypes[107]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13618,7 +14524,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{102}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{107}
 }
 
 func (x *SyncdMutation) GetOperation() SyncdMutation_SyncdOperation {
@@ -13646,7 +14552,7 @@ type SyncdIndex struct {
 func (x *SyncdIndex) Reset() {
 	*x = SyncdIndex{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[103]
+		mi := &file_binary_proto_def_proto_msgTypes[108]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13659,7 +14565,7 @@ func (x *SyncdIndex) String() string {
 func (*SyncdIndex) ProtoMessage() {}
 
 func (x *SyncdIndex) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[103]
+	mi := &file_binary_proto_def_proto_msgTypes[108]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13672,7 +14578,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{103}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{108}
 }
 
 func (x *SyncdIndex) GetBlob() []byte {
@@ -13693,7 +14599,7 @@ type KeyId struct {
 func (x *KeyId) Reset() {
 	*x = KeyId{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[104]
+		mi := &file_binary_proto_def_proto_msgTypes[109]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13706,7 +14612,7 @@ func (x *KeyId) String() string {
 func (*KeyId) ProtoMessage() {}
 
 func (x *KeyId) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[104]
+	mi := &file_binary_proto_def_proto_msgTypes[109]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13719,7 +14625,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{104}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{109}
 }
 
 func (x *KeyId) GetId() []byte {
@@ -13745,7 +14651,7 @@ type ExternalBlobReference struct {
 func (x *ExternalBlobReference) Reset() {
 	*x = ExternalBlobReference{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[105]
+		mi := &file_binary_proto_def_proto_msgTypes[110]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13758,7 +14664,7 @@ func (x *ExternalBlobReference) String() string {
 func (*ExternalBlobReference) ProtoMessage() {}
 
 func (x *ExternalBlobReference) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[105]
+	mi := &file_binary_proto_def_proto_msgTypes[110]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13771,7 +14677,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{105}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{110}
 }
 
 func (x *ExternalBlobReference) GetMediaKey() []byte {
@@ -13828,7 +14734,7 @@ type ExitCode struct {
 func (x *ExitCode) Reset() {
 	*x = ExitCode{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[106]
+		mi := &file_binary_proto_def_proto_msgTypes[111]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13841,7 +14747,7 @@ func (x *ExitCode) String() string {
 func (*ExitCode) ProtoMessage() {}
 
 func (x *ExitCode) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[106]
+	mi := &file_binary_proto_def_proto_msgTypes[111]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13854,7 +14760,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{106}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{111}
 }
 
 func (x *ExitCode) GetCode() uint64 {
@@ -13876,44 +14782,48 @@ type SyncActionValue struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Timestamp                   *int64                            `protobuf:"varint,1,opt,name=timestamp" json:"timestamp,omitempty"`
-	StarAction                  *StarAction                       `protobuf:"bytes,2,opt,name=starAction" json:"starAction,omitempty"`
-	ContactAction               *ContactAction                    `protobuf:"bytes,3,opt,name=contactAction" json:"contactAction,omitempty"`
-	MuteAction                  *MuteAction                       `protobuf:"bytes,4,opt,name=muteAction" json:"muteAction,omitempty"`
-	PinAction                   *PinAction                        `protobuf:"bytes,5,opt,name=pinAction" json:"pinAction,omitempty"`
-	SecurityNotificationSetting *SecurityNotificationSetting      `protobuf:"bytes,6,opt,name=securityNotificationSetting" json:"securityNotificationSetting,omitempty"`
-	PushNameSetting             *PushNameSetting                  `protobuf:"bytes,7,opt,name=pushNameSetting" json:"pushNameSetting,omitempty"`
-	QuickReplyAction            *QuickReplyAction                 `protobuf:"bytes,8,opt,name=quickReplyAction" json:"quickReplyAction,omitempty"`
-	RecentEmojiWeightsAction    *RecentEmojiWeightsAction         `protobuf:"bytes,11,opt,name=recentEmojiWeightsAction" json:"recentEmojiWeightsAction,omitempty"`
-	LabelEditAction             *LabelEditAction                  `protobuf:"bytes,14,opt,name=labelEditAction" json:"labelEditAction,omitempty"`
-	LabelAssociationAction      *LabelAssociationAction           `protobuf:"bytes,15,opt,name=labelAssociationAction" json:"labelAssociationAction,omitempty"`
-	LocaleSetting               *LocaleSetting                    `protobuf:"bytes,16,opt,name=localeSetting" json:"localeSetting,omitempty"`
-	ArchiveChatAction           *ArchiveChatAction                `protobuf:"bytes,17,opt,name=archiveChatAction" json:"archiveChatAction,omitempty"`
-	DeleteMessageForMeAction    *DeleteMessageForMeAction         `protobuf:"bytes,18,opt,name=deleteMessageForMeAction" json:"deleteMessageForMeAction,omitempty"`
-	KeyExpiration               *KeyExpiration                    `protobuf:"bytes,19,opt,name=keyExpiration" json:"keyExpiration,omitempty"`
-	MarkChatAsReadAction        *MarkChatAsReadAction             `protobuf:"bytes,20,opt,name=markChatAsReadAction" json:"markChatAsReadAction,omitempty"`
-	ClearChatAction             *ClearChatAction                  `protobuf:"bytes,21,opt,name=clearChatAction" json:"clearChatAction,omitempty"`
-	DeleteChatAction            *DeleteChatAction                 `protobuf:"bytes,22,opt,name=deleteChatAction" json:"deleteChatAction,omitempty"`
-	UnarchiveChatsSetting       *UnarchiveChatsSetting            `protobuf:"bytes,23,opt,name=unarchiveChatsSetting" json:"unarchiveChatsSetting,omitempty"`
-	PrimaryFeature              *PrimaryFeature                   `protobuf:"bytes,24,opt,name=primaryFeature" json:"primaryFeature,omitempty"`
-	AndroidUnsupportedActions   *AndroidUnsupportedActions        `protobuf:"bytes,26,opt,name=androidUnsupportedActions" json:"androidUnsupportedActions,omitempty"`
-	AgentAction                 *AgentAction                      `protobuf:"bytes,27,opt,name=agentAction" json:"agentAction,omitempty"`
-	SubscriptionAction          *SubscriptionAction               `protobuf:"bytes,28,opt,name=subscriptionAction" json:"subscriptionAction,omitempty"`
-	UserStatusMuteAction        *UserStatusMuteAction             `protobuf:"bytes,29,opt,name=userStatusMuteAction" json:"userStatusMuteAction,omitempty"`
-	TimeFormatAction            *TimeFormatAction                 `protobuf:"bytes,30,opt,name=timeFormatAction" json:"timeFormatAction,omitempty"`
-	NuxAction                   *NuxAction                        `protobuf:"bytes,31,opt,name=nuxAction" json:"nuxAction,omitempty"`
-	PrimaryVersionAction        *PrimaryVersionAction             `protobuf:"bytes,32,opt,name=primaryVersionAction" json:"primaryVersionAction,omitempty"`
-	StickerAction               *StickerAction                    `protobuf:"bytes,33,opt,name=stickerAction" json:"stickerAction,omitempty"`
-	RemoveRecentStickerAction   *RemoveRecentStickerAction        `protobuf:"bytes,34,opt,name=removeRecentStickerAction" json:"removeRecentStickerAction,omitempty"`
-	ChatAssignment              *ChatAssignmentAction             `protobuf:"bytes,35,opt,name=chatAssignment" json:"chatAssignment,omitempty"`
-	ChatAssignmentOpenedStatus  *ChatAssignmentOpenedStatusAction `protobuf:"bytes,36,opt,name=chatAssignmentOpenedStatus" json:"chatAssignmentOpenedStatus,omitempty"`
-	PnForLidChatAction          *PnForLidChatAction               `protobuf:"bytes,37,opt,name=pnForLidChatAction" json:"pnForLidChatAction,omitempty"`
+	Timestamp                       *int64                            `protobuf:"varint,1,opt,name=timestamp" json:"timestamp,omitempty"`
+	StarAction                      *StarAction                       `protobuf:"bytes,2,opt,name=starAction" json:"starAction,omitempty"`
+	ContactAction                   *ContactAction                    `protobuf:"bytes,3,opt,name=contactAction" json:"contactAction,omitempty"`
+	MuteAction                      *MuteAction                       `protobuf:"bytes,4,opt,name=muteAction" json:"muteAction,omitempty"`
+	PinAction                       *PinAction                        `protobuf:"bytes,5,opt,name=pinAction" json:"pinAction,omitempty"`
+	SecurityNotificationSetting     *SecurityNotificationSetting      `protobuf:"bytes,6,opt,name=securityNotificationSetting" json:"securityNotificationSetting,omitempty"`
+	PushNameSetting                 *PushNameSetting                  `protobuf:"bytes,7,opt,name=pushNameSetting" json:"pushNameSetting,omitempty"`
+	QuickReplyAction                *QuickReplyAction                 `protobuf:"bytes,8,opt,name=quickReplyAction" json:"quickReplyAction,omitempty"`
+	RecentEmojiWeightsAction        *RecentEmojiWeightsAction         `protobuf:"bytes,11,opt,name=recentEmojiWeightsAction" json:"recentEmojiWeightsAction,omitempty"`
+	LabelEditAction                 *LabelEditAction                  `protobuf:"bytes,14,opt,name=labelEditAction" json:"labelEditAction,omitempty"`
+	LabelAssociationAction          *LabelAssociationAction           `protobuf:"bytes,15,opt,name=labelAssociationAction" json:"labelAssociationAction,omitempty"`
+	LocaleSetting                   *LocaleSetting                    `protobuf:"bytes,16,opt,name=localeSetting" json:"localeSetting,omitempty"`
+	ArchiveChatAction               *ArchiveChatAction                `protobuf:"bytes,17,opt,name=archiveChatAction" json:"archiveChatAction,omitempty"`
+	DeleteMessageForMeAction        *DeleteMessageForMeAction         `protobuf:"bytes,18,opt,name=deleteMessageForMeAction" json:"deleteMessageForMeAction,omitempty"`
+	KeyExpiration                   *KeyExpiration                    `protobuf:"bytes,19,opt,name=keyExpiration" json:"keyExpiration,omitempty"`
+	MarkChatAsReadAction            *MarkChatAsReadAction             `protobuf:"bytes,20,opt,name=markChatAsReadAction" json:"markChatAsReadAction,omitempty"`
+	ClearChatAction                 *ClearChatAction                  `protobuf:"bytes,21,opt,name=clearChatAction" json:"clearChatAction,omitempty"`
+	DeleteChatAction                *DeleteChatAction                 `protobuf:"bytes,22,opt,name=deleteChatAction" json:"deleteChatAction,omitempty"`
+	UnarchiveChatsSetting           *UnarchiveChatsSetting            `protobuf:"bytes,23,opt,name=unarchiveChatsSetting" json:"unarchiveChatsSetting,omitempty"`
+	PrimaryFeature                  *PrimaryFeature                   `protobuf:"bytes,24,opt,name=primaryFeature" json:"primaryFeature,omitempty"`
+	AndroidUnsupportedActions       *AndroidUnsupportedActions        `protobuf:"bytes,26,opt,name=androidUnsupportedActions" json:"androidUnsupportedActions,omitempty"`
+	AgentAction                     *AgentAction                      `protobuf:"bytes,27,opt,name=agentAction" json:"agentAction,omitempty"`
+	SubscriptionAction              *SubscriptionAction               `protobuf:"bytes,28,opt,name=subscriptionAction" json:"subscriptionAction,omitempty"`
+	UserStatusMuteAction            *UserStatusMuteAction             `protobuf:"bytes,29,opt,name=userStatusMuteAction" json:"userStatusMuteAction,omitempty"`
+	TimeFormatAction                *TimeFormatAction                 `protobuf:"bytes,30,opt,name=timeFormatAction" json:"timeFormatAction,omitempty"`
+	NuxAction                       *NuxAction                        `protobuf:"bytes,31,opt,name=nuxAction" json:"nuxAction,omitempty"`
+	PrimaryVersionAction            *PrimaryVersionAction             `protobuf:"bytes,32,opt,name=primaryVersionAction" json:"primaryVersionAction,omitempty"`
+	StickerAction                   *StickerAction                    `protobuf:"bytes,33,opt,name=stickerAction" json:"stickerAction,omitempty"`
+	RemoveRecentStickerAction       *RemoveRecentStickerAction        `protobuf:"bytes,34,opt,name=removeRecentStickerAction" json:"removeRecentStickerAction,omitempty"`
+	ChatAssignment                  *ChatAssignmentAction             `protobuf:"bytes,35,opt,name=chatAssignment" json:"chatAssignment,omitempty"`
+	ChatAssignmentOpenedStatus      *ChatAssignmentOpenedStatusAction `protobuf:"bytes,36,opt,name=chatAssignmentOpenedStatus" json:"chatAssignmentOpenedStatus,omitempty"`
+	PnForLidChatAction              *PnForLidChatAction               `protobuf:"bytes,37,opt,name=pnForLidChatAction" json:"pnForLidChatAction,omitempty"`
+	MarketingMessageAction          *MarketingMessageAction           `protobuf:"bytes,38,opt,name=marketingMessageAction" json:"marketingMessageAction,omitempty"`
+	MarketingMessageBroadcastAction *MarketingMessageBroadcastAction  `protobuf:"bytes,39,opt,name=marketingMessageBroadcastAction" json:"marketingMessageBroadcastAction,omitempty"`
+	ExternalWebBetaAction           *ExternalWebBetaAction            `protobuf:"bytes,40,opt,name=externalWebBetaAction" json:"externalWebBetaAction,omitempty"`
+	PrivacySettingRelayAllCalls     *PrivacySettingRelayAllCalls      `protobuf:"bytes,41,opt,name=privacySettingRelayAllCalls" json:"privacySettingRelayAllCalls,omitempty"`
 }
 
 func (x *SyncActionValue) Reset() {
 	*x = SyncActionValue{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[107]
+		mi := &file_binary_proto_def_proto_msgTypes[112]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13926,7 +14836,7 @@ func (x *SyncActionValue) String() string {
 func (*SyncActionValue) ProtoMessage() {}
 
 func (x *SyncActionValue) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[107]
+	mi := &file_binary_proto_def_proto_msgTypes[112]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13939,7 +14849,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{107}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{112}
 }
 
 func (x *SyncActionValue) GetTimestamp() int64 {
@@ -14166,6 +15076,34 @@ func (x *SyncActionValue) GetPnForLidChatAction() *PnForLidChatAction {
 	return nil
 }
 
+func (x *SyncActionValue) GetMarketingMessageAction() *MarketingMessageAction {
+	if x != nil {
+		return x.MarketingMessageAction
+	}
+	return nil
+}
+
+func (x *SyncActionValue) GetMarketingMessageBroadcastAction() *MarketingMessageBroadcastAction {
+	if x != nil {
+		return x.MarketingMessageBroadcastAction
+	}
+	return nil
+}
+
+func (x *SyncActionValue) GetExternalWebBetaAction() *ExternalWebBetaAction {
+	if x != nil {
+		return x.ExternalWebBetaAction
+	}
+	return nil
+}
+
+func (x *SyncActionValue) GetPrivacySettingRelayAllCalls() *PrivacySettingRelayAllCalls {
+	if x != nil {
+		return x.PrivacySettingRelayAllCalls
+	}
+	return nil
+}
+
 type UserStatusMuteAction struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -14177,7 +15115,7 @@ type UserStatusMuteAction struct {
 func (x *UserStatusMuteAction) Reset() {
 	*x = UserStatusMuteAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[108]
+		mi := &file_binary_proto_def_proto_msgTypes[113]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14190,7 +15128,7 @@ func (x *UserStatusMuteAction) String() string {
 func (*UserStatusMuteAction) ProtoMessage() {}
 
 func (x *UserStatusMuteAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[108]
+	mi := &file_binary_proto_def_proto_msgTypes[113]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14203,7 +15141,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{108}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{113}
 }
 
 func (x *UserStatusMuteAction) GetMuted() bool {
@@ -14224,7 +15162,7 @@ type UnarchiveChatsSetting struct {
 func (x *UnarchiveChatsSetting) Reset() {
 	*x = UnarchiveChatsSetting{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[109]
+		mi := &file_binary_proto_def_proto_msgTypes[114]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14237,7 +15175,7 @@ func (x *UnarchiveChatsSetting) String() string {
 func (*UnarchiveChatsSetting) ProtoMessage() {}
 
 func (x *UnarchiveChatsSetting) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[109]
+	mi := &file_binary_proto_def_proto_msgTypes[114]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14250,7 +15188,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{109}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{114}
 }
 
 func (x *UnarchiveChatsSetting) GetUnarchiveChats() bool {
@@ -14271,7 +15209,7 @@ type TimeFormatAction struct {
 func (x *TimeFormatAction) Reset() {
 	*x = TimeFormatAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[110]
+		mi := &file_binary_proto_def_proto_msgTypes[115]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14284,7 +15222,7 @@ func (x *TimeFormatAction) String() string {
 func (*TimeFormatAction) ProtoMessage() {}
 
 func (x *TimeFormatAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[110]
+	mi := &file_binary_proto_def_proto_msgTypes[115]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14297,7 +15235,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{110}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{115}
 }
 
 func (x *TimeFormatAction) GetIsTwentyFourHourFormatEnabled() bool {
@@ -14319,7 +15257,7 @@ type SyncActionMessage struct {
 func (x *SyncActionMessage) Reset() {
 	*x = SyncActionMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[111]
+		mi := &file_binary_proto_def_proto_msgTypes[116]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14332,7 +15270,7 @@ func (x *SyncActionMessage) String() string {
 func (*SyncActionMessage) ProtoMessage() {}
 
 func (x *SyncActionMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[111]
+	mi := &file_binary_proto_def_proto_msgTypes[116]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14345,7 +15283,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{111}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{116}
 }
 
 func (x *SyncActionMessage) GetKey() *MessageKey {
@@ -14375,7 +15313,7 @@ type SyncActionMessageRange struct {
 func (x *SyncActionMessageRange) Reset() {
 	*x = SyncActionMessageRange{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[112]
+		mi := &file_binary_proto_def_proto_msgTypes[117]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14388,7 +15326,7 @@ func (x *SyncActionMessageRange) String() string {
 func (*SyncActionMessageRange) ProtoMessage() {}
 
 func (x *SyncActionMessageRange) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[112]
+	mi := &file_binary_proto_def_proto_msgTypes[117]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14401,7 +15339,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{112}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{117}
 }
 
 func (x *SyncActionMessageRange) GetLastMessageTimestamp() int64 {
@@ -14438,7 +15376,7 @@ type SubscriptionAction struct {
 func (x *SubscriptionAction) Reset() {
 	*x = SubscriptionAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[113]
+		mi := &file_binary_proto_def_proto_msgTypes[118]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14451,7 +15389,7 @@ func (x *SubscriptionAction) String() string {
 func (*SubscriptionAction) ProtoMessage() {}
 
 func (x *SubscriptionAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[113]
+	mi := &file_binary_proto_def_proto_msgTypes[118]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14464,7 +15402,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{113}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{118}
 }
 
 func (x *SubscriptionAction) GetIsDeactivated() bool {
@@ -14508,7 +15446,7 @@ type StickerAction struct {
 func (x *StickerAction) Reset() {
 	*x = StickerAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[114]
+		mi := &file_binary_proto_def_proto_msgTypes[119]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14521,7 +15459,7 @@ func (x *StickerAction) String() string {
 func (*StickerAction) ProtoMessage() {}
 
 func (x *StickerAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[114]
+	mi := &file_binary_proto_def_proto_msgTypes[119]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14534,7 +15472,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{114}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{119}
 }
 
 func (x *StickerAction) GetUrl() string {
@@ -14618,7 +15556,7 @@ type StarAction struct {
 func (x *StarAction) Reset() {
 	*x = StarAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[115]
+		mi := &file_binary_proto_def_proto_msgTypes[120]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14631,7 +15569,7 @@ func (x *StarAction) String() string {
 func (*StarAction) ProtoMessage() {}
 
 func (x *StarAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[115]
+	mi := &file_binary_proto_def_proto_msgTypes[120]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14644,7 +15582,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{115}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{120}
 }
 
 func (x *StarAction) GetStarred() bool {
@@ -14665,7 +15603,7 @@ type SecurityNotificationSetting struct {
 func (x *SecurityNotificationSetting) Reset() {
 	*x = SecurityNotificationSetting{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[116]
+		mi := &file_binary_proto_def_proto_msgTypes[121]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14678,7 +15616,7 @@ func (x *SecurityNotificationSetting) String() string {
 func (*SecurityNotificationSetting) ProtoMessage() {}
 
 func (x *SecurityNotificationSetting) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[116]
+	mi := &file_binary_proto_def_proto_msgTypes[121]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14691,7 +15629,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{116}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{121}
 }
 
 func (x *SecurityNotificationSetting) GetShowNotification() bool {
@@ -14712,7 +15650,7 @@ type RemoveRecentStickerAction struct {
 func (x *RemoveRecentStickerAction) Reset() {
 	*x = RemoveRecentStickerAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[117]
+		mi := &file_binary_proto_def_proto_msgTypes[122]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14725,7 +15663,7 @@ func (x *RemoveRecentStickerAction) String() string {
 func (*RemoveRecentStickerAction) ProtoMessage() {}
 
 func (x *RemoveRecentStickerAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[117]
+	mi := &file_binary_proto_def_proto_msgTypes[122]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14738,7 +15676,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{117}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{122}
 }
 
 func (x *RemoveRecentStickerAction) GetLastStickerSentTs() int64 {
@@ -14759,7 +15697,7 @@ type RecentEmojiWeightsAction struct {
 func (x *RecentEmojiWeightsAction) Reset() {
 	*x = RecentEmojiWeightsAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[118]
+		mi := &file_binary_proto_def_proto_msgTypes[123]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14772,7 +15710,7 @@ func (x *RecentEmojiWeightsAction) String() string {
 func (*RecentEmojiWeightsAction) ProtoMessage() {}
 
 func (x *RecentEmojiWeightsAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[118]
+	mi := &file_binary_proto_def_proto_msgTypes[123]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14785,7 +15723,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{118}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{123}
 }
 
 func (x *RecentEmojiWeightsAction) GetWeights() []*RecentEmojiWeight {
@@ -14810,7 +15748,7 @@ type QuickReplyAction struct {
 func (x *QuickReplyAction) Reset() {
 	*x = QuickReplyAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[119]
+		mi := &file_binary_proto_def_proto_msgTypes[124]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14823,7 +15761,7 @@ func (x *QuickReplyAction) String() string {
 func (*QuickReplyAction) ProtoMessage() {}
 
 func (x *QuickReplyAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[119]
+	mi := &file_binary_proto_def_proto_msgTypes[124]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14836,7 +15774,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{119}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{124}
 }
 
 func (x *QuickReplyAction) GetShortcut() string {
@@ -14885,7 +15823,7 @@ type PushNameSetting struct {
 func (x *PushNameSetting) Reset() {
 	*x = PushNameSetting{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[120]
+		mi := &file_binary_proto_def_proto_msgTypes[125]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14898,7 +15836,7 @@ func (x *PushNameSetting) String() string {
 func (*PushNameSetting) ProtoMessage() {}
 
 func (x *PushNameSetting) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[120]
+	mi := &file_binary_proto_def_proto_msgTypes[125]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14911,7 +15849,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{120}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{125}
 }
 
 func (x *PushNameSetting) GetName() string {
@@ -14921,6 +15859,53 @@ func (x *PushNameSetting) GetName() string {
 	return ""
 }
 
+type PrivacySettingRelayAllCalls struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	IsEnabled *bool `protobuf:"varint,1,opt,name=isEnabled" json:"isEnabled,omitempty"`
+}
+
+func (x *PrivacySettingRelayAllCalls) Reset() {
+	*x = PrivacySettingRelayAllCalls{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[126]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PrivacySettingRelayAllCalls) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PrivacySettingRelayAllCalls) ProtoMessage() {}
+
+func (x *PrivacySettingRelayAllCalls) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[126]
+	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 PrivacySettingRelayAllCalls.ProtoReflect.Descriptor instead.
+func (*PrivacySettingRelayAllCalls) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{126}
+}
+
+func (x *PrivacySettingRelayAllCalls) GetIsEnabled() bool {
+	if x != nil && x.IsEnabled != nil {
+		return *x.IsEnabled
+	}
+	return false
+}
+
 type PrimaryVersionAction struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -14932,7 +15917,7 @@ type PrimaryVersionAction struct {
 func (x *PrimaryVersionAction) Reset() {
 	*x = PrimaryVersionAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[121]
+		mi := &file_binary_proto_def_proto_msgTypes[127]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14945,7 +15930,7 @@ func (x *PrimaryVersionAction) String() string {
 func (*PrimaryVersionAction) ProtoMessage() {}
 
 func (x *PrimaryVersionAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[121]
+	mi := &file_binary_proto_def_proto_msgTypes[127]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14958,7 +15943,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{121}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{127}
 }
 
 func (x *PrimaryVersionAction) GetVersion() string {
@@ -14979,7 +15964,7 @@ type PrimaryFeature struct {
 func (x *PrimaryFeature) Reset() {
 	*x = PrimaryFeature{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[122]
+		mi := &file_binary_proto_def_proto_msgTypes[128]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14992,7 +15977,7 @@ func (x *PrimaryFeature) String() string {
 func (*PrimaryFeature) ProtoMessage() {}
 
 func (x *PrimaryFeature) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[122]
+	mi := &file_binary_proto_def_proto_msgTypes[128]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15005,7 +15990,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{122}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{128}
 }
 
 func (x *PrimaryFeature) GetFlags() []string {
@@ -15026,7 +16011,7 @@ type PnForLidChatAction struct {
 func (x *PnForLidChatAction) Reset() {
 	*x = PnForLidChatAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[123]
+		mi := &file_binary_proto_def_proto_msgTypes[129]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15039,7 +16024,7 @@ func (x *PnForLidChatAction) String() string {
 func (*PnForLidChatAction) ProtoMessage() {}
 
 func (x *PnForLidChatAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[123]
+	mi := &file_binary_proto_def_proto_msgTypes[129]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15052,7 +16037,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{123}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{129}
 }
 
 func (x *PnForLidChatAction) GetPnJid() string {
@@ -15073,7 +16058,7 @@ type PinAction struct {
 func (x *PinAction) Reset() {
 	*x = PinAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[124]
+		mi := &file_binary_proto_def_proto_msgTypes[130]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15086,7 +16071,7 @@ func (x *PinAction) String() string {
 func (*PinAction) ProtoMessage() {}
 
 func (x *PinAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[124]
+	mi := &file_binary_proto_def_proto_msgTypes[130]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15099,7 +16084,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{124}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{130}
 }
 
 func (x *PinAction) GetPinned() bool {
@@ -15120,7 +16105,7 @@ type NuxAction struct {
 func (x *NuxAction) Reset() {
 	*x = NuxAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[125]
+		mi := &file_binary_proto_def_proto_msgTypes[131]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15133,7 +16118,7 @@ func (x *NuxAction) String() string {
 func (*NuxAction) ProtoMessage() {}
 
 func (x *NuxAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[125]
+	mi := &file_binary_proto_def_proto_msgTypes[131]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15146,7 +16131,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{125}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{131}
 }
 
 func (x *NuxAction) GetAcknowledged() bool {
@@ -15169,7 +16154,7 @@ type MuteAction struct {
 func (x *MuteAction) Reset() {
 	*x = MuteAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[126]
+		mi := &file_binary_proto_def_proto_msgTypes[132]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15182,7 +16167,7 @@ func (x *MuteAction) String() string {
 func (*MuteAction) ProtoMessage() {}
 
 func (x *MuteAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[126]
+	mi := &file_binary_proto_def_proto_msgTypes[132]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15195,7 +16180,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{126}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{132}
 }
 
 func (x *MuteAction) GetMuted() bool {
@@ -15219,6 +16204,148 @@ func (x *MuteAction) GetAutoMuted() bool {
 	return false
 }
 
+type MarketingMessageBroadcastAction struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	RepliedCount *int32 `protobuf:"varint,1,opt,name=repliedCount" json:"repliedCount,omitempty"`
+}
+
+func (x *MarketingMessageBroadcastAction) Reset() {
+	*x = MarketingMessageBroadcastAction{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[133]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MarketingMessageBroadcastAction) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MarketingMessageBroadcastAction) ProtoMessage() {}
+
+func (x *MarketingMessageBroadcastAction) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[133]
+	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 MarketingMessageBroadcastAction.ProtoReflect.Descriptor instead.
+func (*MarketingMessageBroadcastAction) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{133}
+}
+
+func (x *MarketingMessageBroadcastAction) GetRepliedCount() int32 {
+	if x != nil && x.RepliedCount != nil {
+		return *x.RepliedCount
+	}
+	return 0
+}
+
+type MarketingMessageAction struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name       *string                                               `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Message    *string                                               `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"`
+	Type       *MarketingMessageAction_MarketingMessagePrototypeType `protobuf:"varint,3,opt,name=type,enum=proto.MarketingMessageAction_MarketingMessagePrototypeType" json:"type,omitempty"`
+	CreatedAt  *int64                                                `protobuf:"varint,4,opt,name=createdAt" json:"createdAt,omitempty"`
+	LastSentAt *int64                                                `protobuf:"varint,5,opt,name=lastSentAt" json:"lastSentAt,omitempty"`
+	IsDeleted  *bool                                                 `protobuf:"varint,6,opt,name=isDeleted" json:"isDeleted,omitempty"`
+	MediaId    *string                                               `protobuf:"bytes,7,opt,name=mediaId" json:"mediaId,omitempty"`
+}
+
+func (x *MarketingMessageAction) Reset() {
+	*x = MarketingMessageAction{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[134]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MarketingMessageAction) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MarketingMessageAction) ProtoMessage() {}
+
+func (x *MarketingMessageAction) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[134]
+	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 MarketingMessageAction.ProtoReflect.Descriptor instead.
+func (*MarketingMessageAction) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{134}
+}
+
+func (x *MarketingMessageAction) GetName() string {
+	if x != nil && x.Name != nil {
+		return *x.Name
+	}
+	return ""
+}
+
+func (x *MarketingMessageAction) GetMessage() string {
+	if x != nil && x.Message != nil {
+		return *x.Message
+	}
+	return ""
+}
+
+func (x *MarketingMessageAction) GetType() MarketingMessageAction_MarketingMessagePrototypeType {
+	if x != nil && x.Type != nil {
+		return *x.Type
+	}
+	return MarketingMessageAction_PERSONALIZED
+}
+
+func (x *MarketingMessageAction) GetCreatedAt() int64 {
+	if x != nil && x.CreatedAt != nil {
+		return *x.CreatedAt
+	}
+	return 0
+}
+
+func (x *MarketingMessageAction) GetLastSentAt() int64 {
+	if x != nil && x.LastSentAt != nil {
+		return *x.LastSentAt
+	}
+	return 0
+}
+
+func (x *MarketingMessageAction) GetIsDeleted() bool {
+	if x != nil && x.IsDeleted != nil {
+		return *x.IsDeleted
+	}
+	return false
+}
+
+func (x *MarketingMessageAction) GetMediaId() string {
+	if x != nil && x.MediaId != nil {
+		return *x.MediaId
+	}
+	return ""
+}
+
 type MarkChatAsReadAction struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -15231,7 +16358,7 @@ type MarkChatAsReadAction struct {
 func (x *MarkChatAsReadAction) Reset() {
 	*x = MarkChatAsReadAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[127]
+		mi := &file_binary_proto_def_proto_msgTypes[135]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15244,7 +16371,7 @@ func (x *MarkChatAsReadAction) String() string {
 func (*MarkChatAsReadAction) ProtoMessage() {}
 
 func (x *MarkChatAsReadAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[127]
+	mi := &file_binary_proto_def_proto_msgTypes[135]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15257,7 +16384,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{127}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{135}
 }
 
 func (x *MarkChatAsReadAction) GetRead() bool {
@@ -15285,7 +16412,7 @@ type LocaleSetting struct {
 func (x *LocaleSetting) Reset() {
 	*x = LocaleSetting{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[128]
+		mi := &file_binary_proto_def_proto_msgTypes[136]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15298,7 +16425,7 @@ func (x *LocaleSetting) String() string {
 func (*LocaleSetting) ProtoMessage() {}
 
 func (x *LocaleSetting) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[128]
+	mi := &file_binary_proto_def_proto_msgTypes[136]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15311,7 +16438,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{128}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{136}
 }
 
 func (x *LocaleSetting) GetLocale() string {
@@ -15335,7 +16462,7 @@ type LabelEditAction struct {
 func (x *LabelEditAction) Reset() {
 	*x = LabelEditAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[129]
+		mi := &file_binary_proto_def_proto_msgTypes[137]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15348,7 +16475,7 @@ func (x *LabelEditAction) String() string {
 func (*LabelEditAction) ProtoMessage() {}
 
 func (x *LabelEditAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[129]
+	mi := &file_binary_proto_def_proto_msgTypes[137]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15361,7 +16488,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{129}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{137}
 }
 
 func (x *LabelEditAction) GetName() string {
@@ -15403,7 +16530,7 @@ type LabelAssociationAction struct {
 func (x *LabelAssociationAction) Reset() {
 	*x = LabelAssociationAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[130]
+		mi := &file_binary_proto_def_proto_msgTypes[138]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15416,7 +16543,7 @@ func (x *LabelAssociationAction) String() string {
 func (*LabelAssociationAction) ProtoMessage() {}
 
 func (x *LabelAssociationAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[130]
+	mi := &file_binary_proto_def_proto_msgTypes[138]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15429,7 +16556,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{130}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{138}
 }
 
 func (x *LabelAssociationAction) GetLabeled() bool {
@@ -15450,7 +16577,7 @@ type KeyExpiration struct {
 func (x *KeyExpiration) Reset() {
 	*x = KeyExpiration{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[131]
+		mi := &file_binary_proto_def_proto_msgTypes[139]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15463,7 +16590,7 @@ func (x *KeyExpiration) String() string {
 func (*KeyExpiration) ProtoMessage() {}
 
 func (x *KeyExpiration) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[131]
+	mi := &file_binary_proto_def_proto_msgTypes[139]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15476,7 +16603,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{131}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{139}
 }
 
 func (x *KeyExpiration) GetExpiredKeyEpoch() int32 {
@@ -15486,6 +16613,53 @@ func (x *KeyExpiration) GetExpiredKeyEpoch() int32 {
 	return 0
 }
 
+type ExternalWebBetaAction struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	IsOptIn *bool `protobuf:"varint,1,opt,name=isOptIn" json:"isOptIn,omitempty"`
+}
+
+func (x *ExternalWebBetaAction) Reset() {
+	*x = ExternalWebBetaAction{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[140]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ExternalWebBetaAction) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ExternalWebBetaAction) ProtoMessage() {}
+
+func (x *ExternalWebBetaAction) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[140]
+	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 ExternalWebBetaAction.ProtoReflect.Descriptor instead.
+func (*ExternalWebBetaAction) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{140}
+}
+
+func (x *ExternalWebBetaAction) GetIsOptIn() bool {
+	if x != nil && x.IsOptIn != nil {
+		return *x.IsOptIn
+	}
+	return false
+}
+
 type DeleteMessageForMeAction struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -15498,7 +16672,7 @@ type DeleteMessageForMeAction struct {
 func (x *DeleteMessageForMeAction) Reset() {
 	*x = DeleteMessageForMeAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[132]
+		mi := &file_binary_proto_def_proto_msgTypes[141]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15511,7 +16685,7 @@ func (x *DeleteMessageForMeAction) String() string {
 func (*DeleteMessageForMeAction) ProtoMessage() {}
 
 func (x *DeleteMessageForMeAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[132]
+	mi := &file_binary_proto_def_proto_msgTypes[141]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15524,7 +16698,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{132}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{141}
 }
 
 func (x *DeleteMessageForMeAction) GetDeleteMedia() bool {
@@ -15552,7 +16726,7 @@ type DeleteChatAction struct {
 func (x *DeleteChatAction) Reset() {
 	*x = DeleteChatAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[133]
+		mi := &file_binary_proto_def_proto_msgTypes[142]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15565,7 +16739,7 @@ func (x *DeleteChatAction) String() string {
 func (*DeleteChatAction) ProtoMessage() {}
 
 func (x *DeleteChatAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[133]
+	mi := &file_binary_proto_def_proto_msgTypes[142]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15578,7 +16752,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{133}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{142}
 }
 
 func (x *DeleteChatAction) GetMessageRange() *SyncActionMessageRange {
@@ -15601,7 +16775,7 @@ type ContactAction struct {
 func (x *ContactAction) Reset() {
 	*x = ContactAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[134]
+		mi := &file_binary_proto_def_proto_msgTypes[143]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15614,7 +16788,7 @@ func (x *ContactAction) String() string {
 func (*ContactAction) ProtoMessage() {}
 
 func (x *ContactAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[134]
+	mi := &file_binary_proto_def_proto_msgTypes[143]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15627,7 +16801,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{134}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{143}
 }
 
 func (x *ContactAction) GetFullName() string {
@@ -15662,7 +16836,7 @@ type ClearChatAction struct {
 func (x *ClearChatAction) Reset() {
 	*x = ClearChatAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[135]
+		mi := &file_binary_proto_def_proto_msgTypes[144]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15675,7 +16849,7 @@ func (x *ClearChatAction) String() string {
 func (*ClearChatAction) ProtoMessage() {}
 
 func (x *ClearChatAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[135]
+	mi := &file_binary_proto_def_proto_msgTypes[144]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15688,7 +16862,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{135}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{144}
 }
 
 func (x *ClearChatAction) GetMessageRange() *SyncActionMessageRange {
@@ -15709,7 +16883,7 @@ type ChatAssignmentOpenedStatusAction struct {
 func (x *ChatAssignmentOpenedStatusAction) Reset() {
 	*x = ChatAssignmentOpenedStatusAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[136]
+		mi := &file_binary_proto_def_proto_msgTypes[145]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15722,7 +16896,7 @@ func (x *ChatAssignmentOpenedStatusAction) String() string {
 func (*ChatAssignmentOpenedStatusAction) ProtoMessage() {}
 
 func (x *ChatAssignmentOpenedStatusAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[136]
+	mi := &file_binary_proto_def_proto_msgTypes[145]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15735,7 +16909,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{136}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{145}
 }
 
 func (x *ChatAssignmentOpenedStatusAction) GetChatOpened() bool {
@@ -15756,7 +16930,7 @@ type ChatAssignmentAction struct {
 func (x *ChatAssignmentAction) Reset() {
 	*x = ChatAssignmentAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[137]
+		mi := &file_binary_proto_def_proto_msgTypes[146]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15769,7 +16943,7 @@ func (x *ChatAssignmentAction) String() string {
 func (*ChatAssignmentAction) ProtoMessage() {}
 
 func (x *ChatAssignmentAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[137]
+	mi := &file_binary_proto_def_proto_msgTypes[146]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15782,7 +16956,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{137}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{146}
 }
 
 func (x *ChatAssignmentAction) GetDeviceAgentID() string {
@@ -15804,7 +16978,7 @@ type ArchiveChatAction struct {
 func (x *ArchiveChatAction) Reset() {
 	*x = ArchiveChatAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[138]
+		mi := &file_binary_proto_def_proto_msgTypes[147]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15817,7 +16991,7 @@ func (x *ArchiveChatAction) String() string {
 func (*ArchiveChatAction) ProtoMessage() {}
 
 func (x *ArchiveChatAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[138]
+	mi := &file_binary_proto_def_proto_msgTypes[147]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15830,7 +17004,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{138}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{147}
 }
 
 func (x *ArchiveChatAction) GetArchived() bool {
@@ -15858,7 +17032,7 @@ type AndroidUnsupportedActions struct {
 func (x *AndroidUnsupportedActions) Reset() {
 	*x = AndroidUnsupportedActions{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[139]
+		mi := &file_binary_proto_def_proto_msgTypes[148]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15871,7 +17045,7 @@ func (x *AndroidUnsupportedActions) String() string {
 func (*AndroidUnsupportedActions) ProtoMessage() {}
 
 func (x *AndroidUnsupportedActions) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[139]
+	mi := &file_binary_proto_def_proto_msgTypes[148]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15884,7 +17058,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{139}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{148}
 }
 
 func (x *AndroidUnsupportedActions) GetAllowed() bool {
@@ -15907,7 +17081,7 @@ type AgentAction struct {
 func (x *AgentAction) Reset() {
 	*x = AgentAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[140]
+		mi := &file_binary_proto_def_proto_msgTypes[149]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15920,7 +17094,7 @@ func (x *AgentAction) String() string {
 func (*AgentAction) ProtoMessage() {}
 
 func (x *AgentAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[140]
+	mi := &file_binary_proto_def_proto_msgTypes[149]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15933,7 +17107,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{140}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{149}
 }
 
 func (x *AgentAction) GetName() string {
@@ -15971,7 +17145,7 @@ type SyncActionData struct {
 func (x *SyncActionData) Reset() {
 	*x = SyncActionData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[141]
+		mi := &file_binary_proto_def_proto_msgTypes[150]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15984,7 +17158,7 @@ func (x *SyncActionData) String() string {
 func (*SyncActionData) ProtoMessage() {}
 
 func (x *SyncActionData) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[141]
+	mi := &file_binary_proto_def_proto_msgTypes[150]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15997,7 +17171,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{141}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{150}
 }
 
 func (x *SyncActionData) GetIndex() []byte {
@@ -16040,7 +17214,7 @@ type RecentEmojiWeight struct {
 func (x *RecentEmojiWeight) Reset() {
 	*x = RecentEmojiWeight{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[142]
+		mi := &file_binary_proto_def_proto_msgTypes[151]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16053,7 +17227,7 @@ func (x *RecentEmojiWeight) String() string {
 func (*RecentEmojiWeight) ProtoMessage() {}
 
 func (x *RecentEmojiWeight) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[142]
+	mi := &file_binary_proto_def_proto_msgTypes[151]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16066,7 +17240,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{142}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{151}
 }
 
 func (x *RecentEmojiWeight) GetEmoji() string {
@@ -16096,7 +17270,7 @@ type VerifiedNameCertificate struct {
 func (x *VerifiedNameCertificate) Reset() {
 	*x = VerifiedNameCertificate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[143]
+		mi := &file_binary_proto_def_proto_msgTypes[152]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16109,7 +17283,7 @@ func (x *VerifiedNameCertificate) String() string {
 func (*VerifiedNameCertificate) ProtoMessage() {}
 
 func (x *VerifiedNameCertificate) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[143]
+	mi := &file_binary_proto_def_proto_msgTypes[152]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16122,7 +17296,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{143}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{152}
 }
 
 func (x *VerifiedNameCertificate) GetDetails() []byte {
@@ -16159,7 +17333,7 @@ type LocalizedName struct {
 func (x *LocalizedName) Reset() {
 	*x = LocalizedName{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[144]
+		mi := &file_binary_proto_def_proto_msgTypes[153]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16172,7 +17346,7 @@ func (x *LocalizedName) String() string {
 func (*LocalizedName) ProtoMessage() {}
 
 func (x *LocalizedName) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[144]
+	mi := &file_binary_proto_def_proto_msgTypes[153]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16185,7 +17359,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{144}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{153}
 }
 
 func (x *LocalizedName) GetLg() string {
@@ -16227,7 +17401,7 @@ type BizIdentityInfo struct {
 func (x *BizIdentityInfo) Reset() {
 	*x = BizIdentityInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[145]
+		mi := &file_binary_proto_def_proto_msgTypes[154]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16240,7 +17414,7 @@ func (x *BizIdentityInfo) String() string {
 func (*BizIdentityInfo) ProtoMessage() {}
 
 func (x *BizIdentityInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[145]
+	mi := &file_binary_proto_def_proto_msgTypes[154]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16253,7 +17427,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{145}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{154}
 }
 
 func (x *BizIdentityInfo) GetVlevel() BizIdentityInfo_VerifiedLevelValue {
@@ -16324,7 +17498,7 @@ type BizAccountPayload struct {
 func (x *BizAccountPayload) Reset() {
 	*x = BizAccountPayload{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[146]
+		mi := &file_binary_proto_def_proto_msgTypes[155]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16337,7 +17511,7 @@ func (x *BizAccountPayload) String() string {
 func (*BizAccountPayload) ProtoMessage() {}
 
 func (x *BizAccountPayload) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[146]
+	mi := &file_binary_proto_def_proto_msgTypes[155]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16350,7 +17524,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{146}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{155}
 }
 
 func (x *BizAccountPayload) GetVnameCert() *VerifiedNameCertificate {
@@ -16382,7 +17556,7 @@ type BizAccountLinkInfo struct {
 func (x *BizAccountLinkInfo) Reset() {
 	*x = BizAccountLinkInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[147]
+		mi := &file_binary_proto_def_proto_msgTypes[156]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16395,7 +17569,7 @@ func (x *BizAccountLinkInfo) String() string {
 func (*BizAccountLinkInfo) ProtoMessage() {}
 
 func (x *BizAccountLinkInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[147]
+	mi := &file_binary_proto_def_proto_msgTypes[156]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16408,7 +17582,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{147}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{156}
 }
 
 func (x *BizAccountLinkInfo) GetWhatsappBizAcctFbid() uint64 {
@@ -16459,7 +17633,7 @@ type HandshakeMessage struct {
 func (x *HandshakeMessage) Reset() {
 	*x = HandshakeMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[148]
+		mi := &file_binary_proto_def_proto_msgTypes[157]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16472,7 +17646,7 @@ func (x *HandshakeMessage) String() string {
 func (*HandshakeMessage) ProtoMessage() {}
 
 func (x *HandshakeMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[148]
+	mi := &file_binary_proto_def_proto_msgTypes[157]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16485,7 +17659,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{148}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{157}
 }
 
 func (x *HandshakeMessage) GetClientHello() *HandshakeClientHello {
@@ -16522,7 +17696,7 @@ type HandshakeServerHello struct {
 func (x *HandshakeServerHello) Reset() {
 	*x = HandshakeServerHello{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[149]
+		mi := &file_binary_proto_def_proto_msgTypes[158]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16535,7 +17709,7 @@ func (x *HandshakeServerHello) String() string {
 func (*HandshakeServerHello) ProtoMessage() {}
 
 func (x *HandshakeServerHello) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[149]
+	mi := &file_binary_proto_def_proto_msgTypes[158]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16548,7 +17722,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{149}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{158}
 }
 
 func (x *HandshakeServerHello) GetEphemeral() []byte {
@@ -16585,7 +17759,7 @@ type HandshakeClientHello struct {
 func (x *HandshakeClientHello) Reset() {
 	*x = HandshakeClientHello{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[150]
+		mi := &file_binary_proto_def_proto_msgTypes[159]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16598,7 +17772,7 @@ func (x *HandshakeClientHello) String() string {
 func (*HandshakeClientHello) ProtoMessage() {}
 
 func (x *HandshakeClientHello) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[150]
+	mi := &file_binary_proto_def_proto_msgTypes[159]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16611,7 +17785,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{150}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{159}
 }
 
 func (x *HandshakeClientHello) GetEphemeral() []byte {
@@ -16647,7 +17821,7 @@ type HandshakeClientFinish struct {
 func (x *HandshakeClientFinish) Reset() {
 	*x = HandshakeClientFinish{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[151]
+		mi := &file_binary_proto_def_proto_msgTypes[160]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16660,7 +17834,7 @@ func (x *HandshakeClientFinish) String() string {
 func (*HandshakeClientFinish) ProtoMessage() {}
 
 func (x *HandshakeClientFinish) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[151]
+	mi := &file_binary_proto_def_proto_msgTypes[160]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16673,7 +17847,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{151}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{160}
 }
 
 func (x *HandshakeClientFinish) GetStatic() []byte {
@@ -16721,12 +17895,13 @@ type ClientPayload struct {
 	PaddingBytes        []byte                                       `protobuf:"bytes,34,opt,name=paddingBytes" json:"paddingBytes,omitempty"`
 	YearClass           *int32                                       `protobuf:"varint,36,opt,name=yearClass" json:"yearClass,omitempty"`
 	MemClass            *int32                                       `protobuf:"varint,37,opt,name=memClass" json:"memClass,omitempty"`
+	InteropData         *ClientPayload_InteropData                   `protobuf:"bytes,38,opt,name=interopData" json:"interopData,omitempty"`
 }
 
 func (x *ClientPayload) Reset() {
 	*x = ClientPayload{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[152]
+		mi := &file_binary_proto_def_proto_msgTypes[161]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16739,7 +17914,7 @@ func (x *ClientPayload) String() string {
 func (*ClientPayload) ProtoMessage() {}
 
 func (x *ClientPayload) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[152]
+	mi := &file_binary_proto_def_proto_msgTypes[161]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16752,7 +17927,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{152}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{161}
 }
 
 func (x *ClientPayload) GetUsername() uint64 {
@@ -16937,6 +18112,13 @@ func (x *ClientPayload) GetMemClass() int32 {
 	return 0
 }
 
+func (x *ClientPayload) GetInteropData() *ClientPayload_InteropData {
+	if x != nil {
+		return x.InteropData
+	}
+	return nil
+}
+
 type WebNotificationsInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -16951,7 +18133,7 @@ type WebNotificationsInfo struct {
 func (x *WebNotificationsInfo) Reset() {
 	*x = WebNotificationsInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[153]
+		mi := &file_binary_proto_def_proto_msgTypes[162]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16964,7 +18146,7 @@ func (x *WebNotificationsInfo) String() string {
 func (*WebNotificationsInfo) ProtoMessage() {}
 
 func (x *WebNotificationsInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[153]
+	mi := &file_binary_proto_def_proto_msgTypes[162]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16977,7 +18159,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{153}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{162}
 }
 
 func (x *WebNotificationsInfo) GetTimestamp() uint64 {
@@ -17056,12 +18238,13 @@ type WebMessageInfo struct {
 	KeepInChat                      *KeepInChat                      `protobuf:"bytes,50,opt,name=keepInChat" json:"keepInChat,omitempty"`
 	OriginalSelfAuthorUserJidString *string                          `protobuf:"bytes,51,opt,name=originalSelfAuthorUserJidString" json:"originalSelfAuthorUserJidString,omitempty"`
 	RevokeMessageTimestamp          *uint64                          `protobuf:"varint,52,opt,name=revokeMessageTimestamp" json:"revokeMessageTimestamp,omitempty"`
+	PinInChat                       *PinInChat                       `protobuf:"bytes,54,opt,name=pinInChat" json:"pinInChat,omitempty"`
 }
 
 func (x *WebMessageInfo) Reset() {
 	*x = WebMessageInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[154]
+		mi := &file_binary_proto_def_proto_msgTypes[163]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -17074,7 +18257,7 @@ func (x *WebMessageInfo) String() string {
 func (*WebMessageInfo) ProtoMessage() {}
 
 func (x *WebMessageInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[154]
+	mi := &file_binary_proto_def_proto_msgTypes[163]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -17087,7 +18270,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{154}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{163}
 }
 
 func (x *WebMessageInfo) GetKey() *MessageKey {
@@ -17391,6 +18574,13 @@ func (x *WebMessageInfo) GetRevokeMessageTimestamp() uint64 {
 	return 0
 }
 
+func (x *WebMessageInfo) GetPinInChat() *PinInChat {
+	if x != nil {
+		return x.PinInChat
+	}
+	return nil
+}
+
 type WebFeatures struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -17446,7 +18636,7 @@ type WebFeatures struct {
 func (x *WebFeatures) Reset() {
 	*x = WebFeatures{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[155]
+		mi := &file_binary_proto_def_proto_msgTypes[164]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -17459,7 +18649,7 @@ func (x *WebFeatures) String() string {
 func (*WebFeatures) ProtoMessage() {}
 
 func (x *WebFeatures) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[155]
+	mi := &file_binary_proto_def_proto_msgTypes[164]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -17472,7 +18662,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{155}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{164}
 }
 
 func (x *WebFeatures) GetLabelsDisplay() WebFeatures_Flag {
@@ -17806,7 +18996,7 @@ type UserReceipt struct {
 func (x *UserReceipt) Reset() {
 	*x = UserReceipt{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[156]
+		mi := &file_binary_proto_def_proto_msgTypes[165]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -17819,7 +19009,7 @@ func (x *UserReceipt) String() string {
 func (*UserReceipt) ProtoMessage() {}
 
 func (x *UserReceipt) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[156]
+	mi := &file_binary_proto_def_proto_msgTypes[165]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -17832,7 +19022,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{156}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{165}
 }
 
 func (x *UserReceipt) GetUserJid() string {
@@ -17889,7 +19079,7 @@ type StatusPSA struct {
 func (x *StatusPSA) Reset() {
 	*x = StatusPSA{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[157]
+		mi := &file_binary_proto_def_proto_msgTypes[166]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -17902,7 +19092,7 @@ func (x *StatusPSA) String() string {
 func (*StatusPSA) ProtoMessage() {}
 
 func (x *StatusPSA) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[157]
+	mi := &file_binary_proto_def_proto_msgTypes[166]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -17915,7 +19105,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{157}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{166}
 }
 
 func (x *StatusPSA) GetCampaignId() uint64 {
@@ -17947,7 +19137,7 @@ type Reaction struct {
 func (x *Reaction) Reset() {
 	*x = Reaction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[158]
+		mi := &file_binary_proto_def_proto_msgTypes[167]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -17960,7 +19150,7 @@ func (x *Reaction) String() string {
 func (*Reaction) ProtoMessage() {}
 
 func (x *Reaction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[158]
+	mi := &file_binary_proto_def_proto_msgTypes[167]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -17973,7 +19163,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{158}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{167}
 }
 
 func (x *Reaction) GetKey() *MessageKey {
@@ -18026,7 +19216,7 @@ type PollUpdate struct {
 func (x *PollUpdate) Reset() {
 	*x = PollUpdate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[159]
+		mi := &file_binary_proto_def_proto_msgTypes[168]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18039,7 +19229,7 @@ func (x *PollUpdate) String() string {
 func (*PollUpdate) ProtoMessage() {}
 
 func (x *PollUpdate) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[159]
+	mi := &file_binary_proto_def_proto_msgTypes[168]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18052,7 +19242,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{159}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{168}
 }
 
 func (x *PollUpdate) GetPollUpdateMessageKey() *MessageKey {
@@ -18101,7 +19291,7 @@ type PollAdditionalMetadata struct {
 func (x *PollAdditionalMetadata) Reset() {
 	*x = PollAdditionalMetadata{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[160]
+		mi := &file_binary_proto_def_proto_msgTypes[169]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18114,7 +19304,7 @@ func (x *PollAdditionalMetadata) String() string {
 func (*PollAdditionalMetadata) ProtoMessage() {}
 
 func (x *PollAdditionalMetadata) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[160]
+	mi := &file_binary_proto_def_proto_msgTypes[169]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18127,7 +19317,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{160}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{169}
 }
 
 func (x *PollAdditionalMetadata) GetPollInvalidated() bool {
@@ -18137,6 +19327,85 @@ func (x *PollAdditionalMetadata) GetPollInvalidated() bool {
 	return false
 }
 
+type PinInChat struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Type                    *PinInChat_Type          `protobuf:"varint,1,opt,name=type,enum=proto.PinInChat_Type" json:"type,omitempty"`
+	Key                     *MessageKey              `protobuf:"bytes,2,opt,name=key" json:"key,omitempty"`
+	SenderTimestampMs       *int64                   `protobuf:"varint,3,opt,name=senderTimestampMs" json:"senderTimestampMs,omitempty"`
+	ServerTimestampMs       *int64                   `protobuf:"varint,4,opt,name=serverTimestampMs" json:"serverTimestampMs,omitempty"`
+	MessageAddOnContextInfo *MessageAddOnContextInfo `protobuf:"bytes,5,opt,name=messageAddOnContextInfo" json:"messageAddOnContextInfo,omitempty"`
+}
+
+func (x *PinInChat) Reset() {
+	*x = PinInChat{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[170]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PinInChat) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PinInChat) ProtoMessage() {}
+
+func (x *PinInChat) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[170]
+	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 PinInChat.ProtoReflect.Descriptor instead.
+func (*PinInChat) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{170}
+}
+
+func (x *PinInChat) GetType() PinInChat_Type {
+	if x != nil && x.Type != nil {
+		return *x.Type
+	}
+	return PinInChat_UNKNOWN_TYPE
+}
+
+func (x *PinInChat) GetKey() *MessageKey {
+	if x != nil {
+		return x.Key
+	}
+	return nil
+}
+
+func (x *PinInChat) GetSenderTimestampMs() int64 {
+	if x != nil && x.SenderTimestampMs != nil {
+		return *x.SenderTimestampMs
+	}
+	return 0
+}
+
+func (x *PinInChat) GetServerTimestampMs() int64 {
+	if x != nil && x.ServerTimestampMs != nil {
+		return *x.ServerTimestampMs
+	}
+	return 0
+}
+
+func (x *PinInChat) GetMessageAddOnContextInfo() *MessageAddOnContextInfo {
+	if x != nil {
+		return x.MessageAddOnContextInfo
+	}
+	return nil
+}
+
 type PhotoChange struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -18150,7 +19419,7 @@ type PhotoChange struct {
 func (x *PhotoChange) Reset() {
 	*x = PhotoChange{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[161]
+		mi := &file_binary_proto_def_proto_msgTypes[171]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18163,7 +19432,7 @@ func (x *PhotoChange) String() string {
 func (*PhotoChange) ProtoMessage() {}
 
 func (x *PhotoChange) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[161]
+	mi := &file_binary_proto_def_proto_msgTypes[171]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18176,7 +19445,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{161}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{171}
 }
 
 func (x *PhotoChange) GetOldPhoto() []byte {
@@ -18223,7 +19492,7 @@ type PaymentInfo struct {
 func (x *PaymentInfo) Reset() {
 	*x = PaymentInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[162]
+		mi := &file_binary_proto_def_proto_msgTypes[172]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18236,7 +19505,7 @@ func (x *PaymentInfo) String() string {
 func (*PaymentInfo) ProtoMessage() {}
 
 func (x *PaymentInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[162]
+	mi := &file_binary_proto_def_proto_msgTypes[172]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18249,7 +19518,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{162}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{172}
 }
 
 func (x *PaymentInfo) GetCurrencyDeprecated() PaymentInfo_Currency {
@@ -18357,7 +19626,7 @@ type NotificationMessageInfo struct {
 func (x *NotificationMessageInfo) Reset() {
 	*x = NotificationMessageInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[163]
+		mi := &file_binary_proto_def_proto_msgTypes[173]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18370,7 +19639,7 @@ func (x *NotificationMessageInfo) String() string {
 func (*NotificationMessageInfo) ProtoMessage() {}
 
 func (x *NotificationMessageInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[163]
+	mi := &file_binary_proto_def_proto_msgTypes[173]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18383,7 +19652,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{163}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{173}
 }
 
 func (x *NotificationMessageInfo) GetKey() *MessageKey {
@@ -18414,6 +19683,53 @@ func (x *NotificationMessageInfo) GetParticipant() string {
 	return ""
 }
 
+type MessageAddOnContextInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	MessageAddOnDurationInSecs *uint32 `protobuf:"varint,1,opt,name=messageAddOnDurationInSecs" json:"messageAddOnDurationInSecs,omitempty"`
+}
+
+func (x *MessageAddOnContextInfo) Reset() {
+	*x = MessageAddOnContextInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[174]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MessageAddOnContextInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MessageAddOnContextInfo) ProtoMessage() {}
+
+func (x *MessageAddOnContextInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[174]
+	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 MessageAddOnContextInfo.ProtoReflect.Descriptor instead.
+func (*MessageAddOnContextInfo) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{174}
+}
+
+func (x *MessageAddOnContextInfo) GetMessageAddOnDurationInSecs() uint32 {
+	if x != nil && x.MessageAddOnDurationInSecs != nil {
+		return *x.MessageAddOnDurationInSecs
+	}
+	return 0
+}
+
 type MediaData struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -18425,7 +19741,7 @@ type MediaData struct {
 func (x *MediaData) Reset() {
 	*x = MediaData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[164]
+		mi := &file_binary_proto_def_proto_msgTypes[175]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18438,7 +19754,7 @@ func (x *MediaData) String() string {
 func (*MediaData) ProtoMessage() {}
 
 func (x *MediaData) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[164]
+	mi := &file_binary_proto_def_proto_msgTypes[175]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18451,7 +19767,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{164}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{175}
 }
 
 func (x *MediaData) GetLocalPath() string {
@@ -18477,7 +19793,7 @@ type KeepInChat struct {
 func (x *KeepInChat) Reset() {
 	*x = KeepInChat{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[165]
+		mi := &file_binary_proto_def_proto_msgTypes[176]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18490,7 +19806,7 @@ func (x *KeepInChat) String() string {
 func (*KeepInChat) ProtoMessage() {}
 
 func (x *KeepInChat) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[165]
+	mi := &file_binary_proto_def_proto_msgTypes[176]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18503,7 +19819,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{165}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{176}
 }
 
 func (x *KeepInChat) GetKeepType() KeepType {
@@ -18560,7 +19876,7 @@ type NoiseCertificate struct {
 func (x *NoiseCertificate) Reset() {
 	*x = NoiseCertificate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[166]
+		mi := &file_binary_proto_def_proto_msgTypes[177]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18573,7 +19889,7 @@ func (x *NoiseCertificate) String() string {
 func (*NoiseCertificate) ProtoMessage() {}
 
 func (x *NoiseCertificate) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[166]
+	mi := &file_binary_proto_def_proto_msgTypes[177]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18586,7 +19902,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{166}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{177}
 }
 
 func (x *NoiseCertificate) GetDetails() []byte {
@@ -18615,7 +19931,7 @@ type CertChain struct {
 func (x *CertChain) Reset() {
 	*x = CertChain{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[167]
+		mi := &file_binary_proto_def_proto_msgTypes[178]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18628,7 +19944,7 @@ func (x *CertChain) String() string {
 func (*CertChain) ProtoMessage() {}
 
 func (x *CertChain) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[167]
+	mi := &file_binary_proto_def_proto_msgTypes[178]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18641,7 +19957,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{167}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{178}
 }
 
 func (x *CertChain) GetLeaf() *CertChain_NoiseCertificate {
@@ -18663,15 +19979,17 @@ type DeviceProps_HistorySyncConfig struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	FullSyncDaysLimit   *uint32 `protobuf:"varint,1,opt,name=fullSyncDaysLimit" json:"fullSyncDaysLimit,omitempty"`
-	FullSyncSizeMbLimit *uint32 `protobuf:"varint,2,opt,name=fullSyncSizeMbLimit" json:"fullSyncSizeMbLimit,omitempty"`
-	StorageQuotaMb      *uint32 `protobuf:"varint,3,opt,name=storageQuotaMb" json:"storageQuotaMb,omitempty"`
+	FullSyncDaysLimit             *uint32 `protobuf:"varint,1,opt,name=fullSyncDaysLimit" json:"fullSyncDaysLimit,omitempty"`
+	FullSyncSizeMbLimit           *uint32 `protobuf:"varint,2,opt,name=fullSyncSizeMbLimit" json:"fullSyncSizeMbLimit,omitempty"`
+	StorageQuotaMb                *uint32 `protobuf:"varint,3,opt,name=storageQuotaMb" json:"storageQuotaMb,omitempty"`
+	InlineInitialPayloadInE2EeMsg *bool   `protobuf:"varint,4,opt,name=inlineInitialPayloadInE2EeMsg" json:"inlineInitialPayloadInE2EeMsg,omitempty"`
+	RecentSyncDaysLimit           *uint32 `protobuf:"varint,5,opt,name=recentSyncDaysLimit" json:"recentSyncDaysLimit,omitempty"`
 }
 
 func (x *DeviceProps_HistorySyncConfig) Reset() {
 	*x = DeviceProps_HistorySyncConfig{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[168]
+		mi := &file_binary_proto_def_proto_msgTypes[179]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18684,7 +20002,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[168]
+	mi := &file_binary_proto_def_proto_msgTypes[179]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18721,6 +20039,20 @@ func (x *DeviceProps_HistorySyncConfig) GetStorageQuotaMb() uint32 {
 	return 0
 }
 
+func (x *DeviceProps_HistorySyncConfig) GetInlineInitialPayloadInE2EeMsg() bool {
+	if x != nil && x.InlineInitialPayloadInE2EeMsg != nil {
+		return *x.InlineInitialPayloadInE2EeMsg
+	}
+	return false
+}
+
+func (x *DeviceProps_HistorySyncConfig) GetRecentSyncDaysLimit() uint32 {
+	if x != nil && x.RecentSyncDaysLimit != nil {
+		return *x.RecentSyncDaysLimit
+	}
+	return 0
+}
+
 type DeviceProps_AppVersion struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -18736,7 +20068,7 @@ type DeviceProps_AppVersion struct {
 func (x *DeviceProps_AppVersion) Reset() {
 	*x = DeviceProps_AppVersion{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[169]
+		mi := &file_binary_proto_def_proto_msgTypes[180]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18749,7 +20081,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[169]
+	mi := &file_binary_proto_def_proto_msgTypes[180]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18800,179 +20132,6 @@ func (x *DeviceProps_AppVersion) GetQuinary() uint32 {
 	return 0
 }
 
-type PeerDataOperationRequestMessage_RequestUrlPreview struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Url *string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
-}
-
-func (x *PeerDataOperationRequestMessage_RequestUrlPreview) Reset() {
-	*x = PeerDataOperationRequestMessage_RequestUrlPreview{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[170]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeerDataOperationRequestMessage_RequestUrlPreview) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeerDataOperationRequestMessage_RequestUrlPreview) ProtoMessage() {}
-
-func (x *PeerDataOperationRequestMessage_RequestUrlPreview) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[170]
-	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_RequestUrlPreview.ProtoReflect.Descriptor instead.
-func (*PeerDataOperationRequestMessage_RequestUrlPreview) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{6, 0}
-}
-
-func (x *PeerDataOperationRequestMessage_RequestUrlPreview) GetUrl() string {
-	if x != nil && x.Url != nil {
-		return *x.Url
-	}
-	return ""
-}
-
-type PeerDataOperationRequestMessage_RequestStickerReupload struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	FileSha256 *string `protobuf:"bytes,1,opt,name=fileSha256" json:"fileSha256,omitempty"`
-}
-
-func (x *PeerDataOperationRequestMessage_RequestStickerReupload) Reset() {
-	*x = PeerDataOperationRequestMessage_RequestStickerReupload{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[171]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeerDataOperationRequestMessage_RequestStickerReupload) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeerDataOperationRequestMessage_RequestStickerReupload) ProtoMessage() {}
-
-func (x *PeerDataOperationRequestMessage_RequestStickerReupload) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[171]
-	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_RequestStickerReupload.ProtoReflect.Descriptor instead.
-func (*PeerDataOperationRequestMessage_RequestStickerReupload) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{6, 1}
-}
-
-func (x *PeerDataOperationRequestMessage_RequestStickerReupload) GetFileSha256() string {
-	if x != nil && x.FileSha256 != nil {
-		return *x.FileSha256
-	}
-	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
@@ -18984,7 +20143,7 @@ type ListResponseMessage_SingleSelectReply struct {
 func (x *ListResponseMessage_SingleSelectReply) Reset() {
 	*x = ListResponseMessage_SingleSelectReply{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[173]
+		mi := &file_binary_proto_def_proto_msgTypes[181]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18997,7 +20156,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[173]
+	mi := &file_binary_proto_def_proto_msgTypes[181]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19010,7 +20169,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{11, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{7, 0}
 }
 
 func (x *ListResponseMessage_SingleSelectReply) GetSelectedRowId() string {
@@ -19032,7 +20191,7 @@ type ListMessage_Section struct {
 func (x *ListMessage_Section) Reset() {
 	*x = ListMessage_Section{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[174]
+		mi := &file_binary_proto_def_proto_msgTypes[182]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19045,7 +20204,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[174]
+	mi := &file_binary_proto_def_proto_msgTypes[182]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19058,7 +20217,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{12, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{8, 0}
 }
 
 func (x *ListMessage_Section) GetTitle() string {
@@ -19088,7 +20247,7 @@ type ListMessage_Row struct {
 func (x *ListMessage_Row) Reset() {
 	*x = ListMessage_Row{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[175]
+		mi := &file_binary_proto_def_proto_msgTypes[183]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19101,7 +20260,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[175]
+	mi := &file_binary_proto_def_proto_msgTypes[183]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19114,7 +20273,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{12, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{8, 1}
 }
 
 func (x *ListMessage_Row) GetTitle() string {
@@ -19149,7 +20308,7 @@ type ListMessage_Product struct {
 func (x *ListMessage_Product) Reset() {
 	*x = ListMessage_Product{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[176]
+		mi := &file_binary_proto_def_proto_msgTypes[184]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19162,7 +20321,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[176]
+	mi := &file_binary_proto_def_proto_msgTypes[184]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19175,7 +20334,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{12, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{8, 2}
 }
 
 func (x *ListMessage_Product) GetProductId() string {
@@ -19197,7 +20356,7 @@ type ListMessage_ProductSection struct {
 func (x *ListMessage_ProductSection) Reset() {
 	*x = ListMessage_ProductSection{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[177]
+		mi := &file_binary_proto_def_proto_msgTypes[185]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19210,7 +20369,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[177]
+	mi := &file_binary_proto_def_proto_msgTypes[185]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19223,7 +20382,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{12, 3}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{8, 3}
 }
 
 func (x *ListMessage_ProductSection) GetTitle() string {
@@ -19253,7 +20412,7 @@ type ListMessage_ProductListInfo struct {
 func (x *ListMessage_ProductListInfo) Reset() {
 	*x = ListMessage_ProductListInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[178]
+		mi := &file_binary_proto_def_proto_msgTypes[186]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19266,7 +20425,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[178]
+	mi := &file_binary_proto_def_proto_msgTypes[186]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19279,7 +20438,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{12, 4}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{8, 4}
 }
 
 func (x *ListMessage_ProductListInfo) GetProductSections() []*ListMessage_ProductSection {
@@ -19315,7 +20474,7 @@ type ListMessage_ProductListHeaderImage struct {
 func (x *ListMessage_ProductListHeaderImage) Reset() {
 	*x = ListMessage_ProductListHeaderImage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[179]
+		mi := &file_binary_proto_def_proto_msgTypes[187]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19328,7 +20487,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[179]
+	mi := &file_binary_proto_def_proto_msgTypes[187]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19341,7 +20500,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{12, 5}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{8, 5}
 }
 
 func (x *ListMessage_ProductListHeaderImage) GetProductId() string {
@@ -19371,7 +20530,7 @@ type InteractiveResponseMessage_NativeFlowResponseMessage struct {
 func (x *InteractiveResponseMessage_NativeFlowResponseMessage) Reset() {
 	*x = InteractiveResponseMessage_NativeFlowResponseMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[180]
+		mi := &file_binary_proto_def_proto_msgTypes[188]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19384,7 +20543,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[180]
+	mi := &file_binary_proto_def_proto_msgTypes[188]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19397,7 +20556,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{15, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{11, 0}
 }
 
 func (x *InteractiveResponseMessage_NativeFlowResponseMessage) GetName() string {
@@ -19426,13 +20585,14 @@ type InteractiveResponseMessage_Body struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Text *string `protobuf:"bytes,1,opt,name=text" json:"text,omitempty"`
+	Text   *string                                 `protobuf:"bytes,1,opt,name=text" json:"text,omitempty"`
+	Format *InteractiveResponseMessage_Body_Format `protobuf:"varint,2,opt,name=format,enum=proto.InteractiveResponseMessage_Body_Format" json:"format,omitempty"`
 }
 
 func (x *InteractiveResponseMessage_Body) Reset() {
 	*x = InteractiveResponseMessage_Body{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[181]
+		mi := &file_binary_proto_def_proto_msgTypes[189]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19445,7 +20605,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[181]
+	mi := &file_binary_proto_def_proto_msgTypes[189]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19458,7 +20618,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{15, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{11, 1}
 }
 
 func (x *InteractiveResponseMessage_Body) GetText() string {
@@ -19468,6 +20628,13 @@ func (x *InteractiveResponseMessage_Body) GetText() string {
 	return ""
 }
 
+func (x *InteractiveResponseMessage_Body) GetFormat() InteractiveResponseMessage_Body_Format {
+	if x != nil && x.Format != nil {
+		return *x.Format
+	}
+	return InteractiveResponseMessage_Body_DEFAULT
+}
+
 type InteractiveMessage_ShopMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -19481,7 +20648,7 @@ type InteractiveMessage_ShopMessage struct {
 func (x *InteractiveMessage_ShopMessage) Reset() {
 	*x = InteractiveMessage_ShopMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[182]
+		mi := &file_binary_proto_def_proto_msgTypes[190]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19494,7 +20661,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[182]
+	mi := &file_binary_proto_def_proto_msgTypes[190]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19507,7 +20674,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{16, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{12, 0}
 }
 
 func (x *InteractiveMessage_ShopMessage) GetId() string {
@@ -19544,7 +20711,7 @@ type InteractiveMessage_NativeFlowMessage struct {
 func (x *InteractiveMessage_NativeFlowMessage) Reset() {
 	*x = InteractiveMessage_NativeFlowMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[183]
+		mi := &file_binary_proto_def_proto_msgTypes[191]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19557,7 +20724,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[183]
+	mi := &file_binary_proto_def_proto_msgTypes[191]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19570,7 +20737,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{16, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{12, 1}
 }
 
 func (x *InteractiveMessage_NativeFlowMessage) GetButtons() []*InteractiveMessage_NativeFlowMessage_NativeFlowButton {
@@ -19608,13 +20775,14 @@ type InteractiveMessage_Header struct {
 	//	*InteractiveMessage_Header_ImageMessage
 	//	*InteractiveMessage_Header_JpegThumbnail
 	//	*InteractiveMessage_Header_VideoMessage
+	//	*InteractiveMessage_Header_LocationMessage
 	Media isInteractiveMessage_Header_Media `protobuf_oneof:"media"`
 }
 
 func (x *InteractiveMessage_Header) Reset() {
 	*x = InteractiveMessage_Header{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[184]
+		mi := &file_binary_proto_def_proto_msgTypes[192]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19627,7 +20795,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[184]
+	mi := &file_binary_proto_def_proto_msgTypes[192]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19640,7 +20808,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{16, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{12, 2}
 }
 
 func (x *InteractiveMessage_Header) GetTitle() string {
@@ -19699,6 +20867,13 @@ func (x *InteractiveMessage_Header) GetVideoMessage() *VideoMessage {
 	return nil
 }
 
+func (x *InteractiveMessage_Header) GetLocationMessage() *LocationMessage {
+	if x, ok := x.GetMedia().(*InteractiveMessage_Header_LocationMessage); ok {
+		return x.LocationMessage
+	}
+	return nil
+}
+
 type isInteractiveMessage_Header_Media interface {
 	isInteractiveMessage_Header_Media()
 }
@@ -19719,6 +20894,10 @@ type InteractiveMessage_Header_VideoMessage struct {
 	VideoMessage *VideoMessage `protobuf:"bytes,7,opt,name=videoMessage,oneof"`
 }
 
+type InteractiveMessage_Header_LocationMessage struct {
+	LocationMessage *LocationMessage `protobuf:"bytes,8,opt,name=locationMessage,oneof"`
+}
+
 func (*InteractiveMessage_Header_DocumentMessage) isInteractiveMessage_Header_Media() {}
 
 func (*InteractiveMessage_Header_ImageMessage) isInteractiveMessage_Header_Media() {}
@@ -19727,6 +20906,8 @@ func (*InteractiveMessage_Header_JpegThumbnail) isInteractiveMessage_Header_Medi
 
 func (*InteractiveMessage_Header_VideoMessage) isInteractiveMessage_Header_Media() {}
 
+func (*InteractiveMessage_Header_LocationMessage) isInteractiveMessage_Header_Media() {}
+
 type InteractiveMessage_Footer struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -19738,7 +20919,7 @@ type InteractiveMessage_Footer struct {
 func (x *InteractiveMessage_Footer) Reset() {
 	*x = InteractiveMessage_Footer{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[185]
+		mi := &file_binary_proto_def_proto_msgTypes[193]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19751,7 +20932,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[185]
+	mi := &file_binary_proto_def_proto_msgTypes[193]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19764,7 +20945,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{16, 3}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{12, 3}
 }
 
 func (x *InteractiveMessage_Footer) GetText() string {
@@ -19787,7 +20968,7 @@ type InteractiveMessage_CollectionMessage struct {
 func (x *InteractiveMessage_CollectionMessage) Reset() {
 	*x = InteractiveMessage_CollectionMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[186]
+		mi := &file_binary_proto_def_proto_msgTypes[194]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19800,7 +20981,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[186]
+	mi := &file_binary_proto_def_proto_msgTypes[194]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19813,7 +20994,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{16, 4}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{12, 4}
 }
 
 func (x *InteractiveMessage_CollectionMessage) GetBizJid() string {
@@ -19837,6 +21018,61 @@ func (x *InteractiveMessage_CollectionMessage) GetMessageVersion() int32 {
 	return 0
 }
 
+type InteractiveMessage_CarouselMessage struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Cards          []*InteractiveMessage `protobuf:"bytes,1,rep,name=cards" json:"cards,omitempty"`
+	MessageVersion *int32                `protobuf:"varint,2,opt,name=messageVersion" json:"messageVersion,omitempty"`
+}
+
+func (x *InteractiveMessage_CarouselMessage) Reset() {
+	*x = InteractiveMessage_CarouselMessage{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[195]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *InteractiveMessage_CarouselMessage) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*InteractiveMessage_CarouselMessage) ProtoMessage() {}
+
+func (x *InteractiveMessage_CarouselMessage) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[195]
+	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 InteractiveMessage_CarouselMessage.ProtoReflect.Descriptor instead.
+func (*InteractiveMessage_CarouselMessage) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{12, 5}
+}
+
+func (x *InteractiveMessage_CarouselMessage) GetCards() []*InteractiveMessage {
+	if x != nil {
+		return x.Cards
+	}
+	return nil
+}
+
+func (x *InteractiveMessage_CarouselMessage) GetMessageVersion() int32 {
+	if x != nil && x.MessageVersion != nil {
+		return *x.MessageVersion
+	}
+	return 0
+}
+
 type InteractiveMessage_Body struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -19848,7 +21084,7 @@ type InteractiveMessage_Body struct {
 func (x *InteractiveMessage_Body) Reset() {
 	*x = InteractiveMessage_Body{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[187]
+		mi := &file_binary_proto_def_proto_msgTypes[196]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19861,7 +21097,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[187]
+	mi := &file_binary_proto_def_proto_msgTypes[196]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19874,7 +21110,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{16, 5}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{12, 6}
 }
 
 func (x *InteractiveMessage_Body) GetText() string {
@@ -19896,7 +21132,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[188]
+		mi := &file_binary_proto_def_proto_msgTypes[197]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19909,7 +21145,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[188]
+	mi := &file_binary_proto_def_proto_msgTypes[197]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19922,7 +21158,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{16, 1, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{12, 1, 0}
 }
 
 func (x *InteractiveMessage_NativeFlowMessage_NativeFlowButton) GetName() string {
@@ -19955,7 +21191,7 @@ type HighlyStructuredMessage_HSMLocalizableParameter struct {
 func (x *HighlyStructuredMessage_HSMLocalizableParameter) Reset() {
 	*x = HighlyStructuredMessage_HSMLocalizableParameter{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[189]
+		mi := &file_binary_proto_def_proto_msgTypes[198]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19968,7 +21204,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[189]
+	mi := &file_binary_proto_def_proto_msgTypes[198]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19981,7 +21217,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{20, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{16, 0}
 }
 
 func (x *HighlyStructuredMessage_HSMLocalizableParameter) GetDefault() string {
@@ -20045,7 +21281,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[190]
+		mi := &file_binary_proto_def_proto_msgTypes[199]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20058,7 +21294,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[190]
+	mi := &file_binary_proto_def_proto_msgTypes[199]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20071,7 +21307,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{20, 0, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{16, 0, 0}
 }
 
 func (m *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime) GetDatetimeOneof() isHighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_DatetimeOneof {
@@ -20125,7 +21361,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[191]
+		mi := &file_binary_proto_def_proto_msgTypes[200]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20138,7 +21374,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[191]
+	mi := &file_binary_proto_def_proto_msgTypes[200]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20151,7 +21387,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{20, 0, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{16, 0, 1}
 }
 
 func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMCurrency) GetCurrencyCode() string {
@@ -20179,7 +21415,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[192]
+		mi := &file_binary_proto_def_proto_msgTypes[201]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20193,7 +21429,7 @@ func (*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeUn
 }
 
 func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeUnixEpoch) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[192]
+	mi := &file_binary_proto_def_proto_msgTypes[201]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20206,7 +21442,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{20, 0, 0, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{16, 0, 0, 0}
 }
 
 func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeUnixEpoch) GetTimestamp() int64 {
@@ -20233,7 +21469,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[193]
+		mi := &file_binary_proto_def_proto_msgTypes[202]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20247,7 +21483,7 @@ func (*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeCo
 }
 
 func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[193]
+	mi := &file_binary_proto_def_proto_msgTypes[202]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20260,7 +21496,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{20, 0, 0, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{16, 0, 0, 1}
 }
 
 func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent) GetDayOfWeek() HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_DayOfWeekType {
@@ -20326,7 +21562,7 @@ type ButtonsMessage_Button struct {
 func (x *ButtonsMessage_Button) Reset() {
 	*x = ButtonsMessage_Button{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[194]
+		mi := &file_binary_proto_def_proto_msgTypes[203]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20339,7 +21575,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[194]
+	mi := &file_binary_proto_def_proto_msgTypes[203]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20352,7 +21588,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{34, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{31, 0}
 }
 
 func (x *ButtonsMessage_Button) GetButtonId() string {
@@ -20395,7 +21631,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[195]
+		mi := &file_binary_proto_def_proto_msgTypes[204]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20408,7 +21644,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[195]
+	mi := &file_binary_proto_def_proto_msgTypes[204]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20421,7 +21657,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{34, 0, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{31, 0, 0}
 }
 
 func (x *ButtonsMessage_Button_NativeFlowInfo) GetName() string {
@@ -20449,7 +21685,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[196]
+		mi := &file_binary_proto_def_proto_msgTypes[205]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20462,7 +21698,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[196]
+	mi := &file_binary_proto_def_proto_msgTypes[205]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20475,7 +21711,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{34, 0, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{31, 0, 1}
 }
 
 func (x *ButtonsMessage_Button_ButtonText) GetDisplayText() string {
@@ -20497,7 +21733,7 @@ type HydratedTemplateButton_HydratedURLButton struct {
 func (x *HydratedTemplateButton_HydratedURLButton) Reset() {
 	*x = HydratedTemplateButton_HydratedURLButton{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[197]
+		mi := &file_binary_proto_def_proto_msgTypes[206]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20510,7 +21746,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[197]
+	mi := &file_binary_proto_def_proto_msgTypes[206]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20523,7 +21759,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{45, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{43, 0}
 }
 
 func (x *HydratedTemplateButton_HydratedURLButton) GetDisplayText() string {
@@ -20552,7 +21788,7 @@ type HydratedTemplateButton_HydratedQuickReplyButton struct {
 func (x *HydratedTemplateButton_HydratedQuickReplyButton) Reset() {
 	*x = HydratedTemplateButton_HydratedQuickReplyButton{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[198]
+		mi := &file_binary_proto_def_proto_msgTypes[207]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20565,7 +21801,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[198]
+	mi := &file_binary_proto_def_proto_msgTypes[207]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20578,7 +21814,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{45, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{43, 1}
 }
 
 func (x *HydratedTemplateButton_HydratedQuickReplyButton) GetDisplayText() string {
@@ -20607,7 +21843,7 @@ type HydratedTemplateButton_HydratedCallButton struct {
 func (x *HydratedTemplateButton_HydratedCallButton) Reset() {
 	*x = HydratedTemplateButton_HydratedCallButton{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[199]
+		mi := &file_binary_proto_def_proto_msgTypes[208]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20620,7 +21856,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[199]
+	mi := &file_binary_proto_def_proto_msgTypes[208]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20633,7 +21869,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{45, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{43, 2}
 }
 
 func (x *HydratedTemplateButton_HydratedCallButton) GetDisplayText() string {
@@ -20662,7 +21898,7 @@ type ContextInfo_UTMInfo struct {
 func (x *ContextInfo_UTMInfo) Reset() {
 	*x = ContextInfo_UTMInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[200]
+		mi := &file_binary_proto_def_proto_msgTypes[209]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20675,7 +21911,7 @@ func (x *ContextInfo_UTMInfo) String() string {
 func (*ContextInfo_UTMInfo) ProtoMessage() {}
 
 func (x *ContextInfo_UTMInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[200]
+	mi := &file_binary_proto_def_proto_msgTypes[209]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20688,7 +21924,7 @@ func (x *ContextInfo_UTMInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ContextInfo_UTMInfo.ProtoReflect.Descriptor instead.
 func (*ContextInfo_UTMInfo) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{49, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{47, 0}
 }
 
 func (x *ContextInfo_UTMInfo) GetUtmSource() string {
@@ -20705,6 +21941,69 @@ func (x *ContextInfo_UTMInfo) GetUtmCampaign() string {
 	return ""
 }
 
+type ContextInfo_ForwardedNewsletterMessageInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	NewsletterJid   *string `protobuf:"bytes,1,opt,name=newsletterJid" json:"newsletterJid,omitempty"`
+	ServerMessageId *int32  `protobuf:"varint,2,opt,name=serverMessageId" json:"serverMessageId,omitempty"`
+	NewsletterName  *string `protobuf:"bytes,3,opt,name=newsletterName" json:"newsletterName,omitempty"`
+}
+
+func (x *ContextInfo_ForwardedNewsletterMessageInfo) Reset() {
+	*x = ContextInfo_ForwardedNewsletterMessageInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[210]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ContextInfo_ForwardedNewsletterMessageInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ContextInfo_ForwardedNewsletterMessageInfo) ProtoMessage() {}
+
+func (x *ContextInfo_ForwardedNewsletterMessageInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[210]
+	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_ForwardedNewsletterMessageInfo.ProtoReflect.Descriptor instead.
+func (*ContextInfo_ForwardedNewsletterMessageInfo) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{47, 1}
+}
+
+func (x *ContextInfo_ForwardedNewsletterMessageInfo) GetNewsletterJid() string {
+	if x != nil && x.NewsletterJid != nil {
+		return *x.NewsletterJid
+	}
+	return ""
+}
+
+func (x *ContextInfo_ForwardedNewsletterMessageInfo) GetServerMessageId() int32 {
+	if x != nil && x.ServerMessageId != nil {
+		return *x.ServerMessageId
+	}
+	return 0
+}
+
+func (x *ContextInfo_ForwardedNewsletterMessageInfo) GetNewsletterName() string {
+	if x != nil && x.NewsletterName != nil {
+		return *x.NewsletterName
+	}
+	return ""
+}
+
 type ContextInfo_ExternalAdReplyInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -20723,12 +22022,13 @@ type ContextInfo_ExternalAdReplyInfo struct {
 	RenderLargerThumbnail *bool                                      `protobuf:"varint,11,opt,name=renderLargerThumbnail" json:"renderLargerThumbnail,omitempty"`
 	ShowAdAttribution     *bool                                      `protobuf:"varint,12,opt,name=showAdAttribution" json:"showAdAttribution,omitempty"`
 	CtwaClid              *string                                    `protobuf:"bytes,13,opt,name=ctwaClid" json:"ctwaClid,omitempty"`
+	Ref                   *string                                    `protobuf:"bytes,14,opt,name=ref" json:"ref,omitempty"`
 }
 
 func (x *ContextInfo_ExternalAdReplyInfo) Reset() {
 	*x = ContextInfo_ExternalAdReplyInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[201]
+		mi := &file_binary_proto_def_proto_msgTypes[211]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20741,7 +22041,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[201]
+	mi := &file_binary_proto_def_proto_msgTypes[211]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20754,7 +22054,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, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{47, 2}
 }
 
 func (x *ContextInfo_ExternalAdReplyInfo) GetTitle() string {
@@ -20848,6 +22148,60 @@ func (x *ContextInfo_ExternalAdReplyInfo) GetCtwaClid() string {
 	return ""
 }
 
+func (x *ContextInfo_ExternalAdReplyInfo) GetRef() string {
+	if x != nil && x.Ref != nil {
+		return *x.Ref
+	}
+	return ""
+}
+
+type ContextInfo_BusinessMessageForwardInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	BusinessOwnerJid *string `protobuf:"bytes,1,opt,name=businessOwnerJid" json:"businessOwnerJid,omitempty"`
+}
+
+func (x *ContextInfo_BusinessMessageForwardInfo) Reset() {
+	*x = ContextInfo_BusinessMessageForwardInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[212]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ContextInfo_BusinessMessageForwardInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ContextInfo_BusinessMessageForwardInfo) ProtoMessage() {}
+
+func (x *ContextInfo_BusinessMessageForwardInfo) 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 ContextInfo_BusinessMessageForwardInfo.ProtoReflect.Descriptor instead.
+func (*ContextInfo_BusinessMessageForwardInfo) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{47, 3}
+}
+
+func (x *ContextInfo_BusinessMessageForwardInfo) GetBusinessOwnerJid() string {
+	if x != nil && x.BusinessOwnerJid != nil {
+		return *x.BusinessOwnerJid
+	}
+	return ""
+}
+
 type ContextInfo_AdReplyInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -20862,7 +22216,7 @@ type ContextInfo_AdReplyInfo struct {
 func (x *ContextInfo_AdReplyInfo) Reset() {
 	*x = ContextInfo_AdReplyInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[202]
+		mi := &file_binary_proto_def_proto_msgTypes[213]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20875,7 +22229,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[202]
+	mi := &file_binary_proto_def_proto_msgTypes[213]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20888,7 +22242,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, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{47, 4}
 }
 
 func (x *ContextInfo_AdReplyInfo) GetAdvertiserName() string {
@@ -20931,7 +22285,7 @@ type TemplateButton_URLButton struct {
 func (x *TemplateButton_URLButton) Reset() {
 	*x = TemplateButton_URLButton{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[203]
+		mi := &file_binary_proto_def_proto_msgTypes[214]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20944,7 +22298,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[203]
+	mi := &file_binary_proto_def_proto_msgTypes[214]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20957,7 +22311,7 @@ func (x *TemplateButton_URLButton) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TemplateButton_URLButton.ProtoReflect.Descriptor instead.
 func (*TemplateButton_URLButton) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{51, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{52, 0}
 }
 
 func (x *TemplateButton_URLButton) GetDisplayText() *HighlyStructuredMessage {
@@ -20986,7 +22340,7 @@ type TemplateButton_QuickReplyButton struct {
 func (x *TemplateButton_QuickReplyButton) Reset() {
 	*x = TemplateButton_QuickReplyButton{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[204]
+		mi := &file_binary_proto_def_proto_msgTypes[215]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20999,7 +22353,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[204]
+	mi := &file_binary_proto_def_proto_msgTypes[215]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21012,7 +22366,7 @@ func (x *TemplateButton_QuickReplyButton) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TemplateButton_QuickReplyButton.ProtoReflect.Descriptor instead.
 func (*TemplateButton_QuickReplyButton) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{51, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{52, 1}
 }
 
 func (x *TemplateButton_QuickReplyButton) GetDisplayText() *HighlyStructuredMessage {
@@ -21041,7 +22395,7 @@ type TemplateButton_CallButton struct {
 func (x *TemplateButton_CallButton) Reset() {
 	*x = TemplateButton_CallButton{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[205]
+		mi := &file_binary_proto_def_proto_msgTypes[216]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21054,7 +22408,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[205]
+	mi := &file_binary_proto_def_proto_msgTypes[216]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21067,7 +22421,7 @@ func (x *TemplateButton_CallButton) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TemplateButton_CallButton.ProtoReflect.Descriptor instead.
 func (*TemplateButton_CallButton) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{51, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{52, 2}
 }
 
 func (x *TemplateButton_CallButton) GetDisplayText() *HighlyStructuredMessage {
@@ -21099,7 +22453,7 @@ type PaymentBackground_MediaData struct {
 func (x *PaymentBackground_MediaData) Reset() {
 	*x = PaymentBackground_MediaData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[206]
+		mi := &file_binary_proto_def_proto_msgTypes[217]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21112,7 +22466,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[206]
+	mi := &file_binary_proto_def_proto_msgTypes[217]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21125,7 +22479,7 @@ func (x *PaymentBackground_MediaData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PaymentBackground_MediaData.ProtoReflect.Descriptor instead.
 func (*PaymentBackground_MediaData) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{53, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{54, 0}
 }
 
 func (x *PaymentBackground_MediaData) GetMediaKey() []byte {
@@ -21185,7 +22539,7 @@ type TemplateMessage_HydratedFourRowTemplate struct {
 func (x *TemplateMessage_HydratedFourRowTemplate) Reset() {
 	*x = TemplateMessage_HydratedFourRowTemplate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[207]
+		mi := &file_binary_proto_def_proto_msgTypes[218]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21198,7 +22552,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[207]
+	mi := &file_binary_proto_def_proto_msgTypes[218]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21211,7 +22565,7 @@ func (x *TemplateMessage_HydratedFourRowTemplate) ProtoReflect() protoreflect.Me
 
 // Deprecated: Use TemplateMessage_HydratedFourRowTemplate.ProtoReflect.Descriptor instead.
 func (*TemplateMessage_HydratedFourRowTemplate) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{58, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{60, 0}
 }
 
 func (x *TemplateMessage_HydratedFourRowTemplate) GetHydratedContentText() string {
@@ -21344,7 +22698,7 @@ type TemplateMessage_FourRowTemplate struct {
 func (x *TemplateMessage_FourRowTemplate) Reset() {
 	*x = TemplateMessage_FourRowTemplate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[208]
+		mi := &file_binary_proto_def_proto_msgTypes[219]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21357,7 +22711,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[208]
+	mi := &file_binary_proto_def_proto_msgTypes[219]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21370,7 +22724,7 @@ func (x *TemplateMessage_FourRowTemplate) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TemplateMessage_FourRowTemplate.ProtoReflect.Descriptor instead.
 func (*TemplateMessage_FourRowTemplate) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{58, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{60, 1}
 }
 
 func (x *TemplateMessage_FourRowTemplate) GetContent() *HighlyStructuredMessage {
@@ -21492,7 +22846,7 @@ type ProductMessage_ProductSnapshot struct {
 func (x *ProductMessage_ProductSnapshot) Reset() {
 	*x = ProductMessage_ProductSnapshot{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[209]
+		mi := &file_binary_proto_def_proto_msgTypes[220]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21505,7 +22859,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[209]
+	mi := &file_binary_proto_def_proto_msgTypes[220]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21518,7 +22872,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{70, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{72, 0}
 }
 
 func (x *ProductMessage_ProductSnapshot) GetProductImage() *ImageMessage {
@@ -21611,7 +22965,7 @@ type ProductMessage_CatalogSnapshot struct {
 func (x *ProductMessage_CatalogSnapshot) Reset() {
 	*x = ProductMessage_CatalogSnapshot{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[210]
+		mi := &file_binary_proto_def_proto_msgTypes[221]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21624,7 +22978,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[210]
+	mi := &file_binary_proto_def_proto_msgTypes[221]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21637,7 +22991,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{70, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{72, 1}
 }
 
 func (x *ProductMessage_CatalogSnapshot) GetCatalogImage() *ImageMessage {
@@ -21672,7 +23026,7 @@ type PollCreationMessage_Option struct {
 func (x *PollCreationMessage_Option) Reset() {
 	*x = PollCreationMessage_Option{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[211]
+		mi := &file_binary_proto_def_proto_msgTypes[222]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21685,7 +23039,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[211]
+	mi := &file_binary_proto_def_proto_msgTypes[222]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21698,7 +23052,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{75, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{77, 0}
 }
 
 func (x *PollCreationMessage_Option) GetOptionName() string {
@@ -21713,15 +23067,16 @@ type PeerDataOperationRequestResponseMessage_PeerDataOperationResult struct {
 	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"`
+	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"`
+	PlaceholderMessageResendResponse *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_PlaceholderMessageResendResponse `protobuf:"bytes,4,opt,name=placeholderMessageResendResponse" json:"placeholderMessageResendResponse,omitempty"`
 }
 
 func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) Reset() {
 	*x = PeerDataOperationRequestResponseMessage_PeerDataOperationResult{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[212]
+		mi := &file_binary_proto_def_proto_msgTypes[223]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21734,7 +23089,7 @@ func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) String
 func (*PeerDataOperationRequestResponseMessage_PeerDataOperationResult) ProtoMessage() {}
 
 func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[212]
+	mi := &file_binary_proto_def_proto_msgTypes[223]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21747,7 +23102,7 @@ func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) ProtoR
 
 // Deprecated: Use PeerDataOperationRequestResponseMessage_PeerDataOperationResult.ProtoReflect.Descriptor instead.
 func (*PeerDataOperationRequestResponseMessage_PeerDataOperationResult) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{77, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{79, 0}
 }
 
 func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) GetMediaUploadResult() MediaRetryNotification_ResultType {
@@ -21771,24 +23126,80 @@ func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) GetLin
 	return nil
 }
 
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) GetPlaceholderMessageResendResponse() *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_PlaceholderMessageResendResponse {
+	if x != nil {
+		return x.PlaceholderMessageResendResponse
+	}
+	return nil
+}
+
+type PeerDataOperationRequestResponseMessage_PeerDataOperationResult_PlaceholderMessageResendResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	WebMessageInfoBytes []byte `protobuf:"bytes,1,opt,name=webMessageInfoBytes" json:"webMessageInfoBytes,omitempty"`
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_PlaceholderMessageResendResponse) Reset() {
+	*x = PeerDataOperationRequestResponseMessage_PeerDataOperationResult_PlaceholderMessageResendResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[224]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_PlaceholderMessageResendResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_PlaceholderMessageResendResponse) ProtoMessage() {
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_PlaceholderMessageResendResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[224]
+	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_PlaceholderMessageResendResponse.ProtoReflect.Descriptor instead.
+func (*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_PlaceholderMessageResendResponse) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{79, 0, 0}
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_PlaceholderMessageResendResponse) GetWebMessageInfoBytes() []byte {
+	if x != nil {
+		return x.WebMessageInfoBytes
+	}
+	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"`
+	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"`
+	HqThumbnail  *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail `protobuf:"bytes,8,opt,name=hqThumbnail" json:"hqThumbnail,omitempty"`
 }
 
 func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) Reset() {
 	*x = PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[213]
+		mi := &file_binary_proto_def_proto_msgTypes[225]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21802,7 +23213,7 @@ func (*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPrevi
 }
 
 func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[213]
+	mi := &file_binary_proto_def_proto_msgTypes[225]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21815,7 +23226,7 @@ func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPre
 
 // 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}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{79, 0, 1}
 }
 
 func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) GetUrl() string {
@@ -21867,31 +23278,45 @@ func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPre
 	return ""
 }
 
-type MsgOpaqueData_PollOption struct {
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) GetHqThumbnail() *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail {
+	if x != nil {
+		return x.HqThumbnail
+	}
+	return nil
+}
+
+type PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	DirectPath          *string `protobuf:"bytes,1,opt,name=directPath" json:"directPath,omitempty"`
+	ThumbHash           *string `protobuf:"bytes,2,opt,name=thumbHash" json:"thumbHash,omitempty"`
+	EncThumbHash        *string `protobuf:"bytes,3,opt,name=encThumbHash" json:"encThumbHash,omitempty"`
+	MediaKey            []byte  `protobuf:"bytes,4,opt,name=mediaKey" json:"mediaKey,omitempty"`
+	MediaKeyTimestampMs *int64  `protobuf:"varint,5,opt,name=mediaKeyTimestampMs" json:"mediaKeyTimestampMs,omitempty"`
+	ThumbWidth          *int32  `protobuf:"varint,6,opt,name=thumbWidth" json:"thumbWidth,omitempty"`
+	ThumbHeight         *int32  `protobuf:"varint,7,opt,name=thumbHeight" json:"thumbHeight,omitempty"`
 }
 
-func (x *MsgOpaqueData_PollOption) Reset() {
-	*x = MsgOpaqueData_PollOption{}
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail) Reset() {
+	*x = PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[214]
+		mi := &file_binary_proto_def_proto_msgTypes[226]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
 }
 
-func (x *MsgOpaqueData_PollOption) String() string {
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*MsgOpaqueData_PollOption) ProtoMessage() {}
+func (*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail) ProtoMessage() {
+}
 
-func (x *MsgOpaqueData_PollOption) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[214]
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[226]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21902,18 +23327,288 @@ func (x *MsgOpaqueData_PollOption) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use MsgOpaqueData_PollOption.ProtoReflect.Descriptor instead.
-func (*MsgOpaqueData_PollOption) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{92, 0}
+// Deprecated: Use PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail.ProtoReflect.Descriptor instead.
+func (*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{79, 0, 1, 0}
 }
 
-func (x *MsgOpaqueData_PollOption) GetName() string {
-	if x != nil && x.Name != nil {
-		return *x.Name
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail) GetDirectPath() string {
+	if x != nil && x.DirectPath != nil {
+		return *x.DirectPath
 	}
 	return ""
 }
 
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail) GetThumbHash() string {
+	if x != nil && x.ThumbHash != nil {
+		return *x.ThumbHash
+	}
+	return ""
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail) GetEncThumbHash() string {
+	if x != nil && x.EncThumbHash != nil {
+		return *x.EncThumbHash
+	}
+	return ""
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail) GetMediaKey() []byte {
+	if x != nil {
+		return x.MediaKey
+	}
+	return nil
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail) GetMediaKeyTimestampMs() int64 {
+	if x != nil && x.MediaKeyTimestampMs != nil {
+		return *x.MediaKeyTimestampMs
+	}
+	return 0
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail) GetThumbWidth() int32 {
+	if x != nil && x.ThumbWidth != nil {
+		return *x.ThumbWidth
+	}
+	return 0
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail) GetThumbHeight() int32 {
+	if x != nil && x.ThumbHeight != nil {
+		return *x.ThumbHeight
+	}
+	return 0
+}
+
+type PeerDataOperationRequestMessage_RequestUrlPreview struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Url                *string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
+	IncludeHqThumbnail *bool   `protobuf:"varint,2,opt,name=includeHqThumbnail" json:"includeHqThumbnail,omitempty"`
+}
+
+func (x *PeerDataOperationRequestMessage_RequestUrlPreview) Reset() {
+	*x = PeerDataOperationRequestMessage_RequestUrlPreview{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[227]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeerDataOperationRequestMessage_RequestUrlPreview) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeerDataOperationRequestMessage_RequestUrlPreview) ProtoMessage() {}
+
+func (x *PeerDataOperationRequestMessage_RequestUrlPreview) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[227]
+	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_RequestUrlPreview.ProtoReflect.Descriptor instead.
+func (*PeerDataOperationRequestMessage_RequestUrlPreview) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{80, 0}
+}
+
+func (x *PeerDataOperationRequestMessage_RequestUrlPreview) GetUrl() string {
+	if x != nil && x.Url != nil {
+		return *x.Url
+	}
+	return ""
+}
+
+func (x *PeerDataOperationRequestMessage_RequestUrlPreview) GetIncludeHqThumbnail() bool {
+	if x != nil && x.IncludeHqThumbnail != nil {
+		return *x.IncludeHqThumbnail
+	}
+	return false
+}
+
+type PeerDataOperationRequestMessage_RequestStickerReupload struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	FileSha256 *string `protobuf:"bytes,1,opt,name=fileSha256" json:"fileSha256,omitempty"`
+}
+
+func (x *PeerDataOperationRequestMessage_RequestStickerReupload) Reset() {
+	*x = PeerDataOperationRequestMessage_RequestStickerReupload{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[228]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeerDataOperationRequestMessage_RequestStickerReupload) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeerDataOperationRequestMessage_RequestStickerReupload) ProtoMessage() {}
+
+func (x *PeerDataOperationRequestMessage_RequestStickerReupload) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[228]
+	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_RequestStickerReupload.ProtoReflect.Descriptor instead.
+func (*PeerDataOperationRequestMessage_RequestStickerReupload) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{80, 1}
+}
+
+func (x *PeerDataOperationRequestMessage_RequestStickerReupload) GetFileSha256() string {
+	if x != nil && x.FileSha256 != nil {
+		return *x.FileSha256
+	}
+	return ""
+}
+
+type PeerDataOperationRequestMessage_PlaceholderMessageResendRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	MessageKey *MessageKey `protobuf:"bytes,1,opt,name=messageKey" json:"messageKey,omitempty"`
+}
+
+func (x *PeerDataOperationRequestMessage_PlaceholderMessageResendRequest) Reset() {
+	*x = PeerDataOperationRequestMessage_PlaceholderMessageResendRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[229]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeerDataOperationRequestMessage_PlaceholderMessageResendRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeerDataOperationRequestMessage_PlaceholderMessageResendRequest) ProtoMessage() {}
+
+func (x *PeerDataOperationRequestMessage_PlaceholderMessageResendRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[229]
+	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_PlaceholderMessageResendRequest.ProtoReflect.Descriptor instead.
+func (*PeerDataOperationRequestMessage_PlaceholderMessageResendRequest) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{80, 2}
+}
+
+func (x *PeerDataOperationRequestMessage_PlaceholderMessageResendRequest) GetMessageKey() *MessageKey {
+	if x != nil {
+		return x.MessageKey
+	}
+	return nil
+}
+
+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[230]
+		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[230]
+	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{80, 3}
+}
+
+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 VerifiedNameCertificate_Details struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -21929,7 +23624,7 @@ type VerifiedNameCertificate_Details struct {
 func (x *VerifiedNameCertificate_Details) Reset() {
 	*x = VerifiedNameCertificate_Details{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[215]
+		mi := &file_binary_proto_def_proto_msgTypes[231]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21942,7 +23637,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[215]
+	mi := &file_binary_proto_def_proto_msgTypes[231]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21955,7 +23650,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{143, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{152, 0}
 }
 
 func (x *VerifiedNameCertificate_Details) GetSerial() uint64 {
@@ -22007,7 +23702,7 @@ type ClientPayload_WebInfo struct {
 func (x *ClientPayload_WebInfo) Reset() {
 	*x = ClientPayload_WebInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[216]
+		mi := &file_binary_proto_def_proto_msgTypes[232]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -22020,7 +23715,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[216]
+	mi := &file_binary_proto_def_proto_msgTypes[232]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -22033,7 +23728,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{152, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{161, 0}
 }
 
 func (x *ClientPayload_WebInfo) GetRefToken() string {
@@ -22082,12 +23777,14 @@ type ClientPayload_UserAgent struct {
 	LocaleLanguageIso6391       *string                                 `protobuf:"bytes,11,opt,name=localeLanguageIso6391" json:"localeLanguageIso6391,omitempty"`
 	LocaleCountryIso31661Alpha2 *string                                 `protobuf:"bytes,12,opt,name=localeCountryIso31661Alpha2" json:"localeCountryIso31661Alpha2,omitempty"`
 	DeviceBoard                 *string                                 `protobuf:"bytes,13,opt,name=deviceBoard" json:"deviceBoard,omitempty"`
+	DeviceExpId                 *string                                 `protobuf:"bytes,14,opt,name=deviceExpId" json:"deviceExpId,omitempty"`
+	DeviceType                  *ClientPayload_UserAgent_DeviceType     `protobuf:"varint,15,opt,name=deviceType,enum=proto.ClientPayload_UserAgent_DeviceType" json:"deviceType,omitempty"`
 }
 
 func (x *ClientPayload_UserAgent) Reset() {
 	*x = ClientPayload_UserAgent{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[217]
+		mi := &file_binary_proto_def_proto_msgTypes[233]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -22100,7 +23797,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[217]
+	mi := &file_binary_proto_def_proto_msgTypes[233]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -22113,7 +23810,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{152, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{161, 1}
 }
 
 func (x *ClientPayload_UserAgent) GetPlatform() ClientPayload_UserAgent_Platform {
@@ -22207,6 +23904,83 @@ func (x *ClientPayload_UserAgent) GetDeviceBoard() string {
 	return ""
 }
 
+func (x *ClientPayload_UserAgent) GetDeviceExpId() string {
+	if x != nil && x.DeviceExpId != nil {
+		return *x.DeviceExpId
+	}
+	return ""
+}
+
+func (x *ClientPayload_UserAgent) GetDeviceType() ClientPayload_UserAgent_DeviceType {
+	if x != nil && x.DeviceType != nil {
+		return *x.DeviceType
+	}
+	return ClientPayload_UserAgent_PHONE
+}
+
+type ClientPayload_InteropData struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	AccountId    *uint64 `protobuf:"varint,1,opt,name=accountId" json:"accountId,omitempty"`
+	IntegratorId *uint32 `protobuf:"varint,2,opt,name=integratorId" json:"integratorId,omitempty"`
+	Token        []byte  `protobuf:"bytes,3,opt,name=token" json:"token,omitempty"`
+}
+
+func (x *ClientPayload_InteropData) Reset() {
+	*x = ClientPayload_InteropData{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[234]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ClientPayload_InteropData) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ClientPayload_InteropData) ProtoMessage() {}
+
+func (x *ClientPayload_InteropData) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[234]
+	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 ClientPayload_InteropData.ProtoReflect.Descriptor instead.
+func (*ClientPayload_InteropData) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{161, 2}
+}
+
+func (x *ClientPayload_InteropData) GetAccountId() uint64 {
+	if x != nil && x.AccountId != nil {
+		return *x.AccountId
+	}
+	return 0
+}
+
+func (x *ClientPayload_InteropData) GetIntegratorId() uint32 {
+	if x != nil && x.IntegratorId != nil {
+		return *x.IntegratorId
+	}
+	return 0
+}
+
+func (x *ClientPayload_InteropData) GetToken() []byte {
+	if x != nil {
+		return x.Token
+	}
+	return nil
+}
+
 type ClientPayload_DevicePairingRegistrationData struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -22225,7 +23999,7 @@ type ClientPayload_DevicePairingRegistrationData struct {
 func (x *ClientPayload_DevicePairingRegistrationData) Reset() {
 	*x = ClientPayload_DevicePairingRegistrationData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[218]
+		mi := &file_binary_proto_def_proto_msgTypes[235]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -22238,7 +24012,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[218]
+	mi := &file_binary_proto_def_proto_msgTypes[235]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -22251,7 +24025,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{152, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{161, 3}
 }
 
 func (x *ClientPayload_DevicePairingRegistrationData) GetERegid() []byte {
@@ -22322,7 +24096,7 @@ type ClientPayload_DNSSource struct {
 func (x *ClientPayload_DNSSource) Reset() {
 	*x = ClientPayload_DNSSource{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[219]
+		mi := &file_binary_proto_def_proto_msgTypes[236]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -22335,7 +24109,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[219]
+	mi := &file_binary_proto_def_proto_msgTypes[236]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -22348,7 +24122,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{152, 3}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{161, 4}
 }
 
 func (x *ClientPayload_DNSSource) GetDnsMethod() ClientPayload_DNSSource_DNSResolutionMethod {
@@ -22386,7 +24160,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[220]
+		mi := &file_binary_proto_def_proto_msgTypes[237]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -22399,7 +24173,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[220]
+	mi := &file_binary_proto_def_proto_msgTypes[237]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -22412,7 +24186,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{152, 0, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{161, 0, 0}
 }
 
 func (x *ClientPayload_WebInfo_WebdPayload) GetUsesParticipantInKey() bool {
@@ -22507,7 +24281,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[221]
+		mi := &file_binary_proto_def_proto_msgTypes[238]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -22520,7 +24294,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[221]
+	mi := &file_binary_proto_def_proto_msgTypes[238]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -22533,7 +24307,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{152, 1, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{161, 1, 0}
 }
 
 func (x *ClientPayload_UserAgent_AppVersion) GetPrimary() uint32 {
@@ -22586,7 +24360,7 @@ type NoiseCertificate_Details struct {
 func (x *NoiseCertificate_Details) Reset() {
 	*x = NoiseCertificate_Details{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[222]
+		mi := &file_binary_proto_def_proto_msgTypes[239]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -22599,7 +24373,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[222]
+	mi := &file_binary_proto_def_proto_msgTypes[239]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -22612,7 +24386,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{166, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{177, 0}
 }
 
 func (x *NoiseCertificate_Details) GetSerial() uint32 {
@@ -22662,7 +24436,7 @@ type CertChain_NoiseCertificate struct {
 func (x *CertChain_NoiseCertificate) Reset() {
 	*x = CertChain_NoiseCertificate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[223]
+		mi := &file_binary_proto_def_proto_msgTypes[240]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -22675,7 +24449,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[223]
+	mi := &file_binary_proto_def_proto_msgTypes[240]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -22688,7 +24462,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{167, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{178, 0}
 }
 
 func (x *CertChain_NoiseCertificate) GetDetails() []byte {
@@ -22720,7 +24494,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[224]
+		mi := &file_binary_proto_def_proto_msgTypes[241]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -22733,7 +24507,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[224]
+	mi := &file_binary_proto_def_proto_msgTypes[241]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -22746,7 +24520,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{167, 0, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{178, 0, 0}
 }
 
 func (x *CertChain_NoiseCertificate_Details) GetSerial() uint32 {
@@ -22801,713 +24575,770 @@ 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, 56)
-var file_binary_proto_def_proto_msgTypes = make([]protoimpl.MessageInfo, 225)
+var file_binary_proto_def_proto_enumTypes = make([]protoimpl.EnumInfo, 63)
+var file_binary_proto_def_proto_msgTypes = make([]protoimpl.MessageInfo, 242)
 var file_binary_proto_def_proto_goTypes = []interface{}{
-	(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
-	(OrderMessage_OrderSurface)(0),               // 5: proto.OrderMessage.OrderSurface
-	(OrderMessage_OrderStatus)(0),                // 6: proto.OrderMessage.OrderStatus
-	(ListResponseMessage_ListType)(0),            // 7: proto.ListResponseMessage.ListType
-	(ListMessage_ListType)(0),                    // 8: proto.ListMessage.ListType
-	(InvoiceMessage_AttachmentType)(0),           // 9: proto.InvoiceMessage.AttachmentType
-	(InteractiveMessage_ShopMessage_Surface)(0),  // 10: proto.InteractiveMessage.ShopMessage.Surface
-	(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
-	(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
+	(ADVEncryptionType)(0),                       // 0: proto.ADVEncryptionType
+	(KeepType)(0),                                // 1: proto.KeepType
+	(PeerDataOperationRequestType)(0),            // 2: proto.PeerDataOperationRequestType
+	(MediaVisibility)(0),                         // 3: proto.MediaVisibility
+	(DeviceProps_PlatformType)(0),                // 4: proto.DeviceProps.PlatformType
+	(ListResponseMessage_ListType)(0),            // 5: proto.ListResponseMessage.ListType
+	(ListMessage_ListType)(0),                    // 6: proto.ListMessage.ListType
+	(InvoiceMessage_AttachmentType)(0),           // 7: proto.InvoiceMessage.AttachmentType
+	(InteractiveResponseMessage_Body_Format)(0),  // 8: proto.InteractiveResponseMessage.Body.Format
+	(InteractiveMessage_ShopMessage_Surface)(0),  // 9: proto.InteractiveMessage.ShopMessage.Surface
+	(HistorySyncNotification_HistorySyncType)(0), // 10: proto.HistorySyncNotification.HistorySyncType
+	(HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_DayOfWeekType)(0), // 11: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent.DayOfWeekType
+	(HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_CalendarType)(0),  // 12: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent.CalendarType
+	(GroupInviteMessage_GroupType)(0),                             // 13: proto.GroupInviteMessage.GroupType
+	(ExtendedTextMessage_PreviewType)(0),                          // 14: proto.ExtendedTextMessage.PreviewType
+	(ExtendedTextMessage_InviteLinkGroupType)(0),                  // 15: proto.ExtendedTextMessage.InviteLinkGroupType
+	(ExtendedTextMessage_FontType)(0),                             // 16: proto.ExtendedTextMessage.FontType
+	(ButtonsResponseMessage_Type)(0),                              // 17: proto.ButtonsResponseMessage.Type
+	(ButtonsMessage_HeaderType)(0),                                // 18: proto.ButtonsMessage.HeaderType
+	(ButtonsMessage_Button_Type)(0),                               // 19: proto.ButtonsMessage.Button.Type
+	(BotFeedbackMessage_BotFeedbackKind)(0),                       // 20: proto.BotFeedbackMessage.BotFeedbackKind
+	(DisappearingMode_Trigger)(0),                                 // 21: proto.DisappearingMode.Trigger
+	(DisappearingMode_Initiator)(0),                               // 22: proto.DisappearingMode.Initiator
+	(ContextInfo_ExternalAdReplyInfo_MediaType)(0),                // 23: proto.ContextInfo.ExternalAdReplyInfo.MediaType
+	(ContextInfo_AdReplyInfo_MediaType)(0),                        // 24: proto.ContextInfo.AdReplyInfo.MediaType
+	(PaymentBackground_Type)(0),                                   // 25: proto.PaymentBackground.Type
+	(VideoMessage_Attribution)(0),                                 // 26: proto.VideoMessage.Attribution
+	(ScheduledCallEditMessage_EditType)(0),                        // 27: proto.ScheduledCallEditMessage.EditType
+	(ScheduledCallCreationMessage_CallType)(0),                    // 28: proto.ScheduledCallCreationMessage.CallType
+	(ProtocolMessage_Type)(0),                                     // 29: proto.ProtocolMessage.Type
+	(PinInChatMessage_Type)(0),                                    // 30: proto.PinInChatMessage.Type
+	(PaymentInviteMessage_ServiceType)(0),                         // 31: proto.PaymentInviteMessage.ServiceType
+	(OrderMessage_OrderSurface)(0),                                // 32: proto.OrderMessage.OrderSurface
+	(OrderMessage_OrderStatus)(0),                                 // 33: proto.OrderMessage.OrderStatus
+	(PastParticipant_LeaveReason)(0),                              // 34: proto.PastParticipant.LeaveReason
+	(HistorySync_HistorySyncType)(0),                              // 35: proto.HistorySync.HistorySyncType
+	(GroupParticipant_Rank)(0),                                    // 36: proto.GroupParticipant.Rank
+	(Conversation_EndOfHistoryTransferType)(0),                    // 37: proto.Conversation.EndOfHistoryTransferType
+	(MediaRetryNotification_ResultType)(0),                        // 38: proto.MediaRetryNotification.ResultType
+	(SyncdMutation_SyncdOperation)(0),                             // 39: proto.SyncdMutation.SyncdOperation
+	(MarketingMessageAction_MarketingMessagePrototypeType)(0),     // 40: proto.MarketingMessageAction.MarketingMessagePrototypeType
+	(BizIdentityInfo_VerifiedLevelValue)(0),                       // 41: proto.BizIdentityInfo.VerifiedLevelValue
+	(BizIdentityInfo_HostStorageType)(0),                          // 42: proto.BizIdentityInfo.HostStorageType
+	(BizIdentityInfo_ActualActorsType)(0),                         // 43: proto.BizIdentityInfo.ActualActorsType
+	(BizAccountLinkInfo_HostStorageType)(0),                       // 44: proto.BizAccountLinkInfo.HostStorageType
+	(BizAccountLinkInfo_AccountType)(0),                           // 45: proto.BizAccountLinkInfo.AccountType
+	(ClientPayload_Product)(0),                                    // 46: proto.ClientPayload.Product
+	(ClientPayload_IOSAppExtension)(0),                            // 47: proto.ClientPayload.IOSAppExtension
+	(ClientPayload_ConnectType)(0),                                // 48: proto.ClientPayload.ConnectType
+	(ClientPayload_ConnectReason)(0),                              // 49: proto.ClientPayload.ConnectReason
+	(ClientPayload_WebInfo_WebSubPlatform)(0),                     // 50: proto.ClientPayload.WebInfo.WebSubPlatform
+	(ClientPayload_UserAgent_ReleaseChannel)(0),                   // 51: proto.ClientPayload.UserAgent.ReleaseChannel
+	(ClientPayload_UserAgent_Platform)(0),                         // 52: proto.ClientPayload.UserAgent.Platform
+	(ClientPayload_UserAgent_DeviceType)(0),                       // 53: proto.ClientPayload.UserAgent.DeviceType
+	(ClientPayload_DNSSource_DNSResolutionMethod)(0),              // 54: proto.ClientPayload.DNSSource.DNSResolutionMethod
+	(WebMessageInfo_StubType)(0),                                  // 55: proto.WebMessageInfo.StubType
+	(WebMessageInfo_Status)(0),                                    // 56: proto.WebMessageInfo.Status
+	(WebMessageInfo_BizPrivacyStatus)(0),                          // 57: proto.WebMessageInfo.BizPrivacyStatus
+	(WebFeatures_Flag)(0),                                         // 58: proto.WebFeatures.Flag
+	(PinInChat_Type)(0),                                           // 59: proto.PinInChat.Type
+	(PaymentInfo_TxnStatus)(0),                                    // 60: proto.PaymentInfo.TxnStatus
+	(PaymentInfo_Status)(0),                                       // 61: proto.PaymentInfo.Status
+	(PaymentInfo_Currency)(0),                                     // 62: proto.PaymentInfo.Currency
+	(*ADVSignedKeyIndexList)(nil),                                 // 63: proto.ADVSignedKeyIndexList
+	(*ADVSignedDeviceIdentity)(nil),                               // 64: proto.ADVSignedDeviceIdentity
+	(*ADVSignedDeviceIdentityHMAC)(nil),                           // 65: proto.ADVSignedDeviceIdentityHMAC
+	(*ADVKeyIndexList)(nil),                                       // 66: proto.ADVKeyIndexList
+	(*ADVDeviceIdentity)(nil),                                     // 67: proto.ADVDeviceIdentity
+	(*DeviceProps)(nil),                                           // 68: proto.DeviceProps
+	(*LiveLocationMessage)(nil),                                   // 69: proto.LiveLocationMessage
+	(*ListResponseMessage)(nil),                                   // 70: proto.ListResponseMessage
+	(*ListMessage)(nil),                                           // 71: proto.ListMessage
+	(*KeepInChatMessage)(nil),                                     // 72: proto.KeepInChatMessage
+	(*InvoiceMessage)(nil),                                        // 73: proto.InvoiceMessage
+	(*InteractiveResponseMessage)(nil),                            // 74: proto.InteractiveResponseMessage
+	(*InteractiveMessage)(nil),                                    // 75: proto.InteractiveMessage
+	(*InitialSecurityNotificationSettingSync)(nil),                // 76: proto.InitialSecurityNotificationSettingSync
+	(*ImageMessage)(nil),                                          // 77: proto.ImageMessage
+	(*HistorySyncNotification)(nil),                               // 78: proto.HistorySyncNotification
+	(*HighlyStructuredMessage)(nil),                               // 79: proto.HighlyStructuredMessage
+	(*GroupInviteMessage)(nil),                                    // 80: proto.GroupInviteMessage
+	(*FutureProofMessage)(nil),                                    // 81: proto.FutureProofMessage
+	(*ExtendedTextMessage)(nil),                                   // 82: proto.ExtendedTextMessage
+	(*EncReactionMessage)(nil),                                    // 83: proto.EncReactionMessage
+	(*EncCommentMessage)(nil),                                     // 84: proto.EncCommentMessage
+	(*DocumentMessage)(nil),                                       // 85: proto.DocumentMessage
+	(*DeviceSentMessage)(nil),                                     // 86: proto.DeviceSentMessage
+	(*DeclinePaymentRequestMessage)(nil),                          // 87: proto.DeclinePaymentRequestMessage
+	(*ContactsArrayMessage)(nil),                                  // 88: proto.ContactsArrayMessage
+	(*ContactMessage)(nil),                                        // 89: proto.ContactMessage
+	(*Chat)(nil),                                                  // 90: proto.Chat
+	(*CancelPaymentRequestMessage)(nil),                           // 91: proto.CancelPaymentRequestMessage
+	(*Call)(nil),                                                  // 92: proto.Call
+	(*ButtonsResponseMessage)(nil),                                // 93: proto.ButtonsResponseMessage
+	(*ButtonsMessage)(nil),                                        // 94: proto.ButtonsMessage
+	(*BotFeedbackMessage)(nil),                                    // 95: proto.BotFeedbackMessage
+	(*AudioMessage)(nil),                                          // 96: proto.AudioMessage
+	(*AppStateSyncKey)(nil),                                       // 97: proto.AppStateSyncKey
+	(*AppStateSyncKeyShare)(nil),                                  // 98: proto.AppStateSyncKeyShare
+	(*AppStateSyncKeyRequest)(nil),                                // 99: proto.AppStateSyncKeyRequest
+	(*AppStateSyncKeyId)(nil),                                     // 100: proto.AppStateSyncKeyId
+	(*AppStateSyncKeyFingerprint)(nil),                            // 101: proto.AppStateSyncKeyFingerprint
+	(*AppStateSyncKeyData)(nil),                                   // 102: proto.AppStateSyncKeyData
+	(*AppStateFatalExceptionNotification)(nil),                    // 103: proto.AppStateFatalExceptionNotification
+	(*Location)(nil),                                              // 104: proto.Location
+	(*InteractiveAnnotation)(nil),                                 // 105: proto.InteractiveAnnotation
+	(*HydratedTemplateButton)(nil),                                // 106: proto.HydratedTemplateButton
+	(*GroupMention)(nil),                                          // 107: proto.GroupMention
+	(*DisappearingMode)(nil),                                      // 108: proto.DisappearingMode
+	(*DeviceListMetadata)(nil),                                    // 109: proto.DeviceListMetadata
+	(*ContextInfo)(nil),                                           // 110: proto.ContextInfo
+	(*BotPluginMetadata)(nil),                                     // 111: proto.BotPluginMetadata
+	(*BotMetadata)(nil),                                           // 112: proto.BotMetadata
+	(*BotAvatarMetadata)(nil),                                     // 113: proto.BotAvatarMetadata
+	(*ActionLink)(nil),                                            // 114: proto.ActionLink
+	(*TemplateButton)(nil),                                        // 115: proto.TemplateButton
+	(*Point)(nil),                                                 // 116: proto.Point
+	(*PaymentBackground)(nil),                                     // 117: proto.PaymentBackground
+	(*Money)(nil),                                                 // 118: proto.Money
+	(*Message)(nil),                                               // 119: proto.Message
+	(*MessageSecretMessage)(nil),                                  // 120: proto.MessageSecretMessage
+	(*MessageContextInfo)(nil),                                    // 121: proto.MessageContextInfo
+	(*VideoMessage)(nil),                                          // 122: proto.VideoMessage
+	(*TemplateMessage)(nil),                                       // 123: proto.TemplateMessage
+	(*TemplateButtonReplyMessage)(nil),                            // 124: proto.TemplateButtonReplyMessage
+	(*StickerSyncRMRMessage)(nil),                                 // 125: proto.StickerSyncRMRMessage
+	(*StickerMessage)(nil),                                        // 126: proto.StickerMessage
+	(*SenderKeyDistributionMessage)(nil),                          // 127: proto.SenderKeyDistributionMessage
+	(*SendPaymentMessage)(nil),                                    // 128: proto.SendPaymentMessage
+	(*ScheduledCallEditMessage)(nil),                              // 129: proto.ScheduledCallEditMessage
+	(*ScheduledCallCreationMessage)(nil),                          // 130: proto.ScheduledCallCreationMessage
+	(*RequestPhoneNumberMessage)(nil),                             // 131: proto.RequestPhoneNumberMessage
+	(*RequestPaymentMessage)(nil),                                 // 132: proto.RequestPaymentMessage
+	(*ReactionMessage)(nil),                                       // 133: proto.ReactionMessage
+	(*ProtocolMessage)(nil),                                       // 134: proto.ProtocolMessage
+	(*ProductMessage)(nil),                                        // 135: proto.ProductMessage
+	(*PollVoteMessage)(nil),                                       // 136: proto.PollVoteMessage
+	(*PollUpdateMessage)(nil),                                     // 137: proto.PollUpdateMessage
+	(*PollUpdateMessageMetadata)(nil),                             // 138: proto.PollUpdateMessageMetadata
+	(*PollEncValue)(nil),                                          // 139: proto.PollEncValue
+	(*PollCreationMessage)(nil),                                   // 140: proto.PollCreationMessage
+	(*PinInChatMessage)(nil),                                      // 141: proto.PinInChatMessage
+	(*PeerDataOperationRequestResponseMessage)(nil),               // 142: proto.PeerDataOperationRequestResponseMessage
+	(*PeerDataOperationRequestMessage)(nil),                       // 143: proto.PeerDataOperationRequestMessage
+	(*PaymentInviteMessage)(nil),                                  // 144: proto.PaymentInviteMessage
+	(*OrderMessage)(nil),                                          // 145: proto.OrderMessage
+	(*LocationMessage)(nil),                                       // 146: proto.LocationMessage
+	(*EphemeralSetting)(nil),                                      // 147: proto.EphemeralSetting
+	(*WallpaperSettings)(nil),                                     // 148: proto.WallpaperSettings
+	(*StickerMetadata)(nil),                                       // 149: proto.StickerMetadata
+	(*Pushname)(nil),                                              // 150: proto.Pushname
+	(*PastParticipants)(nil),                                      // 151: proto.PastParticipants
+	(*PastParticipant)(nil),                                       // 152: proto.PastParticipant
+	(*NotificationSettings)(nil),                                  // 153: proto.NotificationSettings
+	(*HistorySync)(nil),                                           // 154: proto.HistorySync
+	(*HistorySyncMsg)(nil),                                        // 155: proto.HistorySyncMsg
+	(*GroupParticipant)(nil),                                      // 156: proto.GroupParticipant
+	(*GlobalSettings)(nil),                                        // 157: proto.GlobalSettings
+	(*Conversation)(nil),                                          // 158: proto.Conversation
+	(*AvatarUserSettings)(nil),                                    // 159: proto.AvatarUserSettings
+	(*AutoDownloadSettings)(nil),                                  // 160: proto.AutoDownloadSettings
+	(*ServerErrorReceipt)(nil),                                    // 161: proto.ServerErrorReceipt
+	(*MediaRetryNotification)(nil),                                // 162: proto.MediaRetryNotification
+	(*MessageKey)(nil),                                            // 163: proto.MessageKey
+	(*SyncdVersion)(nil),                                          // 164: proto.SyncdVersion
+	(*SyncdValue)(nil),                                            // 165: proto.SyncdValue
+	(*SyncdSnapshot)(nil),                                         // 166: proto.SyncdSnapshot
+	(*SyncdRecord)(nil),                                           // 167: proto.SyncdRecord
+	(*SyncdPatch)(nil),                                            // 168: proto.SyncdPatch
+	(*SyncdMutations)(nil),                                        // 169: proto.SyncdMutations
+	(*SyncdMutation)(nil),                                         // 170: proto.SyncdMutation
+	(*SyncdIndex)(nil),                                            // 171: proto.SyncdIndex
+	(*KeyId)(nil),                                                 // 172: proto.KeyId
+	(*ExternalBlobReference)(nil),                                 // 173: proto.ExternalBlobReference
+	(*ExitCode)(nil),                                              // 174: proto.ExitCode
+	(*SyncActionValue)(nil),                                       // 175: proto.SyncActionValue
+	(*UserStatusMuteAction)(nil),                                  // 176: proto.UserStatusMuteAction
+	(*UnarchiveChatsSetting)(nil),                                 // 177: proto.UnarchiveChatsSetting
+	(*TimeFormatAction)(nil),                                      // 178: proto.TimeFormatAction
+	(*SyncActionMessage)(nil),                                     // 179: proto.SyncActionMessage
+	(*SyncActionMessageRange)(nil),                                // 180: proto.SyncActionMessageRange
+	(*SubscriptionAction)(nil),                                    // 181: proto.SubscriptionAction
+	(*StickerAction)(nil),                                         // 182: proto.StickerAction
+	(*StarAction)(nil),                                            // 183: proto.StarAction
+	(*SecurityNotificationSetting)(nil),                           // 184: proto.SecurityNotificationSetting
+	(*RemoveRecentStickerAction)(nil),                             // 185: proto.RemoveRecentStickerAction
+	(*RecentEmojiWeightsAction)(nil),                              // 186: proto.RecentEmojiWeightsAction
+	(*QuickReplyAction)(nil),                                      // 187: proto.QuickReplyAction
+	(*PushNameSetting)(nil),                                       // 188: proto.PushNameSetting
+	(*PrivacySettingRelayAllCalls)(nil),                           // 189: proto.PrivacySettingRelayAllCalls
+	(*PrimaryVersionAction)(nil),                                  // 190: proto.PrimaryVersionAction
+	(*PrimaryFeature)(nil),                                        // 191: proto.PrimaryFeature
+	(*PnForLidChatAction)(nil),                                    // 192: proto.PnForLidChatAction
+	(*PinAction)(nil),                                             // 193: proto.PinAction
+	(*NuxAction)(nil),                                             // 194: proto.NuxAction
+	(*MuteAction)(nil),                                            // 195: proto.MuteAction
+	(*MarketingMessageBroadcastAction)(nil),                       // 196: proto.MarketingMessageBroadcastAction
+	(*MarketingMessageAction)(nil),                                // 197: proto.MarketingMessageAction
+	(*MarkChatAsReadAction)(nil),                                  // 198: proto.MarkChatAsReadAction
+	(*LocaleSetting)(nil),                                         // 199: proto.LocaleSetting
+	(*LabelEditAction)(nil),                                       // 200: proto.LabelEditAction
+	(*LabelAssociationAction)(nil),                                // 201: proto.LabelAssociationAction
+	(*KeyExpiration)(nil),                                         // 202: proto.KeyExpiration
+	(*ExternalWebBetaAction)(nil),                                 // 203: proto.ExternalWebBetaAction
+	(*DeleteMessageForMeAction)(nil),                              // 204: proto.DeleteMessageForMeAction
+	(*DeleteChatAction)(nil),                                      // 205: proto.DeleteChatAction
+	(*ContactAction)(nil),                                         // 206: proto.ContactAction
+	(*ClearChatAction)(nil),                                       // 207: proto.ClearChatAction
+	(*ChatAssignmentOpenedStatusAction)(nil),                      // 208: proto.ChatAssignmentOpenedStatusAction
+	(*ChatAssignmentAction)(nil),                                  // 209: proto.ChatAssignmentAction
+	(*ArchiveChatAction)(nil),                                     // 210: proto.ArchiveChatAction
+	(*AndroidUnsupportedActions)(nil),                             // 211: proto.AndroidUnsupportedActions
+	(*AgentAction)(nil),                                           // 212: proto.AgentAction
+	(*SyncActionData)(nil),                                        // 213: proto.SyncActionData
+	(*RecentEmojiWeight)(nil),                                     // 214: proto.RecentEmojiWeight
+	(*VerifiedNameCertificate)(nil),                               // 215: proto.VerifiedNameCertificate
+	(*LocalizedName)(nil),                                         // 216: proto.LocalizedName
+	(*BizIdentityInfo)(nil),                                       // 217: proto.BizIdentityInfo
+	(*BizAccountPayload)(nil),                                     // 218: proto.BizAccountPayload
+	(*BizAccountLinkInfo)(nil),                                    // 219: proto.BizAccountLinkInfo
+	(*HandshakeMessage)(nil),                                      // 220: proto.HandshakeMessage
+	(*HandshakeServerHello)(nil),                                  // 221: proto.HandshakeServerHello
+	(*HandshakeClientHello)(nil),                                  // 222: proto.HandshakeClientHello
+	(*HandshakeClientFinish)(nil),                                 // 223: proto.HandshakeClientFinish
+	(*ClientPayload)(nil),                                         // 224: proto.ClientPayload
+	(*WebNotificationsInfo)(nil),                                  // 225: proto.WebNotificationsInfo
+	(*WebMessageInfo)(nil),                                        // 226: proto.WebMessageInfo
+	(*WebFeatures)(nil),                                           // 227: proto.WebFeatures
+	(*UserReceipt)(nil),                                           // 228: proto.UserReceipt
+	(*StatusPSA)(nil),                                             // 229: proto.StatusPSA
+	(*Reaction)(nil),                                              // 230: proto.Reaction
+	(*PollUpdate)(nil),                                            // 231: proto.PollUpdate
+	(*PollAdditionalMetadata)(nil),                                // 232: proto.PollAdditionalMetadata
+	(*PinInChat)(nil),                                             // 233: proto.PinInChat
+	(*PhotoChange)(nil),                                           // 234: proto.PhotoChange
+	(*PaymentInfo)(nil),                                           // 235: proto.PaymentInfo
+	(*NotificationMessageInfo)(nil),                               // 236: proto.NotificationMessageInfo
+	(*MessageAddOnContextInfo)(nil),                               // 237: proto.MessageAddOnContextInfo
+	(*MediaData)(nil),                                             // 238: proto.MediaData
+	(*KeepInChat)(nil),                                            // 239: proto.KeepInChat
+	(*NoiseCertificate)(nil),                                      // 240: proto.NoiseCertificate
+	(*CertChain)(nil),                                             // 241: proto.CertChain
+	(*DeviceProps_HistorySyncConfig)(nil),                         // 242: proto.DeviceProps.HistorySyncConfig
+	(*DeviceProps_AppVersion)(nil),                                // 243: proto.DeviceProps.AppVersion
+	(*ListResponseMessage_SingleSelectReply)(nil),                 // 244: proto.ListResponseMessage.SingleSelectReply
+	(*ListMessage_Section)(nil),                                   // 245: proto.ListMessage.Section
+	(*ListMessage_Row)(nil),                                       // 246: proto.ListMessage.Row
+	(*ListMessage_Product)(nil),                                   // 247: proto.ListMessage.Product
+	(*ListMessage_ProductSection)(nil),                            // 248: proto.ListMessage.ProductSection
+	(*ListMessage_ProductListInfo)(nil),                           // 249: proto.ListMessage.ProductListInfo
+	(*ListMessage_ProductListHeaderImage)(nil),                    // 250: proto.ListMessage.ProductListHeaderImage
+	(*InteractiveResponseMessage_NativeFlowResponseMessage)(nil),  // 251: proto.InteractiveResponseMessage.NativeFlowResponseMessage
+	(*InteractiveResponseMessage_Body)(nil),                       // 252: proto.InteractiveResponseMessage.Body
+	(*InteractiveMessage_ShopMessage)(nil),                        // 253: proto.InteractiveMessage.ShopMessage
+	(*InteractiveMessage_NativeFlowMessage)(nil),                  // 254: proto.InteractiveMessage.NativeFlowMessage
+	(*InteractiveMessage_Header)(nil),                             // 255: proto.InteractiveMessage.Header
+	(*InteractiveMessage_Footer)(nil),                             // 256: proto.InteractiveMessage.Footer
+	(*InteractiveMessage_CollectionMessage)(nil),                  // 257: proto.InteractiveMessage.CollectionMessage
+	(*InteractiveMessage_CarouselMessage)(nil),                    // 258: proto.InteractiveMessage.CarouselMessage
+	(*InteractiveMessage_Body)(nil),                               // 259: proto.InteractiveMessage.Body
+	(*InteractiveMessage_NativeFlowMessage_NativeFlowButton)(nil), // 260: proto.InteractiveMessage.NativeFlowMessage.NativeFlowButton
+	(*HighlyStructuredMessage_HSMLocalizableParameter)(nil),       // 261: proto.HighlyStructuredMessage.HSMLocalizableParameter
+	(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime)(nil),                      // 262: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime
+	(*HighlyStructuredMessage_HSMLocalizableParameter_HSMCurrency)(nil),                      // 263: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMCurrency
+	(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeUnixEpoch)(nil), // 264: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeUnixEpoch
+	(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent)(nil), // 265: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent
+	(*ButtonsMessage_Button)(nil),                                           // 266: proto.ButtonsMessage.Button
+	(*ButtonsMessage_Button_NativeFlowInfo)(nil),                            // 267: proto.ButtonsMessage.Button.NativeFlowInfo
+	(*ButtonsMessage_Button_ButtonText)(nil),                                // 268: proto.ButtonsMessage.Button.ButtonText
+	(*HydratedTemplateButton_HydratedURLButton)(nil),                        // 269: proto.HydratedTemplateButton.HydratedURLButton
+	(*HydratedTemplateButton_HydratedQuickReplyButton)(nil),                 // 270: proto.HydratedTemplateButton.HydratedQuickReplyButton
+	(*HydratedTemplateButton_HydratedCallButton)(nil),                       // 271: proto.HydratedTemplateButton.HydratedCallButton
+	(*ContextInfo_UTMInfo)(nil),                                             // 272: proto.ContextInfo.UTMInfo
+	(*ContextInfo_ForwardedNewsletterMessageInfo)(nil),                      // 273: proto.ContextInfo.ForwardedNewsletterMessageInfo
+	(*ContextInfo_ExternalAdReplyInfo)(nil),                                 // 274: proto.ContextInfo.ExternalAdReplyInfo
+	(*ContextInfo_BusinessMessageForwardInfo)(nil),                          // 275: proto.ContextInfo.BusinessMessageForwardInfo
+	(*ContextInfo_AdReplyInfo)(nil),                                         // 276: proto.ContextInfo.AdReplyInfo
+	(*TemplateButton_URLButton)(nil),                                        // 277: proto.TemplateButton.URLButton
+	(*TemplateButton_QuickReplyButton)(nil),                                 // 278: proto.TemplateButton.QuickReplyButton
+	(*TemplateButton_CallButton)(nil),                                       // 279: proto.TemplateButton.CallButton
+	(*PaymentBackground_MediaData)(nil),                                     // 280: proto.PaymentBackground.MediaData
+	(*TemplateMessage_HydratedFourRowTemplate)(nil),                         // 281: proto.TemplateMessage.HydratedFourRowTemplate
+	(*TemplateMessage_FourRowTemplate)(nil),                                 // 282: proto.TemplateMessage.FourRowTemplate
+	(*ProductMessage_ProductSnapshot)(nil),                                  // 283: proto.ProductMessage.ProductSnapshot
+	(*ProductMessage_CatalogSnapshot)(nil),                                  // 284: proto.ProductMessage.CatalogSnapshot
+	(*PollCreationMessage_Option)(nil),                                      // 285: proto.PollCreationMessage.Option
+	(*PeerDataOperationRequestResponseMessage_PeerDataOperationResult)(nil), // 286: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult
+	(*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_PlaceholderMessageResendResponse)(nil),                    // 287: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.PlaceholderMessageResendResponse
+	(*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse)(nil),                                 // 288: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.LinkPreviewResponse
+	(*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail)(nil), // 289: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.LinkPreviewResponse.LinkPreviewHighQualityThumbnail
+	(*PeerDataOperationRequestMessage_RequestUrlPreview)(nil),                                                                   // 290: proto.PeerDataOperationRequestMessage.RequestUrlPreview
+	(*PeerDataOperationRequestMessage_RequestStickerReupload)(nil),                                                              // 291: proto.PeerDataOperationRequestMessage.RequestStickerReupload
+	(*PeerDataOperationRequestMessage_PlaceholderMessageResendRequest)(nil),                                                     // 292: proto.PeerDataOperationRequestMessage.PlaceholderMessageResendRequest
+	(*PeerDataOperationRequestMessage_HistorySyncOnDemandRequest)(nil),                                                          // 293: proto.PeerDataOperationRequestMessage.HistorySyncOnDemandRequest
+	(*VerifiedNameCertificate_Details)(nil),                                                                                     // 294: proto.VerifiedNameCertificate.Details
+	(*ClientPayload_WebInfo)(nil),                                                                                               // 295: proto.ClientPayload.WebInfo
+	(*ClientPayload_UserAgent)(nil),                                                                                             // 296: proto.ClientPayload.UserAgent
+	(*ClientPayload_InteropData)(nil),                                                                                           // 297: proto.ClientPayload.InteropData
+	(*ClientPayload_DevicePairingRegistrationData)(nil),                                                                         // 298: proto.ClientPayload.DevicePairingRegistrationData
+	(*ClientPayload_DNSSource)(nil),                                                                                             // 299: proto.ClientPayload.DNSSource
+	(*ClientPayload_WebInfo_WebdPayload)(nil),                                                                                   // 300: proto.ClientPayload.WebInfo.WebdPayload
+	(*ClientPayload_UserAgent_AppVersion)(nil),                                                                                  // 301: proto.ClientPayload.UserAgent.AppVersion
+	(*NoiseCertificate_Details)(nil),                                                                                            // 302: proto.NoiseCertificate.Details
+	(*CertChain_NoiseCertificate)(nil),                                                                                          // 303: proto.CertChain.NoiseCertificate
+	(*CertChain_NoiseCertificate_Details)(nil),                                                                                  // 304: proto.CertChain.NoiseCertificate.Details
 }
 var file_binary_proto_def_proto_depIdxs = []int32{
-	225, // 0: proto.DeviceProps.version:type_name -> proto.DeviceProps.AppVersion
-	3,   // 1: proto.DeviceProps.platformType:type_name -> proto.DeviceProps.PlatformType
-	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
+	0,   // 0: proto.ADVSignedDeviceIdentityHMAC.accountType:type_name -> proto.ADVEncryptionType
+	0,   // 1: proto.ADVKeyIndexList.accountType:type_name -> proto.ADVEncryptionType
+	0,   // 2: proto.ADVDeviceIdentity.accountType:type_name -> proto.ADVEncryptionType
+	0,   // 3: proto.ADVDeviceIdentity.deviceType:type_name -> proto.ADVEncryptionType
+	243, // 4: proto.DeviceProps.version:type_name -> proto.DeviceProps.AppVersion
+	4,   // 5: proto.DeviceProps.platformType:type_name -> proto.DeviceProps.PlatformType
+	242, // 6: proto.DeviceProps.historySyncConfig:type_name -> proto.DeviceProps.HistorySyncConfig
+	110, // 7: proto.LiveLocationMessage.contextInfo:type_name -> proto.ContextInfo
+	5,   // 8: proto.ListResponseMessage.listType:type_name -> proto.ListResponseMessage.ListType
+	244, // 9: proto.ListResponseMessage.singleSelectReply:type_name -> proto.ListResponseMessage.SingleSelectReply
+	110, // 10: proto.ListResponseMessage.contextInfo:type_name -> proto.ContextInfo
+	6,   // 11: proto.ListMessage.listType:type_name -> proto.ListMessage.ListType
+	245, // 12: proto.ListMessage.sections:type_name -> proto.ListMessage.Section
+	249, // 13: proto.ListMessage.productListInfo:type_name -> proto.ListMessage.ProductListInfo
+	110, // 14: proto.ListMessage.contextInfo:type_name -> proto.ContextInfo
+	163, // 15: proto.KeepInChatMessage.key:type_name -> proto.MessageKey
+	1,   // 16: proto.KeepInChatMessage.keepType:type_name -> proto.KeepType
+	7,   // 17: proto.InvoiceMessage.attachmentType:type_name -> proto.InvoiceMessage.AttachmentType
+	252, // 18: proto.InteractiveResponseMessage.body:type_name -> proto.InteractiveResponseMessage.Body
+	110, // 19: proto.InteractiveResponseMessage.contextInfo:type_name -> proto.ContextInfo
+	251, // 20: proto.InteractiveResponseMessage.nativeFlowResponseMessage:type_name -> proto.InteractiveResponseMessage.NativeFlowResponseMessage
+	255, // 21: proto.InteractiveMessage.header:type_name -> proto.InteractiveMessage.Header
+	259, // 22: proto.InteractiveMessage.body:type_name -> proto.InteractiveMessage.Body
+	256, // 23: proto.InteractiveMessage.footer:type_name -> proto.InteractiveMessage.Footer
+	110, // 24: proto.InteractiveMessage.contextInfo:type_name -> proto.ContextInfo
+	253, // 25: proto.InteractiveMessage.shopStorefrontMessage:type_name -> proto.InteractiveMessage.ShopMessage
+	257, // 26: proto.InteractiveMessage.collectionMessage:type_name -> proto.InteractiveMessage.CollectionMessage
+	254, // 27: proto.InteractiveMessage.nativeFlowMessage:type_name -> proto.InteractiveMessage.NativeFlowMessage
+	258, // 28: proto.InteractiveMessage.carouselMessage:type_name -> proto.InteractiveMessage.CarouselMessage
+	105, // 29: proto.ImageMessage.interactiveAnnotations:type_name -> proto.InteractiveAnnotation
+	110, // 30: proto.ImageMessage.contextInfo:type_name -> proto.ContextInfo
+	10,  // 31: proto.HistorySyncNotification.syncType:type_name -> proto.HistorySyncNotification.HistorySyncType
+	261, // 32: proto.HighlyStructuredMessage.localizableParams:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter
+	123, // 33: proto.HighlyStructuredMessage.hydratedHsm:type_name -> proto.TemplateMessage
+	110, // 34: proto.GroupInviteMessage.contextInfo:type_name -> proto.ContextInfo
+	13,  // 35: proto.GroupInviteMessage.groupType:type_name -> proto.GroupInviteMessage.GroupType
+	119, // 36: proto.FutureProofMessage.message:type_name -> proto.Message
+	16,  // 37: proto.ExtendedTextMessage.font:type_name -> proto.ExtendedTextMessage.FontType
+	14,  // 38: proto.ExtendedTextMessage.previewType:type_name -> proto.ExtendedTextMessage.PreviewType
+	110, // 39: proto.ExtendedTextMessage.contextInfo:type_name -> proto.ContextInfo
+	15,  // 40: proto.ExtendedTextMessage.inviteLinkGroupType:type_name -> proto.ExtendedTextMessage.InviteLinkGroupType
+	15,  // 41: proto.ExtendedTextMessage.inviteLinkGroupTypeV2:type_name -> proto.ExtendedTextMessage.InviteLinkGroupType
+	163, // 42: proto.EncReactionMessage.targetMessageKey:type_name -> proto.MessageKey
+	163, // 43: proto.EncCommentMessage.targetMessageKey:type_name -> proto.MessageKey
+	110, // 44: proto.DocumentMessage.contextInfo:type_name -> proto.ContextInfo
+	119, // 45: proto.DeviceSentMessage.message:type_name -> proto.Message
+	163, // 46: proto.DeclinePaymentRequestMessage.key:type_name -> proto.MessageKey
+	89,  // 47: proto.ContactsArrayMessage.contacts:type_name -> proto.ContactMessage
+	110, // 48: proto.ContactsArrayMessage.contextInfo:type_name -> proto.ContextInfo
+	110, // 49: proto.ContactMessage.contextInfo:type_name -> proto.ContextInfo
+	163, // 50: proto.CancelPaymentRequestMessage.key:type_name -> proto.MessageKey
+	110, // 51: proto.ButtonsResponseMessage.contextInfo:type_name -> proto.ContextInfo
+	17,  // 52: proto.ButtonsResponseMessage.type:type_name -> proto.ButtonsResponseMessage.Type
+	110, // 53: proto.ButtonsMessage.contextInfo:type_name -> proto.ContextInfo
+	266, // 54: proto.ButtonsMessage.buttons:type_name -> proto.ButtonsMessage.Button
+	18,  // 55: proto.ButtonsMessage.headerType:type_name -> proto.ButtonsMessage.HeaderType
+	85,  // 56: proto.ButtonsMessage.documentMessage:type_name -> proto.DocumentMessage
+	77,  // 57: proto.ButtonsMessage.imageMessage:type_name -> proto.ImageMessage
+	122, // 58: proto.ButtonsMessage.videoMessage:type_name -> proto.VideoMessage
+	146, // 59: proto.ButtonsMessage.locationMessage:type_name -> proto.LocationMessage
+	163, // 60: proto.BotFeedbackMessage.messageKey:type_name -> proto.MessageKey
+	20,  // 61: proto.BotFeedbackMessage.kind:type_name -> proto.BotFeedbackMessage.BotFeedbackKind
+	110, // 62: proto.AudioMessage.contextInfo:type_name -> proto.ContextInfo
+	100, // 63: proto.AppStateSyncKey.keyId:type_name -> proto.AppStateSyncKeyId
+	102, // 64: proto.AppStateSyncKey.keyData:type_name -> proto.AppStateSyncKeyData
+	97,  // 65: proto.AppStateSyncKeyShare.keys:type_name -> proto.AppStateSyncKey
+	100, // 66: proto.AppStateSyncKeyRequest.keyIds:type_name -> proto.AppStateSyncKeyId
+	101, // 67: proto.AppStateSyncKeyData.fingerprint:type_name -> proto.AppStateSyncKeyFingerprint
+	116, // 68: proto.InteractiveAnnotation.polygonVertices:type_name -> proto.Point
+	104, // 69: proto.InteractiveAnnotation.location:type_name -> proto.Location
+	270, // 70: proto.HydratedTemplateButton.quickReplyButton:type_name -> proto.HydratedTemplateButton.HydratedQuickReplyButton
+	269, // 71: proto.HydratedTemplateButton.urlButton:type_name -> proto.HydratedTemplateButton.HydratedURLButton
+	271, // 72: proto.HydratedTemplateButton.callButton:type_name -> proto.HydratedTemplateButton.HydratedCallButton
+	22,  // 73: proto.DisappearingMode.initiator:type_name -> proto.DisappearingMode.Initiator
+	21,  // 74: proto.DisappearingMode.trigger:type_name -> proto.DisappearingMode.Trigger
+	119, // 75: proto.ContextInfo.quotedMessage:type_name -> proto.Message
+	276, // 76: proto.ContextInfo.quotedAd:type_name -> proto.ContextInfo.AdReplyInfo
+	163, // 77: proto.ContextInfo.placeholderKey:type_name -> proto.MessageKey
+	274, // 78: proto.ContextInfo.externalAdReply:type_name -> proto.ContextInfo.ExternalAdReplyInfo
+	108, // 79: proto.ContextInfo.disappearingMode:type_name -> proto.DisappearingMode
+	114, // 80: proto.ContextInfo.actionLink:type_name -> proto.ActionLink
+	107, // 81: proto.ContextInfo.groupMentions:type_name -> proto.GroupMention
+	272, // 82: proto.ContextInfo.utm:type_name -> proto.ContextInfo.UTMInfo
+	273, // 83: proto.ContextInfo.forwardedNewsletterMessageInfo:type_name -> proto.ContextInfo.ForwardedNewsletterMessageInfo
+	275, // 84: proto.ContextInfo.businessMessageForwardInfo:type_name -> proto.ContextInfo.BusinessMessageForwardInfo
+	113, // 85: proto.BotMetadata.avatarMetadata:type_name -> proto.BotAvatarMetadata
+	111, // 86: proto.BotMetadata.pluginMetadata:type_name -> proto.BotPluginMetadata
+	278, // 87: proto.TemplateButton.quickReplyButton:type_name -> proto.TemplateButton.QuickReplyButton
+	277, // 88: proto.TemplateButton.urlButton:type_name -> proto.TemplateButton.URLButton
+	279, // 89: proto.TemplateButton.callButton:type_name -> proto.TemplateButton.CallButton
+	280, // 90: proto.PaymentBackground.mediaData:type_name -> proto.PaymentBackground.MediaData
+	25,  // 91: proto.PaymentBackground.type:type_name -> proto.PaymentBackground.Type
+	127, // 92: proto.Message.senderKeyDistributionMessage:type_name -> proto.SenderKeyDistributionMessage
+	77,  // 93: proto.Message.imageMessage:type_name -> proto.ImageMessage
+	89,  // 94: proto.Message.contactMessage:type_name -> proto.ContactMessage
+	146, // 95: proto.Message.locationMessage:type_name -> proto.LocationMessage
+	82,  // 96: proto.Message.extendedTextMessage:type_name -> proto.ExtendedTextMessage
+	85,  // 97: proto.Message.documentMessage:type_name -> proto.DocumentMessage
+	96,  // 98: proto.Message.audioMessage:type_name -> proto.AudioMessage
+	122, // 99: proto.Message.videoMessage:type_name -> proto.VideoMessage
+	92,  // 100: proto.Message.call:type_name -> proto.Call
+	90,  // 101: proto.Message.chat:type_name -> proto.Chat
+	134, // 102: proto.Message.protocolMessage:type_name -> proto.ProtocolMessage
+	88,  // 103: proto.Message.contactsArrayMessage:type_name -> proto.ContactsArrayMessage
+	79,  // 104: proto.Message.highlyStructuredMessage:type_name -> proto.HighlyStructuredMessage
+	127, // 105: proto.Message.fastRatchetKeySenderKeyDistributionMessage:type_name -> proto.SenderKeyDistributionMessage
+	128, // 106: proto.Message.sendPaymentMessage:type_name -> proto.SendPaymentMessage
+	69,  // 107: proto.Message.liveLocationMessage:type_name -> proto.LiveLocationMessage
+	132, // 108: proto.Message.requestPaymentMessage:type_name -> proto.RequestPaymentMessage
+	87,  // 109: proto.Message.declinePaymentRequestMessage:type_name -> proto.DeclinePaymentRequestMessage
+	91,  // 110: proto.Message.cancelPaymentRequestMessage:type_name -> proto.CancelPaymentRequestMessage
+	123, // 111: proto.Message.templateMessage:type_name -> proto.TemplateMessage
+	126, // 112: proto.Message.stickerMessage:type_name -> proto.StickerMessage
+	80,  // 113: proto.Message.groupInviteMessage:type_name -> proto.GroupInviteMessage
+	124, // 114: proto.Message.templateButtonReplyMessage:type_name -> proto.TemplateButtonReplyMessage
+	135, // 115: proto.Message.productMessage:type_name -> proto.ProductMessage
+	86,  // 116: proto.Message.deviceSentMessage:type_name -> proto.DeviceSentMessage
+	121, // 117: proto.Message.messageContextInfo:type_name -> proto.MessageContextInfo
+	71,  // 118: proto.Message.listMessage:type_name -> proto.ListMessage
+	81,  // 119: proto.Message.viewOnceMessage:type_name -> proto.FutureProofMessage
+	145, // 120: proto.Message.orderMessage:type_name -> proto.OrderMessage
+	70,  // 121: proto.Message.listResponseMessage:type_name -> proto.ListResponseMessage
+	81,  // 122: proto.Message.ephemeralMessage:type_name -> proto.FutureProofMessage
+	73,  // 123: proto.Message.invoiceMessage:type_name -> proto.InvoiceMessage
+	94,  // 124: proto.Message.buttonsMessage:type_name -> proto.ButtonsMessage
+	93,  // 125: proto.Message.buttonsResponseMessage:type_name -> proto.ButtonsResponseMessage
+	144, // 126: proto.Message.paymentInviteMessage:type_name -> proto.PaymentInviteMessage
+	75,  // 127: proto.Message.interactiveMessage:type_name -> proto.InteractiveMessage
+	133, // 128: proto.Message.reactionMessage:type_name -> proto.ReactionMessage
+	125, // 129: proto.Message.stickerSyncRmrMessage:type_name -> proto.StickerSyncRMRMessage
+	74,  // 130: proto.Message.interactiveResponseMessage:type_name -> proto.InteractiveResponseMessage
+	140, // 131: proto.Message.pollCreationMessage:type_name -> proto.PollCreationMessage
+	137, // 132: proto.Message.pollUpdateMessage:type_name -> proto.PollUpdateMessage
+	72,  // 133: proto.Message.keepInChatMessage:type_name -> proto.KeepInChatMessage
+	81,  // 134: proto.Message.documentWithCaptionMessage:type_name -> proto.FutureProofMessage
+	131, // 135: proto.Message.requestPhoneNumberMessage:type_name -> proto.RequestPhoneNumberMessage
+	81,  // 136: proto.Message.viewOnceMessageV2:type_name -> proto.FutureProofMessage
+	83,  // 137: proto.Message.encReactionMessage:type_name -> proto.EncReactionMessage
+	81,  // 138: proto.Message.editedMessage:type_name -> proto.FutureProofMessage
+	81,  // 139: proto.Message.viewOnceMessageV2Extension:type_name -> proto.FutureProofMessage
+	140, // 140: proto.Message.pollCreationMessageV2:type_name -> proto.PollCreationMessage
+	130, // 141: proto.Message.scheduledCallCreationMessage:type_name -> proto.ScheduledCallCreationMessage
+	81,  // 142: proto.Message.groupMentionedMessage:type_name -> proto.FutureProofMessage
+	141, // 143: proto.Message.pinInChatMessage:type_name -> proto.PinInChatMessage
+	140, // 144: proto.Message.pollCreationMessageV3:type_name -> proto.PollCreationMessage
+	129, // 145: proto.Message.scheduledCallEditMessage:type_name -> proto.ScheduledCallEditMessage
+	122, // 146: proto.Message.ptvMessage:type_name -> proto.VideoMessage
+	81,  // 147: proto.Message.botInvokeMessage:type_name -> proto.FutureProofMessage
+	84,  // 148: proto.Message.encCommentMessage:type_name -> proto.EncCommentMessage
+	109, // 149: proto.MessageContextInfo.deviceListMetadata:type_name -> proto.DeviceListMetadata
+	112, // 150: proto.MessageContextInfo.botMetadata:type_name -> proto.BotMetadata
+	105, // 151: proto.VideoMessage.interactiveAnnotations:type_name -> proto.InteractiveAnnotation
+	110, // 152: proto.VideoMessage.contextInfo:type_name -> proto.ContextInfo
+	26,  // 153: proto.VideoMessage.gifAttribution:type_name -> proto.VideoMessage.Attribution
+	110, // 154: proto.TemplateMessage.contextInfo:type_name -> proto.ContextInfo
+	281, // 155: proto.TemplateMessage.hydratedTemplate:type_name -> proto.TemplateMessage.HydratedFourRowTemplate
+	282, // 156: proto.TemplateMessage.fourRowTemplate:type_name -> proto.TemplateMessage.FourRowTemplate
+	281, // 157: proto.TemplateMessage.hydratedFourRowTemplate:type_name -> proto.TemplateMessage.HydratedFourRowTemplate
+	75,  // 158: proto.TemplateMessage.interactiveMessageTemplate:type_name -> proto.InteractiveMessage
+	110, // 159: proto.TemplateButtonReplyMessage.contextInfo:type_name -> proto.ContextInfo
+	110, // 160: proto.StickerMessage.contextInfo:type_name -> proto.ContextInfo
+	119, // 161: proto.SendPaymentMessage.noteMessage:type_name -> proto.Message
+	163, // 162: proto.SendPaymentMessage.requestMessageKey:type_name -> proto.MessageKey
+	117, // 163: proto.SendPaymentMessage.background:type_name -> proto.PaymentBackground
+	163, // 164: proto.ScheduledCallEditMessage.key:type_name -> proto.MessageKey
+	27,  // 165: proto.ScheduledCallEditMessage.editType:type_name -> proto.ScheduledCallEditMessage.EditType
+	28,  // 166: proto.ScheduledCallCreationMessage.callType:type_name -> proto.ScheduledCallCreationMessage.CallType
+	110, // 167: proto.RequestPhoneNumberMessage.contextInfo:type_name -> proto.ContextInfo
+	119, // 168: proto.RequestPaymentMessage.noteMessage:type_name -> proto.Message
+	118, // 169: proto.RequestPaymentMessage.amount:type_name -> proto.Money
+	117, // 170: proto.RequestPaymentMessage.background:type_name -> proto.PaymentBackground
+	163, // 171: proto.ReactionMessage.key:type_name -> proto.MessageKey
+	163, // 172: proto.ProtocolMessage.key:type_name -> proto.MessageKey
+	29,  // 173: proto.ProtocolMessage.type:type_name -> proto.ProtocolMessage.Type
+	78,  // 174: proto.ProtocolMessage.historySyncNotification:type_name -> proto.HistorySyncNotification
+	98,  // 175: proto.ProtocolMessage.appStateSyncKeyShare:type_name -> proto.AppStateSyncKeyShare
+	99,  // 176: proto.ProtocolMessage.appStateSyncKeyRequest:type_name -> proto.AppStateSyncKeyRequest
+	76,  // 177: proto.ProtocolMessage.initialSecurityNotificationSettingSync:type_name -> proto.InitialSecurityNotificationSettingSync
+	103, // 178: proto.ProtocolMessage.appStateFatalExceptionNotification:type_name -> proto.AppStateFatalExceptionNotification
+	108, // 179: proto.ProtocolMessage.disappearingMode:type_name -> proto.DisappearingMode
+	119, // 180: proto.ProtocolMessage.editedMessage:type_name -> proto.Message
+	143, // 181: proto.ProtocolMessage.peerDataOperationRequestMessage:type_name -> proto.PeerDataOperationRequestMessage
+	142, // 182: proto.ProtocolMessage.peerDataOperationRequestResponseMessage:type_name -> proto.PeerDataOperationRequestResponseMessage
+	95,  // 183: proto.ProtocolMessage.botFeedbackMessage:type_name -> proto.BotFeedbackMessage
+	283, // 184: proto.ProductMessage.product:type_name -> proto.ProductMessage.ProductSnapshot
+	284, // 185: proto.ProductMessage.catalog:type_name -> proto.ProductMessage.CatalogSnapshot
+	110, // 186: proto.ProductMessage.contextInfo:type_name -> proto.ContextInfo
+	163, // 187: proto.PollUpdateMessage.pollCreationMessageKey:type_name -> proto.MessageKey
+	139, // 188: proto.PollUpdateMessage.vote:type_name -> proto.PollEncValue
+	138, // 189: proto.PollUpdateMessage.metadata:type_name -> proto.PollUpdateMessageMetadata
+	285, // 190: proto.PollCreationMessage.options:type_name -> proto.PollCreationMessage.Option
+	110, // 191: proto.PollCreationMessage.contextInfo:type_name -> proto.ContextInfo
+	163, // 192: proto.PinInChatMessage.key:type_name -> proto.MessageKey
+	30,  // 193: proto.PinInChatMessage.type:type_name -> proto.PinInChatMessage.Type
+	2,   // 194: proto.PeerDataOperationRequestResponseMessage.peerDataOperationRequestType:type_name -> proto.PeerDataOperationRequestType
+	286, // 195: proto.PeerDataOperationRequestResponseMessage.peerDataOperationResult:type_name -> proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult
+	2,   // 196: proto.PeerDataOperationRequestMessage.peerDataOperationRequestType:type_name -> proto.PeerDataOperationRequestType
+	291, // 197: proto.PeerDataOperationRequestMessage.requestStickerReupload:type_name -> proto.PeerDataOperationRequestMessage.RequestStickerReupload
+	290, // 198: proto.PeerDataOperationRequestMessage.requestUrlPreview:type_name -> proto.PeerDataOperationRequestMessage.RequestUrlPreview
+	293, // 199: proto.PeerDataOperationRequestMessage.historySyncOnDemandRequest:type_name -> proto.PeerDataOperationRequestMessage.HistorySyncOnDemandRequest
+	292, // 200: proto.PeerDataOperationRequestMessage.placeholderMessageResendRequest:type_name -> proto.PeerDataOperationRequestMessage.PlaceholderMessageResendRequest
+	31,  // 201: proto.PaymentInviteMessage.serviceType:type_name -> proto.PaymentInviteMessage.ServiceType
+	33,  // 202: proto.OrderMessage.status:type_name -> proto.OrderMessage.OrderStatus
+	32,  // 203: proto.OrderMessage.surface:type_name -> proto.OrderMessage.OrderSurface
+	110, // 204: proto.OrderMessage.contextInfo:type_name -> proto.ContextInfo
+	110, // 205: proto.LocationMessage.contextInfo:type_name -> proto.ContextInfo
+	152, // 206: proto.PastParticipants.pastParticipants:type_name -> proto.PastParticipant
+	34,  // 207: proto.PastParticipant.leaveReason:type_name -> proto.PastParticipant.LeaveReason
+	35,  // 208: proto.HistorySync.syncType:type_name -> proto.HistorySync.HistorySyncType
+	158, // 209: proto.HistorySync.conversations:type_name -> proto.Conversation
+	226, // 210: proto.HistorySync.statusV3Messages:type_name -> proto.WebMessageInfo
+	150, // 211: proto.HistorySync.pushnames:type_name -> proto.Pushname
+	157, // 212: proto.HistorySync.globalSettings:type_name -> proto.GlobalSettings
+	149, // 213: proto.HistorySync.recentStickers:type_name -> proto.StickerMetadata
+	151, // 214: proto.HistorySync.pastParticipants:type_name -> proto.PastParticipants
+	226, // 215: proto.HistorySyncMsg.message:type_name -> proto.WebMessageInfo
+	36,  // 216: proto.GroupParticipant.rank:type_name -> proto.GroupParticipant.Rank
+	148, // 217: proto.GlobalSettings.lightThemeWallpaper:type_name -> proto.WallpaperSettings
+	3,   // 218: proto.GlobalSettings.mediaVisibility:type_name -> proto.MediaVisibility
+	148, // 219: proto.GlobalSettings.darkThemeWallpaper:type_name -> proto.WallpaperSettings
+	160, // 220: proto.GlobalSettings.autoDownloadWiFi:type_name -> proto.AutoDownloadSettings
+	160, // 221: proto.GlobalSettings.autoDownloadCellular:type_name -> proto.AutoDownloadSettings
+	160, // 222: proto.GlobalSettings.autoDownloadRoaming:type_name -> proto.AutoDownloadSettings
+	159, // 223: proto.GlobalSettings.avatarUserSettings:type_name -> proto.AvatarUserSettings
+	153, // 224: proto.GlobalSettings.individualNotificationSettings:type_name -> proto.NotificationSettings
+	153, // 225: proto.GlobalSettings.groupNotificationSettings:type_name -> proto.NotificationSettings
+	155, // 226: proto.Conversation.messages:type_name -> proto.HistorySyncMsg
+	37,  // 227: proto.Conversation.endOfHistoryTransferType:type_name -> proto.Conversation.EndOfHistoryTransferType
+	108, // 228: proto.Conversation.disappearingMode:type_name -> proto.DisappearingMode
+	156, // 229: proto.Conversation.participant:type_name -> proto.GroupParticipant
+	148, // 230: proto.Conversation.wallpaper:type_name -> proto.WallpaperSettings
+	3,   // 231: proto.Conversation.mediaVisibility:type_name -> proto.MediaVisibility
+	38,  // 232: proto.MediaRetryNotification.result:type_name -> proto.MediaRetryNotification.ResultType
+	164, // 233: proto.SyncdSnapshot.version:type_name -> proto.SyncdVersion
+	167, // 234: proto.SyncdSnapshot.records:type_name -> proto.SyncdRecord
+	172, // 235: proto.SyncdSnapshot.keyId:type_name -> proto.KeyId
+	171, // 236: proto.SyncdRecord.index:type_name -> proto.SyncdIndex
+	165, // 237: proto.SyncdRecord.value:type_name -> proto.SyncdValue
+	172, // 238: proto.SyncdRecord.keyId:type_name -> proto.KeyId
+	164, // 239: proto.SyncdPatch.version:type_name -> proto.SyncdVersion
+	170, // 240: proto.SyncdPatch.mutations:type_name -> proto.SyncdMutation
+	173, // 241: proto.SyncdPatch.externalMutations:type_name -> proto.ExternalBlobReference
+	172, // 242: proto.SyncdPatch.keyId:type_name -> proto.KeyId
+	174, // 243: proto.SyncdPatch.exitCode:type_name -> proto.ExitCode
+	170, // 244: proto.SyncdMutations.mutations:type_name -> proto.SyncdMutation
+	39,  // 245: proto.SyncdMutation.operation:type_name -> proto.SyncdMutation.SyncdOperation
+	167, // 246: proto.SyncdMutation.record:type_name -> proto.SyncdRecord
+	183, // 247: proto.SyncActionValue.starAction:type_name -> proto.StarAction
+	206, // 248: proto.SyncActionValue.contactAction:type_name -> proto.ContactAction
+	195, // 249: proto.SyncActionValue.muteAction:type_name -> proto.MuteAction
+	193, // 250: proto.SyncActionValue.pinAction:type_name -> proto.PinAction
+	184, // 251: proto.SyncActionValue.securityNotificationSetting:type_name -> proto.SecurityNotificationSetting
+	188, // 252: proto.SyncActionValue.pushNameSetting:type_name -> proto.PushNameSetting
+	187, // 253: proto.SyncActionValue.quickReplyAction:type_name -> proto.QuickReplyAction
+	186, // 254: proto.SyncActionValue.recentEmojiWeightsAction:type_name -> proto.RecentEmojiWeightsAction
+	200, // 255: proto.SyncActionValue.labelEditAction:type_name -> proto.LabelEditAction
+	201, // 256: proto.SyncActionValue.labelAssociationAction:type_name -> proto.LabelAssociationAction
+	199, // 257: proto.SyncActionValue.localeSetting:type_name -> proto.LocaleSetting
+	210, // 258: proto.SyncActionValue.archiveChatAction:type_name -> proto.ArchiveChatAction
+	204, // 259: proto.SyncActionValue.deleteMessageForMeAction:type_name -> proto.DeleteMessageForMeAction
+	202, // 260: proto.SyncActionValue.keyExpiration:type_name -> proto.KeyExpiration
+	198, // 261: proto.SyncActionValue.markChatAsReadAction:type_name -> proto.MarkChatAsReadAction
+	207, // 262: proto.SyncActionValue.clearChatAction:type_name -> proto.ClearChatAction
+	205, // 263: proto.SyncActionValue.deleteChatAction:type_name -> proto.DeleteChatAction
+	177, // 264: proto.SyncActionValue.unarchiveChatsSetting:type_name -> proto.UnarchiveChatsSetting
+	191, // 265: proto.SyncActionValue.primaryFeature:type_name -> proto.PrimaryFeature
+	211, // 266: proto.SyncActionValue.androidUnsupportedActions:type_name -> proto.AndroidUnsupportedActions
+	212, // 267: proto.SyncActionValue.agentAction:type_name -> proto.AgentAction
+	181, // 268: proto.SyncActionValue.subscriptionAction:type_name -> proto.SubscriptionAction
+	176, // 269: proto.SyncActionValue.userStatusMuteAction:type_name -> proto.UserStatusMuteAction
+	178, // 270: proto.SyncActionValue.timeFormatAction:type_name -> proto.TimeFormatAction
+	194, // 271: proto.SyncActionValue.nuxAction:type_name -> proto.NuxAction
+	190, // 272: proto.SyncActionValue.primaryVersionAction:type_name -> proto.PrimaryVersionAction
+	182, // 273: proto.SyncActionValue.stickerAction:type_name -> proto.StickerAction
+	185, // 274: proto.SyncActionValue.removeRecentStickerAction:type_name -> proto.RemoveRecentStickerAction
+	209, // 275: proto.SyncActionValue.chatAssignment:type_name -> proto.ChatAssignmentAction
+	208, // 276: proto.SyncActionValue.chatAssignmentOpenedStatus:type_name -> proto.ChatAssignmentOpenedStatusAction
+	192, // 277: proto.SyncActionValue.pnForLidChatAction:type_name -> proto.PnForLidChatAction
+	197, // 278: proto.SyncActionValue.marketingMessageAction:type_name -> proto.MarketingMessageAction
+	196, // 279: proto.SyncActionValue.marketingMessageBroadcastAction:type_name -> proto.MarketingMessageBroadcastAction
+	203, // 280: proto.SyncActionValue.externalWebBetaAction:type_name -> proto.ExternalWebBetaAction
+	189, // 281: proto.SyncActionValue.privacySettingRelayAllCalls:type_name -> proto.PrivacySettingRelayAllCalls
+	163, // 282: proto.SyncActionMessage.key:type_name -> proto.MessageKey
+	179, // 283: proto.SyncActionMessageRange.messages:type_name -> proto.SyncActionMessage
+	214, // 284: proto.RecentEmojiWeightsAction.weights:type_name -> proto.RecentEmojiWeight
+	40,  // 285: proto.MarketingMessageAction.type:type_name -> proto.MarketingMessageAction.MarketingMessagePrototypeType
+	180, // 286: proto.MarkChatAsReadAction.messageRange:type_name -> proto.SyncActionMessageRange
+	180, // 287: proto.DeleteChatAction.messageRange:type_name -> proto.SyncActionMessageRange
+	180, // 288: proto.ClearChatAction.messageRange:type_name -> proto.SyncActionMessageRange
+	180, // 289: proto.ArchiveChatAction.messageRange:type_name -> proto.SyncActionMessageRange
+	175, // 290: proto.SyncActionData.value:type_name -> proto.SyncActionValue
+	41,  // 291: proto.BizIdentityInfo.vlevel:type_name -> proto.BizIdentityInfo.VerifiedLevelValue
+	215, // 292: proto.BizIdentityInfo.vnameCert:type_name -> proto.VerifiedNameCertificate
+	42,  // 293: proto.BizIdentityInfo.hostStorage:type_name -> proto.BizIdentityInfo.HostStorageType
+	43,  // 294: proto.BizIdentityInfo.actualActors:type_name -> proto.BizIdentityInfo.ActualActorsType
+	215, // 295: proto.BizAccountPayload.vnameCert:type_name -> proto.VerifiedNameCertificate
+	44,  // 296: proto.BizAccountLinkInfo.hostStorage:type_name -> proto.BizAccountLinkInfo.HostStorageType
+	45,  // 297: proto.BizAccountLinkInfo.accountType:type_name -> proto.BizAccountLinkInfo.AccountType
+	222, // 298: proto.HandshakeMessage.clientHello:type_name -> proto.HandshakeClientHello
+	221, // 299: proto.HandshakeMessage.serverHello:type_name -> proto.HandshakeServerHello
+	223, // 300: proto.HandshakeMessage.clientFinish:type_name -> proto.HandshakeClientFinish
+	296, // 301: proto.ClientPayload.userAgent:type_name -> proto.ClientPayload.UserAgent
+	295, // 302: proto.ClientPayload.webInfo:type_name -> proto.ClientPayload.WebInfo
+	48,  // 303: proto.ClientPayload.connectType:type_name -> proto.ClientPayload.ConnectType
+	49,  // 304: proto.ClientPayload.connectReason:type_name -> proto.ClientPayload.ConnectReason
+	299, // 305: proto.ClientPayload.dnsSource:type_name -> proto.ClientPayload.DNSSource
+	298, // 306: proto.ClientPayload.devicePairingData:type_name -> proto.ClientPayload.DevicePairingRegistrationData
+	46,  // 307: proto.ClientPayload.product:type_name -> proto.ClientPayload.Product
+	47,  // 308: proto.ClientPayload.iosAppExtension:type_name -> proto.ClientPayload.IOSAppExtension
+	297, // 309: proto.ClientPayload.interopData:type_name -> proto.ClientPayload.InteropData
+	226, // 310: proto.WebNotificationsInfo.notifyMessages:type_name -> proto.WebMessageInfo
+	163, // 311: proto.WebMessageInfo.key:type_name -> proto.MessageKey
+	119, // 312: proto.WebMessageInfo.message:type_name -> proto.Message
+	56,  // 313: proto.WebMessageInfo.status:type_name -> proto.WebMessageInfo.Status
+	55,  // 314: proto.WebMessageInfo.messageStubType:type_name -> proto.WebMessageInfo.StubType
+	235, // 315: proto.WebMessageInfo.paymentInfo:type_name -> proto.PaymentInfo
+	69,  // 316: proto.WebMessageInfo.finalLiveLocation:type_name -> proto.LiveLocationMessage
+	235, // 317: proto.WebMessageInfo.quotedPaymentInfo:type_name -> proto.PaymentInfo
+	57,  // 318: proto.WebMessageInfo.bizPrivacyStatus:type_name -> proto.WebMessageInfo.BizPrivacyStatus
+	238, // 319: proto.WebMessageInfo.mediaData:type_name -> proto.MediaData
+	234, // 320: proto.WebMessageInfo.photoChange:type_name -> proto.PhotoChange
+	228, // 321: proto.WebMessageInfo.userReceipt:type_name -> proto.UserReceipt
+	230, // 322: proto.WebMessageInfo.reactions:type_name -> proto.Reaction
+	238, // 323: proto.WebMessageInfo.quotedStickerData:type_name -> proto.MediaData
+	229, // 324: proto.WebMessageInfo.statusPsa:type_name -> proto.StatusPSA
+	231, // 325: proto.WebMessageInfo.pollUpdates:type_name -> proto.PollUpdate
+	232, // 326: proto.WebMessageInfo.pollAdditionalMetadata:type_name -> proto.PollAdditionalMetadata
+	239, // 327: proto.WebMessageInfo.keepInChat:type_name -> proto.KeepInChat
+	233, // 328: proto.WebMessageInfo.pinInChat:type_name -> proto.PinInChat
+	58,  // 329: proto.WebFeatures.labelsDisplay:type_name -> proto.WebFeatures.Flag
+	58,  // 330: proto.WebFeatures.voipIndividualOutgoing:type_name -> proto.WebFeatures.Flag
+	58,  // 331: proto.WebFeatures.groupsV3:type_name -> proto.WebFeatures.Flag
+	58,  // 332: proto.WebFeatures.groupsV3Create:type_name -> proto.WebFeatures.Flag
+	58,  // 333: proto.WebFeatures.changeNumberV2:type_name -> proto.WebFeatures.Flag
+	58,  // 334: proto.WebFeatures.queryStatusV3Thumbnail:type_name -> proto.WebFeatures.Flag
+	58,  // 335: proto.WebFeatures.liveLocations:type_name -> proto.WebFeatures.Flag
+	58,  // 336: proto.WebFeatures.queryVname:type_name -> proto.WebFeatures.Flag
+	58,  // 337: proto.WebFeatures.voipIndividualIncoming:type_name -> proto.WebFeatures.Flag
+	58,  // 338: proto.WebFeatures.quickRepliesQuery:type_name -> proto.WebFeatures.Flag
+	58,  // 339: proto.WebFeatures.payments:type_name -> proto.WebFeatures.Flag
+	58,  // 340: proto.WebFeatures.stickerPackQuery:type_name -> proto.WebFeatures.Flag
+	58,  // 341: proto.WebFeatures.liveLocationsFinal:type_name -> proto.WebFeatures.Flag
+	58,  // 342: proto.WebFeatures.labelsEdit:type_name -> proto.WebFeatures.Flag
+	58,  // 343: proto.WebFeatures.mediaUpload:type_name -> proto.WebFeatures.Flag
+	58,  // 344: proto.WebFeatures.mediaUploadRichQuickReplies:type_name -> proto.WebFeatures.Flag
+	58,  // 345: proto.WebFeatures.vnameV2:type_name -> proto.WebFeatures.Flag
+	58,  // 346: proto.WebFeatures.videoPlaybackUrl:type_name -> proto.WebFeatures.Flag
+	58,  // 347: proto.WebFeatures.statusRanking:type_name -> proto.WebFeatures.Flag
+	58,  // 348: proto.WebFeatures.voipIndividualVideo:type_name -> proto.WebFeatures.Flag
+	58,  // 349: proto.WebFeatures.thirdPartyStickers:type_name -> proto.WebFeatures.Flag
+	58,  // 350: proto.WebFeatures.frequentlyForwardedSetting:type_name -> proto.WebFeatures.Flag
+	58,  // 351: proto.WebFeatures.groupsV4JoinPermission:type_name -> proto.WebFeatures.Flag
+	58,  // 352: proto.WebFeatures.recentStickers:type_name -> proto.WebFeatures.Flag
+	58,  // 353: proto.WebFeatures.catalog:type_name -> proto.WebFeatures.Flag
+	58,  // 354: proto.WebFeatures.starredStickers:type_name -> proto.WebFeatures.Flag
+	58,  // 355: proto.WebFeatures.voipGroupCall:type_name -> proto.WebFeatures.Flag
+	58,  // 356: proto.WebFeatures.templateMessage:type_name -> proto.WebFeatures.Flag
+	58,  // 357: proto.WebFeatures.templateMessageInteractivity:type_name -> proto.WebFeatures.Flag
+	58,  // 358: proto.WebFeatures.ephemeralMessages:type_name -> proto.WebFeatures.Flag
+	58,  // 359: proto.WebFeatures.e2ENotificationSync:type_name -> proto.WebFeatures.Flag
+	58,  // 360: proto.WebFeatures.recentStickersV2:type_name -> proto.WebFeatures.Flag
+	58,  // 361: proto.WebFeatures.recentStickersV3:type_name -> proto.WebFeatures.Flag
+	58,  // 362: proto.WebFeatures.userNotice:type_name -> proto.WebFeatures.Flag
+	58,  // 363: proto.WebFeatures.support:type_name -> proto.WebFeatures.Flag
+	58,  // 364: proto.WebFeatures.groupUiiCleanup:type_name -> proto.WebFeatures.Flag
+	58,  // 365: proto.WebFeatures.groupDogfoodingInternalOnly:type_name -> proto.WebFeatures.Flag
+	58,  // 366: proto.WebFeatures.settingsSync:type_name -> proto.WebFeatures.Flag
+	58,  // 367: proto.WebFeatures.archiveV2:type_name -> proto.WebFeatures.Flag
+	58,  // 368: proto.WebFeatures.ephemeralAllowGroupMembers:type_name -> proto.WebFeatures.Flag
+	58,  // 369: proto.WebFeatures.ephemeral24HDuration:type_name -> proto.WebFeatures.Flag
+	58,  // 370: proto.WebFeatures.mdForceUpgrade:type_name -> proto.WebFeatures.Flag
+	58,  // 371: proto.WebFeatures.disappearingMode:type_name -> proto.WebFeatures.Flag
+	58,  // 372: proto.WebFeatures.externalMdOptInAvailable:type_name -> proto.WebFeatures.Flag
+	58,  // 373: proto.WebFeatures.noDeleteMessageTimeLimit:type_name -> proto.WebFeatures.Flag
+	163, // 374: proto.Reaction.key:type_name -> proto.MessageKey
+	163, // 375: proto.PollUpdate.pollUpdateMessageKey:type_name -> proto.MessageKey
+	136, // 376: proto.PollUpdate.vote:type_name -> proto.PollVoteMessage
+	59,  // 377: proto.PinInChat.type:type_name -> proto.PinInChat.Type
+	163, // 378: proto.PinInChat.key:type_name -> proto.MessageKey
+	237, // 379: proto.PinInChat.messageAddOnContextInfo:type_name -> proto.MessageAddOnContextInfo
+	62,  // 380: proto.PaymentInfo.currencyDeprecated:type_name -> proto.PaymentInfo.Currency
+	61,  // 381: proto.PaymentInfo.status:type_name -> proto.PaymentInfo.Status
+	163, // 382: proto.PaymentInfo.requestMessageKey:type_name -> proto.MessageKey
+	60,  // 383: proto.PaymentInfo.txnStatus:type_name -> proto.PaymentInfo.TxnStatus
+	118, // 384: proto.PaymentInfo.primaryAmount:type_name -> proto.Money
+	118, // 385: proto.PaymentInfo.exchangeAmount:type_name -> proto.Money
+	163, // 386: proto.NotificationMessageInfo.key:type_name -> proto.MessageKey
+	119, // 387: proto.NotificationMessageInfo.message:type_name -> proto.Message
+	1,   // 388: proto.KeepInChat.keepType:type_name -> proto.KeepType
+	163, // 389: proto.KeepInChat.key:type_name -> proto.MessageKey
+	303, // 390: proto.CertChain.leaf:type_name -> proto.CertChain.NoiseCertificate
+	303, // 391: proto.CertChain.intermediate:type_name -> proto.CertChain.NoiseCertificate
+	246, // 392: proto.ListMessage.Section.rows:type_name -> proto.ListMessage.Row
+	247, // 393: proto.ListMessage.ProductSection.products:type_name -> proto.ListMessage.Product
+	248, // 394: proto.ListMessage.ProductListInfo.productSections:type_name -> proto.ListMessage.ProductSection
+	250, // 395: proto.ListMessage.ProductListInfo.headerImage:type_name -> proto.ListMessage.ProductListHeaderImage
+	8,   // 396: proto.InteractiveResponseMessage.Body.format:type_name -> proto.InteractiveResponseMessage.Body.Format
+	9,   // 397: proto.InteractiveMessage.ShopMessage.surface:type_name -> proto.InteractiveMessage.ShopMessage.Surface
+	260, // 398: proto.InteractiveMessage.NativeFlowMessage.buttons:type_name -> proto.InteractiveMessage.NativeFlowMessage.NativeFlowButton
+	85,  // 399: proto.InteractiveMessage.Header.documentMessage:type_name -> proto.DocumentMessage
+	77,  // 400: proto.InteractiveMessage.Header.imageMessage:type_name -> proto.ImageMessage
+	122, // 401: proto.InteractiveMessage.Header.videoMessage:type_name -> proto.VideoMessage
+	146, // 402: proto.InteractiveMessage.Header.locationMessage:type_name -> proto.LocationMessage
+	75,  // 403: proto.InteractiveMessage.CarouselMessage.cards:type_name -> proto.InteractiveMessage
+	263, // 404: proto.HighlyStructuredMessage.HSMLocalizableParameter.currency:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMCurrency
+	262, // 405: proto.HighlyStructuredMessage.HSMLocalizableParameter.dateTime:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime
+	265, // 406: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.component:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent
+	264, // 407: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.unixEpoch:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeUnixEpoch
+	11,  // 408: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent.dayOfWeek:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent.DayOfWeekType
+	12,  // 409: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent.calendar:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent.CalendarType
+	268, // 410: proto.ButtonsMessage.Button.buttonText:type_name -> proto.ButtonsMessage.Button.ButtonText
+	19,  // 411: proto.ButtonsMessage.Button.type:type_name -> proto.ButtonsMessage.Button.Type
+	267, // 412: proto.ButtonsMessage.Button.nativeFlowInfo:type_name -> proto.ButtonsMessage.Button.NativeFlowInfo
+	23,  // 413: proto.ContextInfo.ExternalAdReplyInfo.mediaType:type_name -> proto.ContextInfo.ExternalAdReplyInfo.MediaType
+	24,  // 414: proto.ContextInfo.AdReplyInfo.mediaType:type_name -> proto.ContextInfo.AdReplyInfo.MediaType
+	79,  // 415: proto.TemplateButton.URLButton.displayText:type_name -> proto.HighlyStructuredMessage
+	79,  // 416: proto.TemplateButton.URLButton.url:type_name -> proto.HighlyStructuredMessage
+	79,  // 417: proto.TemplateButton.QuickReplyButton.displayText:type_name -> proto.HighlyStructuredMessage
+	79,  // 418: proto.TemplateButton.CallButton.displayText:type_name -> proto.HighlyStructuredMessage
+	79,  // 419: proto.TemplateButton.CallButton.phoneNumber:type_name -> proto.HighlyStructuredMessage
+	106, // 420: proto.TemplateMessage.HydratedFourRowTemplate.hydratedButtons:type_name -> proto.HydratedTemplateButton
+	85,  // 421: proto.TemplateMessage.HydratedFourRowTemplate.documentMessage:type_name -> proto.DocumentMessage
+	77,  // 422: proto.TemplateMessage.HydratedFourRowTemplate.imageMessage:type_name -> proto.ImageMessage
+	122, // 423: proto.TemplateMessage.HydratedFourRowTemplate.videoMessage:type_name -> proto.VideoMessage
+	146, // 424: proto.TemplateMessage.HydratedFourRowTemplate.locationMessage:type_name -> proto.LocationMessage
+	79,  // 425: proto.TemplateMessage.FourRowTemplate.content:type_name -> proto.HighlyStructuredMessage
+	79,  // 426: proto.TemplateMessage.FourRowTemplate.footer:type_name -> proto.HighlyStructuredMessage
+	115, // 427: proto.TemplateMessage.FourRowTemplate.buttons:type_name -> proto.TemplateButton
+	85,  // 428: proto.TemplateMessage.FourRowTemplate.documentMessage:type_name -> proto.DocumentMessage
+	79,  // 429: proto.TemplateMessage.FourRowTemplate.highlyStructuredMessage:type_name -> proto.HighlyStructuredMessage
+	77,  // 430: proto.TemplateMessage.FourRowTemplate.imageMessage:type_name -> proto.ImageMessage
+	122, // 431: proto.TemplateMessage.FourRowTemplate.videoMessage:type_name -> proto.VideoMessage
+	146, // 432: proto.TemplateMessage.FourRowTemplate.locationMessage:type_name -> proto.LocationMessage
+	77,  // 433: proto.ProductMessage.ProductSnapshot.productImage:type_name -> proto.ImageMessage
+	77,  // 434: proto.ProductMessage.CatalogSnapshot.catalogImage:type_name -> proto.ImageMessage
+	38,  // 435: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.mediaUploadResult:type_name -> proto.MediaRetryNotification.ResultType
+	126, // 436: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.stickerMessage:type_name -> proto.StickerMessage
+	288, // 437: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.linkPreviewResponse:type_name -> proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.LinkPreviewResponse
+	287, // 438: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.placeholderMessageResendResponse:type_name -> proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.PlaceholderMessageResendResponse
+	289, // 439: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.LinkPreviewResponse.hqThumbnail:type_name -> proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.LinkPreviewResponse.LinkPreviewHighQualityThumbnail
+	163, // 440: proto.PeerDataOperationRequestMessage.PlaceholderMessageResendRequest.messageKey:type_name -> proto.MessageKey
+	216, // 441: proto.VerifiedNameCertificate.Details.localizedNames:type_name -> proto.LocalizedName
+	300, // 442: proto.ClientPayload.WebInfo.webdPayload:type_name -> proto.ClientPayload.WebInfo.WebdPayload
+	50,  // 443: proto.ClientPayload.WebInfo.webSubPlatform:type_name -> proto.ClientPayload.WebInfo.WebSubPlatform
+	52,  // 444: proto.ClientPayload.UserAgent.platform:type_name -> proto.ClientPayload.UserAgent.Platform
+	301, // 445: proto.ClientPayload.UserAgent.appVersion:type_name -> proto.ClientPayload.UserAgent.AppVersion
+	51,  // 446: proto.ClientPayload.UserAgent.releaseChannel:type_name -> proto.ClientPayload.UserAgent.ReleaseChannel
+	53,  // 447: proto.ClientPayload.UserAgent.deviceType:type_name -> proto.ClientPayload.UserAgent.DeviceType
+	54,  // 448: proto.ClientPayload.DNSSource.dnsMethod:type_name -> proto.ClientPayload.DNSSource.DNSResolutionMethod
+	449, // [449:449] is the sub-list for method output_type
+	449, // [449:449] is the sub-list for method input_type
+	449, // [449:449] is the sub-list for extension type_name
+	449, // [449:449] is the sub-list for extension extendee
+	0,   // [0:449] is the sub-list for field type_name
 }
 
 func init() { file_binary_proto_def_proto_init() }
@@ -23589,54 +25420,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.(*PeerDataOperationRequestMessage); 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.(*PaymentInviteMessage); 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[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OrderMessage); 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[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LocationMessage); 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[10].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*LiveLocationMessage); i {
 			case 0:
 				return &v.state
@@ -23648,7 +25431,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[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ListResponseMessage); i {
 			case 0:
 				return &v.state
@@ -23660,7 +25443,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[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ListMessage); i {
 			case 0:
 				return &v.state
@@ -23672,7 +25455,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[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*KeepInChatMessage); i {
 			case 0:
 				return &v.state
@@ -23684,7 +25467,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[10].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*InvoiceMessage); i {
 			case 0:
 				return &v.state
@@ -23696,7 +25479,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[11].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*InteractiveResponseMessage); i {
 			case 0:
 				return &v.state
@@ -23708,7 +25491,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[12].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*InteractiveMessage); i {
 			case 0:
 				return &v.state
@@ -23720,7 +25503,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[13].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*InitialSecurityNotificationSettingSync); i {
 			case 0:
 				return &v.state
@@ -23732,7 +25515,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[14].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ImageMessage); i {
 			case 0:
 				return &v.state
@@ -23744,7 +25527,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[15].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HistorySyncNotification); i {
 			case 0:
 				return &v.state
@@ -23756,7 +25539,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[16].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HighlyStructuredMessage); i {
 			case 0:
 				return &v.state
@@ -23768,7 +25551,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[17].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GroupInviteMessage); i {
 			case 0:
 				return &v.state
@@ -23780,7 +25563,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[18].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FutureProofMessage); i {
 			case 0:
 				return &v.state
@@ -23792,7 +25575,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[19].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ExtendedTextMessage); i {
 			case 0:
 				return &v.state
@@ -23804,7 +25587,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[20].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*EncReactionMessage); i {
 			case 0:
 				return &v.state
@@ -23816,7 +25599,19 @@ 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[21].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EncCommentMessage); 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[22].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DocumentMessage); i {
 			case 0:
 				return &v.state
@@ -23828,7 +25623,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[23].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DeviceSentMessage); i {
 			case 0:
 				return &v.state
@@ -23840,7 +25635,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[24].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DeclinePaymentRequestMessage); i {
 			case 0:
 				return &v.state
@@ -23852,7 +25647,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[25].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ContactsArrayMessage); i {
 			case 0:
 				return &v.state
@@ -23864,7 +25659,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[26].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ContactMessage); i {
 			case 0:
 				return &v.state
@@ -23876,7 +25671,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[27].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Chat); i {
 			case 0:
 				return &v.state
@@ -23888,7 +25683,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[28].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CancelPaymentRequestMessage); i {
 			case 0:
 				return &v.state
@@ -23900,7 +25695,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[29].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Call); i {
 			case 0:
 				return &v.state
@@ -23912,7 +25707,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[30].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ButtonsResponseMessage); i {
 			case 0:
 				return &v.state
@@ -23924,7 +25719,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[31].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ButtonsMessage); i {
 			case 0:
 				return &v.state
@@ -23936,7 +25731,19 @@ 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[32].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*BotFeedbackMessage); 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[33].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AudioMessage); i {
 			case 0:
 				return &v.state
@@ -23948,7 +25755,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[34].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AppStateSyncKey); i {
 			case 0:
 				return &v.state
@@ -23960,7 +25767,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[35].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AppStateSyncKeyShare); i {
 			case 0:
 				return &v.state
@@ -23972,7 +25779,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[36].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AppStateSyncKeyRequest); i {
 			case 0:
 				return &v.state
@@ -23984,7 +25791,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[37].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AppStateSyncKeyId); i {
 			case 0:
 				return &v.state
@@ -23996,7 +25803,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[38].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AppStateSyncKeyFingerprint); i {
 			case 0:
 				return &v.state
@@ -24008,7 +25815,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[39].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AppStateSyncKeyData); i {
 			case 0:
 				return &v.state
@@ -24020,7 +25827,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[40].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AppStateFatalExceptionNotification); i {
 			case 0:
 				return &v.state
@@ -24032,7 +25839,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[41].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Location); i {
 			case 0:
 				return &v.state
@@ -24044,7 +25851,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[42].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*InteractiveAnnotation); i {
 			case 0:
 				return &v.state
@@ -24056,7 +25863,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[43].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HydratedTemplateButton); i {
 			case 0:
 				return &v.state
@@ -24068,7 +25875,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[44].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GroupMention); i {
 			case 0:
 				return &v.state
@@ -24080,7 +25887,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DisappearingMode); i {
 			case 0:
 				return &v.state
@@ -24092,7 +25899,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DeviceListMetadata); i {
 			case 0:
 				return &v.state
@@ -24104,7 +25911,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ContextInfo); i {
 			case 0:
 				return &v.state
@@ -24116,8 +25923,32 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
+		file_binary_proto_def_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*BotPluginMetadata); 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[49].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*BotMetadata); 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[50].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ActionLink); i {
+			switch v := v.(*BotAvatarMetadata); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24129,7 +25960,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[51].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TemplateButton); i {
+			switch v := v.(*ActionLink); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24141,7 +25972,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Point); i {
+			switch v := v.(*TemplateButton); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24153,7 +25984,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PaymentBackground); i {
+			switch v := v.(*Point); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24165,7 +25996,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Money); i {
+			switch v := v.(*PaymentBackground); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24177,7 +26008,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Message); i {
+			switch v := v.(*Money); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24189,7 +26020,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MessageContextInfo); i {
+			switch v := v.(*Message); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24201,7 +26032,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*VideoMessage); i {
+			switch v := v.(*MessageSecretMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24213,7 +26044,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TemplateMessage); i {
+			switch v := v.(*MessageContextInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24225,7 +26056,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[59].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TemplateButtonReplyMessage); i {
+			switch v := v.(*VideoMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24237,7 +26068,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[60].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*StickerSyncRMRMessage); i {
+			switch v := v.(*TemplateMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24249,7 +26080,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[61].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*StickerMessage); i {
+			switch v := v.(*TemplateButtonReplyMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24261,7 +26092,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[62].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SenderKeyDistributionMessage); i {
+			switch v := v.(*StickerSyncRMRMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24273,7 +26104,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[63].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SendPaymentMessage); i {
+			switch v := v.(*StickerMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24285,7 +26116,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.(*ScheduledCallEditMessage); i {
+			switch v := v.(*SenderKeyDistributionMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24297,7 +26128,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.(*ScheduledCallCreationMessage); i {
+			switch v := v.(*SendPaymentMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24309,7 +26140,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.(*RequestPhoneNumberMessage); i {
+			switch v := v.(*ScheduledCallEditMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24321,7 +26152,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.(*RequestPaymentMessage); i {
+			switch v := v.(*ScheduledCallCreationMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24333,7 +26164,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.(*ReactionMessage); i {
+			switch v := v.(*RequestPhoneNumberMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24345,7 +26176,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.(*ProtocolMessage); i {
+			switch v := v.(*RequestPaymentMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24357,7 +26188,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.(*ProductMessage); i {
+			switch v := v.(*ReactionMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24369,7 +26200,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.(*PollVoteMessage); i {
+			switch v := v.(*ProtocolMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24381,7 +26212,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.(*PollUpdateMessage); i {
+			switch v := v.(*ProductMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24393,7 +26224,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.(*PollUpdateMessageMetadata); i {
+			switch v := v.(*PollVoteMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24405,7 +26236,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.(*PollEncValue); i {
+			switch v := v.(*PollUpdateMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24417,7 +26248,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.(*PollCreationMessage); i {
+			switch v := v.(*PollUpdateMessageMetadata); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24429,7 +26260,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.(*PinMessage); i {
+			switch v := v.(*PollEncValue); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24441,7 +26272,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.(*PeerDataOperationRequestResponseMessage); i {
+			switch v := v.(*PollCreationMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24453,7 +26284,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.(*EphemeralSetting); i {
+			switch v := v.(*PinInChatMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24465,7 +26296,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.(*WallpaperSettings); i {
+			switch v := v.(*PeerDataOperationRequestResponseMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24477,7 +26308,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.(*StickerMetadata); i {
+			switch v := v.(*PeerDataOperationRequestMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24489,7 +26320,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.(*Pushname); i {
+			switch v := v.(*PaymentInviteMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24501,7 +26332,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.(*PastParticipants); i {
+			switch v := v.(*OrderMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24513,7 +26344,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.(*PastParticipant); i {
+			switch v := v.(*LocationMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24525,7 +26356,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.(*HistorySync); i {
+			switch v := v.(*EphemeralSetting); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24537,7 +26368,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.(*HistorySyncMsg); i {
+			switch v := v.(*WallpaperSettings); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24549,7 +26380,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.(*GroupParticipant); i {
+			switch v := v.(*StickerMetadata); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24561,7 +26392,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.(*GlobalSettings); i {
+			switch v := v.(*Pushname); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24573,7 +26404,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.(*Conversation); i {
+			switch v := v.(*PastParticipants); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24585,7 +26416,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.(*AvatarUserSettings); i {
+			switch v := v.(*PastParticipant); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24597,7 +26428,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.(*AutoDownloadSettings); i {
+			switch v := v.(*NotificationSettings); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24609,7 +26440,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.(*MsgRowOpaqueData); i {
+			switch v := v.(*HistorySync); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24621,7 +26452,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.(*MsgOpaqueData); i {
+			switch v := v.(*HistorySyncMsg); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24633,7 +26464,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.(*ServerErrorReceipt); i {
+			switch v := v.(*GroupParticipant); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24645,7 +26476,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.(*MediaRetryNotification); i {
+			switch v := v.(*GlobalSettings); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24657,7 +26488,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.(*MessageKey); i {
+			switch v := v.(*Conversation); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24669,7 +26500,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.(*SyncdVersion); i {
+			switch v := v.(*AvatarUserSettings); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24681,7 +26512,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.(*SyncdValue); i {
+			switch v := v.(*AutoDownloadSettings); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24693,7 +26524,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.(*SyncdSnapshot); i {
+			switch v := v.(*ServerErrorReceipt); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24705,7 +26536,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.(*SyncdRecord); i {
+			switch v := v.(*MediaRetryNotification); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24717,7 +26548,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.(*SyncdPatch); i {
+			switch v := v.(*MessageKey); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24729,7 +26560,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.(*SyncdMutations); i {
+			switch v := v.(*SyncdVersion); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24741,7 +26572,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.(*SyncdMutation); i {
+			switch v := v.(*SyncdValue); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24753,7 +26584,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.(*SyncdIndex); i {
+			switch v := v.(*SyncdSnapshot); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24765,7 +26596,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.(*KeyId); i {
+			switch v := v.(*SyncdRecord); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24777,7 +26608,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.(*ExternalBlobReference); i {
+			switch v := v.(*SyncdPatch); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24789,7 +26620,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.(*ExitCode); i {
+			switch v := v.(*SyncdMutations); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24801,7 +26632,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.(*SyncActionValue); i {
+			switch v := v.(*SyncdMutation); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24813,7 +26644,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.(*UserStatusMuteAction); i {
+			switch v := v.(*SyncdIndex); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24825,7 +26656,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.(*UnarchiveChatsSetting); i {
+			switch v := v.(*KeyId); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24837,7 +26668,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.(*TimeFormatAction); i {
+			switch v := v.(*ExternalBlobReference); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24849,7 +26680,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.(*SyncActionMessage); i {
+			switch v := v.(*ExitCode); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24861,7 +26692,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.(*SyncActionMessageRange); i {
+			switch v := v.(*SyncActionValue); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24873,7 +26704,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.(*SubscriptionAction); i {
+			switch v := v.(*UserStatusMuteAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24885,7 +26716,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.(*StickerAction); i {
+			switch v := v.(*UnarchiveChatsSetting); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24897,7 +26728,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.(*StarAction); i {
+			switch v := v.(*TimeFormatAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24909,7 +26740,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.(*SecurityNotificationSetting); i {
+			switch v := v.(*SyncActionMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24921,7 +26752,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.(*RemoveRecentStickerAction); i {
+			switch v := v.(*SyncActionMessageRange); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24933,7 +26764,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.(*RecentEmojiWeightsAction); i {
+			switch v := v.(*SubscriptionAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24945,7 +26776,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.(*QuickReplyAction); i {
+			switch v := v.(*StickerAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24957,7 +26788,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.(*PushNameSetting); i {
+			switch v := v.(*StarAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24969,7 +26800,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.(*PrimaryVersionAction); i {
+			switch v := v.(*SecurityNotificationSetting); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24981,7 +26812,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.(*PrimaryFeature); i {
+			switch v := v.(*RemoveRecentStickerAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24993,7 +26824,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.(*PnForLidChatAction); i {
+			switch v := v.(*RecentEmojiWeightsAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25005,7 +26836,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.(*PinAction); i {
+			switch v := v.(*QuickReplyAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25017,7 +26848,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.(*NuxAction); i {
+			switch v := v.(*PushNameSetting); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25029,7 +26860,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.(*MuteAction); i {
+			switch v := v.(*PrivacySettingRelayAllCalls); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25041,7 +26872,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.(*MarkChatAsReadAction); i {
+			switch v := v.(*PrimaryVersionAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25053,7 +26884,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.(*LocaleSetting); i {
+			switch v := v.(*PrimaryFeature); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25065,7 +26896,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.(*LabelEditAction); i {
+			switch v := v.(*PnForLidChatAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25077,7 +26908,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.(*LabelAssociationAction); i {
+			switch v := v.(*PinAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25089,7 +26920,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.(*KeyExpiration); i {
+			switch v := v.(*NuxAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25101,7 +26932,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.(*DeleteMessageForMeAction); i {
+			switch v := v.(*MuteAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25113,7 +26944,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.(*DeleteChatAction); i {
+			switch v := v.(*MarketingMessageBroadcastAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25125,7 +26956,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.(*ContactAction); i {
+			switch v := v.(*MarketingMessageAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25137,7 +26968,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.(*ClearChatAction); i {
+			switch v := v.(*MarkChatAsReadAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25149,7 +26980,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.(*ChatAssignmentOpenedStatusAction); i {
+			switch v := v.(*LocaleSetting); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25161,7 +26992,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.(*ChatAssignmentAction); i {
+			switch v := v.(*LabelEditAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25173,7 +27004,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.(*ArchiveChatAction); i {
+			switch v := v.(*LabelAssociationAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25185,7 +27016,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.(*AndroidUnsupportedActions); i {
+			switch v := v.(*KeyExpiration); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25197,7 +27028,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.(*AgentAction); i {
+			switch v := v.(*ExternalWebBetaAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25209,7 +27040,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.(*SyncActionData); i {
+			switch v := v.(*DeleteMessageForMeAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25221,7 +27052,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.(*RecentEmojiWeight); i {
+			switch v := v.(*DeleteChatAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25233,7 +27064,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.(*VerifiedNameCertificate); i {
+			switch v := v.(*ContactAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25245,7 +27076,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.(*LocalizedName); i {
+			switch v := v.(*ClearChatAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25257,7 +27088,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.(*BizIdentityInfo); i {
+			switch v := v.(*ChatAssignmentOpenedStatusAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25269,7 +27100,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.(*BizAccountPayload); i {
+			switch v := v.(*ChatAssignmentAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25281,7 +27112,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.(*BizAccountLinkInfo); i {
+			switch v := v.(*ArchiveChatAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25293,7 +27124,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.(*HandshakeMessage); i {
+			switch v := v.(*AndroidUnsupportedActions); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25305,7 +27136,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.(*HandshakeServerHello); i {
+			switch v := v.(*AgentAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25317,7 +27148,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.(*HandshakeClientHello); i {
+			switch v := v.(*SyncActionData); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25329,7 +27160,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.(*HandshakeClientFinish); i {
+			switch v := v.(*RecentEmojiWeight); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25341,7 +27172,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.(*ClientPayload); i {
+			switch v := v.(*VerifiedNameCertificate); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25353,7 +27184,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.(*WebNotificationsInfo); i {
+			switch v := v.(*LocalizedName); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25365,7 +27196,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.(*WebMessageInfo); i {
+			switch v := v.(*BizIdentityInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25377,7 +27208,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.(*WebFeatures); i {
+			switch v := v.(*BizAccountPayload); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25389,7 +27220,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.(*UserReceipt); i {
+			switch v := v.(*BizAccountLinkInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25401,7 +27232,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.(*StatusPSA); i {
+			switch v := v.(*HandshakeMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25413,7 +27244,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.(*Reaction); i {
+			switch v := v.(*HandshakeServerHello); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25425,7 +27256,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.(*PollUpdate); i {
+			switch v := v.(*HandshakeClientHello); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25437,7 +27268,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.(*PollAdditionalMetadata); i {
+			switch v := v.(*HandshakeClientFinish); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25449,7 +27280,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.(*PhotoChange); i {
+			switch v := v.(*ClientPayload); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25461,7 +27292,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.(*PaymentInfo); i {
+			switch v := v.(*WebNotificationsInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25473,7 +27304,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.(*NotificationMessageInfo); i {
+			switch v := v.(*WebMessageInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25485,7 +27316,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.(*MediaData); i {
+			switch v := v.(*WebFeatures); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25497,7 +27328,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.(*KeepInChat); i {
+			switch v := v.(*UserReceipt); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25509,7 +27340,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.(*NoiseCertificate); i {
+			switch v := v.(*StatusPSA); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25521,7 +27352,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.(*CertChain); i {
+			switch v := v.(*Reaction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25533,7 +27364,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.(*DeviceProps_HistorySyncConfig); i {
+			switch v := v.(*PollUpdate); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25545,7 +27376,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.(*DeviceProps_AppVersion); i {
+			switch v := v.(*PollAdditionalMetadata); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25557,7 +27388,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.(*PeerDataOperationRequestMessage_RequestUrlPreview); i {
+			switch v := v.(*PinInChat); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25569,7 +27400,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.(*PeerDataOperationRequestMessage_RequestStickerReupload); i {
+			switch v := v.(*PhotoChange); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25581,7 +27412,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.(*PeerDataOperationRequestMessage_HistorySyncOnDemandRequest); i {
+			switch v := v.(*PaymentInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25593,7 +27424,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.(*ListResponseMessage_SingleSelectReply); i {
+			switch v := v.(*NotificationMessageInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25605,7 +27436,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_Section); i {
+			switch v := v.(*MessageAddOnContextInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25617,7 +27448,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_Row); i {
+			switch v := v.(*MediaData); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25629,7 +27460,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_Product); i {
+			switch v := v.(*KeepInChat); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25641,7 +27472,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.(*ListMessage_ProductSection); i {
+			switch v := v.(*NoiseCertificate); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25653,7 +27484,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.(*ListMessage_ProductListInfo); i {
+			switch v := v.(*CertChain); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25665,7 +27496,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.(*ListMessage_ProductListHeaderImage); i {
+			switch v := v.(*DeviceProps_HistorySyncConfig); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25677,7 +27508,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.(*InteractiveResponseMessage_NativeFlowResponseMessage); i {
+			switch v := v.(*DeviceProps_AppVersion); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25689,7 +27520,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.(*InteractiveResponseMessage_Body); i {
+			switch v := v.(*ListResponseMessage_SingleSelectReply); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25701,7 +27532,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_ShopMessage); i {
+			switch v := v.(*ListMessage_Section); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25713,7 +27544,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_NativeFlowMessage); i {
+			switch v := v.(*ListMessage_Row); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25725,7 +27556,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_Header); i {
+			switch v := v.(*ListMessage_Product); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25737,7 +27568,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_Footer); i {
+			switch v := v.(*ListMessage_ProductSection); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25749,7 +27580,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.(*InteractiveMessage_CollectionMessage); i {
+			switch v := v.(*ListMessage_ProductListInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25761,7 +27592,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.(*InteractiveMessage_Body); i {
+			switch v := v.(*ListMessage_ProductListHeaderImage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25773,7 +27604,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.(*InteractiveMessage_NativeFlowMessage_NativeFlowButton); i {
+			switch v := v.(*InteractiveResponseMessage_NativeFlowResponseMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25785,7 +27616,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); i {
+			switch v := v.(*InteractiveResponseMessage_Body); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25797,7 +27628,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); i {
+			switch v := v.(*InteractiveMessage_ShopMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25809,7 +27640,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.(*HighlyStructuredMessage_HSMLocalizableParameter_HSMCurrency); i {
+			switch v := v.(*InteractiveMessage_NativeFlowMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25821,7 +27652,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.(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeUnixEpoch); i {
+			switch v := v.(*InteractiveMessage_Header); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25833,7 +27664,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.(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent); i {
+			switch v := v.(*InteractiveMessage_Footer); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25845,7 +27676,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.(*ButtonsMessage_Button); i {
+			switch v := v.(*InteractiveMessage_CollectionMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25857,7 +27688,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.(*ButtonsMessage_Button_NativeFlowInfo); i {
+			switch v := v.(*InteractiveMessage_CarouselMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25869,7 +27700,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.(*ButtonsMessage_Button_ButtonText); i {
+			switch v := v.(*InteractiveMessage_Body); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25881,7 +27712,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.(*HydratedTemplateButton_HydratedURLButton); i {
+			switch v := v.(*InteractiveMessage_NativeFlowMessage_NativeFlowButton); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25893,7 +27724,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.(*HydratedTemplateButton_HydratedQuickReplyButton); i {
+			switch v := v.(*HighlyStructuredMessage_HSMLocalizableParameter); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25905,7 +27736,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.(*HydratedTemplateButton_HydratedCallButton); i {
+			switch v := v.(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25917,7 +27748,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.(*ContextInfo_UTMInfo); i {
+			switch v := v.(*HighlyStructuredMessage_HSMLocalizableParameter_HSMCurrency); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25929,7 +27760,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.(*ContextInfo_ExternalAdReplyInfo); i {
+			switch v := v.(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeUnixEpoch); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25941,7 +27772,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.(*ContextInfo_AdReplyInfo); i {
+			switch v := v.(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25953,7 +27784,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.(*TemplateButton_URLButton); i {
+			switch v := v.(*ButtonsMessage_Button); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25965,7 +27796,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.(*TemplateButton_QuickReplyButton); i {
+			switch v := v.(*ButtonsMessage_Button_NativeFlowInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25977,7 +27808,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.(*TemplateButton_CallButton); i {
+			switch v := v.(*ButtonsMessage_Button_ButtonText); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25989,7 +27820,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.(*PaymentBackground_MediaData); i {
+			switch v := v.(*HydratedTemplateButton_HydratedURLButton); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -26001,7 +27832,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.(*TemplateMessage_HydratedFourRowTemplate); i {
+			switch v := v.(*HydratedTemplateButton_HydratedQuickReplyButton); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -26013,7 +27844,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.(*TemplateMessage_FourRowTemplate); i {
+			switch v := v.(*HydratedTemplateButton_HydratedCallButton); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -26025,7 +27856,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.(*ProductMessage_ProductSnapshot); i {
+			switch v := v.(*ContextInfo_UTMInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -26037,7 +27868,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.(*ProductMessage_CatalogSnapshot); i {
+			switch v := v.(*ContextInfo_ForwardedNewsletterMessageInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -26049,7 +27880,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.(*PollCreationMessage_Option); i {
+			switch v := v.(*ContextInfo_ExternalAdReplyInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -26061,7 +27892,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.(*PeerDataOperationRequestResponseMessage_PeerDataOperationResult); i {
+			switch v := v.(*ContextInfo_BusinessMessageForwardInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -26073,7 +27904,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.(*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse); i {
+			switch v := v.(*ContextInfo_AdReplyInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -26085,7 +27916,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.(*MsgOpaqueData_PollOption); i {
+			switch v := v.(*TemplateButton_URLButton); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -26097,7 +27928,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.(*VerifiedNameCertificate_Details); i {
+			switch v := v.(*TemplateButton_QuickReplyButton); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -26109,7 +27940,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.(*ClientPayload_WebInfo); i {
+			switch v := v.(*TemplateButton_CallButton); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -26121,7 +27952,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.(*ClientPayload_UserAgent); i {
+			switch v := v.(*PaymentBackground_MediaData); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -26133,7 +27964,7 @@ 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 {
+			switch v := v.(*TemplateMessage_HydratedFourRowTemplate); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -26145,7 +27976,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[219].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ClientPayload_DNSSource); i {
+			switch v := v.(*TemplateMessage_FourRowTemplate); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -26157,7 +27988,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[220].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ClientPayload_WebInfo_WebdPayload); i {
+			switch v := v.(*ProductMessage_ProductSnapshot); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -26169,7 +28000,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[221].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ClientPayload_UserAgent_AppVersion); i {
+			switch v := v.(*ProductMessage_CatalogSnapshot); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -26181,7 +28012,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[222].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*NoiseCertificate_Details); i {
+			switch v := v.(*PollCreationMessage_Option); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -26193,7 +28024,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[223].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CertChain_NoiseCertificate); i {
+			switch v := v.(*PeerDataOperationRequestResponseMessage_PeerDataOperationResult); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -26205,6 +28036,210 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[224].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_PlaceholderMessageResendResponse); 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[225].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse); 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[226].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse_LinkPreviewHighQualityThumbnail); 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[227].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeerDataOperationRequestMessage_RequestUrlPreview); 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[228].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeerDataOperationRequestMessage_RequestStickerReupload); 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[229].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeerDataOperationRequestMessage_PlaceholderMessageResendRequest); 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[230].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeerDataOperationRequestMessage_HistorySyncOnDemandRequest); 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[231].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*VerifiedNameCertificate_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[232].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ClientPayload_WebInfo); 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[233].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ClientPayload_UserAgent); 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[234].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ClientPayload_InteropData); 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[235].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[236].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[237].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[238].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[239].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[240].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[241].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CertChain_NoiseCertificate_Details); i {
 			case 0:
 				return &v.state
@@ -26217,64 +28252,66 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 	}
-	file_binary_proto_def_proto_msgTypes[15].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[11].OneofWrappers = []interface{}{
 		(*InteractiveResponseMessage_NativeFlowResponseMessage_)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[16].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[12].OneofWrappers = []interface{}{
 		(*InteractiveMessage_ShopStorefrontMessage)(nil),
 		(*InteractiveMessage_CollectionMessage_)(nil),
 		(*InteractiveMessage_NativeFlowMessage_)(nil),
+		(*InteractiveMessage_CarouselMessage_)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[33].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[30].OneofWrappers = []interface{}{
 		(*ButtonsResponseMessage_SelectedDisplayText)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[34].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[31].OneofWrappers = []interface{}{
 		(*ButtonsMessage_Text)(nil),
 		(*ButtonsMessage_DocumentMessage)(nil),
 		(*ButtonsMessage_ImageMessage)(nil),
 		(*ButtonsMessage_VideoMessage)(nil),
 		(*ButtonsMessage_LocationMessage)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[44].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[42].OneofWrappers = []interface{}{
 		(*InteractiveAnnotation_Location)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[45].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[43].OneofWrappers = []interface{}{
 		(*HydratedTemplateButton_QuickReplyButton)(nil),
 		(*HydratedTemplateButton_UrlButton)(nil),
 		(*HydratedTemplateButton_CallButton)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[51].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[52].OneofWrappers = []interface{}{
 		(*TemplateButton_QuickReplyButton_)(nil),
 		(*TemplateButton_UrlButton)(nil),
 		(*TemplateButton_CallButton_)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[58].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[60].OneofWrappers = []interface{}{
 		(*TemplateMessage_FourRowTemplate_)(nil),
 		(*TemplateMessage_HydratedFourRowTemplate_)(nil),
 		(*TemplateMessage_InteractiveMessageTemplate)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[184].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[192].OneofWrappers = []interface{}{
 		(*InteractiveMessage_Header_DocumentMessage)(nil),
 		(*InteractiveMessage_Header_ImageMessage)(nil),
 		(*InteractiveMessage_Header_JpegThumbnail)(nil),
 		(*InteractiveMessage_Header_VideoMessage)(nil),
+		(*InteractiveMessage_Header_LocationMessage)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[189].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[198].OneofWrappers = []interface{}{
 		(*HighlyStructuredMessage_HSMLocalizableParameter_Currency)(nil),
 		(*HighlyStructuredMessage_HSMLocalizableParameter_DateTime)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[190].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[199].OneofWrappers = []interface{}{
 		(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_Component)(nil),
 		(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_UnixEpoch)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[207].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[218].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[208].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[219].OneofWrappers = []interface{}{
 		(*TemplateMessage_FourRowTemplate_DocumentMessage)(nil),
 		(*TemplateMessage_FourRowTemplate_HighlyStructuredMessage)(nil),
 		(*TemplateMessage_FourRowTemplate_ImageMessage)(nil),
@@ -26286,8 +28323,8 @@ func file_binary_proto_def_proto_init() {
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_binary_proto_def_proto_rawDesc,
-			NumEnums:      56,
-			NumMessages:   225,
+			NumEnums:      63,
+			NumMessages:   242,
 			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 827172ab..c914646d 100644
Binary files a/vendor/go.mau.fi/whatsmeow/binary/proto/def.pb.raw and b/vendor/go.mau.fi/whatsmeow/binary/proto/def.pb.raw differ
diff --git a/vendor/go.mau.fi/whatsmeow/binary/proto/def.proto b/vendor/go.mau.fi/whatsmeow/binary/proto/def.proto
index cdfc0c35..7e496add 100644
--- a/vendor/go.mau.fi/whatsmeow/binary/proto/def.proto
+++ b/vendor/go.mau.fi/whatsmeow/binary/proto/def.proto
@@ -16,6 +16,7 @@ message ADVSignedDeviceIdentity {
 message ADVSignedDeviceIdentityHMAC {
     optional bytes details = 1;
     optional bytes hmac = 2;
+    optional ADVEncryptionType accountType = 3;
 }
 
 message ADVKeyIndexList {
@@ -23,12 +24,19 @@ message ADVKeyIndexList {
     optional uint64 timestamp = 2;
     optional uint32 currentIndex = 3;
     repeated uint32 validIndexes = 4 [packed=true];
+    optional ADVEncryptionType accountType = 5;
 }
 
+enum ADVEncryptionType {
+    E2EE = 0;
+    HOSTED = 1;
+}
 message ADVDeviceIdentity {
     optional uint32 rawId = 1;
     optional uint64 timestamp = 2;
     optional uint32 keyIndex = 3;
+    optional ADVEncryptionType accountType = 4;
+    optional ADVEncryptionType deviceType = 5;
 }
 
 message DeviceProps {
@@ -51,11 +59,18 @@ message DeviceProps {
         IOS_CATALYST = 15;
         ANDROID_PHONE = 16;
         ANDROID_AMBIGUOUS = 17;
+        WEAR_OS = 18;
+        AR_WRIST = 19;
+        AR_DEVICE = 20;
+        UWP = 21;
+        VR = 22;
     }
     message HistorySyncConfig {
         optional uint32 fullSyncDaysLimit = 1;
         optional uint32 fullSyncSizeMbLimit = 2;
         optional uint32 storageQuotaMb = 3;
+        optional bool inlineInitialPayloadInE2EeMsg = 4;
+        optional uint32 recentSyncDaysLimit = 5;
     }
     
     message AppVersion {
@@ -73,76 +88,6 @@ message DeviceProps {
     optional HistorySyncConfig historySyncConfig = 5;
 }
 
-message PeerDataOperationRequestMessage {
-    message RequestUrlPreview {
-        optional string url = 1;
-    }
-    
-    message RequestStickerReupload {
-        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 {
-    enum ServiceType {
-        UNKNOWN = 0;
-        FBPAY = 1;
-        NOVI = 2;
-        UPI = 3;
-    }
-    optional ServiceType serviceType = 1;
-    optional int64 expiryTimestamp = 2;
-}
-
-message OrderMessage {
-    enum OrderSurface {
-        CATALOG = 1;
-    }
-    enum OrderStatus {
-        INQUIRY = 1;
-    }
-    optional string orderId = 1;
-    optional bytes thumbnail = 2;
-    optional int32 itemCount = 3;
-    optional OrderStatus status = 4;
-    optional OrderSurface surface = 5;
-    optional string message = 6;
-    optional string orderTitle = 7;
-    optional string sellerJid = 8;
-    optional string token = 9;
-    optional int64 totalAmount1000 = 10;
-    optional string totalCurrencyCode = 11;
-    optional ContextInfo contextInfo = 17;
-}
-
-message LocationMessage {
-    optional double degreesLatitude = 1;
-    optional double degreesLongitude = 2;
-    optional string name = 3;
-    optional string address = 4;
-    optional string url = 5;
-    optional bool isLive = 6;
-    optional uint32 accuracyInMeters = 7;
-    optional float speedInMps = 8;
-    optional uint32 degreesClockwiseFromMagneticNorth = 9;
-    optional string comment = 11;
-    optional bytes jpegThumbnail = 16;
-    optional ContextInfo contextInfo = 17;
-}
-
 message LiveLocationMessage {
     optional double degreesLatitude = 1;
     optional double degreesLongitude = 2;
@@ -250,7 +195,12 @@ message InteractiveResponseMessage {
     }
     
     message Body {
+        enum Format {
+            DEFAULT = 0;
+            EXTENSIONS_1 = 1;
+        }
         optional string text = 1;
+        optional Format format = 2;
     }
     
     optional Body body = 1;
@@ -293,6 +243,7 @@ message InteractiveMessage {
             ImageMessage imageMessage = 4;
             bytes jpegThumbnail = 6;
             VideoMessage videoMessage = 7;
+            LocationMessage locationMessage = 8;
         }
     }
     
@@ -306,6 +257,11 @@ message InteractiveMessage {
         optional int32 messageVersion = 3;
     }
     
+    message CarouselMessage {
+        repeated InteractiveMessage cards = 1;
+        optional int32 messageVersion = 2;
+    }
+    
     message Body {
         optional string text = 1;
     }
@@ -318,6 +274,7 @@ message InteractiveMessage {
         ShopMessage shopStorefrontMessage = 4;
         CollectionMessage collectionMessage = 5;
         NativeFlowMessage nativeFlowMessage = 6;
+        CarouselMessage carouselMessage = 7;
     }
 }
 
@@ -374,6 +331,8 @@ message HistorySyncNotification {
     optional string originalMessageId = 8;
     optional uint32 progress = 9;
     optional int64 oldestMsgInChunkTimestampSec = 10;
+    optional bytes initialHistBootstrapInlinePayload = 11;
+    optional string peerDataRequestSessionId = 12;
 }
 
 message HighlyStructuredMessage {
@@ -466,13 +425,10 @@ message ExtendedTextMessage {
         DEFAULT_SUB = 3;
     }
     enum FontType {
-        SANS_SERIF = 0;
-        SERIF = 1;
-        NORICAN_REGULAR = 2;
-        BRYNDAN_WRITE = 3;
-        BEBASNEUE_REGULAR = 4;
-        OSWALD_HEAVY = 5;
-        DAMION_REGULAR = 6;
+        SYSTEM = 0;
+        SYSTEM_TEXT = 1;
+        FB_SCRIPT = 2;
+        SYSTEM_BOLD = 6;
         MORNINGBREEZE_REGULAR = 7;
         CALISTOGA_REGULAR = 8;
         EXO2_EXTRABOLD = 9;
@@ -510,6 +466,12 @@ message EncReactionMessage {
     optional bytes encIv = 3;
 }
 
+message EncCommentMessage {
+    optional MessageKey targetMessageKey = 1;
+    optional bytes encPayload = 2;
+    optional bytes encIv = 3;
+}
+
 message DocumentMessage {
     optional string url = 1;
     optional string mimetype = 2;
@@ -629,6 +591,21 @@ message ButtonsMessage {
     }
 }
 
+message BotFeedbackMessage {
+    enum BotFeedbackKind {
+        BOT_FEEDBACK_POSITIVE = 0;
+        BOT_FEEDBACK_NEGATIVE_GENERIC = 1;
+        BOT_FEEDBACK_NEGATIVE_HELPFUL = 2;
+        BOT_FEEDBACK_NEGATIVE_INTERESTING = 3;
+        BOT_FEEDBACK_NEGATIVE_ACCURATE = 4;
+        BOT_FEEDBACK_NEGATIVE_SAFE = 5;
+        BOT_FEEDBACK_NEGATIVE_OTHER = 6;
+    }
+    optional MessageKey messageKey = 1;
+    optional BotFeedbackKind kind = 2;
+    optional string text = 3;
+}
+
 message AudioMessage {
     optional string url = 1;
     optional string mimetype = 2;
@@ -729,12 +706,20 @@ message GroupMention {
 }
 
 message DisappearingMode {
+    enum Trigger {
+        UNKNOWN = 0;
+        CHAT_SETTING = 1;
+        ACCOUNT_SETTING = 2;
+        BULK_CHANGE = 3;
+    }
     enum Initiator {
         CHANGED_IN_CHAT = 0;
         INITIATED_BY_ME = 1;
         INITIATED_BY_OTHER = 2;
     }
     optional Initiator initiator = 1;
+    optional Trigger trigger = 2;
+    optional string initiatorDeviceJid = 3;
 }
 
 message DeviceListMetadata {
@@ -752,6 +737,12 @@ message ContextInfo {
         optional string utmCampaign = 2;
     }
     
+    message ForwardedNewsletterMessageInfo {
+        optional string newsletterJid = 1;
+        optional int32 serverMessageId = 2;
+        optional string newsletterName = 3;
+    }
+    
     message ExternalAdReplyInfo {
         enum MediaType {
             NONE = 0;
@@ -771,6 +762,11 @@ message ContextInfo {
         optional bool renderLargerThumbnail = 11;
         optional bool showAdAttribution = 12;
         optional string ctwaClid = 13;
+        optional string ref = 14;
+    }
+    
+    message BusinessMessageForwardInfo {
+        optional string businessOwnerJid = 1;
     }
     
     message AdReplyInfo {
@@ -813,6 +809,27 @@ message ContextInfo {
     optional bool isSampled = 39;
     repeated GroupMention groupMentions = 40;
     optional UTMInfo utm = 41;
+    optional ForwardedNewsletterMessageInfo forwardedNewsletterMessageInfo = 43;
+    optional BusinessMessageForwardInfo businessMessageForwardInfo = 44;
+    optional string smbClientCampaignId = 45;
+}
+
+message BotPluginMetadata {
+    optional bool isPlaceholder = 1;
+}
+
+message BotMetadata {
+    optional BotAvatarMetadata avatarMetadata = 1;
+    optional string personaId = 2;
+    optional BotPluginMetadata pluginMetadata = 3;
+}
+
+message BotAvatarMetadata {
+    optional uint32 sentiment = 1;
+    optional string behaviorGraph = 2;
+    optional uint32 action = 3;
+    optional uint32 intensity = 4;
+    optional uint32 wordCount = 5;
 }
 
 message ActionLink {
@@ -935,10 +952,18 @@ message Message {
     optional PollCreationMessage pollCreationMessageV2 = 60;
     optional ScheduledCallCreationMessage scheduledCallCreationMessage = 61;
     optional FutureProofMessage groupMentionedMessage = 62;
-    optional PinMessage pinMessage = 63;
+    optional PinInChatMessage pinInChatMessage = 63;
     optional PollCreationMessage pollCreationMessageV3 = 64;
     optional ScheduledCallEditMessage scheduledCallEditMessage = 65;
     optional VideoMessage ptvMessage = 66;
+    optional FutureProofMessage botInvokeMessage = 67;
+    optional EncCommentMessage encCommentMessage = 68;
+}
+
+message MessageSecretMessage {
+    optional sfixed32 version = 1;
+    optional bytes encIv = 2;
+    optional bytes encPayload = 3;
 }
 
 message MessageContextInfo {
@@ -946,6 +971,9 @@ message MessageContextInfo {
     optional int32 deviceListMetadataVersion = 2;
     optional bytes messageSecret = 3;
     optional bytes paddingBytes = 4;
+    optional uint32 messageAddOnDurationInSecs = 5;
+    optional bytes botMessageSecret = 6;
+    optional BotMetadata botMetadata = 7;
 }
 
 message VideoMessage {
@@ -1048,6 +1076,7 @@ message StickerMessage {
     optional ContextInfo contextInfo = 17;
     optional int64 stickerSentTs = 18;
     optional bool isAvatar = 19;
+    optional bool isAiSticker = 20;
 }
 
 message SenderKeyDistributionMessage {
@@ -1117,6 +1146,8 @@ message ProtocolMessage {
         MESSAGE_EDIT = 14;
         PEER_DATA_OPERATION_REQUEST_MESSAGE = 16;
         PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE = 17;
+        REQUEST_WELCOME_MESSAGE = 18;
+        BOT_FEEDBACK_MESSAGE = 19;
     }
     optional MessageKey key = 1;
     optional Type type = 2;
@@ -1132,6 +1163,7 @@ message ProtocolMessage {
     optional int64 timestampMs = 15;
     optional PeerDataOperationRequestMessage peerDataOperationRequestMessage = 16;
     optional PeerDataOperationRequestResponseMessage peerDataOperationRequestResponseMessage = 17;
+    optional BotFeedbackMessage botFeedbackMessage = 18;
 }
 
 message ProductMessage {
@@ -1194,14 +1226,14 @@ message PollCreationMessage {
     optional ContextInfo contextInfo = 5;
 }
 
-message PinMessage {
-    enum PinMessageType {
-        UNKNOWN_PIN_MESSAGE_TYPE = 0;
+message PinInChatMessage {
+    enum Type {
+        UNKNOWN_TYPE = 0;
         PIN_FOR_ALL = 1;
         UNPIN_FOR_ALL = 2;
     }
     optional MessageKey key = 1;
-    optional PinMessageType pinMessageType = 2;
+    optional Type type = 2;
     optional int64 senderTimestampMs = 3;
 }
 
@@ -1210,10 +1242,25 @@ enum PeerDataOperationRequestType {
     SEND_RECENT_STICKER_BOOTSTRAP = 1;
     GENERATE_LINK_PREVIEW = 2;
     HISTORY_SYNC_ON_DEMAND = 3;
+    PLACEHOLDER_MESSAGE_RESEND = 4;
 }
 message PeerDataOperationRequestResponseMessage {
     message PeerDataOperationResult {
+        message PlaceholderMessageResendResponse {
+            optional bytes webMessageInfoBytes = 1;
+        }
+        
         message LinkPreviewResponse {
+            message LinkPreviewHighQualityThumbnail {
+                optional string directPath = 1;
+                optional string thumbHash = 2;
+                optional string encThumbHash = 3;
+                optional bytes mediaKey = 4;
+                optional int64 mediaKeyTimestampMs = 5;
+                optional int32 thumbWidth = 6;
+                optional int32 thumbHeight = 7;
+            }
+            
             optional string url = 1;
             optional string title = 2;
             optional string description = 3;
@@ -1221,11 +1268,13 @@ message PeerDataOperationRequestResponseMessage {
             optional string canonicalUrl = 5;
             optional string matchText = 6;
             optional string previewType = 7;
+            optional LinkPreviewHighQualityThumbnail hqThumbnail = 8;
         }
         
         optional MediaRetryNotification.ResultType mediaUploadResult = 1;
         optional StickerMessage stickerMessage = 2;
         optional LinkPreviewResponse linkPreviewResponse = 3;
+        optional PlaceholderMessageResendResponse placeholderMessageResendResponse = 4;
     }
     
     optional PeerDataOperationRequestType peerDataOperationRequestType = 1;
@@ -1233,6 +1282,82 @@ message PeerDataOperationRequestResponseMessage {
     repeated PeerDataOperationResult peerDataOperationResult = 3;
 }
 
+message PeerDataOperationRequestMessage {
+    message RequestUrlPreview {
+        optional string url = 1;
+        optional bool includeHqThumbnail = 2;
+    }
+    
+    message RequestStickerReupload {
+        optional string fileSha256 = 1;
+    }
+    
+    message PlaceholderMessageResendRequest {
+        optional MessageKey messageKey = 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;
+    repeated PlaceholderMessageResendRequest placeholderMessageResendRequest = 5;
+}
+
+message PaymentInviteMessage {
+    enum ServiceType {
+        UNKNOWN = 0;
+        FBPAY = 1;
+        NOVI = 2;
+        UPI = 3;
+    }
+    optional ServiceType serviceType = 1;
+    optional int64 expiryTimestamp = 2;
+}
+
+message OrderMessage {
+    enum OrderSurface {
+        CATALOG = 1;
+    }
+    enum OrderStatus {
+        INQUIRY = 1;
+    }
+    optional string orderId = 1;
+    optional bytes thumbnail = 2;
+    optional int32 itemCount = 3;
+    optional OrderStatus status = 4;
+    optional OrderSurface surface = 5;
+    optional string message = 6;
+    optional string orderTitle = 7;
+    optional string sellerJid = 8;
+    optional string token = 9;
+    optional int64 totalAmount1000 = 10;
+    optional string totalCurrencyCode = 11;
+    optional ContextInfo contextInfo = 17;
+}
+
+message LocationMessage {
+    optional double degreesLatitude = 1;
+    optional double degreesLongitude = 2;
+    optional string name = 3;
+    optional string address = 4;
+    optional string url = 5;
+    optional bool isLive = 6;
+    optional uint32 accuracyInMeters = 7;
+    optional float speedInMps = 8;
+    optional uint32 degreesClockwiseFromMagneticNorth = 9;
+    optional string comment = 11;
+    optional bytes jpegThumbnail = 16;
+    optional ContextInfo contextInfo = 17;
+}
+
 message EphemeralSetting {
     optional sfixed32 duration = 1;
     optional sfixed64 timestamp = 2;
@@ -1277,6 +1402,15 @@ message PastParticipant {
     optional uint64 leaveTs = 3;
 }
 
+message NotificationSettings {
+    optional string messageVibrate = 1;
+    optional string messagePopup = 2;
+    optional string messageLight = 3;
+    optional bool lowPriorityNotifications = 4;
+    optional bool reactionsMuted = 5;
+    optional string callVibrate = 6;
+}
+
 enum MediaVisibility {
     DEFAULT = 0;
     OFF = 1;
@@ -1332,12 +1466,20 @@ message GlobalSettings {
     optional int32 disappearingModeDuration = 9;
     optional int64 disappearingModeTimestamp = 10;
     optional AvatarUserSettings avatarUserSettings = 11;
+    optional int32 fontSize = 12;
+    optional bool securityNotifications = 13;
+    optional bool autoUnarchiveChats = 14;
+    optional int32 videoQualityMode = 15;
+    optional int32 photoQualityMode = 16;
+    optional NotificationSettings individualNotificationSettings = 17;
+    optional NotificationSettings groupNotificationSettings = 18;
 }
 
 message Conversation {
     enum EndOfHistoryTransferType {
         COMPLETE_BUT_MORE_MESSAGES_REMAIN_ON_PRIMARY = 0;
         COMPLETE_AND_NO_MORE_MESSAGE_REMAIN_ON_PRIMARY = 1;
+        COMPLETE_ON_DEMAND_SYNC_BUT_MORE_MSG_REMAIN_ON_PRIMARY = 2;
     }
     required string id = 1;
     repeated HistorySyncMsg messages = 2;
@@ -1395,50 +1537,6 @@ message AutoDownloadSettings {
     optional bool downloadDocuments = 4;
 }
 
-// Duplicate type omitted
-//message PollEncValue {
-//    optional bytes encPayload = 1;
-//    optional bytes encIv = 2;
-//}
-
-message MsgRowOpaqueData {
-    optional MsgOpaqueData currentMsg = 1;
-    optional MsgOpaqueData quotedMsg = 2;
-}
-
-message MsgOpaqueData {
-    message PollOption {
-        optional string name = 1;
-    }
-    
-    optional string body = 1;
-    optional string caption = 3;
-    optional double lng = 5;
-    optional bool isLive = 6;
-    optional double lat = 7;
-    optional int32 paymentAmount1000 = 8;
-    optional string paymentNoteMsgBody = 9;
-    optional string canonicalUrl = 10;
-    optional string matchedText = 11;
-    optional string title = 12;
-    optional string description = 13;
-    optional bytes futureproofBuffer = 14;
-    optional string clientUrl = 15;
-    optional string loc = 16;
-    optional string pollName = 17;
-    repeated PollOption pollOptions = 18;
-    optional uint32 pollSelectableOptionsCount = 20;
-    optional bytes messageSecret = 21;
-    optional string originalSelfAuthor = 51;
-    optional int64 senderTimestampMs = 22;
-    optional string pollUpdateParentKey = 23;
-    optional PollEncValue encPollVote = 24;
-    optional bool isSentCagPollCreation = 28;
-    optional string encReactionTargetMessageKey = 25;
-    optional bytes encReactionEncPayload = 26;
-    optional bytes encReactionEncIv = 27;
-}
-
 message ServerErrorReceipt {
     optional string stanzaId = 1;
 }
@@ -1570,6 +1668,10 @@ message SyncActionValue {
     optional ChatAssignmentAction chatAssignment = 35;
     optional ChatAssignmentOpenedStatusAction chatAssignmentOpenedStatus = 36;
     optional PnForLidChatAction pnForLidChatAction = 37;
+    optional MarketingMessageAction marketingMessageAction = 38;
+    optional MarketingMessageBroadcastAction marketingMessageBroadcastAction = 39;
+    optional ExternalWebBetaAction externalWebBetaAction = 40;
+    optional PrivacySettingRelayAllCalls privacySettingRelayAllCalls = 41;
 }
 
 message UserStatusMuteAction {
@@ -1642,6 +1744,10 @@ message PushNameSetting {
     optional string name = 1;
 }
 
+message PrivacySettingRelayAllCalls {
+    optional bool isEnabled = 1;
+}
+
 message PrimaryVersionAction {
     optional string version = 1;
 }
@@ -1668,6 +1774,23 @@ message MuteAction {
     optional bool autoMuted = 3;
 }
 
+message MarketingMessageBroadcastAction {
+    optional int32 repliedCount = 1;
+}
+
+message MarketingMessageAction {
+    enum MarketingMessagePrototypeType {
+        PERSONALIZED = 0;
+    }
+    optional string name = 1;
+    optional string message = 2;
+    optional MarketingMessagePrototypeType type = 3;
+    optional int64 createdAt = 4;
+    optional int64 lastSentAt = 5;
+    optional bool isDeleted = 6;
+    optional string mediaId = 7;
+}
+
 message MarkChatAsReadAction {
     optional bool read = 1;
     optional SyncActionMessageRange messageRange = 2;
@@ -1692,6 +1815,10 @@ message KeyExpiration {
     optional int32 expiredKeyEpoch = 1;
 }
 
+message ExternalWebBetaAction {
+    optional bool isOptIn = 1;
+}
+
 message DeleteMessageForMeAction {
     optional bool deleteMedia = 1;
     optional int64 messageTimestamp = 2;
@@ -1903,6 +2030,14 @@ message ClientPayload {
             ARDEVICE = 30;
             VRDEVICE = 31;
             BLUE_WEB = 32;
+            IPAD = 33;
+        }
+        enum DeviceType {
+            PHONE = 0;
+            TABLET = 1;
+            DESKTOP = 2;
+            WEARABLE = 3;
+            VR = 4;
         }
         message AppVersion {
             optional uint32 primary = 1;
@@ -1925,12 +2060,21 @@ message ClientPayload {
         optional string localeLanguageIso6391 = 11;
         optional string localeCountryIso31661Alpha2 = 12;
         optional string deviceBoard = 13;
+        optional string deviceExpId = 14;
+        optional DeviceType deviceType = 15;
     }
     
     enum Product {
         WHATSAPP = 0;
         MESSENGER = 1;
+        INTEROP = 2;
     }
+    message InteropData {
+        optional uint64 accountId = 1;
+        optional uint32 integratorId = 2;
+        optional bytes token = 3;
+    }
+    
     enum IOSAppExtension {
         SHARE_EXTENSION = 0;
         SERVICE_EXTENSION = 1;
@@ -1983,6 +2127,7 @@ message ClientPayload {
         ERROR_RECONNECT = 3;
         NETWORK_SWITCH = 4;
         PING_RECONNECT = 5;
+        UNKNOWN = 6;
     }
     optional uint64 username = 1;
     optional bool passive = 3;
@@ -2010,6 +2155,7 @@ message ClientPayload {
     optional bytes paddingBytes = 34;
     optional int32 yearClass = 36;
     optional int32 memClass = 37;
+    optional InteropData interopData = 38;
 }
 
 message WebNotificationsInfo {
@@ -2183,6 +2329,30 @@ message WebMessageInfo {
         CAG_INVITE_AUTO_ADD = 159;
         BIZ_CHAT_ASSIGNMENT_UNASSIGN = 160;
         CAG_INVITE_AUTO_JOINED = 161;
+        SCHEDULED_CALL_START_MESSAGE = 162;
+        COMMUNITY_INVITE_RICH = 163;
+        COMMUNITY_INVITE_AUTO_ADD_RICH = 164;
+        SUB_GROUP_INVITE_RICH = 165;
+        SUB_GROUP_PARTICIPANT_ADD_RICH = 166;
+        COMMUNITY_LINK_PARENT_GROUP_RICH = 167;
+        COMMUNITY_PARTICIPANT_ADD_RICH = 168;
+        SILENCED_UNKNOWN_CALLER_AUDIO = 169;
+        SILENCED_UNKNOWN_CALLER_VIDEO = 170;
+        GROUP_MEMBER_ADD_MODE = 171;
+        GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD = 172;
+        COMMUNITY_CHANGE_DESCRIPTION = 173;
+        SENDER_INVITE = 174;
+        RECEIVER_INVITE = 175;
+        COMMUNITY_ALLOW_MEMBER_ADDED_GROUPS = 176;
+        PINNED_MESSAGE_IN_CHAT = 177;
+        PAYMENT_INVITE_SETUP_INVITER = 178;
+        PAYMENT_INVITE_SETUP_INVITEE_RECEIVE_ONLY = 179;
+        PAYMENT_INVITE_SETUP_INVITEE_SEND_AND_RECEIVE = 180;
+        LINKED_GROUP_CALL_START = 181;
+        REPORT_TO_ADMIN_ENABLED_STATUS = 182;
+        EMPTY_SUBGROUP_CREATE = 183;
+        SCHEDULED_CALL_CANCEL = 184;
+        SUBGROUP_ADMIN_TRIGGERED_AUTO_ADD_RICH = 185;
     }
     enum Status {
         ERROR = 0;
@@ -2241,6 +2411,7 @@ message WebMessageInfo {
     optional KeepInChat keepInChat = 50;
     optional string originalSelfAuthorUserJidString = 51;
     optional uint64 revokeMessageTimestamp = 52;
+    optional PinInChat pinInChat = 54;
 }
 
 message WebFeatures {
@@ -2331,6 +2502,19 @@ message PollAdditionalMetadata {
     optional bool pollInvalidated = 1;
 }
 
+message PinInChat {
+    enum Type {
+        UNKNOWN_TYPE = 0;
+        PIN_FOR_ALL = 1;
+        UNPIN_FOR_ALL = 2;
+    }
+    optional Type type = 1;
+    optional MessageKey key = 2;
+    optional int64 senderTimestampMs = 3;
+    optional int64 serverTimestampMs = 4;
+    optional MessageAddOnContextInfo messageAddOnContextInfo = 5;
+}
+
 message PhotoChange {
     optional bytes oldPhoto = 1;
     optional bytes newPhoto = 2;
@@ -2412,6 +2596,10 @@ message NotificationMessageInfo {
     optional string participant = 4;
 }
 
+message MessageAddOnContextInfo {
+    optional uint32 messageAddOnDurationInSecs = 1;
+}
+
 message MediaData {
     optional string localPath = 1;
 }
diff --git a/vendor/go.mau.fi/whatsmeow/client.go b/vendor/go.mau.fi/whatsmeow/client.go
index 86581198..ebaf90cc 100644
--- a/vendor/go.mau.fi/whatsmeow/client.go
+++ b/vendor/go.mau.fi/whatsmeow/client.go
@@ -9,7 +9,6 @@ package whatsmeow
 
 import (
 	"context"
-	"crypto/rand"
 	"encoding/hex"
 	"errors"
 	"fmt"
@@ -29,6 +28,7 @@ import (
 	"go.mau.fi/whatsmeow/types/events"
 	"go.mau.fi/whatsmeow/util/keys"
 	waLog "go.mau.fi/whatsmeow/util/log"
+	"go.mau.fi/whatsmeow/util/randbytes"
 )
 
 // EventHandler is a function that can handle events from WhatsApp.
@@ -65,6 +65,10 @@ type Client struct {
 	// even when re-syncing the whole state.
 	EmitAppStateEventsOnFullSync bool
 
+	AutomaticMessageRerequestFromPhone bool
+	pendingPhoneRerequests             map[types.MessageID]context.CancelFunc
+	pendingPhoneRerequestsLock         sync.RWMutex
+
 	appStateProc     *appstate.Processor
 	appStateSyncLock sync.Mutex
 
@@ -130,6 +134,8 @@ type Client struct {
 	// Should SubscribePresence return an error if no privacy token is stored for the user?
 	ErrorOnSubscribePresenceWithoutToken bool
 
+	phoneLinkingCache *phoneLinkingCache
+
 	uniqueID  string
 	idCounter uint32
 
@@ -161,8 +167,7 @@ func NewClient(deviceStore *store.Device, log waLog.Logger) *Client {
 	if log == nil {
 		log = waLog.Noop
 	}
-	randomBytes := make([]byte, 2)
-	_, _ = rand.Read(randomBytes)
+	uniqueIDPrefix := randbytes.Make(2)
 	cli := &Client{
 		http: &http.Client{
 			Transport: (http.DefaultTransport.(*http.Transport)).Clone(),
@@ -172,7 +177,7 @@ func NewClient(deviceStore *store.Device, log waLog.Logger) *Client {
 		Log:             log,
 		recvLog:         log.Sub("Recv"),
 		sendLog:         log.Sub("Send"),
-		uniqueID:        fmt.Sprintf("%d.%d-", randomBytes[0], randomBytes[1]),
+		uniqueID:        fmt.Sprintf("%d.%d-", uniqueIDPrefix[0], uniqueIDPrefix[1]),
 		responseWaiters: make(map[string]chan<- *waBinary.Node),
 		eventHandlers:   make([]wrappedEventHandler, 0, 1),
 		messageRetries:  make(map[string]int),
@@ -190,6 +195,8 @@ 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),
 
+		pendingPhoneRerequests: make(map[types.MessageID]context.CancelFunc),
+
 		EnableAutoReconnect:   true,
 		AutoTrustIdentity:     true,
 		DontSendSelfBroadcast: true,
@@ -547,17 +554,46 @@ func (cli *Client) handleFrame(data []byte) {
 				cli.handlerQueue <- node
 			}()
 		}
-	} else {
+	} else if node.Tag != "ack" {
 		cli.Log.Debugf("Didn't handle WhatsApp node %s", node.Tag)
 	}
 }
 
+func stopAndDrainTimer(timer *time.Timer) {
+	if !timer.Stop() {
+		select {
+		case <-timer.C:
+		default:
+		}
+	}
+}
+
 func (cli *Client) handlerQueueLoop(ctx context.Context) {
+	timer := time.NewTimer(5 * time.Minute)
+	stopAndDrainTimer(timer)
+	cli.Log.Debugf("Starting handler queue loop")
 	for {
 		select {
 		case node := <-cli.handlerQueue:
-			cli.nodeHandlers[node.Tag](node)
+			doneChan := make(chan struct{}, 1)
+			go func() {
+				start := time.Now()
+				cli.nodeHandlers[node.Tag](node)
+				duration := time.Since(start)
+				doneChan <- struct{}{}
+				if duration > 5*time.Second {
+					cli.Log.Warnf("Node handling took %s for %s", duration, node.XMLString())
+				}
+			}()
+			timer.Reset(5 * time.Minute)
+			select {
+			case <-doneChan:
+				stopAndDrainTimer(timer)
+			case <-timer.C:
+				cli.Log.Warnf("Node handling is taking long for %s - continuing in background", node.XMLString())
+			}
 		case <-ctx.Done():
+			cli.Log.Debugf("Closing handler queue loop")
 			return
 		}
 	}
@@ -609,6 +645,13 @@ func (cli *Client) dispatchEvent(evt interface{}) {
 //		yourNormalEventHandler(evt)
 //	}
 func (cli *Client) ParseWebMessage(chatJID types.JID, webMsg *waProto.WebMessageInfo) (*events.Message, error) {
+	var err error
+	if chatJID.IsEmpty() {
+		chatJID, err = types.ParseJID(webMsg.GetKey().GetRemoteJid())
+		if err != nil {
+			return nil, fmt.Errorf("no chat JID provided and failed to parse remote JID: %w", err)
+		}
+	}
 	info := types.MessageInfo{
 		MessageSource: types.MessageSource{
 			Chat:     chatJID,
@@ -619,7 +662,6 @@ func (cli *Client) ParseWebMessage(chatJID types.JID, webMsg *waProto.WebMessage
 		PushName:  webMsg.GetPushName(),
 		Timestamp: time.Unix(int64(webMsg.GetMessageTimestamp()), 0),
 	}
-	var err error
 	if info.IsFromMe {
 		info.Sender = cli.getOwnID().ToNonAD()
 		if info.Sender.IsEmpty() {
@@ -638,8 +680,9 @@ func (cli *Client) ParseWebMessage(chatJID types.JID, webMsg *waProto.WebMessage
 		return nil, fmt.Errorf("failed to parse sender of message %s: %v", info.ID, err)
 	}
 	evt := &events.Message{
-		RawMessage: webMsg.GetMessage(),
-		Info:       info,
+		RawMessage:   webMsg.GetMessage(),
+		SourceWebMsg: webMsg,
+		Info:         info,
 	}
 	evt.UnwrapRaw()
 	return evt, nil
diff --git a/vendor/go.mau.fi/whatsmeow/connectionevents.go b/vendor/go.mau.fi/whatsmeow/connectionevents.go
index 3a6d9e29..c20fe42a 100644
--- a/vendor/go.mau.fi/whatsmeow/connectionevents.go
+++ b/vendor/go.mau.fi/whatsmeow/connectionevents.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	waBinary "go.mau.fi/whatsmeow/binary"
+	"go.mau.fi/whatsmeow/store"
 	"go.mau.fi/whatsmeow/types"
 	"go.mau.fi/whatsmeow/types/events"
 )
@@ -79,9 +80,17 @@ func (cli *Client) handleIB(node *waBinary.Node) {
 func (cli *Client) handleConnectFailure(node *waBinary.Node) {
 	ag := node.AttrGetter()
 	reason := events.ConnectFailureReason(ag.Int("reason"))
-	// Let the auto-reconnect happen for 503s, for all other failures block it
-	if reason != events.ConnectFailureServiceUnavailable {
+	message := ag.OptionalString("message")
+	willAutoReconnect := true
+	switch {
+	default:
+		// By default, expect a disconnect (i.e. prevent auto-reconnect)
 		cli.expectDisconnect()
+		willAutoReconnect = false
+	case reason == events.ConnectFailureServiceUnavailable:
+		// Auto-reconnect for 503s
+	case reason == 500 && message == "biz vname fetch error":
+		// These happen for business accounts randomly, also auto-reconnect
 	}
 	if reason.IsLoggedOut() {
 		cli.Log.Infof("Got %s connect failure, sending LoggedOut event and deleting session", reason)
@@ -97,13 +106,13 @@ func (cli *Client) handleConnectFailure(node *waBinary.Node) {
 			Expire: time.Duration(ag.Int("expire")) * time.Second,
 		})
 	} else if reason == events.ConnectFailureClientOutdated {
-		cli.Log.Errorf("Client outdated (405) connect failure")
+		cli.Log.Errorf("Client outdated (405) connect failure (client version: %s)", store.GetWAVersion().String())
 		go cli.dispatchEvent(&events.ClientOutdated{})
-	} else if reason == events.ConnectFailureServiceUnavailable {
-		cli.Log.Warnf("Got 503 connect failure, assuming automatic reconnect will handle it")
+	} else if willAutoReconnect {
+		cli.Log.Warnf("Got %d/%s connect failure, assuming automatic reconnect will handle it", int(reason), message)
 	} else {
 		cli.Log.Warnf("Unknown connect failure: %s", node.XMLString())
-		go cli.dispatchEvent(&events.ConnectFailure{Reason: reason, Raw: node})
+		go cli.dispatchEvent(&events.ConnectFailure{Reason: reason, Message: message, Raw: node})
 	}
 }
 
diff --git a/vendor/go.mau.fi/whatsmeow/download.go b/vendor/go.mau.fi/whatsmeow/download.go
index e9bedd45..3e510be6 100644
--- a/vendor/go.mau.fi/whatsmeow/download.go
+++ b/vendor/go.mau.fi/whatsmeow/download.go
@@ -12,8 +12,10 @@ import (
 	"encoding/base64"
 	"fmt"
 	"io"
+	"net"
 	"net/http"
 	"strings"
+	"time"
 
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
@@ -233,7 +235,7 @@ func (cli *Client) DownloadMediaWithPath(directPath string, encFileHash, fileHas
 func (cli *Client) downloadAndDecrypt(url string, mediaKey []byte, appInfo MediaType, fileLength int, fileEncSha256, fileSha256 []byte) (data []byte, err error) {
 	iv, cipherKey, macKey, _ := getMediaKeys(mediaKey, appInfo)
 	var ciphertext, mac []byte
-	if ciphertext, mac, err = cli.downloadEncryptedMedia(url, fileEncSha256); err != nil {
+	if ciphertext, mac, err = cli.downloadEncryptedMediaWithRetries(url, fileEncSha256); err != nil {
 
 	} else if err = validateMedia(iv, ciphertext, macKey, mac); err != nil {
 
@@ -252,6 +254,23 @@ func getMediaKeys(mediaKey []byte, appInfo MediaType) (iv, cipherKey, macKey, re
 	return mediaKeyExpanded[:16], mediaKeyExpanded[16:48], mediaKeyExpanded[48:80], mediaKeyExpanded[80:]
 }
 
+func (cli *Client) downloadEncryptedMediaWithRetries(url string, checksum []byte) (file, mac []byte, err error) {
+	for retryNum := 0; retryNum < 5; retryNum++ {
+		file, mac, err = cli.downloadEncryptedMedia(url, checksum)
+		if err == nil {
+			return
+		}
+		netErr, ok := err.(net.Error)
+		if !ok {
+			// Not a network error, don't retry
+			return
+		}
+		cli.Log.Warnf("Failed to download media due to network error: %w, retrying...", netErr)
+		time.Sleep(time.Duration(retryNum+1) * time.Second)
+	}
+	return
+}
+
 func (cli *Client) downloadEncryptedMedia(url string, checksum []byte) (file, mac []byte, err error) {
 	var req *http.Request
 	req, err = http.NewRequest(http.MethodGet, url, nil)
@@ -268,7 +287,9 @@ func (cli *Client) downloadEncryptedMedia(url string, checksum []byte) (file, ma
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
-		if resp.StatusCode == http.StatusNotFound {
+		if resp.StatusCode == http.StatusForbidden {
+			err = ErrMediaDownloadFailedWith403
+		} else if resp.StatusCode == http.StatusNotFound {
 			err = ErrMediaDownloadFailedWith404
 		} else if resp.StatusCode == http.StatusGone {
 			err = ErrMediaDownloadFailedWith410
diff --git a/vendor/go.mau.fi/whatsmeow/errors.go b/vendor/go.mau.fi/whatsmeow/errors.go
index 62227f3b..a5182eef 100644
--- a/vendor/go.mau.fi/whatsmeow/errors.go
+++ b/vendor/go.mau.fi/whatsmeow/errors.go
@@ -29,6 +29,8 @@ var (
 	ErrNoPushName = errors.New("can't send presence without PushName set")
 
 	ErrNoPrivacyToken = errors.New("no privacy token stored")
+
+	ErrAppStateUpdate = errors.New("server returned error updating app state")
 )
 
 // Errors that happen while confirming device pairing
@@ -107,6 +109,7 @@ var (
 
 // Some errors that Client.Download can return
 var (
+	ErrMediaDownloadFailedWith403 = errors.New("download failed with status code 403")
 	ErrMediaDownloadFailedWith404 = errors.New("download failed with status code 404")
 	ErrMediaDownloadFailedWith410 = errors.New("download failed with status code 410")
 	ErrNoURLPresent               = errors.New("no url present")
diff --git a/vendor/go.mau.fi/whatsmeow/group.go b/vendor/go.mau.fi/whatsmeow/group.go
index c771b5a2..c8f80560 100644
--- a/vendor/go.mau.fi/whatsmeow/group.go
+++ b/vendor/go.mau.fi/whatsmeow/group.go
@@ -57,7 +57,7 @@ func (cli *Client) CreateGroup(req ReqCreateGroup) (*types.GroupInfo, error) {
 		}
 	}
 	if req.CreateKey == "" {
-		req.CreateKey = GenerateMessageID()
+		req.CreateKey = cli.GenerateMessageID()
 	}
 	if req.IsParent {
 		if req.DefaultMembershipApprovalMode == "" {
@@ -99,7 +99,7 @@ func (cli *Client) CreateGroup(req ReqCreateGroup) (*types.GroupInfo, error) {
 func (cli *Client) UnlinkGroup(parent, child types.JID) error {
 	_, err := cli.sendGroupIQ(context.TODO(), iqSet, parent, waBinary.Node{
 		Tag:   "unlink",
-		Attrs: waBinary.Attrs{"unlink_type": types.GroupLinkChangeTypeSub},
+		Attrs: waBinary.Attrs{"unlink_type": string(types.GroupLinkChangeTypeSub)},
 		Content: []waBinary.Node{{
 			Tag:   "group",
 			Attrs: waBinary.Attrs{"jid": child},
@@ -116,7 +116,7 @@ func (cli *Client) LinkGroup(parent, child types.JID) error {
 		Tag: "links",
 		Content: []waBinary.Node{{
 			Tag:   "link",
-			Attrs: waBinary.Attrs{"link_type": types.GroupLinkChangeTypeSub},
+			Attrs: waBinary.Attrs{"link_type": string(types.GroupLinkChangeTypeSub)},
 			Content: []waBinary.Node{{
 				Tag:   "group",
 				Attrs: waBinary.Attrs{"jid": child},
@@ -221,7 +221,7 @@ func (cli *Client) SetGroupName(jid types.JID, name string) error {
 //
 // The previousID and newID fields are optional. If the previous ID is not specified, this will
 // automatically fetch the current group info to find the previous topic ID. If the new ID is not
-// specified, one will be generated with GenerateMessageID().
+// specified, one will be generated with Client.GenerateMessageID().
 func (cli *Client) SetGroupTopic(jid types.JID, previousID, newID, topic string) error {
 	if previousID == "" {
 		oldInfo, err := cli.GetGroupInfo(jid)
@@ -231,7 +231,7 @@ func (cli *Client) SetGroupTopic(jid types.JID, previousID, newID, topic string)
 		previousID = oldInfo.TopicID
 	}
 	if newID == "" {
-		newID = GenerateMessageID()
+		newID = cli.GenerateMessageID()
 	}
 	attrs := waBinary.Attrs{
 		"id": newID,
diff --git a/vendor/go.mau.fi/whatsmeow/internals.go b/vendor/go.mau.fi/whatsmeow/internals.go
index f71e71e5..8227b0ce 100644
--- a/vendor/go.mau.fi/whatsmeow/internals.go
+++ b/vendor/go.mau.fi/whatsmeow/internals.go
@@ -10,6 +10,7 @@ import (
 	"context"
 
 	waBinary "go.mau.fi/whatsmeow/binary"
+	"go.mau.fi/whatsmeow/types"
 )
 
 type DangerousInternalClient struct {
@@ -62,6 +63,6 @@ func (int *DangerousInternalClient) RequestAppStateKeys(ctx context.Context, key
 	int.c.requestAppStateKeys(ctx, keyIDs)
 }
 
-func (int *DangerousInternalClient) SendRetryReceipt(node *waBinary.Node, forceIncludeIdentity bool) {
-	int.c.sendRetryReceipt(node, forceIncludeIdentity)
+func (int *DangerousInternalClient) SendRetryReceipt(node *waBinary.Node, info *types.MessageInfo, forceIncludeIdentity bool) {
+	int.c.sendRetryReceipt(node, info, forceIncludeIdentity)
 }
diff --git a/vendor/go.mau.fi/whatsmeow/keepalive.go b/vendor/go.mau.fi/whatsmeow/keepalive.go
index d5e40286..48510a12 100644
--- a/vendor/go.mau.fi/whatsmeow/keepalive.go
+++ b/vendor/go.mau.fi/whatsmeow/keepalive.go
@@ -23,10 +23,13 @@ var (
 	KeepAliveIntervalMin = 20 * time.Second
 	// KeepAliveIntervalMax specifies the maximum interval for websocket keepalive pings.
 	KeepAliveIntervalMax = 30 * time.Second
+
+	// KeepAliveMaxFailTime specifies the maximum time to wait before forcing a reconnect if keepalives fail repeatedly.
+	KeepAliveMaxFailTime = 3 * time.Minute
 )
 
 func (cli *Client) keepAliveLoop(ctx context.Context) {
-	var lastSuccess time.Time
+	lastSuccess := time.Now()
 	var errorCount int
 	for {
 		interval := rand.Int63n(KeepAliveIntervalMax.Milliseconds()-KeepAliveIntervalMin.Milliseconds()) + KeepAliveIntervalMin.Milliseconds()
@@ -41,6 +44,11 @@ func (cli *Client) keepAliveLoop(ctx context.Context) {
 					ErrorCount:  errorCount,
 					LastSuccess: lastSuccess,
 				})
+				if cli.EnableAutoReconnect && time.Since(lastSuccess) > KeepAliveMaxFailTime {
+					cli.Log.Debugf("Forcing reconnect due to keepalive failure")
+					cli.Disconnect()
+					go cli.autoReconnect()
+				}
 			} else {
 				if errorCount > 0 {
 					errorCount = 0
diff --git a/vendor/go.mau.fi/whatsmeow/mediaretry.go b/vendor/go.mau.fi/whatsmeow/mediaretry.go
index 167df5f2..dfbffe26 100644
--- a/vendor/go.mau.fi/whatsmeow/mediaretry.go
+++ b/vendor/go.mau.fi/whatsmeow/mediaretry.go
@@ -7,7 +7,6 @@
 package whatsmeow
 
 import (
-	"crypto/rand"
 	"fmt"
 
 	"google.golang.org/protobuf/proto"
@@ -18,6 +17,7 @@ import (
 	"go.mau.fi/whatsmeow/types/events"
 	"go.mau.fi/whatsmeow/util/gcmutil"
 	"go.mau.fi/whatsmeow/util/hkdfutil"
+	"go.mau.fi/whatsmeow/util/randbytes"
 )
 
 func getMediaRetryKey(mediaKey []byte) (cipherKey []byte) {
@@ -34,11 +34,7 @@ func encryptMediaRetryReceipt(messageID types.MessageID, mediaKey []byte) (ciphe
 		err = fmt.Errorf("failed to marshal payload: %w", err)
 		return
 	}
-	iv = make([]byte, 12)
-	_, err = rand.Read(iv)
-	if err != nil {
-		panic(err)
-	}
+	iv = randbytes.Make(12)
 	ciphertext, err = gcmutil.Encrypt(getMediaRetryKey(mediaKey), iv, plaintext, []byte(messageID))
 	return
 }
diff --git a/vendor/go.mau.fi/whatsmeow/message.go b/vendor/go.mau.fi/whatsmeow/message.go
index b3ef53b6..fd22c9be 100644
--- a/vendor/go.mau.fi/whatsmeow/message.go
+++ b/vendor/go.mau.fi/whatsmeow/message.go
@@ -9,7 +9,6 @@ package whatsmeow
 import (
 	"bytes"
 	"compress/zlib"
-	"crypto/rand"
 	"encoding/hex"
 	"errors"
 	"fmt"
@@ -31,6 +30,7 @@ import (
 	"go.mau.fi/whatsmeow/store"
 	"go.mau.fi/whatsmeow/types"
 	"go.mau.fi/whatsmeow/types/events"
+	"go.mau.fi/whatsmeow/util/randbytes"
 )
 
 var pbSerializer = store.SignalProtobufSerializer
@@ -101,6 +101,7 @@ func (cli *Client) parseMessageInfo(node *waBinary.Node) (*types.MessageInfo, er
 	info.Timestamp = ag.UnixTime("t")
 	info.PushName = ag.OptionalString("notify")
 	info.Category = ag.OptionalString("category")
+	info.Type = ag.OptionalString("type")
 	if !ag.OK() {
 		return nil, ag.Error()
 	}
@@ -125,7 +126,7 @@ func (cli *Client) decryptMessages(info *types.MessageInfo, node *waBinary.Node)
 	go cli.sendAck(node)
 	if len(node.GetChildrenByTag("unavailable")) > 0 && len(node.GetChildrenByTag("enc")) == 0 {
 		cli.Log.Warnf("Unavailable message %s from %s", info.ID, info.SourceString())
-		go cli.sendRetryReceipt(node, true)
+		go cli.sendRetryReceipt(node, info, true)
 		cli.dispatchEvent(&events.UndecryptableMessage{Info: *info, IsUnavailable: true})
 		return
 	}
@@ -137,7 +138,8 @@ func (cli *Client) decryptMessages(info *types.MessageInfo, node *waBinary.Node)
 		if child.Tag != "enc" {
 			continue
 		}
-		encType, ok := child.Attrs["type"].(string)
+		ag := child.AttrGetter()
+		encType, ok := ag.GetString("type", false)
 		if !ok {
 			continue
 		}
@@ -155,8 +157,13 @@ func (cli *Client) decryptMessages(info *types.MessageInfo, node *waBinary.Node)
 		if err != nil {
 			cli.Log.Warnf("Error decrypting message from %s: %v", info.SourceString(), err)
 			isUnavailable := encType == "skmsg" && !containsDirectMsg && errors.Is(err, signalerror.ErrNoSenderKeyForUser)
-			go cli.sendRetryReceipt(node, isUnavailable)
-			cli.dispatchEvent(&events.UndecryptableMessage{Info: *info, IsUnavailable: isUnavailable})
+			go cli.sendRetryReceipt(node, info, isUnavailable)
+			decryptFailMode, _ := child.Attrs["decrypt-fail"].(string)
+			cli.dispatchEvent(&events.UndecryptableMessage{
+				Info:            *info,
+				IsUnavailable:   isUnavailable,
+				DecryptFailMode: events.DecryptFailMode(decryptFailMode),
+			})
 			return
 		}
 
@@ -166,8 +173,12 @@ func (cli *Client) decryptMessages(info *types.MessageInfo, node *waBinary.Node)
 			cli.Log.Warnf("Error unmarshaling decrypted message from %s: %v", info.SourceString(), err)
 			continue
 		}
+		retryCount := ag.OptionalInt("count")
+		if retryCount > 0 {
+			cli.cancelDelayedRequestFromPhone(info.ID)
+		}
 
-		cli.handleDecryptedMessage(info, &msg)
+		cli.handleDecryptedMessage(info, &msg, retryCount)
 		handled = true
 	}
 	if handled {
@@ -246,6 +257,9 @@ func isValidPadding(plaintext []byte) bool {
 }
 
 func unpadMessage(plaintext []byte) ([]byte, error) {
+	if len(plaintext) == 0 {
+		return nil, fmt.Errorf("plaintext is empty")
+	}
 	if checkPadding && !isValidPadding(plaintext) {
 		return nil, fmt.Errorf("plaintext doesn't have expected padding")
 	}
@@ -253,11 +267,7 @@ func unpadMessage(plaintext []byte) ([]byte, error) {
 }
 
 func padMessage(plaintext []byte) []byte {
-	var pad [1]byte
-	_, err := rand.Read(pad[:])
-	if err != nil {
-		panic(err)
-	}
+	pad := randbytes.Make(1)
 	pad[0] &= 0xf
 	if pad[0] == 0 {
 		pad[0] = 0xf
@@ -357,6 +367,25 @@ func (cli *Client) handleAppStateSyncKeyShare(keys *waProto.AppStateSyncKeyShare
 	}
 }
 
+func (cli *Client) handlePlaceholderResendResponse(msg *waProto.PeerDataOperationRequestResponseMessage) {
+	reqID := msg.GetStanzaId()
+	parts := msg.GetPeerDataOperationResult()
+	cli.Log.Debugf("Handling response to placeholder resend request %s with %d items", reqID, len(parts))
+	for i, part := range parts {
+		var webMsg waProto.WebMessageInfo
+		if resp := part.GetPlaceholderMessageResendResponse(); resp == nil {
+			cli.Log.Warnf("Missing response in item #%d of response to %s", i+1, reqID)
+		} else if err := proto.Unmarshal(resp.GetWebMessageInfoBytes(), &webMsg); err != nil {
+			cli.Log.Warnf("Failed to unmarshal protobuf web message in item #%d of response to %s: %v", i+1, reqID, err)
+		} else if msgEvt, err := cli.ParseWebMessage(types.EmptyJID, &webMsg); err != nil {
+			cli.Log.Warnf("Failed to parse web message info in item #%d of response to %s: %v", i+1, reqID, err)
+		} else {
+			msgEvt.UnavailableRequestID = reqID
+			cli.dispatchEvent(msgEvt)
+		}
+	}
+}
+
 func (cli *Client) handleProtocolMessage(info *types.MessageInfo, msg *waProto.Message) {
 	protoMsg := msg.GetProtocolMessage()
 
@@ -368,6 +397,10 @@ func (cli *Client) handleProtocolMessage(info *types.MessageInfo, msg *waProto.M
 		go cli.sendProtocolMessageReceipt(info.ID, "hist_sync")
 	}
 
+	if protoMsg.GetPeerDataOperationRequestResponseMessage().GetPeerDataOperationRequestType() == waProto.PeerDataOperationRequestType_PLACEHOLDER_MESSAGE_RESEND {
+		go cli.handlePlaceholderResendResponse(protoMsg.GetPeerDataOperationRequestResponseMessage())
+	}
+
 	if protoMsg.GetAppStateSyncKeyShare() != nil && info.IsFromMe {
 		go cli.handleAppStateSyncKeyShare(protoMsg.AppStateSyncKeyShare)
 	}
@@ -472,9 +505,9 @@ func (cli *Client) storeHistoricalMessageSecrets(conversations []*waProto.Conver
 	}
 }
 
-func (cli *Client) handleDecryptedMessage(info *types.MessageInfo, msg *waProto.Message) {
+func (cli *Client) handleDecryptedMessage(info *types.MessageInfo, msg *waProto.Message, retryCount int) {
 	cli.processProtocolParts(info, msg)
-	evt := &events.Message{Info: *info, RawMessage: msg}
+	evt := &events.Message{Info: *info, RawMessage: msg, RetryCount: retryCount}
 	cli.dispatchEvent(evt.UnwrapRaw())
 }
 
diff --git a/vendor/go.mau.fi/whatsmeow/msgsecret.go b/vendor/go.mau.fi/whatsmeow/msgsecret.go
index a4cbb17b..5f3e16ac 100644
--- a/vendor/go.mau.fi/whatsmeow/msgsecret.go
+++ b/vendor/go.mau.fi/whatsmeow/msgsecret.go
@@ -7,7 +7,6 @@
 package whatsmeow
 
 import (
-	"crypto/rand"
 	"crypto/sha256"
 	"fmt"
 	"time"
@@ -19,6 +18,7 @@ import (
 	"go.mau.fi/whatsmeow/types/events"
 	"go.mau.fi/whatsmeow/util/gcmutil"
 	"go.mau.fi/whatsmeow/util/hkdfutil"
+	"go.mau.fi/whatsmeow/util/randbytes"
 )
 
 type MsgSecretType string
@@ -107,11 +107,7 @@ func (cli *Client) encryptMsgSecret(chat, origSender types.JID, origMsgID types.
 	}
 	secretKey, additionalData := generateMsgSecretKey(useCase, ownID, origMsgID, origSender, baseEncKey)
 
-	iv = make([]byte, 12)
-	_, err = rand.Read(iv)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to generate iv: %w", err)
-	}
+	iv = randbytes.Make(12)
 	ciphertext, err = gcmutil.Encrypt(secretKey, iv, plaintext, additionalData)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to encrypt secret message: %w", err)
@@ -132,7 +128,7 @@ func (cli *Client) encryptMsgSecret(chat, origSender types.JID, origMsgID types.
 //	}
 func (cli *Client) DecryptReaction(reaction *events.Message) (*waProto.ReactionMessage, error) {
 	encReaction := reaction.Message.GetEncReactionMessage()
-	if encReaction != nil {
+	if encReaction == nil {
 		return nil, ErrNotEncryptedReactionMessage
 	}
 	plaintext, err := cli.decryptMsgSecret(reaction, EncSecretReaction, encReaction, encReaction.GetTargetMessageKey())
@@ -225,11 +221,7 @@ func (cli *Client) BuildPollVote(pollInfo *types.MessageInfo, optionNames []stri
 //
 //	resp, err := cli.SendMessage(context.Background(), chat, cli.BuildPollCreation("meow?", []string{"yes", "no"}, 1))
 func (cli *Client) BuildPollCreation(name string, optionNames []string, selectableOptionCount int) *waProto.Message {
-	msgSecret := make([]byte, 32)
-	_, err := rand.Read(msgSecret)
-	if err != nil {
-		panic(err)
-	}
+	msgSecret := randbytes.Make(32)
 	if selectableOptionCount < 0 || selectableOptionCount > len(optionNames) {
 		selectableOptionCount = 0
 	}
diff --git a/vendor/go.mau.fi/whatsmeow/notification.go b/vendor/go.mau.fi/whatsmeow/notification.go
index 567722b5..b455785a 100644
--- a/vendor/go.mau.fi/whatsmeow/notification.go
+++ b/vendor/go.mau.fi/whatsmeow/notification.go
@@ -173,6 +173,11 @@ func (cli *Client) handleAccountSyncNotification(node *waBinary.Node) {
 			cli.handlePrivacySettingsNotification(&child)
 		case "devices":
 			cli.handleOwnDevicesNotification(&child)
+		case "picture":
+			cli.dispatchEvent(&events.Picture{
+				Timestamp: node.AttrGetter().UnixTime("t"),
+				JID:       cli.getOwnID().ToNonAD(),
+			})
 		default:
 			cli.Log.Debugf("Unhandled account sync item %s", child.Tag)
 		}
@@ -254,6 +259,8 @@ func (cli *Client) handleNotification(node *waBinary.Node) {
 		go cli.handleMediaRetryNotification(node)
 	case "privacy_token":
 		go cli.handlePrivacyTokenNotification(node)
+	case "link_code_companion_reg":
+		go cli.tryHandleCodePairNotification(node)
 	// Other types: business, disappearing_mode, server, status, pay, psa
 	default:
 		cli.Log.Debugf("Unhandled notification with type %s", notifType)
diff --git a/vendor/go.mau.fi/whatsmeow/pair-code.go b/vendor/go.mau.fi/whatsmeow/pair-code.go
new file mode 100644
index 00000000..183c5304
--- /dev/null
+++ b/vendor/go.mau.fi/whatsmeow/pair-code.go
@@ -0,0 +1,252 @@
+// Copyright (c) 2023 Tulir Asokan
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+package whatsmeow
+
+import (
+	"crypto/aes"
+	"crypto/cipher"
+	"crypto/sha256"
+	"encoding/base32"
+	"fmt"
+	"regexp"
+	"strconv"
+
+	"golang.org/x/crypto/curve25519"
+	"golang.org/x/crypto/pbkdf2"
+
+	waBinary "go.mau.fi/whatsmeow/binary"
+	waProto "go.mau.fi/whatsmeow/binary/proto"
+	"go.mau.fi/whatsmeow/store"
+	"go.mau.fi/whatsmeow/types"
+	"go.mau.fi/whatsmeow/util/hkdfutil"
+	"go.mau.fi/whatsmeow/util/keys"
+	"go.mau.fi/whatsmeow/util/randbytes"
+)
+
+// PairClientType is the type of client to use with PairCode.
+// The type is automatically filled based on store.DeviceProps.PlatformType (which is what QR login uses).
+type PairClientType int
+
+const (
+	PairClientUnknown PairClientType = iota
+	PairClientChrome
+	PairClientEdge
+	PairClientFirefox
+	PairClientIE
+	PairClientOpera
+	PairClientSafari
+	PairClientElectron
+	PairClientUWP
+	PairClientOtherWebClient
+)
+
+func platformTypeToPairClientType(platformType waProto.DeviceProps_PlatformType) PairClientType {
+	switch platformType {
+	case waProto.DeviceProps_CHROME:
+		return PairClientChrome
+	case waProto.DeviceProps_EDGE:
+		return PairClientEdge
+	case waProto.DeviceProps_FIREFOX:
+		return PairClientFirefox
+	case waProto.DeviceProps_IE:
+		return PairClientIE
+	case waProto.DeviceProps_OPERA:
+		return PairClientOpera
+	case waProto.DeviceProps_SAFARI:
+		return PairClientSafari
+	case waProto.DeviceProps_DESKTOP:
+		return PairClientElectron
+	case waProto.DeviceProps_UWP:
+		return PairClientUWP
+	default:
+		return PairClientOtherWebClient
+	}
+}
+
+var notNumbers = regexp.MustCompile("[^0-9]")
+var linkingBase32 = base32.NewEncoding("123456789ABCDEFGHJKLMNPQRSTVWXYZ")
+
+type phoneLinkingCache struct {
+	jid         types.JID
+	keyPair     *keys.KeyPair
+	linkingCode string
+	pairingRef  string
+}
+
+func generateCompanionEphemeralKey() (ephemeralKeyPair *keys.KeyPair, ephemeralKey []byte, encodedLinkingCode string) {
+	ephemeralKeyPair = keys.NewKeyPair()
+	salt := randbytes.Make(32)
+	iv := randbytes.Make(16)
+	linkingCode := randbytes.Make(5)
+	encodedLinkingCode = linkingBase32.EncodeToString(linkingCode)
+	linkCodeKey := pbkdf2.Key([]byte(encodedLinkingCode), salt, 2<<16, 32, sha256.New)
+	linkCipherBlock, _ := aes.NewCipher(linkCodeKey)
+	encryptedPubkey := ephemeralKeyPair.Pub[:]
+	cipher.NewCTR(linkCipherBlock, iv).XORKeyStream(encryptedPubkey, encryptedPubkey)
+	ephemeralKey = make([]byte, 80)
+	copy(ephemeralKey[0:32], salt)
+	copy(ephemeralKey[32:48], iv)
+	copy(ephemeralKey[48:80], encryptedPubkey)
+	return
+}
+
+// PairPhone generates a pairing code that can be used to link to a phone without scanning a QR code.
+//
+// The exact expiry of pairing codes is unknown, but QR codes are always generated and the login websocket is closed
+// after the QR codes run out, which means there's a 160-second time limit. It is recommended to generate the pairing
+// code immediately after connecting to the websocket to have the maximum time.
+//
+// See https://faq.whatsapp.com/1324084875126592 for more info
+func (cli *Client) PairPhone(phone string, showPushNotification bool) (string, error) {
+	clientType := platformTypeToPairClientType(store.DeviceProps.GetPlatformType())
+	clientDisplayName := store.DeviceProps.GetOs()
+
+	ephemeralKeyPair, ephemeralKey, encodedLinkingCode := generateCompanionEphemeralKey()
+	phone = notNumbers.ReplaceAllString(phone, "")
+	jid := types.NewJID(phone, types.DefaultUserServer)
+	resp, err := cli.sendIQ(infoQuery{
+		Namespace: "md",
+		Type:      iqSet,
+		To:        types.ServerJID,
+		Content: []waBinary.Node{{
+			Tag: "link_code_companion_reg",
+			Attrs: waBinary.Attrs{
+				"jid":   jid,
+				"stage": "companion_hello",
+
+				"should_show_push_notification": strconv.FormatBool(showPushNotification),
+			},
+			Content: []waBinary.Node{
+				{Tag: "link_code_pairing_wrapped_companion_ephemeral_pub", Content: ephemeralKey},
+				{Tag: "companion_server_auth_key_pub", Content: cli.Store.NoiseKey.Pub[:]},
+				{Tag: "companion_platform_id", Content: strconv.Itoa(int(clientType))},
+				{Tag: "companion_platform_display", Content: clientDisplayName},
+				{Tag: "link_code_pairing_nonce", Content: []byte{0}},
+			},
+		}},
+	})
+	if err != nil {
+		return "", err
+	}
+	pairingRefNode, ok := resp.GetOptionalChildByTag("link_code_companion_reg", "link_code_pairing_ref")
+	if !ok {
+		return "", &ElementMissingError{Tag: "link_code_pairing_ref", In: "code link registration response"}
+	}
+	pairingRef, ok := pairingRefNode.Content.([]byte)
+	if !ok {
+		return "", fmt.Errorf("unexpected type %T in content of link_code_pairing_ref tag", pairingRefNode.Content)
+	}
+	cli.phoneLinkingCache = &phoneLinkingCache{
+		jid:         jid,
+		keyPair:     ephemeralKeyPair,
+		linkingCode: encodedLinkingCode,
+		pairingRef:  string(pairingRef),
+	}
+	return encodedLinkingCode[0:4] + "-" + encodedLinkingCode[4:], nil
+}
+
+func (cli *Client) tryHandleCodePairNotification(parentNode *waBinary.Node) {
+	err := cli.handleCodePairNotification(parentNode)
+	if err != nil {
+		cli.Log.Errorf("Failed to handle code pair notification: %s", err)
+	}
+}
+
+func (cli *Client) handleCodePairNotification(parentNode *waBinary.Node) error {
+	node, ok := parentNode.GetOptionalChildByTag("link_code_companion_reg")
+	if !ok {
+		return &ElementMissingError{
+			Tag: "link_code_companion_reg",
+			In:  "notification",
+		}
+	}
+	linkCache := cli.phoneLinkingCache
+	if linkCache == nil {
+		return fmt.Errorf("received code pair notification without a pending pairing")
+	}
+	linkCodePairingRef, _ := node.GetChildByTag("link_code_pairing_ref").Content.([]byte)
+	if string(linkCodePairingRef) != linkCache.pairingRef {
+		return fmt.Errorf("pairing ref mismatch in code pair notification")
+	}
+	wrappedPrimaryEphemeralPub, ok := node.GetChildByTag("link_code_pairing_wrapped_primary_ephemeral_pub").Content.([]byte)
+	if !ok {
+		return &ElementMissingError{
+			Tag: "link_code_pairing_wrapped_primary_ephemeral_pub",
+			In:  "notification",
+		}
+	}
+	primaryIdentityPub, ok := node.GetChildByTag("primary_identity_pub").Content.([]byte)
+	if !ok {
+		return &ElementMissingError{
+			Tag: "primary_identity_pub",
+			In:  "notification",
+		}
+	}
+
+	advSecretRandom := randbytes.Make(32)
+	keyBundleSalt := randbytes.Make(32)
+	keyBundleNonce := randbytes.Make(12)
+
+	// Decrypt the primary device's ephemeral public key, which was encrypted with the 8-character pairing code,
+	// then compute the DH shared secret using our ephemeral private key we generated earlier.
+	primarySalt := wrappedPrimaryEphemeralPub[0:32]
+	primaryIV := wrappedPrimaryEphemeralPub[32:48]
+	primaryEncryptedPubkey := wrappedPrimaryEphemeralPub[48:80]
+	linkCodeKey := pbkdf2.Key([]byte(linkCache.linkingCode), primarySalt, 2<<16, 32, sha256.New)
+	linkCipherBlock, err := aes.NewCipher(linkCodeKey)
+	if err != nil {
+		return fmt.Errorf("failed to create link cipher: %w", err)
+	}
+	primaryDecryptedPubkey := make([]byte, 32)
+	cipher.NewCTR(linkCipherBlock, primaryIV).XORKeyStream(primaryDecryptedPubkey, primaryEncryptedPubkey)
+	ephemeralSharedSecret, err := curve25519.X25519(linkCache.keyPair.Priv[:], primaryDecryptedPubkey)
+	if err != nil {
+		return fmt.Errorf("failed to compute ephemeral shared secret: %w", err)
+	}
+
+	// Encrypt and wrap key bundle containing our identity key, the primary device's identity key and the randomness used for the adv key.
+	keyBundleEncryptionKey := hkdfutil.SHA256(ephemeralSharedSecret, keyBundleSalt, []byte("link_code_pairing_key_bundle_encryption_key"), 32)
+	keyBundleCipherBlock, err := aes.NewCipher(keyBundleEncryptionKey)
+	if err != nil {
+		return fmt.Errorf("failed to create key bundle cipher: %w", err)
+	}
+	keyBundleGCM, err := cipher.NewGCM(keyBundleCipherBlock)
+	if err != nil {
+		return fmt.Errorf("failed to create key bundle GCM: %w", err)
+	}
+	plaintextKeyBundle := concatBytes(cli.Store.IdentityKey.Pub[:], primaryIdentityPub, advSecretRandom)
+	encryptedKeyBundle := keyBundleGCM.Seal(nil, keyBundleNonce, plaintextKeyBundle, nil)
+	wrappedKeyBundle := concatBytes(keyBundleSalt, keyBundleNonce, encryptedKeyBundle)
+
+	// Compute the adv secret key (which is used to authenticate the pair-success event later)
+	identitySharedKey, err := curve25519.X25519(cli.Store.IdentityKey.Priv[:], primaryIdentityPub)
+	if err != nil {
+		return fmt.Errorf("failed to compute identity shared key: %w", err)
+	}
+	advSecretInput := append(append(ephemeralSharedSecret, identitySharedKey...), advSecretRandom...)
+	advSecret := hkdfutil.SHA256(advSecretInput, nil, []byte("adv_secret"), 32)
+	cli.Store.AdvSecretKey = advSecret
+
+	_, err = cli.sendIQ(infoQuery{
+		Namespace: "md",
+		Type:      iqSet,
+		To:        types.ServerJID,
+		Content: []waBinary.Node{{
+			Tag: "link_code_companion_reg",
+			Attrs: waBinary.Attrs{
+				"jid":   linkCache.jid,
+				"stage": "companion_finish",
+			},
+			Content: []waBinary.Node{
+				{Tag: "link_code_pairing_wrapped_key_bundle", Content: wrappedKeyBundle},
+				{Tag: "companion_identity_public", Content: cli.Store.IdentityKey.Pub[:]},
+				{Tag: "link_code_pairing_ref", Content: linkCodePairingRef},
+			},
+		}},
+	})
+	return err
+}
diff --git a/vendor/go.mau.fi/whatsmeow/receipt.go b/vendor/go.mau.fi/whatsmeow/receipt.go
index 7e02c0af..8a958c8c 100644
--- a/vendor/go.mau.fi/whatsmeow/receipt.go
+++ b/vendor/go.mau.fi/whatsmeow/receipt.go
@@ -124,6 +124,9 @@ func (cli *Client) sendAck(node *waBinary.Node) {
 //
 // The first JID parameter (chat) must always be set to the chat ID (user ID in DMs and group ID in group chats).
 // The second JID parameter (sender) must be set in group chats and must be the user ID who sent the message.
+//
+// You can mark multiple messages as read at the same time, but only if the messages were sent by the same user.
+// To mark messages by different users as read, you must call MarkRead multiple times (once for each user).
 func (cli *Client) MarkRead(ids []types.MessageID, timestamp time.Time, chat, sender types.JID) error {
 	node := waBinary.Node{
 		Tag: "receipt",
diff --git a/vendor/go.mau.fi/whatsmeow/retry.go b/vendor/go.mau.fi/whatsmeow/retry.go
index 95104c8f..a729cdab 100644
--- a/vendor/go.mau.fi/whatsmeow/retry.go
+++ b/vendor/go.mau.fi/whatsmeow/retry.go
@@ -169,7 +169,11 @@ func (cli *Client) handleRetryReceipt(receipt *events.Receipt, node *waBinary.No
 			return fmt.Errorf("didn't get prekey bundle for %s (response size: %d)", senderAD, len(keys))
 		}
 	}
-	encrypted, includeDeviceIdentity, err := cli.encryptMessageForDevice(plaintext, receipt.Sender, bundle)
+	encAttrs := waBinary.Attrs{}
+	if mediaType := getMediaTypeFromMessage(msg); mediaType != "" {
+		encAttrs["mediatype"] = mediaType
+	}
+	encrypted, includeDeviceIdentity, err := cli.encryptMessageForDevice(plaintext, receipt.Sender, bundle, encAttrs)
 	if err != nil {
 		return fmt.Errorf("failed to encrypt message for retry: %w", err)
 	}
@@ -193,14 +197,10 @@ func (cli *Client) handleRetryReceipt(receipt *events.Receipt, node *waBinary.No
 	if edit, ok := node.Attrs["edit"]; ok {
 		attrs["edit"] = edit
 	}
-	content := []waBinary.Node{*encrypted}
-	if includeDeviceIdentity {
-		content = append(content, cli.makeDeviceIdentityNode())
-	}
 	err = cli.sendNode(waBinary.Node{
 		Tag:     "message",
 		Attrs:   attrs,
-		Content: content,
+		Content: cli.getMessageContent(*encrypted, msg, attrs, includeDeviceIdentity),
 	})
 	if err != nil {
 		return fmt.Errorf("failed to send retry message: %w", err)
@@ -209,8 +209,63 @@ func (cli *Client) handleRetryReceipt(receipt *events.Receipt, node *waBinary.No
 	return nil
 }
 
+func (cli *Client) cancelDelayedRequestFromPhone(msgID types.MessageID) {
+	if !cli.AutomaticMessageRerequestFromPhone {
+		return
+	}
+	cli.pendingPhoneRerequestsLock.RLock()
+	cancelPendingRequest, ok := cli.pendingPhoneRerequests[msgID]
+	if ok {
+		cancelPendingRequest()
+	}
+	cli.pendingPhoneRerequestsLock.RUnlock()
+}
+
+// RequestFromPhoneDelay specifies how long to wait for the sender to resend the message before requesting from your phone.
+// This is only used if Client.AutomaticMessageRerequestFromPhone is true.
+var RequestFromPhoneDelay = 5 * time.Second
+
+func (cli *Client) delayedRequestMessageFromPhone(info *types.MessageInfo) {
+	if !cli.AutomaticMessageRerequestFromPhone {
+		return
+	}
+	cli.pendingPhoneRerequestsLock.Lock()
+	_, alreadyRequesting := cli.pendingPhoneRerequests[info.ID]
+	if alreadyRequesting {
+		cli.pendingPhoneRerequestsLock.Unlock()
+		return
+	}
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	cli.pendingPhoneRerequests[info.ID] = cancel
+	cli.pendingPhoneRerequestsLock.Unlock()
+
+	defer func() {
+		cli.pendingPhoneRerequestsLock.Lock()
+		delete(cli.pendingPhoneRerequests, info.ID)
+		cli.pendingPhoneRerequestsLock.Unlock()
+	}()
+	select {
+	case <-time.After(RequestFromPhoneDelay):
+	case <-ctx.Done():
+		cli.Log.Debugf("Cancelled delayed request for message %s from phone", info.ID)
+		return
+	}
+	_, err := cli.SendMessage(
+		ctx,
+		cli.Store.ID.ToNonAD(),
+		cli.BuildUnavailableMessageRequest(info.Chat, info.Sender, info.ID),
+		SendRequestExtra{Peer: true},
+	)
+	if err != nil {
+		cli.Log.Warnf("Failed to send request for unavailable message %s to phone: %v", info.ID, err)
+	} else {
+		cli.Log.Debugf("Requested message %s from phone", info.ID)
+	}
+}
+
 // sendRetryReceipt sends a retry receipt for an incoming message.
-func (cli *Client) sendRetryReceipt(node *waBinary.Node, forceIncludeIdentity bool) {
+func (cli *Client) sendRetryReceipt(node *waBinary.Node, info *types.MessageInfo, forceIncludeIdentity bool) {
 	id, _ := node.Attrs["id"].(string)
 	children := node.GetChildren()
 	var retryCountInMsg int
@@ -231,6 +286,9 @@ func (cli *Client) sendRetryReceipt(node *waBinary.Node, forceIncludeIdentity bo
 		cli.Log.Warnf("Not sending any more retry receipts for %s", id)
 		return
 	}
+	if retryCount == 1 {
+		go cli.delayedRequestMessageFromPhone(info)
+	}
 
 	var registrationIDBytes [4]byte
 	binary.BigEndian.PutUint32(registrationIDBytes[:], cli.Store.RegistrationID)
diff --git a/vendor/go.mau.fi/whatsmeow/send.go b/vendor/go.mau.fi/whatsmeow/send.go
index 96d888be..a4d49f48 100644
--- a/vendor/go.mau.fi/whatsmeow/send.go
+++ b/vendor/go.mau.fi/whatsmeow/send.go
@@ -8,9 +8,9 @@ package whatsmeow
 
 import (
 	"context"
-	"crypto/rand"
 	"crypto/sha256"
 	"encoding/base64"
+	"encoding/binary"
 	"encoding/hex"
 	"errors"
 	"fmt"
@@ -30,20 +30,35 @@ import (
 	waBinary "go.mau.fi/whatsmeow/binary"
 	waProto "go.mau.fi/whatsmeow/binary/proto"
 	"go.mau.fi/whatsmeow/types"
+	"go.mau.fi/whatsmeow/types/events"
+	"go.mau.fi/whatsmeow/util/randbytes"
 )
 
+// GenerateMessageID generates a random string that can be used as a message ID on WhatsApp.
+//
+//	msgID := cli.GenerateMessageID()
+//	cli.SendMessage(context.Background(), targetJID, &waProto.Message{...}, whatsmeow.SendRequestExtra{ID: msgID})
+func (cli *Client) GenerateMessageID() types.MessageID {
+	data := make([]byte, 8, 8+20+16)
+	binary.BigEndian.PutUint64(data, uint64(time.Now().Unix()))
+	ownID := cli.getOwnID()
+	if !ownID.IsEmpty() {
+		data = append(data, []byte(ownID.User)...)
+		data = append(data, []byte("@c.us")...)
+	}
+	data = append(data, randbytes.Make(16)...)
+	hash := sha256.Sum256(data)
+	return "3EB0" + strings.ToUpper(hex.EncodeToString(hash[:9]))
+}
+
 // GenerateMessageID generates a random string that can be used as a message ID on WhatsApp.
 //
 //	msgID := whatsmeow.GenerateMessageID()
 //	cli.SendMessage(context.Background(), targetJID, &waProto.Message{...}, whatsmeow.SendRequestExtra{ID: msgID})
+//
+// Deprecated: WhatsApp web has switched to using a hash of the current timestamp, user id and random bytes. Use Client.GenerateMessageID instead.
 func GenerateMessageID() types.MessageID {
-	id := make([]byte, 8)
-	_, err := rand.Read(id)
-	if err != nil {
-		// Out of entropy
-		panic(err)
-	}
-	return "3EB0" + strings.ToUpper(hex.EncodeToString(id))
+	return "3EB0" + strings.ToUpper(hex.EncodeToString(randbytes.Make(8)))
 }
 
 type MessageDebugTimings struct {
@@ -132,7 +147,7 @@ func (cli *Client) SendMessage(ctx context.Context, to types.JID, message *waPro
 	}
 
 	if len(req.ID) == 0 {
-		req.ID = GenerateMessageID()
+		req.ID = cli.GenerateMessageID()
 	}
 	resp.ID = req.ID
 
@@ -216,17 +231,9 @@ func (cli *Client) RevokeMessage(chat types.JID, id types.MessageID) (SendRespon
 	return cli.SendMessage(context.TODO(), chat, cli.BuildRevoke(chat, types.EmptyJID, id))
 }
 
-// BuildRevoke builds a message revocation message using the given variables.
-// The built message can be sent normally using Client.SendMessage.
-//
-// To revoke your own messages, pass your JID or an empty JID as the second parameter (sender).
-//
-//	resp, err := cli.SendMessage(context.Background(), chat, cli.BuildRevoke(chat, types.EmptyJID, originalMessageID)
-//
-// To revoke someone else's messages when you are group admin, pass the message sender's JID as the second parameter.
-//
-//	resp, err := cli.SendMessage(context.Background(), chat, cli.BuildRevoke(chat, senderJID, originalMessageID)
-func (cli *Client) BuildRevoke(chat, sender types.JID, id types.MessageID) *waProto.Message {
+// BuildMessageKey builds a MessageKey object, which is used to refer to previous messages
+// for things such as replies, revocations and reactions.
+func (cli *Client) BuildMessageKey(chat, sender types.JID, id types.MessageID) *waProto.MessageKey {
 	key := &waProto.MessageKey{
 		FromMe:    proto.Bool(true),
 		Id:        proto.String(id),
@@ -238,14 +245,90 @@ func (cli *Client) BuildRevoke(chat, sender types.JID, id types.MessageID) *waPr
 			key.Participant = proto.String(sender.ToNonAD().String())
 		}
 	}
+	return key
+}
+
+// BuildRevoke builds a message revocation message using the given variables.
+// The built message can be sent normally using Client.SendMessage.
+//
+// To revoke your own messages, pass your JID or an empty JID as the second parameter (sender).
+//
+//	resp, err := cli.SendMessage(context.Background(), chat, cli.BuildRevoke(chat, types.EmptyJID, originalMessageID)
+//
+// To revoke someone else's messages when you are group admin, pass the message sender's JID as the second parameter.
+//
+//	resp, err := cli.SendMessage(context.Background(), chat, cli.BuildRevoke(chat, senderJID, originalMessageID)
+func (cli *Client) BuildRevoke(chat, sender types.JID, id types.MessageID) *waProto.Message {
 	return &waProto.Message{
 		ProtocolMessage: &waProto.ProtocolMessage{
 			Type: waProto.ProtocolMessage_REVOKE.Enum(),
-			Key:  key,
+			Key:  cli.BuildMessageKey(chat, sender, id),
 		},
 	}
 }
 
+// BuildReaction builds a message reaction message using the given variables.
+// The built message can be sent normally using Client.SendMessage.
+//
+//	resp, err := cli.SendMessage(context.Background(), chat, cli.BuildReaction(chat, senderJID, targetMessageID, "🐈️")
+func (cli *Client) BuildReaction(chat, sender types.JID, id types.MessageID, reaction string) *waProto.Message {
+	return &waProto.Message{
+		ReactionMessage: &waProto.ReactionMessage{
+			Key:               cli.BuildMessageKey(chat, sender, id),
+			Text:              proto.String(reaction),
+			SenderTimestampMs: proto.Int64(time.Now().UnixMilli()),
+		},
+	}
+}
+
+// BuildUnavailableMessageRequest builds a message to request the user's primary device to send
+// the copy of a message that this client was unable to decrypt.
+//
+// The built message can be sent using Client.SendMessage, but you must pass whatsmeow.SendRequestExtra{Peer: true} as the last parameter.
+// The full response will come as a ProtocolMessage with type `PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE`.
+// The response events will also be dispatched as normal *events.Message's with UnavailableRequestID set to the request message ID.
+func (cli *Client) BuildUnavailableMessageRequest(chat, sender types.JID, id string) *waProto.Message {
+	return &waProto.Message{
+		ProtocolMessage: &waProto.ProtocolMessage{
+			Type: waProto.ProtocolMessage_PEER_DATA_OPERATION_REQUEST_MESSAGE.Enum(),
+			PeerDataOperationRequestMessage: &waProto.PeerDataOperationRequestMessage{
+				PeerDataOperationRequestType: waProto.PeerDataOperationRequestType_PLACEHOLDER_MESSAGE_RESEND.Enum(),
+				PlaceholderMessageResendRequest: []*waProto.PeerDataOperationRequestMessage_PlaceholderMessageResendRequest{{
+					MessageKey: cli.BuildMessageKey(chat, sender, id),
+				}},
+			},
+		},
+	}
+}
+
+// BuildHistorySyncRequest builds a message to request additional history from the user's primary device.
+//
+// The built message can be sent using Client.SendMessage, but you must pass whatsmeow.SendRequestExtra{Peer: true} as the last parameter.
+// The response will come as an *events.HistorySync with type `ON_DEMAND`.
+//
+// The response will contain to `count` messages immediately before the given message.
+// The recommended number of messages to request at a time is 50.
+func (cli *Client) BuildHistorySyncRequest(lastKnownMessageInfo *types.MessageInfo, count int) *waProto.Message {
+	return &waProto.Message{
+		ProtocolMessage: &waProto.ProtocolMessage{
+			Type: waProto.ProtocolMessage_PEER_DATA_OPERATION_REQUEST_MESSAGE.Enum(),
+			PeerDataOperationRequestMessage: &waProto.PeerDataOperationRequestMessage{
+				PeerDataOperationRequestType: waProto.PeerDataOperationRequestType_HISTORY_SYNC_ON_DEMAND.Enum(),
+				HistorySyncOnDemandRequest: &waProto.PeerDataOperationRequestMessage_HistorySyncOnDemandRequest{
+					ChatJid:              proto.String(lastKnownMessageInfo.Chat.String()),
+					OldestMsgId:          proto.String(lastKnownMessageInfo.ID),
+					OldestMsgFromMe:      proto.Bool(lastKnownMessageInfo.IsFromMe),
+					OnDemandMsgCount:     proto.Int32(int32(count)),
+					OldestMsgTimestampMs: proto.Int64(lastKnownMessageInfo.Timestamp.UnixMilli()),
+				},
+			},
+		},
+	}
+}
+
+// EditWindow specifies how long a message can be edited for after it was sent.
+const EditWindow = 20 * time.Minute
+
 // BuildEdit builds a message edit message using the given variables.
 // The built message can be sent normally using Client.SendMessage.
 //
@@ -399,11 +482,15 @@ func (cli *Client) sendGroup(ctx context.Context, to, ownID types.JID, id types.
 
 	phash := participantListHashV2(allDevices)
 	node.Attrs["phash"] = phash
-	node.Content = append(node.GetChildren(), waBinary.Node{
+	skMsg := waBinary.Node{
 		Tag:     "enc",
 		Content: ciphertext,
 		Attrs:   waBinary.Attrs{"v": "2", "type": "skmsg"},
-	})
+	}
+	if mediaType := getMediaTypeFromMessage(message); mediaType != "" {
+		skMsg.Attrs["mediatype"] = mediaType
+	}
+	node.Content = append(node.GetChildren(), skMsg)
 
 	start = time.Now()
 	data, err := cli.sendNodeAndGetData(*node)
@@ -463,16 +550,109 @@ func getTypeFromMessage(msg *waProto.Message) string {
 		return "reaction"
 	case msg.PollCreationMessage != nil, msg.PollUpdateMessage != nil:
 		return "poll"
+	case getMediaTypeFromMessage(msg) != "":
+		return "media"
 	case msg.Conversation != nil, msg.ExtendedTextMessage != nil, msg.ProtocolMessage != nil:
 		return "text"
-	//TODO this requires setting mediatype in the enc nodes
-	//case msg.ImageMessage != nil, msg.DocumentMessage != nil, msg.AudioMessage != nil, msg.VideoMessage != nil:
-	//	return "media"
 	default:
 		return "text"
 	}
 }
 
+func getMediaTypeFromMessage(msg *waProto.Message) string {
+	switch {
+	case msg.ViewOnceMessage != nil:
+		return getMediaTypeFromMessage(msg.ViewOnceMessage.Message)
+	case msg.ViewOnceMessageV2 != nil:
+		return getMediaTypeFromMessage(msg.ViewOnceMessageV2.Message)
+	case msg.EphemeralMessage != nil:
+		return getMediaTypeFromMessage(msg.EphemeralMessage.Message)
+	case msg.DocumentWithCaptionMessage != nil:
+		return getMediaTypeFromMessage(msg.DocumentWithCaptionMessage.Message)
+	case msg.ExtendedTextMessage != nil && msg.ExtendedTextMessage.Title != nil:
+		return "url"
+	case msg.ImageMessage != nil:
+		return "image"
+	case msg.StickerMessage != nil:
+		return "sticker"
+	case msg.DocumentMessage != nil:
+		return "document"
+	case msg.AudioMessage != nil:
+		if msg.AudioMessage.GetPtt() {
+			return "ptt"
+		} else {
+			return "audio"
+		}
+	case msg.VideoMessage != nil:
+		if msg.VideoMessage.GetGifPlayback() {
+			return "gif"
+		} else {
+			return "video"
+		}
+	case msg.ContactMessage != nil:
+		return "vcard"
+	case msg.ContactsArrayMessage != nil:
+		return "contact_array"
+	case msg.ListMessage != nil:
+		return "list"
+	case msg.ListResponseMessage != nil:
+		return "list_response"
+	case msg.ButtonsResponseMessage != nil:
+		return "buttons_response"
+	case msg.OrderMessage != nil:
+		return "order"
+	case msg.ProductMessage != nil:
+		return "product"
+	case msg.InteractiveResponseMessage != nil:
+		return "native_flow_response"
+	default:
+		return ""
+	}
+}
+
+func getButtonTypeFromMessage(msg *waProto.Message) string {
+	switch {
+	case msg.ViewOnceMessage != nil:
+		return getButtonTypeFromMessage(msg.ViewOnceMessage.Message)
+	case msg.ViewOnceMessageV2 != nil:
+		return getButtonTypeFromMessage(msg.ViewOnceMessageV2.Message)
+	case msg.EphemeralMessage != nil:
+		return getButtonTypeFromMessage(msg.EphemeralMessage.Message)
+	case msg.ButtonsMessage != nil:
+		return "buttons"
+	case msg.ButtonsResponseMessage != nil:
+		return "buttons_response"
+	case msg.ListMessage != nil:
+		return "list"
+	case msg.ListResponseMessage != nil:
+		return "list_response"
+	case msg.InteractiveResponseMessage != nil:
+		return "interactive_response"
+	default:
+		return ""
+	}
+}
+
+func getButtonAttributes(msg *waProto.Message) waBinary.Attrs {
+	switch {
+	case msg.ViewOnceMessage != nil:
+		return getButtonAttributes(msg.ViewOnceMessage.Message)
+	case msg.ViewOnceMessageV2 != nil:
+		return getButtonAttributes(msg.ViewOnceMessageV2.Message)
+	case msg.EphemeralMessage != nil:
+		return getButtonAttributes(msg.EphemeralMessage.Message)
+	case msg.TemplateMessage != nil:
+		return waBinary.Attrs{}
+	case msg.ListMessage != nil:
+		return waBinary.Attrs{
+			"v":    "2",
+			"type": strings.ToLower(waProto.ListMessage_ListType_name[int32(msg.ListMessage.GetListType())]),
+		}
+	default:
+		return waBinary.Attrs{}
+	}
+}
+
 const (
 	EditAttributeEmpty        = ""
 	EditAttributeMessageEdit  = "1"
@@ -484,6 +664,8 @@ const RemoveReactionText = ""
 
 func getEditAttribute(msg *waProto.Message) string {
 	switch {
+	case msg.EditedMessage != nil && msg.EditedMessage.Message != nil:
+		return getEditAttribute(msg.EditedMessage.Message)
 	case msg.ProtocolMessage != nil && msg.ProtocolMessage.GetKey() != nil:
 		switch msg.ProtocolMessage.GetType() {
 		case waProto.ProtocolMessage_REVOKE:
@@ -493,7 +675,7 @@ func getEditAttribute(msg *waProto.Message) string {
 				return EditAttributeAdminRevoke
 			}
 		case waProto.ProtocolMessage_MESSAGE_EDIT:
-			if msg.EditedMessage != nil {
+			if msg.ProtocolMessage.EditedMessage != nil {
 				return EditAttributeMessageEdit
 			}
 		}
@@ -523,7 +705,7 @@ func (cli *Client) preparePeerMessageNode(to types.JID, id types.MessageID, mess
 		return nil, err
 	}
 	start = time.Now()
-	encrypted, isPreKey, err := cli.encryptMessageForDevice(plaintext, to, nil)
+	encrypted, isPreKey, err := cli.encryptMessageForDevice(plaintext, to, nil, nil)
 	timings.PeerEncrypt = time.Since(start)
 	if err != nil {
 		return nil, fmt.Errorf("failed to encrypt peer message for %s: %v", to, err)
@@ -539,34 +721,12 @@ func (cli *Client) preparePeerMessageNode(to types.JID, id types.MessageID, mess
 	}, nil
 }
 
-func (cli *Client) prepareMessageNode(ctx context.Context, to, ownID types.JID, id types.MessageID, message *waProto.Message, participants []types.JID, plaintext, dsmPlaintext []byte, timings *MessageDebugTimings) (*waBinary.Node, []types.JID, error) {
-	start := time.Now()
-	allDevices, err := cli.GetUserDevicesContext(ctx, participants)
-	timings.GetDevices = time.Since(start)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to get device list: %w", err)
-	}
-
-	attrs := waBinary.Attrs{
-		"id":   id,
-		"type": getTypeFromMessage(message),
-		"to":   to,
-	}
-	if editAttr := getEditAttribute(message); editAttr != "" {
-		attrs["edit"] = editAttr
-	}
-
-	start = time.Now()
-	participantNodes, includeIdentity := cli.encryptMessageForDevices(ctx, allDevices, ownID, id, plaintext, dsmPlaintext)
-	timings.PeerEncrypt = time.Since(start)
-	content := []waBinary.Node{{
-		Tag:     "participants",
-		Content: participantNodes,
-	}}
+func (cli *Client) getMessageContent(baseNode waBinary.Node, message *waProto.Message, msgAttrs waBinary.Attrs, includeIdentity bool) []waBinary.Node {
+	content := []waBinary.Node{baseNode}
 	if includeIdentity {
 		content = append(content, cli.makeDeviceIdentityNode())
 	}
-	if attrs["type"] == "poll" {
+	if msgAttrs["type"] == "poll" {
 		pollType := "creation"
 		if message.PollUpdateMessage != nil {
 			pollType = "vote"
@@ -578,10 +738,56 @@ func (cli *Client) prepareMessageNode(ctx context.Context, to, ownID types.JID,
 			},
 		})
 	}
+	if buttonType := getButtonTypeFromMessage(message); buttonType != "" {
+		content = append(content, waBinary.Node{
+			Tag: "biz",
+			Content: []waBinary.Node{{
+				Tag:   buttonType,
+				Attrs: getButtonAttributes(message),
+			}},
+		})
+	}
+	return content
+}
+
+func (cli *Client) prepareMessageNode(ctx context.Context, to, ownID types.JID, id types.MessageID, message *waProto.Message, participants []types.JID, plaintext, dsmPlaintext []byte, timings *MessageDebugTimings) (*waBinary.Node, []types.JID, error) {
+	start := time.Now()
+	allDevices, err := cli.GetUserDevicesContext(ctx, participants)
+	timings.GetDevices = time.Since(start)
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to get device list: %w", err)
+	}
+
+	msgType := getTypeFromMessage(message)
+	encAttrs := waBinary.Attrs{}
+	// Only include encMediaType for 1:1 messages (groups don't have a device-sent message plaintext)
+	if encMediaType := getMediaTypeFromMessage(message); dsmPlaintext != nil && encMediaType != "" {
+		encAttrs["mediatype"] = encMediaType
+	}
+	attrs := waBinary.Attrs{
+		"id":   id,
+		"type": msgType,
+		"to":   to,
+	}
+	if editAttr := getEditAttribute(message); editAttr != "" {
+		attrs["edit"] = editAttr
+		encAttrs["decrypt-fail"] = string(events.DecryptFailHide)
+	}
+	if msgType == "reaction" {
+		encAttrs["decrypt-fail"] = string(events.DecryptFailHide)
+	}
+
+	start = time.Now()
+	participantNodes, includeIdentity := cli.encryptMessageForDevices(ctx, allDevices, ownID, id, plaintext, dsmPlaintext, encAttrs)
+	timings.PeerEncrypt = time.Since(start)
+	participantNode := waBinary.Node{
+		Tag:     "participants",
+		Content: participantNodes,
+	}
 	return &waBinary.Node{
 		Tag:     "message",
 		Attrs:   attrs,
-		Content: content,
+		Content: cli.getMessageContent(participantNode, message, attrs, includeIdentity),
 	}, allDevices, nil
 }
 
@@ -619,7 +825,7 @@ func (cli *Client) makeDeviceIdentityNode() waBinary.Node {
 	}
 }
 
-func (cli *Client) encryptMessageForDevices(ctx context.Context, allDevices []types.JID, ownID types.JID, id string, msgPlaintext, dsmPlaintext []byte) ([]waBinary.Node, bool) {
+func (cli *Client) encryptMessageForDevices(ctx context.Context, allDevices []types.JID, ownID types.JID, id string, msgPlaintext, dsmPlaintext []byte, encAttrs waBinary.Attrs) ([]waBinary.Node, bool) {
 	includeIdentity := false
 	participantNodes := make([]waBinary.Node, 0, len(allDevices))
 	var retryDevices []types.JID
@@ -631,7 +837,7 @@ func (cli *Client) encryptMessageForDevices(ctx context.Context, allDevices []ty
 			}
 			plaintext = dsmPlaintext
 		}
-		encrypted, isPreKey, err := cli.encryptMessageForDeviceAndWrap(plaintext, jid, nil)
+		encrypted, isPreKey, err := cli.encryptMessageForDeviceAndWrap(plaintext, jid, nil, encAttrs)
 		if errors.Is(err, ErrNoSession) {
 			retryDevices = append(retryDevices, jid)
 			continue
@@ -659,7 +865,7 @@ func (cli *Client) encryptMessageForDevices(ctx context.Context, allDevices []ty
 				if jid.User == ownID.User && dsmPlaintext != nil {
 					plaintext = dsmPlaintext
 				}
-				encrypted, isPreKey, err := cli.encryptMessageForDeviceAndWrap(plaintext, jid, resp.bundle)
+				encrypted, isPreKey, err := cli.encryptMessageForDeviceAndWrap(plaintext, jid, resp.bundle, encAttrs)
 				if err != nil {
 					cli.Log.Warnf("Failed to encrypt %s for %s (retry): %v", id, jid, err)
 					continue
@@ -674,8 +880,8 @@ func (cli *Client) encryptMessageForDevices(ctx context.Context, allDevices []ty
 	return participantNodes, includeIdentity
 }
 
-func (cli *Client) encryptMessageForDeviceAndWrap(plaintext []byte, to types.JID, bundle *prekey.Bundle) (*waBinary.Node, bool, error) {
-	node, includeDeviceIdentity, err := cli.encryptMessageForDevice(plaintext, to, bundle)
+func (cli *Client) encryptMessageForDeviceAndWrap(plaintext []byte, to types.JID, bundle *prekey.Bundle, encAttrs waBinary.Attrs) (*waBinary.Node, bool, error) {
+	node, includeDeviceIdentity, err := cli.encryptMessageForDevice(plaintext, to, bundle, encAttrs)
 	if err != nil {
 		return nil, false, err
 	}
@@ -686,7 +892,13 @@ func (cli *Client) encryptMessageForDeviceAndWrap(plaintext []byte, to types.JID
 	}, includeDeviceIdentity, nil
 }
 
-func (cli *Client) encryptMessageForDevice(plaintext []byte, to types.JID, bundle *prekey.Bundle) (*waBinary.Node, bool, error) {
+func copyAttrs(from, to waBinary.Attrs) {
+	for k, v := range from {
+		to[k] = v
+	}
+}
+
+func (cli *Client) encryptMessageForDevice(plaintext []byte, to types.JID, bundle *prekey.Bundle, extraAttrs waBinary.Attrs) (*waBinary.Node, bool, error) {
 	builder := session.NewBuilderFromSignal(cli.Store, to.SignalAddress(), pbSerializer)
 	if bundle != nil {
 		cli.Log.Debugf("Processing prekey bundle for %s", to)
@@ -708,17 +920,18 @@ func (cli *Client) encryptMessageForDevice(plaintext []byte, to types.JID, bundl
 		return nil, false, fmt.Errorf("cipher encryption failed: %w", err)
 	}
 
-	encType := "msg"
-	if ciphertext.Type() == protocol.PREKEY_TYPE {
-		encType = "pkmsg"
+	encAttrs := waBinary.Attrs{
+		"v":    "2",
+		"type": "msg",
 	}
+	if ciphertext.Type() == protocol.PREKEY_TYPE {
+		encAttrs["type"] = "pkmsg"
+	}
+	copyAttrs(extraAttrs, encAttrs)
 
 	return &waBinary.Node{
-		Tag: "enc",
-		Attrs: waBinary.Attrs{
-			"v":    "2",
-			"type": encType,
-		},
+		Tag:     "enc",
+		Attrs:   encAttrs,
 		Content: ciphertext.Serialize(),
-	}, encType == "pkmsg", nil
+	}, encAttrs["type"] == "pkmsg", nil
 }
diff --git a/vendor/go.mau.fi/whatsmeow/store/clientpayload.go b/vendor/go.mau.fi/whatsmeow/store/clientpayload.go
index 9e8b1778..5ef7d2e6 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, 2310, 5}
+var waVersion = WAVersionContainer{2, 2332, 15}
 
 // waVersionHash is the md5 hash of a dot-separated waVersion
 var waVersionHash [16]byte
diff --git a/vendor/go.mau.fi/whatsmeow/store/sqlstore/container.go b/vendor/go.mau.fi/whatsmeow/store/sqlstore/container.go
index 7f8c6c8f..4fbcec34 100644
--- a/vendor/go.mau.fi/whatsmeow/store/sqlstore/container.go
+++ b/vendor/go.mau.fi/whatsmeow/store/sqlstore/container.go
@@ -7,7 +7,6 @@
 package sqlstore
 
 import (
-	"crypto/rand"
 	"database/sql"
 	"errors"
 	"fmt"
@@ -18,6 +17,7 @@ import (
 	"go.mau.fi/whatsmeow/types"
 	"go.mau.fi/whatsmeow/util/keys"
 	waLog "go.mau.fi/whatsmeow/util/log"
+	"go.mau.fi/whatsmeow/util/randbytes"
 )
 
 // Container is a wrapper for a SQL database that can contain multiple whatsmeow sessions.
@@ -65,7 +65,12 @@ func New(dialect, address string, log waLog.Logger) (*Container, error) {
 //	if err != nil {
 //	    panic(err)
 //	}
-//	container, err := sqlstore.NewWithDB(db, "sqlite3", nil)
+//	container := sqlstore.NewWithDB(db, "sqlite3", nil)
+//
+// This method does not call Upgrade automatically like New does, so you must call it yourself:
+//
+//	container := sqlstore.NewWithDB(...)
+//	err := container.Upgrade()
 func NewWithDB(db *sql.DB, dialect string, log waLog.Logger) *Container {
 	if log == nil {
 		log = waLog.Noop
@@ -205,11 +210,7 @@ func (c *Container) NewDevice() *store.Device {
 		NoiseKey:       keys.NewKeyPair(),
 		IdentityKey:    keys.NewKeyPair(),
 		RegistrationID: mathRand.Uint32(),
-		AdvSecretKey:   make([]byte, 32),
-	}
-	_, err := rand.Read(device.AdvSecretKey)
-	if err != nil {
-		panic(err)
+		AdvSecretKey:   randbytes.Make(32),
 	}
 	device.SignedPreKey = device.IdentityKey.CreateSignedPreKey(1)
 	return device
diff --git a/vendor/go.mau.fi/whatsmeow/store/sqlstore/store.go b/vendor/go.mau.fi/whatsmeow/store/sqlstore/store.go
index f9f5a287..a6acdfc0 100644
--- a/vendor/go.mau.fi/whatsmeow/store/sqlstore/store.go
+++ b/vendor/go.mau.fi/whatsmeow/store/sqlstore/store.go
@@ -284,7 +284,8 @@ const (
 			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`
+	getAppStateSyncKeyQuery         = `SELECT key_data, timestamp, fingerprint FROM whatsmeow_app_state_sync_keys WHERE jid=$1 AND key_id=$2`
+	getLatestAppStateSyncKeyIDQuery = `SELECT key_id FROM whatsmeow_app_state_sync_keys WHERE jid=$1 ORDER BY timestamp DESC LIMIT 1`
 )
 
 func (s *SQLStore) PutAppStateSyncKey(id []byte, key store.AppStateSyncKey) error {
@@ -301,6 +302,15 @@ func (s *SQLStore) GetAppStateSyncKey(id []byte) (*store.AppStateSyncKey, error)
 	return &key, err
 }
 
+func (s *SQLStore) GetLatestAppStateSyncKeyID() ([]byte, error) {
+	var keyID []byte
+	err := s.db.QueryRow(getLatestAppStateSyncKeyIDQuery, s.JID).Scan(&keyID)
+	if errors.Is(err, sql.ErrNoRows) {
+		return nil, nil
+	}
+	return keyID, err
+}
+
 const (
 	putAppStateVersionQuery = `
 		INSERT INTO whatsmeow_app_state_version (jid, name, version, hash) VALUES ($1, $2, $3, $4)
diff --git a/vendor/go.mau.fi/whatsmeow/store/store.go b/vendor/go.mau.fi/whatsmeow/store/store.go
index 36a6dce9..49c2176e 100644
--- a/vendor/go.mau.fi/whatsmeow/store/store.go
+++ b/vendor/go.mau.fi/whatsmeow/store/store.go
@@ -55,6 +55,7 @@ type AppStateSyncKey struct {
 type AppStateSyncKeyStore interface {
 	PutAppStateSyncKey(id []byte, key AppStateSyncKey) error
 	GetAppStateSyncKey(id []byte) (*AppStateSyncKey, error)
+	GetLatestAppStateSyncKeyID() ([]byte, error)
 }
 
 type AppStateMutationMAC struct {
diff --git a/vendor/go.mau.fi/whatsmeow/types/events/appstate.go b/vendor/go.mau.fi/whatsmeow/types/events/appstate.go
index d462d6f3..285e546b 100644
--- a/vendor/go.mau.fi/whatsmeow/types/events/appstate.go
+++ b/vendor/go.mau.fi/whatsmeow/types/events/appstate.go
@@ -19,7 +19,8 @@ type Contact struct {
 	JID       types.JID // The contact who was modified.
 	Timestamp time.Time // The time when the modification happened.'
 
-	Action *waProto.ContactAction // The new contact info.
+	Action       *waProto.ContactAction // The new contact info.
+	FromFullSync bool                   // Whether the action is emitted because of a fullSync
 }
 
 // PushName is emitted when a message is received with a different push name than the previous value cached for the same user.
@@ -43,7 +44,8 @@ type Pin struct {
 	JID       types.JID // The chat which was pinned or unpinned.
 	Timestamp time.Time // The time when the (un)pinning happened.
 
-	Action *waProto.PinAction // Whether the chat is now pinned or not.
+	Action       *waProto.PinAction // Whether the chat is now pinned or not.
+	FromFullSync bool               // Whether the action is emitted because of a fullSync
 }
 
 // Star is emitted when a message is starred or unstarred from another device.
@@ -54,7 +56,8 @@ type Star struct {
 	MessageID string    // The message which was starred or unstarred.
 	Timestamp time.Time // The time when the (un)starring happened.
 
-	Action *waProto.StarAction // Whether the message is now starred or not.
+	Action       *waProto.StarAction // Whether the message is now starred or not.
+	FromFullSync bool                // Whether the action is emitted because of a fullSync
 }
 
 // DeleteForMe is emitted when a message is deleted (for the current user only) from another device.
@@ -65,7 +68,8 @@ type DeleteForMe struct {
 	MessageID string    // The message which was deleted.
 	Timestamp time.Time // The time when the deletion happened.
 
-	Action *waProto.DeleteMessageForMeAction // Additional information for the deletion.
+	Action       *waProto.DeleteMessageForMeAction // Additional information for the deletion.
+	FromFullSync bool                              // Whether the action is emitted because of a fullSync
 }
 
 // Mute is emitted when a chat is muted or unmuted from another device.
@@ -73,7 +77,8 @@ type Mute struct {
 	JID       types.JID // The chat which was muted or unmuted.
 	Timestamp time.Time // The time when the (un)muting happened.
 
-	Action *waProto.MuteAction // The current mute status of the chat.
+	Action       *waProto.MuteAction // The current mute status of the chat.
+	FromFullSync bool                // Whether the action is emitted because of a fullSync
 }
 
 // Archive is emitted when a chat is archived or unarchived from another device.
@@ -81,7 +86,8 @@ type Archive struct {
 	JID       types.JID // The chat which was archived or unarchived.
 	Timestamp time.Time // The time when the (un)archiving happened.
 
-	Action *waProto.ArchiveChatAction // The current archival status of the chat.
+	Action       *waProto.ArchiveChatAction // The current archival status of the chat.
+	FromFullSync bool                       // Whether the action is emitted because of a fullSync
 }
 
 // MarkChatAsRead is emitted when a whole chat is marked as read or unread from another device.
@@ -89,7 +95,17 @@ type MarkChatAsRead struct {
 	JID       types.JID // The chat which was marked as read or unread.
 	Timestamp time.Time // The time when the marking happened.
 
-	Action *waProto.MarkChatAsReadAction // Whether the chat was marked as read or unread, and info about the most recent messages.
+	Action       *waProto.MarkChatAsReadAction // Whether the chat was marked as read or unread, and info about the most recent messages.
+	FromFullSync bool                          // Whether the action is emitted because of a fullSync
+}
+
+// ClearChat is emitted when a chat is cleared on another device. This is different from DeleteChat.
+type ClearChat struct {
+	JID       types.JID // The chat which was cleared.
+	Timestamp time.Time // The time when the clear happened.
+
+	Action       *waProto.ClearChatAction // Information about the clear.
+	FromFullSync bool                     // Whether the action is emitted because of a fullSync
 }
 
 // DeleteChat is emitted when a chat is deleted on another device.
@@ -97,21 +113,33 @@ type DeleteChat struct {
 	JID       types.JID // The chat which was deleted.
 	Timestamp time.Time // The time when the deletion happened.
 
-	Action *waProto.DeleteChatAction // Information about the deletion.
+	Action       *waProto.DeleteChatAction // Information about the deletion.
+	FromFullSync bool                      // Whether the action is emitted because of a fullSync
 }
 
 // PushNameSetting is emitted when the user's push name is changed from another device.
 type PushNameSetting struct {
 	Timestamp time.Time // The time when the push name was changed.
 
-	Action *waProto.PushNameSetting // The new push name for the user.
+	Action       *waProto.PushNameSetting // The new push name for the user.
+	FromFullSync bool                     // Whether the action is emitted because of a fullSync
 }
 
 // UnarchiveChatsSetting is emitted when the user changes the "Keep chats archived" setting from another device.
 type UnarchiveChatsSetting struct {
 	Timestamp time.Time // The time when the setting was changed.
 
-	Action *waProto.UnarchiveChatsSetting // The new settings.
+	Action       *waProto.UnarchiveChatsSetting // The new settings.
+	FromFullSync bool                           // Whether the action is emitted because of a fullSync
+}
+
+// UserStatusMute is emitted when the user mutes or unmutes another user's status updates.
+type UserStatusMute struct {
+	JID       types.JID // The user who was muted or unmuted
+	Timestamp time.Time // The timestamp when the action happened
+
+	Action       *waProto.UserStatusMuteAction // The new mute status
+	FromFullSync bool                          // Whether the action is emitted because of a fullSync
 }
 
 // AppState is emitted directly for new data received from app state syncing.
diff --git a/vendor/go.mau.fi/whatsmeow/types/events/events.go b/vendor/go.mau.fi/whatsmeow/types/events/events.go
index 4ec38d20..e1124e85 100644
--- a/vendor/go.mau.fi/whatsmeow/types/events/events.go
+++ b/vendor/go.mau.fi/whatsmeow/types/events/events.go
@@ -176,8 +176,9 @@ func (cfr ConnectFailureReason) String() string {
 //
 // Known reasons are handled internally and emitted as different events (e.g. LoggedOut and TemporaryBan).
 type ConnectFailure struct {
-	Reason ConnectFailureReason
-	Raw    *waBinary.Node
+	Reason  ConnectFailureReason
+	Message string
+	Raw     *waBinary.Node
 }
 
 // ClientOutdated is emitted when the WhatsApp server rejects the connection with the ConnectFailureClientOutdated code.
@@ -199,6 +200,13 @@ type HistorySync struct {
 	Data *waProto.HistorySync
 }
 
+type DecryptFailMode string
+
+const (
+	DecryptFailShow DecryptFailMode = ""
+	DecryptFailHide DecryptFailMode = "hide"
+)
+
 // UndecryptableMessage is emitted when receiving a new message that failed to decrypt.
 //
 // The library will automatically ask the sender to retry. If the sender resends the message,
@@ -211,6 +219,8 @@ type UndecryptableMessage struct {
 	// IsUnavailable is true if the recipient device didn't send a ciphertext to this device at all
 	// (as opposed to sending a ciphertext, but the ciphertext not being decryptable).
 	IsUnavailable bool
+
+	DecryptFailMode DecryptFailMode
 }
 
 // Message is emitted when receiving a new message.
@@ -224,6 +234,13 @@ type Message struct {
 	IsDocumentWithCaption bool // True if the message was unwrapped from a DocumentWithCaptionMessage
 	IsEdit                bool // True if the message was unwrapped from an EditedMessage
 
+	// If this event was parsed from a WebMessageInfo (i.e. from a history sync or unavailable message request), the source data is here.
+	SourceWebMsg *waProto.WebMessageInfo
+	// If this event is a response to an unavailable message request, the request ID is here.
+	UnavailableRequestID types.MessageID
+	// If the message was re-requested from the sender, this is the number of retries it took.
+	RetryCount int
+
 	// The raw message struct. This is the raw unmodified data, which means the actual message might
 	// be wrapped in DeviceSentMessage, EphemeralMessage or ViewOnceMessage.
 	RawMessage *waProto.Message
diff --git a/vendor/go.mau.fi/whatsmeow/upload.go b/vendor/go.mau.fi/whatsmeow/upload.go
index c72025f0..8bdc1543 100644
--- a/vendor/go.mau.fi/whatsmeow/upload.go
+++ b/vendor/go.mau.fi/whatsmeow/upload.go
@@ -10,7 +10,6 @@ import (
 	"bytes"
 	"context"
 	"crypto/hmac"
-	"crypto/rand"
 	"crypto/sha256"
 	"encoding/base64"
 	"encoding/json"
@@ -20,6 +19,7 @@ import (
 
 	"go.mau.fi/whatsmeow/socket"
 	"go.mau.fi/whatsmeow/util/cbcutil"
+	"go.mau.fi/whatsmeow/util/randbytes"
 )
 
 // UploadResponse contains the data from the attachment upload, which can be put into a message to send the attachment.
@@ -62,11 +62,7 @@ type UploadResponse struct {
 // The same applies to the other message types like DocumentMessage, just replace the struct type and Message field name.
 func (cli *Client) Upload(ctx context.Context, plaintext []byte, appInfo MediaType) (resp UploadResponse, err error) {
 	resp.FileLength = uint64(len(plaintext))
-	resp.MediaKey = make([]byte, 32)
-	_, err = rand.Read(resp.MediaKey)
-	if err != nil {
-		return
-	}
+	resp.MediaKey = randbytes.Make(32)
 
 	plaintextSHA256 := sha256.Sum256(plaintext)
 	resp.FileSHA256 = plaintextSHA256[:]
diff --git a/vendor/go.mau.fi/whatsmeow/util/keys/keypair.go b/vendor/go.mau.fi/whatsmeow/util/keys/keypair.go
index 55679ff2..75b050aa 100644
--- a/vendor/go.mau.fi/whatsmeow/util/keys/keypair.go
+++ b/vendor/go.mau.fi/whatsmeow/util/keys/keypair.go
@@ -8,11 +8,10 @@
 package keys
 
 import (
-	"crypto/rand"
-	"fmt"
-
 	"go.mau.fi/libsignal/ecc"
 	"golang.org/x/crypto/curve25519"
+
+	"go.mau.fi/whatsmeow/util/randbytes"
 )
 
 type KeyPair struct {
@@ -32,12 +31,7 @@ func NewKeyPairFromPrivateKey(priv [32]byte) *KeyPair {
 }
 
 func NewKeyPair() *KeyPair {
-	var priv [32]byte
-
-	_, err := rand.Read(priv[:])
-	if err != nil {
-		panic(fmt.Errorf("failed to generate curve25519 private key: %w", err))
-	}
+	priv := *(*[32]byte)(randbytes.Make(32))
 
 	priv[0] &= 248
 	priv[31] &= 127
diff --git a/vendor/go.mau.fi/whatsmeow/util/randbytes/randbytes.go b/vendor/go.mau.fi/whatsmeow/util/randbytes/randbytes.go
new file mode 100644
index 00000000..befcd4e9
--- /dev/null
+++ b/vendor/go.mau.fi/whatsmeow/util/randbytes/randbytes.go
@@ -0,0 +1,15 @@
+package randbytes
+
+import (
+	"crypto/rand"
+	"fmt"
+)
+
+func Make(length int) []byte {
+	random := make([]byte, length)
+	_, err := rand.Read(random)
+	if err != nil {
+		panic(fmt.Errorf("failed to get random bytes: %w", err))
+	}
+	return random
+}
diff --git a/vendor/go.uber.org/atomic/.codecov.yml b/vendor/go.uber.org/atomic/.codecov.yml
deleted file mode 100644
index 571116cc..00000000
--- a/vendor/go.uber.org/atomic/.codecov.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-coverage:
-  range: 80..100
-  round: down
-  precision: 2
-
-  status:
-    project:                   # measuring the overall project coverage
-      default:                 # context, you can create multiple ones with custom titles
-        enabled: yes           # must be yes|true to enable this status
-        target: 100            # specify the target coverage for each commit status
-                               #   option: "auto" (must increase from parent commit or pull request base)
-                               #   option: "X%" a static target percentage to hit
-        if_not_found: success  # if parent is not found report status as success, error, or failure
-        if_ci_failed: error    # if ci fails report status as success, error, or failure
-
-# Also update COVER_IGNORE_PKGS in the Makefile.
-ignore:
-  - /internal/gen-atomicint/
-  - /internal/gen-valuewrapper/
diff --git a/vendor/go.uber.org/atomic/.gitignore b/vendor/go.uber.org/atomic/.gitignore
deleted file mode 100644
index 2e337a0e..00000000
--- a/vendor/go.uber.org/atomic/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-/bin
-.DS_Store
-/vendor
-cover.html
-cover.out
-lint.log
-
-# Binaries
-*.test
-
-# Profiling output
-*.prof
-
-# Output of fossa analyzer
-/fossa
diff --git a/vendor/go.uber.org/atomic/CHANGELOG.md b/vendor/go.uber.org/atomic/CHANGELOG.md
deleted file mode 100644
index 38f564e2..00000000
--- a/vendor/go.uber.org/atomic/CHANGELOG.md
+++ /dev/null
@@ -1,100 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [1.9.0] - 2021-07-15
-### Added
-- Add `Float64.Swap` to match int atomic operations.
-- Add `atomic.Time` type for atomic operations on `time.Time` values.
-
-[1.9.0]: https://github.com/uber-go/atomic/compare/v1.8.0...v1.9.0
-
-## [1.8.0] - 2021-06-09
-### Added
-- Add `atomic.Uintptr` type for atomic operations on `uintptr` values.
-- Add `atomic.UnsafePointer` type for atomic operations on `unsafe.Pointer` values.
-
-[1.8.0]: https://github.com/uber-go/atomic/compare/v1.7.0...v1.8.0
-
-## [1.7.0] - 2020-09-14
-### Added
-- Support JSON serialization and deserialization of primitive atomic types.
-- Support Text marshalling and unmarshalling for string atomics.
-
-### Changed
-- Disallow incorrect comparison of atomic values in a non-atomic way.
-
-### Removed
-- Remove dependency on `golang.org/x/{lint, tools}`.
-
-[1.7.0]: https://github.com/uber-go/atomic/compare/v1.6.0...v1.7.0
-
-## [1.6.0] - 2020-02-24
-### Changed
-- Drop library dependency on `golang.org/x/{lint, tools}`.
-
-[1.6.0]: https://github.com/uber-go/atomic/compare/v1.5.1...v1.6.0
-
-## [1.5.1] - 2019-11-19
-- Fix bug where `Bool.CAS` and `Bool.Toggle` do work correctly together
-  causing `CAS` to fail even though the old value matches.
-
-[1.5.1]: https://github.com/uber-go/atomic/compare/v1.5.0...v1.5.1
-
-## [1.5.0] - 2019-10-29
-### Changed
-- With Go modules, only the `go.uber.org/atomic` import path is supported now.
-  If you need to use the old import path, please add a `replace` directive to
-  your `go.mod`.
-
-[1.5.0]: https://github.com/uber-go/atomic/compare/v1.4.0...v1.5.0
-
-## [1.4.0] - 2019-05-01
-### Added
- - Add `atomic.Error` type for atomic operations on `error` values.
-
-[1.4.0]: https://github.com/uber-go/atomic/compare/v1.3.2...v1.4.0
-
-## [1.3.2] - 2018-05-02
-### Added
-- Add `atomic.Duration` type for atomic operations on `time.Duration` values.
-
-[1.3.2]: https://github.com/uber-go/atomic/compare/v1.3.1...v1.3.2
-
-## [1.3.1] - 2017-11-14
-### Fixed
-- Revert optimization for `atomic.String.Store("")` which caused data races.
-
-[1.3.1]: https://github.com/uber-go/atomic/compare/v1.3.0...v1.3.1
-
-## [1.3.0] - 2017-11-13
-### Added
-- Add `atomic.Bool.CAS` for compare-and-swap semantics on bools.
-
-### Changed
-- Optimize `atomic.String.Store("")` by avoiding an allocation.
-
-[1.3.0]: https://github.com/uber-go/atomic/compare/v1.2.0...v1.3.0
-
-## [1.2.0] - 2017-04-12
-### Added
-- Shadow `atomic.Value` from `sync/atomic`.
-
-[1.2.0]: https://github.com/uber-go/atomic/compare/v1.1.0...v1.2.0
-
-## [1.1.0] - 2017-03-10
-### Added
-- Add atomic `Float64` type.
-
-### Changed
-- Support new `go.uber.org/atomic` import path.
-
-[1.1.0]: https://github.com/uber-go/atomic/compare/v1.0.0...v1.1.0
-
-## [1.0.0] - 2016-07-18
-
-- Initial release.
-
-[1.0.0]: https://github.com/uber-go/atomic/releases/tag/v1.0.0
diff --git a/vendor/go.uber.org/atomic/LICENSE.txt b/vendor/go.uber.org/atomic/LICENSE.txt
deleted file mode 100644
index 8765c9fb..00000000
--- a/vendor/go.uber.org/atomic/LICENSE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2016 Uber Technologies, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/go.uber.org/atomic/Makefile b/vendor/go.uber.org/atomic/Makefile
deleted file mode 100644
index 46c945b3..00000000
--- a/vendor/go.uber.org/atomic/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-# Directory to place `go install`ed binaries into.
-export GOBIN ?= $(shell pwd)/bin
-
-GOLINT = $(GOBIN)/golint
-GEN_ATOMICINT = $(GOBIN)/gen-atomicint
-GEN_ATOMICWRAPPER = $(GOBIN)/gen-atomicwrapper
-STATICCHECK = $(GOBIN)/staticcheck
-
-GO_FILES ?= $(shell find . '(' -path .git -o -path vendor ')' -prune -o -name '*.go' -print)
-
-# Also update ignore section in .codecov.yml.
-COVER_IGNORE_PKGS = \
-	go.uber.org/atomic/internal/gen-atomicint \
-	go.uber.org/atomic/internal/gen-atomicwrapper
-
-.PHONY: build
-build:
-	go build ./...
-
-.PHONY: test
-test:
-	go test -race ./...
-
-.PHONY: gofmt
-gofmt:
-	$(eval FMT_LOG := $(shell mktemp -t gofmt.XXXXX))
-	gofmt -e -s -l $(GO_FILES) > $(FMT_LOG) || true
-	@[ ! -s "$(FMT_LOG)" ] || (echo "gofmt failed:" && cat $(FMT_LOG) && false)
-
-$(GOLINT):
-	cd tools && go install golang.org/x/lint/golint
-
-$(STATICCHECK):
-	cd tools && go install honnef.co/go/tools/cmd/staticcheck
-
-$(GEN_ATOMICWRAPPER): $(wildcard ./internal/gen-atomicwrapper/*)
-	go build -o $@ ./internal/gen-atomicwrapper
-
-$(GEN_ATOMICINT): $(wildcard ./internal/gen-atomicint/*)
-	go build -o $@ ./internal/gen-atomicint
-
-.PHONY: golint
-golint: $(GOLINT)
-	$(GOLINT) ./...
-
-.PHONY: staticcheck
-staticcheck: $(STATICCHECK)
-	$(STATICCHECK) ./...
-
-.PHONY: lint
-lint: gofmt golint staticcheck generatenodirty
-
-# comma separated list of packages to consider for code coverage.
-COVER_PKG = $(shell \
-	go list -find ./... | \
-	grep -v $(foreach pkg,$(COVER_IGNORE_PKGS),-e "^$(pkg)$$") | \
-	paste -sd, -)
-
-.PHONY: cover
-cover:
-	go test -coverprofile=cover.out -coverpkg  $(COVER_PKG) -v ./...
-	go tool cover -html=cover.out -o cover.html
-
-.PHONY: generate
-generate: $(GEN_ATOMICINT) $(GEN_ATOMICWRAPPER)
-	go generate ./...
-
-.PHONY: generatenodirty
-generatenodirty:
-	@[ -z "$$(git status --porcelain)" ] || ( \
-		echo "Working tree is dirty. Commit your changes first."; \
-		git status; \
-		exit 1 )
-	@make generate
-	@status=$$(git status --porcelain); \
-		[ -z "$$status" ] || ( \
-		echo "Working tree is dirty after `make generate`:"; \
-		echo "$$status"; \
-		echo "Please ensure that the generated code is up-to-date." )
diff --git a/vendor/go.uber.org/atomic/README.md b/vendor/go.uber.org/atomic/README.md
deleted file mode 100644
index 96b47a1f..00000000
--- a/vendor/go.uber.org/atomic/README.md
+++ /dev/null
@@ -1,63 +0,0 @@
-# atomic [![GoDoc][doc-img]][doc] [![Build Status][ci-img]][ci] [![Coverage Status][cov-img]][cov] [![Go Report Card][reportcard-img]][reportcard]
-
-Simple wrappers for primitive types to enforce atomic access.
-
-## Installation
-
-```shell
-$ go get -u go.uber.org/atomic@v1
-```
-
-### Legacy Import Path
-
-As of v1.5.0, the import path `go.uber.org/atomic` is the only supported way
-of using this package. If you are using Go modules, this package will fail to
-compile with the legacy import path path `github.com/uber-go/atomic`.
-
-We recommend migrating your code to the new import path but if you're unable
-to do so, or if your dependencies are still using the old import path, you
-will have to add a `replace` directive to your `go.mod` file downgrading the
-legacy import path to an older version.
-
-```
-replace github.com/uber-go/atomic => github.com/uber-go/atomic v1.4.0
-```
-
-You can do so automatically by running the following command.
-
-```shell
-$ go mod edit -replace github.com/uber-go/atomic=github.com/uber-go/atomic@v1.4.0
-```
-
-## Usage
-
-The standard library's `sync/atomic` is powerful, but it's easy to forget which
-variables must be accessed atomically. `go.uber.org/atomic` preserves all the
-functionality of the standard library, but wraps the primitive types to
-provide a safer, more convenient API.
-
-```go
-var atom atomic.Uint32
-atom.Store(42)
-atom.Sub(2)
-atom.CAS(40, 11)
-```
-
-See the [documentation][doc] for a complete API specification.
-
-## Development Status
-
-Stable.
-
----
-
-Released under the [MIT License](LICENSE.txt).
-
-[doc-img]: https://godoc.org/github.com/uber-go/atomic?status.svg
-[doc]: https://godoc.org/go.uber.org/atomic
-[ci-img]: https://github.com/uber-go/atomic/actions/workflows/go.yml/badge.svg
-[ci]: https://github.com/uber-go/atomic/actions/workflows/go.yml
-[cov-img]: https://codecov.io/gh/uber-go/atomic/branch/master/graph/badge.svg
-[cov]: https://codecov.io/gh/uber-go/atomic
-[reportcard-img]: https://goreportcard.com/badge/go.uber.org/atomic
-[reportcard]: https://goreportcard.com/report/go.uber.org/atomic
diff --git a/vendor/go.uber.org/atomic/bool.go b/vendor/go.uber.org/atomic/bool.go
deleted file mode 100644
index 209df7bb..00000000
--- a/vendor/go.uber.org/atomic/bool.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// @generated Code generated by gen-atomicwrapper.
-
-// Copyright (c) 2020-2021 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-import (
-	"encoding/json"
-)
-
-// Bool is an atomic type-safe wrapper for bool values.
-type Bool struct {
-	_ nocmp // disallow non-atomic comparison
-
-	v Uint32
-}
-
-var _zeroBool bool
-
-// NewBool creates a new Bool.
-func NewBool(val bool) *Bool {
-	x := &Bool{}
-	if val != _zeroBool {
-		x.Store(val)
-	}
-	return x
-}
-
-// Load atomically loads the wrapped bool.
-func (x *Bool) Load() bool {
-	return truthy(x.v.Load())
-}
-
-// Store atomically stores the passed bool.
-func (x *Bool) Store(val bool) {
-	x.v.Store(boolToInt(val))
-}
-
-// CAS is an atomic compare-and-swap for bool values.
-func (x *Bool) CAS(old, new bool) (swapped bool) {
-	return x.v.CAS(boolToInt(old), boolToInt(new))
-}
-
-// Swap atomically stores the given bool and returns the old
-// value.
-func (x *Bool) Swap(val bool) (old bool) {
-	return truthy(x.v.Swap(boolToInt(val)))
-}
-
-// MarshalJSON encodes the wrapped bool into JSON.
-func (x *Bool) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.Load())
-}
-
-// UnmarshalJSON decodes a bool from JSON.
-func (x *Bool) UnmarshalJSON(b []byte) error {
-	var v bool
-	if err := json.Unmarshal(b, &v); err != nil {
-		return err
-	}
-	x.Store(v)
-	return nil
-}
diff --git a/vendor/go.uber.org/atomic/bool_ext.go b/vendor/go.uber.org/atomic/bool_ext.go
deleted file mode 100644
index a2e60e98..00000000
--- a/vendor/go.uber.org/atomic/bool_ext.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) 2020 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-import (
-	"strconv"
-)
-
-//go:generate bin/gen-atomicwrapper -name=Bool -type=bool -wrapped=Uint32 -pack=boolToInt -unpack=truthy -cas -swap -json -file=bool.go
-
-func truthy(n uint32) bool {
-	return n == 1
-}
-
-func boolToInt(b bool) uint32 {
-	if b {
-		return 1
-	}
-	return 0
-}
-
-// Toggle atomically negates the Boolean and returns the previous value.
-func (b *Bool) Toggle() (old bool) {
-	for {
-		old := b.Load()
-		if b.CAS(old, !old) {
-			return old
-		}
-	}
-}
-
-// String encodes the wrapped value as a string.
-func (b *Bool) String() string {
-	return strconv.FormatBool(b.Load())
-}
diff --git a/vendor/go.uber.org/atomic/doc.go b/vendor/go.uber.org/atomic/doc.go
deleted file mode 100644
index ae7390ee..00000000
--- a/vendor/go.uber.org/atomic/doc.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2020 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-// Package atomic provides simple wrappers around numerics to enforce atomic
-// access.
-package atomic
diff --git a/vendor/go.uber.org/atomic/duration.go b/vendor/go.uber.org/atomic/duration.go
deleted file mode 100644
index 207594f5..00000000
--- a/vendor/go.uber.org/atomic/duration.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// @generated Code generated by gen-atomicwrapper.
-
-// Copyright (c) 2020-2021 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-import (
-	"encoding/json"
-	"time"
-)
-
-// Duration is an atomic type-safe wrapper for time.Duration values.
-type Duration struct {
-	_ nocmp // disallow non-atomic comparison
-
-	v Int64
-}
-
-var _zeroDuration time.Duration
-
-// NewDuration creates a new Duration.
-func NewDuration(val time.Duration) *Duration {
-	x := &Duration{}
-	if val != _zeroDuration {
-		x.Store(val)
-	}
-	return x
-}
-
-// Load atomically loads the wrapped time.Duration.
-func (x *Duration) Load() time.Duration {
-	return time.Duration(x.v.Load())
-}
-
-// Store atomically stores the passed time.Duration.
-func (x *Duration) Store(val time.Duration) {
-	x.v.Store(int64(val))
-}
-
-// CAS is an atomic compare-and-swap for time.Duration values.
-func (x *Duration) CAS(old, new time.Duration) (swapped bool) {
-	return x.v.CAS(int64(old), int64(new))
-}
-
-// Swap atomically stores the given time.Duration and returns the old
-// value.
-func (x *Duration) Swap(val time.Duration) (old time.Duration) {
-	return time.Duration(x.v.Swap(int64(val)))
-}
-
-// MarshalJSON encodes the wrapped time.Duration into JSON.
-func (x *Duration) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.Load())
-}
-
-// UnmarshalJSON decodes a time.Duration from JSON.
-func (x *Duration) UnmarshalJSON(b []byte) error {
-	var v time.Duration
-	if err := json.Unmarshal(b, &v); err != nil {
-		return err
-	}
-	x.Store(v)
-	return nil
-}
diff --git a/vendor/go.uber.org/atomic/duration_ext.go b/vendor/go.uber.org/atomic/duration_ext.go
deleted file mode 100644
index 4c18b0a9..00000000
--- a/vendor/go.uber.org/atomic/duration_ext.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2020 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-import "time"
-
-//go:generate bin/gen-atomicwrapper -name=Duration -type=time.Duration -wrapped=Int64 -pack=int64 -unpack=time.Duration -cas -swap -json -imports time -file=duration.go
-
-// Add atomically adds to the wrapped time.Duration and returns the new value.
-func (d *Duration) Add(delta time.Duration) time.Duration {
-	return time.Duration(d.v.Add(int64(delta)))
-}
-
-// Sub atomically subtracts from the wrapped time.Duration and returns the new value.
-func (d *Duration) Sub(delta time.Duration) time.Duration {
-	return time.Duration(d.v.Sub(int64(delta)))
-}
-
-// String encodes the wrapped value as a string.
-func (d *Duration) String() string {
-	return d.Load().String()
-}
diff --git a/vendor/go.uber.org/atomic/error.go b/vendor/go.uber.org/atomic/error.go
deleted file mode 100644
index 3be19c35..00000000
--- a/vendor/go.uber.org/atomic/error.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// @generated Code generated by gen-atomicwrapper.
-
-// Copyright (c) 2020-2021 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-// Error is an atomic type-safe wrapper for error values.
-type Error struct {
-	_ nocmp // disallow non-atomic comparison
-
-	v Value
-}
-
-var _zeroError error
-
-// NewError creates a new Error.
-func NewError(val error) *Error {
-	x := &Error{}
-	if val != _zeroError {
-		x.Store(val)
-	}
-	return x
-}
-
-// Load atomically loads the wrapped error.
-func (x *Error) Load() error {
-	return unpackError(x.v.Load())
-}
-
-// Store atomically stores the passed error.
-func (x *Error) Store(val error) {
-	x.v.Store(packError(val))
-}
diff --git a/vendor/go.uber.org/atomic/error_ext.go b/vendor/go.uber.org/atomic/error_ext.go
deleted file mode 100644
index ffe0be21..00000000
--- a/vendor/go.uber.org/atomic/error_ext.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2020 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-// atomic.Value panics on nil inputs, or if the underlying type changes.
-// Stabilize by always storing a custom struct that we control.
-
-//go:generate bin/gen-atomicwrapper -name=Error -type=error -wrapped=Value -pack=packError -unpack=unpackError -file=error.go
-
-type packedError struct{ Value error }
-
-func packError(v error) interface{} {
-	return packedError{v}
-}
-
-func unpackError(v interface{}) error {
-	if err, ok := v.(packedError); ok {
-		return err.Value
-	}
-	return nil
-}
diff --git a/vendor/go.uber.org/atomic/float64.go b/vendor/go.uber.org/atomic/float64.go
deleted file mode 100644
index 8a136718..00000000
--- a/vendor/go.uber.org/atomic/float64.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// @generated Code generated by gen-atomicwrapper.
-
-// Copyright (c) 2020-2021 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-import (
-	"encoding/json"
-	"math"
-)
-
-// Float64 is an atomic type-safe wrapper for float64 values.
-type Float64 struct {
-	_ nocmp // disallow non-atomic comparison
-
-	v Uint64
-}
-
-var _zeroFloat64 float64
-
-// NewFloat64 creates a new Float64.
-func NewFloat64(val float64) *Float64 {
-	x := &Float64{}
-	if val != _zeroFloat64 {
-		x.Store(val)
-	}
-	return x
-}
-
-// Load atomically loads the wrapped float64.
-func (x *Float64) Load() float64 {
-	return math.Float64frombits(x.v.Load())
-}
-
-// Store atomically stores the passed float64.
-func (x *Float64) Store(val float64) {
-	x.v.Store(math.Float64bits(val))
-}
-
-// Swap atomically stores the given float64 and returns the old
-// value.
-func (x *Float64) Swap(val float64) (old float64) {
-	return math.Float64frombits(x.v.Swap(math.Float64bits(val)))
-}
-
-// MarshalJSON encodes the wrapped float64 into JSON.
-func (x *Float64) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.Load())
-}
-
-// UnmarshalJSON decodes a float64 from JSON.
-func (x *Float64) UnmarshalJSON(b []byte) error {
-	var v float64
-	if err := json.Unmarshal(b, &v); err != nil {
-		return err
-	}
-	x.Store(v)
-	return nil
-}
diff --git a/vendor/go.uber.org/atomic/float64_ext.go b/vendor/go.uber.org/atomic/float64_ext.go
deleted file mode 100644
index df36b010..00000000
--- a/vendor/go.uber.org/atomic/float64_ext.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) 2020 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-import (
-	"math"
-	"strconv"
-)
-
-//go:generate bin/gen-atomicwrapper -name=Float64 -type=float64 -wrapped=Uint64 -pack=math.Float64bits -unpack=math.Float64frombits -swap -json -imports math -file=float64.go
-
-// Add atomically adds to the wrapped float64 and returns the new value.
-func (f *Float64) Add(delta float64) float64 {
-	for {
-		old := f.Load()
-		new := old + delta
-		if f.CAS(old, new) {
-			return new
-		}
-	}
-}
-
-// Sub atomically subtracts from the wrapped float64 and returns the new value.
-func (f *Float64) Sub(delta float64) float64 {
-	return f.Add(-delta)
-}
-
-// CAS is an atomic compare-and-swap for float64 values.
-//
-// Note: CAS handles NaN incorrectly. NaN != NaN using Go's inbuilt operators
-// but CAS allows a stored NaN to compare equal to a passed in NaN.
-// This avoids typical CAS loops from blocking forever, e.g.,
-//
-//   for {
-//     old := atom.Load()
-//     new = f(old)
-//     if atom.CAS(old, new) {
-//       break
-//     }
-//   }
-//
-// If CAS did not match NaN to match, then the above would loop forever.
-func (f *Float64) CAS(old, new float64) (swapped bool) {
-	return f.v.CAS(math.Float64bits(old), math.Float64bits(new))
-}
-
-// String encodes the wrapped value as a string.
-func (f *Float64) String() string {
-	// 'g' is the behavior for floats with %v.
-	return strconv.FormatFloat(f.Load(), 'g', -1, 64)
-}
diff --git a/vendor/go.uber.org/atomic/gen.go b/vendor/go.uber.org/atomic/gen.go
deleted file mode 100644
index 1e9ef4f8..00000000
--- a/vendor/go.uber.org/atomic/gen.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2020 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-//go:generate bin/gen-atomicint -name=Int32 -wrapped=int32 -file=int32.go
-//go:generate bin/gen-atomicint -name=Int64 -wrapped=int64 -file=int64.go
-//go:generate bin/gen-atomicint -name=Uint32 -wrapped=uint32 -unsigned -file=uint32.go
-//go:generate bin/gen-atomicint -name=Uint64 -wrapped=uint64 -unsigned -file=uint64.go
-//go:generate bin/gen-atomicint -name=Uintptr -wrapped=uintptr -unsigned -file=uintptr.go
diff --git a/vendor/go.uber.org/atomic/int32.go b/vendor/go.uber.org/atomic/int32.go
deleted file mode 100644
index 640ea36a..00000000
--- a/vendor/go.uber.org/atomic/int32.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// @generated Code generated by gen-atomicint.
-
-// Copyright (c) 2020-2021 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-import (
-	"encoding/json"
-	"strconv"
-	"sync/atomic"
-)
-
-// Int32 is an atomic wrapper around int32.
-type Int32 struct {
-	_ nocmp // disallow non-atomic comparison
-
-	v int32
-}
-
-// NewInt32 creates a new Int32.
-func NewInt32(val int32) *Int32 {
-	return &Int32{v: val}
-}
-
-// Load atomically loads the wrapped value.
-func (i *Int32) Load() int32 {
-	return atomic.LoadInt32(&i.v)
-}
-
-// Add atomically adds to the wrapped int32 and returns the new value.
-func (i *Int32) Add(delta int32) int32 {
-	return atomic.AddInt32(&i.v, delta)
-}
-
-// Sub atomically subtracts from the wrapped int32 and returns the new value.
-func (i *Int32) Sub(delta int32) int32 {
-	return atomic.AddInt32(&i.v, -delta)
-}
-
-// Inc atomically increments the wrapped int32 and returns the new value.
-func (i *Int32) Inc() int32 {
-	return i.Add(1)
-}
-
-// Dec atomically decrements the wrapped int32 and returns the new value.
-func (i *Int32) Dec() int32 {
-	return i.Sub(1)
-}
-
-// CAS is an atomic compare-and-swap.
-func (i *Int32) CAS(old, new int32) (swapped bool) {
-	return atomic.CompareAndSwapInt32(&i.v, old, new)
-}
-
-// Store atomically stores the passed value.
-func (i *Int32) Store(val int32) {
-	atomic.StoreInt32(&i.v, val)
-}
-
-// Swap atomically swaps the wrapped int32 and returns the old value.
-func (i *Int32) Swap(val int32) (old int32) {
-	return atomic.SwapInt32(&i.v, val)
-}
-
-// MarshalJSON encodes the wrapped int32 into JSON.
-func (i *Int32) MarshalJSON() ([]byte, error) {
-	return json.Marshal(i.Load())
-}
-
-// UnmarshalJSON decodes JSON into the wrapped int32.
-func (i *Int32) UnmarshalJSON(b []byte) error {
-	var v int32
-	if err := json.Unmarshal(b, &v); err != nil {
-		return err
-	}
-	i.Store(v)
-	return nil
-}
-
-// String encodes the wrapped value as a string.
-func (i *Int32) String() string {
-	v := i.Load()
-	return strconv.FormatInt(int64(v), 10)
-}
diff --git a/vendor/go.uber.org/atomic/int64.go b/vendor/go.uber.org/atomic/int64.go
deleted file mode 100644
index 9ab66b98..00000000
--- a/vendor/go.uber.org/atomic/int64.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// @generated Code generated by gen-atomicint.
-
-// Copyright (c) 2020-2021 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-import (
-	"encoding/json"
-	"strconv"
-	"sync/atomic"
-)
-
-// Int64 is an atomic wrapper around int64.
-type Int64 struct {
-	_ nocmp // disallow non-atomic comparison
-
-	v int64
-}
-
-// NewInt64 creates a new Int64.
-func NewInt64(val int64) *Int64 {
-	return &Int64{v: val}
-}
-
-// Load atomically loads the wrapped value.
-func (i *Int64) Load() int64 {
-	return atomic.LoadInt64(&i.v)
-}
-
-// Add atomically adds to the wrapped int64 and returns the new value.
-func (i *Int64) Add(delta int64) int64 {
-	return atomic.AddInt64(&i.v, delta)
-}
-
-// Sub atomically subtracts from the wrapped int64 and returns the new value.
-func (i *Int64) Sub(delta int64) int64 {
-	return atomic.AddInt64(&i.v, -delta)
-}
-
-// Inc atomically increments the wrapped int64 and returns the new value.
-func (i *Int64) Inc() int64 {
-	return i.Add(1)
-}
-
-// Dec atomically decrements the wrapped int64 and returns the new value.
-func (i *Int64) Dec() int64 {
-	return i.Sub(1)
-}
-
-// CAS is an atomic compare-and-swap.
-func (i *Int64) CAS(old, new int64) (swapped bool) {
-	return atomic.CompareAndSwapInt64(&i.v, old, new)
-}
-
-// Store atomically stores the passed value.
-func (i *Int64) Store(val int64) {
-	atomic.StoreInt64(&i.v, val)
-}
-
-// Swap atomically swaps the wrapped int64 and returns the old value.
-func (i *Int64) Swap(val int64) (old int64) {
-	return atomic.SwapInt64(&i.v, val)
-}
-
-// MarshalJSON encodes the wrapped int64 into JSON.
-func (i *Int64) MarshalJSON() ([]byte, error) {
-	return json.Marshal(i.Load())
-}
-
-// UnmarshalJSON decodes JSON into the wrapped int64.
-func (i *Int64) UnmarshalJSON(b []byte) error {
-	var v int64
-	if err := json.Unmarshal(b, &v); err != nil {
-		return err
-	}
-	i.Store(v)
-	return nil
-}
-
-// String encodes the wrapped value as a string.
-func (i *Int64) String() string {
-	v := i.Load()
-	return strconv.FormatInt(int64(v), 10)
-}
diff --git a/vendor/go.uber.org/atomic/nocmp.go b/vendor/go.uber.org/atomic/nocmp.go
deleted file mode 100644
index a8201cb4..00000000
--- a/vendor/go.uber.org/atomic/nocmp.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2020 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-// nocmp is an uncomparable struct. Embed this inside another struct to make
-// it uncomparable.
-//
-//  type Foo struct {
-//    nocmp
-//    // ...
-//  }
-//
-// This DOES NOT:
-//
-//  - Disallow shallow copies of structs
-//  - Disallow comparison of pointers to uncomparable structs
-type nocmp [0]func()
diff --git a/vendor/go.uber.org/atomic/string.go b/vendor/go.uber.org/atomic/string.go
deleted file mode 100644
index 80df93d0..00000000
--- a/vendor/go.uber.org/atomic/string.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// @generated Code generated by gen-atomicwrapper.
-
-// Copyright (c) 2020-2021 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-// String is an atomic type-safe wrapper for string values.
-type String struct {
-	_ nocmp // disallow non-atomic comparison
-
-	v Value
-}
-
-var _zeroString string
-
-// NewString creates a new String.
-func NewString(val string) *String {
-	x := &String{}
-	if val != _zeroString {
-		x.Store(val)
-	}
-	return x
-}
-
-// Load atomically loads the wrapped string.
-func (x *String) Load() string {
-	if v := x.v.Load(); v != nil {
-		return v.(string)
-	}
-	return _zeroString
-}
-
-// Store atomically stores the passed string.
-func (x *String) Store(val string) {
-	x.v.Store(val)
-}
diff --git a/vendor/go.uber.org/atomic/string_ext.go b/vendor/go.uber.org/atomic/string_ext.go
deleted file mode 100644
index 83d92eda..00000000
--- a/vendor/go.uber.org/atomic/string_ext.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) 2020 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-//go:generate bin/gen-atomicwrapper -name=String -type=string -wrapped=Value -file=string.go
-// Note: No Swap as String wraps Value, which wraps the stdlib sync/atomic.Value which
-// only supports Swap as of go1.17: https://github.com/golang/go/issues/39351
-
-// String returns the wrapped value.
-func (s *String) String() string {
-	return s.Load()
-}
-
-// MarshalText encodes the wrapped string into a textual form.
-//
-// This makes it encodable as JSON, YAML, XML, and more.
-func (s *String) MarshalText() ([]byte, error) {
-	return []byte(s.Load()), nil
-}
-
-// UnmarshalText decodes text and replaces the wrapped string with it.
-//
-// This makes it decodable from JSON, YAML, XML, and more.
-func (s *String) UnmarshalText(b []byte) error {
-	s.Store(string(b))
-	return nil
-}
diff --git a/vendor/go.uber.org/atomic/time.go b/vendor/go.uber.org/atomic/time.go
deleted file mode 100644
index 33460fc3..00000000
--- a/vendor/go.uber.org/atomic/time.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// @generated Code generated by gen-atomicwrapper.
-
-// Copyright (c) 2020-2021 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-import (
-	"time"
-)
-
-// Time is an atomic type-safe wrapper for time.Time values.
-type Time struct {
-	_ nocmp // disallow non-atomic comparison
-
-	v Value
-}
-
-var _zeroTime time.Time
-
-// NewTime creates a new Time.
-func NewTime(val time.Time) *Time {
-	x := &Time{}
-	if val != _zeroTime {
-		x.Store(val)
-	}
-	return x
-}
-
-// Load atomically loads the wrapped time.Time.
-func (x *Time) Load() time.Time {
-	return unpackTime(x.v.Load())
-}
-
-// Store atomically stores the passed time.Time.
-func (x *Time) Store(val time.Time) {
-	x.v.Store(packTime(val))
-}
diff --git a/vendor/go.uber.org/atomic/time_ext.go b/vendor/go.uber.org/atomic/time_ext.go
deleted file mode 100644
index 1e3dc978..00000000
--- a/vendor/go.uber.org/atomic/time_ext.go
+++ /dev/null
@@ -1,36 +0,0 @@
-//  Copyright (c) 2021 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-import "time"
-
-//go:generate bin/gen-atomicwrapper -name=Time -type=time.Time -wrapped=Value -pack=packTime -unpack=unpackTime -imports time -file=time.go
-
-func packTime(t time.Time) interface{} {
-	return t
-}
-
-func unpackTime(v interface{}) time.Time {
-	if t, ok := v.(time.Time); ok {
-		return t
-	}
-	return time.Time{}
-}
diff --git a/vendor/go.uber.org/atomic/uint32.go b/vendor/go.uber.org/atomic/uint32.go
deleted file mode 100644
index 7859a9cc..00000000
--- a/vendor/go.uber.org/atomic/uint32.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// @generated Code generated by gen-atomicint.
-
-// Copyright (c) 2020-2021 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-import (
-	"encoding/json"
-	"strconv"
-	"sync/atomic"
-)
-
-// Uint32 is an atomic wrapper around uint32.
-type Uint32 struct {
-	_ nocmp // disallow non-atomic comparison
-
-	v uint32
-}
-
-// NewUint32 creates a new Uint32.
-func NewUint32(val uint32) *Uint32 {
-	return &Uint32{v: val}
-}
-
-// Load atomically loads the wrapped value.
-func (i *Uint32) Load() uint32 {
-	return atomic.LoadUint32(&i.v)
-}
-
-// Add atomically adds to the wrapped uint32 and returns the new value.
-func (i *Uint32) Add(delta uint32) uint32 {
-	return atomic.AddUint32(&i.v, delta)
-}
-
-// Sub atomically subtracts from the wrapped uint32 and returns the new value.
-func (i *Uint32) Sub(delta uint32) uint32 {
-	return atomic.AddUint32(&i.v, ^(delta - 1))
-}
-
-// Inc atomically increments the wrapped uint32 and returns the new value.
-func (i *Uint32) Inc() uint32 {
-	return i.Add(1)
-}
-
-// Dec atomically decrements the wrapped uint32 and returns the new value.
-func (i *Uint32) Dec() uint32 {
-	return i.Sub(1)
-}
-
-// CAS is an atomic compare-and-swap.
-func (i *Uint32) CAS(old, new uint32) (swapped bool) {
-	return atomic.CompareAndSwapUint32(&i.v, old, new)
-}
-
-// Store atomically stores the passed value.
-func (i *Uint32) Store(val uint32) {
-	atomic.StoreUint32(&i.v, val)
-}
-
-// Swap atomically swaps the wrapped uint32 and returns the old value.
-func (i *Uint32) Swap(val uint32) (old uint32) {
-	return atomic.SwapUint32(&i.v, val)
-}
-
-// MarshalJSON encodes the wrapped uint32 into JSON.
-func (i *Uint32) MarshalJSON() ([]byte, error) {
-	return json.Marshal(i.Load())
-}
-
-// UnmarshalJSON decodes JSON into the wrapped uint32.
-func (i *Uint32) UnmarshalJSON(b []byte) error {
-	var v uint32
-	if err := json.Unmarshal(b, &v); err != nil {
-		return err
-	}
-	i.Store(v)
-	return nil
-}
-
-// String encodes the wrapped value as a string.
-func (i *Uint32) String() string {
-	v := i.Load()
-	return strconv.FormatUint(uint64(v), 10)
-}
diff --git a/vendor/go.uber.org/atomic/uint64.go b/vendor/go.uber.org/atomic/uint64.go
deleted file mode 100644
index 2f2a7db6..00000000
--- a/vendor/go.uber.org/atomic/uint64.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// @generated Code generated by gen-atomicint.
-
-// Copyright (c) 2020-2021 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-import (
-	"encoding/json"
-	"strconv"
-	"sync/atomic"
-)
-
-// Uint64 is an atomic wrapper around uint64.
-type Uint64 struct {
-	_ nocmp // disallow non-atomic comparison
-
-	v uint64
-}
-
-// NewUint64 creates a new Uint64.
-func NewUint64(val uint64) *Uint64 {
-	return &Uint64{v: val}
-}
-
-// Load atomically loads the wrapped value.
-func (i *Uint64) Load() uint64 {
-	return atomic.LoadUint64(&i.v)
-}
-
-// Add atomically adds to the wrapped uint64 and returns the new value.
-func (i *Uint64) Add(delta uint64) uint64 {
-	return atomic.AddUint64(&i.v, delta)
-}
-
-// Sub atomically subtracts from the wrapped uint64 and returns the new value.
-func (i *Uint64) Sub(delta uint64) uint64 {
-	return atomic.AddUint64(&i.v, ^(delta - 1))
-}
-
-// Inc atomically increments the wrapped uint64 and returns the new value.
-func (i *Uint64) Inc() uint64 {
-	return i.Add(1)
-}
-
-// Dec atomically decrements the wrapped uint64 and returns the new value.
-func (i *Uint64) Dec() uint64 {
-	return i.Sub(1)
-}
-
-// CAS is an atomic compare-and-swap.
-func (i *Uint64) CAS(old, new uint64) (swapped bool) {
-	return atomic.CompareAndSwapUint64(&i.v, old, new)
-}
-
-// Store atomically stores the passed value.
-func (i *Uint64) Store(val uint64) {
-	atomic.StoreUint64(&i.v, val)
-}
-
-// Swap atomically swaps the wrapped uint64 and returns the old value.
-func (i *Uint64) Swap(val uint64) (old uint64) {
-	return atomic.SwapUint64(&i.v, val)
-}
-
-// MarshalJSON encodes the wrapped uint64 into JSON.
-func (i *Uint64) MarshalJSON() ([]byte, error) {
-	return json.Marshal(i.Load())
-}
-
-// UnmarshalJSON decodes JSON into the wrapped uint64.
-func (i *Uint64) UnmarshalJSON(b []byte) error {
-	var v uint64
-	if err := json.Unmarshal(b, &v); err != nil {
-		return err
-	}
-	i.Store(v)
-	return nil
-}
-
-// String encodes the wrapped value as a string.
-func (i *Uint64) String() string {
-	v := i.Load()
-	return strconv.FormatUint(uint64(v), 10)
-}
diff --git a/vendor/go.uber.org/atomic/uintptr.go b/vendor/go.uber.org/atomic/uintptr.go
deleted file mode 100644
index ecf7a772..00000000
--- a/vendor/go.uber.org/atomic/uintptr.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// @generated Code generated by gen-atomicint.
-
-// Copyright (c) 2020-2021 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-import (
-	"encoding/json"
-	"strconv"
-	"sync/atomic"
-)
-
-// Uintptr is an atomic wrapper around uintptr.
-type Uintptr struct {
-	_ nocmp // disallow non-atomic comparison
-
-	v uintptr
-}
-
-// NewUintptr creates a new Uintptr.
-func NewUintptr(val uintptr) *Uintptr {
-	return &Uintptr{v: val}
-}
-
-// Load atomically loads the wrapped value.
-func (i *Uintptr) Load() uintptr {
-	return atomic.LoadUintptr(&i.v)
-}
-
-// Add atomically adds to the wrapped uintptr and returns the new value.
-func (i *Uintptr) Add(delta uintptr) uintptr {
-	return atomic.AddUintptr(&i.v, delta)
-}
-
-// Sub atomically subtracts from the wrapped uintptr and returns the new value.
-func (i *Uintptr) Sub(delta uintptr) uintptr {
-	return atomic.AddUintptr(&i.v, ^(delta - 1))
-}
-
-// Inc atomically increments the wrapped uintptr and returns the new value.
-func (i *Uintptr) Inc() uintptr {
-	return i.Add(1)
-}
-
-// Dec atomically decrements the wrapped uintptr and returns the new value.
-func (i *Uintptr) Dec() uintptr {
-	return i.Sub(1)
-}
-
-// CAS is an atomic compare-and-swap.
-func (i *Uintptr) CAS(old, new uintptr) (swapped bool) {
-	return atomic.CompareAndSwapUintptr(&i.v, old, new)
-}
-
-// Store atomically stores the passed value.
-func (i *Uintptr) Store(val uintptr) {
-	atomic.StoreUintptr(&i.v, val)
-}
-
-// Swap atomically swaps the wrapped uintptr and returns the old value.
-func (i *Uintptr) Swap(val uintptr) (old uintptr) {
-	return atomic.SwapUintptr(&i.v, val)
-}
-
-// MarshalJSON encodes the wrapped uintptr into JSON.
-func (i *Uintptr) MarshalJSON() ([]byte, error) {
-	return json.Marshal(i.Load())
-}
-
-// UnmarshalJSON decodes JSON into the wrapped uintptr.
-func (i *Uintptr) UnmarshalJSON(b []byte) error {
-	var v uintptr
-	if err := json.Unmarshal(b, &v); err != nil {
-		return err
-	}
-	i.Store(v)
-	return nil
-}
-
-// String encodes the wrapped value as a string.
-func (i *Uintptr) String() string {
-	v := i.Load()
-	return strconv.FormatUint(uint64(v), 10)
-}
diff --git a/vendor/go.uber.org/atomic/unsafe_pointer.go b/vendor/go.uber.org/atomic/unsafe_pointer.go
deleted file mode 100644
index 169f793d..00000000
--- a/vendor/go.uber.org/atomic/unsafe_pointer.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) 2021 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-import (
-	"sync/atomic"
-	"unsafe"
-)
-
-// UnsafePointer is an atomic wrapper around unsafe.Pointer.
-type UnsafePointer struct {
-	_ nocmp // disallow non-atomic comparison
-
-	v unsafe.Pointer
-}
-
-// NewUnsafePointer creates a new UnsafePointer.
-func NewUnsafePointer(val unsafe.Pointer) *UnsafePointer {
-	return &UnsafePointer{v: val}
-}
-
-// Load atomically loads the wrapped value.
-func (p *UnsafePointer) Load() unsafe.Pointer {
-	return atomic.LoadPointer(&p.v)
-}
-
-// Store atomically stores the passed value.
-func (p *UnsafePointer) Store(val unsafe.Pointer) {
-	atomic.StorePointer(&p.v, val)
-}
-
-// Swap atomically swaps the wrapped unsafe.Pointer and returns the old value.
-func (p *UnsafePointer) Swap(val unsafe.Pointer) (old unsafe.Pointer) {
-	return atomic.SwapPointer(&p.v, val)
-}
-
-// CAS is an atomic compare-and-swap.
-func (p *UnsafePointer) CAS(old, new unsafe.Pointer) (swapped bool) {
-	return atomic.CompareAndSwapPointer(&p.v, old, new)
-}
diff --git a/vendor/go.uber.org/atomic/value.go b/vendor/go.uber.org/atomic/value.go
deleted file mode 100644
index 671f3a38..00000000
--- a/vendor/go.uber.org/atomic/value.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2020 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package atomic
-
-import "sync/atomic"
-
-// Value shadows the type of the same name from sync/atomic
-// https://godoc.org/sync/atomic#Value
-type Value struct {
-	atomic.Value
-
-	_ nocmp // disallow non-atomic comparison
-}
diff --git a/vendor/go.uber.org/multierr/.codecov.yml b/vendor/go.uber.org/multierr/.codecov.yml
deleted file mode 100644
index 6d4d1be7..00000000
--- a/vendor/go.uber.org/multierr/.codecov.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-coverage:
-  range: 80..100
-  round: down
-  precision: 2
-
-  status:
-    project:                   # measuring the overall project coverage
-      default:                 # context, you can create multiple ones with custom titles
-        enabled: yes           # must be yes|true to enable this status
-        target: 100            # specify the target coverage for each commit status
-                               #   option: "auto" (must increase from parent commit or pull request base)
-                               #   option: "X%" a static target percentage to hit
-        if_not_found: success  # if parent is not found report status as success, error, or failure
-        if_ci_failed: error    # if ci fails report status as success, error, or failure
-
diff --git a/vendor/go.uber.org/multierr/.gitignore b/vendor/go.uber.org/multierr/.gitignore
deleted file mode 100644
index b9a05e3d..00000000
--- a/vendor/go.uber.org/multierr/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/vendor
-cover.html
-cover.out
-/bin
diff --git a/vendor/go.uber.org/multierr/CHANGELOG.md b/vendor/go.uber.org/multierr/CHANGELOG.md
deleted file mode 100644
index 3ba05276..00000000
--- a/vendor/go.uber.org/multierr/CHANGELOG.md
+++ /dev/null
@@ -1,72 +0,0 @@
-Releases
-========
-
-v1.8.0 (2022-02-28)
-===================
-
--   `Combine`: perform zero allocations when there are no errors.
-
-
-v1.7.0 (2021-05-06)
-===================
-
--   Add `AppendInvoke` to append into errors from `defer` blocks.
-
-
-v1.6.0 (2020-09-14)
-===================
-
--   Actually drop library dependency on development-time tooling.
-
-
-v1.5.0 (2020-02-24)
-===================
-
--   Drop library dependency on development-time tooling.
-
-
-v1.4.0 (2019-11-04)
-===================
-
--   Add `AppendInto` function to more ergonomically build errors inside a
-    loop.
-
-
-v1.3.0 (2019-10-29)
-===================
-
--   Switch to Go modules.
-
-
-v1.2.0 (2019-09-26)
-===================
-
--   Support extracting and matching against wrapped errors with `errors.As`
-    and `errors.Is`.
-
-
-v1.1.0 (2017-06-30)
-===================
-
--   Added an `Errors(error) []error` function to extract the underlying list of
-    errors for a multierr error.
-
-
-v1.0.0 (2017-05-31)
-===================
-
-No changes since v0.2.0. This release is committing to making no breaking
-changes to the current API in the 1.X series.
-
-
-v0.2.0 (2017-04-11)
-===================
-
--   Repeatedly appending to the same error is now faster due to fewer
-    allocations.
-
-
-v0.1.0 (2017-31-03)
-===================
-
--   Initial release
diff --git a/vendor/go.uber.org/multierr/LICENSE.txt b/vendor/go.uber.org/multierr/LICENSE.txt
deleted file mode 100644
index 413e30f7..00000000
--- a/vendor/go.uber.org/multierr/LICENSE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2017-2021 Uber Technologies, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/go.uber.org/multierr/Makefile b/vendor/go.uber.org/multierr/Makefile
deleted file mode 100644
index dcb6fe72..00000000
--- a/vendor/go.uber.org/multierr/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Directory to put `go install`ed binaries in.
-export GOBIN ?= $(shell pwd)/bin
-
-GO_FILES := $(shell \
-	find . '(' -path '*/.*' -o -path './vendor' ')' -prune \
-	-o -name '*.go' -print | cut -b3-)
-
-.PHONY: build
-build:
-	go build ./...
-
-.PHONY: test
-test:
-	go test -race ./...
-
-.PHONY: gofmt
-gofmt:
-	$(eval FMT_LOG := $(shell mktemp -t gofmt.XXXXX))
-	@gofmt -e -s -l $(GO_FILES) > $(FMT_LOG) || true
-	@[ ! -s "$(FMT_LOG)" ] || (echo "gofmt failed:" | cat - $(FMT_LOG) && false)
-
-.PHONY: golint
-golint:
-	@cd tools && go install golang.org/x/lint/golint
-	@$(GOBIN)/golint ./...
-
-.PHONY: staticcheck
-staticcheck:
-	@cd tools && go install honnef.co/go/tools/cmd/staticcheck
-	@$(GOBIN)/staticcheck ./...
-
-.PHONY: lint
-lint: gofmt golint staticcheck
-
-.PHONY: cover
-cover:
-	go test -race -coverprofile=cover.out -coverpkg=./... -v ./...
-	go tool cover -html=cover.out -o cover.html
diff --git a/vendor/go.uber.org/multierr/README.md b/vendor/go.uber.org/multierr/README.md
deleted file mode 100644
index 70aacecd..00000000
--- a/vendor/go.uber.org/multierr/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# multierr [![GoDoc][doc-img]][doc] [![Build Status][ci-img]][ci] [![Coverage Status][cov-img]][cov]
-
-`multierr` allows combining one or more Go `error`s together.
-
-## Installation
-
-    go get -u go.uber.org/multierr
-
-## Status
-
-Stable: No breaking changes will be made before 2.0.
-
--------------------------------------------------------------------------------
-
-Released under the [MIT License].
-
-[MIT License]: LICENSE.txt
-[doc-img]: https://pkg.go.dev/badge/go.uber.org/multierr
-[doc]: https://pkg.go.dev/go.uber.org/multierr
-[ci-img]: https://github.com/uber-go/multierr/actions/workflows/go.yml/badge.svg
-[cov-img]: https://codecov.io/gh/uber-go/multierr/branch/master/graph/badge.svg
-[ci]: https://github.com/uber-go/multierr/actions/workflows/go.yml
-[cov]: https://codecov.io/gh/uber-go/multierr
diff --git a/vendor/go.uber.org/multierr/error.go b/vendor/go.uber.org/multierr/error.go
deleted file mode 100644
index f45af149..00000000
--- a/vendor/go.uber.org/multierr/error.go
+++ /dev/null
@@ -1,652 +0,0 @@
-// Copyright (c) 2017-2021 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-// Package multierr allows combining one or more errors together.
-//
-// Overview
-//
-// Errors can be combined with the use of the Combine function.
-//
-// 	multierr.Combine(
-// 		reader.Close(),
-// 		writer.Close(),
-// 		conn.Close(),
-// 	)
-//
-// If only two errors are being combined, the Append function may be used
-// instead.
-//
-// 	err = multierr.Append(reader.Close(), writer.Close())
-//
-// The underlying list of errors for a returned error object may be retrieved
-// with the Errors function.
-//
-// 	errors := multierr.Errors(err)
-// 	if len(errors) > 0 {
-// 		fmt.Println("The following errors occurred:", errors)
-// 	}
-//
-// Appending from a loop
-//
-// You sometimes need to append into an error from a loop.
-//
-// 	var err error
-// 	for _, item := range items {
-// 		err = multierr.Append(err, process(item))
-// 	}
-//
-// Cases like this may require knowledge of whether an individual instance
-// failed. This usually requires introduction of a new variable.
-//
-// 	var err error
-// 	for _, item := range items {
-// 		if perr := process(item); perr != nil {
-// 			log.Warn("skipping item", item)
-// 			err = multierr.Append(err, perr)
-// 		}
-// 	}
-//
-// multierr includes AppendInto to simplify cases like this.
-//
-// 	var err error
-// 	for _, item := range items {
-// 		if multierr.AppendInto(&err, process(item)) {
-// 			log.Warn("skipping item", item)
-// 		}
-// 	}
-//
-// This will append the error into the err variable, and return true if that
-// individual error was non-nil.
-//
-// See AppendInto for more information.
-//
-// Deferred Functions
-//
-// Go makes it possible to modify the return value of a function in a defer
-// block if the function was using named returns. This makes it possible to
-// record resource cleanup failures from deferred blocks.
-//
-// 	func sendRequest(req Request) (err error) {
-// 		conn, err := openConnection()
-// 		if err != nil {
-// 			return err
-// 		}
-// 		defer func() {
-// 			err = multierr.Append(err, conn.Close())
-// 		}()
-// 		// ...
-// 	}
-//
-// multierr provides the Invoker type and AppendInvoke function to make cases
-// like the above simpler and obviate the need for a closure. The following is
-// roughly equivalent to the example above.
-//
-// 	func sendRequest(req Request) (err error) {
-// 		conn, err := openConnection()
-// 		if err != nil {
-// 			return err
-// 		}
-// 		defer multierr.AppendInvoke(&err, multierr.Close(conn))
-// 		// ...
-// 	}
-//
-// See AppendInvoke and Invoker for more information.
-//
-// Advanced Usage
-//
-// Errors returned by Combine and Append MAY implement the following
-// interface.
-//
-// 	type errorGroup interface {
-// 		// Returns a slice containing the underlying list of errors.
-// 		//
-// 		// This slice MUST NOT be modified by the caller.
-// 		Errors() []error
-// 	}
-//
-// Note that if you need access to list of errors behind a multierr error, you
-// should prefer using the Errors function. That said, if you need cheap
-// read-only access to the underlying errors slice, you can attempt to cast
-// the error to this interface. You MUST handle the failure case gracefully
-// because errors returned by Combine and Append are not guaranteed to
-// implement this interface.
-//
-// 	var errors []error
-// 	group, ok := err.(errorGroup)
-// 	if ok {
-// 		errors = group.Errors()
-// 	} else {
-// 		errors = []error{err}
-// 	}
-package multierr // import "go.uber.org/multierr"
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-	"sync"
-
-	"go.uber.org/atomic"
-)
-
-var (
-	// Separator for single-line error messages.
-	_singlelineSeparator = []byte("; ")
-
-	// Prefix for multi-line messages
-	_multilinePrefix = []byte("the following errors occurred:")
-
-	// Prefix for the first and following lines of an item in a list of
-	// multi-line error messages.
-	//
-	// For example, if a single item is:
-	//
-	// 	foo
-	// 	bar
-	//
-	// It will become,
-	//
-	// 	 -  foo
-	// 	    bar
-	_multilineSeparator = []byte("\n -  ")
-	_multilineIndent    = []byte("    ")
-)
-
-// _bufferPool is a pool of bytes.Buffers.
-var _bufferPool = sync.Pool{
-	New: func() interface{} {
-		return &bytes.Buffer{}
-	},
-}
-
-type errorGroup interface {
-	Errors() []error
-}
-
-// Errors returns a slice containing zero or more errors that the supplied
-// error is composed of. If the error is nil, a nil slice is returned.
-//
-// 	err := multierr.Append(r.Close(), w.Close())
-// 	errors := multierr.Errors(err)
-//
-// If the error is not composed of other errors, the returned slice contains
-// just the error that was passed in.
-//
-// Callers of this function are free to modify the returned slice.
-func Errors(err error) []error {
-	if err == nil {
-		return nil
-	}
-
-	// Note that we're casting to multiError, not errorGroup. Our contract is
-	// that returned errors MAY implement errorGroup. Errors, however, only
-	// has special behavior for multierr-specific error objects.
-	//
-	// This behavior can be expanded in the future but I think it's prudent to
-	// start with as little as possible in terms of contract and possibility
-	// of misuse.
-	eg, ok := err.(*multiError)
-	if !ok {
-		return []error{err}
-	}
-
-	errors := eg.Errors()
-	result := make([]error, len(errors))
-	copy(result, errors)
-	return result
-}
-
-// multiError is an error that holds one or more errors.
-//
-// An instance of this is guaranteed to be non-empty and flattened. That is,
-// none of the errors inside multiError are other multiErrors.
-//
-// multiError formats to a semi-colon delimited list of error messages with
-// %v and with a more readable multi-line format with %+v.
-type multiError struct {
-	copyNeeded atomic.Bool
-	errors     []error
-}
-
-var _ errorGroup = (*multiError)(nil)
-
-// Errors returns the list of underlying errors.
-//
-// This slice MUST NOT be modified.
-func (merr *multiError) Errors() []error {
-	if merr == nil {
-		return nil
-	}
-	return merr.errors
-}
-
-// As attempts to find the first error in the error list that matches the type
-// of the value that target points to.
-//
-// This function allows errors.As to traverse the values stored on the
-// multierr error.
-func (merr *multiError) As(target interface{}) bool {
-	for _, err := range merr.Errors() {
-		if errors.As(err, target) {
-			return true
-		}
-	}
-	return false
-}
-
-// Is attempts to match the provided error against errors in the error list.
-//
-// This function allows errors.Is to traverse the values stored on the
-// multierr error.
-func (merr *multiError) Is(target error) bool {
-	for _, err := range merr.Errors() {
-		if errors.Is(err, target) {
-			return true
-		}
-	}
-	return false
-}
-
-func (merr *multiError) Error() string {
-	if merr == nil {
-		return ""
-	}
-
-	buff := _bufferPool.Get().(*bytes.Buffer)
-	buff.Reset()
-
-	merr.writeSingleline(buff)
-
-	result := buff.String()
-	_bufferPool.Put(buff)
-	return result
-}
-
-func (merr *multiError) Format(f fmt.State, c rune) {
-	if c == 'v' && f.Flag('+') {
-		merr.writeMultiline(f)
-	} else {
-		merr.writeSingleline(f)
-	}
-}
-
-func (merr *multiError) writeSingleline(w io.Writer) {
-	first := true
-	for _, item := range merr.errors {
-		if first {
-			first = false
-		} else {
-			w.Write(_singlelineSeparator)
-		}
-		io.WriteString(w, item.Error())
-	}
-}
-
-func (merr *multiError) writeMultiline(w io.Writer) {
-	w.Write(_multilinePrefix)
-	for _, item := range merr.errors {
-		w.Write(_multilineSeparator)
-		writePrefixLine(w, _multilineIndent, fmt.Sprintf("%+v", item))
-	}
-}
-
-// Writes s to the writer with the given prefix added before each line after
-// the first.
-func writePrefixLine(w io.Writer, prefix []byte, s string) {
-	first := true
-	for len(s) > 0 {
-		if first {
-			first = false
-		} else {
-			w.Write(prefix)
-		}
-
-		idx := strings.IndexByte(s, '\n')
-		if idx < 0 {
-			idx = len(s) - 1
-		}
-
-		io.WriteString(w, s[:idx+1])
-		s = s[idx+1:]
-	}
-}
-
-type inspectResult struct {
-	// Number of top-level non-nil errors
-	Count int
-
-	// Total number of errors including multiErrors
-	Capacity int
-
-	// Index of the first non-nil error in the list. Value is meaningless if
-	// Count is zero.
-	FirstErrorIdx int
-
-	// Whether the list contains at least one multiError
-	ContainsMultiError bool
-}
-
-// Inspects the given slice of errors so that we can efficiently allocate
-// space for it.
-func inspect(errors []error) (res inspectResult) {
-	first := true
-	for i, err := range errors {
-		if err == nil {
-			continue
-		}
-
-		res.Count++
-		if first {
-			first = false
-			res.FirstErrorIdx = i
-		}
-
-		if merr, ok := err.(*multiError); ok {
-			res.Capacity += len(merr.errors)
-			res.ContainsMultiError = true
-		} else {
-			res.Capacity++
-		}
-	}
-	return
-}
-
-// fromSlice converts the given list of errors into a single error.
-func fromSlice(errors []error) error {
-	// Don't pay to inspect small slices.
-	switch len(errors) {
-	case 0:
-		return nil
-	case 1:
-		return errors[0]
-	}
-
-	res := inspect(errors)
-	switch res.Count {
-	case 0:
-		return nil
-	case 1:
-		// only one non-nil entry
-		return errors[res.FirstErrorIdx]
-	case len(errors):
-		if !res.ContainsMultiError {
-			// Error list is flat. Make a copy of it
-			// Otherwise "errors" escapes to the heap
-			// unconditionally for all other cases.
-			// This lets us optimize for the "no errors" case.
-			out := make([]error, len(errors))
-			copy(out, errors)
-			return &multiError{errors: out}
-		}
-	}
-
-	nonNilErrs := make([]error, 0, res.Capacity)
-	for _, err := range errors[res.FirstErrorIdx:] {
-		if err == nil {
-			continue
-		}
-
-		if nested, ok := err.(*multiError); ok {
-			nonNilErrs = append(nonNilErrs, nested.errors...)
-		} else {
-			nonNilErrs = append(nonNilErrs, err)
-		}
-	}
-
-	return &multiError{errors: nonNilErrs}
-}
-
-// Combine combines the passed errors into a single error.
-//
-// If zero arguments were passed or if all items are nil, a nil error is
-// returned.
-//
-// 	Combine(nil, nil)  // == nil
-//
-// If only a single error was passed, it is returned as-is.
-//
-// 	Combine(err)  // == err
-//
-// Combine skips over nil arguments so this function may be used to combine
-// together errors from operations that fail independently of each other.
-//
-// 	multierr.Combine(
-// 		reader.Close(),
-// 		writer.Close(),
-// 		pipe.Close(),
-// 	)
-//
-// If any of the passed errors is a multierr error, it will be flattened along
-// with the other errors.
-//
-// 	multierr.Combine(multierr.Combine(err1, err2), err3)
-// 	// is the same as
-// 	multierr.Combine(err1, err2, err3)
-//
-// The returned error formats into a readable multi-line error message if
-// formatted with %+v.
-//
-// 	fmt.Sprintf("%+v", multierr.Combine(err1, err2))
-func Combine(errors ...error) error {
-	return fromSlice(errors)
-}
-
-// Append appends the given errors together. Either value may be nil.
-//
-// This function is a specialization of Combine for the common case where
-// there are only two errors.
-//
-// 	err = multierr.Append(reader.Close(), writer.Close())
-//
-// The following pattern may also be used to record failure of deferred
-// operations without losing information about the original error.
-//
-// 	func doSomething(..) (err error) {
-// 		f := acquireResource()
-// 		defer func() {
-// 			err = multierr.Append(err, f.Close())
-// 		}()
-func Append(left error, right error) error {
-	switch {
-	case left == nil:
-		return right
-	case right == nil:
-		return left
-	}
-
-	if _, ok := right.(*multiError); !ok {
-		if l, ok := left.(*multiError); ok && !l.copyNeeded.Swap(true) {
-			// Common case where the error on the left is constantly being
-			// appended to.
-			errs := append(l.errors, right)
-			return &multiError{errors: errs}
-		} else if !ok {
-			// Both errors are single errors.
-			return &multiError{errors: []error{left, right}}
-		}
-	}
-
-	// Either right or both, left and right, are multiErrors. Rely on usual
-	// expensive logic.
-	errors := [2]error{left, right}
-	return fromSlice(errors[0:])
-}
-
-// AppendInto appends an error into the destination of an error pointer and
-// returns whether the error being appended was non-nil.
-//
-// 	var err error
-// 	multierr.AppendInto(&err, r.Close())
-// 	multierr.AppendInto(&err, w.Close())
-//
-// The above is equivalent to,
-//
-// 	err := multierr.Append(r.Close(), w.Close())
-//
-// As AppendInto reports whether the provided error was non-nil, it may be
-// used to build a multierr error in a loop more ergonomically. For example:
-//
-// 	var err error
-// 	for line := range lines {
-// 		var item Item
-// 		if multierr.AppendInto(&err, parse(line, &item)) {
-// 			continue
-// 		}
-// 		items = append(items, item)
-// 	}
-//
-// Compare this with a version that relies solely on Append:
-//
-// 	var err error
-// 	for line := range lines {
-// 		var item Item
-// 		if parseErr := parse(line, &item); parseErr != nil {
-// 			err = multierr.Append(err, parseErr)
-// 			continue
-// 		}
-// 		items = append(items, item)
-// 	}
-func AppendInto(into *error, err error) (errored bool) {
-	if into == nil {
-		// We panic if 'into' is nil. This is not documented above
-		// because suggesting that the pointer must be non-nil may
-		// confuse users into thinking that the error that it points
-		// to must be non-nil.
-		panic("misuse of multierr.AppendInto: into pointer must not be nil")
-	}
-
-	if err == nil {
-		return false
-	}
-	*into = Append(*into, err)
-	return true
-}
-
-// Invoker is an operation that may fail with an error. Use it with
-// AppendInvoke to append the result of calling the function into an error.
-// This allows you to conveniently defer capture of failing operations.
-//
-// See also, Close and Invoke.
-type Invoker interface {
-	Invoke() error
-}
-
-// Invoke wraps a function which may fail with an error to match the Invoker
-// interface. Use it to supply functions matching this signature to
-// AppendInvoke.
-//
-// For example,
-//
-// 	func processReader(r io.Reader) (err error) {
-// 		scanner := bufio.NewScanner(r)
-// 		defer multierr.AppendInvoke(&err, multierr.Invoke(scanner.Err))
-// 		for scanner.Scan() {
-// 			// ...
-// 		}
-// 		// ...
-// 	}
-//
-// In this example, the following line will construct the Invoker right away,
-// but defer the invocation of scanner.Err() until the function returns.
-//
-// 	defer multierr.AppendInvoke(&err, multierr.Invoke(scanner.Err))
-type Invoke func() error
-
-// Invoke calls the supplied function and returns its result.
-func (i Invoke) Invoke() error { return i() }
-
-// Close builds an Invoker that closes the provided io.Closer. Use it with
-// AppendInvoke to close io.Closers and append their results into an error.
-//
-// For example,
-//
-// 	func processFile(path string) (err error) {
-// 		f, err := os.Open(path)
-// 		if err != nil {
-// 			return err
-// 		}
-// 		defer multierr.AppendInvoke(&err, multierr.Close(f))
-// 		return processReader(f)
-// 	}
-//
-// In this example, multierr.Close will construct the Invoker right away, but
-// defer the invocation of f.Close until the function returns.
-//
-// 	defer multierr.AppendInvoke(&err, multierr.Close(f))
-func Close(closer io.Closer) Invoker {
-	return Invoke(closer.Close)
-}
-
-// AppendInvoke appends the result of calling the given Invoker into the
-// provided error pointer. Use it with named returns to safely defer
-// invocation of fallible operations until a function returns, and capture the
-// resulting errors.
-//
-// 	func doSomething(...) (err error) {
-// 		// ...
-// 		f, err := openFile(..)
-// 		if err != nil {
-// 			return err
-// 		}
-//
-// 		// multierr will call f.Close() when this function returns and
-// 		// if the operation fails, its append its error into the
-// 		// returned error.
-// 		defer multierr.AppendInvoke(&err, multierr.Close(f))
-//
-// 		scanner := bufio.NewScanner(f)
-// 		// Similarly, this scheduled scanner.Err to be called and
-// 		// inspected when the function returns and append its error
-// 		// into the returned error.
-// 		defer multierr.AppendInvoke(&err, multierr.Invoke(scanner.Err))
-//
-// 		// ...
-// 	}
-//
-// Without defer, AppendInvoke behaves exactly like AppendInto.
-//
-// 	err := // ...
-// 	multierr.AppendInvoke(&err, mutltierr.Invoke(foo))
-//
-// 	// ...is roughly equivalent to...
-//
-// 	err := // ...
-// 	multierr.AppendInto(&err, foo())
-//
-// The advantage of the indirection introduced by Invoker is to make it easy
-// to defer the invocation of a function. Without this indirection, the
-// invoked function will be evaluated at the time of the defer block rather
-// than when the function returns.
-//
-// 	// BAD: This is likely not what the caller intended. This will evaluate
-// 	// foo() right away and append its result into the error when the
-// 	// function returns.
-// 	defer multierr.AppendInto(&err, foo())
-//
-// 	// GOOD: This will defer invocation of foo unutil the function returns.
-// 	defer multierr.AppendInvoke(&err, multierr.Invoke(foo))
-//
-// multierr provides a few Invoker implementations out of the box for
-// convenience. See Invoker for more information.
-func AppendInvoke(into *error, invoker Invoker) {
-	AppendInto(into, invoker.Invoke())
-}
diff --git a/vendor/go.uber.org/multierr/glide.yaml b/vendor/go.uber.org/multierr/glide.yaml
deleted file mode 100644
index 6ef084ec..00000000
--- a/vendor/go.uber.org/multierr/glide.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-package: go.uber.org/multierr
-import:
-- package: go.uber.org/atomic
-  version: ^1
-testImport:
-- package: github.com/stretchr/testify
-  subpackages:
-  - assert
diff --git a/vendor/go.uber.org/zap/.codecov.yml b/vendor/go.uber.org/zap/.codecov.yml
deleted file mode 100644
index 8e5ca7d3..00000000
--- a/vendor/go.uber.org/zap/.codecov.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-coverage:
-  range: 80..100
-  round: down
-  precision: 2
-
-  status:
-    project:                   # measuring the overall project coverage
-      default:                 # context, you can create multiple ones with custom titles
-        enabled: yes           # must be yes|true to enable this status
-        target: 95%            # specify the target coverage for each commit status
-                               #   option: "auto" (must increase from parent commit or pull request base)
-                               #   option: "X%" a static target percentage to hit
-        if_not_found: success  # if parent is not found report status as success, error, or failure
-        if_ci_failed: error    # if ci fails report status as success, error, or failure
-ignore:
-  - internal/readme/readme.go
-
diff --git a/vendor/go.uber.org/zap/.gitignore b/vendor/go.uber.org/zap/.gitignore
deleted file mode 100644
index da9d9d00..00000000
--- a/vendor/go.uber.org/zap/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-vendor
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
-*.pprof
-*.out
-*.log
-
-/bin
-cover.out
-cover.html
diff --git a/vendor/go.uber.org/zap/.readme.tmpl b/vendor/go.uber.org/zap/.readme.tmpl
deleted file mode 100644
index 92aa65d6..00000000
--- a/vendor/go.uber.org/zap/.readme.tmpl
+++ /dev/null
@@ -1,109 +0,0 @@
-# :zap: zap [![GoDoc][doc-img]][doc] [![Build Status][ci-img]][ci] [![Coverage Status][cov-img]][cov]
-
-Blazing fast, structured, leveled logging in Go.
-
-## Installation
-
-`go get -u go.uber.org/zap`
-
-Note that zap only supports the two most recent minor versions of Go.
-
-## Quick Start
-
-In contexts where performance is nice, but not critical, use the
-`SugaredLogger`. It's 4-10x faster than other structured logging
-packages and includes both structured and `printf`-style APIs.
-
-```go
-logger, _ := zap.NewProduction()
-defer logger.Sync() // flushes buffer, if any
-sugar := logger.Sugar()
-sugar.Infow("failed to fetch URL",
-  // Structured context as loosely typed key-value pairs.
-  "url", url,
-  "attempt", 3,
-  "backoff", time.Second,
-)
-sugar.Infof("Failed to fetch URL: %s", url)
-```
-
-When performance and type safety are critical, use the `Logger`. It's even
-faster than the `SugaredLogger` and allocates far less, but it only supports
-structured logging.
-
-```go
-logger, _ := zap.NewProduction()
-defer logger.Sync()
-logger.Info("failed to fetch URL",
-  // Structured context as strongly typed Field values.
-  zap.String("url", url),
-  zap.Int("attempt", 3),
-  zap.Duration("backoff", time.Second),
-)
-```
-
-See the [documentation][doc] and [FAQ](FAQ.md) for more details.
-
-## Performance
-
-For applications that log in the hot path, reflection-based serialization and
-string formatting are prohibitively expensive &mdash; they're CPU-intensive
-and make many small allocations. Put differently, using `encoding/json` and
-`fmt.Fprintf` to log tons of `interface{}`s makes your application slow.
-
-Zap takes a different approach. It includes a reflection-free, zero-allocation
-JSON encoder, and the base `Logger` strives to avoid serialization overhead
-and allocations wherever possible. By building the high-level `SugaredLogger`
-on that foundation, zap lets users *choose* when they need to count every
-allocation and when they'd prefer a more familiar, loosely typed API.
-
-As measured by its own [benchmarking suite][], not only is zap more performant
-than comparable structured logging packages &mdash; it's also faster than the
-standard library. Like all benchmarks, take these with a grain of salt.<sup
-id="anchor-versions">[1](#footnote-versions)</sup>
-
-Log a message and 10 fields:
-
-{{.BenchmarkAddingFields}}
-
-Log a message with a logger that already has 10 fields of context:
-
-{{.BenchmarkAccumulatedContext}}
-
-Log a static string, without any context or `printf`-style templating:
-
-{{.BenchmarkWithoutFields}}
-
-## Development Status: Stable
-
-All APIs are finalized, and no breaking changes will be made in the 1.x series
-of releases. Users of semver-aware dependency management systems should pin
-zap to `^1`.
-
-## Contributing
-
-We encourage and support an active, healthy community of contributors &mdash;
-including you! Details are in the [contribution guide](CONTRIBUTING.md) and
-the [code of conduct](CODE_OF_CONDUCT.md). The zap maintainers keep an eye on
-issues and pull requests, but you can also report any negative conduct to
-oss-conduct@uber.com. That email list is a private, safe space; even the zap
-maintainers don't have access, so don't hesitate to hold us to a high
-standard.
-
-<hr>
-
-Released under the [MIT License](LICENSE.txt).
-
-<sup id="footnote-versions">1</sup> In particular, keep in mind that we may be
-benchmarking against slightly older versions of other packages. Versions are
-pinned in the [benchmarks/go.mod][] file. [↩](#anchor-versions)
-
-[doc-img]: https://pkg.go.dev/badge/go.uber.org/zap
-[doc]: https://pkg.go.dev/go.uber.org/zap
-[ci-img]: https://github.com/uber-go/zap/actions/workflows/go.yml/badge.svg
-[ci]: https://github.com/uber-go/zap/actions/workflows/go.yml
-[cov-img]: https://codecov.io/gh/uber-go/zap/branch/master/graph/badge.svg
-[cov]: https://codecov.io/gh/uber-go/zap
-[benchmarking suite]: https://github.com/uber-go/zap/tree/master/benchmarks
-[benchmarks/go.mod]: https://github.com/uber-go/zap/blob/master/benchmarks/go.mod
-
diff --git a/vendor/go.uber.org/zap/CHANGELOG.md b/vendor/go.uber.org/zap/CHANGELOG.md
deleted file mode 100644
index 1793b08c..00000000
--- a/vendor/go.uber.org/zap/CHANGELOG.md
+++ /dev/null
@@ -1,564 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
-
-## 1.21.0 (7 Feb 2022)
-
-Enhancements:
-*  [#1047][]: Add `zapcore.ParseLevel` to parse a `Level` from a string.
-*  [#1048][]: Add `zap.ParseAtomicLevel` to parse an `AtomicLevel` from a
-   string.
-
-Bugfixes:
-* [#1058][]: Fix panic in JSON encoder when `EncodeLevel` is unset.
-
-Other changes:
-* [#1052][]: Improve encoding performance when the `AddCaller` and
-  `AddStacktrace` options are used together.
-
-[#1047]: https://github.com/uber-go/zap/pull/1047
-[#1048]: https://github.com/uber-go/zap/pull/1048
-[#1052]: https://github.com/uber-go/zap/pull/1052
-[#1058]: https://github.com/uber-go/zap/pull/1058
-
-Thanks to @aerosol and @Techassi for their contributions to this release.
-
-## 1.20.0 (4 Jan 2022)
-
-Enhancements:
-* [#989][]: Add `EncoderConfig.SkipLineEnding` flag to disable adding newline
-  characters between log statements.
-* [#1039][]: Add `EncoderConfig.NewReflectedEncoder` field to customize JSON
-  encoding of reflected log fields.
-
-Bugfixes:
-* [#1011][]: Fix inaccurate precision when encoding complex64 as JSON.
-* [#554][], [#1017][]: Close JSON namespaces opened in `MarshalLogObject`
-  methods when the methods return.
-* [#1033][]: Avoid panicking in Sampler core if `thereafter` is zero.
-
-Other changes:
-* [#1028][]: Drop support for Go < 1.15.
-
-[#554]: https://github.com/uber-go/zap/pull/554
-[#989]: https://github.com/uber-go/zap/pull/989
-[#1011]: https://github.com/uber-go/zap/pull/1011
-[#1017]: https://github.com/uber-go/zap/pull/1017
-[#1028]: https://github.com/uber-go/zap/pull/1028
-[#1033]: https://github.com/uber-go/zap/pull/1033
-[#1039]: https://github.com/uber-go/zap/pull/1039
-
-Thanks to @psrajat, @lruggieri, @sammyrnycreal for their contributions to this release.
-
-## 1.19.1 (8 Sep 2021)
-
-Bugfixes:
-* [#1001][]: JSON: Fix complex number encoding with negative imaginary part. Thanks to @hemantjadon.
-* [#1003][]: JSON: Fix inaccurate precision when encoding float32.
-
-[#1001]: https://github.com/uber-go/zap/pull/1001
-[#1003]: https://github.com/uber-go/zap/pull/1003
-
-## 1.19.0 (9 Aug 2021)
-
-Enhancements:
-* [#975][]: Avoid panicking in Sampler core if the level is out of bounds.
-* [#984][]: Reduce the size of BufferedWriteSyncer by aligning the fields
-  better.
-
-[#975]: https://github.com/uber-go/zap/pull/975
-[#984]: https://github.com/uber-go/zap/pull/984
-
-Thanks to @lancoLiu and @thockin for their contributions to this release.
-
-## 1.18.1 (28 Jun 2021)
-
-Bugfixes:
-* [#974][]: Fix nil dereference in logger constructed by `zap.NewNop`.
-
-[#974]: https://github.com/uber-go/zap/pull/974
-
-## 1.18.0 (28 Jun 2021)
-
-Enhancements:
-* [#961][]: Add `zapcore.BufferedWriteSyncer`, a new `WriteSyncer` that buffers
-  messages in-memory and flushes them periodically.
-* [#971][]: Add `zapio.Writer` to use a Zap logger as an `io.Writer`.
-* [#897][]: Add `zap.WithClock` option to control the source of time via the
-  new `zapcore.Clock` interface.
-* [#949][]: Avoid panicking in `zap.SugaredLogger` when arguments of `*w`
-  methods don't match expectations.
-* [#943][]: Add support for filtering by level or arbitrary matcher function to
-  `zaptest/observer`.
-* [#691][]: Comply with `io.StringWriter` and `io.ByteWriter` in Zap's
-  `buffer.Buffer`.
-
-Thanks to @atrn0, @ernado, @heyanfu, @hnlq715, @zchee
-for their contributions to this release.
-
-[#691]: https://github.com/uber-go/zap/pull/691
-[#897]: https://github.com/uber-go/zap/pull/897
-[#943]: https://github.com/uber-go/zap/pull/943
-[#949]: https://github.com/uber-go/zap/pull/949
-[#961]: https://github.com/uber-go/zap/pull/961
-[#971]: https://github.com/uber-go/zap/pull/971
-
-## 1.17.0 (25 May 2021)
-
-Bugfixes:
-* [#867][]: Encode `<nil>` for nil `error` instead of a panic.
-* [#931][], [#936][]: Update minimum version constraints to address
-  vulnerabilities in dependencies.
-
-Enhancements:
-* [#865][]: Improve alignment of fields of the Logger struct, reducing its
-  size from 96 to 80 bytes.
-* [#881][]: Support `grpclog.LoggerV2` in zapgrpc.
-* [#903][]: Support URL-encoded POST requests to the AtomicLevel HTTP handler
-  with the `application/x-www-form-urlencoded` content type.
-* [#912][]: Support multi-field encoding with `zap.Inline`.
-* [#913][]: Speed up SugaredLogger for calls with a single string.
-* [#928][]: Add support for filtering by field name to `zaptest/observer`.
-
-Thanks to @ash2k, @FMLS, @jimmystewpot, @Oncilla, @tsoslow, @tylitianrui, @withshubh, and @wziww for their contributions to this release.
-
-## 1.16.0 (1 Sep 2020)
-
-Bugfixes:
-* [#828][]: Fix missing newline in IncreaseLevel error messages.
-* [#835][]: Fix panic in JSON encoder when encoding times or durations
-  without specifying a time or duration encoder.
-* [#843][]: Honor CallerSkip when taking stack traces.
-* [#862][]: Fix the default file permissions to use `0666` and rely on the umask instead.
-* [#854][]: Encode `<nil>` for nil `Stringer` instead of a panic error log.
-
-Enhancements:
-* [#629][]: Added `zapcore.TimeEncoderOfLayout` to easily create time encoders
-  for custom layouts.
-* [#697][]: Added support for a configurable delimiter in the console encoder.
-* [#852][]: Optimize console encoder by pooling the underlying JSON encoder.
-* [#844][]: Add ability to include the calling function as part of logs.
-* [#843][]: Add `StackSkip` for including truncated stacks as a field.
-* [#861][]: Add options to customize Fatal behaviour for better testability.
-
-Thanks to @SteelPhase, @tmshn, @lixingwang, @wyxloading, @moul, @segevfiner, @andy-retailnext and @jcorbin for their contributions to this release.
-
-## 1.15.0 (23 Apr 2020)
-
-Bugfixes:
-* [#804][]: Fix handling of `Time` values out of `UnixNano` range.
-* [#812][]: Fix `IncreaseLevel` being reset after a call to `With`.
-
-Enhancements:
-* [#806][]: Add `WithCaller` option to supersede the `AddCaller` option. This
-  allows disabling annotation of log entries with caller information if
-  previously enabled with `AddCaller`.
-* [#813][]: Deprecate `NewSampler` constructor in favor of
-  `NewSamplerWithOptions` which supports a `SamplerHook` option. This option
-   adds support for monitoring sampling decisions through a hook.
-
-Thanks to @danielbprice for their contributions to this release.
-
-## 1.14.1 (14 Mar 2020)
-
-Bugfixes:
-* [#791][]: Fix panic on attempting to build a logger with an invalid Config.
-* [#795][]: Vendoring Zap with `go mod vendor` no longer includes Zap's
-  development-time dependencies.
-* [#799][]: Fix issue introduced in 1.14.0 that caused invalid JSON output to
-  be generated for arrays of `time.Time` objects when using string-based time
-  formats.
-
-Thanks to @YashishDua for their contributions to this release.
-
-## 1.14.0 (20 Feb 2020)
-
-Enhancements:
-* [#771][]: Optimize calls for disabled log levels.
-* [#773][]: Add millisecond duration encoder.
-* [#775][]: Add option to increase the level of a logger.
-* [#786][]: Optimize time formatters using `Time.AppendFormat` where possible.
-
-Thanks to @caibirdme for their contributions to this release.
-
-## 1.13.0 (13 Nov 2019)
-
-Enhancements:
-* [#758][]: Add `Intp`, `Stringp`, and other similar `*p` field constructors
-  to log pointers to primitives with support for `nil` values.
-
-Thanks to @jbizzle for their contributions to this release.
-
-## 1.12.0 (29 Oct 2019)
-
-Enhancements:
-* [#751][]: Migrate to Go modules.
-
-## 1.11.0 (21 Oct 2019)
-
-Enhancements:
-* [#725][]: Add `zapcore.OmitKey` to omit keys in an `EncoderConfig`.
-* [#736][]: Add `RFC3339` and `RFC3339Nano` time encoders.
-
-Thanks to @juicemia, @uhthomas for their contributions to this release.
-
-## 1.10.0 (29 Apr 2019)
-
-Bugfixes:
-* [#657][]: Fix `MapObjectEncoder.AppendByteString` not adding value as a
-  string.
-* [#706][]: Fix incorrect call depth to determine caller in Go 1.12.
-
-Enhancements:
-* [#610][]: Add `zaptest.WrapOptions` to wrap `zap.Option` for creating test
-  loggers.
-* [#675][]: Don't panic when encoding a String field.
-* [#704][]: Disable HTML escaping for JSON objects encoded using the
-  reflect-based encoder.
-
-Thanks to @iaroslav-ciupin, @lelenanam, @joa, @NWilson for their contributions
-to this release.
-
-## v1.9.1 (06 Aug 2018)
-
-Bugfixes:
-
-* [#614][]: MapObjectEncoder should not ignore empty slices.
-
-## v1.9.0 (19 Jul 2018)
-
-Enhancements:
-* [#602][]: Reduce number of allocations when logging with reflection.
-* [#572][], [#606][]: Expose a registry for third-party logging sinks.
-
-Thanks to @nfarah86, @AlekSi, @JeanMertz, @philippgille, @etsangsplk, and
-@dimroc for their contributions to this release.
-
-## v1.8.0 (13 Apr 2018)
-
-Enhancements:
-* [#508][]: Make log level configurable when redirecting the standard
-  library's logger.
-* [#518][]: Add a logger that writes to a `*testing.TB`.
-* [#577][]: Add a top-level alias for `zapcore.Field` to clean up GoDoc.
-
-Bugfixes:
-* [#574][]: Add a missing import comment to `go.uber.org/zap/buffer`.
-
-Thanks to @DiSiqueira and @djui for their contributions to this release.
-
-## v1.7.1 (25 Sep 2017)
-
-Bugfixes:
-* [#504][]: Store strings when using AddByteString with the map encoder.
-
-## v1.7.0 (21 Sep 2017)
-
-Enhancements:
-
-* [#487][]: Add `NewStdLogAt`, which extends `NewStdLog` by allowing the user
-  to specify the level of the logged messages.
-
-## v1.6.0 (30 Aug 2017)
-
-Enhancements:
-
-* [#491][]: Omit zap stack frames from stacktraces.
-* [#490][]: Add a `ContextMap` method to observer logs for simpler
-  field validation in tests.
-
-## v1.5.0 (22 Jul 2017)
-
-Enhancements:
-
-* [#460][] and [#470][]: Support errors produced by `go.uber.org/multierr`.
-* [#465][]: Support user-supplied encoders for logger names.
-
-Bugfixes:
-
-* [#477][]: Fix a bug that incorrectly truncated deep stacktraces.
-
-Thanks to @richard-tunein and @pavius for their contributions to this release.
-
-## v1.4.1 (08 Jun 2017)
-
-This release fixes two bugs.
-
-Bugfixes:
-
-* [#435][]: Support a variety of case conventions when unmarshaling levels.
-* [#444][]: Fix a panic in the observer.
-
-## v1.4.0 (12 May 2017)
-
-This release adds a few small features and is fully backward-compatible.
-
-Enhancements:
-
-* [#424][]: Add a `LineEnding` field to `EncoderConfig`, allowing users to
-  override the Unix-style default.
-* [#425][]: Preserve time zones when logging times.
-* [#431][]: Make `zap.AtomicLevel` implement `fmt.Stringer`, which makes a
-  variety of operations a bit simpler.
-
-## v1.3.0 (25 Apr 2017)
-
-This release adds an enhancement to zap's testing helpers as well as the
-ability to marshal an AtomicLevel. It is fully backward-compatible.
-
-Enhancements:
-
-* [#415][]: Add a substring-filtering helper to zap's observer. This is
-  particularly useful when testing the `SugaredLogger`.
-* [#416][]: Make `AtomicLevel` implement `encoding.TextMarshaler`.
-
-## v1.2.0 (13 Apr 2017)
-
-This release adds a gRPC compatibility wrapper. It is fully backward-compatible.
-
-Enhancements:
-
-* [#402][]: Add a `zapgrpc` package that wraps zap's Logger and implements
-  `grpclog.Logger`.
-
-## v1.1.0 (31 Mar 2017)
-
-This release fixes two bugs and adds some enhancements to zap's testing helpers.
-It is fully backward-compatible.
-
-Bugfixes:
-
-* [#385][]: Fix caller path trimming on Windows.
-* [#396][]: Fix a panic when attempting to use non-existent directories with
-  zap's configuration struct.
-
-Enhancements:
-
-* [#386][]: Add filtering helpers to zaptest's observing logger.
-
-Thanks to @moitias for contributing to this release.
-
-## v1.0.0 (14 Mar 2017)
-
-This is zap's first stable release. All exported APIs are now final, and no
-further breaking changes will be made in the 1.x release series. Anyone using a
-semver-aware dependency manager should now pin to `^1`.
-
-Breaking changes:
-
-* [#366][]: Add byte-oriented APIs to encoders to log UTF-8 encoded text without
-  casting from `[]byte` to `string`.
-* [#364][]: To support buffering outputs, add `Sync` methods to `zapcore.Core`,
-  `zap.Logger`, and `zap.SugaredLogger`.
-* [#371][]: Rename the `testutils` package to `zaptest`, which is less likely to
-  clash with other testing helpers.
-
-Bugfixes:
-
-* [#362][]: Make the ISO8601 time formatters fixed-width, which is friendlier
-  for tab-separated console output.
-* [#369][]: Remove the automatic locks in `zapcore.NewCore`, which allows zap to
-  work with concurrency-safe `WriteSyncer` implementations.
-* [#347][]: Stop reporting errors when trying to `fsync` standard out on Linux
-  systems.
-* [#373][]: Report the correct caller from zap's standard library
-  interoperability wrappers.
-
-Enhancements:
-
-* [#348][]: Add a registry allowing third-party encodings to work with zap's
-  built-in `Config`.
-* [#327][]: Make the representation of logger callers configurable (like times,
-  levels, and durations).
-* [#376][]: Allow third-party encoders to use their own buffer pools, which
-  removes the last performance advantage that zap's encoders have over plugins.
-* [#346][]: Add `CombineWriteSyncers`, a convenience function to tee multiple
-  `WriteSyncer`s and lock the result.
-* [#365][]: Make zap's stacktraces compatible with mid-stack inlining (coming in
-  Go 1.9).
-* [#372][]: Export zap's observing logger as `zaptest/observer`. This makes it
-  easier for particularly punctilious users to unit test their application's
-  logging.
-
-Thanks to @suyash, @htrendev, @flisky, @Ulexus, and @skipor for their
-contributions to this release.
-
-## v1.0.0-rc.3 (7 Mar 2017)
-
-This is the third release candidate for zap's stable release. There are no
-breaking changes.
-
-Bugfixes:
-
-* [#339][]: Byte slices passed to `zap.Any` are now correctly treated as binary blobs
-  rather than `[]uint8`.
-
-Enhancements:
-
-* [#307][]: Users can opt into colored output for log levels.
-* [#353][]: In addition to hijacking the output of the standard library's
-  package-global logging functions, users can now construct a zap-backed
-  `log.Logger` instance.
-* [#311][]: Frames from common runtime functions and some of zap's internal
-  machinery are now omitted from stacktraces.
-
-Thanks to @ansel1 and @suyash for their contributions to this release.
-
-## v1.0.0-rc.2 (21 Feb 2017)
-
-This is the second release candidate for zap's stable release. It includes two
-breaking changes.
-
-Breaking changes:
-
-* [#316][]: Zap's global loggers are now fully concurrency-safe
-  (previously, users had to ensure that `ReplaceGlobals` was called before the
-  loggers were in use). However, they must now be accessed via the `L()` and
-  `S()` functions. Users can update their projects with
-
-  ```
-  gofmt -r "zap.L -> zap.L()" -w .
-  gofmt -r "zap.S -> zap.S()" -w .
-  ```
-* [#309][] and [#317][]: RC1 was mistakenly shipped with invalid
-  JSON and YAML struct tags on all config structs. This release fixes the tags
-  and adds static analysis to prevent similar bugs in the future.
-
-Bugfixes:
-
-* [#321][]: Redirecting the standard library's `log` output now
-  correctly reports the logger's caller.
-
-Enhancements:
-
-* [#325][] and [#333][]: Zap now transparently supports non-standard, rich
-  errors like those produced by `github.com/pkg/errors`.
-* [#326][]: Though `New(nil)` continues to return a no-op logger, `NewNop()` is
-  now preferred. Users can update their projects with `gofmt -r 'zap.New(nil) ->
-  zap.NewNop()' -w .`.
-* [#300][]: Incorrectly importing zap as `github.com/uber-go/zap` now returns a
-  more informative error.
-
-Thanks to @skipor and @chapsuk for their contributions to this release.
-
-## v1.0.0-rc.1 (14 Feb 2017)
-
-This is the first release candidate for zap's stable release. There are multiple
-breaking changes and improvements from the pre-release version. Most notably:
-
-* **Zap's import path is now "go.uber.org/zap"** &mdash; all users will
-  need to update their code.
-* User-facing types and functions remain in the `zap` package. Code relevant
-  largely to extension authors is now in the `zapcore` package.
-* The `zapcore.Core` type makes it easy for third-party packages to use zap's
-  internals but provide a different user-facing API.
-* `Logger` is now a concrete type instead of an interface.
-* A less verbose (though slower) logging API is included by default.
-* Package-global loggers `L` and `S` are included.
-* A human-friendly console encoder is included.
-* A declarative config struct allows common logger configurations to be managed
-  as configuration instead of code.
-* Sampling is more accurate, and doesn't depend on the standard library's shared
-  timer heap.
-
-## v0.1.0-beta.1 (6 Feb 2017)
-
-This is a minor version, tagged to allow users to pin to the pre-1.0 APIs and
-upgrade at their leisure. Since this is the first tagged release, there are no
-backward compatibility concerns and all functionality is new.
-
-Early zap adopters should pin to the 0.1.x minor version until they're ready to
-upgrade to the upcoming stable release.
-
-[#316]: https://github.com/uber-go/zap/pull/316
-[#309]: https://github.com/uber-go/zap/pull/309
-[#317]: https://github.com/uber-go/zap/pull/317
-[#321]: https://github.com/uber-go/zap/pull/321
-[#325]: https://github.com/uber-go/zap/pull/325
-[#333]: https://github.com/uber-go/zap/pull/333
-[#326]: https://github.com/uber-go/zap/pull/326
-[#300]: https://github.com/uber-go/zap/pull/300
-[#339]: https://github.com/uber-go/zap/pull/339
-[#307]: https://github.com/uber-go/zap/pull/307
-[#353]: https://github.com/uber-go/zap/pull/353
-[#311]: https://github.com/uber-go/zap/pull/311
-[#366]: https://github.com/uber-go/zap/pull/366
-[#364]: https://github.com/uber-go/zap/pull/364
-[#371]: https://github.com/uber-go/zap/pull/371
-[#362]: https://github.com/uber-go/zap/pull/362
-[#369]: https://github.com/uber-go/zap/pull/369
-[#347]: https://github.com/uber-go/zap/pull/347
-[#373]: https://github.com/uber-go/zap/pull/373
-[#348]: https://github.com/uber-go/zap/pull/348
-[#327]: https://github.com/uber-go/zap/pull/327
-[#376]: https://github.com/uber-go/zap/pull/376
-[#346]: https://github.com/uber-go/zap/pull/346
-[#365]: https://github.com/uber-go/zap/pull/365
-[#372]: https://github.com/uber-go/zap/pull/372
-[#385]: https://github.com/uber-go/zap/pull/385
-[#396]: https://github.com/uber-go/zap/pull/396
-[#386]: https://github.com/uber-go/zap/pull/386
-[#402]: https://github.com/uber-go/zap/pull/402
-[#415]: https://github.com/uber-go/zap/pull/415
-[#416]: https://github.com/uber-go/zap/pull/416
-[#424]: https://github.com/uber-go/zap/pull/424
-[#425]: https://github.com/uber-go/zap/pull/425
-[#431]: https://github.com/uber-go/zap/pull/431
-[#435]: https://github.com/uber-go/zap/pull/435
-[#444]: https://github.com/uber-go/zap/pull/444
-[#477]: https://github.com/uber-go/zap/pull/477
-[#465]: https://github.com/uber-go/zap/pull/465
-[#460]: https://github.com/uber-go/zap/pull/460
-[#470]: https://github.com/uber-go/zap/pull/470
-[#487]: https://github.com/uber-go/zap/pull/487
-[#490]: https://github.com/uber-go/zap/pull/490
-[#491]: https://github.com/uber-go/zap/pull/491
-[#504]: https://github.com/uber-go/zap/pull/504
-[#508]: https://github.com/uber-go/zap/pull/508
-[#518]: https://github.com/uber-go/zap/pull/518
-[#577]: https://github.com/uber-go/zap/pull/577
-[#574]: https://github.com/uber-go/zap/pull/574
-[#602]: https://github.com/uber-go/zap/pull/602
-[#572]: https://github.com/uber-go/zap/pull/572
-[#606]: https://github.com/uber-go/zap/pull/606
-[#614]: https://github.com/uber-go/zap/pull/614
-[#657]: https://github.com/uber-go/zap/pull/657
-[#706]: https://github.com/uber-go/zap/pull/706
-[#610]: https://github.com/uber-go/zap/pull/610
-[#675]: https://github.com/uber-go/zap/pull/675
-[#704]: https://github.com/uber-go/zap/pull/704
-[#725]: https://github.com/uber-go/zap/pull/725
-[#736]: https://github.com/uber-go/zap/pull/736
-[#751]: https://github.com/uber-go/zap/pull/751
-[#758]: https://github.com/uber-go/zap/pull/758
-[#771]: https://github.com/uber-go/zap/pull/771
-[#773]: https://github.com/uber-go/zap/pull/773
-[#775]: https://github.com/uber-go/zap/pull/775
-[#786]: https://github.com/uber-go/zap/pull/786
-[#791]: https://github.com/uber-go/zap/pull/791
-[#795]: https://github.com/uber-go/zap/pull/795
-[#799]: https://github.com/uber-go/zap/pull/799
-[#804]: https://github.com/uber-go/zap/pull/804
-[#812]: https://github.com/uber-go/zap/pull/812
-[#806]: https://github.com/uber-go/zap/pull/806
-[#813]: https://github.com/uber-go/zap/pull/813
-[#629]: https://github.com/uber-go/zap/pull/629
-[#697]: https://github.com/uber-go/zap/pull/697
-[#828]: https://github.com/uber-go/zap/pull/828
-[#835]: https://github.com/uber-go/zap/pull/835
-[#843]: https://github.com/uber-go/zap/pull/843
-[#844]: https://github.com/uber-go/zap/pull/844
-[#852]: https://github.com/uber-go/zap/pull/852
-[#854]: https://github.com/uber-go/zap/pull/854
-[#861]: https://github.com/uber-go/zap/pull/861
-[#862]: https://github.com/uber-go/zap/pull/862
-[#865]: https://github.com/uber-go/zap/pull/865
-[#867]: https://github.com/uber-go/zap/pull/867
-[#881]: https://github.com/uber-go/zap/pull/881
-[#903]: https://github.com/uber-go/zap/pull/903
-[#912]: https://github.com/uber-go/zap/pull/912
-[#913]: https://github.com/uber-go/zap/pull/913
-[#928]: https://github.com/uber-go/zap/pull/928
-[#931]: https://github.com/uber-go/zap/pull/931
-[#936]: https://github.com/uber-go/zap/pull/936
diff --git a/vendor/go.uber.org/zap/CODE_OF_CONDUCT.md b/vendor/go.uber.org/zap/CODE_OF_CONDUCT.md
deleted file mode 100644
index e327d9aa..00000000
--- a/vendor/go.uber.org/zap/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,75 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age,
-body size, disability, ethnicity, gender identity and expression, level of
-experience, nationality, personal appearance, race, religion, or sexual
-identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an
-appointed representative at an online or offline event. Representation of a
-project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at oss-conduct@uber.com. The project
-team will review and investigate all complaints, and will respond in a way
-that it deems appropriate to the circumstances. The project team is obligated
-to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.4, available at
-[http://contributor-covenant.org/version/1/4][version].
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
diff --git a/vendor/go.uber.org/zap/CONTRIBUTING.md b/vendor/go.uber.org/zap/CONTRIBUTING.md
deleted file mode 100644
index 5cd96568..00000000
--- a/vendor/go.uber.org/zap/CONTRIBUTING.md
+++ /dev/null
@@ -1,75 +0,0 @@
-# Contributing
-
-We'd love your help making zap the very best structured logging library in Go!
-
-If you'd like to add new exported APIs, please [open an issue][open-issue]
-describing your proposal &mdash; discussing API changes ahead of time makes
-pull request review much smoother. In your issue, pull request, and any other
-communications, please remember to treat your fellow contributors with
-respect! We take our [code of conduct](CODE_OF_CONDUCT.md) seriously.
-
-Note that you'll need to sign [Uber's Contributor License Agreement][cla]
-before we can accept any of your contributions. If necessary, a bot will remind
-you to accept the CLA when you open your pull request.
-
-## Setup
-
-[Fork][fork], then clone the repository:
-
-```
-mkdir -p $GOPATH/src/go.uber.org
-cd $GOPATH/src/go.uber.org
-git clone git@github.com:your_github_username/zap.git
-cd zap
-git remote add upstream https://github.com/uber-go/zap.git
-git fetch upstream
-```
-
-Make sure that the tests and the linters pass:
-
-```
-make test
-make lint
-```
-
-If you're not using the minor version of Go specified in the Makefile's
-`LINTABLE_MINOR_VERSIONS` variable, `make lint` doesn't do anything. This is
-fine, but it means that you'll only discover lint failures after you open your
-pull request.
-
-## Making Changes
-
-Start by creating a new branch for your changes:
-
-```
-cd $GOPATH/src/go.uber.org/zap
-git checkout master
-git fetch upstream
-git rebase upstream/master
-git checkout -b cool_new_feature
-```
-
-Make your changes, then ensure that `make lint` and `make test` still pass. If
-you're satisfied with your changes, push them to your fork.
-
-```
-git push origin cool_new_feature
-```
-
-Then use the GitHub UI to open a pull request.
-
-At this point, you're waiting on us to review your changes. We *try* to respond
-to issues and pull requests within a few business days, and we may suggest some
-improvements or alternatives. Once your changes are approved, one of the
-project maintainers will merge them.
-
-We're much more likely to approve your changes if you:
-
-* Add tests for new functionality.
-* Write a [good commit message][commit-message].
-* Maintain backward compatibility.
-
-[fork]: https://github.com/uber-go/zap/fork
-[open-issue]: https://github.com/uber-go/zap/issues/new
-[cla]: https://cla-assistant.io/uber-go/zap
-[commit-message]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
diff --git a/vendor/go.uber.org/zap/FAQ.md b/vendor/go.uber.org/zap/FAQ.md
deleted file mode 100644
index b183b20b..00000000
--- a/vendor/go.uber.org/zap/FAQ.md
+++ /dev/null
@@ -1,164 +0,0 @@
-# Frequently Asked Questions
-
-## Design
-
-### Why spend so much effort on logger performance?
-
-Of course, most applications won't notice the impact of a slow logger: they
-already take tens or hundreds of milliseconds for each operation, so an extra
-millisecond doesn't matter.
-
-On the other hand, why *not* make structured logging fast? The `SugaredLogger`
-isn't any harder to use than other logging packages, and the `Logger` makes
-structured logging possible in performance-sensitive contexts. Across a fleet
-of Go microservices, making each application even slightly more efficient adds
-up quickly.
-
-### Why aren't `Logger` and `SugaredLogger` interfaces?
-
-Unlike the familiar `io.Writer` and `http.Handler`, `Logger` and
-`SugaredLogger` interfaces would include *many* methods. As [Rob Pike points
-out][go-proverbs], "The bigger the interface, the weaker the abstraction."
-Interfaces are also rigid &mdash; *any* change requires releasing a new major
-version, since it breaks all third-party implementations.
-
-Making the `Logger` and `SugaredLogger` concrete types doesn't sacrifice much
-abstraction, and it lets us add methods without introducing breaking changes.
-Your applications should define and depend upon an interface that includes
-just the methods you use.
-
-### Why are some of my logs missing?
-
-Logs are dropped intentionally by zap when sampling is enabled. The production
-configuration (as returned by `NewProductionConfig()` enables sampling which will
-cause repeated logs within a second to be sampled. See more details on why sampling
-is enabled in [Why sample application logs](https://github.com/uber-go/zap/blob/master/FAQ.md#why-sample-application-logs).
-
-### Why sample application logs?
-
-Applications often experience runs of errors, either because of a bug or
-because of a misbehaving user. Logging errors is usually a good idea, but it
-can easily make this bad situation worse: not only is your application coping
-with a flood of errors, it's also spending extra CPU cycles and I/O logging
-those errors. Since writes are typically serialized, logging limits throughput
-when you need it most.
-
-Sampling fixes this problem by dropping repetitive log entries. Under normal
-conditions, your application writes out every entry. When similar entries are
-logged hundreds or thousands of times each second, though, zap begins dropping
-duplicates to preserve throughput.
-
-### Why do the structured logging APIs take a message in addition to fields?
-
-Subjectively, we find it helpful to accompany structured context with a brief
-description. This isn't critical during development, but it makes debugging
-and operating unfamiliar systems much easier.
-
-More concretely, zap's sampling algorithm uses the message to identify
-duplicate entries. In our experience, this is a practical middle ground
-between random sampling (which often drops the exact entry that you need while
-debugging) and hashing the complete entry (which is prohibitively expensive).
-
-### Why include package-global loggers?
-
-Since so many other logging packages include a global logger, many
-applications aren't designed to accept loggers as explicit parameters.
-Changing function signatures is often a breaking change, so zap includes
-global loggers to simplify migration.
-
-Avoid them where possible.
-
-### Why include dedicated Panic and Fatal log levels?
-
-In general, application code should handle errors gracefully instead of using
-`panic` or `os.Exit`. However, every rule has exceptions, and it's common to
-crash when an error is truly unrecoverable. To avoid losing any information
-&mdash; especially the reason for the crash &mdash; the logger must flush any
-buffered entries before the process exits.
-
-Zap makes this easy by offering `Panic` and `Fatal` logging methods that
-automatically flush before exiting. Of course, this doesn't guarantee that
-logs will never be lost, but it eliminates a common error.
-
-See the discussion in uber-go/zap#207 for more details.
-
-### What's `DPanic`?
-
-`DPanic` stands for "panic in development." In development, it logs at
-`PanicLevel`; otherwise, it logs at `ErrorLevel`. `DPanic` makes it easier to
-catch errors that are theoretically possible, but shouldn't actually happen,
-*without* crashing in production.
-
-If you've ever written code like this, you need `DPanic`:
-
-```go
-if err != nil {
-  panic(fmt.Sprintf("shouldn't ever get here: %v", err))
-}
-```
-
-## Installation
-
-### What does the error `expects import "go.uber.org/zap"` mean?
-
-Either zap was installed incorrectly or you're referencing the wrong package
-name in your code.
-
-Zap's source code happens to be hosted on GitHub, but the [import
-path][import-path] is `go.uber.org/zap`. This gives us, the project
-maintainers, the freedom to move the source code if necessary. However, it
-means that you need to take a little care when installing and using the
-package.
-
-If you follow two simple rules, everything should work: install zap with `go
-get -u go.uber.org/zap`, and always import it in your code with `import
-"go.uber.org/zap"`. Your code shouldn't contain *any* references to
-`github.com/uber-go/zap`.
-
-## Usage
-
-### Does zap support log rotation?
-
-Zap doesn't natively support rotating log files, since we prefer to leave this
-to an external program like `logrotate`.
-
-However, it's easy to integrate a log rotation package like
-[`gopkg.in/natefinch/lumberjack.v2`][lumberjack] as a `zapcore.WriteSyncer`.
-
-```go
-// lumberjack.Logger is already safe for concurrent use, so we don't need to
-// lock it.
-w := zapcore.AddSync(&lumberjack.Logger{
-  Filename:   "/var/log/myapp/foo.log",
-  MaxSize:    500, // megabytes
-  MaxBackups: 3,
-  MaxAge:     28, // days
-})
-core := zapcore.NewCore(
-  zapcore.NewJSONEncoder(zap.NewProductionEncoderConfig()),
-  w,
-  zap.InfoLevel,
-)
-logger := zap.New(core)
-```
-
-## Extensions
-
-We'd love to support every logging need within zap itself, but we're only
-familiar with a handful of log ingestion systems, flag-parsing packages, and
-the like. Rather than merging code that we can't effectively debug and
-support, we'd rather grow an ecosystem of zap extensions.
-
-We're aware of the following extensions, but haven't used them ourselves:
-
-| Package | Integration |
-| --- | --- |
-| `github.com/tchap/zapext` | Sentry, syslog |
-| `github.com/fgrosse/zaptest` | Ginkgo |
-| `github.com/blendle/zapdriver` | Stackdriver |
-| `github.com/moul/zapgorm` | Gorm |
-| `github.com/moul/zapfilter` | Advanced filtering rules |
-
-[go-proverbs]: https://go-proverbs.github.io/
-[import-path]: https://golang.org/cmd/go/#hdr-Remote_import_paths
-[lumberjack]: https://godoc.org/gopkg.in/natefinch/lumberjack.v2
diff --git a/vendor/go.uber.org/zap/LICENSE.txt b/vendor/go.uber.org/zap/LICENSE.txt
deleted file mode 100644
index 6652bed4..00000000
--- a/vendor/go.uber.org/zap/LICENSE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2016-2017 Uber Technologies, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/go.uber.org/zap/Makefile b/vendor/go.uber.org/zap/Makefile
deleted file mode 100644
index 9b1bc3b0..00000000
--- a/vendor/go.uber.org/zap/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-export GOBIN ?= $(shell pwd)/bin
-
-GOLINT = $(GOBIN)/golint
-STATICCHECK = $(GOBIN)/staticcheck
-BENCH_FLAGS ?= -cpuprofile=cpu.pprof -memprofile=mem.pprof -benchmem
-
-# Directories containing independent Go modules.
-#
-# We track coverage only for the main module.
-MODULE_DIRS = . ./benchmarks ./zapgrpc/internal/test
-
-# Many Go tools take file globs or directories as arguments instead of packages.
-GO_FILES := $(shell \
-	find . '(' -path '*/.*' -o -path './vendor' ')' -prune \
-	-o -name '*.go' -print | cut -b3-)
-
-.PHONY: all
-all: lint test
-
-.PHONY: lint
-lint: $(GOLINT) $(STATICCHECK)
-	@rm -rf lint.log
-	@echo "Checking formatting..."
-	@gofmt -d -s $(GO_FILES) 2>&1 | tee lint.log
-	@echo "Checking vet..."
-	@$(foreach dir,$(MODULE_DIRS),(cd $(dir) && go vet ./... 2>&1) &&) true | tee -a lint.log
-	@echo "Checking lint..."
-	@$(foreach dir,$(MODULE_DIRS),(cd $(dir) && $(GOLINT) ./... 2>&1) &&) true | tee -a lint.log
-	@echo "Checking staticcheck..."
-	@$(foreach dir,$(MODULE_DIRS),(cd $(dir) && $(STATICCHECK) ./... 2>&1) &&) true | tee -a lint.log
-	@echo "Checking for unresolved FIXMEs..."
-	@git grep -i fixme | grep -v -e Makefile | tee -a lint.log
-	@echo "Checking for license headers..."
-	@./checklicense.sh | tee -a lint.log
-	@[ ! -s lint.log ]
-	@echo "Checking 'go mod tidy'..."
-	@make tidy
-	@if ! git diff --quiet; then \
-		echo "'go mod tidy' resulted in changes or working tree is dirty:"; \
-		git --no-pager diff; \
-	fi
-
-$(GOLINT):
-	cd tools && go install golang.org/x/lint/golint
-
-$(STATICCHECK):
-	cd tools && go install honnef.co/go/tools/cmd/staticcheck
-
-.PHONY: test
-test:
-	@$(foreach dir,$(MODULE_DIRS),(cd $(dir) && go test -race ./...) &&) true
-
-.PHONY: cover
-cover:
-	go test -race -coverprofile=cover.out -coverpkg=./... ./...
-	go tool cover -html=cover.out -o cover.html
-
-.PHONY: bench
-BENCH ?= .
-bench:
-	@$(foreach dir,$(MODULE_DIRS), ( \
-		cd $(dir) && \
-		go list ./... | xargs -n1 go test -bench=$(BENCH) -run="^$$" $(BENCH_FLAGS) \
-	) &&) true
-
-.PHONY: updatereadme
-updatereadme:
-	rm -f README.md
-	cat .readme.tmpl | go run internal/readme/readme.go > README.md
-
-.PHONY: tidy
-tidy:
-	@$(foreach dir,$(MODULE_DIRS),(cd $(dir) && go mod tidy) &&) true
diff --git a/vendor/go.uber.org/zap/README.md b/vendor/go.uber.org/zap/README.md
deleted file mode 100644
index 9c9dfe1e..00000000
--- a/vendor/go.uber.org/zap/README.md
+++ /dev/null
@@ -1,134 +0,0 @@
-# :zap: zap [![GoDoc][doc-img]][doc] [![Build Status][ci-img]][ci] [![Coverage Status][cov-img]][cov]
-
-Blazing fast, structured, leveled logging in Go.
-
-## Installation
-
-`go get -u go.uber.org/zap`
-
-Note that zap only supports the two most recent minor versions of Go.
-
-## Quick Start
-
-In contexts where performance is nice, but not critical, use the
-`SugaredLogger`. It's 4-10x faster than other structured logging
-packages and includes both structured and `printf`-style APIs.
-
-```go
-logger, _ := zap.NewProduction()
-defer logger.Sync() // flushes buffer, if any
-sugar := logger.Sugar()
-sugar.Infow("failed to fetch URL",
-  // Structured context as loosely typed key-value pairs.
-  "url", url,
-  "attempt", 3,
-  "backoff", time.Second,
-)
-sugar.Infof("Failed to fetch URL: %s", url)
-```
-
-When performance and type safety are critical, use the `Logger`. It's even
-faster than the `SugaredLogger` and allocates far less, but it only supports
-structured logging.
-
-```go
-logger, _ := zap.NewProduction()
-defer logger.Sync()
-logger.Info("failed to fetch URL",
-  // Structured context as strongly typed Field values.
-  zap.String("url", url),
-  zap.Int("attempt", 3),
-  zap.Duration("backoff", time.Second),
-)
-```
-
-See the [documentation][doc] and [FAQ](FAQ.md) for more details.
-
-## Performance
-
-For applications that log in the hot path, reflection-based serialization and
-string formatting are prohibitively expensive &mdash; they're CPU-intensive
-and make many small allocations. Put differently, using `encoding/json` and
-`fmt.Fprintf` to log tons of `interface{}`s makes your application slow.
-
-Zap takes a different approach. It includes a reflection-free, zero-allocation
-JSON encoder, and the base `Logger` strives to avoid serialization overhead
-and allocations wherever possible. By building the high-level `SugaredLogger`
-on that foundation, zap lets users *choose* when they need to count every
-allocation and when they'd prefer a more familiar, loosely typed API.
-
-As measured by its own [benchmarking suite][], not only is zap more performant
-than comparable structured logging packages &mdash; it's also faster than the
-standard library. Like all benchmarks, take these with a grain of salt.<sup
-id="anchor-versions">[1](#footnote-versions)</sup>
-
-Log a message and 10 fields:
-
-| Package | Time | Time % to zap | Objects Allocated |
-| :------ | :--: | :-----------: | :---------------: |
-| :zap: zap | 2900 ns/op | +0% | 5 allocs/op
-| :zap: zap (sugared) | 3475 ns/op | +20% | 10 allocs/op
-| zerolog | 10639 ns/op | +267% | 32 allocs/op
-| go-kit | 14434 ns/op | +398% | 59 allocs/op
-| logrus | 17104 ns/op | +490% | 81 allocs/op
-| apex/log | 32424 ns/op | +1018% | 66 allocs/op
-| log15 | 33579 ns/op | +1058% | 76 allocs/op
-
-Log a message with a logger that already has 10 fields of context:
-
-| Package | Time | Time % to zap | Objects Allocated |
-| :------ | :--: | :-----------: | :---------------: |
-| :zap: zap | 373 ns/op | +0% | 0 allocs/op
-| :zap: zap (sugared) | 452 ns/op | +21% | 1 allocs/op
-| zerolog | 288 ns/op | -23% | 0 allocs/op
-| go-kit | 11785 ns/op | +3060% | 58 allocs/op
-| logrus | 19629 ns/op | +5162% | 70 allocs/op
-| log15 | 21866 ns/op | +5762% | 72 allocs/op
-| apex/log | 30890 ns/op | +8182% | 55 allocs/op
-
-Log a static string, without any context or `printf`-style templating:
-
-| Package | Time | Time % to zap | Objects Allocated |
-| :------ | :--: | :-----------: | :---------------: |
-| :zap: zap | 381 ns/op | +0% | 0 allocs/op
-| :zap: zap (sugared) | 410 ns/op | +8% | 1 allocs/op
-| zerolog | 369 ns/op | -3% | 0 allocs/op
-| standard library | 385 ns/op | +1% | 2 allocs/op
-| go-kit | 606 ns/op | +59% | 11 allocs/op
-| logrus | 1730 ns/op | +354% | 25 allocs/op
-| apex/log | 1998 ns/op | +424% | 7 allocs/op
-| log15 | 4546 ns/op | +1093% | 22 allocs/op
-
-## Development Status: Stable
-
-All APIs are finalized, and no breaking changes will be made in the 1.x series
-of releases. Users of semver-aware dependency management systems should pin
-zap to `^1`.
-
-## Contributing
-
-We encourage and support an active, healthy community of contributors &mdash;
-including you! Details are in the [contribution guide](CONTRIBUTING.md) and
-the [code of conduct](CODE_OF_CONDUCT.md). The zap maintainers keep an eye on
-issues and pull requests, but you can also report any negative conduct to
-oss-conduct@uber.com. That email list is a private, safe space; even the zap
-maintainers don't have access, so don't hesitate to hold us to a high
-standard.
-
-<hr>
-
-Released under the [MIT License](LICENSE.txt).
-
-<sup id="footnote-versions">1</sup> In particular, keep in mind that we may be
-benchmarking against slightly older versions of other packages. Versions are
-pinned in the [benchmarks/go.mod][] file. [↩](#anchor-versions)
-
-[doc-img]: https://pkg.go.dev/badge/go.uber.org/zap
-[doc]: https://pkg.go.dev/go.uber.org/zap
-[ci-img]: https://github.com/uber-go/zap/actions/workflows/go.yml/badge.svg
-[ci]: https://github.com/uber-go/zap/actions/workflows/go.yml
-[cov-img]: https://codecov.io/gh/uber-go/zap/branch/master/graph/badge.svg
-[cov]: https://codecov.io/gh/uber-go/zap
-[benchmarking suite]: https://github.com/uber-go/zap/tree/master/benchmarks
-[benchmarks/go.mod]: https://github.com/uber-go/zap/blob/master/benchmarks/go.mod
-
diff --git a/vendor/go.uber.org/zap/array.go b/vendor/go.uber.org/zap/array.go
deleted file mode 100644
index 5be3704a..00000000
--- a/vendor/go.uber.org/zap/array.go
+++ /dev/null
@@ -1,320 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zap
-
-import (
-	"time"
-
-	"go.uber.org/zap/zapcore"
-)
-
-// Array constructs a field with the given key and ArrayMarshaler. It provides
-// a flexible, but still type-safe and efficient, way to add array-like types
-// to the logging context. The struct's MarshalLogArray method is called lazily.
-func Array(key string, val zapcore.ArrayMarshaler) Field {
-	return Field{Key: key, Type: zapcore.ArrayMarshalerType, Interface: val}
-}
-
-// Bools constructs a field that carries a slice of bools.
-func Bools(key string, bs []bool) Field {
-	return Array(key, bools(bs))
-}
-
-// ByteStrings constructs a field that carries a slice of []byte, each of which
-// must be UTF-8 encoded text.
-func ByteStrings(key string, bss [][]byte) Field {
-	return Array(key, byteStringsArray(bss))
-}
-
-// Complex128s constructs a field that carries a slice of complex numbers.
-func Complex128s(key string, nums []complex128) Field {
-	return Array(key, complex128s(nums))
-}
-
-// Complex64s constructs a field that carries a slice of complex numbers.
-func Complex64s(key string, nums []complex64) Field {
-	return Array(key, complex64s(nums))
-}
-
-// Durations constructs a field that carries a slice of time.Durations.
-func Durations(key string, ds []time.Duration) Field {
-	return Array(key, durations(ds))
-}
-
-// Float64s constructs a field that carries a slice of floats.
-func Float64s(key string, nums []float64) Field {
-	return Array(key, float64s(nums))
-}
-
-// Float32s constructs a field that carries a slice of floats.
-func Float32s(key string, nums []float32) Field {
-	return Array(key, float32s(nums))
-}
-
-// Ints constructs a field that carries a slice of integers.
-func Ints(key string, nums []int) Field {
-	return Array(key, ints(nums))
-}
-
-// Int64s constructs a field that carries a slice of integers.
-func Int64s(key string, nums []int64) Field {
-	return Array(key, int64s(nums))
-}
-
-// Int32s constructs a field that carries a slice of integers.
-func Int32s(key string, nums []int32) Field {
-	return Array(key, int32s(nums))
-}
-
-// Int16s constructs a field that carries a slice of integers.
-func Int16s(key string, nums []int16) Field {
-	return Array(key, int16s(nums))
-}
-
-// Int8s constructs a field that carries a slice of integers.
-func Int8s(key string, nums []int8) Field {
-	return Array(key, int8s(nums))
-}
-
-// Strings constructs a field that carries a slice of strings.
-func Strings(key string, ss []string) Field {
-	return Array(key, stringArray(ss))
-}
-
-// Times constructs a field that carries a slice of time.Times.
-func Times(key string, ts []time.Time) Field {
-	return Array(key, times(ts))
-}
-
-// Uints constructs a field that carries a slice of unsigned integers.
-func Uints(key string, nums []uint) Field {
-	return Array(key, uints(nums))
-}
-
-// Uint64s constructs a field that carries a slice of unsigned integers.
-func Uint64s(key string, nums []uint64) Field {
-	return Array(key, uint64s(nums))
-}
-
-// Uint32s constructs a field that carries a slice of unsigned integers.
-func Uint32s(key string, nums []uint32) Field {
-	return Array(key, uint32s(nums))
-}
-
-// Uint16s constructs a field that carries a slice of unsigned integers.
-func Uint16s(key string, nums []uint16) Field {
-	return Array(key, uint16s(nums))
-}
-
-// Uint8s constructs a field that carries a slice of unsigned integers.
-func Uint8s(key string, nums []uint8) Field {
-	return Array(key, uint8s(nums))
-}
-
-// Uintptrs constructs a field that carries a slice of pointer addresses.
-func Uintptrs(key string, us []uintptr) Field {
-	return Array(key, uintptrs(us))
-}
-
-// Errors constructs a field that carries a slice of errors.
-func Errors(key string, errs []error) Field {
-	return Array(key, errArray(errs))
-}
-
-type bools []bool
-
-func (bs bools) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range bs {
-		arr.AppendBool(bs[i])
-	}
-	return nil
-}
-
-type byteStringsArray [][]byte
-
-func (bss byteStringsArray) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range bss {
-		arr.AppendByteString(bss[i])
-	}
-	return nil
-}
-
-type complex128s []complex128
-
-func (nums complex128s) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range nums {
-		arr.AppendComplex128(nums[i])
-	}
-	return nil
-}
-
-type complex64s []complex64
-
-func (nums complex64s) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range nums {
-		arr.AppendComplex64(nums[i])
-	}
-	return nil
-}
-
-type durations []time.Duration
-
-func (ds durations) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range ds {
-		arr.AppendDuration(ds[i])
-	}
-	return nil
-}
-
-type float64s []float64
-
-func (nums float64s) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range nums {
-		arr.AppendFloat64(nums[i])
-	}
-	return nil
-}
-
-type float32s []float32
-
-func (nums float32s) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range nums {
-		arr.AppendFloat32(nums[i])
-	}
-	return nil
-}
-
-type ints []int
-
-func (nums ints) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range nums {
-		arr.AppendInt(nums[i])
-	}
-	return nil
-}
-
-type int64s []int64
-
-func (nums int64s) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range nums {
-		arr.AppendInt64(nums[i])
-	}
-	return nil
-}
-
-type int32s []int32
-
-func (nums int32s) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range nums {
-		arr.AppendInt32(nums[i])
-	}
-	return nil
-}
-
-type int16s []int16
-
-func (nums int16s) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range nums {
-		arr.AppendInt16(nums[i])
-	}
-	return nil
-}
-
-type int8s []int8
-
-func (nums int8s) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range nums {
-		arr.AppendInt8(nums[i])
-	}
-	return nil
-}
-
-type stringArray []string
-
-func (ss stringArray) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range ss {
-		arr.AppendString(ss[i])
-	}
-	return nil
-}
-
-type times []time.Time
-
-func (ts times) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range ts {
-		arr.AppendTime(ts[i])
-	}
-	return nil
-}
-
-type uints []uint
-
-func (nums uints) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range nums {
-		arr.AppendUint(nums[i])
-	}
-	return nil
-}
-
-type uint64s []uint64
-
-func (nums uint64s) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range nums {
-		arr.AppendUint64(nums[i])
-	}
-	return nil
-}
-
-type uint32s []uint32
-
-func (nums uint32s) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range nums {
-		arr.AppendUint32(nums[i])
-	}
-	return nil
-}
-
-type uint16s []uint16
-
-func (nums uint16s) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range nums {
-		arr.AppendUint16(nums[i])
-	}
-	return nil
-}
-
-type uint8s []uint8
-
-func (nums uint8s) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range nums {
-		arr.AppendUint8(nums[i])
-	}
-	return nil
-}
-
-type uintptrs []uintptr
-
-func (nums uintptrs) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range nums {
-		arr.AppendUintptr(nums[i])
-	}
-	return nil
-}
diff --git a/vendor/go.uber.org/zap/buffer/buffer.go b/vendor/go.uber.org/zap/buffer/buffer.go
deleted file mode 100644
index 9e929cd9..00000000
--- a/vendor/go.uber.org/zap/buffer/buffer.go
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-// Package buffer provides a thin wrapper around a byte slice. Unlike the
-// standard library's bytes.Buffer, it supports a portion of the strconv
-// package's zero-allocation formatters.
-package buffer // import "go.uber.org/zap/buffer"
-
-import (
-	"strconv"
-	"time"
-)
-
-const _size = 1024 // by default, create 1 KiB buffers
-
-// Buffer is a thin wrapper around a byte slice. It's intended to be pooled, so
-// the only way to construct one is via a Pool.
-type Buffer struct {
-	bs   []byte
-	pool Pool
-}
-
-// AppendByte writes a single byte to the Buffer.
-func (b *Buffer) AppendByte(v byte) {
-	b.bs = append(b.bs, v)
-}
-
-// AppendString writes a string to the Buffer.
-func (b *Buffer) AppendString(s string) {
-	b.bs = append(b.bs, s...)
-}
-
-// AppendInt appends an integer to the underlying buffer (assuming base 10).
-func (b *Buffer) AppendInt(i int64) {
-	b.bs = strconv.AppendInt(b.bs, i, 10)
-}
-
-// AppendTime appends the time formatted using the specified layout.
-func (b *Buffer) AppendTime(t time.Time, layout string) {
-	b.bs = t.AppendFormat(b.bs, layout)
-}
-
-// AppendUint appends an unsigned integer to the underlying buffer (assuming
-// base 10).
-func (b *Buffer) AppendUint(i uint64) {
-	b.bs = strconv.AppendUint(b.bs, i, 10)
-}
-
-// AppendBool appends a bool to the underlying buffer.
-func (b *Buffer) AppendBool(v bool) {
-	b.bs = strconv.AppendBool(b.bs, v)
-}
-
-// AppendFloat appends a float to the underlying buffer. It doesn't quote NaN
-// or +/- Inf.
-func (b *Buffer) AppendFloat(f float64, bitSize int) {
-	b.bs = strconv.AppendFloat(b.bs, f, 'f', -1, bitSize)
-}
-
-// Len returns the length of the underlying byte slice.
-func (b *Buffer) Len() int {
-	return len(b.bs)
-}
-
-// Cap returns the capacity of the underlying byte slice.
-func (b *Buffer) Cap() int {
-	return cap(b.bs)
-}
-
-// Bytes returns a mutable reference to the underlying byte slice.
-func (b *Buffer) Bytes() []byte {
-	return b.bs
-}
-
-// String returns a string copy of the underlying byte slice.
-func (b *Buffer) String() string {
-	return string(b.bs)
-}
-
-// Reset resets the underlying byte slice. Subsequent writes re-use the slice's
-// backing array.
-func (b *Buffer) Reset() {
-	b.bs = b.bs[:0]
-}
-
-// Write implements io.Writer.
-func (b *Buffer) Write(bs []byte) (int, error) {
-	b.bs = append(b.bs, bs...)
-	return len(bs), nil
-}
-
-// WriteByte writes a single byte to the Buffer.
-//
-// Error returned is always nil, function signature is compatible
-// with bytes.Buffer and bufio.Writer
-func (b *Buffer) WriteByte(v byte) error {
-	b.AppendByte(v)
-	return nil
-}
-
-// WriteString writes a string to the Buffer.
-//
-// Error returned is always nil, function signature is compatible
-// with bytes.Buffer and bufio.Writer
-func (b *Buffer) WriteString(s string) (int, error) {
-	b.AppendString(s)
-	return len(s), nil
-}
-
-// TrimNewline trims any final "\n" byte from the end of the buffer.
-func (b *Buffer) TrimNewline() {
-	if i := len(b.bs) - 1; i >= 0 {
-		if b.bs[i] == '\n' {
-			b.bs = b.bs[:i]
-		}
-	}
-}
-
-// Free returns the Buffer to its Pool.
-//
-// Callers must not retain references to the Buffer after calling Free.
-func (b *Buffer) Free() {
-	b.pool.put(b)
-}
diff --git a/vendor/go.uber.org/zap/buffer/pool.go b/vendor/go.uber.org/zap/buffer/pool.go
deleted file mode 100644
index 8fb3e202..00000000
--- a/vendor/go.uber.org/zap/buffer/pool.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package buffer
-
-import "sync"
-
-// A Pool is a type-safe wrapper around a sync.Pool.
-type Pool struct {
-	p *sync.Pool
-}
-
-// NewPool constructs a new Pool.
-func NewPool() Pool {
-	return Pool{p: &sync.Pool{
-		New: func() interface{} {
-			return &Buffer{bs: make([]byte, 0, _size)}
-		},
-	}}
-}
-
-// Get retrieves a Buffer from the pool, creating one if necessary.
-func (p Pool) Get() *Buffer {
-	buf := p.p.Get().(*Buffer)
-	buf.Reset()
-	buf.pool = p
-	return buf
-}
-
-func (p Pool) put(buf *Buffer) {
-	p.p.Put(buf)
-}
diff --git a/vendor/go.uber.org/zap/checklicense.sh b/vendor/go.uber.org/zap/checklicense.sh
deleted file mode 100644
index 345ac8b8..00000000
--- a/vendor/go.uber.org/zap/checklicense.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash -e
-
-ERROR_COUNT=0
-while read -r file
-do
-	case "$(head -1 "${file}")" in
-		*"Copyright (c) "*" Uber Technologies, Inc.")
-			# everything's cool
-			;;
-		*)
-			echo "$file is missing license header."
-			(( ERROR_COUNT++ ))
-			;;
-	esac
-done < <(git ls-files "*\.go")
-
-exit $ERROR_COUNT
diff --git a/vendor/go.uber.org/zap/config.go b/vendor/go.uber.org/zap/config.go
deleted file mode 100644
index 55637fb0..00000000
--- a/vendor/go.uber.org/zap/config.go
+++ /dev/null
@@ -1,264 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zap
-
-import (
-	"fmt"
-	"sort"
-	"time"
-
-	"go.uber.org/zap/zapcore"
-)
-
-// SamplingConfig sets a sampling strategy for the logger. Sampling caps the
-// global CPU and I/O load that logging puts on your process while attempting
-// to preserve a representative subset of your logs.
-//
-// If specified, the Sampler will invoke the Hook after each decision.
-//
-// Values configured here are per-second. See zapcore.NewSamplerWithOptions for
-// details.
-type SamplingConfig struct {
-	Initial    int                                           `json:"initial" yaml:"initial"`
-	Thereafter int                                           `json:"thereafter" yaml:"thereafter"`
-	Hook       func(zapcore.Entry, zapcore.SamplingDecision) `json:"-" yaml:"-"`
-}
-
-// Config offers a declarative way to construct a logger. It doesn't do
-// anything that can't be done with New, Options, and the various
-// zapcore.WriteSyncer and zapcore.Core wrappers, but it's a simpler way to
-// toggle common options.
-//
-// Note that Config intentionally supports only the most common options. More
-// unusual logging setups (logging to network connections or message queues,
-// splitting output between multiple files, etc.) are possible, but require
-// direct use of the zapcore package. For sample code, see the package-level
-// BasicConfiguration and AdvancedConfiguration examples.
-//
-// For an example showing runtime log level changes, see the documentation for
-// AtomicLevel.
-type Config struct {
-	// Level is the minimum enabled logging level. Note that this is a dynamic
-	// level, so calling Config.Level.SetLevel will atomically change the log
-	// level of all loggers descended from this config.
-	Level AtomicLevel `json:"level" yaml:"level"`
-	// Development puts the logger in development mode, which changes the
-	// behavior of DPanicLevel and takes stacktraces more liberally.
-	Development bool `json:"development" yaml:"development"`
-	// DisableCaller stops annotating logs with the calling function's file
-	// name and line number. By default, all logs are annotated.
-	DisableCaller bool `json:"disableCaller" yaml:"disableCaller"`
-	// DisableStacktrace completely disables automatic stacktrace capturing. By
-	// default, stacktraces are captured for WarnLevel and above logs in
-	// development and ErrorLevel and above in production.
-	DisableStacktrace bool `json:"disableStacktrace" yaml:"disableStacktrace"`
-	// Sampling sets a sampling policy. A nil SamplingConfig disables sampling.
-	Sampling *SamplingConfig `json:"sampling" yaml:"sampling"`
-	// Encoding sets the logger's encoding. Valid values are "json" and
-	// "console", as well as any third-party encodings registered via
-	// RegisterEncoder.
-	Encoding string `json:"encoding" yaml:"encoding"`
-	// EncoderConfig sets options for the chosen encoder. See
-	// zapcore.EncoderConfig for details.
-	EncoderConfig zapcore.EncoderConfig `json:"encoderConfig" yaml:"encoderConfig"`
-	// OutputPaths is a list of URLs or file paths to write logging output to.
-	// See Open for details.
-	OutputPaths []string `json:"outputPaths" yaml:"outputPaths"`
-	// ErrorOutputPaths is a list of URLs to write internal logger errors to.
-	// The default is standard error.
-	//
-	// Note that this setting only affects internal errors; for sample code that
-	// sends error-level logs to a different location from info- and debug-level
-	// logs, see the package-level AdvancedConfiguration example.
-	ErrorOutputPaths []string `json:"errorOutputPaths" yaml:"errorOutputPaths"`
-	// InitialFields is a collection of fields to add to the root logger.
-	InitialFields map[string]interface{} `json:"initialFields" yaml:"initialFields"`
-}
-
-// NewProductionEncoderConfig returns an opinionated EncoderConfig for
-// production environments.
-func NewProductionEncoderConfig() zapcore.EncoderConfig {
-	return zapcore.EncoderConfig{
-		TimeKey:        "ts",
-		LevelKey:       "level",
-		NameKey:        "logger",
-		CallerKey:      "caller",
-		FunctionKey:    zapcore.OmitKey,
-		MessageKey:     "msg",
-		StacktraceKey:  "stacktrace",
-		LineEnding:     zapcore.DefaultLineEnding,
-		EncodeLevel:    zapcore.LowercaseLevelEncoder,
-		EncodeTime:     zapcore.EpochTimeEncoder,
-		EncodeDuration: zapcore.SecondsDurationEncoder,
-		EncodeCaller:   zapcore.ShortCallerEncoder,
-	}
-}
-
-// NewProductionConfig is a reasonable production logging configuration.
-// Logging is enabled at InfoLevel and above.
-//
-// It uses a JSON encoder, writes to standard error, and enables sampling.
-// Stacktraces are automatically included on logs of ErrorLevel and above.
-func NewProductionConfig() Config {
-	return Config{
-		Level:       NewAtomicLevelAt(InfoLevel),
-		Development: false,
-		Sampling: &SamplingConfig{
-			Initial:    100,
-			Thereafter: 100,
-		},
-		Encoding:         "json",
-		EncoderConfig:    NewProductionEncoderConfig(),
-		OutputPaths:      []string{"stderr"},
-		ErrorOutputPaths: []string{"stderr"},
-	}
-}
-
-// NewDevelopmentEncoderConfig returns an opinionated EncoderConfig for
-// development environments.
-func NewDevelopmentEncoderConfig() zapcore.EncoderConfig {
-	return zapcore.EncoderConfig{
-		// Keys can be anything except the empty string.
-		TimeKey:        "T",
-		LevelKey:       "L",
-		NameKey:        "N",
-		CallerKey:      "C",
-		FunctionKey:    zapcore.OmitKey,
-		MessageKey:     "M",
-		StacktraceKey:  "S",
-		LineEnding:     zapcore.DefaultLineEnding,
-		EncodeLevel:    zapcore.CapitalLevelEncoder,
-		EncodeTime:     zapcore.ISO8601TimeEncoder,
-		EncodeDuration: zapcore.StringDurationEncoder,
-		EncodeCaller:   zapcore.ShortCallerEncoder,
-	}
-}
-
-// NewDevelopmentConfig is a reasonable development logging configuration.
-// Logging is enabled at DebugLevel and above.
-//
-// It enables development mode (which makes DPanicLevel logs panic), uses a
-// console encoder, writes to standard error, and disables sampling.
-// Stacktraces are automatically included on logs of WarnLevel and above.
-func NewDevelopmentConfig() Config {
-	return Config{
-		Level:            NewAtomicLevelAt(DebugLevel),
-		Development:      true,
-		Encoding:         "console",
-		EncoderConfig:    NewDevelopmentEncoderConfig(),
-		OutputPaths:      []string{"stderr"},
-		ErrorOutputPaths: []string{"stderr"},
-	}
-}
-
-// Build constructs a logger from the Config and Options.
-func (cfg Config) Build(opts ...Option) (*Logger, error) {
-	enc, err := cfg.buildEncoder()
-	if err != nil {
-		return nil, err
-	}
-
-	sink, errSink, err := cfg.openSinks()
-	if err != nil {
-		return nil, err
-	}
-
-	if cfg.Level == (AtomicLevel{}) {
-		return nil, fmt.Errorf("missing Level")
-	}
-
-	log := New(
-		zapcore.NewCore(enc, sink, cfg.Level),
-		cfg.buildOptions(errSink)...,
-	)
-	if len(opts) > 0 {
-		log = log.WithOptions(opts...)
-	}
-	return log, nil
-}
-
-func (cfg Config) buildOptions(errSink zapcore.WriteSyncer) []Option {
-	opts := []Option{ErrorOutput(errSink)}
-
-	if cfg.Development {
-		opts = append(opts, Development())
-	}
-
-	if !cfg.DisableCaller {
-		opts = append(opts, AddCaller())
-	}
-
-	stackLevel := ErrorLevel
-	if cfg.Development {
-		stackLevel = WarnLevel
-	}
-	if !cfg.DisableStacktrace {
-		opts = append(opts, AddStacktrace(stackLevel))
-	}
-
-	if scfg := cfg.Sampling; scfg != nil {
-		opts = append(opts, WrapCore(func(core zapcore.Core) zapcore.Core {
-			var samplerOpts []zapcore.SamplerOption
-			if scfg.Hook != nil {
-				samplerOpts = append(samplerOpts, zapcore.SamplerHook(scfg.Hook))
-			}
-			return zapcore.NewSamplerWithOptions(
-				core,
-				time.Second,
-				cfg.Sampling.Initial,
-				cfg.Sampling.Thereafter,
-				samplerOpts...,
-			)
-		}))
-	}
-
-	if len(cfg.InitialFields) > 0 {
-		fs := make([]Field, 0, len(cfg.InitialFields))
-		keys := make([]string, 0, len(cfg.InitialFields))
-		for k := range cfg.InitialFields {
-			keys = append(keys, k)
-		}
-		sort.Strings(keys)
-		for _, k := range keys {
-			fs = append(fs, Any(k, cfg.InitialFields[k]))
-		}
-		opts = append(opts, Fields(fs...))
-	}
-
-	return opts
-}
-
-func (cfg Config) openSinks() (zapcore.WriteSyncer, zapcore.WriteSyncer, error) {
-	sink, closeOut, err := Open(cfg.OutputPaths...)
-	if err != nil {
-		return nil, nil, err
-	}
-	errSink, _, err := Open(cfg.ErrorOutputPaths...)
-	if err != nil {
-		closeOut()
-		return nil, nil, err
-	}
-	return sink, errSink, nil
-}
-
-func (cfg Config) buildEncoder() (zapcore.Encoder, error) {
-	return newEncoder(cfg.Encoding, cfg.EncoderConfig)
-}
diff --git a/vendor/go.uber.org/zap/doc.go b/vendor/go.uber.org/zap/doc.go
deleted file mode 100644
index 8638dd1b..00000000
--- a/vendor/go.uber.org/zap/doc.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-// Package zap provides fast, structured, leveled logging.
-//
-// For applications that log in the hot path, reflection-based serialization
-// and string formatting are prohibitively expensive - they're CPU-intensive
-// and make many small allocations. Put differently, using json.Marshal and
-// fmt.Fprintf to log tons of interface{} makes your application slow.
-//
-// Zap takes a different approach. It includes a reflection-free,
-// zero-allocation JSON encoder, and the base Logger strives to avoid
-// serialization overhead and allocations wherever possible. By building the
-// high-level SugaredLogger on that foundation, zap lets users choose when
-// they need to count every allocation and when they'd prefer a more familiar,
-// loosely typed API.
-//
-// Choosing a Logger
-//
-// In contexts where performance is nice, but not critical, use the
-// SugaredLogger. It's 4-10x faster than other structured logging packages and
-// supports both structured and printf-style logging. Like log15 and go-kit,
-// the SugaredLogger's structured logging APIs are loosely typed and accept a
-// variadic number of key-value pairs. (For more advanced use cases, they also
-// accept strongly typed fields - see the SugaredLogger.With documentation for
-// details.)
-//  sugar := zap.NewExample().Sugar()
-//  defer sugar.Sync()
-//  sugar.Infow("failed to fetch URL",
-//    "url", "http://example.com",
-//    "attempt", 3,
-//    "backoff", time.Second,
-//  )
-//  sugar.Infof("failed to fetch URL: %s", "http://example.com")
-//
-// By default, loggers are unbuffered. However, since zap's low-level APIs
-// allow buffering, calling Sync before letting your process exit is a good
-// habit.
-//
-// In the rare contexts where every microsecond and every allocation matter,
-// use the Logger. It's even faster than the SugaredLogger and allocates far
-// less, but it only supports strongly-typed, structured logging.
-//  logger := zap.NewExample()
-//  defer logger.Sync()
-//  logger.Info("failed to fetch URL",
-//    zap.String("url", "http://example.com"),
-//    zap.Int("attempt", 3),
-//    zap.Duration("backoff", time.Second),
-//  )
-//
-// Choosing between the Logger and SugaredLogger doesn't need to be an
-// application-wide decision: converting between the two is simple and
-// inexpensive.
-//   logger := zap.NewExample()
-//   defer logger.Sync()
-//   sugar := logger.Sugar()
-//   plain := sugar.Desugar()
-//
-// Configuring Zap
-//
-// The simplest way to build a Logger is to use zap's opinionated presets:
-// NewExample, NewProduction, and NewDevelopment. These presets build a logger
-// with a single function call:
-//  logger, err := zap.NewProduction()
-//  if err != nil {
-//    log.Fatalf("can't initialize zap logger: %v", err)
-//  }
-//  defer logger.Sync()
-//
-// Presets are fine for small projects, but larger projects and organizations
-// naturally require a bit more customization. For most users, zap's Config
-// struct strikes the right balance between flexibility and convenience. See
-// the package-level BasicConfiguration example for sample code.
-//
-// More unusual configurations (splitting output between files, sending logs
-// to a message queue, etc.) are possible, but require direct use of
-// go.uber.org/zap/zapcore. See the package-level AdvancedConfiguration
-// example for sample code.
-//
-// Extending Zap
-//
-// The zap package itself is a relatively thin wrapper around the interfaces
-// in go.uber.org/zap/zapcore. Extending zap to support a new encoding (e.g.,
-// BSON), a new log sink (e.g., Kafka), or something more exotic (perhaps an
-// exception aggregation service, like Sentry or Rollbar) typically requires
-// implementing the zapcore.Encoder, zapcore.WriteSyncer, or zapcore.Core
-// interfaces. See the zapcore documentation for details.
-//
-// Similarly, package authors can use the high-performance Encoder and Core
-// implementations in the zapcore package to build their own loggers.
-//
-// Frequently Asked Questions
-//
-// An FAQ covering everything from installation errors to design decisions is
-// available at https://github.com/uber-go/zap/blob/master/FAQ.md.
-package zap // import "go.uber.org/zap"
diff --git a/vendor/go.uber.org/zap/encoder.go b/vendor/go.uber.org/zap/encoder.go
deleted file mode 100644
index 08ed8335..00000000
--- a/vendor/go.uber.org/zap/encoder.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zap
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-
-	"go.uber.org/zap/zapcore"
-)
-
-var (
-	errNoEncoderNameSpecified = errors.New("no encoder name specified")
-
-	_encoderNameToConstructor = map[string]func(zapcore.EncoderConfig) (zapcore.Encoder, error){
-		"console": func(encoderConfig zapcore.EncoderConfig) (zapcore.Encoder, error) {
-			return zapcore.NewConsoleEncoder(encoderConfig), nil
-		},
-		"json": func(encoderConfig zapcore.EncoderConfig) (zapcore.Encoder, error) {
-			return zapcore.NewJSONEncoder(encoderConfig), nil
-		},
-	}
-	_encoderMutex sync.RWMutex
-)
-
-// RegisterEncoder registers an encoder constructor, which the Config struct
-// can then reference. By default, the "json" and "console" encoders are
-// registered.
-//
-// Attempting to register an encoder whose name is already taken returns an
-// error.
-func RegisterEncoder(name string, constructor func(zapcore.EncoderConfig) (zapcore.Encoder, error)) error {
-	_encoderMutex.Lock()
-	defer _encoderMutex.Unlock()
-	if name == "" {
-		return errNoEncoderNameSpecified
-	}
-	if _, ok := _encoderNameToConstructor[name]; ok {
-		return fmt.Errorf("encoder already registered for name %q", name)
-	}
-	_encoderNameToConstructor[name] = constructor
-	return nil
-}
-
-func newEncoder(name string, encoderConfig zapcore.EncoderConfig) (zapcore.Encoder, error) {
-	if encoderConfig.TimeKey != "" && encoderConfig.EncodeTime == nil {
-		return nil, fmt.Errorf("missing EncodeTime in EncoderConfig")
-	}
-
-	_encoderMutex.RLock()
-	defer _encoderMutex.RUnlock()
-	if name == "" {
-		return nil, errNoEncoderNameSpecified
-	}
-	constructor, ok := _encoderNameToConstructor[name]
-	if !ok {
-		return nil, fmt.Errorf("no encoder registered for name %q", name)
-	}
-	return constructor(encoderConfig)
-}
diff --git a/vendor/go.uber.org/zap/error.go b/vendor/go.uber.org/zap/error.go
deleted file mode 100644
index 65982a51..00000000
--- a/vendor/go.uber.org/zap/error.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zap
-
-import (
-	"sync"
-
-	"go.uber.org/zap/zapcore"
-)
-
-var _errArrayElemPool = sync.Pool{New: func() interface{} {
-	return &errArrayElem{}
-}}
-
-// Error is shorthand for the common idiom NamedError("error", err).
-func Error(err error) Field {
-	return NamedError("error", err)
-}
-
-// NamedError constructs a field that lazily stores err.Error() under the
-// provided key. Errors which also implement fmt.Formatter (like those produced
-// by github.com/pkg/errors) will also have their verbose representation stored
-// under key+"Verbose". If passed a nil error, the field is a no-op.
-//
-// For the common case in which the key is simply "error", the Error function
-// is shorter and less repetitive.
-func NamedError(key string, err error) Field {
-	if err == nil {
-		return Skip()
-	}
-	return Field{Key: key, Type: zapcore.ErrorType, Interface: err}
-}
-
-type errArray []error
-
-func (errs errArray) MarshalLogArray(arr zapcore.ArrayEncoder) error {
-	for i := range errs {
-		if errs[i] == nil {
-			continue
-		}
-		// To represent each error as an object with an "error" attribute and
-		// potentially an "errorVerbose" attribute, we need to wrap it in a
-		// type that implements LogObjectMarshaler. To prevent this from
-		// allocating, pool the wrapper type.
-		elem := _errArrayElemPool.Get().(*errArrayElem)
-		elem.error = errs[i]
-		arr.AppendObject(elem)
-		elem.error = nil
-		_errArrayElemPool.Put(elem)
-	}
-	return nil
-}
-
-type errArrayElem struct {
-	error
-}
-
-func (e *errArrayElem) MarshalLogObject(enc zapcore.ObjectEncoder) error {
-	// Re-use the error field's logic, which supports non-standard error types.
-	Error(e.error).AddTo(enc)
-	return nil
-}
diff --git a/vendor/go.uber.org/zap/field.go b/vendor/go.uber.org/zap/field.go
deleted file mode 100644
index bbb745db..00000000
--- a/vendor/go.uber.org/zap/field.go
+++ /dev/null
@@ -1,549 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zap
-
-import (
-	"fmt"
-	"math"
-	"time"
-
-	"go.uber.org/zap/zapcore"
-)
-
-// Field is an alias for Field. Aliasing this type dramatically
-// improves the navigability of this package's API documentation.
-type Field = zapcore.Field
-
-var (
-	_minTimeInt64 = time.Unix(0, math.MinInt64)
-	_maxTimeInt64 = time.Unix(0, math.MaxInt64)
-)
-
-// Skip constructs a no-op field, which is often useful when handling invalid
-// inputs in other Field constructors.
-func Skip() Field {
-	return Field{Type: zapcore.SkipType}
-}
-
-// nilField returns a field which will marshal explicitly as nil. See motivation
-// in https://github.com/uber-go/zap/issues/753 . If we ever make breaking
-// changes and add zapcore.NilType and zapcore.ObjectEncoder.AddNil, the
-// implementation here should be changed to reflect that.
-func nilField(key string) Field { return Reflect(key, nil) }
-
-// Binary constructs a field that carries an opaque binary blob.
-//
-// Binary data is serialized in an encoding-appropriate format. For example,
-// zap's JSON encoder base64-encodes binary blobs. To log UTF-8 encoded text,
-// use ByteString.
-func Binary(key string, val []byte) Field {
-	return Field{Key: key, Type: zapcore.BinaryType, Interface: val}
-}
-
-// Bool constructs a field that carries a bool.
-func Bool(key string, val bool) Field {
-	var ival int64
-	if val {
-		ival = 1
-	}
-	return Field{Key: key, Type: zapcore.BoolType, Integer: ival}
-}
-
-// Boolp constructs a field that carries a *bool. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Boolp(key string, val *bool) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return Bool(key, *val)
-}
-
-// ByteString constructs a field that carries UTF-8 encoded text as a []byte.
-// To log opaque binary blobs (which aren't necessarily valid UTF-8), use
-// Binary.
-func ByteString(key string, val []byte) Field {
-	return Field{Key: key, Type: zapcore.ByteStringType, Interface: val}
-}
-
-// Complex128 constructs a field that carries a complex number. Unlike most
-// numeric fields, this costs an allocation (to convert the complex128 to
-// interface{}).
-func Complex128(key string, val complex128) Field {
-	return Field{Key: key, Type: zapcore.Complex128Type, Interface: val}
-}
-
-// Complex128p constructs a field that carries a *complex128. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Complex128p(key string, val *complex128) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return Complex128(key, *val)
-}
-
-// Complex64 constructs a field that carries a complex number. Unlike most
-// numeric fields, this costs an allocation (to convert the complex64 to
-// interface{}).
-func Complex64(key string, val complex64) Field {
-	return Field{Key: key, Type: zapcore.Complex64Type, Interface: val}
-}
-
-// Complex64p constructs a field that carries a *complex64. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Complex64p(key string, val *complex64) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return Complex64(key, *val)
-}
-
-// Float64 constructs a field that carries a float64. The way the
-// floating-point value is represented is encoder-dependent, so marshaling is
-// necessarily lazy.
-func Float64(key string, val float64) Field {
-	return Field{Key: key, Type: zapcore.Float64Type, Integer: int64(math.Float64bits(val))}
-}
-
-// Float64p constructs a field that carries a *float64. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Float64p(key string, val *float64) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return Float64(key, *val)
-}
-
-// Float32 constructs a field that carries a float32. The way the
-// floating-point value is represented is encoder-dependent, so marshaling is
-// necessarily lazy.
-func Float32(key string, val float32) Field {
-	return Field{Key: key, Type: zapcore.Float32Type, Integer: int64(math.Float32bits(val))}
-}
-
-// Float32p constructs a field that carries a *float32. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Float32p(key string, val *float32) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return Float32(key, *val)
-}
-
-// Int constructs a field with the given key and value.
-func Int(key string, val int) Field {
-	return Int64(key, int64(val))
-}
-
-// Intp constructs a field that carries a *int. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Intp(key string, val *int) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return Int(key, *val)
-}
-
-// Int64 constructs a field with the given key and value.
-func Int64(key string, val int64) Field {
-	return Field{Key: key, Type: zapcore.Int64Type, Integer: val}
-}
-
-// Int64p constructs a field that carries a *int64. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Int64p(key string, val *int64) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return Int64(key, *val)
-}
-
-// Int32 constructs a field with the given key and value.
-func Int32(key string, val int32) Field {
-	return Field{Key: key, Type: zapcore.Int32Type, Integer: int64(val)}
-}
-
-// Int32p constructs a field that carries a *int32. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Int32p(key string, val *int32) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return Int32(key, *val)
-}
-
-// Int16 constructs a field with the given key and value.
-func Int16(key string, val int16) Field {
-	return Field{Key: key, Type: zapcore.Int16Type, Integer: int64(val)}
-}
-
-// Int16p constructs a field that carries a *int16. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Int16p(key string, val *int16) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return Int16(key, *val)
-}
-
-// Int8 constructs a field with the given key and value.
-func Int8(key string, val int8) Field {
-	return Field{Key: key, Type: zapcore.Int8Type, Integer: int64(val)}
-}
-
-// Int8p constructs a field that carries a *int8. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Int8p(key string, val *int8) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return Int8(key, *val)
-}
-
-// String constructs a field with the given key and value.
-func String(key string, val string) Field {
-	return Field{Key: key, Type: zapcore.StringType, String: val}
-}
-
-// Stringp constructs a field that carries a *string. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Stringp(key string, val *string) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return String(key, *val)
-}
-
-// Uint constructs a field with the given key and value.
-func Uint(key string, val uint) Field {
-	return Uint64(key, uint64(val))
-}
-
-// Uintp constructs a field that carries a *uint. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Uintp(key string, val *uint) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return Uint(key, *val)
-}
-
-// Uint64 constructs a field with the given key and value.
-func Uint64(key string, val uint64) Field {
-	return Field{Key: key, Type: zapcore.Uint64Type, Integer: int64(val)}
-}
-
-// Uint64p constructs a field that carries a *uint64. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Uint64p(key string, val *uint64) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return Uint64(key, *val)
-}
-
-// Uint32 constructs a field with the given key and value.
-func Uint32(key string, val uint32) Field {
-	return Field{Key: key, Type: zapcore.Uint32Type, Integer: int64(val)}
-}
-
-// Uint32p constructs a field that carries a *uint32. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Uint32p(key string, val *uint32) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return Uint32(key, *val)
-}
-
-// Uint16 constructs a field with the given key and value.
-func Uint16(key string, val uint16) Field {
-	return Field{Key: key, Type: zapcore.Uint16Type, Integer: int64(val)}
-}
-
-// Uint16p constructs a field that carries a *uint16. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Uint16p(key string, val *uint16) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return Uint16(key, *val)
-}
-
-// Uint8 constructs a field with the given key and value.
-func Uint8(key string, val uint8) Field {
-	return Field{Key: key, Type: zapcore.Uint8Type, Integer: int64(val)}
-}
-
-// Uint8p constructs a field that carries a *uint8. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Uint8p(key string, val *uint8) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return Uint8(key, *val)
-}
-
-// Uintptr constructs a field with the given key and value.
-func Uintptr(key string, val uintptr) Field {
-	return Field{Key: key, Type: zapcore.UintptrType, Integer: int64(val)}
-}
-
-// Uintptrp constructs a field that carries a *uintptr. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Uintptrp(key string, val *uintptr) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return Uintptr(key, *val)
-}
-
-// Reflect constructs a field with the given key and an arbitrary object. It uses
-// an encoding-appropriate, reflection-based function to lazily serialize nearly
-// any object into the logging context, but it's relatively slow and
-// allocation-heavy. Outside tests, Any is always a better choice.
-//
-// If encoding fails (e.g., trying to serialize a map[int]string to JSON), Reflect
-// includes the error message in the final log output.
-func Reflect(key string, val interface{}) Field {
-	return Field{Key: key, Type: zapcore.ReflectType, Interface: val}
-}
-
-// Namespace creates a named, isolated scope within the logger's context. All
-// subsequent fields will be added to the new namespace.
-//
-// This helps prevent key collisions when injecting loggers into sub-components
-// or third-party libraries.
-func Namespace(key string) Field {
-	return Field{Key: key, Type: zapcore.NamespaceType}
-}
-
-// Stringer constructs a field with the given key and the output of the value's
-// String method. The Stringer's String method is called lazily.
-func Stringer(key string, val fmt.Stringer) Field {
-	return Field{Key: key, Type: zapcore.StringerType, Interface: val}
-}
-
-// Time constructs a Field with the given key and value. The encoder
-// controls how the time is serialized.
-func Time(key string, val time.Time) Field {
-	if val.Before(_minTimeInt64) || val.After(_maxTimeInt64) {
-		return Field{Key: key, Type: zapcore.TimeFullType, Interface: val}
-	}
-	return Field{Key: key, Type: zapcore.TimeType, Integer: val.UnixNano(), Interface: val.Location()}
-}
-
-// Timep constructs a field that carries a *time.Time. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Timep(key string, val *time.Time) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return Time(key, *val)
-}
-
-// Stack constructs a field that stores a stacktrace of the current goroutine
-// under provided key. Keep in mind that taking a stacktrace is eager and
-// expensive (relatively speaking); this function both makes an allocation and
-// takes about two microseconds.
-func Stack(key string) Field {
-	return StackSkip(key, 1) // skip Stack
-}
-
-// StackSkip constructs a field similarly to Stack, but also skips the given
-// number of frames from the top of the stacktrace.
-func StackSkip(key string, skip int) Field {
-	// Returning the stacktrace as a string costs an allocation, but saves us
-	// from expanding the zapcore.Field union struct to include a byte slice. Since
-	// taking a stacktrace is already so expensive (~10us), the extra allocation
-	// is okay.
-	return String(key, takeStacktrace(skip+1)) // skip StackSkip
-}
-
-// Duration constructs a field with the given key and value. The encoder
-// controls how the duration is serialized.
-func Duration(key string, val time.Duration) Field {
-	return Field{Key: key, Type: zapcore.DurationType, Integer: int64(val)}
-}
-
-// Durationp constructs a field that carries a *time.Duration. The returned Field will safely
-// and explicitly represent `nil` when appropriate.
-func Durationp(key string, val *time.Duration) Field {
-	if val == nil {
-		return nilField(key)
-	}
-	return Duration(key, *val)
-}
-
-// Object constructs a field with the given key and ObjectMarshaler. It
-// provides a flexible, but still type-safe and efficient, way to add map- or
-// struct-like user-defined types to the logging context. The struct's
-// MarshalLogObject method is called lazily.
-func Object(key string, val zapcore.ObjectMarshaler) Field {
-	return Field{Key: key, Type: zapcore.ObjectMarshalerType, Interface: val}
-}
-
-// Inline constructs a Field that is similar to Object, but it
-// will add the elements of the provided ObjectMarshaler to the
-// current namespace.
-func Inline(val zapcore.ObjectMarshaler) Field {
-	return zapcore.Field{
-		Type:      zapcore.InlineMarshalerType,
-		Interface: val,
-	}
-}
-
-// Any takes a key and an arbitrary value and chooses the best way to represent
-// them as a field, falling back to a reflection-based approach only if
-// necessary.
-//
-// Since byte/uint8 and rune/int32 are aliases, Any can't differentiate between
-// them. To minimize surprises, []byte values are treated as binary blobs, byte
-// values are treated as uint8, and runes are always treated as integers.
-func Any(key string, value interface{}) Field {
-	switch val := value.(type) {
-	case zapcore.ObjectMarshaler:
-		return Object(key, val)
-	case zapcore.ArrayMarshaler:
-		return Array(key, val)
-	case bool:
-		return Bool(key, val)
-	case *bool:
-		return Boolp(key, val)
-	case []bool:
-		return Bools(key, val)
-	case complex128:
-		return Complex128(key, val)
-	case *complex128:
-		return Complex128p(key, val)
-	case []complex128:
-		return Complex128s(key, val)
-	case complex64:
-		return Complex64(key, val)
-	case *complex64:
-		return Complex64p(key, val)
-	case []complex64:
-		return Complex64s(key, val)
-	case float64:
-		return Float64(key, val)
-	case *float64:
-		return Float64p(key, val)
-	case []float64:
-		return Float64s(key, val)
-	case float32:
-		return Float32(key, val)
-	case *float32:
-		return Float32p(key, val)
-	case []float32:
-		return Float32s(key, val)
-	case int:
-		return Int(key, val)
-	case *int:
-		return Intp(key, val)
-	case []int:
-		return Ints(key, val)
-	case int64:
-		return Int64(key, val)
-	case *int64:
-		return Int64p(key, val)
-	case []int64:
-		return Int64s(key, val)
-	case int32:
-		return Int32(key, val)
-	case *int32:
-		return Int32p(key, val)
-	case []int32:
-		return Int32s(key, val)
-	case int16:
-		return Int16(key, val)
-	case *int16:
-		return Int16p(key, val)
-	case []int16:
-		return Int16s(key, val)
-	case int8:
-		return Int8(key, val)
-	case *int8:
-		return Int8p(key, val)
-	case []int8:
-		return Int8s(key, val)
-	case string:
-		return String(key, val)
-	case *string:
-		return Stringp(key, val)
-	case []string:
-		return Strings(key, val)
-	case uint:
-		return Uint(key, val)
-	case *uint:
-		return Uintp(key, val)
-	case []uint:
-		return Uints(key, val)
-	case uint64:
-		return Uint64(key, val)
-	case *uint64:
-		return Uint64p(key, val)
-	case []uint64:
-		return Uint64s(key, val)
-	case uint32:
-		return Uint32(key, val)
-	case *uint32:
-		return Uint32p(key, val)
-	case []uint32:
-		return Uint32s(key, val)
-	case uint16:
-		return Uint16(key, val)
-	case *uint16:
-		return Uint16p(key, val)
-	case []uint16:
-		return Uint16s(key, val)
-	case uint8:
-		return Uint8(key, val)
-	case *uint8:
-		return Uint8p(key, val)
-	case []byte:
-		return Binary(key, val)
-	case uintptr:
-		return Uintptr(key, val)
-	case *uintptr:
-		return Uintptrp(key, val)
-	case []uintptr:
-		return Uintptrs(key, val)
-	case time.Time:
-		return Time(key, val)
-	case *time.Time:
-		return Timep(key, val)
-	case []time.Time:
-		return Times(key, val)
-	case time.Duration:
-		return Duration(key, val)
-	case *time.Duration:
-		return Durationp(key, val)
-	case []time.Duration:
-		return Durations(key, val)
-	case error:
-		return NamedError(key, val)
-	case []error:
-		return Errors(key, val)
-	case fmt.Stringer:
-		return Stringer(key, val)
-	default:
-		return Reflect(key, val)
-	}
-}
diff --git a/vendor/go.uber.org/zap/flag.go b/vendor/go.uber.org/zap/flag.go
deleted file mode 100644
index 13128750..00000000
--- a/vendor/go.uber.org/zap/flag.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zap
-
-import (
-	"flag"
-
-	"go.uber.org/zap/zapcore"
-)
-
-// LevelFlag uses the standard library's flag.Var to declare a global flag
-// with the specified name, default, and usage guidance. The returned value is
-// a pointer to the value of the flag.
-//
-// If you don't want to use the flag package's global state, you can use any
-// non-nil *Level as a flag.Value with your own *flag.FlagSet.
-func LevelFlag(name string, defaultLevel zapcore.Level, usage string) *zapcore.Level {
-	lvl := defaultLevel
-	flag.Var(&lvl, name, usage)
-	return &lvl
-}
diff --git a/vendor/go.uber.org/zap/glide.yaml b/vendor/go.uber.org/zap/glide.yaml
deleted file mode 100644
index 8e1d05e9..00000000
--- a/vendor/go.uber.org/zap/glide.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-package: go.uber.org/zap
-license: MIT
-import:
-- package: go.uber.org/atomic
-  version: ^1
-- package: go.uber.org/multierr
-  version: ^1
-testImport:
-- package: github.com/satori/go.uuid
-- package: github.com/sirupsen/logrus
-- package: github.com/apex/log
-  subpackages:
-  - handlers/json
-- package: github.com/go-kit/kit
-  subpackages:
-  - log
-- package: github.com/stretchr/testify
-  subpackages:
-  - assert
-  - require
-- package: gopkg.in/inconshreveable/log15.v2
-- package: github.com/mattn/goveralls
-- package: github.com/pborman/uuid
-- package: github.com/pkg/errors
-- package: github.com/rs/zerolog
-- package: golang.org/x/tools
-  subpackages:
-  - cover
-- package: golang.org/x/lint
-  subpackages:
-  - golint
-- package: github.com/axw/gocov
-  subpackages:
-  - gocov
diff --git a/vendor/go.uber.org/zap/global.go b/vendor/go.uber.org/zap/global.go
deleted file mode 100644
index 3cb46c9e..00000000
--- a/vendor/go.uber.org/zap/global.go
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zap
-
-import (
-	"bytes"
-	"fmt"
-	"log"
-	"os"
-	"sync"
-
-	"go.uber.org/zap/zapcore"
-)
-
-const (
-	_stdLogDefaultDepth      = 1
-	_loggerWriterDepth       = 2
-	_programmerErrorTemplate = "You've found a bug in zap! Please file a bug at " +
-		"https://github.com/uber-go/zap/issues/new and reference this error: %v"
-)
-
-var (
-	_globalMu sync.RWMutex
-	_globalL  = NewNop()
-	_globalS  = _globalL.Sugar()
-)
-
-// L returns the global Logger, which can be reconfigured with ReplaceGlobals.
-// It's safe for concurrent use.
-func L() *Logger {
-	_globalMu.RLock()
-	l := _globalL
-	_globalMu.RUnlock()
-	return l
-}
-
-// S returns the global SugaredLogger, which can be reconfigured with
-// ReplaceGlobals. It's safe for concurrent use.
-func S() *SugaredLogger {
-	_globalMu.RLock()
-	s := _globalS
-	_globalMu.RUnlock()
-	return s
-}
-
-// ReplaceGlobals replaces the global Logger and SugaredLogger, and returns a
-// function to restore the original values. It's safe for concurrent use.
-func ReplaceGlobals(logger *Logger) func() {
-	_globalMu.Lock()
-	prev := _globalL
-	_globalL = logger
-	_globalS = logger.Sugar()
-	_globalMu.Unlock()
-	return func() { ReplaceGlobals(prev) }
-}
-
-// NewStdLog returns a *log.Logger which writes to the supplied zap Logger at
-// InfoLevel. To redirect the standard library's package-global logging
-// functions, use RedirectStdLog instead.
-func NewStdLog(l *Logger) *log.Logger {
-	logger := l.WithOptions(AddCallerSkip(_stdLogDefaultDepth + _loggerWriterDepth))
-	f := logger.Info
-	return log.New(&loggerWriter{f}, "" /* prefix */, 0 /* flags */)
-}
-
-// NewStdLogAt returns *log.Logger which writes to supplied zap logger at
-// required level.
-func NewStdLogAt(l *Logger, level zapcore.Level) (*log.Logger, error) {
-	logger := l.WithOptions(AddCallerSkip(_stdLogDefaultDepth + _loggerWriterDepth))
-	logFunc, err := levelToFunc(logger, level)
-	if err != nil {
-		return nil, err
-	}
-	return log.New(&loggerWriter{logFunc}, "" /* prefix */, 0 /* flags */), nil
-}
-
-// RedirectStdLog redirects output from the standard library's package-global
-// logger to the supplied logger at InfoLevel. Since zap already handles caller
-// annotations, timestamps, etc., it automatically disables the standard
-// library's annotations and prefixing.
-//
-// It returns a function to restore the original prefix and flags and reset the
-// standard library's output to os.Stderr.
-func RedirectStdLog(l *Logger) func() {
-	f, err := redirectStdLogAt(l, InfoLevel)
-	if err != nil {
-		// Can't get here, since passing InfoLevel to redirectStdLogAt always
-		// works.
-		panic(fmt.Sprintf(_programmerErrorTemplate, err))
-	}
-	return f
-}
-
-// RedirectStdLogAt redirects output from the standard library's package-global
-// logger to the supplied logger at the specified level. Since zap already
-// handles caller annotations, timestamps, etc., it automatically disables the
-// standard library's annotations and prefixing.
-//
-// It returns a function to restore the original prefix and flags and reset the
-// standard library's output to os.Stderr.
-func RedirectStdLogAt(l *Logger, level zapcore.Level) (func(), error) {
-	return redirectStdLogAt(l, level)
-}
-
-func redirectStdLogAt(l *Logger, level zapcore.Level) (func(), error) {
-	flags := log.Flags()
-	prefix := log.Prefix()
-	log.SetFlags(0)
-	log.SetPrefix("")
-	logger := l.WithOptions(AddCallerSkip(_stdLogDefaultDepth + _loggerWriterDepth))
-	logFunc, err := levelToFunc(logger, level)
-	if err != nil {
-		return nil, err
-	}
-	log.SetOutput(&loggerWriter{logFunc})
-	return func() {
-		log.SetFlags(flags)
-		log.SetPrefix(prefix)
-		log.SetOutput(os.Stderr)
-	}, nil
-}
-
-func levelToFunc(logger *Logger, lvl zapcore.Level) (func(string, ...Field), error) {
-	switch lvl {
-	case DebugLevel:
-		return logger.Debug, nil
-	case InfoLevel:
-		return logger.Info, nil
-	case WarnLevel:
-		return logger.Warn, nil
-	case ErrorLevel:
-		return logger.Error, nil
-	case DPanicLevel:
-		return logger.DPanic, nil
-	case PanicLevel:
-		return logger.Panic, nil
-	case FatalLevel:
-		return logger.Fatal, nil
-	}
-	return nil, fmt.Errorf("unrecognized level: %q", lvl)
-}
-
-type loggerWriter struct {
-	logFunc func(msg string, fields ...Field)
-}
-
-func (l *loggerWriter) Write(p []byte) (int, error) {
-	p = bytes.TrimSpace(p)
-	l.logFunc(string(p))
-	return len(p), nil
-}
diff --git a/vendor/go.uber.org/zap/http_handler.go b/vendor/go.uber.org/zap/http_handler.go
deleted file mode 100644
index 1297c33b..00000000
--- a/vendor/go.uber.org/zap/http_handler.go
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zap
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-
-	"go.uber.org/zap/zapcore"
-)
-
-// ServeHTTP is a simple JSON endpoint that can report on or change the current
-// logging level.
-//
-// GET
-//
-// The GET request returns a JSON description of the current logging level like:
-//   {"level":"info"}
-//
-// PUT
-//
-// The PUT request changes the logging level. It is perfectly safe to change the
-// logging level while a program is running. Two content types are supported:
-//
-//    Content-Type: application/x-www-form-urlencoded
-//
-// With this content type, the level can be provided through the request body or
-// a query parameter. The log level is URL encoded like:
-//
-//    level=debug
-//
-// The request body takes precedence over the query parameter, if both are
-// specified.
-//
-// This content type is the default for a curl PUT request. Following are two
-// example curl requests that both set the logging level to debug.
-//
-//    curl -X PUT localhost:8080/log/level?level=debug
-//    curl -X PUT localhost:8080/log/level -d level=debug
-//
-// For any other content type, the payload is expected to be JSON encoded and
-// look like:
-//
-//   {"level":"info"}
-//
-// An example curl request could look like this:
-//
-//    curl -X PUT localhost:8080/log/level -H "Content-Type: application/json" -d '{"level":"debug"}'
-//
-func (lvl AtomicLevel) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	type errorResponse struct {
-		Error string `json:"error"`
-	}
-	type payload struct {
-		Level zapcore.Level `json:"level"`
-	}
-
-	enc := json.NewEncoder(w)
-
-	switch r.Method {
-	case http.MethodGet:
-		enc.Encode(payload{Level: lvl.Level()})
-	case http.MethodPut:
-		requestedLvl, err := decodePutRequest(r.Header.Get("Content-Type"), r)
-		if err != nil {
-			w.WriteHeader(http.StatusBadRequest)
-			enc.Encode(errorResponse{Error: err.Error()})
-			return
-		}
-		lvl.SetLevel(requestedLvl)
-		enc.Encode(payload{Level: lvl.Level()})
-	default:
-		w.WriteHeader(http.StatusMethodNotAllowed)
-		enc.Encode(errorResponse{
-			Error: "Only GET and PUT are supported.",
-		})
-	}
-}
-
-// Decodes incoming PUT requests and returns the requested logging level.
-func decodePutRequest(contentType string, r *http.Request) (zapcore.Level, error) {
-	if contentType == "application/x-www-form-urlencoded" {
-		return decodePutURL(r)
-	}
-	return decodePutJSON(r.Body)
-}
-
-func decodePutURL(r *http.Request) (zapcore.Level, error) {
-	lvl := r.FormValue("level")
-	if lvl == "" {
-		return 0, fmt.Errorf("must specify logging level")
-	}
-	var l zapcore.Level
-	if err := l.UnmarshalText([]byte(lvl)); err != nil {
-		return 0, err
-	}
-	return l, nil
-}
-
-func decodePutJSON(body io.Reader) (zapcore.Level, error) {
-	var pld struct {
-		Level *zapcore.Level `json:"level"`
-	}
-	if err := json.NewDecoder(body).Decode(&pld); err != nil {
-		return 0, fmt.Errorf("malformed request body: %v", err)
-	}
-	if pld.Level == nil {
-		return 0, fmt.Errorf("must specify logging level")
-	}
-	return *pld.Level, nil
-
-}
diff --git a/vendor/go.uber.org/zap/internal/bufferpool/bufferpool.go b/vendor/go.uber.org/zap/internal/bufferpool/bufferpool.go
deleted file mode 100644
index dad583aa..00000000
--- a/vendor/go.uber.org/zap/internal/bufferpool/bufferpool.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-// Package bufferpool houses zap's shared internal buffer pool. Third-party
-// packages can recreate the same functionality with buffers.NewPool.
-package bufferpool
-
-import "go.uber.org/zap/buffer"
-
-var (
-	_pool = buffer.NewPool()
-	// Get retrieves a buffer from the pool, creating one if necessary.
-	Get = _pool.Get
-)
diff --git a/vendor/go.uber.org/zap/internal/color/color.go b/vendor/go.uber.org/zap/internal/color/color.go
deleted file mode 100644
index c4d5d02a..00000000
--- a/vendor/go.uber.org/zap/internal/color/color.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-// Package color adds coloring functionality for TTY output.
-package color
-
-import "fmt"
-
-// Foreground colors.
-const (
-	Black Color = iota + 30
-	Red
-	Green
-	Yellow
-	Blue
-	Magenta
-	Cyan
-	White
-)
-
-// Color represents a text color.
-type Color uint8
-
-// Add adds the coloring to the given string.
-func (c Color) Add(s string) string {
-	return fmt.Sprintf("\x1b[%dm%s\x1b[0m", uint8(c), s)
-}
diff --git a/vendor/go.uber.org/zap/internal/exit/exit.go b/vendor/go.uber.org/zap/internal/exit/exit.go
deleted file mode 100644
index dfc5b05f..00000000
--- a/vendor/go.uber.org/zap/internal/exit/exit.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-// Package exit provides stubs so that unit tests can exercise code that calls
-// os.Exit(1).
-package exit
-
-import "os"
-
-var real = func() { os.Exit(1) }
-
-// Exit normally terminates the process by calling os.Exit(1). If the package
-// is stubbed, it instead records a call in the testing spy.
-func Exit() {
-	real()
-}
-
-// A StubbedExit is a testing fake for os.Exit.
-type StubbedExit struct {
-	Exited bool
-	prev   func()
-}
-
-// Stub substitutes a fake for the call to os.Exit(1).
-func Stub() *StubbedExit {
-	s := &StubbedExit{prev: real}
-	real = s.exit
-	return s
-}
-
-// WithStub runs the supplied function with Exit stubbed. It returns the stub
-// used, so that users can test whether the process would have crashed.
-func WithStub(f func()) *StubbedExit {
-	s := Stub()
-	defer s.Unstub()
-	f()
-	return s
-}
-
-// Unstub restores the previous exit function.
-func (se *StubbedExit) Unstub() {
-	real = se.prev
-}
-
-func (se *StubbedExit) exit() {
-	se.Exited = true
-}
diff --git a/vendor/go.uber.org/zap/level.go b/vendor/go.uber.org/zap/level.go
deleted file mode 100644
index 8f86c430..00000000
--- a/vendor/go.uber.org/zap/level.go
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zap
-
-import (
-	"go.uber.org/atomic"
-	"go.uber.org/zap/zapcore"
-)
-
-const (
-	// DebugLevel logs are typically voluminous, and are usually disabled in
-	// production.
-	DebugLevel = zapcore.DebugLevel
-	// InfoLevel is the default logging priority.
-	InfoLevel = zapcore.InfoLevel
-	// WarnLevel logs are more important than Info, but don't need individual
-	// human review.
-	WarnLevel = zapcore.WarnLevel
-	// ErrorLevel logs are high-priority. If an application is running smoothly,
-	// it shouldn't generate any error-level logs.
-	ErrorLevel = zapcore.ErrorLevel
-	// DPanicLevel logs are particularly important errors. In development the
-	// logger panics after writing the message.
-	DPanicLevel = zapcore.DPanicLevel
-	// PanicLevel logs a message, then panics.
-	PanicLevel = zapcore.PanicLevel
-	// FatalLevel logs a message, then calls os.Exit(1).
-	FatalLevel = zapcore.FatalLevel
-)
-
-// LevelEnablerFunc is a convenient way to implement zapcore.LevelEnabler with
-// an anonymous function.
-//
-// It's particularly useful when splitting log output between different
-// outputs (e.g., standard error and standard out). For sample code, see the
-// package-level AdvancedConfiguration example.
-type LevelEnablerFunc func(zapcore.Level) bool
-
-// Enabled calls the wrapped function.
-func (f LevelEnablerFunc) Enabled(lvl zapcore.Level) bool { return f(lvl) }
-
-// An AtomicLevel is an atomically changeable, dynamic logging level. It lets
-// you safely change the log level of a tree of loggers (the root logger and
-// any children created by adding context) at runtime.
-//
-// The AtomicLevel itself is an http.Handler that serves a JSON endpoint to
-// alter its level.
-//
-// AtomicLevels must be created with the NewAtomicLevel constructor to allocate
-// their internal atomic pointer.
-type AtomicLevel struct {
-	l *atomic.Int32
-}
-
-// NewAtomicLevel creates an AtomicLevel with InfoLevel and above logging
-// enabled.
-func NewAtomicLevel() AtomicLevel {
-	return AtomicLevel{
-		l: atomic.NewInt32(int32(InfoLevel)),
-	}
-}
-
-// NewAtomicLevelAt is a convenience function that creates an AtomicLevel
-// and then calls SetLevel with the given level.
-func NewAtomicLevelAt(l zapcore.Level) AtomicLevel {
-	a := NewAtomicLevel()
-	a.SetLevel(l)
-	return a
-}
-
-// ParseAtomicLevel parses an AtomicLevel based on a lowercase or all-caps ASCII
-// representation of the log level. If the provided ASCII representation is
-// invalid an error is returned.
-//
-// This is particularly useful when dealing with text input to configure log
-// levels.
-func ParseAtomicLevel(text string) (AtomicLevel, error) {
-	a := NewAtomicLevel()
-	l, err := zapcore.ParseLevel(text)
-	if err != nil {
-		return a, err
-	}
-
-	a.SetLevel(l)
-	return a, nil
-}
-
-// Enabled implements the zapcore.LevelEnabler interface, which allows the
-// AtomicLevel to be used in place of traditional static levels.
-func (lvl AtomicLevel) Enabled(l zapcore.Level) bool {
-	return lvl.Level().Enabled(l)
-}
-
-// Level returns the minimum enabled log level.
-func (lvl AtomicLevel) Level() zapcore.Level {
-	return zapcore.Level(int8(lvl.l.Load()))
-}
-
-// SetLevel alters the logging level.
-func (lvl AtomicLevel) SetLevel(l zapcore.Level) {
-	lvl.l.Store(int32(l))
-}
-
-// String returns the string representation of the underlying Level.
-func (lvl AtomicLevel) String() string {
-	return lvl.Level().String()
-}
-
-// UnmarshalText unmarshals the text to an AtomicLevel. It uses the same text
-// representations as the static zapcore.Levels ("debug", "info", "warn",
-// "error", "dpanic", "panic", and "fatal").
-func (lvl *AtomicLevel) UnmarshalText(text []byte) error {
-	if lvl.l == nil {
-		lvl.l = &atomic.Int32{}
-	}
-
-	var l zapcore.Level
-	if err := l.UnmarshalText(text); err != nil {
-		return err
-	}
-
-	lvl.SetLevel(l)
-	return nil
-}
-
-// MarshalText marshals the AtomicLevel to a byte slice. It uses the same
-// text representation as the static zapcore.Levels ("debug", "info", "warn",
-// "error", "dpanic", "panic", and "fatal").
-func (lvl AtomicLevel) MarshalText() (text []byte, err error) {
-	return lvl.Level().MarshalText()
-}
diff --git a/vendor/go.uber.org/zap/logger.go b/vendor/go.uber.org/zap/logger.go
deleted file mode 100644
index 087c7422..00000000
--- a/vendor/go.uber.org/zap/logger.go
+++ /dev/null
@@ -1,363 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zap
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"strings"
-
-	"go.uber.org/zap/internal/bufferpool"
-	"go.uber.org/zap/zapcore"
-)
-
-// A Logger provides fast, leveled, structured logging. All methods are safe
-// for concurrent use.
-//
-// The Logger is designed for contexts in which every microsecond and every
-// allocation matters, so its API intentionally favors performance and type
-// safety over brevity. For most applications, the SugaredLogger strikes a
-// better balance between performance and ergonomics.
-type Logger struct {
-	core zapcore.Core
-
-	development bool
-	addCaller   bool
-	onFatal     zapcore.CheckWriteAction // default is WriteThenFatal
-
-	name        string
-	errorOutput zapcore.WriteSyncer
-
-	addStack zapcore.LevelEnabler
-
-	callerSkip int
-
-	clock zapcore.Clock
-}
-
-// New constructs a new Logger from the provided zapcore.Core and Options. If
-// the passed zapcore.Core is nil, it falls back to using a no-op
-// implementation.
-//
-// This is the most flexible way to construct a Logger, but also the most
-// verbose. For typical use cases, the highly-opinionated presets
-// (NewProduction, NewDevelopment, and NewExample) or the Config struct are
-// more convenient.
-//
-// For sample code, see the package-level AdvancedConfiguration example.
-func New(core zapcore.Core, options ...Option) *Logger {
-	if core == nil {
-		return NewNop()
-	}
-	log := &Logger{
-		core:        core,
-		errorOutput: zapcore.Lock(os.Stderr),
-		addStack:    zapcore.FatalLevel + 1,
-		clock:       zapcore.DefaultClock,
-	}
-	return log.WithOptions(options...)
-}
-
-// NewNop returns a no-op Logger. It never writes out logs or internal errors,
-// and it never runs user-defined hooks.
-//
-// Using WithOptions to replace the Core or error output of a no-op Logger can
-// re-enable logging.
-func NewNop() *Logger {
-	return &Logger{
-		core:        zapcore.NewNopCore(),
-		errorOutput: zapcore.AddSync(ioutil.Discard),
-		addStack:    zapcore.FatalLevel + 1,
-		clock:       zapcore.DefaultClock,
-	}
-}
-
-// NewProduction builds a sensible production Logger that writes InfoLevel and
-// above logs to standard error as JSON.
-//
-// It's a shortcut for NewProductionConfig().Build(...Option).
-func NewProduction(options ...Option) (*Logger, error) {
-	return NewProductionConfig().Build(options...)
-}
-
-// NewDevelopment builds a development Logger that writes DebugLevel and above
-// logs to standard error in a human-friendly format.
-//
-// It's a shortcut for NewDevelopmentConfig().Build(...Option).
-func NewDevelopment(options ...Option) (*Logger, error) {
-	return NewDevelopmentConfig().Build(options...)
-}
-
-// NewExample builds a Logger that's designed for use in zap's testable
-// examples. It writes DebugLevel and above logs to standard out as JSON, but
-// omits the timestamp and calling function to keep example output
-// short and deterministic.
-func NewExample(options ...Option) *Logger {
-	encoderCfg := zapcore.EncoderConfig{
-		MessageKey:     "msg",
-		LevelKey:       "level",
-		NameKey:        "logger",
-		EncodeLevel:    zapcore.LowercaseLevelEncoder,
-		EncodeTime:     zapcore.ISO8601TimeEncoder,
-		EncodeDuration: zapcore.StringDurationEncoder,
-	}
-	core := zapcore.NewCore(zapcore.NewJSONEncoder(encoderCfg), os.Stdout, DebugLevel)
-	return New(core).WithOptions(options...)
-}
-
-// Sugar wraps the Logger to provide a more ergonomic, but slightly slower,
-// API. Sugaring a Logger is quite inexpensive, so it's reasonable for a
-// single application to use both Loggers and SugaredLoggers, converting
-// between them on the boundaries of performance-sensitive code.
-func (log *Logger) Sugar() *SugaredLogger {
-	core := log.clone()
-	core.callerSkip += 2
-	return &SugaredLogger{core}
-}
-
-// Named adds a new path segment to the logger's name. Segments are joined by
-// periods. By default, Loggers are unnamed.
-func (log *Logger) Named(s string) *Logger {
-	if s == "" {
-		return log
-	}
-	l := log.clone()
-	if log.name == "" {
-		l.name = s
-	} else {
-		l.name = strings.Join([]string{l.name, s}, ".")
-	}
-	return l
-}
-
-// WithOptions clones the current Logger, applies the supplied Options, and
-// returns the resulting Logger. It's safe to use concurrently.
-func (log *Logger) WithOptions(opts ...Option) *Logger {
-	c := log.clone()
-	for _, opt := range opts {
-		opt.apply(c)
-	}
-	return c
-}
-
-// With creates a child logger and adds structured context to it. Fields added
-// to the child don't affect the parent, and vice versa.
-func (log *Logger) With(fields ...Field) *Logger {
-	if len(fields) == 0 {
-		return log
-	}
-	l := log.clone()
-	l.core = l.core.With(fields)
-	return l
-}
-
-// Check returns a CheckedEntry if logging a message at the specified level
-// is enabled. It's a completely optional optimization; in high-performance
-// applications, Check can help avoid allocating a slice to hold fields.
-func (log *Logger) Check(lvl zapcore.Level, msg string) *zapcore.CheckedEntry {
-	return log.check(lvl, msg)
-}
-
-// Debug logs a message at DebugLevel. The message includes any fields passed
-// at the log site, as well as any fields accumulated on the logger.
-func (log *Logger) Debug(msg string, fields ...Field) {
-	if ce := log.check(DebugLevel, msg); ce != nil {
-		ce.Write(fields...)
-	}
-}
-
-// Info logs a message at InfoLevel. The message includes any fields passed
-// at the log site, as well as any fields accumulated on the logger.
-func (log *Logger) Info(msg string, fields ...Field) {
-	if ce := log.check(InfoLevel, msg); ce != nil {
-		ce.Write(fields...)
-	}
-}
-
-// Warn logs a message at WarnLevel. The message includes any fields passed
-// at the log site, as well as any fields accumulated on the logger.
-func (log *Logger) Warn(msg string, fields ...Field) {
-	if ce := log.check(WarnLevel, msg); ce != nil {
-		ce.Write(fields...)
-	}
-}
-
-// Error logs a message at ErrorLevel. The message includes any fields passed
-// at the log site, as well as any fields accumulated on the logger.
-func (log *Logger) Error(msg string, fields ...Field) {
-	if ce := log.check(ErrorLevel, msg); ce != nil {
-		ce.Write(fields...)
-	}
-}
-
-// DPanic logs a message at DPanicLevel. The message includes any fields
-// passed at the log site, as well as any fields accumulated on the logger.
-//
-// If the logger is in development mode, it then panics (DPanic means
-// "development panic"). This is useful for catching errors that are
-// recoverable, but shouldn't ever happen.
-func (log *Logger) DPanic(msg string, fields ...Field) {
-	if ce := log.check(DPanicLevel, msg); ce != nil {
-		ce.Write(fields...)
-	}
-}
-
-// Panic logs a message at PanicLevel. The message includes any fields passed
-// at the log site, as well as any fields accumulated on the logger.
-//
-// The logger then panics, even if logging at PanicLevel is disabled.
-func (log *Logger) Panic(msg string, fields ...Field) {
-	if ce := log.check(PanicLevel, msg); ce != nil {
-		ce.Write(fields...)
-	}
-}
-
-// Fatal logs a message at FatalLevel. The message includes any fields passed
-// at the log site, as well as any fields accumulated on the logger.
-//
-// The logger then calls os.Exit(1), even if logging at FatalLevel is
-// disabled.
-func (log *Logger) Fatal(msg string, fields ...Field) {
-	if ce := log.check(FatalLevel, msg); ce != nil {
-		ce.Write(fields...)
-	}
-}
-
-// Sync calls the underlying Core's Sync method, flushing any buffered log
-// entries. Applications should take care to call Sync before exiting.
-func (log *Logger) Sync() error {
-	return log.core.Sync()
-}
-
-// Core returns the Logger's underlying zapcore.Core.
-func (log *Logger) Core() zapcore.Core {
-	return log.core
-}
-
-func (log *Logger) clone() *Logger {
-	copy := *log
-	return &copy
-}
-
-func (log *Logger) check(lvl zapcore.Level, msg string) *zapcore.CheckedEntry {
-	// Logger.check must always be called directly by a method in the
-	// Logger interface (e.g., Check, Info, Fatal).
-	// This skips Logger.check and the Info/Fatal/Check/etc. method that
-	// called it.
-	const callerSkipOffset = 2
-
-	// Check the level first to reduce the cost of disabled log calls.
-	// Since Panic and higher may exit, we skip the optimization for those levels.
-	if lvl < zapcore.DPanicLevel && !log.core.Enabled(lvl) {
-		return nil
-	}
-
-	// Create basic checked entry thru the core; this will be non-nil if the
-	// log message will actually be written somewhere.
-	ent := zapcore.Entry{
-		LoggerName: log.name,
-		Time:       log.clock.Now(),
-		Level:      lvl,
-		Message:    msg,
-	}
-	ce := log.core.Check(ent, nil)
-	willWrite := ce != nil
-
-	// Set up any required terminal behavior.
-	switch ent.Level {
-	case zapcore.PanicLevel:
-		ce = ce.Should(ent, zapcore.WriteThenPanic)
-	case zapcore.FatalLevel:
-		onFatal := log.onFatal
-		// Noop is the default value for CheckWriteAction, and it leads to
-		// continued execution after a Fatal which is unexpected.
-		if onFatal == zapcore.WriteThenNoop {
-			onFatal = zapcore.WriteThenFatal
-		}
-		ce = ce.Should(ent, onFatal)
-	case zapcore.DPanicLevel:
-		if log.development {
-			ce = ce.Should(ent, zapcore.WriteThenPanic)
-		}
-	}
-
-	// Only do further annotation if we're going to write this message; checked
-	// entries that exist only for terminal behavior don't benefit from
-	// annotation.
-	if !willWrite {
-		return ce
-	}
-
-	// Thread the error output through to the CheckedEntry.
-	ce.ErrorOutput = log.errorOutput
-
-	addStack := log.addStack.Enabled(ce.Level)
-	if !log.addCaller && !addStack {
-		return ce
-	}
-
-	// Adding the caller or stack trace requires capturing the callers of
-	// this function. We'll share information between these two.
-	stackDepth := stacktraceFirst
-	if addStack {
-		stackDepth = stacktraceFull
-	}
-	stack := captureStacktrace(log.callerSkip+callerSkipOffset, stackDepth)
-	defer stack.Free()
-
-	if stack.Count() == 0 {
-		if log.addCaller {
-			fmt.Fprintf(log.errorOutput, "%v Logger.check error: failed to get caller\n", ent.Time.UTC())
-			log.errorOutput.Sync()
-		}
-		return ce
-	}
-
-	frame, more := stack.Next()
-
-	if log.addCaller {
-		ce.Caller = zapcore.EntryCaller{
-			Defined:  frame.PC != 0,
-			PC:       frame.PC,
-			File:     frame.File,
-			Line:     frame.Line,
-			Function: frame.Function,
-		}
-	}
-
-	if addStack {
-		buffer := bufferpool.Get()
-		defer buffer.Free()
-
-		stackfmt := newStackFormatter(buffer)
-
-		// We've already extracted the first frame, so format that
-		// separately and defer to stackfmt for the rest.
-		stackfmt.FormatFrame(frame)
-		if more {
-			stackfmt.FormatStack(stack)
-		}
-		ce.Stack = buffer.String()
-	}
-
-	return ce
-}
diff --git a/vendor/go.uber.org/zap/options.go b/vendor/go.uber.org/zap/options.go
deleted file mode 100644
index e9e66161..00000000
--- a/vendor/go.uber.org/zap/options.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zap
-
-import (
-	"fmt"
-
-	"go.uber.org/zap/zapcore"
-)
-
-// An Option configures a Logger.
-type Option interface {
-	apply(*Logger)
-}
-
-// optionFunc wraps a func so it satisfies the Option interface.
-type optionFunc func(*Logger)
-
-func (f optionFunc) apply(log *Logger) {
-	f(log)
-}
-
-// WrapCore wraps or replaces the Logger's underlying zapcore.Core.
-func WrapCore(f func(zapcore.Core) zapcore.Core) Option {
-	return optionFunc(func(log *Logger) {
-		log.core = f(log.core)
-	})
-}
-
-// Hooks registers functions which will be called each time the Logger writes
-// out an Entry. Repeated use of Hooks is additive.
-//
-// Hooks are useful for simple side effects, like capturing metrics for the
-// number of emitted logs. More complex side effects, including anything that
-// requires access to the Entry's structured fields, should be implemented as
-// a zapcore.Core instead. See zapcore.RegisterHooks for details.
-func Hooks(hooks ...func(zapcore.Entry) error) Option {
-	return optionFunc(func(log *Logger) {
-		log.core = zapcore.RegisterHooks(log.core, hooks...)
-	})
-}
-
-// Fields adds fields to the Logger.
-func Fields(fs ...Field) Option {
-	return optionFunc(func(log *Logger) {
-		log.core = log.core.With(fs)
-	})
-}
-
-// ErrorOutput sets the destination for errors generated by the Logger. Note
-// that this option only affects internal errors; for sample code that sends
-// error-level logs to a different location from info- and debug-level logs,
-// see the package-level AdvancedConfiguration example.
-//
-// The supplied WriteSyncer must be safe for concurrent use. The Open and
-// zapcore.Lock functions are the simplest ways to protect files with a mutex.
-func ErrorOutput(w zapcore.WriteSyncer) Option {
-	return optionFunc(func(log *Logger) {
-		log.errorOutput = w
-	})
-}
-
-// Development puts the logger in development mode, which makes DPanic-level
-// logs panic instead of simply logging an error.
-func Development() Option {
-	return optionFunc(func(log *Logger) {
-		log.development = true
-	})
-}
-
-// AddCaller configures the Logger to annotate each message with the filename,
-// line number, and function name of zap's caller. See also WithCaller.
-func AddCaller() Option {
-	return WithCaller(true)
-}
-
-// WithCaller configures the Logger to annotate each message with the filename,
-// line number, and function name of zap's caller, or not, depending on the
-// value of enabled. This is a generalized form of AddCaller.
-func WithCaller(enabled bool) Option {
-	return optionFunc(func(log *Logger) {
-		log.addCaller = enabled
-	})
-}
-
-// AddCallerSkip increases the number of callers skipped by caller annotation
-// (as enabled by the AddCaller option). When building wrappers around the
-// Logger and SugaredLogger, supplying this Option prevents zap from always
-// reporting the wrapper code as the caller.
-func AddCallerSkip(skip int) Option {
-	return optionFunc(func(log *Logger) {
-		log.callerSkip += skip
-	})
-}
-
-// AddStacktrace configures the Logger to record a stack trace for all messages at
-// or above a given level.
-func AddStacktrace(lvl zapcore.LevelEnabler) Option {
-	return optionFunc(func(log *Logger) {
-		log.addStack = lvl
-	})
-}
-
-// IncreaseLevel increase the level of the logger. It has no effect if
-// the passed in level tries to decrease the level of the logger.
-func IncreaseLevel(lvl zapcore.LevelEnabler) Option {
-	return optionFunc(func(log *Logger) {
-		core, err := zapcore.NewIncreaseLevelCore(log.core, lvl)
-		if err != nil {
-			fmt.Fprintf(log.errorOutput, "failed to IncreaseLevel: %v\n", err)
-		} else {
-			log.core = core
-		}
-	})
-}
-
-// OnFatal sets the action to take on fatal logs.
-func OnFatal(action zapcore.CheckWriteAction) Option {
-	return optionFunc(func(log *Logger) {
-		log.onFatal = action
-	})
-}
-
-// WithClock specifies the clock used by the logger to determine the current
-// time for logged entries. Defaults to the system clock with time.Now.
-func WithClock(clock zapcore.Clock) Option {
-	return optionFunc(func(log *Logger) {
-		log.clock = clock
-	})
-}
diff --git a/vendor/go.uber.org/zap/sink.go b/vendor/go.uber.org/zap/sink.go
deleted file mode 100644
index df46fa87..00000000
--- a/vendor/go.uber.org/zap/sink.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zap
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"net/url"
-	"os"
-	"strings"
-	"sync"
-
-	"go.uber.org/zap/zapcore"
-)
-
-const schemeFile = "file"
-
-var (
-	_sinkMutex     sync.RWMutex
-	_sinkFactories map[string]func(*url.URL) (Sink, error) // keyed by scheme
-)
-
-func init() {
-	resetSinkRegistry()
-}
-
-func resetSinkRegistry() {
-	_sinkMutex.Lock()
-	defer _sinkMutex.Unlock()
-
-	_sinkFactories = map[string]func(*url.URL) (Sink, error){
-		schemeFile: newFileSink,
-	}
-}
-
-// Sink defines the interface to write to and close logger destinations.
-type Sink interface {
-	zapcore.WriteSyncer
-	io.Closer
-}
-
-type nopCloserSink struct{ zapcore.WriteSyncer }
-
-func (nopCloserSink) Close() error { return nil }
-
-type errSinkNotFound struct {
-	scheme string
-}
-
-func (e *errSinkNotFound) Error() string {
-	return fmt.Sprintf("no sink found for scheme %q", e.scheme)
-}
-
-// RegisterSink registers a user-supplied factory for all sinks with a
-// particular scheme.
-//
-// All schemes must be ASCII, valid under section 3.1 of RFC 3986
-// (https://tools.ietf.org/html/rfc3986#section-3.1), and must not already
-// have a factory registered. Zap automatically registers a factory for the
-// "file" scheme.
-func RegisterSink(scheme string, factory func(*url.URL) (Sink, error)) error {
-	_sinkMutex.Lock()
-	defer _sinkMutex.Unlock()
-
-	if scheme == "" {
-		return errors.New("can't register a sink factory for empty string")
-	}
-	normalized, err := normalizeScheme(scheme)
-	if err != nil {
-		return fmt.Errorf("%q is not a valid scheme: %v", scheme, err)
-	}
-	if _, ok := _sinkFactories[normalized]; ok {
-		return fmt.Errorf("sink factory already registered for scheme %q", normalized)
-	}
-	_sinkFactories[normalized] = factory
-	return nil
-}
-
-func newSink(rawURL string) (Sink, error) {
-	u, err := url.Parse(rawURL)
-	if err != nil {
-		return nil, fmt.Errorf("can't parse %q as a URL: %v", rawURL, err)
-	}
-	if u.Scheme == "" {
-		u.Scheme = schemeFile
-	}
-
-	_sinkMutex.RLock()
-	factory, ok := _sinkFactories[u.Scheme]
-	_sinkMutex.RUnlock()
-	if !ok {
-		return nil, &errSinkNotFound{u.Scheme}
-	}
-	return factory(u)
-}
-
-func newFileSink(u *url.URL) (Sink, error) {
-	if u.User != nil {
-		return nil, fmt.Errorf("user and password not allowed with file URLs: got %v", u)
-	}
-	if u.Fragment != "" {
-		return nil, fmt.Errorf("fragments not allowed with file URLs: got %v", u)
-	}
-	if u.RawQuery != "" {
-		return nil, fmt.Errorf("query parameters not allowed with file URLs: got %v", u)
-	}
-	// Error messages are better if we check hostname and port separately.
-	if u.Port() != "" {
-		return nil, fmt.Errorf("ports not allowed with file URLs: got %v", u)
-	}
-	if hn := u.Hostname(); hn != "" && hn != "localhost" {
-		return nil, fmt.Errorf("file URLs must leave host empty or use localhost: got %v", u)
-	}
-	switch u.Path {
-	case "stdout":
-		return nopCloserSink{os.Stdout}, nil
-	case "stderr":
-		return nopCloserSink{os.Stderr}, nil
-	}
-	return os.OpenFile(u.Path, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0666)
-}
-
-func normalizeScheme(s string) (string, error) {
-	// https://tools.ietf.org/html/rfc3986#section-3.1
-	s = strings.ToLower(s)
-	if first := s[0]; 'a' > first || 'z' < first {
-		return "", errors.New("must start with a letter")
-	}
-	for i := 1; i < len(s); i++ { // iterate over bytes, not runes
-		c := s[i]
-		switch {
-		case 'a' <= c && c <= 'z':
-			continue
-		case '0' <= c && c <= '9':
-			continue
-		case c == '.' || c == '+' || c == '-':
-			continue
-		}
-		return "", fmt.Errorf("may not contain %q", c)
-	}
-	return s, nil
-}
diff --git a/vendor/go.uber.org/zap/stacktrace.go b/vendor/go.uber.org/zap/stacktrace.go
deleted file mode 100644
index 3d187fa5..00000000
--- a/vendor/go.uber.org/zap/stacktrace.go
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zap
-
-import (
-	"runtime"
-	"sync"
-
-	"go.uber.org/zap/buffer"
-	"go.uber.org/zap/internal/bufferpool"
-)
-
-var _stacktracePool = sync.Pool{
-	New: func() interface{} {
-		return &stacktrace{
-			storage: make([]uintptr, 64),
-		}
-	},
-}
-
-type stacktrace struct {
-	pcs    []uintptr // program counters; always a subslice of storage
-	frames *runtime.Frames
-
-	// The size of pcs varies depending on requirements:
-	// it will be one if the only the first frame was requested,
-	// and otherwise it will reflect the depth of the call stack.
-	//
-	// storage decouples the slice we need (pcs) from the slice we pool.
-	// We will always allocate a reasonably large storage, but we'll use
-	// only as much of it as we need.
-	storage []uintptr
-}
-
-// stacktraceDepth specifies how deep of a stack trace should be captured.
-type stacktraceDepth int
-
-const (
-	// stacktraceFirst captures only the first frame.
-	stacktraceFirst stacktraceDepth = iota
-
-	// stacktraceFull captures the entire call stack, allocating more
-	// storage for it if needed.
-	stacktraceFull
-)
-
-// captureStacktrace captures a stack trace of the specified depth, skipping
-// the provided number of frames. skip=0 identifies the caller of
-// captureStacktrace.
-//
-// The caller must call Free on the returned stacktrace after using it.
-func captureStacktrace(skip int, depth stacktraceDepth) *stacktrace {
-	stack := _stacktracePool.Get().(*stacktrace)
-
-	switch depth {
-	case stacktraceFirst:
-		stack.pcs = stack.storage[:1]
-	case stacktraceFull:
-		stack.pcs = stack.storage
-	}
-
-	// Unlike other "skip"-based APIs, skip=0 identifies runtime.Callers
-	// itself. +2 to skip captureStacktrace and runtime.Callers.
-	numFrames := runtime.Callers(
-		skip+2,
-		stack.pcs,
-	)
-
-	// runtime.Callers truncates the recorded stacktrace if there is no
-	// room in the provided slice. For the full stack trace, keep expanding
-	// storage until there are fewer frames than there is room.
-	if depth == stacktraceFull {
-		pcs := stack.pcs
-		for numFrames == len(pcs) {
-			pcs = make([]uintptr, len(pcs)*2)
-			numFrames = runtime.Callers(skip+2, pcs)
-		}
-
-		// Discard old storage instead of returning it to the pool.
-		// This will adjust the pool size over time if stack traces are
-		// consistently very deep.
-		stack.storage = pcs
-		stack.pcs = pcs[:numFrames]
-	} else {
-		stack.pcs = stack.pcs[:numFrames]
-	}
-
-	stack.frames = runtime.CallersFrames(stack.pcs)
-	return stack
-}
-
-// Free releases resources associated with this stacktrace
-// and returns it back to the pool.
-func (st *stacktrace) Free() {
-	st.frames = nil
-	st.pcs = nil
-	_stacktracePool.Put(st)
-}
-
-// Count reports the total number of frames in this stacktrace.
-// Count DOES NOT change as Next is called.
-func (st *stacktrace) Count() int {
-	return len(st.pcs)
-}
-
-// Next returns the next frame in the stack trace,
-// and a boolean indicating whether there are more after it.
-func (st *stacktrace) Next() (_ runtime.Frame, more bool) {
-	return st.frames.Next()
-}
-
-func takeStacktrace(skip int) string {
-	stack := captureStacktrace(skip+1, stacktraceFull)
-	defer stack.Free()
-
-	buffer := bufferpool.Get()
-	defer buffer.Free()
-
-	stackfmt := newStackFormatter(buffer)
-	stackfmt.FormatStack(stack)
-	return buffer.String()
-}
-
-// stackFormatter formats a stack trace into a readable string representation.
-type stackFormatter struct {
-	b        *buffer.Buffer
-	nonEmpty bool // whehther we've written at least one frame already
-}
-
-// newStackFormatter builds a new stackFormatter.
-func newStackFormatter(b *buffer.Buffer) stackFormatter {
-	return stackFormatter{b: b}
-}
-
-// FormatStack formats all remaining frames in the provided stacktrace -- minus
-// the final runtime.main/runtime.goexit frame.
-func (sf *stackFormatter) FormatStack(stack *stacktrace) {
-	// Note: On the last iteration, frames.Next() returns false, with a valid
-	// frame, but we ignore this frame. The last frame is a a runtime frame which
-	// adds noise, since it's only either runtime.main or runtime.goexit.
-	for frame, more := stack.Next(); more; frame, more = stack.Next() {
-		sf.FormatFrame(frame)
-	}
-}
-
-// FormatFrame formats the given frame.
-func (sf *stackFormatter) FormatFrame(frame runtime.Frame) {
-	if sf.nonEmpty {
-		sf.b.AppendByte('\n')
-	}
-	sf.nonEmpty = true
-	sf.b.AppendString(frame.Function)
-	sf.b.AppendByte('\n')
-	sf.b.AppendByte('\t')
-	sf.b.AppendString(frame.File)
-	sf.b.AppendByte(':')
-	sf.b.AppendInt(int64(frame.Line))
-}
diff --git a/vendor/go.uber.org/zap/sugar.go b/vendor/go.uber.org/zap/sugar.go
deleted file mode 100644
index 0b965198..00000000
--- a/vendor/go.uber.org/zap/sugar.go
+++ /dev/null
@@ -1,315 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zap
-
-import (
-	"fmt"
-
-	"go.uber.org/zap/zapcore"
-
-	"go.uber.org/multierr"
-)
-
-const (
-	_oddNumberErrMsg    = "Ignored key without a value."
-	_nonStringKeyErrMsg = "Ignored key-value pairs with non-string keys."
-)
-
-// A SugaredLogger wraps the base Logger functionality in a slower, but less
-// verbose, API. Any Logger can be converted to a SugaredLogger with its Sugar
-// method.
-//
-// Unlike the Logger, the SugaredLogger doesn't insist on structured logging.
-// For each log level, it exposes three methods: one for loosely-typed
-// structured logging, one for println-style formatting, and one for
-// printf-style formatting. For example, SugaredLoggers can produce InfoLevel
-// output with Infow ("info with" structured context), Info, or Infof.
-type SugaredLogger struct {
-	base *Logger
-}
-
-// Desugar unwraps a SugaredLogger, exposing the original Logger. Desugaring
-// is quite inexpensive, so it's reasonable for a single application to use
-// both Loggers and SugaredLoggers, converting between them on the boundaries
-// of performance-sensitive code.
-func (s *SugaredLogger) Desugar() *Logger {
-	base := s.base.clone()
-	base.callerSkip -= 2
-	return base
-}
-
-// Named adds a sub-scope to the logger's name. See Logger.Named for details.
-func (s *SugaredLogger) Named(name string) *SugaredLogger {
-	return &SugaredLogger{base: s.base.Named(name)}
-}
-
-// With adds a variadic number of fields to the logging context. It accepts a
-// mix of strongly-typed Field objects and loosely-typed key-value pairs. When
-// processing pairs, the first element of the pair is used as the field key
-// and the second as the field value.
-//
-// For example,
-//   sugaredLogger.With(
-//     "hello", "world",
-//     "failure", errors.New("oh no"),
-//     Stack(),
-//     "count", 42,
-//     "user", User{Name: "alice"},
-//  )
-// is the equivalent of
-//   unsugared.With(
-//     String("hello", "world"),
-//     String("failure", "oh no"),
-//     Stack(),
-//     Int("count", 42),
-//     Object("user", User{Name: "alice"}),
-//   )
-//
-// Note that the keys in key-value pairs should be strings. In development,
-// passing a non-string key panics. In production, the logger is more
-// forgiving: a separate error is logged, but the key-value pair is skipped
-// and execution continues. Passing an orphaned key triggers similar behavior:
-// panics in development and errors in production.
-func (s *SugaredLogger) With(args ...interface{}) *SugaredLogger {
-	return &SugaredLogger{base: s.base.With(s.sweetenFields(args)...)}
-}
-
-// Debug uses fmt.Sprint to construct and log a message.
-func (s *SugaredLogger) Debug(args ...interface{}) {
-	s.log(DebugLevel, "", args, nil)
-}
-
-// Info uses fmt.Sprint to construct and log a message.
-func (s *SugaredLogger) Info(args ...interface{}) {
-	s.log(InfoLevel, "", args, nil)
-}
-
-// Warn uses fmt.Sprint to construct and log a message.
-func (s *SugaredLogger) Warn(args ...interface{}) {
-	s.log(WarnLevel, "", args, nil)
-}
-
-// Error uses fmt.Sprint to construct and log a message.
-func (s *SugaredLogger) Error(args ...interface{}) {
-	s.log(ErrorLevel, "", args, nil)
-}
-
-// DPanic uses fmt.Sprint to construct and log a message. In development, the
-// logger then panics. (See DPanicLevel for details.)
-func (s *SugaredLogger) DPanic(args ...interface{}) {
-	s.log(DPanicLevel, "", args, nil)
-}
-
-// Panic uses fmt.Sprint to construct and log a message, then panics.
-func (s *SugaredLogger) Panic(args ...interface{}) {
-	s.log(PanicLevel, "", args, nil)
-}
-
-// Fatal uses fmt.Sprint to construct and log a message, then calls os.Exit.
-func (s *SugaredLogger) Fatal(args ...interface{}) {
-	s.log(FatalLevel, "", args, nil)
-}
-
-// Debugf uses fmt.Sprintf to log a templated message.
-func (s *SugaredLogger) Debugf(template string, args ...interface{}) {
-	s.log(DebugLevel, template, args, nil)
-}
-
-// Infof uses fmt.Sprintf to log a templated message.
-func (s *SugaredLogger) Infof(template string, args ...interface{}) {
-	s.log(InfoLevel, template, args, nil)
-}
-
-// Warnf uses fmt.Sprintf to log a templated message.
-func (s *SugaredLogger) Warnf(template string, args ...interface{}) {
-	s.log(WarnLevel, template, args, nil)
-}
-
-// Errorf uses fmt.Sprintf to log a templated message.
-func (s *SugaredLogger) Errorf(template string, args ...interface{}) {
-	s.log(ErrorLevel, template, args, nil)
-}
-
-// DPanicf uses fmt.Sprintf to log a templated message. In development, the
-// logger then panics. (See DPanicLevel for details.)
-func (s *SugaredLogger) DPanicf(template string, args ...interface{}) {
-	s.log(DPanicLevel, template, args, nil)
-}
-
-// Panicf uses fmt.Sprintf to log a templated message, then panics.
-func (s *SugaredLogger) Panicf(template string, args ...interface{}) {
-	s.log(PanicLevel, template, args, nil)
-}
-
-// Fatalf uses fmt.Sprintf to log a templated message, then calls os.Exit.
-func (s *SugaredLogger) Fatalf(template string, args ...interface{}) {
-	s.log(FatalLevel, template, args, nil)
-}
-
-// Debugw logs a message with some additional context. The variadic key-value
-// pairs are treated as they are in With.
-//
-// When debug-level logging is disabled, this is much faster than
-//  s.With(keysAndValues).Debug(msg)
-func (s *SugaredLogger) Debugw(msg string, keysAndValues ...interface{}) {
-	s.log(DebugLevel, msg, nil, keysAndValues)
-}
-
-// Infow logs a message with some additional context. The variadic key-value
-// pairs are treated as they are in With.
-func (s *SugaredLogger) Infow(msg string, keysAndValues ...interface{}) {
-	s.log(InfoLevel, msg, nil, keysAndValues)
-}
-
-// Warnw logs a message with some additional context. The variadic key-value
-// pairs are treated as they are in With.
-func (s *SugaredLogger) Warnw(msg string, keysAndValues ...interface{}) {
-	s.log(WarnLevel, msg, nil, keysAndValues)
-}
-
-// Errorw logs a message with some additional context. The variadic key-value
-// pairs are treated as they are in With.
-func (s *SugaredLogger) Errorw(msg string, keysAndValues ...interface{}) {
-	s.log(ErrorLevel, msg, nil, keysAndValues)
-}
-
-// DPanicw logs a message with some additional context. In development, the
-// logger then panics. (See DPanicLevel for details.) The variadic key-value
-// pairs are treated as they are in With.
-func (s *SugaredLogger) DPanicw(msg string, keysAndValues ...interface{}) {
-	s.log(DPanicLevel, msg, nil, keysAndValues)
-}
-
-// Panicw logs a message with some additional context, then panics. The
-// variadic key-value pairs are treated as they are in With.
-func (s *SugaredLogger) Panicw(msg string, keysAndValues ...interface{}) {
-	s.log(PanicLevel, msg, nil, keysAndValues)
-}
-
-// Fatalw logs a message with some additional context, then calls os.Exit. The
-// variadic key-value pairs are treated as they are in With.
-func (s *SugaredLogger) Fatalw(msg string, keysAndValues ...interface{}) {
-	s.log(FatalLevel, msg, nil, keysAndValues)
-}
-
-// Sync flushes any buffered log entries.
-func (s *SugaredLogger) Sync() error {
-	return s.base.Sync()
-}
-
-func (s *SugaredLogger) log(lvl zapcore.Level, template string, fmtArgs []interface{}, context []interface{}) {
-	// If logging at this level is completely disabled, skip the overhead of
-	// string formatting.
-	if lvl < DPanicLevel && !s.base.Core().Enabled(lvl) {
-		return
-	}
-
-	msg := getMessage(template, fmtArgs)
-	if ce := s.base.Check(lvl, msg); ce != nil {
-		ce.Write(s.sweetenFields(context)...)
-	}
-}
-
-// getMessage format with Sprint, Sprintf, or neither.
-func getMessage(template string, fmtArgs []interface{}) string {
-	if len(fmtArgs) == 0 {
-		return template
-	}
-
-	if template != "" {
-		return fmt.Sprintf(template, fmtArgs...)
-	}
-
-	if len(fmtArgs) == 1 {
-		if str, ok := fmtArgs[0].(string); ok {
-			return str
-		}
-	}
-	return fmt.Sprint(fmtArgs...)
-}
-
-func (s *SugaredLogger) sweetenFields(args []interface{}) []Field {
-	if len(args) == 0 {
-		return nil
-	}
-
-	// Allocate enough space for the worst case; if users pass only structured
-	// fields, we shouldn't penalize them with extra allocations.
-	fields := make([]Field, 0, len(args))
-	var invalid invalidPairs
-
-	for i := 0; i < len(args); {
-		// This is a strongly-typed field. Consume it and move on.
-		if f, ok := args[i].(Field); ok {
-			fields = append(fields, f)
-			i++
-			continue
-		}
-
-		// Make sure this element isn't a dangling key.
-		if i == len(args)-1 {
-			s.base.Error(_oddNumberErrMsg, Any("ignored", args[i]))
-			break
-		}
-
-		// Consume this value and the next, treating them as a key-value pair. If the
-		// key isn't a string, add this pair to the slice of invalid pairs.
-		key, val := args[i], args[i+1]
-		if keyStr, ok := key.(string); !ok {
-			// Subsequent errors are likely, so allocate once up front.
-			if cap(invalid) == 0 {
-				invalid = make(invalidPairs, 0, len(args)/2)
-			}
-			invalid = append(invalid, invalidPair{i, key, val})
-		} else {
-			fields = append(fields, Any(keyStr, val))
-		}
-		i += 2
-	}
-
-	// If we encountered any invalid key-value pairs, log an error.
-	if len(invalid) > 0 {
-		s.base.Error(_nonStringKeyErrMsg, Array("invalid", invalid))
-	}
-	return fields
-}
-
-type invalidPair struct {
-	position   int
-	key, value interface{}
-}
-
-func (p invalidPair) MarshalLogObject(enc zapcore.ObjectEncoder) error {
-	enc.AddInt64("position", int64(p.position))
-	Any("key", p.key).AddTo(enc)
-	Any("value", p.value).AddTo(enc)
-	return nil
-}
-
-type invalidPairs []invalidPair
-
-func (ps invalidPairs) MarshalLogArray(enc zapcore.ArrayEncoder) error {
-	var err error
-	for i := range ps {
-		err = multierr.Append(err, enc.AppendObject(ps[i]))
-	}
-	return err
-}
diff --git a/vendor/go.uber.org/zap/time.go b/vendor/go.uber.org/zap/time.go
deleted file mode 100644
index c5a1f162..00000000
--- a/vendor/go.uber.org/zap/time.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zap
-
-import "time"
-
-func timeToMillis(t time.Time) int64 {
-	return t.UnixNano() / int64(time.Millisecond)
-}
diff --git a/vendor/go.uber.org/zap/writer.go b/vendor/go.uber.org/zap/writer.go
deleted file mode 100644
index 86a709ab..00000000
--- a/vendor/go.uber.org/zap/writer.go
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zap
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-
-	"go.uber.org/zap/zapcore"
-
-	"go.uber.org/multierr"
-)
-
-// Open is a high-level wrapper that takes a variadic number of URLs, opens or
-// creates each of the specified resources, and combines them into a locked
-// WriteSyncer. It also returns any error encountered and a function to close
-// any opened files.
-//
-// Passing no URLs returns a no-op WriteSyncer. Zap handles URLs without a
-// scheme and URLs with the "file" scheme. Third-party code may register
-// factories for other schemes using RegisterSink.
-//
-// URLs with the "file" scheme must use absolute paths on the local
-// filesystem. No user, password, port, fragments, or query parameters are
-// allowed, and the hostname must be empty or "localhost".
-//
-// Since it's common to write logs to the local filesystem, URLs without a
-// scheme (e.g., "/var/log/foo.log") are treated as local file paths. Without
-// a scheme, the special paths "stdout" and "stderr" are interpreted as
-// os.Stdout and os.Stderr. When specified without a scheme, relative file
-// paths also work.
-func Open(paths ...string) (zapcore.WriteSyncer, func(), error) {
-	writers, close, err := open(paths)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	writer := CombineWriteSyncers(writers...)
-	return writer, close, nil
-}
-
-func open(paths []string) ([]zapcore.WriteSyncer, func(), error) {
-	writers := make([]zapcore.WriteSyncer, 0, len(paths))
-	closers := make([]io.Closer, 0, len(paths))
-	close := func() {
-		for _, c := range closers {
-			c.Close()
-		}
-	}
-
-	var openErr error
-	for _, path := range paths {
-		sink, err := newSink(path)
-		if err != nil {
-			openErr = multierr.Append(openErr, fmt.Errorf("couldn't open sink %q: %v", path, err))
-			continue
-		}
-		writers = append(writers, sink)
-		closers = append(closers, sink)
-	}
-	if openErr != nil {
-		close()
-		return writers, nil, openErr
-	}
-
-	return writers, close, nil
-}
-
-// CombineWriteSyncers is a utility that combines multiple WriteSyncers into a
-// single, locked WriteSyncer. If no inputs are supplied, it returns a no-op
-// WriteSyncer.
-//
-// It's provided purely as a convenience; the result is no different from
-// using zapcore.NewMultiWriteSyncer and zapcore.Lock individually.
-func CombineWriteSyncers(writers ...zapcore.WriteSyncer) zapcore.WriteSyncer {
-	if len(writers) == 0 {
-		return zapcore.AddSync(ioutil.Discard)
-	}
-	return zapcore.Lock(zapcore.NewMultiWriteSyncer(writers...))
-}
diff --git a/vendor/go.uber.org/zap/zapcore/buffered_write_syncer.go b/vendor/go.uber.org/zap/zapcore/buffered_write_syncer.go
deleted file mode 100644
index ef2f7d96..00000000
--- a/vendor/go.uber.org/zap/zapcore/buffered_write_syncer.go
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright (c) 2021 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-import (
-	"bufio"
-	"sync"
-	"time"
-
-	"go.uber.org/multierr"
-)
-
-const (
-	// _defaultBufferSize specifies the default size used by Buffer.
-	_defaultBufferSize = 256 * 1024 // 256 kB
-
-	// _defaultFlushInterval specifies the default flush interval for
-	// Buffer.
-	_defaultFlushInterval = 30 * time.Second
-)
-
-// A BufferedWriteSyncer is a WriteSyncer that buffers writes in-memory before
-// flushing them to a wrapped WriteSyncer after reaching some limit, or at some
-// fixed interval--whichever comes first.
-//
-// BufferedWriteSyncer is safe for concurrent use. You don't need to use
-// zapcore.Lock for WriteSyncers with BufferedWriteSyncer.
-type BufferedWriteSyncer struct {
-	// WS is the WriteSyncer around which BufferedWriteSyncer will buffer
-	// writes.
-	//
-	// This field is required.
-	WS WriteSyncer
-
-	// Size specifies the maximum amount of data the writer will buffered
-	// before flushing.
-	//
-	// Defaults to 256 kB if unspecified.
-	Size int
-
-	// FlushInterval specifies how often the writer should flush data if
-	// there have been no writes.
-	//
-	// Defaults to 30 seconds if unspecified.
-	FlushInterval time.Duration
-
-	// Clock, if specified, provides control of the source of time for the
-	// writer.
-	//
-	// Defaults to the system clock.
-	Clock Clock
-
-	// unexported fields for state
-	mu          sync.Mutex
-	initialized bool // whether initialize() has run
-	stopped     bool // whether Stop() has run
-	writer      *bufio.Writer
-	ticker      *time.Ticker
-	stop        chan struct{} // closed when flushLoop should stop
-	done        chan struct{} // closed when flushLoop has stopped
-}
-
-func (s *BufferedWriteSyncer) initialize() {
-	size := s.Size
-	if size == 0 {
-		size = _defaultBufferSize
-	}
-
-	flushInterval := s.FlushInterval
-	if flushInterval == 0 {
-		flushInterval = _defaultFlushInterval
-	}
-
-	if s.Clock == nil {
-		s.Clock = DefaultClock
-	}
-
-	s.ticker = s.Clock.NewTicker(flushInterval)
-	s.writer = bufio.NewWriterSize(s.WS, size)
-	s.stop = make(chan struct{})
-	s.done = make(chan struct{})
-	s.initialized = true
-	go s.flushLoop()
-}
-
-// Write writes log data into buffer syncer directly, multiple Write calls will be batched,
-// and log data will be flushed to disk when the buffer is full or periodically.
-func (s *BufferedWriteSyncer) Write(bs []byte) (int, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	if !s.initialized {
-		s.initialize()
-	}
-
-	// To avoid partial writes from being flushed, we manually flush the existing buffer if:
-	// * The current write doesn't fit into the buffer fully, and
-	// * The buffer is not empty (since bufio will not split large writes when the buffer is empty)
-	if len(bs) > s.writer.Available() && s.writer.Buffered() > 0 {
-		if err := s.writer.Flush(); err != nil {
-			return 0, err
-		}
-	}
-
-	return s.writer.Write(bs)
-}
-
-// Sync flushes buffered log data into disk directly.
-func (s *BufferedWriteSyncer) Sync() error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	var err error
-	if s.initialized {
-		err = s.writer.Flush()
-	}
-
-	return multierr.Append(err, s.WS.Sync())
-}
-
-// flushLoop flushes the buffer at the configured interval until Stop is
-// called.
-func (s *BufferedWriteSyncer) flushLoop() {
-	defer close(s.done)
-
-	for {
-		select {
-		case <-s.ticker.C:
-			// we just simply ignore error here
-			// because the underlying bufio writer stores any errors
-			// and we return any error from Sync() as part of the close
-			_ = s.Sync()
-		case <-s.stop:
-			return
-		}
-	}
-}
-
-// Stop closes the buffer, cleans up background goroutines, and flushes
-// remaining unwritten data.
-func (s *BufferedWriteSyncer) Stop() (err error) {
-	var stopped bool
-
-	// Critical section.
-	func() {
-		s.mu.Lock()
-		defer s.mu.Unlock()
-
-		if !s.initialized {
-			return
-		}
-
-		stopped = s.stopped
-		if stopped {
-			return
-		}
-		s.stopped = true
-
-		s.ticker.Stop()
-		close(s.stop) // tell flushLoop to stop
-		<-s.done      // and wait until it has
-	}()
-
-	// Don't call Sync on consecutive Stops.
-	if !stopped {
-		err = s.Sync()
-	}
-
-	return err
-}
diff --git a/vendor/go.uber.org/zap/zapcore/clock.go b/vendor/go.uber.org/zap/zapcore/clock.go
deleted file mode 100644
index 422fd82a..00000000
--- a/vendor/go.uber.org/zap/zapcore/clock.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) 2021 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-import "time"
-
-// DefaultClock is the default clock used by Zap in operations that require
-// time. This clock uses the system clock for all operations.
-var DefaultClock = systemClock{}
-
-// Clock is a source of time for logged entries.
-type Clock interface {
-	// Now returns the current local time.
-	Now() time.Time
-
-	// NewTicker returns *time.Ticker that holds a channel
-	// that delivers "ticks" of a clock.
-	NewTicker(time.Duration) *time.Ticker
-}
-
-// systemClock implements default Clock that uses system time.
-type systemClock struct{}
-
-func (systemClock) Now() time.Time {
-	return time.Now()
-}
-
-func (systemClock) NewTicker(duration time.Duration) *time.Ticker {
-	return time.NewTicker(duration)
-}
diff --git a/vendor/go.uber.org/zap/zapcore/console_encoder.go b/vendor/go.uber.org/zap/zapcore/console_encoder.go
deleted file mode 100644
index 1aa5dc36..00000000
--- a/vendor/go.uber.org/zap/zapcore/console_encoder.go
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-import (
-	"fmt"
-	"sync"
-
-	"go.uber.org/zap/buffer"
-	"go.uber.org/zap/internal/bufferpool"
-)
-
-var _sliceEncoderPool = sync.Pool{
-	New: func() interface{} {
-		return &sliceArrayEncoder{elems: make([]interface{}, 0, 2)}
-	},
-}
-
-func getSliceEncoder() *sliceArrayEncoder {
-	return _sliceEncoderPool.Get().(*sliceArrayEncoder)
-}
-
-func putSliceEncoder(e *sliceArrayEncoder) {
-	e.elems = e.elems[:0]
-	_sliceEncoderPool.Put(e)
-}
-
-type consoleEncoder struct {
-	*jsonEncoder
-}
-
-// NewConsoleEncoder creates an encoder whose output is designed for human -
-// rather than machine - consumption. It serializes the core log entry data
-// (message, level, timestamp, etc.) in a plain-text format and leaves the
-// structured context as JSON.
-//
-// Note that although the console encoder doesn't use the keys specified in the
-// encoder configuration, it will omit any element whose key is set to the empty
-// string.
-func NewConsoleEncoder(cfg EncoderConfig) Encoder {
-	if cfg.ConsoleSeparator == "" {
-		// Use a default delimiter of '\t' for backwards compatibility
-		cfg.ConsoleSeparator = "\t"
-	}
-	return consoleEncoder{newJSONEncoder(cfg, true)}
-}
-
-func (c consoleEncoder) Clone() Encoder {
-	return consoleEncoder{c.jsonEncoder.Clone().(*jsonEncoder)}
-}
-
-func (c consoleEncoder) EncodeEntry(ent Entry, fields []Field) (*buffer.Buffer, error) {
-	line := bufferpool.Get()
-
-	// We don't want the entry's metadata to be quoted and escaped (if it's
-	// encoded as strings), which means that we can't use the JSON encoder. The
-	// simplest option is to use the memory encoder and fmt.Fprint.
-	//
-	// If this ever becomes a performance bottleneck, we can implement
-	// ArrayEncoder for our plain-text format.
-	arr := getSliceEncoder()
-	if c.TimeKey != "" && c.EncodeTime != nil {
-		c.EncodeTime(ent.Time, arr)
-	}
-	if c.LevelKey != "" && c.EncodeLevel != nil {
-		c.EncodeLevel(ent.Level, arr)
-	}
-	if ent.LoggerName != "" && c.NameKey != "" {
-		nameEncoder := c.EncodeName
-
-		if nameEncoder == nil {
-			// Fall back to FullNameEncoder for backward compatibility.
-			nameEncoder = FullNameEncoder
-		}
-
-		nameEncoder(ent.LoggerName, arr)
-	}
-	if ent.Caller.Defined {
-		if c.CallerKey != "" && c.EncodeCaller != nil {
-			c.EncodeCaller(ent.Caller, arr)
-		}
-		if c.FunctionKey != "" {
-			arr.AppendString(ent.Caller.Function)
-		}
-	}
-	for i := range arr.elems {
-		if i > 0 {
-			line.AppendString(c.ConsoleSeparator)
-		}
-		fmt.Fprint(line, arr.elems[i])
-	}
-	putSliceEncoder(arr)
-
-	// Add the message itself.
-	if c.MessageKey != "" {
-		c.addSeparatorIfNecessary(line)
-		line.AppendString(ent.Message)
-	}
-
-	// Add any structured context.
-	c.writeContext(line, fields)
-
-	// If there's no stacktrace key, honor that; this allows users to force
-	// single-line output.
-	if ent.Stack != "" && c.StacktraceKey != "" {
-		line.AppendByte('\n')
-		line.AppendString(ent.Stack)
-	}
-
-	line.AppendString(c.LineEnding)
-	return line, nil
-}
-
-func (c consoleEncoder) writeContext(line *buffer.Buffer, extra []Field) {
-	context := c.jsonEncoder.Clone().(*jsonEncoder)
-	defer func() {
-		// putJSONEncoder assumes the buffer is still used, but we write out the buffer so
-		// we can free it.
-		context.buf.Free()
-		putJSONEncoder(context)
-	}()
-
-	addFields(context, extra)
-	context.closeOpenNamespaces()
-	if context.buf.Len() == 0 {
-		return
-	}
-
-	c.addSeparatorIfNecessary(line)
-	line.AppendByte('{')
-	line.Write(context.buf.Bytes())
-	line.AppendByte('}')
-}
-
-func (c consoleEncoder) addSeparatorIfNecessary(line *buffer.Buffer) {
-	if line.Len() > 0 {
-		line.AppendString(c.ConsoleSeparator)
-	}
-}
diff --git a/vendor/go.uber.org/zap/zapcore/core.go b/vendor/go.uber.org/zap/zapcore/core.go
deleted file mode 100644
index a1ef8b03..00000000
--- a/vendor/go.uber.org/zap/zapcore/core.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-// Core is a minimal, fast logger interface. It's designed for library authors
-// to wrap in a more user-friendly API.
-type Core interface {
-	LevelEnabler
-
-	// With adds structured context to the Core.
-	With([]Field) Core
-	// Check determines whether the supplied Entry should be logged (using the
-	// embedded LevelEnabler and possibly some extra logic). If the entry
-	// should be logged, the Core adds itself to the CheckedEntry and returns
-	// the result.
-	//
-	// Callers must use Check before calling Write.
-	Check(Entry, *CheckedEntry) *CheckedEntry
-	// Write serializes the Entry and any Fields supplied at the log site and
-	// writes them to their destination.
-	//
-	// If called, Write should always log the Entry and Fields; it should not
-	// replicate the logic of Check.
-	Write(Entry, []Field) error
-	// Sync flushes buffered logs (if any).
-	Sync() error
-}
-
-type nopCore struct{}
-
-// NewNopCore returns a no-op Core.
-func NewNopCore() Core                                        { return nopCore{} }
-func (nopCore) Enabled(Level) bool                            { return false }
-func (n nopCore) With([]Field) Core                           { return n }
-func (nopCore) Check(_ Entry, ce *CheckedEntry) *CheckedEntry { return ce }
-func (nopCore) Write(Entry, []Field) error                    { return nil }
-func (nopCore) Sync() error                                   { return nil }
-
-// NewCore creates a Core that writes logs to a WriteSyncer.
-func NewCore(enc Encoder, ws WriteSyncer, enab LevelEnabler) Core {
-	return &ioCore{
-		LevelEnabler: enab,
-		enc:          enc,
-		out:          ws,
-	}
-}
-
-type ioCore struct {
-	LevelEnabler
-	enc Encoder
-	out WriteSyncer
-}
-
-func (c *ioCore) With(fields []Field) Core {
-	clone := c.clone()
-	addFields(clone.enc, fields)
-	return clone
-}
-
-func (c *ioCore) Check(ent Entry, ce *CheckedEntry) *CheckedEntry {
-	if c.Enabled(ent.Level) {
-		return ce.AddCore(ent, c)
-	}
-	return ce
-}
-
-func (c *ioCore) Write(ent Entry, fields []Field) error {
-	buf, err := c.enc.EncodeEntry(ent, fields)
-	if err != nil {
-		return err
-	}
-	_, err = c.out.Write(buf.Bytes())
-	buf.Free()
-	if err != nil {
-		return err
-	}
-	if ent.Level > ErrorLevel {
-		// Since we may be crashing the program, sync the output. Ignore Sync
-		// errors, pending a clean solution to issue #370.
-		c.Sync()
-	}
-	return nil
-}
-
-func (c *ioCore) Sync() error {
-	return c.out.Sync()
-}
-
-func (c *ioCore) clone() *ioCore {
-	return &ioCore{
-		LevelEnabler: c.LevelEnabler,
-		enc:          c.enc.Clone(),
-		out:          c.out,
-	}
-}
diff --git a/vendor/go.uber.org/zap/zapcore/doc.go b/vendor/go.uber.org/zap/zapcore/doc.go
deleted file mode 100644
index 31000e91..00000000
--- a/vendor/go.uber.org/zap/zapcore/doc.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-// Package zapcore defines and implements the low-level interfaces upon which
-// zap is built. By providing alternate implementations of these interfaces,
-// external packages can extend zap's capabilities.
-package zapcore // import "go.uber.org/zap/zapcore"
diff --git a/vendor/go.uber.org/zap/zapcore/encoder.go b/vendor/go.uber.org/zap/zapcore/encoder.go
deleted file mode 100644
index 6e5fd565..00000000
--- a/vendor/go.uber.org/zap/zapcore/encoder.go
+++ /dev/null
@@ -1,448 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-import (
-	"encoding/json"
-	"io"
-	"time"
-
-	"go.uber.org/zap/buffer"
-)
-
-// DefaultLineEnding defines the default line ending when writing logs.
-// Alternate line endings specified in EncoderConfig can override this
-// behavior.
-const DefaultLineEnding = "\n"
-
-// OmitKey defines the key to use when callers want to remove a key from log output.
-const OmitKey = ""
-
-// A LevelEncoder serializes a Level to a primitive type.
-type LevelEncoder func(Level, PrimitiveArrayEncoder)
-
-// LowercaseLevelEncoder serializes a Level to a lowercase string. For example,
-// InfoLevel is serialized to "info".
-func LowercaseLevelEncoder(l Level, enc PrimitiveArrayEncoder) {
-	enc.AppendString(l.String())
-}
-
-// LowercaseColorLevelEncoder serializes a Level to a lowercase string and adds coloring.
-// For example, InfoLevel is serialized to "info" and colored blue.
-func LowercaseColorLevelEncoder(l Level, enc PrimitiveArrayEncoder) {
-	s, ok := _levelToLowercaseColorString[l]
-	if !ok {
-		s = _unknownLevelColor.Add(l.String())
-	}
-	enc.AppendString(s)
-}
-
-// CapitalLevelEncoder serializes a Level to an all-caps string. For example,
-// InfoLevel is serialized to "INFO".
-func CapitalLevelEncoder(l Level, enc PrimitiveArrayEncoder) {
-	enc.AppendString(l.CapitalString())
-}
-
-// CapitalColorLevelEncoder serializes a Level to an all-caps string and adds color.
-// For example, InfoLevel is serialized to "INFO" and colored blue.
-func CapitalColorLevelEncoder(l Level, enc PrimitiveArrayEncoder) {
-	s, ok := _levelToCapitalColorString[l]
-	if !ok {
-		s = _unknownLevelColor.Add(l.CapitalString())
-	}
-	enc.AppendString(s)
-}
-
-// UnmarshalText unmarshals text to a LevelEncoder. "capital" is unmarshaled to
-// CapitalLevelEncoder, "coloredCapital" is unmarshaled to CapitalColorLevelEncoder,
-// "colored" is unmarshaled to LowercaseColorLevelEncoder, and anything else
-// is unmarshaled to LowercaseLevelEncoder.
-func (e *LevelEncoder) UnmarshalText(text []byte) error {
-	switch string(text) {
-	case "capital":
-		*e = CapitalLevelEncoder
-	case "capitalColor":
-		*e = CapitalColorLevelEncoder
-	case "color":
-		*e = LowercaseColorLevelEncoder
-	default:
-		*e = LowercaseLevelEncoder
-	}
-	return nil
-}
-
-// A TimeEncoder serializes a time.Time to a primitive type.
-type TimeEncoder func(time.Time, PrimitiveArrayEncoder)
-
-// EpochTimeEncoder serializes a time.Time to a floating-point number of seconds
-// since the Unix epoch.
-func EpochTimeEncoder(t time.Time, enc PrimitiveArrayEncoder) {
-	nanos := t.UnixNano()
-	sec := float64(nanos) / float64(time.Second)
-	enc.AppendFloat64(sec)
-}
-
-// EpochMillisTimeEncoder serializes a time.Time to a floating-point number of
-// milliseconds since the Unix epoch.
-func EpochMillisTimeEncoder(t time.Time, enc PrimitiveArrayEncoder) {
-	nanos := t.UnixNano()
-	millis := float64(nanos) / float64(time.Millisecond)
-	enc.AppendFloat64(millis)
-}
-
-// EpochNanosTimeEncoder serializes a time.Time to an integer number of
-// nanoseconds since the Unix epoch.
-func EpochNanosTimeEncoder(t time.Time, enc PrimitiveArrayEncoder) {
-	enc.AppendInt64(t.UnixNano())
-}
-
-func encodeTimeLayout(t time.Time, layout string, enc PrimitiveArrayEncoder) {
-	type appendTimeEncoder interface {
-		AppendTimeLayout(time.Time, string)
-	}
-
-	if enc, ok := enc.(appendTimeEncoder); ok {
-		enc.AppendTimeLayout(t, layout)
-		return
-	}
-
-	enc.AppendString(t.Format(layout))
-}
-
-// ISO8601TimeEncoder serializes a time.Time to an ISO8601-formatted string
-// with millisecond precision.
-//
-// If enc supports AppendTimeLayout(t time.Time,layout string), it's used
-// instead of appending a pre-formatted string value.
-func ISO8601TimeEncoder(t time.Time, enc PrimitiveArrayEncoder) {
-	encodeTimeLayout(t, "2006-01-02T15:04:05.000Z0700", enc)
-}
-
-// RFC3339TimeEncoder serializes a time.Time to an RFC3339-formatted string.
-//
-// If enc supports AppendTimeLayout(t time.Time,layout string), it's used
-// instead of appending a pre-formatted string value.
-func RFC3339TimeEncoder(t time.Time, enc PrimitiveArrayEncoder) {
-	encodeTimeLayout(t, time.RFC3339, enc)
-}
-
-// RFC3339NanoTimeEncoder serializes a time.Time to an RFC3339-formatted string
-// with nanosecond precision.
-//
-// If enc supports AppendTimeLayout(t time.Time,layout string), it's used
-// instead of appending a pre-formatted string value.
-func RFC3339NanoTimeEncoder(t time.Time, enc PrimitiveArrayEncoder) {
-	encodeTimeLayout(t, time.RFC3339Nano, enc)
-}
-
-// TimeEncoderOfLayout returns TimeEncoder which serializes a time.Time using
-// given layout.
-func TimeEncoderOfLayout(layout string) TimeEncoder {
-	return func(t time.Time, enc PrimitiveArrayEncoder) {
-		encodeTimeLayout(t, layout, enc)
-	}
-}
-
-// UnmarshalText unmarshals text to a TimeEncoder.
-// "rfc3339nano" and "RFC3339Nano" are unmarshaled to RFC3339NanoTimeEncoder.
-// "rfc3339" and "RFC3339" are unmarshaled to RFC3339TimeEncoder.
-// "iso8601" and "ISO8601" are unmarshaled to ISO8601TimeEncoder.
-// "millis" is unmarshaled to EpochMillisTimeEncoder.
-// "nanos" is unmarshaled to EpochNanosEncoder.
-// Anything else is unmarshaled to EpochTimeEncoder.
-func (e *TimeEncoder) UnmarshalText(text []byte) error {
-	switch string(text) {
-	case "rfc3339nano", "RFC3339Nano":
-		*e = RFC3339NanoTimeEncoder
-	case "rfc3339", "RFC3339":
-		*e = RFC3339TimeEncoder
-	case "iso8601", "ISO8601":
-		*e = ISO8601TimeEncoder
-	case "millis":
-		*e = EpochMillisTimeEncoder
-	case "nanos":
-		*e = EpochNanosTimeEncoder
-	default:
-		*e = EpochTimeEncoder
-	}
-	return nil
-}
-
-// UnmarshalYAML unmarshals YAML to a TimeEncoder.
-// If value is an object with a "layout" field, it will be unmarshaled to  TimeEncoder with given layout.
-//     timeEncoder:
-//       layout: 06/01/02 03:04pm
-// If value is string, it uses UnmarshalText.
-//     timeEncoder: iso8601
-func (e *TimeEncoder) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	var o struct {
-		Layout string `json:"layout" yaml:"layout"`
-	}
-	if err := unmarshal(&o); err == nil {
-		*e = TimeEncoderOfLayout(o.Layout)
-		return nil
-	}
-
-	var s string
-	if err := unmarshal(&s); err != nil {
-		return err
-	}
-	return e.UnmarshalText([]byte(s))
-}
-
-// UnmarshalJSON unmarshals JSON to a TimeEncoder as same way UnmarshalYAML does.
-func (e *TimeEncoder) UnmarshalJSON(data []byte) error {
-	return e.UnmarshalYAML(func(v interface{}) error {
-		return json.Unmarshal(data, v)
-	})
-}
-
-// A DurationEncoder serializes a time.Duration to a primitive type.
-type DurationEncoder func(time.Duration, PrimitiveArrayEncoder)
-
-// SecondsDurationEncoder serializes a time.Duration to a floating-point number of seconds elapsed.
-func SecondsDurationEncoder(d time.Duration, enc PrimitiveArrayEncoder) {
-	enc.AppendFloat64(float64(d) / float64(time.Second))
-}
-
-// NanosDurationEncoder serializes a time.Duration to an integer number of
-// nanoseconds elapsed.
-func NanosDurationEncoder(d time.Duration, enc PrimitiveArrayEncoder) {
-	enc.AppendInt64(int64(d))
-}
-
-// MillisDurationEncoder serializes a time.Duration to an integer number of
-// milliseconds elapsed.
-func MillisDurationEncoder(d time.Duration, enc PrimitiveArrayEncoder) {
-	enc.AppendInt64(d.Nanoseconds() / 1e6)
-}
-
-// StringDurationEncoder serializes a time.Duration using its built-in String
-// method.
-func StringDurationEncoder(d time.Duration, enc PrimitiveArrayEncoder) {
-	enc.AppendString(d.String())
-}
-
-// UnmarshalText unmarshals text to a DurationEncoder. "string" is unmarshaled
-// to StringDurationEncoder, and anything else is unmarshaled to
-// NanosDurationEncoder.
-func (e *DurationEncoder) UnmarshalText(text []byte) error {
-	switch string(text) {
-	case "string":
-		*e = StringDurationEncoder
-	case "nanos":
-		*e = NanosDurationEncoder
-	case "ms":
-		*e = MillisDurationEncoder
-	default:
-		*e = SecondsDurationEncoder
-	}
-	return nil
-}
-
-// A CallerEncoder serializes an EntryCaller to a primitive type.
-type CallerEncoder func(EntryCaller, PrimitiveArrayEncoder)
-
-// FullCallerEncoder serializes a caller in /full/path/to/package/file:line
-// format.
-func FullCallerEncoder(caller EntryCaller, enc PrimitiveArrayEncoder) {
-	// TODO: consider using a byte-oriented API to save an allocation.
-	enc.AppendString(caller.String())
-}
-
-// ShortCallerEncoder serializes a caller in package/file:line format, trimming
-// all but the final directory from the full path.
-func ShortCallerEncoder(caller EntryCaller, enc PrimitiveArrayEncoder) {
-	// TODO: consider using a byte-oriented API to save an allocation.
-	enc.AppendString(caller.TrimmedPath())
-}
-
-// UnmarshalText unmarshals text to a CallerEncoder. "full" is unmarshaled to
-// FullCallerEncoder and anything else is unmarshaled to ShortCallerEncoder.
-func (e *CallerEncoder) UnmarshalText(text []byte) error {
-	switch string(text) {
-	case "full":
-		*e = FullCallerEncoder
-	default:
-		*e = ShortCallerEncoder
-	}
-	return nil
-}
-
-// A NameEncoder serializes a period-separated logger name to a primitive
-// type.
-type NameEncoder func(string, PrimitiveArrayEncoder)
-
-// FullNameEncoder serializes the logger name as-is.
-func FullNameEncoder(loggerName string, enc PrimitiveArrayEncoder) {
-	enc.AppendString(loggerName)
-}
-
-// UnmarshalText unmarshals text to a NameEncoder. Currently, everything is
-// unmarshaled to FullNameEncoder.
-func (e *NameEncoder) UnmarshalText(text []byte) error {
-	switch string(text) {
-	case "full":
-		*e = FullNameEncoder
-	default:
-		*e = FullNameEncoder
-	}
-	return nil
-}
-
-// An EncoderConfig allows users to configure the concrete encoders supplied by
-// zapcore.
-type EncoderConfig struct {
-	// Set the keys used for each log entry. If any key is empty, that portion
-	// of the entry is omitted.
-	MessageKey     string `json:"messageKey" yaml:"messageKey"`
-	LevelKey       string `json:"levelKey" yaml:"levelKey"`
-	TimeKey        string `json:"timeKey" yaml:"timeKey"`
-	NameKey        string `json:"nameKey" yaml:"nameKey"`
-	CallerKey      string `json:"callerKey" yaml:"callerKey"`
-	FunctionKey    string `json:"functionKey" yaml:"functionKey"`
-	StacktraceKey  string `json:"stacktraceKey" yaml:"stacktraceKey"`
-	SkipLineEnding bool   `json:"skipLineEnding" yaml:"skipLineEnding"`
-	LineEnding     string `json:"lineEnding" yaml:"lineEnding"`
-	// Configure the primitive representations of common complex types. For
-	// example, some users may want all time.Times serialized as floating-point
-	// seconds since epoch, while others may prefer ISO8601 strings.
-	EncodeLevel    LevelEncoder    `json:"levelEncoder" yaml:"levelEncoder"`
-	EncodeTime     TimeEncoder     `json:"timeEncoder" yaml:"timeEncoder"`
-	EncodeDuration DurationEncoder `json:"durationEncoder" yaml:"durationEncoder"`
-	EncodeCaller   CallerEncoder   `json:"callerEncoder" yaml:"callerEncoder"`
-	// Unlike the other primitive type encoders, EncodeName is optional. The
-	// zero value falls back to FullNameEncoder.
-	EncodeName NameEncoder `json:"nameEncoder" yaml:"nameEncoder"`
-	// Configure the encoder for interface{} type objects.
-	// If not provided, objects are encoded using json.Encoder
-	NewReflectedEncoder func(io.Writer) ReflectedEncoder `json:"-" yaml:"-"`
-	// Configures the field separator used by the console encoder. Defaults
-	// to tab.
-	ConsoleSeparator string `json:"consoleSeparator" yaml:"consoleSeparator"`
-}
-
-// ObjectEncoder is a strongly-typed, encoding-agnostic interface for adding a
-// map- or struct-like object to the logging context. Like maps, ObjectEncoders
-// aren't safe for concurrent use (though typical use shouldn't require locks).
-type ObjectEncoder interface {
-	// Logging-specific marshalers.
-	AddArray(key string, marshaler ArrayMarshaler) error
-	AddObject(key string, marshaler ObjectMarshaler) error
-
-	// Built-in types.
-	AddBinary(key string, value []byte)     // for arbitrary bytes
-	AddByteString(key string, value []byte) // for UTF-8 encoded bytes
-	AddBool(key string, value bool)
-	AddComplex128(key string, value complex128)
-	AddComplex64(key string, value complex64)
-	AddDuration(key string, value time.Duration)
-	AddFloat64(key string, value float64)
-	AddFloat32(key string, value float32)
-	AddInt(key string, value int)
-	AddInt64(key string, value int64)
-	AddInt32(key string, value int32)
-	AddInt16(key string, value int16)
-	AddInt8(key string, value int8)
-	AddString(key, value string)
-	AddTime(key string, value time.Time)
-	AddUint(key string, value uint)
-	AddUint64(key string, value uint64)
-	AddUint32(key string, value uint32)
-	AddUint16(key string, value uint16)
-	AddUint8(key string, value uint8)
-	AddUintptr(key string, value uintptr)
-
-	// AddReflected uses reflection to serialize arbitrary objects, so it can be
-	// slow and allocation-heavy.
-	AddReflected(key string, value interface{}) error
-	// OpenNamespace opens an isolated namespace where all subsequent fields will
-	// be added. Applications can use namespaces to prevent key collisions when
-	// injecting loggers into sub-components or third-party libraries.
-	OpenNamespace(key string)
-}
-
-// ArrayEncoder is a strongly-typed, encoding-agnostic interface for adding
-// array-like objects to the logging context. Of note, it supports mixed-type
-// arrays even though they aren't typical in Go. Like slices, ArrayEncoders
-// aren't safe for concurrent use (though typical use shouldn't require locks).
-type ArrayEncoder interface {
-	// Built-in types.
-	PrimitiveArrayEncoder
-
-	// Time-related types.
-	AppendDuration(time.Duration)
-	AppendTime(time.Time)
-
-	// Logging-specific marshalers.
-	AppendArray(ArrayMarshaler) error
-	AppendObject(ObjectMarshaler) error
-
-	// AppendReflected uses reflection to serialize arbitrary objects, so it's
-	// slow and allocation-heavy.
-	AppendReflected(value interface{}) error
-}
-
-// PrimitiveArrayEncoder is the subset of the ArrayEncoder interface that deals
-// only in Go's built-in types. It's included only so that Duration- and
-// TimeEncoders cannot trigger infinite recursion.
-type PrimitiveArrayEncoder interface {
-	// Built-in types.
-	AppendBool(bool)
-	AppendByteString([]byte) // for UTF-8 encoded bytes
-	AppendComplex128(complex128)
-	AppendComplex64(complex64)
-	AppendFloat64(float64)
-	AppendFloat32(float32)
-	AppendInt(int)
-	AppendInt64(int64)
-	AppendInt32(int32)
-	AppendInt16(int16)
-	AppendInt8(int8)
-	AppendString(string)
-	AppendUint(uint)
-	AppendUint64(uint64)
-	AppendUint32(uint32)
-	AppendUint16(uint16)
-	AppendUint8(uint8)
-	AppendUintptr(uintptr)
-}
-
-// Encoder is a format-agnostic interface for all log entry marshalers. Since
-// log encoders don't need to support the same wide range of use cases as
-// general-purpose marshalers, it's possible to make them faster and
-// lower-allocation.
-//
-// Implementations of the ObjectEncoder interface's methods can, of course,
-// freely modify the receiver. However, the Clone and EncodeEntry methods will
-// be called concurrently and shouldn't modify the receiver.
-type Encoder interface {
-	ObjectEncoder
-
-	// Clone copies the encoder, ensuring that adding fields to the copy doesn't
-	// affect the original.
-	Clone() Encoder
-
-	// EncodeEntry encodes an entry and fields, along with any accumulated
-	// context, into a byte buffer and returns it. Any fields that are empty,
-	// including fields on the `Entry` type, should be omitted.
-	EncodeEntry(Entry, []Field) (*buffer.Buffer, error)
-}
diff --git a/vendor/go.uber.org/zap/zapcore/entry.go b/vendor/go.uber.org/zap/zapcore/entry.go
deleted file mode 100644
index 0885505b..00000000
--- a/vendor/go.uber.org/zap/zapcore/entry.go
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-import (
-	"fmt"
-	"runtime"
-	"strings"
-	"sync"
-	"time"
-
-	"go.uber.org/zap/internal/bufferpool"
-	"go.uber.org/zap/internal/exit"
-
-	"go.uber.org/multierr"
-)
-
-var (
-	_cePool = sync.Pool{New: func() interface{} {
-		// Pre-allocate some space for cores.
-		return &CheckedEntry{
-			cores: make([]Core, 4),
-		}
-	}}
-)
-
-func getCheckedEntry() *CheckedEntry {
-	ce := _cePool.Get().(*CheckedEntry)
-	ce.reset()
-	return ce
-}
-
-func putCheckedEntry(ce *CheckedEntry) {
-	if ce == nil {
-		return
-	}
-	_cePool.Put(ce)
-}
-
-// NewEntryCaller makes an EntryCaller from the return signature of
-// runtime.Caller.
-func NewEntryCaller(pc uintptr, file string, line int, ok bool) EntryCaller {
-	if !ok {
-		return EntryCaller{}
-	}
-	return EntryCaller{
-		PC:      pc,
-		File:    file,
-		Line:    line,
-		Defined: true,
-	}
-}
-
-// EntryCaller represents the caller of a logging function.
-type EntryCaller struct {
-	Defined  bool
-	PC       uintptr
-	File     string
-	Line     int
-	Function string
-}
-
-// String returns the full path and line number of the caller.
-func (ec EntryCaller) String() string {
-	return ec.FullPath()
-}
-
-// FullPath returns a /full/path/to/package/file:line description of the
-// caller.
-func (ec EntryCaller) FullPath() string {
-	if !ec.Defined {
-		return "undefined"
-	}
-	buf := bufferpool.Get()
-	buf.AppendString(ec.File)
-	buf.AppendByte(':')
-	buf.AppendInt(int64(ec.Line))
-	caller := buf.String()
-	buf.Free()
-	return caller
-}
-
-// TrimmedPath returns a package/file:line description of the caller,
-// preserving only the leaf directory name and file name.
-func (ec EntryCaller) TrimmedPath() string {
-	if !ec.Defined {
-		return "undefined"
-	}
-	// nb. To make sure we trim the path correctly on Windows too, we
-	// counter-intuitively need to use '/' and *not* os.PathSeparator here,
-	// because the path given originates from Go stdlib, specifically
-	// runtime.Caller() which (as of Mar/17) returns forward slashes even on
-	// Windows.
-	//
-	// See https://github.com/golang/go/issues/3335
-	// and https://github.com/golang/go/issues/18151
-	//
-	// for discussion on the issue on Go side.
-	//
-	// Find the last separator.
-	//
-	idx := strings.LastIndexByte(ec.File, '/')
-	if idx == -1 {
-		return ec.FullPath()
-	}
-	// Find the penultimate separator.
-	idx = strings.LastIndexByte(ec.File[:idx], '/')
-	if idx == -1 {
-		return ec.FullPath()
-	}
-	buf := bufferpool.Get()
-	// Keep everything after the penultimate separator.
-	buf.AppendString(ec.File[idx+1:])
-	buf.AppendByte(':')
-	buf.AppendInt(int64(ec.Line))
-	caller := buf.String()
-	buf.Free()
-	return caller
-}
-
-// An Entry represents a complete log message. The entry's structured context
-// is already serialized, but the log level, time, message, and call site
-// information are available for inspection and modification. Any fields left
-// empty will be omitted when encoding.
-//
-// Entries are pooled, so any functions that accept them MUST be careful not to
-// retain references to them.
-type Entry struct {
-	Level      Level
-	Time       time.Time
-	LoggerName string
-	Message    string
-	Caller     EntryCaller
-	Stack      string
-}
-
-// CheckWriteAction indicates what action to take after a log entry is
-// processed. Actions are ordered in increasing severity.
-type CheckWriteAction uint8
-
-const (
-	// WriteThenNoop indicates that nothing special needs to be done. It's the
-	// default behavior.
-	WriteThenNoop CheckWriteAction = iota
-	// WriteThenGoexit runs runtime.Goexit after Write.
-	WriteThenGoexit
-	// WriteThenPanic causes a panic after Write.
-	WriteThenPanic
-	// WriteThenFatal causes a fatal os.Exit after Write.
-	WriteThenFatal
-)
-
-// CheckedEntry is an Entry together with a collection of Cores that have
-// already agreed to log it.
-//
-// CheckedEntry references should be created by calling AddCore or Should on a
-// nil *CheckedEntry. References are returned to a pool after Write, and MUST
-// NOT be retained after calling their Write method.
-type CheckedEntry struct {
-	Entry
-	ErrorOutput WriteSyncer
-	dirty       bool // best-effort detection of pool misuse
-	should      CheckWriteAction
-	cores       []Core
-}
-
-func (ce *CheckedEntry) reset() {
-	ce.Entry = Entry{}
-	ce.ErrorOutput = nil
-	ce.dirty = false
-	ce.should = WriteThenNoop
-	for i := range ce.cores {
-		// don't keep references to cores
-		ce.cores[i] = nil
-	}
-	ce.cores = ce.cores[:0]
-}
-
-// Write writes the entry to the stored Cores, returns any errors, and returns
-// the CheckedEntry reference to a pool for immediate re-use. Finally, it
-// executes any required CheckWriteAction.
-func (ce *CheckedEntry) Write(fields ...Field) {
-	if ce == nil {
-		return
-	}
-
-	if ce.dirty {
-		if ce.ErrorOutput != nil {
-			// Make a best effort to detect unsafe re-use of this CheckedEntry.
-			// If the entry is dirty, log an internal error; because the
-			// CheckedEntry is being used after it was returned to the pool,
-			// the message may be an amalgamation from multiple call sites.
-			fmt.Fprintf(ce.ErrorOutput, "%v Unsafe CheckedEntry re-use near Entry %+v.\n", ce.Time, ce.Entry)
-			ce.ErrorOutput.Sync()
-		}
-		return
-	}
-	ce.dirty = true
-
-	var err error
-	for i := range ce.cores {
-		err = multierr.Append(err, ce.cores[i].Write(ce.Entry, fields))
-	}
-	if err != nil && ce.ErrorOutput != nil {
-		fmt.Fprintf(ce.ErrorOutput, "%v write error: %v\n", ce.Time, err)
-		ce.ErrorOutput.Sync()
-	}
-
-	should, msg := ce.should, ce.Message
-	putCheckedEntry(ce)
-
-	switch should {
-	case WriteThenPanic:
-		panic(msg)
-	case WriteThenFatal:
-		exit.Exit()
-	case WriteThenGoexit:
-		runtime.Goexit()
-	}
-}
-
-// AddCore adds a Core that has agreed to log this CheckedEntry. It's intended to be
-// used by Core.Check implementations, and is safe to call on nil CheckedEntry
-// references.
-func (ce *CheckedEntry) AddCore(ent Entry, core Core) *CheckedEntry {
-	if ce == nil {
-		ce = getCheckedEntry()
-		ce.Entry = ent
-	}
-	ce.cores = append(ce.cores, core)
-	return ce
-}
-
-// Should sets this CheckedEntry's CheckWriteAction, which controls whether a
-// Core will panic or fatal after writing this log entry. Like AddCore, it's
-// safe to call on nil CheckedEntry references.
-func (ce *CheckedEntry) Should(ent Entry, should CheckWriteAction) *CheckedEntry {
-	if ce == nil {
-		ce = getCheckedEntry()
-		ce.Entry = ent
-	}
-	ce.should = should
-	return ce
-}
diff --git a/vendor/go.uber.org/zap/zapcore/error.go b/vendor/go.uber.org/zap/zapcore/error.go
deleted file mode 100644
index 74919b0c..00000000
--- a/vendor/go.uber.org/zap/zapcore/error.go
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright (c) 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-import (
-	"fmt"
-	"reflect"
-	"sync"
-)
-
-// Encodes the given error into fields of an object. A field with the given
-// name is added for the error message.
-//
-// If the error implements fmt.Formatter, a field with the name ${key}Verbose
-// is also added with the full verbose error message.
-//
-// Finally, if the error implements errorGroup (from go.uber.org/multierr) or
-// causer (from github.com/pkg/errors), a ${key}Causes field is added with an
-// array of objects containing the errors this error was comprised of.
-//
-//  {
-//    "error": err.Error(),
-//    "errorVerbose": fmt.Sprintf("%+v", err),
-//    "errorCauses": [
-//      ...
-//    ],
-//  }
-func encodeError(key string, err error, enc ObjectEncoder) (retErr error) {
-	// Try to capture panics (from nil references or otherwise) when calling
-	// the Error() method
-	defer func() {
-		if rerr := recover(); rerr != nil {
-			// If it's a nil pointer, just say "<nil>". The likeliest causes are a
-			// error that fails to guard against nil or a nil pointer for a
-			// value receiver, and in either case, "<nil>" is a nice result.
-			if v := reflect.ValueOf(err); v.Kind() == reflect.Ptr && v.IsNil() {
-				enc.AddString(key, "<nil>")
-				return
-			}
-
-			retErr = fmt.Errorf("PANIC=%v", rerr)
-		}
-	}()
-
-	basic := err.Error()
-	enc.AddString(key, basic)
-
-	switch e := err.(type) {
-	case errorGroup:
-		return enc.AddArray(key+"Causes", errArray(e.Errors()))
-	case fmt.Formatter:
-		verbose := fmt.Sprintf("%+v", e)
-		if verbose != basic {
-			// This is a rich error type, like those produced by
-			// github.com/pkg/errors.
-			enc.AddString(key+"Verbose", verbose)
-		}
-	}
-	return nil
-}
-
-type errorGroup interface {
-	// Provides read-only access to the underlying list of errors, preferably
-	// without causing any allocs.
-	Errors() []error
-}
-
-// Note that errArray and errArrayElem are very similar to the version
-// implemented in the top-level error.go file. We can't re-use this because
-// that would require exporting errArray as part of the zapcore API.
-
-// Encodes a list of errors using the standard error encoding logic.
-type errArray []error
-
-func (errs errArray) MarshalLogArray(arr ArrayEncoder) error {
-	for i := range errs {
-		if errs[i] == nil {
-			continue
-		}
-
-		el := newErrArrayElem(errs[i])
-		arr.AppendObject(el)
-		el.Free()
-	}
-	return nil
-}
-
-var _errArrayElemPool = sync.Pool{New: func() interface{} {
-	return &errArrayElem{}
-}}
-
-// Encodes any error into a {"error": ...} re-using the same errors logic.
-//
-// May be passed in place of an array to build a single-element array.
-type errArrayElem struct{ err error }
-
-func newErrArrayElem(err error) *errArrayElem {
-	e := _errArrayElemPool.Get().(*errArrayElem)
-	e.err = err
-	return e
-}
-
-func (e *errArrayElem) MarshalLogArray(arr ArrayEncoder) error {
-	return arr.AppendObject(e)
-}
-
-func (e *errArrayElem) MarshalLogObject(enc ObjectEncoder) error {
-	return encodeError("error", e.err, enc)
-}
-
-func (e *errArrayElem) Free() {
-	e.err = nil
-	_errArrayElemPool.Put(e)
-}
diff --git a/vendor/go.uber.org/zap/zapcore/field.go b/vendor/go.uber.org/zap/zapcore/field.go
deleted file mode 100644
index 95bdb0a1..00000000
--- a/vendor/go.uber.org/zap/zapcore/field.go
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-import (
-	"bytes"
-	"fmt"
-	"math"
-	"reflect"
-	"time"
-)
-
-// A FieldType indicates which member of the Field union struct should be used
-// and how it should be serialized.
-type FieldType uint8
-
-const (
-	// UnknownType is the default field type. Attempting to add it to an encoder will panic.
-	UnknownType FieldType = iota
-	// ArrayMarshalerType indicates that the field carries an ArrayMarshaler.
-	ArrayMarshalerType
-	// ObjectMarshalerType indicates that the field carries an ObjectMarshaler.
-	ObjectMarshalerType
-	// BinaryType indicates that the field carries an opaque binary blob.
-	BinaryType
-	// BoolType indicates that the field carries a bool.
-	BoolType
-	// ByteStringType indicates that the field carries UTF-8 encoded bytes.
-	ByteStringType
-	// Complex128Type indicates that the field carries a complex128.
-	Complex128Type
-	// Complex64Type indicates that the field carries a complex128.
-	Complex64Type
-	// DurationType indicates that the field carries a time.Duration.
-	DurationType
-	// Float64Type indicates that the field carries a float64.
-	Float64Type
-	// Float32Type indicates that the field carries a float32.
-	Float32Type
-	// Int64Type indicates that the field carries an int64.
-	Int64Type
-	// Int32Type indicates that the field carries an int32.
-	Int32Type
-	// Int16Type indicates that the field carries an int16.
-	Int16Type
-	// Int8Type indicates that the field carries an int8.
-	Int8Type
-	// StringType indicates that the field carries a string.
-	StringType
-	// TimeType indicates that the field carries a time.Time that is
-	// representable by a UnixNano() stored as an int64.
-	TimeType
-	// TimeFullType indicates that the field carries a time.Time stored as-is.
-	TimeFullType
-	// Uint64Type indicates that the field carries a uint64.
-	Uint64Type
-	// Uint32Type indicates that the field carries a uint32.
-	Uint32Type
-	// Uint16Type indicates that the field carries a uint16.
-	Uint16Type
-	// Uint8Type indicates that the field carries a uint8.
-	Uint8Type
-	// UintptrType indicates that the field carries a uintptr.
-	UintptrType
-	// ReflectType indicates that the field carries an interface{}, which should
-	// be serialized using reflection.
-	ReflectType
-	// NamespaceType signals the beginning of an isolated namespace. All
-	// subsequent fields should be added to the new namespace.
-	NamespaceType
-	// StringerType indicates that the field carries a fmt.Stringer.
-	StringerType
-	// ErrorType indicates that the field carries an error.
-	ErrorType
-	// SkipType indicates that the field is a no-op.
-	SkipType
-
-	// InlineMarshalerType indicates that the field carries an ObjectMarshaler
-	// that should be inlined.
-	InlineMarshalerType
-)
-
-// A Field is a marshaling operation used to add a key-value pair to a logger's
-// context. Most fields are lazily marshaled, so it's inexpensive to add fields
-// to disabled debug-level log statements.
-type Field struct {
-	Key       string
-	Type      FieldType
-	Integer   int64
-	String    string
-	Interface interface{}
-}
-
-// AddTo exports a field through the ObjectEncoder interface. It's primarily
-// useful to library authors, and shouldn't be necessary in most applications.
-func (f Field) AddTo(enc ObjectEncoder) {
-	var err error
-
-	switch f.Type {
-	case ArrayMarshalerType:
-		err = enc.AddArray(f.Key, f.Interface.(ArrayMarshaler))
-	case ObjectMarshalerType:
-		err = enc.AddObject(f.Key, f.Interface.(ObjectMarshaler))
-	case InlineMarshalerType:
-		err = f.Interface.(ObjectMarshaler).MarshalLogObject(enc)
-	case BinaryType:
-		enc.AddBinary(f.Key, f.Interface.([]byte))
-	case BoolType:
-		enc.AddBool(f.Key, f.Integer == 1)
-	case ByteStringType:
-		enc.AddByteString(f.Key, f.Interface.([]byte))
-	case Complex128Type:
-		enc.AddComplex128(f.Key, f.Interface.(complex128))
-	case Complex64Type:
-		enc.AddComplex64(f.Key, f.Interface.(complex64))
-	case DurationType:
-		enc.AddDuration(f.Key, time.Duration(f.Integer))
-	case Float64Type:
-		enc.AddFloat64(f.Key, math.Float64frombits(uint64(f.Integer)))
-	case Float32Type:
-		enc.AddFloat32(f.Key, math.Float32frombits(uint32(f.Integer)))
-	case Int64Type:
-		enc.AddInt64(f.Key, f.Integer)
-	case Int32Type:
-		enc.AddInt32(f.Key, int32(f.Integer))
-	case Int16Type:
-		enc.AddInt16(f.Key, int16(f.Integer))
-	case Int8Type:
-		enc.AddInt8(f.Key, int8(f.Integer))
-	case StringType:
-		enc.AddString(f.Key, f.String)
-	case TimeType:
-		if f.Interface != nil {
-			enc.AddTime(f.Key, time.Unix(0, f.Integer).In(f.Interface.(*time.Location)))
-		} else {
-			// Fall back to UTC if location is nil.
-			enc.AddTime(f.Key, time.Unix(0, f.Integer))
-		}
-	case TimeFullType:
-		enc.AddTime(f.Key, f.Interface.(time.Time))
-	case Uint64Type:
-		enc.AddUint64(f.Key, uint64(f.Integer))
-	case Uint32Type:
-		enc.AddUint32(f.Key, uint32(f.Integer))
-	case Uint16Type:
-		enc.AddUint16(f.Key, uint16(f.Integer))
-	case Uint8Type:
-		enc.AddUint8(f.Key, uint8(f.Integer))
-	case UintptrType:
-		enc.AddUintptr(f.Key, uintptr(f.Integer))
-	case ReflectType:
-		err = enc.AddReflected(f.Key, f.Interface)
-	case NamespaceType:
-		enc.OpenNamespace(f.Key)
-	case StringerType:
-		err = encodeStringer(f.Key, f.Interface, enc)
-	case ErrorType:
-		err = encodeError(f.Key, f.Interface.(error), enc)
-	case SkipType:
-		break
-	default:
-		panic(fmt.Sprintf("unknown field type: %v", f))
-	}
-
-	if err != nil {
-		enc.AddString(fmt.Sprintf("%sError", f.Key), err.Error())
-	}
-}
-
-// Equals returns whether two fields are equal. For non-primitive types such as
-// errors, marshalers, or reflect types, it uses reflect.DeepEqual.
-func (f Field) Equals(other Field) bool {
-	if f.Type != other.Type {
-		return false
-	}
-	if f.Key != other.Key {
-		return false
-	}
-
-	switch f.Type {
-	case BinaryType, ByteStringType:
-		return bytes.Equal(f.Interface.([]byte), other.Interface.([]byte))
-	case ArrayMarshalerType, ObjectMarshalerType, ErrorType, ReflectType:
-		return reflect.DeepEqual(f.Interface, other.Interface)
-	default:
-		return f == other
-	}
-}
-
-func addFields(enc ObjectEncoder, fields []Field) {
-	for i := range fields {
-		fields[i].AddTo(enc)
-	}
-}
-
-func encodeStringer(key string, stringer interface{}, enc ObjectEncoder) (retErr error) {
-	// Try to capture panics (from nil references or otherwise) when calling
-	// the String() method, similar to https://golang.org/src/fmt/print.go#L540
-	defer func() {
-		if err := recover(); err != nil {
-			// If it's a nil pointer, just say "<nil>". The likeliest causes are a
-			// Stringer that fails to guard against nil or a nil pointer for a
-			// value receiver, and in either case, "<nil>" is a nice result.
-			if v := reflect.ValueOf(stringer); v.Kind() == reflect.Ptr && v.IsNil() {
-				enc.AddString(key, "<nil>")
-				return
-			}
-
-			retErr = fmt.Errorf("PANIC=%v", err)
-		}
-	}()
-
-	enc.AddString(key, stringer.(fmt.Stringer).String())
-	return nil
-}
diff --git a/vendor/go.uber.org/zap/zapcore/hook.go b/vendor/go.uber.org/zap/zapcore/hook.go
deleted file mode 100644
index 5db4afb3..00000000
--- a/vendor/go.uber.org/zap/zapcore/hook.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-import "go.uber.org/multierr"
-
-type hooked struct {
-	Core
-	funcs []func(Entry) error
-}
-
-// RegisterHooks wraps a Core and runs a collection of user-defined callback
-// hooks each time a message is logged. Execution of the callbacks is blocking.
-//
-// This offers users an easy way to register simple callbacks (e.g., metrics
-// collection) without implementing the full Core interface.
-func RegisterHooks(core Core, hooks ...func(Entry) error) Core {
-	funcs := append([]func(Entry) error{}, hooks...)
-	return &hooked{
-		Core:  core,
-		funcs: funcs,
-	}
-}
-
-func (h *hooked) Check(ent Entry, ce *CheckedEntry) *CheckedEntry {
-	// Let the wrapped Core decide whether to log this message or not. This
-	// also gives the downstream a chance to register itself directly with the
-	// CheckedEntry.
-	if downstream := h.Core.Check(ent, ce); downstream != nil {
-		return downstream.AddCore(ent, h)
-	}
-	return ce
-}
-
-func (h *hooked) With(fields []Field) Core {
-	return &hooked{
-		Core:  h.Core.With(fields),
-		funcs: h.funcs,
-	}
-}
-
-func (h *hooked) Write(ent Entry, _ []Field) error {
-	// Since our downstream had a chance to register itself directly with the
-	// CheckedMessage, we don't need to call it here.
-	var err error
-	for i := range h.funcs {
-		err = multierr.Append(err, h.funcs[i](ent))
-	}
-	return err
-}
diff --git a/vendor/go.uber.org/zap/zapcore/increase_level.go b/vendor/go.uber.org/zap/zapcore/increase_level.go
deleted file mode 100644
index 5a174926..00000000
--- a/vendor/go.uber.org/zap/zapcore/increase_level.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) 2020 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-import "fmt"
-
-type levelFilterCore struct {
-	core  Core
-	level LevelEnabler
-}
-
-// NewIncreaseLevelCore creates a core that can be used to increase the level of
-// an existing Core. It cannot be used to decrease the logging level, as it acts
-// as a filter before calling the underlying core. If level decreases the log level,
-// an error is returned.
-func NewIncreaseLevelCore(core Core, level LevelEnabler) (Core, error) {
-	for l := _maxLevel; l >= _minLevel; l-- {
-		if !core.Enabled(l) && level.Enabled(l) {
-			return nil, fmt.Errorf("invalid increase level, as level %q is allowed by increased level, but not by existing core", l)
-		}
-	}
-
-	return &levelFilterCore{core, level}, nil
-}
-
-func (c *levelFilterCore) Enabled(lvl Level) bool {
-	return c.level.Enabled(lvl)
-}
-
-func (c *levelFilterCore) With(fields []Field) Core {
-	return &levelFilterCore{c.core.With(fields), c.level}
-}
-
-func (c *levelFilterCore) Check(ent Entry, ce *CheckedEntry) *CheckedEntry {
-	if !c.Enabled(ent.Level) {
-		return ce
-	}
-
-	return c.core.Check(ent, ce)
-}
-
-func (c *levelFilterCore) Write(ent Entry, fields []Field) error {
-	return c.core.Write(ent, fields)
-}
-
-func (c *levelFilterCore) Sync() error {
-	return c.core.Sync()
-}
diff --git a/vendor/go.uber.org/zap/zapcore/json_encoder.go b/vendor/go.uber.org/zap/zapcore/json_encoder.go
deleted file mode 100644
index c5d751b8..00000000
--- a/vendor/go.uber.org/zap/zapcore/json_encoder.go
+++ /dev/null
@@ -1,560 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-import (
-	"encoding/base64"
-	"math"
-	"sync"
-	"time"
-	"unicode/utf8"
-
-	"go.uber.org/zap/buffer"
-	"go.uber.org/zap/internal/bufferpool"
-)
-
-// For JSON-escaping; see jsonEncoder.safeAddString below.
-const _hex = "0123456789abcdef"
-
-var _jsonPool = sync.Pool{New: func() interface{} {
-	return &jsonEncoder{}
-}}
-
-func getJSONEncoder() *jsonEncoder {
-	return _jsonPool.Get().(*jsonEncoder)
-}
-
-func putJSONEncoder(enc *jsonEncoder) {
-	if enc.reflectBuf != nil {
-		enc.reflectBuf.Free()
-	}
-	enc.EncoderConfig = nil
-	enc.buf = nil
-	enc.spaced = false
-	enc.openNamespaces = 0
-	enc.reflectBuf = nil
-	enc.reflectEnc = nil
-	_jsonPool.Put(enc)
-}
-
-type jsonEncoder struct {
-	*EncoderConfig
-	buf            *buffer.Buffer
-	spaced         bool // include spaces after colons and commas
-	openNamespaces int
-
-	// for encoding generic values by reflection
-	reflectBuf *buffer.Buffer
-	reflectEnc ReflectedEncoder
-}
-
-// NewJSONEncoder creates a fast, low-allocation JSON encoder. The encoder
-// appropriately escapes all field keys and values.
-//
-// Note that the encoder doesn't deduplicate keys, so it's possible to produce
-// a message like
-//   {"foo":"bar","foo":"baz"}
-// This is permitted by the JSON specification, but not encouraged. Many
-// libraries will ignore duplicate key-value pairs (typically keeping the last
-// pair) when unmarshaling, but users should attempt to avoid adding duplicate
-// keys.
-func NewJSONEncoder(cfg EncoderConfig) Encoder {
-	return newJSONEncoder(cfg, false)
-}
-
-func newJSONEncoder(cfg EncoderConfig, spaced bool) *jsonEncoder {
-	if cfg.SkipLineEnding {
-		cfg.LineEnding = ""
-	} else if cfg.LineEnding == "" {
-		cfg.LineEnding = DefaultLineEnding
-	}
-
-	// If no EncoderConfig.NewReflectedEncoder is provided by the user, then use default
-	if cfg.NewReflectedEncoder == nil {
-		cfg.NewReflectedEncoder = defaultReflectedEncoder
-	}
-
-	return &jsonEncoder{
-		EncoderConfig: &cfg,
-		buf:           bufferpool.Get(),
-		spaced:        spaced,
-	}
-}
-
-func (enc *jsonEncoder) AddArray(key string, arr ArrayMarshaler) error {
-	enc.addKey(key)
-	return enc.AppendArray(arr)
-}
-
-func (enc *jsonEncoder) AddObject(key string, obj ObjectMarshaler) error {
-	enc.addKey(key)
-	return enc.AppendObject(obj)
-}
-
-func (enc *jsonEncoder) AddBinary(key string, val []byte) {
-	enc.AddString(key, base64.StdEncoding.EncodeToString(val))
-}
-
-func (enc *jsonEncoder) AddByteString(key string, val []byte) {
-	enc.addKey(key)
-	enc.AppendByteString(val)
-}
-
-func (enc *jsonEncoder) AddBool(key string, val bool) {
-	enc.addKey(key)
-	enc.AppendBool(val)
-}
-
-func (enc *jsonEncoder) AddComplex128(key string, val complex128) {
-	enc.addKey(key)
-	enc.AppendComplex128(val)
-}
-
-func (enc *jsonEncoder) AddComplex64(key string, val complex64) {
-	enc.addKey(key)
-	enc.AppendComplex64(val)
-}
-
-func (enc *jsonEncoder) AddDuration(key string, val time.Duration) {
-	enc.addKey(key)
-	enc.AppendDuration(val)
-}
-
-func (enc *jsonEncoder) AddFloat64(key string, val float64) {
-	enc.addKey(key)
-	enc.AppendFloat64(val)
-}
-
-func (enc *jsonEncoder) AddFloat32(key string, val float32) {
-	enc.addKey(key)
-	enc.AppendFloat32(val)
-}
-
-func (enc *jsonEncoder) AddInt64(key string, val int64) {
-	enc.addKey(key)
-	enc.AppendInt64(val)
-}
-
-func (enc *jsonEncoder) resetReflectBuf() {
-	if enc.reflectBuf == nil {
-		enc.reflectBuf = bufferpool.Get()
-		enc.reflectEnc = enc.NewReflectedEncoder(enc.reflectBuf)
-	} else {
-		enc.reflectBuf.Reset()
-	}
-}
-
-var nullLiteralBytes = []byte("null")
-
-// Only invoke the standard JSON encoder if there is actually something to
-// encode; otherwise write JSON null literal directly.
-func (enc *jsonEncoder) encodeReflected(obj interface{}) ([]byte, error) {
-	if obj == nil {
-		return nullLiteralBytes, nil
-	}
-	enc.resetReflectBuf()
-	if err := enc.reflectEnc.Encode(obj); err != nil {
-		return nil, err
-	}
-	enc.reflectBuf.TrimNewline()
-	return enc.reflectBuf.Bytes(), nil
-}
-
-func (enc *jsonEncoder) AddReflected(key string, obj interface{}) error {
-	valueBytes, err := enc.encodeReflected(obj)
-	if err != nil {
-		return err
-	}
-	enc.addKey(key)
-	_, err = enc.buf.Write(valueBytes)
-	return err
-}
-
-func (enc *jsonEncoder) OpenNamespace(key string) {
-	enc.addKey(key)
-	enc.buf.AppendByte('{')
-	enc.openNamespaces++
-}
-
-func (enc *jsonEncoder) AddString(key, val string) {
-	enc.addKey(key)
-	enc.AppendString(val)
-}
-
-func (enc *jsonEncoder) AddTime(key string, val time.Time) {
-	enc.addKey(key)
-	enc.AppendTime(val)
-}
-
-func (enc *jsonEncoder) AddUint64(key string, val uint64) {
-	enc.addKey(key)
-	enc.AppendUint64(val)
-}
-
-func (enc *jsonEncoder) AppendArray(arr ArrayMarshaler) error {
-	enc.addElementSeparator()
-	enc.buf.AppendByte('[')
-	err := arr.MarshalLogArray(enc)
-	enc.buf.AppendByte(']')
-	return err
-}
-
-func (enc *jsonEncoder) AppendObject(obj ObjectMarshaler) error {
-	// Close ONLY new openNamespaces that are created during
-	// AppendObject().
-	old := enc.openNamespaces
-	enc.openNamespaces = 0
-	enc.addElementSeparator()
-	enc.buf.AppendByte('{')
-	err := obj.MarshalLogObject(enc)
-	enc.buf.AppendByte('}')
-	enc.closeOpenNamespaces()
-	enc.openNamespaces = old
-	return err
-}
-
-func (enc *jsonEncoder) AppendBool(val bool) {
-	enc.addElementSeparator()
-	enc.buf.AppendBool(val)
-}
-
-func (enc *jsonEncoder) AppendByteString(val []byte) {
-	enc.addElementSeparator()
-	enc.buf.AppendByte('"')
-	enc.safeAddByteString(val)
-	enc.buf.AppendByte('"')
-}
-
-// appendComplex appends the encoded form of the provided complex128 value.
-// precision specifies the encoding precision for the real and imaginary
-// components of the complex number.
-func (enc *jsonEncoder) appendComplex(val complex128, precision int) {
-	enc.addElementSeparator()
-	// Cast to a platform-independent, fixed-size type.
-	r, i := float64(real(val)), float64(imag(val))
-	enc.buf.AppendByte('"')
-	// Because we're always in a quoted string, we can use strconv without
-	// special-casing NaN and +/-Inf.
-	enc.buf.AppendFloat(r, precision)
-	// If imaginary part is less than 0, minus (-) sign is added by default
-	// by AppendFloat.
-	if i >= 0 {
-		enc.buf.AppendByte('+')
-	}
-	enc.buf.AppendFloat(i, precision)
-	enc.buf.AppendByte('i')
-	enc.buf.AppendByte('"')
-}
-
-func (enc *jsonEncoder) AppendDuration(val time.Duration) {
-	cur := enc.buf.Len()
-	if e := enc.EncodeDuration; e != nil {
-		e(val, enc)
-	}
-	if cur == enc.buf.Len() {
-		// User-supplied EncodeDuration is a no-op. Fall back to nanoseconds to keep
-		// JSON valid.
-		enc.AppendInt64(int64(val))
-	}
-}
-
-func (enc *jsonEncoder) AppendInt64(val int64) {
-	enc.addElementSeparator()
-	enc.buf.AppendInt(val)
-}
-
-func (enc *jsonEncoder) AppendReflected(val interface{}) error {
-	valueBytes, err := enc.encodeReflected(val)
-	if err != nil {
-		return err
-	}
-	enc.addElementSeparator()
-	_, err = enc.buf.Write(valueBytes)
-	return err
-}
-
-func (enc *jsonEncoder) AppendString(val string) {
-	enc.addElementSeparator()
-	enc.buf.AppendByte('"')
-	enc.safeAddString(val)
-	enc.buf.AppendByte('"')
-}
-
-func (enc *jsonEncoder) AppendTimeLayout(time time.Time, layout string) {
-	enc.addElementSeparator()
-	enc.buf.AppendByte('"')
-	enc.buf.AppendTime(time, layout)
-	enc.buf.AppendByte('"')
-}
-
-func (enc *jsonEncoder) AppendTime(val time.Time) {
-	cur := enc.buf.Len()
-	if e := enc.EncodeTime; e != nil {
-		e(val, enc)
-	}
-	if cur == enc.buf.Len() {
-		// User-supplied EncodeTime is a no-op. Fall back to nanos since epoch to keep
-		// output JSON valid.
-		enc.AppendInt64(val.UnixNano())
-	}
-}
-
-func (enc *jsonEncoder) AppendUint64(val uint64) {
-	enc.addElementSeparator()
-	enc.buf.AppendUint(val)
-}
-
-func (enc *jsonEncoder) AddInt(k string, v int)         { enc.AddInt64(k, int64(v)) }
-func (enc *jsonEncoder) AddInt32(k string, v int32)     { enc.AddInt64(k, int64(v)) }
-func (enc *jsonEncoder) AddInt16(k string, v int16)     { enc.AddInt64(k, int64(v)) }
-func (enc *jsonEncoder) AddInt8(k string, v int8)       { enc.AddInt64(k, int64(v)) }
-func (enc *jsonEncoder) AddUint(k string, v uint)       { enc.AddUint64(k, uint64(v)) }
-func (enc *jsonEncoder) AddUint32(k string, v uint32)   { enc.AddUint64(k, uint64(v)) }
-func (enc *jsonEncoder) AddUint16(k string, v uint16)   { enc.AddUint64(k, uint64(v)) }
-func (enc *jsonEncoder) AddUint8(k string, v uint8)     { enc.AddUint64(k, uint64(v)) }
-func (enc *jsonEncoder) AddUintptr(k string, v uintptr) { enc.AddUint64(k, uint64(v)) }
-func (enc *jsonEncoder) AppendComplex64(v complex64)    { enc.appendComplex(complex128(v), 32) }
-func (enc *jsonEncoder) AppendComplex128(v complex128)  { enc.appendComplex(complex128(v), 64) }
-func (enc *jsonEncoder) AppendFloat64(v float64)        { enc.appendFloat(v, 64) }
-func (enc *jsonEncoder) AppendFloat32(v float32)        { enc.appendFloat(float64(v), 32) }
-func (enc *jsonEncoder) AppendInt(v int)                { enc.AppendInt64(int64(v)) }
-func (enc *jsonEncoder) AppendInt32(v int32)            { enc.AppendInt64(int64(v)) }
-func (enc *jsonEncoder) AppendInt16(v int16)            { enc.AppendInt64(int64(v)) }
-func (enc *jsonEncoder) AppendInt8(v int8)              { enc.AppendInt64(int64(v)) }
-func (enc *jsonEncoder) AppendUint(v uint)              { enc.AppendUint64(uint64(v)) }
-func (enc *jsonEncoder) AppendUint32(v uint32)          { enc.AppendUint64(uint64(v)) }
-func (enc *jsonEncoder) AppendUint16(v uint16)          { enc.AppendUint64(uint64(v)) }
-func (enc *jsonEncoder) AppendUint8(v uint8)            { enc.AppendUint64(uint64(v)) }
-func (enc *jsonEncoder) AppendUintptr(v uintptr)        { enc.AppendUint64(uint64(v)) }
-
-func (enc *jsonEncoder) Clone() Encoder {
-	clone := enc.clone()
-	clone.buf.Write(enc.buf.Bytes())
-	return clone
-}
-
-func (enc *jsonEncoder) clone() *jsonEncoder {
-	clone := getJSONEncoder()
-	clone.EncoderConfig = enc.EncoderConfig
-	clone.spaced = enc.spaced
-	clone.openNamespaces = enc.openNamespaces
-	clone.buf = bufferpool.Get()
-	return clone
-}
-
-func (enc *jsonEncoder) EncodeEntry(ent Entry, fields []Field) (*buffer.Buffer, error) {
-	final := enc.clone()
-	final.buf.AppendByte('{')
-
-	if final.LevelKey != "" && final.EncodeLevel != nil {
-		final.addKey(final.LevelKey)
-		cur := final.buf.Len()
-		final.EncodeLevel(ent.Level, final)
-		if cur == final.buf.Len() {
-			// User-supplied EncodeLevel was a no-op. Fall back to strings to keep
-			// output JSON valid.
-			final.AppendString(ent.Level.String())
-		}
-	}
-	if final.TimeKey != "" {
-		final.AddTime(final.TimeKey, ent.Time)
-	}
-	if ent.LoggerName != "" && final.NameKey != "" {
-		final.addKey(final.NameKey)
-		cur := final.buf.Len()
-		nameEncoder := final.EncodeName
-
-		// if no name encoder provided, fall back to FullNameEncoder for backwards
-		// compatibility
-		if nameEncoder == nil {
-			nameEncoder = FullNameEncoder
-		}
-
-		nameEncoder(ent.LoggerName, final)
-		if cur == final.buf.Len() {
-			// User-supplied EncodeName was a no-op. Fall back to strings to
-			// keep output JSON valid.
-			final.AppendString(ent.LoggerName)
-		}
-	}
-	if ent.Caller.Defined {
-		if final.CallerKey != "" {
-			final.addKey(final.CallerKey)
-			cur := final.buf.Len()
-			final.EncodeCaller(ent.Caller, final)
-			if cur == final.buf.Len() {
-				// User-supplied EncodeCaller was a no-op. Fall back to strings to
-				// keep output JSON valid.
-				final.AppendString(ent.Caller.String())
-			}
-		}
-		if final.FunctionKey != "" {
-			final.addKey(final.FunctionKey)
-			final.AppendString(ent.Caller.Function)
-		}
-	}
-	if final.MessageKey != "" {
-		final.addKey(enc.MessageKey)
-		final.AppendString(ent.Message)
-	}
-	if enc.buf.Len() > 0 {
-		final.addElementSeparator()
-		final.buf.Write(enc.buf.Bytes())
-	}
-	addFields(final, fields)
-	final.closeOpenNamespaces()
-	if ent.Stack != "" && final.StacktraceKey != "" {
-		final.AddString(final.StacktraceKey, ent.Stack)
-	}
-	final.buf.AppendByte('}')
-	final.buf.AppendString(final.LineEnding)
-
-	ret := final.buf
-	putJSONEncoder(final)
-	return ret, nil
-}
-
-func (enc *jsonEncoder) truncate() {
-	enc.buf.Reset()
-}
-
-func (enc *jsonEncoder) closeOpenNamespaces() {
-	for i := 0; i < enc.openNamespaces; i++ {
-		enc.buf.AppendByte('}')
-	}
-	enc.openNamespaces = 0
-}
-
-func (enc *jsonEncoder) addKey(key string) {
-	enc.addElementSeparator()
-	enc.buf.AppendByte('"')
-	enc.safeAddString(key)
-	enc.buf.AppendByte('"')
-	enc.buf.AppendByte(':')
-	if enc.spaced {
-		enc.buf.AppendByte(' ')
-	}
-}
-
-func (enc *jsonEncoder) addElementSeparator() {
-	last := enc.buf.Len() - 1
-	if last < 0 {
-		return
-	}
-	switch enc.buf.Bytes()[last] {
-	case '{', '[', ':', ',', ' ':
-		return
-	default:
-		enc.buf.AppendByte(',')
-		if enc.spaced {
-			enc.buf.AppendByte(' ')
-		}
-	}
-}
-
-func (enc *jsonEncoder) appendFloat(val float64, bitSize int) {
-	enc.addElementSeparator()
-	switch {
-	case math.IsNaN(val):
-		enc.buf.AppendString(`"NaN"`)
-	case math.IsInf(val, 1):
-		enc.buf.AppendString(`"+Inf"`)
-	case math.IsInf(val, -1):
-		enc.buf.AppendString(`"-Inf"`)
-	default:
-		enc.buf.AppendFloat(val, bitSize)
-	}
-}
-
-// safeAddString JSON-escapes a string and appends it to the internal buffer.
-// Unlike the standard library's encoder, it doesn't attempt to protect the
-// user from browser vulnerabilities or JSONP-related problems.
-func (enc *jsonEncoder) safeAddString(s string) {
-	for i := 0; i < len(s); {
-		if enc.tryAddRuneSelf(s[i]) {
-			i++
-			continue
-		}
-		r, size := utf8.DecodeRuneInString(s[i:])
-		if enc.tryAddRuneError(r, size) {
-			i++
-			continue
-		}
-		enc.buf.AppendString(s[i : i+size])
-		i += size
-	}
-}
-
-// safeAddByteString is no-alloc equivalent of safeAddString(string(s)) for s []byte.
-func (enc *jsonEncoder) safeAddByteString(s []byte) {
-	for i := 0; i < len(s); {
-		if enc.tryAddRuneSelf(s[i]) {
-			i++
-			continue
-		}
-		r, size := utf8.DecodeRune(s[i:])
-		if enc.tryAddRuneError(r, size) {
-			i++
-			continue
-		}
-		enc.buf.Write(s[i : i+size])
-		i += size
-	}
-}
-
-// tryAddRuneSelf appends b if it is valid UTF-8 character represented in a single byte.
-func (enc *jsonEncoder) tryAddRuneSelf(b byte) bool {
-	if b >= utf8.RuneSelf {
-		return false
-	}
-	if 0x20 <= b && b != '\\' && b != '"' {
-		enc.buf.AppendByte(b)
-		return true
-	}
-	switch b {
-	case '\\', '"':
-		enc.buf.AppendByte('\\')
-		enc.buf.AppendByte(b)
-	case '\n':
-		enc.buf.AppendByte('\\')
-		enc.buf.AppendByte('n')
-	case '\r':
-		enc.buf.AppendByte('\\')
-		enc.buf.AppendByte('r')
-	case '\t':
-		enc.buf.AppendByte('\\')
-		enc.buf.AppendByte('t')
-	default:
-		// Encode bytes < 0x20, except for the escape sequences above.
-		enc.buf.AppendString(`\u00`)
-		enc.buf.AppendByte(_hex[b>>4])
-		enc.buf.AppendByte(_hex[b&0xF])
-	}
-	return true
-}
-
-func (enc *jsonEncoder) tryAddRuneError(r rune, size int) bool {
-	if r == utf8.RuneError && size == 1 {
-		enc.buf.AppendString(`\ufffd`)
-		return true
-	}
-	return false
-}
diff --git a/vendor/go.uber.org/zap/zapcore/level.go b/vendor/go.uber.org/zap/zapcore/level.go
deleted file mode 100644
index 56e88dc0..00000000
--- a/vendor/go.uber.org/zap/zapcore/level.go
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-)
-
-var errUnmarshalNilLevel = errors.New("can't unmarshal a nil *Level")
-
-// A Level is a logging priority. Higher levels are more important.
-type Level int8
-
-const (
-	// DebugLevel logs are typically voluminous, and are usually disabled in
-	// production.
-	DebugLevel Level = iota - 1
-	// InfoLevel is the default logging priority.
-	InfoLevel
-	// WarnLevel logs are more important than Info, but don't need individual
-	// human review.
-	WarnLevel
-	// ErrorLevel logs are high-priority. If an application is running smoothly,
-	// it shouldn't generate any error-level logs.
-	ErrorLevel
-	// DPanicLevel logs are particularly important errors. In development the
-	// logger panics after writing the message.
-	DPanicLevel
-	// PanicLevel logs a message, then panics.
-	PanicLevel
-	// FatalLevel logs a message, then calls os.Exit(1).
-	FatalLevel
-
-	_minLevel = DebugLevel
-	_maxLevel = FatalLevel
-)
-
-// ParseLevel parses a level based on the lower-case or all-caps ASCII
-// representation of the log level. If the provided ASCII representation is
-// invalid an error is returned.
-//
-// This is particularly useful when dealing with text input to configure log
-// levels.
-func ParseLevel(text string) (Level, error) {
-	var level Level
-	err := level.UnmarshalText([]byte(text))
-	return level, err
-}
-
-// String returns a lower-case ASCII representation of the log level.
-func (l Level) String() string {
-	switch l {
-	case DebugLevel:
-		return "debug"
-	case InfoLevel:
-		return "info"
-	case WarnLevel:
-		return "warn"
-	case ErrorLevel:
-		return "error"
-	case DPanicLevel:
-		return "dpanic"
-	case PanicLevel:
-		return "panic"
-	case FatalLevel:
-		return "fatal"
-	default:
-		return fmt.Sprintf("Level(%d)", l)
-	}
-}
-
-// CapitalString returns an all-caps ASCII representation of the log level.
-func (l Level) CapitalString() string {
-	// Printing levels in all-caps is common enough that we should export this
-	// functionality.
-	switch l {
-	case DebugLevel:
-		return "DEBUG"
-	case InfoLevel:
-		return "INFO"
-	case WarnLevel:
-		return "WARN"
-	case ErrorLevel:
-		return "ERROR"
-	case DPanicLevel:
-		return "DPANIC"
-	case PanicLevel:
-		return "PANIC"
-	case FatalLevel:
-		return "FATAL"
-	default:
-		return fmt.Sprintf("LEVEL(%d)", l)
-	}
-}
-
-// MarshalText marshals the Level to text. Note that the text representation
-// drops the -Level suffix (see example).
-func (l Level) MarshalText() ([]byte, error) {
-	return []byte(l.String()), nil
-}
-
-// UnmarshalText unmarshals text to a level. Like MarshalText, UnmarshalText
-// expects the text representation of a Level to drop the -Level suffix (see
-// example).
-//
-// In particular, this makes it easy to configure logging levels using YAML,
-// TOML, or JSON files.
-func (l *Level) UnmarshalText(text []byte) error {
-	if l == nil {
-		return errUnmarshalNilLevel
-	}
-	if !l.unmarshalText(text) && !l.unmarshalText(bytes.ToLower(text)) {
-		return fmt.Errorf("unrecognized level: %q", text)
-	}
-	return nil
-}
-
-func (l *Level) unmarshalText(text []byte) bool {
-	switch string(text) {
-	case "debug", "DEBUG":
-		*l = DebugLevel
-	case "info", "INFO", "": // make the zero value useful
-		*l = InfoLevel
-	case "warn", "WARN":
-		*l = WarnLevel
-	case "error", "ERROR":
-		*l = ErrorLevel
-	case "dpanic", "DPANIC":
-		*l = DPanicLevel
-	case "panic", "PANIC":
-		*l = PanicLevel
-	case "fatal", "FATAL":
-		*l = FatalLevel
-	default:
-		return false
-	}
-	return true
-}
-
-// Set sets the level for the flag.Value interface.
-func (l *Level) Set(s string) error {
-	return l.UnmarshalText([]byte(s))
-}
-
-// Get gets the level for the flag.Getter interface.
-func (l *Level) Get() interface{} {
-	return *l
-}
-
-// Enabled returns true if the given level is at or above this level.
-func (l Level) Enabled(lvl Level) bool {
-	return lvl >= l
-}
-
-// LevelEnabler decides whether a given logging level is enabled when logging a
-// message.
-//
-// Enablers are intended to be used to implement deterministic filters;
-// concerns like sampling are better implemented as a Core.
-//
-// Each concrete Level value implements a static LevelEnabler which returns
-// true for itself and all higher logging levels. For example WarnLevel.Enabled()
-// will return true for WarnLevel, ErrorLevel, DPanicLevel, PanicLevel, and
-// FatalLevel, but return false for InfoLevel and DebugLevel.
-type LevelEnabler interface {
-	Enabled(Level) bool
-}
diff --git a/vendor/go.uber.org/zap/zapcore/level_strings.go b/vendor/go.uber.org/zap/zapcore/level_strings.go
deleted file mode 100644
index 7af8dadc..00000000
--- a/vendor/go.uber.org/zap/zapcore/level_strings.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-import "go.uber.org/zap/internal/color"
-
-var (
-	_levelToColor = map[Level]color.Color{
-		DebugLevel:  color.Magenta,
-		InfoLevel:   color.Blue,
-		WarnLevel:   color.Yellow,
-		ErrorLevel:  color.Red,
-		DPanicLevel: color.Red,
-		PanicLevel:  color.Red,
-		FatalLevel:  color.Red,
-	}
-	_unknownLevelColor = color.Red
-
-	_levelToLowercaseColorString = make(map[Level]string, len(_levelToColor))
-	_levelToCapitalColorString   = make(map[Level]string, len(_levelToColor))
-)
-
-func init() {
-	for level, color := range _levelToColor {
-		_levelToLowercaseColorString[level] = color.Add(level.String())
-		_levelToCapitalColorString[level] = color.Add(level.CapitalString())
-	}
-}
diff --git a/vendor/go.uber.org/zap/zapcore/marshaler.go b/vendor/go.uber.org/zap/zapcore/marshaler.go
deleted file mode 100644
index c3c55ba0..00000000
--- a/vendor/go.uber.org/zap/zapcore/marshaler.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-// ObjectMarshaler allows user-defined types to efficiently add themselves to the
-// logging context, and to selectively omit information which shouldn't be
-// included in logs (e.g., passwords).
-//
-// Note: ObjectMarshaler is only used when zap.Object is used or when
-// passed directly to zap.Any. It is not used when reflection-based
-// encoding is used.
-type ObjectMarshaler interface {
-	MarshalLogObject(ObjectEncoder) error
-}
-
-// ObjectMarshalerFunc is a type adapter that turns a function into an
-// ObjectMarshaler.
-type ObjectMarshalerFunc func(ObjectEncoder) error
-
-// MarshalLogObject calls the underlying function.
-func (f ObjectMarshalerFunc) MarshalLogObject(enc ObjectEncoder) error {
-	return f(enc)
-}
-
-// ArrayMarshaler allows user-defined types to efficiently add themselves to the
-// logging context, and to selectively omit information which shouldn't be
-// included in logs (e.g., passwords).
-//
-// Note: ArrayMarshaler is only used when zap.Array is used or when
-// passed directly to zap.Any. It is not used when reflection-based
-// encoding is used.
-type ArrayMarshaler interface {
-	MarshalLogArray(ArrayEncoder) error
-}
-
-// ArrayMarshalerFunc is a type adapter that turns a function into an
-// ArrayMarshaler.
-type ArrayMarshalerFunc func(ArrayEncoder) error
-
-// MarshalLogArray calls the underlying function.
-func (f ArrayMarshalerFunc) MarshalLogArray(enc ArrayEncoder) error {
-	return f(enc)
-}
diff --git a/vendor/go.uber.org/zap/zapcore/memory_encoder.go b/vendor/go.uber.org/zap/zapcore/memory_encoder.go
deleted file mode 100644
index dfead082..00000000
--- a/vendor/go.uber.org/zap/zapcore/memory_encoder.go
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-import "time"
-
-// MapObjectEncoder is an ObjectEncoder backed by a simple
-// map[string]interface{}. It's not fast enough for production use, but it's
-// helpful in tests.
-type MapObjectEncoder struct {
-	// Fields contains the entire encoded log context.
-	Fields map[string]interface{}
-	// cur is a pointer to the namespace we're currently writing to.
-	cur map[string]interface{}
-}
-
-// NewMapObjectEncoder creates a new map-backed ObjectEncoder.
-func NewMapObjectEncoder() *MapObjectEncoder {
-	m := make(map[string]interface{})
-	return &MapObjectEncoder{
-		Fields: m,
-		cur:    m,
-	}
-}
-
-// AddArray implements ObjectEncoder.
-func (m *MapObjectEncoder) AddArray(key string, v ArrayMarshaler) error {
-	arr := &sliceArrayEncoder{elems: make([]interface{}, 0)}
-	err := v.MarshalLogArray(arr)
-	m.cur[key] = arr.elems
-	return err
-}
-
-// AddObject implements ObjectEncoder.
-func (m *MapObjectEncoder) AddObject(k string, v ObjectMarshaler) error {
-	newMap := NewMapObjectEncoder()
-	m.cur[k] = newMap.Fields
-	return v.MarshalLogObject(newMap)
-}
-
-// AddBinary implements ObjectEncoder.
-func (m *MapObjectEncoder) AddBinary(k string, v []byte) { m.cur[k] = v }
-
-// AddByteString implements ObjectEncoder.
-func (m *MapObjectEncoder) AddByteString(k string, v []byte) { m.cur[k] = string(v) }
-
-// AddBool implements ObjectEncoder.
-func (m *MapObjectEncoder) AddBool(k string, v bool) { m.cur[k] = v }
-
-// AddDuration implements ObjectEncoder.
-func (m MapObjectEncoder) AddDuration(k string, v time.Duration) { m.cur[k] = v }
-
-// AddComplex128 implements ObjectEncoder.
-func (m *MapObjectEncoder) AddComplex128(k string, v complex128) { m.cur[k] = v }
-
-// AddComplex64 implements ObjectEncoder.
-func (m *MapObjectEncoder) AddComplex64(k string, v complex64) { m.cur[k] = v }
-
-// AddFloat64 implements ObjectEncoder.
-func (m *MapObjectEncoder) AddFloat64(k string, v float64) { m.cur[k] = v }
-
-// AddFloat32 implements ObjectEncoder.
-func (m *MapObjectEncoder) AddFloat32(k string, v float32) { m.cur[k] = v }
-
-// AddInt implements ObjectEncoder.
-func (m *MapObjectEncoder) AddInt(k string, v int) { m.cur[k] = v }
-
-// AddInt64 implements ObjectEncoder.
-func (m *MapObjectEncoder) AddInt64(k string, v int64) { m.cur[k] = v }
-
-// AddInt32 implements ObjectEncoder.
-func (m *MapObjectEncoder) AddInt32(k string, v int32) { m.cur[k] = v }
-
-// AddInt16 implements ObjectEncoder.
-func (m *MapObjectEncoder) AddInt16(k string, v int16) { m.cur[k] = v }
-
-// AddInt8 implements ObjectEncoder.
-func (m *MapObjectEncoder) AddInt8(k string, v int8) { m.cur[k] = v }
-
-// AddString implements ObjectEncoder.
-func (m *MapObjectEncoder) AddString(k string, v string) { m.cur[k] = v }
-
-// AddTime implements ObjectEncoder.
-func (m MapObjectEncoder) AddTime(k string, v time.Time) { m.cur[k] = v }
-
-// AddUint implements ObjectEncoder.
-func (m *MapObjectEncoder) AddUint(k string, v uint) { m.cur[k] = v }
-
-// AddUint64 implements ObjectEncoder.
-func (m *MapObjectEncoder) AddUint64(k string, v uint64) { m.cur[k] = v }
-
-// AddUint32 implements ObjectEncoder.
-func (m *MapObjectEncoder) AddUint32(k string, v uint32) { m.cur[k] = v }
-
-// AddUint16 implements ObjectEncoder.
-func (m *MapObjectEncoder) AddUint16(k string, v uint16) { m.cur[k] = v }
-
-// AddUint8 implements ObjectEncoder.
-func (m *MapObjectEncoder) AddUint8(k string, v uint8) { m.cur[k] = v }
-
-// AddUintptr implements ObjectEncoder.
-func (m *MapObjectEncoder) AddUintptr(k string, v uintptr) { m.cur[k] = v }
-
-// AddReflected implements ObjectEncoder.
-func (m *MapObjectEncoder) AddReflected(k string, v interface{}) error {
-	m.cur[k] = v
-	return nil
-}
-
-// OpenNamespace implements ObjectEncoder.
-func (m *MapObjectEncoder) OpenNamespace(k string) {
-	ns := make(map[string]interface{})
-	m.cur[k] = ns
-	m.cur = ns
-}
-
-// sliceArrayEncoder is an ArrayEncoder backed by a simple []interface{}. Like
-// the MapObjectEncoder, it's not designed for production use.
-type sliceArrayEncoder struct {
-	elems []interface{}
-}
-
-func (s *sliceArrayEncoder) AppendArray(v ArrayMarshaler) error {
-	enc := &sliceArrayEncoder{}
-	err := v.MarshalLogArray(enc)
-	s.elems = append(s.elems, enc.elems)
-	return err
-}
-
-func (s *sliceArrayEncoder) AppendObject(v ObjectMarshaler) error {
-	m := NewMapObjectEncoder()
-	err := v.MarshalLogObject(m)
-	s.elems = append(s.elems, m.Fields)
-	return err
-}
-
-func (s *sliceArrayEncoder) AppendReflected(v interface{}) error {
-	s.elems = append(s.elems, v)
-	return nil
-}
-
-func (s *sliceArrayEncoder) AppendBool(v bool)              { s.elems = append(s.elems, v) }
-func (s *sliceArrayEncoder) AppendByteString(v []byte)      { s.elems = append(s.elems, string(v)) }
-func (s *sliceArrayEncoder) AppendComplex128(v complex128)  { s.elems = append(s.elems, v) }
-func (s *sliceArrayEncoder) AppendComplex64(v complex64)    { s.elems = append(s.elems, v) }
-func (s *sliceArrayEncoder) AppendDuration(v time.Duration) { s.elems = append(s.elems, v) }
-func (s *sliceArrayEncoder) AppendFloat64(v float64)        { s.elems = append(s.elems, v) }
-func (s *sliceArrayEncoder) AppendFloat32(v float32)        { s.elems = append(s.elems, v) }
-func (s *sliceArrayEncoder) AppendInt(v int)                { s.elems = append(s.elems, v) }
-func (s *sliceArrayEncoder) AppendInt64(v int64)            { s.elems = append(s.elems, v) }
-func (s *sliceArrayEncoder) AppendInt32(v int32)            { s.elems = append(s.elems, v) }
-func (s *sliceArrayEncoder) AppendInt16(v int16)            { s.elems = append(s.elems, v) }
-func (s *sliceArrayEncoder) AppendInt8(v int8)              { s.elems = append(s.elems, v) }
-func (s *sliceArrayEncoder) AppendString(v string)          { s.elems = append(s.elems, v) }
-func (s *sliceArrayEncoder) AppendTime(v time.Time)         { s.elems = append(s.elems, v) }
-func (s *sliceArrayEncoder) AppendUint(v uint)              { s.elems = append(s.elems, v) }
-func (s *sliceArrayEncoder) AppendUint64(v uint64)          { s.elems = append(s.elems, v) }
-func (s *sliceArrayEncoder) AppendUint32(v uint32)          { s.elems = append(s.elems, v) }
-func (s *sliceArrayEncoder) AppendUint16(v uint16)          { s.elems = append(s.elems, v) }
-func (s *sliceArrayEncoder) AppendUint8(v uint8)            { s.elems = append(s.elems, v) }
-func (s *sliceArrayEncoder) AppendUintptr(v uintptr)        { s.elems = append(s.elems, v) }
diff --git a/vendor/go.uber.org/zap/zapcore/reflected_encoder.go b/vendor/go.uber.org/zap/zapcore/reflected_encoder.go
deleted file mode 100644
index 8746360e..00000000
--- a/vendor/go.uber.org/zap/zapcore/reflected_encoder.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-import (
-	"encoding/json"
-	"io"
-)
-
-// ReflectedEncoder serializes log fields that can't be serialized with Zap's
-// JSON encoder. These have the ReflectType field type.
-// Use EncoderConfig.NewReflectedEncoder to set this.
-type ReflectedEncoder interface {
-	// Encode encodes and writes to the underlying data stream.
-	Encode(interface{}) error
-}
-
-func defaultReflectedEncoder(w io.Writer) ReflectedEncoder {
-	enc := json.NewEncoder(w)
-	// For consistency with our custom JSON encoder.
-	enc.SetEscapeHTML(false)
-	return enc
-}
diff --git a/vendor/go.uber.org/zap/zapcore/sampler.go b/vendor/go.uber.org/zap/zapcore/sampler.go
deleted file mode 100644
index 8c116049..00000000
--- a/vendor/go.uber.org/zap/zapcore/sampler.go
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-import (
-	"time"
-
-	"go.uber.org/atomic"
-)
-
-const (
-	_numLevels        = _maxLevel - _minLevel + 1
-	_countersPerLevel = 4096
-)
-
-type counter struct {
-	resetAt atomic.Int64
-	counter atomic.Uint64
-}
-
-type counters [_numLevels][_countersPerLevel]counter
-
-func newCounters() *counters {
-	return &counters{}
-}
-
-func (cs *counters) get(lvl Level, key string) *counter {
-	i := lvl - _minLevel
-	j := fnv32a(key) % _countersPerLevel
-	return &cs[i][j]
-}
-
-// fnv32a, adapted from "hash/fnv", but without a []byte(string) alloc
-func fnv32a(s string) uint32 {
-	const (
-		offset32 = 2166136261
-		prime32  = 16777619
-	)
-	hash := uint32(offset32)
-	for i := 0; i < len(s); i++ {
-		hash ^= uint32(s[i])
-		hash *= prime32
-	}
-	return hash
-}
-
-func (c *counter) IncCheckReset(t time.Time, tick time.Duration) uint64 {
-	tn := t.UnixNano()
-	resetAfter := c.resetAt.Load()
-	if resetAfter > tn {
-		return c.counter.Inc()
-	}
-
-	c.counter.Store(1)
-
-	newResetAfter := tn + tick.Nanoseconds()
-	if !c.resetAt.CAS(resetAfter, newResetAfter) {
-		// We raced with another goroutine trying to reset, and it also reset
-		// the counter to 1, so we need to reincrement the counter.
-		return c.counter.Inc()
-	}
-
-	return 1
-}
-
-// SamplingDecision is a decision represented as a bit field made by sampler.
-// More decisions may be added in the future.
-type SamplingDecision uint32
-
-const (
-	// LogDropped indicates that the Sampler dropped a log entry.
-	LogDropped SamplingDecision = 1 << iota
-	// LogSampled indicates that the Sampler sampled a log entry.
-	LogSampled
-)
-
-// optionFunc wraps a func so it satisfies the SamplerOption interface.
-type optionFunc func(*sampler)
-
-func (f optionFunc) apply(s *sampler) {
-	f(s)
-}
-
-// SamplerOption configures a Sampler.
-type SamplerOption interface {
-	apply(*sampler)
-}
-
-// nopSamplingHook is the default hook used by sampler.
-func nopSamplingHook(Entry, SamplingDecision) {}
-
-// SamplerHook registers a function  which will be called when Sampler makes a
-// decision.
-//
-// This hook may be used to get visibility into the performance of the sampler.
-// For example, use it to track metrics of dropped versus sampled logs.
-//
-//  var dropped atomic.Int64
-//  zapcore.SamplerHook(func(ent zapcore.Entry, dec zapcore.SamplingDecision) {
-//    if dec&zapcore.LogDropped > 0 {
-//      dropped.Inc()
-//    }
-//  })
-func SamplerHook(hook func(entry Entry, dec SamplingDecision)) SamplerOption {
-	return optionFunc(func(s *sampler) {
-		s.hook = hook
-	})
-}
-
-// NewSamplerWithOptions creates a Core that samples incoming entries, which
-// caps the CPU and I/O load of logging while attempting to preserve a
-// representative subset of your logs.
-//
-// Zap samples by logging the first N entries with a given level and message
-// each tick. If more Entries with the same level and message are seen during
-// the same interval, every Mth message is logged and the rest are dropped.
-//
-// For example,
-//
-//   core = NewSamplerWithOptions(core, time.Second, 10, 5)
-//
-// This will log the first 10 log entries with the same level and message
-// in a one second interval as-is. Following that, it will allow through
-// every 5th log entry with the same level and message in that interval.
-//
-// If thereafter is zero, the Core will drop all log entries after the first N
-// in that interval.
-//
-// Sampler can be configured to report sampling decisions with the SamplerHook
-// option.
-//
-// Keep in mind that Zap's sampling implementation is optimized for speed over
-// absolute precision; under load, each tick may be slightly over- or
-// under-sampled.
-func NewSamplerWithOptions(core Core, tick time.Duration, first, thereafter int, opts ...SamplerOption) Core {
-	s := &sampler{
-		Core:       core,
-		tick:       tick,
-		counts:     newCounters(),
-		first:      uint64(first),
-		thereafter: uint64(thereafter),
-		hook:       nopSamplingHook,
-	}
-	for _, opt := range opts {
-		opt.apply(s)
-	}
-
-	return s
-}
-
-type sampler struct {
-	Core
-
-	counts            *counters
-	tick              time.Duration
-	first, thereafter uint64
-	hook              func(Entry, SamplingDecision)
-}
-
-// NewSampler creates a Core that samples incoming entries, which
-// caps the CPU and I/O load of logging while attempting to preserve a
-// representative subset of your logs.
-//
-// Zap samples by logging the first N entries with a given level and message
-// each tick. If more Entries with the same level and message are seen during
-// the same interval, every Mth message is logged and the rest are dropped.
-//
-// Keep in mind that zap's sampling implementation is optimized for speed over
-// absolute precision; under load, each tick may be slightly over- or
-// under-sampled.
-//
-// Deprecated: use NewSamplerWithOptions.
-func NewSampler(core Core, tick time.Duration, first, thereafter int) Core {
-	return NewSamplerWithOptions(core, tick, first, thereafter)
-}
-
-func (s *sampler) With(fields []Field) Core {
-	return &sampler{
-		Core:       s.Core.With(fields),
-		tick:       s.tick,
-		counts:     s.counts,
-		first:      s.first,
-		thereafter: s.thereafter,
-		hook:       s.hook,
-	}
-}
-
-func (s *sampler) Check(ent Entry, ce *CheckedEntry) *CheckedEntry {
-	if !s.Enabled(ent.Level) {
-		return ce
-	}
-
-	if ent.Level >= _minLevel && ent.Level <= _maxLevel {
-		counter := s.counts.get(ent.Level, ent.Message)
-		n := counter.IncCheckReset(ent.Time, s.tick)
-		if n > s.first && (s.thereafter == 0 || (n-s.first)%s.thereafter != 0) {
-			s.hook(ent, LogDropped)
-			return ce
-		}
-		s.hook(ent, LogSampled)
-	}
-	return s.Core.Check(ent, ce)
-}
diff --git a/vendor/go.uber.org/zap/zapcore/tee.go b/vendor/go.uber.org/zap/zapcore/tee.go
deleted file mode 100644
index 07a32eef..00000000
--- a/vendor/go.uber.org/zap/zapcore/tee.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-import "go.uber.org/multierr"
-
-type multiCore []Core
-
-// NewTee creates a Core that duplicates log entries into two or more
-// underlying Cores.
-//
-// Calling it with a single Core returns the input unchanged, and calling
-// it with no input returns a no-op Core.
-func NewTee(cores ...Core) Core {
-	switch len(cores) {
-	case 0:
-		return NewNopCore()
-	case 1:
-		return cores[0]
-	default:
-		return multiCore(cores)
-	}
-}
-
-func (mc multiCore) With(fields []Field) Core {
-	clone := make(multiCore, len(mc))
-	for i := range mc {
-		clone[i] = mc[i].With(fields)
-	}
-	return clone
-}
-
-func (mc multiCore) Enabled(lvl Level) bool {
-	for i := range mc {
-		if mc[i].Enabled(lvl) {
-			return true
-		}
-	}
-	return false
-}
-
-func (mc multiCore) Check(ent Entry, ce *CheckedEntry) *CheckedEntry {
-	for i := range mc {
-		ce = mc[i].Check(ent, ce)
-	}
-	return ce
-}
-
-func (mc multiCore) Write(ent Entry, fields []Field) error {
-	var err error
-	for i := range mc {
-		err = multierr.Append(err, mc[i].Write(ent, fields))
-	}
-	return err
-}
-
-func (mc multiCore) Sync() error {
-	var err error
-	for i := range mc {
-		err = multierr.Append(err, mc[i].Sync())
-	}
-	return err
-}
diff --git a/vendor/go.uber.org/zap/zapcore/write_syncer.go b/vendor/go.uber.org/zap/zapcore/write_syncer.go
deleted file mode 100644
index d4a1af3d..00000000
--- a/vendor/go.uber.org/zap/zapcore/write_syncer.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zapcore
-
-import (
-	"io"
-	"sync"
-
-	"go.uber.org/multierr"
-)
-
-// A WriteSyncer is an io.Writer that can also flush any buffered data. Note
-// that *os.File (and thus, os.Stderr and os.Stdout) implement WriteSyncer.
-type WriteSyncer interface {
-	io.Writer
-	Sync() error
-}
-
-// AddSync converts an io.Writer to a WriteSyncer. It attempts to be
-// intelligent: if the concrete type of the io.Writer implements WriteSyncer,
-// we'll use the existing Sync method. If it doesn't, we'll add a no-op Sync.
-func AddSync(w io.Writer) WriteSyncer {
-	switch w := w.(type) {
-	case WriteSyncer:
-		return w
-	default:
-		return writerWrapper{w}
-	}
-}
-
-type lockedWriteSyncer struct {
-	sync.Mutex
-	ws WriteSyncer
-}
-
-// Lock wraps a WriteSyncer in a mutex to make it safe for concurrent use. In
-// particular, *os.Files must be locked before use.
-func Lock(ws WriteSyncer) WriteSyncer {
-	if _, ok := ws.(*lockedWriteSyncer); ok {
-		// no need to layer on another lock
-		return ws
-	}
-	return &lockedWriteSyncer{ws: ws}
-}
-
-func (s *lockedWriteSyncer) Write(bs []byte) (int, error) {
-	s.Lock()
-	n, err := s.ws.Write(bs)
-	s.Unlock()
-	return n, err
-}
-
-func (s *lockedWriteSyncer) Sync() error {
-	s.Lock()
-	err := s.ws.Sync()
-	s.Unlock()
-	return err
-}
-
-type writerWrapper struct {
-	io.Writer
-}
-
-func (w writerWrapper) Sync() error {
-	return nil
-}
-
-type multiWriteSyncer []WriteSyncer
-
-// NewMultiWriteSyncer creates a WriteSyncer that duplicates its writes
-// and sync calls, much like io.MultiWriter.
-func NewMultiWriteSyncer(ws ...WriteSyncer) WriteSyncer {
-	if len(ws) == 1 {
-		return ws[0]
-	}
-	return multiWriteSyncer(ws)
-}
-
-// See https://golang.org/src/io/multi.go
-// When not all underlying syncers write the same number of bytes,
-// the smallest number is returned even though Write() is called on
-// all of them.
-func (ws multiWriteSyncer) Write(p []byte) (int, error) {
-	var writeErr error
-	nWritten := 0
-	for _, w := range ws {
-		n, err := w.Write(p)
-		writeErr = multierr.Append(writeErr, err)
-		if nWritten == 0 && n != 0 {
-			nWritten = n
-		} else if n < nWritten {
-			nWritten = n
-		}
-	}
-	return nWritten, writeErr
-}
-
-func (ws multiWriteSyncer) Sync() error {
-	var err error
-	for _, w := range ws {
-		err = multierr.Append(err, w.Sync())
-	}
-	return err
-}
diff --git a/vendor/golang.org/x/crypto/curve25519/curve25519.go b/vendor/golang.org/x/crypto/curve25519/curve25519.go
index bc62161d..00f963ea 100644
--- a/vendor/golang.org/x/crypto/curve25519/curve25519.go
+++ b/vendor/golang.org/x/crypto/curve25519/curve25519.go
@@ -5,71 +5,18 @@
 // Package curve25519 provides an implementation of the X25519 function, which
 // performs scalar multiplication on the elliptic curve known as Curve25519.
 // See RFC 7748.
+//
+// Starting in Go 1.20, this package is a wrapper for the X25519 implementation
+// in the crypto/ecdh package.
 package curve25519 // import "golang.org/x/crypto/curve25519"
 
-import (
-	"crypto/subtle"
-	"errors"
-	"strconv"
-
-	"golang.org/x/crypto/curve25519/internal/field"
-)
-
 // ScalarMult sets dst to the product scalar * point.
 //
 // Deprecated: when provided a low-order point, ScalarMult will set dst to all
 // zeroes, irrespective of the scalar. Instead, use the X25519 function, which
 // will return an error.
 func ScalarMult(dst, scalar, point *[32]byte) {
-	var e [32]byte
-
-	copy(e[:], scalar[:])
-	e[0] &= 248
-	e[31] &= 127
-	e[31] |= 64
-
-	var x1, x2, z2, x3, z3, tmp0, tmp1 field.Element
-	x1.SetBytes(point[:])
-	x2.One()
-	x3.Set(&x1)
-	z3.One()
-
-	swap := 0
-	for pos := 254; pos >= 0; pos-- {
-		b := e[pos/8] >> uint(pos&7)
-		b &= 1
-		swap ^= int(b)
-		x2.Swap(&x3, swap)
-		z2.Swap(&z3, swap)
-		swap = int(b)
-
-		tmp0.Subtract(&x3, &z3)
-		tmp1.Subtract(&x2, &z2)
-		x2.Add(&x2, &z2)
-		z2.Add(&x3, &z3)
-		z3.Multiply(&tmp0, &x2)
-		z2.Multiply(&z2, &tmp1)
-		tmp0.Square(&tmp1)
-		tmp1.Square(&x2)
-		x3.Add(&z3, &z2)
-		z2.Subtract(&z3, &z2)
-		x2.Multiply(&tmp1, &tmp0)
-		tmp1.Subtract(&tmp1, &tmp0)
-		z2.Square(&z2)
-
-		z3.Mult32(&tmp1, 121666)
-		x3.Square(&x3)
-		tmp0.Add(&tmp0, &z3)
-		z3.Multiply(&x1, &z2)
-		z2.Multiply(&tmp1, &tmp0)
-	}
-
-	x2.Swap(&x3, swap)
-	z2.Swap(&z3, swap)
-
-	z2.Invert(&z2)
-	x2.Multiply(&x2, &z2)
-	copy(dst[:], x2.Bytes())
+	scalarMult(dst, scalar, point)
 }
 
 // ScalarBaseMult sets dst to the product scalar * base where base is the
@@ -78,7 +25,7 @@ func ScalarMult(dst, scalar, point *[32]byte) {
 // It is recommended to use the X25519 function with Basepoint instead, as
 // copying into fixed size arrays can lead to unexpected bugs.
 func ScalarBaseMult(dst, scalar *[32]byte) {
-	ScalarMult(dst, scalar, &basePoint)
+	scalarBaseMult(dst, scalar)
 }
 
 const (
@@ -91,21 +38,10 @@ const (
 // Basepoint is the canonical Curve25519 generator.
 var Basepoint []byte
 
-var basePoint = [32]byte{9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+var basePoint = [32]byte{9}
 
 func init() { Basepoint = basePoint[:] }
 
-func checkBasepoint() {
-	if subtle.ConstantTimeCompare(Basepoint, []byte{
-		0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	}) != 1 {
-		panic("curve25519: global Basepoint value was modified")
-	}
-}
-
 // X25519 returns the result of the scalar multiplication (scalar * point),
 // according to RFC 7748, Section 5. scalar, point and the return value are
 // slices of 32 bytes.
@@ -121,26 +57,3 @@ func X25519(scalar, point []byte) ([]byte, error) {
 	var dst [32]byte
 	return x25519(&dst, scalar, point)
 }
-
-func x25519(dst *[32]byte, scalar, point []byte) ([]byte, error) {
-	var in [32]byte
-	if l := len(scalar); l != 32 {
-		return nil, errors.New("bad scalar length: " + strconv.Itoa(l) + ", expected 32")
-	}
-	if l := len(point); l != 32 {
-		return nil, errors.New("bad point length: " + strconv.Itoa(l) + ", expected 32")
-	}
-	copy(in[:], scalar)
-	if &point[0] == &Basepoint[0] {
-		checkBasepoint()
-		ScalarBaseMult(dst, &in)
-	} else {
-		var base, zero [32]byte
-		copy(base[:], point)
-		ScalarMult(dst, &in, &base)
-		if subtle.ConstantTimeCompare(dst[:], zero[:]) == 1 {
-			return nil, errors.New("bad input point: low order point")
-		}
-	}
-	return dst[:], nil
-}
diff --git a/vendor/golang.org/x/crypto/curve25519/curve25519_compat.go b/vendor/golang.org/x/crypto/curve25519/curve25519_compat.go
new file mode 100644
index 00000000..ba647e8d
--- /dev/null
+++ b/vendor/golang.org/x/crypto/curve25519/curve25519_compat.go
@@ -0,0 +1,105 @@
+// Copyright 2019 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.20
+
+package curve25519
+
+import (
+	"crypto/subtle"
+	"errors"
+	"strconv"
+
+	"golang.org/x/crypto/curve25519/internal/field"
+)
+
+func scalarMult(dst, scalar, point *[32]byte) {
+	var e [32]byte
+
+	copy(e[:], scalar[:])
+	e[0] &= 248
+	e[31] &= 127
+	e[31] |= 64
+
+	var x1, x2, z2, x3, z3, tmp0, tmp1 field.Element
+	x1.SetBytes(point[:])
+	x2.One()
+	x3.Set(&x1)
+	z3.One()
+
+	swap := 0
+	for pos := 254; pos >= 0; pos-- {
+		b := e[pos/8] >> uint(pos&7)
+		b &= 1
+		swap ^= int(b)
+		x2.Swap(&x3, swap)
+		z2.Swap(&z3, swap)
+		swap = int(b)
+
+		tmp0.Subtract(&x3, &z3)
+		tmp1.Subtract(&x2, &z2)
+		x2.Add(&x2, &z2)
+		z2.Add(&x3, &z3)
+		z3.Multiply(&tmp0, &x2)
+		z2.Multiply(&z2, &tmp1)
+		tmp0.Square(&tmp1)
+		tmp1.Square(&x2)
+		x3.Add(&z3, &z2)
+		z2.Subtract(&z3, &z2)
+		x2.Multiply(&tmp1, &tmp0)
+		tmp1.Subtract(&tmp1, &tmp0)
+		z2.Square(&z2)
+
+		z3.Mult32(&tmp1, 121666)
+		x3.Square(&x3)
+		tmp0.Add(&tmp0, &z3)
+		z3.Multiply(&x1, &z2)
+		z2.Multiply(&tmp1, &tmp0)
+	}
+
+	x2.Swap(&x3, swap)
+	z2.Swap(&z3, swap)
+
+	z2.Invert(&z2)
+	x2.Multiply(&x2, &z2)
+	copy(dst[:], x2.Bytes())
+}
+
+func scalarBaseMult(dst, scalar *[32]byte) {
+	checkBasepoint()
+	scalarMult(dst, scalar, &basePoint)
+}
+
+func x25519(dst *[32]byte, scalar, point []byte) ([]byte, error) {
+	var in [32]byte
+	if l := len(scalar); l != 32 {
+		return nil, errors.New("bad scalar length: " + strconv.Itoa(l) + ", expected 32")
+	}
+	if l := len(point); l != 32 {
+		return nil, errors.New("bad point length: " + strconv.Itoa(l) + ", expected 32")
+	}
+	copy(in[:], scalar)
+	if &point[0] == &Basepoint[0] {
+		scalarBaseMult(dst, &in)
+	} else {
+		var base, zero [32]byte
+		copy(base[:], point)
+		scalarMult(dst, &in, &base)
+		if subtle.ConstantTimeCompare(dst[:], zero[:]) == 1 {
+			return nil, errors.New("bad input point: low order point")
+		}
+	}
+	return dst[:], nil
+}
+
+func checkBasepoint() {
+	if subtle.ConstantTimeCompare(Basepoint, []byte{
+		0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	}) != 1 {
+		panic("curve25519: global Basepoint value was modified")
+	}
+}
diff --git a/vendor/golang.org/x/crypto/curve25519/curve25519_go120.go b/vendor/golang.org/x/crypto/curve25519/curve25519_go120.go
new file mode 100644
index 00000000..627df497
--- /dev/null
+++ b/vendor/golang.org/x/crypto/curve25519/curve25519_go120.go
@@ -0,0 +1,46 @@
+// 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.
+
+//go:build go1.20
+
+package curve25519
+
+import "crypto/ecdh"
+
+func x25519(dst *[32]byte, scalar, point []byte) ([]byte, error) {
+	curve := ecdh.X25519()
+	pub, err := curve.NewPublicKey(point)
+	if err != nil {
+		return nil, err
+	}
+	priv, err := curve.NewPrivateKey(scalar)
+	if err != nil {
+		return nil, err
+	}
+	out, err := priv.ECDH(pub)
+	if err != nil {
+		return nil, err
+	}
+	copy(dst[:], out)
+	return dst[:], nil
+}
+
+func scalarMult(dst, scalar, point *[32]byte) {
+	if _, err := x25519(dst, scalar[:], point[:]); err != nil {
+		// The only error condition for x25519 when the inputs are 32 bytes long
+		// is if the output would have been the all-zero value.
+		for i := range dst {
+			dst[i] = 0
+		}
+	}
+}
+
+func scalarBaseMult(dst, scalar *[32]byte) {
+	curve := ecdh.X25519()
+	priv, err := curve.NewPrivateKey(scalar[:])
+	if err != nil {
+		panic("curve25519: internal error: scalarBaseMult was not 32 bytes")
+	}
+	copy(dst[:], priv.PublicKey().Bytes())
+}
diff --git a/vendor/golang.org/x/crypto/ssh/cipher.go b/vendor/golang.org/x/crypto/ssh/cipher.go
index 87f48552..741e984f 100644
--- a/vendor/golang.org/x/crypto/ssh/cipher.go
+++ b/vendor/golang.org/x/crypto/ssh/cipher.go
@@ -114,7 +114,8 @@ var cipherModes = map[string]*cipherMode{
 	"arcfour": {16, 0, streamCipherMode(0, newRC4)},
 
 	// AEAD ciphers
-	gcmCipherID:        {16, 12, newGCMCipher},
+	gcm128CipherID:     {16, 12, newGCMCipher},
+	gcm256CipherID:     {32, 12, newGCMCipher},
 	chacha20Poly1305ID: {64, 0, newChaCha20Cipher},
 
 	// CBC mode is insecure and so is not included in the default config.
diff --git a/vendor/golang.org/x/crypto/ssh/common.go b/vendor/golang.org/x/crypto/ssh/common.go
index c7964275..b419c761 100644
--- a/vendor/golang.org/x/crypto/ssh/common.go
+++ b/vendor/golang.org/x/crypto/ssh/common.go
@@ -28,7 +28,7 @@ const (
 // supportedCiphers lists ciphers we support but might not recommend.
 var supportedCiphers = []string{
 	"aes128-ctr", "aes192-ctr", "aes256-ctr",
-	"aes128-gcm@openssh.com",
+	"aes128-gcm@openssh.com", gcm256CipherID,
 	chacha20Poly1305ID,
 	"arcfour256", "arcfour128", "arcfour",
 	aes128cbcID,
@@ -37,7 +37,7 @@ var supportedCiphers = []string{
 
 // preferredCiphers specifies the default preference for ciphers.
 var preferredCiphers = []string{
-	"aes128-gcm@openssh.com",
+	"aes128-gcm@openssh.com", gcm256CipherID,
 	chacha20Poly1305ID,
 	"aes128-ctr", "aes192-ctr", "aes256-ctr",
 }
@@ -49,7 +49,8 @@ var supportedKexAlgos = []string{
 	// P384 and P521 are not constant-time yet, but since we don't
 	// reuse ephemeral keys, using them for ECDH should be OK.
 	kexAlgoECDH256, kexAlgoECDH384, kexAlgoECDH521,
-	kexAlgoDH14SHA256, kexAlgoDH14SHA1, kexAlgoDH1SHA1,
+	kexAlgoDH14SHA256, kexAlgoDH16SHA512, kexAlgoDH14SHA1,
+	kexAlgoDH1SHA1,
 }
 
 // serverForbiddenKexAlgos contains key exchange algorithms, that are forbidden
@@ -59,8 +60,9 @@ var serverForbiddenKexAlgos = map[string]struct{}{
 	kexAlgoDHGEXSHA256: {}, // server half implementation is only minimal to satisfy the automated tests
 }
 
-// preferredKexAlgos specifies the default preference for key-exchange algorithms
-// in preference order.
+// preferredKexAlgos specifies the default preference for key-exchange
+// algorithms in preference order. The diffie-hellman-group16-sha512 algorithm
+// is disabled by default because it is a bit slower than the others.
 var preferredKexAlgos = []string{
 	kexAlgoCurve25519SHA256, kexAlgoCurve25519SHA256LibSSH,
 	kexAlgoECDH256, kexAlgoECDH384, kexAlgoECDH521,
@@ -70,12 +72,12 @@ var preferredKexAlgos = []string{
 // supportedHostKeyAlgos specifies the supported host-key algorithms (i.e. methods
 // of authenticating servers) in preference order.
 var supportedHostKeyAlgos = []string{
-	CertAlgoRSASHA512v01, CertAlgoRSASHA256v01,
+	CertAlgoRSASHA256v01, CertAlgoRSASHA512v01,
 	CertAlgoRSAv01, CertAlgoDSAv01, CertAlgoECDSA256v01,
 	CertAlgoECDSA384v01, CertAlgoECDSA521v01, CertAlgoED25519v01,
 
 	KeyAlgoECDSA256, KeyAlgoECDSA384, KeyAlgoECDSA521,
-	KeyAlgoRSASHA512, KeyAlgoRSASHA256,
+	KeyAlgoRSASHA256, KeyAlgoRSASHA512,
 	KeyAlgoRSA, KeyAlgoDSA,
 
 	KeyAlgoED25519,
@@ -85,7 +87,7 @@ var supportedHostKeyAlgos = []string{
 // This is based on RFC 4253, section 6.4, but with hmac-md5 variants removed
 // because they have reached the end of their useful life.
 var supportedMACs = []string{
-	"hmac-sha2-256-etm@openssh.com", "hmac-sha2-256", "hmac-sha1", "hmac-sha1-96",
+	"hmac-sha2-256-etm@openssh.com", "hmac-sha2-512-etm@openssh.com", "hmac-sha2-256", "hmac-sha2-512", "hmac-sha1", "hmac-sha1-96",
 }
 
 var supportedCompressions = []string{compressionNone}
@@ -119,6 +121,13 @@ func algorithmsForKeyFormat(keyFormat string) []string {
 	}
 }
 
+// isRSA returns whether algo is a supported RSA algorithm, including certificate
+// algorithms.
+func isRSA(algo string) bool {
+	algos := algorithmsForKeyFormat(KeyAlgoRSA)
+	return contains(algos, underlyingAlgo(algo))
+}
+
 // supportedPubKeyAuthAlgos specifies the supported client public key
 // authentication algorithms. Note that this doesn't include certificate types
 // since those use the underlying algorithm. This list is sent to the client if
@@ -168,7 +177,7 @@ func (a *directionAlgorithms) rekeyBytes() int64 {
 	// 2^(BLOCKSIZE/4) blocks. For all AES flavors BLOCKSIZE is
 	// 128.
 	switch a.Cipher {
-	case "aes128-ctr", "aes192-ctr", "aes256-ctr", gcmCipherID, aes128cbcID:
+	case "aes128-ctr", "aes192-ctr", "aes256-ctr", gcm128CipherID, gcm256CipherID, aes128cbcID:
 		return 16 * (1 << 32)
 
 	}
@@ -178,7 +187,8 @@ func (a *directionAlgorithms) rekeyBytes() int64 {
 }
 
 var aeadCiphers = map[string]bool{
-	gcmCipherID:        true,
+	gcm128CipherID:     true,
+	gcm256CipherID:     true,
 	chacha20Poly1305ID: true,
 }
 
@@ -261,16 +271,16 @@ type Config struct {
 	// unspecified, a size suitable for the chosen cipher is used.
 	RekeyThreshold uint64
 
-	// The allowed key exchanges algorithms. If unspecified then a
-	// default set of algorithms is used.
+	// The allowed key exchanges algorithms. If unspecified then a default set
+	// of algorithms is used. Unsupported values are silently ignored.
 	KeyExchanges []string
 
-	// The allowed cipher algorithms. If unspecified then a sensible
-	// default is used.
+	// The allowed cipher algorithms. If unspecified then a sensible default is
+	// used. Unsupported values are silently ignored.
 	Ciphers []string
 
-	// The allowed MAC algorithms. If unspecified then a sensible default
-	// is used.
+	// The allowed MAC algorithms. If unspecified then a sensible default is
+	// used. Unsupported values are silently ignored.
 	MACs []string
 }
 
@@ -287,7 +297,7 @@ func (c *Config) SetDefaults() {
 	var ciphers []string
 	for _, c := range c.Ciphers {
 		if cipherModes[c] != nil {
-			// reject the cipher if we have no cipherModes definition
+			// Ignore the cipher if we have no cipherModes definition.
 			ciphers = append(ciphers, c)
 		}
 	}
@@ -296,10 +306,26 @@ func (c *Config) SetDefaults() {
 	if c.KeyExchanges == nil {
 		c.KeyExchanges = preferredKexAlgos
 	}
+	var kexs []string
+	for _, k := range c.KeyExchanges {
+		if kexAlgoMap[k] != nil {
+			// Ignore the KEX if we have no kexAlgoMap definition.
+			kexs = append(kexs, k)
+		}
+	}
+	c.KeyExchanges = kexs
 
 	if c.MACs == nil {
 		c.MACs = supportedMACs
 	}
+	var macs []string
+	for _, m := range c.MACs {
+		if macModes[m] != nil {
+			// Ignore the MAC if we have no macModes definition.
+			macs = append(macs, m)
+		}
+	}
+	c.MACs = macs
 
 	if c.RekeyThreshold == 0 {
 		// cipher specific default
diff --git a/vendor/golang.org/x/crypto/ssh/connection.go b/vendor/golang.org/x/crypto/ssh/connection.go
index 35661a52..8f345ee9 100644
--- a/vendor/golang.org/x/crypto/ssh/connection.go
+++ b/vendor/golang.org/x/crypto/ssh/connection.go
@@ -97,7 +97,7 @@ func (c *connection) Close() error {
 	return c.sshConn.conn.Close()
 }
 
-// sshconn provides net.Conn metadata, but disallows direct reads and
+// sshConn provides net.Conn metadata, but disallows direct reads and
 // writes.
 type sshConn struct {
 	conn net.Conn
diff --git a/vendor/golang.org/x/crypto/ssh/kex.go b/vendor/golang.org/x/crypto/ssh/kex.go
index 927a90cd..8a05f799 100644
--- a/vendor/golang.org/x/crypto/ssh/kex.go
+++ b/vendor/golang.org/x/crypto/ssh/kex.go
@@ -23,6 +23,7 @@ const (
 	kexAlgoDH1SHA1                = "diffie-hellman-group1-sha1"
 	kexAlgoDH14SHA1               = "diffie-hellman-group14-sha1"
 	kexAlgoDH14SHA256             = "diffie-hellman-group14-sha256"
+	kexAlgoDH16SHA512             = "diffie-hellman-group16-sha512"
 	kexAlgoECDH256                = "ecdh-sha2-nistp256"
 	kexAlgoECDH384                = "ecdh-sha2-nistp384"
 	kexAlgoECDH521                = "ecdh-sha2-nistp521"
@@ -430,6 +431,17 @@ func init() {
 		hashFunc: crypto.SHA256,
 	}
 
+	// This is the group called diffie-hellman-group16-sha512 in RFC
+	// 8268 and Oakley Group 16 in RFC 3526.
+	p, _ = new(big.Int).SetString("FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199FFFFFFFFFFFFFFFF", 16)
+
+	kexAlgoMap[kexAlgoDH16SHA512] = &dhGroup{
+		g:        new(big.Int).SetInt64(2),
+		p:        p,
+		pMinus1:  new(big.Int).Sub(p, bigOne),
+		hashFunc: crypto.SHA512,
+	}
+
 	kexAlgoMap[kexAlgoECDH521] = &ecdh{elliptic.P521()}
 	kexAlgoMap[kexAlgoECDH384] = &ecdh{elliptic.P384()}
 	kexAlgoMap[kexAlgoECDH256] = &ecdh{elliptic.P256()}
diff --git a/vendor/golang.org/x/crypto/ssh/keys.go b/vendor/golang.org/x/crypto/ssh/keys.go
index 72969804..dac8ee72 100644
--- a/vendor/golang.org/x/crypto/ssh/keys.go
+++ b/vendor/golang.org/x/crypto/ssh/keys.go
@@ -1087,9 +1087,9 @@ func (*PassphraseMissingError) Error() string {
 	return "ssh: this private key is passphrase protected"
 }
 
-// ParseRawPrivateKey returns a private key from a PEM encoded private key. It
-// supports RSA (PKCS#1), PKCS#8, DSA (OpenSSL), and ECDSA private keys. If the
-// private key is encrypted, it will return a PassphraseMissingError.
+// ParseRawPrivateKey returns a private key from a PEM encoded private key. It supports
+// RSA, DSA, ECDSA, and Ed25519 private keys in PKCS#1, PKCS#8, OpenSSL, and OpenSSH
+// formats. If the private key is encrypted, it will return a PassphraseMissingError.
 func ParseRawPrivateKey(pemBytes []byte) (interface{}, error) {
 	block, _ := pem.Decode(pemBytes)
 	if block == nil {
diff --git a/vendor/golang.org/x/crypto/ssh/mac.go b/vendor/golang.org/x/crypto/ssh/mac.go
index c07a0628..06a1b275 100644
--- a/vendor/golang.org/x/crypto/ssh/mac.go
+++ b/vendor/golang.org/x/crypto/ssh/mac.go
@@ -10,6 +10,7 @@ import (
 	"crypto/hmac"
 	"crypto/sha1"
 	"crypto/sha256"
+	"crypto/sha512"
 	"hash"
 )
 
@@ -46,9 +47,15 @@ func (t truncatingMAC) Size() int {
 func (t truncatingMAC) BlockSize() int { return t.hmac.BlockSize() }
 
 var macModes = map[string]*macMode{
+	"hmac-sha2-512-etm@openssh.com": {64, true, func(key []byte) hash.Hash {
+		return hmac.New(sha512.New, key)
+	}},
 	"hmac-sha2-256-etm@openssh.com": {32, true, func(key []byte) hash.Hash {
 		return hmac.New(sha256.New, key)
 	}},
+	"hmac-sha2-512": {64, false, func(key []byte) hash.Hash {
+		return hmac.New(sha512.New, key)
+	}},
 	"hmac-sha2-256": {32, false, func(key []byte) hash.Hash {
 		return hmac.New(sha256.New, key)
 	}},
diff --git a/vendor/golang.org/x/crypto/ssh/server.go b/vendor/golang.org/x/crypto/ssh/server.go
index 9e387029..b21322af 100644
--- a/vendor/golang.org/x/crypto/ssh/server.go
+++ b/vendor/golang.org/x/crypto/ssh/server.go
@@ -370,6 +370,25 @@ func gssExchangeToken(gssapiConfig *GSSAPIWithMICConfig, firstToken []byte, s *c
 	return authErr, perms, nil
 }
 
+// isAlgoCompatible checks if the signature format is compatible with the
+// selected algorithm taking into account edge cases that occur with old
+// clients.
+func isAlgoCompatible(algo, sigFormat string) bool {
+	// Compatibility for old clients.
+	//
+	// For certificate authentication with OpenSSH 7.2-7.7 signature format can
+	// be rsa-sha2-256 or rsa-sha2-512 for the algorithm
+	// ssh-rsa-cert-v01@openssh.com.
+	//
+	// With gpg-agent < 2.2.6 the algorithm can be rsa-sha2-256 or rsa-sha2-512
+	// for signature format ssh-rsa.
+	if isRSA(algo) && isRSA(sigFormat) {
+		return true
+	}
+	// Standard case: the underlying algorithm must match the signature format.
+	return underlyingAlgo(algo) == sigFormat
+}
+
 // ServerAuthError represents server authentication errors and is
 // sometimes returned by NewServerConn. It appends any authentication
 // errors that may occur, and is returned if all of the authentication
@@ -567,7 +586,7 @@ userAuthLoop:
 					authErr = fmt.Errorf("ssh: algorithm %q not accepted", sig.Format)
 					break
 				}
-				if underlyingAlgo(algo) != sig.Format {
+				if !isAlgoCompatible(algo, sig.Format) {
 					authErr = fmt.Errorf("ssh: signature %q not compatible with selected algorithm %q", sig.Format, algo)
 					break
 				}
diff --git a/vendor/golang.org/x/crypto/ssh/transport.go b/vendor/golang.org/x/crypto/ssh/transport.go
index acf5a21b..da015801 100644
--- a/vendor/golang.org/x/crypto/ssh/transport.go
+++ b/vendor/golang.org/x/crypto/ssh/transport.go
@@ -17,7 +17,8 @@ import (
 const debugTransport = false
 
 const (
-	gcmCipherID    = "aes128-gcm@openssh.com"
+	gcm128CipherID = "aes128-gcm@openssh.com"
+	gcm256CipherID = "aes256-gcm@openssh.com"
 	aes128cbcID    = "aes128-cbc"
 	tripledescbcID = "3des-cbc"
 )
diff --git a/vendor/golang.org/x/net/html/doc.go b/vendor/golang.org/x/net/html/doc.go
index 7a96eae3..2466ae3d 100644
--- a/vendor/golang.org/x/net/html/doc.go
+++ b/vendor/golang.org/x/net/html/doc.go
@@ -99,14 +99,20 @@ 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.
+This package provides both a tokenizer and a parser, which implement the
+tokenization, and tokenization and tree construction stages of the WHATWG HTML
+parsing specification respectively. While the tokenizer parses and normalizes
+individual HTML tokens, only the parser constructs the DOM tree from the
+tokenized HTML, as described in the tree construction stage of the
+specification, dynamically modifying or extending the docuemnt's DOM tree.
 
-If your use case requires semantically well-formed HTML, as defined by the
-WHATWG specifiction, the parser should be used rather than the tokenizer.
+If your use case requires semantically well-formed HTML documents, as defined by
+the WHATWG specification, the parser should be used rather than the tokenizer.
+
+In security contexts, if trust decisions are being made using the tokenized or
+parsed content, the input must be re-serialized (for instance by using Render or
+Token.String) in order for those trust decisions to hold, as the process of
+tokenization or parsing may alter the content.
 */
 package html // import "golang.org/x/net/html"
 
diff --git a/vendor/golang.org/x/net/html/render.go b/vendor/golang.org/x/net/html/render.go
index 8b280319..e8c12334 100644
--- a/vendor/golang.org/x/net/html/render.go
+++ b/vendor/golang.org/x/net/html/render.go
@@ -194,9 +194,8 @@ func render1(w writer, n *Node) error {
 		}
 	}
 
-	// Render any child nodes.
-	switch n.Data {
-	case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "xmp":
+	// Render any child nodes
+	if childTextNodesAreLiteral(n) {
 		for c := n.FirstChild; c != nil; c = c.NextSibling {
 			if c.Type == TextNode {
 				if _, err := w.WriteString(c.Data); err != nil {
@@ -213,7 +212,7 @@ func render1(w writer, n *Node) error {
 			// last element in the file, with no closing tag.
 			return plaintextAbort
 		}
-	default:
+	} else {
 		for c := n.FirstChild; c != nil; c = c.NextSibling {
 			if err := render1(w, c); err != nil {
 				return err
@@ -231,6 +230,27 @@ func render1(w writer, n *Node) error {
 	return w.WriteByte('>')
 }
 
+func childTextNodesAreLiteral(n *Node) bool {
+	// Per WHATWG HTML 13.3, if the parent of the current node is a style,
+	// script, xmp, iframe, noembed, noframes, or plaintext element, and the
+	// current node is a text node, append the value of the node's data
+	// literally. The specification is not explicit about it, but we only
+	// enforce this if we are in the HTML namespace (i.e. when the namespace is
+	// "").
+	// NOTE: we also always include noscript elements, although the
+	// specification states that they should only be rendered as such if
+	// scripting is enabled for the node (which is not something we track).
+	if n.Namespace != "" {
+		return false
+	}
+	switch n.Data {
+	case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "xmp":
+		return true
+	default:
+		return false
+	}
+}
+
 // writeQuoted writes s to w surrounded by quotes. Normally it will use double
 // quotes, but if s contains a double quote, it will use single quotes.
 // It is used for writing the identifiers in a doctype declaration.
diff --git a/vendor/golang.org/x/net/html/token.go b/vendor/golang.org/x/net/html/token.go
index 5c2a1f4e..de67f938 100644
--- a/vendor/golang.org/x/net/html/token.go
+++ b/vendor/golang.org/x/net/html/token.go
@@ -913,7 +913,14 @@ func (z *Tokenizer) readTagAttrKey() {
 		case ' ', '\n', '\r', '\t', '\f', '/':
 			z.pendingAttr[0].end = z.raw.end - 1
 			return
-		case '=', '>':
+		case '=':
+			if z.pendingAttr[0].start+1 == z.raw.end {
+				// WHATWG 13.2.5.32, if we see an equals sign before the attribute name
+				// begins, we treat it as a character in the attribute name and continue.
+				continue
+			}
+			fallthrough
+		case '>':
 			z.raw.end--
 			z.pendingAttr[0].end = z.raw.end
 			return
diff --git a/vendor/golang.org/x/net/http2/h2c/h2c.go b/vendor/golang.org/x/net/http2/h2c/h2c.go
index a72bbed1..2d6bf861 100644
--- a/vendor/golang.org/x/net/http2/h2c/h2c.go
+++ b/vendor/golang.org/x/net/http2/h2c/h2c.go
@@ -44,7 +44,7 @@ func init() {
 // HTTP/1, but unlikely to occur in practice and (2) Upgrading from HTTP/1 to
 // h2c - this works by using the HTTP/1 Upgrade header to request an upgrade to
 // h2c. When either of those situations occur we hijack the HTTP/1 connection,
-// convert it to a HTTP/2 connection and pass the net.Conn to http2.ServeConn.
+// convert it to an HTTP/2 connection and pass the net.Conn to http2.ServeConn.
 type h2cHandler struct {
 	Handler http.Handler
 	s       *http2.Server
diff --git a/vendor/golang.org/x/net/http2/pipe.go b/vendor/golang.org/x/net/http2/pipe.go
index c15b8a77..684d984f 100644
--- a/vendor/golang.org/x/net/http2/pipe.go
+++ b/vendor/golang.org/x/net/http2/pipe.go
@@ -88,13 +88,9 @@ func (p *pipe) Write(d []byte) (n int, err error) {
 		p.c.L = &p.mu
 	}
 	defer p.c.Signal()
-	if p.err != nil {
+	if p.err != nil || p.breakErr != nil {
 		return 0, errClosedPipeWrite
 	}
-	if p.breakErr != nil {
-		p.unread += len(d)
-		return len(d), nil // discard when there is no reader
-	}
 	return p.b.Write(d)
 }
 
diff --git a/vendor/golang.org/x/net/http2/server.go b/vendor/golang.org/x/net/http2/server.go
index 8cb14f3c..033b6e6d 100644
--- a/vendor/golang.org/x/net/http2/server.go
+++ b/vendor/golang.org/x/net/http2/server.go
@@ -441,7 +441,7 @@ func (s *Server) ServeConn(c net.Conn, opts *ServeConnOpts) {
 	if s.NewWriteScheduler != nil {
 		sc.writeSched = s.NewWriteScheduler()
 	} else {
-		sc.writeSched = NewPriorityWriteScheduler(nil)
+		sc.writeSched = newRoundRobinWriteScheduler()
 	}
 
 	// These start at the RFC-specified defaults. If there is a higher
@@ -1822,15 +1822,18 @@ func (sc *serverConn) processData(f *DataFrame) error {
 		}
 
 		if len(data) > 0 {
+			st.bodyBytes += int64(len(data))
 			wrote, err := st.body.Write(data)
 			if err != nil {
+				// The handler has closed the request body.
+				// Return the connection-level flow control for the discarded data,
+				// but not the stream-level flow control.
 				sc.sendWindowUpdate(nil, int(f.Length)-wrote)
-				return sc.countError("body_write_err", streamError(id, ErrCodeStreamClosed))
+				return nil
 			}
 			if wrote != len(data) {
 				panic("internal error: bad Writer")
 			}
-			st.bodyBytes += int64(len(data))
 		}
 
 		// Return any padded flow control now, since we won't
@@ -2426,7 +2429,7 @@ type requestBody struct {
 	conn          *serverConn
 	closeOnce     sync.Once // for use by Close only
 	sawEOF        bool      // for use by Read only
-	pipe          *pipe     // non-nil if we have a HTTP entity message body
+	pipe          *pipe     // non-nil if we have an HTTP entity message body
 	needsContinue bool      // need to send a 100-continue
 }
 
@@ -2566,7 +2569,8 @@ func (rws *responseWriterState) writeChunk(p []byte) (n int, err error) {
 				clen = ""
 			}
 		}
-		if clen == "" && rws.handlerDone && bodyAllowedForStatus(rws.status) && (len(p) > 0 || !isHeadResp) {
+		_, hasContentLength := rws.snapHeader["Content-Length"]
+		if !hasContentLength && clen == "" && rws.handlerDone && bodyAllowedForStatus(rws.status) && (len(p) > 0 || !isHeadResp) {
 			clen = strconv.Itoa(len(p))
 		}
 		_, hasContentType := rws.snapHeader["Content-Type"]
@@ -2771,7 +2775,7 @@ func (w *responseWriter) FlushError() error {
 		err = rws.bw.Flush()
 	} else {
 		// The bufio.Writer won't call chunkWriter.Write
-		// (writeChunk with zero bytes, so we have to do it
+		// (writeChunk with zero bytes), so we have to do it
 		// ourselves to force the HTTP response header and/or
 		// final DATA frame (with END_STREAM) to be sent.
 		_, err = chunkWriter{rws}.Write(nil)
diff --git a/vendor/golang.org/x/net/http2/transport.go b/vendor/golang.org/x/net/http2/transport.go
index 05ba23d3..b0d482f9 100644
--- a/vendor/golang.org/x/net/http2/transport.go
+++ b/vendor/golang.org/x/net/http2/transport.go
@@ -19,6 +19,7 @@ import (
 	"io/fs"
 	"log"
 	"math"
+	"math/bits"
 	mathrand "math/rand"
 	"net"
 	"net/http"
@@ -518,11 +519,14 @@ func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
 func authorityAddr(scheme string, authority string) (addr string) {
 	host, port, err := net.SplitHostPort(authority)
 	if err != nil { // authority didn't have a port
+		host = authority
+		port = ""
+	}
+	if port == "" { // authority's port was empty
 		port = "443"
 		if scheme == "http" {
 			port = "80"
 		}
-		host = authority
 	}
 	if a, err := idna.ToASCII(host); err == nil {
 		host = a
@@ -560,10 +564,11 @@ func (t *Transport) RoundTripOpt(req *http.Request, opt RoundTripOpt) (*http.Res
 		traceGotConn(req, cc, reused)
 		res, err := cc.RoundTrip(req)
 		if err != nil && retry <= 6 {
+			roundTripErr := err
 			if req, err = shouldRetryRequest(req, err); err == nil {
 				// After the first retry, do exponential backoff with 10% jitter.
 				if retry == 0 {
-					t.vlogf("RoundTrip retrying after failure: %v", err)
+					t.vlogf("RoundTrip retrying after failure: %v", roundTripErr)
 					continue
 				}
 				backoff := float64(uint(1) << (uint(retry) - 1))
@@ -572,7 +577,7 @@ func (t *Transport) RoundTripOpt(req *http.Request, opt RoundTripOpt) (*http.Res
 				timer := backoffNewTimer(d)
 				select {
 				case <-timer.C:
-					t.vlogf("RoundTrip retrying after failure: %v", err)
+					t.vlogf("RoundTrip retrying after failure: %v", roundTripErr)
 					continue
 				case <-req.Context().Done():
 					timer.Stop()
@@ -1265,6 +1270,29 @@ func (cc *ClientConn) RoundTrip(req *http.Request) (*http.Response, error) {
 		return res, nil
 	}
 
+	cancelRequest := func(cs *clientStream, err error) error {
+		cs.cc.mu.Lock()
+		bodyClosed := cs.reqBodyClosed
+		cs.cc.mu.Unlock()
+		// Wait for the request body to be closed.
+		//
+		// If nothing closed the body before now, abortStreamLocked
+		// will have started a goroutine to close it.
+		//
+		// Closing the body before returning avoids a race condition
+		// with net/http checking its readTrackingBody to see if the
+		// body was read from or closed. See golang/go#60041.
+		//
+		// The body is closed in a separate goroutine without the
+		// connection mutex held, but dropping the mutex before waiting
+		// will keep us from holding it indefinitely if the body
+		// close is slow for some reason.
+		if bodyClosed != nil {
+			<-bodyClosed
+		}
+		return err
+	}
+
 	for {
 		select {
 		case <-cs.respHeaderRecv:
@@ -1284,10 +1312,10 @@ func (cc *ClientConn) RoundTrip(req *http.Request) (*http.Response, error) {
 		case <-ctx.Done():
 			err := ctx.Err()
 			cs.abortStream(err)
-			return nil, err
+			return nil, cancelRequest(cs, err)
 		case <-cs.reqCancel:
 			cs.abortStream(errRequestCanceled)
-			return nil, errRequestCanceled
+			return nil, cancelRequest(cs, errRequestCanceled)
 		}
 	}
 }
@@ -1653,7 +1681,27 @@ func (cs *clientStream) frameScratchBufferLen(maxFrameSize int) int {
 	return int(n) // doesn't truncate; max is 512K
 }
 
-var bufPool sync.Pool // of *[]byte
+// Seven bufPools manage different frame sizes. This helps to avoid scenarios where long-running
+// streaming requests using small frame sizes occupy large buffers initially allocated for prior
+// requests needing big buffers. The size ranges are as follows:
+// {0 KB, 16 KB], {16 KB, 32 KB], {32 KB, 64 KB], {64 KB, 128 KB], {128 KB, 256 KB],
+// {256 KB, 512 KB], {512 KB, infinity}
+// In practice, the maximum scratch buffer size should not exceed 512 KB due to
+// frameScratchBufferLen(maxFrameSize), thus the "infinity pool" should never be used.
+// It exists mainly as a safety measure, for potential future increases in max buffer size.
+var bufPools [7]sync.Pool // of *[]byte
+func bufPoolIndex(size int) int {
+	if size <= 16384 {
+		return 0
+	}
+	size -= 1
+	bits := bits.Len(uint(size))
+	index := bits - 14
+	if index >= len(bufPools) {
+		return len(bufPools) - 1
+	}
+	return index
+}
 
 func (cs *clientStream) writeRequestBody(req *http.Request) (err error) {
 	cc := cs.cc
@@ -1671,12 +1719,13 @@ func (cs *clientStream) writeRequestBody(req *http.Request) (err error) {
 	// Scratch buffer for reading into & writing from.
 	scratchLen := cs.frameScratchBufferLen(maxFrameSize)
 	var buf []byte
-	if bp, ok := bufPool.Get().(*[]byte); ok && len(*bp) >= scratchLen {
-		defer bufPool.Put(bp)
+	index := bufPoolIndex(scratchLen)
+	if bp, ok := bufPools[index].Get().(*[]byte); ok && len(*bp) >= scratchLen {
+		defer bufPools[index].Put(bp)
 		buf = *bp
 	} else {
 		buf = make([]byte, scratchLen)
-		defer bufPool.Put(&buf)
+		defer bufPools[index].Put(&buf)
 	}
 
 	var sawEOF bool
@@ -1844,6 +1893,9 @@ func (cc *ClientConn) encodeHeaders(req *http.Request, addGzipHeader bool, trail
 	if err != nil {
 		return nil, err
 	}
+	if !httpguts.ValidHostHeader(host) {
+		return nil, errors.New("http2: invalid Host header")
+	}
 
 	var path string
 	if req.Method != "CONNECT" {
@@ -1880,7 +1932,7 @@ func (cc *ClientConn) encodeHeaders(req *http.Request, addGzipHeader bool, trail
 		// 8.1.2.3 Request Pseudo-Header Fields
 		// The :path pseudo-header field includes the path and query parts of the
 		// target URI (the path-absolute production and optionally a '?' character
-		// followed by the query production (see Sections 3.3 and 3.4 of
+		// followed by the query production, see Sections 3.3 and 3.4 of
 		// [RFC3986]).
 		f(":authority", host)
 		m := req.Method
@@ -2555,6 +2607,9 @@ func (b transportResponseBody) Close() error {
 	cs := b.cs
 	cc := cs.cc
 
+	cs.bufPipe.BreakWithError(errClosedResponseBody)
+	cs.abortStream(errClosedResponseBody)
+
 	unread := cs.bufPipe.Len()
 	if unread > 0 {
 		cc.mu.Lock()
@@ -2573,9 +2628,6 @@ func (b transportResponseBody) Close() error {
 		cc.wmu.Unlock()
 	}
 
-	cs.bufPipe.BreakWithError(errClosedResponseBody)
-	cs.abortStream(errClosedResponseBody)
-
 	select {
 	case <-cs.donec:
 	case <-cs.ctx.Done():
diff --git a/vendor/golang.org/x/net/http2/writesched.go b/vendor/golang.org/x/net/http2/writesched.go
index c7cd0017..cc893adc 100644
--- a/vendor/golang.org/x/net/http2/writesched.go
+++ b/vendor/golang.org/x/net/http2/writesched.go
@@ -184,7 +184,8 @@ func (wr *FrameWriteRequest) replyToWriter(err error) {
 
 // writeQueue is used by implementations of WriteScheduler.
 type writeQueue struct {
-	s []FrameWriteRequest
+	s          []FrameWriteRequest
+	prev, next *writeQueue
 }
 
 func (q *writeQueue) empty() bool { return len(q.s) == 0 }
diff --git a/vendor/golang.org/x/net/http2/writesched_roundrobin.go b/vendor/golang.org/x/net/http2/writesched_roundrobin.go
new file mode 100644
index 00000000..54fe8632
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/writesched_roundrobin.go
@@ -0,0 +1,119 @@
+// 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 http2
+
+import (
+	"fmt"
+	"math"
+)
+
+type roundRobinWriteScheduler struct {
+	// control contains control frames (SETTINGS, PING, etc.).
+	control writeQueue
+
+	// streams maps stream ID to a queue.
+	streams map[uint32]*writeQueue
+
+	// stream queues are stored in a circular linked list.
+	// head is the next stream to write, or nil if there are no streams open.
+	head *writeQueue
+
+	// pool of empty queues for reuse.
+	queuePool writeQueuePool
+}
+
+// newRoundRobinWriteScheduler constructs a new write scheduler.
+// The round robin scheduler priorizes control frames
+// like SETTINGS and PING over DATA frames.
+// When there are no control frames to send, it performs a round-robin
+// selection from the ready streams.
+func newRoundRobinWriteScheduler() WriteScheduler {
+	ws := &roundRobinWriteScheduler{
+		streams: make(map[uint32]*writeQueue),
+	}
+	return ws
+}
+
+func (ws *roundRobinWriteScheduler) OpenStream(streamID uint32, options OpenStreamOptions) {
+	if ws.streams[streamID] != nil {
+		panic(fmt.Errorf("stream %d already opened", streamID))
+	}
+	q := ws.queuePool.get()
+	ws.streams[streamID] = q
+	if ws.head == nil {
+		ws.head = q
+		q.next = q
+		q.prev = q
+	} else {
+		// Queues are stored in a ring.
+		// Insert the new stream before ws.head, putting it at the end of the list.
+		q.prev = ws.head.prev
+		q.next = ws.head
+		q.prev.next = q
+		q.next.prev = q
+	}
+}
+
+func (ws *roundRobinWriteScheduler) CloseStream(streamID uint32) {
+	q := ws.streams[streamID]
+	if q == nil {
+		return
+	}
+	if q.next == q {
+		// This was the only open stream.
+		ws.head = nil
+	} else {
+		q.prev.next = q.next
+		q.next.prev = q.prev
+		if ws.head == q {
+			ws.head = q.next
+		}
+	}
+	delete(ws.streams, streamID)
+	ws.queuePool.put(q)
+}
+
+func (ws *roundRobinWriteScheduler) AdjustStream(streamID uint32, priority PriorityParam) {}
+
+func (ws *roundRobinWriteScheduler) Push(wr FrameWriteRequest) {
+	if wr.isControl() {
+		ws.control.push(wr)
+		return
+	}
+	q := ws.streams[wr.StreamID()]
+	if q == nil {
+		// This is a closed stream.
+		// wr should not be a HEADERS or DATA frame.
+		// We push the request onto the control queue.
+		if wr.DataSize() > 0 {
+			panic("add DATA on non-open stream")
+		}
+		ws.control.push(wr)
+		return
+	}
+	q.push(wr)
+}
+
+func (ws *roundRobinWriteScheduler) Pop() (FrameWriteRequest, bool) {
+	// Control and RST_STREAM frames first.
+	if !ws.control.empty() {
+		return ws.control.shift(), true
+	}
+	if ws.head == nil {
+		return FrameWriteRequest{}, false
+	}
+	q := ws.head
+	for {
+		if wr, ok := q.consume(math.MaxInt32); ok {
+			ws.head = q.next
+			return wr, true
+		}
+		q = q.next
+		if q == ws.head {
+			break
+		}
+	}
+	return FrameWriteRequest{}, false
+}
diff --git a/vendor/golang.org/x/net/idna/idna9.0.0.go b/vendor/golang.org/x/net/idna/idna9.0.0.go
index aae6aac8..ee1698ce 100644
--- a/vendor/golang.org/x/net/idna/idna9.0.0.go
+++ b/vendor/golang.org/x/net/idna/idna9.0.0.go
@@ -121,7 +121,7 @@ func CheckJoiners(enable bool) Option {
 	}
 }
 
-// StrictDomainName limits the set of permissable ASCII characters to those
+// StrictDomainName limits the set of permissible ASCII characters to those
 // allowed in domain names as defined in RFC 1034 (A-Z, a-z, 0-9 and the
 // hyphen). This is set by default for MapForLookup and ValidateForRegistration,
 // but is only useful if ValidateLabels is set.
diff --git a/vendor/golang.org/x/net/idna/tables13.0.0.go b/vendor/golang.org/x/net/idna/tables13.0.0.go
index 390c5e56..66701ead 100644
--- a/vendor/golang.org/x/net/idna/tables13.0.0.go
+++ b/vendor/golang.org/x/net/idna/tables13.0.0.go
@@ -1,151 +1,294 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
-//go:build go1.16
-// +build go1.16
+//go:build go1.16 && !go1.21
+// +build go1.16,!go1.21
 
 package idna
 
 // UnicodeVersion is the Unicode version from which the tables in this package are derived.
 const UnicodeVersion = "13.0.0"
 
-var mappings string = "" + // Size: 8188 bytes
-	"\x00\x01 \x03 ̈\x01a\x03 ̄\x012\x013\x03 ́\x03 ̧\x011\x01o\x051⁄4\x051⁄2" +
-	"\x053⁄4\x03i̇\x03l·\x03ʼn\x01s\x03dž\x03ⱥ\x03ⱦ\x01h\x01j\x01r\x01w\x01y" +
-	"\x03 ̆\x03 ̇\x03 ̊\x03 ̨\x03 ̃\x03 ̋\x01l\x01x\x04̈́\x03 ι\x01;\x05 ̈́" +
-	"\x04եւ\x04اٴ\x04وٴ\x04ۇٴ\x04يٴ\x06क़\x06ख़\x06ग़\x06ज़\x06ड़\x06ढ़\x06फ़" +
-	"\x06य़\x06ড়\x06ঢ়\x06য়\x06ਲ਼\x06ਸ਼\x06ਖ਼\x06ਗ਼\x06ਜ਼\x06ਫ਼\x06ଡ଼\x06ଢ଼" +
-	"\x06ํา\x06ໍາ\x06ຫນ\x06ຫມ\x06གྷ\x06ཌྷ\x06དྷ\x06བྷ\x06ཛྷ\x06ཀྵ\x06ཱི\x06ཱུ" +
-	"\x06ྲྀ\x09ྲཱྀ\x06ླྀ\x09ླཱྀ\x06ཱྀ\x06ྒྷ\x06ྜྷ\x06ྡྷ\x06ྦྷ\x06ྫྷ\x06ྐྵ\x02" +
-	"в\x02д\x02о\x02с\x02т\x02ъ\x02ѣ\x02æ\x01b\x01d\x01e\x02ǝ\x01g\x01i\x01k" +
-	"\x01m\x01n\x02ȣ\x01p\x01t\x01u\x02ɐ\x02ɑ\x02ə\x02ɛ\x02ɜ\x02ŋ\x02ɔ\x02ɯ" +
-	"\x01v\x02β\x02γ\x02δ\x02φ\x02χ\x02ρ\x02н\x02ɒ\x01c\x02ɕ\x02ð\x01f\x02ɟ" +
-	"\x02ɡ\x02ɥ\x02ɨ\x02ɩ\x02ɪ\x02ʝ\x02ɭ\x02ʟ\x02ɱ\x02ɰ\x02ɲ\x02ɳ\x02ɴ\x02ɵ" +
-	"\x02ɸ\x02ʂ\x02ʃ\x02ƫ\x02ʉ\x02ʊ\x02ʋ\x02ʌ\x01z\x02ʐ\x02ʑ\x02ʒ\x02θ\x02ss" +
-	"\x02ά\x02έ\x02ή\x02ί\x02ό\x02ύ\x02ώ\x05ἀι\x05ἁι\x05ἂι\x05ἃι\x05ἄι\x05ἅι" +
-	"\x05ἆι\x05ἇι\x05ἠι\x05ἡι\x05ἢι\x05ἣι\x05ἤι\x05ἥι\x05ἦι\x05ἧι\x05ὠι\x05ὡι" +
-	"\x05ὢι\x05ὣι\x05ὤι\x05ὥι\x05ὦι\x05ὧι\x05ὰι\x04αι\x04άι\x05ᾶι\x02ι\x05 ̈͂" +
-	"\x05ὴι\x04ηι\x04ήι\x05ῆι\x05 ̓̀\x05 ̓́\x05 ̓͂\x02ΐ\x05 ̔̀\x05 ̔́\x05 ̔͂" +
-	"\x02ΰ\x05 ̈̀\x01`\x05ὼι\x04ωι\x04ώι\x05ῶι\x06′′\x09′′′\x06‵‵\x09‵‵‵\x02!" +
-	"!\x02??\x02?!\x02!?\x0c′′′′\x010\x014\x015\x016\x017\x018\x019\x01+\x01=" +
-	"\x01(\x01)\x02rs\x02ħ\x02no\x01q\x02sm\x02tm\x02ω\x02å\x02א\x02ב\x02ג" +
-	"\x02ד\x02π\x051⁄7\x051⁄9\x061⁄10\x051⁄3\x052⁄3\x051⁄5\x052⁄5\x053⁄5\x054" +
-	"⁄5\x051⁄6\x055⁄6\x051⁄8\x053⁄8\x055⁄8\x057⁄8\x041⁄\x02ii\x02iv\x02vi" +
-	"\x04viii\x02ix\x02xi\x050⁄3\x06∫∫\x09∫∫∫\x06∮∮\x09∮∮∮\x0210\x0211\x0212" +
-	"\x0213\x0214\x0215\x0216\x0217\x0218\x0219\x0220\x04(10)\x04(11)\x04(12)" +
-	"\x04(13)\x04(14)\x04(15)\x04(16)\x04(17)\x04(18)\x04(19)\x04(20)\x0c∫∫∫∫" +
-	"\x02==\x05⫝̸\x02ɫ\x02ɽ\x02ȿ\x02ɀ\x01.\x04 ゙\x04 ゚\x06より\x06コト\x05(ᄀ)\x05" +
-	"(ᄂ)\x05(ᄃ)\x05(ᄅ)\x05(ᄆ)\x05(ᄇ)\x05(ᄉ)\x05(ᄋ)\x05(ᄌ)\x05(ᄎ)\x05(ᄏ)\x05(ᄐ" +
-	")\x05(ᄑ)\x05(ᄒ)\x05(가)\x05(나)\x05(다)\x05(라)\x05(마)\x05(바)\x05(사)\x05(아)" +
-	"\x05(자)\x05(차)\x05(카)\x05(타)\x05(파)\x05(하)\x05(주)\x08(오전)\x08(오후)\x05(一)" +
-	"\x05(二)\x05(三)\x05(四)\x05(五)\x05(六)\x05(七)\x05(八)\x05(九)\x05(十)\x05(月)" +
-	"\x05(火)\x05(水)\x05(木)\x05(金)\x05(土)\x05(日)\x05(株)\x05(有)\x05(社)\x05(名)" +
-	"\x05(特)\x05(財)\x05(祝)\x05(労)\x05(代)\x05(呼)\x05(学)\x05(監)\x05(企)\x05(資)" +
-	"\x05(協)\x05(祭)\x05(休)\x05(自)\x05(至)\x0221\x0222\x0223\x0224\x0225\x0226" +
-	"\x0227\x0228\x0229\x0230\x0231\x0232\x0233\x0234\x0235\x06참고\x06주의\x0236" +
-	"\x0237\x0238\x0239\x0240\x0241\x0242\x0243\x0244\x0245\x0246\x0247\x0248" +
-	"\x0249\x0250\x041月\x042月\x043月\x044月\x045月\x046月\x047月\x048月\x049月\x0510" +
-	"月\x0511月\x0512月\x02hg\x02ev\x06令和\x0cアパート\x0cアルファ\x0cアンペア\x09アール\x0cイニ" +
-	"ング\x09インチ\x09ウォン\x0fエスクード\x0cエーカー\x09オンス\x09オーム\x09カイリ\x0cカラット\x0cカロリー" +
-	"\x09ガロン\x09ガンマ\x06ギガ\x09ギニー\x0cキュリー\x0cギルダー\x06キロ\x0fキログラム\x12キロメートル\x0f" +
-	"キロワット\x09グラム\x0fグラムトン\x0fクルゼイロ\x0cクローネ\x09ケース\x09コルナ\x09コーポ\x0cサイクル" +
-	"\x0fサンチーム\x0cシリング\x09センチ\x09セント\x09ダース\x06デシ\x06ドル\x06トン\x06ナノ\x09ノット" +
-	"\x09ハイツ\x0fパーセント\x09パーツ\x0cバーレル\x0fピアストル\x09ピクル\x06ピコ\x06ビル\x0fファラッド\x0c" +
-	"フィート\x0fブッシェル\x09フラン\x0fヘクタール\x06ペソ\x09ペニヒ\x09ヘルツ\x09ペンス\x09ページ\x09ベータ" +
-	"\x0cポイント\x09ボルト\x06ホン\x09ポンド\x09ホール\x09ホーン\x0cマイクロ\x09マイル\x09マッハ\x09マルク" +
-	"\x0fマンション\x0cミクロン\x06ミリ\x0fミリバール\x06メガ\x0cメガトン\x0cメートル\x09ヤード\x09ヤール\x09" +
-	"ユアン\x0cリットル\x06リラ\x09ルピー\x0cルーブル\x06レム\x0fレントゲン\x09ワット\x040点\x041点\x04" +
-	"2点\x043点\x044点\x045点\x046点\x047点\x048点\x049点\x0510点\x0511点\x0512点\x0513点" +
-	"\x0514点\x0515点\x0516点\x0517点\x0518点\x0519点\x0520点\x0521点\x0522点\x0523点" +
-	"\x0524点\x02da\x02au\x02ov\x02pc\x02dm\x02iu\x06平成\x06昭和\x06大正\x06明治\x0c株" +
-	"式会社\x02pa\x02na\x02ma\x02ka\x02kb\x02mb\x02gb\x04kcal\x02pf\x02nf\x02m" +
-	"g\x02kg\x02hz\x02ml\x02dl\x02kl\x02fm\x02nm\x02mm\x02cm\x02km\x02m2\x02m" +
-	"3\x05m∕s\x06m∕s2\x07rad∕s\x08rad∕s2\x02ps\x02ns\x02ms\x02pv\x02nv\x02mv" +
-	"\x02kv\x02pw\x02nw\x02mw\x02kw\x02bq\x02cc\x02cd\x06c∕kg\x02db\x02gy\x02" +
-	"ha\x02hp\x02in\x02kk\x02kt\x02lm\x02ln\x02lx\x02ph\x02pr\x02sr\x02sv\x02" +
-	"wb\x05v∕m\x05a∕m\x041日\x042日\x043日\x044日\x045日\x046日\x047日\x048日\x049日" +
-	"\x0510日\x0511日\x0512日\x0513日\x0514日\x0515日\x0516日\x0517日\x0518日\x0519日" +
-	"\x0520日\x0521日\x0522日\x0523日\x0524日\x0525日\x0526日\x0527日\x0528日\x0529日" +
-	"\x0530日\x0531日\x02ь\x02ɦ\x02ɬ\x02ʞ\x02ʇ\x02œ\x02ʍ\x04𤋮\x04𢡊\x04𢡄\x04𣏕" +
-	"\x04𥉉\x04𥳐\x04𧻓\x02ff\x02fi\x02fl\x02st\x04մն\x04մե\x04մի\x04վն\x04մխ" +
-	"\x04יִ\x04ײַ\x02ע\x02ה\x02כ\x02ל\x02ם\x02ר\x02ת\x04שׁ\x04שׂ\x06שּׁ\x06שּ" +
-	"ׂ\x04אַ\x04אָ\x04אּ\x04בּ\x04גּ\x04דּ\x04הּ\x04וּ\x04זּ\x04טּ\x04יּ\x04" +
-	"ךּ\x04כּ\x04לּ\x04מּ\x04נּ\x04סּ\x04ףּ\x04פּ\x04צּ\x04קּ\x04רּ\x04שּ" +
-	"\x04תּ\x04וֹ\x04בֿ\x04כֿ\x04פֿ\x04אל\x02ٱ\x02ٻ\x02پ\x02ڀ\x02ٺ\x02ٿ\x02ٹ" +
-	"\x02ڤ\x02ڦ\x02ڄ\x02ڃ\x02چ\x02ڇ\x02ڍ\x02ڌ\x02ڎ\x02ڈ\x02ژ\x02ڑ\x02ک\x02گ" +
-	"\x02ڳ\x02ڱ\x02ں\x02ڻ\x02ۀ\x02ہ\x02ھ\x02ے\x02ۓ\x02ڭ\x02ۇ\x02ۆ\x02ۈ\x02ۋ" +
-	"\x02ۅ\x02ۉ\x02ې\x02ى\x04ئا\x04ئە\x04ئو\x04ئۇ\x04ئۆ\x04ئۈ\x04ئې\x04ئى\x02" +
-	"ی\x04ئج\x04ئح\x04ئم\x04ئي\x04بج\x04بح\x04بخ\x04بم\x04بى\x04بي\x04تج\x04" +
-	"تح\x04تخ\x04تم\x04تى\x04تي\x04ثج\x04ثم\x04ثى\x04ثي\x04جح\x04جم\x04حج" +
-	"\x04حم\x04خج\x04خح\x04خم\x04سج\x04سح\x04سخ\x04سم\x04صح\x04صم\x04ضج\x04ضح" +
-	"\x04ضخ\x04ضم\x04طح\x04طم\x04ظم\x04عج\x04عم\x04غج\x04غم\x04فج\x04فح\x04فخ" +
-	"\x04فم\x04فى\x04في\x04قح\x04قم\x04قى\x04قي\x04كا\x04كج\x04كح\x04كخ\x04كل" +
-	"\x04كم\x04كى\x04كي\x04لج\x04لح\x04لخ\x04لم\x04لى\x04لي\x04مج\x04مح\x04مخ" +
-	"\x04مم\x04مى\x04مي\x04نج\x04نح\x04نخ\x04نم\x04نى\x04ني\x04هج\x04هم\x04هى" +
-	"\x04هي\x04يج\x04يح\x04يخ\x04يم\x04يى\x04يي\x04ذٰ\x04رٰ\x04ىٰ\x05 ٌّ\x05 " +
-	"ٍّ\x05 َّ\x05 ُّ\x05 ِّ\x05 ّٰ\x04ئر\x04ئز\x04ئن\x04بر\x04بز\x04بن\x04ت" +
-	"ر\x04تز\x04تن\x04ثر\x04ثز\x04ثن\x04ما\x04نر\x04نز\x04نن\x04ير\x04يز\x04" +
-	"ين\x04ئخ\x04ئه\x04به\x04ته\x04صخ\x04له\x04نه\x04هٰ\x04يه\x04ثه\x04سه" +
-	"\x04شم\x04شه\x06ـَّ\x06ـُّ\x06ـِّ\x04طى\x04طي\x04عى\x04عي\x04غى\x04غي" +
-	"\x04سى\x04سي\x04شى\x04شي\x04حى\x04حي\x04جى\x04جي\x04خى\x04خي\x04صى\x04صي" +
-	"\x04ضى\x04ضي\x04شج\x04شح\x04شخ\x04شر\x04سر\x04صر\x04ضر\x04اً\x06تجم\x06ت" +
-	"حج\x06تحم\x06تخم\x06تمج\x06تمح\x06تمخ\x06جمح\x06حمي\x06حمى\x06سحج\x06سج" +
-	"ح\x06سجى\x06سمح\x06سمج\x06سمم\x06صحح\x06صمم\x06شحم\x06شجي\x06شمخ\x06شمم" +
-	"\x06ضحى\x06ضخم\x06طمح\x06طمم\x06طمي\x06عجم\x06عمم\x06عمى\x06غمم\x06غمي" +
-	"\x06غمى\x06فخم\x06قمح\x06قمم\x06لحم\x06لحي\x06لحى\x06لجج\x06لخم\x06لمح" +
-	"\x06محج\x06محم\x06محي\x06مجح\x06مجم\x06مخج\x06مخم\x06مجخ\x06همج\x06همم" +
-	"\x06نحم\x06نحى\x06نجم\x06نجى\x06نمي\x06نمى\x06يمم\x06بخي\x06تجي\x06تجى" +
-	"\x06تخي\x06تخى\x06تمي\x06تمى\x06جمي\x06جحى\x06جمى\x06سخى\x06صحي\x06شحي" +
-	"\x06ضحي\x06لجي\x06لمي\x06يحي\x06يجي\x06يمي\x06ممي\x06قمي\x06نحي\x06عمي" +
-	"\x06كمي\x06نجح\x06مخي\x06لجم\x06كمم\x06جحي\x06حجي\x06مجي\x06فمي\x06بحي" +
-	"\x06سخي\x06نجي\x06صلے\x06قلے\x08الله\x08اكبر\x08محمد\x08صلعم\x08رسول\x08" +
-	"عليه\x08وسلم\x06صلى!صلى الله عليه وسلم\x0fجل جلاله\x08ریال\x01,\x01:" +
-	"\x01!\x01?\x01_\x01{\x01}\x01[\x01]\x01#\x01&\x01*\x01-\x01<\x01>\x01\\" +
-	"\x01$\x01%\x01@\x04ـً\x04ـَ\x04ـُ\x04ـِ\x04ـّ\x04ـْ\x02ء\x02آ\x02أ\x02ؤ" +
-	"\x02إ\x02ئ\x02ا\x02ب\x02ة\x02ت\x02ث\x02ج\x02ح\x02خ\x02د\x02ذ\x02ر\x02ز" +
-	"\x02س\x02ش\x02ص\x02ض\x02ط\x02ظ\x02ع\x02غ\x02ف\x02ق\x02ك\x02ل\x02م\x02ن" +
-	"\x02ه\x02و\x02ي\x04لآ\x04لأ\x04لإ\x04لا\x01\x22\x01'\x01/\x01^\x01|\x01~" +
-	"\x02¢\x02£\x02¬\x02¦\x02¥\x08𝅗𝅥\x08𝅘𝅥\x0c𝅘𝅥𝅮\x0c𝅘𝅥𝅯\x0c𝅘𝅥𝅰\x0c𝅘𝅥𝅱\x0c𝅘𝅥𝅲" +
-	"\x08𝆹𝅥\x08𝆺𝅥\x0c𝆹𝅥𝅮\x0c𝆺𝅥𝅮\x0c𝆹𝅥𝅯\x0c𝆺𝅥𝅯\x02ı\x02ȷ\x02α\x02ε\x02ζ\x02η" +
-	"\x02κ\x02λ\x02μ\x02ν\x02ξ\x02ο\x02σ\x02τ\x02υ\x02ψ\x03∇\x03∂\x02ϝ\x02ٮ" +
-	"\x02ڡ\x02ٯ\x020,\x021,\x022,\x023,\x024,\x025,\x026,\x027,\x028,\x029," +
-	"\x03(a)\x03(b)\x03(c)\x03(d)\x03(e)\x03(f)\x03(g)\x03(h)\x03(i)\x03(j)" +
-	"\x03(k)\x03(l)\x03(m)\x03(n)\x03(o)\x03(p)\x03(q)\x03(r)\x03(s)\x03(t)" +
-	"\x03(u)\x03(v)\x03(w)\x03(x)\x03(y)\x03(z)\x07〔s〕\x02wz\x02hv\x02sd\x03p" +
-	"pv\x02wc\x02mc\x02md\x02mr\x02dj\x06ほか\x06ココ\x03サ\x03手\x03字\x03双\x03デ" +
-	"\x03二\x03多\x03解\x03天\x03交\x03映\x03無\x03料\x03前\x03後\x03再\x03新\x03初\x03終" +
-	"\x03生\x03販\x03声\x03吹\x03演\x03投\x03捕\x03一\x03三\x03遊\x03左\x03中\x03右\x03指" +
-	"\x03走\x03打\x03禁\x03空\x03合\x03満\x03有\x03月\x03申\x03割\x03営\x03配\x09〔本〕\x09〔" +
-	"三〕\x09〔二〕\x09〔安〕\x09〔点〕\x09〔打〕\x09〔盗〕\x09〔勝〕\x09〔敗〕\x03得\x03可\x03丽\x03" +
-	"丸\x03乁\x03你\x03侮\x03侻\x03倂\x03偺\x03備\x03僧\x03像\x03㒞\x03免\x03兔\x03兤\x03" +
-	"具\x03㒹\x03內\x03冗\x03冤\x03仌\x03冬\x03况\x03凵\x03刃\x03㓟\x03刻\x03剆\x03剷\x03" +
-	"㔕\x03勇\x03勉\x03勤\x03勺\x03包\x03匆\x03北\x03卉\x03卑\x03博\x03即\x03卽\x03卿\x03" +
-	"灰\x03及\x03叟\x03叫\x03叱\x03吆\x03咞\x03吸\x03呈\x03周\x03咢\x03哶\x03唐\x03啓\x03" +
-	"啣\x03善\x03喙\x03喫\x03喳\x03嗂\x03圖\x03嘆\x03圗\x03噑\x03噴\x03切\x03壮\x03城\x03" +
-	"埴\x03堍\x03型\x03堲\x03報\x03墬\x03売\x03壷\x03夆\x03夢\x03奢\x03姬\x03娛\x03娧\x03" +
-	"姘\x03婦\x03㛮\x03嬈\x03嬾\x03寃\x03寘\x03寧\x03寳\x03寿\x03将\x03尢\x03㞁\x03屠\x03" +
-	"屮\x03峀\x03岍\x03嵃\x03嵮\x03嵫\x03嵼\x03巡\x03巢\x03㠯\x03巽\x03帨\x03帽\x03幩\x03" +
-	"㡢\x03㡼\x03庰\x03庳\x03庶\x03廊\x03廾\x03舁\x03弢\x03㣇\x03形\x03彫\x03㣣\x03徚\x03" +
-	"忍\x03志\x03忹\x03悁\x03㤺\x03㤜\x03悔\x03惇\x03慈\x03慌\x03慎\x03慺\x03憎\x03憲\x03" +
-	"憤\x03憯\x03懞\x03懲\x03懶\x03成\x03戛\x03扝\x03抱\x03拔\x03捐\x03挽\x03拼\x03捨\x03" +
-	"掃\x03揤\x03搢\x03揅\x03掩\x03㨮\x03摩\x03摾\x03撝\x03摷\x03㩬\x03敏\x03敬\x03旣\x03" +
-	"書\x03晉\x03㬙\x03暑\x03㬈\x03㫤\x03冒\x03冕\x03最\x03暜\x03肭\x03䏙\x03朗\x03望\x03" +
-	"朡\x03杞\x03杓\x03㭉\x03柺\x03枅\x03桒\x03梅\x03梎\x03栟\x03椔\x03㮝\x03楂\x03榣\x03" +
-	"槪\x03檨\x03櫛\x03㰘\x03次\x03歔\x03㱎\x03歲\x03殟\x03殺\x03殻\x03汎\x03沿\x03泍\x03" +
-	"汧\x03洖\x03派\x03海\x03流\x03浩\x03浸\x03涅\x03洴\x03港\x03湮\x03㴳\x03滋\x03滇\x03" +
-	"淹\x03潮\x03濆\x03瀹\x03瀞\x03瀛\x03㶖\x03灊\x03災\x03灷\x03炭\x03煅\x03熜\x03爨\x03" +
-	"爵\x03牐\x03犀\x03犕\x03獺\x03王\x03㺬\x03玥\x03㺸\x03瑇\x03瑜\x03瑱\x03璅\x03瓊\x03" +
-	"㼛\x03甤\x03甾\x03異\x03瘐\x03㿼\x03䀈\x03直\x03眞\x03真\x03睊\x03䀹\x03瞋\x03䁆\x03" +
-	"䂖\x03硎\x03碌\x03磌\x03䃣\x03祖\x03福\x03秫\x03䄯\x03穀\x03穊\x03穏\x03䈂\x03篆\x03" +
-	"築\x03䈧\x03糒\x03䊠\x03糨\x03糣\x03紀\x03絣\x03䌁\x03緇\x03縂\x03繅\x03䌴\x03䍙\x03" +
-	"罺\x03羕\x03翺\x03者\x03聠\x03聰\x03䏕\x03育\x03脃\x03䐋\x03脾\x03媵\x03舄\x03辞\x03" +
-	"䑫\x03芑\x03芋\x03芝\x03劳\x03花\x03芳\x03芽\x03苦\x03若\x03茝\x03荣\x03莭\x03茣\x03" +
-	"莽\x03菧\x03著\x03荓\x03菊\x03菌\x03菜\x03䔫\x03蓱\x03蓳\x03蔖\x03蕤\x03䕝\x03䕡\x03" +
-	"䕫\x03虐\x03虜\x03虧\x03虩\x03蚩\x03蚈\x03蜎\x03蛢\x03蝹\x03蜨\x03蝫\x03螆\x03蟡\x03" +
-	"蠁\x03䗹\x03衠\x03衣\x03裗\x03裞\x03䘵\x03裺\x03㒻\x03䚾\x03䛇\x03誠\x03諭\x03變\x03" +
-	"豕\x03貫\x03賁\x03贛\x03起\x03跋\x03趼\x03跰\x03軔\x03輸\x03邔\x03郱\x03鄑\x03鄛\x03" +
-	"鈸\x03鋗\x03鋘\x03鉼\x03鏹\x03鐕\x03開\x03䦕\x03閷\x03䧦\x03雃\x03嶲\x03霣\x03䩮\x03" +
-	"䩶\x03韠\x03䪲\x03頋\x03頩\x03飢\x03䬳\x03餩\x03馧\x03駂\x03駾\x03䯎\x03鬒\x03鱀\x03" +
-	"鳽\x03䳎\x03䳭\x03鵧\x03䳸\x03麻\x03䵖\x03黹\x03黾\x03鼅\x03鼏\x03鼖\x03鼻"
+var mappings string = "" + // Size: 6539 bytes
+	"  ̈a ̄23 ́ ̧1o1⁄41⁄23⁄4i̇l·ʼnsdžⱥⱦhjrwy ̆ ̇ ̊ ̨ ̃ ̋lẍ́ ι; ̈́եւاٴوٴۇٴيٴक" +
+	"़ख़ग़ज़ड़ढ़फ़य़ড়ঢ়য়ਲ਼ਸ਼ਖ਼ਗ਼ਜ਼ਫ਼ଡ଼ଢ଼ําໍາຫນຫມགྷཌྷདྷབྷཛྷཀྵཱཱིུྲྀྲཱྀླྀླཱ" +
+	"ཱྀྀྒྷྜྷྡྷྦྷྫྷྐྵвдостъѣæbdeǝgikmnȣptuɐɑəɛɜŋɔɯvβγδφχρнɒcɕðfɟɡɥɨɩɪʝɭʟɱɰɲɳ" +
+	"ɴɵɸʂʃƫʉʊʋʌzʐʑʒθssάέήίόύώἀιἁιἂιἃιἄιἅιἆιἇιἠιἡιἢιἣιἤιἥιἦιἧιὠιὡιὢιὣιὤιὥιὦιὧ" +
+	"ιὰιαιάιᾶιι ̈͂ὴιηιήιῆι ̓̀ ̓́ ̓͂ΐ ̔̀ ̔́ ̔͂ΰ ̈̀`ὼιωιώιῶι′′′′′‵‵‵‵‵!!???!!?" +
+	"′′′′0456789+=()rsħnoqsmtmωåאבגדπ1⁄71⁄91⁄101⁄32⁄31⁄52⁄53⁄54⁄51⁄65⁄61⁄83" +
+	"⁄85⁄87⁄81⁄iiivviviiiixxi0⁄3∫∫∫∫∫∮∮∮∮∮1011121314151617181920(10)(11)(12" +
+	")(13)(14)(15)(16)(17)(18)(19)(20)∫∫∫∫==⫝̸ɫɽȿɀ. ゙ ゚よりコト(ᄀ)(ᄂ)(ᄃ)(ᄅ)(ᄆ)(ᄇ)" +
+	"(ᄉ)(ᄋ)(ᄌ)(ᄎ)(ᄏ)(ᄐ)(ᄑ)(ᄒ)(가)(나)(다)(라)(마)(바)(사)(아)(자)(차)(카)(타)(파)(하)(주)(오전" +
+	")(오후)(一)(二)(三)(四)(五)(六)(七)(八)(九)(十)(月)(火)(水)(木)(金)(土)(日)(株)(有)(社)(名)(特)(" +
+	"財)(祝)(労)(代)(呼)(学)(監)(企)(資)(協)(祭)(休)(自)(至)21222324252627282930313233343" +
+	"5참고주의3637383940414243444546474849501月2月3月4月5月6月7月8月9月10月11月12月hgev令和アパート" +
+	"アルファアンペアアールイニングインチウォンエスクードエーカーオンスオームカイリカラットカロリーガロンガンマギガギニーキュリーギルダーキロキロ" +
+	"グラムキロメートルキロワットグラムグラムトンクルゼイロクローネケースコルナコーポサイクルサンチームシリングセンチセントダースデシドルトンナノ" +
+	"ノットハイツパーセントパーツバーレルピアストルピクルピコビルファラッドフィートブッシェルフランヘクタールペソペニヒヘルツペンスページベータポ" +
+	"イントボルトホンポンドホールホーンマイクロマイルマッハマルクマンションミクロンミリミリバールメガメガトンメートルヤードヤールユアンリットルリ" +
+	"ラルピールーブルレムレントゲンワット0点1点2点3点4点5点6点7点8点9点10点11点12点13点14点15点16点17点18点19点20" +
+	"点21点22点23点24点daauovpcdmiu平成昭和大正明治株式会社panamakakbmbgbkcalpfnfmgkghzmldlk" +
+	"lfmnmmmcmkmm2m3m∕sm∕s2rad∕srad∕s2psnsmspvnvmvkvpwnwmwkwbqcccdc∕kgdbgyhah" +
+	"pinkkktlmlnlxphprsrsvwbv∕ma∕m1日2日3日4日5日6日7日8日9日10日11日12日13日14日15日16日17日1" +
+	"8日19日20日21日22日23日24日25日26日27日28日29日30日31日ьɦɬʞʇœʍ𤋮𢡊𢡄𣏕𥉉𥳐𧻓fffiflstմնմեմիվնմ" +
+	"խיִײַעהכלםרתשׁשׂשּׁשּׂאַאָאּבּגּדּהּוּזּטּיּךּכּלּמּנּסּףּפּצּקּרּשּתּו" +
+	"ֹבֿכֿפֿאלٱٻپڀٺٿٹڤڦڄڃچڇڍڌڎڈژڑکگڳڱںڻۀہھےۓڭۇۆۈۋۅۉېىئائەئوئۇئۆئۈئېئىیئجئحئم" +
+	"ئيبجبحبخبمبىبيتجتحتختمتىتيثجثمثىثيجحجمحجحمخجخحخمسجسحسخسمصحصمضجضحضخضمطحط" +
+	"مظمعجعمغجغمفجفحفخفمفىفيقحقمقىقيكاكجكحكخكلكمكىكيلجلحلخلملىليمجمحمخمممىمي" +
+	"نجنحنخنمنىنيهجهمهىهييجيحيخيميىييذٰرٰىٰ ٌّ ٍّ َّ ُّ ِّ ّٰئرئزئنبربزبنترت" +
+	"زتنثرثزثنمانرنزننيريزينئخئهبهتهصخلهنههٰيهثهسهشمشهـَّـُّـِّطىطيعىعيغىغيس" +
+	"ىسيشىشيحىحيجىجيخىخيصىصيضىضيشجشحشخشرسرصرضراًتجمتحجتحمتخمتمجتمحتمخجمححميح" +
+	"مىسحجسجحسجىسمحسمجسممصححصممشحمشجيشمخشممضحىضخمطمحطممطميعجمعممعمىغممغميغمى" +
+	"فخمقمحقمملحملحيلحىلججلخملمحمحجمحممحيمجحمجممخجمخممجخهمجهممنحمنحىنجمنجىنم" +
+	"ينمىيممبخيتجيتجىتخيتخىتميتمىجميجحىجمىسخىصحيشحيضحيلجيلمييحييجييميمميقمين" +
+	"حيعميكمينجحمخيلجمكممجحيحجيمجيفميبحيسخينجيصلےقلےاللهاكبرمحمدصلعمرسولعليه" +
+	"وسلمصلىصلى الله عليه وسلمجل جلالهریال,:!?_{}[]#&*-<>\\$%@ـًـَـُـِـّـْءآ" +
+	"أؤإئابةتثجحخدذرزسشصضطظعغفقكلمنهويلآلألإلا\x22'/^|~¢£¬¦¥𝅗𝅥𝅘𝅥𝅘𝅥𝅮𝅘𝅥𝅯𝅘𝅥𝅰𝅘𝅥𝅱" +
+	"𝅘𝅥𝅲𝆹𝅥𝆺𝅥𝆹𝅥𝅮𝆺𝅥𝅮𝆹𝅥𝅯𝆺𝅥𝅯ıȷαεζηκλμνξοστυψ∇∂ϝٮڡٯ0,1,2,3,4,5,6,7,8,9,(a)(b)(c" +
+	")(d)(e)(f)(g)(h)(i)(j)(k)(l)(m)(n)(o)(p)(q)(r)(s)(t)(u)(v)(w)(x)(y)(z)〔s" +
+	"〕wzhvsdppvwcmcmdmrdjほかココサ手字双デ二多解天交映無料前後再新初終生販声吹演投捕一三遊左中右指走打禁空合満有月申割営配〔" +
+	"本〕〔三〕〔二〕〔安〕〔点〕〔打〕〔盗〕〔勝〕〔敗〕得可丽丸乁你侮侻倂偺備僧像㒞免兔兤具㒹內冗冤仌冬况凵刃㓟刻剆剷㔕勇勉勤勺包匆北卉卑博即卽" +
+	"卿灰及叟叫叱吆咞吸呈周咢哶唐啓啣善喙喫喳嗂圖嘆圗噑噴切壮城埴堍型堲報墬売壷夆夢奢姬娛娧姘婦㛮嬈嬾寃寘寧寳寿将尢㞁屠屮峀岍嵃嵮嵫嵼巡巢㠯巽帨帽" +
+	"幩㡢㡼庰庳庶廊廾舁弢㣇形彫㣣徚忍志忹悁㤺㤜悔惇慈慌慎慺憎憲憤憯懞懲懶成戛扝抱拔捐挽拼捨掃揤搢揅掩㨮摩摾撝摷㩬敏敬旣書晉㬙暑㬈㫤冒冕最暜肭䏙朗" +
+	"望朡杞杓㭉柺枅桒梅梎栟椔㮝楂榣槪檨櫛㰘次歔㱎歲殟殺殻汎沿泍汧洖派海流浩浸涅洴港湮㴳滋滇淹潮濆瀹瀞瀛㶖灊災灷炭煅熜爨爵牐犀犕獺王㺬玥㺸瑇瑜瑱璅" +
+	"瓊㼛甤甾異瘐㿼䀈直眞真睊䀹瞋䁆䂖硎碌磌䃣祖福秫䄯穀穊穏䈂篆築䈧糒䊠糨糣紀絣䌁緇縂繅䌴䍙罺羕翺者聠聰䏕育脃䐋脾媵舄辞䑫芑芋芝劳花芳芽苦若茝荣莭" +
+	"茣莽菧著荓菊菌菜䔫蓱蓳蔖蕤䕝䕡䕫虐虜虧虩蚩蚈蜎蛢蝹蜨蝫螆蟡蠁䗹衠衣裗裞䘵裺㒻䚾䛇誠諭變豕貫賁贛起跋趼跰軔輸邔郱鄑鄛鈸鋗鋘鉼鏹鐕開䦕閷䧦雃嶲霣" +
+	"䩮䩶韠䪲頋頩飢䬳餩馧駂駾䯎鬒鱀鳽䳎䳭鵧䳸麻䵖黹黾鼅鼏鼖鼻"
+
+var mappingIndex = []uint16{ // 1650 elements
+	// Entry 0 - 3F
+	0x0000, 0x0000, 0x0001, 0x0004, 0x0005, 0x0008, 0x0009, 0x000a,
+	0x000d, 0x0010, 0x0011, 0x0012, 0x0017, 0x001c, 0x0021, 0x0024,
+	0x0027, 0x002a, 0x002b, 0x002e, 0x0031, 0x0034, 0x0035, 0x0036,
+	0x0037, 0x0038, 0x0039, 0x003c, 0x003f, 0x0042, 0x0045, 0x0048,
+	0x004b, 0x004c, 0x004d, 0x0051, 0x0054, 0x0055, 0x005a, 0x005e,
+	0x0062, 0x0066, 0x006a, 0x006e, 0x0074, 0x007a, 0x0080, 0x0086,
+	0x008c, 0x0092, 0x0098, 0x009e, 0x00a4, 0x00aa, 0x00b0, 0x00b6,
+	0x00bc, 0x00c2, 0x00c8, 0x00ce, 0x00d4, 0x00da, 0x00e0, 0x00e6,
+	// Entry 40 - 7F
+	0x00ec, 0x00f2, 0x00f8, 0x00fe, 0x0104, 0x010a, 0x0110, 0x0116,
+	0x011c, 0x0122, 0x0128, 0x012e, 0x0137, 0x013d, 0x0146, 0x014c,
+	0x0152, 0x0158, 0x015e, 0x0164, 0x016a, 0x0170, 0x0172, 0x0174,
+	0x0176, 0x0178, 0x017a, 0x017c, 0x017e, 0x0180, 0x0181, 0x0182,
+	0x0183, 0x0185, 0x0186, 0x0187, 0x0188, 0x0189, 0x018a, 0x018c,
+	0x018d, 0x018e, 0x018f, 0x0191, 0x0193, 0x0195, 0x0197, 0x0199,
+	0x019b, 0x019d, 0x019f, 0x01a0, 0x01a2, 0x01a4, 0x01a6, 0x01a8,
+	0x01aa, 0x01ac, 0x01ae, 0x01b0, 0x01b1, 0x01b3, 0x01b5, 0x01b6,
+	// Entry 80 - BF
+	0x01b8, 0x01ba, 0x01bc, 0x01be, 0x01c0, 0x01c2, 0x01c4, 0x01c6,
+	0x01c8, 0x01ca, 0x01cc, 0x01ce, 0x01d0, 0x01d2, 0x01d4, 0x01d6,
+	0x01d8, 0x01da, 0x01dc, 0x01de, 0x01e0, 0x01e2, 0x01e4, 0x01e5,
+	0x01e7, 0x01e9, 0x01eb, 0x01ed, 0x01ef, 0x01f1, 0x01f3, 0x01f5,
+	0x01f7, 0x01f9, 0x01fb, 0x01fd, 0x0202, 0x0207, 0x020c, 0x0211,
+	0x0216, 0x021b, 0x0220, 0x0225, 0x022a, 0x022f, 0x0234, 0x0239,
+	0x023e, 0x0243, 0x0248, 0x024d, 0x0252, 0x0257, 0x025c, 0x0261,
+	0x0266, 0x026b, 0x0270, 0x0275, 0x027a, 0x027e, 0x0282, 0x0287,
+	// Entry C0 - FF
+	0x0289, 0x028e, 0x0293, 0x0297, 0x029b, 0x02a0, 0x02a5, 0x02aa,
+	0x02af, 0x02b1, 0x02b6, 0x02bb, 0x02c0, 0x02c2, 0x02c7, 0x02c8,
+	0x02cd, 0x02d1, 0x02d5, 0x02da, 0x02e0, 0x02e9, 0x02ef, 0x02f8,
+	0x02fa, 0x02fc, 0x02fe, 0x0300, 0x030c, 0x030d, 0x030e, 0x030f,
+	0x0310, 0x0311, 0x0312, 0x0313, 0x0314, 0x0315, 0x0316, 0x0317,
+	0x0319, 0x031b, 0x031d, 0x031e, 0x0320, 0x0322, 0x0324, 0x0326,
+	0x0328, 0x032a, 0x032c, 0x032e, 0x0330, 0x0335, 0x033a, 0x0340,
+	0x0345, 0x034a, 0x034f, 0x0354, 0x0359, 0x035e, 0x0363, 0x0368,
+	// Entry 100 - 13F
+	0x036d, 0x0372, 0x0377, 0x037c, 0x0380, 0x0382, 0x0384, 0x0386,
+	0x038a, 0x038c, 0x038e, 0x0393, 0x0399, 0x03a2, 0x03a8, 0x03b1,
+	0x03b3, 0x03b5, 0x03b7, 0x03b9, 0x03bb, 0x03bd, 0x03bf, 0x03c1,
+	0x03c3, 0x03c5, 0x03c7, 0x03cb, 0x03cf, 0x03d3, 0x03d7, 0x03db,
+	0x03df, 0x03e3, 0x03e7, 0x03eb, 0x03ef, 0x03f3, 0x03ff, 0x0401,
+	0x0406, 0x0408, 0x040a, 0x040c, 0x040e, 0x040f, 0x0413, 0x0417,
+	0x041d, 0x0423, 0x0428, 0x042d, 0x0432, 0x0437, 0x043c, 0x0441,
+	0x0446, 0x044b, 0x0450, 0x0455, 0x045a, 0x045f, 0x0464, 0x0469,
+	// Entry 140 - 17F
+	0x046e, 0x0473, 0x0478, 0x047d, 0x0482, 0x0487, 0x048c, 0x0491,
+	0x0496, 0x049b, 0x04a0, 0x04a5, 0x04aa, 0x04af, 0x04b4, 0x04bc,
+	0x04c4, 0x04c9, 0x04ce, 0x04d3, 0x04d8, 0x04dd, 0x04e2, 0x04e7,
+	0x04ec, 0x04f1, 0x04f6, 0x04fb, 0x0500, 0x0505, 0x050a, 0x050f,
+	0x0514, 0x0519, 0x051e, 0x0523, 0x0528, 0x052d, 0x0532, 0x0537,
+	0x053c, 0x0541, 0x0546, 0x054b, 0x0550, 0x0555, 0x055a, 0x055f,
+	0x0564, 0x0569, 0x056e, 0x0573, 0x0578, 0x057a, 0x057c, 0x057e,
+	0x0580, 0x0582, 0x0584, 0x0586, 0x0588, 0x058a, 0x058c, 0x058e,
+	// Entry 180 - 1BF
+	0x0590, 0x0592, 0x0594, 0x0596, 0x059c, 0x05a2, 0x05a4, 0x05a6,
+	0x05a8, 0x05aa, 0x05ac, 0x05ae, 0x05b0, 0x05b2, 0x05b4, 0x05b6,
+	0x05b8, 0x05ba, 0x05bc, 0x05be, 0x05c0, 0x05c4, 0x05c8, 0x05cc,
+	0x05d0, 0x05d4, 0x05d8, 0x05dc, 0x05e0, 0x05e4, 0x05e9, 0x05ee,
+	0x05f3, 0x05f5, 0x05f7, 0x05fd, 0x0609, 0x0615, 0x0621, 0x062a,
+	0x0636, 0x063f, 0x0648, 0x0657, 0x0663, 0x066c, 0x0675, 0x067e,
+	0x068a, 0x0696, 0x069f, 0x06a8, 0x06ae, 0x06b7, 0x06c3, 0x06cf,
+	0x06d5, 0x06e4, 0x06f6, 0x0705, 0x070e, 0x071d, 0x072c, 0x0738,
+	// Entry 1C0 - 1FF
+	0x0741, 0x074a, 0x0753, 0x075f, 0x076e, 0x077a, 0x0783, 0x078c,
+	0x0795, 0x079b, 0x07a1, 0x07a7, 0x07ad, 0x07b6, 0x07bf, 0x07ce,
+	0x07d7, 0x07e3, 0x07f2, 0x07fb, 0x0801, 0x0807, 0x0816, 0x0822,
+	0x0831, 0x083a, 0x0849, 0x084f, 0x0858, 0x0861, 0x086a, 0x0873,
+	0x087c, 0x0888, 0x0891, 0x0897, 0x08a0, 0x08a9, 0x08b2, 0x08be,
+	0x08c7, 0x08d0, 0x08d9, 0x08e8, 0x08f4, 0x08fa, 0x0909, 0x090f,
+	0x091b, 0x0927, 0x0930, 0x0939, 0x0942, 0x094e, 0x0954, 0x095d,
+	0x0969, 0x096f, 0x097e, 0x0987, 0x098b, 0x098f, 0x0993, 0x0997,
+	// Entry 200 - 23F
+	0x099b, 0x099f, 0x09a3, 0x09a7, 0x09ab, 0x09af, 0x09b4, 0x09b9,
+	0x09be, 0x09c3, 0x09c8, 0x09cd, 0x09d2, 0x09d7, 0x09dc, 0x09e1,
+	0x09e6, 0x09eb, 0x09f0, 0x09f5, 0x09fa, 0x09fc, 0x09fe, 0x0a00,
+	0x0a02, 0x0a04, 0x0a06, 0x0a0c, 0x0a12, 0x0a18, 0x0a1e, 0x0a2a,
+	0x0a2c, 0x0a2e, 0x0a30, 0x0a32, 0x0a34, 0x0a36, 0x0a38, 0x0a3c,
+	0x0a3e, 0x0a40, 0x0a42, 0x0a44, 0x0a46, 0x0a48, 0x0a4a, 0x0a4c,
+	0x0a4e, 0x0a50, 0x0a52, 0x0a54, 0x0a56, 0x0a58, 0x0a5a, 0x0a5f,
+	0x0a65, 0x0a6c, 0x0a74, 0x0a76, 0x0a78, 0x0a7a, 0x0a7c, 0x0a7e,
+	// Entry 240 - 27F
+	0x0a80, 0x0a82, 0x0a84, 0x0a86, 0x0a88, 0x0a8a, 0x0a8c, 0x0a8e,
+	0x0a90, 0x0a96, 0x0a98, 0x0a9a, 0x0a9c, 0x0a9e, 0x0aa0, 0x0aa2,
+	0x0aa4, 0x0aa6, 0x0aa8, 0x0aaa, 0x0aac, 0x0aae, 0x0ab0, 0x0ab2,
+	0x0ab4, 0x0ab9, 0x0abe, 0x0ac2, 0x0ac6, 0x0aca, 0x0ace, 0x0ad2,
+	0x0ad6, 0x0ada, 0x0ade, 0x0ae2, 0x0ae7, 0x0aec, 0x0af1, 0x0af6,
+	0x0afb, 0x0b00, 0x0b05, 0x0b0a, 0x0b0f, 0x0b14, 0x0b19, 0x0b1e,
+	0x0b23, 0x0b28, 0x0b2d, 0x0b32, 0x0b37, 0x0b3c, 0x0b41, 0x0b46,
+	0x0b4b, 0x0b50, 0x0b52, 0x0b54, 0x0b56, 0x0b58, 0x0b5a, 0x0b5c,
+	// Entry 280 - 2BF
+	0x0b5e, 0x0b62, 0x0b66, 0x0b6a, 0x0b6e, 0x0b72, 0x0b76, 0x0b7a,
+	0x0b7c, 0x0b7e, 0x0b80, 0x0b82, 0x0b86, 0x0b8a, 0x0b8e, 0x0b92,
+	0x0b96, 0x0b9a, 0x0b9e, 0x0ba0, 0x0ba2, 0x0ba4, 0x0ba6, 0x0ba8,
+	0x0baa, 0x0bac, 0x0bb0, 0x0bb4, 0x0bba, 0x0bc0, 0x0bc4, 0x0bc8,
+	0x0bcc, 0x0bd0, 0x0bd4, 0x0bd8, 0x0bdc, 0x0be0, 0x0be4, 0x0be8,
+	0x0bec, 0x0bf0, 0x0bf4, 0x0bf8, 0x0bfc, 0x0c00, 0x0c04, 0x0c08,
+	0x0c0c, 0x0c10, 0x0c14, 0x0c18, 0x0c1c, 0x0c20, 0x0c24, 0x0c28,
+	0x0c2c, 0x0c30, 0x0c34, 0x0c36, 0x0c38, 0x0c3a, 0x0c3c, 0x0c3e,
+	// Entry 2C0 - 2FF
+	0x0c40, 0x0c42, 0x0c44, 0x0c46, 0x0c48, 0x0c4a, 0x0c4c, 0x0c4e,
+	0x0c50, 0x0c52, 0x0c54, 0x0c56, 0x0c58, 0x0c5a, 0x0c5c, 0x0c5e,
+	0x0c60, 0x0c62, 0x0c64, 0x0c66, 0x0c68, 0x0c6a, 0x0c6c, 0x0c6e,
+	0x0c70, 0x0c72, 0x0c74, 0x0c76, 0x0c78, 0x0c7a, 0x0c7c, 0x0c7e,
+	0x0c80, 0x0c82, 0x0c86, 0x0c8a, 0x0c8e, 0x0c92, 0x0c96, 0x0c9a,
+	0x0c9e, 0x0ca2, 0x0ca4, 0x0ca8, 0x0cac, 0x0cb0, 0x0cb4, 0x0cb8,
+	0x0cbc, 0x0cc0, 0x0cc4, 0x0cc8, 0x0ccc, 0x0cd0, 0x0cd4, 0x0cd8,
+	0x0cdc, 0x0ce0, 0x0ce4, 0x0ce8, 0x0cec, 0x0cf0, 0x0cf4, 0x0cf8,
+	// Entry 300 - 33F
+	0x0cfc, 0x0d00, 0x0d04, 0x0d08, 0x0d0c, 0x0d10, 0x0d14, 0x0d18,
+	0x0d1c, 0x0d20, 0x0d24, 0x0d28, 0x0d2c, 0x0d30, 0x0d34, 0x0d38,
+	0x0d3c, 0x0d40, 0x0d44, 0x0d48, 0x0d4c, 0x0d50, 0x0d54, 0x0d58,
+	0x0d5c, 0x0d60, 0x0d64, 0x0d68, 0x0d6c, 0x0d70, 0x0d74, 0x0d78,
+	0x0d7c, 0x0d80, 0x0d84, 0x0d88, 0x0d8c, 0x0d90, 0x0d94, 0x0d98,
+	0x0d9c, 0x0da0, 0x0da4, 0x0da8, 0x0dac, 0x0db0, 0x0db4, 0x0db8,
+	0x0dbc, 0x0dc0, 0x0dc4, 0x0dc8, 0x0dcc, 0x0dd0, 0x0dd4, 0x0dd8,
+	0x0ddc, 0x0de0, 0x0de4, 0x0de8, 0x0dec, 0x0df0, 0x0df4, 0x0df8,
+	// Entry 340 - 37F
+	0x0dfc, 0x0e00, 0x0e04, 0x0e08, 0x0e0c, 0x0e10, 0x0e14, 0x0e18,
+	0x0e1d, 0x0e22, 0x0e27, 0x0e2c, 0x0e31, 0x0e36, 0x0e3a, 0x0e3e,
+	0x0e42, 0x0e46, 0x0e4a, 0x0e4e, 0x0e52, 0x0e56, 0x0e5a, 0x0e5e,
+	0x0e62, 0x0e66, 0x0e6a, 0x0e6e, 0x0e72, 0x0e76, 0x0e7a, 0x0e7e,
+	0x0e82, 0x0e86, 0x0e8a, 0x0e8e, 0x0e92, 0x0e96, 0x0e9a, 0x0e9e,
+	0x0ea2, 0x0ea6, 0x0eaa, 0x0eae, 0x0eb2, 0x0eb6, 0x0ebc, 0x0ec2,
+	0x0ec8, 0x0ecc, 0x0ed0, 0x0ed4, 0x0ed8, 0x0edc, 0x0ee0, 0x0ee4,
+	0x0ee8, 0x0eec, 0x0ef0, 0x0ef4, 0x0ef8, 0x0efc, 0x0f00, 0x0f04,
+	// Entry 380 - 3BF
+	0x0f08, 0x0f0c, 0x0f10, 0x0f14, 0x0f18, 0x0f1c, 0x0f20, 0x0f24,
+	0x0f28, 0x0f2c, 0x0f30, 0x0f34, 0x0f38, 0x0f3e, 0x0f44, 0x0f4a,
+	0x0f50, 0x0f56, 0x0f5c, 0x0f62, 0x0f68, 0x0f6e, 0x0f74, 0x0f7a,
+	0x0f80, 0x0f86, 0x0f8c, 0x0f92, 0x0f98, 0x0f9e, 0x0fa4, 0x0faa,
+	0x0fb0, 0x0fb6, 0x0fbc, 0x0fc2, 0x0fc8, 0x0fce, 0x0fd4, 0x0fda,
+	0x0fe0, 0x0fe6, 0x0fec, 0x0ff2, 0x0ff8, 0x0ffe, 0x1004, 0x100a,
+	0x1010, 0x1016, 0x101c, 0x1022, 0x1028, 0x102e, 0x1034, 0x103a,
+	0x1040, 0x1046, 0x104c, 0x1052, 0x1058, 0x105e, 0x1064, 0x106a,
+	// Entry 3C0 - 3FF
+	0x1070, 0x1076, 0x107c, 0x1082, 0x1088, 0x108e, 0x1094, 0x109a,
+	0x10a0, 0x10a6, 0x10ac, 0x10b2, 0x10b8, 0x10be, 0x10c4, 0x10ca,
+	0x10d0, 0x10d6, 0x10dc, 0x10e2, 0x10e8, 0x10ee, 0x10f4, 0x10fa,
+	0x1100, 0x1106, 0x110c, 0x1112, 0x1118, 0x111e, 0x1124, 0x112a,
+	0x1130, 0x1136, 0x113c, 0x1142, 0x1148, 0x114e, 0x1154, 0x115a,
+	0x1160, 0x1166, 0x116c, 0x1172, 0x1178, 0x1180, 0x1188, 0x1190,
+	0x1198, 0x11a0, 0x11a8, 0x11b0, 0x11b6, 0x11d7, 0x11e6, 0x11ee,
+	0x11ef, 0x11f0, 0x11f1, 0x11f2, 0x11f3, 0x11f4, 0x11f5, 0x11f6,
+	// Entry 400 - 43F
+	0x11f7, 0x11f8, 0x11f9, 0x11fa, 0x11fb, 0x11fc, 0x11fd, 0x11fe,
+	0x11ff, 0x1200, 0x1201, 0x1205, 0x1209, 0x120d, 0x1211, 0x1215,
+	0x1219, 0x121b, 0x121d, 0x121f, 0x1221, 0x1223, 0x1225, 0x1227,
+	0x1229, 0x122b, 0x122d, 0x122f, 0x1231, 0x1233, 0x1235, 0x1237,
+	0x1239, 0x123b, 0x123d, 0x123f, 0x1241, 0x1243, 0x1245, 0x1247,
+	0x1249, 0x124b, 0x124d, 0x124f, 0x1251, 0x1253, 0x1255, 0x1257,
+	0x1259, 0x125b, 0x125d, 0x125f, 0x1263, 0x1267, 0x126b, 0x126f,
+	0x1270, 0x1271, 0x1272, 0x1273, 0x1274, 0x1275, 0x1277, 0x1279,
+	// Entry 440 - 47F
+	0x127b, 0x127d, 0x127f, 0x1287, 0x128f, 0x129b, 0x12a7, 0x12b3,
+	0x12bf, 0x12cb, 0x12d3, 0x12db, 0x12e7, 0x12f3, 0x12ff, 0x130b,
+	0x130d, 0x130f, 0x1311, 0x1313, 0x1315, 0x1317, 0x1319, 0x131b,
+	0x131d, 0x131f, 0x1321, 0x1323, 0x1325, 0x1327, 0x1329, 0x132b,
+	0x132e, 0x1331, 0x1333, 0x1335, 0x1337, 0x1339, 0x133b, 0x133d,
+	0x133f, 0x1341, 0x1343, 0x1345, 0x1347, 0x1349, 0x134b, 0x134d,
+	0x1350, 0x1353, 0x1356, 0x1359, 0x135c, 0x135f, 0x1362, 0x1365,
+	0x1368, 0x136b, 0x136e, 0x1371, 0x1374, 0x1377, 0x137a, 0x137d,
+	// Entry 480 - 4BF
+	0x1380, 0x1383, 0x1386, 0x1389, 0x138c, 0x138f, 0x1392, 0x1395,
+	0x1398, 0x139b, 0x13a2, 0x13a4, 0x13a6, 0x13a8, 0x13ab, 0x13ad,
+	0x13af, 0x13b1, 0x13b3, 0x13b5, 0x13bb, 0x13c1, 0x13c4, 0x13c7,
+	0x13ca, 0x13cd, 0x13d0, 0x13d3, 0x13d6, 0x13d9, 0x13dc, 0x13df,
+	0x13e2, 0x13e5, 0x13e8, 0x13eb, 0x13ee, 0x13f1, 0x13f4, 0x13f7,
+	0x13fa, 0x13fd, 0x1400, 0x1403, 0x1406, 0x1409, 0x140c, 0x140f,
+	0x1412, 0x1415, 0x1418, 0x141b, 0x141e, 0x1421, 0x1424, 0x1427,
+	0x142a, 0x142d, 0x1430, 0x1433, 0x1436, 0x1439, 0x143c, 0x143f,
+	// Entry 4C0 - 4FF
+	0x1442, 0x1445, 0x1448, 0x1451, 0x145a, 0x1463, 0x146c, 0x1475,
+	0x147e, 0x1487, 0x1490, 0x1499, 0x149c, 0x149f, 0x14a2, 0x14a5,
+	0x14a8, 0x14ab, 0x14ae, 0x14b1, 0x14b4, 0x14b7, 0x14ba, 0x14bd,
+	0x14c0, 0x14c3, 0x14c6, 0x14c9, 0x14cc, 0x14cf, 0x14d2, 0x14d5,
+	0x14d8, 0x14db, 0x14de, 0x14e1, 0x14e4, 0x14e7, 0x14ea, 0x14ed,
+	0x14f0, 0x14f3, 0x14f6, 0x14f9, 0x14fc, 0x14ff, 0x1502, 0x1505,
+	0x1508, 0x150b, 0x150e, 0x1511, 0x1514, 0x1517, 0x151a, 0x151d,
+	0x1520, 0x1523, 0x1526, 0x1529, 0x152c, 0x152f, 0x1532, 0x1535,
+	// Entry 500 - 53F
+	0x1538, 0x153b, 0x153e, 0x1541, 0x1544, 0x1547, 0x154a, 0x154d,
+	0x1550, 0x1553, 0x1556, 0x1559, 0x155c, 0x155f, 0x1562, 0x1565,
+	0x1568, 0x156b, 0x156e, 0x1571, 0x1574, 0x1577, 0x157a, 0x157d,
+	0x1580, 0x1583, 0x1586, 0x1589, 0x158c, 0x158f, 0x1592, 0x1595,
+	0x1598, 0x159b, 0x159e, 0x15a1, 0x15a4, 0x15a7, 0x15aa, 0x15ad,
+	0x15b0, 0x15b3, 0x15b6, 0x15b9, 0x15bc, 0x15bf, 0x15c2, 0x15c5,
+	0x15c8, 0x15cb, 0x15ce, 0x15d1, 0x15d4, 0x15d7, 0x15da, 0x15dd,
+	0x15e0, 0x15e3, 0x15e6, 0x15e9, 0x15ec, 0x15ef, 0x15f2, 0x15f5,
+	// Entry 540 - 57F
+	0x15f8, 0x15fb, 0x15fe, 0x1601, 0x1604, 0x1607, 0x160a, 0x160d,
+	0x1610, 0x1613, 0x1616, 0x1619, 0x161c, 0x161f, 0x1622, 0x1625,
+	0x1628, 0x162b, 0x162e, 0x1631, 0x1634, 0x1637, 0x163a, 0x163d,
+	0x1640, 0x1643, 0x1646, 0x1649, 0x164c, 0x164f, 0x1652, 0x1655,
+	0x1658, 0x165b, 0x165e, 0x1661, 0x1664, 0x1667, 0x166a, 0x166d,
+	0x1670, 0x1673, 0x1676, 0x1679, 0x167c, 0x167f, 0x1682, 0x1685,
+	0x1688, 0x168b, 0x168e, 0x1691, 0x1694, 0x1697, 0x169a, 0x169d,
+	0x16a0, 0x16a3, 0x16a6, 0x16a9, 0x16ac, 0x16af, 0x16b2, 0x16b5,
+	// Entry 580 - 5BF
+	0x16b8, 0x16bb, 0x16be, 0x16c1, 0x16c4, 0x16c7, 0x16ca, 0x16cd,
+	0x16d0, 0x16d3, 0x16d6, 0x16d9, 0x16dc, 0x16df, 0x16e2, 0x16e5,
+	0x16e8, 0x16eb, 0x16ee, 0x16f1, 0x16f4, 0x16f7, 0x16fa, 0x16fd,
+	0x1700, 0x1703, 0x1706, 0x1709, 0x170c, 0x170f, 0x1712, 0x1715,
+	0x1718, 0x171b, 0x171e, 0x1721, 0x1724, 0x1727, 0x172a, 0x172d,
+	0x1730, 0x1733, 0x1736, 0x1739, 0x173c, 0x173f, 0x1742, 0x1745,
+	0x1748, 0x174b, 0x174e, 0x1751, 0x1754, 0x1757, 0x175a, 0x175d,
+	0x1760, 0x1763, 0x1766, 0x1769, 0x176c, 0x176f, 0x1772, 0x1775,
+	// Entry 5C0 - 5FF
+	0x1778, 0x177b, 0x177e, 0x1781, 0x1784, 0x1787, 0x178a, 0x178d,
+	0x1790, 0x1793, 0x1796, 0x1799, 0x179c, 0x179f, 0x17a2, 0x17a5,
+	0x17a8, 0x17ab, 0x17ae, 0x17b1, 0x17b4, 0x17b7, 0x17ba, 0x17bd,
+	0x17c0, 0x17c3, 0x17c6, 0x17c9, 0x17cc, 0x17cf, 0x17d2, 0x17d5,
+	0x17d8, 0x17db, 0x17de, 0x17e1, 0x17e4, 0x17e7, 0x17ea, 0x17ed,
+	0x17f0, 0x17f3, 0x17f6, 0x17f9, 0x17fc, 0x17ff, 0x1802, 0x1805,
+	0x1808, 0x180b, 0x180e, 0x1811, 0x1814, 0x1817, 0x181a, 0x181d,
+	0x1820, 0x1823, 0x1826, 0x1829, 0x182c, 0x182f, 0x1832, 0x1835,
+	// Entry 600 - 63F
+	0x1838, 0x183b, 0x183e, 0x1841, 0x1844, 0x1847, 0x184a, 0x184d,
+	0x1850, 0x1853, 0x1856, 0x1859, 0x185c, 0x185f, 0x1862, 0x1865,
+	0x1868, 0x186b, 0x186e, 0x1871, 0x1874, 0x1877, 0x187a, 0x187d,
+	0x1880, 0x1883, 0x1886, 0x1889, 0x188c, 0x188f, 0x1892, 0x1895,
+	0x1898, 0x189b, 0x189e, 0x18a1, 0x18a4, 0x18a7, 0x18aa, 0x18ad,
+	0x18b0, 0x18b3, 0x18b6, 0x18b9, 0x18bc, 0x18bf, 0x18c2, 0x18c5,
+	0x18c8, 0x18cb, 0x18ce, 0x18d1, 0x18d4, 0x18d7, 0x18da, 0x18dd,
+	0x18e0, 0x18e3, 0x18e6, 0x18e9, 0x18ec, 0x18ef, 0x18f2, 0x18f5,
+	// Entry 640 - 67F
+	0x18f8, 0x18fb, 0x18fe, 0x1901, 0x1904, 0x1907, 0x190a, 0x190d,
+	0x1910, 0x1913, 0x1916, 0x1919, 0x191c, 0x191f, 0x1922, 0x1925,
+	0x1928, 0x192b, 0x192e, 0x1931, 0x1934, 0x1937, 0x193a, 0x193d,
+	0x1940, 0x1943, 0x1946, 0x1949, 0x194c, 0x194f, 0x1952, 0x1955,
+	0x1958, 0x195b, 0x195e, 0x1961, 0x1964, 0x1967, 0x196a, 0x196d,
+	0x1970, 0x1973, 0x1976, 0x1979, 0x197c, 0x197f, 0x1982, 0x1985,
+	0x1988, 0x198b,
+} // Size: 3324 bytes
 
 var xorData string = "" + // Size: 4862 bytes
 	"\x02\x0c\x09\x02\xb0\xec\x02\xad\xd8\x02\xad\xd9\x02\x06\x07\x02\x0f\x12" +
@@ -547,7 +690,7 @@ func (t *idnaTrie) lookupStringUnsafe(s string) uint16 {
 	return 0
 }
 
-// idnaTrie. Total size: 30288 bytes (29.58 KiB). Checksum: c0cd84404a2f6f19.
+// idnaTrie. Total size: 30196 bytes (29.49 KiB). Checksum: e2ae95a945f04016.
 type idnaTrie struct{}
 
 func newIdnaTrie(i int) *idnaTrie {
@@ -600,11 +743,11 @@ var idnaValues = [8192]uint16{
 	0xd2: 0x0040, 0xd3: 0x0040, 0xd4: 0x0040, 0xd5: 0x0040, 0xd6: 0x0040, 0xd7: 0x0040,
 	0xd8: 0x0040, 0xd9: 0x0040, 0xda: 0x0040, 0xdb: 0x0040, 0xdc: 0x0040, 0xdd: 0x0040,
 	0xde: 0x0040, 0xdf: 0x0040, 0xe0: 0x000a, 0xe1: 0x0018, 0xe2: 0x0018, 0xe3: 0x0018,
-	0xe4: 0x0018, 0xe5: 0x0018, 0xe6: 0x0018, 0xe7: 0x0018, 0xe8: 0x001a, 0xe9: 0x0018,
-	0xea: 0x0039, 0xeb: 0x0018, 0xec: 0x0018, 0xed: 0x03c0, 0xee: 0x0018, 0xef: 0x004a,
-	0xf0: 0x0018, 0xf1: 0x0018, 0xf2: 0x0069, 0xf3: 0x0079, 0xf4: 0x008a, 0xf5: 0x0005,
-	0xf6: 0x0018, 0xf7: 0x0008, 0xf8: 0x00aa, 0xf9: 0x00c9, 0xfa: 0x00d9, 0xfb: 0x0018,
-	0xfc: 0x00e9, 0xfd: 0x0119, 0xfe: 0x0149, 0xff: 0x0018,
+	0xe4: 0x0018, 0xe5: 0x0018, 0xe6: 0x0018, 0xe7: 0x0018, 0xe8: 0x0012, 0xe9: 0x0018,
+	0xea: 0x0019, 0xeb: 0x0018, 0xec: 0x0018, 0xed: 0x03c0, 0xee: 0x0018, 0xef: 0x0022,
+	0xf0: 0x0018, 0xf1: 0x0018, 0xf2: 0x0029, 0xf3: 0x0031, 0xf4: 0x003a, 0xf5: 0x0005,
+	0xf6: 0x0018, 0xf7: 0x0008, 0xf8: 0x0042, 0xf9: 0x0049, 0xfa: 0x0051, 0xfb: 0x0018,
+	0xfc: 0x0059, 0xfd: 0x0061, 0xfe: 0x0069, 0xff: 0x0018,
 	// Block 0x4, offset 0x100
 	0x100: 0xe00d, 0x101: 0x0008, 0x102: 0xe00d, 0x103: 0x0008, 0x104: 0xe00d, 0x105: 0x0008,
 	0x106: 0xe00d, 0x107: 0x0008, 0x108: 0xe00d, 0x109: 0x0008, 0x10a: 0xe00d, 0x10b: 0x0008,
@@ -614,12 +757,12 @@ var idnaValues = [8192]uint16{
 	0x11e: 0xe00d, 0x11f: 0x0008, 0x120: 0xe00d, 0x121: 0x0008, 0x122: 0xe00d, 0x123: 0x0008,
 	0x124: 0xe00d, 0x125: 0x0008, 0x126: 0xe00d, 0x127: 0x0008, 0x128: 0xe00d, 0x129: 0x0008,
 	0x12a: 0xe00d, 0x12b: 0x0008, 0x12c: 0xe00d, 0x12d: 0x0008, 0x12e: 0xe00d, 0x12f: 0x0008,
-	0x130: 0x0179, 0x131: 0x0008, 0x132: 0x0035, 0x133: 0x004d, 0x134: 0xe00d, 0x135: 0x0008,
+	0x130: 0x0071, 0x131: 0x0008, 0x132: 0x0035, 0x133: 0x004d, 0x134: 0xe00d, 0x135: 0x0008,
 	0x136: 0xe00d, 0x137: 0x0008, 0x138: 0x0008, 0x139: 0xe01d, 0x13a: 0x0008, 0x13b: 0xe03d,
-	0x13c: 0x0008, 0x13d: 0xe01d, 0x13e: 0x0008, 0x13f: 0x0199,
+	0x13c: 0x0008, 0x13d: 0xe01d, 0x13e: 0x0008, 0x13f: 0x0079,
 	// Block 0x5, offset 0x140
-	0x140: 0x0199, 0x141: 0xe01d, 0x142: 0x0008, 0x143: 0xe03d, 0x144: 0x0008, 0x145: 0xe01d,
-	0x146: 0x0008, 0x147: 0xe07d, 0x148: 0x0008, 0x149: 0x01b9, 0x14a: 0xe00d, 0x14b: 0x0008,
+	0x140: 0x0079, 0x141: 0xe01d, 0x142: 0x0008, 0x143: 0xe03d, 0x144: 0x0008, 0x145: 0xe01d,
+	0x146: 0x0008, 0x147: 0xe07d, 0x148: 0x0008, 0x149: 0x0081, 0x14a: 0xe00d, 0x14b: 0x0008,
 	0x14c: 0xe00d, 0x14d: 0x0008, 0x14e: 0xe00d, 0x14f: 0x0008, 0x150: 0xe00d, 0x151: 0x0008,
 	0x152: 0xe00d, 0x153: 0x0008, 0x154: 0xe00d, 0x155: 0x0008, 0x156: 0xe00d, 0x157: 0x0008,
 	0x158: 0xe00d, 0x159: 0x0008, 0x15a: 0xe00d, 0x15b: 0x0008, 0x15c: 0xe00d, 0x15d: 0x0008,
@@ -628,7 +771,7 @@ var idnaValues = [8192]uint16{
 	0x16a: 0xe00d, 0x16b: 0x0008, 0x16c: 0xe00d, 0x16d: 0x0008, 0x16e: 0xe00d, 0x16f: 0x0008,
 	0x170: 0xe00d, 0x171: 0x0008, 0x172: 0xe00d, 0x173: 0x0008, 0x174: 0xe00d, 0x175: 0x0008,
 	0x176: 0xe00d, 0x177: 0x0008, 0x178: 0x0065, 0x179: 0xe01d, 0x17a: 0x0008, 0x17b: 0xe03d,
-	0x17c: 0x0008, 0x17d: 0xe01d, 0x17e: 0x0008, 0x17f: 0x01d9,
+	0x17c: 0x0008, 0x17d: 0xe01d, 0x17e: 0x0008, 0x17f: 0x0089,
 	// Block 0x6, offset 0x180
 	0x180: 0x0008, 0x181: 0x007d, 0x182: 0xe00d, 0x183: 0x0008, 0x184: 0xe00d, 0x185: 0x0008,
 	0x186: 0x007d, 0x187: 0xe07d, 0x188: 0x0008, 0x189: 0x0095, 0x18a: 0x00ad, 0x18b: 0xe03d,
@@ -642,8 +785,8 @@ var idnaValues = [8192]uint16{
 	0x1b6: 0x0008, 0x1b7: 0x01e5, 0x1b8: 0xe00d, 0x1b9: 0x0008, 0x1ba: 0x0008, 0x1bb: 0x0008,
 	0x1bc: 0xe00d, 0x1bd: 0x0008, 0x1be: 0x0008, 0x1bf: 0x0008,
 	// Block 0x7, offset 0x1c0
-	0x1c0: 0x0008, 0x1c1: 0x0008, 0x1c2: 0x0008, 0x1c3: 0x0008, 0x1c4: 0x01e9, 0x1c5: 0x01e9,
-	0x1c6: 0x01e9, 0x1c7: 0x01fd, 0x1c8: 0x0215, 0x1c9: 0x022d, 0x1ca: 0x0245, 0x1cb: 0x025d,
+	0x1c0: 0x0008, 0x1c1: 0x0008, 0x1c2: 0x0008, 0x1c3: 0x0008, 0x1c4: 0x0091, 0x1c5: 0x0091,
+	0x1c6: 0x0091, 0x1c7: 0x01fd, 0x1c8: 0x0215, 0x1c9: 0x022d, 0x1ca: 0x0245, 0x1cb: 0x025d,
 	0x1cc: 0x0275, 0x1cd: 0xe01d, 0x1ce: 0x0008, 0x1cf: 0xe0fd, 0x1d0: 0x0008, 0x1d1: 0xe01d,
 	0x1d2: 0x0008, 0x1d3: 0xe03d, 0x1d4: 0x0008, 0x1d5: 0xe01d, 0x1d6: 0x0008, 0x1d7: 0xe07d,
 	0x1d8: 0x0008, 0x1d9: 0xe01d, 0x1da: 0x0008, 0x1db: 0xe03d, 0x1dc: 0x0008, 0x1dd: 0x0008,
@@ -663,22 +806,22 @@ var idnaValues = [8192]uint16{
 	0x224: 0xe00d, 0x225: 0x0008, 0x226: 0xe00d, 0x227: 0x0008, 0x228: 0xe00d, 0x229: 0x0008,
 	0x22a: 0xe00d, 0x22b: 0x0008, 0x22c: 0xe00d, 0x22d: 0x0008, 0x22e: 0xe00d, 0x22f: 0x0008,
 	0x230: 0xe00d, 0x231: 0x0008, 0x232: 0xe00d, 0x233: 0x0008, 0x234: 0x0008, 0x235: 0x0008,
-	0x236: 0x0008, 0x237: 0x0008, 0x238: 0x0008, 0x239: 0x0008, 0x23a: 0x0209, 0x23b: 0xe03d,
-	0x23c: 0x0008, 0x23d: 0x031d, 0x23e: 0x0229, 0x23f: 0x0008,
+	0x236: 0x0008, 0x237: 0x0008, 0x238: 0x0008, 0x239: 0x0008, 0x23a: 0x0099, 0x23b: 0xe03d,
+	0x23c: 0x0008, 0x23d: 0x031d, 0x23e: 0x00a1, 0x23f: 0x0008,
 	// Block 0x9, offset 0x240
 	0x240: 0x0008, 0x241: 0x0008, 0x242: 0x0018, 0x243: 0x0018, 0x244: 0x0018, 0x245: 0x0018,
 	0x246: 0x0008, 0x247: 0x0008, 0x248: 0x0008, 0x249: 0x0008, 0x24a: 0x0008, 0x24b: 0x0008,
 	0x24c: 0x0008, 0x24d: 0x0008, 0x24e: 0x0008, 0x24f: 0x0008, 0x250: 0x0008, 0x251: 0x0008,
 	0x252: 0x0018, 0x253: 0x0018, 0x254: 0x0018, 0x255: 0x0018, 0x256: 0x0018, 0x257: 0x0018,
-	0x258: 0x029a, 0x259: 0x02ba, 0x25a: 0x02da, 0x25b: 0x02fa, 0x25c: 0x031a, 0x25d: 0x033a,
-	0x25e: 0x0018, 0x25f: 0x0018, 0x260: 0x03ad, 0x261: 0x0359, 0x262: 0x01d9, 0x263: 0x0369,
+	0x258: 0x00d2, 0x259: 0x00da, 0x25a: 0x00e2, 0x25b: 0x00ea, 0x25c: 0x00f2, 0x25d: 0x00fa,
+	0x25e: 0x0018, 0x25f: 0x0018, 0x260: 0x03ad, 0x261: 0x0101, 0x262: 0x0089, 0x263: 0x0109,
 	0x264: 0x03c5, 0x265: 0x0018, 0x266: 0x0018, 0x267: 0x0018, 0x268: 0x0018, 0x269: 0x0018,
 	0x26a: 0x0018, 0x26b: 0x0018, 0x26c: 0x0008, 0x26d: 0x0018, 0x26e: 0x0008, 0x26f: 0x0018,
 	0x270: 0x0018, 0x271: 0x0018, 0x272: 0x0018, 0x273: 0x0018, 0x274: 0x0018, 0x275: 0x0018,
 	0x276: 0x0018, 0x277: 0x0018, 0x278: 0x0018, 0x279: 0x0018, 0x27a: 0x0018, 0x27b: 0x0018,
 	0x27c: 0x0018, 0x27d: 0x0018, 0x27e: 0x0018, 0x27f: 0x0018,
 	// Block 0xa, offset 0x280
-	0x280: 0x03dd, 0x281: 0x03dd, 0x282: 0x3308, 0x283: 0x03f5, 0x284: 0x0379, 0x285: 0x040d,
+	0x280: 0x03dd, 0x281: 0x03dd, 0x282: 0x3308, 0x283: 0x03f5, 0x284: 0x0111, 0x285: 0x040d,
 	0x286: 0x3308, 0x287: 0x3308, 0x288: 0x3308, 0x289: 0x3308, 0x28a: 0x3308, 0x28b: 0x3308,
 	0x28c: 0x3308, 0x28d: 0x3308, 0x28e: 0x3308, 0x28f: 0x33c0, 0x290: 0x3308, 0x291: 0x3308,
 	0x292: 0x3308, 0x293: 0x3308, 0x294: 0x3308, 0x295: 0x3308, 0x296: 0x3308, 0x297: 0x3308,
@@ -687,10 +830,10 @@ var idnaValues = [8192]uint16{
 	0x2a4: 0x3308, 0x2a5: 0x3308, 0x2a6: 0x3308, 0x2a7: 0x3308, 0x2a8: 0x3308, 0x2a9: 0x3308,
 	0x2aa: 0x3308, 0x2ab: 0x3308, 0x2ac: 0x3308, 0x2ad: 0x3308, 0x2ae: 0x3308, 0x2af: 0x3308,
 	0x2b0: 0xe00d, 0x2b1: 0x0008, 0x2b2: 0xe00d, 0x2b3: 0x0008, 0x2b4: 0x0425, 0x2b5: 0x0008,
-	0x2b6: 0xe00d, 0x2b7: 0x0008, 0x2b8: 0x0040, 0x2b9: 0x0040, 0x2ba: 0x03a2, 0x2bb: 0x0008,
-	0x2bc: 0x0008, 0x2bd: 0x0008, 0x2be: 0x03c2, 0x2bf: 0x043d,
+	0x2b6: 0xe00d, 0x2b7: 0x0008, 0x2b8: 0x0040, 0x2b9: 0x0040, 0x2ba: 0x011a, 0x2bb: 0x0008,
+	0x2bc: 0x0008, 0x2bd: 0x0008, 0x2be: 0x0122, 0x2bf: 0x043d,
 	// Block 0xb, offset 0x2c0
-	0x2c0: 0x0040, 0x2c1: 0x0040, 0x2c2: 0x0040, 0x2c3: 0x0040, 0x2c4: 0x008a, 0x2c5: 0x03d2,
+	0x2c0: 0x0040, 0x2c1: 0x0040, 0x2c2: 0x0040, 0x2c3: 0x0040, 0x2c4: 0x003a, 0x2c5: 0x012a,
 	0x2c6: 0xe155, 0x2c7: 0x0455, 0x2c8: 0xe12d, 0x2c9: 0xe13d, 0x2ca: 0xe12d, 0x2cb: 0x0040,
 	0x2cc: 0x03dd, 0x2cd: 0x0040, 0x2ce: 0x046d, 0x2cf: 0x0485, 0x2d0: 0x0008, 0x2d1: 0xe105,
 	0x2d2: 0xe105, 0x2d3: 0xe105, 0x2d4: 0xe105, 0x2d5: 0xe105, 0x2d6: 0xe105, 0x2d7: 0xe105,
@@ -782,8 +925,8 @@ var idnaValues = [8192]uint16{
 	0x49e: 0x3308, 0x49f: 0x3308, 0x4a0: 0x0808, 0x4a1: 0x0808, 0x4a2: 0x0808, 0x4a3: 0x0808,
 	0x4a4: 0x0808, 0x4a5: 0x0808, 0x4a6: 0x0808, 0x4a7: 0x0808, 0x4a8: 0x0808, 0x4a9: 0x0808,
 	0x4aa: 0x0018, 0x4ab: 0x0818, 0x4ac: 0x0818, 0x4ad: 0x0818, 0x4ae: 0x0a08, 0x4af: 0x0a08,
-	0x4b0: 0x3308, 0x4b1: 0x0c08, 0x4b2: 0x0c08, 0x4b3: 0x0c08, 0x4b4: 0x0808, 0x4b5: 0x0429,
-	0x4b6: 0x0451, 0x4b7: 0x0479, 0x4b8: 0x04a1, 0x4b9: 0x0a08, 0x4ba: 0x0a08, 0x4bb: 0x0a08,
+	0x4b0: 0x3308, 0x4b1: 0x0c08, 0x4b2: 0x0c08, 0x4b3: 0x0c08, 0x4b4: 0x0808, 0x4b5: 0x0139,
+	0x4b6: 0x0141, 0x4b7: 0x0149, 0x4b8: 0x0151, 0x4b9: 0x0a08, 0x4ba: 0x0a08, 0x4bb: 0x0a08,
 	0x4bc: 0x0a08, 0x4bd: 0x0a08, 0x4be: 0x0a08, 0x4bf: 0x0a08,
 	// Block 0x13, offset 0x4c0
 	0x4c0: 0x0c08, 0x4c1: 0x0a08, 0x4c2: 0x0a08, 0x4c3: 0x0c08, 0x4c4: 0x0c08, 0x4c5: 0x0c08,
@@ -826,8 +969,8 @@ var idnaValues = [8192]uint16{
 	0x586: 0x3308, 0x587: 0x3308, 0x588: 0x3308, 0x589: 0x3008, 0x58a: 0x3008, 0x58b: 0x3008,
 	0x58c: 0x3008, 0x58d: 0x3b08, 0x58e: 0x3008, 0x58f: 0x3008, 0x590: 0x0008, 0x591: 0x3308,
 	0x592: 0x3308, 0x593: 0x3308, 0x594: 0x3308, 0x595: 0x3308, 0x596: 0x3308, 0x597: 0x3308,
-	0x598: 0x04c9, 0x599: 0x0501, 0x59a: 0x0539, 0x59b: 0x0571, 0x59c: 0x05a9, 0x59d: 0x05e1,
-	0x59e: 0x0619, 0x59f: 0x0651, 0x5a0: 0x0008, 0x5a1: 0x0008, 0x5a2: 0x3308, 0x5a3: 0x3308,
+	0x598: 0x0159, 0x599: 0x0161, 0x59a: 0x0169, 0x59b: 0x0171, 0x59c: 0x0179, 0x59d: 0x0181,
+	0x59e: 0x0189, 0x59f: 0x0191, 0x5a0: 0x0008, 0x5a1: 0x0008, 0x5a2: 0x3308, 0x5a3: 0x3308,
 	0x5a4: 0x0018, 0x5a5: 0x0018, 0x5a6: 0x0008, 0x5a7: 0x0008, 0x5a8: 0x0008, 0x5a9: 0x0008,
 	0x5aa: 0x0008, 0x5ab: 0x0008, 0x5ac: 0x0008, 0x5ad: 0x0008, 0x5ae: 0x0008, 0x5af: 0x0008,
 	0x5b0: 0x0018, 0x5b1: 0x0008, 0x5b2: 0x0008, 0x5b3: 0x0008, 0x5b4: 0x0008, 0x5b5: 0x0008,
@@ -850,8 +993,8 @@ var idnaValues = [8192]uint16{
 	0x606: 0x0040, 0x607: 0x3008, 0x608: 0x3008, 0x609: 0x0040, 0x60a: 0x0040, 0x60b: 0x3008,
 	0x60c: 0x3008, 0x60d: 0x3b08, 0x60e: 0x0008, 0x60f: 0x0040, 0x610: 0x0040, 0x611: 0x0040,
 	0x612: 0x0040, 0x613: 0x0040, 0x614: 0x0040, 0x615: 0x0040, 0x616: 0x0040, 0x617: 0x3008,
-	0x618: 0x0040, 0x619: 0x0040, 0x61a: 0x0040, 0x61b: 0x0040, 0x61c: 0x0689, 0x61d: 0x06c1,
-	0x61e: 0x0040, 0x61f: 0x06f9, 0x620: 0x0008, 0x621: 0x0008, 0x622: 0x3308, 0x623: 0x3308,
+	0x618: 0x0040, 0x619: 0x0040, 0x61a: 0x0040, 0x61b: 0x0040, 0x61c: 0x0199, 0x61d: 0x01a1,
+	0x61e: 0x0040, 0x61f: 0x01a9, 0x620: 0x0008, 0x621: 0x0008, 0x622: 0x3308, 0x623: 0x3308,
 	0x624: 0x0040, 0x625: 0x0040, 0x626: 0x0008, 0x627: 0x0008, 0x628: 0x0008, 0x629: 0x0008,
 	0x62a: 0x0008, 0x62b: 0x0008, 0x62c: 0x0008, 0x62d: 0x0008, 0x62e: 0x0008, 0x62f: 0x0008,
 	0x630: 0x0008, 0x631: 0x0008, 0x632: 0x0018, 0x633: 0x0018, 0x634: 0x0018, 0x635: 0x0018,
@@ -866,16 +1009,16 @@ var idnaValues = [8192]uint16{
 	0x65e: 0x0008, 0x65f: 0x0008, 0x660: 0x0008, 0x661: 0x0008, 0x662: 0x0008, 0x663: 0x0008,
 	0x664: 0x0008, 0x665: 0x0008, 0x666: 0x0008, 0x667: 0x0008, 0x668: 0x0008, 0x669: 0x0040,
 	0x66a: 0x0008, 0x66b: 0x0008, 0x66c: 0x0008, 0x66d: 0x0008, 0x66e: 0x0008, 0x66f: 0x0008,
-	0x670: 0x0008, 0x671: 0x0040, 0x672: 0x0008, 0x673: 0x0731, 0x674: 0x0040, 0x675: 0x0008,
-	0x676: 0x0769, 0x677: 0x0040, 0x678: 0x0008, 0x679: 0x0008, 0x67a: 0x0040, 0x67b: 0x0040,
+	0x670: 0x0008, 0x671: 0x0040, 0x672: 0x0008, 0x673: 0x01b1, 0x674: 0x0040, 0x675: 0x0008,
+	0x676: 0x01b9, 0x677: 0x0040, 0x678: 0x0008, 0x679: 0x0008, 0x67a: 0x0040, 0x67b: 0x0040,
 	0x67c: 0x3308, 0x67d: 0x0040, 0x67e: 0x3008, 0x67f: 0x3008,
 	// Block 0x1a, offset 0x680
 	0x680: 0x3008, 0x681: 0x3308, 0x682: 0x3308, 0x683: 0x0040, 0x684: 0x0040, 0x685: 0x0040,
 	0x686: 0x0040, 0x687: 0x3308, 0x688: 0x3308, 0x689: 0x0040, 0x68a: 0x0040, 0x68b: 0x3308,
 	0x68c: 0x3308, 0x68d: 0x3b08, 0x68e: 0x0040, 0x68f: 0x0040, 0x690: 0x0040, 0x691: 0x3308,
 	0x692: 0x0040, 0x693: 0x0040, 0x694: 0x0040, 0x695: 0x0040, 0x696: 0x0040, 0x697: 0x0040,
-	0x698: 0x0040, 0x699: 0x07a1, 0x69a: 0x07d9, 0x69b: 0x0811, 0x69c: 0x0008, 0x69d: 0x0040,
-	0x69e: 0x0849, 0x69f: 0x0040, 0x6a0: 0x0040, 0x6a1: 0x0040, 0x6a2: 0x0040, 0x6a3: 0x0040,
+	0x698: 0x0040, 0x699: 0x01c1, 0x69a: 0x01c9, 0x69b: 0x01d1, 0x69c: 0x0008, 0x69d: 0x0040,
+	0x69e: 0x01d9, 0x69f: 0x0040, 0x6a0: 0x0040, 0x6a1: 0x0040, 0x6a2: 0x0040, 0x6a3: 0x0040,
 	0x6a4: 0x0040, 0x6a5: 0x0040, 0x6a6: 0x0008, 0x6a7: 0x0008, 0x6a8: 0x0008, 0x6a9: 0x0008,
 	0x6aa: 0x0008, 0x6ab: 0x0008, 0x6ac: 0x0008, 0x6ad: 0x0008, 0x6ae: 0x0008, 0x6af: 0x0008,
 	0x6b0: 0x3308, 0x6b1: 0x3308, 0x6b2: 0x0008, 0x6b3: 0x0008, 0x6b4: 0x0008, 0x6b5: 0x3308,
@@ -922,7 +1065,7 @@ var idnaValues = [8192]uint16{
 	0x786: 0x0040, 0x787: 0x3008, 0x788: 0x3008, 0x789: 0x0040, 0x78a: 0x0040, 0x78b: 0x3008,
 	0x78c: 0x3008, 0x78d: 0x3b08, 0x78e: 0x0040, 0x78f: 0x0040, 0x790: 0x0040, 0x791: 0x0040,
 	0x792: 0x0040, 0x793: 0x0040, 0x794: 0x0040, 0x795: 0x3308, 0x796: 0x3308, 0x797: 0x3008,
-	0x798: 0x0040, 0x799: 0x0040, 0x79a: 0x0040, 0x79b: 0x0040, 0x79c: 0x0881, 0x79d: 0x08b9,
+	0x798: 0x0040, 0x799: 0x0040, 0x79a: 0x0040, 0x79b: 0x0040, 0x79c: 0x01e1, 0x79d: 0x01e9,
 	0x79e: 0x0040, 0x79f: 0x0008, 0x7a0: 0x0008, 0x7a1: 0x0008, 0x7a2: 0x3308, 0x7a3: 0x3308,
 	0x7a4: 0x0040, 0x7a5: 0x0040, 0x7a6: 0x0008, 0x7a7: 0x0008, 0x7a8: 0x0008, 0x7a9: 0x0008,
 	0x7aa: 0x0008, 0x7ab: 0x0008, 0x7ac: 0x0008, 0x7ad: 0x0008, 0x7ae: 0x0008, 0x7af: 0x0008,
@@ -998,32 +1141,32 @@ var idnaValues = [8192]uint16{
 	0x91e: 0x0008, 0x91f: 0x0008, 0x920: 0x0008, 0x921: 0x0008, 0x922: 0x0008, 0x923: 0x0008,
 	0x924: 0x0040, 0x925: 0x0008, 0x926: 0x0040, 0x927: 0x0008, 0x928: 0x0008, 0x929: 0x0008,
 	0x92a: 0x0008, 0x92b: 0x0008, 0x92c: 0x0008, 0x92d: 0x0008, 0x92e: 0x0008, 0x92f: 0x0008,
-	0x930: 0x0008, 0x931: 0x3308, 0x932: 0x0008, 0x933: 0x0929, 0x934: 0x3308, 0x935: 0x3308,
+	0x930: 0x0008, 0x931: 0x3308, 0x932: 0x0008, 0x933: 0x01f9, 0x934: 0x3308, 0x935: 0x3308,
 	0x936: 0x3308, 0x937: 0x3308, 0x938: 0x3308, 0x939: 0x3308, 0x93a: 0x3b08, 0x93b: 0x3308,
 	0x93c: 0x3308, 0x93d: 0x0008, 0x93e: 0x0040, 0x93f: 0x0040,
 	// Block 0x25, offset 0x940
-	0x940: 0x0008, 0x941: 0x0008, 0x942: 0x0008, 0x943: 0x09d1, 0x944: 0x0008, 0x945: 0x0008,
+	0x940: 0x0008, 0x941: 0x0008, 0x942: 0x0008, 0x943: 0x0211, 0x944: 0x0008, 0x945: 0x0008,
 	0x946: 0x0008, 0x947: 0x0008, 0x948: 0x0040, 0x949: 0x0008, 0x94a: 0x0008, 0x94b: 0x0008,
-	0x94c: 0x0008, 0x94d: 0x0a09, 0x94e: 0x0008, 0x94f: 0x0008, 0x950: 0x0008, 0x951: 0x0008,
-	0x952: 0x0a41, 0x953: 0x0008, 0x954: 0x0008, 0x955: 0x0008, 0x956: 0x0008, 0x957: 0x0a79,
-	0x958: 0x0008, 0x959: 0x0008, 0x95a: 0x0008, 0x95b: 0x0008, 0x95c: 0x0ab1, 0x95d: 0x0008,
+	0x94c: 0x0008, 0x94d: 0x0219, 0x94e: 0x0008, 0x94f: 0x0008, 0x950: 0x0008, 0x951: 0x0008,
+	0x952: 0x0221, 0x953: 0x0008, 0x954: 0x0008, 0x955: 0x0008, 0x956: 0x0008, 0x957: 0x0229,
+	0x958: 0x0008, 0x959: 0x0008, 0x95a: 0x0008, 0x95b: 0x0008, 0x95c: 0x0231, 0x95d: 0x0008,
 	0x95e: 0x0008, 0x95f: 0x0008, 0x960: 0x0008, 0x961: 0x0008, 0x962: 0x0008, 0x963: 0x0008,
-	0x964: 0x0008, 0x965: 0x0008, 0x966: 0x0008, 0x967: 0x0008, 0x968: 0x0008, 0x969: 0x0ae9,
+	0x964: 0x0008, 0x965: 0x0008, 0x966: 0x0008, 0x967: 0x0008, 0x968: 0x0008, 0x969: 0x0239,
 	0x96a: 0x0008, 0x96b: 0x0008, 0x96c: 0x0008, 0x96d: 0x0040, 0x96e: 0x0040, 0x96f: 0x0040,
-	0x970: 0x0040, 0x971: 0x3308, 0x972: 0x3308, 0x973: 0x0b21, 0x974: 0x3308, 0x975: 0x0b59,
-	0x976: 0x0b91, 0x977: 0x0bc9, 0x978: 0x0c19, 0x979: 0x0c51, 0x97a: 0x3308, 0x97b: 0x3308,
+	0x970: 0x0040, 0x971: 0x3308, 0x972: 0x3308, 0x973: 0x0241, 0x974: 0x3308, 0x975: 0x0249,
+	0x976: 0x0251, 0x977: 0x0259, 0x978: 0x0261, 0x979: 0x0269, 0x97a: 0x3308, 0x97b: 0x3308,
 	0x97c: 0x3308, 0x97d: 0x3308, 0x97e: 0x3308, 0x97f: 0x3008,
 	// Block 0x26, offset 0x980
-	0x980: 0x3308, 0x981: 0x0ca1, 0x982: 0x3308, 0x983: 0x3308, 0x984: 0x3b08, 0x985: 0x0018,
+	0x980: 0x3308, 0x981: 0x0271, 0x982: 0x3308, 0x983: 0x3308, 0x984: 0x3b08, 0x985: 0x0018,
 	0x986: 0x3308, 0x987: 0x3308, 0x988: 0x0008, 0x989: 0x0008, 0x98a: 0x0008, 0x98b: 0x0008,
 	0x98c: 0x0008, 0x98d: 0x3308, 0x98e: 0x3308, 0x98f: 0x3308, 0x990: 0x3308, 0x991: 0x3308,
-	0x992: 0x3308, 0x993: 0x0cd9, 0x994: 0x3308, 0x995: 0x3308, 0x996: 0x3308, 0x997: 0x3308,
-	0x998: 0x0040, 0x999: 0x3308, 0x99a: 0x3308, 0x99b: 0x3308, 0x99c: 0x3308, 0x99d: 0x0d11,
-	0x99e: 0x3308, 0x99f: 0x3308, 0x9a0: 0x3308, 0x9a1: 0x3308, 0x9a2: 0x0d49, 0x9a3: 0x3308,
-	0x9a4: 0x3308, 0x9a5: 0x3308, 0x9a6: 0x3308, 0x9a7: 0x0d81, 0x9a8: 0x3308, 0x9a9: 0x3308,
-	0x9aa: 0x3308, 0x9ab: 0x3308, 0x9ac: 0x0db9, 0x9ad: 0x3308, 0x9ae: 0x3308, 0x9af: 0x3308,
+	0x992: 0x3308, 0x993: 0x0279, 0x994: 0x3308, 0x995: 0x3308, 0x996: 0x3308, 0x997: 0x3308,
+	0x998: 0x0040, 0x999: 0x3308, 0x99a: 0x3308, 0x99b: 0x3308, 0x99c: 0x3308, 0x99d: 0x0281,
+	0x99e: 0x3308, 0x99f: 0x3308, 0x9a0: 0x3308, 0x9a1: 0x3308, 0x9a2: 0x0289, 0x9a3: 0x3308,
+	0x9a4: 0x3308, 0x9a5: 0x3308, 0x9a6: 0x3308, 0x9a7: 0x0291, 0x9a8: 0x3308, 0x9a9: 0x3308,
+	0x9aa: 0x3308, 0x9ab: 0x3308, 0x9ac: 0x0299, 0x9ad: 0x3308, 0x9ae: 0x3308, 0x9af: 0x3308,
 	0x9b0: 0x3308, 0x9b1: 0x3308, 0x9b2: 0x3308, 0x9b3: 0x3308, 0x9b4: 0x3308, 0x9b5: 0x3308,
-	0x9b6: 0x3308, 0x9b7: 0x3308, 0x9b8: 0x3308, 0x9b9: 0x0df1, 0x9ba: 0x3308, 0x9bb: 0x3308,
+	0x9b6: 0x3308, 0x9b7: 0x3308, 0x9b8: 0x3308, 0x9b9: 0x02a1, 0x9ba: 0x3308, 0x9bb: 0x3308,
 	0x9bc: 0x3308, 0x9bd: 0x0040, 0x9be: 0x0018, 0x9bf: 0x0018,
 	// Block 0x27, offset 0x9c0
 	0x9c0: 0x0008, 0x9c1: 0x0008, 0x9c2: 0x0008, 0x9c3: 0x0008, 0x9c4: 0x0008, 0x9c5: 0x0008,
@@ -1033,34 +1176,34 @@ var idnaValues = [8192]uint16{
 	0x9d8: 0x0008, 0x9d9: 0x0008, 0x9da: 0x0008, 0x9db: 0x0008, 0x9dc: 0x0008, 0x9dd: 0x0008,
 	0x9de: 0x0008, 0x9df: 0x0008, 0x9e0: 0x0008, 0x9e1: 0x0008, 0x9e2: 0x0008, 0x9e3: 0x0008,
 	0x9e4: 0x0008, 0x9e5: 0x0008, 0x9e6: 0x0008, 0x9e7: 0x0008, 0x9e8: 0x0008, 0x9e9: 0x0008,
-	0x9ea: 0x0008, 0x9eb: 0x0008, 0x9ec: 0x0039, 0x9ed: 0x0ed1, 0x9ee: 0x0ee9, 0x9ef: 0x0008,
-	0x9f0: 0x0ef9, 0x9f1: 0x0f09, 0x9f2: 0x0f19, 0x9f3: 0x0f31, 0x9f4: 0x0249, 0x9f5: 0x0f41,
-	0x9f6: 0x0259, 0x9f7: 0x0f51, 0x9f8: 0x0359, 0x9f9: 0x0f61, 0x9fa: 0x0f71, 0x9fb: 0x0008,
-	0x9fc: 0x00d9, 0x9fd: 0x0f81, 0x9fe: 0x0f99, 0x9ff: 0x0269,
+	0x9ea: 0x0008, 0x9eb: 0x0008, 0x9ec: 0x0019, 0x9ed: 0x02e1, 0x9ee: 0x02e9, 0x9ef: 0x0008,
+	0x9f0: 0x02f1, 0x9f1: 0x02f9, 0x9f2: 0x0301, 0x9f3: 0x0309, 0x9f4: 0x00a9, 0x9f5: 0x0311,
+	0x9f6: 0x00b1, 0x9f7: 0x0319, 0x9f8: 0x0101, 0x9f9: 0x0321, 0x9fa: 0x0329, 0x9fb: 0x0008,
+	0x9fc: 0x0051, 0x9fd: 0x0331, 0x9fe: 0x0339, 0x9ff: 0x00b9,
 	// Block 0x28, offset 0xa00
-	0xa00: 0x0fa9, 0xa01: 0x0fb9, 0xa02: 0x0279, 0xa03: 0x0039, 0xa04: 0x0fc9, 0xa05: 0x0fe1,
-	0xa06: 0x05b5, 0xa07: 0x0ee9, 0xa08: 0x0ef9, 0xa09: 0x0f09, 0xa0a: 0x0ff9, 0xa0b: 0x1011,
-	0xa0c: 0x1029, 0xa0d: 0x0f31, 0xa0e: 0x0008, 0xa0f: 0x0f51, 0xa10: 0x0f61, 0xa11: 0x1041,
-	0xa12: 0x00d9, 0xa13: 0x1059, 0xa14: 0x05cd, 0xa15: 0x05cd, 0xa16: 0x0f99, 0xa17: 0x0fa9,
-	0xa18: 0x0fb9, 0xa19: 0x05b5, 0xa1a: 0x1071, 0xa1b: 0x1089, 0xa1c: 0x05e5, 0xa1d: 0x1099,
-	0xa1e: 0x10b1, 0xa1f: 0x10c9, 0xa20: 0x10e1, 0xa21: 0x10f9, 0xa22: 0x0f41, 0xa23: 0x0269,
-	0xa24: 0x0fb9, 0xa25: 0x1089, 0xa26: 0x1099, 0xa27: 0x10b1, 0xa28: 0x1111, 0xa29: 0x10e1,
-	0xa2a: 0x10f9, 0xa2b: 0x0008, 0xa2c: 0x0008, 0xa2d: 0x0008, 0xa2e: 0x0008, 0xa2f: 0x0008,
+	0xa00: 0x0341, 0xa01: 0x0349, 0xa02: 0x00c1, 0xa03: 0x0019, 0xa04: 0x0351, 0xa05: 0x0359,
+	0xa06: 0x05b5, 0xa07: 0x02e9, 0xa08: 0x02f1, 0xa09: 0x02f9, 0xa0a: 0x0361, 0xa0b: 0x0369,
+	0xa0c: 0x0371, 0xa0d: 0x0309, 0xa0e: 0x0008, 0xa0f: 0x0319, 0xa10: 0x0321, 0xa11: 0x0379,
+	0xa12: 0x0051, 0xa13: 0x0381, 0xa14: 0x05cd, 0xa15: 0x05cd, 0xa16: 0x0339, 0xa17: 0x0341,
+	0xa18: 0x0349, 0xa19: 0x05b5, 0xa1a: 0x0389, 0xa1b: 0x0391, 0xa1c: 0x05e5, 0xa1d: 0x0399,
+	0xa1e: 0x03a1, 0xa1f: 0x03a9, 0xa20: 0x03b1, 0xa21: 0x03b9, 0xa22: 0x0311, 0xa23: 0x00b9,
+	0xa24: 0x0349, 0xa25: 0x0391, 0xa26: 0x0399, 0xa27: 0x03a1, 0xa28: 0x03c1, 0xa29: 0x03b1,
+	0xa2a: 0x03b9, 0xa2b: 0x0008, 0xa2c: 0x0008, 0xa2d: 0x0008, 0xa2e: 0x0008, 0xa2f: 0x0008,
 	0xa30: 0x0008, 0xa31: 0x0008, 0xa32: 0x0008, 0xa33: 0x0008, 0xa34: 0x0008, 0xa35: 0x0008,
-	0xa36: 0x0008, 0xa37: 0x0008, 0xa38: 0x1129, 0xa39: 0x0008, 0xa3a: 0x0008, 0xa3b: 0x0008,
+	0xa36: 0x0008, 0xa37: 0x0008, 0xa38: 0x03c9, 0xa39: 0x0008, 0xa3a: 0x0008, 0xa3b: 0x0008,
 	0xa3c: 0x0008, 0xa3d: 0x0008, 0xa3e: 0x0008, 0xa3f: 0x0008,
 	// Block 0x29, offset 0xa40
 	0xa40: 0x0008, 0xa41: 0x0008, 0xa42: 0x0008, 0xa43: 0x0008, 0xa44: 0x0008, 0xa45: 0x0008,
 	0xa46: 0x0008, 0xa47: 0x0008, 0xa48: 0x0008, 0xa49: 0x0008, 0xa4a: 0x0008, 0xa4b: 0x0008,
 	0xa4c: 0x0008, 0xa4d: 0x0008, 0xa4e: 0x0008, 0xa4f: 0x0008, 0xa50: 0x0008, 0xa51: 0x0008,
 	0xa52: 0x0008, 0xa53: 0x0008, 0xa54: 0x0008, 0xa55: 0x0008, 0xa56: 0x0008, 0xa57: 0x0008,
-	0xa58: 0x0008, 0xa59: 0x0008, 0xa5a: 0x0008, 0xa5b: 0x1141, 0xa5c: 0x1159, 0xa5d: 0x1169,
-	0xa5e: 0x1181, 0xa5f: 0x1029, 0xa60: 0x1199, 0xa61: 0x11a9, 0xa62: 0x11c1, 0xa63: 0x11d9,
-	0xa64: 0x11f1, 0xa65: 0x1209, 0xa66: 0x1221, 0xa67: 0x05fd, 0xa68: 0x1239, 0xa69: 0x1251,
-	0xa6a: 0xe17d, 0xa6b: 0x1269, 0xa6c: 0x1281, 0xa6d: 0x1299, 0xa6e: 0x12b1, 0xa6f: 0x12c9,
-	0xa70: 0x12e1, 0xa71: 0x12f9, 0xa72: 0x1311, 0xa73: 0x1329, 0xa74: 0x1341, 0xa75: 0x1359,
-	0xa76: 0x1371, 0xa77: 0x1389, 0xa78: 0x0615, 0xa79: 0x13a1, 0xa7a: 0x13b9, 0xa7b: 0x13d1,
-	0xa7c: 0x13e1, 0xa7d: 0x13f9, 0xa7e: 0x1411, 0xa7f: 0x1429,
+	0xa58: 0x0008, 0xa59: 0x0008, 0xa5a: 0x0008, 0xa5b: 0x03d1, 0xa5c: 0x03d9, 0xa5d: 0x03e1,
+	0xa5e: 0x03e9, 0xa5f: 0x0371, 0xa60: 0x03f1, 0xa61: 0x03f9, 0xa62: 0x0401, 0xa63: 0x0409,
+	0xa64: 0x0411, 0xa65: 0x0419, 0xa66: 0x0421, 0xa67: 0x05fd, 0xa68: 0x0429, 0xa69: 0x0431,
+	0xa6a: 0xe17d, 0xa6b: 0x0439, 0xa6c: 0x0441, 0xa6d: 0x0449, 0xa6e: 0x0451, 0xa6f: 0x0459,
+	0xa70: 0x0461, 0xa71: 0x0469, 0xa72: 0x0471, 0xa73: 0x0479, 0xa74: 0x0481, 0xa75: 0x0489,
+	0xa76: 0x0491, 0xa77: 0x0499, 0xa78: 0x0615, 0xa79: 0x04a1, 0xa7a: 0x04a9, 0xa7b: 0x04b1,
+	0xa7c: 0x04b9, 0xa7d: 0x04c1, 0xa7e: 0x04c9, 0xa7f: 0x04d1,
 	// Block 0x2a, offset 0xa80
 	0xa80: 0xe00d, 0xa81: 0x0008, 0xa82: 0xe00d, 0xa83: 0x0008, 0xa84: 0xe00d, 0xa85: 0x0008,
 	0xa86: 0xe00d, 0xa87: 0x0008, 0xa88: 0xe00d, 0xa89: 0x0008, 0xa8a: 0xe00d, 0xa8b: 0x0008,
@@ -1079,7 +1222,7 @@ var idnaValues = [8192]uint16{
 	0xacc: 0xe00d, 0xacd: 0x0008, 0xace: 0xe00d, 0xacf: 0x0008, 0xad0: 0xe00d, 0xad1: 0x0008,
 	0xad2: 0xe00d, 0xad3: 0x0008, 0xad4: 0xe00d, 0xad5: 0x0008, 0xad6: 0x0008, 0xad7: 0x0008,
 	0xad8: 0x0008, 0xad9: 0x0008, 0xada: 0x062d, 0xadb: 0x064d, 0xadc: 0x0008, 0xadd: 0x0008,
-	0xade: 0x1441, 0xadf: 0x0008, 0xae0: 0xe00d, 0xae1: 0x0008, 0xae2: 0xe00d, 0xae3: 0x0008,
+	0xade: 0x04d9, 0xadf: 0x0008, 0xae0: 0xe00d, 0xae1: 0x0008, 0xae2: 0xe00d, 0xae3: 0x0008,
 	0xae4: 0xe00d, 0xae5: 0x0008, 0xae6: 0xe00d, 0xae7: 0x0008, 0xae8: 0xe00d, 0xae9: 0x0008,
 	0xaea: 0xe00d, 0xaeb: 0x0008, 0xaec: 0xe00d, 0xaed: 0x0008, 0xaee: 0xe00d, 0xaef: 0x0008,
 	0xaf0: 0xe00d, 0xaf1: 0x0008, 0xaf2: 0xe00d, 0xaf3: 0x0008, 0xaf4: 0xe00d, 0xaf5: 0x0008,
@@ -1094,33 +1237,33 @@ var idnaValues = [8192]uint16{
 	0xb1e: 0x0040, 0xb1f: 0xe045, 0xb20: 0x0008, 0xb21: 0x0008, 0xb22: 0x0008, 0xb23: 0x0008,
 	0xb24: 0x0008, 0xb25: 0x0008, 0xb26: 0x0008, 0xb27: 0x0008, 0xb28: 0xe045, 0xb29: 0xe045,
 	0xb2a: 0xe045, 0xb2b: 0xe045, 0xb2c: 0xe045, 0xb2d: 0xe045, 0xb2e: 0xe045, 0xb2f: 0xe045,
-	0xb30: 0x0008, 0xb31: 0x1459, 0xb32: 0x0008, 0xb33: 0x1471, 0xb34: 0x0008, 0xb35: 0x1489,
-	0xb36: 0x0008, 0xb37: 0x14a1, 0xb38: 0x0008, 0xb39: 0x14b9, 0xb3a: 0x0008, 0xb3b: 0x14d1,
-	0xb3c: 0x0008, 0xb3d: 0x14e9, 0xb3e: 0x0040, 0xb3f: 0x0040,
+	0xb30: 0x0008, 0xb31: 0x04e1, 0xb32: 0x0008, 0xb33: 0x04e9, 0xb34: 0x0008, 0xb35: 0x04f1,
+	0xb36: 0x0008, 0xb37: 0x04f9, 0xb38: 0x0008, 0xb39: 0x0501, 0xb3a: 0x0008, 0xb3b: 0x0509,
+	0xb3c: 0x0008, 0xb3d: 0x0511, 0xb3e: 0x0040, 0xb3f: 0x0040,
 	// Block 0x2d, offset 0xb40
-	0xb40: 0x1501, 0xb41: 0x1531, 0xb42: 0x1561, 0xb43: 0x1591, 0xb44: 0x15c1, 0xb45: 0x15f1,
-	0xb46: 0x1621, 0xb47: 0x1651, 0xb48: 0x1501, 0xb49: 0x1531, 0xb4a: 0x1561, 0xb4b: 0x1591,
-	0xb4c: 0x15c1, 0xb4d: 0x15f1, 0xb4e: 0x1621, 0xb4f: 0x1651, 0xb50: 0x1681, 0xb51: 0x16b1,
-	0xb52: 0x16e1, 0xb53: 0x1711, 0xb54: 0x1741, 0xb55: 0x1771, 0xb56: 0x17a1, 0xb57: 0x17d1,
-	0xb58: 0x1681, 0xb59: 0x16b1, 0xb5a: 0x16e1, 0xb5b: 0x1711, 0xb5c: 0x1741, 0xb5d: 0x1771,
-	0xb5e: 0x17a1, 0xb5f: 0x17d1, 0xb60: 0x1801, 0xb61: 0x1831, 0xb62: 0x1861, 0xb63: 0x1891,
-	0xb64: 0x18c1, 0xb65: 0x18f1, 0xb66: 0x1921, 0xb67: 0x1951, 0xb68: 0x1801, 0xb69: 0x1831,
-	0xb6a: 0x1861, 0xb6b: 0x1891, 0xb6c: 0x18c1, 0xb6d: 0x18f1, 0xb6e: 0x1921, 0xb6f: 0x1951,
-	0xb70: 0x0008, 0xb71: 0x0008, 0xb72: 0x1981, 0xb73: 0x19b1, 0xb74: 0x19d9, 0xb75: 0x0040,
-	0xb76: 0x0008, 0xb77: 0x1a01, 0xb78: 0xe045, 0xb79: 0xe045, 0xb7a: 0x0665, 0xb7b: 0x1459,
-	0xb7c: 0x19b1, 0xb7d: 0x067e, 0xb7e: 0x1a31, 0xb7f: 0x069e,
+	0xb40: 0x0519, 0xb41: 0x0521, 0xb42: 0x0529, 0xb43: 0x0531, 0xb44: 0x0539, 0xb45: 0x0541,
+	0xb46: 0x0549, 0xb47: 0x0551, 0xb48: 0x0519, 0xb49: 0x0521, 0xb4a: 0x0529, 0xb4b: 0x0531,
+	0xb4c: 0x0539, 0xb4d: 0x0541, 0xb4e: 0x0549, 0xb4f: 0x0551, 0xb50: 0x0559, 0xb51: 0x0561,
+	0xb52: 0x0569, 0xb53: 0x0571, 0xb54: 0x0579, 0xb55: 0x0581, 0xb56: 0x0589, 0xb57: 0x0591,
+	0xb58: 0x0559, 0xb59: 0x0561, 0xb5a: 0x0569, 0xb5b: 0x0571, 0xb5c: 0x0579, 0xb5d: 0x0581,
+	0xb5e: 0x0589, 0xb5f: 0x0591, 0xb60: 0x0599, 0xb61: 0x05a1, 0xb62: 0x05a9, 0xb63: 0x05b1,
+	0xb64: 0x05b9, 0xb65: 0x05c1, 0xb66: 0x05c9, 0xb67: 0x05d1, 0xb68: 0x0599, 0xb69: 0x05a1,
+	0xb6a: 0x05a9, 0xb6b: 0x05b1, 0xb6c: 0x05b9, 0xb6d: 0x05c1, 0xb6e: 0x05c9, 0xb6f: 0x05d1,
+	0xb70: 0x0008, 0xb71: 0x0008, 0xb72: 0x05d9, 0xb73: 0x05e1, 0xb74: 0x05e9, 0xb75: 0x0040,
+	0xb76: 0x0008, 0xb77: 0x05f1, 0xb78: 0xe045, 0xb79: 0xe045, 0xb7a: 0x0665, 0xb7b: 0x04e1,
+	0xb7c: 0x05e1, 0xb7d: 0x067e, 0xb7e: 0x05f9, 0xb7f: 0x069e,
 	// Block 0x2e, offset 0xb80
-	0xb80: 0x06be, 0xb81: 0x1a4a, 0xb82: 0x1a79, 0xb83: 0x1aa9, 0xb84: 0x1ad1, 0xb85: 0x0040,
-	0xb86: 0x0008, 0xb87: 0x1af9, 0xb88: 0x06dd, 0xb89: 0x1471, 0xb8a: 0x06f5, 0xb8b: 0x1489,
-	0xb8c: 0x1aa9, 0xb8d: 0x1b2a, 0xb8e: 0x1b5a, 0xb8f: 0x1b8a, 0xb90: 0x0008, 0xb91: 0x0008,
-	0xb92: 0x0008, 0xb93: 0x1bb9, 0xb94: 0x0040, 0xb95: 0x0040, 0xb96: 0x0008, 0xb97: 0x0008,
-	0xb98: 0xe045, 0xb99: 0xe045, 0xb9a: 0x070d, 0xb9b: 0x14a1, 0xb9c: 0x0040, 0xb9d: 0x1bd2,
-	0xb9e: 0x1c02, 0xb9f: 0x1c32, 0xba0: 0x0008, 0xba1: 0x0008, 0xba2: 0x0008, 0xba3: 0x1c61,
+	0xb80: 0x06be, 0xb81: 0x0602, 0xb82: 0x0609, 0xb83: 0x0611, 0xb84: 0x0619, 0xb85: 0x0040,
+	0xb86: 0x0008, 0xb87: 0x0621, 0xb88: 0x06dd, 0xb89: 0x04e9, 0xb8a: 0x06f5, 0xb8b: 0x04f1,
+	0xb8c: 0x0611, 0xb8d: 0x062a, 0xb8e: 0x0632, 0xb8f: 0x063a, 0xb90: 0x0008, 0xb91: 0x0008,
+	0xb92: 0x0008, 0xb93: 0x0641, 0xb94: 0x0040, 0xb95: 0x0040, 0xb96: 0x0008, 0xb97: 0x0008,
+	0xb98: 0xe045, 0xb99: 0xe045, 0xb9a: 0x070d, 0xb9b: 0x04f9, 0xb9c: 0x0040, 0xb9d: 0x064a,
+	0xb9e: 0x0652, 0xb9f: 0x065a, 0xba0: 0x0008, 0xba1: 0x0008, 0xba2: 0x0008, 0xba3: 0x0661,
 	0xba4: 0x0008, 0xba5: 0x0008, 0xba6: 0x0008, 0xba7: 0x0008, 0xba8: 0xe045, 0xba9: 0xe045,
-	0xbaa: 0x0725, 0xbab: 0x14d1, 0xbac: 0xe04d, 0xbad: 0x1c7a, 0xbae: 0x03d2, 0xbaf: 0x1caa,
-	0xbb0: 0x0040, 0xbb1: 0x0040, 0xbb2: 0x1cb9, 0xbb3: 0x1ce9, 0xbb4: 0x1d11, 0xbb5: 0x0040,
-	0xbb6: 0x0008, 0xbb7: 0x1d39, 0xbb8: 0x073d, 0xbb9: 0x14b9, 0xbba: 0x0515, 0xbbb: 0x14e9,
-	0xbbc: 0x1ce9, 0xbbd: 0x0756, 0xbbe: 0x0776, 0xbbf: 0x0040,
+	0xbaa: 0x0725, 0xbab: 0x0509, 0xbac: 0xe04d, 0xbad: 0x066a, 0xbae: 0x012a, 0xbaf: 0x0672,
+	0xbb0: 0x0040, 0xbb1: 0x0040, 0xbb2: 0x0679, 0xbb3: 0x0681, 0xbb4: 0x0689, 0xbb5: 0x0040,
+	0xbb6: 0x0008, 0xbb7: 0x0691, 0xbb8: 0x073d, 0xbb9: 0x0501, 0xbba: 0x0515, 0xbbb: 0x0511,
+	0xbbc: 0x0681, 0xbbd: 0x0756, 0xbbe: 0x0776, 0xbbf: 0x0040,
 	// Block 0x2f, offset 0xbc0
 	0xbc0: 0x000a, 0xbc1: 0x000a, 0xbc2: 0x000a, 0xbc3: 0x000a, 0xbc4: 0x000a, 0xbc5: 0x000a,
 	0xbc6: 0x000a, 0xbc7: 0x000a, 0xbc8: 0x000a, 0xbc9: 0x000a, 0xbca: 0x000a, 0xbcb: 0x03c0,
@@ -1130,72 +1273,72 @@ var idnaValues = [8192]uint16{
 	0xbde: 0x0018, 0xbdf: 0x0018, 0xbe0: 0x0018, 0xbe1: 0x0018, 0xbe2: 0x0018, 0xbe3: 0x0018,
 	0xbe4: 0x0040, 0xbe5: 0x0040, 0xbe6: 0x0040, 0xbe7: 0x0018, 0xbe8: 0x0040, 0xbe9: 0x0040,
 	0xbea: 0x0340, 0xbeb: 0x0340, 0xbec: 0x0340, 0xbed: 0x0340, 0xbee: 0x0340, 0xbef: 0x000a,
-	0xbf0: 0x0018, 0xbf1: 0x0018, 0xbf2: 0x0018, 0xbf3: 0x1d69, 0xbf4: 0x1da1, 0xbf5: 0x0018,
-	0xbf6: 0x1df1, 0xbf7: 0x1e29, 0xbf8: 0x0018, 0xbf9: 0x0018, 0xbfa: 0x0018, 0xbfb: 0x0018,
-	0xbfc: 0x1e7a, 0xbfd: 0x0018, 0xbfe: 0x07b6, 0xbff: 0x0018,
+	0xbf0: 0x0018, 0xbf1: 0x0018, 0xbf2: 0x0018, 0xbf3: 0x0699, 0xbf4: 0x06a1, 0xbf5: 0x0018,
+	0xbf6: 0x06a9, 0xbf7: 0x06b1, 0xbf8: 0x0018, 0xbf9: 0x0018, 0xbfa: 0x0018, 0xbfb: 0x0018,
+	0xbfc: 0x06ba, 0xbfd: 0x0018, 0xbfe: 0x07b6, 0xbff: 0x0018,
 	// Block 0x30, offset 0xc00
 	0xc00: 0x0018, 0xc01: 0x0018, 0xc02: 0x0018, 0xc03: 0x0018, 0xc04: 0x0018, 0xc05: 0x0018,
-	0xc06: 0x0018, 0xc07: 0x1e92, 0xc08: 0x1eaa, 0xc09: 0x1ec2, 0xc0a: 0x0018, 0xc0b: 0x0018,
+	0xc06: 0x0018, 0xc07: 0x06c2, 0xc08: 0x06ca, 0xc09: 0x06d2, 0xc0a: 0x0018, 0xc0b: 0x0018,
 	0xc0c: 0x0018, 0xc0d: 0x0018, 0xc0e: 0x0018, 0xc0f: 0x0018, 0xc10: 0x0018, 0xc11: 0x0018,
-	0xc12: 0x0018, 0xc13: 0x0018, 0xc14: 0x0018, 0xc15: 0x0018, 0xc16: 0x0018, 0xc17: 0x1ed9,
+	0xc12: 0x0018, 0xc13: 0x0018, 0xc14: 0x0018, 0xc15: 0x0018, 0xc16: 0x0018, 0xc17: 0x06d9,
 	0xc18: 0x0018, 0xc19: 0x0018, 0xc1a: 0x0018, 0xc1b: 0x0018, 0xc1c: 0x0018, 0xc1d: 0x0018,
 	0xc1e: 0x0018, 0xc1f: 0x000a, 0xc20: 0x03c0, 0xc21: 0x0340, 0xc22: 0x0340, 0xc23: 0x0340,
 	0xc24: 0x03c0, 0xc25: 0x0040, 0xc26: 0x0040, 0xc27: 0x0040, 0xc28: 0x0040, 0xc29: 0x0040,
 	0xc2a: 0x0340, 0xc2b: 0x0340, 0xc2c: 0x0340, 0xc2d: 0x0340, 0xc2e: 0x0340, 0xc2f: 0x0340,
-	0xc30: 0x1f41, 0xc31: 0x0f41, 0xc32: 0x0040, 0xc33: 0x0040, 0xc34: 0x1f51, 0xc35: 0x1f61,
-	0xc36: 0x1f71, 0xc37: 0x1f81, 0xc38: 0x1f91, 0xc39: 0x1fa1, 0xc3a: 0x1fb2, 0xc3b: 0x07d5,
-	0xc3c: 0x1fc2, 0xc3d: 0x1fd2, 0xc3e: 0x1fe2, 0xc3f: 0x0f71,
+	0xc30: 0x06e1, 0xc31: 0x0311, 0xc32: 0x0040, 0xc33: 0x0040, 0xc34: 0x06e9, 0xc35: 0x06f1,
+	0xc36: 0x06f9, 0xc37: 0x0701, 0xc38: 0x0709, 0xc39: 0x0711, 0xc3a: 0x071a, 0xc3b: 0x07d5,
+	0xc3c: 0x0722, 0xc3d: 0x072a, 0xc3e: 0x0732, 0xc3f: 0x0329,
 	// Block 0x31, offset 0xc40
-	0xc40: 0x1f41, 0xc41: 0x00c9, 0xc42: 0x0069, 0xc43: 0x0079, 0xc44: 0x1f51, 0xc45: 0x1f61,
-	0xc46: 0x1f71, 0xc47: 0x1f81, 0xc48: 0x1f91, 0xc49: 0x1fa1, 0xc4a: 0x1fb2, 0xc4b: 0x07ed,
-	0xc4c: 0x1fc2, 0xc4d: 0x1fd2, 0xc4e: 0x1fe2, 0xc4f: 0x0040, 0xc50: 0x0039, 0xc51: 0x0f09,
-	0xc52: 0x00d9, 0xc53: 0x0369, 0xc54: 0x0ff9, 0xc55: 0x0249, 0xc56: 0x0f51, 0xc57: 0x0359,
-	0xc58: 0x0f61, 0xc59: 0x0f71, 0xc5a: 0x0f99, 0xc5b: 0x01d9, 0xc5c: 0x0fa9, 0xc5d: 0x0040,
+	0xc40: 0x06e1, 0xc41: 0x0049, 0xc42: 0x0029, 0xc43: 0x0031, 0xc44: 0x06e9, 0xc45: 0x06f1,
+	0xc46: 0x06f9, 0xc47: 0x0701, 0xc48: 0x0709, 0xc49: 0x0711, 0xc4a: 0x071a, 0xc4b: 0x07ed,
+	0xc4c: 0x0722, 0xc4d: 0x072a, 0xc4e: 0x0732, 0xc4f: 0x0040, 0xc50: 0x0019, 0xc51: 0x02f9,
+	0xc52: 0x0051, 0xc53: 0x0109, 0xc54: 0x0361, 0xc55: 0x00a9, 0xc56: 0x0319, 0xc57: 0x0101,
+	0xc58: 0x0321, 0xc59: 0x0329, 0xc5a: 0x0339, 0xc5b: 0x0089, 0xc5c: 0x0341, 0xc5d: 0x0040,
 	0xc5e: 0x0040, 0xc5f: 0x0040, 0xc60: 0x0018, 0xc61: 0x0018, 0xc62: 0x0018, 0xc63: 0x0018,
-	0xc64: 0x0018, 0xc65: 0x0018, 0xc66: 0x0018, 0xc67: 0x0018, 0xc68: 0x1ff1, 0xc69: 0x0018,
+	0xc64: 0x0018, 0xc65: 0x0018, 0xc66: 0x0018, 0xc67: 0x0018, 0xc68: 0x0739, 0xc69: 0x0018,
 	0xc6a: 0x0018, 0xc6b: 0x0018, 0xc6c: 0x0018, 0xc6d: 0x0018, 0xc6e: 0x0018, 0xc6f: 0x0018,
 	0xc70: 0x0018, 0xc71: 0x0018, 0xc72: 0x0018, 0xc73: 0x0018, 0xc74: 0x0018, 0xc75: 0x0018,
 	0xc76: 0x0018, 0xc77: 0x0018, 0xc78: 0x0018, 0xc79: 0x0018, 0xc7a: 0x0018, 0xc7b: 0x0018,
 	0xc7c: 0x0018, 0xc7d: 0x0018, 0xc7e: 0x0018, 0xc7f: 0x0018,
 	// Block 0x32, offset 0xc80
-	0xc80: 0x0806, 0xc81: 0x0826, 0xc82: 0x1159, 0xc83: 0x0845, 0xc84: 0x0018, 0xc85: 0x0866,
-	0xc86: 0x0886, 0xc87: 0x1011, 0xc88: 0x0018, 0xc89: 0x08a5, 0xc8a: 0x0f31, 0xc8b: 0x0249,
-	0xc8c: 0x0249, 0xc8d: 0x0249, 0xc8e: 0x0249, 0xc8f: 0x2009, 0xc90: 0x0f41, 0xc91: 0x0f41,
-	0xc92: 0x0359, 0xc93: 0x0359, 0xc94: 0x0018, 0xc95: 0x0f71, 0xc96: 0x2021, 0xc97: 0x0018,
-	0xc98: 0x0018, 0xc99: 0x0f99, 0xc9a: 0x2039, 0xc9b: 0x0269, 0xc9c: 0x0269, 0xc9d: 0x0269,
-	0xc9e: 0x0018, 0xc9f: 0x0018, 0xca0: 0x2049, 0xca1: 0x08c5, 0xca2: 0x2061, 0xca3: 0x0018,
-	0xca4: 0x13d1, 0xca5: 0x0018, 0xca6: 0x2079, 0xca7: 0x0018, 0xca8: 0x13d1, 0xca9: 0x0018,
-	0xcaa: 0x0f51, 0xcab: 0x2091, 0xcac: 0x0ee9, 0xcad: 0x1159, 0xcae: 0x0018, 0xcaf: 0x0f09,
-	0xcb0: 0x0f09, 0xcb1: 0x1199, 0xcb2: 0x0040, 0xcb3: 0x0f61, 0xcb4: 0x00d9, 0xcb5: 0x20a9,
-	0xcb6: 0x20c1, 0xcb7: 0x20d9, 0xcb8: 0x20f1, 0xcb9: 0x0f41, 0xcba: 0x0018, 0xcbb: 0x08e5,
-	0xcbc: 0x2109, 0xcbd: 0x10b1, 0xcbe: 0x10b1, 0xcbf: 0x2109,
+	0xc80: 0x0806, 0xc81: 0x0826, 0xc82: 0x03d9, 0xc83: 0x0845, 0xc84: 0x0018, 0xc85: 0x0866,
+	0xc86: 0x0886, 0xc87: 0x0369, 0xc88: 0x0018, 0xc89: 0x08a5, 0xc8a: 0x0309, 0xc8b: 0x00a9,
+	0xc8c: 0x00a9, 0xc8d: 0x00a9, 0xc8e: 0x00a9, 0xc8f: 0x0741, 0xc90: 0x0311, 0xc91: 0x0311,
+	0xc92: 0x0101, 0xc93: 0x0101, 0xc94: 0x0018, 0xc95: 0x0329, 0xc96: 0x0749, 0xc97: 0x0018,
+	0xc98: 0x0018, 0xc99: 0x0339, 0xc9a: 0x0751, 0xc9b: 0x00b9, 0xc9c: 0x00b9, 0xc9d: 0x00b9,
+	0xc9e: 0x0018, 0xc9f: 0x0018, 0xca0: 0x0759, 0xca1: 0x08c5, 0xca2: 0x0761, 0xca3: 0x0018,
+	0xca4: 0x04b1, 0xca5: 0x0018, 0xca6: 0x0769, 0xca7: 0x0018, 0xca8: 0x04b1, 0xca9: 0x0018,
+	0xcaa: 0x0319, 0xcab: 0x0771, 0xcac: 0x02e9, 0xcad: 0x03d9, 0xcae: 0x0018, 0xcaf: 0x02f9,
+	0xcb0: 0x02f9, 0xcb1: 0x03f1, 0xcb2: 0x0040, 0xcb3: 0x0321, 0xcb4: 0x0051, 0xcb5: 0x0779,
+	0xcb6: 0x0781, 0xcb7: 0x0789, 0xcb8: 0x0791, 0xcb9: 0x0311, 0xcba: 0x0018, 0xcbb: 0x08e5,
+	0xcbc: 0x0799, 0xcbd: 0x03a1, 0xcbe: 0x03a1, 0xcbf: 0x0799,
 	// Block 0x33, offset 0xcc0
-	0xcc0: 0x0905, 0xcc1: 0x0018, 0xcc2: 0x0018, 0xcc3: 0x0018, 0xcc4: 0x0018, 0xcc5: 0x0ef9,
-	0xcc6: 0x0ef9, 0xcc7: 0x0f09, 0xcc8: 0x0f41, 0xcc9: 0x0259, 0xcca: 0x0018, 0xccb: 0x0018,
-	0xccc: 0x0018, 0xccd: 0x0018, 0xcce: 0x0008, 0xccf: 0x0018, 0xcd0: 0x2121, 0xcd1: 0x2151,
-	0xcd2: 0x2181, 0xcd3: 0x21b9, 0xcd4: 0x21e9, 0xcd5: 0x2219, 0xcd6: 0x2249, 0xcd7: 0x2279,
-	0xcd8: 0x22a9, 0xcd9: 0x22d9, 0xcda: 0x2309, 0xcdb: 0x2339, 0xcdc: 0x2369, 0xcdd: 0x2399,
-	0xcde: 0x23c9, 0xcdf: 0x23f9, 0xce0: 0x0f41, 0xce1: 0x2421, 0xce2: 0x091d, 0xce3: 0x2439,
-	0xce4: 0x1089, 0xce5: 0x2451, 0xce6: 0x093d, 0xce7: 0x2469, 0xce8: 0x2491, 0xce9: 0x0369,
-	0xcea: 0x24a9, 0xceb: 0x095d, 0xcec: 0x0359, 0xced: 0x1159, 0xcee: 0x0ef9, 0xcef: 0x0f61,
-	0xcf0: 0x0f41, 0xcf1: 0x2421, 0xcf2: 0x097d, 0xcf3: 0x2439, 0xcf4: 0x1089, 0xcf5: 0x2451,
-	0xcf6: 0x099d, 0xcf7: 0x2469, 0xcf8: 0x2491, 0xcf9: 0x0369, 0xcfa: 0x24a9, 0xcfb: 0x09bd,
-	0xcfc: 0x0359, 0xcfd: 0x1159, 0xcfe: 0x0ef9, 0xcff: 0x0f61,
+	0xcc0: 0x0905, 0xcc1: 0x0018, 0xcc2: 0x0018, 0xcc3: 0x0018, 0xcc4: 0x0018, 0xcc5: 0x02f1,
+	0xcc6: 0x02f1, 0xcc7: 0x02f9, 0xcc8: 0x0311, 0xcc9: 0x00b1, 0xcca: 0x0018, 0xccb: 0x0018,
+	0xccc: 0x0018, 0xccd: 0x0018, 0xcce: 0x0008, 0xccf: 0x0018, 0xcd0: 0x07a1, 0xcd1: 0x07a9,
+	0xcd2: 0x07b1, 0xcd3: 0x07b9, 0xcd4: 0x07c1, 0xcd5: 0x07c9, 0xcd6: 0x07d1, 0xcd7: 0x07d9,
+	0xcd8: 0x07e1, 0xcd9: 0x07e9, 0xcda: 0x07f1, 0xcdb: 0x07f9, 0xcdc: 0x0801, 0xcdd: 0x0809,
+	0xcde: 0x0811, 0xcdf: 0x0819, 0xce0: 0x0311, 0xce1: 0x0821, 0xce2: 0x091d, 0xce3: 0x0829,
+	0xce4: 0x0391, 0xce5: 0x0831, 0xce6: 0x093d, 0xce7: 0x0839, 0xce8: 0x0841, 0xce9: 0x0109,
+	0xcea: 0x0849, 0xceb: 0x095d, 0xcec: 0x0101, 0xced: 0x03d9, 0xcee: 0x02f1, 0xcef: 0x0321,
+	0xcf0: 0x0311, 0xcf1: 0x0821, 0xcf2: 0x097d, 0xcf3: 0x0829, 0xcf4: 0x0391, 0xcf5: 0x0831,
+	0xcf6: 0x099d, 0xcf7: 0x0839, 0xcf8: 0x0841, 0xcf9: 0x0109, 0xcfa: 0x0849, 0xcfb: 0x09bd,
+	0xcfc: 0x0101, 0xcfd: 0x03d9, 0xcfe: 0x02f1, 0xcff: 0x0321,
 	// Block 0x34, offset 0xd00
 	0xd00: 0x0018, 0xd01: 0x0018, 0xd02: 0x0018, 0xd03: 0x0018, 0xd04: 0x0018, 0xd05: 0x0018,
 	0xd06: 0x0018, 0xd07: 0x0018, 0xd08: 0x0018, 0xd09: 0x0018, 0xd0a: 0x0018, 0xd0b: 0x0040,
 	0xd0c: 0x0040, 0xd0d: 0x0040, 0xd0e: 0x0040, 0xd0f: 0x0040, 0xd10: 0x0040, 0xd11: 0x0040,
 	0xd12: 0x0040, 0xd13: 0x0040, 0xd14: 0x0040, 0xd15: 0x0040, 0xd16: 0x0040, 0xd17: 0x0040,
 	0xd18: 0x0040, 0xd19: 0x0040, 0xd1a: 0x0040, 0xd1b: 0x0040, 0xd1c: 0x0040, 0xd1d: 0x0040,
-	0xd1e: 0x0040, 0xd1f: 0x0040, 0xd20: 0x00c9, 0xd21: 0x0069, 0xd22: 0x0079, 0xd23: 0x1f51,
-	0xd24: 0x1f61, 0xd25: 0x1f71, 0xd26: 0x1f81, 0xd27: 0x1f91, 0xd28: 0x1fa1, 0xd29: 0x2601,
-	0xd2a: 0x2619, 0xd2b: 0x2631, 0xd2c: 0x2649, 0xd2d: 0x2661, 0xd2e: 0x2679, 0xd2f: 0x2691,
-	0xd30: 0x26a9, 0xd31: 0x26c1, 0xd32: 0x26d9, 0xd33: 0x26f1, 0xd34: 0x0a1e, 0xd35: 0x0a3e,
+	0xd1e: 0x0040, 0xd1f: 0x0040, 0xd20: 0x0049, 0xd21: 0x0029, 0xd22: 0x0031, 0xd23: 0x06e9,
+	0xd24: 0x06f1, 0xd25: 0x06f9, 0xd26: 0x0701, 0xd27: 0x0709, 0xd28: 0x0711, 0xd29: 0x0879,
+	0xd2a: 0x0881, 0xd2b: 0x0889, 0xd2c: 0x0891, 0xd2d: 0x0899, 0xd2e: 0x08a1, 0xd2f: 0x08a9,
+	0xd30: 0x08b1, 0xd31: 0x08b9, 0xd32: 0x08c1, 0xd33: 0x08c9, 0xd34: 0x0a1e, 0xd35: 0x0a3e,
 	0xd36: 0x0a5e, 0xd37: 0x0a7e, 0xd38: 0x0a9e, 0xd39: 0x0abe, 0xd3a: 0x0ade, 0xd3b: 0x0afe,
-	0xd3c: 0x0b1e, 0xd3d: 0x270a, 0xd3e: 0x2732, 0xd3f: 0x275a,
+	0xd3c: 0x0b1e, 0xd3d: 0x08d2, 0xd3e: 0x08da, 0xd3f: 0x08e2,
 	// Block 0x35, offset 0xd40
-	0xd40: 0x2782, 0xd41: 0x27aa, 0xd42: 0x27d2, 0xd43: 0x27fa, 0xd44: 0x2822, 0xd45: 0x284a,
-	0xd46: 0x2872, 0xd47: 0x289a, 0xd48: 0x0040, 0xd49: 0x0040, 0xd4a: 0x0040, 0xd4b: 0x0040,
+	0xd40: 0x08ea, 0xd41: 0x08f2, 0xd42: 0x08fa, 0xd43: 0x0902, 0xd44: 0x090a, 0xd45: 0x0912,
+	0xd46: 0x091a, 0xd47: 0x0922, 0xd48: 0x0040, 0xd49: 0x0040, 0xd4a: 0x0040, 0xd4b: 0x0040,
 	0xd4c: 0x0040, 0xd4d: 0x0040, 0xd4e: 0x0040, 0xd4f: 0x0040, 0xd50: 0x0040, 0xd51: 0x0040,
 	0xd52: 0x0040, 0xd53: 0x0040, 0xd54: 0x0040, 0xd55: 0x0040, 0xd56: 0x0040, 0xd57: 0x0040,
 	0xd58: 0x0040, 0xd59: 0x0040, 0xd5a: 0x0040, 0xd5b: 0x0040, 0xd5c: 0x0b3e, 0xd5d: 0x0b5e,
@@ -1203,17 +1346,17 @@ var idnaValues = [8192]uint16{
 	0xd64: 0x0c3e, 0xd65: 0x0c5e, 0xd66: 0x0c7e, 0xd67: 0x0c9e, 0xd68: 0x0cbe, 0xd69: 0x0cde,
 	0xd6a: 0x0cfe, 0xd6b: 0x0d1e, 0xd6c: 0x0d3e, 0xd6d: 0x0d5e, 0xd6e: 0x0d7e, 0xd6f: 0x0d9e,
 	0xd70: 0x0dbe, 0xd71: 0x0dde, 0xd72: 0x0dfe, 0xd73: 0x0e1e, 0xd74: 0x0e3e, 0xd75: 0x0e5e,
-	0xd76: 0x0039, 0xd77: 0x0ee9, 0xd78: 0x1159, 0xd79: 0x0ef9, 0xd7a: 0x0f09, 0xd7b: 0x1199,
-	0xd7c: 0x0f31, 0xd7d: 0x0249, 0xd7e: 0x0f41, 0xd7f: 0x0259,
+	0xd76: 0x0019, 0xd77: 0x02e9, 0xd78: 0x03d9, 0xd79: 0x02f1, 0xd7a: 0x02f9, 0xd7b: 0x03f1,
+	0xd7c: 0x0309, 0xd7d: 0x00a9, 0xd7e: 0x0311, 0xd7f: 0x00b1,
 	// Block 0x36, offset 0xd80
-	0xd80: 0x0f51, 0xd81: 0x0359, 0xd82: 0x0f61, 0xd83: 0x0f71, 0xd84: 0x00d9, 0xd85: 0x0f99,
-	0xd86: 0x2039, 0xd87: 0x0269, 0xd88: 0x01d9, 0xd89: 0x0fa9, 0xd8a: 0x0fb9, 0xd8b: 0x1089,
-	0xd8c: 0x0279, 0xd8d: 0x0369, 0xd8e: 0x0289, 0xd8f: 0x13d1, 0xd90: 0x0039, 0xd91: 0x0ee9,
-	0xd92: 0x1159, 0xd93: 0x0ef9, 0xd94: 0x0f09, 0xd95: 0x1199, 0xd96: 0x0f31, 0xd97: 0x0249,
-	0xd98: 0x0f41, 0xd99: 0x0259, 0xd9a: 0x0f51, 0xd9b: 0x0359, 0xd9c: 0x0f61, 0xd9d: 0x0f71,
-	0xd9e: 0x00d9, 0xd9f: 0x0f99, 0xda0: 0x2039, 0xda1: 0x0269, 0xda2: 0x01d9, 0xda3: 0x0fa9,
-	0xda4: 0x0fb9, 0xda5: 0x1089, 0xda6: 0x0279, 0xda7: 0x0369, 0xda8: 0x0289, 0xda9: 0x13d1,
-	0xdaa: 0x1f41, 0xdab: 0x0018, 0xdac: 0x0018, 0xdad: 0x0018, 0xdae: 0x0018, 0xdaf: 0x0018,
+	0xd80: 0x0319, 0xd81: 0x0101, 0xd82: 0x0321, 0xd83: 0x0329, 0xd84: 0x0051, 0xd85: 0x0339,
+	0xd86: 0x0751, 0xd87: 0x00b9, 0xd88: 0x0089, 0xd89: 0x0341, 0xd8a: 0x0349, 0xd8b: 0x0391,
+	0xd8c: 0x00c1, 0xd8d: 0x0109, 0xd8e: 0x00c9, 0xd8f: 0x04b1, 0xd90: 0x0019, 0xd91: 0x02e9,
+	0xd92: 0x03d9, 0xd93: 0x02f1, 0xd94: 0x02f9, 0xd95: 0x03f1, 0xd96: 0x0309, 0xd97: 0x00a9,
+	0xd98: 0x0311, 0xd99: 0x00b1, 0xd9a: 0x0319, 0xd9b: 0x0101, 0xd9c: 0x0321, 0xd9d: 0x0329,
+	0xd9e: 0x0051, 0xd9f: 0x0339, 0xda0: 0x0751, 0xda1: 0x00b9, 0xda2: 0x0089, 0xda3: 0x0341,
+	0xda4: 0x0349, 0xda5: 0x0391, 0xda6: 0x00c1, 0xda7: 0x0109, 0xda8: 0x00c9, 0xda9: 0x04b1,
+	0xdaa: 0x06e1, 0xdab: 0x0018, 0xdac: 0x0018, 0xdad: 0x0018, 0xdae: 0x0018, 0xdaf: 0x0018,
 	0xdb0: 0x0018, 0xdb1: 0x0018, 0xdb2: 0x0018, 0xdb3: 0x0018, 0xdb4: 0x0018, 0xdb5: 0x0018,
 	0xdb6: 0x0018, 0xdb7: 0x0018, 0xdb8: 0x0018, 0xdb9: 0x0018, 0xdba: 0x0018, 0xdbb: 0x0018,
 	0xdbc: 0x0018, 0xdbd: 0x0018, 0xdbe: 0x0018, 0xdbf: 0x0018,
@@ -1223,12 +1366,12 @@ var idnaValues = [8192]uint16{
 	0xdcc: 0x0008, 0xdcd: 0x0008, 0xdce: 0x0008, 0xdcf: 0x0008, 0xdd0: 0x0008, 0xdd1: 0x0008,
 	0xdd2: 0x0008, 0xdd3: 0x0008, 0xdd4: 0x0008, 0xdd5: 0x0008, 0xdd6: 0x0008, 0xdd7: 0x0008,
 	0xdd8: 0x0008, 0xdd9: 0x0008, 0xdda: 0x0008, 0xddb: 0x0008, 0xddc: 0x0008, 0xddd: 0x0008,
-	0xdde: 0x0008, 0xddf: 0x0040, 0xde0: 0xe00d, 0xde1: 0x0008, 0xde2: 0x2971, 0xde3: 0x0ed5,
-	0xde4: 0x2989, 0xde5: 0x0008, 0xde6: 0x0008, 0xde7: 0xe07d, 0xde8: 0x0008, 0xde9: 0xe01d,
-	0xdea: 0x0008, 0xdeb: 0xe03d, 0xdec: 0x0008, 0xded: 0x0fe1, 0xdee: 0x1281, 0xdef: 0x0fc9,
-	0xdf0: 0x1141, 0xdf1: 0x0008, 0xdf2: 0xe00d, 0xdf3: 0x0008, 0xdf4: 0x0008, 0xdf5: 0xe01d,
+	0xdde: 0x0008, 0xddf: 0x0040, 0xde0: 0xe00d, 0xde1: 0x0008, 0xde2: 0x0941, 0xde3: 0x0ed5,
+	0xde4: 0x0949, 0xde5: 0x0008, 0xde6: 0x0008, 0xde7: 0xe07d, 0xde8: 0x0008, 0xde9: 0xe01d,
+	0xdea: 0x0008, 0xdeb: 0xe03d, 0xdec: 0x0008, 0xded: 0x0359, 0xdee: 0x0441, 0xdef: 0x0351,
+	0xdf0: 0x03d1, 0xdf1: 0x0008, 0xdf2: 0xe00d, 0xdf3: 0x0008, 0xdf4: 0x0008, 0xdf5: 0xe01d,
 	0xdf6: 0x0008, 0xdf7: 0x0008, 0xdf8: 0x0008, 0xdf9: 0x0008, 0xdfa: 0x0008, 0xdfb: 0x0008,
-	0xdfc: 0x0259, 0xdfd: 0x1089, 0xdfe: 0x29a1, 0xdff: 0x29b9,
+	0xdfc: 0x00b1, 0xdfd: 0x0391, 0xdfe: 0x0951, 0xdff: 0x0959,
 	// Block 0x38, offset 0xe00
 	0xe00: 0xe00d, 0xe01: 0x0008, 0xe02: 0xe00d, 0xe03: 0x0008, 0xe04: 0xe00d, 0xe05: 0x0008,
 	0xe06: 0xe00d, 0xe07: 0x0008, 0xe08: 0xe00d, 0xe09: 0x0008, 0xe0a: 0xe00d, 0xe0b: 0x0008,
@@ -1254,7 +1397,7 @@ var idnaValues = [8192]uint16{
 	0xe76: 0x0040, 0xe77: 0x0040, 0xe78: 0x0040, 0xe79: 0x0040, 0xe7a: 0x0040, 0xe7b: 0x0040,
 	0xe7c: 0x0040, 0xe7d: 0x0040, 0xe7e: 0x0040, 0xe7f: 0x0040,
 	// Block 0x3a, offset 0xe80
-	0xe80: 0x000a, 0xe81: 0x0018, 0xe82: 0x29d1, 0xe83: 0x0018, 0xe84: 0x0018, 0xe85: 0x0008,
+	0xe80: 0x000a, 0xe81: 0x0018, 0xe82: 0x0961, 0xe83: 0x0018, 0xe84: 0x0018, 0xe85: 0x0008,
 	0xe86: 0x0008, 0xe87: 0x0008, 0xe88: 0x0018, 0xe89: 0x0018, 0xe8a: 0x0018, 0xe8b: 0x0018,
 	0xe8c: 0x0018, 0xe8d: 0x0018, 0xe8e: 0x0018, 0xe8f: 0x0018, 0xe90: 0x0018, 0xe91: 0x0018,
 	0xe92: 0x0018, 0xe93: 0x0018, 0xe94: 0x0018, 0xe95: 0x0018, 0xe96: 0x0018, 0xe97: 0x0018,
@@ -1290,17 +1433,17 @@ var idnaValues = [8192]uint16{
 	0xf36: 0x0008, 0xf37: 0x0008, 0xf38: 0x0008, 0xf39: 0x0008, 0xf3a: 0x0008, 0xf3b: 0x0008,
 	0xf3c: 0x0008, 0xf3d: 0x0008, 0xf3e: 0x0008, 0xf3f: 0x0008,
 	// Block 0x3d, offset 0xf40
-	0xf40: 0x36a2, 0xf41: 0x36d2, 0xf42: 0x3702, 0xf43: 0x3732, 0xf44: 0x32d5, 0xf45: 0x32f5,
+	0xf40: 0x0b82, 0xf41: 0x0b8a, 0xf42: 0x0b92, 0xf43: 0x0b9a, 0xf44: 0x32d5, 0xf45: 0x32f5,
 	0xf46: 0x3315, 0xf47: 0x3335, 0xf48: 0x0018, 0xf49: 0x0018, 0xf4a: 0x0018, 0xf4b: 0x0018,
-	0xf4c: 0x0018, 0xf4d: 0x0018, 0xf4e: 0x0018, 0xf4f: 0x0018, 0xf50: 0x3355, 0xf51: 0x3761,
-	0xf52: 0x3779, 0xf53: 0x3791, 0xf54: 0x37a9, 0xf55: 0x37c1, 0xf56: 0x37d9, 0xf57: 0x37f1,
-	0xf58: 0x3809, 0xf59: 0x3821, 0xf5a: 0x3839, 0xf5b: 0x3851, 0xf5c: 0x3869, 0xf5d: 0x3881,
-	0xf5e: 0x3899, 0xf5f: 0x38b1, 0xf60: 0x3375, 0xf61: 0x3395, 0xf62: 0x33b5, 0xf63: 0x33d5,
+	0xf4c: 0x0018, 0xf4d: 0x0018, 0xf4e: 0x0018, 0xf4f: 0x0018, 0xf50: 0x3355, 0xf51: 0x0ba1,
+	0xf52: 0x0ba9, 0xf53: 0x0bb1, 0xf54: 0x0bb9, 0xf55: 0x0bc1, 0xf56: 0x0bc9, 0xf57: 0x0bd1,
+	0xf58: 0x0bd9, 0xf59: 0x0be1, 0xf5a: 0x0be9, 0xf5b: 0x0bf1, 0xf5c: 0x0bf9, 0xf5d: 0x0c01,
+	0xf5e: 0x0c09, 0xf5f: 0x0c11, 0xf60: 0x3375, 0xf61: 0x3395, 0xf62: 0x33b5, 0xf63: 0x33d5,
 	0xf64: 0x33f5, 0xf65: 0x33f5, 0xf66: 0x3415, 0xf67: 0x3435, 0xf68: 0x3455, 0xf69: 0x3475,
 	0xf6a: 0x3495, 0xf6b: 0x34b5, 0xf6c: 0x34d5, 0xf6d: 0x34f5, 0xf6e: 0x3515, 0xf6f: 0x3535,
 	0xf70: 0x3555, 0xf71: 0x3575, 0xf72: 0x3595, 0xf73: 0x35b5, 0xf74: 0x35d5, 0xf75: 0x35f5,
 	0xf76: 0x3615, 0xf77: 0x3635, 0xf78: 0x3655, 0xf79: 0x3675, 0xf7a: 0x3695, 0xf7b: 0x36b5,
-	0xf7c: 0x38c9, 0xf7d: 0x3901, 0xf7e: 0x36d5, 0xf7f: 0x0018,
+	0xf7c: 0x0c19, 0xf7d: 0x0c21, 0xf7e: 0x36d5, 0xf7f: 0x0018,
 	// Block 0x3e, offset 0xf80
 	0xf80: 0x36f5, 0xf81: 0x3715, 0xf82: 0x3735, 0xf83: 0x3755, 0xf84: 0x3775, 0xf85: 0x3795,
 	0xf86: 0x37b5, 0xf87: 0x37d5, 0xf88: 0x37f5, 0xf89: 0x3815, 0xf8a: 0x3835, 0xf8b: 0x3855,
@@ -1310,13 +1453,13 @@ var idnaValues = [8192]uint16{
 	0xf9e: 0x3ab5, 0xf9f: 0x3ad5, 0xfa0: 0x3af5, 0xfa1: 0x3b15, 0xfa2: 0x3b35, 0xfa3: 0x3b55,
 	0xfa4: 0x3b75, 0xfa5: 0x3b95, 0xfa6: 0x1295, 0xfa7: 0x3bb5, 0xfa8: 0x3bd5, 0xfa9: 0x3bf5,
 	0xfaa: 0x3c15, 0xfab: 0x3c35, 0xfac: 0x3c55, 0xfad: 0x3c75, 0xfae: 0x23b5, 0xfaf: 0x3c95,
-	0xfb0: 0x3cb5, 0xfb1: 0x3939, 0xfb2: 0x3951, 0xfb3: 0x3969, 0xfb4: 0x3981, 0xfb5: 0x3999,
-	0xfb6: 0x39b1, 0xfb7: 0x39c9, 0xfb8: 0x39e1, 0xfb9: 0x39f9, 0xfba: 0x3a11, 0xfbb: 0x3a29,
-	0xfbc: 0x3a41, 0xfbd: 0x3a59, 0xfbe: 0x3a71, 0xfbf: 0x3a89,
+	0xfb0: 0x3cb5, 0xfb1: 0x0c29, 0xfb2: 0x0c31, 0xfb3: 0x0c39, 0xfb4: 0x0c41, 0xfb5: 0x0c49,
+	0xfb6: 0x0c51, 0xfb7: 0x0c59, 0xfb8: 0x0c61, 0xfb9: 0x0c69, 0xfba: 0x0c71, 0xfbb: 0x0c79,
+	0xfbc: 0x0c81, 0xfbd: 0x0c89, 0xfbe: 0x0c91, 0xfbf: 0x0c99,
 	// Block 0x3f, offset 0xfc0
-	0xfc0: 0x3aa1, 0xfc1: 0x3ac9, 0xfc2: 0x3af1, 0xfc3: 0x3b19, 0xfc4: 0x3b41, 0xfc5: 0x3b69,
-	0xfc6: 0x3b91, 0xfc7: 0x3bb9, 0xfc8: 0x3be1, 0xfc9: 0x3c09, 0xfca: 0x3c39, 0xfcb: 0x3c69,
-	0xfcc: 0x3c99, 0xfcd: 0x3cd5, 0xfce: 0x3cb1, 0xfcf: 0x3cf5, 0xfd0: 0x3d15, 0xfd1: 0x3d2d,
+	0xfc0: 0x0ca1, 0xfc1: 0x0ca9, 0xfc2: 0x0cb1, 0xfc3: 0x0cb9, 0xfc4: 0x0cc1, 0xfc5: 0x0cc9,
+	0xfc6: 0x0cd1, 0xfc7: 0x0cd9, 0xfc8: 0x0ce1, 0xfc9: 0x0ce9, 0xfca: 0x0cf1, 0xfcb: 0x0cf9,
+	0xfcc: 0x0d01, 0xfcd: 0x3cd5, 0xfce: 0x0d09, 0xfcf: 0x3cf5, 0xfd0: 0x3d15, 0xfd1: 0x3d2d,
 	0xfd2: 0x3d45, 0xfd3: 0x3d5d, 0xfd4: 0x3d75, 0xfd5: 0x3d75, 0xfd6: 0x3d5d, 0xfd7: 0x3d8d,
 	0xfd8: 0x07d5, 0xfd9: 0x3da5, 0xfda: 0x3dbd, 0xfdb: 0x3dd5, 0xfdc: 0x3ded, 0xfdd: 0x3e05,
 	0xfde: 0x3e1d, 0xfdf: 0x3e35, 0xfe0: 0x3e4d, 0xfe1: 0x3e65, 0xfe2: 0x3e7d, 0xfe3: 0x3e95,
@@ -1324,769 +1467,769 @@ var idnaValues = [8192]uint16{
 	0xfea: 0x3ef5, 0xfeb: 0x3f0d, 0xfec: 0x3f25, 0xfed: 0x3f3d, 0xfee: 0x3f55, 0xfef: 0x3f55,
 	0xff0: 0x3f6d, 0xff1: 0x3f6d, 0xff2: 0x3f6d, 0xff3: 0x3f85, 0xff4: 0x3f9d, 0xff5: 0x3fb5,
 	0xff6: 0x3fcd, 0xff7: 0x3fb5, 0xff8: 0x3fe5, 0xff9: 0x3ffd, 0xffa: 0x3f85, 0xffb: 0x4015,
-	0xffc: 0x402d, 0xffd: 0x402d, 0xffe: 0x402d, 0xfff: 0x3cc9,
+	0xffc: 0x402d, 0xffd: 0x402d, 0xffe: 0x402d, 0xfff: 0x0d11,
 	// Block 0x40, offset 0x1000
-	0x1000: 0x3d01, 0x1001: 0x3d69, 0x1002: 0x3dd1, 0x1003: 0x3e39, 0x1004: 0x3e89, 0x1005: 0x3ef1,
-	0x1006: 0x3f41, 0x1007: 0x3f91, 0x1008: 0x4011, 0x1009: 0x4079, 0x100a: 0x40c9, 0x100b: 0x4119,
-	0x100c: 0x4169, 0x100d: 0x41d1, 0x100e: 0x4239, 0x100f: 0x4289, 0x1010: 0x42d9, 0x1011: 0x4311,
-	0x1012: 0x4361, 0x1013: 0x43c9, 0x1014: 0x4431, 0x1015: 0x4469, 0x1016: 0x44e9, 0x1017: 0x4581,
-	0x1018: 0x4601, 0x1019: 0x4651, 0x101a: 0x46d1, 0x101b: 0x4751, 0x101c: 0x47b9, 0x101d: 0x4809,
-	0x101e: 0x4859, 0x101f: 0x48a9, 0x1020: 0x4911, 0x1021: 0x4991, 0x1022: 0x49f9, 0x1023: 0x4a49,
-	0x1024: 0x4a99, 0x1025: 0x4ae9, 0x1026: 0x4b21, 0x1027: 0x4b59, 0x1028: 0x4b91, 0x1029: 0x4bc9,
-	0x102a: 0x4c19, 0x102b: 0x4c69, 0x102c: 0x4ce9, 0x102d: 0x4d39, 0x102e: 0x4da1, 0x102f: 0x4e21,
-	0x1030: 0x4e71, 0x1031: 0x4ea9, 0x1032: 0x4ee1, 0x1033: 0x4f61, 0x1034: 0x4fc9, 0x1035: 0x5049,
-	0x1036: 0x5099, 0x1037: 0x5119, 0x1038: 0x5151, 0x1039: 0x51a1, 0x103a: 0x51f1, 0x103b: 0x5241,
-	0x103c: 0x5291, 0x103d: 0x52e1, 0x103e: 0x5349, 0x103f: 0x5399,
+	0x1000: 0x10f9, 0x1001: 0x1101, 0x1002: 0x40a5, 0x1003: 0x1109, 0x1004: 0x1111, 0x1005: 0x1119,
+	0x1006: 0x1121, 0x1007: 0x1129, 0x1008: 0x40c5, 0x1009: 0x1131, 0x100a: 0x1139, 0x100b: 0x1141,
+	0x100c: 0x40e5, 0x100d: 0x40e5, 0x100e: 0x1149, 0x100f: 0x1151, 0x1010: 0x1159, 0x1011: 0x4105,
+	0x1012: 0x4125, 0x1013: 0x4145, 0x1014: 0x4165, 0x1015: 0x4185, 0x1016: 0x1161, 0x1017: 0x1169,
+	0x1018: 0x1171, 0x1019: 0x1179, 0x101a: 0x1181, 0x101b: 0x41a5, 0x101c: 0x1189, 0x101d: 0x1191,
+	0x101e: 0x1199, 0x101f: 0x41c5, 0x1020: 0x41e5, 0x1021: 0x11a1, 0x1022: 0x4205, 0x1023: 0x4225,
+	0x1024: 0x4245, 0x1025: 0x11a9, 0x1026: 0x4265, 0x1027: 0x11b1, 0x1028: 0x11b9, 0x1029: 0x10f9,
+	0x102a: 0x4285, 0x102b: 0x42a5, 0x102c: 0x42c5, 0x102d: 0x42e5, 0x102e: 0x11c1, 0x102f: 0x11c9,
+	0x1030: 0x11d1, 0x1031: 0x11d9, 0x1032: 0x4305, 0x1033: 0x11e1, 0x1034: 0x11e9, 0x1035: 0x11f1,
+	0x1036: 0x4325, 0x1037: 0x11f9, 0x1038: 0x1201, 0x1039: 0x11f9, 0x103a: 0x1209, 0x103b: 0x1211,
+	0x103c: 0x4345, 0x103d: 0x1219, 0x103e: 0x1221, 0x103f: 0x1219,
 	// Block 0x41, offset 0x1040
-	0x1040: 0x53d1, 0x1041: 0x5421, 0x1042: 0x5471, 0x1043: 0x54c1, 0x1044: 0x5529, 0x1045: 0x5579,
-	0x1046: 0x55c9, 0x1047: 0x5619, 0x1048: 0x5699, 0x1049: 0x5701, 0x104a: 0x5739, 0x104b: 0x57b9,
-	0x104c: 0x57f1, 0x104d: 0x5859, 0x104e: 0x58c1, 0x104f: 0x5911, 0x1050: 0x5961, 0x1051: 0x59b1,
-	0x1052: 0x5a19, 0x1053: 0x5a51, 0x1054: 0x5aa1, 0x1055: 0x5b09, 0x1056: 0x5b41, 0x1057: 0x5bc1,
-	0x1058: 0x5c11, 0x1059: 0x5c39, 0x105a: 0x5c61, 0x105b: 0x5c89, 0x105c: 0x5cb1, 0x105d: 0x5cd9,
-	0x105e: 0x5d01, 0x105f: 0x5d29, 0x1060: 0x5d51, 0x1061: 0x5d79, 0x1062: 0x5da1, 0x1063: 0x5dd1,
-	0x1064: 0x5e01, 0x1065: 0x5e31, 0x1066: 0x5e61, 0x1067: 0x5e91, 0x1068: 0x5ec1, 0x1069: 0x5ef1,
-	0x106a: 0x5f21, 0x106b: 0x5f51, 0x106c: 0x5f81, 0x106d: 0x5fb1, 0x106e: 0x5fe1, 0x106f: 0x6011,
-	0x1070: 0x6041, 0x1071: 0x4045, 0x1072: 0x6071, 0x1073: 0x6089, 0x1074: 0x4065, 0x1075: 0x60a1,
-	0x1076: 0x60b9, 0x1077: 0x60d1, 0x1078: 0x4085, 0x1079: 0x4085, 0x107a: 0x60e9, 0x107b: 0x6101,
-	0x107c: 0x6139, 0x107d: 0x6171, 0x107e: 0x61a9, 0x107f: 0x61e1,
+	0x1040: 0x4365, 0x1041: 0x4385, 0x1042: 0x0040, 0x1043: 0x1229, 0x1044: 0x1231, 0x1045: 0x1239,
+	0x1046: 0x1241, 0x1047: 0x0040, 0x1048: 0x1249, 0x1049: 0x1251, 0x104a: 0x1259, 0x104b: 0x1261,
+	0x104c: 0x1269, 0x104d: 0x1271, 0x104e: 0x1199, 0x104f: 0x1279, 0x1050: 0x1281, 0x1051: 0x1289,
+	0x1052: 0x43a5, 0x1053: 0x1291, 0x1054: 0x1121, 0x1055: 0x43c5, 0x1056: 0x43e5, 0x1057: 0x1299,
+	0x1058: 0x0040, 0x1059: 0x4405, 0x105a: 0x12a1, 0x105b: 0x12a9, 0x105c: 0x12b1, 0x105d: 0x12b9,
+	0x105e: 0x12c1, 0x105f: 0x12c9, 0x1060: 0x12d1, 0x1061: 0x12d9, 0x1062: 0x12e1, 0x1063: 0x12e9,
+	0x1064: 0x12f1, 0x1065: 0x12f9, 0x1066: 0x1301, 0x1067: 0x1309, 0x1068: 0x1311, 0x1069: 0x1319,
+	0x106a: 0x1321, 0x106b: 0x1329, 0x106c: 0x1331, 0x106d: 0x1339, 0x106e: 0x1341, 0x106f: 0x1349,
+	0x1070: 0x1351, 0x1071: 0x1359, 0x1072: 0x1361, 0x1073: 0x1369, 0x1074: 0x1371, 0x1075: 0x1379,
+	0x1076: 0x1381, 0x1077: 0x1389, 0x1078: 0x1391, 0x1079: 0x1399, 0x107a: 0x13a1, 0x107b: 0x13a9,
+	0x107c: 0x13b1, 0x107d: 0x13b9, 0x107e: 0x13c1, 0x107f: 0x4425,
 	// Block 0x42, offset 0x1080
-	0x1080: 0x6249, 0x1081: 0x6261, 0x1082: 0x40a5, 0x1083: 0x6279, 0x1084: 0x6291, 0x1085: 0x62a9,
-	0x1086: 0x62c1, 0x1087: 0x62d9, 0x1088: 0x40c5, 0x1089: 0x62f1, 0x108a: 0x6319, 0x108b: 0x6331,
-	0x108c: 0x40e5, 0x108d: 0x40e5, 0x108e: 0x6349, 0x108f: 0x6361, 0x1090: 0x6379, 0x1091: 0x4105,
-	0x1092: 0x4125, 0x1093: 0x4145, 0x1094: 0x4165, 0x1095: 0x4185, 0x1096: 0x6391, 0x1097: 0x63a9,
-	0x1098: 0x63c1, 0x1099: 0x63d9, 0x109a: 0x63f1, 0x109b: 0x41a5, 0x109c: 0x6409, 0x109d: 0x6421,
-	0x109e: 0x6439, 0x109f: 0x41c5, 0x10a0: 0x41e5, 0x10a1: 0x6451, 0x10a2: 0x4205, 0x10a3: 0x4225,
-	0x10a4: 0x4245, 0x10a5: 0x6469, 0x10a6: 0x4265, 0x10a7: 0x6481, 0x10a8: 0x64b1, 0x10a9: 0x6249,
-	0x10aa: 0x4285, 0x10ab: 0x42a5, 0x10ac: 0x42c5, 0x10ad: 0x42e5, 0x10ae: 0x64e9, 0x10af: 0x6529,
-	0x10b0: 0x6571, 0x10b1: 0x6589, 0x10b2: 0x4305, 0x10b3: 0x65a1, 0x10b4: 0x65b9, 0x10b5: 0x65d1,
-	0x10b6: 0x4325, 0x10b7: 0x65e9, 0x10b8: 0x6601, 0x10b9: 0x65e9, 0x10ba: 0x6619, 0x10bb: 0x6631,
-	0x10bc: 0x4345, 0x10bd: 0x6649, 0x10be: 0x6661, 0x10bf: 0x6649,
+	0x1080: 0xe00d, 0x1081: 0x0008, 0x1082: 0xe00d, 0x1083: 0x0008, 0x1084: 0xe00d, 0x1085: 0x0008,
+	0x1086: 0xe00d, 0x1087: 0x0008, 0x1088: 0xe00d, 0x1089: 0x0008, 0x108a: 0xe00d, 0x108b: 0x0008,
+	0x108c: 0xe00d, 0x108d: 0x0008, 0x108e: 0xe00d, 0x108f: 0x0008, 0x1090: 0xe00d, 0x1091: 0x0008,
+	0x1092: 0xe00d, 0x1093: 0x0008, 0x1094: 0xe00d, 0x1095: 0x0008, 0x1096: 0xe00d, 0x1097: 0x0008,
+	0x1098: 0xe00d, 0x1099: 0x0008, 0x109a: 0xe00d, 0x109b: 0x0008, 0x109c: 0xe00d, 0x109d: 0x0008,
+	0x109e: 0xe00d, 0x109f: 0x0008, 0x10a0: 0xe00d, 0x10a1: 0x0008, 0x10a2: 0xe00d, 0x10a3: 0x0008,
+	0x10a4: 0xe00d, 0x10a5: 0x0008, 0x10a6: 0xe00d, 0x10a7: 0x0008, 0x10a8: 0xe00d, 0x10a9: 0x0008,
+	0x10aa: 0xe00d, 0x10ab: 0x0008, 0x10ac: 0xe00d, 0x10ad: 0x0008, 0x10ae: 0x0008, 0x10af: 0x3308,
+	0x10b0: 0x3318, 0x10b1: 0x3318, 0x10b2: 0x3318, 0x10b3: 0x0018, 0x10b4: 0x3308, 0x10b5: 0x3308,
+	0x10b6: 0x3308, 0x10b7: 0x3308, 0x10b8: 0x3308, 0x10b9: 0x3308, 0x10ba: 0x3308, 0x10bb: 0x3308,
+	0x10bc: 0x3308, 0x10bd: 0x3308, 0x10be: 0x0018, 0x10bf: 0x0008,
 	// Block 0x43, offset 0x10c0
-	0x10c0: 0x4365, 0x10c1: 0x4385, 0x10c2: 0x0040, 0x10c3: 0x6679, 0x10c4: 0x6691, 0x10c5: 0x66a9,
-	0x10c6: 0x66c1, 0x10c7: 0x0040, 0x10c8: 0x66f9, 0x10c9: 0x6711, 0x10ca: 0x6729, 0x10cb: 0x6741,
-	0x10cc: 0x6759, 0x10cd: 0x6771, 0x10ce: 0x6439, 0x10cf: 0x6789, 0x10d0: 0x67a1, 0x10d1: 0x67b9,
-	0x10d2: 0x43a5, 0x10d3: 0x67d1, 0x10d4: 0x62c1, 0x10d5: 0x43c5, 0x10d6: 0x43e5, 0x10d7: 0x67e9,
-	0x10d8: 0x0040, 0x10d9: 0x4405, 0x10da: 0x6801, 0x10db: 0x6819, 0x10dc: 0x6831, 0x10dd: 0x6849,
-	0x10de: 0x6861, 0x10df: 0x6891, 0x10e0: 0x68c1, 0x10e1: 0x68e9, 0x10e2: 0x6911, 0x10e3: 0x6939,
-	0x10e4: 0x6961, 0x10e5: 0x6989, 0x10e6: 0x69b1, 0x10e7: 0x69d9, 0x10e8: 0x6a01, 0x10e9: 0x6a29,
-	0x10ea: 0x6a59, 0x10eb: 0x6a89, 0x10ec: 0x6ab9, 0x10ed: 0x6ae9, 0x10ee: 0x6b19, 0x10ef: 0x6b49,
-	0x10f0: 0x6b79, 0x10f1: 0x6ba9, 0x10f2: 0x6bd9, 0x10f3: 0x6c09, 0x10f4: 0x6c39, 0x10f5: 0x6c69,
-	0x10f6: 0x6c99, 0x10f7: 0x6cc9, 0x10f8: 0x6cf9, 0x10f9: 0x6d29, 0x10fa: 0x6d59, 0x10fb: 0x6d89,
-	0x10fc: 0x6db9, 0x10fd: 0x6de9, 0x10fe: 0x6e19, 0x10ff: 0x4425,
+	0x10c0: 0xe00d, 0x10c1: 0x0008, 0x10c2: 0xe00d, 0x10c3: 0x0008, 0x10c4: 0xe00d, 0x10c5: 0x0008,
+	0x10c6: 0xe00d, 0x10c7: 0x0008, 0x10c8: 0xe00d, 0x10c9: 0x0008, 0x10ca: 0xe00d, 0x10cb: 0x0008,
+	0x10cc: 0xe00d, 0x10cd: 0x0008, 0x10ce: 0xe00d, 0x10cf: 0x0008, 0x10d0: 0xe00d, 0x10d1: 0x0008,
+	0x10d2: 0xe00d, 0x10d3: 0x0008, 0x10d4: 0xe00d, 0x10d5: 0x0008, 0x10d6: 0xe00d, 0x10d7: 0x0008,
+	0x10d8: 0xe00d, 0x10d9: 0x0008, 0x10da: 0xe00d, 0x10db: 0x0008, 0x10dc: 0x02d1, 0x10dd: 0x13c9,
+	0x10de: 0x3308, 0x10df: 0x3308, 0x10e0: 0x0008, 0x10e1: 0x0008, 0x10e2: 0x0008, 0x10e3: 0x0008,
+	0x10e4: 0x0008, 0x10e5: 0x0008, 0x10e6: 0x0008, 0x10e7: 0x0008, 0x10e8: 0x0008, 0x10e9: 0x0008,
+	0x10ea: 0x0008, 0x10eb: 0x0008, 0x10ec: 0x0008, 0x10ed: 0x0008, 0x10ee: 0x0008, 0x10ef: 0x0008,
+	0x10f0: 0x0008, 0x10f1: 0x0008, 0x10f2: 0x0008, 0x10f3: 0x0008, 0x10f4: 0x0008, 0x10f5: 0x0008,
+	0x10f6: 0x0008, 0x10f7: 0x0008, 0x10f8: 0x0008, 0x10f9: 0x0008, 0x10fa: 0x0008, 0x10fb: 0x0008,
+	0x10fc: 0x0008, 0x10fd: 0x0008, 0x10fe: 0x0008, 0x10ff: 0x0008,
 	// Block 0x44, offset 0x1100
-	0x1100: 0xe00d, 0x1101: 0x0008, 0x1102: 0xe00d, 0x1103: 0x0008, 0x1104: 0xe00d, 0x1105: 0x0008,
-	0x1106: 0xe00d, 0x1107: 0x0008, 0x1108: 0xe00d, 0x1109: 0x0008, 0x110a: 0xe00d, 0x110b: 0x0008,
-	0x110c: 0xe00d, 0x110d: 0x0008, 0x110e: 0xe00d, 0x110f: 0x0008, 0x1110: 0xe00d, 0x1111: 0x0008,
-	0x1112: 0xe00d, 0x1113: 0x0008, 0x1114: 0xe00d, 0x1115: 0x0008, 0x1116: 0xe00d, 0x1117: 0x0008,
-	0x1118: 0xe00d, 0x1119: 0x0008, 0x111a: 0xe00d, 0x111b: 0x0008, 0x111c: 0xe00d, 0x111d: 0x0008,
-	0x111e: 0xe00d, 0x111f: 0x0008, 0x1120: 0xe00d, 0x1121: 0x0008, 0x1122: 0xe00d, 0x1123: 0x0008,
+	0x1100: 0x0018, 0x1101: 0x0018, 0x1102: 0x0018, 0x1103: 0x0018, 0x1104: 0x0018, 0x1105: 0x0018,
+	0x1106: 0x0018, 0x1107: 0x0018, 0x1108: 0x0018, 0x1109: 0x0018, 0x110a: 0x0018, 0x110b: 0x0018,
+	0x110c: 0x0018, 0x110d: 0x0018, 0x110e: 0x0018, 0x110f: 0x0018, 0x1110: 0x0018, 0x1111: 0x0018,
+	0x1112: 0x0018, 0x1113: 0x0018, 0x1114: 0x0018, 0x1115: 0x0018, 0x1116: 0x0018, 0x1117: 0x0008,
+	0x1118: 0x0008, 0x1119: 0x0008, 0x111a: 0x0008, 0x111b: 0x0008, 0x111c: 0x0008, 0x111d: 0x0008,
+	0x111e: 0x0008, 0x111f: 0x0008, 0x1120: 0x0018, 0x1121: 0x0018, 0x1122: 0xe00d, 0x1123: 0x0008,
 	0x1124: 0xe00d, 0x1125: 0x0008, 0x1126: 0xe00d, 0x1127: 0x0008, 0x1128: 0xe00d, 0x1129: 0x0008,
-	0x112a: 0xe00d, 0x112b: 0x0008, 0x112c: 0xe00d, 0x112d: 0x0008, 0x112e: 0x0008, 0x112f: 0x3308,
-	0x1130: 0x3318, 0x1131: 0x3318, 0x1132: 0x3318, 0x1133: 0x0018, 0x1134: 0x3308, 0x1135: 0x3308,
-	0x1136: 0x3308, 0x1137: 0x3308, 0x1138: 0x3308, 0x1139: 0x3308, 0x113a: 0x3308, 0x113b: 0x3308,
-	0x113c: 0x3308, 0x113d: 0x3308, 0x113e: 0x0018, 0x113f: 0x0008,
+	0x112a: 0xe00d, 0x112b: 0x0008, 0x112c: 0xe00d, 0x112d: 0x0008, 0x112e: 0xe00d, 0x112f: 0x0008,
+	0x1130: 0x0008, 0x1131: 0x0008, 0x1132: 0xe00d, 0x1133: 0x0008, 0x1134: 0xe00d, 0x1135: 0x0008,
+	0x1136: 0xe00d, 0x1137: 0x0008, 0x1138: 0xe00d, 0x1139: 0x0008, 0x113a: 0xe00d, 0x113b: 0x0008,
+	0x113c: 0xe00d, 0x113d: 0x0008, 0x113e: 0xe00d, 0x113f: 0x0008,
 	// Block 0x45, offset 0x1140
 	0x1140: 0xe00d, 0x1141: 0x0008, 0x1142: 0xe00d, 0x1143: 0x0008, 0x1144: 0xe00d, 0x1145: 0x0008,
 	0x1146: 0xe00d, 0x1147: 0x0008, 0x1148: 0xe00d, 0x1149: 0x0008, 0x114a: 0xe00d, 0x114b: 0x0008,
 	0x114c: 0xe00d, 0x114d: 0x0008, 0x114e: 0xe00d, 0x114f: 0x0008, 0x1150: 0xe00d, 0x1151: 0x0008,
 	0x1152: 0xe00d, 0x1153: 0x0008, 0x1154: 0xe00d, 0x1155: 0x0008, 0x1156: 0xe00d, 0x1157: 0x0008,
-	0x1158: 0xe00d, 0x1159: 0x0008, 0x115a: 0xe00d, 0x115b: 0x0008, 0x115c: 0x0ea1, 0x115d: 0x6e49,
-	0x115e: 0x3308, 0x115f: 0x3308, 0x1160: 0x0008, 0x1161: 0x0008, 0x1162: 0x0008, 0x1163: 0x0008,
-	0x1164: 0x0008, 0x1165: 0x0008, 0x1166: 0x0008, 0x1167: 0x0008, 0x1168: 0x0008, 0x1169: 0x0008,
-	0x116a: 0x0008, 0x116b: 0x0008, 0x116c: 0x0008, 0x116d: 0x0008, 0x116e: 0x0008, 0x116f: 0x0008,
-	0x1170: 0x0008, 0x1171: 0x0008, 0x1172: 0x0008, 0x1173: 0x0008, 0x1174: 0x0008, 0x1175: 0x0008,
-	0x1176: 0x0008, 0x1177: 0x0008, 0x1178: 0x0008, 0x1179: 0x0008, 0x117a: 0x0008, 0x117b: 0x0008,
-	0x117c: 0x0008, 0x117d: 0x0008, 0x117e: 0x0008, 0x117f: 0x0008,
+	0x1158: 0xe00d, 0x1159: 0x0008, 0x115a: 0xe00d, 0x115b: 0x0008, 0x115c: 0xe00d, 0x115d: 0x0008,
+	0x115e: 0xe00d, 0x115f: 0x0008, 0x1160: 0xe00d, 0x1161: 0x0008, 0x1162: 0xe00d, 0x1163: 0x0008,
+	0x1164: 0xe00d, 0x1165: 0x0008, 0x1166: 0xe00d, 0x1167: 0x0008, 0x1168: 0xe00d, 0x1169: 0x0008,
+	0x116a: 0xe00d, 0x116b: 0x0008, 0x116c: 0xe00d, 0x116d: 0x0008, 0x116e: 0xe00d, 0x116f: 0x0008,
+	0x1170: 0xe0fd, 0x1171: 0x0008, 0x1172: 0x0008, 0x1173: 0x0008, 0x1174: 0x0008, 0x1175: 0x0008,
+	0x1176: 0x0008, 0x1177: 0x0008, 0x1178: 0x0008, 0x1179: 0xe01d, 0x117a: 0x0008, 0x117b: 0xe03d,
+	0x117c: 0x0008, 0x117d: 0x4445, 0x117e: 0xe00d, 0x117f: 0x0008,
 	// Block 0x46, offset 0x1180
-	0x1180: 0x0018, 0x1181: 0x0018, 0x1182: 0x0018, 0x1183: 0x0018, 0x1184: 0x0018, 0x1185: 0x0018,
-	0x1186: 0x0018, 0x1187: 0x0018, 0x1188: 0x0018, 0x1189: 0x0018, 0x118a: 0x0018, 0x118b: 0x0018,
-	0x118c: 0x0018, 0x118d: 0x0018, 0x118e: 0x0018, 0x118f: 0x0018, 0x1190: 0x0018, 0x1191: 0x0018,
-	0x1192: 0x0018, 0x1193: 0x0018, 0x1194: 0x0018, 0x1195: 0x0018, 0x1196: 0x0018, 0x1197: 0x0008,
-	0x1198: 0x0008, 0x1199: 0x0008, 0x119a: 0x0008, 0x119b: 0x0008, 0x119c: 0x0008, 0x119d: 0x0008,
-	0x119e: 0x0008, 0x119f: 0x0008, 0x11a0: 0x0018, 0x11a1: 0x0018, 0x11a2: 0xe00d, 0x11a3: 0x0008,
+	0x1180: 0xe00d, 0x1181: 0x0008, 0x1182: 0xe00d, 0x1183: 0x0008, 0x1184: 0xe00d, 0x1185: 0x0008,
+	0x1186: 0xe00d, 0x1187: 0x0008, 0x1188: 0x0008, 0x1189: 0x0018, 0x118a: 0x0018, 0x118b: 0xe03d,
+	0x118c: 0x0008, 0x118d: 0x0409, 0x118e: 0x0008, 0x118f: 0x0008, 0x1190: 0xe00d, 0x1191: 0x0008,
+	0x1192: 0xe00d, 0x1193: 0x0008, 0x1194: 0x0008, 0x1195: 0x0008, 0x1196: 0xe00d, 0x1197: 0x0008,
+	0x1198: 0xe00d, 0x1199: 0x0008, 0x119a: 0xe00d, 0x119b: 0x0008, 0x119c: 0xe00d, 0x119d: 0x0008,
+	0x119e: 0xe00d, 0x119f: 0x0008, 0x11a0: 0xe00d, 0x11a1: 0x0008, 0x11a2: 0xe00d, 0x11a3: 0x0008,
 	0x11a4: 0xe00d, 0x11a5: 0x0008, 0x11a6: 0xe00d, 0x11a7: 0x0008, 0x11a8: 0xe00d, 0x11a9: 0x0008,
-	0x11aa: 0xe00d, 0x11ab: 0x0008, 0x11ac: 0xe00d, 0x11ad: 0x0008, 0x11ae: 0xe00d, 0x11af: 0x0008,
-	0x11b0: 0x0008, 0x11b1: 0x0008, 0x11b2: 0xe00d, 0x11b3: 0x0008, 0x11b4: 0xe00d, 0x11b5: 0x0008,
+	0x11aa: 0x13d1, 0x11ab: 0x0371, 0x11ac: 0x0401, 0x11ad: 0x13d9, 0x11ae: 0x0421, 0x11af: 0x0008,
+	0x11b0: 0x13e1, 0x11b1: 0x13e9, 0x11b2: 0x0429, 0x11b3: 0x4465, 0x11b4: 0xe00d, 0x11b5: 0x0008,
 	0x11b6: 0xe00d, 0x11b7: 0x0008, 0x11b8: 0xe00d, 0x11b9: 0x0008, 0x11ba: 0xe00d, 0x11bb: 0x0008,
 	0x11bc: 0xe00d, 0x11bd: 0x0008, 0x11be: 0xe00d, 0x11bf: 0x0008,
 	// Block 0x47, offset 0x11c0
-	0x11c0: 0xe00d, 0x11c1: 0x0008, 0x11c2: 0xe00d, 0x11c3: 0x0008, 0x11c4: 0xe00d, 0x11c5: 0x0008,
-	0x11c6: 0xe00d, 0x11c7: 0x0008, 0x11c8: 0xe00d, 0x11c9: 0x0008, 0x11ca: 0xe00d, 0x11cb: 0x0008,
-	0x11cc: 0xe00d, 0x11cd: 0x0008, 0x11ce: 0xe00d, 0x11cf: 0x0008, 0x11d0: 0xe00d, 0x11d1: 0x0008,
-	0x11d2: 0xe00d, 0x11d3: 0x0008, 0x11d4: 0xe00d, 0x11d5: 0x0008, 0x11d6: 0xe00d, 0x11d7: 0x0008,
-	0x11d8: 0xe00d, 0x11d9: 0x0008, 0x11da: 0xe00d, 0x11db: 0x0008, 0x11dc: 0xe00d, 0x11dd: 0x0008,
-	0x11de: 0xe00d, 0x11df: 0x0008, 0x11e0: 0xe00d, 0x11e1: 0x0008, 0x11e2: 0xe00d, 0x11e3: 0x0008,
-	0x11e4: 0xe00d, 0x11e5: 0x0008, 0x11e6: 0xe00d, 0x11e7: 0x0008, 0x11e8: 0xe00d, 0x11e9: 0x0008,
-	0x11ea: 0xe00d, 0x11eb: 0x0008, 0x11ec: 0xe00d, 0x11ed: 0x0008, 0x11ee: 0xe00d, 0x11ef: 0x0008,
-	0x11f0: 0xe0fd, 0x11f1: 0x0008, 0x11f2: 0x0008, 0x11f3: 0x0008, 0x11f4: 0x0008, 0x11f5: 0x0008,
-	0x11f6: 0x0008, 0x11f7: 0x0008, 0x11f8: 0x0008, 0x11f9: 0xe01d, 0x11fa: 0x0008, 0x11fb: 0xe03d,
-	0x11fc: 0x0008, 0x11fd: 0x4445, 0x11fe: 0xe00d, 0x11ff: 0x0008,
+	0x11c0: 0x650d, 0x11c1: 0x652d, 0x11c2: 0x654d, 0x11c3: 0x656d, 0x11c4: 0x658d, 0x11c5: 0x65ad,
+	0x11c6: 0x65cd, 0x11c7: 0x65ed, 0x11c8: 0x660d, 0x11c9: 0x662d, 0x11ca: 0x664d, 0x11cb: 0x666d,
+	0x11cc: 0x668d, 0x11cd: 0x66ad, 0x11ce: 0x0008, 0x11cf: 0x0008, 0x11d0: 0x66cd, 0x11d1: 0x0008,
+	0x11d2: 0x66ed, 0x11d3: 0x0008, 0x11d4: 0x0008, 0x11d5: 0x670d, 0x11d6: 0x672d, 0x11d7: 0x674d,
+	0x11d8: 0x676d, 0x11d9: 0x678d, 0x11da: 0x67ad, 0x11db: 0x67cd, 0x11dc: 0x67ed, 0x11dd: 0x680d,
+	0x11de: 0x682d, 0x11df: 0x0008, 0x11e0: 0x684d, 0x11e1: 0x0008, 0x11e2: 0x686d, 0x11e3: 0x0008,
+	0x11e4: 0x0008, 0x11e5: 0x688d, 0x11e6: 0x68ad, 0x11e7: 0x0008, 0x11e8: 0x0008, 0x11e9: 0x0008,
+	0x11ea: 0x68cd, 0x11eb: 0x68ed, 0x11ec: 0x690d, 0x11ed: 0x692d, 0x11ee: 0x694d, 0x11ef: 0x696d,
+	0x11f0: 0x698d, 0x11f1: 0x69ad, 0x11f2: 0x69cd, 0x11f3: 0x69ed, 0x11f4: 0x6a0d, 0x11f5: 0x6a2d,
+	0x11f6: 0x6a4d, 0x11f7: 0x6a6d, 0x11f8: 0x6a8d, 0x11f9: 0x6aad, 0x11fa: 0x6acd, 0x11fb: 0x6aed,
+	0x11fc: 0x6b0d, 0x11fd: 0x6b2d, 0x11fe: 0x6b4d, 0x11ff: 0x6b6d,
 	// Block 0x48, offset 0x1200
-	0x1200: 0xe00d, 0x1201: 0x0008, 0x1202: 0xe00d, 0x1203: 0x0008, 0x1204: 0xe00d, 0x1205: 0x0008,
-	0x1206: 0xe00d, 0x1207: 0x0008, 0x1208: 0x0008, 0x1209: 0x0018, 0x120a: 0x0018, 0x120b: 0xe03d,
-	0x120c: 0x0008, 0x120d: 0x11d9, 0x120e: 0x0008, 0x120f: 0x0008, 0x1210: 0xe00d, 0x1211: 0x0008,
-	0x1212: 0xe00d, 0x1213: 0x0008, 0x1214: 0x0008, 0x1215: 0x0008, 0x1216: 0xe00d, 0x1217: 0x0008,
-	0x1218: 0xe00d, 0x1219: 0x0008, 0x121a: 0xe00d, 0x121b: 0x0008, 0x121c: 0xe00d, 0x121d: 0x0008,
-	0x121e: 0xe00d, 0x121f: 0x0008, 0x1220: 0xe00d, 0x1221: 0x0008, 0x1222: 0xe00d, 0x1223: 0x0008,
-	0x1224: 0xe00d, 0x1225: 0x0008, 0x1226: 0xe00d, 0x1227: 0x0008, 0x1228: 0xe00d, 0x1229: 0x0008,
-	0x122a: 0x6e61, 0x122b: 0x1029, 0x122c: 0x11c1, 0x122d: 0x6e79, 0x122e: 0x1221, 0x122f: 0x0008,
-	0x1230: 0x6e91, 0x1231: 0x6ea9, 0x1232: 0x1239, 0x1233: 0x4465, 0x1234: 0xe00d, 0x1235: 0x0008,
-	0x1236: 0xe00d, 0x1237: 0x0008, 0x1238: 0xe00d, 0x1239: 0x0008, 0x123a: 0xe00d, 0x123b: 0x0008,
-	0x123c: 0xe00d, 0x123d: 0x0008, 0x123e: 0xe00d, 0x123f: 0x0008,
+	0x1200: 0x7acd, 0x1201: 0x7aed, 0x1202: 0x7b0d, 0x1203: 0x7b2d, 0x1204: 0x7b4d, 0x1205: 0x7b6d,
+	0x1206: 0x7b8d, 0x1207: 0x7bad, 0x1208: 0x7bcd, 0x1209: 0x7bed, 0x120a: 0x7c0d, 0x120b: 0x7c2d,
+	0x120c: 0x7c4d, 0x120d: 0x7c6d, 0x120e: 0x7c8d, 0x120f: 0x1409, 0x1210: 0x1411, 0x1211: 0x1419,
+	0x1212: 0x7cad, 0x1213: 0x7ccd, 0x1214: 0x7ced, 0x1215: 0x1421, 0x1216: 0x1429, 0x1217: 0x1431,
+	0x1218: 0x7d0d, 0x1219: 0x7d2d, 0x121a: 0x0040, 0x121b: 0x0040, 0x121c: 0x0040, 0x121d: 0x0040,
+	0x121e: 0x0040, 0x121f: 0x0040, 0x1220: 0x0040, 0x1221: 0x0040, 0x1222: 0x0040, 0x1223: 0x0040,
+	0x1224: 0x0040, 0x1225: 0x0040, 0x1226: 0x0040, 0x1227: 0x0040, 0x1228: 0x0040, 0x1229: 0x0040,
+	0x122a: 0x0040, 0x122b: 0x0040, 0x122c: 0x0040, 0x122d: 0x0040, 0x122e: 0x0040, 0x122f: 0x0040,
+	0x1230: 0x0040, 0x1231: 0x0040, 0x1232: 0x0040, 0x1233: 0x0040, 0x1234: 0x0040, 0x1235: 0x0040,
+	0x1236: 0x0040, 0x1237: 0x0040, 0x1238: 0x0040, 0x1239: 0x0040, 0x123a: 0x0040, 0x123b: 0x0040,
+	0x123c: 0x0040, 0x123d: 0x0040, 0x123e: 0x0040, 0x123f: 0x0040,
 	// Block 0x49, offset 0x1240
-	0x1240: 0x650d, 0x1241: 0x652d, 0x1242: 0x654d, 0x1243: 0x656d, 0x1244: 0x658d, 0x1245: 0x65ad,
-	0x1246: 0x65cd, 0x1247: 0x65ed, 0x1248: 0x660d, 0x1249: 0x662d, 0x124a: 0x664d, 0x124b: 0x666d,
-	0x124c: 0x668d, 0x124d: 0x66ad, 0x124e: 0x0008, 0x124f: 0x0008, 0x1250: 0x66cd, 0x1251: 0x0008,
-	0x1252: 0x66ed, 0x1253: 0x0008, 0x1254: 0x0008, 0x1255: 0x670d, 0x1256: 0x672d, 0x1257: 0x674d,
-	0x1258: 0x676d, 0x1259: 0x678d, 0x125a: 0x67ad, 0x125b: 0x67cd, 0x125c: 0x67ed, 0x125d: 0x680d,
-	0x125e: 0x682d, 0x125f: 0x0008, 0x1260: 0x684d, 0x1261: 0x0008, 0x1262: 0x686d, 0x1263: 0x0008,
-	0x1264: 0x0008, 0x1265: 0x688d, 0x1266: 0x68ad, 0x1267: 0x0008, 0x1268: 0x0008, 0x1269: 0x0008,
-	0x126a: 0x68cd, 0x126b: 0x68ed, 0x126c: 0x690d, 0x126d: 0x692d, 0x126e: 0x694d, 0x126f: 0x696d,
-	0x1270: 0x698d, 0x1271: 0x69ad, 0x1272: 0x69cd, 0x1273: 0x69ed, 0x1274: 0x6a0d, 0x1275: 0x6a2d,
-	0x1276: 0x6a4d, 0x1277: 0x6a6d, 0x1278: 0x6a8d, 0x1279: 0x6aad, 0x127a: 0x6acd, 0x127b: 0x6aed,
-	0x127c: 0x6b0d, 0x127d: 0x6b2d, 0x127e: 0x6b4d, 0x127f: 0x6b6d,
+	0x1240: 0x1439, 0x1241: 0x1441, 0x1242: 0x1449, 0x1243: 0x7d4d, 0x1244: 0x7d6d, 0x1245: 0x1451,
+	0x1246: 0x1451, 0x1247: 0x0040, 0x1248: 0x0040, 0x1249: 0x0040, 0x124a: 0x0040, 0x124b: 0x0040,
+	0x124c: 0x0040, 0x124d: 0x0040, 0x124e: 0x0040, 0x124f: 0x0040, 0x1250: 0x0040, 0x1251: 0x0040,
+	0x1252: 0x0040, 0x1253: 0x1459, 0x1254: 0x1461, 0x1255: 0x1469, 0x1256: 0x1471, 0x1257: 0x1479,
+	0x1258: 0x0040, 0x1259: 0x0040, 0x125a: 0x0040, 0x125b: 0x0040, 0x125c: 0x0040, 0x125d: 0x1481,
+	0x125e: 0x3308, 0x125f: 0x1489, 0x1260: 0x1491, 0x1261: 0x0779, 0x1262: 0x0791, 0x1263: 0x1499,
+	0x1264: 0x14a1, 0x1265: 0x14a9, 0x1266: 0x14b1, 0x1267: 0x14b9, 0x1268: 0x14c1, 0x1269: 0x071a,
+	0x126a: 0x14c9, 0x126b: 0x14d1, 0x126c: 0x14d9, 0x126d: 0x14e1, 0x126e: 0x14e9, 0x126f: 0x14f1,
+	0x1270: 0x14f9, 0x1271: 0x1501, 0x1272: 0x1509, 0x1273: 0x1511, 0x1274: 0x1519, 0x1275: 0x1521,
+	0x1276: 0x1529, 0x1277: 0x0040, 0x1278: 0x1531, 0x1279: 0x1539, 0x127a: 0x1541, 0x127b: 0x1549,
+	0x127c: 0x1551, 0x127d: 0x0040, 0x127e: 0x1559, 0x127f: 0x0040,
 	// Block 0x4a, offset 0x1280
-	0x1280: 0x7acd, 0x1281: 0x7aed, 0x1282: 0x7b0d, 0x1283: 0x7b2d, 0x1284: 0x7b4d, 0x1285: 0x7b6d,
-	0x1286: 0x7b8d, 0x1287: 0x7bad, 0x1288: 0x7bcd, 0x1289: 0x7bed, 0x128a: 0x7c0d, 0x128b: 0x7c2d,
-	0x128c: 0x7c4d, 0x128d: 0x7c6d, 0x128e: 0x7c8d, 0x128f: 0x6f19, 0x1290: 0x6f41, 0x1291: 0x6f69,
-	0x1292: 0x7cad, 0x1293: 0x7ccd, 0x1294: 0x7ced, 0x1295: 0x6f91, 0x1296: 0x6fb9, 0x1297: 0x6fe1,
-	0x1298: 0x7d0d, 0x1299: 0x7d2d, 0x129a: 0x0040, 0x129b: 0x0040, 0x129c: 0x0040, 0x129d: 0x0040,
-	0x129e: 0x0040, 0x129f: 0x0040, 0x12a0: 0x0040, 0x12a1: 0x0040, 0x12a2: 0x0040, 0x12a3: 0x0040,
-	0x12a4: 0x0040, 0x12a5: 0x0040, 0x12a6: 0x0040, 0x12a7: 0x0040, 0x12a8: 0x0040, 0x12a9: 0x0040,
-	0x12aa: 0x0040, 0x12ab: 0x0040, 0x12ac: 0x0040, 0x12ad: 0x0040, 0x12ae: 0x0040, 0x12af: 0x0040,
-	0x12b0: 0x0040, 0x12b1: 0x0040, 0x12b2: 0x0040, 0x12b3: 0x0040, 0x12b4: 0x0040, 0x12b5: 0x0040,
-	0x12b6: 0x0040, 0x12b7: 0x0040, 0x12b8: 0x0040, 0x12b9: 0x0040, 0x12ba: 0x0040, 0x12bb: 0x0040,
-	0x12bc: 0x0040, 0x12bd: 0x0040, 0x12be: 0x0040, 0x12bf: 0x0040,
+	0x1280: 0x1561, 0x1281: 0x1569, 0x1282: 0x0040, 0x1283: 0x1571, 0x1284: 0x1579, 0x1285: 0x0040,
+	0x1286: 0x1581, 0x1287: 0x1589, 0x1288: 0x1591, 0x1289: 0x1599, 0x128a: 0x15a1, 0x128b: 0x15a9,
+	0x128c: 0x15b1, 0x128d: 0x15b9, 0x128e: 0x15c1, 0x128f: 0x15c9, 0x1290: 0x15d1, 0x1291: 0x15d1,
+	0x1292: 0x15d9, 0x1293: 0x15d9, 0x1294: 0x15d9, 0x1295: 0x15d9, 0x1296: 0x15e1, 0x1297: 0x15e1,
+	0x1298: 0x15e1, 0x1299: 0x15e1, 0x129a: 0x15e9, 0x129b: 0x15e9, 0x129c: 0x15e9, 0x129d: 0x15e9,
+	0x129e: 0x15f1, 0x129f: 0x15f1, 0x12a0: 0x15f1, 0x12a1: 0x15f1, 0x12a2: 0x15f9, 0x12a3: 0x15f9,
+	0x12a4: 0x15f9, 0x12a5: 0x15f9, 0x12a6: 0x1601, 0x12a7: 0x1601, 0x12a8: 0x1601, 0x12a9: 0x1601,
+	0x12aa: 0x1609, 0x12ab: 0x1609, 0x12ac: 0x1609, 0x12ad: 0x1609, 0x12ae: 0x1611, 0x12af: 0x1611,
+	0x12b0: 0x1611, 0x12b1: 0x1611, 0x12b2: 0x1619, 0x12b3: 0x1619, 0x12b4: 0x1619, 0x12b5: 0x1619,
+	0x12b6: 0x1621, 0x12b7: 0x1621, 0x12b8: 0x1621, 0x12b9: 0x1621, 0x12ba: 0x1629, 0x12bb: 0x1629,
+	0x12bc: 0x1629, 0x12bd: 0x1629, 0x12be: 0x1631, 0x12bf: 0x1631,
 	// Block 0x4b, offset 0x12c0
-	0x12c0: 0x7009, 0x12c1: 0x7021, 0x12c2: 0x7039, 0x12c3: 0x7d4d, 0x12c4: 0x7d6d, 0x12c5: 0x7051,
-	0x12c6: 0x7051, 0x12c7: 0x0040, 0x12c8: 0x0040, 0x12c9: 0x0040, 0x12ca: 0x0040, 0x12cb: 0x0040,
-	0x12cc: 0x0040, 0x12cd: 0x0040, 0x12ce: 0x0040, 0x12cf: 0x0040, 0x12d0: 0x0040, 0x12d1: 0x0040,
-	0x12d2: 0x0040, 0x12d3: 0x7069, 0x12d4: 0x7091, 0x12d5: 0x70b9, 0x12d6: 0x70e1, 0x12d7: 0x7109,
-	0x12d8: 0x0040, 0x12d9: 0x0040, 0x12da: 0x0040, 0x12db: 0x0040, 0x12dc: 0x0040, 0x12dd: 0x7131,
-	0x12de: 0x3308, 0x12df: 0x7159, 0x12e0: 0x7181, 0x12e1: 0x20a9, 0x12e2: 0x20f1, 0x12e3: 0x7199,
-	0x12e4: 0x71b1, 0x12e5: 0x71c9, 0x12e6: 0x71e1, 0x12e7: 0x71f9, 0x12e8: 0x7211, 0x12e9: 0x1fb2,
-	0x12ea: 0x7229, 0x12eb: 0x7251, 0x12ec: 0x7279, 0x12ed: 0x72b1, 0x12ee: 0x72e9, 0x12ef: 0x7311,
-	0x12f0: 0x7339, 0x12f1: 0x7361, 0x12f2: 0x7389, 0x12f3: 0x73b1, 0x12f4: 0x73d9, 0x12f5: 0x7401,
-	0x12f6: 0x7429, 0x12f7: 0x0040, 0x12f8: 0x7451, 0x12f9: 0x7479, 0x12fa: 0x74a1, 0x12fb: 0x74c9,
-	0x12fc: 0x74f1, 0x12fd: 0x0040, 0x12fe: 0x7519, 0x12ff: 0x0040,
+	0x12c0: 0x1631, 0x12c1: 0x1631, 0x12c2: 0x1639, 0x12c3: 0x1639, 0x12c4: 0x1641, 0x12c5: 0x1641,
+	0x12c6: 0x1649, 0x12c7: 0x1649, 0x12c8: 0x1651, 0x12c9: 0x1651, 0x12ca: 0x1659, 0x12cb: 0x1659,
+	0x12cc: 0x1661, 0x12cd: 0x1661, 0x12ce: 0x1669, 0x12cf: 0x1669, 0x12d0: 0x1669, 0x12d1: 0x1669,
+	0x12d2: 0x1671, 0x12d3: 0x1671, 0x12d4: 0x1671, 0x12d5: 0x1671, 0x12d6: 0x1679, 0x12d7: 0x1679,
+	0x12d8: 0x1679, 0x12d9: 0x1679, 0x12da: 0x1681, 0x12db: 0x1681, 0x12dc: 0x1681, 0x12dd: 0x1681,
+	0x12de: 0x1689, 0x12df: 0x1689, 0x12e0: 0x1691, 0x12e1: 0x1691, 0x12e2: 0x1691, 0x12e3: 0x1691,
+	0x12e4: 0x1699, 0x12e5: 0x1699, 0x12e6: 0x16a1, 0x12e7: 0x16a1, 0x12e8: 0x16a1, 0x12e9: 0x16a1,
+	0x12ea: 0x16a9, 0x12eb: 0x16a9, 0x12ec: 0x16a9, 0x12ed: 0x16a9, 0x12ee: 0x16b1, 0x12ef: 0x16b1,
+	0x12f0: 0x16b9, 0x12f1: 0x16b9, 0x12f2: 0x0818, 0x12f3: 0x0818, 0x12f4: 0x0818, 0x12f5: 0x0818,
+	0x12f6: 0x0818, 0x12f7: 0x0818, 0x12f8: 0x0818, 0x12f9: 0x0818, 0x12fa: 0x0818, 0x12fb: 0x0818,
+	0x12fc: 0x0818, 0x12fd: 0x0818, 0x12fe: 0x0818, 0x12ff: 0x0818,
 	// Block 0x4c, offset 0x1300
-	0x1300: 0x7541, 0x1301: 0x7569, 0x1302: 0x0040, 0x1303: 0x7591, 0x1304: 0x75b9, 0x1305: 0x0040,
-	0x1306: 0x75e1, 0x1307: 0x7609, 0x1308: 0x7631, 0x1309: 0x7659, 0x130a: 0x7681, 0x130b: 0x76a9,
-	0x130c: 0x76d1, 0x130d: 0x76f9, 0x130e: 0x7721, 0x130f: 0x7749, 0x1310: 0x7771, 0x1311: 0x7771,
-	0x1312: 0x7789, 0x1313: 0x7789, 0x1314: 0x7789, 0x1315: 0x7789, 0x1316: 0x77a1, 0x1317: 0x77a1,
-	0x1318: 0x77a1, 0x1319: 0x77a1, 0x131a: 0x77b9, 0x131b: 0x77b9, 0x131c: 0x77b9, 0x131d: 0x77b9,
-	0x131e: 0x77d1, 0x131f: 0x77d1, 0x1320: 0x77d1, 0x1321: 0x77d1, 0x1322: 0x77e9, 0x1323: 0x77e9,
-	0x1324: 0x77e9, 0x1325: 0x77e9, 0x1326: 0x7801, 0x1327: 0x7801, 0x1328: 0x7801, 0x1329: 0x7801,
-	0x132a: 0x7819, 0x132b: 0x7819, 0x132c: 0x7819, 0x132d: 0x7819, 0x132e: 0x7831, 0x132f: 0x7831,
-	0x1330: 0x7831, 0x1331: 0x7831, 0x1332: 0x7849, 0x1333: 0x7849, 0x1334: 0x7849, 0x1335: 0x7849,
-	0x1336: 0x7861, 0x1337: 0x7861, 0x1338: 0x7861, 0x1339: 0x7861, 0x133a: 0x7879, 0x133b: 0x7879,
-	0x133c: 0x7879, 0x133d: 0x7879, 0x133e: 0x7891, 0x133f: 0x7891,
+	0x1300: 0x0818, 0x1301: 0x0818, 0x1302: 0x0040, 0x1303: 0x0040, 0x1304: 0x0040, 0x1305: 0x0040,
+	0x1306: 0x0040, 0x1307: 0x0040, 0x1308: 0x0040, 0x1309: 0x0040, 0x130a: 0x0040, 0x130b: 0x0040,
+	0x130c: 0x0040, 0x130d: 0x0040, 0x130e: 0x0040, 0x130f: 0x0040, 0x1310: 0x0040, 0x1311: 0x0040,
+	0x1312: 0x0040, 0x1313: 0x16c1, 0x1314: 0x16c1, 0x1315: 0x16c1, 0x1316: 0x16c1, 0x1317: 0x16c9,
+	0x1318: 0x16c9, 0x1319: 0x16d1, 0x131a: 0x16d1, 0x131b: 0x16d9, 0x131c: 0x16d9, 0x131d: 0x0149,
+	0x131e: 0x16e1, 0x131f: 0x16e1, 0x1320: 0x16e9, 0x1321: 0x16e9, 0x1322: 0x16f1, 0x1323: 0x16f1,
+	0x1324: 0x16f9, 0x1325: 0x16f9, 0x1326: 0x16f9, 0x1327: 0x16f9, 0x1328: 0x1701, 0x1329: 0x1701,
+	0x132a: 0x1709, 0x132b: 0x1709, 0x132c: 0x1711, 0x132d: 0x1711, 0x132e: 0x1719, 0x132f: 0x1719,
+	0x1330: 0x1721, 0x1331: 0x1721, 0x1332: 0x1729, 0x1333: 0x1729, 0x1334: 0x1731, 0x1335: 0x1731,
+	0x1336: 0x1739, 0x1337: 0x1739, 0x1338: 0x1739, 0x1339: 0x1741, 0x133a: 0x1741, 0x133b: 0x1741,
+	0x133c: 0x1749, 0x133d: 0x1749, 0x133e: 0x1749, 0x133f: 0x1749,
 	// Block 0x4d, offset 0x1340
-	0x1340: 0x7891, 0x1341: 0x7891, 0x1342: 0x78a9, 0x1343: 0x78a9, 0x1344: 0x78c1, 0x1345: 0x78c1,
-	0x1346: 0x78d9, 0x1347: 0x78d9, 0x1348: 0x78f1, 0x1349: 0x78f1, 0x134a: 0x7909, 0x134b: 0x7909,
-	0x134c: 0x7921, 0x134d: 0x7921, 0x134e: 0x7939, 0x134f: 0x7939, 0x1350: 0x7939, 0x1351: 0x7939,
-	0x1352: 0x7951, 0x1353: 0x7951, 0x1354: 0x7951, 0x1355: 0x7951, 0x1356: 0x7969, 0x1357: 0x7969,
-	0x1358: 0x7969, 0x1359: 0x7969, 0x135a: 0x7981, 0x135b: 0x7981, 0x135c: 0x7981, 0x135d: 0x7981,
-	0x135e: 0x7999, 0x135f: 0x7999, 0x1360: 0x79b1, 0x1361: 0x79b1, 0x1362: 0x79b1, 0x1363: 0x79b1,
-	0x1364: 0x79c9, 0x1365: 0x79c9, 0x1366: 0x79e1, 0x1367: 0x79e1, 0x1368: 0x79e1, 0x1369: 0x79e1,
-	0x136a: 0x79f9, 0x136b: 0x79f9, 0x136c: 0x79f9, 0x136d: 0x79f9, 0x136e: 0x7a11, 0x136f: 0x7a11,
-	0x1370: 0x7a29, 0x1371: 0x7a29, 0x1372: 0x0818, 0x1373: 0x0818, 0x1374: 0x0818, 0x1375: 0x0818,
-	0x1376: 0x0818, 0x1377: 0x0818, 0x1378: 0x0818, 0x1379: 0x0818, 0x137a: 0x0818, 0x137b: 0x0818,
-	0x137c: 0x0818, 0x137d: 0x0818, 0x137e: 0x0818, 0x137f: 0x0818,
+	0x1340: 0x1949, 0x1341: 0x1951, 0x1342: 0x1959, 0x1343: 0x1961, 0x1344: 0x1969, 0x1345: 0x1971,
+	0x1346: 0x1979, 0x1347: 0x1981, 0x1348: 0x1989, 0x1349: 0x1991, 0x134a: 0x1999, 0x134b: 0x19a1,
+	0x134c: 0x19a9, 0x134d: 0x19b1, 0x134e: 0x19b9, 0x134f: 0x19c1, 0x1350: 0x19c9, 0x1351: 0x19d1,
+	0x1352: 0x19d9, 0x1353: 0x19e1, 0x1354: 0x19e9, 0x1355: 0x19f1, 0x1356: 0x19f9, 0x1357: 0x1a01,
+	0x1358: 0x1a09, 0x1359: 0x1a11, 0x135a: 0x1a19, 0x135b: 0x1a21, 0x135c: 0x1a29, 0x135d: 0x1a31,
+	0x135e: 0x1a3a, 0x135f: 0x1a42, 0x1360: 0x1a4a, 0x1361: 0x1a52, 0x1362: 0x1a5a, 0x1363: 0x1a62,
+	0x1364: 0x1a69, 0x1365: 0x1a71, 0x1366: 0x1761, 0x1367: 0x1a79, 0x1368: 0x1741, 0x1369: 0x1769,
+	0x136a: 0x1a81, 0x136b: 0x1a89, 0x136c: 0x1789, 0x136d: 0x1a91, 0x136e: 0x1791, 0x136f: 0x1799,
+	0x1370: 0x1a99, 0x1371: 0x1aa1, 0x1372: 0x17b9, 0x1373: 0x1aa9, 0x1374: 0x17c1, 0x1375: 0x17c9,
+	0x1376: 0x1ab1, 0x1377: 0x1ab9, 0x1378: 0x17d9, 0x1379: 0x1ac1, 0x137a: 0x17e1, 0x137b: 0x17e9,
+	0x137c: 0x18d1, 0x137d: 0x18d9, 0x137e: 0x18f1, 0x137f: 0x18f9,
 	// Block 0x4e, offset 0x1380
-	0x1380: 0x0818, 0x1381: 0x0818, 0x1382: 0x0040, 0x1383: 0x0040, 0x1384: 0x0040, 0x1385: 0x0040,
-	0x1386: 0x0040, 0x1387: 0x0040, 0x1388: 0x0040, 0x1389: 0x0040, 0x138a: 0x0040, 0x138b: 0x0040,
-	0x138c: 0x0040, 0x138d: 0x0040, 0x138e: 0x0040, 0x138f: 0x0040, 0x1390: 0x0040, 0x1391: 0x0040,
-	0x1392: 0x0040, 0x1393: 0x7a41, 0x1394: 0x7a41, 0x1395: 0x7a41, 0x1396: 0x7a41, 0x1397: 0x7a59,
-	0x1398: 0x7a59, 0x1399: 0x7a71, 0x139a: 0x7a71, 0x139b: 0x7a89, 0x139c: 0x7a89, 0x139d: 0x0479,
-	0x139e: 0x7aa1, 0x139f: 0x7aa1, 0x13a0: 0x7ab9, 0x13a1: 0x7ab9, 0x13a2: 0x7ad1, 0x13a3: 0x7ad1,
-	0x13a4: 0x7ae9, 0x13a5: 0x7ae9, 0x13a6: 0x7ae9, 0x13a7: 0x7ae9, 0x13a8: 0x7b01, 0x13a9: 0x7b01,
-	0x13aa: 0x7b19, 0x13ab: 0x7b19, 0x13ac: 0x7b41, 0x13ad: 0x7b41, 0x13ae: 0x7b69, 0x13af: 0x7b69,
-	0x13b0: 0x7b91, 0x13b1: 0x7b91, 0x13b2: 0x7bb9, 0x13b3: 0x7bb9, 0x13b4: 0x7be1, 0x13b5: 0x7be1,
-	0x13b6: 0x7c09, 0x13b7: 0x7c09, 0x13b8: 0x7c09, 0x13b9: 0x7c31, 0x13ba: 0x7c31, 0x13bb: 0x7c31,
-	0x13bc: 0x7c59, 0x13bd: 0x7c59, 0x13be: 0x7c59, 0x13bf: 0x7c59,
+	0x1380: 0x1901, 0x1381: 0x1921, 0x1382: 0x1929, 0x1383: 0x1931, 0x1384: 0x1939, 0x1385: 0x1959,
+	0x1386: 0x1961, 0x1387: 0x1969, 0x1388: 0x1ac9, 0x1389: 0x1989, 0x138a: 0x1ad1, 0x138b: 0x1ad9,
+	0x138c: 0x19b9, 0x138d: 0x1ae1, 0x138e: 0x19c1, 0x138f: 0x19c9, 0x1390: 0x1a31, 0x1391: 0x1ae9,
+	0x1392: 0x1af1, 0x1393: 0x1a09, 0x1394: 0x1af9, 0x1395: 0x1a11, 0x1396: 0x1a19, 0x1397: 0x1751,
+	0x1398: 0x1759, 0x1399: 0x1b01, 0x139a: 0x1761, 0x139b: 0x1b09, 0x139c: 0x1771, 0x139d: 0x1779,
+	0x139e: 0x1781, 0x139f: 0x1789, 0x13a0: 0x1b11, 0x13a1: 0x17a1, 0x13a2: 0x17a9, 0x13a3: 0x17b1,
+	0x13a4: 0x17b9, 0x13a5: 0x1b19, 0x13a6: 0x17d9, 0x13a7: 0x17f1, 0x13a8: 0x17f9, 0x13a9: 0x1801,
+	0x13aa: 0x1809, 0x13ab: 0x1811, 0x13ac: 0x1821, 0x13ad: 0x1829, 0x13ae: 0x1831, 0x13af: 0x1839,
+	0x13b0: 0x1841, 0x13b1: 0x1849, 0x13b2: 0x1b21, 0x13b3: 0x1851, 0x13b4: 0x1859, 0x13b5: 0x1861,
+	0x13b6: 0x1869, 0x13b7: 0x1871, 0x13b8: 0x1879, 0x13b9: 0x1889, 0x13ba: 0x1891, 0x13bb: 0x1899,
+	0x13bc: 0x18a1, 0x13bd: 0x18a9, 0x13be: 0x18b1, 0x13bf: 0x18b9,
 	// Block 0x4f, offset 0x13c0
-	0x13c0: 0x8649, 0x13c1: 0x8671, 0x13c2: 0x8699, 0x13c3: 0x86c1, 0x13c4: 0x86e9, 0x13c5: 0x8711,
-	0x13c6: 0x8739, 0x13c7: 0x8761, 0x13c8: 0x8789, 0x13c9: 0x87b1, 0x13ca: 0x87d9, 0x13cb: 0x8801,
-	0x13cc: 0x8829, 0x13cd: 0x8851, 0x13ce: 0x8879, 0x13cf: 0x88a1, 0x13d0: 0x88c9, 0x13d1: 0x88f1,
-	0x13d2: 0x8919, 0x13d3: 0x8941, 0x13d4: 0x8969, 0x13d5: 0x8991, 0x13d6: 0x89b9, 0x13d7: 0x89e1,
-	0x13d8: 0x8a09, 0x13d9: 0x8a31, 0x13da: 0x8a59, 0x13db: 0x8a81, 0x13dc: 0x8aa9, 0x13dd: 0x8ad1,
-	0x13de: 0x8afa, 0x13df: 0x8b2a, 0x13e0: 0x8b5a, 0x13e1: 0x8b8a, 0x13e2: 0x8bba, 0x13e3: 0x8bea,
-	0x13e4: 0x8c19, 0x13e5: 0x8c41, 0x13e6: 0x7cc1, 0x13e7: 0x8c69, 0x13e8: 0x7c31, 0x13e9: 0x7ce9,
-	0x13ea: 0x8c91, 0x13eb: 0x8cb9, 0x13ec: 0x7d89, 0x13ed: 0x8ce1, 0x13ee: 0x7db1, 0x13ef: 0x7dd9,
-	0x13f0: 0x8d09, 0x13f1: 0x8d31, 0x13f2: 0x7e79, 0x13f3: 0x8d59, 0x13f4: 0x7ea1, 0x13f5: 0x7ec9,
-	0x13f6: 0x8d81, 0x13f7: 0x8da9, 0x13f8: 0x7f19, 0x13f9: 0x8dd1, 0x13fa: 0x7f41, 0x13fb: 0x7f69,
-	0x13fc: 0x83f1, 0x13fd: 0x8419, 0x13fe: 0x8491, 0x13ff: 0x84b9,
+	0x13c0: 0x18c1, 0x13c1: 0x18c9, 0x13c2: 0x18e1, 0x13c3: 0x18e9, 0x13c4: 0x1909, 0x13c5: 0x1911,
+	0x13c6: 0x1919, 0x13c7: 0x1921, 0x13c8: 0x1929, 0x13c9: 0x1941, 0x13ca: 0x1949, 0x13cb: 0x1951,
+	0x13cc: 0x1959, 0x13cd: 0x1b29, 0x13ce: 0x1971, 0x13cf: 0x1979, 0x13d0: 0x1981, 0x13d1: 0x1989,
+	0x13d2: 0x19a1, 0x13d3: 0x19a9, 0x13d4: 0x19b1, 0x13d5: 0x19b9, 0x13d6: 0x1b31, 0x13d7: 0x19d1,
+	0x13d8: 0x19d9, 0x13d9: 0x1b39, 0x13da: 0x19f1, 0x13db: 0x19f9, 0x13dc: 0x1a01, 0x13dd: 0x1a09,
+	0x13de: 0x1b41, 0x13df: 0x1761, 0x13e0: 0x1b09, 0x13e1: 0x1789, 0x13e2: 0x1b11, 0x13e3: 0x17b9,
+	0x13e4: 0x1b19, 0x13e5: 0x17d9, 0x13e6: 0x1b49, 0x13e7: 0x1841, 0x13e8: 0x1b51, 0x13e9: 0x1b59,
+	0x13ea: 0x1b61, 0x13eb: 0x1921, 0x13ec: 0x1929, 0x13ed: 0x1959, 0x13ee: 0x19b9, 0x13ef: 0x1b31,
+	0x13f0: 0x1a09, 0x13f1: 0x1b41, 0x13f2: 0x1b69, 0x13f3: 0x1b71, 0x13f4: 0x1b79, 0x13f5: 0x1b81,
+	0x13f6: 0x1b89, 0x13f7: 0x1b91, 0x13f8: 0x1b99, 0x13f9: 0x1ba1, 0x13fa: 0x1ba9, 0x13fb: 0x1bb1,
+	0x13fc: 0x1bb9, 0x13fd: 0x1bc1, 0x13fe: 0x1bc9, 0x13ff: 0x1bd1,
 	// Block 0x50, offset 0x1400
-	0x1400: 0x84e1, 0x1401: 0x8581, 0x1402: 0x85a9, 0x1403: 0x85d1, 0x1404: 0x85f9, 0x1405: 0x8699,
-	0x1406: 0x86c1, 0x1407: 0x86e9, 0x1408: 0x8df9, 0x1409: 0x8789, 0x140a: 0x8e21, 0x140b: 0x8e49,
-	0x140c: 0x8879, 0x140d: 0x8e71, 0x140e: 0x88a1, 0x140f: 0x88c9, 0x1410: 0x8ad1, 0x1411: 0x8e99,
-	0x1412: 0x8ec1, 0x1413: 0x8a09, 0x1414: 0x8ee9, 0x1415: 0x8a31, 0x1416: 0x8a59, 0x1417: 0x7c71,
-	0x1418: 0x7c99, 0x1419: 0x8f11, 0x141a: 0x7cc1, 0x141b: 0x8f39, 0x141c: 0x7d11, 0x141d: 0x7d39,
-	0x141e: 0x7d61, 0x141f: 0x7d89, 0x1420: 0x8f61, 0x1421: 0x7e01, 0x1422: 0x7e29, 0x1423: 0x7e51,
-	0x1424: 0x7e79, 0x1425: 0x8f89, 0x1426: 0x7f19, 0x1427: 0x7f91, 0x1428: 0x7fb9, 0x1429: 0x7fe1,
-	0x142a: 0x8009, 0x142b: 0x8031, 0x142c: 0x8081, 0x142d: 0x80a9, 0x142e: 0x80d1, 0x142f: 0x80f9,
-	0x1430: 0x8121, 0x1431: 0x8149, 0x1432: 0x8fb1, 0x1433: 0x8171, 0x1434: 0x8199, 0x1435: 0x81c1,
-	0x1436: 0x81e9, 0x1437: 0x8211, 0x1438: 0x8239, 0x1439: 0x8289, 0x143a: 0x82b1, 0x143b: 0x82d9,
-	0x143c: 0x8301, 0x143d: 0x8329, 0x143e: 0x8351, 0x143f: 0x8379,
+	0x1400: 0x1bd9, 0x1401: 0x1be1, 0x1402: 0x1be9, 0x1403: 0x1bf1, 0x1404: 0x1bf9, 0x1405: 0x1c01,
+	0x1406: 0x1c09, 0x1407: 0x1c11, 0x1408: 0x1c19, 0x1409: 0x1c21, 0x140a: 0x1c29, 0x140b: 0x1c31,
+	0x140c: 0x1b59, 0x140d: 0x1c39, 0x140e: 0x1c41, 0x140f: 0x1c49, 0x1410: 0x1c51, 0x1411: 0x1b81,
+	0x1412: 0x1b89, 0x1413: 0x1b91, 0x1414: 0x1b99, 0x1415: 0x1ba1, 0x1416: 0x1ba9, 0x1417: 0x1bb1,
+	0x1418: 0x1bb9, 0x1419: 0x1bc1, 0x141a: 0x1bc9, 0x141b: 0x1bd1, 0x141c: 0x1bd9, 0x141d: 0x1be1,
+	0x141e: 0x1be9, 0x141f: 0x1bf1, 0x1420: 0x1bf9, 0x1421: 0x1c01, 0x1422: 0x1c09, 0x1423: 0x1c11,
+	0x1424: 0x1c19, 0x1425: 0x1c21, 0x1426: 0x1c29, 0x1427: 0x1c31, 0x1428: 0x1b59, 0x1429: 0x1c39,
+	0x142a: 0x1c41, 0x142b: 0x1c49, 0x142c: 0x1c51, 0x142d: 0x1c21, 0x142e: 0x1c29, 0x142f: 0x1c31,
+	0x1430: 0x1b59, 0x1431: 0x1b51, 0x1432: 0x1b61, 0x1433: 0x1881, 0x1434: 0x1829, 0x1435: 0x1831,
+	0x1436: 0x1839, 0x1437: 0x1c21, 0x1438: 0x1c29, 0x1439: 0x1c31, 0x143a: 0x1881, 0x143b: 0x1889,
+	0x143c: 0x1c59, 0x143d: 0x1c59, 0x143e: 0x0018, 0x143f: 0x0018,
 	// Block 0x51, offset 0x1440
-	0x1440: 0x83a1, 0x1441: 0x83c9, 0x1442: 0x8441, 0x1443: 0x8469, 0x1444: 0x8509, 0x1445: 0x8531,
-	0x1446: 0x8559, 0x1447: 0x8581, 0x1448: 0x85a9, 0x1449: 0x8621, 0x144a: 0x8649, 0x144b: 0x8671,
-	0x144c: 0x8699, 0x144d: 0x8fd9, 0x144e: 0x8711, 0x144f: 0x8739, 0x1450: 0x8761, 0x1451: 0x8789,
-	0x1452: 0x8801, 0x1453: 0x8829, 0x1454: 0x8851, 0x1455: 0x8879, 0x1456: 0x9001, 0x1457: 0x88f1,
-	0x1458: 0x8919, 0x1459: 0x9029, 0x145a: 0x8991, 0x145b: 0x89b9, 0x145c: 0x89e1, 0x145d: 0x8a09,
-	0x145e: 0x9051, 0x145f: 0x7cc1, 0x1460: 0x8f39, 0x1461: 0x7d89, 0x1462: 0x8f61, 0x1463: 0x7e79,
-	0x1464: 0x8f89, 0x1465: 0x7f19, 0x1466: 0x9079, 0x1467: 0x8121, 0x1468: 0x90a1, 0x1469: 0x90c9,
-	0x146a: 0x90f1, 0x146b: 0x8581, 0x146c: 0x85a9, 0x146d: 0x8699, 0x146e: 0x8879, 0x146f: 0x9001,
-	0x1470: 0x8a09, 0x1471: 0x9051, 0x1472: 0x9119, 0x1473: 0x9151, 0x1474: 0x9189, 0x1475: 0x91c1,
-	0x1476: 0x91e9, 0x1477: 0x9211, 0x1478: 0x9239, 0x1479: 0x9261, 0x147a: 0x9289, 0x147b: 0x92b1,
-	0x147c: 0x92d9, 0x147d: 0x9301, 0x147e: 0x9329, 0x147f: 0x9351,
+	0x1440: 0x0040, 0x1441: 0x0040, 0x1442: 0x0040, 0x1443: 0x0040, 0x1444: 0x0040, 0x1445: 0x0040,
+	0x1446: 0x0040, 0x1447: 0x0040, 0x1448: 0x0040, 0x1449: 0x0040, 0x144a: 0x0040, 0x144b: 0x0040,
+	0x144c: 0x0040, 0x144d: 0x0040, 0x144e: 0x0040, 0x144f: 0x0040, 0x1450: 0x1c61, 0x1451: 0x1c69,
+	0x1452: 0x1c69, 0x1453: 0x1c71, 0x1454: 0x1c79, 0x1455: 0x1c81, 0x1456: 0x1c89, 0x1457: 0x1c91,
+	0x1458: 0x1c99, 0x1459: 0x1c99, 0x145a: 0x1ca1, 0x145b: 0x1ca9, 0x145c: 0x1cb1, 0x145d: 0x1cb9,
+	0x145e: 0x1cc1, 0x145f: 0x1cc9, 0x1460: 0x1cc9, 0x1461: 0x1cd1, 0x1462: 0x1cd9, 0x1463: 0x1cd9,
+	0x1464: 0x1ce1, 0x1465: 0x1ce1, 0x1466: 0x1ce9, 0x1467: 0x1cf1, 0x1468: 0x1cf1, 0x1469: 0x1cf9,
+	0x146a: 0x1d01, 0x146b: 0x1d01, 0x146c: 0x1d09, 0x146d: 0x1d09, 0x146e: 0x1d11, 0x146f: 0x1d19,
+	0x1470: 0x1d19, 0x1471: 0x1d21, 0x1472: 0x1d21, 0x1473: 0x1d29, 0x1474: 0x1d31, 0x1475: 0x1d39,
+	0x1476: 0x1d41, 0x1477: 0x1d41, 0x1478: 0x1d49, 0x1479: 0x1d51, 0x147a: 0x1d59, 0x147b: 0x1d61,
+	0x147c: 0x1d69, 0x147d: 0x1d69, 0x147e: 0x1d71, 0x147f: 0x1d79,
 	// Block 0x52, offset 0x1480
-	0x1480: 0x9379, 0x1481: 0x93a1, 0x1482: 0x93c9, 0x1483: 0x93f1, 0x1484: 0x9419, 0x1485: 0x9441,
-	0x1486: 0x9469, 0x1487: 0x9491, 0x1488: 0x94b9, 0x1489: 0x94e1, 0x148a: 0x9509, 0x148b: 0x9531,
-	0x148c: 0x90c9, 0x148d: 0x9559, 0x148e: 0x9581, 0x148f: 0x95a9, 0x1490: 0x95d1, 0x1491: 0x91c1,
-	0x1492: 0x91e9, 0x1493: 0x9211, 0x1494: 0x9239, 0x1495: 0x9261, 0x1496: 0x9289, 0x1497: 0x92b1,
-	0x1498: 0x92d9, 0x1499: 0x9301, 0x149a: 0x9329, 0x149b: 0x9351, 0x149c: 0x9379, 0x149d: 0x93a1,
-	0x149e: 0x93c9, 0x149f: 0x93f1, 0x14a0: 0x9419, 0x14a1: 0x9441, 0x14a2: 0x9469, 0x14a3: 0x9491,
-	0x14a4: 0x94b9, 0x14a5: 0x94e1, 0x14a6: 0x9509, 0x14a7: 0x9531, 0x14a8: 0x90c9, 0x14a9: 0x9559,
-	0x14aa: 0x9581, 0x14ab: 0x95a9, 0x14ac: 0x95d1, 0x14ad: 0x94e1, 0x14ae: 0x9509, 0x14af: 0x9531,
-	0x14b0: 0x90c9, 0x14b1: 0x90a1, 0x14b2: 0x90f1, 0x14b3: 0x8261, 0x14b4: 0x80a9, 0x14b5: 0x80d1,
-	0x14b6: 0x80f9, 0x14b7: 0x94e1, 0x14b8: 0x9509, 0x14b9: 0x9531, 0x14ba: 0x8261, 0x14bb: 0x8289,
-	0x14bc: 0x95f9, 0x14bd: 0x95f9, 0x14be: 0x0018, 0x14bf: 0x0018,
+	0x1480: 0x1f29, 0x1481: 0x1f31, 0x1482: 0x1f39, 0x1483: 0x1f11, 0x1484: 0x1d39, 0x1485: 0x1ce9,
+	0x1486: 0x1f41, 0x1487: 0x1f49, 0x1488: 0x0040, 0x1489: 0x0040, 0x148a: 0x0040, 0x148b: 0x0040,
+	0x148c: 0x0040, 0x148d: 0x0040, 0x148e: 0x0040, 0x148f: 0x0040, 0x1490: 0x0040, 0x1491: 0x0040,
+	0x1492: 0x0040, 0x1493: 0x0040, 0x1494: 0x0040, 0x1495: 0x0040, 0x1496: 0x0040, 0x1497: 0x0040,
+	0x1498: 0x0040, 0x1499: 0x0040, 0x149a: 0x0040, 0x149b: 0x0040, 0x149c: 0x0040, 0x149d: 0x0040,
+	0x149e: 0x0040, 0x149f: 0x0040, 0x14a0: 0x0040, 0x14a1: 0x0040, 0x14a2: 0x0040, 0x14a3: 0x0040,
+	0x14a4: 0x0040, 0x14a5: 0x0040, 0x14a6: 0x0040, 0x14a7: 0x0040, 0x14a8: 0x0040, 0x14a9: 0x0040,
+	0x14aa: 0x0040, 0x14ab: 0x0040, 0x14ac: 0x0040, 0x14ad: 0x0040, 0x14ae: 0x0040, 0x14af: 0x0040,
+	0x14b0: 0x1f51, 0x14b1: 0x1f59, 0x14b2: 0x1f61, 0x14b3: 0x1f69, 0x14b4: 0x1f71, 0x14b5: 0x1f79,
+	0x14b6: 0x1f81, 0x14b7: 0x1f89, 0x14b8: 0x1f91, 0x14b9: 0x1f99, 0x14ba: 0x1fa2, 0x14bb: 0x1faa,
+	0x14bc: 0x1fb1, 0x14bd: 0x0018, 0x14be: 0x0040, 0x14bf: 0x0040,
 	// Block 0x53, offset 0x14c0
-	0x14c0: 0x0040, 0x14c1: 0x0040, 0x14c2: 0x0040, 0x14c3: 0x0040, 0x14c4: 0x0040, 0x14c5: 0x0040,
-	0x14c6: 0x0040, 0x14c7: 0x0040, 0x14c8: 0x0040, 0x14c9: 0x0040, 0x14ca: 0x0040, 0x14cb: 0x0040,
-	0x14cc: 0x0040, 0x14cd: 0x0040, 0x14ce: 0x0040, 0x14cf: 0x0040, 0x14d0: 0x9621, 0x14d1: 0x9659,
-	0x14d2: 0x9659, 0x14d3: 0x9691, 0x14d4: 0x96c9, 0x14d5: 0x9701, 0x14d6: 0x9739, 0x14d7: 0x9771,
-	0x14d8: 0x97a9, 0x14d9: 0x97a9, 0x14da: 0x97e1, 0x14db: 0x9819, 0x14dc: 0x9851, 0x14dd: 0x9889,
-	0x14de: 0x98c1, 0x14df: 0x98f9, 0x14e0: 0x98f9, 0x14e1: 0x9931, 0x14e2: 0x9969, 0x14e3: 0x9969,
-	0x14e4: 0x99a1, 0x14e5: 0x99a1, 0x14e6: 0x99d9, 0x14e7: 0x9a11, 0x14e8: 0x9a11, 0x14e9: 0x9a49,
-	0x14ea: 0x9a81, 0x14eb: 0x9a81, 0x14ec: 0x9ab9, 0x14ed: 0x9ab9, 0x14ee: 0x9af1, 0x14ef: 0x9b29,
-	0x14f0: 0x9b29, 0x14f1: 0x9b61, 0x14f2: 0x9b61, 0x14f3: 0x9b99, 0x14f4: 0x9bd1, 0x14f5: 0x9c09,
-	0x14f6: 0x9c41, 0x14f7: 0x9c41, 0x14f8: 0x9c79, 0x14f9: 0x9cb1, 0x14fa: 0x9ce9, 0x14fb: 0x9d21,
-	0x14fc: 0x9d59, 0x14fd: 0x9d59, 0x14fe: 0x9d91, 0x14ff: 0x9dc9,
+	0x14c0: 0x33c0, 0x14c1: 0x33c0, 0x14c2: 0x33c0, 0x14c3: 0x33c0, 0x14c4: 0x33c0, 0x14c5: 0x33c0,
+	0x14c6: 0x33c0, 0x14c7: 0x33c0, 0x14c8: 0x33c0, 0x14c9: 0x33c0, 0x14ca: 0x33c0, 0x14cb: 0x33c0,
+	0x14cc: 0x33c0, 0x14cd: 0x33c0, 0x14ce: 0x33c0, 0x14cf: 0x33c0, 0x14d0: 0x1fba, 0x14d1: 0x7d8d,
+	0x14d2: 0x0040, 0x14d3: 0x1fc2, 0x14d4: 0x0122, 0x14d5: 0x1fca, 0x14d6: 0x1fd2, 0x14d7: 0x7dad,
+	0x14d8: 0x7dcd, 0x14d9: 0x0040, 0x14da: 0x0040, 0x14db: 0x0040, 0x14dc: 0x0040, 0x14dd: 0x0040,
+	0x14de: 0x0040, 0x14df: 0x0040, 0x14e0: 0x3308, 0x14e1: 0x3308, 0x14e2: 0x3308, 0x14e3: 0x3308,
+	0x14e4: 0x3308, 0x14e5: 0x3308, 0x14e6: 0x3308, 0x14e7: 0x3308, 0x14e8: 0x3308, 0x14e9: 0x3308,
+	0x14ea: 0x3308, 0x14eb: 0x3308, 0x14ec: 0x3308, 0x14ed: 0x3308, 0x14ee: 0x3308, 0x14ef: 0x3308,
+	0x14f0: 0x0040, 0x14f1: 0x7ded, 0x14f2: 0x7e0d, 0x14f3: 0x1fda, 0x14f4: 0x1fda, 0x14f5: 0x072a,
+	0x14f6: 0x0732, 0x14f7: 0x1fe2, 0x14f8: 0x1fea, 0x14f9: 0x7e2d, 0x14fa: 0x7e4d, 0x14fb: 0x7e6d,
+	0x14fc: 0x7e2d, 0x14fd: 0x7e8d, 0x14fe: 0x7ead, 0x14ff: 0x7e8d,
 	// Block 0x54, offset 0x1500
-	0x1500: 0xa999, 0x1501: 0xa9d1, 0x1502: 0xaa09, 0x1503: 0xa8f1, 0x1504: 0x9c09, 0x1505: 0x99d9,
-	0x1506: 0xaa41, 0x1507: 0xaa79, 0x1508: 0x0040, 0x1509: 0x0040, 0x150a: 0x0040, 0x150b: 0x0040,
-	0x150c: 0x0040, 0x150d: 0x0040, 0x150e: 0x0040, 0x150f: 0x0040, 0x1510: 0x0040, 0x1511: 0x0040,
-	0x1512: 0x0040, 0x1513: 0x0040, 0x1514: 0x0040, 0x1515: 0x0040, 0x1516: 0x0040, 0x1517: 0x0040,
-	0x1518: 0x0040, 0x1519: 0x0040, 0x151a: 0x0040, 0x151b: 0x0040, 0x151c: 0x0040, 0x151d: 0x0040,
-	0x151e: 0x0040, 0x151f: 0x0040, 0x1520: 0x0040, 0x1521: 0x0040, 0x1522: 0x0040, 0x1523: 0x0040,
-	0x1524: 0x0040, 0x1525: 0x0040, 0x1526: 0x0040, 0x1527: 0x0040, 0x1528: 0x0040, 0x1529: 0x0040,
-	0x152a: 0x0040, 0x152b: 0x0040, 0x152c: 0x0040, 0x152d: 0x0040, 0x152e: 0x0040, 0x152f: 0x0040,
-	0x1530: 0xaab1, 0x1531: 0xaae9, 0x1532: 0xab21, 0x1533: 0xab69, 0x1534: 0xabb1, 0x1535: 0xabf9,
-	0x1536: 0xac41, 0x1537: 0xac89, 0x1538: 0xacd1, 0x1539: 0xad19, 0x153a: 0xad52, 0x153b: 0xae62,
-	0x153c: 0xaee1, 0x153d: 0x0018, 0x153e: 0x0040, 0x153f: 0x0040,
+	0x1500: 0x7ecd, 0x1501: 0x7eed, 0x1502: 0x7f0d, 0x1503: 0x7eed, 0x1504: 0x7f2d, 0x1505: 0x0018,
+	0x1506: 0x0018, 0x1507: 0x1ff2, 0x1508: 0x1ffa, 0x1509: 0x7f4e, 0x150a: 0x7f6e, 0x150b: 0x7f8e,
+	0x150c: 0x7fae, 0x150d: 0x1fda, 0x150e: 0x1fda, 0x150f: 0x1fda, 0x1510: 0x1fba, 0x1511: 0x7fcd,
+	0x1512: 0x0040, 0x1513: 0x0040, 0x1514: 0x0122, 0x1515: 0x1fc2, 0x1516: 0x1fd2, 0x1517: 0x1fca,
+	0x1518: 0x7fed, 0x1519: 0x072a, 0x151a: 0x0732, 0x151b: 0x1fe2, 0x151c: 0x1fea, 0x151d: 0x7ecd,
+	0x151e: 0x7f2d, 0x151f: 0x2002, 0x1520: 0x200a, 0x1521: 0x2012, 0x1522: 0x071a, 0x1523: 0x2019,
+	0x1524: 0x2022, 0x1525: 0x202a, 0x1526: 0x0722, 0x1527: 0x0040, 0x1528: 0x2032, 0x1529: 0x203a,
+	0x152a: 0x2042, 0x152b: 0x204a, 0x152c: 0x0040, 0x152d: 0x0040, 0x152e: 0x0040, 0x152f: 0x0040,
+	0x1530: 0x800e, 0x1531: 0x2051, 0x1532: 0x802e, 0x1533: 0x0808, 0x1534: 0x804e, 0x1535: 0x0040,
+	0x1536: 0x806e, 0x1537: 0x2059, 0x1538: 0x808e, 0x1539: 0x2061, 0x153a: 0x80ae, 0x153b: 0x2069,
+	0x153c: 0x80ce, 0x153d: 0x2071, 0x153e: 0x80ee, 0x153f: 0x2079,
 	// Block 0x55, offset 0x1540
-	0x1540: 0x33c0, 0x1541: 0x33c0, 0x1542: 0x33c0, 0x1543: 0x33c0, 0x1544: 0x33c0, 0x1545: 0x33c0,
-	0x1546: 0x33c0, 0x1547: 0x33c0, 0x1548: 0x33c0, 0x1549: 0x33c0, 0x154a: 0x33c0, 0x154b: 0x33c0,
-	0x154c: 0x33c0, 0x154d: 0x33c0, 0x154e: 0x33c0, 0x154f: 0x33c0, 0x1550: 0xaf2a, 0x1551: 0x7d8d,
-	0x1552: 0x0040, 0x1553: 0xaf3a, 0x1554: 0x03c2, 0x1555: 0xaf4a, 0x1556: 0xaf5a, 0x1557: 0x7dad,
-	0x1558: 0x7dcd, 0x1559: 0x0040, 0x155a: 0x0040, 0x155b: 0x0040, 0x155c: 0x0040, 0x155d: 0x0040,
-	0x155e: 0x0040, 0x155f: 0x0040, 0x1560: 0x3308, 0x1561: 0x3308, 0x1562: 0x3308, 0x1563: 0x3308,
-	0x1564: 0x3308, 0x1565: 0x3308, 0x1566: 0x3308, 0x1567: 0x3308, 0x1568: 0x3308, 0x1569: 0x3308,
-	0x156a: 0x3308, 0x156b: 0x3308, 0x156c: 0x3308, 0x156d: 0x3308, 0x156e: 0x3308, 0x156f: 0x3308,
-	0x1570: 0x0040, 0x1571: 0x7ded, 0x1572: 0x7e0d, 0x1573: 0xaf6a, 0x1574: 0xaf6a, 0x1575: 0x1fd2,
-	0x1576: 0x1fe2, 0x1577: 0xaf7a, 0x1578: 0xaf8a, 0x1579: 0x7e2d, 0x157a: 0x7e4d, 0x157b: 0x7e6d,
-	0x157c: 0x7e2d, 0x157d: 0x7e8d, 0x157e: 0x7ead, 0x157f: 0x7e8d,
+	0x1540: 0x2081, 0x1541: 0x2089, 0x1542: 0x2089, 0x1543: 0x2091, 0x1544: 0x2091, 0x1545: 0x2099,
+	0x1546: 0x2099, 0x1547: 0x20a1, 0x1548: 0x20a1, 0x1549: 0x20a9, 0x154a: 0x20a9, 0x154b: 0x20a9,
+	0x154c: 0x20a9, 0x154d: 0x20b1, 0x154e: 0x20b1, 0x154f: 0x20b9, 0x1550: 0x20b9, 0x1551: 0x20b9,
+	0x1552: 0x20b9, 0x1553: 0x20c1, 0x1554: 0x20c1, 0x1555: 0x20c9, 0x1556: 0x20c9, 0x1557: 0x20c9,
+	0x1558: 0x20c9, 0x1559: 0x20d1, 0x155a: 0x20d1, 0x155b: 0x20d1, 0x155c: 0x20d1, 0x155d: 0x20d9,
+	0x155e: 0x20d9, 0x155f: 0x20d9, 0x1560: 0x20d9, 0x1561: 0x20e1, 0x1562: 0x20e1, 0x1563: 0x20e1,
+	0x1564: 0x20e1, 0x1565: 0x20e9, 0x1566: 0x20e9, 0x1567: 0x20e9, 0x1568: 0x20e9, 0x1569: 0x20f1,
+	0x156a: 0x20f1, 0x156b: 0x20f9, 0x156c: 0x20f9, 0x156d: 0x2101, 0x156e: 0x2101, 0x156f: 0x2109,
+	0x1570: 0x2109, 0x1571: 0x2111, 0x1572: 0x2111, 0x1573: 0x2111, 0x1574: 0x2111, 0x1575: 0x2119,
+	0x1576: 0x2119, 0x1577: 0x2119, 0x1578: 0x2119, 0x1579: 0x2121, 0x157a: 0x2121, 0x157b: 0x2121,
+	0x157c: 0x2121, 0x157d: 0x2129, 0x157e: 0x2129, 0x157f: 0x2129,
 	// Block 0x56, offset 0x1580
-	0x1580: 0x7ecd, 0x1581: 0x7eed, 0x1582: 0x7f0d, 0x1583: 0x7eed, 0x1584: 0x7f2d, 0x1585: 0x0018,
-	0x1586: 0x0018, 0x1587: 0xaf9a, 0x1588: 0xafaa, 0x1589: 0x7f4e, 0x158a: 0x7f6e, 0x158b: 0x7f8e,
-	0x158c: 0x7fae, 0x158d: 0xaf6a, 0x158e: 0xaf6a, 0x158f: 0xaf6a, 0x1590: 0xaf2a, 0x1591: 0x7fcd,
-	0x1592: 0x0040, 0x1593: 0x0040, 0x1594: 0x03c2, 0x1595: 0xaf3a, 0x1596: 0xaf5a, 0x1597: 0xaf4a,
-	0x1598: 0x7fed, 0x1599: 0x1fd2, 0x159a: 0x1fe2, 0x159b: 0xaf7a, 0x159c: 0xaf8a, 0x159d: 0x7ecd,
-	0x159e: 0x7f2d, 0x159f: 0xafba, 0x15a0: 0xafca, 0x15a1: 0xafda, 0x15a2: 0x1fb2, 0x15a3: 0xafe9,
-	0x15a4: 0xaffa, 0x15a5: 0xb00a, 0x15a6: 0x1fc2, 0x15a7: 0x0040, 0x15a8: 0xb01a, 0x15a9: 0xb02a,
-	0x15aa: 0xb03a, 0x15ab: 0xb04a, 0x15ac: 0x0040, 0x15ad: 0x0040, 0x15ae: 0x0040, 0x15af: 0x0040,
-	0x15b0: 0x800e, 0x15b1: 0xb059, 0x15b2: 0x802e, 0x15b3: 0x0808, 0x15b4: 0x804e, 0x15b5: 0x0040,
-	0x15b6: 0x806e, 0x15b7: 0xb081, 0x15b8: 0x808e, 0x15b9: 0xb0a9, 0x15ba: 0x80ae, 0x15bb: 0xb0d1,
-	0x15bc: 0x80ce, 0x15bd: 0xb0f9, 0x15be: 0x80ee, 0x15bf: 0xb121,
+	0x1580: 0x2129, 0x1581: 0x2131, 0x1582: 0x2131, 0x1583: 0x2131, 0x1584: 0x2131, 0x1585: 0x2139,
+	0x1586: 0x2139, 0x1587: 0x2139, 0x1588: 0x2139, 0x1589: 0x2141, 0x158a: 0x2141, 0x158b: 0x2141,
+	0x158c: 0x2141, 0x158d: 0x2149, 0x158e: 0x2149, 0x158f: 0x2149, 0x1590: 0x2149, 0x1591: 0x2151,
+	0x1592: 0x2151, 0x1593: 0x2151, 0x1594: 0x2151, 0x1595: 0x2159, 0x1596: 0x2159, 0x1597: 0x2159,
+	0x1598: 0x2159, 0x1599: 0x2161, 0x159a: 0x2161, 0x159b: 0x2161, 0x159c: 0x2161, 0x159d: 0x2169,
+	0x159e: 0x2169, 0x159f: 0x2169, 0x15a0: 0x2169, 0x15a1: 0x2171, 0x15a2: 0x2171, 0x15a3: 0x2171,
+	0x15a4: 0x2171, 0x15a5: 0x2179, 0x15a6: 0x2179, 0x15a7: 0x2179, 0x15a8: 0x2179, 0x15a9: 0x2181,
+	0x15aa: 0x2181, 0x15ab: 0x2181, 0x15ac: 0x2181, 0x15ad: 0x2189, 0x15ae: 0x2189, 0x15af: 0x1701,
+	0x15b0: 0x1701, 0x15b1: 0x2191, 0x15b2: 0x2191, 0x15b3: 0x2191, 0x15b4: 0x2191, 0x15b5: 0x2199,
+	0x15b6: 0x2199, 0x15b7: 0x21a1, 0x15b8: 0x21a1, 0x15b9: 0x21a9, 0x15ba: 0x21a9, 0x15bb: 0x21b1,
+	0x15bc: 0x21b1, 0x15bd: 0x0040, 0x15be: 0x0040, 0x15bf: 0x03c0,
 	// Block 0x57, offset 0x15c0
-	0x15c0: 0xb149, 0x15c1: 0xb161, 0x15c2: 0xb161, 0x15c3: 0xb179, 0x15c4: 0xb179, 0x15c5: 0xb191,
-	0x15c6: 0xb191, 0x15c7: 0xb1a9, 0x15c8: 0xb1a9, 0x15c9: 0xb1c1, 0x15ca: 0xb1c1, 0x15cb: 0xb1c1,
-	0x15cc: 0xb1c1, 0x15cd: 0xb1d9, 0x15ce: 0xb1d9, 0x15cf: 0xb1f1, 0x15d0: 0xb1f1, 0x15d1: 0xb1f1,
-	0x15d2: 0xb1f1, 0x15d3: 0xb209, 0x15d4: 0xb209, 0x15d5: 0xb221, 0x15d6: 0xb221, 0x15d7: 0xb221,
-	0x15d8: 0xb221, 0x15d9: 0xb239, 0x15da: 0xb239, 0x15db: 0xb239, 0x15dc: 0xb239, 0x15dd: 0xb251,
-	0x15de: 0xb251, 0x15df: 0xb251, 0x15e0: 0xb251, 0x15e1: 0xb269, 0x15e2: 0xb269, 0x15e3: 0xb269,
-	0x15e4: 0xb269, 0x15e5: 0xb281, 0x15e6: 0xb281, 0x15e7: 0xb281, 0x15e8: 0xb281, 0x15e9: 0xb299,
-	0x15ea: 0xb299, 0x15eb: 0xb2b1, 0x15ec: 0xb2b1, 0x15ed: 0xb2c9, 0x15ee: 0xb2c9, 0x15ef: 0xb2e1,
-	0x15f0: 0xb2e1, 0x15f1: 0xb2f9, 0x15f2: 0xb2f9, 0x15f3: 0xb2f9, 0x15f4: 0xb2f9, 0x15f5: 0xb311,
-	0x15f6: 0xb311, 0x15f7: 0xb311, 0x15f8: 0xb311, 0x15f9: 0xb329, 0x15fa: 0xb329, 0x15fb: 0xb329,
-	0x15fc: 0xb329, 0x15fd: 0xb341, 0x15fe: 0xb341, 0x15ff: 0xb341,
+	0x15c0: 0x0040, 0x15c1: 0x1fca, 0x15c2: 0x21ba, 0x15c3: 0x2002, 0x15c4: 0x203a, 0x15c5: 0x2042,
+	0x15c6: 0x200a, 0x15c7: 0x21c2, 0x15c8: 0x072a, 0x15c9: 0x0732, 0x15ca: 0x2012, 0x15cb: 0x071a,
+	0x15cc: 0x1fba, 0x15cd: 0x2019, 0x15ce: 0x0961, 0x15cf: 0x21ca, 0x15d0: 0x06e1, 0x15d1: 0x0049,
+	0x15d2: 0x0029, 0x15d3: 0x0031, 0x15d4: 0x06e9, 0x15d5: 0x06f1, 0x15d6: 0x06f9, 0x15d7: 0x0701,
+	0x15d8: 0x0709, 0x15d9: 0x0711, 0x15da: 0x1fc2, 0x15db: 0x0122, 0x15dc: 0x2022, 0x15dd: 0x0722,
+	0x15de: 0x202a, 0x15df: 0x1fd2, 0x15e0: 0x204a, 0x15e1: 0x0019, 0x15e2: 0x02e9, 0x15e3: 0x03d9,
+	0x15e4: 0x02f1, 0x15e5: 0x02f9, 0x15e6: 0x03f1, 0x15e7: 0x0309, 0x15e8: 0x00a9, 0x15e9: 0x0311,
+	0x15ea: 0x00b1, 0x15eb: 0x0319, 0x15ec: 0x0101, 0x15ed: 0x0321, 0x15ee: 0x0329, 0x15ef: 0x0051,
+	0x15f0: 0x0339, 0x15f1: 0x0751, 0x15f2: 0x00b9, 0x15f3: 0x0089, 0x15f4: 0x0341, 0x15f5: 0x0349,
+	0x15f6: 0x0391, 0x15f7: 0x00c1, 0x15f8: 0x0109, 0x15f9: 0x00c9, 0x15fa: 0x04b1, 0x15fb: 0x1ff2,
+	0x15fc: 0x2032, 0x15fd: 0x1ffa, 0x15fe: 0x21d2, 0x15ff: 0x1fda,
 	// Block 0x58, offset 0x1600
-	0x1600: 0xb341, 0x1601: 0xb359, 0x1602: 0xb359, 0x1603: 0xb359, 0x1604: 0xb359, 0x1605: 0xb371,
-	0x1606: 0xb371, 0x1607: 0xb371, 0x1608: 0xb371, 0x1609: 0xb389, 0x160a: 0xb389, 0x160b: 0xb389,
-	0x160c: 0xb389, 0x160d: 0xb3a1, 0x160e: 0xb3a1, 0x160f: 0xb3a1, 0x1610: 0xb3a1, 0x1611: 0xb3b9,
-	0x1612: 0xb3b9, 0x1613: 0xb3b9, 0x1614: 0xb3b9, 0x1615: 0xb3d1, 0x1616: 0xb3d1, 0x1617: 0xb3d1,
-	0x1618: 0xb3d1, 0x1619: 0xb3e9, 0x161a: 0xb3e9, 0x161b: 0xb3e9, 0x161c: 0xb3e9, 0x161d: 0xb401,
-	0x161e: 0xb401, 0x161f: 0xb401, 0x1620: 0xb401, 0x1621: 0xb419, 0x1622: 0xb419, 0x1623: 0xb419,
-	0x1624: 0xb419, 0x1625: 0xb431, 0x1626: 0xb431, 0x1627: 0xb431, 0x1628: 0xb431, 0x1629: 0xb449,
-	0x162a: 0xb449, 0x162b: 0xb449, 0x162c: 0xb449, 0x162d: 0xb461, 0x162e: 0xb461, 0x162f: 0x7b01,
-	0x1630: 0x7b01, 0x1631: 0xb479, 0x1632: 0xb479, 0x1633: 0xb479, 0x1634: 0xb479, 0x1635: 0xb491,
-	0x1636: 0xb491, 0x1637: 0xb4b9, 0x1638: 0xb4b9, 0x1639: 0xb4e1, 0x163a: 0xb4e1, 0x163b: 0xb509,
-	0x163c: 0xb509, 0x163d: 0x0040, 0x163e: 0x0040, 0x163f: 0x03c0,
+	0x1600: 0x0672, 0x1601: 0x0019, 0x1602: 0x02e9, 0x1603: 0x03d9, 0x1604: 0x02f1, 0x1605: 0x02f9,
+	0x1606: 0x03f1, 0x1607: 0x0309, 0x1608: 0x00a9, 0x1609: 0x0311, 0x160a: 0x00b1, 0x160b: 0x0319,
+	0x160c: 0x0101, 0x160d: 0x0321, 0x160e: 0x0329, 0x160f: 0x0051, 0x1610: 0x0339, 0x1611: 0x0751,
+	0x1612: 0x00b9, 0x1613: 0x0089, 0x1614: 0x0341, 0x1615: 0x0349, 0x1616: 0x0391, 0x1617: 0x00c1,
+	0x1618: 0x0109, 0x1619: 0x00c9, 0x161a: 0x04b1, 0x161b: 0x1fe2, 0x161c: 0x21da, 0x161d: 0x1fea,
+	0x161e: 0x21e2, 0x161f: 0x810d, 0x1620: 0x812d, 0x1621: 0x0961, 0x1622: 0x814d, 0x1623: 0x814d,
+	0x1624: 0x816d, 0x1625: 0x818d, 0x1626: 0x81ad, 0x1627: 0x81cd, 0x1628: 0x81ed, 0x1629: 0x820d,
+	0x162a: 0x822d, 0x162b: 0x824d, 0x162c: 0x826d, 0x162d: 0x828d, 0x162e: 0x82ad, 0x162f: 0x82cd,
+	0x1630: 0x82ed, 0x1631: 0x830d, 0x1632: 0x832d, 0x1633: 0x834d, 0x1634: 0x836d, 0x1635: 0x838d,
+	0x1636: 0x83ad, 0x1637: 0x83cd, 0x1638: 0x83ed, 0x1639: 0x840d, 0x163a: 0x842d, 0x163b: 0x844d,
+	0x163c: 0x81ed, 0x163d: 0x846d, 0x163e: 0x848d, 0x163f: 0x824d,
 	// Block 0x59, offset 0x1640
-	0x1640: 0x0040, 0x1641: 0xaf4a, 0x1642: 0xb532, 0x1643: 0xafba, 0x1644: 0xb02a, 0x1645: 0xb03a,
-	0x1646: 0xafca, 0x1647: 0xb542, 0x1648: 0x1fd2, 0x1649: 0x1fe2, 0x164a: 0xafda, 0x164b: 0x1fb2,
-	0x164c: 0xaf2a, 0x164d: 0xafe9, 0x164e: 0x29d1, 0x164f: 0xb552, 0x1650: 0x1f41, 0x1651: 0x00c9,
-	0x1652: 0x0069, 0x1653: 0x0079, 0x1654: 0x1f51, 0x1655: 0x1f61, 0x1656: 0x1f71, 0x1657: 0x1f81,
-	0x1658: 0x1f91, 0x1659: 0x1fa1, 0x165a: 0xaf3a, 0x165b: 0x03c2, 0x165c: 0xaffa, 0x165d: 0x1fc2,
-	0x165e: 0xb00a, 0x165f: 0xaf5a, 0x1660: 0xb04a, 0x1661: 0x0039, 0x1662: 0x0ee9, 0x1663: 0x1159,
-	0x1664: 0x0ef9, 0x1665: 0x0f09, 0x1666: 0x1199, 0x1667: 0x0f31, 0x1668: 0x0249, 0x1669: 0x0f41,
-	0x166a: 0x0259, 0x166b: 0x0f51, 0x166c: 0x0359, 0x166d: 0x0f61, 0x166e: 0x0f71, 0x166f: 0x00d9,
-	0x1670: 0x0f99, 0x1671: 0x2039, 0x1672: 0x0269, 0x1673: 0x01d9, 0x1674: 0x0fa9, 0x1675: 0x0fb9,
-	0x1676: 0x1089, 0x1677: 0x0279, 0x1678: 0x0369, 0x1679: 0x0289, 0x167a: 0x13d1, 0x167b: 0xaf9a,
-	0x167c: 0xb01a, 0x167d: 0xafaa, 0x167e: 0xb562, 0x167f: 0xaf6a,
+	0x1640: 0x84ad, 0x1641: 0x84cd, 0x1642: 0x84ed, 0x1643: 0x850d, 0x1644: 0x852d, 0x1645: 0x854d,
+	0x1646: 0x856d, 0x1647: 0x858d, 0x1648: 0x850d, 0x1649: 0x85ad, 0x164a: 0x850d, 0x164b: 0x85cd,
+	0x164c: 0x85cd, 0x164d: 0x85ed, 0x164e: 0x85ed, 0x164f: 0x860d, 0x1650: 0x854d, 0x1651: 0x862d,
+	0x1652: 0x864d, 0x1653: 0x862d, 0x1654: 0x866d, 0x1655: 0x864d, 0x1656: 0x868d, 0x1657: 0x868d,
+	0x1658: 0x86ad, 0x1659: 0x86ad, 0x165a: 0x86cd, 0x165b: 0x86cd, 0x165c: 0x864d, 0x165d: 0x814d,
+	0x165e: 0x86ed, 0x165f: 0x870d, 0x1660: 0x0040, 0x1661: 0x872d, 0x1662: 0x874d, 0x1663: 0x876d,
+	0x1664: 0x878d, 0x1665: 0x876d, 0x1666: 0x87ad, 0x1667: 0x87cd, 0x1668: 0x87ed, 0x1669: 0x87ed,
+	0x166a: 0x880d, 0x166b: 0x880d, 0x166c: 0x882d, 0x166d: 0x882d, 0x166e: 0x880d, 0x166f: 0x880d,
+	0x1670: 0x884d, 0x1671: 0x886d, 0x1672: 0x888d, 0x1673: 0x88ad, 0x1674: 0x88cd, 0x1675: 0x88ed,
+	0x1676: 0x88ed, 0x1677: 0x88ed, 0x1678: 0x890d, 0x1679: 0x890d, 0x167a: 0x890d, 0x167b: 0x890d,
+	0x167c: 0x87ed, 0x167d: 0x87ed, 0x167e: 0x87ed, 0x167f: 0x0040,
 	// Block 0x5a, offset 0x1680
-	0x1680: 0x1caa, 0x1681: 0x0039, 0x1682: 0x0ee9, 0x1683: 0x1159, 0x1684: 0x0ef9, 0x1685: 0x0f09,
-	0x1686: 0x1199, 0x1687: 0x0f31, 0x1688: 0x0249, 0x1689: 0x0f41, 0x168a: 0x0259, 0x168b: 0x0f51,
-	0x168c: 0x0359, 0x168d: 0x0f61, 0x168e: 0x0f71, 0x168f: 0x00d9, 0x1690: 0x0f99, 0x1691: 0x2039,
-	0x1692: 0x0269, 0x1693: 0x01d9, 0x1694: 0x0fa9, 0x1695: 0x0fb9, 0x1696: 0x1089, 0x1697: 0x0279,
-	0x1698: 0x0369, 0x1699: 0x0289, 0x169a: 0x13d1, 0x169b: 0xaf7a, 0x169c: 0xb572, 0x169d: 0xaf8a,
-	0x169e: 0xb582, 0x169f: 0x810d, 0x16a0: 0x812d, 0x16a1: 0x29d1, 0x16a2: 0x814d, 0x16a3: 0x814d,
-	0x16a4: 0x816d, 0x16a5: 0x818d, 0x16a6: 0x81ad, 0x16a7: 0x81cd, 0x16a8: 0x81ed, 0x16a9: 0x820d,
-	0x16aa: 0x822d, 0x16ab: 0x824d, 0x16ac: 0x826d, 0x16ad: 0x828d, 0x16ae: 0x82ad, 0x16af: 0x82cd,
-	0x16b0: 0x82ed, 0x16b1: 0x830d, 0x16b2: 0x832d, 0x16b3: 0x834d, 0x16b4: 0x836d, 0x16b5: 0x838d,
-	0x16b6: 0x83ad, 0x16b7: 0x83cd, 0x16b8: 0x83ed, 0x16b9: 0x840d, 0x16ba: 0x842d, 0x16bb: 0x844d,
-	0x16bc: 0x81ed, 0x16bd: 0x846d, 0x16be: 0x848d, 0x16bf: 0x824d,
+	0x1680: 0x0040, 0x1681: 0x0040, 0x1682: 0x874d, 0x1683: 0x872d, 0x1684: 0x892d, 0x1685: 0x872d,
+	0x1686: 0x874d, 0x1687: 0x872d, 0x1688: 0x0040, 0x1689: 0x0040, 0x168a: 0x894d, 0x168b: 0x874d,
+	0x168c: 0x896d, 0x168d: 0x892d, 0x168e: 0x896d, 0x168f: 0x874d, 0x1690: 0x0040, 0x1691: 0x0040,
+	0x1692: 0x898d, 0x1693: 0x89ad, 0x1694: 0x88ad, 0x1695: 0x896d, 0x1696: 0x892d, 0x1697: 0x896d,
+	0x1698: 0x0040, 0x1699: 0x0040, 0x169a: 0x89cd, 0x169b: 0x89ed, 0x169c: 0x89cd, 0x169d: 0x0040,
+	0x169e: 0x0040, 0x169f: 0x0040, 0x16a0: 0x21e9, 0x16a1: 0x21f1, 0x16a2: 0x21f9, 0x16a3: 0x8a0e,
+	0x16a4: 0x2201, 0x16a5: 0x2209, 0x16a6: 0x8a2d, 0x16a7: 0x0040, 0x16a8: 0x8a4d, 0x16a9: 0x8a6d,
+	0x16aa: 0x8a8d, 0x16ab: 0x8a6d, 0x16ac: 0x8aad, 0x16ad: 0x8acd, 0x16ae: 0x8aed, 0x16af: 0x0040,
+	0x16b0: 0x0040, 0x16b1: 0x0040, 0x16b2: 0x0040, 0x16b3: 0x0040, 0x16b4: 0x0040, 0x16b5: 0x0040,
+	0x16b6: 0x0040, 0x16b7: 0x0040, 0x16b8: 0x0040, 0x16b9: 0x0340, 0x16ba: 0x0340, 0x16bb: 0x0340,
+	0x16bc: 0x0040, 0x16bd: 0x0040, 0x16be: 0x0040, 0x16bf: 0x0040,
 	// Block 0x5b, offset 0x16c0
-	0x16c0: 0x84ad, 0x16c1: 0x84cd, 0x16c2: 0x84ed, 0x16c3: 0x850d, 0x16c4: 0x852d, 0x16c5: 0x854d,
-	0x16c6: 0x856d, 0x16c7: 0x858d, 0x16c8: 0x850d, 0x16c9: 0x85ad, 0x16ca: 0x850d, 0x16cb: 0x85cd,
-	0x16cc: 0x85cd, 0x16cd: 0x85ed, 0x16ce: 0x85ed, 0x16cf: 0x860d, 0x16d0: 0x854d, 0x16d1: 0x862d,
-	0x16d2: 0x864d, 0x16d3: 0x862d, 0x16d4: 0x866d, 0x16d5: 0x864d, 0x16d6: 0x868d, 0x16d7: 0x868d,
-	0x16d8: 0x86ad, 0x16d9: 0x86ad, 0x16da: 0x86cd, 0x16db: 0x86cd, 0x16dc: 0x864d, 0x16dd: 0x814d,
-	0x16de: 0x86ed, 0x16df: 0x870d, 0x16e0: 0x0040, 0x16e1: 0x872d, 0x16e2: 0x874d, 0x16e3: 0x876d,
-	0x16e4: 0x878d, 0x16e5: 0x876d, 0x16e6: 0x87ad, 0x16e7: 0x87cd, 0x16e8: 0x87ed, 0x16e9: 0x87ed,
-	0x16ea: 0x880d, 0x16eb: 0x880d, 0x16ec: 0x882d, 0x16ed: 0x882d, 0x16ee: 0x880d, 0x16ef: 0x880d,
-	0x16f0: 0x884d, 0x16f1: 0x886d, 0x16f2: 0x888d, 0x16f3: 0x88ad, 0x16f4: 0x88cd, 0x16f5: 0x88ed,
-	0x16f6: 0x88ed, 0x16f7: 0x88ed, 0x16f8: 0x890d, 0x16f9: 0x890d, 0x16fa: 0x890d, 0x16fb: 0x890d,
-	0x16fc: 0x87ed, 0x16fd: 0x87ed, 0x16fe: 0x87ed, 0x16ff: 0x0040,
+	0x16c0: 0x0a08, 0x16c1: 0x0a08, 0x16c2: 0x0a08, 0x16c3: 0x0a08, 0x16c4: 0x0a08, 0x16c5: 0x0c08,
+	0x16c6: 0x0808, 0x16c7: 0x0c08, 0x16c8: 0x0818, 0x16c9: 0x0c08, 0x16ca: 0x0c08, 0x16cb: 0x0808,
+	0x16cc: 0x0808, 0x16cd: 0x0908, 0x16ce: 0x0c08, 0x16cf: 0x0c08, 0x16d0: 0x0c08, 0x16d1: 0x0c08,
+	0x16d2: 0x0c08, 0x16d3: 0x0a08, 0x16d4: 0x0a08, 0x16d5: 0x0a08, 0x16d6: 0x0a08, 0x16d7: 0x0908,
+	0x16d8: 0x0a08, 0x16d9: 0x0a08, 0x16da: 0x0a08, 0x16db: 0x0a08, 0x16dc: 0x0a08, 0x16dd: 0x0c08,
+	0x16de: 0x0a08, 0x16df: 0x0a08, 0x16e0: 0x0a08, 0x16e1: 0x0c08, 0x16e2: 0x0808, 0x16e3: 0x0808,
+	0x16e4: 0x0c08, 0x16e5: 0x3308, 0x16e6: 0x3308, 0x16e7: 0x0040, 0x16e8: 0x0040, 0x16e9: 0x0040,
+	0x16ea: 0x0040, 0x16eb: 0x0a18, 0x16ec: 0x0a18, 0x16ed: 0x0a18, 0x16ee: 0x0a18, 0x16ef: 0x0c18,
+	0x16f0: 0x0818, 0x16f1: 0x0818, 0x16f2: 0x0818, 0x16f3: 0x0818, 0x16f4: 0x0818, 0x16f5: 0x0818,
+	0x16f6: 0x0818, 0x16f7: 0x0040, 0x16f8: 0x0040, 0x16f9: 0x0040, 0x16fa: 0x0040, 0x16fb: 0x0040,
+	0x16fc: 0x0040, 0x16fd: 0x0040, 0x16fe: 0x0040, 0x16ff: 0x0040,
 	// Block 0x5c, offset 0x1700
-	0x1700: 0x0040, 0x1701: 0x0040, 0x1702: 0x874d, 0x1703: 0x872d, 0x1704: 0x892d, 0x1705: 0x872d,
-	0x1706: 0x874d, 0x1707: 0x872d, 0x1708: 0x0040, 0x1709: 0x0040, 0x170a: 0x894d, 0x170b: 0x874d,
-	0x170c: 0x896d, 0x170d: 0x892d, 0x170e: 0x896d, 0x170f: 0x874d, 0x1710: 0x0040, 0x1711: 0x0040,
-	0x1712: 0x898d, 0x1713: 0x89ad, 0x1714: 0x88ad, 0x1715: 0x896d, 0x1716: 0x892d, 0x1717: 0x896d,
-	0x1718: 0x0040, 0x1719: 0x0040, 0x171a: 0x89cd, 0x171b: 0x89ed, 0x171c: 0x89cd, 0x171d: 0x0040,
-	0x171e: 0x0040, 0x171f: 0x0040, 0x1720: 0xb591, 0x1721: 0xb5a9, 0x1722: 0xb5c1, 0x1723: 0x8a0e,
-	0x1724: 0xb5d9, 0x1725: 0xb5f1, 0x1726: 0x8a2d, 0x1727: 0x0040, 0x1728: 0x8a4d, 0x1729: 0x8a6d,
-	0x172a: 0x8a8d, 0x172b: 0x8a6d, 0x172c: 0x8aad, 0x172d: 0x8acd, 0x172e: 0x8aed, 0x172f: 0x0040,
+	0x1700: 0x0a08, 0x1701: 0x0c08, 0x1702: 0x0a08, 0x1703: 0x0c08, 0x1704: 0x0c08, 0x1705: 0x0c08,
+	0x1706: 0x0a08, 0x1707: 0x0a08, 0x1708: 0x0a08, 0x1709: 0x0c08, 0x170a: 0x0a08, 0x170b: 0x0a08,
+	0x170c: 0x0c08, 0x170d: 0x0a08, 0x170e: 0x0c08, 0x170f: 0x0c08, 0x1710: 0x0a08, 0x1711: 0x0c08,
+	0x1712: 0x0040, 0x1713: 0x0040, 0x1714: 0x0040, 0x1715: 0x0040, 0x1716: 0x0040, 0x1717: 0x0040,
+	0x1718: 0x0040, 0x1719: 0x0818, 0x171a: 0x0818, 0x171b: 0x0818, 0x171c: 0x0818, 0x171d: 0x0040,
+	0x171e: 0x0040, 0x171f: 0x0040, 0x1720: 0x0040, 0x1721: 0x0040, 0x1722: 0x0040, 0x1723: 0x0040,
+	0x1724: 0x0040, 0x1725: 0x0040, 0x1726: 0x0040, 0x1727: 0x0040, 0x1728: 0x0040, 0x1729: 0x0c18,
+	0x172a: 0x0c18, 0x172b: 0x0c18, 0x172c: 0x0c18, 0x172d: 0x0a18, 0x172e: 0x0a18, 0x172f: 0x0818,
 	0x1730: 0x0040, 0x1731: 0x0040, 0x1732: 0x0040, 0x1733: 0x0040, 0x1734: 0x0040, 0x1735: 0x0040,
-	0x1736: 0x0040, 0x1737: 0x0040, 0x1738: 0x0040, 0x1739: 0x0340, 0x173a: 0x0340, 0x173b: 0x0340,
+	0x1736: 0x0040, 0x1737: 0x0040, 0x1738: 0x0040, 0x1739: 0x0040, 0x173a: 0x0040, 0x173b: 0x0040,
 	0x173c: 0x0040, 0x173d: 0x0040, 0x173e: 0x0040, 0x173f: 0x0040,
 	// Block 0x5d, offset 0x1740
-	0x1740: 0x0a08, 0x1741: 0x0a08, 0x1742: 0x0a08, 0x1743: 0x0a08, 0x1744: 0x0a08, 0x1745: 0x0c08,
-	0x1746: 0x0808, 0x1747: 0x0c08, 0x1748: 0x0818, 0x1749: 0x0c08, 0x174a: 0x0c08, 0x174b: 0x0808,
-	0x174c: 0x0808, 0x174d: 0x0908, 0x174e: 0x0c08, 0x174f: 0x0c08, 0x1750: 0x0c08, 0x1751: 0x0c08,
-	0x1752: 0x0c08, 0x1753: 0x0a08, 0x1754: 0x0a08, 0x1755: 0x0a08, 0x1756: 0x0a08, 0x1757: 0x0908,
-	0x1758: 0x0a08, 0x1759: 0x0a08, 0x175a: 0x0a08, 0x175b: 0x0a08, 0x175c: 0x0a08, 0x175d: 0x0c08,
-	0x175e: 0x0a08, 0x175f: 0x0a08, 0x1760: 0x0a08, 0x1761: 0x0c08, 0x1762: 0x0808, 0x1763: 0x0808,
-	0x1764: 0x0c08, 0x1765: 0x3308, 0x1766: 0x3308, 0x1767: 0x0040, 0x1768: 0x0040, 0x1769: 0x0040,
-	0x176a: 0x0040, 0x176b: 0x0a18, 0x176c: 0x0a18, 0x176d: 0x0a18, 0x176e: 0x0a18, 0x176f: 0x0c18,
-	0x1770: 0x0818, 0x1771: 0x0818, 0x1772: 0x0818, 0x1773: 0x0818, 0x1774: 0x0818, 0x1775: 0x0818,
-	0x1776: 0x0818, 0x1777: 0x0040, 0x1778: 0x0040, 0x1779: 0x0040, 0x177a: 0x0040, 0x177b: 0x0040,
-	0x177c: 0x0040, 0x177d: 0x0040, 0x177e: 0x0040, 0x177f: 0x0040,
+	0x1740: 0x3308, 0x1741: 0x3308, 0x1742: 0x3008, 0x1743: 0x3008, 0x1744: 0x0040, 0x1745: 0x0008,
+	0x1746: 0x0008, 0x1747: 0x0008, 0x1748: 0x0008, 0x1749: 0x0008, 0x174a: 0x0008, 0x174b: 0x0008,
+	0x174c: 0x0008, 0x174d: 0x0040, 0x174e: 0x0040, 0x174f: 0x0008, 0x1750: 0x0008, 0x1751: 0x0040,
+	0x1752: 0x0040, 0x1753: 0x0008, 0x1754: 0x0008, 0x1755: 0x0008, 0x1756: 0x0008, 0x1757: 0x0008,
+	0x1758: 0x0008, 0x1759: 0x0008, 0x175a: 0x0008, 0x175b: 0x0008, 0x175c: 0x0008, 0x175d: 0x0008,
+	0x175e: 0x0008, 0x175f: 0x0008, 0x1760: 0x0008, 0x1761: 0x0008, 0x1762: 0x0008, 0x1763: 0x0008,
+	0x1764: 0x0008, 0x1765: 0x0008, 0x1766: 0x0008, 0x1767: 0x0008, 0x1768: 0x0008, 0x1769: 0x0040,
+	0x176a: 0x0008, 0x176b: 0x0008, 0x176c: 0x0008, 0x176d: 0x0008, 0x176e: 0x0008, 0x176f: 0x0008,
+	0x1770: 0x0008, 0x1771: 0x0040, 0x1772: 0x0008, 0x1773: 0x0008, 0x1774: 0x0040, 0x1775: 0x0008,
+	0x1776: 0x0008, 0x1777: 0x0008, 0x1778: 0x0008, 0x1779: 0x0008, 0x177a: 0x0040, 0x177b: 0x3308,
+	0x177c: 0x3308, 0x177d: 0x0008, 0x177e: 0x3008, 0x177f: 0x3008,
 	// Block 0x5e, offset 0x1780
-	0x1780: 0x0a08, 0x1781: 0x0c08, 0x1782: 0x0a08, 0x1783: 0x0c08, 0x1784: 0x0c08, 0x1785: 0x0c08,
-	0x1786: 0x0a08, 0x1787: 0x0a08, 0x1788: 0x0a08, 0x1789: 0x0c08, 0x178a: 0x0a08, 0x178b: 0x0a08,
-	0x178c: 0x0c08, 0x178d: 0x0a08, 0x178e: 0x0c08, 0x178f: 0x0c08, 0x1790: 0x0a08, 0x1791: 0x0c08,
-	0x1792: 0x0040, 0x1793: 0x0040, 0x1794: 0x0040, 0x1795: 0x0040, 0x1796: 0x0040, 0x1797: 0x0040,
-	0x1798: 0x0040, 0x1799: 0x0818, 0x179a: 0x0818, 0x179b: 0x0818, 0x179c: 0x0818, 0x179d: 0x0040,
-	0x179e: 0x0040, 0x179f: 0x0040, 0x17a0: 0x0040, 0x17a1: 0x0040, 0x17a2: 0x0040, 0x17a3: 0x0040,
-	0x17a4: 0x0040, 0x17a5: 0x0040, 0x17a6: 0x0040, 0x17a7: 0x0040, 0x17a8: 0x0040, 0x17a9: 0x0c18,
-	0x17aa: 0x0c18, 0x17ab: 0x0c18, 0x17ac: 0x0c18, 0x17ad: 0x0a18, 0x17ae: 0x0a18, 0x17af: 0x0818,
-	0x17b0: 0x0040, 0x17b1: 0x0040, 0x17b2: 0x0040, 0x17b3: 0x0040, 0x17b4: 0x0040, 0x17b5: 0x0040,
+	0x1780: 0x3308, 0x1781: 0x3008, 0x1782: 0x3008, 0x1783: 0x3008, 0x1784: 0x3008, 0x1785: 0x0040,
+	0x1786: 0x0040, 0x1787: 0x3008, 0x1788: 0x3008, 0x1789: 0x0040, 0x178a: 0x0040, 0x178b: 0x3008,
+	0x178c: 0x3008, 0x178d: 0x3808, 0x178e: 0x0040, 0x178f: 0x0040, 0x1790: 0x0008, 0x1791: 0x0040,
+	0x1792: 0x0040, 0x1793: 0x0040, 0x1794: 0x0040, 0x1795: 0x0040, 0x1796: 0x0040, 0x1797: 0x3008,
+	0x1798: 0x0040, 0x1799: 0x0040, 0x179a: 0x0040, 0x179b: 0x0040, 0x179c: 0x0040, 0x179d: 0x0008,
+	0x179e: 0x0008, 0x179f: 0x0008, 0x17a0: 0x0008, 0x17a1: 0x0008, 0x17a2: 0x3008, 0x17a3: 0x3008,
+	0x17a4: 0x0040, 0x17a5: 0x0040, 0x17a6: 0x3308, 0x17a7: 0x3308, 0x17a8: 0x3308, 0x17a9: 0x3308,
+	0x17aa: 0x3308, 0x17ab: 0x3308, 0x17ac: 0x3308, 0x17ad: 0x0040, 0x17ae: 0x0040, 0x17af: 0x0040,
+	0x17b0: 0x3308, 0x17b1: 0x3308, 0x17b2: 0x3308, 0x17b3: 0x3308, 0x17b4: 0x3308, 0x17b5: 0x0040,
 	0x17b6: 0x0040, 0x17b7: 0x0040, 0x17b8: 0x0040, 0x17b9: 0x0040, 0x17ba: 0x0040, 0x17bb: 0x0040,
 	0x17bc: 0x0040, 0x17bd: 0x0040, 0x17be: 0x0040, 0x17bf: 0x0040,
 	// Block 0x5f, offset 0x17c0
-	0x17c0: 0x3308, 0x17c1: 0x3308, 0x17c2: 0x3008, 0x17c3: 0x3008, 0x17c4: 0x0040, 0x17c5: 0x0008,
-	0x17c6: 0x0008, 0x17c7: 0x0008, 0x17c8: 0x0008, 0x17c9: 0x0008, 0x17ca: 0x0008, 0x17cb: 0x0008,
-	0x17cc: 0x0008, 0x17cd: 0x0040, 0x17ce: 0x0040, 0x17cf: 0x0008, 0x17d0: 0x0008, 0x17d1: 0x0040,
-	0x17d2: 0x0040, 0x17d3: 0x0008, 0x17d4: 0x0008, 0x17d5: 0x0008, 0x17d6: 0x0008, 0x17d7: 0x0008,
+	0x17c0: 0x0008, 0x17c1: 0x0008, 0x17c2: 0x0008, 0x17c3: 0x0008, 0x17c4: 0x0008, 0x17c5: 0x0008,
+	0x17c6: 0x0008, 0x17c7: 0x0040, 0x17c8: 0x0040, 0x17c9: 0x0008, 0x17ca: 0x0040, 0x17cb: 0x0040,
+	0x17cc: 0x0008, 0x17cd: 0x0008, 0x17ce: 0x0008, 0x17cf: 0x0008, 0x17d0: 0x0008, 0x17d1: 0x0008,
+	0x17d2: 0x0008, 0x17d3: 0x0008, 0x17d4: 0x0040, 0x17d5: 0x0008, 0x17d6: 0x0008, 0x17d7: 0x0040,
 	0x17d8: 0x0008, 0x17d9: 0x0008, 0x17da: 0x0008, 0x17db: 0x0008, 0x17dc: 0x0008, 0x17dd: 0x0008,
 	0x17de: 0x0008, 0x17df: 0x0008, 0x17e0: 0x0008, 0x17e1: 0x0008, 0x17e2: 0x0008, 0x17e3: 0x0008,
-	0x17e4: 0x0008, 0x17e5: 0x0008, 0x17e6: 0x0008, 0x17e7: 0x0008, 0x17e8: 0x0008, 0x17e9: 0x0040,
+	0x17e4: 0x0008, 0x17e5: 0x0008, 0x17e6: 0x0008, 0x17e7: 0x0008, 0x17e8: 0x0008, 0x17e9: 0x0008,
 	0x17ea: 0x0008, 0x17eb: 0x0008, 0x17ec: 0x0008, 0x17ed: 0x0008, 0x17ee: 0x0008, 0x17ef: 0x0008,
-	0x17f0: 0x0008, 0x17f1: 0x0040, 0x17f2: 0x0008, 0x17f3: 0x0008, 0x17f4: 0x0040, 0x17f5: 0x0008,
-	0x17f6: 0x0008, 0x17f7: 0x0008, 0x17f8: 0x0008, 0x17f9: 0x0008, 0x17fa: 0x0040, 0x17fb: 0x3308,
-	0x17fc: 0x3308, 0x17fd: 0x0008, 0x17fe: 0x3008, 0x17ff: 0x3008,
+	0x17f0: 0x3008, 0x17f1: 0x3008, 0x17f2: 0x3008, 0x17f3: 0x3008, 0x17f4: 0x3008, 0x17f5: 0x3008,
+	0x17f6: 0x0040, 0x17f7: 0x3008, 0x17f8: 0x3008, 0x17f9: 0x0040, 0x17fa: 0x0040, 0x17fb: 0x3308,
+	0x17fc: 0x3308, 0x17fd: 0x3808, 0x17fe: 0x3b08, 0x17ff: 0x0008,
 	// Block 0x60, offset 0x1800
-	0x1800: 0x3308, 0x1801: 0x3008, 0x1802: 0x3008, 0x1803: 0x3008, 0x1804: 0x3008, 0x1805: 0x0040,
-	0x1806: 0x0040, 0x1807: 0x3008, 0x1808: 0x3008, 0x1809: 0x0040, 0x180a: 0x0040, 0x180b: 0x3008,
-	0x180c: 0x3008, 0x180d: 0x3808, 0x180e: 0x0040, 0x180f: 0x0040, 0x1810: 0x0008, 0x1811: 0x0040,
-	0x1812: 0x0040, 0x1813: 0x0040, 0x1814: 0x0040, 0x1815: 0x0040, 0x1816: 0x0040, 0x1817: 0x3008,
-	0x1818: 0x0040, 0x1819: 0x0040, 0x181a: 0x0040, 0x181b: 0x0040, 0x181c: 0x0040, 0x181d: 0x0008,
-	0x181e: 0x0008, 0x181f: 0x0008, 0x1820: 0x0008, 0x1821: 0x0008, 0x1822: 0x3008, 0x1823: 0x3008,
-	0x1824: 0x0040, 0x1825: 0x0040, 0x1826: 0x3308, 0x1827: 0x3308, 0x1828: 0x3308, 0x1829: 0x3308,
-	0x182a: 0x3308, 0x182b: 0x3308, 0x182c: 0x3308, 0x182d: 0x0040, 0x182e: 0x0040, 0x182f: 0x0040,
-	0x1830: 0x3308, 0x1831: 0x3308, 0x1832: 0x3308, 0x1833: 0x3308, 0x1834: 0x3308, 0x1835: 0x0040,
-	0x1836: 0x0040, 0x1837: 0x0040, 0x1838: 0x0040, 0x1839: 0x0040, 0x183a: 0x0040, 0x183b: 0x0040,
-	0x183c: 0x0040, 0x183d: 0x0040, 0x183e: 0x0040, 0x183f: 0x0040,
+	0x1800: 0x0019, 0x1801: 0x02e9, 0x1802: 0x03d9, 0x1803: 0x02f1, 0x1804: 0x02f9, 0x1805: 0x03f1,
+	0x1806: 0x0309, 0x1807: 0x00a9, 0x1808: 0x0311, 0x1809: 0x00b1, 0x180a: 0x0319, 0x180b: 0x0101,
+	0x180c: 0x0321, 0x180d: 0x0329, 0x180e: 0x0051, 0x180f: 0x0339, 0x1810: 0x0751, 0x1811: 0x00b9,
+	0x1812: 0x0089, 0x1813: 0x0341, 0x1814: 0x0349, 0x1815: 0x0391, 0x1816: 0x00c1, 0x1817: 0x0109,
+	0x1818: 0x00c9, 0x1819: 0x04b1, 0x181a: 0x0019, 0x181b: 0x02e9, 0x181c: 0x03d9, 0x181d: 0x02f1,
+	0x181e: 0x02f9, 0x181f: 0x03f1, 0x1820: 0x0309, 0x1821: 0x00a9, 0x1822: 0x0311, 0x1823: 0x00b1,
+	0x1824: 0x0319, 0x1825: 0x0101, 0x1826: 0x0321, 0x1827: 0x0329, 0x1828: 0x0051, 0x1829: 0x0339,
+	0x182a: 0x0751, 0x182b: 0x00b9, 0x182c: 0x0089, 0x182d: 0x0341, 0x182e: 0x0349, 0x182f: 0x0391,
+	0x1830: 0x00c1, 0x1831: 0x0109, 0x1832: 0x00c9, 0x1833: 0x04b1, 0x1834: 0x0019, 0x1835: 0x02e9,
+	0x1836: 0x03d9, 0x1837: 0x02f1, 0x1838: 0x02f9, 0x1839: 0x03f1, 0x183a: 0x0309, 0x183b: 0x00a9,
+	0x183c: 0x0311, 0x183d: 0x00b1, 0x183e: 0x0319, 0x183f: 0x0101,
 	// Block 0x61, offset 0x1840
-	0x1840: 0x0008, 0x1841: 0x0008, 0x1842: 0x0008, 0x1843: 0x0008, 0x1844: 0x0008, 0x1845: 0x0008,
-	0x1846: 0x0008, 0x1847: 0x0040, 0x1848: 0x0040, 0x1849: 0x0008, 0x184a: 0x0040, 0x184b: 0x0040,
-	0x184c: 0x0008, 0x184d: 0x0008, 0x184e: 0x0008, 0x184f: 0x0008, 0x1850: 0x0008, 0x1851: 0x0008,
-	0x1852: 0x0008, 0x1853: 0x0008, 0x1854: 0x0040, 0x1855: 0x0008, 0x1856: 0x0008, 0x1857: 0x0040,
-	0x1858: 0x0008, 0x1859: 0x0008, 0x185a: 0x0008, 0x185b: 0x0008, 0x185c: 0x0008, 0x185d: 0x0008,
-	0x185e: 0x0008, 0x185f: 0x0008, 0x1860: 0x0008, 0x1861: 0x0008, 0x1862: 0x0008, 0x1863: 0x0008,
-	0x1864: 0x0008, 0x1865: 0x0008, 0x1866: 0x0008, 0x1867: 0x0008, 0x1868: 0x0008, 0x1869: 0x0008,
-	0x186a: 0x0008, 0x186b: 0x0008, 0x186c: 0x0008, 0x186d: 0x0008, 0x186e: 0x0008, 0x186f: 0x0008,
-	0x1870: 0x3008, 0x1871: 0x3008, 0x1872: 0x3008, 0x1873: 0x3008, 0x1874: 0x3008, 0x1875: 0x3008,
-	0x1876: 0x0040, 0x1877: 0x3008, 0x1878: 0x3008, 0x1879: 0x0040, 0x187a: 0x0040, 0x187b: 0x3308,
-	0x187c: 0x3308, 0x187d: 0x3808, 0x187e: 0x3b08, 0x187f: 0x0008,
+	0x1840: 0x0321, 0x1841: 0x0329, 0x1842: 0x0051, 0x1843: 0x0339, 0x1844: 0x0751, 0x1845: 0x00b9,
+	0x1846: 0x0089, 0x1847: 0x0341, 0x1848: 0x0349, 0x1849: 0x0391, 0x184a: 0x00c1, 0x184b: 0x0109,
+	0x184c: 0x00c9, 0x184d: 0x04b1, 0x184e: 0x0019, 0x184f: 0x02e9, 0x1850: 0x03d9, 0x1851: 0x02f1,
+	0x1852: 0x02f9, 0x1853: 0x03f1, 0x1854: 0x0309, 0x1855: 0x0040, 0x1856: 0x0311, 0x1857: 0x00b1,
+	0x1858: 0x0319, 0x1859: 0x0101, 0x185a: 0x0321, 0x185b: 0x0329, 0x185c: 0x0051, 0x185d: 0x0339,
+	0x185e: 0x0751, 0x185f: 0x00b9, 0x1860: 0x0089, 0x1861: 0x0341, 0x1862: 0x0349, 0x1863: 0x0391,
+	0x1864: 0x00c1, 0x1865: 0x0109, 0x1866: 0x00c9, 0x1867: 0x04b1, 0x1868: 0x0019, 0x1869: 0x02e9,
+	0x186a: 0x03d9, 0x186b: 0x02f1, 0x186c: 0x02f9, 0x186d: 0x03f1, 0x186e: 0x0309, 0x186f: 0x00a9,
+	0x1870: 0x0311, 0x1871: 0x00b1, 0x1872: 0x0319, 0x1873: 0x0101, 0x1874: 0x0321, 0x1875: 0x0329,
+	0x1876: 0x0051, 0x1877: 0x0339, 0x1878: 0x0751, 0x1879: 0x00b9, 0x187a: 0x0089, 0x187b: 0x0341,
+	0x187c: 0x0349, 0x187d: 0x0391, 0x187e: 0x00c1, 0x187f: 0x0109,
 	// Block 0x62, offset 0x1880
-	0x1880: 0x0039, 0x1881: 0x0ee9, 0x1882: 0x1159, 0x1883: 0x0ef9, 0x1884: 0x0f09, 0x1885: 0x1199,
-	0x1886: 0x0f31, 0x1887: 0x0249, 0x1888: 0x0f41, 0x1889: 0x0259, 0x188a: 0x0f51, 0x188b: 0x0359,
-	0x188c: 0x0f61, 0x188d: 0x0f71, 0x188e: 0x00d9, 0x188f: 0x0f99, 0x1890: 0x2039, 0x1891: 0x0269,
-	0x1892: 0x01d9, 0x1893: 0x0fa9, 0x1894: 0x0fb9, 0x1895: 0x1089, 0x1896: 0x0279, 0x1897: 0x0369,
-	0x1898: 0x0289, 0x1899: 0x13d1, 0x189a: 0x0039, 0x189b: 0x0ee9, 0x189c: 0x1159, 0x189d: 0x0ef9,
-	0x189e: 0x0f09, 0x189f: 0x1199, 0x18a0: 0x0f31, 0x18a1: 0x0249, 0x18a2: 0x0f41, 0x18a3: 0x0259,
-	0x18a4: 0x0f51, 0x18a5: 0x0359, 0x18a6: 0x0f61, 0x18a7: 0x0f71, 0x18a8: 0x00d9, 0x18a9: 0x0f99,
-	0x18aa: 0x2039, 0x18ab: 0x0269, 0x18ac: 0x01d9, 0x18ad: 0x0fa9, 0x18ae: 0x0fb9, 0x18af: 0x1089,
-	0x18b0: 0x0279, 0x18b1: 0x0369, 0x18b2: 0x0289, 0x18b3: 0x13d1, 0x18b4: 0x0039, 0x18b5: 0x0ee9,
-	0x18b6: 0x1159, 0x18b7: 0x0ef9, 0x18b8: 0x0f09, 0x18b9: 0x1199, 0x18ba: 0x0f31, 0x18bb: 0x0249,
-	0x18bc: 0x0f41, 0x18bd: 0x0259, 0x18be: 0x0f51, 0x18bf: 0x0359,
+	0x1880: 0x00c9, 0x1881: 0x04b1, 0x1882: 0x0019, 0x1883: 0x02e9, 0x1884: 0x03d9, 0x1885: 0x02f1,
+	0x1886: 0x02f9, 0x1887: 0x03f1, 0x1888: 0x0309, 0x1889: 0x00a9, 0x188a: 0x0311, 0x188b: 0x00b1,
+	0x188c: 0x0319, 0x188d: 0x0101, 0x188e: 0x0321, 0x188f: 0x0329, 0x1890: 0x0051, 0x1891: 0x0339,
+	0x1892: 0x0751, 0x1893: 0x00b9, 0x1894: 0x0089, 0x1895: 0x0341, 0x1896: 0x0349, 0x1897: 0x0391,
+	0x1898: 0x00c1, 0x1899: 0x0109, 0x189a: 0x00c9, 0x189b: 0x04b1, 0x189c: 0x0019, 0x189d: 0x0040,
+	0x189e: 0x03d9, 0x189f: 0x02f1, 0x18a0: 0x0040, 0x18a1: 0x0040, 0x18a2: 0x0309, 0x18a3: 0x0040,
+	0x18a4: 0x0040, 0x18a5: 0x00b1, 0x18a6: 0x0319, 0x18a7: 0x0040, 0x18a8: 0x0040, 0x18a9: 0x0329,
+	0x18aa: 0x0051, 0x18ab: 0x0339, 0x18ac: 0x0751, 0x18ad: 0x0040, 0x18ae: 0x0089, 0x18af: 0x0341,
+	0x18b0: 0x0349, 0x18b1: 0x0391, 0x18b2: 0x00c1, 0x18b3: 0x0109, 0x18b4: 0x00c9, 0x18b5: 0x04b1,
+	0x18b6: 0x0019, 0x18b7: 0x02e9, 0x18b8: 0x03d9, 0x18b9: 0x02f1, 0x18ba: 0x0040, 0x18bb: 0x03f1,
+	0x18bc: 0x0040, 0x18bd: 0x00a9, 0x18be: 0x0311, 0x18bf: 0x00b1,
 	// Block 0x63, offset 0x18c0
-	0x18c0: 0x0f61, 0x18c1: 0x0f71, 0x18c2: 0x00d9, 0x18c3: 0x0f99, 0x18c4: 0x2039, 0x18c5: 0x0269,
-	0x18c6: 0x01d9, 0x18c7: 0x0fa9, 0x18c8: 0x0fb9, 0x18c9: 0x1089, 0x18ca: 0x0279, 0x18cb: 0x0369,
-	0x18cc: 0x0289, 0x18cd: 0x13d1, 0x18ce: 0x0039, 0x18cf: 0x0ee9, 0x18d0: 0x1159, 0x18d1: 0x0ef9,
-	0x18d2: 0x0f09, 0x18d3: 0x1199, 0x18d4: 0x0f31, 0x18d5: 0x0040, 0x18d6: 0x0f41, 0x18d7: 0x0259,
-	0x18d8: 0x0f51, 0x18d9: 0x0359, 0x18da: 0x0f61, 0x18db: 0x0f71, 0x18dc: 0x00d9, 0x18dd: 0x0f99,
-	0x18de: 0x2039, 0x18df: 0x0269, 0x18e0: 0x01d9, 0x18e1: 0x0fa9, 0x18e2: 0x0fb9, 0x18e3: 0x1089,
-	0x18e4: 0x0279, 0x18e5: 0x0369, 0x18e6: 0x0289, 0x18e7: 0x13d1, 0x18e8: 0x0039, 0x18e9: 0x0ee9,
-	0x18ea: 0x1159, 0x18eb: 0x0ef9, 0x18ec: 0x0f09, 0x18ed: 0x1199, 0x18ee: 0x0f31, 0x18ef: 0x0249,
-	0x18f0: 0x0f41, 0x18f1: 0x0259, 0x18f2: 0x0f51, 0x18f3: 0x0359, 0x18f4: 0x0f61, 0x18f5: 0x0f71,
-	0x18f6: 0x00d9, 0x18f7: 0x0f99, 0x18f8: 0x2039, 0x18f9: 0x0269, 0x18fa: 0x01d9, 0x18fb: 0x0fa9,
-	0x18fc: 0x0fb9, 0x18fd: 0x1089, 0x18fe: 0x0279, 0x18ff: 0x0369,
+	0x18c0: 0x0319, 0x18c1: 0x0101, 0x18c2: 0x0321, 0x18c3: 0x0329, 0x18c4: 0x0040, 0x18c5: 0x0339,
+	0x18c6: 0x0751, 0x18c7: 0x00b9, 0x18c8: 0x0089, 0x18c9: 0x0341, 0x18ca: 0x0349, 0x18cb: 0x0391,
+	0x18cc: 0x00c1, 0x18cd: 0x0109, 0x18ce: 0x00c9, 0x18cf: 0x04b1, 0x18d0: 0x0019, 0x18d1: 0x02e9,
+	0x18d2: 0x03d9, 0x18d3: 0x02f1, 0x18d4: 0x02f9, 0x18d5: 0x03f1, 0x18d6: 0x0309, 0x18d7: 0x00a9,
+	0x18d8: 0x0311, 0x18d9: 0x00b1, 0x18da: 0x0319, 0x18db: 0x0101, 0x18dc: 0x0321, 0x18dd: 0x0329,
+	0x18de: 0x0051, 0x18df: 0x0339, 0x18e0: 0x0751, 0x18e1: 0x00b9, 0x18e2: 0x0089, 0x18e3: 0x0341,
+	0x18e4: 0x0349, 0x18e5: 0x0391, 0x18e6: 0x00c1, 0x18e7: 0x0109, 0x18e8: 0x00c9, 0x18e9: 0x04b1,
+	0x18ea: 0x0019, 0x18eb: 0x02e9, 0x18ec: 0x03d9, 0x18ed: 0x02f1, 0x18ee: 0x02f9, 0x18ef: 0x03f1,
+	0x18f0: 0x0309, 0x18f1: 0x00a9, 0x18f2: 0x0311, 0x18f3: 0x00b1, 0x18f4: 0x0319, 0x18f5: 0x0101,
+	0x18f6: 0x0321, 0x18f7: 0x0329, 0x18f8: 0x0051, 0x18f9: 0x0339, 0x18fa: 0x0751, 0x18fb: 0x00b9,
+	0x18fc: 0x0089, 0x18fd: 0x0341, 0x18fe: 0x0349, 0x18ff: 0x0391,
 	// Block 0x64, offset 0x1900
-	0x1900: 0x0289, 0x1901: 0x13d1, 0x1902: 0x0039, 0x1903: 0x0ee9, 0x1904: 0x1159, 0x1905: 0x0ef9,
-	0x1906: 0x0f09, 0x1907: 0x1199, 0x1908: 0x0f31, 0x1909: 0x0249, 0x190a: 0x0f41, 0x190b: 0x0259,
-	0x190c: 0x0f51, 0x190d: 0x0359, 0x190e: 0x0f61, 0x190f: 0x0f71, 0x1910: 0x00d9, 0x1911: 0x0f99,
-	0x1912: 0x2039, 0x1913: 0x0269, 0x1914: 0x01d9, 0x1915: 0x0fa9, 0x1916: 0x0fb9, 0x1917: 0x1089,
-	0x1918: 0x0279, 0x1919: 0x0369, 0x191a: 0x0289, 0x191b: 0x13d1, 0x191c: 0x0039, 0x191d: 0x0040,
-	0x191e: 0x1159, 0x191f: 0x0ef9, 0x1920: 0x0040, 0x1921: 0x0040, 0x1922: 0x0f31, 0x1923: 0x0040,
-	0x1924: 0x0040, 0x1925: 0x0259, 0x1926: 0x0f51, 0x1927: 0x0040, 0x1928: 0x0040, 0x1929: 0x0f71,
-	0x192a: 0x00d9, 0x192b: 0x0f99, 0x192c: 0x2039, 0x192d: 0x0040, 0x192e: 0x01d9, 0x192f: 0x0fa9,
-	0x1930: 0x0fb9, 0x1931: 0x1089, 0x1932: 0x0279, 0x1933: 0x0369, 0x1934: 0x0289, 0x1935: 0x13d1,
-	0x1936: 0x0039, 0x1937: 0x0ee9, 0x1938: 0x1159, 0x1939: 0x0ef9, 0x193a: 0x0040, 0x193b: 0x1199,
-	0x193c: 0x0040, 0x193d: 0x0249, 0x193e: 0x0f41, 0x193f: 0x0259,
+	0x1900: 0x00c1, 0x1901: 0x0109, 0x1902: 0x00c9, 0x1903: 0x04b1, 0x1904: 0x0019, 0x1905: 0x02e9,
+	0x1906: 0x0040, 0x1907: 0x02f1, 0x1908: 0x02f9, 0x1909: 0x03f1, 0x190a: 0x0309, 0x190b: 0x0040,
+	0x190c: 0x0040, 0x190d: 0x00b1, 0x190e: 0x0319, 0x190f: 0x0101, 0x1910: 0x0321, 0x1911: 0x0329,
+	0x1912: 0x0051, 0x1913: 0x0339, 0x1914: 0x0751, 0x1915: 0x0040, 0x1916: 0x0089, 0x1917: 0x0341,
+	0x1918: 0x0349, 0x1919: 0x0391, 0x191a: 0x00c1, 0x191b: 0x0109, 0x191c: 0x00c9, 0x191d: 0x0040,
+	0x191e: 0x0019, 0x191f: 0x02e9, 0x1920: 0x03d9, 0x1921: 0x02f1, 0x1922: 0x02f9, 0x1923: 0x03f1,
+	0x1924: 0x0309, 0x1925: 0x00a9, 0x1926: 0x0311, 0x1927: 0x00b1, 0x1928: 0x0319, 0x1929: 0x0101,
+	0x192a: 0x0321, 0x192b: 0x0329, 0x192c: 0x0051, 0x192d: 0x0339, 0x192e: 0x0751, 0x192f: 0x00b9,
+	0x1930: 0x0089, 0x1931: 0x0341, 0x1932: 0x0349, 0x1933: 0x0391, 0x1934: 0x00c1, 0x1935: 0x0109,
+	0x1936: 0x00c9, 0x1937: 0x04b1, 0x1938: 0x0019, 0x1939: 0x02e9, 0x193a: 0x0040, 0x193b: 0x02f1,
+	0x193c: 0x02f9, 0x193d: 0x03f1, 0x193e: 0x0309, 0x193f: 0x0040,
 	// Block 0x65, offset 0x1940
-	0x1940: 0x0f51, 0x1941: 0x0359, 0x1942: 0x0f61, 0x1943: 0x0f71, 0x1944: 0x0040, 0x1945: 0x0f99,
-	0x1946: 0x2039, 0x1947: 0x0269, 0x1948: 0x01d9, 0x1949: 0x0fa9, 0x194a: 0x0fb9, 0x194b: 0x1089,
-	0x194c: 0x0279, 0x194d: 0x0369, 0x194e: 0x0289, 0x194f: 0x13d1, 0x1950: 0x0039, 0x1951: 0x0ee9,
-	0x1952: 0x1159, 0x1953: 0x0ef9, 0x1954: 0x0f09, 0x1955: 0x1199, 0x1956: 0x0f31, 0x1957: 0x0249,
-	0x1958: 0x0f41, 0x1959: 0x0259, 0x195a: 0x0f51, 0x195b: 0x0359, 0x195c: 0x0f61, 0x195d: 0x0f71,
-	0x195e: 0x00d9, 0x195f: 0x0f99, 0x1960: 0x2039, 0x1961: 0x0269, 0x1962: 0x01d9, 0x1963: 0x0fa9,
-	0x1964: 0x0fb9, 0x1965: 0x1089, 0x1966: 0x0279, 0x1967: 0x0369, 0x1968: 0x0289, 0x1969: 0x13d1,
-	0x196a: 0x0039, 0x196b: 0x0ee9, 0x196c: 0x1159, 0x196d: 0x0ef9, 0x196e: 0x0f09, 0x196f: 0x1199,
-	0x1970: 0x0f31, 0x1971: 0x0249, 0x1972: 0x0f41, 0x1973: 0x0259, 0x1974: 0x0f51, 0x1975: 0x0359,
-	0x1976: 0x0f61, 0x1977: 0x0f71, 0x1978: 0x00d9, 0x1979: 0x0f99, 0x197a: 0x2039, 0x197b: 0x0269,
-	0x197c: 0x01d9, 0x197d: 0x0fa9, 0x197e: 0x0fb9, 0x197f: 0x1089,
+	0x1940: 0x0311, 0x1941: 0x00b1, 0x1942: 0x0319, 0x1943: 0x0101, 0x1944: 0x0321, 0x1945: 0x0040,
+	0x1946: 0x0051, 0x1947: 0x0040, 0x1948: 0x0040, 0x1949: 0x0040, 0x194a: 0x0089, 0x194b: 0x0341,
+	0x194c: 0x0349, 0x194d: 0x0391, 0x194e: 0x00c1, 0x194f: 0x0109, 0x1950: 0x00c9, 0x1951: 0x0040,
+	0x1952: 0x0019, 0x1953: 0x02e9, 0x1954: 0x03d9, 0x1955: 0x02f1, 0x1956: 0x02f9, 0x1957: 0x03f1,
+	0x1958: 0x0309, 0x1959: 0x00a9, 0x195a: 0x0311, 0x195b: 0x00b1, 0x195c: 0x0319, 0x195d: 0x0101,
+	0x195e: 0x0321, 0x195f: 0x0329, 0x1960: 0x0051, 0x1961: 0x0339, 0x1962: 0x0751, 0x1963: 0x00b9,
+	0x1964: 0x0089, 0x1965: 0x0341, 0x1966: 0x0349, 0x1967: 0x0391, 0x1968: 0x00c1, 0x1969: 0x0109,
+	0x196a: 0x00c9, 0x196b: 0x04b1, 0x196c: 0x0019, 0x196d: 0x02e9, 0x196e: 0x03d9, 0x196f: 0x02f1,
+	0x1970: 0x02f9, 0x1971: 0x03f1, 0x1972: 0x0309, 0x1973: 0x00a9, 0x1974: 0x0311, 0x1975: 0x00b1,
+	0x1976: 0x0319, 0x1977: 0x0101, 0x1978: 0x0321, 0x1979: 0x0329, 0x197a: 0x0051, 0x197b: 0x0339,
+	0x197c: 0x0751, 0x197d: 0x00b9, 0x197e: 0x0089, 0x197f: 0x0341,
 	// Block 0x66, offset 0x1980
-	0x1980: 0x0279, 0x1981: 0x0369, 0x1982: 0x0289, 0x1983: 0x13d1, 0x1984: 0x0039, 0x1985: 0x0ee9,
-	0x1986: 0x0040, 0x1987: 0x0ef9, 0x1988: 0x0f09, 0x1989: 0x1199, 0x198a: 0x0f31, 0x198b: 0x0040,
-	0x198c: 0x0040, 0x198d: 0x0259, 0x198e: 0x0f51, 0x198f: 0x0359, 0x1990: 0x0f61, 0x1991: 0x0f71,
-	0x1992: 0x00d9, 0x1993: 0x0f99, 0x1994: 0x2039, 0x1995: 0x0040, 0x1996: 0x01d9, 0x1997: 0x0fa9,
-	0x1998: 0x0fb9, 0x1999: 0x1089, 0x199a: 0x0279, 0x199b: 0x0369, 0x199c: 0x0289, 0x199d: 0x0040,
-	0x199e: 0x0039, 0x199f: 0x0ee9, 0x19a0: 0x1159, 0x19a1: 0x0ef9, 0x19a2: 0x0f09, 0x19a3: 0x1199,
-	0x19a4: 0x0f31, 0x19a5: 0x0249, 0x19a6: 0x0f41, 0x19a7: 0x0259, 0x19a8: 0x0f51, 0x19a9: 0x0359,
-	0x19aa: 0x0f61, 0x19ab: 0x0f71, 0x19ac: 0x00d9, 0x19ad: 0x0f99, 0x19ae: 0x2039, 0x19af: 0x0269,
-	0x19b0: 0x01d9, 0x19b1: 0x0fa9, 0x19b2: 0x0fb9, 0x19b3: 0x1089, 0x19b4: 0x0279, 0x19b5: 0x0369,
-	0x19b6: 0x0289, 0x19b7: 0x13d1, 0x19b8: 0x0039, 0x19b9: 0x0ee9, 0x19ba: 0x0040, 0x19bb: 0x0ef9,
-	0x19bc: 0x0f09, 0x19bd: 0x1199, 0x19be: 0x0f31, 0x19bf: 0x0040,
+	0x1980: 0x0349, 0x1981: 0x0391, 0x1982: 0x00c1, 0x1983: 0x0109, 0x1984: 0x00c9, 0x1985: 0x04b1,
+	0x1986: 0x0019, 0x1987: 0x02e9, 0x1988: 0x03d9, 0x1989: 0x02f1, 0x198a: 0x02f9, 0x198b: 0x03f1,
+	0x198c: 0x0309, 0x198d: 0x00a9, 0x198e: 0x0311, 0x198f: 0x00b1, 0x1990: 0x0319, 0x1991: 0x0101,
+	0x1992: 0x0321, 0x1993: 0x0329, 0x1994: 0x0051, 0x1995: 0x0339, 0x1996: 0x0751, 0x1997: 0x00b9,
+	0x1998: 0x0089, 0x1999: 0x0341, 0x199a: 0x0349, 0x199b: 0x0391, 0x199c: 0x00c1, 0x199d: 0x0109,
+	0x199e: 0x00c9, 0x199f: 0x04b1, 0x19a0: 0x0019, 0x19a1: 0x02e9, 0x19a2: 0x03d9, 0x19a3: 0x02f1,
+	0x19a4: 0x02f9, 0x19a5: 0x03f1, 0x19a6: 0x0309, 0x19a7: 0x00a9, 0x19a8: 0x0311, 0x19a9: 0x00b1,
+	0x19aa: 0x0319, 0x19ab: 0x0101, 0x19ac: 0x0321, 0x19ad: 0x0329, 0x19ae: 0x0051, 0x19af: 0x0339,
+	0x19b0: 0x0751, 0x19b1: 0x00b9, 0x19b2: 0x0089, 0x19b3: 0x0341, 0x19b4: 0x0349, 0x19b5: 0x0391,
+	0x19b6: 0x00c1, 0x19b7: 0x0109, 0x19b8: 0x00c9, 0x19b9: 0x04b1, 0x19ba: 0x0019, 0x19bb: 0x02e9,
+	0x19bc: 0x03d9, 0x19bd: 0x02f1, 0x19be: 0x02f9, 0x19bf: 0x03f1,
 	// Block 0x67, offset 0x19c0
-	0x19c0: 0x0f41, 0x19c1: 0x0259, 0x19c2: 0x0f51, 0x19c3: 0x0359, 0x19c4: 0x0f61, 0x19c5: 0x0040,
-	0x19c6: 0x00d9, 0x19c7: 0x0040, 0x19c8: 0x0040, 0x19c9: 0x0040, 0x19ca: 0x01d9, 0x19cb: 0x0fa9,
-	0x19cc: 0x0fb9, 0x19cd: 0x1089, 0x19ce: 0x0279, 0x19cf: 0x0369, 0x19d0: 0x0289, 0x19d1: 0x0040,
-	0x19d2: 0x0039, 0x19d3: 0x0ee9, 0x19d4: 0x1159, 0x19d5: 0x0ef9, 0x19d6: 0x0f09, 0x19d7: 0x1199,
-	0x19d8: 0x0f31, 0x19d9: 0x0249, 0x19da: 0x0f41, 0x19db: 0x0259, 0x19dc: 0x0f51, 0x19dd: 0x0359,
-	0x19de: 0x0f61, 0x19df: 0x0f71, 0x19e0: 0x00d9, 0x19e1: 0x0f99, 0x19e2: 0x2039, 0x19e3: 0x0269,
-	0x19e4: 0x01d9, 0x19e5: 0x0fa9, 0x19e6: 0x0fb9, 0x19e7: 0x1089, 0x19e8: 0x0279, 0x19e9: 0x0369,
-	0x19ea: 0x0289, 0x19eb: 0x13d1, 0x19ec: 0x0039, 0x19ed: 0x0ee9, 0x19ee: 0x1159, 0x19ef: 0x0ef9,
-	0x19f0: 0x0f09, 0x19f1: 0x1199, 0x19f2: 0x0f31, 0x19f3: 0x0249, 0x19f4: 0x0f41, 0x19f5: 0x0259,
-	0x19f6: 0x0f51, 0x19f7: 0x0359, 0x19f8: 0x0f61, 0x19f9: 0x0f71, 0x19fa: 0x00d9, 0x19fb: 0x0f99,
-	0x19fc: 0x2039, 0x19fd: 0x0269, 0x19fe: 0x01d9, 0x19ff: 0x0fa9,
+	0x19c0: 0x0309, 0x19c1: 0x00a9, 0x19c2: 0x0311, 0x19c3: 0x00b1, 0x19c4: 0x0319, 0x19c5: 0x0101,
+	0x19c6: 0x0321, 0x19c7: 0x0329, 0x19c8: 0x0051, 0x19c9: 0x0339, 0x19ca: 0x0751, 0x19cb: 0x00b9,
+	0x19cc: 0x0089, 0x19cd: 0x0341, 0x19ce: 0x0349, 0x19cf: 0x0391, 0x19d0: 0x00c1, 0x19d1: 0x0109,
+	0x19d2: 0x00c9, 0x19d3: 0x04b1, 0x19d4: 0x0019, 0x19d5: 0x02e9, 0x19d6: 0x03d9, 0x19d7: 0x02f1,
+	0x19d8: 0x02f9, 0x19d9: 0x03f1, 0x19da: 0x0309, 0x19db: 0x00a9, 0x19dc: 0x0311, 0x19dd: 0x00b1,
+	0x19de: 0x0319, 0x19df: 0x0101, 0x19e0: 0x0321, 0x19e1: 0x0329, 0x19e2: 0x0051, 0x19e3: 0x0339,
+	0x19e4: 0x0751, 0x19e5: 0x00b9, 0x19e6: 0x0089, 0x19e7: 0x0341, 0x19e8: 0x0349, 0x19e9: 0x0391,
+	0x19ea: 0x00c1, 0x19eb: 0x0109, 0x19ec: 0x00c9, 0x19ed: 0x04b1, 0x19ee: 0x0019, 0x19ef: 0x02e9,
+	0x19f0: 0x03d9, 0x19f1: 0x02f1, 0x19f2: 0x02f9, 0x19f3: 0x03f1, 0x19f4: 0x0309, 0x19f5: 0x00a9,
+	0x19f6: 0x0311, 0x19f7: 0x00b1, 0x19f8: 0x0319, 0x19f9: 0x0101, 0x19fa: 0x0321, 0x19fb: 0x0329,
+	0x19fc: 0x0051, 0x19fd: 0x0339, 0x19fe: 0x0751, 0x19ff: 0x00b9,
 	// Block 0x68, offset 0x1a00
-	0x1a00: 0x0fb9, 0x1a01: 0x1089, 0x1a02: 0x0279, 0x1a03: 0x0369, 0x1a04: 0x0289, 0x1a05: 0x13d1,
-	0x1a06: 0x0039, 0x1a07: 0x0ee9, 0x1a08: 0x1159, 0x1a09: 0x0ef9, 0x1a0a: 0x0f09, 0x1a0b: 0x1199,
-	0x1a0c: 0x0f31, 0x1a0d: 0x0249, 0x1a0e: 0x0f41, 0x1a0f: 0x0259, 0x1a10: 0x0f51, 0x1a11: 0x0359,
-	0x1a12: 0x0f61, 0x1a13: 0x0f71, 0x1a14: 0x00d9, 0x1a15: 0x0f99, 0x1a16: 0x2039, 0x1a17: 0x0269,
-	0x1a18: 0x01d9, 0x1a19: 0x0fa9, 0x1a1a: 0x0fb9, 0x1a1b: 0x1089, 0x1a1c: 0x0279, 0x1a1d: 0x0369,
-	0x1a1e: 0x0289, 0x1a1f: 0x13d1, 0x1a20: 0x0039, 0x1a21: 0x0ee9, 0x1a22: 0x1159, 0x1a23: 0x0ef9,
-	0x1a24: 0x0f09, 0x1a25: 0x1199, 0x1a26: 0x0f31, 0x1a27: 0x0249, 0x1a28: 0x0f41, 0x1a29: 0x0259,
-	0x1a2a: 0x0f51, 0x1a2b: 0x0359, 0x1a2c: 0x0f61, 0x1a2d: 0x0f71, 0x1a2e: 0x00d9, 0x1a2f: 0x0f99,
-	0x1a30: 0x2039, 0x1a31: 0x0269, 0x1a32: 0x01d9, 0x1a33: 0x0fa9, 0x1a34: 0x0fb9, 0x1a35: 0x1089,
-	0x1a36: 0x0279, 0x1a37: 0x0369, 0x1a38: 0x0289, 0x1a39: 0x13d1, 0x1a3a: 0x0039, 0x1a3b: 0x0ee9,
-	0x1a3c: 0x1159, 0x1a3d: 0x0ef9, 0x1a3e: 0x0f09, 0x1a3f: 0x1199,
+	0x1a00: 0x0089, 0x1a01: 0x0341, 0x1a02: 0x0349, 0x1a03: 0x0391, 0x1a04: 0x00c1, 0x1a05: 0x0109,
+	0x1a06: 0x00c9, 0x1a07: 0x04b1, 0x1a08: 0x0019, 0x1a09: 0x02e9, 0x1a0a: 0x03d9, 0x1a0b: 0x02f1,
+	0x1a0c: 0x02f9, 0x1a0d: 0x03f1, 0x1a0e: 0x0309, 0x1a0f: 0x00a9, 0x1a10: 0x0311, 0x1a11: 0x00b1,
+	0x1a12: 0x0319, 0x1a13: 0x0101, 0x1a14: 0x0321, 0x1a15: 0x0329, 0x1a16: 0x0051, 0x1a17: 0x0339,
+	0x1a18: 0x0751, 0x1a19: 0x00b9, 0x1a1a: 0x0089, 0x1a1b: 0x0341, 0x1a1c: 0x0349, 0x1a1d: 0x0391,
+	0x1a1e: 0x00c1, 0x1a1f: 0x0109, 0x1a20: 0x00c9, 0x1a21: 0x04b1, 0x1a22: 0x0019, 0x1a23: 0x02e9,
+	0x1a24: 0x03d9, 0x1a25: 0x02f1, 0x1a26: 0x02f9, 0x1a27: 0x03f1, 0x1a28: 0x0309, 0x1a29: 0x00a9,
+	0x1a2a: 0x0311, 0x1a2b: 0x00b1, 0x1a2c: 0x0319, 0x1a2d: 0x0101, 0x1a2e: 0x0321, 0x1a2f: 0x0329,
+	0x1a30: 0x0051, 0x1a31: 0x0339, 0x1a32: 0x0751, 0x1a33: 0x00b9, 0x1a34: 0x0089, 0x1a35: 0x0341,
+	0x1a36: 0x0349, 0x1a37: 0x0391, 0x1a38: 0x00c1, 0x1a39: 0x0109, 0x1a3a: 0x00c9, 0x1a3b: 0x04b1,
+	0x1a3c: 0x0019, 0x1a3d: 0x02e9, 0x1a3e: 0x03d9, 0x1a3f: 0x02f1,
 	// Block 0x69, offset 0x1a40
-	0x1a40: 0x0f31, 0x1a41: 0x0249, 0x1a42: 0x0f41, 0x1a43: 0x0259, 0x1a44: 0x0f51, 0x1a45: 0x0359,
-	0x1a46: 0x0f61, 0x1a47: 0x0f71, 0x1a48: 0x00d9, 0x1a49: 0x0f99, 0x1a4a: 0x2039, 0x1a4b: 0x0269,
-	0x1a4c: 0x01d9, 0x1a4d: 0x0fa9, 0x1a4e: 0x0fb9, 0x1a4f: 0x1089, 0x1a50: 0x0279, 0x1a51: 0x0369,
-	0x1a52: 0x0289, 0x1a53: 0x13d1, 0x1a54: 0x0039, 0x1a55: 0x0ee9, 0x1a56: 0x1159, 0x1a57: 0x0ef9,
-	0x1a58: 0x0f09, 0x1a59: 0x1199, 0x1a5a: 0x0f31, 0x1a5b: 0x0249, 0x1a5c: 0x0f41, 0x1a5d: 0x0259,
-	0x1a5e: 0x0f51, 0x1a5f: 0x0359, 0x1a60: 0x0f61, 0x1a61: 0x0f71, 0x1a62: 0x00d9, 0x1a63: 0x0f99,
-	0x1a64: 0x2039, 0x1a65: 0x0269, 0x1a66: 0x01d9, 0x1a67: 0x0fa9, 0x1a68: 0x0fb9, 0x1a69: 0x1089,
-	0x1a6a: 0x0279, 0x1a6b: 0x0369, 0x1a6c: 0x0289, 0x1a6d: 0x13d1, 0x1a6e: 0x0039, 0x1a6f: 0x0ee9,
-	0x1a70: 0x1159, 0x1a71: 0x0ef9, 0x1a72: 0x0f09, 0x1a73: 0x1199, 0x1a74: 0x0f31, 0x1a75: 0x0249,
-	0x1a76: 0x0f41, 0x1a77: 0x0259, 0x1a78: 0x0f51, 0x1a79: 0x0359, 0x1a7a: 0x0f61, 0x1a7b: 0x0f71,
-	0x1a7c: 0x00d9, 0x1a7d: 0x0f99, 0x1a7e: 0x2039, 0x1a7f: 0x0269,
+	0x1a40: 0x02f9, 0x1a41: 0x03f1, 0x1a42: 0x0309, 0x1a43: 0x00a9, 0x1a44: 0x0311, 0x1a45: 0x00b1,
+	0x1a46: 0x0319, 0x1a47: 0x0101, 0x1a48: 0x0321, 0x1a49: 0x0329, 0x1a4a: 0x0051, 0x1a4b: 0x0339,
+	0x1a4c: 0x0751, 0x1a4d: 0x00b9, 0x1a4e: 0x0089, 0x1a4f: 0x0341, 0x1a50: 0x0349, 0x1a51: 0x0391,
+	0x1a52: 0x00c1, 0x1a53: 0x0109, 0x1a54: 0x00c9, 0x1a55: 0x04b1, 0x1a56: 0x0019, 0x1a57: 0x02e9,
+	0x1a58: 0x03d9, 0x1a59: 0x02f1, 0x1a5a: 0x02f9, 0x1a5b: 0x03f1, 0x1a5c: 0x0309, 0x1a5d: 0x00a9,
+	0x1a5e: 0x0311, 0x1a5f: 0x00b1, 0x1a60: 0x0319, 0x1a61: 0x0101, 0x1a62: 0x0321, 0x1a63: 0x0329,
+	0x1a64: 0x0051, 0x1a65: 0x0339, 0x1a66: 0x0751, 0x1a67: 0x00b9, 0x1a68: 0x0089, 0x1a69: 0x0341,
+	0x1a6a: 0x0349, 0x1a6b: 0x0391, 0x1a6c: 0x00c1, 0x1a6d: 0x0109, 0x1a6e: 0x00c9, 0x1a6f: 0x04b1,
+	0x1a70: 0x0019, 0x1a71: 0x02e9, 0x1a72: 0x03d9, 0x1a73: 0x02f1, 0x1a74: 0x02f9, 0x1a75: 0x03f1,
+	0x1a76: 0x0309, 0x1a77: 0x00a9, 0x1a78: 0x0311, 0x1a79: 0x00b1, 0x1a7a: 0x0319, 0x1a7b: 0x0101,
+	0x1a7c: 0x0321, 0x1a7d: 0x0329, 0x1a7e: 0x0051, 0x1a7f: 0x0339,
 	// Block 0x6a, offset 0x1a80
-	0x1a80: 0x01d9, 0x1a81: 0x0fa9, 0x1a82: 0x0fb9, 0x1a83: 0x1089, 0x1a84: 0x0279, 0x1a85: 0x0369,
-	0x1a86: 0x0289, 0x1a87: 0x13d1, 0x1a88: 0x0039, 0x1a89: 0x0ee9, 0x1a8a: 0x1159, 0x1a8b: 0x0ef9,
-	0x1a8c: 0x0f09, 0x1a8d: 0x1199, 0x1a8e: 0x0f31, 0x1a8f: 0x0249, 0x1a90: 0x0f41, 0x1a91: 0x0259,
-	0x1a92: 0x0f51, 0x1a93: 0x0359, 0x1a94: 0x0f61, 0x1a95: 0x0f71, 0x1a96: 0x00d9, 0x1a97: 0x0f99,
-	0x1a98: 0x2039, 0x1a99: 0x0269, 0x1a9a: 0x01d9, 0x1a9b: 0x0fa9, 0x1a9c: 0x0fb9, 0x1a9d: 0x1089,
-	0x1a9e: 0x0279, 0x1a9f: 0x0369, 0x1aa0: 0x0289, 0x1aa1: 0x13d1, 0x1aa2: 0x0039, 0x1aa3: 0x0ee9,
-	0x1aa4: 0x1159, 0x1aa5: 0x0ef9, 0x1aa6: 0x0f09, 0x1aa7: 0x1199, 0x1aa8: 0x0f31, 0x1aa9: 0x0249,
-	0x1aaa: 0x0f41, 0x1aab: 0x0259, 0x1aac: 0x0f51, 0x1aad: 0x0359, 0x1aae: 0x0f61, 0x1aaf: 0x0f71,
-	0x1ab0: 0x00d9, 0x1ab1: 0x0f99, 0x1ab2: 0x2039, 0x1ab3: 0x0269, 0x1ab4: 0x01d9, 0x1ab5: 0x0fa9,
-	0x1ab6: 0x0fb9, 0x1ab7: 0x1089, 0x1ab8: 0x0279, 0x1ab9: 0x0369, 0x1aba: 0x0289, 0x1abb: 0x13d1,
-	0x1abc: 0x0039, 0x1abd: 0x0ee9, 0x1abe: 0x1159, 0x1abf: 0x0ef9,
+	0x1a80: 0x0751, 0x1a81: 0x00b9, 0x1a82: 0x0089, 0x1a83: 0x0341, 0x1a84: 0x0349, 0x1a85: 0x0391,
+	0x1a86: 0x00c1, 0x1a87: 0x0109, 0x1a88: 0x00c9, 0x1a89: 0x04b1, 0x1a8a: 0x0019, 0x1a8b: 0x02e9,
+	0x1a8c: 0x03d9, 0x1a8d: 0x02f1, 0x1a8e: 0x02f9, 0x1a8f: 0x03f1, 0x1a90: 0x0309, 0x1a91: 0x00a9,
+	0x1a92: 0x0311, 0x1a93: 0x00b1, 0x1a94: 0x0319, 0x1a95: 0x0101, 0x1a96: 0x0321, 0x1a97: 0x0329,
+	0x1a98: 0x0051, 0x1a99: 0x0339, 0x1a9a: 0x0751, 0x1a9b: 0x00b9, 0x1a9c: 0x0089, 0x1a9d: 0x0341,
+	0x1a9e: 0x0349, 0x1a9f: 0x0391, 0x1aa0: 0x00c1, 0x1aa1: 0x0109, 0x1aa2: 0x00c9, 0x1aa3: 0x04b1,
+	0x1aa4: 0x2279, 0x1aa5: 0x2281, 0x1aa6: 0x0040, 0x1aa7: 0x0040, 0x1aa8: 0x2289, 0x1aa9: 0x0399,
+	0x1aaa: 0x03a1, 0x1aab: 0x03a9, 0x1aac: 0x2291, 0x1aad: 0x2299, 0x1aae: 0x22a1, 0x1aaf: 0x04d1,
+	0x1ab0: 0x05f9, 0x1ab1: 0x22a9, 0x1ab2: 0x22b1, 0x1ab3: 0x22b9, 0x1ab4: 0x22c1, 0x1ab5: 0x22c9,
+	0x1ab6: 0x22d1, 0x1ab7: 0x0799, 0x1ab8: 0x03c1, 0x1ab9: 0x04d1, 0x1aba: 0x22d9, 0x1abb: 0x22e1,
+	0x1abc: 0x22e9, 0x1abd: 0x03b1, 0x1abe: 0x03b9, 0x1abf: 0x22f1,
 	// Block 0x6b, offset 0x1ac0
-	0x1ac0: 0x0f09, 0x1ac1: 0x1199, 0x1ac2: 0x0f31, 0x1ac3: 0x0249, 0x1ac4: 0x0f41, 0x1ac5: 0x0259,
-	0x1ac6: 0x0f51, 0x1ac7: 0x0359, 0x1ac8: 0x0f61, 0x1ac9: 0x0f71, 0x1aca: 0x00d9, 0x1acb: 0x0f99,
-	0x1acc: 0x2039, 0x1acd: 0x0269, 0x1ace: 0x01d9, 0x1acf: 0x0fa9, 0x1ad0: 0x0fb9, 0x1ad1: 0x1089,
-	0x1ad2: 0x0279, 0x1ad3: 0x0369, 0x1ad4: 0x0289, 0x1ad5: 0x13d1, 0x1ad6: 0x0039, 0x1ad7: 0x0ee9,
-	0x1ad8: 0x1159, 0x1ad9: 0x0ef9, 0x1ada: 0x0f09, 0x1adb: 0x1199, 0x1adc: 0x0f31, 0x1add: 0x0249,
-	0x1ade: 0x0f41, 0x1adf: 0x0259, 0x1ae0: 0x0f51, 0x1ae1: 0x0359, 0x1ae2: 0x0f61, 0x1ae3: 0x0f71,
-	0x1ae4: 0x00d9, 0x1ae5: 0x0f99, 0x1ae6: 0x2039, 0x1ae7: 0x0269, 0x1ae8: 0x01d9, 0x1ae9: 0x0fa9,
-	0x1aea: 0x0fb9, 0x1aeb: 0x1089, 0x1aec: 0x0279, 0x1aed: 0x0369, 0x1aee: 0x0289, 0x1aef: 0x13d1,
-	0x1af0: 0x0039, 0x1af1: 0x0ee9, 0x1af2: 0x1159, 0x1af3: 0x0ef9, 0x1af4: 0x0f09, 0x1af5: 0x1199,
-	0x1af6: 0x0f31, 0x1af7: 0x0249, 0x1af8: 0x0f41, 0x1af9: 0x0259, 0x1afa: 0x0f51, 0x1afb: 0x0359,
-	0x1afc: 0x0f61, 0x1afd: 0x0f71, 0x1afe: 0x00d9, 0x1aff: 0x0f99,
+	0x1ac0: 0x0769, 0x1ac1: 0x22f9, 0x1ac2: 0x2289, 0x1ac3: 0x0399, 0x1ac4: 0x03a1, 0x1ac5: 0x03a9,
+	0x1ac6: 0x2291, 0x1ac7: 0x2299, 0x1ac8: 0x22a1, 0x1ac9: 0x04d1, 0x1aca: 0x05f9, 0x1acb: 0x22a9,
+	0x1acc: 0x22b1, 0x1acd: 0x22b9, 0x1ace: 0x22c1, 0x1acf: 0x22c9, 0x1ad0: 0x22d1, 0x1ad1: 0x0799,
+	0x1ad2: 0x03c1, 0x1ad3: 0x22d9, 0x1ad4: 0x22d9, 0x1ad5: 0x22e1, 0x1ad6: 0x22e9, 0x1ad7: 0x03b1,
+	0x1ad8: 0x03b9, 0x1ad9: 0x22f1, 0x1ada: 0x0769, 0x1adb: 0x2301, 0x1adc: 0x2291, 0x1add: 0x04d1,
+	0x1ade: 0x22a9, 0x1adf: 0x03b1, 0x1ae0: 0x03c1, 0x1ae1: 0x0799, 0x1ae2: 0x2289, 0x1ae3: 0x0399,
+	0x1ae4: 0x03a1, 0x1ae5: 0x03a9, 0x1ae6: 0x2291, 0x1ae7: 0x2299, 0x1ae8: 0x22a1, 0x1ae9: 0x04d1,
+	0x1aea: 0x05f9, 0x1aeb: 0x22a9, 0x1aec: 0x22b1, 0x1aed: 0x22b9, 0x1aee: 0x22c1, 0x1aef: 0x22c9,
+	0x1af0: 0x22d1, 0x1af1: 0x0799, 0x1af2: 0x03c1, 0x1af3: 0x04d1, 0x1af4: 0x22d9, 0x1af5: 0x22e1,
+	0x1af6: 0x22e9, 0x1af7: 0x03b1, 0x1af8: 0x03b9, 0x1af9: 0x22f1, 0x1afa: 0x0769, 0x1afb: 0x22f9,
+	0x1afc: 0x2289, 0x1afd: 0x0399, 0x1afe: 0x03a1, 0x1aff: 0x03a9,
 	// Block 0x6c, offset 0x1b00
-	0x1b00: 0x2039, 0x1b01: 0x0269, 0x1b02: 0x01d9, 0x1b03: 0x0fa9, 0x1b04: 0x0fb9, 0x1b05: 0x1089,
-	0x1b06: 0x0279, 0x1b07: 0x0369, 0x1b08: 0x0289, 0x1b09: 0x13d1, 0x1b0a: 0x0039, 0x1b0b: 0x0ee9,
-	0x1b0c: 0x1159, 0x1b0d: 0x0ef9, 0x1b0e: 0x0f09, 0x1b0f: 0x1199, 0x1b10: 0x0f31, 0x1b11: 0x0249,
-	0x1b12: 0x0f41, 0x1b13: 0x0259, 0x1b14: 0x0f51, 0x1b15: 0x0359, 0x1b16: 0x0f61, 0x1b17: 0x0f71,
-	0x1b18: 0x00d9, 0x1b19: 0x0f99, 0x1b1a: 0x2039, 0x1b1b: 0x0269, 0x1b1c: 0x01d9, 0x1b1d: 0x0fa9,
-	0x1b1e: 0x0fb9, 0x1b1f: 0x1089, 0x1b20: 0x0279, 0x1b21: 0x0369, 0x1b22: 0x0289, 0x1b23: 0x13d1,
-	0x1b24: 0xbad1, 0x1b25: 0xbae9, 0x1b26: 0x0040, 0x1b27: 0x0040, 0x1b28: 0xbb01, 0x1b29: 0x1099,
-	0x1b2a: 0x10b1, 0x1b2b: 0x10c9, 0x1b2c: 0xbb19, 0x1b2d: 0xbb31, 0x1b2e: 0xbb49, 0x1b2f: 0x1429,
-	0x1b30: 0x1a31, 0x1b31: 0xbb61, 0x1b32: 0xbb79, 0x1b33: 0xbb91, 0x1b34: 0xbba9, 0x1b35: 0xbbc1,
-	0x1b36: 0xbbd9, 0x1b37: 0x2109, 0x1b38: 0x1111, 0x1b39: 0x1429, 0x1b3a: 0xbbf1, 0x1b3b: 0xbc09,
-	0x1b3c: 0xbc21, 0x1b3d: 0x10e1, 0x1b3e: 0x10f9, 0x1b3f: 0xbc39,
+	0x1b00: 0x2291, 0x1b01: 0x2299, 0x1b02: 0x22a1, 0x1b03: 0x04d1, 0x1b04: 0x05f9, 0x1b05: 0x22a9,
+	0x1b06: 0x22b1, 0x1b07: 0x22b9, 0x1b08: 0x22c1, 0x1b09: 0x22c9, 0x1b0a: 0x22d1, 0x1b0b: 0x0799,
+	0x1b0c: 0x03c1, 0x1b0d: 0x22d9, 0x1b0e: 0x22d9, 0x1b0f: 0x22e1, 0x1b10: 0x22e9, 0x1b11: 0x03b1,
+	0x1b12: 0x03b9, 0x1b13: 0x22f1, 0x1b14: 0x0769, 0x1b15: 0x2301, 0x1b16: 0x2291, 0x1b17: 0x04d1,
+	0x1b18: 0x22a9, 0x1b19: 0x03b1, 0x1b1a: 0x03c1, 0x1b1b: 0x0799, 0x1b1c: 0x2289, 0x1b1d: 0x0399,
+	0x1b1e: 0x03a1, 0x1b1f: 0x03a9, 0x1b20: 0x2291, 0x1b21: 0x2299, 0x1b22: 0x22a1, 0x1b23: 0x04d1,
+	0x1b24: 0x05f9, 0x1b25: 0x22a9, 0x1b26: 0x22b1, 0x1b27: 0x22b9, 0x1b28: 0x22c1, 0x1b29: 0x22c9,
+	0x1b2a: 0x22d1, 0x1b2b: 0x0799, 0x1b2c: 0x03c1, 0x1b2d: 0x04d1, 0x1b2e: 0x22d9, 0x1b2f: 0x22e1,
+	0x1b30: 0x22e9, 0x1b31: 0x03b1, 0x1b32: 0x03b9, 0x1b33: 0x22f1, 0x1b34: 0x0769, 0x1b35: 0x22f9,
+	0x1b36: 0x2289, 0x1b37: 0x0399, 0x1b38: 0x03a1, 0x1b39: 0x03a9, 0x1b3a: 0x2291, 0x1b3b: 0x2299,
+	0x1b3c: 0x22a1, 0x1b3d: 0x04d1, 0x1b3e: 0x05f9, 0x1b3f: 0x22a9,
 	// Block 0x6d, offset 0x1b40
-	0x1b40: 0x2079, 0x1b41: 0xbc51, 0x1b42: 0xbb01, 0x1b43: 0x1099, 0x1b44: 0x10b1, 0x1b45: 0x10c9,
-	0x1b46: 0xbb19, 0x1b47: 0xbb31, 0x1b48: 0xbb49, 0x1b49: 0x1429, 0x1b4a: 0x1a31, 0x1b4b: 0xbb61,
-	0x1b4c: 0xbb79, 0x1b4d: 0xbb91, 0x1b4e: 0xbba9, 0x1b4f: 0xbbc1, 0x1b50: 0xbbd9, 0x1b51: 0x2109,
-	0x1b52: 0x1111, 0x1b53: 0xbbf1, 0x1b54: 0xbbf1, 0x1b55: 0xbc09, 0x1b56: 0xbc21, 0x1b57: 0x10e1,
-	0x1b58: 0x10f9, 0x1b59: 0xbc39, 0x1b5a: 0x2079, 0x1b5b: 0xbc71, 0x1b5c: 0xbb19, 0x1b5d: 0x1429,
-	0x1b5e: 0xbb61, 0x1b5f: 0x10e1, 0x1b60: 0x1111, 0x1b61: 0x2109, 0x1b62: 0xbb01, 0x1b63: 0x1099,
-	0x1b64: 0x10b1, 0x1b65: 0x10c9, 0x1b66: 0xbb19, 0x1b67: 0xbb31, 0x1b68: 0xbb49, 0x1b69: 0x1429,
-	0x1b6a: 0x1a31, 0x1b6b: 0xbb61, 0x1b6c: 0xbb79, 0x1b6d: 0xbb91, 0x1b6e: 0xbba9, 0x1b6f: 0xbbc1,
-	0x1b70: 0xbbd9, 0x1b71: 0x2109, 0x1b72: 0x1111, 0x1b73: 0x1429, 0x1b74: 0xbbf1, 0x1b75: 0xbc09,
-	0x1b76: 0xbc21, 0x1b77: 0x10e1, 0x1b78: 0x10f9, 0x1b79: 0xbc39, 0x1b7a: 0x2079, 0x1b7b: 0xbc51,
-	0x1b7c: 0xbb01, 0x1b7d: 0x1099, 0x1b7e: 0x10b1, 0x1b7f: 0x10c9,
+	0x1b40: 0x22b1, 0x1b41: 0x22b9, 0x1b42: 0x22c1, 0x1b43: 0x22c9, 0x1b44: 0x22d1, 0x1b45: 0x0799,
+	0x1b46: 0x03c1, 0x1b47: 0x22d9, 0x1b48: 0x22d9, 0x1b49: 0x22e1, 0x1b4a: 0x22e9, 0x1b4b: 0x03b1,
+	0x1b4c: 0x03b9, 0x1b4d: 0x22f1, 0x1b4e: 0x0769, 0x1b4f: 0x2301, 0x1b50: 0x2291, 0x1b51: 0x04d1,
+	0x1b52: 0x22a9, 0x1b53: 0x03b1, 0x1b54: 0x03c1, 0x1b55: 0x0799, 0x1b56: 0x2289, 0x1b57: 0x0399,
+	0x1b58: 0x03a1, 0x1b59: 0x03a9, 0x1b5a: 0x2291, 0x1b5b: 0x2299, 0x1b5c: 0x22a1, 0x1b5d: 0x04d1,
+	0x1b5e: 0x05f9, 0x1b5f: 0x22a9, 0x1b60: 0x22b1, 0x1b61: 0x22b9, 0x1b62: 0x22c1, 0x1b63: 0x22c9,
+	0x1b64: 0x22d1, 0x1b65: 0x0799, 0x1b66: 0x03c1, 0x1b67: 0x04d1, 0x1b68: 0x22d9, 0x1b69: 0x22e1,
+	0x1b6a: 0x22e9, 0x1b6b: 0x03b1, 0x1b6c: 0x03b9, 0x1b6d: 0x22f1, 0x1b6e: 0x0769, 0x1b6f: 0x22f9,
+	0x1b70: 0x2289, 0x1b71: 0x0399, 0x1b72: 0x03a1, 0x1b73: 0x03a9, 0x1b74: 0x2291, 0x1b75: 0x2299,
+	0x1b76: 0x22a1, 0x1b77: 0x04d1, 0x1b78: 0x05f9, 0x1b79: 0x22a9, 0x1b7a: 0x22b1, 0x1b7b: 0x22b9,
+	0x1b7c: 0x22c1, 0x1b7d: 0x22c9, 0x1b7e: 0x22d1, 0x1b7f: 0x0799,
 	// Block 0x6e, offset 0x1b80
-	0x1b80: 0xbb19, 0x1b81: 0xbb31, 0x1b82: 0xbb49, 0x1b83: 0x1429, 0x1b84: 0x1a31, 0x1b85: 0xbb61,
-	0x1b86: 0xbb79, 0x1b87: 0xbb91, 0x1b88: 0xbba9, 0x1b89: 0xbbc1, 0x1b8a: 0xbbd9, 0x1b8b: 0x2109,
-	0x1b8c: 0x1111, 0x1b8d: 0xbbf1, 0x1b8e: 0xbbf1, 0x1b8f: 0xbc09, 0x1b90: 0xbc21, 0x1b91: 0x10e1,
-	0x1b92: 0x10f9, 0x1b93: 0xbc39, 0x1b94: 0x2079, 0x1b95: 0xbc71, 0x1b96: 0xbb19, 0x1b97: 0x1429,
-	0x1b98: 0xbb61, 0x1b99: 0x10e1, 0x1b9a: 0x1111, 0x1b9b: 0x2109, 0x1b9c: 0xbb01, 0x1b9d: 0x1099,
-	0x1b9e: 0x10b1, 0x1b9f: 0x10c9, 0x1ba0: 0xbb19, 0x1ba1: 0xbb31, 0x1ba2: 0xbb49, 0x1ba3: 0x1429,
-	0x1ba4: 0x1a31, 0x1ba5: 0xbb61, 0x1ba6: 0xbb79, 0x1ba7: 0xbb91, 0x1ba8: 0xbba9, 0x1ba9: 0xbbc1,
-	0x1baa: 0xbbd9, 0x1bab: 0x2109, 0x1bac: 0x1111, 0x1bad: 0x1429, 0x1bae: 0xbbf1, 0x1baf: 0xbc09,
-	0x1bb0: 0xbc21, 0x1bb1: 0x10e1, 0x1bb2: 0x10f9, 0x1bb3: 0xbc39, 0x1bb4: 0x2079, 0x1bb5: 0xbc51,
-	0x1bb6: 0xbb01, 0x1bb7: 0x1099, 0x1bb8: 0x10b1, 0x1bb9: 0x10c9, 0x1bba: 0xbb19, 0x1bbb: 0xbb31,
-	0x1bbc: 0xbb49, 0x1bbd: 0x1429, 0x1bbe: 0x1a31, 0x1bbf: 0xbb61,
+	0x1b80: 0x03c1, 0x1b81: 0x22d9, 0x1b82: 0x22d9, 0x1b83: 0x22e1, 0x1b84: 0x22e9, 0x1b85: 0x03b1,
+	0x1b86: 0x03b9, 0x1b87: 0x22f1, 0x1b88: 0x0769, 0x1b89: 0x2301, 0x1b8a: 0x2291, 0x1b8b: 0x04d1,
+	0x1b8c: 0x22a9, 0x1b8d: 0x03b1, 0x1b8e: 0x03c1, 0x1b8f: 0x0799, 0x1b90: 0x2289, 0x1b91: 0x0399,
+	0x1b92: 0x03a1, 0x1b93: 0x03a9, 0x1b94: 0x2291, 0x1b95: 0x2299, 0x1b96: 0x22a1, 0x1b97: 0x04d1,
+	0x1b98: 0x05f9, 0x1b99: 0x22a9, 0x1b9a: 0x22b1, 0x1b9b: 0x22b9, 0x1b9c: 0x22c1, 0x1b9d: 0x22c9,
+	0x1b9e: 0x22d1, 0x1b9f: 0x0799, 0x1ba0: 0x03c1, 0x1ba1: 0x04d1, 0x1ba2: 0x22d9, 0x1ba3: 0x22e1,
+	0x1ba4: 0x22e9, 0x1ba5: 0x03b1, 0x1ba6: 0x03b9, 0x1ba7: 0x22f1, 0x1ba8: 0x0769, 0x1ba9: 0x22f9,
+	0x1baa: 0x2289, 0x1bab: 0x0399, 0x1bac: 0x03a1, 0x1bad: 0x03a9, 0x1bae: 0x2291, 0x1baf: 0x2299,
+	0x1bb0: 0x22a1, 0x1bb1: 0x04d1, 0x1bb2: 0x05f9, 0x1bb3: 0x22a9, 0x1bb4: 0x22b1, 0x1bb5: 0x22b9,
+	0x1bb6: 0x22c1, 0x1bb7: 0x22c9, 0x1bb8: 0x22d1, 0x1bb9: 0x0799, 0x1bba: 0x03c1, 0x1bbb: 0x22d9,
+	0x1bbc: 0x22d9, 0x1bbd: 0x22e1, 0x1bbe: 0x22e9, 0x1bbf: 0x03b1,
 	// Block 0x6f, offset 0x1bc0
-	0x1bc0: 0xbb79, 0x1bc1: 0xbb91, 0x1bc2: 0xbba9, 0x1bc3: 0xbbc1, 0x1bc4: 0xbbd9, 0x1bc5: 0x2109,
-	0x1bc6: 0x1111, 0x1bc7: 0xbbf1, 0x1bc8: 0xbbf1, 0x1bc9: 0xbc09, 0x1bca: 0xbc21, 0x1bcb: 0x10e1,
-	0x1bcc: 0x10f9, 0x1bcd: 0xbc39, 0x1bce: 0x2079, 0x1bcf: 0xbc71, 0x1bd0: 0xbb19, 0x1bd1: 0x1429,
-	0x1bd2: 0xbb61, 0x1bd3: 0x10e1, 0x1bd4: 0x1111, 0x1bd5: 0x2109, 0x1bd6: 0xbb01, 0x1bd7: 0x1099,
-	0x1bd8: 0x10b1, 0x1bd9: 0x10c9, 0x1bda: 0xbb19, 0x1bdb: 0xbb31, 0x1bdc: 0xbb49, 0x1bdd: 0x1429,
-	0x1bde: 0x1a31, 0x1bdf: 0xbb61, 0x1be0: 0xbb79, 0x1be1: 0xbb91, 0x1be2: 0xbba9, 0x1be3: 0xbbc1,
-	0x1be4: 0xbbd9, 0x1be5: 0x2109, 0x1be6: 0x1111, 0x1be7: 0x1429, 0x1be8: 0xbbf1, 0x1be9: 0xbc09,
-	0x1bea: 0xbc21, 0x1beb: 0x10e1, 0x1bec: 0x10f9, 0x1bed: 0xbc39, 0x1bee: 0x2079, 0x1bef: 0xbc51,
-	0x1bf0: 0xbb01, 0x1bf1: 0x1099, 0x1bf2: 0x10b1, 0x1bf3: 0x10c9, 0x1bf4: 0xbb19, 0x1bf5: 0xbb31,
-	0x1bf6: 0xbb49, 0x1bf7: 0x1429, 0x1bf8: 0x1a31, 0x1bf9: 0xbb61, 0x1bfa: 0xbb79, 0x1bfb: 0xbb91,
-	0x1bfc: 0xbba9, 0x1bfd: 0xbbc1, 0x1bfe: 0xbbd9, 0x1bff: 0x2109,
+	0x1bc0: 0x03b9, 0x1bc1: 0x22f1, 0x1bc2: 0x0769, 0x1bc3: 0x2301, 0x1bc4: 0x2291, 0x1bc5: 0x04d1,
+	0x1bc6: 0x22a9, 0x1bc7: 0x03b1, 0x1bc8: 0x03c1, 0x1bc9: 0x0799, 0x1bca: 0x2309, 0x1bcb: 0x2309,
+	0x1bcc: 0x0040, 0x1bcd: 0x0040, 0x1bce: 0x06e1, 0x1bcf: 0x0049, 0x1bd0: 0x0029, 0x1bd1: 0x0031,
+	0x1bd2: 0x06e9, 0x1bd3: 0x06f1, 0x1bd4: 0x06f9, 0x1bd5: 0x0701, 0x1bd6: 0x0709, 0x1bd7: 0x0711,
+	0x1bd8: 0x06e1, 0x1bd9: 0x0049, 0x1bda: 0x0029, 0x1bdb: 0x0031, 0x1bdc: 0x06e9, 0x1bdd: 0x06f1,
+	0x1bde: 0x06f9, 0x1bdf: 0x0701, 0x1be0: 0x0709, 0x1be1: 0x0711, 0x1be2: 0x06e1, 0x1be3: 0x0049,
+	0x1be4: 0x0029, 0x1be5: 0x0031, 0x1be6: 0x06e9, 0x1be7: 0x06f1, 0x1be8: 0x06f9, 0x1be9: 0x0701,
+	0x1bea: 0x0709, 0x1beb: 0x0711, 0x1bec: 0x06e1, 0x1bed: 0x0049, 0x1bee: 0x0029, 0x1bef: 0x0031,
+	0x1bf0: 0x06e9, 0x1bf1: 0x06f1, 0x1bf2: 0x06f9, 0x1bf3: 0x0701, 0x1bf4: 0x0709, 0x1bf5: 0x0711,
+	0x1bf6: 0x06e1, 0x1bf7: 0x0049, 0x1bf8: 0x0029, 0x1bf9: 0x0031, 0x1bfa: 0x06e9, 0x1bfb: 0x06f1,
+	0x1bfc: 0x06f9, 0x1bfd: 0x0701, 0x1bfe: 0x0709, 0x1bff: 0x0711,
 	// Block 0x70, offset 0x1c00
-	0x1c00: 0x1111, 0x1c01: 0xbbf1, 0x1c02: 0xbbf1, 0x1c03: 0xbc09, 0x1c04: 0xbc21, 0x1c05: 0x10e1,
-	0x1c06: 0x10f9, 0x1c07: 0xbc39, 0x1c08: 0x2079, 0x1c09: 0xbc71, 0x1c0a: 0xbb19, 0x1c0b: 0x1429,
-	0x1c0c: 0xbb61, 0x1c0d: 0x10e1, 0x1c0e: 0x1111, 0x1c0f: 0x2109, 0x1c10: 0xbb01, 0x1c11: 0x1099,
-	0x1c12: 0x10b1, 0x1c13: 0x10c9, 0x1c14: 0xbb19, 0x1c15: 0xbb31, 0x1c16: 0xbb49, 0x1c17: 0x1429,
-	0x1c18: 0x1a31, 0x1c19: 0xbb61, 0x1c1a: 0xbb79, 0x1c1b: 0xbb91, 0x1c1c: 0xbba9, 0x1c1d: 0xbbc1,
-	0x1c1e: 0xbbd9, 0x1c1f: 0x2109, 0x1c20: 0x1111, 0x1c21: 0x1429, 0x1c22: 0xbbf1, 0x1c23: 0xbc09,
-	0x1c24: 0xbc21, 0x1c25: 0x10e1, 0x1c26: 0x10f9, 0x1c27: 0xbc39, 0x1c28: 0x2079, 0x1c29: 0xbc51,
-	0x1c2a: 0xbb01, 0x1c2b: 0x1099, 0x1c2c: 0x10b1, 0x1c2d: 0x10c9, 0x1c2e: 0xbb19, 0x1c2f: 0xbb31,
-	0x1c30: 0xbb49, 0x1c31: 0x1429, 0x1c32: 0x1a31, 0x1c33: 0xbb61, 0x1c34: 0xbb79, 0x1c35: 0xbb91,
-	0x1c36: 0xbba9, 0x1c37: 0xbbc1, 0x1c38: 0xbbd9, 0x1c39: 0x2109, 0x1c3a: 0x1111, 0x1c3b: 0xbbf1,
-	0x1c3c: 0xbbf1, 0x1c3d: 0xbc09, 0x1c3e: 0xbc21, 0x1c3f: 0x10e1,
+	0x1c00: 0xe115, 0x1c01: 0xe115, 0x1c02: 0xe135, 0x1c03: 0xe135, 0x1c04: 0xe115, 0x1c05: 0xe115,
+	0x1c06: 0xe175, 0x1c07: 0xe175, 0x1c08: 0xe115, 0x1c09: 0xe115, 0x1c0a: 0xe135, 0x1c0b: 0xe135,
+	0x1c0c: 0xe115, 0x1c0d: 0xe115, 0x1c0e: 0xe1f5, 0x1c0f: 0xe1f5, 0x1c10: 0xe115, 0x1c11: 0xe115,
+	0x1c12: 0xe135, 0x1c13: 0xe135, 0x1c14: 0xe115, 0x1c15: 0xe115, 0x1c16: 0xe175, 0x1c17: 0xe175,
+	0x1c18: 0xe115, 0x1c19: 0xe115, 0x1c1a: 0xe135, 0x1c1b: 0xe135, 0x1c1c: 0xe115, 0x1c1d: 0xe115,
+	0x1c1e: 0x8b3d, 0x1c1f: 0x8b3d, 0x1c20: 0x04b5, 0x1c21: 0x04b5, 0x1c22: 0x0a08, 0x1c23: 0x0a08,
+	0x1c24: 0x0a08, 0x1c25: 0x0a08, 0x1c26: 0x0a08, 0x1c27: 0x0a08, 0x1c28: 0x0a08, 0x1c29: 0x0a08,
+	0x1c2a: 0x0a08, 0x1c2b: 0x0a08, 0x1c2c: 0x0a08, 0x1c2d: 0x0a08, 0x1c2e: 0x0a08, 0x1c2f: 0x0a08,
+	0x1c30: 0x0a08, 0x1c31: 0x0a08, 0x1c32: 0x0a08, 0x1c33: 0x0a08, 0x1c34: 0x0a08, 0x1c35: 0x0a08,
+	0x1c36: 0x0a08, 0x1c37: 0x0a08, 0x1c38: 0x0a08, 0x1c39: 0x0a08, 0x1c3a: 0x0a08, 0x1c3b: 0x0a08,
+	0x1c3c: 0x0a08, 0x1c3d: 0x0a08, 0x1c3e: 0x0a08, 0x1c3f: 0x0a08,
 	// Block 0x71, offset 0x1c40
-	0x1c40: 0x10f9, 0x1c41: 0xbc39, 0x1c42: 0x2079, 0x1c43: 0xbc71, 0x1c44: 0xbb19, 0x1c45: 0x1429,
-	0x1c46: 0xbb61, 0x1c47: 0x10e1, 0x1c48: 0x1111, 0x1c49: 0x2109, 0x1c4a: 0xbc91, 0x1c4b: 0xbc91,
-	0x1c4c: 0x0040, 0x1c4d: 0x0040, 0x1c4e: 0x1f41, 0x1c4f: 0x00c9, 0x1c50: 0x0069, 0x1c51: 0x0079,
-	0x1c52: 0x1f51, 0x1c53: 0x1f61, 0x1c54: 0x1f71, 0x1c55: 0x1f81, 0x1c56: 0x1f91, 0x1c57: 0x1fa1,
-	0x1c58: 0x1f41, 0x1c59: 0x00c9, 0x1c5a: 0x0069, 0x1c5b: 0x0079, 0x1c5c: 0x1f51, 0x1c5d: 0x1f61,
-	0x1c5e: 0x1f71, 0x1c5f: 0x1f81, 0x1c60: 0x1f91, 0x1c61: 0x1fa1, 0x1c62: 0x1f41, 0x1c63: 0x00c9,
-	0x1c64: 0x0069, 0x1c65: 0x0079, 0x1c66: 0x1f51, 0x1c67: 0x1f61, 0x1c68: 0x1f71, 0x1c69: 0x1f81,
-	0x1c6a: 0x1f91, 0x1c6b: 0x1fa1, 0x1c6c: 0x1f41, 0x1c6d: 0x00c9, 0x1c6e: 0x0069, 0x1c6f: 0x0079,
-	0x1c70: 0x1f51, 0x1c71: 0x1f61, 0x1c72: 0x1f71, 0x1c73: 0x1f81, 0x1c74: 0x1f91, 0x1c75: 0x1fa1,
-	0x1c76: 0x1f41, 0x1c77: 0x00c9, 0x1c78: 0x0069, 0x1c79: 0x0079, 0x1c7a: 0x1f51, 0x1c7b: 0x1f61,
-	0x1c7c: 0x1f71, 0x1c7d: 0x1f81, 0x1c7e: 0x1f91, 0x1c7f: 0x1fa1,
+	0x1c40: 0x20b1, 0x1c41: 0x20b9, 0x1c42: 0x20d9, 0x1c43: 0x20f1, 0x1c44: 0x0040, 0x1c45: 0x2189,
+	0x1c46: 0x2109, 0x1c47: 0x20e1, 0x1c48: 0x2131, 0x1c49: 0x2191, 0x1c4a: 0x2161, 0x1c4b: 0x2169,
+	0x1c4c: 0x2171, 0x1c4d: 0x2179, 0x1c4e: 0x2111, 0x1c4f: 0x2141, 0x1c50: 0x2151, 0x1c51: 0x2121,
+	0x1c52: 0x2159, 0x1c53: 0x2101, 0x1c54: 0x2119, 0x1c55: 0x20c9, 0x1c56: 0x20d1, 0x1c57: 0x20e9,
+	0x1c58: 0x20f9, 0x1c59: 0x2129, 0x1c5a: 0x2139, 0x1c5b: 0x2149, 0x1c5c: 0x2311, 0x1c5d: 0x1689,
+	0x1c5e: 0x2319, 0x1c5f: 0x2321, 0x1c60: 0x0040, 0x1c61: 0x20b9, 0x1c62: 0x20d9, 0x1c63: 0x0040,
+	0x1c64: 0x2181, 0x1c65: 0x0040, 0x1c66: 0x0040, 0x1c67: 0x20e1, 0x1c68: 0x0040, 0x1c69: 0x2191,
+	0x1c6a: 0x2161, 0x1c6b: 0x2169, 0x1c6c: 0x2171, 0x1c6d: 0x2179, 0x1c6e: 0x2111, 0x1c6f: 0x2141,
+	0x1c70: 0x2151, 0x1c71: 0x2121, 0x1c72: 0x2159, 0x1c73: 0x0040, 0x1c74: 0x2119, 0x1c75: 0x20c9,
+	0x1c76: 0x20d1, 0x1c77: 0x20e9, 0x1c78: 0x0040, 0x1c79: 0x2129, 0x1c7a: 0x0040, 0x1c7b: 0x2149,
+	0x1c7c: 0x0040, 0x1c7d: 0x0040, 0x1c7e: 0x0040, 0x1c7f: 0x0040,
 	// Block 0x72, offset 0x1c80
-	0x1c80: 0xe115, 0x1c81: 0xe115, 0x1c82: 0xe135, 0x1c83: 0xe135, 0x1c84: 0xe115, 0x1c85: 0xe115,
-	0x1c86: 0xe175, 0x1c87: 0xe175, 0x1c88: 0xe115, 0x1c89: 0xe115, 0x1c8a: 0xe135, 0x1c8b: 0xe135,
-	0x1c8c: 0xe115, 0x1c8d: 0xe115, 0x1c8e: 0xe1f5, 0x1c8f: 0xe1f5, 0x1c90: 0xe115, 0x1c91: 0xe115,
-	0x1c92: 0xe135, 0x1c93: 0xe135, 0x1c94: 0xe115, 0x1c95: 0xe115, 0x1c96: 0xe175, 0x1c97: 0xe175,
-	0x1c98: 0xe115, 0x1c99: 0xe115, 0x1c9a: 0xe135, 0x1c9b: 0xe135, 0x1c9c: 0xe115, 0x1c9d: 0xe115,
-	0x1c9e: 0x8b3d, 0x1c9f: 0x8b3d, 0x1ca0: 0x04b5, 0x1ca1: 0x04b5, 0x1ca2: 0x0a08, 0x1ca3: 0x0a08,
-	0x1ca4: 0x0a08, 0x1ca5: 0x0a08, 0x1ca6: 0x0a08, 0x1ca7: 0x0a08, 0x1ca8: 0x0a08, 0x1ca9: 0x0a08,
-	0x1caa: 0x0a08, 0x1cab: 0x0a08, 0x1cac: 0x0a08, 0x1cad: 0x0a08, 0x1cae: 0x0a08, 0x1caf: 0x0a08,
-	0x1cb0: 0x0a08, 0x1cb1: 0x0a08, 0x1cb2: 0x0a08, 0x1cb3: 0x0a08, 0x1cb4: 0x0a08, 0x1cb5: 0x0a08,
-	0x1cb6: 0x0a08, 0x1cb7: 0x0a08, 0x1cb8: 0x0a08, 0x1cb9: 0x0a08, 0x1cba: 0x0a08, 0x1cbb: 0x0a08,
-	0x1cbc: 0x0a08, 0x1cbd: 0x0a08, 0x1cbe: 0x0a08, 0x1cbf: 0x0a08,
+	0x1c80: 0x0040, 0x1c81: 0x0040, 0x1c82: 0x20d9, 0x1c83: 0x0040, 0x1c84: 0x0040, 0x1c85: 0x0040,
+	0x1c86: 0x0040, 0x1c87: 0x20e1, 0x1c88: 0x0040, 0x1c89: 0x2191, 0x1c8a: 0x0040, 0x1c8b: 0x2169,
+	0x1c8c: 0x0040, 0x1c8d: 0x2179, 0x1c8e: 0x2111, 0x1c8f: 0x2141, 0x1c90: 0x0040, 0x1c91: 0x2121,
+	0x1c92: 0x2159, 0x1c93: 0x0040, 0x1c94: 0x2119, 0x1c95: 0x0040, 0x1c96: 0x0040, 0x1c97: 0x20e9,
+	0x1c98: 0x0040, 0x1c99: 0x2129, 0x1c9a: 0x0040, 0x1c9b: 0x2149, 0x1c9c: 0x0040, 0x1c9d: 0x1689,
+	0x1c9e: 0x0040, 0x1c9f: 0x2321, 0x1ca0: 0x0040, 0x1ca1: 0x20b9, 0x1ca2: 0x20d9, 0x1ca3: 0x0040,
+	0x1ca4: 0x2181, 0x1ca5: 0x0040, 0x1ca6: 0x0040, 0x1ca7: 0x20e1, 0x1ca8: 0x2131, 0x1ca9: 0x2191,
+	0x1caa: 0x2161, 0x1cab: 0x0040, 0x1cac: 0x2171, 0x1cad: 0x2179, 0x1cae: 0x2111, 0x1caf: 0x2141,
+	0x1cb0: 0x2151, 0x1cb1: 0x2121, 0x1cb2: 0x2159, 0x1cb3: 0x0040, 0x1cb4: 0x2119, 0x1cb5: 0x20c9,
+	0x1cb6: 0x20d1, 0x1cb7: 0x20e9, 0x1cb8: 0x0040, 0x1cb9: 0x2129, 0x1cba: 0x2139, 0x1cbb: 0x2149,
+	0x1cbc: 0x2311, 0x1cbd: 0x0040, 0x1cbe: 0x2319, 0x1cbf: 0x0040,
 	// Block 0x73, offset 0x1cc0
-	0x1cc0: 0xb1d9, 0x1cc1: 0xb1f1, 0x1cc2: 0xb251, 0x1cc3: 0xb299, 0x1cc4: 0x0040, 0x1cc5: 0xb461,
-	0x1cc6: 0xb2e1, 0x1cc7: 0xb269, 0x1cc8: 0xb359, 0x1cc9: 0xb479, 0x1cca: 0xb3e9, 0x1ccb: 0xb401,
-	0x1ccc: 0xb419, 0x1ccd: 0xb431, 0x1cce: 0xb2f9, 0x1ccf: 0xb389, 0x1cd0: 0xb3b9, 0x1cd1: 0xb329,
-	0x1cd2: 0xb3d1, 0x1cd3: 0xb2c9, 0x1cd4: 0xb311, 0x1cd5: 0xb221, 0x1cd6: 0xb239, 0x1cd7: 0xb281,
-	0x1cd8: 0xb2b1, 0x1cd9: 0xb341, 0x1cda: 0xb371, 0x1cdb: 0xb3a1, 0x1cdc: 0xbca9, 0x1cdd: 0x7999,
-	0x1cde: 0xbcc1, 0x1cdf: 0xbcd9, 0x1ce0: 0x0040, 0x1ce1: 0xb1f1, 0x1ce2: 0xb251, 0x1ce3: 0x0040,
-	0x1ce4: 0xb449, 0x1ce5: 0x0040, 0x1ce6: 0x0040, 0x1ce7: 0xb269, 0x1ce8: 0x0040, 0x1ce9: 0xb479,
-	0x1cea: 0xb3e9, 0x1ceb: 0xb401, 0x1cec: 0xb419, 0x1ced: 0xb431, 0x1cee: 0xb2f9, 0x1cef: 0xb389,
-	0x1cf0: 0xb3b9, 0x1cf1: 0xb329, 0x1cf2: 0xb3d1, 0x1cf3: 0x0040, 0x1cf4: 0xb311, 0x1cf5: 0xb221,
-	0x1cf6: 0xb239, 0x1cf7: 0xb281, 0x1cf8: 0x0040, 0x1cf9: 0xb341, 0x1cfa: 0x0040, 0x1cfb: 0xb3a1,
+	0x1cc0: 0x20b1, 0x1cc1: 0x20b9, 0x1cc2: 0x20d9, 0x1cc3: 0x20f1, 0x1cc4: 0x2181, 0x1cc5: 0x2189,
+	0x1cc6: 0x2109, 0x1cc7: 0x20e1, 0x1cc8: 0x2131, 0x1cc9: 0x2191, 0x1cca: 0x0040, 0x1ccb: 0x2169,
+	0x1ccc: 0x2171, 0x1ccd: 0x2179, 0x1cce: 0x2111, 0x1ccf: 0x2141, 0x1cd0: 0x2151, 0x1cd1: 0x2121,
+	0x1cd2: 0x2159, 0x1cd3: 0x2101, 0x1cd4: 0x2119, 0x1cd5: 0x20c9, 0x1cd6: 0x20d1, 0x1cd7: 0x20e9,
+	0x1cd8: 0x20f9, 0x1cd9: 0x2129, 0x1cda: 0x2139, 0x1cdb: 0x2149, 0x1cdc: 0x0040, 0x1cdd: 0x0040,
+	0x1cde: 0x0040, 0x1cdf: 0x0040, 0x1ce0: 0x0040, 0x1ce1: 0x20b9, 0x1ce2: 0x20d9, 0x1ce3: 0x20f1,
+	0x1ce4: 0x0040, 0x1ce5: 0x2189, 0x1ce6: 0x2109, 0x1ce7: 0x20e1, 0x1ce8: 0x2131, 0x1ce9: 0x2191,
+	0x1cea: 0x0040, 0x1ceb: 0x2169, 0x1cec: 0x2171, 0x1ced: 0x2179, 0x1cee: 0x2111, 0x1cef: 0x2141,
+	0x1cf0: 0x2151, 0x1cf1: 0x2121, 0x1cf2: 0x2159, 0x1cf3: 0x2101, 0x1cf4: 0x2119, 0x1cf5: 0x20c9,
+	0x1cf6: 0x20d1, 0x1cf7: 0x20e9, 0x1cf8: 0x20f9, 0x1cf9: 0x2129, 0x1cfa: 0x2139, 0x1cfb: 0x2149,
 	0x1cfc: 0x0040, 0x1cfd: 0x0040, 0x1cfe: 0x0040, 0x1cff: 0x0040,
 	// Block 0x74, offset 0x1d00
-	0x1d00: 0x0040, 0x1d01: 0x0040, 0x1d02: 0xb251, 0x1d03: 0x0040, 0x1d04: 0x0040, 0x1d05: 0x0040,
-	0x1d06: 0x0040, 0x1d07: 0xb269, 0x1d08: 0x0040, 0x1d09: 0xb479, 0x1d0a: 0x0040, 0x1d0b: 0xb401,
-	0x1d0c: 0x0040, 0x1d0d: 0xb431, 0x1d0e: 0xb2f9, 0x1d0f: 0xb389, 0x1d10: 0x0040, 0x1d11: 0xb329,
-	0x1d12: 0xb3d1, 0x1d13: 0x0040, 0x1d14: 0xb311, 0x1d15: 0x0040, 0x1d16: 0x0040, 0x1d17: 0xb281,
-	0x1d18: 0x0040, 0x1d19: 0xb341, 0x1d1a: 0x0040, 0x1d1b: 0xb3a1, 0x1d1c: 0x0040, 0x1d1d: 0x7999,
-	0x1d1e: 0x0040, 0x1d1f: 0xbcd9, 0x1d20: 0x0040, 0x1d21: 0xb1f1, 0x1d22: 0xb251, 0x1d23: 0x0040,
-	0x1d24: 0xb449, 0x1d25: 0x0040, 0x1d26: 0x0040, 0x1d27: 0xb269, 0x1d28: 0xb359, 0x1d29: 0xb479,
-	0x1d2a: 0xb3e9, 0x1d2b: 0x0040, 0x1d2c: 0xb419, 0x1d2d: 0xb431, 0x1d2e: 0xb2f9, 0x1d2f: 0xb389,
-	0x1d30: 0xb3b9, 0x1d31: 0xb329, 0x1d32: 0xb3d1, 0x1d33: 0x0040, 0x1d34: 0xb311, 0x1d35: 0xb221,
-	0x1d36: 0xb239, 0x1d37: 0xb281, 0x1d38: 0x0040, 0x1d39: 0xb341, 0x1d3a: 0xb371, 0x1d3b: 0xb3a1,
-	0x1d3c: 0xbca9, 0x1d3d: 0x0040, 0x1d3e: 0xbcc1, 0x1d3f: 0x0040,
+	0x1d00: 0x0040, 0x1d01: 0x232a, 0x1d02: 0x2332, 0x1d03: 0x233a, 0x1d04: 0x2342, 0x1d05: 0x234a,
+	0x1d06: 0x2352, 0x1d07: 0x235a, 0x1d08: 0x2362, 0x1d09: 0x236a, 0x1d0a: 0x2372, 0x1d0b: 0x0018,
+	0x1d0c: 0x0018, 0x1d0d: 0x0018, 0x1d0e: 0x0018, 0x1d0f: 0x0018, 0x1d10: 0x237a, 0x1d11: 0x2382,
+	0x1d12: 0x238a, 0x1d13: 0x2392, 0x1d14: 0x239a, 0x1d15: 0x23a2, 0x1d16: 0x23aa, 0x1d17: 0x23b2,
+	0x1d18: 0x23ba, 0x1d19: 0x23c2, 0x1d1a: 0x23ca, 0x1d1b: 0x23d2, 0x1d1c: 0x23da, 0x1d1d: 0x23e2,
+	0x1d1e: 0x23ea, 0x1d1f: 0x23f2, 0x1d20: 0x23fa, 0x1d21: 0x2402, 0x1d22: 0x240a, 0x1d23: 0x2412,
+	0x1d24: 0x241a, 0x1d25: 0x2422, 0x1d26: 0x242a, 0x1d27: 0x2432, 0x1d28: 0x243a, 0x1d29: 0x2442,
+	0x1d2a: 0x2449, 0x1d2b: 0x03d9, 0x1d2c: 0x00b9, 0x1d2d: 0x1239, 0x1d2e: 0x2451, 0x1d2f: 0x0018,
+	0x1d30: 0x0019, 0x1d31: 0x02e9, 0x1d32: 0x03d9, 0x1d33: 0x02f1, 0x1d34: 0x02f9, 0x1d35: 0x03f1,
+	0x1d36: 0x0309, 0x1d37: 0x00a9, 0x1d38: 0x0311, 0x1d39: 0x00b1, 0x1d3a: 0x0319, 0x1d3b: 0x0101,
+	0x1d3c: 0x0321, 0x1d3d: 0x0329, 0x1d3e: 0x0051, 0x1d3f: 0x0339,
 	// Block 0x75, offset 0x1d40
-	0x1d40: 0xb1d9, 0x1d41: 0xb1f1, 0x1d42: 0xb251, 0x1d43: 0xb299, 0x1d44: 0xb449, 0x1d45: 0xb461,
-	0x1d46: 0xb2e1, 0x1d47: 0xb269, 0x1d48: 0xb359, 0x1d49: 0xb479, 0x1d4a: 0x0040, 0x1d4b: 0xb401,
-	0x1d4c: 0xb419, 0x1d4d: 0xb431, 0x1d4e: 0xb2f9, 0x1d4f: 0xb389, 0x1d50: 0xb3b9, 0x1d51: 0xb329,
-	0x1d52: 0xb3d1, 0x1d53: 0xb2c9, 0x1d54: 0xb311, 0x1d55: 0xb221, 0x1d56: 0xb239, 0x1d57: 0xb281,
-	0x1d58: 0xb2b1, 0x1d59: 0xb341, 0x1d5a: 0xb371, 0x1d5b: 0xb3a1, 0x1d5c: 0x0040, 0x1d5d: 0x0040,
-	0x1d5e: 0x0040, 0x1d5f: 0x0040, 0x1d60: 0x0040, 0x1d61: 0xb1f1, 0x1d62: 0xb251, 0x1d63: 0xb299,
-	0x1d64: 0x0040, 0x1d65: 0xb461, 0x1d66: 0xb2e1, 0x1d67: 0xb269, 0x1d68: 0xb359, 0x1d69: 0xb479,
-	0x1d6a: 0x0040, 0x1d6b: 0xb401, 0x1d6c: 0xb419, 0x1d6d: 0xb431, 0x1d6e: 0xb2f9, 0x1d6f: 0xb389,
-	0x1d70: 0xb3b9, 0x1d71: 0xb329, 0x1d72: 0xb3d1, 0x1d73: 0xb2c9, 0x1d74: 0xb311, 0x1d75: 0xb221,
-	0x1d76: 0xb239, 0x1d77: 0xb281, 0x1d78: 0xb2b1, 0x1d79: 0xb341, 0x1d7a: 0xb371, 0x1d7b: 0xb3a1,
-	0x1d7c: 0x0040, 0x1d7d: 0x0040, 0x1d7e: 0x0040, 0x1d7f: 0x0040,
+	0x1d40: 0x0751, 0x1d41: 0x00b9, 0x1d42: 0x0089, 0x1d43: 0x0341, 0x1d44: 0x0349, 0x1d45: 0x0391,
+	0x1d46: 0x00c1, 0x1d47: 0x0109, 0x1d48: 0x00c9, 0x1d49: 0x04b1, 0x1d4a: 0x2459, 0x1d4b: 0x11f9,
+	0x1d4c: 0x2461, 0x1d4d: 0x04d9, 0x1d4e: 0x2469, 0x1d4f: 0x2471, 0x1d50: 0x0018, 0x1d51: 0x0018,
+	0x1d52: 0x0018, 0x1d53: 0x0018, 0x1d54: 0x0018, 0x1d55: 0x0018, 0x1d56: 0x0018, 0x1d57: 0x0018,
+	0x1d58: 0x0018, 0x1d59: 0x0018, 0x1d5a: 0x0018, 0x1d5b: 0x0018, 0x1d5c: 0x0018, 0x1d5d: 0x0018,
+	0x1d5e: 0x0018, 0x1d5f: 0x0018, 0x1d60: 0x0018, 0x1d61: 0x0018, 0x1d62: 0x0018, 0x1d63: 0x0018,
+	0x1d64: 0x0018, 0x1d65: 0x0018, 0x1d66: 0x0018, 0x1d67: 0x0018, 0x1d68: 0x0018, 0x1d69: 0x0018,
+	0x1d6a: 0x2479, 0x1d6b: 0x2481, 0x1d6c: 0x2489, 0x1d6d: 0x0018, 0x1d6e: 0x0018, 0x1d6f: 0x0018,
+	0x1d70: 0x0018, 0x1d71: 0x0018, 0x1d72: 0x0018, 0x1d73: 0x0018, 0x1d74: 0x0018, 0x1d75: 0x0018,
+	0x1d76: 0x0018, 0x1d77: 0x0018, 0x1d78: 0x0018, 0x1d79: 0x0018, 0x1d7a: 0x0018, 0x1d7b: 0x0018,
+	0x1d7c: 0x0018, 0x1d7d: 0x0018, 0x1d7e: 0x0018, 0x1d7f: 0x0018,
 	// Block 0x76, offset 0x1d80
-	0x1d80: 0x0040, 0x1d81: 0xbcf2, 0x1d82: 0xbd0a, 0x1d83: 0xbd22, 0x1d84: 0xbd3a, 0x1d85: 0xbd52,
-	0x1d86: 0xbd6a, 0x1d87: 0xbd82, 0x1d88: 0xbd9a, 0x1d89: 0xbdb2, 0x1d8a: 0xbdca, 0x1d8b: 0x0018,
-	0x1d8c: 0x0018, 0x1d8d: 0x0018, 0x1d8e: 0x0018, 0x1d8f: 0x0018, 0x1d90: 0xbde2, 0x1d91: 0xbe02,
-	0x1d92: 0xbe22, 0x1d93: 0xbe42, 0x1d94: 0xbe62, 0x1d95: 0xbe82, 0x1d96: 0xbea2, 0x1d97: 0xbec2,
-	0x1d98: 0xbee2, 0x1d99: 0xbf02, 0x1d9a: 0xbf22, 0x1d9b: 0xbf42, 0x1d9c: 0xbf62, 0x1d9d: 0xbf82,
-	0x1d9e: 0xbfa2, 0x1d9f: 0xbfc2, 0x1da0: 0xbfe2, 0x1da1: 0xc002, 0x1da2: 0xc022, 0x1da3: 0xc042,
-	0x1da4: 0xc062, 0x1da5: 0xc082, 0x1da6: 0xc0a2, 0x1da7: 0xc0c2, 0x1da8: 0xc0e2, 0x1da9: 0xc102,
-	0x1daa: 0xc121, 0x1dab: 0x1159, 0x1dac: 0x0269, 0x1dad: 0x66a9, 0x1dae: 0xc161, 0x1daf: 0x0018,
-	0x1db0: 0x0039, 0x1db1: 0x0ee9, 0x1db2: 0x1159, 0x1db3: 0x0ef9, 0x1db4: 0x0f09, 0x1db5: 0x1199,
-	0x1db6: 0x0f31, 0x1db7: 0x0249, 0x1db8: 0x0f41, 0x1db9: 0x0259, 0x1dba: 0x0f51, 0x1dbb: 0x0359,
-	0x1dbc: 0x0f61, 0x1dbd: 0x0f71, 0x1dbe: 0x00d9, 0x1dbf: 0x0f99,
+	0x1d80: 0x2499, 0x1d81: 0x24a1, 0x1d82: 0x24a9, 0x1d83: 0x0040, 0x1d84: 0x0040, 0x1d85: 0x0040,
+	0x1d86: 0x0040, 0x1d87: 0x0040, 0x1d88: 0x0040, 0x1d89: 0x0040, 0x1d8a: 0x0040, 0x1d8b: 0x0040,
+	0x1d8c: 0x0040, 0x1d8d: 0x0040, 0x1d8e: 0x0040, 0x1d8f: 0x0040, 0x1d90: 0x24b1, 0x1d91: 0x24b9,
+	0x1d92: 0x24c1, 0x1d93: 0x24c9, 0x1d94: 0x24d1, 0x1d95: 0x24d9, 0x1d96: 0x24e1, 0x1d97: 0x24e9,
+	0x1d98: 0x24f1, 0x1d99: 0x24f9, 0x1d9a: 0x2501, 0x1d9b: 0x2509, 0x1d9c: 0x2511, 0x1d9d: 0x2519,
+	0x1d9e: 0x2521, 0x1d9f: 0x2529, 0x1da0: 0x2531, 0x1da1: 0x2539, 0x1da2: 0x2541, 0x1da3: 0x2549,
+	0x1da4: 0x2551, 0x1da5: 0x2559, 0x1da6: 0x2561, 0x1da7: 0x2569, 0x1da8: 0x2571, 0x1da9: 0x2579,
+	0x1daa: 0x2581, 0x1dab: 0x2589, 0x1dac: 0x2591, 0x1dad: 0x2599, 0x1dae: 0x25a1, 0x1daf: 0x25a9,
+	0x1db0: 0x25b1, 0x1db1: 0x25b9, 0x1db2: 0x25c1, 0x1db3: 0x25c9, 0x1db4: 0x25d1, 0x1db5: 0x25d9,
+	0x1db6: 0x25e1, 0x1db7: 0x25e9, 0x1db8: 0x25f1, 0x1db9: 0x25f9, 0x1dba: 0x2601, 0x1dbb: 0x2609,
+	0x1dbc: 0x0040, 0x1dbd: 0x0040, 0x1dbe: 0x0040, 0x1dbf: 0x0040,
 	// Block 0x77, offset 0x1dc0
-	0x1dc0: 0x2039, 0x1dc1: 0x0269, 0x1dc2: 0x01d9, 0x1dc3: 0x0fa9, 0x1dc4: 0x0fb9, 0x1dc5: 0x1089,
-	0x1dc6: 0x0279, 0x1dc7: 0x0369, 0x1dc8: 0x0289, 0x1dc9: 0x13d1, 0x1dca: 0xc179, 0x1dcb: 0x65e9,
-	0x1dcc: 0xc191, 0x1dcd: 0x1441, 0x1dce: 0xc1a9, 0x1dcf: 0xc1c9, 0x1dd0: 0x0018, 0x1dd1: 0x0018,
-	0x1dd2: 0x0018, 0x1dd3: 0x0018, 0x1dd4: 0x0018, 0x1dd5: 0x0018, 0x1dd6: 0x0018, 0x1dd7: 0x0018,
-	0x1dd8: 0x0018, 0x1dd9: 0x0018, 0x1dda: 0x0018, 0x1ddb: 0x0018, 0x1ddc: 0x0018, 0x1ddd: 0x0018,
-	0x1dde: 0x0018, 0x1ddf: 0x0018, 0x1de0: 0x0018, 0x1de1: 0x0018, 0x1de2: 0x0018, 0x1de3: 0x0018,
-	0x1de4: 0x0018, 0x1de5: 0x0018, 0x1de6: 0x0018, 0x1de7: 0x0018, 0x1de8: 0x0018, 0x1de9: 0x0018,
-	0x1dea: 0xc1e1, 0x1deb: 0xc1f9, 0x1dec: 0xc211, 0x1ded: 0x0018, 0x1dee: 0x0018, 0x1def: 0x0018,
-	0x1df0: 0x0018, 0x1df1: 0x0018, 0x1df2: 0x0018, 0x1df3: 0x0018, 0x1df4: 0x0018, 0x1df5: 0x0018,
-	0x1df6: 0x0018, 0x1df7: 0x0018, 0x1df8: 0x0018, 0x1df9: 0x0018, 0x1dfa: 0x0018, 0x1dfb: 0x0018,
-	0x1dfc: 0x0018, 0x1dfd: 0x0018, 0x1dfe: 0x0018, 0x1dff: 0x0018,
+	0x1dc0: 0x2669, 0x1dc1: 0x2671, 0x1dc2: 0x2679, 0x1dc3: 0x8b55, 0x1dc4: 0x2681, 0x1dc5: 0x2689,
+	0x1dc6: 0x2691, 0x1dc7: 0x2699, 0x1dc8: 0x26a1, 0x1dc9: 0x26a9, 0x1dca: 0x26b1, 0x1dcb: 0x26b9,
+	0x1dcc: 0x26c1, 0x1dcd: 0x8b75, 0x1dce: 0x26c9, 0x1dcf: 0x26d1, 0x1dd0: 0x26d9, 0x1dd1: 0x26e1,
+	0x1dd2: 0x8b95, 0x1dd3: 0x26e9, 0x1dd4: 0x26f1, 0x1dd5: 0x2521, 0x1dd6: 0x8bb5, 0x1dd7: 0x26f9,
+	0x1dd8: 0x2701, 0x1dd9: 0x2709, 0x1dda: 0x2711, 0x1ddb: 0x2719, 0x1ddc: 0x8bd5, 0x1ddd: 0x2721,
+	0x1dde: 0x2729, 0x1ddf: 0x2731, 0x1de0: 0x2739, 0x1de1: 0x2741, 0x1de2: 0x25f9, 0x1de3: 0x2749,
+	0x1de4: 0x2751, 0x1de5: 0x2759, 0x1de6: 0x2761, 0x1de7: 0x2769, 0x1de8: 0x2771, 0x1de9: 0x2779,
+	0x1dea: 0x2781, 0x1deb: 0x2789, 0x1dec: 0x2791, 0x1ded: 0x2799, 0x1dee: 0x27a1, 0x1def: 0x27a9,
+	0x1df0: 0x27b1, 0x1df1: 0x27b9, 0x1df2: 0x27b9, 0x1df3: 0x27b9, 0x1df4: 0x8bf5, 0x1df5: 0x27c1,
+	0x1df6: 0x27c9, 0x1df7: 0x27d1, 0x1df8: 0x8c15, 0x1df9: 0x27d9, 0x1dfa: 0x27e1, 0x1dfb: 0x27e9,
+	0x1dfc: 0x27f1, 0x1dfd: 0x27f9, 0x1dfe: 0x2801, 0x1dff: 0x2809,
 	// Block 0x78, offset 0x1e00
-	0x1e00: 0xc241, 0x1e01: 0xc279, 0x1e02: 0xc2b1, 0x1e03: 0x0040, 0x1e04: 0x0040, 0x1e05: 0x0040,
-	0x1e06: 0x0040, 0x1e07: 0x0040, 0x1e08: 0x0040, 0x1e09: 0x0040, 0x1e0a: 0x0040, 0x1e0b: 0x0040,
-	0x1e0c: 0x0040, 0x1e0d: 0x0040, 0x1e0e: 0x0040, 0x1e0f: 0x0040, 0x1e10: 0xc2d1, 0x1e11: 0xc2f1,
-	0x1e12: 0xc311, 0x1e13: 0xc331, 0x1e14: 0xc351, 0x1e15: 0xc371, 0x1e16: 0xc391, 0x1e17: 0xc3b1,
-	0x1e18: 0xc3d1, 0x1e19: 0xc3f1, 0x1e1a: 0xc411, 0x1e1b: 0xc431, 0x1e1c: 0xc451, 0x1e1d: 0xc471,
-	0x1e1e: 0xc491, 0x1e1f: 0xc4b1, 0x1e20: 0xc4d1, 0x1e21: 0xc4f1, 0x1e22: 0xc511, 0x1e23: 0xc531,
-	0x1e24: 0xc551, 0x1e25: 0xc571, 0x1e26: 0xc591, 0x1e27: 0xc5b1, 0x1e28: 0xc5d1, 0x1e29: 0xc5f1,
-	0x1e2a: 0xc611, 0x1e2b: 0xc631, 0x1e2c: 0xc651, 0x1e2d: 0xc671, 0x1e2e: 0xc691, 0x1e2f: 0xc6b1,
-	0x1e30: 0xc6d1, 0x1e31: 0xc6f1, 0x1e32: 0xc711, 0x1e33: 0xc731, 0x1e34: 0xc751, 0x1e35: 0xc771,
-	0x1e36: 0xc791, 0x1e37: 0xc7b1, 0x1e38: 0xc7d1, 0x1e39: 0xc7f1, 0x1e3a: 0xc811, 0x1e3b: 0xc831,
-	0x1e3c: 0x0040, 0x1e3d: 0x0040, 0x1e3e: 0x0040, 0x1e3f: 0x0040,
+	0x1e00: 0x2811, 0x1e01: 0x2819, 0x1e02: 0x2821, 0x1e03: 0x2829, 0x1e04: 0x2831, 0x1e05: 0x2839,
+	0x1e06: 0x2839, 0x1e07: 0x2841, 0x1e08: 0x2849, 0x1e09: 0x2851, 0x1e0a: 0x2859, 0x1e0b: 0x2861,
+	0x1e0c: 0x2869, 0x1e0d: 0x2871, 0x1e0e: 0x2879, 0x1e0f: 0x2881, 0x1e10: 0x2889, 0x1e11: 0x2891,
+	0x1e12: 0x2899, 0x1e13: 0x28a1, 0x1e14: 0x28a9, 0x1e15: 0x28b1, 0x1e16: 0x28b9, 0x1e17: 0x28c1,
+	0x1e18: 0x28c9, 0x1e19: 0x8c35, 0x1e1a: 0x28d1, 0x1e1b: 0x28d9, 0x1e1c: 0x28e1, 0x1e1d: 0x24d9,
+	0x1e1e: 0x28e9, 0x1e1f: 0x28f1, 0x1e20: 0x8c55, 0x1e21: 0x8c75, 0x1e22: 0x28f9, 0x1e23: 0x2901,
+	0x1e24: 0x2909, 0x1e25: 0x2911, 0x1e26: 0x2919, 0x1e27: 0x2921, 0x1e28: 0x2040, 0x1e29: 0x2929,
+	0x1e2a: 0x2931, 0x1e2b: 0x2931, 0x1e2c: 0x8c95, 0x1e2d: 0x2939, 0x1e2e: 0x2941, 0x1e2f: 0x2949,
+	0x1e30: 0x2951, 0x1e31: 0x8cb5, 0x1e32: 0x2959, 0x1e33: 0x2961, 0x1e34: 0x2040, 0x1e35: 0x2969,
+	0x1e36: 0x2971, 0x1e37: 0x2979, 0x1e38: 0x2981, 0x1e39: 0x2989, 0x1e3a: 0x2991, 0x1e3b: 0x8cd5,
+	0x1e3c: 0x2999, 0x1e3d: 0x8cf5, 0x1e3e: 0x29a1, 0x1e3f: 0x29a9,
 	// Block 0x79, offset 0x1e40
-	0x1e40: 0xcb61, 0x1e41: 0xcb81, 0x1e42: 0xcba1, 0x1e43: 0x8b55, 0x1e44: 0xcbc1, 0x1e45: 0xcbe1,
-	0x1e46: 0xcc01, 0x1e47: 0xcc21, 0x1e48: 0xcc41, 0x1e49: 0xcc61, 0x1e4a: 0xcc81, 0x1e4b: 0xcca1,
-	0x1e4c: 0xccc1, 0x1e4d: 0x8b75, 0x1e4e: 0xcce1, 0x1e4f: 0xcd01, 0x1e50: 0xcd21, 0x1e51: 0xcd41,
-	0x1e52: 0x8b95, 0x1e53: 0xcd61, 0x1e54: 0xcd81, 0x1e55: 0xc491, 0x1e56: 0x8bb5, 0x1e57: 0xcda1,
-	0x1e58: 0xcdc1, 0x1e59: 0xcde1, 0x1e5a: 0xce01, 0x1e5b: 0xce21, 0x1e5c: 0x8bd5, 0x1e5d: 0xce41,
-	0x1e5e: 0xce61, 0x1e5f: 0xce81, 0x1e60: 0xcea1, 0x1e61: 0xcec1, 0x1e62: 0xc7f1, 0x1e63: 0xcee1,
-	0x1e64: 0xcf01, 0x1e65: 0xcf21, 0x1e66: 0xcf41, 0x1e67: 0xcf61, 0x1e68: 0xcf81, 0x1e69: 0xcfa1,
-	0x1e6a: 0xcfc1, 0x1e6b: 0xcfe1, 0x1e6c: 0xd001, 0x1e6d: 0xd021, 0x1e6e: 0xd041, 0x1e6f: 0xd061,
-	0x1e70: 0xd081, 0x1e71: 0xd0a1, 0x1e72: 0xd0a1, 0x1e73: 0xd0a1, 0x1e74: 0x8bf5, 0x1e75: 0xd0c1,
-	0x1e76: 0xd0e1, 0x1e77: 0xd101, 0x1e78: 0x8c15, 0x1e79: 0xd121, 0x1e7a: 0xd141, 0x1e7b: 0xd161,
-	0x1e7c: 0xd181, 0x1e7d: 0xd1a1, 0x1e7e: 0xd1c1, 0x1e7f: 0xd1e1,
+	0x1e40: 0x29b1, 0x1e41: 0x29b9, 0x1e42: 0x29c1, 0x1e43: 0x29c9, 0x1e44: 0x29d1, 0x1e45: 0x29d9,
+	0x1e46: 0x29e1, 0x1e47: 0x29e9, 0x1e48: 0x29f1, 0x1e49: 0x8d15, 0x1e4a: 0x29f9, 0x1e4b: 0x2a01,
+	0x1e4c: 0x2a09, 0x1e4d: 0x2a11, 0x1e4e: 0x2a19, 0x1e4f: 0x8d35, 0x1e50: 0x2a21, 0x1e51: 0x8d55,
+	0x1e52: 0x8d75, 0x1e53: 0x2a29, 0x1e54: 0x2a31, 0x1e55: 0x2a31, 0x1e56: 0x2a39, 0x1e57: 0x8d95,
+	0x1e58: 0x8db5, 0x1e59: 0x2a41, 0x1e5a: 0x2a49, 0x1e5b: 0x2a51, 0x1e5c: 0x2a59, 0x1e5d: 0x2a61,
+	0x1e5e: 0x2a69, 0x1e5f: 0x2a71, 0x1e60: 0x2a79, 0x1e61: 0x2a81, 0x1e62: 0x2a89, 0x1e63: 0x2a91,
+	0x1e64: 0x8dd5, 0x1e65: 0x2a99, 0x1e66: 0x2aa1, 0x1e67: 0x2aa9, 0x1e68: 0x2ab1, 0x1e69: 0x2aa9,
+	0x1e6a: 0x2ab9, 0x1e6b: 0x2ac1, 0x1e6c: 0x2ac9, 0x1e6d: 0x2ad1, 0x1e6e: 0x2ad9, 0x1e6f: 0x2ae1,
+	0x1e70: 0x2ae9, 0x1e71: 0x2af1, 0x1e72: 0x2af9, 0x1e73: 0x2b01, 0x1e74: 0x2b09, 0x1e75: 0x2b11,
+	0x1e76: 0x2b19, 0x1e77: 0x2b21, 0x1e78: 0x8df5, 0x1e79: 0x2b29, 0x1e7a: 0x2b31, 0x1e7b: 0x2b39,
+	0x1e7c: 0x2b41, 0x1e7d: 0x2b49, 0x1e7e: 0x8e15, 0x1e7f: 0x2b51,
 	// Block 0x7a, offset 0x1e80
-	0x1e80: 0xd201, 0x1e81: 0xd221, 0x1e82: 0xd241, 0x1e83: 0xd261, 0x1e84: 0xd281, 0x1e85: 0xd2a1,
-	0x1e86: 0xd2a1, 0x1e87: 0xd2c1, 0x1e88: 0xd2e1, 0x1e89: 0xd301, 0x1e8a: 0xd321, 0x1e8b: 0xd341,
-	0x1e8c: 0xd361, 0x1e8d: 0xd381, 0x1e8e: 0xd3a1, 0x1e8f: 0xd3c1, 0x1e90: 0xd3e1, 0x1e91: 0xd401,
-	0x1e92: 0xd421, 0x1e93: 0xd441, 0x1e94: 0xd461, 0x1e95: 0xd481, 0x1e96: 0xd4a1, 0x1e97: 0xd4c1,
-	0x1e98: 0xd4e1, 0x1e99: 0x8c35, 0x1e9a: 0xd501, 0x1e9b: 0xd521, 0x1e9c: 0xd541, 0x1e9d: 0xc371,
-	0x1e9e: 0xd561, 0x1e9f: 0xd581, 0x1ea0: 0x8c55, 0x1ea1: 0x8c75, 0x1ea2: 0xd5a1, 0x1ea3: 0xd5c1,
-	0x1ea4: 0xd5e1, 0x1ea5: 0xd601, 0x1ea6: 0xd621, 0x1ea7: 0xd641, 0x1ea8: 0x2040, 0x1ea9: 0xd661,
-	0x1eaa: 0xd681, 0x1eab: 0xd681, 0x1eac: 0x8c95, 0x1ead: 0xd6a1, 0x1eae: 0xd6c1, 0x1eaf: 0xd6e1,
-	0x1eb0: 0xd701, 0x1eb1: 0x8cb5, 0x1eb2: 0xd721, 0x1eb3: 0xd741, 0x1eb4: 0x2040, 0x1eb5: 0xd761,
-	0x1eb6: 0xd781, 0x1eb7: 0xd7a1, 0x1eb8: 0xd7c1, 0x1eb9: 0xd7e1, 0x1eba: 0xd801, 0x1ebb: 0x8cd5,
-	0x1ebc: 0xd821, 0x1ebd: 0x8cf5, 0x1ebe: 0xd841, 0x1ebf: 0xd861,
+	0x1e80: 0x2b59, 0x1e81: 0x2b61, 0x1e82: 0x2b69, 0x1e83: 0x2b71, 0x1e84: 0x2b79, 0x1e85: 0x2b81,
+	0x1e86: 0x2b89, 0x1e87: 0x2b91, 0x1e88: 0x2b99, 0x1e89: 0x2ba1, 0x1e8a: 0x8e35, 0x1e8b: 0x2ba9,
+	0x1e8c: 0x2bb1, 0x1e8d: 0x2bb9, 0x1e8e: 0x2bc1, 0x1e8f: 0x2bc9, 0x1e90: 0x2bd1, 0x1e91: 0x2bd9,
+	0x1e92: 0x2be1, 0x1e93: 0x2be9, 0x1e94: 0x2bf1, 0x1e95: 0x2bf9, 0x1e96: 0x2c01, 0x1e97: 0x2c09,
+	0x1e98: 0x2c11, 0x1e99: 0x2c19, 0x1e9a: 0x2c21, 0x1e9b: 0x2c29, 0x1e9c: 0x2c31, 0x1e9d: 0x8e55,
+	0x1e9e: 0x2c39, 0x1e9f: 0x2c41, 0x1ea0: 0x2c49, 0x1ea1: 0x2c51, 0x1ea2: 0x2c59, 0x1ea3: 0x8e75,
+	0x1ea4: 0x2c61, 0x1ea5: 0x2c69, 0x1ea6: 0x2c71, 0x1ea7: 0x2c79, 0x1ea8: 0x2c81, 0x1ea9: 0x2c89,
+	0x1eaa: 0x2c91, 0x1eab: 0x2c99, 0x1eac: 0x7f0d, 0x1ead: 0x2ca1, 0x1eae: 0x2ca9, 0x1eaf: 0x2cb1,
+	0x1eb0: 0x8e95, 0x1eb1: 0x2cb9, 0x1eb2: 0x2cc1, 0x1eb3: 0x2cc9, 0x1eb4: 0x2cd1, 0x1eb5: 0x2cd9,
+	0x1eb6: 0x2ce1, 0x1eb7: 0x8eb5, 0x1eb8: 0x8ed5, 0x1eb9: 0x8ef5, 0x1eba: 0x2ce9, 0x1ebb: 0x8f15,
+	0x1ebc: 0x2cf1, 0x1ebd: 0x2cf9, 0x1ebe: 0x2d01, 0x1ebf: 0x2d09,
 	// Block 0x7b, offset 0x1ec0
-	0x1ec0: 0xd881, 0x1ec1: 0xd8a1, 0x1ec2: 0xd8c1, 0x1ec3: 0xd8e1, 0x1ec4: 0xd901, 0x1ec5: 0xd921,
-	0x1ec6: 0xd941, 0x1ec7: 0xd961, 0x1ec8: 0xd981, 0x1ec9: 0x8d15, 0x1eca: 0xd9a1, 0x1ecb: 0xd9c1,
-	0x1ecc: 0xd9e1, 0x1ecd: 0xda01, 0x1ece: 0xda21, 0x1ecf: 0x8d35, 0x1ed0: 0xda41, 0x1ed1: 0x8d55,
-	0x1ed2: 0x8d75, 0x1ed3: 0xda61, 0x1ed4: 0xda81, 0x1ed5: 0xda81, 0x1ed6: 0xdaa1, 0x1ed7: 0x8d95,
-	0x1ed8: 0x8db5, 0x1ed9: 0xdac1, 0x1eda: 0xdae1, 0x1edb: 0xdb01, 0x1edc: 0xdb21, 0x1edd: 0xdb41,
-	0x1ede: 0xdb61, 0x1edf: 0xdb81, 0x1ee0: 0xdba1, 0x1ee1: 0xdbc1, 0x1ee2: 0xdbe1, 0x1ee3: 0xdc01,
-	0x1ee4: 0x8dd5, 0x1ee5: 0xdc21, 0x1ee6: 0xdc41, 0x1ee7: 0xdc61, 0x1ee8: 0xdc81, 0x1ee9: 0xdc61,
-	0x1eea: 0xdca1, 0x1eeb: 0xdcc1, 0x1eec: 0xdce1, 0x1eed: 0xdd01, 0x1eee: 0xdd21, 0x1eef: 0xdd41,
-	0x1ef0: 0xdd61, 0x1ef1: 0xdd81, 0x1ef2: 0xdda1, 0x1ef3: 0xddc1, 0x1ef4: 0xdde1, 0x1ef5: 0xde01,
-	0x1ef6: 0xde21, 0x1ef7: 0xde41, 0x1ef8: 0x8df5, 0x1ef9: 0xde61, 0x1efa: 0xde81, 0x1efb: 0xdea1,
-	0x1efc: 0xdec1, 0x1efd: 0xdee1, 0x1efe: 0x8e15, 0x1eff: 0xdf01,
+	0x1ec0: 0x2d11, 0x1ec1: 0x2d19, 0x1ec2: 0x2d21, 0x1ec3: 0x2d29, 0x1ec4: 0x2d31, 0x1ec5: 0x2d39,
+	0x1ec6: 0x8f35, 0x1ec7: 0x2d41, 0x1ec8: 0x2d49, 0x1ec9: 0x2d51, 0x1eca: 0x2d59, 0x1ecb: 0x2d61,
+	0x1ecc: 0x2d69, 0x1ecd: 0x8f55, 0x1ece: 0x2d71, 0x1ecf: 0x2d79, 0x1ed0: 0x8f75, 0x1ed1: 0x8f95,
+	0x1ed2: 0x2d81, 0x1ed3: 0x2d89, 0x1ed4: 0x2d91, 0x1ed5: 0x2d99, 0x1ed6: 0x2da1, 0x1ed7: 0x2da9,
+	0x1ed8: 0x2db1, 0x1ed9: 0x2db9, 0x1eda: 0x2dc1, 0x1edb: 0x8fb5, 0x1edc: 0x2dc9, 0x1edd: 0x8fd5,
+	0x1ede: 0x2dd1, 0x1edf: 0x2040, 0x1ee0: 0x2dd9, 0x1ee1: 0x2de1, 0x1ee2: 0x2de9, 0x1ee3: 0x8ff5,
+	0x1ee4: 0x2df1, 0x1ee5: 0x2df9, 0x1ee6: 0x9015, 0x1ee7: 0x9035, 0x1ee8: 0x2e01, 0x1ee9: 0x2e09,
+	0x1eea: 0x2e11, 0x1eeb: 0x2e19, 0x1eec: 0x2e21, 0x1eed: 0x2e21, 0x1eee: 0x2e29, 0x1eef: 0x2e31,
+	0x1ef0: 0x2e39, 0x1ef1: 0x2e41, 0x1ef2: 0x2e49, 0x1ef3: 0x2e51, 0x1ef4: 0x2e59, 0x1ef5: 0x9055,
+	0x1ef6: 0x2e61, 0x1ef7: 0x9075, 0x1ef8: 0x2e69, 0x1ef9: 0x9095, 0x1efa: 0x2e71, 0x1efb: 0x90b5,
+	0x1efc: 0x90d5, 0x1efd: 0x90f5, 0x1efe: 0x2e79, 0x1eff: 0x2e81,
 	// Block 0x7c, offset 0x1f00
-	0x1f00: 0xe601, 0x1f01: 0xe621, 0x1f02: 0xe641, 0x1f03: 0xe661, 0x1f04: 0xe681, 0x1f05: 0xe6a1,
-	0x1f06: 0x8f35, 0x1f07: 0xe6c1, 0x1f08: 0xe6e1, 0x1f09: 0xe701, 0x1f0a: 0xe721, 0x1f0b: 0xe741,
-	0x1f0c: 0xe761, 0x1f0d: 0x8f55, 0x1f0e: 0xe781, 0x1f0f: 0xe7a1, 0x1f10: 0x8f75, 0x1f11: 0x8f95,
-	0x1f12: 0xe7c1, 0x1f13: 0xe7e1, 0x1f14: 0xe801, 0x1f15: 0xe821, 0x1f16: 0xe841, 0x1f17: 0xe861,
-	0x1f18: 0xe881, 0x1f19: 0xe8a1, 0x1f1a: 0xe8c1, 0x1f1b: 0x8fb5, 0x1f1c: 0xe8e1, 0x1f1d: 0x8fd5,
-	0x1f1e: 0xe901, 0x1f1f: 0x2040, 0x1f20: 0xe921, 0x1f21: 0xe941, 0x1f22: 0xe961, 0x1f23: 0x8ff5,
-	0x1f24: 0xe981, 0x1f25: 0xe9a1, 0x1f26: 0x9015, 0x1f27: 0x9035, 0x1f28: 0xe9c1, 0x1f29: 0xe9e1,
-	0x1f2a: 0xea01, 0x1f2b: 0xea21, 0x1f2c: 0xea41, 0x1f2d: 0xea41, 0x1f2e: 0xea61, 0x1f2f: 0xea81,
-	0x1f30: 0xeaa1, 0x1f31: 0xeac1, 0x1f32: 0xeae1, 0x1f33: 0xeb01, 0x1f34: 0xeb21, 0x1f35: 0x9055,
-	0x1f36: 0xeb41, 0x1f37: 0x9075, 0x1f38: 0xeb61, 0x1f39: 0x9095, 0x1f3a: 0xeb81, 0x1f3b: 0x90b5,
-	0x1f3c: 0x90d5, 0x1f3d: 0x90f5, 0x1f3e: 0xeba1, 0x1f3f: 0xebc1,
+	0x1f00: 0x2e89, 0x1f01: 0x9115, 0x1f02: 0x9135, 0x1f03: 0x9155, 0x1f04: 0x9175, 0x1f05: 0x2e91,
+	0x1f06: 0x2e99, 0x1f07: 0x2e99, 0x1f08: 0x2ea1, 0x1f09: 0x2ea9, 0x1f0a: 0x2eb1, 0x1f0b: 0x2eb9,
+	0x1f0c: 0x2ec1, 0x1f0d: 0x9195, 0x1f0e: 0x2ec9, 0x1f0f: 0x2ed1, 0x1f10: 0x2ed9, 0x1f11: 0x2ee1,
+	0x1f12: 0x91b5, 0x1f13: 0x2ee9, 0x1f14: 0x91d5, 0x1f15: 0x91f5, 0x1f16: 0x2ef1, 0x1f17: 0x2ef9,
+	0x1f18: 0x2f01, 0x1f19: 0x2f09, 0x1f1a: 0x2f11, 0x1f1b: 0x2f19, 0x1f1c: 0x9215, 0x1f1d: 0x9235,
+	0x1f1e: 0x9255, 0x1f1f: 0x2040, 0x1f20: 0x2f21, 0x1f21: 0x9275, 0x1f22: 0x2f29, 0x1f23: 0x2f31,
+	0x1f24: 0x2f39, 0x1f25: 0x9295, 0x1f26: 0x2f41, 0x1f27: 0x2f49, 0x1f28: 0x2f51, 0x1f29: 0x2f59,
+	0x1f2a: 0x2f61, 0x1f2b: 0x92b5, 0x1f2c: 0x2f69, 0x1f2d: 0x2f71, 0x1f2e: 0x2f79, 0x1f2f: 0x2f81,
+	0x1f30: 0x2f89, 0x1f31: 0x2f91, 0x1f32: 0x92d5, 0x1f33: 0x92f5, 0x1f34: 0x2f99, 0x1f35: 0x9315,
+	0x1f36: 0x2fa1, 0x1f37: 0x9335, 0x1f38: 0x2fa9, 0x1f39: 0x2fb1, 0x1f3a: 0x2fb9, 0x1f3b: 0x9355,
+	0x1f3c: 0x9375, 0x1f3d: 0x2fc1, 0x1f3e: 0x9395, 0x1f3f: 0x2fc9,
 	// Block 0x7d, offset 0x1f40
-	0x1f40: 0xebe1, 0x1f41: 0x9115, 0x1f42: 0x9135, 0x1f43: 0x9155, 0x1f44: 0x9175, 0x1f45: 0xec01,
-	0x1f46: 0xec21, 0x1f47: 0xec21, 0x1f48: 0xec41, 0x1f49: 0xec61, 0x1f4a: 0xec81, 0x1f4b: 0xeca1,
-	0x1f4c: 0xecc1, 0x1f4d: 0x9195, 0x1f4e: 0xece1, 0x1f4f: 0xed01, 0x1f50: 0xed21, 0x1f51: 0xed41,
-	0x1f52: 0x91b5, 0x1f53: 0xed61, 0x1f54: 0x91d5, 0x1f55: 0x91f5, 0x1f56: 0xed81, 0x1f57: 0xeda1,
-	0x1f58: 0xedc1, 0x1f59: 0xede1, 0x1f5a: 0xee01, 0x1f5b: 0xee21, 0x1f5c: 0x9215, 0x1f5d: 0x9235,
-	0x1f5e: 0x9255, 0x1f5f: 0x2040, 0x1f60: 0xee41, 0x1f61: 0x9275, 0x1f62: 0xee61, 0x1f63: 0xee81,
-	0x1f64: 0xeea1, 0x1f65: 0x9295, 0x1f66: 0xeec1, 0x1f67: 0xeee1, 0x1f68: 0xef01, 0x1f69: 0xef21,
-	0x1f6a: 0xef41, 0x1f6b: 0x92b5, 0x1f6c: 0xef61, 0x1f6d: 0xef81, 0x1f6e: 0xefa1, 0x1f6f: 0xefc1,
-	0x1f70: 0xefe1, 0x1f71: 0xf001, 0x1f72: 0x92d5, 0x1f73: 0x92f5, 0x1f74: 0xf021, 0x1f75: 0x9315,
-	0x1f76: 0xf041, 0x1f77: 0x9335, 0x1f78: 0xf061, 0x1f79: 0xf081, 0x1f7a: 0xf0a1, 0x1f7b: 0x9355,
-	0x1f7c: 0x9375, 0x1f7d: 0xf0c1, 0x1f7e: 0x9395, 0x1f7f: 0xf0e1,
+	0x1f40: 0x93b5, 0x1f41: 0x2fd1, 0x1f42: 0x2fd9, 0x1f43: 0x2fe1, 0x1f44: 0x2fe9, 0x1f45: 0x2ff1,
+	0x1f46: 0x2ff9, 0x1f47: 0x93d5, 0x1f48: 0x93f5, 0x1f49: 0x9415, 0x1f4a: 0x9435, 0x1f4b: 0x2a29,
+	0x1f4c: 0x3001, 0x1f4d: 0x3009, 0x1f4e: 0x3011, 0x1f4f: 0x3019, 0x1f50: 0x3021, 0x1f51: 0x3029,
+	0x1f52: 0x3031, 0x1f53: 0x3039, 0x1f54: 0x3041, 0x1f55: 0x3049, 0x1f56: 0x3051, 0x1f57: 0x9455,
+	0x1f58: 0x3059, 0x1f59: 0x3061, 0x1f5a: 0x3069, 0x1f5b: 0x3071, 0x1f5c: 0x3079, 0x1f5d: 0x3081,
+	0x1f5e: 0x3089, 0x1f5f: 0x3091, 0x1f60: 0x3099, 0x1f61: 0x30a1, 0x1f62: 0x30a9, 0x1f63: 0x30b1,
+	0x1f64: 0x9475, 0x1f65: 0x9495, 0x1f66: 0x94b5, 0x1f67: 0x30b9, 0x1f68: 0x30c1, 0x1f69: 0x30c9,
+	0x1f6a: 0x30d1, 0x1f6b: 0x94d5, 0x1f6c: 0x30d9, 0x1f6d: 0x94f5, 0x1f6e: 0x30e1, 0x1f6f: 0x30e9,
+	0x1f70: 0x9515, 0x1f71: 0x9535, 0x1f72: 0x30f1, 0x1f73: 0x30f9, 0x1f74: 0x3101, 0x1f75: 0x3109,
+	0x1f76: 0x3111, 0x1f77: 0x3119, 0x1f78: 0x3121, 0x1f79: 0x3129, 0x1f7a: 0x3131, 0x1f7b: 0x3139,
+	0x1f7c: 0x3141, 0x1f7d: 0x3149, 0x1f7e: 0x3151, 0x1f7f: 0x2040,
 	// Block 0x7e, offset 0x1f80
-	0x1f80: 0xf721, 0x1f81: 0xf741, 0x1f82: 0xf761, 0x1f83: 0xf781, 0x1f84: 0xf7a1, 0x1f85: 0x9555,
-	0x1f86: 0xf7c1, 0x1f87: 0xf7e1, 0x1f88: 0xf801, 0x1f89: 0xf821, 0x1f8a: 0xf841, 0x1f8b: 0x9575,
-	0x1f8c: 0x9595, 0x1f8d: 0xf861, 0x1f8e: 0xf881, 0x1f8f: 0xf8a1, 0x1f90: 0xf8c1, 0x1f91: 0xf8e1,
-	0x1f92: 0xf901, 0x1f93: 0x95b5, 0x1f94: 0xf921, 0x1f95: 0xf941, 0x1f96: 0xf961, 0x1f97: 0xf981,
-	0x1f98: 0x95d5, 0x1f99: 0x95f5, 0x1f9a: 0xf9a1, 0x1f9b: 0xf9c1, 0x1f9c: 0xf9e1, 0x1f9d: 0x9615,
-	0x1f9e: 0xfa01, 0x1f9f: 0xfa21, 0x1fa0: 0x684d, 0x1fa1: 0x9635, 0x1fa2: 0xfa41, 0x1fa3: 0xfa61,
-	0x1fa4: 0xfa81, 0x1fa5: 0x9655, 0x1fa6: 0xfaa1, 0x1fa7: 0xfac1, 0x1fa8: 0xfae1, 0x1fa9: 0xfb01,
-	0x1faa: 0xfb21, 0x1fab: 0xfb41, 0x1fac: 0xfb61, 0x1fad: 0x9675, 0x1fae: 0xfb81, 0x1faf: 0xfba1,
-	0x1fb0: 0xfbc1, 0x1fb1: 0x9695, 0x1fb2: 0xfbe1, 0x1fb3: 0xfc01, 0x1fb4: 0xfc21, 0x1fb5: 0xfc41,
-	0x1fb6: 0x7b6d, 0x1fb7: 0x96b5, 0x1fb8: 0xfc61, 0x1fb9: 0xfc81, 0x1fba: 0xfca1, 0x1fbb: 0x96d5,
-	0x1fbc: 0xfcc1, 0x1fbd: 0x96f5, 0x1fbe: 0xfce1, 0x1fbf: 0xfce1,
+	0x1f80: 0x3159, 0x1f81: 0x3161, 0x1f82: 0x3169, 0x1f83: 0x3171, 0x1f84: 0x3179, 0x1f85: 0x9555,
+	0x1f86: 0x3181, 0x1f87: 0x3189, 0x1f88: 0x3191, 0x1f89: 0x3199, 0x1f8a: 0x31a1, 0x1f8b: 0x9575,
+	0x1f8c: 0x9595, 0x1f8d: 0x31a9, 0x1f8e: 0x31b1, 0x1f8f: 0x31b9, 0x1f90: 0x31c1, 0x1f91: 0x31c9,
+	0x1f92: 0x31d1, 0x1f93: 0x95b5, 0x1f94: 0x31d9, 0x1f95: 0x31e1, 0x1f96: 0x31e9, 0x1f97: 0x31f1,
+	0x1f98: 0x95d5, 0x1f99: 0x95f5, 0x1f9a: 0x31f9, 0x1f9b: 0x3201, 0x1f9c: 0x3209, 0x1f9d: 0x9615,
+	0x1f9e: 0x3211, 0x1f9f: 0x3219, 0x1fa0: 0x684d, 0x1fa1: 0x9635, 0x1fa2: 0x3221, 0x1fa3: 0x3229,
+	0x1fa4: 0x3231, 0x1fa5: 0x9655, 0x1fa6: 0x3239, 0x1fa7: 0x3241, 0x1fa8: 0x3249, 0x1fa9: 0x3251,
+	0x1faa: 0x3259, 0x1fab: 0x3261, 0x1fac: 0x3269, 0x1fad: 0x9675, 0x1fae: 0x3271, 0x1faf: 0x3279,
+	0x1fb0: 0x3281, 0x1fb1: 0x9695, 0x1fb2: 0x3289, 0x1fb3: 0x3291, 0x1fb4: 0x3299, 0x1fb5: 0x32a1,
+	0x1fb6: 0x7b6d, 0x1fb7: 0x96b5, 0x1fb8: 0x32a9, 0x1fb9: 0x32b1, 0x1fba: 0x32b9, 0x1fbb: 0x96d5,
+	0x1fbc: 0x32c1, 0x1fbd: 0x96f5, 0x1fbe: 0x32c9, 0x1fbf: 0x32c9,
 	// Block 0x7f, offset 0x1fc0
-	0x1fc0: 0xfd01, 0x1fc1: 0x9715, 0x1fc2: 0xfd21, 0x1fc3: 0xfd41, 0x1fc4: 0xfd61, 0x1fc5: 0xfd81,
-	0x1fc6: 0xfda1, 0x1fc7: 0xfdc1, 0x1fc8: 0xfde1, 0x1fc9: 0x9735, 0x1fca: 0xfe01, 0x1fcb: 0xfe21,
-	0x1fcc: 0xfe41, 0x1fcd: 0xfe61, 0x1fce: 0xfe81, 0x1fcf: 0xfea1, 0x1fd0: 0x9755, 0x1fd1: 0xfec1,
-	0x1fd2: 0x9775, 0x1fd3: 0x9795, 0x1fd4: 0x97b5, 0x1fd5: 0xfee1, 0x1fd6: 0xff01, 0x1fd7: 0xff21,
-	0x1fd8: 0xff41, 0x1fd9: 0xff61, 0x1fda: 0xff81, 0x1fdb: 0xffa1, 0x1fdc: 0xffc1, 0x1fdd: 0x97d5,
+	0x1fc0: 0x32d1, 0x1fc1: 0x9715, 0x1fc2: 0x32d9, 0x1fc3: 0x32e1, 0x1fc4: 0x32e9, 0x1fc5: 0x32f1,
+	0x1fc6: 0x32f9, 0x1fc7: 0x3301, 0x1fc8: 0x3309, 0x1fc9: 0x9735, 0x1fca: 0x3311, 0x1fcb: 0x3319,
+	0x1fcc: 0x3321, 0x1fcd: 0x3329, 0x1fce: 0x3331, 0x1fcf: 0x3339, 0x1fd0: 0x9755, 0x1fd1: 0x3341,
+	0x1fd2: 0x9775, 0x1fd3: 0x9795, 0x1fd4: 0x97b5, 0x1fd5: 0x3349, 0x1fd6: 0x3351, 0x1fd7: 0x3359,
+	0x1fd8: 0x3361, 0x1fd9: 0x3369, 0x1fda: 0x3371, 0x1fdb: 0x3379, 0x1fdc: 0x3381, 0x1fdd: 0x97d5,
 	0x1fde: 0x0040, 0x1fdf: 0x0040, 0x1fe0: 0x0040, 0x1fe1: 0x0040, 0x1fe2: 0x0040, 0x1fe3: 0x0040,
 	0x1fe4: 0x0040, 0x1fe5: 0x0040, 0x1fe6: 0x0040, 0x1fe7: 0x0040, 0x1fe8: 0x0040, 0x1fe9: 0x0040,
 	0x1fea: 0x0040, 0x1feb: 0x0040, 0x1fec: 0x0040, 0x1fed: 0x0040, 0x1fee: 0x0040, 0x1fef: 0x0040,
@@ -2134,7 +2277,7 @@ var idnaIndex = [2368]uint16{
 	0x1b8: 0xd6, 0x1b9: 0xd7, 0x1ba: 0xd8, 0x1bb: 0xd9, 0x1bc: 0xda, 0x1bd: 0xdb, 0x1be: 0xdc, 0x1bf: 0x37,
 	// Block 0x7, offset 0x1c0
 	0x1c0: 0x38, 0x1c1: 0xdd, 0x1c2: 0xde, 0x1c3: 0xdf, 0x1c4: 0xe0, 0x1c5: 0x39, 0x1c6: 0x3a, 0x1c7: 0xe1,
-	0x1c8: 0xe2, 0x1c9: 0x3b, 0x1ca: 0x3c, 0x1cb: 0x3d, 0x1cc: 0x3e, 0x1cd: 0x3f, 0x1ce: 0x40, 0x1cf: 0x41,
+	0x1c8: 0xe2, 0x1c9: 0x3b, 0x1ca: 0x3c, 0x1cb: 0x3d, 0x1cc: 0xe3, 0x1cd: 0xe4, 0x1ce: 0x3e, 0x1cf: 0x3f,
 	0x1d0: 0xa0, 0x1d1: 0xa0, 0x1d2: 0xa0, 0x1d3: 0xa0, 0x1d4: 0xa0, 0x1d5: 0xa0, 0x1d6: 0xa0, 0x1d7: 0xa0,
 	0x1d8: 0xa0, 0x1d9: 0xa0, 0x1da: 0xa0, 0x1db: 0xa0, 0x1dc: 0xa0, 0x1dd: 0xa0, 0x1de: 0xa0, 0x1df: 0xa0,
 	0x1e0: 0xa0, 0x1e1: 0xa0, 0x1e2: 0xa0, 0x1e3: 0xa0, 0x1e4: 0xa0, 0x1e5: 0xa0, 0x1e6: 0xa0, 0x1e7: 0xa0,
@@ -2167,143 +2310,143 @@ var idnaIndex = [2368]uint16{
 	0x2a0: 0xa0, 0x2a1: 0xa0, 0x2a2: 0xa0, 0x2a3: 0xa0, 0x2a4: 0xa0, 0x2a5: 0xa0, 0x2a6: 0xa0, 0x2a7: 0xa0,
 	0x2a8: 0xa0, 0x2a9: 0xa0, 0x2aa: 0xa0, 0x2ab: 0xa0, 0x2ac: 0xa0, 0x2ad: 0xa0, 0x2ae: 0xa0, 0x2af: 0xa0,
 	0x2b0: 0xa0, 0x2b1: 0xa0, 0x2b2: 0xa0, 0x2b3: 0xa0, 0x2b4: 0xa0, 0x2b5: 0xa0, 0x2b6: 0xa0, 0x2b7: 0xa0,
-	0x2b8: 0xa0, 0x2b9: 0xa0, 0x2ba: 0xa0, 0x2bb: 0xa0, 0x2bc: 0xa0, 0x2bd: 0xa0, 0x2be: 0xa0, 0x2bf: 0xe3,
+	0x2b8: 0xa0, 0x2b9: 0xa0, 0x2ba: 0xa0, 0x2bb: 0xa0, 0x2bc: 0xa0, 0x2bd: 0xa0, 0x2be: 0xa0, 0x2bf: 0xe5,
 	// Block 0xb, offset 0x2c0
 	0x2c0: 0xa0, 0x2c1: 0xa0, 0x2c2: 0xa0, 0x2c3: 0xa0, 0x2c4: 0xa0, 0x2c5: 0xa0, 0x2c6: 0xa0, 0x2c7: 0xa0,
 	0x2c8: 0xa0, 0x2c9: 0xa0, 0x2ca: 0xa0, 0x2cb: 0xa0, 0x2cc: 0xa0, 0x2cd: 0xa0, 0x2ce: 0xa0, 0x2cf: 0xa0,
-	0x2d0: 0xa0, 0x2d1: 0xa0, 0x2d2: 0xe4, 0x2d3: 0xe5, 0x2d4: 0xa0, 0x2d5: 0xa0, 0x2d6: 0xa0, 0x2d7: 0xa0,
-	0x2d8: 0xe6, 0x2d9: 0x42, 0x2da: 0x43, 0x2db: 0xe7, 0x2dc: 0x44, 0x2dd: 0x45, 0x2de: 0x46, 0x2df: 0xe8,
-	0x2e0: 0xe9, 0x2e1: 0xea, 0x2e2: 0xeb, 0x2e3: 0xec, 0x2e4: 0xed, 0x2e5: 0xee, 0x2e6: 0xef, 0x2e7: 0xf0,
-	0x2e8: 0xf1, 0x2e9: 0xf2, 0x2ea: 0xf3, 0x2eb: 0xf4, 0x2ec: 0xf5, 0x2ed: 0xf6, 0x2ee: 0xf7, 0x2ef: 0xf8,
+	0x2d0: 0xa0, 0x2d1: 0xa0, 0x2d2: 0xe6, 0x2d3: 0xe7, 0x2d4: 0xa0, 0x2d5: 0xa0, 0x2d6: 0xa0, 0x2d7: 0xa0,
+	0x2d8: 0xe8, 0x2d9: 0x40, 0x2da: 0x41, 0x2db: 0xe9, 0x2dc: 0x42, 0x2dd: 0x43, 0x2de: 0x44, 0x2df: 0xea,
+	0x2e0: 0xeb, 0x2e1: 0xec, 0x2e2: 0xed, 0x2e3: 0xee, 0x2e4: 0xef, 0x2e5: 0xf0, 0x2e6: 0xf1, 0x2e7: 0xf2,
+	0x2e8: 0xf3, 0x2e9: 0xf4, 0x2ea: 0xf5, 0x2eb: 0xf6, 0x2ec: 0xf7, 0x2ed: 0xf8, 0x2ee: 0xf9, 0x2ef: 0xfa,
 	0x2f0: 0xa0, 0x2f1: 0xa0, 0x2f2: 0xa0, 0x2f3: 0xa0, 0x2f4: 0xa0, 0x2f5: 0xa0, 0x2f6: 0xa0, 0x2f7: 0xa0,
 	0x2f8: 0xa0, 0x2f9: 0xa0, 0x2fa: 0xa0, 0x2fb: 0xa0, 0x2fc: 0xa0, 0x2fd: 0xa0, 0x2fe: 0xa0, 0x2ff: 0xa0,
 	// Block 0xc, offset 0x300
 	0x300: 0xa0, 0x301: 0xa0, 0x302: 0xa0, 0x303: 0xa0, 0x304: 0xa0, 0x305: 0xa0, 0x306: 0xa0, 0x307: 0xa0,
 	0x308: 0xa0, 0x309: 0xa0, 0x30a: 0xa0, 0x30b: 0xa0, 0x30c: 0xa0, 0x30d: 0xa0, 0x30e: 0xa0, 0x30f: 0xa0,
 	0x310: 0xa0, 0x311: 0xa0, 0x312: 0xa0, 0x313: 0xa0, 0x314: 0xa0, 0x315: 0xa0, 0x316: 0xa0, 0x317: 0xa0,
-	0x318: 0xa0, 0x319: 0xa0, 0x31a: 0xa0, 0x31b: 0xa0, 0x31c: 0xa0, 0x31d: 0xa0, 0x31e: 0xf9, 0x31f: 0xfa,
+	0x318: 0xa0, 0x319: 0xa0, 0x31a: 0xa0, 0x31b: 0xa0, 0x31c: 0xa0, 0x31d: 0xa0, 0x31e: 0xfb, 0x31f: 0xfc,
 	// Block 0xd, offset 0x340
-	0x340: 0xfb, 0x341: 0xfb, 0x342: 0xfb, 0x343: 0xfb, 0x344: 0xfb, 0x345: 0xfb, 0x346: 0xfb, 0x347: 0xfb,
-	0x348: 0xfb, 0x349: 0xfb, 0x34a: 0xfb, 0x34b: 0xfb, 0x34c: 0xfb, 0x34d: 0xfb, 0x34e: 0xfb, 0x34f: 0xfb,
-	0x350: 0xfb, 0x351: 0xfb, 0x352: 0xfb, 0x353: 0xfb, 0x354: 0xfb, 0x355: 0xfb, 0x356: 0xfb, 0x357: 0xfb,
-	0x358: 0xfb, 0x359: 0xfb, 0x35a: 0xfb, 0x35b: 0xfb, 0x35c: 0xfb, 0x35d: 0xfb, 0x35e: 0xfb, 0x35f: 0xfb,
-	0x360: 0xfb, 0x361: 0xfb, 0x362: 0xfb, 0x363: 0xfb, 0x364: 0xfb, 0x365: 0xfb, 0x366: 0xfb, 0x367: 0xfb,
-	0x368: 0xfb, 0x369: 0xfb, 0x36a: 0xfb, 0x36b: 0xfb, 0x36c: 0xfb, 0x36d: 0xfb, 0x36e: 0xfb, 0x36f: 0xfb,
-	0x370: 0xfb, 0x371: 0xfb, 0x372: 0xfb, 0x373: 0xfb, 0x374: 0xfb, 0x375: 0xfb, 0x376: 0xfb, 0x377: 0xfb,
-	0x378: 0xfb, 0x379: 0xfb, 0x37a: 0xfb, 0x37b: 0xfb, 0x37c: 0xfb, 0x37d: 0xfb, 0x37e: 0xfb, 0x37f: 0xfb,
+	0x340: 0xfd, 0x341: 0xfd, 0x342: 0xfd, 0x343: 0xfd, 0x344: 0xfd, 0x345: 0xfd, 0x346: 0xfd, 0x347: 0xfd,
+	0x348: 0xfd, 0x349: 0xfd, 0x34a: 0xfd, 0x34b: 0xfd, 0x34c: 0xfd, 0x34d: 0xfd, 0x34e: 0xfd, 0x34f: 0xfd,
+	0x350: 0xfd, 0x351: 0xfd, 0x352: 0xfd, 0x353: 0xfd, 0x354: 0xfd, 0x355: 0xfd, 0x356: 0xfd, 0x357: 0xfd,
+	0x358: 0xfd, 0x359: 0xfd, 0x35a: 0xfd, 0x35b: 0xfd, 0x35c: 0xfd, 0x35d: 0xfd, 0x35e: 0xfd, 0x35f: 0xfd,
+	0x360: 0xfd, 0x361: 0xfd, 0x362: 0xfd, 0x363: 0xfd, 0x364: 0xfd, 0x365: 0xfd, 0x366: 0xfd, 0x367: 0xfd,
+	0x368: 0xfd, 0x369: 0xfd, 0x36a: 0xfd, 0x36b: 0xfd, 0x36c: 0xfd, 0x36d: 0xfd, 0x36e: 0xfd, 0x36f: 0xfd,
+	0x370: 0xfd, 0x371: 0xfd, 0x372: 0xfd, 0x373: 0xfd, 0x374: 0xfd, 0x375: 0xfd, 0x376: 0xfd, 0x377: 0xfd,
+	0x378: 0xfd, 0x379: 0xfd, 0x37a: 0xfd, 0x37b: 0xfd, 0x37c: 0xfd, 0x37d: 0xfd, 0x37e: 0xfd, 0x37f: 0xfd,
 	// Block 0xe, offset 0x380
-	0x380: 0xfb, 0x381: 0xfb, 0x382: 0xfb, 0x383: 0xfb, 0x384: 0xfb, 0x385: 0xfb, 0x386: 0xfb, 0x387: 0xfb,
-	0x388: 0xfb, 0x389: 0xfb, 0x38a: 0xfb, 0x38b: 0xfb, 0x38c: 0xfb, 0x38d: 0xfb, 0x38e: 0xfb, 0x38f: 0xfb,
-	0x390: 0xfb, 0x391: 0xfb, 0x392: 0xfb, 0x393: 0xfb, 0x394: 0xfb, 0x395: 0xfb, 0x396: 0xfb, 0x397: 0xfb,
-	0x398: 0xfb, 0x399: 0xfb, 0x39a: 0xfb, 0x39b: 0xfb, 0x39c: 0xfb, 0x39d: 0xfb, 0x39e: 0xfb, 0x39f: 0xfb,
-	0x3a0: 0xfb, 0x3a1: 0xfb, 0x3a2: 0xfb, 0x3a3: 0xfb, 0x3a4: 0xfc, 0x3a5: 0xfd, 0x3a6: 0xfe, 0x3a7: 0xff,
-	0x3a8: 0x47, 0x3a9: 0x100, 0x3aa: 0x101, 0x3ab: 0x48, 0x3ac: 0x49, 0x3ad: 0x4a, 0x3ae: 0x4b, 0x3af: 0x4c,
-	0x3b0: 0x102, 0x3b1: 0x4d, 0x3b2: 0x4e, 0x3b3: 0x4f, 0x3b4: 0x50, 0x3b5: 0x51, 0x3b6: 0x103, 0x3b7: 0x52,
-	0x3b8: 0x53, 0x3b9: 0x54, 0x3ba: 0x55, 0x3bb: 0x56, 0x3bc: 0x57, 0x3bd: 0x58, 0x3be: 0x59, 0x3bf: 0x5a,
+	0x380: 0xfd, 0x381: 0xfd, 0x382: 0xfd, 0x383: 0xfd, 0x384: 0xfd, 0x385: 0xfd, 0x386: 0xfd, 0x387: 0xfd,
+	0x388: 0xfd, 0x389: 0xfd, 0x38a: 0xfd, 0x38b: 0xfd, 0x38c: 0xfd, 0x38d: 0xfd, 0x38e: 0xfd, 0x38f: 0xfd,
+	0x390: 0xfd, 0x391: 0xfd, 0x392: 0xfd, 0x393: 0xfd, 0x394: 0xfd, 0x395: 0xfd, 0x396: 0xfd, 0x397: 0xfd,
+	0x398: 0xfd, 0x399: 0xfd, 0x39a: 0xfd, 0x39b: 0xfd, 0x39c: 0xfd, 0x39d: 0xfd, 0x39e: 0xfd, 0x39f: 0xfd,
+	0x3a0: 0xfd, 0x3a1: 0xfd, 0x3a2: 0xfd, 0x3a3: 0xfd, 0x3a4: 0xfe, 0x3a5: 0xff, 0x3a6: 0x100, 0x3a7: 0x101,
+	0x3a8: 0x45, 0x3a9: 0x102, 0x3aa: 0x103, 0x3ab: 0x46, 0x3ac: 0x47, 0x3ad: 0x48, 0x3ae: 0x49, 0x3af: 0x4a,
+	0x3b0: 0x104, 0x3b1: 0x4b, 0x3b2: 0x4c, 0x3b3: 0x4d, 0x3b4: 0x4e, 0x3b5: 0x4f, 0x3b6: 0x105, 0x3b7: 0x50,
+	0x3b8: 0x51, 0x3b9: 0x52, 0x3ba: 0x53, 0x3bb: 0x54, 0x3bc: 0x55, 0x3bd: 0x56, 0x3be: 0x57, 0x3bf: 0x58,
 	// Block 0xf, offset 0x3c0
-	0x3c0: 0x104, 0x3c1: 0x105, 0x3c2: 0xa0, 0x3c3: 0x106, 0x3c4: 0x107, 0x3c5: 0x9c, 0x3c6: 0x108, 0x3c7: 0x109,
-	0x3c8: 0xfb, 0x3c9: 0xfb, 0x3ca: 0x10a, 0x3cb: 0x10b, 0x3cc: 0x10c, 0x3cd: 0x10d, 0x3ce: 0x10e, 0x3cf: 0x10f,
-	0x3d0: 0x110, 0x3d1: 0xa0, 0x3d2: 0x111, 0x3d3: 0x112, 0x3d4: 0x113, 0x3d5: 0x114, 0x3d6: 0xfb, 0x3d7: 0xfb,
-	0x3d8: 0xa0, 0x3d9: 0xa0, 0x3da: 0xa0, 0x3db: 0xa0, 0x3dc: 0x115, 0x3dd: 0x116, 0x3de: 0xfb, 0x3df: 0xfb,
-	0x3e0: 0x117, 0x3e1: 0x118, 0x3e2: 0x119, 0x3e3: 0x11a, 0x3e4: 0x11b, 0x3e5: 0xfb, 0x3e6: 0x11c, 0x3e7: 0x11d,
-	0x3e8: 0x11e, 0x3e9: 0x11f, 0x3ea: 0x120, 0x3eb: 0x5b, 0x3ec: 0x121, 0x3ed: 0x122, 0x3ee: 0x5c, 0x3ef: 0xfb,
-	0x3f0: 0x123, 0x3f1: 0x124, 0x3f2: 0x125, 0x3f3: 0x126, 0x3f4: 0x127, 0x3f5: 0xfb, 0x3f6: 0xfb, 0x3f7: 0xfb,
-	0x3f8: 0xfb, 0x3f9: 0x128, 0x3fa: 0x129, 0x3fb: 0xfb, 0x3fc: 0x12a, 0x3fd: 0x12b, 0x3fe: 0x12c, 0x3ff: 0x12d,
+	0x3c0: 0x106, 0x3c1: 0x107, 0x3c2: 0xa0, 0x3c3: 0x108, 0x3c4: 0x109, 0x3c5: 0x9c, 0x3c6: 0x10a, 0x3c7: 0x10b,
+	0x3c8: 0xfd, 0x3c9: 0xfd, 0x3ca: 0x10c, 0x3cb: 0x10d, 0x3cc: 0x10e, 0x3cd: 0x10f, 0x3ce: 0x110, 0x3cf: 0x111,
+	0x3d0: 0x112, 0x3d1: 0xa0, 0x3d2: 0x113, 0x3d3: 0x114, 0x3d4: 0x115, 0x3d5: 0x116, 0x3d6: 0xfd, 0x3d7: 0xfd,
+	0x3d8: 0xa0, 0x3d9: 0xa0, 0x3da: 0xa0, 0x3db: 0xa0, 0x3dc: 0x117, 0x3dd: 0x118, 0x3de: 0xfd, 0x3df: 0xfd,
+	0x3e0: 0x119, 0x3e1: 0x11a, 0x3e2: 0x11b, 0x3e3: 0x11c, 0x3e4: 0x11d, 0x3e5: 0xfd, 0x3e6: 0x11e, 0x3e7: 0x11f,
+	0x3e8: 0x120, 0x3e9: 0x121, 0x3ea: 0x122, 0x3eb: 0x59, 0x3ec: 0x123, 0x3ed: 0x124, 0x3ee: 0x5a, 0x3ef: 0xfd,
+	0x3f0: 0x125, 0x3f1: 0x126, 0x3f2: 0x127, 0x3f3: 0x128, 0x3f4: 0x129, 0x3f5: 0xfd, 0x3f6: 0xfd, 0x3f7: 0xfd,
+	0x3f8: 0xfd, 0x3f9: 0x12a, 0x3fa: 0x12b, 0x3fb: 0xfd, 0x3fc: 0x12c, 0x3fd: 0x12d, 0x3fe: 0x12e, 0x3ff: 0x12f,
 	// Block 0x10, offset 0x400
-	0x400: 0x12e, 0x401: 0x12f, 0x402: 0x130, 0x403: 0x131, 0x404: 0x132, 0x405: 0x133, 0x406: 0x134, 0x407: 0x135,
-	0x408: 0x136, 0x409: 0xfb, 0x40a: 0x137, 0x40b: 0x138, 0x40c: 0x5d, 0x40d: 0x5e, 0x40e: 0xfb, 0x40f: 0xfb,
-	0x410: 0x139, 0x411: 0x13a, 0x412: 0x13b, 0x413: 0x13c, 0x414: 0xfb, 0x415: 0xfb, 0x416: 0x13d, 0x417: 0x13e,
-	0x418: 0x13f, 0x419: 0x140, 0x41a: 0x141, 0x41b: 0x142, 0x41c: 0x143, 0x41d: 0xfb, 0x41e: 0xfb, 0x41f: 0xfb,
-	0x420: 0x144, 0x421: 0xfb, 0x422: 0x145, 0x423: 0x146, 0x424: 0x5f, 0x425: 0x147, 0x426: 0x148, 0x427: 0x149,
-	0x428: 0x14a, 0x429: 0x14b, 0x42a: 0x14c, 0x42b: 0x14d, 0x42c: 0xfb, 0x42d: 0xfb, 0x42e: 0xfb, 0x42f: 0xfb,
-	0x430: 0x14e, 0x431: 0x14f, 0x432: 0x150, 0x433: 0xfb, 0x434: 0x151, 0x435: 0x152, 0x436: 0x153, 0x437: 0xfb,
-	0x438: 0xfb, 0x439: 0xfb, 0x43a: 0xfb, 0x43b: 0x154, 0x43c: 0xfb, 0x43d: 0xfb, 0x43e: 0x155, 0x43f: 0x156,
+	0x400: 0x130, 0x401: 0x131, 0x402: 0x132, 0x403: 0x133, 0x404: 0x134, 0x405: 0x135, 0x406: 0x136, 0x407: 0x137,
+	0x408: 0x138, 0x409: 0xfd, 0x40a: 0x139, 0x40b: 0x13a, 0x40c: 0x5b, 0x40d: 0x5c, 0x40e: 0xfd, 0x40f: 0xfd,
+	0x410: 0x13b, 0x411: 0x13c, 0x412: 0x13d, 0x413: 0x13e, 0x414: 0xfd, 0x415: 0xfd, 0x416: 0x13f, 0x417: 0x140,
+	0x418: 0x141, 0x419: 0x142, 0x41a: 0x143, 0x41b: 0x144, 0x41c: 0x145, 0x41d: 0xfd, 0x41e: 0xfd, 0x41f: 0xfd,
+	0x420: 0x146, 0x421: 0xfd, 0x422: 0x147, 0x423: 0x148, 0x424: 0x5d, 0x425: 0x149, 0x426: 0x14a, 0x427: 0x14b,
+	0x428: 0x14c, 0x429: 0x14d, 0x42a: 0x14e, 0x42b: 0x14f, 0x42c: 0xfd, 0x42d: 0xfd, 0x42e: 0xfd, 0x42f: 0xfd,
+	0x430: 0x150, 0x431: 0x151, 0x432: 0x152, 0x433: 0xfd, 0x434: 0x153, 0x435: 0x154, 0x436: 0x155, 0x437: 0xfd,
+	0x438: 0xfd, 0x439: 0xfd, 0x43a: 0xfd, 0x43b: 0x156, 0x43c: 0xfd, 0x43d: 0xfd, 0x43e: 0x157, 0x43f: 0x158,
 	// Block 0x11, offset 0x440
 	0x440: 0xa0, 0x441: 0xa0, 0x442: 0xa0, 0x443: 0xa0, 0x444: 0xa0, 0x445: 0xa0, 0x446: 0xa0, 0x447: 0xa0,
-	0x448: 0xa0, 0x449: 0xa0, 0x44a: 0xa0, 0x44b: 0xa0, 0x44c: 0xa0, 0x44d: 0xa0, 0x44e: 0x157, 0x44f: 0xfb,
-	0x450: 0x9c, 0x451: 0x158, 0x452: 0xa0, 0x453: 0xa0, 0x454: 0xa0, 0x455: 0x159, 0x456: 0xfb, 0x457: 0xfb,
-	0x458: 0xfb, 0x459: 0xfb, 0x45a: 0xfb, 0x45b: 0xfb, 0x45c: 0xfb, 0x45d: 0xfb, 0x45e: 0xfb, 0x45f: 0xfb,
-	0x460: 0xfb, 0x461: 0xfb, 0x462: 0xfb, 0x463: 0xfb, 0x464: 0xfb, 0x465: 0xfb, 0x466: 0xfb, 0x467: 0xfb,
-	0x468: 0xfb, 0x469: 0xfb, 0x46a: 0xfb, 0x46b: 0xfb, 0x46c: 0xfb, 0x46d: 0xfb, 0x46e: 0xfb, 0x46f: 0xfb,
-	0x470: 0xfb, 0x471: 0xfb, 0x472: 0xfb, 0x473: 0xfb, 0x474: 0xfb, 0x475: 0xfb, 0x476: 0xfb, 0x477: 0xfb,
-	0x478: 0xfb, 0x479: 0xfb, 0x47a: 0xfb, 0x47b: 0xfb, 0x47c: 0xfb, 0x47d: 0xfb, 0x47e: 0xfb, 0x47f: 0xfb,
+	0x448: 0xa0, 0x449: 0xa0, 0x44a: 0xa0, 0x44b: 0xa0, 0x44c: 0xa0, 0x44d: 0xa0, 0x44e: 0x159, 0x44f: 0xfd,
+	0x450: 0x9c, 0x451: 0x15a, 0x452: 0xa0, 0x453: 0xa0, 0x454: 0xa0, 0x455: 0x15b, 0x456: 0xfd, 0x457: 0xfd,
+	0x458: 0xfd, 0x459: 0xfd, 0x45a: 0xfd, 0x45b: 0xfd, 0x45c: 0xfd, 0x45d: 0xfd, 0x45e: 0xfd, 0x45f: 0xfd,
+	0x460: 0xfd, 0x461: 0xfd, 0x462: 0xfd, 0x463: 0xfd, 0x464: 0xfd, 0x465: 0xfd, 0x466: 0xfd, 0x467: 0xfd,
+	0x468: 0xfd, 0x469: 0xfd, 0x46a: 0xfd, 0x46b: 0xfd, 0x46c: 0xfd, 0x46d: 0xfd, 0x46e: 0xfd, 0x46f: 0xfd,
+	0x470: 0xfd, 0x471: 0xfd, 0x472: 0xfd, 0x473: 0xfd, 0x474: 0xfd, 0x475: 0xfd, 0x476: 0xfd, 0x477: 0xfd,
+	0x478: 0xfd, 0x479: 0xfd, 0x47a: 0xfd, 0x47b: 0xfd, 0x47c: 0xfd, 0x47d: 0xfd, 0x47e: 0xfd, 0x47f: 0xfd,
 	// Block 0x12, offset 0x480
 	0x480: 0xa0, 0x481: 0xa0, 0x482: 0xa0, 0x483: 0xa0, 0x484: 0xa0, 0x485: 0xa0, 0x486: 0xa0, 0x487: 0xa0,
 	0x488: 0xa0, 0x489: 0xa0, 0x48a: 0xa0, 0x48b: 0xa0, 0x48c: 0xa0, 0x48d: 0xa0, 0x48e: 0xa0, 0x48f: 0xa0,
-	0x490: 0x15a, 0x491: 0xfb, 0x492: 0xfb, 0x493: 0xfb, 0x494: 0xfb, 0x495: 0xfb, 0x496: 0xfb, 0x497: 0xfb,
-	0x498: 0xfb, 0x499: 0xfb, 0x49a: 0xfb, 0x49b: 0xfb, 0x49c: 0xfb, 0x49d: 0xfb, 0x49e: 0xfb, 0x49f: 0xfb,
-	0x4a0: 0xfb, 0x4a1: 0xfb, 0x4a2: 0xfb, 0x4a3: 0xfb, 0x4a4: 0xfb, 0x4a5: 0xfb, 0x4a6: 0xfb, 0x4a7: 0xfb,
-	0x4a8: 0xfb, 0x4a9: 0xfb, 0x4aa: 0xfb, 0x4ab: 0xfb, 0x4ac: 0xfb, 0x4ad: 0xfb, 0x4ae: 0xfb, 0x4af: 0xfb,
-	0x4b0: 0xfb, 0x4b1: 0xfb, 0x4b2: 0xfb, 0x4b3: 0xfb, 0x4b4: 0xfb, 0x4b5: 0xfb, 0x4b6: 0xfb, 0x4b7: 0xfb,
-	0x4b8: 0xfb, 0x4b9: 0xfb, 0x4ba: 0xfb, 0x4bb: 0xfb, 0x4bc: 0xfb, 0x4bd: 0xfb, 0x4be: 0xfb, 0x4bf: 0xfb,
+	0x490: 0x15c, 0x491: 0xfd, 0x492: 0xfd, 0x493: 0xfd, 0x494: 0xfd, 0x495: 0xfd, 0x496: 0xfd, 0x497: 0xfd,
+	0x498: 0xfd, 0x499: 0xfd, 0x49a: 0xfd, 0x49b: 0xfd, 0x49c: 0xfd, 0x49d: 0xfd, 0x49e: 0xfd, 0x49f: 0xfd,
+	0x4a0: 0xfd, 0x4a1: 0xfd, 0x4a2: 0xfd, 0x4a3: 0xfd, 0x4a4: 0xfd, 0x4a5: 0xfd, 0x4a6: 0xfd, 0x4a7: 0xfd,
+	0x4a8: 0xfd, 0x4a9: 0xfd, 0x4aa: 0xfd, 0x4ab: 0xfd, 0x4ac: 0xfd, 0x4ad: 0xfd, 0x4ae: 0xfd, 0x4af: 0xfd,
+	0x4b0: 0xfd, 0x4b1: 0xfd, 0x4b2: 0xfd, 0x4b3: 0xfd, 0x4b4: 0xfd, 0x4b5: 0xfd, 0x4b6: 0xfd, 0x4b7: 0xfd,
+	0x4b8: 0xfd, 0x4b9: 0xfd, 0x4ba: 0xfd, 0x4bb: 0xfd, 0x4bc: 0xfd, 0x4bd: 0xfd, 0x4be: 0xfd, 0x4bf: 0xfd,
 	// Block 0x13, offset 0x4c0
-	0x4c0: 0xfb, 0x4c1: 0xfb, 0x4c2: 0xfb, 0x4c3: 0xfb, 0x4c4: 0xfb, 0x4c5: 0xfb, 0x4c6: 0xfb, 0x4c7: 0xfb,
-	0x4c8: 0xfb, 0x4c9: 0xfb, 0x4ca: 0xfb, 0x4cb: 0xfb, 0x4cc: 0xfb, 0x4cd: 0xfb, 0x4ce: 0xfb, 0x4cf: 0xfb,
+	0x4c0: 0xfd, 0x4c1: 0xfd, 0x4c2: 0xfd, 0x4c3: 0xfd, 0x4c4: 0xfd, 0x4c5: 0xfd, 0x4c6: 0xfd, 0x4c7: 0xfd,
+	0x4c8: 0xfd, 0x4c9: 0xfd, 0x4ca: 0xfd, 0x4cb: 0xfd, 0x4cc: 0xfd, 0x4cd: 0xfd, 0x4ce: 0xfd, 0x4cf: 0xfd,
 	0x4d0: 0xa0, 0x4d1: 0xa0, 0x4d2: 0xa0, 0x4d3: 0xa0, 0x4d4: 0xa0, 0x4d5: 0xa0, 0x4d6: 0xa0, 0x4d7: 0xa0,
-	0x4d8: 0xa0, 0x4d9: 0x15b, 0x4da: 0xfb, 0x4db: 0xfb, 0x4dc: 0xfb, 0x4dd: 0xfb, 0x4de: 0xfb, 0x4df: 0xfb,
-	0x4e0: 0xfb, 0x4e1: 0xfb, 0x4e2: 0xfb, 0x4e3: 0xfb, 0x4e4: 0xfb, 0x4e5: 0xfb, 0x4e6: 0xfb, 0x4e7: 0xfb,
-	0x4e8: 0xfb, 0x4e9: 0xfb, 0x4ea: 0xfb, 0x4eb: 0xfb, 0x4ec: 0xfb, 0x4ed: 0xfb, 0x4ee: 0xfb, 0x4ef: 0xfb,
-	0x4f0: 0xfb, 0x4f1: 0xfb, 0x4f2: 0xfb, 0x4f3: 0xfb, 0x4f4: 0xfb, 0x4f5: 0xfb, 0x4f6: 0xfb, 0x4f7: 0xfb,
-	0x4f8: 0xfb, 0x4f9: 0xfb, 0x4fa: 0xfb, 0x4fb: 0xfb, 0x4fc: 0xfb, 0x4fd: 0xfb, 0x4fe: 0xfb, 0x4ff: 0xfb,
+	0x4d8: 0xa0, 0x4d9: 0x15d, 0x4da: 0xfd, 0x4db: 0xfd, 0x4dc: 0xfd, 0x4dd: 0xfd, 0x4de: 0xfd, 0x4df: 0xfd,
+	0x4e0: 0xfd, 0x4e1: 0xfd, 0x4e2: 0xfd, 0x4e3: 0xfd, 0x4e4: 0xfd, 0x4e5: 0xfd, 0x4e6: 0xfd, 0x4e7: 0xfd,
+	0x4e8: 0xfd, 0x4e9: 0xfd, 0x4ea: 0xfd, 0x4eb: 0xfd, 0x4ec: 0xfd, 0x4ed: 0xfd, 0x4ee: 0xfd, 0x4ef: 0xfd,
+	0x4f0: 0xfd, 0x4f1: 0xfd, 0x4f2: 0xfd, 0x4f3: 0xfd, 0x4f4: 0xfd, 0x4f5: 0xfd, 0x4f6: 0xfd, 0x4f7: 0xfd,
+	0x4f8: 0xfd, 0x4f9: 0xfd, 0x4fa: 0xfd, 0x4fb: 0xfd, 0x4fc: 0xfd, 0x4fd: 0xfd, 0x4fe: 0xfd, 0x4ff: 0xfd,
 	// Block 0x14, offset 0x500
-	0x500: 0xfb, 0x501: 0xfb, 0x502: 0xfb, 0x503: 0xfb, 0x504: 0xfb, 0x505: 0xfb, 0x506: 0xfb, 0x507: 0xfb,
-	0x508: 0xfb, 0x509: 0xfb, 0x50a: 0xfb, 0x50b: 0xfb, 0x50c: 0xfb, 0x50d: 0xfb, 0x50e: 0xfb, 0x50f: 0xfb,
-	0x510: 0xfb, 0x511: 0xfb, 0x512: 0xfb, 0x513: 0xfb, 0x514: 0xfb, 0x515: 0xfb, 0x516: 0xfb, 0x517: 0xfb,
-	0x518: 0xfb, 0x519: 0xfb, 0x51a: 0xfb, 0x51b: 0xfb, 0x51c: 0xfb, 0x51d: 0xfb, 0x51e: 0xfb, 0x51f: 0xfb,
+	0x500: 0xfd, 0x501: 0xfd, 0x502: 0xfd, 0x503: 0xfd, 0x504: 0xfd, 0x505: 0xfd, 0x506: 0xfd, 0x507: 0xfd,
+	0x508: 0xfd, 0x509: 0xfd, 0x50a: 0xfd, 0x50b: 0xfd, 0x50c: 0xfd, 0x50d: 0xfd, 0x50e: 0xfd, 0x50f: 0xfd,
+	0x510: 0xfd, 0x511: 0xfd, 0x512: 0xfd, 0x513: 0xfd, 0x514: 0xfd, 0x515: 0xfd, 0x516: 0xfd, 0x517: 0xfd,
+	0x518: 0xfd, 0x519: 0xfd, 0x51a: 0xfd, 0x51b: 0xfd, 0x51c: 0xfd, 0x51d: 0xfd, 0x51e: 0xfd, 0x51f: 0xfd,
 	0x520: 0xa0, 0x521: 0xa0, 0x522: 0xa0, 0x523: 0xa0, 0x524: 0xa0, 0x525: 0xa0, 0x526: 0xa0, 0x527: 0xa0,
-	0x528: 0x14d, 0x529: 0x15c, 0x52a: 0xfb, 0x52b: 0x15d, 0x52c: 0x15e, 0x52d: 0x15f, 0x52e: 0x160, 0x52f: 0xfb,
-	0x530: 0xfb, 0x531: 0xfb, 0x532: 0xfb, 0x533: 0xfb, 0x534: 0xfb, 0x535: 0xfb, 0x536: 0xfb, 0x537: 0xfb,
-	0x538: 0xfb, 0x539: 0x161, 0x53a: 0x162, 0x53b: 0xfb, 0x53c: 0xa0, 0x53d: 0x163, 0x53e: 0x164, 0x53f: 0x165,
+	0x528: 0x14f, 0x529: 0x15e, 0x52a: 0xfd, 0x52b: 0x15f, 0x52c: 0x160, 0x52d: 0x161, 0x52e: 0x162, 0x52f: 0xfd,
+	0x530: 0xfd, 0x531: 0xfd, 0x532: 0xfd, 0x533: 0xfd, 0x534: 0xfd, 0x535: 0xfd, 0x536: 0xfd, 0x537: 0xfd,
+	0x538: 0xfd, 0x539: 0x163, 0x53a: 0x164, 0x53b: 0xfd, 0x53c: 0xa0, 0x53d: 0x165, 0x53e: 0x166, 0x53f: 0x167,
 	// Block 0x15, offset 0x540
 	0x540: 0xa0, 0x541: 0xa0, 0x542: 0xa0, 0x543: 0xa0, 0x544: 0xa0, 0x545: 0xa0, 0x546: 0xa0, 0x547: 0xa0,
 	0x548: 0xa0, 0x549: 0xa0, 0x54a: 0xa0, 0x54b: 0xa0, 0x54c: 0xa0, 0x54d: 0xa0, 0x54e: 0xa0, 0x54f: 0xa0,
 	0x550: 0xa0, 0x551: 0xa0, 0x552: 0xa0, 0x553: 0xa0, 0x554: 0xa0, 0x555: 0xa0, 0x556: 0xa0, 0x557: 0xa0,
-	0x558: 0xa0, 0x559: 0xa0, 0x55a: 0xa0, 0x55b: 0xa0, 0x55c: 0xa0, 0x55d: 0xa0, 0x55e: 0xa0, 0x55f: 0x166,
+	0x558: 0xa0, 0x559: 0xa0, 0x55a: 0xa0, 0x55b: 0xa0, 0x55c: 0xa0, 0x55d: 0xa0, 0x55e: 0xa0, 0x55f: 0x168,
 	0x560: 0xa0, 0x561: 0xa0, 0x562: 0xa0, 0x563: 0xa0, 0x564: 0xa0, 0x565: 0xa0, 0x566: 0xa0, 0x567: 0xa0,
 	0x568: 0xa0, 0x569: 0xa0, 0x56a: 0xa0, 0x56b: 0xa0, 0x56c: 0xa0, 0x56d: 0xa0, 0x56e: 0xa0, 0x56f: 0xa0,
-	0x570: 0xa0, 0x571: 0xa0, 0x572: 0xa0, 0x573: 0x167, 0x574: 0x168, 0x575: 0xfb, 0x576: 0xfb, 0x577: 0xfb,
-	0x578: 0xfb, 0x579: 0xfb, 0x57a: 0xfb, 0x57b: 0xfb, 0x57c: 0xfb, 0x57d: 0xfb, 0x57e: 0xfb, 0x57f: 0xfb,
+	0x570: 0xa0, 0x571: 0xa0, 0x572: 0xa0, 0x573: 0x169, 0x574: 0x16a, 0x575: 0xfd, 0x576: 0xfd, 0x577: 0xfd,
+	0x578: 0xfd, 0x579: 0xfd, 0x57a: 0xfd, 0x57b: 0xfd, 0x57c: 0xfd, 0x57d: 0xfd, 0x57e: 0xfd, 0x57f: 0xfd,
 	// Block 0x16, offset 0x580
-	0x580: 0xa0, 0x581: 0xa0, 0x582: 0xa0, 0x583: 0xa0, 0x584: 0x169, 0x585: 0x16a, 0x586: 0xa0, 0x587: 0xa0,
-	0x588: 0xa0, 0x589: 0xa0, 0x58a: 0xa0, 0x58b: 0x16b, 0x58c: 0xfb, 0x58d: 0xfb, 0x58e: 0xfb, 0x58f: 0xfb,
-	0x590: 0xfb, 0x591: 0xfb, 0x592: 0xfb, 0x593: 0xfb, 0x594: 0xfb, 0x595: 0xfb, 0x596: 0xfb, 0x597: 0xfb,
-	0x598: 0xfb, 0x599: 0xfb, 0x59a: 0xfb, 0x59b: 0xfb, 0x59c: 0xfb, 0x59d: 0xfb, 0x59e: 0xfb, 0x59f: 0xfb,
-	0x5a0: 0xfb, 0x5a1: 0xfb, 0x5a2: 0xfb, 0x5a3: 0xfb, 0x5a4: 0xfb, 0x5a5: 0xfb, 0x5a6: 0xfb, 0x5a7: 0xfb,
-	0x5a8: 0xfb, 0x5a9: 0xfb, 0x5aa: 0xfb, 0x5ab: 0xfb, 0x5ac: 0xfb, 0x5ad: 0xfb, 0x5ae: 0xfb, 0x5af: 0xfb,
-	0x5b0: 0xa0, 0x5b1: 0x16c, 0x5b2: 0x16d, 0x5b3: 0xfb, 0x5b4: 0xfb, 0x5b5: 0xfb, 0x5b6: 0xfb, 0x5b7: 0xfb,
-	0x5b8: 0xfb, 0x5b9: 0xfb, 0x5ba: 0xfb, 0x5bb: 0xfb, 0x5bc: 0xfb, 0x5bd: 0xfb, 0x5be: 0xfb, 0x5bf: 0xfb,
+	0x580: 0xa0, 0x581: 0xa0, 0x582: 0xa0, 0x583: 0xa0, 0x584: 0x16b, 0x585: 0x16c, 0x586: 0xa0, 0x587: 0xa0,
+	0x588: 0xa0, 0x589: 0xa0, 0x58a: 0xa0, 0x58b: 0x16d, 0x58c: 0xfd, 0x58d: 0xfd, 0x58e: 0xfd, 0x58f: 0xfd,
+	0x590: 0xfd, 0x591: 0xfd, 0x592: 0xfd, 0x593: 0xfd, 0x594: 0xfd, 0x595: 0xfd, 0x596: 0xfd, 0x597: 0xfd,
+	0x598: 0xfd, 0x599: 0xfd, 0x59a: 0xfd, 0x59b: 0xfd, 0x59c: 0xfd, 0x59d: 0xfd, 0x59e: 0xfd, 0x59f: 0xfd,
+	0x5a0: 0xfd, 0x5a1: 0xfd, 0x5a2: 0xfd, 0x5a3: 0xfd, 0x5a4: 0xfd, 0x5a5: 0xfd, 0x5a6: 0xfd, 0x5a7: 0xfd,
+	0x5a8: 0xfd, 0x5a9: 0xfd, 0x5aa: 0xfd, 0x5ab: 0xfd, 0x5ac: 0xfd, 0x5ad: 0xfd, 0x5ae: 0xfd, 0x5af: 0xfd,
+	0x5b0: 0xa0, 0x5b1: 0x16e, 0x5b2: 0x16f, 0x5b3: 0xfd, 0x5b4: 0xfd, 0x5b5: 0xfd, 0x5b6: 0xfd, 0x5b7: 0xfd,
+	0x5b8: 0xfd, 0x5b9: 0xfd, 0x5ba: 0xfd, 0x5bb: 0xfd, 0x5bc: 0xfd, 0x5bd: 0xfd, 0x5be: 0xfd, 0x5bf: 0xfd,
 	// Block 0x17, offset 0x5c0
-	0x5c0: 0x9c, 0x5c1: 0x9c, 0x5c2: 0x9c, 0x5c3: 0x16e, 0x5c4: 0x16f, 0x5c5: 0x170, 0x5c6: 0x171, 0x5c7: 0x172,
-	0x5c8: 0x9c, 0x5c9: 0x173, 0x5ca: 0xfb, 0x5cb: 0x174, 0x5cc: 0x9c, 0x5cd: 0x175, 0x5ce: 0xfb, 0x5cf: 0xfb,
-	0x5d0: 0x60, 0x5d1: 0x61, 0x5d2: 0x62, 0x5d3: 0x63, 0x5d4: 0x64, 0x5d5: 0x65, 0x5d6: 0x66, 0x5d7: 0x67,
-	0x5d8: 0x68, 0x5d9: 0x69, 0x5da: 0x6a, 0x5db: 0x6b, 0x5dc: 0x6c, 0x5dd: 0x6d, 0x5de: 0x6e, 0x5df: 0x6f,
+	0x5c0: 0x9c, 0x5c1: 0x9c, 0x5c2: 0x9c, 0x5c3: 0x170, 0x5c4: 0x171, 0x5c5: 0x172, 0x5c6: 0x173, 0x5c7: 0x174,
+	0x5c8: 0x9c, 0x5c9: 0x175, 0x5ca: 0xfd, 0x5cb: 0x176, 0x5cc: 0x9c, 0x5cd: 0x177, 0x5ce: 0xfd, 0x5cf: 0xfd,
+	0x5d0: 0x5e, 0x5d1: 0x5f, 0x5d2: 0x60, 0x5d3: 0x61, 0x5d4: 0x62, 0x5d5: 0x63, 0x5d6: 0x64, 0x5d7: 0x65,
+	0x5d8: 0x66, 0x5d9: 0x67, 0x5da: 0x68, 0x5db: 0x69, 0x5dc: 0x6a, 0x5dd: 0x6b, 0x5de: 0x6c, 0x5df: 0x6d,
 	0x5e0: 0x9c, 0x5e1: 0x9c, 0x5e2: 0x9c, 0x5e3: 0x9c, 0x5e4: 0x9c, 0x5e5: 0x9c, 0x5e6: 0x9c, 0x5e7: 0x9c,
-	0x5e8: 0x176, 0x5e9: 0x177, 0x5ea: 0x178, 0x5eb: 0xfb, 0x5ec: 0xfb, 0x5ed: 0xfb, 0x5ee: 0xfb, 0x5ef: 0xfb,
-	0x5f0: 0xfb, 0x5f1: 0xfb, 0x5f2: 0xfb, 0x5f3: 0xfb, 0x5f4: 0xfb, 0x5f5: 0xfb, 0x5f6: 0xfb, 0x5f7: 0xfb,
-	0x5f8: 0xfb, 0x5f9: 0xfb, 0x5fa: 0xfb, 0x5fb: 0xfb, 0x5fc: 0xfb, 0x5fd: 0xfb, 0x5fe: 0xfb, 0x5ff: 0xfb,
+	0x5e8: 0x178, 0x5e9: 0x179, 0x5ea: 0x17a, 0x5eb: 0xfd, 0x5ec: 0xfd, 0x5ed: 0xfd, 0x5ee: 0xfd, 0x5ef: 0xfd,
+	0x5f0: 0xfd, 0x5f1: 0xfd, 0x5f2: 0xfd, 0x5f3: 0xfd, 0x5f4: 0xfd, 0x5f5: 0xfd, 0x5f6: 0xfd, 0x5f7: 0xfd,
+	0x5f8: 0xfd, 0x5f9: 0xfd, 0x5fa: 0xfd, 0x5fb: 0xfd, 0x5fc: 0xfd, 0x5fd: 0xfd, 0x5fe: 0xfd, 0x5ff: 0xfd,
 	// Block 0x18, offset 0x600
-	0x600: 0x179, 0x601: 0xfb, 0x602: 0xfb, 0x603: 0xfb, 0x604: 0x17a, 0x605: 0x17b, 0x606: 0xfb, 0x607: 0xfb,
-	0x608: 0xfb, 0x609: 0xfb, 0x60a: 0xfb, 0x60b: 0x17c, 0x60c: 0xfb, 0x60d: 0xfb, 0x60e: 0xfb, 0x60f: 0xfb,
-	0x610: 0xfb, 0x611: 0xfb, 0x612: 0xfb, 0x613: 0xfb, 0x614: 0xfb, 0x615: 0xfb, 0x616: 0xfb, 0x617: 0xfb,
-	0x618: 0xfb, 0x619: 0xfb, 0x61a: 0xfb, 0x61b: 0xfb, 0x61c: 0xfb, 0x61d: 0xfb, 0x61e: 0xfb, 0x61f: 0xfb,
-	0x620: 0x123, 0x621: 0x123, 0x622: 0x123, 0x623: 0x17d, 0x624: 0x70, 0x625: 0x17e, 0x626: 0xfb, 0x627: 0xfb,
-	0x628: 0xfb, 0x629: 0xfb, 0x62a: 0xfb, 0x62b: 0xfb, 0x62c: 0xfb, 0x62d: 0xfb, 0x62e: 0xfb, 0x62f: 0xfb,
-	0x630: 0xfb, 0x631: 0x17f, 0x632: 0x180, 0x633: 0xfb, 0x634: 0x181, 0x635: 0xfb, 0x636: 0xfb, 0x637: 0xfb,
-	0x638: 0x71, 0x639: 0x72, 0x63a: 0x73, 0x63b: 0x182, 0x63c: 0xfb, 0x63d: 0xfb, 0x63e: 0xfb, 0x63f: 0xfb,
+	0x600: 0x17b, 0x601: 0xfd, 0x602: 0xfd, 0x603: 0xfd, 0x604: 0x17c, 0x605: 0x17d, 0x606: 0xfd, 0x607: 0xfd,
+	0x608: 0xfd, 0x609: 0xfd, 0x60a: 0xfd, 0x60b: 0x17e, 0x60c: 0xfd, 0x60d: 0xfd, 0x60e: 0xfd, 0x60f: 0xfd,
+	0x610: 0xfd, 0x611: 0xfd, 0x612: 0xfd, 0x613: 0xfd, 0x614: 0xfd, 0x615: 0xfd, 0x616: 0xfd, 0x617: 0xfd,
+	0x618: 0xfd, 0x619: 0xfd, 0x61a: 0xfd, 0x61b: 0xfd, 0x61c: 0xfd, 0x61d: 0xfd, 0x61e: 0xfd, 0x61f: 0xfd,
+	0x620: 0x125, 0x621: 0x125, 0x622: 0x125, 0x623: 0x17f, 0x624: 0x6e, 0x625: 0x180, 0x626: 0xfd, 0x627: 0xfd,
+	0x628: 0xfd, 0x629: 0xfd, 0x62a: 0xfd, 0x62b: 0xfd, 0x62c: 0xfd, 0x62d: 0xfd, 0x62e: 0xfd, 0x62f: 0xfd,
+	0x630: 0xfd, 0x631: 0x181, 0x632: 0x182, 0x633: 0xfd, 0x634: 0x183, 0x635: 0xfd, 0x636: 0xfd, 0x637: 0xfd,
+	0x638: 0x6f, 0x639: 0x70, 0x63a: 0x71, 0x63b: 0x184, 0x63c: 0xfd, 0x63d: 0xfd, 0x63e: 0xfd, 0x63f: 0xfd,
 	// Block 0x19, offset 0x640
-	0x640: 0x183, 0x641: 0x9c, 0x642: 0x184, 0x643: 0x185, 0x644: 0x74, 0x645: 0x75, 0x646: 0x186, 0x647: 0x187,
-	0x648: 0x76, 0x649: 0x188, 0x64a: 0xfb, 0x64b: 0xfb, 0x64c: 0x9c, 0x64d: 0x9c, 0x64e: 0x9c, 0x64f: 0x9c,
+	0x640: 0x185, 0x641: 0x9c, 0x642: 0x186, 0x643: 0x187, 0x644: 0x72, 0x645: 0x73, 0x646: 0x188, 0x647: 0x189,
+	0x648: 0x74, 0x649: 0x18a, 0x64a: 0xfd, 0x64b: 0xfd, 0x64c: 0x9c, 0x64d: 0x9c, 0x64e: 0x9c, 0x64f: 0x9c,
 	0x650: 0x9c, 0x651: 0x9c, 0x652: 0x9c, 0x653: 0x9c, 0x654: 0x9c, 0x655: 0x9c, 0x656: 0x9c, 0x657: 0x9c,
-	0x658: 0x9c, 0x659: 0x9c, 0x65a: 0x9c, 0x65b: 0x189, 0x65c: 0x9c, 0x65d: 0x18a, 0x65e: 0x9c, 0x65f: 0x18b,
-	0x660: 0x18c, 0x661: 0x18d, 0x662: 0x18e, 0x663: 0xfb, 0x664: 0x9c, 0x665: 0x18f, 0x666: 0x9c, 0x667: 0x190,
-	0x668: 0x9c, 0x669: 0x191, 0x66a: 0x192, 0x66b: 0x193, 0x66c: 0x9c, 0x66d: 0x9c, 0x66e: 0x194, 0x66f: 0x195,
-	0x670: 0xfb, 0x671: 0xfb, 0x672: 0xfb, 0x673: 0xfb, 0x674: 0xfb, 0x675: 0xfb, 0x676: 0xfb, 0x677: 0xfb,
-	0x678: 0xfb, 0x679: 0xfb, 0x67a: 0xfb, 0x67b: 0xfb, 0x67c: 0xfb, 0x67d: 0xfb, 0x67e: 0xfb, 0x67f: 0xfb,
+	0x658: 0x9c, 0x659: 0x9c, 0x65a: 0x9c, 0x65b: 0x18b, 0x65c: 0x9c, 0x65d: 0x18c, 0x65e: 0x9c, 0x65f: 0x18d,
+	0x660: 0x18e, 0x661: 0x18f, 0x662: 0x190, 0x663: 0xfd, 0x664: 0x9c, 0x665: 0x191, 0x666: 0x9c, 0x667: 0x192,
+	0x668: 0x9c, 0x669: 0x193, 0x66a: 0x194, 0x66b: 0x195, 0x66c: 0x9c, 0x66d: 0x9c, 0x66e: 0x196, 0x66f: 0x197,
+	0x670: 0xfd, 0x671: 0xfd, 0x672: 0xfd, 0x673: 0xfd, 0x674: 0xfd, 0x675: 0xfd, 0x676: 0xfd, 0x677: 0xfd,
+	0x678: 0xfd, 0x679: 0xfd, 0x67a: 0xfd, 0x67b: 0xfd, 0x67c: 0xfd, 0x67d: 0xfd, 0x67e: 0xfd, 0x67f: 0xfd,
 	// Block 0x1a, offset 0x680
 	0x680: 0xa0, 0x681: 0xa0, 0x682: 0xa0, 0x683: 0xa0, 0x684: 0xa0, 0x685: 0xa0, 0x686: 0xa0, 0x687: 0xa0,
 	0x688: 0xa0, 0x689: 0xa0, 0x68a: 0xa0, 0x68b: 0xa0, 0x68c: 0xa0, 0x68d: 0xa0, 0x68e: 0xa0, 0x68f: 0xa0,
 	0x690: 0xa0, 0x691: 0xa0, 0x692: 0xa0, 0x693: 0xa0, 0x694: 0xa0, 0x695: 0xa0, 0x696: 0xa0, 0x697: 0xa0,
-	0x698: 0xa0, 0x699: 0xa0, 0x69a: 0xa0, 0x69b: 0x196, 0x69c: 0xa0, 0x69d: 0xa0, 0x69e: 0xa0, 0x69f: 0xa0,
+	0x698: 0xa0, 0x699: 0xa0, 0x69a: 0xa0, 0x69b: 0x198, 0x69c: 0xa0, 0x69d: 0xa0, 0x69e: 0xa0, 0x69f: 0xa0,
 	0x6a0: 0xa0, 0x6a1: 0xa0, 0x6a2: 0xa0, 0x6a3: 0xa0, 0x6a4: 0xa0, 0x6a5: 0xa0, 0x6a6: 0xa0, 0x6a7: 0xa0,
 	0x6a8: 0xa0, 0x6a9: 0xa0, 0x6aa: 0xa0, 0x6ab: 0xa0, 0x6ac: 0xa0, 0x6ad: 0xa0, 0x6ae: 0xa0, 0x6af: 0xa0,
 	0x6b0: 0xa0, 0x6b1: 0xa0, 0x6b2: 0xa0, 0x6b3: 0xa0, 0x6b4: 0xa0, 0x6b5: 0xa0, 0x6b6: 0xa0, 0x6b7: 0xa0,
@@ -2312,8 +2455,8 @@ var idnaIndex = [2368]uint16{
 	0x6c0: 0xa0, 0x6c1: 0xa0, 0x6c2: 0xa0, 0x6c3: 0xa0, 0x6c4: 0xa0, 0x6c5: 0xa0, 0x6c6: 0xa0, 0x6c7: 0xa0,
 	0x6c8: 0xa0, 0x6c9: 0xa0, 0x6ca: 0xa0, 0x6cb: 0xa0, 0x6cc: 0xa0, 0x6cd: 0xa0, 0x6ce: 0xa0, 0x6cf: 0xa0,
 	0x6d0: 0xa0, 0x6d1: 0xa0, 0x6d2: 0xa0, 0x6d3: 0xa0, 0x6d4: 0xa0, 0x6d5: 0xa0, 0x6d6: 0xa0, 0x6d7: 0xa0,
-	0x6d8: 0xa0, 0x6d9: 0xa0, 0x6da: 0xa0, 0x6db: 0xa0, 0x6dc: 0x197, 0x6dd: 0xa0, 0x6de: 0xa0, 0x6df: 0xa0,
-	0x6e0: 0x198, 0x6e1: 0xa0, 0x6e2: 0xa0, 0x6e3: 0xa0, 0x6e4: 0xa0, 0x6e5: 0xa0, 0x6e6: 0xa0, 0x6e7: 0xa0,
+	0x6d8: 0xa0, 0x6d9: 0xa0, 0x6da: 0xa0, 0x6db: 0xa0, 0x6dc: 0x199, 0x6dd: 0xa0, 0x6de: 0xa0, 0x6df: 0xa0,
+	0x6e0: 0x19a, 0x6e1: 0xa0, 0x6e2: 0xa0, 0x6e3: 0xa0, 0x6e4: 0xa0, 0x6e5: 0xa0, 0x6e6: 0xa0, 0x6e7: 0xa0,
 	0x6e8: 0xa0, 0x6e9: 0xa0, 0x6ea: 0xa0, 0x6eb: 0xa0, 0x6ec: 0xa0, 0x6ed: 0xa0, 0x6ee: 0xa0, 0x6ef: 0xa0,
 	0x6f0: 0xa0, 0x6f1: 0xa0, 0x6f2: 0xa0, 0x6f3: 0xa0, 0x6f4: 0xa0, 0x6f5: 0xa0, 0x6f6: 0xa0, 0x6f7: 0xa0,
 	0x6f8: 0xa0, 0x6f9: 0xa0, 0x6fa: 0xa0, 0x6fb: 0xa0, 0x6fc: 0xa0, 0x6fd: 0xa0, 0x6fe: 0xa0, 0x6ff: 0xa0,
@@ -2325,34 +2468,34 @@ var idnaIndex = [2368]uint16{
 	0x720: 0xa0, 0x721: 0xa0, 0x722: 0xa0, 0x723: 0xa0, 0x724: 0xa0, 0x725: 0xa0, 0x726: 0xa0, 0x727: 0xa0,
 	0x728: 0xa0, 0x729: 0xa0, 0x72a: 0xa0, 0x72b: 0xa0, 0x72c: 0xa0, 0x72d: 0xa0, 0x72e: 0xa0, 0x72f: 0xa0,
 	0x730: 0xa0, 0x731: 0xa0, 0x732: 0xa0, 0x733: 0xa0, 0x734: 0xa0, 0x735: 0xa0, 0x736: 0xa0, 0x737: 0xa0,
-	0x738: 0xa0, 0x739: 0xa0, 0x73a: 0x199, 0x73b: 0xa0, 0x73c: 0xa0, 0x73d: 0xa0, 0x73e: 0xa0, 0x73f: 0xa0,
+	0x738: 0xa0, 0x739: 0xa0, 0x73a: 0x19b, 0x73b: 0xa0, 0x73c: 0xa0, 0x73d: 0xa0, 0x73e: 0xa0, 0x73f: 0xa0,
 	// Block 0x1d, offset 0x740
 	0x740: 0xa0, 0x741: 0xa0, 0x742: 0xa0, 0x743: 0xa0, 0x744: 0xa0, 0x745: 0xa0, 0x746: 0xa0, 0x747: 0xa0,
 	0x748: 0xa0, 0x749: 0xa0, 0x74a: 0xa0, 0x74b: 0xa0, 0x74c: 0xa0, 0x74d: 0xa0, 0x74e: 0xa0, 0x74f: 0xa0,
 	0x750: 0xa0, 0x751: 0xa0, 0x752: 0xa0, 0x753: 0xa0, 0x754: 0xa0, 0x755: 0xa0, 0x756: 0xa0, 0x757: 0xa0,
 	0x758: 0xa0, 0x759: 0xa0, 0x75a: 0xa0, 0x75b: 0xa0, 0x75c: 0xa0, 0x75d: 0xa0, 0x75e: 0xa0, 0x75f: 0xa0,
 	0x760: 0xa0, 0x761: 0xa0, 0x762: 0xa0, 0x763: 0xa0, 0x764: 0xa0, 0x765: 0xa0, 0x766: 0xa0, 0x767: 0xa0,
-	0x768: 0xa0, 0x769: 0xa0, 0x76a: 0xa0, 0x76b: 0xa0, 0x76c: 0xa0, 0x76d: 0xa0, 0x76e: 0xa0, 0x76f: 0x19a,
-	0x770: 0xfb, 0x771: 0xfb, 0x772: 0xfb, 0x773: 0xfb, 0x774: 0xfb, 0x775: 0xfb, 0x776: 0xfb, 0x777: 0xfb,
-	0x778: 0xfb, 0x779: 0xfb, 0x77a: 0xfb, 0x77b: 0xfb, 0x77c: 0xfb, 0x77d: 0xfb, 0x77e: 0xfb, 0x77f: 0xfb,
+	0x768: 0xa0, 0x769: 0xa0, 0x76a: 0xa0, 0x76b: 0xa0, 0x76c: 0xa0, 0x76d: 0xa0, 0x76e: 0xa0, 0x76f: 0x19c,
+	0x770: 0xfd, 0x771: 0xfd, 0x772: 0xfd, 0x773: 0xfd, 0x774: 0xfd, 0x775: 0xfd, 0x776: 0xfd, 0x777: 0xfd,
+	0x778: 0xfd, 0x779: 0xfd, 0x77a: 0xfd, 0x77b: 0xfd, 0x77c: 0xfd, 0x77d: 0xfd, 0x77e: 0xfd, 0x77f: 0xfd,
 	// Block 0x1e, offset 0x780
-	0x780: 0xfb, 0x781: 0xfb, 0x782: 0xfb, 0x783: 0xfb, 0x784: 0xfb, 0x785: 0xfb, 0x786: 0xfb, 0x787: 0xfb,
-	0x788: 0xfb, 0x789: 0xfb, 0x78a: 0xfb, 0x78b: 0xfb, 0x78c: 0xfb, 0x78d: 0xfb, 0x78e: 0xfb, 0x78f: 0xfb,
-	0x790: 0xfb, 0x791: 0xfb, 0x792: 0xfb, 0x793: 0xfb, 0x794: 0xfb, 0x795: 0xfb, 0x796: 0xfb, 0x797: 0xfb,
-	0x798: 0xfb, 0x799: 0xfb, 0x79a: 0xfb, 0x79b: 0xfb, 0x79c: 0xfb, 0x79d: 0xfb, 0x79e: 0xfb, 0x79f: 0xfb,
-	0x7a0: 0x77, 0x7a1: 0x78, 0x7a2: 0x79, 0x7a3: 0x19b, 0x7a4: 0x7a, 0x7a5: 0x7b, 0x7a6: 0x19c, 0x7a7: 0x7c,
-	0x7a8: 0x7d, 0x7a9: 0xfb, 0x7aa: 0xfb, 0x7ab: 0xfb, 0x7ac: 0xfb, 0x7ad: 0xfb, 0x7ae: 0xfb, 0x7af: 0xfb,
-	0x7b0: 0xfb, 0x7b1: 0xfb, 0x7b2: 0xfb, 0x7b3: 0xfb, 0x7b4: 0xfb, 0x7b5: 0xfb, 0x7b6: 0xfb, 0x7b7: 0xfb,
-	0x7b8: 0xfb, 0x7b9: 0xfb, 0x7ba: 0xfb, 0x7bb: 0xfb, 0x7bc: 0xfb, 0x7bd: 0xfb, 0x7be: 0xfb, 0x7bf: 0xfb,
+	0x780: 0xfd, 0x781: 0xfd, 0x782: 0xfd, 0x783: 0xfd, 0x784: 0xfd, 0x785: 0xfd, 0x786: 0xfd, 0x787: 0xfd,
+	0x788: 0xfd, 0x789: 0xfd, 0x78a: 0xfd, 0x78b: 0xfd, 0x78c: 0xfd, 0x78d: 0xfd, 0x78e: 0xfd, 0x78f: 0xfd,
+	0x790: 0xfd, 0x791: 0xfd, 0x792: 0xfd, 0x793: 0xfd, 0x794: 0xfd, 0x795: 0xfd, 0x796: 0xfd, 0x797: 0xfd,
+	0x798: 0xfd, 0x799: 0xfd, 0x79a: 0xfd, 0x79b: 0xfd, 0x79c: 0xfd, 0x79d: 0xfd, 0x79e: 0xfd, 0x79f: 0xfd,
+	0x7a0: 0x75, 0x7a1: 0x76, 0x7a2: 0x77, 0x7a3: 0x78, 0x7a4: 0x79, 0x7a5: 0x7a, 0x7a6: 0x7b, 0x7a7: 0x7c,
+	0x7a8: 0x7d, 0x7a9: 0xfd, 0x7aa: 0xfd, 0x7ab: 0xfd, 0x7ac: 0xfd, 0x7ad: 0xfd, 0x7ae: 0xfd, 0x7af: 0xfd,
+	0x7b0: 0xfd, 0x7b1: 0xfd, 0x7b2: 0xfd, 0x7b3: 0xfd, 0x7b4: 0xfd, 0x7b5: 0xfd, 0x7b6: 0xfd, 0x7b7: 0xfd,
+	0x7b8: 0xfd, 0x7b9: 0xfd, 0x7ba: 0xfd, 0x7bb: 0xfd, 0x7bc: 0xfd, 0x7bd: 0xfd, 0x7be: 0xfd, 0x7bf: 0xfd,
 	// Block 0x1f, offset 0x7c0
 	0x7c0: 0xa0, 0x7c1: 0xa0, 0x7c2: 0xa0, 0x7c3: 0xa0, 0x7c4: 0xa0, 0x7c5: 0xa0, 0x7c6: 0xa0, 0x7c7: 0xa0,
-	0x7c8: 0xa0, 0x7c9: 0xa0, 0x7ca: 0xa0, 0x7cb: 0xa0, 0x7cc: 0xa0, 0x7cd: 0x19d, 0x7ce: 0xfb, 0x7cf: 0xfb,
-	0x7d0: 0xfb, 0x7d1: 0xfb, 0x7d2: 0xfb, 0x7d3: 0xfb, 0x7d4: 0xfb, 0x7d5: 0xfb, 0x7d6: 0xfb, 0x7d7: 0xfb,
-	0x7d8: 0xfb, 0x7d9: 0xfb, 0x7da: 0xfb, 0x7db: 0xfb, 0x7dc: 0xfb, 0x7dd: 0xfb, 0x7de: 0xfb, 0x7df: 0xfb,
-	0x7e0: 0xfb, 0x7e1: 0xfb, 0x7e2: 0xfb, 0x7e3: 0xfb, 0x7e4: 0xfb, 0x7e5: 0xfb, 0x7e6: 0xfb, 0x7e7: 0xfb,
-	0x7e8: 0xfb, 0x7e9: 0xfb, 0x7ea: 0xfb, 0x7eb: 0xfb, 0x7ec: 0xfb, 0x7ed: 0xfb, 0x7ee: 0xfb, 0x7ef: 0xfb,
-	0x7f0: 0xfb, 0x7f1: 0xfb, 0x7f2: 0xfb, 0x7f3: 0xfb, 0x7f4: 0xfb, 0x7f5: 0xfb, 0x7f6: 0xfb, 0x7f7: 0xfb,
-	0x7f8: 0xfb, 0x7f9: 0xfb, 0x7fa: 0xfb, 0x7fb: 0xfb, 0x7fc: 0xfb, 0x7fd: 0xfb, 0x7fe: 0xfb, 0x7ff: 0xfb,
+	0x7c8: 0xa0, 0x7c9: 0xa0, 0x7ca: 0xa0, 0x7cb: 0xa0, 0x7cc: 0xa0, 0x7cd: 0x19d, 0x7ce: 0xfd, 0x7cf: 0xfd,
+	0x7d0: 0xfd, 0x7d1: 0xfd, 0x7d2: 0xfd, 0x7d3: 0xfd, 0x7d4: 0xfd, 0x7d5: 0xfd, 0x7d6: 0xfd, 0x7d7: 0xfd,
+	0x7d8: 0xfd, 0x7d9: 0xfd, 0x7da: 0xfd, 0x7db: 0xfd, 0x7dc: 0xfd, 0x7dd: 0xfd, 0x7de: 0xfd, 0x7df: 0xfd,
+	0x7e0: 0xfd, 0x7e1: 0xfd, 0x7e2: 0xfd, 0x7e3: 0xfd, 0x7e4: 0xfd, 0x7e5: 0xfd, 0x7e6: 0xfd, 0x7e7: 0xfd,
+	0x7e8: 0xfd, 0x7e9: 0xfd, 0x7ea: 0xfd, 0x7eb: 0xfd, 0x7ec: 0xfd, 0x7ed: 0xfd, 0x7ee: 0xfd, 0x7ef: 0xfd,
+	0x7f0: 0xfd, 0x7f1: 0xfd, 0x7f2: 0xfd, 0x7f3: 0xfd, 0x7f4: 0xfd, 0x7f5: 0xfd, 0x7f6: 0xfd, 0x7f7: 0xfd,
+	0x7f8: 0xfd, 0x7f9: 0xfd, 0x7fa: 0xfd, 0x7fb: 0xfd, 0x7fc: 0xfd, 0x7fd: 0xfd, 0x7fe: 0xfd, 0x7ff: 0xfd,
 	// Block 0x20, offset 0x800
 	0x810: 0x0d, 0x811: 0x0e, 0x812: 0x0f, 0x813: 0x10, 0x814: 0x11, 0x815: 0x0b, 0x816: 0x12, 0x817: 0x07,
 	0x818: 0x13, 0x819: 0x0b, 0x81a: 0x0b, 0x81b: 0x14, 0x81c: 0x0b, 0x81d: 0x15, 0x81e: 0x16, 0x81f: 0x17,
@@ -2370,14 +2513,14 @@ var idnaIndex = [2368]uint16{
 	0x870: 0x0b, 0x871: 0x0b, 0x872: 0x0b, 0x873: 0x0b, 0x874: 0x0b, 0x875: 0x0b, 0x876: 0x0b, 0x877: 0x0b,
 	0x878: 0x0b, 0x879: 0x0b, 0x87a: 0x0b, 0x87b: 0x0b, 0x87c: 0x0b, 0x87d: 0x0b, 0x87e: 0x0b, 0x87f: 0x0b,
 	// Block 0x22, offset 0x880
-	0x880: 0x19e, 0x881: 0x19f, 0x882: 0xfb, 0x883: 0xfb, 0x884: 0x1a0, 0x885: 0x1a0, 0x886: 0x1a0, 0x887: 0x1a1,
-	0x888: 0xfb, 0x889: 0xfb, 0x88a: 0xfb, 0x88b: 0xfb, 0x88c: 0xfb, 0x88d: 0xfb, 0x88e: 0xfb, 0x88f: 0xfb,
-	0x890: 0xfb, 0x891: 0xfb, 0x892: 0xfb, 0x893: 0xfb, 0x894: 0xfb, 0x895: 0xfb, 0x896: 0xfb, 0x897: 0xfb,
-	0x898: 0xfb, 0x899: 0xfb, 0x89a: 0xfb, 0x89b: 0xfb, 0x89c: 0xfb, 0x89d: 0xfb, 0x89e: 0xfb, 0x89f: 0xfb,
-	0x8a0: 0xfb, 0x8a1: 0xfb, 0x8a2: 0xfb, 0x8a3: 0xfb, 0x8a4: 0xfb, 0x8a5: 0xfb, 0x8a6: 0xfb, 0x8a7: 0xfb,
-	0x8a8: 0xfb, 0x8a9: 0xfb, 0x8aa: 0xfb, 0x8ab: 0xfb, 0x8ac: 0xfb, 0x8ad: 0xfb, 0x8ae: 0xfb, 0x8af: 0xfb,
-	0x8b0: 0xfb, 0x8b1: 0xfb, 0x8b2: 0xfb, 0x8b3: 0xfb, 0x8b4: 0xfb, 0x8b5: 0xfb, 0x8b6: 0xfb, 0x8b7: 0xfb,
-	0x8b8: 0xfb, 0x8b9: 0xfb, 0x8ba: 0xfb, 0x8bb: 0xfb, 0x8bc: 0xfb, 0x8bd: 0xfb, 0x8be: 0xfb, 0x8bf: 0xfb,
+	0x880: 0x19e, 0x881: 0x19f, 0x882: 0xfd, 0x883: 0xfd, 0x884: 0x1a0, 0x885: 0x1a0, 0x886: 0x1a0, 0x887: 0x1a1,
+	0x888: 0xfd, 0x889: 0xfd, 0x88a: 0xfd, 0x88b: 0xfd, 0x88c: 0xfd, 0x88d: 0xfd, 0x88e: 0xfd, 0x88f: 0xfd,
+	0x890: 0xfd, 0x891: 0xfd, 0x892: 0xfd, 0x893: 0xfd, 0x894: 0xfd, 0x895: 0xfd, 0x896: 0xfd, 0x897: 0xfd,
+	0x898: 0xfd, 0x899: 0xfd, 0x89a: 0xfd, 0x89b: 0xfd, 0x89c: 0xfd, 0x89d: 0xfd, 0x89e: 0xfd, 0x89f: 0xfd,
+	0x8a0: 0xfd, 0x8a1: 0xfd, 0x8a2: 0xfd, 0x8a3: 0xfd, 0x8a4: 0xfd, 0x8a5: 0xfd, 0x8a6: 0xfd, 0x8a7: 0xfd,
+	0x8a8: 0xfd, 0x8a9: 0xfd, 0x8aa: 0xfd, 0x8ab: 0xfd, 0x8ac: 0xfd, 0x8ad: 0xfd, 0x8ae: 0xfd, 0x8af: 0xfd,
+	0x8b0: 0xfd, 0x8b1: 0xfd, 0x8b2: 0xfd, 0x8b3: 0xfd, 0x8b4: 0xfd, 0x8b5: 0xfd, 0x8b6: 0xfd, 0x8b7: 0xfd,
+	0x8b8: 0xfd, 0x8b9: 0xfd, 0x8ba: 0xfd, 0x8bb: 0xfd, 0x8bc: 0xfd, 0x8bd: 0xfd, 0x8be: 0xfd, 0x8bf: 0xfd,
 	// Block 0x23, offset 0x8c0
 	0x8c0: 0x0b, 0x8c1: 0x0b, 0x8c2: 0x0b, 0x8c3: 0x0b, 0x8c4: 0x0b, 0x8c5: 0x0b, 0x8c6: 0x0b, 0x8c7: 0x0b,
 	0x8c8: 0x0b, 0x8c9: 0x0b, 0x8ca: 0x0b, 0x8cb: 0x0b, 0x8cc: 0x0b, 0x8cd: 0x0b, 0x8ce: 0x0b, 0x8cf: 0x0b,
@@ -2393,10 +2536,10 @@ var idnaIndex = [2368]uint16{
 }
 
 // idnaSparseOffset: 292 entries, 584 bytes
-var idnaSparseOffset = []uint16{0x0, 0x8, 0x19, 0x25, 0x27, 0x2c, 0x33, 0x3e, 0x4a, 0x4e, 0x5d, 0x62, 0x6c, 0x78, 0x85, 0x8b, 0x94, 0xa4, 0xb2, 0xbd, 0xca, 0xdb, 0xe5, 0xec, 0xf9, 0x10a, 0x111, 0x11c, 0x12b, 0x139, 0x143, 0x145, 0x14a, 0x14d, 0x150, 0x152, 0x15e, 0x169, 0x171, 0x177, 0x17d, 0x182, 0x187, 0x18a, 0x18e, 0x194, 0x199, 0x1a5, 0x1af, 0x1b5, 0x1c6, 0x1d0, 0x1d3, 0x1db, 0x1de, 0x1eb, 0x1f3, 0x1f7, 0x1fe, 0x206, 0x216, 0x222, 0x225, 0x22f, 0x23b, 0x247, 0x253, 0x25b, 0x260, 0x26d, 0x27e, 0x282, 0x28d, 0x291, 0x29a, 0x2a2, 0x2a8, 0x2ad, 0x2b0, 0x2b4, 0x2ba, 0x2be, 0x2c2, 0x2c6, 0x2cc, 0x2d4, 0x2db, 0x2e6, 0x2f0, 0x2f4, 0x2f7, 0x2fd, 0x301, 0x303, 0x306, 0x308, 0x30b, 0x315, 0x318, 0x327, 0x32b, 0x330, 0x333, 0x337, 0x33c, 0x341, 0x347, 0x358, 0x368, 0x36e, 0x372, 0x381, 0x386, 0x38e, 0x398, 0x3a3, 0x3ab, 0x3bc, 0x3c5, 0x3d5, 0x3e2, 0x3ee, 0x3f3, 0x400, 0x404, 0x409, 0x40b, 0x40d, 0x411, 0x413, 0x417, 0x420, 0x426, 0x42a, 0x43a, 0x444, 0x449, 0x44c, 0x452, 0x459, 0x45e, 0x462, 0x468, 0x46d, 0x476, 0x47b, 0x481, 0x488, 0x48f, 0x496, 0x49a, 0x49f, 0x4a2, 0x4a7, 0x4b3, 0x4b9, 0x4be, 0x4c5, 0x4cd, 0x4d2, 0x4d6, 0x4e6, 0x4ed, 0x4f1, 0x4f5, 0x4fc, 0x4fe, 0x501, 0x504, 0x508, 0x511, 0x515, 0x51d, 0x525, 0x52d, 0x539, 0x545, 0x54b, 0x554, 0x560, 0x567, 0x570, 0x57b, 0x582, 0x591, 0x59e, 0x5ab, 0x5b4, 0x5b8, 0x5c7, 0x5cf, 0x5da, 0x5e3, 0x5e9, 0x5f1, 0x5fa, 0x605, 0x608, 0x614, 0x61d, 0x620, 0x625, 0x62e, 0x633, 0x640, 0x64b, 0x654, 0x65e, 0x661, 0x66b, 0x674, 0x680, 0x68d, 0x69a, 0x6a8, 0x6af, 0x6b3, 0x6b7, 0x6ba, 0x6bf, 0x6c2, 0x6c7, 0x6ca, 0x6d1, 0x6d8, 0x6dc, 0x6e7, 0x6ea, 0x6ed, 0x6f0, 0x6f6, 0x6fc, 0x705, 0x708, 0x70b, 0x70e, 0x711, 0x718, 0x71b, 0x720, 0x72a, 0x72d, 0x731, 0x740, 0x74c, 0x750, 0x755, 0x759, 0x75e, 0x762, 0x767, 0x770, 0x77b, 0x781, 0x787, 0x78d, 0x793, 0x79c, 0x79f, 0x7a2, 0x7a6, 0x7aa, 0x7ae, 0x7b4, 0x7ba, 0x7bf, 0x7c2, 0x7d2, 0x7d9, 0x7dc, 0x7e1, 0x7e5, 0x7eb, 0x7f2, 0x7f6, 0x7fa, 0x803, 0x80a, 0x80f, 0x813, 0x821, 0x824, 0x827, 0x82b, 0x82f, 0x832, 0x842, 0x853, 0x856, 0x85b, 0x85d, 0x85f}
+var idnaSparseOffset = []uint16{0x0, 0x8, 0x19, 0x25, 0x27, 0x2c, 0x33, 0x3e, 0x4a, 0x4e, 0x5d, 0x62, 0x6c, 0x78, 0x85, 0x8b, 0x94, 0xa4, 0xb2, 0xbd, 0xca, 0xdb, 0xe5, 0xec, 0xf9, 0x10a, 0x111, 0x11c, 0x12b, 0x139, 0x143, 0x145, 0x14a, 0x14d, 0x150, 0x152, 0x15e, 0x169, 0x171, 0x177, 0x17d, 0x182, 0x187, 0x18a, 0x18e, 0x194, 0x199, 0x1a5, 0x1af, 0x1b5, 0x1c6, 0x1d0, 0x1d3, 0x1db, 0x1de, 0x1eb, 0x1f3, 0x1f7, 0x1fe, 0x206, 0x216, 0x222, 0x225, 0x22f, 0x23b, 0x247, 0x253, 0x25b, 0x260, 0x26d, 0x27e, 0x282, 0x28d, 0x291, 0x29a, 0x2a2, 0x2a8, 0x2ad, 0x2b0, 0x2b4, 0x2ba, 0x2be, 0x2c2, 0x2c6, 0x2cc, 0x2d4, 0x2db, 0x2e6, 0x2f0, 0x2f4, 0x2f7, 0x2fd, 0x301, 0x303, 0x306, 0x308, 0x30b, 0x315, 0x318, 0x327, 0x32b, 0x32f, 0x331, 0x33a, 0x33d, 0x341, 0x346, 0x34b, 0x351, 0x362, 0x372, 0x378, 0x37c, 0x38b, 0x390, 0x398, 0x3a2, 0x3ad, 0x3b5, 0x3c6, 0x3cf, 0x3df, 0x3ec, 0x3f8, 0x3fd, 0x40a, 0x40e, 0x413, 0x415, 0x417, 0x41b, 0x41d, 0x421, 0x42a, 0x430, 0x434, 0x444, 0x44e, 0x453, 0x456, 0x45c, 0x463, 0x468, 0x46c, 0x472, 0x477, 0x480, 0x485, 0x48b, 0x492, 0x499, 0x4a0, 0x4a4, 0x4a9, 0x4ac, 0x4b1, 0x4bd, 0x4c3, 0x4c8, 0x4cf, 0x4d7, 0x4dc, 0x4e0, 0x4f0, 0x4f7, 0x4fb, 0x4ff, 0x506, 0x508, 0x50b, 0x50e, 0x512, 0x51b, 0x51f, 0x527, 0x52f, 0x537, 0x543, 0x54f, 0x555, 0x55e, 0x56a, 0x571, 0x57a, 0x585, 0x58c, 0x59b, 0x5a8, 0x5b5, 0x5be, 0x5c2, 0x5d1, 0x5d9, 0x5e4, 0x5ed, 0x5f3, 0x5fb, 0x604, 0x60f, 0x612, 0x61e, 0x627, 0x62a, 0x62f, 0x638, 0x63d, 0x64a, 0x655, 0x65e, 0x668, 0x66b, 0x675, 0x67e, 0x68a, 0x697, 0x6a4, 0x6b2, 0x6b9, 0x6bd, 0x6c1, 0x6c4, 0x6c9, 0x6cc, 0x6d1, 0x6d4, 0x6db, 0x6e2, 0x6e6, 0x6f1, 0x6f4, 0x6f7, 0x6fa, 0x700, 0x706, 0x70f, 0x712, 0x715, 0x718, 0x71b, 0x722, 0x725, 0x72a, 0x734, 0x737, 0x73b, 0x74a, 0x756, 0x75a, 0x75f, 0x763, 0x768, 0x76c, 0x771, 0x77a, 0x785, 0x78b, 0x791, 0x797, 0x79d, 0x7a6, 0x7a9, 0x7ac, 0x7b0, 0x7b4, 0x7b8, 0x7be, 0x7c4, 0x7c9, 0x7cc, 0x7dc, 0x7e3, 0x7e6, 0x7eb, 0x7ef, 0x7f5, 0x7fc, 0x800, 0x804, 0x80d, 0x814, 0x819, 0x81d, 0x82b, 0x82e, 0x831, 0x835, 0x839, 0x83c, 0x83f, 0x844, 0x846, 0x848}
 
-// idnaSparseValues: 2146 entries, 8584 bytes
-var idnaSparseValues = [2146]valueRange{
+// idnaSparseValues: 2123 entries, 8492 bytes
+var idnaSparseValues = [2123]valueRange{
 	// Block 0x0, offset 0x0
 	{value: 0x0000, lo: 0x07},
 	{value: 0xe105, lo: 0x80, hi: 0x96},
@@ -2427,15 +2570,15 @@ var idnaSparseValues = [2146]valueRange{
 	// Block 0x2, offset 0x19
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x0008, lo: 0x80, hi: 0xaf},
-	{value: 0x0249, lo: 0xb0, hi: 0xb0},
+	{value: 0x00a9, lo: 0xb0, hi: 0xb0},
 	{value: 0x037d, lo: 0xb1, hi: 0xb1},
-	{value: 0x0259, lo: 0xb2, hi: 0xb2},
-	{value: 0x0269, lo: 0xb3, hi: 0xb3},
+	{value: 0x00b1, lo: 0xb2, hi: 0xb2},
+	{value: 0x00b9, lo: 0xb3, hi: 0xb3},
 	{value: 0x034d, lo: 0xb4, hi: 0xb4},
 	{value: 0x0395, lo: 0xb5, hi: 0xb5},
 	{value: 0xe1bd, lo: 0xb6, hi: 0xb6},
-	{value: 0x0279, lo: 0xb7, hi: 0xb7},
-	{value: 0x0289, lo: 0xb8, hi: 0xb8},
+	{value: 0x00c1, lo: 0xb7, hi: 0xb7},
+	{value: 0x00c9, lo: 0xb8, hi: 0xb8},
 	{value: 0x0008, lo: 0xb9, hi: 0xbf},
 	// Block 0x3, offset 0x25
 	{value: 0x0000, lo: 0x01},
@@ -2457,7 +2600,7 @@ var idnaSparseValues = [2146]valueRange{
 	// Block 0x6, offset 0x33
 	{value: 0x0000, lo: 0x0a},
 	{value: 0x0008, lo: 0x80, hi: 0x86},
-	{value: 0x0401, lo: 0x87, hi: 0x87},
+	{value: 0x0131, lo: 0x87, hi: 0x87},
 	{value: 0x0008, lo: 0x88, hi: 0x88},
 	{value: 0x0018, lo: 0x89, hi: 0x8a},
 	{value: 0x0040, lo: 0x8b, hi: 0x8c},
@@ -2643,7 +2786,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0008, lo: 0x81, hi: 0xb0},
 	{value: 0x3308, lo: 0xb1, hi: 0xb1},
 	{value: 0x0008, lo: 0xb2, hi: 0xb2},
-	{value: 0x08f1, lo: 0xb3, hi: 0xb3},
+	{value: 0x01f1, lo: 0xb3, hi: 0xb3},
 	{value: 0x3308, lo: 0xb4, hi: 0xb9},
 	{value: 0x3b08, lo: 0xba, hi: 0xba},
 	{value: 0x0040, lo: 0xbb, hi: 0xbe},
@@ -2666,8 +2809,8 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0x8e, hi: 0x8f},
 	{value: 0x0008, lo: 0x90, hi: 0x99},
 	{value: 0x0040, lo: 0x9a, hi: 0x9b},
-	{value: 0x0961, lo: 0x9c, hi: 0x9c},
-	{value: 0x0999, lo: 0x9d, hi: 0x9d},
+	{value: 0x0201, lo: 0x9c, hi: 0x9c},
+	{value: 0x0209, lo: 0x9d, hi: 0x9d},
 	{value: 0x0008, lo: 0x9e, hi: 0x9f},
 	{value: 0x0040, lo: 0xa0, hi: 0xbf},
 	// Block 0x18, offset 0xf9
@@ -3075,13 +3218,13 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0018, lo: 0xbe, hi: 0xbf},
 	// Block 0x44, offset 0x260
 	{value: 0x0000, lo: 0x0c},
-	{value: 0x0e29, lo: 0x80, hi: 0x80},
-	{value: 0x0e41, lo: 0x81, hi: 0x81},
-	{value: 0x0e59, lo: 0x82, hi: 0x82},
-	{value: 0x0e71, lo: 0x83, hi: 0x83},
-	{value: 0x0e89, lo: 0x84, hi: 0x85},
-	{value: 0x0ea1, lo: 0x86, hi: 0x86},
-	{value: 0x0eb9, lo: 0x87, hi: 0x87},
+	{value: 0x02a9, lo: 0x80, hi: 0x80},
+	{value: 0x02b1, lo: 0x81, hi: 0x81},
+	{value: 0x02b9, lo: 0x82, hi: 0x82},
+	{value: 0x02c1, lo: 0x83, hi: 0x83},
+	{value: 0x02c9, lo: 0x84, hi: 0x85},
+	{value: 0x02d1, lo: 0x86, hi: 0x86},
+	{value: 0x02d9, lo: 0x87, hi: 0x87},
 	{value: 0x057d, lo: 0x88, hi: 0x88},
 	{value: 0x0040, lo: 0x89, hi: 0x8f},
 	{value: 0x059d, lo: 0x90, hi: 0xba},
@@ -3133,18 +3276,18 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0x83, hi: 0x83},
 	{value: 0x0008, lo: 0x84, hi: 0x84},
 	{value: 0x0018, lo: 0x85, hi: 0x88},
-	{value: 0x24c1, lo: 0x89, hi: 0x89},
+	{value: 0x0851, lo: 0x89, hi: 0x89},
 	{value: 0x0018, lo: 0x8a, hi: 0x8b},
 	{value: 0x0040, lo: 0x8c, hi: 0x8f},
 	{value: 0x0018, lo: 0x90, hi: 0xbf},
 	// Block 0x4a, offset 0x29a
 	{value: 0x0000, lo: 0x07},
 	{value: 0x0018, lo: 0x80, hi: 0xab},
-	{value: 0x24f1, lo: 0xac, hi: 0xac},
-	{value: 0x2529, lo: 0xad, hi: 0xad},
+	{value: 0x0859, lo: 0xac, hi: 0xac},
+	{value: 0x0861, lo: 0xad, hi: 0xad},
 	{value: 0x0018, lo: 0xae, hi: 0xae},
-	{value: 0x2579, lo: 0xaf, hi: 0xaf},
-	{value: 0x25b1, lo: 0xb0, hi: 0xb0},
+	{value: 0x0869, lo: 0xaf, hi: 0xaf},
+	{value: 0x0871, lo: 0xb0, hi: 0xb0},
 	{value: 0x0018, lo: 0xb1, hi: 0xbf},
 	// Block 0x4b, offset 0x2a2
 	{value: 0x0000, lo: 0x05},
@@ -3166,19 +3309,19 @@ var idnaSparseValues = [2146]valueRange{
 	// Block 0x4e, offset 0x2b0
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0018, lo: 0x80, hi: 0x8b},
-	{value: 0x28c1, lo: 0x8c, hi: 0x8c},
+	{value: 0x0929, lo: 0x8c, hi: 0x8c},
 	{value: 0x0018, lo: 0x8d, hi: 0xbf},
 	// Block 0x4f, offset 0x2b4
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0018, lo: 0x80, hi: 0xb3},
 	{value: 0x0e7e, lo: 0xb4, hi: 0xb4},
-	{value: 0x292a, lo: 0xb5, hi: 0xb5},
+	{value: 0x0932, lo: 0xb5, hi: 0xb5},
 	{value: 0x0e9e, lo: 0xb6, hi: 0xb6},
 	{value: 0x0018, lo: 0xb7, hi: 0xbf},
 	// Block 0x50, offset 0x2ba
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0018, lo: 0x80, hi: 0x9b},
-	{value: 0x2941, lo: 0x9c, hi: 0x9c},
+	{value: 0x0939, lo: 0x9c, hi: 0x9c},
 	{value: 0x0018, lo: 0x9d, hi: 0xbf},
 	// Block 0x51, offset 0x2be
 	{value: 0x0000, lo: 0x03},
@@ -3277,16 +3420,16 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0008, lo: 0x80, hi: 0x96},
 	{value: 0x0040, lo: 0x97, hi: 0x98},
 	{value: 0x3308, lo: 0x99, hi: 0x9a},
-	{value: 0x29e2, lo: 0x9b, hi: 0x9b},
-	{value: 0x2a0a, lo: 0x9c, hi: 0x9c},
+	{value: 0x096a, lo: 0x9b, hi: 0x9b},
+	{value: 0x0972, lo: 0x9c, hi: 0x9c},
 	{value: 0x0008, lo: 0x9d, hi: 0x9e},
-	{value: 0x2a31, lo: 0x9f, hi: 0x9f},
+	{value: 0x0979, lo: 0x9f, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xa0},
 	{value: 0x0008, lo: 0xa1, hi: 0xbf},
 	// Block 0x61, offset 0x315
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0xbe},
-	{value: 0x2a69, lo: 0xbf, hi: 0xbf},
+	{value: 0x0981, lo: 0xbf, hi: 0xbf},
 	// Block 0x62, offset 0x318
 	{value: 0x0000, lo: 0x0e},
 	{value: 0x0040, lo: 0x80, hi: 0x84},
@@ -3309,46 +3452,58 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xa4, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xbf},
 	// Block 0x64, offset 0x32b
-	{value: 0x0030, lo: 0x04},
-	{value: 0x2aa2, lo: 0x80, hi: 0x9d},
-	{value: 0x305a, lo: 0x9e, hi: 0x9e},
+	{value: 0x0008, lo: 0x03},
+	{value: 0x098a, lo: 0x80, hi: 0x9e},
 	{value: 0x0040, lo: 0x9f, hi: 0x9f},
-	{value: 0x30a2, lo: 0xa0, hi: 0xbf},
-	// Block 0x65, offset 0x330
+	{value: 0x0a82, lo: 0xa0, hi: 0xbf},
+	// Block 0x65, offset 0x32f
+	{value: 0x0008, lo: 0x01},
+	{value: 0x0d19, lo: 0x80, hi: 0xbf},
+	// Block 0x66, offset 0x331
+	{value: 0x0008, lo: 0x08},
+	{value: 0x0f19, lo: 0x80, hi: 0xb0},
+	{value: 0x4045, lo: 0xb1, hi: 0xb1},
+	{value: 0x10a1, lo: 0xb2, hi: 0xb3},
+	{value: 0x4065, lo: 0xb4, hi: 0xb4},
+	{value: 0x10b1, lo: 0xb5, hi: 0xb7},
+	{value: 0x4085, lo: 0xb8, hi: 0xb8},
+	{value: 0x4085, lo: 0xb9, hi: 0xb9},
+	{value: 0x10c9, lo: 0xba, hi: 0xbf},
+	// Block 0x67, offset 0x33a
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0xbc},
 	{value: 0x0040, lo: 0xbd, hi: 0xbf},
-	// Block 0x66, offset 0x333
+	// Block 0x68, offset 0x33d
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0008, lo: 0x80, hi: 0x8c},
 	{value: 0x0040, lo: 0x8d, hi: 0x8f},
 	{value: 0x0018, lo: 0x90, hi: 0xbf},
-	// Block 0x67, offset 0x337
+	// Block 0x69, offset 0x341
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0018, lo: 0x80, hi: 0x86},
 	{value: 0x0040, lo: 0x87, hi: 0x8f},
 	{value: 0x0008, lo: 0x90, hi: 0xbd},
 	{value: 0x0018, lo: 0xbe, hi: 0xbf},
-	// Block 0x68, offset 0x33c
+	// Block 0x6a, offset 0x346
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0x8c},
 	{value: 0x0018, lo: 0x8d, hi: 0x8f},
 	{value: 0x0008, lo: 0x90, hi: 0xab},
 	{value: 0x0040, lo: 0xac, hi: 0xbf},
-	// Block 0x69, offset 0x341
+	// Block 0x6b, offset 0x34b
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0008, lo: 0x80, hi: 0xa5},
 	{value: 0x0018, lo: 0xa6, hi: 0xaf},
 	{value: 0x3308, lo: 0xb0, hi: 0xb1},
 	{value: 0x0018, lo: 0xb2, hi: 0xb7},
 	{value: 0x0040, lo: 0xb8, hi: 0xbf},
-	// Block 0x6a, offset 0x347
+	// Block 0x6c, offset 0x351
 	{value: 0x0000, lo: 0x10},
 	{value: 0x0040, lo: 0x80, hi: 0x81},
 	{value: 0xe00d, lo: 0x82, hi: 0x82},
 	{value: 0x0008, lo: 0x83, hi: 0x83},
 	{value: 0x03f5, lo: 0x84, hi: 0x84},
-	{value: 0x1329, lo: 0x85, hi: 0x85},
+	{value: 0x0479, lo: 0x85, hi: 0x85},
 	{value: 0x447d, lo: 0x86, hi: 0x86},
 	{value: 0xe07d, lo: 0x87, hi: 0x87},
 	{value: 0x0008, lo: 0x88, hi: 0x88},
@@ -3357,10 +3512,10 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0x8b, hi: 0xb4},
 	{value: 0xe01d, lo: 0xb5, hi: 0xb5},
 	{value: 0x0008, lo: 0xb6, hi: 0xb7},
-	{value: 0x2009, lo: 0xb8, hi: 0xb8},
-	{value: 0x6ec1, lo: 0xb9, hi: 0xb9},
+	{value: 0x0741, lo: 0xb8, hi: 0xb8},
+	{value: 0x13f1, lo: 0xb9, hi: 0xb9},
 	{value: 0x0008, lo: 0xba, hi: 0xbf},
-	// Block 0x6b, offset 0x358
+	// Block 0x6d, offset 0x362
 	{value: 0x0000, lo: 0x0f},
 	{value: 0x0008, lo: 0x80, hi: 0x81},
 	{value: 0x3308, lo: 0x82, hi: 0x82},
@@ -3377,19 +3532,19 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xad, hi: 0xaf},
 	{value: 0x0018, lo: 0xb0, hi: 0xb9},
 	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0x6c, offset 0x368
+	// Block 0x6e, offset 0x372
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0208, lo: 0x80, hi: 0xb1},
 	{value: 0x0108, lo: 0xb2, hi: 0xb2},
 	{value: 0x0008, lo: 0xb3, hi: 0xb3},
 	{value: 0x0018, lo: 0xb4, hi: 0xb7},
 	{value: 0x0040, lo: 0xb8, hi: 0xbf},
-	// Block 0x6d, offset 0x36e
+	// Block 0x6f, offset 0x378
 	{value: 0x0000, lo: 0x03},
 	{value: 0x3008, lo: 0x80, hi: 0x81},
 	{value: 0x0008, lo: 0x82, hi: 0xb3},
 	{value: 0x3008, lo: 0xb4, hi: 0xbf},
-	// Block 0x6e, offset 0x372
+	// Block 0x70, offset 0x37c
 	{value: 0x0000, lo: 0x0e},
 	{value: 0x3008, lo: 0x80, hi: 0x83},
 	{value: 0x3b08, lo: 0x84, hi: 0x84},
@@ -3405,13 +3560,13 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0018, lo: 0xbc, hi: 0xbc},
 	{value: 0x0008, lo: 0xbd, hi: 0xbe},
 	{value: 0x3308, lo: 0xbf, hi: 0xbf},
-	// Block 0x6f, offset 0x381
+	// Block 0x71, offset 0x38b
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0xa5},
 	{value: 0x3308, lo: 0xa6, hi: 0xad},
 	{value: 0x0018, lo: 0xae, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x70, offset 0x386
+	// Block 0x72, offset 0x390
 	{value: 0x0000, lo: 0x07},
 	{value: 0x0008, lo: 0x80, hi: 0x86},
 	{value: 0x3308, lo: 0x87, hi: 0x91},
@@ -3420,7 +3575,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0x94, hi: 0x9e},
 	{value: 0x0018, lo: 0x9f, hi: 0xbc},
 	{value: 0x0040, lo: 0xbd, hi: 0xbf},
-	// Block 0x71, offset 0x38e
+	// Block 0x73, offset 0x398
 	{value: 0x0000, lo: 0x09},
 	{value: 0x3308, lo: 0x80, hi: 0x82},
 	{value: 0x3008, lo: 0x83, hi: 0x83},
@@ -3431,7 +3586,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3008, lo: 0xba, hi: 0xbb},
 	{value: 0x3308, lo: 0xbc, hi: 0xbd},
 	{value: 0x3008, lo: 0xbe, hi: 0xbf},
-	// Block 0x72, offset 0x398
+	// Block 0x74, offset 0x3a2
 	{value: 0x0000, lo: 0x0a},
 	{value: 0x3808, lo: 0x80, hi: 0x80},
 	{value: 0x0018, lo: 0x81, hi: 0x8d},
@@ -3443,7 +3598,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3308, lo: 0xa5, hi: 0xa5},
 	{value: 0x0008, lo: 0xa6, hi: 0xbe},
 	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0x73, offset 0x3a3
+	// Block 0x75, offset 0x3ad
 	{value: 0x0000, lo: 0x07},
 	{value: 0x0008, lo: 0x80, hi: 0xa8},
 	{value: 0x3308, lo: 0xa9, hi: 0xae},
@@ -3452,7 +3607,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3008, lo: 0xb3, hi: 0xb4},
 	{value: 0x3308, lo: 0xb5, hi: 0xb6},
 	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0x74, offset 0x3ab
+	// Block 0x76, offset 0x3b5
 	{value: 0x0000, lo: 0x10},
 	{value: 0x0008, lo: 0x80, hi: 0x82},
 	{value: 0x3308, lo: 0x83, hi: 0x83},
@@ -3470,7 +3625,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3308, lo: 0xbc, hi: 0xbc},
 	{value: 0x3008, lo: 0xbd, hi: 0xbd},
 	{value: 0x0008, lo: 0xbe, hi: 0xbf},
-	// Block 0x75, offset 0x3bc
+	// Block 0x77, offset 0x3c6
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0008, lo: 0x80, hi: 0xaf},
 	{value: 0x3308, lo: 0xb0, hi: 0xb0},
@@ -3480,7 +3635,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3308, lo: 0xb7, hi: 0xb8},
 	{value: 0x0008, lo: 0xb9, hi: 0xbd},
 	{value: 0x3308, lo: 0xbe, hi: 0xbf},
-	// Block 0x76, offset 0x3c5
+	// Block 0x78, offset 0x3cf
 	{value: 0x0000, lo: 0x0f},
 	{value: 0x0008, lo: 0x80, hi: 0x80},
 	{value: 0x3308, lo: 0x81, hi: 0x81},
@@ -3497,7 +3652,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3008, lo: 0xb5, hi: 0xb5},
 	{value: 0x3b08, lo: 0xb6, hi: 0xb6},
 	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0x77, offset 0x3d5
+	// Block 0x79, offset 0x3df
 	{value: 0x0000, lo: 0x0c},
 	{value: 0x0040, lo: 0x80, hi: 0x80},
 	{value: 0x0008, lo: 0x81, hi: 0x86},
@@ -3511,26 +3666,26 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0008, lo: 0xa8, hi: 0xae},
 	{value: 0x0040, lo: 0xaf, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x78, offset 0x3e2
+	// Block 0x7a, offset 0x3ec
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x0008, lo: 0x80, hi: 0x9a},
 	{value: 0x0018, lo: 0x9b, hi: 0x9b},
 	{value: 0x449d, lo: 0x9c, hi: 0x9c},
 	{value: 0x44b5, lo: 0x9d, hi: 0x9d},
-	{value: 0x2971, lo: 0x9e, hi: 0x9e},
+	{value: 0x0941, lo: 0x9e, hi: 0x9e},
 	{value: 0xe06d, lo: 0x9f, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xa8},
-	{value: 0x6ed9, lo: 0xa9, hi: 0xa9},
+	{value: 0x13f9, lo: 0xa9, hi: 0xa9},
 	{value: 0x0018, lo: 0xaa, hi: 0xab},
 	{value: 0x0040, lo: 0xac, hi: 0xaf},
 	{value: 0x44cd, lo: 0xb0, hi: 0xbf},
-	// Block 0x79, offset 0x3ee
+	// Block 0x7b, offset 0x3f8
 	{value: 0x0000, lo: 0x04},
 	{value: 0x44ed, lo: 0x80, hi: 0x8f},
 	{value: 0x450d, lo: 0x90, hi: 0x9f},
 	{value: 0x452d, lo: 0xa0, hi: 0xaf},
 	{value: 0x450d, lo: 0xb0, hi: 0xbf},
-	// Block 0x7a, offset 0x3f3
+	// Block 0x7c, offset 0x3fd
 	{value: 0x0000, lo: 0x0c},
 	{value: 0x0008, lo: 0x80, hi: 0xa2},
 	{value: 0x3008, lo: 0xa3, hi: 0xa4},
@@ -3544,76 +3699,76 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xae, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xb9},
 	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0x7b, offset 0x400
+	// Block 0x7d, offset 0x40a
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0008, lo: 0x80, hi: 0xa3},
 	{value: 0x0040, lo: 0xa4, hi: 0xaf},
 	{value: 0x0018, lo: 0xb0, hi: 0xbf},
-	// Block 0x7c, offset 0x404
+	// Block 0x7e, offset 0x40e
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0018, lo: 0x80, hi: 0x86},
 	{value: 0x0040, lo: 0x87, hi: 0x8a},
 	{value: 0x0018, lo: 0x8b, hi: 0xbb},
 	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0x7d, offset 0x409
+	// Block 0x7f, offset 0x413
 	{value: 0x0000, lo: 0x01},
 	{value: 0x0040, lo: 0x80, hi: 0xbf},
-	// Block 0x7e, offset 0x40b
+	// Block 0x80, offset 0x415
 	{value: 0x0020, lo: 0x01},
 	{value: 0x454d, lo: 0x80, hi: 0xbf},
-	// Block 0x7f, offset 0x40d
+	// Block 0x81, offset 0x417
 	{value: 0x0020, lo: 0x03},
 	{value: 0x4d4d, lo: 0x80, hi: 0x94},
 	{value: 0x4b0d, lo: 0x95, hi: 0x95},
 	{value: 0x4fed, lo: 0x96, hi: 0xbf},
-	// Block 0x80, offset 0x411
+	// Block 0x82, offset 0x41b
 	{value: 0x0020, lo: 0x01},
 	{value: 0x552d, lo: 0x80, hi: 0xbf},
-	// Block 0x81, offset 0x413
+	// Block 0x83, offset 0x41d
 	{value: 0x0020, lo: 0x03},
 	{value: 0x5d2d, lo: 0x80, hi: 0x84},
 	{value: 0x568d, lo: 0x85, hi: 0x85},
 	{value: 0x5dcd, lo: 0x86, hi: 0xbf},
-	// Block 0x82, offset 0x417
+	// Block 0x84, offset 0x421
 	{value: 0x0020, lo: 0x08},
 	{value: 0x6b8d, lo: 0x80, hi: 0x8f},
 	{value: 0x6d4d, lo: 0x90, hi: 0x90},
 	{value: 0x6d8d, lo: 0x91, hi: 0xab},
-	{value: 0x6ef1, lo: 0xac, hi: 0xac},
+	{value: 0x1401, lo: 0xac, hi: 0xac},
 	{value: 0x70ed, lo: 0xad, hi: 0xad},
 	{value: 0x0040, lo: 0xae, hi: 0xae},
 	{value: 0x0040, lo: 0xaf, hi: 0xaf},
 	{value: 0x710d, lo: 0xb0, hi: 0xbf},
-	// Block 0x83, offset 0x420
+	// Block 0x85, offset 0x42a
 	{value: 0x0020, lo: 0x05},
 	{value: 0x730d, lo: 0x80, hi: 0xad},
 	{value: 0x656d, lo: 0xae, hi: 0xae},
 	{value: 0x78cd, lo: 0xaf, hi: 0xb5},
 	{value: 0x6f8d, lo: 0xb6, hi: 0xb6},
 	{value: 0x79ad, lo: 0xb7, hi: 0xbf},
-	// Block 0x84, offset 0x426
-	{value: 0x0028, lo: 0x03},
-	{value: 0x7c71, lo: 0x80, hi: 0x82},
-	{value: 0x7c31, lo: 0x83, hi: 0x83},
-	{value: 0x7ce9, lo: 0x84, hi: 0xbf},
-	// Block 0x85, offset 0x42a
-	{value: 0x0038, lo: 0x0f},
-	{value: 0x9e01, lo: 0x80, hi: 0x83},
-	{value: 0x9ea9, lo: 0x84, hi: 0x85},
-	{value: 0x9ee1, lo: 0x86, hi: 0x87},
-	{value: 0x9f19, lo: 0x88, hi: 0x8f},
+	// Block 0x86, offset 0x430
+	{value: 0x0008, lo: 0x03},
+	{value: 0x1751, lo: 0x80, hi: 0x82},
+	{value: 0x1741, lo: 0x83, hi: 0x83},
+	{value: 0x1769, lo: 0x84, hi: 0xbf},
+	// Block 0x87, offset 0x434
+	{value: 0x0008, lo: 0x0f},
+	{value: 0x1d81, lo: 0x80, hi: 0x83},
+	{value: 0x1d99, lo: 0x84, hi: 0x85},
+	{value: 0x1da1, lo: 0x86, hi: 0x87},
+	{value: 0x1da9, lo: 0x88, hi: 0x8f},
 	{value: 0x0040, lo: 0x90, hi: 0x90},
 	{value: 0x0040, lo: 0x91, hi: 0x91},
-	{value: 0xa0d9, lo: 0x92, hi: 0x97},
-	{value: 0xa1f1, lo: 0x98, hi: 0x9c},
-	{value: 0xa2d1, lo: 0x9d, hi: 0xb3},
-	{value: 0x9d91, lo: 0xb4, hi: 0xb4},
-	{value: 0x9e01, lo: 0xb5, hi: 0xb5},
-	{value: 0xa7d9, lo: 0xb6, hi: 0xbb},
-	{value: 0xa8b9, lo: 0xbc, hi: 0xbc},
-	{value: 0xa849, lo: 0xbd, hi: 0xbd},
-	{value: 0xa929, lo: 0xbe, hi: 0xbf},
-	// Block 0x86, offset 0x43a
+	{value: 0x1de9, lo: 0x92, hi: 0x97},
+	{value: 0x1e11, lo: 0x98, hi: 0x9c},
+	{value: 0x1e31, lo: 0x9d, hi: 0xb3},
+	{value: 0x1d71, lo: 0xb4, hi: 0xb4},
+	{value: 0x1d81, lo: 0xb5, hi: 0xb5},
+	{value: 0x1ee9, lo: 0xb6, hi: 0xbb},
+	{value: 0x1f09, lo: 0xbc, hi: 0xbc},
+	{value: 0x1ef9, lo: 0xbd, hi: 0xbd},
+	{value: 0x1f19, lo: 0xbe, hi: 0xbf},
+	// Block 0x88, offset 0x444
 	{value: 0x0000, lo: 0x09},
 	{value: 0x0008, lo: 0x80, hi: 0x8b},
 	{value: 0x0040, lo: 0x8c, hi: 0x8c},
@@ -3624,24 +3779,24 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0008, lo: 0xbc, hi: 0xbd},
 	{value: 0x0040, lo: 0xbe, hi: 0xbe},
 	{value: 0x0008, lo: 0xbf, hi: 0xbf},
-	// Block 0x87, offset 0x444
+	// Block 0x89, offset 0x44e
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0x8d},
 	{value: 0x0040, lo: 0x8e, hi: 0x8f},
 	{value: 0x0008, lo: 0x90, hi: 0x9d},
 	{value: 0x0040, lo: 0x9e, hi: 0xbf},
-	// Block 0x88, offset 0x449
+	// Block 0x8a, offset 0x453
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0xba},
 	{value: 0x0040, lo: 0xbb, hi: 0xbf},
-	// Block 0x89, offset 0x44c
+	// Block 0x8b, offset 0x456
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0018, lo: 0x80, hi: 0x82},
 	{value: 0x0040, lo: 0x83, hi: 0x86},
 	{value: 0x0018, lo: 0x87, hi: 0xb3},
 	{value: 0x0040, lo: 0xb4, hi: 0xb6},
 	{value: 0x0018, lo: 0xb7, hi: 0xbf},
-	// Block 0x8a, offset 0x452
+	// Block 0x8c, offset 0x45c
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0018, lo: 0x80, hi: 0x8e},
 	{value: 0x0040, lo: 0x8f, hi: 0x8f},
@@ -3649,31 +3804,31 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0x9d, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xa0},
 	{value: 0x0040, lo: 0xa1, hi: 0xbf},
-	// Block 0x8b, offset 0x459
+	// Block 0x8d, offset 0x463
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0040, lo: 0x80, hi: 0x8f},
 	{value: 0x0018, lo: 0x90, hi: 0xbc},
 	{value: 0x3308, lo: 0xbd, hi: 0xbd},
 	{value: 0x0040, lo: 0xbe, hi: 0xbf},
-	// Block 0x8c, offset 0x45e
+	// Block 0x8e, offset 0x468
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0008, lo: 0x80, hi: 0x9c},
 	{value: 0x0040, lo: 0x9d, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x8d, offset 0x462
+	// Block 0x8f, offset 0x46c
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0008, lo: 0x80, hi: 0x90},
 	{value: 0x0040, lo: 0x91, hi: 0x9f},
 	{value: 0x3308, lo: 0xa0, hi: 0xa0},
 	{value: 0x0018, lo: 0xa1, hi: 0xbb},
 	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0x8e, offset 0x468
+	// Block 0x90, offset 0x472
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xa3},
 	{value: 0x0040, lo: 0xa4, hi: 0xac},
 	{value: 0x0008, lo: 0xad, hi: 0xbf},
-	// Block 0x8f, offset 0x46d
+	// Block 0x91, offset 0x477
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0008, lo: 0x80, hi: 0x80},
 	{value: 0x0018, lo: 0x81, hi: 0x81},
@@ -3683,20 +3838,20 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0008, lo: 0x90, hi: 0xb5},
 	{value: 0x3308, lo: 0xb6, hi: 0xba},
 	{value: 0x0040, lo: 0xbb, hi: 0xbf},
-	// Block 0x90, offset 0x476
+	// Block 0x92, offset 0x480
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0x9d},
 	{value: 0x0040, lo: 0x9e, hi: 0x9e},
 	{value: 0x0018, lo: 0x9f, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x91, offset 0x47b
+	// Block 0x93, offset 0x485
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0008, lo: 0x80, hi: 0x83},
 	{value: 0x0040, lo: 0x84, hi: 0x87},
 	{value: 0x0008, lo: 0x88, hi: 0x8f},
 	{value: 0x0018, lo: 0x90, hi: 0x95},
 	{value: 0x0040, lo: 0x96, hi: 0xbf},
-	// Block 0x92, offset 0x481
+	// Block 0x94, offset 0x48b
 	{value: 0x0000, lo: 0x06},
 	{value: 0xe145, lo: 0x80, hi: 0x87},
 	{value: 0xe1c5, lo: 0x88, hi: 0x8f},
@@ -3704,7 +3859,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x8b0d, lo: 0x98, hi: 0x9f},
 	{value: 0x8b25, lo: 0xa0, hi: 0xa7},
 	{value: 0x0008, lo: 0xa8, hi: 0xbf},
-	// Block 0x93, offset 0x488
+	// Block 0x95, offset 0x492
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0008, lo: 0x80, hi: 0x9d},
 	{value: 0x0040, lo: 0x9e, hi: 0x9f},
@@ -3712,7 +3867,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xaa, hi: 0xaf},
 	{value: 0x8b25, lo: 0xb0, hi: 0xb7},
 	{value: 0x8b0d, lo: 0xb8, hi: 0xbf},
-	// Block 0x94, offset 0x48f
+	// Block 0x96, offset 0x499
 	{value: 0x0000, lo: 0x06},
 	{value: 0xe145, lo: 0x80, hi: 0x87},
 	{value: 0xe1c5, lo: 0x88, hi: 0x8f},
@@ -3720,28 +3875,28 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0x94, hi: 0x97},
 	{value: 0x0008, lo: 0x98, hi: 0xbb},
 	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0x95, offset 0x496
+	// Block 0x97, offset 0x4a0
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0008, lo: 0x80, hi: 0xa7},
 	{value: 0x0040, lo: 0xa8, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x96, offset 0x49a
+	// Block 0x98, offset 0x4a4
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0xa3},
 	{value: 0x0040, lo: 0xa4, hi: 0xae},
 	{value: 0x0018, lo: 0xaf, hi: 0xaf},
 	{value: 0x0040, lo: 0xb0, hi: 0xbf},
-	// Block 0x97, offset 0x49f
+	// Block 0x99, offset 0x4a9
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0xb6},
 	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0x98, offset 0x4a2
+	// Block 0x9a, offset 0x4ac
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0x95},
 	{value: 0x0040, lo: 0x96, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xa7},
 	{value: 0x0040, lo: 0xa8, hi: 0xbf},
-	// Block 0x99, offset 0x4a7
+	// Block 0x9b, offset 0x4b1
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x0808, lo: 0x80, hi: 0x85},
 	{value: 0x0040, lo: 0x86, hi: 0x87},
@@ -3754,20 +3909,20 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0808, lo: 0xbc, hi: 0xbc},
 	{value: 0x0040, lo: 0xbd, hi: 0xbe},
 	{value: 0x0808, lo: 0xbf, hi: 0xbf},
-	// Block 0x9a, offset 0x4b3
+	// Block 0x9c, offset 0x4bd
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0808, lo: 0x80, hi: 0x95},
 	{value: 0x0040, lo: 0x96, hi: 0x96},
 	{value: 0x0818, lo: 0x97, hi: 0x9f},
 	{value: 0x0808, lo: 0xa0, hi: 0xb6},
 	{value: 0x0818, lo: 0xb7, hi: 0xbf},
-	// Block 0x9b, offset 0x4b9
+	// Block 0x9d, offset 0x4c3
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0808, lo: 0x80, hi: 0x9e},
 	{value: 0x0040, lo: 0x9f, hi: 0xa6},
 	{value: 0x0818, lo: 0xa7, hi: 0xaf},
 	{value: 0x0040, lo: 0xb0, hi: 0xbf},
-	// Block 0x9c, offset 0x4be
+	// Block 0x9e, offset 0x4c8
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0040, lo: 0x80, hi: 0x9f},
 	{value: 0x0808, lo: 0xa0, hi: 0xb2},
@@ -3775,7 +3930,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0808, lo: 0xb4, hi: 0xb5},
 	{value: 0x0040, lo: 0xb6, hi: 0xba},
 	{value: 0x0818, lo: 0xbb, hi: 0xbf},
-	// Block 0x9d, offset 0x4c5
+	// Block 0x9f, offset 0x4cf
 	{value: 0x0000, lo: 0x07},
 	{value: 0x0808, lo: 0x80, hi: 0x95},
 	{value: 0x0818, lo: 0x96, hi: 0x9b},
@@ -3784,18 +3939,18 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0808, lo: 0xa0, hi: 0xb9},
 	{value: 0x0040, lo: 0xba, hi: 0xbe},
 	{value: 0x0818, lo: 0xbf, hi: 0xbf},
-	// Block 0x9e, offset 0x4cd
+	// Block 0xa0, offset 0x4d7
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0808, lo: 0x80, hi: 0xb7},
 	{value: 0x0040, lo: 0xb8, hi: 0xbb},
 	{value: 0x0818, lo: 0xbc, hi: 0xbd},
 	{value: 0x0808, lo: 0xbe, hi: 0xbf},
-	// Block 0x9f, offset 0x4d2
+	// Block 0xa1, offset 0x4dc
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0818, lo: 0x80, hi: 0x8f},
 	{value: 0x0040, lo: 0x90, hi: 0x91},
 	{value: 0x0818, lo: 0x92, hi: 0xbf},
-	// Block 0xa0, offset 0x4d6
+	// Block 0xa2, offset 0x4e0
 	{value: 0x0000, lo: 0x0f},
 	{value: 0x0808, lo: 0x80, hi: 0x80},
 	{value: 0x3308, lo: 0x81, hi: 0x83},
@@ -3812,7 +3967,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3308, lo: 0xb8, hi: 0xba},
 	{value: 0x0040, lo: 0xbb, hi: 0xbe},
 	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xa1, offset 0x4e6
+	// Block 0xa3, offset 0x4f0
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0818, lo: 0x80, hi: 0x88},
 	{value: 0x0040, lo: 0x89, hi: 0x8f},
@@ -3820,17 +3975,17 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0x99, hi: 0x9f},
 	{value: 0x0808, lo: 0xa0, hi: 0xbc},
 	{value: 0x0818, lo: 0xbd, hi: 0xbf},
-	// Block 0xa2, offset 0x4ed
+	// Block 0xa4, offset 0x4f7
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0808, lo: 0x80, hi: 0x9c},
 	{value: 0x0818, lo: 0x9d, hi: 0x9f},
 	{value: 0x0040, lo: 0xa0, hi: 0xbf},
-	// Block 0xa3, offset 0x4f1
+	// Block 0xa5, offset 0x4fb
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0808, lo: 0x80, hi: 0xb5},
 	{value: 0x0040, lo: 0xb6, hi: 0xb8},
 	{value: 0x0018, lo: 0xb9, hi: 0xbf},
-	// Block 0xa4, offset 0x4f5
+	// Block 0xa6, offset 0x4ff
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0808, lo: 0x80, hi: 0x95},
 	{value: 0x0040, lo: 0x96, hi: 0x97},
@@ -3838,23 +3993,23 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0808, lo: 0xa0, hi: 0xb2},
 	{value: 0x0040, lo: 0xb3, hi: 0xb7},
 	{value: 0x0818, lo: 0xb8, hi: 0xbf},
-	// Block 0xa5, offset 0x4fc
+	// Block 0xa7, offset 0x506
 	{value: 0x0000, lo: 0x01},
 	{value: 0x0808, lo: 0x80, hi: 0xbf},
-	// Block 0xa6, offset 0x4fe
+	// Block 0xa8, offset 0x508
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0808, lo: 0x80, hi: 0x88},
 	{value: 0x0040, lo: 0x89, hi: 0xbf},
-	// Block 0xa7, offset 0x501
+	// Block 0xa9, offset 0x50b
 	{value: 0x0000, lo: 0x02},
 	{value: 0x03dd, lo: 0x80, hi: 0xb2},
 	{value: 0x0040, lo: 0xb3, hi: 0xbf},
-	// Block 0xa8, offset 0x504
+	// Block 0xaa, offset 0x50e
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0808, lo: 0x80, hi: 0xb2},
 	{value: 0x0040, lo: 0xb3, hi: 0xb9},
 	{value: 0x0818, lo: 0xba, hi: 0xbf},
-	// Block 0xa9, offset 0x508
+	// Block 0xab, offset 0x512
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0908, lo: 0x80, hi: 0x80},
 	{value: 0x0a08, lo: 0x81, hi: 0xa1},
@@ -3864,12 +4019,12 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xa8, hi: 0xaf},
 	{value: 0x0808, lo: 0xb0, hi: 0xb9},
 	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0xaa, offset 0x511
+	// Block 0xac, offset 0x51b
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0040, lo: 0x80, hi: 0x9f},
 	{value: 0x0818, lo: 0xa0, hi: 0xbe},
 	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0xab, offset 0x515
+	// Block 0xad, offset 0x51f
 	{value: 0x0000, lo: 0x07},
 	{value: 0x0808, lo: 0x80, hi: 0xa9},
 	{value: 0x0040, lo: 0xaa, hi: 0xaa},
@@ -3878,7 +4033,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xae, hi: 0xaf},
 	{value: 0x0808, lo: 0xb0, hi: 0xb1},
 	{value: 0x0040, lo: 0xb2, hi: 0xbf},
-	// Block 0xac, offset 0x51d
+	// Block 0xae, offset 0x527
 	{value: 0x0000, lo: 0x07},
 	{value: 0x0808, lo: 0x80, hi: 0x9c},
 	{value: 0x0818, lo: 0x9d, hi: 0xa6},
@@ -3887,7 +4042,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0a08, lo: 0xb0, hi: 0xb2},
 	{value: 0x0c08, lo: 0xb3, hi: 0xb3},
 	{value: 0x0a08, lo: 0xb4, hi: 0xbf},
-	// Block 0xad, offset 0x525
+	// Block 0xaf, offset 0x52f
 	{value: 0x0000, lo: 0x07},
 	{value: 0x0a08, lo: 0x80, hi: 0x84},
 	{value: 0x0808, lo: 0x85, hi: 0x85},
@@ -3896,7 +4051,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0c18, lo: 0x94, hi: 0x94},
 	{value: 0x0818, lo: 0x95, hi: 0x99},
 	{value: 0x0040, lo: 0x9a, hi: 0xbf},
-	// Block 0xae, offset 0x52d
+	// Block 0xb0, offset 0x537
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x0040, lo: 0x80, hi: 0xaf},
 	{value: 0x0a08, lo: 0xb0, hi: 0xb0},
@@ -3909,7 +4064,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0a08, lo: 0xbb, hi: 0xbc},
 	{value: 0x0c08, lo: 0xbd, hi: 0xbd},
 	{value: 0x0a08, lo: 0xbe, hi: 0xbf},
-	// Block 0xaf, offset 0x539
+	// Block 0xb1, offset 0x543
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x0808, lo: 0x80, hi: 0x80},
 	{value: 0x0a08, lo: 0x81, hi: 0x81},
@@ -3922,14 +4077,14 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0x8c, hi: 0x9f},
 	{value: 0x0808, lo: 0xa0, hi: 0xb6},
 	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0xb0, offset 0x545
+	// Block 0xb2, offset 0x54f
 	{value: 0x0000, lo: 0x05},
 	{value: 0x3008, lo: 0x80, hi: 0x80},
 	{value: 0x3308, lo: 0x81, hi: 0x81},
 	{value: 0x3008, lo: 0x82, hi: 0x82},
 	{value: 0x0008, lo: 0x83, hi: 0xb7},
 	{value: 0x3308, lo: 0xb8, hi: 0xbf},
-	// Block 0xb1, offset 0x54b
+	// Block 0xb3, offset 0x555
 	{value: 0x0000, lo: 0x08},
 	{value: 0x3308, lo: 0x80, hi: 0x85},
 	{value: 0x3b08, lo: 0x86, hi: 0x86},
@@ -3939,7 +4094,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0008, lo: 0xa6, hi: 0xaf},
 	{value: 0x0040, lo: 0xb0, hi: 0xbe},
 	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xb2, offset 0x554
+	// Block 0xb4, offset 0x55e
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x3308, lo: 0x80, hi: 0x81},
 	{value: 0x3008, lo: 0x82, hi: 0x82},
@@ -3952,7 +4107,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0018, lo: 0xbb, hi: 0xbc},
 	{value: 0x0040, lo: 0xbd, hi: 0xbd},
 	{value: 0x0018, lo: 0xbe, hi: 0xbf},
-	// Block 0xb3, offset 0x560
+	// Block 0xb5, offset 0x56a
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0018, lo: 0x80, hi: 0x81},
 	{value: 0x0040, lo: 0x82, hi: 0x8f},
@@ -3960,7 +4115,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xa9, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xb9},
 	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0xb4, offset 0x567
+	// Block 0xb6, offset 0x571
 	{value: 0x0000, lo: 0x08},
 	{value: 0x3308, lo: 0x80, hi: 0x82},
 	{value: 0x0008, lo: 0x83, hi: 0xa6},
@@ -3970,7 +4125,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3b08, lo: 0xb3, hi: 0xb4},
 	{value: 0x0040, lo: 0xb5, hi: 0xb5},
 	{value: 0x0008, lo: 0xb6, hi: 0xbf},
-	// Block 0xb5, offset 0x570
+	// Block 0xb7, offset 0x57a
 	{value: 0x0000, lo: 0x0a},
 	{value: 0x0018, lo: 0x80, hi: 0x83},
 	{value: 0x0008, lo: 0x84, hi: 0x84},
@@ -3982,7 +4137,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0018, lo: 0xb4, hi: 0xb5},
 	{value: 0x0008, lo: 0xb6, hi: 0xb6},
 	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0xb6, offset 0x57b
+	// Block 0xb8, offset 0x585
 	{value: 0x0000, lo: 0x06},
 	{value: 0x3308, lo: 0x80, hi: 0x81},
 	{value: 0x3008, lo: 0x82, hi: 0x82},
@@ -3990,7 +4145,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3008, lo: 0xb3, hi: 0xb5},
 	{value: 0x3308, lo: 0xb6, hi: 0xbe},
 	{value: 0x3008, lo: 0xbf, hi: 0xbf},
-	// Block 0xb7, offset 0x582
+	// Block 0xb9, offset 0x58c
 	{value: 0x0000, lo: 0x0e},
 	{value: 0x3808, lo: 0x80, hi: 0x80},
 	{value: 0x0008, lo: 0x81, hi: 0x84},
@@ -4006,7 +4161,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xa0, hi: 0xa0},
 	{value: 0x0018, lo: 0xa1, hi: 0xb4},
 	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0xb8, offset 0x591
+	// Block 0xba, offset 0x59b
 	{value: 0x0000, lo: 0x0c},
 	{value: 0x0008, lo: 0x80, hi: 0x91},
 	{value: 0x0040, lo: 0x92, hi: 0x92},
@@ -4020,7 +4175,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0018, lo: 0xb8, hi: 0xbd},
 	{value: 0x3308, lo: 0xbe, hi: 0xbe},
 	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0xb9, offset 0x59e
+	// Block 0xbb, offset 0x5a8
 	{value: 0x0000, lo: 0x0c},
 	{value: 0x0008, lo: 0x80, hi: 0x86},
 	{value: 0x0040, lo: 0x87, hi: 0x87},
@@ -4034,7 +4189,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0018, lo: 0xa9, hi: 0xa9},
 	{value: 0x0040, lo: 0xaa, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0xba, offset 0x5ab
+	// Block 0xbc, offset 0x5b5
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0008, lo: 0x80, hi: 0x9e},
 	{value: 0x3308, lo: 0x9f, hi: 0x9f},
@@ -4044,12 +4199,12 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xab, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xb9},
 	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0xbb, offset 0x5b4
+	// Block 0xbd, offset 0x5be
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0008, lo: 0x80, hi: 0xb4},
 	{value: 0x3008, lo: 0xb5, hi: 0xb7},
 	{value: 0x3308, lo: 0xb8, hi: 0xbf},
-	// Block 0xbc, offset 0x5b8
+	// Block 0xbe, offset 0x5c2
 	{value: 0x0000, lo: 0x0e},
 	{value: 0x3008, lo: 0x80, hi: 0x81},
 	{value: 0x3b08, lo: 0x82, hi: 0x82},
@@ -4065,7 +4220,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3308, lo: 0x9e, hi: 0x9e},
 	{value: 0x0008, lo: 0x9f, hi: 0xa1},
 	{value: 0x0040, lo: 0xa2, hi: 0xbf},
-	// Block 0xbd, offset 0x5c7
+	// Block 0xbf, offset 0x5d1
 	{value: 0x0000, lo: 0x07},
 	{value: 0x0008, lo: 0x80, hi: 0xaf},
 	{value: 0x3008, lo: 0xb0, hi: 0xb2},
@@ -4074,7 +4229,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3308, lo: 0xba, hi: 0xba},
 	{value: 0x3008, lo: 0xbb, hi: 0xbe},
 	{value: 0x3308, lo: 0xbf, hi: 0xbf},
-	// Block 0xbe, offset 0x5cf
+	// Block 0xc0, offset 0x5d9
 	{value: 0x0000, lo: 0x0a},
 	{value: 0x3308, lo: 0x80, hi: 0x80},
 	{value: 0x3008, lo: 0x81, hi: 0x81},
@@ -4086,7 +4241,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0x88, hi: 0x8f},
 	{value: 0x0008, lo: 0x90, hi: 0x99},
 	{value: 0x0040, lo: 0x9a, hi: 0xbf},
-	// Block 0xbf, offset 0x5da
+	// Block 0xc1, offset 0x5e4
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0008, lo: 0x80, hi: 0xae},
 	{value: 0x3008, lo: 0xaf, hi: 0xb1},
@@ -4096,14 +4251,14 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3308, lo: 0xbc, hi: 0xbd},
 	{value: 0x3008, lo: 0xbe, hi: 0xbe},
 	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xc0, offset 0x5e3
+	// Block 0xc2, offset 0x5ed
 	{value: 0x0000, lo: 0x05},
 	{value: 0x3308, lo: 0x80, hi: 0x80},
 	{value: 0x0018, lo: 0x81, hi: 0x97},
 	{value: 0x0008, lo: 0x98, hi: 0x9b},
 	{value: 0x3308, lo: 0x9c, hi: 0x9d},
 	{value: 0x0040, lo: 0x9e, hi: 0xbf},
-	// Block 0xc1, offset 0x5e9
+	// Block 0xc3, offset 0x5f3
 	{value: 0x0000, lo: 0x07},
 	{value: 0x0008, lo: 0x80, hi: 0xaf},
 	{value: 0x3008, lo: 0xb0, hi: 0xb2},
@@ -4112,7 +4267,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3308, lo: 0xbd, hi: 0xbd},
 	{value: 0x3008, lo: 0xbe, hi: 0xbe},
 	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xc2, offset 0x5f1
+	// Block 0xc4, offset 0x5fb
 	{value: 0x0000, lo: 0x08},
 	{value: 0x3308, lo: 0x80, hi: 0x80},
 	{value: 0x0018, lo: 0x81, hi: 0x83},
@@ -4122,7 +4277,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0x9a, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xac},
 	{value: 0x0040, lo: 0xad, hi: 0xbf},
-	// Block 0xc3, offset 0x5fa
+	// Block 0xc5, offset 0x604
 	{value: 0x0000, lo: 0x0a},
 	{value: 0x0008, lo: 0x80, hi: 0xaa},
 	{value: 0x3308, lo: 0xab, hi: 0xab},
@@ -4134,11 +4289,11 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3308, lo: 0xb7, hi: 0xb7},
 	{value: 0x0008, lo: 0xb8, hi: 0xb8},
 	{value: 0x0040, lo: 0xb9, hi: 0xbf},
-	// Block 0xc4, offset 0x605
+	// Block 0xc6, offset 0x60f
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x89},
 	{value: 0x0040, lo: 0x8a, hi: 0xbf},
-	// Block 0xc5, offset 0x608
+	// Block 0xc7, offset 0x612
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x0008, lo: 0x80, hi: 0x9a},
 	{value: 0x0040, lo: 0x9b, hi: 0x9c},
@@ -4151,7 +4306,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xac, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xb9},
 	{value: 0x0018, lo: 0xba, hi: 0xbf},
-	// Block 0xc6, offset 0x614
+	// Block 0xc8, offset 0x61e
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0008, lo: 0x80, hi: 0xab},
 	{value: 0x3008, lo: 0xac, hi: 0xae},
@@ -4161,17 +4316,17 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3308, lo: 0xba, hi: 0xba},
 	{value: 0x0018, lo: 0xbb, hi: 0xbb},
 	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0xc7, offset 0x61d
+	// Block 0xc9, offset 0x627
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0040, lo: 0x80, hi: 0x9f},
 	{value: 0x049d, lo: 0xa0, hi: 0xbf},
-	// Block 0xc8, offset 0x620
+	// Block 0xca, offset 0x62a
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0xa9},
 	{value: 0x0018, lo: 0xaa, hi: 0xb2},
 	{value: 0x0040, lo: 0xb3, hi: 0xbe},
 	{value: 0x0008, lo: 0xbf, hi: 0xbf},
-	// Block 0xc9, offset 0x625
+	// Block 0xcb, offset 0x62f
 	{value: 0x0000, lo: 0x08},
 	{value: 0x3008, lo: 0x80, hi: 0x80},
 	{value: 0x0008, lo: 0x81, hi: 0x81},
@@ -4181,13 +4336,13 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0x87, hi: 0x8f},
 	{value: 0x0008, lo: 0x90, hi: 0x99},
 	{value: 0x0040, lo: 0x9a, hi: 0xbf},
-	// Block 0xca, offset 0x62e
+	// Block 0xcc, offset 0x638
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0040, lo: 0x80, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xa7},
 	{value: 0x0040, lo: 0xa8, hi: 0xa9},
 	{value: 0x0008, lo: 0xaa, hi: 0xbf},
-	// Block 0xcb, offset 0x633
+	// Block 0xcd, offset 0x63d
 	{value: 0x0000, lo: 0x0c},
 	{value: 0x0008, lo: 0x80, hi: 0x90},
 	{value: 0x3008, lo: 0x91, hi: 0x93},
@@ -4201,7 +4356,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0008, lo: 0xa3, hi: 0xa3},
 	{value: 0x3008, lo: 0xa4, hi: 0xa4},
 	{value: 0x0040, lo: 0xa5, hi: 0xbf},
-	// Block 0xcc, offset 0x640
+	// Block 0xce, offset 0x64a
 	{value: 0x0000, lo: 0x0a},
 	{value: 0x0008, lo: 0x80, hi: 0x80},
 	{value: 0x3308, lo: 0x81, hi: 0x8a},
@@ -4213,7 +4368,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0008, lo: 0xba, hi: 0xba},
 	{value: 0x3308, lo: 0xbb, hi: 0xbe},
 	{value: 0x0018, lo: 0xbf, hi: 0xbf},
-	// Block 0xcd, offset 0x64b
+	// Block 0xcf, offset 0x655
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0018, lo: 0x80, hi: 0x86},
 	{value: 0x3b08, lo: 0x87, hi: 0x87},
@@ -4223,7 +4378,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3008, lo: 0x97, hi: 0x98},
 	{value: 0x3308, lo: 0x99, hi: 0x9b},
 	{value: 0x0008, lo: 0x9c, hi: 0xbf},
-	// Block 0xce, offset 0x654
+	// Block 0xd0, offset 0x65e
 	{value: 0x0000, lo: 0x09},
 	{value: 0x0008, lo: 0x80, hi: 0x89},
 	{value: 0x3308, lo: 0x8a, hi: 0x96},
@@ -4234,11 +4389,11 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0008, lo: 0x9d, hi: 0x9d},
 	{value: 0x0018, lo: 0x9e, hi: 0xa2},
 	{value: 0x0040, lo: 0xa3, hi: 0xbf},
-	// Block 0xcf, offset 0x65e
+	// Block 0xd1, offset 0x668
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0xb8},
 	{value: 0x0040, lo: 0xb9, hi: 0xbf},
-	// Block 0xd0, offset 0x661
+	// Block 0xd2, offset 0x66b
 	{value: 0x0000, lo: 0x09},
 	{value: 0x0008, lo: 0x80, hi: 0x88},
 	{value: 0x0040, lo: 0x89, hi: 0x89},
@@ -4249,7 +4404,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3308, lo: 0xb8, hi: 0xbd},
 	{value: 0x3008, lo: 0xbe, hi: 0xbe},
 	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xd1, offset 0x66b
+	// Block 0xd3, offset 0x675
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0008, lo: 0x80, hi: 0x80},
 	{value: 0x0018, lo: 0x81, hi: 0x85},
@@ -4259,7 +4414,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xad, hi: 0xaf},
 	{value: 0x0018, lo: 0xb0, hi: 0xb1},
 	{value: 0x0008, lo: 0xb2, hi: 0xbf},
-	// Block 0xd2, offset 0x674
+	// Block 0xd4, offset 0x67e
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x0008, lo: 0x80, hi: 0x8f},
 	{value: 0x0040, lo: 0x90, hi: 0x91},
@@ -4272,7 +4427,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3008, lo: 0xb4, hi: 0xb4},
 	{value: 0x3308, lo: 0xb5, hi: 0xb6},
 	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0xd3, offset 0x680
+	// Block 0xd5, offset 0x68a
 	{value: 0x0000, lo: 0x0c},
 	{value: 0x0008, lo: 0x80, hi: 0x86},
 	{value: 0x0040, lo: 0x87, hi: 0x87},
@@ -4286,7 +4441,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3308, lo: 0xbc, hi: 0xbd},
 	{value: 0x0040, lo: 0xbe, hi: 0xbe},
 	{value: 0x3308, lo: 0xbf, hi: 0xbf},
-	// Block 0xd4, offset 0x68d
+	// Block 0xd6, offset 0x697
 	{value: 0x0000, lo: 0x0c},
 	{value: 0x3308, lo: 0x80, hi: 0x83},
 	{value: 0x3b08, lo: 0x84, hi: 0x85},
@@ -4300,7 +4455,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0008, lo: 0xa7, hi: 0xa8},
 	{value: 0x0040, lo: 0xa9, hi: 0xa9},
 	{value: 0x0008, lo: 0xaa, hi: 0xbf},
-	// Block 0xd5, offset 0x69a
+	// Block 0xd7, offset 0x6a4
 	{value: 0x0000, lo: 0x0d},
 	{value: 0x0008, lo: 0x80, hi: 0x89},
 	{value: 0x3008, lo: 0x8a, hi: 0x8e},
@@ -4315,7 +4470,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0x99, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xa9},
 	{value: 0x0040, lo: 0xaa, hi: 0xbf},
-	// Block 0xd6, offset 0x6a8
+	// Block 0xd8, offset 0x6b2
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0040, lo: 0x80, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xb2},
@@ -4323,41 +4478,41 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3008, lo: 0xb5, hi: 0xb6},
 	{value: 0x0018, lo: 0xb7, hi: 0xb8},
 	{value: 0x0040, lo: 0xb9, hi: 0xbf},
-	// Block 0xd7, offset 0x6af
+	// Block 0xd9, offset 0x6b9
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0040, lo: 0x80, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xb0},
 	{value: 0x0040, lo: 0xb1, hi: 0xbf},
-	// Block 0xd8, offset 0x6b3
+	// Block 0xda, offset 0x6bd
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0018, lo: 0x80, hi: 0xb1},
 	{value: 0x0040, lo: 0xb2, hi: 0xbe},
 	{value: 0x0018, lo: 0xbf, hi: 0xbf},
-	// Block 0xd9, offset 0x6b7
+	// Block 0xdb, offset 0x6c1
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x99},
 	{value: 0x0040, lo: 0x9a, hi: 0xbf},
-	// Block 0xda, offset 0x6ba
+	// Block 0xdc, offset 0x6c4
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0018, lo: 0x80, hi: 0xae},
 	{value: 0x0040, lo: 0xaf, hi: 0xaf},
 	{value: 0x0018, lo: 0xb0, hi: 0xb4},
 	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0xdb, offset 0x6bf
+	// Block 0xdd, offset 0x6c9
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x83},
 	{value: 0x0040, lo: 0x84, hi: 0xbf},
-	// Block 0xdc, offset 0x6c2
+	// Block 0xde, offset 0x6cc
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0xae},
 	{value: 0x0040, lo: 0xaf, hi: 0xaf},
 	{value: 0x0340, lo: 0xb0, hi: 0xb8},
 	{value: 0x0040, lo: 0xb9, hi: 0xbf},
-	// Block 0xdd, offset 0x6c7
+	// Block 0xdf, offset 0x6d1
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x86},
 	{value: 0x0040, lo: 0x87, hi: 0xbf},
-	// Block 0xde, offset 0x6ca
+	// Block 0xe0, offset 0x6d4
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0008, lo: 0x80, hi: 0x9e},
 	{value: 0x0040, lo: 0x9f, hi: 0x9f},
@@ -4365,7 +4520,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xaa, hi: 0xad},
 	{value: 0x0018, lo: 0xae, hi: 0xaf},
 	{value: 0x0040, lo: 0xb0, hi: 0xbf},
-	// Block 0xdf, offset 0x6d1
+	// Block 0xe1, offset 0x6db
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0040, lo: 0x80, hi: 0x8f},
 	{value: 0x0008, lo: 0x90, hi: 0xad},
@@ -4373,12 +4528,12 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x3308, lo: 0xb0, hi: 0xb4},
 	{value: 0x0018, lo: 0xb5, hi: 0xb5},
 	{value: 0x0040, lo: 0xb6, hi: 0xbf},
-	// Block 0xe0, offset 0x6d8
+	// Block 0xe2, offset 0x6e2
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0008, lo: 0x80, hi: 0xaf},
 	{value: 0x3308, lo: 0xb0, hi: 0xb6},
 	{value: 0x0018, lo: 0xb7, hi: 0xbf},
-	// Block 0xe1, offset 0x6dc
+	// Block 0xe3, offset 0x6e6
 	{value: 0x0000, lo: 0x0a},
 	{value: 0x0008, lo: 0x80, hi: 0x83},
 	{value: 0x0018, lo: 0x84, hi: 0x85},
@@ -4390,33 +4545,33 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0008, lo: 0xa3, hi: 0xb7},
 	{value: 0x0040, lo: 0xb8, hi: 0xbc},
 	{value: 0x0008, lo: 0xbd, hi: 0xbf},
-	// Block 0xe2, offset 0x6e7
+	// Block 0xe4, offset 0x6f1
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x8f},
 	{value: 0x0040, lo: 0x90, hi: 0xbf},
-	// Block 0xe3, offset 0x6ea
+	// Block 0xe5, offset 0x6f4
 	{value: 0x0000, lo: 0x02},
 	{value: 0xe105, lo: 0x80, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0xe4, offset 0x6ed
+	// Block 0xe6, offset 0x6f7
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0018, lo: 0x80, hi: 0x9a},
 	{value: 0x0040, lo: 0x9b, hi: 0xbf},
-	// Block 0xe5, offset 0x6f0
+	// Block 0xe7, offset 0x6fa
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0008, lo: 0x80, hi: 0x8a},
 	{value: 0x0040, lo: 0x8b, hi: 0x8e},
 	{value: 0x3308, lo: 0x8f, hi: 0x8f},
 	{value: 0x0008, lo: 0x90, hi: 0x90},
 	{value: 0x3008, lo: 0x91, hi: 0xbf},
-	// Block 0xe6, offset 0x6f6
+	// Block 0xe8, offset 0x700
 	{value: 0x0000, lo: 0x05},
 	{value: 0x3008, lo: 0x80, hi: 0x87},
 	{value: 0x0040, lo: 0x88, hi: 0x8e},
 	{value: 0x3308, lo: 0x8f, hi: 0x92},
 	{value: 0x0008, lo: 0x93, hi: 0x9f},
 	{value: 0x0040, lo: 0xa0, hi: 0xbf},
-	// Block 0xe7, offset 0x6fc
+	// Block 0xe9, offset 0x706
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0040, lo: 0x80, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xa1},
@@ -4426,23 +4581,23 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xa5, hi: 0xaf},
 	{value: 0x3008, lo: 0xb0, hi: 0xb1},
 	{value: 0x0040, lo: 0xb2, hi: 0xbf},
-	// Block 0xe8, offset 0x705
+	// Block 0xea, offset 0x70f
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0xb7},
 	{value: 0x0040, lo: 0xb8, hi: 0xbf},
-	// Block 0xe9, offset 0x708
+	// Block 0xeb, offset 0x712
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x95},
 	{value: 0x0040, lo: 0x96, hi: 0xbf},
-	// Block 0xea, offset 0x70b
+	// Block 0xec, offset 0x715
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x88},
 	{value: 0x0040, lo: 0x89, hi: 0xbf},
-	// Block 0xeb, offset 0x70e
+	// Block 0xed, offset 0x718
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x9e},
 	{value: 0x0040, lo: 0x9f, hi: 0xbf},
-	// Block 0xec, offset 0x711
+	// Block 0xee, offset 0x71b
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0040, lo: 0x80, hi: 0x8f},
 	{value: 0x0008, lo: 0x90, hi: 0x92},
@@ -4450,17 +4605,17 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0008, lo: 0xa4, hi: 0xa7},
 	{value: 0x0040, lo: 0xa8, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0xed, offset 0x718
+	// Block 0xef, offset 0x722
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0xbb},
 	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0xee, offset 0x71b
+	// Block 0xf0, offset 0x725
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0008, lo: 0x80, hi: 0xaa},
 	{value: 0x0040, lo: 0xab, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xbc},
 	{value: 0x0040, lo: 0xbd, hi: 0xbf},
-	// Block 0xef, offset 0x720
+	// Block 0xf1, offset 0x72a
 	{value: 0x0000, lo: 0x09},
 	{value: 0x0008, lo: 0x80, hi: 0x88},
 	{value: 0x0040, lo: 0x89, hi: 0x8f},
@@ -4471,32 +4626,32 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0018, lo: 0x9f, hi: 0x9f},
 	{value: 0x03c0, lo: 0xa0, hi: 0xa3},
 	{value: 0x0040, lo: 0xa4, hi: 0xbf},
-	// Block 0xf0, offset 0x72a
+	// Block 0xf2, offset 0x734
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0018, lo: 0x80, hi: 0xb5},
 	{value: 0x0040, lo: 0xb6, hi: 0xbf},
-	// Block 0xf1, offset 0x72d
+	// Block 0xf3, offset 0x737
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0018, lo: 0x80, hi: 0xa6},
 	{value: 0x0040, lo: 0xa7, hi: 0xa8},
 	{value: 0x0018, lo: 0xa9, hi: 0xbf},
-	// Block 0xf2, offset 0x731
+	// Block 0xf4, offset 0x73b
 	{value: 0x0000, lo: 0x0e},
 	{value: 0x0018, lo: 0x80, hi: 0x9d},
-	{value: 0xb609, lo: 0x9e, hi: 0x9e},
-	{value: 0xb651, lo: 0x9f, hi: 0x9f},
-	{value: 0xb699, lo: 0xa0, hi: 0xa0},
-	{value: 0xb701, lo: 0xa1, hi: 0xa1},
-	{value: 0xb769, lo: 0xa2, hi: 0xa2},
-	{value: 0xb7d1, lo: 0xa3, hi: 0xa3},
-	{value: 0xb839, lo: 0xa4, hi: 0xa4},
+	{value: 0x2211, lo: 0x9e, hi: 0x9e},
+	{value: 0x2219, lo: 0x9f, hi: 0x9f},
+	{value: 0x2221, lo: 0xa0, hi: 0xa0},
+	{value: 0x2229, lo: 0xa1, hi: 0xa1},
+	{value: 0x2231, lo: 0xa2, hi: 0xa2},
+	{value: 0x2239, lo: 0xa3, hi: 0xa3},
+	{value: 0x2241, lo: 0xa4, hi: 0xa4},
 	{value: 0x3018, lo: 0xa5, hi: 0xa6},
 	{value: 0x3318, lo: 0xa7, hi: 0xa9},
 	{value: 0x0018, lo: 0xaa, hi: 0xac},
 	{value: 0x3018, lo: 0xad, hi: 0xb2},
 	{value: 0x0340, lo: 0xb3, hi: 0xba},
 	{value: 0x3318, lo: 0xbb, hi: 0xbf},
-	// Block 0xf3, offset 0x740
+	// Block 0xf5, offset 0x74a
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x3318, lo: 0x80, hi: 0x82},
 	{value: 0x0018, lo: 0x83, hi: 0x84},
@@ -4504,45 +4659,45 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0018, lo: 0x8c, hi: 0xa9},
 	{value: 0x3318, lo: 0xaa, hi: 0xad},
 	{value: 0x0018, lo: 0xae, hi: 0xba},
-	{value: 0xb8a1, lo: 0xbb, hi: 0xbb},
-	{value: 0xb8e9, lo: 0xbc, hi: 0xbc},
-	{value: 0xb931, lo: 0xbd, hi: 0xbd},
-	{value: 0xb999, lo: 0xbe, hi: 0xbe},
-	{value: 0xba01, lo: 0xbf, hi: 0xbf},
-	// Block 0xf4, offset 0x74c
+	{value: 0x2249, lo: 0xbb, hi: 0xbb},
+	{value: 0x2251, lo: 0xbc, hi: 0xbc},
+	{value: 0x2259, lo: 0xbd, hi: 0xbd},
+	{value: 0x2261, lo: 0xbe, hi: 0xbe},
+	{value: 0x2269, lo: 0xbf, hi: 0xbf},
+	// Block 0xf6, offset 0x756
 	{value: 0x0000, lo: 0x03},
-	{value: 0xba69, lo: 0x80, hi: 0x80},
+	{value: 0x2271, lo: 0x80, hi: 0x80},
 	{value: 0x0018, lo: 0x81, hi: 0xa8},
 	{value: 0x0040, lo: 0xa9, hi: 0xbf},
-	// Block 0xf5, offset 0x750
+	// Block 0xf7, offset 0x75a
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0018, lo: 0x80, hi: 0x81},
 	{value: 0x3318, lo: 0x82, hi: 0x84},
 	{value: 0x0018, lo: 0x85, hi: 0x85},
 	{value: 0x0040, lo: 0x86, hi: 0xbf},
-	// Block 0xf6, offset 0x755
+	// Block 0xf8, offset 0x75f
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0040, lo: 0x80, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xb3},
 	{value: 0x0040, lo: 0xb4, hi: 0xbf},
-	// Block 0xf7, offset 0x759
+	// Block 0xf9, offset 0x763
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0018, lo: 0x80, hi: 0x96},
 	{value: 0x0040, lo: 0x97, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xb8},
 	{value: 0x0040, lo: 0xb9, hi: 0xbf},
-	// Block 0xf8, offset 0x75e
+	// Block 0xfa, offset 0x768
 	{value: 0x0000, lo: 0x03},
 	{value: 0x3308, lo: 0x80, hi: 0xb6},
 	{value: 0x0018, lo: 0xb7, hi: 0xba},
 	{value: 0x3308, lo: 0xbb, hi: 0xbf},
-	// Block 0xf9, offset 0x762
+	// Block 0xfb, offset 0x76c
 	{value: 0x0000, lo: 0x04},
 	{value: 0x3308, lo: 0x80, hi: 0xac},
 	{value: 0x0018, lo: 0xad, hi: 0xb4},
 	{value: 0x3308, lo: 0xb5, hi: 0xb5},
 	{value: 0x0018, lo: 0xb6, hi: 0xbf},
-	// Block 0xfa, offset 0x767
+	// Block 0xfc, offset 0x771
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0018, lo: 0x80, hi: 0x83},
 	{value: 0x3308, lo: 0x84, hi: 0x84},
@@ -4552,7 +4707,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xa0, hi: 0xa0},
 	{value: 0x3308, lo: 0xa1, hi: 0xaf},
 	{value: 0x0040, lo: 0xb0, hi: 0xbf},
-	// Block 0xfb, offset 0x770
+	// Block 0xfd, offset 0x77a
 	{value: 0x0000, lo: 0x0a},
 	{value: 0x3308, lo: 0x80, hi: 0x86},
 	{value: 0x0040, lo: 0x87, hi: 0x87},
@@ -4564,35 +4719,35 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xa5, hi: 0xa5},
 	{value: 0x3308, lo: 0xa6, hi: 0xaa},
 	{value: 0x0040, lo: 0xab, hi: 0xbf},
-	// Block 0xfc, offset 0x77b
+	// Block 0xfe, offset 0x785
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0008, lo: 0x80, hi: 0xac},
 	{value: 0x0040, lo: 0xad, hi: 0xaf},
 	{value: 0x3308, lo: 0xb0, hi: 0xb6},
 	{value: 0x0008, lo: 0xb7, hi: 0xbd},
 	{value: 0x0040, lo: 0xbe, hi: 0xbf},
-	// Block 0xfd, offset 0x781
+	// Block 0xff, offset 0x78b
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0008, lo: 0x80, hi: 0x89},
 	{value: 0x0040, lo: 0x8a, hi: 0x8d},
 	{value: 0x0008, lo: 0x8e, hi: 0x8e},
 	{value: 0x0018, lo: 0x8f, hi: 0x8f},
 	{value: 0x0040, lo: 0x90, hi: 0xbf},
-	// Block 0xfe, offset 0x787
+	// Block 0x100, offset 0x791
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0008, lo: 0x80, hi: 0xab},
 	{value: 0x3308, lo: 0xac, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xb9},
 	{value: 0x0040, lo: 0xba, hi: 0xbe},
 	{value: 0x0018, lo: 0xbf, hi: 0xbf},
-	// Block 0xff, offset 0x78d
+	// Block 0x101, offset 0x797
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0808, lo: 0x80, hi: 0x84},
 	{value: 0x0040, lo: 0x85, hi: 0x86},
 	{value: 0x0818, lo: 0x87, hi: 0x8f},
 	{value: 0x3308, lo: 0x90, hi: 0x96},
 	{value: 0x0040, lo: 0x97, hi: 0xbf},
-	// Block 0x100, offset 0x793
+	// Block 0x102, offset 0x79d
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0a08, lo: 0x80, hi: 0x83},
 	{value: 0x3308, lo: 0x84, hi: 0x8a},
@@ -4602,71 +4757,71 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0x9a, hi: 0x9d},
 	{value: 0x0818, lo: 0x9e, hi: 0x9f},
 	{value: 0x0040, lo: 0xa0, hi: 0xbf},
-	// Block 0x101, offset 0x79c
+	// Block 0x103, offset 0x7a6
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0040, lo: 0x80, hi: 0xb0},
 	{value: 0x0818, lo: 0xb1, hi: 0xbf},
-	// Block 0x102, offset 0x79f
+	// Block 0x104, offset 0x7a9
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0818, lo: 0x80, hi: 0xb4},
 	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0x103, offset 0x7a2
+	// Block 0x105, offset 0x7ac
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0040, lo: 0x80, hi: 0x80},
 	{value: 0x0818, lo: 0x81, hi: 0xbd},
 	{value: 0x0040, lo: 0xbe, hi: 0xbf},
-	// Block 0x104, offset 0x7a6
+	// Block 0x106, offset 0x7b0
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0040, lo: 0x80, hi: 0xaf},
 	{value: 0x0018, lo: 0xb0, hi: 0xb1},
 	{value: 0x0040, lo: 0xb2, hi: 0xbf},
-	// Block 0x105, offset 0x7aa
+	// Block 0x107, offset 0x7b4
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0018, lo: 0x80, hi: 0xab},
 	{value: 0x0040, lo: 0xac, hi: 0xaf},
 	{value: 0x0018, lo: 0xb0, hi: 0xbf},
-	// Block 0x106, offset 0x7ae
+	// Block 0x108, offset 0x7b8
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0018, lo: 0x80, hi: 0x93},
 	{value: 0x0040, lo: 0x94, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xae},
 	{value: 0x0040, lo: 0xaf, hi: 0xb0},
 	{value: 0x0018, lo: 0xb1, hi: 0xbf},
-	// Block 0x107, offset 0x7b4
+	// Block 0x109, offset 0x7be
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0040, lo: 0x80, hi: 0x80},
 	{value: 0x0018, lo: 0x81, hi: 0x8f},
 	{value: 0x0040, lo: 0x90, hi: 0x90},
 	{value: 0x0018, lo: 0x91, hi: 0xb5},
 	{value: 0x0040, lo: 0xb6, hi: 0xbf},
-	// Block 0x108, offset 0x7ba
+	// Block 0x10a, offset 0x7c4
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0018, lo: 0x80, hi: 0x8f},
-	{value: 0xc229, lo: 0x90, hi: 0x90},
+	{value: 0x2491, lo: 0x90, hi: 0x90},
 	{value: 0x0018, lo: 0x91, hi: 0xad},
 	{value: 0x0040, lo: 0xae, hi: 0xbf},
-	// Block 0x109, offset 0x7bf
+	// Block 0x10b, offset 0x7c9
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0040, lo: 0x80, hi: 0xa5},
 	{value: 0x0018, lo: 0xa6, hi: 0xbf},
-	// Block 0x10a, offset 0x7c2
+	// Block 0x10c, offset 0x7cc
 	{value: 0x0000, lo: 0x0f},
-	{value: 0xc851, lo: 0x80, hi: 0x80},
-	{value: 0xc8a1, lo: 0x81, hi: 0x81},
-	{value: 0xc8f1, lo: 0x82, hi: 0x82},
-	{value: 0xc941, lo: 0x83, hi: 0x83},
-	{value: 0xc991, lo: 0x84, hi: 0x84},
-	{value: 0xc9e1, lo: 0x85, hi: 0x85},
-	{value: 0xca31, lo: 0x86, hi: 0x86},
-	{value: 0xca81, lo: 0x87, hi: 0x87},
-	{value: 0xcad1, lo: 0x88, hi: 0x88},
+	{value: 0x2611, lo: 0x80, hi: 0x80},
+	{value: 0x2619, lo: 0x81, hi: 0x81},
+	{value: 0x2621, lo: 0x82, hi: 0x82},
+	{value: 0x2629, lo: 0x83, hi: 0x83},
+	{value: 0x2631, lo: 0x84, hi: 0x84},
+	{value: 0x2639, lo: 0x85, hi: 0x85},
+	{value: 0x2641, lo: 0x86, hi: 0x86},
+	{value: 0x2649, lo: 0x87, hi: 0x87},
+	{value: 0x2651, lo: 0x88, hi: 0x88},
 	{value: 0x0040, lo: 0x89, hi: 0x8f},
-	{value: 0xcb21, lo: 0x90, hi: 0x90},
-	{value: 0xcb41, lo: 0x91, hi: 0x91},
+	{value: 0x2659, lo: 0x90, hi: 0x90},
+	{value: 0x2661, lo: 0x91, hi: 0x91},
 	{value: 0x0040, lo: 0x92, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xa5},
 	{value: 0x0040, lo: 0xa6, hi: 0xbf},
-	// Block 0x10b, offset 0x7d2
+	// Block 0x10d, offset 0x7dc
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0018, lo: 0x80, hi: 0x97},
 	{value: 0x0040, lo: 0x98, hi: 0x9f},
@@ -4674,29 +4829,29 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xad, hi: 0xaf},
 	{value: 0x0018, lo: 0xb0, hi: 0xbc},
 	{value: 0x0040, lo: 0xbd, hi: 0xbf},
-	// Block 0x10c, offset 0x7d9
+	// Block 0x10e, offset 0x7e3
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0018, lo: 0x80, hi: 0xb3},
 	{value: 0x0040, lo: 0xb4, hi: 0xbf},
-	// Block 0x10d, offset 0x7dc
+	// Block 0x10f, offset 0x7e6
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0018, lo: 0x80, hi: 0x98},
 	{value: 0x0040, lo: 0x99, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xab},
 	{value: 0x0040, lo: 0xac, hi: 0xbf},
-	// Block 0x10e, offset 0x7e1
+	// Block 0x110, offset 0x7eb
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0018, lo: 0x80, hi: 0x8b},
 	{value: 0x0040, lo: 0x8c, hi: 0x8f},
 	{value: 0x0018, lo: 0x90, hi: 0xbf},
-	// Block 0x10f, offset 0x7e5
+	// Block 0x111, offset 0x7ef
 	{value: 0x0000, lo: 0x05},
 	{value: 0x0018, lo: 0x80, hi: 0x87},
 	{value: 0x0040, lo: 0x88, hi: 0x8f},
 	{value: 0x0018, lo: 0x90, hi: 0x99},
 	{value: 0x0040, lo: 0x9a, hi: 0x9f},
 	{value: 0x0018, lo: 0xa0, hi: 0xbf},
-	// Block 0x110, offset 0x7eb
+	// Block 0x112, offset 0x7f5
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0018, lo: 0x80, hi: 0x87},
 	{value: 0x0040, lo: 0x88, hi: 0x8f},
@@ -4704,17 +4859,17 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xae, hi: 0xaf},
 	{value: 0x0018, lo: 0xb0, hi: 0xb1},
 	{value: 0x0040, lo: 0xb2, hi: 0xbf},
-	// Block 0x111, offset 0x7f2
+	// Block 0x113, offset 0x7fc
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0018, lo: 0x80, hi: 0xb8},
 	{value: 0x0040, lo: 0xb9, hi: 0xb9},
 	{value: 0x0018, lo: 0xba, hi: 0xbf},
-	// Block 0x112, offset 0x7f6
+	// Block 0x114, offset 0x800
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0018, lo: 0x80, hi: 0x8b},
 	{value: 0x0040, lo: 0x8c, hi: 0x8c},
 	{value: 0x0018, lo: 0x8d, hi: 0xbf},
-	// Block 0x113, offset 0x7fa
+	// Block 0x115, offset 0x804
 	{value: 0x0000, lo: 0x08},
 	{value: 0x0018, lo: 0x80, hi: 0x93},
 	{value: 0x0040, lo: 0x94, hi: 0x9f},
@@ -4724,7 +4879,7 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xb5, hi: 0xb7},
 	{value: 0x0018, lo: 0xb8, hi: 0xba},
 	{value: 0x0040, lo: 0xbb, hi: 0xbf},
-	// Block 0x114, offset 0x803
+	// Block 0x116, offset 0x80d
 	{value: 0x0000, lo: 0x06},
 	{value: 0x0018, lo: 0x80, hi: 0x86},
 	{value: 0x0040, lo: 0x87, hi: 0x8f},
@@ -4732,109 +4887,74 @@ var idnaSparseValues = [2146]valueRange{
 	{value: 0x0040, lo: 0xa9, hi: 0xaf},
 	{value: 0x0018, lo: 0xb0, hi: 0xb6},
 	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0x115, offset 0x80a
+	// Block 0x117, offset 0x814
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0018, lo: 0x80, hi: 0x82},
 	{value: 0x0040, lo: 0x83, hi: 0x8f},
 	{value: 0x0018, lo: 0x90, hi: 0x96},
 	{value: 0x0040, lo: 0x97, hi: 0xbf},
-	// Block 0x116, offset 0x80f
+	// Block 0x118, offset 0x819
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0018, lo: 0x80, hi: 0x92},
 	{value: 0x0040, lo: 0x93, hi: 0x93},
 	{value: 0x0018, lo: 0x94, hi: 0xbf},
-	// Block 0x117, offset 0x813
+	// Block 0x119, offset 0x81d
 	{value: 0x0000, lo: 0x0d},
 	{value: 0x0018, lo: 0x80, hi: 0x8a},
 	{value: 0x0040, lo: 0x8b, hi: 0xaf},
-	{value: 0x1f41, lo: 0xb0, hi: 0xb0},
-	{value: 0x00c9, lo: 0xb1, hi: 0xb1},
-	{value: 0x0069, lo: 0xb2, hi: 0xb2},
-	{value: 0x0079, lo: 0xb3, hi: 0xb3},
-	{value: 0x1f51, lo: 0xb4, hi: 0xb4},
-	{value: 0x1f61, lo: 0xb5, hi: 0xb5},
-	{value: 0x1f71, lo: 0xb6, hi: 0xb6},
-	{value: 0x1f81, lo: 0xb7, hi: 0xb7},
-	{value: 0x1f91, lo: 0xb8, hi: 0xb8},
-	{value: 0x1fa1, lo: 0xb9, hi: 0xb9},
+	{value: 0x06e1, lo: 0xb0, hi: 0xb0},
+	{value: 0x0049, lo: 0xb1, hi: 0xb1},
+	{value: 0x0029, lo: 0xb2, hi: 0xb2},
+	{value: 0x0031, lo: 0xb3, hi: 0xb3},
+	{value: 0x06e9, lo: 0xb4, hi: 0xb4},
+	{value: 0x06f1, lo: 0xb5, hi: 0xb5},
+	{value: 0x06f9, lo: 0xb6, hi: 0xb6},
+	{value: 0x0701, lo: 0xb7, hi: 0xb7},
+	{value: 0x0709, lo: 0xb8, hi: 0xb8},
+	{value: 0x0711, lo: 0xb9, hi: 0xb9},
 	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0x118, offset 0x821
+	// Block 0x11a, offset 0x82b
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x9d},
 	{value: 0x0040, lo: 0x9e, hi: 0xbf},
-	// Block 0x119, offset 0x824
+	// Block 0x11b, offset 0x82e
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0xb4},
 	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0x11a, offset 0x827
+	// Block 0x11c, offset 0x831
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0008, lo: 0x80, hi: 0x9d},
 	{value: 0x0040, lo: 0x9e, hi: 0x9f},
 	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x11b, offset 0x82b
+	// Block 0x11d, offset 0x835
 	{value: 0x0000, lo: 0x03},
 	{value: 0x0008, lo: 0x80, hi: 0xa1},
 	{value: 0x0040, lo: 0xa2, hi: 0xaf},
 	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x11c, offset 0x82f
+	// Block 0x11e, offset 0x839
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0xa0},
 	{value: 0x0040, lo: 0xa1, hi: 0xbf},
-	// Block 0x11d, offset 0x832
-	{value: 0x0020, lo: 0x0f},
-	{value: 0xdf21, lo: 0x80, hi: 0x89},
-	{value: 0x8e35, lo: 0x8a, hi: 0x8a},
-	{value: 0xe061, lo: 0x8b, hi: 0x9c},
-	{value: 0x8e55, lo: 0x9d, hi: 0x9d},
-	{value: 0xe2a1, lo: 0x9e, hi: 0xa2},
-	{value: 0x8e75, lo: 0xa3, hi: 0xa3},
-	{value: 0xe341, lo: 0xa4, hi: 0xab},
-	{value: 0x7f0d, lo: 0xac, hi: 0xac},
-	{value: 0xe441, lo: 0xad, hi: 0xaf},
-	{value: 0x8e95, lo: 0xb0, hi: 0xb0},
-	{value: 0xe4a1, lo: 0xb1, hi: 0xb6},
-	{value: 0x8eb5, lo: 0xb7, hi: 0xb9},
-	{value: 0xe561, lo: 0xba, hi: 0xba},
-	{value: 0x8f15, lo: 0xbb, hi: 0xbb},
-	{value: 0xe581, lo: 0xbc, hi: 0xbf},
-	// Block 0x11e, offset 0x842
-	{value: 0x0020, lo: 0x10},
-	{value: 0x93b5, lo: 0x80, hi: 0x80},
-	{value: 0xf101, lo: 0x81, hi: 0x86},
-	{value: 0x93d5, lo: 0x87, hi: 0x8a},
-	{value: 0xda61, lo: 0x8b, hi: 0x8b},
-	{value: 0xf1c1, lo: 0x8c, hi: 0x96},
-	{value: 0x9455, lo: 0x97, hi: 0x97},
-	{value: 0xf321, lo: 0x98, hi: 0xa3},
-	{value: 0x9475, lo: 0xa4, hi: 0xa6},
-	{value: 0xf4a1, lo: 0xa7, hi: 0xaa},
-	{value: 0x94d5, lo: 0xab, hi: 0xab},
-	{value: 0xf521, lo: 0xac, hi: 0xac},
-	{value: 0x94f5, lo: 0xad, hi: 0xad},
-	{value: 0xf541, lo: 0xae, hi: 0xaf},
-	{value: 0x9515, lo: 0xb0, hi: 0xb1},
-	{value: 0xf581, lo: 0xb2, hi: 0xbe},
-	{value: 0x2040, lo: 0xbf, hi: 0xbf},
-	// Block 0x11f, offset 0x853
+	// Block 0x11f, offset 0x83c
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0008, lo: 0x80, hi: 0x8a},
 	{value: 0x0040, lo: 0x8b, hi: 0xbf},
-	// Block 0x120, offset 0x856
+	// Block 0x120, offset 0x83f
 	{value: 0x0000, lo: 0x04},
 	{value: 0x0040, lo: 0x80, hi: 0x80},
 	{value: 0x0340, lo: 0x81, hi: 0x81},
 	{value: 0x0040, lo: 0x82, hi: 0x9f},
 	{value: 0x0340, lo: 0xa0, hi: 0xbf},
-	// Block 0x121, offset 0x85b
+	// Block 0x121, offset 0x844
 	{value: 0x0000, lo: 0x01},
 	{value: 0x0340, lo: 0x80, hi: 0xbf},
-	// Block 0x122, offset 0x85d
+	// Block 0x122, offset 0x846
 	{value: 0x0000, lo: 0x01},
 	{value: 0x33c0, lo: 0x80, hi: 0xbf},
-	// Block 0x123, offset 0x85f
+	// Block 0x123, offset 0x848
 	{value: 0x0000, lo: 0x02},
 	{value: 0x33c0, lo: 0x80, hi: 0xaf},
 	{value: 0x0040, lo: 0xb0, hi: 0xbf},
 }
 
-// Total table size 43370 bytes (42KiB); checksum: EBD909C0
+// Total table size 44953 bytes (43KiB); checksum: D51909DD
diff --git a/vendor/golang.org/x/net/idna/tables15.0.0.go b/vendor/golang.org/x/net/idna/tables15.0.0.go
new file mode 100644
index 00000000..40033778
--- /dev/null
+++ b/vendor/golang.org/x/net/idna/tables15.0.0.go
@@ -0,0 +1,5145 @@
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
+
+//go:build go1.21
+// +build go1.21
+
+package idna
+
+// UnicodeVersion is the Unicode version from which the tables in this package are derived.
+const UnicodeVersion = "15.0.0"
+
+var mappings string = "" + // Size: 6704 bytes
+	"  ̈a ̄23 ́ ̧1o1⁄41⁄23⁄4i̇l·ʼnsdžⱥⱦhjrwy ̆ ̇ ̊ ̨ ̃ ̋lẍ́ ι; ̈́եւاٴوٴۇٴيٴक" +
+	"़ख़ग़ज़ड़ढ़फ़य़ড়ঢ়য়ਲ਼ਸ਼ਖ਼ਗ਼ਜ਼ਫ਼ଡ଼ଢ଼ําໍາຫນຫມགྷཌྷདྷབྷཛྷཀྵཱཱིུྲྀྲཱྀླྀླཱ" +
+	"ཱྀྀྒྷྜྷྡྷྦྷྫྷྐྵвдостъѣæbdeǝgikmnȣptuɐɑəɛɜŋɔɯvβγδφχρнɒcɕðfɟɡɥɨɩɪʝɭʟɱɰɲɳ" +
+	"ɴɵɸʂʃƫʉʊʋʌzʐʑʒθssάέήίόύώἀιἁιἂιἃιἄιἅιἆιἇιἠιἡιἢιἣιἤιἥιἦιἧιὠιὡιὢιὣιὤιὥιὦιὧ" +
+	"ιὰιαιάιᾶιι ̈͂ὴιηιήιῆι ̓̀ ̓́ ̓͂ΐ ̔̀ ̔́ ̔͂ΰ ̈̀`ὼιωιώιῶι′′′′′‵‵‵‵‵!!???!!?" +
+	"′′′′0456789+=()rsħnoqsmtmωåאבגדπ1⁄71⁄91⁄101⁄32⁄31⁄52⁄53⁄54⁄51⁄65⁄61⁄83" +
+	"⁄85⁄87⁄81⁄iiivviviiiixxi0⁄3∫∫∫∫∫∮∮∮∮∮1011121314151617181920(10)(11)(12" +
+	")(13)(14)(15)(16)(17)(18)(19)(20)∫∫∫∫==⫝̸ɫɽȿɀ. ゙ ゚よりコト(ᄀ)(ᄂ)(ᄃ)(ᄅ)(ᄆ)(ᄇ)" +
+	"(ᄉ)(ᄋ)(ᄌ)(ᄎ)(ᄏ)(ᄐ)(ᄑ)(ᄒ)(가)(나)(다)(라)(마)(바)(사)(아)(자)(차)(카)(타)(파)(하)(주)(오전" +
+	")(오후)(一)(二)(三)(四)(五)(六)(七)(八)(九)(十)(月)(火)(水)(木)(金)(土)(日)(株)(有)(社)(名)(特)(" +
+	"財)(祝)(労)(代)(呼)(学)(監)(企)(資)(協)(祭)(休)(自)(至)21222324252627282930313233343" +
+	"5참고주의3637383940414243444546474849501月2月3月4月5月6月7月8月9月10月11月12月hgev令和アパート" +
+	"アルファアンペアアールイニングインチウォンエスクードエーカーオンスオームカイリカラットカロリーガロンガンマギガギニーキュリーギルダーキロキロ" +
+	"グラムキロメートルキロワットグラムグラムトンクルゼイロクローネケースコルナコーポサイクルサンチームシリングセンチセントダースデシドルトンナノ" +
+	"ノットハイツパーセントパーツバーレルピアストルピクルピコビルファラッドフィートブッシェルフランヘクタールペソペニヒヘルツペンスページベータポ" +
+	"イントボルトホンポンドホールホーンマイクロマイルマッハマルクマンションミクロンミリミリバールメガメガトンメートルヤードヤールユアンリットルリ" +
+	"ラルピールーブルレムレントゲンワット0点1点2点3点4点5点6点7点8点9点10点11点12点13点14点15点16点17点18点19点20" +
+	"点21点22点23点24点daauovpcdmiu平成昭和大正明治株式会社panamakakbmbgbkcalpfnfmgkghzmldlk" +
+	"lfmnmmmcmkmm2m3m∕sm∕s2rad∕srad∕s2psnsmspvnvmvkvpwnwmwkwbqcccdc∕kgdbgyhah" +
+	"pinkkktlmlnlxphprsrsvwbv∕ma∕m1日2日3日4日5日6日7日8日9日10日11日12日13日14日15日16日17日1" +
+	"8日19日20日21日22日23日24日25日26日27日28日29日30日31日ьɦɬʞʇœʍ𤋮𢡊𢡄𣏕𥉉𥳐𧻓fffiflstմնմեմիվնմ" +
+	"խיִײַעהכלםרתשׁשׂשּׁשּׂאַאָאּבּגּדּהּוּזּטּיּךּכּלּמּנּסּףּפּצּקּרּשּתּו" +
+	"ֹבֿכֿפֿאלٱٻپڀٺٿٹڤڦڄڃچڇڍڌڎڈژڑکگڳڱںڻۀہھےۓڭۇۆۈۋۅۉېىئائەئوئۇئۆئۈئېئىیئجئحئم" +
+	"ئيبجبحبخبمبىبيتجتحتختمتىتيثجثمثىثيجحجمحجحمخجخحخمسجسحسخسمصحصمضجضحضخضمطحط" +
+	"مظمعجعمغجغمفجفحفخفمفىفيقحقمقىقيكاكجكحكخكلكمكىكيلجلحلخلملىليمجمحمخمممىمي" +
+	"نجنحنخنمنىنيهجهمهىهييجيحيخيميىييذٰرٰىٰ ٌّ ٍّ َّ ُّ ِّ ّٰئرئزئنبربزبنترت" +
+	"زتنثرثزثنمانرنزننيريزينئخئهبهتهصخلهنههٰيهثهسهشمشهـَّـُّـِّطىطيعىعيغىغيس" +
+	"ىسيشىشيحىحيجىجيخىخيصىصيضىضيشجشحشخشرسرصرضراًتجمتحجتحمتخمتمجتمحتمخجمححميح" +
+	"مىسحجسجحسجىسمحسمجسممصححصممشحمشجيشمخشممضحىضخمطمحطممطميعجمعممعمىغممغميغمى" +
+	"فخمقمحقمملحملحيلحىلججلخملمحمحجمحممحيمجحمجممخجمخممجخهمجهممنحمنحىنجمنجىنم" +
+	"ينمىيممبخيتجيتجىتخيتخىتميتمىجميجحىجمىسخىصحيشحيضحيلجيلمييحييجييميمميقمين" +
+	"حيعميكمينجحمخيلجمكممجحيحجيمجيفميبحيسخينجيصلےقلےاللهاكبرمحمدصلعمرسولعليه" +
+	"وسلمصلىصلى الله عليه وسلمجل جلالهریال,:!?_{}[]#&*-<>\\$%@ـًـَـُـِـّـْءآ" +
+	"أؤإئابةتثجحخدذرزسشصضطظعغفقكلمنهويلآلألإلا\x22'/^|~¢£¬¦¥ːˑʙɓʣꭦʥʤɖɗᶑɘɞʩɤɢ" +
+	"ɠʛʜɧʄʪʫꞎɮʎøɶɷɺɾʀʨʦꭧʧʈⱱʏʡʢʘǀǁǂ𝅗𝅥𝅘𝅥𝅘𝅥𝅮𝅘𝅥𝅯𝅘𝅥𝅰𝅘𝅥𝅱𝅘𝅥𝅲𝆹𝅥𝆺𝅥𝆹𝅥𝅮𝆺𝅥𝅮𝆹𝅥𝅯𝆺𝅥𝅯ıȷαεζηκ" +
+	"λμνξοστυψ∇∂ϝабгежзиклмпруфхцчшыэюꚉәіјөүӏґѕџҫꙑұٮڡٯ0,1,2,3,4,5,6,7,8,9,(a" +
+	")(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)(m)(n)(o)(p)(q)(r)(s)(t)(u)(v)(w)(x)(y" +
+	")(z)〔s〕wzhvsdppvwcmcmdmrdjほかココサ手字双デ二多解天交映無料前後再新初終生販声吹演投捕一三遊左中右指走打禁空合満有月申" +
+	"割営配〔本〕〔三〕〔二〕〔安〕〔点〕〔打〕〔盗〕〔勝〕〔敗〕得可丽丸乁你侮侻倂偺備僧像㒞免兔兤具㒹內冗冤仌冬况凵刃㓟刻剆剷㔕勇勉勤勺包匆北卉" +
+	"卑博即卽卿灰及叟叫叱吆咞吸呈周咢哶唐啓啣善喙喫喳嗂圖嘆圗噑噴切壮城埴堍型堲報墬売壷夆夢奢姬娛娧姘婦㛮嬈嬾寃寘寧寳寿将尢㞁屠屮峀岍嵃嵮嵫嵼巡巢" +
+	"㠯巽帨帽幩㡢㡼庰庳庶廊廾舁弢㣇形彫㣣徚忍志忹悁㤺㤜悔惇慈慌慎慺憎憲憤憯懞懲懶成戛扝抱拔捐挽拼捨掃揤搢揅掩㨮摩摾撝摷㩬敏敬旣書晉㬙暑㬈㫤冒冕最" +
+	"暜肭䏙朗望朡杞杓㭉柺枅桒梅梎栟椔㮝楂榣槪檨櫛㰘次歔㱎歲殟殺殻汎沿泍汧洖派海流浩浸涅洴港湮㴳滋滇淹潮濆瀹瀞瀛㶖灊災灷炭煅熜爨爵牐犀犕獺王㺬玥㺸" +
+	"瑇瑜瑱璅瓊㼛甤甾異瘐㿼䀈直眞真睊䀹瞋䁆䂖硎碌磌䃣祖福秫䄯穀穊穏䈂篆築䈧糒䊠糨糣紀絣䌁緇縂繅䌴䍙罺羕翺者聠聰䏕育脃䐋脾媵舄辞䑫芑芋芝劳花芳芽苦" +
+	"若茝荣莭茣莽菧著荓菊菌菜䔫蓱蓳蔖蕤䕝䕡䕫虐虜虧虩蚩蚈蜎蛢蝹蜨蝫螆蟡蠁䗹衠衣裗裞䘵裺㒻䚾䛇誠諭變豕貫賁贛起跋趼跰軔輸邔郱鄑鄛鈸鋗鋘鉼鏹鐕開䦕閷" +
+	"䧦雃嶲霣䩮䩶韠䪲頋頩飢䬳餩馧駂駾䯎鬒鱀鳽䳎䳭鵧䳸麻䵖黹黾鼅鼏鼖鼻"
+
+var mappingIndex = []uint16{ // 1729 elements
+	// Entry 0 - 3F
+	0x0000, 0x0000, 0x0001, 0x0004, 0x0005, 0x0008, 0x0009, 0x000a,
+	0x000d, 0x0010, 0x0011, 0x0012, 0x0017, 0x001c, 0x0021, 0x0024,
+	0x0027, 0x002a, 0x002b, 0x002e, 0x0031, 0x0034, 0x0035, 0x0036,
+	0x0037, 0x0038, 0x0039, 0x003c, 0x003f, 0x0042, 0x0045, 0x0048,
+	0x004b, 0x004c, 0x004d, 0x0051, 0x0054, 0x0055, 0x005a, 0x005e,
+	0x0062, 0x0066, 0x006a, 0x006e, 0x0074, 0x007a, 0x0080, 0x0086,
+	0x008c, 0x0092, 0x0098, 0x009e, 0x00a4, 0x00aa, 0x00b0, 0x00b6,
+	0x00bc, 0x00c2, 0x00c8, 0x00ce, 0x00d4, 0x00da, 0x00e0, 0x00e6,
+	// Entry 40 - 7F
+	0x00ec, 0x00f2, 0x00f8, 0x00fe, 0x0104, 0x010a, 0x0110, 0x0116,
+	0x011c, 0x0122, 0x0128, 0x012e, 0x0137, 0x013d, 0x0146, 0x014c,
+	0x0152, 0x0158, 0x015e, 0x0164, 0x016a, 0x0170, 0x0172, 0x0174,
+	0x0176, 0x0178, 0x017a, 0x017c, 0x017e, 0x0180, 0x0181, 0x0182,
+	0x0183, 0x0185, 0x0186, 0x0187, 0x0188, 0x0189, 0x018a, 0x018c,
+	0x018d, 0x018e, 0x018f, 0x0191, 0x0193, 0x0195, 0x0197, 0x0199,
+	0x019b, 0x019d, 0x019f, 0x01a0, 0x01a2, 0x01a4, 0x01a6, 0x01a8,
+	0x01aa, 0x01ac, 0x01ae, 0x01b0, 0x01b1, 0x01b3, 0x01b5, 0x01b6,
+	// Entry 80 - BF
+	0x01b8, 0x01ba, 0x01bc, 0x01be, 0x01c0, 0x01c2, 0x01c4, 0x01c6,
+	0x01c8, 0x01ca, 0x01cc, 0x01ce, 0x01d0, 0x01d2, 0x01d4, 0x01d6,
+	0x01d8, 0x01da, 0x01dc, 0x01de, 0x01e0, 0x01e2, 0x01e4, 0x01e5,
+	0x01e7, 0x01e9, 0x01eb, 0x01ed, 0x01ef, 0x01f1, 0x01f3, 0x01f5,
+	0x01f7, 0x01f9, 0x01fb, 0x01fd, 0x0202, 0x0207, 0x020c, 0x0211,
+	0x0216, 0x021b, 0x0220, 0x0225, 0x022a, 0x022f, 0x0234, 0x0239,
+	0x023e, 0x0243, 0x0248, 0x024d, 0x0252, 0x0257, 0x025c, 0x0261,
+	0x0266, 0x026b, 0x0270, 0x0275, 0x027a, 0x027e, 0x0282, 0x0287,
+	// Entry C0 - FF
+	0x0289, 0x028e, 0x0293, 0x0297, 0x029b, 0x02a0, 0x02a5, 0x02aa,
+	0x02af, 0x02b1, 0x02b6, 0x02bb, 0x02c0, 0x02c2, 0x02c7, 0x02c8,
+	0x02cd, 0x02d1, 0x02d5, 0x02da, 0x02e0, 0x02e9, 0x02ef, 0x02f8,
+	0x02fa, 0x02fc, 0x02fe, 0x0300, 0x030c, 0x030d, 0x030e, 0x030f,
+	0x0310, 0x0311, 0x0312, 0x0313, 0x0314, 0x0315, 0x0316, 0x0317,
+	0x0319, 0x031b, 0x031d, 0x031e, 0x0320, 0x0322, 0x0324, 0x0326,
+	0x0328, 0x032a, 0x032c, 0x032e, 0x0330, 0x0335, 0x033a, 0x0340,
+	0x0345, 0x034a, 0x034f, 0x0354, 0x0359, 0x035e, 0x0363, 0x0368,
+	// Entry 100 - 13F
+	0x036d, 0x0372, 0x0377, 0x037c, 0x0380, 0x0382, 0x0384, 0x0386,
+	0x038a, 0x038c, 0x038e, 0x0393, 0x0399, 0x03a2, 0x03a8, 0x03b1,
+	0x03b3, 0x03b5, 0x03b7, 0x03b9, 0x03bb, 0x03bd, 0x03bf, 0x03c1,
+	0x03c3, 0x03c5, 0x03c7, 0x03cb, 0x03cf, 0x03d3, 0x03d7, 0x03db,
+	0x03df, 0x03e3, 0x03e7, 0x03eb, 0x03ef, 0x03f3, 0x03ff, 0x0401,
+	0x0406, 0x0408, 0x040a, 0x040c, 0x040e, 0x040f, 0x0413, 0x0417,
+	0x041d, 0x0423, 0x0428, 0x042d, 0x0432, 0x0437, 0x043c, 0x0441,
+	0x0446, 0x044b, 0x0450, 0x0455, 0x045a, 0x045f, 0x0464, 0x0469,
+	// Entry 140 - 17F
+	0x046e, 0x0473, 0x0478, 0x047d, 0x0482, 0x0487, 0x048c, 0x0491,
+	0x0496, 0x049b, 0x04a0, 0x04a5, 0x04aa, 0x04af, 0x04b4, 0x04bc,
+	0x04c4, 0x04c9, 0x04ce, 0x04d3, 0x04d8, 0x04dd, 0x04e2, 0x04e7,
+	0x04ec, 0x04f1, 0x04f6, 0x04fb, 0x0500, 0x0505, 0x050a, 0x050f,
+	0x0514, 0x0519, 0x051e, 0x0523, 0x0528, 0x052d, 0x0532, 0x0537,
+	0x053c, 0x0541, 0x0546, 0x054b, 0x0550, 0x0555, 0x055a, 0x055f,
+	0x0564, 0x0569, 0x056e, 0x0573, 0x0578, 0x057a, 0x057c, 0x057e,
+	0x0580, 0x0582, 0x0584, 0x0586, 0x0588, 0x058a, 0x058c, 0x058e,
+	// Entry 180 - 1BF
+	0x0590, 0x0592, 0x0594, 0x0596, 0x059c, 0x05a2, 0x05a4, 0x05a6,
+	0x05a8, 0x05aa, 0x05ac, 0x05ae, 0x05b0, 0x05b2, 0x05b4, 0x05b6,
+	0x05b8, 0x05ba, 0x05bc, 0x05be, 0x05c0, 0x05c4, 0x05c8, 0x05cc,
+	0x05d0, 0x05d4, 0x05d8, 0x05dc, 0x05e0, 0x05e4, 0x05e9, 0x05ee,
+	0x05f3, 0x05f5, 0x05f7, 0x05fd, 0x0609, 0x0615, 0x0621, 0x062a,
+	0x0636, 0x063f, 0x0648, 0x0657, 0x0663, 0x066c, 0x0675, 0x067e,
+	0x068a, 0x0696, 0x069f, 0x06a8, 0x06ae, 0x06b7, 0x06c3, 0x06cf,
+	0x06d5, 0x06e4, 0x06f6, 0x0705, 0x070e, 0x071d, 0x072c, 0x0738,
+	// Entry 1C0 - 1FF
+	0x0741, 0x074a, 0x0753, 0x075f, 0x076e, 0x077a, 0x0783, 0x078c,
+	0x0795, 0x079b, 0x07a1, 0x07a7, 0x07ad, 0x07b6, 0x07bf, 0x07ce,
+	0x07d7, 0x07e3, 0x07f2, 0x07fb, 0x0801, 0x0807, 0x0816, 0x0822,
+	0x0831, 0x083a, 0x0849, 0x084f, 0x0858, 0x0861, 0x086a, 0x0873,
+	0x087c, 0x0888, 0x0891, 0x0897, 0x08a0, 0x08a9, 0x08b2, 0x08be,
+	0x08c7, 0x08d0, 0x08d9, 0x08e8, 0x08f4, 0x08fa, 0x0909, 0x090f,
+	0x091b, 0x0927, 0x0930, 0x0939, 0x0942, 0x094e, 0x0954, 0x095d,
+	0x0969, 0x096f, 0x097e, 0x0987, 0x098b, 0x098f, 0x0993, 0x0997,
+	// Entry 200 - 23F
+	0x099b, 0x099f, 0x09a3, 0x09a7, 0x09ab, 0x09af, 0x09b4, 0x09b9,
+	0x09be, 0x09c3, 0x09c8, 0x09cd, 0x09d2, 0x09d7, 0x09dc, 0x09e1,
+	0x09e6, 0x09eb, 0x09f0, 0x09f5, 0x09fa, 0x09fc, 0x09fe, 0x0a00,
+	0x0a02, 0x0a04, 0x0a06, 0x0a0c, 0x0a12, 0x0a18, 0x0a1e, 0x0a2a,
+	0x0a2c, 0x0a2e, 0x0a30, 0x0a32, 0x0a34, 0x0a36, 0x0a38, 0x0a3c,
+	0x0a3e, 0x0a40, 0x0a42, 0x0a44, 0x0a46, 0x0a48, 0x0a4a, 0x0a4c,
+	0x0a4e, 0x0a50, 0x0a52, 0x0a54, 0x0a56, 0x0a58, 0x0a5a, 0x0a5f,
+	0x0a65, 0x0a6c, 0x0a74, 0x0a76, 0x0a78, 0x0a7a, 0x0a7c, 0x0a7e,
+	// Entry 240 - 27F
+	0x0a80, 0x0a82, 0x0a84, 0x0a86, 0x0a88, 0x0a8a, 0x0a8c, 0x0a8e,
+	0x0a90, 0x0a96, 0x0a98, 0x0a9a, 0x0a9c, 0x0a9e, 0x0aa0, 0x0aa2,
+	0x0aa4, 0x0aa6, 0x0aa8, 0x0aaa, 0x0aac, 0x0aae, 0x0ab0, 0x0ab2,
+	0x0ab4, 0x0ab9, 0x0abe, 0x0ac2, 0x0ac6, 0x0aca, 0x0ace, 0x0ad2,
+	0x0ad6, 0x0ada, 0x0ade, 0x0ae2, 0x0ae7, 0x0aec, 0x0af1, 0x0af6,
+	0x0afb, 0x0b00, 0x0b05, 0x0b0a, 0x0b0f, 0x0b14, 0x0b19, 0x0b1e,
+	0x0b23, 0x0b28, 0x0b2d, 0x0b32, 0x0b37, 0x0b3c, 0x0b41, 0x0b46,
+	0x0b4b, 0x0b50, 0x0b52, 0x0b54, 0x0b56, 0x0b58, 0x0b5a, 0x0b5c,
+	// Entry 280 - 2BF
+	0x0b5e, 0x0b62, 0x0b66, 0x0b6a, 0x0b6e, 0x0b72, 0x0b76, 0x0b7a,
+	0x0b7c, 0x0b7e, 0x0b80, 0x0b82, 0x0b86, 0x0b8a, 0x0b8e, 0x0b92,
+	0x0b96, 0x0b9a, 0x0b9e, 0x0ba0, 0x0ba2, 0x0ba4, 0x0ba6, 0x0ba8,
+	0x0baa, 0x0bac, 0x0bb0, 0x0bb4, 0x0bba, 0x0bc0, 0x0bc4, 0x0bc8,
+	0x0bcc, 0x0bd0, 0x0bd4, 0x0bd8, 0x0bdc, 0x0be0, 0x0be4, 0x0be8,
+	0x0bec, 0x0bf0, 0x0bf4, 0x0bf8, 0x0bfc, 0x0c00, 0x0c04, 0x0c08,
+	0x0c0c, 0x0c10, 0x0c14, 0x0c18, 0x0c1c, 0x0c20, 0x0c24, 0x0c28,
+	0x0c2c, 0x0c30, 0x0c34, 0x0c36, 0x0c38, 0x0c3a, 0x0c3c, 0x0c3e,
+	// Entry 2C0 - 2FF
+	0x0c40, 0x0c42, 0x0c44, 0x0c46, 0x0c48, 0x0c4a, 0x0c4c, 0x0c4e,
+	0x0c50, 0x0c52, 0x0c54, 0x0c56, 0x0c58, 0x0c5a, 0x0c5c, 0x0c5e,
+	0x0c60, 0x0c62, 0x0c64, 0x0c66, 0x0c68, 0x0c6a, 0x0c6c, 0x0c6e,
+	0x0c70, 0x0c72, 0x0c74, 0x0c76, 0x0c78, 0x0c7a, 0x0c7c, 0x0c7e,
+	0x0c80, 0x0c82, 0x0c86, 0x0c8a, 0x0c8e, 0x0c92, 0x0c96, 0x0c9a,
+	0x0c9e, 0x0ca2, 0x0ca4, 0x0ca8, 0x0cac, 0x0cb0, 0x0cb4, 0x0cb8,
+	0x0cbc, 0x0cc0, 0x0cc4, 0x0cc8, 0x0ccc, 0x0cd0, 0x0cd4, 0x0cd8,
+	0x0cdc, 0x0ce0, 0x0ce4, 0x0ce8, 0x0cec, 0x0cf0, 0x0cf4, 0x0cf8,
+	// Entry 300 - 33F
+	0x0cfc, 0x0d00, 0x0d04, 0x0d08, 0x0d0c, 0x0d10, 0x0d14, 0x0d18,
+	0x0d1c, 0x0d20, 0x0d24, 0x0d28, 0x0d2c, 0x0d30, 0x0d34, 0x0d38,
+	0x0d3c, 0x0d40, 0x0d44, 0x0d48, 0x0d4c, 0x0d50, 0x0d54, 0x0d58,
+	0x0d5c, 0x0d60, 0x0d64, 0x0d68, 0x0d6c, 0x0d70, 0x0d74, 0x0d78,
+	0x0d7c, 0x0d80, 0x0d84, 0x0d88, 0x0d8c, 0x0d90, 0x0d94, 0x0d98,
+	0x0d9c, 0x0da0, 0x0da4, 0x0da8, 0x0dac, 0x0db0, 0x0db4, 0x0db8,
+	0x0dbc, 0x0dc0, 0x0dc4, 0x0dc8, 0x0dcc, 0x0dd0, 0x0dd4, 0x0dd8,
+	0x0ddc, 0x0de0, 0x0de4, 0x0de8, 0x0dec, 0x0df0, 0x0df4, 0x0df8,
+	// Entry 340 - 37F
+	0x0dfc, 0x0e00, 0x0e04, 0x0e08, 0x0e0c, 0x0e10, 0x0e14, 0x0e18,
+	0x0e1d, 0x0e22, 0x0e27, 0x0e2c, 0x0e31, 0x0e36, 0x0e3a, 0x0e3e,
+	0x0e42, 0x0e46, 0x0e4a, 0x0e4e, 0x0e52, 0x0e56, 0x0e5a, 0x0e5e,
+	0x0e62, 0x0e66, 0x0e6a, 0x0e6e, 0x0e72, 0x0e76, 0x0e7a, 0x0e7e,
+	0x0e82, 0x0e86, 0x0e8a, 0x0e8e, 0x0e92, 0x0e96, 0x0e9a, 0x0e9e,
+	0x0ea2, 0x0ea6, 0x0eaa, 0x0eae, 0x0eb2, 0x0eb6, 0x0ebc, 0x0ec2,
+	0x0ec8, 0x0ecc, 0x0ed0, 0x0ed4, 0x0ed8, 0x0edc, 0x0ee0, 0x0ee4,
+	0x0ee8, 0x0eec, 0x0ef0, 0x0ef4, 0x0ef8, 0x0efc, 0x0f00, 0x0f04,
+	// Entry 380 - 3BF
+	0x0f08, 0x0f0c, 0x0f10, 0x0f14, 0x0f18, 0x0f1c, 0x0f20, 0x0f24,
+	0x0f28, 0x0f2c, 0x0f30, 0x0f34, 0x0f38, 0x0f3e, 0x0f44, 0x0f4a,
+	0x0f50, 0x0f56, 0x0f5c, 0x0f62, 0x0f68, 0x0f6e, 0x0f74, 0x0f7a,
+	0x0f80, 0x0f86, 0x0f8c, 0x0f92, 0x0f98, 0x0f9e, 0x0fa4, 0x0faa,
+	0x0fb0, 0x0fb6, 0x0fbc, 0x0fc2, 0x0fc8, 0x0fce, 0x0fd4, 0x0fda,
+	0x0fe0, 0x0fe6, 0x0fec, 0x0ff2, 0x0ff8, 0x0ffe, 0x1004, 0x100a,
+	0x1010, 0x1016, 0x101c, 0x1022, 0x1028, 0x102e, 0x1034, 0x103a,
+	0x1040, 0x1046, 0x104c, 0x1052, 0x1058, 0x105e, 0x1064, 0x106a,
+	// Entry 3C0 - 3FF
+	0x1070, 0x1076, 0x107c, 0x1082, 0x1088, 0x108e, 0x1094, 0x109a,
+	0x10a0, 0x10a6, 0x10ac, 0x10b2, 0x10b8, 0x10be, 0x10c4, 0x10ca,
+	0x10d0, 0x10d6, 0x10dc, 0x10e2, 0x10e8, 0x10ee, 0x10f4, 0x10fa,
+	0x1100, 0x1106, 0x110c, 0x1112, 0x1118, 0x111e, 0x1124, 0x112a,
+	0x1130, 0x1136, 0x113c, 0x1142, 0x1148, 0x114e, 0x1154, 0x115a,
+	0x1160, 0x1166, 0x116c, 0x1172, 0x1178, 0x1180, 0x1188, 0x1190,
+	0x1198, 0x11a0, 0x11a8, 0x11b0, 0x11b6, 0x11d7, 0x11e6, 0x11ee,
+	0x11ef, 0x11f0, 0x11f1, 0x11f2, 0x11f3, 0x11f4, 0x11f5, 0x11f6,
+	// Entry 400 - 43F
+	0x11f7, 0x11f8, 0x11f9, 0x11fa, 0x11fb, 0x11fc, 0x11fd, 0x11fe,
+	0x11ff, 0x1200, 0x1201, 0x1205, 0x1209, 0x120d, 0x1211, 0x1215,
+	0x1219, 0x121b, 0x121d, 0x121f, 0x1221, 0x1223, 0x1225, 0x1227,
+	0x1229, 0x122b, 0x122d, 0x122f, 0x1231, 0x1233, 0x1235, 0x1237,
+	0x1239, 0x123b, 0x123d, 0x123f, 0x1241, 0x1243, 0x1245, 0x1247,
+	0x1249, 0x124b, 0x124d, 0x124f, 0x1251, 0x1253, 0x1255, 0x1257,
+	0x1259, 0x125b, 0x125d, 0x125f, 0x1263, 0x1267, 0x126b, 0x126f,
+	0x1270, 0x1271, 0x1272, 0x1273, 0x1274, 0x1275, 0x1277, 0x1279,
+	// Entry 440 - 47F
+	0x127b, 0x127d, 0x127f, 0x1281, 0x1283, 0x1285, 0x1287, 0x1289,
+	0x128c, 0x128e, 0x1290, 0x1292, 0x1294, 0x1297, 0x1299, 0x129b,
+	0x129d, 0x129f, 0x12a1, 0x12a3, 0x12a5, 0x12a7, 0x12a9, 0x12ab,
+	0x12ad, 0x12af, 0x12b2, 0x12b4, 0x12b6, 0x12b8, 0x12ba, 0x12bc,
+	0x12be, 0x12c0, 0x12c2, 0x12c4, 0x12c6, 0x12c9, 0x12cb, 0x12cd,
+	0x12d0, 0x12d2, 0x12d4, 0x12d6, 0x12d8, 0x12da, 0x12dc, 0x12de,
+	0x12e6, 0x12ee, 0x12fa, 0x1306, 0x1312, 0x131e, 0x132a, 0x1332,
+	0x133a, 0x1346, 0x1352, 0x135e, 0x136a, 0x136c, 0x136e, 0x1370,
+	// Entry 480 - 4BF
+	0x1372, 0x1374, 0x1376, 0x1378, 0x137a, 0x137c, 0x137e, 0x1380,
+	0x1382, 0x1384, 0x1386, 0x1388, 0x138a, 0x138d, 0x1390, 0x1392,
+	0x1394, 0x1396, 0x1398, 0x139a, 0x139c, 0x139e, 0x13a0, 0x13a2,
+	0x13a4, 0x13a6, 0x13a8, 0x13aa, 0x13ac, 0x13ae, 0x13b0, 0x13b2,
+	0x13b4, 0x13b6, 0x13b8, 0x13ba, 0x13bc, 0x13bf, 0x13c1, 0x13c3,
+	0x13c5, 0x13c7, 0x13c9, 0x13cb, 0x13cd, 0x13cf, 0x13d1, 0x13d3,
+	0x13d6, 0x13d8, 0x13da, 0x13dc, 0x13de, 0x13e0, 0x13e2, 0x13e4,
+	0x13e6, 0x13e8, 0x13ea, 0x13ec, 0x13ee, 0x13f0, 0x13f2, 0x13f5,
+	// Entry 4C0 - 4FF
+	0x13f8, 0x13fb, 0x13fe, 0x1401, 0x1404, 0x1407, 0x140a, 0x140d,
+	0x1410, 0x1413, 0x1416, 0x1419, 0x141c, 0x141f, 0x1422, 0x1425,
+	0x1428, 0x142b, 0x142e, 0x1431, 0x1434, 0x1437, 0x143a, 0x143d,
+	0x1440, 0x1447, 0x1449, 0x144b, 0x144d, 0x1450, 0x1452, 0x1454,
+	0x1456, 0x1458, 0x145a, 0x1460, 0x1466, 0x1469, 0x146c, 0x146f,
+	0x1472, 0x1475, 0x1478, 0x147b, 0x147e, 0x1481, 0x1484, 0x1487,
+	0x148a, 0x148d, 0x1490, 0x1493, 0x1496, 0x1499, 0x149c, 0x149f,
+	0x14a2, 0x14a5, 0x14a8, 0x14ab, 0x14ae, 0x14b1, 0x14b4, 0x14b7,
+	// Entry 500 - 53F
+	0x14ba, 0x14bd, 0x14c0, 0x14c3, 0x14c6, 0x14c9, 0x14cc, 0x14cf,
+	0x14d2, 0x14d5, 0x14d8, 0x14db, 0x14de, 0x14e1, 0x14e4, 0x14e7,
+	0x14ea, 0x14ed, 0x14f6, 0x14ff, 0x1508, 0x1511, 0x151a, 0x1523,
+	0x152c, 0x1535, 0x153e, 0x1541, 0x1544, 0x1547, 0x154a, 0x154d,
+	0x1550, 0x1553, 0x1556, 0x1559, 0x155c, 0x155f, 0x1562, 0x1565,
+	0x1568, 0x156b, 0x156e, 0x1571, 0x1574, 0x1577, 0x157a, 0x157d,
+	0x1580, 0x1583, 0x1586, 0x1589, 0x158c, 0x158f, 0x1592, 0x1595,
+	0x1598, 0x159b, 0x159e, 0x15a1, 0x15a4, 0x15a7, 0x15aa, 0x15ad,
+	// Entry 540 - 57F
+	0x15b0, 0x15b3, 0x15b6, 0x15b9, 0x15bc, 0x15bf, 0x15c2, 0x15c5,
+	0x15c8, 0x15cb, 0x15ce, 0x15d1, 0x15d4, 0x15d7, 0x15da, 0x15dd,
+	0x15e0, 0x15e3, 0x15e6, 0x15e9, 0x15ec, 0x15ef, 0x15f2, 0x15f5,
+	0x15f8, 0x15fb, 0x15fe, 0x1601, 0x1604, 0x1607, 0x160a, 0x160d,
+	0x1610, 0x1613, 0x1616, 0x1619, 0x161c, 0x161f, 0x1622, 0x1625,
+	0x1628, 0x162b, 0x162e, 0x1631, 0x1634, 0x1637, 0x163a, 0x163d,
+	0x1640, 0x1643, 0x1646, 0x1649, 0x164c, 0x164f, 0x1652, 0x1655,
+	0x1658, 0x165b, 0x165e, 0x1661, 0x1664, 0x1667, 0x166a, 0x166d,
+	// Entry 580 - 5BF
+	0x1670, 0x1673, 0x1676, 0x1679, 0x167c, 0x167f, 0x1682, 0x1685,
+	0x1688, 0x168b, 0x168e, 0x1691, 0x1694, 0x1697, 0x169a, 0x169d,
+	0x16a0, 0x16a3, 0x16a6, 0x16a9, 0x16ac, 0x16af, 0x16b2, 0x16b5,
+	0x16b8, 0x16bb, 0x16be, 0x16c1, 0x16c4, 0x16c7, 0x16ca, 0x16cd,
+	0x16d0, 0x16d3, 0x16d6, 0x16d9, 0x16dc, 0x16df, 0x16e2, 0x16e5,
+	0x16e8, 0x16eb, 0x16ee, 0x16f1, 0x16f4, 0x16f7, 0x16fa, 0x16fd,
+	0x1700, 0x1703, 0x1706, 0x1709, 0x170c, 0x170f, 0x1712, 0x1715,
+	0x1718, 0x171b, 0x171e, 0x1721, 0x1724, 0x1727, 0x172a, 0x172d,
+	// Entry 5C0 - 5FF
+	0x1730, 0x1733, 0x1736, 0x1739, 0x173c, 0x173f, 0x1742, 0x1745,
+	0x1748, 0x174b, 0x174e, 0x1751, 0x1754, 0x1757, 0x175a, 0x175d,
+	0x1760, 0x1763, 0x1766, 0x1769, 0x176c, 0x176f, 0x1772, 0x1775,
+	0x1778, 0x177b, 0x177e, 0x1781, 0x1784, 0x1787, 0x178a, 0x178d,
+	0x1790, 0x1793, 0x1796, 0x1799, 0x179c, 0x179f, 0x17a2, 0x17a5,
+	0x17a8, 0x17ab, 0x17ae, 0x17b1, 0x17b4, 0x17b7, 0x17ba, 0x17bd,
+	0x17c0, 0x17c3, 0x17c6, 0x17c9, 0x17cc, 0x17cf, 0x17d2, 0x17d5,
+	0x17d8, 0x17db, 0x17de, 0x17e1, 0x17e4, 0x17e7, 0x17ea, 0x17ed,
+	// Entry 600 - 63F
+	0x17f0, 0x17f3, 0x17f6, 0x17f9, 0x17fc, 0x17ff, 0x1802, 0x1805,
+	0x1808, 0x180b, 0x180e, 0x1811, 0x1814, 0x1817, 0x181a, 0x181d,
+	0x1820, 0x1823, 0x1826, 0x1829, 0x182c, 0x182f, 0x1832, 0x1835,
+	0x1838, 0x183b, 0x183e, 0x1841, 0x1844, 0x1847, 0x184a, 0x184d,
+	0x1850, 0x1853, 0x1856, 0x1859, 0x185c, 0x185f, 0x1862, 0x1865,
+	0x1868, 0x186b, 0x186e, 0x1871, 0x1874, 0x1877, 0x187a, 0x187d,
+	0x1880, 0x1883, 0x1886, 0x1889, 0x188c, 0x188f, 0x1892, 0x1895,
+	0x1898, 0x189b, 0x189e, 0x18a1, 0x18a4, 0x18a7, 0x18aa, 0x18ad,
+	// Entry 640 - 67F
+	0x18b0, 0x18b3, 0x18b6, 0x18b9, 0x18bc, 0x18bf, 0x18c2, 0x18c5,
+	0x18c8, 0x18cb, 0x18ce, 0x18d1, 0x18d4, 0x18d7, 0x18da, 0x18dd,
+	0x18e0, 0x18e3, 0x18e6, 0x18e9, 0x18ec, 0x18ef, 0x18f2, 0x18f5,
+	0x18f8, 0x18fb, 0x18fe, 0x1901, 0x1904, 0x1907, 0x190a, 0x190d,
+	0x1910, 0x1913, 0x1916, 0x1919, 0x191c, 0x191f, 0x1922, 0x1925,
+	0x1928, 0x192b, 0x192e, 0x1931, 0x1934, 0x1937, 0x193a, 0x193d,
+	0x1940, 0x1943, 0x1946, 0x1949, 0x194c, 0x194f, 0x1952, 0x1955,
+	0x1958, 0x195b, 0x195e, 0x1961, 0x1964, 0x1967, 0x196a, 0x196d,
+	// Entry 680 - 6BF
+	0x1970, 0x1973, 0x1976, 0x1979, 0x197c, 0x197f, 0x1982, 0x1985,
+	0x1988, 0x198b, 0x198e, 0x1991, 0x1994, 0x1997, 0x199a, 0x199d,
+	0x19a0, 0x19a3, 0x19a6, 0x19a9, 0x19ac, 0x19af, 0x19b2, 0x19b5,
+	0x19b8, 0x19bb, 0x19be, 0x19c1, 0x19c4, 0x19c7, 0x19ca, 0x19cd,
+	0x19d0, 0x19d3, 0x19d6, 0x19d9, 0x19dc, 0x19df, 0x19e2, 0x19e5,
+	0x19e8, 0x19eb, 0x19ee, 0x19f1, 0x19f4, 0x19f7, 0x19fa, 0x19fd,
+	0x1a00, 0x1a03, 0x1a06, 0x1a09, 0x1a0c, 0x1a0f, 0x1a12, 0x1a15,
+	0x1a18, 0x1a1b, 0x1a1e, 0x1a21, 0x1a24, 0x1a27, 0x1a2a, 0x1a2d,
+	// Entry 6C0 - 6FF
+	0x1a30,
+} // Size: 3482 bytes
+
+var xorData string = "" + // Size: 4907 bytes
+	"\x02\x0c\x09\x02\xb0\xec\x02\xad\xd8\x02\xad\xd9\x02\x06\x07\x02\x0f\x12" +
+	"\x02\x0f\x1f\x02\x0f\x1d\x02\x01\x13\x02\x0f\x16\x02\x0f\x0b\x02\x0f3" +
+	"\x02\x0f7\x02\x0f?\x02\x0f/\x02\x0f*\x02\x0c&\x02\x0c*\x02\x0c;\x02\x0c9" +
+	"\x02\x0c%\x02\xab\xed\x02\xab\xe2\x02\xab\xe3\x02\xa9\xe0\x02\xa9\xe1" +
+	"\x02\xa9\xe6\x02\xa3\xcb\x02\xa3\xc8\x02\xa3\xc9\x02\x01#\x02\x01\x08" +
+	"\x02\x0e>\x02\x0e'\x02\x0f\x03\x02\x03\x0d\x02\x03\x09\x02\x03\x17\x02" +
+	"\x03\x0e\x02\x02\x03\x02\x011\x02\x01\x00\x02\x01\x10\x02\x03<\x02\x07" +
+	"\x0d\x02\x02\x0c\x02\x0c0\x02\x01\x03\x02\x01\x01\x02\x01 \x02\x01\x22" +
+	"\x02\x01)\x02\x01\x0a\x02\x01\x0c\x02\x02\x06\x02\x02\x02\x02\x03\x10" +
+	"\x03\x037 \x03\x0b+\x03\x021\x00\x02\x01\x04\x02\x01\x02\x02\x019\x02" +
+	"\x03\x1c\x02\x02$\x03\x80p$\x02\x03:\x02\x03\x0a\x03\xc1r.\x03\xc1r,\x03" +
+	"\xc1r\x02\x02\x02:\x02\x02>\x02\x02,\x02\x02\x10\x02\x02\x00\x03\xc1s<" +
+	"\x03\xc1s*\x03\xc2L$\x03\xc2L;\x02\x09)\x02\x0a\x19\x03\x83\xab\xe3\x03" +
+	"\x83\xab\xf2\x03 4\xe0\x03\x81\xab\xea\x03\x81\xab\xf3\x03 4\xef\x03\x96" +
+	"\xe1\xcd\x03\x84\xe5\xc3\x02\x0d\x11\x03\x8b\xec\xcb\x03\x94\xec\xcf\x03" +
+	"\x9a\xec\xc2\x03\x8b\xec\xdb\x03\x94\xec\xdf\x03\x9a\xec\xd2\x03\x01\x0c" +
+	"!\x03\x01\x0c#\x03ʠ\x9d\x03ʣ\x9c\x03ʢ\x9f\x03ʥ\x9e\x03ʤ\x91\x03ʧ\x90\x03" +
+	"ʦ\x93\x03ʩ\x92\x03ʨ\x95\x03\xca\xf3\xb5\x03\xca\xf0\xb4\x03\xca\xf1\xb7" +
+	"\x03\xca\xf6\xb6\x03\xca\xf7\x89\x03\xca\xf4\x88\x03\xca\xf5\x8b\x03\xca" +
+	"\xfa\x8a\x03\xca\xfb\x8d\x03\xca\xf8\x8c\x03\xca\xf9\x8f\x03\xca\xfe\x8e" +
+	"\x03\xca\xff\x81\x03\xca\xfc\x80\x03\xca\xfd\x83\x03\xca\xe2\x82\x03\xca" +
+	"\xe3\x85\x03\xca\xe0\x84\x03\xca\xe1\x87\x03\xca\xe6\x86\x03\xca\xe7\x99" +
+	"\x03\xca\xe4\x98\x03\xca\xe5\x9b\x03\xca\xea\x9a\x03\xca\xeb\x9d\x03\xca" +
+	"\xe8\x9c\x03ؓ\x89\x03ߔ\x8b\x02\x010\x03\x03\x04\x1e\x03\x04\x15\x12\x03" +
+	"\x0b\x05,\x03\x06\x04\x00\x03\x06\x04)\x03\x06\x044\x03\x06\x04<\x03\x06" +
+	"\x05\x1d\x03\x06\x06\x00\x03\x06\x06\x0a\x03\x06\x06'\x03\x06\x062\x03" +
+	"\x0786\x03\x079/\x03\x079 \x03\x07:\x0e\x03\x07:\x1b\x03\x07:%\x03\x07;/" +
+	"\x03\x07;%\x03\x074\x11\x03\x076\x09\x03\x077*\x03\x070\x01\x03\x070\x0f" +
+	"\x03\x070.\x03\x071\x16\x03\x071\x04\x03\x0710\x03\x072\x18\x03\x072-" +
+	"\x03\x073\x14\x03\x073>\x03\x07'\x09\x03\x07 \x00\x03\x07\x1f\x0b\x03" +
+	"\x07\x18#\x03\x07\x18(\x03\x07\x186\x03\x07\x18\x03\x03\x07\x19\x16\x03" +
+	"\x07\x116\x03\x07\x12'\x03\x07\x13\x10\x03\x07\x0c&\x03\x07\x0c\x08\x03" +
+	"\x07\x0c\x13\x03\x07\x0d\x02\x03\x07\x0d\x1c\x03\x07\x0b5\x03\x07\x0b" +
+	"\x0a\x03\x07\x0b\x01\x03\x07\x0b\x0f\x03\x07\x05\x00\x03\x07\x05\x09\x03" +
+	"\x07\x05\x0b\x03\x07\x07\x01\x03\x07\x07\x08\x03\x07\x00<\x03\x07\x00+" +
+	"\x03\x07\x01)\x03\x07\x01\x1b\x03\x07\x01\x08\x03\x07\x03?\x03\x0445\x03" +
+	"\x044\x08\x03\x0454\x03\x04)/\x03\x04)5\x03\x04+\x05\x03\x04+\x14\x03" +
+	"\x04+ \x03\x04+<\x03\x04*&\x03\x04*\x22\x03\x04&8\x03\x04!\x01\x03\x04!" +
+	"\x22\x03\x04\x11+\x03\x04\x10.\x03\x04\x104\x03\x04\x13=\x03\x04\x12\x04" +
+	"\x03\x04\x12\x0a\x03\x04\x0d\x1d\x03\x04\x0d\x07\x03\x04\x0d \x03\x05<>" +
+	"\x03\x055<\x03\x055!\x03\x055#\x03\x055&\x03\x054\x1d\x03\x054\x02\x03" +
+	"\x054\x07\x03\x0571\x03\x053\x1a\x03\x053\x16\x03\x05.<\x03\x05.\x07\x03" +
+	"\x05):\x03\x05)<\x03\x05)\x0c\x03\x05)\x15\x03\x05+-\x03\x05+5\x03\x05$" +
+	"\x1e\x03\x05$\x14\x03\x05'\x04\x03\x05'\x14\x03\x05&\x02\x03\x05\x226" +
+	"\x03\x05\x22\x0c\x03\x05\x22\x1c\x03\x05\x19\x0a\x03\x05\x1b\x09\x03\x05" +
+	"\x1b\x0c\x03\x05\x14\x07\x03\x05\x16?\x03\x05\x16\x0c\x03\x05\x0c\x05" +
+	"\x03\x05\x0e\x0f\x03\x05\x01\x0e\x03\x05\x00(\x03\x05\x030\x03\x05\x03" +
+	"\x06\x03\x0a==\x03\x0a=1\x03\x0a=,\x03\x0a=\x0c\x03\x0a??\x03\x0a<\x08" +
+	"\x03\x0a9!\x03\x0a9)\x03\x0a97\x03\x0a99\x03\x0a6\x0a\x03\x0a6\x1c\x03" +
+	"\x0a6\x17\x03\x0a7'\x03\x0a78\x03\x0a73\x03\x0a'\x01\x03\x0a'&\x03\x0a" +
+	"\x1f\x0e\x03\x0a\x1f\x03\x03\x0a\x1f3\x03\x0a\x1b/\x03\x0a\x18\x19\x03" +
+	"\x0a\x19\x01\x03\x0a\x16\x14\x03\x0a\x0e\x22\x03\x0a\x0f\x10\x03\x0a\x0f" +
+	"\x02\x03\x0a\x0f \x03\x0a\x0c\x04\x03\x0a\x0b>\x03\x0a\x0b+\x03\x0a\x08/" +
+	"\x03\x0a\x046\x03\x0a\x05\x14\x03\x0a\x00\x04\x03\x0a\x00\x10\x03\x0a" +
+	"\x00\x14\x03\x0b<3\x03\x0b;*\x03\x0b9\x22\x03\x0b9)\x03\x0b97\x03\x0b+" +
+	"\x10\x03\x0b((\x03\x0b&5\x03\x0b$\x1c\x03\x0b$\x12\x03\x0b%\x04\x03\x0b#" +
+	"<\x03\x0b#0\x03\x0b#\x0d\x03\x0b#\x19\x03\x0b!:\x03\x0b!\x1f\x03\x0b!" +
+	"\x00\x03\x0b\x1e5\x03\x0b\x1c\x1d\x03\x0b\x1d-\x03\x0b\x1d(\x03\x0b\x18." +
+	"\x03\x0b\x18 \x03\x0b\x18\x16\x03\x0b\x14\x13\x03\x0b\x15$\x03\x0b\x15" +
+	"\x22\x03\x0b\x12\x1b\x03\x0b\x12\x10\x03\x0b\x132\x03\x0b\x13=\x03\x0b" +
+	"\x12\x18\x03\x0b\x0c&\x03\x0b\x061\x03\x0b\x06:\x03\x0b\x05#\x03\x0b\x05" +
+	"<\x03\x0b\x04\x0b\x03\x0b\x04\x04\x03\x0b\x04\x1b\x03\x0b\x042\x03\x0b" +
+	"\x041\x03\x0b\x03\x03\x03\x0b\x03\x1d\x03\x0b\x03/\x03\x0b\x03+\x03\x0b" +
+	"\x02\x1b\x03\x0b\x02\x00\x03\x0b\x01\x1e\x03\x0b\x01\x08\x03\x0b\x015" +
+	"\x03\x06\x0d9\x03\x06\x0d=\x03\x06\x0d?\x03\x02\x001\x03\x02\x003\x03" +
+	"\x02\x02\x19\x03\x02\x006\x03\x02\x02\x1b\x03\x02\x004\x03\x02\x00<\x03" +
+	"\x02\x02\x0a\x03\x02\x02\x0e\x03\x02\x01\x1a\x03\x02\x01\x07\x03\x02\x01" +
+	"\x05\x03\x02\x01\x0b\x03\x02\x01%\x03\x02\x01\x0c\x03\x02\x01\x04\x03" +
+	"\x02\x01\x1c\x03\x02\x00.\x03\x02\x002\x03\x02\x00>\x03\x02\x00\x12\x03" +
+	"\x02\x00\x16\x03\x02\x011\x03\x02\x013\x03\x02\x02 \x03\x02\x02%\x03\x02" +
+	"\x02$\x03\x02\x028\x03\x02\x02;\x03\x02\x024\x03\x02\x012\x03\x02\x022" +
+	"\x03\x02\x02/\x03\x02\x01,\x03\x02\x01\x13\x03\x02\x01\x16\x03\x02\x01" +
+	"\x11\x03\x02\x01\x1e\x03\x02\x01\x15\x03\x02\x01\x17\x03\x02\x01\x0f\x03" +
+	"\x02\x01\x08\x03\x02\x00?\x03\x02\x03\x07\x03\x02\x03\x0d\x03\x02\x03" +
+	"\x13\x03\x02\x03\x1d\x03\x02\x03\x1f\x03\x02\x00\x03\x03\x02\x00\x0d\x03" +
+	"\x02\x00\x01\x03\x02\x00\x1b\x03\x02\x00\x19\x03\x02\x00\x18\x03\x02\x00" +
+	"\x13\x03\x02\x00/\x03\x07>\x12\x03\x07<\x1f\x03\x07>\x1d\x03\x06\x1d\x0e" +
+	"\x03\x07>\x1c\x03\x07>:\x03\x07>\x13\x03\x04\x12+\x03\x07?\x03\x03\x07>" +
+	"\x02\x03\x06\x224\x03\x06\x1a.\x03\x07<%\x03\x06\x1c\x0b\x03\x0609\x03" +
+	"\x05\x1f\x01\x03\x04'\x08\x03\x93\xfd\xf5\x03\x02\x0d \x03\x02\x0d#\x03" +
+	"\x02\x0d!\x03\x02\x0d&\x03\x02\x0d\x22\x03\x02\x0d/\x03\x02\x0d,\x03\x02" +
+	"\x0d$\x03\x02\x0d'\x03\x02\x0d%\x03\x02\x0d;\x03\x02\x0d=\x03\x02\x0d?" +
+	"\x03\x099.\x03\x08\x0b7\x03\x08\x02\x14\x03\x08\x14\x0d\x03\x08.:\x03" +
+	"\x089'\x03\x0f\x0b\x18\x03\x0f\x1c1\x03\x0f\x17&\x03\x0f9\x1f\x03\x0f0" +
+	"\x0c\x03\x0e\x0a9\x03\x0e\x056\x03\x0e\x1c#\x03\x0f\x13\x0e\x03\x072\x00" +
+	"\x03\x070\x0d\x03\x072\x0b\x03\x06\x11\x18\x03\x070\x10\x03\x06\x0f(\x03" +
+	"\x072\x05\x03\x06\x0f,\x03\x073\x15\x03\x06\x07\x08\x03\x05\x16\x02\x03" +
+	"\x04\x0b \x03\x05:8\x03\x05\x16%\x03\x0a\x0d\x1f\x03\x06\x16\x10\x03\x05" +
+	"\x1d5\x03\x05*;\x03\x05\x16\x1b\x03\x04.-\x03\x06\x1a\x19\x03\x04\x03," +
+	"\x03\x0b87\x03\x04/\x0a\x03\x06\x00,\x03\x04-\x01\x03\x04\x1e-\x03\x06/(" +
+	"\x03\x0a\x0b5\x03\x06\x0e7\x03\x06\x07.\x03\x0597\x03\x0a*%\x03\x0760" +
+	"\x03\x06\x0c;\x03\x05'\x00\x03\x072.\x03\x072\x08\x03\x06=\x01\x03\x06" +
+	"\x05\x1b\x03\x06\x06\x12\x03\x06$=\x03\x06'\x0d\x03\x04\x11\x0f\x03\x076" +
+	",\x03\x06\x07;\x03\x06.,\x03\x86\xf9\xea\x03\x8f\xff\xeb\x02\x092\x02" +
+	"\x095\x02\x094\x02\x09;\x02\x09>\x02\x098\x02\x09*\x02\x09/\x02\x09,\x02" +
+	"\x09%\x02\x09&\x02\x09#\x02\x09 \x02\x08!\x02\x08%\x02\x08$\x02\x08+\x02" +
+	"\x08.\x02\x08*\x02\x08&\x02\x088\x02\x08>\x02\x084\x02\x086\x02\x080\x02" +
+	"\x08\x10\x02\x08\x17\x02\x08\x12\x02\x08\x1d\x02\x08\x1f\x02\x08\x13\x02" +
+	"\x08\x15\x02\x08\x14\x02\x08\x0c\x03\x8b\xfd\xd0\x03\x81\xec\xc6\x03\x87" +
+	"\xe0\x8a\x03-2\xe3\x03\x80\xef\xe4\x03-2\xea\x03\x88\xe6\xeb\x03\x8e\xe6" +
+	"\xe8\x03\x84\xe6\xe9\x03\x97\xe6\xee\x03-2\xf9\x03-2\xf6\x03\x8e\xe3\xad" +
+	"\x03\x80\xe3\x92\x03\x88\xe3\x90\x03\x8e\xe3\x90\x03\x80\xe3\x97\x03\x88" +
+	"\xe3\x95\x03\x88\xfe\xcb\x03\x8e\xfe\xca\x03\x84\xfe\xcd\x03\x91\xef\xc9" +
+	"\x03-2\xc1\x03-2\xc0\x03-2\xcb\x03\x88@\x09\x03\x8e@\x08\x03\x8f\xe0\xf5" +
+	"\x03\x8e\xe6\xf9\x03\x8e\xe0\xfa\x03\x93\xff\xf4\x03\x84\xee\xd3\x03\x0b" +
+	"(\x04\x023 \x03\x0b)\x08\x021;\x02\x01*\x03\x0b#\x10\x03\x0b 0\x03\x0b!" +
+	"\x10\x03\x0b!0\x03\x07\x15\x08\x03\x09?5\x03\x07\x1f\x08\x03\x07\x17\x0b" +
+	"\x03\x09\x1f\x15\x03\x0b\x1c7\x03\x0a+#\x03\x06\x1a\x1b\x03\x06\x1a\x14" +
+	"\x03\x0a\x01\x18\x03\x06#\x1b\x03\x0a2\x0c\x03\x0a\x01\x04\x03\x09#;\x03" +
+	"\x08='\x03\x08\x1a\x0a\x03\x07</\x03\x07:+\x03\x07\x07*\x03\x06&\x1c\x03" +
+	"\x09\x0c\x16\x03\x09\x10\x0e\x03\x08'\x0f\x03\x08+\x09\x03\x074%\x03\x06" +
+	"!3\x03\x06\x03+\x03\x0b\x1e\x19\x03\x0a))\x03\x09\x08\x19\x03\x08,\x05" +
+	"\x03\x07<2\x03\x06\x1c>\x03\x0a\x111\x03\x09\x1b\x09\x03\x073.\x03\x07" +
+	"\x01\x00\x03\x09/,\x03\x07#>\x03\x07\x048\x03\x0a\x1f\x22\x03\x098>\x03" +
+	"\x09\x11\x00\x03\x08/\x17\x03\x06'\x22\x03\x0b\x1a+\x03\x0a\x22\x19\x03" +
+	"\x0a/1\x03\x0974\x03\x09\x0f\x22\x03\x08,\x22\x03\x08?\x14\x03\x07$5\x03" +
+	"\x07<3\x03\x07=*\x03\x07\x13\x18\x03\x068\x0a\x03\x06\x09\x16\x03\x06" +
+	"\x13\x00\x03\x08\x067\x03\x08\x01\x03\x03\x08\x12\x1d\x03\x07+7\x03\x06(" +
+	";\x03\x06\x1c?\x03\x07\x0e\x17\x03\x0a\x06\x1d\x03\x0a\x19\x07\x03\x08" +
+	"\x14$\x03\x07$;\x03\x08,$\x03\x08\x06\x0d\x03\x07\x16\x0a\x03\x06>>\x03" +
+	"\x0a\x06\x12\x03\x0a\x14)\x03\x09\x0d\x1f\x03\x09\x12\x17\x03\x09\x19" +
+	"\x01\x03\x08\x11 \x03\x08\x1d'\x03\x06<\x1a\x03\x0a.\x00\x03\x07'\x18" +
+	"\x03\x0a\x22\x08\x03\x08\x0d\x0a\x03\x08\x13)\x03\x07*)\x03\x06<,\x03" +
+	"\x07\x0b\x1a\x03\x09.\x14\x03\x09\x0d\x1e\x03\x07\x0e#\x03\x0b\x1d'\x03" +
+	"\x0a\x0a8\x03\x09%2\x03\x08+&\x03\x080\x12\x03\x0a)4\x03\x08\x06\x1f\x03" +
+	"\x0b\x1b\x1a\x03\x0a\x1b\x0f\x03\x0b\x1d*\x03\x09\x16$\x03\x090\x11\x03" +
+	"\x08\x11\x08\x03\x0a*(\x03\x0a\x042\x03\x089,\x03\x074'\x03\x07\x0f\x05" +
+	"\x03\x09\x0b\x0a\x03\x07\x1b\x01\x03\x09\x17:\x03\x09.\x0d\x03\x07.\x11" +
+	"\x03\x09+\x15\x03\x080\x13\x03\x0b\x1f\x19\x03\x0a \x11\x03\x0a\x220\x03" +
+	"\x09\x07;\x03\x08\x16\x1c\x03\x07,\x13\x03\x07\x0e/\x03\x06\x221\x03\x0a" +
+	".\x0a\x03\x0a7\x02\x03\x0a\x032\x03\x0a\x1d.\x03\x091\x06\x03\x09\x19:" +
+	"\x03\x08\x02/\x03\x060+\x03\x06\x0f-\x03\x06\x1c\x1f\x03\x06\x1d\x07\x03" +
+	"\x0a,\x11\x03\x09=\x0d\x03\x09\x0b;\x03\x07\x1b/\x03\x0a\x1f:\x03\x09 " +
+	"\x1f\x03\x09.\x10\x03\x094\x0b\x03\x09\x1a1\x03\x08#\x1a\x03\x084\x1d" +
+	"\x03\x08\x01\x1f\x03\x08\x11\x22\x03\x07'8\x03\x07\x1a>\x03\x0757\x03" +
+	"\x06&9\x03\x06+\x11\x03\x0a.\x0b\x03\x0a,>\x03\x0a4#\x03\x08%\x17\x03" +
+	"\x07\x05\x22\x03\x07\x0c\x0b\x03\x0a\x1d+\x03\x0a\x19\x16\x03\x09+\x1f" +
+	"\x03\x09\x08\x0b\x03\x08\x16\x18\x03\x08+\x12\x03\x0b\x1d\x0c\x03\x0a=" +
+	"\x10\x03\x0a\x09\x0d\x03\x0a\x10\x11\x03\x09&0\x03\x08(\x1f\x03\x087\x07" +
+	"\x03\x08\x185\x03\x07'6\x03\x06.\x05\x03\x06=\x04\x03\x06;;\x03\x06\x06," +
+	"\x03\x0b\x18>\x03\x08\x00\x18\x03\x06 \x03\x03\x06<\x00\x03\x09%\x18\x03" +
+	"\x0b\x1c<\x03\x0a%!\x03\x0a\x09\x12\x03\x0a\x16\x02\x03\x090'\x03\x09" +
+	"\x0e=\x03\x08 \x0e\x03\x08>\x03\x03\x074>\x03\x06&?\x03\x06\x19\x09\x03" +
+	"\x06?(\x03\x0a-\x0e\x03\x09:3\x03\x098:\x03\x09\x12\x0b\x03\x09\x1d\x17" +
+	"\x03\x087\x05\x03\x082\x14\x03\x08\x06%\x03\x08\x13\x1f\x03\x06\x06\x0e" +
+	"\x03\x0a\x22<\x03\x09/<\x03\x06>+\x03\x0a'?\x03\x0a\x13\x0c\x03\x09\x10<" +
+	"\x03\x07\x1b=\x03\x0a\x19\x13\x03\x09\x22\x1d\x03\x09\x07\x0d\x03\x08)" +
+	"\x1c\x03\x06=\x1a\x03\x0a/4\x03\x0a7\x11\x03\x0a\x16:\x03\x09?3\x03\x09:" +
+	"/\x03\x09\x05\x0a\x03\x09\x14\x06\x03\x087\x22\x03\x080\x07\x03\x08\x1a" +
+	"\x1f\x03\x07\x04(\x03\x07\x04\x09\x03\x06 %\x03\x06<\x08\x03\x0a+\x14" +
+	"\x03\x09\x1d\x16\x03\x0a70\x03\x08 >\x03\x0857\x03\x070\x0a\x03\x06=\x12" +
+	"\x03\x06\x16%\x03\x06\x1d,\x03\x099#\x03\x09\x10>\x03\x07 \x1e\x03\x08" +
+	"\x0c<\x03\x08\x0b\x18\x03\x08\x15+\x03\x08,:\x03\x08%\x22\x03\x07\x0a$" +
+	"\x03\x0b\x1c=\x03\x07+\x08\x03\x0a/\x05\x03\x0a \x07\x03\x0a\x12'\x03" +
+	"\x09#\x11\x03\x08\x1b\x15\x03\x0a\x06\x01\x03\x09\x1c\x1b\x03\x0922\x03" +
+	"\x07\x14<\x03\x07\x09\x04\x03\x061\x04\x03\x07\x0e\x01\x03\x0a\x13\x18" +
+	"\x03\x0a-\x0c\x03\x0a?\x0d\x03\x0a\x09\x0a\x03\x091&\x03\x0a/\x0b\x03" +
+	"\x08$<\x03\x083\x1d\x03\x08\x0c$\x03\x08\x0d\x07\x03\x08\x0d?\x03\x08" +
+	"\x0e\x14\x03\x065\x0a\x03\x08\x1a#\x03\x08\x16#\x03\x0702\x03\x07\x03" +
+	"\x1a\x03\x06(\x1d\x03\x06+\x1b\x03\x06\x0b\x05\x03\x06\x0b\x17\x03\x06" +
+	"\x0c\x04\x03\x06\x1e\x19\x03\x06+0\x03\x062\x18\x03\x0b\x16\x1e\x03\x0a+" +
+	"\x16\x03\x0a-?\x03\x0a#:\x03\x0a#\x10\x03\x0a%$\x03\x0a>+\x03\x0a01\x03" +
+	"\x0a1\x10\x03\x0a\x099\x03\x0a\x0a\x12\x03\x0a\x19\x1f\x03\x0a\x19\x12" +
+	"\x03\x09*)\x03\x09-\x16\x03\x09.1\x03\x09.2\x03\x09<\x0e\x03\x09> \x03" +
+	"\x093\x12\x03\x09\x0b\x01\x03\x09\x1c2\x03\x09\x11\x1c\x03\x09\x15%\x03" +
+	"\x08,&\x03\x08!\x22\x03\x089(\x03\x08\x0b\x1a\x03\x08\x0d2\x03\x08\x0c" +
+	"\x04\x03\x08\x0c\x06\x03\x08\x0c\x1f\x03\x08\x0c\x0c\x03\x08\x0f\x1f\x03" +
+	"\x08\x0f\x1d\x03\x08\x00\x14\x03\x08\x03\x14\x03\x08\x06\x16\x03\x08\x1e" +
+	"#\x03\x08\x11\x11\x03\x08\x10\x18\x03\x08\x14(\x03\x07)\x1e\x03\x07.1" +
+	"\x03\x07 $\x03\x07 '\x03\x078\x08\x03\x07\x0d0\x03\x07\x0f7\x03\x07\x05#" +
+	"\x03\x07\x05\x1a\x03\x07\x1a7\x03\x07\x1d-\x03\x07\x17\x10\x03\x06)\x1f" +
+	"\x03\x062\x0b\x03\x066\x16\x03\x06\x09\x11\x03\x09(\x1e\x03\x07!5\x03" +
+	"\x0b\x11\x16\x03\x0a/\x04\x03\x0a,\x1a\x03\x0b\x173\x03\x0a,1\x03\x0a/5" +
+	"\x03\x0a\x221\x03\x0a\x22\x0d\x03\x0a?%\x03\x0a<,\x03\x0a?#\x03\x0a>\x19" +
+	"\x03\x0a\x08&\x03\x0a\x0b\x0e\x03\x0a\x0c:\x03\x0a\x0c+\x03\x0a\x03\x22" +
+	"\x03\x0a\x06)\x03\x0a\x11\x10\x03\x0a\x11\x1a\x03\x0a\x17-\x03\x0a\x14(" +
+	"\x03\x09)\x1e\x03\x09/\x09\x03\x09.\x00\x03\x09,\x07\x03\x09/*\x03\x09-9" +
+	"\x03\x09\x228\x03\x09%\x09\x03\x09:\x12\x03\x09;\x1d\x03\x09?\x06\x03" +
+	"\x093%\x03\x096\x05\x03\x096\x08\x03\x097\x02\x03\x09\x07,\x03\x09\x04," +
+	"\x03\x09\x1f\x16\x03\x09\x11\x03\x03\x09\x11\x12\x03\x09\x168\x03\x08*" +
+	"\x05\x03\x08/2\x03\x084:\x03\x08\x22+\x03\x08 0\x03\x08&\x0a\x03\x08;" +
+	"\x10\x03\x08>$\x03\x08>\x18\x03\x0829\x03\x082:\x03\x081,\x03\x081<\x03" +
+	"\x081\x1c\x03\x087#\x03\x087*\x03\x08\x09'\x03\x08\x00\x1d\x03\x08\x05-" +
+	"\x03\x08\x1f4\x03\x08\x1d\x04\x03\x08\x16\x0f\x03\x07*7\x03\x07'!\x03" +
+	"\x07%\x1b\x03\x077\x0c\x03\x07\x0c1\x03\x07\x0c.\x03\x07\x00\x06\x03\x07" +
+	"\x01\x02\x03\x07\x010\x03\x07\x06=\x03\x07\x01\x03\x03\x07\x01\x13\x03" +
+	"\x07\x06\x06\x03\x07\x05\x0a\x03\x07\x1f\x09\x03\x07\x17:\x03\x06*1\x03" +
+	"\x06-\x1d\x03\x06\x223\x03\x062:\x03\x060$\x03\x066\x1e\x03\x064\x12\x03" +
+	"\x0645\x03\x06\x0b\x00\x03\x06\x0b7\x03\x06\x07\x1f\x03\x06\x15\x12\x03" +
+	"\x0c\x05\x0f\x03\x0b+\x0b\x03\x0b+-\x03\x06\x16\x1b\x03\x06\x15\x17\x03" +
+	"\x89\xca\xea\x03\x89\xca\xe8\x03\x0c8\x10\x03\x0c8\x01\x03\x0c8\x0f\x03" +
+	"\x0d8%\x03\x0d8!\x03\x0c8-\x03\x0c8/\x03\x0c8+\x03\x0c87\x03\x0c85\x03" +
+	"\x0c9\x09\x03\x0c9\x0d\x03\x0c9\x0f\x03\x0c9\x0b\x03\xcfu\x0c\x03\xcfu" +
+	"\x0f\x03\xcfu\x0e\x03\xcfu\x09\x03\x0c9\x10\x03\x0d9\x0c\x03\xcf`;\x03" +
+	"\xcf`>\x03\xcf`9\x03\xcf`8\x03\xcf`7\x03\xcf`*\x03\xcf`-\x03\xcf`,\x03" +
+	"\x0d\x1b\x1a\x03\x0d\x1b&\x03\x0c=.\x03\x0c=%\x03\x0c>\x1e\x03\x0c>\x14" +
+	"\x03\x0c?\x06\x03\x0c?\x0b\x03\x0c?\x0c\x03\x0c?\x0d\x03\x0c?\x02\x03" +
+	"\x0c>\x0f\x03\x0c>\x08\x03\x0c>\x09\x03\x0c>,\x03\x0c>\x0c\x03\x0c?\x13" +
+	"\x03\x0c?\x16\x03\x0c?\x15\x03\x0c?\x1c\x03\x0c?\x1f\x03\x0c?\x1d\x03" +
+	"\x0c?\x1a\x03\x0c?\x17\x03\x0c?\x08\x03\x0c?\x09\x03\x0c?\x0e\x03\x0c?" +
+	"\x04\x03\x0c?\x05\x03\x0c<?\x03\x0c=\x00\x03\x0c=\x06\x03\x0c=\x05\x03" +
+	"\x0c=\x0c\x03\x0c=\x0f\x03\x0c=\x0d\x03\x0c=\x0b\x03\x0c=\x07\x03\x0c=" +
+	"\x19\x03\x0c=\x15\x03\x0c=\x11\x03\x0c=1\x03\x0c=3\x03\x0c=0\x03\x0c=>" +
+	"\x03\x0c=2\x03\x0c=6\x03\x0c<\x07\x03\x0c<\x05\x03\x0e:!\x03\x0e:#\x03" +
+	"\x0e8\x09\x03\x0e:&\x03\x0e8\x0b\x03\x0e:$\x03\x0e:,\x03\x0e8\x1a\x03" +
+	"\x0e8\x1e\x03\x0e:*\x03\x0e:7\x03\x0e:5\x03\x0e:;\x03\x0e:\x15\x03\x0e:<" +
+	"\x03\x0e:4\x03\x0e:'\x03\x0e:-\x03\x0e:%\x03\x0e:?\x03\x0e:=\x03\x0e:)" +
+	"\x03\x0e:/\x03\xcfs'\x03\x0d=\x0f\x03\x0d+*\x03\x0d99\x03\x0d9;\x03\x0d9" +
+	"?\x03\x0d)\x0d\x03\x0d(%\x02\x01\x18\x02\x01(\x02\x03'\x02\x03)\x02\x03+" +
+	"\x02\x03/\x02\x03\x19\x02\x03\x1b\x02\x03\x1f\x03\x0d\x22\x18\x03\x0d" +
+	"\x22\x1a\x03\x0d\x22'\x03\x0d\x22/\x03\x0d\x223\x03\x0d\x22$\x02\x01\x1e" +
+	"\x03\x0f$!\x03\x0f87\x03\x0f4\x0e\x03\x0f5\x1d\x03\x06'\x03\x03\x0f\x08" +
+	"\x18\x03\x0f\x0d\x1b\x03\x0e2=\x03\x0e;\x08\x03\x0e:\x0b\x03\x0e\x06$" +
+	"\x03\x0e\x0d)\x03\x0e\x16\x1f\x03\x0e\x16\x1b\x03\x0d$\x0a\x03\x05,\x1d" +
+	"\x03\x0d. \x03\x0d.#\x03\x0c(/\x03\x09%\x02\x03\x0d90\x03\x0d\x0e4\x03" +
+	"\x0d\x0d\x0f\x03\x0c#\x00\x03\x0c,\x1e\x03\x0c2\x0e\x03\x0c\x01\x17\x03" +
+	"\x0c\x09:\x03\x0e\x173\x03\x0c\x08\x03\x03\x0c\x11\x07\x03\x0c\x10\x18" +
+	"\x03\x0c\x1f\x1c\x03\x0c\x19\x0e\x03\x0c\x1a\x1f\x03\x0f0>\x03\x0b->\x03" +
+	"\x0b<+\x03\x0b8\x13\x03\x0b\x043\x03\x0b\x14\x03\x03\x0b\x16%\x03\x0d" +
+	"\x22&\x03\x0b\x1a\x1a\x03\x0b\x1a\x04\x03\x0a%9\x03\x0a&2\x03\x0a&0\x03" +
+	"\x0a!\x1a\x03\x0a!7\x03\x0a5\x10\x03\x0a=4\x03\x0a?\x0e\x03\x0a>\x10\x03" +
+	"\x0a\x00 \x03\x0a\x0f:\x03\x0a\x0f9\x03\x0a\x0b\x0a\x03\x0a\x17%\x03\x0a" +
+	"\x1b-\x03\x09-\x1a\x03\x09,4\x03\x09.,\x03\x09)\x09\x03\x096!\x03\x091" +
+	"\x1f\x03\x093\x16\x03\x0c+\x1f\x03\x098 \x03\x098=\x03\x0c(\x1a\x03\x0c(" +
+	"\x16\x03\x09\x0a+\x03\x09\x16\x12\x03\x09\x13\x0e\x03\x09\x153\x03\x08)!" +
+	"\x03\x09\x1a\x01\x03\x09\x18\x01\x03\x08%#\x03\x08>\x22\x03\x08\x05%\x03" +
+	"\x08\x02*\x03\x08\x15;\x03\x08\x1b7\x03\x0f\x07\x1d\x03\x0f\x04\x03\x03" +
+	"\x070\x0c\x03\x07;\x0b\x03\x07\x08\x17\x03\x07\x12\x06\x03\x06/-\x03\x06" +
+	"71\x03\x065+\x03\x06>7\x03\x06\x049\x03\x05+\x1e\x03\x05,\x17\x03\x05 " +
+	"\x1d\x03\x05\x22\x05\x03\x050\x1d"
+
+// lookup returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *idnaTrie) lookup(s []byte) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return idnaValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := idnaIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := idnaIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = idnaIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := idnaIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = idnaIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = idnaIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *idnaTrie) lookupUnsafe(s []byte) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return idnaValues[c0]
+	}
+	i := idnaIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = idnaIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = idnaIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// lookupString returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *idnaTrie) lookupString(s string) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return idnaValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := idnaIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := idnaIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = idnaIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := idnaIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = idnaIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = idnaIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *idnaTrie) lookupStringUnsafe(s string) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return idnaValues[c0]
+	}
+	i := idnaIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = idnaIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = idnaIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// idnaTrie. Total size: 31598 bytes (30.86 KiB). Checksum: d3118eda0d6b5360.
+type idnaTrie struct{}
+
+func newIdnaTrie(i int) *idnaTrie {
+	return &idnaTrie{}
+}
+
+// lookupValue determines the type of block n and looks up the value for b.
+func (t *idnaTrie) lookupValue(n uint32, b byte) uint16 {
+	switch {
+	case n < 133:
+		return uint16(idnaValues[n<<6+uint32(b)])
+	default:
+		n -= 133
+		return uint16(idnaSparse.lookup(n, b))
+	}
+}
+
+// idnaValues: 135 blocks, 8640 entries, 17280 bytes
+// The third block is the zero block.
+var idnaValues = [8640]uint16{
+	// Block 0x0, offset 0x0
+	0x00: 0x0080, 0x01: 0x0080, 0x02: 0x0080, 0x03: 0x0080, 0x04: 0x0080, 0x05: 0x0080,
+	0x06: 0x0080, 0x07: 0x0080, 0x08: 0x0080, 0x09: 0x0080, 0x0a: 0x0080, 0x0b: 0x0080,
+	0x0c: 0x0080, 0x0d: 0x0080, 0x0e: 0x0080, 0x0f: 0x0080, 0x10: 0x0080, 0x11: 0x0080,
+	0x12: 0x0080, 0x13: 0x0080, 0x14: 0x0080, 0x15: 0x0080, 0x16: 0x0080, 0x17: 0x0080,
+	0x18: 0x0080, 0x19: 0x0080, 0x1a: 0x0080, 0x1b: 0x0080, 0x1c: 0x0080, 0x1d: 0x0080,
+	0x1e: 0x0080, 0x1f: 0x0080, 0x20: 0x0080, 0x21: 0x0080, 0x22: 0x0080, 0x23: 0x0080,
+	0x24: 0x0080, 0x25: 0x0080, 0x26: 0x0080, 0x27: 0x0080, 0x28: 0x0080, 0x29: 0x0080,
+	0x2a: 0x0080, 0x2b: 0x0080, 0x2c: 0x0080, 0x2d: 0x0008, 0x2e: 0x0008, 0x2f: 0x0080,
+	0x30: 0x0008, 0x31: 0x0008, 0x32: 0x0008, 0x33: 0x0008, 0x34: 0x0008, 0x35: 0x0008,
+	0x36: 0x0008, 0x37: 0x0008, 0x38: 0x0008, 0x39: 0x0008, 0x3a: 0x0080, 0x3b: 0x0080,
+	0x3c: 0x0080, 0x3d: 0x0080, 0x3e: 0x0080, 0x3f: 0x0080,
+	// Block 0x1, offset 0x40
+	0x40: 0x0080, 0x41: 0xe105, 0x42: 0xe105, 0x43: 0xe105, 0x44: 0xe105, 0x45: 0xe105,
+	0x46: 0xe105, 0x47: 0xe105, 0x48: 0xe105, 0x49: 0xe105, 0x4a: 0xe105, 0x4b: 0xe105,
+	0x4c: 0xe105, 0x4d: 0xe105, 0x4e: 0xe105, 0x4f: 0xe105, 0x50: 0xe105, 0x51: 0xe105,
+	0x52: 0xe105, 0x53: 0xe105, 0x54: 0xe105, 0x55: 0xe105, 0x56: 0xe105, 0x57: 0xe105,
+	0x58: 0xe105, 0x59: 0xe105, 0x5a: 0xe105, 0x5b: 0x0080, 0x5c: 0x0080, 0x5d: 0x0080,
+	0x5e: 0x0080, 0x5f: 0x0080, 0x60: 0x0080, 0x61: 0x0008, 0x62: 0x0008, 0x63: 0x0008,
+	0x64: 0x0008, 0x65: 0x0008, 0x66: 0x0008, 0x67: 0x0008, 0x68: 0x0008, 0x69: 0x0008,
+	0x6a: 0x0008, 0x6b: 0x0008, 0x6c: 0x0008, 0x6d: 0x0008, 0x6e: 0x0008, 0x6f: 0x0008,
+	0x70: 0x0008, 0x71: 0x0008, 0x72: 0x0008, 0x73: 0x0008, 0x74: 0x0008, 0x75: 0x0008,
+	0x76: 0x0008, 0x77: 0x0008, 0x78: 0x0008, 0x79: 0x0008, 0x7a: 0x0008, 0x7b: 0x0080,
+	0x7c: 0x0080, 0x7d: 0x0080, 0x7e: 0x0080, 0x7f: 0x0080,
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc0: 0x0040, 0xc1: 0x0040, 0xc2: 0x0040, 0xc3: 0x0040, 0xc4: 0x0040, 0xc5: 0x0040,
+	0xc6: 0x0040, 0xc7: 0x0040, 0xc8: 0x0040, 0xc9: 0x0040, 0xca: 0x0040, 0xcb: 0x0040,
+	0xcc: 0x0040, 0xcd: 0x0040, 0xce: 0x0040, 0xcf: 0x0040, 0xd0: 0x0040, 0xd1: 0x0040,
+	0xd2: 0x0040, 0xd3: 0x0040, 0xd4: 0x0040, 0xd5: 0x0040, 0xd6: 0x0040, 0xd7: 0x0040,
+	0xd8: 0x0040, 0xd9: 0x0040, 0xda: 0x0040, 0xdb: 0x0040, 0xdc: 0x0040, 0xdd: 0x0040,
+	0xde: 0x0040, 0xdf: 0x0040, 0xe0: 0x000a, 0xe1: 0x0018, 0xe2: 0x0018, 0xe3: 0x0018,
+	0xe4: 0x0018, 0xe5: 0x0018, 0xe6: 0x0018, 0xe7: 0x0018, 0xe8: 0x0012, 0xe9: 0x0018,
+	0xea: 0x0019, 0xeb: 0x0018, 0xec: 0x0018, 0xed: 0x03c0, 0xee: 0x0018, 0xef: 0x0022,
+	0xf0: 0x0018, 0xf1: 0x0018, 0xf2: 0x0029, 0xf3: 0x0031, 0xf4: 0x003a, 0xf5: 0x0005,
+	0xf6: 0x0018, 0xf7: 0x0008, 0xf8: 0x0042, 0xf9: 0x0049, 0xfa: 0x0051, 0xfb: 0x0018,
+	0xfc: 0x0059, 0xfd: 0x0061, 0xfe: 0x0069, 0xff: 0x0018,
+	// Block 0x4, offset 0x100
+	0x100: 0xe00d, 0x101: 0x0008, 0x102: 0xe00d, 0x103: 0x0008, 0x104: 0xe00d, 0x105: 0x0008,
+	0x106: 0xe00d, 0x107: 0x0008, 0x108: 0xe00d, 0x109: 0x0008, 0x10a: 0xe00d, 0x10b: 0x0008,
+	0x10c: 0xe00d, 0x10d: 0x0008, 0x10e: 0xe00d, 0x10f: 0x0008, 0x110: 0xe00d, 0x111: 0x0008,
+	0x112: 0xe00d, 0x113: 0x0008, 0x114: 0xe00d, 0x115: 0x0008, 0x116: 0xe00d, 0x117: 0x0008,
+	0x118: 0xe00d, 0x119: 0x0008, 0x11a: 0xe00d, 0x11b: 0x0008, 0x11c: 0xe00d, 0x11d: 0x0008,
+	0x11e: 0xe00d, 0x11f: 0x0008, 0x120: 0xe00d, 0x121: 0x0008, 0x122: 0xe00d, 0x123: 0x0008,
+	0x124: 0xe00d, 0x125: 0x0008, 0x126: 0xe00d, 0x127: 0x0008, 0x128: 0xe00d, 0x129: 0x0008,
+	0x12a: 0xe00d, 0x12b: 0x0008, 0x12c: 0xe00d, 0x12d: 0x0008, 0x12e: 0xe00d, 0x12f: 0x0008,
+	0x130: 0x0071, 0x131: 0x0008, 0x132: 0x0035, 0x133: 0x004d, 0x134: 0xe00d, 0x135: 0x0008,
+	0x136: 0xe00d, 0x137: 0x0008, 0x138: 0x0008, 0x139: 0xe01d, 0x13a: 0x0008, 0x13b: 0xe03d,
+	0x13c: 0x0008, 0x13d: 0xe01d, 0x13e: 0x0008, 0x13f: 0x0079,
+	// Block 0x5, offset 0x140
+	0x140: 0x0079, 0x141: 0xe01d, 0x142: 0x0008, 0x143: 0xe03d, 0x144: 0x0008, 0x145: 0xe01d,
+	0x146: 0x0008, 0x147: 0xe07d, 0x148: 0x0008, 0x149: 0x0081, 0x14a: 0xe00d, 0x14b: 0x0008,
+	0x14c: 0xe00d, 0x14d: 0x0008, 0x14e: 0xe00d, 0x14f: 0x0008, 0x150: 0xe00d, 0x151: 0x0008,
+	0x152: 0xe00d, 0x153: 0x0008, 0x154: 0xe00d, 0x155: 0x0008, 0x156: 0xe00d, 0x157: 0x0008,
+	0x158: 0xe00d, 0x159: 0x0008, 0x15a: 0xe00d, 0x15b: 0x0008, 0x15c: 0xe00d, 0x15d: 0x0008,
+	0x15e: 0xe00d, 0x15f: 0x0008, 0x160: 0xe00d, 0x161: 0x0008, 0x162: 0xe00d, 0x163: 0x0008,
+	0x164: 0xe00d, 0x165: 0x0008, 0x166: 0xe00d, 0x167: 0x0008, 0x168: 0xe00d, 0x169: 0x0008,
+	0x16a: 0xe00d, 0x16b: 0x0008, 0x16c: 0xe00d, 0x16d: 0x0008, 0x16e: 0xe00d, 0x16f: 0x0008,
+	0x170: 0xe00d, 0x171: 0x0008, 0x172: 0xe00d, 0x173: 0x0008, 0x174: 0xe00d, 0x175: 0x0008,
+	0x176: 0xe00d, 0x177: 0x0008, 0x178: 0x0065, 0x179: 0xe01d, 0x17a: 0x0008, 0x17b: 0xe03d,
+	0x17c: 0x0008, 0x17d: 0xe01d, 0x17e: 0x0008, 0x17f: 0x0089,
+	// Block 0x6, offset 0x180
+	0x180: 0x0008, 0x181: 0x007d, 0x182: 0xe00d, 0x183: 0x0008, 0x184: 0xe00d, 0x185: 0x0008,
+	0x186: 0x007d, 0x187: 0xe07d, 0x188: 0x0008, 0x189: 0x0095, 0x18a: 0x00ad, 0x18b: 0xe03d,
+	0x18c: 0x0008, 0x18d: 0x0008, 0x18e: 0x00c5, 0x18f: 0x00dd, 0x190: 0x00f5, 0x191: 0xe01d,
+	0x192: 0x0008, 0x193: 0x010d, 0x194: 0x0125, 0x195: 0x0008, 0x196: 0x013d, 0x197: 0x013d,
+	0x198: 0xe00d, 0x199: 0x0008, 0x19a: 0x0008, 0x19b: 0x0008, 0x19c: 0x010d, 0x19d: 0x0155,
+	0x19e: 0x0008, 0x19f: 0x016d, 0x1a0: 0xe00d, 0x1a1: 0x0008, 0x1a2: 0xe00d, 0x1a3: 0x0008,
+	0x1a4: 0xe00d, 0x1a5: 0x0008, 0x1a6: 0x0185, 0x1a7: 0xe07d, 0x1a8: 0x0008, 0x1a9: 0x019d,
+	0x1aa: 0x0008, 0x1ab: 0x0008, 0x1ac: 0xe00d, 0x1ad: 0x0008, 0x1ae: 0x0185, 0x1af: 0xe0fd,
+	0x1b0: 0x0008, 0x1b1: 0x01b5, 0x1b2: 0x01cd, 0x1b3: 0xe03d, 0x1b4: 0x0008, 0x1b5: 0xe01d,
+	0x1b6: 0x0008, 0x1b7: 0x01e5, 0x1b8: 0xe00d, 0x1b9: 0x0008, 0x1ba: 0x0008, 0x1bb: 0x0008,
+	0x1bc: 0xe00d, 0x1bd: 0x0008, 0x1be: 0x0008, 0x1bf: 0x0008,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x0008, 0x1c1: 0x0008, 0x1c2: 0x0008, 0x1c3: 0x0008, 0x1c4: 0x0091, 0x1c5: 0x0091,
+	0x1c6: 0x0091, 0x1c7: 0x01fd, 0x1c8: 0x0215, 0x1c9: 0x022d, 0x1ca: 0x0245, 0x1cb: 0x025d,
+	0x1cc: 0x0275, 0x1cd: 0xe01d, 0x1ce: 0x0008, 0x1cf: 0xe0fd, 0x1d0: 0x0008, 0x1d1: 0xe01d,
+	0x1d2: 0x0008, 0x1d3: 0xe03d, 0x1d4: 0x0008, 0x1d5: 0xe01d, 0x1d6: 0x0008, 0x1d7: 0xe07d,
+	0x1d8: 0x0008, 0x1d9: 0xe01d, 0x1da: 0x0008, 0x1db: 0xe03d, 0x1dc: 0x0008, 0x1dd: 0x0008,
+	0x1de: 0xe00d, 0x1df: 0x0008, 0x1e0: 0xe00d, 0x1e1: 0x0008, 0x1e2: 0xe00d, 0x1e3: 0x0008,
+	0x1e4: 0xe00d, 0x1e5: 0x0008, 0x1e6: 0xe00d, 0x1e7: 0x0008, 0x1e8: 0xe00d, 0x1e9: 0x0008,
+	0x1ea: 0xe00d, 0x1eb: 0x0008, 0x1ec: 0xe00d, 0x1ed: 0x0008, 0x1ee: 0xe00d, 0x1ef: 0x0008,
+	0x1f0: 0x0008, 0x1f1: 0x028d, 0x1f2: 0x02a5, 0x1f3: 0x02bd, 0x1f4: 0xe00d, 0x1f5: 0x0008,
+	0x1f6: 0x02d5, 0x1f7: 0x02ed, 0x1f8: 0xe00d, 0x1f9: 0x0008, 0x1fa: 0xe00d, 0x1fb: 0x0008,
+	0x1fc: 0xe00d, 0x1fd: 0x0008, 0x1fe: 0xe00d, 0x1ff: 0x0008,
+	// Block 0x8, offset 0x200
+	0x200: 0xe00d, 0x201: 0x0008, 0x202: 0xe00d, 0x203: 0x0008, 0x204: 0xe00d, 0x205: 0x0008,
+	0x206: 0xe00d, 0x207: 0x0008, 0x208: 0xe00d, 0x209: 0x0008, 0x20a: 0xe00d, 0x20b: 0x0008,
+	0x20c: 0xe00d, 0x20d: 0x0008, 0x20e: 0xe00d, 0x20f: 0x0008, 0x210: 0xe00d, 0x211: 0x0008,
+	0x212: 0xe00d, 0x213: 0x0008, 0x214: 0xe00d, 0x215: 0x0008, 0x216: 0xe00d, 0x217: 0x0008,
+	0x218: 0xe00d, 0x219: 0x0008, 0x21a: 0xe00d, 0x21b: 0x0008, 0x21c: 0xe00d, 0x21d: 0x0008,
+	0x21e: 0xe00d, 0x21f: 0x0008, 0x220: 0x0305, 0x221: 0x0008, 0x222: 0xe00d, 0x223: 0x0008,
+	0x224: 0xe00d, 0x225: 0x0008, 0x226: 0xe00d, 0x227: 0x0008, 0x228: 0xe00d, 0x229: 0x0008,
+	0x22a: 0xe00d, 0x22b: 0x0008, 0x22c: 0xe00d, 0x22d: 0x0008, 0x22e: 0xe00d, 0x22f: 0x0008,
+	0x230: 0xe00d, 0x231: 0x0008, 0x232: 0xe00d, 0x233: 0x0008, 0x234: 0x0008, 0x235: 0x0008,
+	0x236: 0x0008, 0x237: 0x0008, 0x238: 0x0008, 0x239: 0x0008, 0x23a: 0x0099, 0x23b: 0xe03d,
+	0x23c: 0x0008, 0x23d: 0x031d, 0x23e: 0x00a1, 0x23f: 0x0008,
+	// Block 0x9, offset 0x240
+	0x240: 0x0008, 0x241: 0x0008, 0x242: 0x0018, 0x243: 0x0018, 0x244: 0x0018, 0x245: 0x0018,
+	0x246: 0x0008, 0x247: 0x0008, 0x248: 0x0008, 0x249: 0x0008, 0x24a: 0x0008, 0x24b: 0x0008,
+	0x24c: 0x0008, 0x24d: 0x0008, 0x24e: 0x0008, 0x24f: 0x0008, 0x250: 0x0008, 0x251: 0x0008,
+	0x252: 0x0018, 0x253: 0x0018, 0x254: 0x0018, 0x255: 0x0018, 0x256: 0x0018, 0x257: 0x0018,
+	0x258: 0x00d2, 0x259: 0x00da, 0x25a: 0x00e2, 0x25b: 0x00ea, 0x25c: 0x00f2, 0x25d: 0x00fa,
+	0x25e: 0x0018, 0x25f: 0x0018, 0x260: 0x03ad, 0x261: 0x0101, 0x262: 0x0089, 0x263: 0x0109,
+	0x264: 0x03c5, 0x265: 0x0018, 0x266: 0x0018, 0x267: 0x0018, 0x268: 0x0018, 0x269: 0x0018,
+	0x26a: 0x0018, 0x26b: 0x0018, 0x26c: 0x0008, 0x26d: 0x0018, 0x26e: 0x0008, 0x26f: 0x0018,
+	0x270: 0x0018, 0x271: 0x0018, 0x272: 0x0018, 0x273: 0x0018, 0x274: 0x0018, 0x275: 0x0018,
+	0x276: 0x0018, 0x277: 0x0018, 0x278: 0x0018, 0x279: 0x0018, 0x27a: 0x0018, 0x27b: 0x0018,
+	0x27c: 0x0018, 0x27d: 0x0018, 0x27e: 0x0018, 0x27f: 0x0018,
+	// Block 0xa, offset 0x280
+	0x280: 0x03dd, 0x281: 0x03dd, 0x282: 0x3308, 0x283: 0x03f5, 0x284: 0x0111, 0x285: 0x040d,
+	0x286: 0x3308, 0x287: 0x3308, 0x288: 0x3308, 0x289: 0x3308, 0x28a: 0x3308, 0x28b: 0x3308,
+	0x28c: 0x3308, 0x28d: 0x3308, 0x28e: 0x3308, 0x28f: 0x33c0, 0x290: 0x3308, 0x291: 0x3308,
+	0x292: 0x3308, 0x293: 0x3308, 0x294: 0x3308, 0x295: 0x3308, 0x296: 0x3308, 0x297: 0x3308,
+	0x298: 0x3308, 0x299: 0x3308, 0x29a: 0x3308, 0x29b: 0x3308, 0x29c: 0x3308, 0x29d: 0x3308,
+	0x29e: 0x3308, 0x29f: 0x3308, 0x2a0: 0x3308, 0x2a1: 0x3308, 0x2a2: 0x3308, 0x2a3: 0x3308,
+	0x2a4: 0x3308, 0x2a5: 0x3308, 0x2a6: 0x3308, 0x2a7: 0x3308, 0x2a8: 0x3308, 0x2a9: 0x3308,
+	0x2aa: 0x3308, 0x2ab: 0x3308, 0x2ac: 0x3308, 0x2ad: 0x3308, 0x2ae: 0x3308, 0x2af: 0x3308,
+	0x2b0: 0xe00d, 0x2b1: 0x0008, 0x2b2: 0xe00d, 0x2b3: 0x0008, 0x2b4: 0x0425, 0x2b5: 0x0008,
+	0x2b6: 0xe00d, 0x2b7: 0x0008, 0x2b8: 0x0040, 0x2b9: 0x0040, 0x2ba: 0x011a, 0x2bb: 0x0008,
+	0x2bc: 0x0008, 0x2bd: 0x0008, 0x2be: 0x0122, 0x2bf: 0x043d,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0x0040, 0x2c1: 0x0040, 0x2c2: 0x0040, 0x2c3: 0x0040, 0x2c4: 0x003a, 0x2c5: 0x012a,
+	0x2c6: 0xe155, 0x2c7: 0x0455, 0x2c8: 0xe12d, 0x2c9: 0xe13d, 0x2ca: 0xe12d, 0x2cb: 0x0040,
+	0x2cc: 0x03dd, 0x2cd: 0x0040, 0x2ce: 0x046d, 0x2cf: 0x0485, 0x2d0: 0x0008, 0x2d1: 0xe105,
+	0x2d2: 0xe105, 0x2d3: 0xe105, 0x2d4: 0xe105, 0x2d5: 0xe105, 0x2d6: 0xe105, 0x2d7: 0xe105,
+	0x2d8: 0xe105, 0x2d9: 0xe105, 0x2da: 0xe105, 0x2db: 0xe105, 0x2dc: 0xe105, 0x2dd: 0xe105,
+	0x2de: 0xe105, 0x2df: 0xe105, 0x2e0: 0x049d, 0x2e1: 0x049d, 0x2e2: 0x0040, 0x2e3: 0x049d,
+	0x2e4: 0x049d, 0x2e5: 0x049d, 0x2e6: 0x049d, 0x2e7: 0x049d, 0x2e8: 0x049d, 0x2e9: 0x049d,
+	0x2ea: 0x049d, 0x2eb: 0x049d, 0x2ec: 0x0008, 0x2ed: 0x0008, 0x2ee: 0x0008, 0x2ef: 0x0008,
+	0x2f0: 0x0008, 0x2f1: 0x0008, 0x2f2: 0x0008, 0x2f3: 0x0008, 0x2f4: 0x0008, 0x2f5: 0x0008,
+	0x2f6: 0x0008, 0x2f7: 0x0008, 0x2f8: 0x0008, 0x2f9: 0x0008, 0x2fa: 0x0008, 0x2fb: 0x0008,
+	0x2fc: 0x0008, 0x2fd: 0x0008, 0x2fe: 0x0008, 0x2ff: 0x0008,
+	// Block 0xc, offset 0x300
+	0x300: 0x0008, 0x301: 0x0008, 0x302: 0xe00f, 0x303: 0x0008, 0x304: 0x0008, 0x305: 0x0008,
+	0x306: 0x0008, 0x307: 0x0008, 0x308: 0x0008, 0x309: 0x0008, 0x30a: 0x0008, 0x30b: 0x0008,
+	0x30c: 0x0008, 0x30d: 0x0008, 0x30e: 0x0008, 0x30f: 0xe0c5, 0x310: 0x04b5, 0x311: 0x04cd,
+	0x312: 0xe0bd, 0x313: 0xe0f5, 0x314: 0xe0fd, 0x315: 0xe09d, 0x316: 0xe0b5, 0x317: 0x0008,
+	0x318: 0xe00d, 0x319: 0x0008, 0x31a: 0xe00d, 0x31b: 0x0008, 0x31c: 0xe00d, 0x31d: 0x0008,
+	0x31e: 0xe00d, 0x31f: 0x0008, 0x320: 0xe00d, 0x321: 0x0008, 0x322: 0xe00d, 0x323: 0x0008,
+	0x324: 0xe00d, 0x325: 0x0008, 0x326: 0xe00d, 0x327: 0x0008, 0x328: 0xe00d, 0x329: 0x0008,
+	0x32a: 0xe00d, 0x32b: 0x0008, 0x32c: 0xe00d, 0x32d: 0x0008, 0x32e: 0xe00d, 0x32f: 0x0008,
+	0x330: 0x04e5, 0x331: 0xe185, 0x332: 0xe18d, 0x333: 0x0008, 0x334: 0x04fd, 0x335: 0x03dd,
+	0x336: 0x0018, 0x337: 0xe07d, 0x338: 0x0008, 0x339: 0xe1d5, 0x33a: 0xe00d, 0x33b: 0x0008,
+	0x33c: 0x0008, 0x33d: 0x0515, 0x33e: 0x052d, 0x33f: 0x052d,
+	// Block 0xd, offset 0x340
+	0x340: 0x0008, 0x341: 0x0008, 0x342: 0x0008, 0x343: 0x0008, 0x344: 0x0008, 0x345: 0x0008,
+	0x346: 0x0008, 0x347: 0x0008, 0x348: 0x0008, 0x349: 0x0008, 0x34a: 0x0008, 0x34b: 0x0008,
+	0x34c: 0x0008, 0x34d: 0x0008, 0x34e: 0x0008, 0x34f: 0x0008, 0x350: 0x0008, 0x351: 0x0008,
+	0x352: 0x0008, 0x353: 0x0008, 0x354: 0x0008, 0x355: 0x0008, 0x356: 0x0008, 0x357: 0x0008,
+	0x358: 0x0008, 0x359: 0x0008, 0x35a: 0x0008, 0x35b: 0x0008, 0x35c: 0x0008, 0x35d: 0x0008,
+	0x35e: 0x0008, 0x35f: 0x0008, 0x360: 0xe00d, 0x361: 0x0008, 0x362: 0xe00d, 0x363: 0x0008,
+	0x364: 0xe00d, 0x365: 0x0008, 0x366: 0xe00d, 0x367: 0x0008, 0x368: 0xe00d, 0x369: 0x0008,
+	0x36a: 0xe00d, 0x36b: 0x0008, 0x36c: 0xe00d, 0x36d: 0x0008, 0x36e: 0xe00d, 0x36f: 0x0008,
+	0x370: 0xe00d, 0x371: 0x0008, 0x372: 0xe00d, 0x373: 0x0008, 0x374: 0xe00d, 0x375: 0x0008,
+	0x376: 0xe00d, 0x377: 0x0008, 0x378: 0xe00d, 0x379: 0x0008, 0x37a: 0xe00d, 0x37b: 0x0008,
+	0x37c: 0xe00d, 0x37d: 0x0008, 0x37e: 0xe00d, 0x37f: 0x0008,
+	// Block 0xe, offset 0x380
+	0x380: 0xe00d, 0x381: 0x0008, 0x382: 0x0018, 0x383: 0x3308, 0x384: 0x3308, 0x385: 0x3308,
+	0x386: 0x3308, 0x387: 0x3308, 0x388: 0x3318, 0x389: 0x3318, 0x38a: 0xe00d, 0x38b: 0x0008,
+	0x38c: 0xe00d, 0x38d: 0x0008, 0x38e: 0xe00d, 0x38f: 0x0008, 0x390: 0xe00d, 0x391: 0x0008,
+	0x392: 0xe00d, 0x393: 0x0008, 0x394: 0xe00d, 0x395: 0x0008, 0x396: 0xe00d, 0x397: 0x0008,
+	0x398: 0xe00d, 0x399: 0x0008, 0x39a: 0xe00d, 0x39b: 0x0008, 0x39c: 0xe00d, 0x39d: 0x0008,
+	0x39e: 0xe00d, 0x39f: 0x0008, 0x3a0: 0xe00d, 0x3a1: 0x0008, 0x3a2: 0xe00d, 0x3a3: 0x0008,
+	0x3a4: 0xe00d, 0x3a5: 0x0008, 0x3a6: 0xe00d, 0x3a7: 0x0008, 0x3a8: 0xe00d, 0x3a9: 0x0008,
+	0x3aa: 0xe00d, 0x3ab: 0x0008, 0x3ac: 0xe00d, 0x3ad: 0x0008, 0x3ae: 0xe00d, 0x3af: 0x0008,
+	0x3b0: 0xe00d, 0x3b1: 0x0008, 0x3b2: 0xe00d, 0x3b3: 0x0008, 0x3b4: 0xe00d, 0x3b5: 0x0008,
+	0x3b6: 0xe00d, 0x3b7: 0x0008, 0x3b8: 0xe00d, 0x3b9: 0x0008, 0x3ba: 0xe00d, 0x3bb: 0x0008,
+	0x3bc: 0xe00d, 0x3bd: 0x0008, 0x3be: 0xe00d, 0x3bf: 0x0008,
+	// Block 0xf, offset 0x3c0
+	0x3c0: 0x0040, 0x3c1: 0xe01d, 0x3c2: 0x0008, 0x3c3: 0xe03d, 0x3c4: 0x0008, 0x3c5: 0xe01d,
+	0x3c6: 0x0008, 0x3c7: 0xe07d, 0x3c8: 0x0008, 0x3c9: 0xe01d, 0x3ca: 0x0008, 0x3cb: 0xe03d,
+	0x3cc: 0x0008, 0x3cd: 0xe01d, 0x3ce: 0x0008, 0x3cf: 0x0008, 0x3d0: 0xe00d, 0x3d1: 0x0008,
+	0x3d2: 0xe00d, 0x3d3: 0x0008, 0x3d4: 0xe00d, 0x3d5: 0x0008, 0x3d6: 0xe00d, 0x3d7: 0x0008,
+	0x3d8: 0xe00d, 0x3d9: 0x0008, 0x3da: 0xe00d, 0x3db: 0x0008, 0x3dc: 0xe00d, 0x3dd: 0x0008,
+	0x3de: 0xe00d, 0x3df: 0x0008, 0x3e0: 0xe00d, 0x3e1: 0x0008, 0x3e2: 0xe00d, 0x3e3: 0x0008,
+	0x3e4: 0xe00d, 0x3e5: 0x0008, 0x3e6: 0xe00d, 0x3e7: 0x0008, 0x3e8: 0xe00d, 0x3e9: 0x0008,
+	0x3ea: 0xe00d, 0x3eb: 0x0008, 0x3ec: 0xe00d, 0x3ed: 0x0008, 0x3ee: 0xe00d, 0x3ef: 0x0008,
+	0x3f0: 0xe00d, 0x3f1: 0x0008, 0x3f2: 0xe00d, 0x3f3: 0x0008, 0x3f4: 0xe00d, 0x3f5: 0x0008,
+	0x3f6: 0xe00d, 0x3f7: 0x0008, 0x3f8: 0xe00d, 0x3f9: 0x0008, 0x3fa: 0xe00d, 0x3fb: 0x0008,
+	0x3fc: 0xe00d, 0x3fd: 0x0008, 0x3fe: 0xe00d, 0x3ff: 0x0008,
+	// Block 0x10, offset 0x400
+	0x400: 0xe00d, 0x401: 0x0008, 0x402: 0xe00d, 0x403: 0x0008, 0x404: 0xe00d, 0x405: 0x0008,
+	0x406: 0xe00d, 0x407: 0x0008, 0x408: 0xe00d, 0x409: 0x0008, 0x40a: 0xe00d, 0x40b: 0x0008,
+	0x40c: 0xe00d, 0x40d: 0x0008, 0x40e: 0xe00d, 0x40f: 0x0008, 0x410: 0xe00d, 0x411: 0x0008,
+	0x412: 0xe00d, 0x413: 0x0008, 0x414: 0xe00d, 0x415: 0x0008, 0x416: 0xe00d, 0x417: 0x0008,
+	0x418: 0xe00d, 0x419: 0x0008, 0x41a: 0xe00d, 0x41b: 0x0008, 0x41c: 0xe00d, 0x41d: 0x0008,
+	0x41e: 0xe00d, 0x41f: 0x0008, 0x420: 0xe00d, 0x421: 0x0008, 0x422: 0xe00d, 0x423: 0x0008,
+	0x424: 0xe00d, 0x425: 0x0008, 0x426: 0xe00d, 0x427: 0x0008, 0x428: 0xe00d, 0x429: 0x0008,
+	0x42a: 0xe00d, 0x42b: 0x0008, 0x42c: 0xe00d, 0x42d: 0x0008, 0x42e: 0xe00d, 0x42f: 0x0008,
+	0x430: 0x0040, 0x431: 0x03f5, 0x432: 0x03f5, 0x433: 0x03f5, 0x434: 0x03f5, 0x435: 0x03f5,
+	0x436: 0x03f5, 0x437: 0x03f5, 0x438: 0x03f5, 0x439: 0x03f5, 0x43a: 0x03f5, 0x43b: 0x03f5,
+	0x43c: 0x03f5, 0x43d: 0x03f5, 0x43e: 0x03f5, 0x43f: 0x03f5,
+	// Block 0x11, offset 0x440
+	0x440: 0x0840, 0x441: 0x0840, 0x442: 0x0840, 0x443: 0x0840, 0x444: 0x0840, 0x445: 0x0840,
+	0x446: 0x0018, 0x447: 0x0018, 0x448: 0x0818, 0x449: 0x0018, 0x44a: 0x0018, 0x44b: 0x0818,
+	0x44c: 0x0018, 0x44d: 0x0818, 0x44e: 0x0018, 0x44f: 0x0018, 0x450: 0x3308, 0x451: 0x3308,
+	0x452: 0x3308, 0x453: 0x3308, 0x454: 0x3308, 0x455: 0x3308, 0x456: 0x3308, 0x457: 0x3308,
+	0x458: 0x3308, 0x459: 0x3308, 0x45a: 0x3308, 0x45b: 0x0818, 0x45c: 0x0b40, 0x45d: 0x0818,
+	0x45e: 0x0818, 0x45f: 0x0818, 0x460: 0x0a08, 0x461: 0x0808, 0x462: 0x0c08, 0x463: 0x0c08,
+	0x464: 0x0c08, 0x465: 0x0c08, 0x466: 0x0a08, 0x467: 0x0c08, 0x468: 0x0a08, 0x469: 0x0c08,
+	0x46a: 0x0a08, 0x46b: 0x0a08, 0x46c: 0x0a08, 0x46d: 0x0a08, 0x46e: 0x0a08, 0x46f: 0x0c08,
+	0x470: 0x0c08, 0x471: 0x0c08, 0x472: 0x0c08, 0x473: 0x0a08, 0x474: 0x0a08, 0x475: 0x0a08,
+	0x476: 0x0a08, 0x477: 0x0a08, 0x478: 0x0a08, 0x479: 0x0a08, 0x47a: 0x0a08, 0x47b: 0x0a08,
+	0x47c: 0x0a08, 0x47d: 0x0a08, 0x47e: 0x0a08, 0x47f: 0x0a08,
+	// Block 0x12, offset 0x480
+	0x480: 0x0818, 0x481: 0x0a08, 0x482: 0x0a08, 0x483: 0x0a08, 0x484: 0x0a08, 0x485: 0x0a08,
+	0x486: 0x0a08, 0x487: 0x0a08, 0x488: 0x0c08, 0x489: 0x0a08, 0x48a: 0x0a08, 0x48b: 0x3308,
+	0x48c: 0x3308, 0x48d: 0x3308, 0x48e: 0x3308, 0x48f: 0x3308, 0x490: 0x3308, 0x491: 0x3308,
+	0x492: 0x3308, 0x493: 0x3308, 0x494: 0x3308, 0x495: 0x3308, 0x496: 0x3308, 0x497: 0x3308,
+	0x498: 0x3308, 0x499: 0x3308, 0x49a: 0x3308, 0x49b: 0x3308, 0x49c: 0x3308, 0x49d: 0x3308,
+	0x49e: 0x3308, 0x49f: 0x3308, 0x4a0: 0x0808, 0x4a1: 0x0808, 0x4a2: 0x0808, 0x4a3: 0x0808,
+	0x4a4: 0x0808, 0x4a5: 0x0808, 0x4a6: 0x0808, 0x4a7: 0x0808, 0x4a8: 0x0808, 0x4a9: 0x0808,
+	0x4aa: 0x0018, 0x4ab: 0x0818, 0x4ac: 0x0818, 0x4ad: 0x0818, 0x4ae: 0x0a08, 0x4af: 0x0a08,
+	0x4b0: 0x3308, 0x4b1: 0x0c08, 0x4b2: 0x0c08, 0x4b3: 0x0c08, 0x4b4: 0x0808, 0x4b5: 0x0139,
+	0x4b6: 0x0141, 0x4b7: 0x0149, 0x4b8: 0x0151, 0x4b9: 0x0a08, 0x4ba: 0x0a08, 0x4bb: 0x0a08,
+	0x4bc: 0x0a08, 0x4bd: 0x0a08, 0x4be: 0x0a08, 0x4bf: 0x0a08,
+	// Block 0x13, offset 0x4c0
+	0x4c0: 0x0c08, 0x4c1: 0x0a08, 0x4c2: 0x0a08, 0x4c3: 0x0c08, 0x4c4: 0x0c08, 0x4c5: 0x0c08,
+	0x4c6: 0x0c08, 0x4c7: 0x0c08, 0x4c8: 0x0c08, 0x4c9: 0x0c08, 0x4ca: 0x0c08, 0x4cb: 0x0c08,
+	0x4cc: 0x0a08, 0x4cd: 0x0c08, 0x4ce: 0x0a08, 0x4cf: 0x0c08, 0x4d0: 0x0a08, 0x4d1: 0x0a08,
+	0x4d2: 0x0c08, 0x4d3: 0x0c08, 0x4d4: 0x0818, 0x4d5: 0x0c08, 0x4d6: 0x3308, 0x4d7: 0x3308,
+	0x4d8: 0x3308, 0x4d9: 0x3308, 0x4da: 0x3308, 0x4db: 0x3308, 0x4dc: 0x3308, 0x4dd: 0x0840,
+	0x4de: 0x0018, 0x4df: 0x3308, 0x4e0: 0x3308, 0x4e1: 0x3308, 0x4e2: 0x3308, 0x4e3: 0x3308,
+	0x4e4: 0x3308, 0x4e5: 0x0808, 0x4e6: 0x0808, 0x4e7: 0x3308, 0x4e8: 0x3308, 0x4e9: 0x0018,
+	0x4ea: 0x3308, 0x4eb: 0x3308, 0x4ec: 0x3308, 0x4ed: 0x3308, 0x4ee: 0x0c08, 0x4ef: 0x0c08,
+	0x4f0: 0x0008, 0x4f1: 0x0008, 0x4f2: 0x0008, 0x4f3: 0x0008, 0x4f4: 0x0008, 0x4f5: 0x0008,
+	0x4f6: 0x0008, 0x4f7: 0x0008, 0x4f8: 0x0008, 0x4f9: 0x0008, 0x4fa: 0x0a08, 0x4fb: 0x0a08,
+	0x4fc: 0x0a08, 0x4fd: 0x0808, 0x4fe: 0x0808, 0x4ff: 0x0a08,
+	// Block 0x14, offset 0x500
+	0x500: 0x0818, 0x501: 0x0818, 0x502: 0x0818, 0x503: 0x0818, 0x504: 0x0818, 0x505: 0x0818,
+	0x506: 0x0818, 0x507: 0x0818, 0x508: 0x0818, 0x509: 0x0818, 0x50a: 0x0818, 0x50b: 0x0818,
+	0x50c: 0x0818, 0x50d: 0x0818, 0x50e: 0x0040, 0x50f: 0x0b40, 0x510: 0x0c08, 0x511: 0x3308,
+	0x512: 0x0a08, 0x513: 0x0a08, 0x514: 0x0a08, 0x515: 0x0c08, 0x516: 0x0c08, 0x517: 0x0c08,
+	0x518: 0x0c08, 0x519: 0x0c08, 0x51a: 0x0a08, 0x51b: 0x0a08, 0x51c: 0x0a08, 0x51d: 0x0a08,
+	0x51e: 0x0c08, 0x51f: 0x0a08, 0x520: 0x0a08, 0x521: 0x0a08, 0x522: 0x0a08, 0x523: 0x0a08,
+	0x524: 0x0a08, 0x525: 0x0a08, 0x526: 0x0a08, 0x527: 0x0a08, 0x528: 0x0c08, 0x529: 0x0a08,
+	0x52a: 0x0c08, 0x52b: 0x0a08, 0x52c: 0x0c08, 0x52d: 0x0a08, 0x52e: 0x0a08, 0x52f: 0x0c08,
+	0x530: 0x3308, 0x531: 0x3308, 0x532: 0x3308, 0x533: 0x3308, 0x534: 0x3308, 0x535: 0x3308,
+	0x536: 0x3308, 0x537: 0x3308, 0x538: 0x3308, 0x539: 0x3308, 0x53a: 0x3308, 0x53b: 0x3308,
+	0x53c: 0x3308, 0x53d: 0x3308, 0x53e: 0x3308, 0x53f: 0x3308,
+	// Block 0x15, offset 0x540
+	0x540: 0x0c08, 0x541: 0x0a08, 0x542: 0x0a08, 0x543: 0x0a08, 0x544: 0x0a08, 0x545: 0x0a08,
+	0x546: 0x0c08, 0x547: 0x0c08, 0x548: 0x0a08, 0x549: 0x0c08, 0x54a: 0x0a08, 0x54b: 0x0a08,
+	0x54c: 0x0a08, 0x54d: 0x0a08, 0x54e: 0x0a08, 0x54f: 0x0a08, 0x550: 0x0a08, 0x551: 0x0a08,
+	0x552: 0x0a08, 0x553: 0x0a08, 0x554: 0x0c08, 0x555: 0x0a08, 0x556: 0x0c08, 0x557: 0x0c08,
+	0x558: 0x0c08, 0x559: 0x3308, 0x55a: 0x3308, 0x55b: 0x3308, 0x55c: 0x0040, 0x55d: 0x0040,
+	0x55e: 0x0818, 0x55f: 0x0040, 0x560: 0x0a08, 0x561: 0x0808, 0x562: 0x0a08, 0x563: 0x0a08,
+	0x564: 0x0a08, 0x565: 0x0a08, 0x566: 0x0808, 0x567: 0x0c08, 0x568: 0x0a08, 0x569: 0x0c08,
+	0x56a: 0x0c08, 0x56b: 0x0040, 0x56c: 0x0040, 0x56d: 0x0040, 0x56e: 0x0040, 0x56f: 0x0040,
+	0x570: 0x0c08, 0x571: 0x0c08, 0x572: 0x0c08, 0x573: 0x0c08, 0x574: 0x0c08, 0x575: 0x0c08,
+	0x576: 0x0c08, 0x577: 0x0c08, 0x578: 0x0c08, 0x579: 0x0c08, 0x57a: 0x0c08, 0x57b: 0x0c08,
+	0x57c: 0x0c08, 0x57d: 0x0c08, 0x57e: 0x0c08, 0x57f: 0x0c08,
+	// Block 0x16, offset 0x580
+	0x580: 0x0c08, 0x581: 0x0c08, 0x582: 0x0c08, 0x583: 0x0808, 0x584: 0x0808, 0x585: 0x0808,
+	0x586: 0x0a08, 0x587: 0x0808, 0x588: 0x0818, 0x589: 0x0a08, 0x58a: 0x0a08, 0x58b: 0x0a08,
+	0x58c: 0x0a08, 0x58d: 0x0a08, 0x58e: 0x0c08, 0x58f: 0x0040, 0x590: 0x0840, 0x591: 0x0840,
+	0x592: 0x0040, 0x593: 0x0040, 0x594: 0x0040, 0x595: 0x0040, 0x596: 0x0040, 0x597: 0x0040,
+	0x598: 0x3308, 0x599: 0x3308, 0x59a: 0x3308, 0x59b: 0x3308, 0x59c: 0x3308, 0x59d: 0x3308,
+	0x59e: 0x3308, 0x59f: 0x3308, 0x5a0: 0x0a08, 0x5a1: 0x0a08, 0x5a2: 0x0a08, 0x5a3: 0x0a08,
+	0x5a4: 0x0a08, 0x5a5: 0x0a08, 0x5a6: 0x0a08, 0x5a7: 0x0a08, 0x5a8: 0x0a08, 0x5a9: 0x0a08,
+	0x5aa: 0x0c08, 0x5ab: 0x0c08, 0x5ac: 0x0c08, 0x5ad: 0x0808, 0x5ae: 0x0c08, 0x5af: 0x0a08,
+	0x5b0: 0x0a08, 0x5b1: 0x0c08, 0x5b2: 0x0c08, 0x5b3: 0x0a08, 0x5b4: 0x0a08, 0x5b5: 0x0a08,
+	0x5b6: 0x0a08, 0x5b7: 0x0a08, 0x5b8: 0x0a08, 0x5b9: 0x0c08, 0x5ba: 0x0a08, 0x5bb: 0x0a08,
+	0x5bc: 0x0a08, 0x5bd: 0x0a08, 0x5be: 0x0a08, 0x5bf: 0x0a08,
+	// Block 0x17, offset 0x5c0
+	0x5c0: 0x3008, 0x5c1: 0x3308, 0x5c2: 0x3308, 0x5c3: 0x3308, 0x5c4: 0x3308, 0x5c5: 0x3308,
+	0x5c6: 0x3308, 0x5c7: 0x3308, 0x5c8: 0x3308, 0x5c9: 0x3008, 0x5ca: 0x3008, 0x5cb: 0x3008,
+	0x5cc: 0x3008, 0x5cd: 0x3b08, 0x5ce: 0x3008, 0x5cf: 0x3008, 0x5d0: 0x0008, 0x5d1: 0x3308,
+	0x5d2: 0x3308, 0x5d3: 0x3308, 0x5d4: 0x3308, 0x5d5: 0x3308, 0x5d6: 0x3308, 0x5d7: 0x3308,
+	0x5d8: 0x0159, 0x5d9: 0x0161, 0x5da: 0x0169, 0x5db: 0x0171, 0x5dc: 0x0179, 0x5dd: 0x0181,
+	0x5de: 0x0189, 0x5df: 0x0191, 0x5e0: 0x0008, 0x5e1: 0x0008, 0x5e2: 0x3308, 0x5e3: 0x3308,
+	0x5e4: 0x0018, 0x5e5: 0x0018, 0x5e6: 0x0008, 0x5e7: 0x0008, 0x5e8: 0x0008, 0x5e9: 0x0008,
+	0x5ea: 0x0008, 0x5eb: 0x0008, 0x5ec: 0x0008, 0x5ed: 0x0008, 0x5ee: 0x0008, 0x5ef: 0x0008,
+	0x5f0: 0x0018, 0x5f1: 0x0008, 0x5f2: 0x0008, 0x5f3: 0x0008, 0x5f4: 0x0008, 0x5f5: 0x0008,
+	0x5f6: 0x0008, 0x5f7: 0x0008, 0x5f8: 0x0008, 0x5f9: 0x0008, 0x5fa: 0x0008, 0x5fb: 0x0008,
+	0x5fc: 0x0008, 0x5fd: 0x0008, 0x5fe: 0x0008, 0x5ff: 0x0008,
+	// Block 0x18, offset 0x600
+	0x600: 0x0008, 0x601: 0x3308, 0x602: 0x3008, 0x603: 0x3008, 0x604: 0x0040, 0x605: 0x0008,
+	0x606: 0x0008, 0x607: 0x0008, 0x608: 0x0008, 0x609: 0x0008, 0x60a: 0x0008, 0x60b: 0x0008,
+	0x60c: 0x0008, 0x60d: 0x0040, 0x60e: 0x0040, 0x60f: 0x0008, 0x610: 0x0008, 0x611: 0x0040,
+	0x612: 0x0040, 0x613: 0x0008, 0x614: 0x0008, 0x615: 0x0008, 0x616: 0x0008, 0x617: 0x0008,
+	0x618: 0x0008, 0x619: 0x0008, 0x61a: 0x0008, 0x61b: 0x0008, 0x61c: 0x0008, 0x61d: 0x0008,
+	0x61e: 0x0008, 0x61f: 0x0008, 0x620: 0x0008, 0x621: 0x0008, 0x622: 0x0008, 0x623: 0x0008,
+	0x624: 0x0008, 0x625: 0x0008, 0x626: 0x0008, 0x627: 0x0008, 0x628: 0x0008, 0x629: 0x0040,
+	0x62a: 0x0008, 0x62b: 0x0008, 0x62c: 0x0008, 0x62d: 0x0008, 0x62e: 0x0008, 0x62f: 0x0008,
+	0x630: 0x0008, 0x631: 0x0040, 0x632: 0x0008, 0x633: 0x0040, 0x634: 0x0040, 0x635: 0x0040,
+	0x636: 0x0008, 0x637: 0x0008, 0x638: 0x0008, 0x639: 0x0008, 0x63a: 0x0040, 0x63b: 0x0040,
+	0x63c: 0x3308, 0x63d: 0x0008, 0x63e: 0x3008, 0x63f: 0x3008,
+	// Block 0x19, offset 0x640
+	0x640: 0x3008, 0x641: 0x3308, 0x642: 0x3308, 0x643: 0x3308, 0x644: 0x3308, 0x645: 0x0040,
+	0x646: 0x0040, 0x647: 0x3008, 0x648: 0x3008, 0x649: 0x0040, 0x64a: 0x0040, 0x64b: 0x3008,
+	0x64c: 0x3008, 0x64d: 0x3b08, 0x64e: 0x0008, 0x64f: 0x0040, 0x650: 0x0040, 0x651: 0x0040,
+	0x652: 0x0040, 0x653: 0x0040, 0x654: 0x0040, 0x655: 0x0040, 0x656: 0x0040, 0x657: 0x3008,
+	0x658: 0x0040, 0x659: 0x0040, 0x65a: 0x0040, 0x65b: 0x0040, 0x65c: 0x0199, 0x65d: 0x01a1,
+	0x65e: 0x0040, 0x65f: 0x01a9, 0x660: 0x0008, 0x661: 0x0008, 0x662: 0x3308, 0x663: 0x3308,
+	0x664: 0x0040, 0x665: 0x0040, 0x666: 0x0008, 0x667: 0x0008, 0x668: 0x0008, 0x669: 0x0008,
+	0x66a: 0x0008, 0x66b: 0x0008, 0x66c: 0x0008, 0x66d: 0x0008, 0x66e: 0x0008, 0x66f: 0x0008,
+	0x670: 0x0008, 0x671: 0x0008, 0x672: 0x0018, 0x673: 0x0018, 0x674: 0x0018, 0x675: 0x0018,
+	0x676: 0x0018, 0x677: 0x0018, 0x678: 0x0018, 0x679: 0x0018, 0x67a: 0x0018, 0x67b: 0x0018,
+	0x67c: 0x0008, 0x67d: 0x0018, 0x67e: 0x3308, 0x67f: 0x0040,
+	// Block 0x1a, offset 0x680
+	0x680: 0x0040, 0x681: 0x3308, 0x682: 0x3308, 0x683: 0x3008, 0x684: 0x0040, 0x685: 0x0008,
+	0x686: 0x0008, 0x687: 0x0008, 0x688: 0x0008, 0x689: 0x0008, 0x68a: 0x0008, 0x68b: 0x0040,
+	0x68c: 0x0040, 0x68d: 0x0040, 0x68e: 0x0040, 0x68f: 0x0008, 0x690: 0x0008, 0x691: 0x0040,
+	0x692: 0x0040, 0x693: 0x0008, 0x694: 0x0008, 0x695: 0x0008, 0x696: 0x0008, 0x697: 0x0008,
+	0x698: 0x0008, 0x699: 0x0008, 0x69a: 0x0008, 0x69b: 0x0008, 0x69c: 0x0008, 0x69d: 0x0008,
+	0x69e: 0x0008, 0x69f: 0x0008, 0x6a0: 0x0008, 0x6a1: 0x0008, 0x6a2: 0x0008, 0x6a3: 0x0008,
+	0x6a4: 0x0008, 0x6a5: 0x0008, 0x6a6: 0x0008, 0x6a7: 0x0008, 0x6a8: 0x0008, 0x6a9: 0x0040,
+	0x6aa: 0x0008, 0x6ab: 0x0008, 0x6ac: 0x0008, 0x6ad: 0x0008, 0x6ae: 0x0008, 0x6af: 0x0008,
+	0x6b0: 0x0008, 0x6b1: 0x0040, 0x6b2: 0x0008, 0x6b3: 0x01b1, 0x6b4: 0x0040, 0x6b5: 0x0008,
+	0x6b6: 0x01b9, 0x6b7: 0x0040, 0x6b8: 0x0008, 0x6b9: 0x0008, 0x6ba: 0x0040, 0x6bb: 0x0040,
+	0x6bc: 0x3308, 0x6bd: 0x0040, 0x6be: 0x3008, 0x6bf: 0x3008,
+	// Block 0x1b, offset 0x6c0
+	0x6c0: 0x3008, 0x6c1: 0x3308, 0x6c2: 0x3308, 0x6c3: 0x0040, 0x6c4: 0x0040, 0x6c5: 0x0040,
+	0x6c6: 0x0040, 0x6c7: 0x3308, 0x6c8: 0x3308, 0x6c9: 0x0040, 0x6ca: 0x0040, 0x6cb: 0x3308,
+	0x6cc: 0x3308, 0x6cd: 0x3b08, 0x6ce: 0x0040, 0x6cf: 0x0040, 0x6d0: 0x0040, 0x6d1: 0x3308,
+	0x6d2: 0x0040, 0x6d3: 0x0040, 0x6d4: 0x0040, 0x6d5: 0x0040, 0x6d6: 0x0040, 0x6d7: 0x0040,
+	0x6d8: 0x0040, 0x6d9: 0x01c1, 0x6da: 0x01c9, 0x6db: 0x01d1, 0x6dc: 0x0008, 0x6dd: 0x0040,
+	0x6de: 0x01d9, 0x6df: 0x0040, 0x6e0: 0x0040, 0x6e1: 0x0040, 0x6e2: 0x0040, 0x6e3: 0x0040,
+	0x6e4: 0x0040, 0x6e5: 0x0040, 0x6e6: 0x0008, 0x6e7: 0x0008, 0x6e8: 0x0008, 0x6e9: 0x0008,
+	0x6ea: 0x0008, 0x6eb: 0x0008, 0x6ec: 0x0008, 0x6ed: 0x0008, 0x6ee: 0x0008, 0x6ef: 0x0008,
+	0x6f0: 0x3308, 0x6f1: 0x3308, 0x6f2: 0x0008, 0x6f3: 0x0008, 0x6f4: 0x0008, 0x6f5: 0x3308,
+	0x6f6: 0x0018, 0x6f7: 0x0040, 0x6f8: 0x0040, 0x6f9: 0x0040, 0x6fa: 0x0040, 0x6fb: 0x0040,
+	0x6fc: 0x0040, 0x6fd: 0x0040, 0x6fe: 0x0040, 0x6ff: 0x0040,
+	// Block 0x1c, offset 0x700
+	0x700: 0x0040, 0x701: 0x3308, 0x702: 0x3308, 0x703: 0x3008, 0x704: 0x0040, 0x705: 0x0008,
+	0x706: 0x0008, 0x707: 0x0008, 0x708: 0x0008, 0x709: 0x0008, 0x70a: 0x0008, 0x70b: 0x0008,
+	0x70c: 0x0008, 0x70d: 0x0008, 0x70e: 0x0040, 0x70f: 0x0008, 0x710: 0x0008, 0x711: 0x0008,
+	0x712: 0x0040, 0x713: 0x0008, 0x714: 0x0008, 0x715: 0x0008, 0x716: 0x0008, 0x717: 0x0008,
+	0x718: 0x0008, 0x719: 0x0008, 0x71a: 0x0008, 0x71b: 0x0008, 0x71c: 0x0008, 0x71d: 0x0008,
+	0x71e: 0x0008, 0x71f: 0x0008, 0x720: 0x0008, 0x721: 0x0008, 0x722: 0x0008, 0x723: 0x0008,
+	0x724: 0x0008, 0x725: 0x0008, 0x726: 0x0008, 0x727: 0x0008, 0x728: 0x0008, 0x729: 0x0040,
+	0x72a: 0x0008, 0x72b: 0x0008, 0x72c: 0x0008, 0x72d: 0x0008, 0x72e: 0x0008, 0x72f: 0x0008,
+	0x730: 0x0008, 0x731: 0x0040, 0x732: 0x0008, 0x733: 0x0008, 0x734: 0x0040, 0x735: 0x0008,
+	0x736: 0x0008, 0x737: 0x0008, 0x738: 0x0008, 0x739: 0x0008, 0x73a: 0x0040, 0x73b: 0x0040,
+	0x73c: 0x3308, 0x73d: 0x0008, 0x73e: 0x3008, 0x73f: 0x3008,
+	// Block 0x1d, offset 0x740
+	0x740: 0x3008, 0x741: 0x3308, 0x742: 0x3308, 0x743: 0x3308, 0x744: 0x3308, 0x745: 0x3308,
+	0x746: 0x0040, 0x747: 0x3308, 0x748: 0x3308, 0x749: 0x3008, 0x74a: 0x0040, 0x74b: 0x3008,
+	0x74c: 0x3008, 0x74d: 0x3b08, 0x74e: 0x0040, 0x74f: 0x0040, 0x750: 0x0008, 0x751: 0x0040,
+	0x752: 0x0040, 0x753: 0x0040, 0x754: 0x0040, 0x755: 0x0040, 0x756: 0x0040, 0x757: 0x0040,
+	0x758: 0x0040, 0x759: 0x0040, 0x75a: 0x0040, 0x75b: 0x0040, 0x75c: 0x0040, 0x75d: 0x0040,
+	0x75e: 0x0040, 0x75f: 0x0040, 0x760: 0x0008, 0x761: 0x0008, 0x762: 0x3308, 0x763: 0x3308,
+	0x764: 0x0040, 0x765: 0x0040, 0x766: 0x0008, 0x767: 0x0008, 0x768: 0x0008, 0x769: 0x0008,
+	0x76a: 0x0008, 0x76b: 0x0008, 0x76c: 0x0008, 0x76d: 0x0008, 0x76e: 0x0008, 0x76f: 0x0008,
+	0x770: 0x0018, 0x771: 0x0018, 0x772: 0x0040, 0x773: 0x0040, 0x774: 0x0040, 0x775: 0x0040,
+	0x776: 0x0040, 0x777: 0x0040, 0x778: 0x0040, 0x779: 0x0008, 0x77a: 0x3308, 0x77b: 0x3308,
+	0x77c: 0x3308, 0x77d: 0x3308, 0x77e: 0x3308, 0x77f: 0x3308,
+	// Block 0x1e, offset 0x780
+	0x780: 0x0040, 0x781: 0x3308, 0x782: 0x3008, 0x783: 0x3008, 0x784: 0x0040, 0x785: 0x0008,
+	0x786: 0x0008, 0x787: 0x0008, 0x788: 0x0008, 0x789: 0x0008, 0x78a: 0x0008, 0x78b: 0x0008,
+	0x78c: 0x0008, 0x78d: 0x0040, 0x78e: 0x0040, 0x78f: 0x0008, 0x790: 0x0008, 0x791: 0x0040,
+	0x792: 0x0040, 0x793: 0x0008, 0x794: 0x0008, 0x795: 0x0008, 0x796: 0x0008, 0x797: 0x0008,
+	0x798: 0x0008, 0x799: 0x0008, 0x79a: 0x0008, 0x79b: 0x0008, 0x79c: 0x0008, 0x79d: 0x0008,
+	0x79e: 0x0008, 0x79f: 0x0008, 0x7a0: 0x0008, 0x7a1: 0x0008, 0x7a2: 0x0008, 0x7a3: 0x0008,
+	0x7a4: 0x0008, 0x7a5: 0x0008, 0x7a6: 0x0008, 0x7a7: 0x0008, 0x7a8: 0x0008, 0x7a9: 0x0040,
+	0x7aa: 0x0008, 0x7ab: 0x0008, 0x7ac: 0x0008, 0x7ad: 0x0008, 0x7ae: 0x0008, 0x7af: 0x0008,
+	0x7b0: 0x0008, 0x7b1: 0x0040, 0x7b2: 0x0008, 0x7b3: 0x0008, 0x7b4: 0x0040, 0x7b5: 0x0008,
+	0x7b6: 0x0008, 0x7b7: 0x0008, 0x7b8: 0x0008, 0x7b9: 0x0008, 0x7ba: 0x0040, 0x7bb: 0x0040,
+	0x7bc: 0x3308, 0x7bd: 0x0008, 0x7be: 0x3008, 0x7bf: 0x3308,
+	// Block 0x1f, offset 0x7c0
+	0x7c0: 0x3008, 0x7c1: 0x3308, 0x7c2: 0x3308, 0x7c3: 0x3308, 0x7c4: 0x3308, 0x7c5: 0x0040,
+	0x7c6: 0x0040, 0x7c7: 0x3008, 0x7c8: 0x3008, 0x7c9: 0x0040, 0x7ca: 0x0040, 0x7cb: 0x3008,
+	0x7cc: 0x3008, 0x7cd: 0x3b08, 0x7ce: 0x0040, 0x7cf: 0x0040, 0x7d0: 0x0040, 0x7d1: 0x0040,
+	0x7d2: 0x0040, 0x7d3: 0x0040, 0x7d4: 0x0040, 0x7d5: 0x3308, 0x7d6: 0x3308, 0x7d7: 0x3008,
+	0x7d8: 0x0040, 0x7d9: 0x0040, 0x7da: 0x0040, 0x7db: 0x0040, 0x7dc: 0x01e1, 0x7dd: 0x01e9,
+	0x7de: 0x0040, 0x7df: 0x0008, 0x7e0: 0x0008, 0x7e1: 0x0008, 0x7e2: 0x3308, 0x7e3: 0x3308,
+	0x7e4: 0x0040, 0x7e5: 0x0040, 0x7e6: 0x0008, 0x7e7: 0x0008, 0x7e8: 0x0008, 0x7e9: 0x0008,
+	0x7ea: 0x0008, 0x7eb: 0x0008, 0x7ec: 0x0008, 0x7ed: 0x0008, 0x7ee: 0x0008, 0x7ef: 0x0008,
+	0x7f0: 0x0018, 0x7f1: 0x0008, 0x7f2: 0x0018, 0x7f3: 0x0018, 0x7f4: 0x0018, 0x7f5: 0x0018,
+	0x7f6: 0x0018, 0x7f7: 0x0018, 0x7f8: 0x0040, 0x7f9: 0x0040, 0x7fa: 0x0040, 0x7fb: 0x0040,
+	0x7fc: 0x0040, 0x7fd: 0x0040, 0x7fe: 0x0040, 0x7ff: 0x0040,
+	// Block 0x20, offset 0x800
+	0x800: 0x0040, 0x801: 0x0040, 0x802: 0x3308, 0x803: 0x0008, 0x804: 0x0040, 0x805: 0x0008,
+	0x806: 0x0008, 0x807: 0x0008, 0x808: 0x0008, 0x809: 0x0008, 0x80a: 0x0008, 0x80b: 0x0040,
+	0x80c: 0x0040, 0x80d: 0x0040, 0x80e: 0x0008, 0x80f: 0x0008, 0x810: 0x0008, 0x811: 0x0040,
+	0x812: 0x0008, 0x813: 0x0008, 0x814: 0x0008, 0x815: 0x0008, 0x816: 0x0040, 0x817: 0x0040,
+	0x818: 0x0040, 0x819: 0x0008, 0x81a: 0x0008, 0x81b: 0x0040, 0x81c: 0x0008, 0x81d: 0x0040,
+	0x81e: 0x0008, 0x81f: 0x0008, 0x820: 0x0040, 0x821: 0x0040, 0x822: 0x0040, 0x823: 0x0008,
+	0x824: 0x0008, 0x825: 0x0040, 0x826: 0x0040, 0x827: 0x0040, 0x828: 0x0008, 0x829: 0x0008,
+	0x82a: 0x0008, 0x82b: 0x0040, 0x82c: 0x0040, 0x82d: 0x0040, 0x82e: 0x0008, 0x82f: 0x0008,
+	0x830: 0x0008, 0x831: 0x0008, 0x832: 0x0008, 0x833: 0x0008, 0x834: 0x0008, 0x835: 0x0008,
+	0x836: 0x0008, 0x837: 0x0008, 0x838: 0x0008, 0x839: 0x0008, 0x83a: 0x0040, 0x83b: 0x0040,
+	0x83c: 0x0040, 0x83d: 0x0040, 0x83e: 0x3008, 0x83f: 0x3008,
+	// Block 0x21, offset 0x840
+	0x840: 0x3308, 0x841: 0x3008, 0x842: 0x3008, 0x843: 0x3008, 0x844: 0x3008, 0x845: 0x0040,
+	0x846: 0x3308, 0x847: 0x3308, 0x848: 0x3308, 0x849: 0x0040, 0x84a: 0x3308, 0x84b: 0x3308,
+	0x84c: 0x3308, 0x84d: 0x3b08, 0x84e: 0x0040, 0x84f: 0x0040, 0x850: 0x0040, 0x851: 0x0040,
+	0x852: 0x0040, 0x853: 0x0040, 0x854: 0x0040, 0x855: 0x3308, 0x856: 0x3308, 0x857: 0x0040,
+	0x858: 0x0008, 0x859: 0x0008, 0x85a: 0x0008, 0x85b: 0x0040, 0x85c: 0x0040, 0x85d: 0x0008,
+	0x85e: 0x0040, 0x85f: 0x0040, 0x860: 0x0008, 0x861: 0x0008, 0x862: 0x3308, 0x863: 0x3308,
+	0x864: 0x0040, 0x865: 0x0040, 0x866: 0x0008, 0x867: 0x0008, 0x868: 0x0008, 0x869: 0x0008,
+	0x86a: 0x0008, 0x86b: 0x0008, 0x86c: 0x0008, 0x86d: 0x0008, 0x86e: 0x0008, 0x86f: 0x0008,
+	0x870: 0x0040, 0x871: 0x0040, 0x872: 0x0040, 0x873: 0x0040, 0x874: 0x0040, 0x875: 0x0040,
+	0x876: 0x0040, 0x877: 0x0018, 0x878: 0x0018, 0x879: 0x0018, 0x87a: 0x0018, 0x87b: 0x0018,
+	0x87c: 0x0018, 0x87d: 0x0018, 0x87e: 0x0018, 0x87f: 0x0018,
+	// Block 0x22, offset 0x880
+	0x880: 0x0008, 0x881: 0x3308, 0x882: 0x3008, 0x883: 0x3008, 0x884: 0x0018, 0x885: 0x0008,
+	0x886: 0x0008, 0x887: 0x0008, 0x888: 0x0008, 0x889: 0x0008, 0x88a: 0x0008, 0x88b: 0x0008,
+	0x88c: 0x0008, 0x88d: 0x0040, 0x88e: 0x0008, 0x88f: 0x0008, 0x890: 0x0008, 0x891: 0x0040,
+	0x892: 0x0008, 0x893: 0x0008, 0x894: 0x0008, 0x895: 0x0008, 0x896: 0x0008, 0x897: 0x0008,
+	0x898: 0x0008, 0x899: 0x0008, 0x89a: 0x0008, 0x89b: 0x0008, 0x89c: 0x0008, 0x89d: 0x0008,
+	0x89e: 0x0008, 0x89f: 0x0008, 0x8a0: 0x0008, 0x8a1: 0x0008, 0x8a2: 0x0008, 0x8a3: 0x0008,
+	0x8a4: 0x0008, 0x8a5: 0x0008, 0x8a6: 0x0008, 0x8a7: 0x0008, 0x8a8: 0x0008, 0x8a9: 0x0040,
+	0x8aa: 0x0008, 0x8ab: 0x0008, 0x8ac: 0x0008, 0x8ad: 0x0008, 0x8ae: 0x0008, 0x8af: 0x0008,
+	0x8b0: 0x0008, 0x8b1: 0x0008, 0x8b2: 0x0008, 0x8b3: 0x0008, 0x8b4: 0x0040, 0x8b5: 0x0008,
+	0x8b6: 0x0008, 0x8b7: 0x0008, 0x8b8: 0x0008, 0x8b9: 0x0008, 0x8ba: 0x0040, 0x8bb: 0x0040,
+	0x8bc: 0x3308, 0x8bd: 0x0008, 0x8be: 0x3008, 0x8bf: 0x3308,
+	// Block 0x23, offset 0x8c0
+	0x8c0: 0x3008, 0x8c1: 0x3008, 0x8c2: 0x3008, 0x8c3: 0x3008, 0x8c4: 0x3008, 0x8c5: 0x0040,
+	0x8c6: 0x3308, 0x8c7: 0x3008, 0x8c8: 0x3008, 0x8c9: 0x0040, 0x8ca: 0x3008, 0x8cb: 0x3008,
+	0x8cc: 0x3308, 0x8cd: 0x3b08, 0x8ce: 0x0040, 0x8cf: 0x0040, 0x8d0: 0x0040, 0x8d1: 0x0040,
+	0x8d2: 0x0040, 0x8d3: 0x0040, 0x8d4: 0x0040, 0x8d5: 0x3008, 0x8d6: 0x3008, 0x8d7: 0x0040,
+	0x8d8: 0x0040, 0x8d9: 0x0040, 0x8da: 0x0040, 0x8db: 0x0040, 0x8dc: 0x0040, 0x8dd: 0x0008,
+	0x8de: 0x0008, 0x8df: 0x0040, 0x8e0: 0x0008, 0x8e1: 0x0008, 0x8e2: 0x3308, 0x8e3: 0x3308,
+	0x8e4: 0x0040, 0x8e5: 0x0040, 0x8e6: 0x0008, 0x8e7: 0x0008, 0x8e8: 0x0008, 0x8e9: 0x0008,
+	0x8ea: 0x0008, 0x8eb: 0x0008, 0x8ec: 0x0008, 0x8ed: 0x0008, 0x8ee: 0x0008, 0x8ef: 0x0008,
+	0x8f0: 0x0040, 0x8f1: 0x0008, 0x8f2: 0x0008, 0x8f3: 0x3008, 0x8f4: 0x0040, 0x8f5: 0x0040,
+	0x8f6: 0x0040, 0x8f7: 0x0040, 0x8f8: 0x0040, 0x8f9: 0x0040, 0x8fa: 0x0040, 0x8fb: 0x0040,
+	0x8fc: 0x0040, 0x8fd: 0x0040, 0x8fe: 0x0040, 0x8ff: 0x0040,
+	// Block 0x24, offset 0x900
+	0x900: 0x3008, 0x901: 0x3308, 0x902: 0x3308, 0x903: 0x3308, 0x904: 0x3308, 0x905: 0x0040,
+	0x906: 0x3008, 0x907: 0x3008, 0x908: 0x3008, 0x909: 0x0040, 0x90a: 0x3008, 0x90b: 0x3008,
+	0x90c: 0x3008, 0x90d: 0x3b08, 0x90e: 0x0008, 0x90f: 0x0018, 0x910: 0x0040, 0x911: 0x0040,
+	0x912: 0x0040, 0x913: 0x0040, 0x914: 0x0008, 0x915: 0x0008, 0x916: 0x0008, 0x917: 0x3008,
+	0x918: 0x0018, 0x919: 0x0018, 0x91a: 0x0018, 0x91b: 0x0018, 0x91c: 0x0018, 0x91d: 0x0018,
+	0x91e: 0x0018, 0x91f: 0x0008, 0x920: 0x0008, 0x921: 0x0008, 0x922: 0x3308, 0x923: 0x3308,
+	0x924: 0x0040, 0x925: 0x0040, 0x926: 0x0008, 0x927: 0x0008, 0x928: 0x0008, 0x929: 0x0008,
+	0x92a: 0x0008, 0x92b: 0x0008, 0x92c: 0x0008, 0x92d: 0x0008, 0x92e: 0x0008, 0x92f: 0x0008,
+	0x930: 0x0018, 0x931: 0x0018, 0x932: 0x0018, 0x933: 0x0018, 0x934: 0x0018, 0x935: 0x0018,
+	0x936: 0x0018, 0x937: 0x0018, 0x938: 0x0018, 0x939: 0x0018, 0x93a: 0x0008, 0x93b: 0x0008,
+	0x93c: 0x0008, 0x93d: 0x0008, 0x93e: 0x0008, 0x93f: 0x0008,
+	// Block 0x25, offset 0x940
+	0x940: 0x0040, 0x941: 0x0008, 0x942: 0x0008, 0x943: 0x0040, 0x944: 0x0008, 0x945: 0x0040,
+	0x946: 0x0008, 0x947: 0x0008, 0x948: 0x0008, 0x949: 0x0008, 0x94a: 0x0008, 0x94b: 0x0040,
+	0x94c: 0x0008, 0x94d: 0x0008, 0x94e: 0x0008, 0x94f: 0x0008, 0x950: 0x0008, 0x951: 0x0008,
+	0x952: 0x0008, 0x953: 0x0008, 0x954: 0x0008, 0x955: 0x0008, 0x956: 0x0008, 0x957: 0x0008,
+	0x958: 0x0008, 0x959: 0x0008, 0x95a: 0x0008, 0x95b: 0x0008, 0x95c: 0x0008, 0x95d: 0x0008,
+	0x95e: 0x0008, 0x95f: 0x0008, 0x960: 0x0008, 0x961: 0x0008, 0x962: 0x0008, 0x963: 0x0008,
+	0x964: 0x0040, 0x965: 0x0008, 0x966: 0x0040, 0x967: 0x0008, 0x968: 0x0008, 0x969: 0x0008,
+	0x96a: 0x0008, 0x96b: 0x0008, 0x96c: 0x0008, 0x96d: 0x0008, 0x96e: 0x0008, 0x96f: 0x0008,
+	0x970: 0x0008, 0x971: 0x3308, 0x972: 0x0008, 0x973: 0x01f9, 0x974: 0x3308, 0x975: 0x3308,
+	0x976: 0x3308, 0x977: 0x3308, 0x978: 0x3308, 0x979: 0x3308, 0x97a: 0x3b08, 0x97b: 0x3308,
+	0x97c: 0x3308, 0x97d: 0x0008, 0x97e: 0x0040, 0x97f: 0x0040,
+	// Block 0x26, offset 0x980
+	0x980: 0x0008, 0x981: 0x0008, 0x982: 0x0008, 0x983: 0x0211, 0x984: 0x0008, 0x985: 0x0008,
+	0x986: 0x0008, 0x987: 0x0008, 0x988: 0x0040, 0x989: 0x0008, 0x98a: 0x0008, 0x98b: 0x0008,
+	0x98c: 0x0008, 0x98d: 0x0219, 0x98e: 0x0008, 0x98f: 0x0008, 0x990: 0x0008, 0x991: 0x0008,
+	0x992: 0x0221, 0x993: 0x0008, 0x994: 0x0008, 0x995: 0x0008, 0x996: 0x0008, 0x997: 0x0229,
+	0x998: 0x0008, 0x999: 0x0008, 0x99a: 0x0008, 0x99b: 0x0008, 0x99c: 0x0231, 0x99d: 0x0008,
+	0x99e: 0x0008, 0x99f: 0x0008, 0x9a0: 0x0008, 0x9a1: 0x0008, 0x9a2: 0x0008, 0x9a3: 0x0008,
+	0x9a4: 0x0008, 0x9a5: 0x0008, 0x9a6: 0x0008, 0x9a7: 0x0008, 0x9a8: 0x0008, 0x9a9: 0x0239,
+	0x9aa: 0x0008, 0x9ab: 0x0008, 0x9ac: 0x0008, 0x9ad: 0x0040, 0x9ae: 0x0040, 0x9af: 0x0040,
+	0x9b0: 0x0040, 0x9b1: 0x3308, 0x9b2: 0x3308, 0x9b3: 0x0241, 0x9b4: 0x3308, 0x9b5: 0x0249,
+	0x9b6: 0x0251, 0x9b7: 0x0259, 0x9b8: 0x0261, 0x9b9: 0x0269, 0x9ba: 0x3308, 0x9bb: 0x3308,
+	0x9bc: 0x3308, 0x9bd: 0x3308, 0x9be: 0x3308, 0x9bf: 0x3008,
+	// Block 0x27, offset 0x9c0
+	0x9c0: 0x3308, 0x9c1: 0x0271, 0x9c2: 0x3308, 0x9c3: 0x3308, 0x9c4: 0x3b08, 0x9c5: 0x0018,
+	0x9c6: 0x3308, 0x9c7: 0x3308, 0x9c8: 0x0008, 0x9c9: 0x0008, 0x9ca: 0x0008, 0x9cb: 0x0008,
+	0x9cc: 0x0008, 0x9cd: 0x3308, 0x9ce: 0x3308, 0x9cf: 0x3308, 0x9d0: 0x3308, 0x9d1: 0x3308,
+	0x9d2: 0x3308, 0x9d3: 0x0279, 0x9d4: 0x3308, 0x9d5: 0x3308, 0x9d6: 0x3308, 0x9d7: 0x3308,
+	0x9d8: 0x0040, 0x9d9: 0x3308, 0x9da: 0x3308, 0x9db: 0x3308, 0x9dc: 0x3308, 0x9dd: 0x0281,
+	0x9de: 0x3308, 0x9df: 0x3308, 0x9e0: 0x3308, 0x9e1: 0x3308, 0x9e2: 0x0289, 0x9e3: 0x3308,
+	0x9e4: 0x3308, 0x9e5: 0x3308, 0x9e6: 0x3308, 0x9e7: 0x0291, 0x9e8: 0x3308, 0x9e9: 0x3308,
+	0x9ea: 0x3308, 0x9eb: 0x3308, 0x9ec: 0x0299, 0x9ed: 0x3308, 0x9ee: 0x3308, 0x9ef: 0x3308,
+	0x9f0: 0x3308, 0x9f1: 0x3308, 0x9f2: 0x3308, 0x9f3: 0x3308, 0x9f4: 0x3308, 0x9f5: 0x3308,
+	0x9f6: 0x3308, 0x9f7: 0x3308, 0x9f8: 0x3308, 0x9f9: 0x02a1, 0x9fa: 0x3308, 0x9fb: 0x3308,
+	0x9fc: 0x3308, 0x9fd: 0x0040, 0x9fe: 0x0018, 0x9ff: 0x0018,
+	// Block 0x28, offset 0xa00
+	0xa00: 0x0008, 0xa01: 0x0008, 0xa02: 0x0008, 0xa03: 0x0008, 0xa04: 0x0008, 0xa05: 0x0008,
+	0xa06: 0x0008, 0xa07: 0x0008, 0xa08: 0x0008, 0xa09: 0x0008, 0xa0a: 0x0008, 0xa0b: 0x0008,
+	0xa0c: 0x0008, 0xa0d: 0x0008, 0xa0e: 0x0008, 0xa0f: 0x0008, 0xa10: 0x0008, 0xa11: 0x0008,
+	0xa12: 0x0008, 0xa13: 0x0008, 0xa14: 0x0008, 0xa15: 0x0008, 0xa16: 0x0008, 0xa17: 0x0008,
+	0xa18: 0x0008, 0xa19: 0x0008, 0xa1a: 0x0008, 0xa1b: 0x0008, 0xa1c: 0x0008, 0xa1d: 0x0008,
+	0xa1e: 0x0008, 0xa1f: 0x0008, 0xa20: 0x0008, 0xa21: 0x0008, 0xa22: 0x0008, 0xa23: 0x0008,
+	0xa24: 0x0008, 0xa25: 0x0008, 0xa26: 0x0008, 0xa27: 0x0008, 0xa28: 0x0008, 0xa29: 0x0008,
+	0xa2a: 0x0008, 0xa2b: 0x0008, 0xa2c: 0x0019, 0xa2d: 0x02e1, 0xa2e: 0x02e9, 0xa2f: 0x0008,
+	0xa30: 0x02f1, 0xa31: 0x02f9, 0xa32: 0x0301, 0xa33: 0x0309, 0xa34: 0x00a9, 0xa35: 0x0311,
+	0xa36: 0x00b1, 0xa37: 0x0319, 0xa38: 0x0101, 0xa39: 0x0321, 0xa3a: 0x0329, 0xa3b: 0x0008,
+	0xa3c: 0x0051, 0xa3d: 0x0331, 0xa3e: 0x0339, 0xa3f: 0x00b9,
+	// Block 0x29, offset 0xa40
+	0xa40: 0x0341, 0xa41: 0x0349, 0xa42: 0x00c1, 0xa43: 0x0019, 0xa44: 0x0351, 0xa45: 0x0359,
+	0xa46: 0x05b5, 0xa47: 0x02e9, 0xa48: 0x02f1, 0xa49: 0x02f9, 0xa4a: 0x0361, 0xa4b: 0x0369,
+	0xa4c: 0x0371, 0xa4d: 0x0309, 0xa4e: 0x0008, 0xa4f: 0x0319, 0xa50: 0x0321, 0xa51: 0x0379,
+	0xa52: 0x0051, 0xa53: 0x0381, 0xa54: 0x05cd, 0xa55: 0x05cd, 0xa56: 0x0339, 0xa57: 0x0341,
+	0xa58: 0x0349, 0xa59: 0x05b5, 0xa5a: 0x0389, 0xa5b: 0x0391, 0xa5c: 0x05e5, 0xa5d: 0x0399,
+	0xa5e: 0x03a1, 0xa5f: 0x03a9, 0xa60: 0x03b1, 0xa61: 0x03b9, 0xa62: 0x0311, 0xa63: 0x00b9,
+	0xa64: 0x0349, 0xa65: 0x0391, 0xa66: 0x0399, 0xa67: 0x03a1, 0xa68: 0x03c1, 0xa69: 0x03b1,
+	0xa6a: 0x03b9, 0xa6b: 0x0008, 0xa6c: 0x0008, 0xa6d: 0x0008, 0xa6e: 0x0008, 0xa6f: 0x0008,
+	0xa70: 0x0008, 0xa71: 0x0008, 0xa72: 0x0008, 0xa73: 0x0008, 0xa74: 0x0008, 0xa75: 0x0008,
+	0xa76: 0x0008, 0xa77: 0x0008, 0xa78: 0x03c9, 0xa79: 0x0008, 0xa7a: 0x0008, 0xa7b: 0x0008,
+	0xa7c: 0x0008, 0xa7d: 0x0008, 0xa7e: 0x0008, 0xa7f: 0x0008,
+	// Block 0x2a, offset 0xa80
+	0xa80: 0x0008, 0xa81: 0x0008, 0xa82: 0x0008, 0xa83: 0x0008, 0xa84: 0x0008, 0xa85: 0x0008,
+	0xa86: 0x0008, 0xa87: 0x0008, 0xa88: 0x0008, 0xa89: 0x0008, 0xa8a: 0x0008, 0xa8b: 0x0008,
+	0xa8c: 0x0008, 0xa8d: 0x0008, 0xa8e: 0x0008, 0xa8f: 0x0008, 0xa90: 0x0008, 0xa91: 0x0008,
+	0xa92: 0x0008, 0xa93: 0x0008, 0xa94: 0x0008, 0xa95: 0x0008, 0xa96: 0x0008, 0xa97: 0x0008,
+	0xa98: 0x0008, 0xa99: 0x0008, 0xa9a: 0x0008, 0xa9b: 0x03d1, 0xa9c: 0x03d9, 0xa9d: 0x03e1,
+	0xa9e: 0x03e9, 0xa9f: 0x0371, 0xaa0: 0x03f1, 0xaa1: 0x03f9, 0xaa2: 0x0401, 0xaa3: 0x0409,
+	0xaa4: 0x0411, 0xaa5: 0x0419, 0xaa6: 0x0421, 0xaa7: 0x05fd, 0xaa8: 0x0429, 0xaa9: 0x0431,
+	0xaaa: 0xe17d, 0xaab: 0x0439, 0xaac: 0x0441, 0xaad: 0x0449, 0xaae: 0x0451, 0xaaf: 0x0459,
+	0xab0: 0x0461, 0xab1: 0x0469, 0xab2: 0x0471, 0xab3: 0x0479, 0xab4: 0x0481, 0xab5: 0x0489,
+	0xab6: 0x0491, 0xab7: 0x0499, 0xab8: 0x0615, 0xab9: 0x04a1, 0xaba: 0x04a9, 0xabb: 0x04b1,
+	0xabc: 0x04b9, 0xabd: 0x04c1, 0xabe: 0x04c9, 0xabf: 0x04d1,
+	// Block 0x2b, offset 0xac0
+	0xac0: 0xe00d, 0xac1: 0x0008, 0xac2: 0xe00d, 0xac3: 0x0008, 0xac4: 0xe00d, 0xac5: 0x0008,
+	0xac6: 0xe00d, 0xac7: 0x0008, 0xac8: 0xe00d, 0xac9: 0x0008, 0xaca: 0xe00d, 0xacb: 0x0008,
+	0xacc: 0xe00d, 0xacd: 0x0008, 0xace: 0xe00d, 0xacf: 0x0008, 0xad0: 0xe00d, 0xad1: 0x0008,
+	0xad2: 0xe00d, 0xad3: 0x0008, 0xad4: 0xe00d, 0xad5: 0x0008, 0xad6: 0xe00d, 0xad7: 0x0008,
+	0xad8: 0xe00d, 0xad9: 0x0008, 0xada: 0xe00d, 0xadb: 0x0008, 0xadc: 0xe00d, 0xadd: 0x0008,
+	0xade: 0xe00d, 0xadf: 0x0008, 0xae0: 0xe00d, 0xae1: 0x0008, 0xae2: 0xe00d, 0xae3: 0x0008,
+	0xae4: 0xe00d, 0xae5: 0x0008, 0xae6: 0xe00d, 0xae7: 0x0008, 0xae8: 0xe00d, 0xae9: 0x0008,
+	0xaea: 0xe00d, 0xaeb: 0x0008, 0xaec: 0xe00d, 0xaed: 0x0008, 0xaee: 0xe00d, 0xaef: 0x0008,
+	0xaf0: 0xe00d, 0xaf1: 0x0008, 0xaf2: 0xe00d, 0xaf3: 0x0008, 0xaf4: 0xe00d, 0xaf5: 0x0008,
+	0xaf6: 0xe00d, 0xaf7: 0x0008, 0xaf8: 0xe00d, 0xaf9: 0x0008, 0xafa: 0xe00d, 0xafb: 0x0008,
+	0xafc: 0xe00d, 0xafd: 0x0008, 0xafe: 0xe00d, 0xaff: 0x0008,
+	// Block 0x2c, offset 0xb00
+	0xb00: 0xe00d, 0xb01: 0x0008, 0xb02: 0xe00d, 0xb03: 0x0008, 0xb04: 0xe00d, 0xb05: 0x0008,
+	0xb06: 0xe00d, 0xb07: 0x0008, 0xb08: 0xe00d, 0xb09: 0x0008, 0xb0a: 0xe00d, 0xb0b: 0x0008,
+	0xb0c: 0xe00d, 0xb0d: 0x0008, 0xb0e: 0xe00d, 0xb0f: 0x0008, 0xb10: 0xe00d, 0xb11: 0x0008,
+	0xb12: 0xe00d, 0xb13: 0x0008, 0xb14: 0xe00d, 0xb15: 0x0008, 0xb16: 0x0008, 0xb17: 0x0008,
+	0xb18: 0x0008, 0xb19: 0x0008, 0xb1a: 0x062d, 0xb1b: 0x064d, 0xb1c: 0x0008, 0xb1d: 0x0008,
+	0xb1e: 0x04d9, 0xb1f: 0x0008, 0xb20: 0xe00d, 0xb21: 0x0008, 0xb22: 0xe00d, 0xb23: 0x0008,
+	0xb24: 0xe00d, 0xb25: 0x0008, 0xb26: 0xe00d, 0xb27: 0x0008, 0xb28: 0xe00d, 0xb29: 0x0008,
+	0xb2a: 0xe00d, 0xb2b: 0x0008, 0xb2c: 0xe00d, 0xb2d: 0x0008, 0xb2e: 0xe00d, 0xb2f: 0x0008,
+	0xb30: 0xe00d, 0xb31: 0x0008, 0xb32: 0xe00d, 0xb33: 0x0008, 0xb34: 0xe00d, 0xb35: 0x0008,
+	0xb36: 0xe00d, 0xb37: 0x0008, 0xb38: 0xe00d, 0xb39: 0x0008, 0xb3a: 0xe00d, 0xb3b: 0x0008,
+	0xb3c: 0xe00d, 0xb3d: 0x0008, 0xb3e: 0xe00d, 0xb3f: 0x0008,
+	// Block 0x2d, offset 0xb40
+	0xb40: 0x0008, 0xb41: 0x0008, 0xb42: 0x0008, 0xb43: 0x0008, 0xb44: 0x0008, 0xb45: 0x0008,
+	0xb46: 0x0040, 0xb47: 0x0040, 0xb48: 0xe045, 0xb49: 0xe045, 0xb4a: 0xe045, 0xb4b: 0xe045,
+	0xb4c: 0xe045, 0xb4d: 0xe045, 0xb4e: 0x0040, 0xb4f: 0x0040, 0xb50: 0x0008, 0xb51: 0x0008,
+	0xb52: 0x0008, 0xb53: 0x0008, 0xb54: 0x0008, 0xb55: 0x0008, 0xb56: 0x0008, 0xb57: 0x0008,
+	0xb58: 0x0040, 0xb59: 0xe045, 0xb5a: 0x0040, 0xb5b: 0xe045, 0xb5c: 0x0040, 0xb5d: 0xe045,
+	0xb5e: 0x0040, 0xb5f: 0xe045, 0xb60: 0x0008, 0xb61: 0x0008, 0xb62: 0x0008, 0xb63: 0x0008,
+	0xb64: 0x0008, 0xb65: 0x0008, 0xb66: 0x0008, 0xb67: 0x0008, 0xb68: 0xe045, 0xb69: 0xe045,
+	0xb6a: 0xe045, 0xb6b: 0xe045, 0xb6c: 0xe045, 0xb6d: 0xe045, 0xb6e: 0xe045, 0xb6f: 0xe045,
+	0xb70: 0x0008, 0xb71: 0x04e1, 0xb72: 0x0008, 0xb73: 0x04e9, 0xb74: 0x0008, 0xb75: 0x04f1,
+	0xb76: 0x0008, 0xb77: 0x04f9, 0xb78: 0x0008, 0xb79: 0x0501, 0xb7a: 0x0008, 0xb7b: 0x0509,
+	0xb7c: 0x0008, 0xb7d: 0x0511, 0xb7e: 0x0040, 0xb7f: 0x0040,
+	// Block 0x2e, offset 0xb80
+	0xb80: 0x0519, 0xb81: 0x0521, 0xb82: 0x0529, 0xb83: 0x0531, 0xb84: 0x0539, 0xb85: 0x0541,
+	0xb86: 0x0549, 0xb87: 0x0551, 0xb88: 0x0519, 0xb89: 0x0521, 0xb8a: 0x0529, 0xb8b: 0x0531,
+	0xb8c: 0x0539, 0xb8d: 0x0541, 0xb8e: 0x0549, 0xb8f: 0x0551, 0xb90: 0x0559, 0xb91: 0x0561,
+	0xb92: 0x0569, 0xb93: 0x0571, 0xb94: 0x0579, 0xb95: 0x0581, 0xb96: 0x0589, 0xb97: 0x0591,
+	0xb98: 0x0559, 0xb99: 0x0561, 0xb9a: 0x0569, 0xb9b: 0x0571, 0xb9c: 0x0579, 0xb9d: 0x0581,
+	0xb9e: 0x0589, 0xb9f: 0x0591, 0xba0: 0x0599, 0xba1: 0x05a1, 0xba2: 0x05a9, 0xba3: 0x05b1,
+	0xba4: 0x05b9, 0xba5: 0x05c1, 0xba6: 0x05c9, 0xba7: 0x05d1, 0xba8: 0x0599, 0xba9: 0x05a1,
+	0xbaa: 0x05a9, 0xbab: 0x05b1, 0xbac: 0x05b9, 0xbad: 0x05c1, 0xbae: 0x05c9, 0xbaf: 0x05d1,
+	0xbb0: 0x0008, 0xbb1: 0x0008, 0xbb2: 0x05d9, 0xbb3: 0x05e1, 0xbb4: 0x05e9, 0xbb5: 0x0040,
+	0xbb6: 0x0008, 0xbb7: 0x05f1, 0xbb8: 0xe045, 0xbb9: 0xe045, 0xbba: 0x0665, 0xbbb: 0x04e1,
+	0xbbc: 0x05e1, 0xbbd: 0x067e, 0xbbe: 0x05f9, 0xbbf: 0x069e,
+	// Block 0x2f, offset 0xbc0
+	0xbc0: 0x06be, 0xbc1: 0x0602, 0xbc2: 0x0609, 0xbc3: 0x0611, 0xbc4: 0x0619, 0xbc5: 0x0040,
+	0xbc6: 0x0008, 0xbc7: 0x0621, 0xbc8: 0x06dd, 0xbc9: 0x04e9, 0xbca: 0x06f5, 0xbcb: 0x04f1,
+	0xbcc: 0x0611, 0xbcd: 0x062a, 0xbce: 0x0632, 0xbcf: 0x063a, 0xbd0: 0x0008, 0xbd1: 0x0008,
+	0xbd2: 0x0008, 0xbd3: 0x0641, 0xbd4: 0x0040, 0xbd5: 0x0040, 0xbd6: 0x0008, 0xbd7: 0x0008,
+	0xbd8: 0xe045, 0xbd9: 0xe045, 0xbda: 0x070d, 0xbdb: 0x04f9, 0xbdc: 0x0040, 0xbdd: 0x064a,
+	0xbde: 0x0652, 0xbdf: 0x065a, 0xbe0: 0x0008, 0xbe1: 0x0008, 0xbe2: 0x0008, 0xbe3: 0x0661,
+	0xbe4: 0x0008, 0xbe5: 0x0008, 0xbe6: 0x0008, 0xbe7: 0x0008, 0xbe8: 0xe045, 0xbe9: 0xe045,
+	0xbea: 0x0725, 0xbeb: 0x0509, 0xbec: 0xe04d, 0xbed: 0x066a, 0xbee: 0x012a, 0xbef: 0x0672,
+	0xbf0: 0x0040, 0xbf1: 0x0040, 0xbf2: 0x0679, 0xbf3: 0x0681, 0xbf4: 0x0689, 0xbf5: 0x0040,
+	0xbf6: 0x0008, 0xbf7: 0x0691, 0xbf8: 0x073d, 0xbf9: 0x0501, 0xbfa: 0x0515, 0xbfb: 0x0511,
+	0xbfc: 0x0681, 0xbfd: 0x0756, 0xbfe: 0x0776, 0xbff: 0x0040,
+	// Block 0x30, offset 0xc00
+	0xc00: 0x000a, 0xc01: 0x000a, 0xc02: 0x000a, 0xc03: 0x000a, 0xc04: 0x000a, 0xc05: 0x000a,
+	0xc06: 0x000a, 0xc07: 0x000a, 0xc08: 0x000a, 0xc09: 0x000a, 0xc0a: 0x000a, 0xc0b: 0x03c0,
+	0xc0c: 0x0003, 0xc0d: 0x0003, 0xc0e: 0x0340, 0xc0f: 0x0b40, 0xc10: 0x0018, 0xc11: 0xe00d,
+	0xc12: 0x0018, 0xc13: 0x0018, 0xc14: 0x0018, 0xc15: 0x0018, 0xc16: 0x0018, 0xc17: 0x0796,
+	0xc18: 0x0018, 0xc19: 0x0018, 0xc1a: 0x0018, 0xc1b: 0x0018, 0xc1c: 0x0018, 0xc1d: 0x0018,
+	0xc1e: 0x0018, 0xc1f: 0x0018, 0xc20: 0x0018, 0xc21: 0x0018, 0xc22: 0x0018, 0xc23: 0x0018,
+	0xc24: 0x0040, 0xc25: 0x0040, 0xc26: 0x0040, 0xc27: 0x0018, 0xc28: 0x0040, 0xc29: 0x0040,
+	0xc2a: 0x0340, 0xc2b: 0x0340, 0xc2c: 0x0340, 0xc2d: 0x0340, 0xc2e: 0x0340, 0xc2f: 0x000a,
+	0xc30: 0x0018, 0xc31: 0x0018, 0xc32: 0x0018, 0xc33: 0x0699, 0xc34: 0x06a1, 0xc35: 0x0018,
+	0xc36: 0x06a9, 0xc37: 0x06b1, 0xc38: 0x0018, 0xc39: 0x0018, 0xc3a: 0x0018, 0xc3b: 0x0018,
+	0xc3c: 0x06ba, 0xc3d: 0x0018, 0xc3e: 0x07b6, 0xc3f: 0x0018,
+	// Block 0x31, offset 0xc40
+	0xc40: 0x0018, 0xc41: 0x0018, 0xc42: 0x0018, 0xc43: 0x0018, 0xc44: 0x0018, 0xc45: 0x0018,
+	0xc46: 0x0018, 0xc47: 0x06c2, 0xc48: 0x06ca, 0xc49: 0x06d2, 0xc4a: 0x0018, 0xc4b: 0x0018,
+	0xc4c: 0x0018, 0xc4d: 0x0018, 0xc4e: 0x0018, 0xc4f: 0x0018, 0xc50: 0x0018, 0xc51: 0x0018,
+	0xc52: 0x0018, 0xc53: 0x0018, 0xc54: 0x0018, 0xc55: 0x0018, 0xc56: 0x0018, 0xc57: 0x06d9,
+	0xc58: 0x0018, 0xc59: 0x0018, 0xc5a: 0x0018, 0xc5b: 0x0018, 0xc5c: 0x0018, 0xc5d: 0x0018,
+	0xc5e: 0x0018, 0xc5f: 0x000a, 0xc60: 0x03c0, 0xc61: 0x0340, 0xc62: 0x0340, 0xc63: 0x0340,
+	0xc64: 0x03c0, 0xc65: 0x0040, 0xc66: 0x0040, 0xc67: 0x0040, 0xc68: 0x0040, 0xc69: 0x0040,
+	0xc6a: 0x0340, 0xc6b: 0x0340, 0xc6c: 0x0340, 0xc6d: 0x0340, 0xc6e: 0x0340, 0xc6f: 0x0340,
+	0xc70: 0x06e1, 0xc71: 0x0311, 0xc72: 0x0040, 0xc73: 0x0040, 0xc74: 0x06e9, 0xc75: 0x06f1,
+	0xc76: 0x06f9, 0xc77: 0x0701, 0xc78: 0x0709, 0xc79: 0x0711, 0xc7a: 0x071a, 0xc7b: 0x07d5,
+	0xc7c: 0x0722, 0xc7d: 0x072a, 0xc7e: 0x0732, 0xc7f: 0x0329,
+	// Block 0x32, offset 0xc80
+	0xc80: 0x06e1, 0xc81: 0x0049, 0xc82: 0x0029, 0xc83: 0x0031, 0xc84: 0x06e9, 0xc85: 0x06f1,
+	0xc86: 0x06f9, 0xc87: 0x0701, 0xc88: 0x0709, 0xc89: 0x0711, 0xc8a: 0x071a, 0xc8b: 0x07ed,
+	0xc8c: 0x0722, 0xc8d: 0x072a, 0xc8e: 0x0732, 0xc8f: 0x0040, 0xc90: 0x0019, 0xc91: 0x02f9,
+	0xc92: 0x0051, 0xc93: 0x0109, 0xc94: 0x0361, 0xc95: 0x00a9, 0xc96: 0x0319, 0xc97: 0x0101,
+	0xc98: 0x0321, 0xc99: 0x0329, 0xc9a: 0x0339, 0xc9b: 0x0089, 0xc9c: 0x0341, 0xc9d: 0x0040,
+	0xc9e: 0x0040, 0xc9f: 0x0040, 0xca0: 0x0018, 0xca1: 0x0018, 0xca2: 0x0018, 0xca3: 0x0018,
+	0xca4: 0x0018, 0xca5: 0x0018, 0xca6: 0x0018, 0xca7: 0x0018, 0xca8: 0x0739, 0xca9: 0x0018,
+	0xcaa: 0x0018, 0xcab: 0x0018, 0xcac: 0x0018, 0xcad: 0x0018, 0xcae: 0x0018, 0xcaf: 0x0018,
+	0xcb0: 0x0018, 0xcb1: 0x0018, 0xcb2: 0x0018, 0xcb3: 0x0018, 0xcb4: 0x0018, 0xcb5: 0x0018,
+	0xcb6: 0x0018, 0xcb7: 0x0018, 0xcb8: 0x0018, 0xcb9: 0x0018, 0xcba: 0x0018, 0xcbb: 0x0018,
+	0xcbc: 0x0018, 0xcbd: 0x0018, 0xcbe: 0x0018, 0xcbf: 0x0018,
+	// Block 0x33, offset 0xcc0
+	0xcc0: 0x0806, 0xcc1: 0x0826, 0xcc2: 0x03d9, 0xcc3: 0x0845, 0xcc4: 0x0018, 0xcc5: 0x0866,
+	0xcc6: 0x0886, 0xcc7: 0x0369, 0xcc8: 0x0018, 0xcc9: 0x08a5, 0xcca: 0x0309, 0xccb: 0x00a9,
+	0xccc: 0x00a9, 0xccd: 0x00a9, 0xcce: 0x00a9, 0xccf: 0x0741, 0xcd0: 0x0311, 0xcd1: 0x0311,
+	0xcd2: 0x0101, 0xcd3: 0x0101, 0xcd4: 0x0018, 0xcd5: 0x0329, 0xcd6: 0x0749, 0xcd7: 0x0018,
+	0xcd8: 0x0018, 0xcd9: 0x0339, 0xcda: 0x0751, 0xcdb: 0x00b9, 0xcdc: 0x00b9, 0xcdd: 0x00b9,
+	0xcde: 0x0018, 0xcdf: 0x0018, 0xce0: 0x0759, 0xce1: 0x08c5, 0xce2: 0x0761, 0xce3: 0x0018,
+	0xce4: 0x04b1, 0xce5: 0x0018, 0xce6: 0x0769, 0xce7: 0x0018, 0xce8: 0x04b1, 0xce9: 0x0018,
+	0xcea: 0x0319, 0xceb: 0x0771, 0xcec: 0x02e9, 0xced: 0x03d9, 0xcee: 0x0018, 0xcef: 0x02f9,
+	0xcf0: 0x02f9, 0xcf1: 0x03f1, 0xcf2: 0x0040, 0xcf3: 0x0321, 0xcf4: 0x0051, 0xcf5: 0x0779,
+	0xcf6: 0x0781, 0xcf7: 0x0789, 0xcf8: 0x0791, 0xcf9: 0x0311, 0xcfa: 0x0018, 0xcfb: 0x08e5,
+	0xcfc: 0x0799, 0xcfd: 0x03a1, 0xcfe: 0x03a1, 0xcff: 0x0799,
+	// Block 0x34, offset 0xd00
+	0xd00: 0x0905, 0xd01: 0x0018, 0xd02: 0x0018, 0xd03: 0x0018, 0xd04: 0x0018, 0xd05: 0x02f1,
+	0xd06: 0x02f1, 0xd07: 0x02f9, 0xd08: 0x0311, 0xd09: 0x00b1, 0xd0a: 0x0018, 0xd0b: 0x0018,
+	0xd0c: 0x0018, 0xd0d: 0x0018, 0xd0e: 0x0008, 0xd0f: 0x0018, 0xd10: 0x07a1, 0xd11: 0x07a9,
+	0xd12: 0x07b1, 0xd13: 0x07b9, 0xd14: 0x07c1, 0xd15: 0x07c9, 0xd16: 0x07d1, 0xd17: 0x07d9,
+	0xd18: 0x07e1, 0xd19: 0x07e9, 0xd1a: 0x07f1, 0xd1b: 0x07f9, 0xd1c: 0x0801, 0xd1d: 0x0809,
+	0xd1e: 0x0811, 0xd1f: 0x0819, 0xd20: 0x0311, 0xd21: 0x0821, 0xd22: 0x091d, 0xd23: 0x0829,
+	0xd24: 0x0391, 0xd25: 0x0831, 0xd26: 0x093d, 0xd27: 0x0839, 0xd28: 0x0841, 0xd29: 0x0109,
+	0xd2a: 0x0849, 0xd2b: 0x095d, 0xd2c: 0x0101, 0xd2d: 0x03d9, 0xd2e: 0x02f1, 0xd2f: 0x0321,
+	0xd30: 0x0311, 0xd31: 0x0821, 0xd32: 0x097d, 0xd33: 0x0829, 0xd34: 0x0391, 0xd35: 0x0831,
+	0xd36: 0x099d, 0xd37: 0x0839, 0xd38: 0x0841, 0xd39: 0x0109, 0xd3a: 0x0849, 0xd3b: 0x09bd,
+	0xd3c: 0x0101, 0xd3d: 0x03d9, 0xd3e: 0x02f1, 0xd3f: 0x0321,
+	// Block 0x35, offset 0xd40
+	0xd40: 0x0018, 0xd41: 0x0018, 0xd42: 0x0018, 0xd43: 0x0018, 0xd44: 0x0018, 0xd45: 0x0018,
+	0xd46: 0x0018, 0xd47: 0x0018, 0xd48: 0x0018, 0xd49: 0x0018, 0xd4a: 0x0018, 0xd4b: 0x0040,
+	0xd4c: 0x0040, 0xd4d: 0x0040, 0xd4e: 0x0040, 0xd4f: 0x0040, 0xd50: 0x0040, 0xd51: 0x0040,
+	0xd52: 0x0040, 0xd53: 0x0040, 0xd54: 0x0040, 0xd55: 0x0040, 0xd56: 0x0040, 0xd57: 0x0040,
+	0xd58: 0x0040, 0xd59: 0x0040, 0xd5a: 0x0040, 0xd5b: 0x0040, 0xd5c: 0x0040, 0xd5d: 0x0040,
+	0xd5e: 0x0040, 0xd5f: 0x0040, 0xd60: 0x0049, 0xd61: 0x0029, 0xd62: 0x0031, 0xd63: 0x06e9,
+	0xd64: 0x06f1, 0xd65: 0x06f9, 0xd66: 0x0701, 0xd67: 0x0709, 0xd68: 0x0711, 0xd69: 0x0879,
+	0xd6a: 0x0881, 0xd6b: 0x0889, 0xd6c: 0x0891, 0xd6d: 0x0899, 0xd6e: 0x08a1, 0xd6f: 0x08a9,
+	0xd70: 0x08b1, 0xd71: 0x08b9, 0xd72: 0x08c1, 0xd73: 0x08c9, 0xd74: 0x0a1e, 0xd75: 0x0a3e,
+	0xd76: 0x0a5e, 0xd77: 0x0a7e, 0xd78: 0x0a9e, 0xd79: 0x0abe, 0xd7a: 0x0ade, 0xd7b: 0x0afe,
+	0xd7c: 0x0b1e, 0xd7d: 0x08d2, 0xd7e: 0x08da, 0xd7f: 0x08e2,
+	// Block 0x36, offset 0xd80
+	0xd80: 0x08ea, 0xd81: 0x08f2, 0xd82: 0x08fa, 0xd83: 0x0902, 0xd84: 0x090a, 0xd85: 0x0912,
+	0xd86: 0x091a, 0xd87: 0x0922, 0xd88: 0x0040, 0xd89: 0x0040, 0xd8a: 0x0040, 0xd8b: 0x0040,
+	0xd8c: 0x0040, 0xd8d: 0x0040, 0xd8e: 0x0040, 0xd8f: 0x0040, 0xd90: 0x0040, 0xd91: 0x0040,
+	0xd92: 0x0040, 0xd93: 0x0040, 0xd94: 0x0040, 0xd95: 0x0040, 0xd96: 0x0040, 0xd97: 0x0040,
+	0xd98: 0x0040, 0xd99: 0x0040, 0xd9a: 0x0040, 0xd9b: 0x0040, 0xd9c: 0x0b3e, 0xd9d: 0x0b5e,
+	0xd9e: 0x0b7e, 0xd9f: 0x0b9e, 0xda0: 0x0bbe, 0xda1: 0x0bde, 0xda2: 0x0bfe, 0xda3: 0x0c1e,
+	0xda4: 0x0c3e, 0xda5: 0x0c5e, 0xda6: 0x0c7e, 0xda7: 0x0c9e, 0xda8: 0x0cbe, 0xda9: 0x0cde,
+	0xdaa: 0x0cfe, 0xdab: 0x0d1e, 0xdac: 0x0d3e, 0xdad: 0x0d5e, 0xdae: 0x0d7e, 0xdaf: 0x0d9e,
+	0xdb0: 0x0dbe, 0xdb1: 0x0dde, 0xdb2: 0x0dfe, 0xdb3: 0x0e1e, 0xdb4: 0x0e3e, 0xdb5: 0x0e5e,
+	0xdb6: 0x0019, 0xdb7: 0x02e9, 0xdb8: 0x03d9, 0xdb9: 0x02f1, 0xdba: 0x02f9, 0xdbb: 0x03f1,
+	0xdbc: 0x0309, 0xdbd: 0x00a9, 0xdbe: 0x0311, 0xdbf: 0x00b1,
+	// Block 0x37, offset 0xdc0
+	0xdc0: 0x0319, 0xdc1: 0x0101, 0xdc2: 0x0321, 0xdc3: 0x0329, 0xdc4: 0x0051, 0xdc5: 0x0339,
+	0xdc6: 0x0751, 0xdc7: 0x00b9, 0xdc8: 0x0089, 0xdc9: 0x0341, 0xdca: 0x0349, 0xdcb: 0x0391,
+	0xdcc: 0x00c1, 0xdcd: 0x0109, 0xdce: 0x00c9, 0xdcf: 0x04b1, 0xdd0: 0x0019, 0xdd1: 0x02e9,
+	0xdd2: 0x03d9, 0xdd3: 0x02f1, 0xdd4: 0x02f9, 0xdd5: 0x03f1, 0xdd6: 0x0309, 0xdd7: 0x00a9,
+	0xdd8: 0x0311, 0xdd9: 0x00b1, 0xdda: 0x0319, 0xddb: 0x0101, 0xddc: 0x0321, 0xddd: 0x0329,
+	0xdde: 0x0051, 0xddf: 0x0339, 0xde0: 0x0751, 0xde1: 0x00b9, 0xde2: 0x0089, 0xde3: 0x0341,
+	0xde4: 0x0349, 0xde5: 0x0391, 0xde6: 0x00c1, 0xde7: 0x0109, 0xde8: 0x00c9, 0xde9: 0x04b1,
+	0xdea: 0x06e1, 0xdeb: 0x0018, 0xdec: 0x0018, 0xded: 0x0018, 0xdee: 0x0018, 0xdef: 0x0018,
+	0xdf0: 0x0018, 0xdf1: 0x0018, 0xdf2: 0x0018, 0xdf3: 0x0018, 0xdf4: 0x0018, 0xdf5: 0x0018,
+	0xdf6: 0x0018, 0xdf7: 0x0018, 0xdf8: 0x0018, 0xdf9: 0x0018, 0xdfa: 0x0018, 0xdfb: 0x0018,
+	0xdfc: 0x0018, 0xdfd: 0x0018, 0xdfe: 0x0018, 0xdff: 0x0018,
+	// Block 0x38, offset 0xe00
+	0xe00: 0x0008, 0xe01: 0x0008, 0xe02: 0x0008, 0xe03: 0x0008, 0xe04: 0x0008, 0xe05: 0x0008,
+	0xe06: 0x0008, 0xe07: 0x0008, 0xe08: 0x0008, 0xe09: 0x0008, 0xe0a: 0x0008, 0xe0b: 0x0008,
+	0xe0c: 0x0008, 0xe0d: 0x0008, 0xe0e: 0x0008, 0xe0f: 0x0008, 0xe10: 0x0008, 0xe11: 0x0008,
+	0xe12: 0x0008, 0xe13: 0x0008, 0xe14: 0x0008, 0xe15: 0x0008, 0xe16: 0x0008, 0xe17: 0x0008,
+	0xe18: 0x0008, 0xe19: 0x0008, 0xe1a: 0x0008, 0xe1b: 0x0008, 0xe1c: 0x0008, 0xe1d: 0x0008,
+	0xe1e: 0x0008, 0xe1f: 0x0008, 0xe20: 0xe00d, 0xe21: 0x0008, 0xe22: 0x0941, 0xe23: 0x0ed5,
+	0xe24: 0x0949, 0xe25: 0x0008, 0xe26: 0x0008, 0xe27: 0xe07d, 0xe28: 0x0008, 0xe29: 0xe01d,
+	0xe2a: 0x0008, 0xe2b: 0xe03d, 0xe2c: 0x0008, 0xe2d: 0x0359, 0xe2e: 0x0441, 0xe2f: 0x0351,
+	0xe30: 0x03d1, 0xe31: 0x0008, 0xe32: 0xe00d, 0xe33: 0x0008, 0xe34: 0x0008, 0xe35: 0xe01d,
+	0xe36: 0x0008, 0xe37: 0x0008, 0xe38: 0x0008, 0xe39: 0x0008, 0xe3a: 0x0008, 0xe3b: 0x0008,
+	0xe3c: 0x00b1, 0xe3d: 0x0391, 0xe3e: 0x0951, 0xe3f: 0x0959,
+	// Block 0x39, offset 0xe40
+	0xe40: 0xe00d, 0xe41: 0x0008, 0xe42: 0xe00d, 0xe43: 0x0008, 0xe44: 0xe00d, 0xe45: 0x0008,
+	0xe46: 0xe00d, 0xe47: 0x0008, 0xe48: 0xe00d, 0xe49: 0x0008, 0xe4a: 0xe00d, 0xe4b: 0x0008,
+	0xe4c: 0xe00d, 0xe4d: 0x0008, 0xe4e: 0xe00d, 0xe4f: 0x0008, 0xe50: 0xe00d, 0xe51: 0x0008,
+	0xe52: 0xe00d, 0xe53: 0x0008, 0xe54: 0xe00d, 0xe55: 0x0008, 0xe56: 0xe00d, 0xe57: 0x0008,
+	0xe58: 0xe00d, 0xe59: 0x0008, 0xe5a: 0xe00d, 0xe5b: 0x0008, 0xe5c: 0xe00d, 0xe5d: 0x0008,
+	0xe5e: 0xe00d, 0xe5f: 0x0008, 0xe60: 0xe00d, 0xe61: 0x0008, 0xe62: 0xe00d, 0xe63: 0x0008,
+	0xe64: 0x0008, 0xe65: 0x0018, 0xe66: 0x0018, 0xe67: 0x0018, 0xe68: 0x0018, 0xe69: 0x0018,
+	0xe6a: 0x0018, 0xe6b: 0xe03d, 0xe6c: 0x0008, 0xe6d: 0xe01d, 0xe6e: 0x0008, 0xe6f: 0x3308,
+	0xe70: 0x3308, 0xe71: 0x3308, 0xe72: 0xe00d, 0xe73: 0x0008, 0xe74: 0x0040, 0xe75: 0x0040,
+	0xe76: 0x0040, 0xe77: 0x0040, 0xe78: 0x0040, 0xe79: 0x0018, 0xe7a: 0x0018, 0xe7b: 0x0018,
+	0xe7c: 0x0018, 0xe7d: 0x0018, 0xe7e: 0x0018, 0xe7f: 0x0018,
+	// Block 0x3a, offset 0xe80
+	0xe80: 0x2715, 0xe81: 0x2735, 0xe82: 0x2755, 0xe83: 0x2775, 0xe84: 0x2795, 0xe85: 0x27b5,
+	0xe86: 0x27d5, 0xe87: 0x27f5, 0xe88: 0x2815, 0xe89: 0x2835, 0xe8a: 0x2855, 0xe8b: 0x2875,
+	0xe8c: 0x2895, 0xe8d: 0x28b5, 0xe8e: 0x28d5, 0xe8f: 0x28f5, 0xe90: 0x2915, 0xe91: 0x2935,
+	0xe92: 0x2955, 0xe93: 0x2975, 0xe94: 0x2995, 0xe95: 0x29b5, 0xe96: 0x0040, 0xe97: 0x0040,
+	0xe98: 0x0040, 0xe99: 0x0040, 0xe9a: 0x0040, 0xe9b: 0x0040, 0xe9c: 0x0040, 0xe9d: 0x0040,
+	0xe9e: 0x0040, 0xe9f: 0x0040, 0xea0: 0x0040, 0xea1: 0x0040, 0xea2: 0x0040, 0xea3: 0x0040,
+	0xea4: 0x0040, 0xea5: 0x0040, 0xea6: 0x0040, 0xea7: 0x0040, 0xea8: 0x0040, 0xea9: 0x0040,
+	0xeaa: 0x0040, 0xeab: 0x0040, 0xeac: 0x0040, 0xead: 0x0040, 0xeae: 0x0040, 0xeaf: 0x0040,
+	0xeb0: 0x0040, 0xeb1: 0x0040, 0xeb2: 0x0040, 0xeb3: 0x0040, 0xeb4: 0x0040, 0xeb5: 0x0040,
+	0xeb6: 0x0040, 0xeb7: 0x0040, 0xeb8: 0x0040, 0xeb9: 0x0040, 0xeba: 0x0040, 0xebb: 0x0040,
+	0xebc: 0x0040, 0xebd: 0x0040, 0xebe: 0x0040, 0xebf: 0x0040,
+	// Block 0x3b, offset 0xec0
+	0xec0: 0x000a, 0xec1: 0x0018, 0xec2: 0x0961, 0xec3: 0x0018, 0xec4: 0x0018, 0xec5: 0x0008,
+	0xec6: 0x0008, 0xec7: 0x0008, 0xec8: 0x0018, 0xec9: 0x0018, 0xeca: 0x0018, 0xecb: 0x0018,
+	0xecc: 0x0018, 0xecd: 0x0018, 0xece: 0x0018, 0xecf: 0x0018, 0xed0: 0x0018, 0xed1: 0x0018,
+	0xed2: 0x0018, 0xed3: 0x0018, 0xed4: 0x0018, 0xed5: 0x0018, 0xed6: 0x0018, 0xed7: 0x0018,
+	0xed8: 0x0018, 0xed9: 0x0018, 0xeda: 0x0018, 0xedb: 0x0018, 0xedc: 0x0018, 0xedd: 0x0018,
+	0xede: 0x0018, 0xedf: 0x0018, 0xee0: 0x0018, 0xee1: 0x0018, 0xee2: 0x0018, 0xee3: 0x0018,
+	0xee4: 0x0018, 0xee5: 0x0018, 0xee6: 0x0018, 0xee7: 0x0018, 0xee8: 0x0018, 0xee9: 0x0018,
+	0xeea: 0x3308, 0xeeb: 0x3308, 0xeec: 0x3308, 0xeed: 0x3308, 0xeee: 0x3018, 0xeef: 0x3018,
+	0xef0: 0x0018, 0xef1: 0x0018, 0xef2: 0x0018, 0xef3: 0x0018, 0xef4: 0x0018, 0xef5: 0x0018,
+	0xef6: 0xe125, 0xef7: 0x0018, 0xef8: 0x29d5, 0xef9: 0x29f5, 0xefa: 0x2a15, 0xefb: 0x0018,
+	0xefc: 0x0008, 0xefd: 0x0018, 0xefe: 0x0018, 0xeff: 0x0018,
+	// Block 0x3c, offset 0xf00
+	0xf00: 0x2b55, 0xf01: 0x2b75, 0xf02: 0x2b95, 0xf03: 0x2bb5, 0xf04: 0x2bd5, 0xf05: 0x2bf5,
+	0xf06: 0x2bf5, 0xf07: 0x2bf5, 0xf08: 0x2c15, 0xf09: 0x2c15, 0xf0a: 0x2c15, 0xf0b: 0x2c15,
+	0xf0c: 0x2c35, 0xf0d: 0x2c35, 0xf0e: 0x2c35, 0xf0f: 0x2c55, 0xf10: 0x2c75, 0xf11: 0x2c75,
+	0xf12: 0x2a95, 0xf13: 0x2a95, 0xf14: 0x2c75, 0xf15: 0x2c75, 0xf16: 0x2c95, 0xf17: 0x2c95,
+	0xf18: 0x2c75, 0xf19: 0x2c75, 0xf1a: 0x2a95, 0xf1b: 0x2a95, 0xf1c: 0x2c75, 0xf1d: 0x2c75,
+	0xf1e: 0x2c55, 0xf1f: 0x2c55, 0xf20: 0x2cb5, 0xf21: 0x2cb5, 0xf22: 0x2cd5, 0xf23: 0x2cd5,
+	0xf24: 0x0040, 0xf25: 0x2cf5, 0xf26: 0x2d15, 0xf27: 0x2d35, 0xf28: 0x2d35, 0xf29: 0x2d55,
+	0xf2a: 0x2d75, 0xf2b: 0x2d95, 0xf2c: 0x2db5, 0xf2d: 0x2dd5, 0xf2e: 0x2df5, 0xf2f: 0x2e15,
+	0xf30: 0x2e35, 0xf31: 0x2e55, 0xf32: 0x2e55, 0xf33: 0x2e75, 0xf34: 0x2e95, 0xf35: 0x2e95,
+	0xf36: 0x2eb5, 0xf37: 0x2ed5, 0xf38: 0x2e75, 0xf39: 0x2ef5, 0xf3a: 0x2f15, 0xf3b: 0x2ef5,
+	0xf3c: 0x2e75, 0xf3d: 0x2f35, 0xf3e: 0x2f55, 0xf3f: 0x2f75,
+	// Block 0x3d, offset 0xf40
+	0xf40: 0x2f95, 0xf41: 0x2fb5, 0xf42: 0x2d15, 0xf43: 0x2cf5, 0xf44: 0x2fd5, 0xf45: 0x2ff5,
+	0xf46: 0x3015, 0xf47: 0x3035, 0xf48: 0x3055, 0xf49: 0x3075, 0xf4a: 0x3095, 0xf4b: 0x30b5,
+	0xf4c: 0x30d5, 0xf4d: 0x30f5, 0xf4e: 0x3115, 0xf4f: 0x0040, 0xf50: 0x0018, 0xf51: 0x0018,
+	0xf52: 0x3135, 0xf53: 0x3155, 0xf54: 0x3175, 0xf55: 0x3195, 0xf56: 0x31b5, 0xf57: 0x31d5,
+	0xf58: 0x31f5, 0xf59: 0x3215, 0xf5a: 0x3235, 0xf5b: 0x3255, 0xf5c: 0x3175, 0xf5d: 0x3275,
+	0xf5e: 0x3295, 0xf5f: 0x32b5, 0xf60: 0x0008, 0xf61: 0x0008, 0xf62: 0x0008, 0xf63: 0x0008,
+	0xf64: 0x0008, 0xf65: 0x0008, 0xf66: 0x0008, 0xf67: 0x0008, 0xf68: 0x0008, 0xf69: 0x0008,
+	0xf6a: 0x0008, 0xf6b: 0x0008, 0xf6c: 0x0008, 0xf6d: 0x0008, 0xf6e: 0x0008, 0xf6f: 0x0008,
+	0xf70: 0x0008, 0xf71: 0x0008, 0xf72: 0x0008, 0xf73: 0x0008, 0xf74: 0x0008, 0xf75: 0x0008,
+	0xf76: 0x0008, 0xf77: 0x0008, 0xf78: 0x0008, 0xf79: 0x0008, 0xf7a: 0x0008, 0xf7b: 0x0008,
+	0xf7c: 0x0008, 0xf7d: 0x0008, 0xf7e: 0x0008, 0xf7f: 0x0008,
+	// Block 0x3e, offset 0xf80
+	0xf80: 0x0b82, 0xf81: 0x0b8a, 0xf82: 0x0b92, 0xf83: 0x0b9a, 0xf84: 0x32d5, 0xf85: 0x32f5,
+	0xf86: 0x3315, 0xf87: 0x3335, 0xf88: 0x0018, 0xf89: 0x0018, 0xf8a: 0x0018, 0xf8b: 0x0018,
+	0xf8c: 0x0018, 0xf8d: 0x0018, 0xf8e: 0x0018, 0xf8f: 0x0018, 0xf90: 0x3355, 0xf91: 0x0ba1,
+	0xf92: 0x0ba9, 0xf93: 0x0bb1, 0xf94: 0x0bb9, 0xf95: 0x0bc1, 0xf96: 0x0bc9, 0xf97: 0x0bd1,
+	0xf98: 0x0bd9, 0xf99: 0x0be1, 0xf9a: 0x0be9, 0xf9b: 0x0bf1, 0xf9c: 0x0bf9, 0xf9d: 0x0c01,
+	0xf9e: 0x0c09, 0xf9f: 0x0c11, 0xfa0: 0x3375, 0xfa1: 0x3395, 0xfa2: 0x33b5, 0xfa3: 0x33d5,
+	0xfa4: 0x33f5, 0xfa5: 0x33f5, 0xfa6: 0x3415, 0xfa7: 0x3435, 0xfa8: 0x3455, 0xfa9: 0x3475,
+	0xfaa: 0x3495, 0xfab: 0x34b5, 0xfac: 0x34d5, 0xfad: 0x34f5, 0xfae: 0x3515, 0xfaf: 0x3535,
+	0xfb0: 0x3555, 0xfb1: 0x3575, 0xfb2: 0x3595, 0xfb3: 0x35b5, 0xfb4: 0x35d5, 0xfb5: 0x35f5,
+	0xfb6: 0x3615, 0xfb7: 0x3635, 0xfb8: 0x3655, 0xfb9: 0x3675, 0xfba: 0x3695, 0xfbb: 0x36b5,
+	0xfbc: 0x0c19, 0xfbd: 0x0c21, 0xfbe: 0x36d5, 0xfbf: 0x0018,
+	// Block 0x3f, offset 0xfc0
+	0xfc0: 0x36f5, 0xfc1: 0x3715, 0xfc2: 0x3735, 0xfc3: 0x3755, 0xfc4: 0x3775, 0xfc5: 0x3795,
+	0xfc6: 0x37b5, 0xfc7: 0x37d5, 0xfc8: 0x37f5, 0xfc9: 0x3815, 0xfca: 0x3835, 0xfcb: 0x3855,
+	0xfcc: 0x3875, 0xfcd: 0x3895, 0xfce: 0x38b5, 0xfcf: 0x38d5, 0xfd0: 0x38f5, 0xfd1: 0x3915,
+	0xfd2: 0x3935, 0xfd3: 0x3955, 0xfd4: 0x3975, 0xfd5: 0x3995, 0xfd6: 0x39b5, 0xfd7: 0x39d5,
+	0xfd8: 0x39f5, 0xfd9: 0x3a15, 0xfda: 0x3a35, 0xfdb: 0x3a55, 0xfdc: 0x3a75, 0xfdd: 0x3a95,
+	0xfde: 0x3ab5, 0xfdf: 0x3ad5, 0xfe0: 0x3af5, 0xfe1: 0x3b15, 0xfe2: 0x3b35, 0xfe3: 0x3b55,
+	0xfe4: 0x3b75, 0xfe5: 0x3b95, 0xfe6: 0x1295, 0xfe7: 0x3bb5, 0xfe8: 0x3bd5, 0xfe9: 0x3bf5,
+	0xfea: 0x3c15, 0xfeb: 0x3c35, 0xfec: 0x3c55, 0xfed: 0x3c75, 0xfee: 0x23b5, 0xfef: 0x3c95,
+	0xff0: 0x3cb5, 0xff1: 0x0c29, 0xff2: 0x0c31, 0xff3: 0x0c39, 0xff4: 0x0c41, 0xff5: 0x0c49,
+	0xff6: 0x0c51, 0xff7: 0x0c59, 0xff8: 0x0c61, 0xff9: 0x0c69, 0xffa: 0x0c71, 0xffb: 0x0c79,
+	0xffc: 0x0c81, 0xffd: 0x0c89, 0xffe: 0x0c91, 0xfff: 0x0c99,
+	// Block 0x40, offset 0x1000
+	0x1000: 0x0ca1, 0x1001: 0x0ca9, 0x1002: 0x0cb1, 0x1003: 0x0cb9, 0x1004: 0x0cc1, 0x1005: 0x0cc9,
+	0x1006: 0x0cd1, 0x1007: 0x0cd9, 0x1008: 0x0ce1, 0x1009: 0x0ce9, 0x100a: 0x0cf1, 0x100b: 0x0cf9,
+	0x100c: 0x0d01, 0x100d: 0x3cd5, 0x100e: 0x0d09, 0x100f: 0x3cf5, 0x1010: 0x3d15, 0x1011: 0x3d2d,
+	0x1012: 0x3d45, 0x1013: 0x3d5d, 0x1014: 0x3d75, 0x1015: 0x3d75, 0x1016: 0x3d5d, 0x1017: 0x3d8d,
+	0x1018: 0x07d5, 0x1019: 0x3da5, 0x101a: 0x3dbd, 0x101b: 0x3dd5, 0x101c: 0x3ded, 0x101d: 0x3e05,
+	0x101e: 0x3e1d, 0x101f: 0x3e35, 0x1020: 0x3e4d, 0x1021: 0x3e65, 0x1022: 0x3e7d, 0x1023: 0x3e95,
+	0x1024: 0x3ead, 0x1025: 0x3ead, 0x1026: 0x3ec5, 0x1027: 0x3ec5, 0x1028: 0x3edd, 0x1029: 0x3edd,
+	0x102a: 0x3ef5, 0x102b: 0x3f0d, 0x102c: 0x3f25, 0x102d: 0x3f3d, 0x102e: 0x3f55, 0x102f: 0x3f55,
+	0x1030: 0x3f6d, 0x1031: 0x3f6d, 0x1032: 0x3f6d, 0x1033: 0x3f85, 0x1034: 0x3f9d, 0x1035: 0x3fb5,
+	0x1036: 0x3fcd, 0x1037: 0x3fb5, 0x1038: 0x3fe5, 0x1039: 0x3ffd, 0x103a: 0x3f85, 0x103b: 0x4015,
+	0x103c: 0x402d, 0x103d: 0x402d, 0x103e: 0x402d, 0x103f: 0x0d11,
+	// Block 0x41, offset 0x1040
+	0x1040: 0x10f9, 0x1041: 0x1101, 0x1042: 0x40a5, 0x1043: 0x1109, 0x1044: 0x1111, 0x1045: 0x1119,
+	0x1046: 0x1121, 0x1047: 0x1129, 0x1048: 0x40c5, 0x1049: 0x1131, 0x104a: 0x1139, 0x104b: 0x1141,
+	0x104c: 0x40e5, 0x104d: 0x40e5, 0x104e: 0x1149, 0x104f: 0x1151, 0x1050: 0x1159, 0x1051: 0x4105,
+	0x1052: 0x4125, 0x1053: 0x4145, 0x1054: 0x4165, 0x1055: 0x4185, 0x1056: 0x1161, 0x1057: 0x1169,
+	0x1058: 0x1171, 0x1059: 0x1179, 0x105a: 0x1181, 0x105b: 0x41a5, 0x105c: 0x1189, 0x105d: 0x1191,
+	0x105e: 0x1199, 0x105f: 0x41c5, 0x1060: 0x41e5, 0x1061: 0x11a1, 0x1062: 0x4205, 0x1063: 0x4225,
+	0x1064: 0x4245, 0x1065: 0x11a9, 0x1066: 0x4265, 0x1067: 0x11b1, 0x1068: 0x11b9, 0x1069: 0x10f9,
+	0x106a: 0x4285, 0x106b: 0x42a5, 0x106c: 0x42c5, 0x106d: 0x42e5, 0x106e: 0x11c1, 0x106f: 0x11c9,
+	0x1070: 0x11d1, 0x1071: 0x11d9, 0x1072: 0x4305, 0x1073: 0x11e1, 0x1074: 0x11e9, 0x1075: 0x11f1,
+	0x1076: 0x4325, 0x1077: 0x11f9, 0x1078: 0x1201, 0x1079: 0x11f9, 0x107a: 0x1209, 0x107b: 0x1211,
+	0x107c: 0x4345, 0x107d: 0x1219, 0x107e: 0x1221, 0x107f: 0x1219,
+	// Block 0x42, offset 0x1080
+	0x1080: 0x4365, 0x1081: 0x4385, 0x1082: 0x0040, 0x1083: 0x1229, 0x1084: 0x1231, 0x1085: 0x1239,
+	0x1086: 0x1241, 0x1087: 0x0040, 0x1088: 0x1249, 0x1089: 0x1251, 0x108a: 0x1259, 0x108b: 0x1261,
+	0x108c: 0x1269, 0x108d: 0x1271, 0x108e: 0x1199, 0x108f: 0x1279, 0x1090: 0x1281, 0x1091: 0x1289,
+	0x1092: 0x43a5, 0x1093: 0x1291, 0x1094: 0x1121, 0x1095: 0x43c5, 0x1096: 0x43e5, 0x1097: 0x1299,
+	0x1098: 0x0040, 0x1099: 0x4405, 0x109a: 0x12a1, 0x109b: 0x12a9, 0x109c: 0x12b1, 0x109d: 0x12b9,
+	0x109e: 0x12c1, 0x109f: 0x12c9, 0x10a0: 0x12d1, 0x10a1: 0x12d9, 0x10a2: 0x12e1, 0x10a3: 0x12e9,
+	0x10a4: 0x12f1, 0x10a5: 0x12f9, 0x10a6: 0x1301, 0x10a7: 0x1309, 0x10a8: 0x1311, 0x10a9: 0x1319,
+	0x10aa: 0x1321, 0x10ab: 0x1329, 0x10ac: 0x1331, 0x10ad: 0x1339, 0x10ae: 0x1341, 0x10af: 0x1349,
+	0x10b0: 0x1351, 0x10b1: 0x1359, 0x10b2: 0x1361, 0x10b3: 0x1369, 0x10b4: 0x1371, 0x10b5: 0x1379,
+	0x10b6: 0x1381, 0x10b7: 0x1389, 0x10b8: 0x1391, 0x10b9: 0x1399, 0x10ba: 0x13a1, 0x10bb: 0x13a9,
+	0x10bc: 0x13b1, 0x10bd: 0x13b9, 0x10be: 0x13c1, 0x10bf: 0x4425,
+	// Block 0x43, offset 0x10c0
+	0x10c0: 0xe00d, 0x10c1: 0x0008, 0x10c2: 0xe00d, 0x10c3: 0x0008, 0x10c4: 0xe00d, 0x10c5: 0x0008,
+	0x10c6: 0xe00d, 0x10c7: 0x0008, 0x10c8: 0xe00d, 0x10c9: 0x0008, 0x10ca: 0xe00d, 0x10cb: 0x0008,
+	0x10cc: 0xe00d, 0x10cd: 0x0008, 0x10ce: 0xe00d, 0x10cf: 0x0008, 0x10d0: 0xe00d, 0x10d1: 0x0008,
+	0x10d2: 0xe00d, 0x10d3: 0x0008, 0x10d4: 0xe00d, 0x10d5: 0x0008, 0x10d6: 0xe00d, 0x10d7: 0x0008,
+	0x10d8: 0xe00d, 0x10d9: 0x0008, 0x10da: 0xe00d, 0x10db: 0x0008, 0x10dc: 0xe00d, 0x10dd: 0x0008,
+	0x10de: 0xe00d, 0x10df: 0x0008, 0x10e0: 0xe00d, 0x10e1: 0x0008, 0x10e2: 0xe00d, 0x10e3: 0x0008,
+	0x10e4: 0xe00d, 0x10e5: 0x0008, 0x10e6: 0xe00d, 0x10e7: 0x0008, 0x10e8: 0xe00d, 0x10e9: 0x0008,
+	0x10ea: 0xe00d, 0x10eb: 0x0008, 0x10ec: 0xe00d, 0x10ed: 0x0008, 0x10ee: 0x0008, 0x10ef: 0x3308,
+	0x10f0: 0x3318, 0x10f1: 0x3318, 0x10f2: 0x3318, 0x10f3: 0x0018, 0x10f4: 0x3308, 0x10f5: 0x3308,
+	0x10f6: 0x3308, 0x10f7: 0x3308, 0x10f8: 0x3308, 0x10f9: 0x3308, 0x10fa: 0x3308, 0x10fb: 0x3308,
+	0x10fc: 0x3308, 0x10fd: 0x3308, 0x10fe: 0x0018, 0x10ff: 0x0008,
+	// Block 0x44, offset 0x1100
+	0x1100: 0xe00d, 0x1101: 0x0008, 0x1102: 0xe00d, 0x1103: 0x0008, 0x1104: 0xe00d, 0x1105: 0x0008,
+	0x1106: 0xe00d, 0x1107: 0x0008, 0x1108: 0xe00d, 0x1109: 0x0008, 0x110a: 0xe00d, 0x110b: 0x0008,
+	0x110c: 0xe00d, 0x110d: 0x0008, 0x110e: 0xe00d, 0x110f: 0x0008, 0x1110: 0xe00d, 0x1111: 0x0008,
+	0x1112: 0xe00d, 0x1113: 0x0008, 0x1114: 0xe00d, 0x1115: 0x0008, 0x1116: 0xe00d, 0x1117: 0x0008,
+	0x1118: 0xe00d, 0x1119: 0x0008, 0x111a: 0xe00d, 0x111b: 0x0008, 0x111c: 0x02d1, 0x111d: 0x13c9,
+	0x111e: 0x3308, 0x111f: 0x3308, 0x1120: 0x0008, 0x1121: 0x0008, 0x1122: 0x0008, 0x1123: 0x0008,
+	0x1124: 0x0008, 0x1125: 0x0008, 0x1126: 0x0008, 0x1127: 0x0008, 0x1128: 0x0008, 0x1129: 0x0008,
+	0x112a: 0x0008, 0x112b: 0x0008, 0x112c: 0x0008, 0x112d: 0x0008, 0x112e: 0x0008, 0x112f: 0x0008,
+	0x1130: 0x0008, 0x1131: 0x0008, 0x1132: 0x0008, 0x1133: 0x0008, 0x1134: 0x0008, 0x1135: 0x0008,
+	0x1136: 0x0008, 0x1137: 0x0008, 0x1138: 0x0008, 0x1139: 0x0008, 0x113a: 0x0008, 0x113b: 0x0008,
+	0x113c: 0x0008, 0x113d: 0x0008, 0x113e: 0x0008, 0x113f: 0x0008,
+	// Block 0x45, offset 0x1140
+	0x1140: 0x0018, 0x1141: 0x0018, 0x1142: 0x0018, 0x1143: 0x0018, 0x1144: 0x0018, 0x1145: 0x0018,
+	0x1146: 0x0018, 0x1147: 0x0018, 0x1148: 0x0018, 0x1149: 0x0018, 0x114a: 0x0018, 0x114b: 0x0018,
+	0x114c: 0x0018, 0x114d: 0x0018, 0x114e: 0x0018, 0x114f: 0x0018, 0x1150: 0x0018, 0x1151: 0x0018,
+	0x1152: 0x0018, 0x1153: 0x0018, 0x1154: 0x0018, 0x1155: 0x0018, 0x1156: 0x0018, 0x1157: 0x0008,
+	0x1158: 0x0008, 0x1159: 0x0008, 0x115a: 0x0008, 0x115b: 0x0008, 0x115c: 0x0008, 0x115d: 0x0008,
+	0x115e: 0x0008, 0x115f: 0x0008, 0x1160: 0x0018, 0x1161: 0x0018, 0x1162: 0xe00d, 0x1163: 0x0008,
+	0x1164: 0xe00d, 0x1165: 0x0008, 0x1166: 0xe00d, 0x1167: 0x0008, 0x1168: 0xe00d, 0x1169: 0x0008,
+	0x116a: 0xe00d, 0x116b: 0x0008, 0x116c: 0xe00d, 0x116d: 0x0008, 0x116e: 0xe00d, 0x116f: 0x0008,
+	0x1170: 0x0008, 0x1171: 0x0008, 0x1172: 0xe00d, 0x1173: 0x0008, 0x1174: 0xe00d, 0x1175: 0x0008,
+	0x1176: 0xe00d, 0x1177: 0x0008, 0x1178: 0xe00d, 0x1179: 0x0008, 0x117a: 0xe00d, 0x117b: 0x0008,
+	0x117c: 0xe00d, 0x117d: 0x0008, 0x117e: 0xe00d, 0x117f: 0x0008,
+	// Block 0x46, offset 0x1180
+	0x1180: 0xe00d, 0x1181: 0x0008, 0x1182: 0xe00d, 0x1183: 0x0008, 0x1184: 0xe00d, 0x1185: 0x0008,
+	0x1186: 0xe00d, 0x1187: 0x0008, 0x1188: 0xe00d, 0x1189: 0x0008, 0x118a: 0xe00d, 0x118b: 0x0008,
+	0x118c: 0xe00d, 0x118d: 0x0008, 0x118e: 0xe00d, 0x118f: 0x0008, 0x1190: 0xe00d, 0x1191: 0x0008,
+	0x1192: 0xe00d, 0x1193: 0x0008, 0x1194: 0xe00d, 0x1195: 0x0008, 0x1196: 0xe00d, 0x1197: 0x0008,
+	0x1198: 0xe00d, 0x1199: 0x0008, 0x119a: 0xe00d, 0x119b: 0x0008, 0x119c: 0xe00d, 0x119d: 0x0008,
+	0x119e: 0xe00d, 0x119f: 0x0008, 0x11a0: 0xe00d, 0x11a1: 0x0008, 0x11a2: 0xe00d, 0x11a3: 0x0008,
+	0x11a4: 0xe00d, 0x11a5: 0x0008, 0x11a6: 0xe00d, 0x11a7: 0x0008, 0x11a8: 0xe00d, 0x11a9: 0x0008,
+	0x11aa: 0xe00d, 0x11ab: 0x0008, 0x11ac: 0xe00d, 0x11ad: 0x0008, 0x11ae: 0xe00d, 0x11af: 0x0008,
+	0x11b0: 0xe0fd, 0x11b1: 0x0008, 0x11b2: 0x0008, 0x11b3: 0x0008, 0x11b4: 0x0008, 0x11b5: 0x0008,
+	0x11b6: 0x0008, 0x11b7: 0x0008, 0x11b8: 0x0008, 0x11b9: 0xe01d, 0x11ba: 0x0008, 0x11bb: 0xe03d,
+	0x11bc: 0x0008, 0x11bd: 0x4445, 0x11be: 0xe00d, 0x11bf: 0x0008,
+	// Block 0x47, offset 0x11c0
+	0x11c0: 0xe00d, 0x11c1: 0x0008, 0x11c2: 0xe00d, 0x11c3: 0x0008, 0x11c4: 0xe00d, 0x11c5: 0x0008,
+	0x11c6: 0xe00d, 0x11c7: 0x0008, 0x11c8: 0x0008, 0x11c9: 0x0018, 0x11ca: 0x0018, 0x11cb: 0xe03d,
+	0x11cc: 0x0008, 0x11cd: 0x0409, 0x11ce: 0x0008, 0x11cf: 0x0008, 0x11d0: 0xe00d, 0x11d1: 0x0008,
+	0x11d2: 0xe00d, 0x11d3: 0x0008, 0x11d4: 0x0008, 0x11d5: 0x0008, 0x11d6: 0xe00d, 0x11d7: 0x0008,
+	0x11d8: 0xe00d, 0x11d9: 0x0008, 0x11da: 0xe00d, 0x11db: 0x0008, 0x11dc: 0xe00d, 0x11dd: 0x0008,
+	0x11de: 0xe00d, 0x11df: 0x0008, 0x11e0: 0xe00d, 0x11e1: 0x0008, 0x11e2: 0xe00d, 0x11e3: 0x0008,
+	0x11e4: 0xe00d, 0x11e5: 0x0008, 0x11e6: 0xe00d, 0x11e7: 0x0008, 0x11e8: 0xe00d, 0x11e9: 0x0008,
+	0x11ea: 0x13d1, 0x11eb: 0x0371, 0x11ec: 0x0401, 0x11ed: 0x13d9, 0x11ee: 0x0421, 0x11ef: 0x0008,
+	0x11f0: 0x13e1, 0x11f1: 0x13e9, 0x11f2: 0x0429, 0x11f3: 0x4465, 0x11f4: 0xe00d, 0x11f5: 0x0008,
+	0x11f6: 0xe00d, 0x11f7: 0x0008, 0x11f8: 0xe00d, 0x11f9: 0x0008, 0x11fa: 0xe00d, 0x11fb: 0x0008,
+	0x11fc: 0xe00d, 0x11fd: 0x0008, 0x11fe: 0xe00d, 0x11ff: 0x0008,
+	// Block 0x48, offset 0x1200
+	0x1200: 0xe00d, 0x1201: 0x0008, 0x1202: 0xe00d, 0x1203: 0x0008, 0x1204: 0x03f5, 0x1205: 0x0479,
+	0x1206: 0x447d, 0x1207: 0xe07d, 0x1208: 0x0008, 0x1209: 0xe01d, 0x120a: 0x0008, 0x120b: 0x0040,
+	0x120c: 0x0040, 0x120d: 0x0040, 0x120e: 0x0040, 0x120f: 0x0040, 0x1210: 0xe00d, 0x1211: 0x0008,
+	0x1212: 0x0040, 0x1213: 0x0008, 0x1214: 0x0040, 0x1215: 0x0008, 0x1216: 0xe00d, 0x1217: 0x0008,
+	0x1218: 0xe00d, 0x1219: 0x0008, 0x121a: 0x0040, 0x121b: 0x0040, 0x121c: 0x0040, 0x121d: 0x0040,
+	0x121e: 0x0040, 0x121f: 0x0040, 0x1220: 0x0040, 0x1221: 0x0040, 0x1222: 0x0040, 0x1223: 0x0040,
+	0x1224: 0x0040, 0x1225: 0x0040, 0x1226: 0x0040, 0x1227: 0x0040, 0x1228: 0x0040, 0x1229: 0x0040,
+	0x122a: 0x0040, 0x122b: 0x0040, 0x122c: 0x0040, 0x122d: 0x0040, 0x122e: 0x0040, 0x122f: 0x0040,
+	0x1230: 0x0040, 0x1231: 0x0040, 0x1232: 0x03d9, 0x1233: 0x03f1, 0x1234: 0x0751, 0x1235: 0xe01d,
+	0x1236: 0x0008, 0x1237: 0x0008, 0x1238: 0x0741, 0x1239: 0x13f1, 0x123a: 0x0008, 0x123b: 0x0008,
+	0x123c: 0x0008, 0x123d: 0x0008, 0x123e: 0x0008, 0x123f: 0x0008,
+	// Block 0x49, offset 0x1240
+	0x1240: 0x650d, 0x1241: 0x652d, 0x1242: 0x654d, 0x1243: 0x656d, 0x1244: 0x658d, 0x1245: 0x65ad,
+	0x1246: 0x65cd, 0x1247: 0x65ed, 0x1248: 0x660d, 0x1249: 0x662d, 0x124a: 0x664d, 0x124b: 0x666d,
+	0x124c: 0x668d, 0x124d: 0x66ad, 0x124e: 0x0008, 0x124f: 0x0008, 0x1250: 0x66cd, 0x1251: 0x0008,
+	0x1252: 0x66ed, 0x1253: 0x0008, 0x1254: 0x0008, 0x1255: 0x670d, 0x1256: 0x672d, 0x1257: 0x674d,
+	0x1258: 0x676d, 0x1259: 0x678d, 0x125a: 0x67ad, 0x125b: 0x67cd, 0x125c: 0x67ed, 0x125d: 0x680d,
+	0x125e: 0x682d, 0x125f: 0x0008, 0x1260: 0x684d, 0x1261: 0x0008, 0x1262: 0x686d, 0x1263: 0x0008,
+	0x1264: 0x0008, 0x1265: 0x688d, 0x1266: 0x68ad, 0x1267: 0x0008, 0x1268: 0x0008, 0x1269: 0x0008,
+	0x126a: 0x68cd, 0x126b: 0x68ed, 0x126c: 0x690d, 0x126d: 0x692d, 0x126e: 0x694d, 0x126f: 0x696d,
+	0x1270: 0x698d, 0x1271: 0x69ad, 0x1272: 0x69cd, 0x1273: 0x69ed, 0x1274: 0x6a0d, 0x1275: 0x6a2d,
+	0x1276: 0x6a4d, 0x1277: 0x6a6d, 0x1278: 0x6a8d, 0x1279: 0x6aad, 0x127a: 0x6acd, 0x127b: 0x6aed,
+	0x127c: 0x6b0d, 0x127d: 0x6b2d, 0x127e: 0x6b4d, 0x127f: 0x6b6d,
+	// Block 0x4a, offset 0x1280
+	0x1280: 0x7acd, 0x1281: 0x7aed, 0x1282: 0x7b0d, 0x1283: 0x7b2d, 0x1284: 0x7b4d, 0x1285: 0x7b6d,
+	0x1286: 0x7b8d, 0x1287: 0x7bad, 0x1288: 0x7bcd, 0x1289: 0x7bed, 0x128a: 0x7c0d, 0x128b: 0x7c2d,
+	0x128c: 0x7c4d, 0x128d: 0x7c6d, 0x128e: 0x7c8d, 0x128f: 0x1409, 0x1290: 0x1411, 0x1291: 0x1419,
+	0x1292: 0x7cad, 0x1293: 0x7ccd, 0x1294: 0x7ced, 0x1295: 0x1421, 0x1296: 0x1429, 0x1297: 0x1431,
+	0x1298: 0x7d0d, 0x1299: 0x7d2d, 0x129a: 0x0040, 0x129b: 0x0040, 0x129c: 0x0040, 0x129d: 0x0040,
+	0x129e: 0x0040, 0x129f: 0x0040, 0x12a0: 0x0040, 0x12a1: 0x0040, 0x12a2: 0x0040, 0x12a3: 0x0040,
+	0x12a4: 0x0040, 0x12a5: 0x0040, 0x12a6: 0x0040, 0x12a7: 0x0040, 0x12a8: 0x0040, 0x12a9: 0x0040,
+	0x12aa: 0x0040, 0x12ab: 0x0040, 0x12ac: 0x0040, 0x12ad: 0x0040, 0x12ae: 0x0040, 0x12af: 0x0040,
+	0x12b0: 0x0040, 0x12b1: 0x0040, 0x12b2: 0x0040, 0x12b3: 0x0040, 0x12b4: 0x0040, 0x12b5: 0x0040,
+	0x12b6: 0x0040, 0x12b7: 0x0040, 0x12b8: 0x0040, 0x12b9: 0x0040, 0x12ba: 0x0040, 0x12bb: 0x0040,
+	0x12bc: 0x0040, 0x12bd: 0x0040, 0x12be: 0x0040, 0x12bf: 0x0040,
+	// Block 0x4b, offset 0x12c0
+	0x12c0: 0x1439, 0x12c1: 0x1441, 0x12c2: 0x1449, 0x12c3: 0x7d4d, 0x12c4: 0x7d6d, 0x12c5: 0x1451,
+	0x12c6: 0x1451, 0x12c7: 0x0040, 0x12c8: 0x0040, 0x12c9: 0x0040, 0x12ca: 0x0040, 0x12cb: 0x0040,
+	0x12cc: 0x0040, 0x12cd: 0x0040, 0x12ce: 0x0040, 0x12cf: 0x0040, 0x12d0: 0x0040, 0x12d1: 0x0040,
+	0x12d2: 0x0040, 0x12d3: 0x1459, 0x12d4: 0x1461, 0x12d5: 0x1469, 0x12d6: 0x1471, 0x12d7: 0x1479,
+	0x12d8: 0x0040, 0x12d9: 0x0040, 0x12da: 0x0040, 0x12db: 0x0040, 0x12dc: 0x0040, 0x12dd: 0x1481,
+	0x12de: 0x3308, 0x12df: 0x1489, 0x12e0: 0x1491, 0x12e1: 0x0779, 0x12e2: 0x0791, 0x12e3: 0x1499,
+	0x12e4: 0x14a1, 0x12e5: 0x14a9, 0x12e6: 0x14b1, 0x12e7: 0x14b9, 0x12e8: 0x14c1, 0x12e9: 0x071a,
+	0x12ea: 0x14c9, 0x12eb: 0x14d1, 0x12ec: 0x14d9, 0x12ed: 0x14e1, 0x12ee: 0x14e9, 0x12ef: 0x14f1,
+	0x12f0: 0x14f9, 0x12f1: 0x1501, 0x12f2: 0x1509, 0x12f3: 0x1511, 0x12f4: 0x1519, 0x12f5: 0x1521,
+	0x12f6: 0x1529, 0x12f7: 0x0040, 0x12f8: 0x1531, 0x12f9: 0x1539, 0x12fa: 0x1541, 0x12fb: 0x1549,
+	0x12fc: 0x1551, 0x12fd: 0x0040, 0x12fe: 0x1559, 0x12ff: 0x0040,
+	// Block 0x4c, offset 0x1300
+	0x1300: 0x1561, 0x1301: 0x1569, 0x1302: 0x0040, 0x1303: 0x1571, 0x1304: 0x1579, 0x1305: 0x0040,
+	0x1306: 0x1581, 0x1307: 0x1589, 0x1308: 0x1591, 0x1309: 0x1599, 0x130a: 0x15a1, 0x130b: 0x15a9,
+	0x130c: 0x15b1, 0x130d: 0x15b9, 0x130e: 0x15c1, 0x130f: 0x15c9, 0x1310: 0x15d1, 0x1311: 0x15d1,
+	0x1312: 0x15d9, 0x1313: 0x15d9, 0x1314: 0x15d9, 0x1315: 0x15d9, 0x1316: 0x15e1, 0x1317: 0x15e1,
+	0x1318: 0x15e1, 0x1319: 0x15e1, 0x131a: 0x15e9, 0x131b: 0x15e9, 0x131c: 0x15e9, 0x131d: 0x15e9,
+	0x131e: 0x15f1, 0x131f: 0x15f1, 0x1320: 0x15f1, 0x1321: 0x15f1, 0x1322: 0x15f9, 0x1323: 0x15f9,
+	0x1324: 0x15f9, 0x1325: 0x15f9, 0x1326: 0x1601, 0x1327: 0x1601, 0x1328: 0x1601, 0x1329: 0x1601,
+	0x132a: 0x1609, 0x132b: 0x1609, 0x132c: 0x1609, 0x132d: 0x1609, 0x132e: 0x1611, 0x132f: 0x1611,
+	0x1330: 0x1611, 0x1331: 0x1611, 0x1332: 0x1619, 0x1333: 0x1619, 0x1334: 0x1619, 0x1335: 0x1619,
+	0x1336: 0x1621, 0x1337: 0x1621, 0x1338: 0x1621, 0x1339: 0x1621, 0x133a: 0x1629, 0x133b: 0x1629,
+	0x133c: 0x1629, 0x133d: 0x1629, 0x133e: 0x1631, 0x133f: 0x1631,
+	// Block 0x4d, offset 0x1340
+	0x1340: 0x1631, 0x1341: 0x1631, 0x1342: 0x1639, 0x1343: 0x1639, 0x1344: 0x1641, 0x1345: 0x1641,
+	0x1346: 0x1649, 0x1347: 0x1649, 0x1348: 0x1651, 0x1349: 0x1651, 0x134a: 0x1659, 0x134b: 0x1659,
+	0x134c: 0x1661, 0x134d: 0x1661, 0x134e: 0x1669, 0x134f: 0x1669, 0x1350: 0x1669, 0x1351: 0x1669,
+	0x1352: 0x1671, 0x1353: 0x1671, 0x1354: 0x1671, 0x1355: 0x1671, 0x1356: 0x1679, 0x1357: 0x1679,
+	0x1358: 0x1679, 0x1359: 0x1679, 0x135a: 0x1681, 0x135b: 0x1681, 0x135c: 0x1681, 0x135d: 0x1681,
+	0x135e: 0x1689, 0x135f: 0x1689, 0x1360: 0x1691, 0x1361: 0x1691, 0x1362: 0x1691, 0x1363: 0x1691,
+	0x1364: 0x1699, 0x1365: 0x1699, 0x1366: 0x16a1, 0x1367: 0x16a1, 0x1368: 0x16a1, 0x1369: 0x16a1,
+	0x136a: 0x16a9, 0x136b: 0x16a9, 0x136c: 0x16a9, 0x136d: 0x16a9, 0x136e: 0x16b1, 0x136f: 0x16b1,
+	0x1370: 0x16b9, 0x1371: 0x16b9, 0x1372: 0x0818, 0x1373: 0x0818, 0x1374: 0x0818, 0x1375: 0x0818,
+	0x1376: 0x0818, 0x1377: 0x0818, 0x1378: 0x0818, 0x1379: 0x0818, 0x137a: 0x0818, 0x137b: 0x0818,
+	0x137c: 0x0818, 0x137d: 0x0818, 0x137e: 0x0818, 0x137f: 0x0818,
+	// Block 0x4e, offset 0x1380
+	0x1380: 0x0818, 0x1381: 0x0818, 0x1382: 0x0818, 0x1383: 0x0040, 0x1384: 0x0040, 0x1385: 0x0040,
+	0x1386: 0x0040, 0x1387: 0x0040, 0x1388: 0x0040, 0x1389: 0x0040, 0x138a: 0x0040, 0x138b: 0x0040,
+	0x138c: 0x0040, 0x138d: 0x0040, 0x138e: 0x0040, 0x138f: 0x0040, 0x1390: 0x0040, 0x1391: 0x0040,
+	0x1392: 0x0040, 0x1393: 0x16c1, 0x1394: 0x16c1, 0x1395: 0x16c1, 0x1396: 0x16c1, 0x1397: 0x16c9,
+	0x1398: 0x16c9, 0x1399: 0x16d1, 0x139a: 0x16d1, 0x139b: 0x16d9, 0x139c: 0x16d9, 0x139d: 0x0149,
+	0x139e: 0x16e1, 0x139f: 0x16e1, 0x13a0: 0x16e9, 0x13a1: 0x16e9, 0x13a2: 0x16f1, 0x13a3: 0x16f1,
+	0x13a4: 0x16f9, 0x13a5: 0x16f9, 0x13a6: 0x16f9, 0x13a7: 0x16f9, 0x13a8: 0x1701, 0x13a9: 0x1701,
+	0x13aa: 0x1709, 0x13ab: 0x1709, 0x13ac: 0x1711, 0x13ad: 0x1711, 0x13ae: 0x1719, 0x13af: 0x1719,
+	0x13b0: 0x1721, 0x13b1: 0x1721, 0x13b2: 0x1729, 0x13b3: 0x1729, 0x13b4: 0x1731, 0x13b5: 0x1731,
+	0x13b6: 0x1739, 0x13b7: 0x1739, 0x13b8: 0x1739, 0x13b9: 0x1741, 0x13ba: 0x1741, 0x13bb: 0x1741,
+	0x13bc: 0x1749, 0x13bd: 0x1749, 0x13be: 0x1749, 0x13bf: 0x1749,
+	// Block 0x4f, offset 0x13c0
+	0x13c0: 0x1949, 0x13c1: 0x1951, 0x13c2: 0x1959, 0x13c3: 0x1961, 0x13c4: 0x1969, 0x13c5: 0x1971,
+	0x13c6: 0x1979, 0x13c7: 0x1981, 0x13c8: 0x1989, 0x13c9: 0x1991, 0x13ca: 0x1999, 0x13cb: 0x19a1,
+	0x13cc: 0x19a9, 0x13cd: 0x19b1, 0x13ce: 0x19b9, 0x13cf: 0x19c1, 0x13d0: 0x19c9, 0x13d1: 0x19d1,
+	0x13d2: 0x19d9, 0x13d3: 0x19e1, 0x13d4: 0x19e9, 0x13d5: 0x19f1, 0x13d6: 0x19f9, 0x13d7: 0x1a01,
+	0x13d8: 0x1a09, 0x13d9: 0x1a11, 0x13da: 0x1a19, 0x13db: 0x1a21, 0x13dc: 0x1a29, 0x13dd: 0x1a31,
+	0x13de: 0x1a3a, 0x13df: 0x1a42, 0x13e0: 0x1a4a, 0x13e1: 0x1a52, 0x13e2: 0x1a5a, 0x13e3: 0x1a62,
+	0x13e4: 0x1a69, 0x13e5: 0x1a71, 0x13e6: 0x1761, 0x13e7: 0x1a79, 0x13e8: 0x1741, 0x13e9: 0x1769,
+	0x13ea: 0x1a81, 0x13eb: 0x1a89, 0x13ec: 0x1789, 0x13ed: 0x1a91, 0x13ee: 0x1791, 0x13ef: 0x1799,
+	0x13f0: 0x1a99, 0x13f1: 0x1aa1, 0x13f2: 0x17b9, 0x13f3: 0x1aa9, 0x13f4: 0x17c1, 0x13f5: 0x17c9,
+	0x13f6: 0x1ab1, 0x13f7: 0x1ab9, 0x13f8: 0x17d9, 0x13f9: 0x1ac1, 0x13fa: 0x17e1, 0x13fb: 0x17e9,
+	0x13fc: 0x18d1, 0x13fd: 0x18d9, 0x13fe: 0x18f1, 0x13ff: 0x18f9,
+	// Block 0x50, offset 0x1400
+	0x1400: 0x1901, 0x1401: 0x1921, 0x1402: 0x1929, 0x1403: 0x1931, 0x1404: 0x1939, 0x1405: 0x1959,
+	0x1406: 0x1961, 0x1407: 0x1969, 0x1408: 0x1ac9, 0x1409: 0x1989, 0x140a: 0x1ad1, 0x140b: 0x1ad9,
+	0x140c: 0x19b9, 0x140d: 0x1ae1, 0x140e: 0x19c1, 0x140f: 0x19c9, 0x1410: 0x1a31, 0x1411: 0x1ae9,
+	0x1412: 0x1af1, 0x1413: 0x1a09, 0x1414: 0x1af9, 0x1415: 0x1a11, 0x1416: 0x1a19, 0x1417: 0x1751,
+	0x1418: 0x1759, 0x1419: 0x1b01, 0x141a: 0x1761, 0x141b: 0x1b09, 0x141c: 0x1771, 0x141d: 0x1779,
+	0x141e: 0x1781, 0x141f: 0x1789, 0x1420: 0x1b11, 0x1421: 0x17a1, 0x1422: 0x17a9, 0x1423: 0x17b1,
+	0x1424: 0x17b9, 0x1425: 0x1b19, 0x1426: 0x17d9, 0x1427: 0x17f1, 0x1428: 0x17f9, 0x1429: 0x1801,
+	0x142a: 0x1809, 0x142b: 0x1811, 0x142c: 0x1821, 0x142d: 0x1829, 0x142e: 0x1831, 0x142f: 0x1839,
+	0x1430: 0x1841, 0x1431: 0x1849, 0x1432: 0x1b21, 0x1433: 0x1851, 0x1434: 0x1859, 0x1435: 0x1861,
+	0x1436: 0x1869, 0x1437: 0x1871, 0x1438: 0x1879, 0x1439: 0x1889, 0x143a: 0x1891, 0x143b: 0x1899,
+	0x143c: 0x18a1, 0x143d: 0x18a9, 0x143e: 0x18b1, 0x143f: 0x18b9,
+	// Block 0x51, offset 0x1440
+	0x1440: 0x18c1, 0x1441: 0x18c9, 0x1442: 0x18e1, 0x1443: 0x18e9, 0x1444: 0x1909, 0x1445: 0x1911,
+	0x1446: 0x1919, 0x1447: 0x1921, 0x1448: 0x1929, 0x1449: 0x1941, 0x144a: 0x1949, 0x144b: 0x1951,
+	0x144c: 0x1959, 0x144d: 0x1b29, 0x144e: 0x1971, 0x144f: 0x1979, 0x1450: 0x1981, 0x1451: 0x1989,
+	0x1452: 0x19a1, 0x1453: 0x19a9, 0x1454: 0x19b1, 0x1455: 0x19b9, 0x1456: 0x1b31, 0x1457: 0x19d1,
+	0x1458: 0x19d9, 0x1459: 0x1b39, 0x145a: 0x19f1, 0x145b: 0x19f9, 0x145c: 0x1a01, 0x145d: 0x1a09,
+	0x145e: 0x1b41, 0x145f: 0x1761, 0x1460: 0x1b09, 0x1461: 0x1789, 0x1462: 0x1b11, 0x1463: 0x17b9,
+	0x1464: 0x1b19, 0x1465: 0x17d9, 0x1466: 0x1b49, 0x1467: 0x1841, 0x1468: 0x1b51, 0x1469: 0x1b59,
+	0x146a: 0x1b61, 0x146b: 0x1921, 0x146c: 0x1929, 0x146d: 0x1959, 0x146e: 0x19b9, 0x146f: 0x1b31,
+	0x1470: 0x1a09, 0x1471: 0x1b41, 0x1472: 0x1b69, 0x1473: 0x1b71, 0x1474: 0x1b79, 0x1475: 0x1b81,
+	0x1476: 0x1b89, 0x1477: 0x1b91, 0x1478: 0x1b99, 0x1479: 0x1ba1, 0x147a: 0x1ba9, 0x147b: 0x1bb1,
+	0x147c: 0x1bb9, 0x147d: 0x1bc1, 0x147e: 0x1bc9, 0x147f: 0x1bd1,
+	// Block 0x52, offset 0x1480
+	0x1480: 0x1bd9, 0x1481: 0x1be1, 0x1482: 0x1be9, 0x1483: 0x1bf1, 0x1484: 0x1bf9, 0x1485: 0x1c01,
+	0x1486: 0x1c09, 0x1487: 0x1c11, 0x1488: 0x1c19, 0x1489: 0x1c21, 0x148a: 0x1c29, 0x148b: 0x1c31,
+	0x148c: 0x1b59, 0x148d: 0x1c39, 0x148e: 0x1c41, 0x148f: 0x1c49, 0x1490: 0x1c51, 0x1491: 0x1b81,
+	0x1492: 0x1b89, 0x1493: 0x1b91, 0x1494: 0x1b99, 0x1495: 0x1ba1, 0x1496: 0x1ba9, 0x1497: 0x1bb1,
+	0x1498: 0x1bb9, 0x1499: 0x1bc1, 0x149a: 0x1bc9, 0x149b: 0x1bd1, 0x149c: 0x1bd9, 0x149d: 0x1be1,
+	0x149e: 0x1be9, 0x149f: 0x1bf1, 0x14a0: 0x1bf9, 0x14a1: 0x1c01, 0x14a2: 0x1c09, 0x14a3: 0x1c11,
+	0x14a4: 0x1c19, 0x14a5: 0x1c21, 0x14a6: 0x1c29, 0x14a7: 0x1c31, 0x14a8: 0x1b59, 0x14a9: 0x1c39,
+	0x14aa: 0x1c41, 0x14ab: 0x1c49, 0x14ac: 0x1c51, 0x14ad: 0x1c21, 0x14ae: 0x1c29, 0x14af: 0x1c31,
+	0x14b0: 0x1b59, 0x14b1: 0x1b51, 0x14b2: 0x1b61, 0x14b3: 0x1881, 0x14b4: 0x1829, 0x14b5: 0x1831,
+	0x14b6: 0x1839, 0x14b7: 0x1c21, 0x14b8: 0x1c29, 0x14b9: 0x1c31, 0x14ba: 0x1881, 0x14bb: 0x1889,
+	0x14bc: 0x1c59, 0x14bd: 0x1c59, 0x14be: 0x0018, 0x14bf: 0x0018,
+	// Block 0x53, offset 0x14c0
+	0x14c0: 0x0018, 0x14c1: 0x0018, 0x14c2: 0x0018, 0x14c3: 0x0018, 0x14c4: 0x0018, 0x14c5: 0x0018,
+	0x14c6: 0x0018, 0x14c7: 0x0018, 0x14c8: 0x0018, 0x14c9: 0x0018, 0x14ca: 0x0018, 0x14cb: 0x0018,
+	0x14cc: 0x0018, 0x14cd: 0x0018, 0x14ce: 0x0018, 0x14cf: 0x0018, 0x14d0: 0x1c61, 0x14d1: 0x1c69,
+	0x14d2: 0x1c69, 0x14d3: 0x1c71, 0x14d4: 0x1c79, 0x14d5: 0x1c81, 0x14d6: 0x1c89, 0x14d7: 0x1c91,
+	0x14d8: 0x1c99, 0x14d9: 0x1c99, 0x14da: 0x1ca1, 0x14db: 0x1ca9, 0x14dc: 0x1cb1, 0x14dd: 0x1cb9,
+	0x14de: 0x1cc1, 0x14df: 0x1cc9, 0x14e0: 0x1cc9, 0x14e1: 0x1cd1, 0x14e2: 0x1cd9, 0x14e3: 0x1cd9,
+	0x14e4: 0x1ce1, 0x14e5: 0x1ce1, 0x14e6: 0x1ce9, 0x14e7: 0x1cf1, 0x14e8: 0x1cf1, 0x14e9: 0x1cf9,
+	0x14ea: 0x1d01, 0x14eb: 0x1d01, 0x14ec: 0x1d09, 0x14ed: 0x1d09, 0x14ee: 0x1d11, 0x14ef: 0x1d19,
+	0x14f0: 0x1d19, 0x14f1: 0x1d21, 0x14f2: 0x1d21, 0x14f3: 0x1d29, 0x14f4: 0x1d31, 0x14f5: 0x1d39,
+	0x14f6: 0x1d41, 0x14f7: 0x1d41, 0x14f8: 0x1d49, 0x14f9: 0x1d51, 0x14fa: 0x1d59, 0x14fb: 0x1d61,
+	0x14fc: 0x1d69, 0x14fd: 0x1d69, 0x14fe: 0x1d71, 0x14ff: 0x1d79,
+	// Block 0x54, offset 0x1500
+	0x1500: 0x1f29, 0x1501: 0x1f31, 0x1502: 0x1f39, 0x1503: 0x1f11, 0x1504: 0x1d39, 0x1505: 0x1ce9,
+	0x1506: 0x1f41, 0x1507: 0x1f49, 0x1508: 0x0040, 0x1509: 0x0040, 0x150a: 0x0040, 0x150b: 0x0040,
+	0x150c: 0x0040, 0x150d: 0x0040, 0x150e: 0x0040, 0x150f: 0x0018, 0x1510: 0x0040, 0x1511: 0x0040,
+	0x1512: 0x0040, 0x1513: 0x0040, 0x1514: 0x0040, 0x1515: 0x0040, 0x1516: 0x0040, 0x1517: 0x0040,
+	0x1518: 0x0040, 0x1519: 0x0040, 0x151a: 0x0040, 0x151b: 0x0040, 0x151c: 0x0040, 0x151d: 0x0040,
+	0x151e: 0x0040, 0x151f: 0x0040, 0x1520: 0x0040, 0x1521: 0x0040, 0x1522: 0x0040, 0x1523: 0x0040,
+	0x1524: 0x0040, 0x1525: 0x0040, 0x1526: 0x0040, 0x1527: 0x0040, 0x1528: 0x0040, 0x1529: 0x0040,
+	0x152a: 0x0040, 0x152b: 0x0040, 0x152c: 0x0040, 0x152d: 0x0040, 0x152e: 0x0040, 0x152f: 0x0040,
+	0x1530: 0x1f51, 0x1531: 0x1f59, 0x1532: 0x1f61, 0x1533: 0x1f69, 0x1534: 0x1f71, 0x1535: 0x1f79,
+	0x1536: 0x1f81, 0x1537: 0x1f89, 0x1538: 0x1f91, 0x1539: 0x1f99, 0x153a: 0x1fa2, 0x153b: 0x1faa,
+	0x153c: 0x1fb1, 0x153d: 0x0018, 0x153e: 0x0018, 0x153f: 0x0018,
+	// Block 0x55, offset 0x1540
+	0x1540: 0x33c0, 0x1541: 0x33c0, 0x1542: 0x33c0, 0x1543: 0x33c0, 0x1544: 0x33c0, 0x1545: 0x33c0,
+	0x1546: 0x33c0, 0x1547: 0x33c0, 0x1548: 0x33c0, 0x1549: 0x33c0, 0x154a: 0x33c0, 0x154b: 0x33c0,
+	0x154c: 0x33c0, 0x154d: 0x33c0, 0x154e: 0x33c0, 0x154f: 0x33c0, 0x1550: 0x1fba, 0x1551: 0x7d8d,
+	0x1552: 0x0040, 0x1553: 0x1fc2, 0x1554: 0x0122, 0x1555: 0x1fca, 0x1556: 0x1fd2, 0x1557: 0x7dad,
+	0x1558: 0x7dcd, 0x1559: 0x0040, 0x155a: 0x0040, 0x155b: 0x0040, 0x155c: 0x0040, 0x155d: 0x0040,
+	0x155e: 0x0040, 0x155f: 0x0040, 0x1560: 0x3308, 0x1561: 0x3308, 0x1562: 0x3308, 0x1563: 0x3308,
+	0x1564: 0x3308, 0x1565: 0x3308, 0x1566: 0x3308, 0x1567: 0x3308, 0x1568: 0x3308, 0x1569: 0x3308,
+	0x156a: 0x3308, 0x156b: 0x3308, 0x156c: 0x3308, 0x156d: 0x3308, 0x156e: 0x3308, 0x156f: 0x3308,
+	0x1570: 0x0040, 0x1571: 0x7ded, 0x1572: 0x7e0d, 0x1573: 0x1fda, 0x1574: 0x1fda, 0x1575: 0x072a,
+	0x1576: 0x0732, 0x1577: 0x1fe2, 0x1578: 0x1fea, 0x1579: 0x7e2d, 0x157a: 0x7e4d, 0x157b: 0x7e6d,
+	0x157c: 0x7e2d, 0x157d: 0x7e8d, 0x157e: 0x7ead, 0x157f: 0x7e8d,
+	// Block 0x56, offset 0x1580
+	0x1580: 0x7ecd, 0x1581: 0x7eed, 0x1582: 0x7f0d, 0x1583: 0x7eed, 0x1584: 0x7f2d, 0x1585: 0x0018,
+	0x1586: 0x0018, 0x1587: 0x1ff2, 0x1588: 0x1ffa, 0x1589: 0x7f4e, 0x158a: 0x7f6e, 0x158b: 0x7f8e,
+	0x158c: 0x7fae, 0x158d: 0x1fda, 0x158e: 0x1fda, 0x158f: 0x1fda, 0x1590: 0x1fba, 0x1591: 0x7fcd,
+	0x1592: 0x0040, 0x1593: 0x0040, 0x1594: 0x0122, 0x1595: 0x1fc2, 0x1596: 0x1fd2, 0x1597: 0x1fca,
+	0x1598: 0x7fed, 0x1599: 0x072a, 0x159a: 0x0732, 0x159b: 0x1fe2, 0x159c: 0x1fea, 0x159d: 0x7ecd,
+	0x159e: 0x7f2d, 0x159f: 0x2002, 0x15a0: 0x200a, 0x15a1: 0x2012, 0x15a2: 0x071a, 0x15a3: 0x2019,
+	0x15a4: 0x2022, 0x15a5: 0x202a, 0x15a6: 0x0722, 0x15a7: 0x0040, 0x15a8: 0x2032, 0x15a9: 0x203a,
+	0x15aa: 0x2042, 0x15ab: 0x204a, 0x15ac: 0x0040, 0x15ad: 0x0040, 0x15ae: 0x0040, 0x15af: 0x0040,
+	0x15b0: 0x800e, 0x15b1: 0x2051, 0x15b2: 0x802e, 0x15b3: 0x0808, 0x15b4: 0x804e, 0x15b5: 0x0040,
+	0x15b6: 0x806e, 0x15b7: 0x2059, 0x15b8: 0x808e, 0x15b9: 0x2061, 0x15ba: 0x80ae, 0x15bb: 0x2069,
+	0x15bc: 0x80ce, 0x15bd: 0x2071, 0x15be: 0x80ee, 0x15bf: 0x2079,
+	// Block 0x57, offset 0x15c0
+	0x15c0: 0x2081, 0x15c1: 0x2089, 0x15c2: 0x2089, 0x15c3: 0x2091, 0x15c4: 0x2091, 0x15c5: 0x2099,
+	0x15c6: 0x2099, 0x15c7: 0x20a1, 0x15c8: 0x20a1, 0x15c9: 0x20a9, 0x15ca: 0x20a9, 0x15cb: 0x20a9,
+	0x15cc: 0x20a9, 0x15cd: 0x20b1, 0x15ce: 0x20b1, 0x15cf: 0x20b9, 0x15d0: 0x20b9, 0x15d1: 0x20b9,
+	0x15d2: 0x20b9, 0x15d3: 0x20c1, 0x15d4: 0x20c1, 0x15d5: 0x20c9, 0x15d6: 0x20c9, 0x15d7: 0x20c9,
+	0x15d8: 0x20c9, 0x15d9: 0x20d1, 0x15da: 0x20d1, 0x15db: 0x20d1, 0x15dc: 0x20d1, 0x15dd: 0x20d9,
+	0x15de: 0x20d9, 0x15df: 0x20d9, 0x15e0: 0x20d9, 0x15e1: 0x20e1, 0x15e2: 0x20e1, 0x15e3: 0x20e1,
+	0x15e4: 0x20e1, 0x15e5: 0x20e9, 0x15e6: 0x20e9, 0x15e7: 0x20e9, 0x15e8: 0x20e9, 0x15e9: 0x20f1,
+	0x15ea: 0x20f1, 0x15eb: 0x20f9, 0x15ec: 0x20f9, 0x15ed: 0x2101, 0x15ee: 0x2101, 0x15ef: 0x2109,
+	0x15f0: 0x2109, 0x15f1: 0x2111, 0x15f2: 0x2111, 0x15f3: 0x2111, 0x15f4: 0x2111, 0x15f5: 0x2119,
+	0x15f6: 0x2119, 0x15f7: 0x2119, 0x15f8: 0x2119, 0x15f9: 0x2121, 0x15fa: 0x2121, 0x15fb: 0x2121,
+	0x15fc: 0x2121, 0x15fd: 0x2129, 0x15fe: 0x2129, 0x15ff: 0x2129,
+	// Block 0x58, offset 0x1600
+	0x1600: 0x2129, 0x1601: 0x2131, 0x1602: 0x2131, 0x1603: 0x2131, 0x1604: 0x2131, 0x1605: 0x2139,
+	0x1606: 0x2139, 0x1607: 0x2139, 0x1608: 0x2139, 0x1609: 0x2141, 0x160a: 0x2141, 0x160b: 0x2141,
+	0x160c: 0x2141, 0x160d: 0x2149, 0x160e: 0x2149, 0x160f: 0x2149, 0x1610: 0x2149, 0x1611: 0x2151,
+	0x1612: 0x2151, 0x1613: 0x2151, 0x1614: 0x2151, 0x1615: 0x2159, 0x1616: 0x2159, 0x1617: 0x2159,
+	0x1618: 0x2159, 0x1619: 0x2161, 0x161a: 0x2161, 0x161b: 0x2161, 0x161c: 0x2161, 0x161d: 0x2169,
+	0x161e: 0x2169, 0x161f: 0x2169, 0x1620: 0x2169, 0x1621: 0x2171, 0x1622: 0x2171, 0x1623: 0x2171,
+	0x1624: 0x2171, 0x1625: 0x2179, 0x1626: 0x2179, 0x1627: 0x2179, 0x1628: 0x2179, 0x1629: 0x2181,
+	0x162a: 0x2181, 0x162b: 0x2181, 0x162c: 0x2181, 0x162d: 0x2189, 0x162e: 0x2189, 0x162f: 0x1701,
+	0x1630: 0x1701, 0x1631: 0x2191, 0x1632: 0x2191, 0x1633: 0x2191, 0x1634: 0x2191, 0x1635: 0x2199,
+	0x1636: 0x2199, 0x1637: 0x21a1, 0x1638: 0x21a1, 0x1639: 0x21a9, 0x163a: 0x21a9, 0x163b: 0x21b1,
+	0x163c: 0x21b1, 0x163d: 0x0040, 0x163e: 0x0040, 0x163f: 0x03c0,
+	// Block 0x59, offset 0x1640
+	0x1640: 0x0040, 0x1641: 0x1fca, 0x1642: 0x21ba, 0x1643: 0x2002, 0x1644: 0x203a, 0x1645: 0x2042,
+	0x1646: 0x200a, 0x1647: 0x21c2, 0x1648: 0x072a, 0x1649: 0x0732, 0x164a: 0x2012, 0x164b: 0x071a,
+	0x164c: 0x1fba, 0x164d: 0x2019, 0x164e: 0x0961, 0x164f: 0x21ca, 0x1650: 0x06e1, 0x1651: 0x0049,
+	0x1652: 0x0029, 0x1653: 0x0031, 0x1654: 0x06e9, 0x1655: 0x06f1, 0x1656: 0x06f9, 0x1657: 0x0701,
+	0x1658: 0x0709, 0x1659: 0x0711, 0x165a: 0x1fc2, 0x165b: 0x0122, 0x165c: 0x2022, 0x165d: 0x0722,
+	0x165e: 0x202a, 0x165f: 0x1fd2, 0x1660: 0x204a, 0x1661: 0x0019, 0x1662: 0x02e9, 0x1663: 0x03d9,
+	0x1664: 0x02f1, 0x1665: 0x02f9, 0x1666: 0x03f1, 0x1667: 0x0309, 0x1668: 0x00a9, 0x1669: 0x0311,
+	0x166a: 0x00b1, 0x166b: 0x0319, 0x166c: 0x0101, 0x166d: 0x0321, 0x166e: 0x0329, 0x166f: 0x0051,
+	0x1670: 0x0339, 0x1671: 0x0751, 0x1672: 0x00b9, 0x1673: 0x0089, 0x1674: 0x0341, 0x1675: 0x0349,
+	0x1676: 0x0391, 0x1677: 0x00c1, 0x1678: 0x0109, 0x1679: 0x00c9, 0x167a: 0x04b1, 0x167b: 0x1ff2,
+	0x167c: 0x2032, 0x167d: 0x1ffa, 0x167e: 0x21d2, 0x167f: 0x1fda,
+	// Block 0x5a, offset 0x1680
+	0x1680: 0x0672, 0x1681: 0x0019, 0x1682: 0x02e9, 0x1683: 0x03d9, 0x1684: 0x02f1, 0x1685: 0x02f9,
+	0x1686: 0x03f1, 0x1687: 0x0309, 0x1688: 0x00a9, 0x1689: 0x0311, 0x168a: 0x00b1, 0x168b: 0x0319,
+	0x168c: 0x0101, 0x168d: 0x0321, 0x168e: 0x0329, 0x168f: 0x0051, 0x1690: 0x0339, 0x1691: 0x0751,
+	0x1692: 0x00b9, 0x1693: 0x0089, 0x1694: 0x0341, 0x1695: 0x0349, 0x1696: 0x0391, 0x1697: 0x00c1,
+	0x1698: 0x0109, 0x1699: 0x00c9, 0x169a: 0x04b1, 0x169b: 0x1fe2, 0x169c: 0x21da, 0x169d: 0x1fea,
+	0x169e: 0x21e2, 0x169f: 0x810d, 0x16a0: 0x812d, 0x16a1: 0x0961, 0x16a2: 0x814d, 0x16a3: 0x814d,
+	0x16a4: 0x816d, 0x16a5: 0x818d, 0x16a6: 0x81ad, 0x16a7: 0x81cd, 0x16a8: 0x81ed, 0x16a9: 0x820d,
+	0x16aa: 0x822d, 0x16ab: 0x824d, 0x16ac: 0x826d, 0x16ad: 0x828d, 0x16ae: 0x82ad, 0x16af: 0x82cd,
+	0x16b0: 0x82ed, 0x16b1: 0x830d, 0x16b2: 0x832d, 0x16b3: 0x834d, 0x16b4: 0x836d, 0x16b5: 0x838d,
+	0x16b6: 0x83ad, 0x16b7: 0x83cd, 0x16b8: 0x83ed, 0x16b9: 0x840d, 0x16ba: 0x842d, 0x16bb: 0x844d,
+	0x16bc: 0x81ed, 0x16bd: 0x846d, 0x16be: 0x848d, 0x16bf: 0x824d,
+	// Block 0x5b, offset 0x16c0
+	0x16c0: 0x84ad, 0x16c1: 0x84cd, 0x16c2: 0x84ed, 0x16c3: 0x850d, 0x16c4: 0x852d, 0x16c5: 0x854d,
+	0x16c6: 0x856d, 0x16c7: 0x858d, 0x16c8: 0x850d, 0x16c9: 0x85ad, 0x16ca: 0x850d, 0x16cb: 0x85cd,
+	0x16cc: 0x85cd, 0x16cd: 0x85ed, 0x16ce: 0x85ed, 0x16cf: 0x860d, 0x16d0: 0x854d, 0x16d1: 0x862d,
+	0x16d2: 0x864d, 0x16d3: 0x862d, 0x16d4: 0x866d, 0x16d5: 0x864d, 0x16d6: 0x868d, 0x16d7: 0x868d,
+	0x16d8: 0x86ad, 0x16d9: 0x86ad, 0x16da: 0x86cd, 0x16db: 0x86cd, 0x16dc: 0x864d, 0x16dd: 0x814d,
+	0x16de: 0x86ed, 0x16df: 0x870d, 0x16e0: 0x0040, 0x16e1: 0x872d, 0x16e2: 0x874d, 0x16e3: 0x876d,
+	0x16e4: 0x878d, 0x16e5: 0x876d, 0x16e6: 0x87ad, 0x16e7: 0x87cd, 0x16e8: 0x87ed, 0x16e9: 0x87ed,
+	0x16ea: 0x880d, 0x16eb: 0x880d, 0x16ec: 0x882d, 0x16ed: 0x882d, 0x16ee: 0x880d, 0x16ef: 0x880d,
+	0x16f0: 0x884d, 0x16f1: 0x886d, 0x16f2: 0x888d, 0x16f3: 0x88ad, 0x16f4: 0x88cd, 0x16f5: 0x88ed,
+	0x16f6: 0x88ed, 0x16f7: 0x88ed, 0x16f8: 0x890d, 0x16f9: 0x890d, 0x16fa: 0x890d, 0x16fb: 0x890d,
+	0x16fc: 0x87ed, 0x16fd: 0x87ed, 0x16fe: 0x87ed, 0x16ff: 0x0040,
+	// Block 0x5c, offset 0x1700
+	0x1700: 0x0040, 0x1701: 0x0040, 0x1702: 0x874d, 0x1703: 0x872d, 0x1704: 0x892d, 0x1705: 0x872d,
+	0x1706: 0x874d, 0x1707: 0x872d, 0x1708: 0x0040, 0x1709: 0x0040, 0x170a: 0x894d, 0x170b: 0x874d,
+	0x170c: 0x896d, 0x170d: 0x892d, 0x170e: 0x896d, 0x170f: 0x874d, 0x1710: 0x0040, 0x1711: 0x0040,
+	0x1712: 0x898d, 0x1713: 0x89ad, 0x1714: 0x88ad, 0x1715: 0x896d, 0x1716: 0x892d, 0x1717: 0x896d,
+	0x1718: 0x0040, 0x1719: 0x0040, 0x171a: 0x89cd, 0x171b: 0x89ed, 0x171c: 0x89cd, 0x171d: 0x0040,
+	0x171e: 0x0040, 0x171f: 0x0040, 0x1720: 0x21e9, 0x1721: 0x21f1, 0x1722: 0x21f9, 0x1723: 0x8a0e,
+	0x1724: 0x2201, 0x1725: 0x2209, 0x1726: 0x8a2d, 0x1727: 0x0040, 0x1728: 0x8a4d, 0x1729: 0x8a6d,
+	0x172a: 0x8a8d, 0x172b: 0x8a6d, 0x172c: 0x8aad, 0x172d: 0x8acd, 0x172e: 0x8aed, 0x172f: 0x0040,
+	0x1730: 0x0040, 0x1731: 0x0040, 0x1732: 0x0040, 0x1733: 0x0040, 0x1734: 0x0040, 0x1735: 0x0040,
+	0x1736: 0x0040, 0x1737: 0x0040, 0x1738: 0x0040, 0x1739: 0x0340, 0x173a: 0x0340, 0x173b: 0x0340,
+	0x173c: 0x0040, 0x173d: 0x0040, 0x173e: 0x0040, 0x173f: 0x0040,
+	// Block 0x5d, offset 0x1740
+	0x1740: 0x0008, 0x1741: 0x0008, 0x1742: 0x0008, 0x1743: 0x0008, 0x1744: 0x0008, 0x1745: 0x0008,
+	0x1746: 0x0008, 0x1747: 0x0008, 0x1748: 0x0008, 0x1749: 0x0008, 0x174a: 0x0008, 0x174b: 0x0008,
+	0x174c: 0x0008, 0x174d: 0x0008, 0x174e: 0x0008, 0x174f: 0x0008, 0x1750: 0x0008, 0x1751: 0x0008,
+	0x1752: 0x0008, 0x1753: 0x0008, 0x1754: 0x0008, 0x1755: 0x0008, 0x1756: 0x0008, 0x1757: 0x0008,
+	0x1758: 0x0008, 0x1759: 0x0008, 0x175a: 0x0008, 0x175b: 0x0008, 0x175c: 0x0008, 0x175d: 0x0008,
+	0x175e: 0x0008, 0x175f: 0x0008, 0x1760: 0x0008, 0x1761: 0x0008, 0x1762: 0x0008, 0x1763: 0x0008,
+	0x1764: 0x0040, 0x1765: 0x0040, 0x1766: 0x0040, 0x1767: 0x0040, 0x1768: 0x0040, 0x1769: 0x0040,
+	0x176a: 0x0040, 0x176b: 0x0040, 0x176c: 0x0040, 0x176d: 0x0040, 0x176e: 0x0040, 0x176f: 0x0018,
+	0x1770: 0x8b3d, 0x1771: 0x8b55, 0x1772: 0x8b6d, 0x1773: 0x8b55, 0x1774: 0x8b85, 0x1775: 0x8b55,
+	0x1776: 0x8b6d, 0x1777: 0x8b55, 0x1778: 0x8b3d, 0x1779: 0x8b9d, 0x177a: 0x8bb5, 0x177b: 0x0040,
+	0x177c: 0x8bcd, 0x177d: 0x8b9d, 0x177e: 0x8bb5, 0x177f: 0x8b9d,
+	// Block 0x5e, offset 0x1780
+	0x1780: 0xe13d, 0x1781: 0xe14d, 0x1782: 0xe15d, 0x1783: 0xe14d, 0x1784: 0xe17d, 0x1785: 0xe14d,
+	0x1786: 0xe15d, 0x1787: 0xe14d, 0x1788: 0xe13d, 0x1789: 0xe1cd, 0x178a: 0xe1dd, 0x178b: 0x0040,
+	0x178c: 0xe1fd, 0x178d: 0xe1cd, 0x178e: 0xe1dd, 0x178f: 0xe1cd, 0x1790: 0xe13d, 0x1791: 0xe14d,
+	0x1792: 0xe15d, 0x1793: 0x0040, 0x1794: 0xe17d, 0x1795: 0xe14d, 0x1796: 0x0040, 0x1797: 0x0008,
+	0x1798: 0x0008, 0x1799: 0x0008, 0x179a: 0x0008, 0x179b: 0x0008, 0x179c: 0x0008, 0x179d: 0x0008,
+	0x179e: 0x0008, 0x179f: 0x0008, 0x17a0: 0x0008, 0x17a1: 0x0008, 0x17a2: 0x0040, 0x17a3: 0x0008,
+	0x17a4: 0x0008, 0x17a5: 0x0008, 0x17a6: 0x0008, 0x17a7: 0x0008, 0x17a8: 0x0008, 0x17a9: 0x0008,
+	0x17aa: 0x0008, 0x17ab: 0x0008, 0x17ac: 0x0008, 0x17ad: 0x0008, 0x17ae: 0x0008, 0x17af: 0x0008,
+	0x17b0: 0x0008, 0x17b1: 0x0008, 0x17b2: 0x0040, 0x17b3: 0x0008, 0x17b4: 0x0008, 0x17b5: 0x0008,
+	0x17b6: 0x0008, 0x17b7: 0x0008, 0x17b8: 0x0008, 0x17b9: 0x0008, 0x17ba: 0x0040, 0x17bb: 0x0008,
+	0x17bc: 0x0008, 0x17bd: 0x0040, 0x17be: 0x0040, 0x17bf: 0x0040,
+	// Block 0x5f, offset 0x17c0
+	0x17c0: 0x0008, 0x17c1: 0x2211, 0x17c2: 0x2219, 0x17c3: 0x02e1, 0x17c4: 0x2221, 0x17c5: 0x2229,
+	0x17c6: 0x0040, 0x17c7: 0x2231, 0x17c8: 0x2239, 0x17c9: 0x2241, 0x17ca: 0x2249, 0x17cb: 0x2251,
+	0x17cc: 0x2259, 0x17cd: 0x2261, 0x17ce: 0x2269, 0x17cf: 0x2271, 0x17d0: 0x2279, 0x17d1: 0x2281,
+	0x17d2: 0x2289, 0x17d3: 0x2291, 0x17d4: 0x2299, 0x17d5: 0x0741, 0x17d6: 0x22a1, 0x17d7: 0x22a9,
+	0x17d8: 0x22b1, 0x17d9: 0x22b9, 0x17da: 0x22c1, 0x17db: 0x13d9, 0x17dc: 0x8be5, 0x17dd: 0x22c9,
+	0x17de: 0x22d1, 0x17df: 0x8c05, 0x17e0: 0x22d9, 0x17e1: 0x8c25, 0x17e2: 0x22e1, 0x17e3: 0x22e9,
+	0x17e4: 0x22f1, 0x17e5: 0x0751, 0x17e6: 0x22f9, 0x17e7: 0x8c45, 0x17e8: 0x0949, 0x17e9: 0x2301,
+	0x17ea: 0x2309, 0x17eb: 0x2311, 0x17ec: 0x2319, 0x17ed: 0x2321, 0x17ee: 0x2329, 0x17ef: 0x2331,
+	0x17f0: 0x2339, 0x17f1: 0x0040, 0x17f2: 0x2341, 0x17f3: 0x2349, 0x17f4: 0x2351, 0x17f5: 0x2359,
+	0x17f6: 0x2361, 0x17f7: 0x2369, 0x17f8: 0x2371, 0x17f9: 0x8c65, 0x17fa: 0x8c85, 0x17fb: 0x0040,
+	0x17fc: 0x0040, 0x17fd: 0x0040, 0x17fe: 0x0040, 0x17ff: 0x0040,
+	// Block 0x60, offset 0x1800
+	0x1800: 0x0a08, 0x1801: 0x0a08, 0x1802: 0x0a08, 0x1803: 0x0a08, 0x1804: 0x0a08, 0x1805: 0x0c08,
+	0x1806: 0x0808, 0x1807: 0x0c08, 0x1808: 0x0818, 0x1809: 0x0c08, 0x180a: 0x0c08, 0x180b: 0x0808,
+	0x180c: 0x0808, 0x180d: 0x0908, 0x180e: 0x0c08, 0x180f: 0x0c08, 0x1810: 0x0c08, 0x1811: 0x0c08,
+	0x1812: 0x0c08, 0x1813: 0x0a08, 0x1814: 0x0a08, 0x1815: 0x0a08, 0x1816: 0x0a08, 0x1817: 0x0908,
+	0x1818: 0x0a08, 0x1819: 0x0a08, 0x181a: 0x0a08, 0x181b: 0x0a08, 0x181c: 0x0a08, 0x181d: 0x0c08,
+	0x181e: 0x0a08, 0x181f: 0x0a08, 0x1820: 0x0a08, 0x1821: 0x0c08, 0x1822: 0x0808, 0x1823: 0x0808,
+	0x1824: 0x0c08, 0x1825: 0x3308, 0x1826: 0x3308, 0x1827: 0x0040, 0x1828: 0x0040, 0x1829: 0x0040,
+	0x182a: 0x0040, 0x182b: 0x0a18, 0x182c: 0x0a18, 0x182d: 0x0a18, 0x182e: 0x0a18, 0x182f: 0x0c18,
+	0x1830: 0x0818, 0x1831: 0x0818, 0x1832: 0x0818, 0x1833: 0x0818, 0x1834: 0x0818, 0x1835: 0x0818,
+	0x1836: 0x0818, 0x1837: 0x0040, 0x1838: 0x0040, 0x1839: 0x0040, 0x183a: 0x0040, 0x183b: 0x0040,
+	0x183c: 0x0040, 0x183d: 0x0040, 0x183e: 0x0040, 0x183f: 0x0040,
+	// Block 0x61, offset 0x1840
+	0x1840: 0x0a08, 0x1841: 0x0c08, 0x1842: 0x0a08, 0x1843: 0x0c08, 0x1844: 0x0c08, 0x1845: 0x0c08,
+	0x1846: 0x0a08, 0x1847: 0x0a08, 0x1848: 0x0a08, 0x1849: 0x0c08, 0x184a: 0x0a08, 0x184b: 0x0a08,
+	0x184c: 0x0c08, 0x184d: 0x0a08, 0x184e: 0x0c08, 0x184f: 0x0c08, 0x1850: 0x0a08, 0x1851: 0x0c08,
+	0x1852: 0x0040, 0x1853: 0x0040, 0x1854: 0x0040, 0x1855: 0x0040, 0x1856: 0x0040, 0x1857: 0x0040,
+	0x1858: 0x0040, 0x1859: 0x0818, 0x185a: 0x0818, 0x185b: 0x0818, 0x185c: 0x0818, 0x185d: 0x0040,
+	0x185e: 0x0040, 0x185f: 0x0040, 0x1860: 0x0040, 0x1861: 0x0040, 0x1862: 0x0040, 0x1863: 0x0040,
+	0x1864: 0x0040, 0x1865: 0x0040, 0x1866: 0x0040, 0x1867: 0x0040, 0x1868: 0x0040, 0x1869: 0x0c18,
+	0x186a: 0x0c18, 0x186b: 0x0c18, 0x186c: 0x0c18, 0x186d: 0x0a18, 0x186e: 0x0a18, 0x186f: 0x0818,
+	0x1870: 0x0040, 0x1871: 0x0040, 0x1872: 0x0040, 0x1873: 0x0040, 0x1874: 0x0040, 0x1875: 0x0040,
+	0x1876: 0x0040, 0x1877: 0x0040, 0x1878: 0x0040, 0x1879: 0x0040, 0x187a: 0x0040, 0x187b: 0x0040,
+	0x187c: 0x0040, 0x187d: 0x0040, 0x187e: 0x0040, 0x187f: 0x0040,
+	// Block 0x62, offset 0x1880
+	0x1880: 0x3308, 0x1881: 0x3308, 0x1882: 0x3008, 0x1883: 0x3008, 0x1884: 0x0040, 0x1885: 0x0008,
+	0x1886: 0x0008, 0x1887: 0x0008, 0x1888: 0x0008, 0x1889: 0x0008, 0x188a: 0x0008, 0x188b: 0x0008,
+	0x188c: 0x0008, 0x188d: 0x0040, 0x188e: 0x0040, 0x188f: 0x0008, 0x1890: 0x0008, 0x1891: 0x0040,
+	0x1892: 0x0040, 0x1893: 0x0008, 0x1894: 0x0008, 0x1895: 0x0008, 0x1896: 0x0008, 0x1897: 0x0008,
+	0x1898: 0x0008, 0x1899: 0x0008, 0x189a: 0x0008, 0x189b: 0x0008, 0x189c: 0x0008, 0x189d: 0x0008,
+	0x189e: 0x0008, 0x189f: 0x0008, 0x18a0: 0x0008, 0x18a1: 0x0008, 0x18a2: 0x0008, 0x18a3: 0x0008,
+	0x18a4: 0x0008, 0x18a5: 0x0008, 0x18a6: 0x0008, 0x18a7: 0x0008, 0x18a8: 0x0008, 0x18a9: 0x0040,
+	0x18aa: 0x0008, 0x18ab: 0x0008, 0x18ac: 0x0008, 0x18ad: 0x0008, 0x18ae: 0x0008, 0x18af: 0x0008,
+	0x18b0: 0x0008, 0x18b1: 0x0040, 0x18b2: 0x0008, 0x18b3: 0x0008, 0x18b4: 0x0040, 0x18b5: 0x0008,
+	0x18b6: 0x0008, 0x18b7: 0x0008, 0x18b8: 0x0008, 0x18b9: 0x0008, 0x18ba: 0x0040, 0x18bb: 0x3308,
+	0x18bc: 0x3308, 0x18bd: 0x0008, 0x18be: 0x3008, 0x18bf: 0x3008,
+	// Block 0x63, offset 0x18c0
+	0x18c0: 0x3308, 0x18c1: 0x3008, 0x18c2: 0x3008, 0x18c3: 0x3008, 0x18c4: 0x3008, 0x18c5: 0x0040,
+	0x18c6: 0x0040, 0x18c7: 0x3008, 0x18c8: 0x3008, 0x18c9: 0x0040, 0x18ca: 0x0040, 0x18cb: 0x3008,
+	0x18cc: 0x3008, 0x18cd: 0x3808, 0x18ce: 0x0040, 0x18cf: 0x0040, 0x18d0: 0x0008, 0x18d1: 0x0040,
+	0x18d2: 0x0040, 0x18d3: 0x0040, 0x18d4: 0x0040, 0x18d5: 0x0040, 0x18d6: 0x0040, 0x18d7: 0x3008,
+	0x18d8: 0x0040, 0x18d9: 0x0040, 0x18da: 0x0040, 0x18db: 0x0040, 0x18dc: 0x0040, 0x18dd: 0x0008,
+	0x18de: 0x0008, 0x18df: 0x0008, 0x18e0: 0x0008, 0x18e1: 0x0008, 0x18e2: 0x3008, 0x18e3: 0x3008,
+	0x18e4: 0x0040, 0x18e5: 0x0040, 0x18e6: 0x3308, 0x18e7: 0x3308, 0x18e8: 0x3308, 0x18e9: 0x3308,
+	0x18ea: 0x3308, 0x18eb: 0x3308, 0x18ec: 0x3308, 0x18ed: 0x0040, 0x18ee: 0x0040, 0x18ef: 0x0040,
+	0x18f0: 0x3308, 0x18f1: 0x3308, 0x18f2: 0x3308, 0x18f3: 0x3308, 0x18f4: 0x3308, 0x18f5: 0x0040,
+	0x18f6: 0x0040, 0x18f7: 0x0040, 0x18f8: 0x0040, 0x18f9: 0x0040, 0x18fa: 0x0040, 0x18fb: 0x0040,
+	0x18fc: 0x0040, 0x18fd: 0x0040, 0x18fe: 0x0040, 0x18ff: 0x0040,
+	// Block 0x64, offset 0x1900
+	0x1900: 0x0008, 0x1901: 0x0008, 0x1902: 0x0008, 0x1903: 0x0008, 0x1904: 0x0008, 0x1905: 0x0008,
+	0x1906: 0x0008, 0x1907: 0x0040, 0x1908: 0x0040, 0x1909: 0x0008, 0x190a: 0x0040, 0x190b: 0x0040,
+	0x190c: 0x0008, 0x190d: 0x0008, 0x190e: 0x0008, 0x190f: 0x0008, 0x1910: 0x0008, 0x1911: 0x0008,
+	0x1912: 0x0008, 0x1913: 0x0008, 0x1914: 0x0040, 0x1915: 0x0008, 0x1916: 0x0008, 0x1917: 0x0040,
+	0x1918: 0x0008, 0x1919: 0x0008, 0x191a: 0x0008, 0x191b: 0x0008, 0x191c: 0x0008, 0x191d: 0x0008,
+	0x191e: 0x0008, 0x191f: 0x0008, 0x1920: 0x0008, 0x1921: 0x0008, 0x1922: 0x0008, 0x1923: 0x0008,
+	0x1924: 0x0008, 0x1925: 0x0008, 0x1926: 0x0008, 0x1927: 0x0008, 0x1928: 0x0008, 0x1929: 0x0008,
+	0x192a: 0x0008, 0x192b: 0x0008, 0x192c: 0x0008, 0x192d: 0x0008, 0x192e: 0x0008, 0x192f: 0x0008,
+	0x1930: 0x3008, 0x1931: 0x3008, 0x1932: 0x3008, 0x1933: 0x3008, 0x1934: 0x3008, 0x1935: 0x3008,
+	0x1936: 0x0040, 0x1937: 0x3008, 0x1938: 0x3008, 0x1939: 0x0040, 0x193a: 0x0040, 0x193b: 0x3308,
+	0x193c: 0x3308, 0x193d: 0x3808, 0x193e: 0x3b08, 0x193f: 0x0008,
+	// Block 0x65, offset 0x1940
+	0x1940: 0x0019, 0x1941: 0x02e9, 0x1942: 0x03d9, 0x1943: 0x02f1, 0x1944: 0x02f9, 0x1945: 0x03f1,
+	0x1946: 0x0309, 0x1947: 0x00a9, 0x1948: 0x0311, 0x1949: 0x00b1, 0x194a: 0x0319, 0x194b: 0x0101,
+	0x194c: 0x0321, 0x194d: 0x0329, 0x194e: 0x0051, 0x194f: 0x0339, 0x1950: 0x0751, 0x1951: 0x00b9,
+	0x1952: 0x0089, 0x1953: 0x0341, 0x1954: 0x0349, 0x1955: 0x0391, 0x1956: 0x00c1, 0x1957: 0x0109,
+	0x1958: 0x00c9, 0x1959: 0x04b1, 0x195a: 0x0019, 0x195b: 0x02e9, 0x195c: 0x03d9, 0x195d: 0x02f1,
+	0x195e: 0x02f9, 0x195f: 0x03f1, 0x1960: 0x0309, 0x1961: 0x00a9, 0x1962: 0x0311, 0x1963: 0x00b1,
+	0x1964: 0x0319, 0x1965: 0x0101, 0x1966: 0x0321, 0x1967: 0x0329, 0x1968: 0x0051, 0x1969: 0x0339,
+	0x196a: 0x0751, 0x196b: 0x00b9, 0x196c: 0x0089, 0x196d: 0x0341, 0x196e: 0x0349, 0x196f: 0x0391,
+	0x1970: 0x00c1, 0x1971: 0x0109, 0x1972: 0x00c9, 0x1973: 0x04b1, 0x1974: 0x0019, 0x1975: 0x02e9,
+	0x1976: 0x03d9, 0x1977: 0x02f1, 0x1978: 0x02f9, 0x1979: 0x03f1, 0x197a: 0x0309, 0x197b: 0x00a9,
+	0x197c: 0x0311, 0x197d: 0x00b1, 0x197e: 0x0319, 0x197f: 0x0101,
+	// Block 0x66, offset 0x1980
+	0x1980: 0x0321, 0x1981: 0x0329, 0x1982: 0x0051, 0x1983: 0x0339, 0x1984: 0x0751, 0x1985: 0x00b9,
+	0x1986: 0x0089, 0x1987: 0x0341, 0x1988: 0x0349, 0x1989: 0x0391, 0x198a: 0x00c1, 0x198b: 0x0109,
+	0x198c: 0x00c9, 0x198d: 0x04b1, 0x198e: 0x0019, 0x198f: 0x02e9, 0x1990: 0x03d9, 0x1991: 0x02f1,
+	0x1992: 0x02f9, 0x1993: 0x03f1, 0x1994: 0x0309, 0x1995: 0x0040, 0x1996: 0x0311, 0x1997: 0x00b1,
+	0x1998: 0x0319, 0x1999: 0x0101, 0x199a: 0x0321, 0x199b: 0x0329, 0x199c: 0x0051, 0x199d: 0x0339,
+	0x199e: 0x0751, 0x199f: 0x00b9, 0x19a0: 0x0089, 0x19a1: 0x0341, 0x19a2: 0x0349, 0x19a3: 0x0391,
+	0x19a4: 0x00c1, 0x19a5: 0x0109, 0x19a6: 0x00c9, 0x19a7: 0x04b1, 0x19a8: 0x0019, 0x19a9: 0x02e9,
+	0x19aa: 0x03d9, 0x19ab: 0x02f1, 0x19ac: 0x02f9, 0x19ad: 0x03f1, 0x19ae: 0x0309, 0x19af: 0x00a9,
+	0x19b0: 0x0311, 0x19b1: 0x00b1, 0x19b2: 0x0319, 0x19b3: 0x0101, 0x19b4: 0x0321, 0x19b5: 0x0329,
+	0x19b6: 0x0051, 0x19b7: 0x0339, 0x19b8: 0x0751, 0x19b9: 0x00b9, 0x19ba: 0x0089, 0x19bb: 0x0341,
+	0x19bc: 0x0349, 0x19bd: 0x0391, 0x19be: 0x00c1, 0x19bf: 0x0109,
+	// Block 0x67, offset 0x19c0
+	0x19c0: 0x00c9, 0x19c1: 0x04b1, 0x19c2: 0x0019, 0x19c3: 0x02e9, 0x19c4: 0x03d9, 0x19c5: 0x02f1,
+	0x19c6: 0x02f9, 0x19c7: 0x03f1, 0x19c8: 0x0309, 0x19c9: 0x00a9, 0x19ca: 0x0311, 0x19cb: 0x00b1,
+	0x19cc: 0x0319, 0x19cd: 0x0101, 0x19ce: 0x0321, 0x19cf: 0x0329, 0x19d0: 0x0051, 0x19d1: 0x0339,
+	0x19d2: 0x0751, 0x19d3: 0x00b9, 0x19d4: 0x0089, 0x19d5: 0x0341, 0x19d6: 0x0349, 0x19d7: 0x0391,
+	0x19d8: 0x00c1, 0x19d9: 0x0109, 0x19da: 0x00c9, 0x19db: 0x04b1, 0x19dc: 0x0019, 0x19dd: 0x0040,
+	0x19de: 0x03d9, 0x19df: 0x02f1, 0x19e0: 0x0040, 0x19e1: 0x0040, 0x19e2: 0x0309, 0x19e3: 0x0040,
+	0x19e4: 0x0040, 0x19e5: 0x00b1, 0x19e6: 0x0319, 0x19e7: 0x0040, 0x19e8: 0x0040, 0x19e9: 0x0329,
+	0x19ea: 0x0051, 0x19eb: 0x0339, 0x19ec: 0x0751, 0x19ed: 0x0040, 0x19ee: 0x0089, 0x19ef: 0x0341,
+	0x19f0: 0x0349, 0x19f1: 0x0391, 0x19f2: 0x00c1, 0x19f3: 0x0109, 0x19f4: 0x00c9, 0x19f5: 0x04b1,
+	0x19f6: 0x0019, 0x19f7: 0x02e9, 0x19f8: 0x03d9, 0x19f9: 0x02f1, 0x19fa: 0x0040, 0x19fb: 0x03f1,
+	0x19fc: 0x0040, 0x19fd: 0x00a9, 0x19fe: 0x0311, 0x19ff: 0x00b1,
+	// Block 0x68, offset 0x1a00
+	0x1a00: 0x0319, 0x1a01: 0x0101, 0x1a02: 0x0321, 0x1a03: 0x0329, 0x1a04: 0x0040, 0x1a05: 0x0339,
+	0x1a06: 0x0751, 0x1a07: 0x00b9, 0x1a08: 0x0089, 0x1a09: 0x0341, 0x1a0a: 0x0349, 0x1a0b: 0x0391,
+	0x1a0c: 0x00c1, 0x1a0d: 0x0109, 0x1a0e: 0x00c9, 0x1a0f: 0x04b1, 0x1a10: 0x0019, 0x1a11: 0x02e9,
+	0x1a12: 0x03d9, 0x1a13: 0x02f1, 0x1a14: 0x02f9, 0x1a15: 0x03f1, 0x1a16: 0x0309, 0x1a17: 0x00a9,
+	0x1a18: 0x0311, 0x1a19: 0x00b1, 0x1a1a: 0x0319, 0x1a1b: 0x0101, 0x1a1c: 0x0321, 0x1a1d: 0x0329,
+	0x1a1e: 0x0051, 0x1a1f: 0x0339, 0x1a20: 0x0751, 0x1a21: 0x00b9, 0x1a22: 0x0089, 0x1a23: 0x0341,
+	0x1a24: 0x0349, 0x1a25: 0x0391, 0x1a26: 0x00c1, 0x1a27: 0x0109, 0x1a28: 0x00c9, 0x1a29: 0x04b1,
+	0x1a2a: 0x0019, 0x1a2b: 0x02e9, 0x1a2c: 0x03d9, 0x1a2d: 0x02f1, 0x1a2e: 0x02f9, 0x1a2f: 0x03f1,
+	0x1a30: 0x0309, 0x1a31: 0x00a9, 0x1a32: 0x0311, 0x1a33: 0x00b1, 0x1a34: 0x0319, 0x1a35: 0x0101,
+	0x1a36: 0x0321, 0x1a37: 0x0329, 0x1a38: 0x0051, 0x1a39: 0x0339, 0x1a3a: 0x0751, 0x1a3b: 0x00b9,
+	0x1a3c: 0x0089, 0x1a3d: 0x0341, 0x1a3e: 0x0349, 0x1a3f: 0x0391,
+	// Block 0x69, offset 0x1a40
+	0x1a40: 0x00c1, 0x1a41: 0x0109, 0x1a42: 0x00c9, 0x1a43: 0x04b1, 0x1a44: 0x0019, 0x1a45: 0x02e9,
+	0x1a46: 0x0040, 0x1a47: 0x02f1, 0x1a48: 0x02f9, 0x1a49: 0x03f1, 0x1a4a: 0x0309, 0x1a4b: 0x0040,
+	0x1a4c: 0x0040, 0x1a4d: 0x00b1, 0x1a4e: 0x0319, 0x1a4f: 0x0101, 0x1a50: 0x0321, 0x1a51: 0x0329,
+	0x1a52: 0x0051, 0x1a53: 0x0339, 0x1a54: 0x0751, 0x1a55: 0x0040, 0x1a56: 0x0089, 0x1a57: 0x0341,
+	0x1a58: 0x0349, 0x1a59: 0x0391, 0x1a5a: 0x00c1, 0x1a5b: 0x0109, 0x1a5c: 0x00c9, 0x1a5d: 0x0040,
+	0x1a5e: 0x0019, 0x1a5f: 0x02e9, 0x1a60: 0x03d9, 0x1a61: 0x02f1, 0x1a62: 0x02f9, 0x1a63: 0x03f1,
+	0x1a64: 0x0309, 0x1a65: 0x00a9, 0x1a66: 0x0311, 0x1a67: 0x00b1, 0x1a68: 0x0319, 0x1a69: 0x0101,
+	0x1a6a: 0x0321, 0x1a6b: 0x0329, 0x1a6c: 0x0051, 0x1a6d: 0x0339, 0x1a6e: 0x0751, 0x1a6f: 0x00b9,
+	0x1a70: 0x0089, 0x1a71: 0x0341, 0x1a72: 0x0349, 0x1a73: 0x0391, 0x1a74: 0x00c1, 0x1a75: 0x0109,
+	0x1a76: 0x00c9, 0x1a77: 0x04b1, 0x1a78: 0x0019, 0x1a79: 0x02e9, 0x1a7a: 0x0040, 0x1a7b: 0x02f1,
+	0x1a7c: 0x02f9, 0x1a7d: 0x03f1, 0x1a7e: 0x0309, 0x1a7f: 0x0040,
+	// Block 0x6a, offset 0x1a80
+	0x1a80: 0x0311, 0x1a81: 0x00b1, 0x1a82: 0x0319, 0x1a83: 0x0101, 0x1a84: 0x0321, 0x1a85: 0x0040,
+	0x1a86: 0x0051, 0x1a87: 0x0040, 0x1a88: 0x0040, 0x1a89: 0x0040, 0x1a8a: 0x0089, 0x1a8b: 0x0341,
+	0x1a8c: 0x0349, 0x1a8d: 0x0391, 0x1a8e: 0x00c1, 0x1a8f: 0x0109, 0x1a90: 0x00c9, 0x1a91: 0x0040,
+	0x1a92: 0x0019, 0x1a93: 0x02e9, 0x1a94: 0x03d9, 0x1a95: 0x02f1, 0x1a96: 0x02f9, 0x1a97: 0x03f1,
+	0x1a98: 0x0309, 0x1a99: 0x00a9, 0x1a9a: 0x0311, 0x1a9b: 0x00b1, 0x1a9c: 0x0319, 0x1a9d: 0x0101,
+	0x1a9e: 0x0321, 0x1a9f: 0x0329, 0x1aa0: 0x0051, 0x1aa1: 0x0339, 0x1aa2: 0x0751, 0x1aa3: 0x00b9,
+	0x1aa4: 0x0089, 0x1aa5: 0x0341, 0x1aa6: 0x0349, 0x1aa7: 0x0391, 0x1aa8: 0x00c1, 0x1aa9: 0x0109,
+	0x1aaa: 0x00c9, 0x1aab: 0x04b1, 0x1aac: 0x0019, 0x1aad: 0x02e9, 0x1aae: 0x03d9, 0x1aaf: 0x02f1,
+	0x1ab0: 0x02f9, 0x1ab1: 0x03f1, 0x1ab2: 0x0309, 0x1ab3: 0x00a9, 0x1ab4: 0x0311, 0x1ab5: 0x00b1,
+	0x1ab6: 0x0319, 0x1ab7: 0x0101, 0x1ab8: 0x0321, 0x1ab9: 0x0329, 0x1aba: 0x0051, 0x1abb: 0x0339,
+	0x1abc: 0x0751, 0x1abd: 0x00b9, 0x1abe: 0x0089, 0x1abf: 0x0341,
+	// Block 0x6b, offset 0x1ac0
+	0x1ac0: 0x0349, 0x1ac1: 0x0391, 0x1ac2: 0x00c1, 0x1ac3: 0x0109, 0x1ac4: 0x00c9, 0x1ac5: 0x04b1,
+	0x1ac6: 0x0019, 0x1ac7: 0x02e9, 0x1ac8: 0x03d9, 0x1ac9: 0x02f1, 0x1aca: 0x02f9, 0x1acb: 0x03f1,
+	0x1acc: 0x0309, 0x1acd: 0x00a9, 0x1ace: 0x0311, 0x1acf: 0x00b1, 0x1ad0: 0x0319, 0x1ad1: 0x0101,
+	0x1ad2: 0x0321, 0x1ad3: 0x0329, 0x1ad4: 0x0051, 0x1ad5: 0x0339, 0x1ad6: 0x0751, 0x1ad7: 0x00b9,
+	0x1ad8: 0x0089, 0x1ad9: 0x0341, 0x1ada: 0x0349, 0x1adb: 0x0391, 0x1adc: 0x00c1, 0x1add: 0x0109,
+	0x1ade: 0x00c9, 0x1adf: 0x04b1, 0x1ae0: 0x0019, 0x1ae1: 0x02e9, 0x1ae2: 0x03d9, 0x1ae3: 0x02f1,
+	0x1ae4: 0x02f9, 0x1ae5: 0x03f1, 0x1ae6: 0x0309, 0x1ae7: 0x00a9, 0x1ae8: 0x0311, 0x1ae9: 0x00b1,
+	0x1aea: 0x0319, 0x1aeb: 0x0101, 0x1aec: 0x0321, 0x1aed: 0x0329, 0x1aee: 0x0051, 0x1aef: 0x0339,
+	0x1af0: 0x0751, 0x1af1: 0x00b9, 0x1af2: 0x0089, 0x1af3: 0x0341, 0x1af4: 0x0349, 0x1af5: 0x0391,
+	0x1af6: 0x00c1, 0x1af7: 0x0109, 0x1af8: 0x00c9, 0x1af9: 0x04b1, 0x1afa: 0x0019, 0x1afb: 0x02e9,
+	0x1afc: 0x03d9, 0x1afd: 0x02f1, 0x1afe: 0x02f9, 0x1aff: 0x03f1,
+	// Block 0x6c, offset 0x1b00
+	0x1b00: 0x0309, 0x1b01: 0x00a9, 0x1b02: 0x0311, 0x1b03: 0x00b1, 0x1b04: 0x0319, 0x1b05: 0x0101,
+	0x1b06: 0x0321, 0x1b07: 0x0329, 0x1b08: 0x0051, 0x1b09: 0x0339, 0x1b0a: 0x0751, 0x1b0b: 0x00b9,
+	0x1b0c: 0x0089, 0x1b0d: 0x0341, 0x1b0e: 0x0349, 0x1b0f: 0x0391, 0x1b10: 0x00c1, 0x1b11: 0x0109,
+	0x1b12: 0x00c9, 0x1b13: 0x04b1, 0x1b14: 0x0019, 0x1b15: 0x02e9, 0x1b16: 0x03d9, 0x1b17: 0x02f1,
+	0x1b18: 0x02f9, 0x1b19: 0x03f1, 0x1b1a: 0x0309, 0x1b1b: 0x00a9, 0x1b1c: 0x0311, 0x1b1d: 0x00b1,
+	0x1b1e: 0x0319, 0x1b1f: 0x0101, 0x1b20: 0x0321, 0x1b21: 0x0329, 0x1b22: 0x0051, 0x1b23: 0x0339,
+	0x1b24: 0x0751, 0x1b25: 0x00b9, 0x1b26: 0x0089, 0x1b27: 0x0341, 0x1b28: 0x0349, 0x1b29: 0x0391,
+	0x1b2a: 0x00c1, 0x1b2b: 0x0109, 0x1b2c: 0x00c9, 0x1b2d: 0x04b1, 0x1b2e: 0x0019, 0x1b2f: 0x02e9,
+	0x1b30: 0x03d9, 0x1b31: 0x02f1, 0x1b32: 0x02f9, 0x1b33: 0x03f1, 0x1b34: 0x0309, 0x1b35: 0x00a9,
+	0x1b36: 0x0311, 0x1b37: 0x00b1, 0x1b38: 0x0319, 0x1b39: 0x0101, 0x1b3a: 0x0321, 0x1b3b: 0x0329,
+	0x1b3c: 0x0051, 0x1b3d: 0x0339, 0x1b3e: 0x0751, 0x1b3f: 0x00b9,
+	// Block 0x6d, offset 0x1b40
+	0x1b40: 0x0089, 0x1b41: 0x0341, 0x1b42: 0x0349, 0x1b43: 0x0391, 0x1b44: 0x00c1, 0x1b45: 0x0109,
+	0x1b46: 0x00c9, 0x1b47: 0x04b1, 0x1b48: 0x0019, 0x1b49: 0x02e9, 0x1b4a: 0x03d9, 0x1b4b: 0x02f1,
+	0x1b4c: 0x02f9, 0x1b4d: 0x03f1, 0x1b4e: 0x0309, 0x1b4f: 0x00a9, 0x1b50: 0x0311, 0x1b51: 0x00b1,
+	0x1b52: 0x0319, 0x1b53: 0x0101, 0x1b54: 0x0321, 0x1b55: 0x0329, 0x1b56: 0x0051, 0x1b57: 0x0339,
+	0x1b58: 0x0751, 0x1b59: 0x00b9, 0x1b5a: 0x0089, 0x1b5b: 0x0341, 0x1b5c: 0x0349, 0x1b5d: 0x0391,
+	0x1b5e: 0x00c1, 0x1b5f: 0x0109, 0x1b60: 0x00c9, 0x1b61: 0x04b1, 0x1b62: 0x0019, 0x1b63: 0x02e9,
+	0x1b64: 0x03d9, 0x1b65: 0x02f1, 0x1b66: 0x02f9, 0x1b67: 0x03f1, 0x1b68: 0x0309, 0x1b69: 0x00a9,
+	0x1b6a: 0x0311, 0x1b6b: 0x00b1, 0x1b6c: 0x0319, 0x1b6d: 0x0101, 0x1b6e: 0x0321, 0x1b6f: 0x0329,
+	0x1b70: 0x0051, 0x1b71: 0x0339, 0x1b72: 0x0751, 0x1b73: 0x00b9, 0x1b74: 0x0089, 0x1b75: 0x0341,
+	0x1b76: 0x0349, 0x1b77: 0x0391, 0x1b78: 0x00c1, 0x1b79: 0x0109, 0x1b7a: 0x00c9, 0x1b7b: 0x04b1,
+	0x1b7c: 0x0019, 0x1b7d: 0x02e9, 0x1b7e: 0x03d9, 0x1b7f: 0x02f1,
+	// Block 0x6e, offset 0x1b80
+	0x1b80: 0x02f9, 0x1b81: 0x03f1, 0x1b82: 0x0309, 0x1b83: 0x00a9, 0x1b84: 0x0311, 0x1b85: 0x00b1,
+	0x1b86: 0x0319, 0x1b87: 0x0101, 0x1b88: 0x0321, 0x1b89: 0x0329, 0x1b8a: 0x0051, 0x1b8b: 0x0339,
+	0x1b8c: 0x0751, 0x1b8d: 0x00b9, 0x1b8e: 0x0089, 0x1b8f: 0x0341, 0x1b90: 0x0349, 0x1b91: 0x0391,
+	0x1b92: 0x00c1, 0x1b93: 0x0109, 0x1b94: 0x00c9, 0x1b95: 0x04b1, 0x1b96: 0x0019, 0x1b97: 0x02e9,
+	0x1b98: 0x03d9, 0x1b99: 0x02f1, 0x1b9a: 0x02f9, 0x1b9b: 0x03f1, 0x1b9c: 0x0309, 0x1b9d: 0x00a9,
+	0x1b9e: 0x0311, 0x1b9f: 0x00b1, 0x1ba0: 0x0319, 0x1ba1: 0x0101, 0x1ba2: 0x0321, 0x1ba3: 0x0329,
+	0x1ba4: 0x0051, 0x1ba5: 0x0339, 0x1ba6: 0x0751, 0x1ba7: 0x00b9, 0x1ba8: 0x0089, 0x1ba9: 0x0341,
+	0x1baa: 0x0349, 0x1bab: 0x0391, 0x1bac: 0x00c1, 0x1bad: 0x0109, 0x1bae: 0x00c9, 0x1baf: 0x04b1,
+	0x1bb0: 0x0019, 0x1bb1: 0x02e9, 0x1bb2: 0x03d9, 0x1bb3: 0x02f1, 0x1bb4: 0x02f9, 0x1bb5: 0x03f1,
+	0x1bb6: 0x0309, 0x1bb7: 0x00a9, 0x1bb8: 0x0311, 0x1bb9: 0x00b1, 0x1bba: 0x0319, 0x1bbb: 0x0101,
+	0x1bbc: 0x0321, 0x1bbd: 0x0329, 0x1bbe: 0x0051, 0x1bbf: 0x0339,
+	// Block 0x6f, offset 0x1bc0
+	0x1bc0: 0x0751, 0x1bc1: 0x00b9, 0x1bc2: 0x0089, 0x1bc3: 0x0341, 0x1bc4: 0x0349, 0x1bc5: 0x0391,
+	0x1bc6: 0x00c1, 0x1bc7: 0x0109, 0x1bc8: 0x00c9, 0x1bc9: 0x04b1, 0x1bca: 0x0019, 0x1bcb: 0x02e9,
+	0x1bcc: 0x03d9, 0x1bcd: 0x02f1, 0x1bce: 0x02f9, 0x1bcf: 0x03f1, 0x1bd0: 0x0309, 0x1bd1: 0x00a9,
+	0x1bd2: 0x0311, 0x1bd3: 0x00b1, 0x1bd4: 0x0319, 0x1bd5: 0x0101, 0x1bd6: 0x0321, 0x1bd7: 0x0329,
+	0x1bd8: 0x0051, 0x1bd9: 0x0339, 0x1bda: 0x0751, 0x1bdb: 0x00b9, 0x1bdc: 0x0089, 0x1bdd: 0x0341,
+	0x1bde: 0x0349, 0x1bdf: 0x0391, 0x1be0: 0x00c1, 0x1be1: 0x0109, 0x1be2: 0x00c9, 0x1be3: 0x04b1,
+	0x1be4: 0x23e1, 0x1be5: 0x23e9, 0x1be6: 0x0040, 0x1be7: 0x0040, 0x1be8: 0x23f1, 0x1be9: 0x0399,
+	0x1bea: 0x03a1, 0x1beb: 0x03a9, 0x1bec: 0x23f9, 0x1bed: 0x2401, 0x1bee: 0x2409, 0x1bef: 0x04d1,
+	0x1bf0: 0x05f9, 0x1bf1: 0x2411, 0x1bf2: 0x2419, 0x1bf3: 0x2421, 0x1bf4: 0x2429, 0x1bf5: 0x2431,
+	0x1bf6: 0x2439, 0x1bf7: 0x0799, 0x1bf8: 0x03c1, 0x1bf9: 0x04d1, 0x1bfa: 0x2441, 0x1bfb: 0x2449,
+	0x1bfc: 0x2451, 0x1bfd: 0x03b1, 0x1bfe: 0x03b9, 0x1bff: 0x2459,
+	// Block 0x70, offset 0x1c00
+	0x1c00: 0x0769, 0x1c01: 0x2461, 0x1c02: 0x23f1, 0x1c03: 0x0399, 0x1c04: 0x03a1, 0x1c05: 0x03a9,
+	0x1c06: 0x23f9, 0x1c07: 0x2401, 0x1c08: 0x2409, 0x1c09: 0x04d1, 0x1c0a: 0x05f9, 0x1c0b: 0x2411,
+	0x1c0c: 0x2419, 0x1c0d: 0x2421, 0x1c0e: 0x2429, 0x1c0f: 0x2431, 0x1c10: 0x2439, 0x1c11: 0x0799,
+	0x1c12: 0x03c1, 0x1c13: 0x2441, 0x1c14: 0x2441, 0x1c15: 0x2449, 0x1c16: 0x2451, 0x1c17: 0x03b1,
+	0x1c18: 0x03b9, 0x1c19: 0x2459, 0x1c1a: 0x0769, 0x1c1b: 0x2469, 0x1c1c: 0x23f9, 0x1c1d: 0x04d1,
+	0x1c1e: 0x2411, 0x1c1f: 0x03b1, 0x1c20: 0x03c1, 0x1c21: 0x0799, 0x1c22: 0x23f1, 0x1c23: 0x0399,
+	0x1c24: 0x03a1, 0x1c25: 0x03a9, 0x1c26: 0x23f9, 0x1c27: 0x2401, 0x1c28: 0x2409, 0x1c29: 0x04d1,
+	0x1c2a: 0x05f9, 0x1c2b: 0x2411, 0x1c2c: 0x2419, 0x1c2d: 0x2421, 0x1c2e: 0x2429, 0x1c2f: 0x2431,
+	0x1c30: 0x2439, 0x1c31: 0x0799, 0x1c32: 0x03c1, 0x1c33: 0x04d1, 0x1c34: 0x2441, 0x1c35: 0x2449,
+	0x1c36: 0x2451, 0x1c37: 0x03b1, 0x1c38: 0x03b9, 0x1c39: 0x2459, 0x1c3a: 0x0769, 0x1c3b: 0x2461,
+	0x1c3c: 0x23f1, 0x1c3d: 0x0399, 0x1c3e: 0x03a1, 0x1c3f: 0x03a9,
+	// Block 0x71, offset 0x1c40
+	0x1c40: 0x23f9, 0x1c41: 0x2401, 0x1c42: 0x2409, 0x1c43: 0x04d1, 0x1c44: 0x05f9, 0x1c45: 0x2411,
+	0x1c46: 0x2419, 0x1c47: 0x2421, 0x1c48: 0x2429, 0x1c49: 0x2431, 0x1c4a: 0x2439, 0x1c4b: 0x0799,
+	0x1c4c: 0x03c1, 0x1c4d: 0x2441, 0x1c4e: 0x2441, 0x1c4f: 0x2449, 0x1c50: 0x2451, 0x1c51: 0x03b1,
+	0x1c52: 0x03b9, 0x1c53: 0x2459, 0x1c54: 0x0769, 0x1c55: 0x2469, 0x1c56: 0x23f9, 0x1c57: 0x04d1,
+	0x1c58: 0x2411, 0x1c59: 0x03b1, 0x1c5a: 0x03c1, 0x1c5b: 0x0799, 0x1c5c: 0x23f1, 0x1c5d: 0x0399,
+	0x1c5e: 0x03a1, 0x1c5f: 0x03a9, 0x1c60: 0x23f9, 0x1c61: 0x2401, 0x1c62: 0x2409, 0x1c63: 0x04d1,
+	0x1c64: 0x05f9, 0x1c65: 0x2411, 0x1c66: 0x2419, 0x1c67: 0x2421, 0x1c68: 0x2429, 0x1c69: 0x2431,
+	0x1c6a: 0x2439, 0x1c6b: 0x0799, 0x1c6c: 0x03c1, 0x1c6d: 0x04d1, 0x1c6e: 0x2441, 0x1c6f: 0x2449,
+	0x1c70: 0x2451, 0x1c71: 0x03b1, 0x1c72: 0x03b9, 0x1c73: 0x2459, 0x1c74: 0x0769, 0x1c75: 0x2461,
+	0x1c76: 0x23f1, 0x1c77: 0x0399, 0x1c78: 0x03a1, 0x1c79: 0x03a9, 0x1c7a: 0x23f9, 0x1c7b: 0x2401,
+	0x1c7c: 0x2409, 0x1c7d: 0x04d1, 0x1c7e: 0x05f9, 0x1c7f: 0x2411,
+	// Block 0x72, offset 0x1c80
+	0x1c80: 0x2419, 0x1c81: 0x2421, 0x1c82: 0x2429, 0x1c83: 0x2431, 0x1c84: 0x2439, 0x1c85: 0x0799,
+	0x1c86: 0x03c1, 0x1c87: 0x2441, 0x1c88: 0x2441, 0x1c89: 0x2449, 0x1c8a: 0x2451, 0x1c8b: 0x03b1,
+	0x1c8c: 0x03b9, 0x1c8d: 0x2459, 0x1c8e: 0x0769, 0x1c8f: 0x2469, 0x1c90: 0x23f9, 0x1c91: 0x04d1,
+	0x1c92: 0x2411, 0x1c93: 0x03b1, 0x1c94: 0x03c1, 0x1c95: 0x0799, 0x1c96: 0x23f1, 0x1c97: 0x0399,
+	0x1c98: 0x03a1, 0x1c99: 0x03a9, 0x1c9a: 0x23f9, 0x1c9b: 0x2401, 0x1c9c: 0x2409, 0x1c9d: 0x04d1,
+	0x1c9e: 0x05f9, 0x1c9f: 0x2411, 0x1ca0: 0x2419, 0x1ca1: 0x2421, 0x1ca2: 0x2429, 0x1ca3: 0x2431,
+	0x1ca4: 0x2439, 0x1ca5: 0x0799, 0x1ca6: 0x03c1, 0x1ca7: 0x04d1, 0x1ca8: 0x2441, 0x1ca9: 0x2449,
+	0x1caa: 0x2451, 0x1cab: 0x03b1, 0x1cac: 0x03b9, 0x1cad: 0x2459, 0x1cae: 0x0769, 0x1caf: 0x2461,
+	0x1cb0: 0x23f1, 0x1cb1: 0x0399, 0x1cb2: 0x03a1, 0x1cb3: 0x03a9, 0x1cb4: 0x23f9, 0x1cb5: 0x2401,
+	0x1cb6: 0x2409, 0x1cb7: 0x04d1, 0x1cb8: 0x05f9, 0x1cb9: 0x2411, 0x1cba: 0x2419, 0x1cbb: 0x2421,
+	0x1cbc: 0x2429, 0x1cbd: 0x2431, 0x1cbe: 0x2439, 0x1cbf: 0x0799,
+	// Block 0x73, offset 0x1cc0
+	0x1cc0: 0x03c1, 0x1cc1: 0x2441, 0x1cc2: 0x2441, 0x1cc3: 0x2449, 0x1cc4: 0x2451, 0x1cc5: 0x03b1,
+	0x1cc6: 0x03b9, 0x1cc7: 0x2459, 0x1cc8: 0x0769, 0x1cc9: 0x2469, 0x1cca: 0x23f9, 0x1ccb: 0x04d1,
+	0x1ccc: 0x2411, 0x1ccd: 0x03b1, 0x1cce: 0x03c1, 0x1ccf: 0x0799, 0x1cd0: 0x23f1, 0x1cd1: 0x0399,
+	0x1cd2: 0x03a1, 0x1cd3: 0x03a9, 0x1cd4: 0x23f9, 0x1cd5: 0x2401, 0x1cd6: 0x2409, 0x1cd7: 0x04d1,
+	0x1cd8: 0x05f9, 0x1cd9: 0x2411, 0x1cda: 0x2419, 0x1cdb: 0x2421, 0x1cdc: 0x2429, 0x1cdd: 0x2431,
+	0x1cde: 0x2439, 0x1cdf: 0x0799, 0x1ce0: 0x03c1, 0x1ce1: 0x04d1, 0x1ce2: 0x2441, 0x1ce3: 0x2449,
+	0x1ce4: 0x2451, 0x1ce5: 0x03b1, 0x1ce6: 0x03b9, 0x1ce7: 0x2459, 0x1ce8: 0x0769, 0x1ce9: 0x2461,
+	0x1cea: 0x23f1, 0x1ceb: 0x0399, 0x1cec: 0x03a1, 0x1ced: 0x03a9, 0x1cee: 0x23f9, 0x1cef: 0x2401,
+	0x1cf0: 0x2409, 0x1cf1: 0x04d1, 0x1cf2: 0x05f9, 0x1cf3: 0x2411, 0x1cf4: 0x2419, 0x1cf5: 0x2421,
+	0x1cf6: 0x2429, 0x1cf7: 0x2431, 0x1cf8: 0x2439, 0x1cf9: 0x0799, 0x1cfa: 0x03c1, 0x1cfb: 0x2441,
+	0x1cfc: 0x2441, 0x1cfd: 0x2449, 0x1cfe: 0x2451, 0x1cff: 0x03b1,
+	// Block 0x74, offset 0x1d00
+	0x1d00: 0x03b9, 0x1d01: 0x2459, 0x1d02: 0x0769, 0x1d03: 0x2469, 0x1d04: 0x23f9, 0x1d05: 0x04d1,
+	0x1d06: 0x2411, 0x1d07: 0x03b1, 0x1d08: 0x03c1, 0x1d09: 0x0799, 0x1d0a: 0x2471, 0x1d0b: 0x2471,
+	0x1d0c: 0x0040, 0x1d0d: 0x0040, 0x1d0e: 0x06e1, 0x1d0f: 0x0049, 0x1d10: 0x0029, 0x1d11: 0x0031,
+	0x1d12: 0x06e9, 0x1d13: 0x06f1, 0x1d14: 0x06f9, 0x1d15: 0x0701, 0x1d16: 0x0709, 0x1d17: 0x0711,
+	0x1d18: 0x06e1, 0x1d19: 0x0049, 0x1d1a: 0x0029, 0x1d1b: 0x0031, 0x1d1c: 0x06e9, 0x1d1d: 0x06f1,
+	0x1d1e: 0x06f9, 0x1d1f: 0x0701, 0x1d20: 0x0709, 0x1d21: 0x0711, 0x1d22: 0x06e1, 0x1d23: 0x0049,
+	0x1d24: 0x0029, 0x1d25: 0x0031, 0x1d26: 0x06e9, 0x1d27: 0x06f1, 0x1d28: 0x06f9, 0x1d29: 0x0701,
+	0x1d2a: 0x0709, 0x1d2b: 0x0711, 0x1d2c: 0x06e1, 0x1d2d: 0x0049, 0x1d2e: 0x0029, 0x1d2f: 0x0031,
+	0x1d30: 0x06e9, 0x1d31: 0x06f1, 0x1d32: 0x06f9, 0x1d33: 0x0701, 0x1d34: 0x0709, 0x1d35: 0x0711,
+	0x1d36: 0x06e1, 0x1d37: 0x0049, 0x1d38: 0x0029, 0x1d39: 0x0031, 0x1d3a: 0x06e9, 0x1d3b: 0x06f1,
+	0x1d3c: 0x06f9, 0x1d3d: 0x0701, 0x1d3e: 0x0709, 0x1d3f: 0x0711,
+	// Block 0x75, offset 0x1d40
+	0x1d40: 0x3308, 0x1d41: 0x3308, 0x1d42: 0x3308, 0x1d43: 0x3308, 0x1d44: 0x3308, 0x1d45: 0x3308,
+	0x1d46: 0x3308, 0x1d47: 0x0040, 0x1d48: 0x3308, 0x1d49: 0x3308, 0x1d4a: 0x3308, 0x1d4b: 0x3308,
+	0x1d4c: 0x3308, 0x1d4d: 0x3308, 0x1d4e: 0x3308, 0x1d4f: 0x3308, 0x1d50: 0x3308, 0x1d51: 0x3308,
+	0x1d52: 0x3308, 0x1d53: 0x3308, 0x1d54: 0x3308, 0x1d55: 0x3308, 0x1d56: 0x3308, 0x1d57: 0x3308,
+	0x1d58: 0x3308, 0x1d59: 0x0040, 0x1d5a: 0x0040, 0x1d5b: 0x3308, 0x1d5c: 0x3308, 0x1d5d: 0x3308,
+	0x1d5e: 0x3308, 0x1d5f: 0x3308, 0x1d60: 0x3308, 0x1d61: 0x3308, 0x1d62: 0x0040, 0x1d63: 0x3308,
+	0x1d64: 0x3308, 0x1d65: 0x0040, 0x1d66: 0x3308, 0x1d67: 0x3308, 0x1d68: 0x3308, 0x1d69: 0x3308,
+	0x1d6a: 0x3308, 0x1d6b: 0x0040, 0x1d6c: 0x0040, 0x1d6d: 0x0040, 0x1d6e: 0x0040, 0x1d6f: 0x0040,
+	0x1d70: 0x2479, 0x1d71: 0x2481, 0x1d72: 0x02a9, 0x1d73: 0x2489, 0x1d74: 0x02b1, 0x1d75: 0x2491,
+	0x1d76: 0x2499, 0x1d77: 0x24a1, 0x1d78: 0x24a9, 0x1d79: 0x24b1, 0x1d7a: 0x24b9, 0x1d7b: 0x24c1,
+	0x1d7c: 0x02b9, 0x1d7d: 0x24c9, 0x1d7e: 0x24d1, 0x1d7f: 0x02c1,
+	// Block 0x76, offset 0x1d80
+	0x1d80: 0x02c9, 0x1d81: 0x24d9, 0x1d82: 0x24e1, 0x1d83: 0x24e9, 0x1d84: 0x24f1, 0x1d85: 0x24f9,
+	0x1d86: 0x2501, 0x1d87: 0x2509, 0x1d88: 0x2511, 0x1d89: 0x2519, 0x1d8a: 0x2521, 0x1d8b: 0x2529,
+	0x1d8c: 0x2531, 0x1d8d: 0x2539, 0x1d8e: 0x2541, 0x1d8f: 0x2549, 0x1d90: 0x2551, 0x1d91: 0x2479,
+	0x1d92: 0x2481, 0x1d93: 0x02a9, 0x1d94: 0x2489, 0x1d95: 0x02b1, 0x1d96: 0x2491, 0x1d97: 0x2499,
+	0x1d98: 0x24a1, 0x1d99: 0x24a9, 0x1d9a: 0x24b1, 0x1d9b: 0x24b9, 0x1d9c: 0x02b9, 0x1d9d: 0x24c9,
+	0x1d9e: 0x02c1, 0x1d9f: 0x24d9, 0x1da0: 0x24e1, 0x1da1: 0x24e9, 0x1da2: 0x24f1, 0x1da3: 0x24f9,
+	0x1da4: 0x2501, 0x1da5: 0x02d1, 0x1da6: 0x2509, 0x1da7: 0x2559, 0x1da8: 0x2531, 0x1da9: 0x2561,
+	0x1daa: 0x2569, 0x1dab: 0x2571, 0x1dac: 0x2579, 0x1dad: 0x2581, 0x1dae: 0x0040, 0x1daf: 0x0040,
+	0x1db0: 0x0040, 0x1db1: 0x0040, 0x1db2: 0x0040, 0x1db3: 0x0040, 0x1db4: 0x0040, 0x1db5: 0x0040,
+	0x1db6: 0x0040, 0x1db7: 0x0040, 0x1db8: 0x0040, 0x1db9: 0x0040, 0x1dba: 0x0040, 0x1dbb: 0x0040,
+	0x1dbc: 0x0040, 0x1dbd: 0x0040, 0x1dbe: 0x0040, 0x1dbf: 0x0040,
+	// Block 0x77, offset 0x1dc0
+	0x1dc0: 0xe115, 0x1dc1: 0xe115, 0x1dc2: 0xe135, 0x1dc3: 0xe135, 0x1dc4: 0xe115, 0x1dc5: 0xe115,
+	0x1dc6: 0xe175, 0x1dc7: 0xe175, 0x1dc8: 0xe115, 0x1dc9: 0xe115, 0x1dca: 0xe135, 0x1dcb: 0xe135,
+	0x1dcc: 0xe115, 0x1dcd: 0xe115, 0x1dce: 0xe1f5, 0x1dcf: 0xe1f5, 0x1dd0: 0xe115, 0x1dd1: 0xe115,
+	0x1dd2: 0xe135, 0x1dd3: 0xe135, 0x1dd4: 0xe115, 0x1dd5: 0xe115, 0x1dd6: 0xe175, 0x1dd7: 0xe175,
+	0x1dd8: 0xe115, 0x1dd9: 0xe115, 0x1dda: 0xe135, 0x1ddb: 0xe135, 0x1ddc: 0xe115, 0x1ddd: 0xe115,
+	0x1dde: 0x8ca5, 0x1ddf: 0x8ca5, 0x1de0: 0x04b5, 0x1de1: 0x04b5, 0x1de2: 0x0a08, 0x1de3: 0x0a08,
+	0x1de4: 0x0a08, 0x1de5: 0x0a08, 0x1de6: 0x0a08, 0x1de7: 0x0a08, 0x1de8: 0x0a08, 0x1de9: 0x0a08,
+	0x1dea: 0x0a08, 0x1deb: 0x0a08, 0x1dec: 0x0a08, 0x1ded: 0x0a08, 0x1dee: 0x0a08, 0x1def: 0x0a08,
+	0x1df0: 0x0a08, 0x1df1: 0x0a08, 0x1df2: 0x0a08, 0x1df3: 0x0a08, 0x1df4: 0x0a08, 0x1df5: 0x0a08,
+	0x1df6: 0x0a08, 0x1df7: 0x0a08, 0x1df8: 0x0a08, 0x1df9: 0x0a08, 0x1dfa: 0x0a08, 0x1dfb: 0x0a08,
+	0x1dfc: 0x0a08, 0x1dfd: 0x0a08, 0x1dfe: 0x0a08, 0x1dff: 0x0a08,
+	// Block 0x78, offset 0x1e00
+	0x1e00: 0x20b1, 0x1e01: 0x20b9, 0x1e02: 0x20d9, 0x1e03: 0x20f1, 0x1e04: 0x0040, 0x1e05: 0x2189,
+	0x1e06: 0x2109, 0x1e07: 0x20e1, 0x1e08: 0x2131, 0x1e09: 0x2191, 0x1e0a: 0x2161, 0x1e0b: 0x2169,
+	0x1e0c: 0x2171, 0x1e0d: 0x2179, 0x1e0e: 0x2111, 0x1e0f: 0x2141, 0x1e10: 0x2151, 0x1e11: 0x2121,
+	0x1e12: 0x2159, 0x1e13: 0x2101, 0x1e14: 0x2119, 0x1e15: 0x20c9, 0x1e16: 0x20d1, 0x1e17: 0x20e9,
+	0x1e18: 0x20f9, 0x1e19: 0x2129, 0x1e1a: 0x2139, 0x1e1b: 0x2149, 0x1e1c: 0x2589, 0x1e1d: 0x1689,
+	0x1e1e: 0x2591, 0x1e1f: 0x2599, 0x1e20: 0x0040, 0x1e21: 0x20b9, 0x1e22: 0x20d9, 0x1e23: 0x0040,
+	0x1e24: 0x2181, 0x1e25: 0x0040, 0x1e26: 0x0040, 0x1e27: 0x20e1, 0x1e28: 0x0040, 0x1e29: 0x2191,
+	0x1e2a: 0x2161, 0x1e2b: 0x2169, 0x1e2c: 0x2171, 0x1e2d: 0x2179, 0x1e2e: 0x2111, 0x1e2f: 0x2141,
+	0x1e30: 0x2151, 0x1e31: 0x2121, 0x1e32: 0x2159, 0x1e33: 0x0040, 0x1e34: 0x2119, 0x1e35: 0x20c9,
+	0x1e36: 0x20d1, 0x1e37: 0x20e9, 0x1e38: 0x0040, 0x1e39: 0x2129, 0x1e3a: 0x0040, 0x1e3b: 0x2149,
+	0x1e3c: 0x0040, 0x1e3d: 0x0040, 0x1e3e: 0x0040, 0x1e3f: 0x0040,
+	// Block 0x79, offset 0x1e40
+	0x1e40: 0x0040, 0x1e41: 0x0040, 0x1e42: 0x20d9, 0x1e43: 0x0040, 0x1e44: 0x0040, 0x1e45: 0x0040,
+	0x1e46: 0x0040, 0x1e47: 0x20e1, 0x1e48: 0x0040, 0x1e49: 0x2191, 0x1e4a: 0x0040, 0x1e4b: 0x2169,
+	0x1e4c: 0x0040, 0x1e4d: 0x2179, 0x1e4e: 0x2111, 0x1e4f: 0x2141, 0x1e50: 0x0040, 0x1e51: 0x2121,
+	0x1e52: 0x2159, 0x1e53: 0x0040, 0x1e54: 0x2119, 0x1e55: 0x0040, 0x1e56: 0x0040, 0x1e57: 0x20e9,
+	0x1e58: 0x0040, 0x1e59: 0x2129, 0x1e5a: 0x0040, 0x1e5b: 0x2149, 0x1e5c: 0x0040, 0x1e5d: 0x1689,
+	0x1e5e: 0x0040, 0x1e5f: 0x2599, 0x1e60: 0x0040, 0x1e61: 0x20b9, 0x1e62: 0x20d9, 0x1e63: 0x0040,
+	0x1e64: 0x2181, 0x1e65: 0x0040, 0x1e66: 0x0040, 0x1e67: 0x20e1, 0x1e68: 0x2131, 0x1e69: 0x2191,
+	0x1e6a: 0x2161, 0x1e6b: 0x0040, 0x1e6c: 0x2171, 0x1e6d: 0x2179, 0x1e6e: 0x2111, 0x1e6f: 0x2141,
+	0x1e70: 0x2151, 0x1e71: 0x2121, 0x1e72: 0x2159, 0x1e73: 0x0040, 0x1e74: 0x2119, 0x1e75: 0x20c9,
+	0x1e76: 0x20d1, 0x1e77: 0x20e9, 0x1e78: 0x0040, 0x1e79: 0x2129, 0x1e7a: 0x2139, 0x1e7b: 0x2149,
+	0x1e7c: 0x2589, 0x1e7d: 0x0040, 0x1e7e: 0x2591, 0x1e7f: 0x0040,
+	// Block 0x7a, offset 0x1e80
+	0x1e80: 0x20b1, 0x1e81: 0x20b9, 0x1e82: 0x20d9, 0x1e83: 0x20f1, 0x1e84: 0x2181, 0x1e85: 0x2189,
+	0x1e86: 0x2109, 0x1e87: 0x20e1, 0x1e88: 0x2131, 0x1e89: 0x2191, 0x1e8a: 0x0040, 0x1e8b: 0x2169,
+	0x1e8c: 0x2171, 0x1e8d: 0x2179, 0x1e8e: 0x2111, 0x1e8f: 0x2141, 0x1e90: 0x2151, 0x1e91: 0x2121,
+	0x1e92: 0x2159, 0x1e93: 0x2101, 0x1e94: 0x2119, 0x1e95: 0x20c9, 0x1e96: 0x20d1, 0x1e97: 0x20e9,
+	0x1e98: 0x20f9, 0x1e99: 0x2129, 0x1e9a: 0x2139, 0x1e9b: 0x2149, 0x1e9c: 0x0040, 0x1e9d: 0x0040,
+	0x1e9e: 0x0040, 0x1e9f: 0x0040, 0x1ea0: 0x0040, 0x1ea1: 0x20b9, 0x1ea2: 0x20d9, 0x1ea3: 0x20f1,
+	0x1ea4: 0x0040, 0x1ea5: 0x2189, 0x1ea6: 0x2109, 0x1ea7: 0x20e1, 0x1ea8: 0x2131, 0x1ea9: 0x2191,
+	0x1eaa: 0x0040, 0x1eab: 0x2169, 0x1eac: 0x2171, 0x1ead: 0x2179, 0x1eae: 0x2111, 0x1eaf: 0x2141,
+	0x1eb0: 0x2151, 0x1eb1: 0x2121, 0x1eb2: 0x2159, 0x1eb3: 0x2101, 0x1eb4: 0x2119, 0x1eb5: 0x20c9,
+	0x1eb6: 0x20d1, 0x1eb7: 0x20e9, 0x1eb8: 0x20f9, 0x1eb9: 0x2129, 0x1eba: 0x2139, 0x1ebb: 0x2149,
+	0x1ebc: 0x0040, 0x1ebd: 0x0040, 0x1ebe: 0x0040, 0x1ebf: 0x0040,
+	// Block 0x7b, offset 0x1ec0
+	0x1ec0: 0x0040, 0x1ec1: 0x25a2, 0x1ec2: 0x25aa, 0x1ec3: 0x25b2, 0x1ec4: 0x25ba, 0x1ec5: 0x25c2,
+	0x1ec6: 0x25ca, 0x1ec7: 0x25d2, 0x1ec8: 0x25da, 0x1ec9: 0x25e2, 0x1eca: 0x25ea, 0x1ecb: 0x0018,
+	0x1ecc: 0x0018, 0x1ecd: 0x0018, 0x1ece: 0x0018, 0x1ecf: 0x0018, 0x1ed0: 0x25f2, 0x1ed1: 0x25fa,
+	0x1ed2: 0x2602, 0x1ed3: 0x260a, 0x1ed4: 0x2612, 0x1ed5: 0x261a, 0x1ed6: 0x2622, 0x1ed7: 0x262a,
+	0x1ed8: 0x2632, 0x1ed9: 0x263a, 0x1eda: 0x2642, 0x1edb: 0x264a, 0x1edc: 0x2652, 0x1edd: 0x265a,
+	0x1ede: 0x2662, 0x1edf: 0x266a, 0x1ee0: 0x2672, 0x1ee1: 0x267a, 0x1ee2: 0x2682, 0x1ee3: 0x268a,
+	0x1ee4: 0x2692, 0x1ee5: 0x269a, 0x1ee6: 0x26a2, 0x1ee7: 0x26aa, 0x1ee8: 0x26b2, 0x1ee9: 0x26ba,
+	0x1eea: 0x26c1, 0x1eeb: 0x03d9, 0x1eec: 0x00b9, 0x1eed: 0x1239, 0x1eee: 0x26c9, 0x1eef: 0x0018,
+	0x1ef0: 0x0019, 0x1ef1: 0x02e9, 0x1ef2: 0x03d9, 0x1ef3: 0x02f1, 0x1ef4: 0x02f9, 0x1ef5: 0x03f1,
+	0x1ef6: 0x0309, 0x1ef7: 0x00a9, 0x1ef8: 0x0311, 0x1ef9: 0x00b1, 0x1efa: 0x0319, 0x1efb: 0x0101,
+	0x1efc: 0x0321, 0x1efd: 0x0329, 0x1efe: 0x0051, 0x1eff: 0x0339,
+	// Block 0x7c, offset 0x1f00
+	0x1f00: 0x0751, 0x1f01: 0x00b9, 0x1f02: 0x0089, 0x1f03: 0x0341, 0x1f04: 0x0349, 0x1f05: 0x0391,
+	0x1f06: 0x00c1, 0x1f07: 0x0109, 0x1f08: 0x00c9, 0x1f09: 0x04b1, 0x1f0a: 0x26d1, 0x1f0b: 0x11f9,
+	0x1f0c: 0x26d9, 0x1f0d: 0x04d9, 0x1f0e: 0x26e1, 0x1f0f: 0x26e9, 0x1f10: 0x0018, 0x1f11: 0x0018,
+	0x1f12: 0x0018, 0x1f13: 0x0018, 0x1f14: 0x0018, 0x1f15: 0x0018, 0x1f16: 0x0018, 0x1f17: 0x0018,
+	0x1f18: 0x0018, 0x1f19: 0x0018, 0x1f1a: 0x0018, 0x1f1b: 0x0018, 0x1f1c: 0x0018, 0x1f1d: 0x0018,
+	0x1f1e: 0x0018, 0x1f1f: 0x0018, 0x1f20: 0x0018, 0x1f21: 0x0018, 0x1f22: 0x0018, 0x1f23: 0x0018,
+	0x1f24: 0x0018, 0x1f25: 0x0018, 0x1f26: 0x0018, 0x1f27: 0x0018, 0x1f28: 0x0018, 0x1f29: 0x0018,
+	0x1f2a: 0x26f1, 0x1f2b: 0x26f9, 0x1f2c: 0x2701, 0x1f2d: 0x0018, 0x1f2e: 0x0018, 0x1f2f: 0x0018,
+	0x1f30: 0x0018, 0x1f31: 0x0018, 0x1f32: 0x0018, 0x1f33: 0x0018, 0x1f34: 0x0018, 0x1f35: 0x0018,
+	0x1f36: 0x0018, 0x1f37: 0x0018, 0x1f38: 0x0018, 0x1f39: 0x0018, 0x1f3a: 0x0018, 0x1f3b: 0x0018,
+	0x1f3c: 0x0018, 0x1f3d: 0x0018, 0x1f3e: 0x0018, 0x1f3f: 0x0018,
+	// Block 0x7d, offset 0x1f40
+	0x1f40: 0x2711, 0x1f41: 0x2719, 0x1f42: 0x2721, 0x1f43: 0x0040, 0x1f44: 0x0040, 0x1f45: 0x0040,
+	0x1f46: 0x0040, 0x1f47: 0x0040, 0x1f48: 0x0040, 0x1f49: 0x0040, 0x1f4a: 0x0040, 0x1f4b: 0x0040,
+	0x1f4c: 0x0040, 0x1f4d: 0x0040, 0x1f4e: 0x0040, 0x1f4f: 0x0040, 0x1f50: 0x2729, 0x1f51: 0x2731,
+	0x1f52: 0x2739, 0x1f53: 0x2741, 0x1f54: 0x2749, 0x1f55: 0x2751, 0x1f56: 0x2759, 0x1f57: 0x2761,
+	0x1f58: 0x2769, 0x1f59: 0x2771, 0x1f5a: 0x2779, 0x1f5b: 0x2781, 0x1f5c: 0x2789, 0x1f5d: 0x2791,
+	0x1f5e: 0x2799, 0x1f5f: 0x27a1, 0x1f60: 0x27a9, 0x1f61: 0x27b1, 0x1f62: 0x27b9, 0x1f63: 0x27c1,
+	0x1f64: 0x27c9, 0x1f65: 0x27d1, 0x1f66: 0x27d9, 0x1f67: 0x27e1, 0x1f68: 0x27e9, 0x1f69: 0x27f1,
+	0x1f6a: 0x27f9, 0x1f6b: 0x2801, 0x1f6c: 0x2809, 0x1f6d: 0x2811, 0x1f6e: 0x2819, 0x1f6f: 0x2821,
+	0x1f70: 0x2829, 0x1f71: 0x2831, 0x1f72: 0x2839, 0x1f73: 0x2841, 0x1f74: 0x2849, 0x1f75: 0x2851,
+	0x1f76: 0x2859, 0x1f77: 0x2861, 0x1f78: 0x2869, 0x1f79: 0x2871, 0x1f7a: 0x2879, 0x1f7b: 0x2881,
+	0x1f7c: 0x0040, 0x1f7d: 0x0040, 0x1f7e: 0x0040, 0x1f7f: 0x0040,
+	// Block 0x7e, offset 0x1f80
+	0x1f80: 0x28e1, 0x1f81: 0x28e9, 0x1f82: 0x28f1, 0x1f83: 0x8cbd, 0x1f84: 0x28f9, 0x1f85: 0x2901,
+	0x1f86: 0x2909, 0x1f87: 0x2911, 0x1f88: 0x2919, 0x1f89: 0x2921, 0x1f8a: 0x2929, 0x1f8b: 0x2931,
+	0x1f8c: 0x2939, 0x1f8d: 0x8cdd, 0x1f8e: 0x2941, 0x1f8f: 0x2949, 0x1f90: 0x2951, 0x1f91: 0x2959,
+	0x1f92: 0x8cfd, 0x1f93: 0x2961, 0x1f94: 0x2969, 0x1f95: 0x2799, 0x1f96: 0x8d1d, 0x1f97: 0x2971,
+	0x1f98: 0x2979, 0x1f99: 0x2981, 0x1f9a: 0x2989, 0x1f9b: 0x2991, 0x1f9c: 0x8d3d, 0x1f9d: 0x2999,
+	0x1f9e: 0x29a1, 0x1f9f: 0x29a9, 0x1fa0: 0x29b1, 0x1fa1: 0x29b9, 0x1fa2: 0x2871, 0x1fa3: 0x29c1,
+	0x1fa4: 0x29c9, 0x1fa5: 0x29d1, 0x1fa6: 0x29d9, 0x1fa7: 0x29e1, 0x1fa8: 0x29e9, 0x1fa9: 0x29f1,
+	0x1faa: 0x29f9, 0x1fab: 0x2a01, 0x1fac: 0x2a09, 0x1fad: 0x2a11, 0x1fae: 0x2a19, 0x1faf: 0x2a21,
+	0x1fb0: 0x2a29, 0x1fb1: 0x2a31, 0x1fb2: 0x2a31, 0x1fb3: 0x2a31, 0x1fb4: 0x8d5d, 0x1fb5: 0x2a39,
+	0x1fb6: 0x2a41, 0x1fb7: 0x2a49, 0x1fb8: 0x8d7d, 0x1fb9: 0x2a51, 0x1fba: 0x2a59, 0x1fbb: 0x2a61,
+	0x1fbc: 0x2a69, 0x1fbd: 0x2a71, 0x1fbe: 0x2a79, 0x1fbf: 0x2a81,
+	// Block 0x7f, offset 0x1fc0
+	0x1fc0: 0x2a89, 0x1fc1: 0x2a91, 0x1fc2: 0x2a99, 0x1fc3: 0x2aa1, 0x1fc4: 0x2aa9, 0x1fc5: 0x2ab1,
+	0x1fc6: 0x2ab1, 0x1fc7: 0x2ab9, 0x1fc8: 0x2ac1, 0x1fc9: 0x2ac9, 0x1fca: 0x2ad1, 0x1fcb: 0x2ad9,
+	0x1fcc: 0x2ae1, 0x1fcd: 0x2ae9, 0x1fce: 0x2af1, 0x1fcf: 0x2af9, 0x1fd0: 0x2b01, 0x1fd1: 0x2b09,
+	0x1fd2: 0x2b11, 0x1fd3: 0x2b19, 0x1fd4: 0x2b21, 0x1fd5: 0x2b29, 0x1fd6: 0x2b31, 0x1fd7: 0x2b39,
+	0x1fd8: 0x2b41, 0x1fd9: 0x8d9d, 0x1fda: 0x2b49, 0x1fdb: 0x2b51, 0x1fdc: 0x2b59, 0x1fdd: 0x2751,
+	0x1fde: 0x2b61, 0x1fdf: 0x2b69, 0x1fe0: 0x8dbd, 0x1fe1: 0x8ddd, 0x1fe2: 0x2b71, 0x1fe3: 0x2b79,
+	0x1fe4: 0x2b81, 0x1fe5: 0x2b89, 0x1fe6: 0x2b91, 0x1fe7: 0x2b99, 0x1fe8: 0x2040, 0x1fe9: 0x2ba1,
+	0x1fea: 0x2ba9, 0x1feb: 0x2ba9, 0x1fec: 0x8dfd, 0x1fed: 0x2bb1, 0x1fee: 0x2bb9, 0x1fef: 0x2bc1,
+	0x1ff0: 0x2bc9, 0x1ff1: 0x8e1d, 0x1ff2: 0x2bd1, 0x1ff3: 0x2bd9, 0x1ff4: 0x2040, 0x1ff5: 0x2be1,
+	0x1ff6: 0x2be9, 0x1ff7: 0x2bf1, 0x1ff8: 0x2bf9, 0x1ff9: 0x2c01, 0x1ffa: 0x2c09, 0x1ffb: 0x8e3d,
+	0x1ffc: 0x2c11, 0x1ffd: 0x8e5d, 0x1ffe: 0x2c19, 0x1fff: 0x2c21,
+	// Block 0x80, offset 0x2000
+	0x2000: 0x2c29, 0x2001: 0x2c31, 0x2002: 0x2c39, 0x2003: 0x2c41, 0x2004: 0x2c49, 0x2005: 0x2c51,
+	0x2006: 0x2c59, 0x2007: 0x2c61, 0x2008: 0x2c69, 0x2009: 0x8e7d, 0x200a: 0x2c71, 0x200b: 0x2c79,
+	0x200c: 0x2c81, 0x200d: 0x2c89, 0x200e: 0x2c91, 0x200f: 0x8e9d, 0x2010: 0x2c99, 0x2011: 0x8ebd,
+	0x2012: 0x8edd, 0x2013: 0x2ca1, 0x2014: 0x2ca9, 0x2015: 0x2ca9, 0x2016: 0x2cb1, 0x2017: 0x8efd,
+	0x2018: 0x8f1d, 0x2019: 0x2cb9, 0x201a: 0x2cc1, 0x201b: 0x2cc9, 0x201c: 0x2cd1, 0x201d: 0x2cd9,
+	0x201e: 0x2ce1, 0x201f: 0x2ce9, 0x2020: 0x2cf1, 0x2021: 0x2cf9, 0x2022: 0x2d01, 0x2023: 0x2d09,
+	0x2024: 0x8f3d, 0x2025: 0x2d11, 0x2026: 0x2d19, 0x2027: 0x2d21, 0x2028: 0x2d29, 0x2029: 0x2d21,
+	0x202a: 0x2d31, 0x202b: 0x2d39, 0x202c: 0x2d41, 0x202d: 0x2d49, 0x202e: 0x2d51, 0x202f: 0x2d59,
+	0x2030: 0x2d61, 0x2031: 0x2d69, 0x2032: 0x2d71, 0x2033: 0x2d79, 0x2034: 0x2d81, 0x2035: 0x2d89,
+	0x2036: 0x2d91, 0x2037: 0x2d99, 0x2038: 0x8f5d, 0x2039: 0x2da1, 0x203a: 0x2da9, 0x203b: 0x2db1,
+	0x203c: 0x2db9, 0x203d: 0x2dc1, 0x203e: 0x8f7d, 0x203f: 0x2dc9,
+	// Block 0x81, offset 0x2040
+	0x2040: 0x2dd1, 0x2041: 0x2dd9, 0x2042: 0x2de1, 0x2043: 0x2de9, 0x2044: 0x2df1, 0x2045: 0x2df9,
+	0x2046: 0x2e01, 0x2047: 0x2e09, 0x2048: 0x2e11, 0x2049: 0x2e19, 0x204a: 0x8f9d, 0x204b: 0x2e21,
+	0x204c: 0x2e29, 0x204d: 0x2e31, 0x204e: 0x2e39, 0x204f: 0x2e41, 0x2050: 0x2e49, 0x2051: 0x2e51,
+	0x2052: 0x2e59, 0x2053: 0x2e61, 0x2054: 0x2e69, 0x2055: 0x2e71, 0x2056: 0x2e79, 0x2057: 0x2e81,
+	0x2058: 0x2e89, 0x2059: 0x2e91, 0x205a: 0x2e99, 0x205b: 0x2ea1, 0x205c: 0x2ea9, 0x205d: 0x8fbd,
+	0x205e: 0x2eb1, 0x205f: 0x2eb9, 0x2060: 0x2ec1, 0x2061: 0x2ec9, 0x2062: 0x2ed1, 0x2063: 0x8fdd,
+	0x2064: 0x2ed9, 0x2065: 0x2ee1, 0x2066: 0x2ee9, 0x2067: 0x2ef1, 0x2068: 0x2ef9, 0x2069: 0x2f01,
+	0x206a: 0x2f09, 0x206b: 0x2f11, 0x206c: 0x7f0d, 0x206d: 0x2f19, 0x206e: 0x2f21, 0x206f: 0x2f29,
+	0x2070: 0x8ffd, 0x2071: 0x2f31, 0x2072: 0x2f39, 0x2073: 0x2f41, 0x2074: 0x2f49, 0x2075: 0x2f51,
+	0x2076: 0x2f59, 0x2077: 0x901d, 0x2078: 0x903d, 0x2079: 0x905d, 0x207a: 0x2f61, 0x207b: 0x907d,
+	0x207c: 0x2f69, 0x207d: 0x2f71, 0x207e: 0x2f79, 0x207f: 0x2f81,
+	// Block 0x82, offset 0x2080
+	0x2080: 0x2f89, 0x2081: 0x2f91, 0x2082: 0x2f99, 0x2083: 0x2fa1, 0x2084: 0x2fa9, 0x2085: 0x2fb1,
+	0x2086: 0x909d, 0x2087: 0x2fb9, 0x2088: 0x2fc1, 0x2089: 0x2fc9, 0x208a: 0x2fd1, 0x208b: 0x2fd9,
+	0x208c: 0x2fe1, 0x208d: 0x90bd, 0x208e: 0x2fe9, 0x208f: 0x2ff1, 0x2090: 0x90dd, 0x2091: 0x90fd,
+	0x2092: 0x2ff9, 0x2093: 0x3001, 0x2094: 0x3009, 0x2095: 0x3011, 0x2096: 0x3019, 0x2097: 0x3021,
+	0x2098: 0x3029, 0x2099: 0x3031, 0x209a: 0x3039, 0x209b: 0x911d, 0x209c: 0x3041, 0x209d: 0x913d,
+	0x209e: 0x3049, 0x209f: 0x2040, 0x20a0: 0x3051, 0x20a1: 0x3059, 0x20a2: 0x3061, 0x20a3: 0x915d,
+	0x20a4: 0x3069, 0x20a5: 0x3071, 0x20a6: 0x917d, 0x20a7: 0x919d, 0x20a8: 0x3079, 0x20a9: 0x3081,
+	0x20aa: 0x3089, 0x20ab: 0x3091, 0x20ac: 0x3099, 0x20ad: 0x3099, 0x20ae: 0x30a1, 0x20af: 0x30a9,
+	0x20b0: 0x30b1, 0x20b1: 0x30b9, 0x20b2: 0x30c1, 0x20b3: 0x30c9, 0x20b4: 0x30d1, 0x20b5: 0x91bd,
+	0x20b6: 0x30d9, 0x20b7: 0x91dd, 0x20b8: 0x30e1, 0x20b9: 0x91fd, 0x20ba: 0x30e9, 0x20bb: 0x921d,
+	0x20bc: 0x923d, 0x20bd: 0x925d, 0x20be: 0x30f1, 0x20bf: 0x30f9,
+	// Block 0x83, offset 0x20c0
+	0x20c0: 0x3101, 0x20c1: 0x927d, 0x20c2: 0x929d, 0x20c3: 0x92bd, 0x20c4: 0x92dd, 0x20c5: 0x3109,
+	0x20c6: 0x3111, 0x20c7: 0x3111, 0x20c8: 0x3119, 0x20c9: 0x3121, 0x20ca: 0x3129, 0x20cb: 0x3131,
+	0x20cc: 0x3139, 0x20cd: 0x92fd, 0x20ce: 0x3141, 0x20cf: 0x3149, 0x20d0: 0x3151, 0x20d1: 0x3159,
+	0x20d2: 0x931d, 0x20d3: 0x3161, 0x20d4: 0x933d, 0x20d5: 0x935d, 0x20d6: 0x3169, 0x20d7: 0x3171,
+	0x20d8: 0x3179, 0x20d9: 0x3181, 0x20da: 0x3189, 0x20db: 0x3191, 0x20dc: 0x937d, 0x20dd: 0x939d,
+	0x20de: 0x93bd, 0x20df: 0x2040, 0x20e0: 0x3199, 0x20e1: 0x93dd, 0x20e2: 0x31a1, 0x20e3: 0x31a9,
+	0x20e4: 0x31b1, 0x20e5: 0x93fd, 0x20e6: 0x31b9, 0x20e7: 0x31c1, 0x20e8: 0x31c9, 0x20e9: 0x31d1,
+	0x20ea: 0x31d9, 0x20eb: 0x941d, 0x20ec: 0x31e1, 0x20ed: 0x31e9, 0x20ee: 0x31f1, 0x20ef: 0x31f9,
+	0x20f0: 0x3201, 0x20f1: 0x3209, 0x20f2: 0x943d, 0x20f3: 0x945d, 0x20f4: 0x3211, 0x20f5: 0x947d,
+	0x20f6: 0x3219, 0x20f7: 0x949d, 0x20f8: 0x3221, 0x20f9: 0x3229, 0x20fa: 0x3231, 0x20fb: 0x94bd,
+	0x20fc: 0x94dd, 0x20fd: 0x3239, 0x20fe: 0x94fd, 0x20ff: 0x3241,
+	// Block 0x84, offset 0x2100
+	0x2100: 0x951d, 0x2101: 0x3249, 0x2102: 0x3251, 0x2103: 0x3259, 0x2104: 0x3261, 0x2105: 0x3269,
+	0x2106: 0x3271, 0x2107: 0x953d, 0x2108: 0x955d, 0x2109: 0x957d, 0x210a: 0x959d, 0x210b: 0x2ca1,
+	0x210c: 0x3279, 0x210d: 0x3281, 0x210e: 0x3289, 0x210f: 0x3291, 0x2110: 0x3299, 0x2111: 0x32a1,
+	0x2112: 0x32a9, 0x2113: 0x32b1, 0x2114: 0x32b9, 0x2115: 0x32c1, 0x2116: 0x32c9, 0x2117: 0x95bd,
+	0x2118: 0x32d1, 0x2119: 0x32d9, 0x211a: 0x32e1, 0x211b: 0x32e9, 0x211c: 0x32f1, 0x211d: 0x32f9,
+	0x211e: 0x3301, 0x211f: 0x3309, 0x2120: 0x3311, 0x2121: 0x3319, 0x2122: 0x3321, 0x2123: 0x3329,
+	0x2124: 0x95dd, 0x2125: 0x95fd, 0x2126: 0x961d, 0x2127: 0x3331, 0x2128: 0x3339, 0x2129: 0x3341,
+	0x212a: 0x3349, 0x212b: 0x963d, 0x212c: 0x3351, 0x212d: 0x965d, 0x212e: 0x3359, 0x212f: 0x3361,
+	0x2130: 0x967d, 0x2131: 0x969d, 0x2132: 0x3369, 0x2133: 0x3371, 0x2134: 0x3379, 0x2135: 0x3381,
+	0x2136: 0x3389, 0x2137: 0x3391, 0x2138: 0x3399, 0x2139: 0x33a1, 0x213a: 0x33a9, 0x213b: 0x33b1,
+	0x213c: 0x33b9, 0x213d: 0x33c1, 0x213e: 0x33c9, 0x213f: 0x2040,
+	// Block 0x85, offset 0x2140
+	0x2140: 0x33d1, 0x2141: 0x33d9, 0x2142: 0x33e1, 0x2143: 0x33e9, 0x2144: 0x33f1, 0x2145: 0x96bd,
+	0x2146: 0x33f9, 0x2147: 0x3401, 0x2148: 0x3409, 0x2149: 0x3411, 0x214a: 0x3419, 0x214b: 0x96dd,
+	0x214c: 0x96fd, 0x214d: 0x3421, 0x214e: 0x3429, 0x214f: 0x3431, 0x2150: 0x3439, 0x2151: 0x3441,
+	0x2152: 0x3449, 0x2153: 0x971d, 0x2154: 0x3451, 0x2155: 0x3459, 0x2156: 0x3461, 0x2157: 0x3469,
+	0x2158: 0x973d, 0x2159: 0x975d, 0x215a: 0x3471, 0x215b: 0x3479, 0x215c: 0x3481, 0x215d: 0x977d,
+	0x215e: 0x3489, 0x215f: 0x3491, 0x2160: 0x684d, 0x2161: 0x979d, 0x2162: 0x3499, 0x2163: 0x34a1,
+	0x2164: 0x34a9, 0x2165: 0x97bd, 0x2166: 0x34b1, 0x2167: 0x34b9, 0x2168: 0x34c1, 0x2169: 0x34c9,
+	0x216a: 0x34d1, 0x216b: 0x34d9, 0x216c: 0x34e1, 0x216d: 0x97dd, 0x216e: 0x34e9, 0x216f: 0x34f1,
+	0x2170: 0x34f9, 0x2171: 0x97fd, 0x2172: 0x3501, 0x2173: 0x3509, 0x2174: 0x3511, 0x2175: 0x3519,
+	0x2176: 0x7b6d, 0x2177: 0x981d, 0x2178: 0x3521, 0x2179: 0x3529, 0x217a: 0x3531, 0x217b: 0x983d,
+	0x217c: 0x3539, 0x217d: 0x985d, 0x217e: 0x3541, 0x217f: 0x3541,
+	// Block 0x86, offset 0x2180
+	0x2180: 0x3549, 0x2181: 0x987d, 0x2182: 0x3551, 0x2183: 0x3559, 0x2184: 0x3561, 0x2185: 0x3569,
+	0x2186: 0x3571, 0x2187: 0x3579, 0x2188: 0x3581, 0x2189: 0x989d, 0x218a: 0x3589, 0x218b: 0x3591,
+	0x218c: 0x3599, 0x218d: 0x35a1, 0x218e: 0x35a9, 0x218f: 0x35b1, 0x2190: 0x98bd, 0x2191: 0x35b9,
+	0x2192: 0x98dd, 0x2193: 0x98fd, 0x2194: 0x991d, 0x2195: 0x35c1, 0x2196: 0x35c9, 0x2197: 0x35d1,
+	0x2198: 0x35d9, 0x2199: 0x35e1, 0x219a: 0x35e9, 0x219b: 0x35f1, 0x219c: 0x35f9, 0x219d: 0x993d,
+	0x219e: 0x0040, 0x219f: 0x0040, 0x21a0: 0x0040, 0x21a1: 0x0040, 0x21a2: 0x0040, 0x21a3: 0x0040,
+	0x21a4: 0x0040, 0x21a5: 0x0040, 0x21a6: 0x0040, 0x21a7: 0x0040, 0x21a8: 0x0040, 0x21a9: 0x0040,
+	0x21aa: 0x0040, 0x21ab: 0x0040, 0x21ac: 0x0040, 0x21ad: 0x0040, 0x21ae: 0x0040, 0x21af: 0x0040,
+	0x21b0: 0x0040, 0x21b1: 0x0040, 0x21b2: 0x0040, 0x21b3: 0x0040, 0x21b4: 0x0040, 0x21b5: 0x0040,
+	0x21b6: 0x0040, 0x21b7: 0x0040, 0x21b8: 0x0040, 0x21b9: 0x0040, 0x21ba: 0x0040, 0x21bb: 0x0040,
+	0x21bc: 0x0040, 0x21bd: 0x0040, 0x21be: 0x0040, 0x21bf: 0x0040,
+}
+
+// idnaIndex: 39 blocks, 2496 entries, 4992 bytes
+// Block 0 is the zero block.
+var idnaIndex = [2496]uint16{
+	// Block 0x0, offset 0x0
+	// Block 0x1, offset 0x40
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc2: 0x01, 0xc3: 0x85, 0xc4: 0x02, 0xc5: 0x03, 0xc6: 0x04, 0xc7: 0x05,
+	0xc8: 0x06, 0xc9: 0x86, 0xca: 0x87, 0xcb: 0x07, 0xcc: 0x88, 0xcd: 0x08, 0xce: 0x09, 0xcf: 0x0a,
+	0xd0: 0x89, 0xd1: 0x0b, 0xd2: 0x0c, 0xd3: 0x0d, 0xd4: 0x0e, 0xd5: 0x8a, 0xd6: 0x8b, 0xd7: 0x8c,
+	0xd8: 0x0f, 0xd9: 0x10, 0xda: 0x8d, 0xdb: 0x11, 0xdc: 0x12, 0xdd: 0x8e, 0xde: 0x8f, 0xdf: 0x90,
+	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05, 0xe4: 0x06, 0xe5: 0x07, 0xe6: 0x07, 0xe7: 0x07,
+	0xe8: 0x07, 0xe9: 0x07, 0xea: 0x08, 0xeb: 0x07, 0xec: 0x07, 0xed: 0x09, 0xee: 0x0a, 0xef: 0x0b,
+	0xf0: 0x20, 0xf1: 0x21, 0xf2: 0x21, 0xf3: 0x23, 0xf4: 0x24,
+	// Block 0x4, offset 0x100
+	0x120: 0x91, 0x121: 0x13, 0x122: 0x14, 0x123: 0x92, 0x124: 0x93, 0x125: 0x15, 0x126: 0x16, 0x127: 0x17,
+	0x128: 0x18, 0x129: 0x19, 0x12a: 0x1a, 0x12b: 0x1b, 0x12c: 0x1c, 0x12d: 0x1d, 0x12e: 0x1e, 0x12f: 0x94,
+	0x130: 0x95, 0x131: 0x1f, 0x132: 0x20, 0x133: 0x21, 0x134: 0x96, 0x135: 0x22, 0x136: 0x97, 0x137: 0x98,
+	0x138: 0x99, 0x139: 0x9a, 0x13a: 0x23, 0x13b: 0x9b, 0x13c: 0x9c, 0x13d: 0x24, 0x13e: 0x25, 0x13f: 0x9d,
+	// Block 0x5, offset 0x140
+	0x140: 0x9e, 0x141: 0x9f, 0x142: 0xa0, 0x143: 0xa1, 0x144: 0xa2, 0x145: 0xa3, 0x146: 0xa4, 0x147: 0xa5,
+	0x148: 0xa6, 0x149: 0xa7, 0x14a: 0xa8, 0x14b: 0xa9, 0x14c: 0xaa, 0x14d: 0xab, 0x14e: 0xac, 0x14f: 0xad,
+	0x150: 0xae, 0x151: 0xa6, 0x152: 0xa6, 0x153: 0xa6, 0x154: 0xa6, 0x155: 0xa6, 0x156: 0xa6, 0x157: 0xa6,
+	0x158: 0xa6, 0x159: 0xaf, 0x15a: 0xb0, 0x15b: 0xb1, 0x15c: 0xb2, 0x15d: 0xb3, 0x15e: 0xb4, 0x15f: 0xb5,
+	0x160: 0xb6, 0x161: 0xb7, 0x162: 0xb8, 0x163: 0xb9, 0x164: 0xba, 0x165: 0xbb, 0x166: 0xbc, 0x167: 0xbd,
+	0x168: 0xbe, 0x169: 0xbf, 0x16a: 0xc0, 0x16b: 0xc1, 0x16c: 0xc2, 0x16d: 0xc3, 0x16e: 0xc4, 0x16f: 0xc5,
+	0x170: 0xc6, 0x171: 0xc7, 0x172: 0xc8, 0x173: 0xc9, 0x174: 0x26, 0x175: 0x27, 0x176: 0x28, 0x177: 0x88,
+	0x178: 0x29, 0x179: 0x29, 0x17a: 0x2a, 0x17b: 0x29, 0x17c: 0xca, 0x17d: 0x2b, 0x17e: 0x2c, 0x17f: 0x2d,
+	// Block 0x6, offset 0x180
+	0x180: 0x2e, 0x181: 0x2f, 0x182: 0x30, 0x183: 0xcb, 0x184: 0x31, 0x185: 0x32, 0x186: 0xcc, 0x187: 0xa2,
+	0x188: 0xcd, 0x189: 0xce, 0x18a: 0xa2, 0x18b: 0xa2, 0x18c: 0xcf, 0x18d: 0xa2, 0x18e: 0xa2, 0x18f: 0xa2,
+	0x190: 0xd0, 0x191: 0x33, 0x192: 0x34, 0x193: 0x35, 0x194: 0xa2, 0x195: 0xa2, 0x196: 0xa2, 0x197: 0xa2,
+	0x198: 0xa2, 0x199: 0xa2, 0x19a: 0xa2, 0x19b: 0xa2, 0x19c: 0xa2, 0x19d: 0xa2, 0x19e: 0xa2, 0x19f: 0xa2,
+	0x1a0: 0xa2, 0x1a1: 0xa2, 0x1a2: 0xa2, 0x1a3: 0xa2, 0x1a4: 0xa2, 0x1a5: 0xa2, 0x1a6: 0xa2, 0x1a7: 0xa2,
+	0x1a8: 0xd1, 0x1a9: 0xd2, 0x1aa: 0xa2, 0x1ab: 0xd3, 0x1ac: 0xa2, 0x1ad: 0xd4, 0x1ae: 0xd5, 0x1af: 0xa2,
+	0x1b0: 0xd6, 0x1b1: 0x36, 0x1b2: 0x29, 0x1b3: 0x37, 0x1b4: 0xd7, 0x1b5: 0xd8, 0x1b6: 0xd9, 0x1b7: 0xda,
+	0x1b8: 0xdb, 0x1b9: 0xdc, 0x1ba: 0xdd, 0x1bb: 0xde, 0x1bc: 0xdf, 0x1bd: 0xe0, 0x1be: 0xe1, 0x1bf: 0x38,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x39, 0x1c1: 0xe2, 0x1c2: 0xe3, 0x1c3: 0xe4, 0x1c4: 0xe5, 0x1c5: 0x3a, 0x1c6: 0x3b, 0x1c7: 0xe6,
+	0x1c8: 0xe7, 0x1c9: 0x3c, 0x1ca: 0x3d, 0x1cb: 0x3e, 0x1cc: 0xe8, 0x1cd: 0xe9, 0x1ce: 0x3f, 0x1cf: 0x40,
+	0x1d0: 0xa6, 0x1d1: 0xa6, 0x1d2: 0xa6, 0x1d3: 0xa6, 0x1d4: 0xa6, 0x1d5: 0xa6, 0x1d6: 0xa6, 0x1d7: 0xa6,
+	0x1d8: 0xa6, 0x1d9: 0xa6, 0x1da: 0xa6, 0x1db: 0xa6, 0x1dc: 0xa6, 0x1dd: 0xa6, 0x1de: 0xa6, 0x1df: 0xa6,
+	0x1e0: 0xa6, 0x1e1: 0xa6, 0x1e2: 0xa6, 0x1e3: 0xa6, 0x1e4: 0xa6, 0x1e5: 0xa6, 0x1e6: 0xa6, 0x1e7: 0xa6,
+	0x1e8: 0xa6, 0x1e9: 0xa6, 0x1ea: 0xa6, 0x1eb: 0xa6, 0x1ec: 0xa6, 0x1ed: 0xa6, 0x1ee: 0xa6, 0x1ef: 0xa6,
+	0x1f0: 0xa6, 0x1f1: 0xa6, 0x1f2: 0xa6, 0x1f3: 0xa6, 0x1f4: 0xa6, 0x1f5: 0xa6, 0x1f6: 0xa6, 0x1f7: 0xa6,
+	0x1f8: 0xa6, 0x1f9: 0xa6, 0x1fa: 0xa6, 0x1fb: 0xa6, 0x1fc: 0xa6, 0x1fd: 0xa6, 0x1fe: 0xa6, 0x1ff: 0xa6,
+	// Block 0x8, offset 0x200
+	0x200: 0xa6, 0x201: 0xa6, 0x202: 0xa6, 0x203: 0xa6, 0x204: 0xa6, 0x205: 0xa6, 0x206: 0xa6, 0x207: 0xa6,
+	0x208: 0xa6, 0x209: 0xa6, 0x20a: 0xa6, 0x20b: 0xa6, 0x20c: 0xa6, 0x20d: 0xa6, 0x20e: 0xa6, 0x20f: 0xa6,
+	0x210: 0xa6, 0x211: 0xa6, 0x212: 0xa6, 0x213: 0xa6, 0x214: 0xa6, 0x215: 0xa6, 0x216: 0xa6, 0x217: 0xa6,
+	0x218: 0xa6, 0x219: 0xa6, 0x21a: 0xa6, 0x21b: 0xa6, 0x21c: 0xa6, 0x21d: 0xa6, 0x21e: 0xa6, 0x21f: 0xa6,
+	0x220: 0xa6, 0x221: 0xa6, 0x222: 0xa6, 0x223: 0xa6, 0x224: 0xa6, 0x225: 0xa6, 0x226: 0xa6, 0x227: 0xa6,
+	0x228: 0xa6, 0x229: 0xa6, 0x22a: 0xa6, 0x22b: 0xa6, 0x22c: 0xa6, 0x22d: 0xa6, 0x22e: 0xa6, 0x22f: 0xa6,
+	0x230: 0xa6, 0x231: 0xa6, 0x232: 0xa6, 0x233: 0xa6, 0x234: 0xa6, 0x235: 0xa6, 0x236: 0xa6, 0x237: 0xa2,
+	0x238: 0xa6, 0x239: 0xa6, 0x23a: 0xa6, 0x23b: 0xa6, 0x23c: 0xa6, 0x23d: 0xa6, 0x23e: 0xa6, 0x23f: 0xa6,
+	// Block 0x9, offset 0x240
+	0x240: 0xa6, 0x241: 0xa6, 0x242: 0xa6, 0x243: 0xa6, 0x244: 0xa6, 0x245: 0xa6, 0x246: 0xa6, 0x247: 0xa6,
+	0x248: 0xa6, 0x249: 0xa6, 0x24a: 0xa6, 0x24b: 0xa6, 0x24c: 0xa6, 0x24d: 0xa6, 0x24e: 0xa6, 0x24f: 0xa6,
+	0x250: 0xa6, 0x251: 0xa6, 0x252: 0xa6, 0x253: 0xa6, 0x254: 0xa6, 0x255: 0xa6, 0x256: 0xa6, 0x257: 0xa6,
+	0x258: 0xa6, 0x259: 0xa6, 0x25a: 0xa6, 0x25b: 0xa6, 0x25c: 0xa6, 0x25d: 0xa6, 0x25e: 0xa6, 0x25f: 0xa6,
+	0x260: 0xa6, 0x261: 0xa6, 0x262: 0xa6, 0x263: 0xa6, 0x264: 0xa6, 0x265: 0xa6, 0x266: 0xa6, 0x267: 0xa6,
+	0x268: 0xa6, 0x269: 0xa6, 0x26a: 0xa6, 0x26b: 0xa6, 0x26c: 0xa6, 0x26d: 0xa6, 0x26e: 0xa6, 0x26f: 0xa6,
+	0x270: 0xa6, 0x271: 0xa6, 0x272: 0xa6, 0x273: 0xa6, 0x274: 0xa6, 0x275: 0xa6, 0x276: 0xa6, 0x277: 0xa6,
+	0x278: 0xa6, 0x279: 0xa6, 0x27a: 0xa6, 0x27b: 0xa6, 0x27c: 0xa6, 0x27d: 0xa6, 0x27e: 0xa6, 0x27f: 0xa6,
+	// Block 0xa, offset 0x280
+	0x280: 0xa6, 0x281: 0xa6, 0x282: 0xa6, 0x283: 0xa6, 0x284: 0xa6, 0x285: 0xa6, 0x286: 0xa6, 0x287: 0xa6,
+	0x288: 0xa6, 0x289: 0xa6, 0x28a: 0xa6, 0x28b: 0xa6, 0x28c: 0xa6, 0x28d: 0xa6, 0x28e: 0xa6, 0x28f: 0xa6,
+	0x290: 0xa6, 0x291: 0xa6, 0x292: 0xea, 0x293: 0xeb, 0x294: 0xa6, 0x295: 0xa6, 0x296: 0xa6, 0x297: 0xa6,
+	0x298: 0xec, 0x299: 0x41, 0x29a: 0x42, 0x29b: 0xed, 0x29c: 0x43, 0x29d: 0x44, 0x29e: 0x45, 0x29f: 0x46,
+	0x2a0: 0xee, 0x2a1: 0xef, 0x2a2: 0xf0, 0x2a3: 0xf1, 0x2a4: 0xf2, 0x2a5: 0xf3, 0x2a6: 0xf4, 0x2a7: 0xf5,
+	0x2a8: 0xf6, 0x2a9: 0xf7, 0x2aa: 0xf8, 0x2ab: 0xf9, 0x2ac: 0xfa, 0x2ad: 0xfb, 0x2ae: 0xfc, 0x2af: 0xfd,
+	0x2b0: 0xa6, 0x2b1: 0xa6, 0x2b2: 0xa6, 0x2b3: 0xa6, 0x2b4: 0xa6, 0x2b5: 0xa6, 0x2b6: 0xa6, 0x2b7: 0xa6,
+	0x2b8: 0xa6, 0x2b9: 0xa6, 0x2ba: 0xa6, 0x2bb: 0xa6, 0x2bc: 0xa6, 0x2bd: 0xa6, 0x2be: 0xa6, 0x2bf: 0xa6,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0xa6, 0x2c1: 0xa6, 0x2c2: 0xa6, 0x2c3: 0xa6, 0x2c4: 0xa6, 0x2c5: 0xa6, 0x2c6: 0xa6, 0x2c7: 0xa6,
+	0x2c8: 0xa6, 0x2c9: 0xa6, 0x2ca: 0xa6, 0x2cb: 0xa6, 0x2cc: 0xa6, 0x2cd: 0xa6, 0x2ce: 0xa6, 0x2cf: 0xa6,
+	0x2d0: 0xa6, 0x2d1: 0xa6, 0x2d2: 0xa6, 0x2d3: 0xa6, 0x2d4: 0xa6, 0x2d5: 0xa6, 0x2d6: 0xa6, 0x2d7: 0xa6,
+	0x2d8: 0xa6, 0x2d9: 0xa6, 0x2da: 0xa6, 0x2db: 0xa6, 0x2dc: 0xa6, 0x2dd: 0xa6, 0x2de: 0xfe, 0x2df: 0xff,
+	// Block 0xc, offset 0x300
+	0x300: 0x100, 0x301: 0x100, 0x302: 0x100, 0x303: 0x100, 0x304: 0x100, 0x305: 0x100, 0x306: 0x100, 0x307: 0x100,
+	0x308: 0x100, 0x309: 0x100, 0x30a: 0x100, 0x30b: 0x100, 0x30c: 0x100, 0x30d: 0x100, 0x30e: 0x100, 0x30f: 0x100,
+	0x310: 0x100, 0x311: 0x100, 0x312: 0x100, 0x313: 0x100, 0x314: 0x100, 0x315: 0x100, 0x316: 0x100, 0x317: 0x100,
+	0x318: 0x100, 0x319: 0x100, 0x31a: 0x100, 0x31b: 0x100, 0x31c: 0x100, 0x31d: 0x100, 0x31e: 0x100, 0x31f: 0x100,
+	0x320: 0x100, 0x321: 0x100, 0x322: 0x100, 0x323: 0x100, 0x324: 0x100, 0x325: 0x100, 0x326: 0x100, 0x327: 0x100,
+	0x328: 0x100, 0x329: 0x100, 0x32a: 0x100, 0x32b: 0x100, 0x32c: 0x100, 0x32d: 0x100, 0x32e: 0x100, 0x32f: 0x100,
+	0x330: 0x100, 0x331: 0x100, 0x332: 0x100, 0x333: 0x100, 0x334: 0x100, 0x335: 0x100, 0x336: 0x100, 0x337: 0x100,
+	0x338: 0x100, 0x339: 0x100, 0x33a: 0x100, 0x33b: 0x100, 0x33c: 0x100, 0x33d: 0x100, 0x33e: 0x100, 0x33f: 0x100,
+	// Block 0xd, offset 0x340
+	0x340: 0x100, 0x341: 0x100, 0x342: 0x100, 0x343: 0x100, 0x344: 0x100, 0x345: 0x100, 0x346: 0x100, 0x347: 0x100,
+	0x348: 0x100, 0x349: 0x100, 0x34a: 0x100, 0x34b: 0x100, 0x34c: 0x100, 0x34d: 0x100, 0x34e: 0x100, 0x34f: 0x100,
+	0x350: 0x100, 0x351: 0x100, 0x352: 0x100, 0x353: 0x100, 0x354: 0x100, 0x355: 0x100, 0x356: 0x100, 0x357: 0x100,
+	0x358: 0x100, 0x359: 0x100, 0x35a: 0x100, 0x35b: 0x100, 0x35c: 0x100, 0x35d: 0x100, 0x35e: 0x100, 0x35f: 0x100,
+	0x360: 0x100, 0x361: 0x100, 0x362: 0x100, 0x363: 0x100, 0x364: 0x101, 0x365: 0x102, 0x366: 0x103, 0x367: 0x104,
+	0x368: 0x47, 0x369: 0x105, 0x36a: 0x106, 0x36b: 0x48, 0x36c: 0x49, 0x36d: 0x4a, 0x36e: 0x4b, 0x36f: 0x4c,
+	0x370: 0x107, 0x371: 0x4d, 0x372: 0x4e, 0x373: 0x4f, 0x374: 0x50, 0x375: 0x51, 0x376: 0x108, 0x377: 0x52,
+	0x378: 0x53, 0x379: 0x54, 0x37a: 0x55, 0x37b: 0x56, 0x37c: 0x57, 0x37d: 0x58, 0x37e: 0x59, 0x37f: 0x5a,
+	// Block 0xe, offset 0x380
+	0x380: 0x109, 0x381: 0x10a, 0x382: 0xa6, 0x383: 0x10b, 0x384: 0x10c, 0x385: 0xa2, 0x386: 0x10d, 0x387: 0x10e,
+	0x388: 0x100, 0x389: 0x100, 0x38a: 0x10f, 0x38b: 0x110, 0x38c: 0x111, 0x38d: 0x112, 0x38e: 0x113, 0x38f: 0x114,
+	0x390: 0x115, 0x391: 0xa6, 0x392: 0x116, 0x393: 0x117, 0x394: 0x118, 0x395: 0x5b, 0x396: 0x5c, 0x397: 0x100,
+	0x398: 0xa6, 0x399: 0xa6, 0x39a: 0xa6, 0x39b: 0xa6, 0x39c: 0x119, 0x39d: 0x11a, 0x39e: 0x5d, 0x39f: 0x100,
+	0x3a0: 0x11b, 0x3a1: 0x11c, 0x3a2: 0x11d, 0x3a3: 0x11e, 0x3a4: 0x11f, 0x3a5: 0x100, 0x3a6: 0x120, 0x3a7: 0x121,
+	0x3a8: 0x122, 0x3a9: 0x123, 0x3aa: 0x124, 0x3ab: 0x5e, 0x3ac: 0x125, 0x3ad: 0x126, 0x3ae: 0x5f, 0x3af: 0x100,
+	0x3b0: 0x127, 0x3b1: 0x128, 0x3b2: 0x129, 0x3b3: 0x12a, 0x3b4: 0x12b, 0x3b5: 0x100, 0x3b6: 0x100, 0x3b7: 0x100,
+	0x3b8: 0x100, 0x3b9: 0x12c, 0x3ba: 0x12d, 0x3bb: 0x12e, 0x3bc: 0x12f, 0x3bd: 0x130, 0x3be: 0x131, 0x3bf: 0x132,
+	// Block 0xf, offset 0x3c0
+	0x3c0: 0x133, 0x3c1: 0x134, 0x3c2: 0x135, 0x3c3: 0x136, 0x3c4: 0x137, 0x3c5: 0x138, 0x3c6: 0x139, 0x3c7: 0x13a,
+	0x3c8: 0x13b, 0x3c9: 0x13c, 0x3ca: 0x13d, 0x3cb: 0x13e, 0x3cc: 0x60, 0x3cd: 0x61, 0x3ce: 0x100, 0x3cf: 0x100,
+	0x3d0: 0x13f, 0x3d1: 0x140, 0x3d2: 0x141, 0x3d3: 0x142, 0x3d4: 0x100, 0x3d5: 0x100, 0x3d6: 0x143, 0x3d7: 0x144,
+	0x3d8: 0x145, 0x3d9: 0x146, 0x3da: 0x147, 0x3db: 0x148, 0x3dc: 0x149, 0x3dd: 0x14a, 0x3de: 0x100, 0x3df: 0x100,
+	0x3e0: 0x14b, 0x3e1: 0x100, 0x3e2: 0x14c, 0x3e3: 0x14d, 0x3e4: 0x62, 0x3e5: 0x14e, 0x3e6: 0x14f, 0x3e7: 0x150,
+	0x3e8: 0x151, 0x3e9: 0x152, 0x3ea: 0x153, 0x3eb: 0x154, 0x3ec: 0x155, 0x3ed: 0x100, 0x3ee: 0x100, 0x3ef: 0x100,
+	0x3f0: 0x156, 0x3f1: 0x157, 0x3f2: 0x158, 0x3f3: 0x100, 0x3f4: 0x159, 0x3f5: 0x15a, 0x3f6: 0x15b, 0x3f7: 0x100,
+	0x3f8: 0x100, 0x3f9: 0x100, 0x3fa: 0x100, 0x3fb: 0x15c, 0x3fc: 0x15d, 0x3fd: 0x15e, 0x3fe: 0x15f, 0x3ff: 0x160,
+	// Block 0x10, offset 0x400
+	0x400: 0xa6, 0x401: 0xa6, 0x402: 0xa6, 0x403: 0xa6, 0x404: 0xa6, 0x405: 0xa6, 0x406: 0xa6, 0x407: 0xa6,
+	0x408: 0xa6, 0x409: 0xa6, 0x40a: 0xa6, 0x40b: 0xa6, 0x40c: 0xa6, 0x40d: 0xa6, 0x40e: 0x161, 0x40f: 0x100,
+	0x410: 0xa2, 0x411: 0x162, 0x412: 0xa6, 0x413: 0xa6, 0x414: 0xa6, 0x415: 0x163, 0x416: 0x100, 0x417: 0x100,
+	0x418: 0x100, 0x419: 0x100, 0x41a: 0x100, 0x41b: 0x100, 0x41c: 0x100, 0x41d: 0x100, 0x41e: 0x100, 0x41f: 0x100,
+	0x420: 0x100, 0x421: 0x100, 0x422: 0x100, 0x423: 0x100, 0x424: 0x100, 0x425: 0x100, 0x426: 0x100, 0x427: 0x100,
+	0x428: 0x100, 0x429: 0x100, 0x42a: 0x100, 0x42b: 0x100, 0x42c: 0x100, 0x42d: 0x100, 0x42e: 0x100, 0x42f: 0x100,
+	0x430: 0x100, 0x431: 0x100, 0x432: 0x100, 0x433: 0x100, 0x434: 0x100, 0x435: 0x100, 0x436: 0x100, 0x437: 0x100,
+	0x438: 0x100, 0x439: 0x100, 0x43a: 0x100, 0x43b: 0x100, 0x43c: 0x100, 0x43d: 0x100, 0x43e: 0x164, 0x43f: 0x165,
+	// Block 0x11, offset 0x440
+	0x440: 0xa6, 0x441: 0xa6, 0x442: 0xa6, 0x443: 0xa6, 0x444: 0xa6, 0x445: 0xa6, 0x446: 0xa6, 0x447: 0xa6,
+	0x448: 0xa6, 0x449: 0xa6, 0x44a: 0xa6, 0x44b: 0xa6, 0x44c: 0xa6, 0x44d: 0xa6, 0x44e: 0xa6, 0x44f: 0xa6,
+	0x450: 0x166, 0x451: 0x167, 0x452: 0x100, 0x453: 0x100, 0x454: 0x100, 0x455: 0x100, 0x456: 0x100, 0x457: 0x100,
+	0x458: 0x100, 0x459: 0x100, 0x45a: 0x100, 0x45b: 0x100, 0x45c: 0x100, 0x45d: 0x100, 0x45e: 0x100, 0x45f: 0x100,
+	0x460: 0x100, 0x461: 0x100, 0x462: 0x100, 0x463: 0x100, 0x464: 0x100, 0x465: 0x100, 0x466: 0x100, 0x467: 0x100,
+	0x468: 0x100, 0x469: 0x100, 0x46a: 0x100, 0x46b: 0x100, 0x46c: 0x100, 0x46d: 0x100, 0x46e: 0x100, 0x46f: 0x100,
+	0x470: 0x100, 0x471: 0x100, 0x472: 0x100, 0x473: 0x100, 0x474: 0x100, 0x475: 0x100, 0x476: 0x100, 0x477: 0x100,
+	0x478: 0x100, 0x479: 0x100, 0x47a: 0x100, 0x47b: 0x100, 0x47c: 0x100, 0x47d: 0x100, 0x47e: 0x100, 0x47f: 0x100,
+	// Block 0x12, offset 0x480
+	0x480: 0x100, 0x481: 0x100, 0x482: 0x100, 0x483: 0x100, 0x484: 0x100, 0x485: 0x100, 0x486: 0x100, 0x487: 0x100,
+	0x488: 0x100, 0x489: 0x100, 0x48a: 0x100, 0x48b: 0x100, 0x48c: 0x100, 0x48d: 0x100, 0x48e: 0x100, 0x48f: 0x100,
+	0x490: 0xa6, 0x491: 0xa6, 0x492: 0xa6, 0x493: 0xa6, 0x494: 0xa6, 0x495: 0xa6, 0x496: 0xa6, 0x497: 0xa6,
+	0x498: 0xa6, 0x499: 0x14a, 0x49a: 0x100, 0x49b: 0x100, 0x49c: 0x100, 0x49d: 0x100, 0x49e: 0x100, 0x49f: 0x100,
+	0x4a0: 0x100, 0x4a1: 0x100, 0x4a2: 0x100, 0x4a3: 0x100, 0x4a4: 0x100, 0x4a5: 0x100, 0x4a6: 0x100, 0x4a7: 0x100,
+	0x4a8: 0x100, 0x4a9: 0x100, 0x4aa: 0x100, 0x4ab: 0x100, 0x4ac: 0x100, 0x4ad: 0x100, 0x4ae: 0x100, 0x4af: 0x100,
+	0x4b0: 0x100, 0x4b1: 0x100, 0x4b2: 0x100, 0x4b3: 0x100, 0x4b4: 0x100, 0x4b5: 0x100, 0x4b6: 0x100, 0x4b7: 0x100,
+	0x4b8: 0x100, 0x4b9: 0x100, 0x4ba: 0x100, 0x4bb: 0x100, 0x4bc: 0x100, 0x4bd: 0x100, 0x4be: 0x100, 0x4bf: 0x100,
+	// Block 0x13, offset 0x4c0
+	0x4c0: 0x100, 0x4c1: 0x100, 0x4c2: 0x100, 0x4c3: 0x100, 0x4c4: 0x100, 0x4c5: 0x100, 0x4c6: 0x100, 0x4c7: 0x100,
+	0x4c8: 0x100, 0x4c9: 0x100, 0x4ca: 0x100, 0x4cb: 0x100, 0x4cc: 0x100, 0x4cd: 0x100, 0x4ce: 0x100, 0x4cf: 0x100,
+	0x4d0: 0x100, 0x4d1: 0x100, 0x4d2: 0x100, 0x4d3: 0x100, 0x4d4: 0x100, 0x4d5: 0x100, 0x4d6: 0x100, 0x4d7: 0x100,
+	0x4d8: 0x100, 0x4d9: 0x100, 0x4da: 0x100, 0x4db: 0x100, 0x4dc: 0x100, 0x4dd: 0x100, 0x4de: 0x100, 0x4df: 0x100,
+	0x4e0: 0xa6, 0x4e1: 0xa6, 0x4e2: 0xa6, 0x4e3: 0xa6, 0x4e4: 0xa6, 0x4e5: 0xa6, 0x4e6: 0xa6, 0x4e7: 0xa6,
+	0x4e8: 0x154, 0x4e9: 0x168, 0x4ea: 0x169, 0x4eb: 0x16a, 0x4ec: 0x16b, 0x4ed: 0x16c, 0x4ee: 0x16d, 0x4ef: 0x100,
+	0x4f0: 0x100, 0x4f1: 0x100, 0x4f2: 0x100, 0x4f3: 0x100, 0x4f4: 0x100, 0x4f5: 0x100, 0x4f6: 0x100, 0x4f7: 0x100,
+	0x4f8: 0x100, 0x4f9: 0x16e, 0x4fa: 0x16f, 0x4fb: 0x100, 0x4fc: 0xa6, 0x4fd: 0x170, 0x4fe: 0x171, 0x4ff: 0x172,
+	// Block 0x14, offset 0x500
+	0x500: 0xa6, 0x501: 0xa6, 0x502: 0xa6, 0x503: 0xa6, 0x504: 0xa6, 0x505: 0xa6, 0x506: 0xa6, 0x507: 0xa6,
+	0x508: 0xa6, 0x509: 0xa6, 0x50a: 0xa6, 0x50b: 0xa6, 0x50c: 0xa6, 0x50d: 0xa6, 0x50e: 0xa6, 0x50f: 0xa6,
+	0x510: 0xa6, 0x511: 0xa6, 0x512: 0xa6, 0x513: 0xa6, 0x514: 0xa6, 0x515: 0xa6, 0x516: 0xa6, 0x517: 0xa6,
+	0x518: 0xa6, 0x519: 0xa6, 0x51a: 0xa6, 0x51b: 0xa6, 0x51c: 0xa6, 0x51d: 0xa6, 0x51e: 0xa6, 0x51f: 0x173,
+	0x520: 0xa6, 0x521: 0xa6, 0x522: 0xa6, 0x523: 0xa6, 0x524: 0xa6, 0x525: 0xa6, 0x526: 0xa6, 0x527: 0xa6,
+	0x528: 0xa6, 0x529: 0xa6, 0x52a: 0xa6, 0x52b: 0xa6, 0x52c: 0xa6, 0x52d: 0xa6, 0x52e: 0xa6, 0x52f: 0xa6,
+	0x530: 0xa6, 0x531: 0xa6, 0x532: 0xa6, 0x533: 0x174, 0x534: 0x175, 0x535: 0x100, 0x536: 0x100, 0x537: 0x100,
+	0x538: 0x100, 0x539: 0x100, 0x53a: 0x100, 0x53b: 0x100, 0x53c: 0x100, 0x53d: 0x100, 0x53e: 0x100, 0x53f: 0x100,
+	// Block 0x15, offset 0x540
+	0x540: 0x100, 0x541: 0x100, 0x542: 0x100, 0x543: 0x100, 0x544: 0x100, 0x545: 0x100, 0x546: 0x100, 0x547: 0x100,
+	0x548: 0x100, 0x549: 0x100, 0x54a: 0x100, 0x54b: 0x100, 0x54c: 0x100, 0x54d: 0x100, 0x54e: 0x100, 0x54f: 0x100,
+	0x550: 0x100, 0x551: 0x100, 0x552: 0x100, 0x553: 0x100, 0x554: 0x100, 0x555: 0x100, 0x556: 0x100, 0x557: 0x100,
+	0x558: 0x100, 0x559: 0x100, 0x55a: 0x100, 0x55b: 0x100, 0x55c: 0x100, 0x55d: 0x100, 0x55e: 0x100, 0x55f: 0x100,
+	0x560: 0x100, 0x561: 0x100, 0x562: 0x100, 0x563: 0x100, 0x564: 0x100, 0x565: 0x100, 0x566: 0x100, 0x567: 0x100,
+	0x568: 0x100, 0x569: 0x100, 0x56a: 0x100, 0x56b: 0x100, 0x56c: 0x100, 0x56d: 0x100, 0x56e: 0x100, 0x56f: 0x100,
+	0x570: 0x100, 0x571: 0x100, 0x572: 0x100, 0x573: 0x100, 0x574: 0x100, 0x575: 0x100, 0x576: 0x100, 0x577: 0x100,
+	0x578: 0x100, 0x579: 0x100, 0x57a: 0x100, 0x57b: 0x100, 0x57c: 0x100, 0x57d: 0x100, 0x57e: 0x100, 0x57f: 0x176,
+	// Block 0x16, offset 0x580
+	0x580: 0xa6, 0x581: 0xa6, 0x582: 0xa6, 0x583: 0xa6, 0x584: 0x177, 0x585: 0x178, 0x586: 0xa6, 0x587: 0xa6,
+	0x588: 0xa6, 0x589: 0xa6, 0x58a: 0xa6, 0x58b: 0x179, 0x58c: 0x100, 0x58d: 0x100, 0x58e: 0x100, 0x58f: 0x100,
+	0x590: 0x100, 0x591: 0x100, 0x592: 0x100, 0x593: 0x100, 0x594: 0x100, 0x595: 0x100, 0x596: 0x100, 0x597: 0x100,
+	0x598: 0x100, 0x599: 0x100, 0x59a: 0x100, 0x59b: 0x100, 0x59c: 0x100, 0x59d: 0x100, 0x59e: 0x100, 0x59f: 0x100,
+	0x5a0: 0x100, 0x5a1: 0x100, 0x5a2: 0x100, 0x5a3: 0x100, 0x5a4: 0x100, 0x5a5: 0x100, 0x5a6: 0x100, 0x5a7: 0x100,
+	0x5a8: 0x100, 0x5a9: 0x100, 0x5aa: 0x100, 0x5ab: 0x100, 0x5ac: 0x100, 0x5ad: 0x100, 0x5ae: 0x100, 0x5af: 0x100,
+	0x5b0: 0xa6, 0x5b1: 0x17a, 0x5b2: 0x17b, 0x5b3: 0x100, 0x5b4: 0x100, 0x5b5: 0x100, 0x5b6: 0x100, 0x5b7: 0x100,
+	0x5b8: 0x100, 0x5b9: 0x100, 0x5ba: 0x100, 0x5bb: 0x100, 0x5bc: 0x100, 0x5bd: 0x100, 0x5be: 0x100, 0x5bf: 0x100,
+	// Block 0x17, offset 0x5c0
+	0x5c0: 0x100, 0x5c1: 0x100, 0x5c2: 0x100, 0x5c3: 0x100, 0x5c4: 0x100, 0x5c5: 0x100, 0x5c6: 0x100, 0x5c7: 0x100,
+	0x5c8: 0x100, 0x5c9: 0x100, 0x5ca: 0x100, 0x5cb: 0x100, 0x5cc: 0x100, 0x5cd: 0x100, 0x5ce: 0x100, 0x5cf: 0x100,
+	0x5d0: 0x100, 0x5d1: 0x100, 0x5d2: 0x100, 0x5d3: 0x100, 0x5d4: 0x100, 0x5d5: 0x100, 0x5d6: 0x100, 0x5d7: 0x100,
+	0x5d8: 0x100, 0x5d9: 0x100, 0x5da: 0x100, 0x5db: 0x100, 0x5dc: 0x100, 0x5dd: 0x100, 0x5de: 0x100, 0x5df: 0x100,
+	0x5e0: 0x100, 0x5e1: 0x100, 0x5e2: 0x100, 0x5e3: 0x100, 0x5e4: 0x100, 0x5e5: 0x100, 0x5e6: 0x100, 0x5e7: 0x100,
+	0x5e8: 0x100, 0x5e9: 0x100, 0x5ea: 0x100, 0x5eb: 0x100, 0x5ec: 0x100, 0x5ed: 0x100, 0x5ee: 0x100, 0x5ef: 0x100,
+	0x5f0: 0x100, 0x5f1: 0x100, 0x5f2: 0x100, 0x5f3: 0x100, 0x5f4: 0x100, 0x5f5: 0x100, 0x5f6: 0x100, 0x5f7: 0x100,
+	0x5f8: 0x100, 0x5f9: 0x100, 0x5fa: 0x100, 0x5fb: 0x100, 0x5fc: 0x17c, 0x5fd: 0x17d, 0x5fe: 0xa2, 0x5ff: 0x17e,
+	// Block 0x18, offset 0x600
+	0x600: 0xa2, 0x601: 0xa2, 0x602: 0xa2, 0x603: 0x17f, 0x604: 0x180, 0x605: 0x181, 0x606: 0x182, 0x607: 0x183,
+	0x608: 0xa2, 0x609: 0x184, 0x60a: 0x100, 0x60b: 0x185, 0x60c: 0xa2, 0x60d: 0x186, 0x60e: 0x100, 0x60f: 0x100,
+	0x610: 0x63, 0x611: 0x64, 0x612: 0x65, 0x613: 0x66, 0x614: 0x67, 0x615: 0x68, 0x616: 0x69, 0x617: 0x6a,
+	0x618: 0x6b, 0x619: 0x6c, 0x61a: 0x6d, 0x61b: 0x6e, 0x61c: 0x6f, 0x61d: 0x70, 0x61e: 0x71, 0x61f: 0x72,
+	0x620: 0xa2, 0x621: 0xa2, 0x622: 0xa2, 0x623: 0xa2, 0x624: 0xa2, 0x625: 0xa2, 0x626: 0xa2, 0x627: 0xa2,
+	0x628: 0x187, 0x629: 0x188, 0x62a: 0x189, 0x62b: 0x100, 0x62c: 0x100, 0x62d: 0x100, 0x62e: 0x100, 0x62f: 0x100,
+	0x630: 0x100, 0x631: 0x100, 0x632: 0x100, 0x633: 0x100, 0x634: 0x100, 0x635: 0x100, 0x636: 0x100, 0x637: 0x100,
+	0x638: 0x100, 0x639: 0x100, 0x63a: 0x100, 0x63b: 0x100, 0x63c: 0x18a, 0x63d: 0x100, 0x63e: 0x100, 0x63f: 0x100,
+	// Block 0x19, offset 0x640
+	0x640: 0x73, 0x641: 0x74, 0x642: 0x18b, 0x643: 0x100, 0x644: 0x18c, 0x645: 0x18d, 0x646: 0x100, 0x647: 0x100,
+	0x648: 0x100, 0x649: 0x100, 0x64a: 0x18e, 0x64b: 0x18f, 0x64c: 0x100, 0x64d: 0x100, 0x64e: 0x100, 0x64f: 0x100,
+	0x650: 0x100, 0x651: 0x100, 0x652: 0x100, 0x653: 0x190, 0x654: 0x100, 0x655: 0x100, 0x656: 0x100, 0x657: 0x100,
+	0x658: 0x100, 0x659: 0x100, 0x65a: 0x100, 0x65b: 0x100, 0x65c: 0x100, 0x65d: 0x100, 0x65e: 0x100, 0x65f: 0x191,
+	0x660: 0x127, 0x661: 0x127, 0x662: 0x127, 0x663: 0x192, 0x664: 0x75, 0x665: 0x193, 0x666: 0x100, 0x667: 0x100,
+	0x668: 0x100, 0x669: 0x100, 0x66a: 0x100, 0x66b: 0x100, 0x66c: 0x100, 0x66d: 0x100, 0x66e: 0x100, 0x66f: 0x100,
+	0x670: 0x100, 0x671: 0x194, 0x672: 0x195, 0x673: 0x100, 0x674: 0x196, 0x675: 0x100, 0x676: 0x100, 0x677: 0x100,
+	0x678: 0x76, 0x679: 0x77, 0x67a: 0x78, 0x67b: 0x197, 0x67c: 0x100, 0x67d: 0x100, 0x67e: 0x100, 0x67f: 0x100,
+	// Block 0x1a, offset 0x680
+	0x680: 0x198, 0x681: 0xa2, 0x682: 0x199, 0x683: 0x19a, 0x684: 0x79, 0x685: 0x7a, 0x686: 0x19b, 0x687: 0x19c,
+	0x688: 0x7b, 0x689: 0x19d, 0x68a: 0x100, 0x68b: 0x100, 0x68c: 0xa2, 0x68d: 0xa2, 0x68e: 0xa2, 0x68f: 0xa2,
+	0x690: 0xa2, 0x691: 0xa2, 0x692: 0xa2, 0x693: 0xa2, 0x694: 0xa2, 0x695: 0xa2, 0x696: 0xa2, 0x697: 0xa2,
+	0x698: 0xa2, 0x699: 0xa2, 0x69a: 0xa2, 0x69b: 0x19e, 0x69c: 0xa2, 0x69d: 0x19f, 0x69e: 0xa2, 0x69f: 0x1a0,
+	0x6a0: 0x1a1, 0x6a1: 0x1a2, 0x6a2: 0x1a3, 0x6a3: 0x100, 0x6a4: 0xa2, 0x6a5: 0xa2, 0x6a6: 0xa2, 0x6a7: 0xa2,
+	0x6a8: 0xa2, 0x6a9: 0x1a4, 0x6aa: 0x1a5, 0x6ab: 0x1a6, 0x6ac: 0xa2, 0x6ad: 0xa2, 0x6ae: 0x1a7, 0x6af: 0x1a8,
+	0x6b0: 0x100, 0x6b1: 0x100, 0x6b2: 0x100, 0x6b3: 0x100, 0x6b4: 0x100, 0x6b5: 0x100, 0x6b6: 0x100, 0x6b7: 0x100,
+	0x6b8: 0x100, 0x6b9: 0x100, 0x6ba: 0x100, 0x6bb: 0x100, 0x6bc: 0x100, 0x6bd: 0x100, 0x6be: 0x100, 0x6bf: 0x100,
+	// Block 0x1b, offset 0x6c0
+	0x6c0: 0xa6, 0x6c1: 0xa6, 0x6c2: 0xa6, 0x6c3: 0xa6, 0x6c4: 0xa6, 0x6c5: 0xa6, 0x6c6: 0xa6, 0x6c7: 0xa6,
+	0x6c8: 0xa6, 0x6c9: 0xa6, 0x6ca: 0xa6, 0x6cb: 0xa6, 0x6cc: 0xa6, 0x6cd: 0xa6, 0x6ce: 0xa6, 0x6cf: 0xa6,
+	0x6d0: 0xa6, 0x6d1: 0xa6, 0x6d2: 0xa6, 0x6d3: 0xa6, 0x6d4: 0xa6, 0x6d5: 0xa6, 0x6d6: 0xa6, 0x6d7: 0xa6,
+	0x6d8: 0xa6, 0x6d9: 0xa6, 0x6da: 0xa6, 0x6db: 0x1a9, 0x6dc: 0xa6, 0x6dd: 0xa6, 0x6de: 0xa6, 0x6df: 0xa6,
+	0x6e0: 0xa6, 0x6e1: 0xa6, 0x6e2: 0xa6, 0x6e3: 0xa6, 0x6e4: 0xa6, 0x6e5: 0xa6, 0x6e6: 0xa6, 0x6e7: 0xa6,
+	0x6e8: 0xa6, 0x6e9: 0xa6, 0x6ea: 0xa6, 0x6eb: 0xa6, 0x6ec: 0xa6, 0x6ed: 0xa6, 0x6ee: 0xa6, 0x6ef: 0xa6,
+	0x6f0: 0xa6, 0x6f1: 0xa6, 0x6f2: 0xa6, 0x6f3: 0xa6, 0x6f4: 0xa6, 0x6f5: 0xa6, 0x6f6: 0xa6, 0x6f7: 0xa6,
+	0x6f8: 0xa6, 0x6f9: 0xa6, 0x6fa: 0xa6, 0x6fb: 0xa6, 0x6fc: 0xa6, 0x6fd: 0xa6, 0x6fe: 0xa6, 0x6ff: 0xa6,
+	// Block 0x1c, offset 0x700
+	0x700: 0xa6, 0x701: 0xa6, 0x702: 0xa6, 0x703: 0xa6, 0x704: 0xa6, 0x705: 0xa6, 0x706: 0xa6, 0x707: 0xa6,
+	0x708: 0xa6, 0x709: 0xa6, 0x70a: 0xa6, 0x70b: 0xa6, 0x70c: 0xa6, 0x70d: 0xa6, 0x70e: 0xa6, 0x70f: 0xa6,
+	0x710: 0xa6, 0x711: 0xa6, 0x712: 0xa6, 0x713: 0xa6, 0x714: 0xa6, 0x715: 0xa6, 0x716: 0xa6, 0x717: 0xa6,
+	0x718: 0xa6, 0x719: 0xa6, 0x71a: 0xa6, 0x71b: 0xa6, 0x71c: 0x1aa, 0x71d: 0xa6, 0x71e: 0xa6, 0x71f: 0xa6,
+	0x720: 0x1ab, 0x721: 0xa6, 0x722: 0xa6, 0x723: 0xa6, 0x724: 0xa6, 0x725: 0xa6, 0x726: 0xa6, 0x727: 0xa6,
+	0x728: 0xa6, 0x729: 0xa6, 0x72a: 0xa6, 0x72b: 0xa6, 0x72c: 0xa6, 0x72d: 0xa6, 0x72e: 0xa6, 0x72f: 0xa6,
+	0x730: 0xa6, 0x731: 0xa6, 0x732: 0xa6, 0x733: 0xa6, 0x734: 0xa6, 0x735: 0xa6, 0x736: 0xa6, 0x737: 0xa6,
+	0x738: 0xa6, 0x739: 0xa6, 0x73a: 0xa6, 0x73b: 0xa6, 0x73c: 0xa6, 0x73d: 0xa6, 0x73e: 0xa6, 0x73f: 0xa6,
+	// Block 0x1d, offset 0x740
+	0x740: 0xa6, 0x741: 0xa6, 0x742: 0xa6, 0x743: 0xa6, 0x744: 0xa6, 0x745: 0xa6, 0x746: 0xa6, 0x747: 0xa6,
+	0x748: 0xa6, 0x749: 0xa6, 0x74a: 0xa6, 0x74b: 0xa6, 0x74c: 0xa6, 0x74d: 0xa6, 0x74e: 0xa6, 0x74f: 0xa6,
+	0x750: 0xa6, 0x751: 0xa6, 0x752: 0xa6, 0x753: 0xa6, 0x754: 0xa6, 0x755: 0xa6, 0x756: 0xa6, 0x757: 0xa6,
+	0x758: 0xa6, 0x759: 0xa6, 0x75a: 0xa6, 0x75b: 0xa6, 0x75c: 0xa6, 0x75d: 0xa6, 0x75e: 0xa6, 0x75f: 0xa6,
+	0x760: 0xa6, 0x761: 0xa6, 0x762: 0xa6, 0x763: 0xa6, 0x764: 0xa6, 0x765: 0xa6, 0x766: 0xa6, 0x767: 0xa6,
+	0x768: 0xa6, 0x769: 0xa6, 0x76a: 0xa6, 0x76b: 0xa6, 0x76c: 0xa6, 0x76d: 0xa6, 0x76e: 0xa6, 0x76f: 0xa6,
+	0x770: 0xa6, 0x771: 0xa6, 0x772: 0xa6, 0x773: 0xa6, 0x774: 0xa6, 0x775: 0xa6, 0x776: 0xa6, 0x777: 0xa6,
+	0x778: 0xa6, 0x779: 0xa6, 0x77a: 0x1ac, 0x77b: 0xa6, 0x77c: 0xa6, 0x77d: 0xa6, 0x77e: 0xa6, 0x77f: 0xa6,
+	// Block 0x1e, offset 0x780
+	0x780: 0xa6, 0x781: 0xa6, 0x782: 0xa6, 0x783: 0xa6, 0x784: 0xa6, 0x785: 0xa6, 0x786: 0xa6, 0x787: 0xa6,
+	0x788: 0xa6, 0x789: 0xa6, 0x78a: 0xa6, 0x78b: 0xa6, 0x78c: 0xa6, 0x78d: 0xa6, 0x78e: 0xa6, 0x78f: 0xa6,
+	0x790: 0xa6, 0x791: 0xa6, 0x792: 0xa6, 0x793: 0xa6, 0x794: 0xa6, 0x795: 0xa6, 0x796: 0xa6, 0x797: 0xa6,
+	0x798: 0xa6, 0x799: 0xa6, 0x79a: 0xa6, 0x79b: 0xa6, 0x79c: 0xa6, 0x79d: 0xa6, 0x79e: 0xa6, 0x79f: 0xa6,
+	0x7a0: 0xa6, 0x7a1: 0xa6, 0x7a2: 0xa6, 0x7a3: 0xa6, 0x7a4: 0xa6, 0x7a5: 0xa6, 0x7a6: 0xa6, 0x7a7: 0xa6,
+	0x7a8: 0xa6, 0x7a9: 0xa6, 0x7aa: 0xa6, 0x7ab: 0xa6, 0x7ac: 0xa6, 0x7ad: 0xa6, 0x7ae: 0xa6, 0x7af: 0x1ad,
+	0x7b0: 0x100, 0x7b1: 0x100, 0x7b2: 0x100, 0x7b3: 0x100, 0x7b4: 0x100, 0x7b5: 0x100, 0x7b6: 0x100, 0x7b7: 0x100,
+	0x7b8: 0x100, 0x7b9: 0x100, 0x7ba: 0x100, 0x7bb: 0x100, 0x7bc: 0x100, 0x7bd: 0x100, 0x7be: 0x100, 0x7bf: 0x100,
+	// Block 0x1f, offset 0x7c0
+	0x7c0: 0x100, 0x7c1: 0x100, 0x7c2: 0x100, 0x7c3: 0x100, 0x7c4: 0x100, 0x7c5: 0x100, 0x7c6: 0x100, 0x7c7: 0x100,
+	0x7c8: 0x100, 0x7c9: 0x100, 0x7ca: 0x100, 0x7cb: 0x100, 0x7cc: 0x100, 0x7cd: 0x100, 0x7ce: 0x100, 0x7cf: 0x100,
+	0x7d0: 0x100, 0x7d1: 0x100, 0x7d2: 0x100, 0x7d3: 0x100, 0x7d4: 0x100, 0x7d5: 0x100, 0x7d6: 0x100, 0x7d7: 0x100,
+	0x7d8: 0x100, 0x7d9: 0x100, 0x7da: 0x100, 0x7db: 0x100, 0x7dc: 0x100, 0x7dd: 0x100, 0x7de: 0x100, 0x7df: 0x100,
+	0x7e0: 0x7c, 0x7e1: 0x7d, 0x7e2: 0x7e, 0x7e3: 0x7f, 0x7e4: 0x80, 0x7e5: 0x81, 0x7e6: 0x82, 0x7e7: 0x83,
+	0x7e8: 0x84, 0x7e9: 0x100, 0x7ea: 0x100, 0x7eb: 0x100, 0x7ec: 0x100, 0x7ed: 0x100, 0x7ee: 0x100, 0x7ef: 0x100,
+	0x7f0: 0x100, 0x7f1: 0x100, 0x7f2: 0x100, 0x7f3: 0x100, 0x7f4: 0x100, 0x7f5: 0x100, 0x7f6: 0x100, 0x7f7: 0x100,
+	0x7f8: 0x100, 0x7f9: 0x100, 0x7fa: 0x100, 0x7fb: 0x100, 0x7fc: 0x100, 0x7fd: 0x100, 0x7fe: 0x100, 0x7ff: 0x100,
+	// Block 0x20, offset 0x800
+	0x800: 0xa6, 0x801: 0xa6, 0x802: 0xa6, 0x803: 0xa6, 0x804: 0xa6, 0x805: 0xa6, 0x806: 0xa6, 0x807: 0xa6,
+	0x808: 0xa6, 0x809: 0xa6, 0x80a: 0xa6, 0x80b: 0xa6, 0x80c: 0xa6, 0x80d: 0x1ae, 0x80e: 0xa6, 0x80f: 0xa6,
+	0x810: 0xa6, 0x811: 0xa6, 0x812: 0xa6, 0x813: 0xa6, 0x814: 0xa6, 0x815: 0xa6, 0x816: 0xa6, 0x817: 0xa6,
+	0x818: 0xa6, 0x819: 0xa6, 0x81a: 0xa6, 0x81b: 0xa6, 0x81c: 0xa6, 0x81d: 0xa6, 0x81e: 0xa6, 0x81f: 0xa6,
+	0x820: 0xa6, 0x821: 0xa6, 0x822: 0xa6, 0x823: 0xa6, 0x824: 0xa6, 0x825: 0xa6, 0x826: 0xa6, 0x827: 0xa6,
+	0x828: 0xa6, 0x829: 0xa6, 0x82a: 0xa6, 0x82b: 0xa6, 0x82c: 0xa6, 0x82d: 0xa6, 0x82e: 0xa6, 0x82f: 0xa6,
+	0x830: 0xa6, 0x831: 0xa6, 0x832: 0xa6, 0x833: 0xa6, 0x834: 0xa6, 0x835: 0xa6, 0x836: 0xa6, 0x837: 0xa6,
+	0x838: 0xa6, 0x839: 0xa6, 0x83a: 0xa6, 0x83b: 0xa6, 0x83c: 0xa6, 0x83d: 0xa6, 0x83e: 0xa6, 0x83f: 0xa6,
+	// Block 0x21, offset 0x840
+	0x840: 0xa6, 0x841: 0xa6, 0x842: 0xa6, 0x843: 0xa6, 0x844: 0xa6, 0x845: 0xa6, 0x846: 0xa6, 0x847: 0xa6,
+	0x848: 0xa6, 0x849: 0xa6, 0x84a: 0xa6, 0x84b: 0xa6, 0x84c: 0xa6, 0x84d: 0xa6, 0x84e: 0x1af, 0x84f: 0x100,
+	0x850: 0x100, 0x851: 0x100, 0x852: 0x100, 0x853: 0x100, 0x854: 0x100, 0x855: 0x100, 0x856: 0x100, 0x857: 0x100,
+	0x858: 0x100, 0x859: 0x100, 0x85a: 0x100, 0x85b: 0x100, 0x85c: 0x100, 0x85d: 0x100, 0x85e: 0x100, 0x85f: 0x100,
+	0x860: 0x100, 0x861: 0x100, 0x862: 0x100, 0x863: 0x100, 0x864: 0x100, 0x865: 0x100, 0x866: 0x100, 0x867: 0x100,
+	0x868: 0x100, 0x869: 0x100, 0x86a: 0x100, 0x86b: 0x100, 0x86c: 0x100, 0x86d: 0x100, 0x86e: 0x100, 0x86f: 0x100,
+	0x870: 0x100, 0x871: 0x100, 0x872: 0x100, 0x873: 0x100, 0x874: 0x100, 0x875: 0x100, 0x876: 0x100, 0x877: 0x100,
+	0x878: 0x100, 0x879: 0x100, 0x87a: 0x100, 0x87b: 0x100, 0x87c: 0x100, 0x87d: 0x100, 0x87e: 0x100, 0x87f: 0x100,
+	// Block 0x22, offset 0x880
+	0x890: 0x0c, 0x891: 0x0d, 0x892: 0x0e, 0x893: 0x0f, 0x894: 0x10, 0x895: 0x0a, 0x896: 0x11, 0x897: 0x07,
+	0x898: 0x12, 0x899: 0x0a, 0x89a: 0x13, 0x89b: 0x14, 0x89c: 0x15, 0x89d: 0x16, 0x89e: 0x17, 0x89f: 0x18,
+	0x8a0: 0x07, 0x8a1: 0x07, 0x8a2: 0x07, 0x8a3: 0x07, 0x8a4: 0x07, 0x8a5: 0x07, 0x8a6: 0x07, 0x8a7: 0x07,
+	0x8a8: 0x07, 0x8a9: 0x07, 0x8aa: 0x19, 0x8ab: 0x1a, 0x8ac: 0x1b, 0x8ad: 0x07, 0x8ae: 0x1c, 0x8af: 0x1d,
+	0x8b0: 0x07, 0x8b1: 0x1e, 0x8b2: 0x1f, 0x8b3: 0x0a, 0x8b4: 0x0a, 0x8b5: 0x0a, 0x8b6: 0x0a, 0x8b7: 0x0a,
+	0x8b8: 0x0a, 0x8b9: 0x0a, 0x8ba: 0x0a, 0x8bb: 0x0a, 0x8bc: 0x0a, 0x8bd: 0x0a, 0x8be: 0x0a, 0x8bf: 0x0a,
+	// Block 0x23, offset 0x8c0
+	0x8c0: 0x0a, 0x8c1: 0x0a, 0x8c2: 0x0a, 0x8c3: 0x0a, 0x8c4: 0x0a, 0x8c5: 0x0a, 0x8c6: 0x0a, 0x8c7: 0x0a,
+	0x8c8: 0x0a, 0x8c9: 0x0a, 0x8ca: 0x0a, 0x8cb: 0x0a, 0x8cc: 0x0a, 0x8cd: 0x0a, 0x8ce: 0x0a, 0x8cf: 0x0a,
+	0x8d0: 0x0a, 0x8d1: 0x0a, 0x8d2: 0x0a, 0x8d3: 0x0a, 0x8d4: 0x0a, 0x8d5: 0x0a, 0x8d6: 0x0a, 0x8d7: 0x0a,
+	0x8d8: 0x0a, 0x8d9: 0x0a, 0x8da: 0x0a, 0x8db: 0x0a, 0x8dc: 0x0a, 0x8dd: 0x0a, 0x8de: 0x0a, 0x8df: 0x0a,
+	0x8e0: 0x0a, 0x8e1: 0x0a, 0x8e2: 0x0a, 0x8e3: 0x0a, 0x8e4: 0x0a, 0x8e5: 0x0a, 0x8e6: 0x0a, 0x8e7: 0x0a,
+	0x8e8: 0x0a, 0x8e9: 0x0a, 0x8ea: 0x0a, 0x8eb: 0x0a, 0x8ec: 0x0a, 0x8ed: 0x0a, 0x8ee: 0x0a, 0x8ef: 0x0a,
+	0x8f0: 0x0a, 0x8f1: 0x0a, 0x8f2: 0x0a, 0x8f3: 0x0a, 0x8f4: 0x0a, 0x8f5: 0x0a, 0x8f6: 0x0a, 0x8f7: 0x0a,
+	0x8f8: 0x0a, 0x8f9: 0x0a, 0x8fa: 0x0a, 0x8fb: 0x0a, 0x8fc: 0x0a, 0x8fd: 0x0a, 0x8fe: 0x0a, 0x8ff: 0x0a,
+	// Block 0x24, offset 0x900
+	0x900: 0x1b0, 0x901: 0x1b1, 0x902: 0x100, 0x903: 0x100, 0x904: 0x1b2, 0x905: 0x1b2, 0x906: 0x1b2, 0x907: 0x1b3,
+	0x908: 0x100, 0x909: 0x100, 0x90a: 0x100, 0x90b: 0x100, 0x90c: 0x100, 0x90d: 0x100, 0x90e: 0x100, 0x90f: 0x100,
+	0x910: 0x100, 0x911: 0x100, 0x912: 0x100, 0x913: 0x100, 0x914: 0x100, 0x915: 0x100, 0x916: 0x100, 0x917: 0x100,
+	0x918: 0x100, 0x919: 0x100, 0x91a: 0x100, 0x91b: 0x100, 0x91c: 0x100, 0x91d: 0x100, 0x91e: 0x100, 0x91f: 0x100,
+	0x920: 0x100, 0x921: 0x100, 0x922: 0x100, 0x923: 0x100, 0x924: 0x100, 0x925: 0x100, 0x926: 0x100, 0x927: 0x100,
+	0x928: 0x100, 0x929: 0x100, 0x92a: 0x100, 0x92b: 0x100, 0x92c: 0x100, 0x92d: 0x100, 0x92e: 0x100, 0x92f: 0x100,
+	0x930: 0x100, 0x931: 0x100, 0x932: 0x100, 0x933: 0x100, 0x934: 0x100, 0x935: 0x100, 0x936: 0x100, 0x937: 0x100,
+	0x938: 0x100, 0x939: 0x100, 0x93a: 0x100, 0x93b: 0x100, 0x93c: 0x100, 0x93d: 0x100, 0x93e: 0x100, 0x93f: 0x100,
+	// Block 0x25, offset 0x940
+	0x940: 0x0a, 0x941: 0x0a, 0x942: 0x0a, 0x943: 0x0a, 0x944: 0x0a, 0x945: 0x0a, 0x946: 0x0a, 0x947: 0x0a,
+	0x948: 0x0a, 0x949: 0x0a, 0x94a: 0x0a, 0x94b: 0x0a, 0x94c: 0x0a, 0x94d: 0x0a, 0x94e: 0x0a, 0x94f: 0x0a,
+	0x950: 0x0a, 0x951: 0x0a, 0x952: 0x0a, 0x953: 0x0a, 0x954: 0x0a, 0x955: 0x0a, 0x956: 0x0a, 0x957: 0x0a,
+	0x958: 0x0a, 0x959: 0x0a, 0x95a: 0x0a, 0x95b: 0x0a, 0x95c: 0x0a, 0x95d: 0x0a, 0x95e: 0x0a, 0x95f: 0x0a,
+	0x960: 0x22, 0x961: 0x0a, 0x962: 0x0a, 0x963: 0x0a, 0x964: 0x0a, 0x965: 0x0a, 0x966: 0x0a, 0x967: 0x0a,
+	0x968: 0x0a, 0x969: 0x0a, 0x96a: 0x0a, 0x96b: 0x0a, 0x96c: 0x0a, 0x96d: 0x0a, 0x96e: 0x0a, 0x96f: 0x0a,
+	0x970: 0x0a, 0x971: 0x0a, 0x972: 0x0a, 0x973: 0x0a, 0x974: 0x0a, 0x975: 0x0a, 0x976: 0x0a, 0x977: 0x0a,
+	0x978: 0x0a, 0x979: 0x0a, 0x97a: 0x0a, 0x97b: 0x0a, 0x97c: 0x0a, 0x97d: 0x0a, 0x97e: 0x0a, 0x97f: 0x0a,
+	// Block 0x26, offset 0x980
+	0x980: 0x0a, 0x981: 0x0a, 0x982: 0x0a, 0x983: 0x0a, 0x984: 0x0a, 0x985: 0x0a, 0x986: 0x0a, 0x987: 0x0a,
+	0x988: 0x0a, 0x989: 0x0a, 0x98a: 0x0a, 0x98b: 0x0a, 0x98c: 0x0a, 0x98d: 0x0a, 0x98e: 0x0a, 0x98f: 0x0a,
+}
+
+// idnaSparseOffset: 303 entries, 606 bytes
+var idnaSparseOffset = []uint16{0x0, 0x8, 0x19, 0x25, 0x27, 0x2c, 0x33, 0x3e, 0x4a, 0x4e, 0x5d, 0x62, 0x6c, 0x78, 0x7e, 0x87, 0x97, 0xa6, 0xb1, 0xbe, 0xcf, 0xd9, 0xe0, 0xed, 0xfe, 0x105, 0x110, 0x11f, 0x12d, 0x137, 0x139, 0x13e, 0x141, 0x144, 0x146, 0x152, 0x15d, 0x165, 0x16b, 0x171, 0x176, 0x17b, 0x17e, 0x182, 0x188, 0x18d, 0x198, 0x1a2, 0x1a8, 0x1b9, 0x1c4, 0x1c7, 0x1cf, 0x1d2, 0x1df, 0x1e7, 0x1eb, 0x1f2, 0x1fa, 0x20a, 0x216, 0x219, 0x223, 0x22f, 0x23b, 0x247, 0x24f, 0x254, 0x261, 0x272, 0x27d, 0x282, 0x28b, 0x293, 0x299, 0x29e, 0x2a1, 0x2a5, 0x2ab, 0x2af, 0x2b3, 0x2b7, 0x2bc, 0x2c4, 0x2cb, 0x2d6, 0x2e0, 0x2e4, 0x2e7, 0x2ed, 0x2f1, 0x2f3, 0x2f6, 0x2f8, 0x2fb, 0x305, 0x308, 0x317, 0x31b, 0x31f, 0x321, 0x32a, 0x32e, 0x333, 0x338, 0x33e, 0x34e, 0x354, 0x358, 0x367, 0x36c, 0x374, 0x37e, 0x389, 0x391, 0x3a2, 0x3ab, 0x3bb, 0x3c8, 0x3d4, 0x3d9, 0x3e6, 0x3ea, 0x3ef, 0x3f1, 0x3f3, 0x3f7, 0x3f9, 0x3fd, 0x406, 0x40c, 0x410, 0x420, 0x42a, 0x42f, 0x432, 0x438, 0x43f, 0x444, 0x448, 0x44e, 0x453, 0x45c, 0x461, 0x467, 0x46e, 0x475, 0x47c, 0x480, 0x483, 0x488, 0x494, 0x49a, 0x49f, 0x4a6, 0x4ae, 0x4b3, 0x4b7, 0x4c7, 0x4ce, 0x4d2, 0x4d6, 0x4dd, 0x4df, 0x4e2, 0x4e5, 0x4e9, 0x4f2, 0x4f6, 0x4fe, 0x501, 0x509, 0x514, 0x523, 0x52f, 0x535, 0x542, 0x54e, 0x556, 0x55f, 0x56a, 0x571, 0x580, 0x58d, 0x591, 0x59e, 0x5a7, 0x5ab, 0x5ba, 0x5c2, 0x5cd, 0x5d6, 0x5dc, 0x5e4, 0x5ed, 0x5f9, 0x5fc, 0x608, 0x60b, 0x614, 0x617, 0x61c, 0x625, 0x62a, 0x637, 0x642, 0x64b, 0x656, 0x659, 0x65c, 0x666, 0x66f, 0x67b, 0x688, 0x695, 0x6a3, 0x6aa, 0x6b5, 0x6bc, 0x6c0, 0x6c4, 0x6c7, 0x6cc, 0x6cf, 0x6d2, 0x6d6, 0x6d9, 0x6de, 0x6e5, 0x6e8, 0x6f0, 0x6f4, 0x6ff, 0x702, 0x705, 0x708, 0x70e, 0x714, 0x71d, 0x720, 0x723, 0x726, 0x72e, 0x733, 0x73c, 0x73f, 0x744, 0x74e, 0x752, 0x756, 0x759, 0x75c, 0x760, 0x76f, 0x77b, 0x77f, 0x784, 0x789, 0x78e, 0x792, 0x797, 0x7a0, 0x7a5, 0x7a9, 0x7af, 0x7b5, 0x7ba, 0x7c0, 0x7c6, 0x7d0, 0x7d6, 0x7df, 0x7e2, 0x7e5, 0x7e9, 0x7ed, 0x7f1, 0x7f7, 0x7fd, 0x802, 0x805, 0x815, 0x81c, 0x820, 0x827, 0x82b, 0x831, 0x838, 0x83f, 0x845, 0x84e, 0x852, 0x860, 0x863, 0x866, 0x86a, 0x86e, 0x871, 0x875, 0x878, 0x87d, 0x87f, 0x881}
+
+// idnaSparseValues: 2180 entries, 8720 bytes
+var idnaSparseValues = [2180]valueRange{
+	// Block 0x0, offset 0x0
+	{value: 0x0000, lo: 0x07},
+	{value: 0xe105, lo: 0x80, hi: 0x96},
+	{value: 0x0018, lo: 0x97, hi: 0x97},
+	{value: 0xe105, lo: 0x98, hi: 0x9e},
+	{value: 0x001f, lo: 0x9f, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xb6},
+	{value: 0x0018, lo: 0xb7, hi: 0xb7},
+	{value: 0x0008, lo: 0xb8, hi: 0xbf},
+	// Block 0x1, offset 0x8
+	{value: 0x0000, lo: 0x10},
+	{value: 0x0008, lo: 0x80, hi: 0x80},
+	{value: 0xe01d, lo: 0x81, hi: 0x81},
+	{value: 0x0008, lo: 0x82, hi: 0x82},
+	{value: 0x0335, lo: 0x83, hi: 0x83},
+	{value: 0x034d, lo: 0x84, hi: 0x84},
+	{value: 0x0365, lo: 0x85, hi: 0x85},
+	{value: 0xe00d, lo: 0x86, hi: 0x86},
+	{value: 0x0008, lo: 0x87, hi: 0x87},
+	{value: 0xe00d, lo: 0x88, hi: 0x88},
+	{value: 0x0008, lo: 0x89, hi: 0x89},
+	{value: 0xe00d, lo: 0x8a, hi: 0x8a},
+	{value: 0x0008, lo: 0x8b, hi: 0x8b},
+	{value: 0xe00d, lo: 0x8c, hi: 0x8c},
+	{value: 0x0008, lo: 0x8d, hi: 0x8d},
+	{value: 0xe00d, lo: 0x8e, hi: 0x8e},
+	{value: 0x0008, lo: 0x8f, hi: 0xbf},
+	// Block 0x2, offset 0x19
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x0008, lo: 0x80, hi: 0xaf},
+	{value: 0x00a9, lo: 0xb0, hi: 0xb0},
+	{value: 0x037d, lo: 0xb1, hi: 0xb1},
+	{value: 0x00b1, lo: 0xb2, hi: 0xb2},
+	{value: 0x00b9, lo: 0xb3, hi: 0xb3},
+	{value: 0x034d, lo: 0xb4, hi: 0xb4},
+	{value: 0x0395, lo: 0xb5, hi: 0xb5},
+	{value: 0xe1bd, lo: 0xb6, hi: 0xb6},
+	{value: 0x00c1, lo: 0xb7, hi: 0xb7},
+	{value: 0x00c9, lo: 0xb8, hi: 0xb8},
+	{value: 0x0008, lo: 0xb9, hi: 0xbf},
+	// Block 0x3, offset 0x25
+	{value: 0x0000, lo: 0x01},
+	{value: 0x3308, lo: 0x80, hi: 0xbf},
+	// Block 0x4, offset 0x27
+	{value: 0x0000, lo: 0x04},
+	{value: 0x03f5, lo: 0x80, hi: 0x8f},
+	{value: 0xe105, lo: 0x90, hi: 0x9f},
+	{value: 0x049d, lo: 0xa0, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xbf},
+	// Block 0x5, offset 0x2c
+	{value: 0x0000, lo: 0x06},
+	{value: 0xe185, lo: 0x80, hi: 0x8f},
+	{value: 0x0545, lo: 0x90, hi: 0x96},
+	{value: 0x0040, lo: 0x97, hi: 0x98},
+	{value: 0x0008, lo: 0x99, hi: 0x99},
+	{value: 0x0018, lo: 0x9a, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xbf},
+	// Block 0x6, offset 0x33
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x0008, lo: 0x80, hi: 0x86},
+	{value: 0x0131, lo: 0x87, hi: 0x87},
+	{value: 0x0008, lo: 0x88, hi: 0x88},
+	{value: 0x0018, lo: 0x89, hi: 0x8a},
+	{value: 0x0040, lo: 0x8b, hi: 0x8c},
+	{value: 0x0018, lo: 0x8d, hi: 0x8f},
+	{value: 0x0040, lo: 0x90, hi: 0x90},
+	{value: 0x3308, lo: 0x91, hi: 0xbd},
+	{value: 0x0818, lo: 0xbe, hi: 0xbe},
+	{value: 0x3308, lo: 0xbf, hi: 0xbf},
+	// Block 0x7, offset 0x3e
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x0818, lo: 0x80, hi: 0x80},
+	{value: 0x3308, lo: 0x81, hi: 0x82},
+	{value: 0x0818, lo: 0x83, hi: 0x83},
+	{value: 0x3308, lo: 0x84, hi: 0x85},
+	{value: 0x0818, lo: 0x86, hi: 0x86},
+	{value: 0x3308, lo: 0x87, hi: 0x87},
+	{value: 0x0040, lo: 0x88, hi: 0x8f},
+	{value: 0x0808, lo: 0x90, hi: 0xaa},
+	{value: 0x0040, lo: 0xab, hi: 0xae},
+	{value: 0x0808, lo: 0xaf, hi: 0xb4},
+	{value: 0x0040, lo: 0xb5, hi: 0xbf},
+	// Block 0x8, offset 0x4a
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0a08, lo: 0x80, hi: 0x87},
+	{value: 0x0c08, lo: 0x88, hi: 0x99},
+	{value: 0x0a08, lo: 0x9a, hi: 0xbf},
+	// Block 0x9, offset 0x4e
+	{value: 0x0000, lo: 0x0e},
+	{value: 0x3308, lo: 0x80, hi: 0x8a},
+	{value: 0x0040, lo: 0x8b, hi: 0x8c},
+	{value: 0x0c08, lo: 0x8d, hi: 0x8d},
+	{value: 0x0a08, lo: 0x8e, hi: 0x98},
+	{value: 0x0c08, lo: 0x99, hi: 0x9b},
+	{value: 0x0a08, lo: 0x9c, hi: 0xaa},
+	{value: 0x0c08, lo: 0xab, hi: 0xac},
+	{value: 0x0a08, lo: 0xad, hi: 0xb0},
+	{value: 0x0c08, lo: 0xb1, hi: 0xb1},
+	{value: 0x0a08, lo: 0xb2, hi: 0xb2},
+	{value: 0x0c08, lo: 0xb3, hi: 0xb4},
+	{value: 0x0a08, lo: 0xb5, hi: 0xb7},
+	{value: 0x0c08, lo: 0xb8, hi: 0xb9},
+	{value: 0x0a08, lo: 0xba, hi: 0xbf},
+	// Block 0xa, offset 0x5d
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0808, lo: 0x80, hi: 0xa5},
+	{value: 0x3308, lo: 0xa6, hi: 0xb0},
+	{value: 0x0808, lo: 0xb1, hi: 0xb1},
+	{value: 0x0040, lo: 0xb2, hi: 0xbf},
+	// Block 0xb, offset 0x62
+	{value: 0x0000, lo: 0x09},
+	{value: 0x0808, lo: 0x80, hi: 0x89},
+	{value: 0x0a08, lo: 0x8a, hi: 0xaa},
+	{value: 0x3308, lo: 0xab, hi: 0xb3},
+	{value: 0x0808, lo: 0xb4, hi: 0xb5},
+	{value: 0x0018, lo: 0xb6, hi: 0xb9},
+	{value: 0x0818, lo: 0xba, hi: 0xba},
+	{value: 0x0040, lo: 0xbb, hi: 0xbc},
+	{value: 0x3308, lo: 0xbd, hi: 0xbd},
+	{value: 0x0818, lo: 0xbe, hi: 0xbf},
+	// Block 0xc, offset 0x6c
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x0808, lo: 0x80, hi: 0x95},
+	{value: 0x3308, lo: 0x96, hi: 0x99},
+	{value: 0x0808, lo: 0x9a, hi: 0x9a},
+	{value: 0x3308, lo: 0x9b, hi: 0xa3},
+	{value: 0x0808, lo: 0xa4, hi: 0xa4},
+	{value: 0x3308, lo: 0xa5, hi: 0xa7},
+	{value: 0x0808, lo: 0xa8, hi: 0xa8},
+	{value: 0x3308, lo: 0xa9, hi: 0xad},
+	{value: 0x0040, lo: 0xae, hi: 0xaf},
+	{value: 0x0818, lo: 0xb0, hi: 0xbe},
+	{value: 0x0040, lo: 0xbf, hi: 0xbf},
+	// Block 0xd, offset 0x78
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0a08, lo: 0x80, hi: 0x88},
+	{value: 0x0808, lo: 0x89, hi: 0x89},
+	{value: 0x3308, lo: 0x8a, hi: 0xa1},
+	{value: 0x0840, lo: 0xa2, hi: 0xa2},
+	{value: 0x3308, lo: 0xa3, hi: 0xbf},
+	// Block 0xe, offset 0x7e
+	{value: 0x0000, lo: 0x08},
+	{value: 0x3308, lo: 0x80, hi: 0x82},
+	{value: 0x3008, lo: 0x83, hi: 0x83},
+	{value: 0x0008, lo: 0x84, hi: 0xb9},
+	{value: 0x3308, lo: 0xba, hi: 0xba},
+	{value: 0x3008, lo: 0xbb, hi: 0xbb},
+	{value: 0x3308, lo: 0xbc, hi: 0xbc},
+	{value: 0x0008, lo: 0xbd, hi: 0xbd},
+	{value: 0x3008, lo: 0xbe, hi: 0xbf},
+	// Block 0xf, offset 0x87
+	{value: 0x0000, lo: 0x0f},
+	{value: 0x3308, lo: 0x80, hi: 0x80},
+	{value: 0x3008, lo: 0x81, hi: 0x82},
+	{value: 0x0040, lo: 0x83, hi: 0x85},
+	{value: 0x3008, lo: 0x86, hi: 0x88},
+	{value: 0x0040, lo: 0x89, hi: 0x89},
+	{value: 0x3008, lo: 0x8a, hi: 0x8c},
+	{value: 0x3b08, lo: 0x8d, hi: 0x8d},
+	{value: 0x0040, lo: 0x8e, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x90},
+	{value: 0x0040, lo: 0x91, hi: 0x96},
+	{value: 0x3008, lo: 0x97, hi: 0x97},
+	{value: 0x0040, lo: 0x98, hi: 0xa5},
+	{value: 0x0008, lo: 0xa6, hi: 0xaf},
+	{value: 0x0018, lo: 0xb0, hi: 0xba},
+	{value: 0x0040, lo: 0xbb, hi: 0xbf},
+	// Block 0x10, offset 0x97
+	{value: 0x0000, lo: 0x0e},
+	{value: 0x3308, lo: 0x80, hi: 0x80},
+	{value: 0x3008, lo: 0x81, hi: 0x83},
+	{value: 0x3308, lo: 0x84, hi: 0x84},
+	{value: 0x0008, lo: 0x85, hi: 0x8c},
+	{value: 0x0040, lo: 0x8d, hi: 0x8d},
+	{value: 0x0008, lo: 0x8e, hi: 0x90},
+	{value: 0x0040, lo: 0x91, hi: 0x91},
+	{value: 0x0008, lo: 0x92, hi: 0xa8},
+	{value: 0x0040, lo: 0xa9, hi: 0xa9},
+	{value: 0x0008, lo: 0xaa, hi: 0xb9},
+	{value: 0x0040, lo: 0xba, hi: 0xbb},
+	{value: 0x3308, lo: 0xbc, hi: 0xbc},
+	{value: 0x0008, lo: 0xbd, hi: 0xbd},
+	{value: 0x3308, lo: 0xbe, hi: 0xbf},
+	// Block 0x11, offset 0xa6
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x3308, lo: 0x80, hi: 0x81},
+	{value: 0x3008, lo: 0x82, hi: 0x83},
+	{value: 0x0008, lo: 0x84, hi: 0x8c},
+	{value: 0x0040, lo: 0x8d, hi: 0x8d},
+	{value: 0x0008, lo: 0x8e, hi: 0x90},
+	{value: 0x0040, lo: 0x91, hi: 0x91},
+	{value: 0x0008, lo: 0x92, hi: 0xba},
+	{value: 0x3b08, lo: 0xbb, hi: 0xbc},
+	{value: 0x0008, lo: 0xbd, hi: 0xbd},
+	{value: 0x3008, lo: 0xbe, hi: 0xbf},
+	// Block 0x12, offset 0xb1
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x0040, lo: 0x80, hi: 0x80},
+	{value: 0x3308, lo: 0x81, hi: 0x81},
+	{value: 0x3008, lo: 0x82, hi: 0x83},
+	{value: 0x0040, lo: 0x84, hi: 0x84},
+	{value: 0x0008, lo: 0x85, hi: 0x96},
+	{value: 0x0040, lo: 0x97, hi: 0x99},
+	{value: 0x0008, lo: 0x9a, hi: 0xb1},
+	{value: 0x0040, lo: 0xb2, hi: 0xb2},
+	{value: 0x0008, lo: 0xb3, hi: 0xbb},
+	{value: 0x0040, lo: 0xbc, hi: 0xbc},
+	{value: 0x0008, lo: 0xbd, hi: 0xbd},
+	{value: 0x0040, lo: 0xbe, hi: 0xbf},
+	// Block 0x13, offset 0xbe
+	{value: 0x0000, lo: 0x10},
+	{value: 0x0008, lo: 0x80, hi: 0x86},
+	{value: 0x0040, lo: 0x87, hi: 0x89},
+	{value: 0x3b08, lo: 0x8a, hi: 0x8a},
+	{value: 0x0040, lo: 0x8b, hi: 0x8e},
+	{value: 0x3008, lo: 0x8f, hi: 0x91},
+	{value: 0x3308, lo: 0x92, hi: 0x94},
+	{value: 0x0040, lo: 0x95, hi: 0x95},
+	{value: 0x3308, lo: 0x96, hi: 0x96},
+	{value: 0x0040, lo: 0x97, hi: 0x97},
+	{value: 0x3008, lo: 0x98, hi: 0x9f},
+	{value: 0x0040, lo: 0xa0, hi: 0xa5},
+	{value: 0x0008, lo: 0xa6, hi: 0xaf},
+	{value: 0x0040, lo: 0xb0, hi: 0xb1},
+	{value: 0x3008, lo: 0xb2, hi: 0xb3},
+	{value: 0x0018, lo: 0xb4, hi: 0xb4},
+	{value: 0x0040, lo: 0xb5, hi: 0xbf},
+	// Block 0x14, offset 0xcf
+	{value: 0x0000, lo: 0x09},
+	{value: 0x0040, lo: 0x80, hi: 0x80},
+	{value: 0x0008, lo: 0x81, hi: 0xb0},
+	{value: 0x3308, lo: 0xb1, hi: 0xb1},
+	{value: 0x0008, lo: 0xb2, hi: 0xb2},
+	{value: 0x01f1, lo: 0xb3, hi: 0xb3},
+	{value: 0x3308, lo: 0xb4, hi: 0xb9},
+	{value: 0x3b08, lo: 0xba, hi: 0xba},
+	{value: 0x0040, lo: 0xbb, hi: 0xbe},
+	{value: 0x0018, lo: 0xbf, hi: 0xbf},
+	// Block 0x15, offset 0xd9
+	{value: 0x0000, lo: 0x06},
+	{value: 0x0008, lo: 0x80, hi: 0x86},
+	{value: 0x3308, lo: 0x87, hi: 0x8e},
+	{value: 0x0018, lo: 0x8f, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x99},
+	{value: 0x0018, lo: 0x9a, hi: 0x9b},
+	{value: 0x0040, lo: 0x9c, hi: 0xbf},
+	// Block 0x16, offset 0xe0
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x0008, lo: 0x80, hi: 0x84},
+	{value: 0x0040, lo: 0x85, hi: 0x85},
+	{value: 0x0008, lo: 0x86, hi: 0x86},
+	{value: 0x0040, lo: 0x87, hi: 0x87},
+	{value: 0x3308, lo: 0x88, hi: 0x8e},
+	{value: 0x0040, lo: 0x8f, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0x9b},
+	{value: 0x0201, lo: 0x9c, hi: 0x9c},
+	{value: 0x0209, lo: 0x9d, hi: 0x9d},
+	{value: 0x0008, lo: 0x9e, hi: 0x9f},
+	{value: 0x0040, lo: 0xa0, hi: 0xbf},
+	// Block 0x17, offset 0xed
+	{value: 0x0000, lo: 0x10},
+	{value: 0x0008, lo: 0x80, hi: 0x80},
+	{value: 0x0018, lo: 0x81, hi: 0x8a},
+	{value: 0x0008, lo: 0x8b, hi: 0x8b},
+	{value: 0xe03d, lo: 0x8c, hi: 0x8c},
+	{value: 0x0018, lo: 0x8d, hi: 0x97},
+	{value: 0x3308, lo: 0x98, hi: 0x99},
+	{value: 0x0018, lo: 0x9a, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xa9},
+	{value: 0x0018, lo: 0xaa, hi: 0xb4},
+	{value: 0x3308, lo: 0xb5, hi: 0xb5},
+	{value: 0x0018, lo: 0xb6, hi: 0xb6},
+	{value: 0x3308, lo: 0xb7, hi: 0xb7},
+	{value: 0x0018, lo: 0xb8, hi: 0xb8},
+	{value: 0x3308, lo: 0xb9, hi: 0xb9},
+	{value: 0x0018, lo: 0xba, hi: 0xbd},
+	{value: 0x3008, lo: 0xbe, hi: 0xbf},
+	// Block 0x18, offset 0xfe
+	{value: 0x0000, lo: 0x06},
+	{value: 0x0018, lo: 0x80, hi: 0x85},
+	{value: 0x3308, lo: 0x86, hi: 0x86},
+	{value: 0x0018, lo: 0x87, hi: 0x8c},
+	{value: 0x0040, lo: 0x8d, hi: 0x8d},
+	{value: 0x0018, lo: 0x8e, hi: 0x9a},
+	{value: 0x0040, lo: 0x9b, hi: 0xbf},
+	// Block 0x19, offset 0x105
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x0008, lo: 0x80, hi: 0xaa},
+	{value: 0x3008, lo: 0xab, hi: 0xac},
+	{value: 0x3308, lo: 0xad, hi: 0xb0},
+	{value: 0x3008, lo: 0xb1, hi: 0xb1},
+	{value: 0x3308, lo: 0xb2, hi: 0xb7},
+	{value: 0x3008, lo: 0xb8, hi: 0xb8},
+	{value: 0x3b08, lo: 0xb9, hi: 0xba},
+	{value: 0x3008, lo: 0xbb, hi: 0xbc},
+	{value: 0x3308, lo: 0xbd, hi: 0xbe},
+	{value: 0x0008, lo: 0xbf, hi: 0xbf},
+	// Block 0x1a, offset 0x110
+	{value: 0x0000, lo: 0x0e},
+	{value: 0x0008, lo: 0x80, hi: 0x89},
+	{value: 0x0018, lo: 0x8a, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x95},
+	{value: 0x3008, lo: 0x96, hi: 0x97},
+	{value: 0x3308, lo: 0x98, hi: 0x99},
+	{value: 0x0008, lo: 0x9a, hi: 0x9d},
+	{value: 0x3308, lo: 0x9e, hi: 0xa0},
+	{value: 0x0008, lo: 0xa1, hi: 0xa1},
+	{value: 0x3008, lo: 0xa2, hi: 0xa4},
+	{value: 0x0008, lo: 0xa5, hi: 0xa6},
+	{value: 0x3008, lo: 0xa7, hi: 0xad},
+	{value: 0x0008, lo: 0xae, hi: 0xb0},
+	{value: 0x3308, lo: 0xb1, hi: 0xb4},
+	{value: 0x0008, lo: 0xb5, hi: 0xbf},
+	// Block 0x1b, offset 0x11f
+	{value: 0x0000, lo: 0x0d},
+	{value: 0x0008, lo: 0x80, hi: 0x81},
+	{value: 0x3308, lo: 0x82, hi: 0x82},
+	{value: 0x3008, lo: 0x83, hi: 0x84},
+	{value: 0x3308, lo: 0x85, hi: 0x86},
+	{value: 0x3008, lo: 0x87, hi: 0x8c},
+	{value: 0x3308, lo: 0x8d, hi: 0x8d},
+	{value: 0x0008, lo: 0x8e, hi: 0x8e},
+	{value: 0x3008, lo: 0x8f, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x99},
+	{value: 0x3008, lo: 0x9a, hi: 0x9c},
+	{value: 0x3308, lo: 0x9d, hi: 0x9d},
+	{value: 0x0018, lo: 0x9e, hi: 0x9f},
+	{value: 0x0040, lo: 0xa0, hi: 0xbf},
+	// Block 0x1c, offset 0x12d
+	{value: 0x0000, lo: 0x09},
+	{value: 0x0040, lo: 0x80, hi: 0x86},
+	{value: 0x055d, lo: 0x87, hi: 0x87},
+	{value: 0x0040, lo: 0x88, hi: 0x8c},
+	{value: 0x055d, lo: 0x8d, hi: 0x8d},
+	{value: 0x0040, lo: 0x8e, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0xba},
+	{value: 0x0018, lo: 0xbb, hi: 0xbb},
+	{value: 0xe105, lo: 0xbc, hi: 0xbc},
+	{value: 0x0008, lo: 0xbd, hi: 0xbf},
+	// Block 0x1d, offset 0x137
+	{value: 0x0000, lo: 0x01},
+	{value: 0x0018, lo: 0x80, hi: 0xbf},
+	// Block 0x1e, offset 0x139
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0018, lo: 0x80, hi: 0x9e},
+	{value: 0x0040, lo: 0x9f, hi: 0xa0},
+	{value: 0x2018, lo: 0xa1, hi: 0xb5},
+	{value: 0x0018, lo: 0xb6, hi: 0xbf},
+	// Block 0x1f, offset 0x13e
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0018, lo: 0x80, hi: 0xa7},
+	{value: 0x2018, lo: 0xa8, hi: 0xbf},
+	// Block 0x20, offset 0x141
+	{value: 0x0000, lo: 0x02},
+	{value: 0x2018, lo: 0x80, hi: 0x82},
+	{value: 0x0018, lo: 0x83, hi: 0xbf},
+	// Block 0x21, offset 0x144
+	{value: 0x0000, lo: 0x01},
+	{value: 0x0008, lo: 0x80, hi: 0xbf},
+	// Block 0x22, offset 0x146
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x0008, lo: 0x80, hi: 0x88},
+	{value: 0x0040, lo: 0x89, hi: 0x89},
+	{value: 0x0008, lo: 0x8a, hi: 0x8d},
+	{value: 0x0040, lo: 0x8e, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x96},
+	{value: 0x0040, lo: 0x97, hi: 0x97},
+	{value: 0x0008, lo: 0x98, hi: 0x98},
+	{value: 0x0040, lo: 0x99, hi: 0x99},
+	{value: 0x0008, lo: 0x9a, hi: 0x9d},
+	{value: 0x0040, lo: 0x9e, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xbf},
+	// Block 0x23, offset 0x152
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x0008, lo: 0x80, hi: 0x88},
+	{value: 0x0040, lo: 0x89, hi: 0x89},
+	{value: 0x0008, lo: 0x8a, hi: 0x8d},
+	{value: 0x0040, lo: 0x8e, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0xb0},
+	{value: 0x0040, lo: 0xb1, hi: 0xb1},
+	{value: 0x0008, lo: 0xb2, hi: 0xb5},
+	{value: 0x0040, lo: 0xb6, hi: 0xb7},
+	{value: 0x0008, lo: 0xb8, hi: 0xbe},
+	{value: 0x0040, lo: 0xbf, hi: 0xbf},
+	// Block 0x24, offset 0x15d
+	{value: 0x0000, lo: 0x07},
+	{value: 0x0008, lo: 0x80, hi: 0x80},
+	{value: 0x0040, lo: 0x81, hi: 0x81},
+	{value: 0x0008, lo: 0x82, hi: 0x85},
+	{value: 0x0040, lo: 0x86, hi: 0x87},
+	{value: 0x0008, lo: 0x88, hi: 0x96},
+	{value: 0x0040, lo: 0x97, hi: 0x97},
+	{value: 0x0008, lo: 0x98, hi: 0xbf},
+	// Block 0x25, offset 0x165
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0008, lo: 0x80, hi: 0x90},
+	{value: 0x0040, lo: 0x91, hi: 0x91},
+	{value: 0x0008, lo: 0x92, hi: 0x95},
+	{value: 0x0040, lo: 0x96, hi: 0x97},
+	{value: 0x0008, lo: 0x98, hi: 0xbf},
+	// Block 0x26, offset 0x16b
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0008, lo: 0x80, hi: 0x9a},
+	{value: 0x0040, lo: 0x9b, hi: 0x9c},
+	{value: 0x3308, lo: 0x9d, hi: 0x9f},
+	{value: 0x0018, lo: 0xa0, hi: 0xbc},
+	{value: 0x0040, lo: 0xbd, hi: 0xbf},
+	// Block 0x27, offset 0x171
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0008, lo: 0x80, hi: 0x8f},
+	{value: 0x0018, lo: 0x90, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xbf},
+	// Block 0x28, offset 0x176
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0008, lo: 0x80, hi: 0xb5},
+	{value: 0x0040, lo: 0xb6, hi: 0xb7},
+	{value: 0xe045, lo: 0xb8, hi: 0xbd},
+	{value: 0x0040, lo: 0xbe, hi: 0xbf},
+	// Block 0x29, offset 0x17b
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0018, lo: 0x80, hi: 0x80},
+	{value: 0x0008, lo: 0x81, hi: 0xbf},
+	// Block 0x2a, offset 0x17e
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0008, lo: 0x80, hi: 0xac},
+	{value: 0x0018, lo: 0xad, hi: 0xae},
+	{value: 0x0008, lo: 0xaf, hi: 0xbf},
+	// Block 0x2b, offset 0x182
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0040, lo: 0x80, hi: 0x80},
+	{value: 0x0008, lo: 0x81, hi: 0x9a},
+	{value: 0x0018, lo: 0x9b, hi: 0x9c},
+	{value: 0x0040, lo: 0x9d, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xbf},
+	// Block 0x2c, offset 0x188
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0008, lo: 0x80, hi: 0xaa},
+	{value: 0x0018, lo: 0xab, hi: 0xb0},
+	{value: 0x0008, lo: 0xb1, hi: 0xb8},
+	{value: 0x0040, lo: 0xb9, hi: 0xbf},
+	// Block 0x2d, offset 0x18d
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x0008, lo: 0x80, hi: 0x91},
+	{value: 0x3308, lo: 0x92, hi: 0x93},
+	{value: 0x3b08, lo: 0x94, hi: 0x94},
+	{value: 0x3808, lo: 0x95, hi: 0x95},
+	{value: 0x0040, lo: 0x96, hi: 0x9e},
+	{value: 0x0008, lo: 0x9f, hi: 0xb1},
+	{value: 0x3308, lo: 0xb2, hi: 0xb3},
+	{value: 0x3808, lo: 0xb4, hi: 0xb4},
+	{value: 0x0018, lo: 0xb5, hi: 0xb6},
+	{value: 0x0040, lo: 0xb7, hi: 0xbf},
+	// Block 0x2e, offset 0x198
+	{value: 0x0000, lo: 0x09},
+	{value: 0x0008, lo: 0x80, hi: 0x91},
+	{value: 0x3308, lo: 0x92, hi: 0x93},
+	{value: 0x0040, lo: 0x94, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xac},
+	{value: 0x0040, lo: 0xad, hi: 0xad},
+	{value: 0x0008, lo: 0xae, hi: 0xb0},
+	{value: 0x0040, lo: 0xb1, hi: 0xb1},
+	{value: 0x3308, lo: 0xb2, hi: 0xb3},
+	{value: 0x0040, lo: 0xb4, hi: 0xbf},
+	// Block 0x2f, offset 0x1a2
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0008, lo: 0x80, hi: 0xb3},
+	{value: 0x3340, lo: 0xb4, hi: 0xb5},
+	{value: 0x3008, lo: 0xb6, hi: 0xb6},
+	{value: 0x3308, lo: 0xb7, hi: 0xbd},
+	{value: 0x3008, lo: 0xbe, hi: 0xbf},
+	// Block 0x30, offset 0x1a8
+	{value: 0x0000, lo: 0x10},
+	{value: 0x3008, lo: 0x80, hi: 0x85},
+	{value: 0x3308, lo: 0x86, hi: 0x86},
+	{value: 0x3008, lo: 0x87, hi: 0x88},
+	{value: 0x3308, lo: 0x89, hi: 0x91},
+	{value: 0x3b08, lo: 0x92, hi: 0x92},
+	{value: 0x3308, lo: 0x93, hi: 0x93},
+	{value: 0x0018, lo: 0x94, hi: 0x96},
+	{value: 0x0008, lo: 0x97, hi: 0x97},
+	{value: 0x0018, lo: 0x98, hi: 0x9b},
+	{value: 0x0008, lo: 0x9c, hi: 0x9c},
+	{value: 0x3308, lo: 0x9d, hi: 0x9d},
+	{value: 0x0040, lo: 0x9e, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xa9},
+	{value: 0x0040, lo: 0xaa, hi: 0xaf},
+	{value: 0x0018, lo: 0xb0, hi: 0xb9},
+	{value: 0x0040, lo: 0xba, hi: 0xbf},
+	// Block 0x31, offset 0x1b9
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x0018, lo: 0x80, hi: 0x85},
+	{value: 0x0040, lo: 0x86, hi: 0x86},
+	{value: 0x0218, lo: 0x87, hi: 0x87},
+	{value: 0x0018, lo: 0x88, hi: 0x8a},
+	{value: 0x33c0, lo: 0x8b, hi: 0x8d},
+	{value: 0x0040, lo: 0x8e, hi: 0x8e},
+	{value: 0x33c0, lo: 0x8f, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0x9f},
+	{value: 0x0208, lo: 0xa0, hi: 0xbf},
+	// Block 0x32, offset 0x1c4
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0208, lo: 0x80, hi: 0xb8},
+	{value: 0x0040, lo: 0xb9, hi: 0xbf},
+	// Block 0x33, offset 0x1c7
+	{value: 0x0000, lo: 0x07},
+	{value: 0x0008, lo: 0x80, hi: 0x84},
+	{value: 0x3308, lo: 0x85, hi: 0x86},
+	{value: 0x0208, lo: 0x87, hi: 0xa8},
+	{value: 0x3308, lo: 0xa9, hi: 0xa9},
+	{value: 0x0208, lo: 0xaa, hi: 0xaa},
+	{value: 0x0040, lo: 0xab, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xbf},
+	// Block 0x34, offset 0x1cf
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0xb5},
+	{value: 0x0040, lo: 0xb6, hi: 0xbf},
+	// Block 0x35, offset 0x1d2
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x0008, lo: 0x80, hi: 0x9e},
+	{value: 0x0040, lo: 0x9f, hi: 0x9f},
+	{value: 0x3308, lo: 0xa0, hi: 0xa2},
+	{value: 0x3008, lo: 0xa3, hi: 0xa6},
+	{value: 0x3308, lo: 0xa7, hi: 0xa8},
+	{value: 0x3008, lo: 0xa9, hi: 0xab},
+	{value: 0x0040, lo: 0xac, hi: 0xaf},
+	{value: 0x3008, lo: 0xb0, hi: 0xb1},
+	{value: 0x3308, lo: 0xb2, hi: 0xb2},
+	{value: 0x3008, lo: 0xb3, hi: 0xb8},
+	{value: 0x3308, lo: 0xb9, hi: 0xbb},
+	{value: 0x0040, lo: 0xbc, hi: 0xbf},
+	// Block 0x36, offset 0x1df
+	{value: 0x0000, lo: 0x07},
+	{value: 0x0018, lo: 0x80, hi: 0x80},
+	{value: 0x0040, lo: 0x81, hi: 0x83},
+	{value: 0x0018, lo: 0x84, hi: 0x85},
+	{value: 0x0008, lo: 0x86, hi: 0xad},
+	{value: 0x0040, lo: 0xae, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xb4},
+	{value: 0x0040, lo: 0xb5, hi: 0xbf},
+	// Block 0x37, offset 0x1e7
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0008, lo: 0x80, hi: 0xab},
+	{value: 0x0040, lo: 0xac, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xbf},
+	// Block 0x38, offset 0x1eb
+	{value: 0x0000, lo: 0x06},
+	{value: 0x0008, lo: 0x80, hi: 0x89},
+	{value: 0x0040, lo: 0x8a, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x99},
+	{value: 0x0028, lo: 0x9a, hi: 0x9a},
+	{value: 0x0040, lo: 0x9b, hi: 0x9d},
+	{value: 0x0018, lo: 0x9e, hi: 0xbf},
+	// Block 0x39, offset 0x1f2
+	{value: 0x0000, lo: 0x07},
+	{value: 0x0008, lo: 0x80, hi: 0x96},
+	{value: 0x3308, lo: 0x97, hi: 0x98},
+	{value: 0x3008, lo: 0x99, hi: 0x9a},
+	{value: 0x3308, lo: 0x9b, hi: 0x9b},
+	{value: 0x0040, lo: 0x9c, hi: 0x9d},
+	{value: 0x0018, lo: 0x9e, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xbf},
+	// Block 0x3a, offset 0x1fa
+	{value: 0x0000, lo: 0x0f},
+	{value: 0x0008, lo: 0x80, hi: 0x94},
+	{value: 0x3008, lo: 0x95, hi: 0x95},
+	{value: 0x3308, lo: 0x96, hi: 0x96},
+	{value: 0x3008, lo: 0x97, hi: 0x97},
+	{value: 0x3308, lo: 0x98, hi: 0x9e},
+	{value: 0x0040, lo: 0x9f, hi: 0x9f},
+	{value: 0x3b08, lo: 0xa0, hi: 0xa0},
+	{value: 0x3008, lo: 0xa1, hi: 0xa1},
+	{value: 0x3308, lo: 0xa2, hi: 0xa2},
+	{value: 0x3008, lo: 0xa3, hi: 0xa4},
+	{value: 0x3308, lo: 0xa5, hi: 0xac},
+	{value: 0x3008, lo: 0xad, hi: 0xb2},
+	{value: 0x3308, lo: 0xb3, hi: 0xbc},
+	{value: 0x0040, lo: 0xbd, hi: 0xbe},
+	{value: 0x3308, lo: 0xbf, hi: 0xbf},
+	// Block 0x3b, offset 0x20a
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x0008, lo: 0x80, hi: 0x89},
+	{value: 0x0040, lo: 0x8a, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0x9f},
+	{value: 0x0018, lo: 0xa0, hi: 0xa6},
+	{value: 0x0008, lo: 0xa7, hi: 0xa7},
+	{value: 0x0018, lo: 0xa8, hi: 0xad},
+	{value: 0x0040, lo: 0xae, hi: 0xaf},
+	{value: 0x3308, lo: 0xb0, hi: 0xbd},
+	{value: 0x3318, lo: 0xbe, hi: 0xbe},
+	{value: 0x3308, lo: 0xbf, hi: 0xbf},
+	// Block 0x3c, offset 0x216
+	{value: 0x0000, lo: 0x02},
+	{value: 0x3308, lo: 0x80, hi: 0x8e},
+	{value: 0x0040, lo: 0x8f, hi: 0xbf},
+	// Block 0x3d, offset 0x219
+	{value: 0x0000, lo: 0x09},
+	{value: 0x3308, lo: 0x80, hi: 0x83},
+	{value: 0x3008, lo: 0x84, hi: 0x84},
+	{value: 0x0008, lo: 0x85, hi: 0xb3},
+	{value: 0x3308, lo: 0xb4, hi: 0xb4},
+	{value: 0x3008, lo: 0xb5, hi: 0xb5},
+	{value: 0x3308, lo: 0xb6, hi: 0xba},
+	{value: 0x3008, lo: 0xbb, hi: 0xbb},
+	{value: 0x3308, lo: 0xbc, hi: 0xbc},
+	{value: 0x3008, lo: 0xbd, hi: 0xbf},
+	// Block 0x3e, offset 0x223
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x3008, lo: 0x80, hi: 0x81},
+	{value: 0x3308, lo: 0x82, hi: 0x82},
+	{value: 0x3008, lo: 0x83, hi: 0x83},
+	{value: 0x3808, lo: 0x84, hi: 0x84},
+	{value: 0x0008, lo: 0x85, hi: 0x8c},
+	{value: 0x0040, lo: 0x8d, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x99},
+	{value: 0x0018, lo: 0x9a, hi: 0xaa},
+	{value: 0x3308, lo: 0xab, hi: 0xb3},
+	{value: 0x0018, lo: 0xb4, hi: 0xbe},
+	{value: 0x0040, lo: 0xbf, hi: 0xbf},
+	// Block 0x3f, offset 0x22f
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x3308, lo: 0x80, hi: 0x81},
+	{value: 0x3008, lo: 0x82, hi: 0x82},
+	{value: 0x0008, lo: 0x83, hi: 0xa0},
+	{value: 0x3008, lo: 0xa1, hi: 0xa1},
+	{value: 0x3308, lo: 0xa2, hi: 0xa5},
+	{value: 0x3008, lo: 0xa6, hi: 0xa7},
+	{value: 0x3308, lo: 0xa8, hi: 0xa9},
+	{value: 0x3808, lo: 0xaa, hi: 0xaa},
+	{value: 0x3b08, lo: 0xab, hi: 0xab},
+	{value: 0x3308, lo: 0xac, hi: 0xad},
+	{value: 0x0008, lo: 0xae, hi: 0xbf},
+	// Block 0x40, offset 0x23b
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x0008, lo: 0x80, hi: 0xa5},
+	{value: 0x3308, lo: 0xa6, hi: 0xa6},
+	{value: 0x3008, lo: 0xa7, hi: 0xa7},
+	{value: 0x3308, lo: 0xa8, hi: 0xa9},
+	{value: 0x3008, lo: 0xaa, hi: 0xac},
+	{value: 0x3308, lo: 0xad, hi: 0xad},
+	{value: 0x3008, lo: 0xae, hi: 0xae},
+	{value: 0x3308, lo: 0xaf, hi: 0xb1},
+	{value: 0x3808, lo: 0xb2, hi: 0xb3},
+	{value: 0x0040, lo: 0xb4, hi: 0xbb},
+	{value: 0x0018, lo: 0xbc, hi: 0xbf},
+	// Block 0x41, offset 0x247
+	{value: 0x0000, lo: 0x07},
+	{value: 0x0008, lo: 0x80, hi: 0xa3},
+	{value: 0x3008, lo: 0xa4, hi: 0xab},
+	{value: 0x3308, lo: 0xac, hi: 0xb3},
+	{value: 0x3008, lo: 0xb4, hi: 0xb5},
+	{value: 0x3308, lo: 0xb6, hi: 0xb7},
+	{value: 0x0040, lo: 0xb8, hi: 0xba},
+	{value: 0x0018, lo: 0xbb, hi: 0xbf},
+	// Block 0x42, offset 0x24f
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0008, lo: 0x80, hi: 0x89},
+	{value: 0x0040, lo: 0x8a, hi: 0x8c},
+	{value: 0x0008, lo: 0x8d, hi: 0xbd},
+	{value: 0x0018, lo: 0xbe, hi: 0xbf},
+	// Block 0x43, offset 0x254
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x02a9, lo: 0x80, hi: 0x80},
+	{value: 0x02b1, lo: 0x81, hi: 0x81},
+	{value: 0x02b9, lo: 0x82, hi: 0x82},
+	{value: 0x02c1, lo: 0x83, hi: 0x83},
+	{value: 0x02c9, lo: 0x84, hi: 0x85},
+	{value: 0x02d1, lo: 0x86, hi: 0x86},
+	{value: 0x02d9, lo: 0x87, hi: 0x87},
+	{value: 0x057d, lo: 0x88, hi: 0x88},
+	{value: 0x0040, lo: 0x89, hi: 0x8f},
+	{value: 0x059d, lo: 0x90, hi: 0xba},
+	{value: 0x0040, lo: 0xbb, hi: 0xbc},
+	{value: 0x059d, lo: 0xbd, hi: 0xbf},
+	// Block 0x44, offset 0x261
+	{value: 0x0000, lo: 0x10},
+	{value: 0x0018, lo: 0x80, hi: 0x87},
+	{value: 0x0040, lo: 0x88, hi: 0x8f},
+	{value: 0x3308, lo: 0x90, hi: 0x92},
+	{value: 0x0018, lo: 0x93, hi: 0x93},
+	{value: 0x3308, lo: 0x94, hi: 0xa0},
+	{value: 0x3008, lo: 0xa1, hi: 0xa1},
+	{value: 0x3308, lo: 0xa2, hi: 0xa8},
+	{value: 0x0008, lo: 0xa9, hi: 0xac},
+	{value: 0x3308, lo: 0xad, hi: 0xad},
+	{value: 0x0008, lo: 0xae, hi: 0xb3},
+	{value: 0x3308, lo: 0xb4, hi: 0xb4},
+	{value: 0x0008, lo: 0xb5, hi: 0xb6},
+	{value: 0x3008, lo: 0xb7, hi: 0xb7},
+	{value: 0x3308, lo: 0xb8, hi: 0xb9},
+	{value: 0x0008, lo: 0xba, hi: 0xba},
+	{value: 0x0040, lo: 0xbb, hi: 0xbf},
+	// Block 0x45, offset 0x272
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x0008, lo: 0x80, hi: 0x87},
+	{value: 0xe045, lo: 0x88, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x95},
+	{value: 0x0040, lo: 0x96, hi: 0x97},
+	{value: 0xe045, lo: 0x98, hi: 0x9d},
+	{value: 0x0040, lo: 0x9e, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xa7},
+	{value: 0xe045, lo: 0xa8, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xb7},
+	{value: 0xe045, lo: 0xb8, hi: 0xbf},
+	// Block 0x46, offset 0x27d
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0018, lo: 0x80, hi: 0x80},
+	{value: 0x0040, lo: 0x81, hi: 0x8f},
+	{value: 0x3318, lo: 0x90, hi: 0xb0},
+	{value: 0x0040, lo: 0xb1, hi: 0xbf},
+	// Block 0x47, offset 0x282
+	{value: 0x0000, lo: 0x08},
+	{value: 0x0018, lo: 0x80, hi: 0x82},
+	{value: 0x0040, lo: 0x83, hi: 0x83},
+	{value: 0x0008, lo: 0x84, hi: 0x84},
+	{value: 0x0018, lo: 0x85, hi: 0x88},
+	{value: 0x0851, lo: 0x89, hi: 0x89},
+	{value: 0x0018, lo: 0x8a, hi: 0x8b},
+	{value: 0x0040, lo: 0x8c, hi: 0x8f},
+	{value: 0x0018, lo: 0x90, hi: 0xbf},
+	// Block 0x48, offset 0x28b
+	{value: 0x0000, lo: 0x07},
+	{value: 0x0018, lo: 0x80, hi: 0xab},
+	{value: 0x0859, lo: 0xac, hi: 0xac},
+	{value: 0x0861, lo: 0xad, hi: 0xad},
+	{value: 0x0018, lo: 0xae, hi: 0xae},
+	{value: 0x0869, lo: 0xaf, hi: 0xaf},
+	{value: 0x0871, lo: 0xb0, hi: 0xb0},
+	{value: 0x0018, lo: 0xb1, hi: 0xbf},
+	// Block 0x49, offset 0x293
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0018, lo: 0x80, hi: 0x9f},
+	{value: 0x0080, lo: 0xa0, hi: 0xa0},
+	{value: 0x0018, lo: 0xa1, hi: 0xad},
+	{value: 0x0080, lo: 0xae, hi: 0xaf},
+	{value: 0x0018, lo: 0xb0, hi: 0xbf},
+	// Block 0x4a, offset 0x299
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0018, lo: 0x80, hi: 0xa8},
+	{value: 0x09dd, lo: 0xa9, hi: 0xa9},
+	{value: 0x09fd, lo: 0xaa, hi: 0xaa},
+	{value: 0x0018, lo: 0xab, hi: 0xbf},
+	// Block 0x4b, offset 0x29e
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0018, lo: 0x80, hi: 0xa6},
+	{value: 0x0040, lo: 0xa7, hi: 0xbf},
+	// Block 0x4c, offset 0x2a1
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0018, lo: 0x80, hi: 0x8b},
+	{value: 0x0929, lo: 0x8c, hi: 0x8c},
+	{value: 0x0018, lo: 0x8d, hi: 0xbf},
+	// Block 0x4d, offset 0x2a5
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0018, lo: 0x80, hi: 0xb3},
+	{value: 0x0e7e, lo: 0xb4, hi: 0xb4},
+	{value: 0x0932, lo: 0xb5, hi: 0xb5},
+	{value: 0x0e9e, lo: 0xb6, hi: 0xb6},
+	{value: 0x0018, lo: 0xb7, hi: 0xbf},
+	// Block 0x4e, offset 0x2ab
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0018, lo: 0x80, hi: 0x9b},
+	{value: 0x0939, lo: 0x9c, hi: 0x9c},
+	{value: 0x0018, lo: 0x9d, hi: 0xbf},
+	// Block 0x4f, offset 0x2af
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0018, lo: 0x80, hi: 0xb3},
+	{value: 0x0040, lo: 0xb4, hi: 0xb5},
+	{value: 0x0018, lo: 0xb6, hi: 0xbf},
+	// Block 0x50, offset 0x2b3
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0018, lo: 0x80, hi: 0x95},
+	{value: 0x0040, lo: 0x96, hi: 0x96},
+	{value: 0x0018, lo: 0x97, hi: 0xbf},
+	// Block 0x51, offset 0x2b7
+	{value: 0x0000, lo: 0x04},
+	{value: 0xe185, lo: 0x80, hi: 0x8f},
+	{value: 0x03f5, lo: 0x90, hi: 0x9f},
+	{value: 0x0ebd, lo: 0xa0, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xbf},
+	// Block 0x52, offset 0x2bc
+	{value: 0x0000, lo: 0x07},
+	{value: 0x0008, lo: 0x80, hi: 0xa5},
+	{value: 0x0040, lo: 0xa6, hi: 0xa6},
+	{value: 0x0008, lo: 0xa7, hi: 0xa7},
+	{value: 0x0040, lo: 0xa8, hi: 0xac},
+	{value: 0x0008, lo: 0xad, hi: 0xad},
+	{value: 0x0040, lo: 0xae, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xbf},
+	// Block 0x53, offset 0x2c4
+	{value: 0x0000, lo: 0x06},
+	{value: 0x0008, lo: 0x80, hi: 0xa7},
+	{value: 0x0040, lo: 0xa8, hi: 0xae},
+	{value: 0xe075, lo: 0xaf, hi: 0xaf},
+	{value: 0x0018, lo: 0xb0, hi: 0xb0},
+	{value: 0x0040, lo: 0xb1, hi: 0xbe},
+	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
+	// Block 0x54, offset 0x2cb
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x0008, lo: 0x80, hi: 0x96},
+	{value: 0x0040, lo: 0x97, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xa6},
+	{value: 0x0040, lo: 0xa7, hi: 0xa7},
+	{value: 0x0008, lo: 0xa8, hi: 0xae},
+	{value: 0x0040, lo: 0xaf, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xb6},
+	{value: 0x0040, lo: 0xb7, hi: 0xb7},
+	{value: 0x0008, lo: 0xb8, hi: 0xbe},
+	{value: 0x0040, lo: 0xbf, hi: 0xbf},
+	// Block 0x55, offset 0x2d6
+	{value: 0x0000, lo: 0x09},
+	{value: 0x0008, lo: 0x80, hi: 0x86},
+	{value: 0x0040, lo: 0x87, hi: 0x87},
+	{value: 0x0008, lo: 0x88, hi: 0x8e},
+	{value: 0x0040, lo: 0x8f, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x96},
+	{value: 0x0040, lo: 0x97, hi: 0x97},
+	{value: 0x0008, lo: 0x98, hi: 0x9e},
+	{value: 0x0040, lo: 0x9f, hi: 0x9f},
+	{value: 0x3308, lo: 0xa0, hi: 0xbf},
+	// Block 0x56, offset 0x2e0
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0018, lo: 0x80, hi: 0xae},
+	{value: 0x0008, lo: 0xaf, hi: 0xaf},
+	{value: 0x0018, lo: 0xb0, hi: 0xbf},
+	// Block 0x57, offset 0x2e4
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0018, lo: 0x80, hi: 0x9d},
+	{value: 0x0040, lo: 0x9e, hi: 0xbf},
+	// Block 0x58, offset 0x2e7
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0018, lo: 0x80, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0x9a},
+	{value: 0x0018, lo: 0x9b, hi: 0x9e},
+	{value: 0x0ef5, lo: 0x9f, hi: 0x9f},
+	{value: 0x0018, lo: 0xa0, hi: 0xbf},
+	// Block 0x59, offset 0x2ed
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0018, lo: 0x80, hi: 0xb2},
+	{value: 0x0f15, lo: 0xb3, hi: 0xb3},
+	{value: 0x0040, lo: 0xb4, hi: 0xbf},
+	// Block 0x5a, offset 0x2f1
+	{value: 0x0020, lo: 0x01},
+	{value: 0x0f35, lo: 0x80, hi: 0xbf},
+	// Block 0x5b, offset 0x2f3
+	{value: 0x0020, lo: 0x02},
+	{value: 0x1735, lo: 0x80, hi: 0x8f},
+	{value: 0x1915, lo: 0x90, hi: 0xbf},
+	// Block 0x5c, offset 0x2f6
+	{value: 0x0020, lo: 0x01},
+	{value: 0x1f15, lo: 0x80, hi: 0xbf},
+	// Block 0x5d, offset 0x2f8
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0040, lo: 0x80, hi: 0x80},
+	{value: 0x0008, lo: 0x81, hi: 0xbf},
+	// Block 0x5e, offset 0x2fb
+	{value: 0x0000, lo: 0x09},
+	{value: 0x0008, lo: 0x80, hi: 0x96},
+	{value: 0x0040, lo: 0x97, hi: 0x98},
+	{value: 0x3308, lo: 0x99, hi: 0x9a},
+	{value: 0x096a, lo: 0x9b, hi: 0x9b},
+	{value: 0x0972, lo: 0x9c, hi: 0x9c},
+	{value: 0x0008, lo: 0x9d, hi: 0x9e},
+	{value: 0x0979, lo: 0x9f, hi: 0x9f},
+	{value: 0x0018, lo: 0xa0, hi: 0xa0},
+	{value: 0x0008, lo: 0xa1, hi: 0xbf},
+	// Block 0x5f, offset 0x305
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0xbe},
+	{value: 0x0981, lo: 0xbf, hi: 0xbf},
+	// Block 0x60, offset 0x308
+	{value: 0x0000, lo: 0x0e},
+	{value: 0x0040, lo: 0x80, hi: 0x84},
+	{value: 0x0008, lo: 0x85, hi: 0xaf},
+	{value: 0x0040, lo: 0xb0, hi: 0xb0},
+	{value: 0x2a35, lo: 0xb1, hi: 0xb1},
+	{value: 0x2a55, lo: 0xb2, hi: 0xb2},
+	{value: 0x2a75, lo: 0xb3, hi: 0xb3},
+	{value: 0x2a95, lo: 0xb4, hi: 0xb4},
+	{value: 0x2a75, lo: 0xb5, hi: 0xb5},
+	{value: 0x2ab5, lo: 0xb6, hi: 0xb6},
+	{value: 0x2ad5, lo: 0xb7, hi: 0xb7},
+	{value: 0x2af5, lo: 0xb8, hi: 0xb9},
+	{value: 0x2b15, lo: 0xba, hi: 0xbb},
+	{value: 0x2b35, lo: 0xbc, hi: 0xbd},
+	{value: 0x2b15, lo: 0xbe, hi: 0xbf},
+	// Block 0x61, offset 0x317
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0018, lo: 0x80, hi: 0xa3},
+	{value: 0x0040, lo: 0xa4, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xbf},
+	// Block 0x62, offset 0x31b
+	{value: 0x0008, lo: 0x03},
+	{value: 0x098a, lo: 0x80, hi: 0x9e},
+	{value: 0x0040, lo: 0x9f, hi: 0x9f},
+	{value: 0x0a82, lo: 0xa0, hi: 0xbf},
+	// Block 0x63, offset 0x31f
+	{value: 0x0008, lo: 0x01},
+	{value: 0x0d19, lo: 0x80, hi: 0xbf},
+	// Block 0x64, offset 0x321
+	{value: 0x0008, lo: 0x08},
+	{value: 0x0f19, lo: 0x80, hi: 0xb0},
+	{value: 0x4045, lo: 0xb1, hi: 0xb1},
+	{value: 0x10a1, lo: 0xb2, hi: 0xb3},
+	{value: 0x4065, lo: 0xb4, hi: 0xb4},
+	{value: 0x10b1, lo: 0xb5, hi: 0xb7},
+	{value: 0x4085, lo: 0xb8, hi: 0xb8},
+	{value: 0x4085, lo: 0xb9, hi: 0xb9},
+	{value: 0x10c9, lo: 0xba, hi: 0xbf},
+	// Block 0x65, offset 0x32a
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0008, lo: 0x80, hi: 0x8c},
+	{value: 0x0040, lo: 0x8d, hi: 0x8f},
+	{value: 0x0018, lo: 0x90, hi: 0xbf},
+	// Block 0x66, offset 0x32e
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0018, lo: 0x80, hi: 0x86},
+	{value: 0x0040, lo: 0x87, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0xbd},
+	{value: 0x0018, lo: 0xbe, hi: 0xbf},
+	// Block 0x67, offset 0x333
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0008, lo: 0x80, hi: 0x8c},
+	{value: 0x0018, lo: 0x8d, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0xab},
+	{value: 0x0040, lo: 0xac, hi: 0xbf},
+	// Block 0x68, offset 0x338
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0008, lo: 0x80, hi: 0xa5},
+	{value: 0x0018, lo: 0xa6, hi: 0xaf},
+	{value: 0x3308, lo: 0xb0, hi: 0xb1},
+	{value: 0x0018, lo: 0xb2, hi: 0xb7},
+	{value: 0x0040, lo: 0xb8, hi: 0xbf},
+	// Block 0x69, offset 0x33e
+	{value: 0x0000, lo: 0x0f},
+	{value: 0x0008, lo: 0x80, hi: 0x81},
+	{value: 0x3308, lo: 0x82, hi: 0x82},
+	{value: 0x0008, lo: 0x83, hi: 0x85},
+	{value: 0x3b08, lo: 0x86, hi: 0x86},
+	{value: 0x0008, lo: 0x87, hi: 0x8a},
+	{value: 0x3308, lo: 0x8b, hi: 0x8b},
+	{value: 0x0008, lo: 0x8c, hi: 0xa2},
+	{value: 0x3008, lo: 0xa3, hi: 0xa4},
+	{value: 0x3308, lo: 0xa5, hi: 0xa6},
+	{value: 0x3008, lo: 0xa7, hi: 0xa7},
+	{value: 0x0018, lo: 0xa8, hi: 0xab},
+	{value: 0x3b08, lo: 0xac, hi: 0xac},
+	{value: 0x0040, lo: 0xad, hi: 0xaf},
+	{value: 0x0018, lo: 0xb0, hi: 0xb9},
+	{value: 0x0040, lo: 0xba, hi: 0xbf},
+	// Block 0x6a, offset 0x34e
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0208, lo: 0x80, hi: 0xb1},
+	{value: 0x0108, lo: 0xb2, hi: 0xb2},
+	{value: 0x0008, lo: 0xb3, hi: 0xb3},
+	{value: 0x0018, lo: 0xb4, hi: 0xb7},
+	{value: 0x0040, lo: 0xb8, hi: 0xbf},
+	// Block 0x6b, offset 0x354
+	{value: 0x0000, lo: 0x03},
+	{value: 0x3008, lo: 0x80, hi: 0x81},
+	{value: 0x0008, lo: 0x82, hi: 0xb3},
+	{value: 0x3008, lo: 0xb4, hi: 0xbf},
+	// Block 0x6c, offset 0x358
+	{value: 0x0000, lo: 0x0e},
+	{value: 0x3008, lo: 0x80, hi: 0x83},
+	{value: 0x3b08, lo: 0x84, hi: 0x84},
+	{value: 0x3308, lo: 0x85, hi: 0x85},
+	{value: 0x0040, lo: 0x86, hi: 0x8d},
+	{value: 0x0018, lo: 0x8e, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0x9f},
+	{value: 0x3308, lo: 0xa0, hi: 0xb1},
+	{value: 0x0008, lo: 0xb2, hi: 0xb7},
+	{value: 0x0018, lo: 0xb8, hi: 0xba},
+	{value: 0x0008, lo: 0xbb, hi: 0xbb},
+	{value: 0x0018, lo: 0xbc, hi: 0xbc},
+	{value: 0x0008, lo: 0xbd, hi: 0xbe},
+	{value: 0x3308, lo: 0xbf, hi: 0xbf},
+	// Block 0x6d, offset 0x367
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0008, lo: 0x80, hi: 0xa5},
+	{value: 0x3308, lo: 0xa6, hi: 0xad},
+	{value: 0x0018, lo: 0xae, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xbf},
+	// Block 0x6e, offset 0x36c
+	{value: 0x0000, lo: 0x07},
+	{value: 0x0008, lo: 0x80, hi: 0x86},
+	{value: 0x3308, lo: 0x87, hi: 0x91},
+	{value: 0x3008, lo: 0x92, hi: 0x92},
+	{value: 0x3808, lo: 0x93, hi: 0x93},
+	{value: 0x0040, lo: 0x94, hi: 0x9e},
+	{value: 0x0018, lo: 0x9f, hi: 0xbc},
+	{value: 0x0040, lo: 0xbd, hi: 0xbf},
+	// Block 0x6f, offset 0x374
+	{value: 0x0000, lo: 0x09},
+	{value: 0x3308, lo: 0x80, hi: 0x82},
+	{value: 0x3008, lo: 0x83, hi: 0x83},
+	{value: 0x0008, lo: 0x84, hi: 0xb2},
+	{value: 0x3308, lo: 0xb3, hi: 0xb3},
+	{value: 0x3008, lo: 0xb4, hi: 0xb5},
+	{value: 0x3308, lo: 0xb6, hi: 0xb9},
+	{value: 0x3008, lo: 0xba, hi: 0xbb},
+	{value: 0x3308, lo: 0xbc, hi: 0xbd},
+	{value: 0x3008, lo: 0xbe, hi: 0xbf},
+	// Block 0x70, offset 0x37e
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x3808, lo: 0x80, hi: 0x80},
+	{value: 0x0018, lo: 0x81, hi: 0x8d},
+	{value: 0x0040, lo: 0x8e, hi: 0x8e},
+	{value: 0x0008, lo: 0x8f, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0x9d},
+	{value: 0x0018, lo: 0x9e, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xa4},
+	{value: 0x3308, lo: 0xa5, hi: 0xa5},
+	{value: 0x0008, lo: 0xa6, hi: 0xbe},
+	{value: 0x0040, lo: 0xbf, hi: 0xbf},
+	// Block 0x71, offset 0x389
+	{value: 0x0000, lo: 0x07},
+	{value: 0x0008, lo: 0x80, hi: 0xa8},
+	{value: 0x3308, lo: 0xa9, hi: 0xae},
+	{value: 0x3008, lo: 0xaf, hi: 0xb0},
+	{value: 0x3308, lo: 0xb1, hi: 0xb2},
+	{value: 0x3008, lo: 0xb3, hi: 0xb4},
+	{value: 0x3308, lo: 0xb5, hi: 0xb6},
+	{value: 0x0040, lo: 0xb7, hi: 0xbf},
+	// Block 0x72, offset 0x391
+	{value: 0x0000, lo: 0x10},
+	{value: 0x0008, lo: 0x80, hi: 0x82},
+	{value: 0x3308, lo: 0x83, hi: 0x83},
+	{value: 0x0008, lo: 0x84, hi: 0x8b},
+	{value: 0x3308, lo: 0x8c, hi: 0x8c},
+	{value: 0x3008, lo: 0x8d, hi: 0x8d},
+	{value: 0x0040, lo: 0x8e, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0x9b},
+	{value: 0x0018, lo: 0x9c, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xb6},
+	{value: 0x0018, lo: 0xb7, hi: 0xb9},
+	{value: 0x0008, lo: 0xba, hi: 0xba},
+	{value: 0x3008, lo: 0xbb, hi: 0xbb},
+	{value: 0x3308, lo: 0xbc, hi: 0xbc},
+	{value: 0x3008, lo: 0xbd, hi: 0xbd},
+	{value: 0x0008, lo: 0xbe, hi: 0xbf},
+	// Block 0x73, offset 0x3a2
+	{value: 0x0000, lo: 0x08},
+	{value: 0x0008, lo: 0x80, hi: 0xaf},
+	{value: 0x3308, lo: 0xb0, hi: 0xb0},
+	{value: 0x0008, lo: 0xb1, hi: 0xb1},
+	{value: 0x3308, lo: 0xb2, hi: 0xb4},
+	{value: 0x0008, lo: 0xb5, hi: 0xb6},
+	{value: 0x3308, lo: 0xb7, hi: 0xb8},
+	{value: 0x0008, lo: 0xb9, hi: 0xbd},
+	{value: 0x3308, lo: 0xbe, hi: 0xbf},
+	// Block 0x74, offset 0x3ab
+	{value: 0x0000, lo: 0x0f},
+	{value: 0x0008, lo: 0x80, hi: 0x80},
+	{value: 0x3308, lo: 0x81, hi: 0x81},
+	{value: 0x0008, lo: 0x82, hi: 0x82},
+	{value: 0x0040, lo: 0x83, hi: 0x9a},
+	{value: 0x0008, lo: 0x9b, hi: 0x9d},
+	{value: 0x0018, lo: 0x9e, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xaa},
+	{value: 0x3008, lo: 0xab, hi: 0xab},
+	{value: 0x3308, lo: 0xac, hi: 0xad},
+	{value: 0x3008, lo: 0xae, hi: 0xaf},
+	{value: 0x0018, lo: 0xb0, hi: 0xb1},
+	{value: 0x0008, lo: 0xb2, hi: 0xb4},
+	{value: 0x3008, lo: 0xb5, hi: 0xb5},
+	{value: 0x3b08, lo: 0xb6, hi: 0xb6},
+	{value: 0x0040, lo: 0xb7, hi: 0xbf},
+	// Block 0x75, offset 0x3bb
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x0040, lo: 0x80, hi: 0x80},
+	{value: 0x0008, lo: 0x81, hi: 0x86},
+	{value: 0x0040, lo: 0x87, hi: 0x88},
+	{value: 0x0008, lo: 0x89, hi: 0x8e},
+	{value: 0x0040, lo: 0x8f, hi: 0x90},
+	{value: 0x0008, lo: 0x91, hi: 0x96},
+	{value: 0x0040, lo: 0x97, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xa6},
+	{value: 0x0040, lo: 0xa7, hi: 0xa7},
+	{value: 0x0008, lo: 0xa8, hi: 0xae},
+	{value: 0x0040, lo: 0xaf, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xbf},
+	// Block 0x76, offset 0x3c8
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x0008, lo: 0x80, hi: 0x9a},
+	{value: 0x0018, lo: 0x9b, hi: 0x9b},
+	{value: 0x449d, lo: 0x9c, hi: 0x9c},
+	{value: 0x44b5, lo: 0x9d, hi: 0x9d},
+	{value: 0x0941, lo: 0x9e, hi: 0x9e},
+	{value: 0xe06d, lo: 0x9f, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xa8},
+	{value: 0x13f9, lo: 0xa9, hi: 0xa9},
+	{value: 0x0018, lo: 0xaa, hi: 0xab},
+	{value: 0x0040, lo: 0xac, hi: 0xaf},
+	{value: 0x44cd, lo: 0xb0, hi: 0xbf},
+	// Block 0x77, offset 0x3d4
+	{value: 0x0000, lo: 0x04},
+	{value: 0x44ed, lo: 0x80, hi: 0x8f},
+	{value: 0x450d, lo: 0x90, hi: 0x9f},
+	{value: 0x452d, lo: 0xa0, hi: 0xaf},
+	{value: 0x450d, lo: 0xb0, hi: 0xbf},
+	// Block 0x78, offset 0x3d9
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x0008, lo: 0x80, hi: 0xa2},
+	{value: 0x3008, lo: 0xa3, hi: 0xa4},
+	{value: 0x3308, lo: 0xa5, hi: 0xa5},
+	{value: 0x3008, lo: 0xa6, hi: 0xa7},
+	{value: 0x3308, lo: 0xa8, hi: 0xa8},
+	{value: 0x3008, lo: 0xa9, hi: 0xaa},
+	{value: 0x0018, lo: 0xab, hi: 0xab},
+	{value: 0x3008, lo: 0xac, hi: 0xac},
+	{value: 0x3b08, lo: 0xad, hi: 0xad},
+	{value: 0x0040, lo: 0xae, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xb9},
+	{value: 0x0040, lo: 0xba, hi: 0xbf},
+	// Block 0x79, offset 0x3e6
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0008, lo: 0x80, hi: 0xa3},
+	{value: 0x0040, lo: 0xa4, hi: 0xaf},
+	{value: 0x0018, lo: 0xb0, hi: 0xbf},
+	// Block 0x7a, offset 0x3ea
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0018, lo: 0x80, hi: 0x86},
+	{value: 0x0040, lo: 0x87, hi: 0x8a},
+	{value: 0x0018, lo: 0x8b, hi: 0xbb},
+	{value: 0x0040, lo: 0xbc, hi: 0xbf},
+	// Block 0x7b, offset 0x3ef
+	{value: 0x0000, lo: 0x01},
+	{value: 0x0040, lo: 0x80, hi: 0xbf},
+	// Block 0x7c, offset 0x3f1
+	{value: 0x0020, lo: 0x01},
+	{value: 0x454d, lo: 0x80, hi: 0xbf},
+	// Block 0x7d, offset 0x3f3
+	{value: 0x0020, lo: 0x03},
+	{value: 0x4d4d, lo: 0x80, hi: 0x94},
+	{value: 0x4b0d, lo: 0x95, hi: 0x95},
+	{value: 0x4fed, lo: 0x96, hi: 0xbf},
+	// Block 0x7e, offset 0x3f7
+	{value: 0x0020, lo: 0x01},
+	{value: 0x552d, lo: 0x80, hi: 0xbf},
+	// Block 0x7f, offset 0x3f9
+	{value: 0x0020, lo: 0x03},
+	{value: 0x5d2d, lo: 0x80, hi: 0x84},
+	{value: 0x568d, lo: 0x85, hi: 0x85},
+	{value: 0x5dcd, lo: 0x86, hi: 0xbf},
+	// Block 0x80, offset 0x3fd
+	{value: 0x0020, lo: 0x08},
+	{value: 0x6b8d, lo: 0x80, hi: 0x8f},
+	{value: 0x6d4d, lo: 0x90, hi: 0x90},
+	{value: 0x6d8d, lo: 0x91, hi: 0xab},
+	{value: 0x1401, lo: 0xac, hi: 0xac},
+	{value: 0x70ed, lo: 0xad, hi: 0xad},
+	{value: 0x0040, lo: 0xae, hi: 0xae},
+	{value: 0x0040, lo: 0xaf, hi: 0xaf},
+	{value: 0x710d, lo: 0xb0, hi: 0xbf},
+	// Block 0x81, offset 0x406
+	{value: 0x0020, lo: 0x05},
+	{value: 0x730d, lo: 0x80, hi: 0xad},
+	{value: 0x656d, lo: 0xae, hi: 0xae},
+	{value: 0x78cd, lo: 0xaf, hi: 0xb5},
+	{value: 0x6f8d, lo: 0xb6, hi: 0xb6},
+	{value: 0x79ad, lo: 0xb7, hi: 0xbf},
+	// Block 0x82, offset 0x40c
+	{value: 0x0008, lo: 0x03},
+	{value: 0x1751, lo: 0x80, hi: 0x82},
+	{value: 0x1741, lo: 0x83, hi: 0x83},
+	{value: 0x1769, lo: 0x84, hi: 0xbf},
+	// Block 0x83, offset 0x410
+	{value: 0x0008, lo: 0x0f},
+	{value: 0x1d81, lo: 0x80, hi: 0x83},
+	{value: 0x1d99, lo: 0x84, hi: 0x85},
+	{value: 0x1da1, lo: 0x86, hi: 0x87},
+	{value: 0x1da9, lo: 0x88, hi: 0x8f},
+	{value: 0x0040, lo: 0x90, hi: 0x90},
+	{value: 0x0040, lo: 0x91, hi: 0x91},
+	{value: 0x1de9, lo: 0x92, hi: 0x97},
+	{value: 0x1e11, lo: 0x98, hi: 0x9c},
+	{value: 0x1e31, lo: 0x9d, hi: 0xb3},
+	{value: 0x1d71, lo: 0xb4, hi: 0xb4},
+	{value: 0x1d81, lo: 0xb5, hi: 0xb5},
+	{value: 0x1ee9, lo: 0xb6, hi: 0xbb},
+	{value: 0x1f09, lo: 0xbc, hi: 0xbc},
+	{value: 0x1ef9, lo: 0xbd, hi: 0xbd},
+	{value: 0x1f19, lo: 0xbe, hi: 0xbf},
+	// Block 0x84, offset 0x420
+	{value: 0x0000, lo: 0x09},
+	{value: 0x0008, lo: 0x80, hi: 0x8b},
+	{value: 0x0040, lo: 0x8c, hi: 0x8c},
+	{value: 0x0008, lo: 0x8d, hi: 0xa6},
+	{value: 0x0040, lo: 0xa7, hi: 0xa7},
+	{value: 0x0008, lo: 0xa8, hi: 0xba},
+	{value: 0x0040, lo: 0xbb, hi: 0xbb},
+	{value: 0x0008, lo: 0xbc, hi: 0xbd},
+	{value: 0x0040, lo: 0xbe, hi: 0xbe},
+	{value: 0x0008, lo: 0xbf, hi: 0xbf},
+	// Block 0x85, offset 0x42a
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0008, lo: 0x80, hi: 0x8d},
+	{value: 0x0040, lo: 0x8e, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x9d},
+	{value: 0x0040, lo: 0x9e, hi: 0xbf},
+	// Block 0x86, offset 0x42f
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0xba},
+	{value: 0x0040, lo: 0xbb, hi: 0xbf},
+	// Block 0x87, offset 0x432
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0018, lo: 0x80, hi: 0x82},
+	{value: 0x0040, lo: 0x83, hi: 0x86},
+	{value: 0x0018, lo: 0x87, hi: 0xb3},
+	{value: 0x0040, lo: 0xb4, hi: 0xb6},
+	{value: 0x0018, lo: 0xb7, hi: 0xbf},
+	// Block 0x88, offset 0x438
+	{value: 0x0000, lo: 0x06},
+	{value: 0x0018, lo: 0x80, hi: 0x8e},
+	{value: 0x0040, lo: 0x8f, hi: 0x8f},
+	{value: 0x0018, lo: 0x90, hi: 0x9c},
+	{value: 0x0040, lo: 0x9d, hi: 0x9f},
+	{value: 0x0018, lo: 0xa0, hi: 0xa0},
+	{value: 0x0040, lo: 0xa1, hi: 0xbf},
+	// Block 0x89, offset 0x43f
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0040, lo: 0x80, hi: 0x8f},
+	{value: 0x0018, lo: 0x90, hi: 0xbc},
+	{value: 0x3308, lo: 0xbd, hi: 0xbd},
+	{value: 0x0040, lo: 0xbe, hi: 0xbf},
+	// Block 0x8a, offset 0x444
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0008, lo: 0x80, hi: 0x9c},
+	{value: 0x0040, lo: 0x9d, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xbf},
+	// Block 0x8b, offset 0x448
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0008, lo: 0x80, hi: 0x90},
+	{value: 0x0040, lo: 0x91, hi: 0x9f},
+	{value: 0x3308, lo: 0xa0, hi: 0xa0},
+	{value: 0x0018, lo: 0xa1, hi: 0xbb},
+	{value: 0x0040, lo: 0xbc, hi: 0xbf},
+	// Block 0x8c, offset 0x44e
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0008, lo: 0x80, hi: 0x9f},
+	{value: 0x0018, lo: 0xa0, hi: 0xa3},
+	{value: 0x0040, lo: 0xa4, hi: 0xac},
+	{value: 0x0008, lo: 0xad, hi: 0xbf},
+	// Block 0x8d, offset 0x453
+	{value: 0x0000, lo: 0x08},
+	{value: 0x0008, lo: 0x80, hi: 0x80},
+	{value: 0x0018, lo: 0x81, hi: 0x81},
+	{value: 0x0008, lo: 0x82, hi: 0x89},
+	{value: 0x0018, lo: 0x8a, hi: 0x8a},
+	{value: 0x0040, lo: 0x8b, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0xb5},
+	{value: 0x3308, lo: 0xb6, hi: 0xba},
+	{value: 0x0040, lo: 0xbb, hi: 0xbf},
+	// Block 0x8e, offset 0x45c
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0008, lo: 0x80, hi: 0x9d},
+	{value: 0x0040, lo: 0x9e, hi: 0x9e},
+	{value: 0x0018, lo: 0x9f, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xbf},
+	// Block 0x8f, offset 0x461
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0008, lo: 0x80, hi: 0x83},
+	{value: 0x0040, lo: 0x84, hi: 0x87},
+	{value: 0x0008, lo: 0x88, hi: 0x8f},
+	{value: 0x0018, lo: 0x90, hi: 0x95},
+	{value: 0x0040, lo: 0x96, hi: 0xbf},
+	// Block 0x90, offset 0x467
+	{value: 0x0000, lo: 0x06},
+	{value: 0xe145, lo: 0x80, hi: 0x87},
+	{value: 0xe1c5, lo: 0x88, hi: 0x8f},
+	{value: 0xe145, lo: 0x90, hi: 0x97},
+	{value: 0x8b0d, lo: 0x98, hi: 0x9f},
+	{value: 0x8b25, lo: 0xa0, hi: 0xa7},
+	{value: 0x0008, lo: 0xa8, hi: 0xbf},
+	// Block 0x91, offset 0x46e
+	{value: 0x0000, lo: 0x06},
+	{value: 0x0008, lo: 0x80, hi: 0x9d},
+	{value: 0x0040, lo: 0x9e, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xa9},
+	{value: 0x0040, lo: 0xaa, hi: 0xaf},
+	{value: 0x8b25, lo: 0xb0, hi: 0xb7},
+	{value: 0x8b0d, lo: 0xb8, hi: 0xbf},
+	// Block 0x92, offset 0x475
+	{value: 0x0000, lo: 0x06},
+	{value: 0xe145, lo: 0x80, hi: 0x87},
+	{value: 0xe1c5, lo: 0x88, hi: 0x8f},
+	{value: 0xe145, lo: 0x90, hi: 0x93},
+	{value: 0x0040, lo: 0x94, hi: 0x97},
+	{value: 0x0008, lo: 0x98, hi: 0xbb},
+	{value: 0x0040, lo: 0xbc, hi: 0xbf},
+	// Block 0x93, offset 0x47c
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0008, lo: 0x80, hi: 0xa7},
+	{value: 0x0040, lo: 0xa8, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xbf},
+	// Block 0x94, offset 0x480
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0xb6},
+	{value: 0x0040, lo: 0xb7, hi: 0xbf},
+	// Block 0x95, offset 0x483
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0008, lo: 0x80, hi: 0x95},
+	{value: 0x0040, lo: 0x96, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xa7},
+	{value: 0x0040, lo: 0xa8, hi: 0xbf},
+	// Block 0x96, offset 0x488
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x0808, lo: 0x80, hi: 0x85},
+	{value: 0x0040, lo: 0x86, hi: 0x87},
+	{value: 0x0808, lo: 0x88, hi: 0x88},
+	{value: 0x0040, lo: 0x89, hi: 0x89},
+	{value: 0x0808, lo: 0x8a, hi: 0xb5},
+	{value: 0x0040, lo: 0xb6, hi: 0xb6},
+	{value: 0x0808, lo: 0xb7, hi: 0xb8},
+	{value: 0x0040, lo: 0xb9, hi: 0xbb},
+	{value: 0x0808, lo: 0xbc, hi: 0xbc},
+	{value: 0x0040, lo: 0xbd, hi: 0xbe},
+	{value: 0x0808, lo: 0xbf, hi: 0xbf},
+	// Block 0x97, offset 0x494
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0808, lo: 0x80, hi: 0x95},
+	{value: 0x0040, lo: 0x96, hi: 0x96},
+	{value: 0x0818, lo: 0x97, hi: 0x9f},
+	{value: 0x0808, lo: 0xa0, hi: 0xb6},
+	{value: 0x0818, lo: 0xb7, hi: 0xbf},
+	// Block 0x98, offset 0x49a
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0808, lo: 0x80, hi: 0x9e},
+	{value: 0x0040, lo: 0x9f, hi: 0xa6},
+	{value: 0x0818, lo: 0xa7, hi: 0xaf},
+	{value: 0x0040, lo: 0xb0, hi: 0xbf},
+	// Block 0x99, offset 0x49f
+	{value: 0x0000, lo: 0x06},
+	{value: 0x0040, lo: 0x80, hi: 0x9f},
+	{value: 0x0808, lo: 0xa0, hi: 0xb2},
+	{value: 0x0040, lo: 0xb3, hi: 0xb3},
+	{value: 0x0808, lo: 0xb4, hi: 0xb5},
+	{value: 0x0040, lo: 0xb6, hi: 0xba},
+	{value: 0x0818, lo: 0xbb, hi: 0xbf},
+	// Block 0x9a, offset 0x4a6
+	{value: 0x0000, lo: 0x07},
+	{value: 0x0808, lo: 0x80, hi: 0x95},
+	{value: 0x0818, lo: 0x96, hi: 0x9b},
+	{value: 0x0040, lo: 0x9c, hi: 0x9e},
+	{value: 0x0018, lo: 0x9f, hi: 0x9f},
+	{value: 0x0808, lo: 0xa0, hi: 0xb9},
+	{value: 0x0040, lo: 0xba, hi: 0xbe},
+	{value: 0x0818, lo: 0xbf, hi: 0xbf},
+	// Block 0x9b, offset 0x4ae
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0808, lo: 0x80, hi: 0xb7},
+	{value: 0x0040, lo: 0xb8, hi: 0xbb},
+	{value: 0x0818, lo: 0xbc, hi: 0xbd},
+	{value: 0x0808, lo: 0xbe, hi: 0xbf},
+	// Block 0x9c, offset 0x4b3
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0818, lo: 0x80, hi: 0x8f},
+	{value: 0x0040, lo: 0x90, hi: 0x91},
+	{value: 0x0818, lo: 0x92, hi: 0xbf},
+	// Block 0x9d, offset 0x4b7
+	{value: 0x0000, lo: 0x0f},
+	{value: 0x0808, lo: 0x80, hi: 0x80},
+	{value: 0x3308, lo: 0x81, hi: 0x83},
+	{value: 0x0040, lo: 0x84, hi: 0x84},
+	{value: 0x3308, lo: 0x85, hi: 0x86},
+	{value: 0x0040, lo: 0x87, hi: 0x8b},
+	{value: 0x3308, lo: 0x8c, hi: 0x8f},
+	{value: 0x0808, lo: 0x90, hi: 0x93},
+	{value: 0x0040, lo: 0x94, hi: 0x94},
+	{value: 0x0808, lo: 0x95, hi: 0x97},
+	{value: 0x0040, lo: 0x98, hi: 0x98},
+	{value: 0x0808, lo: 0x99, hi: 0xb5},
+	{value: 0x0040, lo: 0xb6, hi: 0xb7},
+	{value: 0x3308, lo: 0xb8, hi: 0xba},
+	{value: 0x0040, lo: 0xbb, hi: 0xbe},
+	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
+	// Block 0x9e, offset 0x4c7
+	{value: 0x0000, lo: 0x06},
+	{value: 0x0818, lo: 0x80, hi: 0x88},
+	{value: 0x0040, lo: 0x89, hi: 0x8f},
+	{value: 0x0818, lo: 0x90, hi: 0x98},
+	{value: 0x0040, lo: 0x99, hi: 0x9f},
+	{value: 0x0808, lo: 0xa0, hi: 0xbc},
+	{value: 0x0818, lo: 0xbd, hi: 0xbf},
+	// Block 0x9f, offset 0x4ce
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0808, lo: 0x80, hi: 0x9c},
+	{value: 0x0818, lo: 0x9d, hi: 0x9f},
+	{value: 0x0040, lo: 0xa0, hi: 0xbf},
+	// Block 0xa0, offset 0x4d2
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0808, lo: 0x80, hi: 0xb5},
+	{value: 0x0040, lo: 0xb6, hi: 0xb8},
+	{value: 0x0018, lo: 0xb9, hi: 0xbf},
+	// Block 0xa1, offset 0x4d6
+	{value: 0x0000, lo: 0x06},
+	{value: 0x0808, lo: 0x80, hi: 0x95},
+	{value: 0x0040, lo: 0x96, hi: 0x97},
+	{value: 0x0818, lo: 0x98, hi: 0x9f},
+	{value: 0x0808, lo: 0xa0, hi: 0xb2},
+	{value: 0x0040, lo: 0xb3, hi: 0xb7},
+	{value: 0x0818, lo: 0xb8, hi: 0xbf},
+	// Block 0xa2, offset 0x4dd
+	{value: 0x0000, lo: 0x01},
+	{value: 0x0808, lo: 0x80, hi: 0xbf},
+	// Block 0xa3, offset 0x4df
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0808, lo: 0x80, hi: 0x88},
+	{value: 0x0040, lo: 0x89, hi: 0xbf},
+	// Block 0xa4, offset 0x4e2
+	{value: 0x0000, lo: 0x02},
+	{value: 0x03dd, lo: 0x80, hi: 0xb2},
+	{value: 0x0040, lo: 0xb3, hi: 0xbf},
+	// Block 0xa5, offset 0x4e5
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0808, lo: 0x80, hi: 0xb2},
+	{value: 0x0040, lo: 0xb3, hi: 0xb9},
+	{value: 0x0818, lo: 0xba, hi: 0xbf},
+	// Block 0xa6, offset 0x4e9
+	{value: 0x0000, lo: 0x08},
+	{value: 0x0908, lo: 0x80, hi: 0x80},
+	{value: 0x0a08, lo: 0x81, hi: 0xa1},
+	{value: 0x0c08, lo: 0xa2, hi: 0xa2},
+	{value: 0x0a08, lo: 0xa3, hi: 0xa3},
+	{value: 0x3308, lo: 0xa4, hi: 0xa7},
+	{value: 0x0040, lo: 0xa8, hi: 0xaf},
+	{value: 0x0808, lo: 0xb0, hi: 0xb9},
+	{value: 0x0040, lo: 0xba, hi: 0xbf},
+	// Block 0xa7, offset 0x4f2
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0040, lo: 0x80, hi: 0x9f},
+	{value: 0x0818, lo: 0xa0, hi: 0xbe},
+	{value: 0x0040, lo: 0xbf, hi: 0xbf},
+	// Block 0xa8, offset 0x4f6
+	{value: 0x0000, lo: 0x07},
+	{value: 0x0808, lo: 0x80, hi: 0xa9},
+	{value: 0x0040, lo: 0xaa, hi: 0xaa},
+	{value: 0x3308, lo: 0xab, hi: 0xac},
+	{value: 0x0818, lo: 0xad, hi: 0xad},
+	{value: 0x0040, lo: 0xae, hi: 0xaf},
+	{value: 0x0808, lo: 0xb0, hi: 0xb1},
+	{value: 0x0040, lo: 0xb2, hi: 0xbf},
+	// Block 0xa9, offset 0x4fe
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0040, lo: 0x80, hi: 0xbc},
+	{value: 0x3308, lo: 0xbd, hi: 0xbf},
+	// Block 0xaa, offset 0x501
+	{value: 0x0000, lo: 0x07},
+	{value: 0x0808, lo: 0x80, hi: 0x9c},
+	{value: 0x0818, lo: 0x9d, hi: 0xa6},
+	{value: 0x0808, lo: 0xa7, hi: 0xa7},
+	{value: 0x0040, lo: 0xa8, hi: 0xaf},
+	{value: 0x0a08, lo: 0xb0, hi: 0xb2},
+	{value: 0x0c08, lo: 0xb3, hi: 0xb3},
+	{value: 0x0a08, lo: 0xb4, hi: 0xbf},
+	// Block 0xab, offset 0x509
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x0a08, lo: 0x80, hi: 0x84},
+	{value: 0x0808, lo: 0x85, hi: 0x85},
+	{value: 0x3308, lo: 0x86, hi: 0x90},
+	{value: 0x0a18, lo: 0x91, hi: 0x93},
+	{value: 0x0c18, lo: 0x94, hi: 0x94},
+	{value: 0x0818, lo: 0x95, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0xaf},
+	{value: 0x0a08, lo: 0xb0, hi: 0xb3},
+	{value: 0x0c08, lo: 0xb4, hi: 0xb5},
+	{value: 0x0a08, lo: 0xb6, hi: 0xbf},
+	// Block 0xac, offset 0x514
+	{value: 0x0000, lo: 0x0e},
+	{value: 0x0a08, lo: 0x80, hi: 0x81},
+	{value: 0x3308, lo: 0x82, hi: 0x85},
+	{value: 0x0818, lo: 0x86, hi: 0x89},
+	{value: 0x0040, lo: 0x8a, hi: 0xaf},
+	{value: 0x0a08, lo: 0xb0, hi: 0xb0},
+	{value: 0x0808, lo: 0xb1, hi: 0xb1},
+	{value: 0x0a08, lo: 0xb2, hi: 0xb3},
+	{value: 0x0c08, lo: 0xb4, hi: 0xb6},
+	{value: 0x0808, lo: 0xb7, hi: 0xb7},
+	{value: 0x0a08, lo: 0xb8, hi: 0xb8},
+	{value: 0x0c08, lo: 0xb9, hi: 0xba},
+	{value: 0x0a08, lo: 0xbb, hi: 0xbc},
+	{value: 0x0c08, lo: 0xbd, hi: 0xbd},
+	{value: 0x0a08, lo: 0xbe, hi: 0xbf},
+	// Block 0xad, offset 0x523
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x0808, lo: 0x80, hi: 0x80},
+	{value: 0x0a08, lo: 0x81, hi: 0x81},
+	{value: 0x0c08, lo: 0x82, hi: 0x83},
+	{value: 0x0a08, lo: 0x84, hi: 0x84},
+	{value: 0x0818, lo: 0x85, hi: 0x88},
+	{value: 0x0c18, lo: 0x89, hi: 0x89},
+	{value: 0x0a18, lo: 0x8a, hi: 0x8a},
+	{value: 0x0918, lo: 0x8b, hi: 0x8b},
+	{value: 0x0040, lo: 0x8c, hi: 0x9f},
+	{value: 0x0808, lo: 0xa0, hi: 0xb6},
+	{value: 0x0040, lo: 0xb7, hi: 0xbf},
+	// Block 0xae, offset 0x52f
+	{value: 0x0000, lo: 0x05},
+	{value: 0x3008, lo: 0x80, hi: 0x80},
+	{value: 0x3308, lo: 0x81, hi: 0x81},
+	{value: 0x3008, lo: 0x82, hi: 0x82},
+	{value: 0x0008, lo: 0x83, hi: 0xb7},
+	{value: 0x3308, lo: 0xb8, hi: 0xbf},
+	// Block 0xaf, offset 0x535
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x3308, lo: 0x80, hi: 0x85},
+	{value: 0x3b08, lo: 0x86, hi: 0x86},
+	{value: 0x0018, lo: 0x87, hi: 0x8d},
+	{value: 0x0040, lo: 0x8e, hi: 0x91},
+	{value: 0x0018, lo: 0x92, hi: 0xa5},
+	{value: 0x0008, lo: 0xa6, hi: 0xaf},
+	{value: 0x3b08, lo: 0xb0, hi: 0xb0},
+	{value: 0x0008, lo: 0xb1, hi: 0xb2},
+	{value: 0x3308, lo: 0xb3, hi: 0xb4},
+	{value: 0x0008, lo: 0xb5, hi: 0xb5},
+	{value: 0x0040, lo: 0xb6, hi: 0xbe},
+	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
+	// Block 0xb0, offset 0x542
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x3308, lo: 0x80, hi: 0x81},
+	{value: 0x3008, lo: 0x82, hi: 0x82},
+	{value: 0x0008, lo: 0x83, hi: 0xaf},
+	{value: 0x3008, lo: 0xb0, hi: 0xb2},
+	{value: 0x3308, lo: 0xb3, hi: 0xb6},
+	{value: 0x3008, lo: 0xb7, hi: 0xb8},
+	{value: 0x3b08, lo: 0xb9, hi: 0xb9},
+	{value: 0x3308, lo: 0xba, hi: 0xba},
+	{value: 0x0018, lo: 0xbb, hi: 0xbc},
+	{value: 0x0040, lo: 0xbd, hi: 0xbd},
+	{value: 0x0018, lo: 0xbe, hi: 0xbf},
+	// Block 0xb1, offset 0x54e
+	{value: 0x0000, lo: 0x07},
+	{value: 0x0018, lo: 0x80, hi: 0x81},
+	{value: 0x3308, lo: 0x82, hi: 0x82},
+	{value: 0x0040, lo: 0x83, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0xa8},
+	{value: 0x0040, lo: 0xa9, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xb9},
+	{value: 0x0040, lo: 0xba, hi: 0xbf},
+	// Block 0xb2, offset 0x556
+	{value: 0x0000, lo: 0x08},
+	{value: 0x3308, lo: 0x80, hi: 0x82},
+	{value: 0x0008, lo: 0x83, hi: 0xa6},
+	{value: 0x3308, lo: 0xa7, hi: 0xab},
+	{value: 0x3008, lo: 0xac, hi: 0xac},
+	{value: 0x3308, lo: 0xad, hi: 0xb2},
+	{value: 0x3b08, lo: 0xb3, hi: 0xb4},
+	{value: 0x0040, lo: 0xb5, hi: 0xb5},
+	{value: 0x0008, lo: 0xb6, hi: 0xbf},
+	// Block 0xb3, offset 0x55f
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x0018, lo: 0x80, hi: 0x83},
+	{value: 0x0008, lo: 0x84, hi: 0x84},
+	{value: 0x3008, lo: 0x85, hi: 0x86},
+	{value: 0x0008, lo: 0x87, hi: 0x87},
+	{value: 0x0040, lo: 0x88, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0xb2},
+	{value: 0x3308, lo: 0xb3, hi: 0xb3},
+	{value: 0x0018, lo: 0xb4, hi: 0xb5},
+	{value: 0x0008, lo: 0xb6, hi: 0xb6},
+	{value: 0x0040, lo: 0xb7, hi: 0xbf},
+	// Block 0xb4, offset 0x56a
+	{value: 0x0000, lo: 0x06},
+	{value: 0x3308, lo: 0x80, hi: 0x81},
+	{value: 0x3008, lo: 0x82, hi: 0x82},
+	{value: 0x0008, lo: 0x83, hi: 0xb2},
+	{value: 0x3008, lo: 0xb3, hi: 0xb5},
+	{value: 0x3308, lo: 0xb6, hi: 0xbe},
+	{value: 0x3008, lo: 0xbf, hi: 0xbf},
+	// Block 0xb5, offset 0x571
+	{value: 0x0000, lo: 0x0e},
+	{value: 0x3808, lo: 0x80, hi: 0x80},
+	{value: 0x0008, lo: 0x81, hi: 0x84},
+	{value: 0x0018, lo: 0x85, hi: 0x88},
+	{value: 0x3308, lo: 0x89, hi: 0x8c},
+	{value: 0x0018, lo: 0x8d, hi: 0x8d},
+	{value: 0x3008, lo: 0x8e, hi: 0x8e},
+	{value: 0x3308, lo: 0x8f, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x9a},
+	{value: 0x0018, lo: 0x9b, hi: 0x9b},
+	{value: 0x0008, lo: 0x9c, hi: 0x9c},
+	{value: 0x0018, lo: 0x9d, hi: 0x9f},
+	{value: 0x0040, lo: 0xa0, hi: 0xa0},
+	{value: 0x0018, lo: 0xa1, hi: 0xb4},
+	{value: 0x0040, lo: 0xb5, hi: 0xbf},
+	// Block 0xb6, offset 0x580
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x0008, lo: 0x80, hi: 0x91},
+	{value: 0x0040, lo: 0x92, hi: 0x92},
+	{value: 0x0008, lo: 0x93, hi: 0xab},
+	{value: 0x3008, lo: 0xac, hi: 0xae},
+	{value: 0x3308, lo: 0xaf, hi: 0xb1},
+	{value: 0x3008, lo: 0xb2, hi: 0xb3},
+	{value: 0x3308, lo: 0xb4, hi: 0xb4},
+	{value: 0x3808, lo: 0xb5, hi: 0xb5},
+	{value: 0x3308, lo: 0xb6, hi: 0xb7},
+	{value: 0x0018, lo: 0xb8, hi: 0xbd},
+	{value: 0x3308, lo: 0xbe, hi: 0xbe},
+	{value: 0x0008, lo: 0xbf, hi: 0xbf},
+	// Block 0xb7, offset 0x58d
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0008, lo: 0x80, hi: 0x80},
+	{value: 0x3308, lo: 0x81, hi: 0x81},
+	{value: 0x0040, lo: 0x82, hi: 0xbf},
+	// Block 0xb8, offset 0x591
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x0008, lo: 0x80, hi: 0x86},
+	{value: 0x0040, lo: 0x87, hi: 0x87},
+	{value: 0x0008, lo: 0x88, hi: 0x88},
+	{value: 0x0040, lo: 0x89, hi: 0x89},
+	{value: 0x0008, lo: 0x8a, hi: 0x8d},
+	{value: 0x0040, lo: 0x8e, hi: 0x8e},
+	{value: 0x0008, lo: 0x8f, hi: 0x9d},
+	{value: 0x0040, lo: 0x9e, hi: 0x9e},
+	{value: 0x0008, lo: 0x9f, hi: 0xa8},
+	{value: 0x0018, lo: 0xa9, hi: 0xa9},
+	{value: 0x0040, lo: 0xaa, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xbf},
+	// Block 0xb9, offset 0x59e
+	{value: 0x0000, lo: 0x08},
+	{value: 0x0008, lo: 0x80, hi: 0x9e},
+	{value: 0x3308, lo: 0x9f, hi: 0x9f},
+	{value: 0x3008, lo: 0xa0, hi: 0xa2},
+	{value: 0x3308, lo: 0xa3, hi: 0xa9},
+	{value: 0x3b08, lo: 0xaa, hi: 0xaa},
+	{value: 0x0040, lo: 0xab, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xb9},
+	{value: 0x0040, lo: 0xba, hi: 0xbf},
+	// Block 0xba, offset 0x5a7
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0008, lo: 0x80, hi: 0xb4},
+	{value: 0x3008, lo: 0xb5, hi: 0xb7},
+	{value: 0x3308, lo: 0xb8, hi: 0xbf},
+	// Block 0xbb, offset 0x5ab
+	{value: 0x0000, lo: 0x0e},
+	{value: 0x3008, lo: 0x80, hi: 0x81},
+	{value: 0x3b08, lo: 0x82, hi: 0x82},
+	{value: 0x3308, lo: 0x83, hi: 0x84},
+	{value: 0x3008, lo: 0x85, hi: 0x85},
+	{value: 0x3308, lo: 0x86, hi: 0x86},
+	{value: 0x0008, lo: 0x87, hi: 0x8a},
+	{value: 0x0018, lo: 0x8b, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x99},
+	{value: 0x0018, lo: 0x9a, hi: 0x9b},
+	{value: 0x0040, lo: 0x9c, hi: 0x9c},
+	{value: 0x0018, lo: 0x9d, hi: 0x9d},
+	{value: 0x3308, lo: 0x9e, hi: 0x9e},
+	{value: 0x0008, lo: 0x9f, hi: 0xa1},
+	{value: 0x0040, lo: 0xa2, hi: 0xbf},
+	// Block 0xbc, offset 0x5ba
+	{value: 0x0000, lo: 0x07},
+	{value: 0x0008, lo: 0x80, hi: 0xaf},
+	{value: 0x3008, lo: 0xb0, hi: 0xb2},
+	{value: 0x3308, lo: 0xb3, hi: 0xb8},
+	{value: 0x3008, lo: 0xb9, hi: 0xb9},
+	{value: 0x3308, lo: 0xba, hi: 0xba},
+	{value: 0x3008, lo: 0xbb, hi: 0xbe},
+	{value: 0x3308, lo: 0xbf, hi: 0xbf},
+	// Block 0xbd, offset 0x5c2
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x3308, lo: 0x80, hi: 0x80},
+	{value: 0x3008, lo: 0x81, hi: 0x81},
+	{value: 0x3b08, lo: 0x82, hi: 0x82},
+	{value: 0x3308, lo: 0x83, hi: 0x83},
+	{value: 0x0008, lo: 0x84, hi: 0x85},
+	{value: 0x0018, lo: 0x86, hi: 0x86},
+	{value: 0x0008, lo: 0x87, hi: 0x87},
+	{value: 0x0040, lo: 0x88, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0xbf},
+	// Block 0xbe, offset 0x5cd
+	{value: 0x0000, lo: 0x08},
+	{value: 0x0008, lo: 0x80, hi: 0xae},
+	{value: 0x3008, lo: 0xaf, hi: 0xb1},
+	{value: 0x3308, lo: 0xb2, hi: 0xb5},
+	{value: 0x0040, lo: 0xb6, hi: 0xb7},
+	{value: 0x3008, lo: 0xb8, hi: 0xbb},
+	{value: 0x3308, lo: 0xbc, hi: 0xbd},
+	{value: 0x3008, lo: 0xbe, hi: 0xbe},
+	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
+	// Block 0xbf, offset 0x5d6
+	{value: 0x0000, lo: 0x05},
+	{value: 0x3308, lo: 0x80, hi: 0x80},
+	{value: 0x0018, lo: 0x81, hi: 0x97},
+	{value: 0x0008, lo: 0x98, hi: 0x9b},
+	{value: 0x3308, lo: 0x9c, hi: 0x9d},
+	{value: 0x0040, lo: 0x9e, hi: 0xbf},
+	// Block 0xc0, offset 0x5dc
+	{value: 0x0000, lo: 0x07},
+	{value: 0x0008, lo: 0x80, hi: 0xaf},
+	{value: 0x3008, lo: 0xb0, hi: 0xb2},
+	{value: 0x3308, lo: 0xb3, hi: 0xba},
+	{value: 0x3008, lo: 0xbb, hi: 0xbc},
+	{value: 0x3308, lo: 0xbd, hi: 0xbd},
+	{value: 0x3008, lo: 0xbe, hi: 0xbe},
+	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
+	// Block 0xc1, offset 0x5e4
+	{value: 0x0000, lo: 0x08},
+	{value: 0x3308, lo: 0x80, hi: 0x80},
+	{value: 0x0018, lo: 0x81, hi: 0x83},
+	{value: 0x0008, lo: 0x84, hi: 0x84},
+	{value: 0x0040, lo: 0x85, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0x9f},
+	{value: 0x0018, lo: 0xa0, hi: 0xac},
+	{value: 0x0040, lo: 0xad, hi: 0xbf},
+	// Block 0xc2, offset 0x5ed
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x0008, lo: 0x80, hi: 0xaa},
+	{value: 0x3308, lo: 0xab, hi: 0xab},
+	{value: 0x3008, lo: 0xac, hi: 0xac},
+	{value: 0x3308, lo: 0xad, hi: 0xad},
+	{value: 0x3008, lo: 0xae, hi: 0xaf},
+	{value: 0x3308, lo: 0xb0, hi: 0xb5},
+	{value: 0x3808, lo: 0xb6, hi: 0xb6},
+	{value: 0x3308, lo: 0xb7, hi: 0xb7},
+	{value: 0x0008, lo: 0xb8, hi: 0xb8},
+	{value: 0x0018, lo: 0xb9, hi: 0xb9},
+	{value: 0x0040, lo: 0xba, hi: 0xbf},
+	// Block 0xc3, offset 0x5f9
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0x89},
+	{value: 0x0040, lo: 0x8a, hi: 0xbf},
+	// Block 0xc4, offset 0x5fc
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x0008, lo: 0x80, hi: 0x9a},
+	{value: 0x0040, lo: 0x9b, hi: 0x9c},
+	{value: 0x3308, lo: 0x9d, hi: 0x9f},
+	{value: 0x3008, lo: 0xa0, hi: 0xa1},
+	{value: 0x3308, lo: 0xa2, hi: 0xa5},
+	{value: 0x3008, lo: 0xa6, hi: 0xa6},
+	{value: 0x3308, lo: 0xa7, hi: 0xaa},
+	{value: 0x3b08, lo: 0xab, hi: 0xab},
+	{value: 0x0040, lo: 0xac, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xb9},
+	{value: 0x0018, lo: 0xba, hi: 0xbf},
+	// Block 0xc5, offset 0x608
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0x86},
+	{value: 0x0040, lo: 0x87, hi: 0xbf},
+	// Block 0xc6, offset 0x60b
+	{value: 0x0000, lo: 0x08},
+	{value: 0x0008, lo: 0x80, hi: 0xab},
+	{value: 0x3008, lo: 0xac, hi: 0xae},
+	{value: 0x3308, lo: 0xaf, hi: 0xb7},
+	{value: 0x3008, lo: 0xb8, hi: 0xb8},
+	{value: 0x3b08, lo: 0xb9, hi: 0xb9},
+	{value: 0x3308, lo: 0xba, hi: 0xba},
+	{value: 0x0018, lo: 0xbb, hi: 0xbb},
+	{value: 0x0040, lo: 0xbc, hi: 0xbf},
+	// Block 0xc7, offset 0x614
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0040, lo: 0x80, hi: 0x9f},
+	{value: 0x049d, lo: 0xa0, hi: 0xbf},
+	// Block 0xc8, offset 0x617
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0008, lo: 0x80, hi: 0xa9},
+	{value: 0x0018, lo: 0xaa, hi: 0xb2},
+	{value: 0x0040, lo: 0xb3, hi: 0xbe},
+	{value: 0x0008, lo: 0xbf, hi: 0xbf},
+	// Block 0xc9, offset 0x61c
+	{value: 0x0000, lo: 0x08},
+	{value: 0x3008, lo: 0x80, hi: 0x80},
+	{value: 0x0008, lo: 0x81, hi: 0x81},
+	{value: 0x3008, lo: 0x82, hi: 0x82},
+	{value: 0x3308, lo: 0x83, hi: 0x83},
+	{value: 0x0018, lo: 0x84, hi: 0x86},
+	{value: 0x0040, lo: 0x87, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0xbf},
+	// Block 0xca, offset 0x625
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0040, lo: 0x80, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xa7},
+	{value: 0x0040, lo: 0xa8, hi: 0xa9},
+	{value: 0x0008, lo: 0xaa, hi: 0xbf},
+	// Block 0xcb, offset 0x62a
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x0008, lo: 0x80, hi: 0x90},
+	{value: 0x3008, lo: 0x91, hi: 0x93},
+	{value: 0x3308, lo: 0x94, hi: 0x97},
+	{value: 0x0040, lo: 0x98, hi: 0x99},
+	{value: 0x3308, lo: 0x9a, hi: 0x9b},
+	{value: 0x3008, lo: 0x9c, hi: 0x9f},
+	{value: 0x3b08, lo: 0xa0, hi: 0xa0},
+	{value: 0x0008, lo: 0xa1, hi: 0xa1},
+	{value: 0x0018, lo: 0xa2, hi: 0xa2},
+	{value: 0x0008, lo: 0xa3, hi: 0xa3},
+	{value: 0x3008, lo: 0xa4, hi: 0xa4},
+	{value: 0x0040, lo: 0xa5, hi: 0xbf},
+	// Block 0xcc, offset 0x637
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x0008, lo: 0x80, hi: 0x80},
+	{value: 0x3308, lo: 0x81, hi: 0x8a},
+	{value: 0x0008, lo: 0x8b, hi: 0xb2},
+	{value: 0x3308, lo: 0xb3, hi: 0xb3},
+	{value: 0x3b08, lo: 0xb4, hi: 0xb4},
+	{value: 0x3308, lo: 0xb5, hi: 0xb8},
+	{value: 0x3008, lo: 0xb9, hi: 0xb9},
+	{value: 0x0008, lo: 0xba, hi: 0xba},
+	{value: 0x3308, lo: 0xbb, hi: 0xbe},
+	{value: 0x0018, lo: 0xbf, hi: 0xbf},
+	// Block 0xcd, offset 0x642
+	{value: 0x0000, lo: 0x08},
+	{value: 0x0018, lo: 0x80, hi: 0x86},
+	{value: 0x3b08, lo: 0x87, hi: 0x87},
+	{value: 0x0040, lo: 0x88, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x90},
+	{value: 0x3308, lo: 0x91, hi: 0x96},
+	{value: 0x3008, lo: 0x97, hi: 0x98},
+	{value: 0x3308, lo: 0x99, hi: 0x9b},
+	{value: 0x0008, lo: 0x9c, hi: 0xbf},
+	// Block 0xce, offset 0x64b
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x0008, lo: 0x80, hi: 0x89},
+	{value: 0x3308, lo: 0x8a, hi: 0x96},
+	{value: 0x3008, lo: 0x97, hi: 0x97},
+	{value: 0x3308, lo: 0x98, hi: 0x98},
+	{value: 0x3b08, lo: 0x99, hi: 0x99},
+	{value: 0x0018, lo: 0x9a, hi: 0x9c},
+	{value: 0x0008, lo: 0x9d, hi: 0x9d},
+	{value: 0x0018, lo: 0x9e, hi: 0xa2},
+	{value: 0x0040, lo: 0xa3, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xbf},
+	// Block 0xcf, offset 0x656
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0xb8},
+	{value: 0x0040, lo: 0xb9, hi: 0xbf},
+	// Block 0xd0, offset 0x659
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0018, lo: 0x80, hi: 0x89},
+	{value: 0x0040, lo: 0x8a, hi: 0xbf},
+	// Block 0xd1, offset 0x65c
+	{value: 0x0000, lo: 0x09},
+	{value: 0x0008, lo: 0x80, hi: 0x88},
+	{value: 0x0040, lo: 0x89, hi: 0x89},
+	{value: 0x0008, lo: 0x8a, hi: 0xae},
+	{value: 0x3008, lo: 0xaf, hi: 0xaf},
+	{value: 0x3308, lo: 0xb0, hi: 0xb6},
+	{value: 0x0040, lo: 0xb7, hi: 0xb7},
+	{value: 0x3308, lo: 0xb8, hi: 0xbd},
+	{value: 0x3008, lo: 0xbe, hi: 0xbe},
+	{value: 0x3b08, lo: 0xbf, hi: 0xbf},
+	// Block 0xd2, offset 0x666
+	{value: 0x0000, lo: 0x08},
+	{value: 0x0008, lo: 0x80, hi: 0x80},
+	{value: 0x0018, lo: 0x81, hi: 0x85},
+	{value: 0x0040, lo: 0x86, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x99},
+	{value: 0x0018, lo: 0x9a, hi: 0xac},
+	{value: 0x0040, lo: 0xad, hi: 0xaf},
+	{value: 0x0018, lo: 0xb0, hi: 0xb1},
+	{value: 0x0008, lo: 0xb2, hi: 0xbf},
+	// Block 0xd3, offset 0x66f
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x0008, lo: 0x80, hi: 0x8f},
+	{value: 0x0040, lo: 0x90, hi: 0x91},
+	{value: 0x3308, lo: 0x92, hi: 0xa7},
+	{value: 0x0040, lo: 0xa8, hi: 0xa8},
+	{value: 0x3008, lo: 0xa9, hi: 0xa9},
+	{value: 0x3308, lo: 0xaa, hi: 0xb0},
+	{value: 0x3008, lo: 0xb1, hi: 0xb1},
+	{value: 0x3308, lo: 0xb2, hi: 0xb3},
+	{value: 0x3008, lo: 0xb4, hi: 0xb4},
+	{value: 0x3308, lo: 0xb5, hi: 0xb6},
+	{value: 0x0040, lo: 0xb7, hi: 0xbf},
+	// Block 0xd4, offset 0x67b
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x0008, lo: 0x80, hi: 0x86},
+	{value: 0x0040, lo: 0x87, hi: 0x87},
+	{value: 0x0008, lo: 0x88, hi: 0x89},
+	{value: 0x0040, lo: 0x8a, hi: 0x8a},
+	{value: 0x0008, lo: 0x8b, hi: 0xb0},
+	{value: 0x3308, lo: 0xb1, hi: 0xb6},
+	{value: 0x0040, lo: 0xb7, hi: 0xb9},
+	{value: 0x3308, lo: 0xba, hi: 0xba},
+	{value: 0x0040, lo: 0xbb, hi: 0xbb},
+	{value: 0x3308, lo: 0xbc, hi: 0xbd},
+	{value: 0x0040, lo: 0xbe, hi: 0xbe},
+	{value: 0x3308, lo: 0xbf, hi: 0xbf},
+	// Block 0xd5, offset 0x688
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x3308, lo: 0x80, hi: 0x83},
+	{value: 0x3b08, lo: 0x84, hi: 0x85},
+	{value: 0x0008, lo: 0x86, hi: 0x86},
+	{value: 0x3308, lo: 0x87, hi: 0x87},
+	{value: 0x0040, lo: 0x88, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xa5},
+	{value: 0x0040, lo: 0xa6, hi: 0xa6},
+	{value: 0x0008, lo: 0xa7, hi: 0xa8},
+	{value: 0x0040, lo: 0xa9, hi: 0xa9},
+	{value: 0x0008, lo: 0xaa, hi: 0xbf},
+	// Block 0xd6, offset 0x695
+	{value: 0x0000, lo: 0x0d},
+	{value: 0x0008, lo: 0x80, hi: 0x89},
+	{value: 0x3008, lo: 0x8a, hi: 0x8e},
+	{value: 0x0040, lo: 0x8f, hi: 0x8f},
+	{value: 0x3308, lo: 0x90, hi: 0x91},
+	{value: 0x0040, lo: 0x92, hi: 0x92},
+	{value: 0x3008, lo: 0x93, hi: 0x94},
+	{value: 0x3308, lo: 0x95, hi: 0x95},
+	{value: 0x3008, lo: 0x96, hi: 0x96},
+	{value: 0x3b08, lo: 0x97, hi: 0x97},
+	{value: 0x0008, lo: 0x98, hi: 0x98},
+	{value: 0x0040, lo: 0x99, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xa9},
+	{value: 0x0040, lo: 0xaa, hi: 0xbf},
+	// Block 0xd7, offset 0x6a3
+	{value: 0x0000, lo: 0x06},
+	{value: 0x0040, lo: 0x80, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xb2},
+	{value: 0x3308, lo: 0xb3, hi: 0xb4},
+	{value: 0x3008, lo: 0xb5, hi: 0xb6},
+	{value: 0x0018, lo: 0xb7, hi: 0xb8},
+	{value: 0x0040, lo: 0xb9, hi: 0xbf},
+	// Block 0xd8, offset 0x6aa
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x3308, lo: 0x80, hi: 0x81},
+	{value: 0x0008, lo: 0x82, hi: 0x82},
+	{value: 0x3008, lo: 0x83, hi: 0x83},
+	{value: 0x0008, lo: 0x84, hi: 0x90},
+	{value: 0x0040, lo: 0x91, hi: 0x91},
+	{value: 0x0008, lo: 0x92, hi: 0xb3},
+	{value: 0x3008, lo: 0xb4, hi: 0xb5},
+	{value: 0x3308, lo: 0xb6, hi: 0xba},
+	{value: 0x0040, lo: 0xbb, hi: 0xbd},
+	{value: 0x3008, lo: 0xbe, hi: 0xbf},
+	// Block 0xd9, offset 0x6b5
+	{value: 0x0000, lo: 0x06},
+	{value: 0x3308, lo: 0x80, hi: 0x80},
+	{value: 0x3808, lo: 0x81, hi: 0x81},
+	{value: 0x3b08, lo: 0x82, hi: 0x82},
+	{value: 0x0018, lo: 0x83, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0xbf},
+	// Block 0xda, offset 0x6bc
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0040, lo: 0x80, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xb0},
+	{value: 0x0040, lo: 0xb1, hi: 0xbf},
+	// Block 0xdb, offset 0x6c0
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0018, lo: 0x80, hi: 0xb1},
+	{value: 0x0040, lo: 0xb2, hi: 0xbe},
+	{value: 0x0018, lo: 0xbf, hi: 0xbf},
+	// Block 0xdc, offset 0x6c4
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0xbf},
+	// Block 0xdd, offset 0x6c7
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0018, lo: 0x80, hi: 0xae},
+	{value: 0x0040, lo: 0xaf, hi: 0xaf},
+	{value: 0x0018, lo: 0xb0, hi: 0xb4},
+	{value: 0x0040, lo: 0xb5, hi: 0xbf},
+	// Block 0xde, offset 0x6cc
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0x83},
+	{value: 0x0040, lo: 0x84, hi: 0xbf},
+	// Block 0xdf, offset 0x6cf
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0040, lo: 0x80, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0xbf},
+	// Block 0xe0, offset 0x6d2
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0008, lo: 0x80, hi: 0xb0},
+	{value: 0x0018, lo: 0xb1, hi: 0xb2},
+	{value: 0x0040, lo: 0xb3, hi: 0xbf},
+	// Block 0xe1, offset 0x6d6
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0xaf},
+	{value: 0x0340, lo: 0xb0, hi: 0xbf},
+	// Block 0xe2, offset 0x6d9
+	{value: 0x0000, lo: 0x04},
+	{value: 0x3308, lo: 0x80, hi: 0x80},
+	{value: 0x0008, lo: 0x81, hi: 0x86},
+	{value: 0x3308, lo: 0x87, hi: 0x95},
+	{value: 0x0040, lo: 0x96, hi: 0xbf},
+	// Block 0xe3, offset 0x6de
+	{value: 0x0000, lo: 0x06},
+	{value: 0x0008, lo: 0x80, hi: 0x9e},
+	{value: 0x0040, lo: 0x9f, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xa9},
+	{value: 0x0040, lo: 0xaa, hi: 0xad},
+	{value: 0x0018, lo: 0xae, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xbf},
+	// Block 0xe4, offset 0x6e5
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0xbe},
+	{value: 0x0040, lo: 0xbf, hi: 0xbf},
+	// Block 0xe5, offset 0x6e8
+	{value: 0x0000, lo: 0x07},
+	{value: 0x0008, lo: 0x80, hi: 0x89},
+	{value: 0x0040, lo: 0x8a, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0xad},
+	{value: 0x0040, lo: 0xae, hi: 0xaf},
+	{value: 0x3308, lo: 0xb0, hi: 0xb4},
+	{value: 0x0018, lo: 0xb5, hi: 0xb5},
+	{value: 0x0040, lo: 0xb6, hi: 0xbf},
+	// Block 0xe6, offset 0x6f0
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0008, lo: 0x80, hi: 0xaf},
+	{value: 0x3308, lo: 0xb0, hi: 0xb6},
+	{value: 0x0018, lo: 0xb7, hi: 0xbf},
+	// Block 0xe7, offset 0x6f4
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x0008, lo: 0x80, hi: 0x83},
+	{value: 0x0018, lo: 0x84, hi: 0x85},
+	{value: 0x0040, lo: 0x86, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0x9a},
+	{value: 0x0018, lo: 0x9b, hi: 0xa1},
+	{value: 0x0040, lo: 0xa2, hi: 0xa2},
+	{value: 0x0008, lo: 0xa3, hi: 0xb7},
+	{value: 0x0040, lo: 0xb8, hi: 0xbc},
+	{value: 0x0008, lo: 0xbd, hi: 0xbf},
+	// Block 0xe8, offset 0x6ff
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0x8f},
+	{value: 0x0040, lo: 0x90, hi: 0xbf},
+	// Block 0xe9, offset 0x702
+	{value: 0x0000, lo: 0x02},
+	{value: 0xe105, lo: 0x80, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xbf},
+	// Block 0xea, offset 0x705
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0018, lo: 0x80, hi: 0x9a},
+	{value: 0x0040, lo: 0x9b, hi: 0xbf},
+	// Block 0xeb, offset 0x708
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0008, lo: 0x80, hi: 0x8a},
+	{value: 0x0040, lo: 0x8b, hi: 0x8e},
+	{value: 0x3308, lo: 0x8f, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x90},
+	{value: 0x3008, lo: 0x91, hi: 0xbf},
+	// Block 0xec, offset 0x70e
+	{value: 0x0000, lo: 0x05},
+	{value: 0x3008, lo: 0x80, hi: 0x87},
+	{value: 0x0040, lo: 0x88, hi: 0x8e},
+	{value: 0x3308, lo: 0x8f, hi: 0x92},
+	{value: 0x0008, lo: 0x93, hi: 0x9f},
+	{value: 0x0040, lo: 0xa0, hi: 0xbf},
+	// Block 0xed, offset 0x714
+	{value: 0x0000, lo: 0x08},
+	{value: 0x0040, lo: 0x80, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xa1},
+	{value: 0x0018, lo: 0xa2, hi: 0xa2},
+	{value: 0x0008, lo: 0xa3, hi: 0xa3},
+	{value: 0x3308, lo: 0xa4, hi: 0xa4},
+	{value: 0x0040, lo: 0xa5, hi: 0xaf},
+	{value: 0x3008, lo: 0xb0, hi: 0xb1},
+	{value: 0x0040, lo: 0xb2, hi: 0xbf},
+	// Block 0xee, offset 0x71d
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0xb7},
+	{value: 0x0040, lo: 0xb8, hi: 0xbf},
+	// Block 0xef, offset 0x720
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0x95},
+	{value: 0x0040, lo: 0x96, hi: 0xbf},
+	// Block 0xf0, offset 0x723
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0x88},
+	{value: 0x0040, lo: 0x89, hi: 0xbf},
+	// Block 0xf1, offset 0x726
+	{value: 0x0000, lo: 0x07},
+	{value: 0x0040, lo: 0x80, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xb3},
+	{value: 0x0040, lo: 0xb4, hi: 0xb4},
+	{value: 0x0008, lo: 0xb5, hi: 0xbb},
+	{value: 0x0040, lo: 0xbc, hi: 0xbc},
+	{value: 0x0008, lo: 0xbd, hi: 0xbe},
+	{value: 0x0040, lo: 0xbf, hi: 0xbf},
+	// Block 0xf2, offset 0x72e
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0008, lo: 0x80, hi: 0xa2},
+	{value: 0x0040, lo: 0xa3, hi: 0xb1},
+	{value: 0x0008, lo: 0xb2, hi: 0xb2},
+	{value: 0x0040, lo: 0xb3, hi: 0xbf},
+	// Block 0xf3, offset 0x733
+	{value: 0x0000, lo: 0x08},
+	{value: 0x0040, lo: 0x80, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x92},
+	{value: 0x0040, lo: 0x93, hi: 0x94},
+	{value: 0x0008, lo: 0x95, hi: 0x95},
+	{value: 0x0040, lo: 0x96, hi: 0xa3},
+	{value: 0x0008, lo: 0xa4, hi: 0xa7},
+	{value: 0x0040, lo: 0xa8, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xbf},
+	// Block 0xf4, offset 0x73c
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0xbb},
+	{value: 0x0040, lo: 0xbc, hi: 0xbf},
+	// Block 0xf5, offset 0x73f
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0008, lo: 0x80, hi: 0xaa},
+	{value: 0x0040, lo: 0xab, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xbc},
+	{value: 0x0040, lo: 0xbd, hi: 0xbf},
+	// Block 0xf6, offset 0x744
+	{value: 0x0000, lo: 0x09},
+	{value: 0x0008, lo: 0x80, hi: 0x88},
+	{value: 0x0040, lo: 0x89, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0x9b},
+	{value: 0x0018, lo: 0x9c, hi: 0x9c},
+	{value: 0x3308, lo: 0x9d, hi: 0x9e},
+	{value: 0x0018, lo: 0x9f, hi: 0x9f},
+	{value: 0x03c0, lo: 0xa0, hi: 0xa3},
+	{value: 0x0040, lo: 0xa4, hi: 0xbf},
+	// Block 0xf7, offset 0x74e
+	{value: 0x0000, lo: 0x03},
+	{value: 0x3308, lo: 0x80, hi: 0xad},
+	{value: 0x0040, lo: 0xae, hi: 0xaf},
+	{value: 0x3308, lo: 0xb0, hi: 0xbf},
+	// Block 0xf8, offset 0x752
+	{value: 0x0000, lo: 0x03},
+	{value: 0x3308, lo: 0x80, hi: 0x86},
+	{value: 0x0040, lo: 0x87, hi: 0x8f},
+	{value: 0x0018, lo: 0x90, hi: 0xbf},
+	// Block 0xf9, offset 0x756
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0018, lo: 0x80, hi: 0x83},
+	{value: 0x0040, lo: 0x84, hi: 0xbf},
+	// Block 0xfa, offset 0x759
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0018, lo: 0x80, hi: 0xb5},
+	{value: 0x0040, lo: 0xb6, hi: 0xbf},
+	// Block 0xfb, offset 0x75c
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0018, lo: 0x80, hi: 0xa6},
+	{value: 0x0040, lo: 0xa7, hi: 0xa8},
+	{value: 0x0018, lo: 0xa9, hi: 0xbf},
+	// Block 0xfc, offset 0x760
+	{value: 0x0000, lo: 0x0e},
+	{value: 0x0018, lo: 0x80, hi: 0x9d},
+	{value: 0x2379, lo: 0x9e, hi: 0x9e},
+	{value: 0x2381, lo: 0x9f, hi: 0x9f},
+	{value: 0x2389, lo: 0xa0, hi: 0xa0},
+	{value: 0x2391, lo: 0xa1, hi: 0xa1},
+	{value: 0x2399, lo: 0xa2, hi: 0xa2},
+	{value: 0x23a1, lo: 0xa3, hi: 0xa3},
+	{value: 0x23a9, lo: 0xa4, hi: 0xa4},
+	{value: 0x3018, lo: 0xa5, hi: 0xa6},
+	{value: 0x3318, lo: 0xa7, hi: 0xa9},
+	{value: 0x0018, lo: 0xaa, hi: 0xac},
+	{value: 0x3018, lo: 0xad, hi: 0xb2},
+	{value: 0x0340, lo: 0xb3, hi: 0xba},
+	{value: 0x3318, lo: 0xbb, hi: 0xbf},
+	// Block 0xfd, offset 0x76f
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x3318, lo: 0x80, hi: 0x82},
+	{value: 0x0018, lo: 0x83, hi: 0x84},
+	{value: 0x3318, lo: 0x85, hi: 0x8b},
+	{value: 0x0018, lo: 0x8c, hi: 0xa9},
+	{value: 0x3318, lo: 0xaa, hi: 0xad},
+	{value: 0x0018, lo: 0xae, hi: 0xba},
+	{value: 0x23b1, lo: 0xbb, hi: 0xbb},
+	{value: 0x23b9, lo: 0xbc, hi: 0xbc},
+	{value: 0x23c1, lo: 0xbd, hi: 0xbd},
+	{value: 0x23c9, lo: 0xbe, hi: 0xbe},
+	{value: 0x23d1, lo: 0xbf, hi: 0xbf},
+	// Block 0xfe, offset 0x77b
+	{value: 0x0000, lo: 0x03},
+	{value: 0x23d9, lo: 0x80, hi: 0x80},
+	{value: 0x0018, lo: 0x81, hi: 0xaa},
+	{value: 0x0040, lo: 0xab, hi: 0xbf},
+	// Block 0xff, offset 0x77f
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0018, lo: 0x80, hi: 0x81},
+	{value: 0x3318, lo: 0x82, hi: 0x84},
+	{value: 0x0018, lo: 0x85, hi: 0x85},
+	{value: 0x0040, lo: 0x86, hi: 0xbf},
+	// Block 0x100, offset 0x784
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0018, lo: 0x80, hi: 0x93},
+	{value: 0x0040, lo: 0x94, hi: 0x9f},
+	{value: 0x0018, lo: 0xa0, hi: 0xb3},
+	{value: 0x0040, lo: 0xb4, hi: 0xbf},
+	// Block 0x101, offset 0x789
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0018, lo: 0x80, hi: 0x96},
+	{value: 0x0040, lo: 0x97, hi: 0x9f},
+	{value: 0x0018, lo: 0xa0, hi: 0xb8},
+	{value: 0x0040, lo: 0xb9, hi: 0xbf},
+	// Block 0x102, offset 0x78e
+	{value: 0x0000, lo: 0x03},
+	{value: 0x3308, lo: 0x80, hi: 0xb6},
+	{value: 0x0018, lo: 0xb7, hi: 0xba},
+	{value: 0x3308, lo: 0xbb, hi: 0xbf},
+	// Block 0x103, offset 0x792
+	{value: 0x0000, lo: 0x04},
+	{value: 0x3308, lo: 0x80, hi: 0xac},
+	{value: 0x0018, lo: 0xad, hi: 0xb4},
+	{value: 0x3308, lo: 0xb5, hi: 0xb5},
+	{value: 0x0018, lo: 0xb6, hi: 0xbf},
+	// Block 0x104, offset 0x797
+	{value: 0x0000, lo: 0x08},
+	{value: 0x0018, lo: 0x80, hi: 0x83},
+	{value: 0x3308, lo: 0x84, hi: 0x84},
+	{value: 0x0018, lo: 0x85, hi: 0x8b},
+	{value: 0x0040, lo: 0x8c, hi: 0x9a},
+	{value: 0x3308, lo: 0x9b, hi: 0x9f},
+	{value: 0x0040, lo: 0xa0, hi: 0xa0},
+	{value: 0x3308, lo: 0xa1, hi: 0xaf},
+	{value: 0x0040, lo: 0xb0, hi: 0xbf},
+	// Block 0x105, offset 0x7a0
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0008, lo: 0x80, hi: 0x9e},
+	{value: 0x0040, lo: 0x9f, hi: 0xa4},
+	{value: 0x0008, lo: 0xa5, hi: 0xaa},
+	{value: 0x0040, lo: 0xab, hi: 0xbf},
+	// Block 0x106, offset 0x7a5
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0040, lo: 0x80, hi: 0x8e},
+	{value: 0x3308, lo: 0x8f, hi: 0x8f},
+	{value: 0x0040, lo: 0x90, hi: 0xbf},
+	// Block 0x107, offset 0x7a9
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0008, lo: 0x80, hi: 0xac},
+	{value: 0x0040, lo: 0xad, hi: 0xaf},
+	{value: 0x3308, lo: 0xb0, hi: 0xb6},
+	{value: 0x0008, lo: 0xb7, hi: 0xbd},
+	{value: 0x0040, lo: 0xbe, hi: 0xbf},
+	// Block 0x108, offset 0x7af
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0008, lo: 0x80, hi: 0x89},
+	{value: 0x0040, lo: 0x8a, hi: 0x8d},
+	{value: 0x0008, lo: 0x8e, hi: 0x8e},
+	{value: 0x0018, lo: 0x8f, hi: 0x8f},
+	{value: 0x0040, lo: 0x90, hi: 0xbf},
+	// Block 0x109, offset 0x7b5
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0040, lo: 0x80, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0xad},
+	{value: 0x3308, lo: 0xae, hi: 0xae},
+	{value: 0x0040, lo: 0xaf, hi: 0xbf},
+	// Block 0x10a, offset 0x7ba
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0008, lo: 0x80, hi: 0xab},
+	{value: 0x3308, lo: 0xac, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xb9},
+	{value: 0x0040, lo: 0xba, hi: 0xbe},
+	{value: 0x0018, lo: 0xbf, hi: 0xbf},
+	// Block 0x10b, offset 0x7c0
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0040, lo: 0x80, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0xab},
+	{value: 0x3308, lo: 0xac, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xb9},
+	{value: 0x0040, lo: 0xba, hi: 0xbf},
+	// Block 0x10c, offset 0x7c6
+	{value: 0x0000, lo: 0x09},
+	{value: 0x0040, lo: 0x80, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xa6},
+	{value: 0x0040, lo: 0xa7, hi: 0xa7},
+	{value: 0x0008, lo: 0xa8, hi: 0xab},
+	{value: 0x0040, lo: 0xac, hi: 0xac},
+	{value: 0x0008, lo: 0xad, hi: 0xae},
+	{value: 0x0040, lo: 0xaf, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xbe},
+	{value: 0x0040, lo: 0xbf, hi: 0xbf},
+	// Block 0x10d, offset 0x7d0
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0808, lo: 0x80, hi: 0x84},
+	{value: 0x0040, lo: 0x85, hi: 0x86},
+	{value: 0x0818, lo: 0x87, hi: 0x8f},
+	{value: 0x3308, lo: 0x90, hi: 0x96},
+	{value: 0x0040, lo: 0x97, hi: 0xbf},
+	// Block 0x10e, offset 0x7d6
+	{value: 0x0000, lo: 0x08},
+	{value: 0x0a08, lo: 0x80, hi: 0x83},
+	{value: 0x3308, lo: 0x84, hi: 0x8a},
+	{value: 0x0b08, lo: 0x8b, hi: 0x8b},
+	{value: 0x0040, lo: 0x8c, hi: 0x8f},
+	{value: 0x0808, lo: 0x90, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0x9d},
+	{value: 0x0818, lo: 0x9e, hi: 0x9f},
+	{value: 0x0040, lo: 0xa0, hi: 0xbf},
+	// Block 0x10f, offset 0x7df
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0040, lo: 0x80, hi: 0xb0},
+	{value: 0x0818, lo: 0xb1, hi: 0xbf},
+	// Block 0x110, offset 0x7e2
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0818, lo: 0x80, hi: 0xb4},
+	{value: 0x0040, lo: 0xb5, hi: 0xbf},
+	// Block 0x111, offset 0x7e5
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0040, lo: 0x80, hi: 0x80},
+	{value: 0x0818, lo: 0x81, hi: 0xbd},
+	{value: 0x0040, lo: 0xbe, hi: 0xbf},
+	// Block 0x112, offset 0x7e9
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0040, lo: 0x80, hi: 0xaf},
+	{value: 0x0018, lo: 0xb0, hi: 0xb1},
+	{value: 0x0040, lo: 0xb2, hi: 0xbf},
+	// Block 0x113, offset 0x7ed
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0018, lo: 0x80, hi: 0xab},
+	{value: 0x0040, lo: 0xac, hi: 0xaf},
+	{value: 0x0018, lo: 0xb0, hi: 0xbf},
+	// Block 0x114, offset 0x7f1
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0018, lo: 0x80, hi: 0x93},
+	{value: 0x0040, lo: 0x94, hi: 0x9f},
+	{value: 0x0018, lo: 0xa0, hi: 0xae},
+	{value: 0x0040, lo: 0xaf, hi: 0xb0},
+	{value: 0x0018, lo: 0xb1, hi: 0xbf},
+	// Block 0x115, offset 0x7f7
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0040, lo: 0x80, hi: 0x80},
+	{value: 0x0018, lo: 0x81, hi: 0x8f},
+	{value: 0x0040, lo: 0x90, hi: 0x90},
+	{value: 0x0018, lo: 0x91, hi: 0xb5},
+	{value: 0x0040, lo: 0xb6, hi: 0xbf},
+	// Block 0x116, offset 0x7fd
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0018, lo: 0x80, hi: 0x8f},
+	{value: 0x2709, lo: 0x90, hi: 0x90},
+	{value: 0x0018, lo: 0x91, hi: 0xad},
+	{value: 0x0040, lo: 0xae, hi: 0xbf},
+	// Block 0x117, offset 0x802
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0040, lo: 0x80, hi: 0xa5},
+	{value: 0x0018, lo: 0xa6, hi: 0xbf},
+	// Block 0x118, offset 0x805
+	{value: 0x0000, lo: 0x0f},
+	{value: 0x2889, lo: 0x80, hi: 0x80},
+	{value: 0x2891, lo: 0x81, hi: 0x81},
+	{value: 0x2899, lo: 0x82, hi: 0x82},
+	{value: 0x28a1, lo: 0x83, hi: 0x83},
+	{value: 0x28a9, lo: 0x84, hi: 0x84},
+	{value: 0x28b1, lo: 0x85, hi: 0x85},
+	{value: 0x28b9, lo: 0x86, hi: 0x86},
+	{value: 0x28c1, lo: 0x87, hi: 0x87},
+	{value: 0x28c9, lo: 0x88, hi: 0x88},
+	{value: 0x0040, lo: 0x89, hi: 0x8f},
+	{value: 0x28d1, lo: 0x90, hi: 0x90},
+	{value: 0x28d9, lo: 0x91, hi: 0x91},
+	{value: 0x0040, lo: 0x92, hi: 0x9f},
+	{value: 0x0018, lo: 0xa0, hi: 0xa5},
+	{value: 0x0040, lo: 0xa6, hi: 0xbf},
+	// Block 0x119, offset 0x815
+	{value: 0x0000, lo: 0x06},
+	{value: 0x0018, lo: 0x80, hi: 0x97},
+	{value: 0x0040, lo: 0x98, hi: 0x9b},
+	{value: 0x0018, lo: 0x9c, hi: 0xac},
+	{value: 0x0040, lo: 0xad, hi: 0xaf},
+	{value: 0x0018, lo: 0xb0, hi: 0xbc},
+	{value: 0x0040, lo: 0xbd, hi: 0xbf},
+	// Block 0x11a, offset 0x81c
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0018, lo: 0x80, hi: 0xb6},
+	{value: 0x0040, lo: 0xb7, hi: 0xba},
+	{value: 0x0018, lo: 0xbb, hi: 0xbf},
+	// Block 0x11b, offset 0x820
+	{value: 0x0000, lo: 0x06},
+	{value: 0x0018, lo: 0x80, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0x9f},
+	{value: 0x0018, lo: 0xa0, hi: 0xab},
+	{value: 0x0040, lo: 0xac, hi: 0xaf},
+	{value: 0x0018, lo: 0xb0, hi: 0xb0},
+	{value: 0x0040, lo: 0xb1, hi: 0xbf},
+	// Block 0x11c, offset 0x827
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0018, lo: 0x80, hi: 0x8b},
+	{value: 0x0040, lo: 0x8c, hi: 0x8f},
+	{value: 0x0018, lo: 0x90, hi: 0xbf},
+	// Block 0x11d, offset 0x82b
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0018, lo: 0x80, hi: 0x87},
+	{value: 0x0040, lo: 0x88, hi: 0x8f},
+	{value: 0x0018, lo: 0x90, hi: 0x99},
+	{value: 0x0040, lo: 0x9a, hi: 0x9f},
+	{value: 0x0018, lo: 0xa0, hi: 0xbf},
+	// Block 0x11e, offset 0x831
+	{value: 0x0000, lo: 0x06},
+	{value: 0x0018, lo: 0x80, hi: 0x87},
+	{value: 0x0040, lo: 0x88, hi: 0x8f},
+	{value: 0x0018, lo: 0x90, hi: 0xad},
+	{value: 0x0040, lo: 0xae, hi: 0xaf},
+	{value: 0x0018, lo: 0xb0, hi: 0xb1},
+	{value: 0x0040, lo: 0xb2, hi: 0xbf},
+	// Block 0x11f, offset 0x838
+	{value: 0x0000, lo: 0x06},
+	{value: 0x0018, lo: 0x80, hi: 0x93},
+	{value: 0x0040, lo: 0x94, hi: 0x9f},
+	{value: 0x0018, lo: 0xa0, hi: 0xad},
+	{value: 0x0040, lo: 0xae, hi: 0xaf},
+	{value: 0x0018, lo: 0xb0, hi: 0xbc},
+	{value: 0x0040, lo: 0xbd, hi: 0xbf},
+	// Block 0x120, offset 0x83f
+	{value: 0x0000, lo: 0x05},
+	{value: 0x0018, lo: 0x80, hi: 0x88},
+	{value: 0x0040, lo: 0x89, hi: 0x8f},
+	{value: 0x0018, lo: 0x90, hi: 0xbd},
+	{value: 0x0040, lo: 0xbe, hi: 0xbe},
+	{value: 0x0018, lo: 0xbf, hi: 0xbf},
+	// Block 0x121, offset 0x845
+	{value: 0x0000, lo: 0x08},
+	{value: 0x0018, lo: 0x80, hi: 0x85},
+	{value: 0x0040, lo: 0x86, hi: 0x8d},
+	{value: 0x0018, lo: 0x8e, hi: 0x9b},
+	{value: 0x0040, lo: 0x9c, hi: 0x9f},
+	{value: 0x0018, lo: 0xa0, hi: 0xa8},
+	{value: 0x0040, lo: 0xa9, hi: 0xaf},
+	{value: 0x0018, lo: 0xb0, hi: 0xb8},
+	{value: 0x0040, lo: 0xb9, hi: 0xbf},
+	// Block 0x122, offset 0x84e
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0018, lo: 0x80, hi: 0x92},
+	{value: 0x0040, lo: 0x93, hi: 0x93},
+	{value: 0x0018, lo: 0x94, hi: 0xbf},
+	// Block 0x123, offset 0x852
+	{value: 0x0000, lo: 0x0d},
+	{value: 0x0018, lo: 0x80, hi: 0x8a},
+	{value: 0x0040, lo: 0x8b, hi: 0xaf},
+	{value: 0x06e1, lo: 0xb0, hi: 0xb0},
+	{value: 0x0049, lo: 0xb1, hi: 0xb1},
+	{value: 0x0029, lo: 0xb2, hi: 0xb2},
+	{value: 0x0031, lo: 0xb3, hi: 0xb3},
+	{value: 0x06e9, lo: 0xb4, hi: 0xb4},
+	{value: 0x06f1, lo: 0xb5, hi: 0xb5},
+	{value: 0x06f9, lo: 0xb6, hi: 0xb6},
+	{value: 0x0701, lo: 0xb7, hi: 0xb7},
+	{value: 0x0709, lo: 0xb8, hi: 0xb8},
+	{value: 0x0711, lo: 0xb9, hi: 0xb9},
+	{value: 0x0040, lo: 0xba, hi: 0xbf},
+	// Block 0x124, offset 0x860
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0x9f},
+	{value: 0x0040, lo: 0xa0, hi: 0xbf},
+	// Block 0x125, offset 0x863
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0xb9},
+	{value: 0x0040, lo: 0xba, hi: 0xbf},
+	// Block 0x126, offset 0x866
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0008, lo: 0x80, hi: 0x9d},
+	{value: 0x0040, lo: 0x9e, hi: 0x9f},
+	{value: 0x0008, lo: 0xa0, hi: 0xbf},
+	// Block 0x127, offset 0x86a
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0008, lo: 0x80, hi: 0xa1},
+	{value: 0x0040, lo: 0xa2, hi: 0xaf},
+	{value: 0x0008, lo: 0xb0, hi: 0xbf},
+	// Block 0x128, offset 0x86e
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0xa0},
+	{value: 0x0040, lo: 0xa1, hi: 0xbf},
+	// Block 0x129, offset 0x871
+	{value: 0x0000, lo: 0x03},
+	{value: 0x0008, lo: 0x80, hi: 0x8a},
+	{value: 0x0040, lo: 0x8b, hi: 0x8f},
+	{value: 0x0008, lo: 0x90, hi: 0xbf},
+	// Block 0x12a, offset 0x875
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0008, lo: 0x80, hi: 0xaf},
+	{value: 0x0040, lo: 0xb0, hi: 0xbf},
+	// Block 0x12b, offset 0x878
+	{value: 0x0000, lo: 0x04},
+	{value: 0x0040, lo: 0x80, hi: 0x80},
+	{value: 0x0340, lo: 0x81, hi: 0x81},
+	{value: 0x0040, lo: 0x82, hi: 0x9f},
+	{value: 0x0340, lo: 0xa0, hi: 0xbf},
+	// Block 0x12c, offset 0x87d
+	{value: 0x0000, lo: 0x01},
+	{value: 0x0340, lo: 0x80, hi: 0xbf},
+	// Block 0x12d, offset 0x87f
+	{value: 0x0000, lo: 0x01},
+	{value: 0x33c0, lo: 0x80, hi: 0xbf},
+	// Block 0x12e, offset 0x881
+	{value: 0x0000, lo: 0x02},
+	{value: 0x33c0, lo: 0x80, hi: 0xaf},
+	{value: 0x0040, lo: 0xb0, hi: 0xbf},
+}
+
+// Total table size 46723 bytes (45KiB); checksum: 4CF3143A
diff --git a/vendor/golang.org/x/net/idna/trie.go b/vendor/golang.org/x/net/idna/trie.go
index c4ef847e..42127417 100644
--- a/vendor/golang.org/x/net/idna/trie.go
+++ b/vendor/golang.org/x/net/idna/trie.go
@@ -6,27 +6,6 @@
 
 package idna
 
-// appendMapping appends the mapping for the respective rune. isMapped must be
-// true. A mapping is a categorization of a rune as defined in UTS #46.
-func (c info) appendMapping(b []byte, s string) []byte {
-	index := int(c >> indexShift)
-	if c&xorBit == 0 {
-		s := mappings[index:]
-		return append(b, s[1:s[0]+1]...)
-	}
-	b = append(b, s...)
-	if c&inlineXOR == inlineXOR {
-		// TODO: support and handle two-byte inline masks
-		b[len(b)-1] ^= byte(index)
-	} else {
-		for p := len(b) - int(xorData[index]); p < len(b); p++ {
-			index++
-			b[p] ^= xorData[index]
-		}
-	}
-	return b
-}
-
 // Sparse block handling code.
 
 type valueRange struct {
diff --git a/vendor/golang.org/x/net/idna/trie12.0.0.go b/vendor/golang.org/x/net/idna/trie12.0.0.go
new file mode 100644
index 00000000..bb63f904
--- /dev/null
+++ b/vendor/golang.org/x/net/idna/trie12.0.0.go
@@ -0,0 +1,31 @@
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
+
+// 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.
+
+//go:build !go1.16
+// +build !go1.16
+
+package idna
+
+// appendMapping appends the mapping for the respective rune. isMapped must be
+// true. A mapping is a categorization of a rune as defined in UTS #46.
+func (c info) appendMapping(b []byte, s string) []byte {
+	index := int(c >> indexShift)
+	if c&xorBit == 0 {
+		s := mappings[index:]
+		return append(b, s[1:s[0]+1]...)
+	}
+	b = append(b, s...)
+	if c&inlineXOR == inlineXOR {
+		// TODO: support and handle two-byte inline masks
+		b[len(b)-1] ^= byte(index)
+	} else {
+		for p := len(b) - int(xorData[index]); p < len(b); p++ {
+			index++
+			b[p] ^= xorData[index]
+		}
+	}
+	return b
+}
diff --git a/vendor/golang.org/x/net/idna/trie13.0.0.go b/vendor/golang.org/x/net/idna/trie13.0.0.go
new file mode 100644
index 00000000..7d68a8dc
--- /dev/null
+++ b/vendor/golang.org/x/net/idna/trie13.0.0.go
@@ -0,0 +1,31 @@
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
+
+// 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.
+
+//go:build go1.16
+// +build go1.16
+
+package idna
+
+// appendMapping appends the mapping for the respective rune. isMapped must be
+// true. A mapping is a categorization of a rune as defined in UTS #46.
+func (c info) appendMapping(b []byte, s string) []byte {
+	index := int(c >> indexShift)
+	if c&xorBit == 0 {
+		p := index
+		return append(b, mappings[mappingIndex[p]:mappingIndex[p+1]]...)
+	}
+	b = append(b, s...)
+	if c&inlineXOR == inlineXOR {
+		// TODO: support and handle two-byte inline masks
+		b[len(b)-1] ^= byte(index)
+	} else {
+		for p := len(b) - int(xorData[index]); p < len(b); p++ {
+			index++
+			b[p] ^= xorData[index]
+		}
+	}
+	return b
+}
diff --git a/vendor/golang.org/x/oauth2/README.md b/vendor/golang.org/x/oauth2/README.md
index 1473e129..781770c2 100644
--- a/vendor/golang.org/x/oauth2/README.md
+++ b/vendor/golang.org/x/oauth2/README.md
@@ -19,7 +19,7 @@ See pkg.go.dev for further documentation and examples.
 * [pkg.go.dev/golang.org/x/oauth2](https://pkg.go.dev/golang.org/x/oauth2)
 * [pkg.go.dev/golang.org/x/oauth2/google](https://pkg.go.dev/golang.org/x/oauth2/google)
 
-## Policy for new packages
+## Policy for new endpoints
 
 We no longer accept new provider-specific packages in this repo if all
 they do is add a single endpoint variable. If you just want to add a
@@ -29,8 +29,12 @@ package.
 
 ## Report Issues / Send Patches
 
-This repository uses Gerrit for code changes. To learn how to submit changes to
-this repository, see https://golang.org/doc/contribute.html.
-
 The main issue tracker for the oauth2 repository is located at
 https://github.com/golang/oauth2/issues.
+
+This repository uses Gerrit for code changes. To learn how to submit changes to
+this repository, see https://golang.org/doc/contribute.html. In particular:
+
+* Excluding trivial changes, all contributions should be connected to an existing issue.
+* API changes must go through the [change proposal process](https://go.dev/s/proposal-process) before they can be accepted.
+* The code owners are listed at [dev.golang.org/owners](https://dev.golang.org/owners#:~:text=x/oauth2).
diff --git a/vendor/golang.org/x/oauth2/internal/client_appengine.go b/vendor/golang.org/x/oauth2/internal/client_appengine.go
index e1755d1d..d28140f7 100644
--- a/vendor/golang.org/x/oauth2/internal/client_appengine.go
+++ b/vendor/golang.org/x/oauth2/internal/client_appengine.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build appengine
-// +build appengine
 
 package internal
 
diff --git a/vendor/golang.org/x/oauth2/internal/oauth2.go b/vendor/golang.org/x/oauth2/internal/oauth2.go
index c0ab196c..14989bea 100644
--- a/vendor/golang.org/x/oauth2/internal/oauth2.go
+++ b/vendor/golang.org/x/oauth2/internal/oauth2.go
@@ -14,7 +14,7 @@ import (
 
 // ParseKey converts the binary contents of a private key file
 // to an *rsa.PrivateKey. It detects whether the private key is in a
-// PEM container or not. If so, it extracts the the private key
+// PEM container or not. If so, it extracts the private key
 // from PEM container before conversion. It only supports PEM
 // containers with no passphrase.
 func ParseKey(key []byte) (*rsa.PrivateKey, error) {
diff --git a/vendor/golang.org/x/oauth2/internal/token.go b/vendor/golang.org/x/oauth2/internal/token.go
index b4723fca..58901bda 100644
--- a/vendor/golang.org/x/oauth2/internal/token.go
+++ b/vendor/golang.org/x/oauth2/internal/token.go
@@ -55,12 +55,18 @@ type Token struct {
 }
 
 // tokenJSON is the struct representing the HTTP response from OAuth2
-// providers returning a token in JSON form.
+// providers returning a token or error in JSON form.
+// https://datatracker.ietf.org/doc/html/rfc6749#section-5.1
 type tokenJSON struct {
 	AccessToken  string         `json:"access_token"`
 	TokenType    string         `json:"token_type"`
 	RefreshToken string         `json:"refresh_token"`
 	ExpiresIn    expirationTime `json:"expires_in"` // at least PayPal returns string, while most return number
+	// error fields
+	// https://datatracker.ietf.org/doc/html/rfc6749#section-5.2
+	ErrorCode        string `json:"error"`
+	ErrorDescription string `json:"error_description"`
+	ErrorURI         string `json:"error_uri"`
 }
 
 func (e *tokenJSON) expiry() (t time.Time) {
@@ -236,21 +242,29 @@ func doTokenRoundTrip(ctx context.Context, req *http.Request) (*Token, error) {
 	if err != nil {
 		return nil, fmt.Errorf("oauth2: cannot fetch token: %v", err)
 	}
-	if code := r.StatusCode; code < 200 || code > 299 {
-		return nil, &RetrieveError{
-			Response: r,
-			Body:     body,
-		}
+
+	failureStatus := r.StatusCode < 200 || r.StatusCode > 299
+	retrieveError := &RetrieveError{
+		Response: r,
+		Body:     body,
+		// attempt to populate error detail below
 	}
 
 	var token *Token
 	content, _, _ := mime.ParseMediaType(r.Header.Get("Content-Type"))
 	switch content {
 	case "application/x-www-form-urlencoded", "text/plain":
+		// some endpoints return a query string
 		vals, err := url.ParseQuery(string(body))
 		if err != nil {
-			return nil, err
+			if failureStatus {
+				return nil, retrieveError
+			}
+			return nil, fmt.Errorf("oauth2: cannot parse response: %v", err)
 		}
+		retrieveError.ErrorCode = vals.Get("error")
+		retrieveError.ErrorDescription = vals.Get("error_description")
+		retrieveError.ErrorURI = vals.Get("error_uri")
 		token = &Token{
 			AccessToken:  vals.Get("access_token"),
 			TokenType:    vals.Get("token_type"),
@@ -265,8 +279,14 @@ func doTokenRoundTrip(ctx context.Context, req *http.Request) (*Token, error) {
 	default:
 		var tj tokenJSON
 		if err = json.Unmarshal(body, &tj); err != nil {
-			return nil, err
+			if failureStatus {
+				return nil, retrieveError
+			}
+			return nil, fmt.Errorf("oauth2: cannot parse json: %v", err)
 		}
+		retrieveError.ErrorCode = tj.ErrorCode
+		retrieveError.ErrorDescription = tj.ErrorDescription
+		retrieveError.ErrorURI = tj.ErrorURI
 		token = &Token{
 			AccessToken:  tj.AccessToken,
 			TokenType:    tj.TokenType,
@@ -276,17 +296,37 @@ func doTokenRoundTrip(ctx context.Context, req *http.Request) (*Token, error) {
 		}
 		json.Unmarshal(body, &token.Raw) // no error checks for optional fields
 	}
+	// according to spec, servers should respond status 400 in error case
+	// https://www.rfc-editor.org/rfc/rfc6749#section-5.2
+	// but some unorthodox servers respond 200 in error case
+	if failureStatus || retrieveError.ErrorCode != "" {
+		return nil, retrieveError
+	}
 	if token.AccessToken == "" {
 		return nil, errors.New("oauth2: server response missing access_token")
 	}
 	return token, nil
 }
 
+// mirrors oauth2.RetrieveError
 type RetrieveError struct {
-	Response *http.Response
-	Body     []byte
+	Response         *http.Response
+	Body             []byte
+	ErrorCode        string
+	ErrorDescription string
+	ErrorURI         string
 }
 
 func (r *RetrieveError) Error() string {
+	if r.ErrorCode != "" {
+		s := fmt.Sprintf("oauth2: %q", r.ErrorCode)
+		if r.ErrorDescription != "" {
+			s += fmt.Sprintf(" %q", r.ErrorDescription)
+		}
+		if r.ErrorURI != "" {
+			s += fmt.Sprintf(" %q", r.ErrorURI)
+		}
+		return s
+	}
 	return fmt.Sprintf("oauth2: cannot fetch token: %v\nResponse: %s", r.Response.Status, r.Body)
 }
diff --git a/vendor/golang.org/x/oauth2/oauth2.go b/vendor/golang.org/x/oauth2/oauth2.go
index 291df5c8..9085fabe 100644
--- a/vendor/golang.org/x/oauth2/oauth2.go
+++ b/vendor/golang.org/x/oauth2/oauth2.go
@@ -16,6 +16,7 @@ import (
 	"net/url"
 	"strings"
 	"sync"
+	"time"
 
 	"golang.org/x/oauth2/internal"
 )
@@ -140,7 +141,7 @@ func SetAuthURLParam(key, value string) AuthCodeOption {
 //
 // State is a token to protect the user from CSRF attacks. You must
 // always provide a non-empty string and validate that it matches the
-// the state query parameter on your redirect callback.
+// state query parameter on your redirect callback.
 // See http://tools.ietf.org/html/rfc6749#section-10.12 for more info.
 //
 // Opts may include AccessTypeOnline or AccessTypeOffline, as well
@@ -290,6 +291,8 @@ type reuseTokenSource struct {
 
 	mu sync.Mutex // guards t
 	t  *Token
+
+	expiryDelta time.Duration
 }
 
 // Token returns the current token if it's still valid, else will
@@ -305,6 +308,7 @@ func (s *reuseTokenSource) Token() (*Token, error) {
 	if err != nil {
 		return nil, err
 	}
+	t.expiryDelta = s.expiryDelta
 	s.t = t
 	return t, nil
 }
@@ -379,3 +383,30 @@ func ReuseTokenSource(t *Token, src TokenSource) TokenSource {
 		new: src,
 	}
 }
+
+// ReuseTokenSource returns a TokenSource that acts in the same manner as the
+// TokenSource returned by ReuseTokenSource, except the expiry buffer is
+// configurable. The expiration time of a token is calculated as
+// t.Expiry.Add(-earlyExpiry).
+func ReuseTokenSourceWithExpiry(t *Token, src TokenSource, earlyExpiry time.Duration) TokenSource {
+	// Don't wrap a reuseTokenSource in itself. That would work,
+	// but cause an unnecessary number of mutex operations.
+	// Just build the equivalent one.
+	if rt, ok := src.(*reuseTokenSource); ok {
+		if t == nil {
+			// Just use it directly, but set the expiryDelta to earlyExpiry,
+			// so the behavior matches what the user expects.
+			rt.expiryDelta = earlyExpiry
+			return rt
+		}
+		src = rt.new
+	}
+	if t != nil {
+		t.expiryDelta = earlyExpiry
+	}
+	return &reuseTokenSource{
+		t:           t,
+		new:         src,
+		expiryDelta: earlyExpiry,
+	}
+}
diff --git a/vendor/golang.org/x/oauth2/token.go b/vendor/golang.org/x/oauth2/token.go
index 82272034..5ffce976 100644
--- a/vendor/golang.org/x/oauth2/token.go
+++ b/vendor/golang.org/x/oauth2/token.go
@@ -16,10 +16,10 @@ import (
 	"golang.org/x/oauth2/internal"
 )
 
-// expiryDelta determines how earlier a token should be considered
+// defaultExpiryDelta determines how earlier a token should be considered
 // expired than its actual expiration time. It is used to avoid late
 // expirations due to client-server time mismatches.
-const expiryDelta = 10 * time.Second
+const defaultExpiryDelta = 10 * time.Second
 
 // Token represents the credentials used to authorize
 // the requests to access protected resources on the OAuth 2.0
@@ -52,6 +52,11 @@ type Token struct {
 	// raw optionally contains extra metadata from the server
 	// when updating a token.
 	raw interface{}
+
+	// expiryDelta is used to calculate when a token is considered
+	// expired, by subtracting from Expiry. If zero, defaultExpiryDelta
+	// is used.
+	expiryDelta time.Duration
 }
 
 // Type returns t.TokenType if non-empty, else "Bearer".
@@ -127,6 +132,11 @@ func (t *Token) expired() bool {
 	if t.Expiry.IsZero() {
 		return false
 	}
+
+	expiryDelta := defaultExpiryDelta
+	if t.expiryDelta != 0 {
+		expiryDelta = t.expiryDelta
+	}
 	return t.Expiry.Round(0).Add(-expiryDelta).Before(timeNow())
 }
 
@@ -165,14 +175,31 @@ func retrieveToken(ctx context.Context, c *Config, v url.Values) (*Token, error)
 }
 
 // RetrieveError is the error returned when the token endpoint returns a
-// non-2XX HTTP status code.
+// non-2XX HTTP status code or populates RFC 6749's 'error' parameter.
+// https://datatracker.ietf.org/doc/html/rfc6749#section-5.2
 type RetrieveError struct {
 	Response *http.Response
 	// Body is the body that was consumed by reading Response.Body.
 	// It may be truncated.
 	Body []byte
+	// ErrorCode is RFC 6749's 'error' parameter.
+	ErrorCode string
+	// ErrorDescription is RFC 6749's 'error_description' parameter.
+	ErrorDescription string
+	// ErrorURI is RFC 6749's 'error_uri' parameter.
+	ErrorURI string
 }
 
 func (r *RetrieveError) Error() string {
+	if r.ErrorCode != "" {
+		s := fmt.Sprintf("oauth2: %q", r.ErrorCode)
+		if r.ErrorDescription != "" {
+			s += fmt.Sprintf(" %q", r.ErrorDescription)
+		}
+		if r.ErrorURI != "" {
+			s += fmt.Sprintf(" %q", r.ErrorURI)
+		}
+		return s
+	}
 	return fmt.Sprintf("oauth2: cannot fetch token: %v\nResponse: %s", r.Response.Status, r.Body)
 }
diff --git a/vendor/golang.org/x/sys/cpu/endian_little.go b/vendor/golang.org/x/sys/cpu/endian_little.go
index fe545966..55db853e 100644
--- a/vendor/golang.org/x/sys/cpu/endian_little.go
+++ b/vendor/golang.org/x/sys/cpu/endian_little.go
@@ -2,8 +2,8 @@
 // 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
+//go:build 386 || amd64 || amd64p32 || alpha || arm || arm64 || loong64 || mipsle || mips64le || mips64p32le || nios2 || ppc64le || riscv || riscv64 || sh || wasm
+// +build 386 amd64 amd64p32 alpha arm arm64 loong64 mipsle mips64le mips64p32le nios2 ppc64le riscv riscv64 sh wasm
 
 package cpu
 
diff --git a/vendor/golang.org/x/sys/unix/ioctl_signed.go b/vendor/golang.org/x/sys/unix/ioctl_signed.go
new file mode 100644
index 00000000..7def9580
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ioctl_signed.go
@@ -0,0 +1,70 @@
+// Copyright 2018 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 aix || solaris
+// +build aix solaris
+
+package unix
+
+import (
+	"unsafe"
+)
+
+// ioctl itself should not be exposed directly, but additional get/set
+// functions for specific types are permissible.
+
+// IoctlSetInt performs an ioctl operation which sets an integer value
+// on fd, using the specified request number.
+func IoctlSetInt(fd int, req int, value int) error {
+	return ioctl(fd, req, uintptr(value))
+}
+
+// IoctlSetPointerInt performs an ioctl operation which sets an
+// integer value on fd, using the specified request number. The ioctl
+// argument is called with a pointer to the integer value, rather than
+// passing the integer value directly.
+func IoctlSetPointerInt(fd int, req int, value int) error {
+	v := int32(value)
+	return ioctlPtr(fd, req, unsafe.Pointer(&v))
+}
+
+// IoctlSetWinsize performs an ioctl on fd with a *Winsize argument.
+//
+// To change fd's window size, the req argument should be TIOCSWINSZ.
+func IoctlSetWinsize(fd int, req int, value *Winsize) error {
+	// TODO: if we get the chance, remove the req parameter and
+	// hardcode TIOCSWINSZ.
+	return ioctlPtr(fd, req, unsafe.Pointer(value))
+}
+
+// IoctlSetTermios performs an ioctl on fd with a *Termios.
+//
+// The req value will usually be TCSETA or TIOCSETA.
+func IoctlSetTermios(fd int, req int, value *Termios) error {
+	// TODO: if we get the chance, remove the req parameter.
+	return ioctlPtr(fd, req, unsafe.Pointer(value))
+}
+
+// IoctlGetInt performs an ioctl operation which gets an integer value
+// from fd, using the specified request number.
+//
+// A few ioctl requests use the return value as an output parameter;
+// for those, IoctlRetInt should be used instead of this function.
+func IoctlGetInt(fd int, req int) (int, error) {
+	var value int
+	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
+	return value, err
+}
+
+func IoctlGetWinsize(fd int, req int) (*Winsize, error) {
+	var value Winsize
+	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
+	return &value, err
+}
+
+func IoctlGetTermios(fd int, req int) (*Termios, error) {
+	var value Termios
+	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
+	return &value, err
+}
diff --git a/vendor/golang.org/x/sys/unix/ioctl.go b/vendor/golang.org/x/sys/unix/ioctl_unsigned.go
similarity index 92%
rename from vendor/golang.org/x/sys/unix/ioctl.go
rename to vendor/golang.org/x/sys/unix/ioctl_unsigned.go
index 7ce8dd40..649913d1 100644
--- a/vendor/golang.org/x/sys/unix/ioctl.go
+++ b/vendor/golang.org/x/sys/unix/ioctl_unsigned.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build aix || darwin || dragonfly || freebsd || hurd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd hurd linux netbsd openbsd solaris
+//go:build darwin || dragonfly || freebsd || hurd || linux || netbsd || openbsd
+// +build darwin dragonfly freebsd hurd linux netbsd openbsd
 
 package unix
 
diff --git a/vendor/golang.org/x/sys/unix/ioctl_zos.go b/vendor/golang.org/x/sys/unix/ioctl_zos.go
index 6532f09a..cdc21bf7 100644
--- a/vendor/golang.org/x/sys/unix/ioctl_zos.go
+++ b/vendor/golang.org/x/sys/unix/ioctl_zos.go
@@ -17,14 +17,14 @@ import (
 
 // IoctlSetInt performs an ioctl operation which sets an integer value
 // on fd, using the specified request number.
-func IoctlSetInt(fd int, req uint, value int) error {
+func IoctlSetInt(fd int, req int, value int) error {
 	return ioctl(fd, req, uintptr(value))
 }
 
 // IoctlSetWinsize performs an ioctl on fd with a *Winsize argument.
 //
 // To change fd's window size, the req argument should be TIOCSWINSZ.
-func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
+func IoctlSetWinsize(fd int, req int, value *Winsize) error {
 	// TODO: if we get the chance, remove the req parameter and
 	// hardcode TIOCSWINSZ.
 	return ioctlPtr(fd, req, unsafe.Pointer(value))
@@ -33,7 +33,7 @@ func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
 // IoctlSetTermios performs an ioctl on fd with a *Termios.
 //
 // The req value is expected to be TCSETS, TCSETSW, or TCSETSF
-func IoctlSetTermios(fd int, req uint, value *Termios) error {
+func IoctlSetTermios(fd int, req int, value *Termios) error {
 	if (req != TCSETS) && (req != TCSETSW) && (req != TCSETSF) {
 		return ENOSYS
 	}
@@ -47,13 +47,13 @@ func IoctlSetTermios(fd int, req uint, value *Termios) error {
 //
 // A few ioctl requests use the return value as an output parameter;
 // for those, IoctlRetInt should be used instead of this function.
-func IoctlGetInt(fd int, req uint) (int, error) {
+func IoctlGetInt(fd int, req int) (int, error) {
 	var value int
 	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
 	return value, err
 }
 
-func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
+func IoctlGetWinsize(fd int, req int) (*Winsize, error) {
 	var value Winsize
 	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
 	return &value, err
@@ -62,7 +62,7 @@ func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
 // IoctlGetTermios performs an ioctl on fd with a *Termios.
 //
 // The req value is expected to be TCGETS
-func IoctlGetTermios(fd int, req uint) (*Termios, error) {
+func IoctlGetTermios(fd int, req int) (*Termios, error) {
 	var value Termios
 	if req != TCGETS {
 		return &value, ENOSYS
diff --git a/vendor/golang.org/x/sys/unix/mkall.sh b/vendor/golang.org/x/sys/unix/mkall.sh
index 8e3947c3..e6f31d37 100644
--- a/vendor/golang.org/x/sys/unix/mkall.sh
+++ b/vendor/golang.org/x/sys/unix/mkall.sh
@@ -50,7 +50,7 @@ if [[ "$GOOS" = "linux" ]]; then
 	# Use the Docker-based build system
 	# Files generated through docker (use $cmd so you can Ctl-C the build or run)
 	$cmd docker build --tag generate:$GOOS $GOOS
-	$cmd docker run --interactive --tty --volume $(cd -- "$(dirname -- "$0")/.." && /bin/pwd):/build generate:$GOOS
+	$cmd docker run --interactive --tty --volume $(cd -- "$(dirname -- "$0")/.." && pwd):/build generate:$GOOS
 	exit
 fi
 
diff --git a/vendor/golang.org/x/sys/unix/mkerrors.sh b/vendor/golang.org/x/sys/unix/mkerrors.sh
index 7456d9dd..8f775faf 100644
--- a/vendor/golang.org/x/sys/unix/mkerrors.sh
+++ b/vendor/golang.org/x/sys/unix/mkerrors.sh
@@ -66,6 +66,7 @@ includes_Darwin='
 #include <sys/ptrace.h>
 #include <sys/select.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
 #include <sys/un.h>
 #include <sys/sockio.h>
 #include <sys/sys_domain.h>
@@ -203,6 +204,7 @@ struct ltchars {
 #include <sys/timerfd.h>
 #include <sys/uio.h>
 #include <sys/xattr.h>
+#include <netinet/udp.h>
 #include <linux/audit.h>
 #include <linux/bpf.h>
 #include <linux/can.h>
@@ -517,10 +519,11 @@ ccflags="$@"
 		$2 ~ /^LOCK_(SH|EX|NB|UN)$/ ||
 		$2 ~ /^LO_(KEY|NAME)_SIZE$/ ||
 		$2 ~ /^LOOP_(CLR|CTL|GET|SET)_/ ||
-		$2 ~ /^(AF|SOCK|SO|SOL|IPPROTO|IP|IPV6|TCP|MCAST|EVFILT|NOTE|SHUT|PROT|MAP|MFD|T?PACKET|MSG|SCM|MCL|DT|MADV|PR|LOCAL|TCPOPT)_/ ||
+		$2 ~ /^(AF|SOCK|SO|SOL|IPPROTO|IP|IPV6|TCP|MCAST|EVFILT|NOTE|SHUT|PROT|MAP|MREMAP|MFD|T?PACKET|MSG|SCM|MCL|DT|MADV|PR|LOCAL|TCPOPT|UDP)_/ ||
 		$2 ~ /^NFC_(GENL|PROTO|COMM|RF|SE|DIRECTION|LLCP|SOCKPROTO)_/ ||
 		$2 ~ /^NFC_.*_(MAX)?SIZE$/ ||
 		$2 ~ /^RAW_PAYLOAD_/ ||
+		$2 ~ /^[US]F_/ ||
 		$2 ~ /^TP_STATUS_/ ||
 		$2 ~ /^FALLOC_/ ||
 		$2 ~ /^ICMPV?6?_(FILTER|SEC)/ ||
@@ -621,7 +624,7 @@ ccflags="$@"
 		$2 ~ /^MEM/ ||
 		$2 ~ /^WG/ ||
 		$2 ~ /^FIB_RULE_/ ||
-		$2 ~ /^BLK[A-Z]*(GET$|SET$|BUF$|PART$|SIZE)/ {printf("\t%s = C.%s\n", $2, $2)}
+		$2 ~ /^BLK[A-Z]*(GET$|SET$|BUF$|PART$|SIZE|IOMIN$|IOOPT$|ALIGNOFF$|DISCARD|ROTATIONAL$|ZEROOUT$|GETDISKSEQ$)/ {printf("\t%s = C.%s\n", $2, $2)}
 		$2 ~ /^__WCOREFLAG$/ {next}
 		$2 ~ /^__W[A-Z0-9]+$/ {printf("\t%s = C.%s\n", substr($2,3), $2)}
 
@@ -738,7 +741,8 @@ main(void)
 		e = errors[i].num;
 		if(i > 0 && errors[i-1].num == e)
 			continue;
-		strcpy(buf, strerror(e));
+		strncpy(buf, strerror(e), sizeof(buf) - 1);
+		buf[sizeof(buf) - 1] = '\0';
 		// lowercase first letter: Bad -> bad, but STREAM -> STREAM.
 		if(A <= buf[0] && buf[0] <= Z && a <= buf[1] && buf[1] <= z)
 			buf[0] += a - A;
@@ -757,7 +761,8 @@ main(void)
 		e = signals[i].num;
 		if(i > 0 && signals[i-1].num == e)
 			continue;
-		strcpy(buf, strsignal(e));
+		strncpy(buf, strsignal(e), sizeof(buf) - 1);
+		buf[sizeof(buf) - 1] = '\0';
 		// lowercase first letter: Bad -> bad, but STREAM -> STREAM.
 		if(A <= buf[0] && buf[0] <= Z && a <= buf[1] && buf[1] <= z)
 			buf[0] += a - A;
diff --git a/vendor/golang.org/x/sys/unix/mmap_nomremap.go b/vendor/golang.org/x/sys/unix/mmap_nomremap.go
new file mode 100644
index 00000000..ca051363
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/mmap_nomremap.go
@@ -0,0 +1,14 @@
+// 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 aix || darwin || dragonfly || freebsd || openbsd || solaris
+// +build aix darwin dragonfly freebsd openbsd solaris
+
+package unix
+
+var mapper = &mmapper{
+	active: make(map[*byte][]byte),
+	mmap:   mmap,
+	munmap: munmap,
+}
diff --git a/vendor/golang.org/x/sys/unix/mremap.go b/vendor/golang.org/x/sys/unix/mremap.go
new file mode 100644
index 00000000..fa93d0aa
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/mremap.go
@@ -0,0 +1,53 @@
+// 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 linux || netbsd
+// +build linux netbsd
+
+package unix
+
+import "unsafe"
+
+type mremapMmapper struct {
+	mmapper
+	mremap func(oldaddr uintptr, oldlength uintptr, newlength uintptr, flags int, newaddr uintptr) (xaddr uintptr, err error)
+}
+
+var mapper = &mremapMmapper{
+	mmapper: mmapper{
+		active: make(map[*byte][]byte),
+		mmap:   mmap,
+		munmap: munmap,
+	},
+	mremap: mremap,
+}
+
+func (m *mremapMmapper) Mremap(oldData []byte, newLength int, flags int) (data []byte, err error) {
+	if newLength <= 0 || len(oldData) == 0 || len(oldData) != cap(oldData) || flags&mremapFixed != 0 {
+		return nil, EINVAL
+	}
+
+	pOld := &oldData[cap(oldData)-1]
+	m.Lock()
+	defer m.Unlock()
+	bOld := m.active[pOld]
+	if bOld == nil || &bOld[0] != &oldData[0] {
+		return nil, EINVAL
+	}
+	newAddr, errno := m.mremap(uintptr(unsafe.Pointer(&bOld[0])), uintptr(len(bOld)), uintptr(newLength), flags, 0)
+	if errno != nil {
+		return nil, errno
+	}
+	bNew := unsafe.Slice((*byte)(unsafe.Pointer(newAddr)), newLength)
+	pNew := &bNew[cap(bNew)-1]
+	if flags&mremapDontunmap == 0 {
+		delete(m.active, pOld)
+	}
+	m.active[pNew] = bNew
+	return bNew, nil
+}
+
+func Mremap(oldData []byte, newLength int, flags int) (data []byte, err error) {
+	return mapper.Mremap(oldData, newLength, flags)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_aix.go b/vendor/golang.org/x/sys/unix/syscall_aix.go
index d9f5544c..9a6e5aca 100644
--- a/vendor/golang.org/x/sys/unix/syscall_aix.go
+++ b/vendor/golang.org/x/sys/unix/syscall_aix.go
@@ -408,8 +408,8 @@ 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
+//sys	ioctl(fd int, req int, arg uintptr) (err error)
+//sys	ioctlPtr(fd int, req int, 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,
@@ -535,21 +535,6 @@ func Fsync(fd int) error {
 //sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error) = nsendmsg
 
 //sys	munmap(addr uintptr, length uintptr) (err error)
-
-var mapper = &mmapper{
-	active: make(map[*byte][]byte),
-	mmap:   mmap,
-	munmap: munmap,
-}
-
-func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
-	return mapper.Mmap(fd, offset, length, prot, flags)
-}
-
-func Munmap(b []byte) (err error) {
-	return mapper.Munmap(b)
-}
-
 //sys	Madvise(b []byte, advice int) (err error)
 //sys	Mprotect(b []byte, prot int) (err error)
 //sys	Mlock(b []byte) (err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_aix_ppc.go b/vendor/golang.org/x/sys/unix/syscall_aix_ppc.go
index e92a0be1..f2871fa9 100644
--- a/vendor/golang.org/x/sys/unix/syscall_aix_ppc.go
+++ b/vendor/golang.org/x/sys/unix/syscall_aix_ppc.go
@@ -8,7 +8,6 @@
 package unix
 
 //sysnb	Getrlimit(resource int, rlim *Rlimit) (err error) = getrlimit64
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error) = setrlimit64
 //sys	Seek(fd int, offset int64, whence int) (off int64, err error) = lseek64
 
 //sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_aix_ppc64.go b/vendor/golang.org/x/sys/unix/syscall_aix_ppc64.go
index 16eed170..75718ec0 100644
--- a/vendor/golang.org/x/sys/unix/syscall_aix_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_aix_ppc64.go
@@ -8,7 +8,6 @@
 package unix
 
 //sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
 //sys	Seek(fd int, offset int64, whence int) (off int64, err error) = lseek
 
 //sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) = mmap64
diff --git a/vendor/golang.org/x/sys/unix/syscall_bsd.go b/vendor/golang.org/x/sys/unix/syscall_bsd.go
index 7705c327..4217de51 100644
--- a/vendor/golang.org/x/sys/unix/syscall_bsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_bsd.go
@@ -601,20 +601,6 @@ func Poll(fds []PollFd, timeout int) (n int, err error) {
 //	Gethostuuid(uuid *byte, timeout *Timespec) (err error)
 //	Ptrace(req int, pid int, addr uintptr, data int) (ret uintptr, err error)
 
-var mapper = &mmapper{
-	active: make(map[*byte][]byte),
-	mmap:   mmap,
-	munmap: munmap,
-}
-
-func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
-	return mapper.Mmap(fd, offset, length, prot, flags)
-}
-
-func Munmap(b []byte) (err error) {
-	return mapper.Munmap(b)
-}
-
 //sys	Madvise(b []byte, behav int) (err error)
 //sys	Mlock(b []byte) (err error)
 //sys	Mlockall(flags int) (err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.go b/vendor/golang.org/x/sys/unix/syscall_darwin.go
index 7064d6eb..135cc3cd 100644
--- a/vendor/golang.org/x/sys/unix/syscall_darwin.go
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin.go
@@ -510,30 +510,36 @@ func SysctlKinfoProcSlice(name string, args ...int) ([]KinfoProc, error) {
 		return nil, err
 	}
 
-	// Find size.
-	n := uintptr(0)
-	if err := sysctl(mib, nil, &n, nil, 0); err != nil {
-		return nil, err
-	}
-	if n == 0 {
-		return nil, nil
-	}
-	if n%SizeofKinfoProc != 0 {
-		return nil, fmt.Errorf("sysctl() returned a size of %d, which is not a multiple of %d", n, SizeofKinfoProc)
-	}
+	for {
+		// Find size.
+		n := uintptr(0)
+		if err := sysctl(mib, nil, &n, nil, 0); err != nil {
+			return nil, err
+		}
+		if n == 0 {
+			return nil, nil
+		}
+		if n%SizeofKinfoProc != 0 {
+			return nil, fmt.Errorf("sysctl() returned a size of %d, which is not a multiple of %d", n, SizeofKinfoProc)
+		}
 
-	// Read into buffer of that size.
-	buf := make([]KinfoProc, n/SizeofKinfoProc)
-	if err := sysctl(mib, (*byte)(unsafe.Pointer(&buf[0])), &n, nil, 0); err != nil {
-		return nil, err
-	}
-	if n%SizeofKinfoProc != 0 {
-		return nil, fmt.Errorf("sysctl() returned a size of %d, which is not a multiple of %d", n, SizeofKinfoProc)
-	}
+		// Read into buffer of that size.
+		buf := make([]KinfoProc, n/SizeofKinfoProc)
+		if err := sysctl(mib, (*byte)(unsafe.Pointer(&buf[0])), &n, nil, 0); err != nil {
+			if err == ENOMEM {
+				// Process table grew. Try again.
+				continue
+			}
+			return nil, err
+		}
+		if n%SizeofKinfoProc != 0 {
+			return nil, fmt.Errorf("sysctl() returned a size of %d, which is not a multiple of %d", n, SizeofKinfoProc)
+		}
 
-	// The actual call may return less than the original reported required
-	// size so ensure we deal with that.
-	return buf[:n/SizeofKinfoProc], nil
+		// The actual call may return less than the original reported required
+		// size so ensure we deal with that.
+		return buf[:n/SizeofKinfoProc], nil
+	}
 }
 
 //sys	sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error)
@@ -613,6 +619,7 @@ func SysctlKinfoProcSlice(name string, args ...int) ([]KinfoProc, error) {
 //sys	Rmdir(path string) (err error)
 //sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
 //sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
+//sys	Setattrlist(path string, attrlist *Attrlist, attrBuf []byte, options int) (err error)
 //sys	Setegid(egid int) (err error)
 //sysnb	Seteuid(euid int) (err error)
 //sysnb	Setgid(gid int) (err error)
@@ -622,7 +629,6 @@ func SysctlKinfoProcSlice(name string, args ...int) ([]KinfoProc, error) {
 //sys	Setprivexec(flag int) (err error)
 //sysnb	Setregid(rgid int, egid int) (err error)
 //sysnb	Setreuid(ruid int, euid int) (err error)
-//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
 //sysnb	Setsid() (pid int, err error)
 //sysnb	Settimeofday(tp *Timeval) (err error)
 //sysnb	Setuid(uid int) (err error)
@@ -676,7 +682,6 @@ func SysctlKinfoProcSlice(name string, args ...int) ([]KinfoProc, error) {
 // Kqueue_from_portset_np
 // Kqueue_portset
 // Getattrlist
-// Setattrlist
 // Getdirentriesattr
 // Searchfs
 // Delete
diff --git a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
index 221efc26..d4ce988e 100644
--- a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
+++ b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
@@ -326,7 +326,6 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 //sysnb	Setreuid(ruid int, euid int) (err error)
 //sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
 //sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
 //sysnb	Setsid() (pid int, err error)
 //sysnb	Settimeofday(tp *Timeval) (err error)
 //sysnb	Setuid(uid int) (err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd.go b/vendor/golang.org/x/sys/unix/syscall_freebsd.go
index 5bdde03e..afb10106 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd.go
@@ -433,7 +433,6 @@ func Dup3(oldfd, newfd, flags int) error {
 //sysnb	Setreuid(ruid int, euid int) (err error)
 //sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
 //sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
 //sysnb	Setsid() (pid int, err error)
 //sysnb	Settimeofday(tp *Timeval) (err error)
 //sysnb	Setuid(uid int) (err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go
index 97353315..a730878e 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux.go
@@ -1699,12 +1699,23 @@ func PtracePokeUser(pid int, addr uintptr, data []byte) (count int, err error) {
 	return ptracePoke(PTRACE_POKEUSR, PTRACE_PEEKUSR, pid, addr, data)
 }
 
+// elfNT_PRSTATUS is a copy of the debug/elf.NT_PRSTATUS constant so
+// x/sys/unix doesn't need to depend on debug/elf and thus
+// compress/zlib, debug/dwarf, and other packages.
+const elfNT_PRSTATUS = 1
+
 func PtraceGetRegs(pid int, regsout *PtraceRegs) (err error) {
-	return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout))
+	var iov Iovec
+	iov.Base = (*byte)(unsafe.Pointer(regsout))
+	iov.SetLen(int(unsafe.Sizeof(*regsout)))
+	return ptracePtr(PTRACE_GETREGSET, pid, uintptr(elfNT_PRSTATUS), unsafe.Pointer(&iov))
 }
 
 func PtraceSetRegs(pid int, regs *PtraceRegs) (err error) {
-	return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs))
+	var iov Iovec
+	iov.Base = (*byte)(unsafe.Pointer(regs))
+	iov.SetLen(int(unsafe.Sizeof(*regs)))
+	return ptracePtr(PTRACE_SETREGSET, pid, uintptr(elfNT_PRSTATUS), unsafe.Pointer(&iov))
 }
 
 func PtraceSetOptions(pid int, options int) (err error) {
@@ -1873,9 +1884,8 @@ func Getpgrp() (pid int) {
 //sys	OpenTree(dfd int, fileName string, flags uint) (r int, err error)
 //sys	PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error)
 //sys	PivotRoot(newroot string, putold string) (err error) = SYS_PIVOT_ROOT
-//sysnb	Prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) = SYS_PRLIMIT64
 //sys	Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error)
-//sys	Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) = SYS_PSELECT6
+//sys	pselect6(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *sigset_argpack) (n int, err error)
 //sys	read(fd int, p []byte) (n int, err error)
 //sys	Removexattr(path string, attr string) (err error)
 //sys	Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error)
@@ -1887,6 +1897,15 @@ func Getpgrp() (pid int) {
 //sysnb	Settimeofday(tv *Timeval) (err error)
 //sys	Setns(fd int, nstype int) (err error)
 
+//go:linkname syscall_prlimit syscall.prlimit
+func syscall_prlimit(pid, resource int, newlimit, old *syscall.Rlimit) error
+
+func Prlimit(pid, resource int, newlimit, old *Rlimit) error {
+	// Just call the syscall version, because as of Go 1.21
+	// it will affect starting a new process.
+	return syscall_prlimit(pid, resource, (*syscall.Rlimit)(newlimit), (*syscall.Rlimit)(old))
+}
+
 // PrctlRetInt performs a prctl operation specified by option and further
 // optional arguments arg2 through arg5 depending on option. It returns a
 // non-negative integer that is returned by the prctl syscall.
@@ -2105,21 +2124,7 @@ func writevRacedetect(iovecs []Iovec, n int) {
 
 // mmap varies by architecture; see syscall_linux_*.go.
 //sys	munmap(addr uintptr, length uintptr) (err error)
-
-var mapper = &mmapper{
-	active: make(map[*byte][]byte),
-	mmap:   mmap,
-	munmap: munmap,
-}
-
-func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
-	return mapper.Mmap(fd, offset, length, prot, flags)
-}
-
-func Munmap(b []byte) (err error) {
-	return mapper.Munmap(b)
-}
-
+//sys	mremap(oldaddr uintptr, oldlength uintptr, newlength uintptr, flags int, newaddr uintptr) (xaddr uintptr, err error)
 //sys	Madvise(b []byte, advice int) (err error)
 //sys	Mprotect(b []byte, prot int) (err error)
 //sys	Mlock(b []byte) (err error)
@@ -2128,6 +2133,12 @@ func Munmap(b []byte) (err error) {
 //sys	Munlock(b []byte) (err error)
 //sys	Munlockall() (err error)
 
+const (
+	mremapFixed     = MREMAP_FIXED
+	mremapDontunmap = MREMAP_DONTUNMAP
+	mremapMaymove   = MREMAP_MAYMOVE
+)
+
 // Vmsplice splices user pages from a slice of Iovecs into a pipe specified by fd,
 // using the specified flags.
 func Vmsplice(fd int, iovs []Iovec, flags int) (int, error) {
@@ -2412,6 +2423,54 @@ func PthreadSigmask(how int, set, oldset *Sigset_t) error {
 	return rtSigprocmask(how, set, oldset, _C__NSIG/8)
 }
 
+//sysnb	getresuid(ruid *_C_int, euid *_C_int, suid *_C_int)
+//sysnb	getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int)
+
+func Getresuid() (ruid, euid, suid int) {
+	var r, e, s _C_int
+	getresuid(&r, &e, &s)
+	return int(r), int(e), int(s)
+}
+
+func Getresgid() (rgid, egid, sgid int) {
+	var r, e, s _C_int
+	getresgid(&r, &e, &s)
+	return int(r), int(e), int(s)
+}
+
+// Pselect is a wrapper around the Linux pselect6 system call.
+// This version does not modify the timeout argument.
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	// Per https://man7.org/linux/man-pages/man2/select.2.html#NOTES,
+	// The Linux pselect6() system call modifies its timeout argument.
+	// [Not modifying the argument] is the behavior required by POSIX.1-2001.
+	var mutableTimeout *Timespec
+	if timeout != nil {
+		mutableTimeout = new(Timespec)
+		*mutableTimeout = *timeout
+	}
+
+	// The final argument of the pselect6() system call is not a
+	// sigset_t * pointer, but is instead a structure
+	var kernelMask *sigset_argpack
+	if sigmask != nil {
+		wordBits := 32 << (^uintptr(0) >> 63) // see math.intSize
+
+		// A sigset stores one bit per signal,
+		// offset by 1 (because signal 0 does not exist).
+		// So the number of words needed is ⌈__C_NSIG - 1 / wordBits⌉.
+		sigsetWords := (_C__NSIG - 1 + wordBits - 1) / (wordBits)
+
+		sigsetBytes := uintptr(sigsetWords * (wordBits / 8))
+		kernelMask = &sigset_argpack{
+			ss:    sigmask,
+			ssLen: sigsetBytes,
+		}
+	}
+
+	return pselect6(nfd, r, w, e, mutableTimeout, kernelMask)
+}
+
 /*
  * Unimplemented
  */
@@ -2453,7 +2512,6 @@ func PthreadSigmask(how int, set, oldset *Sigset_t) error {
 // MqTimedreceive
 // MqTimedsend
 // MqUnlink
-// Mremap
 // Msgctl
 // Msgget
 // Msgrcv
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_386.go b/vendor/golang.org/x/sys/unix/syscall_linux_386.go
index ff5b5899..c7d9945e 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_386.go
@@ -97,33 +97,6 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 	return
 }
 
-//sysnb	setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	err = Prlimit(0, resource, rlim, nil)
-	if err != ENOSYS {
-		return err
-	}
-
-	rl := rlimit32{}
-	if rlim.Cur == rlimInf64 {
-		rl.Cur = rlimInf32
-	} else if rlim.Cur < uint64(rlimInf32) {
-		rl.Cur = uint32(rlim.Cur)
-	} else {
-		return EINVAL
-	}
-	if rlim.Max == rlimInf64 {
-		rl.Max = rlimInf32
-	} else if rlim.Max < uint64(rlimInf32) {
-		rl.Max = uint32(rlim.Max)
-	} else {
-		return EINVAL
-	}
-
-	return setrlimit(resource, &rl)
-}
-
 func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 	newoffset, errno := seek(fd, offset, whence)
 	if errno != 0 {
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
index 9b270353..70601ce3 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
@@ -40,13 +40,12 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err
 	if timeout != nil {
 		ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000}
 	}
-	return Pselect(nfd, r, w, e, ts, nil)
+	return pselect6(nfd, r, w, e, ts, nil)
 }
 
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
 //sys	setfsgid(gid int) (prev int, err error)
 //sys	setfsuid(uid int) (prev int, err error)
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
 //sys	Shutdown(fd int, how int) (err error)
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
index 856ad1d6..da298641 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
@@ -171,33 +171,6 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 	return
 }
 
-//sysnb	setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	err = Prlimit(0, resource, rlim, nil)
-	if err != ENOSYS {
-		return err
-	}
-
-	rl := rlimit32{}
-	if rlim.Cur == rlimInf64 {
-		rl.Cur = rlimInf32
-	} else if rlim.Cur < uint64(rlimInf32) {
-		rl.Cur = uint32(rlim.Cur)
-	} else {
-		return EINVAL
-	}
-	if rlim.Max == rlimInf64 {
-		rl.Max = rlimInf32
-	} else if rlim.Max < uint64(rlimInf32) {
-		rl.Max = uint32(rlim.Max)
-	} else {
-		return EINVAL
-	}
-
-	return setrlimit(resource, &rl)
-}
-
 func (r *PtraceRegs) PC() uint64 { return uint64(r.Uregs[15]) }
 
 func (r *PtraceRegs) SetPC(pc uint64) { r.Uregs[15] = uint32(pc) }
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
index 6422704b..f5266689 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
@@ -33,13 +33,12 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err
 	if timeout != nil {
 		ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000}
 	}
-	return Pselect(nfd, r, w, e, ts, nil)
+	return pselect6(nfd, r, w, e, ts, nil)
 }
 
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
 //sys	setfsgid(gid int) (prev int, err error)
 //sys	setfsuid(uid int) (prev int, err error)
-//sysnb	setrlimit(resource int, rlim *Rlimit) (err error)
 //sys	Shutdown(fd int, how int) (err error)
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
 
@@ -143,15 +142,6 @@ func Getrlimit(resource int, rlim *Rlimit) error {
 	return getrlimit(resource, rlim)
 }
 
-// Setrlimit prefers the prlimit64 system call. See issue 38604.
-func Setrlimit(resource int, rlim *Rlimit) error {
-	err := Prlimit(0, resource, rlim, nil)
-	if err != ENOSYS {
-		return err
-	}
-	return setrlimit(resource, rlim)
-}
-
 func (r *PtraceRegs) PC() uint64 { return r.Pc }
 
 func (r *PtraceRegs) SetPC(pc uint64) { r.Pc = pc }
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go b/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
index 59dab510..f6ab02ec 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
@@ -28,7 +28,7 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err
 	if timeout != nil {
 		ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000}
 	}
-	return Pselect(nfd, r, w, e, ts, nil)
+	return pselect6(nfd, r, w, e, ts, nil)
 }
 
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
@@ -126,11 +126,6 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 	return
 }
 
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	err = Prlimit(0, resource, rlim, nil)
-	return
-}
-
 func futimesat(dirfd int, path string, tv *[2]Timeval) (err error) {
 	if tv == nil {
 		return utimensat(dirfd, path, nil, 0)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
index bfef09a3..93fe59d2 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
@@ -31,13 +31,12 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err
 	if timeout != nil {
 		ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000}
 	}
-	return Pselect(nfd, r, w, e, ts, nil)
+	return pselect6(nfd, r, w, e, ts, nil)
 }
 
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
 //sys	setfsgid(gid int) (prev int, err error)
 //sys	setfsuid(uid int) (prev int, err error)
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
 //sys	Shutdown(fd int, how int) (err error)
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
 //sys	Statfs(path string, buf *Statfs_t) (err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go b/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
index ab302509..aae7f0ff 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
@@ -151,33 +151,6 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 	return
 }
 
-//sysnb	setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	err = Prlimit(0, resource, rlim, nil)
-	if err != ENOSYS {
-		return err
-	}
-
-	rl := rlimit32{}
-	if rlim.Cur == rlimInf64 {
-		rl.Cur = rlimInf32
-	} else if rlim.Cur < uint64(rlimInf32) {
-		rl.Cur = uint32(rlim.Cur)
-	} else {
-		return EINVAL
-	}
-	if rlim.Max == rlimInf64 {
-		rl.Max = rlimInf32
-	} else if rlim.Max < uint64(rlimInf32) {
-		rl.Max = uint32(rlim.Max)
-	} else {
-		return EINVAL
-	}
-
-	return setrlimit(resource, &rl)
-}
-
 func (r *PtraceRegs) PC() uint64 { return r.Epc }
 
 func (r *PtraceRegs) SetPC(pc uint64) { r.Epc = pc }
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_ppc.go b/vendor/golang.org/x/sys/unix/syscall_linux_ppc.go
index eac1cf1a..66eff19a 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_ppc.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_ppc.go
@@ -159,33 +159,6 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 	return
 }
 
-//sysnb	setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	err = Prlimit(0, resource, rlim, nil)
-	if err != ENOSYS {
-		return err
-	}
-
-	rl := rlimit32{}
-	if rlim.Cur == rlimInf64 {
-		rl.Cur = rlimInf32
-	} else if rlim.Cur < uint64(rlimInf32) {
-		rl.Cur = uint32(rlim.Cur)
-	} else {
-		return EINVAL
-	}
-	if rlim.Max == rlimInf64 {
-		rl.Max = rlimInf32
-	} else if rlim.Max < uint64(rlimInf32) {
-		rl.Max = uint32(rlim.Max)
-	} else {
-		return EINVAL
-	}
-
-	return setrlimit(resource, &rl)
-}
-
 func (r *PtraceRegs) PC() uint32 { return r.Nip }
 
 func (r *PtraceRegs) SetPC(pc uint32) { r.Nip = pc }
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
index 4df56616..806aa257 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
@@ -34,7 +34,6 @@ package unix
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
 //sys	setfsgid(gid int) (prev int, err error)
 //sys	setfsuid(uid int) (prev int, err error)
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
 //sys	Shutdown(fd int, how int) (err error)
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
 //sys	Stat(path string, stat *Stat_t) (err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go b/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
index 5f4243de..5e6ceee1 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
@@ -32,13 +32,12 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err
 	if timeout != nil {
 		ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000}
 	}
-	return Pselect(nfd, r, w, e, ts, nil)
+	return pselect6(nfd, r, w, e, ts, nil)
 }
 
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
 //sys	setfsgid(gid int) (prev int, err error)
 //sys	setfsuid(uid int) (prev int, err error)
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
 //sys	Shutdown(fd int, how int) (err error)
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
 
@@ -178,3 +177,14 @@ func KexecFileLoad(kernelFd int, initrdFd int, cmdline string, flags int) error
 	}
 	return kexecFileLoad(kernelFd, initrdFd, cmdlineLen, cmdline, flags)
 }
+
+//sys	riscvHWProbe(pairs []RISCVHWProbePairs, cpuCount uintptr, cpus *CPUSet, flags uint) (err error)
+
+func RISCVHWProbe(pairs []RISCVHWProbePairs, set *CPUSet, flags uint) (err error) {
+	var setSize uintptr
+
+	if set != nil {
+		setSize = uintptr(unsafe.Sizeof(*set))
+	}
+	return riscvHWProbe(pairs, setSize, set, flags)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
index d0a7d406..2f89e8f5 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
@@ -34,7 +34,6 @@ import (
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
 //sys	setfsgid(gid int) (prev int, err error)
 //sys	setfsuid(uid int) (prev int, err error)
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
 //sys	Stat(path string, stat *Stat_t) (err error)
 //sys	Statfs(path string, buf *Statfs_t) (err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go b/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
index f5c793be..7ca064ae 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
@@ -31,7 +31,6 @@ package unix
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
 //sys	setfsgid(gid int) (prev int, err error)
 //sys	setfsuid(uid int) (prev int, err error)
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
 //sys	Shutdown(fd int, how int) (err error)
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
 //sys	Stat(path string, stat *Stat_t) (err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd.go b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
index e66865dc..ddd1ac85 100644
--- a/vendor/golang.org/x/sys/unix/syscall_netbsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
@@ -340,7 +340,6 @@ func Statvfs(path string, buf *Statvfs_t) (err error) {
 //sys	Setpriority(which int, who int, prio int) (err error)
 //sysnb	Setregid(rgid int, egid int) (err error)
 //sysnb	Setreuid(ruid int, euid int) (err error)
-//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
 //sysnb	Setsid() (pid int, err error)
 //sysnb	Settimeofday(tp *Timeval) (err error)
 //sysnb	Setuid(uid int) (err error)
@@ -361,6 +360,18 @@ func Statvfs(path string, buf *Statvfs_t) (err error) {
 //sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
 //sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
 
+const (
+	mremapFixed     = MAP_FIXED
+	mremapDontunmap = 0
+	mremapMaymove   = 0
+)
+
+//sys	mremapNetBSD(oldp uintptr, oldsize uintptr, newp uintptr, newsize uintptr, flags int) (xaddr uintptr, err error) = SYS_MREMAP
+
+func mremap(oldaddr uintptr, oldlength uintptr, newlength uintptr, flags int, newaddr uintptr) (uintptr, error) {
+	return mremapNetBSD(oldaddr, oldlength, newaddr, newlength, flags)
+}
+
 /*
  * Unimplemented
  */
@@ -501,7 +512,6 @@ func Statvfs(path string, buf *Statvfs_t) (err error) {
 // compat_43_osendmsg
 // compat_43_osethostid
 // compat_43_osethostname
-// compat_43_osetrlimit
 // compat_43_osigblock
 // compat_43_osigsetmask
 // compat_43_osigstack
@@ -566,7 +576,6 @@ func Statvfs(path string, buf *Statvfs_t) (err error) {
 // mq_timedreceive
 // mq_timedsend
 // mq_unlink
-// mremap
 // msgget
 // msgrcv
 // msgsnd
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd.go b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
index 5e9de23a..c5f166a1 100644
--- a/vendor/golang.org/x/sys/unix/syscall_openbsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
@@ -151,6 +151,21 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 	return
 }
 
+//sysnb	getresuid(ruid *_C_int, euid *_C_int, suid *_C_int)
+//sysnb	getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int)
+
+func Getresuid() (ruid, euid, suid int) {
+	var r, e, s _C_int
+	getresuid(&r, &e, &s)
+	return int(r), int(e), int(s)
+}
+
+func Getresgid() (rgid, egid, sgid int) {
+	var r, e, s _C_int
+	getresgid(&r, &e, &s)
+	return int(r), int(e), int(s)
+}
+
 //sys	ioctl(fd int, req uint, arg uintptr) (err error)
 //sys	ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) = SYS_IOCTL
 
@@ -294,7 +309,6 @@ func Uname(uname *Utsname) error {
 //sysnb	Setreuid(ruid int, euid int) (err error)
 //sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
 //sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
 //sysnb	Setrtable(rtable int) (err error)
 //sysnb	Setsid() (pid int, err error)
 //sysnb	Settimeofday(tp *Timeval) (err error)
@@ -339,8 +353,6 @@ func Uname(uname *Utsname) error {
 // getgid
 // getitimer
 // getlogin
-// getresgid
-// getresuid
 // getthrid
 // ktrace
 // lfs_bmapv
diff --git a/vendor/golang.org/x/sys/unix/syscall_solaris.go b/vendor/golang.org/x/sys/unix/syscall_solaris.go
index d3444b64..72d23575 100644
--- a/vendor/golang.org/x/sys/unix/syscall_solaris.go
+++ b/vendor/golang.org/x/sys/unix/syscall_solaris.go
@@ -545,24 +545,24 @@ func Minor(dev uint64) uint32 {
  * Expose the ioctl function
  */
 
-//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
+//sys	ioctlRet(fd int, req int, arg uintptr) (ret int, err error) = libc.ioctl
+//sys	ioctlPtrRet(fd int, req int, arg unsafe.Pointer) (ret int, err error) = libc.ioctl
 
-func ioctl(fd int, req uint, arg uintptr) (err error) {
+func ioctl(fd int, req int, arg uintptr) (err error) {
 	_, err = ioctlRet(fd, req, arg)
 	return err
 }
 
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+func ioctlPtr(fd int, req int, arg unsafe.Pointer) (err error) {
 	_, err = ioctlPtrRet(fd, req, arg)
 	return err
 }
 
-func IoctlSetTermio(fd int, req uint, value *Termio) error {
+func IoctlSetTermio(fd int, req int, value *Termio) error {
 	return ioctlPtr(fd, req, unsafe.Pointer(value))
 }
 
-func IoctlGetTermio(fd int, req uint) (*Termio, error) {
+func IoctlGetTermio(fd int, req int) (*Termio, error) {
 	var value Termio
 	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
 	return &value, err
@@ -665,7 +665,6 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 //sys	Setpriority(which int, who int, prio int) (err error)
 //sysnb	Setregid(rgid int, egid int) (err error)
 //sysnb	Setreuid(ruid int, euid int) (err error)
-//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
 //sysnb	Setsid() (pid int, err error)
 //sysnb	Setuid(uid int) (err error)
 //sys	Shutdown(s int, how int) (err error) = libsocket.shutdown
@@ -717,20 +716,6 @@ func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
 	return
 }
 
-var mapper = &mmapper{
-	active: make(map[*byte][]byte),
-	mmap:   mmap,
-	munmap: munmap,
-}
-
-func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
-	return mapper.Mmap(fd, offset, length, prot, flags)
-}
-
-func Munmap(b []byte) (err error) {
-	return mapper.Munmap(b)
-}
-
 // Event Ports
 
 type fileObjCookie struct {
@@ -1080,11 +1065,11 @@ func Getmsg(fd int, cl []byte, data []byte) (retCl []byte, retData []byte, flags
 	return retCl, retData, flags, nil
 }
 
-func IoctlSetIntRetInt(fd int, req uint, arg int) (int, error) {
+func IoctlSetIntRetInt(fd int, req int, arg int) (int, error) {
 	return ioctlRet(fd, req, uintptr(arg))
 }
 
-func IoctlSetString(fd int, req uint, val string) error {
+func IoctlSetString(fd int, req int, val string) error {
 	bs := make([]byte, len(val)+1)
 	copy(bs[:len(bs)-1], val)
 	err := ioctlPtr(fd, req, unsafe.Pointer(&bs[0]))
@@ -1120,7 +1105,7 @@ func (l *Lifreq) GetLifruUint() uint {
 	return *(*uint)(unsafe.Pointer(&l.Lifru[0]))
 }
 
-func IoctlLifreq(fd int, req uint, l *Lifreq) error {
+func IoctlLifreq(fd int, req int, l *Lifreq) error {
 	return ioctlPtr(fd, req, unsafe.Pointer(l))
 }
 
@@ -1131,6 +1116,6 @@ func (s *Strioctl) SetInt(i int) {
 	s.Dp = (*int8)(unsafe.Pointer(&i))
 }
 
-func IoctlSetStrioctlRetInt(fd int, req uint, s *Strioctl) (int, error) {
+func IoctlSetStrioctlRetInt(fd int, req int, s *Strioctl) (int, error) {
 	return ioctlPtrRet(fd, req, unsafe.Pointer(s))
 }
diff --git a/vendor/golang.org/x/sys/unix/syscall_unix.go b/vendor/golang.org/x/sys/unix/syscall_unix.go
index 00f0aa37..8bb30e7c 100644
--- a/vendor/golang.org/x/sys/unix/syscall_unix.go
+++ b/vendor/golang.org/x/sys/unix/syscall_unix.go
@@ -147,6 +147,14 @@ func (m *mmapper) Munmap(data []byte) (err error) {
 	return nil
 }
 
+func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
+	return mapper.Mmap(fd, offset, length, prot, flags)
+}
+
+func Munmap(b []byte) (err error) {
+	return mapper.Munmap(b)
+}
+
 func Read(fd int, p []byte) (n int, err error) {
 	n, err = read(fd, p)
 	if raceenabled {
@@ -587,3 +595,10 @@ func emptyIovecs(iov []Iovec) bool {
 	}
 	return true
 }
+
+// Setrlimit sets a resource limit.
+func Setrlimit(resource int, rlim *Rlimit) error {
+	// Just call the syscall version, because as of Go 1.21
+	// it will affect starting a new process.
+	return syscall.Setrlimit(resource, (*syscall.Rlimit)(rlim))
+}
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 b295497a..44e72edb 100644
--- a/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
+++ b/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
@@ -212,8 +212,8 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 //sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error) = SYS___SENDMSG_A
 //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   ioctl(fd int, req int, arg uintptr) (err error) = SYS_IOCTL
+//sys   ioctlPtr(fd int, req int, 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
@@ -285,25 +285,11 @@ func Close(fd int) (err error) {
 	return
 }
 
-var mapper = &mmapper{
-	active: make(map[*byte][]byte),
-	mmap:   mmap,
-	munmap: munmap,
-}
-
 // Dummy function: there are no semantics for Madvise on z/OS
 func Madvise(b []byte, advice int) (err error) {
 	return
 }
 
-func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
-	return mapper.Mmap(fd, offset, length, prot, flags)
-}
-
-func Munmap(b []byte) (err error) {
-	return mapper.Munmap(b)
-}
-
 //sys   Gethostname(buf []byte) (err error) = SYS___GETHOSTNAME_A
 //sysnb	Getegid() (egid int)
 //sysnb	Geteuid() (uid int)
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
index 476a1c7e..14300762 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
@@ -1270,6 +1270,16 @@ const (
 	SEEK_END                                = 0x2
 	SEEK_HOLE                               = 0x3
 	SEEK_SET                                = 0x0
+	SF_APPEND                               = 0x40000
+	SF_ARCHIVED                             = 0x10000
+	SF_DATALESS                             = 0x40000000
+	SF_FIRMLINK                             = 0x800000
+	SF_IMMUTABLE                            = 0x20000
+	SF_NOUNLINK                             = 0x100000
+	SF_RESTRICTED                           = 0x80000
+	SF_SETTABLE                             = 0x3fff0000
+	SF_SUPPORTED                            = 0x9f0000
+	SF_SYNTHETIC                            = 0xc0000000
 	SHUT_RD                                 = 0x0
 	SHUT_RDWR                               = 0x2
 	SHUT_WR                                 = 0x1
@@ -1543,6 +1553,15 @@ const (
 	TIOCTIMESTAMP                           = 0x40107459
 	TIOCUCNTL                               = 0x80047466
 	TOSTOP                                  = 0x400000
+	UF_APPEND                               = 0x4
+	UF_COMPRESSED                           = 0x20
+	UF_DATAVAULT                            = 0x80
+	UF_HIDDEN                               = 0x8000
+	UF_IMMUTABLE                            = 0x2
+	UF_NODUMP                               = 0x1
+	UF_OPAQUE                               = 0x8
+	UF_SETTABLE                             = 0xffff
+	UF_TRACKED                              = 0x40
 	VDISCARD                                = 0xf
 	VDSUSP                                  = 0xb
 	VEOF                                    = 0x0
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
index e36f5178..ab044a74 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
@@ -1270,6 +1270,16 @@ const (
 	SEEK_END                                = 0x2
 	SEEK_HOLE                               = 0x3
 	SEEK_SET                                = 0x0
+	SF_APPEND                               = 0x40000
+	SF_ARCHIVED                             = 0x10000
+	SF_DATALESS                             = 0x40000000
+	SF_FIRMLINK                             = 0x800000
+	SF_IMMUTABLE                            = 0x20000
+	SF_NOUNLINK                             = 0x100000
+	SF_RESTRICTED                           = 0x80000
+	SF_SETTABLE                             = 0x3fff0000
+	SF_SUPPORTED                            = 0x9f0000
+	SF_SYNTHETIC                            = 0xc0000000
 	SHUT_RD                                 = 0x0
 	SHUT_RDWR                               = 0x2
 	SHUT_WR                                 = 0x1
@@ -1543,6 +1553,15 @@ const (
 	TIOCTIMESTAMP                           = 0x40107459
 	TIOCUCNTL                               = 0x80047466
 	TOSTOP                                  = 0x400000
+	UF_APPEND                               = 0x4
+	UF_COMPRESSED                           = 0x20
+	UF_DATAVAULT                            = 0x80
+	UF_HIDDEN                               = 0x8000
+	UF_IMMUTABLE                            = 0x2
+	UF_NODUMP                               = 0x1
+	UF_OPAQUE                               = 0x8
+	UF_SETTABLE                             = 0xffff
+	UF_TRACKED                              = 0x40
 	VDISCARD                                = 0xf
 	VDSUSP                                  = 0xb
 	VEOF                                    = 0x0
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux.go b/vendor/golang.org/x/sys/unix/zerrors_linux.go
index 398c37e5..3784f402 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux.go
@@ -493,6 +493,7 @@ const (
 	BPF_F_TEST_RUN_ON_CPU                       = 0x1
 	BPF_F_TEST_STATE_FREQ                       = 0x8
 	BPF_F_TEST_XDP_LIVE_FRAMES                  = 0x2
+	BPF_F_XDP_DEV_BOUND_ONLY                    = 0x40
 	BPF_F_XDP_HAS_FRAGS                         = 0x20
 	BPF_H                                       = 0x8
 	BPF_IMM                                     = 0x0
@@ -826,9 +827,9 @@ const (
 	DM_UUID_FLAG                                = 0x4000
 	DM_UUID_LEN                                 = 0x81
 	DM_VERSION                                  = 0xc138fd00
-	DM_VERSION_EXTRA                            = "-ioctl (2022-07-28)"
+	DM_VERSION_EXTRA                            = "-ioctl (2023-03-01)"
 	DM_VERSION_MAJOR                            = 0x4
-	DM_VERSION_MINOR                            = 0x2f
+	DM_VERSION_MINOR                            = 0x30
 	DM_VERSION_PATCHLEVEL                       = 0x0
 	DT_BLK                                      = 0x6
 	DT_CHR                                      = 0x2
@@ -1197,6 +1198,7 @@ const (
 	FAN_EVENT_METADATA_LEN                      = 0x18
 	FAN_EVENT_ON_CHILD                          = 0x8000000
 	FAN_FS_ERROR                                = 0x8000
+	FAN_INFO                                    = 0x20
 	FAN_MARK_ADD                                = 0x1
 	FAN_MARK_DONT_FOLLOW                        = 0x4
 	FAN_MARK_EVICTABLE                          = 0x200
@@ -1233,6 +1235,8 @@ const (
 	FAN_REPORT_PIDFD                            = 0x80
 	FAN_REPORT_TARGET_FID                       = 0x1000
 	FAN_REPORT_TID                              = 0x100
+	FAN_RESPONSE_INFO_AUDIT_RULE                = 0x1
+	FAN_RESPONSE_INFO_NONE                      = 0x0
 	FAN_UNLIMITED_MARKS                         = 0x20
 	FAN_UNLIMITED_QUEUE                         = 0x10
 	FD_CLOEXEC                                  = 0x1
@@ -1860,6 +1864,7 @@ const (
 	MEMWRITEOOB64                               = 0xc0184d15
 	MFD_ALLOW_SEALING                           = 0x2
 	MFD_CLOEXEC                                 = 0x1
+	MFD_EXEC                                    = 0x10
 	MFD_HUGETLB                                 = 0x4
 	MFD_HUGE_16GB                               = 0x88000000
 	MFD_HUGE_16MB                               = 0x60000000
@@ -1875,6 +1880,7 @@ const (
 	MFD_HUGE_8MB                                = 0x5c000000
 	MFD_HUGE_MASK                               = 0x3f
 	MFD_HUGE_SHIFT                              = 0x1a
+	MFD_NOEXEC_SEAL                             = 0x8
 	MINIX2_SUPER_MAGIC                          = 0x2468
 	MINIX2_SUPER_MAGIC2                         = 0x2478
 	MINIX3_SUPER_MAGIC                          = 0x4d5a
@@ -1898,6 +1904,9 @@ const (
 	MOUNT_ATTR_SIZE_VER0                        = 0x20
 	MOUNT_ATTR_STRICTATIME                      = 0x20
 	MOUNT_ATTR__ATIME                           = 0x70
+	MREMAP_DONTUNMAP                            = 0x4
+	MREMAP_FIXED                                = 0x2
+	MREMAP_MAYMOVE                              = 0x1
 	MSDOS_SUPER_MAGIC                           = 0x4d44
 	MSG_BATCH                                   = 0x40000
 	MSG_CMSG_CLOEXEC                            = 0x40000000
@@ -2204,6 +2213,7 @@ const (
 	PACKET_USER                                 = 0x6
 	PACKET_VERSION                              = 0xa
 	PACKET_VNET_HDR                             = 0xf
+	PACKET_VNET_HDR_SZ                          = 0x18
 	PARITY_CRC16_PR0                            = 0x2
 	PARITY_CRC16_PR0_CCITT                      = 0x4
 	PARITY_CRC16_PR1                            = 0x3
@@ -2221,6 +2231,7 @@ const (
 	PERF_ATTR_SIZE_VER5                         = 0x70
 	PERF_ATTR_SIZE_VER6                         = 0x78
 	PERF_ATTR_SIZE_VER7                         = 0x80
+	PERF_ATTR_SIZE_VER8                         = 0x88
 	PERF_AUX_FLAG_COLLISION                     = 0x8
 	PERF_AUX_FLAG_CORESIGHT_FORMAT_CORESIGHT    = 0x0
 	PERF_AUX_FLAG_CORESIGHT_FORMAT_RAW          = 0x100
@@ -2361,6 +2372,7 @@ const (
 	PR_FP_EXC_UND                               = 0x40000
 	PR_FP_MODE_FR                               = 0x1
 	PR_FP_MODE_FRE                              = 0x2
+	PR_GET_AUXV                                 = 0x41555856
 	PR_GET_CHILD_SUBREAPER                      = 0x25
 	PR_GET_DUMPABLE                             = 0x3
 	PR_GET_ENDIAN                               = 0x13
@@ -2369,6 +2381,8 @@ const (
 	PR_GET_FP_MODE                              = 0x2e
 	PR_GET_IO_FLUSHER                           = 0x3a
 	PR_GET_KEEPCAPS                             = 0x7
+	PR_GET_MDWE                                 = 0x42
+	PR_GET_MEMORY_MERGE                         = 0x44
 	PR_GET_NAME                                 = 0x10
 	PR_GET_NO_NEW_PRIVS                         = 0x27
 	PR_GET_PDEATHSIG                            = 0x2
@@ -2389,6 +2403,7 @@ const (
 	PR_MCE_KILL_GET                             = 0x22
 	PR_MCE_KILL_LATE                            = 0x0
 	PR_MCE_KILL_SET                             = 0x1
+	PR_MDWE_REFUSE_EXEC_GAIN                    = 0x1
 	PR_MPX_DISABLE_MANAGEMENT                   = 0x2c
 	PR_MPX_ENABLE_MANAGEMENT                    = 0x2b
 	PR_MTE_TAG_MASK                             = 0x7fff8
@@ -2423,6 +2438,8 @@ const (
 	PR_SET_FP_MODE                              = 0x2d
 	PR_SET_IO_FLUSHER                           = 0x39
 	PR_SET_KEEPCAPS                             = 0x8
+	PR_SET_MDWE                                 = 0x41
+	PR_SET_MEMORY_MERGE                         = 0x43
 	PR_SET_MM                                   = 0x23
 	PR_SET_MM_ARG_END                           = 0x9
 	PR_SET_MM_ARG_START                         = 0x8
@@ -2506,6 +2523,7 @@ const (
 	PTRACE_GETSIGMASK                           = 0x420a
 	PTRACE_GET_RSEQ_CONFIGURATION               = 0x420f
 	PTRACE_GET_SYSCALL_INFO                     = 0x420e
+	PTRACE_GET_SYSCALL_USER_DISPATCH_CONFIG     = 0x4211
 	PTRACE_INTERRUPT                            = 0x4207
 	PTRACE_KILL                                 = 0x8
 	PTRACE_LISTEN                               = 0x4208
@@ -2536,6 +2554,7 @@ const (
 	PTRACE_SETREGSET                            = 0x4205
 	PTRACE_SETSIGINFO                           = 0x4203
 	PTRACE_SETSIGMASK                           = 0x420b
+	PTRACE_SET_SYSCALL_USER_DISPATCH_CONFIG     = 0x4210
 	PTRACE_SINGLESTEP                           = 0x9
 	PTRACE_SYSCALL                              = 0x18
 	PTRACE_SYSCALL_INFO_ENTRY                   = 0x1
@@ -2967,6 +2986,7 @@ const (
 	SOL_TCP                                     = 0x6
 	SOL_TIPC                                    = 0x10f
 	SOL_TLS                                     = 0x11a
+	SOL_UDP                                     = 0x11
 	SOL_X25                                     = 0x106
 	SOL_XDP                                     = 0x11b
 	SOMAXCONN                                   = 0x1000
@@ -3071,7 +3091,7 @@ const (
 	TASKSTATS_GENL_NAME                         = "TASKSTATS"
 	TASKSTATS_GENL_VERSION                      = 0x1
 	TASKSTATS_TYPE_MAX                          = 0x6
-	TASKSTATS_VERSION                           = 0xd
+	TASKSTATS_VERSION                           = 0xe
 	TCIFLUSH                                    = 0x0
 	TCIOFF                                      = 0x2
 	TCIOFLUSH                                   = 0x2
@@ -3237,6 +3257,7 @@ const (
 	TP_STATUS_COPY                              = 0x2
 	TP_STATUS_CSUMNOTREADY                      = 0x8
 	TP_STATUS_CSUM_VALID                        = 0x80
+	TP_STATUS_GSO_TCP                           = 0x100
 	TP_STATUS_KERNEL                            = 0x0
 	TP_STATUS_LOSING                            = 0x4
 	TP_STATUS_SENDING                           = 0x2
@@ -3251,6 +3272,19 @@ const (
 	TRACEFS_MAGIC                               = 0x74726163
 	TS_COMM_LEN                                 = 0x20
 	UDF_SUPER_MAGIC                             = 0x15013346
+	UDP_CORK                                    = 0x1
+	UDP_ENCAP                                   = 0x64
+	UDP_ENCAP_ESPINUDP                          = 0x2
+	UDP_ENCAP_ESPINUDP_NON_IKE                  = 0x1
+	UDP_ENCAP_GTP0                              = 0x4
+	UDP_ENCAP_GTP1U                             = 0x5
+	UDP_ENCAP_L2TPINUDP                         = 0x3
+	UDP_GRO                                     = 0x68
+	UDP_NO_CHECK6_RX                            = 0x66
+	UDP_NO_CHECK6_TX                            = 0x65
+	UDP_SEGMENT                                 = 0x67
+	UDP_V4_FLOW                                 = 0x2
+	UDP_V6_FLOW                                 = 0x6
 	UMOUNT_NOFOLLOW                             = 0x8
 	USBDEVICE_SUPER_MAGIC                       = 0x9fa2
 	UTIME_NOW                                   = 0x3fffffff
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 a46df0f1..cfb14300 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
@@ -27,22 +27,31 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
+	BLKALIGNOFF                      = 0x127a
 	BLKBSZGET                        = 0x80041270
 	BLKBSZSET                        = 0x40041271
+	BLKDISCARD                       = 0x1277
+	BLKDISCARDZEROES                 = 0x127c
 	BLKFLSBUF                        = 0x1261
 	BLKFRAGET                        = 0x1265
 	BLKFRASET                        = 0x1264
+	BLKGETDISKSEQ                    = 0x80081280
 	BLKGETSIZE                       = 0x1260
 	BLKGETSIZE64                     = 0x80041272
+	BLKIOMIN                         = 0x1278
+	BLKIOOPT                         = 0x1279
 	BLKPBSZGET                       = 0x127b
 	BLKRAGET                         = 0x1263
 	BLKRASET                         = 0x1262
 	BLKROGET                         = 0x125e
 	BLKROSET                         = 0x125d
+	BLKROTATIONAL                    = 0x127e
 	BLKRRPART                        = 0x125f
+	BLKSECDISCARD                    = 0x127d
 	BLKSECTGET                       = 0x1267
 	BLKSECTSET                       = 0x1266
 	BLKSSZGET                        = 0x1268
+	BLKZEROOUT                       = 0x127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
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 6cd4a3ea..df64f2d5 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
@@ -27,22 +27,31 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
+	BLKALIGNOFF                      = 0x127a
 	BLKBSZGET                        = 0x80081270
 	BLKBSZSET                        = 0x40081271
+	BLKDISCARD                       = 0x1277
+	BLKDISCARDZEROES                 = 0x127c
 	BLKFLSBUF                        = 0x1261
 	BLKFRAGET                        = 0x1265
 	BLKFRASET                        = 0x1264
+	BLKGETDISKSEQ                    = 0x80081280
 	BLKGETSIZE                       = 0x1260
 	BLKGETSIZE64                     = 0x80081272
+	BLKIOMIN                         = 0x1278
+	BLKIOOPT                         = 0x1279
 	BLKPBSZGET                       = 0x127b
 	BLKRAGET                         = 0x1263
 	BLKRASET                         = 0x1262
 	BLKROGET                         = 0x125e
 	BLKROSET                         = 0x125d
+	BLKROTATIONAL                    = 0x127e
 	BLKRRPART                        = 0x125f
+	BLKSECDISCARD                    = 0x127d
 	BLKSECTGET                       = 0x1267
 	BLKSECTSET                       = 0x1266
 	BLKSSZGET                        = 0x1268
+	BLKZEROOUT                       = 0x127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
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 c7ebee24..3025cd5b 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
@@ -27,22 +27,31 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
+	BLKALIGNOFF                      = 0x127a
 	BLKBSZGET                        = 0x80041270
 	BLKBSZSET                        = 0x40041271
+	BLKDISCARD                       = 0x1277
+	BLKDISCARDZEROES                 = 0x127c
 	BLKFLSBUF                        = 0x1261
 	BLKFRAGET                        = 0x1265
 	BLKFRASET                        = 0x1264
+	BLKGETDISKSEQ                    = 0x80081280
 	BLKGETSIZE                       = 0x1260
 	BLKGETSIZE64                     = 0x80041272
+	BLKIOMIN                         = 0x1278
+	BLKIOOPT                         = 0x1279
 	BLKPBSZGET                       = 0x127b
 	BLKRAGET                         = 0x1263
 	BLKRASET                         = 0x1262
 	BLKROGET                         = 0x125e
 	BLKROSET                         = 0x125d
+	BLKROTATIONAL                    = 0x127e
 	BLKRRPART                        = 0x125f
+	BLKSECDISCARD                    = 0x127d
 	BLKSECTGET                       = 0x1267
 	BLKSECTSET                       = 0x1266
 	BLKSSZGET                        = 0x1268
+	BLKZEROOUT                       = 0x127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
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 9d5352c3..09e1ffbe 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
@@ -27,22 +27,31 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
+	BLKALIGNOFF                      = 0x127a
 	BLKBSZGET                        = 0x80081270
 	BLKBSZSET                        = 0x40081271
+	BLKDISCARD                       = 0x1277
+	BLKDISCARDZEROES                 = 0x127c
 	BLKFLSBUF                        = 0x1261
 	BLKFRAGET                        = 0x1265
 	BLKFRASET                        = 0x1264
+	BLKGETDISKSEQ                    = 0x80081280
 	BLKGETSIZE                       = 0x1260
 	BLKGETSIZE64                     = 0x80081272
+	BLKIOMIN                         = 0x1278
+	BLKIOOPT                         = 0x1279
 	BLKPBSZGET                       = 0x127b
 	BLKRAGET                         = 0x1263
 	BLKRASET                         = 0x1262
 	BLKROGET                         = 0x125e
 	BLKROSET                         = 0x125d
+	BLKROTATIONAL                    = 0x127e
 	BLKRRPART                        = 0x125f
+	BLKSECDISCARD                    = 0x127d
 	BLKSECTGET                       = 0x1267
 	BLKSECTSET                       = 0x1266
 	BLKSSZGET                        = 0x1268
+	BLKZEROOUT                       = 0x127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
@@ -443,6 +452,7 @@ const (
 	TIOCSWINSZ                       = 0x5414
 	TIOCVHANGUP                      = 0x5437
 	TOSTOP                           = 0x100
+	TPIDR2_MAGIC                     = 0x54504902
 	TUNATTACHFILTER                  = 0x401054d5
 	TUNDETACHFILTER                  = 0x401054d6
 	TUNGETDEVNETNS                   = 0x54e3
@@ -515,6 +525,7 @@ const (
 	XCASE                            = 0x4
 	XTABS                            = 0x1800
 	ZA_MAGIC                         = 0x54366345
+	ZT_MAGIC                         = 0x5a544e01
 	_HIDIOCGRAWNAME                  = 0x80804804
 	_HIDIOCGRAWPHYS                  = 0x80404805
 	_HIDIOCGRAWUNIQ                  = 0x80404808
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 f26a164f..a4572354 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
@@ -27,22 +27,31 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
+	BLKALIGNOFF                      = 0x127a
 	BLKBSZGET                        = 0x80081270
 	BLKBSZSET                        = 0x40081271
+	BLKDISCARD                       = 0x1277
+	BLKDISCARDZEROES                 = 0x127c
 	BLKFLSBUF                        = 0x1261
 	BLKFRAGET                        = 0x1265
 	BLKFRASET                        = 0x1264
+	BLKGETDISKSEQ                    = 0x80081280
 	BLKGETSIZE                       = 0x1260
 	BLKGETSIZE64                     = 0x80081272
+	BLKIOMIN                         = 0x1278
+	BLKIOOPT                         = 0x1279
 	BLKPBSZGET                       = 0x127b
 	BLKRAGET                         = 0x1263
 	BLKRASET                         = 0x1262
 	BLKROGET                         = 0x125e
 	BLKROSET                         = 0x125d
+	BLKROTATIONAL                    = 0x127e
 	BLKRRPART                        = 0x125f
+	BLKSECDISCARD                    = 0x127d
 	BLKSECTGET                       = 0x1267
 	BLKSECTSET                       = 0x1266
 	BLKSSZGET                        = 0x1268
+	BLKZEROOUT                       = 0x127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
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 890bc3c9..fee7dfb8 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
@@ -27,22 +27,31 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
+	BLKALIGNOFF                      = 0x2000127a
 	BLKBSZGET                        = 0x40041270
 	BLKBSZSET                        = 0x80041271
+	BLKDISCARD                       = 0x20001277
+	BLKDISCARDZEROES                 = 0x2000127c
 	BLKFLSBUF                        = 0x20001261
 	BLKFRAGET                        = 0x20001265
 	BLKFRASET                        = 0x20001264
+	BLKGETDISKSEQ                    = 0x40081280
 	BLKGETSIZE                       = 0x20001260
 	BLKGETSIZE64                     = 0x40041272
+	BLKIOMIN                         = 0x20001278
+	BLKIOOPT                         = 0x20001279
 	BLKPBSZGET                       = 0x2000127b
 	BLKRAGET                         = 0x20001263
 	BLKRASET                         = 0x20001262
 	BLKROGET                         = 0x2000125e
 	BLKROSET                         = 0x2000125d
+	BLKROTATIONAL                    = 0x2000127e
 	BLKRRPART                        = 0x2000125f
+	BLKSECDISCARD                    = 0x2000127d
 	BLKSECTGET                       = 0x20001267
 	BLKSECTSET                       = 0x20001266
 	BLKSSZGET                        = 0x20001268
+	BLKZEROOUT                       = 0x2000127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
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 549f26ac..a5b2373a 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
@@ -27,22 +27,31 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
+	BLKALIGNOFF                      = 0x2000127a
 	BLKBSZGET                        = 0x40081270
 	BLKBSZSET                        = 0x80081271
+	BLKDISCARD                       = 0x20001277
+	BLKDISCARDZEROES                 = 0x2000127c
 	BLKFLSBUF                        = 0x20001261
 	BLKFRAGET                        = 0x20001265
 	BLKFRASET                        = 0x20001264
+	BLKGETDISKSEQ                    = 0x40081280
 	BLKGETSIZE                       = 0x20001260
 	BLKGETSIZE64                     = 0x40081272
+	BLKIOMIN                         = 0x20001278
+	BLKIOOPT                         = 0x20001279
 	BLKPBSZGET                       = 0x2000127b
 	BLKRAGET                         = 0x20001263
 	BLKRASET                         = 0x20001262
 	BLKROGET                         = 0x2000125e
 	BLKROSET                         = 0x2000125d
+	BLKROTATIONAL                    = 0x2000127e
 	BLKRRPART                        = 0x2000125f
+	BLKSECDISCARD                    = 0x2000127d
 	BLKSECTGET                       = 0x20001267
 	BLKSECTSET                       = 0x20001266
 	BLKSSZGET                        = 0x20001268
+	BLKZEROOUT                       = 0x2000127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
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 e0365e32..5dde82c9 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
@@ -27,22 +27,31 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
+	BLKALIGNOFF                      = 0x2000127a
 	BLKBSZGET                        = 0x40081270
 	BLKBSZSET                        = 0x80081271
+	BLKDISCARD                       = 0x20001277
+	BLKDISCARDZEROES                 = 0x2000127c
 	BLKFLSBUF                        = 0x20001261
 	BLKFRAGET                        = 0x20001265
 	BLKFRASET                        = 0x20001264
+	BLKGETDISKSEQ                    = 0x40081280
 	BLKGETSIZE                       = 0x20001260
 	BLKGETSIZE64                     = 0x40081272
+	BLKIOMIN                         = 0x20001278
+	BLKIOOPT                         = 0x20001279
 	BLKPBSZGET                       = 0x2000127b
 	BLKRAGET                         = 0x20001263
 	BLKRASET                         = 0x20001262
 	BLKROGET                         = 0x2000125e
 	BLKROSET                         = 0x2000125d
+	BLKROTATIONAL                    = 0x2000127e
 	BLKRRPART                        = 0x2000125f
+	BLKSECDISCARD                    = 0x2000127d
 	BLKSECTGET                       = 0x20001267
 	BLKSECTSET                       = 0x20001266
 	BLKSSZGET                        = 0x20001268
+	BLKZEROOUT                       = 0x2000127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
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 fdccce15..2e80ea6b 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
@@ -27,22 +27,31 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
+	BLKALIGNOFF                      = 0x2000127a
 	BLKBSZGET                        = 0x40041270
 	BLKBSZSET                        = 0x80041271
+	BLKDISCARD                       = 0x20001277
+	BLKDISCARDZEROES                 = 0x2000127c
 	BLKFLSBUF                        = 0x20001261
 	BLKFRAGET                        = 0x20001265
 	BLKFRASET                        = 0x20001264
+	BLKGETDISKSEQ                    = 0x40081280
 	BLKGETSIZE                       = 0x20001260
 	BLKGETSIZE64                     = 0x40041272
+	BLKIOMIN                         = 0x20001278
+	BLKIOOPT                         = 0x20001279
 	BLKPBSZGET                       = 0x2000127b
 	BLKRAGET                         = 0x20001263
 	BLKRASET                         = 0x20001262
 	BLKROGET                         = 0x2000125e
 	BLKROSET                         = 0x2000125d
+	BLKROTATIONAL                    = 0x2000127e
 	BLKRRPART                        = 0x2000125f
+	BLKSECDISCARD                    = 0x2000127d
 	BLKSECTGET                       = 0x20001267
 	BLKSECTSET                       = 0x20001266
 	BLKSSZGET                        = 0x20001268
+	BLKZEROOUT                       = 0x2000127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
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 b2205c83..a65dcd7c 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
@@ -27,22 +27,31 @@ const (
 	B57600                           = 0x10
 	B576000                          = 0x15
 	B921600                          = 0x16
+	BLKALIGNOFF                      = 0x2000127a
 	BLKBSZGET                        = 0x40041270
 	BLKBSZSET                        = 0x80041271
+	BLKDISCARD                       = 0x20001277
+	BLKDISCARDZEROES                 = 0x2000127c
 	BLKFLSBUF                        = 0x20001261
 	BLKFRAGET                        = 0x20001265
 	BLKFRASET                        = 0x20001264
+	BLKGETDISKSEQ                    = 0x40081280
 	BLKGETSIZE                       = 0x20001260
 	BLKGETSIZE64                     = 0x40041272
+	BLKIOMIN                         = 0x20001278
+	BLKIOOPT                         = 0x20001279
 	BLKPBSZGET                       = 0x2000127b
 	BLKRAGET                         = 0x20001263
 	BLKRASET                         = 0x20001262
 	BLKROGET                         = 0x2000125e
 	BLKROSET                         = 0x2000125d
+	BLKROTATIONAL                    = 0x2000127e
 	BLKRRPART                        = 0x2000125f
+	BLKSECDISCARD                    = 0x2000127d
 	BLKSECTGET                       = 0x20001267
 	BLKSECTSET                       = 0x20001266
 	BLKSSZGET                        = 0x20001268
+	BLKZEROOUT                       = 0x2000127f
 	BOTHER                           = 0x1f
 	BS1                              = 0x8000
 	BSDLY                            = 0x8000
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 81aa5ad0..cbd34e3d 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
@@ -27,22 +27,31 @@ const (
 	B57600                           = 0x10
 	B576000                          = 0x15
 	B921600                          = 0x16
+	BLKALIGNOFF                      = 0x2000127a
 	BLKBSZGET                        = 0x40081270
 	BLKBSZSET                        = 0x80081271
+	BLKDISCARD                       = 0x20001277
+	BLKDISCARDZEROES                 = 0x2000127c
 	BLKFLSBUF                        = 0x20001261
 	BLKFRAGET                        = 0x20001265
 	BLKFRASET                        = 0x20001264
+	BLKGETDISKSEQ                    = 0x40081280
 	BLKGETSIZE                       = 0x20001260
 	BLKGETSIZE64                     = 0x40081272
+	BLKIOMIN                         = 0x20001278
+	BLKIOOPT                         = 0x20001279
 	BLKPBSZGET                       = 0x2000127b
 	BLKRAGET                         = 0x20001263
 	BLKRASET                         = 0x20001262
 	BLKROGET                         = 0x2000125e
 	BLKROSET                         = 0x2000125d
+	BLKROTATIONAL                    = 0x2000127e
 	BLKRRPART                        = 0x2000125f
+	BLKSECDISCARD                    = 0x2000127d
 	BLKSECTGET                       = 0x20001267
 	BLKSECTSET                       = 0x20001266
 	BLKSSZGET                        = 0x20001268
+	BLKZEROOUT                       = 0x2000127f
 	BOTHER                           = 0x1f
 	BS1                              = 0x8000
 	BSDLY                            = 0x8000
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 76807a1f..e4afa7a3 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
@@ -27,22 +27,31 @@ const (
 	B57600                           = 0x10
 	B576000                          = 0x15
 	B921600                          = 0x16
+	BLKALIGNOFF                      = 0x2000127a
 	BLKBSZGET                        = 0x40081270
 	BLKBSZSET                        = 0x80081271
+	BLKDISCARD                       = 0x20001277
+	BLKDISCARDZEROES                 = 0x2000127c
 	BLKFLSBUF                        = 0x20001261
 	BLKFRAGET                        = 0x20001265
 	BLKFRASET                        = 0x20001264
+	BLKGETDISKSEQ                    = 0x40081280
 	BLKGETSIZE                       = 0x20001260
 	BLKGETSIZE64                     = 0x40081272
+	BLKIOMIN                         = 0x20001278
+	BLKIOOPT                         = 0x20001279
 	BLKPBSZGET                       = 0x2000127b
 	BLKRAGET                         = 0x20001263
 	BLKRASET                         = 0x20001262
 	BLKROGET                         = 0x2000125e
 	BLKROSET                         = 0x2000125d
+	BLKROTATIONAL                    = 0x2000127e
 	BLKRRPART                        = 0x2000125f
+	BLKSECDISCARD                    = 0x2000127d
 	BLKSECTGET                       = 0x20001267
 	BLKSECTSET                       = 0x20001266
 	BLKSSZGET                        = 0x20001268
+	BLKZEROOUT                       = 0x2000127f
 	BOTHER                           = 0x1f
 	BS1                              = 0x8000
 	BSDLY                            = 0x8000
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 d4a5ab9e..44f45a03 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
@@ -27,22 +27,31 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
+	BLKALIGNOFF                      = 0x127a
 	BLKBSZGET                        = 0x80081270
 	BLKBSZSET                        = 0x40081271
+	BLKDISCARD                       = 0x1277
+	BLKDISCARDZEROES                 = 0x127c
 	BLKFLSBUF                        = 0x1261
 	BLKFRAGET                        = 0x1265
 	BLKFRASET                        = 0x1264
+	BLKGETDISKSEQ                    = 0x80081280
 	BLKGETSIZE                       = 0x1260
 	BLKGETSIZE64                     = 0x80081272
+	BLKIOMIN                         = 0x1278
+	BLKIOOPT                         = 0x1279
 	BLKPBSZGET                       = 0x127b
 	BLKRAGET                         = 0x1263
 	BLKRASET                         = 0x1262
 	BLKROGET                         = 0x125e
 	BLKROSET                         = 0x125d
+	BLKROTATIONAL                    = 0x127e
 	BLKRRPART                        = 0x125f
+	BLKSECDISCARD                    = 0x127d
 	BLKSECTGET                       = 0x1267
 	BLKSECTSET                       = 0x1266
 	BLKSSZGET                        = 0x1268
+	BLKZEROOUT                       = 0x127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
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 66e65db9..74733e26 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
@@ -27,22 +27,31 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
+	BLKALIGNOFF                      = 0x127a
 	BLKBSZGET                        = 0x80081270
 	BLKBSZSET                        = 0x40081271
+	BLKDISCARD                       = 0x1277
+	BLKDISCARDZEROES                 = 0x127c
 	BLKFLSBUF                        = 0x1261
 	BLKFRAGET                        = 0x1265
 	BLKFRASET                        = 0x1264
+	BLKGETDISKSEQ                    = 0x80081280
 	BLKGETSIZE                       = 0x1260
 	BLKGETSIZE64                     = 0x80081272
+	BLKIOMIN                         = 0x1278
+	BLKIOOPT                         = 0x1279
 	BLKPBSZGET                       = 0x127b
 	BLKRAGET                         = 0x1263
 	BLKRASET                         = 0x1262
 	BLKROGET                         = 0x125e
 	BLKROSET                         = 0x125d
+	BLKROTATIONAL                    = 0x127e
 	BLKRRPART                        = 0x125f
+	BLKSECDISCARD                    = 0x127d
 	BLKSECTGET                       = 0x1267
 	BLKSECTSET                       = 0x1266
 	BLKSSZGET                        = 0x1268
+	BLKZEROOUT                       = 0x127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
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 f6192526..f5f3934b 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
@@ -30,22 +30,31 @@ const (
 	B57600                           = 0x1001
 	B576000                          = 0x1006
 	B921600                          = 0x1007
+	BLKALIGNOFF                      = 0x2000127a
 	BLKBSZGET                        = 0x40081270
 	BLKBSZSET                        = 0x80081271
+	BLKDISCARD                       = 0x20001277
+	BLKDISCARDZEROES                 = 0x2000127c
 	BLKFLSBUF                        = 0x20001261
 	BLKFRAGET                        = 0x20001265
 	BLKFRASET                        = 0x20001264
+	BLKGETDISKSEQ                    = 0x40081280
 	BLKGETSIZE                       = 0x20001260
 	BLKGETSIZE64                     = 0x40081272
+	BLKIOMIN                         = 0x20001278
+	BLKIOOPT                         = 0x20001279
 	BLKPBSZGET                       = 0x2000127b
 	BLKRAGET                         = 0x20001263
 	BLKRASET                         = 0x20001262
 	BLKROGET                         = 0x2000125e
 	BLKROSET                         = 0x2000125d
+	BLKROTATIONAL                    = 0x2000127e
 	BLKRRPART                        = 0x2000125f
+	BLKSECDISCARD                    = 0x2000127d
 	BLKSECTGET                       = 0x20001267
 	BLKSECTSET                       = 0x20001266
 	BLKSSZGET                        = 0x20001268
+	BLKZEROOUT                       = 0x2000127f
 	BOTHER                           = 0x1000
 	BS1                              = 0x2000
 	BSDLY                            = 0x2000
@@ -329,6 +338,54 @@ const (
 	SCM_WIFI_STATUS                  = 0x25
 	SFD_CLOEXEC                      = 0x400000
 	SFD_NONBLOCK                     = 0x4000
+	SF_FP                            = 0x38
+	SF_I0                            = 0x20
+	SF_I1                            = 0x24
+	SF_I2                            = 0x28
+	SF_I3                            = 0x2c
+	SF_I4                            = 0x30
+	SF_I5                            = 0x34
+	SF_L0                            = 0x0
+	SF_L1                            = 0x4
+	SF_L2                            = 0x8
+	SF_L3                            = 0xc
+	SF_L4                            = 0x10
+	SF_L5                            = 0x14
+	SF_L6                            = 0x18
+	SF_L7                            = 0x1c
+	SF_PC                            = 0x3c
+	SF_RETP                          = 0x40
+	SF_V9_FP                         = 0x70
+	SF_V9_I0                         = 0x40
+	SF_V9_I1                         = 0x48
+	SF_V9_I2                         = 0x50
+	SF_V9_I3                         = 0x58
+	SF_V9_I4                         = 0x60
+	SF_V9_I5                         = 0x68
+	SF_V9_L0                         = 0x0
+	SF_V9_L1                         = 0x8
+	SF_V9_L2                         = 0x10
+	SF_V9_L3                         = 0x18
+	SF_V9_L4                         = 0x20
+	SF_V9_L5                         = 0x28
+	SF_V9_L6                         = 0x30
+	SF_V9_L7                         = 0x38
+	SF_V9_PC                         = 0x78
+	SF_V9_RETP                       = 0x80
+	SF_V9_XARG0                      = 0x88
+	SF_V9_XARG1                      = 0x90
+	SF_V9_XARG2                      = 0x98
+	SF_V9_XARG3                      = 0xa0
+	SF_V9_XARG4                      = 0xa8
+	SF_V9_XARG5                      = 0xb0
+	SF_V9_XXARG                      = 0xb8
+	SF_XARG0                         = 0x44
+	SF_XARG1                         = 0x48
+	SF_XARG2                         = 0x4c
+	SF_XARG3                         = 0x50
+	SF_XARG4                         = 0x54
+	SF_XARG5                         = 0x58
+	SF_XXARG                         = 0x5c
 	SIOCATMARK                       = 0x8905
 	SIOCGPGRP                        = 0x8904
 	SIOCGSTAMPNS_NEW                 = 0x40108907
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 ef9dcd1b..9a257219 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
@@ -124,7 +124,6 @@ int utime(uintptr_t, uintptr_t);
 unsigned long long getsystemcfg(int);
 int umount(uintptr_t);
 int getrlimit64(int, uintptr_t);
-int setrlimit64(int, uintptr_t);
 long long lseek64(int, long long, int);
 uintptr_t mmap(uintptr_t, uintptr_t, int, int, int, long long);
 
@@ -213,7 +212,7 @@ func wait4(pid Pid_t, status *_C_int, options int, rusage *Rusage) (wpid Pid_t,
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctl(fd int, req uint, arg uintptr) (err error) {
+func ioctl(fd int, req int, arg uintptr) (err error) {
 	r0, er := C.ioctl(C.int(fd), C.int(req), C.uintptr_t(arg))
 	if r0 == -1 && er != nil {
 		err = er
@@ -223,7 +222,7 @@ 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) {
+func ioctlPtr(fd int, req int, 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
@@ -1464,16 +1463,6 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	r0, er := C.setrlimit64(C.int(resource), C.uintptr_t(uintptr(unsafe.Pointer(rlim))))
-	if r0 == -1 && er != nil {
-		err = er
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Seek(fd int, offset int64, whence int) (off int64, err error) {
 	r0, er := C.lseek64(C.int(fd), C.longlong(offset), C.int(whence))
 	off = int64(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 f86a9459..6de80c20 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
@@ -93,8 +93,8 @@ func wait4(pid Pid_t, status *_C_int, options int, rusage *Rusage) (wpid Pid_t,
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctl(fd int, req uint, arg uintptr) (err error) {
-	_, e1 := callioctl(fd, int(req), arg)
+func ioctl(fd int, req int, arg uintptr) (err error) {
+	_, e1 := callioctl(fd, req, arg)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -103,8 +103,8 @@ 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)
+func ioctlPtr(fd int, req int, arg unsafe.Pointer) (err error) {
+	_, e1 := callioctl_ptr(fd, req, arg)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1422,16 +1422,6 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, e1 := callsetrlimit(resource, uintptr(unsafe.Pointer(rlim)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Seek(fd int, offset int64, whence int) (off int64, err error) {
 	r0, e1 := calllseek(fd, offset, whence)
 	off = int64(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 d32a84ca..c4d50ae5 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
@@ -124,7 +124,6 @@ import (
 //go:cgo_import_dynamic libc_getsystemcfg getsystemcfg "libc.a/shr_64.o"
 //go:cgo_import_dynamic libc_umount umount "libc.a/shr_64.o"
 //go:cgo_import_dynamic libc_getrlimit getrlimit "libc.a/shr_64.o"
-//go:cgo_import_dynamic libc_setrlimit setrlimit "libc.a/shr_64.o"
 //go:cgo_import_dynamic libc_lseek lseek "libc.a/shr_64.o"
 //go:cgo_import_dynamic libc_mmap64 mmap64 "libc.a/shr_64.o"
 
@@ -242,7 +241,6 @@ import (
 //go:linkname libc_getsystemcfg libc_getsystemcfg
 //go:linkname libc_umount libc_umount
 //go:linkname libc_getrlimit libc_getrlimit
-//go:linkname libc_setrlimit libc_setrlimit
 //go:linkname libc_lseek libc_lseek
 //go:linkname libc_mmap64 libc_mmap64
 
@@ -363,7 +361,6 @@ var (
 	libc_getsystemcfg,
 	libc_umount,
 	libc_getrlimit,
-	libc_setrlimit,
 	libc_lseek,
 	libc_mmap64 syscallFunc
 )
@@ -1179,13 +1176,6 @@ func callgetrlimit(resource int, rlim uintptr) (r1 uintptr, e1 Errno) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func callsetrlimit(resource int, rlim uintptr) (r1 uintptr, e1 Errno) {
-	r1, _, e1 = rawSyscall6(uintptr(unsafe.Pointer(&libc_setrlimit)), 2, uintptr(resource), rlim, 0, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func calllseek(fd int, offset int64, whence int) (r1 uintptr, e1 Errno) {
 	r1, _, e1 = syscall6(uintptr(unsafe.Pointer(&libc_lseek)), 3, uintptr(fd), uintptr(offset), uintptr(whence), 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 d7d8baf8..6903d3b0 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
@@ -123,7 +123,6 @@ int utime(uintptr_t, uintptr_t);
 unsigned long long getsystemcfg(int);
 int umount(uintptr_t);
 int getrlimit(int, uintptr_t);
-int setrlimit(int, uintptr_t);
 long long lseek(int, long long, int);
 uintptr_t mmap64(uintptr_t, uintptr_t, int, int, int, long long);
 
@@ -131,6 +130,7 @@ uintptr_t mmap64(uintptr_t, uintptr_t, int, int, int, long long);
 import "C"
 import (
 	"syscall"
+	"unsafe"
 )
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
@@ -1055,14 +1055,6 @@ func callgetrlimit(resource int, rlim uintptr) (r1 uintptr, e1 Errno) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func callsetrlimit(resource int, rlim uintptr) (r1 uintptr, e1 Errno) {
-	r1 = uintptr(C.setrlimit(C.int(resource), C.uintptr_t(rlim)))
-	e1 = syscall.GetErrno()
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func calllseek(fd int, offset int64, whence int) (r1 uintptr, e1 Errno) {
 	r1 = uintptr(C.lseek(C.int(fd), C.longlong(offset), C.int(whence)))
 	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 a29ffdd5..4037ccf7 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
@@ -1992,6 +1992,31 @@ var libc_select_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setattrlist(path string, attrlist *Attrlist, attrBuf []byte, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(attrBuf) > 0 {
+		_p1 = unsafe.Pointer(&attrBuf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := syscall_syscall6(libc_setattrlist_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(attrlist)), uintptr(_p1), uintptr(len(attrBuf)), uintptr(options), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_setattrlist_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_setattrlist setattrlist "/usr/lib/libSystem.B.dylib"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setegid(egid int) (err error) {
 	_, _, e1 := syscall_syscall(libc_setegid_trampoline_addr, uintptr(egid), 0, 0)
 	if e1 != 0 {
@@ -2123,20 +2148,6 @@ var libc_setreuid_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setrlimit_trampoline_addr, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setrlimit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setrlimit setrlimit "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setsid() (pid int, err error) {
 	r0, _, e1 := syscall_rawSyscall(libc_setsid_trampoline_addr, 0, 0, 0)
 	pid = int(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
index 95fe4c0e..4baaed0b 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
@@ -705,6 +705,11 @@ TEXT libc_select_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_select_trampoline_addr(SB), RODATA, $8
 DATA	·libc_select_trampoline_addr(SB)/8, $libc_select_trampoline<>(SB)
 
+TEXT libc_setattrlist_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_setattrlist(SB)
+GLOBL	·libc_setattrlist_trampoline_addr(SB), RODATA, $8
+DATA	·libc_setattrlist_trampoline_addr(SB)/8, $libc_setattrlist_trampoline<>(SB)
+
 TEXT libc_setegid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setegid(SB)
 
@@ -759,12 +764,6 @@ TEXT libc_setreuid_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_setreuid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setreuid_trampoline_addr(SB)/8, $libc_setreuid_trampoline<>(SB)
 
-TEXT libc_setrlimit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setrlimit(SB)
-
-GLOBL	·libc_setrlimit_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setrlimit_trampoline_addr(SB)/8, $libc_setrlimit_trampoline<>(SB)
-
 TEXT libc_setsid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setsid(SB)
 
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 2fd4590b..51d6f3fb 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
@@ -1992,6 +1992,31 @@ var libc_select_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setattrlist(path string, attrlist *Attrlist, attrBuf []byte, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(attrBuf) > 0 {
+		_p1 = unsafe.Pointer(&attrBuf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := syscall_syscall6(libc_setattrlist_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(attrlist)), uintptr(_p1), uintptr(len(attrBuf)), uintptr(options), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_setattrlist_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_setattrlist setattrlist "/usr/lib/libSystem.B.dylib"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setegid(egid int) (err error) {
 	_, _, e1 := syscall_syscall(libc_setegid_trampoline_addr, uintptr(egid), 0, 0)
 	if e1 != 0 {
@@ -2123,20 +2148,6 @@ var libc_setreuid_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setrlimit_trampoline_addr, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setrlimit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setrlimit setrlimit "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setsid() (pid int, err error) {
 	r0, _, e1 := syscall_rawSyscall(libc_setsid_trampoline_addr, 0, 0, 0)
 	pid = int(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
index efa5b4c9..c3b82c03 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
@@ -705,6 +705,11 @@ TEXT libc_select_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_select_trampoline_addr(SB), RODATA, $8
 DATA	·libc_select_trampoline_addr(SB)/8, $libc_select_trampoline<>(SB)
 
+TEXT libc_setattrlist_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_setattrlist(SB)
+GLOBL	·libc_setattrlist_trampoline_addr(SB), RODATA, $8
+DATA	·libc_setattrlist_trampoline_addr(SB)/8, $libc_setattrlist_trampoline<>(SB)
+
 TEXT libc_setegid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setegid(SB)
 
@@ -759,12 +764,6 @@ TEXT libc_setreuid_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_setreuid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setreuid_trampoline_addr(SB)/8, $libc_setreuid_trampoline<>(SB)
 
-TEXT libc_setrlimit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setrlimit(SB)
-
-GLOBL	·libc_setrlimit_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setrlimit_trampoline_addr(SB)/8, $libc_setrlimit_trampoline<>(SB)
-
 TEXT libc_setsid_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setsid(SB)
 
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 3b851347..0eabac7a 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
@@ -1410,16 +1410,6 @@ func Setresuid(ruid int, euid int, suid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
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 11290656..ee313eb0 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
@@ -1645,16 +1645,6 @@ func Setresuid(ruid int, euid int, suid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
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 55f5abfe..4c986e44 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
@@ -1645,16 +1645,6 @@ func Setresuid(ruid int, euid int, suid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
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 d39651c2..55521694 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
@@ -1645,16 +1645,6 @@ func Setresuid(ruid int, euid int, suid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
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 ddb74086..67a226fb 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
@@ -1645,16 +1645,6 @@ func Setresuid(ruid int, euid int, suid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
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 09a53a61..f0b9ddaa 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_riscv64.go
@@ -1645,16 +1645,6 @@ func Setresuid(ruid int, euid int, suid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux.go b/vendor/golang.org/x/sys/unix/zsyscall_linux.go
index 430cb24d..a07321be 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux.go
@@ -1346,16 +1346,6 @@ func PivotRoot(newroot string, putold string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
 	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
 	if e1 != 0 {
@@ -1366,7 +1356,7 @@ func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+func pselect6(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *sigset_argpack) (n int, err error) {
 	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
 	n = int(r0)
 	if e1 != 0 {
@@ -1878,6 +1868,17 @@ func munmap(addr uintptr, length uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func mremap(oldaddr uintptr, oldlength uintptr, newlength uintptr, flags int, newaddr uintptr) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MREMAP, uintptr(oldaddr), uintptr(oldlength), uintptr(newlength), uintptr(flags), uintptr(newaddr), 0)
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Madvise(b []byte, advice int) (err error) {
 	var _p0 unsafe.Pointer
 	if len(b) > 0 {
@@ -2182,3 +2183,17 @@ func rtSigprocmask(how int, set *Sigset_t, oldset *Sigset_t, sigsetsize uintptr)
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) {
+	RawSyscallNoError(SYS_GETRESUID, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid)))
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) {
+	RawSyscallNoError(SYS_GETRESGID, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid)))
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
index c81b0ad4..07b549cc 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
@@ -411,16 +411,6 @@ func getrlimit(resource int, rlim *rlimit32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func setrlimit(resource int, rlim *rlimit32) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func futimesat(dirfd int, path string, times *[2]Timeval) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
index 2206bce7..5f481bf8 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
@@ -334,16 +334,6 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
index edf6b39f..824cd52c 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
@@ -578,16 +578,6 @@ func getrlimit(resource int, rlim *rlimit32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func setrlimit(resource int, rlim *rlimit32) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func armSyncFileRange(fd int, flags int, off int64, n int64) (err error) {
 	_, _, e1 := Syscall6(SYS_ARM_SYNC_FILE_RANGE, uintptr(fd), uintptr(flags), uintptr(off), uintptr(off>>32), uintptr(n), uintptr(n>>32))
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
index 190609f2..e77aecfe 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
@@ -289,16 +289,6 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
index 5f984cbb..961a3afb 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
@@ -644,16 +644,6 @@ func getrlimit(resource int, rlim *rlimit32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func setrlimit(resource int, rlim *rlimit32) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Alarm(seconds uint) (remaining uint, err error) {
 	r0, _, e1 := Syscall(SYS_ALARM, uintptr(seconds), 0, 0)
 	remaining = uint(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
index 46fc380a..ed05005e 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
@@ -278,16 +278,6 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
index cbd0d4da..d365b718 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
@@ -278,16 +278,6 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
index 0c13d15f..c3f1b8bb 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
@@ -644,16 +644,6 @@ func getrlimit(resource int, rlim *rlimit32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func setrlimit(resource int, rlim *rlimit32) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Alarm(seconds uint) (remaining uint, err error) {
 	r0, _, e1 := Syscall(SYS_ALARM, uintptr(seconds), 0, 0)
 	remaining = uint(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go
index e01432ae..a6574cf9 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go
@@ -624,16 +624,6 @@ func getrlimit(resource int, rlim *rlimit32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func setrlimit(resource int, rlim *rlimit32) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func syncFileRange2(fd int, flags int, off int64, n int64) (err error) {
 	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE2, uintptr(fd), uintptr(flags), uintptr(off>>32), uintptr(off), uintptr(n>>32), uintptr(n))
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
index 13c7ee7b..f4099026 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
@@ -349,16 +349,6 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
index 02d0c0fd..9dfcc299 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
@@ -349,16 +349,6 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
index 9fee3b1d..0ab4f2ed 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
@@ -269,16 +269,6 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -541,3 +531,19 @@ func kexecFileLoad(kernelFd int, initrdFd int, cmdlineLen int, cmdline string, f
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func riscvHWProbe(pairs []RISCVHWProbePairs, cpuCount uintptr, cpus *CPUSet, flags uint) (err error) {
+	var _p0 unsafe.Pointer
+	if len(pairs) > 0 {
+		_p0 = unsafe.Pointer(&pairs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_RISCV_HWPROBE, uintptr(_p0), uintptr(len(pairs)), uintptr(cpuCount), uintptr(unsafe.Pointer(cpus)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
index 647bbfec..6cde3223 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
@@ -319,16 +319,6 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
 	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
 	n = int64(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
index ada057f8..5253d65b 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
@@ -329,16 +329,6 @@ func setfsuid(uid int) (prev int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Shutdown(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
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 8e1d9c8f..35f499b3 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
@@ -1607,16 +1607,6 @@ func Setreuid(ruid int, euid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
@@ -1868,3 +1858,14 @@ func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mremapNetBSD(oldp uintptr, oldsize uintptr, newp uintptr, newsize uintptr, flags int) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MREMAP, uintptr(oldp), uintptr(oldsize), uintptr(newp), uintptr(newsize), uintptr(flags), 0)
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
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 21c69504..3cda65b0 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
@@ -1607,16 +1607,6 @@ func Setreuid(ruid int, euid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
@@ -1868,3 +1858,14 @@ func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mremapNetBSD(oldp uintptr, oldsize uintptr, newp uintptr, newsize uintptr, flags int) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MREMAP, uintptr(oldp), uintptr(oldsize), uintptr(newp), uintptr(newsize), uintptr(flags), 0)
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
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 298168f9..1e1fea90 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
@@ -1607,16 +1607,6 @@ func Setreuid(ruid int, euid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
@@ -1868,3 +1858,14 @@ func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mremapNetBSD(oldp uintptr, oldsize uintptr, newp uintptr, newsize uintptr, flags int) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MREMAP, uintptr(oldp), uintptr(oldsize), uintptr(newp), uintptr(newsize), uintptr(flags), 0)
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
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 68b8bd49..3b77da11 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
@@ -1607,16 +1607,6 @@ func Setreuid(ruid int, euid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
@@ -1868,3 +1858,14 @@ func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mremapNetBSD(oldp uintptr, oldsize uintptr, newp uintptr, newsize uintptr, flags int) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MREMAP, uintptr(oldp), uintptr(oldsize), uintptr(newp), uintptr(newsize), uintptr(flags), 0)
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
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 0b0f910e..9ab9abf7 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
@@ -519,6 +519,28 @@ var libc_getcwd_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) {
+	syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid)))
+	return
+}
+
+var libc_getresuid_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_getresuid getresuid "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) {
+	syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid)))
+	return
+}
+
+var libc_getresgid_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_getresgid getresgid "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ioctl(fd int, req uint, arg uintptr) (err error) {
 	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
 	if e1 != 0 {
@@ -1894,20 +1916,6 @@ var libc_setresuid_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setrlimit_trampoline_addr, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setrlimit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setrlimit setrlimit "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setrtable(rtable int) (err error) {
 	_, _, e1 := syscall_rawSyscall(libc_setrtable_trampoline_addr, uintptr(rtable), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s
index 08744425..3dcacd30 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s
@@ -158,6 +158,16 @@ TEXT libc_getcwd_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_getcwd_trampoline_addr(SB), RODATA, $4
 DATA	·libc_getcwd_trampoline_addr(SB)/4, $libc_getcwd_trampoline<>(SB)
 
+TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_getresuid(SB)
+GLOBL	·libc_getresuid_trampoline_addr(SB), RODATA, $4
+DATA	·libc_getresuid_trampoline_addr(SB)/4, $libc_getresuid_trampoline<>(SB)
+
+TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_getresgid(SB)
+GLOBL	·libc_getresgid_trampoline_addr(SB), RODATA, $4
+DATA	·libc_getresgid_trampoline_addr(SB)/4, $libc_getresgid_trampoline<>(SB)
+
 TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_ioctl(SB)
 GLOBL	·libc_ioctl_trampoline_addr(SB), RODATA, $4
@@ -573,11 +583,6 @@ TEXT libc_setresuid_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_setresuid_trampoline_addr(SB), RODATA, $4
 DATA	·libc_setresuid_trampoline_addr(SB)/4, $libc_setresuid_trampoline<>(SB)
 
-TEXT libc_setrlimit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setrlimit(SB)
-GLOBL	·libc_setrlimit_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setrlimit_trampoline_addr(SB)/4, $libc_setrlimit_trampoline<>(SB)
-
 TEXT libc_setrtable_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setrtable(SB)
 GLOBL	·libc_setrtable_trampoline_addr(SB), RODATA, $4
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 48ff5de7..915761ea 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
@@ -519,15 +519,29 @@ var libc_getcwd_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctl(fd int, req uint, arg uintptr) (err error) {
-	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
+func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) {
+	syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid)))
 	return
 }
 
-func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+var libc_getresuid_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_getresuid getresuid "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) {
+	syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid)))
+	return
+}
+
+var libc_getresgid_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_getresgid getresgid "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
 	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -541,6 +555,16 @@ var libc_ioctl_trampoline_addr uintptr
 
 // 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(libc_ioctl_trampoline_addr, 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 {
@@ -1894,20 +1918,6 @@ var libc_setresuid_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setrlimit_trampoline_addr, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setrlimit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setrlimit setrlimit "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setrtable(rtable int) (err error) {
 	_, _, e1 := syscall_rawSyscall(libc_setrtable_trampoline_addr, uintptr(rtable), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s
index 5782cd10..2763620b 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s
@@ -158,6 +158,16 @@ TEXT libc_getcwd_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_getcwd_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getcwd_trampoline_addr(SB)/8, $libc_getcwd_trampoline<>(SB)
 
+TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_getresuid(SB)
+GLOBL	·libc_getresuid_trampoline_addr(SB), RODATA, $8
+DATA	·libc_getresuid_trampoline_addr(SB)/8, $libc_getresuid_trampoline<>(SB)
+
+TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_getresgid(SB)
+GLOBL	·libc_getresgid_trampoline_addr(SB), RODATA, $8
+DATA	·libc_getresgid_trampoline_addr(SB)/8, $libc_getresgid_trampoline<>(SB)
+
 TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_ioctl(SB)
 GLOBL	·libc_ioctl_trampoline_addr(SB), RODATA, $8
@@ -573,11 +583,6 @@ TEXT libc_setresuid_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_setresuid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setresuid_trampoline_addr(SB)/8, $libc_setresuid_trampoline<>(SB)
 
-TEXT libc_setrlimit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setrlimit(SB)
-GLOBL	·libc_setrlimit_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setrlimit_trampoline_addr(SB)/8, $libc_setrlimit_trampoline<>(SB)
-
 TEXT libc_setrtable_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setrtable(SB)
 GLOBL	·libc_setrtable_trampoline_addr(SB), RODATA, $8
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 2452a641..8e87fdf1 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
@@ -519,6 +519,28 @@ var libc_getcwd_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) {
+	syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid)))
+	return
+}
+
+var libc_getresuid_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_getresuid getresuid "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) {
+	syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid)))
+	return
+}
+
+var libc_getresgid_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_getresgid getresgid "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ioctl(fd int, req uint, arg uintptr) (err error) {
 	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
 	if e1 != 0 {
@@ -1894,20 +1916,6 @@ var libc_setresuid_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setrlimit_trampoline_addr, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setrlimit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setrlimit setrlimit "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setrtable(rtable int) (err error) {
 	_, _, e1 := syscall_rawSyscall(libc_setrtable_trampoline_addr, uintptr(rtable), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s
index cf310420..c9223140 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s
@@ -158,6 +158,16 @@ TEXT libc_getcwd_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_getcwd_trampoline_addr(SB), RODATA, $4
 DATA	·libc_getcwd_trampoline_addr(SB)/4, $libc_getcwd_trampoline<>(SB)
 
+TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_getresuid(SB)
+GLOBL	·libc_getresuid_trampoline_addr(SB), RODATA, $4
+DATA	·libc_getresuid_trampoline_addr(SB)/4, $libc_getresuid_trampoline<>(SB)
+
+TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_getresgid(SB)
+GLOBL	·libc_getresgid_trampoline_addr(SB), RODATA, $4
+DATA	·libc_getresgid_trampoline_addr(SB)/4, $libc_getresgid_trampoline<>(SB)
+
 TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_ioctl(SB)
 GLOBL	·libc_ioctl_trampoline_addr(SB), RODATA, $4
@@ -573,11 +583,6 @@ TEXT libc_setresuid_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_setresuid_trampoline_addr(SB), RODATA, $4
 DATA	·libc_setresuid_trampoline_addr(SB)/4, $libc_setresuid_trampoline<>(SB)
 
-TEXT libc_setrlimit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setrlimit(SB)
-GLOBL	·libc_setrlimit_trampoline_addr(SB), RODATA, $4
-DATA	·libc_setrlimit_trampoline_addr(SB)/4, $libc_setrlimit_trampoline<>(SB)
-
 TEXT libc_setrtable_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setrtable(SB)
 GLOBL	·libc_setrtable_trampoline_addr(SB), RODATA, $4
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 5e35600a..12a7a216 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
@@ -519,6 +519,28 @@ var libc_getcwd_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) {
+	syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid)))
+	return
+}
+
+var libc_getresuid_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_getresuid getresuid "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) {
+	syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid)))
+	return
+}
+
+var libc_getresgid_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_getresgid getresgid "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ioctl(fd int, req uint, arg uintptr) (err error) {
 	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
 	if e1 != 0 {
@@ -1894,20 +1916,6 @@ var libc_setresuid_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setrlimit_trampoline_addr, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setrlimit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setrlimit setrlimit "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setrtable(rtable int) (err error) {
 	_, _, e1 := syscall_rawSyscall(libc_setrtable_trampoline_addr, uintptr(rtable), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s
index 484bb42e..a6bc32c9 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s
@@ -158,6 +158,16 @@ TEXT libc_getcwd_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_getcwd_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getcwd_trampoline_addr(SB)/8, $libc_getcwd_trampoline<>(SB)
 
+TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_getresuid(SB)
+GLOBL	·libc_getresuid_trampoline_addr(SB), RODATA, $8
+DATA	·libc_getresuid_trampoline_addr(SB)/8, $libc_getresuid_trampoline<>(SB)
+
+TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_getresgid(SB)
+GLOBL	·libc_getresgid_trampoline_addr(SB), RODATA, $8
+DATA	·libc_getresgid_trampoline_addr(SB)/8, $libc_getresgid_trampoline<>(SB)
+
 TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_ioctl(SB)
 GLOBL	·libc_ioctl_trampoline_addr(SB), RODATA, $8
@@ -573,11 +583,6 @@ TEXT libc_setresuid_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_setresuid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setresuid_trampoline_addr(SB)/8, $libc_setresuid_trampoline<>(SB)
 
-TEXT libc_setrlimit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setrlimit(SB)
-GLOBL	·libc_setrlimit_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setrlimit_trampoline_addr(SB)/8, $libc_setrlimit_trampoline<>(SB)
-
 TEXT libc_setrtable_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setrtable(SB)
 GLOBL	·libc_setrtable_trampoline_addr(SB), RODATA, $8
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 b04cef1a..b19e8aa0 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
@@ -519,6 +519,28 @@ var libc_getcwd_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) {
+	syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid)))
+	return
+}
+
+var libc_getresuid_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_getresuid getresuid "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) {
+	syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid)))
+	return
+}
+
+var libc_getresgid_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_getresgid getresgid "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ioctl(fd int, req uint, arg uintptr) (err error) {
 	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
 	if e1 != 0 {
@@ -1894,20 +1916,6 @@ var libc_setresuid_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setrlimit_trampoline_addr, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setrlimit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setrlimit setrlimit "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setrtable(rtable int) (err error) {
 	_, _, e1 := syscall_rawSyscall(libc_setrtable_trampoline_addr, uintptr(rtable), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s
index 55af2726..b4e7bcea 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s
@@ -158,6 +158,16 @@ TEXT libc_getcwd_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_getcwd_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getcwd_trampoline_addr(SB)/8, $libc_getcwd_trampoline<>(SB)
 
+TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_getresuid(SB)
+GLOBL	·libc_getresuid_trampoline_addr(SB), RODATA, $8
+DATA	·libc_getresuid_trampoline_addr(SB)/8, $libc_getresuid_trampoline<>(SB)
+
+TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_getresgid(SB)
+GLOBL	·libc_getresgid_trampoline_addr(SB), RODATA, $8
+DATA	·libc_getresgid_trampoline_addr(SB)/8, $libc_getresgid_trampoline<>(SB)
+
 TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_ioctl(SB)
 GLOBL	·libc_ioctl_trampoline_addr(SB), RODATA, $8
@@ -573,11 +583,6 @@ TEXT libc_setresuid_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_setresuid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setresuid_trampoline_addr(SB)/8, $libc_setresuid_trampoline<>(SB)
 
-TEXT libc_setrlimit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setrlimit(SB)
-GLOBL	·libc_setrlimit_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setrlimit_trampoline_addr(SB)/8, $libc_setrlimit_trampoline<>(SB)
-
 TEXT libc_setrtable_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setrtable(SB)
 GLOBL	·libc_setrtable_trampoline_addr(SB), RODATA, $8
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 47a07ee0..fb99594c 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
@@ -519,6 +519,28 @@ var libc_getcwd_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) {
+	syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid)))
+	return
+}
+
+var libc_getresuid_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_getresuid getresuid "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) {
+	syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid)))
+	return
+}
+
+var libc_getresgid_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_getresgid getresgid "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ioctl(fd int, req uint, arg uintptr) (err error) {
 	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
 	if e1 != 0 {
@@ -1894,20 +1916,6 @@ var libc_setresuid_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setrlimit_trampoline_addr, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setrlimit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setrlimit setrlimit "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setrtable(rtable int) (err error) {
 	_, _, e1 := syscall_rawSyscall(libc_setrtable_trampoline_addr, uintptr(rtable), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s
index 4028255b..ca3f7660 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s
@@ -189,6 +189,18 @@ TEXT libc_getcwd_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_getcwd_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getcwd_trampoline_addr(SB)/8, $libc_getcwd_trampoline<>(SB)
 
+TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0
+	CALL	libc_getresuid(SB)
+	RET
+GLOBL	·libc_getresuid_trampoline_addr(SB), RODATA, $8
+DATA	·libc_getresuid_trampoline_addr(SB)/8, $libc_getresuid_trampoline<>(SB)
+
+TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0
+	CALL	libc_getresgid(SB)
+	RET
+GLOBL	·libc_getresgid_trampoline_addr(SB), RODATA, $8
+DATA	·libc_getresgid_trampoline_addr(SB)/8, $libc_getresgid_trampoline<>(SB)
+
 TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0
 	CALL	libc_ioctl(SB)
 	RET
@@ -687,12 +699,6 @@ TEXT libc_setresuid_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_setresuid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setresuid_trampoline_addr(SB)/8, $libc_setresuid_trampoline<>(SB)
 
-TEXT libc_setrlimit_trampoline<>(SB),NOSPLIT,$0-0
-	CALL	libc_setrlimit(SB)
-	RET
-GLOBL	·libc_setrlimit_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setrlimit_trampoline_addr(SB)/8, $libc_setrlimit_trampoline<>(SB)
-
 TEXT libc_setrtable_trampoline<>(SB),NOSPLIT,$0-0
 	CALL	libc_setrtable(SB)
 	RET
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 573378fd..32cbbbc5 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
@@ -519,6 +519,28 @@ var libc_getcwd_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) {
+	syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid)))
+	return
+}
+
+var libc_getresuid_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_getresuid getresuid "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) {
+	syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid)))
+	return
+}
+
+var libc_getresgid_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_getresgid getresgid "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ioctl(fd int, req uint, arg uintptr) (err error) {
 	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
 	if e1 != 0 {
@@ -1894,20 +1916,6 @@ var libc_setresuid_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := syscall_rawSyscall(libc_setrlimit_trampoline_addr, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-var libc_setrlimit_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_setrlimit setrlimit "libc.so"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setrtable(rtable int) (err error) {
 	_, _, e1 := syscall_rawSyscall(libc_setrtable_trampoline_addr, uintptr(rtable), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s
index e1fbd4df..477a7d5b 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s
@@ -158,6 +158,16 @@ TEXT libc_getcwd_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_getcwd_trampoline_addr(SB), RODATA, $8
 DATA	·libc_getcwd_trampoline_addr(SB)/8, $libc_getcwd_trampoline<>(SB)
 
+TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_getresuid(SB)
+GLOBL	·libc_getresuid_trampoline_addr(SB), RODATA, $8
+DATA	·libc_getresuid_trampoline_addr(SB)/8, $libc_getresuid_trampoline<>(SB)
+
+TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_getresgid(SB)
+GLOBL	·libc_getresgid_trampoline_addr(SB), RODATA, $8
+DATA	·libc_getresgid_trampoline_addr(SB)/8, $libc_getresgid_trampoline<>(SB)
+
 TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_ioctl(SB)
 GLOBL	·libc_ioctl_trampoline_addr(SB), RODATA, $8
@@ -573,11 +583,6 @@ TEXT libc_setresuid_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_setresuid_trampoline_addr(SB), RODATA, $8
 DATA	·libc_setresuid_trampoline_addr(SB)/8, $libc_setresuid_trampoline<>(SB)
 
-TEXT libc_setrlimit_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_setrlimit(SB)
-GLOBL	·libc_setrlimit_trampoline_addr(SB), RODATA, $8
-DATA	·libc_setrlimit_trampoline_addr(SB)/8, $libc_setrlimit_trampoline<>(SB)
-
 TEXT libc_setrtable_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_setrtable(SB)
 GLOBL	·libc_setrtable_trampoline_addr(SB), RODATA, $8
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 4873a1e5..609d1c59 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
@@ -110,7 +110,6 @@ import (
 //go:cgo_import_dynamic libc_setpriority setpriority "libc.so"
 //go:cgo_import_dynamic libc_setregid setregid "libc.so"
 //go:cgo_import_dynamic libc_setreuid setreuid "libc.so"
-//go:cgo_import_dynamic libc_setrlimit setrlimit "libc.so"
 //go:cgo_import_dynamic libc_setsid setsid "libc.so"
 //go:cgo_import_dynamic libc_setuid setuid "libc.so"
 //go:cgo_import_dynamic libc_shutdown shutdown "libsocket.so"
@@ -250,7 +249,6 @@ import (
 //go:linkname procSetpriority libc_setpriority
 //go:linkname procSetregid libc_setregid
 //go:linkname procSetreuid libc_setreuid
-//go:linkname procSetrlimit libc_setrlimit
 //go:linkname procSetsid libc_setsid
 //go:linkname procSetuid libc_setuid
 //go:linkname procshutdown libc_shutdown
@@ -391,7 +389,6 @@ var (
 	procSetpriority,
 	procSetregid,
 	procSetreuid,
-	procSetrlimit,
 	procSetsid,
 	procSetuid,
 	procshutdown,
@@ -646,7 +643,7 @@ func __minor(version int, dev uint64) (val uint) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctlRet(fd int, req uint, arg uintptr) (ret int, err error) {
+func ioctlRet(fd int, req int, arg uintptr) (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 {
@@ -657,7 +654,7 @@ 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) {
+func ioctlPtrRet(fd int, req int, 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 {
@@ -1650,16 +1647,6 @@ func Setreuid(ruid int, euid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetrlimit)), 2, uintptr(which), uintptr(unsafe.Pointer(lim)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setsid() (pid int, err error) {
 	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetsid)), 0, 0, 0, 0, 0, 0, 0)
 	pid = 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 07bfe2ef..c3168174 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go
@@ -257,7 +257,7 @@ func munmap(addr uintptr, length uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func ioctl(fd int, req uint, arg uintptr) (err error) {
+func ioctl(fd int, req int, arg uintptr) (err error) {
 	_, _, e1 := syscall_syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -267,7 +267,7 @@ 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) {
+func ioctlPtr(fd int, req int, arg unsafe.Pointer) (err error) {
 	_, _, e1 := syscall_syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
 	if e1 != 0 {
 		err = errnoErr(e1)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
index 3e594a8c..ef285c56 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
@@ -251,6 +251,8 @@ const (
 	SYS_ACCEPT4                 = 242
 	SYS_RECVMMSG                = 243
 	SYS_ARCH_SPECIFIC_SYSCALL   = 244
+	SYS_RISCV_HWPROBE           = 258
+	SYS_RISCV_FLUSH_ICACHE      = 259
 	SYS_WAIT4                   = 260
 	SYS_PRLIMIT64               = 261
 	SYS_FANOTIFY_INIT           = 262
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
index 7ea46520..e6ed7d63 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
@@ -372,6 +372,7 @@ const (
 	SYS_LANDLOCK_CREATE_RULESET = 444
 	SYS_LANDLOCK_ADD_RULE       = 445
 	SYS_LANDLOCK_RESTRICT_SELF  = 446
+	SYS_MEMFD_SECRET            = 447
 	SYS_PROCESS_MRELEASE        = 448
 	SYS_FUTEX_WAITV             = 449
 	SYS_SET_MEMPOLICY_HOME_NODE = 450
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
index e2a64f09..690cefc3 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
@@ -151,6 +151,16 @@ type Dirent struct {
 	_       [3]byte
 }
 
+type Attrlist struct {
+	Bitmapcount uint16
+	Reserved    uint16
+	Commonattr  uint32
+	Volattr     uint32
+	Dirattr     uint32
+	Fileattr    uint32
+	Forkattr    uint32
+}
+
 const (
 	PathMax = 0x400
 )
@@ -610,6 +620,7 @@ const (
 	AT_REMOVEDIR        = 0x80
 	AT_SYMLINK_FOLLOW   = 0x40
 	AT_SYMLINK_NOFOLLOW = 0x20
+	AT_EACCESS          = 0x10
 )
 
 type PollFd struct {
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
index 34aa7752..5bffc10e 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
@@ -151,6 +151,16 @@ type Dirent struct {
 	_       [3]byte
 }
 
+type Attrlist struct {
+	Bitmapcount uint16
+	Reserved    uint16
+	Commonattr  uint32
+	Volattr     uint32
+	Dirattr     uint32
+	Fileattr    uint32
+	Forkattr    uint32
+}
+
 const (
 	PathMax = 0x400
 )
@@ -610,6 +620,7 @@ const (
 	AT_REMOVEDIR        = 0x80
 	AT_SYMLINK_FOLLOW   = 0x40
 	AT_SYMLINK_NOFOLLOW = 0x20
+	AT_EACCESS          = 0x10
 )
 
 type PollFd struct {
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux.go b/vendor/golang.org/x/sys/unix/ztypes_linux.go
index ca84727c..26ef52aa 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux.go
@@ -866,6 +866,11 @@ const (
 	POLLNVAL = 0x20
 )
 
+type sigset_argpack struct {
+	ss    *Sigset_t
+	ssLen uintptr
+}
+
 type SignalfdSiginfo struct {
 	Signo     uint32
 	Errno     int32
@@ -1538,6 +1543,10 @@ const (
 	IFLA_GRO_MAX_SIZE                          = 0x3a
 	IFLA_TSO_MAX_SIZE                          = 0x3b
 	IFLA_TSO_MAX_SEGS                          = 0x3c
+	IFLA_ALLMULTI                              = 0x3d
+	IFLA_DEVLINK_PORT                          = 0x3e
+	IFLA_GSO_IPV4_MAX_SIZE                     = 0x3f
+	IFLA_GRO_IPV4_MAX_SIZE                     = 0x40
 	IFLA_PROTO_DOWN_REASON_UNSPEC              = 0x0
 	IFLA_PROTO_DOWN_REASON_MASK                = 0x1
 	IFLA_PROTO_DOWN_REASON_VALUE               = 0x2
@@ -1968,7 +1977,7 @@ const (
 	NFT_MSG_GETFLOWTABLE              = 0x17
 	NFT_MSG_DELFLOWTABLE              = 0x18
 	NFT_MSG_GETRULE_RESET             = 0x19
-	NFT_MSG_MAX                       = 0x1a
+	NFT_MSG_MAX                       = 0x21
 	NFTA_LIST_UNSPEC                  = 0x0
 	NFTA_LIST_ELEM                    = 0x1
 	NFTA_HOOK_UNSPEC                  = 0x0
@@ -2555,6 +2564,11 @@ const (
 	BPF_REG_8                                  = 0x8
 	BPF_REG_9                                  = 0x9
 	BPF_REG_10                                 = 0xa
+	BPF_CGROUP_ITER_ORDER_UNSPEC               = 0x0
+	BPF_CGROUP_ITER_SELF_ONLY                  = 0x1
+	BPF_CGROUP_ITER_DESCENDANTS_PRE            = 0x2
+	BPF_CGROUP_ITER_DESCENDANTS_POST           = 0x3
+	BPF_CGROUP_ITER_ANCESTORS_UP               = 0x4
 	BPF_MAP_CREATE                             = 0x0
 	BPF_MAP_LOOKUP_ELEM                        = 0x1
 	BPF_MAP_UPDATE_ELEM                        = 0x2
@@ -2566,6 +2580,7 @@ const (
 	BPF_PROG_ATTACH                            = 0x8
 	BPF_PROG_DETACH                            = 0x9
 	BPF_PROG_TEST_RUN                          = 0xa
+	BPF_PROG_RUN                               = 0xa
 	BPF_PROG_GET_NEXT_ID                       = 0xb
 	BPF_MAP_GET_NEXT_ID                        = 0xc
 	BPF_PROG_GET_FD_BY_ID                      = 0xd
@@ -2610,6 +2625,7 @@ const (
 	BPF_MAP_TYPE_CPUMAP                        = 0x10
 	BPF_MAP_TYPE_XSKMAP                        = 0x11
 	BPF_MAP_TYPE_SOCKHASH                      = 0x12
+	BPF_MAP_TYPE_CGROUP_STORAGE_DEPRECATED     = 0x13
 	BPF_MAP_TYPE_CGROUP_STORAGE                = 0x13
 	BPF_MAP_TYPE_REUSEPORT_SOCKARRAY           = 0x14
 	BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE         = 0x15
@@ -2620,6 +2636,10 @@ const (
 	BPF_MAP_TYPE_STRUCT_OPS                    = 0x1a
 	BPF_MAP_TYPE_RINGBUF                       = 0x1b
 	BPF_MAP_TYPE_INODE_STORAGE                 = 0x1c
+	BPF_MAP_TYPE_TASK_STORAGE                  = 0x1d
+	BPF_MAP_TYPE_BLOOM_FILTER                  = 0x1e
+	BPF_MAP_TYPE_USER_RINGBUF                  = 0x1f
+	BPF_MAP_TYPE_CGRP_STORAGE                  = 0x20
 	BPF_PROG_TYPE_UNSPEC                       = 0x0
 	BPF_PROG_TYPE_SOCKET_FILTER                = 0x1
 	BPF_PROG_TYPE_KPROBE                       = 0x2
@@ -2651,6 +2671,7 @@ const (
 	BPF_PROG_TYPE_EXT                          = 0x1c
 	BPF_PROG_TYPE_LSM                          = 0x1d
 	BPF_PROG_TYPE_SK_LOOKUP                    = 0x1e
+	BPF_PROG_TYPE_SYSCALL                      = 0x1f
 	BPF_CGROUP_INET_INGRESS                    = 0x0
 	BPF_CGROUP_INET_EGRESS                     = 0x1
 	BPF_CGROUP_INET_SOCK_CREATE                = 0x2
@@ -2689,6 +2710,12 @@ const (
 	BPF_XDP_CPUMAP                             = 0x23
 	BPF_SK_LOOKUP                              = 0x24
 	BPF_XDP                                    = 0x25
+	BPF_SK_SKB_VERDICT                         = 0x26
+	BPF_SK_REUSEPORT_SELECT                    = 0x27
+	BPF_SK_REUSEPORT_SELECT_OR_MIGRATE         = 0x28
+	BPF_PERF_EVENT                             = 0x29
+	BPF_TRACE_KPROBE_MULTI                     = 0x2a
+	BPF_LSM_CGROUP                             = 0x2b
 	BPF_LINK_TYPE_UNSPEC                       = 0x0
 	BPF_LINK_TYPE_RAW_TRACEPOINT               = 0x1
 	BPF_LINK_TYPE_TRACING                      = 0x2
@@ -2696,6 +2723,9 @@ const (
 	BPF_LINK_TYPE_ITER                         = 0x4
 	BPF_LINK_TYPE_NETNS                        = 0x5
 	BPF_LINK_TYPE_XDP                          = 0x6
+	BPF_LINK_TYPE_PERF_EVENT                   = 0x7
+	BPF_LINK_TYPE_KPROBE_MULTI                 = 0x8
+	BPF_LINK_TYPE_STRUCT_OPS                   = 0x9
 	BPF_ANY                                    = 0x0
 	BPF_NOEXIST                                = 0x1
 	BPF_EXIST                                  = 0x2
@@ -2733,6 +2763,7 @@ const (
 	BPF_F_ZERO_CSUM_TX                         = 0x2
 	BPF_F_DONT_FRAGMENT                        = 0x4
 	BPF_F_SEQ_NUMBER                           = 0x8
+	BPF_F_TUNINFO_FLAGS                        = 0x10
 	BPF_F_INDEX_MASK                           = 0xffffffff
 	BPF_F_CURRENT_CPU                          = 0xffffffff
 	BPF_F_CTXLEN_MASK                          = 0xfffff00000000
@@ -2747,6 +2778,7 @@ const (
 	BPF_F_ADJ_ROOM_ENCAP_L4_GRE                = 0x8
 	BPF_F_ADJ_ROOM_ENCAP_L4_UDP                = 0x10
 	BPF_F_ADJ_ROOM_NO_CSUM_RESET               = 0x20
+	BPF_F_ADJ_ROOM_ENCAP_L2_ETH                = 0x40
 	BPF_ADJ_ROOM_ENCAP_L2_MASK                 = 0xff
 	BPF_ADJ_ROOM_ENCAP_L2_SHIFT                = 0x38
 	BPF_F_SYSCTL_BASE_NAME                     = 0x1
@@ -2771,10 +2803,16 @@ const (
 	BPF_LWT_ENCAP_SEG6                         = 0x0
 	BPF_LWT_ENCAP_SEG6_INLINE                  = 0x1
 	BPF_LWT_ENCAP_IP                           = 0x2
+	BPF_F_BPRM_SECUREEXEC                      = 0x1
+	BPF_F_BROADCAST                            = 0x8
+	BPF_F_EXCLUDE_INGRESS                      = 0x10
+	BPF_SKB_TSTAMP_UNSPEC                      = 0x0
+	BPF_SKB_TSTAMP_DELIVERY_MONO               = 0x1
 	BPF_OK                                     = 0x0
 	BPF_DROP                                   = 0x2
 	BPF_REDIRECT                               = 0x7
 	BPF_LWT_REROUTE                            = 0x80
+	BPF_FLOW_DISSECTOR_CONTINUE                = 0x81
 	BPF_SOCK_OPS_RTO_CB_FLAG                   = 0x1
 	BPF_SOCK_OPS_RETRANS_CB_FLAG               = 0x2
 	BPF_SOCK_OPS_STATE_CB_FLAG                 = 0x4
@@ -2838,6 +2876,10 @@ const (
 	BPF_FIB_LKUP_RET_UNSUPP_LWT                = 0x6
 	BPF_FIB_LKUP_RET_NO_NEIGH                  = 0x7
 	BPF_FIB_LKUP_RET_FRAG_NEEDED               = 0x8
+	BPF_MTU_CHK_SEGS                           = 0x1
+	BPF_MTU_CHK_RET_SUCCESS                    = 0x0
+	BPF_MTU_CHK_RET_FRAG_NEEDED                = 0x1
+	BPF_MTU_CHK_RET_SEGS_TOOBIG                = 0x2
 	BPF_FD_TYPE_RAW_TRACEPOINT                 = 0x0
 	BPF_FD_TYPE_TRACEPOINT                     = 0x1
 	BPF_FD_TYPE_KPROBE                         = 0x2
@@ -2847,6 +2889,19 @@ const (
 	BPF_FLOW_DISSECTOR_F_PARSE_1ST_FRAG        = 0x1
 	BPF_FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL    = 0x2
 	BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP         = 0x4
+	BPF_CORE_FIELD_BYTE_OFFSET                 = 0x0
+	BPF_CORE_FIELD_BYTE_SIZE                   = 0x1
+	BPF_CORE_FIELD_EXISTS                      = 0x2
+	BPF_CORE_FIELD_SIGNED                      = 0x3
+	BPF_CORE_FIELD_LSHIFT_U64                  = 0x4
+	BPF_CORE_FIELD_RSHIFT_U64                  = 0x5
+	BPF_CORE_TYPE_ID_LOCAL                     = 0x6
+	BPF_CORE_TYPE_ID_TARGET                    = 0x7
+	BPF_CORE_TYPE_EXISTS                       = 0x8
+	BPF_CORE_TYPE_SIZE                         = 0x9
+	BPF_CORE_ENUMVAL_EXISTS                    = 0xa
+	BPF_CORE_ENUMVAL_VALUE                     = 0xb
+	BPF_CORE_TYPE_MATCHES                      = 0xc
 )
 
 const (
@@ -3605,7 +3660,7 @@ const (
 	ETHTOOL_MSG_PSE_GET                       = 0x24
 	ETHTOOL_MSG_PSE_SET                       = 0x25
 	ETHTOOL_MSG_RSS_GET                       = 0x26
-	ETHTOOL_MSG_USER_MAX                      = 0x26
+	ETHTOOL_MSG_USER_MAX                      = 0x2b
 	ETHTOOL_MSG_KERNEL_NONE                   = 0x0
 	ETHTOOL_MSG_STRSET_GET_REPLY              = 0x1
 	ETHTOOL_MSG_LINKINFO_GET_REPLY            = 0x2
@@ -3645,7 +3700,7 @@ const (
 	ETHTOOL_MSG_MODULE_NTF                    = 0x24
 	ETHTOOL_MSG_PSE_GET_REPLY                 = 0x25
 	ETHTOOL_MSG_RSS_GET_REPLY                 = 0x26
-	ETHTOOL_MSG_KERNEL_MAX                    = 0x26
+	ETHTOOL_MSG_KERNEL_MAX                    = 0x2b
 	ETHTOOL_A_HEADER_UNSPEC                   = 0x0
 	ETHTOOL_A_HEADER_DEV_INDEX                = 0x1
 	ETHTOOL_A_HEADER_DEV_NAME                 = 0x2
@@ -3749,7 +3804,7 @@ const (
 	ETHTOOL_A_RINGS_TCP_DATA_SPLIT            = 0xb
 	ETHTOOL_A_RINGS_CQE_SIZE                  = 0xc
 	ETHTOOL_A_RINGS_TX_PUSH                   = 0xd
-	ETHTOOL_A_RINGS_MAX                       = 0xd
+	ETHTOOL_A_RINGS_MAX                       = 0x10
 	ETHTOOL_A_CHANNELS_UNSPEC                 = 0x0
 	ETHTOOL_A_CHANNELS_HEADER                 = 0x1
 	ETHTOOL_A_CHANNELS_RX_MAX                 = 0x2
@@ -3787,14 +3842,14 @@ const (
 	ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL   = 0x17
 	ETHTOOL_A_COALESCE_USE_CQE_MODE_TX        = 0x18
 	ETHTOOL_A_COALESCE_USE_CQE_MODE_RX        = 0x19
-	ETHTOOL_A_COALESCE_MAX                    = 0x19
+	ETHTOOL_A_COALESCE_MAX                    = 0x1c
 	ETHTOOL_A_PAUSE_UNSPEC                    = 0x0
 	ETHTOOL_A_PAUSE_HEADER                    = 0x1
 	ETHTOOL_A_PAUSE_AUTONEG                   = 0x2
 	ETHTOOL_A_PAUSE_RX                        = 0x3
 	ETHTOOL_A_PAUSE_TX                        = 0x4
 	ETHTOOL_A_PAUSE_STATS                     = 0x5
-	ETHTOOL_A_PAUSE_MAX                       = 0x5
+	ETHTOOL_A_PAUSE_MAX                       = 0x6
 	ETHTOOL_A_PAUSE_STAT_UNSPEC               = 0x0
 	ETHTOOL_A_PAUSE_STAT_PAD                  = 0x1
 	ETHTOOL_A_PAUSE_STAT_TX_FRAMES            = 0x2
@@ -4444,7 +4499,7 @@ const (
 	NL80211_ATTR_MAC_HINT                                   = 0xc8
 	NL80211_ATTR_MAC_MASK                                   = 0xd7
 	NL80211_ATTR_MAX_AP_ASSOC_STA                           = 0xca
-	NL80211_ATTR_MAX                                        = 0x141
+	NL80211_ATTR_MAX                                        = 0x145
 	NL80211_ATTR_MAX_CRIT_PROT_DURATION                     = 0xb4
 	NL80211_ATTR_MAX_CSA_COUNTERS                           = 0xce
 	NL80211_ATTR_MAX_MATCH_SETS                             = 0x85
@@ -4673,7 +4728,7 @@ const (
 	NL80211_BAND_ATTR_HT_CAPA                               = 0x4
 	NL80211_BAND_ATTR_HT_MCS_SET                            = 0x3
 	NL80211_BAND_ATTR_IFTYPE_DATA                           = 0x9
-	NL80211_BAND_ATTR_MAX                                   = 0xb
+	NL80211_BAND_ATTR_MAX                                   = 0xd
 	NL80211_BAND_ATTR_RATES                                 = 0x2
 	NL80211_BAND_ATTR_VHT_CAPA                              = 0x8
 	NL80211_BAND_ATTR_VHT_MCS_SET                           = 0x7
@@ -4814,7 +4869,7 @@ const (
 	NL80211_CMD_LEAVE_IBSS                                  = 0x2c
 	NL80211_CMD_LEAVE_MESH                                  = 0x45
 	NL80211_CMD_LEAVE_OCB                                   = 0x6d
-	NL80211_CMD_MAX                                         = 0x98
+	NL80211_CMD_MAX                                         = 0x99
 	NL80211_CMD_MICHAEL_MIC_FAILURE                         = 0x29
 	NL80211_CMD_MODIFY_LINK_STA                             = 0x97
 	NL80211_CMD_NAN_MATCH                                   = 0x78
@@ -5795,6 +5850,8 @@ const (
 	TUN_F_TSO6    = 0x4
 	TUN_F_TSO_ECN = 0x8
 	TUN_F_UFO     = 0x10
+	TUN_F_USO4    = 0x20
+	TUN_F_USO6    = 0x40
 )
 
 const (
@@ -5804,9 +5861,10 @@ const (
 )
 
 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
+	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_UDP_L4 = 0x5
+	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 4ecc1495..6d8acbcc 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
@@ -337,6 +337,8 @@ type Taskstats struct {
 	Ac_exe_inode              uint64
 	Wpcopy_count              uint64
 	Wpcopy_delay_total        uint64
+	Irq_count                 uint64
+	Irq_delay_total           uint64
 }
 
 type cpuMask 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 34fddff9..59293c68 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
@@ -350,6 +350,8 @@ type Taskstats struct {
 	Ac_exe_inode              uint64
 	Wpcopy_count              uint64
 	Wpcopy_delay_total        uint64
+	Irq_count                 uint64
+	Irq_delay_total           uint64
 }
 
 type cpuMask 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 3b14a603..40cfa38c 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
@@ -328,6 +328,8 @@ type Taskstats struct {
 	Ac_exe_inode              uint64
 	Wpcopy_count              uint64
 	Wpcopy_delay_total        uint64
+	Irq_count                 uint64
+	Irq_delay_total           uint64
 }
 
 type cpuMask 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 0517651a..055bc421 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
@@ -329,6 +329,8 @@ type Taskstats struct {
 	Ac_exe_inode              uint64
 	Wpcopy_count              uint64
 	Wpcopy_delay_total        uint64
+	Irq_count                 uint64
+	Irq_delay_total           uint64
 }
 
 type cpuMask 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 3b0c5181..f28affbc 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
@@ -330,6 +330,8 @@ type Taskstats struct {
 	Ac_exe_inode              uint64
 	Wpcopy_count              uint64
 	Wpcopy_delay_total        uint64
+	Irq_count                 uint64
+	Irq_delay_total           uint64
 }
 
 type cpuMask 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 fccdf4dd..9d71e7cc 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
@@ -333,6 +333,8 @@ type Taskstats struct {
 	Ac_exe_inode              uint64
 	Wpcopy_count              uint64
 	Wpcopy_delay_total        uint64
+	Irq_count                 uint64
+	Irq_delay_total           uint64
 }
 
 type cpuMask 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 500de8fc..fd5ccd33 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
@@ -332,6 +332,8 @@ type Taskstats struct {
 	Ac_exe_inode              uint64
 	Wpcopy_count              uint64
 	Wpcopy_delay_total        uint64
+	Irq_count                 uint64
+	Irq_delay_total           uint64
 }
 
 type cpuMask 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 d0434cd2..7704de77 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
@@ -332,6 +332,8 @@ type Taskstats struct {
 	Ac_exe_inode              uint64
 	Wpcopy_count              uint64
 	Wpcopy_delay_total        uint64
+	Irq_count                 uint64
+	Irq_delay_total           uint64
 }
 
 type cpuMask 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 84206ba5..df00b875 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
@@ -333,6 +333,8 @@ type Taskstats struct {
 	Ac_exe_inode              uint64
 	Wpcopy_count              uint64
 	Wpcopy_delay_total        uint64
+	Irq_count                 uint64
+	Irq_delay_total           uint64
 }
 
 type cpuMask 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 ab078cf1..0942840d 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
@@ -340,6 +340,8 @@ type Taskstats struct {
 	Ac_exe_inode              uint64
 	Wpcopy_count              uint64
 	Wpcopy_delay_total        uint64
+	Irq_count                 uint64
+	Irq_delay_total           uint64
 }
 
 type cpuMask 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 42eb2c4c..03487439 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
@@ -339,6 +339,8 @@ type Taskstats struct {
 	Ac_exe_inode              uint64
 	Wpcopy_count              uint64
 	Wpcopy_delay_total        uint64
+	Irq_count                 uint64
+	Irq_delay_total           uint64
 }
 
 type cpuMask 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 31304a4e..bad06704 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
@@ -339,6 +339,8 @@ type Taskstats struct {
 	Ac_exe_inode              uint64
 	Wpcopy_count              uint64
 	Wpcopy_delay_total        uint64
+	Irq_count                 uint64
+	Irq_delay_total           uint64
 }
 
 type cpuMask 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 c311f961..83c69c11 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
@@ -357,6 +357,8 @@ type Taskstats struct {
 	Ac_exe_inode              uint64
 	Wpcopy_count              uint64
 	Wpcopy_delay_total        uint64
+	Irq_count                 uint64
+	Irq_delay_total           uint64
 }
 
 type cpuMask uint64
@@ -716,3 +718,26 @@ type SysvShmDesc struct {
 	_      uint64
 	_      uint64
 }
+
+type RISCVHWProbePairs struct {
+	Key   int64
+	Value uint64
+}
+
+const (
+	RISCV_HWPROBE_KEY_MVENDORID          = 0x0
+	RISCV_HWPROBE_KEY_MARCHID            = 0x1
+	RISCV_HWPROBE_KEY_MIMPID             = 0x2
+	RISCV_HWPROBE_KEY_BASE_BEHAVIOR      = 0x3
+	RISCV_HWPROBE_BASE_BEHAVIOR_IMA      = 0x1
+	RISCV_HWPROBE_KEY_IMA_EXT_0          = 0x4
+	RISCV_HWPROBE_IMA_FD                 = 0x1
+	RISCV_HWPROBE_IMA_C                  = 0x2
+	RISCV_HWPROBE_KEY_CPUPERF_0          = 0x5
+	RISCV_HWPROBE_MISALIGNED_UNKNOWN     = 0x0
+	RISCV_HWPROBE_MISALIGNED_EMULATED    = 0x1
+	RISCV_HWPROBE_MISALIGNED_SLOW        = 0x2
+	RISCV_HWPROBE_MISALIGNED_FAST        = 0x3
+	RISCV_HWPROBE_MISALIGNED_UNSUPPORTED = 0x4
+	RISCV_HWPROBE_MISALIGNED_MASK        = 0x7
+)
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 bba3cefa..aa268d02 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
@@ -352,6 +352,8 @@ type Taskstats struct {
 	Ac_exe_inode              uint64
 	Wpcopy_count              uint64
 	Wpcopy_delay_total        uint64
+	Irq_count                 uint64
+	Irq_delay_total           uint64
 }
 
 type cpuMask 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 ad8a0138..444045b6 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
@@ -334,6 +334,8 @@ type Taskstats struct {
 	Ac_exe_inode              uint64
 	Wpcopy_count              uint64
 	Wpcopy_delay_total        uint64
+	Irq_count                 uint64
+	Irq_delay_total           uint64
 }
 
 type cpuMask uint64
diff --git a/vendor/golang.org/x/sys/windows/env_windows.go b/vendor/golang.org/x/sys/windows/env_windows.go
index 92ac05ff..b8ad1925 100644
--- a/vendor/golang.org/x/sys/windows/env_windows.go
+++ b/vendor/golang.org/x/sys/windows/env_windows.go
@@ -37,14 +37,14 @@ func (token Token) Environ(inheritExisting bool) (env []string, err error) {
 		return nil, err
 	}
 	defer DestroyEnvironmentBlock(block)
-	blockp := uintptr(unsafe.Pointer(block))
+	blockp := unsafe.Pointer(block)
 	for {
-		entry := UTF16PtrToString((*uint16)(unsafe.Pointer(blockp)))
+		entry := UTF16PtrToString((*uint16)(blockp))
 		if len(entry) == 0 {
 			break
 		}
 		env = append(env, entry)
-		blockp += 2 * (uintptr(len(entry)) + 1)
+		blockp = unsafe.Add(blockp, 2*(len(entry)+1))
 	}
 	return env, nil
 }
diff --git a/vendor/golang.org/x/sys/windows/exec_windows.go b/vendor/golang.org/x/sys/windows/exec_windows.go
index 75980fd4..a52e0331 100644
--- a/vendor/golang.org/x/sys/windows/exec_windows.go
+++ b/vendor/golang.org/x/sys/windows/exec_windows.go
@@ -95,12 +95,17 @@ func ComposeCommandLine(args []string) string {
 // DecomposeCommandLine breaks apart its argument command line into unescaped parts using CommandLineToArgv,
 // as gathered from GetCommandLine, QUERY_SERVICE_CONFIG's BinaryPathName argument, or elsewhere that
 // command lines are passed around.
+// DecomposeCommandLine returns error if commandLine contains NUL.
 func DecomposeCommandLine(commandLine string) ([]string, error) {
 	if len(commandLine) == 0 {
 		return []string{}, nil
 	}
+	utf16CommandLine, err := UTF16FromString(commandLine)
+	if err != nil {
+		return nil, errorspkg.New("string with NUL passed to DecomposeCommandLine")
+	}
 	var argc int32
-	argv, err := CommandLineToArgv(StringToUTF16Ptr(commandLine), &argc)
+	argv, err := CommandLineToArgv(&utf16CommandLine[0], &argc)
 	if err != nil {
 		return nil, err
 	}
diff --git a/vendor/golang.org/x/sys/windows/service.go b/vendor/golang.org/x/sys/windows/service.go
index f8deca83..c44a1b96 100644
--- a/vendor/golang.org/x/sys/windows/service.go
+++ b/vendor/golang.org/x/sys/windows/service.go
@@ -141,6 +141,12 @@ const (
 	SERVICE_DYNAMIC_INFORMATION_LEVEL_START_REASON = 1
 )
 
+type ENUM_SERVICE_STATUS struct {
+	ServiceName   *uint16
+	DisplayName   *uint16
+	ServiceStatus SERVICE_STATUS
+}
+
 type SERVICE_STATUS struct {
 	ServiceType             uint32
 	CurrentState            uint32
@@ -212,6 +218,10 @@ type SERVICE_FAILURE_ACTIONS struct {
 	Actions      *SC_ACTION
 }
 
+type SERVICE_FAILURE_ACTIONS_FLAG struct {
+	FailureActionsOnNonCrashFailures int32
+}
+
 type SC_ACTION struct {
 	Type  uint32
 	Delay uint32
@@ -245,3 +255,4 @@ type QUERY_SERVICE_LOCK_STATUS struct {
 //sys	UnsubscribeServiceChangeNotifications(subscription uintptr) = sechost.UnsubscribeServiceChangeNotifications?
 //sys	RegisterServiceCtrlHandlerEx(serviceName *uint16, handlerProc uintptr, context uintptr) (handle Handle, err error) = advapi32.RegisterServiceCtrlHandlerExW
 //sys	QueryServiceDynamicInformation(service Handle, infoLevel uint32, dynamicInfo unsafe.Pointer) (err error) = advapi32.QueryServiceDynamicInformation?
+//sys	EnumDependentServices(service Handle, activityState uint32, services *ENUM_SERVICE_STATUS, buffSize uint32, bytesNeeded *uint32, servicesReturned *uint32) (err error) = advapi32.EnumDependentServicesW
diff --git a/vendor/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go
index 3723b2c2..373d1638 100644
--- a/vendor/golang.org/x/sys/windows/syscall_windows.go
+++ b/vendor/golang.org/x/sys/windows/syscall_windows.go
@@ -135,14 +135,14 @@ func Getpagesize() int { return 4096 }
 
 // NewCallback converts a Go function to a function pointer conforming to the stdcall calling convention.
 // This is useful when interoperating with Windows code requiring callbacks.
-// The argument is expected to be a function with with one uintptr-sized result. The function must not have arguments with size larger than the size of uintptr.
+// The argument is expected to be a function with one uintptr-sized result. The function must not have arguments with size larger than the size of uintptr.
 func NewCallback(fn interface{}) uintptr {
 	return syscall.NewCallback(fn)
 }
 
 // NewCallbackCDecl converts a Go function to a function pointer conforming to the cdecl calling convention.
 // This is useful when interoperating with Windows code requiring callbacks.
-// The argument is expected to be a function with with one uintptr-sized result. The function must not have arguments with size larger than the size of uintptr.
+// The argument is expected to be a function with one uintptr-sized result. The function must not have arguments with size larger than the size of uintptr.
 func NewCallbackCDecl(fn interface{}) uintptr {
 	return syscall.NewCallbackCDecl(fn)
 }
@@ -405,7 +405,7 @@ func NewCallbackCDecl(fn interface{}) uintptr {
 //sys	VerQueryValue(block unsafe.Pointer, subBlock string, pointerToBufferPointer unsafe.Pointer, bufSize *uint32) (err error) = version.VerQueryValueW
 
 // Process Status API (PSAPI)
-//sys	EnumProcesses(processIds []uint32, bytesReturned *uint32) (err error) = psapi.EnumProcesses
+//sys	enumProcesses(processIds *uint32, nSize uint32, bytesReturned *uint32) (err error) = psapi.EnumProcesses
 //sys	EnumProcessModules(process Handle, module *Handle, cb uint32, cbNeeded *uint32) (err error) = psapi.EnumProcessModules
 //sys	EnumProcessModulesEx(process Handle, module *Handle, cb uint32, cbNeeded *uint32, filterFlag uint32) (err error) = psapi.EnumProcessModulesEx
 //sys	GetModuleInformation(process Handle, module Handle, modinfo *ModuleInfo, cb uint32) (err error) = psapi.GetModuleInformation
@@ -1354,6 +1354,17 @@ func SetsockoptIPv6Mreq(fd Handle, level, opt int, mreq *IPv6Mreq) (err error) {
 	return syscall.EWINDOWS
 }
 
+func EnumProcesses(processIds []uint32, bytesReturned *uint32) error {
+	// EnumProcesses syscall expects the size parameter to be in bytes, but the code generated with mksyscall uses
+	// the length of the processIds slice instead. Hence, this wrapper function is added to fix the discrepancy.
+	var p *uint32
+	if len(processIds) > 0 {
+		p = &processIds[0]
+	}
+	size := uint32(len(processIds) * 4)
+	return enumProcesses(p, size, bytesReturned)
+}
+
 func Getpid() (pid int) { return int(GetCurrentProcessId()) }
 
 func FindFirstFile(name *uint16, data *Win32finddata) (handle Handle, err error) {
diff --git a/vendor/golang.org/x/sys/windows/types_windows.go b/vendor/golang.org/x/sys/windows/types_windows.go
index 857acf10..88e62a63 100644
--- a/vendor/golang.org/x/sys/windows/types_windows.go
+++ b/vendor/golang.org/x/sys/windows/types_windows.go
@@ -2220,19 +2220,23 @@ type JOBOBJECT_BASIC_UI_RESTRICTIONS struct {
 }
 
 const (
-	// JobObjectInformationClass
+	// JobObjectInformationClass for QueryInformationJobObject and SetInformationJobObject
 	JobObjectAssociateCompletionPortInformation = 7
+	JobObjectBasicAccountingInformation         = 1
+	JobObjectBasicAndIoAccountingInformation    = 8
 	JobObjectBasicLimitInformation              = 2
+	JobObjectBasicProcessIdList                 = 3
 	JobObjectBasicUIRestrictions                = 4
 	JobObjectCpuRateControlInformation          = 15
 	JobObjectEndOfJobTimeInformation            = 6
 	JobObjectExtendedLimitInformation           = 9
 	JobObjectGroupInformation                   = 11
 	JobObjectGroupInformationEx                 = 14
-	JobObjectLimitViolationInformation2         = 35
+	JobObjectLimitViolationInformation          = 13
+	JobObjectLimitViolationInformation2         = 34
 	JobObjectNetRateControlInformation          = 32
 	JobObjectNotificationLimitInformation       = 12
-	JobObjectNotificationLimitInformation2      = 34
+	JobObjectNotificationLimitInformation2      = 33
 	JobObjectSecurityLimitInformation           = 5
 )
 
diff --git a/vendor/golang.org/x/sys/windows/zsyscall_windows.go b/vendor/golang.org/x/sys/windows/zsyscall_windows.go
index 6d2a2685..566dd3e3 100644
--- a/vendor/golang.org/x/sys/windows/zsyscall_windows.go
+++ b/vendor/golang.org/x/sys/windows/zsyscall_windows.go
@@ -86,6 +86,7 @@ var (
 	procDeleteService                                        = modadvapi32.NewProc("DeleteService")
 	procDeregisterEventSource                                = modadvapi32.NewProc("DeregisterEventSource")
 	procDuplicateTokenEx                                     = modadvapi32.NewProc("DuplicateTokenEx")
+	procEnumDependentServicesW                               = modadvapi32.NewProc("EnumDependentServicesW")
 	procEnumServicesStatusExW                                = modadvapi32.NewProc("EnumServicesStatusExW")
 	procEqualSid                                             = modadvapi32.NewProc("EqualSid")
 	procFreeSid                                              = modadvapi32.NewProc("FreeSid")
@@ -734,6 +735,14 @@ func DuplicateTokenEx(existingToken Token, desiredAccess uint32, tokenAttributes
 	return
 }
 
+func EnumDependentServices(service Handle, activityState uint32, services *ENUM_SERVICE_STATUS, buffSize uint32, bytesNeeded *uint32, servicesReturned *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall6(procEnumDependentServicesW.Addr(), 6, uintptr(service), uintptr(activityState), uintptr(unsafe.Pointer(services)), uintptr(buffSize), uintptr(unsafe.Pointer(bytesNeeded)), uintptr(unsafe.Pointer(servicesReturned)))
+	if r1 == 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
 func EnumServicesStatusEx(mgr Handle, infoLevel uint32, serviceType uint32, serviceState uint32, services *byte, bufSize uint32, bytesNeeded *uint32, servicesReturned *uint32, resumeHandle *uint32, groupName *uint16) (err error) {
 	r1, _, e1 := syscall.Syscall12(procEnumServicesStatusExW.Addr(), 10, uintptr(mgr), uintptr(infoLevel), uintptr(serviceType), uintptr(serviceState), uintptr(unsafe.Pointer(services)), uintptr(bufSize), uintptr(unsafe.Pointer(bytesNeeded)), uintptr(unsafe.Pointer(servicesReturned)), uintptr(unsafe.Pointer(resumeHandle)), uintptr(unsafe.Pointer(groupName)), 0, 0)
 	if r1 == 0 {
@@ -3507,12 +3516,8 @@ func EnumProcessModulesEx(process Handle, module *Handle, cb uint32, cbNeeded *u
 	return
 }
 
-func EnumProcesses(processIds []uint32, bytesReturned *uint32) (err error) {
-	var _p0 *uint32
-	if len(processIds) > 0 {
-		_p0 = &processIds[0]
-	}
-	r1, _, e1 := syscall.Syscall(procEnumProcesses.Addr(), 3, uintptr(unsafe.Pointer(_p0)), uintptr(len(processIds)), uintptr(unsafe.Pointer(bytesReturned)))
+func enumProcesses(processIds *uint32, nSize uint32, bytesReturned *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procEnumProcesses.Addr(), 3, uintptr(unsafe.Pointer(processIds)), uintptr(nSize), uintptr(unsafe.Pointer(bytesReturned)))
 	if r1 == 0 {
 		err = errnoErr(e1)
 	}
diff --git a/vendor/golang.org/x/term/term_unix.go b/vendor/golang.org/x/term/term_unix.go
index a4e31ab1..62c2b3f4 100644
--- a/vendor/golang.org/x/term/term_unix.go
+++ b/vendor/golang.org/x/term/term_unix.go
@@ -60,7 +60,7 @@ func restore(fd int, state *State) error {
 func getSize(fd int) (width, height int, err error) {
 	ws, err := unix.IoctlGetWinsize(fd, unix.TIOCGWINSZ)
 	if err != nil {
-		return -1, -1, err
+		return 0, 0, err
 	}
 	return int(ws.Col), int(ws.Row), nil
 }
diff --git a/vendor/golang.org/x/text/internal/language/compact/tables.go b/vendor/golang.org/x/text/internal/language/compact/tables.go
index 32af9de5..a09ed198 100644
--- a/vendor/golang.org/x/text/internal/language/compact/tables.go
+++ b/vendor/golang.org/x/text/internal/language/compact/tables.go
@@ -790,226 +790,226 @@ const (
 
 var coreTags = []language.CompactCoreInfo{ // 773 elements
 	// Entry 0 - 1F
-	0x00000000, 0x01600000, 0x016000d2, 0x01600161,
-	0x01c00000, 0x01c00052, 0x02100000, 0x02100080,
-	0x02700000, 0x0270006f, 0x03a00000, 0x03a00001,
-	0x03a00023, 0x03a00039, 0x03a00062, 0x03a00067,
-	0x03a0006b, 0x03a0006c, 0x03a0006d, 0x03a00097,
-	0x03a0009b, 0x03a000a1, 0x03a000a8, 0x03a000ac,
-	0x03a000b0, 0x03a000b9, 0x03a000ba, 0x03a000c9,
-	0x03a000e1, 0x03a000ed, 0x03a000f3, 0x03a00108,
+	0x00000000, 0x01600000, 0x016000d3, 0x01600162,
+	0x01c00000, 0x01c00052, 0x02100000, 0x02100081,
+	0x02700000, 0x02700070, 0x03a00000, 0x03a00001,
+	0x03a00023, 0x03a00039, 0x03a00063, 0x03a00068,
+	0x03a0006c, 0x03a0006d, 0x03a0006e, 0x03a00098,
+	0x03a0009c, 0x03a000a2, 0x03a000a9, 0x03a000ad,
+	0x03a000b1, 0x03a000ba, 0x03a000bb, 0x03a000ca,
+	0x03a000e2, 0x03a000ee, 0x03a000f4, 0x03a00109,
 	// Entry 20 - 3F
-	0x03a0010b, 0x03a00115, 0x03a00117, 0x03a0011c,
-	0x03a00120, 0x03a00128, 0x03a0015e, 0x04000000,
-	0x04300000, 0x04300099, 0x04400000, 0x0440012f,
-	0x04800000, 0x0480006e, 0x05800000, 0x05820000,
-	0x05820032, 0x0585a000, 0x0585a032, 0x05e00000,
+	0x03a0010c, 0x03a00116, 0x03a00118, 0x03a0011d,
+	0x03a00121, 0x03a00129, 0x03a0015f, 0x04000000,
+	0x04300000, 0x0430009a, 0x04400000, 0x04400130,
+	0x04800000, 0x0480006f, 0x05800000, 0x05820000,
+	0x05820032, 0x0585b000, 0x0585b032, 0x05e00000,
 	0x05e00052, 0x07100000, 0x07100047, 0x07500000,
-	0x07500162, 0x07900000, 0x0790012f, 0x07e00000,
-	0x07e00038, 0x08200000, 0x0a000000, 0x0a0000c3,
+	0x07500163, 0x07900000, 0x07900130, 0x07e00000,
+	0x07e00038, 0x08200000, 0x0a000000, 0x0a0000c4,
 	// Entry 40 - 5F
-	0x0a500000, 0x0a500035, 0x0a500099, 0x0a900000,
-	0x0a900053, 0x0a900099, 0x0b200000, 0x0b200078,
-	0x0b500000, 0x0b500099, 0x0b700000, 0x0b720000,
-	0x0b720033, 0x0b75a000, 0x0b75a033, 0x0d700000,
-	0x0d700022, 0x0d70006e, 0x0d700078, 0x0d70009e,
-	0x0db00000, 0x0db00035, 0x0db00099, 0x0dc00000,
-	0x0dc00106, 0x0df00000, 0x0df00131, 0x0e500000,
-	0x0e500135, 0x0e900000, 0x0e90009b, 0x0e90009c,
+	0x0a500000, 0x0a500035, 0x0a50009a, 0x0a900000,
+	0x0a900053, 0x0a90009a, 0x0b200000, 0x0b200079,
+	0x0b500000, 0x0b50009a, 0x0b700000, 0x0b720000,
+	0x0b720033, 0x0b75b000, 0x0b75b033, 0x0d700000,
+	0x0d700022, 0x0d70006f, 0x0d700079, 0x0d70009f,
+	0x0db00000, 0x0db00035, 0x0db0009a, 0x0dc00000,
+	0x0dc00107, 0x0df00000, 0x0df00132, 0x0e500000,
+	0x0e500136, 0x0e900000, 0x0e90009c, 0x0e90009d,
 	// Entry 60 - 7F
-	0x0fa00000, 0x0fa0005e, 0x0fe00000, 0x0fe00106,
-	0x10000000, 0x1000007b, 0x10100000, 0x10100063,
-	0x10100082, 0x10800000, 0x108000a4, 0x10d00000,
-	0x10d0002e, 0x10d00036, 0x10d0004e, 0x10d00060,
-	0x10d0009e, 0x10d000b2, 0x10d000b7, 0x11700000,
-	0x117000d4, 0x11f00000, 0x11f00060, 0x12400000,
-	0x12400052, 0x12800000, 0x12b00000, 0x12b00114,
-	0x12d00000, 0x12d00043, 0x12f00000, 0x12f000a4,
+	0x0fa00000, 0x0fa0005f, 0x0fe00000, 0x0fe00107,
+	0x10000000, 0x1000007c, 0x10100000, 0x10100064,
+	0x10100083, 0x10800000, 0x108000a5, 0x10d00000,
+	0x10d0002e, 0x10d00036, 0x10d0004e, 0x10d00061,
+	0x10d0009f, 0x10d000b3, 0x10d000b8, 0x11700000,
+	0x117000d5, 0x11f00000, 0x11f00061, 0x12400000,
+	0x12400052, 0x12800000, 0x12b00000, 0x12b00115,
+	0x12d00000, 0x12d00043, 0x12f00000, 0x12f000a5,
 	// Entry 80 - 9F
-	0x13000000, 0x13000080, 0x13000122, 0x13600000,
-	0x1360005d, 0x13600087, 0x13900000, 0x13900001,
+	0x13000000, 0x13000081, 0x13000123, 0x13600000,
+	0x1360005e, 0x13600088, 0x13900000, 0x13900001,
 	0x1390001a, 0x13900025, 0x13900026, 0x1390002d,
 	0x1390002e, 0x1390002f, 0x13900034, 0x13900036,
 	0x1390003a, 0x1390003d, 0x13900042, 0x13900046,
 	0x13900048, 0x13900049, 0x1390004a, 0x1390004e,
-	0x13900050, 0x13900052, 0x1390005c, 0x1390005d,
-	0x13900060, 0x13900061, 0x13900063, 0x13900064,
+	0x13900050, 0x13900052, 0x1390005d, 0x1390005e,
+	0x13900061, 0x13900062, 0x13900064, 0x13900065,
 	// Entry A0 - BF
-	0x1390006d, 0x13900072, 0x13900073, 0x13900074,
-	0x13900075, 0x1390007b, 0x1390007c, 0x1390007f,
-	0x13900080, 0x13900081, 0x13900083, 0x1390008a,
-	0x1390008c, 0x1390008d, 0x13900096, 0x13900097,
-	0x13900098, 0x13900099, 0x1390009a, 0x1390009f,
-	0x139000a0, 0x139000a4, 0x139000a7, 0x139000a9,
-	0x139000ad, 0x139000b1, 0x139000b4, 0x139000b5,
-	0x139000bf, 0x139000c0, 0x139000c6, 0x139000c7,
+	0x1390006e, 0x13900073, 0x13900074, 0x13900075,
+	0x13900076, 0x1390007c, 0x1390007d, 0x13900080,
+	0x13900081, 0x13900082, 0x13900084, 0x1390008b,
+	0x1390008d, 0x1390008e, 0x13900097, 0x13900098,
+	0x13900099, 0x1390009a, 0x1390009b, 0x139000a0,
+	0x139000a1, 0x139000a5, 0x139000a8, 0x139000aa,
+	0x139000ae, 0x139000b2, 0x139000b5, 0x139000b6,
+	0x139000c0, 0x139000c1, 0x139000c7, 0x139000c8,
 	// Entry C0 - DF
-	0x139000ca, 0x139000cb, 0x139000cc, 0x139000ce,
-	0x139000d0, 0x139000d2, 0x139000d5, 0x139000d6,
-	0x139000d9, 0x139000dd, 0x139000df, 0x139000e0,
-	0x139000e6, 0x139000e7, 0x139000e8, 0x139000eb,
-	0x139000ec, 0x139000f0, 0x13900107, 0x13900109,
-	0x1390010a, 0x1390010b, 0x1390010c, 0x1390010d,
-	0x1390010e, 0x1390010f, 0x13900112, 0x13900117,
-	0x1390011b, 0x1390011d, 0x1390011f, 0x13900125,
+	0x139000cb, 0x139000cc, 0x139000cd, 0x139000cf,
+	0x139000d1, 0x139000d3, 0x139000d6, 0x139000d7,
+	0x139000da, 0x139000de, 0x139000e0, 0x139000e1,
+	0x139000e7, 0x139000e8, 0x139000e9, 0x139000ec,
+	0x139000ed, 0x139000f1, 0x13900108, 0x1390010a,
+	0x1390010b, 0x1390010c, 0x1390010d, 0x1390010e,
+	0x1390010f, 0x13900110, 0x13900113, 0x13900118,
+	0x1390011c, 0x1390011e, 0x13900120, 0x13900126,
 	// Entry E0 - FF
-	0x13900129, 0x1390012c, 0x1390012d, 0x1390012f,
-	0x13900131, 0x13900133, 0x13900135, 0x13900139,
-	0x1390013c, 0x1390013d, 0x1390013f, 0x13900142,
-	0x13900161, 0x13900162, 0x13900164, 0x13c00000,
+	0x1390012a, 0x1390012d, 0x1390012e, 0x13900130,
+	0x13900132, 0x13900134, 0x13900136, 0x1390013a,
+	0x1390013d, 0x1390013e, 0x13900140, 0x13900143,
+	0x13900162, 0x13900163, 0x13900165, 0x13c00000,
 	0x13c00001, 0x13e00000, 0x13e0001f, 0x13e0002c,
 	0x13e0003f, 0x13e00041, 0x13e00048, 0x13e00051,
-	0x13e00054, 0x13e00056, 0x13e00059, 0x13e00065,
-	0x13e00068, 0x13e00069, 0x13e0006e, 0x13e00086,
+	0x13e00054, 0x13e00057, 0x13e0005a, 0x13e00066,
+	0x13e00069, 0x13e0006a, 0x13e0006f, 0x13e00087,
 	// Entry 100 - 11F
-	0x13e00089, 0x13e0008f, 0x13e00094, 0x13e000cf,
-	0x13e000d8, 0x13e000e2, 0x13e000e4, 0x13e000e7,
-	0x13e000ec, 0x13e000f1, 0x13e0011a, 0x13e00135,
-	0x13e00136, 0x13e0013b, 0x14000000, 0x1400006a,
-	0x14500000, 0x1450006e, 0x14600000, 0x14600052,
-	0x14800000, 0x14800024, 0x1480009c, 0x14e00000,
-	0x14e00052, 0x14e00084, 0x14e000c9, 0x14e00114,
-	0x15100000, 0x15100072, 0x15300000, 0x153000e7,
+	0x13e0008a, 0x13e00090, 0x13e00095, 0x13e000d0,
+	0x13e000d9, 0x13e000e3, 0x13e000e5, 0x13e000e8,
+	0x13e000ed, 0x13e000f2, 0x13e0011b, 0x13e00136,
+	0x13e00137, 0x13e0013c, 0x14000000, 0x1400006b,
+	0x14500000, 0x1450006f, 0x14600000, 0x14600052,
+	0x14800000, 0x14800024, 0x1480009d, 0x14e00000,
+	0x14e00052, 0x14e00085, 0x14e000ca, 0x14e00115,
+	0x15100000, 0x15100073, 0x15300000, 0x153000e8,
 	// Entry 120 - 13F
-	0x15800000, 0x15800063, 0x15800076, 0x15e00000,
+	0x15800000, 0x15800064, 0x15800077, 0x15e00000,
 	0x15e00036, 0x15e00037, 0x15e0003a, 0x15e0003b,
 	0x15e0003c, 0x15e00049, 0x15e0004b, 0x15e0004c,
 	0x15e0004d, 0x15e0004e, 0x15e0004f, 0x15e00052,
-	0x15e00062, 0x15e00067, 0x15e00078, 0x15e0007a,
-	0x15e0007e, 0x15e00084, 0x15e00085, 0x15e00086,
-	0x15e00091, 0x15e000a8, 0x15e000b7, 0x15e000ba,
-	0x15e000bb, 0x15e000be, 0x15e000bf, 0x15e000c3,
+	0x15e00063, 0x15e00068, 0x15e00079, 0x15e0007b,
+	0x15e0007f, 0x15e00085, 0x15e00086, 0x15e00087,
+	0x15e00092, 0x15e000a9, 0x15e000b8, 0x15e000bb,
+	0x15e000bc, 0x15e000bf, 0x15e000c0, 0x15e000c4,
 	// Entry 140 - 15F
-	0x15e000c8, 0x15e000c9, 0x15e000cc, 0x15e000d3,
-	0x15e000d4, 0x15e000e5, 0x15e000ea, 0x15e00102,
-	0x15e00107, 0x15e0010a, 0x15e00114, 0x15e0011c,
-	0x15e00120, 0x15e00122, 0x15e00128, 0x15e0013f,
-	0x15e00140, 0x15e0015f, 0x16900000, 0x1690009e,
-	0x16d00000, 0x16d000d9, 0x16e00000, 0x16e00096,
-	0x17e00000, 0x17e0007b, 0x19000000, 0x1900006e,
-	0x1a300000, 0x1a30004e, 0x1a300078, 0x1a3000b2,
+	0x15e000c9, 0x15e000ca, 0x15e000cd, 0x15e000d4,
+	0x15e000d5, 0x15e000e6, 0x15e000eb, 0x15e00103,
+	0x15e00108, 0x15e0010b, 0x15e00115, 0x15e0011d,
+	0x15e00121, 0x15e00123, 0x15e00129, 0x15e00140,
+	0x15e00141, 0x15e00160, 0x16900000, 0x1690009f,
+	0x16d00000, 0x16d000da, 0x16e00000, 0x16e00097,
+	0x17e00000, 0x17e0007c, 0x19000000, 0x1900006f,
+	0x1a300000, 0x1a30004e, 0x1a300079, 0x1a3000b3,
 	// Entry 160 - 17F
-	0x1a400000, 0x1a400099, 0x1a900000, 0x1ab00000,
-	0x1ab000a4, 0x1ac00000, 0x1ac00098, 0x1b400000,
-	0x1b400080, 0x1b4000d4, 0x1b4000d6, 0x1b800000,
-	0x1b800135, 0x1bc00000, 0x1bc00097, 0x1be00000,
-	0x1be00099, 0x1d100000, 0x1d100033, 0x1d100090,
-	0x1d200000, 0x1d200060, 0x1d500000, 0x1d500092,
-	0x1d700000, 0x1d700028, 0x1e100000, 0x1e100095,
-	0x1e700000, 0x1e7000d6, 0x1ea00000, 0x1ea00053,
+	0x1a400000, 0x1a40009a, 0x1a900000, 0x1ab00000,
+	0x1ab000a5, 0x1ac00000, 0x1ac00099, 0x1b400000,
+	0x1b400081, 0x1b4000d5, 0x1b4000d7, 0x1b800000,
+	0x1b800136, 0x1bc00000, 0x1bc00098, 0x1be00000,
+	0x1be0009a, 0x1d100000, 0x1d100033, 0x1d100091,
+	0x1d200000, 0x1d200061, 0x1d500000, 0x1d500093,
+	0x1d700000, 0x1d700028, 0x1e100000, 0x1e100096,
+	0x1e700000, 0x1e7000d7, 0x1ea00000, 0x1ea00053,
 	// Entry 180 - 19F
-	0x1f300000, 0x1f500000, 0x1f800000, 0x1f80009d,
-	0x1f900000, 0x1f90004e, 0x1f90009e, 0x1f900113,
-	0x1f900138, 0x1fa00000, 0x1fb00000, 0x20000000,
-	0x200000a2, 0x20300000, 0x20700000, 0x20700052,
-	0x20800000, 0x20a00000, 0x20a0012f, 0x20e00000,
-	0x20f00000, 0x21000000, 0x2100007d, 0x21200000,
-	0x21200067, 0x21600000, 0x21700000, 0x217000a4,
-	0x21f00000, 0x22300000, 0x2230012f, 0x22700000,
+	0x1f300000, 0x1f500000, 0x1f800000, 0x1f80009e,
+	0x1f900000, 0x1f90004e, 0x1f90009f, 0x1f900114,
+	0x1f900139, 0x1fa00000, 0x1fb00000, 0x20000000,
+	0x200000a3, 0x20300000, 0x20700000, 0x20700052,
+	0x20800000, 0x20a00000, 0x20a00130, 0x20e00000,
+	0x20f00000, 0x21000000, 0x2100007e, 0x21200000,
+	0x21200068, 0x21600000, 0x21700000, 0x217000a5,
+	0x21f00000, 0x22300000, 0x22300130, 0x22700000,
 	// Entry 1A0 - 1BF
-	0x2270005a, 0x23400000, 0x234000c3, 0x23900000,
-	0x239000a4, 0x24200000, 0x242000ae, 0x24400000,
-	0x24400052, 0x24500000, 0x24500082, 0x24600000,
-	0x246000a4, 0x24a00000, 0x24a000a6, 0x25100000,
-	0x25100099, 0x25400000, 0x254000aa, 0x254000ab,
-	0x25600000, 0x25600099, 0x26a00000, 0x26a00099,
-	0x26b00000, 0x26b0012f, 0x26d00000, 0x26d00052,
-	0x26e00000, 0x26e00060, 0x27400000, 0x28100000,
+	0x2270005b, 0x23400000, 0x234000c4, 0x23900000,
+	0x239000a5, 0x24200000, 0x242000af, 0x24400000,
+	0x24400052, 0x24500000, 0x24500083, 0x24600000,
+	0x246000a5, 0x24a00000, 0x24a000a7, 0x25100000,
+	0x2510009a, 0x25400000, 0x254000ab, 0x254000ac,
+	0x25600000, 0x2560009a, 0x26a00000, 0x26a0009a,
+	0x26b00000, 0x26b00130, 0x26d00000, 0x26d00052,
+	0x26e00000, 0x26e00061, 0x27400000, 0x28100000,
 	// Entry 1C0 - 1DF
-	0x2810007b, 0x28a00000, 0x28a000a5, 0x29100000,
-	0x2910012f, 0x29500000, 0x295000b7, 0x2a300000,
-	0x2a300131, 0x2af00000, 0x2af00135, 0x2b500000,
+	0x2810007c, 0x28a00000, 0x28a000a6, 0x29100000,
+	0x29100130, 0x29500000, 0x295000b8, 0x2a300000,
+	0x2a300132, 0x2af00000, 0x2af00136, 0x2b500000,
 	0x2b50002a, 0x2b50004b, 0x2b50004c, 0x2b50004d,
-	0x2b800000, 0x2b8000af, 0x2bf00000, 0x2bf0009b,
-	0x2bf0009c, 0x2c000000, 0x2c0000b6, 0x2c200000,
-	0x2c20004b, 0x2c400000, 0x2c4000a4, 0x2c500000,
-	0x2c5000a4, 0x2c700000, 0x2c7000b8, 0x2d100000,
+	0x2b800000, 0x2b8000b0, 0x2bf00000, 0x2bf0009c,
+	0x2bf0009d, 0x2c000000, 0x2c0000b7, 0x2c200000,
+	0x2c20004b, 0x2c400000, 0x2c4000a5, 0x2c500000,
+	0x2c5000a5, 0x2c700000, 0x2c7000b9, 0x2d100000,
 	// Entry 1E0 - 1FF
-	0x2d1000a4, 0x2d10012f, 0x2e900000, 0x2e9000a4,
-	0x2ed00000, 0x2ed000cc, 0x2f100000, 0x2f1000bf,
-	0x2f200000, 0x2f2000d1, 0x2f400000, 0x2f400052,
-	0x2ff00000, 0x2ff000c2, 0x30400000, 0x30400099,
-	0x30b00000, 0x30b000c5, 0x31000000, 0x31b00000,
-	0x31b00099, 0x31f00000, 0x31f0003e, 0x31f000d0,
-	0x31f0010d, 0x32000000, 0x320000cb, 0x32500000,
-	0x32500052, 0x33100000, 0x331000c4, 0x33a00000,
+	0x2d1000a5, 0x2d100130, 0x2e900000, 0x2e9000a5,
+	0x2ed00000, 0x2ed000cd, 0x2f100000, 0x2f1000c0,
+	0x2f200000, 0x2f2000d2, 0x2f400000, 0x2f400052,
+	0x2ff00000, 0x2ff000c3, 0x30400000, 0x3040009a,
+	0x30b00000, 0x30b000c6, 0x31000000, 0x31b00000,
+	0x31b0009a, 0x31f00000, 0x31f0003e, 0x31f000d1,
+	0x31f0010e, 0x32000000, 0x320000cc, 0x32500000,
+	0x32500052, 0x33100000, 0x331000c5, 0x33a00000,
 	// Entry 200 - 21F
-	0x33a0009c, 0x34100000, 0x34500000, 0x345000d2,
-	0x34700000, 0x347000da, 0x34700110, 0x34e00000,
-	0x34e00164, 0x35000000, 0x35000060, 0x350000d9,
-	0x35100000, 0x35100099, 0x351000db, 0x36700000,
-	0x36700030, 0x36700036, 0x36700040, 0x3670005b,
-	0x367000d9, 0x36700116, 0x3670011b, 0x36800000,
-	0x36800052, 0x36a00000, 0x36a000da, 0x36c00000,
+	0x33a0009d, 0x34100000, 0x34500000, 0x345000d3,
+	0x34700000, 0x347000db, 0x34700111, 0x34e00000,
+	0x34e00165, 0x35000000, 0x35000061, 0x350000da,
+	0x35100000, 0x3510009a, 0x351000dc, 0x36700000,
+	0x36700030, 0x36700036, 0x36700040, 0x3670005c,
+	0x367000da, 0x36700117, 0x3670011c, 0x36800000,
+	0x36800052, 0x36a00000, 0x36a000db, 0x36c00000,
 	0x36c00052, 0x36f00000, 0x37500000, 0x37600000,
 	// Entry 220 - 23F
-	0x37a00000, 0x38000000, 0x38000117, 0x38700000,
-	0x38900000, 0x38900131, 0x39000000, 0x3900006f,
-	0x390000a4, 0x39500000, 0x39500099, 0x39800000,
-	0x3980007d, 0x39800106, 0x39d00000, 0x39d05000,
-	0x39d050e8, 0x39d36000, 0x39d36099, 0x3a100000,
-	0x3b300000, 0x3b3000e9, 0x3bd00000, 0x3bd00001,
+	0x37a00000, 0x38000000, 0x38000118, 0x38700000,
+	0x38900000, 0x38900132, 0x39000000, 0x39000070,
+	0x390000a5, 0x39500000, 0x3950009a, 0x39800000,
+	0x3980007e, 0x39800107, 0x39d00000, 0x39d05000,
+	0x39d050e9, 0x39d36000, 0x39d3609a, 0x3a100000,
+	0x3b300000, 0x3b3000ea, 0x3bd00000, 0x3bd00001,
 	0x3be00000, 0x3be00024, 0x3c000000, 0x3c00002a,
-	0x3c000041, 0x3c00004e, 0x3c00005a, 0x3c000086,
+	0x3c000041, 0x3c00004e, 0x3c00005b, 0x3c000087,
 	// Entry 240 - 25F
-	0x3c00008b, 0x3c0000b7, 0x3c0000c6, 0x3c0000d1,
-	0x3c0000ee, 0x3c000118, 0x3c000126, 0x3c400000,
-	0x3c40003f, 0x3c400069, 0x3c4000e4, 0x3d400000,
+	0x3c00008c, 0x3c0000b8, 0x3c0000c7, 0x3c0000d2,
+	0x3c0000ef, 0x3c000119, 0x3c000127, 0x3c400000,
+	0x3c40003f, 0x3c40006a, 0x3c4000e5, 0x3d400000,
 	0x3d40004e, 0x3d900000, 0x3d90003a, 0x3dc00000,
-	0x3dc000bc, 0x3dc00104, 0x3de00000, 0x3de0012f,
-	0x3e200000, 0x3e200047, 0x3e2000a5, 0x3e2000ae,
-	0x3e2000bc, 0x3e200106, 0x3e200130, 0x3e500000,
-	0x3e500107, 0x3e600000, 0x3e60012f, 0x3eb00000,
+	0x3dc000bd, 0x3dc00105, 0x3de00000, 0x3de00130,
+	0x3e200000, 0x3e200047, 0x3e2000a6, 0x3e2000af,
+	0x3e2000bd, 0x3e200107, 0x3e200131, 0x3e500000,
+	0x3e500108, 0x3e600000, 0x3e600130, 0x3eb00000,
 	// Entry 260 - 27F
-	0x3eb00106, 0x3ec00000, 0x3ec000a4, 0x3f300000,
-	0x3f30012f, 0x3fa00000, 0x3fa000e8, 0x3fc00000,
-	0x3fd00000, 0x3fd00072, 0x3fd000da, 0x3fd0010c,
-	0x3ff00000, 0x3ff000d1, 0x40100000, 0x401000c3,
+	0x3eb00107, 0x3ec00000, 0x3ec000a5, 0x3f300000,
+	0x3f300130, 0x3fa00000, 0x3fa000e9, 0x3fc00000,
+	0x3fd00000, 0x3fd00073, 0x3fd000db, 0x3fd0010d,
+	0x3ff00000, 0x3ff000d2, 0x40100000, 0x401000c4,
 	0x40200000, 0x4020004c, 0x40700000, 0x40800000,
-	0x4085a000, 0x4085a0ba, 0x408e8000, 0x408e80ba,
-	0x40c00000, 0x40c000b3, 0x41200000, 0x41200111,
-	0x41600000, 0x4160010f, 0x41c00000, 0x41d00000,
+	0x4085b000, 0x4085b0bb, 0x408eb000, 0x408eb0bb,
+	0x40c00000, 0x40c000b4, 0x41200000, 0x41200112,
+	0x41600000, 0x41600110, 0x41c00000, 0x41d00000,
 	// Entry 280 - 29F
-	0x41e00000, 0x41f00000, 0x41f00072, 0x42200000,
-	0x42300000, 0x42300164, 0x42900000, 0x42900062,
-	0x4290006f, 0x429000a4, 0x42900115, 0x43100000,
-	0x43100027, 0x431000c2, 0x4310014d, 0x43200000,
-	0x43220000, 0x43220033, 0x432200bd, 0x43220105,
-	0x4322014d, 0x4325a000, 0x4325a033, 0x4325a0bd,
-	0x4325a105, 0x4325a14d, 0x43700000, 0x43a00000,
-	0x43b00000, 0x44400000, 0x44400031, 0x44400072,
+	0x41e00000, 0x41f00000, 0x41f00073, 0x42200000,
+	0x42300000, 0x42300165, 0x42900000, 0x42900063,
+	0x42900070, 0x429000a5, 0x42900116, 0x43100000,
+	0x43100027, 0x431000c3, 0x4310014e, 0x43200000,
+	0x43220000, 0x43220033, 0x432200be, 0x43220106,
+	0x4322014e, 0x4325b000, 0x4325b033, 0x4325b0be,
+	0x4325b106, 0x4325b14e, 0x43700000, 0x43a00000,
+	0x43b00000, 0x44400000, 0x44400031, 0x44400073,
 	// Entry 2A0 - 2BF
-	0x4440010c, 0x44500000, 0x4450004b, 0x445000a4,
-	0x4450012f, 0x44500131, 0x44e00000, 0x45000000,
-	0x45000099, 0x450000b3, 0x450000d0, 0x4500010d,
-	0x46100000, 0x46100099, 0x46400000, 0x464000a4,
-	0x46400131, 0x46700000, 0x46700124, 0x46b00000,
-	0x46b00123, 0x46f00000, 0x46f0006d, 0x46f0006f,
-	0x47100000, 0x47600000, 0x47600127, 0x47a00000,
-	0x48000000, 0x48200000, 0x48200129, 0x48a00000,
+	0x4440010d, 0x44500000, 0x4450004b, 0x445000a5,
+	0x44500130, 0x44500132, 0x44e00000, 0x45000000,
+	0x4500009a, 0x450000b4, 0x450000d1, 0x4500010e,
+	0x46100000, 0x4610009a, 0x46400000, 0x464000a5,
+	0x46400132, 0x46700000, 0x46700125, 0x46b00000,
+	0x46b00124, 0x46f00000, 0x46f0006e, 0x46f00070,
+	0x47100000, 0x47600000, 0x47600128, 0x47a00000,
+	0x48000000, 0x48200000, 0x4820012a, 0x48a00000,
 	// Entry 2C0 - 2DF
-	0x48a0005d, 0x48a0012b, 0x48e00000, 0x49400000,
-	0x49400106, 0x4a400000, 0x4a4000d4, 0x4a900000,
-	0x4a9000ba, 0x4ac00000, 0x4ac00053, 0x4ae00000,
-	0x4ae00130, 0x4b400000, 0x4b400099, 0x4b4000e8,
+	0x48a0005e, 0x48a0012c, 0x48e00000, 0x49400000,
+	0x49400107, 0x4a400000, 0x4a4000d5, 0x4a900000,
+	0x4a9000bb, 0x4ac00000, 0x4ac00053, 0x4ae00000,
+	0x4ae00131, 0x4b400000, 0x4b40009a, 0x4b4000e9,
 	0x4bc00000, 0x4bc05000, 0x4bc05024, 0x4bc20000,
-	0x4bc20137, 0x4bc5a000, 0x4bc5a137, 0x4be00000,
-	0x4be5a000, 0x4be5a0b4, 0x4bef1000, 0x4bef10b4,
-	0x4c000000, 0x4c300000, 0x4c30013e, 0x4c900000,
+	0x4bc20138, 0x4bc5b000, 0x4bc5b138, 0x4be00000,
+	0x4be5b000, 0x4be5b0b5, 0x4bef4000, 0x4bef40b5,
+	0x4c000000, 0x4c300000, 0x4c30013f, 0x4c900000,
 	// Entry 2E0 - 2FF
-	0x4c900001, 0x4cc00000, 0x4cc0012f, 0x4ce00000,
-	0x4cf00000, 0x4cf0004e, 0x4e500000, 0x4e500114,
-	0x4f200000, 0x4fb00000, 0x4fb00131, 0x50900000,
+	0x4c900001, 0x4cc00000, 0x4cc00130, 0x4ce00000,
+	0x4cf00000, 0x4cf0004e, 0x4e500000, 0x4e500115,
+	0x4f200000, 0x4fb00000, 0x4fb00132, 0x50900000,
 	0x50900052, 0x51200000, 0x51200001, 0x51800000,
-	0x5180003b, 0x518000d6, 0x51f00000, 0x51f3b000,
-	0x51f3b053, 0x51f3c000, 0x51f3c08d, 0x52800000,
-	0x528000ba, 0x52900000, 0x5293b000, 0x5293b053,
-	0x5293b08d, 0x5293b0c6, 0x5293b10d, 0x5293c000,
+	0x5180003b, 0x518000d7, 0x51f00000, 0x51f3b000,
+	0x51f3b053, 0x51f3c000, 0x51f3c08e, 0x52800000,
+	0x528000bb, 0x52900000, 0x5293b000, 0x5293b053,
+	0x5293b08e, 0x5293b0c7, 0x5293b10e, 0x5293c000,
 	// Entry 300 - 31F
-	0x5293c08d, 0x5293c0c6, 0x5293c12e, 0x52f00000,
-	0x52f00161,
+	0x5293c08e, 0x5293c0c7, 0x5293c12f, 0x52f00000,
+	0x52f00162,
 } // Size: 3116 bytes
 
 const specialTagsStr string = "ca-ES-valencia en-US-u-va-posix"
 
-// Total table size 3147 bytes (3KiB); checksum: 6772C83C
+// Total table size 3147 bytes (3KiB); checksum: 5A8FFFA5
diff --git a/vendor/golang.org/x/text/internal/language/tables.go b/vendor/golang.org/x/text/internal/language/tables.go
index fb6b5837..14167e74 100644
--- a/vendor/golang.org/x/text/internal/language/tables.go
+++ b/vendor/golang.org/x/text/internal/language/tables.go
@@ -7,11 +7,11 @@ import "golang.org/x/text/internal/tag"
 // CLDRVersion is the CLDR version from which the tables in this package are derived.
 const CLDRVersion = "32"
 
-const NumLanguages = 8752
+const NumLanguages = 8798
 
-const NumScripts = 258
+const NumScripts = 261
 
-const NumRegions = 357
+const NumRegions = 358
 
 type FromTo struct {
 	From uint16
@@ -263,7 +263,7 @@ var langNoIndex = [2197]uint8{
 	0xff, 0xf8, 0xed, 0xfe, 0xeb, 0xd3, 0x3b, 0xd2,
 	0xfb, 0xbf, 0x7a, 0xfa, 0x37, 0x1d, 0x3c, 0x57,
 	0x6e, 0x97, 0x73, 0x38, 0xfb, 0xea, 0xbf, 0x70,
-	0xad, 0x03, 0xff, 0xff, 0xcf, 0x05, 0x84, 0x62,
+	0xad, 0x03, 0xff, 0xff, 0xcf, 0x05, 0x84, 0x72,
 	0xe9, 0xbf, 0xfd, 0xbf, 0xbf, 0xf7, 0xfd, 0x77,
 	0x0f, 0xff, 0xef, 0x6f, 0xff, 0xfb, 0xdf, 0xe2,
 	0xc9, 0xf8, 0x7f, 0x7e, 0x4d, 0xbc, 0x0a, 0x6a,
@@ -278,7 +278,7 @@ var langNoIndex = [2197]uint8{
 	0xa8, 0xff, 0x1f, 0x67, 0x7d, 0xeb, 0xef, 0xce,
 	0xff, 0xff, 0x9f, 0xff, 0xb7, 0xef, 0xfe, 0xcf,
 	// Entry 80 - BF
-	0xdb, 0xff, 0xf3, 0xcd, 0xfb, 0x6f, 0xff, 0xff,
+	0xdb, 0xff, 0xf3, 0xcd, 0xfb, 0x7f, 0xff, 0xff,
 	0xbb, 0xee, 0xf7, 0xbd, 0xdb, 0xff, 0x5f, 0xf7,
 	0xfd, 0xf2, 0xfd, 0xff, 0x5e, 0x2f, 0x3b, 0xba,
 	0x7e, 0xff, 0xff, 0xfe, 0xf7, 0xff, 0xdd, 0xff,
@@ -289,11 +289,11 @@ var langNoIndex = [2197]uint8{
 	// Entry C0 - FF
 	0xfb, 0x4a, 0xf2, 0x9f, 0xb4, 0x42, 0x41, 0x96,
 	0x1b, 0x14, 0x08, 0xf3, 0x2b, 0xe7, 0x17, 0x56,
-	0x05, 0x7d, 0x0e, 0x1c, 0x37, 0x7b, 0xf3, 0xef,
+	0x05, 0x7d, 0x0e, 0x1c, 0x37, 0x7f, 0xf3, 0xef,
 	0x97, 0xff, 0x5d, 0x38, 0x64, 0x08, 0x00, 0x10,
 	0xbc, 0x85, 0xaf, 0xdf, 0xff, 0xff, 0x7b, 0x35,
 	0x3e, 0xc7, 0xc7, 0xdf, 0xff, 0x01, 0x81, 0x00,
-	0xb0, 0x05, 0x80, 0x00, 0x00, 0x00, 0x00, 0x03,
+	0xb0, 0x05, 0x80, 0x00, 0x20, 0x00, 0x00, 0x03,
 	0x40, 0x00, 0x40, 0x92, 0x21, 0x50, 0xb1, 0x5d,
 	// Entry 100 - 13F
 	0xfd, 0xdc, 0xbe, 0x5e, 0x00, 0x00, 0x02, 0x64,
@@ -303,20 +303,20 @@ var langNoIndex = [2197]uint8{
 	0x86, 0x00, 0xd1, 0x00, 0xf0, 0xc7, 0x67, 0x5f,
 	0x56, 0x99, 0x5e, 0xb5, 0x6c, 0xaf, 0x03, 0x00,
 	0x02, 0x00, 0x00, 0x00, 0xc0, 0x37, 0xda, 0x56,
-	0x90, 0x69, 0x01, 0x2c, 0x96, 0x69, 0x20, 0xfb,
+	0x90, 0x6d, 0x01, 0x2e, 0x96, 0x69, 0x20, 0xfb,
 	// Entry 140 - 17F
 	0xff, 0x3f, 0x00, 0x00, 0x00, 0x01, 0x0c, 0x16,
-	0x03, 0x00, 0x00, 0xb0, 0x14, 0x03, 0x50, 0x06,
+	0x03, 0x00, 0x00, 0xb0, 0x14, 0x23, 0x50, 0x06,
 	0x0a, 0x00, 0x01, 0x00, 0x00, 0x10, 0x11, 0x09,
 	0x00, 0x00, 0x60, 0x10, 0x00, 0x00, 0x00, 0x10,
-	0x00, 0x00, 0x44, 0x00, 0x00, 0x10, 0x00, 0x04,
+	0x00, 0x00, 0x44, 0x00, 0x00, 0x10, 0x00, 0x05,
 	0x08, 0x00, 0x00, 0x05, 0x00, 0x80, 0x28, 0x04,
 	0x00, 0x00, 0x40, 0xd5, 0x2d, 0x00, 0x64, 0x35,
 	0x24, 0x52, 0xf4, 0xd5, 0xbf, 0x62, 0xc9, 0x03,
 	// Entry 180 - 1BF
 	0x00, 0x80, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x04, 0x13, 0x39, 0x01, 0xdd, 0x57, 0x98,
-	0x21, 0x18, 0x81, 0x00, 0x00, 0x01, 0x40, 0x82,
+	0x21, 0x18, 0x81, 0x08, 0x00, 0x01, 0x40, 0x82,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x01, 0x40, 0x00, 0x44, 0x00, 0x00, 0x80, 0xea,
 	0xa9, 0x39, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04,
@@ -337,7 +337,7 @@ var langNoIndex = [2197]uint8{
 	0xa4, 0x45, 0x25, 0x9b, 0x02, 0xdf, 0xe1, 0xdf,
 	0x03, 0x44, 0x08, 0x90, 0x01, 0x04, 0x81, 0xe3,
 	0x92, 0x54, 0xdb, 0x28, 0xd3, 0x5f, 0xfe, 0x6d,
-	0x79, 0xed, 0x1c, 0x7d, 0x04, 0x08, 0x00, 0x01,
+	0x79, 0xed, 0x1c, 0x7f, 0x04, 0x08, 0x00, 0x01,
 	0x21, 0x12, 0x64, 0x5f, 0xdd, 0x0e, 0x85, 0x4f,
 	0x40, 0x40, 0x00, 0x04, 0xf1, 0xfd, 0x3d, 0x54,
 	// Entry 240 - 27F
@@ -359,13 +359,13 @@ var langNoIndex = [2197]uint8{
 	0x03, 0x00, 0x00, 0x00, 0x8c, 0x50, 0x40, 0x04,
 	0x84, 0x47, 0x84, 0x40, 0x20, 0x10, 0x00, 0x20,
 	// Entry 2C0 - 2FF
-	0x02, 0x50, 0x80, 0x11, 0x00, 0x91, 0x6c, 0xe2,
-	0x50, 0x27, 0x1d, 0x11, 0x29, 0x06, 0x59, 0xe9,
+	0x02, 0x50, 0x80, 0x11, 0x00, 0x99, 0x6c, 0xe2,
+	0x50, 0x27, 0x1d, 0x11, 0x29, 0x0e, 0x59, 0xe9,
 	0x33, 0x08, 0x00, 0x20, 0x04, 0x40, 0x10, 0x00,
 	0x00, 0x00, 0x50, 0x44, 0x92, 0x49, 0xd6, 0x5d,
 	0xa7, 0x81, 0x47, 0x97, 0xfb, 0x00, 0x10, 0x00,
 	0x08, 0x00, 0x80, 0x00, 0x40, 0x04, 0x00, 0x01,
-	0x02, 0x00, 0x01, 0x40, 0x80, 0x00, 0x00, 0x08,
+	0x02, 0x00, 0x01, 0x40, 0x80, 0x00, 0x40, 0x08,
 	0xd8, 0xeb, 0xf6, 0x39, 0xc4, 0x8d, 0x12, 0x00,
 	// Entry 300 - 33F
 	0x00, 0x0c, 0x04, 0x01, 0x20, 0x20, 0xdd, 0xa0,
@@ -392,14 +392,14 @@ var langNoIndex = [2197]uint8{
 	0xee, 0xdb, 0x6f, 0xef, 0xff, 0x7f, 0xff, 0xff,
 	0xf7, 0x5f, 0xd3, 0x3b, 0xfd, 0xd9, 0xdf, 0xeb,
 	0xbc, 0x08, 0x05, 0x24, 0xff, 0x07, 0x70, 0xfe,
-	0xe6, 0x5e, 0x00, 0x08, 0x00, 0x83, 0x3d, 0x1b,
+	0xe6, 0x5e, 0x00, 0x08, 0x00, 0x83, 0x7d, 0x1f,
 	0x06, 0xe6, 0x72, 0x60, 0xd1, 0x3c, 0x7f, 0x44,
 	// Entry 3C0 - 3FF
 	0x02, 0x30, 0x9f, 0x7a, 0x16, 0xbd, 0x7f, 0x57,
 	0xf2, 0xff, 0x31, 0xff, 0xf2, 0x1e, 0x90, 0xf7,
-	0xf1, 0xf9, 0x45, 0x80, 0x01, 0x02, 0x00, 0x00,
-	0x40, 0x54, 0x9f, 0x8a, 0xdb, 0xf9, 0x2e, 0x11,
-	0x86, 0x51, 0xc0, 0xf3, 0xfb, 0x47, 0x40, 0x01,
+	0xf1, 0xf9, 0x45, 0x80, 0x01, 0x02, 0x00, 0x20,
+	0x40, 0x54, 0x9f, 0x8a, 0xdf, 0xf9, 0x6e, 0x11,
+	0x86, 0x51, 0xc0, 0xf3, 0xfb, 0x47, 0x40, 0x03,
 	0x05, 0xd1, 0x50, 0x5c, 0x00, 0x40, 0x00, 0x10,
 	0x04, 0x02, 0x00, 0x00, 0x0a, 0x00, 0x17, 0xd2,
 	0xb9, 0xfd, 0xfc, 0xba, 0xfe, 0xef, 0xc7, 0xbe,
@@ -424,12 +424,12 @@ var langNoIndex = [2197]uint8{
 	// Entry 480 - 4BF
 	0x93, 0x50, 0x5d, 0xaf, 0xa6, 0xff, 0x99, 0xfb,
 	0x63, 0x1d, 0x53, 0xff, 0xef, 0xb7, 0x35, 0x20,
-	0x14, 0x00, 0x55, 0x51, 0x82, 0x65, 0xf5, 0x41,
-	0xe2, 0xff, 0xfc, 0xdf, 0x02, 0x05, 0xc5, 0x05,
+	0x14, 0x00, 0x55, 0x51, 0xc2, 0x65, 0xf5, 0x41,
+	0xe2, 0xff, 0xfc, 0xdf, 0x02, 0x85, 0xc5, 0x05,
 	0x00, 0x22, 0x00, 0x74, 0x69, 0x10, 0x08, 0x05,
 	0x41, 0x00, 0x01, 0x06, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x51, 0x20, 0x05, 0x04, 0x01, 0x00, 0x00,
-	0x06, 0x01, 0x20, 0x00, 0x18, 0x01, 0x92, 0xf1,
+	0x06, 0x11, 0x20, 0x00, 0x18, 0x01, 0x92, 0xf1,
 	// Entry 4C0 - 4FF
 	0xfd, 0x47, 0x69, 0x06, 0x95, 0x06, 0x57, 0xed,
 	0xfb, 0x4d, 0x1c, 0x6b, 0x83, 0x04, 0x62, 0x40,
@@ -441,7 +441,7 @@ var langNoIndex = [2197]uint8{
 	0xbe, 0xcf, 0xf7, 0xaf, 0x42, 0x04, 0x84, 0x41,
 	// Entry 500 - 53F
 	0x30, 0xff, 0x79, 0x72, 0x04, 0x00, 0x00, 0x49,
-	0x2d, 0x14, 0x27, 0x57, 0xed, 0xf1, 0x3f, 0xe7,
+	0x2d, 0x14, 0x27, 0x5f, 0xed, 0xf1, 0x3f, 0xe7,
 	0x3f, 0x00, 0x00, 0x02, 0xc6, 0xa0, 0x1e, 0xf8,
 	0xbb, 0xff, 0xfd, 0xfb, 0xb7, 0xfd, 0xe7, 0xf7,
 	0xfd, 0xfc, 0xd5, 0xed, 0x47, 0xf4, 0x7e, 0x10,
@@ -449,7 +449,7 @@ var langNoIndex = [2197]uint8{
 	0x5b, 0x05, 0x86, 0xed, 0xf5, 0x77, 0xbd, 0x3c,
 	0x00, 0x00, 0x00, 0x42, 0x71, 0x42, 0x00, 0x40,
 	// Entry 540 - 57F
-	0x00, 0x00, 0x01, 0x43, 0x19, 0x00, 0x08, 0x00,
+	0x00, 0x00, 0x01, 0x43, 0x19, 0x24, 0x08, 0x00,
 	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -464,13 +464,13 @@ var langNoIndex = [2197]uint8{
 	0x00, 0x00, 0x00, 0x00, 0xf0, 0xce, 0xfb, 0xbf,
 	0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
 	0x00, 0x30, 0x15, 0xa3, 0x10, 0x00, 0x00, 0x00,
-	0x11, 0x04, 0x16, 0x00, 0x00, 0x02, 0x00, 0x81,
+	0x11, 0x04, 0x16, 0x00, 0x00, 0x02, 0x20, 0x81,
 	0xa3, 0x01, 0x50, 0x00, 0x00, 0x83, 0x11, 0x40,
 	// Entry 5C0 - 5FF
-	0x00, 0x00, 0x00, 0xf0, 0xdd, 0x7b, 0x3e, 0x02,
+	0x00, 0x00, 0x00, 0xf0, 0xdd, 0x7b, 0xbe, 0x02,
 	0xaa, 0x10, 0x5d, 0x98, 0x52, 0x00, 0x80, 0x20,
 	0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x02, 0x02,
-	0x19, 0x00, 0x10, 0x02, 0x10, 0x61, 0x5a, 0x9d,
+	0x3d, 0x40, 0x10, 0x02, 0x10, 0x61, 0x5a, 0x9d,
 	0x31, 0x00, 0x00, 0x00, 0x01, 0x18, 0x02, 0x20,
 	0x00, 0x00, 0x01, 0x00, 0x42, 0x00, 0x20, 0x00,
 	0x00, 0x1f, 0xdf, 0xd2, 0xb9, 0xff, 0xfd, 0x3f,
@@ -491,20 +491,20 @@ var langNoIndex = [2197]uint8{
 	0x02, 0xfb, 0xa3, 0xef, 0xf3, 0xd6, 0xf2, 0xff,
 	0xb9, 0xda, 0x7d, 0xd0, 0x3e, 0x15, 0x7b, 0xb4,
 	0xf5, 0x3e, 0xff, 0xff, 0xf1, 0xf7, 0xff, 0xe7,
-	0x5f, 0xff, 0xff, 0x9e, 0xdb, 0xf6, 0xd7, 0xb9,
+	0x5f, 0xff, 0xff, 0x9e, 0xdf, 0xf6, 0xd7, 0xb9,
 	0xef, 0x27, 0x80, 0xbb, 0xc5, 0xff, 0xff, 0xe3,
 	// Entry 680 - 6BF
 	0x97, 0x9d, 0xbf, 0x9f, 0xf7, 0xc7, 0xfd, 0x37,
-	0xce, 0x7f, 0x04, 0x1d, 0x73, 0x7f, 0xf8, 0xda,
+	0xce, 0x7f, 0x44, 0x1d, 0x73, 0x7f, 0xf8, 0xda,
 	0x5d, 0xce, 0x7d, 0x06, 0xb9, 0xea, 0x79, 0xa0,
 	0x1a, 0x20, 0x00, 0x30, 0x02, 0x04, 0x24, 0x08,
 	0x04, 0x00, 0x00, 0x40, 0xd4, 0x02, 0x04, 0x00,
-	0x00, 0x04, 0x00, 0x04, 0x00, 0x20, 0x01, 0x06,
+	0x00, 0x04, 0x00, 0x04, 0x00, 0x20, 0x09, 0x06,
 	0x50, 0x00, 0x08, 0x00, 0x00, 0x00, 0x24, 0x00,
 	0x04, 0x00, 0x10, 0xdc, 0x58, 0xd7, 0x0d, 0x0f,
 	// Entry 6C0 - 6FF
-	0x14, 0x4d, 0xf1, 0x16, 0x44, 0xd5, 0x42, 0x08,
-	0x40, 0x00, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00,
+	0x54, 0x4d, 0xf1, 0x16, 0x44, 0xd5, 0x42, 0x08,
+	0x40, 0x02, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00,
 	0x00, 0xdc, 0xfb, 0xcb, 0x0e, 0x58, 0x48, 0x41,
 	0x24, 0x20, 0x04, 0x00, 0x30, 0x12, 0x40, 0x00,
 	0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -513,7 +513,7 @@ var langNoIndex = [2197]uint8{
 	0x00, 0x00, 0x00, 0x80, 0x80, 0x25, 0x00, 0x00,
 	// Entry 700 - 73F
 	0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
-	0x80, 0x86, 0xc2, 0x00, 0x00, 0x00, 0x00, 0x01,
+	0x80, 0x86, 0xc2, 0x00, 0x00, 0x01, 0x00, 0x01,
 	0xff, 0x18, 0x02, 0x00, 0x02, 0xf0, 0xfd, 0x79,
 	0x3b, 0x00, 0x25, 0x00, 0x00, 0x00, 0x02, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00,
@@ -522,7 +522,7 @@ var langNoIndex = [2197]uint8{
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	// Entry 740 - 77F
 	0x00, 0x00, 0x00, 0xef, 0xd5, 0xfd, 0xcf, 0x7e,
-	0xb0, 0x11, 0x00, 0x00, 0x00, 0x92, 0x01, 0x44,
+	0xb0, 0x11, 0x00, 0x00, 0x00, 0x92, 0x01, 0x46,
 	0xcd, 0xf9, 0x5c, 0x00, 0x01, 0x00, 0x30, 0x04,
 	0x04, 0x55, 0x00, 0x01, 0x04, 0xf4, 0x3f, 0x4a,
 	0x01, 0x00, 0x00, 0xb0, 0x80, 0x20, 0x55, 0x75,
@@ -530,12 +530,12 @@ var langNoIndex = [2197]uint8{
 	0xd5, 0x57, 0x27, 0x14, 0x01, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x2c, 0xf7, 0xcb, 0x1f, 0x14, 0x60,
 	// Entry 780 - 7BF
-	0x03, 0x68, 0x01, 0x10, 0x8b, 0x38, 0x8a, 0x01,
+	0x83, 0x68, 0x01, 0x10, 0x8b, 0x38, 0x8a, 0x01,
 	0x00, 0x00, 0x20, 0x00, 0x24, 0x44, 0x00, 0x00,
-	0x10, 0x03, 0x11, 0x02, 0x01, 0x00, 0x00, 0xf0,
+	0x10, 0x03, 0x31, 0x02, 0x01, 0x00, 0x00, 0xf0,
 	0xf5, 0xff, 0xd5, 0x97, 0xbc, 0x70, 0xd6, 0x78,
-	0x78, 0x15, 0x50, 0x01, 0xa4, 0x84, 0xa9, 0x41,
-	0x00, 0x00, 0x00, 0x6b, 0x39, 0x52, 0x74, 0x00,
+	0x78, 0x15, 0x50, 0x05, 0xa4, 0x84, 0xa9, 0x41,
+	0x00, 0x00, 0x00, 0x6b, 0x39, 0x52, 0x74, 0x40,
 	0xe8, 0x30, 0x90, 0x6a, 0x92, 0x00, 0x00, 0x02,
 	0xff, 0xef, 0xff, 0x4b, 0x85, 0x53, 0xf4, 0xed,
 	// Entry 7C0 - 7FF
@@ -545,11 +545,11 @@ var langNoIndex = [2197]uint8{
 	0xbd, 0xa4, 0xaf, 0x01, 0x44, 0x18, 0x01, 0x4d,
 	0x4e, 0x4a, 0x08, 0x50, 0x28, 0x30, 0xe0, 0x80,
 	0x10, 0x20, 0x24, 0x00, 0xff, 0x2f, 0xd3, 0x60,
-	0xfe, 0x01, 0x02, 0x88, 0x0a, 0x40, 0x16, 0x01,
+	0xfe, 0x01, 0x02, 0x88, 0x2a, 0x40, 0x16, 0x01,
 	0x01, 0x15, 0x2b, 0x3c, 0x01, 0x00, 0x00, 0x10,
 	// Entry 800 - 83F
 	0x90, 0x49, 0x41, 0x02, 0x02, 0x01, 0xe1, 0xbf,
-	0xbf, 0x03, 0x00, 0x00, 0x10, 0xd4, 0xa3, 0xd1,
+	0xbf, 0x03, 0x00, 0x00, 0x10, 0xdc, 0xa3, 0xd1,
 	0x40, 0x9c, 0x44, 0xdf, 0xf5, 0x8f, 0x66, 0xb3,
 	0x55, 0x20, 0xd4, 0xc1, 0xd8, 0x30, 0x3d, 0x80,
 	0x00, 0x00, 0x00, 0x04, 0xd4, 0x11, 0xc5, 0x84,
@@ -557,11 +557,11 @@ var langNoIndex = [2197]uint8{
 	0x07, 0x00, 0x20, 0x10, 0x84, 0xb2, 0x45, 0x10,
 	0x06, 0x44, 0x00, 0x00, 0x12, 0x02, 0x11, 0x00,
 	// Entry 840 - 87F
-	0xf0, 0xfb, 0xfd, 0x7f, 0x05, 0x00, 0x16, 0x81,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x02,
+	0xf0, 0xfb, 0xfd, 0x7f, 0x05, 0x00, 0x16, 0x89,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x03,
 	0x00, 0x00, 0x00, 0x00, 0x03, 0x30, 0x02, 0x28,
 	0x84, 0x00, 0x21, 0xc0, 0x23, 0x24, 0x00, 0x00,
-	0x00, 0xcb, 0xe4, 0x3a, 0x46, 0x88, 0x14, 0xf1,
+	0x00, 0xcb, 0xe4, 0x3a, 0x46, 0x88, 0x54, 0xf1,
 	0xef, 0xff, 0x7f, 0x12, 0x01, 0x01, 0x84, 0x50,
 	0x07, 0xfc, 0xff, 0xff, 0x0f, 0x01, 0x00, 0x40,
 	0x10, 0x38, 0x01, 0x01, 0x1c, 0x12, 0x40, 0xe1,
@@ -583,8 +583,8 @@ var altLangIndex = [6]uint16{
 }
 
 // AliasMap maps langIDs to their suggested replacements.
-// Size: 716 bytes, 179 elements
-var AliasMap = [179]FromTo{
+// Size: 772 bytes, 193 elements
+var AliasMap = [193]FromTo{
 	0:   {From: 0x82, To: 0x88},
 	1:   {From: 0x187, To: 0x1ae},
 	2:   {From: 0x1f3, To: 0x1e1},
@@ -599,223 +599,239 @@ var AliasMap = [179]FromTo{
 	11:  {From: 0x4a2, To: 0x21},
 	12:  {From: 0x53e, To: 0x544},
 	13:  {From: 0x58f, To: 0x12d},
-	14:  {From: 0x630, To: 0x1eb1},
-	15:  {From: 0x651, To: 0x431},
-	16:  {From: 0x662, To: 0x431},
-	17:  {From: 0x6ed, To: 0x3a},
-	18:  {From: 0x6f8, To: 0x1d7},
-	19:  {From: 0x709, To: 0x3625},
-	20:  {From: 0x73e, To: 0x21a1},
-	21:  {From: 0x7b3, To: 0x56},
-	22:  {From: 0x7b9, To: 0x299b},
-	23:  {From: 0x7c5, To: 0x58},
-	24:  {From: 0x7e6, To: 0x145},
-	25:  {From: 0x80c, To: 0x5a},
-	26:  {From: 0x815, To: 0x8d},
-	27:  {From: 0x87e, To: 0x810},
-	28:  {From: 0x8a8, To: 0x8b7},
-	29:  {From: 0x8c3, To: 0xee3},
-	30:  {From: 0x8fa, To: 0x1dc},
-	31:  {From: 0x9ef, To: 0x331},
-	32:  {From: 0xa36, To: 0x2c5},
-	33:  {From: 0xa3d, To: 0xbf},
-	34:  {From: 0xabe, To: 0x3322},
-	35:  {From: 0xb38, To: 0x529},
-	36:  {From: 0xb75, To: 0x265a},
-	37:  {From: 0xb7e, To: 0xbc3},
-	38:  {From: 0xb9b, To: 0x44e},
-	39:  {From: 0xbbc, To: 0x4229},
-	40:  {From: 0xbbf, To: 0x529},
-	41:  {From: 0xbfe, To: 0x2da7},
-	42:  {From: 0xc2e, To: 0x3181},
-	43:  {From: 0xcb9, To: 0xf3},
-	44:  {From: 0xd08, To: 0xfa},
-	45:  {From: 0xdc8, To: 0x11a},
-	46:  {From: 0xdd7, To: 0x32d},
-	47:  {From: 0xdf8, To: 0xdfb},
-	48:  {From: 0xdfe, To: 0x531},
-	49:  {From: 0xe01, To: 0xdf3},
-	50:  {From: 0xedf, To: 0x205a},
-	51:  {From: 0xee9, To: 0x222e},
-	52:  {From: 0xeee, To: 0x2e9a},
-	53:  {From: 0xf39, To: 0x367},
-	54:  {From: 0x10d0, To: 0x140},
-	55:  {From: 0x1104, To: 0x2d0},
-	56:  {From: 0x11a0, To: 0x1ec},
-	57:  {From: 0x1279, To: 0x21},
-	58:  {From: 0x1424, To: 0x15e},
-	59:  {From: 0x1470, To: 0x14e},
-	60:  {From: 0x151f, To: 0xd9b},
-	61:  {From: 0x1523, To: 0x390},
-	62:  {From: 0x1532, To: 0x19f},
-	63:  {From: 0x1580, To: 0x210},
-	64:  {From: 0x1583, To: 0x10d},
-	65:  {From: 0x15a3, To: 0x3caf},
-	66:  {From: 0x1630, To: 0x222e},
-	67:  {From: 0x166a, To: 0x19b},
-	68:  {From: 0x16c8, To: 0x136},
-	69:  {From: 0x1700, To: 0x29f8},
-	70:  {From: 0x1718, To: 0x194},
-	71:  {From: 0x1727, To: 0xf3f},
-	72:  {From: 0x177a, To: 0x178},
-	73:  {From: 0x1809, To: 0x17b6},
-	74:  {From: 0x1816, To: 0x18f3},
-	75:  {From: 0x188a, To: 0x436},
-	76:  {From: 0x1979, To: 0x1d01},
-	77:  {From: 0x1a74, To: 0x2bb0},
-	78:  {From: 0x1a8a, To: 0x1f8},
-	79:  {From: 0x1b5a, To: 0x1fa},
-	80:  {From: 0x1b86, To: 0x1515},
-	81:  {From: 0x1d64, To: 0x2c9b},
-	82:  {From: 0x2038, To: 0x37b1},
-	83:  {From: 0x203d, To: 0x20dd},
-	84:  {From: 0x205a, To: 0x30b},
-	85:  {From: 0x20e3, To: 0x274},
-	86:  {From: 0x20ee, To: 0x263},
-	87:  {From: 0x20f2, To: 0x22d},
-	88:  {From: 0x20f9, To: 0x256},
-	89:  {From: 0x210f, To: 0x21eb},
-	90:  {From: 0x2135, To: 0x27d},
-	91:  {From: 0x2160, To: 0x913},
-	92:  {From: 0x2199, To: 0x121},
-	93:  {From: 0x21ce, To: 0x1561},
-	94:  {From: 0x21e6, To: 0x504},
-	95:  {From: 0x21f4, To: 0x49f},
-	96:  {From: 0x21fb, To: 0x269},
-	97:  {From: 0x222d, To: 0x121},
-	98:  {From: 0x2237, To: 0x121},
-	99:  {From: 0x2262, To: 0x92a},
-	100: {From: 0x2316, To: 0x3226},
-	101: {From: 0x236a, To: 0x2835},
-	102: {From: 0x2382, To: 0x3365},
-	103: {From: 0x2472, To: 0x2c7},
-	104: {From: 0x24e4, To: 0x2ff},
-	105: {From: 0x24f0, To: 0x2fa},
-	106: {From: 0x24fa, To: 0x31f},
-	107: {From: 0x2550, To: 0xb5b},
-	108: {From: 0x25a9, To: 0xe2},
-	109: {From: 0x263e, To: 0x2d0},
-	110: {From: 0x26c9, To: 0x26b4},
-	111: {From: 0x26f9, To: 0x3c8},
-	112: {From: 0x2727, To: 0x3caf},
-	113: {From: 0x2755, To: 0x6a4},
-	114: {From: 0x2765, To: 0x26b4},
-	115: {From: 0x2789, To: 0x4358},
-	116: {From: 0x27c9, To: 0x2001},
-	117: {From: 0x28ea, To: 0x27b1},
-	118: {From: 0x28ef, To: 0x2837},
-	119: {From: 0x2914, To: 0x351},
-	120: {From: 0x2986, To: 0x2da7},
-	121: {From: 0x29f0, To: 0x96b},
-	122: {From: 0x2b1a, To: 0x38d},
-	123: {From: 0x2bfc, To: 0x395},
-	124: {From: 0x2c3f, To: 0x3caf},
-	125: {From: 0x2ce1, To: 0x2201},
-	126: {From: 0x2cfc, To: 0x3be},
-	127: {From: 0x2d13, To: 0x597},
-	128: {From: 0x2d47, To: 0x148},
-	129: {From: 0x2d48, To: 0x148},
-	130: {From: 0x2dff, To: 0x2f1},
-	131: {From: 0x2e08, To: 0x19cc},
-	132: {From: 0x2e1a, To: 0x2d95},
-	133: {From: 0x2e21, To: 0x292},
-	134: {From: 0x2e54, To: 0x7d},
-	135: {From: 0x2e65, To: 0x2282},
-	136: {From: 0x2ea0, To: 0x2e9b},
-	137: {From: 0x2eef, To: 0x2ed7},
-	138: {From: 0x3193, To: 0x3c4},
-	139: {From: 0x3366, To: 0x338e},
-	140: {From: 0x342a, To: 0x3dc},
-	141: {From: 0x34ee, To: 0x18d0},
-	142: {From: 0x35c8, To: 0x2c9b},
-	143: {From: 0x35e6, To: 0x412},
-	144: {From: 0x3658, To: 0x246},
-	145: {From: 0x3676, To: 0x3f4},
-	146: {From: 0x36fd, To: 0x445},
-	147: {From: 0x37c0, To: 0x121},
-	148: {From: 0x3816, To: 0x38f2},
-	149: {From: 0x382a, To: 0x2b48},
-	150: {From: 0x382b, To: 0x2c9b},
-	151: {From: 0x382f, To: 0xa9},
-	152: {From: 0x3832, To: 0x3228},
-	153: {From: 0x386c, To: 0x39a6},
-	154: {From: 0x3892, To: 0x3fc0},
-	155: {From: 0x38a5, To: 0x39d7},
-	156: {From: 0x38b4, To: 0x1fa4},
-	157: {From: 0x38b5, To: 0x2e9a},
-	158: {From: 0x395c, To: 0x47e},
-	159: {From: 0x3b4e, To: 0xd91},
-	160: {From: 0x3b78, To: 0x137},
-	161: {From: 0x3c99, To: 0x4bc},
-	162: {From: 0x3fbd, To: 0x100},
-	163: {From: 0x4208, To: 0xa91},
-	164: {From: 0x42be, To: 0x573},
-	165: {From: 0x42f9, To: 0x3f60},
-	166: {From: 0x4378, To: 0x25a},
-	167: {From: 0x43b8, To: 0xe6c},
-	168: {From: 0x43cd, To: 0x10f},
-	169: {From: 0x44af, To: 0x3322},
-	170: {From: 0x44e3, To: 0x512},
-	171: {From: 0x45ca, To: 0x2409},
-	172: {From: 0x45dd, To: 0x26dc},
-	173: {From: 0x4610, To: 0x48ae},
-	174: {From: 0x46ae, To: 0x46a0},
-	175: {From: 0x473e, To: 0x4745},
-	176: {From: 0x4817, To: 0x3503},
-	177: {From: 0x4916, To: 0x31f},
-	178: {From: 0x49a7, To: 0x523},
+	14:  {From: 0x62b, To: 0x34},
+	15:  {From: 0x62f, To: 0x14},
+	16:  {From: 0x630, To: 0x1eb1},
+	17:  {From: 0x651, To: 0x431},
+	18:  {From: 0x662, To: 0x431},
+	19:  {From: 0x6ed, To: 0x3a},
+	20:  {From: 0x6f8, To: 0x1d7},
+	21:  {From: 0x709, To: 0x3625},
+	22:  {From: 0x73e, To: 0x21a1},
+	23:  {From: 0x7b3, To: 0x56},
+	24:  {From: 0x7b9, To: 0x299b},
+	25:  {From: 0x7c5, To: 0x58},
+	26:  {From: 0x7e6, To: 0x145},
+	27:  {From: 0x80c, To: 0x5a},
+	28:  {From: 0x815, To: 0x8d},
+	29:  {From: 0x87e, To: 0x810},
+	30:  {From: 0x8a8, To: 0x8b7},
+	31:  {From: 0x8c3, To: 0xee3},
+	32:  {From: 0x8fa, To: 0x1dc},
+	33:  {From: 0x9ef, To: 0x331},
+	34:  {From: 0xa36, To: 0x2c5},
+	35:  {From: 0xa3d, To: 0xbf},
+	36:  {From: 0xabe, To: 0x3322},
+	37:  {From: 0xb38, To: 0x529},
+	38:  {From: 0xb75, To: 0x265a},
+	39:  {From: 0xb7e, To: 0xbc3},
+	40:  {From: 0xb9b, To: 0x44e},
+	41:  {From: 0xbbc, To: 0x4229},
+	42:  {From: 0xbbf, To: 0x529},
+	43:  {From: 0xbfe, To: 0x2da7},
+	44:  {From: 0xc2e, To: 0x3181},
+	45:  {From: 0xcb9, To: 0xf3},
+	46:  {From: 0xd08, To: 0xfa},
+	47:  {From: 0xdc8, To: 0x11a},
+	48:  {From: 0xdd7, To: 0x32d},
+	49:  {From: 0xdf8, To: 0xdfb},
+	50:  {From: 0xdfe, To: 0x531},
+	51:  {From: 0xe01, To: 0xdf3},
+	52:  {From: 0xedf, To: 0x205a},
+	53:  {From: 0xee9, To: 0x222e},
+	54:  {From: 0xeee, To: 0x2e9a},
+	55:  {From: 0xf39, To: 0x367},
+	56:  {From: 0x10d0, To: 0x140},
+	57:  {From: 0x1104, To: 0x2d0},
+	58:  {From: 0x11a0, To: 0x1ec},
+	59:  {From: 0x1279, To: 0x21},
+	60:  {From: 0x1424, To: 0x15e},
+	61:  {From: 0x1470, To: 0x14e},
+	62:  {From: 0x151f, To: 0xd9b},
+	63:  {From: 0x1523, To: 0x390},
+	64:  {From: 0x1532, To: 0x19f},
+	65:  {From: 0x1580, To: 0x210},
+	66:  {From: 0x1583, To: 0x10d},
+	67:  {From: 0x15a3, To: 0x3caf},
+	68:  {From: 0x1630, To: 0x222e},
+	69:  {From: 0x166a, To: 0x19b},
+	70:  {From: 0x16c8, To: 0x136},
+	71:  {From: 0x1700, To: 0x29f8},
+	72:  {From: 0x1718, To: 0x194},
+	73:  {From: 0x1727, To: 0xf3f},
+	74:  {From: 0x177a, To: 0x178},
+	75:  {From: 0x1809, To: 0x17b6},
+	76:  {From: 0x1816, To: 0x18f3},
+	77:  {From: 0x188a, To: 0x436},
+	78:  {From: 0x1979, To: 0x1d01},
+	79:  {From: 0x1a74, To: 0x2bb0},
+	80:  {From: 0x1a8a, To: 0x1f8},
+	81:  {From: 0x1b5a, To: 0x1fa},
+	82:  {From: 0x1b86, To: 0x1515},
+	83:  {From: 0x1d64, To: 0x2c9b},
+	84:  {From: 0x2038, To: 0x37b1},
+	85:  {From: 0x203d, To: 0x20dd},
+	86:  {From: 0x2042, To: 0x2e00},
+	87:  {From: 0x205a, To: 0x30b},
+	88:  {From: 0x20e3, To: 0x274},
+	89:  {From: 0x20ee, To: 0x263},
+	90:  {From: 0x20f2, To: 0x22d},
+	91:  {From: 0x20f9, To: 0x256},
+	92:  {From: 0x210f, To: 0x21eb},
+	93:  {From: 0x2135, To: 0x27d},
+	94:  {From: 0x2160, To: 0x913},
+	95:  {From: 0x2199, To: 0x121},
+	96:  {From: 0x21ce, To: 0x1561},
+	97:  {From: 0x21e6, To: 0x504},
+	98:  {From: 0x21f4, To: 0x49f},
+	99:  {From: 0x21fb, To: 0x269},
+	100: {From: 0x222d, To: 0x121},
+	101: {From: 0x2237, To: 0x121},
+	102: {From: 0x2248, To: 0x217d},
+	103: {From: 0x2262, To: 0x92a},
+	104: {From: 0x2316, To: 0x3226},
+	105: {From: 0x236a, To: 0x2835},
+	106: {From: 0x2382, To: 0x3365},
+	107: {From: 0x2472, To: 0x2c7},
+	108: {From: 0x24e4, To: 0x2ff},
+	109: {From: 0x24f0, To: 0x2fa},
+	110: {From: 0x24fa, To: 0x31f},
+	111: {From: 0x2550, To: 0xb5b},
+	112: {From: 0x25a9, To: 0xe2},
+	113: {From: 0x263e, To: 0x2d0},
+	114: {From: 0x26c9, To: 0x26b4},
+	115: {From: 0x26f9, To: 0x3c8},
+	116: {From: 0x2727, To: 0x3caf},
+	117: {From: 0x2755, To: 0x6a4},
+	118: {From: 0x2765, To: 0x26b4},
+	119: {From: 0x2789, To: 0x4358},
+	120: {From: 0x27c9, To: 0x2001},
+	121: {From: 0x28ea, To: 0x27b1},
+	122: {From: 0x28ef, To: 0x2837},
+	123: {From: 0x28fe, To: 0xaa5},
+	124: {From: 0x2914, To: 0x351},
+	125: {From: 0x2986, To: 0x2da7},
+	126: {From: 0x29f0, To: 0x96b},
+	127: {From: 0x2b1a, To: 0x38d},
+	128: {From: 0x2bfc, To: 0x395},
+	129: {From: 0x2c3f, To: 0x3caf},
+	130: {From: 0x2ce1, To: 0x2201},
+	131: {From: 0x2cfc, To: 0x3be},
+	132: {From: 0x2d13, To: 0x597},
+	133: {From: 0x2d47, To: 0x148},
+	134: {From: 0x2d48, To: 0x148},
+	135: {From: 0x2dff, To: 0x2f1},
+	136: {From: 0x2e08, To: 0x19cc},
+	137: {From: 0x2e10, To: 0xc45},
+	138: {From: 0x2e1a, To: 0x2d95},
+	139: {From: 0x2e21, To: 0x292},
+	140: {From: 0x2e54, To: 0x7d},
+	141: {From: 0x2e65, To: 0x2282},
+	142: {From: 0x2e97, To: 0x1a4},
+	143: {From: 0x2ea0, To: 0x2e9b},
+	144: {From: 0x2eef, To: 0x2ed7},
+	145: {From: 0x3193, To: 0x3c4},
+	146: {From: 0x3366, To: 0x338e},
+	147: {From: 0x342a, To: 0x3dc},
+	148: {From: 0x34ee, To: 0x18d0},
+	149: {From: 0x35c8, To: 0x2c9b},
+	150: {From: 0x35e6, To: 0x412},
+	151: {From: 0x35f5, To: 0x24b},
+	152: {From: 0x360d, To: 0x1dc},
+	153: {From: 0x3658, To: 0x246},
+	154: {From: 0x3676, To: 0x3f4},
+	155: {From: 0x36fd, To: 0x445},
+	156: {From: 0x3747, To: 0x3b42},
+	157: {From: 0x37c0, To: 0x121},
+	158: {From: 0x3816, To: 0x38f2},
+	159: {From: 0x382a, To: 0x2b48},
+	160: {From: 0x382b, To: 0x2c9b},
+	161: {From: 0x382f, To: 0xa9},
+	162: {From: 0x3832, To: 0x3228},
+	163: {From: 0x386c, To: 0x39a6},
+	164: {From: 0x3892, To: 0x3fc0},
+	165: {From: 0x38a0, To: 0x45f},
+	166: {From: 0x38a5, To: 0x39d7},
+	167: {From: 0x38b4, To: 0x1fa4},
+	168: {From: 0x38b5, To: 0x2e9a},
+	169: {From: 0x38fa, To: 0x38f1},
+	170: {From: 0x395c, To: 0x47e},
+	171: {From: 0x3b4e, To: 0xd91},
+	172: {From: 0x3b78, To: 0x137},
+	173: {From: 0x3c99, To: 0x4bc},
+	174: {From: 0x3fbd, To: 0x100},
+	175: {From: 0x4208, To: 0xa91},
+	176: {From: 0x42be, To: 0x573},
+	177: {From: 0x42f9, To: 0x3f60},
+	178: {From: 0x4378, To: 0x25a},
+	179: {From: 0x43b8, To: 0xe6c},
+	180: {From: 0x43cd, To: 0x10f},
+	181: {From: 0x43d4, To: 0x4848},
+	182: {From: 0x44af, To: 0x3322},
+	183: {From: 0x44e3, To: 0x512},
+	184: {From: 0x45ca, To: 0x2409},
+	185: {From: 0x45dd, To: 0x26dc},
+	186: {From: 0x4610, To: 0x48ae},
+	187: {From: 0x46ae, To: 0x46a0},
+	188: {From: 0x473e, To: 0x4745},
+	189: {From: 0x4817, To: 0x3503},
+	190: {From: 0x483b, To: 0x208b},
+	191: {From: 0x4916, To: 0x31f},
+	192: {From: 0x49a7, To: 0x523},
 }
 
-// Size: 179 bytes, 179 elements
-var AliasTypes = [179]AliasType{
+// Size: 193 bytes, 193 elements
+var AliasTypes = [193]AliasType{
 	// Entry 0 - 3F
-	1, 0, 0, 0, 0, 0, 0, 1, 2, 2, 0, 1, 0, 0, 1, 2,
-	1, 1, 2, 0, 0, 1, 0, 1, 2, 1, 1, 0, 0, 0, 0, 2,
-	1, 1, 0, 2, 0, 0, 1, 0, 1, 0, 0, 1, 2, 1, 1, 1,
-	1, 0, 0, 0, 0, 2, 1, 1, 1, 1, 2, 1, 0, 1, 1, 2,
+	1, 0, 0, 0, 0, 0, 0, 1, 2, 2, 0, 1, 0, 0, 0, 0,
+	1, 2, 1, 1, 2, 0, 0, 1, 0, 1, 2, 1, 1, 0, 0, 0,
+	0, 2, 1, 1, 0, 2, 0, 0, 1, 0, 1, 0, 0, 1, 2, 1,
+	1, 1, 1, 0, 0, 0, 0, 2, 1, 1, 1, 1, 2, 1, 0, 1,
 	// Entry 40 - 7F
-	2, 0, 0, 1, 2, 0, 1, 0, 1, 1, 1, 1, 0, 0, 2, 1,
-	0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0,
-	0, 0, 0, 1, 0, 0, 0, 1, 2, 2, 2, 0, 1, 1, 0, 1,
-	0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0,
+	1, 2, 2, 0, 0, 1, 2, 0, 1, 0, 1, 1, 1, 1, 0, 0,
+	2, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 2, 2, 2, 0,
+	1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1,
 	// Entry 80 - BF
-	2, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 2, 0, 0, 2,
-	1, 1, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 1,
-	0, 1, 2, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1,
-	0, 1, 1,
+	1, 0, 0, 1, 0, 2, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0,
+	0, 1, 1, 2, 0, 0, 2, 0, 0, 1, 1, 1, 0, 0, 0, 0,
+	0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 2, 0,
+	0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1,
+	// Entry C0 - FF
+	1,
 }
 
 const (
-	_Latn = 90
+	_Latn = 91
 	_Hani = 57
 	_Hans = 59
 	_Hant = 60
-	_Qaaa = 147
-	_Qaai = 155
-	_Qabx = 196
-	_Zinh = 252
-	_Zyyy = 257
-	_Zzzz = 258
+	_Qaaa = 149
+	_Qaai = 157
+	_Qabx = 198
+	_Zinh = 255
+	_Zyyy = 260
+	_Zzzz = 261
 )
 
 // script is an alphabetically sorted list of ISO 15924 codes. The index
 // of the script in the string, divided by 4, is the internal scriptID.
-const script tag.Index = "" + // Size: 1040 bytes
+const script tag.Index = "" + // Size: 1052 bytes
 	"----AdlmAfakAghbAhomArabAranArmiArmnAvstBaliBamuBassBatkBengBhksBlisBopo" +
 	"BrahBraiBugiBuhdCakmCansCariChamCherChrsCirtCoptCpmnCprtCyrlCyrsDevaDiak" +
 	"DogrDsrtDuplEgydEgyhEgypElbaElymEthiGeokGeorGlagGongGonmGothGranGrekGujr" +
 	"GuruHanbHangHaniHanoHansHantHatrHebrHiraHluwHmngHmnpHrktHungIndsItalJamo" +
-	"JavaJpanJurcKaliKanaKharKhmrKhojKitlKitsKndaKoreKpelKthiLanaLaooLatfLatg" +
-	"LatnLekeLepcLimbLinaLinbLisuLomaLyciLydiMahjMakaMandManiMarcMayaMedfMend" +
-	"MercMeroMlymModiMongMoonMrooMteiMultMymrNandNarbNbatNewaNkdbNkgbNkooNshu" +
-	"OgamOlckOrkhOryaOsgeOsmaOugrPalmPaucPcunPelmPermPhagPhliPhlpPhlvPhnxPiqd" +
-	"PlrdPrtiPsinQaaaQaabQaacQaadQaaeQaafQaagQaahQaaiQaajQaakQaalQaamQaanQaao" +
-	"QaapQaaqQaarQaasQaatQaauQaavQaawQaaxQaayQaazQabaQabbQabcQabdQabeQabfQabg" +
-	"QabhQabiQabjQabkQablQabmQabnQaboQabpQabqQabrQabsQabtQabuQabvQabwQabxRanj" +
-	"RjngRohgRoroRunrSamrSaraSarbSaurSgnwShawShrdShuiSiddSindSinhSogdSogoSora" +
-	"SoyoSundSyloSyrcSyreSyrjSyrnTagbTakrTaleTaluTamlTangTavtTeluTengTfngTglg" +
-	"ThaaThaiTibtTirhTnsaTotoUgarVaiiVispVithWaraWchoWoleXpeoXsuxYeziYiiiZanb" +
-	"ZinhZmthZsyeZsymZxxxZyyyZzzz\xff\xff\xff\xff"
+	"JavaJpanJurcKaliKanaKawiKharKhmrKhojKitlKitsKndaKoreKpelKthiLanaLaooLatf" +
+	"LatgLatnLekeLepcLimbLinaLinbLisuLomaLyciLydiMahjMakaMandManiMarcMayaMedf" +
+	"MendMercMeroMlymModiMongMoonMrooMteiMultMymrNagmNandNarbNbatNewaNkdbNkgb" +
+	"NkooNshuOgamOlckOrkhOryaOsgeOsmaOugrPalmPaucPcunPelmPermPhagPhliPhlpPhlv" +
+	"PhnxPiqdPlrdPrtiPsinQaaaQaabQaacQaadQaaeQaafQaagQaahQaaiQaajQaakQaalQaam" +
+	"QaanQaaoQaapQaaqQaarQaasQaatQaauQaavQaawQaaxQaayQaazQabaQabbQabcQabdQabe" +
+	"QabfQabgQabhQabiQabjQabkQablQabmQabnQaboQabpQabqQabrQabsQabtQabuQabvQabw" +
+	"QabxRanjRjngRohgRoroRunrSamrSaraSarbSaurSgnwShawShrdShuiSiddSindSinhSogd" +
+	"SogoSoraSoyoSundSunuSyloSyrcSyreSyrjSyrnTagbTakrTaleTaluTamlTangTavtTelu" +
+	"TengTfngTglgThaaThaiTibtTirhTnsaTotoUgarVaiiVispVithWaraWchoWoleXpeoXsux" +
+	"YeziYiiiZanbZinhZmthZsyeZsymZxxxZyyyZzzz\xff\xff\xff\xff"
 
 // suppressScript is an index from langID to the dominant script for that language,
 // if it exists.  If a script is given, it should be suppressed from the language tag.
@@ -824,7 +840,7 @@ var suppressScript = [1330]uint8{
 	// Entry 0 - 3F
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -833,7 +849,7 @@ var suppressScript = [1330]uint8{
 	// Entry 40 - 7F
 	0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -846,53 +862,53 @@ var suppressScript = [1330]uint8{
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	// Entry C0 - FF
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00,
 	// Entry 100 - 13F
-	0x5a, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x00, 0x00,
+	0x5b, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xea, 0x00, 0x00, 0x00, 0x00, 0xec, 0x00, 0x00,
+	0xed, 0x00, 0x00, 0x00, 0x00, 0xef, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x00,
-	0x00, 0x5a, 0x00, 0x00, 0x5a, 0x00, 0x5a, 0x00,
+	0x00, 0x5b, 0x00, 0x00, 0x5b, 0x00, 0x5b, 0x00,
 	// Entry 140 - 17F
-	0x5a, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x00, 0x00,
+	0x5b, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00,
 	0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x5a, 0x00, 0x00, 0x00, 0x5a, 0x00, 0x00,
-	0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x00,
-	0x00, 0x5a, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x5a, 0x00,
+	0x00, 0x5b, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00,
+	0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00,
+	0x00, 0x5b, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x5b, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	// Entry 180 - 1BF
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x5a, 0x00, 0x00, 0x00, 0x5a, 0x00, 0x00, 0x00,
+	0x5b, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x5a, 0x35, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x5a, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x5b, 0x35, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x22, 0x00,
 	// Entry 1C0 - 1FF
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x5a, 0x5a, 0x00, 0x5a, 0x5a, 0x00, 0x08,
+	0x00, 0x5b, 0x5b, 0x00, 0x5b, 0x5b, 0x00, 0x08,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x5a, 0x00, 0x00, 0x00, 0x00,
-	0x5a, 0x5a, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00,
+	0x5b, 0x5b, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00,
 	// Entry 200 - 23F
 	0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -903,9 +919,9 @@ var suppressScript = [1330]uint8{
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	// Entry 240 - 27F
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x5a, 0x00, 0x00,
-	0x00, 0x00, 0x4e, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x52, 0x00, 0x00, 0x53, 0x00, 0x22, 0x00,
+	0x00, 0x00, 0x20, 0x00, 0x00, 0x5b, 0x00, 0x00,
+	0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x53, 0x00, 0x00, 0x54, 0x00, 0x22, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -913,93 +929,93 @@ var suppressScript = [1330]uint8{
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	// Entry 280 - 2BF
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x00, 0x00,
-	0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00,
+	0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	// Entry 2C0 - 2FF
-	0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a,
+	0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a,
+	0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,
 	// Entry 300 - 33F
-	0x00, 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x5a,
-	0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x5b,
+	0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x00,
+	0x00, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00,
 	// Entry 340 - 37F
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x00,
-	0x5a, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00,
+	0x5b, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a,
-	0x00, 0x00, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x5a,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x5a, 0x00,
-	0x00, 0x00, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
+	0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x5b,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x5b, 0x00,
+	0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00,
 	// Entry 380 - 3BF
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x5a, 0x00, 0x00, 0x00, 0x00, 0x81, 0x00, 0x00,
+	0x5b, 0x00, 0x00, 0x00, 0x00, 0x83, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x5a, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
 	// Entry 3C0 - 3FF
-	0x5a, 0x00, 0x00, 0x00, 0x5a, 0x00, 0x00, 0x00,
+	0x5b, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x5a, 0x00, 0x00, 0x00,
-	0x00, 0x5a, 0x00, 0x00, 0x5a, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x5a, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00,
+	0x00, 0x5b, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x20, 0x00, 0x00, 0x5b, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	// Entry 400 - 43F
-	0x00, 0x00, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xd4, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x5a, 0x00, 0x00, 0x00, 0x5a, 0x00,
-	0x00, 0x00, 0x00, 0x5a, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xd6, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x5b, 0x00,
+	0x00, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a,
-	0x00, 0x00, 0x00, 0x5a, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
+	0x00, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00,
 	// Entry 440 - 47F
-	0x00, 0x00, 0x00, 0x00, 0x5a, 0x5a, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x5b, 0x5b, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xe3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xe6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0xe6, 0x00, 0x5a, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0xeb, 0x00, 0x00, 0x00, 0x2c,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a,
-	0x00, 0x00, 0x5a, 0x00, 0x00, 0x00, 0x5a, 0x00,
+	0x00, 0xe9, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xee, 0x00, 0x00, 0x00, 0x2c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
+	0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x5b, 0x00,
 	// Entry 480 - 4BF
-	0x5a, 0x00, 0x5a, 0x00, 0x00, 0x00, 0x5a, 0x00,
-	0x00, 0x00, 0x5a, 0x00, 0x00, 0x00, 0x5a, 0x00,
+	0x5b, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x5b, 0x00,
+	0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x5b, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	// Entry 4C0 - 4FF
-	0x5a, 0x00, 0x00, 0x5a, 0x00, 0x00, 0x00, 0x00,
+	0x5b, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	// Entry 500 - 53F
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1007,7 +1023,7 @@ var suppressScript = [1330]uint8{
 	0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
 	0x00, 0x00,
 }
 
@@ -1016,16 +1032,16 @@ const (
 	_419 = 31
 	_BR  = 65
 	_CA  = 73
-	_ES  = 110
-	_GB  = 123
-	_MD  = 188
-	_PT  = 238
-	_UK  = 306
-	_US  = 309
-	_ZZ  = 357
-	_XA  = 323
-	_XC  = 325
-	_XK  = 333
+	_ES  = 111
+	_GB  = 124
+	_MD  = 189
+	_PT  = 239
+	_UK  = 307
+	_US  = 310
+	_ZZ  = 358
+	_XA  = 324
+	_XC  = 326
+	_XK  = 334
 )
 
 // isoRegionOffset needs to be added to the index of regionISO to obtain the regionID
@@ -1034,8 +1050,8 @@ const (
 const isoRegionOffset = 32
 
 // regionTypes defines the status of a region for various standards.
-// Size: 358 bytes, 358 elements
-var regionTypes = [358]uint8{
+// Size: 359 bytes, 359 elements
+var regionTypes = [359]uint8{
 	// Entry 0 - 3F
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1048,45 +1064,45 @@ var regionTypes = [358]uint8{
 	// Entry 40 - 7F
 	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06,
 	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04,
-	0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04,
-	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06,
-	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06,
+	0x04, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x00,
 	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x00, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06,
 	// Entry 80 - BF
 	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
 	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x00, 0x04, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x00, 0x04, 0x06, 0x06,
 	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06,
 	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
 	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
 	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
 	// Entry C0 - FF
-	0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06,
 	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00,
-	0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x04, 0x06,
-	0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00,
-	0x06, 0x06, 0x00, 0x06, 0x05, 0x05, 0x05, 0x05,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x00, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x04,
+	0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x00, 0x06, 0x06, 0x00, 0x06, 0x05, 0x05, 0x05,
 	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
 	// Entry 100 - 13F
-	0x05, 0x05, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06,
+	0x05, 0x05, 0x05, 0x06, 0x00, 0x06, 0x06, 0x06,
 	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
 	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04,
 	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
 	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x02, 0x06, 0x04, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x02, 0x06, 0x04, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06,
 	// Entry 140 - 17F
-	0x06, 0x00, 0x06, 0x05, 0x05, 0x05, 0x05, 0x05,
+	0x06, 0x06, 0x00, 0x06, 0x05, 0x05, 0x05, 0x05,
 	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
 	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-	0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 0x06, 0x06,
-	0x04, 0x06, 0x06, 0x04, 0x06, 0x05,
+	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 0x06,
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 0x05,
 }
 
 // regionISO holds a list of alphabetically sorted 2-letter ISO region codes.
@@ -1094,27 +1110,27 @@ var regionTypes = [358]uint8{
 //   - [A-Z}{2}: the first letter of the 2-letter code plus these two
 //     letters form the 3-letter ISO code.
 //   - 0, n:     index into altRegionISO3.
-const regionISO tag.Index = "" + // Size: 1308 bytes
+const regionISO tag.Index = "" + // Size: 1312 bytes
 	"AAAAACSCADNDAEREAFFGAGTGAIIAALLBAMRMANNTAOGOAQTAARRGASSMATUTAUUSAWBWAXLA" +
 	"AZZEBAIHBBRBBDGDBEELBFFABGGRBHHRBIDIBJENBLLMBMMUBNRNBOOLBQESBRRABSHSBTTN" +
 	"BUURBVVTBWWABYLRBZLZCAANCCCKCDODCFAFCGOGCHHECIIVCKOKCLHLCMMRCNHNCOOLCPPT" +
-	"CRRICS\x00\x00CTTECUUBCVPVCWUWCXXRCYYPCZZEDDDRDEEUDGGADJJIDKNKDMMADOOMDY" +
-	"HYDZZAEA  ECCUEESTEGGYEHSHERRIESSPETTHEU\x00\x03EZ  FIINFJJIFKLKFMSMFORO" +
-	"FQ\x00\x18FRRAFXXXGAABGBBRGDRDGEEOGFUFGGGYGHHAGIIBGLRLGMMBGNINGPLPGQNQGR" +
-	"RCGS\x00\x06GTTMGUUMGWNBGYUYHKKGHMMDHNNDHRRVHTTIHUUNHVVOIC  IDDNIERLILSR" +
-	"IMMNINNDIOOTIQRQIRRNISSLITTAJEEYJMAMJOORJPPNJTTNKEENKGGZKHHMKIIRKM\x00" +
-	"\x09KNNAKP\x00\x0cKRORKWWTKY\x00\x0fKZAZLAAOLBBNLCCALIIELKKALRBRLSSOLTTU" +
-	"LUUXLVVALYBYMAARMCCOMDDAMENEMFAFMGDGMHHLMIIDMKKDMLLIMMMRMNNGMOACMPNPMQTQ" +
-	"MRRTMSSRMTLTMUUSMVDVMWWIMXEXMYYSMZOZNAAMNCCLNEERNFFKNGGANHHBNIICNLLDNOOR" +
-	"NPPLNQ\x00\x1eNRRUNTTZNUIUNZZLOMMNPAANPCCIPEERPFYFPGNGPHHLPKAKPLOLPM\x00" +
-	"\x12PNCNPRRIPSSEPTRTPUUSPWLWPYRYPZCZQAATQMMMQNNNQOOOQPPPQQQQQRRRQSSSQTTT" +
-	"QU\x00\x03QVVVQWWWQXXXQYYYQZZZREEURHHOROOURS\x00\x15RUUSRWWASAAUSBLBSCYC" +
-	"SDDNSEWESGGPSHHNSIVNSJJMSKVKSLLESMMRSNENSOOMSRURSSSDSTTPSUUNSVLVSXXMSYYR" +
-	"SZWZTAAATCCATDCDTF\x00\x18TGGOTHHATJJKTKKLTLLSTMKMTNUNTOONTPMPTRURTTTOTV" +
-	"UVTWWNTZZAUAKRUGGAUK  UMMIUN  USSAUYRYUZZBVAATVCCTVDDRVEENVGGBVIIRVNNMVU" +
-	"UTWFLFWKAKWSSMXAAAXBBBXCCCXDDDXEEEXFFFXGGGXHHHXIIIXJJJXKKKXLLLXMMMXNNNXO" +
-	"OOXPPPXQQQXRRRXSSSXTTTXUUUXVVVXWWWXXXXXYYYXZZZYDMDYEEMYT\x00\x1bYUUGZAAF" +
-	"ZMMBZRARZWWEZZZZ\xff\xff\xff\xff"
+	"CQ  CRRICS\x00\x00CTTECUUBCVPVCWUWCXXRCYYPCZZEDDDRDEEUDGGADJJIDKNKDMMADO" +
+	"OMDYHYDZZAEA  ECCUEESTEGGYEHSHERRIESSPETTHEU\x00\x03EZ  FIINFJJIFKLKFMSM" +
+	"FOROFQ\x00\x18FRRAFXXXGAABGBBRGDRDGEEOGFUFGGGYGHHAGIIBGLRLGMMBGNINGPLPGQ" +
+	"NQGRRCGS\x00\x06GTTMGUUMGWNBGYUYHKKGHMMDHNNDHRRVHTTIHUUNHVVOIC  IDDNIERL" +
+	"ILSRIMMNINNDIOOTIQRQIRRNISSLITTAJEEYJMAMJOORJPPNJTTNKEENKGGZKHHMKIIRKM" +
+	"\x00\x09KNNAKP\x00\x0cKRORKWWTKY\x00\x0fKZAZLAAOLBBNLCCALIIELKKALRBRLSSO" +
+	"LTTULUUXLVVALYBYMAARMCCOMDDAMENEMFAFMGDGMHHLMIIDMKKDMLLIMMMRMNNGMOACMPNP" +
+	"MQTQMRRTMSSRMTLTMUUSMVDVMWWIMXEXMYYSMZOZNAAMNCCLNEERNFFKNGGANHHBNIICNLLD" +
+	"NOORNPPLNQ\x00\x1eNRRUNTTZNUIUNZZLOMMNPAANPCCIPEERPFYFPGNGPHHLPKAKPLOLPM" +
+	"\x00\x12PNCNPRRIPSSEPTRTPUUSPWLWPYRYPZCZQAATQMMMQNNNQOOOQPPPQQQQQRRRQSSS" +
+	"QTTTQU\x00\x03QVVVQWWWQXXXQYYYQZZZREEURHHOROOURS\x00\x15RUUSRWWASAAUSBLB" +
+	"SCYCSDDNSEWESGGPSHHNSIVNSJJMSKVKSLLESMMRSNENSOOMSRURSSSDSTTPSUUNSVLVSXXM" +
+	"SYYRSZWZTAAATCCATDCDTF\x00\x18TGGOTHHATJJKTKKLTLLSTMKMTNUNTOONTPMPTRURTT" +
+	"TOTVUVTWWNTZZAUAKRUGGAUK  UMMIUN  USSAUYRYUZZBVAATVCCTVDDRVEENVGGBVIIRVN" +
+	"NMVUUTWFLFWKAKWSSMXAAAXBBBXCCCXDDDXEEEXFFFXGGGXHHHXIIIXJJJXKKKXLLLXMMMXN" +
+	"NNXOOOXPPPXQQQXRRRXSSSXTTTXUUUXVVVXWWWXXXXXYYYXZZZYDMDYEEMYT\x00\x1bYUUG" +
+	"ZAAFZMMBZRARZWWEZZZZ\xff\xff\xff\xff"
 
 // altRegionISO3 holds a list of 3-letter region codes that cannot be
 // mapped to 2-letter codes using the default algorithm. This is a short list.
@@ -1124,38 +1140,38 @@ const altRegionISO3 string = "SCGQUUSGSCOMPRKCYMSPMSRBATFMYTATN"
 // of the 3-letter ISO codes in altRegionISO3.
 // Size: 22 bytes, 11 elements
 var altRegionIDs = [11]uint16{
-	0x0057, 0x0070, 0x0088, 0x00a8, 0x00aa, 0x00ad, 0x00ea, 0x0105,
-	0x0121, 0x015f, 0x00dc,
+	0x0058, 0x0071, 0x0089, 0x00a9, 0x00ab, 0x00ae, 0x00eb, 0x0106,
+	0x0122, 0x0160, 0x00dd,
 }
 
 // Size: 80 bytes, 20 elements
 var regionOldMap = [20]FromTo{
-	0:  {From: 0x44, To: 0xc4},
-	1:  {From: 0x58, To: 0xa7},
-	2:  {From: 0x5f, To: 0x60},
-	3:  {From: 0x66, To: 0x3b},
-	4:  {From: 0x79, To: 0x78},
-	5:  {From: 0x93, To: 0x37},
-	6:  {From: 0xa3, To: 0x133},
-	7:  {From: 0xc1, To: 0x133},
-	8:  {From: 0xd7, To: 0x13f},
-	9:  {From: 0xdc, To: 0x2b},
-	10: {From: 0xef, To: 0x133},
-	11: {From: 0xf2, To: 0xe2},
-	12: {From: 0xfc, To: 0x70},
-	13: {From: 0x103, To: 0x164},
-	14: {From: 0x12a, To: 0x126},
-	15: {From: 0x132, To: 0x7b},
-	16: {From: 0x13a, To: 0x13e},
-	17: {From: 0x141, To: 0x133},
-	18: {From: 0x15d, To: 0x15e},
-	19: {From: 0x163, To: 0x4b},
+	0:  {From: 0x44, To: 0xc5},
+	1:  {From: 0x59, To: 0xa8},
+	2:  {From: 0x60, To: 0x61},
+	3:  {From: 0x67, To: 0x3b},
+	4:  {From: 0x7a, To: 0x79},
+	5:  {From: 0x94, To: 0x37},
+	6:  {From: 0xa4, To: 0x134},
+	7:  {From: 0xc2, To: 0x134},
+	8:  {From: 0xd8, To: 0x140},
+	9:  {From: 0xdd, To: 0x2b},
+	10: {From: 0xf0, To: 0x134},
+	11: {From: 0xf3, To: 0xe3},
+	12: {From: 0xfd, To: 0x71},
+	13: {From: 0x104, To: 0x165},
+	14: {From: 0x12b, To: 0x127},
+	15: {From: 0x133, To: 0x7c},
+	16: {From: 0x13b, To: 0x13f},
+	17: {From: 0x142, To: 0x134},
+	18: {From: 0x15e, To: 0x15f},
+	19: {From: 0x164, To: 0x4b},
 }
 
 // m49 maps regionIDs to UN.M49 codes. The first isoRegionOffset entries are
 // codes indicating collections of regions.
-// Size: 716 bytes, 358 elements
-var m49 = [358]int16{
+// Size: 718 bytes, 359 elements
+var m49 = [359]int16{
 	// Entry 0 - 3F
 	0, 1, 2, 3, 5, 9, 11, 13,
 	14, 15, 17, 18, 19, 21, 29, 30,
@@ -1168,45 +1184,45 @@ var m49 = [358]int16{
 	// Entry 40 - 7F
 	535, 76, 44, 64, 104, 74, 72, 112,
 	84, 124, 166, 180, 140, 178, 756, 384,
-	184, 152, 120, 156, 170, 0, 188, 891,
-	296, 192, 132, 531, 162, 196, 203, 278,
-	276, 0, 262, 208, 212, 214, 204, 12,
-	0, 218, 233, 818, 732, 232, 724, 231,
-	967, 0, 246, 242, 238, 583, 234, 0,
-	250, 249, 266, 826, 308, 268, 254, 831,
+	184, 152, 120, 156, 170, 0, 0, 188,
+	891, 296, 192, 132, 531, 162, 196, 203,
+	278, 276, 0, 262, 208, 212, 214, 204,
+	12, 0, 218, 233, 818, 732, 232, 724,
+	231, 967, 0, 246, 242, 238, 583, 234,
+	0, 250, 249, 266, 826, 308, 268, 254,
 	// Entry 80 - BF
-	288, 292, 304, 270, 324, 312, 226, 300,
-	239, 320, 316, 624, 328, 344, 334, 340,
-	191, 332, 348, 854, 0, 360, 372, 376,
-	833, 356, 86, 368, 364, 352, 380, 832,
-	388, 400, 392, 581, 404, 417, 116, 296,
-	174, 659, 408, 410, 414, 136, 398, 418,
-	422, 662, 438, 144, 430, 426, 440, 442,
-	428, 434, 504, 492, 498, 499, 663, 450,
+	831, 288, 292, 304, 270, 324, 312, 226,
+	300, 239, 320, 316, 624, 328, 344, 334,
+	340, 191, 332, 348, 854, 0, 360, 372,
+	376, 833, 356, 86, 368, 364, 352, 380,
+	832, 388, 400, 392, 581, 404, 417, 116,
+	296, 174, 659, 408, 410, 414, 136, 398,
+	418, 422, 662, 438, 144, 430, 426, 440,
+	442, 428, 434, 504, 492, 498, 499, 663,
 	// Entry C0 - FF
-	584, 581, 807, 466, 104, 496, 446, 580,
-	474, 478, 500, 470, 480, 462, 454, 484,
-	458, 508, 516, 540, 562, 574, 566, 548,
-	558, 528, 578, 524, 10, 520, 536, 570,
-	554, 512, 591, 0, 604, 258, 598, 608,
-	586, 616, 666, 612, 630, 275, 620, 581,
-	585, 600, 591, 634, 959, 960, 961, 962,
-	963, 964, 965, 966, 967, 968, 969, 970,
+	450, 584, 581, 807, 466, 104, 496, 446,
+	580, 474, 478, 500, 470, 480, 462, 454,
+	484, 458, 508, 516, 540, 562, 574, 566,
+	548, 558, 528, 578, 524, 10, 520, 536,
+	570, 554, 512, 591, 0, 604, 258, 598,
+	608, 586, 616, 666, 612, 630, 275, 620,
+	581, 585, 600, 591, 634, 959, 960, 961,
+	962, 963, 964, 965, 966, 967, 968, 969,
 	// Entry 100 - 13F
-	971, 972, 638, 716, 642, 688, 643, 646,
-	682, 90, 690, 729, 752, 702, 654, 705,
-	744, 703, 694, 674, 686, 706, 740, 728,
-	678, 810, 222, 534, 760, 748, 0, 796,
-	148, 260, 768, 764, 762, 772, 626, 795,
-	788, 776, 626, 792, 780, 798, 158, 834,
-	804, 800, 826, 581, 0, 840, 858, 860,
-	336, 670, 704, 862, 92, 850, 704, 548,
+	970, 971, 972, 638, 716, 642, 688, 643,
+	646, 682, 90, 690, 729, 752, 702, 654,
+	705, 744, 703, 694, 674, 686, 706, 740,
+	728, 678, 810, 222, 534, 760, 748, 0,
+	796, 148, 260, 768, 764, 762, 772, 626,
+	795, 788, 776, 626, 792, 780, 798, 158,
+	834, 804, 800, 826, 581, 0, 840, 858,
+	860, 336, 670, 704, 862, 92, 850, 704,
 	// Entry 140 - 17F
-	876, 581, 882, 973, 974, 975, 976, 977,
-	978, 979, 980, 981, 982, 983, 984, 985,
-	986, 987, 988, 989, 990, 991, 992, 993,
-	994, 995, 996, 997, 998, 720, 887, 175,
-	891, 710, 894, 180, 716, 999,
+	548, 876, 581, 882, 973, 974, 975, 976,
+	977, 978, 979, 980, 981, 982, 983, 984,
+	985, 986, 987, 988, 989, 990, 991, 992,
+	993, 994, 995, 996, 997, 998, 720, 887,
+	175, 891, 710, 894, 180, 716, 999,
 }
 
 // m49Index gives indexes into fromM49 based on the three most significant bits
@@ -1227,65 +1243,65 @@ var m49Index = [9]int16{
 var fromM49 = [333]uint16{
 	// Entry 0 - 3F
 	0x0201, 0x0402, 0x0603, 0x0824, 0x0a04, 0x1027, 0x1205, 0x142b,
-	0x1606, 0x1867, 0x1a07, 0x1c08, 0x1e09, 0x202d, 0x220a, 0x240b,
+	0x1606, 0x1868, 0x1a07, 0x1c08, 0x1e09, 0x202d, 0x220a, 0x240b,
 	0x260c, 0x2822, 0x2a0d, 0x302a, 0x3825, 0x3a0e, 0x3c0f, 0x3e32,
 	0x402c, 0x4410, 0x4611, 0x482f, 0x4e12, 0x502e, 0x5842, 0x6039,
 	0x6435, 0x6628, 0x6834, 0x6a13, 0x6c14, 0x7036, 0x7215, 0x783d,
 	0x7a16, 0x8043, 0x883f, 0x8c33, 0x9046, 0x9445, 0x9841, 0xa848,
-	0xac9a, 0xb509, 0xb93c, 0xc03e, 0xc838, 0xd0c4, 0xd83a, 0xe047,
-	0xe8a6, 0xf052, 0xf849, 0x085a, 0x10ad, 0x184c, 0x1c17, 0x1e18,
+	0xac9b, 0xb50a, 0xb93d, 0xc03e, 0xc838, 0xd0c5, 0xd83a, 0xe047,
+	0xe8a7, 0xf052, 0xf849, 0x085b, 0x10ae, 0x184c, 0x1c17, 0x1e18,
 	// Entry 40 - 7F
-	0x20b3, 0x2219, 0x2920, 0x2c1a, 0x2e1b, 0x3051, 0x341c, 0x361d,
-	0x3853, 0x3d2e, 0x445c, 0x4c4a, 0x5454, 0x5ca8, 0x5f5f, 0x644d,
-	0x684b, 0x7050, 0x7856, 0x7e90, 0x8059, 0x885d, 0x941e, 0x965e,
-	0x983b, 0xa063, 0xa864, 0xac65, 0xb469, 0xbd1a, 0xc486, 0xcc6f,
-	0xce6f, 0xd06d, 0xd26a, 0xd476, 0xdc74, 0xde88, 0xe473, 0xec72,
-	0xf031, 0xf279, 0xf478, 0xfc7e, 0x04e5, 0x0921, 0x0c62, 0x147a,
-	0x187d, 0x1c83, 0x26ed, 0x2860, 0x2c5f, 0x3060, 0x4080, 0x4881,
-	0x50a7, 0x5887, 0x6082, 0x687c, 0x7085, 0x788a, 0x8089, 0x8884,
+	0x20b4, 0x2219, 0x2921, 0x2c1a, 0x2e1b, 0x3051, 0x341c, 0x361d,
+	0x3853, 0x3d2f, 0x445d, 0x4c4a, 0x5454, 0x5ca9, 0x5f60, 0x644d,
+	0x684b, 0x7050, 0x7857, 0x7e91, 0x805a, 0x885e, 0x941e, 0x965f,
+	0x983b, 0xa064, 0xa865, 0xac66, 0xb46a, 0xbd1b, 0xc487, 0xcc70,
+	0xce70, 0xd06e, 0xd26b, 0xd477, 0xdc75, 0xde89, 0xe474, 0xec73,
+	0xf031, 0xf27a, 0xf479, 0xfc7f, 0x04e6, 0x0922, 0x0c63, 0x147b,
+	0x187e, 0x1c84, 0x26ee, 0x2861, 0x2c60, 0x3061, 0x4081, 0x4882,
+	0x50a8, 0x5888, 0x6083, 0x687d, 0x7086, 0x788b, 0x808a, 0x8885,
 	// Entry 80 - BF
-	0x908c, 0x9891, 0x9c8e, 0xa138, 0xa88f, 0xb08d, 0xb892, 0xc09d,
-	0xc899, 0xd095, 0xd89c, 0xe09b, 0xe896, 0xf097, 0xf89e, 0x004f,
-	0x08a0, 0x10a2, 0x1cae, 0x20a1, 0x28a4, 0x30aa, 0x34ab, 0x3cac,
-	0x42a5, 0x44af, 0x461f, 0x4cb0, 0x54b5, 0x58b8, 0x5cb4, 0x64b9,
-	0x6cb2, 0x70b6, 0x74b7, 0x7cc6, 0x84bf, 0x8cce, 0x94d0, 0x9ccd,
-	0xa4c3, 0xaccb, 0xb4c8, 0xbcc9, 0xc0cc, 0xc8cf, 0xd8bb, 0xe0c5,
-	0xe4bc, 0xe6bd, 0xe8ca, 0xf0ba, 0xf8d1, 0x00e1, 0x08d2, 0x10dd,
-	0x18db, 0x20d9, 0x2429, 0x265b, 0x2a30, 0x2d1b, 0x2e40, 0x30de,
+	0x908d, 0x9892, 0x9c8f, 0xa139, 0xa890, 0xb08e, 0xb893, 0xc09e,
+	0xc89a, 0xd096, 0xd89d, 0xe09c, 0xe897, 0xf098, 0xf89f, 0x004f,
+	0x08a1, 0x10a3, 0x1caf, 0x20a2, 0x28a5, 0x30ab, 0x34ac, 0x3cad,
+	0x42a6, 0x44b0, 0x461f, 0x4cb1, 0x54b6, 0x58b9, 0x5cb5, 0x64ba,
+	0x6cb3, 0x70b7, 0x74b8, 0x7cc7, 0x84c0, 0x8ccf, 0x94d1, 0x9cce,
+	0xa4c4, 0xaccc, 0xb4c9, 0xbcca, 0xc0cd, 0xc8d0, 0xd8bc, 0xe0c6,
+	0xe4bd, 0xe6be, 0xe8cb, 0xf0bb, 0xf8d2, 0x00e2, 0x08d3, 0x10de,
+	0x18dc, 0x20da, 0x2429, 0x265c, 0x2a30, 0x2d1c, 0x2e40, 0x30df,
 	// Entry C0 - FF
-	0x38d3, 0x493f, 0x54e0, 0x5cd8, 0x64d4, 0x6cd6, 0x74df, 0x7cd5,
-	0x84da, 0x88c7, 0x8b33, 0x8e75, 0x90c0, 0x92f0, 0x94e8, 0x9ee2,
-	0xace6, 0xb0f1, 0xb8e4, 0xc0e7, 0xc8eb, 0xd0e9, 0xd8ee, 0xe08b,
-	0xe526, 0xecec, 0xf4f3, 0xfd02, 0x0504, 0x0706, 0x0d07, 0x183c,
-	0x1d0e, 0x26a9, 0x2826, 0x2cb1, 0x2ebe, 0x34ea, 0x3d39, 0x4513,
-	0x4d18, 0x5508, 0x5d14, 0x6105, 0x650a, 0x6d12, 0x7d0d, 0x7f11,
-	0x813e, 0x830f, 0x8515, 0x8d61, 0x9964, 0xa15d, 0xa86e, 0xb117,
-	0xb30b, 0xb86c, 0xc10b, 0xc916, 0xd110, 0xd91d, 0xe10c, 0xe84e,
+	0x38d4, 0x4940, 0x54e1, 0x5cd9, 0x64d5, 0x6cd7, 0x74e0, 0x7cd6,
+	0x84db, 0x88c8, 0x8b34, 0x8e76, 0x90c1, 0x92f1, 0x94e9, 0x9ee3,
+	0xace7, 0xb0f2, 0xb8e5, 0xc0e8, 0xc8ec, 0xd0ea, 0xd8ef, 0xe08c,
+	0xe527, 0xeced, 0xf4f4, 0xfd03, 0x0505, 0x0707, 0x0d08, 0x183c,
+	0x1d0f, 0x26aa, 0x2826, 0x2cb2, 0x2ebf, 0x34eb, 0x3d3a, 0x4514,
+	0x4d19, 0x5509, 0x5d15, 0x6106, 0x650b, 0x6d13, 0x7d0e, 0x7f12,
+	0x813f, 0x8310, 0x8516, 0x8d62, 0x9965, 0xa15e, 0xa86f, 0xb118,
+	0xb30c, 0xb86d, 0xc10c, 0xc917, 0xd111, 0xd91e, 0xe10d, 0xe84e,
 	// Entry 100 - 13F
-	0xf11c, 0xf524, 0xf923, 0x0122, 0x0925, 0x1129, 0x192c, 0x2023,
-	0x2928, 0x312b, 0x3727, 0x391f, 0x3d2d, 0x4131, 0x4930, 0x4ec2,
-	0x5519, 0x646b, 0x747b, 0x7e7f, 0x809f, 0x8298, 0x852f, 0x9135,
-	0xa53d, 0xac37, 0xb536, 0xb937, 0xbd3b, 0xd940, 0xe542, 0xed5e,
-	0xef5e, 0xf657, 0xfd62, 0x7c20, 0x7ef4, 0x80f5, 0x82f6, 0x84f7,
-	0x86f8, 0x88f9, 0x8afa, 0x8cfb, 0x8e70, 0x90fd, 0x92fe, 0x94ff,
-	0x9700, 0x9901, 0x9b43, 0x9d44, 0x9f45, 0xa146, 0xa347, 0xa548,
-	0xa749, 0xa94a, 0xab4b, 0xad4c, 0xaf4d, 0xb14e, 0xb34f, 0xb550,
+	0xf11d, 0xf525, 0xf924, 0x0123, 0x0926, 0x112a, 0x192d, 0x2023,
+	0x2929, 0x312c, 0x3728, 0x3920, 0x3d2e, 0x4132, 0x4931, 0x4ec3,
+	0x551a, 0x646c, 0x747c, 0x7e80, 0x80a0, 0x8299, 0x8530, 0x9136,
+	0xa53e, 0xac37, 0xb537, 0xb938, 0xbd3c, 0xd941, 0xe543, 0xed5f,
+	0xef5f, 0xf658, 0xfd63, 0x7c20, 0x7ef5, 0x80f6, 0x82f7, 0x84f8,
+	0x86f9, 0x88fa, 0x8afb, 0x8cfc, 0x8e71, 0x90fe, 0x92ff, 0x9500,
+	0x9701, 0x9902, 0x9b44, 0x9d45, 0x9f46, 0xa147, 0xa348, 0xa549,
+	0xa74a, 0xa94b, 0xab4c, 0xad4d, 0xaf4e, 0xb14f, 0xb350, 0xb551,
 	// Entry 140 - 17F
-	0xb751, 0xb952, 0xbb53, 0xbd54, 0xbf55, 0xc156, 0xc357, 0xc558,
-	0xc759, 0xc95a, 0xcb5b, 0xcd5c, 0xcf65,
+	0xb752, 0xb953, 0xbb54, 0xbd55, 0xbf56, 0xc157, 0xc358, 0xc559,
+	0xc75a, 0xc95b, 0xcb5c, 0xcd5d, 0xcf66,
 }
 
-// Size: 2014 bytes
+// Size: 2128 bytes
 var variantIndex = map[string]uint8{
 	"1606nict": 0x0,
 	"1694acad": 0x1,
 	"1901":     0x2,
 	"1959acad": 0x3,
-	"1994":     0x61,
+	"1994":     0x67,
 	"1996":     0x4,
 	"abl1943":  0x5,
 	"akuapem":  0x6,
-	"alalc97":  0x63,
+	"alalc97":  0x69,
 	"aluku":    0x7,
 	"ao1990":   0x8,
 	"aranes":   0x9,
@@ -1299,94 +1315,100 @@ var variantIndex = map[string]uint8{
 	"barla":    0x11,
 	"basiceng": 0x12,
 	"bauddha":  0x13,
-	"biscayan": 0x14,
-	"biske":    0x5c,
-	"bohoric":  0x15,
-	"boont":    0x16,
-	"bornholm": 0x17,
-	"cisaup":   0x18,
-	"colb1945": 0x19,
-	"cornu":    0x1a,
-	"creiss":   0x1b,
-	"dajnko":   0x1c,
-	"ekavsk":   0x1d,
-	"emodeng":  0x1e,
-	"fonipa":   0x64,
-	"fonkirsh": 0x65,
-	"fonnapa":  0x66,
-	"fonupa":   0x67,
-	"fonxsamp": 0x68,
-	"gascon":   0x1f,
-	"grclass":  0x20,
-	"grital":   0x21,
-	"grmistr":  0x22,
-	"hepburn":  0x23,
-	"heploc":   0x62,
-	"hognorsk": 0x24,
-	"hsistemo": 0x25,
-	"ijekavsk": 0x26,
-	"itihasa":  0x27,
-	"ivanchov": 0x28,
-	"jauer":    0x29,
-	"jyutping": 0x2a,
-	"kkcor":    0x2b,
-	"kociewie": 0x2c,
-	"kscor":    0x2d,
-	"laukika":  0x2e,
-	"lemosin":  0x2f,
-	"lengadoc": 0x30,
-	"lipaw":    0x5d,
-	"luna1918": 0x31,
-	"metelko":  0x32,
-	"monoton":  0x33,
-	"ndyuka":   0x34,
-	"nedis":    0x35,
-	"newfound": 0x36,
-	"nicard":   0x37,
-	"njiva":    0x5e,
-	"nulik":    0x38,
-	"osojs":    0x5f,
-	"oxendict": 0x39,
-	"pahawh2":  0x3a,
-	"pahawh3":  0x3b,
-	"pahawh4":  0x3c,
-	"pamaka":   0x3d,
-	"peano":    0x3e,
-	"petr1708": 0x3f,
-	"pinyin":   0x40,
-	"polyton":  0x41,
-	"provenc":  0x42,
-	"puter":    0x43,
-	"rigik":    0x44,
-	"rozaj":    0x45,
-	"rumgr":    0x46,
-	"scotland": 0x47,
-	"scouse":   0x48,
-	"simple":   0x69,
-	"solba":    0x60,
-	"sotav":    0x49,
-	"spanglis": 0x4a,
-	"surmiran": 0x4b,
-	"sursilv":  0x4c,
-	"sutsilv":  0x4d,
-	"tarask":   0x4e,
-	"tongyong": 0x4f,
-	"tunumiit": 0x50,
-	"uccor":    0x51,
-	"ucrcor":   0x52,
-	"ulster":   0x53,
-	"unifon":   0x54,
-	"vaidika":  0x55,
-	"valencia": 0x56,
-	"vallader": 0x57,
-	"vecdruka": 0x58,
-	"vivaraup": 0x59,
-	"wadegile": 0x5a,
-	"xsistemo": 0x5b,
+	"bciav":    0x14,
+	"bcizbl":   0x15,
+	"biscayan": 0x16,
+	"biske":    0x62,
+	"bohoric":  0x17,
+	"boont":    0x18,
+	"bornholm": 0x19,
+	"cisaup":   0x1a,
+	"colb1945": 0x1b,
+	"cornu":    0x1c,
+	"creiss":   0x1d,
+	"dajnko":   0x1e,
+	"ekavsk":   0x1f,
+	"emodeng":  0x20,
+	"fonipa":   0x6a,
+	"fonkirsh": 0x6b,
+	"fonnapa":  0x6c,
+	"fonupa":   0x6d,
+	"fonxsamp": 0x6e,
+	"gallo":    0x21,
+	"gascon":   0x22,
+	"grclass":  0x23,
+	"grital":   0x24,
+	"grmistr":  0x25,
+	"hepburn":  0x26,
+	"heploc":   0x68,
+	"hognorsk": 0x27,
+	"hsistemo": 0x28,
+	"ijekavsk": 0x29,
+	"itihasa":  0x2a,
+	"ivanchov": 0x2b,
+	"jauer":    0x2c,
+	"jyutping": 0x2d,
+	"kkcor":    0x2e,
+	"kociewie": 0x2f,
+	"kscor":    0x30,
+	"laukika":  0x31,
+	"lemosin":  0x32,
+	"lengadoc": 0x33,
+	"lipaw":    0x63,
+	"ltg1929":  0x34,
+	"ltg2007":  0x35,
+	"luna1918": 0x36,
+	"metelko":  0x37,
+	"monoton":  0x38,
+	"ndyuka":   0x39,
+	"nedis":    0x3a,
+	"newfound": 0x3b,
+	"nicard":   0x3c,
+	"njiva":    0x64,
+	"nulik":    0x3d,
+	"osojs":    0x65,
+	"oxendict": 0x3e,
+	"pahawh2":  0x3f,
+	"pahawh3":  0x40,
+	"pahawh4":  0x41,
+	"pamaka":   0x42,
+	"peano":    0x43,
+	"petr1708": 0x44,
+	"pinyin":   0x45,
+	"polyton":  0x46,
+	"provenc":  0x47,
+	"puter":    0x48,
+	"rigik":    0x49,
+	"rozaj":    0x4a,
+	"rumgr":    0x4b,
+	"scotland": 0x4c,
+	"scouse":   0x4d,
+	"simple":   0x6f,
+	"solba":    0x66,
+	"sotav":    0x4e,
+	"spanglis": 0x4f,
+	"surmiran": 0x50,
+	"sursilv":  0x51,
+	"sutsilv":  0x52,
+	"synnejyl": 0x53,
+	"tarask":   0x54,
+	"tongyong": 0x55,
+	"tunumiit": 0x56,
+	"uccor":    0x57,
+	"ucrcor":   0x58,
+	"ulster":   0x59,
+	"unifon":   0x5a,
+	"vaidika":  0x5b,
+	"valencia": 0x5c,
+	"vallader": 0x5d,
+	"vecdruka": 0x5e,
+	"vivaraup": 0x5f,
+	"wadegile": 0x60,
+	"xsistemo": 0x61,
 }
 
 // variantNumSpecialized is the number of specialized variants in variants.
-const variantNumSpecialized = 99
+const variantNumSpecialized = 105
 
 // nRegionGroups is the number of region groups.
 const nRegionGroups = 33
@@ -1398,151 +1420,151 @@ type likelyLangRegion struct {
 
 // likelyScript is a lookup table, indexed by scriptID, for the most likely
 // languages and regions given a script.
-// Size: 1040 bytes, 260 elements
-var likelyScript = [260]likelyLangRegion{
-	1:   {lang: 0x14e, region: 0x84},
-	3:   {lang: 0x2a2, region: 0x106},
-	4:   {lang: 0x1f, region: 0x99},
-	5:   {lang: 0x3a, region: 0x6b},
-	7:   {lang: 0x3b, region: 0x9c},
+// Size: 1052 bytes, 263 elements
+var likelyScript = [263]likelyLangRegion{
+	1:   {lang: 0x14e, region: 0x85},
+	3:   {lang: 0x2a2, region: 0x107},
+	4:   {lang: 0x1f, region: 0x9a},
+	5:   {lang: 0x3a, region: 0x6c},
+	7:   {lang: 0x3b, region: 0x9d},
 	8:   {lang: 0x1d7, region: 0x28},
-	9:   {lang: 0x13, region: 0x9c},
-	10:  {lang: 0x5b, region: 0x95},
+	9:   {lang: 0x13, region: 0x9d},
+	10:  {lang: 0x5b, region: 0x96},
 	11:  {lang: 0x60, region: 0x52},
-	12:  {lang: 0xb9, region: 0xb4},
-	13:  {lang: 0x63, region: 0x95},
+	12:  {lang: 0xb9, region: 0xb5},
+	13:  {lang: 0x63, region: 0x96},
 	14:  {lang: 0xa5, region: 0x35},
-	15:  {lang: 0x3e9, region: 0x99},
-	17:  {lang: 0x529, region: 0x12e},
-	18:  {lang: 0x3b1, region: 0x99},
-	19:  {lang: 0x15e, region: 0x78},
-	20:  {lang: 0xc2, region: 0x95},
-	21:  {lang: 0x9d, region: 0xe7},
+	15:  {lang: 0x3e9, region: 0x9a},
+	17:  {lang: 0x529, region: 0x12f},
+	18:  {lang: 0x3b1, region: 0x9a},
+	19:  {lang: 0x15e, region: 0x79},
+	20:  {lang: 0xc2, region: 0x96},
+	21:  {lang: 0x9d, region: 0xe8},
 	22:  {lang: 0xdb, region: 0x35},
 	23:  {lang: 0xf3, region: 0x49},
-	24:  {lang: 0x4f0, region: 0x12b},
-	25:  {lang: 0xe7, region: 0x13e},
-	26:  {lang: 0xe5, region: 0x135},
-	29:  {lang: 0xf1, region: 0x6b},
-	31:  {lang: 0x1a0, region: 0x5d},
-	32:  {lang: 0x3e2, region: 0x106},
-	34:  {lang: 0x1be, region: 0x99},
-	38:  {lang: 0x15e, region: 0x78},
-	41:  {lang: 0x133, region: 0x6b},
+	24:  {lang: 0x4f0, region: 0x12c},
+	25:  {lang: 0xe7, region: 0x13f},
+	26:  {lang: 0xe5, region: 0x136},
+	29:  {lang: 0xf1, region: 0x6c},
+	31:  {lang: 0x1a0, region: 0x5e},
+	32:  {lang: 0x3e2, region: 0x107},
+	34:  {lang: 0x1be, region: 0x9a},
+	38:  {lang: 0x15e, region: 0x79},
+	41:  {lang: 0x133, region: 0x6c},
 	42:  {lang: 0x431, region: 0x27},
-	44:  {lang: 0x27, region: 0x6f},
-	46:  {lang: 0x210, region: 0x7d},
+	44:  {lang: 0x27, region: 0x70},
+	46:  {lang: 0x210, region: 0x7e},
 	47:  {lang: 0xfe, region: 0x38},
-	49:  {lang: 0x19b, region: 0x99},
-	50:  {lang: 0x19e, region: 0x130},
-	51:  {lang: 0x3e9, region: 0x99},
-	52:  {lang: 0x136, region: 0x87},
-	53:  {lang: 0x1a4, region: 0x99},
-	54:  {lang: 0x39d, region: 0x99},
-	55:  {lang: 0x529, region: 0x12e},
-	56:  {lang: 0x254, region: 0xab},
+	49:  {lang: 0x19b, region: 0x9a},
+	50:  {lang: 0x19e, region: 0x131},
+	51:  {lang: 0x3e9, region: 0x9a},
+	52:  {lang: 0x136, region: 0x88},
+	53:  {lang: 0x1a4, region: 0x9a},
+	54:  {lang: 0x39d, region: 0x9a},
+	55:  {lang: 0x529, region: 0x12f},
+	56:  {lang: 0x254, region: 0xac},
 	57:  {lang: 0x529, region: 0x53},
-	58:  {lang: 0x1cb, region: 0xe7},
+	58:  {lang: 0x1cb, region: 0xe8},
 	59:  {lang: 0x529, region: 0x53},
-	60:  {lang: 0x529, region: 0x12e},
-	61:  {lang: 0x2fd, region: 0x9b},
-	62:  {lang: 0x1bc, region: 0x97},
-	63:  {lang: 0x200, region: 0xa2},
-	64:  {lang: 0x1c5, region: 0x12b},
-	65:  {lang: 0x1ca, region: 0xaf},
-	68:  {lang: 0x1d5, region: 0x92},
-	70:  {lang: 0x142, region: 0x9e},
-	71:  {lang: 0x254, region: 0xab},
-	72:  {lang: 0x20e, region: 0x95},
-	73:  {lang: 0x200, region: 0xa2},
-	75:  {lang: 0x135, region: 0xc4},
-	76:  {lang: 0x200, region: 0xa2},
-	77:  {lang: 0x3bb, region: 0xe8},
-	78:  {lang: 0x24a, region: 0xa6},
-	79:  {lang: 0x3fa, region: 0x99},
-	82:  {lang: 0x251, region: 0x99},
-	83:  {lang: 0x254, region: 0xab},
-	85:  {lang: 0x88, region: 0x99},
-	86:  {lang: 0x370, region: 0x123},
-	87:  {lang: 0x2b8, region: 0xaf},
-	92:  {lang: 0x29f, region: 0x99},
-	93:  {lang: 0x2a8, region: 0x99},
-	94:  {lang: 0x28f, region: 0x87},
-	95:  {lang: 0x1a0, region: 0x87},
-	96:  {lang: 0x2ac, region: 0x53},
-	98:  {lang: 0x4f4, region: 0x12b},
-	99:  {lang: 0x4f5, region: 0x12b},
-	100: {lang: 0x1be, region: 0x99},
-	102: {lang: 0x337, region: 0x9c},
-	103: {lang: 0x4f7, region: 0x53},
-	104: {lang: 0xa9, region: 0x53},
-	107: {lang: 0x2e8, region: 0x112},
-	108: {lang: 0x4f8, region: 0x10b},
-	109: {lang: 0x4f8, region: 0x10b},
-	110: {lang: 0x304, region: 0x99},
-	111: {lang: 0x31b, region: 0x99},
-	112: {lang: 0x30b, region: 0x53},
-	114: {lang: 0x31e, region: 0x35},
-	115: {lang: 0x30e, region: 0x99},
-	116: {lang: 0x414, region: 0xe8},
-	117: {lang: 0x331, region: 0xc4},
-	119: {lang: 0x4f9, region: 0x108},
-	120: {lang: 0x3b, region: 0xa1},
-	121: {lang: 0x353, region: 0xdb},
-	124: {lang: 0x2d0, region: 0x84},
-	125: {lang: 0x52a, region: 0x53},
-	126: {lang: 0x403, region: 0x96},
-	127: {lang: 0x3ee, region: 0x99},
-	128: {lang: 0x39b, region: 0xc5},
-	129: {lang: 0x395, region: 0x99},
-	130: {lang: 0x399, region: 0x135},
-	131: {lang: 0x429, region: 0x115},
-	133: {lang: 0x3b, region: 0x11c},
-	134: {lang: 0xfd, region: 0xc4},
-	137: {lang: 0x27d, region: 0x106},
-	138: {lang: 0x2c9, region: 0x53},
-	139: {lang: 0x39f, region: 0x9c},
-	140: {lang: 0x39f, region: 0x53},
-	142: {lang: 0x3ad, region: 0xb0},
-	144: {lang: 0x1c6, region: 0x53},
-	145: {lang: 0x4fd, region: 0x9c},
-	198: {lang: 0x3cb, region: 0x95},
-	201: {lang: 0x372, region: 0x10c},
-	202: {lang: 0x420, region: 0x97},
-	204: {lang: 0x4ff, region: 0x15e},
-	205: {lang: 0x3f0, region: 0x99},
-	206: {lang: 0x45, region: 0x135},
-	207: {lang: 0x139, region: 0x7b},
-	208: {lang: 0x3e9, region: 0x99},
-	210: {lang: 0x3e9, region: 0x99},
-	211: {lang: 0x3fa, region: 0x99},
-	212: {lang: 0x40c, region: 0xb3},
-	215: {lang: 0x433, region: 0x99},
-	216: {lang: 0xef, region: 0xc5},
-	217: {lang: 0x43e, region: 0x95},
-	218: {lang: 0x44d, region: 0x35},
-	219: {lang: 0x44e, region: 0x9b},
-	223: {lang: 0x45a, region: 0xe7},
-	224: {lang: 0x11a, region: 0x99},
-	225: {lang: 0x45e, region: 0x53},
-	226: {lang: 0x232, region: 0x53},
-	227: {lang: 0x450, region: 0x99},
-	228: {lang: 0x4a5, region: 0x53},
-	229: {lang: 0x9f, region: 0x13e},
-	230: {lang: 0x461, region: 0x99},
-	232: {lang: 0x528, region: 0xba},
-	233: {lang: 0x153, region: 0xe7},
-	234: {lang: 0x128, region: 0xcd},
-	235: {lang: 0x46b, region: 0x123},
-	236: {lang: 0xa9, region: 0x53},
-	237: {lang: 0x2ce, region: 0x99},
-	240: {lang: 0x4ad, region: 0x11c},
-	241: {lang: 0x4be, region: 0xb4},
-	244: {lang: 0x1ce, region: 0x99},
-	247: {lang: 0x3a9, region: 0x9c},
-	248: {lang: 0x22, region: 0x9b},
-	250: {lang: 0x1ea, region: 0x53},
-	251: {lang: 0xef, region: 0xc5},
+	60:  {lang: 0x529, region: 0x12f},
+	61:  {lang: 0x2fd, region: 0x9c},
+	62:  {lang: 0x1bc, region: 0x98},
+	63:  {lang: 0x200, region: 0xa3},
+	64:  {lang: 0x1c5, region: 0x12c},
+	65:  {lang: 0x1ca, region: 0xb0},
+	68:  {lang: 0x1d5, region: 0x93},
+	70:  {lang: 0x142, region: 0x9f},
+	71:  {lang: 0x254, region: 0xac},
+	72:  {lang: 0x20e, region: 0x96},
+	73:  {lang: 0x200, region: 0xa3},
+	75:  {lang: 0x135, region: 0xc5},
+	76:  {lang: 0x200, region: 0xa3},
+	78:  {lang: 0x3bb, region: 0xe9},
+	79:  {lang: 0x24a, region: 0xa7},
+	80:  {lang: 0x3fa, region: 0x9a},
+	83:  {lang: 0x251, region: 0x9a},
+	84:  {lang: 0x254, region: 0xac},
+	86:  {lang: 0x88, region: 0x9a},
+	87:  {lang: 0x370, region: 0x124},
+	88:  {lang: 0x2b8, region: 0xb0},
+	93:  {lang: 0x29f, region: 0x9a},
+	94:  {lang: 0x2a8, region: 0x9a},
+	95:  {lang: 0x28f, region: 0x88},
+	96:  {lang: 0x1a0, region: 0x88},
+	97:  {lang: 0x2ac, region: 0x53},
+	99:  {lang: 0x4f4, region: 0x12c},
+	100: {lang: 0x4f5, region: 0x12c},
+	101: {lang: 0x1be, region: 0x9a},
+	103: {lang: 0x337, region: 0x9d},
+	104: {lang: 0x4f7, region: 0x53},
+	105: {lang: 0xa9, region: 0x53},
+	108: {lang: 0x2e8, region: 0x113},
+	109: {lang: 0x4f8, region: 0x10c},
+	110: {lang: 0x4f8, region: 0x10c},
+	111: {lang: 0x304, region: 0x9a},
+	112: {lang: 0x31b, region: 0x9a},
+	113: {lang: 0x30b, region: 0x53},
+	115: {lang: 0x31e, region: 0x35},
+	116: {lang: 0x30e, region: 0x9a},
+	117: {lang: 0x414, region: 0xe9},
+	118: {lang: 0x331, region: 0xc5},
+	121: {lang: 0x4f9, region: 0x109},
+	122: {lang: 0x3b, region: 0xa2},
+	123: {lang: 0x353, region: 0xdc},
+	126: {lang: 0x2d0, region: 0x85},
+	127: {lang: 0x52a, region: 0x53},
+	128: {lang: 0x403, region: 0x97},
+	129: {lang: 0x3ee, region: 0x9a},
+	130: {lang: 0x39b, region: 0xc6},
+	131: {lang: 0x395, region: 0x9a},
+	132: {lang: 0x399, region: 0x136},
+	133: {lang: 0x429, region: 0x116},
+	135: {lang: 0x3b, region: 0x11d},
+	136: {lang: 0xfd, region: 0xc5},
+	139: {lang: 0x27d, region: 0x107},
+	140: {lang: 0x2c9, region: 0x53},
+	141: {lang: 0x39f, region: 0x9d},
+	142: {lang: 0x39f, region: 0x53},
+	144: {lang: 0x3ad, region: 0xb1},
+	146: {lang: 0x1c6, region: 0x53},
+	147: {lang: 0x4fd, region: 0x9d},
+	200: {lang: 0x3cb, region: 0x96},
+	203: {lang: 0x372, region: 0x10d},
+	204: {lang: 0x420, region: 0x98},
+	206: {lang: 0x4ff, region: 0x15f},
+	207: {lang: 0x3f0, region: 0x9a},
+	208: {lang: 0x45, region: 0x136},
+	209: {lang: 0x139, region: 0x7c},
+	210: {lang: 0x3e9, region: 0x9a},
+	212: {lang: 0x3e9, region: 0x9a},
+	213: {lang: 0x3fa, region: 0x9a},
+	214: {lang: 0x40c, region: 0xb4},
+	217: {lang: 0x433, region: 0x9a},
+	218: {lang: 0xef, region: 0xc6},
+	219: {lang: 0x43e, region: 0x96},
+	221: {lang: 0x44d, region: 0x35},
+	222: {lang: 0x44e, region: 0x9c},
+	226: {lang: 0x45a, region: 0xe8},
+	227: {lang: 0x11a, region: 0x9a},
+	228: {lang: 0x45e, region: 0x53},
+	229: {lang: 0x232, region: 0x53},
+	230: {lang: 0x450, region: 0x9a},
+	231: {lang: 0x4a5, region: 0x53},
+	232: {lang: 0x9f, region: 0x13f},
+	233: {lang: 0x461, region: 0x9a},
+	235: {lang: 0x528, region: 0xbb},
+	236: {lang: 0x153, region: 0xe8},
+	237: {lang: 0x128, region: 0xce},
+	238: {lang: 0x46b, region: 0x124},
+	239: {lang: 0xa9, region: 0x53},
+	240: {lang: 0x2ce, region: 0x9a},
+	243: {lang: 0x4ad, region: 0x11d},
+	244: {lang: 0x4be, region: 0xb5},
+	247: {lang: 0x1ce, region: 0x9a},
+	250: {lang: 0x3a9, region: 0x9d},
+	251: {lang: 0x22, region: 0x9c},
+	253: {lang: 0x1ea, region: 0x53},
+	254: {lang: 0xef, region: 0xc6},
 }
 
 type likelyScriptRegion struct {
@@ -1557,1423 +1579,1423 @@ type likelyScriptRegion struct {
 // of the list in likelyLangList.
 // Size: 7980 bytes, 1330 elements
 var likelyLang = [1330]likelyScriptRegion{
-	0:    {region: 0x135, script: 0x5a, flags: 0x0},
-	1:    {region: 0x6f, script: 0x5a, flags: 0x0},
-	2:    {region: 0x165, script: 0x5a, flags: 0x0},
-	3:    {region: 0x165, script: 0x5a, flags: 0x0},
-	4:    {region: 0x165, script: 0x5a, flags: 0x0},
-	5:    {region: 0x7d, script: 0x20, flags: 0x0},
-	6:    {region: 0x165, script: 0x5a, flags: 0x0},
-	7:    {region: 0x165, script: 0x20, flags: 0x0},
-	8:    {region: 0x80, script: 0x5a, flags: 0x0},
-	9:    {region: 0x165, script: 0x5a, flags: 0x0},
-	10:   {region: 0x165, script: 0x5a, flags: 0x0},
-	11:   {region: 0x165, script: 0x5a, flags: 0x0},
-	12:   {region: 0x95, script: 0x5a, flags: 0x0},
-	13:   {region: 0x131, script: 0x5a, flags: 0x0},
-	14:   {region: 0x80, script: 0x5a, flags: 0x0},
-	15:   {region: 0x165, script: 0x5a, flags: 0x0},
-	16:   {region: 0x165, script: 0x5a, flags: 0x0},
-	17:   {region: 0x106, script: 0x20, flags: 0x0},
-	18:   {region: 0x165, script: 0x5a, flags: 0x0},
-	19:   {region: 0x9c, script: 0x9, flags: 0x0},
-	20:   {region: 0x128, script: 0x5, flags: 0x0},
-	21:   {region: 0x165, script: 0x5a, flags: 0x0},
-	22:   {region: 0x161, script: 0x5a, flags: 0x0},
-	23:   {region: 0x165, script: 0x5a, flags: 0x0},
-	24:   {region: 0x165, script: 0x5a, flags: 0x0},
-	25:   {region: 0x165, script: 0x5a, flags: 0x0},
-	26:   {region: 0x165, script: 0x5a, flags: 0x0},
-	27:   {region: 0x165, script: 0x5a, flags: 0x0},
-	28:   {region: 0x52, script: 0x5a, flags: 0x0},
-	29:   {region: 0x165, script: 0x5a, flags: 0x0},
-	30:   {region: 0x165, script: 0x5a, flags: 0x0},
-	31:   {region: 0x99, script: 0x4, flags: 0x0},
-	32:   {region: 0x165, script: 0x5a, flags: 0x0},
-	33:   {region: 0x80, script: 0x5a, flags: 0x0},
-	34:   {region: 0x9b, script: 0xf8, flags: 0x0},
-	35:   {region: 0x165, script: 0x5a, flags: 0x0},
-	36:   {region: 0x165, script: 0x5a, flags: 0x0},
-	37:   {region: 0x14d, script: 0x5a, flags: 0x0},
-	38:   {region: 0x106, script: 0x20, flags: 0x0},
-	39:   {region: 0x6f, script: 0x2c, flags: 0x0},
-	40:   {region: 0x165, script: 0x5a, flags: 0x0},
-	41:   {region: 0x165, script: 0x5a, flags: 0x0},
-	42:   {region: 0xd6, script: 0x5a, flags: 0x0},
-	43:   {region: 0x165, script: 0x5a, flags: 0x0},
-	45:   {region: 0x165, script: 0x5a, flags: 0x0},
-	46:   {region: 0x165, script: 0x5a, flags: 0x0},
-	47:   {region: 0x165, script: 0x5a, flags: 0x0},
-	48:   {region: 0x165, script: 0x5a, flags: 0x0},
-	49:   {region: 0x165, script: 0x5a, flags: 0x0},
-	50:   {region: 0x165, script: 0x5a, flags: 0x0},
-	51:   {region: 0x95, script: 0x5a, flags: 0x0},
-	52:   {region: 0x165, script: 0x5, flags: 0x0},
-	53:   {region: 0x122, script: 0x5, flags: 0x0},
-	54:   {region: 0x165, script: 0x5a, flags: 0x0},
-	55:   {region: 0x165, script: 0x5a, flags: 0x0},
-	56:   {region: 0x165, script: 0x5a, flags: 0x0},
-	57:   {region: 0x165, script: 0x5a, flags: 0x0},
-	58:   {region: 0x6b, script: 0x5, flags: 0x0},
+	0:    {region: 0x136, script: 0x5b, flags: 0x0},
+	1:    {region: 0x70, script: 0x5b, flags: 0x0},
+	2:    {region: 0x166, script: 0x5b, flags: 0x0},
+	3:    {region: 0x166, script: 0x5b, flags: 0x0},
+	4:    {region: 0x166, script: 0x5b, flags: 0x0},
+	5:    {region: 0x7e, script: 0x20, flags: 0x0},
+	6:    {region: 0x166, script: 0x5b, flags: 0x0},
+	7:    {region: 0x166, script: 0x20, flags: 0x0},
+	8:    {region: 0x81, script: 0x5b, flags: 0x0},
+	9:    {region: 0x166, script: 0x5b, flags: 0x0},
+	10:   {region: 0x166, script: 0x5b, flags: 0x0},
+	11:   {region: 0x166, script: 0x5b, flags: 0x0},
+	12:   {region: 0x96, script: 0x5b, flags: 0x0},
+	13:   {region: 0x132, script: 0x5b, flags: 0x0},
+	14:   {region: 0x81, script: 0x5b, flags: 0x0},
+	15:   {region: 0x166, script: 0x5b, flags: 0x0},
+	16:   {region: 0x166, script: 0x5b, flags: 0x0},
+	17:   {region: 0x107, script: 0x20, flags: 0x0},
+	18:   {region: 0x166, script: 0x5b, flags: 0x0},
+	19:   {region: 0x9d, script: 0x9, flags: 0x0},
+	20:   {region: 0x129, script: 0x5, flags: 0x0},
+	21:   {region: 0x166, script: 0x5b, flags: 0x0},
+	22:   {region: 0x162, script: 0x5b, flags: 0x0},
+	23:   {region: 0x166, script: 0x5b, flags: 0x0},
+	24:   {region: 0x166, script: 0x5b, flags: 0x0},
+	25:   {region: 0x166, script: 0x5b, flags: 0x0},
+	26:   {region: 0x166, script: 0x5b, flags: 0x0},
+	27:   {region: 0x166, script: 0x5b, flags: 0x0},
+	28:   {region: 0x52, script: 0x5b, flags: 0x0},
+	29:   {region: 0x166, script: 0x5b, flags: 0x0},
+	30:   {region: 0x166, script: 0x5b, flags: 0x0},
+	31:   {region: 0x9a, script: 0x4, flags: 0x0},
+	32:   {region: 0x166, script: 0x5b, flags: 0x0},
+	33:   {region: 0x81, script: 0x5b, flags: 0x0},
+	34:   {region: 0x9c, script: 0xfb, flags: 0x0},
+	35:   {region: 0x166, script: 0x5b, flags: 0x0},
+	36:   {region: 0x166, script: 0x5b, flags: 0x0},
+	37:   {region: 0x14e, script: 0x5b, flags: 0x0},
+	38:   {region: 0x107, script: 0x20, flags: 0x0},
+	39:   {region: 0x70, script: 0x2c, flags: 0x0},
+	40:   {region: 0x166, script: 0x5b, flags: 0x0},
+	41:   {region: 0x166, script: 0x5b, flags: 0x0},
+	42:   {region: 0xd7, script: 0x5b, flags: 0x0},
+	43:   {region: 0x166, script: 0x5b, flags: 0x0},
+	45:   {region: 0x166, script: 0x5b, flags: 0x0},
+	46:   {region: 0x166, script: 0x5b, flags: 0x0},
+	47:   {region: 0x166, script: 0x5b, flags: 0x0},
+	48:   {region: 0x166, script: 0x5b, flags: 0x0},
+	49:   {region: 0x166, script: 0x5b, flags: 0x0},
+	50:   {region: 0x166, script: 0x5b, flags: 0x0},
+	51:   {region: 0x96, script: 0x5b, flags: 0x0},
+	52:   {region: 0x166, script: 0x5, flags: 0x0},
+	53:   {region: 0x123, script: 0x5, flags: 0x0},
+	54:   {region: 0x166, script: 0x5b, flags: 0x0},
+	55:   {region: 0x166, script: 0x5b, flags: 0x0},
+	56:   {region: 0x166, script: 0x5b, flags: 0x0},
+	57:   {region: 0x166, script: 0x5b, flags: 0x0},
+	58:   {region: 0x6c, script: 0x5, flags: 0x0},
 	59:   {region: 0x0, script: 0x3, flags: 0x1},
-	60:   {region: 0x165, script: 0x5a, flags: 0x0},
-	61:   {region: 0x51, script: 0x5a, flags: 0x0},
-	62:   {region: 0x3f, script: 0x5a, flags: 0x0},
-	63:   {region: 0x67, script: 0x5, flags: 0x0},
-	65:   {region: 0xba, script: 0x5, flags: 0x0},
-	66:   {region: 0x6b, script: 0x5, flags: 0x0},
-	67:   {region: 0x99, script: 0xe, flags: 0x0},
-	68:   {region: 0x12f, script: 0x5a, flags: 0x0},
-	69:   {region: 0x135, script: 0xce, flags: 0x0},
-	70:   {region: 0x165, script: 0x5a, flags: 0x0},
-	71:   {region: 0x165, script: 0x5a, flags: 0x0},
-	72:   {region: 0x6e, script: 0x5a, flags: 0x0},
-	73:   {region: 0x165, script: 0x5a, flags: 0x0},
-	74:   {region: 0x165, script: 0x5a, flags: 0x0},
-	75:   {region: 0x49, script: 0x5a, flags: 0x0},
-	76:   {region: 0x165, script: 0x5a, flags: 0x0},
-	77:   {region: 0x106, script: 0x20, flags: 0x0},
-	78:   {region: 0x165, script: 0x5, flags: 0x0},
-	79:   {region: 0x165, script: 0x5a, flags: 0x0},
-	80:   {region: 0x165, script: 0x5a, flags: 0x0},
-	81:   {region: 0x165, script: 0x5a, flags: 0x0},
-	82:   {region: 0x99, script: 0x22, flags: 0x0},
-	83:   {region: 0x165, script: 0x5a, flags: 0x0},
-	84:   {region: 0x165, script: 0x5a, flags: 0x0},
-	85:   {region: 0x165, script: 0x5a, flags: 0x0},
-	86:   {region: 0x3f, script: 0x5a, flags: 0x0},
-	87:   {region: 0x165, script: 0x5a, flags: 0x0},
+	60:   {region: 0x166, script: 0x5b, flags: 0x0},
+	61:   {region: 0x51, script: 0x5b, flags: 0x0},
+	62:   {region: 0x3f, script: 0x5b, flags: 0x0},
+	63:   {region: 0x68, script: 0x5, flags: 0x0},
+	65:   {region: 0xbb, script: 0x5, flags: 0x0},
+	66:   {region: 0x6c, script: 0x5, flags: 0x0},
+	67:   {region: 0x9a, script: 0xe, flags: 0x0},
+	68:   {region: 0x130, script: 0x5b, flags: 0x0},
+	69:   {region: 0x136, script: 0xd0, flags: 0x0},
+	70:   {region: 0x166, script: 0x5b, flags: 0x0},
+	71:   {region: 0x166, script: 0x5b, flags: 0x0},
+	72:   {region: 0x6f, script: 0x5b, flags: 0x0},
+	73:   {region: 0x166, script: 0x5b, flags: 0x0},
+	74:   {region: 0x166, script: 0x5b, flags: 0x0},
+	75:   {region: 0x49, script: 0x5b, flags: 0x0},
+	76:   {region: 0x166, script: 0x5b, flags: 0x0},
+	77:   {region: 0x107, script: 0x20, flags: 0x0},
+	78:   {region: 0x166, script: 0x5, flags: 0x0},
+	79:   {region: 0x166, script: 0x5b, flags: 0x0},
+	80:   {region: 0x166, script: 0x5b, flags: 0x0},
+	81:   {region: 0x166, script: 0x5b, flags: 0x0},
+	82:   {region: 0x9a, script: 0x22, flags: 0x0},
+	83:   {region: 0x166, script: 0x5b, flags: 0x0},
+	84:   {region: 0x166, script: 0x5b, flags: 0x0},
+	85:   {region: 0x166, script: 0x5b, flags: 0x0},
+	86:   {region: 0x3f, script: 0x5b, flags: 0x0},
+	87:   {region: 0x166, script: 0x5b, flags: 0x0},
 	88:   {region: 0x3, script: 0x5, flags: 0x1},
-	89:   {region: 0x106, script: 0x20, flags: 0x0},
-	90:   {region: 0xe8, script: 0x5, flags: 0x0},
-	91:   {region: 0x95, script: 0x5a, flags: 0x0},
-	92:   {region: 0xdb, script: 0x22, flags: 0x0},
-	93:   {region: 0x2e, script: 0x5a, flags: 0x0},
-	94:   {region: 0x52, script: 0x5a, flags: 0x0},
-	95:   {region: 0x165, script: 0x5a, flags: 0x0},
+	89:   {region: 0x107, script: 0x20, flags: 0x0},
+	90:   {region: 0xe9, script: 0x5, flags: 0x0},
+	91:   {region: 0x96, script: 0x5b, flags: 0x0},
+	92:   {region: 0xdc, script: 0x22, flags: 0x0},
+	93:   {region: 0x2e, script: 0x5b, flags: 0x0},
+	94:   {region: 0x52, script: 0x5b, flags: 0x0},
+	95:   {region: 0x166, script: 0x5b, flags: 0x0},
 	96:   {region: 0x52, script: 0xb, flags: 0x0},
-	97:   {region: 0x165, script: 0x5a, flags: 0x0},
-	98:   {region: 0x165, script: 0x5a, flags: 0x0},
-	99:   {region: 0x95, script: 0x5a, flags: 0x0},
-	100:  {region: 0x165, script: 0x5a, flags: 0x0},
-	101:  {region: 0x52, script: 0x5a, flags: 0x0},
-	102:  {region: 0x165, script: 0x5a, flags: 0x0},
-	103:  {region: 0x165, script: 0x5a, flags: 0x0},
-	104:  {region: 0x165, script: 0x5a, flags: 0x0},
-	105:  {region: 0x165, script: 0x5a, flags: 0x0},
-	106:  {region: 0x4f, script: 0x5a, flags: 0x0},
-	107:  {region: 0x165, script: 0x5a, flags: 0x0},
-	108:  {region: 0x165, script: 0x5a, flags: 0x0},
-	109:  {region: 0x165, script: 0x5a, flags: 0x0},
-	110:  {region: 0x165, script: 0x2c, flags: 0x0},
-	111:  {region: 0x165, script: 0x5a, flags: 0x0},
-	112:  {region: 0x165, script: 0x5a, flags: 0x0},
+	97:   {region: 0x166, script: 0x5b, flags: 0x0},
+	98:   {region: 0x166, script: 0x5b, flags: 0x0},
+	99:   {region: 0x96, script: 0x5b, flags: 0x0},
+	100:  {region: 0x166, script: 0x5b, flags: 0x0},
+	101:  {region: 0x52, script: 0x5b, flags: 0x0},
+	102:  {region: 0x166, script: 0x5b, flags: 0x0},
+	103:  {region: 0x166, script: 0x5b, flags: 0x0},
+	104:  {region: 0x166, script: 0x5b, flags: 0x0},
+	105:  {region: 0x166, script: 0x5b, flags: 0x0},
+	106:  {region: 0x4f, script: 0x5b, flags: 0x0},
+	107:  {region: 0x166, script: 0x5b, flags: 0x0},
+	108:  {region: 0x166, script: 0x5b, flags: 0x0},
+	109:  {region: 0x166, script: 0x5b, flags: 0x0},
+	110:  {region: 0x166, script: 0x2c, flags: 0x0},
+	111:  {region: 0x166, script: 0x5b, flags: 0x0},
+	112:  {region: 0x166, script: 0x5b, flags: 0x0},
 	113:  {region: 0x47, script: 0x20, flags: 0x0},
-	114:  {region: 0x165, script: 0x5a, flags: 0x0},
-	115:  {region: 0x165, script: 0x5a, flags: 0x0},
-	116:  {region: 0x10b, script: 0x5, flags: 0x0},
-	117:  {region: 0x162, script: 0x5a, flags: 0x0},
-	118:  {region: 0x165, script: 0x5a, flags: 0x0},
-	119:  {region: 0x95, script: 0x5a, flags: 0x0},
-	120:  {region: 0x165, script: 0x5a, flags: 0x0},
-	121:  {region: 0x12f, script: 0x5a, flags: 0x0},
-	122:  {region: 0x52, script: 0x5a, flags: 0x0},
-	123:  {region: 0x99, script: 0xe3, flags: 0x0},
-	124:  {region: 0xe8, script: 0x5, flags: 0x0},
-	125:  {region: 0x99, script: 0x22, flags: 0x0},
+	114:  {region: 0x166, script: 0x5b, flags: 0x0},
+	115:  {region: 0x166, script: 0x5b, flags: 0x0},
+	116:  {region: 0x10c, script: 0x5, flags: 0x0},
+	117:  {region: 0x163, script: 0x5b, flags: 0x0},
+	118:  {region: 0x166, script: 0x5b, flags: 0x0},
+	119:  {region: 0x96, script: 0x5b, flags: 0x0},
+	120:  {region: 0x166, script: 0x5b, flags: 0x0},
+	121:  {region: 0x130, script: 0x5b, flags: 0x0},
+	122:  {region: 0x52, script: 0x5b, flags: 0x0},
+	123:  {region: 0x9a, script: 0xe6, flags: 0x0},
+	124:  {region: 0xe9, script: 0x5, flags: 0x0},
+	125:  {region: 0x9a, script: 0x22, flags: 0x0},
 	126:  {region: 0x38, script: 0x20, flags: 0x0},
-	127:  {region: 0x99, script: 0x22, flags: 0x0},
-	128:  {region: 0xe8, script: 0x5, flags: 0x0},
-	129:  {region: 0x12b, script: 0x34, flags: 0x0},
-	131:  {region: 0x99, script: 0x22, flags: 0x0},
-	132:  {region: 0x165, script: 0x5a, flags: 0x0},
-	133:  {region: 0x99, script: 0x22, flags: 0x0},
-	134:  {region: 0xe7, script: 0x5a, flags: 0x0},
-	135:  {region: 0x165, script: 0x5a, flags: 0x0},
-	136:  {region: 0x99, script: 0x22, flags: 0x0},
-	137:  {region: 0x165, script: 0x5a, flags: 0x0},
-	138:  {region: 0x13f, script: 0x5a, flags: 0x0},
-	139:  {region: 0x165, script: 0x5a, flags: 0x0},
-	140:  {region: 0x165, script: 0x5a, flags: 0x0},
-	141:  {region: 0xe7, script: 0x5a, flags: 0x0},
-	142:  {region: 0x165, script: 0x5a, flags: 0x0},
-	143:  {region: 0xd6, script: 0x5a, flags: 0x0},
-	144:  {region: 0x165, script: 0x5a, flags: 0x0},
-	145:  {region: 0x165, script: 0x5a, flags: 0x0},
-	146:  {region: 0x165, script: 0x5a, flags: 0x0},
-	147:  {region: 0x165, script: 0x2c, flags: 0x0},
-	148:  {region: 0x99, script: 0x22, flags: 0x0},
-	149:  {region: 0x95, script: 0x5a, flags: 0x0},
-	150:  {region: 0x165, script: 0x5a, flags: 0x0},
-	151:  {region: 0x165, script: 0x5a, flags: 0x0},
-	152:  {region: 0x114, script: 0x5a, flags: 0x0},
-	153:  {region: 0x165, script: 0x5a, flags: 0x0},
-	154:  {region: 0x165, script: 0x5a, flags: 0x0},
-	155:  {region: 0x52, script: 0x5a, flags: 0x0},
-	156:  {region: 0x165, script: 0x5a, flags: 0x0},
-	157:  {region: 0xe7, script: 0x5a, flags: 0x0},
-	158:  {region: 0x165, script: 0x5a, flags: 0x0},
-	159:  {region: 0x13e, script: 0xe5, flags: 0x0},
-	160:  {region: 0xc3, script: 0x5a, flags: 0x0},
-	161:  {region: 0x165, script: 0x5a, flags: 0x0},
-	162:  {region: 0x165, script: 0x5a, flags: 0x0},
-	163:  {region: 0xc3, script: 0x5a, flags: 0x0},
-	164:  {region: 0x165, script: 0x5a, flags: 0x0},
+	127:  {region: 0x9a, script: 0x22, flags: 0x0},
+	128:  {region: 0xe9, script: 0x5, flags: 0x0},
+	129:  {region: 0x12c, script: 0x34, flags: 0x0},
+	131:  {region: 0x9a, script: 0x22, flags: 0x0},
+	132:  {region: 0x166, script: 0x5b, flags: 0x0},
+	133:  {region: 0x9a, script: 0x22, flags: 0x0},
+	134:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	135:  {region: 0x166, script: 0x5b, flags: 0x0},
+	136:  {region: 0x9a, script: 0x22, flags: 0x0},
+	137:  {region: 0x166, script: 0x5b, flags: 0x0},
+	138:  {region: 0x140, script: 0x5b, flags: 0x0},
+	139:  {region: 0x166, script: 0x5b, flags: 0x0},
+	140:  {region: 0x166, script: 0x5b, flags: 0x0},
+	141:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	142:  {region: 0x166, script: 0x5b, flags: 0x0},
+	143:  {region: 0xd7, script: 0x5b, flags: 0x0},
+	144:  {region: 0x166, script: 0x5b, flags: 0x0},
+	145:  {region: 0x166, script: 0x5b, flags: 0x0},
+	146:  {region: 0x166, script: 0x5b, flags: 0x0},
+	147:  {region: 0x166, script: 0x2c, flags: 0x0},
+	148:  {region: 0x9a, script: 0x22, flags: 0x0},
+	149:  {region: 0x96, script: 0x5b, flags: 0x0},
+	150:  {region: 0x166, script: 0x5b, flags: 0x0},
+	151:  {region: 0x166, script: 0x5b, flags: 0x0},
+	152:  {region: 0x115, script: 0x5b, flags: 0x0},
+	153:  {region: 0x166, script: 0x5b, flags: 0x0},
+	154:  {region: 0x166, script: 0x5b, flags: 0x0},
+	155:  {region: 0x52, script: 0x5b, flags: 0x0},
+	156:  {region: 0x166, script: 0x5b, flags: 0x0},
+	157:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	158:  {region: 0x166, script: 0x5b, flags: 0x0},
+	159:  {region: 0x13f, script: 0xe8, flags: 0x0},
+	160:  {region: 0xc4, script: 0x5b, flags: 0x0},
+	161:  {region: 0x166, script: 0x5b, flags: 0x0},
+	162:  {region: 0x166, script: 0x5b, flags: 0x0},
+	163:  {region: 0xc4, script: 0x5b, flags: 0x0},
+	164:  {region: 0x166, script: 0x5b, flags: 0x0},
 	165:  {region: 0x35, script: 0xe, flags: 0x0},
-	166:  {region: 0x165, script: 0x5a, flags: 0x0},
-	167:  {region: 0x165, script: 0x5a, flags: 0x0},
-	168:  {region: 0x165, script: 0x5a, flags: 0x0},
-	169:  {region: 0x53, script: 0xec, flags: 0x0},
-	170:  {region: 0x165, script: 0x5a, flags: 0x0},
-	171:  {region: 0x165, script: 0x5a, flags: 0x0},
-	172:  {region: 0x165, script: 0x5a, flags: 0x0},
-	173:  {region: 0x99, script: 0xe, flags: 0x0},
-	174:  {region: 0x165, script: 0x5a, flags: 0x0},
-	175:  {region: 0x9c, script: 0x5, flags: 0x0},
-	176:  {region: 0x165, script: 0x5a, flags: 0x0},
-	177:  {region: 0x4f, script: 0x5a, flags: 0x0},
-	178:  {region: 0x78, script: 0x5a, flags: 0x0},
-	179:  {region: 0x99, script: 0x22, flags: 0x0},
-	180:  {region: 0xe8, script: 0x5, flags: 0x0},
-	181:  {region: 0x99, script: 0x22, flags: 0x0},
-	182:  {region: 0x165, script: 0x5a, flags: 0x0},
-	183:  {region: 0x33, script: 0x5a, flags: 0x0},
-	184:  {region: 0x165, script: 0x5a, flags: 0x0},
-	185:  {region: 0xb4, script: 0xc, flags: 0x0},
-	186:  {region: 0x52, script: 0x5a, flags: 0x0},
-	187:  {region: 0x165, script: 0x2c, flags: 0x0},
-	188:  {region: 0xe7, script: 0x5a, flags: 0x0},
-	189:  {region: 0x165, script: 0x5a, flags: 0x0},
-	190:  {region: 0xe8, script: 0x22, flags: 0x0},
-	191:  {region: 0x106, script: 0x20, flags: 0x0},
-	192:  {region: 0x15f, script: 0x5a, flags: 0x0},
-	193:  {region: 0x165, script: 0x5a, flags: 0x0},
-	194:  {region: 0x95, script: 0x5a, flags: 0x0},
-	195:  {region: 0x165, script: 0x5a, flags: 0x0},
-	196:  {region: 0x52, script: 0x5a, flags: 0x0},
-	197:  {region: 0x165, script: 0x5a, flags: 0x0},
-	198:  {region: 0x165, script: 0x5a, flags: 0x0},
-	199:  {region: 0x165, script: 0x5a, flags: 0x0},
-	200:  {region: 0x86, script: 0x5a, flags: 0x0},
-	201:  {region: 0x165, script: 0x5a, flags: 0x0},
-	202:  {region: 0x165, script: 0x5a, flags: 0x0},
-	203:  {region: 0x165, script: 0x5a, flags: 0x0},
-	204:  {region: 0x165, script: 0x5a, flags: 0x0},
-	205:  {region: 0x6d, script: 0x2c, flags: 0x0},
-	206:  {region: 0x165, script: 0x5a, flags: 0x0},
-	207:  {region: 0x165, script: 0x5a, flags: 0x0},
-	208:  {region: 0x52, script: 0x5a, flags: 0x0},
-	209:  {region: 0x165, script: 0x5a, flags: 0x0},
-	210:  {region: 0x165, script: 0x5a, flags: 0x0},
-	211:  {region: 0xc3, script: 0x5a, flags: 0x0},
-	212:  {region: 0x165, script: 0x5a, flags: 0x0},
-	213:  {region: 0x165, script: 0x5a, flags: 0x0},
-	214:  {region: 0x165, script: 0x5a, flags: 0x0},
-	215:  {region: 0x6e, script: 0x5a, flags: 0x0},
-	216:  {region: 0x165, script: 0x5a, flags: 0x0},
-	217:  {region: 0x165, script: 0x5a, flags: 0x0},
-	218:  {region: 0xd6, script: 0x5a, flags: 0x0},
+	166:  {region: 0x166, script: 0x5b, flags: 0x0},
+	167:  {region: 0x166, script: 0x5b, flags: 0x0},
+	168:  {region: 0x166, script: 0x5b, flags: 0x0},
+	169:  {region: 0x53, script: 0xef, flags: 0x0},
+	170:  {region: 0x166, script: 0x5b, flags: 0x0},
+	171:  {region: 0x166, script: 0x5b, flags: 0x0},
+	172:  {region: 0x166, script: 0x5b, flags: 0x0},
+	173:  {region: 0x9a, script: 0xe, flags: 0x0},
+	174:  {region: 0x166, script: 0x5b, flags: 0x0},
+	175:  {region: 0x9d, script: 0x5, flags: 0x0},
+	176:  {region: 0x166, script: 0x5b, flags: 0x0},
+	177:  {region: 0x4f, script: 0x5b, flags: 0x0},
+	178:  {region: 0x79, script: 0x5b, flags: 0x0},
+	179:  {region: 0x9a, script: 0x22, flags: 0x0},
+	180:  {region: 0xe9, script: 0x5, flags: 0x0},
+	181:  {region: 0x9a, script: 0x22, flags: 0x0},
+	182:  {region: 0x166, script: 0x5b, flags: 0x0},
+	183:  {region: 0x33, script: 0x5b, flags: 0x0},
+	184:  {region: 0x166, script: 0x5b, flags: 0x0},
+	185:  {region: 0xb5, script: 0xc, flags: 0x0},
+	186:  {region: 0x52, script: 0x5b, flags: 0x0},
+	187:  {region: 0x166, script: 0x2c, flags: 0x0},
+	188:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	189:  {region: 0x166, script: 0x5b, flags: 0x0},
+	190:  {region: 0xe9, script: 0x22, flags: 0x0},
+	191:  {region: 0x107, script: 0x20, flags: 0x0},
+	192:  {region: 0x160, script: 0x5b, flags: 0x0},
+	193:  {region: 0x166, script: 0x5b, flags: 0x0},
+	194:  {region: 0x96, script: 0x5b, flags: 0x0},
+	195:  {region: 0x166, script: 0x5b, flags: 0x0},
+	196:  {region: 0x52, script: 0x5b, flags: 0x0},
+	197:  {region: 0x166, script: 0x5b, flags: 0x0},
+	198:  {region: 0x166, script: 0x5b, flags: 0x0},
+	199:  {region: 0x166, script: 0x5b, flags: 0x0},
+	200:  {region: 0x87, script: 0x5b, flags: 0x0},
+	201:  {region: 0x166, script: 0x5b, flags: 0x0},
+	202:  {region: 0x166, script: 0x5b, flags: 0x0},
+	203:  {region: 0x166, script: 0x5b, flags: 0x0},
+	204:  {region: 0x166, script: 0x5b, flags: 0x0},
+	205:  {region: 0x6e, script: 0x2c, flags: 0x0},
+	206:  {region: 0x166, script: 0x5b, flags: 0x0},
+	207:  {region: 0x166, script: 0x5b, flags: 0x0},
+	208:  {region: 0x52, script: 0x5b, flags: 0x0},
+	209:  {region: 0x166, script: 0x5b, flags: 0x0},
+	210:  {region: 0x166, script: 0x5b, flags: 0x0},
+	211:  {region: 0xc4, script: 0x5b, flags: 0x0},
+	212:  {region: 0x166, script: 0x5b, flags: 0x0},
+	213:  {region: 0x166, script: 0x5b, flags: 0x0},
+	214:  {region: 0x166, script: 0x5b, flags: 0x0},
+	215:  {region: 0x6f, script: 0x5b, flags: 0x0},
+	216:  {region: 0x166, script: 0x5b, flags: 0x0},
+	217:  {region: 0x166, script: 0x5b, flags: 0x0},
+	218:  {region: 0xd7, script: 0x5b, flags: 0x0},
 	219:  {region: 0x35, script: 0x16, flags: 0x0},
-	220:  {region: 0x106, script: 0x20, flags: 0x0},
-	221:  {region: 0xe7, script: 0x5a, flags: 0x0},
-	222:  {region: 0x165, script: 0x5a, flags: 0x0},
-	223:  {region: 0x131, script: 0x5a, flags: 0x0},
-	224:  {region: 0x8a, script: 0x5a, flags: 0x0},
-	225:  {region: 0x75, script: 0x5a, flags: 0x0},
-	226:  {region: 0x106, script: 0x20, flags: 0x0},
-	227:  {region: 0x135, script: 0x5a, flags: 0x0},
-	228:  {region: 0x49, script: 0x5a, flags: 0x0},
-	229:  {region: 0x135, script: 0x1a, flags: 0x0},
-	230:  {region: 0xa6, script: 0x5, flags: 0x0},
-	231:  {region: 0x13e, script: 0x19, flags: 0x0},
-	232:  {region: 0x165, script: 0x5a, flags: 0x0},
-	233:  {region: 0x9b, script: 0x5, flags: 0x0},
-	234:  {region: 0x165, script: 0x5a, flags: 0x0},
-	235:  {region: 0x165, script: 0x5a, flags: 0x0},
-	236:  {region: 0x165, script: 0x5a, flags: 0x0},
-	237:  {region: 0x165, script: 0x5a, flags: 0x0},
-	238:  {region: 0x165, script: 0x5a, flags: 0x0},
-	239:  {region: 0xc5, script: 0xd8, flags: 0x0},
-	240:  {region: 0x78, script: 0x5a, flags: 0x0},
-	241:  {region: 0x6b, script: 0x1d, flags: 0x0},
-	242:  {region: 0xe7, script: 0x5a, flags: 0x0},
+	220:  {region: 0x107, script: 0x20, flags: 0x0},
+	221:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	222:  {region: 0x166, script: 0x5b, flags: 0x0},
+	223:  {region: 0x132, script: 0x5b, flags: 0x0},
+	224:  {region: 0x8b, script: 0x5b, flags: 0x0},
+	225:  {region: 0x76, script: 0x5b, flags: 0x0},
+	226:  {region: 0x107, script: 0x20, flags: 0x0},
+	227:  {region: 0x136, script: 0x5b, flags: 0x0},
+	228:  {region: 0x49, script: 0x5b, flags: 0x0},
+	229:  {region: 0x136, script: 0x1a, flags: 0x0},
+	230:  {region: 0xa7, script: 0x5, flags: 0x0},
+	231:  {region: 0x13f, script: 0x19, flags: 0x0},
+	232:  {region: 0x166, script: 0x5b, flags: 0x0},
+	233:  {region: 0x9c, script: 0x5, flags: 0x0},
+	234:  {region: 0x166, script: 0x5b, flags: 0x0},
+	235:  {region: 0x166, script: 0x5b, flags: 0x0},
+	236:  {region: 0x166, script: 0x5b, flags: 0x0},
+	237:  {region: 0x166, script: 0x5b, flags: 0x0},
+	238:  {region: 0x166, script: 0x5b, flags: 0x0},
+	239:  {region: 0xc6, script: 0xda, flags: 0x0},
+	240:  {region: 0x79, script: 0x5b, flags: 0x0},
+	241:  {region: 0x6c, script: 0x1d, flags: 0x0},
+	242:  {region: 0xe8, script: 0x5b, flags: 0x0},
 	243:  {region: 0x49, script: 0x17, flags: 0x0},
-	244:  {region: 0x130, script: 0x20, flags: 0x0},
+	244:  {region: 0x131, script: 0x20, flags: 0x0},
 	245:  {region: 0x49, script: 0x17, flags: 0x0},
 	246:  {region: 0x49, script: 0x17, flags: 0x0},
 	247:  {region: 0x49, script: 0x17, flags: 0x0},
 	248:  {region: 0x49, script: 0x17, flags: 0x0},
-	249:  {region: 0x10a, script: 0x5a, flags: 0x0},
-	250:  {region: 0x5e, script: 0x5a, flags: 0x0},
-	251:  {region: 0xe9, script: 0x5a, flags: 0x0},
+	249:  {region: 0x10b, script: 0x5b, flags: 0x0},
+	250:  {region: 0x5f, script: 0x5b, flags: 0x0},
+	251:  {region: 0xea, script: 0x5b, flags: 0x0},
 	252:  {region: 0x49, script: 0x17, flags: 0x0},
-	253:  {region: 0xc4, script: 0x86, flags: 0x0},
+	253:  {region: 0xc5, script: 0x88, flags: 0x0},
 	254:  {region: 0x8, script: 0x2, flags: 0x1},
-	255:  {region: 0x106, script: 0x20, flags: 0x0},
-	256:  {region: 0x7b, script: 0x5a, flags: 0x0},
-	257:  {region: 0x63, script: 0x5a, flags: 0x0},
-	258:  {region: 0x165, script: 0x5a, flags: 0x0},
-	259:  {region: 0x165, script: 0x5a, flags: 0x0},
-	260:  {region: 0x165, script: 0x5a, flags: 0x0},
-	261:  {region: 0x165, script: 0x5a, flags: 0x0},
-	262:  {region: 0x135, script: 0x5a, flags: 0x0},
-	263:  {region: 0x106, script: 0x20, flags: 0x0},
-	264:  {region: 0xa4, script: 0x5a, flags: 0x0},
-	265:  {region: 0x165, script: 0x5a, flags: 0x0},
-	266:  {region: 0x165, script: 0x5a, flags: 0x0},
-	267:  {region: 0x99, script: 0x5, flags: 0x0},
-	268:  {region: 0x165, script: 0x5a, flags: 0x0},
-	269:  {region: 0x60, script: 0x5a, flags: 0x0},
-	270:  {region: 0x165, script: 0x5a, flags: 0x0},
-	271:  {region: 0x49, script: 0x5a, flags: 0x0},
-	272:  {region: 0x165, script: 0x5a, flags: 0x0},
-	273:  {region: 0x165, script: 0x5a, flags: 0x0},
-	274:  {region: 0x165, script: 0x5a, flags: 0x0},
-	275:  {region: 0x165, script: 0x5, flags: 0x0},
-	276:  {region: 0x49, script: 0x5a, flags: 0x0},
-	277:  {region: 0x165, script: 0x5a, flags: 0x0},
-	278:  {region: 0x165, script: 0x5a, flags: 0x0},
-	279:  {region: 0xd4, script: 0x5a, flags: 0x0},
-	280:  {region: 0x4f, script: 0x5a, flags: 0x0},
-	281:  {region: 0x165, script: 0x5a, flags: 0x0},
-	282:  {region: 0x99, script: 0x5, flags: 0x0},
-	283:  {region: 0x165, script: 0x5a, flags: 0x0},
-	284:  {region: 0x165, script: 0x5a, flags: 0x0},
-	285:  {region: 0x165, script: 0x5a, flags: 0x0},
-	286:  {region: 0x165, script: 0x2c, flags: 0x0},
-	287:  {region: 0x60, script: 0x5a, flags: 0x0},
-	288:  {region: 0xc3, script: 0x5a, flags: 0x0},
-	289:  {region: 0xd0, script: 0x5a, flags: 0x0},
-	290:  {region: 0x165, script: 0x5a, flags: 0x0},
-	291:  {region: 0xdb, script: 0x22, flags: 0x0},
-	292:  {region: 0x52, script: 0x5a, flags: 0x0},
-	293:  {region: 0x165, script: 0x5a, flags: 0x0},
-	294:  {region: 0x165, script: 0x5a, flags: 0x0},
-	295:  {region: 0x165, script: 0x5a, flags: 0x0},
-	296:  {region: 0xcd, script: 0xea, flags: 0x0},
-	297:  {region: 0x165, script: 0x5a, flags: 0x0},
-	298:  {region: 0x165, script: 0x5a, flags: 0x0},
-	299:  {region: 0x114, script: 0x5a, flags: 0x0},
-	300:  {region: 0x37, script: 0x5a, flags: 0x0},
-	301:  {region: 0x43, script: 0xec, flags: 0x0},
-	302:  {region: 0x165, script: 0x5a, flags: 0x0},
-	303:  {region: 0xa4, script: 0x5a, flags: 0x0},
-	304:  {region: 0x80, script: 0x5a, flags: 0x0},
-	305:  {region: 0xd6, script: 0x5a, flags: 0x0},
-	306:  {region: 0x9e, script: 0x5a, flags: 0x0},
-	307:  {region: 0x6b, script: 0x29, flags: 0x0},
-	308:  {region: 0x165, script: 0x5a, flags: 0x0},
-	309:  {region: 0xc4, script: 0x4b, flags: 0x0},
-	310:  {region: 0x87, script: 0x34, flags: 0x0},
-	311:  {region: 0x165, script: 0x5a, flags: 0x0},
-	312:  {region: 0x165, script: 0x5a, flags: 0x0},
+	255:  {region: 0x107, script: 0x20, flags: 0x0},
+	256:  {region: 0x7c, script: 0x5b, flags: 0x0},
+	257:  {region: 0x64, script: 0x5b, flags: 0x0},
+	258:  {region: 0x166, script: 0x5b, flags: 0x0},
+	259:  {region: 0x166, script: 0x5b, flags: 0x0},
+	260:  {region: 0x166, script: 0x5b, flags: 0x0},
+	261:  {region: 0x166, script: 0x5b, flags: 0x0},
+	262:  {region: 0x136, script: 0x5b, flags: 0x0},
+	263:  {region: 0x107, script: 0x20, flags: 0x0},
+	264:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	265:  {region: 0x166, script: 0x5b, flags: 0x0},
+	266:  {region: 0x166, script: 0x5b, flags: 0x0},
+	267:  {region: 0x9a, script: 0x5, flags: 0x0},
+	268:  {region: 0x166, script: 0x5b, flags: 0x0},
+	269:  {region: 0x61, script: 0x5b, flags: 0x0},
+	270:  {region: 0x166, script: 0x5b, flags: 0x0},
+	271:  {region: 0x49, script: 0x5b, flags: 0x0},
+	272:  {region: 0x166, script: 0x5b, flags: 0x0},
+	273:  {region: 0x166, script: 0x5b, flags: 0x0},
+	274:  {region: 0x166, script: 0x5b, flags: 0x0},
+	275:  {region: 0x166, script: 0x5, flags: 0x0},
+	276:  {region: 0x49, script: 0x5b, flags: 0x0},
+	277:  {region: 0x166, script: 0x5b, flags: 0x0},
+	278:  {region: 0x166, script: 0x5b, flags: 0x0},
+	279:  {region: 0xd5, script: 0x5b, flags: 0x0},
+	280:  {region: 0x4f, script: 0x5b, flags: 0x0},
+	281:  {region: 0x166, script: 0x5b, flags: 0x0},
+	282:  {region: 0x9a, script: 0x5, flags: 0x0},
+	283:  {region: 0x166, script: 0x5b, flags: 0x0},
+	284:  {region: 0x166, script: 0x5b, flags: 0x0},
+	285:  {region: 0x166, script: 0x5b, flags: 0x0},
+	286:  {region: 0x166, script: 0x2c, flags: 0x0},
+	287:  {region: 0x61, script: 0x5b, flags: 0x0},
+	288:  {region: 0xc4, script: 0x5b, flags: 0x0},
+	289:  {region: 0xd1, script: 0x5b, flags: 0x0},
+	290:  {region: 0x166, script: 0x5b, flags: 0x0},
+	291:  {region: 0xdc, script: 0x22, flags: 0x0},
+	292:  {region: 0x52, script: 0x5b, flags: 0x0},
+	293:  {region: 0x166, script: 0x5b, flags: 0x0},
+	294:  {region: 0x166, script: 0x5b, flags: 0x0},
+	295:  {region: 0x166, script: 0x5b, flags: 0x0},
+	296:  {region: 0xce, script: 0xed, flags: 0x0},
+	297:  {region: 0x166, script: 0x5b, flags: 0x0},
+	298:  {region: 0x166, script: 0x5b, flags: 0x0},
+	299:  {region: 0x115, script: 0x5b, flags: 0x0},
+	300:  {region: 0x37, script: 0x5b, flags: 0x0},
+	301:  {region: 0x43, script: 0xef, flags: 0x0},
+	302:  {region: 0x166, script: 0x5b, flags: 0x0},
+	303:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	304:  {region: 0x81, script: 0x5b, flags: 0x0},
+	305:  {region: 0xd7, script: 0x5b, flags: 0x0},
+	306:  {region: 0x9f, script: 0x5b, flags: 0x0},
+	307:  {region: 0x6c, script: 0x29, flags: 0x0},
+	308:  {region: 0x166, script: 0x5b, flags: 0x0},
+	309:  {region: 0xc5, script: 0x4b, flags: 0x0},
+	310:  {region: 0x88, script: 0x34, flags: 0x0},
+	311:  {region: 0x166, script: 0x5b, flags: 0x0},
+	312:  {region: 0x166, script: 0x5b, flags: 0x0},
 	313:  {region: 0xa, script: 0x2, flags: 0x1},
-	314:  {region: 0x165, script: 0x5a, flags: 0x0},
-	315:  {region: 0x165, script: 0x5a, flags: 0x0},
-	316:  {region: 0x1, script: 0x5a, flags: 0x0},
-	317:  {region: 0x165, script: 0x5a, flags: 0x0},
-	318:  {region: 0x6e, script: 0x5a, flags: 0x0},
-	319:  {region: 0x135, script: 0x5a, flags: 0x0},
-	320:  {region: 0x6a, script: 0x5a, flags: 0x0},
-	321:  {region: 0x165, script: 0x5a, flags: 0x0},
-	322:  {region: 0x9e, script: 0x46, flags: 0x0},
-	323:  {region: 0x165, script: 0x5a, flags: 0x0},
-	324:  {region: 0x165, script: 0x5a, flags: 0x0},
-	325:  {region: 0x6e, script: 0x5a, flags: 0x0},
-	326:  {region: 0x52, script: 0x5a, flags: 0x0},
-	327:  {region: 0x6e, script: 0x5a, flags: 0x0},
-	328:  {region: 0x9c, script: 0x5, flags: 0x0},
-	329:  {region: 0x165, script: 0x5a, flags: 0x0},
-	330:  {region: 0x165, script: 0x5a, flags: 0x0},
-	331:  {region: 0x165, script: 0x5a, flags: 0x0},
-	332:  {region: 0x165, script: 0x5a, flags: 0x0},
-	333:  {region: 0x86, script: 0x5a, flags: 0x0},
+	314:  {region: 0x166, script: 0x5b, flags: 0x0},
+	315:  {region: 0x166, script: 0x5b, flags: 0x0},
+	316:  {region: 0x1, script: 0x5b, flags: 0x0},
+	317:  {region: 0x166, script: 0x5b, flags: 0x0},
+	318:  {region: 0x6f, script: 0x5b, flags: 0x0},
+	319:  {region: 0x136, script: 0x5b, flags: 0x0},
+	320:  {region: 0x6b, script: 0x5b, flags: 0x0},
+	321:  {region: 0x166, script: 0x5b, flags: 0x0},
+	322:  {region: 0x9f, script: 0x46, flags: 0x0},
+	323:  {region: 0x166, script: 0x5b, flags: 0x0},
+	324:  {region: 0x166, script: 0x5b, flags: 0x0},
+	325:  {region: 0x6f, script: 0x5b, flags: 0x0},
+	326:  {region: 0x52, script: 0x5b, flags: 0x0},
+	327:  {region: 0x6f, script: 0x5b, flags: 0x0},
+	328:  {region: 0x9d, script: 0x5, flags: 0x0},
+	329:  {region: 0x166, script: 0x5b, flags: 0x0},
+	330:  {region: 0x166, script: 0x5b, flags: 0x0},
+	331:  {region: 0x166, script: 0x5b, flags: 0x0},
+	332:  {region: 0x166, script: 0x5b, flags: 0x0},
+	333:  {region: 0x87, script: 0x5b, flags: 0x0},
 	334:  {region: 0xc, script: 0x2, flags: 0x1},
-	335:  {region: 0x165, script: 0x5a, flags: 0x0},
-	336:  {region: 0xc3, script: 0x5a, flags: 0x0},
-	337:  {region: 0x72, script: 0x5a, flags: 0x0},
-	338:  {region: 0x10b, script: 0x5, flags: 0x0},
-	339:  {region: 0xe7, script: 0x5a, flags: 0x0},
-	340:  {region: 0x10c, script: 0x5a, flags: 0x0},
-	341:  {region: 0x73, script: 0x5a, flags: 0x0},
-	342:  {region: 0x165, script: 0x5a, flags: 0x0},
-	343:  {region: 0x165, script: 0x5a, flags: 0x0},
-	344:  {region: 0x76, script: 0x5a, flags: 0x0},
-	345:  {region: 0x165, script: 0x5a, flags: 0x0},
-	346:  {region: 0x3b, script: 0x5a, flags: 0x0},
-	347:  {region: 0x165, script: 0x5a, flags: 0x0},
-	348:  {region: 0x165, script: 0x5a, flags: 0x0},
-	349:  {region: 0x165, script: 0x5a, flags: 0x0},
-	350:  {region: 0x78, script: 0x5a, flags: 0x0},
-	351:  {region: 0x135, script: 0x5a, flags: 0x0},
-	352:  {region: 0x78, script: 0x5a, flags: 0x0},
-	353:  {region: 0x60, script: 0x5a, flags: 0x0},
-	354:  {region: 0x60, script: 0x5a, flags: 0x0},
+	335:  {region: 0x166, script: 0x5b, flags: 0x0},
+	336:  {region: 0xc4, script: 0x5b, flags: 0x0},
+	337:  {region: 0x73, script: 0x5b, flags: 0x0},
+	338:  {region: 0x10c, script: 0x5, flags: 0x0},
+	339:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	340:  {region: 0x10d, script: 0x5b, flags: 0x0},
+	341:  {region: 0x74, script: 0x5b, flags: 0x0},
+	342:  {region: 0x166, script: 0x5b, flags: 0x0},
+	343:  {region: 0x166, script: 0x5b, flags: 0x0},
+	344:  {region: 0x77, script: 0x5b, flags: 0x0},
+	345:  {region: 0x166, script: 0x5b, flags: 0x0},
+	346:  {region: 0x3b, script: 0x5b, flags: 0x0},
+	347:  {region: 0x166, script: 0x5b, flags: 0x0},
+	348:  {region: 0x166, script: 0x5b, flags: 0x0},
+	349:  {region: 0x166, script: 0x5b, flags: 0x0},
+	350:  {region: 0x79, script: 0x5b, flags: 0x0},
+	351:  {region: 0x136, script: 0x5b, flags: 0x0},
+	352:  {region: 0x79, script: 0x5b, flags: 0x0},
+	353:  {region: 0x61, script: 0x5b, flags: 0x0},
+	354:  {region: 0x61, script: 0x5b, flags: 0x0},
 	355:  {region: 0x52, script: 0x5, flags: 0x0},
-	356:  {region: 0x140, script: 0x5a, flags: 0x0},
-	357:  {region: 0x165, script: 0x5a, flags: 0x0},
-	358:  {region: 0x84, script: 0x5a, flags: 0x0},
-	359:  {region: 0x165, script: 0x5a, flags: 0x0},
-	360:  {region: 0xd4, script: 0x5a, flags: 0x0},
-	361:  {region: 0x9e, script: 0x5a, flags: 0x0},
-	362:  {region: 0xd6, script: 0x5a, flags: 0x0},
-	363:  {region: 0x165, script: 0x5a, flags: 0x0},
-	364:  {region: 0x10b, script: 0x5a, flags: 0x0},
-	365:  {region: 0xd9, script: 0x5a, flags: 0x0},
-	366:  {region: 0x96, script: 0x5a, flags: 0x0},
-	367:  {region: 0x80, script: 0x5a, flags: 0x0},
-	368:  {region: 0x165, script: 0x5a, flags: 0x0},
-	369:  {region: 0xbc, script: 0x5a, flags: 0x0},
-	370:  {region: 0x165, script: 0x5a, flags: 0x0},
-	371:  {region: 0x165, script: 0x5a, flags: 0x0},
-	372:  {region: 0x165, script: 0x5a, flags: 0x0},
+	356:  {region: 0x141, script: 0x5b, flags: 0x0},
+	357:  {region: 0x166, script: 0x5b, flags: 0x0},
+	358:  {region: 0x85, script: 0x5b, flags: 0x0},
+	359:  {region: 0x166, script: 0x5b, flags: 0x0},
+	360:  {region: 0xd5, script: 0x5b, flags: 0x0},
+	361:  {region: 0x9f, script: 0x5b, flags: 0x0},
+	362:  {region: 0xd7, script: 0x5b, flags: 0x0},
+	363:  {region: 0x166, script: 0x5b, flags: 0x0},
+	364:  {region: 0x10c, script: 0x5b, flags: 0x0},
+	365:  {region: 0xda, script: 0x5b, flags: 0x0},
+	366:  {region: 0x97, script: 0x5b, flags: 0x0},
+	367:  {region: 0x81, script: 0x5b, flags: 0x0},
+	368:  {region: 0x166, script: 0x5b, flags: 0x0},
+	369:  {region: 0xbd, script: 0x5b, flags: 0x0},
+	370:  {region: 0x166, script: 0x5b, flags: 0x0},
+	371:  {region: 0x166, script: 0x5b, flags: 0x0},
+	372:  {region: 0x166, script: 0x5b, flags: 0x0},
 	373:  {region: 0x53, script: 0x3b, flags: 0x0},
-	374:  {region: 0x165, script: 0x5a, flags: 0x0},
-	375:  {region: 0x95, script: 0x5a, flags: 0x0},
-	376:  {region: 0x165, script: 0x5a, flags: 0x0},
-	377:  {region: 0x165, script: 0x5a, flags: 0x0},
-	378:  {region: 0x99, script: 0x22, flags: 0x0},
-	379:  {region: 0x165, script: 0x5a, flags: 0x0},
-	380:  {region: 0x9c, script: 0x5, flags: 0x0},
-	381:  {region: 0x7e, script: 0x5a, flags: 0x0},
-	382:  {region: 0x7b, script: 0x5a, flags: 0x0},
-	383:  {region: 0x165, script: 0x5a, flags: 0x0},
-	384:  {region: 0x165, script: 0x5a, flags: 0x0},
-	385:  {region: 0x165, script: 0x5a, flags: 0x0},
-	386:  {region: 0x165, script: 0x5a, flags: 0x0},
-	387:  {region: 0x165, script: 0x5a, flags: 0x0},
-	388:  {region: 0x165, script: 0x5a, flags: 0x0},
-	389:  {region: 0x6f, script: 0x2c, flags: 0x0},
-	390:  {region: 0x165, script: 0x5a, flags: 0x0},
-	391:  {region: 0xdb, script: 0x22, flags: 0x0},
-	392:  {region: 0x165, script: 0x5a, flags: 0x0},
-	393:  {region: 0xa7, script: 0x5a, flags: 0x0},
-	394:  {region: 0x165, script: 0x5a, flags: 0x0},
-	395:  {region: 0xe8, script: 0x5, flags: 0x0},
-	396:  {region: 0x165, script: 0x5a, flags: 0x0},
-	397:  {region: 0xe8, script: 0x5, flags: 0x0},
-	398:  {region: 0x165, script: 0x5a, flags: 0x0},
-	399:  {region: 0x165, script: 0x5a, flags: 0x0},
-	400:  {region: 0x6e, script: 0x5a, flags: 0x0},
-	401:  {region: 0x9c, script: 0x5, flags: 0x0},
-	402:  {region: 0x165, script: 0x5a, flags: 0x0},
-	403:  {region: 0x165, script: 0x2c, flags: 0x0},
-	404:  {region: 0xf1, script: 0x5a, flags: 0x0},
-	405:  {region: 0x165, script: 0x5a, flags: 0x0},
-	406:  {region: 0x165, script: 0x5a, flags: 0x0},
-	407:  {region: 0x165, script: 0x5a, flags: 0x0},
-	408:  {region: 0x165, script: 0x2c, flags: 0x0},
-	409:  {region: 0x165, script: 0x5a, flags: 0x0},
-	410:  {region: 0x99, script: 0x22, flags: 0x0},
-	411:  {region: 0x99, script: 0xe6, flags: 0x0},
-	412:  {region: 0x95, script: 0x5a, flags: 0x0},
-	413:  {region: 0xd9, script: 0x5a, flags: 0x0},
-	414:  {region: 0x130, script: 0x32, flags: 0x0},
-	415:  {region: 0x165, script: 0x5a, flags: 0x0},
+	374:  {region: 0x166, script: 0x5b, flags: 0x0},
+	375:  {region: 0x96, script: 0x5b, flags: 0x0},
+	376:  {region: 0x166, script: 0x5b, flags: 0x0},
+	377:  {region: 0x166, script: 0x5b, flags: 0x0},
+	378:  {region: 0x9a, script: 0x22, flags: 0x0},
+	379:  {region: 0x166, script: 0x5b, flags: 0x0},
+	380:  {region: 0x9d, script: 0x5, flags: 0x0},
+	381:  {region: 0x7f, script: 0x5b, flags: 0x0},
+	382:  {region: 0x7c, script: 0x5b, flags: 0x0},
+	383:  {region: 0x166, script: 0x5b, flags: 0x0},
+	384:  {region: 0x166, script: 0x5b, flags: 0x0},
+	385:  {region: 0x166, script: 0x5b, flags: 0x0},
+	386:  {region: 0x166, script: 0x5b, flags: 0x0},
+	387:  {region: 0x166, script: 0x5b, flags: 0x0},
+	388:  {region: 0x166, script: 0x5b, flags: 0x0},
+	389:  {region: 0x70, script: 0x2c, flags: 0x0},
+	390:  {region: 0x166, script: 0x5b, flags: 0x0},
+	391:  {region: 0xdc, script: 0x22, flags: 0x0},
+	392:  {region: 0x166, script: 0x5b, flags: 0x0},
+	393:  {region: 0xa8, script: 0x5b, flags: 0x0},
+	394:  {region: 0x166, script: 0x5b, flags: 0x0},
+	395:  {region: 0xe9, script: 0x5, flags: 0x0},
+	396:  {region: 0x166, script: 0x5b, flags: 0x0},
+	397:  {region: 0xe9, script: 0x5, flags: 0x0},
+	398:  {region: 0x166, script: 0x5b, flags: 0x0},
+	399:  {region: 0x166, script: 0x5b, flags: 0x0},
+	400:  {region: 0x6f, script: 0x5b, flags: 0x0},
+	401:  {region: 0x9d, script: 0x5, flags: 0x0},
+	402:  {region: 0x166, script: 0x5b, flags: 0x0},
+	403:  {region: 0x166, script: 0x2c, flags: 0x0},
+	404:  {region: 0xf2, script: 0x5b, flags: 0x0},
+	405:  {region: 0x166, script: 0x5b, flags: 0x0},
+	406:  {region: 0x166, script: 0x5b, flags: 0x0},
+	407:  {region: 0x166, script: 0x5b, flags: 0x0},
+	408:  {region: 0x166, script: 0x2c, flags: 0x0},
+	409:  {region: 0x166, script: 0x5b, flags: 0x0},
+	410:  {region: 0x9a, script: 0x22, flags: 0x0},
+	411:  {region: 0x9a, script: 0xe9, flags: 0x0},
+	412:  {region: 0x96, script: 0x5b, flags: 0x0},
+	413:  {region: 0xda, script: 0x5b, flags: 0x0},
+	414:  {region: 0x131, script: 0x32, flags: 0x0},
+	415:  {region: 0x166, script: 0x5b, flags: 0x0},
 	416:  {region: 0xe, script: 0x2, flags: 0x1},
-	417:  {region: 0x99, script: 0xe, flags: 0x0},
-	418:  {region: 0x165, script: 0x5a, flags: 0x0},
-	419:  {region: 0x4e, script: 0x5a, flags: 0x0},
-	420:  {region: 0x99, script: 0x35, flags: 0x0},
-	421:  {region: 0x41, script: 0x5a, flags: 0x0},
-	422:  {region: 0x54, script: 0x5a, flags: 0x0},
-	423:  {region: 0x165, script: 0x5a, flags: 0x0},
-	424:  {region: 0x80, script: 0x5a, flags: 0x0},
-	425:  {region: 0x165, script: 0x5a, flags: 0x0},
-	426:  {region: 0x165, script: 0x5a, flags: 0x0},
-	427:  {region: 0xa4, script: 0x5a, flags: 0x0},
-	428:  {region: 0x98, script: 0x5a, flags: 0x0},
-	429:  {region: 0x165, script: 0x5a, flags: 0x0},
-	430:  {region: 0xdb, script: 0x22, flags: 0x0},
-	431:  {region: 0x165, script: 0x5a, flags: 0x0},
-	432:  {region: 0x165, script: 0x5, flags: 0x0},
-	433:  {region: 0x49, script: 0x5a, flags: 0x0},
-	434:  {region: 0x165, script: 0x5, flags: 0x0},
-	435:  {region: 0x165, script: 0x5a, flags: 0x0},
+	417:  {region: 0x9a, script: 0xe, flags: 0x0},
+	418:  {region: 0x166, script: 0x5b, flags: 0x0},
+	419:  {region: 0x4e, script: 0x5b, flags: 0x0},
+	420:  {region: 0x9a, script: 0x35, flags: 0x0},
+	421:  {region: 0x41, script: 0x5b, flags: 0x0},
+	422:  {region: 0x54, script: 0x5b, flags: 0x0},
+	423:  {region: 0x166, script: 0x5b, flags: 0x0},
+	424:  {region: 0x81, script: 0x5b, flags: 0x0},
+	425:  {region: 0x166, script: 0x5b, flags: 0x0},
+	426:  {region: 0x166, script: 0x5b, flags: 0x0},
+	427:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	428:  {region: 0x99, script: 0x5b, flags: 0x0},
+	429:  {region: 0x166, script: 0x5b, flags: 0x0},
+	430:  {region: 0xdc, script: 0x22, flags: 0x0},
+	431:  {region: 0x166, script: 0x5b, flags: 0x0},
+	432:  {region: 0x166, script: 0x5, flags: 0x0},
+	433:  {region: 0x49, script: 0x5b, flags: 0x0},
+	434:  {region: 0x166, script: 0x5, flags: 0x0},
+	435:  {region: 0x166, script: 0x5b, flags: 0x0},
 	436:  {region: 0x10, script: 0x3, flags: 0x1},
-	437:  {region: 0x165, script: 0x5a, flags: 0x0},
+	437:  {region: 0x166, script: 0x5b, flags: 0x0},
 	438:  {region: 0x53, script: 0x3b, flags: 0x0},
-	439:  {region: 0x165, script: 0x5a, flags: 0x0},
-	440:  {region: 0x135, script: 0x5a, flags: 0x0},
+	439:  {region: 0x166, script: 0x5b, flags: 0x0},
+	440:  {region: 0x136, script: 0x5b, flags: 0x0},
 	441:  {region: 0x24, script: 0x5, flags: 0x0},
-	442:  {region: 0x165, script: 0x5a, flags: 0x0},
-	443:  {region: 0x165, script: 0x2c, flags: 0x0},
-	444:  {region: 0x97, script: 0x3e, flags: 0x0},
-	445:  {region: 0x165, script: 0x5a, flags: 0x0},
-	446:  {region: 0x99, script: 0x22, flags: 0x0},
-	447:  {region: 0x165, script: 0x5a, flags: 0x0},
-	448:  {region: 0x73, script: 0x5a, flags: 0x0},
-	449:  {region: 0x165, script: 0x5a, flags: 0x0},
-	450:  {region: 0x165, script: 0x5a, flags: 0x0},
-	451:  {region: 0xe7, script: 0x5a, flags: 0x0},
-	452:  {region: 0x165, script: 0x5a, flags: 0x0},
-	453:  {region: 0x12b, script: 0x40, flags: 0x0},
-	454:  {region: 0x53, script: 0x90, flags: 0x0},
-	455:  {region: 0x165, script: 0x5a, flags: 0x0},
-	456:  {region: 0xe8, script: 0x5, flags: 0x0},
-	457:  {region: 0x99, script: 0x22, flags: 0x0},
-	458:  {region: 0xaf, script: 0x41, flags: 0x0},
-	459:  {region: 0xe7, script: 0x5a, flags: 0x0},
-	460:  {region: 0xe8, script: 0x5, flags: 0x0},
-	461:  {region: 0xe6, script: 0x5a, flags: 0x0},
-	462:  {region: 0x99, script: 0x22, flags: 0x0},
-	463:  {region: 0x99, script: 0x22, flags: 0x0},
-	464:  {region: 0x165, script: 0x5a, flags: 0x0},
-	465:  {region: 0x90, script: 0x5a, flags: 0x0},
-	466:  {region: 0x60, script: 0x5a, flags: 0x0},
+	442:  {region: 0x166, script: 0x5b, flags: 0x0},
+	443:  {region: 0x166, script: 0x2c, flags: 0x0},
+	444:  {region: 0x98, script: 0x3e, flags: 0x0},
+	445:  {region: 0x166, script: 0x5b, flags: 0x0},
+	446:  {region: 0x9a, script: 0x22, flags: 0x0},
+	447:  {region: 0x166, script: 0x5b, flags: 0x0},
+	448:  {region: 0x74, script: 0x5b, flags: 0x0},
+	449:  {region: 0x166, script: 0x5b, flags: 0x0},
+	450:  {region: 0x166, script: 0x5b, flags: 0x0},
+	451:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	452:  {region: 0x166, script: 0x5b, flags: 0x0},
+	453:  {region: 0x12c, script: 0x40, flags: 0x0},
+	454:  {region: 0x53, script: 0x92, flags: 0x0},
+	455:  {region: 0x166, script: 0x5b, flags: 0x0},
+	456:  {region: 0xe9, script: 0x5, flags: 0x0},
+	457:  {region: 0x9a, script: 0x22, flags: 0x0},
+	458:  {region: 0xb0, script: 0x41, flags: 0x0},
+	459:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	460:  {region: 0xe9, script: 0x5, flags: 0x0},
+	461:  {region: 0xe7, script: 0x5b, flags: 0x0},
+	462:  {region: 0x9a, script: 0x22, flags: 0x0},
+	463:  {region: 0x9a, script: 0x22, flags: 0x0},
+	464:  {region: 0x166, script: 0x5b, flags: 0x0},
+	465:  {region: 0x91, script: 0x5b, flags: 0x0},
+	466:  {region: 0x61, script: 0x5b, flags: 0x0},
 	467:  {region: 0x53, script: 0x3b, flags: 0x0},
-	468:  {region: 0x91, script: 0x5a, flags: 0x0},
-	469:  {region: 0x92, script: 0x5a, flags: 0x0},
-	470:  {region: 0x165, script: 0x5a, flags: 0x0},
+	468:  {region: 0x92, script: 0x5b, flags: 0x0},
+	469:  {region: 0x93, script: 0x5b, flags: 0x0},
+	470:  {region: 0x166, script: 0x5b, flags: 0x0},
 	471:  {region: 0x28, script: 0x8, flags: 0x0},
-	472:  {region: 0xd2, script: 0x5a, flags: 0x0},
-	473:  {region: 0x78, script: 0x5a, flags: 0x0},
-	474:  {region: 0x165, script: 0x5a, flags: 0x0},
-	475:  {region: 0x165, script: 0x5a, flags: 0x0},
-	476:  {region: 0xd0, script: 0x5a, flags: 0x0},
-	477:  {region: 0xd6, script: 0x5a, flags: 0x0},
-	478:  {region: 0x165, script: 0x5a, flags: 0x0},
-	479:  {region: 0x165, script: 0x5a, flags: 0x0},
-	480:  {region: 0x165, script: 0x5a, flags: 0x0},
-	481:  {region: 0x95, script: 0x5a, flags: 0x0},
-	482:  {region: 0x165, script: 0x5a, flags: 0x0},
-	483:  {region: 0x165, script: 0x5a, flags: 0x0},
-	484:  {region: 0x165, script: 0x5a, flags: 0x0},
-	486:  {region: 0x122, script: 0x5a, flags: 0x0},
-	487:  {region: 0xd6, script: 0x5a, flags: 0x0},
-	488:  {region: 0x165, script: 0x5a, flags: 0x0},
-	489:  {region: 0x165, script: 0x5a, flags: 0x0},
-	490:  {region: 0x53, script: 0xfa, flags: 0x0},
-	491:  {region: 0x165, script: 0x5a, flags: 0x0},
-	492:  {region: 0x135, script: 0x5a, flags: 0x0},
-	493:  {region: 0x165, script: 0x5a, flags: 0x0},
-	494:  {region: 0x49, script: 0x5a, flags: 0x0},
-	495:  {region: 0x165, script: 0x5a, flags: 0x0},
-	496:  {region: 0x165, script: 0x5a, flags: 0x0},
-	497:  {region: 0xe7, script: 0x5a, flags: 0x0},
-	498:  {region: 0x165, script: 0x5a, flags: 0x0},
-	499:  {region: 0x95, script: 0x5a, flags: 0x0},
-	500:  {region: 0x106, script: 0x20, flags: 0x0},
-	501:  {region: 0x1, script: 0x5a, flags: 0x0},
-	502:  {region: 0x165, script: 0x5a, flags: 0x0},
-	503:  {region: 0x165, script: 0x5a, flags: 0x0},
-	504:  {region: 0x9d, script: 0x5a, flags: 0x0},
-	505:  {region: 0x9e, script: 0x5a, flags: 0x0},
+	472:  {region: 0xd3, script: 0x5b, flags: 0x0},
+	473:  {region: 0x79, script: 0x5b, flags: 0x0},
+	474:  {region: 0x166, script: 0x5b, flags: 0x0},
+	475:  {region: 0x166, script: 0x5b, flags: 0x0},
+	476:  {region: 0xd1, script: 0x5b, flags: 0x0},
+	477:  {region: 0xd7, script: 0x5b, flags: 0x0},
+	478:  {region: 0x166, script: 0x5b, flags: 0x0},
+	479:  {region: 0x166, script: 0x5b, flags: 0x0},
+	480:  {region: 0x166, script: 0x5b, flags: 0x0},
+	481:  {region: 0x96, script: 0x5b, flags: 0x0},
+	482:  {region: 0x166, script: 0x5b, flags: 0x0},
+	483:  {region: 0x166, script: 0x5b, flags: 0x0},
+	484:  {region: 0x166, script: 0x5b, flags: 0x0},
+	486:  {region: 0x123, script: 0x5b, flags: 0x0},
+	487:  {region: 0xd7, script: 0x5b, flags: 0x0},
+	488:  {region: 0x166, script: 0x5b, flags: 0x0},
+	489:  {region: 0x166, script: 0x5b, flags: 0x0},
+	490:  {region: 0x53, script: 0xfd, flags: 0x0},
+	491:  {region: 0x166, script: 0x5b, flags: 0x0},
+	492:  {region: 0x136, script: 0x5b, flags: 0x0},
+	493:  {region: 0x166, script: 0x5b, flags: 0x0},
+	494:  {region: 0x49, script: 0x5b, flags: 0x0},
+	495:  {region: 0x166, script: 0x5b, flags: 0x0},
+	496:  {region: 0x166, script: 0x5b, flags: 0x0},
+	497:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	498:  {region: 0x166, script: 0x5b, flags: 0x0},
+	499:  {region: 0x96, script: 0x5b, flags: 0x0},
+	500:  {region: 0x107, script: 0x20, flags: 0x0},
+	501:  {region: 0x1, script: 0x5b, flags: 0x0},
+	502:  {region: 0x166, script: 0x5b, flags: 0x0},
+	503:  {region: 0x166, script: 0x5b, flags: 0x0},
+	504:  {region: 0x9e, script: 0x5b, flags: 0x0},
+	505:  {region: 0x9f, script: 0x5b, flags: 0x0},
 	506:  {region: 0x49, script: 0x17, flags: 0x0},
-	507:  {region: 0x97, script: 0x3e, flags: 0x0},
-	508:  {region: 0x165, script: 0x5a, flags: 0x0},
-	509:  {region: 0x165, script: 0x5a, flags: 0x0},
-	510:  {region: 0x106, script: 0x5a, flags: 0x0},
-	511:  {region: 0x165, script: 0x5a, flags: 0x0},
-	512:  {region: 0xa2, script: 0x49, flags: 0x0},
-	513:  {region: 0x165, script: 0x5a, flags: 0x0},
-	514:  {region: 0xa0, script: 0x5a, flags: 0x0},
-	515:  {region: 0x1, script: 0x5a, flags: 0x0},
-	516:  {region: 0x165, script: 0x5a, flags: 0x0},
-	517:  {region: 0x165, script: 0x5a, flags: 0x0},
-	518:  {region: 0x165, script: 0x5a, flags: 0x0},
-	519:  {region: 0x52, script: 0x5a, flags: 0x0},
-	520:  {region: 0x130, script: 0x3e, flags: 0x0},
-	521:  {region: 0x165, script: 0x5a, flags: 0x0},
-	522:  {region: 0x12f, script: 0x5a, flags: 0x0},
-	523:  {region: 0xdb, script: 0x22, flags: 0x0},
-	524:  {region: 0x165, script: 0x5a, flags: 0x0},
-	525:  {region: 0x63, script: 0x5a, flags: 0x0},
-	526:  {region: 0x95, script: 0x5a, flags: 0x0},
-	527:  {region: 0x95, script: 0x5a, flags: 0x0},
-	528:  {region: 0x7d, script: 0x2e, flags: 0x0},
-	529:  {region: 0x137, script: 0x20, flags: 0x0},
-	530:  {region: 0x67, script: 0x5a, flags: 0x0},
-	531:  {region: 0xc4, script: 0x5a, flags: 0x0},
-	532:  {region: 0x165, script: 0x5a, flags: 0x0},
-	533:  {region: 0x165, script: 0x5a, flags: 0x0},
-	534:  {region: 0xd6, script: 0x5a, flags: 0x0},
-	535:  {region: 0xa4, script: 0x5a, flags: 0x0},
-	536:  {region: 0xc3, script: 0x5a, flags: 0x0},
-	537:  {region: 0x106, script: 0x20, flags: 0x0},
-	538:  {region: 0x165, script: 0x5a, flags: 0x0},
-	539:  {region: 0x165, script: 0x5a, flags: 0x0},
-	540:  {region: 0x165, script: 0x5a, flags: 0x0},
-	541:  {region: 0x165, script: 0x5a, flags: 0x0},
-	542:  {region: 0xd4, script: 0x5, flags: 0x0},
-	543:  {region: 0xd6, script: 0x5a, flags: 0x0},
-	544:  {region: 0x164, script: 0x5a, flags: 0x0},
-	545:  {region: 0x165, script: 0x5a, flags: 0x0},
-	546:  {region: 0x165, script: 0x5a, flags: 0x0},
-	547:  {region: 0x12f, script: 0x5a, flags: 0x0},
-	548:  {region: 0x122, script: 0x5, flags: 0x0},
-	549:  {region: 0x165, script: 0x5a, flags: 0x0},
-	550:  {region: 0x123, script: 0xeb, flags: 0x0},
-	551:  {region: 0x5a, script: 0x5a, flags: 0x0},
-	552:  {region: 0x52, script: 0x5a, flags: 0x0},
-	553:  {region: 0x165, script: 0x5a, flags: 0x0},
-	554:  {region: 0x4f, script: 0x5a, flags: 0x0},
-	555:  {region: 0x99, script: 0x22, flags: 0x0},
-	556:  {region: 0x99, script: 0x22, flags: 0x0},
-	557:  {region: 0x4b, script: 0x5a, flags: 0x0},
-	558:  {region: 0x95, script: 0x5a, flags: 0x0},
-	559:  {region: 0x165, script: 0x5a, flags: 0x0},
-	560:  {region: 0x41, script: 0x5a, flags: 0x0},
-	561:  {region: 0x99, script: 0x5a, flags: 0x0},
-	562:  {region: 0x53, script: 0xe2, flags: 0x0},
-	563:  {region: 0x99, script: 0x22, flags: 0x0},
-	564:  {region: 0xc3, script: 0x5a, flags: 0x0},
-	565:  {region: 0x165, script: 0x5a, flags: 0x0},
-	566:  {region: 0x99, script: 0x75, flags: 0x0},
-	567:  {region: 0xe8, script: 0x5, flags: 0x0},
-	568:  {region: 0x165, script: 0x5a, flags: 0x0},
-	569:  {region: 0xa4, script: 0x5a, flags: 0x0},
-	570:  {region: 0x165, script: 0x5a, flags: 0x0},
-	571:  {region: 0x12b, script: 0x5a, flags: 0x0},
-	572:  {region: 0x165, script: 0x5a, flags: 0x0},
-	573:  {region: 0xd2, script: 0x5a, flags: 0x0},
-	574:  {region: 0x165, script: 0x5a, flags: 0x0},
-	575:  {region: 0xaf, script: 0x57, flags: 0x0},
-	576:  {region: 0x165, script: 0x5a, flags: 0x0},
-	577:  {region: 0x165, script: 0x5a, flags: 0x0},
+	507:  {region: 0x98, script: 0x3e, flags: 0x0},
+	508:  {region: 0x166, script: 0x5b, flags: 0x0},
+	509:  {region: 0x166, script: 0x5b, flags: 0x0},
+	510:  {region: 0x107, script: 0x5b, flags: 0x0},
+	511:  {region: 0x166, script: 0x5b, flags: 0x0},
+	512:  {region: 0xa3, script: 0x49, flags: 0x0},
+	513:  {region: 0x166, script: 0x5b, flags: 0x0},
+	514:  {region: 0xa1, script: 0x5b, flags: 0x0},
+	515:  {region: 0x1, script: 0x5b, flags: 0x0},
+	516:  {region: 0x166, script: 0x5b, flags: 0x0},
+	517:  {region: 0x166, script: 0x5b, flags: 0x0},
+	518:  {region: 0x166, script: 0x5b, flags: 0x0},
+	519:  {region: 0x52, script: 0x5b, flags: 0x0},
+	520:  {region: 0x131, script: 0x3e, flags: 0x0},
+	521:  {region: 0x166, script: 0x5b, flags: 0x0},
+	522:  {region: 0x130, script: 0x5b, flags: 0x0},
+	523:  {region: 0xdc, script: 0x22, flags: 0x0},
+	524:  {region: 0x166, script: 0x5b, flags: 0x0},
+	525:  {region: 0x64, script: 0x5b, flags: 0x0},
+	526:  {region: 0x96, script: 0x5b, flags: 0x0},
+	527:  {region: 0x96, script: 0x5b, flags: 0x0},
+	528:  {region: 0x7e, script: 0x2e, flags: 0x0},
+	529:  {region: 0x138, script: 0x20, flags: 0x0},
+	530:  {region: 0x68, script: 0x5b, flags: 0x0},
+	531:  {region: 0xc5, script: 0x5b, flags: 0x0},
+	532:  {region: 0x166, script: 0x5b, flags: 0x0},
+	533:  {region: 0x166, script: 0x5b, flags: 0x0},
+	534:  {region: 0xd7, script: 0x5b, flags: 0x0},
+	535:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	536:  {region: 0xc4, script: 0x5b, flags: 0x0},
+	537:  {region: 0x107, script: 0x20, flags: 0x0},
+	538:  {region: 0x166, script: 0x5b, flags: 0x0},
+	539:  {region: 0x166, script: 0x5b, flags: 0x0},
+	540:  {region: 0x166, script: 0x5b, flags: 0x0},
+	541:  {region: 0x166, script: 0x5b, flags: 0x0},
+	542:  {region: 0xd5, script: 0x5, flags: 0x0},
+	543:  {region: 0xd7, script: 0x5b, flags: 0x0},
+	544:  {region: 0x165, script: 0x5b, flags: 0x0},
+	545:  {region: 0x166, script: 0x5b, flags: 0x0},
+	546:  {region: 0x166, script: 0x5b, flags: 0x0},
+	547:  {region: 0x130, script: 0x5b, flags: 0x0},
+	548:  {region: 0x123, script: 0x5, flags: 0x0},
+	549:  {region: 0x166, script: 0x5b, flags: 0x0},
+	550:  {region: 0x124, script: 0xee, flags: 0x0},
+	551:  {region: 0x5b, script: 0x5b, flags: 0x0},
+	552:  {region: 0x52, script: 0x5b, flags: 0x0},
+	553:  {region: 0x166, script: 0x5b, flags: 0x0},
+	554:  {region: 0x4f, script: 0x5b, flags: 0x0},
+	555:  {region: 0x9a, script: 0x22, flags: 0x0},
+	556:  {region: 0x9a, script: 0x22, flags: 0x0},
+	557:  {region: 0x4b, script: 0x5b, flags: 0x0},
+	558:  {region: 0x96, script: 0x5b, flags: 0x0},
+	559:  {region: 0x166, script: 0x5b, flags: 0x0},
+	560:  {region: 0x41, script: 0x5b, flags: 0x0},
+	561:  {region: 0x9a, script: 0x5b, flags: 0x0},
+	562:  {region: 0x53, script: 0xe5, flags: 0x0},
+	563:  {region: 0x9a, script: 0x22, flags: 0x0},
+	564:  {region: 0xc4, script: 0x5b, flags: 0x0},
+	565:  {region: 0x166, script: 0x5b, flags: 0x0},
+	566:  {region: 0x9a, script: 0x76, flags: 0x0},
+	567:  {region: 0xe9, script: 0x5, flags: 0x0},
+	568:  {region: 0x166, script: 0x5b, flags: 0x0},
+	569:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	570:  {region: 0x166, script: 0x5b, flags: 0x0},
+	571:  {region: 0x12c, script: 0x5b, flags: 0x0},
+	572:  {region: 0x166, script: 0x5b, flags: 0x0},
+	573:  {region: 0xd3, script: 0x5b, flags: 0x0},
+	574:  {region: 0x166, script: 0x5b, flags: 0x0},
+	575:  {region: 0xb0, script: 0x58, flags: 0x0},
+	576:  {region: 0x166, script: 0x5b, flags: 0x0},
+	577:  {region: 0x166, script: 0x5b, flags: 0x0},
 	578:  {region: 0x13, script: 0x6, flags: 0x1},
-	579:  {region: 0x165, script: 0x5a, flags: 0x0},
-	580:  {region: 0x52, script: 0x5a, flags: 0x0},
-	581:  {region: 0x82, script: 0x5a, flags: 0x0},
-	582:  {region: 0xa4, script: 0x5a, flags: 0x0},
-	583:  {region: 0x165, script: 0x5a, flags: 0x0},
-	584:  {region: 0x165, script: 0x5a, flags: 0x0},
-	585:  {region: 0x165, script: 0x5a, flags: 0x0},
-	586:  {region: 0xa6, script: 0x4e, flags: 0x0},
-	587:  {region: 0x2a, script: 0x5a, flags: 0x0},
-	588:  {region: 0x165, script: 0x5a, flags: 0x0},
-	589:  {region: 0x165, script: 0x5a, flags: 0x0},
-	590:  {region: 0x165, script: 0x5a, flags: 0x0},
-	591:  {region: 0x165, script: 0x5a, flags: 0x0},
-	592:  {region: 0x165, script: 0x5a, flags: 0x0},
-	593:  {region: 0x99, script: 0x52, flags: 0x0},
-	594:  {region: 0x8b, script: 0x5a, flags: 0x0},
-	595:  {region: 0x165, script: 0x5a, flags: 0x0},
-	596:  {region: 0xab, script: 0x53, flags: 0x0},
-	597:  {region: 0x106, script: 0x20, flags: 0x0},
-	598:  {region: 0x99, script: 0x22, flags: 0x0},
-	599:  {region: 0x165, script: 0x5a, flags: 0x0},
-	600:  {region: 0x75, script: 0x5a, flags: 0x0},
-	601:  {region: 0x165, script: 0x5a, flags: 0x0},
-	602:  {region: 0xb4, script: 0x5a, flags: 0x0},
-	603:  {region: 0x165, script: 0x5a, flags: 0x0},
-	604:  {region: 0x165, script: 0x5a, flags: 0x0},
-	605:  {region: 0x165, script: 0x5a, flags: 0x0},
-	606:  {region: 0x165, script: 0x5a, flags: 0x0},
-	607:  {region: 0x165, script: 0x5a, flags: 0x0},
-	608:  {region: 0x165, script: 0x5a, flags: 0x0},
-	609:  {region: 0x165, script: 0x5a, flags: 0x0},
-	610:  {region: 0x165, script: 0x2c, flags: 0x0},
-	611:  {region: 0x165, script: 0x5a, flags: 0x0},
-	612:  {region: 0x106, script: 0x20, flags: 0x0},
-	613:  {region: 0x112, script: 0x5a, flags: 0x0},
-	614:  {region: 0xe7, script: 0x5a, flags: 0x0},
-	615:  {region: 0x106, script: 0x5a, flags: 0x0},
-	616:  {region: 0x165, script: 0x5a, flags: 0x0},
-	617:  {region: 0x99, script: 0x22, flags: 0x0},
-	618:  {region: 0x99, script: 0x5, flags: 0x0},
-	619:  {region: 0x12f, script: 0x5a, flags: 0x0},
-	620:  {region: 0x165, script: 0x5a, flags: 0x0},
-	621:  {region: 0x52, script: 0x5a, flags: 0x0},
-	622:  {region: 0x60, script: 0x5a, flags: 0x0},
-	623:  {region: 0x165, script: 0x5a, flags: 0x0},
-	624:  {region: 0x165, script: 0x5a, flags: 0x0},
-	625:  {region: 0x165, script: 0x2c, flags: 0x0},
-	626:  {region: 0x165, script: 0x5a, flags: 0x0},
-	627:  {region: 0x165, script: 0x5a, flags: 0x0},
+	579:  {region: 0x166, script: 0x5b, flags: 0x0},
+	580:  {region: 0x52, script: 0x5b, flags: 0x0},
+	581:  {region: 0x83, script: 0x5b, flags: 0x0},
+	582:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	583:  {region: 0x166, script: 0x5b, flags: 0x0},
+	584:  {region: 0x166, script: 0x5b, flags: 0x0},
+	585:  {region: 0x166, script: 0x5b, flags: 0x0},
+	586:  {region: 0xa7, script: 0x4f, flags: 0x0},
+	587:  {region: 0x2a, script: 0x5b, flags: 0x0},
+	588:  {region: 0x166, script: 0x5b, flags: 0x0},
+	589:  {region: 0x166, script: 0x5b, flags: 0x0},
+	590:  {region: 0x166, script: 0x5b, flags: 0x0},
+	591:  {region: 0x166, script: 0x5b, flags: 0x0},
+	592:  {region: 0x166, script: 0x5b, flags: 0x0},
+	593:  {region: 0x9a, script: 0x53, flags: 0x0},
+	594:  {region: 0x8c, script: 0x5b, flags: 0x0},
+	595:  {region: 0x166, script: 0x5b, flags: 0x0},
+	596:  {region: 0xac, script: 0x54, flags: 0x0},
+	597:  {region: 0x107, script: 0x20, flags: 0x0},
+	598:  {region: 0x9a, script: 0x22, flags: 0x0},
+	599:  {region: 0x166, script: 0x5b, flags: 0x0},
+	600:  {region: 0x76, script: 0x5b, flags: 0x0},
+	601:  {region: 0x166, script: 0x5b, flags: 0x0},
+	602:  {region: 0xb5, script: 0x5b, flags: 0x0},
+	603:  {region: 0x166, script: 0x5b, flags: 0x0},
+	604:  {region: 0x166, script: 0x5b, flags: 0x0},
+	605:  {region: 0x166, script: 0x5b, flags: 0x0},
+	606:  {region: 0x166, script: 0x5b, flags: 0x0},
+	607:  {region: 0x166, script: 0x5b, flags: 0x0},
+	608:  {region: 0x166, script: 0x5b, flags: 0x0},
+	609:  {region: 0x166, script: 0x5b, flags: 0x0},
+	610:  {region: 0x166, script: 0x2c, flags: 0x0},
+	611:  {region: 0x166, script: 0x5b, flags: 0x0},
+	612:  {region: 0x107, script: 0x20, flags: 0x0},
+	613:  {region: 0x113, script: 0x5b, flags: 0x0},
+	614:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	615:  {region: 0x107, script: 0x5b, flags: 0x0},
+	616:  {region: 0x166, script: 0x5b, flags: 0x0},
+	617:  {region: 0x9a, script: 0x22, flags: 0x0},
+	618:  {region: 0x9a, script: 0x5, flags: 0x0},
+	619:  {region: 0x130, script: 0x5b, flags: 0x0},
+	620:  {region: 0x166, script: 0x5b, flags: 0x0},
+	621:  {region: 0x52, script: 0x5b, flags: 0x0},
+	622:  {region: 0x61, script: 0x5b, flags: 0x0},
+	623:  {region: 0x166, script: 0x5b, flags: 0x0},
+	624:  {region: 0x166, script: 0x5b, flags: 0x0},
+	625:  {region: 0x166, script: 0x2c, flags: 0x0},
+	626:  {region: 0x166, script: 0x5b, flags: 0x0},
+	627:  {region: 0x166, script: 0x5b, flags: 0x0},
 	628:  {region: 0x19, script: 0x3, flags: 0x1},
-	629:  {region: 0x165, script: 0x5a, flags: 0x0},
-	630:  {region: 0x165, script: 0x5a, flags: 0x0},
-	631:  {region: 0x165, script: 0x5a, flags: 0x0},
-	632:  {region: 0x165, script: 0x5a, flags: 0x0},
-	633:  {region: 0x106, script: 0x20, flags: 0x0},
-	634:  {region: 0x165, script: 0x5a, flags: 0x0},
-	635:  {region: 0x165, script: 0x5a, flags: 0x0},
-	636:  {region: 0x165, script: 0x5a, flags: 0x0},
-	637:  {region: 0x106, script: 0x20, flags: 0x0},
-	638:  {region: 0x165, script: 0x5a, flags: 0x0},
-	639:  {region: 0x95, script: 0x5a, flags: 0x0},
-	640:  {region: 0xe8, script: 0x5, flags: 0x0},
-	641:  {region: 0x7b, script: 0x5a, flags: 0x0},
-	642:  {region: 0x165, script: 0x5a, flags: 0x0},
-	643:  {region: 0x165, script: 0x5a, flags: 0x0},
-	644:  {region: 0x165, script: 0x5a, flags: 0x0},
-	645:  {region: 0x165, script: 0x2c, flags: 0x0},
-	646:  {region: 0x123, script: 0xeb, flags: 0x0},
-	647:  {region: 0xe8, script: 0x5, flags: 0x0},
-	648:  {region: 0x165, script: 0x5a, flags: 0x0},
-	649:  {region: 0x165, script: 0x5a, flags: 0x0},
+	629:  {region: 0x166, script: 0x5b, flags: 0x0},
+	630:  {region: 0x166, script: 0x5b, flags: 0x0},
+	631:  {region: 0x166, script: 0x5b, flags: 0x0},
+	632:  {region: 0x166, script: 0x5b, flags: 0x0},
+	633:  {region: 0x107, script: 0x20, flags: 0x0},
+	634:  {region: 0x166, script: 0x5b, flags: 0x0},
+	635:  {region: 0x166, script: 0x5b, flags: 0x0},
+	636:  {region: 0x166, script: 0x5b, flags: 0x0},
+	637:  {region: 0x107, script: 0x20, flags: 0x0},
+	638:  {region: 0x166, script: 0x5b, flags: 0x0},
+	639:  {region: 0x96, script: 0x5b, flags: 0x0},
+	640:  {region: 0xe9, script: 0x5, flags: 0x0},
+	641:  {region: 0x7c, script: 0x5b, flags: 0x0},
+	642:  {region: 0x166, script: 0x5b, flags: 0x0},
+	643:  {region: 0x166, script: 0x5b, flags: 0x0},
+	644:  {region: 0x166, script: 0x5b, flags: 0x0},
+	645:  {region: 0x166, script: 0x2c, flags: 0x0},
+	646:  {region: 0x124, script: 0xee, flags: 0x0},
+	647:  {region: 0xe9, script: 0x5, flags: 0x0},
+	648:  {region: 0x166, script: 0x5b, flags: 0x0},
+	649:  {region: 0x166, script: 0x5b, flags: 0x0},
 	650:  {region: 0x1c, script: 0x5, flags: 0x1},
-	651:  {region: 0x165, script: 0x5a, flags: 0x0},
-	652:  {region: 0x165, script: 0x5a, flags: 0x0},
-	653:  {region: 0x165, script: 0x5a, flags: 0x0},
-	654:  {region: 0x138, script: 0x5a, flags: 0x0},
-	655:  {region: 0x87, script: 0x5e, flags: 0x0},
-	656:  {region: 0x97, script: 0x3e, flags: 0x0},
-	657:  {region: 0x12f, script: 0x5a, flags: 0x0},
-	658:  {region: 0xe8, script: 0x5, flags: 0x0},
-	659:  {region: 0x131, script: 0x5a, flags: 0x0},
-	660:  {region: 0x165, script: 0x5a, flags: 0x0},
-	661:  {region: 0xb7, script: 0x5a, flags: 0x0},
-	662:  {region: 0x106, script: 0x20, flags: 0x0},
-	663:  {region: 0x165, script: 0x5a, flags: 0x0},
-	664:  {region: 0x95, script: 0x5a, flags: 0x0},
-	665:  {region: 0x165, script: 0x5a, flags: 0x0},
-	666:  {region: 0x53, script: 0xeb, flags: 0x0},
-	667:  {region: 0x165, script: 0x5a, flags: 0x0},
-	668:  {region: 0x165, script: 0x5a, flags: 0x0},
-	669:  {region: 0x165, script: 0x5a, flags: 0x0},
-	670:  {region: 0x165, script: 0x5a, flags: 0x0},
-	671:  {region: 0x99, script: 0x5c, flags: 0x0},
-	672:  {region: 0x165, script: 0x5a, flags: 0x0},
-	673:  {region: 0x165, script: 0x5a, flags: 0x0},
-	674:  {region: 0x106, script: 0x20, flags: 0x0},
-	675:  {region: 0x131, script: 0x5a, flags: 0x0},
-	676:  {region: 0x165, script: 0x5a, flags: 0x0},
-	677:  {region: 0xd9, script: 0x5a, flags: 0x0},
-	678:  {region: 0x165, script: 0x5a, flags: 0x0},
-	679:  {region: 0x165, script: 0x5a, flags: 0x0},
+	651:  {region: 0x166, script: 0x5b, flags: 0x0},
+	652:  {region: 0x166, script: 0x5b, flags: 0x0},
+	653:  {region: 0x166, script: 0x5b, flags: 0x0},
+	654:  {region: 0x139, script: 0x5b, flags: 0x0},
+	655:  {region: 0x88, script: 0x5f, flags: 0x0},
+	656:  {region: 0x98, script: 0x3e, flags: 0x0},
+	657:  {region: 0x130, script: 0x5b, flags: 0x0},
+	658:  {region: 0xe9, script: 0x5, flags: 0x0},
+	659:  {region: 0x132, script: 0x5b, flags: 0x0},
+	660:  {region: 0x166, script: 0x5b, flags: 0x0},
+	661:  {region: 0xb8, script: 0x5b, flags: 0x0},
+	662:  {region: 0x107, script: 0x20, flags: 0x0},
+	663:  {region: 0x166, script: 0x5b, flags: 0x0},
+	664:  {region: 0x96, script: 0x5b, flags: 0x0},
+	665:  {region: 0x166, script: 0x5b, flags: 0x0},
+	666:  {region: 0x53, script: 0xee, flags: 0x0},
+	667:  {region: 0x166, script: 0x5b, flags: 0x0},
+	668:  {region: 0x166, script: 0x5b, flags: 0x0},
+	669:  {region: 0x166, script: 0x5b, flags: 0x0},
+	670:  {region: 0x166, script: 0x5b, flags: 0x0},
+	671:  {region: 0x9a, script: 0x5d, flags: 0x0},
+	672:  {region: 0x166, script: 0x5b, flags: 0x0},
+	673:  {region: 0x166, script: 0x5b, flags: 0x0},
+	674:  {region: 0x107, script: 0x20, flags: 0x0},
+	675:  {region: 0x132, script: 0x5b, flags: 0x0},
+	676:  {region: 0x166, script: 0x5b, flags: 0x0},
+	677:  {region: 0xda, script: 0x5b, flags: 0x0},
+	678:  {region: 0x166, script: 0x5b, flags: 0x0},
+	679:  {region: 0x166, script: 0x5b, flags: 0x0},
 	680:  {region: 0x21, script: 0x2, flags: 0x1},
-	681:  {region: 0x165, script: 0x5a, flags: 0x0},
-	682:  {region: 0x165, script: 0x5a, flags: 0x0},
-	683:  {region: 0x9e, script: 0x5a, flags: 0x0},
-	684:  {region: 0x53, script: 0x60, flags: 0x0},
-	685:  {region: 0x95, script: 0x5a, flags: 0x0},
-	686:  {region: 0x9c, script: 0x5, flags: 0x0},
-	687:  {region: 0x135, script: 0x5a, flags: 0x0},
-	688:  {region: 0x165, script: 0x5a, flags: 0x0},
-	689:  {region: 0x165, script: 0x5a, flags: 0x0},
-	690:  {region: 0x99, script: 0xe6, flags: 0x0},
-	691:  {region: 0x9e, script: 0x5a, flags: 0x0},
-	692:  {region: 0x165, script: 0x5a, flags: 0x0},
-	693:  {region: 0x4b, script: 0x5a, flags: 0x0},
-	694:  {region: 0x165, script: 0x5a, flags: 0x0},
-	695:  {region: 0x165, script: 0x5a, flags: 0x0},
-	696:  {region: 0xaf, script: 0x57, flags: 0x0},
-	697:  {region: 0x165, script: 0x5a, flags: 0x0},
-	698:  {region: 0x165, script: 0x5a, flags: 0x0},
-	699:  {region: 0x4b, script: 0x5a, flags: 0x0},
-	700:  {region: 0x165, script: 0x5a, flags: 0x0},
-	701:  {region: 0x165, script: 0x5a, flags: 0x0},
-	702:  {region: 0x162, script: 0x5a, flags: 0x0},
-	703:  {region: 0x9c, script: 0x5, flags: 0x0},
-	704:  {region: 0xb6, script: 0x5a, flags: 0x0},
-	705:  {region: 0xb8, script: 0x5a, flags: 0x0},
-	706:  {region: 0x4b, script: 0x5a, flags: 0x0},
-	707:  {region: 0x4b, script: 0x5a, flags: 0x0},
-	708:  {region: 0xa4, script: 0x5a, flags: 0x0},
-	709:  {region: 0xa4, script: 0x5a, flags: 0x0},
-	710:  {region: 0x9c, script: 0x5, flags: 0x0},
-	711:  {region: 0xb8, script: 0x5a, flags: 0x0},
-	712:  {region: 0x123, script: 0xeb, flags: 0x0},
+	681:  {region: 0x166, script: 0x5b, flags: 0x0},
+	682:  {region: 0x166, script: 0x5b, flags: 0x0},
+	683:  {region: 0x9f, script: 0x5b, flags: 0x0},
+	684:  {region: 0x53, script: 0x61, flags: 0x0},
+	685:  {region: 0x96, script: 0x5b, flags: 0x0},
+	686:  {region: 0x9d, script: 0x5, flags: 0x0},
+	687:  {region: 0x136, script: 0x5b, flags: 0x0},
+	688:  {region: 0x166, script: 0x5b, flags: 0x0},
+	689:  {region: 0x166, script: 0x5b, flags: 0x0},
+	690:  {region: 0x9a, script: 0xe9, flags: 0x0},
+	691:  {region: 0x9f, script: 0x5b, flags: 0x0},
+	692:  {region: 0x166, script: 0x5b, flags: 0x0},
+	693:  {region: 0x4b, script: 0x5b, flags: 0x0},
+	694:  {region: 0x166, script: 0x5b, flags: 0x0},
+	695:  {region: 0x166, script: 0x5b, flags: 0x0},
+	696:  {region: 0xb0, script: 0x58, flags: 0x0},
+	697:  {region: 0x166, script: 0x5b, flags: 0x0},
+	698:  {region: 0x166, script: 0x5b, flags: 0x0},
+	699:  {region: 0x4b, script: 0x5b, flags: 0x0},
+	700:  {region: 0x166, script: 0x5b, flags: 0x0},
+	701:  {region: 0x166, script: 0x5b, flags: 0x0},
+	702:  {region: 0x163, script: 0x5b, flags: 0x0},
+	703:  {region: 0x9d, script: 0x5, flags: 0x0},
+	704:  {region: 0xb7, script: 0x5b, flags: 0x0},
+	705:  {region: 0xb9, script: 0x5b, flags: 0x0},
+	706:  {region: 0x4b, script: 0x5b, flags: 0x0},
+	707:  {region: 0x4b, script: 0x5b, flags: 0x0},
+	708:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	709:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	710:  {region: 0x9d, script: 0x5, flags: 0x0},
+	711:  {region: 0xb9, script: 0x5b, flags: 0x0},
+	712:  {region: 0x124, script: 0xee, flags: 0x0},
 	713:  {region: 0x53, script: 0x3b, flags: 0x0},
-	714:  {region: 0x12b, script: 0x5a, flags: 0x0},
-	715:  {region: 0x95, script: 0x5a, flags: 0x0},
-	716:  {region: 0x52, script: 0x5a, flags: 0x0},
-	717:  {region: 0x99, script: 0x22, flags: 0x0},
-	718:  {region: 0x99, script: 0x22, flags: 0x0},
-	719:  {region: 0x95, script: 0x5a, flags: 0x0},
+	714:  {region: 0x12c, script: 0x5b, flags: 0x0},
+	715:  {region: 0x96, script: 0x5b, flags: 0x0},
+	716:  {region: 0x52, script: 0x5b, flags: 0x0},
+	717:  {region: 0x9a, script: 0x22, flags: 0x0},
+	718:  {region: 0x9a, script: 0x22, flags: 0x0},
+	719:  {region: 0x96, script: 0x5b, flags: 0x0},
 	720:  {region: 0x23, script: 0x3, flags: 0x1},
-	721:  {region: 0xa4, script: 0x5a, flags: 0x0},
-	722:  {region: 0x165, script: 0x5a, flags: 0x0},
-	723:  {region: 0xcf, script: 0x5a, flags: 0x0},
-	724:  {region: 0x165, script: 0x5a, flags: 0x0},
-	725:  {region: 0x165, script: 0x5a, flags: 0x0},
-	726:  {region: 0x165, script: 0x5a, flags: 0x0},
-	727:  {region: 0x165, script: 0x5a, flags: 0x0},
-	728:  {region: 0x165, script: 0x5a, flags: 0x0},
-	729:  {region: 0x165, script: 0x5a, flags: 0x0},
-	730:  {region: 0x165, script: 0x5a, flags: 0x0},
-	731:  {region: 0x165, script: 0x5a, flags: 0x0},
-	732:  {region: 0x165, script: 0x5a, flags: 0x0},
-	733:  {region: 0x165, script: 0x5a, flags: 0x0},
-	734:  {region: 0x165, script: 0x5a, flags: 0x0},
-	735:  {region: 0x165, script: 0x5, flags: 0x0},
-	736:  {region: 0x106, script: 0x20, flags: 0x0},
-	737:  {region: 0xe7, script: 0x5a, flags: 0x0},
-	738:  {region: 0x165, script: 0x5a, flags: 0x0},
-	739:  {region: 0x95, script: 0x5a, flags: 0x0},
-	740:  {region: 0x165, script: 0x2c, flags: 0x0},
-	741:  {region: 0x165, script: 0x5a, flags: 0x0},
-	742:  {region: 0x165, script: 0x5a, flags: 0x0},
-	743:  {region: 0x165, script: 0x5a, flags: 0x0},
-	744:  {region: 0x112, script: 0x5a, flags: 0x0},
-	745:  {region: 0xa4, script: 0x5a, flags: 0x0},
-	746:  {region: 0x165, script: 0x5a, flags: 0x0},
-	747:  {region: 0x165, script: 0x5a, flags: 0x0},
-	748:  {region: 0x123, script: 0x5, flags: 0x0},
-	749:  {region: 0xcc, script: 0x5a, flags: 0x0},
-	750:  {region: 0x165, script: 0x5a, flags: 0x0},
-	751:  {region: 0x165, script: 0x5a, flags: 0x0},
-	752:  {region: 0x165, script: 0x5a, flags: 0x0},
-	753:  {region: 0xbf, script: 0x5a, flags: 0x0},
-	754:  {region: 0xd1, script: 0x5a, flags: 0x0},
-	755:  {region: 0x165, script: 0x5a, flags: 0x0},
-	756:  {region: 0x52, script: 0x5a, flags: 0x0},
-	757:  {region: 0xdb, script: 0x22, flags: 0x0},
-	758:  {region: 0x12f, script: 0x5a, flags: 0x0},
-	759:  {region: 0xc0, script: 0x5a, flags: 0x0},
-	760:  {region: 0x165, script: 0x5a, flags: 0x0},
-	761:  {region: 0x165, script: 0x5a, flags: 0x0},
-	762:  {region: 0xe0, script: 0x5a, flags: 0x0},
-	763:  {region: 0x165, script: 0x5a, flags: 0x0},
-	764:  {region: 0x95, script: 0x5a, flags: 0x0},
-	765:  {region: 0x9b, script: 0x3d, flags: 0x0},
-	766:  {region: 0x165, script: 0x5a, flags: 0x0},
-	767:  {region: 0xc2, script: 0x20, flags: 0x0},
-	768:  {region: 0x165, script: 0x5, flags: 0x0},
-	769:  {region: 0x165, script: 0x5a, flags: 0x0},
-	770:  {region: 0x165, script: 0x5a, flags: 0x0},
-	771:  {region: 0x165, script: 0x5a, flags: 0x0},
-	772:  {region: 0x99, script: 0x6e, flags: 0x0},
-	773:  {region: 0x165, script: 0x5a, flags: 0x0},
-	774:  {region: 0x165, script: 0x5a, flags: 0x0},
-	775:  {region: 0x10b, script: 0x5a, flags: 0x0},
-	776:  {region: 0x165, script: 0x5a, flags: 0x0},
-	777:  {region: 0x165, script: 0x5a, flags: 0x0},
-	778:  {region: 0x165, script: 0x5a, flags: 0x0},
+	721:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	722:  {region: 0x166, script: 0x5b, flags: 0x0},
+	723:  {region: 0xd0, script: 0x5b, flags: 0x0},
+	724:  {region: 0x166, script: 0x5b, flags: 0x0},
+	725:  {region: 0x166, script: 0x5b, flags: 0x0},
+	726:  {region: 0x166, script: 0x5b, flags: 0x0},
+	727:  {region: 0x166, script: 0x5b, flags: 0x0},
+	728:  {region: 0x166, script: 0x5b, flags: 0x0},
+	729:  {region: 0x166, script: 0x5b, flags: 0x0},
+	730:  {region: 0x166, script: 0x5b, flags: 0x0},
+	731:  {region: 0x166, script: 0x5b, flags: 0x0},
+	732:  {region: 0x166, script: 0x5b, flags: 0x0},
+	733:  {region: 0x166, script: 0x5b, flags: 0x0},
+	734:  {region: 0x166, script: 0x5b, flags: 0x0},
+	735:  {region: 0x166, script: 0x5, flags: 0x0},
+	736:  {region: 0x107, script: 0x20, flags: 0x0},
+	737:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	738:  {region: 0x166, script: 0x5b, flags: 0x0},
+	739:  {region: 0x96, script: 0x5b, flags: 0x0},
+	740:  {region: 0x166, script: 0x2c, flags: 0x0},
+	741:  {region: 0x166, script: 0x5b, flags: 0x0},
+	742:  {region: 0x166, script: 0x5b, flags: 0x0},
+	743:  {region: 0x166, script: 0x5b, flags: 0x0},
+	744:  {region: 0x113, script: 0x5b, flags: 0x0},
+	745:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	746:  {region: 0x166, script: 0x5b, flags: 0x0},
+	747:  {region: 0x166, script: 0x5b, flags: 0x0},
+	748:  {region: 0x124, script: 0x5, flags: 0x0},
+	749:  {region: 0xcd, script: 0x5b, flags: 0x0},
+	750:  {region: 0x166, script: 0x5b, flags: 0x0},
+	751:  {region: 0x166, script: 0x5b, flags: 0x0},
+	752:  {region: 0x166, script: 0x5b, flags: 0x0},
+	753:  {region: 0xc0, script: 0x5b, flags: 0x0},
+	754:  {region: 0xd2, script: 0x5b, flags: 0x0},
+	755:  {region: 0x166, script: 0x5b, flags: 0x0},
+	756:  {region: 0x52, script: 0x5b, flags: 0x0},
+	757:  {region: 0xdc, script: 0x22, flags: 0x0},
+	758:  {region: 0x130, script: 0x5b, flags: 0x0},
+	759:  {region: 0xc1, script: 0x5b, flags: 0x0},
+	760:  {region: 0x166, script: 0x5b, flags: 0x0},
+	761:  {region: 0x166, script: 0x5b, flags: 0x0},
+	762:  {region: 0xe1, script: 0x5b, flags: 0x0},
+	763:  {region: 0x166, script: 0x5b, flags: 0x0},
+	764:  {region: 0x96, script: 0x5b, flags: 0x0},
+	765:  {region: 0x9c, script: 0x3d, flags: 0x0},
+	766:  {region: 0x166, script: 0x5b, flags: 0x0},
+	767:  {region: 0xc3, script: 0x20, flags: 0x0},
+	768:  {region: 0x166, script: 0x5, flags: 0x0},
+	769:  {region: 0x166, script: 0x5b, flags: 0x0},
+	770:  {region: 0x166, script: 0x5b, flags: 0x0},
+	771:  {region: 0x166, script: 0x5b, flags: 0x0},
+	772:  {region: 0x9a, script: 0x6f, flags: 0x0},
+	773:  {region: 0x166, script: 0x5b, flags: 0x0},
+	774:  {region: 0x166, script: 0x5b, flags: 0x0},
+	775:  {region: 0x10c, script: 0x5b, flags: 0x0},
+	776:  {region: 0x166, script: 0x5b, flags: 0x0},
+	777:  {region: 0x166, script: 0x5b, flags: 0x0},
+	778:  {region: 0x166, script: 0x5b, flags: 0x0},
 	779:  {region: 0x26, script: 0x3, flags: 0x1},
-	780:  {region: 0x165, script: 0x5a, flags: 0x0},
-	781:  {region: 0x165, script: 0x5a, flags: 0x0},
-	782:  {region: 0x99, script: 0xe, flags: 0x0},
-	783:  {region: 0xc4, script: 0x75, flags: 0x0},
-	785:  {region: 0x165, script: 0x5a, flags: 0x0},
-	786:  {region: 0x49, script: 0x5a, flags: 0x0},
-	787:  {region: 0x49, script: 0x5a, flags: 0x0},
-	788:  {region: 0x37, script: 0x5a, flags: 0x0},
-	789:  {region: 0x165, script: 0x5a, flags: 0x0},
-	790:  {region: 0x165, script: 0x5a, flags: 0x0},
-	791:  {region: 0x165, script: 0x5a, flags: 0x0},
-	792:  {region: 0x165, script: 0x5a, flags: 0x0},
-	793:  {region: 0x165, script: 0x5a, flags: 0x0},
-	794:  {region: 0x165, script: 0x5a, flags: 0x0},
-	795:  {region: 0x99, script: 0x22, flags: 0x0},
-	796:  {region: 0xdb, script: 0x22, flags: 0x0},
-	797:  {region: 0x106, script: 0x20, flags: 0x0},
-	798:  {region: 0x35, script: 0x72, flags: 0x0},
+	780:  {region: 0x166, script: 0x5b, flags: 0x0},
+	781:  {region: 0x166, script: 0x5b, flags: 0x0},
+	782:  {region: 0x9a, script: 0xe, flags: 0x0},
+	783:  {region: 0xc5, script: 0x76, flags: 0x0},
+	785:  {region: 0x166, script: 0x5b, flags: 0x0},
+	786:  {region: 0x49, script: 0x5b, flags: 0x0},
+	787:  {region: 0x49, script: 0x5b, flags: 0x0},
+	788:  {region: 0x37, script: 0x5b, flags: 0x0},
+	789:  {region: 0x166, script: 0x5b, flags: 0x0},
+	790:  {region: 0x166, script: 0x5b, flags: 0x0},
+	791:  {region: 0x166, script: 0x5b, flags: 0x0},
+	792:  {region: 0x166, script: 0x5b, flags: 0x0},
+	793:  {region: 0x166, script: 0x5b, flags: 0x0},
+	794:  {region: 0x166, script: 0x5b, flags: 0x0},
+	795:  {region: 0x9a, script: 0x22, flags: 0x0},
+	796:  {region: 0xdc, script: 0x22, flags: 0x0},
+	797:  {region: 0x107, script: 0x20, flags: 0x0},
+	798:  {region: 0x35, script: 0x73, flags: 0x0},
 	799:  {region: 0x29, script: 0x3, flags: 0x1},
-	800:  {region: 0xcb, script: 0x5a, flags: 0x0},
-	801:  {region: 0x165, script: 0x5a, flags: 0x0},
-	802:  {region: 0x165, script: 0x5a, flags: 0x0},
-	803:  {region: 0x165, script: 0x5a, flags: 0x0},
-	804:  {region: 0x99, script: 0x22, flags: 0x0},
-	805:  {region: 0x52, script: 0x5a, flags: 0x0},
-	807:  {region: 0x165, script: 0x5a, flags: 0x0},
-	808:  {region: 0x135, script: 0x5a, flags: 0x0},
-	809:  {region: 0x165, script: 0x5a, flags: 0x0},
-	810:  {region: 0x165, script: 0x5a, flags: 0x0},
-	811:  {region: 0xe8, script: 0x5, flags: 0x0},
-	812:  {region: 0xc3, script: 0x5a, flags: 0x0},
-	813:  {region: 0x99, script: 0x22, flags: 0x0},
-	814:  {region: 0x95, script: 0x5a, flags: 0x0},
-	815:  {region: 0x164, script: 0x5a, flags: 0x0},
-	816:  {region: 0x165, script: 0x5a, flags: 0x0},
-	817:  {region: 0xc4, script: 0x75, flags: 0x0},
-	818:  {region: 0x165, script: 0x5a, flags: 0x0},
-	819:  {region: 0x165, script: 0x2c, flags: 0x0},
-	820:  {region: 0x106, script: 0x20, flags: 0x0},
-	821:  {region: 0x165, script: 0x5a, flags: 0x0},
-	822:  {region: 0x131, script: 0x5a, flags: 0x0},
-	823:  {region: 0x9c, script: 0x66, flags: 0x0},
-	824:  {region: 0x165, script: 0x5a, flags: 0x0},
-	825:  {region: 0x165, script: 0x5a, flags: 0x0},
-	826:  {region: 0x9c, script: 0x5, flags: 0x0},
-	827:  {region: 0x165, script: 0x5a, flags: 0x0},
-	828:  {region: 0x165, script: 0x5a, flags: 0x0},
-	829:  {region: 0x165, script: 0x5a, flags: 0x0},
-	830:  {region: 0xdd, script: 0x5a, flags: 0x0},
-	831:  {region: 0x165, script: 0x5a, flags: 0x0},
-	832:  {region: 0x165, script: 0x5a, flags: 0x0},
-	834:  {region: 0x165, script: 0x5a, flags: 0x0},
+	800:  {region: 0xcc, script: 0x5b, flags: 0x0},
+	801:  {region: 0x166, script: 0x5b, flags: 0x0},
+	802:  {region: 0x166, script: 0x5b, flags: 0x0},
+	803:  {region: 0x166, script: 0x5b, flags: 0x0},
+	804:  {region: 0x9a, script: 0x22, flags: 0x0},
+	805:  {region: 0x52, script: 0x5b, flags: 0x0},
+	807:  {region: 0x166, script: 0x5b, flags: 0x0},
+	808:  {region: 0x136, script: 0x5b, flags: 0x0},
+	809:  {region: 0x166, script: 0x5b, flags: 0x0},
+	810:  {region: 0x166, script: 0x5b, flags: 0x0},
+	811:  {region: 0xe9, script: 0x5, flags: 0x0},
+	812:  {region: 0xc4, script: 0x5b, flags: 0x0},
+	813:  {region: 0x9a, script: 0x22, flags: 0x0},
+	814:  {region: 0x96, script: 0x5b, flags: 0x0},
+	815:  {region: 0x165, script: 0x5b, flags: 0x0},
+	816:  {region: 0x166, script: 0x5b, flags: 0x0},
+	817:  {region: 0xc5, script: 0x76, flags: 0x0},
+	818:  {region: 0x166, script: 0x5b, flags: 0x0},
+	819:  {region: 0x166, script: 0x2c, flags: 0x0},
+	820:  {region: 0x107, script: 0x20, flags: 0x0},
+	821:  {region: 0x166, script: 0x5b, flags: 0x0},
+	822:  {region: 0x132, script: 0x5b, flags: 0x0},
+	823:  {region: 0x9d, script: 0x67, flags: 0x0},
+	824:  {region: 0x166, script: 0x5b, flags: 0x0},
+	825:  {region: 0x166, script: 0x5b, flags: 0x0},
+	826:  {region: 0x9d, script: 0x5, flags: 0x0},
+	827:  {region: 0x166, script: 0x5b, flags: 0x0},
+	828:  {region: 0x166, script: 0x5b, flags: 0x0},
+	829:  {region: 0x166, script: 0x5b, flags: 0x0},
+	830:  {region: 0xde, script: 0x5b, flags: 0x0},
+	831:  {region: 0x166, script: 0x5b, flags: 0x0},
+	832:  {region: 0x166, script: 0x5b, flags: 0x0},
+	834:  {region: 0x166, script: 0x5b, flags: 0x0},
 	835:  {region: 0x53, script: 0x3b, flags: 0x0},
-	836:  {region: 0x9e, script: 0x5a, flags: 0x0},
-	837:  {region: 0xd2, script: 0x5a, flags: 0x0},
-	838:  {region: 0x165, script: 0x5a, flags: 0x0},
-	839:  {region: 0xda, script: 0x5a, flags: 0x0},
-	840:  {region: 0x165, script: 0x5a, flags: 0x0},
-	841:  {region: 0x165, script: 0x5a, flags: 0x0},
-	842:  {region: 0x165, script: 0x5a, flags: 0x0},
-	843:  {region: 0xcf, script: 0x5a, flags: 0x0},
-	844:  {region: 0x165, script: 0x5a, flags: 0x0},
-	845:  {region: 0x165, script: 0x5a, flags: 0x0},
-	846:  {region: 0x164, script: 0x5a, flags: 0x0},
-	847:  {region: 0xd1, script: 0x5a, flags: 0x0},
-	848:  {region: 0x60, script: 0x5a, flags: 0x0},
-	849:  {region: 0xdb, script: 0x22, flags: 0x0},
-	850:  {region: 0x165, script: 0x5a, flags: 0x0},
-	851:  {region: 0xdb, script: 0x22, flags: 0x0},
-	852:  {region: 0x165, script: 0x5a, flags: 0x0},
-	853:  {region: 0x165, script: 0x5a, flags: 0x0},
-	854:  {region: 0xd2, script: 0x5a, flags: 0x0},
-	855:  {region: 0x165, script: 0x5a, flags: 0x0},
-	856:  {region: 0x165, script: 0x5a, flags: 0x0},
-	857:  {region: 0xd1, script: 0x5a, flags: 0x0},
-	858:  {region: 0x165, script: 0x5a, flags: 0x0},
-	859:  {region: 0xcf, script: 0x5a, flags: 0x0},
-	860:  {region: 0xcf, script: 0x5a, flags: 0x0},
-	861:  {region: 0x165, script: 0x5a, flags: 0x0},
-	862:  {region: 0x165, script: 0x5a, flags: 0x0},
-	863:  {region: 0x95, script: 0x5a, flags: 0x0},
-	864:  {region: 0x165, script: 0x5a, flags: 0x0},
-	865:  {region: 0xdf, script: 0x5a, flags: 0x0},
-	866:  {region: 0x165, script: 0x5a, flags: 0x0},
-	867:  {region: 0x165, script: 0x5a, flags: 0x0},
-	868:  {region: 0x99, script: 0x5a, flags: 0x0},
-	869:  {region: 0x165, script: 0x5a, flags: 0x0},
-	870:  {region: 0x165, script: 0x5a, flags: 0x0},
-	871:  {region: 0xd9, script: 0x5a, flags: 0x0},
-	872:  {region: 0x52, script: 0x5a, flags: 0x0},
-	873:  {region: 0x165, script: 0x5a, flags: 0x0},
-	874:  {region: 0xda, script: 0x5a, flags: 0x0},
-	875:  {region: 0x165, script: 0x5a, flags: 0x0},
-	876:  {region: 0x52, script: 0x5a, flags: 0x0},
-	877:  {region: 0x165, script: 0x5a, flags: 0x0},
-	878:  {region: 0x165, script: 0x5a, flags: 0x0},
-	879:  {region: 0xda, script: 0x5a, flags: 0x0},
-	880:  {region: 0x123, script: 0x56, flags: 0x0},
-	881:  {region: 0x99, script: 0x22, flags: 0x0},
-	882:  {region: 0x10c, script: 0xc9, flags: 0x0},
-	883:  {region: 0x165, script: 0x5a, flags: 0x0},
-	884:  {region: 0x165, script: 0x5a, flags: 0x0},
-	885:  {region: 0x84, script: 0x7c, flags: 0x0},
-	886:  {region: 0x161, script: 0x5a, flags: 0x0},
-	887:  {region: 0x165, script: 0x5a, flags: 0x0},
+	836:  {region: 0x9f, script: 0x5b, flags: 0x0},
+	837:  {region: 0xd3, script: 0x5b, flags: 0x0},
+	838:  {region: 0x166, script: 0x5b, flags: 0x0},
+	839:  {region: 0xdb, script: 0x5b, flags: 0x0},
+	840:  {region: 0x166, script: 0x5b, flags: 0x0},
+	841:  {region: 0x166, script: 0x5b, flags: 0x0},
+	842:  {region: 0x166, script: 0x5b, flags: 0x0},
+	843:  {region: 0xd0, script: 0x5b, flags: 0x0},
+	844:  {region: 0x166, script: 0x5b, flags: 0x0},
+	845:  {region: 0x166, script: 0x5b, flags: 0x0},
+	846:  {region: 0x165, script: 0x5b, flags: 0x0},
+	847:  {region: 0xd2, script: 0x5b, flags: 0x0},
+	848:  {region: 0x61, script: 0x5b, flags: 0x0},
+	849:  {region: 0xdc, script: 0x22, flags: 0x0},
+	850:  {region: 0x166, script: 0x5b, flags: 0x0},
+	851:  {region: 0xdc, script: 0x22, flags: 0x0},
+	852:  {region: 0x166, script: 0x5b, flags: 0x0},
+	853:  {region: 0x166, script: 0x5b, flags: 0x0},
+	854:  {region: 0xd3, script: 0x5b, flags: 0x0},
+	855:  {region: 0x166, script: 0x5b, flags: 0x0},
+	856:  {region: 0x166, script: 0x5b, flags: 0x0},
+	857:  {region: 0xd2, script: 0x5b, flags: 0x0},
+	858:  {region: 0x166, script: 0x5b, flags: 0x0},
+	859:  {region: 0xd0, script: 0x5b, flags: 0x0},
+	860:  {region: 0xd0, script: 0x5b, flags: 0x0},
+	861:  {region: 0x166, script: 0x5b, flags: 0x0},
+	862:  {region: 0x166, script: 0x5b, flags: 0x0},
+	863:  {region: 0x96, script: 0x5b, flags: 0x0},
+	864:  {region: 0x166, script: 0x5b, flags: 0x0},
+	865:  {region: 0xe0, script: 0x5b, flags: 0x0},
+	866:  {region: 0x166, script: 0x5b, flags: 0x0},
+	867:  {region: 0x166, script: 0x5b, flags: 0x0},
+	868:  {region: 0x9a, script: 0x5b, flags: 0x0},
+	869:  {region: 0x166, script: 0x5b, flags: 0x0},
+	870:  {region: 0x166, script: 0x5b, flags: 0x0},
+	871:  {region: 0xda, script: 0x5b, flags: 0x0},
+	872:  {region: 0x52, script: 0x5b, flags: 0x0},
+	873:  {region: 0x166, script: 0x5b, flags: 0x0},
+	874:  {region: 0xdb, script: 0x5b, flags: 0x0},
+	875:  {region: 0x166, script: 0x5b, flags: 0x0},
+	876:  {region: 0x52, script: 0x5b, flags: 0x0},
+	877:  {region: 0x166, script: 0x5b, flags: 0x0},
+	878:  {region: 0x166, script: 0x5b, flags: 0x0},
+	879:  {region: 0xdb, script: 0x5b, flags: 0x0},
+	880:  {region: 0x124, script: 0x57, flags: 0x0},
+	881:  {region: 0x9a, script: 0x22, flags: 0x0},
+	882:  {region: 0x10d, script: 0xcb, flags: 0x0},
+	883:  {region: 0x166, script: 0x5b, flags: 0x0},
+	884:  {region: 0x166, script: 0x5b, flags: 0x0},
+	885:  {region: 0x85, script: 0x7e, flags: 0x0},
+	886:  {region: 0x162, script: 0x5b, flags: 0x0},
+	887:  {region: 0x166, script: 0x5b, flags: 0x0},
 	888:  {region: 0x49, script: 0x17, flags: 0x0},
-	889:  {region: 0x165, script: 0x5a, flags: 0x0},
-	890:  {region: 0x161, script: 0x5a, flags: 0x0},
-	891:  {region: 0x165, script: 0x5a, flags: 0x0},
-	892:  {region: 0x165, script: 0x5a, flags: 0x0},
-	893:  {region: 0x165, script: 0x5a, flags: 0x0},
-	894:  {region: 0x165, script: 0x5a, flags: 0x0},
-	895:  {region: 0x165, script: 0x5a, flags: 0x0},
-	896:  {region: 0x117, script: 0x5a, flags: 0x0},
-	897:  {region: 0x165, script: 0x5a, flags: 0x0},
-	898:  {region: 0x165, script: 0x5a, flags: 0x0},
-	899:  {region: 0x135, script: 0x5a, flags: 0x0},
-	900:  {region: 0x165, script: 0x5a, flags: 0x0},
-	901:  {region: 0x53, script: 0x5a, flags: 0x0},
-	902:  {region: 0x165, script: 0x5a, flags: 0x0},
-	903:  {region: 0xce, script: 0x5a, flags: 0x0},
-	904:  {region: 0x12f, script: 0x5a, flags: 0x0},
-	905:  {region: 0x131, script: 0x5a, flags: 0x0},
-	906:  {region: 0x80, script: 0x5a, flags: 0x0},
-	907:  {region: 0x78, script: 0x5a, flags: 0x0},
-	908:  {region: 0x165, script: 0x5a, flags: 0x0},
-	910:  {region: 0x165, script: 0x5a, flags: 0x0},
-	911:  {region: 0x165, script: 0x5a, flags: 0x0},
-	912:  {region: 0x6f, script: 0x5a, flags: 0x0},
-	913:  {region: 0x165, script: 0x5a, flags: 0x0},
-	914:  {region: 0x165, script: 0x5a, flags: 0x0},
-	915:  {region: 0x165, script: 0x5a, flags: 0x0},
-	916:  {region: 0x165, script: 0x5a, flags: 0x0},
-	917:  {region: 0x99, script: 0x81, flags: 0x0},
-	918:  {region: 0x165, script: 0x5a, flags: 0x0},
-	919:  {region: 0x165, script: 0x5, flags: 0x0},
-	920:  {region: 0x7d, script: 0x20, flags: 0x0},
-	921:  {region: 0x135, script: 0x82, flags: 0x0},
-	922:  {region: 0x165, script: 0x5, flags: 0x0},
-	923:  {region: 0xc5, script: 0x80, flags: 0x0},
-	924:  {region: 0x165, script: 0x5a, flags: 0x0},
+	889:  {region: 0x166, script: 0x5b, flags: 0x0},
+	890:  {region: 0x162, script: 0x5b, flags: 0x0},
+	891:  {region: 0x166, script: 0x5b, flags: 0x0},
+	892:  {region: 0x166, script: 0x5b, flags: 0x0},
+	893:  {region: 0x166, script: 0x5b, flags: 0x0},
+	894:  {region: 0x166, script: 0x5b, flags: 0x0},
+	895:  {region: 0x166, script: 0x5b, flags: 0x0},
+	896:  {region: 0x118, script: 0x5b, flags: 0x0},
+	897:  {region: 0x166, script: 0x5b, flags: 0x0},
+	898:  {region: 0x166, script: 0x5b, flags: 0x0},
+	899:  {region: 0x136, script: 0x5b, flags: 0x0},
+	900:  {region: 0x166, script: 0x5b, flags: 0x0},
+	901:  {region: 0x53, script: 0x5b, flags: 0x0},
+	902:  {region: 0x166, script: 0x5b, flags: 0x0},
+	903:  {region: 0xcf, script: 0x5b, flags: 0x0},
+	904:  {region: 0x130, script: 0x5b, flags: 0x0},
+	905:  {region: 0x132, script: 0x5b, flags: 0x0},
+	906:  {region: 0x81, script: 0x5b, flags: 0x0},
+	907:  {region: 0x79, script: 0x5b, flags: 0x0},
+	908:  {region: 0x166, script: 0x5b, flags: 0x0},
+	910:  {region: 0x166, script: 0x5b, flags: 0x0},
+	911:  {region: 0x166, script: 0x5b, flags: 0x0},
+	912:  {region: 0x70, script: 0x5b, flags: 0x0},
+	913:  {region: 0x166, script: 0x5b, flags: 0x0},
+	914:  {region: 0x166, script: 0x5b, flags: 0x0},
+	915:  {region: 0x166, script: 0x5b, flags: 0x0},
+	916:  {region: 0x166, script: 0x5b, flags: 0x0},
+	917:  {region: 0x9a, script: 0x83, flags: 0x0},
+	918:  {region: 0x166, script: 0x5b, flags: 0x0},
+	919:  {region: 0x166, script: 0x5, flags: 0x0},
+	920:  {region: 0x7e, script: 0x20, flags: 0x0},
+	921:  {region: 0x136, script: 0x84, flags: 0x0},
+	922:  {region: 0x166, script: 0x5, flags: 0x0},
+	923:  {region: 0xc6, script: 0x82, flags: 0x0},
+	924:  {region: 0x166, script: 0x5b, flags: 0x0},
 	925:  {region: 0x2c, script: 0x3, flags: 0x1},
-	926:  {region: 0xe7, script: 0x5a, flags: 0x0},
+	926:  {region: 0xe8, script: 0x5b, flags: 0x0},
 	927:  {region: 0x2f, script: 0x2, flags: 0x1},
-	928:  {region: 0xe7, script: 0x5a, flags: 0x0},
-	929:  {region: 0x30, script: 0x5a, flags: 0x0},
-	930:  {region: 0xf0, script: 0x5a, flags: 0x0},
-	931:  {region: 0x165, script: 0x5a, flags: 0x0},
-	932:  {region: 0x78, script: 0x5a, flags: 0x0},
-	933:  {region: 0xd6, script: 0x5a, flags: 0x0},
-	934:  {region: 0x135, script: 0x5a, flags: 0x0},
-	935:  {region: 0x49, script: 0x5a, flags: 0x0},
-	936:  {region: 0x165, script: 0x5a, flags: 0x0},
-	937:  {region: 0x9c, script: 0xf7, flags: 0x0},
-	938:  {region: 0x165, script: 0x5a, flags: 0x0},
-	939:  {region: 0x60, script: 0x5a, flags: 0x0},
-	940:  {region: 0x165, script: 0x5, flags: 0x0},
-	941:  {region: 0xb0, script: 0x8e, flags: 0x0},
-	943:  {region: 0x165, script: 0x5a, flags: 0x0},
-	944:  {region: 0x165, script: 0x5a, flags: 0x0},
-	945:  {region: 0x99, script: 0x12, flags: 0x0},
-	946:  {region: 0xa4, script: 0x5a, flags: 0x0},
-	947:  {region: 0xe9, script: 0x5a, flags: 0x0},
-	948:  {region: 0x165, script: 0x5a, flags: 0x0},
-	949:  {region: 0x9e, script: 0x5a, flags: 0x0},
-	950:  {region: 0x165, script: 0x5a, flags: 0x0},
-	951:  {region: 0x165, script: 0x5a, flags: 0x0},
-	952:  {region: 0x87, script: 0x34, flags: 0x0},
-	953:  {region: 0x75, script: 0x5a, flags: 0x0},
-	954:  {region: 0x165, script: 0x5a, flags: 0x0},
-	955:  {region: 0xe8, script: 0x4d, flags: 0x0},
-	956:  {region: 0x9c, script: 0x5, flags: 0x0},
-	957:  {region: 0x1, script: 0x5a, flags: 0x0},
+	928:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	929:  {region: 0x30, script: 0x5b, flags: 0x0},
+	930:  {region: 0xf1, script: 0x5b, flags: 0x0},
+	931:  {region: 0x166, script: 0x5b, flags: 0x0},
+	932:  {region: 0x79, script: 0x5b, flags: 0x0},
+	933:  {region: 0xd7, script: 0x5b, flags: 0x0},
+	934:  {region: 0x136, script: 0x5b, flags: 0x0},
+	935:  {region: 0x49, script: 0x5b, flags: 0x0},
+	936:  {region: 0x166, script: 0x5b, flags: 0x0},
+	937:  {region: 0x9d, script: 0xfa, flags: 0x0},
+	938:  {region: 0x166, script: 0x5b, flags: 0x0},
+	939:  {region: 0x61, script: 0x5b, flags: 0x0},
+	940:  {region: 0x166, script: 0x5, flags: 0x0},
+	941:  {region: 0xb1, script: 0x90, flags: 0x0},
+	943:  {region: 0x166, script: 0x5b, flags: 0x0},
+	944:  {region: 0x166, script: 0x5b, flags: 0x0},
+	945:  {region: 0x9a, script: 0x12, flags: 0x0},
+	946:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	947:  {region: 0xea, script: 0x5b, flags: 0x0},
+	948:  {region: 0x166, script: 0x5b, flags: 0x0},
+	949:  {region: 0x9f, script: 0x5b, flags: 0x0},
+	950:  {region: 0x166, script: 0x5b, flags: 0x0},
+	951:  {region: 0x166, script: 0x5b, flags: 0x0},
+	952:  {region: 0x88, script: 0x34, flags: 0x0},
+	953:  {region: 0x76, script: 0x5b, flags: 0x0},
+	954:  {region: 0x166, script: 0x5b, flags: 0x0},
+	955:  {region: 0xe9, script: 0x4e, flags: 0x0},
+	956:  {region: 0x9d, script: 0x5, flags: 0x0},
+	957:  {region: 0x1, script: 0x5b, flags: 0x0},
 	958:  {region: 0x24, script: 0x5, flags: 0x0},
-	959:  {region: 0x165, script: 0x5a, flags: 0x0},
-	960:  {region: 0x41, script: 0x5a, flags: 0x0},
-	961:  {region: 0x165, script: 0x5a, flags: 0x0},
-	962:  {region: 0x7a, script: 0x5a, flags: 0x0},
-	963:  {region: 0x165, script: 0x5a, flags: 0x0},
-	964:  {region: 0xe4, script: 0x5a, flags: 0x0},
-	965:  {region: 0x89, script: 0x5a, flags: 0x0},
-	966:  {region: 0x69, script: 0x5a, flags: 0x0},
-	967:  {region: 0x165, script: 0x5a, flags: 0x0},
-	968:  {region: 0x99, script: 0x22, flags: 0x0},
-	969:  {region: 0x165, script: 0x5a, flags: 0x0},
-	970:  {region: 0x102, script: 0x5a, flags: 0x0},
-	971:  {region: 0x95, script: 0x5a, flags: 0x0},
-	972:  {region: 0x165, script: 0x5a, flags: 0x0},
-	973:  {region: 0x165, script: 0x5a, flags: 0x0},
-	974:  {region: 0x9e, script: 0x5a, flags: 0x0},
-	975:  {region: 0x165, script: 0x5, flags: 0x0},
-	976:  {region: 0x99, script: 0x5a, flags: 0x0},
+	959:  {region: 0x166, script: 0x5b, flags: 0x0},
+	960:  {region: 0x41, script: 0x5b, flags: 0x0},
+	961:  {region: 0x166, script: 0x5b, flags: 0x0},
+	962:  {region: 0x7b, script: 0x5b, flags: 0x0},
+	963:  {region: 0x166, script: 0x5b, flags: 0x0},
+	964:  {region: 0xe5, script: 0x5b, flags: 0x0},
+	965:  {region: 0x8a, script: 0x5b, flags: 0x0},
+	966:  {region: 0x6a, script: 0x5b, flags: 0x0},
+	967:  {region: 0x166, script: 0x5b, flags: 0x0},
+	968:  {region: 0x9a, script: 0x22, flags: 0x0},
+	969:  {region: 0x166, script: 0x5b, flags: 0x0},
+	970:  {region: 0x103, script: 0x5b, flags: 0x0},
+	971:  {region: 0x96, script: 0x5b, flags: 0x0},
+	972:  {region: 0x166, script: 0x5b, flags: 0x0},
+	973:  {region: 0x166, script: 0x5b, flags: 0x0},
+	974:  {region: 0x9f, script: 0x5b, flags: 0x0},
+	975:  {region: 0x166, script: 0x5, flags: 0x0},
+	976:  {region: 0x9a, script: 0x5b, flags: 0x0},
 	977:  {region: 0x31, script: 0x2, flags: 0x1},
-	978:  {region: 0xdb, script: 0x22, flags: 0x0},
+	978:  {region: 0xdc, script: 0x22, flags: 0x0},
 	979:  {region: 0x35, script: 0xe, flags: 0x0},
-	980:  {region: 0x4e, script: 0x5a, flags: 0x0},
-	981:  {region: 0x72, script: 0x5a, flags: 0x0},
-	982:  {region: 0x4e, script: 0x5a, flags: 0x0},
-	983:  {region: 0x9c, script: 0x5, flags: 0x0},
-	984:  {region: 0x10c, script: 0x5a, flags: 0x0},
-	985:  {region: 0x3a, script: 0x5a, flags: 0x0},
-	986:  {region: 0x165, script: 0x5a, flags: 0x0},
-	987:  {region: 0xd1, script: 0x5a, flags: 0x0},
-	988:  {region: 0x104, script: 0x5a, flags: 0x0},
-	989:  {region: 0x95, script: 0x5a, flags: 0x0},
-	990:  {region: 0x12f, script: 0x5a, flags: 0x0},
-	991:  {region: 0x165, script: 0x5a, flags: 0x0},
-	992:  {region: 0x165, script: 0x5a, flags: 0x0},
-	993:  {region: 0x73, script: 0x5a, flags: 0x0},
-	994:  {region: 0x106, script: 0x20, flags: 0x0},
-	995:  {region: 0x130, script: 0x20, flags: 0x0},
-	996:  {region: 0x109, script: 0x5a, flags: 0x0},
-	997:  {region: 0x107, script: 0x5a, flags: 0x0},
-	998:  {region: 0x12f, script: 0x5a, flags: 0x0},
-	999:  {region: 0x165, script: 0x5a, flags: 0x0},
-	1000: {region: 0xa2, script: 0x4c, flags: 0x0},
-	1001: {region: 0x99, script: 0x22, flags: 0x0},
-	1002: {region: 0x80, script: 0x5a, flags: 0x0},
-	1003: {region: 0x106, script: 0x20, flags: 0x0},
-	1004: {region: 0xa4, script: 0x5a, flags: 0x0},
-	1005: {region: 0x95, script: 0x5a, flags: 0x0},
-	1006: {region: 0x99, script: 0x5a, flags: 0x0},
-	1007: {region: 0x114, script: 0x5a, flags: 0x0},
-	1008: {region: 0x99, script: 0xcd, flags: 0x0},
-	1009: {region: 0x165, script: 0x5a, flags: 0x0},
-	1010: {region: 0x165, script: 0x5a, flags: 0x0},
-	1011: {region: 0x12f, script: 0x5a, flags: 0x0},
-	1012: {region: 0x9e, script: 0x5a, flags: 0x0},
-	1013: {region: 0x99, script: 0x22, flags: 0x0},
-	1014: {region: 0x165, script: 0x5, flags: 0x0},
-	1015: {region: 0x9e, script: 0x5a, flags: 0x0},
-	1016: {region: 0x7b, script: 0x5a, flags: 0x0},
-	1017: {region: 0x49, script: 0x5a, flags: 0x0},
+	980:  {region: 0x4e, script: 0x5b, flags: 0x0},
+	981:  {region: 0x73, script: 0x5b, flags: 0x0},
+	982:  {region: 0x4e, script: 0x5b, flags: 0x0},
+	983:  {region: 0x9d, script: 0x5, flags: 0x0},
+	984:  {region: 0x10d, script: 0x5b, flags: 0x0},
+	985:  {region: 0x3a, script: 0x5b, flags: 0x0},
+	986:  {region: 0x166, script: 0x5b, flags: 0x0},
+	987:  {region: 0xd2, script: 0x5b, flags: 0x0},
+	988:  {region: 0x105, script: 0x5b, flags: 0x0},
+	989:  {region: 0x96, script: 0x5b, flags: 0x0},
+	990:  {region: 0x130, script: 0x5b, flags: 0x0},
+	991:  {region: 0x166, script: 0x5b, flags: 0x0},
+	992:  {region: 0x166, script: 0x5b, flags: 0x0},
+	993:  {region: 0x74, script: 0x5b, flags: 0x0},
+	994:  {region: 0x107, script: 0x20, flags: 0x0},
+	995:  {region: 0x131, script: 0x20, flags: 0x0},
+	996:  {region: 0x10a, script: 0x5b, flags: 0x0},
+	997:  {region: 0x108, script: 0x5b, flags: 0x0},
+	998:  {region: 0x130, script: 0x5b, flags: 0x0},
+	999:  {region: 0x166, script: 0x5b, flags: 0x0},
+	1000: {region: 0xa3, script: 0x4c, flags: 0x0},
+	1001: {region: 0x9a, script: 0x22, flags: 0x0},
+	1002: {region: 0x81, script: 0x5b, flags: 0x0},
+	1003: {region: 0x107, script: 0x20, flags: 0x0},
+	1004: {region: 0xa5, script: 0x5b, flags: 0x0},
+	1005: {region: 0x96, script: 0x5b, flags: 0x0},
+	1006: {region: 0x9a, script: 0x5b, flags: 0x0},
+	1007: {region: 0x115, script: 0x5b, flags: 0x0},
+	1008: {region: 0x9a, script: 0xcf, flags: 0x0},
+	1009: {region: 0x166, script: 0x5b, flags: 0x0},
+	1010: {region: 0x166, script: 0x5b, flags: 0x0},
+	1011: {region: 0x130, script: 0x5b, flags: 0x0},
+	1012: {region: 0x9f, script: 0x5b, flags: 0x0},
+	1013: {region: 0x9a, script: 0x22, flags: 0x0},
+	1014: {region: 0x166, script: 0x5, flags: 0x0},
+	1015: {region: 0x9f, script: 0x5b, flags: 0x0},
+	1016: {region: 0x7c, script: 0x5b, flags: 0x0},
+	1017: {region: 0x49, script: 0x5b, flags: 0x0},
 	1018: {region: 0x33, script: 0x4, flags: 0x1},
-	1019: {region: 0x9e, script: 0x5a, flags: 0x0},
-	1020: {region: 0x9c, script: 0x5, flags: 0x0},
-	1021: {region: 0xda, script: 0x5a, flags: 0x0},
-	1022: {region: 0x4f, script: 0x5a, flags: 0x0},
-	1023: {region: 0xd1, script: 0x5a, flags: 0x0},
-	1024: {region: 0xcf, script: 0x5a, flags: 0x0},
-	1025: {region: 0xc3, script: 0x5a, flags: 0x0},
-	1026: {region: 0x4c, script: 0x5a, flags: 0x0},
-	1027: {region: 0x96, script: 0x7e, flags: 0x0},
-	1028: {region: 0xb6, script: 0x5a, flags: 0x0},
-	1029: {region: 0x165, script: 0x2c, flags: 0x0},
-	1030: {region: 0x165, script: 0x5a, flags: 0x0},
-	1032: {region: 0xba, script: 0xe8, flags: 0x0},
-	1033: {region: 0x165, script: 0x5a, flags: 0x0},
-	1034: {region: 0xc4, script: 0x75, flags: 0x0},
-	1035: {region: 0x165, script: 0x5, flags: 0x0},
-	1036: {region: 0xb3, script: 0xd4, flags: 0x0},
-	1037: {region: 0x6f, script: 0x5a, flags: 0x0},
-	1038: {region: 0x165, script: 0x5a, flags: 0x0},
-	1039: {region: 0x165, script: 0x5a, flags: 0x0},
-	1040: {region: 0x165, script: 0x5a, flags: 0x0},
-	1041: {region: 0x165, script: 0x5a, flags: 0x0},
-	1042: {region: 0x111, script: 0x5a, flags: 0x0},
-	1043: {region: 0x165, script: 0x5a, flags: 0x0},
-	1044: {region: 0xe8, script: 0x5, flags: 0x0},
-	1045: {region: 0x165, script: 0x5a, flags: 0x0},
-	1046: {region: 0x10f, script: 0x5a, flags: 0x0},
-	1047: {region: 0x165, script: 0x5a, flags: 0x0},
-	1048: {region: 0xe9, script: 0x5a, flags: 0x0},
-	1049: {region: 0x165, script: 0x5a, flags: 0x0},
-	1050: {region: 0x95, script: 0x5a, flags: 0x0},
-	1051: {region: 0x142, script: 0x5a, flags: 0x0},
-	1052: {region: 0x10c, script: 0x5a, flags: 0x0},
-	1054: {region: 0x10c, script: 0x5a, flags: 0x0},
-	1055: {region: 0x72, script: 0x5a, flags: 0x0},
-	1056: {region: 0x97, script: 0xca, flags: 0x0},
-	1057: {region: 0x165, script: 0x5a, flags: 0x0},
-	1058: {region: 0x72, script: 0x5a, flags: 0x0},
-	1059: {region: 0x164, script: 0x5a, flags: 0x0},
-	1060: {region: 0x165, script: 0x5a, flags: 0x0},
-	1061: {region: 0xc3, script: 0x5a, flags: 0x0},
-	1062: {region: 0x165, script: 0x5a, flags: 0x0},
-	1063: {region: 0x165, script: 0x5a, flags: 0x0},
-	1064: {region: 0x165, script: 0x5a, flags: 0x0},
-	1065: {region: 0x115, script: 0x5a, flags: 0x0},
-	1066: {region: 0x165, script: 0x5a, flags: 0x0},
-	1067: {region: 0x165, script: 0x5a, flags: 0x0},
-	1068: {region: 0x123, script: 0xeb, flags: 0x0},
-	1069: {region: 0x165, script: 0x5a, flags: 0x0},
-	1070: {region: 0x165, script: 0x5a, flags: 0x0},
-	1071: {region: 0x165, script: 0x5a, flags: 0x0},
-	1072: {region: 0x165, script: 0x5a, flags: 0x0},
-	1073: {region: 0x27, script: 0x5a, flags: 0x0},
+	1019: {region: 0x9f, script: 0x5b, flags: 0x0},
+	1020: {region: 0x9d, script: 0x5, flags: 0x0},
+	1021: {region: 0xdb, script: 0x5b, flags: 0x0},
+	1022: {region: 0x4f, script: 0x5b, flags: 0x0},
+	1023: {region: 0xd2, script: 0x5b, flags: 0x0},
+	1024: {region: 0xd0, script: 0x5b, flags: 0x0},
+	1025: {region: 0xc4, script: 0x5b, flags: 0x0},
+	1026: {region: 0x4c, script: 0x5b, flags: 0x0},
+	1027: {region: 0x97, script: 0x80, flags: 0x0},
+	1028: {region: 0xb7, script: 0x5b, flags: 0x0},
+	1029: {region: 0x166, script: 0x2c, flags: 0x0},
+	1030: {region: 0x166, script: 0x5b, flags: 0x0},
+	1032: {region: 0xbb, script: 0xeb, flags: 0x0},
+	1033: {region: 0x166, script: 0x5b, flags: 0x0},
+	1034: {region: 0xc5, script: 0x76, flags: 0x0},
+	1035: {region: 0x166, script: 0x5, flags: 0x0},
+	1036: {region: 0xb4, script: 0xd6, flags: 0x0},
+	1037: {region: 0x70, script: 0x5b, flags: 0x0},
+	1038: {region: 0x166, script: 0x5b, flags: 0x0},
+	1039: {region: 0x166, script: 0x5b, flags: 0x0},
+	1040: {region: 0x166, script: 0x5b, flags: 0x0},
+	1041: {region: 0x166, script: 0x5b, flags: 0x0},
+	1042: {region: 0x112, script: 0x5b, flags: 0x0},
+	1043: {region: 0x166, script: 0x5b, flags: 0x0},
+	1044: {region: 0xe9, script: 0x5, flags: 0x0},
+	1045: {region: 0x166, script: 0x5b, flags: 0x0},
+	1046: {region: 0x110, script: 0x5b, flags: 0x0},
+	1047: {region: 0x166, script: 0x5b, flags: 0x0},
+	1048: {region: 0xea, script: 0x5b, flags: 0x0},
+	1049: {region: 0x166, script: 0x5b, flags: 0x0},
+	1050: {region: 0x96, script: 0x5b, flags: 0x0},
+	1051: {region: 0x143, script: 0x5b, flags: 0x0},
+	1052: {region: 0x10d, script: 0x5b, flags: 0x0},
+	1054: {region: 0x10d, script: 0x5b, flags: 0x0},
+	1055: {region: 0x73, script: 0x5b, flags: 0x0},
+	1056: {region: 0x98, script: 0xcc, flags: 0x0},
+	1057: {region: 0x166, script: 0x5b, flags: 0x0},
+	1058: {region: 0x73, script: 0x5b, flags: 0x0},
+	1059: {region: 0x165, script: 0x5b, flags: 0x0},
+	1060: {region: 0x166, script: 0x5b, flags: 0x0},
+	1061: {region: 0xc4, script: 0x5b, flags: 0x0},
+	1062: {region: 0x166, script: 0x5b, flags: 0x0},
+	1063: {region: 0x166, script: 0x5b, flags: 0x0},
+	1064: {region: 0x166, script: 0x5b, flags: 0x0},
+	1065: {region: 0x116, script: 0x5b, flags: 0x0},
+	1066: {region: 0x166, script: 0x5b, flags: 0x0},
+	1067: {region: 0x166, script: 0x5b, flags: 0x0},
+	1068: {region: 0x124, script: 0xee, flags: 0x0},
+	1069: {region: 0x166, script: 0x5b, flags: 0x0},
+	1070: {region: 0x166, script: 0x5b, flags: 0x0},
+	1071: {region: 0x166, script: 0x5b, flags: 0x0},
+	1072: {region: 0x166, script: 0x5b, flags: 0x0},
+	1073: {region: 0x27, script: 0x5b, flags: 0x0},
 	1074: {region: 0x37, script: 0x5, flags: 0x1},
-	1075: {region: 0x99, script: 0xd7, flags: 0x0},
-	1076: {region: 0x116, script: 0x5a, flags: 0x0},
-	1077: {region: 0x114, script: 0x5a, flags: 0x0},
-	1078: {region: 0x99, script: 0x22, flags: 0x0},
-	1079: {region: 0x161, script: 0x5a, flags: 0x0},
-	1080: {region: 0x165, script: 0x5a, flags: 0x0},
-	1081: {region: 0x165, script: 0x5a, flags: 0x0},
-	1082: {region: 0x6d, script: 0x5a, flags: 0x0},
-	1083: {region: 0x161, script: 0x5a, flags: 0x0},
-	1084: {region: 0x165, script: 0x5a, flags: 0x0},
-	1085: {region: 0x60, script: 0x5a, flags: 0x0},
-	1086: {region: 0x95, script: 0x5a, flags: 0x0},
-	1087: {region: 0x165, script: 0x5a, flags: 0x0},
-	1088: {region: 0x165, script: 0x5a, flags: 0x0},
-	1089: {region: 0x12f, script: 0x5a, flags: 0x0},
-	1090: {region: 0x165, script: 0x5a, flags: 0x0},
-	1091: {region: 0x84, script: 0x5a, flags: 0x0},
-	1092: {region: 0x10c, script: 0x5a, flags: 0x0},
-	1093: {region: 0x12f, script: 0x5a, flags: 0x0},
-	1094: {region: 0x15f, script: 0x5, flags: 0x0},
-	1095: {region: 0x4b, script: 0x5a, flags: 0x0},
-	1096: {region: 0x60, script: 0x5a, flags: 0x0},
-	1097: {region: 0x165, script: 0x5a, flags: 0x0},
-	1098: {region: 0x99, script: 0x22, flags: 0x0},
-	1099: {region: 0x95, script: 0x5a, flags: 0x0},
-	1100: {region: 0x165, script: 0x5a, flags: 0x0},
+	1075: {region: 0x9a, script: 0xd9, flags: 0x0},
+	1076: {region: 0x117, script: 0x5b, flags: 0x0},
+	1077: {region: 0x115, script: 0x5b, flags: 0x0},
+	1078: {region: 0x9a, script: 0x22, flags: 0x0},
+	1079: {region: 0x162, script: 0x5b, flags: 0x0},
+	1080: {region: 0x166, script: 0x5b, flags: 0x0},
+	1081: {region: 0x166, script: 0x5b, flags: 0x0},
+	1082: {region: 0x6e, script: 0x5b, flags: 0x0},
+	1083: {region: 0x162, script: 0x5b, flags: 0x0},
+	1084: {region: 0x166, script: 0x5b, flags: 0x0},
+	1085: {region: 0x61, script: 0x5b, flags: 0x0},
+	1086: {region: 0x96, script: 0x5b, flags: 0x0},
+	1087: {region: 0x166, script: 0x5b, flags: 0x0},
+	1088: {region: 0x166, script: 0x5b, flags: 0x0},
+	1089: {region: 0x130, script: 0x5b, flags: 0x0},
+	1090: {region: 0x166, script: 0x5b, flags: 0x0},
+	1091: {region: 0x85, script: 0x5b, flags: 0x0},
+	1092: {region: 0x10d, script: 0x5b, flags: 0x0},
+	1093: {region: 0x130, script: 0x5b, flags: 0x0},
+	1094: {region: 0x160, script: 0x5, flags: 0x0},
+	1095: {region: 0x4b, script: 0x5b, flags: 0x0},
+	1096: {region: 0x61, script: 0x5b, flags: 0x0},
+	1097: {region: 0x166, script: 0x5b, flags: 0x0},
+	1098: {region: 0x9a, script: 0x22, flags: 0x0},
+	1099: {region: 0x96, script: 0x5b, flags: 0x0},
+	1100: {region: 0x166, script: 0x5b, flags: 0x0},
 	1101: {region: 0x35, script: 0xe, flags: 0x0},
-	1102: {region: 0x9b, script: 0xdb, flags: 0x0},
-	1103: {region: 0xe9, script: 0x5a, flags: 0x0},
-	1104: {region: 0x99, script: 0xe3, flags: 0x0},
-	1105: {region: 0xdb, script: 0x22, flags: 0x0},
-	1106: {region: 0x165, script: 0x5a, flags: 0x0},
-	1107: {region: 0x165, script: 0x5a, flags: 0x0},
-	1108: {region: 0x165, script: 0x5a, flags: 0x0},
-	1109: {region: 0x165, script: 0x5a, flags: 0x0},
-	1110: {region: 0x165, script: 0x5a, flags: 0x0},
-	1111: {region: 0x165, script: 0x5a, flags: 0x0},
-	1112: {region: 0x165, script: 0x5a, flags: 0x0},
-	1113: {region: 0x165, script: 0x5a, flags: 0x0},
-	1114: {region: 0xe7, script: 0x5a, flags: 0x0},
-	1115: {region: 0x165, script: 0x5a, flags: 0x0},
-	1116: {region: 0x165, script: 0x5a, flags: 0x0},
-	1117: {region: 0x99, script: 0x52, flags: 0x0},
-	1118: {region: 0x53, script: 0xe1, flags: 0x0},
-	1119: {region: 0xdb, script: 0x22, flags: 0x0},
-	1120: {region: 0xdb, script: 0x22, flags: 0x0},
-	1121: {region: 0x99, script: 0xe6, flags: 0x0},
-	1122: {region: 0x165, script: 0x5a, flags: 0x0},
-	1123: {region: 0x112, script: 0x5a, flags: 0x0},
-	1124: {region: 0x131, script: 0x5a, flags: 0x0},
-	1125: {region: 0x126, script: 0x5a, flags: 0x0},
-	1126: {region: 0x165, script: 0x5a, flags: 0x0},
+	1102: {region: 0x9c, script: 0xde, flags: 0x0},
+	1103: {region: 0xea, script: 0x5b, flags: 0x0},
+	1104: {region: 0x9a, script: 0xe6, flags: 0x0},
+	1105: {region: 0xdc, script: 0x22, flags: 0x0},
+	1106: {region: 0x166, script: 0x5b, flags: 0x0},
+	1107: {region: 0x166, script: 0x5b, flags: 0x0},
+	1108: {region: 0x166, script: 0x5b, flags: 0x0},
+	1109: {region: 0x166, script: 0x5b, flags: 0x0},
+	1110: {region: 0x166, script: 0x5b, flags: 0x0},
+	1111: {region: 0x166, script: 0x5b, flags: 0x0},
+	1112: {region: 0x166, script: 0x5b, flags: 0x0},
+	1113: {region: 0x166, script: 0x5b, flags: 0x0},
+	1114: {region: 0xe8, script: 0x5b, flags: 0x0},
+	1115: {region: 0x166, script: 0x5b, flags: 0x0},
+	1116: {region: 0x166, script: 0x5b, flags: 0x0},
+	1117: {region: 0x9a, script: 0x53, flags: 0x0},
+	1118: {region: 0x53, script: 0xe4, flags: 0x0},
+	1119: {region: 0xdc, script: 0x22, flags: 0x0},
+	1120: {region: 0xdc, script: 0x22, flags: 0x0},
+	1121: {region: 0x9a, script: 0xe9, flags: 0x0},
+	1122: {region: 0x166, script: 0x5b, flags: 0x0},
+	1123: {region: 0x113, script: 0x5b, flags: 0x0},
+	1124: {region: 0x132, script: 0x5b, flags: 0x0},
+	1125: {region: 0x127, script: 0x5b, flags: 0x0},
+	1126: {region: 0x166, script: 0x5b, flags: 0x0},
 	1127: {region: 0x3c, script: 0x3, flags: 0x1},
-	1128: {region: 0x165, script: 0x5a, flags: 0x0},
-	1129: {region: 0x165, script: 0x5a, flags: 0x0},
-	1130: {region: 0x165, script: 0x5a, flags: 0x0},
-	1131: {region: 0x123, script: 0xeb, flags: 0x0},
-	1132: {region: 0xdb, script: 0x22, flags: 0x0},
-	1133: {region: 0xdb, script: 0x22, flags: 0x0},
-	1134: {region: 0xdb, script: 0x22, flags: 0x0},
-	1135: {region: 0x6f, script: 0x2c, flags: 0x0},
-	1136: {region: 0x165, script: 0x5a, flags: 0x0},
-	1137: {region: 0x6d, script: 0x2c, flags: 0x0},
-	1138: {region: 0x165, script: 0x5a, flags: 0x0},
-	1139: {region: 0x165, script: 0x5a, flags: 0x0},
-	1140: {region: 0x165, script: 0x5a, flags: 0x0},
-	1141: {region: 0xd6, script: 0x5a, flags: 0x0},
-	1142: {region: 0x127, script: 0x5a, flags: 0x0},
-	1143: {region: 0x125, script: 0x5a, flags: 0x0},
-	1144: {region: 0x32, script: 0x5a, flags: 0x0},
-	1145: {region: 0xdb, script: 0x22, flags: 0x0},
-	1146: {region: 0xe7, script: 0x5a, flags: 0x0},
-	1147: {region: 0x165, script: 0x5a, flags: 0x0},
-	1148: {region: 0x165, script: 0x5a, flags: 0x0},
-	1149: {region: 0x32, script: 0x5a, flags: 0x0},
-	1150: {region: 0xd4, script: 0x5a, flags: 0x0},
-	1151: {region: 0x165, script: 0x5a, flags: 0x0},
-	1152: {region: 0x161, script: 0x5a, flags: 0x0},
-	1153: {region: 0x165, script: 0x5a, flags: 0x0},
-	1154: {region: 0x129, script: 0x5a, flags: 0x0},
-	1155: {region: 0x165, script: 0x5a, flags: 0x0},
-	1156: {region: 0xce, script: 0x5a, flags: 0x0},
-	1157: {region: 0x165, script: 0x5a, flags: 0x0},
-	1158: {region: 0xe6, script: 0x5a, flags: 0x0},
-	1159: {region: 0x165, script: 0x5a, flags: 0x0},
-	1160: {region: 0x165, script: 0x5a, flags: 0x0},
-	1161: {region: 0x165, script: 0x5a, flags: 0x0},
-	1162: {region: 0x12b, script: 0x5a, flags: 0x0},
-	1163: {region: 0x12b, script: 0x5a, flags: 0x0},
-	1164: {region: 0x12e, script: 0x5a, flags: 0x0},
-	1165: {region: 0x165, script: 0x5, flags: 0x0},
-	1166: {region: 0x161, script: 0x5a, flags: 0x0},
-	1167: {region: 0x87, script: 0x34, flags: 0x0},
-	1168: {region: 0xdb, script: 0x22, flags: 0x0},
-	1169: {region: 0xe7, script: 0x5a, flags: 0x0},
-	1170: {region: 0x43, script: 0xec, flags: 0x0},
-	1171: {region: 0x165, script: 0x5a, flags: 0x0},
-	1172: {region: 0x106, script: 0x20, flags: 0x0},
-	1173: {region: 0x165, script: 0x5a, flags: 0x0},
-	1174: {region: 0x165, script: 0x5a, flags: 0x0},
-	1175: {region: 0x131, script: 0x5a, flags: 0x0},
-	1176: {region: 0x165, script: 0x5a, flags: 0x0},
-	1177: {region: 0x123, script: 0xeb, flags: 0x0},
-	1178: {region: 0x32, script: 0x5a, flags: 0x0},
-	1179: {region: 0x165, script: 0x5a, flags: 0x0},
-	1180: {region: 0x165, script: 0x5a, flags: 0x0},
-	1181: {region: 0xce, script: 0x5a, flags: 0x0},
-	1182: {region: 0x165, script: 0x5a, flags: 0x0},
-	1183: {region: 0x165, script: 0x5a, flags: 0x0},
-	1184: {region: 0x12d, script: 0x5a, flags: 0x0},
-	1185: {region: 0x165, script: 0x5a, flags: 0x0},
-	1187: {region: 0x165, script: 0x5a, flags: 0x0},
-	1188: {region: 0xd4, script: 0x5a, flags: 0x0},
-	1189: {region: 0x53, script: 0xe4, flags: 0x0},
-	1190: {region: 0xe5, script: 0x5a, flags: 0x0},
-	1191: {region: 0x165, script: 0x5a, flags: 0x0},
-	1192: {region: 0x106, script: 0x20, flags: 0x0},
-	1193: {region: 0xba, script: 0x5a, flags: 0x0},
-	1194: {region: 0x165, script: 0x5a, flags: 0x0},
-	1195: {region: 0x106, script: 0x20, flags: 0x0},
+	1128: {region: 0x166, script: 0x5b, flags: 0x0},
+	1129: {region: 0x166, script: 0x5b, flags: 0x0},
+	1130: {region: 0x166, script: 0x5b, flags: 0x0},
+	1131: {region: 0x124, script: 0xee, flags: 0x0},
+	1132: {region: 0xdc, script: 0x22, flags: 0x0},
+	1133: {region: 0xdc, script: 0x22, flags: 0x0},
+	1134: {region: 0xdc, script: 0x22, flags: 0x0},
+	1135: {region: 0x70, script: 0x2c, flags: 0x0},
+	1136: {region: 0x166, script: 0x5b, flags: 0x0},
+	1137: {region: 0x6e, script: 0x2c, flags: 0x0},
+	1138: {region: 0x166, script: 0x5b, flags: 0x0},
+	1139: {region: 0x166, script: 0x5b, flags: 0x0},
+	1140: {region: 0x166, script: 0x5b, flags: 0x0},
+	1141: {region: 0xd7, script: 0x5b, flags: 0x0},
+	1142: {region: 0x128, script: 0x5b, flags: 0x0},
+	1143: {region: 0x126, script: 0x5b, flags: 0x0},
+	1144: {region: 0x32, script: 0x5b, flags: 0x0},
+	1145: {region: 0xdc, script: 0x22, flags: 0x0},
+	1146: {region: 0xe8, script: 0x5b, flags: 0x0},
+	1147: {region: 0x166, script: 0x5b, flags: 0x0},
+	1148: {region: 0x166, script: 0x5b, flags: 0x0},
+	1149: {region: 0x32, script: 0x5b, flags: 0x0},
+	1150: {region: 0xd5, script: 0x5b, flags: 0x0},
+	1151: {region: 0x166, script: 0x5b, flags: 0x0},
+	1152: {region: 0x162, script: 0x5b, flags: 0x0},
+	1153: {region: 0x166, script: 0x5b, flags: 0x0},
+	1154: {region: 0x12a, script: 0x5b, flags: 0x0},
+	1155: {region: 0x166, script: 0x5b, flags: 0x0},
+	1156: {region: 0xcf, script: 0x5b, flags: 0x0},
+	1157: {region: 0x166, script: 0x5b, flags: 0x0},
+	1158: {region: 0xe7, script: 0x5b, flags: 0x0},
+	1159: {region: 0x166, script: 0x5b, flags: 0x0},
+	1160: {region: 0x166, script: 0x5b, flags: 0x0},
+	1161: {region: 0x166, script: 0x5b, flags: 0x0},
+	1162: {region: 0x12c, script: 0x5b, flags: 0x0},
+	1163: {region: 0x12c, script: 0x5b, flags: 0x0},
+	1164: {region: 0x12f, script: 0x5b, flags: 0x0},
+	1165: {region: 0x166, script: 0x5, flags: 0x0},
+	1166: {region: 0x162, script: 0x5b, flags: 0x0},
+	1167: {region: 0x88, script: 0x34, flags: 0x0},
+	1168: {region: 0xdc, script: 0x22, flags: 0x0},
+	1169: {region: 0xe8, script: 0x5b, flags: 0x0},
+	1170: {region: 0x43, script: 0xef, flags: 0x0},
+	1171: {region: 0x166, script: 0x5b, flags: 0x0},
+	1172: {region: 0x107, script: 0x20, flags: 0x0},
+	1173: {region: 0x166, script: 0x5b, flags: 0x0},
+	1174: {region: 0x166, script: 0x5b, flags: 0x0},
+	1175: {region: 0x132, script: 0x5b, flags: 0x0},
+	1176: {region: 0x166, script: 0x5b, flags: 0x0},
+	1177: {region: 0x124, script: 0xee, flags: 0x0},
+	1178: {region: 0x32, script: 0x5b, flags: 0x0},
+	1179: {region: 0x166, script: 0x5b, flags: 0x0},
+	1180: {region: 0x166, script: 0x5b, flags: 0x0},
+	1181: {region: 0xcf, script: 0x5b, flags: 0x0},
+	1182: {region: 0x166, script: 0x5b, flags: 0x0},
+	1183: {region: 0x166, script: 0x5b, flags: 0x0},
+	1184: {region: 0x12e, script: 0x5b, flags: 0x0},
+	1185: {region: 0x166, script: 0x5b, flags: 0x0},
+	1187: {region: 0x166, script: 0x5b, flags: 0x0},
+	1188: {region: 0xd5, script: 0x5b, flags: 0x0},
+	1189: {region: 0x53, script: 0xe7, flags: 0x0},
+	1190: {region: 0xe6, script: 0x5b, flags: 0x0},
+	1191: {region: 0x166, script: 0x5b, flags: 0x0},
+	1192: {region: 0x107, script: 0x20, flags: 0x0},
+	1193: {region: 0xbb, script: 0x5b, flags: 0x0},
+	1194: {region: 0x166, script: 0x5b, flags: 0x0},
+	1195: {region: 0x107, script: 0x20, flags: 0x0},
 	1196: {region: 0x3f, script: 0x4, flags: 0x1},
-	1197: {region: 0x11c, script: 0xf0, flags: 0x0},
-	1198: {region: 0x130, script: 0x20, flags: 0x0},
-	1199: {region: 0x75, script: 0x5a, flags: 0x0},
-	1200: {region: 0x2a, script: 0x5a, flags: 0x0},
+	1197: {region: 0x11d, script: 0xf3, flags: 0x0},
+	1198: {region: 0x131, script: 0x20, flags: 0x0},
+	1199: {region: 0x76, script: 0x5b, flags: 0x0},
+	1200: {region: 0x2a, script: 0x5b, flags: 0x0},
 	1202: {region: 0x43, script: 0x3, flags: 0x1},
-	1203: {region: 0x99, script: 0xe, flags: 0x0},
-	1204: {region: 0xe8, script: 0x5, flags: 0x0},
-	1205: {region: 0x165, script: 0x5a, flags: 0x0},
-	1206: {region: 0x165, script: 0x5a, flags: 0x0},
-	1207: {region: 0x165, script: 0x5a, flags: 0x0},
-	1208: {region: 0x165, script: 0x5a, flags: 0x0},
-	1209: {region: 0x165, script: 0x5a, flags: 0x0},
-	1210: {region: 0x165, script: 0x5a, flags: 0x0},
-	1211: {region: 0x165, script: 0x5a, flags: 0x0},
+	1203: {region: 0x9a, script: 0xe, flags: 0x0},
+	1204: {region: 0xe9, script: 0x5, flags: 0x0},
+	1205: {region: 0x166, script: 0x5b, flags: 0x0},
+	1206: {region: 0x166, script: 0x5b, flags: 0x0},
+	1207: {region: 0x166, script: 0x5b, flags: 0x0},
+	1208: {region: 0x166, script: 0x5b, flags: 0x0},
+	1209: {region: 0x166, script: 0x5b, flags: 0x0},
+	1210: {region: 0x166, script: 0x5b, flags: 0x0},
+	1211: {region: 0x166, script: 0x5b, flags: 0x0},
 	1212: {region: 0x46, script: 0x4, flags: 0x1},
-	1213: {region: 0x165, script: 0x5a, flags: 0x0},
-	1214: {region: 0xb4, script: 0xf1, flags: 0x0},
-	1215: {region: 0x165, script: 0x5a, flags: 0x0},
-	1216: {region: 0x161, script: 0x5a, flags: 0x0},
-	1217: {region: 0x9e, script: 0x5a, flags: 0x0},
-	1218: {region: 0x106, script: 0x5a, flags: 0x0},
-	1219: {region: 0x13e, script: 0x5a, flags: 0x0},
-	1220: {region: 0x11b, script: 0x5a, flags: 0x0},
-	1221: {region: 0x165, script: 0x5a, flags: 0x0},
-	1222: {region: 0x36, script: 0x5a, flags: 0x0},
-	1223: {region: 0x60, script: 0x5a, flags: 0x0},
-	1224: {region: 0xd1, script: 0x5a, flags: 0x0},
-	1225: {region: 0x1, script: 0x5a, flags: 0x0},
-	1226: {region: 0x106, script: 0x5a, flags: 0x0},
-	1227: {region: 0x6a, script: 0x5a, flags: 0x0},
-	1228: {region: 0x12f, script: 0x5a, flags: 0x0},
-	1229: {region: 0x165, script: 0x5a, flags: 0x0},
-	1230: {region: 0x36, script: 0x5a, flags: 0x0},
-	1231: {region: 0x4e, script: 0x5a, flags: 0x0},
-	1232: {region: 0x165, script: 0x5a, flags: 0x0},
-	1233: {region: 0x6f, script: 0x2c, flags: 0x0},
-	1234: {region: 0x165, script: 0x5a, flags: 0x0},
-	1235: {region: 0xe7, script: 0x5a, flags: 0x0},
-	1236: {region: 0x2f, script: 0x5a, flags: 0x0},
-	1237: {region: 0x99, script: 0xe6, flags: 0x0},
-	1238: {region: 0x99, script: 0x22, flags: 0x0},
-	1239: {region: 0x165, script: 0x5a, flags: 0x0},
-	1240: {region: 0x165, script: 0x5a, flags: 0x0},
-	1241: {region: 0x165, script: 0x5a, flags: 0x0},
-	1242: {region: 0x165, script: 0x5a, flags: 0x0},
-	1243: {region: 0x165, script: 0x5a, flags: 0x0},
-	1244: {region: 0x165, script: 0x5a, flags: 0x0},
-	1245: {region: 0x165, script: 0x5a, flags: 0x0},
-	1246: {region: 0x165, script: 0x5a, flags: 0x0},
-	1247: {region: 0x165, script: 0x5a, flags: 0x0},
-	1248: {region: 0x140, script: 0x5a, flags: 0x0},
-	1249: {region: 0x165, script: 0x5a, flags: 0x0},
-	1250: {region: 0x165, script: 0x5a, flags: 0x0},
-	1251: {region: 0xa8, script: 0x5, flags: 0x0},
-	1252: {region: 0x165, script: 0x5a, flags: 0x0},
-	1253: {region: 0x114, script: 0x5a, flags: 0x0},
-	1254: {region: 0x165, script: 0x5a, flags: 0x0},
-	1255: {region: 0x165, script: 0x5a, flags: 0x0},
-	1256: {region: 0x165, script: 0x5a, flags: 0x0},
-	1257: {region: 0x165, script: 0x5a, flags: 0x0},
-	1258: {region: 0x99, script: 0x22, flags: 0x0},
+	1213: {region: 0x166, script: 0x5b, flags: 0x0},
+	1214: {region: 0xb5, script: 0xf4, flags: 0x0},
+	1215: {region: 0x166, script: 0x5b, flags: 0x0},
+	1216: {region: 0x162, script: 0x5b, flags: 0x0},
+	1217: {region: 0x9f, script: 0x5b, flags: 0x0},
+	1218: {region: 0x107, script: 0x5b, flags: 0x0},
+	1219: {region: 0x13f, script: 0x5b, flags: 0x0},
+	1220: {region: 0x11c, script: 0x5b, flags: 0x0},
+	1221: {region: 0x166, script: 0x5b, flags: 0x0},
+	1222: {region: 0x36, script: 0x5b, flags: 0x0},
+	1223: {region: 0x61, script: 0x5b, flags: 0x0},
+	1224: {region: 0xd2, script: 0x5b, flags: 0x0},
+	1225: {region: 0x1, script: 0x5b, flags: 0x0},
+	1226: {region: 0x107, script: 0x5b, flags: 0x0},
+	1227: {region: 0x6b, script: 0x5b, flags: 0x0},
+	1228: {region: 0x130, script: 0x5b, flags: 0x0},
+	1229: {region: 0x166, script: 0x5b, flags: 0x0},
+	1230: {region: 0x36, script: 0x5b, flags: 0x0},
+	1231: {region: 0x4e, script: 0x5b, flags: 0x0},
+	1232: {region: 0x166, script: 0x5b, flags: 0x0},
+	1233: {region: 0x70, script: 0x2c, flags: 0x0},
+	1234: {region: 0x166, script: 0x5b, flags: 0x0},
+	1235: {region: 0xe8, script: 0x5b, flags: 0x0},
+	1236: {region: 0x2f, script: 0x5b, flags: 0x0},
+	1237: {region: 0x9a, script: 0xe9, flags: 0x0},
+	1238: {region: 0x9a, script: 0x22, flags: 0x0},
+	1239: {region: 0x166, script: 0x5b, flags: 0x0},
+	1240: {region: 0x166, script: 0x5b, flags: 0x0},
+	1241: {region: 0x166, script: 0x5b, flags: 0x0},
+	1242: {region: 0x166, script: 0x5b, flags: 0x0},
+	1243: {region: 0x166, script: 0x5b, flags: 0x0},
+	1244: {region: 0x166, script: 0x5b, flags: 0x0},
+	1245: {region: 0x166, script: 0x5b, flags: 0x0},
+	1246: {region: 0x166, script: 0x5b, flags: 0x0},
+	1247: {region: 0x166, script: 0x5b, flags: 0x0},
+	1248: {region: 0x141, script: 0x5b, flags: 0x0},
+	1249: {region: 0x166, script: 0x5b, flags: 0x0},
+	1250: {region: 0x166, script: 0x5b, flags: 0x0},
+	1251: {region: 0xa9, script: 0x5, flags: 0x0},
+	1252: {region: 0x166, script: 0x5b, flags: 0x0},
+	1253: {region: 0x115, script: 0x5b, flags: 0x0},
+	1254: {region: 0x166, script: 0x5b, flags: 0x0},
+	1255: {region: 0x166, script: 0x5b, flags: 0x0},
+	1256: {region: 0x166, script: 0x5b, flags: 0x0},
+	1257: {region: 0x166, script: 0x5b, flags: 0x0},
+	1258: {region: 0x9a, script: 0x22, flags: 0x0},
 	1259: {region: 0x53, script: 0x3b, flags: 0x0},
-	1260: {region: 0x165, script: 0x5a, flags: 0x0},
-	1261: {region: 0x165, script: 0x5a, flags: 0x0},
-	1262: {region: 0x41, script: 0x5a, flags: 0x0},
-	1263: {region: 0x165, script: 0x5a, flags: 0x0},
-	1264: {region: 0x12b, script: 0x18, flags: 0x0},
-	1265: {region: 0x165, script: 0x5a, flags: 0x0},
-	1266: {region: 0x161, script: 0x5a, flags: 0x0},
-	1267: {region: 0x165, script: 0x5a, flags: 0x0},
-	1268: {region: 0x12b, script: 0x62, flags: 0x0},
-	1269: {region: 0x12b, script: 0x63, flags: 0x0},
-	1270: {region: 0x7d, script: 0x2e, flags: 0x0},
-	1271: {region: 0x53, script: 0x67, flags: 0x0},
-	1272: {region: 0x10b, script: 0x6c, flags: 0x0},
-	1273: {region: 0x108, script: 0x77, flags: 0x0},
-	1274: {region: 0x99, script: 0x22, flags: 0x0},
-	1275: {region: 0x131, script: 0x5a, flags: 0x0},
-	1276: {region: 0x165, script: 0x5a, flags: 0x0},
-	1277: {region: 0x9c, script: 0x91, flags: 0x0},
-	1278: {region: 0x165, script: 0x5a, flags: 0x0},
-	1279: {region: 0x15e, script: 0xcc, flags: 0x0},
-	1280: {region: 0x165, script: 0x5a, flags: 0x0},
-	1281: {region: 0x165, script: 0x5a, flags: 0x0},
-	1282: {region: 0xdb, script: 0x22, flags: 0x0},
-	1283: {region: 0x165, script: 0x5a, flags: 0x0},
-	1284: {region: 0x165, script: 0x5a, flags: 0x0},
-	1285: {region: 0xd1, script: 0x5a, flags: 0x0},
-	1286: {region: 0x75, script: 0x5a, flags: 0x0},
-	1287: {region: 0x165, script: 0x5a, flags: 0x0},
-	1288: {region: 0x165, script: 0x5a, flags: 0x0},
-	1289: {region: 0x52, script: 0x5a, flags: 0x0},
-	1290: {region: 0x165, script: 0x5a, flags: 0x0},
-	1291: {region: 0x165, script: 0x5a, flags: 0x0},
-	1292: {region: 0x165, script: 0x5a, flags: 0x0},
-	1293: {region: 0x52, script: 0x5a, flags: 0x0},
-	1294: {region: 0x165, script: 0x5a, flags: 0x0},
-	1295: {region: 0x165, script: 0x5a, flags: 0x0},
-	1296: {region: 0x165, script: 0x5a, flags: 0x0},
-	1297: {region: 0x165, script: 0x5a, flags: 0x0},
+	1260: {region: 0x166, script: 0x5b, flags: 0x0},
+	1261: {region: 0x166, script: 0x5b, flags: 0x0},
+	1262: {region: 0x41, script: 0x5b, flags: 0x0},
+	1263: {region: 0x166, script: 0x5b, flags: 0x0},
+	1264: {region: 0x12c, script: 0x18, flags: 0x0},
+	1265: {region: 0x166, script: 0x5b, flags: 0x0},
+	1266: {region: 0x162, script: 0x5b, flags: 0x0},
+	1267: {region: 0x166, script: 0x5b, flags: 0x0},
+	1268: {region: 0x12c, script: 0x63, flags: 0x0},
+	1269: {region: 0x12c, script: 0x64, flags: 0x0},
+	1270: {region: 0x7e, script: 0x2e, flags: 0x0},
+	1271: {region: 0x53, script: 0x68, flags: 0x0},
+	1272: {region: 0x10c, script: 0x6d, flags: 0x0},
+	1273: {region: 0x109, script: 0x79, flags: 0x0},
+	1274: {region: 0x9a, script: 0x22, flags: 0x0},
+	1275: {region: 0x132, script: 0x5b, flags: 0x0},
+	1276: {region: 0x166, script: 0x5b, flags: 0x0},
+	1277: {region: 0x9d, script: 0x93, flags: 0x0},
+	1278: {region: 0x166, script: 0x5b, flags: 0x0},
+	1279: {region: 0x15f, script: 0xce, flags: 0x0},
+	1280: {region: 0x166, script: 0x5b, flags: 0x0},
+	1281: {region: 0x166, script: 0x5b, flags: 0x0},
+	1282: {region: 0xdc, script: 0x22, flags: 0x0},
+	1283: {region: 0x166, script: 0x5b, flags: 0x0},
+	1284: {region: 0x166, script: 0x5b, flags: 0x0},
+	1285: {region: 0xd2, script: 0x5b, flags: 0x0},
+	1286: {region: 0x76, script: 0x5b, flags: 0x0},
+	1287: {region: 0x166, script: 0x5b, flags: 0x0},
+	1288: {region: 0x166, script: 0x5b, flags: 0x0},
+	1289: {region: 0x52, script: 0x5b, flags: 0x0},
+	1290: {region: 0x166, script: 0x5b, flags: 0x0},
+	1291: {region: 0x166, script: 0x5b, flags: 0x0},
+	1292: {region: 0x166, script: 0x5b, flags: 0x0},
+	1293: {region: 0x52, script: 0x5b, flags: 0x0},
+	1294: {region: 0x166, script: 0x5b, flags: 0x0},
+	1295: {region: 0x166, script: 0x5b, flags: 0x0},
+	1296: {region: 0x166, script: 0x5b, flags: 0x0},
+	1297: {region: 0x166, script: 0x5b, flags: 0x0},
 	1298: {region: 0x1, script: 0x3e, flags: 0x0},
-	1299: {region: 0x165, script: 0x5a, flags: 0x0},
-	1300: {region: 0x165, script: 0x5a, flags: 0x0},
-	1301: {region: 0x165, script: 0x5a, flags: 0x0},
-	1302: {region: 0x165, script: 0x5a, flags: 0x0},
-	1303: {region: 0x165, script: 0x5a, flags: 0x0},
-	1304: {region: 0xd6, script: 0x5a, flags: 0x0},
-	1305: {region: 0x165, script: 0x5a, flags: 0x0},
-	1306: {region: 0x165, script: 0x5a, flags: 0x0},
-	1307: {region: 0x165, script: 0x5a, flags: 0x0},
-	1308: {region: 0x41, script: 0x5a, flags: 0x0},
-	1309: {region: 0x165, script: 0x5a, flags: 0x0},
-	1310: {region: 0xcf, script: 0x5a, flags: 0x0},
+	1299: {region: 0x166, script: 0x5b, flags: 0x0},
+	1300: {region: 0x166, script: 0x5b, flags: 0x0},
+	1301: {region: 0x166, script: 0x5b, flags: 0x0},
+	1302: {region: 0x166, script: 0x5b, flags: 0x0},
+	1303: {region: 0x166, script: 0x5b, flags: 0x0},
+	1304: {region: 0xd7, script: 0x5b, flags: 0x0},
+	1305: {region: 0x166, script: 0x5b, flags: 0x0},
+	1306: {region: 0x166, script: 0x5b, flags: 0x0},
+	1307: {region: 0x166, script: 0x5b, flags: 0x0},
+	1308: {region: 0x41, script: 0x5b, flags: 0x0},
+	1309: {region: 0x166, script: 0x5b, flags: 0x0},
+	1310: {region: 0xd0, script: 0x5b, flags: 0x0},
 	1311: {region: 0x4a, script: 0x3, flags: 0x1},
-	1312: {region: 0x165, script: 0x5a, flags: 0x0},
-	1313: {region: 0x165, script: 0x5a, flags: 0x0},
-	1314: {region: 0x165, script: 0x5a, flags: 0x0},
-	1315: {region: 0x53, script: 0x5a, flags: 0x0},
-	1316: {region: 0x10b, script: 0x5a, flags: 0x0},
-	1318: {region: 0xa8, script: 0x5, flags: 0x0},
-	1319: {region: 0xd9, script: 0x5a, flags: 0x0},
-	1320: {region: 0xba, script: 0xe8, flags: 0x0},
+	1312: {region: 0x166, script: 0x5b, flags: 0x0},
+	1313: {region: 0x166, script: 0x5b, flags: 0x0},
+	1314: {region: 0x166, script: 0x5b, flags: 0x0},
+	1315: {region: 0x53, script: 0x5b, flags: 0x0},
+	1316: {region: 0x10c, script: 0x5b, flags: 0x0},
+	1318: {region: 0xa9, script: 0x5, flags: 0x0},
+	1319: {region: 0xda, script: 0x5b, flags: 0x0},
+	1320: {region: 0xbb, script: 0xeb, flags: 0x0},
 	1321: {region: 0x4d, script: 0x14, flags: 0x1},
-	1322: {region: 0x53, script: 0x7d, flags: 0x0},
-	1323: {region: 0x165, script: 0x5a, flags: 0x0},
-	1324: {region: 0x122, script: 0x5a, flags: 0x0},
-	1325: {region: 0xd0, script: 0x5a, flags: 0x0},
-	1326: {region: 0x165, script: 0x5a, flags: 0x0},
-	1327: {region: 0x161, script: 0x5a, flags: 0x0},
-	1329: {region: 0x12b, script: 0x5a, flags: 0x0},
+	1322: {region: 0x53, script: 0x7f, flags: 0x0},
+	1323: {region: 0x166, script: 0x5b, flags: 0x0},
+	1324: {region: 0x123, script: 0x5b, flags: 0x0},
+	1325: {region: 0xd1, script: 0x5b, flags: 0x0},
+	1326: {region: 0x166, script: 0x5b, flags: 0x0},
+	1327: {region: 0x162, script: 0x5b, flags: 0x0},
+	1329: {region: 0x12c, script: 0x5b, flags: 0x0},
 }
 
 // likelyLangList holds lists info associated with likelyLang.
 // Size: 582 bytes, 97 elements
 var likelyLangList = [97]likelyScriptRegion{
-	0:  {region: 0x9c, script: 0x7, flags: 0x0},
-	1:  {region: 0xa1, script: 0x78, flags: 0x2},
-	2:  {region: 0x11c, script: 0x85, flags: 0x2},
-	3:  {region: 0x32, script: 0x5a, flags: 0x0},
-	4:  {region: 0x9b, script: 0x5, flags: 0x4},
-	5:  {region: 0x9c, script: 0x5, flags: 0x4},
-	6:  {region: 0x106, script: 0x20, flags: 0x4},
-	7:  {region: 0x9c, script: 0x5, flags: 0x2},
-	8:  {region: 0x106, script: 0x20, flags: 0x0},
+	0:  {region: 0x9d, script: 0x7, flags: 0x0},
+	1:  {region: 0xa2, script: 0x7a, flags: 0x2},
+	2:  {region: 0x11d, script: 0x87, flags: 0x2},
+	3:  {region: 0x32, script: 0x5b, flags: 0x0},
+	4:  {region: 0x9c, script: 0x5, flags: 0x4},
+	5:  {region: 0x9d, script: 0x5, flags: 0x4},
+	6:  {region: 0x107, script: 0x20, flags: 0x4},
+	7:  {region: 0x9d, script: 0x5, flags: 0x2},
+	8:  {region: 0x107, script: 0x20, flags: 0x0},
 	9:  {region: 0x38, script: 0x2f, flags: 0x2},
-	10: {region: 0x135, script: 0x5a, flags: 0x0},
-	11: {region: 0x7b, script: 0xcf, flags: 0x2},
-	12: {region: 0x114, script: 0x5a, flags: 0x0},
-	13: {region: 0x84, script: 0x1, flags: 0x2},
-	14: {region: 0x5d, script: 0x1f, flags: 0x0},
-	15: {region: 0x87, script: 0x5f, flags: 0x2},
-	16: {region: 0xd6, script: 0x5a, flags: 0x0},
+	10: {region: 0x136, script: 0x5b, flags: 0x0},
+	11: {region: 0x7c, script: 0xd1, flags: 0x2},
+	12: {region: 0x115, script: 0x5b, flags: 0x0},
+	13: {region: 0x85, script: 0x1, flags: 0x2},
+	14: {region: 0x5e, script: 0x1f, flags: 0x0},
+	15: {region: 0x88, script: 0x60, flags: 0x2},
+	16: {region: 0xd7, script: 0x5b, flags: 0x0},
 	17: {region: 0x52, script: 0x5, flags: 0x4},
-	18: {region: 0x10b, script: 0x5, flags: 0x4},
-	19: {region: 0xae, script: 0x20, flags: 0x0},
+	18: {region: 0x10c, script: 0x5, flags: 0x4},
+	19: {region: 0xaf, script: 0x20, flags: 0x0},
 	20: {region: 0x24, script: 0x5, flags: 0x4},
 	21: {region: 0x53, script: 0x5, flags: 0x4},
-	22: {region: 0x9c, script: 0x5, flags: 0x4},
-	23: {region: 0xc5, script: 0x5, flags: 0x4},
+	22: {region: 0x9d, script: 0x5, flags: 0x4},
+	23: {region: 0xc6, script: 0x5, flags: 0x4},
 	24: {region: 0x53, script: 0x5, flags: 0x2},
-	25: {region: 0x12b, script: 0x5a, flags: 0x0},
-	26: {region: 0xb0, script: 0x5, flags: 0x4},
-	27: {region: 0x9b, script: 0x5, flags: 0x2},
-	28: {region: 0xa5, script: 0x20, flags: 0x0},
+	25: {region: 0x12c, script: 0x5b, flags: 0x0},
+	26: {region: 0xb1, script: 0x5, flags: 0x4},
+	27: {region: 0x9c, script: 0x5, flags: 0x2},
+	28: {region: 0xa6, script: 0x20, flags: 0x0},
 	29: {region: 0x53, script: 0x5, flags: 0x4},
-	30: {region: 0x12b, script: 0x5a, flags: 0x4},
+	30: {region: 0x12c, script: 0x5b, flags: 0x4},
 	31: {region: 0x53, script: 0x5, flags: 0x2},
-	32: {region: 0x12b, script: 0x5a, flags: 0x2},
-	33: {region: 0xdb, script: 0x22, flags: 0x0},
-	34: {region: 0x99, script: 0x5d, flags: 0x2},
-	35: {region: 0x83, script: 0x5a, flags: 0x0},
-	36: {region: 0x84, script: 0x7c, flags: 0x4},
-	37: {region: 0x84, script: 0x7c, flags: 0x2},
-	38: {region: 0xc5, script: 0x20, flags: 0x0},
-	39: {region: 0x53, script: 0x70, flags: 0x4},
-	40: {region: 0x53, script: 0x70, flags: 0x2},
-	41: {region: 0xd0, script: 0x5a, flags: 0x0},
+	32: {region: 0x12c, script: 0x5b, flags: 0x2},
+	33: {region: 0xdc, script: 0x22, flags: 0x0},
+	34: {region: 0x9a, script: 0x5e, flags: 0x2},
+	35: {region: 0x84, script: 0x5b, flags: 0x0},
+	36: {region: 0x85, script: 0x7e, flags: 0x4},
+	37: {region: 0x85, script: 0x7e, flags: 0x2},
+	38: {region: 0xc6, script: 0x20, flags: 0x0},
+	39: {region: 0x53, script: 0x71, flags: 0x4},
+	40: {region: 0x53, script: 0x71, flags: 0x2},
+	41: {region: 0xd1, script: 0x5b, flags: 0x0},
 	42: {region: 0x4a, script: 0x5, flags: 0x4},
-	43: {region: 0x95, script: 0x5, flags: 0x4},
-	44: {region: 0x99, script: 0x36, flags: 0x0},
-	45: {region: 0xe8, script: 0x5, flags: 0x4},
-	46: {region: 0xe8, script: 0x5, flags: 0x2},
-	47: {region: 0x9c, script: 0x8b, flags: 0x0},
-	48: {region: 0x53, script: 0x8c, flags: 0x2},
-	49: {region: 0xba, script: 0xe8, flags: 0x0},
-	50: {region: 0xd9, script: 0x5a, flags: 0x4},
-	51: {region: 0xe8, script: 0x5, flags: 0x0},
-	52: {region: 0x99, script: 0x22, flags: 0x2},
-	53: {region: 0x99, script: 0x4f, flags: 0x2},
-	54: {region: 0x99, script: 0xd3, flags: 0x2},
-	55: {region: 0x105, script: 0x20, flags: 0x0},
-	56: {region: 0xbd, script: 0x5a, flags: 0x4},
-	57: {region: 0x104, script: 0x5a, flags: 0x4},
-	58: {region: 0x106, script: 0x5a, flags: 0x4},
-	59: {region: 0x12b, script: 0x5a, flags: 0x4},
-	60: {region: 0x124, script: 0x20, flags: 0x0},
-	61: {region: 0xe8, script: 0x5, flags: 0x4},
-	62: {region: 0xe8, script: 0x5, flags: 0x2},
+	43: {region: 0x96, script: 0x5, flags: 0x4},
+	44: {region: 0x9a, script: 0x36, flags: 0x0},
+	45: {region: 0xe9, script: 0x5, flags: 0x4},
+	46: {region: 0xe9, script: 0x5, flags: 0x2},
+	47: {region: 0x9d, script: 0x8d, flags: 0x0},
+	48: {region: 0x53, script: 0x8e, flags: 0x2},
+	49: {region: 0xbb, script: 0xeb, flags: 0x0},
+	50: {region: 0xda, script: 0x5b, flags: 0x4},
+	51: {region: 0xe9, script: 0x5, flags: 0x0},
+	52: {region: 0x9a, script: 0x22, flags: 0x2},
+	53: {region: 0x9a, script: 0x50, flags: 0x2},
+	54: {region: 0x9a, script: 0xd5, flags: 0x2},
+	55: {region: 0x106, script: 0x20, flags: 0x0},
+	56: {region: 0xbe, script: 0x5b, flags: 0x4},
+	57: {region: 0x105, script: 0x5b, flags: 0x4},
+	58: {region: 0x107, script: 0x5b, flags: 0x4},
+	59: {region: 0x12c, script: 0x5b, flags: 0x4},
+	60: {region: 0x125, script: 0x20, flags: 0x0},
+	61: {region: 0xe9, script: 0x5, flags: 0x4},
+	62: {region: 0xe9, script: 0x5, flags: 0x2},
 	63: {region: 0x53, script: 0x5, flags: 0x0},
-	64: {region: 0xae, script: 0x20, flags: 0x4},
-	65: {region: 0xc5, script: 0x20, flags: 0x4},
-	66: {region: 0xae, script: 0x20, flags: 0x2},
-	67: {region: 0x99, script: 0xe, flags: 0x0},
-	68: {region: 0xdb, script: 0x22, flags: 0x4},
-	69: {region: 0xdb, script: 0x22, flags: 0x2},
-	70: {region: 0x137, script: 0x5a, flags: 0x0},
+	64: {region: 0xaf, script: 0x20, flags: 0x4},
+	65: {region: 0xc6, script: 0x20, flags: 0x4},
+	66: {region: 0xaf, script: 0x20, flags: 0x2},
+	67: {region: 0x9a, script: 0xe, flags: 0x0},
+	68: {region: 0xdc, script: 0x22, flags: 0x4},
+	69: {region: 0xdc, script: 0x22, flags: 0x2},
+	70: {region: 0x138, script: 0x5b, flags: 0x0},
 	71: {region: 0x24, script: 0x5, flags: 0x4},
 	72: {region: 0x53, script: 0x20, flags: 0x4},
 	73: {region: 0x24, script: 0x5, flags: 0x2},
-	74: {region: 0x8d, script: 0x3c, flags: 0x0},
+	74: {region: 0x8e, script: 0x3c, flags: 0x0},
 	75: {region: 0x53, script: 0x3b, flags: 0x4},
 	76: {region: 0x53, script: 0x3b, flags: 0x2},
 	77: {region: 0x53, script: 0x3b, flags: 0x0},
 	78: {region: 0x2f, script: 0x3c, flags: 0x4},
 	79: {region: 0x3e, script: 0x3c, flags: 0x4},
-	80: {region: 0x7b, script: 0x3c, flags: 0x4},
-	81: {region: 0x7e, script: 0x3c, flags: 0x4},
-	82: {region: 0x8d, script: 0x3c, flags: 0x4},
-	83: {region: 0x95, script: 0x3c, flags: 0x4},
-	84: {region: 0xc6, script: 0x3c, flags: 0x4},
-	85: {region: 0xd0, script: 0x3c, flags: 0x4},
-	86: {region: 0xe2, script: 0x3c, flags: 0x4},
-	87: {region: 0xe5, script: 0x3c, flags: 0x4},
-	88: {region: 0xe7, script: 0x3c, flags: 0x4},
-	89: {region: 0x116, script: 0x3c, flags: 0x4},
-	90: {region: 0x123, script: 0x3c, flags: 0x4},
-	91: {region: 0x12e, script: 0x3c, flags: 0x4},
-	92: {region: 0x135, script: 0x3c, flags: 0x4},
-	93: {region: 0x13e, script: 0x3c, flags: 0x4},
-	94: {region: 0x12e, script: 0x11, flags: 0x2},
-	95: {region: 0x12e, script: 0x37, flags: 0x2},
-	96: {region: 0x12e, script: 0x3c, flags: 0x2},
+	80: {region: 0x7c, script: 0x3c, flags: 0x4},
+	81: {region: 0x7f, script: 0x3c, flags: 0x4},
+	82: {region: 0x8e, script: 0x3c, flags: 0x4},
+	83: {region: 0x96, script: 0x3c, flags: 0x4},
+	84: {region: 0xc7, script: 0x3c, flags: 0x4},
+	85: {region: 0xd1, script: 0x3c, flags: 0x4},
+	86: {region: 0xe3, script: 0x3c, flags: 0x4},
+	87: {region: 0xe6, script: 0x3c, flags: 0x4},
+	88: {region: 0xe8, script: 0x3c, flags: 0x4},
+	89: {region: 0x117, script: 0x3c, flags: 0x4},
+	90: {region: 0x124, script: 0x3c, flags: 0x4},
+	91: {region: 0x12f, script: 0x3c, flags: 0x4},
+	92: {region: 0x136, script: 0x3c, flags: 0x4},
+	93: {region: 0x13f, script: 0x3c, flags: 0x4},
+	94: {region: 0x12f, script: 0x11, flags: 0x2},
+	95: {region: 0x12f, script: 0x37, flags: 0x2},
+	96: {region: 0x12f, script: 0x3c, flags: 0x2},
 }
 
 type likelyLangScript struct {
@@ -2987,306 +3009,306 @@ type likelyLangScript struct {
 // for a given regionID, lang and script are the index and size respectively
 // of the list in likelyRegionList.
 // TODO: exclude containers and user-definable regions from the list.
-// Size: 2148 bytes, 358 elements
-var likelyRegion = [358]likelyLangScript{
-	34:  {lang: 0xd7, script: 0x5a, flags: 0x0},
+// Size: 2154 bytes, 359 elements
+var likelyRegion = [359]likelyLangScript{
+	34:  {lang: 0xd7, script: 0x5b, flags: 0x0},
 	35:  {lang: 0x3a, script: 0x5, flags: 0x0},
 	36:  {lang: 0x0, script: 0x2, flags: 0x1},
 	39:  {lang: 0x2, script: 0x2, flags: 0x1},
 	40:  {lang: 0x4, script: 0x2, flags: 0x1},
-	42:  {lang: 0x3c0, script: 0x5a, flags: 0x0},
-	43:  {lang: 0x0, script: 0x5a, flags: 0x0},
-	44:  {lang: 0x13e, script: 0x5a, flags: 0x0},
-	45:  {lang: 0x41b, script: 0x5a, flags: 0x0},
-	46:  {lang: 0x10d, script: 0x5a, flags: 0x0},
-	48:  {lang: 0x367, script: 0x5a, flags: 0x0},
-	49:  {lang: 0x444, script: 0x5a, flags: 0x0},
-	50:  {lang: 0x58, script: 0x5a, flags: 0x0},
+	42:  {lang: 0x3c0, script: 0x5b, flags: 0x0},
+	43:  {lang: 0x0, script: 0x5b, flags: 0x0},
+	44:  {lang: 0x13e, script: 0x5b, flags: 0x0},
+	45:  {lang: 0x41b, script: 0x5b, flags: 0x0},
+	46:  {lang: 0x10d, script: 0x5b, flags: 0x0},
+	48:  {lang: 0x367, script: 0x5b, flags: 0x0},
+	49:  {lang: 0x444, script: 0x5b, flags: 0x0},
+	50:  {lang: 0x58, script: 0x5b, flags: 0x0},
 	51:  {lang: 0x6, script: 0x2, flags: 0x1},
 	53:  {lang: 0xa5, script: 0xe, flags: 0x0},
-	54:  {lang: 0x367, script: 0x5a, flags: 0x0},
-	55:  {lang: 0x15e, script: 0x5a, flags: 0x0},
+	54:  {lang: 0x367, script: 0x5b, flags: 0x0},
+	55:  {lang: 0x15e, script: 0x5b, flags: 0x0},
 	56:  {lang: 0x7e, script: 0x20, flags: 0x0},
 	57:  {lang: 0x3a, script: 0x5, flags: 0x0},
-	58:  {lang: 0x3d9, script: 0x5a, flags: 0x0},
-	59:  {lang: 0x15e, script: 0x5a, flags: 0x0},
-	60:  {lang: 0x15e, script: 0x5a, flags: 0x0},
-	62:  {lang: 0x31f, script: 0x5a, flags: 0x0},
-	63:  {lang: 0x13e, script: 0x5a, flags: 0x0},
-	64:  {lang: 0x3a1, script: 0x5a, flags: 0x0},
-	65:  {lang: 0x3c0, script: 0x5a, flags: 0x0},
+	58:  {lang: 0x3d9, script: 0x5b, flags: 0x0},
+	59:  {lang: 0x15e, script: 0x5b, flags: 0x0},
+	60:  {lang: 0x15e, script: 0x5b, flags: 0x0},
+	62:  {lang: 0x31f, script: 0x5b, flags: 0x0},
+	63:  {lang: 0x13e, script: 0x5b, flags: 0x0},
+	64:  {lang: 0x3a1, script: 0x5b, flags: 0x0},
+	65:  {lang: 0x3c0, script: 0x5b, flags: 0x0},
 	67:  {lang: 0x8, script: 0x2, flags: 0x1},
-	69:  {lang: 0x0, script: 0x5a, flags: 0x0},
+	69:  {lang: 0x0, script: 0x5b, flags: 0x0},
 	71:  {lang: 0x71, script: 0x20, flags: 0x0},
 	73:  {lang: 0x512, script: 0x3e, flags: 0x2},
 	74:  {lang: 0x31f, script: 0x5, flags: 0x2},
-	75:  {lang: 0x445, script: 0x5a, flags: 0x0},
-	76:  {lang: 0x15e, script: 0x5a, flags: 0x0},
-	77:  {lang: 0x15e, script: 0x5a, flags: 0x0},
-	78:  {lang: 0x10d, script: 0x5a, flags: 0x0},
-	79:  {lang: 0x15e, script: 0x5a, flags: 0x0},
-	81:  {lang: 0x13e, script: 0x5a, flags: 0x0},
-	82:  {lang: 0x15e, script: 0x5a, flags: 0x0},
+	75:  {lang: 0x445, script: 0x5b, flags: 0x0},
+	76:  {lang: 0x15e, script: 0x5b, flags: 0x0},
+	77:  {lang: 0x15e, script: 0x5b, flags: 0x0},
+	78:  {lang: 0x10d, script: 0x5b, flags: 0x0},
+	79:  {lang: 0x15e, script: 0x5b, flags: 0x0},
+	81:  {lang: 0x13e, script: 0x5b, flags: 0x0},
+	82:  {lang: 0x15e, script: 0x5b, flags: 0x0},
 	83:  {lang: 0xa, script: 0x4, flags: 0x1},
-	84:  {lang: 0x13e, script: 0x5a, flags: 0x0},
-	85:  {lang: 0x0, script: 0x5a, flags: 0x0},
-	86:  {lang: 0x13e, script: 0x5a, flags: 0x0},
-	89:  {lang: 0x13e, script: 0x5a, flags: 0x0},
-	90:  {lang: 0x3c0, script: 0x5a, flags: 0x0},
-	91:  {lang: 0x3a1, script: 0x5a, flags: 0x0},
-	93:  {lang: 0xe, script: 0x2, flags: 0x1},
-	94:  {lang: 0xfa, script: 0x5a, flags: 0x0},
-	96:  {lang: 0x10d, script: 0x5a, flags: 0x0},
-	98:  {lang: 0x1, script: 0x5a, flags: 0x0},
-	99:  {lang: 0x101, script: 0x5a, flags: 0x0},
-	101: {lang: 0x13e, script: 0x5a, flags: 0x0},
-	103: {lang: 0x10, script: 0x2, flags: 0x1},
-	104: {lang: 0x13e, script: 0x5a, flags: 0x0},
-	105: {lang: 0x13e, script: 0x5a, flags: 0x0},
-	106: {lang: 0x140, script: 0x5a, flags: 0x0},
-	107: {lang: 0x3a, script: 0x5, flags: 0x0},
+	84:  {lang: 0x13e, script: 0x5b, flags: 0x0},
+	85:  {lang: 0x0, script: 0x5b, flags: 0x0},
+	87:  {lang: 0x13e, script: 0x5b, flags: 0x0},
+	90:  {lang: 0x13e, script: 0x5b, flags: 0x0},
+	91:  {lang: 0x3c0, script: 0x5b, flags: 0x0},
+	92:  {lang: 0x3a1, script: 0x5b, flags: 0x0},
+	94:  {lang: 0xe, script: 0x2, flags: 0x1},
+	95:  {lang: 0xfa, script: 0x5b, flags: 0x0},
+	97:  {lang: 0x10d, script: 0x5b, flags: 0x0},
+	99:  {lang: 0x1, script: 0x5b, flags: 0x0},
+	100: {lang: 0x101, script: 0x5b, flags: 0x0},
+	102: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	104: {lang: 0x10, script: 0x2, flags: 0x1},
+	105: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	106: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	107: {lang: 0x140, script: 0x5b, flags: 0x0},
 	108: {lang: 0x3a, script: 0x5, flags: 0x0},
-	109: {lang: 0x46f, script: 0x2c, flags: 0x0},
-	110: {lang: 0x13e, script: 0x5a, flags: 0x0},
-	111: {lang: 0x12, script: 0x2, flags: 0x1},
-	113: {lang: 0x10d, script: 0x5a, flags: 0x0},
-	114: {lang: 0x151, script: 0x5a, flags: 0x0},
-	115: {lang: 0x1c0, script: 0x22, flags: 0x2},
-	118: {lang: 0x158, script: 0x5a, flags: 0x0},
-	120: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	122: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	123: {lang: 0x14, script: 0x2, flags: 0x1},
-	125: {lang: 0x16, script: 0x3, flags: 0x1},
-	126: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	128: {lang: 0x21, script: 0x5a, flags: 0x0},
-	130: {lang: 0x245, script: 0x5a, flags: 0x0},
-	132: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	133: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	134: {lang: 0x13e, script: 0x5a, flags: 0x0},
-	135: {lang: 0x19, script: 0x2, flags: 0x1},
-	136: {lang: 0x0, script: 0x5a, flags: 0x0},
-	137: {lang: 0x13e, script: 0x5a, flags: 0x0},
-	139: {lang: 0x3c0, script: 0x5a, flags: 0x0},
-	141: {lang: 0x529, script: 0x3c, flags: 0x0},
-	142: {lang: 0x0, script: 0x5a, flags: 0x0},
-	143: {lang: 0x13e, script: 0x5a, flags: 0x0},
-	144: {lang: 0x1d1, script: 0x5a, flags: 0x0},
-	145: {lang: 0x1d4, script: 0x5a, flags: 0x0},
-	146: {lang: 0x1d5, script: 0x5a, flags: 0x0},
-	148: {lang: 0x13e, script: 0x5a, flags: 0x0},
-	149: {lang: 0x1b, script: 0x2, flags: 0x1},
-	151: {lang: 0x1bc, script: 0x3e, flags: 0x0},
-	153: {lang: 0x1d, script: 0x3, flags: 0x1},
-	155: {lang: 0x3a, script: 0x5, flags: 0x0},
-	156: {lang: 0x20, script: 0x2, flags: 0x1},
-	157: {lang: 0x1f8, script: 0x5a, flags: 0x0},
-	158: {lang: 0x1f9, script: 0x5a, flags: 0x0},
-	161: {lang: 0x3a, script: 0x5, flags: 0x0},
-	162: {lang: 0x200, script: 0x49, flags: 0x0},
-	164: {lang: 0x445, script: 0x5a, flags: 0x0},
-	165: {lang: 0x28a, script: 0x20, flags: 0x0},
-	166: {lang: 0x22, script: 0x3, flags: 0x1},
-	168: {lang: 0x25, script: 0x2, flags: 0x1},
-	170: {lang: 0x254, script: 0x53, flags: 0x0},
-	171: {lang: 0x254, script: 0x53, flags: 0x0},
-	172: {lang: 0x3a, script: 0x5, flags: 0x0},
-	174: {lang: 0x3e2, script: 0x20, flags: 0x0},
-	175: {lang: 0x27, script: 0x2, flags: 0x1},
-	176: {lang: 0x3a, script: 0x5, flags: 0x0},
-	178: {lang: 0x10d, script: 0x5a, flags: 0x0},
-	179: {lang: 0x40c, script: 0xd4, flags: 0x0},
-	181: {lang: 0x43b, script: 0x5a, flags: 0x0},
-	182: {lang: 0x2c0, script: 0x5a, flags: 0x0},
-	183: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	184: {lang: 0x2c7, script: 0x5a, flags: 0x0},
-	185: {lang: 0x3a, script: 0x5, flags: 0x0},
-	186: {lang: 0x29, script: 0x2, flags: 0x1},
-	187: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	188: {lang: 0x2b, script: 0x2, flags: 0x1},
-	189: {lang: 0x432, script: 0x5a, flags: 0x0},
-	190: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	191: {lang: 0x2f1, script: 0x5a, flags: 0x0},
-	194: {lang: 0x2d, script: 0x2, flags: 0x1},
-	195: {lang: 0xa0, script: 0x5a, flags: 0x0},
-	196: {lang: 0x2f, script: 0x2, flags: 0x1},
-	197: {lang: 0x31, script: 0x2, flags: 0x1},
-	198: {lang: 0x33, script: 0x2, flags: 0x1},
-	200: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	201: {lang: 0x35, script: 0x2, flags: 0x1},
-	203: {lang: 0x320, script: 0x5a, flags: 0x0},
-	204: {lang: 0x37, script: 0x3, flags: 0x1},
-	205: {lang: 0x128, script: 0xea, flags: 0x0},
-	207: {lang: 0x13e, script: 0x5a, flags: 0x0},
-	208: {lang: 0x31f, script: 0x5a, flags: 0x0},
-	209: {lang: 0x3c0, script: 0x5a, flags: 0x0},
-	210: {lang: 0x16, script: 0x5a, flags: 0x0},
-	211: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	212: {lang: 0x1b4, script: 0x5a, flags: 0x0},
-	214: {lang: 0x1b4, script: 0x5, flags: 0x2},
-	216: {lang: 0x13e, script: 0x5a, flags: 0x0},
-	217: {lang: 0x367, script: 0x5a, flags: 0x0},
-	218: {lang: 0x347, script: 0x5a, flags: 0x0},
-	219: {lang: 0x351, script: 0x22, flags: 0x0},
-	225: {lang: 0x3a, script: 0x5, flags: 0x0},
-	226: {lang: 0x13e, script: 0x5a, flags: 0x0},
-	228: {lang: 0x13e, script: 0x5a, flags: 0x0},
-	229: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	230: {lang: 0x486, script: 0x5a, flags: 0x0},
-	231: {lang: 0x153, script: 0x5a, flags: 0x0},
-	232: {lang: 0x3a, script: 0x3, flags: 0x1},
-	233: {lang: 0x3b3, script: 0x5a, flags: 0x0},
-	234: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	236: {lang: 0x13e, script: 0x5a, flags: 0x0},
-	237: {lang: 0x3a, script: 0x5, flags: 0x0},
-	238: {lang: 0x3c0, script: 0x5a, flags: 0x0},
-	240: {lang: 0x3a2, script: 0x5a, flags: 0x0},
-	241: {lang: 0x194, script: 0x5a, flags: 0x0},
-	243: {lang: 0x3a, script: 0x5, flags: 0x0},
-	258: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	260: {lang: 0x3d, script: 0x2, flags: 0x1},
-	261: {lang: 0x432, script: 0x20, flags: 0x0},
-	262: {lang: 0x3f, script: 0x2, flags: 0x1},
-	263: {lang: 0x3e5, script: 0x5a, flags: 0x0},
-	264: {lang: 0x3a, script: 0x5, flags: 0x0},
-	266: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	267: {lang: 0x3a, script: 0x5, flags: 0x0},
-	268: {lang: 0x41, script: 0x2, flags: 0x1},
-	271: {lang: 0x416, script: 0x5a, flags: 0x0},
-	272: {lang: 0x347, script: 0x5a, flags: 0x0},
-	273: {lang: 0x43, script: 0x2, flags: 0x1},
-	275: {lang: 0x1f9, script: 0x5a, flags: 0x0},
-	276: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	277: {lang: 0x429, script: 0x5a, flags: 0x0},
-	278: {lang: 0x367, script: 0x5a, flags: 0x0},
-	280: {lang: 0x3c0, script: 0x5a, flags: 0x0},
-	282: {lang: 0x13e, script: 0x5a, flags: 0x0},
-	284: {lang: 0x45, script: 0x2, flags: 0x1},
-	288: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	289: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	290: {lang: 0x47, script: 0x2, flags: 0x1},
-	291: {lang: 0x49, script: 0x3, flags: 0x1},
-	292: {lang: 0x4c, script: 0x2, flags: 0x1},
-	293: {lang: 0x477, script: 0x5a, flags: 0x0},
-	294: {lang: 0x3c0, script: 0x5a, flags: 0x0},
-	295: {lang: 0x476, script: 0x5a, flags: 0x0},
-	296: {lang: 0x4e, script: 0x2, flags: 0x1},
-	297: {lang: 0x482, script: 0x5a, flags: 0x0},
-	299: {lang: 0x50, script: 0x4, flags: 0x1},
-	301: {lang: 0x4a0, script: 0x5a, flags: 0x0},
-	302: {lang: 0x54, script: 0x2, flags: 0x1},
-	303: {lang: 0x445, script: 0x5a, flags: 0x0},
-	304: {lang: 0x56, script: 0x3, flags: 0x1},
-	305: {lang: 0x445, script: 0x5a, flags: 0x0},
-	309: {lang: 0x512, script: 0x3e, flags: 0x2},
-	310: {lang: 0x13e, script: 0x5a, flags: 0x0},
-	311: {lang: 0x4bc, script: 0x5a, flags: 0x0},
-	312: {lang: 0x1f9, script: 0x5a, flags: 0x0},
-	315: {lang: 0x13e, script: 0x5a, flags: 0x0},
-	318: {lang: 0x4c3, script: 0x5a, flags: 0x0},
-	319: {lang: 0x8a, script: 0x5a, flags: 0x0},
-	320: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	322: {lang: 0x41b, script: 0x5a, flags: 0x0},
-	333: {lang: 0x59, script: 0x2, flags: 0x1},
-	350: {lang: 0x3a, script: 0x5, flags: 0x0},
-	351: {lang: 0x5b, script: 0x2, flags: 0x1},
-	356: {lang: 0x423, script: 0x5a, flags: 0x0},
+	109: {lang: 0x3a, script: 0x5, flags: 0x0},
+	110: {lang: 0x46f, script: 0x2c, flags: 0x0},
+	111: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	112: {lang: 0x12, script: 0x2, flags: 0x1},
+	114: {lang: 0x10d, script: 0x5b, flags: 0x0},
+	115: {lang: 0x151, script: 0x5b, flags: 0x0},
+	116: {lang: 0x1c0, script: 0x22, flags: 0x2},
+	119: {lang: 0x158, script: 0x5b, flags: 0x0},
+	121: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	123: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	124: {lang: 0x14, script: 0x2, flags: 0x1},
+	126: {lang: 0x16, script: 0x3, flags: 0x1},
+	127: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	129: {lang: 0x21, script: 0x5b, flags: 0x0},
+	131: {lang: 0x245, script: 0x5b, flags: 0x0},
+	133: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	134: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	135: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	136: {lang: 0x19, script: 0x2, flags: 0x1},
+	137: {lang: 0x0, script: 0x5b, flags: 0x0},
+	138: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	140: {lang: 0x3c0, script: 0x5b, flags: 0x0},
+	142: {lang: 0x529, script: 0x3c, flags: 0x0},
+	143: {lang: 0x0, script: 0x5b, flags: 0x0},
+	144: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	145: {lang: 0x1d1, script: 0x5b, flags: 0x0},
+	146: {lang: 0x1d4, script: 0x5b, flags: 0x0},
+	147: {lang: 0x1d5, script: 0x5b, flags: 0x0},
+	149: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	150: {lang: 0x1b, script: 0x2, flags: 0x1},
+	152: {lang: 0x1bc, script: 0x3e, flags: 0x0},
+	154: {lang: 0x1d, script: 0x3, flags: 0x1},
+	156: {lang: 0x3a, script: 0x5, flags: 0x0},
+	157: {lang: 0x20, script: 0x2, flags: 0x1},
+	158: {lang: 0x1f8, script: 0x5b, flags: 0x0},
+	159: {lang: 0x1f9, script: 0x5b, flags: 0x0},
+	162: {lang: 0x3a, script: 0x5, flags: 0x0},
+	163: {lang: 0x200, script: 0x49, flags: 0x0},
+	165: {lang: 0x445, script: 0x5b, flags: 0x0},
+	166: {lang: 0x28a, script: 0x20, flags: 0x0},
+	167: {lang: 0x22, script: 0x3, flags: 0x1},
+	169: {lang: 0x25, script: 0x2, flags: 0x1},
+	171: {lang: 0x254, script: 0x54, flags: 0x0},
+	172: {lang: 0x254, script: 0x54, flags: 0x0},
+	173: {lang: 0x3a, script: 0x5, flags: 0x0},
+	175: {lang: 0x3e2, script: 0x20, flags: 0x0},
+	176: {lang: 0x27, script: 0x2, flags: 0x1},
+	177: {lang: 0x3a, script: 0x5, flags: 0x0},
+	179: {lang: 0x10d, script: 0x5b, flags: 0x0},
+	180: {lang: 0x40c, script: 0xd6, flags: 0x0},
+	182: {lang: 0x43b, script: 0x5b, flags: 0x0},
+	183: {lang: 0x2c0, script: 0x5b, flags: 0x0},
+	184: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	185: {lang: 0x2c7, script: 0x5b, flags: 0x0},
+	186: {lang: 0x3a, script: 0x5, flags: 0x0},
+	187: {lang: 0x29, script: 0x2, flags: 0x1},
+	188: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	189: {lang: 0x2b, script: 0x2, flags: 0x1},
+	190: {lang: 0x432, script: 0x5b, flags: 0x0},
+	191: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	192: {lang: 0x2f1, script: 0x5b, flags: 0x0},
+	195: {lang: 0x2d, script: 0x2, flags: 0x1},
+	196: {lang: 0xa0, script: 0x5b, flags: 0x0},
+	197: {lang: 0x2f, script: 0x2, flags: 0x1},
+	198: {lang: 0x31, script: 0x2, flags: 0x1},
+	199: {lang: 0x33, script: 0x2, flags: 0x1},
+	201: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	202: {lang: 0x35, script: 0x2, flags: 0x1},
+	204: {lang: 0x320, script: 0x5b, flags: 0x0},
+	205: {lang: 0x37, script: 0x3, flags: 0x1},
+	206: {lang: 0x128, script: 0xed, flags: 0x0},
+	208: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	209: {lang: 0x31f, script: 0x5b, flags: 0x0},
+	210: {lang: 0x3c0, script: 0x5b, flags: 0x0},
+	211: {lang: 0x16, script: 0x5b, flags: 0x0},
+	212: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	213: {lang: 0x1b4, script: 0x5b, flags: 0x0},
+	215: {lang: 0x1b4, script: 0x5, flags: 0x2},
+	217: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	218: {lang: 0x367, script: 0x5b, flags: 0x0},
+	219: {lang: 0x347, script: 0x5b, flags: 0x0},
+	220: {lang: 0x351, script: 0x22, flags: 0x0},
+	226: {lang: 0x3a, script: 0x5, flags: 0x0},
+	227: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	229: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	230: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	231: {lang: 0x486, script: 0x5b, flags: 0x0},
+	232: {lang: 0x153, script: 0x5b, flags: 0x0},
+	233: {lang: 0x3a, script: 0x3, flags: 0x1},
+	234: {lang: 0x3b3, script: 0x5b, flags: 0x0},
+	235: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	237: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	238: {lang: 0x3a, script: 0x5, flags: 0x0},
+	239: {lang: 0x3c0, script: 0x5b, flags: 0x0},
+	241: {lang: 0x3a2, script: 0x5b, flags: 0x0},
+	242: {lang: 0x194, script: 0x5b, flags: 0x0},
+	244: {lang: 0x3a, script: 0x5, flags: 0x0},
+	259: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	261: {lang: 0x3d, script: 0x2, flags: 0x1},
+	262: {lang: 0x432, script: 0x20, flags: 0x0},
+	263: {lang: 0x3f, script: 0x2, flags: 0x1},
+	264: {lang: 0x3e5, script: 0x5b, flags: 0x0},
+	265: {lang: 0x3a, script: 0x5, flags: 0x0},
+	267: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	268: {lang: 0x3a, script: 0x5, flags: 0x0},
+	269: {lang: 0x41, script: 0x2, flags: 0x1},
+	272: {lang: 0x416, script: 0x5b, flags: 0x0},
+	273: {lang: 0x347, script: 0x5b, flags: 0x0},
+	274: {lang: 0x43, script: 0x2, flags: 0x1},
+	276: {lang: 0x1f9, script: 0x5b, flags: 0x0},
+	277: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	278: {lang: 0x429, script: 0x5b, flags: 0x0},
+	279: {lang: 0x367, script: 0x5b, flags: 0x0},
+	281: {lang: 0x3c0, script: 0x5b, flags: 0x0},
+	283: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	285: {lang: 0x45, script: 0x2, flags: 0x1},
+	289: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	290: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	291: {lang: 0x47, script: 0x2, flags: 0x1},
+	292: {lang: 0x49, script: 0x3, flags: 0x1},
+	293: {lang: 0x4c, script: 0x2, flags: 0x1},
+	294: {lang: 0x477, script: 0x5b, flags: 0x0},
+	295: {lang: 0x3c0, script: 0x5b, flags: 0x0},
+	296: {lang: 0x476, script: 0x5b, flags: 0x0},
+	297: {lang: 0x4e, script: 0x2, flags: 0x1},
+	298: {lang: 0x482, script: 0x5b, flags: 0x0},
+	300: {lang: 0x50, script: 0x4, flags: 0x1},
+	302: {lang: 0x4a0, script: 0x5b, flags: 0x0},
+	303: {lang: 0x54, script: 0x2, flags: 0x1},
+	304: {lang: 0x445, script: 0x5b, flags: 0x0},
+	305: {lang: 0x56, script: 0x3, flags: 0x1},
+	306: {lang: 0x445, script: 0x5b, flags: 0x0},
+	310: {lang: 0x512, script: 0x3e, flags: 0x2},
+	311: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	312: {lang: 0x4bc, script: 0x5b, flags: 0x0},
+	313: {lang: 0x1f9, script: 0x5b, flags: 0x0},
+	316: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	319: {lang: 0x4c3, script: 0x5b, flags: 0x0},
+	320: {lang: 0x8a, script: 0x5b, flags: 0x0},
+	321: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	323: {lang: 0x41b, script: 0x5b, flags: 0x0},
+	334: {lang: 0x59, script: 0x2, flags: 0x1},
+	351: {lang: 0x3a, script: 0x5, flags: 0x0},
+	352: {lang: 0x5b, script: 0x2, flags: 0x1},
+	357: {lang: 0x423, script: 0x5b, flags: 0x0},
 }
 
 // likelyRegionList holds lists info associated with likelyRegion.
 // Size: 558 bytes, 93 elements
 var likelyRegionList = [93]likelyLangScript{
 	0:  {lang: 0x148, script: 0x5, flags: 0x0},
-	1:  {lang: 0x476, script: 0x5a, flags: 0x0},
-	2:  {lang: 0x431, script: 0x5a, flags: 0x0},
+	1:  {lang: 0x476, script: 0x5b, flags: 0x0},
+	2:  {lang: 0x431, script: 0x5b, flags: 0x0},
 	3:  {lang: 0x2ff, script: 0x20, flags: 0x0},
 	4:  {lang: 0x1d7, script: 0x8, flags: 0x0},
-	5:  {lang: 0x274, script: 0x5a, flags: 0x0},
-	6:  {lang: 0xb7, script: 0x5a, flags: 0x0},
+	5:  {lang: 0x274, script: 0x5b, flags: 0x0},
+	6:  {lang: 0xb7, script: 0x5b, flags: 0x0},
 	7:  {lang: 0x432, script: 0x20, flags: 0x0},
-	8:  {lang: 0x12d, script: 0xec, flags: 0x0},
+	8:  {lang: 0x12d, script: 0xef, flags: 0x0},
 	9:  {lang: 0x351, script: 0x22, flags: 0x0},
 	10: {lang: 0x529, script: 0x3b, flags: 0x0},
 	11: {lang: 0x4ac, script: 0x5, flags: 0x0},
-	12: {lang: 0x523, script: 0x5a, flags: 0x0},
-	13: {lang: 0x29a, script: 0xeb, flags: 0x0},
+	12: {lang: 0x523, script: 0x5b, flags: 0x0},
+	13: {lang: 0x29a, script: 0xee, flags: 0x0},
 	14: {lang: 0x136, script: 0x34, flags: 0x0},
-	15: {lang: 0x48a, script: 0x5a, flags: 0x0},
+	15: {lang: 0x48a, script: 0x5b, flags: 0x0},
 	16: {lang: 0x3a, script: 0x5, flags: 0x0},
-	17: {lang: 0x15e, script: 0x5a, flags: 0x0},
+	17: {lang: 0x15e, script: 0x5b, flags: 0x0},
 	18: {lang: 0x27, script: 0x2c, flags: 0x0},
-	19: {lang: 0x139, script: 0x5a, flags: 0x0},
+	19: {lang: 0x139, script: 0x5b, flags: 0x0},
 	20: {lang: 0x26a, script: 0x5, flags: 0x2},
 	21: {lang: 0x512, script: 0x3e, flags: 0x2},
 	22: {lang: 0x210, script: 0x2e, flags: 0x0},
 	23: {lang: 0x5, script: 0x20, flags: 0x0},
-	24: {lang: 0x274, script: 0x5a, flags: 0x0},
+	24: {lang: 0x274, script: 0x5b, flags: 0x0},
 	25: {lang: 0x136, script: 0x34, flags: 0x0},
 	26: {lang: 0x2ff, script: 0x20, flags: 0x0},
-	27: {lang: 0x1e1, script: 0x5a, flags: 0x0},
+	27: {lang: 0x1e1, script: 0x5b, flags: 0x0},
 	28: {lang: 0x31f, script: 0x5, flags: 0x0},
 	29: {lang: 0x1be, script: 0x22, flags: 0x0},
 	30: {lang: 0x4b4, script: 0x5, flags: 0x0},
-	31: {lang: 0x236, script: 0x75, flags: 0x0},
+	31: {lang: 0x236, script: 0x76, flags: 0x0},
 	32: {lang: 0x148, script: 0x5, flags: 0x0},
-	33: {lang: 0x476, script: 0x5a, flags: 0x0},
-	34: {lang: 0x24a, script: 0x4e, flags: 0x0},
+	33: {lang: 0x476, script: 0x5b, flags: 0x0},
+	34: {lang: 0x24a, script: 0x4f, flags: 0x0},
 	35: {lang: 0xe6, script: 0x5, flags: 0x0},
-	36: {lang: 0x226, script: 0xeb, flags: 0x0},
+	36: {lang: 0x226, script: 0xee, flags: 0x0},
 	37: {lang: 0x3a, script: 0x5, flags: 0x0},
-	38: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	39: {lang: 0x2b8, script: 0x57, flags: 0x0},
-	40: {lang: 0x226, script: 0xeb, flags: 0x0},
+	38: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	39: {lang: 0x2b8, script: 0x58, flags: 0x0},
+	40: {lang: 0x226, script: 0xee, flags: 0x0},
 	41: {lang: 0x3a, script: 0x5, flags: 0x0},
-	42: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	43: {lang: 0x3dc, script: 0x5a, flags: 0x0},
+	42: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	43: {lang: 0x3dc, script: 0x5b, flags: 0x0},
 	44: {lang: 0x4ae, script: 0x20, flags: 0x0},
 	45: {lang: 0x2ff, script: 0x20, flags: 0x0},
-	46: {lang: 0x431, script: 0x5a, flags: 0x0},
-	47: {lang: 0x331, script: 0x75, flags: 0x0},
-	48: {lang: 0x213, script: 0x5a, flags: 0x0},
+	46: {lang: 0x431, script: 0x5b, flags: 0x0},
+	47: {lang: 0x331, script: 0x76, flags: 0x0},
+	48: {lang: 0x213, script: 0x5b, flags: 0x0},
 	49: {lang: 0x30b, script: 0x20, flags: 0x0},
 	50: {lang: 0x242, script: 0x5, flags: 0x0},
 	51: {lang: 0x529, script: 0x3c, flags: 0x0},
-	52: {lang: 0x3c0, script: 0x5a, flags: 0x0},
+	52: {lang: 0x3c0, script: 0x5b, flags: 0x0},
 	53: {lang: 0x3a, script: 0x5, flags: 0x0},
-	54: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	55: {lang: 0x2ed, script: 0x5a, flags: 0x0},
+	54: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	55: {lang: 0x2ed, script: 0x5b, flags: 0x0},
 	56: {lang: 0x4b4, script: 0x5, flags: 0x0},
 	57: {lang: 0x88, script: 0x22, flags: 0x0},
 	58: {lang: 0x4b4, script: 0x5, flags: 0x0},
 	59: {lang: 0x4b4, script: 0x5, flags: 0x0},
 	60: {lang: 0xbe, script: 0x22, flags: 0x0},
-	61: {lang: 0x3dc, script: 0x5a, flags: 0x0},
+	61: {lang: 0x3dc, script: 0x5b, flags: 0x0},
 	62: {lang: 0x7e, script: 0x20, flags: 0x0},
 	63: {lang: 0x3e2, script: 0x20, flags: 0x0},
-	64: {lang: 0x267, script: 0x5a, flags: 0x0},
-	65: {lang: 0x444, script: 0x5a, flags: 0x0},
+	64: {lang: 0x267, script: 0x5b, flags: 0x0},
+	65: {lang: 0x444, script: 0x5b, flags: 0x0},
 	66: {lang: 0x512, script: 0x3e, flags: 0x0},
-	67: {lang: 0x412, script: 0x5a, flags: 0x0},
+	67: {lang: 0x412, script: 0x5b, flags: 0x0},
 	68: {lang: 0x4ae, script: 0x20, flags: 0x0},
 	69: {lang: 0x3a, script: 0x5, flags: 0x0},
-	70: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	71: {lang: 0x15e, script: 0x5a, flags: 0x0},
+	70: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	71: {lang: 0x15e, script: 0x5b, flags: 0x0},
 	72: {lang: 0x35, script: 0x5, flags: 0x0},
-	73: {lang: 0x46b, script: 0xeb, flags: 0x0},
+	73: {lang: 0x46b, script: 0xee, flags: 0x0},
 	74: {lang: 0x2ec, script: 0x5, flags: 0x0},
-	75: {lang: 0x30f, script: 0x75, flags: 0x0},
+	75: {lang: 0x30f, script: 0x76, flags: 0x0},
 	76: {lang: 0x467, script: 0x20, flags: 0x0},
 	77: {lang: 0x148, script: 0x5, flags: 0x0},
 	78: {lang: 0x3a, script: 0x5, flags: 0x0},
-	79: {lang: 0x15e, script: 0x5a, flags: 0x0},
-	80: {lang: 0x48a, script: 0x5a, flags: 0x0},
+	79: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	80: {lang: 0x48a, script: 0x5b, flags: 0x0},
 	81: {lang: 0x58, script: 0x5, flags: 0x0},
 	82: {lang: 0x219, script: 0x20, flags: 0x0},
 	83: {lang: 0x81, script: 0x34, flags: 0x0},
 	84: {lang: 0x529, script: 0x3c, flags: 0x0},
-	85: {lang: 0x48c, script: 0x5a, flags: 0x0},
+	85: {lang: 0x48c, script: 0x5b, flags: 0x0},
 	86: {lang: 0x4ae, script: 0x20, flags: 0x0},
 	87: {lang: 0x512, script: 0x3e, flags: 0x0},
-	88: {lang: 0x3b3, script: 0x5a, flags: 0x0},
-	89: {lang: 0x431, script: 0x5a, flags: 0x0},
+	88: {lang: 0x3b3, script: 0x5b, flags: 0x0},
+	89: {lang: 0x431, script: 0x5b, flags: 0x0},
 	90: {lang: 0x432, script: 0x20, flags: 0x0},
-	91: {lang: 0x15e, script: 0x5a, flags: 0x0},
+	91: {lang: 0x15e, script: 0x5b, flags: 0x0},
 	92: {lang: 0x446, script: 0x5, flags: 0x0},
 }
 
@@ -3298,38 +3320,38 @@ type likelyTag struct {
 
 // Size: 198 bytes, 33 elements
 var likelyRegionGroup = [33]likelyTag{
-	1:  {lang: 0x139, region: 0xd6, script: 0x5a},
-	2:  {lang: 0x139, region: 0x135, script: 0x5a},
-	3:  {lang: 0x3c0, region: 0x41, script: 0x5a},
-	4:  {lang: 0x139, region: 0x2f, script: 0x5a},
-	5:  {lang: 0x139, region: 0xd6, script: 0x5a},
-	6:  {lang: 0x13e, region: 0xcf, script: 0x5a},
-	7:  {lang: 0x445, region: 0x12f, script: 0x5a},
-	8:  {lang: 0x3a, region: 0x6b, script: 0x5},
-	9:  {lang: 0x445, region: 0x4b, script: 0x5a},
-	10: {lang: 0x139, region: 0x161, script: 0x5a},
-	11: {lang: 0x139, region: 0x135, script: 0x5a},
-	12: {lang: 0x139, region: 0x135, script: 0x5a},
-	13: {lang: 0x13e, region: 0x59, script: 0x5a},
+	1:  {lang: 0x139, region: 0xd7, script: 0x5b},
+	2:  {lang: 0x139, region: 0x136, script: 0x5b},
+	3:  {lang: 0x3c0, region: 0x41, script: 0x5b},
+	4:  {lang: 0x139, region: 0x2f, script: 0x5b},
+	5:  {lang: 0x139, region: 0xd7, script: 0x5b},
+	6:  {lang: 0x13e, region: 0xd0, script: 0x5b},
+	7:  {lang: 0x445, region: 0x130, script: 0x5b},
+	8:  {lang: 0x3a, region: 0x6c, script: 0x5},
+	9:  {lang: 0x445, region: 0x4b, script: 0x5b},
+	10: {lang: 0x139, region: 0x162, script: 0x5b},
+	11: {lang: 0x139, region: 0x136, script: 0x5b},
+	12: {lang: 0x139, region: 0x136, script: 0x5b},
+	13: {lang: 0x13e, region: 0x5a, script: 0x5b},
 	14: {lang: 0x529, region: 0x53, script: 0x3b},
-	15: {lang: 0x1be, region: 0x99, script: 0x22},
-	16: {lang: 0x1e1, region: 0x95, script: 0x5a},
-	17: {lang: 0x1f9, region: 0x9e, script: 0x5a},
-	18: {lang: 0x139, region: 0x2f, script: 0x5a},
-	19: {lang: 0x139, region: 0xe6, script: 0x5a},
-	20: {lang: 0x139, region: 0x8a, script: 0x5a},
-	21: {lang: 0x41b, region: 0x142, script: 0x5a},
+	15: {lang: 0x1be, region: 0x9a, script: 0x22},
+	16: {lang: 0x1e1, region: 0x96, script: 0x5b},
+	17: {lang: 0x1f9, region: 0x9f, script: 0x5b},
+	18: {lang: 0x139, region: 0x2f, script: 0x5b},
+	19: {lang: 0x139, region: 0xe7, script: 0x5b},
+	20: {lang: 0x139, region: 0x8b, script: 0x5b},
+	21: {lang: 0x41b, region: 0x143, script: 0x5b},
 	22: {lang: 0x529, region: 0x53, script: 0x3b},
-	23: {lang: 0x4bc, region: 0x137, script: 0x5a},
-	24: {lang: 0x3a, region: 0x108, script: 0x5},
-	25: {lang: 0x3e2, region: 0x106, script: 0x20},
-	26: {lang: 0x3e2, region: 0x106, script: 0x20},
-	27: {lang: 0x139, region: 0x7b, script: 0x5a},
-	28: {lang: 0x10d, region: 0x60, script: 0x5a},
-	29: {lang: 0x139, region: 0xd6, script: 0x5a},
-	30: {lang: 0x13e, region: 0x1f, script: 0x5a},
-	31: {lang: 0x139, region: 0x9a, script: 0x5a},
-	32: {lang: 0x139, region: 0x7b, script: 0x5a},
+	23: {lang: 0x4bc, region: 0x138, script: 0x5b},
+	24: {lang: 0x3a, region: 0x109, script: 0x5},
+	25: {lang: 0x3e2, region: 0x107, script: 0x20},
+	26: {lang: 0x3e2, region: 0x107, script: 0x20},
+	27: {lang: 0x139, region: 0x7c, script: 0x5b},
+	28: {lang: 0x10d, region: 0x61, script: 0x5b},
+	29: {lang: 0x139, region: 0xd7, script: 0x5b},
+	30: {lang: 0x13e, region: 0x1f, script: 0x5b},
+	31: {lang: 0x139, region: 0x9b, script: 0x5b},
+	32: {lang: 0x139, region: 0x7c, script: 0x5b},
 }
 
 // Size: 264 bytes, 33 elements
@@ -3350,8 +3372,8 @@ var regionContainment = [33]uint64{
 // regionInclusion maps region identifiers to sets of regions in regionInclusionBits,
 // where each set holds all groupings that are directly connected in a region
 // containment graph.
-// Size: 358 bytes, 358 elements
-var regionInclusion = [358]uint8{
+// Size: 359 bytes, 359 elements
+var regionInclusion = [359]uint8{
 	// Entry 0 - 3F
 	0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
 	0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
@@ -3364,45 +3386,45 @@ var regionInclusion = [358]uint8{
 	// Entry 40 - 7F
 	0x26, 0x28, 0x26, 0x25, 0x31, 0x22, 0x32, 0x33,
 	0x34, 0x30, 0x22, 0x27, 0x27, 0x27, 0x35, 0x2d,
-	0x29, 0x28, 0x27, 0x36, 0x28, 0x22, 0x34, 0x23,
-	0x21, 0x26, 0x2d, 0x26, 0x22, 0x37, 0x2e, 0x35,
-	0x2a, 0x22, 0x2f, 0x38, 0x26, 0x26, 0x21, 0x39,
-	0x39, 0x28, 0x38, 0x39, 0x39, 0x2f, 0x3a, 0x2f,
-	0x20, 0x21, 0x38, 0x3b, 0x28, 0x3c, 0x2c, 0x21,
-	0x2a, 0x35, 0x27, 0x38, 0x26, 0x24, 0x28, 0x2c,
+	0x29, 0x28, 0x27, 0x36, 0x28, 0x22, 0x21, 0x34,
+	0x23, 0x21, 0x26, 0x2d, 0x26, 0x22, 0x37, 0x2e,
+	0x35, 0x2a, 0x22, 0x2f, 0x38, 0x26, 0x26, 0x21,
+	0x39, 0x39, 0x28, 0x38, 0x39, 0x39, 0x2f, 0x3a,
+	0x2f, 0x20, 0x21, 0x38, 0x3b, 0x28, 0x3c, 0x2c,
+	0x21, 0x2a, 0x35, 0x27, 0x38, 0x26, 0x24, 0x28,
 	// Entry 80 - BF
-	0x2d, 0x23, 0x30, 0x2d, 0x2d, 0x26, 0x27, 0x3a,
-	0x22, 0x34, 0x3c, 0x2d, 0x28, 0x36, 0x22, 0x34,
-	0x3a, 0x26, 0x2e, 0x21, 0x39, 0x31, 0x38, 0x24,
-	0x2c, 0x25, 0x22, 0x24, 0x25, 0x2c, 0x3a, 0x2c,
-	0x26, 0x24, 0x36, 0x21, 0x2f, 0x3d, 0x31, 0x3c,
-	0x2f, 0x26, 0x36, 0x36, 0x24, 0x26, 0x3d, 0x31,
-	0x24, 0x26, 0x35, 0x25, 0x2d, 0x32, 0x38, 0x2a,
-	0x38, 0x39, 0x39, 0x35, 0x33, 0x23, 0x26, 0x2f,
+	0x2c, 0x2d, 0x23, 0x30, 0x2d, 0x2d, 0x26, 0x27,
+	0x3a, 0x22, 0x34, 0x3c, 0x2d, 0x28, 0x36, 0x22,
+	0x34, 0x3a, 0x26, 0x2e, 0x21, 0x39, 0x31, 0x38,
+	0x24, 0x2c, 0x25, 0x22, 0x24, 0x25, 0x2c, 0x3a,
+	0x2c, 0x26, 0x24, 0x36, 0x21, 0x2f, 0x3d, 0x31,
+	0x3c, 0x2f, 0x26, 0x36, 0x36, 0x24, 0x26, 0x3d,
+	0x31, 0x24, 0x26, 0x35, 0x25, 0x2d, 0x32, 0x38,
+	0x2a, 0x38, 0x39, 0x39, 0x35, 0x33, 0x23, 0x26,
 	// Entry C0 - FF
-	0x3c, 0x21, 0x23, 0x2d, 0x31, 0x36, 0x36, 0x3c,
-	0x26, 0x2d, 0x26, 0x3a, 0x2f, 0x25, 0x2f, 0x34,
-	0x31, 0x2f, 0x32, 0x3b, 0x2d, 0x2b, 0x2d, 0x21,
-	0x34, 0x2a, 0x2c, 0x25, 0x21, 0x3c, 0x24, 0x29,
-	0x2b, 0x24, 0x34, 0x21, 0x28, 0x29, 0x3b, 0x31,
-	0x25, 0x2e, 0x30, 0x29, 0x26, 0x24, 0x3a, 0x21,
-	0x3c, 0x28, 0x21, 0x24, 0x21, 0x21, 0x1f, 0x21,
+	0x2f, 0x3c, 0x21, 0x23, 0x2d, 0x31, 0x36, 0x36,
+	0x3c, 0x26, 0x2d, 0x26, 0x3a, 0x2f, 0x25, 0x2f,
+	0x34, 0x31, 0x2f, 0x32, 0x3b, 0x2d, 0x2b, 0x2d,
+	0x21, 0x34, 0x2a, 0x2c, 0x25, 0x21, 0x3c, 0x24,
+	0x29, 0x2b, 0x24, 0x34, 0x21, 0x28, 0x29, 0x3b,
+	0x31, 0x25, 0x2e, 0x30, 0x29, 0x26, 0x24, 0x3a,
+	0x21, 0x3c, 0x28, 0x21, 0x24, 0x21, 0x21, 0x1f,
 	0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21,
 	// Entry 100 - 13F
-	0x21, 0x21, 0x2f, 0x21, 0x2e, 0x23, 0x33, 0x2f,
-	0x24, 0x3b, 0x2f, 0x39, 0x38, 0x31, 0x2d, 0x3a,
-	0x2c, 0x2e, 0x2d, 0x23, 0x2d, 0x2f, 0x28, 0x2f,
-	0x27, 0x33, 0x34, 0x26, 0x24, 0x32, 0x22, 0x26,
-	0x27, 0x22, 0x2d, 0x31, 0x3d, 0x29, 0x31, 0x3d,
-	0x39, 0x29, 0x31, 0x24, 0x26, 0x29, 0x36, 0x2f,
-	0x33, 0x2f, 0x21, 0x22, 0x21, 0x30, 0x28, 0x3d,
-	0x23, 0x26, 0x21, 0x28, 0x26, 0x26, 0x31, 0x3b,
+	0x21, 0x21, 0x21, 0x2f, 0x21, 0x2e, 0x23, 0x33,
+	0x2f, 0x24, 0x3b, 0x2f, 0x39, 0x38, 0x31, 0x2d,
+	0x3a, 0x2c, 0x2e, 0x2d, 0x23, 0x2d, 0x2f, 0x28,
+	0x2f, 0x27, 0x33, 0x34, 0x26, 0x24, 0x32, 0x22,
+	0x26, 0x27, 0x22, 0x2d, 0x31, 0x3d, 0x29, 0x31,
+	0x3d, 0x39, 0x29, 0x31, 0x24, 0x26, 0x29, 0x36,
+	0x2f, 0x33, 0x2f, 0x21, 0x22, 0x21, 0x30, 0x28,
+	0x3d, 0x23, 0x26, 0x21, 0x28, 0x26, 0x26, 0x31,
 	// Entry 140 - 17F
-	0x29, 0x21, 0x29, 0x21, 0x21, 0x21, 0x21, 0x21,
-	0x21, 0x21, 0x21, 0x21, 0x21, 0x23, 0x21, 0x21,
+	0x3b, 0x29, 0x21, 0x29, 0x21, 0x21, 0x21, 0x21,
+	0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x23, 0x21,
 	0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21,
-	0x21, 0x21, 0x21, 0x21, 0x21, 0x24, 0x24, 0x2f,
-	0x23, 0x32, 0x2f, 0x27, 0x2f, 0x21,
+	0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x24, 0x24,
+	0x2f, 0x23, 0x32, 0x2f, 0x27, 0x2f, 0x21,
 }
 
 // regionInclusionBits is an array of bit vectors where every vector represents
@@ -3462,11 +3484,11 @@ type parentRel struct {
 
 // Size: 414 bytes, 5 elements
 var parents = [5]parentRel{
-	0: {lang: 0x139, script: 0x0, maxScript: 0x5a, toRegion: 0x1, fromRegion: []uint16{0x1a, 0x25, 0x26, 0x2f, 0x34, 0x36, 0x3d, 0x42, 0x46, 0x48, 0x49, 0x4a, 0x50, 0x52, 0x5c, 0x5d, 0x61, 0x64, 0x6d, 0x73, 0x74, 0x75, 0x7b, 0x7c, 0x7f, 0x80, 0x81, 0x83, 0x8c, 0x8d, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9f, 0xa0, 0xa4, 0xa7, 0xa9, 0xad, 0xb1, 0xb4, 0xb5, 0xbf, 0xc6, 0xca, 0xcb, 0xcc, 0xce, 0xd0, 0xd2, 0xd5, 0xd6, 0xdd, 0xdf, 0xe0, 0xe6, 0xe7, 0xe8, 0xeb, 0xf0, 0x107, 0x109, 0x10a, 0x10b, 0x10d, 0x10e, 0x112, 0x117, 0x11b, 0x11d, 0x11f, 0x125, 0x129, 0x12c, 0x12d, 0x12f, 0x131, 0x139, 0x13c, 0x13f, 0x142, 0x161, 0x162, 0x164}},
-	1: {lang: 0x139, script: 0x0, maxScript: 0x5a, toRegion: 0x1a, fromRegion: []uint16{0x2e, 0x4e, 0x60, 0x63, 0x72, 0xd9, 0x10c, 0x10f}},
-	2: {lang: 0x13e, script: 0x0, maxScript: 0x5a, toRegion: 0x1f, fromRegion: []uint16{0x2c, 0x3f, 0x41, 0x48, 0x51, 0x54, 0x56, 0x59, 0x65, 0x69, 0x89, 0x8f, 0xcf, 0xd8, 0xe2, 0xe4, 0xec, 0xf1, 0x11a, 0x135, 0x136, 0x13b}},
-	3: {lang: 0x3c0, script: 0x0, maxScript: 0x5a, toRegion: 0xee, fromRegion: []uint16{0x2a, 0x4e, 0x5a, 0x86, 0x8b, 0xb7, 0xc6, 0xd1, 0x118, 0x126}},
-	4: {lang: 0x529, script: 0x3c, maxScript: 0x3c, toRegion: 0x8d, fromRegion: []uint16{0xc6}},
+	0: {lang: 0x139, script: 0x0, maxScript: 0x5b, toRegion: 0x1, fromRegion: []uint16{0x1a, 0x25, 0x26, 0x2f, 0x34, 0x36, 0x3d, 0x42, 0x46, 0x48, 0x49, 0x4a, 0x50, 0x52, 0x5d, 0x5e, 0x62, 0x65, 0x6e, 0x74, 0x75, 0x76, 0x7c, 0x7d, 0x80, 0x81, 0x82, 0x84, 0x8d, 0x8e, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0xa0, 0xa1, 0xa5, 0xa8, 0xaa, 0xae, 0xb2, 0xb5, 0xb6, 0xc0, 0xc7, 0xcb, 0xcc, 0xcd, 0xcf, 0xd1, 0xd3, 0xd6, 0xd7, 0xde, 0xe0, 0xe1, 0xe7, 0xe8, 0xe9, 0xec, 0xf1, 0x108, 0x10a, 0x10b, 0x10c, 0x10e, 0x10f, 0x113, 0x118, 0x11c, 0x11e, 0x120, 0x126, 0x12a, 0x12d, 0x12e, 0x130, 0x132, 0x13a, 0x13d, 0x140, 0x143, 0x162, 0x163, 0x165}},
+	1: {lang: 0x139, script: 0x0, maxScript: 0x5b, toRegion: 0x1a, fromRegion: []uint16{0x2e, 0x4e, 0x61, 0x64, 0x73, 0xda, 0x10d, 0x110}},
+	2: {lang: 0x13e, script: 0x0, maxScript: 0x5b, toRegion: 0x1f, fromRegion: []uint16{0x2c, 0x3f, 0x41, 0x48, 0x51, 0x54, 0x57, 0x5a, 0x66, 0x6a, 0x8a, 0x90, 0xd0, 0xd9, 0xe3, 0xe5, 0xed, 0xf2, 0x11b, 0x136, 0x137, 0x13c}},
+	3: {lang: 0x3c0, script: 0x0, maxScript: 0x5b, toRegion: 0xef, fromRegion: []uint16{0x2a, 0x4e, 0x5b, 0x87, 0x8c, 0xb8, 0xc7, 0xd2, 0x119, 0x127}},
+	4: {lang: 0x529, script: 0x3c, maxScript: 0x3c, toRegion: 0x8e, fromRegion: []uint16{0xc7}},
 }
 
-// Total table size 30244 bytes (29KiB); checksum: B6B15F30
+// Total table size 30466 bytes (29KiB); checksum: 7544152B
diff --git a/vendor/golang.org/x/text/language/match.go b/vendor/golang.org/x/text/language/match.go
index ee45f494..1153baf2 100644
--- a/vendor/golang.org/x/text/language/match.go
+++ b/vendor/golang.org/x/text/language/match.go
@@ -434,7 +434,7 @@ func newMatcher(supported []Tag, options []MatchOption) *matcher {
 	// (their canonicalization simply substitutes a different language code, but
 	// nothing else), the match confidence is Exact, otherwise it is High.
 	for i, lm := range language.AliasMap {
-		// If deprecated codes match and there is no fiddling with the script or
+		// If deprecated codes match and there is no fiddling with the script
 		// or region, we consider it an exact match.
 		conf := Exact
 		if language.AliasTypes[i] != language.Macro {
diff --git a/vendor/golang.org/x/text/language/tables.go b/vendor/golang.org/x/text/language/tables.go
index 34a732b6..a6573dcb 100644
--- a/vendor/golang.org/x/text/language/tables.go
+++ b/vendor/golang.org/x/text/language/tables.go
@@ -23,31 +23,31 @@ const (
 	_419 = 31
 	_BR  = 65
 	_CA  = 73
-	_ES  = 110
-	_GB  = 123
-	_MD  = 188
-	_PT  = 238
-	_UK  = 306
-	_US  = 309
-	_ZZ  = 357
-	_XA  = 323
-	_XC  = 325
-	_XK  = 333
+	_ES  = 111
+	_GB  = 124
+	_MD  = 189
+	_PT  = 239
+	_UK  = 307
+	_US  = 310
+	_ZZ  = 358
+	_XA  = 324
+	_XC  = 326
+	_XK  = 334
 )
 const (
-	_Latn = 90
+	_Latn = 91
 	_Hani = 57
 	_Hans = 59
 	_Hant = 60
-	_Qaaa = 147
-	_Qaai = 155
-	_Qabx = 196
-	_Zinh = 252
-	_Zyyy = 257
-	_Zzzz = 258
+	_Qaaa = 149
+	_Qaai = 157
+	_Qabx = 198
+	_Zinh = 255
+	_Zyyy = 260
+	_Zzzz = 261
 )
 
-var regionToGroups = []uint8{ // 358 elements
+var regionToGroups = []uint8{ // 359 elements
 	// Entry 0 - 3F
 	0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x04,
 	0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x00,
@@ -60,51 +60,51 @@ var regionToGroups = []uint8{ // 358 elements
 	// Entry 40 - 7F
 	0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x04, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00,
-	0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x08,
-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00,
-	// Entry 80 - BF
-	0x00, 0x00, 0x04, 0x00, 0x00, 0x04, 0x00, 0x00,
-	0x00, 0x04, 0x01, 0x00, 0x04, 0x02, 0x00, 0x04,
-	0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
-	0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x08, 0x08, 0x00, 0x00, 0x00, 0x04, 0x00,
-	// Entry C0 - FF
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01,
-	0x04, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x04,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x04, 0x00, 0x00, 0x04, 0x00, 0x00, 0x04,
 	0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x04, 0x00, 0x05, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00,
+	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04,
+	// Entry 80 - BF
+	0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x04, 0x00,
+	0x00, 0x00, 0x04, 0x01, 0x00, 0x04, 0x02, 0x00,
+	0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00,
+	0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x00, 0x04,
+	// Entry C0 - FF
+	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
+	0x01, 0x04, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x04, 0x00, 0x05, 0x00, 0x00,
+	0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	// Entry 100 - 13F
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00,
-	0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x04,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x01, 0x00, 0x05, 0x04, 0x00,
-	0x00, 0x04, 0x00, 0x04, 0x04, 0x05, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
+	0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x05, 0x04,
+	0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x05, 0x00,
 	// Entry 140 - 17F
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-} // Size: 382 bytes
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+} // Size: 383 bytes
 
 var paradigmLocales = [][3]uint16{ // 3 elements
-	0: [3]uint16{0x139, 0x0, 0x7b},
+	0: [3]uint16{0x139, 0x0, 0x7c},
 	1: [3]uint16{0x13e, 0x0, 0x1f},
-	2: [3]uint16{0x3c0, 0x41, 0xee},
+	2: [3]uint16{0x3c0, 0x41, 0xef},
 } // Size: 42 bytes
 
 type mutualIntelligibility struct {
@@ -249,30 +249,30 @@ var matchLang = []mutualIntelligibility{ // 113 elements
 // matchScript holds pairs of scriptIDs where readers of one script
 // can typically also read the other. Each is associated with a confidence.
 var matchScript = []scriptIntelligibility{ // 26 elements
-	0:  {wantLang: 0x432, haveLang: 0x432, wantScript: 0x5a, haveScript: 0x20, distance: 0x5},
-	1:  {wantLang: 0x432, haveLang: 0x432, wantScript: 0x20, haveScript: 0x5a, distance: 0x5},
-	2:  {wantLang: 0x58, haveLang: 0x3e2, wantScript: 0x5a, haveScript: 0x20, distance: 0xa},
-	3:  {wantLang: 0xa5, haveLang: 0x139, wantScript: 0xe, haveScript: 0x5a, distance: 0xa},
+	0:  {wantLang: 0x432, haveLang: 0x432, wantScript: 0x5b, haveScript: 0x20, distance: 0x5},
+	1:  {wantLang: 0x432, haveLang: 0x432, wantScript: 0x20, haveScript: 0x5b, distance: 0x5},
+	2:  {wantLang: 0x58, haveLang: 0x3e2, wantScript: 0x5b, haveScript: 0x20, distance: 0xa},
+	3:  {wantLang: 0xa5, haveLang: 0x139, wantScript: 0xe, haveScript: 0x5b, distance: 0xa},
 	4:  {wantLang: 0x1d7, haveLang: 0x3e2, wantScript: 0x8, haveScript: 0x20, distance: 0xa},
-	5:  {wantLang: 0x210, haveLang: 0x139, wantScript: 0x2e, haveScript: 0x5a, distance: 0xa},
-	6:  {wantLang: 0x24a, haveLang: 0x139, wantScript: 0x4e, haveScript: 0x5a, distance: 0xa},
-	7:  {wantLang: 0x251, haveLang: 0x139, wantScript: 0x52, haveScript: 0x5a, distance: 0xa},
-	8:  {wantLang: 0x2b8, haveLang: 0x139, wantScript: 0x57, haveScript: 0x5a, distance: 0xa},
-	9:  {wantLang: 0x304, haveLang: 0x139, wantScript: 0x6e, haveScript: 0x5a, distance: 0xa},
-	10: {wantLang: 0x331, haveLang: 0x139, wantScript: 0x75, haveScript: 0x5a, distance: 0xa},
-	11: {wantLang: 0x351, haveLang: 0x139, wantScript: 0x22, haveScript: 0x5a, distance: 0xa},
-	12: {wantLang: 0x395, haveLang: 0x139, wantScript: 0x81, haveScript: 0x5a, distance: 0xa},
-	13: {wantLang: 0x39d, haveLang: 0x139, wantScript: 0x36, haveScript: 0x5a, distance: 0xa},
-	14: {wantLang: 0x3be, haveLang: 0x139, wantScript: 0x5, haveScript: 0x5a, distance: 0xa},
-	15: {wantLang: 0x3fa, haveLang: 0x139, wantScript: 0x5, haveScript: 0x5a, distance: 0xa},
-	16: {wantLang: 0x40c, haveLang: 0x139, wantScript: 0xd4, haveScript: 0x5a, distance: 0xa},
-	17: {wantLang: 0x450, haveLang: 0x139, wantScript: 0xe3, haveScript: 0x5a, distance: 0xa},
-	18: {wantLang: 0x461, haveLang: 0x139, wantScript: 0xe6, haveScript: 0x5a, distance: 0xa},
-	19: {wantLang: 0x46f, haveLang: 0x139, wantScript: 0x2c, haveScript: 0x5a, distance: 0xa},
-	20: {wantLang: 0x476, haveLang: 0x3e2, wantScript: 0x5a, haveScript: 0x20, distance: 0xa},
-	21: {wantLang: 0x4b4, haveLang: 0x139, wantScript: 0x5, haveScript: 0x5a, distance: 0xa},
-	22: {wantLang: 0x4bc, haveLang: 0x3e2, wantScript: 0x5a, haveScript: 0x20, distance: 0xa},
-	23: {wantLang: 0x512, haveLang: 0x139, wantScript: 0x3e, haveScript: 0x5a, distance: 0xa},
+	5:  {wantLang: 0x210, haveLang: 0x139, wantScript: 0x2e, haveScript: 0x5b, distance: 0xa},
+	6:  {wantLang: 0x24a, haveLang: 0x139, wantScript: 0x4f, haveScript: 0x5b, distance: 0xa},
+	7:  {wantLang: 0x251, haveLang: 0x139, wantScript: 0x53, haveScript: 0x5b, distance: 0xa},
+	8:  {wantLang: 0x2b8, haveLang: 0x139, wantScript: 0x58, haveScript: 0x5b, distance: 0xa},
+	9:  {wantLang: 0x304, haveLang: 0x139, wantScript: 0x6f, haveScript: 0x5b, distance: 0xa},
+	10: {wantLang: 0x331, haveLang: 0x139, wantScript: 0x76, haveScript: 0x5b, distance: 0xa},
+	11: {wantLang: 0x351, haveLang: 0x139, wantScript: 0x22, haveScript: 0x5b, distance: 0xa},
+	12: {wantLang: 0x395, haveLang: 0x139, wantScript: 0x83, haveScript: 0x5b, distance: 0xa},
+	13: {wantLang: 0x39d, haveLang: 0x139, wantScript: 0x36, haveScript: 0x5b, distance: 0xa},
+	14: {wantLang: 0x3be, haveLang: 0x139, wantScript: 0x5, haveScript: 0x5b, distance: 0xa},
+	15: {wantLang: 0x3fa, haveLang: 0x139, wantScript: 0x5, haveScript: 0x5b, distance: 0xa},
+	16: {wantLang: 0x40c, haveLang: 0x139, wantScript: 0xd6, haveScript: 0x5b, distance: 0xa},
+	17: {wantLang: 0x450, haveLang: 0x139, wantScript: 0xe6, haveScript: 0x5b, distance: 0xa},
+	18: {wantLang: 0x461, haveLang: 0x139, wantScript: 0xe9, haveScript: 0x5b, distance: 0xa},
+	19: {wantLang: 0x46f, haveLang: 0x139, wantScript: 0x2c, haveScript: 0x5b, distance: 0xa},
+	20: {wantLang: 0x476, haveLang: 0x3e2, wantScript: 0x5b, haveScript: 0x20, distance: 0xa},
+	21: {wantLang: 0x4b4, haveLang: 0x139, wantScript: 0x5, haveScript: 0x5b, distance: 0xa},
+	22: {wantLang: 0x4bc, haveLang: 0x3e2, wantScript: 0x5b, haveScript: 0x20, distance: 0xa},
+	23: {wantLang: 0x512, haveLang: 0x139, wantScript: 0x3e, haveScript: 0x5b, distance: 0xa},
 	24: {wantLang: 0x529, haveLang: 0x529, wantScript: 0x3b, haveScript: 0x3c, distance: 0xf},
 	25: {wantLang: 0x529, haveLang: 0x529, wantScript: 0x3c, haveScript: 0x3b, distance: 0x13},
 } // Size: 232 bytes
@@ -295,4 +295,4 @@ var matchRegion = []regionIntelligibility{ // 15 elements
 	14: {lang: 0x529, script: 0x3c, group: 0x80, distance: 0x5},
 } // Size: 114 bytes
 
-// Total table size 1472 bytes (1KiB); checksum: F86C669
+// Total table size 1473 bytes (1KiB); checksum: 7BB90B5C
diff --git a/vendor/golang.org/x/text/unicode/bidi/tables13.0.0.go b/vendor/golang.org/x/text/unicode/bidi/tables13.0.0.go
index f248effa..ffadb7be 100644
--- a/vendor/golang.org/x/text/unicode/bidi/tables13.0.0.go
+++ b/vendor/golang.org/x/text/unicode/bidi/tables13.0.0.go
@@ -1,7 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
-//go:build go1.16
-// +build go1.16
+//go:build go1.16 && !go1.21
+// +build go1.16,!go1.21
 
 package bidi
 
diff --git a/vendor/golang.org/x/text/unicode/bidi/tables15.0.0.go b/vendor/golang.org/x/text/unicode/bidi/tables15.0.0.go
new file mode 100644
index 00000000..92cce580
--- /dev/null
+++ b/vendor/golang.org/x/text/unicode/bidi/tables15.0.0.go
@@ -0,0 +1,2043 @@
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
+
+//go:build go1.21
+// +build go1.21
+
+package bidi
+
+// UnicodeVersion is the Unicode version from which the tables in this package are derived.
+const UnicodeVersion = "15.0.0"
+
+// xorMasks contains masks to be xor-ed with brackets to get the reverse
+// version.
+var xorMasks = []int32{ // 8 elements
+	0, 1, 6, 7, 3, 15, 29, 63,
+} // Size: 56 bytes
+
+// lookup returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *bidiTrie) lookup(s []byte) (v uint8, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return bidiValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := bidiIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := bidiIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = bidiIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := bidiIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = bidiIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = bidiIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *bidiTrie) lookupUnsafe(s []byte) uint8 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return bidiValues[c0]
+	}
+	i := bidiIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = bidiIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = bidiIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// lookupString returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *bidiTrie) lookupString(s string) (v uint8, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return bidiValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := bidiIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := bidiIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = bidiIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := bidiIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = bidiIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = bidiIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *bidiTrie) lookupStringUnsafe(s string) uint8 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return bidiValues[c0]
+	}
+	i := bidiIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = bidiIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = bidiIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// bidiTrie. Total size: 19904 bytes (19.44 KiB). Checksum: b1f201ed2debb6c8.
+type bidiTrie struct{}
+
+func newBidiTrie(i int) *bidiTrie {
+	return &bidiTrie{}
+}
+
+// lookupValue determines the type of block n and looks up the value for b.
+func (t *bidiTrie) lookupValue(n uint32, b byte) uint8 {
+	switch {
+	default:
+		return uint8(bidiValues[n<<6+uint32(b)])
+	}
+}
+
+// bidiValues: 259 blocks, 16576 entries, 16576 bytes
+// The third block is the zero block.
+var bidiValues = [16576]uint8{
+	// Block 0x0, offset 0x0
+	0x00: 0x000b, 0x01: 0x000b, 0x02: 0x000b, 0x03: 0x000b, 0x04: 0x000b, 0x05: 0x000b,
+	0x06: 0x000b, 0x07: 0x000b, 0x08: 0x000b, 0x09: 0x0008, 0x0a: 0x0007, 0x0b: 0x0008,
+	0x0c: 0x0009, 0x0d: 0x0007, 0x0e: 0x000b, 0x0f: 0x000b, 0x10: 0x000b, 0x11: 0x000b,
+	0x12: 0x000b, 0x13: 0x000b, 0x14: 0x000b, 0x15: 0x000b, 0x16: 0x000b, 0x17: 0x000b,
+	0x18: 0x000b, 0x19: 0x000b, 0x1a: 0x000b, 0x1b: 0x000b, 0x1c: 0x0007, 0x1d: 0x0007,
+	0x1e: 0x0007, 0x1f: 0x0008, 0x20: 0x0009, 0x21: 0x000a, 0x22: 0x000a, 0x23: 0x0004,
+	0x24: 0x0004, 0x25: 0x0004, 0x26: 0x000a, 0x27: 0x000a, 0x28: 0x003a, 0x29: 0x002a,
+	0x2a: 0x000a, 0x2b: 0x0003, 0x2c: 0x0006, 0x2d: 0x0003, 0x2e: 0x0006, 0x2f: 0x0006,
+	0x30: 0x0002, 0x31: 0x0002, 0x32: 0x0002, 0x33: 0x0002, 0x34: 0x0002, 0x35: 0x0002,
+	0x36: 0x0002, 0x37: 0x0002, 0x38: 0x0002, 0x39: 0x0002, 0x3a: 0x0006, 0x3b: 0x000a,
+	0x3c: 0x000a, 0x3d: 0x000a, 0x3e: 0x000a, 0x3f: 0x000a,
+	// Block 0x1, offset 0x40
+	0x40: 0x000a,
+	0x5b: 0x005a, 0x5c: 0x000a, 0x5d: 0x004a,
+	0x5e: 0x000a, 0x5f: 0x000a, 0x60: 0x000a,
+	0x7b: 0x005a,
+	0x7c: 0x000a, 0x7d: 0x004a, 0x7e: 0x000a, 0x7f: 0x000b,
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc0: 0x000b, 0xc1: 0x000b, 0xc2: 0x000b, 0xc3: 0x000b, 0xc4: 0x000b, 0xc5: 0x0007,
+	0xc6: 0x000b, 0xc7: 0x000b, 0xc8: 0x000b, 0xc9: 0x000b, 0xca: 0x000b, 0xcb: 0x000b,
+	0xcc: 0x000b, 0xcd: 0x000b, 0xce: 0x000b, 0xcf: 0x000b, 0xd0: 0x000b, 0xd1: 0x000b,
+	0xd2: 0x000b, 0xd3: 0x000b, 0xd4: 0x000b, 0xd5: 0x000b, 0xd6: 0x000b, 0xd7: 0x000b,
+	0xd8: 0x000b, 0xd9: 0x000b, 0xda: 0x000b, 0xdb: 0x000b, 0xdc: 0x000b, 0xdd: 0x000b,
+	0xde: 0x000b, 0xdf: 0x000b, 0xe0: 0x0006, 0xe1: 0x000a, 0xe2: 0x0004, 0xe3: 0x0004,
+	0xe4: 0x0004, 0xe5: 0x0004, 0xe6: 0x000a, 0xe7: 0x000a, 0xe8: 0x000a, 0xe9: 0x000a,
+	0xeb: 0x000a, 0xec: 0x000a, 0xed: 0x000b, 0xee: 0x000a, 0xef: 0x000a,
+	0xf0: 0x0004, 0xf1: 0x0004, 0xf2: 0x0002, 0xf3: 0x0002, 0xf4: 0x000a,
+	0xf6: 0x000a, 0xf7: 0x000a, 0xf8: 0x000a, 0xf9: 0x0002, 0xfb: 0x000a,
+	0xfc: 0x000a, 0xfd: 0x000a, 0xfe: 0x000a, 0xff: 0x000a,
+	// Block 0x4, offset 0x100
+	0x117: 0x000a,
+	0x137: 0x000a,
+	// Block 0x5, offset 0x140
+	0x179: 0x000a, 0x17a: 0x000a,
+	// Block 0x6, offset 0x180
+	0x182: 0x000a, 0x183: 0x000a, 0x184: 0x000a, 0x185: 0x000a,
+	0x186: 0x000a, 0x187: 0x000a, 0x188: 0x000a, 0x189: 0x000a, 0x18a: 0x000a, 0x18b: 0x000a,
+	0x18c: 0x000a, 0x18d: 0x000a, 0x18e: 0x000a, 0x18f: 0x000a,
+	0x192: 0x000a, 0x193: 0x000a, 0x194: 0x000a, 0x195: 0x000a, 0x196: 0x000a, 0x197: 0x000a,
+	0x198: 0x000a, 0x199: 0x000a, 0x19a: 0x000a, 0x19b: 0x000a, 0x19c: 0x000a, 0x19d: 0x000a,
+	0x19e: 0x000a, 0x19f: 0x000a,
+	0x1a5: 0x000a, 0x1a6: 0x000a, 0x1a7: 0x000a, 0x1a8: 0x000a, 0x1a9: 0x000a,
+	0x1aa: 0x000a, 0x1ab: 0x000a, 0x1ac: 0x000a, 0x1ad: 0x000a, 0x1af: 0x000a,
+	0x1b0: 0x000a, 0x1b1: 0x000a, 0x1b2: 0x000a, 0x1b3: 0x000a, 0x1b4: 0x000a, 0x1b5: 0x000a,
+	0x1b6: 0x000a, 0x1b7: 0x000a, 0x1b8: 0x000a, 0x1b9: 0x000a, 0x1ba: 0x000a, 0x1bb: 0x000a,
+	0x1bc: 0x000a, 0x1bd: 0x000a, 0x1be: 0x000a, 0x1bf: 0x000a,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x000c, 0x1c1: 0x000c, 0x1c2: 0x000c, 0x1c3: 0x000c, 0x1c4: 0x000c, 0x1c5: 0x000c,
+	0x1c6: 0x000c, 0x1c7: 0x000c, 0x1c8: 0x000c, 0x1c9: 0x000c, 0x1ca: 0x000c, 0x1cb: 0x000c,
+	0x1cc: 0x000c, 0x1cd: 0x000c, 0x1ce: 0x000c, 0x1cf: 0x000c, 0x1d0: 0x000c, 0x1d1: 0x000c,
+	0x1d2: 0x000c, 0x1d3: 0x000c, 0x1d4: 0x000c, 0x1d5: 0x000c, 0x1d6: 0x000c, 0x1d7: 0x000c,
+	0x1d8: 0x000c, 0x1d9: 0x000c, 0x1da: 0x000c, 0x1db: 0x000c, 0x1dc: 0x000c, 0x1dd: 0x000c,
+	0x1de: 0x000c, 0x1df: 0x000c, 0x1e0: 0x000c, 0x1e1: 0x000c, 0x1e2: 0x000c, 0x1e3: 0x000c,
+	0x1e4: 0x000c, 0x1e5: 0x000c, 0x1e6: 0x000c, 0x1e7: 0x000c, 0x1e8: 0x000c, 0x1e9: 0x000c,
+	0x1ea: 0x000c, 0x1eb: 0x000c, 0x1ec: 0x000c, 0x1ed: 0x000c, 0x1ee: 0x000c, 0x1ef: 0x000c,
+	0x1f0: 0x000c, 0x1f1: 0x000c, 0x1f2: 0x000c, 0x1f3: 0x000c, 0x1f4: 0x000c, 0x1f5: 0x000c,
+	0x1f6: 0x000c, 0x1f7: 0x000c, 0x1f8: 0x000c, 0x1f9: 0x000c, 0x1fa: 0x000c, 0x1fb: 0x000c,
+	0x1fc: 0x000c, 0x1fd: 0x000c, 0x1fe: 0x000c, 0x1ff: 0x000c,
+	// Block 0x8, offset 0x200
+	0x200: 0x000c, 0x201: 0x000c, 0x202: 0x000c, 0x203: 0x000c, 0x204: 0x000c, 0x205: 0x000c,
+	0x206: 0x000c, 0x207: 0x000c, 0x208: 0x000c, 0x209: 0x000c, 0x20a: 0x000c, 0x20b: 0x000c,
+	0x20c: 0x000c, 0x20d: 0x000c, 0x20e: 0x000c, 0x20f: 0x000c, 0x210: 0x000c, 0x211: 0x000c,
+	0x212: 0x000c, 0x213: 0x000c, 0x214: 0x000c, 0x215: 0x000c, 0x216: 0x000c, 0x217: 0x000c,
+	0x218: 0x000c, 0x219: 0x000c, 0x21a: 0x000c, 0x21b: 0x000c, 0x21c: 0x000c, 0x21d: 0x000c,
+	0x21e: 0x000c, 0x21f: 0x000c, 0x220: 0x000c, 0x221: 0x000c, 0x222: 0x000c, 0x223: 0x000c,
+	0x224: 0x000c, 0x225: 0x000c, 0x226: 0x000c, 0x227: 0x000c, 0x228: 0x000c, 0x229: 0x000c,
+	0x22a: 0x000c, 0x22b: 0x000c, 0x22c: 0x000c, 0x22d: 0x000c, 0x22e: 0x000c, 0x22f: 0x000c,
+	0x234: 0x000a, 0x235: 0x000a,
+	0x23e: 0x000a,
+	// Block 0x9, offset 0x240
+	0x244: 0x000a, 0x245: 0x000a,
+	0x247: 0x000a,
+	// Block 0xa, offset 0x280
+	0x2b6: 0x000a,
+	// Block 0xb, offset 0x2c0
+	0x2c3: 0x000c, 0x2c4: 0x000c, 0x2c5: 0x000c,
+	0x2c6: 0x000c, 0x2c7: 0x000c, 0x2c8: 0x000c, 0x2c9: 0x000c,
+	// Block 0xc, offset 0x300
+	0x30a: 0x000a,
+	0x30d: 0x000a, 0x30e: 0x000a, 0x30f: 0x0004, 0x310: 0x0001, 0x311: 0x000c,
+	0x312: 0x000c, 0x313: 0x000c, 0x314: 0x000c, 0x315: 0x000c, 0x316: 0x000c, 0x317: 0x000c,
+	0x318: 0x000c, 0x319: 0x000c, 0x31a: 0x000c, 0x31b: 0x000c, 0x31c: 0x000c, 0x31d: 0x000c,
+	0x31e: 0x000c, 0x31f: 0x000c, 0x320: 0x000c, 0x321: 0x000c, 0x322: 0x000c, 0x323: 0x000c,
+	0x324: 0x000c, 0x325: 0x000c, 0x326: 0x000c, 0x327: 0x000c, 0x328: 0x000c, 0x329: 0x000c,
+	0x32a: 0x000c, 0x32b: 0x000c, 0x32c: 0x000c, 0x32d: 0x000c, 0x32e: 0x000c, 0x32f: 0x000c,
+	0x330: 0x000c, 0x331: 0x000c, 0x332: 0x000c, 0x333: 0x000c, 0x334: 0x000c, 0x335: 0x000c,
+	0x336: 0x000c, 0x337: 0x000c, 0x338: 0x000c, 0x339: 0x000c, 0x33a: 0x000c, 0x33b: 0x000c,
+	0x33c: 0x000c, 0x33d: 0x000c, 0x33e: 0x0001, 0x33f: 0x000c,
+	// Block 0xd, offset 0x340
+	0x340: 0x0001, 0x341: 0x000c, 0x342: 0x000c, 0x343: 0x0001, 0x344: 0x000c, 0x345: 0x000c,
+	0x346: 0x0001, 0x347: 0x000c, 0x348: 0x0001, 0x349: 0x0001, 0x34a: 0x0001, 0x34b: 0x0001,
+	0x34c: 0x0001, 0x34d: 0x0001, 0x34e: 0x0001, 0x34f: 0x0001, 0x350: 0x0001, 0x351: 0x0001,
+	0x352: 0x0001, 0x353: 0x0001, 0x354: 0x0001, 0x355: 0x0001, 0x356: 0x0001, 0x357: 0x0001,
+	0x358: 0x0001, 0x359: 0x0001, 0x35a: 0x0001, 0x35b: 0x0001, 0x35c: 0x0001, 0x35d: 0x0001,
+	0x35e: 0x0001, 0x35f: 0x0001, 0x360: 0x0001, 0x361: 0x0001, 0x362: 0x0001, 0x363: 0x0001,
+	0x364: 0x0001, 0x365: 0x0001, 0x366: 0x0001, 0x367: 0x0001, 0x368: 0x0001, 0x369: 0x0001,
+	0x36a: 0x0001, 0x36b: 0x0001, 0x36c: 0x0001, 0x36d: 0x0001, 0x36e: 0x0001, 0x36f: 0x0001,
+	0x370: 0x0001, 0x371: 0x0001, 0x372: 0x0001, 0x373: 0x0001, 0x374: 0x0001, 0x375: 0x0001,
+	0x376: 0x0001, 0x377: 0x0001, 0x378: 0x0001, 0x379: 0x0001, 0x37a: 0x0001, 0x37b: 0x0001,
+	0x37c: 0x0001, 0x37d: 0x0001, 0x37e: 0x0001, 0x37f: 0x0001,
+	// Block 0xe, offset 0x380
+	0x380: 0x0005, 0x381: 0x0005, 0x382: 0x0005, 0x383: 0x0005, 0x384: 0x0005, 0x385: 0x0005,
+	0x386: 0x000a, 0x387: 0x000a, 0x388: 0x000d, 0x389: 0x0004, 0x38a: 0x0004, 0x38b: 0x000d,
+	0x38c: 0x0006, 0x38d: 0x000d, 0x38e: 0x000a, 0x38f: 0x000a, 0x390: 0x000c, 0x391: 0x000c,
+	0x392: 0x000c, 0x393: 0x000c, 0x394: 0x000c, 0x395: 0x000c, 0x396: 0x000c, 0x397: 0x000c,
+	0x398: 0x000c, 0x399: 0x000c, 0x39a: 0x000c, 0x39b: 0x000d, 0x39c: 0x000d, 0x39d: 0x000d,
+	0x39e: 0x000d, 0x39f: 0x000d, 0x3a0: 0x000d, 0x3a1: 0x000d, 0x3a2: 0x000d, 0x3a3: 0x000d,
+	0x3a4: 0x000d, 0x3a5: 0x000d, 0x3a6: 0x000d, 0x3a7: 0x000d, 0x3a8: 0x000d, 0x3a9: 0x000d,
+	0x3aa: 0x000d, 0x3ab: 0x000d, 0x3ac: 0x000d, 0x3ad: 0x000d, 0x3ae: 0x000d, 0x3af: 0x000d,
+	0x3b0: 0x000d, 0x3b1: 0x000d, 0x3b2: 0x000d, 0x3b3: 0x000d, 0x3b4: 0x000d, 0x3b5: 0x000d,
+	0x3b6: 0x000d, 0x3b7: 0x000d, 0x3b8: 0x000d, 0x3b9: 0x000d, 0x3ba: 0x000d, 0x3bb: 0x000d,
+	0x3bc: 0x000d, 0x3bd: 0x000d, 0x3be: 0x000d, 0x3bf: 0x000d,
+	// Block 0xf, offset 0x3c0
+	0x3c0: 0x000d, 0x3c1: 0x000d, 0x3c2: 0x000d, 0x3c3: 0x000d, 0x3c4: 0x000d, 0x3c5: 0x000d,
+	0x3c6: 0x000d, 0x3c7: 0x000d, 0x3c8: 0x000d, 0x3c9: 0x000d, 0x3ca: 0x000d, 0x3cb: 0x000c,
+	0x3cc: 0x000c, 0x3cd: 0x000c, 0x3ce: 0x000c, 0x3cf: 0x000c, 0x3d0: 0x000c, 0x3d1: 0x000c,
+	0x3d2: 0x000c, 0x3d3: 0x000c, 0x3d4: 0x000c, 0x3d5: 0x000c, 0x3d6: 0x000c, 0x3d7: 0x000c,
+	0x3d8: 0x000c, 0x3d9: 0x000c, 0x3da: 0x000c, 0x3db: 0x000c, 0x3dc: 0x000c, 0x3dd: 0x000c,
+	0x3de: 0x000c, 0x3df: 0x000c, 0x3e0: 0x0005, 0x3e1: 0x0005, 0x3e2: 0x0005, 0x3e3: 0x0005,
+	0x3e4: 0x0005, 0x3e5: 0x0005, 0x3e6: 0x0005, 0x3e7: 0x0005, 0x3e8: 0x0005, 0x3e9: 0x0005,
+	0x3ea: 0x0004, 0x3eb: 0x0005, 0x3ec: 0x0005, 0x3ed: 0x000d, 0x3ee: 0x000d, 0x3ef: 0x000d,
+	0x3f0: 0x000c, 0x3f1: 0x000d, 0x3f2: 0x000d, 0x3f3: 0x000d, 0x3f4: 0x000d, 0x3f5: 0x000d,
+	0x3f6: 0x000d, 0x3f7: 0x000d, 0x3f8: 0x000d, 0x3f9: 0x000d, 0x3fa: 0x000d, 0x3fb: 0x000d,
+	0x3fc: 0x000d, 0x3fd: 0x000d, 0x3fe: 0x000d, 0x3ff: 0x000d,
+	// Block 0x10, offset 0x400
+	0x400: 0x000d, 0x401: 0x000d, 0x402: 0x000d, 0x403: 0x000d, 0x404: 0x000d, 0x405: 0x000d,
+	0x406: 0x000d, 0x407: 0x000d, 0x408: 0x000d, 0x409: 0x000d, 0x40a: 0x000d, 0x40b: 0x000d,
+	0x40c: 0x000d, 0x40d: 0x000d, 0x40e: 0x000d, 0x40f: 0x000d, 0x410: 0x000d, 0x411: 0x000d,
+	0x412: 0x000d, 0x413: 0x000d, 0x414: 0x000d, 0x415: 0x000d, 0x416: 0x000d, 0x417: 0x000d,
+	0x418: 0x000d, 0x419: 0x000d, 0x41a: 0x000d, 0x41b: 0x000d, 0x41c: 0x000d, 0x41d: 0x000d,
+	0x41e: 0x000d, 0x41f: 0x000d, 0x420: 0x000d, 0x421: 0x000d, 0x422: 0x000d, 0x423: 0x000d,
+	0x424: 0x000d, 0x425: 0x000d, 0x426: 0x000d, 0x427: 0x000d, 0x428: 0x000d, 0x429: 0x000d,
+	0x42a: 0x000d, 0x42b: 0x000d, 0x42c: 0x000d, 0x42d: 0x000d, 0x42e: 0x000d, 0x42f: 0x000d,
+	0x430: 0x000d, 0x431: 0x000d, 0x432: 0x000d, 0x433: 0x000d, 0x434: 0x000d, 0x435: 0x000d,
+	0x436: 0x000d, 0x437: 0x000d, 0x438: 0x000d, 0x439: 0x000d, 0x43a: 0x000d, 0x43b: 0x000d,
+	0x43c: 0x000d, 0x43d: 0x000d, 0x43e: 0x000d, 0x43f: 0x000d,
+	// Block 0x11, offset 0x440
+	0x440: 0x000d, 0x441: 0x000d, 0x442: 0x000d, 0x443: 0x000d, 0x444: 0x000d, 0x445: 0x000d,
+	0x446: 0x000d, 0x447: 0x000d, 0x448: 0x000d, 0x449: 0x000d, 0x44a: 0x000d, 0x44b: 0x000d,
+	0x44c: 0x000d, 0x44d: 0x000d, 0x44e: 0x000d, 0x44f: 0x000d, 0x450: 0x000d, 0x451: 0x000d,
+	0x452: 0x000d, 0x453: 0x000d, 0x454: 0x000d, 0x455: 0x000d, 0x456: 0x000c, 0x457: 0x000c,
+	0x458: 0x000c, 0x459: 0x000c, 0x45a: 0x000c, 0x45b: 0x000c, 0x45c: 0x000c, 0x45d: 0x0005,
+	0x45e: 0x000a, 0x45f: 0x000c, 0x460: 0x000c, 0x461: 0x000c, 0x462: 0x000c, 0x463: 0x000c,
+	0x464: 0x000c, 0x465: 0x000d, 0x466: 0x000d, 0x467: 0x000c, 0x468: 0x000c, 0x469: 0x000a,
+	0x46a: 0x000c, 0x46b: 0x000c, 0x46c: 0x000c, 0x46d: 0x000c, 0x46e: 0x000d, 0x46f: 0x000d,
+	0x470: 0x0002, 0x471: 0x0002, 0x472: 0x0002, 0x473: 0x0002, 0x474: 0x0002, 0x475: 0x0002,
+	0x476: 0x0002, 0x477: 0x0002, 0x478: 0x0002, 0x479: 0x0002, 0x47a: 0x000d, 0x47b: 0x000d,
+	0x47c: 0x000d, 0x47d: 0x000d, 0x47e: 0x000d, 0x47f: 0x000d,
+	// Block 0x12, offset 0x480
+	0x480: 0x000d, 0x481: 0x000d, 0x482: 0x000d, 0x483: 0x000d, 0x484: 0x000d, 0x485: 0x000d,
+	0x486: 0x000d, 0x487: 0x000d, 0x488: 0x000d, 0x489: 0x000d, 0x48a: 0x000d, 0x48b: 0x000d,
+	0x48c: 0x000d, 0x48d: 0x000d, 0x48e: 0x000d, 0x48f: 0x000d, 0x490: 0x000d, 0x491: 0x000c,
+	0x492: 0x000d, 0x493: 0x000d, 0x494: 0x000d, 0x495: 0x000d, 0x496: 0x000d, 0x497: 0x000d,
+	0x498: 0x000d, 0x499: 0x000d, 0x49a: 0x000d, 0x49b: 0x000d, 0x49c: 0x000d, 0x49d: 0x000d,
+	0x49e: 0x000d, 0x49f: 0x000d, 0x4a0: 0x000d, 0x4a1: 0x000d, 0x4a2: 0x000d, 0x4a3: 0x000d,
+	0x4a4: 0x000d, 0x4a5: 0x000d, 0x4a6: 0x000d, 0x4a7: 0x000d, 0x4a8: 0x000d, 0x4a9: 0x000d,
+	0x4aa: 0x000d, 0x4ab: 0x000d, 0x4ac: 0x000d, 0x4ad: 0x000d, 0x4ae: 0x000d, 0x4af: 0x000d,
+	0x4b0: 0x000c, 0x4b1: 0x000c, 0x4b2: 0x000c, 0x4b3: 0x000c, 0x4b4: 0x000c, 0x4b5: 0x000c,
+	0x4b6: 0x000c, 0x4b7: 0x000c, 0x4b8: 0x000c, 0x4b9: 0x000c, 0x4ba: 0x000c, 0x4bb: 0x000c,
+	0x4bc: 0x000c, 0x4bd: 0x000c, 0x4be: 0x000c, 0x4bf: 0x000c,
+	// Block 0x13, offset 0x4c0
+	0x4c0: 0x000c, 0x4c1: 0x000c, 0x4c2: 0x000c, 0x4c3: 0x000c, 0x4c4: 0x000c, 0x4c5: 0x000c,
+	0x4c6: 0x000c, 0x4c7: 0x000c, 0x4c8: 0x000c, 0x4c9: 0x000c, 0x4ca: 0x000c, 0x4cb: 0x000d,
+	0x4cc: 0x000d, 0x4cd: 0x000d, 0x4ce: 0x000d, 0x4cf: 0x000d, 0x4d0: 0x000d, 0x4d1: 0x000d,
+	0x4d2: 0x000d, 0x4d3: 0x000d, 0x4d4: 0x000d, 0x4d5: 0x000d, 0x4d6: 0x000d, 0x4d7: 0x000d,
+	0x4d8: 0x000d, 0x4d9: 0x000d, 0x4da: 0x000d, 0x4db: 0x000d, 0x4dc: 0x000d, 0x4dd: 0x000d,
+	0x4de: 0x000d, 0x4df: 0x000d, 0x4e0: 0x000d, 0x4e1: 0x000d, 0x4e2: 0x000d, 0x4e3: 0x000d,
+	0x4e4: 0x000d, 0x4e5: 0x000d, 0x4e6: 0x000d, 0x4e7: 0x000d, 0x4e8: 0x000d, 0x4e9: 0x000d,
+	0x4ea: 0x000d, 0x4eb: 0x000d, 0x4ec: 0x000d, 0x4ed: 0x000d, 0x4ee: 0x000d, 0x4ef: 0x000d,
+	0x4f0: 0x000d, 0x4f1: 0x000d, 0x4f2: 0x000d, 0x4f3: 0x000d, 0x4f4: 0x000d, 0x4f5: 0x000d,
+	0x4f6: 0x000d, 0x4f7: 0x000d, 0x4f8: 0x000d, 0x4f9: 0x000d, 0x4fa: 0x000d, 0x4fb: 0x000d,
+	0x4fc: 0x000d, 0x4fd: 0x000d, 0x4fe: 0x000d, 0x4ff: 0x000d,
+	// Block 0x14, offset 0x500
+	0x500: 0x000d, 0x501: 0x000d, 0x502: 0x000d, 0x503: 0x000d, 0x504: 0x000d, 0x505: 0x000d,
+	0x506: 0x000d, 0x507: 0x000d, 0x508: 0x000d, 0x509: 0x000d, 0x50a: 0x000d, 0x50b: 0x000d,
+	0x50c: 0x000d, 0x50d: 0x000d, 0x50e: 0x000d, 0x50f: 0x000d, 0x510: 0x000d, 0x511: 0x000d,
+	0x512: 0x000d, 0x513: 0x000d, 0x514: 0x000d, 0x515: 0x000d, 0x516: 0x000d, 0x517: 0x000d,
+	0x518: 0x000d, 0x519: 0x000d, 0x51a: 0x000d, 0x51b: 0x000d, 0x51c: 0x000d, 0x51d: 0x000d,
+	0x51e: 0x000d, 0x51f: 0x000d, 0x520: 0x000d, 0x521: 0x000d, 0x522: 0x000d, 0x523: 0x000d,
+	0x524: 0x000d, 0x525: 0x000d, 0x526: 0x000c, 0x527: 0x000c, 0x528: 0x000c, 0x529: 0x000c,
+	0x52a: 0x000c, 0x52b: 0x000c, 0x52c: 0x000c, 0x52d: 0x000c, 0x52e: 0x000c, 0x52f: 0x000c,
+	0x530: 0x000c, 0x531: 0x000d, 0x532: 0x000d, 0x533: 0x000d, 0x534: 0x000d, 0x535: 0x000d,
+	0x536: 0x000d, 0x537: 0x000d, 0x538: 0x000d, 0x539: 0x000d, 0x53a: 0x000d, 0x53b: 0x000d,
+	0x53c: 0x000d, 0x53d: 0x000d, 0x53e: 0x000d, 0x53f: 0x000d,
+	// Block 0x15, offset 0x540
+	0x540: 0x0001, 0x541: 0x0001, 0x542: 0x0001, 0x543: 0x0001, 0x544: 0x0001, 0x545: 0x0001,
+	0x546: 0x0001, 0x547: 0x0001, 0x548: 0x0001, 0x549: 0x0001, 0x54a: 0x0001, 0x54b: 0x0001,
+	0x54c: 0x0001, 0x54d: 0x0001, 0x54e: 0x0001, 0x54f: 0x0001, 0x550: 0x0001, 0x551: 0x0001,
+	0x552: 0x0001, 0x553: 0x0001, 0x554: 0x0001, 0x555: 0x0001, 0x556: 0x0001, 0x557: 0x0001,
+	0x558: 0x0001, 0x559: 0x0001, 0x55a: 0x0001, 0x55b: 0x0001, 0x55c: 0x0001, 0x55d: 0x0001,
+	0x55e: 0x0001, 0x55f: 0x0001, 0x560: 0x0001, 0x561: 0x0001, 0x562: 0x0001, 0x563: 0x0001,
+	0x564: 0x0001, 0x565: 0x0001, 0x566: 0x0001, 0x567: 0x0001, 0x568: 0x0001, 0x569: 0x0001,
+	0x56a: 0x0001, 0x56b: 0x000c, 0x56c: 0x000c, 0x56d: 0x000c, 0x56e: 0x000c, 0x56f: 0x000c,
+	0x570: 0x000c, 0x571: 0x000c, 0x572: 0x000c, 0x573: 0x000c, 0x574: 0x0001, 0x575: 0x0001,
+	0x576: 0x000a, 0x577: 0x000a, 0x578: 0x000a, 0x579: 0x000a, 0x57a: 0x0001, 0x57b: 0x0001,
+	0x57c: 0x0001, 0x57d: 0x000c, 0x57e: 0x0001, 0x57f: 0x0001,
+	// Block 0x16, offset 0x580
+	0x580: 0x0001, 0x581: 0x0001, 0x582: 0x0001, 0x583: 0x0001, 0x584: 0x0001, 0x585: 0x0001,
+	0x586: 0x0001, 0x587: 0x0001, 0x588: 0x0001, 0x589: 0x0001, 0x58a: 0x0001, 0x58b: 0x0001,
+	0x58c: 0x0001, 0x58d: 0x0001, 0x58e: 0x0001, 0x58f: 0x0001, 0x590: 0x0001, 0x591: 0x0001,
+	0x592: 0x0001, 0x593: 0x0001, 0x594: 0x0001, 0x595: 0x0001, 0x596: 0x000c, 0x597: 0x000c,
+	0x598: 0x000c, 0x599: 0x000c, 0x59a: 0x0001, 0x59b: 0x000c, 0x59c: 0x000c, 0x59d: 0x000c,
+	0x59e: 0x000c, 0x59f: 0x000c, 0x5a0: 0x000c, 0x5a1: 0x000c, 0x5a2: 0x000c, 0x5a3: 0x000c,
+	0x5a4: 0x0001, 0x5a5: 0x000c, 0x5a6: 0x000c, 0x5a7: 0x000c, 0x5a8: 0x0001, 0x5a9: 0x000c,
+	0x5aa: 0x000c, 0x5ab: 0x000c, 0x5ac: 0x000c, 0x5ad: 0x000c, 0x5ae: 0x0001, 0x5af: 0x0001,
+	0x5b0: 0x0001, 0x5b1: 0x0001, 0x5b2: 0x0001, 0x5b3: 0x0001, 0x5b4: 0x0001, 0x5b5: 0x0001,
+	0x5b6: 0x0001, 0x5b7: 0x0001, 0x5b8: 0x0001, 0x5b9: 0x0001, 0x5ba: 0x0001, 0x5bb: 0x0001,
+	0x5bc: 0x0001, 0x5bd: 0x0001, 0x5be: 0x0001, 0x5bf: 0x0001,
+	// Block 0x17, offset 0x5c0
+	0x5c0: 0x0001, 0x5c1: 0x0001, 0x5c2: 0x0001, 0x5c3: 0x0001, 0x5c4: 0x0001, 0x5c5: 0x0001,
+	0x5c6: 0x0001, 0x5c7: 0x0001, 0x5c8: 0x0001, 0x5c9: 0x0001, 0x5ca: 0x0001, 0x5cb: 0x0001,
+	0x5cc: 0x0001, 0x5cd: 0x0001, 0x5ce: 0x0001, 0x5cf: 0x0001, 0x5d0: 0x0001, 0x5d1: 0x0001,
+	0x5d2: 0x0001, 0x5d3: 0x0001, 0x5d4: 0x0001, 0x5d5: 0x0001, 0x5d6: 0x0001, 0x5d7: 0x0001,
+	0x5d8: 0x0001, 0x5d9: 0x000c, 0x5da: 0x000c, 0x5db: 0x000c, 0x5dc: 0x0001, 0x5dd: 0x0001,
+	0x5de: 0x0001, 0x5df: 0x0001, 0x5e0: 0x000d, 0x5e1: 0x000d, 0x5e2: 0x000d, 0x5e3: 0x000d,
+	0x5e4: 0x000d, 0x5e5: 0x000d, 0x5e6: 0x000d, 0x5e7: 0x000d, 0x5e8: 0x000d, 0x5e9: 0x000d,
+	0x5ea: 0x000d, 0x5eb: 0x0001, 0x5ec: 0x0001, 0x5ed: 0x0001, 0x5ee: 0x0001, 0x5ef: 0x0001,
+	0x5f0: 0x000d, 0x5f1: 0x000d, 0x5f2: 0x000d, 0x5f3: 0x000d, 0x5f4: 0x000d, 0x5f5: 0x000d,
+	0x5f6: 0x000d, 0x5f7: 0x000d, 0x5f8: 0x000d, 0x5f9: 0x000d, 0x5fa: 0x000d, 0x5fb: 0x000d,
+	0x5fc: 0x000d, 0x5fd: 0x000d, 0x5fe: 0x000d, 0x5ff: 0x000d,
+	// Block 0x18, offset 0x600
+	0x600: 0x000d, 0x601: 0x000d, 0x602: 0x000d, 0x603: 0x000d, 0x604: 0x000d, 0x605: 0x000d,
+	0x606: 0x000d, 0x607: 0x000d, 0x608: 0x000d, 0x609: 0x000d, 0x60a: 0x000d, 0x60b: 0x000d,
+	0x60c: 0x000d, 0x60d: 0x000d, 0x60e: 0x000d, 0x60f: 0x0001, 0x610: 0x0005, 0x611: 0x0005,
+	0x612: 0x0001, 0x613: 0x0001, 0x614: 0x0001, 0x615: 0x0001, 0x616: 0x0001, 0x617: 0x0001,
+	0x618: 0x000c, 0x619: 0x000c, 0x61a: 0x000c, 0x61b: 0x000c, 0x61c: 0x000c, 0x61d: 0x000c,
+	0x61e: 0x000c, 0x61f: 0x000c, 0x620: 0x000d, 0x621: 0x000d, 0x622: 0x000d, 0x623: 0x000d,
+	0x624: 0x000d, 0x625: 0x000d, 0x626: 0x000d, 0x627: 0x000d, 0x628: 0x000d, 0x629: 0x000d,
+	0x62a: 0x000d, 0x62b: 0x000d, 0x62c: 0x000d, 0x62d: 0x000d, 0x62e: 0x000d, 0x62f: 0x000d,
+	0x630: 0x000d, 0x631: 0x000d, 0x632: 0x000d, 0x633: 0x000d, 0x634: 0x000d, 0x635: 0x000d,
+	0x636: 0x000d, 0x637: 0x000d, 0x638: 0x000d, 0x639: 0x000d, 0x63a: 0x000d, 0x63b: 0x000d,
+	0x63c: 0x000d, 0x63d: 0x000d, 0x63e: 0x000d, 0x63f: 0x000d,
+	// Block 0x19, offset 0x640
+	0x640: 0x000d, 0x641: 0x000d, 0x642: 0x000d, 0x643: 0x000d, 0x644: 0x000d, 0x645: 0x000d,
+	0x646: 0x000d, 0x647: 0x000d, 0x648: 0x000d, 0x649: 0x000d, 0x64a: 0x000c, 0x64b: 0x000c,
+	0x64c: 0x000c, 0x64d: 0x000c, 0x64e: 0x000c, 0x64f: 0x000c, 0x650: 0x000c, 0x651: 0x000c,
+	0x652: 0x000c, 0x653: 0x000c, 0x654: 0x000c, 0x655: 0x000c, 0x656: 0x000c, 0x657: 0x000c,
+	0x658: 0x000c, 0x659: 0x000c, 0x65a: 0x000c, 0x65b: 0x000c, 0x65c: 0x000c, 0x65d: 0x000c,
+	0x65e: 0x000c, 0x65f: 0x000c, 0x660: 0x000c, 0x661: 0x000c, 0x662: 0x0005, 0x663: 0x000c,
+	0x664: 0x000c, 0x665: 0x000c, 0x666: 0x000c, 0x667: 0x000c, 0x668: 0x000c, 0x669: 0x000c,
+	0x66a: 0x000c, 0x66b: 0x000c, 0x66c: 0x000c, 0x66d: 0x000c, 0x66e: 0x000c, 0x66f: 0x000c,
+	0x670: 0x000c, 0x671: 0x000c, 0x672: 0x000c, 0x673: 0x000c, 0x674: 0x000c, 0x675: 0x000c,
+	0x676: 0x000c, 0x677: 0x000c, 0x678: 0x000c, 0x679: 0x000c, 0x67a: 0x000c, 0x67b: 0x000c,
+	0x67c: 0x000c, 0x67d: 0x000c, 0x67e: 0x000c, 0x67f: 0x000c,
+	// Block 0x1a, offset 0x680
+	0x680: 0x000c, 0x681: 0x000c, 0x682: 0x000c,
+	0x6ba: 0x000c,
+	0x6bc: 0x000c,
+	// Block 0x1b, offset 0x6c0
+	0x6c1: 0x000c, 0x6c2: 0x000c, 0x6c3: 0x000c, 0x6c4: 0x000c, 0x6c5: 0x000c,
+	0x6c6: 0x000c, 0x6c7: 0x000c, 0x6c8: 0x000c,
+	0x6cd: 0x000c, 0x6d1: 0x000c,
+	0x6d2: 0x000c, 0x6d3: 0x000c, 0x6d4: 0x000c, 0x6d5: 0x000c, 0x6d6: 0x000c, 0x6d7: 0x000c,
+	0x6e2: 0x000c, 0x6e3: 0x000c,
+	// Block 0x1c, offset 0x700
+	0x701: 0x000c,
+	0x73c: 0x000c,
+	// Block 0x1d, offset 0x740
+	0x741: 0x000c, 0x742: 0x000c, 0x743: 0x000c, 0x744: 0x000c,
+	0x74d: 0x000c,
+	0x762: 0x000c, 0x763: 0x000c,
+	0x772: 0x0004, 0x773: 0x0004,
+	0x77b: 0x0004,
+	0x77e: 0x000c,
+	// Block 0x1e, offset 0x780
+	0x781: 0x000c, 0x782: 0x000c,
+	0x7bc: 0x000c,
+	// Block 0x1f, offset 0x7c0
+	0x7c1: 0x000c, 0x7c2: 0x000c,
+	0x7c7: 0x000c, 0x7c8: 0x000c, 0x7cb: 0x000c,
+	0x7cc: 0x000c, 0x7cd: 0x000c, 0x7d1: 0x000c,
+	0x7f0: 0x000c, 0x7f1: 0x000c, 0x7f5: 0x000c,
+	// Block 0x20, offset 0x800
+	0x801: 0x000c, 0x802: 0x000c, 0x803: 0x000c, 0x804: 0x000c, 0x805: 0x000c,
+	0x807: 0x000c, 0x808: 0x000c,
+	0x80d: 0x000c,
+	0x822: 0x000c, 0x823: 0x000c,
+	0x831: 0x0004,
+	0x83a: 0x000c, 0x83b: 0x000c,
+	0x83c: 0x000c, 0x83d: 0x000c, 0x83e: 0x000c, 0x83f: 0x000c,
+	// Block 0x21, offset 0x840
+	0x841: 0x000c,
+	0x87c: 0x000c, 0x87f: 0x000c,
+	// Block 0x22, offset 0x880
+	0x881: 0x000c, 0x882: 0x000c, 0x883: 0x000c, 0x884: 0x000c,
+	0x88d: 0x000c,
+	0x895: 0x000c, 0x896: 0x000c,
+	0x8a2: 0x000c, 0x8a3: 0x000c,
+	// Block 0x23, offset 0x8c0
+	0x8c2: 0x000c,
+	// Block 0x24, offset 0x900
+	0x900: 0x000c,
+	0x90d: 0x000c,
+	0x933: 0x000a, 0x934: 0x000a, 0x935: 0x000a,
+	0x936: 0x000a, 0x937: 0x000a, 0x938: 0x000a, 0x939: 0x0004, 0x93a: 0x000a,
+	// Block 0x25, offset 0x940
+	0x940: 0x000c, 0x944: 0x000c,
+	0x97c: 0x000c, 0x97e: 0x000c, 0x97f: 0x000c,
+	// Block 0x26, offset 0x980
+	0x980: 0x000c,
+	0x986: 0x000c, 0x987: 0x000c, 0x988: 0x000c, 0x98a: 0x000c, 0x98b: 0x000c,
+	0x98c: 0x000c, 0x98d: 0x000c,
+	0x995: 0x000c, 0x996: 0x000c,
+	0x9a2: 0x000c, 0x9a3: 0x000c,
+	0x9b8: 0x000a, 0x9b9: 0x000a, 0x9ba: 0x000a, 0x9bb: 0x000a,
+	0x9bc: 0x000a, 0x9bd: 0x000a, 0x9be: 0x000a,
+	// Block 0x27, offset 0x9c0
+	0x9cc: 0x000c, 0x9cd: 0x000c,
+	0x9e2: 0x000c, 0x9e3: 0x000c,
+	// Block 0x28, offset 0xa00
+	0xa00: 0x000c, 0xa01: 0x000c,
+	0xa3b: 0x000c,
+	0xa3c: 0x000c,
+	// Block 0x29, offset 0xa40
+	0xa41: 0x000c, 0xa42: 0x000c, 0xa43: 0x000c, 0xa44: 0x000c,
+	0xa4d: 0x000c,
+	0xa62: 0x000c, 0xa63: 0x000c,
+	// Block 0x2a, offset 0xa80
+	0xa81: 0x000c,
+	// Block 0x2b, offset 0xac0
+	0xaca: 0x000c,
+	0xad2: 0x000c, 0xad3: 0x000c, 0xad4: 0x000c, 0xad6: 0x000c,
+	// Block 0x2c, offset 0xb00
+	0xb31: 0x000c, 0xb34: 0x000c, 0xb35: 0x000c,
+	0xb36: 0x000c, 0xb37: 0x000c, 0xb38: 0x000c, 0xb39: 0x000c, 0xb3a: 0x000c,
+	0xb3f: 0x0004,
+	// Block 0x2d, offset 0xb40
+	0xb47: 0x000c, 0xb48: 0x000c, 0xb49: 0x000c, 0xb4a: 0x000c, 0xb4b: 0x000c,
+	0xb4c: 0x000c, 0xb4d: 0x000c, 0xb4e: 0x000c,
+	// Block 0x2e, offset 0xb80
+	0xbb1: 0x000c, 0xbb4: 0x000c, 0xbb5: 0x000c,
+	0xbb6: 0x000c, 0xbb7: 0x000c, 0xbb8: 0x000c, 0xbb9: 0x000c, 0xbba: 0x000c, 0xbbb: 0x000c,
+	0xbbc: 0x000c,
+	// Block 0x2f, offset 0xbc0
+	0xbc8: 0x000c, 0xbc9: 0x000c, 0xbca: 0x000c, 0xbcb: 0x000c,
+	0xbcc: 0x000c, 0xbcd: 0x000c, 0xbce: 0x000c,
+	// Block 0x30, offset 0xc00
+	0xc18: 0x000c, 0xc19: 0x000c,
+	0xc35: 0x000c,
+	0xc37: 0x000c, 0xc39: 0x000c, 0xc3a: 0x003a, 0xc3b: 0x002a,
+	0xc3c: 0x003a, 0xc3d: 0x002a,
+	// Block 0x31, offset 0xc40
+	0xc71: 0x000c, 0xc72: 0x000c, 0xc73: 0x000c, 0xc74: 0x000c, 0xc75: 0x000c,
+	0xc76: 0x000c, 0xc77: 0x000c, 0xc78: 0x000c, 0xc79: 0x000c, 0xc7a: 0x000c, 0xc7b: 0x000c,
+	0xc7c: 0x000c, 0xc7d: 0x000c, 0xc7e: 0x000c,
+	// Block 0x32, offset 0xc80
+	0xc80: 0x000c, 0xc81: 0x000c, 0xc82: 0x000c, 0xc83: 0x000c, 0xc84: 0x000c,
+	0xc86: 0x000c, 0xc87: 0x000c,
+	0xc8d: 0x000c, 0xc8e: 0x000c, 0xc8f: 0x000c, 0xc90: 0x000c, 0xc91: 0x000c,
+	0xc92: 0x000c, 0xc93: 0x000c, 0xc94: 0x000c, 0xc95: 0x000c, 0xc96: 0x000c, 0xc97: 0x000c,
+	0xc99: 0x000c, 0xc9a: 0x000c, 0xc9b: 0x000c, 0xc9c: 0x000c, 0xc9d: 0x000c,
+	0xc9e: 0x000c, 0xc9f: 0x000c, 0xca0: 0x000c, 0xca1: 0x000c, 0xca2: 0x000c, 0xca3: 0x000c,
+	0xca4: 0x000c, 0xca5: 0x000c, 0xca6: 0x000c, 0xca7: 0x000c, 0xca8: 0x000c, 0xca9: 0x000c,
+	0xcaa: 0x000c, 0xcab: 0x000c, 0xcac: 0x000c, 0xcad: 0x000c, 0xcae: 0x000c, 0xcaf: 0x000c,
+	0xcb0: 0x000c, 0xcb1: 0x000c, 0xcb2: 0x000c, 0xcb3: 0x000c, 0xcb4: 0x000c, 0xcb5: 0x000c,
+	0xcb6: 0x000c, 0xcb7: 0x000c, 0xcb8: 0x000c, 0xcb9: 0x000c, 0xcba: 0x000c, 0xcbb: 0x000c,
+	0xcbc: 0x000c,
+	// Block 0x33, offset 0xcc0
+	0xcc6: 0x000c,
+	// Block 0x34, offset 0xd00
+	0xd2d: 0x000c, 0xd2e: 0x000c, 0xd2f: 0x000c,
+	0xd30: 0x000c, 0xd32: 0x000c, 0xd33: 0x000c, 0xd34: 0x000c, 0xd35: 0x000c,
+	0xd36: 0x000c, 0xd37: 0x000c, 0xd39: 0x000c, 0xd3a: 0x000c,
+	0xd3d: 0x000c, 0xd3e: 0x000c,
+	// Block 0x35, offset 0xd40
+	0xd58: 0x000c, 0xd59: 0x000c,
+	0xd5e: 0x000c, 0xd5f: 0x000c, 0xd60: 0x000c,
+	0xd71: 0x000c, 0xd72: 0x000c, 0xd73: 0x000c, 0xd74: 0x000c,
+	// Block 0x36, offset 0xd80
+	0xd82: 0x000c, 0xd85: 0x000c,
+	0xd86: 0x000c,
+	0xd8d: 0x000c,
+	0xd9d: 0x000c,
+	// Block 0x37, offset 0xdc0
+	0xddd: 0x000c,
+	0xdde: 0x000c, 0xddf: 0x000c,
+	// Block 0x38, offset 0xe00
+	0xe10: 0x000a, 0xe11: 0x000a,
+	0xe12: 0x000a, 0xe13: 0x000a, 0xe14: 0x000a, 0xe15: 0x000a, 0xe16: 0x000a, 0xe17: 0x000a,
+	0xe18: 0x000a, 0xe19: 0x000a,
+	// Block 0x39, offset 0xe40
+	0xe40: 0x000a,
+	// Block 0x3a, offset 0xe80
+	0xe80: 0x0009,
+	0xe9b: 0x007a, 0xe9c: 0x006a,
+	// Block 0x3b, offset 0xec0
+	0xed2: 0x000c, 0xed3: 0x000c, 0xed4: 0x000c,
+	0xef2: 0x000c, 0xef3: 0x000c,
+	// Block 0x3c, offset 0xf00
+	0xf12: 0x000c, 0xf13: 0x000c,
+	0xf32: 0x000c, 0xf33: 0x000c,
+	// Block 0x3d, offset 0xf40
+	0xf74: 0x000c, 0xf75: 0x000c,
+	0xf77: 0x000c, 0xf78: 0x000c, 0xf79: 0x000c, 0xf7a: 0x000c, 0xf7b: 0x000c,
+	0xf7c: 0x000c, 0xf7d: 0x000c,
+	// Block 0x3e, offset 0xf80
+	0xf86: 0x000c, 0xf89: 0x000c, 0xf8a: 0x000c, 0xf8b: 0x000c,
+	0xf8c: 0x000c, 0xf8d: 0x000c, 0xf8e: 0x000c, 0xf8f: 0x000c, 0xf90: 0x000c, 0xf91: 0x000c,
+	0xf92: 0x000c, 0xf93: 0x000c,
+	0xf9b: 0x0004, 0xf9d: 0x000c,
+	0xfb0: 0x000a, 0xfb1: 0x000a, 0xfb2: 0x000a, 0xfb3: 0x000a, 0xfb4: 0x000a, 0xfb5: 0x000a,
+	0xfb6: 0x000a, 0xfb7: 0x000a, 0xfb8: 0x000a, 0xfb9: 0x000a,
+	// Block 0x3f, offset 0xfc0
+	0xfc0: 0x000a, 0xfc1: 0x000a, 0xfc2: 0x000a, 0xfc3: 0x000a, 0xfc4: 0x000a, 0xfc5: 0x000a,
+	0xfc6: 0x000a, 0xfc7: 0x000a, 0xfc8: 0x000a, 0xfc9: 0x000a, 0xfca: 0x000a, 0xfcb: 0x000c,
+	0xfcc: 0x000c, 0xfcd: 0x000c, 0xfce: 0x000b, 0xfcf: 0x000c,
+	// Block 0x40, offset 0x1000
+	0x1005: 0x000c,
+	0x1006: 0x000c,
+	0x1029: 0x000c,
+	// Block 0x41, offset 0x1040
+	0x1060: 0x000c, 0x1061: 0x000c, 0x1062: 0x000c,
+	0x1067: 0x000c, 0x1068: 0x000c,
+	0x1072: 0x000c,
+	0x1079: 0x000c, 0x107a: 0x000c, 0x107b: 0x000c,
+	// Block 0x42, offset 0x1080
+	0x1080: 0x000a, 0x1084: 0x000a, 0x1085: 0x000a,
+	// Block 0x43, offset 0x10c0
+	0x10de: 0x000a, 0x10df: 0x000a, 0x10e0: 0x000a, 0x10e1: 0x000a, 0x10e2: 0x000a, 0x10e3: 0x000a,
+	0x10e4: 0x000a, 0x10e5: 0x000a, 0x10e6: 0x000a, 0x10e7: 0x000a, 0x10e8: 0x000a, 0x10e9: 0x000a,
+	0x10ea: 0x000a, 0x10eb: 0x000a, 0x10ec: 0x000a, 0x10ed: 0x000a, 0x10ee: 0x000a, 0x10ef: 0x000a,
+	0x10f0: 0x000a, 0x10f1: 0x000a, 0x10f2: 0x000a, 0x10f3: 0x000a, 0x10f4: 0x000a, 0x10f5: 0x000a,
+	0x10f6: 0x000a, 0x10f7: 0x000a, 0x10f8: 0x000a, 0x10f9: 0x000a, 0x10fa: 0x000a, 0x10fb: 0x000a,
+	0x10fc: 0x000a, 0x10fd: 0x000a, 0x10fe: 0x000a, 0x10ff: 0x000a,
+	// Block 0x44, offset 0x1100
+	0x1117: 0x000c,
+	0x1118: 0x000c, 0x111b: 0x000c,
+	// Block 0x45, offset 0x1140
+	0x1156: 0x000c,
+	0x1158: 0x000c, 0x1159: 0x000c, 0x115a: 0x000c, 0x115b: 0x000c, 0x115c: 0x000c, 0x115d: 0x000c,
+	0x115e: 0x000c, 0x1160: 0x000c, 0x1162: 0x000c,
+	0x1165: 0x000c, 0x1166: 0x000c, 0x1167: 0x000c, 0x1168: 0x000c, 0x1169: 0x000c,
+	0x116a: 0x000c, 0x116b: 0x000c, 0x116c: 0x000c,
+	0x1173: 0x000c, 0x1174: 0x000c, 0x1175: 0x000c,
+	0x1176: 0x000c, 0x1177: 0x000c, 0x1178: 0x000c, 0x1179: 0x000c, 0x117a: 0x000c, 0x117b: 0x000c,
+	0x117c: 0x000c, 0x117f: 0x000c,
+	// Block 0x46, offset 0x1180
+	0x11b0: 0x000c, 0x11b1: 0x000c, 0x11b2: 0x000c, 0x11b3: 0x000c, 0x11b4: 0x000c, 0x11b5: 0x000c,
+	0x11b6: 0x000c, 0x11b7: 0x000c, 0x11b8: 0x000c, 0x11b9: 0x000c, 0x11ba: 0x000c, 0x11bb: 0x000c,
+	0x11bc: 0x000c, 0x11bd: 0x000c, 0x11be: 0x000c, 0x11bf: 0x000c,
+	// Block 0x47, offset 0x11c0
+	0x11c0: 0x000c, 0x11c1: 0x000c, 0x11c2: 0x000c, 0x11c3: 0x000c, 0x11c4: 0x000c, 0x11c5: 0x000c,
+	0x11c6: 0x000c, 0x11c7: 0x000c, 0x11c8: 0x000c, 0x11c9: 0x000c, 0x11ca: 0x000c, 0x11cb: 0x000c,
+	0x11cc: 0x000c, 0x11cd: 0x000c, 0x11ce: 0x000c,
+	// Block 0x48, offset 0x1200
+	0x1200: 0x000c, 0x1201: 0x000c, 0x1202: 0x000c, 0x1203: 0x000c,
+	0x1234: 0x000c,
+	0x1236: 0x000c, 0x1237: 0x000c, 0x1238: 0x000c, 0x1239: 0x000c, 0x123a: 0x000c,
+	0x123c: 0x000c,
+	// Block 0x49, offset 0x1240
+	0x1242: 0x000c,
+	0x126b: 0x000c, 0x126c: 0x000c, 0x126d: 0x000c, 0x126e: 0x000c, 0x126f: 0x000c,
+	0x1270: 0x000c, 0x1271: 0x000c, 0x1272: 0x000c, 0x1273: 0x000c,
+	// Block 0x4a, offset 0x1280
+	0x1280: 0x000c, 0x1281: 0x000c,
+	0x12a2: 0x000c, 0x12a3: 0x000c,
+	0x12a4: 0x000c, 0x12a5: 0x000c, 0x12a8: 0x000c, 0x12a9: 0x000c,
+	0x12ab: 0x000c, 0x12ac: 0x000c, 0x12ad: 0x000c,
+	// Block 0x4b, offset 0x12c0
+	0x12e6: 0x000c, 0x12e8: 0x000c, 0x12e9: 0x000c,
+	0x12ed: 0x000c, 0x12ef: 0x000c,
+	0x12f0: 0x000c, 0x12f1: 0x000c,
+	// Block 0x4c, offset 0x1300
+	0x132c: 0x000c, 0x132d: 0x000c, 0x132e: 0x000c, 0x132f: 0x000c,
+	0x1330: 0x000c, 0x1331: 0x000c, 0x1332: 0x000c, 0x1333: 0x000c,
+	0x1336: 0x000c, 0x1337: 0x000c,
+	// Block 0x4d, offset 0x1340
+	0x1350: 0x000c, 0x1351: 0x000c,
+	0x1352: 0x000c, 0x1354: 0x000c, 0x1355: 0x000c, 0x1356: 0x000c, 0x1357: 0x000c,
+	0x1358: 0x000c, 0x1359: 0x000c, 0x135a: 0x000c, 0x135b: 0x000c, 0x135c: 0x000c, 0x135d: 0x000c,
+	0x135e: 0x000c, 0x135f: 0x000c, 0x1360: 0x000c, 0x1362: 0x000c, 0x1363: 0x000c,
+	0x1364: 0x000c, 0x1365: 0x000c, 0x1366: 0x000c, 0x1367: 0x000c, 0x1368: 0x000c,
+	0x136d: 0x000c,
+	0x1374: 0x000c,
+	0x1378: 0x000c, 0x1379: 0x000c,
+	// Block 0x4e, offset 0x1380
+	0x13bd: 0x000a, 0x13bf: 0x000a,
+	// Block 0x4f, offset 0x13c0
+	0x13c0: 0x000a, 0x13c1: 0x000a,
+	0x13cd: 0x000a, 0x13ce: 0x000a, 0x13cf: 0x000a,
+	0x13dd: 0x000a,
+	0x13de: 0x000a, 0x13df: 0x000a,
+	0x13ed: 0x000a, 0x13ee: 0x000a, 0x13ef: 0x000a,
+	0x13fd: 0x000a, 0x13fe: 0x000a,
+	// Block 0x50, offset 0x1400
+	0x1400: 0x0009, 0x1401: 0x0009, 0x1402: 0x0009, 0x1403: 0x0009, 0x1404: 0x0009, 0x1405: 0x0009,
+	0x1406: 0x0009, 0x1407: 0x0009, 0x1408: 0x0009, 0x1409: 0x0009, 0x140a: 0x0009, 0x140b: 0x000b,
+	0x140c: 0x000b, 0x140d: 0x000b, 0x140f: 0x0001, 0x1410: 0x000a, 0x1411: 0x000a,
+	0x1412: 0x000a, 0x1413: 0x000a, 0x1414: 0x000a, 0x1415: 0x000a, 0x1416: 0x000a, 0x1417: 0x000a,
+	0x1418: 0x000a, 0x1419: 0x000a, 0x141a: 0x000a, 0x141b: 0x000a, 0x141c: 0x000a, 0x141d: 0x000a,
+	0x141e: 0x000a, 0x141f: 0x000a, 0x1420: 0x000a, 0x1421: 0x000a, 0x1422: 0x000a, 0x1423: 0x000a,
+	0x1424: 0x000a, 0x1425: 0x000a, 0x1426: 0x000a, 0x1427: 0x000a, 0x1428: 0x0009, 0x1429: 0x0007,
+	0x142a: 0x000e, 0x142b: 0x000e, 0x142c: 0x000e, 0x142d: 0x000e, 0x142e: 0x000e, 0x142f: 0x0006,
+	0x1430: 0x0004, 0x1431: 0x0004, 0x1432: 0x0004, 0x1433: 0x0004, 0x1434: 0x0004, 0x1435: 0x000a,
+	0x1436: 0x000a, 0x1437: 0x000a, 0x1438: 0x000a, 0x1439: 0x000a, 0x143a: 0x000a, 0x143b: 0x000a,
+	0x143c: 0x000a, 0x143d: 0x000a, 0x143e: 0x000a, 0x143f: 0x000a,
+	// Block 0x51, offset 0x1440
+	0x1440: 0x000a, 0x1441: 0x000a, 0x1442: 0x000a, 0x1443: 0x000a, 0x1444: 0x0006, 0x1445: 0x009a,
+	0x1446: 0x008a, 0x1447: 0x000a, 0x1448: 0x000a, 0x1449: 0x000a, 0x144a: 0x000a, 0x144b: 0x000a,
+	0x144c: 0x000a, 0x144d: 0x000a, 0x144e: 0x000a, 0x144f: 0x000a, 0x1450: 0x000a, 0x1451: 0x000a,
+	0x1452: 0x000a, 0x1453: 0x000a, 0x1454: 0x000a, 0x1455: 0x000a, 0x1456: 0x000a, 0x1457: 0x000a,
+	0x1458: 0x000a, 0x1459: 0x000a, 0x145a: 0x000a, 0x145b: 0x000a, 0x145c: 0x000a, 0x145d: 0x000a,
+	0x145e: 0x000a, 0x145f: 0x0009, 0x1460: 0x000b, 0x1461: 0x000b, 0x1462: 0x000b, 0x1463: 0x000b,
+	0x1464: 0x000b, 0x1465: 0x000b, 0x1466: 0x000e, 0x1467: 0x000e, 0x1468: 0x000e, 0x1469: 0x000e,
+	0x146a: 0x000b, 0x146b: 0x000b, 0x146c: 0x000b, 0x146d: 0x000b, 0x146e: 0x000b, 0x146f: 0x000b,
+	0x1470: 0x0002, 0x1474: 0x0002, 0x1475: 0x0002,
+	0x1476: 0x0002, 0x1477: 0x0002, 0x1478: 0x0002, 0x1479: 0x0002, 0x147a: 0x0003, 0x147b: 0x0003,
+	0x147c: 0x000a, 0x147d: 0x009a, 0x147e: 0x008a,
+	// Block 0x52, offset 0x1480
+	0x1480: 0x0002, 0x1481: 0x0002, 0x1482: 0x0002, 0x1483: 0x0002, 0x1484: 0x0002, 0x1485: 0x0002,
+	0x1486: 0x0002, 0x1487: 0x0002, 0x1488: 0x0002, 0x1489: 0x0002, 0x148a: 0x0003, 0x148b: 0x0003,
+	0x148c: 0x000a, 0x148d: 0x009a, 0x148e: 0x008a,
+	0x14a0: 0x0004, 0x14a1: 0x0004, 0x14a2: 0x0004, 0x14a3: 0x0004,
+	0x14a4: 0x0004, 0x14a5: 0x0004, 0x14a6: 0x0004, 0x14a7: 0x0004, 0x14a8: 0x0004, 0x14a9: 0x0004,
+	0x14aa: 0x0004, 0x14ab: 0x0004, 0x14ac: 0x0004, 0x14ad: 0x0004, 0x14ae: 0x0004, 0x14af: 0x0004,
+	0x14b0: 0x0004, 0x14b1: 0x0004, 0x14b2: 0x0004, 0x14b3: 0x0004, 0x14b4: 0x0004, 0x14b5: 0x0004,
+	0x14b6: 0x0004, 0x14b7: 0x0004, 0x14b8: 0x0004, 0x14b9: 0x0004, 0x14ba: 0x0004, 0x14bb: 0x0004,
+	0x14bc: 0x0004, 0x14bd: 0x0004, 0x14be: 0x0004, 0x14bf: 0x0004,
+	// Block 0x53, offset 0x14c0
+	0x14c0: 0x0004, 0x14c1: 0x0004, 0x14c2: 0x0004, 0x14c3: 0x0004, 0x14c4: 0x0004, 0x14c5: 0x0004,
+	0x14c6: 0x0004, 0x14c7: 0x0004, 0x14c8: 0x0004, 0x14c9: 0x0004, 0x14ca: 0x0004, 0x14cb: 0x0004,
+	0x14cc: 0x0004, 0x14cd: 0x0004, 0x14ce: 0x0004, 0x14cf: 0x0004, 0x14d0: 0x000c, 0x14d1: 0x000c,
+	0x14d2: 0x000c, 0x14d3: 0x000c, 0x14d4: 0x000c, 0x14d5: 0x000c, 0x14d6: 0x000c, 0x14d7: 0x000c,
+	0x14d8: 0x000c, 0x14d9: 0x000c, 0x14da: 0x000c, 0x14db: 0x000c, 0x14dc: 0x000c, 0x14dd: 0x000c,
+	0x14de: 0x000c, 0x14df: 0x000c, 0x14e0: 0x000c, 0x14e1: 0x000c, 0x14e2: 0x000c, 0x14e3: 0x000c,
+	0x14e4: 0x000c, 0x14e5: 0x000c, 0x14e6: 0x000c, 0x14e7: 0x000c, 0x14e8: 0x000c, 0x14e9: 0x000c,
+	0x14ea: 0x000c, 0x14eb: 0x000c, 0x14ec: 0x000c, 0x14ed: 0x000c, 0x14ee: 0x000c, 0x14ef: 0x000c,
+	0x14f0: 0x000c,
+	// Block 0x54, offset 0x1500
+	0x1500: 0x000a, 0x1501: 0x000a, 0x1503: 0x000a, 0x1504: 0x000a, 0x1505: 0x000a,
+	0x1506: 0x000a, 0x1508: 0x000a, 0x1509: 0x000a,
+	0x1514: 0x000a, 0x1516: 0x000a, 0x1517: 0x000a,
+	0x1518: 0x000a,
+	0x151e: 0x000a, 0x151f: 0x000a, 0x1520: 0x000a, 0x1521: 0x000a, 0x1522: 0x000a, 0x1523: 0x000a,
+	0x1525: 0x000a, 0x1527: 0x000a, 0x1529: 0x000a,
+	0x152e: 0x0004,
+	0x153a: 0x000a, 0x153b: 0x000a,
+	// Block 0x55, offset 0x1540
+	0x1540: 0x000a, 0x1541: 0x000a, 0x1542: 0x000a, 0x1543: 0x000a, 0x1544: 0x000a,
+	0x154a: 0x000a, 0x154b: 0x000a,
+	0x154c: 0x000a, 0x154d: 0x000a, 0x1550: 0x000a, 0x1551: 0x000a,
+	0x1552: 0x000a, 0x1553: 0x000a, 0x1554: 0x000a, 0x1555: 0x000a, 0x1556: 0x000a, 0x1557: 0x000a,
+	0x1558: 0x000a, 0x1559: 0x000a, 0x155a: 0x000a, 0x155b: 0x000a, 0x155c: 0x000a, 0x155d: 0x000a,
+	0x155e: 0x000a, 0x155f: 0x000a,
+	// Block 0x56, offset 0x1580
+	0x1589: 0x000a, 0x158a: 0x000a, 0x158b: 0x000a,
+	0x1590: 0x000a, 0x1591: 0x000a,
+	0x1592: 0x000a, 0x1593: 0x000a, 0x1594: 0x000a, 0x1595: 0x000a, 0x1596: 0x000a, 0x1597: 0x000a,
+	0x1598: 0x000a, 0x1599: 0x000a, 0x159a: 0x000a, 0x159b: 0x000a, 0x159c: 0x000a, 0x159d: 0x000a,
+	0x159e: 0x000a, 0x159f: 0x000a, 0x15a0: 0x000a, 0x15a1: 0x000a, 0x15a2: 0x000a, 0x15a3: 0x000a,
+	0x15a4: 0x000a, 0x15a5: 0x000a, 0x15a6: 0x000a, 0x15a7: 0x000a, 0x15a8: 0x000a, 0x15a9: 0x000a,
+	0x15aa: 0x000a, 0x15ab: 0x000a, 0x15ac: 0x000a, 0x15ad: 0x000a, 0x15ae: 0x000a, 0x15af: 0x000a,
+	0x15b0: 0x000a, 0x15b1: 0x000a, 0x15b2: 0x000a, 0x15b3: 0x000a, 0x15b4: 0x000a, 0x15b5: 0x000a,
+	0x15b6: 0x000a, 0x15b7: 0x000a, 0x15b8: 0x000a, 0x15b9: 0x000a, 0x15ba: 0x000a, 0x15bb: 0x000a,
+	0x15bc: 0x000a, 0x15bd: 0x000a, 0x15be: 0x000a, 0x15bf: 0x000a,
+	// Block 0x57, offset 0x15c0
+	0x15c0: 0x000a, 0x15c1: 0x000a, 0x15c2: 0x000a, 0x15c3: 0x000a, 0x15c4: 0x000a, 0x15c5: 0x000a,
+	0x15c6: 0x000a, 0x15c7: 0x000a, 0x15c8: 0x000a, 0x15c9: 0x000a, 0x15ca: 0x000a, 0x15cb: 0x000a,
+	0x15cc: 0x000a, 0x15cd: 0x000a, 0x15ce: 0x000a, 0x15cf: 0x000a, 0x15d0: 0x000a, 0x15d1: 0x000a,
+	0x15d2: 0x000a, 0x15d3: 0x000a, 0x15d4: 0x000a, 0x15d5: 0x000a, 0x15d6: 0x000a, 0x15d7: 0x000a,
+	0x15d8: 0x000a, 0x15d9: 0x000a, 0x15da: 0x000a, 0x15db: 0x000a, 0x15dc: 0x000a, 0x15dd: 0x000a,
+	0x15de: 0x000a, 0x15df: 0x000a, 0x15e0: 0x000a, 0x15e1: 0x000a, 0x15e2: 0x000a, 0x15e3: 0x000a,
+	0x15e4: 0x000a, 0x15e5: 0x000a, 0x15e6: 0x000a, 0x15e7: 0x000a, 0x15e8: 0x000a, 0x15e9: 0x000a,
+	0x15ea: 0x000a, 0x15eb: 0x000a, 0x15ec: 0x000a, 0x15ed: 0x000a, 0x15ee: 0x000a, 0x15ef: 0x000a,
+	0x15f0: 0x000a, 0x15f1: 0x000a, 0x15f2: 0x000a, 0x15f3: 0x000a, 0x15f4: 0x000a, 0x15f5: 0x000a,
+	0x15f6: 0x000a, 0x15f7: 0x000a, 0x15f8: 0x000a, 0x15f9: 0x000a, 0x15fa: 0x000a, 0x15fb: 0x000a,
+	0x15fc: 0x000a, 0x15fd: 0x000a, 0x15fe: 0x000a, 0x15ff: 0x000a,
+	// Block 0x58, offset 0x1600
+	0x1600: 0x000a, 0x1601: 0x000a, 0x1602: 0x000a, 0x1603: 0x000a, 0x1604: 0x000a, 0x1605: 0x000a,
+	0x1606: 0x000a, 0x1607: 0x000a, 0x1608: 0x000a, 0x1609: 0x000a, 0x160a: 0x000a, 0x160b: 0x000a,
+	0x160c: 0x000a, 0x160d: 0x000a, 0x160e: 0x000a, 0x160f: 0x000a, 0x1610: 0x000a, 0x1611: 0x000a,
+	0x1612: 0x0003, 0x1613: 0x0004, 0x1614: 0x000a, 0x1615: 0x000a, 0x1616: 0x000a, 0x1617: 0x000a,
+	0x1618: 0x000a, 0x1619: 0x000a, 0x161a: 0x000a, 0x161b: 0x000a, 0x161c: 0x000a, 0x161d: 0x000a,
+	0x161e: 0x000a, 0x161f: 0x000a, 0x1620: 0x000a, 0x1621: 0x000a, 0x1622: 0x000a, 0x1623: 0x000a,
+	0x1624: 0x000a, 0x1625: 0x000a, 0x1626: 0x000a, 0x1627: 0x000a, 0x1628: 0x000a, 0x1629: 0x000a,
+	0x162a: 0x000a, 0x162b: 0x000a, 0x162c: 0x000a, 0x162d: 0x000a, 0x162e: 0x000a, 0x162f: 0x000a,
+	0x1630: 0x000a, 0x1631: 0x000a, 0x1632: 0x000a, 0x1633: 0x000a, 0x1634: 0x000a, 0x1635: 0x000a,
+	0x1636: 0x000a, 0x1637: 0x000a, 0x1638: 0x000a, 0x1639: 0x000a, 0x163a: 0x000a, 0x163b: 0x000a,
+	0x163c: 0x000a, 0x163d: 0x000a, 0x163e: 0x000a, 0x163f: 0x000a,
+	// Block 0x59, offset 0x1640
+	0x1640: 0x000a, 0x1641: 0x000a, 0x1642: 0x000a, 0x1643: 0x000a, 0x1644: 0x000a, 0x1645: 0x000a,
+	0x1646: 0x000a, 0x1647: 0x000a, 0x1648: 0x003a, 0x1649: 0x002a, 0x164a: 0x003a, 0x164b: 0x002a,
+	0x164c: 0x000a, 0x164d: 0x000a, 0x164e: 0x000a, 0x164f: 0x000a, 0x1650: 0x000a, 0x1651: 0x000a,
+	0x1652: 0x000a, 0x1653: 0x000a, 0x1654: 0x000a, 0x1655: 0x000a, 0x1656: 0x000a, 0x1657: 0x000a,
+	0x1658: 0x000a, 0x1659: 0x000a, 0x165a: 0x000a, 0x165b: 0x000a, 0x165c: 0x000a, 0x165d: 0x000a,
+	0x165e: 0x000a, 0x165f: 0x000a, 0x1660: 0x000a, 0x1661: 0x000a, 0x1662: 0x000a, 0x1663: 0x000a,
+	0x1664: 0x000a, 0x1665: 0x000a, 0x1666: 0x000a, 0x1667: 0x000a, 0x1668: 0x000a, 0x1669: 0x009a,
+	0x166a: 0x008a, 0x166b: 0x000a, 0x166c: 0x000a, 0x166d: 0x000a, 0x166e: 0x000a, 0x166f: 0x000a,
+	0x1670: 0x000a, 0x1671: 0x000a, 0x1672: 0x000a, 0x1673: 0x000a, 0x1674: 0x000a, 0x1675: 0x000a,
+	// Block 0x5a, offset 0x1680
+	0x16bb: 0x000a,
+	0x16bc: 0x000a, 0x16bd: 0x000a, 0x16be: 0x000a, 0x16bf: 0x000a,
+	// Block 0x5b, offset 0x16c0
+	0x16c0: 0x000a, 0x16c1: 0x000a, 0x16c2: 0x000a, 0x16c3: 0x000a, 0x16c4: 0x000a, 0x16c5: 0x000a,
+	0x16c6: 0x000a, 0x16c7: 0x000a, 0x16c8: 0x000a, 0x16c9: 0x000a, 0x16ca: 0x000a, 0x16cb: 0x000a,
+	0x16cc: 0x000a, 0x16cd: 0x000a, 0x16ce: 0x000a, 0x16cf: 0x000a, 0x16d0: 0x000a, 0x16d1: 0x000a,
+	0x16d2: 0x000a, 0x16d3: 0x000a, 0x16d4: 0x000a, 0x16d6: 0x000a, 0x16d7: 0x000a,
+	0x16d8: 0x000a, 0x16d9: 0x000a, 0x16da: 0x000a, 0x16db: 0x000a, 0x16dc: 0x000a, 0x16dd: 0x000a,
+	0x16de: 0x000a, 0x16df: 0x000a, 0x16e0: 0x000a, 0x16e1: 0x000a, 0x16e2: 0x000a, 0x16e3: 0x000a,
+	0x16e4: 0x000a, 0x16e5: 0x000a, 0x16e6: 0x000a, 0x16e7: 0x000a, 0x16e8: 0x000a, 0x16e9: 0x000a,
+	0x16ea: 0x000a, 0x16eb: 0x000a, 0x16ec: 0x000a, 0x16ed: 0x000a, 0x16ee: 0x000a, 0x16ef: 0x000a,
+	0x16f0: 0x000a, 0x16f1: 0x000a, 0x16f2: 0x000a, 0x16f3: 0x000a, 0x16f4: 0x000a, 0x16f5: 0x000a,
+	0x16f6: 0x000a, 0x16f7: 0x000a, 0x16f8: 0x000a, 0x16f9: 0x000a, 0x16fa: 0x000a, 0x16fb: 0x000a,
+	0x16fc: 0x000a, 0x16fd: 0x000a, 0x16fe: 0x000a, 0x16ff: 0x000a,
+	// Block 0x5c, offset 0x1700
+	0x1700: 0x000a, 0x1701: 0x000a, 0x1702: 0x000a, 0x1703: 0x000a, 0x1704: 0x000a, 0x1705: 0x000a,
+	0x1706: 0x000a, 0x1707: 0x000a, 0x1708: 0x000a, 0x1709: 0x000a, 0x170a: 0x000a, 0x170b: 0x000a,
+	0x170c: 0x000a, 0x170d: 0x000a, 0x170e: 0x000a, 0x170f: 0x000a, 0x1710: 0x000a, 0x1711: 0x000a,
+	0x1712: 0x000a, 0x1713: 0x000a, 0x1714: 0x000a, 0x1715: 0x000a, 0x1716: 0x000a, 0x1717: 0x000a,
+	0x1718: 0x000a, 0x1719: 0x000a, 0x171a: 0x000a, 0x171b: 0x000a, 0x171c: 0x000a, 0x171d: 0x000a,
+	0x171e: 0x000a, 0x171f: 0x000a, 0x1720: 0x000a, 0x1721: 0x000a, 0x1722: 0x000a, 0x1723: 0x000a,
+	0x1724: 0x000a, 0x1725: 0x000a, 0x1726: 0x000a,
+	// Block 0x5d, offset 0x1740
+	0x1740: 0x000a, 0x1741: 0x000a, 0x1742: 0x000a, 0x1743: 0x000a, 0x1744: 0x000a, 0x1745: 0x000a,
+	0x1746: 0x000a, 0x1747: 0x000a, 0x1748: 0x000a, 0x1749: 0x000a, 0x174a: 0x000a,
+	0x1760: 0x000a, 0x1761: 0x000a, 0x1762: 0x000a, 0x1763: 0x000a,
+	0x1764: 0x000a, 0x1765: 0x000a, 0x1766: 0x000a, 0x1767: 0x000a, 0x1768: 0x000a, 0x1769: 0x000a,
+	0x176a: 0x000a, 0x176b: 0x000a, 0x176c: 0x000a, 0x176d: 0x000a, 0x176e: 0x000a, 0x176f: 0x000a,
+	0x1770: 0x000a, 0x1771: 0x000a, 0x1772: 0x000a, 0x1773: 0x000a, 0x1774: 0x000a, 0x1775: 0x000a,
+	0x1776: 0x000a, 0x1777: 0x000a, 0x1778: 0x000a, 0x1779: 0x000a, 0x177a: 0x000a, 0x177b: 0x000a,
+	0x177c: 0x000a, 0x177d: 0x000a, 0x177e: 0x000a, 0x177f: 0x000a,
+	// Block 0x5e, offset 0x1780
+	0x1780: 0x000a, 0x1781: 0x000a, 0x1782: 0x000a, 0x1783: 0x000a, 0x1784: 0x000a, 0x1785: 0x000a,
+	0x1786: 0x000a, 0x1787: 0x000a, 0x1788: 0x0002, 0x1789: 0x0002, 0x178a: 0x0002, 0x178b: 0x0002,
+	0x178c: 0x0002, 0x178d: 0x0002, 0x178e: 0x0002, 0x178f: 0x0002, 0x1790: 0x0002, 0x1791: 0x0002,
+	0x1792: 0x0002, 0x1793: 0x0002, 0x1794: 0x0002, 0x1795: 0x0002, 0x1796: 0x0002, 0x1797: 0x0002,
+	0x1798: 0x0002, 0x1799: 0x0002, 0x179a: 0x0002, 0x179b: 0x0002,
+	// Block 0x5f, offset 0x17c0
+	0x17ea: 0x000a, 0x17eb: 0x000a, 0x17ec: 0x000a, 0x17ed: 0x000a, 0x17ee: 0x000a, 0x17ef: 0x000a,
+	0x17f0: 0x000a, 0x17f1: 0x000a, 0x17f2: 0x000a, 0x17f3: 0x000a, 0x17f4: 0x000a, 0x17f5: 0x000a,
+	0x17f6: 0x000a, 0x17f7: 0x000a, 0x17f8: 0x000a, 0x17f9: 0x000a, 0x17fa: 0x000a, 0x17fb: 0x000a,
+	0x17fc: 0x000a, 0x17fd: 0x000a, 0x17fe: 0x000a, 0x17ff: 0x000a,
+	// Block 0x60, offset 0x1800
+	0x1800: 0x000a, 0x1801: 0x000a, 0x1802: 0x000a, 0x1803: 0x000a, 0x1804: 0x000a, 0x1805: 0x000a,
+	0x1806: 0x000a, 0x1807: 0x000a, 0x1808: 0x000a, 0x1809: 0x000a, 0x180a: 0x000a, 0x180b: 0x000a,
+	0x180c: 0x000a, 0x180d: 0x000a, 0x180e: 0x000a, 0x180f: 0x000a, 0x1810: 0x000a, 0x1811: 0x000a,
+	0x1812: 0x000a, 0x1813: 0x000a, 0x1814: 0x000a, 0x1815: 0x000a, 0x1816: 0x000a, 0x1817: 0x000a,
+	0x1818: 0x000a, 0x1819: 0x000a, 0x181a: 0x000a, 0x181b: 0x000a, 0x181c: 0x000a, 0x181d: 0x000a,
+	0x181e: 0x000a, 0x181f: 0x000a, 0x1820: 0x000a, 0x1821: 0x000a, 0x1822: 0x000a, 0x1823: 0x000a,
+	0x1824: 0x000a, 0x1825: 0x000a, 0x1826: 0x000a, 0x1827: 0x000a, 0x1828: 0x000a, 0x1829: 0x000a,
+	0x182a: 0x000a, 0x182b: 0x000a, 0x182d: 0x000a, 0x182e: 0x000a, 0x182f: 0x000a,
+	0x1830: 0x000a, 0x1831: 0x000a, 0x1832: 0x000a, 0x1833: 0x000a, 0x1834: 0x000a, 0x1835: 0x000a,
+	0x1836: 0x000a, 0x1837: 0x000a, 0x1838: 0x000a, 0x1839: 0x000a, 0x183a: 0x000a, 0x183b: 0x000a,
+	0x183c: 0x000a, 0x183d: 0x000a, 0x183e: 0x000a, 0x183f: 0x000a,
+	// Block 0x61, offset 0x1840
+	0x1840: 0x000a, 0x1841: 0x000a, 0x1842: 0x000a, 0x1843: 0x000a, 0x1844: 0x000a, 0x1845: 0x000a,
+	0x1846: 0x000a, 0x1847: 0x000a, 0x1848: 0x000a, 0x1849: 0x000a, 0x184a: 0x000a, 0x184b: 0x000a,
+	0x184c: 0x000a, 0x184d: 0x000a, 0x184e: 0x000a, 0x184f: 0x000a, 0x1850: 0x000a, 0x1851: 0x000a,
+	0x1852: 0x000a, 0x1853: 0x000a, 0x1854: 0x000a, 0x1855: 0x000a, 0x1856: 0x000a, 0x1857: 0x000a,
+	0x1858: 0x000a, 0x1859: 0x000a, 0x185a: 0x000a, 0x185b: 0x000a, 0x185c: 0x000a, 0x185d: 0x000a,
+	0x185e: 0x000a, 0x185f: 0x000a, 0x1860: 0x000a, 0x1861: 0x000a, 0x1862: 0x000a, 0x1863: 0x000a,
+	0x1864: 0x000a, 0x1865: 0x000a, 0x1866: 0x000a, 0x1867: 0x000a, 0x1868: 0x003a, 0x1869: 0x002a,
+	0x186a: 0x003a, 0x186b: 0x002a, 0x186c: 0x003a, 0x186d: 0x002a, 0x186e: 0x003a, 0x186f: 0x002a,
+	0x1870: 0x003a, 0x1871: 0x002a, 0x1872: 0x003a, 0x1873: 0x002a, 0x1874: 0x003a, 0x1875: 0x002a,
+	0x1876: 0x000a, 0x1877: 0x000a, 0x1878: 0x000a, 0x1879: 0x000a, 0x187a: 0x000a, 0x187b: 0x000a,
+	0x187c: 0x000a, 0x187d: 0x000a, 0x187e: 0x000a, 0x187f: 0x000a,
+	// Block 0x62, offset 0x1880
+	0x1880: 0x000a, 0x1881: 0x000a, 0x1882: 0x000a, 0x1883: 0x000a, 0x1884: 0x000a, 0x1885: 0x009a,
+	0x1886: 0x008a, 0x1887: 0x000a, 0x1888: 0x000a, 0x1889: 0x000a, 0x188a: 0x000a, 0x188b: 0x000a,
+	0x188c: 0x000a, 0x188d: 0x000a, 0x188e: 0x000a, 0x188f: 0x000a, 0x1890: 0x000a, 0x1891: 0x000a,
+	0x1892: 0x000a, 0x1893: 0x000a, 0x1894: 0x000a, 0x1895: 0x000a, 0x1896: 0x000a, 0x1897: 0x000a,
+	0x1898: 0x000a, 0x1899: 0x000a, 0x189a: 0x000a, 0x189b: 0x000a, 0x189c: 0x000a, 0x189d: 0x000a,
+	0x189e: 0x000a, 0x189f: 0x000a, 0x18a0: 0x000a, 0x18a1: 0x000a, 0x18a2: 0x000a, 0x18a3: 0x000a,
+	0x18a4: 0x000a, 0x18a5: 0x000a, 0x18a6: 0x003a, 0x18a7: 0x002a, 0x18a8: 0x003a, 0x18a9: 0x002a,
+	0x18aa: 0x003a, 0x18ab: 0x002a, 0x18ac: 0x003a, 0x18ad: 0x002a, 0x18ae: 0x003a, 0x18af: 0x002a,
+	0x18b0: 0x000a, 0x18b1: 0x000a, 0x18b2: 0x000a, 0x18b3: 0x000a, 0x18b4: 0x000a, 0x18b5: 0x000a,
+	0x18b6: 0x000a, 0x18b7: 0x000a, 0x18b8: 0x000a, 0x18b9: 0x000a, 0x18ba: 0x000a, 0x18bb: 0x000a,
+	0x18bc: 0x000a, 0x18bd: 0x000a, 0x18be: 0x000a, 0x18bf: 0x000a,
+	// Block 0x63, offset 0x18c0
+	0x18c0: 0x000a, 0x18c1: 0x000a, 0x18c2: 0x000a, 0x18c3: 0x007a, 0x18c4: 0x006a, 0x18c5: 0x009a,
+	0x18c6: 0x008a, 0x18c7: 0x00ba, 0x18c8: 0x00aa, 0x18c9: 0x009a, 0x18ca: 0x008a, 0x18cb: 0x007a,
+	0x18cc: 0x006a, 0x18cd: 0x00da, 0x18ce: 0x002a, 0x18cf: 0x003a, 0x18d0: 0x00ca, 0x18d1: 0x009a,
+	0x18d2: 0x008a, 0x18d3: 0x007a, 0x18d4: 0x006a, 0x18d5: 0x009a, 0x18d6: 0x008a, 0x18d7: 0x00ba,
+	0x18d8: 0x00aa, 0x18d9: 0x000a, 0x18da: 0x000a, 0x18db: 0x000a, 0x18dc: 0x000a, 0x18dd: 0x000a,
+	0x18de: 0x000a, 0x18df: 0x000a, 0x18e0: 0x000a, 0x18e1: 0x000a, 0x18e2: 0x000a, 0x18e3: 0x000a,
+	0x18e4: 0x000a, 0x18e5: 0x000a, 0x18e6: 0x000a, 0x18e7: 0x000a, 0x18e8: 0x000a, 0x18e9: 0x000a,
+	0x18ea: 0x000a, 0x18eb: 0x000a, 0x18ec: 0x000a, 0x18ed: 0x000a, 0x18ee: 0x000a, 0x18ef: 0x000a,
+	0x18f0: 0x000a, 0x18f1: 0x000a, 0x18f2: 0x000a, 0x18f3: 0x000a, 0x18f4: 0x000a, 0x18f5: 0x000a,
+	0x18f6: 0x000a, 0x18f7: 0x000a, 0x18f8: 0x000a, 0x18f9: 0x000a, 0x18fa: 0x000a, 0x18fb: 0x000a,
+	0x18fc: 0x000a, 0x18fd: 0x000a, 0x18fe: 0x000a, 0x18ff: 0x000a,
+	// Block 0x64, offset 0x1900
+	0x1900: 0x000a, 0x1901: 0x000a, 0x1902: 0x000a, 0x1903: 0x000a, 0x1904: 0x000a, 0x1905: 0x000a,
+	0x1906: 0x000a, 0x1907: 0x000a, 0x1908: 0x000a, 0x1909: 0x000a, 0x190a: 0x000a, 0x190b: 0x000a,
+	0x190c: 0x000a, 0x190d: 0x000a, 0x190e: 0x000a, 0x190f: 0x000a, 0x1910: 0x000a, 0x1911: 0x000a,
+	0x1912: 0x000a, 0x1913: 0x000a, 0x1914: 0x000a, 0x1915: 0x000a, 0x1916: 0x000a, 0x1917: 0x000a,
+	0x1918: 0x003a, 0x1919: 0x002a, 0x191a: 0x003a, 0x191b: 0x002a, 0x191c: 0x000a, 0x191d: 0x000a,
+	0x191e: 0x000a, 0x191f: 0x000a, 0x1920: 0x000a, 0x1921: 0x000a, 0x1922: 0x000a, 0x1923: 0x000a,
+	0x1924: 0x000a, 0x1925: 0x000a, 0x1926: 0x000a, 0x1927: 0x000a, 0x1928: 0x000a, 0x1929: 0x000a,
+	0x192a: 0x000a, 0x192b: 0x000a, 0x192c: 0x000a, 0x192d: 0x000a, 0x192e: 0x000a, 0x192f: 0x000a,
+	0x1930: 0x000a, 0x1931: 0x000a, 0x1932: 0x000a, 0x1933: 0x000a, 0x1934: 0x000a, 0x1935: 0x000a,
+	0x1936: 0x000a, 0x1937: 0x000a, 0x1938: 0x000a, 0x1939: 0x000a, 0x193a: 0x000a, 0x193b: 0x000a,
+	0x193c: 0x003a, 0x193d: 0x002a, 0x193e: 0x000a, 0x193f: 0x000a,
+	// Block 0x65, offset 0x1940
+	0x1940: 0x000a, 0x1941: 0x000a, 0x1942: 0x000a, 0x1943: 0x000a, 0x1944: 0x000a, 0x1945: 0x000a,
+	0x1946: 0x000a, 0x1947: 0x000a, 0x1948: 0x000a, 0x1949: 0x000a, 0x194a: 0x000a, 0x194b: 0x000a,
+	0x194c: 0x000a, 0x194d: 0x000a, 0x194e: 0x000a, 0x194f: 0x000a, 0x1950: 0x000a, 0x1951: 0x000a,
+	0x1952: 0x000a, 0x1953: 0x000a, 0x1954: 0x000a, 0x1955: 0x000a, 0x1956: 0x000a, 0x1957: 0x000a,
+	0x1958: 0x000a, 0x1959: 0x000a, 0x195a: 0x000a, 0x195b: 0x000a, 0x195c: 0x000a, 0x195d: 0x000a,
+	0x195e: 0x000a, 0x195f: 0x000a, 0x1960: 0x000a, 0x1961: 0x000a, 0x1962: 0x000a, 0x1963: 0x000a,
+	0x1964: 0x000a, 0x1965: 0x000a, 0x1966: 0x000a, 0x1967: 0x000a, 0x1968: 0x000a, 0x1969: 0x000a,
+	0x196a: 0x000a, 0x196b: 0x000a, 0x196c: 0x000a, 0x196d: 0x000a, 0x196e: 0x000a, 0x196f: 0x000a,
+	0x1970: 0x000a, 0x1971: 0x000a, 0x1972: 0x000a, 0x1973: 0x000a,
+	0x1976: 0x000a, 0x1977: 0x000a, 0x1978: 0x000a, 0x1979: 0x000a, 0x197a: 0x000a, 0x197b: 0x000a,
+	0x197c: 0x000a, 0x197d: 0x000a, 0x197e: 0x000a, 0x197f: 0x000a,
+	// Block 0x66, offset 0x1980
+	0x1980: 0x000a, 0x1981: 0x000a, 0x1982: 0x000a, 0x1983: 0x000a, 0x1984: 0x000a, 0x1985: 0x000a,
+	0x1986: 0x000a, 0x1987: 0x000a, 0x1988: 0x000a, 0x1989: 0x000a, 0x198a: 0x000a, 0x198b: 0x000a,
+	0x198c: 0x000a, 0x198d: 0x000a, 0x198e: 0x000a, 0x198f: 0x000a, 0x1990: 0x000a, 0x1991: 0x000a,
+	0x1992: 0x000a, 0x1993: 0x000a, 0x1994: 0x000a, 0x1995: 0x000a, 0x1997: 0x000a,
+	0x1998: 0x000a, 0x1999: 0x000a, 0x199a: 0x000a, 0x199b: 0x000a, 0x199c: 0x000a, 0x199d: 0x000a,
+	0x199e: 0x000a, 0x199f: 0x000a, 0x19a0: 0x000a, 0x19a1: 0x000a, 0x19a2: 0x000a, 0x19a3: 0x000a,
+	0x19a4: 0x000a, 0x19a5: 0x000a, 0x19a6: 0x000a, 0x19a7: 0x000a, 0x19a8: 0x000a, 0x19a9: 0x000a,
+	0x19aa: 0x000a, 0x19ab: 0x000a, 0x19ac: 0x000a, 0x19ad: 0x000a, 0x19ae: 0x000a, 0x19af: 0x000a,
+	0x19b0: 0x000a, 0x19b1: 0x000a, 0x19b2: 0x000a, 0x19b3: 0x000a, 0x19b4: 0x000a, 0x19b5: 0x000a,
+	0x19b6: 0x000a, 0x19b7: 0x000a, 0x19b8: 0x000a, 0x19b9: 0x000a, 0x19ba: 0x000a, 0x19bb: 0x000a,
+	0x19bc: 0x000a, 0x19bd: 0x000a, 0x19be: 0x000a, 0x19bf: 0x000a,
+	// Block 0x67, offset 0x19c0
+	0x19e5: 0x000a, 0x19e6: 0x000a, 0x19e7: 0x000a, 0x19e8: 0x000a, 0x19e9: 0x000a,
+	0x19ea: 0x000a, 0x19ef: 0x000c,
+	0x19f0: 0x000c, 0x19f1: 0x000c,
+	0x19f9: 0x000a, 0x19fa: 0x000a, 0x19fb: 0x000a,
+	0x19fc: 0x000a, 0x19fd: 0x000a, 0x19fe: 0x000a, 0x19ff: 0x000a,
+	// Block 0x68, offset 0x1a00
+	0x1a3f: 0x000c,
+	// Block 0x69, offset 0x1a40
+	0x1a60: 0x000c, 0x1a61: 0x000c, 0x1a62: 0x000c, 0x1a63: 0x000c,
+	0x1a64: 0x000c, 0x1a65: 0x000c, 0x1a66: 0x000c, 0x1a67: 0x000c, 0x1a68: 0x000c, 0x1a69: 0x000c,
+	0x1a6a: 0x000c, 0x1a6b: 0x000c, 0x1a6c: 0x000c, 0x1a6d: 0x000c, 0x1a6e: 0x000c, 0x1a6f: 0x000c,
+	0x1a70: 0x000c, 0x1a71: 0x000c, 0x1a72: 0x000c, 0x1a73: 0x000c, 0x1a74: 0x000c, 0x1a75: 0x000c,
+	0x1a76: 0x000c, 0x1a77: 0x000c, 0x1a78: 0x000c, 0x1a79: 0x000c, 0x1a7a: 0x000c, 0x1a7b: 0x000c,
+	0x1a7c: 0x000c, 0x1a7d: 0x000c, 0x1a7e: 0x000c, 0x1a7f: 0x000c,
+	// Block 0x6a, offset 0x1a80
+	0x1a80: 0x000a, 0x1a81: 0x000a, 0x1a82: 0x000a, 0x1a83: 0x000a, 0x1a84: 0x000a, 0x1a85: 0x000a,
+	0x1a86: 0x000a, 0x1a87: 0x000a, 0x1a88: 0x000a, 0x1a89: 0x000a, 0x1a8a: 0x000a, 0x1a8b: 0x000a,
+	0x1a8c: 0x000a, 0x1a8d: 0x000a, 0x1a8e: 0x000a, 0x1a8f: 0x000a, 0x1a90: 0x000a, 0x1a91: 0x000a,
+	0x1a92: 0x000a, 0x1a93: 0x000a, 0x1a94: 0x000a, 0x1a95: 0x000a, 0x1a96: 0x000a, 0x1a97: 0x000a,
+	0x1a98: 0x000a, 0x1a99: 0x000a, 0x1a9a: 0x000a, 0x1a9b: 0x000a, 0x1a9c: 0x000a, 0x1a9d: 0x000a,
+	0x1a9e: 0x000a, 0x1a9f: 0x000a, 0x1aa0: 0x000a, 0x1aa1: 0x000a, 0x1aa2: 0x003a, 0x1aa3: 0x002a,
+	0x1aa4: 0x003a, 0x1aa5: 0x002a, 0x1aa6: 0x003a, 0x1aa7: 0x002a, 0x1aa8: 0x003a, 0x1aa9: 0x002a,
+	0x1aaa: 0x000a, 0x1aab: 0x000a, 0x1aac: 0x000a, 0x1aad: 0x000a, 0x1aae: 0x000a, 0x1aaf: 0x000a,
+	0x1ab0: 0x000a, 0x1ab1: 0x000a, 0x1ab2: 0x000a, 0x1ab3: 0x000a, 0x1ab4: 0x000a, 0x1ab5: 0x000a,
+	0x1ab6: 0x000a, 0x1ab7: 0x000a, 0x1ab8: 0x000a, 0x1ab9: 0x000a, 0x1aba: 0x000a, 0x1abb: 0x000a,
+	0x1abc: 0x000a, 0x1abd: 0x000a, 0x1abe: 0x000a, 0x1abf: 0x000a,
+	// Block 0x6b, offset 0x1ac0
+	0x1ac0: 0x000a, 0x1ac1: 0x000a, 0x1ac2: 0x000a, 0x1ac3: 0x000a, 0x1ac4: 0x000a, 0x1ac5: 0x000a,
+	0x1ac6: 0x000a, 0x1ac7: 0x000a, 0x1ac8: 0x000a, 0x1ac9: 0x000a, 0x1aca: 0x000a, 0x1acb: 0x000a,
+	0x1acc: 0x000a, 0x1acd: 0x000a, 0x1ace: 0x000a, 0x1acf: 0x000a, 0x1ad0: 0x000a, 0x1ad1: 0x000a,
+	0x1ad2: 0x000a, 0x1ad3: 0x000a, 0x1ad4: 0x000a, 0x1ad5: 0x009a, 0x1ad6: 0x008a, 0x1ad7: 0x00ba,
+	0x1ad8: 0x00aa, 0x1ad9: 0x009a, 0x1ada: 0x008a, 0x1adb: 0x007a, 0x1adc: 0x006a, 0x1add: 0x000a,
+	// Block 0x6c, offset 0x1b00
+	0x1b00: 0x000a, 0x1b01: 0x000a, 0x1b02: 0x000a, 0x1b03: 0x000a, 0x1b04: 0x000a, 0x1b05: 0x000a,
+	0x1b06: 0x000a, 0x1b07: 0x000a, 0x1b08: 0x000a, 0x1b09: 0x000a, 0x1b0a: 0x000a, 0x1b0b: 0x000a,
+	0x1b0c: 0x000a, 0x1b0d: 0x000a, 0x1b0e: 0x000a, 0x1b0f: 0x000a, 0x1b10: 0x000a, 0x1b11: 0x000a,
+	0x1b12: 0x000a, 0x1b13: 0x000a, 0x1b14: 0x000a, 0x1b15: 0x000a, 0x1b16: 0x000a, 0x1b17: 0x000a,
+	0x1b18: 0x000a, 0x1b19: 0x000a, 0x1b1b: 0x000a, 0x1b1c: 0x000a, 0x1b1d: 0x000a,
+	0x1b1e: 0x000a, 0x1b1f: 0x000a, 0x1b20: 0x000a, 0x1b21: 0x000a, 0x1b22: 0x000a, 0x1b23: 0x000a,
+	0x1b24: 0x000a, 0x1b25: 0x000a, 0x1b26: 0x000a, 0x1b27: 0x000a, 0x1b28: 0x000a, 0x1b29: 0x000a,
+	0x1b2a: 0x000a, 0x1b2b: 0x000a, 0x1b2c: 0x000a, 0x1b2d: 0x000a, 0x1b2e: 0x000a, 0x1b2f: 0x000a,
+	0x1b30: 0x000a, 0x1b31: 0x000a, 0x1b32: 0x000a, 0x1b33: 0x000a, 0x1b34: 0x000a, 0x1b35: 0x000a,
+	0x1b36: 0x000a, 0x1b37: 0x000a, 0x1b38: 0x000a, 0x1b39: 0x000a, 0x1b3a: 0x000a, 0x1b3b: 0x000a,
+	0x1b3c: 0x000a, 0x1b3d: 0x000a, 0x1b3e: 0x000a, 0x1b3f: 0x000a,
+	// Block 0x6d, offset 0x1b40
+	0x1b40: 0x000a, 0x1b41: 0x000a, 0x1b42: 0x000a, 0x1b43: 0x000a, 0x1b44: 0x000a, 0x1b45: 0x000a,
+	0x1b46: 0x000a, 0x1b47: 0x000a, 0x1b48: 0x000a, 0x1b49: 0x000a, 0x1b4a: 0x000a, 0x1b4b: 0x000a,
+	0x1b4c: 0x000a, 0x1b4d: 0x000a, 0x1b4e: 0x000a, 0x1b4f: 0x000a, 0x1b50: 0x000a, 0x1b51: 0x000a,
+	0x1b52: 0x000a, 0x1b53: 0x000a, 0x1b54: 0x000a, 0x1b55: 0x000a, 0x1b56: 0x000a, 0x1b57: 0x000a,
+	0x1b58: 0x000a, 0x1b59: 0x000a, 0x1b5a: 0x000a, 0x1b5b: 0x000a, 0x1b5c: 0x000a, 0x1b5d: 0x000a,
+	0x1b5e: 0x000a, 0x1b5f: 0x000a, 0x1b60: 0x000a, 0x1b61: 0x000a, 0x1b62: 0x000a, 0x1b63: 0x000a,
+	0x1b64: 0x000a, 0x1b65: 0x000a, 0x1b66: 0x000a, 0x1b67: 0x000a, 0x1b68: 0x000a, 0x1b69: 0x000a,
+	0x1b6a: 0x000a, 0x1b6b: 0x000a, 0x1b6c: 0x000a, 0x1b6d: 0x000a, 0x1b6e: 0x000a, 0x1b6f: 0x000a,
+	0x1b70: 0x000a, 0x1b71: 0x000a, 0x1b72: 0x000a, 0x1b73: 0x000a,
+	// Block 0x6e, offset 0x1b80
+	0x1b80: 0x000a, 0x1b81: 0x000a, 0x1b82: 0x000a, 0x1b83: 0x000a, 0x1b84: 0x000a, 0x1b85: 0x000a,
+	0x1b86: 0x000a, 0x1b87: 0x000a, 0x1b88: 0x000a, 0x1b89: 0x000a, 0x1b8a: 0x000a, 0x1b8b: 0x000a,
+	0x1b8c: 0x000a, 0x1b8d: 0x000a, 0x1b8e: 0x000a, 0x1b8f: 0x000a, 0x1b90: 0x000a, 0x1b91: 0x000a,
+	0x1b92: 0x000a, 0x1b93: 0x000a, 0x1b94: 0x000a, 0x1b95: 0x000a,
+	0x1bb0: 0x000a, 0x1bb1: 0x000a, 0x1bb2: 0x000a, 0x1bb3: 0x000a, 0x1bb4: 0x000a, 0x1bb5: 0x000a,
+	0x1bb6: 0x000a, 0x1bb7: 0x000a, 0x1bb8: 0x000a, 0x1bb9: 0x000a, 0x1bba: 0x000a, 0x1bbb: 0x000a,
+	// Block 0x6f, offset 0x1bc0
+	0x1bc0: 0x0009, 0x1bc1: 0x000a, 0x1bc2: 0x000a, 0x1bc3: 0x000a, 0x1bc4: 0x000a,
+	0x1bc8: 0x003a, 0x1bc9: 0x002a, 0x1bca: 0x003a, 0x1bcb: 0x002a,
+	0x1bcc: 0x003a, 0x1bcd: 0x002a, 0x1bce: 0x003a, 0x1bcf: 0x002a, 0x1bd0: 0x003a, 0x1bd1: 0x002a,
+	0x1bd2: 0x000a, 0x1bd3: 0x000a, 0x1bd4: 0x003a, 0x1bd5: 0x002a, 0x1bd6: 0x003a, 0x1bd7: 0x002a,
+	0x1bd8: 0x003a, 0x1bd9: 0x002a, 0x1bda: 0x003a, 0x1bdb: 0x002a, 0x1bdc: 0x000a, 0x1bdd: 0x000a,
+	0x1bde: 0x000a, 0x1bdf: 0x000a, 0x1be0: 0x000a,
+	0x1bea: 0x000c, 0x1beb: 0x000c, 0x1bec: 0x000c, 0x1bed: 0x000c,
+	0x1bf0: 0x000a,
+	0x1bf6: 0x000a, 0x1bf7: 0x000a,
+	0x1bfd: 0x000a, 0x1bfe: 0x000a, 0x1bff: 0x000a,
+	// Block 0x70, offset 0x1c00
+	0x1c19: 0x000c, 0x1c1a: 0x000c, 0x1c1b: 0x000a, 0x1c1c: 0x000a,
+	0x1c20: 0x000a,
+	// Block 0x71, offset 0x1c40
+	0x1c7b: 0x000a,
+	// Block 0x72, offset 0x1c80
+	0x1c80: 0x000a, 0x1c81: 0x000a, 0x1c82: 0x000a, 0x1c83: 0x000a, 0x1c84: 0x000a, 0x1c85: 0x000a,
+	0x1c86: 0x000a, 0x1c87: 0x000a, 0x1c88: 0x000a, 0x1c89: 0x000a, 0x1c8a: 0x000a, 0x1c8b: 0x000a,
+	0x1c8c: 0x000a, 0x1c8d: 0x000a, 0x1c8e: 0x000a, 0x1c8f: 0x000a, 0x1c90: 0x000a, 0x1c91: 0x000a,
+	0x1c92: 0x000a, 0x1c93: 0x000a, 0x1c94: 0x000a, 0x1c95: 0x000a, 0x1c96: 0x000a, 0x1c97: 0x000a,
+	0x1c98: 0x000a, 0x1c99: 0x000a, 0x1c9a: 0x000a, 0x1c9b: 0x000a, 0x1c9c: 0x000a, 0x1c9d: 0x000a,
+	0x1c9e: 0x000a, 0x1c9f: 0x000a, 0x1ca0: 0x000a, 0x1ca1: 0x000a, 0x1ca2: 0x000a, 0x1ca3: 0x000a,
+	// Block 0x73, offset 0x1cc0
+	0x1cdd: 0x000a,
+	0x1cde: 0x000a,
+	// Block 0x74, offset 0x1d00
+	0x1d10: 0x000a, 0x1d11: 0x000a,
+	0x1d12: 0x000a, 0x1d13: 0x000a, 0x1d14: 0x000a, 0x1d15: 0x000a, 0x1d16: 0x000a, 0x1d17: 0x000a,
+	0x1d18: 0x000a, 0x1d19: 0x000a, 0x1d1a: 0x000a, 0x1d1b: 0x000a, 0x1d1c: 0x000a, 0x1d1d: 0x000a,
+	0x1d1e: 0x000a, 0x1d1f: 0x000a,
+	0x1d3c: 0x000a, 0x1d3d: 0x000a, 0x1d3e: 0x000a,
+	// Block 0x75, offset 0x1d40
+	0x1d71: 0x000a, 0x1d72: 0x000a, 0x1d73: 0x000a, 0x1d74: 0x000a, 0x1d75: 0x000a,
+	0x1d76: 0x000a, 0x1d77: 0x000a, 0x1d78: 0x000a, 0x1d79: 0x000a, 0x1d7a: 0x000a, 0x1d7b: 0x000a,
+	0x1d7c: 0x000a, 0x1d7d: 0x000a, 0x1d7e: 0x000a, 0x1d7f: 0x000a,
+	// Block 0x76, offset 0x1d80
+	0x1d8c: 0x000a, 0x1d8d: 0x000a, 0x1d8e: 0x000a, 0x1d8f: 0x000a,
+	// Block 0x77, offset 0x1dc0
+	0x1df7: 0x000a, 0x1df8: 0x000a, 0x1df9: 0x000a, 0x1dfa: 0x000a,
+	// Block 0x78, offset 0x1e00
+	0x1e1e: 0x000a, 0x1e1f: 0x000a,
+	0x1e3f: 0x000a,
+	// Block 0x79, offset 0x1e40
+	0x1e50: 0x000a, 0x1e51: 0x000a,
+	0x1e52: 0x000a, 0x1e53: 0x000a, 0x1e54: 0x000a, 0x1e55: 0x000a, 0x1e56: 0x000a, 0x1e57: 0x000a,
+	0x1e58: 0x000a, 0x1e59: 0x000a, 0x1e5a: 0x000a, 0x1e5b: 0x000a, 0x1e5c: 0x000a, 0x1e5d: 0x000a,
+	0x1e5e: 0x000a, 0x1e5f: 0x000a, 0x1e60: 0x000a, 0x1e61: 0x000a, 0x1e62: 0x000a, 0x1e63: 0x000a,
+	0x1e64: 0x000a, 0x1e65: 0x000a, 0x1e66: 0x000a, 0x1e67: 0x000a, 0x1e68: 0x000a, 0x1e69: 0x000a,
+	0x1e6a: 0x000a, 0x1e6b: 0x000a, 0x1e6c: 0x000a, 0x1e6d: 0x000a, 0x1e6e: 0x000a, 0x1e6f: 0x000a,
+	0x1e70: 0x000a, 0x1e71: 0x000a, 0x1e72: 0x000a, 0x1e73: 0x000a, 0x1e74: 0x000a, 0x1e75: 0x000a,
+	0x1e76: 0x000a, 0x1e77: 0x000a, 0x1e78: 0x000a, 0x1e79: 0x000a, 0x1e7a: 0x000a, 0x1e7b: 0x000a,
+	0x1e7c: 0x000a, 0x1e7d: 0x000a, 0x1e7e: 0x000a, 0x1e7f: 0x000a,
+	// Block 0x7a, offset 0x1e80
+	0x1e80: 0x000a, 0x1e81: 0x000a, 0x1e82: 0x000a, 0x1e83: 0x000a, 0x1e84: 0x000a, 0x1e85: 0x000a,
+	0x1e86: 0x000a,
+	// Block 0x7b, offset 0x1ec0
+	0x1ecd: 0x000a, 0x1ece: 0x000a, 0x1ecf: 0x000a,
+	// Block 0x7c, offset 0x1f00
+	0x1f2f: 0x000c,
+	0x1f30: 0x000c, 0x1f31: 0x000c, 0x1f32: 0x000c, 0x1f33: 0x000a, 0x1f34: 0x000c, 0x1f35: 0x000c,
+	0x1f36: 0x000c, 0x1f37: 0x000c, 0x1f38: 0x000c, 0x1f39: 0x000c, 0x1f3a: 0x000c, 0x1f3b: 0x000c,
+	0x1f3c: 0x000c, 0x1f3d: 0x000c, 0x1f3e: 0x000a, 0x1f3f: 0x000a,
+	// Block 0x7d, offset 0x1f40
+	0x1f5e: 0x000c, 0x1f5f: 0x000c,
+	// Block 0x7e, offset 0x1f80
+	0x1fb0: 0x000c, 0x1fb1: 0x000c,
+	// Block 0x7f, offset 0x1fc0
+	0x1fc0: 0x000a, 0x1fc1: 0x000a, 0x1fc2: 0x000a, 0x1fc3: 0x000a, 0x1fc4: 0x000a, 0x1fc5: 0x000a,
+	0x1fc6: 0x000a, 0x1fc7: 0x000a, 0x1fc8: 0x000a, 0x1fc9: 0x000a, 0x1fca: 0x000a, 0x1fcb: 0x000a,
+	0x1fcc: 0x000a, 0x1fcd: 0x000a, 0x1fce: 0x000a, 0x1fcf: 0x000a, 0x1fd0: 0x000a, 0x1fd1: 0x000a,
+	0x1fd2: 0x000a, 0x1fd3: 0x000a, 0x1fd4: 0x000a, 0x1fd5: 0x000a, 0x1fd6: 0x000a, 0x1fd7: 0x000a,
+	0x1fd8: 0x000a, 0x1fd9: 0x000a, 0x1fda: 0x000a, 0x1fdb: 0x000a, 0x1fdc: 0x000a, 0x1fdd: 0x000a,
+	0x1fde: 0x000a, 0x1fdf: 0x000a, 0x1fe0: 0x000a, 0x1fe1: 0x000a,
+	// Block 0x80, offset 0x2000
+	0x2008: 0x000a,
+	// Block 0x81, offset 0x2040
+	0x2042: 0x000c,
+	0x2046: 0x000c, 0x204b: 0x000c,
+	0x2065: 0x000c, 0x2066: 0x000c, 0x2068: 0x000a, 0x2069: 0x000a,
+	0x206a: 0x000a, 0x206b: 0x000a, 0x206c: 0x000c,
+	0x2078: 0x0004, 0x2079: 0x0004,
+	// Block 0x82, offset 0x2080
+	0x20b4: 0x000a, 0x20b5: 0x000a,
+	0x20b6: 0x000a, 0x20b7: 0x000a,
+	// Block 0x83, offset 0x20c0
+	0x20c4: 0x000c, 0x20c5: 0x000c,
+	0x20e0: 0x000c, 0x20e1: 0x000c, 0x20e2: 0x000c, 0x20e3: 0x000c,
+	0x20e4: 0x000c, 0x20e5: 0x000c, 0x20e6: 0x000c, 0x20e7: 0x000c, 0x20e8: 0x000c, 0x20e9: 0x000c,
+	0x20ea: 0x000c, 0x20eb: 0x000c, 0x20ec: 0x000c, 0x20ed: 0x000c, 0x20ee: 0x000c, 0x20ef: 0x000c,
+	0x20f0: 0x000c, 0x20f1: 0x000c,
+	0x20ff: 0x000c,
+	// Block 0x84, offset 0x2100
+	0x2126: 0x000c, 0x2127: 0x000c, 0x2128: 0x000c, 0x2129: 0x000c,
+	0x212a: 0x000c, 0x212b: 0x000c, 0x212c: 0x000c, 0x212d: 0x000c,
+	// Block 0x85, offset 0x2140
+	0x2147: 0x000c, 0x2148: 0x000c, 0x2149: 0x000c, 0x214a: 0x000c, 0x214b: 0x000c,
+	0x214c: 0x000c, 0x214d: 0x000c, 0x214e: 0x000c, 0x214f: 0x000c, 0x2150: 0x000c, 0x2151: 0x000c,
+	// Block 0x86, offset 0x2180
+	0x2180: 0x000c, 0x2181: 0x000c, 0x2182: 0x000c,
+	0x21b3: 0x000c,
+	0x21b6: 0x000c, 0x21b7: 0x000c, 0x21b8: 0x000c, 0x21b9: 0x000c,
+	0x21bc: 0x000c, 0x21bd: 0x000c,
+	// Block 0x87, offset 0x21c0
+	0x21e5: 0x000c,
+	// Block 0x88, offset 0x2200
+	0x2229: 0x000c,
+	0x222a: 0x000c, 0x222b: 0x000c, 0x222c: 0x000c, 0x222d: 0x000c, 0x222e: 0x000c,
+	0x2231: 0x000c, 0x2232: 0x000c, 0x2235: 0x000c,
+	0x2236: 0x000c,
+	// Block 0x89, offset 0x2240
+	0x2243: 0x000c,
+	0x224c: 0x000c,
+	0x227c: 0x000c,
+	// Block 0x8a, offset 0x2280
+	0x22b0: 0x000c, 0x22b2: 0x000c, 0x22b3: 0x000c, 0x22b4: 0x000c,
+	0x22b7: 0x000c, 0x22b8: 0x000c,
+	0x22be: 0x000c, 0x22bf: 0x000c,
+	// Block 0x8b, offset 0x22c0
+	0x22c1: 0x000c,
+	0x22ec: 0x000c, 0x22ed: 0x000c,
+	0x22f6: 0x000c,
+	// Block 0x8c, offset 0x2300
+	0x232a: 0x000a, 0x232b: 0x000a,
+	// Block 0x8d, offset 0x2340
+	0x2365: 0x000c, 0x2368: 0x000c,
+	0x236d: 0x000c,
+	// Block 0x8e, offset 0x2380
+	0x239d: 0x0001,
+	0x239e: 0x000c, 0x239f: 0x0001, 0x23a0: 0x0001, 0x23a1: 0x0001, 0x23a2: 0x0001, 0x23a3: 0x0001,
+	0x23a4: 0x0001, 0x23a5: 0x0001, 0x23a6: 0x0001, 0x23a7: 0x0001, 0x23a8: 0x0001, 0x23a9: 0x0003,
+	0x23aa: 0x0001, 0x23ab: 0x0001, 0x23ac: 0x0001, 0x23ad: 0x0001, 0x23ae: 0x0001, 0x23af: 0x0001,
+	0x23b0: 0x0001, 0x23b1: 0x0001, 0x23b2: 0x0001, 0x23b3: 0x0001, 0x23b4: 0x0001, 0x23b5: 0x0001,
+	0x23b6: 0x0001, 0x23b7: 0x0001, 0x23b8: 0x0001, 0x23b9: 0x0001, 0x23ba: 0x0001, 0x23bb: 0x0001,
+	0x23bc: 0x0001, 0x23bd: 0x0001, 0x23be: 0x0001, 0x23bf: 0x0001,
+	// Block 0x8f, offset 0x23c0
+	0x23c0: 0x0001, 0x23c1: 0x0001, 0x23c2: 0x0001, 0x23c3: 0x0001, 0x23c4: 0x0001, 0x23c5: 0x0001,
+	0x23c6: 0x0001, 0x23c7: 0x0001, 0x23c8: 0x0001, 0x23c9: 0x0001, 0x23ca: 0x0001, 0x23cb: 0x0001,
+	0x23cc: 0x0001, 0x23cd: 0x0001, 0x23ce: 0x0001, 0x23cf: 0x0001, 0x23d0: 0x000d, 0x23d1: 0x000d,
+	0x23d2: 0x000d, 0x23d3: 0x000d, 0x23d4: 0x000d, 0x23d5: 0x000d, 0x23d6: 0x000d, 0x23d7: 0x000d,
+	0x23d8: 0x000d, 0x23d9: 0x000d, 0x23da: 0x000d, 0x23db: 0x000d, 0x23dc: 0x000d, 0x23dd: 0x000d,
+	0x23de: 0x000d, 0x23df: 0x000d, 0x23e0: 0x000d, 0x23e1: 0x000d, 0x23e2: 0x000d, 0x23e3: 0x000d,
+	0x23e4: 0x000d, 0x23e5: 0x000d, 0x23e6: 0x000d, 0x23e7: 0x000d, 0x23e8: 0x000d, 0x23e9: 0x000d,
+	0x23ea: 0x000d, 0x23eb: 0x000d, 0x23ec: 0x000d, 0x23ed: 0x000d, 0x23ee: 0x000d, 0x23ef: 0x000d,
+	0x23f0: 0x000d, 0x23f1: 0x000d, 0x23f2: 0x000d, 0x23f3: 0x000d, 0x23f4: 0x000d, 0x23f5: 0x000d,
+	0x23f6: 0x000d, 0x23f7: 0x000d, 0x23f8: 0x000d, 0x23f9: 0x000d, 0x23fa: 0x000d, 0x23fb: 0x000d,
+	0x23fc: 0x000d, 0x23fd: 0x000d, 0x23fe: 0x000d, 0x23ff: 0x000d,
+	// Block 0x90, offset 0x2400
+	0x2400: 0x000d, 0x2401: 0x000d, 0x2402: 0x000d, 0x2403: 0x000d, 0x2404: 0x000d, 0x2405: 0x000d,
+	0x2406: 0x000d, 0x2407: 0x000d, 0x2408: 0x000d, 0x2409: 0x000d, 0x240a: 0x000d, 0x240b: 0x000d,
+	0x240c: 0x000d, 0x240d: 0x000d, 0x240e: 0x000d, 0x240f: 0x000d, 0x2410: 0x000d, 0x2411: 0x000d,
+	0x2412: 0x000d, 0x2413: 0x000d, 0x2414: 0x000d, 0x2415: 0x000d, 0x2416: 0x000d, 0x2417: 0x000d,
+	0x2418: 0x000d, 0x2419: 0x000d, 0x241a: 0x000d, 0x241b: 0x000d, 0x241c: 0x000d, 0x241d: 0x000d,
+	0x241e: 0x000d, 0x241f: 0x000d, 0x2420: 0x000d, 0x2421: 0x000d, 0x2422: 0x000d, 0x2423: 0x000d,
+	0x2424: 0x000d, 0x2425: 0x000d, 0x2426: 0x000d, 0x2427: 0x000d, 0x2428: 0x000d, 0x2429: 0x000d,
+	0x242a: 0x000d, 0x242b: 0x000d, 0x242c: 0x000d, 0x242d: 0x000d, 0x242e: 0x000d, 0x242f: 0x000d,
+	0x2430: 0x000d, 0x2431: 0x000d, 0x2432: 0x000d, 0x2433: 0x000d, 0x2434: 0x000d, 0x2435: 0x000d,
+	0x2436: 0x000d, 0x2437: 0x000d, 0x2438: 0x000d, 0x2439: 0x000d, 0x243a: 0x000d, 0x243b: 0x000d,
+	0x243c: 0x000d, 0x243d: 0x000d, 0x243e: 0x000a, 0x243f: 0x000a,
+	// Block 0x91, offset 0x2440
+	0x2440: 0x000a, 0x2441: 0x000a, 0x2442: 0x000a, 0x2443: 0x000a, 0x2444: 0x000a, 0x2445: 0x000a,
+	0x2446: 0x000a, 0x2447: 0x000a, 0x2448: 0x000a, 0x2449: 0x000a, 0x244a: 0x000a, 0x244b: 0x000a,
+	0x244c: 0x000a, 0x244d: 0x000a, 0x244e: 0x000a, 0x244f: 0x000a, 0x2450: 0x000d, 0x2451: 0x000d,
+	0x2452: 0x000d, 0x2453: 0x000d, 0x2454: 0x000d, 0x2455: 0x000d, 0x2456: 0x000d, 0x2457: 0x000d,
+	0x2458: 0x000d, 0x2459: 0x000d, 0x245a: 0x000d, 0x245b: 0x000d, 0x245c: 0x000d, 0x245d: 0x000d,
+	0x245e: 0x000d, 0x245f: 0x000d, 0x2460: 0x000d, 0x2461: 0x000d, 0x2462: 0x000d, 0x2463: 0x000d,
+	0x2464: 0x000d, 0x2465: 0x000d, 0x2466: 0x000d, 0x2467: 0x000d, 0x2468: 0x000d, 0x2469: 0x000d,
+	0x246a: 0x000d, 0x246b: 0x000d, 0x246c: 0x000d, 0x246d: 0x000d, 0x246e: 0x000d, 0x246f: 0x000d,
+	0x2470: 0x000d, 0x2471: 0x000d, 0x2472: 0x000d, 0x2473: 0x000d, 0x2474: 0x000d, 0x2475: 0x000d,
+	0x2476: 0x000d, 0x2477: 0x000d, 0x2478: 0x000d, 0x2479: 0x000d, 0x247a: 0x000d, 0x247b: 0x000d,
+	0x247c: 0x000d, 0x247d: 0x000d, 0x247e: 0x000d, 0x247f: 0x000d,
+	// Block 0x92, offset 0x2480
+	0x2480: 0x000d, 0x2481: 0x000d, 0x2482: 0x000d, 0x2483: 0x000d, 0x2484: 0x000d, 0x2485: 0x000d,
+	0x2486: 0x000d, 0x2487: 0x000d, 0x2488: 0x000d, 0x2489: 0x000d, 0x248a: 0x000d, 0x248b: 0x000d,
+	0x248c: 0x000d, 0x248d: 0x000d, 0x248e: 0x000d, 0x248f: 0x000a, 0x2490: 0x000b, 0x2491: 0x000b,
+	0x2492: 0x000b, 0x2493: 0x000b, 0x2494: 0x000b, 0x2495: 0x000b, 0x2496: 0x000b, 0x2497: 0x000b,
+	0x2498: 0x000b, 0x2499: 0x000b, 0x249a: 0x000b, 0x249b: 0x000b, 0x249c: 0x000b, 0x249d: 0x000b,
+	0x249e: 0x000b, 0x249f: 0x000b, 0x24a0: 0x000b, 0x24a1: 0x000b, 0x24a2: 0x000b, 0x24a3: 0x000b,
+	0x24a4: 0x000b, 0x24a5: 0x000b, 0x24a6: 0x000b, 0x24a7: 0x000b, 0x24a8: 0x000b, 0x24a9: 0x000b,
+	0x24aa: 0x000b, 0x24ab: 0x000b, 0x24ac: 0x000b, 0x24ad: 0x000b, 0x24ae: 0x000b, 0x24af: 0x000b,
+	0x24b0: 0x000d, 0x24b1: 0x000d, 0x24b2: 0x000d, 0x24b3: 0x000d, 0x24b4: 0x000d, 0x24b5: 0x000d,
+	0x24b6: 0x000d, 0x24b7: 0x000d, 0x24b8: 0x000d, 0x24b9: 0x000d, 0x24ba: 0x000d, 0x24bb: 0x000d,
+	0x24bc: 0x000d, 0x24bd: 0x000a, 0x24be: 0x000a, 0x24bf: 0x000a,
+	// Block 0x93, offset 0x24c0
+	0x24c0: 0x000c, 0x24c1: 0x000c, 0x24c2: 0x000c, 0x24c3: 0x000c, 0x24c4: 0x000c, 0x24c5: 0x000c,
+	0x24c6: 0x000c, 0x24c7: 0x000c, 0x24c8: 0x000c, 0x24c9: 0x000c, 0x24ca: 0x000c, 0x24cb: 0x000c,
+	0x24cc: 0x000c, 0x24cd: 0x000c, 0x24ce: 0x000c, 0x24cf: 0x000c, 0x24d0: 0x000a, 0x24d1: 0x000a,
+	0x24d2: 0x000a, 0x24d3: 0x000a, 0x24d4: 0x000a, 0x24d5: 0x000a, 0x24d6: 0x000a, 0x24d7: 0x000a,
+	0x24d8: 0x000a, 0x24d9: 0x000a,
+	0x24e0: 0x000c, 0x24e1: 0x000c, 0x24e2: 0x000c, 0x24e3: 0x000c,
+	0x24e4: 0x000c, 0x24e5: 0x000c, 0x24e6: 0x000c, 0x24e7: 0x000c, 0x24e8: 0x000c, 0x24e9: 0x000c,
+	0x24ea: 0x000c, 0x24eb: 0x000c, 0x24ec: 0x000c, 0x24ed: 0x000c, 0x24ee: 0x000c, 0x24ef: 0x000c,
+	0x24f0: 0x000a, 0x24f1: 0x000a, 0x24f2: 0x000a, 0x24f3: 0x000a, 0x24f4: 0x000a, 0x24f5: 0x000a,
+	0x24f6: 0x000a, 0x24f7: 0x000a, 0x24f8: 0x000a, 0x24f9: 0x000a, 0x24fa: 0x000a, 0x24fb: 0x000a,
+	0x24fc: 0x000a, 0x24fd: 0x000a, 0x24fe: 0x000a, 0x24ff: 0x000a,
+	// Block 0x94, offset 0x2500
+	0x2500: 0x000a, 0x2501: 0x000a, 0x2502: 0x000a, 0x2503: 0x000a, 0x2504: 0x000a, 0x2505: 0x000a,
+	0x2506: 0x000a, 0x2507: 0x000a, 0x2508: 0x000a, 0x2509: 0x000a, 0x250a: 0x000a, 0x250b: 0x000a,
+	0x250c: 0x000a, 0x250d: 0x000a, 0x250e: 0x000a, 0x250f: 0x000a, 0x2510: 0x0006, 0x2511: 0x000a,
+	0x2512: 0x0006, 0x2514: 0x000a, 0x2515: 0x0006, 0x2516: 0x000a, 0x2517: 0x000a,
+	0x2518: 0x000a, 0x2519: 0x009a, 0x251a: 0x008a, 0x251b: 0x007a, 0x251c: 0x006a, 0x251d: 0x009a,
+	0x251e: 0x008a, 0x251f: 0x0004, 0x2520: 0x000a, 0x2521: 0x000a, 0x2522: 0x0003, 0x2523: 0x0003,
+	0x2524: 0x000a, 0x2525: 0x000a, 0x2526: 0x000a, 0x2528: 0x000a, 0x2529: 0x0004,
+	0x252a: 0x0004, 0x252b: 0x000a,
+	0x2530: 0x000d, 0x2531: 0x000d, 0x2532: 0x000d, 0x2533: 0x000d, 0x2534: 0x000d, 0x2535: 0x000d,
+	0x2536: 0x000d, 0x2537: 0x000d, 0x2538: 0x000d, 0x2539: 0x000d, 0x253a: 0x000d, 0x253b: 0x000d,
+	0x253c: 0x000d, 0x253d: 0x000d, 0x253e: 0x000d, 0x253f: 0x000d,
+	// Block 0x95, offset 0x2540
+	0x2540: 0x000d, 0x2541: 0x000d, 0x2542: 0x000d, 0x2543: 0x000d, 0x2544: 0x000d, 0x2545: 0x000d,
+	0x2546: 0x000d, 0x2547: 0x000d, 0x2548: 0x000d, 0x2549: 0x000d, 0x254a: 0x000d, 0x254b: 0x000d,
+	0x254c: 0x000d, 0x254d: 0x000d, 0x254e: 0x000d, 0x254f: 0x000d, 0x2550: 0x000d, 0x2551: 0x000d,
+	0x2552: 0x000d, 0x2553: 0x000d, 0x2554: 0x000d, 0x2555: 0x000d, 0x2556: 0x000d, 0x2557: 0x000d,
+	0x2558: 0x000d, 0x2559: 0x000d, 0x255a: 0x000d, 0x255b: 0x000d, 0x255c: 0x000d, 0x255d: 0x000d,
+	0x255e: 0x000d, 0x255f: 0x000d, 0x2560: 0x000d, 0x2561: 0x000d, 0x2562: 0x000d, 0x2563: 0x000d,
+	0x2564: 0x000d, 0x2565: 0x000d, 0x2566: 0x000d, 0x2567: 0x000d, 0x2568: 0x000d, 0x2569: 0x000d,
+	0x256a: 0x000d, 0x256b: 0x000d, 0x256c: 0x000d, 0x256d: 0x000d, 0x256e: 0x000d, 0x256f: 0x000d,
+	0x2570: 0x000d, 0x2571: 0x000d, 0x2572: 0x000d, 0x2573: 0x000d, 0x2574: 0x000d, 0x2575: 0x000d,
+	0x2576: 0x000d, 0x2577: 0x000d, 0x2578: 0x000d, 0x2579: 0x000d, 0x257a: 0x000d, 0x257b: 0x000d,
+	0x257c: 0x000d, 0x257d: 0x000d, 0x257e: 0x000d, 0x257f: 0x000b,
+	// Block 0x96, offset 0x2580
+	0x2581: 0x000a, 0x2582: 0x000a, 0x2583: 0x0004, 0x2584: 0x0004, 0x2585: 0x0004,
+	0x2586: 0x000a, 0x2587: 0x000a, 0x2588: 0x003a, 0x2589: 0x002a, 0x258a: 0x000a, 0x258b: 0x0003,
+	0x258c: 0x0006, 0x258d: 0x0003, 0x258e: 0x0006, 0x258f: 0x0006, 0x2590: 0x0002, 0x2591: 0x0002,
+	0x2592: 0x0002, 0x2593: 0x0002, 0x2594: 0x0002, 0x2595: 0x0002, 0x2596: 0x0002, 0x2597: 0x0002,
+	0x2598: 0x0002, 0x2599: 0x0002, 0x259a: 0x0006, 0x259b: 0x000a, 0x259c: 0x000a, 0x259d: 0x000a,
+	0x259e: 0x000a, 0x259f: 0x000a, 0x25a0: 0x000a,
+	0x25bb: 0x005a,
+	0x25bc: 0x000a, 0x25bd: 0x004a, 0x25be: 0x000a, 0x25bf: 0x000a,
+	// Block 0x97, offset 0x25c0
+	0x25c0: 0x000a,
+	0x25db: 0x005a, 0x25dc: 0x000a, 0x25dd: 0x004a,
+	0x25de: 0x000a, 0x25df: 0x00fa, 0x25e0: 0x00ea, 0x25e1: 0x000a, 0x25e2: 0x003a, 0x25e3: 0x002a,
+	0x25e4: 0x000a, 0x25e5: 0x000a,
+	// Block 0x98, offset 0x2600
+	0x2620: 0x0004, 0x2621: 0x0004, 0x2622: 0x000a, 0x2623: 0x000a,
+	0x2624: 0x000a, 0x2625: 0x0004, 0x2626: 0x0004, 0x2628: 0x000a, 0x2629: 0x000a,
+	0x262a: 0x000a, 0x262b: 0x000a, 0x262c: 0x000a, 0x262d: 0x000a, 0x262e: 0x000a,
+	0x2630: 0x000b, 0x2631: 0x000b, 0x2632: 0x000b, 0x2633: 0x000b, 0x2634: 0x000b, 0x2635: 0x000b,
+	0x2636: 0x000b, 0x2637: 0x000b, 0x2638: 0x000b, 0x2639: 0x000a, 0x263a: 0x000a, 0x263b: 0x000a,
+	0x263c: 0x000a, 0x263d: 0x000a, 0x263e: 0x000b, 0x263f: 0x000b,
+	// Block 0x99, offset 0x2640
+	0x2641: 0x000a,
+	// Block 0x9a, offset 0x2680
+	0x2680: 0x000a, 0x2681: 0x000a, 0x2682: 0x000a, 0x2683: 0x000a, 0x2684: 0x000a, 0x2685: 0x000a,
+	0x2686: 0x000a, 0x2687: 0x000a, 0x2688: 0x000a, 0x2689: 0x000a, 0x268a: 0x000a, 0x268b: 0x000a,
+	0x268c: 0x000a, 0x2690: 0x000a, 0x2691: 0x000a,
+	0x2692: 0x000a, 0x2693: 0x000a, 0x2694: 0x000a, 0x2695: 0x000a, 0x2696: 0x000a, 0x2697: 0x000a,
+	0x2698: 0x000a, 0x2699: 0x000a, 0x269a: 0x000a, 0x269b: 0x000a, 0x269c: 0x000a,
+	0x26a0: 0x000a,
+	// Block 0x9b, offset 0x26c0
+	0x26fd: 0x000c,
+	// Block 0x9c, offset 0x2700
+	0x2720: 0x000c, 0x2721: 0x0002, 0x2722: 0x0002, 0x2723: 0x0002,
+	0x2724: 0x0002, 0x2725: 0x0002, 0x2726: 0x0002, 0x2727: 0x0002, 0x2728: 0x0002, 0x2729: 0x0002,
+	0x272a: 0x0002, 0x272b: 0x0002, 0x272c: 0x0002, 0x272d: 0x0002, 0x272e: 0x0002, 0x272f: 0x0002,
+	0x2730: 0x0002, 0x2731: 0x0002, 0x2732: 0x0002, 0x2733: 0x0002, 0x2734: 0x0002, 0x2735: 0x0002,
+	0x2736: 0x0002, 0x2737: 0x0002, 0x2738: 0x0002, 0x2739: 0x0002, 0x273a: 0x0002, 0x273b: 0x0002,
+	// Block 0x9d, offset 0x2740
+	0x2776: 0x000c, 0x2777: 0x000c, 0x2778: 0x000c, 0x2779: 0x000c, 0x277a: 0x000c,
+	// Block 0x9e, offset 0x2780
+	0x2780: 0x0001, 0x2781: 0x0001, 0x2782: 0x0001, 0x2783: 0x0001, 0x2784: 0x0001, 0x2785: 0x0001,
+	0x2786: 0x0001, 0x2787: 0x0001, 0x2788: 0x0001, 0x2789: 0x0001, 0x278a: 0x0001, 0x278b: 0x0001,
+	0x278c: 0x0001, 0x278d: 0x0001, 0x278e: 0x0001, 0x278f: 0x0001, 0x2790: 0x0001, 0x2791: 0x0001,
+	0x2792: 0x0001, 0x2793: 0x0001, 0x2794: 0x0001, 0x2795: 0x0001, 0x2796: 0x0001, 0x2797: 0x0001,
+	0x2798: 0x0001, 0x2799: 0x0001, 0x279a: 0x0001, 0x279b: 0x0001, 0x279c: 0x0001, 0x279d: 0x0001,
+	0x279e: 0x0001, 0x279f: 0x0001, 0x27a0: 0x0001, 0x27a1: 0x0001, 0x27a2: 0x0001, 0x27a3: 0x0001,
+	0x27a4: 0x0001, 0x27a5: 0x0001, 0x27a6: 0x0001, 0x27a7: 0x0001, 0x27a8: 0x0001, 0x27a9: 0x0001,
+	0x27aa: 0x0001, 0x27ab: 0x0001, 0x27ac: 0x0001, 0x27ad: 0x0001, 0x27ae: 0x0001, 0x27af: 0x0001,
+	0x27b0: 0x0001, 0x27b1: 0x0001, 0x27b2: 0x0001, 0x27b3: 0x0001, 0x27b4: 0x0001, 0x27b5: 0x0001,
+	0x27b6: 0x0001, 0x27b7: 0x0001, 0x27b8: 0x0001, 0x27b9: 0x0001, 0x27ba: 0x0001, 0x27bb: 0x0001,
+	0x27bc: 0x0001, 0x27bd: 0x0001, 0x27be: 0x0001, 0x27bf: 0x0001,
+	// Block 0x9f, offset 0x27c0
+	0x27c0: 0x0001, 0x27c1: 0x0001, 0x27c2: 0x0001, 0x27c3: 0x0001, 0x27c4: 0x0001, 0x27c5: 0x0001,
+	0x27c6: 0x0001, 0x27c7: 0x0001, 0x27c8: 0x0001, 0x27c9: 0x0001, 0x27ca: 0x0001, 0x27cb: 0x0001,
+	0x27cc: 0x0001, 0x27cd: 0x0001, 0x27ce: 0x0001, 0x27cf: 0x0001, 0x27d0: 0x0001, 0x27d1: 0x0001,
+	0x27d2: 0x0001, 0x27d3: 0x0001, 0x27d4: 0x0001, 0x27d5: 0x0001, 0x27d6: 0x0001, 0x27d7: 0x0001,
+	0x27d8: 0x0001, 0x27d9: 0x0001, 0x27da: 0x0001, 0x27db: 0x0001, 0x27dc: 0x0001, 0x27dd: 0x0001,
+	0x27de: 0x0001, 0x27df: 0x000a, 0x27e0: 0x0001, 0x27e1: 0x0001, 0x27e2: 0x0001, 0x27e3: 0x0001,
+	0x27e4: 0x0001, 0x27e5: 0x0001, 0x27e6: 0x0001, 0x27e7: 0x0001, 0x27e8: 0x0001, 0x27e9: 0x0001,
+	0x27ea: 0x0001, 0x27eb: 0x0001, 0x27ec: 0x0001, 0x27ed: 0x0001, 0x27ee: 0x0001, 0x27ef: 0x0001,
+	0x27f0: 0x0001, 0x27f1: 0x0001, 0x27f2: 0x0001, 0x27f3: 0x0001, 0x27f4: 0x0001, 0x27f5: 0x0001,
+	0x27f6: 0x0001, 0x27f7: 0x0001, 0x27f8: 0x0001, 0x27f9: 0x0001, 0x27fa: 0x0001, 0x27fb: 0x0001,
+	0x27fc: 0x0001, 0x27fd: 0x0001, 0x27fe: 0x0001, 0x27ff: 0x0001,
+	// Block 0xa0, offset 0x2800
+	0x2800: 0x0001, 0x2801: 0x000c, 0x2802: 0x000c, 0x2803: 0x000c, 0x2804: 0x0001, 0x2805: 0x000c,
+	0x2806: 0x000c, 0x2807: 0x0001, 0x2808: 0x0001, 0x2809: 0x0001, 0x280a: 0x0001, 0x280b: 0x0001,
+	0x280c: 0x000c, 0x280d: 0x000c, 0x280e: 0x000c, 0x280f: 0x000c, 0x2810: 0x0001, 0x2811: 0x0001,
+	0x2812: 0x0001, 0x2813: 0x0001, 0x2814: 0x0001, 0x2815: 0x0001, 0x2816: 0x0001, 0x2817: 0x0001,
+	0x2818: 0x0001, 0x2819: 0x0001, 0x281a: 0x0001, 0x281b: 0x0001, 0x281c: 0x0001, 0x281d: 0x0001,
+	0x281e: 0x0001, 0x281f: 0x0001, 0x2820: 0x0001, 0x2821: 0x0001, 0x2822: 0x0001, 0x2823: 0x0001,
+	0x2824: 0x0001, 0x2825: 0x0001, 0x2826: 0x0001, 0x2827: 0x0001, 0x2828: 0x0001, 0x2829: 0x0001,
+	0x282a: 0x0001, 0x282b: 0x0001, 0x282c: 0x0001, 0x282d: 0x0001, 0x282e: 0x0001, 0x282f: 0x0001,
+	0x2830: 0x0001, 0x2831: 0x0001, 0x2832: 0x0001, 0x2833: 0x0001, 0x2834: 0x0001, 0x2835: 0x0001,
+	0x2836: 0x0001, 0x2837: 0x0001, 0x2838: 0x000c, 0x2839: 0x000c, 0x283a: 0x000c, 0x283b: 0x0001,
+	0x283c: 0x0001, 0x283d: 0x0001, 0x283e: 0x0001, 0x283f: 0x000c,
+	// Block 0xa1, offset 0x2840
+	0x2840: 0x0001, 0x2841: 0x0001, 0x2842: 0x0001, 0x2843: 0x0001, 0x2844: 0x0001, 0x2845: 0x0001,
+	0x2846: 0x0001, 0x2847: 0x0001, 0x2848: 0x0001, 0x2849: 0x0001, 0x284a: 0x0001, 0x284b: 0x0001,
+	0x284c: 0x0001, 0x284d: 0x0001, 0x284e: 0x0001, 0x284f: 0x0001, 0x2850: 0x0001, 0x2851: 0x0001,
+	0x2852: 0x0001, 0x2853: 0x0001, 0x2854: 0x0001, 0x2855: 0x0001, 0x2856: 0x0001, 0x2857: 0x0001,
+	0x2858: 0x0001, 0x2859: 0x0001, 0x285a: 0x0001, 0x285b: 0x0001, 0x285c: 0x0001, 0x285d: 0x0001,
+	0x285e: 0x0001, 0x285f: 0x0001, 0x2860: 0x0001, 0x2861: 0x0001, 0x2862: 0x0001, 0x2863: 0x0001,
+	0x2864: 0x0001, 0x2865: 0x000c, 0x2866: 0x000c, 0x2867: 0x0001, 0x2868: 0x0001, 0x2869: 0x0001,
+	0x286a: 0x0001, 0x286b: 0x0001, 0x286c: 0x0001, 0x286d: 0x0001, 0x286e: 0x0001, 0x286f: 0x0001,
+	0x2870: 0x0001, 0x2871: 0x0001, 0x2872: 0x0001, 0x2873: 0x0001, 0x2874: 0x0001, 0x2875: 0x0001,
+	0x2876: 0x0001, 0x2877: 0x0001, 0x2878: 0x0001, 0x2879: 0x0001, 0x287a: 0x0001, 0x287b: 0x0001,
+	0x287c: 0x0001, 0x287d: 0x0001, 0x287e: 0x0001, 0x287f: 0x0001,
+	// Block 0xa2, offset 0x2880
+	0x2880: 0x0001, 0x2881: 0x0001, 0x2882: 0x0001, 0x2883: 0x0001, 0x2884: 0x0001, 0x2885: 0x0001,
+	0x2886: 0x0001, 0x2887: 0x0001, 0x2888: 0x0001, 0x2889: 0x0001, 0x288a: 0x0001, 0x288b: 0x0001,
+	0x288c: 0x0001, 0x288d: 0x0001, 0x288e: 0x0001, 0x288f: 0x0001, 0x2890: 0x0001, 0x2891: 0x0001,
+	0x2892: 0x0001, 0x2893: 0x0001, 0x2894: 0x0001, 0x2895: 0x0001, 0x2896: 0x0001, 0x2897: 0x0001,
+	0x2898: 0x0001, 0x2899: 0x0001, 0x289a: 0x0001, 0x289b: 0x0001, 0x289c: 0x0001, 0x289d: 0x0001,
+	0x289e: 0x0001, 0x289f: 0x0001, 0x28a0: 0x0001, 0x28a1: 0x0001, 0x28a2: 0x0001, 0x28a3: 0x0001,
+	0x28a4: 0x0001, 0x28a5: 0x0001, 0x28a6: 0x0001, 0x28a7: 0x0001, 0x28a8: 0x0001, 0x28a9: 0x0001,
+	0x28aa: 0x0001, 0x28ab: 0x0001, 0x28ac: 0x0001, 0x28ad: 0x0001, 0x28ae: 0x0001, 0x28af: 0x0001,
+	0x28b0: 0x0001, 0x28b1: 0x0001, 0x28b2: 0x0001, 0x28b3: 0x0001, 0x28b4: 0x0001, 0x28b5: 0x0001,
+	0x28b6: 0x0001, 0x28b7: 0x0001, 0x28b8: 0x0001, 0x28b9: 0x000a, 0x28ba: 0x000a, 0x28bb: 0x000a,
+	0x28bc: 0x000a, 0x28bd: 0x000a, 0x28be: 0x000a, 0x28bf: 0x000a,
+	// Block 0xa3, offset 0x28c0
+	0x28c0: 0x000d, 0x28c1: 0x000d, 0x28c2: 0x000d, 0x28c3: 0x000d, 0x28c4: 0x000d, 0x28c5: 0x000d,
+	0x28c6: 0x000d, 0x28c7: 0x000d, 0x28c8: 0x000d, 0x28c9: 0x000d, 0x28ca: 0x000d, 0x28cb: 0x000d,
+	0x28cc: 0x000d, 0x28cd: 0x000d, 0x28ce: 0x000d, 0x28cf: 0x000d, 0x28d0: 0x000d, 0x28d1: 0x000d,
+	0x28d2: 0x000d, 0x28d3: 0x000d, 0x28d4: 0x000d, 0x28d5: 0x000d, 0x28d6: 0x000d, 0x28d7: 0x000d,
+	0x28d8: 0x000d, 0x28d9: 0x000d, 0x28da: 0x000d, 0x28db: 0x000d, 0x28dc: 0x000d, 0x28dd: 0x000d,
+	0x28de: 0x000d, 0x28df: 0x000d, 0x28e0: 0x000d, 0x28e1: 0x000d, 0x28e2: 0x000d, 0x28e3: 0x000d,
+	0x28e4: 0x000c, 0x28e5: 0x000c, 0x28e6: 0x000c, 0x28e7: 0x000c, 0x28e8: 0x0001, 0x28e9: 0x0001,
+	0x28ea: 0x0001, 0x28eb: 0x0001, 0x28ec: 0x0001, 0x28ed: 0x0001, 0x28ee: 0x0001, 0x28ef: 0x0001,
+	0x28f0: 0x0005, 0x28f1: 0x0005, 0x28f2: 0x0005, 0x28f3: 0x0005, 0x28f4: 0x0005, 0x28f5: 0x0005,
+	0x28f6: 0x0005, 0x28f7: 0x0005, 0x28f8: 0x0005, 0x28f9: 0x0005, 0x28fa: 0x0001, 0x28fb: 0x0001,
+	0x28fc: 0x0001, 0x28fd: 0x0001, 0x28fe: 0x0001, 0x28ff: 0x0001,
+	// Block 0xa4, offset 0x2900
+	0x2900: 0x0001, 0x2901: 0x0001, 0x2902: 0x0001, 0x2903: 0x0001, 0x2904: 0x0001, 0x2905: 0x0001,
+	0x2906: 0x0001, 0x2907: 0x0001, 0x2908: 0x0001, 0x2909: 0x0001, 0x290a: 0x0001, 0x290b: 0x0001,
+	0x290c: 0x0001, 0x290d: 0x0001, 0x290e: 0x0001, 0x290f: 0x0001, 0x2910: 0x0001, 0x2911: 0x0001,
+	0x2912: 0x0001, 0x2913: 0x0001, 0x2914: 0x0001, 0x2915: 0x0001, 0x2916: 0x0001, 0x2917: 0x0001,
+	0x2918: 0x0001, 0x2919: 0x0001, 0x291a: 0x0001, 0x291b: 0x0001, 0x291c: 0x0001, 0x291d: 0x0001,
+	0x291e: 0x0001, 0x291f: 0x0001, 0x2920: 0x0005, 0x2921: 0x0005, 0x2922: 0x0005, 0x2923: 0x0005,
+	0x2924: 0x0005, 0x2925: 0x0005, 0x2926: 0x0005, 0x2927: 0x0005, 0x2928: 0x0005, 0x2929: 0x0005,
+	0x292a: 0x0005, 0x292b: 0x0005, 0x292c: 0x0005, 0x292d: 0x0005, 0x292e: 0x0005, 0x292f: 0x0005,
+	0x2930: 0x0005, 0x2931: 0x0005, 0x2932: 0x0005, 0x2933: 0x0005, 0x2934: 0x0005, 0x2935: 0x0005,
+	0x2936: 0x0005, 0x2937: 0x0005, 0x2938: 0x0005, 0x2939: 0x0005, 0x293a: 0x0005, 0x293b: 0x0005,
+	0x293c: 0x0005, 0x293d: 0x0005, 0x293e: 0x0005, 0x293f: 0x0001,
+	// Block 0xa5, offset 0x2940
+	0x2940: 0x0001, 0x2941: 0x0001, 0x2942: 0x0001, 0x2943: 0x0001, 0x2944: 0x0001, 0x2945: 0x0001,
+	0x2946: 0x0001, 0x2947: 0x0001, 0x2948: 0x0001, 0x2949: 0x0001, 0x294a: 0x0001, 0x294b: 0x0001,
+	0x294c: 0x0001, 0x294d: 0x0001, 0x294e: 0x0001, 0x294f: 0x0001, 0x2950: 0x0001, 0x2951: 0x0001,
+	0x2952: 0x0001, 0x2953: 0x0001, 0x2954: 0x0001, 0x2955: 0x0001, 0x2956: 0x0001, 0x2957: 0x0001,
+	0x2958: 0x0001, 0x2959: 0x0001, 0x295a: 0x0001, 0x295b: 0x0001, 0x295c: 0x0001, 0x295d: 0x0001,
+	0x295e: 0x0001, 0x295f: 0x0001, 0x2960: 0x0001, 0x2961: 0x0001, 0x2962: 0x0001, 0x2963: 0x0001,
+	0x2964: 0x0001, 0x2965: 0x0001, 0x2966: 0x0001, 0x2967: 0x0001, 0x2968: 0x0001, 0x2969: 0x0001,
+	0x296a: 0x0001, 0x296b: 0x000c, 0x296c: 0x000c, 0x296d: 0x0001, 0x296e: 0x0001, 0x296f: 0x0001,
+	0x2970: 0x0001, 0x2971: 0x0001, 0x2972: 0x0001, 0x2973: 0x0001, 0x2974: 0x0001, 0x2975: 0x0001,
+	0x2976: 0x0001, 0x2977: 0x0001, 0x2978: 0x0001, 0x2979: 0x0001, 0x297a: 0x0001, 0x297b: 0x0001,
+	0x297c: 0x0001, 0x297d: 0x0001, 0x297e: 0x0001, 0x297f: 0x0001,
+	// Block 0xa6, offset 0x2980
+	0x2980: 0x0001, 0x2981: 0x0001, 0x2982: 0x0001, 0x2983: 0x0001, 0x2984: 0x0001, 0x2985: 0x0001,
+	0x2986: 0x0001, 0x2987: 0x0001, 0x2988: 0x0001, 0x2989: 0x0001, 0x298a: 0x0001, 0x298b: 0x0001,
+	0x298c: 0x0001, 0x298d: 0x0001, 0x298e: 0x0001, 0x298f: 0x0001, 0x2990: 0x0001, 0x2991: 0x0001,
+	0x2992: 0x0001, 0x2993: 0x0001, 0x2994: 0x0001, 0x2995: 0x0001, 0x2996: 0x0001, 0x2997: 0x0001,
+	0x2998: 0x0001, 0x2999: 0x0001, 0x299a: 0x0001, 0x299b: 0x0001, 0x299c: 0x0001, 0x299d: 0x0001,
+	0x299e: 0x0001, 0x299f: 0x0001, 0x29a0: 0x0001, 0x29a1: 0x0001, 0x29a2: 0x0001, 0x29a3: 0x0001,
+	0x29a4: 0x0001, 0x29a5: 0x0001, 0x29a6: 0x0001, 0x29a7: 0x0001, 0x29a8: 0x0001, 0x29a9: 0x0001,
+	0x29aa: 0x0001, 0x29ab: 0x0001, 0x29ac: 0x0001, 0x29ad: 0x0001, 0x29ae: 0x0001, 0x29af: 0x0001,
+	0x29b0: 0x0001, 0x29b1: 0x0001, 0x29b2: 0x0001, 0x29b3: 0x0001, 0x29b4: 0x0001, 0x29b5: 0x0001,
+	0x29b6: 0x0001, 0x29b7: 0x0001, 0x29b8: 0x0001, 0x29b9: 0x0001, 0x29ba: 0x0001, 0x29bb: 0x0001,
+	0x29bc: 0x0001, 0x29bd: 0x000c, 0x29be: 0x000c, 0x29bf: 0x000c,
+	// Block 0xa7, offset 0x29c0
+	0x29c0: 0x0001, 0x29c1: 0x0001, 0x29c2: 0x0001, 0x29c3: 0x0001, 0x29c4: 0x0001, 0x29c5: 0x0001,
+	0x29c6: 0x0001, 0x29c7: 0x0001, 0x29c8: 0x0001, 0x29c9: 0x0001, 0x29ca: 0x0001, 0x29cb: 0x0001,
+	0x29cc: 0x0001, 0x29cd: 0x0001, 0x29ce: 0x0001, 0x29cf: 0x0001, 0x29d0: 0x0001, 0x29d1: 0x0001,
+	0x29d2: 0x0001, 0x29d3: 0x0001, 0x29d4: 0x0001, 0x29d5: 0x0001, 0x29d6: 0x0001, 0x29d7: 0x0001,
+	0x29d8: 0x0001, 0x29d9: 0x0001, 0x29da: 0x0001, 0x29db: 0x0001, 0x29dc: 0x0001, 0x29dd: 0x0001,
+	0x29de: 0x0001, 0x29df: 0x0001, 0x29e0: 0x0001, 0x29e1: 0x0001, 0x29e2: 0x0001, 0x29e3: 0x0001,
+	0x29e4: 0x0001, 0x29e5: 0x0001, 0x29e6: 0x0001, 0x29e7: 0x0001, 0x29e8: 0x0001, 0x29e9: 0x0001,
+	0x29ea: 0x0001, 0x29eb: 0x0001, 0x29ec: 0x0001, 0x29ed: 0x0001, 0x29ee: 0x0001, 0x29ef: 0x0001,
+	0x29f0: 0x000d, 0x29f1: 0x000d, 0x29f2: 0x000d, 0x29f3: 0x000d, 0x29f4: 0x000d, 0x29f5: 0x000d,
+	0x29f6: 0x000d, 0x29f7: 0x000d, 0x29f8: 0x000d, 0x29f9: 0x000d, 0x29fa: 0x000d, 0x29fb: 0x000d,
+	0x29fc: 0x000d, 0x29fd: 0x000d, 0x29fe: 0x000d, 0x29ff: 0x000d,
+	// Block 0xa8, offset 0x2a00
+	0x2a00: 0x000d, 0x2a01: 0x000d, 0x2a02: 0x000d, 0x2a03: 0x000d, 0x2a04: 0x000d, 0x2a05: 0x000d,
+	0x2a06: 0x000c, 0x2a07: 0x000c, 0x2a08: 0x000c, 0x2a09: 0x000c, 0x2a0a: 0x000c, 0x2a0b: 0x000c,
+	0x2a0c: 0x000c, 0x2a0d: 0x000c, 0x2a0e: 0x000c, 0x2a0f: 0x000c, 0x2a10: 0x000c, 0x2a11: 0x000d,
+	0x2a12: 0x000d, 0x2a13: 0x000d, 0x2a14: 0x000d, 0x2a15: 0x000d, 0x2a16: 0x000d, 0x2a17: 0x000d,
+	0x2a18: 0x000d, 0x2a19: 0x000d, 0x2a1a: 0x0001, 0x2a1b: 0x0001, 0x2a1c: 0x0001, 0x2a1d: 0x0001,
+	0x2a1e: 0x0001, 0x2a1f: 0x0001, 0x2a20: 0x0001, 0x2a21: 0x0001, 0x2a22: 0x0001, 0x2a23: 0x0001,
+	0x2a24: 0x0001, 0x2a25: 0x0001, 0x2a26: 0x0001, 0x2a27: 0x0001, 0x2a28: 0x0001, 0x2a29: 0x0001,
+	0x2a2a: 0x0001, 0x2a2b: 0x0001, 0x2a2c: 0x0001, 0x2a2d: 0x0001, 0x2a2e: 0x0001, 0x2a2f: 0x0001,
+	0x2a30: 0x0001, 0x2a31: 0x0001, 0x2a32: 0x0001, 0x2a33: 0x0001, 0x2a34: 0x0001, 0x2a35: 0x0001,
+	0x2a36: 0x0001, 0x2a37: 0x0001, 0x2a38: 0x0001, 0x2a39: 0x0001, 0x2a3a: 0x0001, 0x2a3b: 0x0001,
+	0x2a3c: 0x0001, 0x2a3d: 0x0001, 0x2a3e: 0x0001, 0x2a3f: 0x0001,
+	// Block 0xa9, offset 0x2a40
+	0x2a40: 0x0001, 0x2a41: 0x0001, 0x2a42: 0x000c, 0x2a43: 0x000c, 0x2a44: 0x000c, 0x2a45: 0x000c,
+	0x2a46: 0x0001, 0x2a47: 0x0001, 0x2a48: 0x0001, 0x2a49: 0x0001, 0x2a4a: 0x0001, 0x2a4b: 0x0001,
+	0x2a4c: 0x0001, 0x2a4d: 0x0001, 0x2a4e: 0x0001, 0x2a4f: 0x0001, 0x2a50: 0x0001, 0x2a51: 0x0001,
+	0x2a52: 0x0001, 0x2a53: 0x0001, 0x2a54: 0x0001, 0x2a55: 0x0001, 0x2a56: 0x0001, 0x2a57: 0x0001,
+	0x2a58: 0x0001, 0x2a59: 0x0001, 0x2a5a: 0x0001, 0x2a5b: 0x0001, 0x2a5c: 0x0001, 0x2a5d: 0x0001,
+	0x2a5e: 0x0001, 0x2a5f: 0x0001, 0x2a60: 0x0001, 0x2a61: 0x0001, 0x2a62: 0x0001, 0x2a63: 0x0001,
+	0x2a64: 0x0001, 0x2a65: 0x0001, 0x2a66: 0x0001, 0x2a67: 0x0001, 0x2a68: 0x0001, 0x2a69: 0x0001,
+	0x2a6a: 0x0001, 0x2a6b: 0x0001, 0x2a6c: 0x0001, 0x2a6d: 0x0001, 0x2a6e: 0x0001, 0x2a6f: 0x0001,
+	0x2a70: 0x0001, 0x2a71: 0x0001, 0x2a72: 0x0001, 0x2a73: 0x0001, 0x2a74: 0x0001, 0x2a75: 0x0001,
+	0x2a76: 0x0001, 0x2a77: 0x0001, 0x2a78: 0x0001, 0x2a79: 0x0001, 0x2a7a: 0x0001, 0x2a7b: 0x0001,
+	0x2a7c: 0x0001, 0x2a7d: 0x0001, 0x2a7e: 0x0001, 0x2a7f: 0x0001,
+	// Block 0xaa, offset 0x2a80
+	0x2a81: 0x000c,
+	0x2ab8: 0x000c, 0x2ab9: 0x000c, 0x2aba: 0x000c, 0x2abb: 0x000c,
+	0x2abc: 0x000c, 0x2abd: 0x000c, 0x2abe: 0x000c, 0x2abf: 0x000c,
+	// Block 0xab, offset 0x2ac0
+	0x2ac0: 0x000c, 0x2ac1: 0x000c, 0x2ac2: 0x000c, 0x2ac3: 0x000c, 0x2ac4: 0x000c, 0x2ac5: 0x000c,
+	0x2ac6: 0x000c,
+	0x2ad2: 0x000a, 0x2ad3: 0x000a, 0x2ad4: 0x000a, 0x2ad5: 0x000a, 0x2ad6: 0x000a, 0x2ad7: 0x000a,
+	0x2ad8: 0x000a, 0x2ad9: 0x000a, 0x2ada: 0x000a, 0x2adb: 0x000a, 0x2adc: 0x000a, 0x2add: 0x000a,
+	0x2ade: 0x000a, 0x2adf: 0x000a, 0x2ae0: 0x000a, 0x2ae1: 0x000a, 0x2ae2: 0x000a, 0x2ae3: 0x000a,
+	0x2ae4: 0x000a, 0x2ae5: 0x000a,
+	0x2af0: 0x000c, 0x2af3: 0x000c, 0x2af4: 0x000c,
+	0x2aff: 0x000c,
+	// Block 0xac, offset 0x2b00
+	0x2b00: 0x000c, 0x2b01: 0x000c,
+	0x2b33: 0x000c, 0x2b34: 0x000c, 0x2b35: 0x000c,
+	0x2b36: 0x000c, 0x2b39: 0x000c, 0x2b3a: 0x000c,
+	// Block 0xad, offset 0x2b40
+	0x2b40: 0x000c, 0x2b41: 0x000c, 0x2b42: 0x000c,
+	0x2b67: 0x000c, 0x2b68: 0x000c, 0x2b69: 0x000c,
+	0x2b6a: 0x000c, 0x2b6b: 0x000c, 0x2b6d: 0x000c, 0x2b6e: 0x000c, 0x2b6f: 0x000c,
+	0x2b70: 0x000c, 0x2b71: 0x000c, 0x2b72: 0x000c, 0x2b73: 0x000c, 0x2b74: 0x000c,
+	// Block 0xae, offset 0x2b80
+	0x2bb3: 0x000c,
+	// Block 0xaf, offset 0x2bc0
+	0x2bc0: 0x000c, 0x2bc1: 0x000c,
+	0x2bf6: 0x000c, 0x2bf7: 0x000c, 0x2bf8: 0x000c, 0x2bf9: 0x000c, 0x2bfa: 0x000c, 0x2bfb: 0x000c,
+	0x2bfc: 0x000c, 0x2bfd: 0x000c, 0x2bfe: 0x000c,
+	// Block 0xb0, offset 0x2c00
+	0x2c09: 0x000c, 0x2c0a: 0x000c, 0x2c0b: 0x000c,
+	0x2c0c: 0x000c, 0x2c0f: 0x000c,
+	// Block 0xb1, offset 0x2c40
+	0x2c6f: 0x000c,
+	0x2c70: 0x000c, 0x2c71: 0x000c, 0x2c74: 0x000c,
+	0x2c76: 0x000c, 0x2c77: 0x000c,
+	0x2c7e: 0x000c,
+	// Block 0xb2, offset 0x2c80
+	0x2c9f: 0x000c, 0x2ca3: 0x000c,
+	0x2ca4: 0x000c, 0x2ca5: 0x000c, 0x2ca6: 0x000c, 0x2ca7: 0x000c, 0x2ca8: 0x000c, 0x2ca9: 0x000c,
+	0x2caa: 0x000c,
+	// Block 0xb3, offset 0x2cc0
+	0x2cc0: 0x000c,
+	0x2ce6: 0x000c, 0x2ce7: 0x000c, 0x2ce8: 0x000c, 0x2ce9: 0x000c,
+	0x2cea: 0x000c, 0x2ceb: 0x000c, 0x2cec: 0x000c,
+	0x2cf0: 0x000c, 0x2cf1: 0x000c, 0x2cf2: 0x000c, 0x2cf3: 0x000c, 0x2cf4: 0x000c,
+	// Block 0xb4, offset 0x2d00
+	0x2d38: 0x000c, 0x2d39: 0x000c, 0x2d3a: 0x000c, 0x2d3b: 0x000c,
+	0x2d3c: 0x000c, 0x2d3d: 0x000c, 0x2d3e: 0x000c, 0x2d3f: 0x000c,
+	// Block 0xb5, offset 0x2d40
+	0x2d42: 0x000c, 0x2d43: 0x000c, 0x2d44: 0x000c,
+	0x2d46: 0x000c,
+	0x2d5e: 0x000c,
+	// Block 0xb6, offset 0x2d80
+	0x2db3: 0x000c, 0x2db4: 0x000c, 0x2db5: 0x000c,
+	0x2db6: 0x000c, 0x2db7: 0x000c, 0x2db8: 0x000c, 0x2dba: 0x000c,
+	0x2dbf: 0x000c,
+	// Block 0xb7, offset 0x2dc0
+	0x2dc0: 0x000c, 0x2dc2: 0x000c, 0x2dc3: 0x000c,
+	// Block 0xb8, offset 0x2e00
+	0x2e32: 0x000c, 0x2e33: 0x000c, 0x2e34: 0x000c, 0x2e35: 0x000c,
+	0x2e3c: 0x000c, 0x2e3d: 0x000c, 0x2e3f: 0x000c,
+	// Block 0xb9, offset 0x2e40
+	0x2e40: 0x000c,
+	0x2e5c: 0x000c, 0x2e5d: 0x000c,
+	// Block 0xba, offset 0x2e80
+	0x2eb3: 0x000c, 0x2eb4: 0x000c, 0x2eb5: 0x000c,
+	0x2eb6: 0x000c, 0x2eb7: 0x000c, 0x2eb8: 0x000c, 0x2eb9: 0x000c, 0x2eba: 0x000c,
+	0x2ebd: 0x000c, 0x2ebf: 0x000c,
+	// Block 0xbb, offset 0x2ec0
+	0x2ec0: 0x000c,
+	0x2ee0: 0x000a, 0x2ee1: 0x000a, 0x2ee2: 0x000a, 0x2ee3: 0x000a,
+	0x2ee4: 0x000a, 0x2ee5: 0x000a, 0x2ee6: 0x000a, 0x2ee7: 0x000a, 0x2ee8: 0x000a, 0x2ee9: 0x000a,
+	0x2eea: 0x000a, 0x2eeb: 0x000a, 0x2eec: 0x000a,
+	// Block 0xbc, offset 0x2f00
+	0x2f2b: 0x000c, 0x2f2d: 0x000c,
+	0x2f30: 0x000c, 0x2f31: 0x000c, 0x2f32: 0x000c, 0x2f33: 0x000c, 0x2f34: 0x000c, 0x2f35: 0x000c,
+	0x2f37: 0x000c,
+	// Block 0xbd, offset 0x2f40
+	0x2f5d: 0x000c,
+	0x2f5e: 0x000c, 0x2f5f: 0x000c, 0x2f62: 0x000c, 0x2f63: 0x000c,
+	0x2f64: 0x000c, 0x2f65: 0x000c, 0x2f67: 0x000c, 0x2f68: 0x000c, 0x2f69: 0x000c,
+	0x2f6a: 0x000c, 0x2f6b: 0x000c,
+	// Block 0xbe, offset 0x2f80
+	0x2faf: 0x000c,
+	0x2fb0: 0x000c, 0x2fb1: 0x000c, 0x2fb2: 0x000c, 0x2fb3: 0x000c, 0x2fb4: 0x000c, 0x2fb5: 0x000c,
+	0x2fb6: 0x000c, 0x2fb7: 0x000c, 0x2fb9: 0x000c, 0x2fba: 0x000c,
+	// Block 0xbf, offset 0x2fc0
+	0x2ffb: 0x000c,
+	0x2ffc: 0x000c, 0x2ffe: 0x000c,
+	// Block 0xc0, offset 0x3000
+	0x3003: 0x000c,
+	// Block 0xc1, offset 0x3040
+	0x3054: 0x000c, 0x3055: 0x000c, 0x3056: 0x000c, 0x3057: 0x000c,
+	0x305a: 0x000c, 0x305b: 0x000c,
+	0x3060: 0x000c,
+	// Block 0xc2, offset 0x3080
+	0x3081: 0x000c, 0x3082: 0x000c, 0x3083: 0x000c, 0x3084: 0x000c, 0x3085: 0x000c,
+	0x3086: 0x000c, 0x3089: 0x000c, 0x308a: 0x000c,
+	0x30b3: 0x000c, 0x30b4: 0x000c, 0x30b5: 0x000c,
+	0x30b6: 0x000c, 0x30b7: 0x000c, 0x30b8: 0x000c, 0x30bb: 0x000c,
+	0x30bc: 0x000c, 0x30bd: 0x000c, 0x30be: 0x000c,
+	// Block 0xc3, offset 0x30c0
+	0x30c7: 0x000c,
+	0x30d1: 0x000c,
+	0x30d2: 0x000c, 0x30d3: 0x000c, 0x30d4: 0x000c, 0x30d5: 0x000c, 0x30d6: 0x000c,
+	0x30d9: 0x000c, 0x30da: 0x000c, 0x30db: 0x000c,
+	// Block 0xc4, offset 0x3100
+	0x310a: 0x000c, 0x310b: 0x000c,
+	0x310c: 0x000c, 0x310d: 0x000c, 0x310e: 0x000c, 0x310f: 0x000c, 0x3110: 0x000c, 0x3111: 0x000c,
+	0x3112: 0x000c, 0x3113: 0x000c, 0x3114: 0x000c, 0x3115: 0x000c, 0x3116: 0x000c,
+	0x3118: 0x000c, 0x3119: 0x000c,
+	// Block 0xc5, offset 0x3140
+	0x3170: 0x000c, 0x3171: 0x000c, 0x3172: 0x000c, 0x3173: 0x000c, 0x3174: 0x000c, 0x3175: 0x000c,
+	0x3176: 0x000c, 0x3178: 0x000c, 0x3179: 0x000c, 0x317a: 0x000c, 0x317b: 0x000c,
+	0x317c: 0x000c, 0x317d: 0x000c,
+	// Block 0xc6, offset 0x3180
+	0x3192: 0x000c, 0x3193: 0x000c, 0x3194: 0x000c, 0x3195: 0x000c, 0x3196: 0x000c, 0x3197: 0x000c,
+	0x3198: 0x000c, 0x3199: 0x000c, 0x319a: 0x000c, 0x319b: 0x000c, 0x319c: 0x000c, 0x319d: 0x000c,
+	0x319e: 0x000c, 0x319f: 0x000c, 0x31a0: 0x000c, 0x31a1: 0x000c, 0x31a2: 0x000c, 0x31a3: 0x000c,
+	0x31a4: 0x000c, 0x31a5: 0x000c, 0x31a6: 0x000c, 0x31a7: 0x000c,
+	0x31aa: 0x000c, 0x31ab: 0x000c, 0x31ac: 0x000c, 0x31ad: 0x000c, 0x31ae: 0x000c, 0x31af: 0x000c,
+	0x31b0: 0x000c, 0x31b2: 0x000c, 0x31b3: 0x000c, 0x31b5: 0x000c,
+	0x31b6: 0x000c,
+	// Block 0xc7, offset 0x31c0
+	0x31f1: 0x000c, 0x31f2: 0x000c, 0x31f3: 0x000c, 0x31f4: 0x000c, 0x31f5: 0x000c,
+	0x31f6: 0x000c, 0x31fa: 0x000c,
+	0x31fc: 0x000c, 0x31fd: 0x000c, 0x31ff: 0x000c,
+	// Block 0xc8, offset 0x3200
+	0x3200: 0x000c, 0x3201: 0x000c, 0x3202: 0x000c, 0x3203: 0x000c, 0x3204: 0x000c, 0x3205: 0x000c,
+	0x3207: 0x000c,
+	// Block 0xc9, offset 0x3240
+	0x3250: 0x000c, 0x3251: 0x000c,
+	0x3255: 0x000c, 0x3257: 0x000c,
+	// Block 0xca, offset 0x3280
+	0x32b3: 0x000c, 0x32b4: 0x000c,
+	// Block 0xcb, offset 0x32c0
+	0x32c0: 0x000c, 0x32c1: 0x000c,
+	0x32f6: 0x000c, 0x32f7: 0x000c, 0x32f8: 0x000c, 0x32f9: 0x000c, 0x32fa: 0x000c,
+	// Block 0xcc, offset 0x3300
+	0x3300: 0x000c, 0x3302: 0x000c,
+	// Block 0xcd, offset 0x3340
+	0x3355: 0x000a, 0x3356: 0x000a, 0x3357: 0x000a,
+	0x3358: 0x000a, 0x3359: 0x000a, 0x335a: 0x000a, 0x335b: 0x000a, 0x335c: 0x000a, 0x335d: 0x0004,
+	0x335e: 0x0004, 0x335f: 0x0004, 0x3360: 0x0004, 0x3361: 0x000a, 0x3362: 0x000a, 0x3363: 0x000a,
+	0x3364: 0x000a, 0x3365: 0x000a, 0x3366: 0x000a, 0x3367: 0x000a, 0x3368: 0x000a, 0x3369: 0x000a,
+	0x336a: 0x000a, 0x336b: 0x000a, 0x336c: 0x000a, 0x336d: 0x000a, 0x336e: 0x000a, 0x336f: 0x000a,
+	0x3370: 0x000a, 0x3371: 0x000a,
+	// Block 0xce, offset 0x3380
+	0x3380: 0x000c,
+	0x3387: 0x000c, 0x3388: 0x000c, 0x3389: 0x000c, 0x338a: 0x000c, 0x338b: 0x000c,
+	0x338c: 0x000c, 0x338d: 0x000c, 0x338e: 0x000c, 0x338f: 0x000c, 0x3390: 0x000c, 0x3391: 0x000c,
+	0x3392: 0x000c, 0x3393: 0x000c, 0x3394: 0x000c, 0x3395: 0x000c,
+	// Block 0xcf, offset 0x33c0
+	0x33f0: 0x000c, 0x33f1: 0x000c, 0x33f2: 0x000c, 0x33f3: 0x000c, 0x33f4: 0x000c,
+	// Block 0xd0, offset 0x3400
+	0x3430: 0x000c, 0x3431: 0x000c, 0x3432: 0x000c, 0x3433: 0x000c, 0x3434: 0x000c, 0x3435: 0x000c,
+	0x3436: 0x000c,
+	// Block 0xd1, offset 0x3440
+	0x344f: 0x000c,
+	// Block 0xd2, offset 0x3480
+	0x348f: 0x000c, 0x3490: 0x000c, 0x3491: 0x000c,
+	0x3492: 0x000c,
+	// Block 0xd3, offset 0x34c0
+	0x34e2: 0x000a,
+	0x34e4: 0x000c,
+	// Block 0xd4, offset 0x3500
+	0x351d: 0x000c,
+	0x351e: 0x000c, 0x3520: 0x000b, 0x3521: 0x000b, 0x3522: 0x000b, 0x3523: 0x000b,
+	// Block 0xd5, offset 0x3540
+	0x3540: 0x000c, 0x3541: 0x000c, 0x3542: 0x000c, 0x3543: 0x000c, 0x3544: 0x000c, 0x3545: 0x000c,
+	0x3546: 0x000c, 0x3547: 0x000c, 0x3548: 0x000c, 0x3549: 0x000c, 0x354a: 0x000c, 0x354b: 0x000c,
+	0x354c: 0x000c, 0x354d: 0x000c, 0x354e: 0x000c, 0x354f: 0x000c, 0x3550: 0x000c, 0x3551: 0x000c,
+	0x3552: 0x000c, 0x3553: 0x000c, 0x3554: 0x000c, 0x3555: 0x000c, 0x3556: 0x000c, 0x3557: 0x000c,
+	0x3558: 0x000c, 0x3559: 0x000c, 0x355a: 0x000c, 0x355b: 0x000c, 0x355c: 0x000c, 0x355d: 0x000c,
+	0x355e: 0x000c, 0x355f: 0x000c, 0x3560: 0x000c, 0x3561: 0x000c, 0x3562: 0x000c, 0x3563: 0x000c,
+	0x3564: 0x000c, 0x3565: 0x000c, 0x3566: 0x000c, 0x3567: 0x000c, 0x3568: 0x000c, 0x3569: 0x000c,
+	0x356a: 0x000c, 0x356b: 0x000c, 0x356c: 0x000c, 0x356d: 0x000c,
+	0x3570: 0x000c, 0x3571: 0x000c, 0x3572: 0x000c, 0x3573: 0x000c, 0x3574: 0x000c, 0x3575: 0x000c,
+	0x3576: 0x000c, 0x3577: 0x000c, 0x3578: 0x000c, 0x3579: 0x000c, 0x357a: 0x000c, 0x357b: 0x000c,
+	0x357c: 0x000c, 0x357d: 0x000c, 0x357e: 0x000c, 0x357f: 0x000c,
+	// Block 0xd6, offset 0x3580
+	0x3580: 0x000c, 0x3581: 0x000c, 0x3582: 0x000c, 0x3583: 0x000c, 0x3584: 0x000c, 0x3585: 0x000c,
+	0x3586: 0x000c,
+	// Block 0xd7, offset 0x35c0
+	0x35e7: 0x000c, 0x35e8: 0x000c, 0x35e9: 0x000c,
+	0x35f3: 0x000b, 0x35f4: 0x000b, 0x35f5: 0x000b,
+	0x35f6: 0x000b, 0x35f7: 0x000b, 0x35f8: 0x000b, 0x35f9: 0x000b, 0x35fa: 0x000b, 0x35fb: 0x000c,
+	0x35fc: 0x000c, 0x35fd: 0x000c, 0x35fe: 0x000c, 0x35ff: 0x000c,
+	// Block 0xd8, offset 0x3600
+	0x3600: 0x000c, 0x3601: 0x000c, 0x3602: 0x000c, 0x3605: 0x000c,
+	0x3606: 0x000c, 0x3607: 0x000c, 0x3608: 0x000c, 0x3609: 0x000c, 0x360a: 0x000c, 0x360b: 0x000c,
+	0x362a: 0x000c, 0x362b: 0x000c, 0x362c: 0x000c, 0x362d: 0x000c,
+	// Block 0xd9, offset 0x3640
+	0x3669: 0x000a,
+	0x366a: 0x000a,
+	// Block 0xda, offset 0x3680
+	0x3680: 0x000a, 0x3681: 0x000a, 0x3682: 0x000c, 0x3683: 0x000c, 0x3684: 0x000c, 0x3685: 0x000a,
+	// Block 0xdb, offset 0x36c0
+	0x36c0: 0x000a, 0x36c1: 0x000a, 0x36c2: 0x000a, 0x36c3: 0x000a, 0x36c4: 0x000a, 0x36c5: 0x000a,
+	0x36c6: 0x000a, 0x36c7: 0x000a, 0x36c8: 0x000a, 0x36c9: 0x000a, 0x36ca: 0x000a, 0x36cb: 0x000a,
+	0x36cc: 0x000a, 0x36cd: 0x000a, 0x36ce: 0x000a, 0x36cf: 0x000a, 0x36d0: 0x000a, 0x36d1: 0x000a,
+	0x36d2: 0x000a, 0x36d3: 0x000a, 0x36d4: 0x000a, 0x36d5: 0x000a, 0x36d6: 0x000a,
+	// Block 0xdc, offset 0x3700
+	0x371b: 0x000a,
+	// Block 0xdd, offset 0x3740
+	0x3755: 0x000a,
+	// Block 0xde, offset 0x3780
+	0x378f: 0x000a,
+	// Block 0xdf, offset 0x37c0
+	0x37c9: 0x000a,
+	// Block 0xe0, offset 0x3800
+	0x3803: 0x000a,
+	0x380e: 0x0002, 0x380f: 0x0002, 0x3810: 0x0002, 0x3811: 0x0002,
+	0x3812: 0x0002, 0x3813: 0x0002, 0x3814: 0x0002, 0x3815: 0x0002, 0x3816: 0x0002, 0x3817: 0x0002,
+	0x3818: 0x0002, 0x3819: 0x0002, 0x381a: 0x0002, 0x381b: 0x0002, 0x381c: 0x0002, 0x381d: 0x0002,
+	0x381e: 0x0002, 0x381f: 0x0002, 0x3820: 0x0002, 0x3821: 0x0002, 0x3822: 0x0002, 0x3823: 0x0002,
+	0x3824: 0x0002, 0x3825: 0x0002, 0x3826: 0x0002, 0x3827: 0x0002, 0x3828: 0x0002, 0x3829: 0x0002,
+	0x382a: 0x0002, 0x382b: 0x0002, 0x382c: 0x0002, 0x382d: 0x0002, 0x382e: 0x0002, 0x382f: 0x0002,
+	0x3830: 0x0002, 0x3831: 0x0002, 0x3832: 0x0002, 0x3833: 0x0002, 0x3834: 0x0002, 0x3835: 0x0002,
+	0x3836: 0x0002, 0x3837: 0x0002, 0x3838: 0x0002, 0x3839: 0x0002, 0x383a: 0x0002, 0x383b: 0x0002,
+	0x383c: 0x0002, 0x383d: 0x0002, 0x383e: 0x0002, 0x383f: 0x0002,
+	// Block 0xe1, offset 0x3840
+	0x3840: 0x000c, 0x3841: 0x000c, 0x3842: 0x000c, 0x3843: 0x000c, 0x3844: 0x000c, 0x3845: 0x000c,
+	0x3846: 0x000c, 0x3847: 0x000c, 0x3848: 0x000c, 0x3849: 0x000c, 0x384a: 0x000c, 0x384b: 0x000c,
+	0x384c: 0x000c, 0x384d: 0x000c, 0x384e: 0x000c, 0x384f: 0x000c, 0x3850: 0x000c, 0x3851: 0x000c,
+	0x3852: 0x000c, 0x3853: 0x000c, 0x3854: 0x000c, 0x3855: 0x000c, 0x3856: 0x000c, 0x3857: 0x000c,
+	0x3858: 0x000c, 0x3859: 0x000c, 0x385a: 0x000c, 0x385b: 0x000c, 0x385c: 0x000c, 0x385d: 0x000c,
+	0x385e: 0x000c, 0x385f: 0x000c, 0x3860: 0x000c, 0x3861: 0x000c, 0x3862: 0x000c, 0x3863: 0x000c,
+	0x3864: 0x000c, 0x3865: 0x000c, 0x3866: 0x000c, 0x3867: 0x000c, 0x3868: 0x000c, 0x3869: 0x000c,
+	0x386a: 0x000c, 0x386b: 0x000c, 0x386c: 0x000c, 0x386d: 0x000c, 0x386e: 0x000c, 0x386f: 0x000c,
+	0x3870: 0x000c, 0x3871: 0x000c, 0x3872: 0x000c, 0x3873: 0x000c, 0x3874: 0x000c, 0x3875: 0x000c,
+	0x3876: 0x000c, 0x387b: 0x000c,
+	0x387c: 0x000c, 0x387d: 0x000c, 0x387e: 0x000c, 0x387f: 0x000c,
+	// Block 0xe2, offset 0x3880
+	0x3880: 0x000c, 0x3881: 0x000c, 0x3882: 0x000c, 0x3883: 0x000c, 0x3884: 0x000c, 0x3885: 0x000c,
+	0x3886: 0x000c, 0x3887: 0x000c, 0x3888: 0x000c, 0x3889: 0x000c, 0x388a: 0x000c, 0x388b: 0x000c,
+	0x388c: 0x000c, 0x388d: 0x000c, 0x388e: 0x000c, 0x388f: 0x000c, 0x3890: 0x000c, 0x3891: 0x000c,
+	0x3892: 0x000c, 0x3893: 0x000c, 0x3894: 0x000c, 0x3895: 0x000c, 0x3896: 0x000c, 0x3897: 0x000c,
+	0x3898: 0x000c, 0x3899: 0x000c, 0x389a: 0x000c, 0x389b: 0x000c, 0x389c: 0x000c, 0x389d: 0x000c,
+	0x389e: 0x000c, 0x389f: 0x000c, 0x38a0: 0x000c, 0x38a1: 0x000c, 0x38a2: 0x000c, 0x38a3: 0x000c,
+	0x38a4: 0x000c, 0x38a5: 0x000c, 0x38a6: 0x000c, 0x38a7: 0x000c, 0x38a8: 0x000c, 0x38a9: 0x000c,
+	0x38aa: 0x000c, 0x38ab: 0x000c, 0x38ac: 0x000c,
+	0x38b5: 0x000c,
+	// Block 0xe3, offset 0x38c0
+	0x38c4: 0x000c,
+	0x38db: 0x000c, 0x38dc: 0x000c, 0x38dd: 0x000c,
+	0x38de: 0x000c, 0x38df: 0x000c, 0x38e1: 0x000c, 0x38e2: 0x000c, 0x38e3: 0x000c,
+	0x38e4: 0x000c, 0x38e5: 0x000c, 0x38e6: 0x000c, 0x38e7: 0x000c, 0x38e8: 0x000c, 0x38e9: 0x000c,
+	0x38ea: 0x000c, 0x38eb: 0x000c, 0x38ec: 0x000c, 0x38ed: 0x000c, 0x38ee: 0x000c, 0x38ef: 0x000c,
+	// Block 0xe4, offset 0x3900
+	0x3900: 0x000c, 0x3901: 0x000c, 0x3902: 0x000c, 0x3903: 0x000c, 0x3904: 0x000c, 0x3905: 0x000c,
+	0x3906: 0x000c, 0x3908: 0x000c, 0x3909: 0x000c, 0x390a: 0x000c, 0x390b: 0x000c,
+	0x390c: 0x000c, 0x390d: 0x000c, 0x390e: 0x000c, 0x390f: 0x000c, 0x3910: 0x000c, 0x3911: 0x000c,
+	0x3912: 0x000c, 0x3913: 0x000c, 0x3914: 0x000c, 0x3915: 0x000c, 0x3916: 0x000c, 0x3917: 0x000c,
+	0x3918: 0x000c, 0x391b: 0x000c, 0x391c: 0x000c, 0x391d: 0x000c,
+	0x391e: 0x000c, 0x391f: 0x000c, 0x3920: 0x000c, 0x3921: 0x000c, 0x3923: 0x000c,
+	0x3924: 0x000c, 0x3926: 0x000c, 0x3927: 0x000c, 0x3928: 0x000c, 0x3929: 0x000c,
+	0x392a: 0x000c,
+	// Block 0xe5, offset 0x3940
+	0x396e: 0x000c,
+	// Block 0xe6, offset 0x3980
+	0x39ac: 0x000c, 0x39ad: 0x000c, 0x39ae: 0x000c, 0x39af: 0x000c,
+	0x39bf: 0x0004,
+	// Block 0xe7, offset 0x39c0
+	0x39ec: 0x000c, 0x39ed: 0x000c, 0x39ee: 0x000c, 0x39ef: 0x000c,
+	// Block 0xe8, offset 0x3a00
+	0x3a00: 0x0001, 0x3a01: 0x0001, 0x3a02: 0x0001, 0x3a03: 0x0001, 0x3a04: 0x0001, 0x3a05: 0x0001,
+	0x3a06: 0x0001, 0x3a07: 0x0001, 0x3a08: 0x0001, 0x3a09: 0x0001, 0x3a0a: 0x0001, 0x3a0b: 0x0001,
+	0x3a0c: 0x0001, 0x3a0d: 0x0001, 0x3a0e: 0x0001, 0x3a0f: 0x0001, 0x3a10: 0x000c, 0x3a11: 0x000c,
+	0x3a12: 0x000c, 0x3a13: 0x000c, 0x3a14: 0x000c, 0x3a15: 0x000c, 0x3a16: 0x000c, 0x3a17: 0x0001,
+	0x3a18: 0x0001, 0x3a19: 0x0001, 0x3a1a: 0x0001, 0x3a1b: 0x0001, 0x3a1c: 0x0001, 0x3a1d: 0x0001,
+	0x3a1e: 0x0001, 0x3a1f: 0x0001, 0x3a20: 0x0001, 0x3a21: 0x0001, 0x3a22: 0x0001, 0x3a23: 0x0001,
+	0x3a24: 0x0001, 0x3a25: 0x0001, 0x3a26: 0x0001, 0x3a27: 0x0001, 0x3a28: 0x0001, 0x3a29: 0x0001,
+	0x3a2a: 0x0001, 0x3a2b: 0x0001, 0x3a2c: 0x0001, 0x3a2d: 0x0001, 0x3a2e: 0x0001, 0x3a2f: 0x0001,
+	0x3a30: 0x0001, 0x3a31: 0x0001, 0x3a32: 0x0001, 0x3a33: 0x0001, 0x3a34: 0x0001, 0x3a35: 0x0001,
+	0x3a36: 0x0001, 0x3a37: 0x0001, 0x3a38: 0x0001, 0x3a39: 0x0001, 0x3a3a: 0x0001, 0x3a3b: 0x0001,
+	0x3a3c: 0x0001, 0x3a3d: 0x0001, 0x3a3e: 0x0001, 0x3a3f: 0x0001,
+	// Block 0xe9, offset 0x3a40
+	0x3a40: 0x0001, 0x3a41: 0x0001, 0x3a42: 0x0001, 0x3a43: 0x0001, 0x3a44: 0x000c, 0x3a45: 0x000c,
+	0x3a46: 0x000c, 0x3a47: 0x000c, 0x3a48: 0x000c, 0x3a49: 0x000c, 0x3a4a: 0x000c, 0x3a4b: 0x0001,
+	0x3a4c: 0x0001, 0x3a4d: 0x0001, 0x3a4e: 0x0001, 0x3a4f: 0x0001, 0x3a50: 0x0001, 0x3a51: 0x0001,
+	0x3a52: 0x0001, 0x3a53: 0x0001, 0x3a54: 0x0001, 0x3a55: 0x0001, 0x3a56: 0x0001, 0x3a57: 0x0001,
+	0x3a58: 0x0001, 0x3a59: 0x0001, 0x3a5a: 0x0001, 0x3a5b: 0x0001, 0x3a5c: 0x0001, 0x3a5d: 0x0001,
+	0x3a5e: 0x0001, 0x3a5f: 0x0001, 0x3a60: 0x0001, 0x3a61: 0x0001, 0x3a62: 0x0001, 0x3a63: 0x0001,
+	0x3a64: 0x0001, 0x3a65: 0x0001, 0x3a66: 0x0001, 0x3a67: 0x0001, 0x3a68: 0x0001, 0x3a69: 0x0001,
+	0x3a6a: 0x0001, 0x3a6b: 0x0001, 0x3a6c: 0x0001, 0x3a6d: 0x0001, 0x3a6e: 0x0001, 0x3a6f: 0x0001,
+	0x3a70: 0x0001, 0x3a71: 0x0001, 0x3a72: 0x0001, 0x3a73: 0x0001, 0x3a74: 0x0001, 0x3a75: 0x0001,
+	0x3a76: 0x0001, 0x3a77: 0x0001, 0x3a78: 0x0001, 0x3a79: 0x0001, 0x3a7a: 0x0001, 0x3a7b: 0x0001,
+	0x3a7c: 0x0001, 0x3a7d: 0x0001, 0x3a7e: 0x0001, 0x3a7f: 0x0001,
+	// Block 0xea, offset 0x3a80
+	0x3a80: 0x0001, 0x3a81: 0x0001, 0x3a82: 0x0001, 0x3a83: 0x0001, 0x3a84: 0x0001, 0x3a85: 0x0001,
+	0x3a86: 0x0001, 0x3a87: 0x0001, 0x3a88: 0x0001, 0x3a89: 0x0001, 0x3a8a: 0x0001, 0x3a8b: 0x0001,
+	0x3a8c: 0x0001, 0x3a8d: 0x0001, 0x3a8e: 0x0001, 0x3a8f: 0x0001, 0x3a90: 0x0001, 0x3a91: 0x0001,
+	0x3a92: 0x0001, 0x3a93: 0x0001, 0x3a94: 0x0001, 0x3a95: 0x0001, 0x3a96: 0x0001, 0x3a97: 0x0001,
+	0x3a98: 0x0001, 0x3a99: 0x0001, 0x3a9a: 0x0001, 0x3a9b: 0x0001, 0x3a9c: 0x0001, 0x3a9d: 0x0001,
+	0x3a9e: 0x0001, 0x3a9f: 0x0001, 0x3aa0: 0x0001, 0x3aa1: 0x0001, 0x3aa2: 0x0001, 0x3aa3: 0x0001,
+	0x3aa4: 0x0001, 0x3aa5: 0x0001, 0x3aa6: 0x0001, 0x3aa7: 0x0001, 0x3aa8: 0x0001, 0x3aa9: 0x0001,
+	0x3aaa: 0x0001, 0x3aab: 0x0001, 0x3aac: 0x0001, 0x3aad: 0x0001, 0x3aae: 0x0001, 0x3aaf: 0x0001,
+	0x3ab0: 0x0001, 0x3ab1: 0x000d, 0x3ab2: 0x000d, 0x3ab3: 0x000d, 0x3ab4: 0x000d, 0x3ab5: 0x000d,
+	0x3ab6: 0x000d, 0x3ab7: 0x000d, 0x3ab8: 0x000d, 0x3ab9: 0x000d, 0x3aba: 0x000d, 0x3abb: 0x000d,
+	0x3abc: 0x000d, 0x3abd: 0x000d, 0x3abe: 0x000d, 0x3abf: 0x000d,
+	// Block 0xeb, offset 0x3ac0
+	0x3ac0: 0x000d, 0x3ac1: 0x000d, 0x3ac2: 0x000d, 0x3ac3: 0x000d, 0x3ac4: 0x000d, 0x3ac5: 0x000d,
+	0x3ac6: 0x000d, 0x3ac7: 0x000d, 0x3ac8: 0x000d, 0x3ac9: 0x000d, 0x3aca: 0x000d, 0x3acb: 0x000d,
+	0x3acc: 0x000d, 0x3acd: 0x000d, 0x3ace: 0x000d, 0x3acf: 0x000d, 0x3ad0: 0x000d, 0x3ad1: 0x000d,
+	0x3ad2: 0x000d, 0x3ad3: 0x000d, 0x3ad4: 0x000d, 0x3ad5: 0x000d, 0x3ad6: 0x000d, 0x3ad7: 0x000d,
+	0x3ad8: 0x000d, 0x3ad9: 0x000d, 0x3ada: 0x000d, 0x3adb: 0x000d, 0x3adc: 0x000d, 0x3add: 0x000d,
+	0x3ade: 0x000d, 0x3adf: 0x000d, 0x3ae0: 0x000d, 0x3ae1: 0x000d, 0x3ae2: 0x000d, 0x3ae3: 0x000d,
+	0x3ae4: 0x000d, 0x3ae5: 0x000d, 0x3ae6: 0x000d, 0x3ae7: 0x000d, 0x3ae8: 0x000d, 0x3ae9: 0x000d,
+	0x3aea: 0x000d, 0x3aeb: 0x000d, 0x3aec: 0x000d, 0x3aed: 0x000d, 0x3aee: 0x000d, 0x3aef: 0x000d,
+	0x3af0: 0x000d, 0x3af1: 0x000d, 0x3af2: 0x000d, 0x3af3: 0x000d, 0x3af4: 0x000d, 0x3af5: 0x0001,
+	0x3af6: 0x0001, 0x3af7: 0x0001, 0x3af8: 0x0001, 0x3af9: 0x0001, 0x3afa: 0x0001, 0x3afb: 0x0001,
+	0x3afc: 0x0001, 0x3afd: 0x0001, 0x3afe: 0x0001, 0x3aff: 0x0001,
+	// Block 0xec, offset 0x3b00
+	0x3b00: 0x0001, 0x3b01: 0x000d, 0x3b02: 0x000d, 0x3b03: 0x000d, 0x3b04: 0x000d, 0x3b05: 0x000d,
+	0x3b06: 0x000d, 0x3b07: 0x000d, 0x3b08: 0x000d, 0x3b09: 0x000d, 0x3b0a: 0x000d, 0x3b0b: 0x000d,
+	0x3b0c: 0x000d, 0x3b0d: 0x000d, 0x3b0e: 0x000d, 0x3b0f: 0x000d, 0x3b10: 0x000d, 0x3b11: 0x000d,
+	0x3b12: 0x000d, 0x3b13: 0x000d, 0x3b14: 0x000d, 0x3b15: 0x000d, 0x3b16: 0x000d, 0x3b17: 0x000d,
+	0x3b18: 0x000d, 0x3b19: 0x000d, 0x3b1a: 0x000d, 0x3b1b: 0x000d, 0x3b1c: 0x000d, 0x3b1d: 0x000d,
+	0x3b1e: 0x000d, 0x3b1f: 0x000d, 0x3b20: 0x000d, 0x3b21: 0x000d, 0x3b22: 0x000d, 0x3b23: 0x000d,
+	0x3b24: 0x000d, 0x3b25: 0x000d, 0x3b26: 0x000d, 0x3b27: 0x000d, 0x3b28: 0x000d, 0x3b29: 0x000d,
+	0x3b2a: 0x000d, 0x3b2b: 0x000d, 0x3b2c: 0x000d, 0x3b2d: 0x000d, 0x3b2e: 0x000d, 0x3b2f: 0x000d,
+	0x3b30: 0x000d, 0x3b31: 0x000d, 0x3b32: 0x000d, 0x3b33: 0x000d, 0x3b34: 0x000d, 0x3b35: 0x000d,
+	0x3b36: 0x000d, 0x3b37: 0x000d, 0x3b38: 0x000d, 0x3b39: 0x000d, 0x3b3a: 0x000d, 0x3b3b: 0x000d,
+	0x3b3c: 0x000d, 0x3b3d: 0x000d, 0x3b3e: 0x0001, 0x3b3f: 0x0001,
+	// Block 0xed, offset 0x3b40
+	0x3b40: 0x000d, 0x3b41: 0x000d, 0x3b42: 0x000d, 0x3b43: 0x000d, 0x3b44: 0x000d, 0x3b45: 0x000d,
+	0x3b46: 0x000d, 0x3b47: 0x000d, 0x3b48: 0x000d, 0x3b49: 0x000d, 0x3b4a: 0x000d, 0x3b4b: 0x000d,
+	0x3b4c: 0x000d, 0x3b4d: 0x000d, 0x3b4e: 0x000d, 0x3b4f: 0x000d, 0x3b50: 0x000d, 0x3b51: 0x000d,
+	0x3b52: 0x000d, 0x3b53: 0x000d, 0x3b54: 0x000d, 0x3b55: 0x000d, 0x3b56: 0x000d, 0x3b57: 0x000d,
+	0x3b58: 0x000d, 0x3b59: 0x000d, 0x3b5a: 0x000d, 0x3b5b: 0x000d, 0x3b5c: 0x000d, 0x3b5d: 0x000d,
+	0x3b5e: 0x000d, 0x3b5f: 0x000d, 0x3b60: 0x000d, 0x3b61: 0x000d, 0x3b62: 0x000d, 0x3b63: 0x000d,
+	0x3b64: 0x000d, 0x3b65: 0x000d, 0x3b66: 0x000d, 0x3b67: 0x000d, 0x3b68: 0x000d, 0x3b69: 0x000d,
+	0x3b6a: 0x000d, 0x3b6b: 0x000d, 0x3b6c: 0x000d, 0x3b6d: 0x000d, 0x3b6e: 0x000d, 0x3b6f: 0x000d,
+	0x3b70: 0x000a, 0x3b71: 0x000a, 0x3b72: 0x000d, 0x3b73: 0x000d, 0x3b74: 0x000d, 0x3b75: 0x000d,
+	0x3b76: 0x000d, 0x3b77: 0x000d, 0x3b78: 0x000d, 0x3b79: 0x000d, 0x3b7a: 0x000d, 0x3b7b: 0x000d,
+	0x3b7c: 0x000d, 0x3b7d: 0x000d, 0x3b7e: 0x000d, 0x3b7f: 0x000d,
+	// Block 0xee, offset 0x3b80
+	0x3b80: 0x000a, 0x3b81: 0x000a, 0x3b82: 0x000a, 0x3b83: 0x000a, 0x3b84: 0x000a, 0x3b85: 0x000a,
+	0x3b86: 0x000a, 0x3b87: 0x000a, 0x3b88: 0x000a, 0x3b89: 0x000a, 0x3b8a: 0x000a, 0x3b8b: 0x000a,
+	0x3b8c: 0x000a, 0x3b8d: 0x000a, 0x3b8e: 0x000a, 0x3b8f: 0x000a, 0x3b90: 0x000a, 0x3b91: 0x000a,
+	0x3b92: 0x000a, 0x3b93: 0x000a, 0x3b94: 0x000a, 0x3b95: 0x000a, 0x3b96: 0x000a, 0x3b97: 0x000a,
+	0x3b98: 0x000a, 0x3b99: 0x000a, 0x3b9a: 0x000a, 0x3b9b: 0x000a, 0x3b9c: 0x000a, 0x3b9d: 0x000a,
+	0x3b9e: 0x000a, 0x3b9f: 0x000a, 0x3ba0: 0x000a, 0x3ba1: 0x000a, 0x3ba2: 0x000a, 0x3ba3: 0x000a,
+	0x3ba4: 0x000a, 0x3ba5: 0x000a, 0x3ba6: 0x000a, 0x3ba7: 0x000a, 0x3ba8: 0x000a, 0x3ba9: 0x000a,
+	0x3baa: 0x000a, 0x3bab: 0x000a,
+	0x3bb0: 0x000a, 0x3bb1: 0x000a, 0x3bb2: 0x000a, 0x3bb3: 0x000a, 0x3bb4: 0x000a, 0x3bb5: 0x000a,
+	0x3bb6: 0x000a, 0x3bb7: 0x000a, 0x3bb8: 0x000a, 0x3bb9: 0x000a, 0x3bba: 0x000a, 0x3bbb: 0x000a,
+	0x3bbc: 0x000a, 0x3bbd: 0x000a, 0x3bbe: 0x000a, 0x3bbf: 0x000a,
+	// Block 0xef, offset 0x3bc0
+	0x3bc0: 0x000a, 0x3bc1: 0x000a, 0x3bc2: 0x000a, 0x3bc3: 0x000a, 0x3bc4: 0x000a, 0x3bc5: 0x000a,
+	0x3bc6: 0x000a, 0x3bc7: 0x000a, 0x3bc8: 0x000a, 0x3bc9: 0x000a, 0x3bca: 0x000a, 0x3bcb: 0x000a,
+	0x3bcc: 0x000a, 0x3bcd: 0x000a, 0x3bce: 0x000a, 0x3bcf: 0x000a, 0x3bd0: 0x000a, 0x3bd1: 0x000a,
+	0x3bd2: 0x000a, 0x3bd3: 0x000a,
+	0x3be0: 0x000a, 0x3be1: 0x000a, 0x3be2: 0x000a, 0x3be3: 0x000a,
+	0x3be4: 0x000a, 0x3be5: 0x000a, 0x3be6: 0x000a, 0x3be7: 0x000a, 0x3be8: 0x000a, 0x3be9: 0x000a,
+	0x3bea: 0x000a, 0x3beb: 0x000a, 0x3bec: 0x000a, 0x3bed: 0x000a, 0x3bee: 0x000a,
+	0x3bf1: 0x000a, 0x3bf2: 0x000a, 0x3bf3: 0x000a, 0x3bf4: 0x000a, 0x3bf5: 0x000a,
+	0x3bf6: 0x000a, 0x3bf7: 0x000a, 0x3bf8: 0x000a, 0x3bf9: 0x000a, 0x3bfa: 0x000a, 0x3bfb: 0x000a,
+	0x3bfc: 0x000a, 0x3bfd: 0x000a, 0x3bfe: 0x000a, 0x3bff: 0x000a,
+	// Block 0xf0, offset 0x3c00
+	0x3c01: 0x000a, 0x3c02: 0x000a, 0x3c03: 0x000a, 0x3c04: 0x000a, 0x3c05: 0x000a,
+	0x3c06: 0x000a, 0x3c07: 0x000a, 0x3c08: 0x000a, 0x3c09: 0x000a, 0x3c0a: 0x000a, 0x3c0b: 0x000a,
+	0x3c0c: 0x000a, 0x3c0d: 0x000a, 0x3c0e: 0x000a, 0x3c0f: 0x000a, 0x3c11: 0x000a,
+	0x3c12: 0x000a, 0x3c13: 0x000a, 0x3c14: 0x000a, 0x3c15: 0x000a, 0x3c16: 0x000a, 0x3c17: 0x000a,
+	0x3c18: 0x000a, 0x3c19: 0x000a, 0x3c1a: 0x000a, 0x3c1b: 0x000a, 0x3c1c: 0x000a, 0x3c1d: 0x000a,
+	0x3c1e: 0x000a, 0x3c1f: 0x000a, 0x3c20: 0x000a, 0x3c21: 0x000a, 0x3c22: 0x000a, 0x3c23: 0x000a,
+	0x3c24: 0x000a, 0x3c25: 0x000a, 0x3c26: 0x000a, 0x3c27: 0x000a, 0x3c28: 0x000a, 0x3c29: 0x000a,
+	0x3c2a: 0x000a, 0x3c2b: 0x000a, 0x3c2c: 0x000a, 0x3c2d: 0x000a, 0x3c2e: 0x000a, 0x3c2f: 0x000a,
+	0x3c30: 0x000a, 0x3c31: 0x000a, 0x3c32: 0x000a, 0x3c33: 0x000a, 0x3c34: 0x000a, 0x3c35: 0x000a,
+	// Block 0xf1, offset 0x3c40
+	0x3c40: 0x0002, 0x3c41: 0x0002, 0x3c42: 0x0002, 0x3c43: 0x0002, 0x3c44: 0x0002, 0x3c45: 0x0002,
+	0x3c46: 0x0002, 0x3c47: 0x0002, 0x3c48: 0x0002, 0x3c49: 0x0002, 0x3c4a: 0x0002, 0x3c4b: 0x000a,
+	0x3c4c: 0x000a, 0x3c4d: 0x000a, 0x3c4e: 0x000a, 0x3c4f: 0x000a,
+	0x3c6f: 0x000a,
+	// Block 0xf2, offset 0x3c80
+	0x3caa: 0x000a, 0x3cab: 0x000a, 0x3cac: 0x000a, 0x3cad: 0x000a, 0x3cae: 0x000a, 0x3caf: 0x000a,
+	// Block 0xf3, offset 0x3cc0
+	0x3ced: 0x000a,
+	// Block 0xf4, offset 0x3d00
+	0x3d20: 0x000a, 0x3d21: 0x000a, 0x3d22: 0x000a, 0x3d23: 0x000a,
+	0x3d24: 0x000a, 0x3d25: 0x000a,
+	// Block 0xf5, offset 0x3d40
+	0x3d40: 0x000a, 0x3d41: 0x000a, 0x3d42: 0x000a, 0x3d43: 0x000a, 0x3d44: 0x000a, 0x3d45: 0x000a,
+	0x3d46: 0x000a, 0x3d47: 0x000a, 0x3d48: 0x000a, 0x3d49: 0x000a, 0x3d4a: 0x000a, 0x3d4b: 0x000a,
+	0x3d4c: 0x000a, 0x3d4d: 0x000a, 0x3d4e: 0x000a, 0x3d4f: 0x000a, 0x3d50: 0x000a, 0x3d51: 0x000a,
+	0x3d52: 0x000a, 0x3d53: 0x000a, 0x3d54: 0x000a, 0x3d55: 0x000a, 0x3d56: 0x000a, 0x3d57: 0x000a,
+	0x3d5c: 0x000a, 0x3d5d: 0x000a,
+	0x3d5e: 0x000a, 0x3d5f: 0x000a, 0x3d60: 0x000a, 0x3d61: 0x000a, 0x3d62: 0x000a, 0x3d63: 0x000a,
+	0x3d64: 0x000a, 0x3d65: 0x000a, 0x3d66: 0x000a, 0x3d67: 0x000a, 0x3d68: 0x000a, 0x3d69: 0x000a,
+	0x3d6a: 0x000a, 0x3d6b: 0x000a, 0x3d6c: 0x000a,
+	0x3d70: 0x000a, 0x3d71: 0x000a, 0x3d72: 0x000a, 0x3d73: 0x000a, 0x3d74: 0x000a, 0x3d75: 0x000a,
+	0x3d76: 0x000a, 0x3d77: 0x000a, 0x3d78: 0x000a, 0x3d79: 0x000a, 0x3d7a: 0x000a, 0x3d7b: 0x000a,
+	0x3d7c: 0x000a,
+	// Block 0xf6, offset 0x3d80
+	0x3d80: 0x000a, 0x3d81: 0x000a, 0x3d82: 0x000a, 0x3d83: 0x000a, 0x3d84: 0x000a, 0x3d85: 0x000a,
+	0x3d86: 0x000a, 0x3d87: 0x000a, 0x3d88: 0x000a, 0x3d89: 0x000a, 0x3d8a: 0x000a, 0x3d8b: 0x000a,
+	0x3d8c: 0x000a, 0x3d8d: 0x000a, 0x3d8e: 0x000a, 0x3d8f: 0x000a, 0x3d90: 0x000a, 0x3d91: 0x000a,
+	0x3d92: 0x000a, 0x3d93: 0x000a, 0x3d94: 0x000a, 0x3d95: 0x000a, 0x3d96: 0x000a, 0x3d97: 0x000a,
+	0x3d98: 0x000a, 0x3d99: 0x000a, 0x3d9a: 0x000a, 0x3d9b: 0x000a, 0x3d9c: 0x000a, 0x3d9d: 0x000a,
+	0x3d9e: 0x000a, 0x3d9f: 0x000a, 0x3da0: 0x000a, 0x3da1: 0x000a, 0x3da2: 0x000a, 0x3da3: 0x000a,
+	0x3da4: 0x000a, 0x3da5: 0x000a, 0x3da6: 0x000a, 0x3da7: 0x000a, 0x3da8: 0x000a, 0x3da9: 0x000a,
+	0x3daa: 0x000a, 0x3dab: 0x000a, 0x3dac: 0x000a, 0x3dad: 0x000a, 0x3dae: 0x000a, 0x3daf: 0x000a,
+	0x3db0: 0x000a, 0x3db1: 0x000a, 0x3db2: 0x000a, 0x3db3: 0x000a, 0x3db4: 0x000a, 0x3db5: 0x000a,
+	0x3db6: 0x000a, 0x3dbb: 0x000a,
+	0x3dbc: 0x000a, 0x3dbd: 0x000a, 0x3dbe: 0x000a, 0x3dbf: 0x000a,
+	// Block 0xf7, offset 0x3dc0
+	0x3dc0: 0x000a, 0x3dc1: 0x000a, 0x3dc2: 0x000a, 0x3dc3: 0x000a, 0x3dc4: 0x000a, 0x3dc5: 0x000a,
+	0x3dc6: 0x000a, 0x3dc7: 0x000a, 0x3dc8: 0x000a, 0x3dc9: 0x000a, 0x3dca: 0x000a, 0x3dcb: 0x000a,
+	0x3dcc: 0x000a, 0x3dcd: 0x000a, 0x3dce: 0x000a, 0x3dcf: 0x000a, 0x3dd0: 0x000a, 0x3dd1: 0x000a,
+	0x3dd2: 0x000a, 0x3dd3: 0x000a, 0x3dd4: 0x000a, 0x3dd5: 0x000a, 0x3dd6: 0x000a, 0x3dd7: 0x000a,
+	0x3dd8: 0x000a, 0x3dd9: 0x000a,
+	0x3de0: 0x000a, 0x3de1: 0x000a, 0x3de2: 0x000a, 0x3de3: 0x000a,
+	0x3de4: 0x000a, 0x3de5: 0x000a, 0x3de6: 0x000a, 0x3de7: 0x000a, 0x3de8: 0x000a, 0x3de9: 0x000a,
+	0x3dea: 0x000a, 0x3deb: 0x000a,
+	0x3df0: 0x000a,
+	// Block 0xf8, offset 0x3e00
+	0x3e00: 0x000a, 0x3e01: 0x000a, 0x3e02: 0x000a, 0x3e03: 0x000a, 0x3e04: 0x000a, 0x3e05: 0x000a,
+	0x3e06: 0x000a, 0x3e07: 0x000a, 0x3e08: 0x000a, 0x3e09: 0x000a, 0x3e0a: 0x000a, 0x3e0b: 0x000a,
+	0x3e10: 0x000a, 0x3e11: 0x000a,
+	0x3e12: 0x000a, 0x3e13: 0x000a, 0x3e14: 0x000a, 0x3e15: 0x000a, 0x3e16: 0x000a, 0x3e17: 0x000a,
+	0x3e18: 0x000a, 0x3e19: 0x000a, 0x3e1a: 0x000a, 0x3e1b: 0x000a, 0x3e1c: 0x000a, 0x3e1d: 0x000a,
+	0x3e1e: 0x000a, 0x3e1f: 0x000a, 0x3e20: 0x000a, 0x3e21: 0x000a, 0x3e22: 0x000a, 0x3e23: 0x000a,
+	0x3e24: 0x000a, 0x3e25: 0x000a, 0x3e26: 0x000a, 0x3e27: 0x000a, 0x3e28: 0x000a, 0x3e29: 0x000a,
+	0x3e2a: 0x000a, 0x3e2b: 0x000a, 0x3e2c: 0x000a, 0x3e2d: 0x000a, 0x3e2e: 0x000a, 0x3e2f: 0x000a,
+	0x3e30: 0x000a, 0x3e31: 0x000a, 0x3e32: 0x000a, 0x3e33: 0x000a, 0x3e34: 0x000a, 0x3e35: 0x000a,
+	0x3e36: 0x000a, 0x3e37: 0x000a, 0x3e38: 0x000a, 0x3e39: 0x000a, 0x3e3a: 0x000a, 0x3e3b: 0x000a,
+	0x3e3c: 0x000a, 0x3e3d: 0x000a, 0x3e3e: 0x000a, 0x3e3f: 0x000a,
+	// Block 0xf9, offset 0x3e40
+	0x3e40: 0x000a, 0x3e41: 0x000a, 0x3e42: 0x000a, 0x3e43: 0x000a, 0x3e44: 0x000a, 0x3e45: 0x000a,
+	0x3e46: 0x000a, 0x3e47: 0x000a,
+	0x3e50: 0x000a, 0x3e51: 0x000a,
+	0x3e52: 0x000a, 0x3e53: 0x000a, 0x3e54: 0x000a, 0x3e55: 0x000a, 0x3e56: 0x000a, 0x3e57: 0x000a,
+	0x3e58: 0x000a, 0x3e59: 0x000a,
+	0x3e60: 0x000a, 0x3e61: 0x000a, 0x3e62: 0x000a, 0x3e63: 0x000a,
+	0x3e64: 0x000a, 0x3e65: 0x000a, 0x3e66: 0x000a, 0x3e67: 0x000a, 0x3e68: 0x000a, 0x3e69: 0x000a,
+	0x3e6a: 0x000a, 0x3e6b: 0x000a, 0x3e6c: 0x000a, 0x3e6d: 0x000a, 0x3e6e: 0x000a, 0x3e6f: 0x000a,
+	0x3e70: 0x000a, 0x3e71: 0x000a, 0x3e72: 0x000a, 0x3e73: 0x000a, 0x3e74: 0x000a, 0x3e75: 0x000a,
+	0x3e76: 0x000a, 0x3e77: 0x000a, 0x3e78: 0x000a, 0x3e79: 0x000a, 0x3e7a: 0x000a, 0x3e7b: 0x000a,
+	0x3e7c: 0x000a, 0x3e7d: 0x000a, 0x3e7e: 0x000a, 0x3e7f: 0x000a,
+	// Block 0xfa, offset 0x3e80
+	0x3e80: 0x000a, 0x3e81: 0x000a, 0x3e82: 0x000a, 0x3e83: 0x000a, 0x3e84: 0x000a, 0x3e85: 0x000a,
+	0x3e86: 0x000a, 0x3e87: 0x000a,
+	0x3e90: 0x000a, 0x3e91: 0x000a,
+	0x3e92: 0x000a, 0x3e93: 0x000a, 0x3e94: 0x000a, 0x3e95: 0x000a, 0x3e96: 0x000a, 0x3e97: 0x000a,
+	0x3e98: 0x000a, 0x3e99: 0x000a, 0x3e9a: 0x000a, 0x3e9b: 0x000a, 0x3e9c: 0x000a, 0x3e9d: 0x000a,
+	0x3e9e: 0x000a, 0x3e9f: 0x000a, 0x3ea0: 0x000a, 0x3ea1: 0x000a, 0x3ea2: 0x000a, 0x3ea3: 0x000a,
+	0x3ea4: 0x000a, 0x3ea5: 0x000a, 0x3ea6: 0x000a, 0x3ea7: 0x000a, 0x3ea8: 0x000a, 0x3ea9: 0x000a,
+	0x3eaa: 0x000a, 0x3eab: 0x000a, 0x3eac: 0x000a, 0x3ead: 0x000a,
+	0x3eb0: 0x000a, 0x3eb1: 0x000a,
+	// Block 0xfb, offset 0x3ec0
+	0x3ec0: 0x000a, 0x3ec1: 0x000a, 0x3ec2: 0x000a, 0x3ec3: 0x000a, 0x3ec4: 0x000a, 0x3ec5: 0x000a,
+	0x3ec6: 0x000a, 0x3ec7: 0x000a, 0x3ec8: 0x000a, 0x3ec9: 0x000a, 0x3eca: 0x000a, 0x3ecb: 0x000a,
+	0x3ecc: 0x000a, 0x3ecd: 0x000a, 0x3ece: 0x000a, 0x3ecf: 0x000a, 0x3ed0: 0x000a, 0x3ed1: 0x000a,
+	0x3ed2: 0x000a, 0x3ed3: 0x000a,
+	0x3ee0: 0x000a, 0x3ee1: 0x000a, 0x3ee2: 0x000a, 0x3ee3: 0x000a,
+	0x3ee4: 0x000a, 0x3ee5: 0x000a, 0x3ee6: 0x000a, 0x3ee7: 0x000a, 0x3ee8: 0x000a, 0x3ee9: 0x000a,
+	0x3eea: 0x000a, 0x3eeb: 0x000a, 0x3eec: 0x000a, 0x3eed: 0x000a,
+	0x3ef0: 0x000a, 0x3ef1: 0x000a, 0x3ef2: 0x000a, 0x3ef3: 0x000a, 0x3ef4: 0x000a, 0x3ef5: 0x000a,
+	0x3ef6: 0x000a, 0x3ef7: 0x000a, 0x3ef8: 0x000a, 0x3ef9: 0x000a, 0x3efa: 0x000a, 0x3efb: 0x000a,
+	0x3efc: 0x000a,
+	// Block 0xfc, offset 0x3f00
+	0x3f00: 0x000a, 0x3f01: 0x000a, 0x3f02: 0x000a, 0x3f03: 0x000a, 0x3f04: 0x000a, 0x3f05: 0x000a,
+	0x3f06: 0x000a, 0x3f07: 0x000a, 0x3f08: 0x000a,
+	0x3f10: 0x000a, 0x3f11: 0x000a,
+	0x3f12: 0x000a, 0x3f13: 0x000a, 0x3f14: 0x000a, 0x3f15: 0x000a, 0x3f16: 0x000a, 0x3f17: 0x000a,
+	0x3f18: 0x000a, 0x3f19: 0x000a, 0x3f1a: 0x000a, 0x3f1b: 0x000a, 0x3f1c: 0x000a, 0x3f1d: 0x000a,
+	0x3f1e: 0x000a, 0x3f1f: 0x000a, 0x3f20: 0x000a, 0x3f21: 0x000a, 0x3f22: 0x000a, 0x3f23: 0x000a,
+	0x3f24: 0x000a, 0x3f25: 0x000a, 0x3f26: 0x000a, 0x3f27: 0x000a, 0x3f28: 0x000a, 0x3f29: 0x000a,
+	0x3f2a: 0x000a, 0x3f2b: 0x000a, 0x3f2c: 0x000a, 0x3f2d: 0x000a, 0x3f2e: 0x000a, 0x3f2f: 0x000a,
+	0x3f30: 0x000a, 0x3f31: 0x000a, 0x3f32: 0x000a, 0x3f33: 0x000a, 0x3f34: 0x000a, 0x3f35: 0x000a,
+	0x3f36: 0x000a, 0x3f37: 0x000a, 0x3f38: 0x000a, 0x3f39: 0x000a, 0x3f3a: 0x000a, 0x3f3b: 0x000a,
+	0x3f3c: 0x000a, 0x3f3d: 0x000a, 0x3f3f: 0x000a,
+	// Block 0xfd, offset 0x3f40
+	0x3f40: 0x000a, 0x3f41: 0x000a, 0x3f42: 0x000a, 0x3f43: 0x000a, 0x3f44: 0x000a, 0x3f45: 0x000a,
+	0x3f4e: 0x000a, 0x3f4f: 0x000a, 0x3f50: 0x000a, 0x3f51: 0x000a,
+	0x3f52: 0x000a, 0x3f53: 0x000a, 0x3f54: 0x000a, 0x3f55: 0x000a, 0x3f56: 0x000a, 0x3f57: 0x000a,
+	0x3f58: 0x000a, 0x3f59: 0x000a, 0x3f5a: 0x000a, 0x3f5b: 0x000a,
+	0x3f60: 0x000a, 0x3f61: 0x000a, 0x3f62: 0x000a, 0x3f63: 0x000a,
+	0x3f64: 0x000a, 0x3f65: 0x000a, 0x3f66: 0x000a, 0x3f67: 0x000a, 0x3f68: 0x000a,
+	0x3f70: 0x000a, 0x3f71: 0x000a, 0x3f72: 0x000a, 0x3f73: 0x000a, 0x3f74: 0x000a, 0x3f75: 0x000a,
+	0x3f76: 0x000a, 0x3f77: 0x000a, 0x3f78: 0x000a,
+	// Block 0xfe, offset 0x3f80
+	0x3f80: 0x000a, 0x3f81: 0x000a, 0x3f82: 0x000a, 0x3f83: 0x000a, 0x3f84: 0x000a, 0x3f85: 0x000a,
+	0x3f86: 0x000a, 0x3f87: 0x000a, 0x3f88: 0x000a, 0x3f89: 0x000a, 0x3f8a: 0x000a, 0x3f8b: 0x000a,
+	0x3f8c: 0x000a, 0x3f8d: 0x000a, 0x3f8e: 0x000a, 0x3f8f: 0x000a, 0x3f90: 0x000a, 0x3f91: 0x000a,
+	0x3f92: 0x000a, 0x3f94: 0x000a, 0x3f95: 0x000a, 0x3f96: 0x000a, 0x3f97: 0x000a,
+	0x3f98: 0x000a, 0x3f99: 0x000a, 0x3f9a: 0x000a, 0x3f9b: 0x000a, 0x3f9c: 0x000a, 0x3f9d: 0x000a,
+	0x3f9e: 0x000a, 0x3f9f: 0x000a, 0x3fa0: 0x000a, 0x3fa1: 0x000a, 0x3fa2: 0x000a, 0x3fa3: 0x000a,
+	0x3fa4: 0x000a, 0x3fa5: 0x000a, 0x3fa6: 0x000a, 0x3fa7: 0x000a, 0x3fa8: 0x000a, 0x3fa9: 0x000a,
+	0x3faa: 0x000a, 0x3fab: 0x000a, 0x3fac: 0x000a, 0x3fad: 0x000a, 0x3fae: 0x000a, 0x3faf: 0x000a,
+	0x3fb0: 0x000a, 0x3fb1: 0x000a, 0x3fb2: 0x000a, 0x3fb3: 0x000a, 0x3fb4: 0x000a, 0x3fb5: 0x000a,
+	0x3fb6: 0x000a, 0x3fb7: 0x000a, 0x3fb8: 0x000a, 0x3fb9: 0x000a, 0x3fba: 0x000a, 0x3fbb: 0x000a,
+	0x3fbc: 0x000a, 0x3fbd: 0x000a, 0x3fbe: 0x000a, 0x3fbf: 0x000a,
+	// Block 0xff, offset 0x3fc0
+	0x3fc0: 0x000a, 0x3fc1: 0x000a, 0x3fc2: 0x000a, 0x3fc3: 0x000a, 0x3fc4: 0x000a, 0x3fc5: 0x000a,
+	0x3fc6: 0x000a, 0x3fc7: 0x000a, 0x3fc8: 0x000a, 0x3fc9: 0x000a, 0x3fca: 0x000a,
+	0x3ff0: 0x0002, 0x3ff1: 0x0002, 0x3ff2: 0x0002, 0x3ff3: 0x0002, 0x3ff4: 0x0002, 0x3ff5: 0x0002,
+	0x3ff6: 0x0002, 0x3ff7: 0x0002, 0x3ff8: 0x0002, 0x3ff9: 0x0002,
+	// Block 0x100, offset 0x4000
+	0x403e: 0x000b, 0x403f: 0x000b,
+	// Block 0x101, offset 0x4040
+	0x4040: 0x000b, 0x4041: 0x000b, 0x4042: 0x000b, 0x4043: 0x000b, 0x4044: 0x000b, 0x4045: 0x000b,
+	0x4046: 0x000b, 0x4047: 0x000b, 0x4048: 0x000b, 0x4049: 0x000b, 0x404a: 0x000b, 0x404b: 0x000b,
+	0x404c: 0x000b, 0x404d: 0x000b, 0x404e: 0x000b, 0x404f: 0x000b, 0x4050: 0x000b, 0x4051: 0x000b,
+	0x4052: 0x000b, 0x4053: 0x000b, 0x4054: 0x000b, 0x4055: 0x000b, 0x4056: 0x000b, 0x4057: 0x000b,
+	0x4058: 0x000b, 0x4059: 0x000b, 0x405a: 0x000b, 0x405b: 0x000b, 0x405c: 0x000b, 0x405d: 0x000b,
+	0x405e: 0x000b, 0x405f: 0x000b, 0x4060: 0x000b, 0x4061: 0x000b, 0x4062: 0x000b, 0x4063: 0x000b,
+	0x4064: 0x000b, 0x4065: 0x000b, 0x4066: 0x000b, 0x4067: 0x000b, 0x4068: 0x000b, 0x4069: 0x000b,
+	0x406a: 0x000b, 0x406b: 0x000b, 0x406c: 0x000b, 0x406d: 0x000b, 0x406e: 0x000b, 0x406f: 0x000b,
+	0x4070: 0x000b, 0x4071: 0x000b, 0x4072: 0x000b, 0x4073: 0x000b, 0x4074: 0x000b, 0x4075: 0x000b,
+	0x4076: 0x000b, 0x4077: 0x000b, 0x4078: 0x000b, 0x4079: 0x000b, 0x407a: 0x000b, 0x407b: 0x000b,
+	0x407c: 0x000b, 0x407d: 0x000b, 0x407e: 0x000b, 0x407f: 0x000b,
+	// Block 0x102, offset 0x4080
+	0x4080: 0x000c, 0x4081: 0x000c, 0x4082: 0x000c, 0x4083: 0x000c, 0x4084: 0x000c, 0x4085: 0x000c,
+	0x4086: 0x000c, 0x4087: 0x000c, 0x4088: 0x000c, 0x4089: 0x000c, 0x408a: 0x000c, 0x408b: 0x000c,
+	0x408c: 0x000c, 0x408d: 0x000c, 0x408e: 0x000c, 0x408f: 0x000c, 0x4090: 0x000c, 0x4091: 0x000c,
+	0x4092: 0x000c, 0x4093: 0x000c, 0x4094: 0x000c, 0x4095: 0x000c, 0x4096: 0x000c, 0x4097: 0x000c,
+	0x4098: 0x000c, 0x4099: 0x000c, 0x409a: 0x000c, 0x409b: 0x000c, 0x409c: 0x000c, 0x409d: 0x000c,
+	0x409e: 0x000c, 0x409f: 0x000c, 0x40a0: 0x000c, 0x40a1: 0x000c, 0x40a2: 0x000c, 0x40a3: 0x000c,
+	0x40a4: 0x000c, 0x40a5: 0x000c, 0x40a6: 0x000c, 0x40a7: 0x000c, 0x40a8: 0x000c, 0x40a9: 0x000c,
+	0x40aa: 0x000c, 0x40ab: 0x000c, 0x40ac: 0x000c, 0x40ad: 0x000c, 0x40ae: 0x000c, 0x40af: 0x000c,
+	0x40b0: 0x000b, 0x40b1: 0x000b, 0x40b2: 0x000b, 0x40b3: 0x000b, 0x40b4: 0x000b, 0x40b5: 0x000b,
+	0x40b6: 0x000b, 0x40b7: 0x000b, 0x40b8: 0x000b, 0x40b9: 0x000b, 0x40ba: 0x000b, 0x40bb: 0x000b,
+	0x40bc: 0x000b, 0x40bd: 0x000b, 0x40be: 0x000b, 0x40bf: 0x000b,
+}
+
+// bidiIndex: 26 blocks, 1664 entries, 3328 bytes
+// Block 0 is the zero block.
+var bidiIndex = [1664]uint16{
+	// Block 0x0, offset 0x0
+	// Block 0x1, offset 0x40
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc2: 0x01, 0xc3: 0x02,
+	0xca: 0x03, 0xcb: 0x04, 0xcc: 0x05, 0xcd: 0x06, 0xce: 0x07, 0xcf: 0x08,
+	0xd2: 0x09, 0xd6: 0x0a, 0xd7: 0x0b,
+	0xd8: 0x0c, 0xd9: 0x0d, 0xda: 0x0e, 0xdb: 0x0f, 0xdc: 0x10, 0xdd: 0x11, 0xde: 0x12, 0xdf: 0x13,
+	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05, 0xe4: 0x06,
+	0xea: 0x07, 0xef: 0x08,
+	0xf0: 0x13, 0xf1: 0x14, 0xf2: 0x14, 0xf3: 0x16, 0xf4: 0x17,
+	// Block 0x4, offset 0x100
+	0x120: 0x14, 0x121: 0x15, 0x122: 0x16, 0x123: 0x17, 0x124: 0x18, 0x125: 0x19, 0x126: 0x1a, 0x127: 0x1b,
+	0x128: 0x1c, 0x129: 0x1d, 0x12a: 0x1c, 0x12b: 0x1e, 0x12c: 0x1f, 0x12d: 0x20, 0x12e: 0x21, 0x12f: 0x22,
+	0x130: 0x23, 0x131: 0x24, 0x132: 0x1a, 0x133: 0x25, 0x134: 0x26, 0x135: 0x27, 0x136: 0x28, 0x137: 0x29,
+	0x138: 0x2a, 0x139: 0x2b, 0x13a: 0x2c, 0x13b: 0x2d, 0x13c: 0x2e, 0x13d: 0x2f, 0x13e: 0x30, 0x13f: 0x31,
+	// Block 0x5, offset 0x140
+	0x140: 0x32, 0x141: 0x33, 0x142: 0x34,
+	0x14d: 0x35, 0x14e: 0x36,
+	0x150: 0x37,
+	0x15a: 0x38, 0x15c: 0x39, 0x15d: 0x3a, 0x15e: 0x3b, 0x15f: 0x3c,
+	0x160: 0x3d, 0x162: 0x3e, 0x164: 0x3f, 0x165: 0x40, 0x167: 0x41,
+	0x168: 0x42, 0x169: 0x43, 0x16a: 0x44, 0x16b: 0x45, 0x16c: 0x46, 0x16d: 0x47, 0x16e: 0x48, 0x16f: 0x49,
+	0x170: 0x4a, 0x173: 0x4b, 0x177: 0x05,
+	0x17e: 0x4c, 0x17f: 0x4d,
+	// Block 0x6, offset 0x180
+	0x180: 0x4e, 0x181: 0x4f, 0x182: 0x50, 0x183: 0x51, 0x184: 0x52, 0x185: 0x53, 0x186: 0x54, 0x187: 0x55,
+	0x188: 0x56, 0x189: 0x55, 0x18a: 0x55, 0x18b: 0x55, 0x18c: 0x57, 0x18d: 0x58, 0x18e: 0x59, 0x18f: 0x55,
+	0x190: 0x5a, 0x191: 0x5b, 0x192: 0x5c, 0x193: 0x5d, 0x194: 0x55, 0x195: 0x55, 0x196: 0x55, 0x197: 0x55,
+	0x198: 0x55, 0x199: 0x55, 0x19a: 0x5e, 0x19b: 0x55, 0x19c: 0x55, 0x19d: 0x5f, 0x19e: 0x55, 0x19f: 0x60,
+	0x1a4: 0x55, 0x1a5: 0x55, 0x1a6: 0x61, 0x1a7: 0x62,
+	0x1a8: 0x55, 0x1a9: 0x55, 0x1aa: 0x55, 0x1ab: 0x55, 0x1ac: 0x55, 0x1ad: 0x63, 0x1ae: 0x64, 0x1af: 0x55,
+	0x1b3: 0x65, 0x1b5: 0x66, 0x1b7: 0x67,
+	0x1b8: 0x68, 0x1b9: 0x69, 0x1ba: 0x6a, 0x1bb: 0x6b, 0x1bc: 0x55, 0x1bd: 0x55, 0x1be: 0x55, 0x1bf: 0x6c,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x6d, 0x1c2: 0x6e, 0x1c3: 0x6f, 0x1c7: 0x70,
+	0x1c8: 0x71, 0x1c9: 0x72, 0x1ca: 0x73, 0x1cb: 0x74, 0x1cd: 0x75, 0x1cf: 0x76,
+	// Block 0x8, offset 0x200
+	0x237: 0x55,
+	// Block 0x9, offset 0x240
+	0x252: 0x77, 0x253: 0x78,
+	0x258: 0x79, 0x259: 0x7a, 0x25a: 0x7b, 0x25b: 0x7c, 0x25c: 0x7d, 0x25e: 0x7e,
+	0x260: 0x7f, 0x261: 0x80, 0x263: 0x81, 0x264: 0x82, 0x265: 0x83, 0x266: 0x84, 0x267: 0x85,
+	0x268: 0x86, 0x269: 0x87, 0x26a: 0x88, 0x26b: 0x89, 0x26d: 0x8a, 0x26f: 0x8b,
+	// Block 0xa, offset 0x280
+	0x2ac: 0x8c, 0x2ad: 0x8d, 0x2ae: 0x0e, 0x2af: 0x0e,
+	0x2b0: 0x0e, 0x2b1: 0x0e, 0x2b2: 0x0e, 0x2b3: 0x0e, 0x2b4: 0x8e, 0x2b5: 0x8f, 0x2b6: 0x0e, 0x2b7: 0x90,
+	0x2b8: 0x91, 0x2b9: 0x92, 0x2ba: 0x0e, 0x2bb: 0x93, 0x2bc: 0x94, 0x2bd: 0x95, 0x2bf: 0x96,
+	// Block 0xb, offset 0x2c0
+	0x2c4: 0x97, 0x2c5: 0x55, 0x2c6: 0x98, 0x2c7: 0x99,
+	0x2cb: 0x9a, 0x2cd: 0x9b,
+	0x2e0: 0x9c, 0x2e1: 0x9c, 0x2e2: 0x9c, 0x2e3: 0x9c, 0x2e4: 0x9d, 0x2e5: 0x9c, 0x2e6: 0x9c, 0x2e7: 0x9c,
+	0x2e8: 0x9e, 0x2e9: 0x9c, 0x2ea: 0x9c, 0x2eb: 0x9f, 0x2ec: 0xa0, 0x2ed: 0x9c, 0x2ee: 0x9c, 0x2ef: 0x9c,
+	0x2f0: 0x9c, 0x2f1: 0x9c, 0x2f2: 0x9c, 0x2f3: 0x9c, 0x2f4: 0xa1, 0x2f5: 0x9c, 0x2f6: 0x9c, 0x2f7: 0x9c,
+	0x2f8: 0x9c, 0x2f9: 0xa2, 0x2fa: 0xa3, 0x2fb: 0xa4, 0x2fc: 0xa5, 0x2fd: 0xa6, 0x2fe: 0xa7, 0x2ff: 0x9c,
+	// Block 0xc, offset 0x300
+	0x300: 0xa8, 0x301: 0xa9, 0x302: 0xaa, 0x303: 0x21, 0x304: 0xab, 0x305: 0xac, 0x306: 0xad, 0x307: 0xae,
+	0x308: 0xaf, 0x309: 0x28, 0x30b: 0xb0, 0x30c: 0x26, 0x30d: 0xb1,
+	0x310: 0xb2, 0x311: 0xb3, 0x312: 0xb4, 0x313: 0xb5, 0x316: 0xb6, 0x317: 0xb7,
+	0x318: 0xb8, 0x319: 0xb9, 0x31a: 0xba, 0x31c: 0xbb,
+	0x320: 0xbc, 0x324: 0xbd, 0x325: 0xbe, 0x327: 0xbf,
+	0x328: 0xc0, 0x329: 0xc1, 0x32a: 0xc2,
+	0x330: 0xc3, 0x332: 0xc4, 0x334: 0xc5, 0x335: 0xc6, 0x336: 0xc7,
+	0x33b: 0xc8, 0x33c: 0xc9, 0x33d: 0xca, 0x33f: 0xcb,
+	// Block 0xd, offset 0x340
+	0x351: 0xcc,
+	// Block 0xe, offset 0x380
+	0x3ab: 0xcd, 0x3ac: 0xce,
+	0x3bd: 0xcf, 0x3be: 0xd0, 0x3bf: 0xd1,
+	// Block 0xf, offset 0x3c0
+	0x3f2: 0xd2,
+	// Block 0x10, offset 0x400
+	0x43c: 0xd3, 0x43d: 0xd4,
+	// Block 0x11, offset 0x440
+	0x445: 0xd5, 0x446: 0xd6, 0x447: 0xd7,
+	0x448: 0x55, 0x449: 0xd8, 0x44c: 0x55, 0x44d: 0xd9,
+	0x45b: 0xda, 0x45c: 0xdb, 0x45d: 0xdc, 0x45e: 0xdd, 0x45f: 0xde,
+	0x468: 0xdf, 0x469: 0xe0, 0x46a: 0xe1,
+	// Block 0x12, offset 0x480
+	0x480: 0xe2, 0x482: 0xcf, 0x484: 0xce,
+	0x48a: 0xe3, 0x48b: 0xe4,
+	0x493: 0xe5,
+	0x4a0: 0x9c, 0x4a1: 0x9c, 0x4a2: 0x9c, 0x4a3: 0xe6, 0x4a4: 0x9c, 0x4a5: 0xe7, 0x4a6: 0x9c, 0x4a7: 0x9c,
+	0x4a8: 0x9c, 0x4a9: 0x9c, 0x4aa: 0x9c, 0x4ab: 0x9c, 0x4ac: 0x9c, 0x4ad: 0x9c, 0x4ae: 0x9c, 0x4af: 0x9c,
+	0x4b0: 0x9c, 0x4b1: 0xe8, 0x4b2: 0xe9, 0x4b3: 0x9c, 0x4b4: 0xea, 0x4b5: 0x9c, 0x4b6: 0x9c, 0x4b7: 0x9c,
+	0x4b8: 0x0e, 0x4b9: 0x0e, 0x4ba: 0x0e, 0x4bb: 0xeb, 0x4bc: 0x9c, 0x4bd: 0x9c, 0x4be: 0x9c, 0x4bf: 0x9c,
+	// Block 0x13, offset 0x4c0
+	0x4c0: 0xec, 0x4c1: 0x55, 0x4c2: 0xed, 0x4c3: 0xee, 0x4c4: 0xef, 0x4c5: 0xf0, 0x4c6: 0xf1,
+	0x4c9: 0xf2, 0x4cc: 0x55, 0x4cd: 0x55, 0x4ce: 0x55, 0x4cf: 0x55,
+	0x4d0: 0x55, 0x4d1: 0x55, 0x4d2: 0x55, 0x4d3: 0x55, 0x4d4: 0x55, 0x4d5: 0x55, 0x4d6: 0x55, 0x4d7: 0x55,
+	0x4d8: 0x55, 0x4d9: 0x55, 0x4da: 0x55, 0x4db: 0xf3, 0x4dc: 0x55, 0x4dd: 0xf4, 0x4de: 0x55, 0x4df: 0xf5,
+	0x4e0: 0xf6, 0x4e1: 0xf7, 0x4e2: 0xf8, 0x4e4: 0x55, 0x4e5: 0x55, 0x4e6: 0x55, 0x4e7: 0x55,
+	0x4e8: 0x55, 0x4e9: 0xf9, 0x4ea: 0xfa, 0x4eb: 0xfb, 0x4ec: 0x55, 0x4ed: 0x55, 0x4ee: 0xfc, 0x4ef: 0xfd,
+	0x4ff: 0xfe,
+	// Block 0x14, offset 0x500
+	0x53f: 0xfe,
+	// Block 0x15, offset 0x540
+	0x550: 0x09, 0x551: 0x0a, 0x553: 0x0b, 0x556: 0x0c,
+	0x55b: 0x0d, 0x55c: 0x0e, 0x55d: 0x0f, 0x55e: 0x10, 0x55f: 0x11,
+	0x56f: 0x12,
+	0x57f: 0x12,
+	// Block 0x16, offset 0x580
+	0x58f: 0x12,
+	0x59f: 0x12,
+	0x5af: 0x12,
+	0x5bf: 0x12,
+	// Block 0x17, offset 0x5c0
+	0x5c0: 0xff, 0x5c1: 0xff, 0x5c2: 0xff, 0x5c3: 0xff, 0x5c4: 0x05, 0x5c5: 0x05, 0x5c6: 0x05, 0x5c7: 0x100,
+	0x5c8: 0xff, 0x5c9: 0xff, 0x5ca: 0xff, 0x5cb: 0xff, 0x5cc: 0xff, 0x5cd: 0xff, 0x5ce: 0xff, 0x5cf: 0xff,
+	0x5d0: 0xff, 0x5d1: 0xff, 0x5d2: 0xff, 0x5d3: 0xff, 0x5d4: 0xff, 0x5d5: 0xff, 0x5d6: 0xff, 0x5d7: 0xff,
+	0x5d8: 0xff, 0x5d9: 0xff, 0x5da: 0xff, 0x5db: 0xff, 0x5dc: 0xff, 0x5dd: 0xff, 0x5de: 0xff, 0x5df: 0xff,
+	0x5e0: 0xff, 0x5e1: 0xff, 0x5e2: 0xff, 0x5e3: 0xff, 0x5e4: 0xff, 0x5e5: 0xff, 0x5e6: 0xff, 0x5e7: 0xff,
+	0x5e8: 0xff, 0x5e9: 0xff, 0x5ea: 0xff, 0x5eb: 0xff, 0x5ec: 0xff, 0x5ed: 0xff, 0x5ee: 0xff, 0x5ef: 0xff,
+	0x5f0: 0xff, 0x5f1: 0xff, 0x5f2: 0xff, 0x5f3: 0xff, 0x5f4: 0xff, 0x5f5: 0xff, 0x5f6: 0xff, 0x5f7: 0xff,
+	0x5f8: 0xff, 0x5f9: 0xff, 0x5fa: 0xff, 0x5fb: 0xff, 0x5fc: 0xff, 0x5fd: 0xff, 0x5fe: 0xff, 0x5ff: 0xff,
+	// Block 0x18, offset 0x600
+	0x60f: 0x12,
+	0x61f: 0x12,
+	0x620: 0x15,
+	0x62f: 0x12,
+	0x63f: 0x12,
+	// Block 0x19, offset 0x640
+	0x64f: 0x12,
+}
+
+// Total table size 19960 bytes (19KiB); checksum: F50EF68C
diff --git a/vendor/golang.org/x/text/unicode/norm/tables13.0.0.go b/vendor/golang.org/x/text/unicode/norm/tables13.0.0.go
index 9115ef25..f65785e8 100644
--- a/vendor/golang.org/x/text/unicode/norm/tables13.0.0.go
+++ b/vendor/golang.org/x/text/unicode/norm/tables13.0.0.go
@@ -1,7 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
-//go:build go1.16
-// +build go1.16
+//go:build go1.16 && !go1.21
+// +build go1.16,!go1.21
 
 package norm
 
diff --git a/vendor/golang.org/x/text/unicode/norm/tables15.0.0.go b/vendor/golang.org/x/text/unicode/norm/tables15.0.0.go
new file mode 100644
index 00000000..e1858b87
--- /dev/null
+++ b/vendor/golang.org/x/text/unicode/norm/tables15.0.0.go
@@ -0,0 +1,7908 @@
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
+
+//go:build go1.21
+// +build go1.21
+
+package norm
+
+import "sync"
+
+const (
+	// Version is the Unicode edition from which the tables are derived.
+	Version = "15.0.0"
+
+	// MaxTransformChunkSize indicates the maximum number of bytes that Transform
+	// may need to write atomically for any Form. Making a destination buffer at
+	// least this size ensures that Transform can always make progress and that
+	// the user does not need to grow the buffer on an ErrShortDst.
+	MaxTransformChunkSize = 35 + maxNonStarters*4
+)
+
+var ccc = [56]uint8{
+	0, 1, 6, 7, 8, 9, 10, 11,
+	12, 13, 14, 15, 16, 17, 18, 19,
+	20, 21, 22, 23, 24, 25, 26, 27,
+	28, 29, 30, 31, 32, 33, 34, 35,
+	36, 84, 91, 103, 107, 118, 122, 129,
+	130, 132, 202, 214, 216, 218, 220, 222,
+	224, 226, 228, 230, 232, 233, 234, 240,
+}
+
+const (
+	firstMulti            = 0x199A
+	firstCCC              = 0x2DD5
+	endMulti              = 0x30A1
+	firstLeadingCCC       = 0x4AEF
+	firstCCCZeroExcept    = 0x4BB9
+	firstStarterWithNLead = 0x4BE0
+	lastDecomp            = 0x4BE2
+	maxDecomp             = 0x8000
+)
+
+// decomps: 19426 bytes
+var decomps = [...]byte{
+	// Bytes 0 - 3f
+	0x00, 0x41, 0x20, 0x41, 0x21, 0x41, 0x22, 0x41,
+	0x23, 0x41, 0x24, 0x41, 0x25, 0x41, 0x26, 0x41,
+	0x27, 0x41, 0x28, 0x41, 0x29, 0x41, 0x2A, 0x41,
+	0x2B, 0x41, 0x2C, 0x41, 0x2D, 0x41, 0x2E, 0x41,
+	0x2F, 0x41, 0x30, 0x41, 0x31, 0x41, 0x32, 0x41,
+	0x33, 0x41, 0x34, 0x41, 0x35, 0x41, 0x36, 0x41,
+	0x37, 0x41, 0x38, 0x41, 0x39, 0x41, 0x3A, 0x41,
+	0x3B, 0x41, 0x3C, 0x41, 0x3D, 0x41, 0x3E, 0x41,
+	// Bytes 40 - 7f
+	0x3F, 0x41, 0x40, 0x41, 0x41, 0x41, 0x42, 0x41,
+	0x43, 0x41, 0x44, 0x41, 0x45, 0x41, 0x46, 0x41,
+	0x47, 0x41, 0x48, 0x41, 0x49, 0x41, 0x4A, 0x41,
+	0x4B, 0x41, 0x4C, 0x41, 0x4D, 0x41, 0x4E, 0x41,
+	0x4F, 0x41, 0x50, 0x41, 0x51, 0x41, 0x52, 0x41,
+	0x53, 0x41, 0x54, 0x41, 0x55, 0x41, 0x56, 0x41,
+	0x57, 0x41, 0x58, 0x41, 0x59, 0x41, 0x5A, 0x41,
+	0x5B, 0x41, 0x5C, 0x41, 0x5D, 0x41, 0x5E, 0x41,
+	// Bytes 80 - bf
+	0x5F, 0x41, 0x60, 0x41, 0x61, 0x41, 0x62, 0x41,
+	0x63, 0x41, 0x64, 0x41, 0x65, 0x41, 0x66, 0x41,
+	0x67, 0x41, 0x68, 0x41, 0x69, 0x41, 0x6A, 0x41,
+	0x6B, 0x41, 0x6C, 0x41, 0x6D, 0x41, 0x6E, 0x41,
+	0x6F, 0x41, 0x70, 0x41, 0x71, 0x41, 0x72, 0x41,
+	0x73, 0x41, 0x74, 0x41, 0x75, 0x41, 0x76, 0x41,
+	0x77, 0x41, 0x78, 0x41, 0x79, 0x41, 0x7A, 0x41,
+	0x7B, 0x41, 0x7C, 0x41, 0x7D, 0x41, 0x7E, 0x42,
+	// Bytes c0 - ff
+	0xC2, 0xA2, 0x42, 0xC2, 0xA3, 0x42, 0xC2, 0xA5,
+	0x42, 0xC2, 0xA6, 0x42, 0xC2, 0xAC, 0x42, 0xC2,
+	0xB7, 0x42, 0xC3, 0x86, 0x42, 0xC3, 0xA6, 0x42,
+	0xC3, 0xB0, 0x42, 0xC3, 0xB8, 0x42, 0xC4, 0xA6,
+	0x42, 0xC4, 0xA7, 0x42, 0xC4, 0xB1, 0x42, 0xC5,
+	0x8B, 0x42, 0xC5, 0x93, 0x42, 0xC6, 0x8E, 0x42,
+	0xC6, 0x90, 0x42, 0xC6, 0xAB, 0x42, 0xC7, 0x80,
+	0x42, 0xC7, 0x81, 0x42, 0xC7, 0x82, 0x42, 0xC8,
+	// Bytes 100 - 13f
+	0xA2, 0x42, 0xC8, 0xB7, 0x42, 0xC9, 0x90, 0x42,
+	0xC9, 0x91, 0x42, 0xC9, 0x92, 0x42, 0xC9, 0x93,
+	0x42, 0xC9, 0x94, 0x42, 0xC9, 0x95, 0x42, 0xC9,
+	0x96, 0x42, 0xC9, 0x97, 0x42, 0xC9, 0x98, 0x42,
+	0xC9, 0x99, 0x42, 0xC9, 0x9B, 0x42, 0xC9, 0x9C,
+	0x42, 0xC9, 0x9E, 0x42, 0xC9, 0x9F, 0x42, 0xC9,
+	0xA0, 0x42, 0xC9, 0xA1, 0x42, 0xC9, 0xA2, 0x42,
+	0xC9, 0xA3, 0x42, 0xC9, 0xA4, 0x42, 0xC9, 0xA5,
+	// Bytes 140 - 17f
+	0x42, 0xC9, 0xA6, 0x42, 0xC9, 0xA7, 0x42, 0xC9,
+	0xA8, 0x42, 0xC9, 0xA9, 0x42, 0xC9, 0xAA, 0x42,
+	0xC9, 0xAB, 0x42, 0xC9, 0xAC, 0x42, 0xC9, 0xAD,
+	0x42, 0xC9, 0xAE, 0x42, 0xC9, 0xAF, 0x42, 0xC9,
+	0xB0, 0x42, 0xC9, 0xB1, 0x42, 0xC9, 0xB2, 0x42,
+	0xC9, 0xB3, 0x42, 0xC9, 0xB4, 0x42, 0xC9, 0xB5,
+	0x42, 0xC9, 0xB6, 0x42, 0xC9, 0xB7, 0x42, 0xC9,
+	0xB8, 0x42, 0xC9, 0xB9, 0x42, 0xC9, 0xBA, 0x42,
+	// Bytes 180 - 1bf
+	0xC9, 0xBB, 0x42, 0xC9, 0xBD, 0x42, 0xC9, 0xBE,
+	0x42, 0xCA, 0x80, 0x42, 0xCA, 0x81, 0x42, 0xCA,
+	0x82, 0x42, 0xCA, 0x83, 0x42, 0xCA, 0x84, 0x42,
+	0xCA, 0x88, 0x42, 0xCA, 0x89, 0x42, 0xCA, 0x8A,
+	0x42, 0xCA, 0x8B, 0x42, 0xCA, 0x8C, 0x42, 0xCA,
+	0x8D, 0x42, 0xCA, 0x8E, 0x42, 0xCA, 0x8F, 0x42,
+	0xCA, 0x90, 0x42, 0xCA, 0x91, 0x42, 0xCA, 0x92,
+	0x42, 0xCA, 0x95, 0x42, 0xCA, 0x98, 0x42, 0xCA,
+	// Bytes 1c0 - 1ff
+	0x99, 0x42, 0xCA, 0x9B, 0x42, 0xCA, 0x9C, 0x42,
+	0xCA, 0x9D, 0x42, 0xCA, 0x9F, 0x42, 0xCA, 0xA1,
+	0x42, 0xCA, 0xA2, 0x42, 0xCA, 0xA3, 0x42, 0xCA,
+	0xA4, 0x42, 0xCA, 0xA5, 0x42, 0xCA, 0xA6, 0x42,
+	0xCA, 0xA7, 0x42, 0xCA, 0xA8, 0x42, 0xCA, 0xA9,
+	0x42, 0xCA, 0xAA, 0x42, 0xCA, 0xAB, 0x42, 0xCA,
+	0xB9, 0x42, 0xCB, 0x90, 0x42, 0xCB, 0x91, 0x42,
+	0xCE, 0x91, 0x42, 0xCE, 0x92, 0x42, 0xCE, 0x93,
+	// Bytes 200 - 23f
+	0x42, 0xCE, 0x94, 0x42, 0xCE, 0x95, 0x42, 0xCE,
+	0x96, 0x42, 0xCE, 0x97, 0x42, 0xCE, 0x98, 0x42,
+	0xCE, 0x99, 0x42, 0xCE, 0x9A, 0x42, 0xCE, 0x9B,
+	0x42, 0xCE, 0x9C, 0x42, 0xCE, 0x9D, 0x42, 0xCE,
+	0x9E, 0x42, 0xCE, 0x9F, 0x42, 0xCE, 0xA0, 0x42,
+	0xCE, 0xA1, 0x42, 0xCE, 0xA3, 0x42, 0xCE, 0xA4,
+	0x42, 0xCE, 0xA5, 0x42, 0xCE, 0xA6, 0x42, 0xCE,
+	0xA7, 0x42, 0xCE, 0xA8, 0x42, 0xCE, 0xA9, 0x42,
+	// Bytes 240 - 27f
+	0xCE, 0xB1, 0x42, 0xCE, 0xB2, 0x42, 0xCE, 0xB3,
+	0x42, 0xCE, 0xB4, 0x42, 0xCE, 0xB5, 0x42, 0xCE,
+	0xB6, 0x42, 0xCE, 0xB7, 0x42, 0xCE, 0xB8, 0x42,
+	0xCE, 0xB9, 0x42, 0xCE, 0xBA, 0x42, 0xCE, 0xBB,
+	0x42, 0xCE, 0xBC, 0x42, 0xCE, 0xBD, 0x42, 0xCE,
+	0xBE, 0x42, 0xCE, 0xBF, 0x42, 0xCF, 0x80, 0x42,
+	0xCF, 0x81, 0x42, 0xCF, 0x82, 0x42, 0xCF, 0x83,
+	0x42, 0xCF, 0x84, 0x42, 0xCF, 0x85, 0x42, 0xCF,
+	// Bytes 280 - 2bf
+	0x86, 0x42, 0xCF, 0x87, 0x42, 0xCF, 0x88, 0x42,
+	0xCF, 0x89, 0x42, 0xCF, 0x9C, 0x42, 0xCF, 0x9D,
+	0x42, 0xD0, 0xB0, 0x42, 0xD0, 0xB1, 0x42, 0xD0,
+	0xB2, 0x42, 0xD0, 0xB3, 0x42, 0xD0, 0xB4, 0x42,
+	0xD0, 0xB5, 0x42, 0xD0, 0xB6, 0x42, 0xD0, 0xB7,
+	0x42, 0xD0, 0xB8, 0x42, 0xD0, 0xBA, 0x42, 0xD0,
+	0xBB, 0x42, 0xD0, 0xBC, 0x42, 0xD0, 0xBD, 0x42,
+	0xD0, 0xBE, 0x42, 0xD0, 0xBF, 0x42, 0xD1, 0x80,
+	// Bytes 2c0 - 2ff
+	0x42, 0xD1, 0x81, 0x42, 0xD1, 0x82, 0x42, 0xD1,
+	0x83, 0x42, 0xD1, 0x84, 0x42, 0xD1, 0x85, 0x42,
+	0xD1, 0x86, 0x42, 0xD1, 0x87, 0x42, 0xD1, 0x88,
+	0x42, 0xD1, 0x8A, 0x42, 0xD1, 0x8B, 0x42, 0xD1,
+	0x8C, 0x42, 0xD1, 0x8D, 0x42, 0xD1, 0x8E, 0x42,
+	0xD1, 0x95, 0x42, 0xD1, 0x96, 0x42, 0xD1, 0x98,
+	0x42, 0xD1, 0x9F, 0x42, 0xD2, 0x91, 0x42, 0xD2,
+	0xAB, 0x42, 0xD2, 0xAF, 0x42, 0xD2, 0xB1, 0x42,
+	// Bytes 300 - 33f
+	0xD3, 0x8F, 0x42, 0xD3, 0x99, 0x42, 0xD3, 0xA9,
+	0x42, 0xD7, 0x90, 0x42, 0xD7, 0x91, 0x42, 0xD7,
+	0x92, 0x42, 0xD7, 0x93, 0x42, 0xD7, 0x94, 0x42,
+	0xD7, 0x9B, 0x42, 0xD7, 0x9C, 0x42, 0xD7, 0x9D,
+	0x42, 0xD7, 0xA2, 0x42, 0xD7, 0xA8, 0x42, 0xD7,
+	0xAA, 0x42, 0xD8, 0xA1, 0x42, 0xD8, 0xA7, 0x42,
+	0xD8, 0xA8, 0x42, 0xD8, 0xA9, 0x42, 0xD8, 0xAA,
+	0x42, 0xD8, 0xAB, 0x42, 0xD8, 0xAC, 0x42, 0xD8,
+	// Bytes 340 - 37f
+	0xAD, 0x42, 0xD8, 0xAE, 0x42, 0xD8, 0xAF, 0x42,
+	0xD8, 0xB0, 0x42, 0xD8, 0xB1, 0x42, 0xD8, 0xB2,
+	0x42, 0xD8, 0xB3, 0x42, 0xD8, 0xB4, 0x42, 0xD8,
+	0xB5, 0x42, 0xD8, 0xB6, 0x42, 0xD8, 0xB7, 0x42,
+	0xD8, 0xB8, 0x42, 0xD8, 0xB9, 0x42, 0xD8, 0xBA,
+	0x42, 0xD9, 0x81, 0x42, 0xD9, 0x82, 0x42, 0xD9,
+	0x83, 0x42, 0xD9, 0x84, 0x42, 0xD9, 0x85, 0x42,
+	0xD9, 0x86, 0x42, 0xD9, 0x87, 0x42, 0xD9, 0x88,
+	// Bytes 380 - 3bf
+	0x42, 0xD9, 0x89, 0x42, 0xD9, 0x8A, 0x42, 0xD9,
+	0xAE, 0x42, 0xD9, 0xAF, 0x42, 0xD9, 0xB1, 0x42,
+	0xD9, 0xB9, 0x42, 0xD9, 0xBA, 0x42, 0xD9, 0xBB,
+	0x42, 0xD9, 0xBE, 0x42, 0xD9, 0xBF, 0x42, 0xDA,
+	0x80, 0x42, 0xDA, 0x83, 0x42, 0xDA, 0x84, 0x42,
+	0xDA, 0x86, 0x42, 0xDA, 0x87, 0x42, 0xDA, 0x88,
+	0x42, 0xDA, 0x8C, 0x42, 0xDA, 0x8D, 0x42, 0xDA,
+	0x8E, 0x42, 0xDA, 0x91, 0x42, 0xDA, 0x98, 0x42,
+	// Bytes 3c0 - 3ff
+	0xDA, 0xA1, 0x42, 0xDA, 0xA4, 0x42, 0xDA, 0xA6,
+	0x42, 0xDA, 0xA9, 0x42, 0xDA, 0xAD, 0x42, 0xDA,
+	0xAF, 0x42, 0xDA, 0xB1, 0x42, 0xDA, 0xB3, 0x42,
+	0xDA, 0xBA, 0x42, 0xDA, 0xBB, 0x42, 0xDA, 0xBE,
+	0x42, 0xDB, 0x81, 0x42, 0xDB, 0x85, 0x42, 0xDB,
+	0x86, 0x42, 0xDB, 0x87, 0x42, 0xDB, 0x88, 0x42,
+	0xDB, 0x89, 0x42, 0xDB, 0x8B, 0x42, 0xDB, 0x8C,
+	0x42, 0xDB, 0x90, 0x42, 0xDB, 0x92, 0x43, 0xE0,
+	// Bytes 400 - 43f
+	0xBC, 0x8B, 0x43, 0xE1, 0x83, 0x9C, 0x43, 0xE1,
+	0x84, 0x80, 0x43, 0xE1, 0x84, 0x81, 0x43, 0xE1,
+	0x84, 0x82, 0x43, 0xE1, 0x84, 0x83, 0x43, 0xE1,
+	0x84, 0x84, 0x43, 0xE1, 0x84, 0x85, 0x43, 0xE1,
+	0x84, 0x86, 0x43, 0xE1, 0x84, 0x87, 0x43, 0xE1,
+	0x84, 0x88, 0x43, 0xE1, 0x84, 0x89, 0x43, 0xE1,
+	0x84, 0x8A, 0x43, 0xE1, 0x84, 0x8B, 0x43, 0xE1,
+	0x84, 0x8C, 0x43, 0xE1, 0x84, 0x8D, 0x43, 0xE1,
+	// Bytes 440 - 47f
+	0x84, 0x8E, 0x43, 0xE1, 0x84, 0x8F, 0x43, 0xE1,
+	0x84, 0x90, 0x43, 0xE1, 0x84, 0x91, 0x43, 0xE1,
+	0x84, 0x92, 0x43, 0xE1, 0x84, 0x94, 0x43, 0xE1,
+	0x84, 0x95, 0x43, 0xE1, 0x84, 0x9A, 0x43, 0xE1,
+	0x84, 0x9C, 0x43, 0xE1, 0x84, 0x9D, 0x43, 0xE1,
+	0x84, 0x9E, 0x43, 0xE1, 0x84, 0xA0, 0x43, 0xE1,
+	0x84, 0xA1, 0x43, 0xE1, 0x84, 0xA2, 0x43, 0xE1,
+	0x84, 0xA3, 0x43, 0xE1, 0x84, 0xA7, 0x43, 0xE1,
+	// Bytes 480 - 4bf
+	0x84, 0xA9, 0x43, 0xE1, 0x84, 0xAB, 0x43, 0xE1,
+	0x84, 0xAC, 0x43, 0xE1, 0x84, 0xAD, 0x43, 0xE1,
+	0x84, 0xAE, 0x43, 0xE1, 0x84, 0xAF, 0x43, 0xE1,
+	0x84, 0xB2, 0x43, 0xE1, 0x84, 0xB6, 0x43, 0xE1,
+	0x85, 0x80, 0x43, 0xE1, 0x85, 0x87, 0x43, 0xE1,
+	0x85, 0x8C, 0x43, 0xE1, 0x85, 0x97, 0x43, 0xE1,
+	0x85, 0x98, 0x43, 0xE1, 0x85, 0x99, 0x43, 0xE1,
+	0x85, 0xA0, 0x43, 0xE1, 0x86, 0x84, 0x43, 0xE1,
+	// Bytes 4c0 - 4ff
+	0x86, 0x85, 0x43, 0xE1, 0x86, 0x88, 0x43, 0xE1,
+	0x86, 0x91, 0x43, 0xE1, 0x86, 0x92, 0x43, 0xE1,
+	0x86, 0x94, 0x43, 0xE1, 0x86, 0x9E, 0x43, 0xE1,
+	0x86, 0xA1, 0x43, 0xE1, 0x87, 0x87, 0x43, 0xE1,
+	0x87, 0x88, 0x43, 0xE1, 0x87, 0x8C, 0x43, 0xE1,
+	0x87, 0x8E, 0x43, 0xE1, 0x87, 0x93, 0x43, 0xE1,
+	0x87, 0x97, 0x43, 0xE1, 0x87, 0x99, 0x43, 0xE1,
+	0x87, 0x9D, 0x43, 0xE1, 0x87, 0x9F, 0x43, 0xE1,
+	// Bytes 500 - 53f
+	0x87, 0xB1, 0x43, 0xE1, 0x87, 0xB2, 0x43, 0xE1,
+	0xB4, 0x82, 0x43, 0xE1, 0xB4, 0x96, 0x43, 0xE1,
+	0xB4, 0x97, 0x43, 0xE1, 0xB4, 0x9C, 0x43, 0xE1,
+	0xB4, 0x9D, 0x43, 0xE1, 0xB4, 0xA5, 0x43, 0xE1,
+	0xB5, 0xBB, 0x43, 0xE1, 0xB6, 0x85, 0x43, 0xE1,
+	0xB6, 0x91, 0x43, 0xE2, 0x80, 0x82, 0x43, 0xE2,
+	0x80, 0x83, 0x43, 0xE2, 0x80, 0x90, 0x43, 0xE2,
+	0x80, 0x93, 0x43, 0xE2, 0x80, 0x94, 0x43, 0xE2,
+	// Bytes 540 - 57f
+	0x82, 0xA9, 0x43, 0xE2, 0x86, 0x90, 0x43, 0xE2,
+	0x86, 0x91, 0x43, 0xE2, 0x86, 0x92, 0x43, 0xE2,
+	0x86, 0x93, 0x43, 0xE2, 0x88, 0x82, 0x43, 0xE2,
+	0x88, 0x87, 0x43, 0xE2, 0x88, 0x91, 0x43, 0xE2,
+	0x88, 0x92, 0x43, 0xE2, 0x94, 0x82, 0x43, 0xE2,
+	0x96, 0xA0, 0x43, 0xE2, 0x97, 0x8B, 0x43, 0xE2,
+	0xA6, 0x85, 0x43, 0xE2, 0xA6, 0x86, 0x43, 0xE2,
+	0xB1, 0xB1, 0x43, 0xE2, 0xB5, 0xA1, 0x43, 0xE3,
+	// Bytes 580 - 5bf
+	0x80, 0x81, 0x43, 0xE3, 0x80, 0x82, 0x43, 0xE3,
+	0x80, 0x88, 0x43, 0xE3, 0x80, 0x89, 0x43, 0xE3,
+	0x80, 0x8A, 0x43, 0xE3, 0x80, 0x8B, 0x43, 0xE3,
+	0x80, 0x8C, 0x43, 0xE3, 0x80, 0x8D, 0x43, 0xE3,
+	0x80, 0x8E, 0x43, 0xE3, 0x80, 0x8F, 0x43, 0xE3,
+	0x80, 0x90, 0x43, 0xE3, 0x80, 0x91, 0x43, 0xE3,
+	0x80, 0x92, 0x43, 0xE3, 0x80, 0x94, 0x43, 0xE3,
+	0x80, 0x95, 0x43, 0xE3, 0x80, 0x96, 0x43, 0xE3,
+	// Bytes 5c0 - 5ff
+	0x80, 0x97, 0x43, 0xE3, 0x82, 0xA1, 0x43, 0xE3,
+	0x82, 0xA2, 0x43, 0xE3, 0x82, 0xA3, 0x43, 0xE3,
+	0x82, 0xA4, 0x43, 0xE3, 0x82, 0xA5, 0x43, 0xE3,
+	0x82, 0xA6, 0x43, 0xE3, 0x82, 0xA7, 0x43, 0xE3,
+	0x82, 0xA8, 0x43, 0xE3, 0x82, 0xA9, 0x43, 0xE3,
+	0x82, 0xAA, 0x43, 0xE3, 0x82, 0xAB, 0x43, 0xE3,
+	0x82, 0xAD, 0x43, 0xE3, 0x82, 0xAF, 0x43, 0xE3,
+	0x82, 0xB1, 0x43, 0xE3, 0x82, 0xB3, 0x43, 0xE3,
+	// Bytes 600 - 63f
+	0x82, 0xB5, 0x43, 0xE3, 0x82, 0xB7, 0x43, 0xE3,
+	0x82, 0xB9, 0x43, 0xE3, 0x82, 0xBB, 0x43, 0xE3,
+	0x82, 0xBD, 0x43, 0xE3, 0x82, 0xBF, 0x43, 0xE3,
+	0x83, 0x81, 0x43, 0xE3, 0x83, 0x83, 0x43, 0xE3,
+	0x83, 0x84, 0x43, 0xE3, 0x83, 0x86, 0x43, 0xE3,
+	0x83, 0x88, 0x43, 0xE3, 0x83, 0x8A, 0x43, 0xE3,
+	0x83, 0x8B, 0x43, 0xE3, 0x83, 0x8C, 0x43, 0xE3,
+	0x83, 0x8D, 0x43, 0xE3, 0x83, 0x8E, 0x43, 0xE3,
+	// Bytes 640 - 67f
+	0x83, 0x8F, 0x43, 0xE3, 0x83, 0x92, 0x43, 0xE3,
+	0x83, 0x95, 0x43, 0xE3, 0x83, 0x98, 0x43, 0xE3,
+	0x83, 0x9B, 0x43, 0xE3, 0x83, 0x9E, 0x43, 0xE3,
+	0x83, 0x9F, 0x43, 0xE3, 0x83, 0xA0, 0x43, 0xE3,
+	0x83, 0xA1, 0x43, 0xE3, 0x83, 0xA2, 0x43, 0xE3,
+	0x83, 0xA3, 0x43, 0xE3, 0x83, 0xA4, 0x43, 0xE3,
+	0x83, 0xA5, 0x43, 0xE3, 0x83, 0xA6, 0x43, 0xE3,
+	0x83, 0xA7, 0x43, 0xE3, 0x83, 0xA8, 0x43, 0xE3,
+	// Bytes 680 - 6bf
+	0x83, 0xA9, 0x43, 0xE3, 0x83, 0xAA, 0x43, 0xE3,
+	0x83, 0xAB, 0x43, 0xE3, 0x83, 0xAC, 0x43, 0xE3,
+	0x83, 0xAD, 0x43, 0xE3, 0x83, 0xAF, 0x43, 0xE3,
+	0x83, 0xB0, 0x43, 0xE3, 0x83, 0xB1, 0x43, 0xE3,
+	0x83, 0xB2, 0x43, 0xE3, 0x83, 0xB3, 0x43, 0xE3,
+	0x83, 0xBB, 0x43, 0xE3, 0x83, 0xBC, 0x43, 0xE3,
+	0x92, 0x9E, 0x43, 0xE3, 0x92, 0xB9, 0x43, 0xE3,
+	0x92, 0xBB, 0x43, 0xE3, 0x93, 0x9F, 0x43, 0xE3,
+	// Bytes 6c0 - 6ff
+	0x94, 0x95, 0x43, 0xE3, 0x9B, 0xAE, 0x43, 0xE3,
+	0x9B, 0xBC, 0x43, 0xE3, 0x9E, 0x81, 0x43, 0xE3,
+	0xA0, 0xAF, 0x43, 0xE3, 0xA1, 0xA2, 0x43, 0xE3,
+	0xA1, 0xBC, 0x43, 0xE3, 0xA3, 0x87, 0x43, 0xE3,
+	0xA3, 0xA3, 0x43, 0xE3, 0xA4, 0x9C, 0x43, 0xE3,
+	0xA4, 0xBA, 0x43, 0xE3, 0xA8, 0xAE, 0x43, 0xE3,
+	0xA9, 0xAC, 0x43, 0xE3, 0xAB, 0xA4, 0x43, 0xE3,
+	0xAC, 0x88, 0x43, 0xE3, 0xAC, 0x99, 0x43, 0xE3,
+	// Bytes 700 - 73f
+	0xAD, 0x89, 0x43, 0xE3, 0xAE, 0x9D, 0x43, 0xE3,
+	0xB0, 0x98, 0x43, 0xE3, 0xB1, 0x8E, 0x43, 0xE3,
+	0xB4, 0xB3, 0x43, 0xE3, 0xB6, 0x96, 0x43, 0xE3,
+	0xBA, 0xAC, 0x43, 0xE3, 0xBA, 0xB8, 0x43, 0xE3,
+	0xBC, 0x9B, 0x43, 0xE3, 0xBF, 0xBC, 0x43, 0xE4,
+	0x80, 0x88, 0x43, 0xE4, 0x80, 0x98, 0x43, 0xE4,
+	0x80, 0xB9, 0x43, 0xE4, 0x81, 0x86, 0x43, 0xE4,
+	0x82, 0x96, 0x43, 0xE4, 0x83, 0xA3, 0x43, 0xE4,
+	// Bytes 740 - 77f
+	0x84, 0xAF, 0x43, 0xE4, 0x88, 0x82, 0x43, 0xE4,
+	0x88, 0xA7, 0x43, 0xE4, 0x8A, 0xA0, 0x43, 0xE4,
+	0x8C, 0x81, 0x43, 0xE4, 0x8C, 0xB4, 0x43, 0xE4,
+	0x8D, 0x99, 0x43, 0xE4, 0x8F, 0x95, 0x43, 0xE4,
+	0x8F, 0x99, 0x43, 0xE4, 0x90, 0x8B, 0x43, 0xE4,
+	0x91, 0xAB, 0x43, 0xE4, 0x94, 0xAB, 0x43, 0xE4,
+	0x95, 0x9D, 0x43, 0xE4, 0x95, 0xA1, 0x43, 0xE4,
+	0x95, 0xAB, 0x43, 0xE4, 0x97, 0x97, 0x43, 0xE4,
+	// Bytes 780 - 7bf
+	0x97, 0xB9, 0x43, 0xE4, 0x98, 0xB5, 0x43, 0xE4,
+	0x9A, 0xBE, 0x43, 0xE4, 0x9B, 0x87, 0x43, 0xE4,
+	0xA6, 0x95, 0x43, 0xE4, 0xA7, 0xA6, 0x43, 0xE4,
+	0xA9, 0xAE, 0x43, 0xE4, 0xA9, 0xB6, 0x43, 0xE4,
+	0xAA, 0xB2, 0x43, 0xE4, 0xAC, 0xB3, 0x43, 0xE4,
+	0xAF, 0x8E, 0x43, 0xE4, 0xB3, 0x8E, 0x43, 0xE4,
+	0xB3, 0xAD, 0x43, 0xE4, 0xB3, 0xB8, 0x43, 0xE4,
+	0xB5, 0x96, 0x43, 0xE4, 0xB8, 0x80, 0x43, 0xE4,
+	// Bytes 7c0 - 7ff
+	0xB8, 0x81, 0x43, 0xE4, 0xB8, 0x83, 0x43, 0xE4,
+	0xB8, 0x89, 0x43, 0xE4, 0xB8, 0x8A, 0x43, 0xE4,
+	0xB8, 0x8B, 0x43, 0xE4, 0xB8, 0x8D, 0x43, 0xE4,
+	0xB8, 0x99, 0x43, 0xE4, 0xB8, 0xA6, 0x43, 0xE4,
+	0xB8, 0xA8, 0x43, 0xE4, 0xB8, 0xAD, 0x43, 0xE4,
+	0xB8, 0xB2, 0x43, 0xE4, 0xB8, 0xB6, 0x43, 0xE4,
+	0xB8, 0xB8, 0x43, 0xE4, 0xB8, 0xB9, 0x43, 0xE4,
+	0xB8, 0xBD, 0x43, 0xE4, 0xB8, 0xBF, 0x43, 0xE4,
+	// Bytes 800 - 83f
+	0xB9, 0x81, 0x43, 0xE4, 0xB9, 0x99, 0x43, 0xE4,
+	0xB9, 0x9D, 0x43, 0xE4, 0xBA, 0x82, 0x43, 0xE4,
+	0xBA, 0x85, 0x43, 0xE4, 0xBA, 0x86, 0x43, 0xE4,
+	0xBA, 0x8C, 0x43, 0xE4, 0xBA, 0x94, 0x43, 0xE4,
+	0xBA, 0xA0, 0x43, 0xE4, 0xBA, 0xA4, 0x43, 0xE4,
+	0xBA, 0xAE, 0x43, 0xE4, 0xBA, 0xBA, 0x43, 0xE4,
+	0xBB, 0x80, 0x43, 0xE4, 0xBB, 0x8C, 0x43, 0xE4,
+	0xBB, 0xA4, 0x43, 0xE4, 0xBC, 0x81, 0x43, 0xE4,
+	// Bytes 840 - 87f
+	0xBC, 0x91, 0x43, 0xE4, 0xBD, 0xA0, 0x43, 0xE4,
+	0xBE, 0x80, 0x43, 0xE4, 0xBE, 0x86, 0x43, 0xE4,
+	0xBE, 0x8B, 0x43, 0xE4, 0xBE, 0xAE, 0x43, 0xE4,
+	0xBE, 0xBB, 0x43, 0xE4, 0xBE, 0xBF, 0x43, 0xE5,
+	0x80, 0x82, 0x43, 0xE5, 0x80, 0xAB, 0x43, 0xE5,
+	0x81, 0xBA, 0x43, 0xE5, 0x82, 0x99, 0x43, 0xE5,
+	0x83, 0x8F, 0x43, 0xE5, 0x83, 0x9A, 0x43, 0xE5,
+	0x83, 0xA7, 0x43, 0xE5, 0x84, 0xAA, 0x43, 0xE5,
+	// Bytes 880 - 8bf
+	0x84, 0xBF, 0x43, 0xE5, 0x85, 0x80, 0x43, 0xE5,
+	0x85, 0x85, 0x43, 0xE5, 0x85, 0x8D, 0x43, 0xE5,
+	0x85, 0x94, 0x43, 0xE5, 0x85, 0xA4, 0x43, 0xE5,
+	0x85, 0xA5, 0x43, 0xE5, 0x85, 0xA7, 0x43, 0xE5,
+	0x85, 0xA8, 0x43, 0xE5, 0x85, 0xA9, 0x43, 0xE5,
+	0x85, 0xAB, 0x43, 0xE5, 0x85, 0xAD, 0x43, 0xE5,
+	0x85, 0xB7, 0x43, 0xE5, 0x86, 0x80, 0x43, 0xE5,
+	0x86, 0x82, 0x43, 0xE5, 0x86, 0x8D, 0x43, 0xE5,
+	// Bytes 8c0 - 8ff
+	0x86, 0x92, 0x43, 0xE5, 0x86, 0x95, 0x43, 0xE5,
+	0x86, 0x96, 0x43, 0xE5, 0x86, 0x97, 0x43, 0xE5,
+	0x86, 0x99, 0x43, 0xE5, 0x86, 0xA4, 0x43, 0xE5,
+	0x86, 0xAB, 0x43, 0xE5, 0x86, 0xAC, 0x43, 0xE5,
+	0x86, 0xB5, 0x43, 0xE5, 0x86, 0xB7, 0x43, 0xE5,
+	0x87, 0x89, 0x43, 0xE5, 0x87, 0x8C, 0x43, 0xE5,
+	0x87, 0x9C, 0x43, 0xE5, 0x87, 0x9E, 0x43, 0xE5,
+	0x87, 0xA0, 0x43, 0xE5, 0x87, 0xB5, 0x43, 0xE5,
+	// Bytes 900 - 93f
+	0x88, 0x80, 0x43, 0xE5, 0x88, 0x83, 0x43, 0xE5,
+	0x88, 0x87, 0x43, 0xE5, 0x88, 0x97, 0x43, 0xE5,
+	0x88, 0x9D, 0x43, 0xE5, 0x88, 0xA9, 0x43, 0xE5,
+	0x88, 0xBA, 0x43, 0xE5, 0x88, 0xBB, 0x43, 0xE5,
+	0x89, 0x86, 0x43, 0xE5, 0x89, 0x8D, 0x43, 0xE5,
+	0x89, 0xB2, 0x43, 0xE5, 0x89, 0xB7, 0x43, 0xE5,
+	0x8A, 0x89, 0x43, 0xE5, 0x8A, 0x9B, 0x43, 0xE5,
+	0x8A, 0xA3, 0x43, 0xE5, 0x8A, 0xB3, 0x43, 0xE5,
+	// Bytes 940 - 97f
+	0x8A, 0xB4, 0x43, 0xE5, 0x8B, 0x87, 0x43, 0xE5,
+	0x8B, 0x89, 0x43, 0xE5, 0x8B, 0x92, 0x43, 0xE5,
+	0x8B, 0x9E, 0x43, 0xE5, 0x8B, 0xA4, 0x43, 0xE5,
+	0x8B, 0xB5, 0x43, 0xE5, 0x8B, 0xB9, 0x43, 0xE5,
+	0x8B, 0xBA, 0x43, 0xE5, 0x8C, 0x85, 0x43, 0xE5,
+	0x8C, 0x86, 0x43, 0xE5, 0x8C, 0x95, 0x43, 0xE5,
+	0x8C, 0x97, 0x43, 0xE5, 0x8C, 0x9A, 0x43, 0xE5,
+	0x8C, 0xB8, 0x43, 0xE5, 0x8C, 0xBB, 0x43, 0xE5,
+	// Bytes 980 - 9bf
+	0x8C, 0xBF, 0x43, 0xE5, 0x8D, 0x81, 0x43, 0xE5,
+	0x8D, 0x84, 0x43, 0xE5, 0x8D, 0x85, 0x43, 0xE5,
+	0x8D, 0x89, 0x43, 0xE5, 0x8D, 0x91, 0x43, 0xE5,
+	0x8D, 0x94, 0x43, 0xE5, 0x8D, 0x9A, 0x43, 0xE5,
+	0x8D, 0x9C, 0x43, 0xE5, 0x8D, 0xA9, 0x43, 0xE5,
+	0x8D, 0xB0, 0x43, 0xE5, 0x8D, 0xB3, 0x43, 0xE5,
+	0x8D, 0xB5, 0x43, 0xE5, 0x8D, 0xBD, 0x43, 0xE5,
+	0x8D, 0xBF, 0x43, 0xE5, 0x8E, 0x82, 0x43, 0xE5,
+	// Bytes 9c0 - 9ff
+	0x8E, 0xB6, 0x43, 0xE5, 0x8F, 0x83, 0x43, 0xE5,
+	0x8F, 0x88, 0x43, 0xE5, 0x8F, 0x8A, 0x43, 0xE5,
+	0x8F, 0x8C, 0x43, 0xE5, 0x8F, 0x9F, 0x43, 0xE5,
+	0x8F, 0xA3, 0x43, 0xE5, 0x8F, 0xA5, 0x43, 0xE5,
+	0x8F, 0xAB, 0x43, 0xE5, 0x8F, 0xAF, 0x43, 0xE5,
+	0x8F, 0xB1, 0x43, 0xE5, 0x8F, 0xB3, 0x43, 0xE5,
+	0x90, 0x86, 0x43, 0xE5, 0x90, 0x88, 0x43, 0xE5,
+	0x90, 0x8D, 0x43, 0xE5, 0x90, 0x8F, 0x43, 0xE5,
+	// Bytes a00 - a3f
+	0x90, 0x9D, 0x43, 0xE5, 0x90, 0xB8, 0x43, 0xE5,
+	0x90, 0xB9, 0x43, 0xE5, 0x91, 0x82, 0x43, 0xE5,
+	0x91, 0x88, 0x43, 0xE5, 0x91, 0xA8, 0x43, 0xE5,
+	0x92, 0x9E, 0x43, 0xE5, 0x92, 0xA2, 0x43, 0xE5,
+	0x92, 0xBD, 0x43, 0xE5, 0x93, 0xB6, 0x43, 0xE5,
+	0x94, 0x90, 0x43, 0xE5, 0x95, 0x8F, 0x43, 0xE5,
+	0x95, 0x93, 0x43, 0xE5, 0x95, 0x95, 0x43, 0xE5,
+	0x95, 0xA3, 0x43, 0xE5, 0x96, 0x84, 0x43, 0xE5,
+	// Bytes a40 - a7f
+	0x96, 0x87, 0x43, 0xE5, 0x96, 0x99, 0x43, 0xE5,
+	0x96, 0x9D, 0x43, 0xE5, 0x96, 0xAB, 0x43, 0xE5,
+	0x96, 0xB3, 0x43, 0xE5, 0x96, 0xB6, 0x43, 0xE5,
+	0x97, 0x80, 0x43, 0xE5, 0x97, 0x82, 0x43, 0xE5,
+	0x97, 0xA2, 0x43, 0xE5, 0x98, 0x86, 0x43, 0xE5,
+	0x99, 0x91, 0x43, 0xE5, 0x99, 0xA8, 0x43, 0xE5,
+	0x99, 0xB4, 0x43, 0xE5, 0x9B, 0x97, 0x43, 0xE5,
+	0x9B, 0x9B, 0x43, 0xE5, 0x9B, 0xB9, 0x43, 0xE5,
+	// Bytes a80 - abf
+	0x9C, 0x96, 0x43, 0xE5, 0x9C, 0x97, 0x43, 0xE5,
+	0x9C, 0x9F, 0x43, 0xE5, 0x9C, 0xB0, 0x43, 0xE5,
+	0x9E, 0x8B, 0x43, 0xE5, 0x9F, 0x8E, 0x43, 0xE5,
+	0x9F, 0xB4, 0x43, 0xE5, 0xA0, 0x8D, 0x43, 0xE5,
+	0xA0, 0xB1, 0x43, 0xE5, 0xA0, 0xB2, 0x43, 0xE5,
+	0xA1, 0x80, 0x43, 0xE5, 0xA1, 0x9A, 0x43, 0xE5,
+	0xA1, 0x9E, 0x43, 0xE5, 0xA2, 0xA8, 0x43, 0xE5,
+	0xA2, 0xAC, 0x43, 0xE5, 0xA2, 0xB3, 0x43, 0xE5,
+	// Bytes ac0 - aff
+	0xA3, 0x98, 0x43, 0xE5, 0xA3, 0x9F, 0x43, 0xE5,
+	0xA3, 0xAB, 0x43, 0xE5, 0xA3, 0xAE, 0x43, 0xE5,
+	0xA3, 0xB0, 0x43, 0xE5, 0xA3, 0xB2, 0x43, 0xE5,
+	0xA3, 0xB7, 0x43, 0xE5, 0xA4, 0x82, 0x43, 0xE5,
+	0xA4, 0x86, 0x43, 0xE5, 0xA4, 0x8A, 0x43, 0xE5,
+	0xA4, 0x95, 0x43, 0xE5, 0xA4, 0x9A, 0x43, 0xE5,
+	0xA4, 0x9C, 0x43, 0xE5, 0xA4, 0xA2, 0x43, 0xE5,
+	0xA4, 0xA7, 0x43, 0xE5, 0xA4, 0xA9, 0x43, 0xE5,
+	// Bytes b00 - b3f
+	0xA5, 0x84, 0x43, 0xE5, 0xA5, 0x88, 0x43, 0xE5,
+	0xA5, 0x91, 0x43, 0xE5, 0xA5, 0x94, 0x43, 0xE5,
+	0xA5, 0xA2, 0x43, 0xE5, 0xA5, 0xB3, 0x43, 0xE5,
+	0xA7, 0x98, 0x43, 0xE5, 0xA7, 0xAC, 0x43, 0xE5,
+	0xA8, 0x9B, 0x43, 0xE5, 0xA8, 0xA7, 0x43, 0xE5,
+	0xA9, 0xA2, 0x43, 0xE5, 0xA9, 0xA6, 0x43, 0xE5,
+	0xAA, 0xB5, 0x43, 0xE5, 0xAC, 0x88, 0x43, 0xE5,
+	0xAC, 0xA8, 0x43, 0xE5, 0xAC, 0xBE, 0x43, 0xE5,
+	// Bytes b40 - b7f
+	0xAD, 0x90, 0x43, 0xE5, 0xAD, 0x97, 0x43, 0xE5,
+	0xAD, 0xA6, 0x43, 0xE5, 0xAE, 0x80, 0x43, 0xE5,
+	0xAE, 0x85, 0x43, 0xE5, 0xAE, 0x97, 0x43, 0xE5,
+	0xAF, 0x83, 0x43, 0xE5, 0xAF, 0x98, 0x43, 0xE5,
+	0xAF, 0xA7, 0x43, 0xE5, 0xAF, 0xAE, 0x43, 0xE5,
+	0xAF, 0xB3, 0x43, 0xE5, 0xAF, 0xB8, 0x43, 0xE5,
+	0xAF, 0xBF, 0x43, 0xE5, 0xB0, 0x86, 0x43, 0xE5,
+	0xB0, 0x8F, 0x43, 0xE5, 0xB0, 0xA2, 0x43, 0xE5,
+	// Bytes b80 - bbf
+	0xB0, 0xB8, 0x43, 0xE5, 0xB0, 0xBF, 0x43, 0xE5,
+	0xB1, 0xA0, 0x43, 0xE5, 0xB1, 0xA2, 0x43, 0xE5,
+	0xB1, 0xA4, 0x43, 0xE5, 0xB1, 0xA5, 0x43, 0xE5,
+	0xB1, 0xAE, 0x43, 0xE5, 0xB1, 0xB1, 0x43, 0xE5,
+	0xB2, 0x8D, 0x43, 0xE5, 0xB3, 0x80, 0x43, 0xE5,
+	0xB4, 0x99, 0x43, 0xE5, 0xB5, 0x83, 0x43, 0xE5,
+	0xB5, 0x90, 0x43, 0xE5, 0xB5, 0xAB, 0x43, 0xE5,
+	0xB5, 0xAE, 0x43, 0xE5, 0xB5, 0xBC, 0x43, 0xE5,
+	// Bytes bc0 - bff
+	0xB6, 0xB2, 0x43, 0xE5, 0xB6, 0xBA, 0x43, 0xE5,
+	0xB7, 0x9B, 0x43, 0xE5, 0xB7, 0xA1, 0x43, 0xE5,
+	0xB7, 0xA2, 0x43, 0xE5, 0xB7, 0xA5, 0x43, 0xE5,
+	0xB7, 0xA6, 0x43, 0xE5, 0xB7, 0xB1, 0x43, 0xE5,
+	0xB7, 0xBD, 0x43, 0xE5, 0xB7, 0xBE, 0x43, 0xE5,
+	0xB8, 0xA8, 0x43, 0xE5, 0xB8, 0xBD, 0x43, 0xE5,
+	0xB9, 0xA9, 0x43, 0xE5, 0xB9, 0xB2, 0x43, 0xE5,
+	0xB9, 0xB4, 0x43, 0xE5, 0xB9, 0xBA, 0x43, 0xE5,
+	// Bytes c00 - c3f
+	0xB9, 0xBC, 0x43, 0xE5, 0xB9, 0xBF, 0x43, 0xE5,
+	0xBA, 0xA6, 0x43, 0xE5, 0xBA, 0xB0, 0x43, 0xE5,
+	0xBA, 0xB3, 0x43, 0xE5, 0xBA, 0xB6, 0x43, 0xE5,
+	0xBB, 0x89, 0x43, 0xE5, 0xBB, 0x8A, 0x43, 0xE5,
+	0xBB, 0x92, 0x43, 0xE5, 0xBB, 0x93, 0x43, 0xE5,
+	0xBB, 0x99, 0x43, 0xE5, 0xBB, 0xAC, 0x43, 0xE5,
+	0xBB, 0xB4, 0x43, 0xE5, 0xBB, 0xBE, 0x43, 0xE5,
+	0xBC, 0x84, 0x43, 0xE5, 0xBC, 0x8B, 0x43, 0xE5,
+	// Bytes c40 - c7f
+	0xBC, 0x93, 0x43, 0xE5, 0xBC, 0xA2, 0x43, 0xE5,
+	0xBD, 0x90, 0x43, 0xE5, 0xBD, 0x93, 0x43, 0xE5,
+	0xBD, 0xA1, 0x43, 0xE5, 0xBD, 0xA2, 0x43, 0xE5,
+	0xBD, 0xA9, 0x43, 0xE5, 0xBD, 0xAB, 0x43, 0xE5,
+	0xBD, 0xB3, 0x43, 0xE5, 0xBE, 0x8B, 0x43, 0xE5,
+	0xBE, 0x8C, 0x43, 0xE5, 0xBE, 0x97, 0x43, 0xE5,
+	0xBE, 0x9A, 0x43, 0xE5, 0xBE, 0xA9, 0x43, 0xE5,
+	0xBE, 0xAD, 0x43, 0xE5, 0xBF, 0x83, 0x43, 0xE5,
+	// Bytes c80 - cbf
+	0xBF, 0x8D, 0x43, 0xE5, 0xBF, 0x97, 0x43, 0xE5,
+	0xBF, 0xB5, 0x43, 0xE5, 0xBF, 0xB9, 0x43, 0xE6,
+	0x80, 0x92, 0x43, 0xE6, 0x80, 0x9C, 0x43, 0xE6,
+	0x81, 0xB5, 0x43, 0xE6, 0x82, 0x81, 0x43, 0xE6,
+	0x82, 0x94, 0x43, 0xE6, 0x83, 0x87, 0x43, 0xE6,
+	0x83, 0x98, 0x43, 0xE6, 0x83, 0xA1, 0x43, 0xE6,
+	0x84, 0x88, 0x43, 0xE6, 0x85, 0x84, 0x43, 0xE6,
+	0x85, 0x88, 0x43, 0xE6, 0x85, 0x8C, 0x43, 0xE6,
+	// Bytes cc0 - cff
+	0x85, 0x8E, 0x43, 0xE6, 0x85, 0xA0, 0x43, 0xE6,
+	0x85, 0xA8, 0x43, 0xE6, 0x85, 0xBA, 0x43, 0xE6,
+	0x86, 0x8E, 0x43, 0xE6, 0x86, 0x90, 0x43, 0xE6,
+	0x86, 0xA4, 0x43, 0xE6, 0x86, 0xAF, 0x43, 0xE6,
+	0x86, 0xB2, 0x43, 0xE6, 0x87, 0x9E, 0x43, 0xE6,
+	0x87, 0xB2, 0x43, 0xE6, 0x87, 0xB6, 0x43, 0xE6,
+	0x88, 0x80, 0x43, 0xE6, 0x88, 0x88, 0x43, 0xE6,
+	0x88, 0x90, 0x43, 0xE6, 0x88, 0x9B, 0x43, 0xE6,
+	// Bytes d00 - d3f
+	0x88, 0xAE, 0x43, 0xE6, 0x88, 0xB4, 0x43, 0xE6,
+	0x88, 0xB6, 0x43, 0xE6, 0x89, 0x8B, 0x43, 0xE6,
+	0x89, 0x93, 0x43, 0xE6, 0x89, 0x9D, 0x43, 0xE6,
+	0x8A, 0x95, 0x43, 0xE6, 0x8A, 0xB1, 0x43, 0xE6,
+	0x8B, 0x89, 0x43, 0xE6, 0x8B, 0x8F, 0x43, 0xE6,
+	0x8B, 0x93, 0x43, 0xE6, 0x8B, 0x94, 0x43, 0xE6,
+	0x8B, 0xBC, 0x43, 0xE6, 0x8B, 0xBE, 0x43, 0xE6,
+	0x8C, 0x87, 0x43, 0xE6, 0x8C, 0xBD, 0x43, 0xE6,
+	// Bytes d40 - d7f
+	0x8D, 0x90, 0x43, 0xE6, 0x8D, 0x95, 0x43, 0xE6,
+	0x8D, 0xA8, 0x43, 0xE6, 0x8D, 0xBB, 0x43, 0xE6,
+	0x8E, 0x83, 0x43, 0xE6, 0x8E, 0xA0, 0x43, 0xE6,
+	0x8E, 0xA9, 0x43, 0xE6, 0x8F, 0x84, 0x43, 0xE6,
+	0x8F, 0x85, 0x43, 0xE6, 0x8F, 0xA4, 0x43, 0xE6,
+	0x90, 0x9C, 0x43, 0xE6, 0x90, 0xA2, 0x43, 0xE6,
+	0x91, 0x92, 0x43, 0xE6, 0x91, 0xA9, 0x43, 0xE6,
+	0x91, 0xB7, 0x43, 0xE6, 0x91, 0xBE, 0x43, 0xE6,
+	// Bytes d80 - dbf
+	0x92, 0x9A, 0x43, 0xE6, 0x92, 0x9D, 0x43, 0xE6,
+	0x93, 0x84, 0x43, 0xE6, 0x94, 0xAF, 0x43, 0xE6,
+	0x94, 0xB4, 0x43, 0xE6, 0x95, 0x8F, 0x43, 0xE6,
+	0x95, 0x96, 0x43, 0xE6, 0x95, 0xAC, 0x43, 0xE6,
+	0x95, 0xB8, 0x43, 0xE6, 0x96, 0x87, 0x43, 0xE6,
+	0x96, 0x97, 0x43, 0xE6, 0x96, 0x99, 0x43, 0xE6,
+	0x96, 0xA4, 0x43, 0xE6, 0x96, 0xB0, 0x43, 0xE6,
+	0x96, 0xB9, 0x43, 0xE6, 0x97, 0x85, 0x43, 0xE6,
+	// Bytes dc0 - dff
+	0x97, 0xA0, 0x43, 0xE6, 0x97, 0xA2, 0x43, 0xE6,
+	0x97, 0xA3, 0x43, 0xE6, 0x97, 0xA5, 0x43, 0xE6,
+	0x98, 0x93, 0x43, 0xE6, 0x98, 0xA0, 0x43, 0xE6,
+	0x99, 0x89, 0x43, 0xE6, 0x99, 0xB4, 0x43, 0xE6,
+	0x9A, 0x88, 0x43, 0xE6, 0x9A, 0x91, 0x43, 0xE6,
+	0x9A, 0x9C, 0x43, 0xE6, 0x9A, 0xB4, 0x43, 0xE6,
+	0x9B, 0x86, 0x43, 0xE6, 0x9B, 0xB0, 0x43, 0xE6,
+	0x9B, 0xB4, 0x43, 0xE6, 0x9B, 0xB8, 0x43, 0xE6,
+	// Bytes e00 - e3f
+	0x9C, 0x80, 0x43, 0xE6, 0x9C, 0x88, 0x43, 0xE6,
+	0x9C, 0x89, 0x43, 0xE6, 0x9C, 0x97, 0x43, 0xE6,
+	0x9C, 0x9B, 0x43, 0xE6, 0x9C, 0xA1, 0x43, 0xE6,
+	0x9C, 0xA8, 0x43, 0xE6, 0x9D, 0x8E, 0x43, 0xE6,
+	0x9D, 0x93, 0x43, 0xE6, 0x9D, 0x96, 0x43, 0xE6,
+	0x9D, 0x9E, 0x43, 0xE6, 0x9D, 0xBB, 0x43, 0xE6,
+	0x9E, 0x85, 0x43, 0xE6, 0x9E, 0x97, 0x43, 0xE6,
+	0x9F, 0xB3, 0x43, 0xE6, 0x9F, 0xBA, 0x43, 0xE6,
+	// Bytes e40 - e7f
+	0xA0, 0x97, 0x43, 0xE6, 0xA0, 0x9F, 0x43, 0xE6,
+	0xA0, 0xAA, 0x43, 0xE6, 0xA1, 0x92, 0x43, 0xE6,
+	0xA2, 0x81, 0x43, 0xE6, 0xA2, 0x85, 0x43, 0xE6,
+	0xA2, 0x8E, 0x43, 0xE6, 0xA2, 0xA8, 0x43, 0xE6,
+	0xA4, 0x94, 0x43, 0xE6, 0xA5, 0x82, 0x43, 0xE6,
+	0xA6, 0xA3, 0x43, 0xE6, 0xA7, 0xAA, 0x43, 0xE6,
+	0xA8, 0x82, 0x43, 0xE6, 0xA8, 0x93, 0x43, 0xE6,
+	0xAA, 0xA8, 0x43, 0xE6, 0xAB, 0x93, 0x43, 0xE6,
+	// Bytes e80 - ebf
+	0xAB, 0x9B, 0x43, 0xE6, 0xAC, 0x84, 0x43, 0xE6,
+	0xAC, 0xA0, 0x43, 0xE6, 0xAC, 0xA1, 0x43, 0xE6,
+	0xAD, 0x94, 0x43, 0xE6, 0xAD, 0xA2, 0x43, 0xE6,
+	0xAD, 0xA3, 0x43, 0xE6, 0xAD, 0xB2, 0x43, 0xE6,
+	0xAD, 0xB7, 0x43, 0xE6, 0xAD, 0xB9, 0x43, 0xE6,
+	0xAE, 0x9F, 0x43, 0xE6, 0xAE, 0xAE, 0x43, 0xE6,
+	0xAE, 0xB3, 0x43, 0xE6, 0xAE, 0xBA, 0x43, 0xE6,
+	0xAE, 0xBB, 0x43, 0xE6, 0xAF, 0x8B, 0x43, 0xE6,
+	// Bytes ec0 - eff
+	0xAF, 0x8D, 0x43, 0xE6, 0xAF, 0x94, 0x43, 0xE6,
+	0xAF, 0x9B, 0x43, 0xE6, 0xB0, 0x8F, 0x43, 0xE6,
+	0xB0, 0x94, 0x43, 0xE6, 0xB0, 0xB4, 0x43, 0xE6,
+	0xB1, 0x8E, 0x43, 0xE6, 0xB1, 0xA7, 0x43, 0xE6,
+	0xB2, 0x88, 0x43, 0xE6, 0xB2, 0xBF, 0x43, 0xE6,
+	0xB3, 0x8C, 0x43, 0xE6, 0xB3, 0x8D, 0x43, 0xE6,
+	0xB3, 0xA5, 0x43, 0xE6, 0xB3, 0xA8, 0x43, 0xE6,
+	0xB4, 0x96, 0x43, 0xE6, 0xB4, 0x9B, 0x43, 0xE6,
+	// Bytes f00 - f3f
+	0xB4, 0x9E, 0x43, 0xE6, 0xB4, 0xB4, 0x43, 0xE6,
+	0xB4, 0xBE, 0x43, 0xE6, 0xB5, 0x81, 0x43, 0xE6,
+	0xB5, 0xA9, 0x43, 0xE6, 0xB5, 0xAA, 0x43, 0xE6,
+	0xB5, 0xB7, 0x43, 0xE6, 0xB5, 0xB8, 0x43, 0xE6,
+	0xB6, 0x85, 0x43, 0xE6, 0xB7, 0x8B, 0x43, 0xE6,
+	0xB7, 0x9A, 0x43, 0xE6, 0xB7, 0xAA, 0x43, 0xE6,
+	0xB7, 0xB9, 0x43, 0xE6, 0xB8, 0x9A, 0x43, 0xE6,
+	0xB8, 0xAF, 0x43, 0xE6, 0xB9, 0xAE, 0x43, 0xE6,
+	// Bytes f40 - f7f
+	0xBA, 0x80, 0x43, 0xE6, 0xBA, 0x9C, 0x43, 0xE6,
+	0xBA, 0xBA, 0x43, 0xE6, 0xBB, 0x87, 0x43, 0xE6,
+	0xBB, 0x8B, 0x43, 0xE6, 0xBB, 0x91, 0x43, 0xE6,
+	0xBB, 0x9B, 0x43, 0xE6, 0xBC, 0x8F, 0x43, 0xE6,
+	0xBC, 0x94, 0x43, 0xE6, 0xBC, 0xA2, 0x43, 0xE6,
+	0xBC, 0xA3, 0x43, 0xE6, 0xBD, 0xAE, 0x43, 0xE6,
+	0xBF, 0x86, 0x43, 0xE6, 0xBF, 0xAB, 0x43, 0xE6,
+	0xBF, 0xBE, 0x43, 0xE7, 0x80, 0x9B, 0x43, 0xE7,
+	// Bytes f80 - fbf
+	0x80, 0x9E, 0x43, 0xE7, 0x80, 0xB9, 0x43, 0xE7,
+	0x81, 0x8A, 0x43, 0xE7, 0x81, 0xAB, 0x43, 0xE7,
+	0x81, 0xB0, 0x43, 0xE7, 0x81, 0xB7, 0x43, 0xE7,
+	0x81, 0xBD, 0x43, 0xE7, 0x82, 0x99, 0x43, 0xE7,
+	0x82, 0xAD, 0x43, 0xE7, 0x83, 0x88, 0x43, 0xE7,
+	0x83, 0x99, 0x43, 0xE7, 0x84, 0xA1, 0x43, 0xE7,
+	0x85, 0x85, 0x43, 0xE7, 0x85, 0x89, 0x43, 0xE7,
+	0x85, 0xAE, 0x43, 0xE7, 0x86, 0x9C, 0x43, 0xE7,
+	// Bytes fc0 - fff
+	0x87, 0x8E, 0x43, 0xE7, 0x87, 0x90, 0x43, 0xE7,
+	0x88, 0x90, 0x43, 0xE7, 0x88, 0x9B, 0x43, 0xE7,
+	0x88, 0xA8, 0x43, 0xE7, 0x88, 0xAA, 0x43, 0xE7,
+	0x88, 0xAB, 0x43, 0xE7, 0x88, 0xB5, 0x43, 0xE7,
+	0x88, 0xB6, 0x43, 0xE7, 0x88, 0xBB, 0x43, 0xE7,
+	0x88, 0xBF, 0x43, 0xE7, 0x89, 0x87, 0x43, 0xE7,
+	0x89, 0x90, 0x43, 0xE7, 0x89, 0x99, 0x43, 0xE7,
+	0x89, 0x9B, 0x43, 0xE7, 0x89, 0xA2, 0x43, 0xE7,
+	// Bytes 1000 - 103f
+	0x89, 0xB9, 0x43, 0xE7, 0x8A, 0x80, 0x43, 0xE7,
+	0x8A, 0x95, 0x43, 0xE7, 0x8A, 0xAC, 0x43, 0xE7,
+	0x8A, 0xAF, 0x43, 0xE7, 0x8B, 0x80, 0x43, 0xE7,
+	0x8B, 0xBC, 0x43, 0xE7, 0x8C, 0xAA, 0x43, 0xE7,
+	0x8D, 0xB5, 0x43, 0xE7, 0x8D, 0xBA, 0x43, 0xE7,
+	0x8E, 0x84, 0x43, 0xE7, 0x8E, 0x87, 0x43, 0xE7,
+	0x8E, 0x89, 0x43, 0xE7, 0x8E, 0x8B, 0x43, 0xE7,
+	0x8E, 0xA5, 0x43, 0xE7, 0x8E, 0xB2, 0x43, 0xE7,
+	// Bytes 1040 - 107f
+	0x8F, 0x9E, 0x43, 0xE7, 0x90, 0x86, 0x43, 0xE7,
+	0x90, 0x89, 0x43, 0xE7, 0x90, 0xA2, 0x43, 0xE7,
+	0x91, 0x87, 0x43, 0xE7, 0x91, 0x9C, 0x43, 0xE7,
+	0x91, 0xA9, 0x43, 0xE7, 0x91, 0xB1, 0x43, 0xE7,
+	0x92, 0x85, 0x43, 0xE7, 0x92, 0x89, 0x43, 0xE7,
+	0x92, 0x98, 0x43, 0xE7, 0x93, 0x8A, 0x43, 0xE7,
+	0x93, 0x9C, 0x43, 0xE7, 0x93, 0xA6, 0x43, 0xE7,
+	0x94, 0x86, 0x43, 0xE7, 0x94, 0x98, 0x43, 0xE7,
+	// Bytes 1080 - 10bf
+	0x94, 0x9F, 0x43, 0xE7, 0x94, 0xA4, 0x43, 0xE7,
+	0x94, 0xA8, 0x43, 0xE7, 0x94, 0xB0, 0x43, 0xE7,
+	0x94, 0xB2, 0x43, 0xE7, 0x94, 0xB3, 0x43, 0xE7,
+	0x94, 0xB7, 0x43, 0xE7, 0x94, 0xBB, 0x43, 0xE7,
+	0x94, 0xBE, 0x43, 0xE7, 0x95, 0x99, 0x43, 0xE7,
+	0x95, 0xA5, 0x43, 0xE7, 0x95, 0xB0, 0x43, 0xE7,
+	0x96, 0x8B, 0x43, 0xE7, 0x96, 0x92, 0x43, 0xE7,
+	0x97, 0xA2, 0x43, 0xE7, 0x98, 0x90, 0x43, 0xE7,
+	// Bytes 10c0 - 10ff
+	0x98, 0x9D, 0x43, 0xE7, 0x98, 0x9F, 0x43, 0xE7,
+	0x99, 0x82, 0x43, 0xE7, 0x99, 0xA9, 0x43, 0xE7,
+	0x99, 0xB6, 0x43, 0xE7, 0x99, 0xBD, 0x43, 0xE7,
+	0x9A, 0xAE, 0x43, 0xE7, 0x9A, 0xBF, 0x43, 0xE7,
+	0x9B, 0x8A, 0x43, 0xE7, 0x9B, 0x9B, 0x43, 0xE7,
+	0x9B, 0xA3, 0x43, 0xE7, 0x9B, 0xA7, 0x43, 0xE7,
+	0x9B, 0xAE, 0x43, 0xE7, 0x9B, 0xB4, 0x43, 0xE7,
+	0x9C, 0x81, 0x43, 0xE7, 0x9C, 0x9E, 0x43, 0xE7,
+	// Bytes 1100 - 113f
+	0x9C, 0x9F, 0x43, 0xE7, 0x9D, 0x80, 0x43, 0xE7,
+	0x9D, 0x8A, 0x43, 0xE7, 0x9E, 0x8B, 0x43, 0xE7,
+	0x9E, 0xA7, 0x43, 0xE7, 0x9F, 0x9B, 0x43, 0xE7,
+	0x9F, 0xA2, 0x43, 0xE7, 0x9F, 0xB3, 0x43, 0xE7,
+	0xA1, 0x8E, 0x43, 0xE7, 0xA1, 0xAB, 0x43, 0xE7,
+	0xA2, 0x8C, 0x43, 0xE7, 0xA2, 0x91, 0x43, 0xE7,
+	0xA3, 0x8A, 0x43, 0xE7, 0xA3, 0x8C, 0x43, 0xE7,
+	0xA3, 0xBB, 0x43, 0xE7, 0xA4, 0xAA, 0x43, 0xE7,
+	// Bytes 1140 - 117f
+	0xA4, 0xBA, 0x43, 0xE7, 0xA4, 0xBC, 0x43, 0xE7,
+	0xA4, 0xBE, 0x43, 0xE7, 0xA5, 0x88, 0x43, 0xE7,
+	0xA5, 0x89, 0x43, 0xE7, 0xA5, 0x90, 0x43, 0xE7,
+	0xA5, 0x96, 0x43, 0xE7, 0xA5, 0x9D, 0x43, 0xE7,
+	0xA5, 0x9E, 0x43, 0xE7, 0xA5, 0xA5, 0x43, 0xE7,
+	0xA5, 0xBF, 0x43, 0xE7, 0xA6, 0x81, 0x43, 0xE7,
+	0xA6, 0x8D, 0x43, 0xE7, 0xA6, 0x8E, 0x43, 0xE7,
+	0xA6, 0x8F, 0x43, 0xE7, 0xA6, 0xAE, 0x43, 0xE7,
+	// Bytes 1180 - 11bf
+	0xA6, 0xB8, 0x43, 0xE7, 0xA6, 0xBE, 0x43, 0xE7,
+	0xA7, 0x8A, 0x43, 0xE7, 0xA7, 0x98, 0x43, 0xE7,
+	0xA7, 0xAB, 0x43, 0xE7, 0xA8, 0x9C, 0x43, 0xE7,
+	0xA9, 0x80, 0x43, 0xE7, 0xA9, 0x8A, 0x43, 0xE7,
+	0xA9, 0x8F, 0x43, 0xE7, 0xA9, 0xB4, 0x43, 0xE7,
+	0xA9, 0xBA, 0x43, 0xE7, 0xAA, 0x81, 0x43, 0xE7,
+	0xAA, 0xB1, 0x43, 0xE7, 0xAB, 0x8B, 0x43, 0xE7,
+	0xAB, 0xAE, 0x43, 0xE7, 0xAB, 0xB9, 0x43, 0xE7,
+	// Bytes 11c0 - 11ff
+	0xAC, 0xA0, 0x43, 0xE7, 0xAE, 0x8F, 0x43, 0xE7,
+	0xAF, 0x80, 0x43, 0xE7, 0xAF, 0x86, 0x43, 0xE7,
+	0xAF, 0x89, 0x43, 0xE7, 0xB0, 0xBE, 0x43, 0xE7,
+	0xB1, 0xA0, 0x43, 0xE7, 0xB1, 0xB3, 0x43, 0xE7,
+	0xB1, 0xBB, 0x43, 0xE7, 0xB2, 0x92, 0x43, 0xE7,
+	0xB2, 0xBE, 0x43, 0xE7, 0xB3, 0x92, 0x43, 0xE7,
+	0xB3, 0x96, 0x43, 0xE7, 0xB3, 0xA3, 0x43, 0xE7,
+	0xB3, 0xA7, 0x43, 0xE7, 0xB3, 0xA8, 0x43, 0xE7,
+	// Bytes 1200 - 123f
+	0xB3, 0xB8, 0x43, 0xE7, 0xB4, 0x80, 0x43, 0xE7,
+	0xB4, 0x90, 0x43, 0xE7, 0xB4, 0xA2, 0x43, 0xE7,
+	0xB4, 0xAF, 0x43, 0xE7, 0xB5, 0x82, 0x43, 0xE7,
+	0xB5, 0x9B, 0x43, 0xE7, 0xB5, 0xA3, 0x43, 0xE7,
+	0xB6, 0xA0, 0x43, 0xE7, 0xB6, 0xBE, 0x43, 0xE7,
+	0xB7, 0x87, 0x43, 0xE7, 0xB7, 0xB4, 0x43, 0xE7,
+	0xB8, 0x82, 0x43, 0xE7, 0xB8, 0x89, 0x43, 0xE7,
+	0xB8, 0xB7, 0x43, 0xE7, 0xB9, 0x81, 0x43, 0xE7,
+	// Bytes 1240 - 127f
+	0xB9, 0x85, 0x43, 0xE7, 0xBC, 0xB6, 0x43, 0xE7,
+	0xBC, 0xBE, 0x43, 0xE7, 0xBD, 0x91, 0x43, 0xE7,
+	0xBD, 0xB2, 0x43, 0xE7, 0xBD, 0xB9, 0x43, 0xE7,
+	0xBD, 0xBA, 0x43, 0xE7, 0xBE, 0x85, 0x43, 0xE7,
+	0xBE, 0x8A, 0x43, 0xE7, 0xBE, 0x95, 0x43, 0xE7,
+	0xBE, 0x9A, 0x43, 0xE7, 0xBE, 0xBD, 0x43, 0xE7,
+	0xBF, 0xBA, 0x43, 0xE8, 0x80, 0x81, 0x43, 0xE8,
+	0x80, 0x85, 0x43, 0xE8, 0x80, 0x8C, 0x43, 0xE8,
+	// Bytes 1280 - 12bf
+	0x80, 0x92, 0x43, 0xE8, 0x80, 0xB3, 0x43, 0xE8,
+	0x81, 0x86, 0x43, 0xE8, 0x81, 0xA0, 0x43, 0xE8,
+	0x81, 0xAF, 0x43, 0xE8, 0x81, 0xB0, 0x43, 0xE8,
+	0x81, 0xBE, 0x43, 0xE8, 0x81, 0xBF, 0x43, 0xE8,
+	0x82, 0x89, 0x43, 0xE8, 0x82, 0x8B, 0x43, 0xE8,
+	0x82, 0xAD, 0x43, 0xE8, 0x82, 0xB2, 0x43, 0xE8,
+	0x84, 0x83, 0x43, 0xE8, 0x84, 0xBE, 0x43, 0xE8,
+	0x87, 0x98, 0x43, 0xE8, 0x87, 0xA3, 0x43, 0xE8,
+	// Bytes 12c0 - 12ff
+	0x87, 0xA8, 0x43, 0xE8, 0x87, 0xAA, 0x43, 0xE8,
+	0x87, 0xAD, 0x43, 0xE8, 0x87, 0xB3, 0x43, 0xE8,
+	0x87, 0xBC, 0x43, 0xE8, 0x88, 0x81, 0x43, 0xE8,
+	0x88, 0x84, 0x43, 0xE8, 0x88, 0x8C, 0x43, 0xE8,
+	0x88, 0x98, 0x43, 0xE8, 0x88, 0x9B, 0x43, 0xE8,
+	0x88, 0x9F, 0x43, 0xE8, 0x89, 0xAE, 0x43, 0xE8,
+	0x89, 0xAF, 0x43, 0xE8, 0x89, 0xB2, 0x43, 0xE8,
+	0x89, 0xB8, 0x43, 0xE8, 0x89, 0xB9, 0x43, 0xE8,
+	// Bytes 1300 - 133f
+	0x8A, 0x8B, 0x43, 0xE8, 0x8A, 0x91, 0x43, 0xE8,
+	0x8A, 0x9D, 0x43, 0xE8, 0x8A, 0xB1, 0x43, 0xE8,
+	0x8A, 0xB3, 0x43, 0xE8, 0x8A, 0xBD, 0x43, 0xE8,
+	0x8B, 0xA5, 0x43, 0xE8, 0x8B, 0xA6, 0x43, 0xE8,
+	0x8C, 0x9D, 0x43, 0xE8, 0x8C, 0xA3, 0x43, 0xE8,
+	0x8C, 0xB6, 0x43, 0xE8, 0x8D, 0x92, 0x43, 0xE8,
+	0x8D, 0x93, 0x43, 0xE8, 0x8D, 0xA3, 0x43, 0xE8,
+	0x8E, 0xAD, 0x43, 0xE8, 0x8E, 0xBD, 0x43, 0xE8,
+	// Bytes 1340 - 137f
+	0x8F, 0x89, 0x43, 0xE8, 0x8F, 0x8A, 0x43, 0xE8,
+	0x8F, 0x8C, 0x43, 0xE8, 0x8F, 0x9C, 0x43, 0xE8,
+	0x8F, 0xA7, 0x43, 0xE8, 0x8F, 0xAF, 0x43, 0xE8,
+	0x8F, 0xB1, 0x43, 0xE8, 0x90, 0xBD, 0x43, 0xE8,
+	0x91, 0x89, 0x43, 0xE8, 0x91, 0x97, 0x43, 0xE8,
+	0x93, 0xAE, 0x43, 0xE8, 0x93, 0xB1, 0x43, 0xE8,
+	0x93, 0xB3, 0x43, 0xE8, 0x93, 0xBC, 0x43, 0xE8,
+	0x94, 0x96, 0x43, 0xE8, 0x95, 0xA4, 0x43, 0xE8,
+	// Bytes 1380 - 13bf
+	0x97, 0x8D, 0x43, 0xE8, 0x97, 0xBA, 0x43, 0xE8,
+	0x98, 0x86, 0x43, 0xE8, 0x98, 0x92, 0x43, 0xE8,
+	0x98, 0xAD, 0x43, 0xE8, 0x98, 0xBF, 0x43, 0xE8,
+	0x99, 0x8D, 0x43, 0xE8, 0x99, 0x90, 0x43, 0xE8,
+	0x99, 0x9C, 0x43, 0xE8, 0x99, 0xA7, 0x43, 0xE8,
+	0x99, 0xA9, 0x43, 0xE8, 0x99, 0xAB, 0x43, 0xE8,
+	0x9A, 0x88, 0x43, 0xE8, 0x9A, 0xA9, 0x43, 0xE8,
+	0x9B, 0xA2, 0x43, 0xE8, 0x9C, 0x8E, 0x43, 0xE8,
+	// Bytes 13c0 - 13ff
+	0x9C, 0xA8, 0x43, 0xE8, 0x9D, 0xAB, 0x43, 0xE8,
+	0x9D, 0xB9, 0x43, 0xE8, 0x9E, 0x86, 0x43, 0xE8,
+	0x9E, 0xBA, 0x43, 0xE8, 0x9F, 0xA1, 0x43, 0xE8,
+	0xA0, 0x81, 0x43, 0xE8, 0xA0, 0x9F, 0x43, 0xE8,
+	0xA1, 0x80, 0x43, 0xE8, 0xA1, 0x8C, 0x43, 0xE8,
+	0xA1, 0xA0, 0x43, 0xE8, 0xA1, 0xA3, 0x43, 0xE8,
+	0xA3, 0x82, 0x43, 0xE8, 0xA3, 0x8F, 0x43, 0xE8,
+	0xA3, 0x97, 0x43, 0xE8, 0xA3, 0x9E, 0x43, 0xE8,
+	// Bytes 1400 - 143f
+	0xA3, 0xA1, 0x43, 0xE8, 0xA3, 0xB8, 0x43, 0xE8,
+	0xA3, 0xBA, 0x43, 0xE8, 0xA4, 0x90, 0x43, 0xE8,
+	0xA5, 0x81, 0x43, 0xE8, 0xA5, 0xA4, 0x43, 0xE8,
+	0xA5, 0xBE, 0x43, 0xE8, 0xA6, 0x86, 0x43, 0xE8,
+	0xA6, 0x8B, 0x43, 0xE8, 0xA6, 0x96, 0x43, 0xE8,
+	0xA7, 0x92, 0x43, 0xE8, 0xA7, 0xA3, 0x43, 0xE8,
+	0xA8, 0x80, 0x43, 0xE8, 0xAA, 0xA0, 0x43, 0xE8,
+	0xAA, 0xAA, 0x43, 0xE8, 0xAA, 0xBF, 0x43, 0xE8,
+	// Bytes 1440 - 147f
+	0xAB, 0x8B, 0x43, 0xE8, 0xAB, 0x92, 0x43, 0xE8,
+	0xAB, 0x96, 0x43, 0xE8, 0xAB, 0xAD, 0x43, 0xE8,
+	0xAB, 0xB8, 0x43, 0xE8, 0xAB, 0xBE, 0x43, 0xE8,
+	0xAC, 0x81, 0x43, 0xE8, 0xAC, 0xB9, 0x43, 0xE8,
+	0xAD, 0x98, 0x43, 0xE8, 0xAE, 0x80, 0x43, 0xE8,
+	0xAE, 0x8A, 0x43, 0xE8, 0xB0, 0xB7, 0x43, 0xE8,
+	0xB1, 0x86, 0x43, 0xE8, 0xB1, 0x88, 0x43, 0xE8,
+	0xB1, 0x95, 0x43, 0xE8, 0xB1, 0xB8, 0x43, 0xE8,
+	// Bytes 1480 - 14bf
+	0xB2, 0x9D, 0x43, 0xE8, 0xB2, 0xA1, 0x43, 0xE8,
+	0xB2, 0xA9, 0x43, 0xE8, 0xB2, 0xAB, 0x43, 0xE8,
+	0xB3, 0x81, 0x43, 0xE8, 0xB3, 0x82, 0x43, 0xE8,
+	0xB3, 0x87, 0x43, 0xE8, 0xB3, 0x88, 0x43, 0xE8,
+	0xB3, 0x93, 0x43, 0xE8, 0xB4, 0x88, 0x43, 0xE8,
+	0xB4, 0x9B, 0x43, 0xE8, 0xB5, 0xA4, 0x43, 0xE8,
+	0xB5, 0xB0, 0x43, 0xE8, 0xB5, 0xB7, 0x43, 0xE8,
+	0xB6, 0xB3, 0x43, 0xE8, 0xB6, 0xBC, 0x43, 0xE8,
+	// Bytes 14c0 - 14ff
+	0xB7, 0x8B, 0x43, 0xE8, 0xB7, 0xAF, 0x43, 0xE8,
+	0xB7, 0xB0, 0x43, 0xE8, 0xBA, 0xAB, 0x43, 0xE8,
+	0xBB, 0x8A, 0x43, 0xE8, 0xBB, 0x94, 0x43, 0xE8,
+	0xBC, 0xA6, 0x43, 0xE8, 0xBC, 0xAA, 0x43, 0xE8,
+	0xBC, 0xB8, 0x43, 0xE8, 0xBC, 0xBB, 0x43, 0xE8,
+	0xBD, 0xA2, 0x43, 0xE8, 0xBE, 0x9B, 0x43, 0xE8,
+	0xBE, 0x9E, 0x43, 0xE8, 0xBE, 0xB0, 0x43, 0xE8,
+	0xBE, 0xB5, 0x43, 0xE8, 0xBE, 0xB6, 0x43, 0xE9,
+	// Bytes 1500 - 153f
+	0x80, 0xA3, 0x43, 0xE9, 0x80, 0xB8, 0x43, 0xE9,
+	0x81, 0x8A, 0x43, 0xE9, 0x81, 0xA9, 0x43, 0xE9,
+	0x81, 0xB2, 0x43, 0xE9, 0x81, 0xBC, 0x43, 0xE9,
+	0x82, 0x8F, 0x43, 0xE9, 0x82, 0x91, 0x43, 0xE9,
+	0x82, 0x94, 0x43, 0xE9, 0x83, 0x8E, 0x43, 0xE9,
+	0x83, 0x9E, 0x43, 0xE9, 0x83, 0xB1, 0x43, 0xE9,
+	0x83, 0xBD, 0x43, 0xE9, 0x84, 0x91, 0x43, 0xE9,
+	0x84, 0x9B, 0x43, 0xE9, 0x85, 0x89, 0x43, 0xE9,
+	// Bytes 1540 - 157f
+	0x85, 0x8D, 0x43, 0xE9, 0x85, 0xAA, 0x43, 0xE9,
+	0x86, 0x99, 0x43, 0xE9, 0x86, 0xB4, 0x43, 0xE9,
+	0x87, 0x86, 0x43, 0xE9, 0x87, 0x8C, 0x43, 0xE9,
+	0x87, 0x8F, 0x43, 0xE9, 0x87, 0x91, 0x43, 0xE9,
+	0x88, 0xB4, 0x43, 0xE9, 0x88, 0xB8, 0x43, 0xE9,
+	0x89, 0xB6, 0x43, 0xE9, 0x89, 0xBC, 0x43, 0xE9,
+	0x8B, 0x97, 0x43, 0xE9, 0x8B, 0x98, 0x43, 0xE9,
+	0x8C, 0x84, 0x43, 0xE9, 0x8D, 0x8A, 0x43, 0xE9,
+	// Bytes 1580 - 15bf
+	0x8F, 0xB9, 0x43, 0xE9, 0x90, 0x95, 0x43, 0xE9,
+	0x95, 0xB7, 0x43, 0xE9, 0x96, 0x80, 0x43, 0xE9,
+	0x96, 0x8B, 0x43, 0xE9, 0x96, 0xAD, 0x43, 0xE9,
+	0x96, 0xB7, 0x43, 0xE9, 0x98, 0x9C, 0x43, 0xE9,
+	0x98, 0xAE, 0x43, 0xE9, 0x99, 0x8B, 0x43, 0xE9,
+	0x99, 0x8D, 0x43, 0xE9, 0x99, 0xB5, 0x43, 0xE9,
+	0x99, 0xB8, 0x43, 0xE9, 0x99, 0xBC, 0x43, 0xE9,
+	0x9A, 0x86, 0x43, 0xE9, 0x9A, 0xA3, 0x43, 0xE9,
+	// Bytes 15c0 - 15ff
+	0x9A, 0xB6, 0x43, 0xE9, 0x9A, 0xB7, 0x43, 0xE9,
+	0x9A, 0xB8, 0x43, 0xE9, 0x9A, 0xB9, 0x43, 0xE9,
+	0x9B, 0x83, 0x43, 0xE9, 0x9B, 0xA2, 0x43, 0xE9,
+	0x9B, 0xA3, 0x43, 0xE9, 0x9B, 0xA8, 0x43, 0xE9,
+	0x9B, 0xB6, 0x43, 0xE9, 0x9B, 0xB7, 0x43, 0xE9,
+	0x9C, 0xA3, 0x43, 0xE9, 0x9C, 0xB2, 0x43, 0xE9,
+	0x9D, 0x88, 0x43, 0xE9, 0x9D, 0x91, 0x43, 0xE9,
+	0x9D, 0x96, 0x43, 0xE9, 0x9D, 0x9E, 0x43, 0xE9,
+	// Bytes 1600 - 163f
+	0x9D, 0xA2, 0x43, 0xE9, 0x9D, 0xA9, 0x43, 0xE9,
+	0x9F, 0x8B, 0x43, 0xE9, 0x9F, 0x9B, 0x43, 0xE9,
+	0x9F, 0xA0, 0x43, 0xE9, 0x9F, 0xAD, 0x43, 0xE9,
+	0x9F, 0xB3, 0x43, 0xE9, 0x9F, 0xBF, 0x43, 0xE9,
+	0xA0, 0x81, 0x43, 0xE9, 0xA0, 0x85, 0x43, 0xE9,
+	0xA0, 0x8B, 0x43, 0xE9, 0xA0, 0x98, 0x43, 0xE9,
+	0xA0, 0xA9, 0x43, 0xE9, 0xA0, 0xBB, 0x43, 0xE9,
+	0xA1, 0x9E, 0x43, 0xE9, 0xA2, 0xA8, 0x43, 0xE9,
+	// Bytes 1640 - 167f
+	0xA3, 0x9B, 0x43, 0xE9, 0xA3, 0x9F, 0x43, 0xE9,
+	0xA3, 0xA2, 0x43, 0xE9, 0xA3, 0xAF, 0x43, 0xE9,
+	0xA3, 0xBC, 0x43, 0xE9, 0xA4, 0xA8, 0x43, 0xE9,
+	0xA4, 0xA9, 0x43, 0xE9, 0xA6, 0x96, 0x43, 0xE9,
+	0xA6, 0x99, 0x43, 0xE9, 0xA6, 0xA7, 0x43, 0xE9,
+	0xA6, 0xAC, 0x43, 0xE9, 0xA7, 0x82, 0x43, 0xE9,
+	0xA7, 0xB1, 0x43, 0xE9, 0xA7, 0xBE, 0x43, 0xE9,
+	0xA9, 0xAA, 0x43, 0xE9, 0xAA, 0xA8, 0x43, 0xE9,
+	// Bytes 1680 - 16bf
+	0xAB, 0x98, 0x43, 0xE9, 0xAB, 0x9F, 0x43, 0xE9,
+	0xAC, 0x92, 0x43, 0xE9, 0xAC, 0xA5, 0x43, 0xE9,
+	0xAC, 0xAF, 0x43, 0xE9, 0xAC, 0xB2, 0x43, 0xE9,
+	0xAC, 0xBC, 0x43, 0xE9, 0xAD, 0x9A, 0x43, 0xE9,
+	0xAD, 0xAF, 0x43, 0xE9, 0xB1, 0x80, 0x43, 0xE9,
+	0xB1, 0x97, 0x43, 0xE9, 0xB3, 0xA5, 0x43, 0xE9,
+	0xB3, 0xBD, 0x43, 0xE9, 0xB5, 0xA7, 0x43, 0xE9,
+	0xB6, 0xB4, 0x43, 0xE9, 0xB7, 0xBA, 0x43, 0xE9,
+	// Bytes 16c0 - 16ff
+	0xB8, 0x9E, 0x43, 0xE9, 0xB9, 0xB5, 0x43, 0xE9,
+	0xB9, 0xBF, 0x43, 0xE9, 0xBA, 0x97, 0x43, 0xE9,
+	0xBA, 0x9F, 0x43, 0xE9, 0xBA, 0xA5, 0x43, 0xE9,
+	0xBA, 0xBB, 0x43, 0xE9, 0xBB, 0x83, 0x43, 0xE9,
+	0xBB, 0x8D, 0x43, 0xE9, 0xBB, 0x8E, 0x43, 0xE9,
+	0xBB, 0x91, 0x43, 0xE9, 0xBB, 0xB9, 0x43, 0xE9,
+	0xBB, 0xBD, 0x43, 0xE9, 0xBB, 0xBE, 0x43, 0xE9,
+	0xBC, 0x85, 0x43, 0xE9, 0xBC, 0x8E, 0x43, 0xE9,
+	// Bytes 1700 - 173f
+	0xBC, 0x8F, 0x43, 0xE9, 0xBC, 0x93, 0x43, 0xE9,
+	0xBC, 0x96, 0x43, 0xE9, 0xBC, 0xA0, 0x43, 0xE9,
+	0xBC, 0xBB, 0x43, 0xE9, 0xBD, 0x83, 0x43, 0xE9,
+	0xBD, 0x8A, 0x43, 0xE9, 0xBD, 0x92, 0x43, 0xE9,
+	0xBE, 0x8D, 0x43, 0xE9, 0xBE, 0x8E, 0x43, 0xE9,
+	0xBE, 0x9C, 0x43, 0xE9, 0xBE, 0x9F, 0x43, 0xE9,
+	0xBE, 0xA0, 0x43, 0xEA, 0x99, 0x91, 0x43, 0xEA,
+	0x9A, 0x89, 0x43, 0xEA, 0x9C, 0xA7, 0x43, 0xEA,
+	// Bytes 1740 - 177f
+	0x9D, 0xAF, 0x43, 0xEA, 0x9E, 0x8E, 0x43, 0xEA,
+	0xAC, 0xB7, 0x43, 0xEA, 0xAD, 0x92, 0x43, 0xEA,
+	0xAD, 0xA6, 0x43, 0xEA, 0xAD, 0xA7, 0x44, 0xF0,
+	0x9D, 0xBC, 0x84, 0x44, 0xF0, 0x9D, 0xBC, 0x85,
+	0x44, 0xF0, 0x9D, 0xBC, 0x86, 0x44, 0xF0, 0x9D,
+	0xBC, 0x88, 0x44, 0xF0, 0x9D, 0xBC, 0x8A, 0x44,
+	0xF0, 0x9D, 0xBC, 0x9E, 0x44, 0xF0, 0xA0, 0x84,
+	0xA2, 0x44, 0xF0, 0xA0, 0x94, 0x9C, 0x44, 0xF0,
+	// Bytes 1780 - 17bf
+	0xA0, 0x94, 0xA5, 0x44, 0xF0, 0xA0, 0x95, 0x8B,
+	0x44, 0xF0, 0xA0, 0x98, 0xBA, 0x44, 0xF0, 0xA0,
+	0xA0, 0x84, 0x44, 0xF0, 0xA0, 0xA3, 0x9E, 0x44,
+	0xF0, 0xA0, 0xA8, 0xAC, 0x44, 0xF0, 0xA0, 0xAD,
+	0xA3, 0x44, 0xF0, 0xA1, 0x93, 0xA4, 0x44, 0xF0,
+	0xA1, 0x9A, 0xA8, 0x44, 0xF0, 0xA1, 0x9B, 0xAA,
+	0x44, 0xF0, 0xA1, 0xA7, 0x88, 0x44, 0xF0, 0xA1,
+	0xAC, 0x98, 0x44, 0xF0, 0xA1, 0xB4, 0x8B, 0x44,
+	// Bytes 17c0 - 17ff
+	0xF0, 0xA1, 0xB7, 0xA4, 0x44, 0xF0, 0xA1, 0xB7,
+	0xA6, 0x44, 0xF0, 0xA2, 0x86, 0x83, 0x44, 0xF0,
+	0xA2, 0x86, 0x9F, 0x44, 0xF0, 0xA2, 0x8C, 0xB1,
+	0x44, 0xF0, 0xA2, 0x9B, 0x94, 0x44, 0xF0, 0xA2,
+	0xA1, 0x84, 0x44, 0xF0, 0xA2, 0xA1, 0x8A, 0x44,
+	0xF0, 0xA2, 0xAC, 0x8C, 0x44, 0xF0, 0xA2, 0xAF,
+	0xB1, 0x44, 0xF0, 0xA3, 0x80, 0x8A, 0x44, 0xF0,
+	0xA3, 0x8A, 0xB8, 0x44, 0xF0, 0xA3, 0x8D, 0x9F,
+	// Bytes 1800 - 183f
+	0x44, 0xF0, 0xA3, 0x8E, 0x93, 0x44, 0xF0, 0xA3,
+	0x8E, 0x9C, 0x44, 0xF0, 0xA3, 0x8F, 0x83, 0x44,
+	0xF0, 0xA3, 0x8F, 0x95, 0x44, 0xF0, 0xA3, 0x91,
+	0xAD, 0x44, 0xF0, 0xA3, 0x9A, 0xA3, 0x44, 0xF0,
+	0xA3, 0xA2, 0xA7, 0x44, 0xF0, 0xA3, 0xAA, 0x8D,
+	0x44, 0xF0, 0xA3, 0xAB, 0xBA, 0x44, 0xF0, 0xA3,
+	0xB2, 0xBC, 0x44, 0xF0, 0xA3, 0xB4, 0x9E, 0x44,
+	0xF0, 0xA3, 0xBB, 0x91, 0x44, 0xF0, 0xA3, 0xBD,
+	// Bytes 1840 - 187f
+	0x9E, 0x44, 0xF0, 0xA3, 0xBE, 0x8E, 0x44, 0xF0,
+	0xA4, 0x89, 0xA3, 0x44, 0xF0, 0xA4, 0x8B, 0xAE,
+	0x44, 0xF0, 0xA4, 0x8E, 0xAB, 0x44, 0xF0, 0xA4,
+	0x98, 0x88, 0x44, 0xF0, 0xA4, 0x9C, 0xB5, 0x44,
+	0xF0, 0xA4, 0xA0, 0x94, 0x44, 0xF0, 0xA4, 0xB0,
+	0xB6, 0x44, 0xF0, 0xA4, 0xB2, 0x92, 0x44, 0xF0,
+	0xA4, 0xBE, 0xA1, 0x44, 0xF0, 0xA4, 0xBE, 0xB8,
+	0x44, 0xF0, 0xA5, 0x81, 0x84, 0x44, 0xF0, 0xA5,
+	// Bytes 1880 - 18bf
+	0x83, 0xB2, 0x44, 0xF0, 0xA5, 0x83, 0xB3, 0x44,
+	0xF0, 0xA5, 0x84, 0x99, 0x44, 0xF0, 0xA5, 0x84,
+	0xB3, 0x44, 0xF0, 0xA5, 0x89, 0x89, 0x44, 0xF0,
+	0xA5, 0x90, 0x9D, 0x44, 0xF0, 0xA5, 0x98, 0xA6,
+	0x44, 0xF0, 0xA5, 0x9A, 0x9A, 0x44, 0xF0, 0xA5,
+	0x9B, 0x85, 0x44, 0xF0, 0xA5, 0xA5, 0xBC, 0x44,
+	0xF0, 0xA5, 0xAA, 0xA7, 0x44, 0xF0, 0xA5, 0xAE,
+	0xAB, 0x44, 0xF0, 0xA5, 0xB2, 0x80, 0x44, 0xF0,
+	// Bytes 18c0 - 18ff
+	0xA5, 0xB3, 0x90, 0x44, 0xF0, 0xA5, 0xBE, 0x86,
+	0x44, 0xF0, 0xA6, 0x87, 0x9A, 0x44, 0xF0, 0xA6,
+	0x88, 0xA8, 0x44, 0xF0, 0xA6, 0x89, 0x87, 0x44,
+	0xF0, 0xA6, 0x8B, 0x99, 0x44, 0xF0, 0xA6, 0x8C,
+	0xBE, 0x44, 0xF0, 0xA6, 0x93, 0x9A, 0x44, 0xF0,
+	0xA6, 0x94, 0xA3, 0x44, 0xF0, 0xA6, 0x96, 0xA8,
+	0x44, 0xF0, 0xA6, 0x9E, 0xA7, 0x44, 0xF0, 0xA6,
+	0x9E, 0xB5, 0x44, 0xF0, 0xA6, 0xAC, 0xBC, 0x44,
+	// Bytes 1900 - 193f
+	0xF0, 0xA6, 0xB0, 0xB6, 0x44, 0xF0, 0xA6, 0xB3,
+	0x95, 0x44, 0xF0, 0xA6, 0xB5, 0xAB, 0x44, 0xF0,
+	0xA6, 0xBC, 0xAC, 0x44, 0xF0, 0xA6, 0xBE, 0xB1,
+	0x44, 0xF0, 0xA7, 0x83, 0x92, 0x44, 0xF0, 0xA7,
+	0x8F, 0x8A, 0x44, 0xF0, 0xA7, 0x99, 0xA7, 0x44,
+	0xF0, 0xA7, 0xA2, 0xAE, 0x44, 0xF0, 0xA7, 0xA5,
+	0xA6, 0x44, 0xF0, 0xA7, 0xB2, 0xA8, 0x44, 0xF0,
+	0xA7, 0xBB, 0x93, 0x44, 0xF0, 0xA7, 0xBC, 0xAF,
+	// Bytes 1940 - 197f
+	0x44, 0xF0, 0xA8, 0x97, 0x92, 0x44, 0xF0, 0xA8,
+	0x97, 0xAD, 0x44, 0xF0, 0xA8, 0x9C, 0xAE, 0x44,
+	0xF0, 0xA8, 0xAF, 0xBA, 0x44, 0xF0, 0xA8, 0xB5,
+	0xB7, 0x44, 0xF0, 0xA9, 0x85, 0x85, 0x44, 0xF0,
+	0xA9, 0x87, 0x9F, 0x44, 0xF0, 0xA9, 0x88, 0x9A,
+	0x44, 0xF0, 0xA9, 0x90, 0x8A, 0x44, 0xF0, 0xA9,
+	0x92, 0x96, 0x44, 0xF0, 0xA9, 0x96, 0xB6, 0x44,
+	0xF0, 0xA9, 0xAC, 0xB0, 0x44, 0xF0, 0xAA, 0x83,
+	// Bytes 1980 - 19bf
+	0x8E, 0x44, 0xF0, 0xAA, 0x84, 0x85, 0x44, 0xF0,
+	0xAA, 0x88, 0x8E, 0x44, 0xF0, 0xAA, 0x8A, 0x91,
+	0x44, 0xF0, 0xAA, 0x8E, 0x92, 0x44, 0xF0, 0xAA,
+	0x98, 0x80, 0x42, 0x21, 0x21, 0x42, 0x21, 0x3F,
+	0x42, 0x2E, 0x2E, 0x42, 0x30, 0x2C, 0x42, 0x30,
+	0x2E, 0x42, 0x31, 0x2C, 0x42, 0x31, 0x2E, 0x42,
+	0x31, 0x30, 0x42, 0x31, 0x31, 0x42, 0x31, 0x32,
+	0x42, 0x31, 0x33, 0x42, 0x31, 0x34, 0x42, 0x31,
+	// Bytes 19c0 - 19ff
+	0x35, 0x42, 0x31, 0x36, 0x42, 0x31, 0x37, 0x42,
+	0x31, 0x38, 0x42, 0x31, 0x39, 0x42, 0x32, 0x2C,
+	0x42, 0x32, 0x2E, 0x42, 0x32, 0x30, 0x42, 0x32,
+	0x31, 0x42, 0x32, 0x32, 0x42, 0x32, 0x33, 0x42,
+	0x32, 0x34, 0x42, 0x32, 0x35, 0x42, 0x32, 0x36,
+	0x42, 0x32, 0x37, 0x42, 0x32, 0x38, 0x42, 0x32,
+	0x39, 0x42, 0x33, 0x2C, 0x42, 0x33, 0x2E, 0x42,
+	0x33, 0x30, 0x42, 0x33, 0x31, 0x42, 0x33, 0x32,
+	// Bytes 1a00 - 1a3f
+	0x42, 0x33, 0x33, 0x42, 0x33, 0x34, 0x42, 0x33,
+	0x35, 0x42, 0x33, 0x36, 0x42, 0x33, 0x37, 0x42,
+	0x33, 0x38, 0x42, 0x33, 0x39, 0x42, 0x34, 0x2C,
+	0x42, 0x34, 0x2E, 0x42, 0x34, 0x30, 0x42, 0x34,
+	0x31, 0x42, 0x34, 0x32, 0x42, 0x34, 0x33, 0x42,
+	0x34, 0x34, 0x42, 0x34, 0x35, 0x42, 0x34, 0x36,
+	0x42, 0x34, 0x37, 0x42, 0x34, 0x38, 0x42, 0x34,
+	0x39, 0x42, 0x35, 0x2C, 0x42, 0x35, 0x2E, 0x42,
+	// Bytes 1a40 - 1a7f
+	0x35, 0x30, 0x42, 0x36, 0x2C, 0x42, 0x36, 0x2E,
+	0x42, 0x37, 0x2C, 0x42, 0x37, 0x2E, 0x42, 0x38,
+	0x2C, 0x42, 0x38, 0x2E, 0x42, 0x39, 0x2C, 0x42,
+	0x39, 0x2E, 0x42, 0x3D, 0x3D, 0x42, 0x3F, 0x21,
+	0x42, 0x3F, 0x3F, 0x42, 0x41, 0x55, 0x42, 0x42,
+	0x71, 0x42, 0x43, 0x44, 0x42, 0x44, 0x4A, 0x42,
+	0x44, 0x5A, 0x42, 0x44, 0x7A, 0x42, 0x47, 0x42,
+	0x42, 0x47, 0x79, 0x42, 0x48, 0x50, 0x42, 0x48,
+	// Bytes 1a80 - 1abf
+	0x56, 0x42, 0x48, 0x67, 0x42, 0x48, 0x7A, 0x42,
+	0x49, 0x49, 0x42, 0x49, 0x4A, 0x42, 0x49, 0x55,
+	0x42, 0x49, 0x56, 0x42, 0x49, 0x58, 0x42, 0x4B,
+	0x42, 0x42, 0x4B, 0x4B, 0x42, 0x4B, 0x4D, 0x42,
+	0x4C, 0x4A, 0x42, 0x4C, 0x6A, 0x42, 0x4D, 0x42,
+	0x42, 0x4D, 0x43, 0x42, 0x4D, 0x44, 0x42, 0x4D,
+	0x52, 0x42, 0x4D, 0x56, 0x42, 0x4D, 0x57, 0x42,
+	0x4E, 0x4A, 0x42, 0x4E, 0x6A, 0x42, 0x4E, 0x6F,
+	// Bytes 1ac0 - 1aff
+	0x42, 0x50, 0x48, 0x42, 0x50, 0x52, 0x42, 0x50,
+	0x61, 0x42, 0x52, 0x73, 0x42, 0x53, 0x44, 0x42,
+	0x53, 0x4D, 0x42, 0x53, 0x53, 0x42, 0x53, 0x76,
+	0x42, 0x54, 0x4D, 0x42, 0x56, 0x49, 0x42, 0x57,
+	0x43, 0x42, 0x57, 0x5A, 0x42, 0x57, 0x62, 0x42,
+	0x58, 0x49, 0x42, 0x63, 0x63, 0x42, 0x63, 0x64,
+	0x42, 0x63, 0x6D, 0x42, 0x64, 0x42, 0x42, 0x64,
+	0x61, 0x42, 0x64, 0x6C, 0x42, 0x64, 0x6D, 0x42,
+	// Bytes 1b00 - 1b3f
+	0x64, 0x7A, 0x42, 0x65, 0x56, 0x42, 0x66, 0x66,
+	0x42, 0x66, 0x69, 0x42, 0x66, 0x6C, 0x42, 0x66,
+	0x6D, 0x42, 0x68, 0x61, 0x42, 0x69, 0x69, 0x42,
+	0x69, 0x6A, 0x42, 0x69, 0x6E, 0x42, 0x69, 0x76,
+	0x42, 0x69, 0x78, 0x42, 0x6B, 0x41, 0x42, 0x6B,
+	0x56, 0x42, 0x6B, 0x57, 0x42, 0x6B, 0x67, 0x42,
+	0x6B, 0x6C, 0x42, 0x6B, 0x6D, 0x42, 0x6B, 0x74,
+	0x42, 0x6C, 0x6A, 0x42, 0x6C, 0x6D, 0x42, 0x6C,
+	// Bytes 1b40 - 1b7f
+	0x6E, 0x42, 0x6C, 0x78, 0x42, 0x6D, 0x32, 0x42,
+	0x6D, 0x33, 0x42, 0x6D, 0x41, 0x42, 0x6D, 0x56,
+	0x42, 0x6D, 0x57, 0x42, 0x6D, 0x62, 0x42, 0x6D,
+	0x67, 0x42, 0x6D, 0x6C, 0x42, 0x6D, 0x6D, 0x42,
+	0x6D, 0x73, 0x42, 0x6E, 0x41, 0x42, 0x6E, 0x46,
+	0x42, 0x6E, 0x56, 0x42, 0x6E, 0x57, 0x42, 0x6E,
+	0x6A, 0x42, 0x6E, 0x6D, 0x42, 0x6E, 0x73, 0x42,
+	0x6F, 0x56, 0x42, 0x70, 0x41, 0x42, 0x70, 0x46,
+	// Bytes 1b80 - 1bbf
+	0x42, 0x70, 0x56, 0x42, 0x70, 0x57, 0x42, 0x70,
+	0x63, 0x42, 0x70, 0x73, 0x42, 0x73, 0x72, 0x42,
+	0x73, 0x74, 0x42, 0x76, 0x69, 0x42, 0x78, 0x69,
+	0x43, 0x28, 0x31, 0x29, 0x43, 0x28, 0x32, 0x29,
+	0x43, 0x28, 0x33, 0x29, 0x43, 0x28, 0x34, 0x29,
+	0x43, 0x28, 0x35, 0x29, 0x43, 0x28, 0x36, 0x29,
+	0x43, 0x28, 0x37, 0x29, 0x43, 0x28, 0x38, 0x29,
+	0x43, 0x28, 0x39, 0x29, 0x43, 0x28, 0x41, 0x29,
+	// Bytes 1bc0 - 1bff
+	0x43, 0x28, 0x42, 0x29, 0x43, 0x28, 0x43, 0x29,
+	0x43, 0x28, 0x44, 0x29, 0x43, 0x28, 0x45, 0x29,
+	0x43, 0x28, 0x46, 0x29, 0x43, 0x28, 0x47, 0x29,
+	0x43, 0x28, 0x48, 0x29, 0x43, 0x28, 0x49, 0x29,
+	0x43, 0x28, 0x4A, 0x29, 0x43, 0x28, 0x4B, 0x29,
+	0x43, 0x28, 0x4C, 0x29, 0x43, 0x28, 0x4D, 0x29,
+	0x43, 0x28, 0x4E, 0x29, 0x43, 0x28, 0x4F, 0x29,
+	0x43, 0x28, 0x50, 0x29, 0x43, 0x28, 0x51, 0x29,
+	// Bytes 1c00 - 1c3f
+	0x43, 0x28, 0x52, 0x29, 0x43, 0x28, 0x53, 0x29,
+	0x43, 0x28, 0x54, 0x29, 0x43, 0x28, 0x55, 0x29,
+	0x43, 0x28, 0x56, 0x29, 0x43, 0x28, 0x57, 0x29,
+	0x43, 0x28, 0x58, 0x29, 0x43, 0x28, 0x59, 0x29,
+	0x43, 0x28, 0x5A, 0x29, 0x43, 0x28, 0x61, 0x29,
+	0x43, 0x28, 0x62, 0x29, 0x43, 0x28, 0x63, 0x29,
+	0x43, 0x28, 0x64, 0x29, 0x43, 0x28, 0x65, 0x29,
+	0x43, 0x28, 0x66, 0x29, 0x43, 0x28, 0x67, 0x29,
+	// Bytes 1c40 - 1c7f
+	0x43, 0x28, 0x68, 0x29, 0x43, 0x28, 0x69, 0x29,
+	0x43, 0x28, 0x6A, 0x29, 0x43, 0x28, 0x6B, 0x29,
+	0x43, 0x28, 0x6C, 0x29, 0x43, 0x28, 0x6D, 0x29,
+	0x43, 0x28, 0x6E, 0x29, 0x43, 0x28, 0x6F, 0x29,
+	0x43, 0x28, 0x70, 0x29, 0x43, 0x28, 0x71, 0x29,
+	0x43, 0x28, 0x72, 0x29, 0x43, 0x28, 0x73, 0x29,
+	0x43, 0x28, 0x74, 0x29, 0x43, 0x28, 0x75, 0x29,
+	0x43, 0x28, 0x76, 0x29, 0x43, 0x28, 0x77, 0x29,
+	// Bytes 1c80 - 1cbf
+	0x43, 0x28, 0x78, 0x29, 0x43, 0x28, 0x79, 0x29,
+	0x43, 0x28, 0x7A, 0x29, 0x43, 0x2E, 0x2E, 0x2E,
+	0x43, 0x31, 0x30, 0x2E, 0x43, 0x31, 0x31, 0x2E,
+	0x43, 0x31, 0x32, 0x2E, 0x43, 0x31, 0x33, 0x2E,
+	0x43, 0x31, 0x34, 0x2E, 0x43, 0x31, 0x35, 0x2E,
+	0x43, 0x31, 0x36, 0x2E, 0x43, 0x31, 0x37, 0x2E,
+	0x43, 0x31, 0x38, 0x2E, 0x43, 0x31, 0x39, 0x2E,
+	0x43, 0x32, 0x30, 0x2E, 0x43, 0x3A, 0x3A, 0x3D,
+	// Bytes 1cc0 - 1cff
+	0x43, 0x3D, 0x3D, 0x3D, 0x43, 0x43, 0x6F, 0x2E,
+	0x43, 0x46, 0x41, 0x58, 0x43, 0x47, 0x48, 0x7A,
+	0x43, 0x47, 0x50, 0x61, 0x43, 0x49, 0x49, 0x49,
+	0x43, 0x4C, 0x54, 0x44, 0x43, 0x4C, 0xC2, 0xB7,
+	0x43, 0x4D, 0x48, 0x7A, 0x43, 0x4D, 0x50, 0x61,
+	0x43, 0x4D, 0xCE, 0xA9, 0x43, 0x50, 0x50, 0x4D,
+	0x43, 0x50, 0x50, 0x56, 0x43, 0x50, 0x54, 0x45,
+	0x43, 0x54, 0x45, 0x4C, 0x43, 0x54, 0x48, 0x7A,
+	// Bytes 1d00 - 1d3f
+	0x43, 0x56, 0x49, 0x49, 0x43, 0x58, 0x49, 0x49,
+	0x43, 0x61, 0x2F, 0x63, 0x43, 0x61, 0x2F, 0x73,
+	0x43, 0x61, 0xCA, 0xBE, 0x43, 0x62, 0x61, 0x72,
+	0x43, 0x63, 0x2F, 0x6F, 0x43, 0x63, 0x2F, 0x75,
+	0x43, 0x63, 0x61, 0x6C, 0x43, 0x63, 0x6D, 0x32,
+	0x43, 0x63, 0x6D, 0x33, 0x43, 0x64, 0x6D, 0x32,
+	0x43, 0x64, 0x6D, 0x33, 0x43, 0x65, 0x72, 0x67,
+	0x43, 0x66, 0x66, 0x69, 0x43, 0x66, 0x66, 0x6C,
+	// Bytes 1d40 - 1d7f
+	0x43, 0x67, 0x61, 0x6C, 0x43, 0x68, 0x50, 0x61,
+	0x43, 0x69, 0x69, 0x69, 0x43, 0x6B, 0x48, 0x7A,
+	0x43, 0x6B, 0x50, 0x61, 0x43, 0x6B, 0x6D, 0x32,
+	0x43, 0x6B, 0x6D, 0x33, 0x43, 0x6B, 0xCE, 0xA9,
+	0x43, 0x6C, 0x6F, 0x67, 0x43, 0x6C, 0xC2, 0xB7,
+	0x43, 0x6D, 0x69, 0x6C, 0x43, 0x6D, 0x6D, 0x32,
+	0x43, 0x6D, 0x6D, 0x33, 0x43, 0x6D, 0x6F, 0x6C,
+	0x43, 0x72, 0x61, 0x64, 0x43, 0x76, 0x69, 0x69,
+	// Bytes 1d80 - 1dbf
+	0x43, 0x78, 0x69, 0x69, 0x43, 0xC2, 0xB0, 0x43,
+	0x43, 0xC2, 0xB0, 0x46, 0x43, 0xCA, 0xBC, 0x6E,
+	0x43, 0xCE, 0xBC, 0x41, 0x43, 0xCE, 0xBC, 0x46,
+	0x43, 0xCE, 0xBC, 0x56, 0x43, 0xCE, 0xBC, 0x57,
+	0x43, 0xCE, 0xBC, 0x67, 0x43, 0xCE, 0xBC, 0x6C,
+	0x43, 0xCE, 0xBC, 0x6D, 0x43, 0xCE, 0xBC, 0x73,
+	0x44, 0x28, 0x31, 0x30, 0x29, 0x44, 0x28, 0x31,
+	0x31, 0x29, 0x44, 0x28, 0x31, 0x32, 0x29, 0x44,
+	// Bytes 1dc0 - 1dff
+	0x28, 0x31, 0x33, 0x29, 0x44, 0x28, 0x31, 0x34,
+	0x29, 0x44, 0x28, 0x31, 0x35, 0x29, 0x44, 0x28,
+	0x31, 0x36, 0x29, 0x44, 0x28, 0x31, 0x37, 0x29,
+	0x44, 0x28, 0x31, 0x38, 0x29, 0x44, 0x28, 0x31,
+	0x39, 0x29, 0x44, 0x28, 0x32, 0x30, 0x29, 0x44,
+	0x30, 0xE7, 0x82, 0xB9, 0x44, 0x31, 0xE2, 0x81,
+	0x84, 0x44, 0x31, 0xE6, 0x97, 0xA5, 0x44, 0x31,
+	0xE6, 0x9C, 0x88, 0x44, 0x31, 0xE7, 0x82, 0xB9,
+	// Bytes 1e00 - 1e3f
+	0x44, 0x32, 0xE6, 0x97, 0xA5, 0x44, 0x32, 0xE6,
+	0x9C, 0x88, 0x44, 0x32, 0xE7, 0x82, 0xB9, 0x44,
+	0x33, 0xE6, 0x97, 0xA5, 0x44, 0x33, 0xE6, 0x9C,
+	0x88, 0x44, 0x33, 0xE7, 0x82, 0xB9, 0x44, 0x34,
+	0xE6, 0x97, 0xA5, 0x44, 0x34, 0xE6, 0x9C, 0x88,
+	0x44, 0x34, 0xE7, 0x82, 0xB9, 0x44, 0x35, 0xE6,
+	0x97, 0xA5, 0x44, 0x35, 0xE6, 0x9C, 0x88, 0x44,
+	0x35, 0xE7, 0x82, 0xB9, 0x44, 0x36, 0xE6, 0x97,
+	// Bytes 1e40 - 1e7f
+	0xA5, 0x44, 0x36, 0xE6, 0x9C, 0x88, 0x44, 0x36,
+	0xE7, 0x82, 0xB9, 0x44, 0x37, 0xE6, 0x97, 0xA5,
+	0x44, 0x37, 0xE6, 0x9C, 0x88, 0x44, 0x37, 0xE7,
+	0x82, 0xB9, 0x44, 0x38, 0xE6, 0x97, 0xA5, 0x44,
+	0x38, 0xE6, 0x9C, 0x88, 0x44, 0x38, 0xE7, 0x82,
+	0xB9, 0x44, 0x39, 0xE6, 0x97, 0xA5, 0x44, 0x39,
+	0xE6, 0x9C, 0x88, 0x44, 0x39, 0xE7, 0x82, 0xB9,
+	0x44, 0x56, 0x49, 0x49, 0x49, 0x44, 0x61, 0x2E,
+	// Bytes 1e80 - 1ebf
+	0x6D, 0x2E, 0x44, 0x6B, 0x63, 0x61, 0x6C, 0x44,
+	0x70, 0x2E, 0x6D, 0x2E, 0x44, 0x76, 0x69, 0x69,
+	0x69, 0x44, 0xD5, 0xA5, 0xD6, 0x82, 0x44, 0xD5,
+	0xB4, 0xD5, 0xA5, 0x44, 0xD5, 0xB4, 0xD5, 0xAB,
+	0x44, 0xD5, 0xB4, 0xD5, 0xAD, 0x44, 0xD5, 0xB4,
+	0xD5, 0xB6, 0x44, 0xD5, 0xBE, 0xD5, 0xB6, 0x44,
+	0xD7, 0x90, 0xD7, 0x9C, 0x44, 0xD8, 0xA7, 0xD9,
+	0xB4, 0x44, 0xD8, 0xA8, 0xD8, 0xAC, 0x44, 0xD8,
+	// Bytes 1ec0 - 1eff
+	0xA8, 0xD8, 0xAD, 0x44, 0xD8, 0xA8, 0xD8, 0xAE,
+	0x44, 0xD8, 0xA8, 0xD8, 0xB1, 0x44, 0xD8, 0xA8,
+	0xD8, 0xB2, 0x44, 0xD8, 0xA8, 0xD9, 0x85, 0x44,
+	0xD8, 0xA8, 0xD9, 0x86, 0x44, 0xD8, 0xA8, 0xD9,
+	0x87, 0x44, 0xD8, 0xA8, 0xD9, 0x89, 0x44, 0xD8,
+	0xA8, 0xD9, 0x8A, 0x44, 0xD8, 0xAA, 0xD8, 0xAC,
+	0x44, 0xD8, 0xAA, 0xD8, 0xAD, 0x44, 0xD8, 0xAA,
+	0xD8, 0xAE, 0x44, 0xD8, 0xAA, 0xD8, 0xB1, 0x44,
+	// Bytes 1f00 - 1f3f
+	0xD8, 0xAA, 0xD8, 0xB2, 0x44, 0xD8, 0xAA, 0xD9,
+	0x85, 0x44, 0xD8, 0xAA, 0xD9, 0x86, 0x44, 0xD8,
+	0xAA, 0xD9, 0x87, 0x44, 0xD8, 0xAA, 0xD9, 0x89,
+	0x44, 0xD8, 0xAA, 0xD9, 0x8A, 0x44, 0xD8, 0xAB,
+	0xD8, 0xAC, 0x44, 0xD8, 0xAB, 0xD8, 0xB1, 0x44,
+	0xD8, 0xAB, 0xD8, 0xB2, 0x44, 0xD8, 0xAB, 0xD9,
+	0x85, 0x44, 0xD8, 0xAB, 0xD9, 0x86, 0x44, 0xD8,
+	0xAB, 0xD9, 0x87, 0x44, 0xD8, 0xAB, 0xD9, 0x89,
+	// Bytes 1f40 - 1f7f
+	0x44, 0xD8, 0xAB, 0xD9, 0x8A, 0x44, 0xD8, 0xAC,
+	0xD8, 0xAD, 0x44, 0xD8, 0xAC, 0xD9, 0x85, 0x44,
+	0xD8, 0xAC, 0xD9, 0x89, 0x44, 0xD8, 0xAC, 0xD9,
+	0x8A, 0x44, 0xD8, 0xAD, 0xD8, 0xAC, 0x44, 0xD8,
+	0xAD, 0xD9, 0x85, 0x44, 0xD8, 0xAD, 0xD9, 0x89,
+	0x44, 0xD8, 0xAD, 0xD9, 0x8A, 0x44, 0xD8, 0xAE,
+	0xD8, 0xAC, 0x44, 0xD8, 0xAE, 0xD8, 0xAD, 0x44,
+	0xD8, 0xAE, 0xD9, 0x85, 0x44, 0xD8, 0xAE, 0xD9,
+	// Bytes 1f80 - 1fbf
+	0x89, 0x44, 0xD8, 0xAE, 0xD9, 0x8A, 0x44, 0xD8,
+	0xB3, 0xD8, 0xAC, 0x44, 0xD8, 0xB3, 0xD8, 0xAD,
+	0x44, 0xD8, 0xB3, 0xD8, 0xAE, 0x44, 0xD8, 0xB3,
+	0xD8, 0xB1, 0x44, 0xD8, 0xB3, 0xD9, 0x85, 0x44,
+	0xD8, 0xB3, 0xD9, 0x87, 0x44, 0xD8, 0xB3, 0xD9,
+	0x89, 0x44, 0xD8, 0xB3, 0xD9, 0x8A, 0x44, 0xD8,
+	0xB4, 0xD8, 0xAC, 0x44, 0xD8, 0xB4, 0xD8, 0xAD,
+	0x44, 0xD8, 0xB4, 0xD8, 0xAE, 0x44, 0xD8, 0xB4,
+	// Bytes 1fc0 - 1fff
+	0xD8, 0xB1, 0x44, 0xD8, 0xB4, 0xD9, 0x85, 0x44,
+	0xD8, 0xB4, 0xD9, 0x87, 0x44, 0xD8, 0xB4, 0xD9,
+	0x89, 0x44, 0xD8, 0xB4, 0xD9, 0x8A, 0x44, 0xD8,
+	0xB5, 0xD8, 0xAD, 0x44, 0xD8, 0xB5, 0xD8, 0xAE,
+	0x44, 0xD8, 0xB5, 0xD8, 0xB1, 0x44, 0xD8, 0xB5,
+	0xD9, 0x85, 0x44, 0xD8, 0xB5, 0xD9, 0x89, 0x44,
+	0xD8, 0xB5, 0xD9, 0x8A, 0x44, 0xD8, 0xB6, 0xD8,
+	0xAC, 0x44, 0xD8, 0xB6, 0xD8, 0xAD, 0x44, 0xD8,
+	// Bytes 2000 - 203f
+	0xB6, 0xD8, 0xAE, 0x44, 0xD8, 0xB6, 0xD8, 0xB1,
+	0x44, 0xD8, 0xB6, 0xD9, 0x85, 0x44, 0xD8, 0xB6,
+	0xD9, 0x89, 0x44, 0xD8, 0xB6, 0xD9, 0x8A, 0x44,
+	0xD8, 0xB7, 0xD8, 0xAD, 0x44, 0xD8, 0xB7, 0xD9,
+	0x85, 0x44, 0xD8, 0xB7, 0xD9, 0x89, 0x44, 0xD8,
+	0xB7, 0xD9, 0x8A, 0x44, 0xD8, 0xB8, 0xD9, 0x85,
+	0x44, 0xD8, 0xB9, 0xD8, 0xAC, 0x44, 0xD8, 0xB9,
+	0xD9, 0x85, 0x44, 0xD8, 0xB9, 0xD9, 0x89, 0x44,
+	// Bytes 2040 - 207f
+	0xD8, 0xB9, 0xD9, 0x8A, 0x44, 0xD8, 0xBA, 0xD8,
+	0xAC, 0x44, 0xD8, 0xBA, 0xD9, 0x85, 0x44, 0xD8,
+	0xBA, 0xD9, 0x89, 0x44, 0xD8, 0xBA, 0xD9, 0x8A,
+	0x44, 0xD9, 0x81, 0xD8, 0xAC, 0x44, 0xD9, 0x81,
+	0xD8, 0xAD, 0x44, 0xD9, 0x81, 0xD8, 0xAE, 0x44,
+	0xD9, 0x81, 0xD9, 0x85, 0x44, 0xD9, 0x81, 0xD9,
+	0x89, 0x44, 0xD9, 0x81, 0xD9, 0x8A, 0x44, 0xD9,
+	0x82, 0xD8, 0xAD, 0x44, 0xD9, 0x82, 0xD9, 0x85,
+	// Bytes 2080 - 20bf
+	0x44, 0xD9, 0x82, 0xD9, 0x89, 0x44, 0xD9, 0x82,
+	0xD9, 0x8A, 0x44, 0xD9, 0x83, 0xD8, 0xA7, 0x44,
+	0xD9, 0x83, 0xD8, 0xAC, 0x44, 0xD9, 0x83, 0xD8,
+	0xAD, 0x44, 0xD9, 0x83, 0xD8, 0xAE, 0x44, 0xD9,
+	0x83, 0xD9, 0x84, 0x44, 0xD9, 0x83, 0xD9, 0x85,
+	0x44, 0xD9, 0x83, 0xD9, 0x89, 0x44, 0xD9, 0x83,
+	0xD9, 0x8A, 0x44, 0xD9, 0x84, 0xD8, 0xA7, 0x44,
+	0xD9, 0x84, 0xD8, 0xAC, 0x44, 0xD9, 0x84, 0xD8,
+	// Bytes 20c0 - 20ff
+	0xAD, 0x44, 0xD9, 0x84, 0xD8, 0xAE, 0x44, 0xD9,
+	0x84, 0xD9, 0x85, 0x44, 0xD9, 0x84, 0xD9, 0x87,
+	0x44, 0xD9, 0x84, 0xD9, 0x89, 0x44, 0xD9, 0x84,
+	0xD9, 0x8A, 0x44, 0xD9, 0x85, 0xD8, 0xA7, 0x44,
+	0xD9, 0x85, 0xD8, 0xAC, 0x44, 0xD9, 0x85, 0xD8,
+	0xAD, 0x44, 0xD9, 0x85, 0xD8, 0xAE, 0x44, 0xD9,
+	0x85, 0xD9, 0x85, 0x44, 0xD9, 0x85, 0xD9, 0x89,
+	0x44, 0xD9, 0x85, 0xD9, 0x8A, 0x44, 0xD9, 0x86,
+	// Bytes 2100 - 213f
+	0xD8, 0xAC, 0x44, 0xD9, 0x86, 0xD8, 0xAD, 0x44,
+	0xD9, 0x86, 0xD8, 0xAE, 0x44, 0xD9, 0x86, 0xD8,
+	0xB1, 0x44, 0xD9, 0x86, 0xD8, 0xB2, 0x44, 0xD9,
+	0x86, 0xD9, 0x85, 0x44, 0xD9, 0x86, 0xD9, 0x86,
+	0x44, 0xD9, 0x86, 0xD9, 0x87, 0x44, 0xD9, 0x86,
+	0xD9, 0x89, 0x44, 0xD9, 0x86, 0xD9, 0x8A, 0x44,
+	0xD9, 0x87, 0xD8, 0xAC, 0x44, 0xD9, 0x87, 0xD9,
+	0x85, 0x44, 0xD9, 0x87, 0xD9, 0x89, 0x44, 0xD9,
+	// Bytes 2140 - 217f
+	0x87, 0xD9, 0x8A, 0x44, 0xD9, 0x88, 0xD9, 0xB4,
+	0x44, 0xD9, 0x8A, 0xD8, 0xAC, 0x44, 0xD9, 0x8A,
+	0xD8, 0xAD, 0x44, 0xD9, 0x8A, 0xD8, 0xAE, 0x44,
+	0xD9, 0x8A, 0xD8, 0xB1, 0x44, 0xD9, 0x8A, 0xD8,
+	0xB2, 0x44, 0xD9, 0x8A, 0xD9, 0x85, 0x44, 0xD9,
+	0x8A, 0xD9, 0x86, 0x44, 0xD9, 0x8A, 0xD9, 0x87,
+	0x44, 0xD9, 0x8A, 0xD9, 0x89, 0x44, 0xD9, 0x8A,
+	0xD9, 0x8A, 0x44, 0xD9, 0x8A, 0xD9, 0xB4, 0x44,
+	// Bytes 2180 - 21bf
+	0xDB, 0x87, 0xD9, 0xB4, 0x45, 0x28, 0xE1, 0x84,
+	0x80, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x82, 0x29,
+	0x45, 0x28, 0xE1, 0x84, 0x83, 0x29, 0x45, 0x28,
+	0xE1, 0x84, 0x85, 0x29, 0x45, 0x28, 0xE1, 0x84,
+	0x86, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x87, 0x29,
+	0x45, 0x28, 0xE1, 0x84, 0x89, 0x29, 0x45, 0x28,
+	0xE1, 0x84, 0x8B, 0x29, 0x45, 0x28, 0xE1, 0x84,
+	0x8C, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x8E, 0x29,
+	// Bytes 21c0 - 21ff
+	0x45, 0x28, 0xE1, 0x84, 0x8F, 0x29, 0x45, 0x28,
+	0xE1, 0x84, 0x90, 0x29, 0x45, 0x28, 0xE1, 0x84,
+	0x91, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x92, 0x29,
+	0x45, 0x28, 0xE4, 0xB8, 0x80, 0x29, 0x45, 0x28,
+	0xE4, 0xB8, 0x83, 0x29, 0x45, 0x28, 0xE4, 0xB8,
+	0x89, 0x29, 0x45, 0x28, 0xE4, 0xB9, 0x9D, 0x29,
+	0x45, 0x28, 0xE4, 0xBA, 0x8C, 0x29, 0x45, 0x28,
+	0xE4, 0xBA, 0x94, 0x29, 0x45, 0x28, 0xE4, 0xBB,
+	// Bytes 2200 - 223f
+	0xA3, 0x29, 0x45, 0x28, 0xE4, 0xBC, 0x81, 0x29,
+	0x45, 0x28, 0xE4, 0xBC, 0x91, 0x29, 0x45, 0x28,
+	0xE5, 0x85, 0xAB, 0x29, 0x45, 0x28, 0xE5, 0x85,
+	0xAD, 0x29, 0x45, 0x28, 0xE5, 0x8A, 0xB4, 0x29,
+	0x45, 0x28, 0xE5, 0x8D, 0x81, 0x29, 0x45, 0x28,
+	0xE5, 0x8D, 0x94, 0x29, 0x45, 0x28, 0xE5, 0x90,
+	0x8D, 0x29, 0x45, 0x28, 0xE5, 0x91, 0xBC, 0x29,
+	0x45, 0x28, 0xE5, 0x9B, 0x9B, 0x29, 0x45, 0x28,
+	// Bytes 2240 - 227f
+	0xE5, 0x9C, 0x9F, 0x29, 0x45, 0x28, 0xE5, 0xAD,
+	0xA6, 0x29, 0x45, 0x28, 0xE6, 0x97, 0xA5, 0x29,
+	0x45, 0x28, 0xE6, 0x9C, 0x88, 0x29, 0x45, 0x28,
+	0xE6, 0x9C, 0x89, 0x29, 0x45, 0x28, 0xE6, 0x9C,
+	0xA8, 0x29, 0x45, 0x28, 0xE6, 0xA0, 0xAA, 0x29,
+	0x45, 0x28, 0xE6, 0xB0, 0xB4, 0x29, 0x45, 0x28,
+	0xE7, 0x81, 0xAB, 0x29, 0x45, 0x28, 0xE7, 0x89,
+	0xB9, 0x29, 0x45, 0x28, 0xE7, 0x9B, 0xA3, 0x29,
+	// Bytes 2280 - 22bf
+	0x45, 0x28, 0xE7, 0xA4, 0xBE, 0x29, 0x45, 0x28,
+	0xE7, 0xA5, 0x9D, 0x29, 0x45, 0x28, 0xE7, 0xA5,
+	0xAD, 0x29, 0x45, 0x28, 0xE8, 0x87, 0xAA, 0x29,
+	0x45, 0x28, 0xE8, 0x87, 0xB3, 0x29, 0x45, 0x28,
+	0xE8, 0xB2, 0xA1, 0x29, 0x45, 0x28, 0xE8, 0xB3,
+	0x87, 0x29, 0x45, 0x28, 0xE9, 0x87, 0x91, 0x29,
+	0x45, 0x30, 0xE2, 0x81, 0x84, 0x33, 0x45, 0x31,
+	0x30, 0xE6, 0x97, 0xA5, 0x45, 0x31, 0x30, 0xE6,
+	// Bytes 22c0 - 22ff
+	0x9C, 0x88, 0x45, 0x31, 0x30, 0xE7, 0x82, 0xB9,
+	0x45, 0x31, 0x31, 0xE6, 0x97, 0xA5, 0x45, 0x31,
+	0x31, 0xE6, 0x9C, 0x88, 0x45, 0x31, 0x31, 0xE7,
+	0x82, 0xB9, 0x45, 0x31, 0x32, 0xE6, 0x97, 0xA5,
+	0x45, 0x31, 0x32, 0xE6, 0x9C, 0x88, 0x45, 0x31,
+	0x32, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x33, 0xE6,
+	0x97, 0xA5, 0x45, 0x31, 0x33, 0xE7, 0x82, 0xB9,
+	0x45, 0x31, 0x34, 0xE6, 0x97, 0xA5, 0x45, 0x31,
+	// Bytes 2300 - 233f
+	0x34, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x35, 0xE6,
+	0x97, 0xA5, 0x45, 0x31, 0x35, 0xE7, 0x82, 0xB9,
+	0x45, 0x31, 0x36, 0xE6, 0x97, 0xA5, 0x45, 0x31,
+	0x36, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x37, 0xE6,
+	0x97, 0xA5, 0x45, 0x31, 0x37, 0xE7, 0x82, 0xB9,
+	0x45, 0x31, 0x38, 0xE6, 0x97, 0xA5, 0x45, 0x31,
+	0x38, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x39, 0xE6,
+	0x97, 0xA5, 0x45, 0x31, 0x39, 0xE7, 0x82, 0xB9,
+	// Bytes 2340 - 237f
+	0x45, 0x31, 0xE2, 0x81, 0x84, 0x32, 0x45, 0x31,
+	0xE2, 0x81, 0x84, 0x33, 0x45, 0x31, 0xE2, 0x81,
+	0x84, 0x34, 0x45, 0x31, 0xE2, 0x81, 0x84, 0x35,
+	0x45, 0x31, 0xE2, 0x81, 0x84, 0x36, 0x45, 0x31,
+	0xE2, 0x81, 0x84, 0x37, 0x45, 0x31, 0xE2, 0x81,
+	0x84, 0x38, 0x45, 0x31, 0xE2, 0x81, 0x84, 0x39,
+	0x45, 0x32, 0x30, 0xE6, 0x97, 0xA5, 0x45, 0x32,
+	0x30, 0xE7, 0x82, 0xB9, 0x45, 0x32, 0x31, 0xE6,
+	// Bytes 2380 - 23bf
+	0x97, 0xA5, 0x45, 0x32, 0x31, 0xE7, 0x82, 0xB9,
+	0x45, 0x32, 0x32, 0xE6, 0x97, 0xA5, 0x45, 0x32,
+	0x32, 0xE7, 0x82, 0xB9, 0x45, 0x32, 0x33, 0xE6,
+	0x97, 0xA5, 0x45, 0x32, 0x33, 0xE7, 0x82, 0xB9,
+	0x45, 0x32, 0x34, 0xE6, 0x97, 0xA5, 0x45, 0x32,
+	0x34, 0xE7, 0x82, 0xB9, 0x45, 0x32, 0x35, 0xE6,
+	0x97, 0xA5, 0x45, 0x32, 0x36, 0xE6, 0x97, 0xA5,
+	0x45, 0x32, 0x37, 0xE6, 0x97, 0xA5, 0x45, 0x32,
+	// Bytes 23c0 - 23ff
+	0x38, 0xE6, 0x97, 0xA5, 0x45, 0x32, 0x39, 0xE6,
+	0x97, 0xA5, 0x45, 0x32, 0xE2, 0x81, 0x84, 0x33,
+	0x45, 0x32, 0xE2, 0x81, 0x84, 0x35, 0x45, 0x33,
+	0x30, 0xE6, 0x97, 0xA5, 0x45, 0x33, 0x31, 0xE6,
+	0x97, 0xA5, 0x45, 0x33, 0xE2, 0x81, 0x84, 0x34,
+	0x45, 0x33, 0xE2, 0x81, 0x84, 0x35, 0x45, 0x33,
+	0xE2, 0x81, 0x84, 0x38, 0x45, 0x34, 0xE2, 0x81,
+	0x84, 0x35, 0x45, 0x35, 0xE2, 0x81, 0x84, 0x36,
+	// Bytes 2400 - 243f
+	0x45, 0x35, 0xE2, 0x81, 0x84, 0x38, 0x45, 0x37,
+	0xE2, 0x81, 0x84, 0x38, 0x45, 0x41, 0xE2, 0x88,
+	0x95, 0x6D, 0x45, 0x56, 0xE2, 0x88, 0x95, 0x6D,
+	0x45, 0x6D, 0xE2, 0x88, 0x95, 0x73, 0x46, 0x31,
+	0xE2, 0x81, 0x84, 0x31, 0x30, 0x46, 0x43, 0xE2,
+	0x88, 0x95, 0x6B, 0x67, 0x46, 0x6D, 0xE2, 0x88,
+	0x95, 0x73, 0x32, 0x46, 0xD8, 0xA8, 0xD8, 0xAD,
+	0xD9, 0x8A, 0x46, 0xD8, 0xA8, 0xD8, 0xAE, 0xD9,
+	// Bytes 2440 - 247f
+	0x8A, 0x46, 0xD8, 0xAA, 0xD8, 0xAC, 0xD9, 0x85,
+	0x46, 0xD8, 0xAA, 0xD8, 0xAC, 0xD9, 0x89, 0x46,
+	0xD8, 0xAA, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD8,
+	0xAA, 0xD8, 0xAD, 0xD8, 0xAC, 0x46, 0xD8, 0xAA,
+	0xD8, 0xAD, 0xD9, 0x85, 0x46, 0xD8, 0xAA, 0xD8,
+	0xAE, 0xD9, 0x85, 0x46, 0xD8, 0xAA, 0xD8, 0xAE,
+	0xD9, 0x89, 0x46, 0xD8, 0xAA, 0xD8, 0xAE, 0xD9,
+	0x8A, 0x46, 0xD8, 0xAA, 0xD9, 0x85, 0xD8, 0xAC,
+	// Bytes 2480 - 24bf
+	0x46, 0xD8, 0xAA, 0xD9, 0x85, 0xD8, 0xAD, 0x46,
+	0xD8, 0xAA, 0xD9, 0x85, 0xD8, 0xAE, 0x46, 0xD8,
+	0xAA, 0xD9, 0x85, 0xD9, 0x89, 0x46, 0xD8, 0xAA,
+	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD8, 0xAC, 0xD8,
+	0xAD, 0xD9, 0x89, 0x46, 0xD8, 0xAC, 0xD8, 0xAD,
+	0xD9, 0x8A, 0x46, 0xD8, 0xAC, 0xD9, 0x85, 0xD8,
+	0xAD, 0x46, 0xD8, 0xAC, 0xD9, 0x85, 0xD9, 0x89,
+	0x46, 0xD8, 0xAC, 0xD9, 0x85, 0xD9, 0x8A, 0x46,
+	// Bytes 24c0 - 24ff
+	0xD8, 0xAD, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD8,
+	0xAD, 0xD9, 0x85, 0xD9, 0x89, 0x46, 0xD8, 0xAD,
+	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD8, 0xB3, 0xD8,
+	0xAC, 0xD8, 0xAD, 0x46, 0xD8, 0xB3, 0xD8, 0xAC,
+	0xD9, 0x89, 0x46, 0xD8, 0xB3, 0xD8, 0xAD, 0xD8,
+	0xAC, 0x46, 0xD8, 0xB3, 0xD8, 0xAE, 0xD9, 0x89,
+	0x46, 0xD8, 0xB3, 0xD8, 0xAE, 0xD9, 0x8A, 0x46,
+	0xD8, 0xB3, 0xD9, 0x85, 0xD8, 0xAC, 0x46, 0xD8,
+	// Bytes 2500 - 253f
+	0xB3, 0xD9, 0x85, 0xD8, 0xAD, 0x46, 0xD8, 0xB3,
+	0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD8, 0xB4, 0xD8,
+	0xAC, 0xD9, 0x8A, 0x46, 0xD8, 0xB4, 0xD8, 0xAD,
+	0xD9, 0x85, 0x46, 0xD8, 0xB4, 0xD8, 0xAD, 0xD9,
+	0x8A, 0x46, 0xD8, 0xB4, 0xD9, 0x85, 0xD8, 0xAE,
+	0x46, 0xD8, 0xB4, 0xD9, 0x85, 0xD9, 0x85, 0x46,
+	0xD8, 0xB5, 0xD8, 0xAD, 0xD8, 0xAD, 0x46, 0xD8,
+	0xB5, 0xD8, 0xAD, 0xD9, 0x8A, 0x46, 0xD8, 0xB5,
+	// Bytes 2540 - 257f
+	0xD9, 0x84, 0xD9, 0x89, 0x46, 0xD8, 0xB5, 0xD9,
+	0x84, 0xDB, 0x92, 0x46, 0xD8, 0xB5, 0xD9, 0x85,
+	0xD9, 0x85, 0x46, 0xD8, 0xB6, 0xD8, 0xAD, 0xD9,
+	0x89, 0x46, 0xD8, 0xB6, 0xD8, 0xAD, 0xD9, 0x8A,
+	0x46, 0xD8, 0xB6, 0xD8, 0xAE, 0xD9, 0x85, 0x46,
+	0xD8, 0xB7, 0xD9, 0x85, 0xD8, 0xAD, 0x46, 0xD8,
+	0xB7, 0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD8, 0xB7,
+	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD8, 0xB9, 0xD8,
+	// Bytes 2580 - 25bf
+	0xAC, 0xD9, 0x85, 0x46, 0xD8, 0xB9, 0xD9, 0x85,
+	0xD9, 0x85, 0x46, 0xD8, 0xB9, 0xD9, 0x85, 0xD9,
+	0x89, 0x46, 0xD8, 0xB9, 0xD9, 0x85, 0xD9, 0x8A,
+	0x46, 0xD8, 0xBA, 0xD9, 0x85, 0xD9, 0x85, 0x46,
+	0xD8, 0xBA, 0xD9, 0x85, 0xD9, 0x89, 0x46, 0xD8,
+	0xBA, 0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x81,
+	0xD8, 0xAE, 0xD9, 0x85, 0x46, 0xD9, 0x81, 0xD9,
+	0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x82, 0xD9, 0x84,
+	// Bytes 25c0 - 25ff
+	0xDB, 0x92, 0x46, 0xD9, 0x82, 0xD9, 0x85, 0xD8,
+	0xAD, 0x46, 0xD9, 0x82, 0xD9, 0x85, 0xD9, 0x85,
+	0x46, 0xD9, 0x82, 0xD9, 0x85, 0xD9, 0x8A, 0x46,
+	0xD9, 0x83, 0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD9,
+	0x83, 0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x84,
+	0xD8, 0xAC, 0xD8, 0xAC, 0x46, 0xD9, 0x84, 0xD8,
+	0xAC, 0xD9, 0x85, 0x46, 0xD9, 0x84, 0xD8, 0xAC,
+	0xD9, 0x8A, 0x46, 0xD9, 0x84, 0xD8, 0xAD, 0xD9,
+	// Bytes 2600 - 263f
+	0x85, 0x46, 0xD9, 0x84, 0xD8, 0xAD, 0xD9, 0x89,
+	0x46, 0xD9, 0x84, 0xD8, 0xAD, 0xD9, 0x8A, 0x46,
+	0xD9, 0x84, 0xD8, 0xAE, 0xD9, 0x85, 0x46, 0xD9,
+	0x84, 0xD9, 0x85, 0xD8, 0xAD, 0x46, 0xD9, 0x84,
+	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x85, 0xD8,
+	0xAC, 0xD8, 0xAD, 0x46, 0xD9, 0x85, 0xD8, 0xAC,
+	0xD8, 0xAE, 0x46, 0xD9, 0x85, 0xD8, 0xAC, 0xD9,
+	0x85, 0x46, 0xD9, 0x85, 0xD8, 0xAC, 0xD9, 0x8A,
+	// Bytes 2640 - 267f
+	0x46, 0xD9, 0x85, 0xD8, 0xAD, 0xD8, 0xAC, 0x46,
+	0xD9, 0x85, 0xD8, 0xAD, 0xD9, 0x85, 0x46, 0xD9,
+	0x85, 0xD8, 0xAD, 0xD9, 0x8A, 0x46, 0xD9, 0x85,
+	0xD8, 0xAE, 0xD8, 0xAC, 0x46, 0xD9, 0x85, 0xD8,
+	0xAE, 0xD9, 0x85, 0x46, 0xD9, 0x85, 0xD8, 0xAE,
+	0xD9, 0x8A, 0x46, 0xD9, 0x85, 0xD9, 0x85, 0xD9,
+	0x8A, 0x46, 0xD9, 0x86, 0xD8, 0xAC, 0xD8, 0xAD,
+	0x46, 0xD9, 0x86, 0xD8, 0xAC, 0xD9, 0x85, 0x46,
+	// Bytes 2680 - 26bf
+	0xD9, 0x86, 0xD8, 0xAC, 0xD9, 0x89, 0x46, 0xD9,
+	0x86, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD9, 0x86,
+	0xD8, 0xAD, 0xD9, 0x85, 0x46, 0xD9, 0x86, 0xD8,
+	0xAD, 0xD9, 0x89, 0x46, 0xD9, 0x86, 0xD8, 0xAD,
+	0xD9, 0x8A, 0x46, 0xD9, 0x86, 0xD9, 0x85, 0xD9,
+	0x89, 0x46, 0xD9, 0x86, 0xD9, 0x85, 0xD9, 0x8A,
+	0x46, 0xD9, 0x87, 0xD9, 0x85, 0xD8, 0xAC, 0x46,
+	0xD9, 0x87, 0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD9,
+	// Bytes 26c0 - 26ff
+	0x8A, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD9, 0x8A,
+	0xD8, 0xAD, 0xD9, 0x8A, 0x46, 0xD9, 0x8A, 0xD9,
+	0x85, 0xD9, 0x85, 0x46, 0xD9, 0x8A, 0xD9, 0x85,
+	0xD9, 0x8A, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD8,
+	0xA7, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD8, 0xAC,
+	0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD8, 0xAD, 0x46,
+	0xD9, 0x8A, 0xD9, 0x94, 0xD8, 0xAE, 0x46, 0xD9,
+	0x8A, 0xD9, 0x94, 0xD8, 0xB1, 0x46, 0xD9, 0x8A,
+	// Bytes 2700 - 273f
+	0xD9, 0x94, 0xD8, 0xB2, 0x46, 0xD9, 0x8A, 0xD9,
+	0x94, 0xD9, 0x85, 0x46, 0xD9, 0x8A, 0xD9, 0x94,
+	0xD9, 0x86, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD9,
+	0x87, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD9, 0x88,
+	0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD9, 0x89, 0x46,
+	0xD9, 0x8A, 0xD9, 0x94, 0xD9, 0x8A, 0x46, 0xD9,
+	0x8A, 0xD9, 0x94, 0xDB, 0x86, 0x46, 0xD9, 0x8A,
+	0xD9, 0x94, 0xDB, 0x87, 0x46, 0xD9, 0x8A, 0xD9,
+	// Bytes 2740 - 277f
+	0x94, 0xDB, 0x88, 0x46, 0xD9, 0x8A, 0xD9, 0x94,
+	0xDB, 0x90, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xDB,
+	0x95, 0x46, 0xE0, 0xB9, 0x8D, 0xE0, 0xB8, 0xB2,
+	0x46, 0xE0, 0xBA, 0xAB, 0xE0, 0xBA, 0x99, 0x46,
+	0xE0, 0xBA, 0xAB, 0xE0, 0xBA, 0xA1, 0x46, 0xE0,
+	0xBB, 0x8D, 0xE0, 0xBA, 0xB2, 0x46, 0xE0, 0xBD,
+	0x80, 0xE0, 0xBE, 0xB5, 0x46, 0xE0, 0xBD, 0x82,
+	0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBD, 0x8C, 0xE0,
+	// Bytes 2780 - 27bf
+	0xBE, 0xB7, 0x46, 0xE0, 0xBD, 0x91, 0xE0, 0xBE,
+	0xB7, 0x46, 0xE0, 0xBD, 0x96, 0xE0, 0xBE, 0xB7,
+	0x46, 0xE0, 0xBD, 0x9B, 0xE0, 0xBE, 0xB7, 0x46,
+	0xE0, 0xBE, 0x90, 0xE0, 0xBE, 0xB5, 0x46, 0xE0,
+	0xBE, 0x92, 0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBE,
+	0x9C, 0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBE, 0xA1,
+	0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBE, 0xA6, 0xE0,
+	0xBE, 0xB7, 0x46, 0xE0, 0xBE, 0xAB, 0xE0, 0xBE,
+	// Bytes 27c0 - 27ff
+	0xB7, 0x46, 0xE2, 0x80, 0xB2, 0xE2, 0x80, 0xB2,
+	0x46, 0xE2, 0x80, 0xB5, 0xE2, 0x80, 0xB5, 0x46,
+	0xE2, 0x88, 0xAB, 0xE2, 0x88, 0xAB, 0x46, 0xE2,
+	0x88, 0xAE, 0xE2, 0x88, 0xAE, 0x46, 0xE3, 0x81,
+	0xBB, 0xE3, 0x81, 0x8B, 0x46, 0xE3, 0x82, 0x88,
+	0xE3, 0x82, 0x8A, 0x46, 0xE3, 0x82, 0xAD, 0xE3,
+	0x83, 0xAD, 0x46, 0xE3, 0x82, 0xB3, 0xE3, 0x82,
+	0xB3, 0x46, 0xE3, 0x82, 0xB3, 0xE3, 0x83, 0x88,
+	// Bytes 2800 - 283f
+	0x46, 0xE3, 0x83, 0x88, 0xE3, 0x83, 0xB3, 0x46,
+	0xE3, 0x83, 0x8A, 0xE3, 0x83, 0x8E, 0x46, 0xE3,
+	0x83, 0x9B, 0xE3, 0x83, 0xB3, 0x46, 0xE3, 0x83,
+	0x9F, 0xE3, 0x83, 0xAA, 0x46, 0xE3, 0x83, 0xAA,
+	0xE3, 0x83, 0xA9, 0x46, 0xE3, 0x83, 0xAC, 0xE3,
+	0x83, 0xA0, 0x46, 0xE4, 0xBB, 0xA4, 0xE5, 0x92,
+	0x8C, 0x46, 0xE5, 0xA4, 0xA7, 0xE6, 0xAD, 0xA3,
+	0x46, 0xE5, 0xB9, 0xB3, 0xE6, 0x88, 0x90, 0x46,
+	// Bytes 2840 - 287f
+	0xE6, 0x98, 0x8E, 0xE6, 0xB2, 0xBB, 0x46, 0xE6,
+	0x98, 0xAD, 0xE5, 0x92, 0x8C, 0x47, 0x72, 0x61,
+	0x64, 0xE2, 0x88, 0x95, 0x73, 0x47, 0xE3, 0x80,
+	0x94, 0x53, 0xE3, 0x80, 0x95, 0x48, 0x28, 0xE1,
+	0x84, 0x80, 0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28,
+	0xE1, 0x84, 0x82, 0xE1, 0x85, 0xA1, 0x29, 0x48,
+	0x28, 0xE1, 0x84, 0x83, 0xE1, 0x85, 0xA1, 0x29,
+	0x48, 0x28, 0xE1, 0x84, 0x85, 0xE1, 0x85, 0xA1,
+	// Bytes 2880 - 28bf
+	0x29, 0x48, 0x28, 0xE1, 0x84, 0x86, 0xE1, 0x85,
+	0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x87, 0xE1,
+	0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x89,
+	0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84,
+	0x8B, 0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1,
+	0x84, 0x8C, 0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28,
+	0xE1, 0x84, 0x8C, 0xE1, 0x85, 0xAE, 0x29, 0x48,
+	0x28, 0xE1, 0x84, 0x8E, 0xE1, 0x85, 0xA1, 0x29,
+	// Bytes 28c0 - 28ff
+	0x48, 0x28, 0xE1, 0x84, 0x8F, 0xE1, 0x85, 0xA1,
+	0x29, 0x48, 0x28, 0xE1, 0x84, 0x90, 0xE1, 0x85,
+	0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x91, 0xE1,
+	0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x92,
+	0xE1, 0x85, 0xA1, 0x29, 0x48, 0x72, 0x61, 0x64,
+	0xE2, 0x88, 0x95, 0x73, 0x32, 0x48, 0xD8, 0xA7,
+	0xD9, 0x83, 0xD8, 0xA8, 0xD8, 0xB1, 0x48, 0xD8,
+	0xA7, 0xD9, 0x84, 0xD9, 0x84, 0xD9, 0x87, 0x48,
+	// Bytes 2900 - 293f
+	0xD8, 0xB1, 0xD8, 0xB3, 0xD9, 0x88, 0xD9, 0x84,
+	0x48, 0xD8, 0xB1, 0xDB, 0x8C, 0xD8, 0xA7, 0xD9,
+	0x84, 0x48, 0xD8, 0xB5, 0xD9, 0x84, 0xD8, 0xB9,
+	0xD9, 0x85, 0x48, 0xD8, 0xB9, 0xD9, 0x84, 0xD9,
+	0x8A, 0xD9, 0x87, 0x48, 0xD9, 0x85, 0xD8, 0xAD,
+	0xD9, 0x85, 0xD8, 0xAF, 0x48, 0xD9, 0x88, 0xD8,
+	0xB3, 0xD9, 0x84, 0xD9, 0x85, 0x49, 0xE2, 0x80,
+	0xB2, 0xE2, 0x80, 0xB2, 0xE2, 0x80, 0xB2, 0x49,
+	// Bytes 2940 - 297f
+	0xE2, 0x80, 0xB5, 0xE2, 0x80, 0xB5, 0xE2, 0x80,
+	0xB5, 0x49, 0xE2, 0x88, 0xAB, 0xE2, 0x88, 0xAB,
+	0xE2, 0x88, 0xAB, 0x49, 0xE2, 0x88, 0xAE, 0xE2,
+	0x88, 0xAE, 0xE2, 0x88, 0xAE, 0x49, 0xE3, 0x80,
+	0x94, 0xE4, 0xB8, 0x89, 0xE3, 0x80, 0x95, 0x49,
+	0xE3, 0x80, 0x94, 0xE4, 0xBA, 0x8C, 0xE3, 0x80,
+	0x95, 0x49, 0xE3, 0x80, 0x94, 0xE5, 0x8B, 0x9D,
+	0xE3, 0x80, 0x95, 0x49, 0xE3, 0x80, 0x94, 0xE5,
+	// Bytes 2980 - 29bf
+	0xAE, 0x89, 0xE3, 0x80, 0x95, 0x49, 0xE3, 0x80,
+	0x94, 0xE6, 0x89, 0x93, 0xE3, 0x80, 0x95, 0x49,
+	0xE3, 0x80, 0x94, 0xE6, 0x95, 0x97, 0xE3, 0x80,
+	0x95, 0x49, 0xE3, 0x80, 0x94, 0xE6, 0x9C, 0xAC,
+	0xE3, 0x80, 0x95, 0x49, 0xE3, 0x80, 0x94, 0xE7,
+	0x82, 0xB9, 0xE3, 0x80, 0x95, 0x49, 0xE3, 0x80,
+	0x94, 0xE7, 0x9B, 0x97, 0xE3, 0x80, 0x95, 0x49,
+	0xE3, 0x82, 0xA2, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
+	// Bytes 29c0 - 29ff
+	0xAB, 0x49, 0xE3, 0x82, 0xA4, 0xE3, 0x83, 0xB3,
+	0xE3, 0x83, 0x81, 0x49, 0xE3, 0x82, 0xA6, 0xE3,
+	0x82, 0xA9, 0xE3, 0x83, 0xB3, 0x49, 0xE3, 0x82,
+	0xAA, 0xE3, 0x83, 0xB3, 0xE3, 0x82, 0xB9, 0x49,
+	0xE3, 0x82, 0xAA, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
+	0xA0, 0x49, 0xE3, 0x82, 0xAB, 0xE3, 0x82, 0xA4,
+	0xE3, 0x83, 0xAA, 0x49, 0xE3, 0x82, 0xB1, 0xE3,
+	0x83, 0xBC, 0xE3, 0x82, 0xB9, 0x49, 0xE3, 0x82,
+	// Bytes 2a00 - 2a3f
+	0xB3, 0xE3, 0x83, 0xAB, 0xE3, 0x83, 0x8A, 0x49,
+	0xE3, 0x82, 0xBB, 0xE3, 0x83, 0xB3, 0xE3, 0x83,
+	0x81, 0x49, 0xE3, 0x82, 0xBB, 0xE3, 0x83, 0xB3,
+	0xE3, 0x83, 0x88, 0x49, 0xE3, 0x83, 0x86, 0xE3,
+	0x82, 0x99, 0xE3, 0x82, 0xB7, 0x49, 0xE3, 0x83,
+	0x88, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xAB, 0x49,
+	0xE3, 0x83, 0x8E, 0xE3, 0x83, 0x83, 0xE3, 0x83,
+	0x88, 0x49, 0xE3, 0x83, 0x8F, 0xE3, 0x82, 0xA4,
+	// Bytes 2a40 - 2a7f
+	0xE3, 0x83, 0x84, 0x49, 0xE3, 0x83, 0x92, 0xE3,
+	0x82, 0x99, 0xE3, 0x83, 0xAB, 0x49, 0xE3, 0x83,
+	0x92, 0xE3, 0x82, 0x9A, 0xE3, 0x82, 0xB3, 0x49,
+	0xE3, 0x83, 0x95, 0xE3, 0x83, 0xA9, 0xE3, 0x83,
+	0xB3, 0x49, 0xE3, 0x83, 0x98, 0xE3, 0x82, 0x9A,
+	0xE3, 0x82, 0xBD, 0x49, 0xE3, 0x83, 0x98, 0xE3,
+	0x83, 0xAB, 0xE3, 0x83, 0x84, 0x49, 0xE3, 0x83,
+	0x9B, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0xAB, 0x49,
+	// Bytes 2a80 - 2abf
+	0xE3, 0x83, 0x9B, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
+	0xB3, 0x49, 0xE3, 0x83, 0x9E, 0xE3, 0x82, 0xA4,
+	0xE3, 0x83, 0xAB, 0x49, 0xE3, 0x83, 0x9E, 0xE3,
+	0x83, 0x83, 0xE3, 0x83, 0x8F, 0x49, 0xE3, 0x83,
+	0x9E, 0xE3, 0x83, 0xAB, 0xE3, 0x82, 0xAF, 0x49,
+	0xE3, 0x83, 0xA4, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
+	0xAB, 0x49, 0xE3, 0x83, 0xA6, 0xE3, 0x82, 0xA2,
+	0xE3, 0x83, 0xB3, 0x49, 0xE3, 0x83, 0xAF, 0xE3,
+	// Bytes 2ac0 - 2aff
+	0x83, 0x83, 0xE3, 0x83, 0x88, 0x4C, 0xE2, 0x80,
+	0xB2, 0xE2, 0x80, 0xB2, 0xE2, 0x80, 0xB2, 0xE2,
+	0x80, 0xB2, 0x4C, 0xE2, 0x88, 0xAB, 0xE2, 0x88,
+	0xAB, 0xE2, 0x88, 0xAB, 0xE2, 0x88, 0xAB, 0x4C,
+	0xE3, 0x82, 0xA2, 0xE3, 0x83, 0xAB, 0xE3, 0x83,
+	0x95, 0xE3, 0x82, 0xA1, 0x4C, 0xE3, 0x82, 0xA8,
+	0xE3, 0x83, 0xBC, 0xE3, 0x82, 0xAB, 0xE3, 0x83,
+	0xBC, 0x4C, 0xE3, 0x82, 0xAB, 0xE3, 0x82, 0x99,
+	// Bytes 2b00 - 2b3f
+	0xE3, 0x83, 0xAD, 0xE3, 0x83, 0xB3, 0x4C, 0xE3,
+	0x82, 0xAB, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xB3,
+	0xE3, 0x83, 0x9E, 0x4C, 0xE3, 0x82, 0xAB, 0xE3,
+	0x83, 0xA9, 0xE3, 0x83, 0x83, 0xE3, 0x83, 0x88,
+	0x4C, 0xE3, 0x82, 0xAB, 0xE3, 0x83, 0xAD, 0xE3,
+	0x83, 0xAA, 0xE3, 0x83, 0xBC, 0x4C, 0xE3, 0x82,
+	0xAD, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0x8B, 0xE3,
+	0x83, 0xBC, 0x4C, 0xE3, 0x82, 0xAD, 0xE3, 0x83,
+	// Bytes 2b40 - 2b7f
+	0xA5, 0xE3, 0x83, 0xAA, 0xE3, 0x83, 0xBC, 0x4C,
+	0xE3, 0x82, 0xAF, 0xE3, 0x82, 0x99, 0xE3, 0x83,
+	0xA9, 0xE3, 0x83, 0xA0, 0x4C, 0xE3, 0x82, 0xAF,
+	0xE3, 0x83, 0xAD, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
+	0x8D, 0x4C, 0xE3, 0x82, 0xB5, 0xE3, 0x82, 0xA4,
+	0xE3, 0x82, 0xAF, 0xE3, 0x83, 0xAB, 0x4C, 0xE3,
+	0x82, 0xBF, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xBC,
+	0xE3, 0x82, 0xB9, 0x4C, 0xE3, 0x83, 0x8F, 0xE3,
+	// Bytes 2b80 - 2bbf
+	0x82, 0x9A, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0x84,
+	0x4C, 0xE3, 0x83, 0x92, 0xE3, 0x82, 0x9A, 0xE3,
+	0x82, 0xAF, 0xE3, 0x83, 0xAB, 0x4C, 0xE3, 0x83,
+	0x95, 0xE3, 0x82, 0xA3, 0xE3, 0x83, 0xBC, 0xE3,
+	0x83, 0x88, 0x4C, 0xE3, 0x83, 0x98, 0xE3, 0x82,
+	0x99, 0xE3, 0x83, 0xBC, 0xE3, 0x82, 0xBF, 0x4C,
+	0xE3, 0x83, 0x98, 0xE3, 0x82, 0x9A, 0xE3, 0x83,
+	0x8B, 0xE3, 0x83, 0x92, 0x4C, 0xE3, 0x83, 0x98,
+	// Bytes 2bc0 - 2bff
+	0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xB3, 0xE3, 0x82,
+	0xB9, 0x4C, 0xE3, 0x83, 0x9B, 0xE3, 0x82, 0x99,
+	0xE3, 0x83, 0xAB, 0xE3, 0x83, 0x88, 0x4C, 0xE3,
+	0x83, 0x9E, 0xE3, 0x82, 0xA4, 0xE3, 0x82, 0xAF,
+	0xE3, 0x83, 0xAD, 0x4C, 0xE3, 0x83, 0x9F, 0xE3,
+	0x82, 0xAF, 0xE3, 0x83, 0xAD, 0xE3, 0x83, 0xB3,
+	0x4C, 0xE3, 0x83, 0xA1, 0xE3, 0x83, 0xBC, 0xE3,
+	0x83, 0x88, 0xE3, 0x83, 0xAB, 0x4C, 0xE3, 0x83,
+	// Bytes 2c00 - 2c3f
+	0xAA, 0xE3, 0x83, 0x83, 0xE3, 0x83, 0x88, 0xE3,
+	0x83, 0xAB, 0x4C, 0xE3, 0x83, 0xAB, 0xE3, 0x83,
+	0x92, 0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xBC, 0x4C,
+	0xE6, 0xA0, 0xAA, 0xE5, 0xBC, 0x8F, 0xE4, 0xBC,
+	0x9A, 0xE7, 0xA4, 0xBE, 0x4E, 0x28, 0xE1, 0x84,
+	0x8B, 0xE1, 0x85, 0xA9, 0xE1, 0x84, 0x92, 0xE1,
+	0x85, 0xAE, 0x29, 0x4F, 0xD8, 0xAC, 0xD9, 0x84,
+	0x20, 0xD8, 0xAC, 0xD9, 0x84, 0xD8, 0xA7, 0xD9,
+	// Bytes 2c40 - 2c7f
+	0x84, 0xD9, 0x87, 0x4F, 0xE3, 0x82, 0xA2, 0xE3,
+	0x83, 0x8F, 0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xBC,
+	0xE3, 0x83, 0x88, 0x4F, 0xE3, 0x82, 0xA2, 0xE3,
+	0x83, 0xB3, 0xE3, 0x83, 0x98, 0xE3, 0x82, 0x9A,
+	0xE3, 0x82, 0xA2, 0x4F, 0xE3, 0x82, 0xAD, 0xE3,
+	0x83, 0xAD, 0xE3, 0x83, 0xAF, 0xE3, 0x83, 0x83,
+	0xE3, 0x83, 0x88, 0x4F, 0xE3, 0x82, 0xB5, 0xE3,
+	0x83, 0xB3, 0xE3, 0x83, 0x81, 0xE3, 0x83, 0xBC,
+	// Bytes 2c80 - 2cbf
+	0xE3, 0x83, 0xA0, 0x4F, 0xE3, 0x83, 0x8F, 0xE3,
+	0x82, 0x99, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0xAC,
+	0xE3, 0x83, 0xAB, 0x4F, 0xE3, 0x83, 0x98, 0xE3,
+	0x82, 0xAF, 0xE3, 0x82, 0xBF, 0xE3, 0x83, 0xBC,
+	0xE3, 0x83, 0xAB, 0x4F, 0xE3, 0x83, 0x9B, 0xE3,
+	0x82, 0x9A, 0xE3, 0x82, 0xA4, 0xE3, 0x83, 0xB3,
+	0xE3, 0x83, 0x88, 0x4F, 0xE3, 0x83, 0x9E, 0xE3,
+	0x83, 0xB3, 0xE3, 0x82, 0xB7, 0xE3, 0x83, 0xA7,
+	// Bytes 2cc0 - 2cff
+	0xE3, 0x83, 0xB3, 0x4F, 0xE3, 0x83, 0xA1, 0xE3,
+	0x82, 0xAB, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0x88,
+	0xE3, 0x83, 0xB3, 0x4F, 0xE3, 0x83, 0xAB, 0xE3,
+	0x83, 0xBC, 0xE3, 0x83, 0x95, 0xE3, 0x82, 0x99,
+	0xE3, 0x83, 0xAB, 0x51, 0x28, 0xE1, 0x84, 0x8B,
+	0xE1, 0x85, 0xA9, 0xE1, 0x84, 0x8C, 0xE1, 0x85,
+	0xA5, 0xE1, 0x86, 0xAB, 0x29, 0x52, 0xE3, 0x82,
+	0xAD, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xAB, 0xE3,
+	// Bytes 2d00 - 2d3f
+	0x82, 0xBF, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xBC,
+	0x52, 0xE3, 0x82, 0xAD, 0xE3, 0x83, 0xAD, 0xE3,
+	0x82, 0xAF, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xA9,
+	0xE3, 0x83, 0xA0, 0x52, 0xE3, 0x82, 0xAD, 0xE3,
+	0x83, 0xAD, 0xE3, 0x83, 0xA1, 0xE3, 0x83, 0xBC,
+	0xE3, 0x83, 0x88, 0xE3, 0x83, 0xAB, 0x52, 0xE3,
+	0x82, 0xAF, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xA9,
+	0xE3, 0x83, 0xA0, 0xE3, 0x83, 0x88, 0xE3, 0x83,
+	// Bytes 2d40 - 2d7f
+	0xB3, 0x52, 0xE3, 0x82, 0xAF, 0xE3, 0x83, 0xAB,
+	0xE3, 0x82, 0xBB, 0xE3, 0x82, 0x99, 0xE3, 0x82,
+	0xA4, 0xE3, 0x83, 0xAD, 0x52, 0xE3, 0x83, 0x8F,
+	0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xBC, 0xE3, 0x82,
+	0xBB, 0xE3, 0x83, 0xB3, 0xE3, 0x83, 0x88, 0x52,
+	0xE3, 0x83, 0x92, 0xE3, 0x82, 0x9A, 0xE3, 0x82,
+	0xA2, 0xE3, 0x82, 0xB9, 0xE3, 0x83, 0x88, 0xE3,
+	0x83, 0xAB, 0x52, 0xE3, 0x83, 0x95, 0xE3, 0x82,
+	// Bytes 2d80 - 2dbf
+	0x99, 0xE3, 0x83, 0x83, 0xE3, 0x82, 0xB7, 0xE3,
+	0x82, 0xA7, 0xE3, 0x83, 0xAB, 0x52, 0xE3, 0x83,
+	0x9F, 0xE3, 0x83, 0xAA, 0xE3, 0x83, 0x8F, 0xE3,
+	0x82, 0x99, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0xAB,
+	0x52, 0xE3, 0x83, 0xAC, 0xE3, 0x83, 0xB3, 0xE3,
+	0x83, 0x88, 0xE3, 0x82, 0xB1, 0xE3, 0x82, 0x99,
+	0xE3, 0x83, 0xB3, 0x61, 0xD8, 0xB5, 0xD9, 0x84,
+	0xD9, 0x89, 0x20, 0xD8, 0xA7, 0xD9, 0x84, 0xD9,
+	// Bytes 2dc0 - 2dff
+	0x84, 0xD9, 0x87, 0x20, 0xD8, 0xB9, 0xD9, 0x84,
+	0xD9, 0x8A, 0xD9, 0x87, 0x20, 0xD9, 0x88, 0xD8,
+	0xB3, 0xD9, 0x84, 0xD9, 0x85, 0x06, 0xE0, 0xA7,
+	0x87, 0xE0, 0xA6, 0xBE, 0x01, 0x06, 0xE0, 0xA7,
+	0x87, 0xE0, 0xA7, 0x97, 0x01, 0x06, 0xE0, 0xAD,
+	0x87, 0xE0, 0xAC, 0xBE, 0x01, 0x06, 0xE0, 0xAD,
+	0x87, 0xE0, 0xAD, 0x96, 0x01, 0x06, 0xE0, 0xAD,
+	0x87, 0xE0, 0xAD, 0x97, 0x01, 0x06, 0xE0, 0xAE,
+	// Bytes 2e00 - 2e3f
+	0x92, 0xE0, 0xAF, 0x97, 0x01, 0x06, 0xE0, 0xAF,
+	0x86, 0xE0, 0xAE, 0xBE, 0x01, 0x06, 0xE0, 0xAF,
+	0x86, 0xE0, 0xAF, 0x97, 0x01, 0x06, 0xE0, 0xAF,
+	0x87, 0xE0, 0xAE, 0xBE, 0x01, 0x06, 0xE0, 0xB2,
+	0xBF, 0xE0, 0xB3, 0x95, 0x01, 0x06, 0xE0, 0xB3,
+	0x86, 0xE0, 0xB3, 0x95, 0x01, 0x06, 0xE0, 0xB3,
+	0x86, 0xE0, 0xB3, 0x96, 0x01, 0x06, 0xE0, 0xB5,
+	0x86, 0xE0, 0xB4, 0xBE, 0x01, 0x06, 0xE0, 0xB5,
+	// Bytes 2e40 - 2e7f
+	0x86, 0xE0, 0xB5, 0x97, 0x01, 0x06, 0xE0, 0xB5,
+	0x87, 0xE0, 0xB4, 0xBE, 0x01, 0x06, 0xE0, 0xB7,
+	0x99, 0xE0, 0xB7, 0x9F, 0x01, 0x06, 0xE1, 0x80,
+	0xA5, 0xE1, 0x80, 0xAE, 0x01, 0x06, 0xE1, 0xAC,
+	0x85, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAC,
+	0x87, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAC,
+	0x89, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAC,
+	0x8B, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAC,
+	// Bytes 2e80 - 2ebf
+	0x8D, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAC,
+	0x91, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAC,
+	0xBA, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAC,
+	0xBC, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAC,
+	0xBE, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAC,
+	0xBF, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1, 0xAD,
+	0x82, 0xE1, 0xAC, 0xB5, 0x01, 0x08, 0xF0, 0x91,
+	0x84, 0xB1, 0xF0, 0x91, 0x84, 0xA7, 0x01, 0x08,
+	// Bytes 2ec0 - 2eff
+	0xF0, 0x91, 0x84, 0xB2, 0xF0, 0x91, 0x84, 0xA7,
+	0x01, 0x08, 0xF0, 0x91, 0x8D, 0x87, 0xF0, 0x91,
+	0x8C, 0xBE, 0x01, 0x08, 0xF0, 0x91, 0x8D, 0x87,
+	0xF0, 0x91, 0x8D, 0x97, 0x01, 0x08, 0xF0, 0x91,
+	0x92, 0xB9, 0xF0, 0x91, 0x92, 0xB0, 0x01, 0x08,
+	0xF0, 0x91, 0x92, 0xB9, 0xF0, 0x91, 0x92, 0xBA,
+	0x01, 0x08, 0xF0, 0x91, 0x92, 0xB9, 0xF0, 0x91,
+	0x92, 0xBD, 0x01, 0x08, 0xF0, 0x91, 0x96, 0xB8,
+	// Bytes 2f00 - 2f3f
+	0xF0, 0x91, 0x96, 0xAF, 0x01, 0x08, 0xF0, 0x91,
+	0x96, 0xB9, 0xF0, 0x91, 0x96, 0xAF, 0x01, 0x08,
+	0xF0, 0x91, 0xA4, 0xB5, 0xF0, 0x91, 0xA4, 0xB0,
+	0x01, 0x09, 0xE0, 0xB3, 0x86, 0xE0, 0xB3, 0x82,
+	0xE0, 0xB3, 0x95, 0x02, 0x09, 0xE0, 0xB7, 0x99,
+	0xE0, 0xB7, 0x8F, 0xE0, 0xB7, 0x8A, 0x16, 0x44,
+	0x44, 0x5A, 0xCC, 0x8C, 0xCD, 0x44, 0x44, 0x7A,
+	0xCC, 0x8C, 0xCD, 0x44, 0x64, 0x7A, 0xCC, 0x8C,
+	// Bytes 2f40 - 2f7f
+	0xCD, 0x46, 0xD9, 0x84, 0xD8, 0xA7, 0xD9, 0x93,
+	0xCD, 0x46, 0xD9, 0x84, 0xD8, 0xA7, 0xD9, 0x94,
+	0xCD, 0x46, 0xD9, 0x84, 0xD8, 0xA7, 0xD9, 0x95,
+	0xB9, 0x46, 0xE1, 0x84, 0x80, 0xE1, 0x85, 0xA1,
+	0x01, 0x46, 0xE1, 0x84, 0x82, 0xE1, 0x85, 0xA1,
+	0x01, 0x46, 0xE1, 0x84, 0x83, 0xE1, 0x85, 0xA1,
+	0x01, 0x46, 0xE1, 0x84, 0x85, 0xE1, 0x85, 0xA1,
+	0x01, 0x46, 0xE1, 0x84, 0x86, 0xE1, 0x85, 0xA1,
+	// Bytes 2f80 - 2fbf
+	0x01, 0x46, 0xE1, 0x84, 0x87, 0xE1, 0x85, 0xA1,
+	0x01, 0x46, 0xE1, 0x84, 0x89, 0xE1, 0x85, 0xA1,
+	0x01, 0x46, 0xE1, 0x84, 0x8B, 0xE1, 0x85, 0xA1,
+	0x01, 0x46, 0xE1, 0x84, 0x8B, 0xE1, 0x85, 0xAE,
+	0x01, 0x46, 0xE1, 0x84, 0x8C, 0xE1, 0x85, 0xA1,
+	0x01, 0x46, 0xE1, 0x84, 0x8E, 0xE1, 0x85, 0xA1,
+	0x01, 0x46, 0xE1, 0x84, 0x8F, 0xE1, 0x85, 0xA1,
+	0x01, 0x46, 0xE1, 0x84, 0x90, 0xE1, 0x85, 0xA1,
+	// Bytes 2fc0 - 2fff
+	0x01, 0x46, 0xE1, 0x84, 0x91, 0xE1, 0x85, 0xA1,
+	0x01, 0x46, 0xE1, 0x84, 0x92, 0xE1, 0x85, 0xA1,
+	0x01, 0x49, 0xE3, 0x83, 0xA1, 0xE3, 0x82, 0xAB,
+	0xE3, 0x82, 0x99, 0x11, 0x4C, 0xE1, 0x84, 0x8C,
+	0xE1, 0x85, 0xAE, 0xE1, 0x84, 0x8B, 0xE1, 0x85,
+	0xB4, 0x01, 0x4C, 0xE3, 0x82, 0xAD, 0xE3, 0x82,
+	0x99, 0xE3, 0x82, 0xAB, 0xE3, 0x82, 0x99, 0x11,
+	0x4C, 0xE3, 0x82, 0xB3, 0xE3, 0x83, 0xBC, 0xE3,
+	// Bytes 3000 - 303f
+	0x83, 0x9B, 0xE3, 0x82, 0x9A, 0x11, 0x4C, 0xE3,
+	0x83, 0xA4, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0x88,
+	0xE3, 0x82, 0x99, 0x11, 0x4F, 0xE1, 0x84, 0x8E,
+	0xE1, 0x85, 0xA1, 0xE1, 0x86, 0xB7, 0xE1, 0x84,
+	0x80, 0xE1, 0x85, 0xA9, 0x01, 0x4F, 0xE3, 0x82,
+	0xA4, 0xE3, 0x83, 0x8B, 0xE3, 0x83, 0xB3, 0xE3,
+	0x82, 0xAF, 0xE3, 0x82, 0x99, 0x11, 0x4F, 0xE3,
+	0x82, 0xB7, 0xE3, 0x83, 0xAA, 0xE3, 0x83, 0xB3,
+	// Bytes 3040 - 307f
+	0xE3, 0x82, 0xAF, 0xE3, 0x82, 0x99, 0x11, 0x4F,
+	0xE3, 0x83, 0x98, 0xE3, 0x82, 0x9A, 0xE3, 0x83,
+	0xBC, 0xE3, 0x82, 0xB7, 0xE3, 0x82, 0x99, 0x11,
+	0x4F, 0xE3, 0x83, 0x9B, 0xE3, 0x82, 0x9A, 0xE3,
+	0x83, 0xB3, 0xE3, 0x83, 0x88, 0xE3, 0x82, 0x99,
+	0x11, 0x52, 0xE3, 0x82, 0xA8, 0xE3, 0x82, 0xB9,
+	0xE3, 0x82, 0xAF, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
+	0x88, 0xE3, 0x82, 0x99, 0x11, 0x52, 0xE3, 0x83,
+	// Bytes 3080 - 30bf
+	0x95, 0xE3, 0x82, 0xA1, 0xE3, 0x83, 0xA9, 0xE3,
+	0x83, 0x83, 0xE3, 0x83, 0x88, 0xE3, 0x82, 0x99,
+	0x11, 0x86, 0xE0, 0xB3, 0x86, 0xE0, 0xB3, 0x82,
+	0x01, 0x86, 0xE0, 0xB7, 0x99, 0xE0, 0xB7, 0x8F,
+	0x01, 0x03, 0x3C, 0xCC, 0xB8, 0x05, 0x03, 0x3D,
+	0xCC, 0xB8, 0x05, 0x03, 0x3E, 0xCC, 0xB8, 0x05,
+	0x03, 0x41, 0xCC, 0x80, 0xCD, 0x03, 0x41, 0xCC,
+	0x81, 0xCD, 0x03, 0x41, 0xCC, 0x83, 0xCD, 0x03,
+	// Bytes 30c0 - 30ff
+	0x41, 0xCC, 0x84, 0xCD, 0x03, 0x41, 0xCC, 0x89,
+	0xCD, 0x03, 0x41, 0xCC, 0x8C, 0xCD, 0x03, 0x41,
+	0xCC, 0x8F, 0xCD, 0x03, 0x41, 0xCC, 0x91, 0xCD,
+	0x03, 0x41, 0xCC, 0xA5, 0xB9, 0x03, 0x41, 0xCC,
+	0xA8, 0xA9, 0x03, 0x42, 0xCC, 0x87, 0xCD, 0x03,
+	0x42, 0xCC, 0xA3, 0xB9, 0x03, 0x42, 0xCC, 0xB1,
+	0xB9, 0x03, 0x43, 0xCC, 0x81, 0xCD, 0x03, 0x43,
+	0xCC, 0x82, 0xCD, 0x03, 0x43, 0xCC, 0x87, 0xCD,
+	// Bytes 3100 - 313f
+	0x03, 0x43, 0xCC, 0x8C, 0xCD, 0x03, 0x44, 0xCC,
+	0x87, 0xCD, 0x03, 0x44, 0xCC, 0x8C, 0xCD, 0x03,
+	0x44, 0xCC, 0xA3, 0xB9, 0x03, 0x44, 0xCC, 0xA7,
+	0xA9, 0x03, 0x44, 0xCC, 0xAD, 0xB9, 0x03, 0x44,
+	0xCC, 0xB1, 0xB9, 0x03, 0x45, 0xCC, 0x80, 0xCD,
+	0x03, 0x45, 0xCC, 0x81, 0xCD, 0x03, 0x45, 0xCC,
+	0x83, 0xCD, 0x03, 0x45, 0xCC, 0x86, 0xCD, 0x03,
+	0x45, 0xCC, 0x87, 0xCD, 0x03, 0x45, 0xCC, 0x88,
+	// Bytes 3140 - 317f
+	0xCD, 0x03, 0x45, 0xCC, 0x89, 0xCD, 0x03, 0x45,
+	0xCC, 0x8C, 0xCD, 0x03, 0x45, 0xCC, 0x8F, 0xCD,
+	0x03, 0x45, 0xCC, 0x91, 0xCD, 0x03, 0x45, 0xCC,
+	0xA8, 0xA9, 0x03, 0x45, 0xCC, 0xAD, 0xB9, 0x03,
+	0x45, 0xCC, 0xB0, 0xB9, 0x03, 0x46, 0xCC, 0x87,
+	0xCD, 0x03, 0x47, 0xCC, 0x81, 0xCD, 0x03, 0x47,
+	0xCC, 0x82, 0xCD, 0x03, 0x47, 0xCC, 0x84, 0xCD,
+	0x03, 0x47, 0xCC, 0x86, 0xCD, 0x03, 0x47, 0xCC,
+	// Bytes 3180 - 31bf
+	0x87, 0xCD, 0x03, 0x47, 0xCC, 0x8C, 0xCD, 0x03,
+	0x47, 0xCC, 0xA7, 0xA9, 0x03, 0x48, 0xCC, 0x82,
+	0xCD, 0x03, 0x48, 0xCC, 0x87, 0xCD, 0x03, 0x48,
+	0xCC, 0x88, 0xCD, 0x03, 0x48, 0xCC, 0x8C, 0xCD,
+	0x03, 0x48, 0xCC, 0xA3, 0xB9, 0x03, 0x48, 0xCC,
+	0xA7, 0xA9, 0x03, 0x48, 0xCC, 0xAE, 0xB9, 0x03,
+	0x49, 0xCC, 0x80, 0xCD, 0x03, 0x49, 0xCC, 0x81,
+	0xCD, 0x03, 0x49, 0xCC, 0x82, 0xCD, 0x03, 0x49,
+	// Bytes 31c0 - 31ff
+	0xCC, 0x83, 0xCD, 0x03, 0x49, 0xCC, 0x84, 0xCD,
+	0x03, 0x49, 0xCC, 0x86, 0xCD, 0x03, 0x49, 0xCC,
+	0x87, 0xCD, 0x03, 0x49, 0xCC, 0x89, 0xCD, 0x03,
+	0x49, 0xCC, 0x8C, 0xCD, 0x03, 0x49, 0xCC, 0x8F,
+	0xCD, 0x03, 0x49, 0xCC, 0x91, 0xCD, 0x03, 0x49,
+	0xCC, 0xA3, 0xB9, 0x03, 0x49, 0xCC, 0xA8, 0xA9,
+	0x03, 0x49, 0xCC, 0xB0, 0xB9, 0x03, 0x4A, 0xCC,
+	0x82, 0xCD, 0x03, 0x4B, 0xCC, 0x81, 0xCD, 0x03,
+	// Bytes 3200 - 323f
+	0x4B, 0xCC, 0x8C, 0xCD, 0x03, 0x4B, 0xCC, 0xA3,
+	0xB9, 0x03, 0x4B, 0xCC, 0xA7, 0xA9, 0x03, 0x4B,
+	0xCC, 0xB1, 0xB9, 0x03, 0x4C, 0xCC, 0x81, 0xCD,
+	0x03, 0x4C, 0xCC, 0x8C, 0xCD, 0x03, 0x4C, 0xCC,
+	0xA7, 0xA9, 0x03, 0x4C, 0xCC, 0xAD, 0xB9, 0x03,
+	0x4C, 0xCC, 0xB1, 0xB9, 0x03, 0x4D, 0xCC, 0x81,
+	0xCD, 0x03, 0x4D, 0xCC, 0x87, 0xCD, 0x03, 0x4D,
+	0xCC, 0xA3, 0xB9, 0x03, 0x4E, 0xCC, 0x80, 0xCD,
+	// Bytes 3240 - 327f
+	0x03, 0x4E, 0xCC, 0x81, 0xCD, 0x03, 0x4E, 0xCC,
+	0x83, 0xCD, 0x03, 0x4E, 0xCC, 0x87, 0xCD, 0x03,
+	0x4E, 0xCC, 0x8C, 0xCD, 0x03, 0x4E, 0xCC, 0xA3,
+	0xB9, 0x03, 0x4E, 0xCC, 0xA7, 0xA9, 0x03, 0x4E,
+	0xCC, 0xAD, 0xB9, 0x03, 0x4E, 0xCC, 0xB1, 0xB9,
+	0x03, 0x4F, 0xCC, 0x80, 0xCD, 0x03, 0x4F, 0xCC,
+	0x81, 0xCD, 0x03, 0x4F, 0xCC, 0x86, 0xCD, 0x03,
+	0x4F, 0xCC, 0x89, 0xCD, 0x03, 0x4F, 0xCC, 0x8B,
+	// Bytes 3280 - 32bf
+	0xCD, 0x03, 0x4F, 0xCC, 0x8C, 0xCD, 0x03, 0x4F,
+	0xCC, 0x8F, 0xCD, 0x03, 0x4F, 0xCC, 0x91, 0xCD,
+	0x03, 0x50, 0xCC, 0x81, 0xCD, 0x03, 0x50, 0xCC,
+	0x87, 0xCD, 0x03, 0x52, 0xCC, 0x81, 0xCD, 0x03,
+	0x52, 0xCC, 0x87, 0xCD, 0x03, 0x52, 0xCC, 0x8C,
+	0xCD, 0x03, 0x52, 0xCC, 0x8F, 0xCD, 0x03, 0x52,
+	0xCC, 0x91, 0xCD, 0x03, 0x52, 0xCC, 0xA7, 0xA9,
+	0x03, 0x52, 0xCC, 0xB1, 0xB9, 0x03, 0x53, 0xCC,
+	// Bytes 32c0 - 32ff
+	0x82, 0xCD, 0x03, 0x53, 0xCC, 0x87, 0xCD, 0x03,
+	0x53, 0xCC, 0xA6, 0xB9, 0x03, 0x53, 0xCC, 0xA7,
+	0xA9, 0x03, 0x54, 0xCC, 0x87, 0xCD, 0x03, 0x54,
+	0xCC, 0x8C, 0xCD, 0x03, 0x54, 0xCC, 0xA3, 0xB9,
+	0x03, 0x54, 0xCC, 0xA6, 0xB9, 0x03, 0x54, 0xCC,
+	0xA7, 0xA9, 0x03, 0x54, 0xCC, 0xAD, 0xB9, 0x03,
+	0x54, 0xCC, 0xB1, 0xB9, 0x03, 0x55, 0xCC, 0x80,
+	0xCD, 0x03, 0x55, 0xCC, 0x81, 0xCD, 0x03, 0x55,
+	// Bytes 3300 - 333f
+	0xCC, 0x82, 0xCD, 0x03, 0x55, 0xCC, 0x86, 0xCD,
+	0x03, 0x55, 0xCC, 0x89, 0xCD, 0x03, 0x55, 0xCC,
+	0x8A, 0xCD, 0x03, 0x55, 0xCC, 0x8B, 0xCD, 0x03,
+	0x55, 0xCC, 0x8C, 0xCD, 0x03, 0x55, 0xCC, 0x8F,
+	0xCD, 0x03, 0x55, 0xCC, 0x91, 0xCD, 0x03, 0x55,
+	0xCC, 0xA3, 0xB9, 0x03, 0x55, 0xCC, 0xA4, 0xB9,
+	0x03, 0x55, 0xCC, 0xA8, 0xA9, 0x03, 0x55, 0xCC,
+	0xAD, 0xB9, 0x03, 0x55, 0xCC, 0xB0, 0xB9, 0x03,
+	// Bytes 3340 - 337f
+	0x56, 0xCC, 0x83, 0xCD, 0x03, 0x56, 0xCC, 0xA3,
+	0xB9, 0x03, 0x57, 0xCC, 0x80, 0xCD, 0x03, 0x57,
+	0xCC, 0x81, 0xCD, 0x03, 0x57, 0xCC, 0x82, 0xCD,
+	0x03, 0x57, 0xCC, 0x87, 0xCD, 0x03, 0x57, 0xCC,
+	0x88, 0xCD, 0x03, 0x57, 0xCC, 0xA3, 0xB9, 0x03,
+	0x58, 0xCC, 0x87, 0xCD, 0x03, 0x58, 0xCC, 0x88,
+	0xCD, 0x03, 0x59, 0xCC, 0x80, 0xCD, 0x03, 0x59,
+	0xCC, 0x81, 0xCD, 0x03, 0x59, 0xCC, 0x82, 0xCD,
+	// Bytes 3380 - 33bf
+	0x03, 0x59, 0xCC, 0x83, 0xCD, 0x03, 0x59, 0xCC,
+	0x84, 0xCD, 0x03, 0x59, 0xCC, 0x87, 0xCD, 0x03,
+	0x59, 0xCC, 0x88, 0xCD, 0x03, 0x59, 0xCC, 0x89,
+	0xCD, 0x03, 0x59, 0xCC, 0xA3, 0xB9, 0x03, 0x5A,
+	0xCC, 0x81, 0xCD, 0x03, 0x5A, 0xCC, 0x82, 0xCD,
+	0x03, 0x5A, 0xCC, 0x87, 0xCD, 0x03, 0x5A, 0xCC,
+	0x8C, 0xCD, 0x03, 0x5A, 0xCC, 0xA3, 0xB9, 0x03,
+	0x5A, 0xCC, 0xB1, 0xB9, 0x03, 0x61, 0xCC, 0x80,
+	// Bytes 33c0 - 33ff
+	0xCD, 0x03, 0x61, 0xCC, 0x81, 0xCD, 0x03, 0x61,
+	0xCC, 0x83, 0xCD, 0x03, 0x61, 0xCC, 0x84, 0xCD,
+	0x03, 0x61, 0xCC, 0x89, 0xCD, 0x03, 0x61, 0xCC,
+	0x8C, 0xCD, 0x03, 0x61, 0xCC, 0x8F, 0xCD, 0x03,
+	0x61, 0xCC, 0x91, 0xCD, 0x03, 0x61, 0xCC, 0xA5,
+	0xB9, 0x03, 0x61, 0xCC, 0xA8, 0xA9, 0x03, 0x62,
+	0xCC, 0x87, 0xCD, 0x03, 0x62, 0xCC, 0xA3, 0xB9,
+	0x03, 0x62, 0xCC, 0xB1, 0xB9, 0x03, 0x63, 0xCC,
+	// Bytes 3400 - 343f
+	0x81, 0xCD, 0x03, 0x63, 0xCC, 0x82, 0xCD, 0x03,
+	0x63, 0xCC, 0x87, 0xCD, 0x03, 0x63, 0xCC, 0x8C,
+	0xCD, 0x03, 0x64, 0xCC, 0x87, 0xCD, 0x03, 0x64,
+	0xCC, 0x8C, 0xCD, 0x03, 0x64, 0xCC, 0xA3, 0xB9,
+	0x03, 0x64, 0xCC, 0xA7, 0xA9, 0x03, 0x64, 0xCC,
+	0xAD, 0xB9, 0x03, 0x64, 0xCC, 0xB1, 0xB9, 0x03,
+	0x65, 0xCC, 0x80, 0xCD, 0x03, 0x65, 0xCC, 0x81,
+	0xCD, 0x03, 0x65, 0xCC, 0x83, 0xCD, 0x03, 0x65,
+	// Bytes 3440 - 347f
+	0xCC, 0x86, 0xCD, 0x03, 0x65, 0xCC, 0x87, 0xCD,
+	0x03, 0x65, 0xCC, 0x88, 0xCD, 0x03, 0x65, 0xCC,
+	0x89, 0xCD, 0x03, 0x65, 0xCC, 0x8C, 0xCD, 0x03,
+	0x65, 0xCC, 0x8F, 0xCD, 0x03, 0x65, 0xCC, 0x91,
+	0xCD, 0x03, 0x65, 0xCC, 0xA8, 0xA9, 0x03, 0x65,
+	0xCC, 0xAD, 0xB9, 0x03, 0x65, 0xCC, 0xB0, 0xB9,
+	0x03, 0x66, 0xCC, 0x87, 0xCD, 0x03, 0x67, 0xCC,
+	0x81, 0xCD, 0x03, 0x67, 0xCC, 0x82, 0xCD, 0x03,
+	// Bytes 3480 - 34bf
+	0x67, 0xCC, 0x84, 0xCD, 0x03, 0x67, 0xCC, 0x86,
+	0xCD, 0x03, 0x67, 0xCC, 0x87, 0xCD, 0x03, 0x67,
+	0xCC, 0x8C, 0xCD, 0x03, 0x67, 0xCC, 0xA7, 0xA9,
+	0x03, 0x68, 0xCC, 0x82, 0xCD, 0x03, 0x68, 0xCC,
+	0x87, 0xCD, 0x03, 0x68, 0xCC, 0x88, 0xCD, 0x03,
+	0x68, 0xCC, 0x8C, 0xCD, 0x03, 0x68, 0xCC, 0xA3,
+	0xB9, 0x03, 0x68, 0xCC, 0xA7, 0xA9, 0x03, 0x68,
+	0xCC, 0xAE, 0xB9, 0x03, 0x68, 0xCC, 0xB1, 0xB9,
+	// Bytes 34c0 - 34ff
+	0x03, 0x69, 0xCC, 0x80, 0xCD, 0x03, 0x69, 0xCC,
+	0x81, 0xCD, 0x03, 0x69, 0xCC, 0x82, 0xCD, 0x03,
+	0x69, 0xCC, 0x83, 0xCD, 0x03, 0x69, 0xCC, 0x84,
+	0xCD, 0x03, 0x69, 0xCC, 0x86, 0xCD, 0x03, 0x69,
+	0xCC, 0x89, 0xCD, 0x03, 0x69, 0xCC, 0x8C, 0xCD,
+	0x03, 0x69, 0xCC, 0x8F, 0xCD, 0x03, 0x69, 0xCC,
+	0x91, 0xCD, 0x03, 0x69, 0xCC, 0xA3, 0xB9, 0x03,
+	0x69, 0xCC, 0xA8, 0xA9, 0x03, 0x69, 0xCC, 0xB0,
+	// Bytes 3500 - 353f
+	0xB9, 0x03, 0x6A, 0xCC, 0x82, 0xCD, 0x03, 0x6A,
+	0xCC, 0x8C, 0xCD, 0x03, 0x6B, 0xCC, 0x81, 0xCD,
+	0x03, 0x6B, 0xCC, 0x8C, 0xCD, 0x03, 0x6B, 0xCC,
+	0xA3, 0xB9, 0x03, 0x6B, 0xCC, 0xA7, 0xA9, 0x03,
+	0x6B, 0xCC, 0xB1, 0xB9, 0x03, 0x6C, 0xCC, 0x81,
+	0xCD, 0x03, 0x6C, 0xCC, 0x8C, 0xCD, 0x03, 0x6C,
+	0xCC, 0xA7, 0xA9, 0x03, 0x6C, 0xCC, 0xAD, 0xB9,
+	0x03, 0x6C, 0xCC, 0xB1, 0xB9, 0x03, 0x6D, 0xCC,
+	// Bytes 3540 - 357f
+	0x81, 0xCD, 0x03, 0x6D, 0xCC, 0x87, 0xCD, 0x03,
+	0x6D, 0xCC, 0xA3, 0xB9, 0x03, 0x6E, 0xCC, 0x80,
+	0xCD, 0x03, 0x6E, 0xCC, 0x81, 0xCD, 0x03, 0x6E,
+	0xCC, 0x83, 0xCD, 0x03, 0x6E, 0xCC, 0x87, 0xCD,
+	0x03, 0x6E, 0xCC, 0x8C, 0xCD, 0x03, 0x6E, 0xCC,
+	0xA3, 0xB9, 0x03, 0x6E, 0xCC, 0xA7, 0xA9, 0x03,
+	0x6E, 0xCC, 0xAD, 0xB9, 0x03, 0x6E, 0xCC, 0xB1,
+	0xB9, 0x03, 0x6F, 0xCC, 0x80, 0xCD, 0x03, 0x6F,
+	// Bytes 3580 - 35bf
+	0xCC, 0x81, 0xCD, 0x03, 0x6F, 0xCC, 0x86, 0xCD,
+	0x03, 0x6F, 0xCC, 0x89, 0xCD, 0x03, 0x6F, 0xCC,
+	0x8B, 0xCD, 0x03, 0x6F, 0xCC, 0x8C, 0xCD, 0x03,
+	0x6F, 0xCC, 0x8F, 0xCD, 0x03, 0x6F, 0xCC, 0x91,
+	0xCD, 0x03, 0x70, 0xCC, 0x81, 0xCD, 0x03, 0x70,
+	0xCC, 0x87, 0xCD, 0x03, 0x72, 0xCC, 0x81, 0xCD,
+	0x03, 0x72, 0xCC, 0x87, 0xCD, 0x03, 0x72, 0xCC,
+	0x8C, 0xCD, 0x03, 0x72, 0xCC, 0x8F, 0xCD, 0x03,
+	// Bytes 35c0 - 35ff
+	0x72, 0xCC, 0x91, 0xCD, 0x03, 0x72, 0xCC, 0xA7,
+	0xA9, 0x03, 0x72, 0xCC, 0xB1, 0xB9, 0x03, 0x73,
+	0xCC, 0x82, 0xCD, 0x03, 0x73, 0xCC, 0x87, 0xCD,
+	0x03, 0x73, 0xCC, 0xA6, 0xB9, 0x03, 0x73, 0xCC,
+	0xA7, 0xA9, 0x03, 0x74, 0xCC, 0x87, 0xCD, 0x03,
+	0x74, 0xCC, 0x88, 0xCD, 0x03, 0x74, 0xCC, 0x8C,
+	0xCD, 0x03, 0x74, 0xCC, 0xA3, 0xB9, 0x03, 0x74,
+	0xCC, 0xA6, 0xB9, 0x03, 0x74, 0xCC, 0xA7, 0xA9,
+	// Bytes 3600 - 363f
+	0x03, 0x74, 0xCC, 0xAD, 0xB9, 0x03, 0x74, 0xCC,
+	0xB1, 0xB9, 0x03, 0x75, 0xCC, 0x80, 0xCD, 0x03,
+	0x75, 0xCC, 0x81, 0xCD, 0x03, 0x75, 0xCC, 0x82,
+	0xCD, 0x03, 0x75, 0xCC, 0x86, 0xCD, 0x03, 0x75,
+	0xCC, 0x89, 0xCD, 0x03, 0x75, 0xCC, 0x8A, 0xCD,
+	0x03, 0x75, 0xCC, 0x8B, 0xCD, 0x03, 0x75, 0xCC,
+	0x8C, 0xCD, 0x03, 0x75, 0xCC, 0x8F, 0xCD, 0x03,
+	0x75, 0xCC, 0x91, 0xCD, 0x03, 0x75, 0xCC, 0xA3,
+	// Bytes 3640 - 367f
+	0xB9, 0x03, 0x75, 0xCC, 0xA4, 0xB9, 0x03, 0x75,
+	0xCC, 0xA8, 0xA9, 0x03, 0x75, 0xCC, 0xAD, 0xB9,
+	0x03, 0x75, 0xCC, 0xB0, 0xB9, 0x03, 0x76, 0xCC,
+	0x83, 0xCD, 0x03, 0x76, 0xCC, 0xA3, 0xB9, 0x03,
+	0x77, 0xCC, 0x80, 0xCD, 0x03, 0x77, 0xCC, 0x81,
+	0xCD, 0x03, 0x77, 0xCC, 0x82, 0xCD, 0x03, 0x77,
+	0xCC, 0x87, 0xCD, 0x03, 0x77, 0xCC, 0x88, 0xCD,
+	0x03, 0x77, 0xCC, 0x8A, 0xCD, 0x03, 0x77, 0xCC,
+	// Bytes 3680 - 36bf
+	0xA3, 0xB9, 0x03, 0x78, 0xCC, 0x87, 0xCD, 0x03,
+	0x78, 0xCC, 0x88, 0xCD, 0x03, 0x79, 0xCC, 0x80,
+	0xCD, 0x03, 0x79, 0xCC, 0x81, 0xCD, 0x03, 0x79,
+	0xCC, 0x82, 0xCD, 0x03, 0x79, 0xCC, 0x83, 0xCD,
+	0x03, 0x79, 0xCC, 0x84, 0xCD, 0x03, 0x79, 0xCC,
+	0x87, 0xCD, 0x03, 0x79, 0xCC, 0x88, 0xCD, 0x03,
+	0x79, 0xCC, 0x89, 0xCD, 0x03, 0x79, 0xCC, 0x8A,
+	0xCD, 0x03, 0x79, 0xCC, 0xA3, 0xB9, 0x03, 0x7A,
+	// Bytes 36c0 - 36ff
+	0xCC, 0x81, 0xCD, 0x03, 0x7A, 0xCC, 0x82, 0xCD,
+	0x03, 0x7A, 0xCC, 0x87, 0xCD, 0x03, 0x7A, 0xCC,
+	0x8C, 0xCD, 0x03, 0x7A, 0xCC, 0xA3, 0xB9, 0x03,
+	0x7A, 0xCC, 0xB1, 0xB9, 0x04, 0xC2, 0xA8, 0xCC,
+	0x80, 0xCE, 0x04, 0xC2, 0xA8, 0xCC, 0x81, 0xCE,
+	0x04, 0xC2, 0xA8, 0xCD, 0x82, 0xCE, 0x04, 0xC3,
+	0x86, 0xCC, 0x81, 0xCD, 0x04, 0xC3, 0x86, 0xCC,
+	0x84, 0xCD, 0x04, 0xC3, 0x98, 0xCC, 0x81, 0xCD,
+	// Bytes 3700 - 373f
+	0x04, 0xC3, 0xA6, 0xCC, 0x81, 0xCD, 0x04, 0xC3,
+	0xA6, 0xCC, 0x84, 0xCD, 0x04, 0xC3, 0xB8, 0xCC,
+	0x81, 0xCD, 0x04, 0xC5, 0xBF, 0xCC, 0x87, 0xCD,
+	0x04, 0xC6, 0xB7, 0xCC, 0x8C, 0xCD, 0x04, 0xCA,
+	0x92, 0xCC, 0x8C, 0xCD, 0x04, 0xCE, 0x91, 0xCC,
+	0x80, 0xCD, 0x04, 0xCE, 0x91, 0xCC, 0x81, 0xCD,
+	0x04, 0xCE, 0x91, 0xCC, 0x84, 0xCD, 0x04, 0xCE,
+	0x91, 0xCC, 0x86, 0xCD, 0x04, 0xCE, 0x91, 0xCD,
+	// Bytes 3740 - 377f
+	0x85, 0xDD, 0x04, 0xCE, 0x95, 0xCC, 0x80, 0xCD,
+	0x04, 0xCE, 0x95, 0xCC, 0x81, 0xCD, 0x04, 0xCE,
+	0x97, 0xCC, 0x80, 0xCD, 0x04, 0xCE, 0x97, 0xCC,
+	0x81, 0xCD, 0x04, 0xCE, 0x97, 0xCD, 0x85, 0xDD,
+	0x04, 0xCE, 0x99, 0xCC, 0x80, 0xCD, 0x04, 0xCE,
+	0x99, 0xCC, 0x81, 0xCD, 0x04, 0xCE, 0x99, 0xCC,
+	0x84, 0xCD, 0x04, 0xCE, 0x99, 0xCC, 0x86, 0xCD,
+	0x04, 0xCE, 0x99, 0xCC, 0x88, 0xCD, 0x04, 0xCE,
+	// Bytes 3780 - 37bf
+	0x9F, 0xCC, 0x80, 0xCD, 0x04, 0xCE, 0x9F, 0xCC,
+	0x81, 0xCD, 0x04, 0xCE, 0xA1, 0xCC, 0x94, 0xCD,
+	0x04, 0xCE, 0xA5, 0xCC, 0x80, 0xCD, 0x04, 0xCE,
+	0xA5, 0xCC, 0x81, 0xCD, 0x04, 0xCE, 0xA5, 0xCC,
+	0x84, 0xCD, 0x04, 0xCE, 0xA5, 0xCC, 0x86, 0xCD,
+	0x04, 0xCE, 0xA5, 0xCC, 0x88, 0xCD, 0x04, 0xCE,
+	0xA9, 0xCC, 0x80, 0xCD, 0x04, 0xCE, 0xA9, 0xCC,
+	0x81, 0xCD, 0x04, 0xCE, 0xA9, 0xCD, 0x85, 0xDD,
+	// Bytes 37c0 - 37ff
+	0x04, 0xCE, 0xB1, 0xCC, 0x84, 0xCD, 0x04, 0xCE,
+	0xB1, 0xCC, 0x86, 0xCD, 0x04, 0xCE, 0xB1, 0xCD,
+	0x85, 0xDD, 0x04, 0xCE, 0xB5, 0xCC, 0x80, 0xCD,
+	0x04, 0xCE, 0xB5, 0xCC, 0x81, 0xCD, 0x04, 0xCE,
+	0xB7, 0xCD, 0x85, 0xDD, 0x04, 0xCE, 0xB9, 0xCC,
+	0x80, 0xCD, 0x04, 0xCE, 0xB9, 0xCC, 0x81, 0xCD,
+	0x04, 0xCE, 0xB9, 0xCC, 0x84, 0xCD, 0x04, 0xCE,
+	0xB9, 0xCC, 0x86, 0xCD, 0x04, 0xCE, 0xB9, 0xCD,
+	// Bytes 3800 - 383f
+	0x82, 0xCD, 0x04, 0xCE, 0xBF, 0xCC, 0x80, 0xCD,
+	0x04, 0xCE, 0xBF, 0xCC, 0x81, 0xCD, 0x04, 0xCF,
+	0x81, 0xCC, 0x93, 0xCD, 0x04, 0xCF, 0x81, 0xCC,
+	0x94, 0xCD, 0x04, 0xCF, 0x85, 0xCC, 0x80, 0xCD,
+	0x04, 0xCF, 0x85, 0xCC, 0x81, 0xCD, 0x04, 0xCF,
+	0x85, 0xCC, 0x84, 0xCD, 0x04, 0xCF, 0x85, 0xCC,
+	0x86, 0xCD, 0x04, 0xCF, 0x85, 0xCD, 0x82, 0xCD,
+	0x04, 0xCF, 0x89, 0xCD, 0x85, 0xDD, 0x04, 0xCF,
+	// Bytes 3840 - 387f
+	0x92, 0xCC, 0x81, 0xCD, 0x04, 0xCF, 0x92, 0xCC,
+	0x88, 0xCD, 0x04, 0xD0, 0x86, 0xCC, 0x88, 0xCD,
+	0x04, 0xD0, 0x90, 0xCC, 0x86, 0xCD, 0x04, 0xD0,
+	0x90, 0xCC, 0x88, 0xCD, 0x04, 0xD0, 0x93, 0xCC,
+	0x81, 0xCD, 0x04, 0xD0, 0x95, 0xCC, 0x80, 0xCD,
+	0x04, 0xD0, 0x95, 0xCC, 0x86, 0xCD, 0x04, 0xD0,
+	0x95, 0xCC, 0x88, 0xCD, 0x04, 0xD0, 0x96, 0xCC,
+	0x86, 0xCD, 0x04, 0xD0, 0x96, 0xCC, 0x88, 0xCD,
+	// Bytes 3880 - 38bf
+	0x04, 0xD0, 0x97, 0xCC, 0x88, 0xCD, 0x04, 0xD0,
+	0x98, 0xCC, 0x80, 0xCD, 0x04, 0xD0, 0x98, 0xCC,
+	0x84, 0xCD, 0x04, 0xD0, 0x98, 0xCC, 0x86, 0xCD,
+	0x04, 0xD0, 0x98, 0xCC, 0x88, 0xCD, 0x04, 0xD0,
+	0x9A, 0xCC, 0x81, 0xCD, 0x04, 0xD0, 0x9E, 0xCC,
+	0x88, 0xCD, 0x04, 0xD0, 0xA3, 0xCC, 0x84, 0xCD,
+	0x04, 0xD0, 0xA3, 0xCC, 0x86, 0xCD, 0x04, 0xD0,
+	0xA3, 0xCC, 0x88, 0xCD, 0x04, 0xD0, 0xA3, 0xCC,
+	// Bytes 38c0 - 38ff
+	0x8B, 0xCD, 0x04, 0xD0, 0xA7, 0xCC, 0x88, 0xCD,
+	0x04, 0xD0, 0xAB, 0xCC, 0x88, 0xCD, 0x04, 0xD0,
+	0xAD, 0xCC, 0x88, 0xCD, 0x04, 0xD0, 0xB0, 0xCC,
+	0x86, 0xCD, 0x04, 0xD0, 0xB0, 0xCC, 0x88, 0xCD,
+	0x04, 0xD0, 0xB3, 0xCC, 0x81, 0xCD, 0x04, 0xD0,
+	0xB5, 0xCC, 0x80, 0xCD, 0x04, 0xD0, 0xB5, 0xCC,
+	0x86, 0xCD, 0x04, 0xD0, 0xB5, 0xCC, 0x88, 0xCD,
+	0x04, 0xD0, 0xB6, 0xCC, 0x86, 0xCD, 0x04, 0xD0,
+	// Bytes 3900 - 393f
+	0xB6, 0xCC, 0x88, 0xCD, 0x04, 0xD0, 0xB7, 0xCC,
+	0x88, 0xCD, 0x04, 0xD0, 0xB8, 0xCC, 0x80, 0xCD,
+	0x04, 0xD0, 0xB8, 0xCC, 0x84, 0xCD, 0x04, 0xD0,
+	0xB8, 0xCC, 0x86, 0xCD, 0x04, 0xD0, 0xB8, 0xCC,
+	0x88, 0xCD, 0x04, 0xD0, 0xBA, 0xCC, 0x81, 0xCD,
+	0x04, 0xD0, 0xBE, 0xCC, 0x88, 0xCD, 0x04, 0xD1,
+	0x83, 0xCC, 0x84, 0xCD, 0x04, 0xD1, 0x83, 0xCC,
+	0x86, 0xCD, 0x04, 0xD1, 0x83, 0xCC, 0x88, 0xCD,
+	// Bytes 3940 - 397f
+	0x04, 0xD1, 0x83, 0xCC, 0x8B, 0xCD, 0x04, 0xD1,
+	0x87, 0xCC, 0x88, 0xCD, 0x04, 0xD1, 0x8B, 0xCC,
+	0x88, 0xCD, 0x04, 0xD1, 0x8D, 0xCC, 0x88, 0xCD,
+	0x04, 0xD1, 0x96, 0xCC, 0x88, 0xCD, 0x04, 0xD1,
+	0xB4, 0xCC, 0x8F, 0xCD, 0x04, 0xD1, 0xB5, 0xCC,
+	0x8F, 0xCD, 0x04, 0xD3, 0x98, 0xCC, 0x88, 0xCD,
+	0x04, 0xD3, 0x99, 0xCC, 0x88, 0xCD, 0x04, 0xD3,
+	0xA8, 0xCC, 0x88, 0xCD, 0x04, 0xD3, 0xA9, 0xCC,
+	// Bytes 3980 - 39bf
+	0x88, 0xCD, 0x04, 0xD8, 0xA7, 0xD9, 0x93, 0xCD,
+	0x04, 0xD8, 0xA7, 0xD9, 0x94, 0xCD, 0x04, 0xD8,
+	0xA7, 0xD9, 0x95, 0xB9, 0x04, 0xD9, 0x88, 0xD9,
+	0x94, 0xCD, 0x04, 0xD9, 0x8A, 0xD9, 0x94, 0xCD,
+	0x04, 0xDB, 0x81, 0xD9, 0x94, 0xCD, 0x04, 0xDB,
+	0x92, 0xD9, 0x94, 0xCD, 0x04, 0xDB, 0x95, 0xD9,
+	0x94, 0xCD, 0x05, 0x41, 0xCC, 0x82, 0xCC, 0x80,
+	0xCE, 0x05, 0x41, 0xCC, 0x82, 0xCC, 0x81, 0xCE,
+	// Bytes 39c0 - 39ff
+	0x05, 0x41, 0xCC, 0x82, 0xCC, 0x83, 0xCE, 0x05,
+	0x41, 0xCC, 0x82, 0xCC, 0x89, 0xCE, 0x05, 0x41,
+	0xCC, 0x86, 0xCC, 0x80, 0xCE, 0x05, 0x41, 0xCC,
+	0x86, 0xCC, 0x81, 0xCE, 0x05, 0x41, 0xCC, 0x86,
+	0xCC, 0x83, 0xCE, 0x05, 0x41, 0xCC, 0x86, 0xCC,
+	0x89, 0xCE, 0x05, 0x41, 0xCC, 0x87, 0xCC, 0x84,
+	0xCE, 0x05, 0x41, 0xCC, 0x88, 0xCC, 0x84, 0xCE,
+	0x05, 0x41, 0xCC, 0x8A, 0xCC, 0x81, 0xCE, 0x05,
+	// Bytes 3a00 - 3a3f
+	0x41, 0xCC, 0xA3, 0xCC, 0x82, 0xCE, 0x05, 0x41,
+	0xCC, 0xA3, 0xCC, 0x86, 0xCE, 0x05, 0x43, 0xCC,
+	0xA7, 0xCC, 0x81, 0xCE, 0x05, 0x45, 0xCC, 0x82,
+	0xCC, 0x80, 0xCE, 0x05, 0x45, 0xCC, 0x82, 0xCC,
+	0x81, 0xCE, 0x05, 0x45, 0xCC, 0x82, 0xCC, 0x83,
+	0xCE, 0x05, 0x45, 0xCC, 0x82, 0xCC, 0x89, 0xCE,
+	0x05, 0x45, 0xCC, 0x84, 0xCC, 0x80, 0xCE, 0x05,
+	0x45, 0xCC, 0x84, 0xCC, 0x81, 0xCE, 0x05, 0x45,
+	// Bytes 3a40 - 3a7f
+	0xCC, 0xA3, 0xCC, 0x82, 0xCE, 0x05, 0x45, 0xCC,
+	0xA7, 0xCC, 0x86, 0xCE, 0x05, 0x49, 0xCC, 0x88,
+	0xCC, 0x81, 0xCE, 0x05, 0x4C, 0xCC, 0xA3, 0xCC,
+	0x84, 0xCE, 0x05, 0x4F, 0xCC, 0x82, 0xCC, 0x80,
+	0xCE, 0x05, 0x4F, 0xCC, 0x82, 0xCC, 0x81, 0xCE,
+	0x05, 0x4F, 0xCC, 0x82, 0xCC, 0x83, 0xCE, 0x05,
+	0x4F, 0xCC, 0x82, 0xCC, 0x89, 0xCE, 0x05, 0x4F,
+	0xCC, 0x83, 0xCC, 0x81, 0xCE, 0x05, 0x4F, 0xCC,
+	// Bytes 3a80 - 3abf
+	0x83, 0xCC, 0x84, 0xCE, 0x05, 0x4F, 0xCC, 0x83,
+	0xCC, 0x88, 0xCE, 0x05, 0x4F, 0xCC, 0x84, 0xCC,
+	0x80, 0xCE, 0x05, 0x4F, 0xCC, 0x84, 0xCC, 0x81,
+	0xCE, 0x05, 0x4F, 0xCC, 0x87, 0xCC, 0x84, 0xCE,
+	0x05, 0x4F, 0xCC, 0x88, 0xCC, 0x84, 0xCE, 0x05,
+	0x4F, 0xCC, 0x9B, 0xCC, 0x80, 0xCE, 0x05, 0x4F,
+	0xCC, 0x9B, 0xCC, 0x81, 0xCE, 0x05, 0x4F, 0xCC,
+	0x9B, 0xCC, 0x83, 0xCE, 0x05, 0x4F, 0xCC, 0x9B,
+	// Bytes 3ac0 - 3aff
+	0xCC, 0x89, 0xCE, 0x05, 0x4F, 0xCC, 0x9B, 0xCC,
+	0xA3, 0xBA, 0x05, 0x4F, 0xCC, 0xA3, 0xCC, 0x82,
+	0xCE, 0x05, 0x4F, 0xCC, 0xA8, 0xCC, 0x84, 0xCE,
+	0x05, 0x52, 0xCC, 0xA3, 0xCC, 0x84, 0xCE, 0x05,
+	0x53, 0xCC, 0x81, 0xCC, 0x87, 0xCE, 0x05, 0x53,
+	0xCC, 0x8C, 0xCC, 0x87, 0xCE, 0x05, 0x53, 0xCC,
+	0xA3, 0xCC, 0x87, 0xCE, 0x05, 0x55, 0xCC, 0x83,
+	0xCC, 0x81, 0xCE, 0x05, 0x55, 0xCC, 0x84, 0xCC,
+	// Bytes 3b00 - 3b3f
+	0x88, 0xCE, 0x05, 0x55, 0xCC, 0x88, 0xCC, 0x80,
+	0xCE, 0x05, 0x55, 0xCC, 0x88, 0xCC, 0x81, 0xCE,
+	0x05, 0x55, 0xCC, 0x88, 0xCC, 0x84, 0xCE, 0x05,
+	0x55, 0xCC, 0x88, 0xCC, 0x8C, 0xCE, 0x05, 0x55,
+	0xCC, 0x9B, 0xCC, 0x80, 0xCE, 0x05, 0x55, 0xCC,
+	0x9B, 0xCC, 0x81, 0xCE, 0x05, 0x55, 0xCC, 0x9B,
+	0xCC, 0x83, 0xCE, 0x05, 0x55, 0xCC, 0x9B, 0xCC,
+	0x89, 0xCE, 0x05, 0x55, 0xCC, 0x9B, 0xCC, 0xA3,
+	// Bytes 3b40 - 3b7f
+	0xBA, 0x05, 0x61, 0xCC, 0x82, 0xCC, 0x80, 0xCE,
+	0x05, 0x61, 0xCC, 0x82, 0xCC, 0x81, 0xCE, 0x05,
+	0x61, 0xCC, 0x82, 0xCC, 0x83, 0xCE, 0x05, 0x61,
+	0xCC, 0x82, 0xCC, 0x89, 0xCE, 0x05, 0x61, 0xCC,
+	0x86, 0xCC, 0x80, 0xCE, 0x05, 0x61, 0xCC, 0x86,
+	0xCC, 0x81, 0xCE, 0x05, 0x61, 0xCC, 0x86, 0xCC,
+	0x83, 0xCE, 0x05, 0x61, 0xCC, 0x86, 0xCC, 0x89,
+	0xCE, 0x05, 0x61, 0xCC, 0x87, 0xCC, 0x84, 0xCE,
+	// Bytes 3b80 - 3bbf
+	0x05, 0x61, 0xCC, 0x88, 0xCC, 0x84, 0xCE, 0x05,
+	0x61, 0xCC, 0x8A, 0xCC, 0x81, 0xCE, 0x05, 0x61,
+	0xCC, 0xA3, 0xCC, 0x82, 0xCE, 0x05, 0x61, 0xCC,
+	0xA3, 0xCC, 0x86, 0xCE, 0x05, 0x63, 0xCC, 0xA7,
+	0xCC, 0x81, 0xCE, 0x05, 0x65, 0xCC, 0x82, 0xCC,
+	0x80, 0xCE, 0x05, 0x65, 0xCC, 0x82, 0xCC, 0x81,
+	0xCE, 0x05, 0x65, 0xCC, 0x82, 0xCC, 0x83, 0xCE,
+	0x05, 0x65, 0xCC, 0x82, 0xCC, 0x89, 0xCE, 0x05,
+	// Bytes 3bc0 - 3bff
+	0x65, 0xCC, 0x84, 0xCC, 0x80, 0xCE, 0x05, 0x65,
+	0xCC, 0x84, 0xCC, 0x81, 0xCE, 0x05, 0x65, 0xCC,
+	0xA3, 0xCC, 0x82, 0xCE, 0x05, 0x65, 0xCC, 0xA7,
+	0xCC, 0x86, 0xCE, 0x05, 0x69, 0xCC, 0x88, 0xCC,
+	0x81, 0xCE, 0x05, 0x6C, 0xCC, 0xA3, 0xCC, 0x84,
+	0xCE, 0x05, 0x6F, 0xCC, 0x82, 0xCC, 0x80, 0xCE,
+	0x05, 0x6F, 0xCC, 0x82, 0xCC, 0x81, 0xCE, 0x05,
+	0x6F, 0xCC, 0x82, 0xCC, 0x83, 0xCE, 0x05, 0x6F,
+	// Bytes 3c00 - 3c3f
+	0xCC, 0x82, 0xCC, 0x89, 0xCE, 0x05, 0x6F, 0xCC,
+	0x83, 0xCC, 0x81, 0xCE, 0x05, 0x6F, 0xCC, 0x83,
+	0xCC, 0x84, 0xCE, 0x05, 0x6F, 0xCC, 0x83, 0xCC,
+	0x88, 0xCE, 0x05, 0x6F, 0xCC, 0x84, 0xCC, 0x80,
+	0xCE, 0x05, 0x6F, 0xCC, 0x84, 0xCC, 0x81, 0xCE,
+	0x05, 0x6F, 0xCC, 0x87, 0xCC, 0x84, 0xCE, 0x05,
+	0x6F, 0xCC, 0x88, 0xCC, 0x84, 0xCE, 0x05, 0x6F,
+	0xCC, 0x9B, 0xCC, 0x80, 0xCE, 0x05, 0x6F, 0xCC,
+	// Bytes 3c40 - 3c7f
+	0x9B, 0xCC, 0x81, 0xCE, 0x05, 0x6F, 0xCC, 0x9B,
+	0xCC, 0x83, 0xCE, 0x05, 0x6F, 0xCC, 0x9B, 0xCC,
+	0x89, 0xCE, 0x05, 0x6F, 0xCC, 0x9B, 0xCC, 0xA3,
+	0xBA, 0x05, 0x6F, 0xCC, 0xA3, 0xCC, 0x82, 0xCE,
+	0x05, 0x6F, 0xCC, 0xA8, 0xCC, 0x84, 0xCE, 0x05,
+	0x72, 0xCC, 0xA3, 0xCC, 0x84, 0xCE, 0x05, 0x73,
+	0xCC, 0x81, 0xCC, 0x87, 0xCE, 0x05, 0x73, 0xCC,
+	0x8C, 0xCC, 0x87, 0xCE, 0x05, 0x73, 0xCC, 0xA3,
+	// Bytes 3c80 - 3cbf
+	0xCC, 0x87, 0xCE, 0x05, 0x75, 0xCC, 0x83, 0xCC,
+	0x81, 0xCE, 0x05, 0x75, 0xCC, 0x84, 0xCC, 0x88,
+	0xCE, 0x05, 0x75, 0xCC, 0x88, 0xCC, 0x80, 0xCE,
+	0x05, 0x75, 0xCC, 0x88, 0xCC, 0x81, 0xCE, 0x05,
+	0x75, 0xCC, 0x88, 0xCC, 0x84, 0xCE, 0x05, 0x75,
+	0xCC, 0x88, 0xCC, 0x8C, 0xCE, 0x05, 0x75, 0xCC,
+	0x9B, 0xCC, 0x80, 0xCE, 0x05, 0x75, 0xCC, 0x9B,
+	0xCC, 0x81, 0xCE, 0x05, 0x75, 0xCC, 0x9B, 0xCC,
+	// Bytes 3cc0 - 3cff
+	0x83, 0xCE, 0x05, 0x75, 0xCC, 0x9B, 0xCC, 0x89,
+	0xCE, 0x05, 0x75, 0xCC, 0x9B, 0xCC, 0xA3, 0xBA,
+	0x05, 0xE1, 0xBE, 0xBF, 0xCC, 0x80, 0xCE, 0x05,
+	0xE1, 0xBE, 0xBF, 0xCC, 0x81, 0xCE, 0x05, 0xE1,
+	0xBE, 0xBF, 0xCD, 0x82, 0xCE, 0x05, 0xE1, 0xBF,
+	0xBE, 0xCC, 0x80, 0xCE, 0x05, 0xE1, 0xBF, 0xBE,
+	0xCC, 0x81, 0xCE, 0x05, 0xE1, 0xBF, 0xBE, 0xCD,
+	0x82, 0xCE, 0x05, 0xE2, 0x86, 0x90, 0xCC, 0xB8,
+	// Bytes 3d00 - 3d3f
+	0x05, 0x05, 0xE2, 0x86, 0x92, 0xCC, 0xB8, 0x05,
+	0x05, 0xE2, 0x86, 0x94, 0xCC, 0xB8, 0x05, 0x05,
+	0xE2, 0x87, 0x90, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
+	0x87, 0x92, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x87,
+	0x94, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x88, 0x83,
+	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x88, 0x88, 0xCC,
+	0xB8, 0x05, 0x05, 0xE2, 0x88, 0x8B, 0xCC, 0xB8,
+	0x05, 0x05, 0xE2, 0x88, 0xA3, 0xCC, 0xB8, 0x05,
+	// Bytes 3d40 - 3d7f
+	0x05, 0xE2, 0x88, 0xA5, 0xCC, 0xB8, 0x05, 0x05,
+	0xE2, 0x88, 0xBC, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
+	0x89, 0x83, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89,
+	0x85, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0x88,
+	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0x8D, 0xCC,
+	0xB8, 0x05, 0x05, 0xE2, 0x89, 0xA1, 0xCC, 0xB8,
+	0x05, 0x05, 0xE2, 0x89, 0xA4, 0xCC, 0xB8, 0x05,
+	0x05, 0xE2, 0x89, 0xA5, 0xCC, 0xB8, 0x05, 0x05,
+	// Bytes 3d80 - 3dbf
+	0xE2, 0x89, 0xB2, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
+	0x89, 0xB3, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89,
+	0xB6, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0xB7,
+	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0xBA, 0xCC,
+	0xB8, 0x05, 0x05, 0xE2, 0x89, 0xBB, 0xCC, 0xB8,
+	0x05, 0x05, 0xE2, 0x89, 0xBC, 0xCC, 0xB8, 0x05,
+	0x05, 0xE2, 0x89, 0xBD, 0xCC, 0xB8, 0x05, 0x05,
+	0xE2, 0x8A, 0x82, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
+	// Bytes 3dc0 - 3dff
+	0x8A, 0x83, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A,
+	0x86, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0x87,
+	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0x91, 0xCC,
+	0xB8, 0x05, 0x05, 0xE2, 0x8A, 0x92, 0xCC, 0xB8,
+	0x05, 0x05, 0xE2, 0x8A, 0xA2, 0xCC, 0xB8, 0x05,
+	0x05, 0xE2, 0x8A, 0xA8, 0xCC, 0xB8, 0x05, 0x05,
+	0xE2, 0x8A, 0xA9, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
+	0x8A, 0xAB, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A,
+	// Bytes 3e00 - 3e3f
+	0xB2, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0xB3,
+	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0xB4, 0xCC,
+	0xB8, 0x05, 0x05, 0xE2, 0x8A, 0xB5, 0xCC, 0xB8,
+	0x05, 0x06, 0xCE, 0x91, 0xCC, 0x93, 0xCD, 0x85,
+	0xDE, 0x06, 0xCE, 0x91, 0xCC, 0x94, 0xCD, 0x85,
+	0xDE, 0x06, 0xCE, 0x95, 0xCC, 0x93, 0xCC, 0x80,
+	0xCE, 0x06, 0xCE, 0x95, 0xCC, 0x93, 0xCC, 0x81,
+	0xCE, 0x06, 0xCE, 0x95, 0xCC, 0x94, 0xCC, 0x80,
+	// Bytes 3e40 - 3e7f
+	0xCE, 0x06, 0xCE, 0x95, 0xCC, 0x94, 0xCC, 0x81,
+	0xCE, 0x06, 0xCE, 0x97, 0xCC, 0x93, 0xCD, 0x85,
+	0xDE, 0x06, 0xCE, 0x97, 0xCC, 0x94, 0xCD, 0x85,
+	0xDE, 0x06, 0xCE, 0x99, 0xCC, 0x93, 0xCC, 0x80,
+	0xCE, 0x06, 0xCE, 0x99, 0xCC, 0x93, 0xCC, 0x81,
+	0xCE, 0x06, 0xCE, 0x99, 0xCC, 0x93, 0xCD, 0x82,
+	0xCE, 0x06, 0xCE, 0x99, 0xCC, 0x94, 0xCC, 0x80,
+	0xCE, 0x06, 0xCE, 0x99, 0xCC, 0x94, 0xCC, 0x81,
+	// Bytes 3e80 - 3ebf
+	0xCE, 0x06, 0xCE, 0x99, 0xCC, 0x94, 0xCD, 0x82,
+	0xCE, 0x06, 0xCE, 0x9F, 0xCC, 0x93, 0xCC, 0x80,
+	0xCE, 0x06, 0xCE, 0x9F, 0xCC, 0x93, 0xCC, 0x81,
+	0xCE, 0x06, 0xCE, 0x9F, 0xCC, 0x94, 0xCC, 0x80,
+	0xCE, 0x06, 0xCE, 0x9F, 0xCC, 0x94, 0xCC, 0x81,
+	0xCE, 0x06, 0xCE, 0xA5, 0xCC, 0x94, 0xCC, 0x80,
+	0xCE, 0x06, 0xCE, 0xA5, 0xCC, 0x94, 0xCC, 0x81,
+	0xCE, 0x06, 0xCE, 0xA5, 0xCC, 0x94, 0xCD, 0x82,
+	// Bytes 3ec0 - 3eff
+	0xCE, 0x06, 0xCE, 0xA9, 0xCC, 0x93, 0xCD, 0x85,
+	0xDE, 0x06, 0xCE, 0xA9, 0xCC, 0x94, 0xCD, 0x85,
+	0xDE, 0x06, 0xCE, 0xB1, 0xCC, 0x80, 0xCD, 0x85,
+	0xDE, 0x06, 0xCE, 0xB1, 0xCC, 0x81, 0xCD, 0x85,
+	0xDE, 0x06, 0xCE, 0xB1, 0xCC, 0x93, 0xCD, 0x85,
+	0xDE, 0x06, 0xCE, 0xB1, 0xCC, 0x94, 0xCD, 0x85,
+	0xDE, 0x06, 0xCE, 0xB1, 0xCD, 0x82, 0xCD, 0x85,
+	0xDE, 0x06, 0xCE, 0xB5, 0xCC, 0x93, 0xCC, 0x80,
+	// Bytes 3f00 - 3f3f
+	0xCE, 0x06, 0xCE, 0xB5, 0xCC, 0x93, 0xCC, 0x81,
+	0xCE, 0x06, 0xCE, 0xB5, 0xCC, 0x94, 0xCC, 0x80,
+	0xCE, 0x06, 0xCE, 0xB5, 0xCC, 0x94, 0xCC, 0x81,
+	0xCE, 0x06, 0xCE, 0xB7, 0xCC, 0x80, 0xCD, 0x85,
+	0xDE, 0x06, 0xCE, 0xB7, 0xCC, 0x81, 0xCD, 0x85,
+	0xDE, 0x06, 0xCE, 0xB7, 0xCC, 0x93, 0xCD, 0x85,
+	0xDE, 0x06, 0xCE, 0xB7, 0xCC, 0x94, 0xCD, 0x85,
+	0xDE, 0x06, 0xCE, 0xB7, 0xCD, 0x82, 0xCD, 0x85,
+	// Bytes 3f40 - 3f7f
+	0xDE, 0x06, 0xCE, 0xB9, 0xCC, 0x88, 0xCC, 0x80,
+	0xCE, 0x06, 0xCE, 0xB9, 0xCC, 0x88, 0xCC, 0x81,
+	0xCE, 0x06, 0xCE, 0xB9, 0xCC, 0x88, 0xCD, 0x82,
+	0xCE, 0x06, 0xCE, 0xB9, 0xCC, 0x93, 0xCC, 0x80,
+	0xCE, 0x06, 0xCE, 0xB9, 0xCC, 0x93, 0xCC, 0x81,
+	0xCE, 0x06, 0xCE, 0xB9, 0xCC, 0x93, 0xCD, 0x82,
+	0xCE, 0x06, 0xCE, 0xB9, 0xCC, 0x94, 0xCC, 0x80,
+	0xCE, 0x06, 0xCE, 0xB9, 0xCC, 0x94, 0xCC, 0x81,
+	// Bytes 3f80 - 3fbf
+	0xCE, 0x06, 0xCE, 0xB9, 0xCC, 0x94, 0xCD, 0x82,
+	0xCE, 0x06, 0xCE, 0xBF, 0xCC, 0x93, 0xCC, 0x80,
+	0xCE, 0x06, 0xCE, 0xBF, 0xCC, 0x93, 0xCC, 0x81,
+	0xCE, 0x06, 0xCE, 0xBF, 0xCC, 0x94, 0xCC, 0x80,
+	0xCE, 0x06, 0xCE, 0xBF, 0xCC, 0x94, 0xCC, 0x81,
+	0xCE, 0x06, 0xCF, 0x85, 0xCC, 0x88, 0xCC, 0x80,
+	0xCE, 0x06, 0xCF, 0x85, 0xCC, 0x88, 0xCC, 0x81,
+	0xCE, 0x06, 0xCF, 0x85, 0xCC, 0x88, 0xCD, 0x82,
+	// Bytes 3fc0 - 3fff
+	0xCE, 0x06, 0xCF, 0x85, 0xCC, 0x93, 0xCC, 0x80,
+	0xCE, 0x06, 0xCF, 0x85, 0xCC, 0x93, 0xCC, 0x81,
+	0xCE, 0x06, 0xCF, 0x85, 0xCC, 0x93, 0xCD, 0x82,
+	0xCE, 0x06, 0xCF, 0x85, 0xCC, 0x94, 0xCC, 0x80,
+	0xCE, 0x06, 0xCF, 0x85, 0xCC, 0x94, 0xCC, 0x81,
+	0xCE, 0x06, 0xCF, 0x85, 0xCC, 0x94, 0xCD, 0x82,
+	0xCE, 0x06, 0xCF, 0x89, 0xCC, 0x80, 0xCD, 0x85,
+	0xDE, 0x06, 0xCF, 0x89, 0xCC, 0x81, 0xCD, 0x85,
+	// Bytes 4000 - 403f
+	0xDE, 0x06, 0xCF, 0x89, 0xCC, 0x93, 0xCD, 0x85,
+	0xDE, 0x06, 0xCF, 0x89, 0xCC, 0x94, 0xCD, 0x85,
+	0xDE, 0x06, 0xCF, 0x89, 0xCD, 0x82, 0xCD, 0x85,
+	0xDE, 0x06, 0xE0, 0xA4, 0xA8, 0xE0, 0xA4, 0xBC,
+	0x0D, 0x06, 0xE0, 0xA4, 0xB0, 0xE0, 0xA4, 0xBC,
+	0x0D, 0x06, 0xE0, 0xA4, 0xB3, 0xE0, 0xA4, 0xBC,
+	0x0D, 0x06, 0xE0, 0xB1, 0x86, 0xE0, 0xB1, 0x96,
+	0x89, 0x06, 0xE0, 0xB7, 0x99, 0xE0, 0xB7, 0x8A,
+	// Bytes 4040 - 407f
+	0x15, 0x06, 0xE3, 0x81, 0x86, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0x8B, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0x8D, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0x8F, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0x91, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0x93, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0x95, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0x97, 0xE3, 0x82, 0x99,
+	// Bytes 4080 - 40bf
+	0x11, 0x06, 0xE3, 0x81, 0x99, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0x9B, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0x9D, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0x9F, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0xA1, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0xA4, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0xA6, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0xA8, 0xE3, 0x82, 0x99,
+	// Bytes 40c0 - 40ff
+	0x11, 0x06, 0xE3, 0x81, 0xAF, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0xAF, 0xE3, 0x82, 0x9A,
+	0x11, 0x06, 0xE3, 0x81, 0xB2, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0xB2, 0xE3, 0x82, 0x9A,
+	0x11, 0x06, 0xE3, 0x81, 0xB5, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0xB5, 0xE3, 0x82, 0x9A,
+	0x11, 0x06, 0xE3, 0x81, 0xB8, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0xB8, 0xE3, 0x82, 0x9A,
+	// Bytes 4100 - 413f
+	0x11, 0x06, 0xE3, 0x81, 0xBB, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x81, 0xBB, 0xE3, 0x82, 0x9A,
+	0x11, 0x06, 0xE3, 0x82, 0x9D, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x82, 0xA6, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x82, 0xAB, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x82, 0xAD, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x82, 0xAF, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x82, 0xB1, 0xE3, 0x82, 0x99,
+	// Bytes 4140 - 417f
+	0x11, 0x06, 0xE3, 0x82, 0xB3, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x82, 0xB5, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x82, 0xB7, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x82, 0xB9, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x82, 0xBB, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x82, 0xBD, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x82, 0xBF, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x83, 0x81, 0xE3, 0x82, 0x99,
+	// Bytes 4180 - 41bf
+	0x11, 0x06, 0xE3, 0x83, 0x84, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x83, 0x86, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x83, 0x88, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x83, 0x8F, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x83, 0x8F, 0xE3, 0x82, 0x9A,
+	0x11, 0x06, 0xE3, 0x83, 0x92, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x83, 0x92, 0xE3, 0x82, 0x9A,
+	0x11, 0x06, 0xE3, 0x83, 0x95, 0xE3, 0x82, 0x99,
+	// Bytes 41c0 - 41ff
+	0x11, 0x06, 0xE3, 0x83, 0x95, 0xE3, 0x82, 0x9A,
+	0x11, 0x06, 0xE3, 0x83, 0x98, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x83, 0x98, 0xE3, 0x82, 0x9A,
+	0x11, 0x06, 0xE3, 0x83, 0x9B, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x83, 0x9B, 0xE3, 0x82, 0x9A,
+	0x11, 0x06, 0xE3, 0x83, 0xAF, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x83, 0xB0, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x83, 0xB1, 0xE3, 0x82, 0x99,
+	// Bytes 4200 - 423f
+	0x11, 0x06, 0xE3, 0x83, 0xB2, 0xE3, 0x82, 0x99,
+	0x11, 0x06, 0xE3, 0x83, 0xBD, 0xE3, 0x82, 0x99,
+	0x11, 0x08, 0xCE, 0x91, 0xCC, 0x93, 0xCC, 0x80,
+	0xCD, 0x85, 0xDF, 0x08, 0xCE, 0x91, 0xCC, 0x93,
+	0xCC, 0x81, 0xCD, 0x85, 0xDF, 0x08, 0xCE, 0x91,
+	0xCC, 0x93, 0xCD, 0x82, 0xCD, 0x85, 0xDF, 0x08,
+	0xCE, 0x91, 0xCC, 0x94, 0xCC, 0x80, 0xCD, 0x85,
+	0xDF, 0x08, 0xCE, 0x91, 0xCC, 0x94, 0xCC, 0x81,
+	// Bytes 4240 - 427f
+	0xCD, 0x85, 0xDF, 0x08, 0xCE, 0x91, 0xCC, 0x94,
+	0xCD, 0x82, 0xCD, 0x85, 0xDF, 0x08, 0xCE, 0x97,
+	0xCC, 0x93, 0xCC, 0x80, 0xCD, 0x85, 0xDF, 0x08,
+	0xCE, 0x97, 0xCC, 0x93, 0xCC, 0x81, 0xCD, 0x85,
+	0xDF, 0x08, 0xCE, 0x97, 0xCC, 0x93, 0xCD, 0x82,
+	0xCD, 0x85, 0xDF, 0x08, 0xCE, 0x97, 0xCC, 0x94,
+	0xCC, 0x80, 0xCD, 0x85, 0xDF, 0x08, 0xCE, 0x97,
+	0xCC, 0x94, 0xCC, 0x81, 0xCD, 0x85, 0xDF, 0x08,
+	// Bytes 4280 - 42bf
+	0xCE, 0x97, 0xCC, 0x94, 0xCD, 0x82, 0xCD, 0x85,
+	0xDF, 0x08, 0xCE, 0xA9, 0xCC, 0x93, 0xCC, 0x80,
+	0xCD, 0x85, 0xDF, 0x08, 0xCE, 0xA9, 0xCC, 0x93,
+	0xCC, 0x81, 0xCD, 0x85, 0xDF, 0x08, 0xCE, 0xA9,
+	0xCC, 0x93, 0xCD, 0x82, 0xCD, 0x85, 0xDF, 0x08,
+	0xCE, 0xA9, 0xCC, 0x94, 0xCC, 0x80, 0xCD, 0x85,
+	0xDF, 0x08, 0xCE, 0xA9, 0xCC, 0x94, 0xCC, 0x81,
+	0xCD, 0x85, 0xDF, 0x08, 0xCE, 0xA9, 0xCC, 0x94,
+	// Bytes 42c0 - 42ff
+	0xCD, 0x82, 0xCD, 0x85, 0xDF, 0x08, 0xCE, 0xB1,
+	0xCC, 0x93, 0xCC, 0x80, 0xCD, 0x85, 0xDF, 0x08,
+	0xCE, 0xB1, 0xCC, 0x93, 0xCC, 0x81, 0xCD, 0x85,
+	0xDF, 0x08, 0xCE, 0xB1, 0xCC, 0x93, 0xCD, 0x82,
+	0xCD, 0x85, 0xDF, 0x08, 0xCE, 0xB1, 0xCC, 0x94,
+	0xCC, 0x80, 0xCD, 0x85, 0xDF, 0x08, 0xCE, 0xB1,
+	0xCC, 0x94, 0xCC, 0x81, 0xCD, 0x85, 0xDF, 0x08,
+	0xCE, 0xB1, 0xCC, 0x94, 0xCD, 0x82, 0xCD, 0x85,
+	// Bytes 4300 - 433f
+	0xDF, 0x08, 0xCE, 0xB7, 0xCC, 0x93, 0xCC, 0x80,
+	0xCD, 0x85, 0xDF, 0x08, 0xCE, 0xB7, 0xCC, 0x93,
+	0xCC, 0x81, 0xCD, 0x85, 0xDF, 0x08, 0xCE, 0xB7,
+	0xCC, 0x93, 0xCD, 0x82, 0xCD, 0x85, 0xDF, 0x08,
+	0xCE, 0xB7, 0xCC, 0x94, 0xCC, 0x80, 0xCD, 0x85,
+	0xDF, 0x08, 0xCE, 0xB7, 0xCC, 0x94, 0xCC, 0x81,
+	0xCD, 0x85, 0xDF, 0x08, 0xCE, 0xB7, 0xCC, 0x94,
+	0xCD, 0x82, 0xCD, 0x85, 0xDF, 0x08, 0xCF, 0x89,
+	// Bytes 4340 - 437f
+	0xCC, 0x93, 0xCC, 0x80, 0xCD, 0x85, 0xDF, 0x08,
+	0xCF, 0x89, 0xCC, 0x93, 0xCC, 0x81, 0xCD, 0x85,
+	0xDF, 0x08, 0xCF, 0x89, 0xCC, 0x93, 0xCD, 0x82,
+	0xCD, 0x85, 0xDF, 0x08, 0xCF, 0x89, 0xCC, 0x94,
+	0xCC, 0x80, 0xCD, 0x85, 0xDF, 0x08, 0xCF, 0x89,
+	0xCC, 0x94, 0xCC, 0x81, 0xCD, 0x85, 0xDF, 0x08,
+	0xCF, 0x89, 0xCC, 0x94, 0xCD, 0x82, 0xCD, 0x85,
+	0xDF, 0x08, 0xF0, 0x91, 0x82, 0x99, 0xF0, 0x91,
+	// Bytes 4380 - 43bf
+	0x82, 0xBA, 0x0D, 0x08, 0xF0, 0x91, 0x82, 0x9B,
+	0xF0, 0x91, 0x82, 0xBA, 0x0D, 0x08, 0xF0, 0x91,
+	0x82, 0xA5, 0xF0, 0x91, 0x82, 0xBA, 0x0D, 0x42,
+	0xC2, 0xB4, 0x01, 0x43, 0x20, 0xCC, 0x81, 0xCD,
+	0x43, 0x20, 0xCC, 0x83, 0xCD, 0x43, 0x20, 0xCC,
+	0x84, 0xCD, 0x43, 0x20, 0xCC, 0x85, 0xCD, 0x43,
+	0x20, 0xCC, 0x86, 0xCD, 0x43, 0x20, 0xCC, 0x87,
+	0xCD, 0x43, 0x20, 0xCC, 0x88, 0xCD, 0x43, 0x20,
+	// Bytes 43c0 - 43ff
+	0xCC, 0x8A, 0xCD, 0x43, 0x20, 0xCC, 0x8B, 0xCD,
+	0x43, 0x20, 0xCC, 0x93, 0xCD, 0x43, 0x20, 0xCC,
+	0x94, 0xCD, 0x43, 0x20, 0xCC, 0xA7, 0xA9, 0x43,
+	0x20, 0xCC, 0xA8, 0xA9, 0x43, 0x20, 0xCC, 0xB3,
+	0xB9, 0x43, 0x20, 0xCD, 0x82, 0xCD, 0x43, 0x20,
+	0xCD, 0x85, 0xDD, 0x43, 0x20, 0xD9, 0x8B, 0x5D,
+	0x43, 0x20, 0xD9, 0x8C, 0x61, 0x43, 0x20, 0xD9,
+	0x8D, 0x65, 0x43, 0x20, 0xD9, 0x8E, 0x69, 0x43,
+	// Bytes 4400 - 443f
+	0x20, 0xD9, 0x8F, 0x6D, 0x43, 0x20, 0xD9, 0x90,
+	0x71, 0x43, 0x20, 0xD9, 0x91, 0x75, 0x43, 0x20,
+	0xD9, 0x92, 0x79, 0x43, 0x41, 0xCC, 0x8A, 0xCD,
+	0x43, 0x73, 0xCC, 0x87, 0xCD, 0x44, 0x20, 0xE3,
+	0x82, 0x99, 0x11, 0x44, 0x20, 0xE3, 0x82, 0x9A,
+	0x11, 0x44, 0xC2, 0xA8, 0xCC, 0x81, 0xCE, 0x44,
+	0xCE, 0x91, 0xCC, 0x81, 0xCD, 0x44, 0xCE, 0x95,
+	0xCC, 0x81, 0xCD, 0x44, 0xCE, 0x97, 0xCC, 0x81,
+	// Bytes 4440 - 447f
+	0xCD, 0x44, 0xCE, 0x99, 0xCC, 0x81, 0xCD, 0x44,
+	0xCE, 0x9F, 0xCC, 0x81, 0xCD, 0x44, 0xCE, 0xA5,
+	0xCC, 0x81, 0xCD, 0x44, 0xCE, 0xA5, 0xCC, 0x88,
+	0xCD, 0x44, 0xCE, 0xA9, 0xCC, 0x81, 0xCD, 0x44,
+	0xCE, 0xB1, 0xCC, 0x81, 0xCD, 0x44, 0xCE, 0xB5,
+	0xCC, 0x81, 0xCD, 0x44, 0xCE, 0xB7, 0xCC, 0x81,
+	0xCD, 0x44, 0xCE, 0xB9, 0xCC, 0x81, 0xCD, 0x44,
+	0xCE, 0xBF, 0xCC, 0x81, 0xCD, 0x44, 0xCF, 0x85,
+	// Bytes 4480 - 44bf
+	0xCC, 0x81, 0xCD, 0x44, 0xCF, 0x89, 0xCC, 0x81,
+	0xCD, 0x44, 0xD7, 0x90, 0xD6, 0xB7, 0x35, 0x44,
+	0xD7, 0x90, 0xD6, 0xB8, 0x39, 0x44, 0xD7, 0x90,
+	0xD6, 0xBC, 0x45, 0x44, 0xD7, 0x91, 0xD6, 0xBC,
+	0x45, 0x44, 0xD7, 0x91, 0xD6, 0xBF, 0x4D, 0x44,
+	0xD7, 0x92, 0xD6, 0xBC, 0x45, 0x44, 0xD7, 0x93,
+	0xD6, 0xBC, 0x45, 0x44, 0xD7, 0x94, 0xD6, 0xBC,
+	0x45, 0x44, 0xD7, 0x95, 0xD6, 0xB9, 0x3D, 0x44,
+	// Bytes 44c0 - 44ff
+	0xD7, 0x95, 0xD6, 0xBC, 0x45, 0x44, 0xD7, 0x96,
+	0xD6, 0xBC, 0x45, 0x44, 0xD7, 0x98, 0xD6, 0xBC,
+	0x45, 0x44, 0xD7, 0x99, 0xD6, 0xB4, 0x29, 0x44,
+	0xD7, 0x99, 0xD6, 0xBC, 0x45, 0x44, 0xD7, 0x9A,
+	0xD6, 0xBC, 0x45, 0x44, 0xD7, 0x9B, 0xD6, 0xBC,
+	0x45, 0x44, 0xD7, 0x9B, 0xD6, 0xBF, 0x4D, 0x44,
+	0xD7, 0x9C, 0xD6, 0xBC, 0x45, 0x44, 0xD7, 0x9E,
+	0xD6, 0xBC, 0x45, 0x44, 0xD7, 0xA0, 0xD6, 0xBC,
+	// Bytes 4500 - 453f
+	0x45, 0x44, 0xD7, 0xA1, 0xD6, 0xBC, 0x45, 0x44,
+	0xD7, 0xA3, 0xD6, 0xBC, 0x45, 0x44, 0xD7, 0xA4,
+	0xD6, 0xBC, 0x45, 0x44, 0xD7, 0xA4, 0xD6, 0xBF,
+	0x4D, 0x44, 0xD7, 0xA6, 0xD6, 0xBC, 0x45, 0x44,
+	0xD7, 0xA7, 0xD6, 0xBC, 0x45, 0x44, 0xD7, 0xA8,
+	0xD6, 0xBC, 0x45, 0x44, 0xD7, 0xA9, 0xD6, 0xBC,
+	0x45, 0x44, 0xD7, 0xA9, 0xD7, 0x81, 0x51, 0x44,
+	0xD7, 0xA9, 0xD7, 0x82, 0x55, 0x44, 0xD7, 0xAA,
+	// Bytes 4540 - 457f
+	0xD6, 0xBC, 0x45, 0x44, 0xD7, 0xB2, 0xD6, 0xB7,
+	0x35, 0x44, 0xD8, 0xA7, 0xD9, 0x8B, 0x5D, 0x44,
+	0xD8, 0xA7, 0xD9, 0x93, 0xCD, 0x44, 0xD8, 0xA7,
+	0xD9, 0x94, 0xCD, 0x44, 0xD8, 0xA7, 0xD9, 0x95,
+	0xB9, 0x44, 0xD8, 0xB0, 0xD9, 0xB0, 0x7D, 0x44,
+	0xD8, 0xB1, 0xD9, 0xB0, 0x7D, 0x44, 0xD9, 0x80,
+	0xD9, 0x8B, 0x5D, 0x44, 0xD9, 0x80, 0xD9, 0x8E,
+	0x69, 0x44, 0xD9, 0x80, 0xD9, 0x8F, 0x6D, 0x44,
+	// Bytes 4580 - 45bf
+	0xD9, 0x80, 0xD9, 0x90, 0x71, 0x44, 0xD9, 0x80,
+	0xD9, 0x91, 0x75, 0x44, 0xD9, 0x80, 0xD9, 0x92,
+	0x79, 0x44, 0xD9, 0x87, 0xD9, 0xB0, 0x7D, 0x44,
+	0xD9, 0x88, 0xD9, 0x94, 0xCD, 0x44, 0xD9, 0x89,
+	0xD9, 0xB0, 0x7D, 0x44, 0xD9, 0x8A, 0xD9, 0x94,
+	0xCD, 0x44, 0xDB, 0x92, 0xD9, 0x94, 0xCD, 0x44,
+	0xDB, 0x95, 0xD9, 0x94, 0xCD, 0x45, 0x20, 0xCC,
+	0x88, 0xCC, 0x80, 0xCE, 0x45, 0x20, 0xCC, 0x88,
+	// Bytes 45c0 - 45ff
+	0xCC, 0x81, 0xCE, 0x45, 0x20, 0xCC, 0x88, 0xCD,
+	0x82, 0xCE, 0x45, 0x20, 0xCC, 0x93, 0xCC, 0x80,
+	0xCE, 0x45, 0x20, 0xCC, 0x93, 0xCC, 0x81, 0xCE,
+	0x45, 0x20, 0xCC, 0x93, 0xCD, 0x82, 0xCE, 0x45,
+	0x20, 0xCC, 0x94, 0xCC, 0x80, 0xCE, 0x45, 0x20,
+	0xCC, 0x94, 0xCC, 0x81, 0xCE, 0x45, 0x20, 0xCC,
+	0x94, 0xCD, 0x82, 0xCE, 0x45, 0x20, 0xD9, 0x8C,
+	0xD9, 0x91, 0x76, 0x45, 0x20, 0xD9, 0x8D, 0xD9,
+	// Bytes 4600 - 463f
+	0x91, 0x76, 0x45, 0x20, 0xD9, 0x8E, 0xD9, 0x91,
+	0x76, 0x45, 0x20, 0xD9, 0x8F, 0xD9, 0x91, 0x76,
+	0x45, 0x20, 0xD9, 0x90, 0xD9, 0x91, 0x76, 0x45,
+	0x20, 0xD9, 0x91, 0xD9, 0xB0, 0x7E, 0x45, 0xE2,
+	0xAB, 0x9D, 0xCC, 0xB8, 0x05, 0x46, 0xCE, 0xB9,
+	0xCC, 0x88, 0xCC, 0x81, 0xCE, 0x46, 0xCF, 0x85,
+	0xCC, 0x88, 0xCC, 0x81, 0xCE, 0x46, 0xD7, 0xA9,
+	0xD6, 0xBC, 0xD7, 0x81, 0x52, 0x46, 0xD7, 0xA9,
+	// Bytes 4640 - 467f
+	0xD6, 0xBC, 0xD7, 0x82, 0x56, 0x46, 0xD9, 0x80,
+	0xD9, 0x8E, 0xD9, 0x91, 0x76, 0x46, 0xD9, 0x80,
+	0xD9, 0x8F, 0xD9, 0x91, 0x76, 0x46, 0xD9, 0x80,
+	0xD9, 0x90, 0xD9, 0x91, 0x76, 0x46, 0xE0, 0xA4,
+	0x95, 0xE0, 0xA4, 0xBC, 0x0D, 0x46, 0xE0, 0xA4,
+	0x96, 0xE0, 0xA4, 0xBC, 0x0D, 0x46, 0xE0, 0xA4,
+	0x97, 0xE0, 0xA4, 0xBC, 0x0D, 0x46, 0xE0, 0xA4,
+	0x9C, 0xE0, 0xA4, 0xBC, 0x0D, 0x46, 0xE0, 0xA4,
+	// Bytes 4680 - 46bf
+	0xA1, 0xE0, 0xA4, 0xBC, 0x0D, 0x46, 0xE0, 0xA4,
+	0xA2, 0xE0, 0xA4, 0xBC, 0x0D, 0x46, 0xE0, 0xA4,
+	0xAB, 0xE0, 0xA4, 0xBC, 0x0D, 0x46, 0xE0, 0xA4,
+	0xAF, 0xE0, 0xA4, 0xBC, 0x0D, 0x46, 0xE0, 0xA6,
+	0xA1, 0xE0, 0xA6, 0xBC, 0x0D, 0x46, 0xE0, 0xA6,
+	0xA2, 0xE0, 0xA6, 0xBC, 0x0D, 0x46, 0xE0, 0xA6,
+	0xAF, 0xE0, 0xA6, 0xBC, 0x0D, 0x46, 0xE0, 0xA8,
+	0x96, 0xE0, 0xA8, 0xBC, 0x0D, 0x46, 0xE0, 0xA8,
+	// Bytes 46c0 - 46ff
+	0x97, 0xE0, 0xA8, 0xBC, 0x0D, 0x46, 0xE0, 0xA8,
+	0x9C, 0xE0, 0xA8, 0xBC, 0x0D, 0x46, 0xE0, 0xA8,
+	0xAB, 0xE0, 0xA8, 0xBC, 0x0D, 0x46, 0xE0, 0xA8,
+	0xB2, 0xE0, 0xA8, 0xBC, 0x0D, 0x46, 0xE0, 0xA8,
+	0xB8, 0xE0, 0xA8, 0xBC, 0x0D, 0x46, 0xE0, 0xAC,
+	0xA1, 0xE0, 0xAC, 0xBC, 0x0D, 0x46, 0xE0, 0xAC,
+	0xA2, 0xE0, 0xAC, 0xBC, 0x0D, 0x46, 0xE0, 0xBE,
+	0xB2, 0xE0, 0xBE, 0x80, 0xA1, 0x46, 0xE0, 0xBE,
+	// Bytes 4700 - 473f
+	0xB3, 0xE0, 0xBE, 0x80, 0xA1, 0x46, 0xE3, 0x83,
+	0x86, 0xE3, 0x82, 0x99, 0x11, 0x48, 0xF0, 0x9D,
+	0x85, 0x97, 0xF0, 0x9D, 0x85, 0xA5, 0xB1, 0x48,
+	0xF0, 0x9D, 0x85, 0x98, 0xF0, 0x9D, 0x85, 0xA5,
+	0xB1, 0x48, 0xF0, 0x9D, 0x86, 0xB9, 0xF0, 0x9D,
+	0x85, 0xA5, 0xB1, 0x48, 0xF0, 0x9D, 0x86, 0xBA,
+	0xF0, 0x9D, 0x85, 0xA5, 0xB1, 0x49, 0xE0, 0xBE,
+	0xB2, 0xE0, 0xBD, 0xB1, 0xE0, 0xBE, 0x80, 0xA2,
+	// Bytes 4740 - 477f
+	0x49, 0xE0, 0xBE, 0xB3, 0xE0, 0xBD, 0xB1, 0xE0,
+	0xBE, 0x80, 0xA2, 0x4C, 0xF0, 0x9D, 0x85, 0x98,
+	0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xAE,
+	0xB2, 0x4C, 0xF0, 0x9D, 0x85, 0x98, 0xF0, 0x9D,
+	0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xAF, 0xB2, 0x4C,
+	0xF0, 0x9D, 0x85, 0x98, 0xF0, 0x9D, 0x85, 0xA5,
+	0xF0, 0x9D, 0x85, 0xB0, 0xB2, 0x4C, 0xF0, 0x9D,
+	0x85, 0x98, 0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D,
+	// Bytes 4780 - 47bf
+	0x85, 0xB1, 0xB2, 0x4C, 0xF0, 0x9D, 0x85, 0x98,
+	0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xB2,
+	0xB2, 0x4C, 0xF0, 0x9D, 0x86, 0xB9, 0xF0, 0x9D,
+	0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xAE, 0xB2, 0x4C,
+	0xF0, 0x9D, 0x86, 0xB9, 0xF0, 0x9D, 0x85, 0xA5,
+	0xF0, 0x9D, 0x85, 0xAF, 0xB2, 0x4C, 0xF0, 0x9D,
+	0x86, 0xBA, 0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D,
+	0x85, 0xAE, 0xB2, 0x4C, 0xF0, 0x9D, 0x86, 0xBA,
+	// Bytes 47c0 - 47ff
+	0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xAF,
+	0xB2, 0x83, 0x41, 0xCC, 0x82, 0xCD, 0x83, 0x41,
+	0xCC, 0x86, 0xCD, 0x83, 0x41, 0xCC, 0x87, 0xCD,
+	0x83, 0x41, 0xCC, 0x88, 0xCD, 0x83, 0x41, 0xCC,
+	0x8A, 0xCD, 0x83, 0x41, 0xCC, 0xA3, 0xB9, 0x83,
+	0x43, 0xCC, 0xA7, 0xA9, 0x83, 0x45, 0xCC, 0x82,
+	0xCD, 0x83, 0x45, 0xCC, 0x84, 0xCD, 0x83, 0x45,
+	0xCC, 0xA3, 0xB9, 0x83, 0x45, 0xCC, 0xA7, 0xA9,
+	// Bytes 4800 - 483f
+	0x83, 0x49, 0xCC, 0x88, 0xCD, 0x83, 0x4C, 0xCC,
+	0xA3, 0xB9, 0x83, 0x4F, 0xCC, 0x82, 0xCD, 0x83,
+	0x4F, 0xCC, 0x83, 0xCD, 0x83, 0x4F, 0xCC, 0x84,
+	0xCD, 0x83, 0x4F, 0xCC, 0x87, 0xCD, 0x83, 0x4F,
+	0xCC, 0x88, 0xCD, 0x83, 0x4F, 0xCC, 0x9B, 0xB1,
+	0x83, 0x4F, 0xCC, 0xA3, 0xB9, 0x83, 0x4F, 0xCC,
+	0xA8, 0xA9, 0x83, 0x52, 0xCC, 0xA3, 0xB9, 0x83,
+	0x53, 0xCC, 0x81, 0xCD, 0x83, 0x53, 0xCC, 0x8C,
+	// Bytes 4840 - 487f
+	0xCD, 0x83, 0x53, 0xCC, 0xA3, 0xB9, 0x83, 0x55,
+	0xCC, 0x83, 0xCD, 0x83, 0x55, 0xCC, 0x84, 0xCD,
+	0x83, 0x55, 0xCC, 0x88, 0xCD, 0x83, 0x55, 0xCC,
+	0x9B, 0xB1, 0x83, 0x61, 0xCC, 0x82, 0xCD, 0x83,
+	0x61, 0xCC, 0x86, 0xCD, 0x83, 0x61, 0xCC, 0x87,
+	0xCD, 0x83, 0x61, 0xCC, 0x88, 0xCD, 0x83, 0x61,
+	0xCC, 0x8A, 0xCD, 0x83, 0x61, 0xCC, 0xA3, 0xB9,
+	0x83, 0x63, 0xCC, 0xA7, 0xA9, 0x83, 0x65, 0xCC,
+	// Bytes 4880 - 48bf
+	0x82, 0xCD, 0x83, 0x65, 0xCC, 0x84, 0xCD, 0x83,
+	0x65, 0xCC, 0xA3, 0xB9, 0x83, 0x65, 0xCC, 0xA7,
+	0xA9, 0x83, 0x69, 0xCC, 0x88, 0xCD, 0x83, 0x6C,
+	0xCC, 0xA3, 0xB9, 0x83, 0x6F, 0xCC, 0x82, 0xCD,
+	0x83, 0x6F, 0xCC, 0x83, 0xCD, 0x83, 0x6F, 0xCC,
+	0x84, 0xCD, 0x83, 0x6F, 0xCC, 0x87, 0xCD, 0x83,
+	0x6F, 0xCC, 0x88, 0xCD, 0x83, 0x6F, 0xCC, 0x9B,
+	0xB1, 0x83, 0x6F, 0xCC, 0xA3, 0xB9, 0x83, 0x6F,
+	// Bytes 48c0 - 48ff
+	0xCC, 0xA8, 0xA9, 0x83, 0x72, 0xCC, 0xA3, 0xB9,
+	0x83, 0x73, 0xCC, 0x81, 0xCD, 0x83, 0x73, 0xCC,
+	0x8C, 0xCD, 0x83, 0x73, 0xCC, 0xA3, 0xB9, 0x83,
+	0x75, 0xCC, 0x83, 0xCD, 0x83, 0x75, 0xCC, 0x84,
+	0xCD, 0x83, 0x75, 0xCC, 0x88, 0xCD, 0x83, 0x75,
+	0xCC, 0x9B, 0xB1, 0x84, 0xCE, 0x91, 0xCC, 0x93,
+	0xCD, 0x84, 0xCE, 0x91, 0xCC, 0x94, 0xCD, 0x84,
+	0xCE, 0x95, 0xCC, 0x93, 0xCD, 0x84, 0xCE, 0x95,
+	// Bytes 4900 - 493f
+	0xCC, 0x94, 0xCD, 0x84, 0xCE, 0x97, 0xCC, 0x93,
+	0xCD, 0x84, 0xCE, 0x97, 0xCC, 0x94, 0xCD, 0x84,
+	0xCE, 0x99, 0xCC, 0x93, 0xCD, 0x84, 0xCE, 0x99,
+	0xCC, 0x94, 0xCD, 0x84, 0xCE, 0x9F, 0xCC, 0x93,
+	0xCD, 0x84, 0xCE, 0x9F, 0xCC, 0x94, 0xCD, 0x84,
+	0xCE, 0xA5, 0xCC, 0x94, 0xCD, 0x84, 0xCE, 0xA9,
+	0xCC, 0x93, 0xCD, 0x84, 0xCE, 0xA9, 0xCC, 0x94,
+	0xCD, 0x84, 0xCE, 0xB1, 0xCC, 0x80, 0xCD, 0x84,
+	// Bytes 4940 - 497f
+	0xCE, 0xB1, 0xCC, 0x81, 0xCD, 0x84, 0xCE, 0xB1,
+	0xCC, 0x93, 0xCD, 0x84, 0xCE, 0xB1, 0xCC, 0x94,
+	0xCD, 0x84, 0xCE, 0xB1, 0xCD, 0x82, 0xCD, 0x84,
+	0xCE, 0xB5, 0xCC, 0x93, 0xCD, 0x84, 0xCE, 0xB5,
+	0xCC, 0x94, 0xCD, 0x84, 0xCE, 0xB7, 0xCC, 0x80,
+	0xCD, 0x84, 0xCE, 0xB7, 0xCC, 0x81, 0xCD, 0x84,
+	0xCE, 0xB7, 0xCC, 0x93, 0xCD, 0x84, 0xCE, 0xB7,
+	0xCC, 0x94, 0xCD, 0x84, 0xCE, 0xB7, 0xCD, 0x82,
+	// Bytes 4980 - 49bf
+	0xCD, 0x84, 0xCE, 0xB9, 0xCC, 0x88, 0xCD, 0x84,
+	0xCE, 0xB9, 0xCC, 0x93, 0xCD, 0x84, 0xCE, 0xB9,
+	0xCC, 0x94, 0xCD, 0x84, 0xCE, 0xBF, 0xCC, 0x93,
+	0xCD, 0x84, 0xCE, 0xBF, 0xCC, 0x94, 0xCD, 0x84,
+	0xCF, 0x85, 0xCC, 0x88, 0xCD, 0x84, 0xCF, 0x85,
+	0xCC, 0x93, 0xCD, 0x84, 0xCF, 0x85, 0xCC, 0x94,
+	0xCD, 0x84, 0xCF, 0x89, 0xCC, 0x80, 0xCD, 0x84,
+	0xCF, 0x89, 0xCC, 0x81, 0xCD, 0x84, 0xCF, 0x89,
+	// Bytes 49c0 - 49ff
+	0xCC, 0x93, 0xCD, 0x84, 0xCF, 0x89, 0xCC, 0x94,
+	0xCD, 0x84, 0xCF, 0x89, 0xCD, 0x82, 0xCD, 0x86,
+	0xCE, 0x91, 0xCC, 0x93, 0xCC, 0x80, 0xCE, 0x86,
+	0xCE, 0x91, 0xCC, 0x93, 0xCC, 0x81, 0xCE, 0x86,
+	0xCE, 0x91, 0xCC, 0x93, 0xCD, 0x82, 0xCE, 0x86,
+	0xCE, 0x91, 0xCC, 0x94, 0xCC, 0x80, 0xCE, 0x86,
+	0xCE, 0x91, 0xCC, 0x94, 0xCC, 0x81, 0xCE, 0x86,
+	0xCE, 0x91, 0xCC, 0x94, 0xCD, 0x82, 0xCE, 0x86,
+	// Bytes 4a00 - 4a3f
+	0xCE, 0x97, 0xCC, 0x93, 0xCC, 0x80, 0xCE, 0x86,
+	0xCE, 0x97, 0xCC, 0x93, 0xCC, 0x81, 0xCE, 0x86,
+	0xCE, 0x97, 0xCC, 0x93, 0xCD, 0x82, 0xCE, 0x86,
+	0xCE, 0x97, 0xCC, 0x94, 0xCC, 0x80, 0xCE, 0x86,
+	0xCE, 0x97, 0xCC, 0x94, 0xCC, 0x81, 0xCE, 0x86,
+	0xCE, 0x97, 0xCC, 0x94, 0xCD, 0x82, 0xCE, 0x86,
+	0xCE, 0xA9, 0xCC, 0x93, 0xCC, 0x80, 0xCE, 0x86,
+	0xCE, 0xA9, 0xCC, 0x93, 0xCC, 0x81, 0xCE, 0x86,
+	// Bytes 4a40 - 4a7f
+	0xCE, 0xA9, 0xCC, 0x93, 0xCD, 0x82, 0xCE, 0x86,
+	0xCE, 0xA9, 0xCC, 0x94, 0xCC, 0x80, 0xCE, 0x86,
+	0xCE, 0xA9, 0xCC, 0x94, 0xCC, 0x81, 0xCE, 0x86,
+	0xCE, 0xA9, 0xCC, 0x94, 0xCD, 0x82, 0xCE, 0x86,
+	0xCE, 0xB1, 0xCC, 0x93, 0xCC, 0x80, 0xCE, 0x86,
+	0xCE, 0xB1, 0xCC, 0x93, 0xCC, 0x81, 0xCE, 0x86,
+	0xCE, 0xB1, 0xCC, 0x93, 0xCD, 0x82, 0xCE, 0x86,
+	0xCE, 0xB1, 0xCC, 0x94, 0xCC, 0x80, 0xCE, 0x86,
+	// Bytes 4a80 - 4abf
+	0xCE, 0xB1, 0xCC, 0x94, 0xCC, 0x81, 0xCE, 0x86,
+	0xCE, 0xB1, 0xCC, 0x94, 0xCD, 0x82, 0xCE, 0x86,
+	0xCE, 0xB7, 0xCC, 0x93, 0xCC, 0x80, 0xCE, 0x86,
+	0xCE, 0xB7, 0xCC, 0x93, 0xCC, 0x81, 0xCE, 0x86,
+	0xCE, 0xB7, 0xCC, 0x93, 0xCD, 0x82, 0xCE, 0x86,
+	0xCE, 0xB7, 0xCC, 0x94, 0xCC, 0x80, 0xCE, 0x86,
+	0xCE, 0xB7, 0xCC, 0x94, 0xCC, 0x81, 0xCE, 0x86,
+	0xCE, 0xB7, 0xCC, 0x94, 0xCD, 0x82, 0xCE, 0x86,
+	// Bytes 4ac0 - 4aff
+	0xCF, 0x89, 0xCC, 0x93, 0xCC, 0x80, 0xCE, 0x86,
+	0xCF, 0x89, 0xCC, 0x93, 0xCC, 0x81, 0xCE, 0x86,
+	0xCF, 0x89, 0xCC, 0x93, 0xCD, 0x82, 0xCE, 0x86,
+	0xCF, 0x89, 0xCC, 0x94, 0xCC, 0x80, 0xCE, 0x86,
+	0xCF, 0x89, 0xCC, 0x94, 0xCC, 0x81, 0xCE, 0x86,
+	0xCF, 0x89, 0xCC, 0x94, 0xCD, 0x82, 0xCE, 0x42,
+	0xCC, 0x80, 0xCD, 0x33, 0x42, 0xCC, 0x81, 0xCD,
+	0x33, 0x42, 0xCC, 0x93, 0xCD, 0x33, 0x43, 0xE1,
+	// Bytes 4b00 - 4b3f
+	0x85, 0xA1, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xA2,
+	0x01, 0x00, 0x43, 0xE1, 0x85, 0xA3, 0x01, 0x00,
+	0x43, 0xE1, 0x85, 0xA4, 0x01, 0x00, 0x43, 0xE1,
+	0x85, 0xA5, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xA6,
+	0x01, 0x00, 0x43, 0xE1, 0x85, 0xA7, 0x01, 0x00,
+	0x43, 0xE1, 0x85, 0xA8, 0x01, 0x00, 0x43, 0xE1,
+	0x85, 0xA9, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xAA,
+	0x01, 0x00, 0x43, 0xE1, 0x85, 0xAB, 0x01, 0x00,
+	// Bytes 4b40 - 4b7f
+	0x43, 0xE1, 0x85, 0xAC, 0x01, 0x00, 0x43, 0xE1,
+	0x85, 0xAD, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xAE,
+	0x01, 0x00, 0x43, 0xE1, 0x85, 0xAF, 0x01, 0x00,
+	0x43, 0xE1, 0x85, 0xB0, 0x01, 0x00, 0x43, 0xE1,
+	0x85, 0xB1, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xB2,
+	0x01, 0x00, 0x43, 0xE1, 0x85, 0xB3, 0x01, 0x00,
+	0x43, 0xE1, 0x85, 0xB4, 0x01, 0x00, 0x43, 0xE1,
+	0x85, 0xB5, 0x01, 0x00, 0x43, 0xE1, 0x86, 0xAA,
+	// Bytes 4b80 - 4bbf
+	0x01, 0x00, 0x43, 0xE1, 0x86, 0xAC, 0x01, 0x00,
+	0x43, 0xE1, 0x86, 0xAD, 0x01, 0x00, 0x43, 0xE1,
+	0x86, 0xB0, 0x01, 0x00, 0x43, 0xE1, 0x86, 0xB1,
+	0x01, 0x00, 0x43, 0xE1, 0x86, 0xB2, 0x01, 0x00,
+	0x43, 0xE1, 0x86, 0xB3, 0x01, 0x00, 0x43, 0xE1,
+	0x86, 0xB4, 0x01, 0x00, 0x43, 0xE1, 0x86, 0xB5,
+	0x01, 0x00, 0x44, 0xCC, 0x88, 0xCC, 0x81, 0xCE,
+	0x33, 0x43, 0xE3, 0x82, 0x99, 0x11, 0x04, 0x43,
+	// Bytes 4bc0 - 4bff
+	0xE3, 0x82, 0x9A, 0x11, 0x04, 0x46, 0xE0, 0xBD,
+	0xB1, 0xE0, 0xBD, 0xB2, 0xA2, 0x27, 0x46, 0xE0,
+	0xBD, 0xB1, 0xE0, 0xBD, 0xB4, 0xA6, 0x27, 0x46,
+	0xE0, 0xBD, 0xB1, 0xE0, 0xBE, 0x80, 0xA2, 0x27,
+	0x00, 0x01,
+}
+
+// lookup returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *nfcTrie) lookup(s []byte) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return nfcValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := nfcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := nfcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := nfcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = nfcIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *nfcTrie) lookupUnsafe(s []byte) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return nfcValues[c0]
+	}
+	i := nfcIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = nfcIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = nfcIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// lookupString returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *nfcTrie) lookupString(s string) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return nfcValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := nfcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := nfcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := nfcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = nfcIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *nfcTrie) lookupStringUnsafe(s string) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return nfcValues[c0]
+	}
+	i := nfcIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = nfcIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = nfcIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// nfcTrie. Total size: 10798 bytes (10.54 KiB). Checksum: b5981cc85e3bd14.
+type nfcTrie struct{}
+
+func newNfcTrie(i int) *nfcTrie {
+	return &nfcTrie{}
+}
+
+// lookupValue determines the type of block n and looks up the value for b.
+func (t *nfcTrie) lookupValue(n uint32, b byte) uint16 {
+	switch {
+	case n < 46:
+		return uint16(nfcValues[n<<6+uint32(b)])
+	default:
+		n -= 46
+		return uint16(nfcSparse.lookup(n, b))
+	}
+}
+
+// nfcValues: 48 blocks, 3072 entries, 6144 bytes
+// The third block is the zero block.
+var nfcValues = [3072]uint16{
+	// Block 0x0, offset 0x0
+	0x3c: 0xa000, 0x3d: 0xa000, 0x3e: 0xa000,
+	// Block 0x1, offset 0x40
+	0x41: 0xa000, 0x42: 0xa000, 0x43: 0xa000, 0x44: 0xa000, 0x45: 0xa000,
+	0x46: 0xa000, 0x47: 0xa000, 0x48: 0xa000, 0x49: 0xa000, 0x4a: 0xa000, 0x4b: 0xa000,
+	0x4c: 0xa000, 0x4d: 0xa000, 0x4e: 0xa000, 0x4f: 0xa000, 0x50: 0xa000,
+	0x52: 0xa000, 0x53: 0xa000, 0x54: 0xa000, 0x55: 0xa000, 0x56: 0xa000, 0x57: 0xa000,
+	0x58: 0xa000, 0x59: 0xa000, 0x5a: 0xa000,
+	0x61: 0xa000, 0x62: 0xa000, 0x63: 0xa000,
+	0x64: 0xa000, 0x65: 0xa000, 0x66: 0xa000, 0x67: 0xa000, 0x68: 0xa000, 0x69: 0xa000,
+	0x6a: 0xa000, 0x6b: 0xa000, 0x6c: 0xa000, 0x6d: 0xa000, 0x6e: 0xa000, 0x6f: 0xa000,
+	0x70: 0xa000, 0x72: 0xa000, 0x73: 0xa000, 0x74: 0xa000, 0x75: 0xa000,
+	0x76: 0xa000, 0x77: 0xa000, 0x78: 0xa000, 0x79: 0xa000, 0x7a: 0xa000,
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc0: 0x30b0, 0xc1: 0x30b5, 0xc2: 0x47c9, 0xc3: 0x30ba, 0xc4: 0x47d8, 0xc5: 0x47dd,
+	0xc6: 0xa000, 0xc7: 0x47e7, 0xc8: 0x3123, 0xc9: 0x3128, 0xca: 0x47ec, 0xcb: 0x313c,
+	0xcc: 0x31af, 0xcd: 0x31b4, 0xce: 0x31b9, 0xcf: 0x4800, 0xd1: 0x3245,
+	0xd2: 0x3268, 0xd3: 0x326d, 0xd4: 0x480a, 0xd5: 0x480f, 0xd6: 0x481e,
+	0xd8: 0xa000, 0xd9: 0x32f4, 0xda: 0x32f9, 0xdb: 0x32fe, 0xdc: 0x4850, 0xdd: 0x3376,
+	0xe0: 0x33bc, 0xe1: 0x33c1, 0xe2: 0x485a, 0xe3: 0x33c6,
+	0xe4: 0x4869, 0xe5: 0x486e, 0xe6: 0xa000, 0xe7: 0x4878, 0xe8: 0x342f, 0xe9: 0x3434,
+	0xea: 0x487d, 0xeb: 0x3448, 0xec: 0x34c0, 0xed: 0x34c5, 0xee: 0x34ca, 0xef: 0x4891,
+	0xf1: 0x3556, 0xf2: 0x3579, 0xf3: 0x357e, 0xf4: 0x489b, 0xf5: 0x48a0,
+	0xf6: 0x48af, 0xf8: 0xa000, 0xf9: 0x360a, 0xfa: 0x360f, 0xfb: 0x3614,
+	0xfc: 0x48e1, 0xfd: 0x3691, 0xff: 0x36aa,
+	// Block 0x4, offset 0x100
+	0x100: 0x30bf, 0x101: 0x33cb, 0x102: 0x47ce, 0x103: 0x485f, 0x104: 0x30dd, 0x105: 0x33e9,
+	0x106: 0x30f1, 0x107: 0x33fd, 0x108: 0x30f6, 0x109: 0x3402, 0x10a: 0x30fb, 0x10b: 0x3407,
+	0x10c: 0x3100, 0x10d: 0x340c, 0x10e: 0x310a, 0x10f: 0x3416,
+	0x112: 0x47f1, 0x113: 0x4882, 0x114: 0x3132, 0x115: 0x343e, 0x116: 0x3137, 0x117: 0x3443,
+	0x118: 0x3155, 0x119: 0x3461, 0x11a: 0x3146, 0x11b: 0x3452, 0x11c: 0x316e, 0x11d: 0x347a,
+	0x11e: 0x3178, 0x11f: 0x3484, 0x120: 0x317d, 0x121: 0x3489, 0x122: 0x3187, 0x123: 0x3493,
+	0x124: 0x318c, 0x125: 0x3498, 0x128: 0x31be, 0x129: 0x34cf,
+	0x12a: 0x31c3, 0x12b: 0x34d4, 0x12c: 0x31c8, 0x12d: 0x34d9, 0x12e: 0x31eb, 0x12f: 0x34f7,
+	0x130: 0x31cd, 0x134: 0x31f5, 0x135: 0x3501,
+	0x136: 0x3209, 0x137: 0x351a, 0x139: 0x3213, 0x13a: 0x3524, 0x13b: 0x321d,
+	0x13c: 0x352e, 0x13d: 0x3218, 0x13e: 0x3529,
+	// Block 0x5, offset 0x140
+	0x143: 0x3240, 0x144: 0x3551, 0x145: 0x3259,
+	0x146: 0x356a, 0x147: 0x324f, 0x148: 0x3560,
+	0x14c: 0x4814, 0x14d: 0x48a5, 0x14e: 0x3272, 0x14f: 0x3583, 0x150: 0x327c, 0x151: 0x358d,
+	0x154: 0x329a, 0x155: 0x35ab, 0x156: 0x32b3, 0x157: 0x35c4,
+	0x158: 0x32a4, 0x159: 0x35b5, 0x15a: 0x4837, 0x15b: 0x48c8, 0x15c: 0x32bd, 0x15d: 0x35ce,
+	0x15e: 0x32cc, 0x15f: 0x35dd, 0x160: 0x483c, 0x161: 0x48cd, 0x162: 0x32e5, 0x163: 0x35fb,
+	0x164: 0x32d6, 0x165: 0x35ec, 0x168: 0x4846, 0x169: 0x48d7,
+	0x16a: 0x484b, 0x16b: 0x48dc, 0x16c: 0x3303, 0x16d: 0x3619, 0x16e: 0x330d, 0x16f: 0x3623,
+	0x170: 0x3312, 0x171: 0x3628, 0x172: 0x3330, 0x173: 0x3646, 0x174: 0x3353, 0x175: 0x3669,
+	0x176: 0x337b, 0x177: 0x3696, 0x178: 0x338f, 0x179: 0x339e, 0x17a: 0x36be, 0x17b: 0x33a8,
+	0x17c: 0x36c8, 0x17d: 0x33ad, 0x17e: 0x36cd, 0x17f: 0xa000,
+	// Block 0x6, offset 0x180
+	0x184: 0x8100, 0x185: 0x8100,
+	0x186: 0x8100,
+	0x18d: 0x30c9, 0x18e: 0x33d5, 0x18f: 0x31d7, 0x190: 0x34e3, 0x191: 0x3281,
+	0x192: 0x3592, 0x193: 0x3317, 0x194: 0x362d, 0x195: 0x3b10, 0x196: 0x3c9f, 0x197: 0x3b09,
+	0x198: 0x3c98, 0x199: 0x3b17, 0x19a: 0x3ca6, 0x19b: 0x3b02, 0x19c: 0x3c91,
+	0x19e: 0x39f1, 0x19f: 0x3b80, 0x1a0: 0x39ea, 0x1a1: 0x3b79, 0x1a2: 0x36f4, 0x1a3: 0x3706,
+	0x1a6: 0x3182, 0x1a7: 0x348e, 0x1a8: 0x31ff, 0x1a9: 0x3510,
+	0x1aa: 0x482d, 0x1ab: 0x48be, 0x1ac: 0x3ad1, 0x1ad: 0x3c60, 0x1ae: 0x3718, 0x1af: 0x371e,
+	0x1b0: 0x3506, 0x1b4: 0x3169, 0x1b5: 0x3475,
+	0x1b8: 0x323b, 0x1b9: 0x354c, 0x1ba: 0x39f8, 0x1bb: 0x3b87,
+	0x1bc: 0x36ee, 0x1bd: 0x3700, 0x1be: 0x36fa, 0x1bf: 0x370c,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x30ce, 0x1c1: 0x33da, 0x1c2: 0x30d3, 0x1c3: 0x33df, 0x1c4: 0x314b, 0x1c5: 0x3457,
+	0x1c6: 0x3150, 0x1c7: 0x345c, 0x1c8: 0x31dc, 0x1c9: 0x34e8, 0x1ca: 0x31e1, 0x1cb: 0x34ed,
+	0x1cc: 0x3286, 0x1cd: 0x3597, 0x1ce: 0x328b, 0x1cf: 0x359c, 0x1d0: 0x32a9, 0x1d1: 0x35ba,
+	0x1d2: 0x32ae, 0x1d3: 0x35bf, 0x1d4: 0x331c, 0x1d5: 0x3632, 0x1d6: 0x3321, 0x1d7: 0x3637,
+	0x1d8: 0x32c7, 0x1d9: 0x35d8, 0x1da: 0x32e0, 0x1db: 0x35f6,
+	0x1de: 0x319b, 0x1df: 0x34a7,
+	0x1e6: 0x47d3, 0x1e7: 0x4864, 0x1e8: 0x47fb, 0x1e9: 0x488c,
+	0x1ea: 0x3aa0, 0x1eb: 0x3c2f, 0x1ec: 0x3a7d, 0x1ed: 0x3c0c, 0x1ee: 0x4819, 0x1ef: 0x48aa,
+	0x1f0: 0x3a99, 0x1f1: 0x3c28, 0x1f2: 0x3385, 0x1f3: 0x36a0,
+	// Block 0x8, offset 0x200
+	0x200: 0x9933, 0x201: 0x9933, 0x202: 0x9933, 0x203: 0x9933, 0x204: 0x9933, 0x205: 0x8133,
+	0x206: 0x9933, 0x207: 0x9933, 0x208: 0x9933, 0x209: 0x9933, 0x20a: 0x9933, 0x20b: 0x9933,
+	0x20c: 0x9933, 0x20d: 0x8133, 0x20e: 0x8133, 0x20f: 0x9933, 0x210: 0x8133, 0x211: 0x9933,
+	0x212: 0x8133, 0x213: 0x9933, 0x214: 0x9933, 0x215: 0x8134, 0x216: 0x812e, 0x217: 0x812e,
+	0x218: 0x812e, 0x219: 0x812e, 0x21a: 0x8134, 0x21b: 0x992c, 0x21c: 0x812e, 0x21d: 0x812e,
+	0x21e: 0x812e, 0x21f: 0x812e, 0x220: 0x812e, 0x221: 0x812a, 0x222: 0x812a, 0x223: 0x992e,
+	0x224: 0x992e, 0x225: 0x992e, 0x226: 0x992e, 0x227: 0x992a, 0x228: 0x992a, 0x229: 0x812e,
+	0x22a: 0x812e, 0x22b: 0x812e, 0x22c: 0x812e, 0x22d: 0x992e, 0x22e: 0x992e, 0x22f: 0x812e,
+	0x230: 0x992e, 0x231: 0x992e, 0x232: 0x812e, 0x233: 0x812e, 0x234: 0x8101, 0x235: 0x8101,
+	0x236: 0x8101, 0x237: 0x8101, 0x238: 0x9901, 0x239: 0x812e, 0x23a: 0x812e, 0x23b: 0x812e,
+	0x23c: 0x812e, 0x23d: 0x8133, 0x23e: 0x8133, 0x23f: 0x8133,
+	// Block 0x9, offset 0x240
+	0x240: 0x4aef, 0x241: 0x4af4, 0x242: 0x9933, 0x243: 0x4af9, 0x244: 0x4bb2, 0x245: 0x9937,
+	0x246: 0x8133, 0x247: 0x812e, 0x248: 0x812e, 0x249: 0x812e, 0x24a: 0x8133, 0x24b: 0x8133,
+	0x24c: 0x8133, 0x24d: 0x812e, 0x24e: 0x812e, 0x250: 0x8133, 0x251: 0x8133,
+	0x252: 0x8133, 0x253: 0x812e, 0x254: 0x812e, 0x255: 0x812e, 0x256: 0x812e, 0x257: 0x8133,
+	0x258: 0x8134, 0x259: 0x812e, 0x25a: 0x812e, 0x25b: 0x8133, 0x25c: 0x8135, 0x25d: 0x8136,
+	0x25e: 0x8136, 0x25f: 0x8135, 0x260: 0x8136, 0x261: 0x8136, 0x262: 0x8135, 0x263: 0x8133,
+	0x264: 0x8133, 0x265: 0x8133, 0x266: 0x8133, 0x267: 0x8133, 0x268: 0x8133, 0x269: 0x8133,
+	0x26a: 0x8133, 0x26b: 0x8133, 0x26c: 0x8133, 0x26d: 0x8133, 0x26e: 0x8133, 0x26f: 0x8133,
+	0x274: 0x01ee,
+	0x27a: 0x8100,
+	0x27e: 0x0037,
+	// Block 0xa, offset 0x280
+	0x284: 0x8100, 0x285: 0x36e2,
+	0x286: 0x372a, 0x287: 0x00ce, 0x288: 0x3748, 0x289: 0x3754, 0x28a: 0x3766,
+	0x28c: 0x3784, 0x28e: 0x3796, 0x28f: 0x37b4, 0x290: 0x3f49, 0x291: 0xa000,
+	0x295: 0xa000, 0x297: 0xa000,
+	0x299: 0xa000,
+	0x29f: 0xa000, 0x2a1: 0xa000,
+	0x2a5: 0xa000, 0x2a9: 0xa000,
+	0x2aa: 0x3778, 0x2ab: 0x37a8, 0x2ac: 0x493f, 0x2ad: 0x37d8, 0x2ae: 0x4969, 0x2af: 0x37ea,
+	0x2b0: 0x3fb1, 0x2b1: 0xa000, 0x2b5: 0xa000,
+	0x2b7: 0xa000, 0x2b9: 0xa000,
+	0x2bf: 0xa000,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0x3862, 0x2c1: 0x386e, 0x2c3: 0x385c,
+	0x2c6: 0xa000, 0x2c7: 0x384a,
+	0x2cc: 0x389e, 0x2cd: 0x3886, 0x2ce: 0x38b0, 0x2d0: 0xa000,
+	0x2d3: 0xa000, 0x2d5: 0xa000, 0x2d6: 0xa000, 0x2d7: 0xa000,
+	0x2d8: 0xa000, 0x2d9: 0x3892, 0x2da: 0xa000,
+	0x2de: 0xa000, 0x2e3: 0xa000,
+	0x2e7: 0xa000,
+	0x2eb: 0xa000, 0x2ed: 0xa000,
+	0x2f0: 0xa000, 0x2f3: 0xa000, 0x2f5: 0xa000,
+	0x2f6: 0xa000, 0x2f7: 0xa000, 0x2f8: 0xa000, 0x2f9: 0x3916, 0x2fa: 0xa000,
+	0x2fe: 0xa000,
+	// Block 0xc, offset 0x300
+	0x301: 0x3874, 0x302: 0x38f8,
+	0x310: 0x3850, 0x311: 0x38d4,
+	0x312: 0x3856, 0x313: 0x38da, 0x316: 0x3868, 0x317: 0x38ec,
+	0x318: 0xa000, 0x319: 0xa000, 0x31a: 0x396a, 0x31b: 0x3970, 0x31c: 0x387a, 0x31d: 0x38fe,
+	0x31e: 0x3880, 0x31f: 0x3904, 0x322: 0x388c, 0x323: 0x3910,
+	0x324: 0x3898, 0x325: 0x391c, 0x326: 0x38a4, 0x327: 0x3928, 0x328: 0xa000, 0x329: 0xa000,
+	0x32a: 0x3976, 0x32b: 0x397c, 0x32c: 0x38ce, 0x32d: 0x3952, 0x32e: 0x38aa, 0x32f: 0x392e,
+	0x330: 0x38b6, 0x331: 0x393a, 0x332: 0x38bc, 0x333: 0x3940, 0x334: 0x38c2, 0x335: 0x3946,
+	0x338: 0x38c8, 0x339: 0x394c,
+	// Block 0xd, offset 0x340
+	0x351: 0x812e,
+	0x352: 0x8133, 0x353: 0x8133, 0x354: 0x8133, 0x355: 0x8133, 0x356: 0x812e, 0x357: 0x8133,
+	0x358: 0x8133, 0x359: 0x8133, 0x35a: 0x812f, 0x35b: 0x812e, 0x35c: 0x8133, 0x35d: 0x8133,
+	0x35e: 0x8133, 0x35f: 0x8133, 0x360: 0x8133, 0x361: 0x8133, 0x362: 0x812e, 0x363: 0x812e,
+	0x364: 0x812e, 0x365: 0x812e, 0x366: 0x812e, 0x367: 0x812e, 0x368: 0x8133, 0x369: 0x8133,
+	0x36a: 0x812e, 0x36b: 0x8133, 0x36c: 0x8133, 0x36d: 0x812f, 0x36e: 0x8132, 0x36f: 0x8133,
+	0x370: 0x8106, 0x371: 0x8107, 0x372: 0x8108, 0x373: 0x8109, 0x374: 0x810a, 0x375: 0x810b,
+	0x376: 0x810c, 0x377: 0x810d, 0x378: 0x810e, 0x379: 0x810f, 0x37a: 0x810f, 0x37b: 0x8110,
+	0x37c: 0x8111, 0x37d: 0x8112, 0x37f: 0x8113,
+	// Block 0xe, offset 0x380
+	0x388: 0xa000, 0x38a: 0xa000, 0x38b: 0x8117,
+	0x38c: 0x8118, 0x38d: 0x8119, 0x38e: 0x811a, 0x38f: 0x811b, 0x390: 0x811c, 0x391: 0x811d,
+	0x392: 0x811e, 0x393: 0x9933, 0x394: 0x9933, 0x395: 0x992e, 0x396: 0x812e, 0x397: 0x8133,
+	0x398: 0x8133, 0x399: 0x8133, 0x39a: 0x8133, 0x39b: 0x8133, 0x39c: 0x812e, 0x39d: 0x8133,
+	0x39e: 0x8133, 0x39f: 0x812e,
+	0x3b0: 0x811f,
+	// Block 0xf, offset 0x3c0
+	0x3ca: 0x8133, 0x3cb: 0x8133,
+	0x3cc: 0x8133, 0x3cd: 0x8133, 0x3ce: 0x8133, 0x3cf: 0x812e, 0x3d0: 0x812e, 0x3d1: 0x812e,
+	0x3d2: 0x812e, 0x3d3: 0x812e, 0x3d4: 0x8133, 0x3d5: 0x8133, 0x3d6: 0x8133, 0x3d7: 0x8133,
+	0x3d8: 0x8133, 0x3d9: 0x8133, 0x3da: 0x8133, 0x3db: 0x8133, 0x3dc: 0x8133, 0x3dd: 0x8133,
+	0x3de: 0x8133, 0x3df: 0x8133, 0x3e0: 0x8133, 0x3e1: 0x8133, 0x3e3: 0x812e,
+	0x3e4: 0x8133, 0x3e5: 0x8133, 0x3e6: 0x812e, 0x3e7: 0x8133, 0x3e8: 0x8133, 0x3e9: 0x812e,
+	0x3ea: 0x8133, 0x3eb: 0x8133, 0x3ec: 0x8133, 0x3ed: 0x812e, 0x3ee: 0x812e, 0x3ef: 0x812e,
+	0x3f0: 0x8117, 0x3f1: 0x8118, 0x3f2: 0x8119, 0x3f3: 0x8133, 0x3f4: 0x8133, 0x3f5: 0x8133,
+	0x3f6: 0x812e, 0x3f7: 0x8133, 0x3f8: 0x8133, 0x3f9: 0x812e, 0x3fa: 0x812e, 0x3fb: 0x8133,
+	0x3fc: 0x8133, 0x3fd: 0x8133, 0x3fe: 0x8133, 0x3ff: 0x8133,
+	// Block 0x10, offset 0x400
+	0x405: 0xa000,
+	0x406: 0x2e5d, 0x407: 0xa000, 0x408: 0x2e65, 0x409: 0xa000, 0x40a: 0x2e6d, 0x40b: 0xa000,
+	0x40c: 0x2e75, 0x40d: 0xa000, 0x40e: 0x2e7d, 0x411: 0xa000,
+	0x412: 0x2e85,
+	0x434: 0x8103, 0x435: 0x9900,
+	0x43a: 0xa000, 0x43b: 0x2e8d,
+	0x43c: 0xa000, 0x43d: 0x2e95, 0x43e: 0xa000, 0x43f: 0xa000,
+	// Block 0x11, offset 0x440
+	0x440: 0x8133, 0x441: 0x8133, 0x442: 0x812e, 0x443: 0x8133, 0x444: 0x8133, 0x445: 0x8133,
+	0x446: 0x8133, 0x447: 0x8133, 0x448: 0x8133, 0x449: 0x8133, 0x44a: 0x812e, 0x44b: 0x8133,
+	0x44c: 0x8133, 0x44d: 0x8136, 0x44e: 0x812b, 0x44f: 0x812e, 0x450: 0x812a, 0x451: 0x8133,
+	0x452: 0x8133, 0x453: 0x8133, 0x454: 0x8133, 0x455: 0x8133, 0x456: 0x8133, 0x457: 0x8133,
+	0x458: 0x8133, 0x459: 0x8133, 0x45a: 0x8133, 0x45b: 0x8133, 0x45c: 0x8133, 0x45d: 0x8133,
+	0x45e: 0x8133, 0x45f: 0x8133, 0x460: 0x8133, 0x461: 0x8133, 0x462: 0x8133, 0x463: 0x8133,
+	0x464: 0x8133, 0x465: 0x8133, 0x466: 0x8133, 0x467: 0x8133, 0x468: 0x8133, 0x469: 0x8133,
+	0x46a: 0x8133, 0x46b: 0x8133, 0x46c: 0x8133, 0x46d: 0x8133, 0x46e: 0x8133, 0x46f: 0x8133,
+	0x470: 0x8133, 0x471: 0x8133, 0x472: 0x8133, 0x473: 0x8133, 0x474: 0x8133, 0x475: 0x8133,
+	0x476: 0x8134, 0x477: 0x8132, 0x478: 0x8132, 0x479: 0x812e, 0x47a: 0x812d, 0x47b: 0x8133,
+	0x47c: 0x8135, 0x47d: 0x812e, 0x47e: 0x8133, 0x47f: 0x812e,
+	// Block 0x12, offset 0x480
+	0x480: 0x30d8, 0x481: 0x33e4, 0x482: 0x30e2, 0x483: 0x33ee, 0x484: 0x30e7, 0x485: 0x33f3,
+	0x486: 0x30ec, 0x487: 0x33f8, 0x488: 0x3a0d, 0x489: 0x3b9c, 0x48a: 0x3105, 0x48b: 0x3411,
+	0x48c: 0x310f, 0x48d: 0x341b, 0x48e: 0x311e, 0x48f: 0x342a, 0x490: 0x3114, 0x491: 0x3420,
+	0x492: 0x3119, 0x493: 0x3425, 0x494: 0x3a30, 0x495: 0x3bbf, 0x496: 0x3a37, 0x497: 0x3bc6,
+	0x498: 0x315a, 0x499: 0x3466, 0x49a: 0x315f, 0x49b: 0x346b, 0x49c: 0x3a45, 0x49d: 0x3bd4,
+	0x49e: 0x3164, 0x49f: 0x3470, 0x4a0: 0x3173, 0x4a1: 0x347f, 0x4a2: 0x3191, 0x4a3: 0x349d,
+	0x4a4: 0x31a0, 0x4a5: 0x34ac, 0x4a6: 0x3196, 0x4a7: 0x34a2, 0x4a8: 0x31a5, 0x4a9: 0x34b1,
+	0x4aa: 0x31aa, 0x4ab: 0x34b6, 0x4ac: 0x31f0, 0x4ad: 0x34fc, 0x4ae: 0x3a4c, 0x4af: 0x3bdb,
+	0x4b0: 0x31fa, 0x4b1: 0x350b, 0x4b2: 0x3204, 0x4b3: 0x3515, 0x4b4: 0x320e, 0x4b5: 0x351f,
+	0x4b6: 0x4805, 0x4b7: 0x4896, 0x4b8: 0x3a53, 0x4b9: 0x3be2, 0x4ba: 0x3227, 0x4bb: 0x3538,
+	0x4bc: 0x3222, 0x4bd: 0x3533, 0x4be: 0x322c, 0x4bf: 0x353d,
+	// Block 0x13, offset 0x4c0
+	0x4c0: 0x3231, 0x4c1: 0x3542, 0x4c2: 0x3236, 0x4c3: 0x3547, 0x4c4: 0x324a, 0x4c5: 0x355b,
+	0x4c6: 0x3254, 0x4c7: 0x3565, 0x4c8: 0x3263, 0x4c9: 0x3574, 0x4ca: 0x325e, 0x4cb: 0x356f,
+	0x4cc: 0x3a76, 0x4cd: 0x3c05, 0x4ce: 0x3a84, 0x4cf: 0x3c13, 0x4d0: 0x3a8b, 0x4d1: 0x3c1a,
+	0x4d2: 0x3a92, 0x4d3: 0x3c21, 0x4d4: 0x3290, 0x4d5: 0x35a1, 0x4d6: 0x3295, 0x4d7: 0x35a6,
+	0x4d8: 0x329f, 0x4d9: 0x35b0, 0x4da: 0x4832, 0x4db: 0x48c3, 0x4dc: 0x3ad8, 0x4dd: 0x3c67,
+	0x4de: 0x32b8, 0x4df: 0x35c9, 0x4e0: 0x32c2, 0x4e1: 0x35d3, 0x4e2: 0x4841, 0x4e3: 0x48d2,
+	0x4e4: 0x3adf, 0x4e5: 0x3c6e, 0x4e6: 0x3ae6, 0x4e7: 0x3c75, 0x4e8: 0x3aed, 0x4e9: 0x3c7c,
+	0x4ea: 0x32d1, 0x4eb: 0x35e2, 0x4ec: 0x32db, 0x4ed: 0x35f1, 0x4ee: 0x32ef, 0x4ef: 0x3605,
+	0x4f0: 0x32ea, 0x4f1: 0x3600, 0x4f2: 0x332b, 0x4f3: 0x3641, 0x4f4: 0x333a, 0x4f5: 0x3650,
+	0x4f6: 0x3335, 0x4f7: 0x364b, 0x4f8: 0x3af4, 0x4f9: 0x3c83, 0x4fa: 0x3afb, 0x4fb: 0x3c8a,
+	0x4fc: 0x333f, 0x4fd: 0x3655, 0x4fe: 0x3344, 0x4ff: 0x365a,
+	// Block 0x14, offset 0x500
+	0x500: 0x3349, 0x501: 0x365f, 0x502: 0x334e, 0x503: 0x3664, 0x504: 0x335d, 0x505: 0x3673,
+	0x506: 0x3358, 0x507: 0x366e, 0x508: 0x3362, 0x509: 0x367d, 0x50a: 0x3367, 0x50b: 0x3682,
+	0x50c: 0x336c, 0x50d: 0x3687, 0x50e: 0x338a, 0x50f: 0x36a5, 0x510: 0x33a3, 0x511: 0x36c3,
+	0x512: 0x33b2, 0x513: 0x36d2, 0x514: 0x33b7, 0x515: 0x36d7, 0x516: 0x34bb, 0x517: 0x35e7,
+	0x518: 0x3678, 0x519: 0x36b4, 0x51b: 0x3712,
+	0x520: 0x47e2, 0x521: 0x4873, 0x522: 0x30c4, 0x523: 0x33d0,
+	0x524: 0x39b9, 0x525: 0x3b48, 0x526: 0x39b2, 0x527: 0x3b41, 0x528: 0x39c7, 0x529: 0x3b56,
+	0x52a: 0x39c0, 0x52b: 0x3b4f, 0x52c: 0x39ff, 0x52d: 0x3b8e, 0x52e: 0x39d5, 0x52f: 0x3b64,
+	0x530: 0x39ce, 0x531: 0x3b5d, 0x532: 0x39e3, 0x533: 0x3b72, 0x534: 0x39dc, 0x535: 0x3b6b,
+	0x536: 0x3a06, 0x537: 0x3b95, 0x538: 0x47f6, 0x539: 0x4887, 0x53a: 0x3141, 0x53b: 0x344d,
+	0x53c: 0x312d, 0x53d: 0x3439, 0x53e: 0x3a1b, 0x53f: 0x3baa,
+	// Block 0x15, offset 0x540
+	0x540: 0x3a14, 0x541: 0x3ba3, 0x542: 0x3a29, 0x543: 0x3bb8, 0x544: 0x3a22, 0x545: 0x3bb1,
+	0x546: 0x3a3e, 0x547: 0x3bcd, 0x548: 0x31d2, 0x549: 0x34de, 0x54a: 0x31e6, 0x54b: 0x34f2,
+	0x54c: 0x4828, 0x54d: 0x48b9, 0x54e: 0x3277, 0x54f: 0x3588, 0x550: 0x3a61, 0x551: 0x3bf0,
+	0x552: 0x3a5a, 0x553: 0x3be9, 0x554: 0x3a6f, 0x555: 0x3bfe, 0x556: 0x3a68, 0x557: 0x3bf7,
+	0x558: 0x3aca, 0x559: 0x3c59, 0x55a: 0x3aae, 0x55b: 0x3c3d, 0x55c: 0x3aa7, 0x55d: 0x3c36,
+	0x55e: 0x3abc, 0x55f: 0x3c4b, 0x560: 0x3ab5, 0x561: 0x3c44, 0x562: 0x3ac3, 0x563: 0x3c52,
+	0x564: 0x3326, 0x565: 0x363c, 0x566: 0x3308, 0x567: 0x361e, 0x568: 0x3b25, 0x569: 0x3cb4,
+	0x56a: 0x3b1e, 0x56b: 0x3cad, 0x56c: 0x3b33, 0x56d: 0x3cc2, 0x56e: 0x3b2c, 0x56f: 0x3cbb,
+	0x570: 0x3b3a, 0x571: 0x3cc9, 0x572: 0x3371, 0x573: 0x368c, 0x574: 0x3399, 0x575: 0x36b9,
+	0x576: 0x3394, 0x577: 0x36af, 0x578: 0x3380, 0x579: 0x369b,
+	// Block 0x16, offset 0x580
+	0x580: 0x4945, 0x581: 0x494b, 0x582: 0x4a5f, 0x583: 0x4a77, 0x584: 0x4a67, 0x585: 0x4a7f,
+	0x586: 0x4a6f, 0x587: 0x4a87, 0x588: 0x48eb, 0x589: 0x48f1, 0x58a: 0x49cf, 0x58b: 0x49e7,
+	0x58c: 0x49d7, 0x58d: 0x49ef, 0x58e: 0x49df, 0x58f: 0x49f7, 0x590: 0x4957, 0x591: 0x495d,
+	0x592: 0x3ef9, 0x593: 0x3f09, 0x594: 0x3f01, 0x595: 0x3f11,
+	0x598: 0x48f7, 0x599: 0x48fd, 0x59a: 0x3e29, 0x59b: 0x3e39, 0x59c: 0x3e31, 0x59d: 0x3e41,
+	0x5a0: 0x496f, 0x5a1: 0x4975, 0x5a2: 0x4a8f, 0x5a3: 0x4aa7,
+	0x5a4: 0x4a97, 0x5a5: 0x4aaf, 0x5a6: 0x4a9f, 0x5a7: 0x4ab7, 0x5a8: 0x4903, 0x5a9: 0x4909,
+	0x5aa: 0x49ff, 0x5ab: 0x4a17, 0x5ac: 0x4a07, 0x5ad: 0x4a1f, 0x5ae: 0x4a0f, 0x5af: 0x4a27,
+	0x5b0: 0x4987, 0x5b1: 0x498d, 0x5b2: 0x3f59, 0x5b3: 0x3f71, 0x5b4: 0x3f61, 0x5b5: 0x3f79,
+	0x5b6: 0x3f69, 0x5b7: 0x3f81, 0x5b8: 0x490f, 0x5b9: 0x4915, 0x5ba: 0x3e59, 0x5bb: 0x3e71,
+	0x5bc: 0x3e61, 0x5bd: 0x3e79, 0x5be: 0x3e69, 0x5bf: 0x3e81,
+	// Block 0x17, offset 0x5c0
+	0x5c0: 0x4993, 0x5c1: 0x4999, 0x5c2: 0x3f89, 0x5c3: 0x3f99, 0x5c4: 0x3f91, 0x5c5: 0x3fa1,
+	0x5c8: 0x491b, 0x5c9: 0x4921, 0x5ca: 0x3e89, 0x5cb: 0x3e99,
+	0x5cc: 0x3e91, 0x5cd: 0x3ea1, 0x5d0: 0x49a5, 0x5d1: 0x49ab,
+	0x5d2: 0x3fc1, 0x5d3: 0x3fd9, 0x5d4: 0x3fc9, 0x5d5: 0x3fe1, 0x5d6: 0x3fd1, 0x5d7: 0x3fe9,
+	0x5d9: 0x4927, 0x5db: 0x3ea9, 0x5dd: 0x3eb1,
+	0x5df: 0x3eb9, 0x5e0: 0x49bd, 0x5e1: 0x49c3, 0x5e2: 0x4abf, 0x5e3: 0x4ad7,
+	0x5e4: 0x4ac7, 0x5e5: 0x4adf, 0x5e6: 0x4acf, 0x5e7: 0x4ae7, 0x5e8: 0x492d, 0x5e9: 0x4933,
+	0x5ea: 0x4a2f, 0x5eb: 0x4a47, 0x5ec: 0x4a37, 0x5ed: 0x4a4f, 0x5ee: 0x4a3f, 0x5ef: 0x4a57,
+	0x5f0: 0x4939, 0x5f1: 0x445f, 0x5f2: 0x37d2, 0x5f3: 0x4465, 0x5f4: 0x4963, 0x5f5: 0x446b,
+	0x5f6: 0x37e4, 0x5f7: 0x4471, 0x5f8: 0x3802, 0x5f9: 0x4477, 0x5fa: 0x381a, 0x5fb: 0x447d,
+	0x5fc: 0x49b1, 0x5fd: 0x4483,
+	// Block 0x18, offset 0x600
+	0x600: 0x3ee1, 0x601: 0x3ee9, 0x602: 0x42c5, 0x603: 0x42e3, 0x604: 0x42cf, 0x605: 0x42ed,
+	0x606: 0x42d9, 0x607: 0x42f7, 0x608: 0x3e19, 0x609: 0x3e21, 0x60a: 0x4211, 0x60b: 0x422f,
+	0x60c: 0x421b, 0x60d: 0x4239, 0x60e: 0x4225, 0x60f: 0x4243, 0x610: 0x3f29, 0x611: 0x3f31,
+	0x612: 0x4301, 0x613: 0x431f, 0x614: 0x430b, 0x615: 0x4329, 0x616: 0x4315, 0x617: 0x4333,
+	0x618: 0x3e49, 0x619: 0x3e51, 0x61a: 0x424d, 0x61b: 0x426b, 0x61c: 0x4257, 0x61d: 0x4275,
+	0x61e: 0x4261, 0x61f: 0x427f, 0x620: 0x4001, 0x621: 0x4009, 0x622: 0x433d, 0x623: 0x435b,
+	0x624: 0x4347, 0x625: 0x4365, 0x626: 0x4351, 0x627: 0x436f, 0x628: 0x3ec1, 0x629: 0x3ec9,
+	0x62a: 0x4289, 0x62b: 0x42a7, 0x62c: 0x4293, 0x62d: 0x42b1, 0x62e: 0x429d, 0x62f: 0x42bb,
+	0x630: 0x37c6, 0x631: 0x37c0, 0x632: 0x3ed1, 0x633: 0x37cc, 0x634: 0x3ed9,
+	0x636: 0x4951, 0x637: 0x3ef1, 0x638: 0x3736, 0x639: 0x3730, 0x63a: 0x3724, 0x63b: 0x442f,
+	0x63c: 0x373c, 0x63d: 0x8100, 0x63e: 0x0257, 0x63f: 0xa100,
+	// Block 0x19, offset 0x640
+	0x640: 0x8100, 0x641: 0x36e8, 0x642: 0x3f19, 0x643: 0x37de, 0x644: 0x3f21,
+	0x646: 0x497b, 0x647: 0x3f39, 0x648: 0x3742, 0x649: 0x4435, 0x64a: 0x374e, 0x64b: 0x443b,
+	0x64c: 0x375a, 0x64d: 0x3cd0, 0x64e: 0x3cd7, 0x64f: 0x3cde, 0x650: 0x37f6, 0x651: 0x37f0,
+	0x652: 0x3f41, 0x653: 0x4625, 0x656: 0x37fc, 0x657: 0x3f51,
+	0x658: 0x3772, 0x659: 0x376c, 0x65a: 0x3760, 0x65b: 0x4441, 0x65d: 0x3ce5,
+	0x65e: 0x3cec, 0x65f: 0x3cf3, 0x660: 0x382c, 0x661: 0x3826, 0x662: 0x3fa9, 0x663: 0x462d,
+	0x664: 0x380e, 0x665: 0x3814, 0x666: 0x3832, 0x667: 0x3fb9, 0x668: 0x37a2, 0x669: 0x379c,
+	0x66a: 0x3790, 0x66b: 0x444d, 0x66c: 0x378a, 0x66d: 0x36dc, 0x66e: 0x4429, 0x66f: 0x0081,
+	0x672: 0x3ff1, 0x673: 0x3838, 0x674: 0x3ff9,
+	0x676: 0x49c9, 0x677: 0x4011, 0x678: 0x377e, 0x679: 0x4447, 0x67a: 0x37ae, 0x67b: 0x4459,
+	0x67c: 0x37ba, 0x67d: 0x4397, 0x67e: 0xa100,
+	// Block 0x1a, offset 0x680
+	0x681: 0x3d47, 0x683: 0xa000, 0x684: 0x3d4e, 0x685: 0xa000,
+	0x687: 0x3d55, 0x688: 0xa000, 0x689: 0x3d5c,
+	0x68d: 0xa000,
+	0x6a0: 0x30a6, 0x6a1: 0xa000, 0x6a2: 0x3d6a,
+	0x6a4: 0xa000, 0x6a5: 0xa000,
+	0x6ad: 0x3d63, 0x6ae: 0x30a1, 0x6af: 0x30ab,
+	0x6b0: 0x3d71, 0x6b1: 0x3d78, 0x6b2: 0xa000, 0x6b3: 0xa000, 0x6b4: 0x3d7f, 0x6b5: 0x3d86,
+	0x6b6: 0xa000, 0x6b7: 0xa000, 0x6b8: 0x3d8d, 0x6b9: 0x3d94, 0x6ba: 0xa000, 0x6bb: 0xa000,
+	0x6bc: 0xa000, 0x6bd: 0xa000,
+	// Block 0x1b, offset 0x6c0
+	0x6c0: 0x3d9b, 0x6c1: 0x3da2, 0x6c2: 0xa000, 0x6c3: 0xa000, 0x6c4: 0x3db7, 0x6c5: 0x3dbe,
+	0x6c6: 0xa000, 0x6c7: 0xa000, 0x6c8: 0x3dc5, 0x6c9: 0x3dcc,
+	0x6d1: 0xa000,
+	0x6d2: 0xa000,
+	0x6e2: 0xa000,
+	0x6e8: 0xa000, 0x6e9: 0xa000,
+	0x6eb: 0xa000, 0x6ec: 0x3de1, 0x6ed: 0x3de8, 0x6ee: 0x3def, 0x6ef: 0x3df6,
+	0x6f2: 0xa000, 0x6f3: 0xa000, 0x6f4: 0xa000, 0x6f5: 0xa000,
+	// Block 0x1c, offset 0x700
+	0x706: 0xa000, 0x70b: 0xa000,
+	0x70c: 0x4049, 0x70d: 0xa000, 0x70e: 0x4051, 0x70f: 0xa000, 0x710: 0x4059, 0x711: 0xa000,
+	0x712: 0x4061, 0x713: 0xa000, 0x714: 0x4069, 0x715: 0xa000, 0x716: 0x4071, 0x717: 0xa000,
+	0x718: 0x4079, 0x719: 0xa000, 0x71a: 0x4081, 0x71b: 0xa000, 0x71c: 0x4089, 0x71d: 0xa000,
+	0x71e: 0x4091, 0x71f: 0xa000, 0x720: 0x4099, 0x721: 0xa000, 0x722: 0x40a1,
+	0x724: 0xa000, 0x725: 0x40a9, 0x726: 0xa000, 0x727: 0x40b1, 0x728: 0xa000, 0x729: 0x40b9,
+	0x72f: 0xa000,
+	0x730: 0x40c1, 0x731: 0x40c9, 0x732: 0xa000, 0x733: 0x40d1, 0x734: 0x40d9, 0x735: 0xa000,
+	0x736: 0x40e1, 0x737: 0x40e9, 0x738: 0xa000, 0x739: 0x40f1, 0x73a: 0x40f9, 0x73b: 0xa000,
+	0x73c: 0x4101, 0x73d: 0x4109,
+	// Block 0x1d, offset 0x740
+	0x754: 0x4041,
+	0x759: 0x9904, 0x75a: 0x9904, 0x75b: 0x8100, 0x75c: 0x8100, 0x75d: 0xa000,
+	0x75e: 0x4111,
+	0x766: 0xa000,
+	0x76b: 0xa000, 0x76c: 0x4121, 0x76d: 0xa000, 0x76e: 0x4129, 0x76f: 0xa000,
+	0x770: 0x4131, 0x771: 0xa000, 0x772: 0x4139, 0x773: 0xa000, 0x774: 0x4141, 0x775: 0xa000,
+	0x776: 0x4149, 0x777: 0xa000, 0x778: 0x4151, 0x779: 0xa000, 0x77a: 0x4159, 0x77b: 0xa000,
+	0x77c: 0x4161, 0x77d: 0xa000, 0x77e: 0x4169, 0x77f: 0xa000,
+	// Block 0x1e, offset 0x780
+	0x780: 0x4171, 0x781: 0xa000, 0x782: 0x4179, 0x784: 0xa000, 0x785: 0x4181,
+	0x786: 0xa000, 0x787: 0x4189, 0x788: 0xa000, 0x789: 0x4191,
+	0x78f: 0xa000, 0x790: 0x4199, 0x791: 0x41a1,
+	0x792: 0xa000, 0x793: 0x41a9, 0x794: 0x41b1, 0x795: 0xa000, 0x796: 0x41b9, 0x797: 0x41c1,
+	0x798: 0xa000, 0x799: 0x41c9, 0x79a: 0x41d1, 0x79b: 0xa000, 0x79c: 0x41d9, 0x79d: 0x41e1,
+	0x7af: 0xa000,
+	0x7b0: 0xa000, 0x7b1: 0xa000, 0x7b2: 0xa000, 0x7b4: 0x4119,
+	0x7b7: 0x41e9, 0x7b8: 0x41f1, 0x7b9: 0x41f9, 0x7ba: 0x4201,
+	0x7bd: 0xa000, 0x7be: 0x4209,
+	// Block 0x1f, offset 0x7c0
+	0x7c0: 0x1472, 0x7c1: 0x0df6, 0x7c2: 0x14ce, 0x7c3: 0x149a, 0x7c4: 0x0f52, 0x7c5: 0x07e6,
+	0x7c6: 0x09da, 0x7c7: 0x1726, 0x7c8: 0x1726, 0x7c9: 0x0b06, 0x7ca: 0x155a, 0x7cb: 0x0a3e,
+	0x7cc: 0x0b02, 0x7cd: 0x0cea, 0x7ce: 0x10ca, 0x7cf: 0x125a, 0x7d0: 0x1392, 0x7d1: 0x13ce,
+	0x7d2: 0x1402, 0x7d3: 0x1516, 0x7d4: 0x0e6e, 0x7d5: 0x0efa, 0x7d6: 0x0fa6, 0x7d7: 0x103e,
+	0x7d8: 0x135a, 0x7d9: 0x1542, 0x7da: 0x166e, 0x7db: 0x080a, 0x7dc: 0x09ae, 0x7dd: 0x0e82,
+	0x7de: 0x0fca, 0x7df: 0x138e, 0x7e0: 0x16be, 0x7e1: 0x0bae, 0x7e2: 0x0f72, 0x7e3: 0x137e,
+	0x7e4: 0x1412, 0x7e5: 0x0d1e, 0x7e6: 0x12b6, 0x7e7: 0x13da, 0x7e8: 0x0c1a, 0x7e9: 0x0e0a,
+	0x7ea: 0x0f12, 0x7eb: 0x1016, 0x7ec: 0x1522, 0x7ed: 0x084a, 0x7ee: 0x08e2, 0x7ef: 0x094e,
+	0x7f0: 0x0d86, 0x7f1: 0x0e7a, 0x7f2: 0x0fc6, 0x7f3: 0x10ea, 0x7f4: 0x1272, 0x7f5: 0x1386,
+	0x7f6: 0x139e, 0x7f7: 0x14c2, 0x7f8: 0x15ea, 0x7f9: 0x169e, 0x7fa: 0x16ba, 0x7fb: 0x1126,
+	0x7fc: 0x1166, 0x7fd: 0x121e, 0x7fe: 0x133e, 0x7ff: 0x1576,
+	// Block 0x20, offset 0x800
+	0x800: 0x16c6, 0x801: 0x1446, 0x802: 0x0ac2, 0x803: 0x0c36, 0x804: 0x11d6, 0x805: 0x1296,
+	0x806: 0x0ffa, 0x807: 0x112e, 0x808: 0x1492, 0x809: 0x15e2, 0x80a: 0x0abe, 0x80b: 0x0b8a,
+	0x80c: 0x0e72, 0x80d: 0x0f26, 0x80e: 0x0f5a, 0x80f: 0x120e, 0x810: 0x1236, 0x811: 0x15a2,
+	0x812: 0x094a, 0x813: 0x12a2, 0x814: 0x08ee, 0x815: 0x08ea, 0x816: 0x1192, 0x817: 0x1222,
+	0x818: 0x1356, 0x819: 0x15aa, 0x81a: 0x1462, 0x81b: 0x0d22, 0x81c: 0x0e6e, 0x81d: 0x1452,
+	0x81e: 0x07f2, 0x81f: 0x0b5e, 0x820: 0x0c8e, 0x821: 0x102a, 0x822: 0x10aa, 0x823: 0x096e,
+	0x824: 0x1136, 0x825: 0x085a, 0x826: 0x0c72, 0x827: 0x07d2, 0x828: 0x0ee6, 0x829: 0x0d9e,
+	0x82a: 0x120a, 0x82b: 0x09c2, 0x82c: 0x0aae, 0x82d: 0x10f6, 0x82e: 0x135e, 0x82f: 0x1436,
+	0x830: 0x0eb2, 0x831: 0x14f2, 0x832: 0x0ede, 0x833: 0x0d32, 0x834: 0x1316, 0x835: 0x0d52,
+	0x836: 0x10a6, 0x837: 0x0826, 0x838: 0x08a2, 0x839: 0x08e6, 0x83a: 0x0e4e, 0x83b: 0x11f6,
+	0x83c: 0x12ee, 0x83d: 0x1442, 0x83e: 0x1556, 0x83f: 0x0956,
+	// Block 0x21, offset 0x840
+	0x840: 0x0a0a, 0x841: 0x0b12, 0x842: 0x0c2a, 0x843: 0x0dba, 0x844: 0x0f76, 0x845: 0x113a,
+	0x846: 0x1592, 0x847: 0x1676, 0x848: 0x16ca, 0x849: 0x16e2, 0x84a: 0x0932, 0x84b: 0x0dee,
+	0x84c: 0x0e9e, 0x84d: 0x14e6, 0x84e: 0x0bf6, 0x84f: 0x0cd2, 0x850: 0x0cee, 0x851: 0x0d7e,
+	0x852: 0x0f66, 0x853: 0x0fb2, 0x854: 0x1062, 0x855: 0x1186, 0x856: 0x122a, 0x857: 0x128e,
+	0x858: 0x14d6, 0x859: 0x1366, 0x85a: 0x14fe, 0x85b: 0x157a, 0x85c: 0x090a, 0x85d: 0x0936,
+	0x85e: 0x0a1e, 0x85f: 0x0fa2, 0x860: 0x13ee, 0x861: 0x1436, 0x862: 0x0c16, 0x863: 0x0c86,
+	0x864: 0x0d4a, 0x865: 0x0eaa, 0x866: 0x11d2, 0x867: 0x101e, 0x868: 0x0836, 0x869: 0x0a7a,
+	0x86a: 0x0b5e, 0x86b: 0x0bc2, 0x86c: 0x0c92, 0x86d: 0x103a, 0x86e: 0x1056, 0x86f: 0x1266,
+	0x870: 0x1286, 0x871: 0x155e, 0x872: 0x15de, 0x873: 0x15ee, 0x874: 0x162a, 0x875: 0x084e,
+	0x876: 0x117a, 0x877: 0x154a, 0x878: 0x15c6, 0x879: 0x0caa, 0x87a: 0x0812, 0x87b: 0x0872,
+	0x87c: 0x0b62, 0x87d: 0x0b82, 0x87e: 0x0daa, 0x87f: 0x0e6e,
+	// Block 0x22, offset 0x880
+	0x880: 0x0fbe, 0x881: 0x10c6, 0x882: 0x1372, 0x883: 0x1512, 0x884: 0x171e, 0x885: 0x0dde,
+	0x886: 0x159e, 0x887: 0x092e, 0x888: 0x0e2a, 0x889: 0x0e36, 0x88a: 0x0f0a, 0x88b: 0x0f42,
+	0x88c: 0x1046, 0x88d: 0x10a2, 0x88e: 0x1122, 0x88f: 0x1206, 0x890: 0x1636, 0x891: 0x08aa,
+	0x892: 0x0cfe, 0x893: 0x15ae, 0x894: 0x0862, 0x895: 0x0ba6, 0x896: 0x0f2a, 0x897: 0x14da,
+	0x898: 0x0c62, 0x899: 0x0cb2, 0x89a: 0x0e3e, 0x89b: 0x102a, 0x89c: 0x15b6, 0x89d: 0x0912,
+	0x89e: 0x09fa, 0x89f: 0x0b92, 0x8a0: 0x0dce, 0x8a1: 0x0e1a, 0x8a2: 0x0e5a, 0x8a3: 0x0eee,
+	0x8a4: 0x1042, 0x8a5: 0x10b6, 0x8a6: 0x1252, 0x8a7: 0x13f2, 0x8a8: 0x13fe, 0x8a9: 0x1552,
+	0x8aa: 0x15d2, 0x8ab: 0x097e, 0x8ac: 0x0f46, 0x8ad: 0x09fe, 0x8ae: 0x0fc2, 0x8af: 0x1066,
+	0x8b0: 0x1382, 0x8b1: 0x15ba, 0x8b2: 0x16a6, 0x8b3: 0x16ce, 0x8b4: 0x0e32, 0x8b5: 0x0f22,
+	0x8b6: 0x12be, 0x8b7: 0x11b2, 0x8b8: 0x11be, 0x8b9: 0x11e2, 0x8ba: 0x1012, 0x8bb: 0x0f9a,
+	0x8bc: 0x145e, 0x8bd: 0x082e, 0x8be: 0x1326, 0x8bf: 0x0916,
+	// Block 0x23, offset 0x8c0
+	0x8c0: 0x0906, 0x8c1: 0x0c06, 0x8c2: 0x0d26, 0x8c3: 0x11ee, 0x8c4: 0x0b4e, 0x8c5: 0x0efe,
+	0x8c6: 0x0dea, 0x8c7: 0x14e2, 0x8c8: 0x13e2, 0x8c9: 0x15a6, 0x8ca: 0x141e, 0x8cb: 0x0c22,
+	0x8cc: 0x0882, 0x8cd: 0x0a56, 0x8d0: 0x0aaa,
+	0x8d2: 0x0dda, 0x8d5: 0x08f2, 0x8d6: 0x101a, 0x8d7: 0x10de,
+	0x8d8: 0x1142, 0x8d9: 0x115e, 0x8da: 0x1162, 0x8db: 0x1176, 0x8dc: 0x15f6, 0x8dd: 0x11e6,
+	0x8de: 0x126a, 0x8e0: 0x138a, 0x8e2: 0x144e,
+	0x8e5: 0x1502, 0x8e6: 0x152e,
+	0x8ea: 0x164a, 0x8eb: 0x164e, 0x8ec: 0x1652, 0x8ed: 0x16b6, 0x8ee: 0x1526, 0x8ef: 0x15c2,
+	0x8f0: 0x0852, 0x8f1: 0x0876, 0x8f2: 0x088a, 0x8f3: 0x0946, 0x8f4: 0x0952, 0x8f5: 0x0992,
+	0x8f6: 0x0a46, 0x8f7: 0x0a62, 0x8f8: 0x0a6a, 0x8f9: 0x0aa6, 0x8fa: 0x0ab2, 0x8fb: 0x0b8e,
+	0x8fc: 0x0b96, 0x8fd: 0x0c9e, 0x8fe: 0x0cc6, 0x8ff: 0x0cce,
+	// Block 0x24, offset 0x900
+	0x900: 0x0ce6, 0x901: 0x0d92, 0x902: 0x0dc2, 0x903: 0x0de2, 0x904: 0x0e52, 0x905: 0x0f16,
+	0x906: 0x0f32, 0x907: 0x0f62, 0x908: 0x0fb6, 0x909: 0x0fd6, 0x90a: 0x104a, 0x90b: 0x112a,
+	0x90c: 0x1146, 0x90d: 0x114e, 0x90e: 0x114a, 0x90f: 0x1152, 0x910: 0x1156, 0x911: 0x115a,
+	0x912: 0x116e, 0x913: 0x1172, 0x914: 0x1196, 0x915: 0x11aa, 0x916: 0x11c6, 0x917: 0x122a,
+	0x918: 0x1232, 0x919: 0x123a, 0x91a: 0x124e, 0x91b: 0x1276, 0x91c: 0x12c6, 0x91d: 0x12fa,
+	0x91e: 0x12fa, 0x91f: 0x1362, 0x920: 0x140a, 0x921: 0x1422, 0x922: 0x1456, 0x923: 0x145a,
+	0x924: 0x149e, 0x925: 0x14a2, 0x926: 0x14fa, 0x927: 0x1502, 0x928: 0x15d6, 0x929: 0x161a,
+	0x92a: 0x1632, 0x92b: 0x0c96, 0x92c: 0x184b, 0x92d: 0x12de,
+	0x930: 0x07da, 0x931: 0x08de, 0x932: 0x089e, 0x933: 0x0846, 0x934: 0x0886, 0x935: 0x08b2,
+	0x936: 0x0942, 0x937: 0x095e, 0x938: 0x0a46, 0x939: 0x0a32, 0x93a: 0x0a42, 0x93b: 0x0a5e,
+	0x93c: 0x0aaa, 0x93d: 0x0aba, 0x93e: 0x0afe, 0x93f: 0x0b0a,
+	// Block 0x25, offset 0x940
+	0x940: 0x0b26, 0x941: 0x0b36, 0x942: 0x0c1e, 0x943: 0x0c26, 0x944: 0x0c56, 0x945: 0x0c76,
+	0x946: 0x0ca6, 0x947: 0x0cbe, 0x948: 0x0cae, 0x949: 0x0cce, 0x94a: 0x0cc2, 0x94b: 0x0ce6,
+	0x94c: 0x0d02, 0x94d: 0x0d5a, 0x94e: 0x0d66, 0x94f: 0x0d6e, 0x950: 0x0d96, 0x951: 0x0dda,
+	0x952: 0x0e0a, 0x953: 0x0e0e, 0x954: 0x0e22, 0x955: 0x0ea2, 0x956: 0x0eb2, 0x957: 0x0f0a,
+	0x958: 0x0f56, 0x959: 0x0f4e, 0x95a: 0x0f62, 0x95b: 0x0f7e, 0x95c: 0x0fb6, 0x95d: 0x110e,
+	0x95e: 0x0fda, 0x95f: 0x100e, 0x960: 0x101a, 0x961: 0x105a, 0x962: 0x1076, 0x963: 0x109a,
+	0x964: 0x10be, 0x965: 0x10c2, 0x966: 0x10de, 0x967: 0x10e2, 0x968: 0x10f2, 0x969: 0x1106,
+	0x96a: 0x1102, 0x96b: 0x1132, 0x96c: 0x11ae, 0x96d: 0x11c6, 0x96e: 0x11de, 0x96f: 0x1216,
+	0x970: 0x122a, 0x971: 0x1246, 0x972: 0x1276, 0x973: 0x132a, 0x974: 0x1352, 0x975: 0x13c6,
+	0x976: 0x140e, 0x977: 0x141a, 0x978: 0x1422, 0x979: 0x143a, 0x97a: 0x144e, 0x97b: 0x143e,
+	0x97c: 0x1456, 0x97d: 0x1452, 0x97e: 0x144a, 0x97f: 0x145a,
+	// Block 0x26, offset 0x980
+	0x980: 0x1466, 0x981: 0x14a2, 0x982: 0x14de, 0x983: 0x150e, 0x984: 0x1546, 0x985: 0x1566,
+	0x986: 0x15b2, 0x987: 0x15d6, 0x988: 0x15f6, 0x989: 0x160a, 0x98a: 0x161a, 0x98b: 0x1626,
+	0x98c: 0x1632, 0x98d: 0x1686, 0x98e: 0x1726, 0x98f: 0x17e2, 0x990: 0x17dd, 0x991: 0x180f,
+	0x992: 0x0702, 0x993: 0x072a, 0x994: 0x072e, 0x995: 0x1891, 0x996: 0x18be, 0x997: 0x1936,
+	0x998: 0x1712, 0x999: 0x1722,
+	// Block 0x27, offset 0x9c0
+	0x9c0: 0x07f6, 0x9c1: 0x07ee, 0x9c2: 0x07fe, 0x9c3: 0x1774, 0x9c4: 0x0842, 0x9c5: 0x0852,
+	0x9c6: 0x0856, 0x9c7: 0x085e, 0x9c8: 0x0866, 0x9c9: 0x086a, 0x9ca: 0x0876, 0x9cb: 0x086e,
+	0x9cc: 0x06ae, 0x9cd: 0x1788, 0x9ce: 0x088a, 0x9cf: 0x088e, 0x9d0: 0x0892, 0x9d1: 0x08ae,
+	0x9d2: 0x1779, 0x9d3: 0x06b2, 0x9d4: 0x089a, 0x9d5: 0x08ba, 0x9d6: 0x1783, 0x9d7: 0x08ca,
+	0x9d8: 0x08d2, 0x9d9: 0x0832, 0x9da: 0x08da, 0x9db: 0x08de, 0x9dc: 0x195e, 0x9dd: 0x08fa,
+	0x9de: 0x0902, 0x9df: 0x06ba, 0x9e0: 0x091a, 0x9e1: 0x091e, 0x9e2: 0x0926, 0x9e3: 0x092a,
+	0x9e4: 0x06be, 0x9e5: 0x0942, 0x9e6: 0x0946, 0x9e7: 0x0952, 0x9e8: 0x095e, 0x9e9: 0x0962,
+	0x9ea: 0x0966, 0x9eb: 0x096e, 0x9ec: 0x098e, 0x9ed: 0x0992, 0x9ee: 0x099a, 0x9ef: 0x09aa,
+	0x9f0: 0x09b2, 0x9f1: 0x09b6, 0x9f2: 0x09b6, 0x9f3: 0x09b6, 0x9f4: 0x1797, 0x9f5: 0x0f8e,
+	0x9f6: 0x09ca, 0x9f7: 0x09d2, 0x9f8: 0x179c, 0x9f9: 0x09de, 0x9fa: 0x09e6, 0x9fb: 0x09ee,
+	0x9fc: 0x0a16, 0x9fd: 0x0a02, 0x9fe: 0x0a0e, 0x9ff: 0x0a12,
+	// Block 0x28, offset 0xa00
+	0xa00: 0x0a1a, 0xa01: 0x0a22, 0xa02: 0x0a26, 0xa03: 0x0a2e, 0xa04: 0x0a36, 0xa05: 0x0a3a,
+	0xa06: 0x0a3a, 0xa07: 0x0a42, 0xa08: 0x0a4a, 0xa09: 0x0a4e, 0xa0a: 0x0a5a, 0xa0b: 0x0a7e,
+	0xa0c: 0x0a62, 0xa0d: 0x0a82, 0xa0e: 0x0a66, 0xa0f: 0x0a6e, 0xa10: 0x0906, 0xa11: 0x0aca,
+	0xa12: 0x0a92, 0xa13: 0x0a96, 0xa14: 0x0a9a, 0xa15: 0x0a8e, 0xa16: 0x0aa2, 0xa17: 0x0a9e,
+	0xa18: 0x0ab6, 0xa19: 0x17a1, 0xa1a: 0x0ad2, 0xa1b: 0x0ad6, 0xa1c: 0x0ade, 0xa1d: 0x0aea,
+	0xa1e: 0x0af2, 0xa1f: 0x0b0e, 0xa20: 0x17a6, 0xa21: 0x17ab, 0xa22: 0x0b1a, 0xa23: 0x0b1e,
+	0xa24: 0x0b22, 0xa25: 0x0b16, 0xa26: 0x0b2a, 0xa27: 0x06c2, 0xa28: 0x06c6, 0xa29: 0x0b32,
+	0xa2a: 0x0b3a, 0xa2b: 0x0b3a, 0xa2c: 0x17b0, 0xa2d: 0x0b56, 0xa2e: 0x0b5a, 0xa2f: 0x0b5e,
+	0xa30: 0x0b66, 0xa31: 0x17b5, 0xa32: 0x0b6e, 0xa33: 0x0b72, 0xa34: 0x0c4a, 0xa35: 0x0b7a,
+	0xa36: 0x06ca, 0xa37: 0x0b86, 0xa38: 0x0b96, 0xa39: 0x0ba2, 0xa3a: 0x0b9e, 0xa3b: 0x17bf,
+	0xa3c: 0x0baa, 0xa3d: 0x17c4, 0xa3e: 0x0bb6, 0xa3f: 0x0bb2,
+	// Block 0x29, offset 0xa40
+	0xa40: 0x0bba, 0xa41: 0x0bca, 0xa42: 0x0bce, 0xa43: 0x06ce, 0xa44: 0x0bde, 0xa45: 0x0be6,
+	0xa46: 0x0bea, 0xa47: 0x0bee, 0xa48: 0x06d2, 0xa49: 0x17c9, 0xa4a: 0x06d6, 0xa4b: 0x0c0a,
+	0xa4c: 0x0c0e, 0xa4d: 0x0c12, 0xa4e: 0x0c1a, 0xa4f: 0x1990, 0xa50: 0x0c32, 0xa51: 0x17d3,
+	0xa52: 0x17d3, 0xa53: 0x12d2, 0xa54: 0x0c42, 0xa55: 0x0c42, 0xa56: 0x06da, 0xa57: 0x17f6,
+	0xa58: 0x18c8, 0xa59: 0x0c52, 0xa5a: 0x0c5a, 0xa5b: 0x06de, 0xa5c: 0x0c6e, 0xa5d: 0x0c7e,
+	0xa5e: 0x0c82, 0xa5f: 0x0c8a, 0xa60: 0x0c9a, 0xa61: 0x06e6, 0xa62: 0x06e2, 0xa63: 0x0c9e,
+	0xa64: 0x17d8, 0xa65: 0x0ca2, 0xa66: 0x0cb6, 0xa67: 0x0cba, 0xa68: 0x0cbe, 0xa69: 0x0cba,
+	0xa6a: 0x0cca, 0xa6b: 0x0cce, 0xa6c: 0x0cde, 0xa6d: 0x0cd6, 0xa6e: 0x0cda, 0xa6f: 0x0ce2,
+	0xa70: 0x0ce6, 0xa71: 0x0cea, 0xa72: 0x0cf6, 0xa73: 0x0cfa, 0xa74: 0x0d12, 0xa75: 0x0d1a,
+	0xa76: 0x0d2a, 0xa77: 0x0d3e, 0xa78: 0x17e7, 0xa79: 0x0d3a, 0xa7a: 0x0d2e, 0xa7b: 0x0d46,
+	0xa7c: 0x0d4e, 0xa7d: 0x0d62, 0xa7e: 0x17ec, 0xa7f: 0x0d6a,
+	// Block 0x2a, offset 0xa80
+	0xa80: 0x0d5e, 0xa81: 0x0d56, 0xa82: 0x06ea, 0xa83: 0x0d72, 0xa84: 0x0d7a, 0xa85: 0x0d82,
+	0xa86: 0x0d76, 0xa87: 0x06ee, 0xa88: 0x0d92, 0xa89: 0x0d9a, 0xa8a: 0x17f1, 0xa8b: 0x0dc6,
+	0xa8c: 0x0dfa, 0xa8d: 0x0dd6, 0xa8e: 0x06fa, 0xa8f: 0x0de2, 0xa90: 0x06f6, 0xa91: 0x06f2,
+	0xa92: 0x08be, 0xa93: 0x08c2, 0xa94: 0x0dfe, 0xa95: 0x0de6, 0xa96: 0x12a6, 0xa97: 0x075e,
+	0xa98: 0x0e0a, 0xa99: 0x0e0e, 0xa9a: 0x0e12, 0xa9b: 0x0e26, 0xa9c: 0x0e1e, 0xa9d: 0x180a,
+	0xa9e: 0x06fe, 0xa9f: 0x0e3a, 0xaa0: 0x0e2e, 0xaa1: 0x0e4a, 0xaa2: 0x0e52, 0xaa3: 0x1814,
+	0xaa4: 0x0e56, 0xaa5: 0x0e42, 0xaa6: 0x0e5e, 0xaa7: 0x0702, 0xaa8: 0x0e62, 0xaa9: 0x0e66,
+	0xaaa: 0x0e6a, 0xaab: 0x0e76, 0xaac: 0x1819, 0xaad: 0x0e7e, 0xaae: 0x0706, 0xaaf: 0x0e8a,
+	0xab0: 0x181e, 0xab1: 0x0e8e, 0xab2: 0x070a, 0xab3: 0x0e9a, 0xab4: 0x0ea6, 0xab5: 0x0eb2,
+	0xab6: 0x0eb6, 0xab7: 0x1823, 0xab8: 0x17ba, 0xab9: 0x1828, 0xaba: 0x0ed6, 0xabb: 0x182d,
+	0xabc: 0x0ee2, 0xabd: 0x0eea, 0xabe: 0x0eda, 0xabf: 0x0ef6,
+	// Block 0x2b, offset 0xac0
+	0xac0: 0x0f06, 0xac1: 0x0f16, 0xac2: 0x0f0a, 0xac3: 0x0f0e, 0xac4: 0x0f1a, 0xac5: 0x0f1e,
+	0xac6: 0x1832, 0xac7: 0x0f02, 0xac8: 0x0f36, 0xac9: 0x0f3a, 0xaca: 0x070e, 0xacb: 0x0f4e,
+	0xacc: 0x0f4a, 0xacd: 0x1837, 0xace: 0x0f2e, 0xacf: 0x0f6a, 0xad0: 0x183c, 0xad1: 0x1841,
+	0xad2: 0x0f6e, 0xad3: 0x0f82, 0xad4: 0x0f7e, 0xad5: 0x0f7a, 0xad6: 0x0712, 0xad7: 0x0f86,
+	0xad8: 0x0f96, 0xad9: 0x0f92, 0xada: 0x0f9e, 0xadb: 0x177e, 0xadc: 0x0fae, 0xadd: 0x1846,
+	0xade: 0x0fba, 0xadf: 0x1850, 0xae0: 0x0fce, 0xae1: 0x0fda, 0xae2: 0x0fee, 0xae3: 0x1855,
+	0xae4: 0x1002, 0xae5: 0x1006, 0xae6: 0x185a, 0xae7: 0x185f, 0xae8: 0x1022, 0xae9: 0x1032,
+	0xaea: 0x0716, 0xaeb: 0x1036, 0xaec: 0x071a, 0xaed: 0x071a, 0xaee: 0x104e, 0xaef: 0x1052,
+	0xaf0: 0x105a, 0xaf1: 0x105e, 0xaf2: 0x106a, 0xaf3: 0x071e, 0xaf4: 0x1082, 0xaf5: 0x1864,
+	0xaf6: 0x109e, 0xaf7: 0x1869, 0xaf8: 0x10aa, 0xaf9: 0x17ce, 0xafa: 0x10ba, 0xafb: 0x186e,
+	0xafc: 0x1873, 0xafd: 0x1878, 0xafe: 0x0722, 0xaff: 0x0726,
+	// Block 0x2c, offset 0xb00
+	0xb00: 0x10f2, 0xb01: 0x1882, 0xb02: 0x187d, 0xb03: 0x1887, 0xb04: 0x188c, 0xb05: 0x10fa,
+	0xb06: 0x10fe, 0xb07: 0x10fe, 0xb08: 0x1106, 0xb09: 0x072e, 0xb0a: 0x110a, 0xb0b: 0x0732,
+	0xb0c: 0x0736, 0xb0d: 0x1896, 0xb0e: 0x111e, 0xb0f: 0x1126, 0xb10: 0x1132, 0xb11: 0x073a,
+	0xb12: 0x189b, 0xb13: 0x1156, 0xb14: 0x18a0, 0xb15: 0x18a5, 0xb16: 0x1176, 0xb17: 0x118e,
+	0xb18: 0x073e, 0xb19: 0x1196, 0xb1a: 0x119a, 0xb1b: 0x119e, 0xb1c: 0x18aa, 0xb1d: 0x18af,
+	0xb1e: 0x18af, 0xb1f: 0x11b6, 0xb20: 0x0742, 0xb21: 0x18b4, 0xb22: 0x11ca, 0xb23: 0x11ce,
+	0xb24: 0x0746, 0xb25: 0x18b9, 0xb26: 0x11ea, 0xb27: 0x074a, 0xb28: 0x11fa, 0xb29: 0x11f2,
+	0xb2a: 0x1202, 0xb2b: 0x18c3, 0xb2c: 0x121a, 0xb2d: 0x074e, 0xb2e: 0x1226, 0xb2f: 0x122e,
+	0xb30: 0x123e, 0xb31: 0x0752, 0xb32: 0x18cd, 0xb33: 0x18d2, 0xb34: 0x0756, 0xb35: 0x18d7,
+	0xb36: 0x1256, 0xb37: 0x18dc, 0xb38: 0x1262, 0xb39: 0x126e, 0xb3a: 0x1276, 0xb3b: 0x18e1,
+	0xb3c: 0x18e6, 0xb3d: 0x128a, 0xb3e: 0x18eb, 0xb3f: 0x1292,
+	// Block 0x2d, offset 0xb40
+	0xb40: 0x17fb, 0xb41: 0x075a, 0xb42: 0x12aa, 0xb43: 0x12ae, 0xb44: 0x0762, 0xb45: 0x12b2,
+	0xb46: 0x0b2e, 0xb47: 0x18f0, 0xb48: 0x18f5, 0xb49: 0x1800, 0xb4a: 0x1805, 0xb4b: 0x12d2,
+	0xb4c: 0x12d6, 0xb4d: 0x14ee, 0xb4e: 0x0766, 0xb4f: 0x1302, 0xb50: 0x12fe, 0xb51: 0x1306,
+	0xb52: 0x093a, 0xb53: 0x130a, 0xb54: 0x130e, 0xb55: 0x1312, 0xb56: 0x131a, 0xb57: 0x18fa,
+	0xb58: 0x1316, 0xb59: 0x131e, 0xb5a: 0x1332, 0xb5b: 0x1336, 0xb5c: 0x1322, 0xb5d: 0x133a,
+	0xb5e: 0x134e, 0xb5f: 0x1362, 0xb60: 0x132e, 0xb61: 0x1342, 0xb62: 0x1346, 0xb63: 0x134a,
+	0xb64: 0x18ff, 0xb65: 0x1909, 0xb66: 0x1904, 0xb67: 0x076a, 0xb68: 0x136a, 0xb69: 0x136e,
+	0xb6a: 0x1376, 0xb6b: 0x191d, 0xb6c: 0x137a, 0xb6d: 0x190e, 0xb6e: 0x076e, 0xb6f: 0x0772,
+	0xb70: 0x1913, 0xb71: 0x1918, 0xb72: 0x0776, 0xb73: 0x139a, 0xb74: 0x139e, 0xb75: 0x13a2,
+	0xb76: 0x13a6, 0xb77: 0x13b2, 0xb78: 0x13ae, 0xb79: 0x13ba, 0xb7a: 0x13b6, 0xb7b: 0x13c6,
+	0xb7c: 0x13be, 0xb7d: 0x13c2, 0xb7e: 0x13ca, 0xb7f: 0x077a,
+	// Block 0x2e, offset 0xb80
+	0xb80: 0x13d2, 0xb81: 0x13d6, 0xb82: 0x077e, 0xb83: 0x13e6, 0xb84: 0x13ea, 0xb85: 0x1922,
+	0xb86: 0x13f6, 0xb87: 0x13fa, 0xb88: 0x0782, 0xb89: 0x1406, 0xb8a: 0x06b6, 0xb8b: 0x1927,
+	0xb8c: 0x192c, 0xb8d: 0x0786, 0xb8e: 0x078a, 0xb8f: 0x1432, 0xb90: 0x144a, 0xb91: 0x1466,
+	0xb92: 0x1476, 0xb93: 0x1931, 0xb94: 0x148a, 0xb95: 0x148e, 0xb96: 0x14a6, 0xb97: 0x14b2,
+	0xb98: 0x193b, 0xb99: 0x178d, 0xb9a: 0x14be, 0xb9b: 0x14ba, 0xb9c: 0x14c6, 0xb9d: 0x1792,
+	0xb9e: 0x14d2, 0xb9f: 0x14de, 0xba0: 0x1940, 0xba1: 0x1945, 0xba2: 0x151e, 0xba3: 0x152a,
+	0xba4: 0x1532, 0xba5: 0x194a, 0xba6: 0x1536, 0xba7: 0x1562, 0xba8: 0x156e, 0xba9: 0x1572,
+	0xbaa: 0x156a, 0xbab: 0x157e, 0xbac: 0x1582, 0xbad: 0x194f, 0xbae: 0x158e, 0xbaf: 0x078e,
+	0xbb0: 0x1596, 0xbb1: 0x1954, 0xbb2: 0x0792, 0xbb3: 0x15ce, 0xbb4: 0x0bbe, 0xbb5: 0x15e6,
+	0xbb6: 0x1959, 0xbb7: 0x1963, 0xbb8: 0x0796, 0xbb9: 0x079a, 0xbba: 0x160e, 0xbbb: 0x1968,
+	0xbbc: 0x079e, 0xbbd: 0x196d, 0xbbe: 0x1626, 0xbbf: 0x1626,
+	// Block 0x2f, offset 0xbc0
+	0xbc0: 0x162e, 0xbc1: 0x1972, 0xbc2: 0x1646, 0xbc3: 0x07a2, 0xbc4: 0x1656, 0xbc5: 0x1662,
+	0xbc6: 0x166a, 0xbc7: 0x1672, 0xbc8: 0x07a6, 0xbc9: 0x1977, 0xbca: 0x1686, 0xbcb: 0x16a2,
+	0xbcc: 0x16ae, 0xbcd: 0x07aa, 0xbce: 0x07ae, 0xbcf: 0x16b2, 0xbd0: 0x197c, 0xbd1: 0x07b2,
+	0xbd2: 0x1981, 0xbd3: 0x1986, 0xbd4: 0x198b, 0xbd5: 0x16d6, 0xbd6: 0x07b6, 0xbd7: 0x16ea,
+	0xbd8: 0x16f2, 0xbd9: 0x16f6, 0xbda: 0x16fe, 0xbdb: 0x1706, 0xbdc: 0x170e, 0xbdd: 0x1995,
+}
+
+// nfcIndex: 22 blocks, 1408 entries, 1408 bytes
+// Block 0 is the zero block.
+var nfcIndex = [1408]uint8{
+	// Block 0x0, offset 0x0
+	// Block 0x1, offset 0x40
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc2: 0x2e, 0xc3: 0x01, 0xc4: 0x02, 0xc5: 0x03, 0xc6: 0x2f, 0xc7: 0x04,
+	0xc8: 0x05, 0xca: 0x30, 0xcb: 0x31, 0xcc: 0x06, 0xcd: 0x07, 0xce: 0x08, 0xcf: 0x32,
+	0xd0: 0x09, 0xd1: 0x33, 0xd2: 0x34, 0xd3: 0x0a, 0xd6: 0x0b, 0xd7: 0x35,
+	0xd8: 0x36, 0xd9: 0x0c, 0xdb: 0x37, 0xdc: 0x38, 0xdd: 0x39, 0xdf: 0x3a,
+	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05,
+	0xea: 0x06, 0xeb: 0x07, 0xec: 0x08, 0xed: 0x09, 0xef: 0x0a,
+	0xf0: 0x13,
+	// Block 0x4, offset 0x100
+	0x120: 0x3b, 0x121: 0x3c, 0x122: 0x3d, 0x123: 0x0d, 0x124: 0x3e, 0x125: 0x3f, 0x126: 0x40, 0x127: 0x41,
+	0x128: 0x42, 0x129: 0x43, 0x12a: 0x44, 0x12b: 0x45, 0x12c: 0x40, 0x12d: 0x46, 0x12e: 0x47, 0x12f: 0x48,
+	0x130: 0x44, 0x131: 0x49, 0x132: 0x4a, 0x133: 0x4b, 0x134: 0x4c, 0x135: 0x4d, 0x137: 0x4e,
+	0x138: 0x4f, 0x139: 0x50, 0x13a: 0x51, 0x13b: 0x52, 0x13c: 0x53, 0x13d: 0x54, 0x13e: 0x55, 0x13f: 0x56,
+	// Block 0x5, offset 0x140
+	0x140: 0x57, 0x142: 0x58, 0x144: 0x59, 0x145: 0x5a, 0x146: 0x5b, 0x147: 0x5c,
+	0x14d: 0x5d,
+	0x15c: 0x5e, 0x15f: 0x5f,
+	0x162: 0x60, 0x164: 0x61,
+	0x168: 0x62, 0x169: 0x63, 0x16a: 0x64, 0x16b: 0x65, 0x16c: 0x0e, 0x16d: 0x66, 0x16e: 0x67, 0x16f: 0x68,
+	0x170: 0x69, 0x173: 0x6a, 0x177: 0x0f,
+	0x178: 0x10, 0x179: 0x11, 0x17a: 0x12, 0x17b: 0x13, 0x17c: 0x14, 0x17d: 0x15, 0x17e: 0x16, 0x17f: 0x17,
+	// Block 0x6, offset 0x180
+	0x180: 0x6b, 0x183: 0x6c, 0x184: 0x6d, 0x186: 0x6e, 0x187: 0x6f,
+	0x188: 0x70, 0x189: 0x18, 0x18a: 0x19, 0x18b: 0x71, 0x18c: 0x72,
+	0x1ab: 0x73,
+	0x1b3: 0x74, 0x1b5: 0x75, 0x1b7: 0x76,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x77, 0x1c1: 0x1a, 0x1c2: 0x1b, 0x1c3: 0x1c, 0x1c4: 0x78, 0x1c5: 0x79,
+	0x1c9: 0x7a, 0x1cc: 0x7b, 0x1cd: 0x7c,
+	// Block 0x8, offset 0x200
+	0x219: 0x7d, 0x21a: 0x7e, 0x21b: 0x7f,
+	0x220: 0x80, 0x223: 0x81, 0x224: 0x82, 0x225: 0x83, 0x226: 0x84, 0x227: 0x85,
+	0x22a: 0x86, 0x22b: 0x87, 0x22f: 0x88,
+	0x230: 0x89, 0x231: 0x8a, 0x232: 0x8b, 0x233: 0x8c, 0x234: 0x8d, 0x235: 0x8e, 0x236: 0x8f, 0x237: 0x89,
+	0x238: 0x8a, 0x239: 0x8b, 0x23a: 0x8c, 0x23b: 0x8d, 0x23c: 0x8e, 0x23d: 0x8f, 0x23e: 0x89, 0x23f: 0x8a,
+	// Block 0x9, offset 0x240
+	0x240: 0x8b, 0x241: 0x8c, 0x242: 0x8d, 0x243: 0x8e, 0x244: 0x8f, 0x245: 0x89, 0x246: 0x8a, 0x247: 0x8b,
+	0x248: 0x8c, 0x249: 0x8d, 0x24a: 0x8e, 0x24b: 0x8f, 0x24c: 0x89, 0x24d: 0x8a, 0x24e: 0x8b, 0x24f: 0x8c,
+	0x250: 0x8d, 0x251: 0x8e, 0x252: 0x8f, 0x253: 0x89, 0x254: 0x8a, 0x255: 0x8b, 0x256: 0x8c, 0x257: 0x8d,
+	0x258: 0x8e, 0x259: 0x8f, 0x25a: 0x89, 0x25b: 0x8a, 0x25c: 0x8b, 0x25d: 0x8c, 0x25e: 0x8d, 0x25f: 0x8e,
+	0x260: 0x8f, 0x261: 0x89, 0x262: 0x8a, 0x263: 0x8b, 0x264: 0x8c, 0x265: 0x8d, 0x266: 0x8e, 0x267: 0x8f,
+	0x268: 0x89, 0x269: 0x8a, 0x26a: 0x8b, 0x26b: 0x8c, 0x26c: 0x8d, 0x26d: 0x8e, 0x26e: 0x8f, 0x26f: 0x89,
+	0x270: 0x8a, 0x271: 0x8b, 0x272: 0x8c, 0x273: 0x8d, 0x274: 0x8e, 0x275: 0x8f, 0x276: 0x89, 0x277: 0x8a,
+	0x278: 0x8b, 0x279: 0x8c, 0x27a: 0x8d, 0x27b: 0x8e, 0x27c: 0x8f, 0x27d: 0x89, 0x27e: 0x8a, 0x27f: 0x8b,
+	// Block 0xa, offset 0x280
+	0x280: 0x8c, 0x281: 0x8d, 0x282: 0x8e, 0x283: 0x8f, 0x284: 0x89, 0x285: 0x8a, 0x286: 0x8b, 0x287: 0x8c,
+	0x288: 0x8d, 0x289: 0x8e, 0x28a: 0x8f, 0x28b: 0x89, 0x28c: 0x8a, 0x28d: 0x8b, 0x28e: 0x8c, 0x28f: 0x8d,
+	0x290: 0x8e, 0x291: 0x8f, 0x292: 0x89, 0x293: 0x8a, 0x294: 0x8b, 0x295: 0x8c, 0x296: 0x8d, 0x297: 0x8e,
+	0x298: 0x8f, 0x299: 0x89, 0x29a: 0x8a, 0x29b: 0x8b, 0x29c: 0x8c, 0x29d: 0x8d, 0x29e: 0x8e, 0x29f: 0x8f,
+	0x2a0: 0x89, 0x2a1: 0x8a, 0x2a2: 0x8b, 0x2a3: 0x8c, 0x2a4: 0x8d, 0x2a5: 0x8e, 0x2a6: 0x8f, 0x2a7: 0x89,
+	0x2a8: 0x8a, 0x2a9: 0x8b, 0x2aa: 0x8c, 0x2ab: 0x8d, 0x2ac: 0x8e, 0x2ad: 0x8f, 0x2ae: 0x89, 0x2af: 0x8a,
+	0x2b0: 0x8b, 0x2b1: 0x8c, 0x2b2: 0x8d, 0x2b3: 0x8e, 0x2b4: 0x8f, 0x2b5: 0x89, 0x2b6: 0x8a, 0x2b7: 0x8b,
+	0x2b8: 0x8c, 0x2b9: 0x8d, 0x2ba: 0x8e, 0x2bb: 0x8f, 0x2bc: 0x89, 0x2bd: 0x8a, 0x2be: 0x8b, 0x2bf: 0x8c,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0x8d, 0x2c1: 0x8e, 0x2c2: 0x8f, 0x2c3: 0x89, 0x2c4: 0x8a, 0x2c5: 0x8b, 0x2c6: 0x8c, 0x2c7: 0x8d,
+	0x2c8: 0x8e, 0x2c9: 0x8f, 0x2ca: 0x89, 0x2cb: 0x8a, 0x2cc: 0x8b, 0x2cd: 0x8c, 0x2ce: 0x8d, 0x2cf: 0x8e,
+	0x2d0: 0x8f, 0x2d1: 0x89, 0x2d2: 0x8a, 0x2d3: 0x8b, 0x2d4: 0x8c, 0x2d5: 0x8d, 0x2d6: 0x8e, 0x2d7: 0x8f,
+	0x2d8: 0x89, 0x2d9: 0x8a, 0x2da: 0x8b, 0x2db: 0x8c, 0x2dc: 0x8d, 0x2dd: 0x8e, 0x2de: 0x90,
+	// Block 0xc, offset 0x300
+	0x324: 0x1d, 0x325: 0x1e, 0x326: 0x1f, 0x327: 0x20,
+	0x328: 0x21, 0x329: 0x22, 0x32a: 0x23, 0x32b: 0x24, 0x32c: 0x91, 0x32d: 0x92, 0x32e: 0x93,
+	0x331: 0x94, 0x332: 0x95, 0x333: 0x96, 0x334: 0x97,
+	0x338: 0x98, 0x339: 0x99, 0x33a: 0x9a, 0x33b: 0x9b, 0x33e: 0x9c, 0x33f: 0x9d,
+	// Block 0xd, offset 0x340
+	0x347: 0x9e,
+	0x34b: 0x9f, 0x34d: 0xa0,
+	0x368: 0xa1, 0x36b: 0xa2,
+	0x374: 0xa3,
+	0x37a: 0xa4, 0x37b: 0xa5, 0x37d: 0xa6, 0x37e: 0xa7,
+	// Block 0xe, offset 0x380
+	0x381: 0xa8, 0x382: 0xa9, 0x384: 0xaa, 0x385: 0x84, 0x387: 0xab,
+	0x388: 0xac, 0x38b: 0xad, 0x38c: 0xae, 0x38d: 0xaf,
+	0x391: 0xb0, 0x392: 0xb1, 0x393: 0xb2, 0x396: 0xb3, 0x397: 0xb4,
+	0x398: 0x75, 0x39a: 0xb5, 0x39c: 0xb6,
+	0x3a0: 0xb7, 0x3a4: 0xb8, 0x3a5: 0xb9, 0x3a7: 0xba,
+	0x3a8: 0xbb, 0x3a9: 0xbc, 0x3aa: 0xbd,
+	0x3b0: 0x75, 0x3b5: 0xbe, 0x3b6: 0xbf,
+	0x3bd: 0xc0,
+	// Block 0xf, offset 0x3c0
+	0x3eb: 0xc1, 0x3ec: 0xc2,
+	0x3ff: 0xc3,
+	// Block 0x10, offset 0x400
+	0x432: 0xc4,
+	// Block 0x11, offset 0x440
+	0x445: 0xc5, 0x446: 0xc6, 0x447: 0xc7,
+	0x449: 0xc8,
+	// Block 0x12, offset 0x480
+	0x480: 0xc9, 0x482: 0xca, 0x484: 0xc2,
+	0x48a: 0xcb, 0x48b: 0xcc,
+	0x493: 0xcd,
+	0x4a3: 0xce, 0x4a5: 0xcf,
+	// Block 0x13, offset 0x4c0
+	0x4c8: 0xd0,
+	// Block 0x14, offset 0x500
+	0x520: 0x25, 0x521: 0x26, 0x522: 0x27, 0x523: 0x28, 0x524: 0x29, 0x525: 0x2a, 0x526: 0x2b, 0x527: 0x2c,
+	0x528: 0x2d,
+	// Block 0x15, offset 0x540
+	0x550: 0x0b, 0x551: 0x0c, 0x556: 0x0d,
+	0x55b: 0x0e, 0x55d: 0x0f, 0x55e: 0x10, 0x55f: 0x11,
+	0x56f: 0x12,
+}
+
+// nfcSparseOffset: 163 entries, 326 bytes
+var nfcSparseOffset = []uint16{0x0, 0x5, 0x9, 0xb, 0xd, 0x18, 0x28, 0x2a, 0x2f, 0x3a, 0x49, 0x56, 0x5e, 0x63, 0x68, 0x6a, 0x6e, 0x76, 0x7d, 0x80, 0x88, 0x8c, 0x90, 0x92, 0x94, 0x9d, 0xa1, 0xa8, 0xad, 0xb0, 0xba, 0xbd, 0xc4, 0xcc, 0xcf, 0xd1, 0xd4, 0xd6, 0xdb, 0xec, 0xf8, 0xfa, 0x100, 0x102, 0x104, 0x106, 0x108, 0x10a, 0x10c, 0x10f, 0x112, 0x114, 0x117, 0x11a, 0x11e, 0x124, 0x12b, 0x134, 0x136, 0x139, 0x13b, 0x146, 0x14a, 0x158, 0x15b, 0x161, 0x167, 0x172, 0x176, 0x178, 0x17a, 0x17c, 0x17e, 0x180, 0x186, 0x18a, 0x18c, 0x18e, 0x196, 0x19a, 0x19d, 0x19f, 0x1a1, 0x1a4, 0x1a7, 0x1a9, 0x1ab, 0x1ad, 0x1af, 0x1b5, 0x1b8, 0x1ba, 0x1c1, 0x1c7, 0x1cd, 0x1d5, 0x1db, 0x1e1, 0x1e7, 0x1eb, 0x1f9, 0x202, 0x205, 0x208, 0x20a, 0x20d, 0x20f, 0x213, 0x218, 0x21a, 0x21c, 0x221, 0x227, 0x229, 0x22b, 0x22d, 0x233, 0x236, 0x238, 0x23a, 0x23c, 0x242, 0x246, 0x24a, 0x252, 0x259, 0x25c, 0x25f, 0x261, 0x264, 0x26c, 0x270, 0x277, 0x27a, 0x280, 0x282, 0x285, 0x287, 0x28a, 0x28f, 0x291, 0x293, 0x295, 0x297, 0x299, 0x29c, 0x29e, 0x2a0, 0x2a2, 0x2a4, 0x2a6, 0x2a8, 0x2b5, 0x2bf, 0x2c1, 0x2c3, 0x2c9, 0x2cb, 0x2cd, 0x2cf, 0x2d3, 0x2d5, 0x2d8}
+
+// nfcSparseValues: 730 entries, 2920 bytes
+var nfcSparseValues = [730]valueRange{
+	// Block 0x0, offset 0x0
+	{value: 0x0000, lo: 0x04},
+	{value: 0xa100, lo: 0xa8, hi: 0xa8},
+	{value: 0x8100, lo: 0xaf, hi: 0xaf},
+	{value: 0x8100, lo: 0xb4, hi: 0xb4},
+	{value: 0x8100, lo: 0xb8, hi: 0xb8},
+	// Block 0x1, offset 0x5
+	{value: 0x0091, lo: 0x03},
+	{value: 0x4823, lo: 0xa0, hi: 0xa1},
+	{value: 0x4855, lo: 0xaf, hi: 0xb0},
+	{value: 0xa000, lo: 0xb7, hi: 0xb7},
+	// Block 0x2, offset 0x9
+	{value: 0x0000, lo: 0x01},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	// Block 0x3, offset 0xb
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0x98, hi: 0x9d},
+	// Block 0x4, offset 0xd
+	{value: 0x0006, lo: 0x0a},
+	{value: 0xa000, lo: 0x81, hi: 0x81},
+	{value: 0xa000, lo: 0x85, hi: 0x85},
+	{value: 0xa000, lo: 0x89, hi: 0x89},
+	{value: 0x4981, lo: 0x8a, hi: 0x8a},
+	{value: 0x499f, lo: 0x8b, hi: 0x8b},
+	{value: 0x3808, lo: 0x8c, hi: 0x8c},
+	{value: 0x3820, lo: 0x8d, hi: 0x8d},
+	{value: 0x49b7, lo: 0x8e, hi: 0x8e},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0x383e, lo: 0x93, hi: 0x94},
+	// Block 0x5, offset 0x18
+	{value: 0x0000, lo: 0x0f},
+	{value: 0xa000, lo: 0x83, hi: 0x83},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0xa000, lo: 0x8b, hi: 0x8b},
+	{value: 0xa000, lo: 0x8d, hi: 0x8d},
+	{value: 0x38e6, lo: 0x90, hi: 0x90},
+	{value: 0x38f2, lo: 0x91, hi: 0x91},
+	{value: 0x38e0, lo: 0x93, hi: 0x93},
+	{value: 0xa000, lo: 0x96, hi: 0x96},
+	{value: 0x3958, lo: 0x97, hi: 0x97},
+	{value: 0x3922, lo: 0x9c, hi: 0x9c},
+	{value: 0x390a, lo: 0x9d, hi: 0x9d},
+	{value: 0x3934, lo: 0x9e, hi: 0x9e},
+	{value: 0xa000, lo: 0xb4, hi: 0xb5},
+	{value: 0x395e, lo: 0xb6, hi: 0xb6},
+	{value: 0x3964, lo: 0xb7, hi: 0xb7},
+	// Block 0x6, offset 0x28
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0x83, hi: 0x87},
+	// Block 0x7, offset 0x2a
+	{value: 0x0001, lo: 0x04},
+	{value: 0x8114, lo: 0x81, hi: 0x82},
+	{value: 0x8133, lo: 0x84, hi: 0x84},
+	{value: 0x812e, lo: 0x85, hi: 0x85},
+	{value: 0x810e, lo: 0x87, hi: 0x87},
+	// Block 0x8, offset 0x2f
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x8133, lo: 0x90, hi: 0x97},
+	{value: 0x811a, lo: 0x98, hi: 0x98},
+	{value: 0x811b, lo: 0x99, hi: 0x99},
+	{value: 0x811c, lo: 0x9a, hi: 0x9a},
+	{value: 0x3982, lo: 0xa2, hi: 0xa2},
+	{value: 0x3988, lo: 0xa3, hi: 0xa3},
+	{value: 0x3994, lo: 0xa4, hi: 0xa4},
+	{value: 0x398e, lo: 0xa5, hi: 0xa5},
+	{value: 0x399a, lo: 0xa6, hi: 0xa6},
+	{value: 0xa000, lo: 0xa7, hi: 0xa7},
+	// Block 0x9, offset 0x3a
+	{value: 0x0000, lo: 0x0e},
+	{value: 0x39ac, lo: 0x80, hi: 0x80},
+	{value: 0xa000, lo: 0x81, hi: 0x81},
+	{value: 0x39a0, lo: 0x82, hi: 0x82},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0x39a6, lo: 0x93, hi: 0x93},
+	{value: 0xa000, lo: 0x95, hi: 0x95},
+	{value: 0x8133, lo: 0x96, hi: 0x9c},
+	{value: 0x8133, lo: 0x9f, hi: 0xa2},
+	{value: 0x812e, lo: 0xa3, hi: 0xa3},
+	{value: 0x8133, lo: 0xa4, hi: 0xa4},
+	{value: 0x8133, lo: 0xa7, hi: 0xa8},
+	{value: 0x812e, lo: 0xaa, hi: 0xaa},
+	{value: 0x8133, lo: 0xab, hi: 0xac},
+	{value: 0x812e, lo: 0xad, hi: 0xad},
+	// Block 0xa, offset 0x49
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x8120, lo: 0x91, hi: 0x91},
+	{value: 0x8133, lo: 0xb0, hi: 0xb0},
+	{value: 0x812e, lo: 0xb1, hi: 0xb1},
+	{value: 0x8133, lo: 0xb2, hi: 0xb3},
+	{value: 0x812e, lo: 0xb4, hi: 0xb4},
+	{value: 0x8133, lo: 0xb5, hi: 0xb6},
+	{value: 0x812e, lo: 0xb7, hi: 0xb9},
+	{value: 0x8133, lo: 0xba, hi: 0xba},
+	{value: 0x812e, lo: 0xbb, hi: 0xbc},
+	{value: 0x8133, lo: 0xbd, hi: 0xbd},
+	{value: 0x812e, lo: 0xbe, hi: 0xbe},
+	{value: 0x8133, lo: 0xbf, hi: 0xbf},
+	// Block 0xb, offset 0x56
+	{value: 0x0005, lo: 0x07},
+	{value: 0x8133, lo: 0x80, hi: 0x80},
+	{value: 0x8133, lo: 0x81, hi: 0x81},
+	{value: 0x812e, lo: 0x82, hi: 0x83},
+	{value: 0x812e, lo: 0x84, hi: 0x85},
+	{value: 0x812e, lo: 0x86, hi: 0x87},
+	{value: 0x812e, lo: 0x88, hi: 0x89},
+	{value: 0x8133, lo: 0x8a, hi: 0x8a},
+	// Block 0xc, offset 0x5e
+	{value: 0x0000, lo: 0x04},
+	{value: 0x8133, lo: 0xab, hi: 0xb1},
+	{value: 0x812e, lo: 0xb2, hi: 0xb2},
+	{value: 0x8133, lo: 0xb3, hi: 0xb3},
+	{value: 0x812e, lo: 0xbd, hi: 0xbd},
+	// Block 0xd, offset 0x63
+	{value: 0x0000, lo: 0x04},
+	{value: 0x8133, lo: 0x96, hi: 0x99},
+	{value: 0x8133, lo: 0x9b, hi: 0xa3},
+	{value: 0x8133, lo: 0xa5, hi: 0xa7},
+	{value: 0x8133, lo: 0xa9, hi: 0xad},
+	// Block 0xe, offset 0x68
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812e, lo: 0x99, hi: 0x9b},
+	// Block 0xf, offset 0x6a
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8133, lo: 0x98, hi: 0x98},
+	{value: 0x812e, lo: 0x99, hi: 0x9b},
+	{value: 0x8133, lo: 0x9c, hi: 0x9f},
+	// Block 0x10, offset 0x6e
+	{value: 0x0000, lo: 0x07},
+	{value: 0xa000, lo: 0xa8, hi: 0xa8},
+	{value: 0x4019, lo: 0xa9, hi: 0xa9},
+	{value: 0xa000, lo: 0xb0, hi: 0xb0},
+	{value: 0x4021, lo: 0xb1, hi: 0xb1},
+	{value: 0xa000, lo: 0xb3, hi: 0xb3},
+	{value: 0x4029, lo: 0xb4, hi: 0xb4},
+	{value: 0x9903, lo: 0xbc, hi: 0xbc},
+	// Block 0x11, offset 0x76
+	{value: 0x0008, lo: 0x06},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	{value: 0x8133, lo: 0x91, hi: 0x91},
+	{value: 0x812e, lo: 0x92, hi: 0x92},
+	{value: 0x8133, lo: 0x93, hi: 0x93},
+	{value: 0x8133, lo: 0x94, hi: 0x94},
+	{value: 0x465d, lo: 0x98, hi: 0x9f},
+	// Block 0x12, offset 0x7d
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8103, lo: 0xbc, hi: 0xbc},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x13, offset 0x80
+	{value: 0x0008, lo: 0x07},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0x2dd5, lo: 0x8b, hi: 0x8c},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	{value: 0x469d, lo: 0x9c, hi: 0x9d},
+	{value: 0x46ad, lo: 0x9f, hi: 0x9f},
+	{value: 0x8133, lo: 0xbe, hi: 0xbe},
+	// Block 0x14, offset 0x88
+	{value: 0x0000, lo: 0x03},
+	{value: 0x46d5, lo: 0xb3, hi: 0xb3},
+	{value: 0x46dd, lo: 0xb6, hi: 0xb6},
+	{value: 0x8103, lo: 0xbc, hi: 0xbc},
+	// Block 0x15, offset 0x8c
+	{value: 0x0008, lo: 0x03},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	{value: 0x46b5, lo: 0x99, hi: 0x9b},
+	{value: 0x46cd, lo: 0x9e, hi: 0x9e},
+	// Block 0x16, offset 0x90
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8103, lo: 0xbc, hi: 0xbc},
+	// Block 0x17, offset 0x92
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	// Block 0x18, offset 0x94
+	{value: 0x0000, lo: 0x08},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0x2ded, lo: 0x88, hi: 0x88},
+	{value: 0x2de5, lo: 0x8b, hi: 0x8b},
+	{value: 0x2df5, lo: 0x8c, hi: 0x8c},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x96, hi: 0x97},
+	{value: 0x46e5, lo: 0x9c, hi: 0x9c},
+	{value: 0x46ed, lo: 0x9d, hi: 0x9d},
+	// Block 0x19, offset 0x9d
+	{value: 0x0000, lo: 0x03},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0x2dfd, lo: 0x94, hi: 0x94},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x1a, offset 0xa1
+	{value: 0x0000, lo: 0x06},
+	{value: 0xa000, lo: 0x86, hi: 0x87},
+	{value: 0x2e05, lo: 0x8a, hi: 0x8a},
+	{value: 0x2e15, lo: 0x8b, hi: 0x8b},
+	{value: 0x2e0d, lo: 0x8c, hi: 0x8c},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	// Block 0x1b, offset 0xa8
+	{value: 0x1801, lo: 0x04},
+	{value: 0xa000, lo: 0x86, hi: 0x86},
+	{value: 0x4031, lo: 0x88, hi: 0x88},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	{value: 0x8121, lo: 0x95, hi: 0x96},
+	// Block 0x1c, offset 0xad
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8103, lo: 0xbc, hi: 0xbc},
+	{value: 0xa000, lo: 0xbf, hi: 0xbf},
+	// Block 0x1d, offset 0xb0
+	{value: 0x0000, lo: 0x09},
+	{value: 0x2e1d, lo: 0x80, hi: 0x80},
+	{value: 0x9900, lo: 0x82, hi: 0x82},
+	{value: 0xa000, lo: 0x86, hi: 0x86},
+	{value: 0x2e25, lo: 0x87, hi: 0x87},
+	{value: 0x2e2d, lo: 0x88, hi: 0x88},
+	{value: 0x3091, lo: 0x8a, hi: 0x8a},
+	{value: 0x2f19, lo: 0x8b, hi: 0x8b},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x95, hi: 0x96},
+	// Block 0x1e, offset 0xba
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0xbb, hi: 0xbc},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x1f, offset 0xbd
+	{value: 0x0000, lo: 0x06},
+	{value: 0xa000, lo: 0x86, hi: 0x87},
+	{value: 0x2e35, lo: 0x8a, hi: 0x8a},
+	{value: 0x2e45, lo: 0x8b, hi: 0x8b},
+	{value: 0x2e3d, lo: 0x8c, hi: 0x8c},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	// Block 0x20, offset 0xc4
+	{value: 0x6ab3, lo: 0x07},
+	{value: 0x9905, lo: 0x8a, hi: 0x8a},
+	{value: 0x9900, lo: 0x8f, hi: 0x8f},
+	{value: 0xa000, lo: 0x99, hi: 0x99},
+	{value: 0x4039, lo: 0x9a, hi: 0x9a},
+	{value: 0x3099, lo: 0x9c, hi: 0x9c},
+	{value: 0x2f24, lo: 0x9d, hi: 0x9d},
+	{value: 0x2e4d, lo: 0x9e, hi: 0x9f},
+	// Block 0x21, offset 0xcc
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8123, lo: 0xb8, hi: 0xb9},
+	{value: 0x8105, lo: 0xba, hi: 0xba},
+	// Block 0x22, offset 0xcf
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8124, lo: 0x88, hi: 0x8b},
+	// Block 0x23, offset 0xd1
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8125, lo: 0xb8, hi: 0xb9},
+	{value: 0x8105, lo: 0xba, hi: 0xba},
+	// Block 0x24, offset 0xd4
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8126, lo: 0x88, hi: 0x8b},
+	// Block 0x25, offset 0xd6
+	{value: 0x0000, lo: 0x04},
+	{value: 0x812e, lo: 0x98, hi: 0x99},
+	{value: 0x812e, lo: 0xb5, hi: 0xb5},
+	{value: 0x812e, lo: 0xb7, hi: 0xb7},
+	{value: 0x812c, lo: 0xb9, hi: 0xb9},
+	// Block 0x26, offset 0xdb
+	{value: 0x0000, lo: 0x10},
+	{value: 0x2774, lo: 0x83, hi: 0x83},
+	{value: 0x277b, lo: 0x8d, hi: 0x8d},
+	{value: 0x2782, lo: 0x92, hi: 0x92},
+	{value: 0x2789, lo: 0x97, hi: 0x97},
+	{value: 0x2790, lo: 0x9c, hi: 0x9c},
+	{value: 0x276d, lo: 0xa9, hi: 0xa9},
+	{value: 0x8127, lo: 0xb1, hi: 0xb1},
+	{value: 0x8128, lo: 0xb2, hi: 0xb2},
+	{value: 0x4bc5, lo: 0xb3, hi: 0xb3},
+	{value: 0x8129, lo: 0xb4, hi: 0xb4},
+	{value: 0x4bce, lo: 0xb5, hi: 0xb5},
+	{value: 0x46f5, lo: 0xb6, hi: 0xb6},
+	{value: 0x8200, lo: 0xb7, hi: 0xb7},
+	{value: 0x46fd, lo: 0xb8, hi: 0xb8},
+	{value: 0x8200, lo: 0xb9, hi: 0xb9},
+	{value: 0x8128, lo: 0xba, hi: 0xbd},
+	// Block 0x27, offset 0xec
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x8128, lo: 0x80, hi: 0x80},
+	{value: 0x4bd7, lo: 0x81, hi: 0x81},
+	{value: 0x8133, lo: 0x82, hi: 0x83},
+	{value: 0x8105, lo: 0x84, hi: 0x84},
+	{value: 0x8133, lo: 0x86, hi: 0x87},
+	{value: 0x279e, lo: 0x93, hi: 0x93},
+	{value: 0x27a5, lo: 0x9d, hi: 0x9d},
+	{value: 0x27ac, lo: 0xa2, hi: 0xa2},
+	{value: 0x27b3, lo: 0xa7, hi: 0xa7},
+	{value: 0x27ba, lo: 0xac, hi: 0xac},
+	{value: 0x2797, lo: 0xb9, hi: 0xb9},
+	// Block 0x28, offset 0xf8
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812e, lo: 0x86, hi: 0x86},
+	// Block 0x29, offset 0xfa
+	{value: 0x0000, lo: 0x05},
+	{value: 0xa000, lo: 0xa5, hi: 0xa5},
+	{value: 0x2e55, lo: 0xa6, hi: 0xa6},
+	{value: 0x9900, lo: 0xae, hi: 0xae},
+	{value: 0x8103, lo: 0xb7, hi: 0xb7},
+	{value: 0x8105, lo: 0xb9, hi: 0xba},
+	// Block 0x2a, offset 0x100
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812e, lo: 0x8d, hi: 0x8d},
+	// Block 0x2b, offset 0x102
+	{value: 0x0000, lo: 0x01},
+	{value: 0xa000, lo: 0x80, hi: 0x92},
+	// Block 0x2c, offset 0x104
+	{value: 0x0000, lo: 0x01},
+	{value: 0xb900, lo: 0xa1, hi: 0xb5},
+	// Block 0x2d, offset 0x106
+	{value: 0x0000, lo: 0x01},
+	{value: 0x9900, lo: 0xa8, hi: 0xbf},
+	// Block 0x2e, offset 0x108
+	{value: 0x0000, lo: 0x01},
+	{value: 0x9900, lo: 0x80, hi: 0x82},
+	// Block 0x2f, offset 0x10a
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0x9d, hi: 0x9f},
+	// Block 0x30, offset 0x10c
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0x94, hi: 0x95},
+	{value: 0x8105, lo: 0xb4, hi: 0xb4},
+	// Block 0x31, offset 0x10f
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0x92, hi: 0x92},
+	{value: 0x8133, lo: 0x9d, hi: 0x9d},
+	// Block 0x32, offset 0x112
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xa9, hi: 0xa9},
+	// Block 0x33, offset 0x114
+	{value: 0x0004, lo: 0x02},
+	{value: 0x812f, lo: 0xb9, hi: 0xba},
+	{value: 0x812e, lo: 0xbb, hi: 0xbb},
+	// Block 0x34, offset 0x117
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8133, lo: 0x97, hi: 0x97},
+	{value: 0x812e, lo: 0x98, hi: 0x98},
+	// Block 0x35, offset 0x11a
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8105, lo: 0xa0, hi: 0xa0},
+	{value: 0x8133, lo: 0xb5, hi: 0xbc},
+	{value: 0x812e, lo: 0xbf, hi: 0xbf},
+	// Block 0x36, offset 0x11e
+	{value: 0x0000, lo: 0x05},
+	{value: 0x8133, lo: 0xb0, hi: 0xb4},
+	{value: 0x812e, lo: 0xb5, hi: 0xba},
+	{value: 0x8133, lo: 0xbb, hi: 0xbc},
+	{value: 0x812e, lo: 0xbd, hi: 0xbd},
+	{value: 0x812e, lo: 0xbf, hi: 0xbf},
+	// Block 0x37, offset 0x124
+	{value: 0x0000, lo: 0x06},
+	{value: 0x812e, lo: 0x80, hi: 0x80},
+	{value: 0x8133, lo: 0x81, hi: 0x82},
+	{value: 0x812e, lo: 0x83, hi: 0x84},
+	{value: 0x8133, lo: 0x85, hi: 0x89},
+	{value: 0x812e, lo: 0x8a, hi: 0x8a},
+	{value: 0x8133, lo: 0x8b, hi: 0x8e},
+	// Block 0x38, offset 0x12b
+	{value: 0x0000, lo: 0x08},
+	{value: 0x2e9d, lo: 0x80, hi: 0x80},
+	{value: 0x2ea5, lo: 0x81, hi: 0x81},
+	{value: 0xa000, lo: 0x82, hi: 0x82},
+	{value: 0x2ead, lo: 0x83, hi: 0x83},
+	{value: 0x8105, lo: 0x84, hi: 0x84},
+	{value: 0x8133, lo: 0xab, hi: 0xab},
+	{value: 0x812e, lo: 0xac, hi: 0xac},
+	{value: 0x8133, lo: 0xad, hi: 0xb3},
+	// Block 0x39, offset 0x134
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0xaa, hi: 0xab},
+	// Block 0x3a, offset 0x136
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8103, lo: 0xa6, hi: 0xa6},
+	{value: 0x8105, lo: 0xb2, hi: 0xb3},
+	// Block 0x3b, offset 0x139
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8103, lo: 0xb7, hi: 0xb7},
+	// Block 0x3c, offset 0x13b
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x8133, lo: 0x90, hi: 0x92},
+	{value: 0x8101, lo: 0x94, hi: 0x94},
+	{value: 0x812e, lo: 0x95, hi: 0x99},
+	{value: 0x8133, lo: 0x9a, hi: 0x9b},
+	{value: 0x812e, lo: 0x9c, hi: 0x9f},
+	{value: 0x8133, lo: 0xa0, hi: 0xa0},
+	{value: 0x8101, lo: 0xa2, hi: 0xa8},
+	{value: 0x812e, lo: 0xad, hi: 0xad},
+	{value: 0x8133, lo: 0xb4, hi: 0xb4},
+	{value: 0x8133, lo: 0xb8, hi: 0xb9},
+	// Block 0x3d, offset 0x146
+	{value: 0x0004, lo: 0x03},
+	{value: 0x052a, lo: 0x80, hi: 0x81},
+	{value: 0x8100, lo: 0x97, hi: 0x97},
+	{value: 0x8100, lo: 0xbe, hi: 0xbe},
+	// Block 0x3e, offset 0x14a
+	{value: 0x0000, lo: 0x0d},
+	{value: 0x8133, lo: 0x90, hi: 0x91},
+	{value: 0x8101, lo: 0x92, hi: 0x93},
+	{value: 0x8133, lo: 0x94, hi: 0x97},
+	{value: 0x8101, lo: 0x98, hi: 0x9a},
+	{value: 0x8133, lo: 0x9b, hi: 0x9c},
+	{value: 0x8133, lo: 0xa1, hi: 0xa1},
+	{value: 0x8101, lo: 0xa5, hi: 0xa6},
+	{value: 0x8133, lo: 0xa7, hi: 0xa7},
+	{value: 0x812e, lo: 0xa8, hi: 0xa8},
+	{value: 0x8133, lo: 0xa9, hi: 0xa9},
+	{value: 0x8101, lo: 0xaa, hi: 0xab},
+	{value: 0x812e, lo: 0xac, hi: 0xaf},
+	{value: 0x8133, lo: 0xb0, hi: 0xb0},
+	// Block 0x3f, offset 0x158
+	{value: 0x43bc, lo: 0x02},
+	{value: 0x023c, lo: 0xa6, hi: 0xa6},
+	{value: 0x0057, lo: 0xaa, hi: 0xab},
+	// Block 0x40, offset 0x15b
+	{value: 0x0007, lo: 0x05},
+	{value: 0xa000, lo: 0x90, hi: 0x90},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0xa000, lo: 0x94, hi: 0x94},
+	{value: 0x3cfa, lo: 0x9a, hi: 0x9b},
+	{value: 0x3d08, lo: 0xae, hi: 0xae},
+	// Block 0x41, offset 0x161
+	{value: 0x000e, lo: 0x05},
+	{value: 0x3d0f, lo: 0x8d, hi: 0x8e},
+	{value: 0x3d16, lo: 0x8f, hi: 0x8f},
+	{value: 0xa000, lo: 0x90, hi: 0x90},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0xa000, lo: 0x94, hi: 0x94},
+	// Block 0x42, offset 0x167
+	{value: 0x62c7, lo: 0x0a},
+	{value: 0xa000, lo: 0x83, hi: 0x83},
+	{value: 0x3d24, lo: 0x84, hi: 0x84},
+	{value: 0xa000, lo: 0x88, hi: 0x88},
+	{value: 0x3d2b, lo: 0x89, hi: 0x89},
+	{value: 0xa000, lo: 0x8b, hi: 0x8b},
+	{value: 0x3d32, lo: 0x8c, hi: 0x8c},
+	{value: 0xa000, lo: 0xa3, hi: 0xa3},
+	{value: 0x3d39, lo: 0xa4, hi: 0xa5},
+	{value: 0x3d40, lo: 0xa6, hi: 0xa6},
+	{value: 0xa000, lo: 0xbc, hi: 0xbc},
+	// Block 0x43, offset 0x172
+	{value: 0x0007, lo: 0x03},
+	{value: 0x3da9, lo: 0xa0, hi: 0xa1},
+	{value: 0x3dd3, lo: 0xa2, hi: 0xa3},
+	{value: 0x3dfd, lo: 0xaa, hi: 0xad},
+	// Block 0x44, offset 0x176
+	{value: 0x0004, lo: 0x01},
+	{value: 0x0586, lo: 0xa9, hi: 0xaa},
+	// Block 0x45, offset 0x178
+	{value: 0x0000, lo: 0x01},
+	{value: 0x461e, lo: 0x9c, hi: 0x9c},
+	// Block 0x46, offset 0x17a
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0xaf, hi: 0xb1},
+	// Block 0x47, offset 0x17c
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0xbf, hi: 0xbf},
+	// Block 0x48, offset 0x17e
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0xa0, hi: 0xbf},
+	// Block 0x49, offset 0x180
+	{value: 0x0000, lo: 0x05},
+	{value: 0x812d, lo: 0xaa, hi: 0xaa},
+	{value: 0x8132, lo: 0xab, hi: 0xab},
+	{value: 0x8134, lo: 0xac, hi: 0xac},
+	{value: 0x812f, lo: 0xad, hi: 0xad},
+	{value: 0x8130, lo: 0xae, hi: 0xaf},
+	// Block 0x4a, offset 0x186
+	{value: 0x0000, lo: 0x03},
+	{value: 0x4be0, lo: 0xb3, hi: 0xb3},
+	{value: 0x4be0, lo: 0xb5, hi: 0xb6},
+	{value: 0x4be0, lo: 0xba, hi: 0xbf},
+	// Block 0x4b, offset 0x18a
+	{value: 0x0000, lo: 0x01},
+	{value: 0x4be0, lo: 0x8f, hi: 0xa3},
+	// Block 0x4c, offset 0x18c
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0xae, hi: 0xbe},
+	// Block 0x4d, offset 0x18e
+	{value: 0x0000, lo: 0x07},
+	{value: 0x8100, lo: 0x84, hi: 0x84},
+	{value: 0x8100, lo: 0x87, hi: 0x87},
+	{value: 0x8100, lo: 0x90, hi: 0x90},
+	{value: 0x8100, lo: 0x9e, hi: 0x9e},
+	{value: 0x8100, lo: 0xa1, hi: 0xa1},
+	{value: 0x8100, lo: 0xb2, hi: 0xb2},
+	{value: 0x8100, lo: 0xbb, hi: 0xbb},
+	// Block 0x4e, offset 0x196
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8100, lo: 0x80, hi: 0x80},
+	{value: 0x8100, lo: 0x8b, hi: 0x8b},
+	{value: 0x8100, lo: 0x8e, hi: 0x8e},
+	// Block 0x4f, offset 0x19a
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8133, lo: 0xaf, hi: 0xaf},
+	{value: 0x8133, lo: 0xb4, hi: 0xbd},
+	// Block 0x50, offset 0x19d
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0x9e, hi: 0x9f},
+	// Block 0x51, offset 0x19f
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0xb0, hi: 0xb1},
+	// Block 0x52, offset 0x1a1
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0x86, hi: 0x86},
+	{value: 0x8105, lo: 0xac, hi: 0xac},
+	// Block 0x53, offset 0x1a4
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0x84, hi: 0x84},
+	{value: 0x8133, lo: 0xa0, hi: 0xb1},
+	// Block 0x54, offset 0x1a7
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812e, lo: 0xab, hi: 0xad},
+	// Block 0x55, offset 0x1a9
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0x93, hi: 0x93},
+	// Block 0x56, offset 0x1ab
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8103, lo: 0xb3, hi: 0xb3},
+	// Block 0x57, offset 0x1ad
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0x80, hi: 0x80},
+	// Block 0x58, offset 0x1af
+	{value: 0x0000, lo: 0x05},
+	{value: 0x8133, lo: 0xb0, hi: 0xb0},
+	{value: 0x8133, lo: 0xb2, hi: 0xb3},
+	{value: 0x812e, lo: 0xb4, hi: 0xb4},
+	{value: 0x8133, lo: 0xb7, hi: 0xb8},
+	{value: 0x8133, lo: 0xbe, hi: 0xbf},
+	// Block 0x59, offset 0x1b5
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8133, lo: 0x81, hi: 0x81},
+	{value: 0x8105, lo: 0xb6, hi: 0xb6},
+	// Block 0x5a, offset 0x1b8
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0xad, hi: 0xad},
+	// Block 0x5b, offset 0x1ba
+	{value: 0x0000, lo: 0x06},
+	{value: 0xe500, lo: 0x80, hi: 0x80},
+	{value: 0xc600, lo: 0x81, hi: 0x9b},
+	{value: 0xe500, lo: 0x9c, hi: 0x9c},
+	{value: 0xc600, lo: 0x9d, hi: 0xb7},
+	{value: 0xe500, lo: 0xb8, hi: 0xb8},
+	{value: 0xc600, lo: 0xb9, hi: 0xbf},
+	// Block 0x5c, offset 0x1c1
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x93},
+	{value: 0xe500, lo: 0x94, hi: 0x94},
+	{value: 0xc600, lo: 0x95, hi: 0xaf},
+	{value: 0xe500, lo: 0xb0, hi: 0xb0},
+	{value: 0xc600, lo: 0xb1, hi: 0xbf},
+	// Block 0x5d, offset 0x1c7
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x8b},
+	{value: 0xe500, lo: 0x8c, hi: 0x8c},
+	{value: 0xc600, lo: 0x8d, hi: 0xa7},
+	{value: 0xe500, lo: 0xa8, hi: 0xa8},
+	{value: 0xc600, lo: 0xa9, hi: 0xbf},
+	// Block 0x5e, offset 0x1cd
+	{value: 0x0000, lo: 0x07},
+	{value: 0xc600, lo: 0x80, hi: 0x83},
+	{value: 0xe500, lo: 0x84, hi: 0x84},
+	{value: 0xc600, lo: 0x85, hi: 0x9f},
+	{value: 0xe500, lo: 0xa0, hi: 0xa0},
+	{value: 0xc600, lo: 0xa1, hi: 0xbb},
+	{value: 0xe500, lo: 0xbc, hi: 0xbc},
+	{value: 0xc600, lo: 0xbd, hi: 0xbf},
+	// Block 0x5f, offset 0x1d5
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x97},
+	{value: 0xe500, lo: 0x98, hi: 0x98},
+	{value: 0xc600, lo: 0x99, hi: 0xb3},
+	{value: 0xe500, lo: 0xb4, hi: 0xb4},
+	{value: 0xc600, lo: 0xb5, hi: 0xbf},
+	// Block 0x60, offset 0x1db
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x8f},
+	{value: 0xe500, lo: 0x90, hi: 0x90},
+	{value: 0xc600, lo: 0x91, hi: 0xab},
+	{value: 0xe500, lo: 0xac, hi: 0xac},
+	{value: 0xc600, lo: 0xad, hi: 0xbf},
+	// Block 0x61, offset 0x1e1
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x87},
+	{value: 0xe500, lo: 0x88, hi: 0x88},
+	{value: 0xc600, lo: 0x89, hi: 0xa3},
+	{value: 0xe500, lo: 0xa4, hi: 0xa4},
+	{value: 0xc600, lo: 0xa5, hi: 0xbf},
+	// Block 0x62, offset 0x1e7
+	{value: 0x0000, lo: 0x03},
+	{value: 0xc600, lo: 0x80, hi: 0x87},
+	{value: 0xe500, lo: 0x88, hi: 0x88},
+	{value: 0xc600, lo: 0x89, hi: 0xa3},
+	// Block 0x63, offset 0x1eb
+	{value: 0x0006, lo: 0x0d},
+	{value: 0x44d1, lo: 0x9d, hi: 0x9d},
+	{value: 0x8116, lo: 0x9e, hi: 0x9e},
+	{value: 0x4543, lo: 0x9f, hi: 0x9f},
+	{value: 0x4531, lo: 0xaa, hi: 0xab},
+	{value: 0x4635, lo: 0xac, hi: 0xac},
+	{value: 0x463d, lo: 0xad, hi: 0xad},
+	{value: 0x4489, lo: 0xae, hi: 0xb1},
+	{value: 0x44a7, lo: 0xb2, hi: 0xb4},
+	{value: 0x44bf, lo: 0xb5, hi: 0xb6},
+	{value: 0x44cb, lo: 0xb8, hi: 0xb8},
+	{value: 0x44d7, lo: 0xb9, hi: 0xbb},
+	{value: 0x44ef, lo: 0xbc, hi: 0xbc},
+	{value: 0x44f5, lo: 0xbe, hi: 0xbe},
+	// Block 0x64, offset 0x1f9
+	{value: 0x0006, lo: 0x08},
+	{value: 0x44fb, lo: 0x80, hi: 0x81},
+	{value: 0x4507, lo: 0x83, hi: 0x84},
+	{value: 0x4519, lo: 0x86, hi: 0x89},
+	{value: 0x453d, lo: 0x8a, hi: 0x8a},
+	{value: 0x44b9, lo: 0x8b, hi: 0x8b},
+	{value: 0x44a1, lo: 0x8c, hi: 0x8c},
+	{value: 0x44e9, lo: 0x8d, hi: 0x8d},
+	{value: 0x4513, lo: 0x8e, hi: 0x8e},
+	// Block 0x65, offset 0x202
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8100, lo: 0xa4, hi: 0xa5},
+	{value: 0x8100, lo: 0xb0, hi: 0xb1},
+	// Block 0x66, offset 0x205
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8100, lo: 0x9b, hi: 0x9d},
+	{value: 0x8200, lo: 0x9e, hi: 0xa3},
+	// Block 0x67, offset 0x208
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0x90, hi: 0x90},
+	// Block 0x68, offset 0x20a
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8100, lo: 0x99, hi: 0x99},
+	{value: 0x8200, lo: 0xb2, hi: 0xb4},
+	// Block 0x69, offset 0x20d
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0xbc, hi: 0xbd},
+	// Block 0x6a, offset 0x20f
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8133, lo: 0xa0, hi: 0xa6},
+	{value: 0x812e, lo: 0xa7, hi: 0xad},
+	{value: 0x8133, lo: 0xae, hi: 0xaf},
+	// Block 0x6b, offset 0x213
+	{value: 0x0000, lo: 0x04},
+	{value: 0x8100, lo: 0x89, hi: 0x8c},
+	{value: 0x8100, lo: 0xb0, hi: 0xb2},
+	{value: 0x8100, lo: 0xb4, hi: 0xb4},
+	{value: 0x8100, lo: 0xb6, hi: 0xbf},
+	// Block 0x6c, offset 0x218
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0x81, hi: 0x8c},
+	// Block 0x6d, offset 0x21a
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0xb5, hi: 0xba},
+	// Block 0x6e, offset 0x21c
+	{value: 0x0000, lo: 0x04},
+	{value: 0x4be0, lo: 0x9e, hi: 0x9f},
+	{value: 0x4be0, lo: 0xa3, hi: 0xa3},
+	{value: 0x4be0, lo: 0xa5, hi: 0xa6},
+	{value: 0x4be0, lo: 0xaa, hi: 0xaf},
+	// Block 0x6f, offset 0x221
+	{value: 0x0000, lo: 0x05},
+	{value: 0x4be0, lo: 0x82, hi: 0x87},
+	{value: 0x4be0, lo: 0x8a, hi: 0x8f},
+	{value: 0x4be0, lo: 0x92, hi: 0x97},
+	{value: 0x4be0, lo: 0x9a, hi: 0x9c},
+	{value: 0x8100, lo: 0xa3, hi: 0xa3},
+	// Block 0x70, offset 0x227
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812e, lo: 0xbd, hi: 0xbd},
+	// Block 0x71, offset 0x229
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812e, lo: 0xa0, hi: 0xa0},
+	// Block 0x72, offset 0x22b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0xb6, hi: 0xba},
+	// Block 0x73, offset 0x22d
+	{value: 0x002d, lo: 0x05},
+	{value: 0x812e, lo: 0x8d, hi: 0x8d},
+	{value: 0x8133, lo: 0x8f, hi: 0x8f},
+	{value: 0x8133, lo: 0xb8, hi: 0xb8},
+	{value: 0x8101, lo: 0xb9, hi: 0xba},
+	{value: 0x8105, lo: 0xbf, hi: 0xbf},
+	// Block 0x74, offset 0x233
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8133, lo: 0xa5, hi: 0xa5},
+	{value: 0x812e, lo: 0xa6, hi: 0xa6},
+	// Block 0x75, offset 0x236
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0xa4, hi: 0xa7},
+	// Block 0x76, offset 0x238
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0xab, hi: 0xac},
+	// Block 0x77, offset 0x23a
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812e, lo: 0xbd, hi: 0xbf},
+	// Block 0x78, offset 0x23c
+	{value: 0x0000, lo: 0x05},
+	{value: 0x812e, lo: 0x86, hi: 0x87},
+	{value: 0x8133, lo: 0x88, hi: 0x8a},
+	{value: 0x812e, lo: 0x8b, hi: 0x8b},
+	{value: 0x8133, lo: 0x8c, hi: 0x8c},
+	{value: 0x812e, lo: 0x8d, hi: 0x90},
+	// Block 0x79, offset 0x242
+	{value: 0x0005, lo: 0x03},
+	{value: 0x8133, lo: 0x82, hi: 0x82},
+	{value: 0x812e, lo: 0x83, hi: 0x84},
+	{value: 0x812e, lo: 0x85, hi: 0x85},
+	// Block 0x7a, offset 0x246
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8105, lo: 0x86, hi: 0x86},
+	{value: 0x8105, lo: 0xb0, hi: 0xb0},
+	{value: 0x8105, lo: 0xbf, hi: 0xbf},
+	// Block 0x7b, offset 0x24a
+	{value: 0x17fe, lo: 0x07},
+	{value: 0xa000, lo: 0x99, hi: 0x99},
+	{value: 0x4379, lo: 0x9a, hi: 0x9a},
+	{value: 0xa000, lo: 0x9b, hi: 0x9b},
+	{value: 0x4383, lo: 0x9c, hi: 0x9c},
+	{value: 0xa000, lo: 0xa5, hi: 0xa5},
+	{value: 0x438d, lo: 0xab, hi: 0xab},
+	{value: 0x8105, lo: 0xb9, hi: 0xba},
+	// Block 0x7c, offset 0x252
+	{value: 0x0000, lo: 0x06},
+	{value: 0x8133, lo: 0x80, hi: 0x82},
+	{value: 0x9900, lo: 0xa7, hi: 0xa7},
+	{value: 0x2eb5, lo: 0xae, hi: 0xae},
+	{value: 0x2ebf, lo: 0xaf, hi: 0xaf},
+	{value: 0xa000, lo: 0xb1, hi: 0xb2},
+	{value: 0x8105, lo: 0xb3, hi: 0xb4},
+	// Block 0x7d, offset 0x259
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0x80, hi: 0x80},
+	{value: 0x8103, lo: 0x8a, hi: 0x8a},
+	// Block 0x7e, offset 0x25c
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0xb5, hi: 0xb5},
+	{value: 0x8103, lo: 0xb6, hi: 0xb6},
+	// Block 0x7f, offset 0x25f
+	{value: 0x0002, lo: 0x01},
+	{value: 0x8103, lo: 0xa9, hi: 0xaa},
+	// Block 0x80, offset 0x261
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8103, lo: 0xbb, hi: 0xbc},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x81, offset 0x264
+	{value: 0x0000, lo: 0x07},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0x2ec9, lo: 0x8b, hi: 0x8b},
+	{value: 0x2ed3, lo: 0x8c, hi: 0x8c},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	{value: 0x8133, lo: 0xa6, hi: 0xac},
+	{value: 0x8133, lo: 0xb0, hi: 0xb4},
+	// Block 0x82, offset 0x26c
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8105, lo: 0x82, hi: 0x82},
+	{value: 0x8103, lo: 0x86, hi: 0x86},
+	{value: 0x8133, lo: 0x9e, hi: 0x9e},
+	// Block 0x83, offset 0x270
+	{value: 0x6a23, lo: 0x06},
+	{value: 0x9900, lo: 0xb0, hi: 0xb0},
+	{value: 0xa000, lo: 0xb9, hi: 0xb9},
+	{value: 0x9900, lo: 0xba, hi: 0xba},
+	{value: 0x2ee7, lo: 0xbb, hi: 0xbb},
+	{value: 0x2edd, lo: 0xbc, hi: 0xbd},
+	{value: 0x2ef1, lo: 0xbe, hi: 0xbe},
+	// Block 0x84, offset 0x277
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0x82, hi: 0x82},
+	{value: 0x8103, lo: 0x83, hi: 0x83},
+	// Block 0x85, offset 0x27a
+	{value: 0x0000, lo: 0x05},
+	{value: 0x9900, lo: 0xaf, hi: 0xaf},
+	{value: 0xa000, lo: 0xb8, hi: 0xb9},
+	{value: 0x2efb, lo: 0xba, hi: 0xba},
+	{value: 0x2f05, lo: 0xbb, hi: 0xbb},
+	{value: 0x8105, lo: 0xbf, hi: 0xbf},
+	// Block 0x86, offset 0x280
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8103, lo: 0x80, hi: 0x80},
+	// Block 0x87, offset 0x282
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0xb6, hi: 0xb6},
+	{value: 0x8103, lo: 0xb7, hi: 0xb7},
+	// Block 0x88, offset 0x285
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0xab, hi: 0xab},
+	// Block 0x89, offset 0x287
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0xb9, hi: 0xb9},
+	{value: 0x8103, lo: 0xba, hi: 0xba},
+	// Block 0x8a, offset 0x28a
+	{value: 0x0000, lo: 0x04},
+	{value: 0x9900, lo: 0xb0, hi: 0xb0},
+	{value: 0xa000, lo: 0xb5, hi: 0xb5},
+	{value: 0x2f0f, lo: 0xb8, hi: 0xb8},
+	{value: 0x8105, lo: 0xbd, hi: 0xbe},
+	// Block 0x8b, offset 0x28f
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8103, lo: 0x83, hi: 0x83},
+	// Block 0x8c, offset 0x291
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0xa0, hi: 0xa0},
+	// Block 0x8d, offset 0x293
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0xb4, hi: 0xb4},
+	// Block 0x8e, offset 0x295
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0x87, hi: 0x87},
+	// Block 0x8f, offset 0x297
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0x99, hi: 0x99},
+	// Block 0x90, offset 0x299
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8103, lo: 0x82, hi: 0x82},
+	{value: 0x8105, lo: 0x84, hi: 0x85},
+	// Block 0x91, offset 0x29c
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0x97, hi: 0x97},
+	// Block 0x92, offset 0x29e
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0x81, hi: 0x82},
+	// Block 0x93, offset 0x2a0
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8101, lo: 0xb0, hi: 0xb4},
+	// Block 0x94, offset 0x2a2
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0xb0, hi: 0xb6},
+	// Block 0x95, offset 0x2a4
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8102, lo: 0xb0, hi: 0xb1},
+	// Block 0x96, offset 0x2a6
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8101, lo: 0x9e, hi: 0x9e},
+	// Block 0x97, offset 0x2a8
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x470d, lo: 0x9e, hi: 0x9e},
+	{value: 0x4717, lo: 0x9f, hi: 0x9f},
+	{value: 0x474b, lo: 0xa0, hi: 0xa0},
+	{value: 0x4759, lo: 0xa1, hi: 0xa1},
+	{value: 0x4767, lo: 0xa2, hi: 0xa2},
+	{value: 0x4775, lo: 0xa3, hi: 0xa3},
+	{value: 0x4783, lo: 0xa4, hi: 0xa4},
+	{value: 0x812c, lo: 0xa5, hi: 0xa6},
+	{value: 0x8101, lo: 0xa7, hi: 0xa9},
+	{value: 0x8131, lo: 0xad, hi: 0xad},
+	{value: 0x812c, lo: 0xae, hi: 0xb2},
+	{value: 0x812e, lo: 0xbb, hi: 0xbf},
+	// Block 0x98, offset 0x2b5
+	{value: 0x0000, lo: 0x09},
+	{value: 0x812e, lo: 0x80, hi: 0x82},
+	{value: 0x8133, lo: 0x85, hi: 0x89},
+	{value: 0x812e, lo: 0x8a, hi: 0x8b},
+	{value: 0x8133, lo: 0xaa, hi: 0xad},
+	{value: 0x4721, lo: 0xbb, hi: 0xbb},
+	{value: 0x472b, lo: 0xbc, hi: 0xbc},
+	{value: 0x4791, lo: 0xbd, hi: 0xbd},
+	{value: 0x47ad, lo: 0xbe, hi: 0xbe},
+	{value: 0x479f, lo: 0xbf, hi: 0xbf},
+	// Block 0x99, offset 0x2bf
+	{value: 0x0000, lo: 0x01},
+	{value: 0x47bb, lo: 0x80, hi: 0x80},
+	// Block 0x9a, offset 0x2c1
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0x82, hi: 0x84},
+	// Block 0x9b, offset 0x2c3
+	{value: 0x0000, lo: 0x05},
+	{value: 0x8133, lo: 0x80, hi: 0x86},
+	{value: 0x8133, lo: 0x88, hi: 0x98},
+	{value: 0x8133, lo: 0x9b, hi: 0xa1},
+	{value: 0x8133, lo: 0xa3, hi: 0xa4},
+	{value: 0x8133, lo: 0xa6, hi: 0xaa},
+	// Block 0x9c, offset 0x2c9
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0x8f, hi: 0x8f},
+	// Block 0x9d, offset 0x2cb
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0xae, hi: 0xae},
+	// Block 0x9e, offset 0x2cd
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0xac, hi: 0xaf},
+	// Block 0x9f, offset 0x2cf
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8134, lo: 0xac, hi: 0xad},
+	{value: 0x812e, lo: 0xae, hi: 0xae},
+	{value: 0x8133, lo: 0xaf, hi: 0xaf},
+	// Block 0xa0, offset 0x2d3
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812e, lo: 0x90, hi: 0x96},
+	// Block 0xa1, offset 0x2d5
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8133, lo: 0x84, hi: 0x89},
+	{value: 0x8103, lo: 0x8a, hi: 0x8a},
+	// Block 0xa2, offset 0x2d8
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0x93, hi: 0x93},
+}
+
+// lookup returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *nfkcTrie) lookup(s []byte) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return nfkcValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := nfkcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := nfkcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfkcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := nfkcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfkcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = nfkcIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *nfkcTrie) lookupUnsafe(s []byte) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return nfkcValues[c0]
+	}
+	i := nfkcIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = nfkcIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = nfkcIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// lookupString returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *nfkcTrie) lookupString(s string) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return nfkcValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := nfkcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := nfkcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfkcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := nfkcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfkcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = nfkcIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *nfkcTrie) lookupStringUnsafe(s string) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return nfkcValues[c0]
+	}
+	i := nfkcIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = nfkcIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = nfkcIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// nfkcTrie. Total size: 19260 bytes (18.81 KiB). Checksum: 1a0bbc4c8c24da49.
+type nfkcTrie struct{}
+
+func newNfkcTrie(i int) *nfkcTrie {
+	return &nfkcTrie{}
+}
+
+// lookupValue determines the type of block n and looks up the value for b.
+func (t *nfkcTrie) lookupValue(n uint32, b byte) uint16 {
+	switch {
+	case n < 95:
+		return uint16(nfkcValues[n<<6+uint32(b)])
+	default:
+		n -= 95
+		return uint16(nfkcSparse.lookup(n, b))
+	}
+}
+
+// nfkcValues: 97 blocks, 6208 entries, 12416 bytes
+// The third block is the zero block.
+var nfkcValues = [6208]uint16{
+	// Block 0x0, offset 0x0
+	0x3c: 0xa000, 0x3d: 0xa000, 0x3e: 0xa000,
+	// Block 0x1, offset 0x40
+	0x41: 0xa000, 0x42: 0xa000, 0x43: 0xa000, 0x44: 0xa000, 0x45: 0xa000,
+	0x46: 0xa000, 0x47: 0xa000, 0x48: 0xa000, 0x49: 0xa000, 0x4a: 0xa000, 0x4b: 0xa000,
+	0x4c: 0xa000, 0x4d: 0xa000, 0x4e: 0xa000, 0x4f: 0xa000, 0x50: 0xa000,
+	0x52: 0xa000, 0x53: 0xa000, 0x54: 0xa000, 0x55: 0xa000, 0x56: 0xa000, 0x57: 0xa000,
+	0x58: 0xa000, 0x59: 0xa000, 0x5a: 0xa000,
+	0x61: 0xa000, 0x62: 0xa000, 0x63: 0xa000,
+	0x64: 0xa000, 0x65: 0xa000, 0x66: 0xa000, 0x67: 0xa000, 0x68: 0xa000, 0x69: 0xa000,
+	0x6a: 0xa000, 0x6b: 0xa000, 0x6c: 0xa000, 0x6d: 0xa000, 0x6e: 0xa000, 0x6f: 0xa000,
+	0x70: 0xa000, 0x72: 0xa000, 0x73: 0xa000, 0x74: 0xa000, 0x75: 0xa000,
+	0x76: 0xa000, 0x77: 0xa000, 0x78: 0xa000, 0x79: 0xa000, 0x7a: 0xa000,
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc0: 0x30b0, 0xc1: 0x30b5, 0xc2: 0x47c9, 0xc3: 0x30ba, 0xc4: 0x47d8, 0xc5: 0x47dd,
+	0xc6: 0xa000, 0xc7: 0x47e7, 0xc8: 0x3123, 0xc9: 0x3128, 0xca: 0x47ec, 0xcb: 0x313c,
+	0xcc: 0x31af, 0xcd: 0x31b4, 0xce: 0x31b9, 0xcf: 0x4800, 0xd1: 0x3245,
+	0xd2: 0x3268, 0xd3: 0x326d, 0xd4: 0x480a, 0xd5: 0x480f, 0xd6: 0x481e,
+	0xd8: 0xa000, 0xd9: 0x32f4, 0xda: 0x32f9, 0xdb: 0x32fe, 0xdc: 0x4850, 0xdd: 0x3376,
+	0xe0: 0x33bc, 0xe1: 0x33c1, 0xe2: 0x485a, 0xe3: 0x33c6,
+	0xe4: 0x4869, 0xe5: 0x486e, 0xe6: 0xa000, 0xe7: 0x4878, 0xe8: 0x342f, 0xe9: 0x3434,
+	0xea: 0x487d, 0xeb: 0x3448, 0xec: 0x34c0, 0xed: 0x34c5, 0xee: 0x34ca, 0xef: 0x4891,
+	0xf1: 0x3556, 0xf2: 0x3579, 0xf3: 0x357e, 0xf4: 0x489b, 0xf5: 0x48a0,
+	0xf6: 0x48af, 0xf8: 0xa000, 0xf9: 0x360a, 0xfa: 0x360f, 0xfb: 0x3614,
+	0xfc: 0x48e1, 0xfd: 0x3691, 0xff: 0x36aa,
+	// Block 0x4, offset 0x100
+	0x100: 0x30bf, 0x101: 0x33cb, 0x102: 0x47ce, 0x103: 0x485f, 0x104: 0x30dd, 0x105: 0x33e9,
+	0x106: 0x30f1, 0x107: 0x33fd, 0x108: 0x30f6, 0x109: 0x3402, 0x10a: 0x30fb, 0x10b: 0x3407,
+	0x10c: 0x3100, 0x10d: 0x340c, 0x10e: 0x310a, 0x10f: 0x3416,
+	0x112: 0x47f1, 0x113: 0x4882, 0x114: 0x3132, 0x115: 0x343e, 0x116: 0x3137, 0x117: 0x3443,
+	0x118: 0x3155, 0x119: 0x3461, 0x11a: 0x3146, 0x11b: 0x3452, 0x11c: 0x316e, 0x11d: 0x347a,
+	0x11e: 0x3178, 0x11f: 0x3484, 0x120: 0x317d, 0x121: 0x3489, 0x122: 0x3187, 0x123: 0x3493,
+	0x124: 0x318c, 0x125: 0x3498, 0x128: 0x31be, 0x129: 0x34cf,
+	0x12a: 0x31c3, 0x12b: 0x34d4, 0x12c: 0x31c8, 0x12d: 0x34d9, 0x12e: 0x31eb, 0x12f: 0x34f7,
+	0x130: 0x31cd, 0x132: 0x1a8a, 0x133: 0x1b17, 0x134: 0x31f5, 0x135: 0x3501,
+	0x136: 0x3209, 0x137: 0x351a, 0x139: 0x3213, 0x13a: 0x3524, 0x13b: 0x321d,
+	0x13c: 0x352e, 0x13d: 0x3218, 0x13e: 0x3529, 0x13f: 0x1cdc,
+	// Block 0x5, offset 0x140
+	0x140: 0x1d64, 0x143: 0x3240, 0x144: 0x3551, 0x145: 0x3259,
+	0x146: 0x356a, 0x147: 0x324f, 0x148: 0x3560, 0x149: 0x1d8c,
+	0x14c: 0x4814, 0x14d: 0x48a5, 0x14e: 0x3272, 0x14f: 0x3583, 0x150: 0x327c, 0x151: 0x358d,
+	0x154: 0x329a, 0x155: 0x35ab, 0x156: 0x32b3, 0x157: 0x35c4,
+	0x158: 0x32a4, 0x159: 0x35b5, 0x15a: 0x4837, 0x15b: 0x48c8, 0x15c: 0x32bd, 0x15d: 0x35ce,
+	0x15e: 0x32cc, 0x15f: 0x35dd, 0x160: 0x483c, 0x161: 0x48cd, 0x162: 0x32e5, 0x163: 0x35fb,
+	0x164: 0x32d6, 0x165: 0x35ec, 0x168: 0x4846, 0x169: 0x48d7,
+	0x16a: 0x484b, 0x16b: 0x48dc, 0x16c: 0x3303, 0x16d: 0x3619, 0x16e: 0x330d, 0x16f: 0x3623,
+	0x170: 0x3312, 0x171: 0x3628, 0x172: 0x3330, 0x173: 0x3646, 0x174: 0x3353, 0x175: 0x3669,
+	0x176: 0x337b, 0x177: 0x3696, 0x178: 0x338f, 0x179: 0x339e, 0x17a: 0x36be, 0x17b: 0x33a8,
+	0x17c: 0x36c8, 0x17d: 0x33ad, 0x17e: 0x36cd, 0x17f: 0x00a7,
+	// Block 0x6, offset 0x180
+	0x184: 0x2f2f, 0x185: 0x2f35,
+	0x186: 0x2f3b, 0x187: 0x1a9f, 0x188: 0x1aa2, 0x189: 0x1b38, 0x18a: 0x1ab7, 0x18b: 0x1aba,
+	0x18c: 0x1b6e, 0x18d: 0x30c9, 0x18e: 0x33d5, 0x18f: 0x31d7, 0x190: 0x34e3, 0x191: 0x3281,
+	0x192: 0x3592, 0x193: 0x3317, 0x194: 0x362d, 0x195: 0x3b10, 0x196: 0x3c9f, 0x197: 0x3b09,
+	0x198: 0x3c98, 0x199: 0x3b17, 0x19a: 0x3ca6, 0x19b: 0x3b02, 0x19c: 0x3c91,
+	0x19e: 0x39f1, 0x19f: 0x3b80, 0x1a0: 0x39ea, 0x1a1: 0x3b79, 0x1a2: 0x36f4, 0x1a3: 0x3706,
+	0x1a6: 0x3182, 0x1a7: 0x348e, 0x1a8: 0x31ff, 0x1a9: 0x3510,
+	0x1aa: 0x482d, 0x1ab: 0x48be, 0x1ac: 0x3ad1, 0x1ad: 0x3c60, 0x1ae: 0x3718, 0x1af: 0x371e,
+	0x1b0: 0x3506, 0x1b1: 0x1a6f, 0x1b2: 0x1a72, 0x1b3: 0x1aff, 0x1b4: 0x3169, 0x1b5: 0x3475,
+	0x1b8: 0x323b, 0x1b9: 0x354c, 0x1ba: 0x39f8, 0x1bb: 0x3b87,
+	0x1bc: 0x36ee, 0x1bd: 0x3700, 0x1be: 0x36fa, 0x1bf: 0x370c,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x30ce, 0x1c1: 0x33da, 0x1c2: 0x30d3, 0x1c3: 0x33df, 0x1c4: 0x314b, 0x1c5: 0x3457,
+	0x1c6: 0x3150, 0x1c7: 0x345c, 0x1c8: 0x31dc, 0x1c9: 0x34e8, 0x1ca: 0x31e1, 0x1cb: 0x34ed,
+	0x1cc: 0x3286, 0x1cd: 0x3597, 0x1ce: 0x328b, 0x1cf: 0x359c, 0x1d0: 0x32a9, 0x1d1: 0x35ba,
+	0x1d2: 0x32ae, 0x1d3: 0x35bf, 0x1d4: 0x331c, 0x1d5: 0x3632, 0x1d6: 0x3321, 0x1d7: 0x3637,
+	0x1d8: 0x32c7, 0x1d9: 0x35d8, 0x1da: 0x32e0, 0x1db: 0x35f6,
+	0x1de: 0x319b, 0x1df: 0x34a7,
+	0x1e6: 0x47d3, 0x1e7: 0x4864, 0x1e8: 0x47fb, 0x1e9: 0x488c,
+	0x1ea: 0x3aa0, 0x1eb: 0x3c2f, 0x1ec: 0x3a7d, 0x1ed: 0x3c0c, 0x1ee: 0x4819, 0x1ef: 0x48aa,
+	0x1f0: 0x3a99, 0x1f1: 0x3c28, 0x1f2: 0x3385, 0x1f3: 0x36a0,
+	// Block 0x8, offset 0x200
+	0x200: 0x9933, 0x201: 0x9933, 0x202: 0x9933, 0x203: 0x9933, 0x204: 0x9933, 0x205: 0x8133,
+	0x206: 0x9933, 0x207: 0x9933, 0x208: 0x9933, 0x209: 0x9933, 0x20a: 0x9933, 0x20b: 0x9933,
+	0x20c: 0x9933, 0x20d: 0x8133, 0x20e: 0x8133, 0x20f: 0x9933, 0x210: 0x8133, 0x211: 0x9933,
+	0x212: 0x8133, 0x213: 0x9933, 0x214: 0x9933, 0x215: 0x8134, 0x216: 0x812e, 0x217: 0x812e,
+	0x218: 0x812e, 0x219: 0x812e, 0x21a: 0x8134, 0x21b: 0x992c, 0x21c: 0x812e, 0x21d: 0x812e,
+	0x21e: 0x812e, 0x21f: 0x812e, 0x220: 0x812e, 0x221: 0x812a, 0x222: 0x812a, 0x223: 0x992e,
+	0x224: 0x992e, 0x225: 0x992e, 0x226: 0x992e, 0x227: 0x992a, 0x228: 0x992a, 0x229: 0x812e,
+	0x22a: 0x812e, 0x22b: 0x812e, 0x22c: 0x812e, 0x22d: 0x992e, 0x22e: 0x992e, 0x22f: 0x812e,
+	0x230: 0x992e, 0x231: 0x992e, 0x232: 0x812e, 0x233: 0x812e, 0x234: 0x8101, 0x235: 0x8101,
+	0x236: 0x8101, 0x237: 0x8101, 0x238: 0x9901, 0x239: 0x812e, 0x23a: 0x812e, 0x23b: 0x812e,
+	0x23c: 0x812e, 0x23d: 0x8133, 0x23e: 0x8133, 0x23f: 0x8133,
+	// Block 0x9, offset 0x240
+	0x240: 0x4aef, 0x241: 0x4af4, 0x242: 0x9933, 0x243: 0x4af9, 0x244: 0x4bb2, 0x245: 0x9937,
+	0x246: 0x8133, 0x247: 0x812e, 0x248: 0x812e, 0x249: 0x812e, 0x24a: 0x8133, 0x24b: 0x8133,
+	0x24c: 0x8133, 0x24d: 0x812e, 0x24e: 0x812e, 0x250: 0x8133, 0x251: 0x8133,
+	0x252: 0x8133, 0x253: 0x812e, 0x254: 0x812e, 0x255: 0x812e, 0x256: 0x812e, 0x257: 0x8133,
+	0x258: 0x8134, 0x259: 0x812e, 0x25a: 0x812e, 0x25b: 0x8133, 0x25c: 0x8135, 0x25d: 0x8136,
+	0x25e: 0x8136, 0x25f: 0x8135, 0x260: 0x8136, 0x261: 0x8136, 0x262: 0x8135, 0x263: 0x8133,
+	0x264: 0x8133, 0x265: 0x8133, 0x266: 0x8133, 0x267: 0x8133, 0x268: 0x8133, 0x269: 0x8133,
+	0x26a: 0x8133, 0x26b: 0x8133, 0x26c: 0x8133, 0x26d: 0x8133, 0x26e: 0x8133, 0x26f: 0x8133,
+	0x274: 0x01ee,
+	0x27a: 0x43e6,
+	0x27e: 0x0037,
+	// Block 0xa, offset 0x280
+	0x284: 0x439b, 0x285: 0x45bc,
+	0x286: 0x372a, 0x287: 0x00ce, 0x288: 0x3748, 0x289: 0x3754, 0x28a: 0x3766,
+	0x28c: 0x3784, 0x28e: 0x3796, 0x28f: 0x37b4, 0x290: 0x3f49, 0x291: 0xa000,
+	0x295: 0xa000, 0x297: 0xa000,
+	0x299: 0xa000,
+	0x29f: 0xa000, 0x2a1: 0xa000,
+	0x2a5: 0xa000, 0x2a9: 0xa000,
+	0x2aa: 0x3778, 0x2ab: 0x37a8, 0x2ac: 0x493f, 0x2ad: 0x37d8, 0x2ae: 0x4969, 0x2af: 0x37ea,
+	0x2b0: 0x3fb1, 0x2b1: 0xa000, 0x2b5: 0xa000,
+	0x2b7: 0xa000, 0x2b9: 0xa000,
+	0x2bf: 0xa000,
+	// Block 0xb, offset 0x2c0
+	0x2c1: 0xa000, 0x2c5: 0xa000,
+	0x2c9: 0xa000, 0x2ca: 0x4981, 0x2cb: 0x499f,
+	0x2cc: 0x3808, 0x2cd: 0x3820, 0x2ce: 0x49b7, 0x2d0: 0x0242, 0x2d1: 0x0254,
+	0x2d2: 0x0230, 0x2d3: 0x444d, 0x2d4: 0x4453, 0x2d5: 0x027e, 0x2d6: 0x026c,
+	0x2f0: 0x025a, 0x2f1: 0x026f, 0x2f2: 0x0272, 0x2f4: 0x020c, 0x2f5: 0x024b,
+	0x2f9: 0x022a,
+	// Block 0xc, offset 0x300
+	0x300: 0x3862, 0x301: 0x386e, 0x303: 0x385c,
+	0x306: 0xa000, 0x307: 0x384a,
+	0x30c: 0x389e, 0x30d: 0x3886, 0x30e: 0x38b0, 0x310: 0xa000,
+	0x313: 0xa000, 0x315: 0xa000, 0x316: 0xa000, 0x317: 0xa000,
+	0x318: 0xa000, 0x319: 0x3892, 0x31a: 0xa000,
+	0x31e: 0xa000, 0x323: 0xa000,
+	0x327: 0xa000,
+	0x32b: 0xa000, 0x32d: 0xa000,
+	0x330: 0xa000, 0x333: 0xa000, 0x335: 0xa000,
+	0x336: 0xa000, 0x337: 0xa000, 0x338: 0xa000, 0x339: 0x3916, 0x33a: 0xa000,
+	0x33e: 0xa000,
+	// Block 0xd, offset 0x340
+	0x341: 0x3874, 0x342: 0x38f8,
+	0x350: 0x3850, 0x351: 0x38d4,
+	0x352: 0x3856, 0x353: 0x38da, 0x356: 0x3868, 0x357: 0x38ec,
+	0x358: 0xa000, 0x359: 0xa000, 0x35a: 0x396a, 0x35b: 0x3970, 0x35c: 0x387a, 0x35d: 0x38fe,
+	0x35e: 0x3880, 0x35f: 0x3904, 0x362: 0x388c, 0x363: 0x3910,
+	0x364: 0x3898, 0x365: 0x391c, 0x366: 0x38a4, 0x367: 0x3928, 0x368: 0xa000, 0x369: 0xa000,
+	0x36a: 0x3976, 0x36b: 0x397c, 0x36c: 0x38ce, 0x36d: 0x3952, 0x36e: 0x38aa, 0x36f: 0x392e,
+	0x370: 0x38b6, 0x371: 0x393a, 0x372: 0x38bc, 0x373: 0x3940, 0x374: 0x38c2, 0x375: 0x3946,
+	0x378: 0x38c8, 0x379: 0x394c,
+	// Block 0xe, offset 0x380
+	0x387: 0x1e91,
+	0x391: 0x812e,
+	0x392: 0x8133, 0x393: 0x8133, 0x394: 0x8133, 0x395: 0x8133, 0x396: 0x812e, 0x397: 0x8133,
+	0x398: 0x8133, 0x399: 0x8133, 0x39a: 0x812f, 0x39b: 0x812e, 0x39c: 0x8133, 0x39d: 0x8133,
+	0x39e: 0x8133, 0x39f: 0x8133, 0x3a0: 0x8133, 0x3a1: 0x8133, 0x3a2: 0x812e, 0x3a3: 0x812e,
+	0x3a4: 0x812e, 0x3a5: 0x812e, 0x3a6: 0x812e, 0x3a7: 0x812e, 0x3a8: 0x8133, 0x3a9: 0x8133,
+	0x3aa: 0x812e, 0x3ab: 0x8133, 0x3ac: 0x8133, 0x3ad: 0x812f, 0x3ae: 0x8132, 0x3af: 0x8133,
+	0x3b0: 0x8106, 0x3b1: 0x8107, 0x3b2: 0x8108, 0x3b3: 0x8109, 0x3b4: 0x810a, 0x3b5: 0x810b,
+	0x3b6: 0x810c, 0x3b7: 0x810d, 0x3b8: 0x810e, 0x3b9: 0x810f, 0x3ba: 0x810f, 0x3bb: 0x8110,
+	0x3bc: 0x8111, 0x3bd: 0x8112, 0x3bf: 0x8113,
+	// Block 0xf, offset 0x3c0
+	0x3c8: 0xa000, 0x3ca: 0xa000, 0x3cb: 0x8117,
+	0x3cc: 0x8118, 0x3cd: 0x8119, 0x3ce: 0x811a, 0x3cf: 0x811b, 0x3d0: 0x811c, 0x3d1: 0x811d,
+	0x3d2: 0x811e, 0x3d3: 0x9933, 0x3d4: 0x9933, 0x3d5: 0x992e, 0x3d6: 0x812e, 0x3d7: 0x8133,
+	0x3d8: 0x8133, 0x3d9: 0x8133, 0x3da: 0x8133, 0x3db: 0x8133, 0x3dc: 0x812e, 0x3dd: 0x8133,
+	0x3de: 0x8133, 0x3df: 0x812e,
+	0x3f0: 0x811f, 0x3f5: 0x1eb4,
+	0x3f6: 0x2143, 0x3f7: 0x217f, 0x3f8: 0x217a,
+	// Block 0x10, offset 0x400
+	0x40a: 0x8133, 0x40b: 0x8133,
+	0x40c: 0x8133, 0x40d: 0x8133, 0x40e: 0x8133, 0x40f: 0x812e, 0x410: 0x812e, 0x411: 0x812e,
+	0x412: 0x812e, 0x413: 0x812e, 0x414: 0x8133, 0x415: 0x8133, 0x416: 0x8133, 0x417: 0x8133,
+	0x418: 0x8133, 0x419: 0x8133, 0x41a: 0x8133, 0x41b: 0x8133, 0x41c: 0x8133, 0x41d: 0x8133,
+	0x41e: 0x8133, 0x41f: 0x8133, 0x420: 0x8133, 0x421: 0x8133, 0x423: 0x812e,
+	0x424: 0x8133, 0x425: 0x8133, 0x426: 0x812e, 0x427: 0x8133, 0x428: 0x8133, 0x429: 0x812e,
+	0x42a: 0x8133, 0x42b: 0x8133, 0x42c: 0x8133, 0x42d: 0x812e, 0x42e: 0x812e, 0x42f: 0x812e,
+	0x430: 0x8117, 0x431: 0x8118, 0x432: 0x8119, 0x433: 0x8133, 0x434: 0x8133, 0x435: 0x8133,
+	0x436: 0x812e, 0x437: 0x8133, 0x438: 0x8133, 0x439: 0x812e, 0x43a: 0x812e, 0x43b: 0x8133,
+	0x43c: 0x8133, 0x43d: 0x8133, 0x43e: 0x8133, 0x43f: 0x8133,
+	// Block 0x11, offset 0x440
+	0x445: 0xa000,
+	0x446: 0x2e5d, 0x447: 0xa000, 0x448: 0x2e65, 0x449: 0xa000, 0x44a: 0x2e6d, 0x44b: 0xa000,
+	0x44c: 0x2e75, 0x44d: 0xa000, 0x44e: 0x2e7d, 0x451: 0xa000,
+	0x452: 0x2e85,
+	0x474: 0x8103, 0x475: 0x9900,
+	0x47a: 0xa000, 0x47b: 0x2e8d,
+	0x47c: 0xa000, 0x47d: 0x2e95, 0x47e: 0xa000, 0x47f: 0xa000,
+	// Block 0x12, offset 0x480
+	0x480: 0x0069, 0x481: 0x006b, 0x482: 0x006f, 0x483: 0x0083, 0x484: 0x0104, 0x485: 0x0107,
+	0x486: 0x0506, 0x487: 0x0085, 0x488: 0x0089, 0x489: 0x008b, 0x48a: 0x011f, 0x48b: 0x0122,
+	0x48c: 0x0125, 0x48d: 0x008f, 0x48f: 0x0097, 0x490: 0x009b, 0x491: 0x00e6,
+	0x492: 0x009f, 0x493: 0x0110, 0x494: 0x050a, 0x495: 0x050e, 0x496: 0x00a1, 0x497: 0x00a9,
+	0x498: 0x00ab, 0x499: 0x0516, 0x49a: 0x015b, 0x49b: 0x00ad, 0x49c: 0x051a, 0x49d: 0x0242,
+	0x49e: 0x0245, 0x49f: 0x0248, 0x4a0: 0x027e, 0x4a1: 0x0281, 0x4a2: 0x0093, 0x4a3: 0x00a5,
+	0x4a4: 0x00ab, 0x4a5: 0x00ad, 0x4a6: 0x0242, 0x4a7: 0x0245, 0x4a8: 0x026f, 0x4a9: 0x027e,
+	0x4aa: 0x0281,
+	0x4b8: 0x02b4,
+	// Block 0x13, offset 0x4c0
+	0x4db: 0x010a, 0x4dc: 0x0087, 0x4dd: 0x0113,
+	0x4de: 0x00d7, 0x4df: 0x0125, 0x4e0: 0x008d, 0x4e1: 0x012b, 0x4e2: 0x0131, 0x4e3: 0x013d,
+	0x4e4: 0x0146, 0x4e5: 0x0149, 0x4e6: 0x014c, 0x4e7: 0x051e, 0x4e8: 0x01c7, 0x4e9: 0x0155,
+	0x4ea: 0x0522, 0x4eb: 0x01ca, 0x4ec: 0x0161, 0x4ed: 0x015e, 0x4ee: 0x0164, 0x4ef: 0x0167,
+	0x4f0: 0x016a, 0x4f1: 0x016d, 0x4f2: 0x0176, 0x4f3: 0x018e, 0x4f4: 0x0191, 0x4f5: 0x00f2,
+	0x4f6: 0x019a, 0x4f7: 0x019d, 0x4f8: 0x0512, 0x4f9: 0x01a0, 0x4fa: 0x01a3, 0x4fb: 0x00b5,
+	0x4fc: 0x01af, 0x4fd: 0x01b2, 0x4fe: 0x01b5, 0x4ff: 0x0254,
+	// Block 0x14, offset 0x500
+	0x500: 0x8133, 0x501: 0x8133, 0x502: 0x812e, 0x503: 0x8133, 0x504: 0x8133, 0x505: 0x8133,
+	0x506: 0x8133, 0x507: 0x8133, 0x508: 0x8133, 0x509: 0x8133, 0x50a: 0x812e, 0x50b: 0x8133,
+	0x50c: 0x8133, 0x50d: 0x8136, 0x50e: 0x812b, 0x50f: 0x812e, 0x510: 0x812a, 0x511: 0x8133,
+	0x512: 0x8133, 0x513: 0x8133, 0x514: 0x8133, 0x515: 0x8133, 0x516: 0x8133, 0x517: 0x8133,
+	0x518: 0x8133, 0x519: 0x8133, 0x51a: 0x8133, 0x51b: 0x8133, 0x51c: 0x8133, 0x51d: 0x8133,
+	0x51e: 0x8133, 0x51f: 0x8133, 0x520: 0x8133, 0x521: 0x8133, 0x522: 0x8133, 0x523: 0x8133,
+	0x524: 0x8133, 0x525: 0x8133, 0x526: 0x8133, 0x527: 0x8133, 0x528: 0x8133, 0x529: 0x8133,
+	0x52a: 0x8133, 0x52b: 0x8133, 0x52c: 0x8133, 0x52d: 0x8133, 0x52e: 0x8133, 0x52f: 0x8133,
+	0x530: 0x8133, 0x531: 0x8133, 0x532: 0x8133, 0x533: 0x8133, 0x534: 0x8133, 0x535: 0x8133,
+	0x536: 0x8134, 0x537: 0x8132, 0x538: 0x8132, 0x539: 0x812e, 0x53a: 0x812d, 0x53b: 0x8133,
+	0x53c: 0x8135, 0x53d: 0x812e, 0x53e: 0x8133, 0x53f: 0x812e,
+	// Block 0x15, offset 0x540
+	0x540: 0x30d8, 0x541: 0x33e4, 0x542: 0x30e2, 0x543: 0x33ee, 0x544: 0x30e7, 0x545: 0x33f3,
+	0x546: 0x30ec, 0x547: 0x33f8, 0x548: 0x3a0d, 0x549: 0x3b9c, 0x54a: 0x3105, 0x54b: 0x3411,
+	0x54c: 0x310f, 0x54d: 0x341b, 0x54e: 0x311e, 0x54f: 0x342a, 0x550: 0x3114, 0x551: 0x3420,
+	0x552: 0x3119, 0x553: 0x3425, 0x554: 0x3a30, 0x555: 0x3bbf, 0x556: 0x3a37, 0x557: 0x3bc6,
+	0x558: 0x315a, 0x559: 0x3466, 0x55a: 0x315f, 0x55b: 0x346b, 0x55c: 0x3a45, 0x55d: 0x3bd4,
+	0x55e: 0x3164, 0x55f: 0x3470, 0x560: 0x3173, 0x561: 0x347f, 0x562: 0x3191, 0x563: 0x349d,
+	0x564: 0x31a0, 0x565: 0x34ac, 0x566: 0x3196, 0x567: 0x34a2, 0x568: 0x31a5, 0x569: 0x34b1,
+	0x56a: 0x31aa, 0x56b: 0x34b6, 0x56c: 0x31f0, 0x56d: 0x34fc, 0x56e: 0x3a4c, 0x56f: 0x3bdb,
+	0x570: 0x31fa, 0x571: 0x350b, 0x572: 0x3204, 0x573: 0x3515, 0x574: 0x320e, 0x575: 0x351f,
+	0x576: 0x4805, 0x577: 0x4896, 0x578: 0x3a53, 0x579: 0x3be2, 0x57a: 0x3227, 0x57b: 0x3538,
+	0x57c: 0x3222, 0x57d: 0x3533, 0x57e: 0x322c, 0x57f: 0x353d,
+	// Block 0x16, offset 0x580
+	0x580: 0x3231, 0x581: 0x3542, 0x582: 0x3236, 0x583: 0x3547, 0x584: 0x324a, 0x585: 0x355b,
+	0x586: 0x3254, 0x587: 0x3565, 0x588: 0x3263, 0x589: 0x3574, 0x58a: 0x325e, 0x58b: 0x356f,
+	0x58c: 0x3a76, 0x58d: 0x3c05, 0x58e: 0x3a84, 0x58f: 0x3c13, 0x590: 0x3a8b, 0x591: 0x3c1a,
+	0x592: 0x3a92, 0x593: 0x3c21, 0x594: 0x3290, 0x595: 0x35a1, 0x596: 0x3295, 0x597: 0x35a6,
+	0x598: 0x329f, 0x599: 0x35b0, 0x59a: 0x4832, 0x59b: 0x48c3, 0x59c: 0x3ad8, 0x59d: 0x3c67,
+	0x59e: 0x32b8, 0x59f: 0x35c9, 0x5a0: 0x32c2, 0x5a1: 0x35d3, 0x5a2: 0x4841, 0x5a3: 0x48d2,
+	0x5a4: 0x3adf, 0x5a5: 0x3c6e, 0x5a6: 0x3ae6, 0x5a7: 0x3c75, 0x5a8: 0x3aed, 0x5a9: 0x3c7c,
+	0x5aa: 0x32d1, 0x5ab: 0x35e2, 0x5ac: 0x32db, 0x5ad: 0x35f1, 0x5ae: 0x32ef, 0x5af: 0x3605,
+	0x5b0: 0x32ea, 0x5b1: 0x3600, 0x5b2: 0x332b, 0x5b3: 0x3641, 0x5b4: 0x333a, 0x5b5: 0x3650,
+	0x5b6: 0x3335, 0x5b7: 0x364b, 0x5b8: 0x3af4, 0x5b9: 0x3c83, 0x5ba: 0x3afb, 0x5bb: 0x3c8a,
+	0x5bc: 0x333f, 0x5bd: 0x3655, 0x5be: 0x3344, 0x5bf: 0x365a,
+	// Block 0x17, offset 0x5c0
+	0x5c0: 0x3349, 0x5c1: 0x365f, 0x5c2: 0x334e, 0x5c3: 0x3664, 0x5c4: 0x335d, 0x5c5: 0x3673,
+	0x5c6: 0x3358, 0x5c7: 0x366e, 0x5c8: 0x3362, 0x5c9: 0x367d, 0x5ca: 0x3367, 0x5cb: 0x3682,
+	0x5cc: 0x336c, 0x5cd: 0x3687, 0x5ce: 0x338a, 0x5cf: 0x36a5, 0x5d0: 0x33a3, 0x5d1: 0x36c3,
+	0x5d2: 0x33b2, 0x5d3: 0x36d2, 0x5d4: 0x33b7, 0x5d5: 0x36d7, 0x5d6: 0x34bb, 0x5d7: 0x35e7,
+	0x5d8: 0x3678, 0x5d9: 0x36b4, 0x5da: 0x1d10, 0x5db: 0x4418,
+	0x5e0: 0x47e2, 0x5e1: 0x4873, 0x5e2: 0x30c4, 0x5e3: 0x33d0,
+	0x5e4: 0x39b9, 0x5e5: 0x3b48, 0x5e6: 0x39b2, 0x5e7: 0x3b41, 0x5e8: 0x39c7, 0x5e9: 0x3b56,
+	0x5ea: 0x39c0, 0x5eb: 0x3b4f, 0x5ec: 0x39ff, 0x5ed: 0x3b8e, 0x5ee: 0x39d5, 0x5ef: 0x3b64,
+	0x5f0: 0x39ce, 0x5f1: 0x3b5d, 0x5f2: 0x39e3, 0x5f3: 0x3b72, 0x5f4: 0x39dc, 0x5f5: 0x3b6b,
+	0x5f6: 0x3a06, 0x5f7: 0x3b95, 0x5f8: 0x47f6, 0x5f9: 0x4887, 0x5fa: 0x3141, 0x5fb: 0x344d,
+	0x5fc: 0x312d, 0x5fd: 0x3439, 0x5fe: 0x3a1b, 0x5ff: 0x3baa,
+	// Block 0x18, offset 0x600
+	0x600: 0x3a14, 0x601: 0x3ba3, 0x602: 0x3a29, 0x603: 0x3bb8, 0x604: 0x3a22, 0x605: 0x3bb1,
+	0x606: 0x3a3e, 0x607: 0x3bcd, 0x608: 0x31d2, 0x609: 0x34de, 0x60a: 0x31e6, 0x60b: 0x34f2,
+	0x60c: 0x4828, 0x60d: 0x48b9, 0x60e: 0x3277, 0x60f: 0x3588, 0x610: 0x3a61, 0x611: 0x3bf0,
+	0x612: 0x3a5a, 0x613: 0x3be9, 0x614: 0x3a6f, 0x615: 0x3bfe, 0x616: 0x3a68, 0x617: 0x3bf7,
+	0x618: 0x3aca, 0x619: 0x3c59, 0x61a: 0x3aae, 0x61b: 0x3c3d, 0x61c: 0x3aa7, 0x61d: 0x3c36,
+	0x61e: 0x3abc, 0x61f: 0x3c4b, 0x620: 0x3ab5, 0x621: 0x3c44, 0x622: 0x3ac3, 0x623: 0x3c52,
+	0x624: 0x3326, 0x625: 0x363c, 0x626: 0x3308, 0x627: 0x361e, 0x628: 0x3b25, 0x629: 0x3cb4,
+	0x62a: 0x3b1e, 0x62b: 0x3cad, 0x62c: 0x3b33, 0x62d: 0x3cc2, 0x62e: 0x3b2c, 0x62f: 0x3cbb,
+	0x630: 0x3b3a, 0x631: 0x3cc9, 0x632: 0x3371, 0x633: 0x368c, 0x634: 0x3399, 0x635: 0x36b9,
+	0x636: 0x3394, 0x637: 0x36af, 0x638: 0x3380, 0x639: 0x369b,
+	// Block 0x19, offset 0x640
+	0x640: 0x4945, 0x641: 0x494b, 0x642: 0x4a5f, 0x643: 0x4a77, 0x644: 0x4a67, 0x645: 0x4a7f,
+	0x646: 0x4a6f, 0x647: 0x4a87, 0x648: 0x48eb, 0x649: 0x48f1, 0x64a: 0x49cf, 0x64b: 0x49e7,
+	0x64c: 0x49d7, 0x64d: 0x49ef, 0x64e: 0x49df, 0x64f: 0x49f7, 0x650: 0x4957, 0x651: 0x495d,
+	0x652: 0x3ef9, 0x653: 0x3f09, 0x654: 0x3f01, 0x655: 0x3f11,
+	0x658: 0x48f7, 0x659: 0x48fd, 0x65a: 0x3e29, 0x65b: 0x3e39, 0x65c: 0x3e31, 0x65d: 0x3e41,
+	0x660: 0x496f, 0x661: 0x4975, 0x662: 0x4a8f, 0x663: 0x4aa7,
+	0x664: 0x4a97, 0x665: 0x4aaf, 0x666: 0x4a9f, 0x667: 0x4ab7, 0x668: 0x4903, 0x669: 0x4909,
+	0x66a: 0x49ff, 0x66b: 0x4a17, 0x66c: 0x4a07, 0x66d: 0x4a1f, 0x66e: 0x4a0f, 0x66f: 0x4a27,
+	0x670: 0x4987, 0x671: 0x498d, 0x672: 0x3f59, 0x673: 0x3f71, 0x674: 0x3f61, 0x675: 0x3f79,
+	0x676: 0x3f69, 0x677: 0x3f81, 0x678: 0x490f, 0x679: 0x4915, 0x67a: 0x3e59, 0x67b: 0x3e71,
+	0x67c: 0x3e61, 0x67d: 0x3e79, 0x67e: 0x3e69, 0x67f: 0x3e81,
+	// Block 0x1a, offset 0x680
+	0x680: 0x4993, 0x681: 0x4999, 0x682: 0x3f89, 0x683: 0x3f99, 0x684: 0x3f91, 0x685: 0x3fa1,
+	0x688: 0x491b, 0x689: 0x4921, 0x68a: 0x3e89, 0x68b: 0x3e99,
+	0x68c: 0x3e91, 0x68d: 0x3ea1, 0x690: 0x49a5, 0x691: 0x49ab,
+	0x692: 0x3fc1, 0x693: 0x3fd9, 0x694: 0x3fc9, 0x695: 0x3fe1, 0x696: 0x3fd1, 0x697: 0x3fe9,
+	0x699: 0x4927, 0x69b: 0x3ea9, 0x69d: 0x3eb1,
+	0x69f: 0x3eb9, 0x6a0: 0x49bd, 0x6a1: 0x49c3, 0x6a2: 0x4abf, 0x6a3: 0x4ad7,
+	0x6a4: 0x4ac7, 0x6a5: 0x4adf, 0x6a6: 0x4acf, 0x6a7: 0x4ae7, 0x6a8: 0x492d, 0x6a9: 0x4933,
+	0x6aa: 0x4a2f, 0x6ab: 0x4a47, 0x6ac: 0x4a37, 0x6ad: 0x4a4f, 0x6ae: 0x4a3f, 0x6af: 0x4a57,
+	0x6b0: 0x4939, 0x6b1: 0x445f, 0x6b2: 0x37d2, 0x6b3: 0x4465, 0x6b4: 0x4963, 0x6b5: 0x446b,
+	0x6b6: 0x37e4, 0x6b7: 0x4471, 0x6b8: 0x3802, 0x6b9: 0x4477, 0x6ba: 0x381a, 0x6bb: 0x447d,
+	0x6bc: 0x49b1, 0x6bd: 0x4483,
+	// Block 0x1b, offset 0x6c0
+	0x6c0: 0x3ee1, 0x6c1: 0x3ee9, 0x6c2: 0x42c5, 0x6c3: 0x42e3, 0x6c4: 0x42cf, 0x6c5: 0x42ed,
+	0x6c6: 0x42d9, 0x6c7: 0x42f7, 0x6c8: 0x3e19, 0x6c9: 0x3e21, 0x6ca: 0x4211, 0x6cb: 0x422f,
+	0x6cc: 0x421b, 0x6cd: 0x4239, 0x6ce: 0x4225, 0x6cf: 0x4243, 0x6d0: 0x3f29, 0x6d1: 0x3f31,
+	0x6d2: 0x4301, 0x6d3: 0x431f, 0x6d4: 0x430b, 0x6d5: 0x4329, 0x6d6: 0x4315, 0x6d7: 0x4333,
+	0x6d8: 0x3e49, 0x6d9: 0x3e51, 0x6da: 0x424d, 0x6db: 0x426b, 0x6dc: 0x4257, 0x6dd: 0x4275,
+	0x6de: 0x4261, 0x6df: 0x427f, 0x6e0: 0x4001, 0x6e1: 0x4009, 0x6e2: 0x433d, 0x6e3: 0x435b,
+	0x6e4: 0x4347, 0x6e5: 0x4365, 0x6e6: 0x4351, 0x6e7: 0x436f, 0x6e8: 0x3ec1, 0x6e9: 0x3ec9,
+	0x6ea: 0x4289, 0x6eb: 0x42a7, 0x6ec: 0x4293, 0x6ed: 0x42b1, 0x6ee: 0x429d, 0x6ef: 0x42bb,
+	0x6f0: 0x37c6, 0x6f1: 0x37c0, 0x6f2: 0x3ed1, 0x6f3: 0x37cc, 0x6f4: 0x3ed9,
+	0x6f6: 0x4951, 0x6f7: 0x3ef1, 0x6f8: 0x3736, 0x6f9: 0x3730, 0x6fa: 0x3724, 0x6fb: 0x442f,
+	0x6fc: 0x373c, 0x6fd: 0x43c8, 0x6fe: 0x0257, 0x6ff: 0x43c8,
+	// Block 0x1c, offset 0x700
+	0x700: 0x43e1, 0x701: 0x45c3, 0x702: 0x3f19, 0x703: 0x37de, 0x704: 0x3f21,
+	0x706: 0x497b, 0x707: 0x3f39, 0x708: 0x3742, 0x709: 0x4435, 0x70a: 0x374e, 0x70b: 0x443b,
+	0x70c: 0x375a, 0x70d: 0x45ca, 0x70e: 0x45d1, 0x70f: 0x45d8, 0x710: 0x37f6, 0x711: 0x37f0,
+	0x712: 0x3f41, 0x713: 0x4625, 0x716: 0x37fc, 0x717: 0x3f51,
+	0x718: 0x3772, 0x719: 0x376c, 0x71a: 0x3760, 0x71b: 0x4441, 0x71d: 0x45df,
+	0x71e: 0x45e6, 0x71f: 0x45ed, 0x720: 0x382c, 0x721: 0x3826, 0x722: 0x3fa9, 0x723: 0x462d,
+	0x724: 0x380e, 0x725: 0x3814, 0x726: 0x3832, 0x727: 0x3fb9, 0x728: 0x37a2, 0x729: 0x379c,
+	0x72a: 0x3790, 0x72b: 0x444d, 0x72c: 0x378a, 0x72d: 0x45b5, 0x72e: 0x45bc, 0x72f: 0x0081,
+	0x732: 0x3ff1, 0x733: 0x3838, 0x734: 0x3ff9,
+	0x736: 0x49c9, 0x737: 0x4011, 0x738: 0x377e, 0x739: 0x4447, 0x73a: 0x37ae, 0x73b: 0x4459,
+	0x73c: 0x37ba, 0x73d: 0x439b, 0x73e: 0x43cd,
+	// Block 0x1d, offset 0x740
+	0x740: 0x1d08, 0x741: 0x1d0c, 0x742: 0x0047, 0x743: 0x1d84, 0x745: 0x1d18,
+	0x746: 0x1d1c, 0x747: 0x00ef, 0x749: 0x1d88, 0x74a: 0x008f, 0x74b: 0x0051,
+	0x74c: 0x0051, 0x74d: 0x0051, 0x74e: 0x0091, 0x74f: 0x00e0, 0x750: 0x0053, 0x751: 0x0053,
+	0x752: 0x0059, 0x753: 0x0099, 0x755: 0x005d, 0x756: 0x1abd,
+	0x759: 0x0061, 0x75a: 0x0063, 0x75b: 0x0065, 0x75c: 0x0065, 0x75d: 0x0065,
+	0x760: 0x1acf, 0x761: 0x1cf8, 0x762: 0x1ad8,
+	0x764: 0x0075, 0x766: 0x023c, 0x768: 0x0075,
+	0x76a: 0x0057, 0x76b: 0x4413, 0x76c: 0x0045, 0x76d: 0x0047, 0x76f: 0x008b,
+	0x770: 0x004b, 0x771: 0x004d, 0x773: 0x005b, 0x774: 0x009f, 0x775: 0x0308,
+	0x776: 0x030b, 0x777: 0x030e, 0x778: 0x0311, 0x779: 0x0093, 0x77b: 0x1cc8,
+	0x77c: 0x026c, 0x77d: 0x0245, 0x77e: 0x01fd, 0x77f: 0x0224,
+	// Block 0x1e, offset 0x780
+	0x780: 0x055a, 0x785: 0x0049,
+	0x786: 0x0089, 0x787: 0x008b, 0x788: 0x0093, 0x789: 0x0095,
+	0x790: 0x235e, 0x791: 0x236a,
+	0x792: 0x241e, 0x793: 0x2346, 0x794: 0x23ca, 0x795: 0x2352, 0x796: 0x23d0, 0x797: 0x23e8,
+	0x798: 0x23f4, 0x799: 0x2358, 0x79a: 0x23fa, 0x79b: 0x2364, 0x79c: 0x23ee, 0x79d: 0x2400,
+	0x79e: 0x2406, 0x79f: 0x1dec, 0x7a0: 0x0053, 0x7a1: 0x1a87, 0x7a2: 0x1cd4, 0x7a3: 0x1a90,
+	0x7a4: 0x006d, 0x7a5: 0x1adb, 0x7a6: 0x1d00, 0x7a7: 0x1e78, 0x7a8: 0x1a93, 0x7a9: 0x0071,
+	0x7aa: 0x1ae7, 0x7ab: 0x1d04, 0x7ac: 0x0059, 0x7ad: 0x0047, 0x7ae: 0x0049, 0x7af: 0x005b,
+	0x7b0: 0x0093, 0x7b1: 0x1b14, 0x7b2: 0x1d48, 0x7b3: 0x1b1d, 0x7b4: 0x00ad, 0x7b5: 0x1b92,
+	0x7b6: 0x1d7c, 0x7b7: 0x1e8c, 0x7b8: 0x1b20, 0x7b9: 0x00b1, 0x7ba: 0x1b95, 0x7bb: 0x1d80,
+	0x7bc: 0x0099, 0x7bd: 0x0087, 0x7be: 0x0089, 0x7bf: 0x009b,
+	// Block 0x1f, offset 0x7c0
+	0x7c1: 0x3d47, 0x7c3: 0xa000, 0x7c4: 0x3d4e, 0x7c5: 0xa000,
+	0x7c7: 0x3d55, 0x7c8: 0xa000, 0x7c9: 0x3d5c,
+	0x7cd: 0xa000,
+	0x7e0: 0x30a6, 0x7e1: 0xa000, 0x7e2: 0x3d6a,
+	0x7e4: 0xa000, 0x7e5: 0xa000,
+	0x7ed: 0x3d63, 0x7ee: 0x30a1, 0x7ef: 0x30ab,
+	0x7f0: 0x3d71, 0x7f1: 0x3d78, 0x7f2: 0xa000, 0x7f3: 0xa000, 0x7f4: 0x3d7f, 0x7f5: 0x3d86,
+	0x7f6: 0xa000, 0x7f7: 0xa000, 0x7f8: 0x3d8d, 0x7f9: 0x3d94, 0x7fa: 0xa000, 0x7fb: 0xa000,
+	0x7fc: 0xa000, 0x7fd: 0xa000,
+	// Block 0x20, offset 0x800
+	0x800: 0x3d9b, 0x801: 0x3da2, 0x802: 0xa000, 0x803: 0xa000, 0x804: 0x3db7, 0x805: 0x3dbe,
+	0x806: 0xa000, 0x807: 0xa000, 0x808: 0x3dc5, 0x809: 0x3dcc,
+	0x811: 0xa000,
+	0x812: 0xa000,
+	0x822: 0xa000,
+	0x828: 0xa000, 0x829: 0xa000,
+	0x82b: 0xa000, 0x82c: 0x3de1, 0x82d: 0x3de8, 0x82e: 0x3def, 0x82f: 0x3df6,
+	0x832: 0xa000, 0x833: 0xa000, 0x834: 0xa000, 0x835: 0xa000,
+	// Block 0x21, offset 0x840
+	0x860: 0x0023, 0x861: 0x0025, 0x862: 0x0027, 0x863: 0x0029,
+	0x864: 0x002b, 0x865: 0x002d, 0x866: 0x002f, 0x867: 0x0031, 0x868: 0x0033, 0x869: 0x19af,
+	0x86a: 0x19b2, 0x86b: 0x19b5, 0x86c: 0x19b8, 0x86d: 0x19bb, 0x86e: 0x19be, 0x86f: 0x19c1,
+	0x870: 0x19c4, 0x871: 0x19c7, 0x872: 0x19ca, 0x873: 0x19d3, 0x874: 0x1b98, 0x875: 0x1b9c,
+	0x876: 0x1ba0, 0x877: 0x1ba4, 0x878: 0x1ba8, 0x879: 0x1bac, 0x87a: 0x1bb0, 0x87b: 0x1bb4,
+	0x87c: 0x1bb8, 0x87d: 0x1db0, 0x87e: 0x1db5, 0x87f: 0x1dba,
+	// Block 0x22, offset 0x880
+	0x880: 0x1dbf, 0x881: 0x1dc4, 0x882: 0x1dc9, 0x883: 0x1dce, 0x884: 0x1dd3, 0x885: 0x1dd8,
+	0x886: 0x1ddd, 0x887: 0x1de2, 0x888: 0x19ac, 0x889: 0x19d0, 0x88a: 0x19f4, 0x88b: 0x1a18,
+	0x88c: 0x1a3c, 0x88d: 0x1a45, 0x88e: 0x1a4b, 0x88f: 0x1a51, 0x890: 0x1a57, 0x891: 0x1c90,
+	0x892: 0x1c94, 0x893: 0x1c98, 0x894: 0x1c9c, 0x895: 0x1ca0, 0x896: 0x1ca4, 0x897: 0x1ca8,
+	0x898: 0x1cac, 0x899: 0x1cb0, 0x89a: 0x1cb4, 0x89b: 0x1cb8, 0x89c: 0x1c24, 0x89d: 0x1c28,
+	0x89e: 0x1c2c, 0x89f: 0x1c30, 0x8a0: 0x1c34, 0x8a1: 0x1c38, 0x8a2: 0x1c3c, 0x8a3: 0x1c40,
+	0x8a4: 0x1c44, 0x8a5: 0x1c48, 0x8a6: 0x1c4c, 0x8a7: 0x1c50, 0x8a8: 0x1c54, 0x8a9: 0x1c58,
+	0x8aa: 0x1c5c, 0x8ab: 0x1c60, 0x8ac: 0x1c64, 0x8ad: 0x1c68, 0x8ae: 0x1c6c, 0x8af: 0x1c70,
+	0x8b0: 0x1c74, 0x8b1: 0x1c78, 0x8b2: 0x1c7c, 0x8b3: 0x1c80, 0x8b4: 0x1c84, 0x8b5: 0x1c88,
+	0x8b6: 0x0043, 0x8b7: 0x0045, 0x8b8: 0x0047, 0x8b9: 0x0049, 0x8ba: 0x004b, 0x8bb: 0x004d,
+	0x8bc: 0x004f, 0x8bd: 0x0051, 0x8be: 0x0053, 0x8bf: 0x0055,
+	// Block 0x23, offset 0x8c0
+	0x8c0: 0x07ba, 0x8c1: 0x07de, 0x8c2: 0x07ea, 0x8c3: 0x07fa, 0x8c4: 0x0802, 0x8c5: 0x080e,
+	0x8c6: 0x0816, 0x8c7: 0x081e, 0x8c8: 0x082a, 0x8c9: 0x087e, 0x8ca: 0x0896, 0x8cb: 0x08a6,
+	0x8cc: 0x08b6, 0x8cd: 0x08c6, 0x8ce: 0x08d6, 0x8cf: 0x08f6, 0x8d0: 0x08fa, 0x8d1: 0x08fe,
+	0x8d2: 0x0932, 0x8d3: 0x095a, 0x8d4: 0x096a, 0x8d5: 0x0972, 0x8d6: 0x0976, 0x8d7: 0x0982,
+	0x8d8: 0x099e, 0x8d9: 0x09a2, 0x8da: 0x09ba, 0x8db: 0x09be, 0x8dc: 0x09c6, 0x8dd: 0x09d6,
+	0x8de: 0x0a72, 0x8df: 0x0a86, 0x8e0: 0x0ac6, 0x8e1: 0x0ada, 0x8e2: 0x0ae2, 0x8e3: 0x0ae6,
+	0x8e4: 0x0af6, 0x8e5: 0x0b12, 0x8e6: 0x0b3e, 0x8e7: 0x0b4a, 0x8e8: 0x0b6a, 0x8e9: 0x0b76,
+	0x8ea: 0x0b7a, 0x8eb: 0x0b7e, 0x8ec: 0x0b96, 0x8ed: 0x0b9a, 0x8ee: 0x0bc6, 0x8ef: 0x0bd2,
+	0x8f0: 0x0bda, 0x8f1: 0x0be2, 0x8f2: 0x0bf2, 0x8f3: 0x0bfa, 0x8f4: 0x0c02, 0x8f5: 0x0c2e,
+	0x8f6: 0x0c32, 0x8f7: 0x0c3a, 0x8f8: 0x0c3e, 0x8f9: 0x0c46, 0x8fa: 0x0c4e, 0x8fb: 0x0c5e,
+	0x8fc: 0x0c7a, 0x8fd: 0x0cf2, 0x8fe: 0x0d06, 0x8ff: 0x0d0a,
+	// Block 0x24, offset 0x900
+	0x900: 0x0d8a, 0x901: 0x0d8e, 0x902: 0x0da2, 0x903: 0x0da6, 0x904: 0x0dae, 0x905: 0x0db6,
+	0x906: 0x0dbe, 0x907: 0x0dca, 0x908: 0x0df2, 0x909: 0x0e02, 0x90a: 0x0e16, 0x90b: 0x0e86,
+	0x90c: 0x0e92, 0x90d: 0x0ea2, 0x90e: 0x0eae, 0x90f: 0x0eba, 0x910: 0x0ec2, 0x911: 0x0ec6,
+	0x912: 0x0eca, 0x913: 0x0ece, 0x914: 0x0ed2, 0x915: 0x0f8a, 0x916: 0x0fd2, 0x917: 0x0fde,
+	0x918: 0x0fe2, 0x919: 0x0fe6, 0x91a: 0x0fea, 0x91b: 0x0ff2, 0x91c: 0x0ff6, 0x91d: 0x100a,
+	0x91e: 0x1026, 0x91f: 0x102e, 0x920: 0x106e, 0x921: 0x1072, 0x922: 0x107a, 0x923: 0x107e,
+	0x924: 0x1086, 0x925: 0x108a, 0x926: 0x10ae, 0x927: 0x10b2, 0x928: 0x10ce, 0x929: 0x10d2,
+	0x92a: 0x10d6, 0x92b: 0x10da, 0x92c: 0x10ee, 0x92d: 0x1112, 0x92e: 0x1116, 0x92f: 0x111a,
+	0x930: 0x113e, 0x931: 0x117e, 0x932: 0x1182, 0x933: 0x11a2, 0x934: 0x11b2, 0x935: 0x11ba,
+	0x936: 0x11da, 0x937: 0x11fe, 0x938: 0x1242, 0x939: 0x124a, 0x93a: 0x125e, 0x93b: 0x126a,
+	0x93c: 0x1272, 0x93d: 0x127a, 0x93e: 0x127e, 0x93f: 0x1282,
+	// Block 0x25, offset 0x940
+	0x940: 0x129a, 0x941: 0x129e, 0x942: 0x12ba, 0x943: 0x12c2, 0x944: 0x12ca, 0x945: 0x12ce,
+	0x946: 0x12da, 0x947: 0x12e2, 0x948: 0x12e6, 0x949: 0x12ea, 0x94a: 0x12f2, 0x94b: 0x12f6,
+	0x94c: 0x1396, 0x94d: 0x13aa, 0x94e: 0x13de, 0x94f: 0x13e2, 0x950: 0x13ea, 0x951: 0x1416,
+	0x952: 0x141e, 0x953: 0x1426, 0x954: 0x142e, 0x955: 0x146a, 0x956: 0x146e, 0x957: 0x1476,
+	0x958: 0x147a, 0x959: 0x147e, 0x95a: 0x14aa, 0x95b: 0x14ae, 0x95c: 0x14b6, 0x95d: 0x14ca,
+	0x95e: 0x14ce, 0x95f: 0x14ea, 0x960: 0x14f2, 0x961: 0x14f6, 0x962: 0x151a, 0x963: 0x153a,
+	0x964: 0x154e, 0x965: 0x1552, 0x966: 0x155a, 0x967: 0x1586, 0x968: 0x158a, 0x969: 0x159a,
+	0x96a: 0x15be, 0x96b: 0x15ca, 0x96c: 0x15da, 0x96d: 0x15f2, 0x96e: 0x15fa, 0x96f: 0x15fe,
+	0x970: 0x1602, 0x971: 0x1606, 0x972: 0x1612, 0x973: 0x1616, 0x974: 0x161e, 0x975: 0x163a,
+	0x976: 0x163e, 0x977: 0x1642, 0x978: 0x165a, 0x979: 0x165e, 0x97a: 0x1666, 0x97b: 0x167a,
+	0x97c: 0x167e, 0x97d: 0x1682, 0x97e: 0x168a, 0x97f: 0x168e,
+	// Block 0x26, offset 0x980
+	0x986: 0xa000, 0x98b: 0xa000,
+	0x98c: 0x4049, 0x98d: 0xa000, 0x98e: 0x4051, 0x98f: 0xa000, 0x990: 0x4059, 0x991: 0xa000,
+	0x992: 0x4061, 0x993: 0xa000, 0x994: 0x4069, 0x995: 0xa000, 0x996: 0x4071, 0x997: 0xa000,
+	0x998: 0x4079, 0x999: 0xa000, 0x99a: 0x4081, 0x99b: 0xa000, 0x99c: 0x4089, 0x99d: 0xa000,
+	0x99e: 0x4091, 0x99f: 0xa000, 0x9a0: 0x4099, 0x9a1: 0xa000, 0x9a2: 0x40a1,
+	0x9a4: 0xa000, 0x9a5: 0x40a9, 0x9a6: 0xa000, 0x9a7: 0x40b1, 0x9a8: 0xa000, 0x9a9: 0x40b9,
+	0x9af: 0xa000,
+	0x9b0: 0x40c1, 0x9b1: 0x40c9, 0x9b2: 0xa000, 0x9b3: 0x40d1, 0x9b4: 0x40d9, 0x9b5: 0xa000,
+	0x9b6: 0x40e1, 0x9b7: 0x40e9, 0x9b8: 0xa000, 0x9b9: 0x40f1, 0x9ba: 0x40f9, 0x9bb: 0xa000,
+	0x9bc: 0x4101, 0x9bd: 0x4109,
+	// Block 0x27, offset 0x9c0
+	0x9d4: 0x4041,
+	0x9d9: 0x9904, 0x9da: 0x9904, 0x9db: 0x441d, 0x9dc: 0x4423, 0x9dd: 0xa000,
+	0x9de: 0x4111, 0x9df: 0x27e4,
+	0x9e6: 0xa000,
+	0x9eb: 0xa000, 0x9ec: 0x4121, 0x9ed: 0xa000, 0x9ee: 0x4129, 0x9ef: 0xa000,
+	0x9f0: 0x4131, 0x9f1: 0xa000, 0x9f2: 0x4139, 0x9f3: 0xa000, 0x9f4: 0x4141, 0x9f5: 0xa000,
+	0x9f6: 0x4149, 0x9f7: 0xa000, 0x9f8: 0x4151, 0x9f9: 0xa000, 0x9fa: 0x4159, 0x9fb: 0xa000,
+	0x9fc: 0x4161, 0x9fd: 0xa000, 0x9fe: 0x4169, 0x9ff: 0xa000,
+	// Block 0x28, offset 0xa00
+	0xa00: 0x4171, 0xa01: 0xa000, 0xa02: 0x4179, 0xa04: 0xa000, 0xa05: 0x4181,
+	0xa06: 0xa000, 0xa07: 0x4189, 0xa08: 0xa000, 0xa09: 0x4191,
+	0xa0f: 0xa000, 0xa10: 0x4199, 0xa11: 0x41a1,
+	0xa12: 0xa000, 0xa13: 0x41a9, 0xa14: 0x41b1, 0xa15: 0xa000, 0xa16: 0x41b9, 0xa17: 0x41c1,
+	0xa18: 0xa000, 0xa19: 0x41c9, 0xa1a: 0x41d1, 0xa1b: 0xa000, 0xa1c: 0x41d9, 0xa1d: 0x41e1,
+	0xa2f: 0xa000,
+	0xa30: 0xa000, 0xa31: 0xa000, 0xa32: 0xa000, 0xa34: 0x4119,
+	0xa37: 0x41e9, 0xa38: 0x41f1, 0xa39: 0x41f9, 0xa3a: 0x4201,
+	0xa3d: 0xa000, 0xa3e: 0x4209, 0xa3f: 0x27f9,
+	// Block 0x29, offset 0xa40
+	0xa40: 0x045a, 0xa41: 0x041e, 0xa42: 0x0422, 0xa43: 0x0426, 0xa44: 0x046e, 0xa45: 0x042a,
+	0xa46: 0x042e, 0xa47: 0x0432, 0xa48: 0x0436, 0xa49: 0x043a, 0xa4a: 0x043e, 0xa4b: 0x0442,
+	0xa4c: 0x0446, 0xa4d: 0x044a, 0xa4e: 0x044e, 0xa4f: 0x4afe, 0xa50: 0x4b04, 0xa51: 0x4b0a,
+	0xa52: 0x4b10, 0xa53: 0x4b16, 0xa54: 0x4b1c, 0xa55: 0x4b22, 0xa56: 0x4b28, 0xa57: 0x4b2e,
+	0xa58: 0x4b34, 0xa59: 0x4b3a, 0xa5a: 0x4b40, 0xa5b: 0x4b46, 0xa5c: 0x4b4c, 0xa5d: 0x4b52,
+	0xa5e: 0x4b58, 0xa5f: 0x4b5e, 0xa60: 0x4b64, 0xa61: 0x4b6a, 0xa62: 0x4b70, 0xa63: 0x4b76,
+	0xa64: 0x04b6, 0xa65: 0x0452, 0xa66: 0x0456, 0xa67: 0x04da, 0xa68: 0x04de, 0xa69: 0x04e2,
+	0xa6a: 0x04e6, 0xa6b: 0x04ea, 0xa6c: 0x04ee, 0xa6d: 0x04f2, 0xa6e: 0x045e, 0xa6f: 0x04f6,
+	0xa70: 0x04fa, 0xa71: 0x0462, 0xa72: 0x0466, 0xa73: 0x046a, 0xa74: 0x0472, 0xa75: 0x0476,
+	0xa76: 0x047a, 0xa77: 0x047e, 0xa78: 0x0482, 0xa79: 0x0486, 0xa7a: 0x048a, 0xa7b: 0x048e,
+	0xa7c: 0x0492, 0xa7d: 0x0496, 0xa7e: 0x049a, 0xa7f: 0x049e,
+	// Block 0x2a, offset 0xa80
+	0xa80: 0x04a2, 0xa81: 0x04a6, 0xa82: 0x04fe, 0xa83: 0x0502, 0xa84: 0x04aa, 0xa85: 0x04ae,
+	0xa86: 0x04b2, 0xa87: 0x04ba, 0xa88: 0x04be, 0xa89: 0x04c2, 0xa8a: 0x04c6, 0xa8b: 0x04ca,
+	0xa8c: 0x04ce, 0xa8d: 0x04d2, 0xa8e: 0x04d6,
+	0xa92: 0x07ba, 0xa93: 0x0816, 0xa94: 0x07c6, 0xa95: 0x0a76, 0xa96: 0x07ca, 0xa97: 0x07e2,
+	0xa98: 0x07ce, 0xa99: 0x108e, 0xa9a: 0x0802, 0xa9b: 0x07d6, 0xa9c: 0x07be, 0xa9d: 0x0afa,
+	0xa9e: 0x0a8a, 0xa9f: 0x082a,
+	// Block 0x2b, offset 0xac0
+	0xac0: 0x2184, 0xac1: 0x218a, 0xac2: 0x2190, 0xac3: 0x2196, 0xac4: 0x219c, 0xac5: 0x21a2,
+	0xac6: 0x21a8, 0xac7: 0x21ae, 0xac8: 0x21b4, 0xac9: 0x21ba, 0xaca: 0x21c0, 0xacb: 0x21c6,
+	0xacc: 0x21cc, 0xacd: 0x21d2, 0xace: 0x285d, 0xacf: 0x2866, 0xad0: 0x286f, 0xad1: 0x2878,
+	0xad2: 0x2881, 0xad3: 0x288a, 0xad4: 0x2893, 0xad5: 0x289c, 0xad6: 0x28a5, 0xad7: 0x28b7,
+	0xad8: 0x28c0, 0xad9: 0x28c9, 0xada: 0x28d2, 0xadb: 0x28db, 0xadc: 0x28ae, 0xadd: 0x2ce3,
+	0xade: 0x2c24, 0xae0: 0x21d8, 0xae1: 0x21f0, 0xae2: 0x21e4, 0xae3: 0x2238,
+	0xae4: 0x21f6, 0xae5: 0x2214, 0xae6: 0x21de, 0xae7: 0x220e, 0xae8: 0x21ea, 0xae9: 0x2220,
+	0xaea: 0x2250, 0xaeb: 0x226e, 0xaec: 0x2268, 0xaed: 0x225c, 0xaee: 0x22aa, 0xaef: 0x223e,
+	0xaf0: 0x224a, 0xaf1: 0x2262, 0xaf2: 0x2256, 0xaf3: 0x2280, 0xaf4: 0x222c, 0xaf5: 0x2274,
+	0xaf6: 0x229e, 0xaf7: 0x2286, 0xaf8: 0x221a, 0xaf9: 0x21fc, 0xafa: 0x2232, 0xafb: 0x2244,
+	0xafc: 0x227a, 0xafd: 0x2202, 0xafe: 0x22a4, 0xaff: 0x2226,
+	// Block 0x2c, offset 0xb00
+	0xb00: 0x228c, 0xb01: 0x2208, 0xb02: 0x2292, 0xb03: 0x2298, 0xb04: 0x0a2a, 0xb05: 0x0bfe,
+	0xb06: 0x0da2, 0xb07: 0x11c2,
+	0xb10: 0x1cf4, 0xb11: 0x19d6,
+	0xb12: 0x19d9, 0xb13: 0x19dc, 0xb14: 0x19df, 0xb15: 0x19e2, 0xb16: 0x19e5, 0xb17: 0x19e8,
+	0xb18: 0x19eb, 0xb19: 0x19ee, 0xb1a: 0x19f7, 0xb1b: 0x19fa, 0xb1c: 0x19fd, 0xb1d: 0x1a00,
+	0xb1e: 0x1a03, 0xb1f: 0x1a06, 0xb20: 0x0406, 0xb21: 0x040e, 0xb22: 0x0412, 0xb23: 0x041a,
+	0xb24: 0x041e, 0xb25: 0x0422, 0xb26: 0x042a, 0xb27: 0x0432, 0xb28: 0x0436, 0xb29: 0x043e,
+	0xb2a: 0x0442, 0xb2b: 0x0446, 0xb2c: 0x044a, 0xb2d: 0x044e, 0xb2e: 0x2f59, 0xb2f: 0x2f61,
+	0xb30: 0x2f69, 0xb31: 0x2f71, 0xb32: 0x2f79, 0xb33: 0x2f81, 0xb34: 0x2f89, 0xb35: 0x2f91,
+	0xb36: 0x2fa1, 0xb37: 0x2fa9, 0xb38: 0x2fb1, 0xb39: 0x2fb9, 0xb3a: 0x2fc1, 0xb3b: 0x2fc9,
+	0xb3c: 0x3014, 0xb3d: 0x2fdc, 0xb3e: 0x2f99,
+	// Block 0x2d, offset 0xb40
+	0xb40: 0x07ba, 0xb41: 0x0816, 0xb42: 0x07c6, 0xb43: 0x0a76, 0xb44: 0x081a, 0xb45: 0x08aa,
+	0xb46: 0x07c2, 0xb47: 0x08a6, 0xb48: 0x0806, 0xb49: 0x0982, 0xb4a: 0x0e02, 0xb4b: 0x0f8a,
+	0xb4c: 0x0ed2, 0xb4d: 0x0e16, 0xb4e: 0x155a, 0xb4f: 0x0a86, 0xb50: 0x0dca, 0xb51: 0x0e46,
+	0xb52: 0x0e06, 0xb53: 0x1146, 0xb54: 0x09f6, 0xb55: 0x0ffe, 0xb56: 0x1482, 0xb57: 0x115a,
+	0xb58: 0x093e, 0xb59: 0x118a, 0xb5a: 0x1096, 0xb5b: 0x0b12, 0xb5c: 0x150a, 0xb5d: 0x087a,
+	0xb5e: 0x09a6, 0xb5f: 0x0ef2, 0xb60: 0x1622, 0xb61: 0x083e, 0xb62: 0x08ce, 0xb63: 0x0e96,
+	0xb64: 0x07ca, 0xb65: 0x07e2, 0xb66: 0x07ce, 0xb67: 0x0bd6, 0xb68: 0x09ea, 0xb69: 0x097a,
+	0xb6a: 0x0b52, 0xb6b: 0x0b46, 0xb6c: 0x10e6, 0xb6d: 0x083a, 0xb6e: 0x1496, 0xb6f: 0x0996,
+	0xb70: 0x0aee, 0xb71: 0x1a09, 0xb72: 0x1a0c, 0xb73: 0x1a0f, 0xb74: 0x1a12, 0xb75: 0x1a1b,
+	0xb76: 0x1a1e, 0xb77: 0x1a21, 0xb78: 0x1a24, 0xb79: 0x1a27, 0xb7a: 0x1a2a, 0xb7b: 0x1a2d,
+	0xb7c: 0x1a30, 0xb7d: 0x1a33, 0xb7e: 0x1a36, 0xb7f: 0x1a3f,
+	// Block 0x2e, offset 0xb80
+	0xb80: 0x1df6, 0xb81: 0x1e05, 0xb82: 0x1e14, 0xb83: 0x1e23, 0xb84: 0x1e32, 0xb85: 0x1e41,
+	0xb86: 0x1e50, 0xb87: 0x1e5f, 0xb88: 0x1e6e, 0xb89: 0x22bc, 0xb8a: 0x22ce, 0xb8b: 0x22e0,
+	0xb8c: 0x1a81, 0xb8d: 0x1d34, 0xb8e: 0x1b02, 0xb8f: 0x1cd8, 0xb90: 0x05c6, 0xb91: 0x05ce,
+	0xb92: 0x05d6, 0xb93: 0x05de, 0xb94: 0x05e6, 0xb95: 0x05ea, 0xb96: 0x05ee, 0xb97: 0x05f2,
+	0xb98: 0x05f6, 0xb99: 0x05fa, 0xb9a: 0x05fe, 0xb9b: 0x0602, 0xb9c: 0x0606, 0xb9d: 0x060a,
+	0xb9e: 0x060e, 0xb9f: 0x0612, 0xba0: 0x0616, 0xba1: 0x061e, 0xba2: 0x0622, 0xba3: 0x0626,
+	0xba4: 0x062a, 0xba5: 0x062e, 0xba6: 0x0632, 0xba7: 0x0636, 0xba8: 0x063a, 0xba9: 0x063e,
+	0xbaa: 0x0642, 0xbab: 0x0646, 0xbac: 0x064a, 0xbad: 0x064e, 0xbae: 0x0652, 0xbaf: 0x0656,
+	0xbb0: 0x065a, 0xbb1: 0x065e, 0xbb2: 0x0662, 0xbb3: 0x066a, 0xbb4: 0x0672, 0xbb5: 0x067a,
+	0xbb6: 0x067e, 0xbb7: 0x0682, 0xbb8: 0x0686, 0xbb9: 0x068a, 0xbba: 0x068e, 0xbbb: 0x0692,
+	0xbbc: 0x0696, 0xbbd: 0x069a, 0xbbe: 0x069e, 0xbbf: 0x282a,
+	// Block 0x2f, offset 0xbc0
+	0xbc0: 0x2c43, 0xbc1: 0x2adf, 0xbc2: 0x2c53, 0xbc3: 0x29b7, 0xbc4: 0x3025, 0xbc5: 0x29c1,
+	0xbc6: 0x29cb, 0xbc7: 0x3069, 0xbc8: 0x2aec, 0xbc9: 0x29d5, 0xbca: 0x29df, 0xbcb: 0x29e9,
+	0xbcc: 0x2b13, 0xbcd: 0x2b20, 0xbce: 0x2af9, 0xbcf: 0x2b06, 0xbd0: 0x2fea, 0xbd1: 0x2b2d,
+	0xbd2: 0x2b3a, 0xbd3: 0x2cf5, 0xbd4: 0x27eb, 0xbd5: 0x2d08, 0xbd6: 0x2d1b, 0xbd7: 0x2c63,
+	0xbd8: 0x2b47, 0xbd9: 0x2d2e, 0xbda: 0x2d41, 0xbdb: 0x2b54, 0xbdc: 0x29f3, 0xbdd: 0x29fd,
+	0xbde: 0x2ff8, 0xbdf: 0x2b61, 0xbe0: 0x2c73, 0xbe1: 0x3036, 0xbe2: 0x2a07, 0xbe3: 0x2a11,
+	0xbe4: 0x2b6e, 0xbe5: 0x2a1b, 0xbe6: 0x2a25, 0xbe7: 0x2800, 0xbe8: 0x2807, 0xbe9: 0x2a2f,
+	0xbea: 0x2a39, 0xbeb: 0x2d54, 0xbec: 0x2b7b, 0xbed: 0x2c83, 0xbee: 0x2d67, 0xbef: 0x2b88,
+	0xbf0: 0x2a4d, 0xbf1: 0x2a43, 0xbf2: 0x307d, 0xbf3: 0x2b95, 0xbf4: 0x2d7a, 0xbf5: 0x2a57,
+	0xbf6: 0x2c93, 0xbf7: 0x2a61, 0xbf8: 0x2baf, 0xbf9: 0x2a6b, 0xbfa: 0x2bbc, 0xbfb: 0x3047,
+	0xbfc: 0x2ba2, 0xbfd: 0x2ca3, 0xbfe: 0x2bc9, 0xbff: 0x280e,
+	// Block 0x30, offset 0xc00
+	0xc00: 0x3058, 0xc01: 0x2a75, 0xc02: 0x2a7f, 0xc03: 0x2bd6, 0xc04: 0x2a89, 0xc05: 0x2a93,
+	0xc06: 0x2a9d, 0xc07: 0x2cb3, 0xc08: 0x2be3, 0xc09: 0x2815, 0xc0a: 0x2d8d, 0xc0b: 0x2fd1,
+	0xc0c: 0x2cc3, 0xc0d: 0x2bf0, 0xc0e: 0x3006, 0xc0f: 0x2aa7, 0xc10: 0x2ab1, 0xc11: 0x2bfd,
+	0xc12: 0x281c, 0xc13: 0x2c0a, 0xc14: 0x2cd3, 0xc15: 0x2823, 0xc16: 0x2da0, 0xc17: 0x2abb,
+	0xc18: 0x1de7, 0xc19: 0x1dfb, 0xc1a: 0x1e0a, 0xc1b: 0x1e19, 0xc1c: 0x1e28, 0xc1d: 0x1e37,
+	0xc1e: 0x1e46, 0xc1f: 0x1e55, 0xc20: 0x1e64, 0xc21: 0x1e73, 0xc22: 0x22c2, 0xc23: 0x22d4,
+	0xc24: 0x22e6, 0xc25: 0x22f2, 0xc26: 0x22fe, 0xc27: 0x230a, 0xc28: 0x2316, 0xc29: 0x2322,
+	0xc2a: 0x232e, 0xc2b: 0x233a, 0xc2c: 0x2376, 0xc2d: 0x2382, 0xc2e: 0x238e, 0xc2f: 0x239a,
+	0xc30: 0x23a6, 0xc31: 0x1d44, 0xc32: 0x1af6, 0xc33: 0x1a63, 0xc34: 0x1d14, 0xc35: 0x1b77,
+	0xc36: 0x1b86, 0xc37: 0x1afc, 0xc38: 0x1d2c, 0xc39: 0x1d30, 0xc3a: 0x1a8d, 0xc3b: 0x2838,
+	0xc3c: 0x2846, 0xc3d: 0x2831, 0xc3e: 0x283f, 0xc3f: 0x2c17,
+	// Block 0x31, offset 0xc40
+	0xc40: 0x1b7a, 0xc41: 0x1b62, 0xc42: 0x1d90, 0xc43: 0x1b4a, 0xc44: 0x1b23, 0xc45: 0x1a96,
+	0xc46: 0x1aa5, 0xc47: 0x1a75, 0xc48: 0x1d20, 0xc49: 0x1e82, 0xc4a: 0x1b7d, 0xc4b: 0x1b65,
+	0xc4c: 0x1d94, 0xc4d: 0x1da0, 0xc4e: 0x1b56, 0xc4f: 0x1b2c, 0xc50: 0x1a84, 0xc51: 0x1d4c,
+	0xc52: 0x1ce0, 0xc53: 0x1ccc, 0xc54: 0x1cfc, 0xc55: 0x1da4, 0xc56: 0x1b59, 0xc57: 0x1af9,
+	0xc58: 0x1b2f, 0xc59: 0x1b0e, 0xc5a: 0x1b71, 0xc5b: 0x1da8, 0xc5c: 0x1b5c, 0xc5d: 0x1af0,
+	0xc5e: 0x1b32, 0xc5f: 0x1d6c, 0xc60: 0x1d24, 0xc61: 0x1b44, 0xc62: 0x1d54, 0xc63: 0x1d70,
+	0xc64: 0x1d28, 0xc65: 0x1b47, 0xc66: 0x1d58, 0xc67: 0x2418, 0xc68: 0x242c, 0xc69: 0x1ac6,
+	0xc6a: 0x1d50, 0xc6b: 0x1ce4, 0xc6c: 0x1cd0, 0xc6d: 0x1d78, 0xc6e: 0x284d, 0xc6f: 0x28e4,
+	0xc70: 0x1b89, 0xc71: 0x1b74, 0xc72: 0x1dac, 0xc73: 0x1b5f, 0xc74: 0x1b80, 0xc75: 0x1b68,
+	0xc76: 0x1d98, 0xc77: 0x1b4d, 0xc78: 0x1b26, 0xc79: 0x1ab1, 0xc7a: 0x1b83, 0xc7b: 0x1b6b,
+	0xc7c: 0x1d9c, 0xc7d: 0x1b50, 0xc7e: 0x1b29, 0xc7f: 0x1ab4,
+	// Block 0x32, offset 0xc80
+	0xc80: 0x1d5c, 0xc81: 0x1ce8, 0xc82: 0x1e7d, 0xc83: 0x1a66, 0xc84: 0x1aea, 0xc85: 0x1aed,
+	0xc86: 0x2425, 0xc87: 0x1cc4, 0xc88: 0x1af3, 0xc89: 0x1a78, 0xc8a: 0x1b11, 0xc8b: 0x1a7b,
+	0xc8c: 0x1b1a, 0xc8d: 0x1a99, 0xc8e: 0x1a9c, 0xc8f: 0x1b35, 0xc90: 0x1b3b, 0xc91: 0x1b3e,
+	0xc92: 0x1d60, 0xc93: 0x1b41, 0xc94: 0x1b53, 0xc95: 0x1d68, 0xc96: 0x1d74, 0xc97: 0x1ac0,
+	0xc98: 0x1e87, 0xc99: 0x1cec, 0xc9a: 0x1ac3, 0xc9b: 0x1b8c, 0xc9c: 0x1ad5, 0xc9d: 0x1ae4,
+	0xc9e: 0x2412, 0xc9f: 0x240c, 0xca0: 0x1df1, 0xca1: 0x1e00, 0xca2: 0x1e0f, 0xca3: 0x1e1e,
+	0xca4: 0x1e2d, 0xca5: 0x1e3c, 0xca6: 0x1e4b, 0xca7: 0x1e5a, 0xca8: 0x1e69, 0xca9: 0x22b6,
+	0xcaa: 0x22c8, 0xcab: 0x22da, 0xcac: 0x22ec, 0xcad: 0x22f8, 0xcae: 0x2304, 0xcaf: 0x2310,
+	0xcb0: 0x231c, 0xcb1: 0x2328, 0xcb2: 0x2334, 0xcb3: 0x2370, 0xcb4: 0x237c, 0xcb5: 0x2388,
+	0xcb6: 0x2394, 0xcb7: 0x23a0, 0xcb8: 0x23ac, 0xcb9: 0x23b2, 0xcba: 0x23b8, 0xcbb: 0x23be,
+	0xcbc: 0x23c4, 0xcbd: 0x23d6, 0xcbe: 0x23dc, 0xcbf: 0x1d40,
+	// Block 0x33, offset 0xcc0
+	0xcc0: 0x1472, 0xcc1: 0x0df6, 0xcc2: 0x14ce, 0xcc3: 0x149a, 0xcc4: 0x0f52, 0xcc5: 0x07e6,
+	0xcc6: 0x09da, 0xcc7: 0x1726, 0xcc8: 0x1726, 0xcc9: 0x0b06, 0xcca: 0x155a, 0xccb: 0x0a3e,
+	0xccc: 0x0b02, 0xccd: 0x0cea, 0xcce: 0x10ca, 0xccf: 0x125a, 0xcd0: 0x1392, 0xcd1: 0x13ce,
+	0xcd2: 0x1402, 0xcd3: 0x1516, 0xcd4: 0x0e6e, 0xcd5: 0x0efa, 0xcd6: 0x0fa6, 0xcd7: 0x103e,
+	0xcd8: 0x135a, 0xcd9: 0x1542, 0xcda: 0x166e, 0xcdb: 0x080a, 0xcdc: 0x09ae, 0xcdd: 0x0e82,
+	0xcde: 0x0fca, 0xcdf: 0x138e, 0xce0: 0x16be, 0xce1: 0x0bae, 0xce2: 0x0f72, 0xce3: 0x137e,
+	0xce4: 0x1412, 0xce5: 0x0d1e, 0xce6: 0x12b6, 0xce7: 0x13da, 0xce8: 0x0c1a, 0xce9: 0x0e0a,
+	0xcea: 0x0f12, 0xceb: 0x1016, 0xcec: 0x1522, 0xced: 0x084a, 0xcee: 0x08e2, 0xcef: 0x094e,
+	0xcf0: 0x0d86, 0xcf1: 0x0e7a, 0xcf2: 0x0fc6, 0xcf3: 0x10ea, 0xcf4: 0x1272, 0xcf5: 0x1386,
+	0xcf6: 0x139e, 0xcf7: 0x14c2, 0xcf8: 0x15ea, 0xcf9: 0x169e, 0xcfa: 0x16ba, 0xcfb: 0x1126,
+	0xcfc: 0x1166, 0xcfd: 0x121e, 0xcfe: 0x133e, 0xcff: 0x1576,
+	// Block 0x34, offset 0xd00
+	0xd00: 0x16c6, 0xd01: 0x1446, 0xd02: 0x0ac2, 0xd03: 0x0c36, 0xd04: 0x11d6, 0xd05: 0x1296,
+	0xd06: 0x0ffa, 0xd07: 0x112e, 0xd08: 0x1492, 0xd09: 0x15e2, 0xd0a: 0x0abe, 0xd0b: 0x0b8a,
+	0xd0c: 0x0e72, 0xd0d: 0x0f26, 0xd0e: 0x0f5a, 0xd0f: 0x120e, 0xd10: 0x1236, 0xd11: 0x15a2,
+	0xd12: 0x094a, 0xd13: 0x12a2, 0xd14: 0x08ee, 0xd15: 0x08ea, 0xd16: 0x1192, 0xd17: 0x1222,
+	0xd18: 0x1356, 0xd19: 0x15aa, 0xd1a: 0x1462, 0xd1b: 0x0d22, 0xd1c: 0x0e6e, 0xd1d: 0x1452,
+	0xd1e: 0x07f2, 0xd1f: 0x0b5e, 0xd20: 0x0c8e, 0xd21: 0x102a, 0xd22: 0x10aa, 0xd23: 0x096e,
+	0xd24: 0x1136, 0xd25: 0x085a, 0xd26: 0x0c72, 0xd27: 0x07d2, 0xd28: 0x0ee6, 0xd29: 0x0d9e,
+	0xd2a: 0x120a, 0xd2b: 0x09c2, 0xd2c: 0x0aae, 0xd2d: 0x10f6, 0xd2e: 0x135e, 0xd2f: 0x1436,
+	0xd30: 0x0eb2, 0xd31: 0x14f2, 0xd32: 0x0ede, 0xd33: 0x0d32, 0xd34: 0x1316, 0xd35: 0x0d52,
+	0xd36: 0x10a6, 0xd37: 0x0826, 0xd38: 0x08a2, 0xd39: 0x08e6, 0xd3a: 0x0e4e, 0xd3b: 0x11f6,
+	0xd3c: 0x12ee, 0xd3d: 0x1442, 0xd3e: 0x1556, 0xd3f: 0x0956,
+	// Block 0x35, offset 0xd40
+	0xd40: 0x0a0a, 0xd41: 0x0b12, 0xd42: 0x0c2a, 0xd43: 0x0dba, 0xd44: 0x0f76, 0xd45: 0x113a,
+	0xd46: 0x1592, 0xd47: 0x1676, 0xd48: 0x16ca, 0xd49: 0x16e2, 0xd4a: 0x0932, 0xd4b: 0x0dee,
+	0xd4c: 0x0e9e, 0xd4d: 0x14e6, 0xd4e: 0x0bf6, 0xd4f: 0x0cd2, 0xd50: 0x0cee, 0xd51: 0x0d7e,
+	0xd52: 0x0f66, 0xd53: 0x0fb2, 0xd54: 0x1062, 0xd55: 0x1186, 0xd56: 0x122a, 0xd57: 0x128e,
+	0xd58: 0x14d6, 0xd59: 0x1366, 0xd5a: 0x14fe, 0xd5b: 0x157a, 0xd5c: 0x090a, 0xd5d: 0x0936,
+	0xd5e: 0x0a1e, 0xd5f: 0x0fa2, 0xd60: 0x13ee, 0xd61: 0x1436, 0xd62: 0x0c16, 0xd63: 0x0c86,
+	0xd64: 0x0d4a, 0xd65: 0x0eaa, 0xd66: 0x11d2, 0xd67: 0x101e, 0xd68: 0x0836, 0xd69: 0x0a7a,
+	0xd6a: 0x0b5e, 0xd6b: 0x0bc2, 0xd6c: 0x0c92, 0xd6d: 0x103a, 0xd6e: 0x1056, 0xd6f: 0x1266,
+	0xd70: 0x1286, 0xd71: 0x155e, 0xd72: 0x15de, 0xd73: 0x15ee, 0xd74: 0x162a, 0xd75: 0x084e,
+	0xd76: 0x117a, 0xd77: 0x154a, 0xd78: 0x15c6, 0xd79: 0x0caa, 0xd7a: 0x0812, 0xd7b: 0x0872,
+	0xd7c: 0x0b62, 0xd7d: 0x0b82, 0xd7e: 0x0daa, 0xd7f: 0x0e6e,
+	// Block 0x36, offset 0xd80
+	0xd80: 0x0fbe, 0xd81: 0x10c6, 0xd82: 0x1372, 0xd83: 0x1512, 0xd84: 0x171e, 0xd85: 0x0dde,
+	0xd86: 0x159e, 0xd87: 0x092e, 0xd88: 0x0e2a, 0xd89: 0x0e36, 0xd8a: 0x0f0a, 0xd8b: 0x0f42,
+	0xd8c: 0x1046, 0xd8d: 0x10a2, 0xd8e: 0x1122, 0xd8f: 0x1206, 0xd90: 0x1636, 0xd91: 0x08aa,
+	0xd92: 0x0cfe, 0xd93: 0x15ae, 0xd94: 0x0862, 0xd95: 0x0ba6, 0xd96: 0x0f2a, 0xd97: 0x14da,
+	0xd98: 0x0c62, 0xd99: 0x0cb2, 0xd9a: 0x0e3e, 0xd9b: 0x102a, 0xd9c: 0x15b6, 0xd9d: 0x0912,
+	0xd9e: 0x09fa, 0xd9f: 0x0b92, 0xda0: 0x0dce, 0xda1: 0x0e1a, 0xda2: 0x0e5a, 0xda3: 0x0eee,
+	0xda4: 0x1042, 0xda5: 0x10b6, 0xda6: 0x1252, 0xda7: 0x13f2, 0xda8: 0x13fe, 0xda9: 0x1552,
+	0xdaa: 0x15d2, 0xdab: 0x097e, 0xdac: 0x0f46, 0xdad: 0x09fe, 0xdae: 0x0fc2, 0xdaf: 0x1066,
+	0xdb0: 0x1382, 0xdb1: 0x15ba, 0xdb2: 0x16a6, 0xdb3: 0x16ce, 0xdb4: 0x0e32, 0xdb5: 0x0f22,
+	0xdb6: 0x12be, 0xdb7: 0x11b2, 0xdb8: 0x11be, 0xdb9: 0x11e2, 0xdba: 0x1012, 0xdbb: 0x0f9a,
+	0xdbc: 0x145e, 0xdbd: 0x082e, 0xdbe: 0x1326, 0xdbf: 0x0916,
+	// Block 0x37, offset 0xdc0
+	0xdc0: 0x0906, 0xdc1: 0x0c06, 0xdc2: 0x0d26, 0xdc3: 0x11ee, 0xdc4: 0x0b4e, 0xdc5: 0x0efe,
+	0xdc6: 0x0dea, 0xdc7: 0x14e2, 0xdc8: 0x13e2, 0xdc9: 0x15a6, 0xdca: 0x141e, 0xdcb: 0x0c22,
+	0xdcc: 0x0882, 0xdcd: 0x0a56, 0xdd0: 0x0aaa,
+	0xdd2: 0x0dda, 0xdd5: 0x08f2, 0xdd6: 0x101a, 0xdd7: 0x10de,
+	0xdd8: 0x1142, 0xdd9: 0x115e, 0xdda: 0x1162, 0xddb: 0x1176, 0xddc: 0x15f6, 0xddd: 0x11e6,
+	0xdde: 0x126a, 0xde0: 0x138a, 0xde2: 0x144e,
+	0xde5: 0x1502, 0xde6: 0x152e,
+	0xdea: 0x164a, 0xdeb: 0x164e, 0xdec: 0x1652, 0xded: 0x16b6, 0xdee: 0x1526, 0xdef: 0x15c2,
+	0xdf0: 0x0852, 0xdf1: 0x0876, 0xdf2: 0x088a, 0xdf3: 0x0946, 0xdf4: 0x0952, 0xdf5: 0x0992,
+	0xdf6: 0x0a46, 0xdf7: 0x0a62, 0xdf8: 0x0a6a, 0xdf9: 0x0aa6, 0xdfa: 0x0ab2, 0xdfb: 0x0b8e,
+	0xdfc: 0x0b96, 0xdfd: 0x0c9e, 0xdfe: 0x0cc6, 0xdff: 0x0cce,
+	// Block 0x38, offset 0xe00
+	0xe00: 0x0ce6, 0xe01: 0x0d92, 0xe02: 0x0dc2, 0xe03: 0x0de2, 0xe04: 0x0e52, 0xe05: 0x0f16,
+	0xe06: 0x0f32, 0xe07: 0x0f62, 0xe08: 0x0fb6, 0xe09: 0x0fd6, 0xe0a: 0x104a, 0xe0b: 0x112a,
+	0xe0c: 0x1146, 0xe0d: 0x114e, 0xe0e: 0x114a, 0xe0f: 0x1152, 0xe10: 0x1156, 0xe11: 0x115a,
+	0xe12: 0x116e, 0xe13: 0x1172, 0xe14: 0x1196, 0xe15: 0x11aa, 0xe16: 0x11c6, 0xe17: 0x122a,
+	0xe18: 0x1232, 0xe19: 0x123a, 0xe1a: 0x124e, 0xe1b: 0x1276, 0xe1c: 0x12c6, 0xe1d: 0x12fa,
+	0xe1e: 0x12fa, 0xe1f: 0x1362, 0xe20: 0x140a, 0xe21: 0x1422, 0xe22: 0x1456, 0xe23: 0x145a,
+	0xe24: 0x149e, 0xe25: 0x14a2, 0xe26: 0x14fa, 0xe27: 0x1502, 0xe28: 0x15d6, 0xe29: 0x161a,
+	0xe2a: 0x1632, 0xe2b: 0x0c96, 0xe2c: 0x184b, 0xe2d: 0x12de,
+	0xe30: 0x07da, 0xe31: 0x08de, 0xe32: 0x089e, 0xe33: 0x0846, 0xe34: 0x0886, 0xe35: 0x08b2,
+	0xe36: 0x0942, 0xe37: 0x095e, 0xe38: 0x0a46, 0xe39: 0x0a32, 0xe3a: 0x0a42, 0xe3b: 0x0a5e,
+	0xe3c: 0x0aaa, 0xe3d: 0x0aba, 0xe3e: 0x0afe, 0xe3f: 0x0b0a,
+	// Block 0x39, offset 0xe40
+	0xe40: 0x0b26, 0xe41: 0x0b36, 0xe42: 0x0c1e, 0xe43: 0x0c26, 0xe44: 0x0c56, 0xe45: 0x0c76,
+	0xe46: 0x0ca6, 0xe47: 0x0cbe, 0xe48: 0x0cae, 0xe49: 0x0cce, 0xe4a: 0x0cc2, 0xe4b: 0x0ce6,
+	0xe4c: 0x0d02, 0xe4d: 0x0d5a, 0xe4e: 0x0d66, 0xe4f: 0x0d6e, 0xe50: 0x0d96, 0xe51: 0x0dda,
+	0xe52: 0x0e0a, 0xe53: 0x0e0e, 0xe54: 0x0e22, 0xe55: 0x0ea2, 0xe56: 0x0eb2, 0xe57: 0x0f0a,
+	0xe58: 0x0f56, 0xe59: 0x0f4e, 0xe5a: 0x0f62, 0xe5b: 0x0f7e, 0xe5c: 0x0fb6, 0xe5d: 0x110e,
+	0xe5e: 0x0fda, 0xe5f: 0x100e, 0xe60: 0x101a, 0xe61: 0x105a, 0xe62: 0x1076, 0xe63: 0x109a,
+	0xe64: 0x10be, 0xe65: 0x10c2, 0xe66: 0x10de, 0xe67: 0x10e2, 0xe68: 0x10f2, 0xe69: 0x1106,
+	0xe6a: 0x1102, 0xe6b: 0x1132, 0xe6c: 0x11ae, 0xe6d: 0x11c6, 0xe6e: 0x11de, 0xe6f: 0x1216,
+	0xe70: 0x122a, 0xe71: 0x1246, 0xe72: 0x1276, 0xe73: 0x132a, 0xe74: 0x1352, 0xe75: 0x13c6,
+	0xe76: 0x140e, 0xe77: 0x141a, 0xe78: 0x1422, 0xe79: 0x143a, 0xe7a: 0x144e, 0xe7b: 0x143e,
+	0xe7c: 0x1456, 0xe7d: 0x1452, 0xe7e: 0x144a, 0xe7f: 0x145a,
+	// Block 0x3a, offset 0xe80
+	0xe80: 0x1466, 0xe81: 0x14a2, 0xe82: 0x14de, 0xe83: 0x150e, 0xe84: 0x1546, 0xe85: 0x1566,
+	0xe86: 0x15b2, 0xe87: 0x15d6, 0xe88: 0x15f6, 0xe89: 0x160a, 0xe8a: 0x161a, 0xe8b: 0x1626,
+	0xe8c: 0x1632, 0xe8d: 0x1686, 0xe8e: 0x1726, 0xe8f: 0x17e2, 0xe90: 0x17dd, 0xe91: 0x180f,
+	0xe92: 0x0702, 0xe93: 0x072a, 0xe94: 0x072e, 0xe95: 0x1891, 0xe96: 0x18be, 0xe97: 0x1936,
+	0xe98: 0x1712, 0xe99: 0x1722,
+	// Block 0x3b, offset 0xec0
+	0xec0: 0x1b05, 0xec1: 0x1b08, 0xec2: 0x1b0b, 0xec3: 0x1d38, 0xec4: 0x1d3c, 0xec5: 0x1b8f,
+	0xec6: 0x1b8f,
+	0xed3: 0x1ea5, 0xed4: 0x1e96, 0xed5: 0x1e9b, 0xed6: 0x1eaa, 0xed7: 0x1ea0,
+	0xedd: 0x44d1,
+	0xede: 0x8116, 0xedf: 0x4543, 0xee0: 0x0320, 0xee1: 0x0308, 0xee2: 0x0311, 0xee3: 0x0314,
+	0xee4: 0x0317, 0xee5: 0x031a, 0xee6: 0x031d, 0xee7: 0x0323, 0xee8: 0x0326, 0xee9: 0x0017,
+	0xeea: 0x4531, 0xeeb: 0x4537, 0xeec: 0x4635, 0xeed: 0x463d, 0xeee: 0x4489, 0xeef: 0x448f,
+	0xef0: 0x4495, 0xef1: 0x449b, 0xef2: 0x44a7, 0xef3: 0x44ad, 0xef4: 0x44b3, 0xef5: 0x44bf,
+	0xef6: 0x44c5, 0xef8: 0x44cb, 0xef9: 0x44d7, 0xefa: 0x44dd, 0xefb: 0x44e3,
+	0xefc: 0x44ef, 0xefe: 0x44f5,
+	// Block 0x3c, offset 0xf00
+	0xf00: 0x44fb, 0xf01: 0x4501, 0xf03: 0x4507, 0xf04: 0x450d,
+	0xf06: 0x4519, 0xf07: 0x451f, 0xf08: 0x4525, 0xf09: 0x452b, 0xf0a: 0x453d, 0xf0b: 0x44b9,
+	0xf0c: 0x44a1, 0xf0d: 0x44e9, 0xf0e: 0x4513, 0xf0f: 0x1eaf, 0xf10: 0x038c, 0xf11: 0x038c,
+	0xf12: 0x0395, 0xf13: 0x0395, 0xf14: 0x0395, 0xf15: 0x0395, 0xf16: 0x0398, 0xf17: 0x0398,
+	0xf18: 0x0398, 0xf19: 0x0398, 0xf1a: 0x039e, 0xf1b: 0x039e, 0xf1c: 0x039e, 0xf1d: 0x039e,
+	0xf1e: 0x0392, 0xf1f: 0x0392, 0xf20: 0x0392, 0xf21: 0x0392, 0xf22: 0x039b, 0xf23: 0x039b,
+	0xf24: 0x039b, 0xf25: 0x039b, 0xf26: 0x038f, 0xf27: 0x038f, 0xf28: 0x038f, 0xf29: 0x038f,
+	0xf2a: 0x03c2, 0xf2b: 0x03c2, 0xf2c: 0x03c2, 0xf2d: 0x03c2, 0xf2e: 0x03c5, 0xf2f: 0x03c5,
+	0xf30: 0x03c5, 0xf31: 0x03c5, 0xf32: 0x03a4, 0xf33: 0x03a4, 0xf34: 0x03a4, 0xf35: 0x03a4,
+	0xf36: 0x03a1, 0xf37: 0x03a1, 0xf38: 0x03a1, 0xf39: 0x03a1, 0xf3a: 0x03a7, 0xf3b: 0x03a7,
+	0xf3c: 0x03a7, 0xf3d: 0x03a7, 0xf3e: 0x03aa, 0xf3f: 0x03aa,
+	// Block 0x3d, offset 0xf40
+	0xf40: 0x03aa, 0xf41: 0x03aa, 0xf42: 0x03b3, 0xf43: 0x03b3, 0xf44: 0x03b0, 0xf45: 0x03b0,
+	0xf46: 0x03b6, 0xf47: 0x03b6, 0xf48: 0x03ad, 0xf49: 0x03ad, 0xf4a: 0x03bc, 0xf4b: 0x03bc,
+	0xf4c: 0x03b9, 0xf4d: 0x03b9, 0xf4e: 0x03c8, 0xf4f: 0x03c8, 0xf50: 0x03c8, 0xf51: 0x03c8,
+	0xf52: 0x03ce, 0xf53: 0x03ce, 0xf54: 0x03ce, 0xf55: 0x03ce, 0xf56: 0x03d4, 0xf57: 0x03d4,
+	0xf58: 0x03d4, 0xf59: 0x03d4, 0xf5a: 0x03d1, 0xf5b: 0x03d1, 0xf5c: 0x03d1, 0xf5d: 0x03d1,
+	0xf5e: 0x03d7, 0xf5f: 0x03d7, 0xf60: 0x03da, 0xf61: 0x03da, 0xf62: 0x03da, 0xf63: 0x03da,
+	0xf64: 0x45af, 0xf65: 0x45af, 0xf66: 0x03e0, 0xf67: 0x03e0, 0xf68: 0x03e0, 0xf69: 0x03e0,
+	0xf6a: 0x03dd, 0xf6b: 0x03dd, 0xf6c: 0x03dd, 0xf6d: 0x03dd, 0xf6e: 0x03fb, 0xf6f: 0x03fb,
+	0xf70: 0x45a9, 0xf71: 0x45a9,
+	// Block 0x3e, offset 0xf80
+	0xf93: 0x03cb, 0xf94: 0x03cb, 0xf95: 0x03cb, 0xf96: 0x03cb, 0xf97: 0x03e9,
+	0xf98: 0x03e9, 0xf99: 0x03e6, 0xf9a: 0x03e6, 0xf9b: 0x03ec, 0xf9c: 0x03ec, 0xf9d: 0x217f,
+	0xf9e: 0x03f2, 0xf9f: 0x03f2, 0xfa0: 0x03e3, 0xfa1: 0x03e3, 0xfa2: 0x03ef, 0xfa3: 0x03ef,
+	0xfa4: 0x03f8, 0xfa5: 0x03f8, 0xfa6: 0x03f8, 0xfa7: 0x03f8, 0xfa8: 0x0380, 0xfa9: 0x0380,
+	0xfaa: 0x26da, 0xfab: 0x26da, 0xfac: 0x274a, 0xfad: 0x274a, 0xfae: 0x2719, 0xfaf: 0x2719,
+	0xfb0: 0x2735, 0xfb1: 0x2735, 0xfb2: 0x272e, 0xfb3: 0x272e, 0xfb4: 0x273c, 0xfb5: 0x273c,
+	0xfb6: 0x2743, 0xfb7: 0x2743, 0xfb8: 0x2743, 0xfb9: 0x2720, 0xfba: 0x2720, 0xfbb: 0x2720,
+	0xfbc: 0x03f5, 0xfbd: 0x03f5, 0xfbe: 0x03f5, 0xfbf: 0x03f5,
+	// Block 0x3f, offset 0xfc0
+	0xfc0: 0x26e1, 0xfc1: 0x26e8, 0xfc2: 0x2704, 0xfc3: 0x2720, 0xfc4: 0x2727, 0xfc5: 0x1eb9,
+	0xfc6: 0x1ebe, 0xfc7: 0x1ec3, 0xfc8: 0x1ed2, 0xfc9: 0x1ee1, 0xfca: 0x1ee6, 0xfcb: 0x1eeb,
+	0xfcc: 0x1ef0, 0xfcd: 0x1ef5, 0xfce: 0x1f04, 0xfcf: 0x1f13, 0xfd0: 0x1f18, 0xfd1: 0x1f1d,
+	0xfd2: 0x1f2c, 0xfd3: 0x1f3b, 0xfd4: 0x1f40, 0xfd5: 0x1f45, 0xfd6: 0x1f4a, 0xfd7: 0x1f59,
+	0xfd8: 0x1f5e, 0xfd9: 0x1f6d, 0xfda: 0x1f72, 0xfdb: 0x1f77, 0xfdc: 0x1f86, 0xfdd: 0x1f8b,
+	0xfde: 0x1f90, 0xfdf: 0x1f9a, 0xfe0: 0x1fd6, 0xfe1: 0x1fe5, 0xfe2: 0x1ff4, 0xfe3: 0x1ff9,
+	0xfe4: 0x1ffe, 0xfe5: 0x2008, 0xfe6: 0x2017, 0xfe7: 0x201c, 0xfe8: 0x202b, 0xfe9: 0x2030,
+	0xfea: 0x2035, 0xfeb: 0x2044, 0xfec: 0x2049, 0xfed: 0x2058, 0xfee: 0x205d, 0xfef: 0x2062,
+	0xff0: 0x2067, 0xff1: 0x206c, 0xff2: 0x2071, 0xff3: 0x2076, 0xff4: 0x207b, 0xff5: 0x2080,
+	0xff6: 0x2085, 0xff7: 0x208a, 0xff8: 0x208f, 0xff9: 0x2094, 0xffa: 0x2099, 0xffb: 0x209e,
+	0xffc: 0x20a3, 0xffd: 0x20a8, 0xffe: 0x20ad, 0xfff: 0x20b7,
+	// Block 0x40, offset 0x1000
+	0x1000: 0x20bc, 0x1001: 0x20c1, 0x1002: 0x20c6, 0x1003: 0x20d0, 0x1004: 0x20d5, 0x1005: 0x20df,
+	0x1006: 0x20e4, 0x1007: 0x20e9, 0x1008: 0x20ee, 0x1009: 0x20f3, 0x100a: 0x20f8, 0x100b: 0x20fd,
+	0x100c: 0x2102, 0x100d: 0x2107, 0x100e: 0x2116, 0x100f: 0x2125, 0x1010: 0x212a, 0x1011: 0x212f,
+	0x1012: 0x2134, 0x1013: 0x2139, 0x1014: 0x213e, 0x1015: 0x2148, 0x1016: 0x214d, 0x1017: 0x2152,
+	0x1018: 0x2161, 0x1019: 0x2170, 0x101a: 0x2175, 0x101b: 0x4561, 0x101c: 0x4567, 0x101d: 0x459d,
+	0x101e: 0x45f4, 0x101f: 0x45fb, 0x1020: 0x4602, 0x1021: 0x4609, 0x1022: 0x4610, 0x1023: 0x4617,
+	0x1024: 0x26f6, 0x1025: 0x26fd, 0x1026: 0x2704, 0x1027: 0x270b, 0x1028: 0x2720, 0x1029: 0x2727,
+	0x102a: 0x1ec8, 0x102b: 0x1ecd, 0x102c: 0x1ed2, 0x102d: 0x1ed7, 0x102e: 0x1ee1, 0x102f: 0x1ee6,
+	0x1030: 0x1efa, 0x1031: 0x1eff, 0x1032: 0x1f04, 0x1033: 0x1f09, 0x1034: 0x1f13, 0x1035: 0x1f18,
+	0x1036: 0x1f22, 0x1037: 0x1f27, 0x1038: 0x1f2c, 0x1039: 0x1f31, 0x103a: 0x1f3b, 0x103b: 0x1f40,
+	0x103c: 0x206c, 0x103d: 0x2071, 0x103e: 0x2080, 0x103f: 0x2085,
+	// Block 0x41, offset 0x1040
+	0x1040: 0x208a, 0x1041: 0x209e, 0x1042: 0x20a3, 0x1043: 0x20a8, 0x1044: 0x20ad, 0x1045: 0x20c6,
+	0x1046: 0x20d0, 0x1047: 0x20d5, 0x1048: 0x20da, 0x1049: 0x20ee, 0x104a: 0x210c, 0x104b: 0x2111,
+	0x104c: 0x2116, 0x104d: 0x211b, 0x104e: 0x2125, 0x104f: 0x212a, 0x1050: 0x459d, 0x1051: 0x2157,
+	0x1052: 0x215c, 0x1053: 0x2161, 0x1054: 0x2166, 0x1055: 0x2170, 0x1056: 0x2175, 0x1057: 0x26e1,
+	0x1058: 0x26e8, 0x1059: 0x26ef, 0x105a: 0x2704, 0x105b: 0x2712, 0x105c: 0x1eb9, 0x105d: 0x1ebe,
+	0x105e: 0x1ec3, 0x105f: 0x1ed2, 0x1060: 0x1edc, 0x1061: 0x1eeb, 0x1062: 0x1ef0, 0x1063: 0x1ef5,
+	0x1064: 0x1f04, 0x1065: 0x1f0e, 0x1066: 0x1f2c, 0x1067: 0x1f45, 0x1068: 0x1f4a, 0x1069: 0x1f59,
+	0x106a: 0x1f5e, 0x106b: 0x1f6d, 0x106c: 0x1f77, 0x106d: 0x1f86, 0x106e: 0x1f8b, 0x106f: 0x1f90,
+	0x1070: 0x1f9a, 0x1071: 0x1fd6, 0x1072: 0x1fdb, 0x1073: 0x1fe5, 0x1074: 0x1ff4, 0x1075: 0x1ff9,
+	0x1076: 0x1ffe, 0x1077: 0x2008, 0x1078: 0x2017, 0x1079: 0x202b, 0x107a: 0x2030, 0x107b: 0x2035,
+	0x107c: 0x2044, 0x107d: 0x2049, 0x107e: 0x2058, 0x107f: 0x205d,
+	// Block 0x42, offset 0x1080
+	0x1080: 0x2062, 0x1081: 0x2067, 0x1082: 0x2076, 0x1083: 0x207b, 0x1084: 0x208f, 0x1085: 0x2094,
+	0x1086: 0x2099, 0x1087: 0x209e, 0x1088: 0x20a3, 0x1089: 0x20b7, 0x108a: 0x20bc, 0x108b: 0x20c1,
+	0x108c: 0x20c6, 0x108d: 0x20cb, 0x108e: 0x20df, 0x108f: 0x20e4, 0x1090: 0x20e9, 0x1091: 0x20ee,
+	0x1092: 0x20fd, 0x1093: 0x2102, 0x1094: 0x2107, 0x1095: 0x2116, 0x1096: 0x2120, 0x1097: 0x212f,
+	0x1098: 0x2134, 0x1099: 0x4591, 0x109a: 0x2148, 0x109b: 0x214d, 0x109c: 0x2152, 0x109d: 0x2161,
+	0x109e: 0x216b, 0x109f: 0x2704, 0x10a0: 0x2712, 0x10a1: 0x1ed2, 0x10a2: 0x1edc, 0x10a3: 0x1f04,
+	0x10a4: 0x1f0e, 0x10a5: 0x1f2c, 0x10a6: 0x1f36, 0x10a7: 0x1f9a, 0x10a8: 0x1f9f, 0x10a9: 0x1fc2,
+	0x10aa: 0x1fc7, 0x10ab: 0x209e, 0x10ac: 0x20a3, 0x10ad: 0x20c6, 0x10ae: 0x2116, 0x10af: 0x2120,
+	0x10b0: 0x2161, 0x10b1: 0x216b, 0x10b2: 0x4645, 0x10b3: 0x464d, 0x10b4: 0x4655, 0x10b5: 0x2021,
+	0x10b6: 0x2026, 0x10b7: 0x203a, 0x10b8: 0x203f, 0x10b9: 0x204e, 0x10ba: 0x2053, 0x10bb: 0x1fa4,
+	0x10bc: 0x1fa9, 0x10bd: 0x1fcc, 0x10be: 0x1fd1, 0x10bf: 0x1f63,
+	// Block 0x43, offset 0x10c0
+	0x10c0: 0x1f68, 0x10c1: 0x1f4f, 0x10c2: 0x1f54, 0x10c3: 0x1f7c, 0x10c4: 0x1f81, 0x10c5: 0x1fea,
+	0x10c6: 0x1fef, 0x10c7: 0x200d, 0x10c8: 0x2012, 0x10c9: 0x1fae, 0x10ca: 0x1fb3, 0x10cb: 0x1fb8,
+	0x10cc: 0x1fc2, 0x10cd: 0x1fbd, 0x10ce: 0x1f95, 0x10cf: 0x1fe0, 0x10d0: 0x2003, 0x10d1: 0x2021,
+	0x10d2: 0x2026, 0x10d3: 0x203a, 0x10d4: 0x203f, 0x10d5: 0x204e, 0x10d6: 0x2053, 0x10d7: 0x1fa4,
+	0x10d8: 0x1fa9, 0x10d9: 0x1fcc, 0x10da: 0x1fd1, 0x10db: 0x1f63, 0x10dc: 0x1f68, 0x10dd: 0x1f4f,
+	0x10de: 0x1f54, 0x10df: 0x1f7c, 0x10e0: 0x1f81, 0x10e1: 0x1fea, 0x10e2: 0x1fef, 0x10e3: 0x200d,
+	0x10e4: 0x2012, 0x10e5: 0x1fae, 0x10e6: 0x1fb3, 0x10e7: 0x1fb8, 0x10e8: 0x1fc2, 0x10e9: 0x1fbd,
+	0x10ea: 0x1f95, 0x10eb: 0x1fe0, 0x10ec: 0x2003, 0x10ed: 0x1fae, 0x10ee: 0x1fb3, 0x10ef: 0x1fb8,
+	0x10f0: 0x1fc2, 0x10f1: 0x1f9f, 0x10f2: 0x1fc7, 0x10f3: 0x201c, 0x10f4: 0x1f86, 0x10f5: 0x1f8b,
+	0x10f6: 0x1f90, 0x10f7: 0x1fae, 0x10f8: 0x1fb3, 0x10f9: 0x1fb8, 0x10fa: 0x201c, 0x10fb: 0x202b,
+	0x10fc: 0x4549, 0x10fd: 0x4549,
+	// Block 0x44, offset 0x1100
+	0x1110: 0x2441, 0x1111: 0x2456,
+	0x1112: 0x2456, 0x1113: 0x245d, 0x1114: 0x2464, 0x1115: 0x2479, 0x1116: 0x2480, 0x1117: 0x2487,
+	0x1118: 0x24aa, 0x1119: 0x24aa, 0x111a: 0x24cd, 0x111b: 0x24c6, 0x111c: 0x24e2, 0x111d: 0x24d4,
+	0x111e: 0x24db, 0x111f: 0x24fe, 0x1120: 0x24fe, 0x1121: 0x24f7, 0x1122: 0x2505, 0x1123: 0x2505,
+	0x1124: 0x252f, 0x1125: 0x252f, 0x1126: 0x254b, 0x1127: 0x2513, 0x1128: 0x2513, 0x1129: 0x250c,
+	0x112a: 0x2521, 0x112b: 0x2521, 0x112c: 0x2528, 0x112d: 0x2528, 0x112e: 0x2552, 0x112f: 0x2560,
+	0x1130: 0x2560, 0x1131: 0x2567, 0x1132: 0x2567, 0x1133: 0x256e, 0x1134: 0x2575, 0x1135: 0x257c,
+	0x1136: 0x2583, 0x1137: 0x2583, 0x1138: 0x258a, 0x1139: 0x2598, 0x113a: 0x25a6, 0x113b: 0x259f,
+	0x113c: 0x25ad, 0x113d: 0x25ad, 0x113e: 0x25c2, 0x113f: 0x25c9,
+	// Block 0x45, offset 0x1140
+	0x1140: 0x25fa, 0x1141: 0x2608, 0x1142: 0x2601, 0x1143: 0x25e5, 0x1144: 0x25e5, 0x1145: 0x260f,
+	0x1146: 0x260f, 0x1147: 0x2616, 0x1148: 0x2616, 0x1149: 0x2640, 0x114a: 0x2647, 0x114b: 0x264e,
+	0x114c: 0x2624, 0x114d: 0x2632, 0x114e: 0x2655, 0x114f: 0x265c,
+	0x1152: 0x262b, 0x1153: 0x26b0, 0x1154: 0x26b7, 0x1155: 0x268d, 0x1156: 0x2694, 0x1157: 0x2678,
+	0x1158: 0x2678, 0x1159: 0x267f, 0x115a: 0x26a9, 0x115b: 0x26a2, 0x115c: 0x26cc, 0x115d: 0x26cc,
+	0x115e: 0x243a, 0x115f: 0x244f, 0x1160: 0x2448, 0x1161: 0x2472, 0x1162: 0x246b, 0x1163: 0x2495,
+	0x1164: 0x248e, 0x1165: 0x24b8, 0x1166: 0x249c, 0x1167: 0x24b1, 0x1168: 0x24e9, 0x1169: 0x2536,
+	0x116a: 0x251a, 0x116b: 0x2559, 0x116c: 0x25f3, 0x116d: 0x261d, 0x116e: 0x26c5, 0x116f: 0x26be,
+	0x1170: 0x26d3, 0x1171: 0x266a, 0x1172: 0x25d0, 0x1173: 0x269b, 0x1174: 0x25c2, 0x1175: 0x25fa,
+	0x1176: 0x2591, 0x1177: 0x25de, 0x1178: 0x2671, 0x1179: 0x2663, 0x117a: 0x25ec, 0x117b: 0x25d7,
+	0x117c: 0x25ec, 0x117d: 0x2671, 0x117e: 0x24a3, 0x117f: 0x24bf,
+	// Block 0x46, offset 0x1180
+	0x1180: 0x2639, 0x1181: 0x25b4, 0x1182: 0x2433, 0x1183: 0x25d7, 0x1184: 0x257c, 0x1185: 0x254b,
+	0x1186: 0x24f0, 0x1187: 0x2686,
+	0x11b0: 0x2544, 0x11b1: 0x25bb, 0x11b2: 0x28f6, 0x11b3: 0x28ed, 0x11b4: 0x2923, 0x11b5: 0x2911,
+	0x11b6: 0x28ff, 0x11b7: 0x291a, 0x11b8: 0x292c, 0x11b9: 0x253d, 0x11ba: 0x2db3, 0x11bb: 0x2c33,
+	0x11bc: 0x2908,
+	// Block 0x47, offset 0x11c0
+	0x11d0: 0x0019, 0x11d1: 0x057e,
+	0x11d2: 0x0582, 0x11d3: 0x0035, 0x11d4: 0x0037, 0x11d5: 0x0003, 0x11d6: 0x003f, 0x11d7: 0x05ba,
+	0x11d8: 0x05be, 0x11d9: 0x1c8c,
+	0x11e0: 0x8133, 0x11e1: 0x8133, 0x11e2: 0x8133, 0x11e3: 0x8133,
+	0x11e4: 0x8133, 0x11e5: 0x8133, 0x11e6: 0x8133, 0x11e7: 0x812e, 0x11e8: 0x812e, 0x11e9: 0x812e,
+	0x11ea: 0x812e, 0x11eb: 0x812e, 0x11ec: 0x812e, 0x11ed: 0x812e, 0x11ee: 0x8133, 0x11ef: 0x8133,
+	0x11f0: 0x19a0, 0x11f1: 0x053a, 0x11f2: 0x0536, 0x11f3: 0x007f, 0x11f4: 0x007f, 0x11f5: 0x0011,
+	0x11f6: 0x0013, 0x11f7: 0x00b7, 0x11f8: 0x00bb, 0x11f9: 0x05b2, 0x11fa: 0x05b6, 0x11fb: 0x05a6,
+	0x11fc: 0x05aa, 0x11fd: 0x058e, 0x11fe: 0x0592, 0x11ff: 0x0586,
+	// Block 0x48, offset 0x1200
+	0x1200: 0x058a, 0x1201: 0x0596, 0x1202: 0x059a, 0x1203: 0x059e, 0x1204: 0x05a2,
+	0x1207: 0x0077, 0x1208: 0x007b, 0x1209: 0x43aa, 0x120a: 0x43aa, 0x120b: 0x43aa,
+	0x120c: 0x43aa, 0x120d: 0x007f, 0x120e: 0x007f, 0x120f: 0x007f, 0x1210: 0x0019, 0x1211: 0x057e,
+	0x1212: 0x001d, 0x1214: 0x0037, 0x1215: 0x0035, 0x1216: 0x003f, 0x1217: 0x0003,
+	0x1218: 0x053a, 0x1219: 0x0011, 0x121a: 0x0013, 0x121b: 0x00b7, 0x121c: 0x00bb, 0x121d: 0x05b2,
+	0x121e: 0x05b6, 0x121f: 0x0007, 0x1220: 0x000d, 0x1221: 0x0015, 0x1222: 0x0017, 0x1223: 0x001b,
+	0x1224: 0x0039, 0x1225: 0x003d, 0x1226: 0x003b, 0x1228: 0x0079, 0x1229: 0x0009,
+	0x122a: 0x000b, 0x122b: 0x0041,
+	0x1230: 0x43eb, 0x1231: 0x456d, 0x1232: 0x43f0, 0x1234: 0x43f5,
+	0x1236: 0x43fa, 0x1237: 0x4573, 0x1238: 0x43ff, 0x1239: 0x4579, 0x123a: 0x4404, 0x123b: 0x457f,
+	0x123c: 0x4409, 0x123d: 0x4585, 0x123e: 0x440e, 0x123f: 0x458b,
+	// Block 0x49, offset 0x1240
+	0x1240: 0x0329, 0x1241: 0x454f, 0x1242: 0x454f, 0x1243: 0x4555, 0x1244: 0x4555, 0x1245: 0x4597,
+	0x1246: 0x4597, 0x1247: 0x455b, 0x1248: 0x455b, 0x1249: 0x45a3, 0x124a: 0x45a3, 0x124b: 0x45a3,
+	0x124c: 0x45a3, 0x124d: 0x032c, 0x124e: 0x032c, 0x124f: 0x032f, 0x1250: 0x032f, 0x1251: 0x032f,
+	0x1252: 0x032f, 0x1253: 0x0332, 0x1254: 0x0332, 0x1255: 0x0335, 0x1256: 0x0335, 0x1257: 0x0335,
+	0x1258: 0x0335, 0x1259: 0x0338, 0x125a: 0x0338, 0x125b: 0x0338, 0x125c: 0x0338, 0x125d: 0x033b,
+	0x125e: 0x033b, 0x125f: 0x033b, 0x1260: 0x033b, 0x1261: 0x033e, 0x1262: 0x033e, 0x1263: 0x033e,
+	0x1264: 0x033e, 0x1265: 0x0341, 0x1266: 0x0341, 0x1267: 0x0341, 0x1268: 0x0341, 0x1269: 0x0344,
+	0x126a: 0x0344, 0x126b: 0x0347, 0x126c: 0x0347, 0x126d: 0x034a, 0x126e: 0x034a, 0x126f: 0x034d,
+	0x1270: 0x034d, 0x1271: 0x0350, 0x1272: 0x0350, 0x1273: 0x0350, 0x1274: 0x0350, 0x1275: 0x0353,
+	0x1276: 0x0353, 0x1277: 0x0353, 0x1278: 0x0353, 0x1279: 0x0356, 0x127a: 0x0356, 0x127b: 0x0356,
+	0x127c: 0x0356, 0x127d: 0x0359, 0x127e: 0x0359, 0x127f: 0x0359,
+	// Block 0x4a, offset 0x1280
+	0x1280: 0x0359, 0x1281: 0x035c, 0x1282: 0x035c, 0x1283: 0x035c, 0x1284: 0x035c, 0x1285: 0x035f,
+	0x1286: 0x035f, 0x1287: 0x035f, 0x1288: 0x035f, 0x1289: 0x0362, 0x128a: 0x0362, 0x128b: 0x0362,
+	0x128c: 0x0362, 0x128d: 0x0365, 0x128e: 0x0365, 0x128f: 0x0365, 0x1290: 0x0365, 0x1291: 0x0368,
+	0x1292: 0x0368, 0x1293: 0x0368, 0x1294: 0x0368, 0x1295: 0x036b, 0x1296: 0x036b, 0x1297: 0x036b,
+	0x1298: 0x036b, 0x1299: 0x036e, 0x129a: 0x036e, 0x129b: 0x036e, 0x129c: 0x036e, 0x129d: 0x0371,
+	0x129e: 0x0371, 0x129f: 0x0371, 0x12a0: 0x0371, 0x12a1: 0x0374, 0x12a2: 0x0374, 0x12a3: 0x0374,
+	0x12a4: 0x0374, 0x12a5: 0x0377, 0x12a6: 0x0377, 0x12a7: 0x0377, 0x12a8: 0x0377, 0x12a9: 0x037a,
+	0x12aa: 0x037a, 0x12ab: 0x037a, 0x12ac: 0x037a, 0x12ad: 0x037d, 0x12ae: 0x037d, 0x12af: 0x0380,
+	0x12b0: 0x0380, 0x12b1: 0x0383, 0x12b2: 0x0383, 0x12b3: 0x0383, 0x12b4: 0x0383, 0x12b5: 0x2f41,
+	0x12b6: 0x2f41, 0x12b7: 0x2f49, 0x12b8: 0x2f49, 0x12b9: 0x2f51, 0x12ba: 0x2f51, 0x12bb: 0x20b2,
+	0x12bc: 0x20b2,
+	// Block 0x4b, offset 0x12c0
+	0x12c0: 0x0081, 0x12c1: 0x0083, 0x12c2: 0x0085, 0x12c3: 0x0087, 0x12c4: 0x0089, 0x12c5: 0x008b,
+	0x12c6: 0x008d, 0x12c7: 0x008f, 0x12c8: 0x0091, 0x12c9: 0x0093, 0x12ca: 0x0095, 0x12cb: 0x0097,
+	0x12cc: 0x0099, 0x12cd: 0x009b, 0x12ce: 0x009d, 0x12cf: 0x009f, 0x12d0: 0x00a1, 0x12d1: 0x00a3,
+	0x12d2: 0x00a5, 0x12d3: 0x00a7, 0x12d4: 0x00a9, 0x12d5: 0x00ab, 0x12d6: 0x00ad, 0x12d7: 0x00af,
+	0x12d8: 0x00b1, 0x12d9: 0x00b3, 0x12da: 0x00b5, 0x12db: 0x00b7, 0x12dc: 0x00b9, 0x12dd: 0x00bb,
+	0x12de: 0x00bd, 0x12df: 0x056e, 0x12e0: 0x0572, 0x12e1: 0x0582, 0x12e2: 0x0596, 0x12e3: 0x059a,
+	0x12e4: 0x057e, 0x12e5: 0x06a6, 0x12e6: 0x069e, 0x12e7: 0x05c2, 0x12e8: 0x05ca, 0x12e9: 0x05d2,
+	0x12ea: 0x05da, 0x12eb: 0x05e2, 0x12ec: 0x0666, 0x12ed: 0x066e, 0x12ee: 0x0676, 0x12ef: 0x061a,
+	0x12f0: 0x06aa, 0x12f1: 0x05c6, 0x12f2: 0x05ce, 0x12f3: 0x05d6, 0x12f4: 0x05de, 0x12f5: 0x05e6,
+	0x12f6: 0x05ea, 0x12f7: 0x05ee, 0x12f8: 0x05f2, 0x12f9: 0x05f6, 0x12fa: 0x05fa, 0x12fb: 0x05fe,
+	0x12fc: 0x0602, 0x12fd: 0x0606, 0x12fe: 0x060a, 0x12ff: 0x060e,
+	// Block 0x4c, offset 0x1300
+	0x1300: 0x0612, 0x1301: 0x0616, 0x1302: 0x061e, 0x1303: 0x0622, 0x1304: 0x0626, 0x1305: 0x062a,
+	0x1306: 0x062e, 0x1307: 0x0632, 0x1308: 0x0636, 0x1309: 0x063a, 0x130a: 0x063e, 0x130b: 0x0642,
+	0x130c: 0x0646, 0x130d: 0x064a, 0x130e: 0x064e, 0x130f: 0x0652, 0x1310: 0x0656, 0x1311: 0x065a,
+	0x1312: 0x065e, 0x1313: 0x0662, 0x1314: 0x066a, 0x1315: 0x0672, 0x1316: 0x067a, 0x1317: 0x067e,
+	0x1318: 0x0682, 0x1319: 0x0686, 0x131a: 0x068a, 0x131b: 0x068e, 0x131c: 0x0692, 0x131d: 0x06a2,
+	0x131e: 0x4bb9, 0x131f: 0x4bbf, 0x1320: 0x04b6, 0x1321: 0x0406, 0x1322: 0x040a, 0x1323: 0x4b7c,
+	0x1324: 0x040e, 0x1325: 0x4b82, 0x1326: 0x4b88, 0x1327: 0x0412, 0x1328: 0x0416, 0x1329: 0x041a,
+	0x132a: 0x4b8e, 0x132b: 0x4b94, 0x132c: 0x4b9a, 0x132d: 0x4ba0, 0x132e: 0x4ba6, 0x132f: 0x4bac,
+	0x1330: 0x045a, 0x1331: 0x041e, 0x1332: 0x0422, 0x1333: 0x0426, 0x1334: 0x046e, 0x1335: 0x042a,
+	0x1336: 0x042e, 0x1337: 0x0432, 0x1338: 0x0436, 0x1339: 0x043a, 0x133a: 0x043e, 0x133b: 0x0442,
+	0x133c: 0x0446, 0x133d: 0x044a, 0x133e: 0x044e,
+	// Block 0x4d, offset 0x1340
+	0x1342: 0x4afe, 0x1343: 0x4b04, 0x1344: 0x4b0a, 0x1345: 0x4b10,
+	0x1346: 0x4b16, 0x1347: 0x4b1c, 0x134a: 0x4b22, 0x134b: 0x4b28,
+	0x134c: 0x4b2e, 0x134d: 0x4b34, 0x134e: 0x4b3a, 0x134f: 0x4b40,
+	0x1352: 0x4b46, 0x1353: 0x4b4c, 0x1354: 0x4b52, 0x1355: 0x4b58, 0x1356: 0x4b5e, 0x1357: 0x4b64,
+	0x135a: 0x4b6a, 0x135b: 0x4b70, 0x135c: 0x4b76,
+	0x1360: 0x00bf, 0x1361: 0x00c2, 0x1362: 0x00cb, 0x1363: 0x43a5,
+	0x1364: 0x00c8, 0x1365: 0x00c5, 0x1366: 0x053e, 0x1368: 0x0562, 0x1369: 0x0542,
+	0x136a: 0x0546, 0x136b: 0x054a, 0x136c: 0x054e, 0x136d: 0x0566, 0x136e: 0x056a,
+	// Block 0x4e, offset 0x1380
+	0x1381: 0x01f1, 0x1382: 0x01f4, 0x1383: 0x00d4, 0x1384: 0x01be, 0x1385: 0x010d,
+	0x1387: 0x01d3, 0x1388: 0x174e, 0x1389: 0x01d9, 0x138a: 0x01d6, 0x138b: 0x0116,
+	0x138c: 0x0119, 0x138d: 0x0526, 0x138e: 0x011c, 0x138f: 0x0128, 0x1390: 0x01e5, 0x1391: 0x013a,
+	0x1392: 0x0134, 0x1393: 0x012e, 0x1394: 0x01c1, 0x1395: 0x00e0, 0x1396: 0x01c4, 0x1397: 0x0143,
+	0x1398: 0x0194, 0x1399: 0x01e8, 0x139a: 0x01eb, 0x139b: 0x0152, 0x139c: 0x1756, 0x139d: 0x1742,
+	0x139e: 0x0158, 0x139f: 0x175b, 0x13a0: 0x01a9, 0x13a1: 0x1760, 0x13a2: 0x00da, 0x13a3: 0x0170,
+	0x13a4: 0x0173, 0x13a5: 0x00a3, 0x13a6: 0x017c, 0x13a7: 0x1765, 0x13a8: 0x0182, 0x13a9: 0x0185,
+	0x13aa: 0x0188, 0x13ab: 0x01e2, 0x13ac: 0x01dc, 0x13ad: 0x1752, 0x13ae: 0x01df, 0x13af: 0x0197,
+	0x13b0: 0x0576, 0x13b2: 0x01ac, 0x13b3: 0x01cd, 0x13b4: 0x01d0, 0x13b5: 0x01bb,
+	0x13b6: 0x00f5, 0x13b7: 0x00f8, 0x13b8: 0x00fb, 0x13b9: 0x176a, 0x13ba: 0x176f,
+	// Block 0x4f, offset 0x13c0
+	0x13c0: 0x0063, 0x13c1: 0x0065, 0x13c2: 0x0067, 0x13c3: 0x0069, 0x13c4: 0x006b, 0x13c5: 0x006d,
+	0x13c6: 0x006f, 0x13c7: 0x0071, 0x13c8: 0x0073, 0x13c9: 0x0075, 0x13ca: 0x0083, 0x13cb: 0x0085,
+	0x13cc: 0x0087, 0x13cd: 0x0089, 0x13ce: 0x008b, 0x13cf: 0x008d, 0x13d0: 0x008f, 0x13d1: 0x0091,
+	0x13d2: 0x0093, 0x13d3: 0x0095, 0x13d4: 0x0097, 0x13d5: 0x0099, 0x13d6: 0x009b, 0x13d7: 0x009d,
+	0x13d8: 0x009f, 0x13d9: 0x00a1, 0x13da: 0x00a3, 0x13db: 0x00a5, 0x13dc: 0x00a7, 0x13dd: 0x00a9,
+	0x13de: 0x00ab, 0x13df: 0x00ad, 0x13e0: 0x00af, 0x13e1: 0x00b1, 0x13e2: 0x00b3, 0x13e3: 0x00b5,
+	0x13e4: 0x00e3, 0x13e5: 0x0101, 0x13e8: 0x01f7, 0x13e9: 0x01fa,
+	0x13ea: 0x01fd, 0x13eb: 0x0200, 0x13ec: 0x0203, 0x13ed: 0x0206, 0x13ee: 0x0209, 0x13ef: 0x020c,
+	0x13f0: 0x020f, 0x13f1: 0x0212, 0x13f2: 0x0215, 0x13f3: 0x0218, 0x13f4: 0x021b, 0x13f5: 0x021e,
+	0x13f6: 0x0221, 0x13f7: 0x0224, 0x13f8: 0x0227, 0x13f9: 0x020c, 0x13fa: 0x022a, 0x13fb: 0x022d,
+	0x13fc: 0x0230, 0x13fd: 0x0233, 0x13fe: 0x0236, 0x13ff: 0x0239,
+	// Block 0x50, offset 0x1400
+	0x1400: 0x0281, 0x1401: 0x0284, 0x1402: 0x0287, 0x1403: 0x0552, 0x1404: 0x024b, 0x1405: 0x0254,
+	0x1406: 0x025a, 0x1407: 0x027e, 0x1408: 0x026f, 0x1409: 0x026c, 0x140a: 0x028a, 0x140b: 0x028d,
+	0x140e: 0x0021, 0x140f: 0x0023, 0x1410: 0x0025, 0x1411: 0x0027,
+	0x1412: 0x0029, 0x1413: 0x002b, 0x1414: 0x002d, 0x1415: 0x002f, 0x1416: 0x0031, 0x1417: 0x0033,
+	0x1418: 0x0021, 0x1419: 0x0023, 0x141a: 0x0025, 0x141b: 0x0027, 0x141c: 0x0029, 0x141d: 0x002b,
+	0x141e: 0x002d, 0x141f: 0x002f, 0x1420: 0x0031, 0x1421: 0x0033, 0x1422: 0x0021, 0x1423: 0x0023,
+	0x1424: 0x0025, 0x1425: 0x0027, 0x1426: 0x0029, 0x1427: 0x002b, 0x1428: 0x002d, 0x1429: 0x002f,
+	0x142a: 0x0031, 0x142b: 0x0033, 0x142c: 0x0021, 0x142d: 0x0023, 0x142e: 0x0025, 0x142f: 0x0027,
+	0x1430: 0x0029, 0x1431: 0x002b, 0x1432: 0x002d, 0x1433: 0x002f, 0x1434: 0x0031, 0x1435: 0x0033,
+	0x1436: 0x0021, 0x1437: 0x0023, 0x1438: 0x0025, 0x1439: 0x0027, 0x143a: 0x0029, 0x143b: 0x002b,
+	0x143c: 0x002d, 0x143d: 0x002f, 0x143e: 0x0031, 0x143f: 0x0033,
+	// Block 0x51, offset 0x1440
+	0x1440: 0x8133, 0x1441: 0x8133, 0x1442: 0x8133, 0x1443: 0x8133, 0x1444: 0x8133, 0x1445: 0x8133,
+	0x1446: 0x8133, 0x1448: 0x8133, 0x1449: 0x8133, 0x144a: 0x8133, 0x144b: 0x8133,
+	0x144c: 0x8133, 0x144d: 0x8133, 0x144e: 0x8133, 0x144f: 0x8133, 0x1450: 0x8133, 0x1451: 0x8133,
+	0x1452: 0x8133, 0x1453: 0x8133, 0x1454: 0x8133, 0x1455: 0x8133, 0x1456: 0x8133, 0x1457: 0x8133,
+	0x1458: 0x8133, 0x145b: 0x8133, 0x145c: 0x8133, 0x145d: 0x8133,
+	0x145e: 0x8133, 0x145f: 0x8133, 0x1460: 0x8133, 0x1461: 0x8133, 0x1463: 0x8133,
+	0x1464: 0x8133, 0x1466: 0x8133, 0x1467: 0x8133, 0x1468: 0x8133, 0x1469: 0x8133,
+	0x146a: 0x8133,
+	0x1470: 0x0290, 0x1471: 0x0293, 0x1472: 0x0296, 0x1473: 0x0299, 0x1474: 0x029c, 0x1475: 0x029f,
+	0x1476: 0x02a2, 0x1477: 0x02a5, 0x1478: 0x02a8, 0x1479: 0x02ab, 0x147a: 0x02ae, 0x147b: 0x02b1,
+	0x147c: 0x02b7, 0x147d: 0x02ba, 0x147e: 0x02bd, 0x147f: 0x02c0,
+	// Block 0x52, offset 0x1480
+	0x1480: 0x02c3, 0x1481: 0x02c6, 0x1482: 0x02c9, 0x1483: 0x02cc, 0x1484: 0x02cf, 0x1485: 0x02d2,
+	0x1486: 0x02d5, 0x1487: 0x02db, 0x1488: 0x02e1, 0x1489: 0x02e4, 0x148a: 0x1736, 0x148b: 0x0302,
+	0x148c: 0x02ea, 0x148d: 0x02ed, 0x148e: 0x0305, 0x148f: 0x02f9, 0x1490: 0x02ff, 0x1491: 0x0290,
+	0x1492: 0x0293, 0x1493: 0x0296, 0x1494: 0x0299, 0x1495: 0x029c, 0x1496: 0x029f, 0x1497: 0x02a2,
+	0x1498: 0x02a5, 0x1499: 0x02a8, 0x149a: 0x02ab, 0x149b: 0x02ae, 0x149c: 0x02b7, 0x149d: 0x02ba,
+	0x149e: 0x02c0, 0x149f: 0x02c6, 0x14a0: 0x02c9, 0x14a1: 0x02cc, 0x14a2: 0x02cf, 0x14a3: 0x02d2,
+	0x14a4: 0x02d5, 0x14a5: 0x02d8, 0x14a6: 0x02db, 0x14a7: 0x02f3, 0x14a8: 0x02ea, 0x14a9: 0x02e7,
+	0x14aa: 0x02f0, 0x14ab: 0x02f6, 0x14ac: 0x1732, 0x14ad: 0x02fc,
+	// Block 0x53, offset 0x14c0
+	0x14c0: 0x032c, 0x14c1: 0x032f, 0x14c2: 0x033b, 0x14c3: 0x0344, 0x14c5: 0x037d,
+	0x14c6: 0x034d, 0x14c7: 0x033e, 0x14c8: 0x035c, 0x14c9: 0x0383, 0x14ca: 0x036e, 0x14cb: 0x0371,
+	0x14cc: 0x0374, 0x14cd: 0x0377, 0x14ce: 0x0350, 0x14cf: 0x0362, 0x14d0: 0x0368, 0x14d1: 0x0356,
+	0x14d2: 0x036b, 0x14d3: 0x034a, 0x14d4: 0x0353, 0x14d5: 0x0335, 0x14d6: 0x0338, 0x14d7: 0x0341,
+	0x14d8: 0x0347, 0x14d9: 0x0359, 0x14da: 0x035f, 0x14db: 0x0365, 0x14dc: 0x0386, 0x14dd: 0x03d7,
+	0x14de: 0x03bf, 0x14df: 0x0389, 0x14e1: 0x032f, 0x14e2: 0x033b,
+	0x14e4: 0x037a, 0x14e7: 0x033e, 0x14e9: 0x0383,
+	0x14ea: 0x036e, 0x14eb: 0x0371, 0x14ec: 0x0374, 0x14ed: 0x0377, 0x14ee: 0x0350, 0x14ef: 0x0362,
+	0x14f0: 0x0368, 0x14f1: 0x0356, 0x14f2: 0x036b, 0x14f4: 0x0353, 0x14f5: 0x0335,
+	0x14f6: 0x0338, 0x14f7: 0x0341, 0x14f9: 0x0359, 0x14fb: 0x0365,
+	// Block 0x54, offset 0x1500
+	0x1502: 0x033b,
+	0x1507: 0x033e, 0x1509: 0x0383, 0x150b: 0x0371,
+	0x150d: 0x0377, 0x150e: 0x0350, 0x150f: 0x0362, 0x1511: 0x0356,
+	0x1512: 0x036b, 0x1514: 0x0353, 0x1517: 0x0341,
+	0x1519: 0x0359, 0x151b: 0x0365, 0x151d: 0x03d7,
+	0x151f: 0x0389, 0x1521: 0x032f, 0x1522: 0x033b,
+	0x1524: 0x037a, 0x1527: 0x033e, 0x1528: 0x035c, 0x1529: 0x0383,
+	0x152a: 0x036e, 0x152c: 0x0374, 0x152d: 0x0377, 0x152e: 0x0350, 0x152f: 0x0362,
+	0x1530: 0x0368, 0x1531: 0x0356, 0x1532: 0x036b, 0x1534: 0x0353, 0x1535: 0x0335,
+	0x1536: 0x0338, 0x1537: 0x0341, 0x1539: 0x0359, 0x153a: 0x035f, 0x153b: 0x0365,
+	0x153c: 0x0386, 0x153e: 0x03bf,
+	// Block 0x55, offset 0x1540
+	0x1540: 0x032c, 0x1541: 0x032f, 0x1542: 0x033b, 0x1543: 0x0344, 0x1544: 0x037a, 0x1545: 0x037d,
+	0x1546: 0x034d, 0x1547: 0x033e, 0x1548: 0x035c, 0x1549: 0x0383, 0x154b: 0x0371,
+	0x154c: 0x0374, 0x154d: 0x0377, 0x154e: 0x0350, 0x154f: 0x0362, 0x1550: 0x0368, 0x1551: 0x0356,
+	0x1552: 0x036b, 0x1553: 0x034a, 0x1554: 0x0353, 0x1555: 0x0335, 0x1556: 0x0338, 0x1557: 0x0341,
+	0x1558: 0x0347, 0x1559: 0x0359, 0x155a: 0x035f, 0x155b: 0x0365,
+	0x1561: 0x032f, 0x1562: 0x033b, 0x1563: 0x0344,
+	0x1565: 0x037d, 0x1566: 0x034d, 0x1567: 0x033e, 0x1568: 0x035c, 0x1569: 0x0383,
+	0x156b: 0x0371, 0x156c: 0x0374, 0x156d: 0x0377, 0x156e: 0x0350, 0x156f: 0x0362,
+	0x1570: 0x0368, 0x1571: 0x0356, 0x1572: 0x036b, 0x1573: 0x034a, 0x1574: 0x0353, 0x1575: 0x0335,
+	0x1576: 0x0338, 0x1577: 0x0341, 0x1578: 0x0347, 0x1579: 0x0359, 0x157a: 0x035f, 0x157b: 0x0365,
+	// Block 0x56, offset 0x1580
+	0x1580: 0x19a6, 0x1581: 0x19a3, 0x1582: 0x19a9, 0x1583: 0x19cd, 0x1584: 0x19f1, 0x1585: 0x1a15,
+	0x1586: 0x1a39, 0x1587: 0x1a42, 0x1588: 0x1a48, 0x1589: 0x1a4e, 0x158a: 0x1a54,
+	0x1590: 0x1bbc, 0x1591: 0x1bc0,
+	0x1592: 0x1bc4, 0x1593: 0x1bc8, 0x1594: 0x1bcc, 0x1595: 0x1bd0, 0x1596: 0x1bd4, 0x1597: 0x1bd8,
+	0x1598: 0x1bdc, 0x1599: 0x1be0, 0x159a: 0x1be4, 0x159b: 0x1be8, 0x159c: 0x1bec, 0x159d: 0x1bf0,
+	0x159e: 0x1bf4, 0x159f: 0x1bf8, 0x15a0: 0x1bfc, 0x15a1: 0x1c00, 0x15a2: 0x1c04, 0x15a3: 0x1c08,
+	0x15a4: 0x1c0c, 0x15a5: 0x1c10, 0x15a6: 0x1c14, 0x15a7: 0x1c18, 0x15a8: 0x1c1c, 0x15a9: 0x1c20,
+	0x15aa: 0x2855, 0x15ab: 0x0047, 0x15ac: 0x0065, 0x15ad: 0x1a69, 0x15ae: 0x1ae1,
+	0x15b0: 0x0043, 0x15b1: 0x0045, 0x15b2: 0x0047, 0x15b3: 0x0049, 0x15b4: 0x004b, 0x15b5: 0x004d,
+	0x15b6: 0x004f, 0x15b7: 0x0051, 0x15b8: 0x0053, 0x15b9: 0x0055, 0x15ba: 0x0057, 0x15bb: 0x0059,
+	0x15bc: 0x005b, 0x15bd: 0x005d, 0x15be: 0x005f, 0x15bf: 0x0061,
+	// Block 0x57, offset 0x15c0
+	0x15c0: 0x27dd, 0x15c1: 0x27f2, 0x15c2: 0x05fe,
+	0x15d0: 0x0d0a, 0x15d1: 0x0b42,
+	0x15d2: 0x09ce, 0x15d3: 0x4705, 0x15d4: 0x0816, 0x15d5: 0x0aea, 0x15d6: 0x142a, 0x15d7: 0x0afa,
+	0x15d8: 0x0822, 0x15d9: 0x0dd2, 0x15da: 0x0faa, 0x15db: 0x0daa, 0x15dc: 0x0922, 0x15dd: 0x0c66,
+	0x15de: 0x08ba, 0x15df: 0x0db2, 0x15e0: 0x090e, 0x15e1: 0x1212, 0x15e2: 0x107e, 0x15e3: 0x1486,
+	0x15e4: 0x0ace, 0x15e5: 0x0a06, 0x15e6: 0x0f5e, 0x15e7: 0x0d16, 0x15e8: 0x0d42, 0x15e9: 0x07ba,
+	0x15ea: 0x07c6, 0x15eb: 0x1506, 0x15ec: 0x0bd6, 0x15ed: 0x07e2, 0x15ee: 0x09ea, 0x15ef: 0x0d36,
+	0x15f0: 0x14ae, 0x15f1: 0x0d0e, 0x15f2: 0x116a, 0x15f3: 0x11a6, 0x15f4: 0x09f2, 0x15f5: 0x0f3e,
+	0x15f6: 0x0e06, 0x15f7: 0x0e02, 0x15f8: 0x1092, 0x15f9: 0x0926, 0x15fa: 0x0a52, 0x15fb: 0x153e,
+	// Block 0x58, offset 0x1600
+	0x1600: 0x07f6, 0x1601: 0x07ee, 0x1602: 0x07fe, 0x1603: 0x1774, 0x1604: 0x0842, 0x1605: 0x0852,
+	0x1606: 0x0856, 0x1607: 0x085e, 0x1608: 0x0866, 0x1609: 0x086a, 0x160a: 0x0876, 0x160b: 0x086e,
+	0x160c: 0x06ae, 0x160d: 0x1788, 0x160e: 0x088a, 0x160f: 0x088e, 0x1610: 0x0892, 0x1611: 0x08ae,
+	0x1612: 0x1779, 0x1613: 0x06b2, 0x1614: 0x089a, 0x1615: 0x08ba, 0x1616: 0x1783, 0x1617: 0x08ca,
+	0x1618: 0x08d2, 0x1619: 0x0832, 0x161a: 0x08da, 0x161b: 0x08de, 0x161c: 0x195e, 0x161d: 0x08fa,
+	0x161e: 0x0902, 0x161f: 0x06ba, 0x1620: 0x091a, 0x1621: 0x091e, 0x1622: 0x0926, 0x1623: 0x092a,
+	0x1624: 0x06be, 0x1625: 0x0942, 0x1626: 0x0946, 0x1627: 0x0952, 0x1628: 0x095e, 0x1629: 0x0962,
+	0x162a: 0x0966, 0x162b: 0x096e, 0x162c: 0x098e, 0x162d: 0x0992, 0x162e: 0x099a, 0x162f: 0x09aa,
+	0x1630: 0x09b2, 0x1631: 0x09b6, 0x1632: 0x09b6, 0x1633: 0x09b6, 0x1634: 0x1797, 0x1635: 0x0f8e,
+	0x1636: 0x09ca, 0x1637: 0x09d2, 0x1638: 0x179c, 0x1639: 0x09de, 0x163a: 0x09e6, 0x163b: 0x09ee,
+	0x163c: 0x0a16, 0x163d: 0x0a02, 0x163e: 0x0a0e, 0x163f: 0x0a12,
+	// Block 0x59, offset 0x1640
+	0x1640: 0x0a1a, 0x1641: 0x0a22, 0x1642: 0x0a26, 0x1643: 0x0a2e, 0x1644: 0x0a36, 0x1645: 0x0a3a,
+	0x1646: 0x0a3a, 0x1647: 0x0a42, 0x1648: 0x0a4a, 0x1649: 0x0a4e, 0x164a: 0x0a5a, 0x164b: 0x0a7e,
+	0x164c: 0x0a62, 0x164d: 0x0a82, 0x164e: 0x0a66, 0x164f: 0x0a6e, 0x1650: 0x0906, 0x1651: 0x0aca,
+	0x1652: 0x0a92, 0x1653: 0x0a96, 0x1654: 0x0a9a, 0x1655: 0x0a8e, 0x1656: 0x0aa2, 0x1657: 0x0a9e,
+	0x1658: 0x0ab6, 0x1659: 0x17a1, 0x165a: 0x0ad2, 0x165b: 0x0ad6, 0x165c: 0x0ade, 0x165d: 0x0aea,
+	0x165e: 0x0af2, 0x165f: 0x0b0e, 0x1660: 0x17a6, 0x1661: 0x17ab, 0x1662: 0x0b1a, 0x1663: 0x0b1e,
+	0x1664: 0x0b22, 0x1665: 0x0b16, 0x1666: 0x0b2a, 0x1667: 0x06c2, 0x1668: 0x06c6, 0x1669: 0x0b32,
+	0x166a: 0x0b3a, 0x166b: 0x0b3a, 0x166c: 0x17b0, 0x166d: 0x0b56, 0x166e: 0x0b5a, 0x166f: 0x0b5e,
+	0x1670: 0x0b66, 0x1671: 0x17b5, 0x1672: 0x0b6e, 0x1673: 0x0b72, 0x1674: 0x0c4a, 0x1675: 0x0b7a,
+	0x1676: 0x06ca, 0x1677: 0x0b86, 0x1678: 0x0b96, 0x1679: 0x0ba2, 0x167a: 0x0b9e, 0x167b: 0x17bf,
+	0x167c: 0x0baa, 0x167d: 0x17c4, 0x167e: 0x0bb6, 0x167f: 0x0bb2,
+	// Block 0x5a, offset 0x1680
+	0x1680: 0x0bba, 0x1681: 0x0bca, 0x1682: 0x0bce, 0x1683: 0x06ce, 0x1684: 0x0bde, 0x1685: 0x0be6,
+	0x1686: 0x0bea, 0x1687: 0x0bee, 0x1688: 0x06d2, 0x1689: 0x17c9, 0x168a: 0x06d6, 0x168b: 0x0c0a,
+	0x168c: 0x0c0e, 0x168d: 0x0c12, 0x168e: 0x0c1a, 0x168f: 0x1990, 0x1690: 0x0c32, 0x1691: 0x17d3,
+	0x1692: 0x17d3, 0x1693: 0x12d2, 0x1694: 0x0c42, 0x1695: 0x0c42, 0x1696: 0x06da, 0x1697: 0x17f6,
+	0x1698: 0x18c8, 0x1699: 0x0c52, 0x169a: 0x0c5a, 0x169b: 0x06de, 0x169c: 0x0c6e, 0x169d: 0x0c7e,
+	0x169e: 0x0c82, 0x169f: 0x0c8a, 0x16a0: 0x0c9a, 0x16a1: 0x06e6, 0x16a2: 0x06e2, 0x16a3: 0x0c9e,
+	0x16a4: 0x17d8, 0x16a5: 0x0ca2, 0x16a6: 0x0cb6, 0x16a7: 0x0cba, 0x16a8: 0x0cbe, 0x16a9: 0x0cba,
+	0x16aa: 0x0cca, 0x16ab: 0x0cce, 0x16ac: 0x0cde, 0x16ad: 0x0cd6, 0x16ae: 0x0cda, 0x16af: 0x0ce2,
+	0x16b0: 0x0ce6, 0x16b1: 0x0cea, 0x16b2: 0x0cf6, 0x16b3: 0x0cfa, 0x16b4: 0x0d12, 0x16b5: 0x0d1a,
+	0x16b6: 0x0d2a, 0x16b7: 0x0d3e, 0x16b8: 0x17e7, 0x16b9: 0x0d3a, 0x16ba: 0x0d2e, 0x16bb: 0x0d46,
+	0x16bc: 0x0d4e, 0x16bd: 0x0d62, 0x16be: 0x17ec, 0x16bf: 0x0d6a,
+	// Block 0x5b, offset 0x16c0
+	0x16c0: 0x0d5e, 0x16c1: 0x0d56, 0x16c2: 0x06ea, 0x16c3: 0x0d72, 0x16c4: 0x0d7a, 0x16c5: 0x0d82,
+	0x16c6: 0x0d76, 0x16c7: 0x06ee, 0x16c8: 0x0d92, 0x16c9: 0x0d9a, 0x16ca: 0x17f1, 0x16cb: 0x0dc6,
+	0x16cc: 0x0dfa, 0x16cd: 0x0dd6, 0x16ce: 0x06fa, 0x16cf: 0x0de2, 0x16d0: 0x06f6, 0x16d1: 0x06f2,
+	0x16d2: 0x08be, 0x16d3: 0x08c2, 0x16d4: 0x0dfe, 0x16d5: 0x0de6, 0x16d6: 0x12a6, 0x16d7: 0x075e,
+	0x16d8: 0x0e0a, 0x16d9: 0x0e0e, 0x16da: 0x0e12, 0x16db: 0x0e26, 0x16dc: 0x0e1e, 0x16dd: 0x180a,
+	0x16de: 0x06fe, 0x16df: 0x0e3a, 0x16e0: 0x0e2e, 0x16e1: 0x0e4a, 0x16e2: 0x0e52, 0x16e3: 0x1814,
+	0x16e4: 0x0e56, 0x16e5: 0x0e42, 0x16e6: 0x0e5e, 0x16e7: 0x0702, 0x16e8: 0x0e62, 0x16e9: 0x0e66,
+	0x16ea: 0x0e6a, 0x16eb: 0x0e76, 0x16ec: 0x1819, 0x16ed: 0x0e7e, 0x16ee: 0x0706, 0x16ef: 0x0e8a,
+	0x16f0: 0x181e, 0x16f1: 0x0e8e, 0x16f2: 0x070a, 0x16f3: 0x0e9a, 0x16f4: 0x0ea6, 0x16f5: 0x0eb2,
+	0x16f6: 0x0eb6, 0x16f7: 0x1823, 0x16f8: 0x17ba, 0x16f9: 0x1828, 0x16fa: 0x0ed6, 0x16fb: 0x182d,
+	0x16fc: 0x0ee2, 0x16fd: 0x0eea, 0x16fe: 0x0eda, 0x16ff: 0x0ef6,
+	// Block 0x5c, offset 0x1700
+	0x1700: 0x0f06, 0x1701: 0x0f16, 0x1702: 0x0f0a, 0x1703: 0x0f0e, 0x1704: 0x0f1a, 0x1705: 0x0f1e,
+	0x1706: 0x1832, 0x1707: 0x0f02, 0x1708: 0x0f36, 0x1709: 0x0f3a, 0x170a: 0x070e, 0x170b: 0x0f4e,
+	0x170c: 0x0f4a, 0x170d: 0x1837, 0x170e: 0x0f2e, 0x170f: 0x0f6a, 0x1710: 0x183c, 0x1711: 0x1841,
+	0x1712: 0x0f6e, 0x1713: 0x0f82, 0x1714: 0x0f7e, 0x1715: 0x0f7a, 0x1716: 0x0712, 0x1717: 0x0f86,
+	0x1718: 0x0f96, 0x1719: 0x0f92, 0x171a: 0x0f9e, 0x171b: 0x177e, 0x171c: 0x0fae, 0x171d: 0x1846,
+	0x171e: 0x0fba, 0x171f: 0x1850, 0x1720: 0x0fce, 0x1721: 0x0fda, 0x1722: 0x0fee, 0x1723: 0x1855,
+	0x1724: 0x1002, 0x1725: 0x1006, 0x1726: 0x185a, 0x1727: 0x185f, 0x1728: 0x1022, 0x1729: 0x1032,
+	0x172a: 0x0716, 0x172b: 0x1036, 0x172c: 0x071a, 0x172d: 0x071a, 0x172e: 0x104e, 0x172f: 0x1052,
+	0x1730: 0x105a, 0x1731: 0x105e, 0x1732: 0x106a, 0x1733: 0x071e, 0x1734: 0x1082, 0x1735: 0x1864,
+	0x1736: 0x109e, 0x1737: 0x1869, 0x1738: 0x10aa, 0x1739: 0x17ce, 0x173a: 0x10ba, 0x173b: 0x186e,
+	0x173c: 0x1873, 0x173d: 0x1878, 0x173e: 0x0722, 0x173f: 0x0726,
+	// Block 0x5d, offset 0x1740
+	0x1740: 0x10f2, 0x1741: 0x1882, 0x1742: 0x187d, 0x1743: 0x1887, 0x1744: 0x188c, 0x1745: 0x10fa,
+	0x1746: 0x10fe, 0x1747: 0x10fe, 0x1748: 0x1106, 0x1749: 0x072e, 0x174a: 0x110a, 0x174b: 0x0732,
+	0x174c: 0x0736, 0x174d: 0x1896, 0x174e: 0x111e, 0x174f: 0x1126, 0x1750: 0x1132, 0x1751: 0x073a,
+	0x1752: 0x189b, 0x1753: 0x1156, 0x1754: 0x18a0, 0x1755: 0x18a5, 0x1756: 0x1176, 0x1757: 0x118e,
+	0x1758: 0x073e, 0x1759: 0x1196, 0x175a: 0x119a, 0x175b: 0x119e, 0x175c: 0x18aa, 0x175d: 0x18af,
+	0x175e: 0x18af, 0x175f: 0x11b6, 0x1760: 0x0742, 0x1761: 0x18b4, 0x1762: 0x11ca, 0x1763: 0x11ce,
+	0x1764: 0x0746, 0x1765: 0x18b9, 0x1766: 0x11ea, 0x1767: 0x074a, 0x1768: 0x11fa, 0x1769: 0x11f2,
+	0x176a: 0x1202, 0x176b: 0x18c3, 0x176c: 0x121a, 0x176d: 0x074e, 0x176e: 0x1226, 0x176f: 0x122e,
+	0x1770: 0x123e, 0x1771: 0x0752, 0x1772: 0x18cd, 0x1773: 0x18d2, 0x1774: 0x0756, 0x1775: 0x18d7,
+	0x1776: 0x1256, 0x1777: 0x18dc, 0x1778: 0x1262, 0x1779: 0x126e, 0x177a: 0x1276, 0x177b: 0x18e1,
+	0x177c: 0x18e6, 0x177d: 0x128a, 0x177e: 0x18eb, 0x177f: 0x1292,
+	// Block 0x5e, offset 0x1780
+	0x1780: 0x17fb, 0x1781: 0x075a, 0x1782: 0x12aa, 0x1783: 0x12ae, 0x1784: 0x0762, 0x1785: 0x12b2,
+	0x1786: 0x0b2e, 0x1787: 0x18f0, 0x1788: 0x18f5, 0x1789: 0x1800, 0x178a: 0x1805, 0x178b: 0x12d2,
+	0x178c: 0x12d6, 0x178d: 0x14ee, 0x178e: 0x0766, 0x178f: 0x1302, 0x1790: 0x12fe, 0x1791: 0x1306,
+	0x1792: 0x093a, 0x1793: 0x130a, 0x1794: 0x130e, 0x1795: 0x1312, 0x1796: 0x131a, 0x1797: 0x18fa,
+	0x1798: 0x1316, 0x1799: 0x131e, 0x179a: 0x1332, 0x179b: 0x1336, 0x179c: 0x1322, 0x179d: 0x133a,
+	0x179e: 0x134e, 0x179f: 0x1362, 0x17a0: 0x132e, 0x17a1: 0x1342, 0x17a2: 0x1346, 0x17a3: 0x134a,
+	0x17a4: 0x18ff, 0x17a5: 0x1909, 0x17a6: 0x1904, 0x17a7: 0x076a, 0x17a8: 0x136a, 0x17a9: 0x136e,
+	0x17aa: 0x1376, 0x17ab: 0x191d, 0x17ac: 0x137a, 0x17ad: 0x190e, 0x17ae: 0x076e, 0x17af: 0x0772,
+	0x17b0: 0x1913, 0x17b1: 0x1918, 0x17b2: 0x0776, 0x17b3: 0x139a, 0x17b4: 0x139e, 0x17b5: 0x13a2,
+	0x17b6: 0x13a6, 0x17b7: 0x13b2, 0x17b8: 0x13ae, 0x17b9: 0x13ba, 0x17ba: 0x13b6, 0x17bb: 0x13c6,
+	0x17bc: 0x13be, 0x17bd: 0x13c2, 0x17be: 0x13ca, 0x17bf: 0x077a,
+	// Block 0x5f, offset 0x17c0
+	0x17c0: 0x13d2, 0x17c1: 0x13d6, 0x17c2: 0x077e, 0x17c3: 0x13e6, 0x17c4: 0x13ea, 0x17c5: 0x1922,
+	0x17c6: 0x13f6, 0x17c7: 0x13fa, 0x17c8: 0x0782, 0x17c9: 0x1406, 0x17ca: 0x06b6, 0x17cb: 0x1927,
+	0x17cc: 0x192c, 0x17cd: 0x0786, 0x17ce: 0x078a, 0x17cf: 0x1432, 0x17d0: 0x144a, 0x17d1: 0x1466,
+	0x17d2: 0x1476, 0x17d3: 0x1931, 0x17d4: 0x148a, 0x17d5: 0x148e, 0x17d6: 0x14a6, 0x17d7: 0x14b2,
+	0x17d8: 0x193b, 0x17d9: 0x178d, 0x17da: 0x14be, 0x17db: 0x14ba, 0x17dc: 0x14c6, 0x17dd: 0x1792,
+	0x17de: 0x14d2, 0x17df: 0x14de, 0x17e0: 0x1940, 0x17e1: 0x1945, 0x17e2: 0x151e, 0x17e3: 0x152a,
+	0x17e4: 0x1532, 0x17e5: 0x194a, 0x17e6: 0x1536, 0x17e7: 0x1562, 0x17e8: 0x156e, 0x17e9: 0x1572,
+	0x17ea: 0x156a, 0x17eb: 0x157e, 0x17ec: 0x1582, 0x17ed: 0x194f, 0x17ee: 0x158e, 0x17ef: 0x078e,
+	0x17f0: 0x1596, 0x17f1: 0x1954, 0x17f2: 0x0792, 0x17f3: 0x15ce, 0x17f4: 0x0bbe, 0x17f5: 0x15e6,
+	0x17f6: 0x1959, 0x17f7: 0x1963, 0x17f8: 0x0796, 0x17f9: 0x079a, 0x17fa: 0x160e, 0x17fb: 0x1968,
+	0x17fc: 0x079e, 0x17fd: 0x196d, 0x17fe: 0x1626, 0x17ff: 0x1626,
+	// Block 0x60, offset 0x1800
+	0x1800: 0x162e, 0x1801: 0x1972, 0x1802: 0x1646, 0x1803: 0x07a2, 0x1804: 0x1656, 0x1805: 0x1662,
+	0x1806: 0x166a, 0x1807: 0x1672, 0x1808: 0x07a6, 0x1809: 0x1977, 0x180a: 0x1686, 0x180b: 0x16a2,
+	0x180c: 0x16ae, 0x180d: 0x07aa, 0x180e: 0x07ae, 0x180f: 0x16b2, 0x1810: 0x197c, 0x1811: 0x07b2,
+	0x1812: 0x1981, 0x1813: 0x1986, 0x1814: 0x198b, 0x1815: 0x16d6, 0x1816: 0x07b6, 0x1817: 0x16ea,
+	0x1818: 0x16f2, 0x1819: 0x16f6, 0x181a: 0x16fe, 0x181b: 0x1706, 0x181c: 0x170e, 0x181d: 0x1995,
+}
+
+// nfkcIndex: 22 blocks, 1408 entries, 2816 bytes
+// Block 0 is the zero block.
+var nfkcIndex = [1408]uint16{
+	// Block 0x0, offset 0x0
+	// Block 0x1, offset 0x40
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc2: 0x5f, 0xc3: 0x01, 0xc4: 0x02, 0xc5: 0x03, 0xc6: 0x60, 0xc7: 0x04,
+	0xc8: 0x05, 0xca: 0x61, 0xcb: 0x62, 0xcc: 0x06, 0xcd: 0x07, 0xce: 0x08, 0xcf: 0x09,
+	0xd0: 0x0a, 0xd1: 0x63, 0xd2: 0x64, 0xd3: 0x0b, 0xd6: 0x0c, 0xd7: 0x65,
+	0xd8: 0x66, 0xd9: 0x0d, 0xdb: 0x67, 0xdc: 0x68, 0xdd: 0x69, 0xdf: 0x6a,
+	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05,
+	0xea: 0x06, 0xeb: 0x07, 0xec: 0x08, 0xed: 0x09, 0xef: 0x0a,
+	0xf0: 0x13,
+	// Block 0x4, offset 0x100
+	0x120: 0x6b, 0x121: 0x6c, 0x122: 0x6d, 0x123: 0x0e, 0x124: 0x6e, 0x125: 0x6f, 0x126: 0x70, 0x127: 0x71,
+	0x128: 0x72, 0x129: 0x73, 0x12a: 0x74, 0x12b: 0x75, 0x12c: 0x70, 0x12d: 0x76, 0x12e: 0x77, 0x12f: 0x78,
+	0x130: 0x74, 0x131: 0x79, 0x132: 0x7a, 0x133: 0x7b, 0x134: 0x7c, 0x135: 0x7d, 0x137: 0x7e,
+	0x138: 0x7f, 0x139: 0x80, 0x13a: 0x81, 0x13b: 0x82, 0x13c: 0x83, 0x13d: 0x84, 0x13e: 0x85, 0x13f: 0x86,
+	// Block 0x5, offset 0x140
+	0x140: 0x87, 0x142: 0x88, 0x143: 0x89, 0x144: 0x8a, 0x145: 0x8b, 0x146: 0x8c, 0x147: 0x8d,
+	0x14d: 0x8e,
+	0x15c: 0x8f, 0x15f: 0x90,
+	0x162: 0x91, 0x164: 0x92,
+	0x168: 0x93, 0x169: 0x94, 0x16a: 0x95, 0x16b: 0x96, 0x16c: 0x0f, 0x16d: 0x97, 0x16e: 0x98, 0x16f: 0x99,
+	0x170: 0x9a, 0x173: 0x9b, 0x174: 0x9c, 0x175: 0x10, 0x176: 0x11, 0x177: 0x12,
+	0x178: 0x13, 0x179: 0x14, 0x17a: 0x15, 0x17b: 0x16, 0x17c: 0x17, 0x17d: 0x18, 0x17e: 0x19, 0x17f: 0x1a,
+	// Block 0x6, offset 0x180
+	0x180: 0x9d, 0x181: 0x9e, 0x182: 0x9f, 0x183: 0xa0, 0x184: 0x1b, 0x185: 0x1c, 0x186: 0xa1, 0x187: 0xa2,
+	0x188: 0xa3, 0x189: 0x1d, 0x18a: 0x1e, 0x18b: 0xa4, 0x18c: 0xa5,
+	0x191: 0x1f, 0x192: 0x20, 0x193: 0xa6,
+	0x1a8: 0xa7, 0x1a9: 0xa8, 0x1ab: 0xa9,
+	0x1b1: 0xaa, 0x1b3: 0xab, 0x1b5: 0xac, 0x1b7: 0xad,
+	0x1ba: 0xae, 0x1bb: 0xaf, 0x1bc: 0x21, 0x1bd: 0x22, 0x1be: 0x23, 0x1bf: 0xb0,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0xb1, 0x1c1: 0x24, 0x1c2: 0x25, 0x1c3: 0x26, 0x1c4: 0xb2, 0x1c5: 0x27, 0x1c6: 0x28,
+	0x1c8: 0x29, 0x1c9: 0x2a, 0x1ca: 0x2b, 0x1cb: 0x2c, 0x1cc: 0x2d, 0x1cd: 0x2e, 0x1ce: 0x2f, 0x1cf: 0x30,
+	// Block 0x8, offset 0x200
+	0x219: 0xb3, 0x21a: 0xb4, 0x21b: 0xb5, 0x21d: 0xb6, 0x21f: 0xb7,
+	0x220: 0xb8, 0x223: 0xb9, 0x224: 0xba, 0x225: 0xbb, 0x226: 0xbc, 0x227: 0xbd,
+	0x22a: 0xbe, 0x22b: 0xbf, 0x22d: 0xc0, 0x22f: 0xc1,
+	0x230: 0xc2, 0x231: 0xc3, 0x232: 0xc4, 0x233: 0xc5, 0x234: 0xc6, 0x235: 0xc7, 0x236: 0xc8, 0x237: 0xc2,
+	0x238: 0xc3, 0x239: 0xc4, 0x23a: 0xc5, 0x23b: 0xc6, 0x23c: 0xc7, 0x23d: 0xc8, 0x23e: 0xc2, 0x23f: 0xc3,
+	// Block 0x9, offset 0x240
+	0x240: 0xc4, 0x241: 0xc5, 0x242: 0xc6, 0x243: 0xc7, 0x244: 0xc8, 0x245: 0xc2, 0x246: 0xc3, 0x247: 0xc4,
+	0x248: 0xc5, 0x249: 0xc6, 0x24a: 0xc7, 0x24b: 0xc8, 0x24c: 0xc2, 0x24d: 0xc3, 0x24e: 0xc4, 0x24f: 0xc5,
+	0x250: 0xc6, 0x251: 0xc7, 0x252: 0xc8, 0x253: 0xc2, 0x254: 0xc3, 0x255: 0xc4, 0x256: 0xc5, 0x257: 0xc6,
+	0x258: 0xc7, 0x259: 0xc8, 0x25a: 0xc2, 0x25b: 0xc3, 0x25c: 0xc4, 0x25d: 0xc5, 0x25e: 0xc6, 0x25f: 0xc7,
+	0x260: 0xc8, 0x261: 0xc2, 0x262: 0xc3, 0x263: 0xc4, 0x264: 0xc5, 0x265: 0xc6, 0x266: 0xc7, 0x267: 0xc8,
+	0x268: 0xc2, 0x269: 0xc3, 0x26a: 0xc4, 0x26b: 0xc5, 0x26c: 0xc6, 0x26d: 0xc7, 0x26e: 0xc8, 0x26f: 0xc2,
+	0x270: 0xc3, 0x271: 0xc4, 0x272: 0xc5, 0x273: 0xc6, 0x274: 0xc7, 0x275: 0xc8, 0x276: 0xc2, 0x277: 0xc3,
+	0x278: 0xc4, 0x279: 0xc5, 0x27a: 0xc6, 0x27b: 0xc7, 0x27c: 0xc8, 0x27d: 0xc2, 0x27e: 0xc3, 0x27f: 0xc4,
+	// Block 0xa, offset 0x280
+	0x280: 0xc5, 0x281: 0xc6, 0x282: 0xc7, 0x283: 0xc8, 0x284: 0xc2, 0x285: 0xc3, 0x286: 0xc4, 0x287: 0xc5,
+	0x288: 0xc6, 0x289: 0xc7, 0x28a: 0xc8, 0x28b: 0xc2, 0x28c: 0xc3, 0x28d: 0xc4, 0x28e: 0xc5, 0x28f: 0xc6,
+	0x290: 0xc7, 0x291: 0xc8, 0x292: 0xc2, 0x293: 0xc3, 0x294: 0xc4, 0x295: 0xc5, 0x296: 0xc6, 0x297: 0xc7,
+	0x298: 0xc8, 0x299: 0xc2, 0x29a: 0xc3, 0x29b: 0xc4, 0x29c: 0xc5, 0x29d: 0xc6, 0x29e: 0xc7, 0x29f: 0xc8,
+	0x2a0: 0xc2, 0x2a1: 0xc3, 0x2a2: 0xc4, 0x2a3: 0xc5, 0x2a4: 0xc6, 0x2a5: 0xc7, 0x2a6: 0xc8, 0x2a7: 0xc2,
+	0x2a8: 0xc3, 0x2a9: 0xc4, 0x2aa: 0xc5, 0x2ab: 0xc6, 0x2ac: 0xc7, 0x2ad: 0xc8, 0x2ae: 0xc2, 0x2af: 0xc3,
+	0x2b0: 0xc4, 0x2b1: 0xc5, 0x2b2: 0xc6, 0x2b3: 0xc7, 0x2b4: 0xc8, 0x2b5: 0xc2, 0x2b6: 0xc3, 0x2b7: 0xc4,
+	0x2b8: 0xc5, 0x2b9: 0xc6, 0x2ba: 0xc7, 0x2bb: 0xc8, 0x2bc: 0xc2, 0x2bd: 0xc3, 0x2be: 0xc4, 0x2bf: 0xc5,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0xc6, 0x2c1: 0xc7, 0x2c2: 0xc8, 0x2c3: 0xc2, 0x2c4: 0xc3, 0x2c5: 0xc4, 0x2c6: 0xc5, 0x2c7: 0xc6,
+	0x2c8: 0xc7, 0x2c9: 0xc8, 0x2ca: 0xc2, 0x2cb: 0xc3, 0x2cc: 0xc4, 0x2cd: 0xc5, 0x2ce: 0xc6, 0x2cf: 0xc7,
+	0x2d0: 0xc8, 0x2d1: 0xc2, 0x2d2: 0xc3, 0x2d3: 0xc4, 0x2d4: 0xc5, 0x2d5: 0xc6, 0x2d6: 0xc7, 0x2d7: 0xc8,
+	0x2d8: 0xc2, 0x2d9: 0xc3, 0x2da: 0xc4, 0x2db: 0xc5, 0x2dc: 0xc6, 0x2dd: 0xc7, 0x2de: 0xc9,
+	// Block 0xc, offset 0x300
+	0x324: 0x31, 0x325: 0x32, 0x326: 0x33, 0x327: 0x34,
+	0x328: 0x35, 0x329: 0x36, 0x32a: 0x37, 0x32b: 0x38, 0x32c: 0x39, 0x32d: 0x3a, 0x32e: 0x3b, 0x32f: 0x3c,
+	0x330: 0x3d, 0x331: 0x3e, 0x332: 0x3f, 0x333: 0x40, 0x334: 0x41, 0x335: 0x42, 0x336: 0x43, 0x337: 0x44,
+	0x338: 0x45, 0x339: 0x46, 0x33a: 0x47, 0x33b: 0x48, 0x33c: 0xca, 0x33d: 0x49, 0x33e: 0x4a, 0x33f: 0x4b,
+	// Block 0xd, offset 0x340
+	0x347: 0xcb,
+	0x34b: 0xcc, 0x34d: 0xcd,
+	0x35e: 0x4c,
+	0x368: 0xce, 0x36b: 0xcf,
+	0x374: 0xd0,
+	0x37a: 0xd1, 0x37b: 0xd2, 0x37d: 0xd3, 0x37e: 0xd4,
+	// Block 0xe, offset 0x380
+	0x381: 0xd5, 0x382: 0xd6, 0x384: 0xd7, 0x385: 0xbc, 0x387: 0xd8,
+	0x388: 0xd9, 0x38b: 0xda, 0x38c: 0xdb, 0x38d: 0xdc,
+	0x391: 0xdd, 0x392: 0xde, 0x393: 0xdf, 0x396: 0xe0, 0x397: 0xe1,
+	0x398: 0xe2, 0x39a: 0xe3, 0x39c: 0xe4,
+	0x3a0: 0xe5, 0x3a4: 0xe6, 0x3a5: 0xe7, 0x3a7: 0xe8,
+	0x3a8: 0xe9, 0x3a9: 0xea, 0x3aa: 0xeb,
+	0x3b0: 0xe2, 0x3b5: 0xec, 0x3b6: 0xed,
+	0x3bd: 0xee,
+	// Block 0xf, offset 0x3c0
+	0x3eb: 0xef, 0x3ec: 0xf0,
+	0x3ff: 0xf1,
+	// Block 0x10, offset 0x400
+	0x432: 0xf2,
+	// Block 0x11, offset 0x440
+	0x445: 0xf3, 0x446: 0xf4, 0x447: 0xf5,
+	0x449: 0xf6,
+	0x450: 0xf7, 0x451: 0xf8, 0x452: 0xf9, 0x453: 0xfa, 0x454: 0xfb, 0x455: 0xfc, 0x456: 0xfd, 0x457: 0xfe,
+	0x458: 0xff, 0x459: 0x100, 0x45a: 0x4d, 0x45b: 0x101, 0x45c: 0x102, 0x45d: 0x103, 0x45e: 0x104, 0x45f: 0x4e,
+	// Block 0x12, offset 0x480
+	0x480: 0x4f, 0x481: 0x50, 0x482: 0x105, 0x484: 0xf0,
+	0x48a: 0x106, 0x48b: 0x107,
+	0x493: 0x108,
+	0x4a3: 0x109, 0x4a5: 0x10a,
+	0x4b8: 0x51, 0x4b9: 0x52, 0x4ba: 0x53,
+	// Block 0x13, offset 0x4c0
+	0x4c4: 0x54, 0x4c5: 0x10b, 0x4c6: 0x10c,
+	0x4c8: 0x55, 0x4c9: 0x10d,
+	0x4ef: 0x10e,
+	// Block 0x14, offset 0x500
+	0x520: 0x56, 0x521: 0x57, 0x522: 0x58, 0x523: 0x59, 0x524: 0x5a, 0x525: 0x5b, 0x526: 0x5c, 0x527: 0x5d,
+	0x528: 0x5e,
+	// Block 0x15, offset 0x540
+	0x550: 0x0b, 0x551: 0x0c, 0x556: 0x0d,
+	0x55b: 0x0e, 0x55d: 0x0f, 0x55e: 0x10, 0x55f: 0x11,
+	0x56f: 0x12,
+}
+
+// nfkcSparseOffset: 176 entries, 352 bytes
+var nfkcSparseOffset = []uint16{0x0, 0xe, 0x12, 0x1c, 0x26, 0x36, 0x38, 0x3d, 0x48, 0x57, 0x64, 0x6c, 0x71, 0x76, 0x78, 0x7c, 0x84, 0x8b, 0x8e, 0x96, 0x9a, 0x9e, 0xa0, 0xa2, 0xab, 0xaf, 0xb6, 0xbb, 0xbe, 0xc8, 0xcb, 0xd2, 0xda, 0xde, 0xe0, 0xe4, 0xe8, 0xee, 0xff, 0x10b, 0x10d, 0x113, 0x115, 0x117, 0x119, 0x11b, 0x11d, 0x11f, 0x121, 0x124, 0x127, 0x129, 0x12c, 0x12f, 0x133, 0x139, 0x140, 0x149, 0x14b, 0x14e, 0x150, 0x15b, 0x166, 0x174, 0x182, 0x192, 0x1a0, 0x1a7, 0x1ad, 0x1bc, 0x1c0, 0x1c2, 0x1c6, 0x1c8, 0x1cb, 0x1cd, 0x1d0, 0x1d2, 0x1d5, 0x1d7, 0x1d9, 0x1db, 0x1e7, 0x1f1, 0x1fb, 0x1fe, 0x202, 0x204, 0x206, 0x20b, 0x20e, 0x211, 0x213, 0x215, 0x217, 0x219, 0x21f, 0x222, 0x227, 0x229, 0x230, 0x236, 0x23c, 0x244, 0x24a, 0x250, 0x256, 0x25a, 0x25c, 0x25e, 0x260, 0x262, 0x268, 0x26b, 0x26d, 0x26f, 0x271, 0x277, 0x27b, 0x27f, 0x287, 0x28e, 0x291, 0x294, 0x296, 0x299, 0x2a1, 0x2a5, 0x2ac, 0x2af, 0x2b5, 0x2b7, 0x2b9, 0x2bc, 0x2be, 0x2c1, 0x2c6, 0x2c8, 0x2ca, 0x2cc, 0x2ce, 0x2d0, 0x2d3, 0x2d5, 0x2d7, 0x2d9, 0x2db, 0x2dd, 0x2df, 0x2ec, 0x2f6, 0x2f8, 0x2fa, 0x2fe, 0x303, 0x30f, 0x314, 0x31d, 0x323, 0x328, 0x32c, 0x331, 0x335, 0x345, 0x353, 0x361, 0x36f, 0x371, 0x373, 0x375, 0x379, 0x37b, 0x37e, 0x389, 0x38b, 0x395}
+
+// nfkcSparseValues: 919 entries, 3676 bytes
+var nfkcSparseValues = [919]valueRange{
+	// Block 0x0, offset 0x0
+	{value: 0x0002, lo: 0x0d},
+	{value: 0x0001, lo: 0xa0, hi: 0xa0},
+	{value: 0x43b9, lo: 0xa8, hi: 0xa8},
+	{value: 0x0083, lo: 0xaa, hi: 0xaa},
+	{value: 0x43a5, lo: 0xaf, hi: 0xaf},
+	{value: 0x0025, lo: 0xb2, hi: 0xb3},
+	{value: 0x439b, lo: 0xb4, hi: 0xb4},
+	{value: 0x0260, lo: 0xb5, hi: 0xb5},
+	{value: 0x43d2, lo: 0xb8, hi: 0xb8},
+	{value: 0x0023, lo: 0xb9, hi: 0xb9},
+	{value: 0x009f, lo: 0xba, hi: 0xba},
+	{value: 0x234c, lo: 0xbc, hi: 0xbc},
+	{value: 0x2340, lo: 0xbd, hi: 0xbd},
+	{value: 0x23e2, lo: 0xbe, hi: 0xbe},
+	// Block 0x1, offset 0xe
+	{value: 0x0091, lo: 0x03},
+	{value: 0x4823, lo: 0xa0, hi: 0xa1},
+	{value: 0x4855, lo: 0xaf, hi: 0xb0},
+	{value: 0xa000, lo: 0xb7, hi: 0xb7},
+	// Block 0x2, offset 0x12
+	{value: 0x0004, lo: 0x09},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0x0091, lo: 0xb0, hi: 0xb0},
+	{value: 0x0140, lo: 0xb1, hi: 0xb1},
+	{value: 0x0095, lo: 0xb2, hi: 0xb2},
+	{value: 0x00a5, lo: 0xb3, hi: 0xb3},
+	{value: 0x0179, lo: 0xb4, hi: 0xb4},
+	{value: 0x017f, lo: 0xb5, hi: 0xb5},
+	{value: 0x018b, lo: 0xb6, hi: 0xb6},
+	{value: 0x00af, lo: 0xb7, hi: 0xb8},
+	// Block 0x3, offset 0x1c
+	{value: 0x000a, lo: 0x09},
+	{value: 0x43af, lo: 0x98, hi: 0x98},
+	{value: 0x43b4, lo: 0x99, hi: 0x9a},
+	{value: 0x43d7, lo: 0x9b, hi: 0x9b},
+	{value: 0x43a0, lo: 0x9c, hi: 0x9c},
+	{value: 0x43c3, lo: 0x9d, hi: 0x9d},
+	{value: 0x0137, lo: 0xa0, hi: 0xa0},
+	{value: 0x0099, lo: 0xa1, hi: 0xa1},
+	{value: 0x00a7, lo: 0xa2, hi: 0xa3},
+	{value: 0x01b8, lo: 0xa4, hi: 0xa4},
+	// Block 0x4, offset 0x26
+	{value: 0x0000, lo: 0x0f},
+	{value: 0xa000, lo: 0x83, hi: 0x83},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0xa000, lo: 0x8b, hi: 0x8b},
+	{value: 0xa000, lo: 0x8d, hi: 0x8d},
+	{value: 0x38e6, lo: 0x90, hi: 0x90},
+	{value: 0x38f2, lo: 0x91, hi: 0x91},
+	{value: 0x38e0, lo: 0x93, hi: 0x93},
+	{value: 0xa000, lo: 0x96, hi: 0x96},
+	{value: 0x3958, lo: 0x97, hi: 0x97},
+	{value: 0x3922, lo: 0x9c, hi: 0x9c},
+	{value: 0x390a, lo: 0x9d, hi: 0x9d},
+	{value: 0x3934, lo: 0x9e, hi: 0x9e},
+	{value: 0xa000, lo: 0xb4, hi: 0xb5},
+	{value: 0x395e, lo: 0xb6, hi: 0xb6},
+	{value: 0x3964, lo: 0xb7, hi: 0xb7},
+	// Block 0x5, offset 0x36
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0x83, hi: 0x87},
+	// Block 0x6, offset 0x38
+	{value: 0x0001, lo: 0x04},
+	{value: 0x8114, lo: 0x81, hi: 0x82},
+	{value: 0x8133, lo: 0x84, hi: 0x84},
+	{value: 0x812e, lo: 0x85, hi: 0x85},
+	{value: 0x810e, lo: 0x87, hi: 0x87},
+	// Block 0x7, offset 0x3d
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x8133, lo: 0x90, hi: 0x97},
+	{value: 0x811a, lo: 0x98, hi: 0x98},
+	{value: 0x811b, lo: 0x99, hi: 0x99},
+	{value: 0x811c, lo: 0x9a, hi: 0x9a},
+	{value: 0x3982, lo: 0xa2, hi: 0xa2},
+	{value: 0x3988, lo: 0xa3, hi: 0xa3},
+	{value: 0x3994, lo: 0xa4, hi: 0xa4},
+	{value: 0x398e, lo: 0xa5, hi: 0xa5},
+	{value: 0x399a, lo: 0xa6, hi: 0xa6},
+	{value: 0xa000, lo: 0xa7, hi: 0xa7},
+	// Block 0x8, offset 0x48
+	{value: 0x0000, lo: 0x0e},
+	{value: 0x39ac, lo: 0x80, hi: 0x80},
+	{value: 0xa000, lo: 0x81, hi: 0x81},
+	{value: 0x39a0, lo: 0x82, hi: 0x82},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0x39a6, lo: 0x93, hi: 0x93},
+	{value: 0xa000, lo: 0x95, hi: 0x95},
+	{value: 0x8133, lo: 0x96, hi: 0x9c},
+	{value: 0x8133, lo: 0x9f, hi: 0xa2},
+	{value: 0x812e, lo: 0xa3, hi: 0xa3},
+	{value: 0x8133, lo: 0xa4, hi: 0xa4},
+	{value: 0x8133, lo: 0xa7, hi: 0xa8},
+	{value: 0x812e, lo: 0xaa, hi: 0xaa},
+	{value: 0x8133, lo: 0xab, hi: 0xac},
+	{value: 0x812e, lo: 0xad, hi: 0xad},
+	// Block 0x9, offset 0x57
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x8120, lo: 0x91, hi: 0x91},
+	{value: 0x8133, lo: 0xb0, hi: 0xb0},
+	{value: 0x812e, lo: 0xb1, hi: 0xb1},
+	{value: 0x8133, lo: 0xb2, hi: 0xb3},
+	{value: 0x812e, lo: 0xb4, hi: 0xb4},
+	{value: 0x8133, lo: 0xb5, hi: 0xb6},
+	{value: 0x812e, lo: 0xb7, hi: 0xb9},
+	{value: 0x8133, lo: 0xba, hi: 0xba},
+	{value: 0x812e, lo: 0xbb, hi: 0xbc},
+	{value: 0x8133, lo: 0xbd, hi: 0xbd},
+	{value: 0x812e, lo: 0xbe, hi: 0xbe},
+	{value: 0x8133, lo: 0xbf, hi: 0xbf},
+	// Block 0xa, offset 0x64
+	{value: 0x0005, lo: 0x07},
+	{value: 0x8133, lo: 0x80, hi: 0x80},
+	{value: 0x8133, lo: 0x81, hi: 0x81},
+	{value: 0x812e, lo: 0x82, hi: 0x83},
+	{value: 0x812e, lo: 0x84, hi: 0x85},
+	{value: 0x812e, lo: 0x86, hi: 0x87},
+	{value: 0x812e, lo: 0x88, hi: 0x89},
+	{value: 0x8133, lo: 0x8a, hi: 0x8a},
+	// Block 0xb, offset 0x6c
+	{value: 0x0000, lo: 0x04},
+	{value: 0x8133, lo: 0xab, hi: 0xb1},
+	{value: 0x812e, lo: 0xb2, hi: 0xb2},
+	{value: 0x8133, lo: 0xb3, hi: 0xb3},
+	{value: 0x812e, lo: 0xbd, hi: 0xbd},
+	// Block 0xc, offset 0x71
+	{value: 0x0000, lo: 0x04},
+	{value: 0x8133, lo: 0x96, hi: 0x99},
+	{value: 0x8133, lo: 0x9b, hi: 0xa3},
+	{value: 0x8133, lo: 0xa5, hi: 0xa7},
+	{value: 0x8133, lo: 0xa9, hi: 0xad},
+	// Block 0xd, offset 0x76
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812e, lo: 0x99, hi: 0x9b},
+	// Block 0xe, offset 0x78
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8133, lo: 0x98, hi: 0x98},
+	{value: 0x812e, lo: 0x99, hi: 0x9b},
+	{value: 0x8133, lo: 0x9c, hi: 0x9f},
+	// Block 0xf, offset 0x7c
+	{value: 0x0000, lo: 0x07},
+	{value: 0xa000, lo: 0xa8, hi: 0xa8},
+	{value: 0x4019, lo: 0xa9, hi: 0xa9},
+	{value: 0xa000, lo: 0xb0, hi: 0xb0},
+	{value: 0x4021, lo: 0xb1, hi: 0xb1},
+	{value: 0xa000, lo: 0xb3, hi: 0xb3},
+	{value: 0x4029, lo: 0xb4, hi: 0xb4},
+	{value: 0x9903, lo: 0xbc, hi: 0xbc},
+	// Block 0x10, offset 0x84
+	{value: 0x0008, lo: 0x06},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	{value: 0x8133, lo: 0x91, hi: 0x91},
+	{value: 0x812e, lo: 0x92, hi: 0x92},
+	{value: 0x8133, lo: 0x93, hi: 0x93},
+	{value: 0x8133, lo: 0x94, hi: 0x94},
+	{value: 0x465d, lo: 0x98, hi: 0x9f},
+	// Block 0x11, offset 0x8b
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8103, lo: 0xbc, hi: 0xbc},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x12, offset 0x8e
+	{value: 0x0008, lo: 0x07},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0x2dd5, lo: 0x8b, hi: 0x8c},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	{value: 0x469d, lo: 0x9c, hi: 0x9d},
+	{value: 0x46ad, lo: 0x9f, hi: 0x9f},
+	{value: 0x8133, lo: 0xbe, hi: 0xbe},
+	// Block 0x13, offset 0x96
+	{value: 0x0000, lo: 0x03},
+	{value: 0x46d5, lo: 0xb3, hi: 0xb3},
+	{value: 0x46dd, lo: 0xb6, hi: 0xb6},
+	{value: 0x8103, lo: 0xbc, hi: 0xbc},
+	// Block 0x14, offset 0x9a
+	{value: 0x0008, lo: 0x03},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	{value: 0x46b5, lo: 0x99, hi: 0x9b},
+	{value: 0x46cd, lo: 0x9e, hi: 0x9e},
+	// Block 0x15, offset 0x9e
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8103, lo: 0xbc, hi: 0xbc},
+	// Block 0x16, offset 0xa0
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	// Block 0x17, offset 0xa2
+	{value: 0x0000, lo: 0x08},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0x2ded, lo: 0x88, hi: 0x88},
+	{value: 0x2de5, lo: 0x8b, hi: 0x8b},
+	{value: 0x2df5, lo: 0x8c, hi: 0x8c},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x96, hi: 0x97},
+	{value: 0x46e5, lo: 0x9c, hi: 0x9c},
+	{value: 0x46ed, lo: 0x9d, hi: 0x9d},
+	// Block 0x18, offset 0xab
+	{value: 0x0000, lo: 0x03},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0x2dfd, lo: 0x94, hi: 0x94},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x19, offset 0xaf
+	{value: 0x0000, lo: 0x06},
+	{value: 0xa000, lo: 0x86, hi: 0x87},
+	{value: 0x2e05, lo: 0x8a, hi: 0x8a},
+	{value: 0x2e15, lo: 0x8b, hi: 0x8b},
+	{value: 0x2e0d, lo: 0x8c, hi: 0x8c},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	// Block 0x1a, offset 0xb6
+	{value: 0x1801, lo: 0x04},
+	{value: 0xa000, lo: 0x86, hi: 0x86},
+	{value: 0x4031, lo: 0x88, hi: 0x88},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	{value: 0x8121, lo: 0x95, hi: 0x96},
+	// Block 0x1b, offset 0xbb
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8103, lo: 0xbc, hi: 0xbc},
+	{value: 0xa000, lo: 0xbf, hi: 0xbf},
+	// Block 0x1c, offset 0xbe
+	{value: 0x0000, lo: 0x09},
+	{value: 0x2e1d, lo: 0x80, hi: 0x80},
+	{value: 0x9900, lo: 0x82, hi: 0x82},
+	{value: 0xa000, lo: 0x86, hi: 0x86},
+	{value: 0x2e25, lo: 0x87, hi: 0x87},
+	{value: 0x2e2d, lo: 0x88, hi: 0x88},
+	{value: 0x3091, lo: 0x8a, hi: 0x8a},
+	{value: 0x2f19, lo: 0x8b, hi: 0x8b},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x95, hi: 0x96},
+	// Block 0x1d, offset 0xc8
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0xbb, hi: 0xbc},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x1e, offset 0xcb
+	{value: 0x0000, lo: 0x06},
+	{value: 0xa000, lo: 0x86, hi: 0x87},
+	{value: 0x2e35, lo: 0x8a, hi: 0x8a},
+	{value: 0x2e45, lo: 0x8b, hi: 0x8b},
+	{value: 0x2e3d, lo: 0x8c, hi: 0x8c},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	// Block 0x1f, offset 0xd2
+	{value: 0x6ab3, lo: 0x07},
+	{value: 0x9905, lo: 0x8a, hi: 0x8a},
+	{value: 0x9900, lo: 0x8f, hi: 0x8f},
+	{value: 0xa000, lo: 0x99, hi: 0x99},
+	{value: 0x4039, lo: 0x9a, hi: 0x9a},
+	{value: 0x3099, lo: 0x9c, hi: 0x9c},
+	{value: 0x2f24, lo: 0x9d, hi: 0x9d},
+	{value: 0x2e4d, lo: 0x9e, hi: 0x9f},
+	// Block 0x20, offset 0xda
+	{value: 0x0000, lo: 0x03},
+	{value: 0x2751, lo: 0xb3, hi: 0xb3},
+	{value: 0x8123, lo: 0xb8, hi: 0xb9},
+	{value: 0x8105, lo: 0xba, hi: 0xba},
+	// Block 0x21, offset 0xde
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8124, lo: 0x88, hi: 0x8b},
+	// Block 0x22, offset 0xe0
+	{value: 0x0000, lo: 0x03},
+	{value: 0x2766, lo: 0xb3, hi: 0xb3},
+	{value: 0x8125, lo: 0xb8, hi: 0xb9},
+	{value: 0x8105, lo: 0xba, hi: 0xba},
+	// Block 0x23, offset 0xe4
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8126, lo: 0x88, hi: 0x8b},
+	{value: 0x2758, lo: 0x9c, hi: 0x9c},
+	{value: 0x275f, lo: 0x9d, hi: 0x9d},
+	// Block 0x24, offset 0xe8
+	{value: 0x0000, lo: 0x05},
+	{value: 0x03fe, lo: 0x8c, hi: 0x8c},
+	{value: 0x812e, lo: 0x98, hi: 0x99},
+	{value: 0x812e, lo: 0xb5, hi: 0xb5},
+	{value: 0x812e, lo: 0xb7, hi: 0xb7},
+	{value: 0x812c, lo: 0xb9, hi: 0xb9},
+	// Block 0x25, offset 0xee
+	{value: 0x0000, lo: 0x10},
+	{value: 0x2774, lo: 0x83, hi: 0x83},
+	{value: 0x277b, lo: 0x8d, hi: 0x8d},
+	{value: 0x2782, lo: 0x92, hi: 0x92},
+	{value: 0x2789, lo: 0x97, hi: 0x97},
+	{value: 0x2790, lo: 0x9c, hi: 0x9c},
+	{value: 0x276d, lo: 0xa9, hi: 0xa9},
+	{value: 0x8127, lo: 0xb1, hi: 0xb1},
+	{value: 0x8128, lo: 0xb2, hi: 0xb2},
+	{value: 0x4bc5, lo: 0xb3, hi: 0xb3},
+	{value: 0x8129, lo: 0xb4, hi: 0xb4},
+	{value: 0x4bce, lo: 0xb5, hi: 0xb5},
+	{value: 0x46f5, lo: 0xb6, hi: 0xb6},
+	{value: 0x4735, lo: 0xb7, hi: 0xb7},
+	{value: 0x46fd, lo: 0xb8, hi: 0xb8},
+	{value: 0x4740, lo: 0xb9, hi: 0xb9},
+	{value: 0x8128, lo: 0xba, hi: 0xbd},
+	// Block 0x26, offset 0xff
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x8128, lo: 0x80, hi: 0x80},
+	{value: 0x4bd7, lo: 0x81, hi: 0x81},
+	{value: 0x8133, lo: 0x82, hi: 0x83},
+	{value: 0x8105, lo: 0x84, hi: 0x84},
+	{value: 0x8133, lo: 0x86, hi: 0x87},
+	{value: 0x279e, lo: 0x93, hi: 0x93},
+	{value: 0x27a5, lo: 0x9d, hi: 0x9d},
+	{value: 0x27ac, lo: 0xa2, hi: 0xa2},
+	{value: 0x27b3, lo: 0xa7, hi: 0xa7},
+	{value: 0x27ba, lo: 0xac, hi: 0xac},
+	{value: 0x2797, lo: 0xb9, hi: 0xb9},
+	// Block 0x27, offset 0x10b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812e, lo: 0x86, hi: 0x86},
+	// Block 0x28, offset 0x10d
+	{value: 0x0000, lo: 0x05},
+	{value: 0xa000, lo: 0xa5, hi: 0xa5},
+	{value: 0x2e55, lo: 0xa6, hi: 0xa6},
+	{value: 0x9900, lo: 0xae, hi: 0xae},
+	{value: 0x8103, lo: 0xb7, hi: 0xb7},
+	{value: 0x8105, lo: 0xb9, hi: 0xba},
+	// Block 0x29, offset 0x113
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812e, lo: 0x8d, hi: 0x8d},
+	// Block 0x2a, offset 0x115
+	{value: 0x0000, lo: 0x01},
+	{value: 0x0402, lo: 0xbc, hi: 0xbc},
+	// Block 0x2b, offset 0x117
+	{value: 0x0000, lo: 0x01},
+	{value: 0xa000, lo: 0x80, hi: 0x92},
+	// Block 0x2c, offset 0x119
+	{value: 0x0000, lo: 0x01},
+	{value: 0xb900, lo: 0xa1, hi: 0xb5},
+	// Block 0x2d, offset 0x11b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x9900, lo: 0xa8, hi: 0xbf},
+	// Block 0x2e, offset 0x11d
+	{value: 0x0000, lo: 0x01},
+	{value: 0x9900, lo: 0x80, hi: 0x82},
+	// Block 0x2f, offset 0x11f
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0x9d, hi: 0x9f},
+	// Block 0x30, offset 0x121
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0x94, hi: 0x95},
+	{value: 0x8105, lo: 0xb4, hi: 0xb4},
+	// Block 0x31, offset 0x124
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0x92, hi: 0x92},
+	{value: 0x8133, lo: 0x9d, hi: 0x9d},
+	// Block 0x32, offset 0x127
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xa9, hi: 0xa9},
+	// Block 0x33, offset 0x129
+	{value: 0x0004, lo: 0x02},
+	{value: 0x812f, lo: 0xb9, hi: 0xba},
+	{value: 0x812e, lo: 0xbb, hi: 0xbb},
+	// Block 0x34, offset 0x12c
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8133, lo: 0x97, hi: 0x97},
+	{value: 0x812e, lo: 0x98, hi: 0x98},
+	// Block 0x35, offset 0x12f
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8105, lo: 0xa0, hi: 0xa0},
+	{value: 0x8133, lo: 0xb5, hi: 0xbc},
+	{value: 0x812e, lo: 0xbf, hi: 0xbf},
+	// Block 0x36, offset 0x133
+	{value: 0x0000, lo: 0x05},
+	{value: 0x8133, lo: 0xb0, hi: 0xb4},
+	{value: 0x812e, lo: 0xb5, hi: 0xba},
+	{value: 0x8133, lo: 0xbb, hi: 0xbc},
+	{value: 0x812e, lo: 0xbd, hi: 0xbd},
+	{value: 0x812e, lo: 0xbf, hi: 0xbf},
+	// Block 0x37, offset 0x139
+	{value: 0x0000, lo: 0x06},
+	{value: 0x812e, lo: 0x80, hi: 0x80},
+	{value: 0x8133, lo: 0x81, hi: 0x82},
+	{value: 0x812e, lo: 0x83, hi: 0x84},
+	{value: 0x8133, lo: 0x85, hi: 0x89},
+	{value: 0x812e, lo: 0x8a, hi: 0x8a},
+	{value: 0x8133, lo: 0x8b, hi: 0x8e},
+	// Block 0x38, offset 0x140
+	{value: 0x0000, lo: 0x08},
+	{value: 0x2e9d, lo: 0x80, hi: 0x80},
+	{value: 0x2ea5, lo: 0x81, hi: 0x81},
+	{value: 0xa000, lo: 0x82, hi: 0x82},
+	{value: 0x2ead, lo: 0x83, hi: 0x83},
+	{value: 0x8105, lo: 0x84, hi: 0x84},
+	{value: 0x8133, lo: 0xab, hi: 0xab},
+	{value: 0x812e, lo: 0xac, hi: 0xac},
+	{value: 0x8133, lo: 0xad, hi: 0xb3},
+	// Block 0x39, offset 0x149
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0xaa, hi: 0xab},
+	// Block 0x3a, offset 0x14b
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8103, lo: 0xa6, hi: 0xa6},
+	{value: 0x8105, lo: 0xb2, hi: 0xb3},
+	// Block 0x3b, offset 0x14e
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8103, lo: 0xb7, hi: 0xb7},
+	// Block 0x3c, offset 0x150
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x8133, lo: 0x90, hi: 0x92},
+	{value: 0x8101, lo: 0x94, hi: 0x94},
+	{value: 0x812e, lo: 0x95, hi: 0x99},
+	{value: 0x8133, lo: 0x9a, hi: 0x9b},
+	{value: 0x812e, lo: 0x9c, hi: 0x9f},
+	{value: 0x8133, lo: 0xa0, hi: 0xa0},
+	{value: 0x8101, lo: 0xa2, hi: 0xa8},
+	{value: 0x812e, lo: 0xad, hi: 0xad},
+	{value: 0x8133, lo: 0xb4, hi: 0xb4},
+	{value: 0x8133, lo: 0xb8, hi: 0xb9},
+	// Block 0x3d, offset 0x15b
+	{value: 0x0002, lo: 0x0a},
+	{value: 0x0043, lo: 0xac, hi: 0xac},
+	{value: 0x00d1, lo: 0xad, hi: 0xad},
+	{value: 0x0045, lo: 0xae, hi: 0xae},
+	{value: 0x0049, lo: 0xb0, hi: 0xb1},
+	{value: 0x00ec, lo: 0xb2, hi: 0xb2},
+	{value: 0x004f, lo: 0xb3, hi: 0xba},
+	{value: 0x005f, lo: 0xbc, hi: 0xbc},
+	{value: 0x00fe, lo: 0xbd, hi: 0xbd},
+	{value: 0x0061, lo: 0xbe, hi: 0xbe},
+	{value: 0x0065, lo: 0xbf, hi: 0xbf},
+	// Block 0x3e, offset 0x166
+	{value: 0x0000, lo: 0x0d},
+	{value: 0x0001, lo: 0x80, hi: 0x8a},
+	{value: 0x0532, lo: 0x91, hi: 0x91},
+	{value: 0x43dc, lo: 0x97, hi: 0x97},
+	{value: 0x001d, lo: 0xa4, hi: 0xa4},
+	{value: 0x19a0, lo: 0xa5, hi: 0xa5},
+	{value: 0x1c8c, lo: 0xa6, hi: 0xa6},
+	{value: 0x0001, lo: 0xaf, hi: 0xaf},
+	{value: 0x27c1, lo: 0xb3, hi: 0xb3},
+	{value: 0x2935, lo: 0xb4, hi: 0xb4},
+	{value: 0x27c8, lo: 0xb6, hi: 0xb6},
+	{value: 0x293f, lo: 0xb7, hi: 0xb7},
+	{value: 0x199a, lo: 0xbc, hi: 0xbc},
+	{value: 0x43aa, lo: 0xbe, hi: 0xbe},
+	// Block 0x3f, offset 0x174
+	{value: 0x0002, lo: 0x0d},
+	{value: 0x1a60, lo: 0x87, hi: 0x87},
+	{value: 0x1a5d, lo: 0x88, hi: 0x88},
+	{value: 0x199d, lo: 0x89, hi: 0x89},
+	{value: 0x2ac5, lo: 0x97, hi: 0x97},
+	{value: 0x0001, lo: 0x9f, hi: 0x9f},
+	{value: 0x0021, lo: 0xb0, hi: 0xb0},
+	{value: 0x0093, lo: 0xb1, hi: 0xb1},
+	{value: 0x0029, lo: 0xb4, hi: 0xb9},
+	{value: 0x0017, lo: 0xba, hi: 0xba},
+	{value: 0x055e, lo: 0xbb, hi: 0xbb},
+	{value: 0x003b, lo: 0xbc, hi: 0xbc},
+	{value: 0x0011, lo: 0xbd, hi: 0xbe},
+	{value: 0x009d, lo: 0xbf, hi: 0xbf},
+	// Block 0x40, offset 0x182
+	{value: 0x0002, lo: 0x0f},
+	{value: 0x0021, lo: 0x80, hi: 0x89},
+	{value: 0x0017, lo: 0x8a, hi: 0x8a},
+	{value: 0x055e, lo: 0x8b, hi: 0x8b},
+	{value: 0x003b, lo: 0x8c, hi: 0x8c},
+	{value: 0x0011, lo: 0x8d, hi: 0x8e},
+	{value: 0x0083, lo: 0x90, hi: 0x90},
+	{value: 0x008b, lo: 0x91, hi: 0x91},
+	{value: 0x009f, lo: 0x92, hi: 0x92},
+	{value: 0x00b1, lo: 0x93, hi: 0x93},
+	{value: 0x011f, lo: 0x94, hi: 0x94},
+	{value: 0x0091, lo: 0x95, hi: 0x95},
+	{value: 0x0097, lo: 0x96, hi: 0x99},
+	{value: 0x00a1, lo: 0x9a, hi: 0x9a},
+	{value: 0x00a7, lo: 0x9b, hi: 0x9c},
+	{value: 0x1ac9, lo: 0xa8, hi: 0xa8},
+	// Block 0x41, offset 0x192
+	{value: 0x0000, lo: 0x0d},
+	{value: 0x8133, lo: 0x90, hi: 0x91},
+	{value: 0x8101, lo: 0x92, hi: 0x93},
+	{value: 0x8133, lo: 0x94, hi: 0x97},
+	{value: 0x8101, lo: 0x98, hi: 0x9a},
+	{value: 0x8133, lo: 0x9b, hi: 0x9c},
+	{value: 0x8133, lo: 0xa1, hi: 0xa1},
+	{value: 0x8101, lo: 0xa5, hi: 0xa6},
+	{value: 0x8133, lo: 0xa7, hi: 0xa7},
+	{value: 0x812e, lo: 0xa8, hi: 0xa8},
+	{value: 0x8133, lo: 0xa9, hi: 0xa9},
+	{value: 0x8101, lo: 0xaa, hi: 0xab},
+	{value: 0x812e, lo: 0xac, hi: 0xaf},
+	{value: 0x8133, lo: 0xb0, hi: 0xb0},
+	// Block 0x42, offset 0x1a0
+	{value: 0x0007, lo: 0x06},
+	{value: 0x22b0, lo: 0x89, hi: 0x89},
+	{value: 0xa000, lo: 0x90, hi: 0x90},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0xa000, lo: 0x94, hi: 0x94},
+	{value: 0x3cfa, lo: 0x9a, hi: 0x9b},
+	{value: 0x3d08, lo: 0xae, hi: 0xae},
+	// Block 0x43, offset 0x1a7
+	{value: 0x000e, lo: 0x05},
+	{value: 0x3d0f, lo: 0x8d, hi: 0x8e},
+	{value: 0x3d16, lo: 0x8f, hi: 0x8f},
+	{value: 0xa000, lo: 0x90, hi: 0x90},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0xa000, lo: 0x94, hi: 0x94},
+	// Block 0x44, offset 0x1ad
+	{value: 0x017a, lo: 0x0e},
+	{value: 0xa000, lo: 0x83, hi: 0x83},
+	{value: 0x3d24, lo: 0x84, hi: 0x84},
+	{value: 0xa000, lo: 0x88, hi: 0x88},
+	{value: 0x3d2b, lo: 0x89, hi: 0x89},
+	{value: 0xa000, lo: 0x8b, hi: 0x8b},
+	{value: 0x3d32, lo: 0x8c, hi: 0x8c},
+	{value: 0xa000, lo: 0xa3, hi: 0xa3},
+	{value: 0x3d39, lo: 0xa4, hi: 0xa4},
+	{value: 0xa000, lo: 0xa5, hi: 0xa5},
+	{value: 0x3d40, lo: 0xa6, hi: 0xa6},
+	{value: 0x27cf, lo: 0xac, hi: 0xad},
+	{value: 0x27d6, lo: 0xaf, hi: 0xaf},
+	{value: 0x2953, lo: 0xb0, hi: 0xb0},
+	{value: 0xa000, lo: 0xbc, hi: 0xbc},
+	// Block 0x45, offset 0x1bc
+	{value: 0x0007, lo: 0x03},
+	{value: 0x3da9, lo: 0xa0, hi: 0xa1},
+	{value: 0x3dd3, lo: 0xa2, hi: 0xa3},
+	{value: 0x3dfd, lo: 0xaa, hi: 0xad},
+	// Block 0x46, offset 0x1c0
+	{value: 0x0004, lo: 0x01},
+	{value: 0x0586, lo: 0xa9, hi: 0xaa},
+	// Block 0x47, offset 0x1c2
+	{value: 0x0002, lo: 0x03},
+	{value: 0x0057, lo: 0x80, hi: 0x8f},
+	{value: 0x0083, lo: 0x90, hi: 0xa9},
+	{value: 0x0021, lo: 0xaa, hi: 0xaa},
+	// Block 0x48, offset 0x1c6
+	{value: 0x0000, lo: 0x01},
+	{value: 0x2ad2, lo: 0x8c, hi: 0x8c},
+	// Block 0x49, offset 0x1c8
+	{value: 0x0266, lo: 0x02},
+	{value: 0x1cbc, lo: 0xb4, hi: 0xb4},
+	{value: 0x1a5a, lo: 0xb5, hi: 0xb6},
+	// Block 0x4a, offset 0x1cb
+	{value: 0x0000, lo: 0x01},
+	{value: 0x461e, lo: 0x9c, hi: 0x9c},
+	// Block 0x4b, offset 0x1cd
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0095, lo: 0xbc, hi: 0xbc},
+	{value: 0x006d, lo: 0xbd, hi: 0xbd},
+	// Block 0x4c, offset 0x1d0
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0xaf, hi: 0xb1},
+	// Block 0x4d, offset 0x1d2
+	{value: 0x0000, lo: 0x02},
+	{value: 0x057a, lo: 0xaf, hi: 0xaf},
+	{value: 0x8105, lo: 0xbf, hi: 0xbf},
+	// Block 0x4e, offset 0x1d5
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0xa0, hi: 0xbf},
+	// Block 0x4f, offset 0x1d7
+	{value: 0x0000, lo: 0x01},
+	{value: 0x0ebe, lo: 0x9f, hi: 0x9f},
+	// Block 0x50, offset 0x1d9
+	{value: 0x0000, lo: 0x01},
+	{value: 0x172a, lo: 0xb3, hi: 0xb3},
+	// Block 0x51, offset 0x1db
+	{value: 0x0004, lo: 0x0b},
+	{value: 0x1692, lo: 0x80, hi: 0x82},
+	{value: 0x16aa, lo: 0x83, hi: 0x83},
+	{value: 0x16c2, lo: 0x84, hi: 0x85},
+	{value: 0x16d2, lo: 0x86, hi: 0x89},
+	{value: 0x16e6, lo: 0x8a, hi: 0x8c},
+	{value: 0x16fa, lo: 0x8d, hi: 0x8d},
+	{value: 0x1702, lo: 0x8e, hi: 0x8e},
+	{value: 0x170a, lo: 0x8f, hi: 0x90},
+	{value: 0x1716, lo: 0x91, hi: 0x93},
+	{value: 0x1726, lo: 0x94, hi: 0x94},
+	{value: 0x172e, lo: 0x95, hi: 0x95},
+	// Block 0x52, offset 0x1e7
+	{value: 0x0004, lo: 0x09},
+	{value: 0x0001, lo: 0x80, hi: 0x80},
+	{value: 0x812d, lo: 0xaa, hi: 0xaa},
+	{value: 0x8132, lo: 0xab, hi: 0xab},
+	{value: 0x8134, lo: 0xac, hi: 0xac},
+	{value: 0x812f, lo: 0xad, hi: 0xad},
+	{value: 0x8130, lo: 0xae, hi: 0xae},
+	{value: 0x8130, lo: 0xaf, hi: 0xaf},
+	{value: 0x05ae, lo: 0xb6, hi: 0xb6},
+	{value: 0x0982, lo: 0xb8, hi: 0xba},
+	// Block 0x53, offset 0x1f1
+	{value: 0x0006, lo: 0x09},
+	{value: 0x0406, lo: 0xb1, hi: 0xb1},
+	{value: 0x040a, lo: 0xb2, hi: 0xb2},
+	{value: 0x4b7c, lo: 0xb3, hi: 0xb3},
+	{value: 0x040e, lo: 0xb4, hi: 0xb4},
+	{value: 0x4b82, lo: 0xb5, hi: 0xb6},
+	{value: 0x0412, lo: 0xb7, hi: 0xb7},
+	{value: 0x0416, lo: 0xb8, hi: 0xb8},
+	{value: 0x041a, lo: 0xb9, hi: 0xb9},
+	{value: 0x4b8e, lo: 0xba, hi: 0xbf},
+	// Block 0x54, offset 0x1fb
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8133, lo: 0xaf, hi: 0xaf},
+	{value: 0x8133, lo: 0xb4, hi: 0xbd},
+	// Block 0x55, offset 0x1fe
+	{value: 0x0000, lo: 0x03},
+	{value: 0x02d8, lo: 0x9c, hi: 0x9c},
+	{value: 0x02de, lo: 0x9d, hi: 0x9d},
+	{value: 0x8133, lo: 0x9e, hi: 0x9f},
+	// Block 0x56, offset 0x202
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0xb0, hi: 0xb1},
+	// Block 0x57, offset 0x204
+	{value: 0x0000, lo: 0x01},
+	{value: 0x173e, lo: 0xb0, hi: 0xb0},
+	// Block 0x58, offset 0x206
+	{value: 0x0006, lo: 0x04},
+	{value: 0x0047, lo: 0xb2, hi: 0xb3},
+	{value: 0x0063, lo: 0xb4, hi: 0xb4},
+	{value: 0x00dd, lo: 0xb8, hi: 0xb8},
+	{value: 0x00e9, lo: 0xb9, hi: 0xb9},
+	// Block 0x59, offset 0x20b
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0x86, hi: 0x86},
+	{value: 0x8105, lo: 0xac, hi: 0xac},
+	// Block 0x5a, offset 0x20e
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0x84, hi: 0x84},
+	{value: 0x8133, lo: 0xa0, hi: 0xb1},
+	// Block 0x5b, offset 0x211
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812e, lo: 0xab, hi: 0xad},
+	// Block 0x5c, offset 0x213
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0x93, hi: 0x93},
+	// Block 0x5d, offset 0x215
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8103, lo: 0xb3, hi: 0xb3},
+	// Block 0x5e, offset 0x217
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0x80, hi: 0x80},
+	// Block 0x5f, offset 0x219
+	{value: 0x0000, lo: 0x05},
+	{value: 0x8133, lo: 0xb0, hi: 0xb0},
+	{value: 0x8133, lo: 0xb2, hi: 0xb3},
+	{value: 0x812e, lo: 0xb4, hi: 0xb4},
+	{value: 0x8133, lo: 0xb7, hi: 0xb8},
+	{value: 0x8133, lo: 0xbe, hi: 0xbf},
+	// Block 0x60, offset 0x21f
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8133, lo: 0x81, hi: 0x81},
+	{value: 0x8105, lo: 0xb6, hi: 0xb6},
+	// Block 0x61, offset 0x222
+	{value: 0x000c, lo: 0x04},
+	{value: 0x173a, lo: 0x9c, hi: 0x9d},
+	{value: 0x014f, lo: 0x9e, hi: 0x9e},
+	{value: 0x174a, lo: 0x9f, hi: 0x9f},
+	{value: 0x01a6, lo: 0xa9, hi: 0xa9},
+	// Block 0x62, offset 0x227
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0xad, hi: 0xad},
+	// Block 0x63, offset 0x229
+	{value: 0x0000, lo: 0x06},
+	{value: 0xe500, lo: 0x80, hi: 0x80},
+	{value: 0xc600, lo: 0x81, hi: 0x9b},
+	{value: 0xe500, lo: 0x9c, hi: 0x9c},
+	{value: 0xc600, lo: 0x9d, hi: 0xb7},
+	{value: 0xe500, lo: 0xb8, hi: 0xb8},
+	{value: 0xc600, lo: 0xb9, hi: 0xbf},
+	// Block 0x64, offset 0x230
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x93},
+	{value: 0xe500, lo: 0x94, hi: 0x94},
+	{value: 0xc600, lo: 0x95, hi: 0xaf},
+	{value: 0xe500, lo: 0xb0, hi: 0xb0},
+	{value: 0xc600, lo: 0xb1, hi: 0xbf},
+	// Block 0x65, offset 0x236
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x8b},
+	{value: 0xe500, lo: 0x8c, hi: 0x8c},
+	{value: 0xc600, lo: 0x8d, hi: 0xa7},
+	{value: 0xe500, lo: 0xa8, hi: 0xa8},
+	{value: 0xc600, lo: 0xa9, hi: 0xbf},
+	// Block 0x66, offset 0x23c
+	{value: 0x0000, lo: 0x07},
+	{value: 0xc600, lo: 0x80, hi: 0x83},
+	{value: 0xe500, lo: 0x84, hi: 0x84},
+	{value: 0xc600, lo: 0x85, hi: 0x9f},
+	{value: 0xe500, lo: 0xa0, hi: 0xa0},
+	{value: 0xc600, lo: 0xa1, hi: 0xbb},
+	{value: 0xe500, lo: 0xbc, hi: 0xbc},
+	{value: 0xc600, lo: 0xbd, hi: 0xbf},
+	// Block 0x67, offset 0x244
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x97},
+	{value: 0xe500, lo: 0x98, hi: 0x98},
+	{value: 0xc600, lo: 0x99, hi: 0xb3},
+	{value: 0xe500, lo: 0xb4, hi: 0xb4},
+	{value: 0xc600, lo: 0xb5, hi: 0xbf},
+	// Block 0x68, offset 0x24a
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x8f},
+	{value: 0xe500, lo: 0x90, hi: 0x90},
+	{value: 0xc600, lo: 0x91, hi: 0xab},
+	{value: 0xe500, lo: 0xac, hi: 0xac},
+	{value: 0xc600, lo: 0xad, hi: 0xbf},
+	// Block 0x69, offset 0x250
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x87},
+	{value: 0xe500, lo: 0x88, hi: 0x88},
+	{value: 0xc600, lo: 0x89, hi: 0xa3},
+	{value: 0xe500, lo: 0xa4, hi: 0xa4},
+	{value: 0xc600, lo: 0xa5, hi: 0xbf},
+	// Block 0x6a, offset 0x256
+	{value: 0x0000, lo: 0x03},
+	{value: 0xc600, lo: 0x80, hi: 0x87},
+	{value: 0xe500, lo: 0x88, hi: 0x88},
+	{value: 0xc600, lo: 0x89, hi: 0xa3},
+	// Block 0x6b, offset 0x25a
+	{value: 0x0002, lo: 0x01},
+	{value: 0x0003, lo: 0x81, hi: 0xbf},
+	// Block 0x6c, offset 0x25c
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812e, lo: 0xbd, hi: 0xbd},
+	// Block 0x6d, offset 0x25e
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812e, lo: 0xa0, hi: 0xa0},
+	// Block 0x6e, offset 0x260
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0xb6, hi: 0xba},
+	// Block 0x6f, offset 0x262
+	{value: 0x002d, lo: 0x05},
+	{value: 0x812e, lo: 0x8d, hi: 0x8d},
+	{value: 0x8133, lo: 0x8f, hi: 0x8f},
+	{value: 0x8133, lo: 0xb8, hi: 0xb8},
+	{value: 0x8101, lo: 0xb9, hi: 0xba},
+	{value: 0x8105, lo: 0xbf, hi: 0xbf},
+	// Block 0x70, offset 0x268
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8133, lo: 0xa5, hi: 0xa5},
+	{value: 0x812e, lo: 0xa6, hi: 0xa6},
+	// Block 0x71, offset 0x26b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0xa4, hi: 0xa7},
+	// Block 0x72, offset 0x26d
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0xab, hi: 0xac},
+	// Block 0x73, offset 0x26f
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812e, lo: 0xbd, hi: 0xbf},
+	// Block 0x74, offset 0x271
+	{value: 0x0000, lo: 0x05},
+	{value: 0x812e, lo: 0x86, hi: 0x87},
+	{value: 0x8133, lo: 0x88, hi: 0x8a},
+	{value: 0x812e, lo: 0x8b, hi: 0x8b},
+	{value: 0x8133, lo: 0x8c, hi: 0x8c},
+	{value: 0x812e, lo: 0x8d, hi: 0x90},
+	// Block 0x75, offset 0x277
+	{value: 0x0005, lo: 0x03},
+	{value: 0x8133, lo: 0x82, hi: 0x82},
+	{value: 0x812e, lo: 0x83, hi: 0x84},
+	{value: 0x812e, lo: 0x85, hi: 0x85},
+	// Block 0x76, offset 0x27b
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8105, lo: 0x86, hi: 0x86},
+	{value: 0x8105, lo: 0xb0, hi: 0xb0},
+	{value: 0x8105, lo: 0xbf, hi: 0xbf},
+	// Block 0x77, offset 0x27f
+	{value: 0x17fe, lo: 0x07},
+	{value: 0xa000, lo: 0x99, hi: 0x99},
+	{value: 0x4379, lo: 0x9a, hi: 0x9a},
+	{value: 0xa000, lo: 0x9b, hi: 0x9b},
+	{value: 0x4383, lo: 0x9c, hi: 0x9c},
+	{value: 0xa000, lo: 0xa5, hi: 0xa5},
+	{value: 0x438d, lo: 0xab, hi: 0xab},
+	{value: 0x8105, lo: 0xb9, hi: 0xba},
+	// Block 0x78, offset 0x287
+	{value: 0x0000, lo: 0x06},
+	{value: 0x8133, lo: 0x80, hi: 0x82},
+	{value: 0x9900, lo: 0xa7, hi: 0xa7},
+	{value: 0x2eb5, lo: 0xae, hi: 0xae},
+	{value: 0x2ebf, lo: 0xaf, hi: 0xaf},
+	{value: 0xa000, lo: 0xb1, hi: 0xb2},
+	{value: 0x8105, lo: 0xb3, hi: 0xb4},
+	// Block 0x79, offset 0x28e
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0x80, hi: 0x80},
+	{value: 0x8103, lo: 0x8a, hi: 0x8a},
+	// Block 0x7a, offset 0x291
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0xb5, hi: 0xb5},
+	{value: 0x8103, lo: 0xb6, hi: 0xb6},
+	// Block 0x7b, offset 0x294
+	{value: 0x0002, lo: 0x01},
+	{value: 0x8103, lo: 0xa9, hi: 0xaa},
+	// Block 0x7c, offset 0x296
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8103, lo: 0xbb, hi: 0xbc},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x7d, offset 0x299
+	{value: 0x0000, lo: 0x07},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0x2ec9, lo: 0x8b, hi: 0x8b},
+	{value: 0x2ed3, lo: 0x8c, hi: 0x8c},
+	{value: 0x8105, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	{value: 0x8133, lo: 0xa6, hi: 0xac},
+	{value: 0x8133, lo: 0xb0, hi: 0xb4},
+	// Block 0x7e, offset 0x2a1
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8105, lo: 0x82, hi: 0x82},
+	{value: 0x8103, lo: 0x86, hi: 0x86},
+	{value: 0x8133, lo: 0x9e, hi: 0x9e},
+	// Block 0x7f, offset 0x2a5
+	{value: 0x6a23, lo: 0x06},
+	{value: 0x9900, lo: 0xb0, hi: 0xb0},
+	{value: 0xa000, lo: 0xb9, hi: 0xb9},
+	{value: 0x9900, lo: 0xba, hi: 0xba},
+	{value: 0x2ee7, lo: 0xbb, hi: 0xbb},
+	{value: 0x2edd, lo: 0xbc, hi: 0xbd},
+	{value: 0x2ef1, lo: 0xbe, hi: 0xbe},
+	// Block 0x80, offset 0x2ac
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0x82, hi: 0x82},
+	{value: 0x8103, lo: 0x83, hi: 0x83},
+	// Block 0x81, offset 0x2af
+	{value: 0x0000, lo: 0x05},
+	{value: 0x9900, lo: 0xaf, hi: 0xaf},
+	{value: 0xa000, lo: 0xb8, hi: 0xb9},
+	{value: 0x2efb, lo: 0xba, hi: 0xba},
+	{value: 0x2f05, lo: 0xbb, hi: 0xbb},
+	{value: 0x8105, lo: 0xbf, hi: 0xbf},
+	// Block 0x82, offset 0x2b5
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8103, lo: 0x80, hi: 0x80},
+	// Block 0x83, offset 0x2b7
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0xbf, hi: 0xbf},
+	// Block 0x84, offset 0x2b9
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0xb6, hi: 0xb6},
+	{value: 0x8103, lo: 0xb7, hi: 0xb7},
+	// Block 0x85, offset 0x2bc
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0xab, hi: 0xab},
+	// Block 0x86, offset 0x2be
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8105, lo: 0xb9, hi: 0xb9},
+	{value: 0x8103, lo: 0xba, hi: 0xba},
+	// Block 0x87, offset 0x2c1
+	{value: 0x0000, lo: 0x04},
+	{value: 0x9900, lo: 0xb0, hi: 0xb0},
+	{value: 0xa000, lo: 0xb5, hi: 0xb5},
+	{value: 0x2f0f, lo: 0xb8, hi: 0xb8},
+	{value: 0x8105, lo: 0xbd, hi: 0xbe},
+	// Block 0x88, offset 0x2c6
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8103, lo: 0x83, hi: 0x83},
+	// Block 0x89, offset 0x2c8
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0xa0, hi: 0xa0},
+	// Block 0x8a, offset 0x2ca
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0xb4, hi: 0xb4},
+	// Block 0x8b, offset 0x2cc
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0x87, hi: 0x87},
+	// Block 0x8c, offset 0x2ce
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0x99, hi: 0x99},
+	// Block 0x8d, offset 0x2d0
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8103, lo: 0x82, hi: 0x82},
+	{value: 0x8105, lo: 0x84, hi: 0x85},
+	// Block 0x8e, offset 0x2d3
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0x97, hi: 0x97},
+	// Block 0x8f, offset 0x2d5
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8105, lo: 0x81, hi: 0x82},
+	// Block 0x90, offset 0x2d7
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8101, lo: 0xb0, hi: 0xb4},
+	// Block 0x91, offset 0x2d9
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0xb0, hi: 0xb6},
+	// Block 0x92, offset 0x2db
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8102, lo: 0xb0, hi: 0xb1},
+	// Block 0x93, offset 0x2dd
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8101, lo: 0x9e, hi: 0x9e},
+	// Block 0x94, offset 0x2df
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x470d, lo: 0x9e, hi: 0x9e},
+	{value: 0x4717, lo: 0x9f, hi: 0x9f},
+	{value: 0x474b, lo: 0xa0, hi: 0xa0},
+	{value: 0x4759, lo: 0xa1, hi: 0xa1},
+	{value: 0x4767, lo: 0xa2, hi: 0xa2},
+	{value: 0x4775, lo: 0xa3, hi: 0xa3},
+	{value: 0x4783, lo: 0xa4, hi: 0xa4},
+	{value: 0x812c, lo: 0xa5, hi: 0xa6},
+	{value: 0x8101, lo: 0xa7, hi: 0xa9},
+	{value: 0x8131, lo: 0xad, hi: 0xad},
+	{value: 0x812c, lo: 0xae, hi: 0xb2},
+	{value: 0x812e, lo: 0xbb, hi: 0xbf},
+	// Block 0x95, offset 0x2ec
+	{value: 0x0000, lo: 0x09},
+	{value: 0x812e, lo: 0x80, hi: 0x82},
+	{value: 0x8133, lo: 0x85, hi: 0x89},
+	{value: 0x812e, lo: 0x8a, hi: 0x8b},
+	{value: 0x8133, lo: 0xaa, hi: 0xad},
+	{value: 0x4721, lo: 0xbb, hi: 0xbb},
+	{value: 0x472b, lo: 0xbc, hi: 0xbc},
+	{value: 0x4791, lo: 0xbd, hi: 0xbd},
+	{value: 0x47ad, lo: 0xbe, hi: 0xbe},
+	{value: 0x479f, lo: 0xbf, hi: 0xbf},
+	// Block 0x96, offset 0x2f6
+	{value: 0x0000, lo: 0x01},
+	{value: 0x47bb, lo: 0x80, hi: 0x80},
+	// Block 0x97, offset 0x2f8
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0x82, hi: 0x84},
+	// Block 0x98, offset 0x2fa
+	{value: 0x0002, lo: 0x03},
+	{value: 0x0043, lo: 0x80, hi: 0x99},
+	{value: 0x0083, lo: 0x9a, hi: 0xb3},
+	{value: 0x0043, lo: 0xb4, hi: 0xbf},
+	// Block 0x99, offset 0x2fe
+	{value: 0x0002, lo: 0x04},
+	{value: 0x005b, lo: 0x80, hi: 0x8d},
+	{value: 0x0083, lo: 0x8e, hi: 0x94},
+	{value: 0x0093, lo: 0x96, hi: 0xa7},
+	{value: 0x0043, lo: 0xa8, hi: 0xbf},
+	// Block 0x9a, offset 0x303
+	{value: 0x0002, lo: 0x0b},
+	{value: 0x0073, lo: 0x80, hi: 0x81},
+	{value: 0x0083, lo: 0x82, hi: 0x9b},
+	{value: 0x0043, lo: 0x9c, hi: 0x9c},
+	{value: 0x0047, lo: 0x9e, hi: 0x9f},
+	{value: 0x004f, lo: 0xa2, hi: 0xa2},
+	{value: 0x0055, lo: 0xa5, hi: 0xa6},
+	{value: 0x005d, lo: 0xa9, hi: 0xac},
+	{value: 0x0067, lo: 0xae, hi: 0xb5},
+	{value: 0x0083, lo: 0xb6, hi: 0xb9},
+	{value: 0x008d, lo: 0xbb, hi: 0xbb},
+	{value: 0x0091, lo: 0xbd, hi: 0xbf},
+	// Block 0x9b, offset 0x30f
+	{value: 0x0002, lo: 0x04},
+	{value: 0x0097, lo: 0x80, hi: 0x83},
+	{value: 0x00a1, lo: 0x85, hi: 0x8f},
+	{value: 0x0043, lo: 0x90, hi: 0xa9},
+	{value: 0x0083, lo: 0xaa, hi: 0xbf},
+	// Block 0x9c, offset 0x314
+	{value: 0x0002, lo: 0x08},
+	{value: 0x00af, lo: 0x80, hi: 0x83},
+	{value: 0x0043, lo: 0x84, hi: 0x85},
+	{value: 0x0049, lo: 0x87, hi: 0x8a},
+	{value: 0x0055, lo: 0x8d, hi: 0x94},
+	{value: 0x0067, lo: 0x96, hi: 0x9c},
+	{value: 0x0083, lo: 0x9e, hi: 0xb7},
+	{value: 0x0043, lo: 0xb8, hi: 0xb9},
+	{value: 0x0049, lo: 0xbb, hi: 0xbe},
+	// Block 0x9d, offset 0x31d
+	{value: 0x0002, lo: 0x05},
+	{value: 0x0053, lo: 0x80, hi: 0x84},
+	{value: 0x005f, lo: 0x86, hi: 0x86},
+	{value: 0x0067, lo: 0x8a, hi: 0x90},
+	{value: 0x0083, lo: 0x92, hi: 0xab},
+	{value: 0x0043, lo: 0xac, hi: 0xbf},
+	// Block 0x9e, offset 0x323
+	{value: 0x0002, lo: 0x04},
+	{value: 0x006b, lo: 0x80, hi: 0x85},
+	{value: 0x0083, lo: 0x86, hi: 0x9f},
+	{value: 0x0043, lo: 0xa0, hi: 0xb9},
+	{value: 0x0083, lo: 0xba, hi: 0xbf},
+	// Block 0x9f, offset 0x328
+	{value: 0x0002, lo: 0x03},
+	{value: 0x008f, lo: 0x80, hi: 0x93},
+	{value: 0x0043, lo: 0x94, hi: 0xad},
+	{value: 0x0083, lo: 0xae, hi: 0xbf},
+	// Block 0xa0, offset 0x32c
+	{value: 0x0002, lo: 0x04},
+	{value: 0x00a7, lo: 0x80, hi: 0x87},
+	{value: 0x0043, lo: 0x88, hi: 0xa1},
+	{value: 0x0083, lo: 0xa2, hi: 0xbb},
+	{value: 0x0043, lo: 0xbc, hi: 0xbf},
+	// Block 0xa1, offset 0x331
+	{value: 0x0002, lo: 0x03},
+	{value: 0x004b, lo: 0x80, hi: 0x95},
+	{value: 0x0083, lo: 0x96, hi: 0xaf},
+	{value: 0x0043, lo: 0xb0, hi: 0xbf},
+	// Block 0xa2, offset 0x335
+	{value: 0x0003, lo: 0x0f},
+	{value: 0x023c, lo: 0x80, hi: 0x80},
+	{value: 0x0556, lo: 0x81, hi: 0x81},
+	{value: 0x023f, lo: 0x82, hi: 0x9a},
+	{value: 0x0552, lo: 0x9b, hi: 0x9b},
+	{value: 0x024b, lo: 0x9c, hi: 0x9c},
+	{value: 0x0254, lo: 0x9d, hi: 0x9d},
+	{value: 0x025a, lo: 0x9e, hi: 0x9e},
+	{value: 0x027e, lo: 0x9f, hi: 0x9f},
+	{value: 0x026f, lo: 0xa0, hi: 0xa0},
+	{value: 0x026c, lo: 0xa1, hi: 0xa1},
+	{value: 0x01f7, lo: 0xa2, hi: 0xb2},
+	{value: 0x020c, lo: 0xb3, hi: 0xb3},
+	{value: 0x022a, lo: 0xb4, hi: 0xba},
+	{value: 0x0556, lo: 0xbb, hi: 0xbb},
+	{value: 0x023f, lo: 0xbc, hi: 0xbf},
+	// Block 0xa3, offset 0x345
+	{value: 0x0003, lo: 0x0d},
+	{value: 0x024b, lo: 0x80, hi: 0x94},
+	{value: 0x0552, lo: 0x95, hi: 0x95},
+	{value: 0x024b, lo: 0x96, hi: 0x96},
+	{value: 0x0254, lo: 0x97, hi: 0x97},
+	{value: 0x025a, lo: 0x98, hi: 0x98},
+	{value: 0x027e, lo: 0x99, hi: 0x99},
+	{value: 0x026f, lo: 0x9a, hi: 0x9a},
+	{value: 0x026c, lo: 0x9b, hi: 0x9b},
+	{value: 0x01f7, lo: 0x9c, hi: 0xac},
+	{value: 0x020c, lo: 0xad, hi: 0xad},
+	{value: 0x022a, lo: 0xae, hi: 0xb4},
+	{value: 0x0556, lo: 0xb5, hi: 0xb5},
+	{value: 0x023f, lo: 0xb6, hi: 0xbf},
+	// Block 0xa4, offset 0x353
+	{value: 0x0003, lo: 0x0d},
+	{value: 0x025d, lo: 0x80, hi: 0x8e},
+	{value: 0x0552, lo: 0x8f, hi: 0x8f},
+	{value: 0x024b, lo: 0x90, hi: 0x90},
+	{value: 0x0254, lo: 0x91, hi: 0x91},
+	{value: 0x025a, lo: 0x92, hi: 0x92},
+	{value: 0x027e, lo: 0x93, hi: 0x93},
+	{value: 0x026f, lo: 0x94, hi: 0x94},
+	{value: 0x026c, lo: 0x95, hi: 0x95},
+	{value: 0x01f7, lo: 0x96, hi: 0xa6},
+	{value: 0x020c, lo: 0xa7, hi: 0xa7},
+	{value: 0x022a, lo: 0xa8, hi: 0xae},
+	{value: 0x0556, lo: 0xaf, hi: 0xaf},
+	{value: 0x023f, lo: 0xb0, hi: 0xbf},
+	// Block 0xa5, offset 0x361
+	{value: 0x0003, lo: 0x0d},
+	{value: 0x026f, lo: 0x80, hi: 0x88},
+	{value: 0x0552, lo: 0x89, hi: 0x89},
+	{value: 0x024b, lo: 0x8a, hi: 0x8a},
+	{value: 0x0254, lo: 0x8b, hi: 0x8b},
+	{value: 0x025a, lo: 0x8c, hi: 0x8c},
+	{value: 0x027e, lo: 0x8d, hi: 0x8d},
+	{value: 0x026f, lo: 0x8e, hi: 0x8e},
+	{value: 0x026c, lo: 0x8f, hi: 0x8f},
+	{value: 0x01f7, lo: 0x90, hi: 0xa0},
+	{value: 0x020c, lo: 0xa1, hi: 0xa1},
+	{value: 0x022a, lo: 0xa2, hi: 0xa8},
+	{value: 0x0556, lo: 0xa9, hi: 0xa9},
+	{value: 0x023f, lo: 0xaa, hi: 0xbf},
+	// Block 0xa6, offset 0x36f
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0x8f, hi: 0x8f},
+	// Block 0xa7, offset 0x371
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0xae, hi: 0xae},
+	// Block 0xa8, offset 0x373
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8133, lo: 0xac, hi: 0xaf},
+	// Block 0xa9, offset 0x375
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8134, lo: 0xac, hi: 0xad},
+	{value: 0x812e, lo: 0xae, hi: 0xae},
+	{value: 0x8133, lo: 0xaf, hi: 0xaf},
+	// Block 0xaa, offset 0x379
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812e, lo: 0x90, hi: 0x96},
+	// Block 0xab, offset 0x37b
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8133, lo: 0x84, hi: 0x89},
+	{value: 0x8103, lo: 0x8a, hi: 0x8a},
+	// Block 0xac, offset 0x37e
+	{value: 0x0002, lo: 0x0a},
+	{value: 0x0063, lo: 0x80, hi: 0x89},
+	{value: 0x1a7e, lo: 0x8a, hi: 0x8a},
+	{value: 0x1ab1, lo: 0x8b, hi: 0x8b},
+	{value: 0x1acc, lo: 0x8c, hi: 0x8c},
+	{value: 0x1ad2, lo: 0x8d, hi: 0x8d},
+	{value: 0x1cf0, lo: 0x8e, hi: 0x8e},
+	{value: 0x1ade, lo: 0x8f, hi: 0x8f},
+	{value: 0x1aa8, lo: 0xaa, hi: 0xaa},
+	{value: 0x1aab, lo: 0xab, hi: 0xab},
+	{value: 0x1aae, lo: 0xac, hi: 0xac},
+	// Block 0xad, offset 0x389
+	{value: 0x0000, lo: 0x01},
+	{value: 0x1a6c, lo: 0x90, hi: 0x90},
+	// Block 0xae, offset 0x38b
+	{value: 0x0028, lo: 0x09},
+	{value: 0x2999, lo: 0x80, hi: 0x80},
+	{value: 0x295d, lo: 0x81, hi: 0x81},
+	{value: 0x2967, lo: 0x82, hi: 0x82},
+	{value: 0x297b, lo: 0x83, hi: 0x84},
+	{value: 0x2985, lo: 0x85, hi: 0x86},
+	{value: 0x2971, lo: 0x87, hi: 0x87},
+	{value: 0x298f, lo: 0x88, hi: 0x88},
+	{value: 0x0c6a, lo: 0x90, hi: 0x90},
+	{value: 0x09e2, lo: 0x91, hi: 0x91},
+	// Block 0xaf, offset 0x395
+	{value: 0x0002, lo: 0x01},
+	{value: 0x0021, lo: 0xb0, hi: 0xb9},
+}
+
+// recompMap: 7528 bytes (entries only)
+var recompMap map[uint32]rune
+var recompMapOnce sync.Once
+
+const recompMapPacked = "" +
+	"\x00A\x03\x00\x00\x00\x00\xc0" + // 0x00410300: 0x000000C0
+	"\x00A\x03\x01\x00\x00\x00\xc1" + // 0x00410301: 0x000000C1
+	"\x00A\x03\x02\x00\x00\x00\xc2" + // 0x00410302: 0x000000C2
+	"\x00A\x03\x03\x00\x00\x00\xc3" + // 0x00410303: 0x000000C3
+	"\x00A\x03\b\x00\x00\x00\xc4" + // 0x00410308: 0x000000C4
+	"\x00A\x03\n\x00\x00\x00\xc5" + // 0x0041030A: 0x000000C5
+	"\x00C\x03'\x00\x00\x00\xc7" + // 0x00430327: 0x000000C7
+	"\x00E\x03\x00\x00\x00\x00\xc8" + // 0x00450300: 0x000000C8
+	"\x00E\x03\x01\x00\x00\x00\xc9" + // 0x00450301: 0x000000C9
+	"\x00E\x03\x02\x00\x00\x00\xca" + // 0x00450302: 0x000000CA
+	"\x00E\x03\b\x00\x00\x00\xcb" + // 0x00450308: 0x000000CB
+	"\x00I\x03\x00\x00\x00\x00\xcc" + // 0x00490300: 0x000000CC
+	"\x00I\x03\x01\x00\x00\x00\xcd" + // 0x00490301: 0x000000CD
+	"\x00I\x03\x02\x00\x00\x00\xce" + // 0x00490302: 0x000000CE
+	"\x00I\x03\b\x00\x00\x00\xcf" + // 0x00490308: 0x000000CF
+	"\x00N\x03\x03\x00\x00\x00\xd1" + // 0x004E0303: 0x000000D1
+	"\x00O\x03\x00\x00\x00\x00\xd2" + // 0x004F0300: 0x000000D2
+	"\x00O\x03\x01\x00\x00\x00\xd3" + // 0x004F0301: 0x000000D3
+	"\x00O\x03\x02\x00\x00\x00\xd4" + // 0x004F0302: 0x000000D4
+	"\x00O\x03\x03\x00\x00\x00\xd5" + // 0x004F0303: 0x000000D5
+	"\x00O\x03\b\x00\x00\x00\xd6" + // 0x004F0308: 0x000000D6
+	"\x00U\x03\x00\x00\x00\x00\xd9" + // 0x00550300: 0x000000D9
+	"\x00U\x03\x01\x00\x00\x00\xda" + // 0x00550301: 0x000000DA
+	"\x00U\x03\x02\x00\x00\x00\xdb" + // 0x00550302: 0x000000DB
+	"\x00U\x03\b\x00\x00\x00\xdc" + // 0x00550308: 0x000000DC
+	"\x00Y\x03\x01\x00\x00\x00\xdd" + // 0x00590301: 0x000000DD
+	"\x00a\x03\x00\x00\x00\x00\xe0" + // 0x00610300: 0x000000E0
+	"\x00a\x03\x01\x00\x00\x00\xe1" + // 0x00610301: 0x000000E1
+	"\x00a\x03\x02\x00\x00\x00\xe2" + // 0x00610302: 0x000000E2
+	"\x00a\x03\x03\x00\x00\x00\xe3" + // 0x00610303: 0x000000E3
+	"\x00a\x03\b\x00\x00\x00\xe4" + // 0x00610308: 0x000000E4
+	"\x00a\x03\n\x00\x00\x00\xe5" + // 0x0061030A: 0x000000E5
+	"\x00c\x03'\x00\x00\x00\xe7" + // 0x00630327: 0x000000E7
+	"\x00e\x03\x00\x00\x00\x00\xe8" + // 0x00650300: 0x000000E8
+	"\x00e\x03\x01\x00\x00\x00\xe9" + // 0x00650301: 0x000000E9
+	"\x00e\x03\x02\x00\x00\x00\xea" + // 0x00650302: 0x000000EA
+	"\x00e\x03\b\x00\x00\x00\xeb" + // 0x00650308: 0x000000EB
+	"\x00i\x03\x00\x00\x00\x00\xec" + // 0x00690300: 0x000000EC
+	"\x00i\x03\x01\x00\x00\x00\xed" + // 0x00690301: 0x000000ED
+	"\x00i\x03\x02\x00\x00\x00\xee" + // 0x00690302: 0x000000EE
+	"\x00i\x03\b\x00\x00\x00\xef" + // 0x00690308: 0x000000EF
+	"\x00n\x03\x03\x00\x00\x00\xf1" + // 0x006E0303: 0x000000F1
+	"\x00o\x03\x00\x00\x00\x00\xf2" + // 0x006F0300: 0x000000F2
+	"\x00o\x03\x01\x00\x00\x00\xf3" + // 0x006F0301: 0x000000F3
+	"\x00o\x03\x02\x00\x00\x00\xf4" + // 0x006F0302: 0x000000F4
+	"\x00o\x03\x03\x00\x00\x00\xf5" + // 0x006F0303: 0x000000F5
+	"\x00o\x03\b\x00\x00\x00\xf6" + // 0x006F0308: 0x000000F6
+	"\x00u\x03\x00\x00\x00\x00\xf9" + // 0x00750300: 0x000000F9
+	"\x00u\x03\x01\x00\x00\x00\xfa" + // 0x00750301: 0x000000FA
+	"\x00u\x03\x02\x00\x00\x00\xfb" + // 0x00750302: 0x000000FB
+	"\x00u\x03\b\x00\x00\x00\xfc" + // 0x00750308: 0x000000FC
+	"\x00y\x03\x01\x00\x00\x00\xfd" + // 0x00790301: 0x000000FD
+	"\x00y\x03\b\x00\x00\x00\xff" + // 0x00790308: 0x000000FF
+	"\x00A\x03\x04\x00\x00\x01\x00" + // 0x00410304: 0x00000100
+	"\x00a\x03\x04\x00\x00\x01\x01" + // 0x00610304: 0x00000101
+	"\x00A\x03\x06\x00\x00\x01\x02" + // 0x00410306: 0x00000102
+	"\x00a\x03\x06\x00\x00\x01\x03" + // 0x00610306: 0x00000103
+	"\x00A\x03(\x00\x00\x01\x04" + // 0x00410328: 0x00000104
+	"\x00a\x03(\x00\x00\x01\x05" + // 0x00610328: 0x00000105
+	"\x00C\x03\x01\x00\x00\x01\x06" + // 0x00430301: 0x00000106
+	"\x00c\x03\x01\x00\x00\x01\a" + // 0x00630301: 0x00000107
+	"\x00C\x03\x02\x00\x00\x01\b" + // 0x00430302: 0x00000108
+	"\x00c\x03\x02\x00\x00\x01\t" + // 0x00630302: 0x00000109
+	"\x00C\x03\a\x00\x00\x01\n" + // 0x00430307: 0x0000010A
+	"\x00c\x03\a\x00\x00\x01\v" + // 0x00630307: 0x0000010B
+	"\x00C\x03\f\x00\x00\x01\f" + // 0x0043030C: 0x0000010C
+	"\x00c\x03\f\x00\x00\x01\r" + // 0x0063030C: 0x0000010D
+	"\x00D\x03\f\x00\x00\x01\x0e" + // 0x0044030C: 0x0000010E
+	"\x00d\x03\f\x00\x00\x01\x0f" + // 0x0064030C: 0x0000010F
+	"\x00E\x03\x04\x00\x00\x01\x12" + // 0x00450304: 0x00000112
+	"\x00e\x03\x04\x00\x00\x01\x13" + // 0x00650304: 0x00000113
+	"\x00E\x03\x06\x00\x00\x01\x14" + // 0x00450306: 0x00000114
+	"\x00e\x03\x06\x00\x00\x01\x15" + // 0x00650306: 0x00000115
+	"\x00E\x03\a\x00\x00\x01\x16" + // 0x00450307: 0x00000116
+	"\x00e\x03\a\x00\x00\x01\x17" + // 0x00650307: 0x00000117
+	"\x00E\x03(\x00\x00\x01\x18" + // 0x00450328: 0x00000118
+	"\x00e\x03(\x00\x00\x01\x19" + // 0x00650328: 0x00000119
+	"\x00E\x03\f\x00\x00\x01\x1a" + // 0x0045030C: 0x0000011A
+	"\x00e\x03\f\x00\x00\x01\x1b" + // 0x0065030C: 0x0000011B
+	"\x00G\x03\x02\x00\x00\x01\x1c" + // 0x00470302: 0x0000011C
+	"\x00g\x03\x02\x00\x00\x01\x1d" + // 0x00670302: 0x0000011D
+	"\x00G\x03\x06\x00\x00\x01\x1e" + // 0x00470306: 0x0000011E
+	"\x00g\x03\x06\x00\x00\x01\x1f" + // 0x00670306: 0x0000011F
+	"\x00G\x03\a\x00\x00\x01 " + // 0x00470307: 0x00000120
+	"\x00g\x03\a\x00\x00\x01!" + // 0x00670307: 0x00000121
+	"\x00G\x03'\x00\x00\x01\"" + // 0x00470327: 0x00000122
+	"\x00g\x03'\x00\x00\x01#" + // 0x00670327: 0x00000123
+	"\x00H\x03\x02\x00\x00\x01$" + // 0x00480302: 0x00000124
+	"\x00h\x03\x02\x00\x00\x01%" + // 0x00680302: 0x00000125
+	"\x00I\x03\x03\x00\x00\x01(" + // 0x00490303: 0x00000128
+	"\x00i\x03\x03\x00\x00\x01)" + // 0x00690303: 0x00000129
+	"\x00I\x03\x04\x00\x00\x01*" + // 0x00490304: 0x0000012A
+	"\x00i\x03\x04\x00\x00\x01+" + // 0x00690304: 0x0000012B
+	"\x00I\x03\x06\x00\x00\x01," + // 0x00490306: 0x0000012C
+	"\x00i\x03\x06\x00\x00\x01-" + // 0x00690306: 0x0000012D
+	"\x00I\x03(\x00\x00\x01." + // 0x00490328: 0x0000012E
+	"\x00i\x03(\x00\x00\x01/" + // 0x00690328: 0x0000012F
+	"\x00I\x03\a\x00\x00\x010" + // 0x00490307: 0x00000130
+	"\x00J\x03\x02\x00\x00\x014" + // 0x004A0302: 0x00000134
+	"\x00j\x03\x02\x00\x00\x015" + // 0x006A0302: 0x00000135
+	"\x00K\x03'\x00\x00\x016" + // 0x004B0327: 0x00000136
+	"\x00k\x03'\x00\x00\x017" + // 0x006B0327: 0x00000137
+	"\x00L\x03\x01\x00\x00\x019" + // 0x004C0301: 0x00000139
+	"\x00l\x03\x01\x00\x00\x01:" + // 0x006C0301: 0x0000013A
+	"\x00L\x03'\x00\x00\x01;" + // 0x004C0327: 0x0000013B
+	"\x00l\x03'\x00\x00\x01<" + // 0x006C0327: 0x0000013C
+	"\x00L\x03\f\x00\x00\x01=" + // 0x004C030C: 0x0000013D
+	"\x00l\x03\f\x00\x00\x01>" + // 0x006C030C: 0x0000013E
+	"\x00N\x03\x01\x00\x00\x01C" + // 0x004E0301: 0x00000143
+	"\x00n\x03\x01\x00\x00\x01D" + // 0x006E0301: 0x00000144
+	"\x00N\x03'\x00\x00\x01E" + // 0x004E0327: 0x00000145
+	"\x00n\x03'\x00\x00\x01F" + // 0x006E0327: 0x00000146
+	"\x00N\x03\f\x00\x00\x01G" + // 0x004E030C: 0x00000147
+	"\x00n\x03\f\x00\x00\x01H" + // 0x006E030C: 0x00000148
+	"\x00O\x03\x04\x00\x00\x01L" + // 0x004F0304: 0x0000014C
+	"\x00o\x03\x04\x00\x00\x01M" + // 0x006F0304: 0x0000014D
+	"\x00O\x03\x06\x00\x00\x01N" + // 0x004F0306: 0x0000014E
+	"\x00o\x03\x06\x00\x00\x01O" + // 0x006F0306: 0x0000014F
+	"\x00O\x03\v\x00\x00\x01P" + // 0x004F030B: 0x00000150
+	"\x00o\x03\v\x00\x00\x01Q" + // 0x006F030B: 0x00000151
+	"\x00R\x03\x01\x00\x00\x01T" + // 0x00520301: 0x00000154
+	"\x00r\x03\x01\x00\x00\x01U" + // 0x00720301: 0x00000155
+	"\x00R\x03'\x00\x00\x01V" + // 0x00520327: 0x00000156
+	"\x00r\x03'\x00\x00\x01W" + // 0x00720327: 0x00000157
+	"\x00R\x03\f\x00\x00\x01X" + // 0x0052030C: 0x00000158
+	"\x00r\x03\f\x00\x00\x01Y" + // 0x0072030C: 0x00000159
+	"\x00S\x03\x01\x00\x00\x01Z" + // 0x00530301: 0x0000015A
+	"\x00s\x03\x01\x00\x00\x01[" + // 0x00730301: 0x0000015B
+	"\x00S\x03\x02\x00\x00\x01\\" + // 0x00530302: 0x0000015C
+	"\x00s\x03\x02\x00\x00\x01]" + // 0x00730302: 0x0000015D
+	"\x00S\x03'\x00\x00\x01^" + // 0x00530327: 0x0000015E
+	"\x00s\x03'\x00\x00\x01_" + // 0x00730327: 0x0000015F
+	"\x00S\x03\f\x00\x00\x01`" + // 0x0053030C: 0x00000160
+	"\x00s\x03\f\x00\x00\x01a" + // 0x0073030C: 0x00000161
+	"\x00T\x03'\x00\x00\x01b" + // 0x00540327: 0x00000162
+	"\x00t\x03'\x00\x00\x01c" + // 0x00740327: 0x00000163
+	"\x00T\x03\f\x00\x00\x01d" + // 0x0054030C: 0x00000164
+	"\x00t\x03\f\x00\x00\x01e" + // 0x0074030C: 0x00000165
+	"\x00U\x03\x03\x00\x00\x01h" + // 0x00550303: 0x00000168
+	"\x00u\x03\x03\x00\x00\x01i" + // 0x00750303: 0x00000169
+	"\x00U\x03\x04\x00\x00\x01j" + // 0x00550304: 0x0000016A
+	"\x00u\x03\x04\x00\x00\x01k" + // 0x00750304: 0x0000016B
+	"\x00U\x03\x06\x00\x00\x01l" + // 0x00550306: 0x0000016C
+	"\x00u\x03\x06\x00\x00\x01m" + // 0x00750306: 0x0000016D
+	"\x00U\x03\n\x00\x00\x01n" + // 0x0055030A: 0x0000016E
+	"\x00u\x03\n\x00\x00\x01o" + // 0x0075030A: 0x0000016F
+	"\x00U\x03\v\x00\x00\x01p" + // 0x0055030B: 0x00000170
+	"\x00u\x03\v\x00\x00\x01q" + // 0x0075030B: 0x00000171
+	"\x00U\x03(\x00\x00\x01r" + // 0x00550328: 0x00000172
+	"\x00u\x03(\x00\x00\x01s" + // 0x00750328: 0x00000173
+	"\x00W\x03\x02\x00\x00\x01t" + // 0x00570302: 0x00000174
+	"\x00w\x03\x02\x00\x00\x01u" + // 0x00770302: 0x00000175
+	"\x00Y\x03\x02\x00\x00\x01v" + // 0x00590302: 0x00000176
+	"\x00y\x03\x02\x00\x00\x01w" + // 0x00790302: 0x00000177
+	"\x00Y\x03\b\x00\x00\x01x" + // 0x00590308: 0x00000178
+	"\x00Z\x03\x01\x00\x00\x01y" + // 0x005A0301: 0x00000179
+	"\x00z\x03\x01\x00\x00\x01z" + // 0x007A0301: 0x0000017A
+	"\x00Z\x03\a\x00\x00\x01{" + // 0x005A0307: 0x0000017B
+	"\x00z\x03\a\x00\x00\x01|" + // 0x007A0307: 0x0000017C
+	"\x00Z\x03\f\x00\x00\x01}" + // 0x005A030C: 0x0000017D
+	"\x00z\x03\f\x00\x00\x01~" + // 0x007A030C: 0x0000017E
+	"\x00O\x03\x1b\x00\x00\x01\xa0" + // 0x004F031B: 0x000001A0
+	"\x00o\x03\x1b\x00\x00\x01\xa1" + // 0x006F031B: 0x000001A1
+	"\x00U\x03\x1b\x00\x00\x01\xaf" + // 0x0055031B: 0x000001AF
+	"\x00u\x03\x1b\x00\x00\x01\xb0" + // 0x0075031B: 0x000001B0
+	"\x00A\x03\f\x00\x00\x01\xcd" + // 0x0041030C: 0x000001CD
+	"\x00a\x03\f\x00\x00\x01\xce" + // 0x0061030C: 0x000001CE
+	"\x00I\x03\f\x00\x00\x01\xcf" + // 0x0049030C: 0x000001CF
+	"\x00i\x03\f\x00\x00\x01\xd0" + // 0x0069030C: 0x000001D0
+	"\x00O\x03\f\x00\x00\x01\xd1" + // 0x004F030C: 0x000001D1
+	"\x00o\x03\f\x00\x00\x01\xd2" + // 0x006F030C: 0x000001D2
+	"\x00U\x03\f\x00\x00\x01\xd3" + // 0x0055030C: 0x000001D3
+	"\x00u\x03\f\x00\x00\x01\xd4" + // 0x0075030C: 0x000001D4
+	"\x00\xdc\x03\x04\x00\x00\x01\xd5" + // 0x00DC0304: 0x000001D5
+	"\x00\xfc\x03\x04\x00\x00\x01\xd6" + // 0x00FC0304: 0x000001D6
+	"\x00\xdc\x03\x01\x00\x00\x01\xd7" + // 0x00DC0301: 0x000001D7
+	"\x00\xfc\x03\x01\x00\x00\x01\xd8" + // 0x00FC0301: 0x000001D8
+	"\x00\xdc\x03\f\x00\x00\x01\xd9" + // 0x00DC030C: 0x000001D9
+	"\x00\xfc\x03\f\x00\x00\x01\xda" + // 0x00FC030C: 0x000001DA
+	"\x00\xdc\x03\x00\x00\x00\x01\xdb" + // 0x00DC0300: 0x000001DB
+	"\x00\xfc\x03\x00\x00\x00\x01\xdc" + // 0x00FC0300: 0x000001DC
+	"\x00\xc4\x03\x04\x00\x00\x01\xde" + // 0x00C40304: 0x000001DE
+	"\x00\xe4\x03\x04\x00\x00\x01\xdf" + // 0x00E40304: 0x000001DF
+	"\x02&\x03\x04\x00\x00\x01\xe0" + // 0x02260304: 0x000001E0
+	"\x02'\x03\x04\x00\x00\x01\xe1" + // 0x02270304: 0x000001E1
+	"\x00\xc6\x03\x04\x00\x00\x01\xe2" + // 0x00C60304: 0x000001E2
+	"\x00\xe6\x03\x04\x00\x00\x01\xe3" + // 0x00E60304: 0x000001E3
+	"\x00G\x03\f\x00\x00\x01\xe6" + // 0x0047030C: 0x000001E6
+	"\x00g\x03\f\x00\x00\x01\xe7" + // 0x0067030C: 0x000001E7
+	"\x00K\x03\f\x00\x00\x01\xe8" + // 0x004B030C: 0x000001E8
+	"\x00k\x03\f\x00\x00\x01\xe9" + // 0x006B030C: 0x000001E9
+	"\x00O\x03(\x00\x00\x01\xea" + // 0x004F0328: 0x000001EA
+	"\x00o\x03(\x00\x00\x01\xeb" + // 0x006F0328: 0x000001EB
+	"\x01\xea\x03\x04\x00\x00\x01\xec" + // 0x01EA0304: 0x000001EC
+	"\x01\xeb\x03\x04\x00\x00\x01\xed" + // 0x01EB0304: 0x000001ED
+	"\x01\xb7\x03\f\x00\x00\x01\xee" + // 0x01B7030C: 0x000001EE
+	"\x02\x92\x03\f\x00\x00\x01\xef" + // 0x0292030C: 0x000001EF
+	"\x00j\x03\f\x00\x00\x01\xf0" + // 0x006A030C: 0x000001F0
+	"\x00G\x03\x01\x00\x00\x01\xf4" + // 0x00470301: 0x000001F4
+	"\x00g\x03\x01\x00\x00\x01\xf5" + // 0x00670301: 0x000001F5
+	"\x00N\x03\x00\x00\x00\x01\xf8" + // 0x004E0300: 0x000001F8
+	"\x00n\x03\x00\x00\x00\x01\xf9" + // 0x006E0300: 0x000001F9
+	"\x00\xc5\x03\x01\x00\x00\x01\xfa" + // 0x00C50301: 0x000001FA
+	"\x00\xe5\x03\x01\x00\x00\x01\xfb" + // 0x00E50301: 0x000001FB
+	"\x00\xc6\x03\x01\x00\x00\x01\xfc" + // 0x00C60301: 0x000001FC
+	"\x00\xe6\x03\x01\x00\x00\x01\xfd" + // 0x00E60301: 0x000001FD
+	"\x00\xd8\x03\x01\x00\x00\x01\xfe" + // 0x00D80301: 0x000001FE
+	"\x00\xf8\x03\x01\x00\x00\x01\xff" + // 0x00F80301: 0x000001FF
+	"\x00A\x03\x0f\x00\x00\x02\x00" + // 0x0041030F: 0x00000200
+	"\x00a\x03\x0f\x00\x00\x02\x01" + // 0x0061030F: 0x00000201
+	"\x00A\x03\x11\x00\x00\x02\x02" + // 0x00410311: 0x00000202
+	"\x00a\x03\x11\x00\x00\x02\x03" + // 0x00610311: 0x00000203
+	"\x00E\x03\x0f\x00\x00\x02\x04" + // 0x0045030F: 0x00000204
+	"\x00e\x03\x0f\x00\x00\x02\x05" + // 0x0065030F: 0x00000205
+	"\x00E\x03\x11\x00\x00\x02\x06" + // 0x00450311: 0x00000206
+	"\x00e\x03\x11\x00\x00\x02\a" + // 0x00650311: 0x00000207
+	"\x00I\x03\x0f\x00\x00\x02\b" + // 0x0049030F: 0x00000208
+	"\x00i\x03\x0f\x00\x00\x02\t" + // 0x0069030F: 0x00000209
+	"\x00I\x03\x11\x00\x00\x02\n" + // 0x00490311: 0x0000020A
+	"\x00i\x03\x11\x00\x00\x02\v" + // 0x00690311: 0x0000020B
+	"\x00O\x03\x0f\x00\x00\x02\f" + // 0x004F030F: 0x0000020C
+	"\x00o\x03\x0f\x00\x00\x02\r" + // 0x006F030F: 0x0000020D
+	"\x00O\x03\x11\x00\x00\x02\x0e" + // 0x004F0311: 0x0000020E
+	"\x00o\x03\x11\x00\x00\x02\x0f" + // 0x006F0311: 0x0000020F
+	"\x00R\x03\x0f\x00\x00\x02\x10" + // 0x0052030F: 0x00000210
+	"\x00r\x03\x0f\x00\x00\x02\x11" + // 0x0072030F: 0x00000211
+	"\x00R\x03\x11\x00\x00\x02\x12" + // 0x00520311: 0x00000212
+	"\x00r\x03\x11\x00\x00\x02\x13" + // 0x00720311: 0x00000213
+	"\x00U\x03\x0f\x00\x00\x02\x14" + // 0x0055030F: 0x00000214
+	"\x00u\x03\x0f\x00\x00\x02\x15" + // 0x0075030F: 0x00000215
+	"\x00U\x03\x11\x00\x00\x02\x16" + // 0x00550311: 0x00000216
+	"\x00u\x03\x11\x00\x00\x02\x17" + // 0x00750311: 0x00000217
+	"\x00S\x03&\x00\x00\x02\x18" + // 0x00530326: 0x00000218
+	"\x00s\x03&\x00\x00\x02\x19" + // 0x00730326: 0x00000219
+	"\x00T\x03&\x00\x00\x02\x1a" + // 0x00540326: 0x0000021A
+	"\x00t\x03&\x00\x00\x02\x1b" + // 0x00740326: 0x0000021B
+	"\x00H\x03\f\x00\x00\x02\x1e" + // 0x0048030C: 0x0000021E
+	"\x00h\x03\f\x00\x00\x02\x1f" + // 0x0068030C: 0x0000021F
+	"\x00A\x03\a\x00\x00\x02&" + // 0x00410307: 0x00000226
+	"\x00a\x03\a\x00\x00\x02'" + // 0x00610307: 0x00000227
+	"\x00E\x03'\x00\x00\x02(" + // 0x00450327: 0x00000228
+	"\x00e\x03'\x00\x00\x02)" + // 0x00650327: 0x00000229
+	"\x00\xd6\x03\x04\x00\x00\x02*" + // 0x00D60304: 0x0000022A
+	"\x00\xf6\x03\x04\x00\x00\x02+" + // 0x00F60304: 0x0000022B
+	"\x00\xd5\x03\x04\x00\x00\x02," + // 0x00D50304: 0x0000022C
+	"\x00\xf5\x03\x04\x00\x00\x02-" + // 0x00F50304: 0x0000022D
+	"\x00O\x03\a\x00\x00\x02." + // 0x004F0307: 0x0000022E
+	"\x00o\x03\a\x00\x00\x02/" + // 0x006F0307: 0x0000022F
+	"\x02.\x03\x04\x00\x00\x020" + // 0x022E0304: 0x00000230
+	"\x02/\x03\x04\x00\x00\x021" + // 0x022F0304: 0x00000231
+	"\x00Y\x03\x04\x00\x00\x022" + // 0x00590304: 0x00000232
+	"\x00y\x03\x04\x00\x00\x023" + // 0x00790304: 0x00000233
+	"\x00\xa8\x03\x01\x00\x00\x03\x85" + // 0x00A80301: 0x00000385
+	"\x03\x91\x03\x01\x00\x00\x03\x86" + // 0x03910301: 0x00000386
+	"\x03\x95\x03\x01\x00\x00\x03\x88" + // 0x03950301: 0x00000388
+	"\x03\x97\x03\x01\x00\x00\x03\x89" + // 0x03970301: 0x00000389
+	"\x03\x99\x03\x01\x00\x00\x03\x8a" + // 0x03990301: 0x0000038A
+	"\x03\x9f\x03\x01\x00\x00\x03\x8c" + // 0x039F0301: 0x0000038C
+	"\x03\xa5\x03\x01\x00\x00\x03\x8e" + // 0x03A50301: 0x0000038E
+	"\x03\xa9\x03\x01\x00\x00\x03\x8f" + // 0x03A90301: 0x0000038F
+	"\x03\xca\x03\x01\x00\x00\x03\x90" + // 0x03CA0301: 0x00000390
+	"\x03\x99\x03\b\x00\x00\x03\xaa" + // 0x03990308: 0x000003AA
+	"\x03\xa5\x03\b\x00\x00\x03\xab" + // 0x03A50308: 0x000003AB
+	"\x03\xb1\x03\x01\x00\x00\x03\xac" + // 0x03B10301: 0x000003AC
+	"\x03\xb5\x03\x01\x00\x00\x03\xad" + // 0x03B50301: 0x000003AD
+	"\x03\xb7\x03\x01\x00\x00\x03\xae" + // 0x03B70301: 0x000003AE
+	"\x03\xb9\x03\x01\x00\x00\x03\xaf" + // 0x03B90301: 0x000003AF
+	"\x03\xcb\x03\x01\x00\x00\x03\xb0" + // 0x03CB0301: 0x000003B0
+	"\x03\xb9\x03\b\x00\x00\x03\xca" + // 0x03B90308: 0x000003CA
+	"\x03\xc5\x03\b\x00\x00\x03\xcb" + // 0x03C50308: 0x000003CB
+	"\x03\xbf\x03\x01\x00\x00\x03\xcc" + // 0x03BF0301: 0x000003CC
+	"\x03\xc5\x03\x01\x00\x00\x03\xcd" + // 0x03C50301: 0x000003CD
+	"\x03\xc9\x03\x01\x00\x00\x03\xce" + // 0x03C90301: 0x000003CE
+	"\x03\xd2\x03\x01\x00\x00\x03\xd3" + // 0x03D20301: 0x000003D3
+	"\x03\xd2\x03\b\x00\x00\x03\xd4" + // 0x03D20308: 0x000003D4
+	"\x04\x15\x03\x00\x00\x00\x04\x00" + // 0x04150300: 0x00000400
+	"\x04\x15\x03\b\x00\x00\x04\x01" + // 0x04150308: 0x00000401
+	"\x04\x13\x03\x01\x00\x00\x04\x03" + // 0x04130301: 0x00000403
+	"\x04\x06\x03\b\x00\x00\x04\a" + // 0x04060308: 0x00000407
+	"\x04\x1a\x03\x01\x00\x00\x04\f" + // 0x041A0301: 0x0000040C
+	"\x04\x18\x03\x00\x00\x00\x04\r" + // 0x04180300: 0x0000040D
+	"\x04#\x03\x06\x00\x00\x04\x0e" + // 0x04230306: 0x0000040E
+	"\x04\x18\x03\x06\x00\x00\x04\x19" + // 0x04180306: 0x00000419
+	"\x048\x03\x06\x00\x00\x049" + // 0x04380306: 0x00000439
+	"\x045\x03\x00\x00\x00\x04P" + // 0x04350300: 0x00000450
+	"\x045\x03\b\x00\x00\x04Q" + // 0x04350308: 0x00000451
+	"\x043\x03\x01\x00\x00\x04S" + // 0x04330301: 0x00000453
+	"\x04V\x03\b\x00\x00\x04W" + // 0x04560308: 0x00000457
+	"\x04:\x03\x01\x00\x00\x04\\" + // 0x043A0301: 0x0000045C
+	"\x048\x03\x00\x00\x00\x04]" + // 0x04380300: 0x0000045D
+	"\x04C\x03\x06\x00\x00\x04^" + // 0x04430306: 0x0000045E
+	"\x04t\x03\x0f\x00\x00\x04v" + // 0x0474030F: 0x00000476
+	"\x04u\x03\x0f\x00\x00\x04w" + // 0x0475030F: 0x00000477
+	"\x04\x16\x03\x06\x00\x00\x04\xc1" + // 0x04160306: 0x000004C1
+	"\x046\x03\x06\x00\x00\x04\xc2" + // 0x04360306: 0x000004C2
+	"\x04\x10\x03\x06\x00\x00\x04\xd0" + // 0x04100306: 0x000004D0
+	"\x040\x03\x06\x00\x00\x04\xd1" + // 0x04300306: 0x000004D1
+	"\x04\x10\x03\b\x00\x00\x04\xd2" + // 0x04100308: 0x000004D2
+	"\x040\x03\b\x00\x00\x04\xd3" + // 0x04300308: 0x000004D3
+	"\x04\x15\x03\x06\x00\x00\x04\xd6" + // 0x04150306: 0x000004D6
+	"\x045\x03\x06\x00\x00\x04\xd7" + // 0x04350306: 0x000004D7
+	"\x04\xd8\x03\b\x00\x00\x04\xda" + // 0x04D80308: 0x000004DA
+	"\x04\xd9\x03\b\x00\x00\x04\xdb" + // 0x04D90308: 0x000004DB
+	"\x04\x16\x03\b\x00\x00\x04\xdc" + // 0x04160308: 0x000004DC
+	"\x046\x03\b\x00\x00\x04\xdd" + // 0x04360308: 0x000004DD
+	"\x04\x17\x03\b\x00\x00\x04\xde" + // 0x04170308: 0x000004DE
+	"\x047\x03\b\x00\x00\x04\xdf" + // 0x04370308: 0x000004DF
+	"\x04\x18\x03\x04\x00\x00\x04\xe2" + // 0x04180304: 0x000004E2
+	"\x048\x03\x04\x00\x00\x04\xe3" + // 0x04380304: 0x000004E3
+	"\x04\x18\x03\b\x00\x00\x04\xe4" + // 0x04180308: 0x000004E4
+	"\x048\x03\b\x00\x00\x04\xe5" + // 0x04380308: 0x000004E5
+	"\x04\x1e\x03\b\x00\x00\x04\xe6" + // 0x041E0308: 0x000004E6
+	"\x04>\x03\b\x00\x00\x04\xe7" + // 0x043E0308: 0x000004E7
+	"\x04\xe8\x03\b\x00\x00\x04\xea" + // 0x04E80308: 0x000004EA
+	"\x04\xe9\x03\b\x00\x00\x04\xeb" + // 0x04E90308: 0x000004EB
+	"\x04-\x03\b\x00\x00\x04\xec" + // 0x042D0308: 0x000004EC
+	"\x04M\x03\b\x00\x00\x04\xed" + // 0x044D0308: 0x000004ED
+	"\x04#\x03\x04\x00\x00\x04\xee" + // 0x04230304: 0x000004EE
+	"\x04C\x03\x04\x00\x00\x04\xef" + // 0x04430304: 0x000004EF
+	"\x04#\x03\b\x00\x00\x04\xf0" + // 0x04230308: 0x000004F0
+	"\x04C\x03\b\x00\x00\x04\xf1" + // 0x04430308: 0x000004F1
+	"\x04#\x03\v\x00\x00\x04\xf2" + // 0x0423030B: 0x000004F2
+	"\x04C\x03\v\x00\x00\x04\xf3" + // 0x0443030B: 0x000004F3
+	"\x04'\x03\b\x00\x00\x04\xf4" + // 0x04270308: 0x000004F4
+	"\x04G\x03\b\x00\x00\x04\xf5" + // 0x04470308: 0x000004F5
+	"\x04+\x03\b\x00\x00\x04\xf8" + // 0x042B0308: 0x000004F8
+	"\x04K\x03\b\x00\x00\x04\xf9" + // 0x044B0308: 0x000004F9
+	"\x06'\x06S\x00\x00\x06\"" + // 0x06270653: 0x00000622
+	"\x06'\x06T\x00\x00\x06#" + // 0x06270654: 0x00000623
+	"\x06H\x06T\x00\x00\x06$" + // 0x06480654: 0x00000624
+	"\x06'\x06U\x00\x00\x06%" + // 0x06270655: 0x00000625
+	"\x06J\x06T\x00\x00\x06&" + // 0x064A0654: 0x00000626
+	"\x06\xd5\x06T\x00\x00\x06\xc0" + // 0x06D50654: 0x000006C0
+	"\x06\xc1\x06T\x00\x00\x06\xc2" + // 0x06C10654: 0x000006C2
+	"\x06\xd2\x06T\x00\x00\x06\xd3" + // 0x06D20654: 0x000006D3
+	"\t(\t<\x00\x00\t)" + // 0x0928093C: 0x00000929
+	"\t0\t<\x00\x00\t1" + // 0x0930093C: 0x00000931
+	"\t3\t<\x00\x00\t4" + // 0x0933093C: 0x00000934
+	"\t\xc7\t\xbe\x00\x00\t\xcb" + // 0x09C709BE: 0x000009CB
+	"\t\xc7\t\xd7\x00\x00\t\xcc" + // 0x09C709D7: 0x000009CC
+	"\vG\vV\x00\x00\vH" + // 0x0B470B56: 0x00000B48
+	"\vG\v>\x00\x00\vK" + // 0x0B470B3E: 0x00000B4B
+	"\vG\vW\x00\x00\vL" + // 0x0B470B57: 0x00000B4C
+	"\v\x92\v\xd7\x00\x00\v\x94" + // 0x0B920BD7: 0x00000B94
+	"\v\xc6\v\xbe\x00\x00\v\xca" + // 0x0BC60BBE: 0x00000BCA
+	"\v\xc7\v\xbe\x00\x00\v\xcb" + // 0x0BC70BBE: 0x00000BCB
+	"\v\xc6\v\xd7\x00\x00\v\xcc" + // 0x0BC60BD7: 0x00000BCC
+	"\fF\fV\x00\x00\fH" + // 0x0C460C56: 0x00000C48
+	"\f\xbf\f\xd5\x00\x00\f\xc0" + // 0x0CBF0CD5: 0x00000CC0
+	"\f\xc6\f\xd5\x00\x00\f\xc7" + // 0x0CC60CD5: 0x00000CC7
+	"\f\xc6\f\xd6\x00\x00\f\xc8" + // 0x0CC60CD6: 0x00000CC8
+	"\f\xc6\f\xc2\x00\x00\f\xca" + // 0x0CC60CC2: 0x00000CCA
+	"\f\xca\f\xd5\x00\x00\f\xcb" + // 0x0CCA0CD5: 0x00000CCB
+	"\rF\r>\x00\x00\rJ" + // 0x0D460D3E: 0x00000D4A
+	"\rG\r>\x00\x00\rK" + // 0x0D470D3E: 0x00000D4B
+	"\rF\rW\x00\x00\rL" + // 0x0D460D57: 0x00000D4C
+	"\r\xd9\r\xca\x00\x00\r\xda" + // 0x0DD90DCA: 0x00000DDA
+	"\r\xd9\r\xcf\x00\x00\r\xdc" + // 0x0DD90DCF: 0x00000DDC
+	"\r\xdc\r\xca\x00\x00\r\xdd" + // 0x0DDC0DCA: 0x00000DDD
+	"\r\xd9\r\xdf\x00\x00\r\xde" + // 0x0DD90DDF: 0x00000DDE
+	"\x10%\x10.\x00\x00\x10&" + // 0x1025102E: 0x00001026
+	"\x1b\x05\x1b5\x00\x00\x1b\x06" + // 0x1B051B35: 0x00001B06
+	"\x1b\a\x1b5\x00\x00\x1b\b" + // 0x1B071B35: 0x00001B08
+	"\x1b\t\x1b5\x00\x00\x1b\n" + // 0x1B091B35: 0x00001B0A
+	"\x1b\v\x1b5\x00\x00\x1b\f" + // 0x1B0B1B35: 0x00001B0C
+	"\x1b\r\x1b5\x00\x00\x1b\x0e" + // 0x1B0D1B35: 0x00001B0E
+	"\x1b\x11\x1b5\x00\x00\x1b\x12" + // 0x1B111B35: 0x00001B12
+	"\x1b:\x1b5\x00\x00\x1b;" + // 0x1B3A1B35: 0x00001B3B
+	"\x1b<\x1b5\x00\x00\x1b=" + // 0x1B3C1B35: 0x00001B3D
+	"\x1b>\x1b5\x00\x00\x1b@" + // 0x1B3E1B35: 0x00001B40
+	"\x1b?\x1b5\x00\x00\x1bA" + // 0x1B3F1B35: 0x00001B41
+	"\x1bB\x1b5\x00\x00\x1bC" + // 0x1B421B35: 0x00001B43
+	"\x00A\x03%\x00\x00\x1e\x00" + // 0x00410325: 0x00001E00
+	"\x00a\x03%\x00\x00\x1e\x01" + // 0x00610325: 0x00001E01
+	"\x00B\x03\a\x00\x00\x1e\x02" + // 0x00420307: 0x00001E02
+	"\x00b\x03\a\x00\x00\x1e\x03" + // 0x00620307: 0x00001E03
+	"\x00B\x03#\x00\x00\x1e\x04" + // 0x00420323: 0x00001E04
+	"\x00b\x03#\x00\x00\x1e\x05" + // 0x00620323: 0x00001E05
+	"\x00B\x031\x00\x00\x1e\x06" + // 0x00420331: 0x00001E06
+	"\x00b\x031\x00\x00\x1e\a" + // 0x00620331: 0x00001E07
+	"\x00\xc7\x03\x01\x00\x00\x1e\b" + // 0x00C70301: 0x00001E08
+	"\x00\xe7\x03\x01\x00\x00\x1e\t" + // 0x00E70301: 0x00001E09
+	"\x00D\x03\a\x00\x00\x1e\n" + // 0x00440307: 0x00001E0A
+	"\x00d\x03\a\x00\x00\x1e\v" + // 0x00640307: 0x00001E0B
+	"\x00D\x03#\x00\x00\x1e\f" + // 0x00440323: 0x00001E0C
+	"\x00d\x03#\x00\x00\x1e\r" + // 0x00640323: 0x00001E0D
+	"\x00D\x031\x00\x00\x1e\x0e" + // 0x00440331: 0x00001E0E
+	"\x00d\x031\x00\x00\x1e\x0f" + // 0x00640331: 0x00001E0F
+	"\x00D\x03'\x00\x00\x1e\x10" + // 0x00440327: 0x00001E10
+	"\x00d\x03'\x00\x00\x1e\x11" + // 0x00640327: 0x00001E11
+	"\x00D\x03-\x00\x00\x1e\x12" + // 0x0044032D: 0x00001E12
+	"\x00d\x03-\x00\x00\x1e\x13" + // 0x0064032D: 0x00001E13
+	"\x01\x12\x03\x00\x00\x00\x1e\x14" + // 0x01120300: 0x00001E14
+	"\x01\x13\x03\x00\x00\x00\x1e\x15" + // 0x01130300: 0x00001E15
+	"\x01\x12\x03\x01\x00\x00\x1e\x16" + // 0x01120301: 0x00001E16
+	"\x01\x13\x03\x01\x00\x00\x1e\x17" + // 0x01130301: 0x00001E17
+	"\x00E\x03-\x00\x00\x1e\x18" + // 0x0045032D: 0x00001E18
+	"\x00e\x03-\x00\x00\x1e\x19" + // 0x0065032D: 0x00001E19
+	"\x00E\x030\x00\x00\x1e\x1a" + // 0x00450330: 0x00001E1A
+	"\x00e\x030\x00\x00\x1e\x1b" + // 0x00650330: 0x00001E1B
+	"\x02(\x03\x06\x00\x00\x1e\x1c" + // 0x02280306: 0x00001E1C
+	"\x02)\x03\x06\x00\x00\x1e\x1d" + // 0x02290306: 0x00001E1D
+	"\x00F\x03\a\x00\x00\x1e\x1e" + // 0x00460307: 0x00001E1E
+	"\x00f\x03\a\x00\x00\x1e\x1f" + // 0x00660307: 0x00001E1F
+	"\x00G\x03\x04\x00\x00\x1e " + // 0x00470304: 0x00001E20
+	"\x00g\x03\x04\x00\x00\x1e!" + // 0x00670304: 0x00001E21
+	"\x00H\x03\a\x00\x00\x1e\"" + // 0x00480307: 0x00001E22
+	"\x00h\x03\a\x00\x00\x1e#" + // 0x00680307: 0x00001E23
+	"\x00H\x03#\x00\x00\x1e$" + // 0x00480323: 0x00001E24
+	"\x00h\x03#\x00\x00\x1e%" + // 0x00680323: 0x00001E25
+	"\x00H\x03\b\x00\x00\x1e&" + // 0x00480308: 0x00001E26
+	"\x00h\x03\b\x00\x00\x1e'" + // 0x00680308: 0x00001E27
+	"\x00H\x03'\x00\x00\x1e(" + // 0x00480327: 0x00001E28
+	"\x00h\x03'\x00\x00\x1e)" + // 0x00680327: 0x00001E29
+	"\x00H\x03.\x00\x00\x1e*" + // 0x0048032E: 0x00001E2A
+	"\x00h\x03.\x00\x00\x1e+" + // 0x0068032E: 0x00001E2B
+	"\x00I\x030\x00\x00\x1e," + // 0x00490330: 0x00001E2C
+	"\x00i\x030\x00\x00\x1e-" + // 0x00690330: 0x00001E2D
+	"\x00\xcf\x03\x01\x00\x00\x1e." + // 0x00CF0301: 0x00001E2E
+	"\x00\xef\x03\x01\x00\x00\x1e/" + // 0x00EF0301: 0x00001E2F
+	"\x00K\x03\x01\x00\x00\x1e0" + // 0x004B0301: 0x00001E30
+	"\x00k\x03\x01\x00\x00\x1e1" + // 0x006B0301: 0x00001E31
+	"\x00K\x03#\x00\x00\x1e2" + // 0x004B0323: 0x00001E32
+	"\x00k\x03#\x00\x00\x1e3" + // 0x006B0323: 0x00001E33
+	"\x00K\x031\x00\x00\x1e4" + // 0x004B0331: 0x00001E34
+	"\x00k\x031\x00\x00\x1e5" + // 0x006B0331: 0x00001E35
+	"\x00L\x03#\x00\x00\x1e6" + // 0x004C0323: 0x00001E36
+	"\x00l\x03#\x00\x00\x1e7" + // 0x006C0323: 0x00001E37
+	"\x1e6\x03\x04\x00\x00\x1e8" + // 0x1E360304: 0x00001E38
+	"\x1e7\x03\x04\x00\x00\x1e9" + // 0x1E370304: 0x00001E39
+	"\x00L\x031\x00\x00\x1e:" + // 0x004C0331: 0x00001E3A
+	"\x00l\x031\x00\x00\x1e;" + // 0x006C0331: 0x00001E3B
+	"\x00L\x03-\x00\x00\x1e<" + // 0x004C032D: 0x00001E3C
+	"\x00l\x03-\x00\x00\x1e=" + // 0x006C032D: 0x00001E3D
+	"\x00M\x03\x01\x00\x00\x1e>" + // 0x004D0301: 0x00001E3E
+	"\x00m\x03\x01\x00\x00\x1e?" + // 0x006D0301: 0x00001E3F
+	"\x00M\x03\a\x00\x00\x1e@" + // 0x004D0307: 0x00001E40
+	"\x00m\x03\a\x00\x00\x1eA" + // 0x006D0307: 0x00001E41
+	"\x00M\x03#\x00\x00\x1eB" + // 0x004D0323: 0x00001E42
+	"\x00m\x03#\x00\x00\x1eC" + // 0x006D0323: 0x00001E43
+	"\x00N\x03\a\x00\x00\x1eD" + // 0x004E0307: 0x00001E44
+	"\x00n\x03\a\x00\x00\x1eE" + // 0x006E0307: 0x00001E45
+	"\x00N\x03#\x00\x00\x1eF" + // 0x004E0323: 0x00001E46
+	"\x00n\x03#\x00\x00\x1eG" + // 0x006E0323: 0x00001E47
+	"\x00N\x031\x00\x00\x1eH" + // 0x004E0331: 0x00001E48
+	"\x00n\x031\x00\x00\x1eI" + // 0x006E0331: 0x00001E49
+	"\x00N\x03-\x00\x00\x1eJ" + // 0x004E032D: 0x00001E4A
+	"\x00n\x03-\x00\x00\x1eK" + // 0x006E032D: 0x00001E4B
+	"\x00\xd5\x03\x01\x00\x00\x1eL" + // 0x00D50301: 0x00001E4C
+	"\x00\xf5\x03\x01\x00\x00\x1eM" + // 0x00F50301: 0x00001E4D
+	"\x00\xd5\x03\b\x00\x00\x1eN" + // 0x00D50308: 0x00001E4E
+	"\x00\xf5\x03\b\x00\x00\x1eO" + // 0x00F50308: 0x00001E4F
+	"\x01L\x03\x00\x00\x00\x1eP" + // 0x014C0300: 0x00001E50
+	"\x01M\x03\x00\x00\x00\x1eQ" + // 0x014D0300: 0x00001E51
+	"\x01L\x03\x01\x00\x00\x1eR" + // 0x014C0301: 0x00001E52
+	"\x01M\x03\x01\x00\x00\x1eS" + // 0x014D0301: 0x00001E53
+	"\x00P\x03\x01\x00\x00\x1eT" + // 0x00500301: 0x00001E54
+	"\x00p\x03\x01\x00\x00\x1eU" + // 0x00700301: 0x00001E55
+	"\x00P\x03\a\x00\x00\x1eV" + // 0x00500307: 0x00001E56
+	"\x00p\x03\a\x00\x00\x1eW" + // 0x00700307: 0x00001E57
+	"\x00R\x03\a\x00\x00\x1eX" + // 0x00520307: 0x00001E58
+	"\x00r\x03\a\x00\x00\x1eY" + // 0x00720307: 0x00001E59
+	"\x00R\x03#\x00\x00\x1eZ" + // 0x00520323: 0x00001E5A
+	"\x00r\x03#\x00\x00\x1e[" + // 0x00720323: 0x00001E5B
+	"\x1eZ\x03\x04\x00\x00\x1e\\" + // 0x1E5A0304: 0x00001E5C
+	"\x1e[\x03\x04\x00\x00\x1e]" + // 0x1E5B0304: 0x00001E5D
+	"\x00R\x031\x00\x00\x1e^" + // 0x00520331: 0x00001E5E
+	"\x00r\x031\x00\x00\x1e_" + // 0x00720331: 0x00001E5F
+	"\x00S\x03\a\x00\x00\x1e`" + // 0x00530307: 0x00001E60
+	"\x00s\x03\a\x00\x00\x1ea" + // 0x00730307: 0x00001E61
+	"\x00S\x03#\x00\x00\x1eb" + // 0x00530323: 0x00001E62
+	"\x00s\x03#\x00\x00\x1ec" + // 0x00730323: 0x00001E63
+	"\x01Z\x03\a\x00\x00\x1ed" + // 0x015A0307: 0x00001E64
+	"\x01[\x03\a\x00\x00\x1ee" + // 0x015B0307: 0x00001E65
+	"\x01`\x03\a\x00\x00\x1ef" + // 0x01600307: 0x00001E66
+	"\x01a\x03\a\x00\x00\x1eg" + // 0x01610307: 0x00001E67
+	"\x1eb\x03\a\x00\x00\x1eh" + // 0x1E620307: 0x00001E68
+	"\x1ec\x03\a\x00\x00\x1ei" + // 0x1E630307: 0x00001E69
+	"\x00T\x03\a\x00\x00\x1ej" + // 0x00540307: 0x00001E6A
+	"\x00t\x03\a\x00\x00\x1ek" + // 0x00740307: 0x00001E6B
+	"\x00T\x03#\x00\x00\x1el" + // 0x00540323: 0x00001E6C
+	"\x00t\x03#\x00\x00\x1em" + // 0x00740323: 0x00001E6D
+	"\x00T\x031\x00\x00\x1en" + // 0x00540331: 0x00001E6E
+	"\x00t\x031\x00\x00\x1eo" + // 0x00740331: 0x00001E6F
+	"\x00T\x03-\x00\x00\x1ep" + // 0x0054032D: 0x00001E70
+	"\x00t\x03-\x00\x00\x1eq" + // 0x0074032D: 0x00001E71
+	"\x00U\x03$\x00\x00\x1er" + // 0x00550324: 0x00001E72
+	"\x00u\x03$\x00\x00\x1es" + // 0x00750324: 0x00001E73
+	"\x00U\x030\x00\x00\x1et" + // 0x00550330: 0x00001E74
+	"\x00u\x030\x00\x00\x1eu" + // 0x00750330: 0x00001E75
+	"\x00U\x03-\x00\x00\x1ev" + // 0x0055032D: 0x00001E76
+	"\x00u\x03-\x00\x00\x1ew" + // 0x0075032D: 0x00001E77
+	"\x01h\x03\x01\x00\x00\x1ex" + // 0x01680301: 0x00001E78
+	"\x01i\x03\x01\x00\x00\x1ey" + // 0x01690301: 0x00001E79
+	"\x01j\x03\b\x00\x00\x1ez" + // 0x016A0308: 0x00001E7A
+	"\x01k\x03\b\x00\x00\x1e{" + // 0x016B0308: 0x00001E7B
+	"\x00V\x03\x03\x00\x00\x1e|" + // 0x00560303: 0x00001E7C
+	"\x00v\x03\x03\x00\x00\x1e}" + // 0x00760303: 0x00001E7D
+	"\x00V\x03#\x00\x00\x1e~" + // 0x00560323: 0x00001E7E
+	"\x00v\x03#\x00\x00\x1e\x7f" + // 0x00760323: 0x00001E7F
+	"\x00W\x03\x00\x00\x00\x1e\x80" + // 0x00570300: 0x00001E80
+	"\x00w\x03\x00\x00\x00\x1e\x81" + // 0x00770300: 0x00001E81
+	"\x00W\x03\x01\x00\x00\x1e\x82" + // 0x00570301: 0x00001E82
+	"\x00w\x03\x01\x00\x00\x1e\x83" + // 0x00770301: 0x00001E83
+	"\x00W\x03\b\x00\x00\x1e\x84" + // 0x00570308: 0x00001E84
+	"\x00w\x03\b\x00\x00\x1e\x85" + // 0x00770308: 0x00001E85
+	"\x00W\x03\a\x00\x00\x1e\x86" + // 0x00570307: 0x00001E86
+	"\x00w\x03\a\x00\x00\x1e\x87" + // 0x00770307: 0x00001E87
+	"\x00W\x03#\x00\x00\x1e\x88" + // 0x00570323: 0x00001E88
+	"\x00w\x03#\x00\x00\x1e\x89" + // 0x00770323: 0x00001E89
+	"\x00X\x03\a\x00\x00\x1e\x8a" + // 0x00580307: 0x00001E8A
+	"\x00x\x03\a\x00\x00\x1e\x8b" + // 0x00780307: 0x00001E8B
+	"\x00X\x03\b\x00\x00\x1e\x8c" + // 0x00580308: 0x00001E8C
+	"\x00x\x03\b\x00\x00\x1e\x8d" + // 0x00780308: 0x00001E8D
+	"\x00Y\x03\a\x00\x00\x1e\x8e" + // 0x00590307: 0x00001E8E
+	"\x00y\x03\a\x00\x00\x1e\x8f" + // 0x00790307: 0x00001E8F
+	"\x00Z\x03\x02\x00\x00\x1e\x90" + // 0x005A0302: 0x00001E90
+	"\x00z\x03\x02\x00\x00\x1e\x91" + // 0x007A0302: 0x00001E91
+	"\x00Z\x03#\x00\x00\x1e\x92" + // 0x005A0323: 0x00001E92
+	"\x00z\x03#\x00\x00\x1e\x93" + // 0x007A0323: 0x00001E93
+	"\x00Z\x031\x00\x00\x1e\x94" + // 0x005A0331: 0x00001E94
+	"\x00z\x031\x00\x00\x1e\x95" + // 0x007A0331: 0x00001E95
+	"\x00h\x031\x00\x00\x1e\x96" + // 0x00680331: 0x00001E96
+	"\x00t\x03\b\x00\x00\x1e\x97" + // 0x00740308: 0x00001E97
+	"\x00w\x03\n\x00\x00\x1e\x98" + // 0x0077030A: 0x00001E98
+	"\x00y\x03\n\x00\x00\x1e\x99" + // 0x0079030A: 0x00001E99
+	"\x01\x7f\x03\a\x00\x00\x1e\x9b" + // 0x017F0307: 0x00001E9B
+	"\x00A\x03#\x00\x00\x1e\xa0" + // 0x00410323: 0x00001EA0
+	"\x00a\x03#\x00\x00\x1e\xa1" + // 0x00610323: 0x00001EA1
+	"\x00A\x03\t\x00\x00\x1e\xa2" + // 0x00410309: 0x00001EA2
+	"\x00a\x03\t\x00\x00\x1e\xa3" + // 0x00610309: 0x00001EA3
+	"\x00\xc2\x03\x01\x00\x00\x1e\xa4" + // 0x00C20301: 0x00001EA4
+	"\x00\xe2\x03\x01\x00\x00\x1e\xa5" + // 0x00E20301: 0x00001EA5
+	"\x00\xc2\x03\x00\x00\x00\x1e\xa6" + // 0x00C20300: 0x00001EA6
+	"\x00\xe2\x03\x00\x00\x00\x1e\xa7" + // 0x00E20300: 0x00001EA7
+	"\x00\xc2\x03\t\x00\x00\x1e\xa8" + // 0x00C20309: 0x00001EA8
+	"\x00\xe2\x03\t\x00\x00\x1e\xa9" + // 0x00E20309: 0x00001EA9
+	"\x00\xc2\x03\x03\x00\x00\x1e\xaa" + // 0x00C20303: 0x00001EAA
+	"\x00\xe2\x03\x03\x00\x00\x1e\xab" + // 0x00E20303: 0x00001EAB
+	"\x1e\xa0\x03\x02\x00\x00\x1e\xac" + // 0x1EA00302: 0x00001EAC
+	"\x1e\xa1\x03\x02\x00\x00\x1e\xad" + // 0x1EA10302: 0x00001EAD
+	"\x01\x02\x03\x01\x00\x00\x1e\xae" + // 0x01020301: 0x00001EAE
+	"\x01\x03\x03\x01\x00\x00\x1e\xaf" + // 0x01030301: 0x00001EAF
+	"\x01\x02\x03\x00\x00\x00\x1e\xb0" + // 0x01020300: 0x00001EB0
+	"\x01\x03\x03\x00\x00\x00\x1e\xb1" + // 0x01030300: 0x00001EB1
+	"\x01\x02\x03\t\x00\x00\x1e\xb2" + // 0x01020309: 0x00001EB2
+	"\x01\x03\x03\t\x00\x00\x1e\xb3" + // 0x01030309: 0x00001EB3
+	"\x01\x02\x03\x03\x00\x00\x1e\xb4" + // 0x01020303: 0x00001EB4
+	"\x01\x03\x03\x03\x00\x00\x1e\xb5" + // 0x01030303: 0x00001EB5
+	"\x1e\xa0\x03\x06\x00\x00\x1e\xb6" + // 0x1EA00306: 0x00001EB6
+	"\x1e\xa1\x03\x06\x00\x00\x1e\xb7" + // 0x1EA10306: 0x00001EB7
+	"\x00E\x03#\x00\x00\x1e\xb8" + // 0x00450323: 0x00001EB8
+	"\x00e\x03#\x00\x00\x1e\xb9" + // 0x00650323: 0x00001EB9
+	"\x00E\x03\t\x00\x00\x1e\xba" + // 0x00450309: 0x00001EBA
+	"\x00e\x03\t\x00\x00\x1e\xbb" + // 0x00650309: 0x00001EBB
+	"\x00E\x03\x03\x00\x00\x1e\xbc" + // 0x00450303: 0x00001EBC
+	"\x00e\x03\x03\x00\x00\x1e\xbd" + // 0x00650303: 0x00001EBD
+	"\x00\xca\x03\x01\x00\x00\x1e\xbe" + // 0x00CA0301: 0x00001EBE
+	"\x00\xea\x03\x01\x00\x00\x1e\xbf" + // 0x00EA0301: 0x00001EBF
+	"\x00\xca\x03\x00\x00\x00\x1e\xc0" + // 0x00CA0300: 0x00001EC0
+	"\x00\xea\x03\x00\x00\x00\x1e\xc1" + // 0x00EA0300: 0x00001EC1
+	"\x00\xca\x03\t\x00\x00\x1e\xc2" + // 0x00CA0309: 0x00001EC2
+	"\x00\xea\x03\t\x00\x00\x1e\xc3" + // 0x00EA0309: 0x00001EC3
+	"\x00\xca\x03\x03\x00\x00\x1e\xc4" + // 0x00CA0303: 0x00001EC4
+	"\x00\xea\x03\x03\x00\x00\x1e\xc5" + // 0x00EA0303: 0x00001EC5
+	"\x1e\xb8\x03\x02\x00\x00\x1e\xc6" + // 0x1EB80302: 0x00001EC6
+	"\x1e\xb9\x03\x02\x00\x00\x1e\xc7" + // 0x1EB90302: 0x00001EC7
+	"\x00I\x03\t\x00\x00\x1e\xc8" + // 0x00490309: 0x00001EC8
+	"\x00i\x03\t\x00\x00\x1e\xc9" + // 0x00690309: 0x00001EC9
+	"\x00I\x03#\x00\x00\x1e\xca" + // 0x00490323: 0x00001ECA
+	"\x00i\x03#\x00\x00\x1e\xcb" + // 0x00690323: 0x00001ECB
+	"\x00O\x03#\x00\x00\x1e\xcc" + // 0x004F0323: 0x00001ECC
+	"\x00o\x03#\x00\x00\x1e\xcd" + // 0x006F0323: 0x00001ECD
+	"\x00O\x03\t\x00\x00\x1e\xce" + // 0x004F0309: 0x00001ECE
+	"\x00o\x03\t\x00\x00\x1e\xcf" + // 0x006F0309: 0x00001ECF
+	"\x00\xd4\x03\x01\x00\x00\x1e\xd0" + // 0x00D40301: 0x00001ED0
+	"\x00\xf4\x03\x01\x00\x00\x1e\xd1" + // 0x00F40301: 0x00001ED1
+	"\x00\xd4\x03\x00\x00\x00\x1e\xd2" + // 0x00D40300: 0x00001ED2
+	"\x00\xf4\x03\x00\x00\x00\x1e\xd3" + // 0x00F40300: 0x00001ED3
+	"\x00\xd4\x03\t\x00\x00\x1e\xd4" + // 0x00D40309: 0x00001ED4
+	"\x00\xf4\x03\t\x00\x00\x1e\xd5" + // 0x00F40309: 0x00001ED5
+	"\x00\xd4\x03\x03\x00\x00\x1e\xd6" + // 0x00D40303: 0x00001ED6
+	"\x00\xf4\x03\x03\x00\x00\x1e\xd7" + // 0x00F40303: 0x00001ED7
+	"\x1e\xcc\x03\x02\x00\x00\x1e\xd8" + // 0x1ECC0302: 0x00001ED8
+	"\x1e\xcd\x03\x02\x00\x00\x1e\xd9" + // 0x1ECD0302: 0x00001ED9
+	"\x01\xa0\x03\x01\x00\x00\x1e\xda" + // 0x01A00301: 0x00001EDA
+	"\x01\xa1\x03\x01\x00\x00\x1e\xdb" + // 0x01A10301: 0x00001EDB
+	"\x01\xa0\x03\x00\x00\x00\x1e\xdc" + // 0x01A00300: 0x00001EDC
+	"\x01\xa1\x03\x00\x00\x00\x1e\xdd" + // 0x01A10300: 0x00001EDD
+	"\x01\xa0\x03\t\x00\x00\x1e\xde" + // 0x01A00309: 0x00001EDE
+	"\x01\xa1\x03\t\x00\x00\x1e\xdf" + // 0x01A10309: 0x00001EDF
+	"\x01\xa0\x03\x03\x00\x00\x1e\xe0" + // 0x01A00303: 0x00001EE0
+	"\x01\xa1\x03\x03\x00\x00\x1e\xe1" + // 0x01A10303: 0x00001EE1
+	"\x01\xa0\x03#\x00\x00\x1e\xe2" + // 0x01A00323: 0x00001EE2
+	"\x01\xa1\x03#\x00\x00\x1e\xe3" + // 0x01A10323: 0x00001EE3
+	"\x00U\x03#\x00\x00\x1e\xe4" + // 0x00550323: 0x00001EE4
+	"\x00u\x03#\x00\x00\x1e\xe5" + // 0x00750323: 0x00001EE5
+	"\x00U\x03\t\x00\x00\x1e\xe6" + // 0x00550309: 0x00001EE6
+	"\x00u\x03\t\x00\x00\x1e\xe7" + // 0x00750309: 0x00001EE7
+	"\x01\xaf\x03\x01\x00\x00\x1e\xe8" + // 0x01AF0301: 0x00001EE8
+	"\x01\xb0\x03\x01\x00\x00\x1e\xe9" + // 0x01B00301: 0x00001EE9
+	"\x01\xaf\x03\x00\x00\x00\x1e\xea" + // 0x01AF0300: 0x00001EEA
+	"\x01\xb0\x03\x00\x00\x00\x1e\xeb" + // 0x01B00300: 0x00001EEB
+	"\x01\xaf\x03\t\x00\x00\x1e\xec" + // 0x01AF0309: 0x00001EEC
+	"\x01\xb0\x03\t\x00\x00\x1e\xed" + // 0x01B00309: 0x00001EED
+	"\x01\xaf\x03\x03\x00\x00\x1e\xee" + // 0x01AF0303: 0x00001EEE
+	"\x01\xb0\x03\x03\x00\x00\x1e\xef" + // 0x01B00303: 0x00001EEF
+	"\x01\xaf\x03#\x00\x00\x1e\xf0" + // 0x01AF0323: 0x00001EF0
+	"\x01\xb0\x03#\x00\x00\x1e\xf1" + // 0x01B00323: 0x00001EF1
+	"\x00Y\x03\x00\x00\x00\x1e\xf2" + // 0x00590300: 0x00001EF2
+	"\x00y\x03\x00\x00\x00\x1e\xf3" + // 0x00790300: 0x00001EF3
+	"\x00Y\x03#\x00\x00\x1e\xf4" + // 0x00590323: 0x00001EF4
+	"\x00y\x03#\x00\x00\x1e\xf5" + // 0x00790323: 0x00001EF5
+	"\x00Y\x03\t\x00\x00\x1e\xf6" + // 0x00590309: 0x00001EF6
+	"\x00y\x03\t\x00\x00\x1e\xf7" + // 0x00790309: 0x00001EF7
+	"\x00Y\x03\x03\x00\x00\x1e\xf8" + // 0x00590303: 0x00001EF8
+	"\x00y\x03\x03\x00\x00\x1e\xf9" + // 0x00790303: 0x00001EF9
+	"\x03\xb1\x03\x13\x00\x00\x1f\x00" + // 0x03B10313: 0x00001F00
+	"\x03\xb1\x03\x14\x00\x00\x1f\x01" + // 0x03B10314: 0x00001F01
+	"\x1f\x00\x03\x00\x00\x00\x1f\x02" + // 0x1F000300: 0x00001F02
+	"\x1f\x01\x03\x00\x00\x00\x1f\x03" + // 0x1F010300: 0x00001F03
+	"\x1f\x00\x03\x01\x00\x00\x1f\x04" + // 0x1F000301: 0x00001F04
+	"\x1f\x01\x03\x01\x00\x00\x1f\x05" + // 0x1F010301: 0x00001F05
+	"\x1f\x00\x03B\x00\x00\x1f\x06" + // 0x1F000342: 0x00001F06
+	"\x1f\x01\x03B\x00\x00\x1f\a" + // 0x1F010342: 0x00001F07
+	"\x03\x91\x03\x13\x00\x00\x1f\b" + // 0x03910313: 0x00001F08
+	"\x03\x91\x03\x14\x00\x00\x1f\t" + // 0x03910314: 0x00001F09
+	"\x1f\b\x03\x00\x00\x00\x1f\n" + // 0x1F080300: 0x00001F0A
+	"\x1f\t\x03\x00\x00\x00\x1f\v" + // 0x1F090300: 0x00001F0B
+	"\x1f\b\x03\x01\x00\x00\x1f\f" + // 0x1F080301: 0x00001F0C
+	"\x1f\t\x03\x01\x00\x00\x1f\r" + // 0x1F090301: 0x00001F0D
+	"\x1f\b\x03B\x00\x00\x1f\x0e" + // 0x1F080342: 0x00001F0E
+	"\x1f\t\x03B\x00\x00\x1f\x0f" + // 0x1F090342: 0x00001F0F
+	"\x03\xb5\x03\x13\x00\x00\x1f\x10" + // 0x03B50313: 0x00001F10
+	"\x03\xb5\x03\x14\x00\x00\x1f\x11" + // 0x03B50314: 0x00001F11
+	"\x1f\x10\x03\x00\x00\x00\x1f\x12" + // 0x1F100300: 0x00001F12
+	"\x1f\x11\x03\x00\x00\x00\x1f\x13" + // 0x1F110300: 0x00001F13
+	"\x1f\x10\x03\x01\x00\x00\x1f\x14" + // 0x1F100301: 0x00001F14
+	"\x1f\x11\x03\x01\x00\x00\x1f\x15" + // 0x1F110301: 0x00001F15
+	"\x03\x95\x03\x13\x00\x00\x1f\x18" + // 0x03950313: 0x00001F18
+	"\x03\x95\x03\x14\x00\x00\x1f\x19" + // 0x03950314: 0x00001F19
+	"\x1f\x18\x03\x00\x00\x00\x1f\x1a" + // 0x1F180300: 0x00001F1A
+	"\x1f\x19\x03\x00\x00\x00\x1f\x1b" + // 0x1F190300: 0x00001F1B
+	"\x1f\x18\x03\x01\x00\x00\x1f\x1c" + // 0x1F180301: 0x00001F1C
+	"\x1f\x19\x03\x01\x00\x00\x1f\x1d" + // 0x1F190301: 0x00001F1D
+	"\x03\xb7\x03\x13\x00\x00\x1f " + // 0x03B70313: 0x00001F20
+	"\x03\xb7\x03\x14\x00\x00\x1f!" + // 0x03B70314: 0x00001F21
+	"\x1f \x03\x00\x00\x00\x1f\"" + // 0x1F200300: 0x00001F22
+	"\x1f!\x03\x00\x00\x00\x1f#" + // 0x1F210300: 0x00001F23
+	"\x1f \x03\x01\x00\x00\x1f$" + // 0x1F200301: 0x00001F24
+	"\x1f!\x03\x01\x00\x00\x1f%" + // 0x1F210301: 0x00001F25
+	"\x1f \x03B\x00\x00\x1f&" + // 0x1F200342: 0x00001F26
+	"\x1f!\x03B\x00\x00\x1f'" + // 0x1F210342: 0x00001F27
+	"\x03\x97\x03\x13\x00\x00\x1f(" + // 0x03970313: 0x00001F28
+	"\x03\x97\x03\x14\x00\x00\x1f)" + // 0x03970314: 0x00001F29
+	"\x1f(\x03\x00\x00\x00\x1f*" + // 0x1F280300: 0x00001F2A
+	"\x1f)\x03\x00\x00\x00\x1f+" + // 0x1F290300: 0x00001F2B
+	"\x1f(\x03\x01\x00\x00\x1f," + // 0x1F280301: 0x00001F2C
+	"\x1f)\x03\x01\x00\x00\x1f-" + // 0x1F290301: 0x00001F2D
+	"\x1f(\x03B\x00\x00\x1f." + // 0x1F280342: 0x00001F2E
+	"\x1f)\x03B\x00\x00\x1f/" + // 0x1F290342: 0x00001F2F
+	"\x03\xb9\x03\x13\x00\x00\x1f0" + // 0x03B90313: 0x00001F30
+	"\x03\xb9\x03\x14\x00\x00\x1f1" + // 0x03B90314: 0x00001F31
+	"\x1f0\x03\x00\x00\x00\x1f2" + // 0x1F300300: 0x00001F32
+	"\x1f1\x03\x00\x00\x00\x1f3" + // 0x1F310300: 0x00001F33
+	"\x1f0\x03\x01\x00\x00\x1f4" + // 0x1F300301: 0x00001F34
+	"\x1f1\x03\x01\x00\x00\x1f5" + // 0x1F310301: 0x00001F35
+	"\x1f0\x03B\x00\x00\x1f6" + // 0x1F300342: 0x00001F36
+	"\x1f1\x03B\x00\x00\x1f7" + // 0x1F310342: 0x00001F37
+	"\x03\x99\x03\x13\x00\x00\x1f8" + // 0x03990313: 0x00001F38
+	"\x03\x99\x03\x14\x00\x00\x1f9" + // 0x03990314: 0x00001F39
+	"\x1f8\x03\x00\x00\x00\x1f:" + // 0x1F380300: 0x00001F3A
+	"\x1f9\x03\x00\x00\x00\x1f;" + // 0x1F390300: 0x00001F3B
+	"\x1f8\x03\x01\x00\x00\x1f<" + // 0x1F380301: 0x00001F3C
+	"\x1f9\x03\x01\x00\x00\x1f=" + // 0x1F390301: 0x00001F3D
+	"\x1f8\x03B\x00\x00\x1f>" + // 0x1F380342: 0x00001F3E
+	"\x1f9\x03B\x00\x00\x1f?" + // 0x1F390342: 0x00001F3F
+	"\x03\xbf\x03\x13\x00\x00\x1f@" + // 0x03BF0313: 0x00001F40
+	"\x03\xbf\x03\x14\x00\x00\x1fA" + // 0x03BF0314: 0x00001F41
+	"\x1f@\x03\x00\x00\x00\x1fB" + // 0x1F400300: 0x00001F42
+	"\x1fA\x03\x00\x00\x00\x1fC" + // 0x1F410300: 0x00001F43
+	"\x1f@\x03\x01\x00\x00\x1fD" + // 0x1F400301: 0x00001F44
+	"\x1fA\x03\x01\x00\x00\x1fE" + // 0x1F410301: 0x00001F45
+	"\x03\x9f\x03\x13\x00\x00\x1fH" + // 0x039F0313: 0x00001F48
+	"\x03\x9f\x03\x14\x00\x00\x1fI" + // 0x039F0314: 0x00001F49
+	"\x1fH\x03\x00\x00\x00\x1fJ" + // 0x1F480300: 0x00001F4A
+	"\x1fI\x03\x00\x00\x00\x1fK" + // 0x1F490300: 0x00001F4B
+	"\x1fH\x03\x01\x00\x00\x1fL" + // 0x1F480301: 0x00001F4C
+	"\x1fI\x03\x01\x00\x00\x1fM" + // 0x1F490301: 0x00001F4D
+	"\x03\xc5\x03\x13\x00\x00\x1fP" + // 0x03C50313: 0x00001F50
+	"\x03\xc5\x03\x14\x00\x00\x1fQ" + // 0x03C50314: 0x00001F51
+	"\x1fP\x03\x00\x00\x00\x1fR" + // 0x1F500300: 0x00001F52
+	"\x1fQ\x03\x00\x00\x00\x1fS" + // 0x1F510300: 0x00001F53
+	"\x1fP\x03\x01\x00\x00\x1fT" + // 0x1F500301: 0x00001F54
+	"\x1fQ\x03\x01\x00\x00\x1fU" + // 0x1F510301: 0x00001F55
+	"\x1fP\x03B\x00\x00\x1fV" + // 0x1F500342: 0x00001F56
+	"\x1fQ\x03B\x00\x00\x1fW" + // 0x1F510342: 0x00001F57
+	"\x03\xa5\x03\x14\x00\x00\x1fY" + // 0x03A50314: 0x00001F59
+	"\x1fY\x03\x00\x00\x00\x1f[" + // 0x1F590300: 0x00001F5B
+	"\x1fY\x03\x01\x00\x00\x1f]" + // 0x1F590301: 0x00001F5D
+	"\x1fY\x03B\x00\x00\x1f_" + // 0x1F590342: 0x00001F5F
+	"\x03\xc9\x03\x13\x00\x00\x1f`" + // 0x03C90313: 0x00001F60
+	"\x03\xc9\x03\x14\x00\x00\x1fa" + // 0x03C90314: 0x00001F61
+	"\x1f`\x03\x00\x00\x00\x1fb" + // 0x1F600300: 0x00001F62
+	"\x1fa\x03\x00\x00\x00\x1fc" + // 0x1F610300: 0x00001F63
+	"\x1f`\x03\x01\x00\x00\x1fd" + // 0x1F600301: 0x00001F64
+	"\x1fa\x03\x01\x00\x00\x1fe" + // 0x1F610301: 0x00001F65
+	"\x1f`\x03B\x00\x00\x1ff" + // 0x1F600342: 0x00001F66
+	"\x1fa\x03B\x00\x00\x1fg" + // 0x1F610342: 0x00001F67
+	"\x03\xa9\x03\x13\x00\x00\x1fh" + // 0x03A90313: 0x00001F68
+	"\x03\xa9\x03\x14\x00\x00\x1fi" + // 0x03A90314: 0x00001F69
+	"\x1fh\x03\x00\x00\x00\x1fj" + // 0x1F680300: 0x00001F6A
+	"\x1fi\x03\x00\x00\x00\x1fk" + // 0x1F690300: 0x00001F6B
+	"\x1fh\x03\x01\x00\x00\x1fl" + // 0x1F680301: 0x00001F6C
+	"\x1fi\x03\x01\x00\x00\x1fm" + // 0x1F690301: 0x00001F6D
+	"\x1fh\x03B\x00\x00\x1fn" + // 0x1F680342: 0x00001F6E
+	"\x1fi\x03B\x00\x00\x1fo" + // 0x1F690342: 0x00001F6F
+	"\x03\xb1\x03\x00\x00\x00\x1fp" + // 0x03B10300: 0x00001F70
+	"\x03\xb5\x03\x00\x00\x00\x1fr" + // 0x03B50300: 0x00001F72
+	"\x03\xb7\x03\x00\x00\x00\x1ft" + // 0x03B70300: 0x00001F74
+	"\x03\xb9\x03\x00\x00\x00\x1fv" + // 0x03B90300: 0x00001F76
+	"\x03\xbf\x03\x00\x00\x00\x1fx" + // 0x03BF0300: 0x00001F78
+	"\x03\xc5\x03\x00\x00\x00\x1fz" + // 0x03C50300: 0x00001F7A
+	"\x03\xc9\x03\x00\x00\x00\x1f|" + // 0x03C90300: 0x00001F7C
+	"\x1f\x00\x03E\x00\x00\x1f\x80" + // 0x1F000345: 0x00001F80
+	"\x1f\x01\x03E\x00\x00\x1f\x81" + // 0x1F010345: 0x00001F81
+	"\x1f\x02\x03E\x00\x00\x1f\x82" + // 0x1F020345: 0x00001F82
+	"\x1f\x03\x03E\x00\x00\x1f\x83" + // 0x1F030345: 0x00001F83
+	"\x1f\x04\x03E\x00\x00\x1f\x84" + // 0x1F040345: 0x00001F84
+	"\x1f\x05\x03E\x00\x00\x1f\x85" + // 0x1F050345: 0x00001F85
+	"\x1f\x06\x03E\x00\x00\x1f\x86" + // 0x1F060345: 0x00001F86
+	"\x1f\a\x03E\x00\x00\x1f\x87" + // 0x1F070345: 0x00001F87
+	"\x1f\b\x03E\x00\x00\x1f\x88" + // 0x1F080345: 0x00001F88
+	"\x1f\t\x03E\x00\x00\x1f\x89" + // 0x1F090345: 0x00001F89
+	"\x1f\n\x03E\x00\x00\x1f\x8a" + // 0x1F0A0345: 0x00001F8A
+	"\x1f\v\x03E\x00\x00\x1f\x8b" + // 0x1F0B0345: 0x00001F8B
+	"\x1f\f\x03E\x00\x00\x1f\x8c" + // 0x1F0C0345: 0x00001F8C
+	"\x1f\r\x03E\x00\x00\x1f\x8d" + // 0x1F0D0345: 0x00001F8D
+	"\x1f\x0e\x03E\x00\x00\x1f\x8e" + // 0x1F0E0345: 0x00001F8E
+	"\x1f\x0f\x03E\x00\x00\x1f\x8f" + // 0x1F0F0345: 0x00001F8F
+	"\x1f \x03E\x00\x00\x1f\x90" + // 0x1F200345: 0x00001F90
+	"\x1f!\x03E\x00\x00\x1f\x91" + // 0x1F210345: 0x00001F91
+	"\x1f\"\x03E\x00\x00\x1f\x92" + // 0x1F220345: 0x00001F92
+	"\x1f#\x03E\x00\x00\x1f\x93" + // 0x1F230345: 0x00001F93
+	"\x1f$\x03E\x00\x00\x1f\x94" + // 0x1F240345: 0x00001F94
+	"\x1f%\x03E\x00\x00\x1f\x95" + // 0x1F250345: 0x00001F95
+	"\x1f&\x03E\x00\x00\x1f\x96" + // 0x1F260345: 0x00001F96
+	"\x1f'\x03E\x00\x00\x1f\x97" + // 0x1F270345: 0x00001F97
+	"\x1f(\x03E\x00\x00\x1f\x98" + // 0x1F280345: 0x00001F98
+	"\x1f)\x03E\x00\x00\x1f\x99" + // 0x1F290345: 0x00001F99
+	"\x1f*\x03E\x00\x00\x1f\x9a" + // 0x1F2A0345: 0x00001F9A
+	"\x1f+\x03E\x00\x00\x1f\x9b" + // 0x1F2B0345: 0x00001F9B
+	"\x1f,\x03E\x00\x00\x1f\x9c" + // 0x1F2C0345: 0x00001F9C
+	"\x1f-\x03E\x00\x00\x1f\x9d" + // 0x1F2D0345: 0x00001F9D
+	"\x1f.\x03E\x00\x00\x1f\x9e" + // 0x1F2E0345: 0x00001F9E
+	"\x1f/\x03E\x00\x00\x1f\x9f" + // 0x1F2F0345: 0x00001F9F
+	"\x1f`\x03E\x00\x00\x1f\xa0" + // 0x1F600345: 0x00001FA0
+	"\x1fa\x03E\x00\x00\x1f\xa1" + // 0x1F610345: 0x00001FA1
+	"\x1fb\x03E\x00\x00\x1f\xa2" + // 0x1F620345: 0x00001FA2
+	"\x1fc\x03E\x00\x00\x1f\xa3" + // 0x1F630345: 0x00001FA3
+	"\x1fd\x03E\x00\x00\x1f\xa4" + // 0x1F640345: 0x00001FA4
+	"\x1fe\x03E\x00\x00\x1f\xa5" + // 0x1F650345: 0x00001FA5
+	"\x1ff\x03E\x00\x00\x1f\xa6" + // 0x1F660345: 0x00001FA6
+	"\x1fg\x03E\x00\x00\x1f\xa7" + // 0x1F670345: 0x00001FA7
+	"\x1fh\x03E\x00\x00\x1f\xa8" + // 0x1F680345: 0x00001FA8
+	"\x1fi\x03E\x00\x00\x1f\xa9" + // 0x1F690345: 0x00001FA9
+	"\x1fj\x03E\x00\x00\x1f\xaa" + // 0x1F6A0345: 0x00001FAA
+	"\x1fk\x03E\x00\x00\x1f\xab" + // 0x1F6B0345: 0x00001FAB
+	"\x1fl\x03E\x00\x00\x1f\xac" + // 0x1F6C0345: 0x00001FAC
+	"\x1fm\x03E\x00\x00\x1f\xad" + // 0x1F6D0345: 0x00001FAD
+	"\x1fn\x03E\x00\x00\x1f\xae" + // 0x1F6E0345: 0x00001FAE
+	"\x1fo\x03E\x00\x00\x1f\xaf" + // 0x1F6F0345: 0x00001FAF
+	"\x03\xb1\x03\x06\x00\x00\x1f\xb0" + // 0x03B10306: 0x00001FB0
+	"\x03\xb1\x03\x04\x00\x00\x1f\xb1" + // 0x03B10304: 0x00001FB1
+	"\x1fp\x03E\x00\x00\x1f\xb2" + // 0x1F700345: 0x00001FB2
+	"\x03\xb1\x03E\x00\x00\x1f\xb3" + // 0x03B10345: 0x00001FB3
+	"\x03\xac\x03E\x00\x00\x1f\xb4" + // 0x03AC0345: 0x00001FB4
+	"\x03\xb1\x03B\x00\x00\x1f\xb6" + // 0x03B10342: 0x00001FB6
+	"\x1f\xb6\x03E\x00\x00\x1f\xb7" + // 0x1FB60345: 0x00001FB7
+	"\x03\x91\x03\x06\x00\x00\x1f\xb8" + // 0x03910306: 0x00001FB8
+	"\x03\x91\x03\x04\x00\x00\x1f\xb9" + // 0x03910304: 0x00001FB9
+	"\x03\x91\x03\x00\x00\x00\x1f\xba" + // 0x03910300: 0x00001FBA
+	"\x03\x91\x03E\x00\x00\x1f\xbc" + // 0x03910345: 0x00001FBC
+	"\x00\xa8\x03B\x00\x00\x1f\xc1" + // 0x00A80342: 0x00001FC1
+	"\x1ft\x03E\x00\x00\x1f\xc2" + // 0x1F740345: 0x00001FC2
+	"\x03\xb7\x03E\x00\x00\x1f\xc3" + // 0x03B70345: 0x00001FC3
+	"\x03\xae\x03E\x00\x00\x1f\xc4" + // 0x03AE0345: 0x00001FC4
+	"\x03\xb7\x03B\x00\x00\x1f\xc6" + // 0x03B70342: 0x00001FC6
+	"\x1f\xc6\x03E\x00\x00\x1f\xc7" + // 0x1FC60345: 0x00001FC7
+	"\x03\x95\x03\x00\x00\x00\x1f\xc8" + // 0x03950300: 0x00001FC8
+	"\x03\x97\x03\x00\x00\x00\x1f\xca" + // 0x03970300: 0x00001FCA
+	"\x03\x97\x03E\x00\x00\x1f\xcc" + // 0x03970345: 0x00001FCC
+	"\x1f\xbf\x03\x00\x00\x00\x1f\xcd" + // 0x1FBF0300: 0x00001FCD
+	"\x1f\xbf\x03\x01\x00\x00\x1f\xce" + // 0x1FBF0301: 0x00001FCE
+	"\x1f\xbf\x03B\x00\x00\x1f\xcf" + // 0x1FBF0342: 0x00001FCF
+	"\x03\xb9\x03\x06\x00\x00\x1f\xd0" + // 0x03B90306: 0x00001FD0
+	"\x03\xb9\x03\x04\x00\x00\x1f\xd1" + // 0x03B90304: 0x00001FD1
+	"\x03\xca\x03\x00\x00\x00\x1f\xd2" + // 0x03CA0300: 0x00001FD2
+	"\x03\xb9\x03B\x00\x00\x1f\xd6" + // 0x03B90342: 0x00001FD6
+	"\x03\xca\x03B\x00\x00\x1f\xd7" + // 0x03CA0342: 0x00001FD7
+	"\x03\x99\x03\x06\x00\x00\x1f\xd8" + // 0x03990306: 0x00001FD8
+	"\x03\x99\x03\x04\x00\x00\x1f\xd9" + // 0x03990304: 0x00001FD9
+	"\x03\x99\x03\x00\x00\x00\x1f\xda" + // 0x03990300: 0x00001FDA
+	"\x1f\xfe\x03\x00\x00\x00\x1f\xdd" + // 0x1FFE0300: 0x00001FDD
+	"\x1f\xfe\x03\x01\x00\x00\x1f\xde" + // 0x1FFE0301: 0x00001FDE
+	"\x1f\xfe\x03B\x00\x00\x1f\xdf" + // 0x1FFE0342: 0x00001FDF
+	"\x03\xc5\x03\x06\x00\x00\x1f\xe0" + // 0x03C50306: 0x00001FE0
+	"\x03\xc5\x03\x04\x00\x00\x1f\xe1" + // 0x03C50304: 0x00001FE1
+	"\x03\xcb\x03\x00\x00\x00\x1f\xe2" + // 0x03CB0300: 0x00001FE2
+	"\x03\xc1\x03\x13\x00\x00\x1f\xe4" + // 0x03C10313: 0x00001FE4
+	"\x03\xc1\x03\x14\x00\x00\x1f\xe5" + // 0x03C10314: 0x00001FE5
+	"\x03\xc5\x03B\x00\x00\x1f\xe6" + // 0x03C50342: 0x00001FE6
+	"\x03\xcb\x03B\x00\x00\x1f\xe7" + // 0x03CB0342: 0x00001FE7
+	"\x03\xa5\x03\x06\x00\x00\x1f\xe8" + // 0x03A50306: 0x00001FE8
+	"\x03\xa5\x03\x04\x00\x00\x1f\xe9" + // 0x03A50304: 0x00001FE9
+	"\x03\xa5\x03\x00\x00\x00\x1f\xea" + // 0x03A50300: 0x00001FEA
+	"\x03\xa1\x03\x14\x00\x00\x1f\xec" + // 0x03A10314: 0x00001FEC
+	"\x00\xa8\x03\x00\x00\x00\x1f\xed" + // 0x00A80300: 0x00001FED
+	"\x1f|\x03E\x00\x00\x1f\xf2" + // 0x1F7C0345: 0x00001FF2
+	"\x03\xc9\x03E\x00\x00\x1f\xf3" + // 0x03C90345: 0x00001FF3
+	"\x03\xce\x03E\x00\x00\x1f\xf4" + // 0x03CE0345: 0x00001FF4
+	"\x03\xc9\x03B\x00\x00\x1f\xf6" + // 0x03C90342: 0x00001FF6
+	"\x1f\xf6\x03E\x00\x00\x1f\xf7" + // 0x1FF60345: 0x00001FF7
+	"\x03\x9f\x03\x00\x00\x00\x1f\xf8" + // 0x039F0300: 0x00001FF8
+	"\x03\xa9\x03\x00\x00\x00\x1f\xfa" + // 0x03A90300: 0x00001FFA
+	"\x03\xa9\x03E\x00\x00\x1f\xfc" + // 0x03A90345: 0x00001FFC
+	"!\x90\x038\x00\x00!\x9a" + // 0x21900338: 0x0000219A
+	"!\x92\x038\x00\x00!\x9b" + // 0x21920338: 0x0000219B
+	"!\x94\x038\x00\x00!\xae" + // 0x21940338: 0x000021AE
+	"!\xd0\x038\x00\x00!\xcd" + // 0x21D00338: 0x000021CD
+	"!\xd4\x038\x00\x00!\xce" + // 0x21D40338: 0x000021CE
+	"!\xd2\x038\x00\x00!\xcf" + // 0x21D20338: 0x000021CF
+	"\"\x03\x038\x00\x00\"\x04" + // 0x22030338: 0x00002204
+	"\"\b\x038\x00\x00\"\t" + // 0x22080338: 0x00002209
+	"\"\v\x038\x00\x00\"\f" + // 0x220B0338: 0x0000220C
+	"\"#\x038\x00\x00\"$" + // 0x22230338: 0x00002224
+	"\"%\x038\x00\x00\"&" + // 0x22250338: 0x00002226
+	"\"<\x038\x00\x00\"A" + // 0x223C0338: 0x00002241
+	"\"C\x038\x00\x00\"D" + // 0x22430338: 0x00002244
+	"\"E\x038\x00\x00\"G" + // 0x22450338: 0x00002247
+	"\"H\x038\x00\x00\"I" + // 0x22480338: 0x00002249
+	"\x00=\x038\x00\x00\"`" + // 0x003D0338: 0x00002260
+	"\"a\x038\x00\x00\"b" + // 0x22610338: 0x00002262
+	"\"M\x038\x00\x00\"m" + // 0x224D0338: 0x0000226D
+	"\x00<\x038\x00\x00\"n" + // 0x003C0338: 0x0000226E
+	"\x00>\x038\x00\x00\"o" + // 0x003E0338: 0x0000226F
+	"\"d\x038\x00\x00\"p" + // 0x22640338: 0x00002270
+	"\"e\x038\x00\x00\"q" + // 0x22650338: 0x00002271
+	"\"r\x038\x00\x00\"t" + // 0x22720338: 0x00002274
+	"\"s\x038\x00\x00\"u" + // 0x22730338: 0x00002275
+	"\"v\x038\x00\x00\"x" + // 0x22760338: 0x00002278
+	"\"w\x038\x00\x00\"y" + // 0x22770338: 0x00002279
+	"\"z\x038\x00\x00\"\x80" + // 0x227A0338: 0x00002280
+	"\"{\x038\x00\x00\"\x81" + // 0x227B0338: 0x00002281
+	"\"\x82\x038\x00\x00\"\x84" + // 0x22820338: 0x00002284
+	"\"\x83\x038\x00\x00\"\x85" + // 0x22830338: 0x00002285
+	"\"\x86\x038\x00\x00\"\x88" + // 0x22860338: 0x00002288
+	"\"\x87\x038\x00\x00\"\x89" + // 0x22870338: 0x00002289
+	"\"\xa2\x038\x00\x00\"\xac" + // 0x22A20338: 0x000022AC
+	"\"\xa8\x038\x00\x00\"\xad" + // 0x22A80338: 0x000022AD
+	"\"\xa9\x038\x00\x00\"\xae" + // 0x22A90338: 0x000022AE
+	"\"\xab\x038\x00\x00\"\xaf" + // 0x22AB0338: 0x000022AF
+	"\"|\x038\x00\x00\"\xe0" + // 0x227C0338: 0x000022E0
+	"\"}\x038\x00\x00\"\xe1" + // 0x227D0338: 0x000022E1
+	"\"\x91\x038\x00\x00\"\xe2" + // 0x22910338: 0x000022E2
+	"\"\x92\x038\x00\x00\"\xe3" + // 0x22920338: 0x000022E3
+	"\"\xb2\x038\x00\x00\"\xea" + // 0x22B20338: 0x000022EA
+	"\"\xb3\x038\x00\x00\"\xeb" + // 0x22B30338: 0x000022EB
+	"\"\xb4\x038\x00\x00\"\xec" + // 0x22B40338: 0x000022EC
+	"\"\xb5\x038\x00\x00\"\xed" + // 0x22B50338: 0x000022ED
+	"0K0\x99\x00\x000L" + // 0x304B3099: 0x0000304C
+	"0M0\x99\x00\x000N" + // 0x304D3099: 0x0000304E
+	"0O0\x99\x00\x000P" + // 0x304F3099: 0x00003050
+	"0Q0\x99\x00\x000R" + // 0x30513099: 0x00003052
+	"0S0\x99\x00\x000T" + // 0x30533099: 0x00003054
+	"0U0\x99\x00\x000V" + // 0x30553099: 0x00003056
+	"0W0\x99\x00\x000X" + // 0x30573099: 0x00003058
+	"0Y0\x99\x00\x000Z" + // 0x30593099: 0x0000305A
+	"0[0\x99\x00\x000\\" + // 0x305B3099: 0x0000305C
+	"0]0\x99\x00\x000^" + // 0x305D3099: 0x0000305E
+	"0_0\x99\x00\x000`" + // 0x305F3099: 0x00003060
+	"0a0\x99\x00\x000b" + // 0x30613099: 0x00003062
+	"0d0\x99\x00\x000e" + // 0x30643099: 0x00003065
+	"0f0\x99\x00\x000g" + // 0x30663099: 0x00003067
+	"0h0\x99\x00\x000i" + // 0x30683099: 0x00003069
+	"0o0\x99\x00\x000p" + // 0x306F3099: 0x00003070
+	"0o0\x9a\x00\x000q" + // 0x306F309A: 0x00003071
+	"0r0\x99\x00\x000s" + // 0x30723099: 0x00003073
+	"0r0\x9a\x00\x000t" + // 0x3072309A: 0x00003074
+	"0u0\x99\x00\x000v" + // 0x30753099: 0x00003076
+	"0u0\x9a\x00\x000w" + // 0x3075309A: 0x00003077
+	"0x0\x99\x00\x000y" + // 0x30783099: 0x00003079
+	"0x0\x9a\x00\x000z" + // 0x3078309A: 0x0000307A
+	"0{0\x99\x00\x000|" + // 0x307B3099: 0x0000307C
+	"0{0\x9a\x00\x000}" + // 0x307B309A: 0x0000307D
+	"0F0\x99\x00\x000\x94" + // 0x30463099: 0x00003094
+	"0\x9d0\x99\x00\x000\x9e" + // 0x309D3099: 0x0000309E
+	"0\xab0\x99\x00\x000\xac" + // 0x30AB3099: 0x000030AC
+	"0\xad0\x99\x00\x000\xae" + // 0x30AD3099: 0x000030AE
+	"0\xaf0\x99\x00\x000\xb0" + // 0x30AF3099: 0x000030B0
+	"0\xb10\x99\x00\x000\xb2" + // 0x30B13099: 0x000030B2
+	"0\xb30\x99\x00\x000\xb4" + // 0x30B33099: 0x000030B4
+	"0\xb50\x99\x00\x000\xb6" + // 0x30B53099: 0x000030B6
+	"0\xb70\x99\x00\x000\xb8" + // 0x30B73099: 0x000030B8
+	"0\xb90\x99\x00\x000\xba" + // 0x30B93099: 0x000030BA
+	"0\xbb0\x99\x00\x000\xbc" + // 0x30BB3099: 0x000030BC
+	"0\xbd0\x99\x00\x000\xbe" + // 0x30BD3099: 0x000030BE
+	"0\xbf0\x99\x00\x000\xc0" + // 0x30BF3099: 0x000030C0
+	"0\xc10\x99\x00\x000\xc2" + // 0x30C13099: 0x000030C2
+	"0\xc40\x99\x00\x000\xc5" + // 0x30C43099: 0x000030C5
+	"0\xc60\x99\x00\x000\xc7" + // 0x30C63099: 0x000030C7
+	"0\xc80\x99\x00\x000\xc9" + // 0x30C83099: 0x000030C9
+	"0\xcf0\x99\x00\x000\xd0" + // 0x30CF3099: 0x000030D0
+	"0\xcf0\x9a\x00\x000\xd1" + // 0x30CF309A: 0x000030D1
+	"0\xd20\x99\x00\x000\xd3" + // 0x30D23099: 0x000030D3
+	"0\xd20\x9a\x00\x000\xd4" + // 0x30D2309A: 0x000030D4
+	"0\xd50\x99\x00\x000\xd6" + // 0x30D53099: 0x000030D6
+	"0\xd50\x9a\x00\x000\xd7" + // 0x30D5309A: 0x000030D7
+	"0\xd80\x99\x00\x000\xd9" + // 0x30D83099: 0x000030D9
+	"0\xd80\x9a\x00\x000\xda" + // 0x30D8309A: 0x000030DA
+	"0\xdb0\x99\x00\x000\xdc" + // 0x30DB3099: 0x000030DC
+	"0\xdb0\x9a\x00\x000\xdd" + // 0x30DB309A: 0x000030DD
+	"0\xa60\x99\x00\x000\xf4" + // 0x30A63099: 0x000030F4
+	"0\xef0\x99\x00\x000\xf7" + // 0x30EF3099: 0x000030F7
+	"0\xf00\x99\x00\x000\xf8" + // 0x30F03099: 0x000030F8
+	"0\xf10\x99\x00\x000\xf9" + // 0x30F13099: 0x000030F9
+	"0\xf20\x99\x00\x000\xfa" + // 0x30F23099: 0x000030FA
+	"0\xfd0\x99\x00\x000\xfe" + // 0x30FD3099: 0x000030FE
+	"\x10\x99\x10\xba\x00\x01\x10\x9a" + // 0x109910BA: 0x0001109A
+	"\x10\x9b\x10\xba\x00\x01\x10\x9c" + // 0x109B10BA: 0x0001109C
+	"\x10\xa5\x10\xba\x00\x01\x10\xab" + // 0x10A510BA: 0x000110AB
+	"\x111\x11'\x00\x01\x11." + // 0x11311127: 0x0001112E
+	"\x112\x11'\x00\x01\x11/" + // 0x11321127: 0x0001112F
+	"\x13G\x13>\x00\x01\x13K" + // 0x1347133E: 0x0001134B
+	"\x13G\x13W\x00\x01\x13L" + // 0x13471357: 0x0001134C
+	"\x14\xb9\x14\xba\x00\x01\x14\xbb" + // 0x14B914BA: 0x000114BB
+	"\x14\xb9\x14\xb0\x00\x01\x14\xbc" + // 0x14B914B0: 0x000114BC
+	"\x14\xb9\x14\xbd\x00\x01\x14\xbe" + // 0x14B914BD: 0x000114BE
+	"\x15\xb8\x15\xaf\x00\x01\x15\xba" + // 0x15B815AF: 0x000115BA
+	"\x15\xb9\x15\xaf\x00\x01\x15\xbb" + // 0x15B915AF: 0x000115BB
+	"\x195\x190\x00\x01\x198" + // 0x19351930: 0x00011938
+	""
+	// Total size of tables: 56KB (57068 bytes)
diff --git a/vendor/golang.org/x/text/width/tables13.0.0.go b/vendor/golang.org/x/text/width/tables13.0.0.go
index ab258e38..b1fcb522 100644
--- a/vendor/golang.org/x/text/width/tables13.0.0.go
+++ b/vendor/golang.org/x/text/width/tables13.0.0.go
@@ -1,7 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
-//go:build go1.16
-// +build go1.16
+//go:build go1.16 && !go1.21
+// +build go1.16,!go1.21
 
 package width
 
diff --git a/vendor/golang.org/x/text/width/tables15.0.0.go b/vendor/golang.org/x/text/width/tables15.0.0.go
new file mode 100644
index 00000000..4b91e338
--- /dev/null
+++ b/vendor/golang.org/x/text/width/tables15.0.0.go
@@ -0,0 +1,1368 @@
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
+
+//go:build go1.21
+// +build go1.21
+
+package width
+
+// UnicodeVersion is the Unicode version from which the tables in this package are derived.
+const UnicodeVersion = "15.0.0"
+
+// lookup returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *widthTrie) lookup(s []byte) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return widthValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := widthIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := widthIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = widthIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := widthIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = widthIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = widthIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *widthTrie) lookupUnsafe(s []byte) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return widthValues[c0]
+	}
+	i := widthIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = widthIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = widthIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// lookupString returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *widthTrie) lookupString(s string) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return widthValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := widthIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := widthIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = widthIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := widthIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = widthIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = widthIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *widthTrie) lookupStringUnsafe(s string) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return widthValues[c0]
+	}
+	i := widthIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = widthIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = widthIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// widthTrie. Total size: 14912 bytes (14.56 KiB). Checksum: 4468b6cd178303d2.
+type widthTrie struct{}
+
+func newWidthTrie(i int) *widthTrie {
+	return &widthTrie{}
+}
+
+// lookupValue determines the type of block n and looks up the value for b.
+func (t *widthTrie) lookupValue(n uint32, b byte) uint16 {
+	switch {
+	default:
+		return uint16(widthValues[n<<6+uint32(b)])
+	}
+}
+
+// widthValues: 105 blocks, 6720 entries, 13440 bytes
+// The third block is the zero block.
+var widthValues = [6720]uint16{
+	// Block 0x0, offset 0x0
+	0x20: 0x6001, 0x21: 0x6002, 0x22: 0x6002, 0x23: 0x6002,
+	0x24: 0x6002, 0x25: 0x6002, 0x26: 0x6002, 0x27: 0x6002, 0x28: 0x6002, 0x29: 0x6002,
+	0x2a: 0x6002, 0x2b: 0x6002, 0x2c: 0x6002, 0x2d: 0x6002, 0x2e: 0x6002, 0x2f: 0x6002,
+	0x30: 0x6002, 0x31: 0x6002, 0x32: 0x6002, 0x33: 0x6002, 0x34: 0x6002, 0x35: 0x6002,
+	0x36: 0x6002, 0x37: 0x6002, 0x38: 0x6002, 0x39: 0x6002, 0x3a: 0x6002, 0x3b: 0x6002,
+	0x3c: 0x6002, 0x3d: 0x6002, 0x3e: 0x6002, 0x3f: 0x6002,
+	// Block 0x1, offset 0x40
+	0x40: 0x6003, 0x41: 0x6003, 0x42: 0x6003, 0x43: 0x6003, 0x44: 0x6003, 0x45: 0x6003,
+	0x46: 0x6003, 0x47: 0x6003, 0x48: 0x6003, 0x49: 0x6003, 0x4a: 0x6003, 0x4b: 0x6003,
+	0x4c: 0x6003, 0x4d: 0x6003, 0x4e: 0x6003, 0x4f: 0x6003, 0x50: 0x6003, 0x51: 0x6003,
+	0x52: 0x6003, 0x53: 0x6003, 0x54: 0x6003, 0x55: 0x6003, 0x56: 0x6003, 0x57: 0x6003,
+	0x58: 0x6003, 0x59: 0x6003, 0x5a: 0x6003, 0x5b: 0x6003, 0x5c: 0x6003, 0x5d: 0x6003,
+	0x5e: 0x6003, 0x5f: 0x6003, 0x60: 0x6004, 0x61: 0x6004, 0x62: 0x6004, 0x63: 0x6004,
+	0x64: 0x6004, 0x65: 0x6004, 0x66: 0x6004, 0x67: 0x6004, 0x68: 0x6004, 0x69: 0x6004,
+	0x6a: 0x6004, 0x6b: 0x6004, 0x6c: 0x6004, 0x6d: 0x6004, 0x6e: 0x6004, 0x6f: 0x6004,
+	0x70: 0x6004, 0x71: 0x6004, 0x72: 0x6004, 0x73: 0x6004, 0x74: 0x6004, 0x75: 0x6004,
+	0x76: 0x6004, 0x77: 0x6004, 0x78: 0x6004, 0x79: 0x6004, 0x7a: 0x6004, 0x7b: 0x6004,
+	0x7c: 0x6004, 0x7d: 0x6004, 0x7e: 0x6004,
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xe1: 0x2000, 0xe2: 0x6005, 0xe3: 0x6005,
+	0xe4: 0x2000, 0xe5: 0x6006, 0xe6: 0x6005, 0xe7: 0x2000, 0xe8: 0x2000,
+	0xea: 0x2000, 0xec: 0x6007, 0xed: 0x2000, 0xee: 0x2000, 0xef: 0x6008,
+	0xf0: 0x2000, 0xf1: 0x2000, 0xf2: 0x2000, 0xf3: 0x2000, 0xf4: 0x2000,
+	0xf6: 0x2000, 0xf7: 0x2000, 0xf8: 0x2000, 0xf9: 0x2000, 0xfa: 0x2000,
+	0xfc: 0x2000, 0xfd: 0x2000, 0xfe: 0x2000, 0xff: 0x2000,
+	// Block 0x4, offset 0x100
+	0x106: 0x2000,
+	0x110: 0x2000,
+	0x117: 0x2000,
+	0x118: 0x2000,
+	0x11e: 0x2000, 0x11f: 0x2000, 0x120: 0x2000, 0x121: 0x2000,
+	0x126: 0x2000, 0x128: 0x2000, 0x129: 0x2000,
+	0x12a: 0x2000, 0x12c: 0x2000, 0x12d: 0x2000,
+	0x130: 0x2000, 0x132: 0x2000, 0x133: 0x2000,
+	0x137: 0x2000, 0x138: 0x2000, 0x139: 0x2000, 0x13a: 0x2000,
+	0x13c: 0x2000, 0x13e: 0x2000,
+	// Block 0x5, offset 0x140
+	0x141: 0x2000,
+	0x151: 0x2000,
+	0x153: 0x2000,
+	0x15b: 0x2000,
+	0x166: 0x2000, 0x167: 0x2000,
+	0x16b: 0x2000,
+	0x171: 0x2000, 0x172: 0x2000, 0x173: 0x2000,
+	0x178: 0x2000,
+	0x17f: 0x2000,
+	// Block 0x6, offset 0x180
+	0x180: 0x2000, 0x181: 0x2000, 0x182: 0x2000, 0x184: 0x2000,
+	0x188: 0x2000, 0x189: 0x2000, 0x18a: 0x2000, 0x18b: 0x2000,
+	0x18d: 0x2000,
+	0x192: 0x2000, 0x193: 0x2000,
+	0x1a6: 0x2000, 0x1a7: 0x2000,
+	0x1ab: 0x2000,
+	// Block 0x7, offset 0x1c0
+	0x1ce: 0x2000, 0x1d0: 0x2000,
+	0x1d2: 0x2000, 0x1d4: 0x2000, 0x1d6: 0x2000,
+	0x1d8: 0x2000, 0x1da: 0x2000, 0x1dc: 0x2000,
+	// Block 0x8, offset 0x200
+	0x211: 0x2000,
+	0x221: 0x2000,
+	// Block 0x9, offset 0x240
+	0x244: 0x2000,
+	0x247: 0x2000, 0x249: 0x2000, 0x24a: 0x2000, 0x24b: 0x2000,
+	0x24d: 0x2000, 0x250: 0x2000,
+	0x258: 0x2000, 0x259: 0x2000, 0x25a: 0x2000, 0x25b: 0x2000, 0x25d: 0x2000,
+	0x25f: 0x2000,
+	// Block 0xa, offset 0x280
+	0x280: 0x2000, 0x281: 0x2000, 0x282: 0x2000, 0x283: 0x2000, 0x284: 0x2000, 0x285: 0x2000,
+	0x286: 0x2000, 0x287: 0x2000, 0x288: 0x2000, 0x289: 0x2000, 0x28a: 0x2000, 0x28b: 0x2000,
+	0x28c: 0x2000, 0x28d: 0x2000, 0x28e: 0x2000, 0x28f: 0x2000, 0x290: 0x2000, 0x291: 0x2000,
+	0x292: 0x2000, 0x293: 0x2000, 0x294: 0x2000, 0x295: 0x2000, 0x296: 0x2000, 0x297: 0x2000,
+	0x298: 0x2000, 0x299: 0x2000, 0x29a: 0x2000, 0x29b: 0x2000, 0x29c: 0x2000, 0x29d: 0x2000,
+	0x29e: 0x2000, 0x29f: 0x2000, 0x2a0: 0x2000, 0x2a1: 0x2000, 0x2a2: 0x2000, 0x2a3: 0x2000,
+	0x2a4: 0x2000, 0x2a5: 0x2000, 0x2a6: 0x2000, 0x2a7: 0x2000, 0x2a8: 0x2000, 0x2a9: 0x2000,
+	0x2aa: 0x2000, 0x2ab: 0x2000, 0x2ac: 0x2000, 0x2ad: 0x2000, 0x2ae: 0x2000, 0x2af: 0x2000,
+	0x2b0: 0x2000, 0x2b1: 0x2000, 0x2b2: 0x2000, 0x2b3: 0x2000, 0x2b4: 0x2000, 0x2b5: 0x2000,
+	0x2b6: 0x2000, 0x2b7: 0x2000, 0x2b8: 0x2000, 0x2b9: 0x2000, 0x2ba: 0x2000, 0x2bb: 0x2000,
+	0x2bc: 0x2000, 0x2bd: 0x2000, 0x2be: 0x2000, 0x2bf: 0x2000,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0x2000, 0x2c1: 0x2000, 0x2c2: 0x2000, 0x2c3: 0x2000, 0x2c4: 0x2000, 0x2c5: 0x2000,
+	0x2c6: 0x2000, 0x2c7: 0x2000, 0x2c8: 0x2000, 0x2c9: 0x2000, 0x2ca: 0x2000, 0x2cb: 0x2000,
+	0x2cc: 0x2000, 0x2cd: 0x2000, 0x2ce: 0x2000, 0x2cf: 0x2000, 0x2d0: 0x2000, 0x2d1: 0x2000,
+	0x2d2: 0x2000, 0x2d3: 0x2000, 0x2d4: 0x2000, 0x2d5: 0x2000, 0x2d6: 0x2000, 0x2d7: 0x2000,
+	0x2d8: 0x2000, 0x2d9: 0x2000, 0x2da: 0x2000, 0x2db: 0x2000, 0x2dc: 0x2000, 0x2dd: 0x2000,
+	0x2de: 0x2000, 0x2df: 0x2000, 0x2e0: 0x2000, 0x2e1: 0x2000, 0x2e2: 0x2000, 0x2e3: 0x2000,
+	0x2e4: 0x2000, 0x2e5: 0x2000, 0x2e6: 0x2000, 0x2e7: 0x2000, 0x2e8: 0x2000, 0x2e9: 0x2000,
+	0x2ea: 0x2000, 0x2eb: 0x2000, 0x2ec: 0x2000, 0x2ed: 0x2000, 0x2ee: 0x2000, 0x2ef: 0x2000,
+	// Block 0xc, offset 0x300
+	0x311: 0x2000,
+	0x312: 0x2000, 0x313: 0x2000, 0x314: 0x2000, 0x315: 0x2000, 0x316: 0x2000, 0x317: 0x2000,
+	0x318: 0x2000, 0x319: 0x2000, 0x31a: 0x2000, 0x31b: 0x2000, 0x31c: 0x2000, 0x31d: 0x2000,
+	0x31e: 0x2000, 0x31f: 0x2000, 0x320: 0x2000, 0x321: 0x2000, 0x323: 0x2000,
+	0x324: 0x2000, 0x325: 0x2000, 0x326: 0x2000, 0x327: 0x2000, 0x328: 0x2000, 0x329: 0x2000,
+	0x331: 0x2000, 0x332: 0x2000, 0x333: 0x2000, 0x334: 0x2000, 0x335: 0x2000,
+	0x336: 0x2000, 0x337: 0x2000, 0x338: 0x2000, 0x339: 0x2000, 0x33a: 0x2000, 0x33b: 0x2000,
+	0x33c: 0x2000, 0x33d: 0x2000, 0x33e: 0x2000, 0x33f: 0x2000,
+	// Block 0xd, offset 0x340
+	0x340: 0x2000, 0x341: 0x2000, 0x343: 0x2000, 0x344: 0x2000, 0x345: 0x2000,
+	0x346: 0x2000, 0x347: 0x2000, 0x348: 0x2000, 0x349: 0x2000,
+	// Block 0xe, offset 0x380
+	0x381: 0x2000,
+	0x390: 0x2000, 0x391: 0x2000,
+	0x392: 0x2000, 0x393: 0x2000, 0x394: 0x2000, 0x395: 0x2000, 0x396: 0x2000, 0x397: 0x2000,
+	0x398: 0x2000, 0x399: 0x2000, 0x39a: 0x2000, 0x39b: 0x2000, 0x39c: 0x2000, 0x39d: 0x2000,
+	0x39e: 0x2000, 0x39f: 0x2000, 0x3a0: 0x2000, 0x3a1: 0x2000, 0x3a2: 0x2000, 0x3a3: 0x2000,
+	0x3a4: 0x2000, 0x3a5: 0x2000, 0x3a6: 0x2000, 0x3a7: 0x2000, 0x3a8: 0x2000, 0x3a9: 0x2000,
+	0x3aa: 0x2000, 0x3ab: 0x2000, 0x3ac: 0x2000, 0x3ad: 0x2000, 0x3ae: 0x2000, 0x3af: 0x2000,
+	0x3b0: 0x2000, 0x3b1: 0x2000, 0x3b2: 0x2000, 0x3b3: 0x2000, 0x3b4: 0x2000, 0x3b5: 0x2000,
+	0x3b6: 0x2000, 0x3b7: 0x2000, 0x3b8: 0x2000, 0x3b9: 0x2000, 0x3ba: 0x2000, 0x3bb: 0x2000,
+	0x3bc: 0x2000, 0x3bd: 0x2000, 0x3be: 0x2000, 0x3bf: 0x2000,
+	// Block 0xf, offset 0x3c0
+	0x3c0: 0x2000, 0x3c1: 0x2000, 0x3c2: 0x2000, 0x3c3: 0x2000, 0x3c4: 0x2000, 0x3c5: 0x2000,
+	0x3c6: 0x2000, 0x3c7: 0x2000, 0x3c8: 0x2000, 0x3c9: 0x2000, 0x3ca: 0x2000, 0x3cb: 0x2000,
+	0x3cc: 0x2000, 0x3cd: 0x2000, 0x3ce: 0x2000, 0x3cf: 0x2000, 0x3d1: 0x2000,
+	// Block 0x10, offset 0x400
+	0x400: 0x4000, 0x401: 0x4000, 0x402: 0x4000, 0x403: 0x4000, 0x404: 0x4000, 0x405: 0x4000,
+	0x406: 0x4000, 0x407: 0x4000, 0x408: 0x4000, 0x409: 0x4000, 0x40a: 0x4000, 0x40b: 0x4000,
+	0x40c: 0x4000, 0x40d: 0x4000, 0x40e: 0x4000, 0x40f: 0x4000, 0x410: 0x4000, 0x411: 0x4000,
+	0x412: 0x4000, 0x413: 0x4000, 0x414: 0x4000, 0x415: 0x4000, 0x416: 0x4000, 0x417: 0x4000,
+	0x418: 0x4000, 0x419: 0x4000, 0x41a: 0x4000, 0x41b: 0x4000, 0x41c: 0x4000, 0x41d: 0x4000,
+	0x41e: 0x4000, 0x41f: 0x4000, 0x420: 0x4000, 0x421: 0x4000, 0x422: 0x4000, 0x423: 0x4000,
+	0x424: 0x4000, 0x425: 0x4000, 0x426: 0x4000, 0x427: 0x4000, 0x428: 0x4000, 0x429: 0x4000,
+	0x42a: 0x4000, 0x42b: 0x4000, 0x42c: 0x4000, 0x42d: 0x4000, 0x42e: 0x4000, 0x42f: 0x4000,
+	0x430: 0x4000, 0x431: 0x4000, 0x432: 0x4000, 0x433: 0x4000, 0x434: 0x4000, 0x435: 0x4000,
+	0x436: 0x4000, 0x437: 0x4000, 0x438: 0x4000, 0x439: 0x4000, 0x43a: 0x4000, 0x43b: 0x4000,
+	0x43c: 0x4000, 0x43d: 0x4000, 0x43e: 0x4000, 0x43f: 0x4000,
+	// Block 0x11, offset 0x440
+	0x440: 0x4000, 0x441: 0x4000, 0x442: 0x4000, 0x443: 0x4000, 0x444: 0x4000, 0x445: 0x4000,
+	0x446: 0x4000, 0x447: 0x4000, 0x448: 0x4000, 0x449: 0x4000, 0x44a: 0x4000, 0x44b: 0x4000,
+	0x44c: 0x4000, 0x44d: 0x4000, 0x44e: 0x4000, 0x44f: 0x4000, 0x450: 0x4000, 0x451: 0x4000,
+	0x452: 0x4000, 0x453: 0x4000, 0x454: 0x4000, 0x455: 0x4000, 0x456: 0x4000, 0x457: 0x4000,
+	0x458: 0x4000, 0x459: 0x4000, 0x45a: 0x4000, 0x45b: 0x4000, 0x45c: 0x4000, 0x45d: 0x4000,
+	0x45e: 0x4000, 0x45f: 0x4000,
+	// Block 0x12, offset 0x480
+	0x490: 0x2000,
+	0x493: 0x2000, 0x494: 0x2000, 0x495: 0x2000, 0x496: 0x2000,
+	0x498: 0x2000, 0x499: 0x2000, 0x49c: 0x2000, 0x49d: 0x2000,
+	0x4a0: 0x2000, 0x4a1: 0x2000, 0x4a2: 0x2000,
+	0x4a4: 0x2000, 0x4a5: 0x2000, 0x4a6: 0x2000, 0x4a7: 0x2000,
+	0x4b0: 0x2000, 0x4b2: 0x2000, 0x4b3: 0x2000, 0x4b5: 0x2000,
+	0x4bb: 0x2000,
+	0x4be: 0x2000,
+	// Block 0x13, offset 0x4c0
+	0x4f4: 0x2000,
+	0x4ff: 0x2000,
+	// Block 0x14, offset 0x500
+	0x501: 0x2000, 0x502: 0x2000, 0x503: 0x2000, 0x504: 0x2000,
+	0x529: 0xa009,
+	0x52c: 0x2000,
+	// Block 0x15, offset 0x540
+	0x543: 0x2000, 0x545: 0x2000,
+	0x549: 0x2000,
+	0x553: 0x2000, 0x556: 0x2000,
+	0x561: 0x2000, 0x562: 0x2000,
+	0x566: 0x2000,
+	0x56b: 0x2000,
+	// Block 0x16, offset 0x580
+	0x593: 0x2000, 0x594: 0x2000,
+	0x59b: 0x2000, 0x59c: 0x2000, 0x59d: 0x2000,
+	0x59e: 0x2000, 0x5a0: 0x2000, 0x5a1: 0x2000, 0x5a2: 0x2000, 0x5a3: 0x2000,
+	0x5a4: 0x2000, 0x5a5: 0x2000, 0x5a6: 0x2000, 0x5a7: 0x2000, 0x5a8: 0x2000, 0x5a9: 0x2000,
+	0x5aa: 0x2000, 0x5ab: 0x2000,
+	0x5b0: 0x2000, 0x5b1: 0x2000, 0x5b2: 0x2000, 0x5b3: 0x2000, 0x5b4: 0x2000, 0x5b5: 0x2000,
+	0x5b6: 0x2000, 0x5b7: 0x2000, 0x5b8: 0x2000, 0x5b9: 0x2000,
+	// Block 0x17, offset 0x5c0
+	0x5c9: 0x2000,
+	0x5d0: 0x200a, 0x5d1: 0x200b,
+	0x5d2: 0x200a, 0x5d3: 0x200c, 0x5d4: 0x2000, 0x5d5: 0x2000, 0x5d6: 0x2000, 0x5d7: 0x2000,
+	0x5d8: 0x2000, 0x5d9: 0x2000,
+	0x5f8: 0x2000, 0x5f9: 0x2000,
+	// Block 0x18, offset 0x600
+	0x612: 0x2000, 0x614: 0x2000,
+	0x627: 0x2000,
+	// Block 0x19, offset 0x640
+	0x640: 0x2000, 0x642: 0x2000, 0x643: 0x2000,
+	0x647: 0x2000, 0x648: 0x2000, 0x64b: 0x2000,
+	0x64f: 0x2000, 0x651: 0x2000,
+	0x655: 0x2000,
+	0x65a: 0x2000, 0x65d: 0x2000,
+	0x65e: 0x2000, 0x65f: 0x2000, 0x660: 0x2000, 0x663: 0x2000,
+	0x665: 0x2000, 0x667: 0x2000, 0x668: 0x2000, 0x669: 0x2000,
+	0x66a: 0x2000, 0x66b: 0x2000, 0x66c: 0x2000, 0x66e: 0x2000,
+	0x674: 0x2000, 0x675: 0x2000,
+	0x676: 0x2000, 0x677: 0x2000,
+	0x67c: 0x2000, 0x67d: 0x2000,
+	// Block 0x1a, offset 0x680
+	0x688: 0x2000,
+	0x68c: 0x2000,
+	0x692: 0x2000,
+	0x6a0: 0x2000, 0x6a1: 0x2000,
+	0x6a4: 0x2000, 0x6a5: 0x2000, 0x6a6: 0x2000, 0x6a7: 0x2000,
+	0x6aa: 0x2000, 0x6ab: 0x2000, 0x6ae: 0x2000, 0x6af: 0x2000,
+	// Block 0x1b, offset 0x6c0
+	0x6c2: 0x2000, 0x6c3: 0x2000,
+	0x6c6: 0x2000, 0x6c7: 0x2000,
+	0x6d5: 0x2000,
+	0x6d9: 0x2000,
+	0x6e5: 0x2000,
+	0x6ff: 0x2000,
+	// Block 0x1c, offset 0x700
+	0x712: 0x2000,
+	0x71a: 0x4000, 0x71b: 0x4000,
+	0x729: 0x4000,
+	0x72a: 0x4000,
+	// Block 0x1d, offset 0x740
+	0x769: 0x4000,
+	0x76a: 0x4000, 0x76b: 0x4000, 0x76c: 0x4000,
+	0x770: 0x4000, 0x773: 0x4000,
+	// Block 0x1e, offset 0x780
+	0x7a0: 0x2000, 0x7a1: 0x2000, 0x7a2: 0x2000, 0x7a3: 0x2000,
+	0x7a4: 0x2000, 0x7a5: 0x2000, 0x7a6: 0x2000, 0x7a7: 0x2000, 0x7a8: 0x2000, 0x7a9: 0x2000,
+	0x7aa: 0x2000, 0x7ab: 0x2000, 0x7ac: 0x2000, 0x7ad: 0x2000, 0x7ae: 0x2000, 0x7af: 0x2000,
+	0x7b0: 0x2000, 0x7b1: 0x2000, 0x7b2: 0x2000, 0x7b3: 0x2000, 0x7b4: 0x2000, 0x7b5: 0x2000,
+	0x7b6: 0x2000, 0x7b7: 0x2000, 0x7b8: 0x2000, 0x7b9: 0x2000, 0x7ba: 0x2000, 0x7bb: 0x2000,
+	0x7bc: 0x2000, 0x7bd: 0x2000, 0x7be: 0x2000, 0x7bf: 0x2000,
+	// Block 0x1f, offset 0x7c0
+	0x7c0: 0x2000, 0x7c1: 0x2000, 0x7c2: 0x2000, 0x7c3: 0x2000, 0x7c4: 0x2000, 0x7c5: 0x2000,
+	0x7c6: 0x2000, 0x7c7: 0x2000, 0x7c8: 0x2000, 0x7c9: 0x2000, 0x7ca: 0x2000, 0x7cb: 0x2000,
+	0x7cc: 0x2000, 0x7cd: 0x2000, 0x7ce: 0x2000, 0x7cf: 0x2000, 0x7d0: 0x2000, 0x7d1: 0x2000,
+	0x7d2: 0x2000, 0x7d3: 0x2000, 0x7d4: 0x2000, 0x7d5: 0x2000, 0x7d6: 0x2000, 0x7d7: 0x2000,
+	0x7d8: 0x2000, 0x7d9: 0x2000, 0x7da: 0x2000, 0x7db: 0x2000, 0x7dc: 0x2000, 0x7dd: 0x2000,
+	0x7de: 0x2000, 0x7df: 0x2000, 0x7e0: 0x2000, 0x7e1: 0x2000, 0x7e2: 0x2000, 0x7e3: 0x2000,
+	0x7e4: 0x2000, 0x7e5: 0x2000, 0x7e6: 0x2000, 0x7e7: 0x2000, 0x7e8: 0x2000, 0x7e9: 0x2000,
+	0x7eb: 0x2000, 0x7ec: 0x2000, 0x7ed: 0x2000, 0x7ee: 0x2000, 0x7ef: 0x2000,
+	0x7f0: 0x2000, 0x7f1: 0x2000, 0x7f2: 0x2000, 0x7f3: 0x2000, 0x7f4: 0x2000, 0x7f5: 0x2000,
+	0x7f6: 0x2000, 0x7f7: 0x2000, 0x7f8: 0x2000, 0x7f9: 0x2000, 0x7fa: 0x2000, 0x7fb: 0x2000,
+	0x7fc: 0x2000, 0x7fd: 0x2000, 0x7fe: 0x2000, 0x7ff: 0x2000,
+	// Block 0x20, offset 0x800
+	0x800: 0x2000, 0x801: 0x2000, 0x802: 0x200d, 0x803: 0x2000, 0x804: 0x2000, 0x805: 0x2000,
+	0x806: 0x2000, 0x807: 0x2000, 0x808: 0x2000, 0x809: 0x2000, 0x80a: 0x2000, 0x80b: 0x2000,
+	0x80c: 0x2000, 0x80d: 0x2000, 0x80e: 0x2000, 0x80f: 0x2000, 0x810: 0x2000, 0x811: 0x2000,
+	0x812: 0x2000, 0x813: 0x2000, 0x814: 0x2000, 0x815: 0x2000, 0x816: 0x2000, 0x817: 0x2000,
+	0x818: 0x2000, 0x819: 0x2000, 0x81a: 0x2000, 0x81b: 0x2000, 0x81c: 0x2000, 0x81d: 0x2000,
+	0x81e: 0x2000, 0x81f: 0x2000, 0x820: 0x2000, 0x821: 0x2000, 0x822: 0x2000, 0x823: 0x2000,
+	0x824: 0x2000, 0x825: 0x2000, 0x826: 0x2000, 0x827: 0x2000, 0x828: 0x2000, 0x829: 0x2000,
+	0x82a: 0x2000, 0x82b: 0x2000, 0x82c: 0x2000, 0x82d: 0x2000, 0x82e: 0x2000, 0x82f: 0x2000,
+	0x830: 0x2000, 0x831: 0x2000, 0x832: 0x2000, 0x833: 0x2000, 0x834: 0x2000, 0x835: 0x2000,
+	0x836: 0x2000, 0x837: 0x2000, 0x838: 0x2000, 0x839: 0x2000, 0x83a: 0x2000, 0x83b: 0x2000,
+	0x83c: 0x2000, 0x83d: 0x2000, 0x83e: 0x2000, 0x83f: 0x2000,
+	// Block 0x21, offset 0x840
+	0x840: 0x2000, 0x841: 0x2000, 0x842: 0x2000, 0x843: 0x2000, 0x844: 0x2000, 0x845: 0x2000,
+	0x846: 0x2000, 0x847: 0x2000, 0x848: 0x2000, 0x849: 0x2000, 0x84a: 0x2000, 0x84b: 0x2000,
+	0x850: 0x2000, 0x851: 0x2000,
+	0x852: 0x2000, 0x853: 0x2000, 0x854: 0x2000, 0x855: 0x2000, 0x856: 0x2000, 0x857: 0x2000,
+	0x858: 0x2000, 0x859: 0x2000, 0x85a: 0x2000, 0x85b: 0x2000, 0x85c: 0x2000, 0x85d: 0x2000,
+	0x85e: 0x2000, 0x85f: 0x2000, 0x860: 0x2000, 0x861: 0x2000, 0x862: 0x2000, 0x863: 0x2000,
+	0x864: 0x2000, 0x865: 0x2000, 0x866: 0x2000, 0x867: 0x2000, 0x868: 0x2000, 0x869: 0x2000,
+	0x86a: 0x2000, 0x86b: 0x2000, 0x86c: 0x2000, 0x86d: 0x2000, 0x86e: 0x2000, 0x86f: 0x2000,
+	0x870: 0x2000, 0x871: 0x2000, 0x872: 0x2000, 0x873: 0x2000,
+	// Block 0x22, offset 0x880
+	0x880: 0x2000, 0x881: 0x2000, 0x882: 0x2000, 0x883: 0x2000, 0x884: 0x2000, 0x885: 0x2000,
+	0x886: 0x2000, 0x887: 0x2000, 0x888: 0x2000, 0x889: 0x2000, 0x88a: 0x2000, 0x88b: 0x2000,
+	0x88c: 0x2000, 0x88d: 0x2000, 0x88e: 0x2000, 0x88f: 0x2000,
+	0x892: 0x2000, 0x893: 0x2000, 0x894: 0x2000, 0x895: 0x2000,
+	0x8a0: 0x200e, 0x8a1: 0x2000, 0x8a3: 0x2000,
+	0x8a4: 0x2000, 0x8a5: 0x2000, 0x8a6: 0x2000, 0x8a7: 0x2000, 0x8a8: 0x2000, 0x8a9: 0x2000,
+	0x8b2: 0x2000, 0x8b3: 0x2000,
+	0x8b6: 0x2000, 0x8b7: 0x2000,
+	0x8bc: 0x2000, 0x8bd: 0x2000,
+	// Block 0x23, offset 0x8c0
+	0x8c0: 0x2000, 0x8c1: 0x2000,
+	0x8c6: 0x2000, 0x8c7: 0x2000, 0x8c8: 0x2000, 0x8cb: 0x200f,
+	0x8ce: 0x2000, 0x8cf: 0x2000, 0x8d0: 0x2000, 0x8d1: 0x2000,
+	0x8e2: 0x2000, 0x8e3: 0x2000,
+	0x8e4: 0x2000, 0x8e5: 0x2000,
+	0x8ef: 0x2000,
+	0x8fd: 0x4000, 0x8fe: 0x4000,
+	// Block 0x24, offset 0x900
+	0x905: 0x2000,
+	0x906: 0x2000, 0x909: 0x2000,
+	0x90e: 0x2000, 0x90f: 0x2000,
+	0x914: 0x4000, 0x915: 0x4000,
+	0x91c: 0x2000,
+	0x91e: 0x2000,
+	// Block 0x25, offset 0x940
+	0x940: 0x2000, 0x942: 0x2000,
+	0x948: 0x4000, 0x949: 0x4000, 0x94a: 0x4000, 0x94b: 0x4000,
+	0x94c: 0x4000, 0x94d: 0x4000, 0x94e: 0x4000, 0x94f: 0x4000, 0x950: 0x4000, 0x951: 0x4000,
+	0x952: 0x4000, 0x953: 0x4000,
+	0x960: 0x2000, 0x961: 0x2000, 0x963: 0x2000,
+	0x964: 0x2000, 0x965: 0x2000, 0x967: 0x2000, 0x968: 0x2000, 0x969: 0x2000,
+	0x96a: 0x2000, 0x96c: 0x2000, 0x96d: 0x2000, 0x96f: 0x2000,
+	0x97f: 0x4000,
+	// Block 0x26, offset 0x980
+	0x993: 0x4000,
+	0x99e: 0x2000, 0x99f: 0x2000, 0x9a1: 0x4000,
+	0x9aa: 0x4000, 0x9ab: 0x4000,
+	0x9bd: 0x4000, 0x9be: 0x4000, 0x9bf: 0x2000,
+	// Block 0x27, offset 0x9c0
+	0x9c4: 0x4000, 0x9c5: 0x4000,
+	0x9c6: 0x2000, 0x9c7: 0x2000, 0x9c8: 0x2000, 0x9c9: 0x2000, 0x9ca: 0x2000, 0x9cb: 0x2000,
+	0x9cc: 0x2000, 0x9cd: 0x2000, 0x9ce: 0x4000, 0x9cf: 0x2000, 0x9d0: 0x2000, 0x9d1: 0x2000,
+	0x9d2: 0x2000, 0x9d3: 0x2000, 0x9d4: 0x4000, 0x9d5: 0x2000, 0x9d6: 0x2000, 0x9d7: 0x2000,
+	0x9d8: 0x2000, 0x9d9: 0x2000, 0x9da: 0x2000, 0x9db: 0x2000, 0x9dc: 0x2000, 0x9dd: 0x2000,
+	0x9de: 0x2000, 0x9df: 0x2000, 0x9e0: 0x2000, 0x9e1: 0x2000, 0x9e3: 0x2000,
+	0x9e8: 0x2000, 0x9e9: 0x2000,
+	0x9ea: 0x4000, 0x9eb: 0x2000, 0x9ec: 0x2000, 0x9ed: 0x2000, 0x9ee: 0x2000, 0x9ef: 0x2000,
+	0x9f0: 0x2000, 0x9f1: 0x2000, 0x9f2: 0x4000, 0x9f3: 0x4000, 0x9f4: 0x2000, 0x9f5: 0x4000,
+	0x9f6: 0x2000, 0x9f7: 0x2000, 0x9f8: 0x2000, 0x9f9: 0x2000, 0x9fa: 0x4000, 0x9fb: 0x2000,
+	0x9fc: 0x2000, 0x9fd: 0x4000, 0x9fe: 0x2000, 0x9ff: 0x2000,
+	// Block 0x28, offset 0xa00
+	0xa05: 0x4000,
+	0xa0a: 0x4000, 0xa0b: 0x4000,
+	0xa28: 0x4000,
+	0xa3d: 0x2000,
+	// Block 0x29, offset 0xa40
+	0xa4c: 0x4000, 0xa4e: 0x4000,
+	0xa53: 0x4000, 0xa54: 0x4000, 0xa55: 0x4000, 0xa57: 0x4000,
+	0xa76: 0x2000, 0xa77: 0x2000, 0xa78: 0x2000, 0xa79: 0x2000, 0xa7a: 0x2000, 0xa7b: 0x2000,
+	0xa7c: 0x2000, 0xa7d: 0x2000, 0xa7e: 0x2000, 0xa7f: 0x2000,
+	// Block 0x2a, offset 0xa80
+	0xa95: 0x4000, 0xa96: 0x4000, 0xa97: 0x4000,
+	0xab0: 0x4000,
+	0xabf: 0x4000,
+	// Block 0x2b, offset 0xac0
+	0xae6: 0x6000, 0xae7: 0x6000, 0xae8: 0x6000, 0xae9: 0x6000,
+	0xaea: 0x6000, 0xaeb: 0x6000, 0xaec: 0x6000, 0xaed: 0x6000,
+	// Block 0x2c, offset 0xb00
+	0xb05: 0x6010,
+	0xb06: 0x6011,
+	// Block 0x2d, offset 0xb40
+	0xb5b: 0x4000, 0xb5c: 0x4000,
+	// Block 0x2e, offset 0xb80
+	0xb90: 0x4000,
+	0xb95: 0x4000, 0xb96: 0x2000, 0xb97: 0x2000,
+	0xb98: 0x2000, 0xb99: 0x2000,
+	// Block 0x2f, offset 0xbc0
+	0xbc0: 0x4000, 0xbc1: 0x4000, 0xbc2: 0x4000, 0xbc3: 0x4000, 0xbc4: 0x4000, 0xbc5: 0x4000,
+	0xbc6: 0x4000, 0xbc7: 0x4000, 0xbc8: 0x4000, 0xbc9: 0x4000, 0xbca: 0x4000, 0xbcb: 0x4000,
+	0xbcc: 0x4000, 0xbcd: 0x4000, 0xbce: 0x4000, 0xbcf: 0x4000, 0xbd0: 0x4000, 0xbd1: 0x4000,
+	0xbd2: 0x4000, 0xbd3: 0x4000, 0xbd4: 0x4000, 0xbd5: 0x4000, 0xbd6: 0x4000, 0xbd7: 0x4000,
+	0xbd8: 0x4000, 0xbd9: 0x4000, 0xbdb: 0x4000, 0xbdc: 0x4000, 0xbdd: 0x4000,
+	0xbde: 0x4000, 0xbdf: 0x4000, 0xbe0: 0x4000, 0xbe1: 0x4000, 0xbe2: 0x4000, 0xbe3: 0x4000,
+	0xbe4: 0x4000, 0xbe5: 0x4000, 0xbe6: 0x4000, 0xbe7: 0x4000, 0xbe8: 0x4000, 0xbe9: 0x4000,
+	0xbea: 0x4000, 0xbeb: 0x4000, 0xbec: 0x4000, 0xbed: 0x4000, 0xbee: 0x4000, 0xbef: 0x4000,
+	0xbf0: 0x4000, 0xbf1: 0x4000, 0xbf2: 0x4000, 0xbf3: 0x4000, 0xbf4: 0x4000, 0xbf5: 0x4000,
+	0xbf6: 0x4000, 0xbf7: 0x4000, 0xbf8: 0x4000, 0xbf9: 0x4000, 0xbfa: 0x4000, 0xbfb: 0x4000,
+	0xbfc: 0x4000, 0xbfd: 0x4000, 0xbfe: 0x4000, 0xbff: 0x4000,
+	// Block 0x30, offset 0xc00
+	0xc00: 0x4000, 0xc01: 0x4000, 0xc02: 0x4000, 0xc03: 0x4000, 0xc04: 0x4000, 0xc05: 0x4000,
+	0xc06: 0x4000, 0xc07: 0x4000, 0xc08: 0x4000, 0xc09: 0x4000, 0xc0a: 0x4000, 0xc0b: 0x4000,
+	0xc0c: 0x4000, 0xc0d: 0x4000, 0xc0e: 0x4000, 0xc0f: 0x4000, 0xc10: 0x4000, 0xc11: 0x4000,
+	0xc12: 0x4000, 0xc13: 0x4000, 0xc14: 0x4000, 0xc15: 0x4000, 0xc16: 0x4000, 0xc17: 0x4000,
+	0xc18: 0x4000, 0xc19: 0x4000, 0xc1a: 0x4000, 0xc1b: 0x4000, 0xc1c: 0x4000, 0xc1d: 0x4000,
+	0xc1e: 0x4000, 0xc1f: 0x4000, 0xc20: 0x4000, 0xc21: 0x4000, 0xc22: 0x4000, 0xc23: 0x4000,
+	0xc24: 0x4000, 0xc25: 0x4000, 0xc26: 0x4000, 0xc27: 0x4000, 0xc28: 0x4000, 0xc29: 0x4000,
+	0xc2a: 0x4000, 0xc2b: 0x4000, 0xc2c: 0x4000, 0xc2d: 0x4000, 0xc2e: 0x4000, 0xc2f: 0x4000,
+	0xc30: 0x4000, 0xc31: 0x4000, 0xc32: 0x4000, 0xc33: 0x4000,
+	// Block 0x31, offset 0xc40
+	0xc40: 0x4000, 0xc41: 0x4000, 0xc42: 0x4000, 0xc43: 0x4000, 0xc44: 0x4000, 0xc45: 0x4000,
+	0xc46: 0x4000, 0xc47: 0x4000, 0xc48: 0x4000, 0xc49: 0x4000, 0xc4a: 0x4000, 0xc4b: 0x4000,
+	0xc4c: 0x4000, 0xc4d: 0x4000, 0xc4e: 0x4000, 0xc4f: 0x4000, 0xc50: 0x4000, 0xc51: 0x4000,
+	0xc52: 0x4000, 0xc53: 0x4000, 0xc54: 0x4000, 0xc55: 0x4000,
+	0xc70: 0x4000, 0xc71: 0x4000, 0xc72: 0x4000, 0xc73: 0x4000, 0xc74: 0x4000, 0xc75: 0x4000,
+	0xc76: 0x4000, 0xc77: 0x4000, 0xc78: 0x4000, 0xc79: 0x4000, 0xc7a: 0x4000, 0xc7b: 0x4000,
+	// Block 0x32, offset 0xc80
+	0xc80: 0x9012, 0xc81: 0x4013, 0xc82: 0x4014, 0xc83: 0x4000, 0xc84: 0x4000, 0xc85: 0x4000,
+	0xc86: 0x4000, 0xc87: 0x4000, 0xc88: 0x4000, 0xc89: 0x4000, 0xc8a: 0x4000, 0xc8b: 0x4000,
+	0xc8c: 0x4015, 0xc8d: 0x4015, 0xc8e: 0x4000, 0xc8f: 0x4000, 0xc90: 0x4000, 0xc91: 0x4000,
+	0xc92: 0x4000, 0xc93: 0x4000, 0xc94: 0x4000, 0xc95: 0x4000, 0xc96: 0x4000, 0xc97: 0x4000,
+	0xc98: 0x4000, 0xc99: 0x4000, 0xc9a: 0x4000, 0xc9b: 0x4000, 0xc9c: 0x4000, 0xc9d: 0x4000,
+	0xc9e: 0x4000, 0xc9f: 0x4000, 0xca0: 0x4000, 0xca1: 0x4000, 0xca2: 0x4000, 0xca3: 0x4000,
+	0xca4: 0x4000, 0xca5: 0x4000, 0xca6: 0x4000, 0xca7: 0x4000, 0xca8: 0x4000, 0xca9: 0x4000,
+	0xcaa: 0x4000, 0xcab: 0x4000, 0xcac: 0x4000, 0xcad: 0x4000, 0xcae: 0x4000, 0xcaf: 0x4000,
+	0xcb0: 0x4000, 0xcb1: 0x4000, 0xcb2: 0x4000, 0xcb3: 0x4000, 0xcb4: 0x4000, 0xcb5: 0x4000,
+	0xcb6: 0x4000, 0xcb7: 0x4000, 0xcb8: 0x4000, 0xcb9: 0x4000, 0xcba: 0x4000, 0xcbb: 0x4000,
+	0xcbc: 0x4000, 0xcbd: 0x4000, 0xcbe: 0x4000,
+	// Block 0x33, offset 0xcc0
+	0xcc1: 0x4000, 0xcc2: 0x4000, 0xcc3: 0x4000, 0xcc4: 0x4000, 0xcc5: 0x4000,
+	0xcc6: 0x4000, 0xcc7: 0x4000, 0xcc8: 0x4000, 0xcc9: 0x4000, 0xcca: 0x4000, 0xccb: 0x4000,
+	0xccc: 0x4000, 0xccd: 0x4000, 0xcce: 0x4000, 0xccf: 0x4000, 0xcd0: 0x4000, 0xcd1: 0x4000,
+	0xcd2: 0x4000, 0xcd3: 0x4000, 0xcd4: 0x4000, 0xcd5: 0x4000, 0xcd6: 0x4000, 0xcd7: 0x4000,
+	0xcd8: 0x4000, 0xcd9: 0x4000, 0xcda: 0x4000, 0xcdb: 0x4000, 0xcdc: 0x4000, 0xcdd: 0x4000,
+	0xcde: 0x4000, 0xcdf: 0x4000, 0xce0: 0x4000, 0xce1: 0x4000, 0xce2: 0x4000, 0xce3: 0x4000,
+	0xce4: 0x4000, 0xce5: 0x4000, 0xce6: 0x4000, 0xce7: 0x4000, 0xce8: 0x4000, 0xce9: 0x4000,
+	0xcea: 0x4000, 0xceb: 0x4000, 0xcec: 0x4000, 0xced: 0x4000, 0xcee: 0x4000, 0xcef: 0x4000,
+	0xcf0: 0x4000, 0xcf1: 0x4000, 0xcf2: 0x4000, 0xcf3: 0x4000, 0xcf4: 0x4000, 0xcf5: 0x4000,
+	0xcf6: 0x4000, 0xcf7: 0x4000, 0xcf8: 0x4000, 0xcf9: 0x4000, 0xcfa: 0x4000, 0xcfb: 0x4000,
+	0xcfc: 0x4000, 0xcfd: 0x4000, 0xcfe: 0x4000, 0xcff: 0x4000,
+	// Block 0x34, offset 0xd00
+	0xd00: 0x4000, 0xd01: 0x4000, 0xd02: 0x4000, 0xd03: 0x4000, 0xd04: 0x4000, 0xd05: 0x4000,
+	0xd06: 0x4000, 0xd07: 0x4000, 0xd08: 0x4000, 0xd09: 0x4000, 0xd0a: 0x4000, 0xd0b: 0x4000,
+	0xd0c: 0x4000, 0xd0d: 0x4000, 0xd0e: 0x4000, 0xd0f: 0x4000, 0xd10: 0x4000, 0xd11: 0x4000,
+	0xd12: 0x4000, 0xd13: 0x4000, 0xd14: 0x4000, 0xd15: 0x4000, 0xd16: 0x4000,
+	0xd19: 0x4016, 0xd1a: 0x4017, 0xd1b: 0x4000, 0xd1c: 0x4000, 0xd1d: 0x4000,
+	0xd1e: 0x4000, 0xd1f: 0x4000, 0xd20: 0x4000, 0xd21: 0x4018, 0xd22: 0x4019, 0xd23: 0x401a,
+	0xd24: 0x401b, 0xd25: 0x401c, 0xd26: 0x401d, 0xd27: 0x401e, 0xd28: 0x401f, 0xd29: 0x4020,
+	0xd2a: 0x4021, 0xd2b: 0x4022, 0xd2c: 0x4000, 0xd2d: 0x4010, 0xd2e: 0x4000, 0xd2f: 0x4023,
+	0xd30: 0x4000, 0xd31: 0x4024, 0xd32: 0x4000, 0xd33: 0x4025, 0xd34: 0x4000, 0xd35: 0x4026,
+	0xd36: 0x4000, 0xd37: 0x401a, 0xd38: 0x4000, 0xd39: 0x4027, 0xd3a: 0x4000, 0xd3b: 0x4028,
+	0xd3c: 0x4000, 0xd3d: 0x4020, 0xd3e: 0x4000, 0xd3f: 0x4029,
+	// Block 0x35, offset 0xd40
+	0xd40: 0x4000, 0xd41: 0x402a, 0xd42: 0x4000, 0xd43: 0x402b, 0xd44: 0x402c, 0xd45: 0x4000,
+	0xd46: 0x4017, 0xd47: 0x4000, 0xd48: 0x402d, 0xd49: 0x4000, 0xd4a: 0x402e, 0xd4b: 0x402f,
+	0xd4c: 0x4030, 0xd4d: 0x4017, 0xd4e: 0x4016, 0xd4f: 0x4017, 0xd50: 0x4000, 0xd51: 0x4000,
+	0xd52: 0x4031, 0xd53: 0x4000, 0xd54: 0x4000, 0xd55: 0x4031, 0xd56: 0x4000, 0xd57: 0x4000,
+	0xd58: 0x4032, 0xd59: 0x4000, 0xd5a: 0x4000, 0xd5b: 0x4032, 0xd5c: 0x4000, 0xd5d: 0x4000,
+	0xd5e: 0x4033, 0xd5f: 0x402e, 0xd60: 0x4034, 0xd61: 0x4035, 0xd62: 0x4034, 0xd63: 0x4036,
+	0xd64: 0x4037, 0xd65: 0x4024, 0xd66: 0x4035, 0xd67: 0x4025, 0xd68: 0x4038, 0xd69: 0x4038,
+	0xd6a: 0x4039, 0xd6b: 0x4039, 0xd6c: 0x403a, 0xd6d: 0x403a, 0xd6e: 0x4000, 0xd6f: 0x4035,
+	0xd70: 0x4000, 0xd71: 0x4000, 0xd72: 0x403b, 0xd73: 0x403c, 0xd74: 0x4000, 0xd75: 0x4000,
+	0xd76: 0x4000, 0xd77: 0x4000, 0xd78: 0x4000, 0xd79: 0x4000, 0xd7a: 0x4000, 0xd7b: 0x403d,
+	0xd7c: 0x401c, 0xd7d: 0x4000, 0xd7e: 0x4000, 0xd7f: 0x4000,
+	// Block 0x36, offset 0xd80
+	0xd85: 0x4000,
+	0xd86: 0x4000, 0xd87: 0x4000, 0xd88: 0x4000, 0xd89: 0x4000, 0xd8a: 0x4000, 0xd8b: 0x4000,
+	0xd8c: 0x4000, 0xd8d: 0x4000, 0xd8e: 0x4000, 0xd8f: 0x4000, 0xd90: 0x4000, 0xd91: 0x4000,
+	0xd92: 0x4000, 0xd93: 0x4000, 0xd94: 0x4000, 0xd95: 0x4000, 0xd96: 0x4000, 0xd97: 0x4000,
+	0xd98: 0x4000, 0xd99: 0x4000, 0xd9a: 0x4000, 0xd9b: 0x4000, 0xd9c: 0x4000, 0xd9d: 0x4000,
+	0xd9e: 0x4000, 0xd9f: 0x4000, 0xda0: 0x4000, 0xda1: 0x4000, 0xda2: 0x4000, 0xda3: 0x4000,
+	0xda4: 0x4000, 0xda5: 0x4000, 0xda6: 0x4000, 0xda7: 0x4000, 0xda8: 0x4000, 0xda9: 0x4000,
+	0xdaa: 0x4000, 0xdab: 0x4000, 0xdac: 0x4000, 0xdad: 0x4000, 0xdae: 0x4000, 0xdaf: 0x4000,
+	0xdb1: 0x403e, 0xdb2: 0x403e, 0xdb3: 0x403e, 0xdb4: 0x403e, 0xdb5: 0x403e,
+	0xdb6: 0x403e, 0xdb7: 0x403e, 0xdb8: 0x403e, 0xdb9: 0x403e, 0xdba: 0x403e, 0xdbb: 0x403e,
+	0xdbc: 0x403e, 0xdbd: 0x403e, 0xdbe: 0x403e, 0xdbf: 0x403e,
+	// Block 0x37, offset 0xdc0
+	0xdc0: 0x4037, 0xdc1: 0x4037, 0xdc2: 0x4037, 0xdc3: 0x4037, 0xdc4: 0x4037, 0xdc5: 0x4037,
+	0xdc6: 0x4037, 0xdc7: 0x4037, 0xdc8: 0x4037, 0xdc9: 0x4037, 0xdca: 0x4037, 0xdcb: 0x4037,
+	0xdcc: 0x4037, 0xdcd: 0x4037, 0xdce: 0x4037, 0xdcf: 0x400e, 0xdd0: 0x403f, 0xdd1: 0x4040,
+	0xdd2: 0x4041, 0xdd3: 0x4040, 0xdd4: 0x403f, 0xdd5: 0x4042, 0xdd6: 0x4043, 0xdd7: 0x4044,
+	0xdd8: 0x4040, 0xdd9: 0x4041, 0xdda: 0x4040, 0xddb: 0x4045, 0xddc: 0x4009, 0xddd: 0x4045,
+	0xdde: 0x4046, 0xddf: 0x4045, 0xde0: 0x4047, 0xde1: 0x400b, 0xde2: 0x400a, 0xde3: 0x400c,
+	0xde4: 0x4048, 0xde5: 0x4000, 0xde6: 0x4000, 0xde7: 0x4000, 0xde8: 0x4000, 0xde9: 0x4000,
+	0xdea: 0x4000, 0xdeb: 0x4000, 0xdec: 0x4000, 0xded: 0x4000, 0xdee: 0x4000, 0xdef: 0x4000,
+	0xdf0: 0x4000, 0xdf1: 0x4000, 0xdf2: 0x4000, 0xdf3: 0x4000, 0xdf4: 0x4000, 0xdf5: 0x4000,
+	0xdf6: 0x4000, 0xdf7: 0x4000, 0xdf8: 0x4000, 0xdf9: 0x4000, 0xdfa: 0x4000, 0xdfb: 0x4000,
+	0xdfc: 0x4000, 0xdfd: 0x4000, 0xdfe: 0x4000, 0xdff: 0x4000,
+	// Block 0x38, offset 0xe00
+	0xe00: 0x4000, 0xe01: 0x4000, 0xe02: 0x4000, 0xe03: 0x4000, 0xe04: 0x4000, 0xe05: 0x4000,
+	0xe06: 0x4000, 0xe07: 0x4000, 0xe08: 0x4000, 0xe09: 0x4000, 0xe0a: 0x4000, 0xe0b: 0x4000,
+	0xe0c: 0x4000, 0xe0d: 0x4000, 0xe0e: 0x4000, 0xe10: 0x4000, 0xe11: 0x4000,
+	0xe12: 0x4000, 0xe13: 0x4000, 0xe14: 0x4000, 0xe15: 0x4000, 0xe16: 0x4000, 0xe17: 0x4000,
+	0xe18: 0x4000, 0xe19: 0x4000, 0xe1a: 0x4000, 0xe1b: 0x4000, 0xe1c: 0x4000, 0xe1d: 0x4000,
+	0xe1e: 0x4000, 0xe1f: 0x4000, 0xe20: 0x4000, 0xe21: 0x4000, 0xe22: 0x4000, 0xe23: 0x4000,
+	0xe24: 0x4000, 0xe25: 0x4000, 0xe26: 0x4000, 0xe27: 0x4000, 0xe28: 0x4000, 0xe29: 0x4000,
+	0xe2a: 0x4000, 0xe2b: 0x4000, 0xe2c: 0x4000, 0xe2d: 0x4000, 0xe2e: 0x4000, 0xe2f: 0x4000,
+	0xe30: 0x4000, 0xe31: 0x4000, 0xe32: 0x4000, 0xe33: 0x4000, 0xe34: 0x4000, 0xe35: 0x4000,
+	0xe36: 0x4000, 0xe37: 0x4000, 0xe38: 0x4000, 0xe39: 0x4000, 0xe3a: 0x4000, 0xe3b: 0x4000,
+	0xe3c: 0x4000, 0xe3d: 0x4000, 0xe3e: 0x4000, 0xe3f: 0x4000,
+	// Block 0x39, offset 0xe40
+	0xe40: 0x4000, 0xe41: 0x4000, 0xe42: 0x4000, 0xe43: 0x4000, 0xe44: 0x4000, 0xe45: 0x4000,
+	0xe46: 0x4000, 0xe47: 0x4000, 0xe48: 0x4000, 0xe49: 0x4000, 0xe4a: 0x4000, 0xe4b: 0x4000,
+	0xe4c: 0x4000, 0xe4d: 0x4000, 0xe4e: 0x4000, 0xe4f: 0x4000, 0xe50: 0x4000, 0xe51: 0x4000,
+	0xe52: 0x4000, 0xe53: 0x4000, 0xe54: 0x4000, 0xe55: 0x4000, 0xe56: 0x4000, 0xe57: 0x4000,
+	0xe58: 0x4000, 0xe59: 0x4000, 0xe5a: 0x4000, 0xe5b: 0x4000, 0xe5c: 0x4000, 0xe5d: 0x4000,
+	0xe5e: 0x4000, 0xe5f: 0x4000, 0xe60: 0x4000, 0xe61: 0x4000, 0xe62: 0x4000, 0xe63: 0x4000,
+	0xe70: 0x4000, 0xe71: 0x4000, 0xe72: 0x4000, 0xe73: 0x4000, 0xe74: 0x4000, 0xe75: 0x4000,
+	0xe76: 0x4000, 0xe77: 0x4000, 0xe78: 0x4000, 0xe79: 0x4000, 0xe7a: 0x4000, 0xe7b: 0x4000,
+	0xe7c: 0x4000, 0xe7d: 0x4000, 0xe7e: 0x4000, 0xe7f: 0x4000,
+	// Block 0x3a, offset 0xe80
+	0xe80: 0x4000, 0xe81: 0x4000, 0xe82: 0x4000, 0xe83: 0x4000, 0xe84: 0x4000, 0xe85: 0x4000,
+	0xe86: 0x4000, 0xe87: 0x4000, 0xe88: 0x4000, 0xe89: 0x4000, 0xe8a: 0x4000, 0xe8b: 0x4000,
+	0xe8c: 0x4000, 0xe8d: 0x4000, 0xe8e: 0x4000, 0xe8f: 0x4000, 0xe90: 0x4000, 0xe91: 0x4000,
+	0xe92: 0x4000, 0xe93: 0x4000, 0xe94: 0x4000, 0xe95: 0x4000, 0xe96: 0x4000, 0xe97: 0x4000,
+	0xe98: 0x4000, 0xe99: 0x4000, 0xe9a: 0x4000, 0xe9b: 0x4000, 0xe9c: 0x4000, 0xe9d: 0x4000,
+	0xe9e: 0x4000, 0xea0: 0x4000, 0xea1: 0x4000, 0xea2: 0x4000, 0xea3: 0x4000,
+	0xea4: 0x4000, 0xea5: 0x4000, 0xea6: 0x4000, 0xea7: 0x4000, 0xea8: 0x4000, 0xea9: 0x4000,
+	0xeaa: 0x4000, 0xeab: 0x4000, 0xeac: 0x4000, 0xead: 0x4000, 0xeae: 0x4000, 0xeaf: 0x4000,
+	0xeb0: 0x4000, 0xeb1: 0x4000, 0xeb2: 0x4000, 0xeb3: 0x4000, 0xeb4: 0x4000, 0xeb5: 0x4000,
+	0xeb6: 0x4000, 0xeb7: 0x4000, 0xeb8: 0x4000, 0xeb9: 0x4000, 0xeba: 0x4000, 0xebb: 0x4000,
+	0xebc: 0x4000, 0xebd: 0x4000, 0xebe: 0x4000, 0xebf: 0x4000,
+	// Block 0x3b, offset 0xec0
+	0xec0: 0x4000, 0xec1: 0x4000, 0xec2: 0x4000, 0xec3: 0x4000, 0xec4: 0x4000, 0xec5: 0x4000,
+	0xec6: 0x4000, 0xec7: 0x4000, 0xec8: 0x2000, 0xec9: 0x2000, 0xeca: 0x2000, 0xecb: 0x2000,
+	0xecc: 0x2000, 0xecd: 0x2000, 0xece: 0x2000, 0xecf: 0x2000, 0xed0: 0x4000, 0xed1: 0x4000,
+	0xed2: 0x4000, 0xed3: 0x4000, 0xed4: 0x4000, 0xed5: 0x4000, 0xed6: 0x4000, 0xed7: 0x4000,
+	0xed8: 0x4000, 0xed9: 0x4000, 0xeda: 0x4000, 0xedb: 0x4000, 0xedc: 0x4000, 0xedd: 0x4000,
+	0xede: 0x4000, 0xedf: 0x4000, 0xee0: 0x4000, 0xee1: 0x4000, 0xee2: 0x4000, 0xee3: 0x4000,
+	0xee4: 0x4000, 0xee5: 0x4000, 0xee6: 0x4000, 0xee7: 0x4000, 0xee8: 0x4000, 0xee9: 0x4000,
+	0xeea: 0x4000, 0xeeb: 0x4000, 0xeec: 0x4000, 0xeed: 0x4000, 0xeee: 0x4000, 0xeef: 0x4000,
+	0xef0: 0x4000, 0xef1: 0x4000, 0xef2: 0x4000, 0xef3: 0x4000, 0xef4: 0x4000, 0xef5: 0x4000,
+	0xef6: 0x4000, 0xef7: 0x4000, 0xef8: 0x4000, 0xef9: 0x4000, 0xefa: 0x4000, 0xefb: 0x4000,
+	0xefc: 0x4000, 0xefd: 0x4000, 0xefe: 0x4000, 0xeff: 0x4000,
+	// Block 0x3c, offset 0xf00
+	0xf00: 0x4000, 0xf01: 0x4000, 0xf02: 0x4000, 0xf03: 0x4000, 0xf04: 0x4000, 0xf05: 0x4000,
+	0xf06: 0x4000, 0xf07: 0x4000, 0xf08: 0x4000, 0xf09: 0x4000, 0xf0a: 0x4000, 0xf0b: 0x4000,
+	0xf0c: 0x4000, 0xf10: 0x4000, 0xf11: 0x4000,
+	0xf12: 0x4000, 0xf13: 0x4000, 0xf14: 0x4000, 0xf15: 0x4000, 0xf16: 0x4000, 0xf17: 0x4000,
+	0xf18: 0x4000, 0xf19: 0x4000, 0xf1a: 0x4000, 0xf1b: 0x4000, 0xf1c: 0x4000, 0xf1d: 0x4000,
+	0xf1e: 0x4000, 0xf1f: 0x4000, 0xf20: 0x4000, 0xf21: 0x4000, 0xf22: 0x4000, 0xf23: 0x4000,
+	0xf24: 0x4000, 0xf25: 0x4000, 0xf26: 0x4000, 0xf27: 0x4000, 0xf28: 0x4000, 0xf29: 0x4000,
+	0xf2a: 0x4000, 0xf2b: 0x4000, 0xf2c: 0x4000, 0xf2d: 0x4000, 0xf2e: 0x4000, 0xf2f: 0x4000,
+	0xf30: 0x4000, 0xf31: 0x4000, 0xf32: 0x4000, 0xf33: 0x4000, 0xf34: 0x4000, 0xf35: 0x4000,
+	0xf36: 0x4000, 0xf37: 0x4000, 0xf38: 0x4000, 0xf39: 0x4000, 0xf3a: 0x4000, 0xf3b: 0x4000,
+	0xf3c: 0x4000, 0xf3d: 0x4000, 0xf3e: 0x4000, 0xf3f: 0x4000,
+	// Block 0x3d, offset 0xf40
+	0xf40: 0x4000, 0xf41: 0x4000, 0xf42: 0x4000, 0xf43: 0x4000, 0xf44: 0x4000, 0xf45: 0x4000,
+	0xf46: 0x4000,
+	// Block 0x3e, offset 0xf80
+	0xfa0: 0x4000, 0xfa1: 0x4000, 0xfa2: 0x4000, 0xfa3: 0x4000,
+	0xfa4: 0x4000, 0xfa5: 0x4000, 0xfa6: 0x4000, 0xfa7: 0x4000, 0xfa8: 0x4000, 0xfa9: 0x4000,
+	0xfaa: 0x4000, 0xfab: 0x4000, 0xfac: 0x4000, 0xfad: 0x4000, 0xfae: 0x4000, 0xfaf: 0x4000,
+	0xfb0: 0x4000, 0xfb1: 0x4000, 0xfb2: 0x4000, 0xfb3: 0x4000, 0xfb4: 0x4000, 0xfb5: 0x4000,
+	0xfb6: 0x4000, 0xfb7: 0x4000, 0xfb8: 0x4000, 0xfb9: 0x4000, 0xfba: 0x4000, 0xfbb: 0x4000,
+	0xfbc: 0x4000,
+	// Block 0x3f, offset 0xfc0
+	0xfc0: 0x4000, 0xfc1: 0x4000, 0xfc2: 0x4000, 0xfc3: 0x4000, 0xfc4: 0x4000, 0xfc5: 0x4000,
+	0xfc6: 0x4000, 0xfc7: 0x4000, 0xfc8: 0x4000, 0xfc9: 0x4000, 0xfca: 0x4000, 0xfcb: 0x4000,
+	0xfcc: 0x4000, 0xfcd: 0x4000, 0xfce: 0x4000, 0xfcf: 0x4000, 0xfd0: 0x4000, 0xfd1: 0x4000,
+	0xfd2: 0x4000, 0xfd3: 0x4000, 0xfd4: 0x4000, 0xfd5: 0x4000, 0xfd6: 0x4000, 0xfd7: 0x4000,
+	0xfd8: 0x4000, 0xfd9: 0x4000, 0xfda: 0x4000, 0xfdb: 0x4000, 0xfdc: 0x4000, 0xfdd: 0x4000,
+	0xfde: 0x4000, 0xfdf: 0x4000, 0xfe0: 0x4000, 0xfe1: 0x4000, 0xfe2: 0x4000, 0xfe3: 0x4000,
+	// Block 0x40, offset 0x1000
+	0x1000: 0x2000, 0x1001: 0x2000, 0x1002: 0x2000, 0x1003: 0x2000, 0x1004: 0x2000, 0x1005: 0x2000,
+	0x1006: 0x2000, 0x1007: 0x2000, 0x1008: 0x2000, 0x1009: 0x2000, 0x100a: 0x2000, 0x100b: 0x2000,
+	0x100c: 0x2000, 0x100d: 0x2000, 0x100e: 0x2000, 0x100f: 0x2000, 0x1010: 0x4000, 0x1011: 0x4000,
+	0x1012: 0x4000, 0x1013: 0x4000, 0x1014: 0x4000, 0x1015: 0x4000, 0x1016: 0x4000, 0x1017: 0x4000,
+	0x1018: 0x4000, 0x1019: 0x4000,
+	0x1030: 0x4000, 0x1031: 0x4000, 0x1032: 0x4000, 0x1033: 0x4000, 0x1034: 0x4000, 0x1035: 0x4000,
+	0x1036: 0x4000, 0x1037: 0x4000, 0x1038: 0x4000, 0x1039: 0x4000, 0x103a: 0x4000, 0x103b: 0x4000,
+	0x103c: 0x4000, 0x103d: 0x4000, 0x103e: 0x4000, 0x103f: 0x4000,
+	// Block 0x41, offset 0x1040
+	0x1040: 0x4000, 0x1041: 0x4000, 0x1042: 0x4000, 0x1043: 0x4000, 0x1044: 0x4000, 0x1045: 0x4000,
+	0x1046: 0x4000, 0x1047: 0x4000, 0x1048: 0x4000, 0x1049: 0x4000, 0x104a: 0x4000, 0x104b: 0x4000,
+	0x104c: 0x4000, 0x104d: 0x4000, 0x104e: 0x4000, 0x104f: 0x4000, 0x1050: 0x4000, 0x1051: 0x4000,
+	0x1052: 0x4000, 0x1054: 0x4000, 0x1055: 0x4000, 0x1056: 0x4000, 0x1057: 0x4000,
+	0x1058: 0x4000, 0x1059: 0x4000, 0x105a: 0x4000, 0x105b: 0x4000, 0x105c: 0x4000, 0x105d: 0x4000,
+	0x105e: 0x4000, 0x105f: 0x4000, 0x1060: 0x4000, 0x1061: 0x4000, 0x1062: 0x4000, 0x1063: 0x4000,
+	0x1064: 0x4000, 0x1065: 0x4000, 0x1066: 0x4000, 0x1068: 0x4000, 0x1069: 0x4000,
+	0x106a: 0x4000, 0x106b: 0x4000,
+	// Block 0x42, offset 0x1080
+	0x1081: 0x9012, 0x1082: 0x9012, 0x1083: 0x9012, 0x1084: 0x9012, 0x1085: 0x9012,
+	0x1086: 0x9012, 0x1087: 0x9012, 0x1088: 0x9012, 0x1089: 0x9012, 0x108a: 0x9012, 0x108b: 0x9012,
+	0x108c: 0x9012, 0x108d: 0x9012, 0x108e: 0x9012, 0x108f: 0x9012, 0x1090: 0x9012, 0x1091: 0x9012,
+	0x1092: 0x9012, 0x1093: 0x9012, 0x1094: 0x9012, 0x1095: 0x9012, 0x1096: 0x9012, 0x1097: 0x9012,
+	0x1098: 0x9012, 0x1099: 0x9012, 0x109a: 0x9012, 0x109b: 0x9012, 0x109c: 0x9012, 0x109d: 0x9012,
+	0x109e: 0x9012, 0x109f: 0x9012, 0x10a0: 0x9049, 0x10a1: 0x9049, 0x10a2: 0x9049, 0x10a3: 0x9049,
+	0x10a4: 0x9049, 0x10a5: 0x9049, 0x10a6: 0x9049, 0x10a7: 0x9049, 0x10a8: 0x9049, 0x10a9: 0x9049,
+	0x10aa: 0x9049, 0x10ab: 0x9049, 0x10ac: 0x9049, 0x10ad: 0x9049, 0x10ae: 0x9049, 0x10af: 0x9049,
+	0x10b0: 0x9049, 0x10b1: 0x9049, 0x10b2: 0x9049, 0x10b3: 0x9049, 0x10b4: 0x9049, 0x10b5: 0x9049,
+	0x10b6: 0x9049, 0x10b7: 0x9049, 0x10b8: 0x9049, 0x10b9: 0x9049, 0x10ba: 0x9049, 0x10bb: 0x9049,
+	0x10bc: 0x9049, 0x10bd: 0x9049, 0x10be: 0x9049, 0x10bf: 0x9049,
+	// Block 0x43, offset 0x10c0
+	0x10c0: 0x9049, 0x10c1: 0x9049, 0x10c2: 0x9049, 0x10c3: 0x9049, 0x10c4: 0x9049, 0x10c5: 0x9049,
+	0x10c6: 0x9049, 0x10c7: 0x9049, 0x10c8: 0x9049, 0x10c9: 0x9049, 0x10ca: 0x9049, 0x10cb: 0x9049,
+	0x10cc: 0x9049, 0x10cd: 0x9049, 0x10ce: 0x9049, 0x10cf: 0x9049, 0x10d0: 0x9049, 0x10d1: 0x9049,
+	0x10d2: 0x9049, 0x10d3: 0x9049, 0x10d4: 0x9049, 0x10d5: 0x9049, 0x10d6: 0x9049, 0x10d7: 0x9049,
+	0x10d8: 0x9049, 0x10d9: 0x9049, 0x10da: 0x9049, 0x10db: 0x9049, 0x10dc: 0x9049, 0x10dd: 0x9049,
+	0x10de: 0x9049, 0x10df: 0x904a, 0x10e0: 0x904b, 0x10e1: 0xb04c, 0x10e2: 0xb04d, 0x10e3: 0xb04d,
+	0x10e4: 0xb04e, 0x10e5: 0xb04f, 0x10e6: 0xb050, 0x10e7: 0xb051, 0x10e8: 0xb052, 0x10e9: 0xb053,
+	0x10ea: 0xb054, 0x10eb: 0xb055, 0x10ec: 0xb056, 0x10ed: 0xb057, 0x10ee: 0xb058, 0x10ef: 0xb059,
+	0x10f0: 0xb05a, 0x10f1: 0xb05b, 0x10f2: 0xb05c, 0x10f3: 0xb05d, 0x10f4: 0xb05e, 0x10f5: 0xb05f,
+	0x10f6: 0xb060, 0x10f7: 0xb061, 0x10f8: 0xb062, 0x10f9: 0xb063, 0x10fa: 0xb064, 0x10fb: 0xb065,
+	0x10fc: 0xb052, 0x10fd: 0xb066, 0x10fe: 0xb067, 0x10ff: 0xb055,
+	// Block 0x44, offset 0x1100
+	0x1100: 0xb068, 0x1101: 0xb069, 0x1102: 0xb06a, 0x1103: 0xb06b, 0x1104: 0xb05a, 0x1105: 0xb056,
+	0x1106: 0xb06c, 0x1107: 0xb06d, 0x1108: 0xb06b, 0x1109: 0xb06e, 0x110a: 0xb06b, 0x110b: 0xb06f,
+	0x110c: 0xb06f, 0x110d: 0xb070, 0x110e: 0xb070, 0x110f: 0xb071, 0x1110: 0xb056, 0x1111: 0xb072,
+	0x1112: 0xb073, 0x1113: 0xb072, 0x1114: 0xb074, 0x1115: 0xb073, 0x1116: 0xb075, 0x1117: 0xb075,
+	0x1118: 0xb076, 0x1119: 0xb076, 0x111a: 0xb077, 0x111b: 0xb077, 0x111c: 0xb073, 0x111d: 0xb078,
+	0x111e: 0xb079, 0x111f: 0xb067, 0x1120: 0xb07a, 0x1121: 0xb07b, 0x1122: 0xb07b, 0x1123: 0xb07b,
+	0x1124: 0xb07b, 0x1125: 0xb07b, 0x1126: 0xb07b, 0x1127: 0xb07b, 0x1128: 0xb07b, 0x1129: 0xb07b,
+	0x112a: 0xb07b, 0x112b: 0xb07b, 0x112c: 0xb07b, 0x112d: 0xb07b, 0x112e: 0xb07b, 0x112f: 0xb07b,
+	0x1130: 0xb07c, 0x1131: 0xb07c, 0x1132: 0xb07c, 0x1133: 0xb07c, 0x1134: 0xb07c, 0x1135: 0xb07c,
+	0x1136: 0xb07c, 0x1137: 0xb07c, 0x1138: 0xb07c, 0x1139: 0xb07c, 0x113a: 0xb07c, 0x113b: 0xb07c,
+	0x113c: 0xb07c, 0x113d: 0xb07c, 0x113e: 0xb07c,
+	// Block 0x45, offset 0x1140
+	0x1142: 0xb07d, 0x1143: 0xb07e, 0x1144: 0xb07f, 0x1145: 0xb080,
+	0x1146: 0xb07f, 0x1147: 0xb07e, 0x114a: 0xb081, 0x114b: 0xb082,
+	0x114c: 0xb083, 0x114d: 0xb07f, 0x114e: 0xb080, 0x114f: 0xb07f,
+	0x1152: 0xb084, 0x1153: 0xb085, 0x1154: 0xb084, 0x1155: 0xb086, 0x1156: 0xb084, 0x1157: 0xb087,
+	0x115a: 0xb088, 0x115b: 0xb089, 0x115c: 0xb08a,
+	0x1160: 0x908b, 0x1161: 0x908b, 0x1162: 0x908c, 0x1163: 0x908d,
+	0x1164: 0x908b, 0x1165: 0x908e, 0x1166: 0x908f, 0x1168: 0xb090, 0x1169: 0xb091,
+	0x116a: 0xb092, 0x116b: 0xb091, 0x116c: 0xb093, 0x116d: 0xb094, 0x116e: 0xb095,
+	0x117d: 0x2000,
+	// Block 0x46, offset 0x1180
+	0x11a0: 0x4000, 0x11a1: 0x4000, 0x11a2: 0x4000, 0x11a3: 0x4000,
+	0x11a4: 0x4000,
+	0x11b0: 0x4000, 0x11b1: 0x4000,
+	// Block 0x47, offset 0x11c0
+	0x11c0: 0x4000, 0x11c1: 0x4000, 0x11c2: 0x4000, 0x11c3: 0x4000, 0x11c4: 0x4000, 0x11c5: 0x4000,
+	0x11c6: 0x4000, 0x11c7: 0x4000, 0x11c8: 0x4000, 0x11c9: 0x4000, 0x11ca: 0x4000, 0x11cb: 0x4000,
+	0x11cc: 0x4000, 0x11cd: 0x4000, 0x11ce: 0x4000, 0x11cf: 0x4000, 0x11d0: 0x4000, 0x11d1: 0x4000,
+	0x11d2: 0x4000, 0x11d3: 0x4000, 0x11d4: 0x4000, 0x11d5: 0x4000, 0x11d6: 0x4000, 0x11d7: 0x4000,
+	0x11d8: 0x4000, 0x11d9: 0x4000, 0x11da: 0x4000, 0x11db: 0x4000, 0x11dc: 0x4000, 0x11dd: 0x4000,
+	0x11de: 0x4000, 0x11df: 0x4000, 0x11e0: 0x4000, 0x11e1: 0x4000, 0x11e2: 0x4000, 0x11e3: 0x4000,
+	0x11e4: 0x4000, 0x11e5: 0x4000, 0x11e6: 0x4000, 0x11e7: 0x4000, 0x11e8: 0x4000, 0x11e9: 0x4000,
+	0x11ea: 0x4000, 0x11eb: 0x4000, 0x11ec: 0x4000, 0x11ed: 0x4000, 0x11ee: 0x4000, 0x11ef: 0x4000,
+	0x11f0: 0x4000, 0x11f1: 0x4000, 0x11f2: 0x4000, 0x11f3: 0x4000, 0x11f4: 0x4000, 0x11f5: 0x4000,
+	0x11f6: 0x4000, 0x11f7: 0x4000,
+	// Block 0x48, offset 0x1200
+	0x1200: 0x4000, 0x1201: 0x4000, 0x1202: 0x4000, 0x1203: 0x4000, 0x1204: 0x4000, 0x1205: 0x4000,
+	0x1206: 0x4000, 0x1207: 0x4000, 0x1208: 0x4000, 0x1209: 0x4000, 0x120a: 0x4000, 0x120b: 0x4000,
+	0x120c: 0x4000, 0x120d: 0x4000, 0x120e: 0x4000, 0x120f: 0x4000, 0x1210: 0x4000, 0x1211: 0x4000,
+	0x1212: 0x4000, 0x1213: 0x4000, 0x1214: 0x4000, 0x1215: 0x4000,
+	// Block 0x49, offset 0x1240
+	0x1240: 0x4000, 0x1241: 0x4000, 0x1242: 0x4000, 0x1243: 0x4000, 0x1244: 0x4000, 0x1245: 0x4000,
+	0x1246: 0x4000, 0x1247: 0x4000, 0x1248: 0x4000,
+	// Block 0x4a, offset 0x1280
+	0x12b0: 0x4000, 0x12b1: 0x4000, 0x12b2: 0x4000, 0x12b3: 0x4000, 0x12b5: 0x4000,
+	0x12b6: 0x4000, 0x12b7: 0x4000, 0x12b8: 0x4000, 0x12b9: 0x4000, 0x12ba: 0x4000, 0x12bb: 0x4000,
+	0x12bd: 0x4000, 0x12be: 0x4000,
+	// Block 0x4b, offset 0x12c0
+	0x12c0: 0x4000, 0x12c1: 0x4000, 0x12c2: 0x4000, 0x12c3: 0x4000, 0x12c4: 0x4000, 0x12c5: 0x4000,
+	0x12c6: 0x4000, 0x12c7: 0x4000, 0x12c8: 0x4000, 0x12c9: 0x4000, 0x12ca: 0x4000, 0x12cb: 0x4000,
+	0x12cc: 0x4000, 0x12cd: 0x4000, 0x12ce: 0x4000, 0x12cf: 0x4000, 0x12d0: 0x4000, 0x12d1: 0x4000,
+	0x12d2: 0x4000, 0x12d3: 0x4000, 0x12d4: 0x4000, 0x12d5: 0x4000, 0x12d6: 0x4000, 0x12d7: 0x4000,
+	0x12d8: 0x4000, 0x12d9: 0x4000, 0x12da: 0x4000, 0x12db: 0x4000, 0x12dc: 0x4000, 0x12dd: 0x4000,
+	0x12de: 0x4000, 0x12df: 0x4000, 0x12e0: 0x4000, 0x12e1: 0x4000, 0x12e2: 0x4000,
+	0x12f2: 0x4000,
+	// Block 0x4c, offset 0x1300
+	0x1310: 0x4000, 0x1311: 0x4000,
+	0x1312: 0x4000, 0x1315: 0x4000,
+	0x1324: 0x4000, 0x1325: 0x4000, 0x1326: 0x4000, 0x1327: 0x4000,
+	0x1330: 0x4000, 0x1331: 0x4000, 0x1332: 0x4000, 0x1333: 0x4000, 0x1334: 0x4000, 0x1335: 0x4000,
+	0x1336: 0x4000, 0x1337: 0x4000, 0x1338: 0x4000, 0x1339: 0x4000, 0x133a: 0x4000, 0x133b: 0x4000,
+	0x133c: 0x4000, 0x133d: 0x4000, 0x133e: 0x4000, 0x133f: 0x4000,
+	// Block 0x4d, offset 0x1340
+	0x1340: 0x4000, 0x1341: 0x4000, 0x1342: 0x4000, 0x1343: 0x4000, 0x1344: 0x4000, 0x1345: 0x4000,
+	0x1346: 0x4000, 0x1347: 0x4000, 0x1348: 0x4000, 0x1349: 0x4000, 0x134a: 0x4000, 0x134b: 0x4000,
+	0x134c: 0x4000, 0x134d: 0x4000, 0x134e: 0x4000, 0x134f: 0x4000, 0x1350: 0x4000, 0x1351: 0x4000,
+	0x1352: 0x4000, 0x1353: 0x4000, 0x1354: 0x4000, 0x1355: 0x4000, 0x1356: 0x4000, 0x1357: 0x4000,
+	0x1358: 0x4000, 0x1359: 0x4000, 0x135a: 0x4000, 0x135b: 0x4000, 0x135c: 0x4000, 0x135d: 0x4000,
+	0x135e: 0x4000, 0x135f: 0x4000, 0x1360: 0x4000, 0x1361: 0x4000, 0x1362: 0x4000, 0x1363: 0x4000,
+	0x1364: 0x4000, 0x1365: 0x4000, 0x1366: 0x4000, 0x1367: 0x4000, 0x1368: 0x4000, 0x1369: 0x4000,
+	0x136a: 0x4000, 0x136b: 0x4000, 0x136c: 0x4000, 0x136d: 0x4000, 0x136e: 0x4000, 0x136f: 0x4000,
+	0x1370: 0x4000, 0x1371: 0x4000, 0x1372: 0x4000, 0x1373: 0x4000, 0x1374: 0x4000, 0x1375: 0x4000,
+	0x1376: 0x4000, 0x1377: 0x4000, 0x1378: 0x4000, 0x1379: 0x4000, 0x137a: 0x4000, 0x137b: 0x4000,
+	// Block 0x4e, offset 0x1380
+	0x1384: 0x4000,
+	// Block 0x4f, offset 0x13c0
+	0x13cf: 0x4000,
+	// Block 0x50, offset 0x1400
+	0x1400: 0x2000, 0x1401: 0x2000, 0x1402: 0x2000, 0x1403: 0x2000, 0x1404: 0x2000, 0x1405: 0x2000,
+	0x1406: 0x2000, 0x1407: 0x2000, 0x1408: 0x2000, 0x1409: 0x2000, 0x140a: 0x2000,
+	0x1410: 0x2000, 0x1411: 0x2000,
+	0x1412: 0x2000, 0x1413: 0x2000, 0x1414: 0x2000, 0x1415: 0x2000, 0x1416: 0x2000, 0x1417: 0x2000,
+	0x1418: 0x2000, 0x1419: 0x2000, 0x141a: 0x2000, 0x141b: 0x2000, 0x141c: 0x2000, 0x141d: 0x2000,
+	0x141e: 0x2000, 0x141f: 0x2000, 0x1420: 0x2000, 0x1421: 0x2000, 0x1422: 0x2000, 0x1423: 0x2000,
+	0x1424: 0x2000, 0x1425: 0x2000, 0x1426: 0x2000, 0x1427: 0x2000, 0x1428: 0x2000, 0x1429: 0x2000,
+	0x142a: 0x2000, 0x142b: 0x2000, 0x142c: 0x2000, 0x142d: 0x2000,
+	0x1430: 0x2000, 0x1431: 0x2000, 0x1432: 0x2000, 0x1433: 0x2000, 0x1434: 0x2000, 0x1435: 0x2000,
+	0x1436: 0x2000, 0x1437: 0x2000, 0x1438: 0x2000, 0x1439: 0x2000, 0x143a: 0x2000, 0x143b: 0x2000,
+	0x143c: 0x2000, 0x143d: 0x2000, 0x143e: 0x2000, 0x143f: 0x2000,
+	// Block 0x51, offset 0x1440
+	0x1440: 0x2000, 0x1441: 0x2000, 0x1442: 0x2000, 0x1443: 0x2000, 0x1444: 0x2000, 0x1445: 0x2000,
+	0x1446: 0x2000, 0x1447: 0x2000, 0x1448: 0x2000, 0x1449: 0x2000, 0x144a: 0x2000, 0x144b: 0x2000,
+	0x144c: 0x2000, 0x144d: 0x2000, 0x144e: 0x2000, 0x144f: 0x2000, 0x1450: 0x2000, 0x1451: 0x2000,
+	0x1452: 0x2000, 0x1453: 0x2000, 0x1454: 0x2000, 0x1455: 0x2000, 0x1456: 0x2000, 0x1457: 0x2000,
+	0x1458: 0x2000, 0x1459: 0x2000, 0x145a: 0x2000, 0x145b: 0x2000, 0x145c: 0x2000, 0x145d: 0x2000,
+	0x145e: 0x2000, 0x145f: 0x2000, 0x1460: 0x2000, 0x1461: 0x2000, 0x1462: 0x2000, 0x1463: 0x2000,
+	0x1464: 0x2000, 0x1465: 0x2000, 0x1466: 0x2000, 0x1467: 0x2000, 0x1468: 0x2000, 0x1469: 0x2000,
+	0x1470: 0x2000, 0x1471: 0x2000, 0x1472: 0x2000, 0x1473: 0x2000, 0x1474: 0x2000, 0x1475: 0x2000,
+	0x1476: 0x2000, 0x1477: 0x2000, 0x1478: 0x2000, 0x1479: 0x2000, 0x147a: 0x2000, 0x147b: 0x2000,
+	0x147c: 0x2000, 0x147d: 0x2000, 0x147e: 0x2000, 0x147f: 0x2000,
+	// Block 0x52, offset 0x1480
+	0x1480: 0x2000, 0x1481: 0x2000, 0x1482: 0x2000, 0x1483: 0x2000, 0x1484: 0x2000, 0x1485: 0x2000,
+	0x1486: 0x2000, 0x1487: 0x2000, 0x1488: 0x2000, 0x1489: 0x2000, 0x148a: 0x2000, 0x148b: 0x2000,
+	0x148c: 0x2000, 0x148d: 0x2000, 0x148e: 0x4000, 0x148f: 0x2000, 0x1490: 0x2000, 0x1491: 0x4000,
+	0x1492: 0x4000, 0x1493: 0x4000, 0x1494: 0x4000, 0x1495: 0x4000, 0x1496: 0x4000, 0x1497: 0x4000,
+	0x1498: 0x4000, 0x1499: 0x4000, 0x149a: 0x4000, 0x149b: 0x2000, 0x149c: 0x2000, 0x149d: 0x2000,
+	0x149e: 0x2000, 0x149f: 0x2000, 0x14a0: 0x2000, 0x14a1: 0x2000, 0x14a2: 0x2000, 0x14a3: 0x2000,
+	0x14a4: 0x2000, 0x14a5: 0x2000, 0x14a6: 0x2000, 0x14a7: 0x2000, 0x14a8: 0x2000, 0x14a9: 0x2000,
+	0x14aa: 0x2000, 0x14ab: 0x2000, 0x14ac: 0x2000,
+	// Block 0x53, offset 0x14c0
+	0x14c0: 0x4000, 0x14c1: 0x4000, 0x14c2: 0x4000,
+	0x14d0: 0x4000, 0x14d1: 0x4000,
+	0x14d2: 0x4000, 0x14d3: 0x4000, 0x14d4: 0x4000, 0x14d5: 0x4000, 0x14d6: 0x4000, 0x14d7: 0x4000,
+	0x14d8: 0x4000, 0x14d9: 0x4000, 0x14da: 0x4000, 0x14db: 0x4000, 0x14dc: 0x4000, 0x14dd: 0x4000,
+	0x14de: 0x4000, 0x14df: 0x4000, 0x14e0: 0x4000, 0x14e1: 0x4000, 0x14e2: 0x4000, 0x14e3: 0x4000,
+	0x14e4: 0x4000, 0x14e5: 0x4000, 0x14e6: 0x4000, 0x14e7: 0x4000, 0x14e8: 0x4000, 0x14e9: 0x4000,
+	0x14ea: 0x4000, 0x14eb: 0x4000, 0x14ec: 0x4000, 0x14ed: 0x4000, 0x14ee: 0x4000, 0x14ef: 0x4000,
+	0x14f0: 0x4000, 0x14f1: 0x4000, 0x14f2: 0x4000, 0x14f3: 0x4000, 0x14f4: 0x4000, 0x14f5: 0x4000,
+	0x14f6: 0x4000, 0x14f7: 0x4000, 0x14f8: 0x4000, 0x14f9: 0x4000, 0x14fa: 0x4000, 0x14fb: 0x4000,
+	// Block 0x54, offset 0x1500
+	0x1500: 0x4000, 0x1501: 0x4000, 0x1502: 0x4000, 0x1503: 0x4000, 0x1504: 0x4000, 0x1505: 0x4000,
+	0x1506: 0x4000, 0x1507: 0x4000, 0x1508: 0x4000,
+	0x1510: 0x4000, 0x1511: 0x4000,
+	0x1520: 0x4000, 0x1521: 0x4000, 0x1522: 0x4000, 0x1523: 0x4000,
+	0x1524: 0x4000, 0x1525: 0x4000,
+	// Block 0x55, offset 0x1540
+	0x1540: 0x4000, 0x1541: 0x4000, 0x1542: 0x4000, 0x1543: 0x4000, 0x1544: 0x4000, 0x1545: 0x4000,
+	0x1546: 0x4000, 0x1547: 0x4000, 0x1548: 0x4000, 0x1549: 0x4000, 0x154a: 0x4000, 0x154b: 0x4000,
+	0x154c: 0x4000, 0x154d: 0x4000, 0x154e: 0x4000, 0x154f: 0x4000, 0x1550: 0x4000, 0x1551: 0x4000,
+	0x1552: 0x4000, 0x1553: 0x4000, 0x1554: 0x4000, 0x1555: 0x4000, 0x1556: 0x4000, 0x1557: 0x4000,
+	0x1558: 0x4000, 0x1559: 0x4000, 0x155a: 0x4000, 0x155b: 0x4000, 0x155c: 0x4000, 0x155d: 0x4000,
+	0x155e: 0x4000, 0x155f: 0x4000, 0x1560: 0x4000,
+	0x156d: 0x4000, 0x156e: 0x4000, 0x156f: 0x4000,
+	0x1570: 0x4000, 0x1571: 0x4000, 0x1572: 0x4000, 0x1573: 0x4000, 0x1574: 0x4000, 0x1575: 0x4000,
+	0x1577: 0x4000, 0x1578: 0x4000, 0x1579: 0x4000, 0x157a: 0x4000, 0x157b: 0x4000,
+	0x157c: 0x4000, 0x157d: 0x4000, 0x157e: 0x4000, 0x157f: 0x4000,
+	// Block 0x56, offset 0x1580
+	0x1580: 0x4000, 0x1581: 0x4000, 0x1582: 0x4000, 0x1583: 0x4000, 0x1584: 0x4000, 0x1585: 0x4000,
+	0x1586: 0x4000, 0x1587: 0x4000, 0x1588: 0x4000, 0x1589: 0x4000, 0x158a: 0x4000, 0x158b: 0x4000,
+	0x158c: 0x4000, 0x158d: 0x4000, 0x158e: 0x4000, 0x158f: 0x4000, 0x1590: 0x4000, 0x1591: 0x4000,
+	0x1592: 0x4000, 0x1593: 0x4000, 0x1594: 0x4000, 0x1595: 0x4000, 0x1596: 0x4000, 0x1597: 0x4000,
+	0x1598: 0x4000, 0x1599: 0x4000, 0x159a: 0x4000, 0x159b: 0x4000, 0x159c: 0x4000, 0x159d: 0x4000,
+	0x159e: 0x4000, 0x159f: 0x4000, 0x15a0: 0x4000, 0x15a1: 0x4000, 0x15a2: 0x4000, 0x15a3: 0x4000,
+	0x15a4: 0x4000, 0x15a5: 0x4000, 0x15a6: 0x4000, 0x15a7: 0x4000, 0x15a8: 0x4000, 0x15a9: 0x4000,
+	0x15aa: 0x4000, 0x15ab: 0x4000, 0x15ac: 0x4000, 0x15ad: 0x4000, 0x15ae: 0x4000, 0x15af: 0x4000,
+	0x15b0: 0x4000, 0x15b1: 0x4000, 0x15b2: 0x4000, 0x15b3: 0x4000, 0x15b4: 0x4000, 0x15b5: 0x4000,
+	0x15b6: 0x4000, 0x15b7: 0x4000, 0x15b8: 0x4000, 0x15b9: 0x4000, 0x15ba: 0x4000, 0x15bb: 0x4000,
+	0x15bc: 0x4000, 0x15be: 0x4000, 0x15bf: 0x4000,
+	// Block 0x57, offset 0x15c0
+	0x15c0: 0x4000, 0x15c1: 0x4000, 0x15c2: 0x4000, 0x15c3: 0x4000, 0x15c4: 0x4000, 0x15c5: 0x4000,
+	0x15c6: 0x4000, 0x15c7: 0x4000, 0x15c8: 0x4000, 0x15c9: 0x4000, 0x15ca: 0x4000, 0x15cb: 0x4000,
+	0x15cc: 0x4000, 0x15cd: 0x4000, 0x15ce: 0x4000, 0x15cf: 0x4000, 0x15d0: 0x4000, 0x15d1: 0x4000,
+	0x15d2: 0x4000, 0x15d3: 0x4000,
+	0x15e0: 0x4000, 0x15e1: 0x4000, 0x15e2: 0x4000, 0x15e3: 0x4000,
+	0x15e4: 0x4000, 0x15e5: 0x4000, 0x15e6: 0x4000, 0x15e7: 0x4000, 0x15e8: 0x4000, 0x15e9: 0x4000,
+	0x15ea: 0x4000, 0x15eb: 0x4000, 0x15ec: 0x4000, 0x15ed: 0x4000, 0x15ee: 0x4000, 0x15ef: 0x4000,
+	0x15f0: 0x4000, 0x15f1: 0x4000, 0x15f2: 0x4000, 0x15f3: 0x4000, 0x15f4: 0x4000, 0x15f5: 0x4000,
+	0x15f6: 0x4000, 0x15f7: 0x4000, 0x15f8: 0x4000, 0x15f9: 0x4000, 0x15fa: 0x4000, 0x15fb: 0x4000,
+	0x15fc: 0x4000, 0x15fd: 0x4000, 0x15fe: 0x4000, 0x15ff: 0x4000,
+	// Block 0x58, offset 0x1600
+	0x1600: 0x4000, 0x1601: 0x4000, 0x1602: 0x4000, 0x1603: 0x4000, 0x1604: 0x4000, 0x1605: 0x4000,
+	0x1606: 0x4000, 0x1607: 0x4000, 0x1608: 0x4000, 0x1609: 0x4000, 0x160a: 0x4000,
+	0x160f: 0x4000, 0x1610: 0x4000, 0x1611: 0x4000,
+	0x1612: 0x4000, 0x1613: 0x4000,
+	0x1620: 0x4000, 0x1621: 0x4000, 0x1622: 0x4000, 0x1623: 0x4000,
+	0x1624: 0x4000, 0x1625: 0x4000, 0x1626: 0x4000, 0x1627: 0x4000, 0x1628: 0x4000, 0x1629: 0x4000,
+	0x162a: 0x4000, 0x162b: 0x4000, 0x162c: 0x4000, 0x162d: 0x4000, 0x162e: 0x4000, 0x162f: 0x4000,
+	0x1630: 0x4000, 0x1634: 0x4000,
+	0x1638: 0x4000, 0x1639: 0x4000, 0x163a: 0x4000, 0x163b: 0x4000,
+	0x163c: 0x4000, 0x163d: 0x4000, 0x163e: 0x4000, 0x163f: 0x4000,
+	// Block 0x59, offset 0x1640
+	0x1640: 0x4000, 0x1641: 0x4000, 0x1642: 0x4000, 0x1643: 0x4000, 0x1644: 0x4000, 0x1645: 0x4000,
+	0x1646: 0x4000, 0x1647: 0x4000, 0x1648: 0x4000, 0x1649: 0x4000, 0x164a: 0x4000, 0x164b: 0x4000,
+	0x164c: 0x4000, 0x164d: 0x4000, 0x164e: 0x4000, 0x164f: 0x4000, 0x1650: 0x4000, 0x1651: 0x4000,
+	0x1652: 0x4000, 0x1653: 0x4000, 0x1654: 0x4000, 0x1655: 0x4000, 0x1656: 0x4000, 0x1657: 0x4000,
+	0x1658: 0x4000, 0x1659: 0x4000, 0x165a: 0x4000, 0x165b: 0x4000, 0x165c: 0x4000, 0x165d: 0x4000,
+	0x165e: 0x4000, 0x165f: 0x4000, 0x1660: 0x4000, 0x1661: 0x4000, 0x1662: 0x4000, 0x1663: 0x4000,
+	0x1664: 0x4000, 0x1665: 0x4000, 0x1666: 0x4000, 0x1667: 0x4000, 0x1668: 0x4000, 0x1669: 0x4000,
+	0x166a: 0x4000, 0x166b: 0x4000, 0x166c: 0x4000, 0x166d: 0x4000, 0x166e: 0x4000, 0x166f: 0x4000,
+	0x1670: 0x4000, 0x1671: 0x4000, 0x1672: 0x4000, 0x1673: 0x4000, 0x1674: 0x4000, 0x1675: 0x4000,
+	0x1676: 0x4000, 0x1677: 0x4000, 0x1678: 0x4000, 0x1679: 0x4000, 0x167a: 0x4000, 0x167b: 0x4000,
+	0x167c: 0x4000, 0x167d: 0x4000, 0x167e: 0x4000,
+	// Block 0x5a, offset 0x1680
+	0x1680: 0x4000, 0x1682: 0x4000, 0x1683: 0x4000, 0x1684: 0x4000, 0x1685: 0x4000,
+	0x1686: 0x4000, 0x1687: 0x4000, 0x1688: 0x4000, 0x1689: 0x4000, 0x168a: 0x4000, 0x168b: 0x4000,
+	0x168c: 0x4000, 0x168d: 0x4000, 0x168e: 0x4000, 0x168f: 0x4000, 0x1690: 0x4000, 0x1691: 0x4000,
+	0x1692: 0x4000, 0x1693: 0x4000, 0x1694: 0x4000, 0x1695: 0x4000, 0x1696: 0x4000, 0x1697: 0x4000,
+	0x1698: 0x4000, 0x1699: 0x4000, 0x169a: 0x4000, 0x169b: 0x4000, 0x169c: 0x4000, 0x169d: 0x4000,
+	0x169e: 0x4000, 0x169f: 0x4000, 0x16a0: 0x4000, 0x16a1: 0x4000, 0x16a2: 0x4000, 0x16a3: 0x4000,
+	0x16a4: 0x4000, 0x16a5: 0x4000, 0x16a6: 0x4000, 0x16a7: 0x4000, 0x16a8: 0x4000, 0x16a9: 0x4000,
+	0x16aa: 0x4000, 0x16ab: 0x4000, 0x16ac: 0x4000, 0x16ad: 0x4000, 0x16ae: 0x4000, 0x16af: 0x4000,
+	0x16b0: 0x4000, 0x16b1: 0x4000, 0x16b2: 0x4000, 0x16b3: 0x4000, 0x16b4: 0x4000, 0x16b5: 0x4000,
+	0x16b6: 0x4000, 0x16b7: 0x4000, 0x16b8: 0x4000, 0x16b9: 0x4000, 0x16ba: 0x4000, 0x16bb: 0x4000,
+	0x16bc: 0x4000, 0x16bd: 0x4000, 0x16be: 0x4000, 0x16bf: 0x4000,
+	// Block 0x5b, offset 0x16c0
+	0x16c0: 0x4000, 0x16c1: 0x4000, 0x16c2: 0x4000, 0x16c3: 0x4000, 0x16c4: 0x4000, 0x16c5: 0x4000,
+	0x16c6: 0x4000, 0x16c7: 0x4000, 0x16c8: 0x4000, 0x16c9: 0x4000, 0x16ca: 0x4000, 0x16cb: 0x4000,
+	0x16cc: 0x4000, 0x16cd: 0x4000, 0x16ce: 0x4000, 0x16cf: 0x4000, 0x16d0: 0x4000, 0x16d1: 0x4000,
+	0x16d2: 0x4000, 0x16d3: 0x4000, 0x16d4: 0x4000, 0x16d5: 0x4000, 0x16d6: 0x4000, 0x16d7: 0x4000,
+	0x16d8: 0x4000, 0x16d9: 0x4000, 0x16da: 0x4000, 0x16db: 0x4000, 0x16dc: 0x4000, 0x16dd: 0x4000,
+	0x16de: 0x4000, 0x16df: 0x4000, 0x16e0: 0x4000, 0x16e1: 0x4000, 0x16e2: 0x4000, 0x16e3: 0x4000,
+	0x16e4: 0x4000, 0x16e5: 0x4000, 0x16e6: 0x4000, 0x16e7: 0x4000, 0x16e8: 0x4000, 0x16e9: 0x4000,
+	0x16ea: 0x4000, 0x16eb: 0x4000, 0x16ec: 0x4000, 0x16ed: 0x4000, 0x16ee: 0x4000, 0x16ef: 0x4000,
+	0x16f0: 0x4000, 0x16f1: 0x4000, 0x16f2: 0x4000, 0x16f3: 0x4000, 0x16f4: 0x4000, 0x16f5: 0x4000,
+	0x16f6: 0x4000, 0x16f7: 0x4000, 0x16f8: 0x4000, 0x16f9: 0x4000, 0x16fa: 0x4000, 0x16fb: 0x4000,
+	0x16fc: 0x4000, 0x16ff: 0x4000,
+	// Block 0x5c, offset 0x1700
+	0x1700: 0x4000, 0x1701: 0x4000, 0x1702: 0x4000, 0x1703: 0x4000, 0x1704: 0x4000, 0x1705: 0x4000,
+	0x1706: 0x4000, 0x1707: 0x4000, 0x1708: 0x4000, 0x1709: 0x4000, 0x170a: 0x4000, 0x170b: 0x4000,
+	0x170c: 0x4000, 0x170d: 0x4000, 0x170e: 0x4000, 0x170f: 0x4000, 0x1710: 0x4000, 0x1711: 0x4000,
+	0x1712: 0x4000, 0x1713: 0x4000, 0x1714: 0x4000, 0x1715: 0x4000, 0x1716: 0x4000, 0x1717: 0x4000,
+	0x1718: 0x4000, 0x1719: 0x4000, 0x171a: 0x4000, 0x171b: 0x4000, 0x171c: 0x4000, 0x171d: 0x4000,
+	0x171e: 0x4000, 0x171f: 0x4000, 0x1720: 0x4000, 0x1721: 0x4000, 0x1722: 0x4000, 0x1723: 0x4000,
+	0x1724: 0x4000, 0x1725: 0x4000, 0x1726: 0x4000, 0x1727: 0x4000, 0x1728: 0x4000, 0x1729: 0x4000,
+	0x172a: 0x4000, 0x172b: 0x4000, 0x172c: 0x4000, 0x172d: 0x4000, 0x172e: 0x4000, 0x172f: 0x4000,
+	0x1730: 0x4000, 0x1731: 0x4000, 0x1732: 0x4000, 0x1733: 0x4000, 0x1734: 0x4000, 0x1735: 0x4000,
+	0x1736: 0x4000, 0x1737: 0x4000, 0x1738: 0x4000, 0x1739: 0x4000, 0x173a: 0x4000, 0x173b: 0x4000,
+	0x173c: 0x4000, 0x173d: 0x4000,
+	// Block 0x5d, offset 0x1740
+	0x174b: 0x4000,
+	0x174c: 0x4000, 0x174d: 0x4000, 0x174e: 0x4000, 0x1750: 0x4000, 0x1751: 0x4000,
+	0x1752: 0x4000, 0x1753: 0x4000, 0x1754: 0x4000, 0x1755: 0x4000, 0x1756: 0x4000, 0x1757: 0x4000,
+	0x1758: 0x4000, 0x1759: 0x4000, 0x175a: 0x4000, 0x175b: 0x4000, 0x175c: 0x4000, 0x175d: 0x4000,
+	0x175e: 0x4000, 0x175f: 0x4000, 0x1760: 0x4000, 0x1761: 0x4000, 0x1762: 0x4000, 0x1763: 0x4000,
+	0x1764: 0x4000, 0x1765: 0x4000, 0x1766: 0x4000, 0x1767: 0x4000,
+	0x177a: 0x4000,
+	// Block 0x5e, offset 0x1780
+	0x1795: 0x4000, 0x1796: 0x4000,
+	0x17a4: 0x4000,
+	// Block 0x5f, offset 0x17c0
+	0x17fb: 0x4000,
+	0x17fc: 0x4000, 0x17fd: 0x4000, 0x17fe: 0x4000, 0x17ff: 0x4000,
+	// Block 0x60, offset 0x1800
+	0x1800: 0x4000, 0x1801: 0x4000, 0x1802: 0x4000, 0x1803: 0x4000, 0x1804: 0x4000, 0x1805: 0x4000,
+	0x1806: 0x4000, 0x1807: 0x4000, 0x1808: 0x4000, 0x1809: 0x4000, 0x180a: 0x4000, 0x180b: 0x4000,
+	0x180c: 0x4000, 0x180d: 0x4000, 0x180e: 0x4000, 0x180f: 0x4000,
+	// Block 0x61, offset 0x1840
+	0x1840: 0x4000, 0x1841: 0x4000, 0x1842: 0x4000, 0x1843: 0x4000, 0x1844: 0x4000, 0x1845: 0x4000,
+	0x184c: 0x4000, 0x1850: 0x4000, 0x1851: 0x4000,
+	0x1852: 0x4000, 0x1855: 0x4000, 0x1856: 0x4000, 0x1857: 0x4000,
+	0x185c: 0x4000, 0x185d: 0x4000,
+	0x185e: 0x4000, 0x185f: 0x4000,
+	0x186b: 0x4000, 0x186c: 0x4000,
+	0x1874: 0x4000, 0x1875: 0x4000,
+	0x1876: 0x4000, 0x1877: 0x4000, 0x1878: 0x4000, 0x1879: 0x4000, 0x187a: 0x4000, 0x187b: 0x4000,
+	0x187c: 0x4000,
+	// Block 0x62, offset 0x1880
+	0x18a0: 0x4000, 0x18a1: 0x4000, 0x18a2: 0x4000, 0x18a3: 0x4000,
+	0x18a4: 0x4000, 0x18a5: 0x4000, 0x18a6: 0x4000, 0x18a7: 0x4000, 0x18a8: 0x4000, 0x18a9: 0x4000,
+	0x18aa: 0x4000, 0x18ab: 0x4000,
+	0x18b0: 0x4000,
+	// Block 0x63, offset 0x18c0
+	0x18cc: 0x4000, 0x18cd: 0x4000, 0x18ce: 0x4000, 0x18cf: 0x4000, 0x18d0: 0x4000, 0x18d1: 0x4000,
+	0x18d2: 0x4000, 0x18d3: 0x4000, 0x18d4: 0x4000, 0x18d5: 0x4000, 0x18d6: 0x4000, 0x18d7: 0x4000,
+	0x18d8: 0x4000, 0x18d9: 0x4000, 0x18da: 0x4000, 0x18db: 0x4000, 0x18dc: 0x4000, 0x18dd: 0x4000,
+	0x18de: 0x4000, 0x18df: 0x4000, 0x18e0: 0x4000, 0x18e1: 0x4000, 0x18e2: 0x4000, 0x18e3: 0x4000,
+	0x18e4: 0x4000, 0x18e5: 0x4000, 0x18e6: 0x4000, 0x18e7: 0x4000, 0x18e8: 0x4000, 0x18e9: 0x4000,
+	0x18ea: 0x4000, 0x18eb: 0x4000, 0x18ec: 0x4000, 0x18ed: 0x4000, 0x18ee: 0x4000, 0x18ef: 0x4000,
+	0x18f0: 0x4000, 0x18f1: 0x4000, 0x18f2: 0x4000, 0x18f3: 0x4000, 0x18f4: 0x4000, 0x18f5: 0x4000,
+	0x18f6: 0x4000, 0x18f7: 0x4000, 0x18f8: 0x4000, 0x18f9: 0x4000, 0x18fa: 0x4000,
+	0x18fc: 0x4000, 0x18fd: 0x4000, 0x18fe: 0x4000, 0x18ff: 0x4000,
+	// Block 0x64, offset 0x1900
+	0x1900: 0x4000, 0x1901: 0x4000, 0x1902: 0x4000, 0x1903: 0x4000, 0x1904: 0x4000, 0x1905: 0x4000,
+	0x1907: 0x4000, 0x1908: 0x4000, 0x1909: 0x4000, 0x190a: 0x4000, 0x190b: 0x4000,
+	0x190c: 0x4000, 0x190d: 0x4000, 0x190e: 0x4000, 0x190f: 0x4000, 0x1910: 0x4000, 0x1911: 0x4000,
+	0x1912: 0x4000, 0x1913: 0x4000, 0x1914: 0x4000, 0x1915: 0x4000, 0x1916: 0x4000, 0x1917: 0x4000,
+	0x1918: 0x4000, 0x1919: 0x4000, 0x191a: 0x4000, 0x191b: 0x4000, 0x191c: 0x4000, 0x191d: 0x4000,
+	0x191e: 0x4000, 0x191f: 0x4000, 0x1920: 0x4000, 0x1921: 0x4000, 0x1922: 0x4000, 0x1923: 0x4000,
+	0x1924: 0x4000, 0x1925: 0x4000, 0x1926: 0x4000, 0x1927: 0x4000, 0x1928: 0x4000, 0x1929: 0x4000,
+	0x192a: 0x4000, 0x192b: 0x4000, 0x192c: 0x4000, 0x192d: 0x4000, 0x192e: 0x4000, 0x192f: 0x4000,
+	0x1930: 0x4000, 0x1931: 0x4000, 0x1932: 0x4000, 0x1933: 0x4000, 0x1934: 0x4000, 0x1935: 0x4000,
+	0x1936: 0x4000, 0x1937: 0x4000, 0x1938: 0x4000, 0x1939: 0x4000, 0x193a: 0x4000, 0x193b: 0x4000,
+	0x193c: 0x4000, 0x193d: 0x4000, 0x193e: 0x4000, 0x193f: 0x4000,
+	// Block 0x65, offset 0x1940
+	0x1970: 0x4000, 0x1971: 0x4000, 0x1972: 0x4000, 0x1973: 0x4000, 0x1974: 0x4000, 0x1975: 0x4000,
+	0x1976: 0x4000, 0x1977: 0x4000, 0x1978: 0x4000, 0x1979: 0x4000, 0x197a: 0x4000, 0x197b: 0x4000,
+	0x197c: 0x4000,
+	// Block 0x66, offset 0x1980
+	0x1980: 0x4000, 0x1981: 0x4000, 0x1982: 0x4000, 0x1983: 0x4000, 0x1984: 0x4000, 0x1985: 0x4000,
+	0x1986: 0x4000, 0x1987: 0x4000, 0x1988: 0x4000,
+	0x1990: 0x4000, 0x1991: 0x4000,
+	0x1992: 0x4000, 0x1993: 0x4000, 0x1994: 0x4000, 0x1995: 0x4000, 0x1996: 0x4000, 0x1997: 0x4000,
+	0x1998: 0x4000, 0x1999: 0x4000, 0x199a: 0x4000, 0x199b: 0x4000, 0x199c: 0x4000, 0x199d: 0x4000,
+	0x199e: 0x4000, 0x199f: 0x4000, 0x19a0: 0x4000, 0x19a1: 0x4000, 0x19a2: 0x4000, 0x19a3: 0x4000,
+	0x19a4: 0x4000, 0x19a5: 0x4000, 0x19a6: 0x4000, 0x19a7: 0x4000, 0x19a8: 0x4000, 0x19a9: 0x4000,
+	0x19aa: 0x4000, 0x19ab: 0x4000, 0x19ac: 0x4000, 0x19ad: 0x4000, 0x19ae: 0x4000, 0x19af: 0x4000,
+	0x19b0: 0x4000, 0x19b1: 0x4000, 0x19b2: 0x4000, 0x19b3: 0x4000, 0x19b4: 0x4000, 0x19b5: 0x4000,
+	0x19b6: 0x4000, 0x19b7: 0x4000, 0x19b8: 0x4000, 0x19b9: 0x4000, 0x19ba: 0x4000, 0x19bb: 0x4000,
+	0x19bc: 0x4000, 0x19bd: 0x4000, 0x19bf: 0x4000,
+	// Block 0x67, offset 0x19c0
+	0x19c0: 0x4000, 0x19c1: 0x4000, 0x19c2: 0x4000, 0x19c3: 0x4000, 0x19c4: 0x4000, 0x19c5: 0x4000,
+	0x19ce: 0x4000, 0x19cf: 0x4000, 0x19d0: 0x4000, 0x19d1: 0x4000,
+	0x19d2: 0x4000, 0x19d3: 0x4000, 0x19d4: 0x4000, 0x19d5: 0x4000, 0x19d6: 0x4000, 0x19d7: 0x4000,
+	0x19d8: 0x4000, 0x19d9: 0x4000, 0x19da: 0x4000, 0x19db: 0x4000,
+	0x19e0: 0x4000, 0x19e1: 0x4000, 0x19e2: 0x4000, 0x19e3: 0x4000,
+	0x19e4: 0x4000, 0x19e5: 0x4000, 0x19e6: 0x4000, 0x19e7: 0x4000, 0x19e8: 0x4000,
+	0x19f0: 0x4000, 0x19f1: 0x4000, 0x19f2: 0x4000, 0x19f3: 0x4000, 0x19f4: 0x4000, 0x19f5: 0x4000,
+	0x19f6: 0x4000, 0x19f7: 0x4000, 0x19f8: 0x4000,
+	// Block 0x68, offset 0x1a00
+	0x1a00: 0x2000, 0x1a01: 0x2000, 0x1a02: 0x2000, 0x1a03: 0x2000, 0x1a04: 0x2000, 0x1a05: 0x2000,
+	0x1a06: 0x2000, 0x1a07: 0x2000, 0x1a08: 0x2000, 0x1a09: 0x2000, 0x1a0a: 0x2000, 0x1a0b: 0x2000,
+	0x1a0c: 0x2000, 0x1a0d: 0x2000, 0x1a0e: 0x2000, 0x1a0f: 0x2000, 0x1a10: 0x2000, 0x1a11: 0x2000,
+	0x1a12: 0x2000, 0x1a13: 0x2000, 0x1a14: 0x2000, 0x1a15: 0x2000, 0x1a16: 0x2000, 0x1a17: 0x2000,
+	0x1a18: 0x2000, 0x1a19: 0x2000, 0x1a1a: 0x2000, 0x1a1b: 0x2000, 0x1a1c: 0x2000, 0x1a1d: 0x2000,
+	0x1a1e: 0x2000, 0x1a1f: 0x2000, 0x1a20: 0x2000, 0x1a21: 0x2000, 0x1a22: 0x2000, 0x1a23: 0x2000,
+	0x1a24: 0x2000, 0x1a25: 0x2000, 0x1a26: 0x2000, 0x1a27: 0x2000, 0x1a28: 0x2000, 0x1a29: 0x2000,
+	0x1a2a: 0x2000, 0x1a2b: 0x2000, 0x1a2c: 0x2000, 0x1a2d: 0x2000, 0x1a2e: 0x2000, 0x1a2f: 0x2000,
+	0x1a30: 0x2000, 0x1a31: 0x2000, 0x1a32: 0x2000, 0x1a33: 0x2000, 0x1a34: 0x2000, 0x1a35: 0x2000,
+	0x1a36: 0x2000, 0x1a37: 0x2000, 0x1a38: 0x2000, 0x1a39: 0x2000, 0x1a3a: 0x2000, 0x1a3b: 0x2000,
+	0x1a3c: 0x2000, 0x1a3d: 0x2000,
+}
+
+// widthIndex: 23 blocks, 1472 entries, 1472 bytes
+// Block 0 is the zero block.
+var widthIndex = [1472]uint8{
+	// Block 0x0, offset 0x0
+	// Block 0x1, offset 0x40
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc2: 0x01, 0xc3: 0x02, 0xc4: 0x03, 0xc5: 0x04, 0xc7: 0x05,
+	0xc9: 0x06, 0xcb: 0x07, 0xcc: 0x08, 0xcd: 0x09, 0xce: 0x0a, 0xcf: 0x0b,
+	0xd0: 0x0c, 0xd1: 0x0d,
+	0xe1: 0x02, 0xe2: 0x03, 0xe3: 0x04, 0xe4: 0x05, 0xe5: 0x06, 0xe6: 0x06, 0xe7: 0x06,
+	0xe8: 0x06, 0xe9: 0x06, 0xea: 0x07, 0xeb: 0x06, 0xec: 0x06, 0xed: 0x08, 0xee: 0x09, 0xef: 0x0a,
+	0xf0: 0x10, 0xf3: 0x13, 0xf4: 0x14,
+	// Block 0x4, offset 0x100
+	0x104: 0x0e, 0x105: 0x0f,
+	// Block 0x5, offset 0x140
+	0x140: 0x10, 0x141: 0x11, 0x142: 0x12, 0x144: 0x13, 0x145: 0x14, 0x146: 0x15, 0x147: 0x16,
+	0x148: 0x17, 0x149: 0x18, 0x14a: 0x19, 0x14c: 0x1a, 0x14f: 0x1b,
+	0x151: 0x1c, 0x152: 0x08, 0x153: 0x1d, 0x154: 0x1e, 0x155: 0x1f, 0x156: 0x20, 0x157: 0x21,
+	0x158: 0x22, 0x159: 0x23, 0x15a: 0x24, 0x15b: 0x25, 0x15c: 0x26, 0x15d: 0x27, 0x15e: 0x28, 0x15f: 0x29,
+	0x166: 0x2a,
+	0x16c: 0x2b, 0x16d: 0x2c,
+	0x17a: 0x2d, 0x17b: 0x2e, 0x17c: 0x0e, 0x17d: 0x0e, 0x17e: 0x0e, 0x17f: 0x2f,
+	// Block 0x6, offset 0x180
+	0x180: 0x30, 0x181: 0x31, 0x182: 0x32, 0x183: 0x33, 0x184: 0x34, 0x185: 0x35, 0x186: 0x36, 0x187: 0x37,
+	0x188: 0x38, 0x189: 0x39, 0x18a: 0x0e, 0x18b: 0x0e, 0x18c: 0x0e, 0x18d: 0x0e, 0x18e: 0x0e, 0x18f: 0x0e,
+	0x190: 0x0e, 0x191: 0x0e, 0x192: 0x0e, 0x193: 0x0e, 0x194: 0x0e, 0x195: 0x0e, 0x196: 0x0e, 0x197: 0x0e,
+	0x198: 0x0e, 0x199: 0x0e, 0x19a: 0x0e, 0x19b: 0x0e, 0x19c: 0x0e, 0x19d: 0x0e, 0x19e: 0x0e, 0x19f: 0x0e,
+	0x1a0: 0x0e, 0x1a1: 0x0e, 0x1a2: 0x0e, 0x1a3: 0x0e, 0x1a4: 0x0e, 0x1a5: 0x0e, 0x1a6: 0x0e, 0x1a7: 0x0e,
+	0x1a8: 0x0e, 0x1a9: 0x0e, 0x1aa: 0x0e, 0x1ab: 0x0e, 0x1ac: 0x0e, 0x1ad: 0x0e, 0x1ae: 0x0e, 0x1af: 0x0e,
+	0x1b0: 0x0e, 0x1b1: 0x0e, 0x1b2: 0x0e, 0x1b3: 0x0e, 0x1b4: 0x0e, 0x1b5: 0x0e, 0x1b6: 0x0e, 0x1b7: 0x0e,
+	0x1b8: 0x0e, 0x1b9: 0x0e, 0x1ba: 0x0e, 0x1bb: 0x0e, 0x1bc: 0x0e, 0x1bd: 0x0e, 0x1be: 0x0e, 0x1bf: 0x0e,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x0e, 0x1c1: 0x0e, 0x1c2: 0x0e, 0x1c3: 0x0e, 0x1c4: 0x0e, 0x1c5: 0x0e, 0x1c6: 0x0e, 0x1c7: 0x0e,
+	0x1c8: 0x0e, 0x1c9: 0x0e, 0x1ca: 0x0e, 0x1cb: 0x0e, 0x1cc: 0x0e, 0x1cd: 0x0e, 0x1ce: 0x0e, 0x1cf: 0x0e,
+	0x1d0: 0x0e, 0x1d1: 0x0e, 0x1d2: 0x0e, 0x1d3: 0x0e, 0x1d4: 0x0e, 0x1d5: 0x0e, 0x1d6: 0x0e, 0x1d7: 0x0e,
+	0x1d8: 0x0e, 0x1d9: 0x0e, 0x1da: 0x0e, 0x1db: 0x0e, 0x1dc: 0x0e, 0x1dd: 0x0e, 0x1de: 0x0e, 0x1df: 0x0e,
+	0x1e0: 0x0e, 0x1e1: 0x0e, 0x1e2: 0x0e, 0x1e3: 0x0e, 0x1e4: 0x0e, 0x1e5: 0x0e, 0x1e6: 0x0e, 0x1e7: 0x0e,
+	0x1e8: 0x0e, 0x1e9: 0x0e, 0x1ea: 0x0e, 0x1eb: 0x0e, 0x1ec: 0x0e, 0x1ed: 0x0e, 0x1ee: 0x0e, 0x1ef: 0x0e,
+	0x1f0: 0x0e, 0x1f1: 0x0e, 0x1f2: 0x0e, 0x1f3: 0x0e, 0x1f4: 0x0e, 0x1f5: 0x0e, 0x1f6: 0x0e,
+	0x1f8: 0x0e, 0x1f9: 0x0e, 0x1fa: 0x0e, 0x1fb: 0x0e, 0x1fc: 0x0e, 0x1fd: 0x0e, 0x1fe: 0x0e, 0x1ff: 0x0e,
+	// Block 0x8, offset 0x200
+	0x200: 0x0e, 0x201: 0x0e, 0x202: 0x0e, 0x203: 0x0e, 0x204: 0x0e, 0x205: 0x0e, 0x206: 0x0e, 0x207: 0x0e,
+	0x208: 0x0e, 0x209: 0x0e, 0x20a: 0x0e, 0x20b: 0x0e, 0x20c: 0x0e, 0x20d: 0x0e, 0x20e: 0x0e, 0x20f: 0x0e,
+	0x210: 0x0e, 0x211: 0x0e, 0x212: 0x0e, 0x213: 0x0e, 0x214: 0x0e, 0x215: 0x0e, 0x216: 0x0e, 0x217: 0x0e,
+	0x218: 0x0e, 0x219: 0x0e, 0x21a: 0x0e, 0x21b: 0x0e, 0x21c: 0x0e, 0x21d: 0x0e, 0x21e: 0x0e, 0x21f: 0x0e,
+	0x220: 0x0e, 0x221: 0x0e, 0x222: 0x0e, 0x223: 0x0e, 0x224: 0x0e, 0x225: 0x0e, 0x226: 0x0e, 0x227: 0x0e,
+	0x228: 0x0e, 0x229: 0x0e, 0x22a: 0x0e, 0x22b: 0x0e, 0x22c: 0x0e, 0x22d: 0x0e, 0x22e: 0x0e, 0x22f: 0x0e,
+	0x230: 0x0e, 0x231: 0x0e, 0x232: 0x0e, 0x233: 0x0e, 0x234: 0x0e, 0x235: 0x0e, 0x236: 0x0e, 0x237: 0x0e,
+	0x238: 0x0e, 0x239: 0x0e, 0x23a: 0x0e, 0x23b: 0x0e, 0x23c: 0x0e, 0x23d: 0x0e, 0x23e: 0x0e, 0x23f: 0x0e,
+	// Block 0x9, offset 0x240
+	0x240: 0x0e, 0x241: 0x0e, 0x242: 0x0e, 0x243: 0x0e, 0x244: 0x0e, 0x245: 0x0e, 0x246: 0x0e, 0x247: 0x0e,
+	0x248: 0x0e, 0x249: 0x0e, 0x24a: 0x0e, 0x24b: 0x0e, 0x24c: 0x0e, 0x24d: 0x0e, 0x24e: 0x0e, 0x24f: 0x0e,
+	0x250: 0x0e, 0x251: 0x0e, 0x252: 0x3a, 0x253: 0x3b,
+	0x265: 0x3c,
+	0x270: 0x0e, 0x271: 0x0e, 0x272: 0x0e, 0x273: 0x0e, 0x274: 0x0e, 0x275: 0x0e, 0x276: 0x0e, 0x277: 0x0e,
+	0x278: 0x0e, 0x279: 0x0e, 0x27a: 0x0e, 0x27b: 0x0e, 0x27c: 0x0e, 0x27d: 0x0e, 0x27e: 0x0e, 0x27f: 0x0e,
+	// Block 0xa, offset 0x280
+	0x280: 0x0e, 0x281: 0x0e, 0x282: 0x0e, 0x283: 0x0e, 0x284: 0x0e, 0x285: 0x0e, 0x286: 0x0e, 0x287: 0x0e,
+	0x288: 0x0e, 0x289: 0x0e, 0x28a: 0x0e, 0x28b: 0x0e, 0x28c: 0x0e, 0x28d: 0x0e, 0x28e: 0x0e, 0x28f: 0x0e,
+	0x290: 0x0e, 0x291: 0x0e, 0x292: 0x0e, 0x293: 0x0e, 0x294: 0x0e, 0x295: 0x0e, 0x296: 0x0e, 0x297: 0x0e,
+	0x298: 0x0e, 0x299: 0x0e, 0x29a: 0x0e, 0x29b: 0x0e, 0x29c: 0x0e, 0x29d: 0x0e, 0x29e: 0x3d,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0x08, 0x2c1: 0x08, 0x2c2: 0x08, 0x2c3: 0x08, 0x2c4: 0x08, 0x2c5: 0x08, 0x2c6: 0x08, 0x2c7: 0x08,
+	0x2c8: 0x08, 0x2c9: 0x08, 0x2ca: 0x08, 0x2cb: 0x08, 0x2cc: 0x08, 0x2cd: 0x08, 0x2ce: 0x08, 0x2cf: 0x08,
+	0x2d0: 0x08, 0x2d1: 0x08, 0x2d2: 0x08, 0x2d3: 0x08, 0x2d4: 0x08, 0x2d5: 0x08, 0x2d6: 0x08, 0x2d7: 0x08,
+	0x2d8: 0x08, 0x2d9: 0x08, 0x2da: 0x08, 0x2db: 0x08, 0x2dc: 0x08, 0x2dd: 0x08, 0x2de: 0x08, 0x2df: 0x08,
+	0x2e0: 0x08, 0x2e1: 0x08, 0x2e2: 0x08, 0x2e3: 0x08, 0x2e4: 0x08, 0x2e5: 0x08, 0x2e6: 0x08, 0x2e7: 0x08,
+	0x2e8: 0x08, 0x2e9: 0x08, 0x2ea: 0x08, 0x2eb: 0x08, 0x2ec: 0x08, 0x2ed: 0x08, 0x2ee: 0x08, 0x2ef: 0x08,
+	0x2f0: 0x08, 0x2f1: 0x08, 0x2f2: 0x08, 0x2f3: 0x08, 0x2f4: 0x08, 0x2f5: 0x08, 0x2f6: 0x08, 0x2f7: 0x08,
+	0x2f8: 0x08, 0x2f9: 0x08, 0x2fa: 0x08, 0x2fb: 0x08, 0x2fc: 0x08, 0x2fd: 0x08, 0x2fe: 0x08, 0x2ff: 0x08,
+	// Block 0xc, offset 0x300
+	0x300: 0x08, 0x301: 0x08, 0x302: 0x08, 0x303: 0x08, 0x304: 0x08, 0x305: 0x08, 0x306: 0x08, 0x307: 0x08,
+	0x308: 0x08, 0x309: 0x08, 0x30a: 0x08, 0x30b: 0x08, 0x30c: 0x08, 0x30d: 0x08, 0x30e: 0x08, 0x30f: 0x08,
+	0x310: 0x08, 0x311: 0x08, 0x312: 0x08, 0x313: 0x08, 0x314: 0x08, 0x315: 0x08, 0x316: 0x08, 0x317: 0x08,
+	0x318: 0x08, 0x319: 0x08, 0x31a: 0x08, 0x31b: 0x08, 0x31c: 0x08, 0x31d: 0x08, 0x31e: 0x08, 0x31f: 0x08,
+	0x320: 0x08, 0x321: 0x08, 0x322: 0x08, 0x323: 0x08, 0x324: 0x0e, 0x325: 0x0e, 0x326: 0x0e, 0x327: 0x0e,
+	0x328: 0x0e, 0x329: 0x0e, 0x32a: 0x0e, 0x32b: 0x0e,
+	0x338: 0x3e, 0x339: 0x3f, 0x33c: 0x40, 0x33d: 0x41, 0x33e: 0x42, 0x33f: 0x43,
+	// Block 0xd, offset 0x340
+	0x37f: 0x44,
+	// Block 0xe, offset 0x380
+	0x380: 0x0e, 0x381: 0x0e, 0x382: 0x0e, 0x383: 0x0e, 0x384: 0x0e, 0x385: 0x0e, 0x386: 0x0e, 0x387: 0x0e,
+	0x388: 0x0e, 0x389: 0x0e, 0x38a: 0x0e, 0x38b: 0x0e, 0x38c: 0x0e, 0x38d: 0x0e, 0x38e: 0x0e, 0x38f: 0x0e,
+	0x390: 0x0e, 0x391: 0x0e, 0x392: 0x0e, 0x393: 0x0e, 0x394: 0x0e, 0x395: 0x0e, 0x396: 0x0e, 0x397: 0x0e,
+	0x398: 0x0e, 0x399: 0x0e, 0x39a: 0x0e, 0x39b: 0x0e, 0x39c: 0x0e, 0x39d: 0x0e, 0x39e: 0x0e, 0x39f: 0x45,
+	0x3a0: 0x0e, 0x3a1: 0x0e, 0x3a2: 0x0e, 0x3a3: 0x0e, 0x3a4: 0x0e, 0x3a5: 0x0e, 0x3a6: 0x0e, 0x3a7: 0x0e,
+	0x3a8: 0x0e, 0x3a9: 0x0e, 0x3aa: 0x0e, 0x3ab: 0x0e, 0x3ac: 0x0e, 0x3ad: 0x0e, 0x3ae: 0x0e, 0x3af: 0x0e,
+	0x3b0: 0x0e, 0x3b1: 0x0e, 0x3b2: 0x0e, 0x3b3: 0x46, 0x3b4: 0x47,
+	// Block 0xf, offset 0x3c0
+	0x3ff: 0x48,
+	// Block 0x10, offset 0x400
+	0x400: 0x0e, 0x401: 0x0e, 0x402: 0x0e, 0x403: 0x0e, 0x404: 0x49, 0x405: 0x4a, 0x406: 0x0e, 0x407: 0x0e,
+	0x408: 0x0e, 0x409: 0x0e, 0x40a: 0x0e, 0x40b: 0x4b,
+	// Block 0x11, offset 0x440
+	0x440: 0x4c, 0x443: 0x4d, 0x444: 0x4e, 0x445: 0x4f, 0x446: 0x50,
+	0x448: 0x51, 0x449: 0x52, 0x44c: 0x53, 0x44d: 0x54, 0x44e: 0x55, 0x44f: 0x56,
+	0x450: 0x57, 0x451: 0x58, 0x452: 0x0e, 0x453: 0x59, 0x454: 0x5a, 0x455: 0x5b, 0x456: 0x5c, 0x457: 0x5d,
+	0x458: 0x0e, 0x459: 0x5e, 0x45a: 0x0e, 0x45b: 0x5f, 0x45f: 0x60,
+	0x464: 0x61, 0x465: 0x62, 0x466: 0x0e, 0x467: 0x0e,
+	0x469: 0x63, 0x46a: 0x64, 0x46b: 0x65,
+	// Block 0x12, offset 0x480
+	0x496: 0x0b, 0x497: 0x06,
+	0x498: 0x0c, 0x49a: 0x0d, 0x49b: 0x0e, 0x49f: 0x0f,
+	0x4a0: 0x06, 0x4a1: 0x06, 0x4a2: 0x06, 0x4a3: 0x06, 0x4a4: 0x06, 0x4a5: 0x06, 0x4a6: 0x06, 0x4a7: 0x06,
+	0x4a8: 0x06, 0x4a9: 0x06, 0x4aa: 0x06, 0x4ab: 0x06, 0x4ac: 0x06, 0x4ad: 0x06, 0x4ae: 0x06, 0x4af: 0x06,
+	0x4b0: 0x06, 0x4b1: 0x06, 0x4b2: 0x06, 0x4b3: 0x06, 0x4b4: 0x06, 0x4b5: 0x06, 0x4b6: 0x06, 0x4b7: 0x06,
+	0x4b8: 0x06, 0x4b9: 0x06, 0x4ba: 0x06, 0x4bb: 0x06, 0x4bc: 0x06, 0x4bd: 0x06, 0x4be: 0x06, 0x4bf: 0x06,
+	// Block 0x13, offset 0x4c0
+	0x4c4: 0x08, 0x4c5: 0x08, 0x4c6: 0x08, 0x4c7: 0x09,
+	// Block 0x14, offset 0x500
+	0x500: 0x08, 0x501: 0x08, 0x502: 0x08, 0x503: 0x08, 0x504: 0x08, 0x505: 0x08, 0x506: 0x08, 0x507: 0x08,
+	0x508: 0x08, 0x509: 0x08, 0x50a: 0x08, 0x50b: 0x08, 0x50c: 0x08, 0x50d: 0x08, 0x50e: 0x08, 0x50f: 0x08,
+	0x510: 0x08, 0x511: 0x08, 0x512: 0x08, 0x513: 0x08, 0x514: 0x08, 0x515: 0x08, 0x516: 0x08, 0x517: 0x08,
+	0x518: 0x08, 0x519: 0x08, 0x51a: 0x08, 0x51b: 0x08, 0x51c: 0x08, 0x51d: 0x08, 0x51e: 0x08, 0x51f: 0x08,
+	0x520: 0x08, 0x521: 0x08, 0x522: 0x08, 0x523: 0x08, 0x524: 0x08, 0x525: 0x08, 0x526: 0x08, 0x527: 0x08,
+	0x528: 0x08, 0x529: 0x08, 0x52a: 0x08, 0x52b: 0x08, 0x52c: 0x08, 0x52d: 0x08, 0x52e: 0x08, 0x52f: 0x08,
+	0x530: 0x08, 0x531: 0x08, 0x532: 0x08, 0x533: 0x08, 0x534: 0x08, 0x535: 0x08, 0x536: 0x08, 0x537: 0x08,
+	0x538: 0x08, 0x539: 0x08, 0x53a: 0x08, 0x53b: 0x08, 0x53c: 0x08, 0x53d: 0x08, 0x53e: 0x08, 0x53f: 0x66,
+	// Block 0x15, offset 0x540
+	0x560: 0x11,
+	0x570: 0x09, 0x571: 0x09, 0x572: 0x09, 0x573: 0x09, 0x574: 0x09, 0x575: 0x09, 0x576: 0x09, 0x577: 0x09,
+	0x578: 0x09, 0x579: 0x09, 0x57a: 0x09, 0x57b: 0x09, 0x57c: 0x09, 0x57d: 0x09, 0x57e: 0x09, 0x57f: 0x12,
+	// Block 0x16, offset 0x580
+	0x580: 0x09, 0x581: 0x09, 0x582: 0x09, 0x583: 0x09, 0x584: 0x09, 0x585: 0x09, 0x586: 0x09, 0x587: 0x09,
+	0x588: 0x09, 0x589: 0x09, 0x58a: 0x09, 0x58b: 0x09, 0x58c: 0x09, 0x58d: 0x09, 0x58e: 0x09, 0x58f: 0x12,
+}
+
+// inverseData contains 4-byte entries of the following format:
+//
+//	<length> <modified UTF-8-encoded rune> <0 padding>
+//
+// The last byte of the UTF-8-encoded rune is xor-ed with the last byte of the
+// UTF-8 encoding of the original rune. Mappings often have the following
+// pattern:
+//
+//	Ａ -> A  (U+FF21 -> U+0041)
+//	Ｂ -> B  (U+FF22 -> U+0042)
+//	...
+//
+// By xor-ing the last byte the same entry can be shared by many mappings. This
+// reduces the total number of distinct entries by about two thirds.
+// The resulting entry for the aforementioned mappings is
+//
+//	{ 0x01, 0xE0, 0x00, 0x00 }
+//
+// Using this entry to map U+FF21 (UTF-8 [EF BC A1]), we get
+//
+//	E0 ^ A1 = 41.
+//
+// Similarly, for U+FF22 (UTF-8 [EF BC A2]), we get
+//
+//	E0 ^ A2 = 42.
+//
+// Note that because of the xor-ing, the byte sequence stored in the entry is
+// not valid UTF-8.
+var inverseData = [150][4]byte{
+	{0x00, 0x00, 0x00, 0x00},
+	{0x03, 0xe3, 0x80, 0xa0},
+	{0x03, 0xef, 0xbc, 0xa0},
+	{0x03, 0xef, 0xbc, 0xe0},
+	{0x03, 0xef, 0xbd, 0xe0},
+	{0x03, 0xef, 0xbf, 0x02},
+	{0x03, 0xef, 0xbf, 0x00},
+	{0x03, 0xef, 0xbf, 0x0e},
+	{0x03, 0xef, 0xbf, 0x0c},
+	{0x03, 0xef, 0xbf, 0x0f},
+	{0x03, 0xef, 0xbf, 0x39},
+	{0x03, 0xef, 0xbf, 0x3b},
+	{0x03, 0xef, 0xbf, 0x3f},
+	{0x03, 0xef, 0xbf, 0x2a},
+	{0x03, 0xef, 0xbf, 0x0d},
+	{0x03, 0xef, 0xbf, 0x25},
+	{0x03, 0xef, 0xbd, 0x1a},
+	{0x03, 0xef, 0xbd, 0x26},
+	{0x01, 0xa0, 0x00, 0x00},
+	{0x03, 0xef, 0xbd, 0x25},
+	{0x03, 0xef, 0xbd, 0x23},
+	{0x03, 0xef, 0xbd, 0x2e},
+	{0x03, 0xef, 0xbe, 0x07},
+	{0x03, 0xef, 0xbe, 0x05},
+	{0x03, 0xef, 0xbd, 0x06},
+	{0x03, 0xef, 0xbd, 0x13},
+	{0x03, 0xef, 0xbd, 0x0b},
+	{0x03, 0xef, 0xbd, 0x16},
+	{0x03, 0xef, 0xbd, 0x0c},
+	{0x03, 0xef, 0xbd, 0x15},
+	{0x03, 0xef, 0xbd, 0x0d},
+	{0x03, 0xef, 0xbd, 0x1c},
+	{0x03, 0xef, 0xbd, 0x02},
+	{0x03, 0xef, 0xbd, 0x1f},
+	{0x03, 0xef, 0xbd, 0x1d},
+	{0x03, 0xef, 0xbd, 0x17},
+	{0x03, 0xef, 0xbd, 0x08},
+	{0x03, 0xef, 0xbd, 0x09},
+	{0x03, 0xef, 0xbd, 0x0e},
+	{0x03, 0xef, 0xbd, 0x04},
+	{0x03, 0xef, 0xbd, 0x05},
+	{0x03, 0xef, 0xbe, 0x3f},
+	{0x03, 0xef, 0xbe, 0x00},
+	{0x03, 0xef, 0xbd, 0x2c},
+	{0x03, 0xef, 0xbe, 0x06},
+	{0x03, 0xef, 0xbe, 0x0c},
+	{0x03, 0xef, 0xbe, 0x0f},
+	{0x03, 0xef, 0xbe, 0x0d},
+	{0x03, 0xef, 0xbe, 0x0b},
+	{0x03, 0xef, 0xbe, 0x19},
+	{0x03, 0xef, 0xbe, 0x15},
+	{0x03, 0xef, 0xbe, 0x11},
+	{0x03, 0xef, 0xbe, 0x31},
+	{0x03, 0xef, 0xbe, 0x33},
+	{0x03, 0xef, 0xbd, 0x0f},
+	{0x03, 0xef, 0xbe, 0x30},
+	{0x03, 0xef, 0xbe, 0x3e},
+	{0x03, 0xef, 0xbe, 0x32},
+	{0x03, 0xef, 0xbe, 0x36},
+	{0x03, 0xef, 0xbd, 0x14},
+	{0x03, 0xef, 0xbe, 0x2e},
+	{0x03, 0xef, 0xbd, 0x1e},
+	{0x03, 0xef, 0xbe, 0x10},
+	{0x03, 0xef, 0xbf, 0x13},
+	{0x03, 0xef, 0xbf, 0x15},
+	{0x03, 0xef, 0xbf, 0x17},
+	{0x03, 0xef, 0xbf, 0x1f},
+	{0x03, 0xef, 0xbf, 0x1d},
+	{0x03, 0xef, 0xbf, 0x1b},
+	{0x03, 0xef, 0xbf, 0x09},
+	{0x03, 0xef, 0xbf, 0x0b},
+	{0x03, 0xef, 0xbf, 0x37},
+	{0x03, 0xef, 0xbe, 0x04},
+	{0x01, 0xe0, 0x00, 0x00},
+	{0x03, 0xe2, 0xa6, 0x1a},
+	{0x03, 0xe2, 0xa6, 0x26},
+	{0x03, 0xe3, 0x80, 0x23},
+	{0x03, 0xe3, 0x80, 0x2e},
+	{0x03, 0xe3, 0x80, 0x25},
+	{0x03, 0xe3, 0x83, 0x1e},
+	{0x03, 0xe3, 0x83, 0x14},
+	{0x03, 0xe3, 0x82, 0x06},
+	{0x03, 0xe3, 0x82, 0x0b},
+	{0x03, 0xe3, 0x82, 0x0c},
+	{0x03, 0xe3, 0x82, 0x0d},
+	{0x03, 0xe3, 0x82, 0x02},
+	{0x03, 0xe3, 0x83, 0x0f},
+	{0x03, 0xe3, 0x83, 0x08},
+	{0x03, 0xe3, 0x83, 0x09},
+	{0x03, 0xe3, 0x83, 0x2c},
+	{0x03, 0xe3, 0x83, 0x0c},
+	{0x03, 0xe3, 0x82, 0x13},
+	{0x03, 0xe3, 0x82, 0x16},
+	{0x03, 0xe3, 0x82, 0x15},
+	{0x03, 0xe3, 0x82, 0x1c},
+	{0x03, 0xe3, 0x82, 0x1f},
+	{0x03, 0xe3, 0x82, 0x1d},
+	{0x03, 0xe3, 0x82, 0x1a},
+	{0x03, 0xe3, 0x82, 0x17},
+	{0x03, 0xe3, 0x82, 0x08},
+	{0x03, 0xe3, 0x82, 0x09},
+	{0x03, 0xe3, 0x82, 0x0e},
+	{0x03, 0xe3, 0x82, 0x04},
+	{0x03, 0xe3, 0x82, 0x05},
+	{0x03, 0xe3, 0x82, 0x3f},
+	{0x03, 0xe3, 0x83, 0x00},
+	{0x03, 0xe3, 0x83, 0x06},
+	{0x03, 0xe3, 0x83, 0x05},
+	{0x03, 0xe3, 0x83, 0x0d},
+	{0x03, 0xe3, 0x83, 0x0b},
+	{0x03, 0xe3, 0x83, 0x07},
+	{0x03, 0xe3, 0x83, 0x19},
+	{0x03, 0xe3, 0x83, 0x15},
+	{0x03, 0xe3, 0x83, 0x11},
+	{0x03, 0xe3, 0x83, 0x31},
+	{0x03, 0xe3, 0x83, 0x33},
+	{0x03, 0xe3, 0x83, 0x30},
+	{0x03, 0xe3, 0x83, 0x3e},
+	{0x03, 0xe3, 0x83, 0x32},
+	{0x03, 0xe3, 0x83, 0x36},
+	{0x03, 0xe3, 0x83, 0x2e},
+	{0x03, 0xe3, 0x82, 0x07},
+	{0x03, 0xe3, 0x85, 0x04},
+	{0x03, 0xe3, 0x84, 0x10},
+	{0x03, 0xe3, 0x85, 0x30},
+	{0x03, 0xe3, 0x85, 0x0d},
+	{0x03, 0xe3, 0x85, 0x13},
+	{0x03, 0xe3, 0x85, 0x15},
+	{0x03, 0xe3, 0x85, 0x17},
+	{0x03, 0xe3, 0x85, 0x1f},
+	{0x03, 0xe3, 0x85, 0x1d},
+	{0x03, 0xe3, 0x85, 0x1b},
+	{0x03, 0xe3, 0x85, 0x09},
+	{0x03, 0xe3, 0x85, 0x0f},
+	{0x03, 0xe3, 0x85, 0x0b},
+	{0x03, 0xe3, 0x85, 0x37},
+	{0x03, 0xe3, 0x85, 0x3b},
+	{0x03, 0xe3, 0x85, 0x39},
+	{0x03, 0xe3, 0x85, 0x3f},
+	{0x02, 0xc2, 0x02, 0x00},
+	{0x02, 0xc2, 0x0e, 0x00},
+	{0x02, 0xc2, 0x0c, 0x00},
+	{0x02, 0xc2, 0x00, 0x00},
+	{0x03, 0xe2, 0x82, 0x0f},
+	{0x03, 0xe2, 0x94, 0x2a},
+	{0x03, 0xe2, 0x86, 0x39},
+	{0x03, 0xe2, 0x86, 0x3b},
+	{0x03, 0xe2, 0x86, 0x3f},
+	{0x03, 0xe2, 0x96, 0x0d},
+	{0x03, 0xe2, 0x97, 0x25},
+}
+
+// Total table size 15512 bytes (15KiB)
diff --git a/vendor/google.golang.org/protobuf/encoding/prototext/encode.go b/vendor/google.golang.org/protobuf/encoding/prototext/encode.go
index ebf6c652..722a7b41 100644
--- a/vendor/google.golang.org/protobuf/encoding/prototext/encode.go
+++ b/vendor/google.golang.org/protobuf/encoding/prototext/encode.go
@@ -101,13 +101,19 @@ func (o MarshalOptions) Format(m proto.Message) string {
 // MarshalOptions object. Do not depend on the output being stable. It may
 // change over time across different versions of the program.
 func (o MarshalOptions) Marshal(m proto.Message) ([]byte, error) {
-	return o.marshal(m)
+	return o.marshal(nil, m)
+}
+
+// MarshalAppend appends the textproto format encoding of m to b,
+// returning the result.
+func (o MarshalOptions) MarshalAppend(b []byte, m proto.Message) ([]byte, error) {
+	return o.marshal(b, m)
 }
 
 // marshal is a centralized function that all marshal operations go through.
 // For profiling purposes, avoid changing the name of this function or
 // introducing other code paths for marshal that do not go through this.
-func (o MarshalOptions) marshal(m proto.Message) ([]byte, error) {
+func (o MarshalOptions) marshal(b []byte, m proto.Message) ([]byte, error) {
 	var delims = [2]byte{'{', '}'}
 
 	if o.Multiline && o.Indent == "" {
@@ -117,7 +123,7 @@ func (o MarshalOptions) marshal(m proto.Message) ([]byte, error) {
 		o.Resolver = protoregistry.GlobalTypes
 	}
 
-	internalEnc, err := text.NewEncoder(o.Indent, delims, o.EmitASCII)
+	internalEnc, err := text.NewEncoder(b, o.Indent, delims, o.EmitASCII)
 	if err != nil {
 		return nil, err
 	}
@@ -125,7 +131,7 @@ func (o MarshalOptions) marshal(m proto.Message) ([]byte, error) {
 	// Treat nil message interface as an empty message,
 	// in which case there is nothing to output.
 	if m == nil {
-		return []byte{}, nil
+		return b, nil
 	}
 
 	enc := encoder{internalEnc, o}
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/text/encode.go b/vendor/google.golang.org/protobuf/internal/encoding/text/encode.go
index da289ccc..cf7aed77 100644
--- a/vendor/google.golang.org/protobuf/internal/encoding/text/encode.go
+++ b/vendor/google.golang.org/protobuf/internal/encoding/text/encode.go
@@ -53,8 +53,10 @@ type encoderState struct {
 // If outputASCII is true, strings will be serialized in such a way that
 // multi-byte UTF-8 sequences are escaped. This property ensures that the
 // overall output is ASCII (as opposed to UTF-8).
-func NewEncoder(indent string, delims [2]byte, outputASCII bool) (*Encoder, error) {
-	e := &Encoder{}
+func NewEncoder(buf []byte, indent string, delims [2]byte, outputASCII bool) (*Encoder, error) {
+	e := &Encoder{
+		encoderState: encoderState{out: buf},
+	}
 	if len(indent) > 0 {
 		if strings.Trim(indent, " \t") != "" {
 			return nil, errors.New("indent may only be composed of space and tab characters")
@@ -195,13 +197,13 @@ func appendFloat(out []byte, n float64, bitSize int) []byte {
 // WriteInt writes out the given signed integer value.
 func (e *Encoder) WriteInt(n int64) {
 	e.prepareNext(scalar)
-	e.out = append(e.out, strconv.FormatInt(n, 10)...)
+	e.out = strconv.AppendInt(e.out, n, 10)
 }
 
 // WriteUint writes out the given unsigned integer value.
 func (e *Encoder) WriteUint(n uint64) {
 	e.prepareNext(scalar)
-	e.out = append(e.out, strconv.FormatUint(n, 10)...)
+	e.out = strconv.AppendUint(e.out, n, 10)
 }
 
 // WriteLiteral writes out the given string as a literal value without quotes.
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 5c0e8f73..136f1b21 100644
--- a/vendor/google.golang.org/protobuf/internal/genid/descriptor_gen.go
+++ b/vendor/google.golang.org/protobuf/internal/genid/descriptor_gen.go
@@ -183,13 +183,58 @@ const (
 // Field names for google.protobuf.ExtensionRangeOptions.
 const (
 	ExtensionRangeOptions_UninterpretedOption_field_name protoreflect.Name = "uninterpreted_option"
+	ExtensionRangeOptions_Declaration_field_name         protoreflect.Name = "declaration"
+	ExtensionRangeOptions_Verification_field_name        protoreflect.Name = "verification"
 
 	ExtensionRangeOptions_UninterpretedOption_field_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.uninterpreted_option"
+	ExtensionRangeOptions_Declaration_field_fullname         protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.declaration"
+	ExtensionRangeOptions_Verification_field_fullname        protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.verification"
 )
 
 // Field numbers for google.protobuf.ExtensionRangeOptions.
 const (
 	ExtensionRangeOptions_UninterpretedOption_field_number protoreflect.FieldNumber = 999
+	ExtensionRangeOptions_Declaration_field_number         protoreflect.FieldNumber = 2
+	ExtensionRangeOptions_Verification_field_number        protoreflect.FieldNumber = 3
+)
+
+// Full and short names for google.protobuf.ExtensionRangeOptions.VerificationState.
+const (
+	ExtensionRangeOptions_VerificationState_enum_fullname = "google.protobuf.ExtensionRangeOptions.VerificationState"
+	ExtensionRangeOptions_VerificationState_enum_name     = "VerificationState"
+)
+
+// Names for google.protobuf.ExtensionRangeOptions.Declaration.
+const (
+	ExtensionRangeOptions_Declaration_message_name     protoreflect.Name     = "Declaration"
+	ExtensionRangeOptions_Declaration_message_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration"
+)
+
+// Field names for google.protobuf.ExtensionRangeOptions.Declaration.
+const (
+	ExtensionRangeOptions_Declaration_Number_field_name     protoreflect.Name = "number"
+	ExtensionRangeOptions_Declaration_FullName_field_name   protoreflect.Name = "full_name"
+	ExtensionRangeOptions_Declaration_Type_field_name       protoreflect.Name = "type"
+	ExtensionRangeOptions_Declaration_IsRepeated_field_name protoreflect.Name = "is_repeated"
+	ExtensionRangeOptions_Declaration_Reserved_field_name   protoreflect.Name = "reserved"
+	ExtensionRangeOptions_Declaration_Repeated_field_name   protoreflect.Name = "repeated"
+
+	ExtensionRangeOptions_Declaration_Number_field_fullname     protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.number"
+	ExtensionRangeOptions_Declaration_FullName_field_fullname   protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.full_name"
+	ExtensionRangeOptions_Declaration_Type_field_fullname       protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.type"
+	ExtensionRangeOptions_Declaration_IsRepeated_field_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.is_repeated"
+	ExtensionRangeOptions_Declaration_Reserved_field_fullname   protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.reserved"
+	ExtensionRangeOptions_Declaration_Repeated_field_fullname   protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.repeated"
+)
+
+// Field numbers for google.protobuf.ExtensionRangeOptions.Declaration.
+const (
+	ExtensionRangeOptions_Declaration_Number_field_number     protoreflect.FieldNumber = 1
+	ExtensionRangeOptions_Declaration_FullName_field_number   protoreflect.FieldNumber = 2
+	ExtensionRangeOptions_Declaration_Type_field_number       protoreflect.FieldNumber = 3
+	ExtensionRangeOptions_Declaration_IsRepeated_field_number protoreflect.FieldNumber = 4
+	ExtensionRangeOptions_Declaration_Reserved_field_number   protoreflect.FieldNumber = 5
+	ExtensionRangeOptions_Declaration_Repeated_field_number   protoreflect.FieldNumber = 6
 )
 
 // Names for google.protobuf.FieldDescriptorProto.
@@ -540,6 +585,7 @@ const (
 	FieldOptions_DebugRedact_field_name         protoreflect.Name = "debug_redact"
 	FieldOptions_Retention_field_name           protoreflect.Name = "retention"
 	FieldOptions_Target_field_name              protoreflect.Name = "target"
+	FieldOptions_Targets_field_name             protoreflect.Name = "targets"
 	FieldOptions_UninterpretedOption_field_name protoreflect.Name = "uninterpreted_option"
 
 	FieldOptions_Ctype_field_fullname               protoreflect.FullName = "google.protobuf.FieldOptions.ctype"
@@ -552,6 +598,7 @@ const (
 	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_Targets_field_fullname             protoreflect.FullName = "google.protobuf.FieldOptions.targets"
 	FieldOptions_UninterpretedOption_field_fullname protoreflect.FullName = "google.protobuf.FieldOptions.uninterpreted_option"
 )
 
@@ -567,6 +614,7 @@ const (
 	FieldOptions_DebugRedact_field_number         protoreflect.FieldNumber = 16
 	FieldOptions_Retention_field_number           protoreflect.FieldNumber = 17
 	FieldOptions_Target_field_number              protoreflect.FieldNumber = 18
+	FieldOptions_Targets_field_number             protoreflect.FieldNumber = 19
 	FieldOptions_UninterpretedOption_field_number protoreflect.FieldNumber = 999
 )
 
diff --git a/vendor/google.golang.org/protobuf/internal/genid/type_gen.go b/vendor/google.golang.org/protobuf/internal/genid/type_gen.go
index 3bc71013..e0f75fea 100644
--- a/vendor/google.golang.org/protobuf/internal/genid/type_gen.go
+++ b/vendor/google.golang.org/protobuf/internal/genid/type_gen.go
@@ -32,6 +32,7 @@ const (
 	Type_Options_field_name       protoreflect.Name = "options"
 	Type_SourceContext_field_name protoreflect.Name = "source_context"
 	Type_Syntax_field_name        protoreflect.Name = "syntax"
+	Type_Edition_field_name       protoreflect.Name = "edition"
 
 	Type_Name_field_fullname          protoreflect.FullName = "google.protobuf.Type.name"
 	Type_Fields_field_fullname        protoreflect.FullName = "google.protobuf.Type.fields"
@@ -39,6 +40,7 @@ const (
 	Type_Options_field_fullname       protoreflect.FullName = "google.protobuf.Type.options"
 	Type_SourceContext_field_fullname protoreflect.FullName = "google.protobuf.Type.source_context"
 	Type_Syntax_field_fullname        protoreflect.FullName = "google.protobuf.Type.syntax"
+	Type_Edition_field_fullname       protoreflect.FullName = "google.protobuf.Type.edition"
 )
 
 // Field numbers for google.protobuf.Type.
@@ -49,6 +51,7 @@ const (
 	Type_Options_field_number       protoreflect.FieldNumber = 4
 	Type_SourceContext_field_number protoreflect.FieldNumber = 5
 	Type_Syntax_field_number        protoreflect.FieldNumber = 6
+	Type_Edition_field_number       protoreflect.FieldNumber = 7
 )
 
 // Names for google.protobuf.Field.
@@ -121,12 +124,14 @@ const (
 	Enum_Options_field_name       protoreflect.Name = "options"
 	Enum_SourceContext_field_name protoreflect.Name = "source_context"
 	Enum_Syntax_field_name        protoreflect.Name = "syntax"
+	Enum_Edition_field_name       protoreflect.Name = "edition"
 
 	Enum_Name_field_fullname          protoreflect.FullName = "google.protobuf.Enum.name"
 	Enum_Enumvalue_field_fullname     protoreflect.FullName = "google.protobuf.Enum.enumvalue"
 	Enum_Options_field_fullname       protoreflect.FullName = "google.protobuf.Enum.options"
 	Enum_SourceContext_field_fullname protoreflect.FullName = "google.protobuf.Enum.source_context"
 	Enum_Syntax_field_fullname        protoreflect.FullName = "google.protobuf.Enum.syntax"
+	Enum_Edition_field_fullname       protoreflect.FullName = "google.protobuf.Enum.edition"
 )
 
 // Field numbers for google.protobuf.Enum.
@@ -136,6 +141,7 @@ const (
 	Enum_Options_field_number       protoreflect.FieldNumber = 3
 	Enum_SourceContext_field_number protoreflect.FieldNumber = 4
 	Enum_Syntax_field_number        protoreflect.FieldNumber = 5
+	Enum_Edition_field_number       protoreflect.FieldNumber = 6
 )
 
 // Names for google.protobuf.EnumValue.
diff --git a/vendor/google.golang.org/protobuf/internal/order/order.go b/vendor/google.golang.org/protobuf/internal/order/order.go
index 33745ed0..dea522e1 100644
--- a/vendor/google.golang.org/protobuf/internal/order/order.go
+++ b/vendor/google.golang.org/protobuf/internal/order/order.go
@@ -33,7 +33,7 @@ var (
 			return !inOneof(ox) && inOneof(oy)
 		}
 		// Fields in disjoint oneof sets are sorted by declaration index.
-		if ox != nil && oy != nil && ox != oy {
+		if inOneof(ox) && inOneof(oy) && ox != oy {
 			return ox.Index() < oy.Index()
 		}
 		// Fields sorted by field number.
diff --git a/vendor/google.golang.org/protobuf/internal/version/version.go b/vendor/google.golang.org/protobuf/internal/version/version.go
index daefe110..0999f29d 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      = 29
-	Patch      = 1
+	Minor      = 31
+	Patch      = 0
 	PreRelease = ""
 )
 
diff --git a/vendor/google.golang.org/protobuf/proto/size.go b/vendor/google.golang.org/protobuf/proto/size.go
index 554b9c6c..f1692b49 100644
--- a/vendor/google.golang.org/protobuf/proto/size.go
+++ b/vendor/google.golang.org/protobuf/proto/size.go
@@ -73,23 +73,27 @@ func (o MarshalOptions) sizeField(fd protoreflect.FieldDescriptor, value protore
 }
 
 func (o MarshalOptions) sizeList(num protowire.Number, fd protoreflect.FieldDescriptor, list protoreflect.List) (size int) {
+	sizeTag := protowire.SizeTag(num)
+
 	if fd.IsPacked() && list.Len() > 0 {
 		content := 0
 		for i, llen := 0, list.Len(); i < llen; i++ {
 			content += o.sizeSingular(num, fd.Kind(), list.Get(i))
 		}
-		return protowire.SizeTag(num) + protowire.SizeBytes(content)
+		return sizeTag + protowire.SizeBytes(content)
 	}
 
 	for i, llen := 0, list.Len(); i < llen; i++ {
-		size += protowire.SizeTag(num) + o.sizeSingular(num, fd.Kind(), list.Get(i))
+		size += sizeTag + o.sizeSingular(num, fd.Kind(), list.Get(i))
 	}
 	return size
 }
 
 func (o MarshalOptions) sizeMap(num protowire.Number, fd protoreflect.FieldDescriptor, mapv protoreflect.Map) (size int) {
+	sizeTag := protowire.SizeTag(num)
+
 	mapv.Range(func(key protoreflect.MapKey, value protoreflect.Value) bool {
-		size += protowire.SizeTag(num)
+		size += sizeTag
 		size += protowire.SizeBytes(o.sizeField(fd.MapKey(), key.Value()) + o.sizeField(fd.MapValue(), value))
 		return true
 	})
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 54ce326d..717b106f 100644
--- a/vendor/google.golang.org/protobuf/reflect/protoreflect/source_gen.go
+++ b/vendor/google.golang.org/protobuf/reflect/protoreflect/source_gen.go
@@ -363,6 +363,8 @@ func (p *SourcePath) appendFieldOptions(b []byte) []byte {
 		b = p.appendSingularField(b, "retention", nil)
 	case 18:
 		b = p.appendSingularField(b, "target", nil)
+	case 19:
+		b = p.appendRepeatedField(b, "targets", nil)
 	case 999:
 		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
 	}
@@ -418,6 +420,10 @@ func (p *SourcePath) appendExtensionRangeOptions(b []byte) []byte {
 	switch (*p)[0] {
 	case 999:
 		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
+	case 2:
+		b = p.appendRepeatedField(b, "declaration", (*SourcePath).appendExtensionRangeOptions_Declaration)
+	case 3:
+		b = p.appendSingularField(b, "verification", nil)
 	}
 	return b
 }
@@ -473,3 +479,24 @@ func (p *SourcePath) appendUninterpretedOption_NamePart(b []byte) []byte {
 	}
 	return b
 }
+
+func (p *SourcePath) appendExtensionRangeOptions_Declaration(b []byte) []byte {
+	if len(*p) == 0 {
+		return b
+	}
+	switch (*p)[0] {
+	case 1:
+		b = p.appendSingularField(b, "number", nil)
+	case 2:
+		b = p.appendSingularField(b, "full_name", nil)
+	case 3:
+		b = p.appendSingularField(b, "type", nil)
+	case 4:
+		b = p.appendSingularField(b, "is_repeated", nil)
+	case 5:
+		b = p.appendSingularField(b, "reserved", nil)
+	case 6:
+		b = p.appendSingularField(b, "repeated", nil)
+	}
+	return b
+}
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 dac5671d..04c00f73 100644
--- a/vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go
+++ b/vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go
@@ -48,6 +48,64 @@ import (
 	sync "sync"
 )
 
+// The verification state of the extension range.
+type ExtensionRangeOptions_VerificationState int32
+
+const (
+	// All the extensions of the range must be declared.
+	ExtensionRangeOptions_DECLARATION ExtensionRangeOptions_VerificationState = 0
+	ExtensionRangeOptions_UNVERIFIED  ExtensionRangeOptions_VerificationState = 1
+)
+
+// Enum value maps for ExtensionRangeOptions_VerificationState.
+var (
+	ExtensionRangeOptions_VerificationState_name = map[int32]string{
+		0: "DECLARATION",
+		1: "UNVERIFIED",
+	}
+	ExtensionRangeOptions_VerificationState_value = map[string]int32{
+		"DECLARATION": 0,
+		"UNVERIFIED":  1,
+	}
+)
+
+func (x ExtensionRangeOptions_VerificationState) Enum() *ExtensionRangeOptions_VerificationState {
+	p := new(ExtensionRangeOptions_VerificationState)
+	*p = x
+	return p
+}
+
+func (x ExtensionRangeOptions_VerificationState) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (ExtensionRangeOptions_VerificationState) Descriptor() protoreflect.EnumDescriptor {
+	return file_google_protobuf_descriptor_proto_enumTypes[0].Descriptor()
+}
+
+func (ExtensionRangeOptions_VerificationState) Type() protoreflect.EnumType {
+	return &file_google_protobuf_descriptor_proto_enumTypes[0]
+}
+
+func (x ExtensionRangeOptions_VerificationState) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *ExtensionRangeOptions_VerificationState) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = ExtensionRangeOptions_VerificationState(num)
+	return nil
+}
+
+// Deprecated: Use ExtensionRangeOptions_VerificationState.Descriptor instead.
+func (ExtensionRangeOptions_VerificationState) EnumDescriptor() ([]byte, []int) {
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{3, 0}
+}
+
 type FieldDescriptorProto_Type int32
 
 const (
@@ -137,11 +195,11 @@ func (x FieldDescriptorProto_Type) String() string {
 }
 
 func (FieldDescriptorProto_Type) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[0].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[1].Descriptor()
 }
 
 func (FieldDescriptorProto_Type) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[0]
+	return &file_google_protobuf_descriptor_proto_enumTypes[1]
 }
 
 func (x FieldDescriptorProto_Type) Number() protoreflect.EnumNumber {
@@ -197,11 +255,11 @@ func (x FieldDescriptorProto_Label) String() string {
 }
 
 func (FieldDescriptorProto_Label) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[1].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[2].Descriptor()
 }
 
 func (FieldDescriptorProto_Label) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[1]
+	return &file_google_protobuf_descriptor_proto_enumTypes[2]
 }
 
 func (x FieldDescriptorProto_Label) Number() protoreflect.EnumNumber {
@@ -258,11 +316,11 @@ func (x FileOptions_OptimizeMode) String() string {
 }
 
 func (FileOptions_OptimizeMode) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[2].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[3].Descriptor()
 }
 
 func (FileOptions_OptimizeMode) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[2]
+	return &file_google_protobuf_descriptor_proto_enumTypes[3]
 }
 
 func (x FileOptions_OptimizeMode) Number() protoreflect.EnumNumber {
@@ -288,7 +346,13 @@ type FieldOptions_CType int32
 
 const (
 	// Default mode.
-	FieldOptions_STRING       FieldOptions_CType = 0
+	FieldOptions_STRING FieldOptions_CType = 0
+	// The option [ctype=CORD] may be applied to a non-repeated field of type
+	// "bytes". It indicates that in C++, the data should be stored in a Cord
+	// instead of a string.  For very large strings, this may reduce memory
+	// fragmentation. It may also allow better performance when parsing from a
+	// Cord, or when parsing with aliasing enabled, as the parsed Cord may then
+	// alias the original buffer.
 	FieldOptions_CORD         FieldOptions_CType = 1
 	FieldOptions_STRING_PIECE FieldOptions_CType = 2
 )
@@ -318,11 +382,11 @@ func (x FieldOptions_CType) String() string {
 }
 
 func (FieldOptions_CType) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[3].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[4].Descriptor()
 }
 
 func (FieldOptions_CType) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[3]
+	return &file_google_protobuf_descriptor_proto_enumTypes[4]
 }
 
 func (x FieldOptions_CType) Number() protoreflect.EnumNumber {
@@ -380,11 +444,11 @@ func (x FieldOptions_JSType) String() string {
 }
 
 func (FieldOptions_JSType) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[4].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[5].Descriptor()
 }
 
 func (FieldOptions_JSType) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[4]
+	return &file_google_protobuf_descriptor_proto_enumTypes[5]
 }
 
 func (x FieldOptions_JSType) Number() protoreflect.EnumNumber {
@@ -442,11 +506,11 @@ func (x FieldOptions_OptionRetention) String() string {
 }
 
 func (FieldOptions_OptionRetention) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[5].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[6].Descriptor()
 }
 
 func (FieldOptions_OptionRetention) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[5]
+	return &file_google_protobuf_descriptor_proto_enumTypes[6]
 }
 
 func (x FieldOptions_OptionRetention) Number() protoreflect.EnumNumber {
@@ -526,11 +590,11 @@ func (x FieldOptions_OptionTargetType) String() string {
 }
 
 func (FieldOptions_OptionTargetType) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[6].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[7].Descriptor()
 }
 
 func (FieldOptions_OptionTargetType) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[6]
+	return &file_google_protobuf_descriptor_proto_enumTypes[7]
 }
 
 func (x FieldOptions_OptionTargetType) Number() protoreflect.EnumNumber {
@@ -588,11 +652,11 @@ func (x MethodOptions_IdempotencyLevel) String() string {
 }
 
 func (MethodOptions_IdempotencyLevel) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[7].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[8].Descriptor()
 }
 
 func (MethodOptions_IdempotencyLevel) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[7]
+	return &file_google_protobuf_descriptor_proto_enumTypes[8]
 }
 
 func (x MethodOptions_IdempotencyLevel) Number() protoreflect.EnumNumber {
@@ -652,11 +716,11 @@ func (x GeneratedCodeInfo_Annotation_Semantic) String() string {
 }
 
 func (GeneratedCodeInfo_Annotation_Semantic) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[8].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[9].Descriptor()
 }
 
 func (GeneratedCodeInfo_Annotation_Semantic) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[8]
+	return &file_google_protobuf_descriptor_proto_enumTypes[9]
 }
 
 func (x GeneratedCodeInfo_Annotation_Semantic) Number() protoreflect.EnumNumber {
@@ -1015,8 +1079,22 @@ type ExtensionRangeOptions struct {
 
 	// 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"`
+	// go/protobuf-stripping-extension-declarations
+	// Like Metadata, but we use a repeated field to hold all extension
+	// declarations. This should avoid the size increases of transforming a large
+	// extension range into small ranges in generated binaries.
+	Declaration []*ExtensionRangeOptions_Declaration `protobuf:"bytes,2,rep,name=declaration" json:"declaration,omitempty"`
+	// The verification state of the range.
+	// TODO(b/278783756): flip the default to DECLARATION once all empty ranges
+	// are marked as UNVERIFIED.
+	Verification *ExtensionRangeOptions_VerificationState `protobuf:"varint,3,opt,name=verification,enum=google.protobuf.ExtensionRangeOptions_VerificationState,def=1" json:"verification,omitempty"`
 }
 
+// Default values for ExtensionRangeOptions fields.
+const (
+	Default_ExtensionRangeOptions_Verification = ExtensionRangeOptions_UNVERIFIED
+)
+
 func (x *ExtensionRangeOptions) Reset() {
 	*x = ExtensionRangeOptions{}
 	if protoimpl.UnsafeEnabled {
@@ -1056,6 +1134,20 @@ func (x *ExtensionRangeOptions) GetUninterpretedOption() []*UninterpretedOption
 	return nil
 }
 
+func (x *ExtensionRangeOptions) GetDeclaration() []*ExtensionRangeOptions_Declaration {
+	if x != nil {
+		return x.Declaration
+	}
+	return nil
+}
+
+func (x *ExtensionRangeOptions) GetVerification() ExtensionRangeOptions_VerificationState {
+	if x != nil && x.Verification != nil {
+		return *x.Verification
+	}
+	return Default_ExtensionRangeOptions_Verification
+}
+
 // Describes a field within a message.
 type FieldDescriptorProto struct {
 	state         protoimpl.MessageState
@@ -2046,8 +2138,10 @@ type FieldOptions struct {
 
 	// The ctype option instructs the C++ code generator to use a different
 	// representation of the field than it normally would.  See the specific
-	// options below.  This option is not yet implemented in the open source
-	// release -- sorry, we'll try to include it in a future version!
+	// options below.  This option is only implemented to support use of
+	// [ctype=CORD] and [ctype=STRING] (the default) on non-repeated fields of
+	// type "bytes" in the open source release -- sorry, we'll try to include
+	// other types in a future version!
 	Ctype *FieldOptions_CType `protobuf:"varint,1,opt,name=ctype,enum=google.protobuf.FieldOptions_CType,def=0" json:"ctype,omitempty"`
 	// The packed option can be enabled for repeated primitive fields to enable
 	// a more efficient representation on the wire. Rather than repeatedly
@@ -2111,9 +2205,11 @@ type FieldOptions struct {
 	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"`
+	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"`
+	// Deprecated: Marked as deprecated in google/protobuf/descriptor.proto.
+	Target  *FieldOptions_OptionTargetType  `protobuf:"varint,18,opt,name=target,enum=google.protobuf.FieldOptions_OptionTargetType" json:"target,omitempty"`
+	Targets []FieldOptions_OptionTargetType `protobuf:"varint,19,rep,name=targets,enum=google.protobuf.FieldOptions_OptionTargetType" json:"targets,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"`
 }
@@ -2224,6 +2320,7 @@ func (x *FieldOptions) GetRetention() FieldOptions_OptionRetention {
 	return FieldOptions_RETENTION_UNKNOWN
 }
 
+// Deprecated: Marked as deprecated in google/protobuf/descriptor.proto.
 func (x *FieldOptions) GetTarget() FieldOptions_OptionTargetType {
 	if x != nil && x.Target != nil {
 		return *x.Target
@@ -2231,6 +2328,13 @@ func (x *FieldOptions) GetTarget() FieldOptions_OptionTargetType {
 	return FieldOptions_TARGET_TYPE_UNKNOWN
 }
 
+func (x *FieldOptions) GetTargets() []FieldOptions_OptionTargetType {
+	if x != nil {
+		return x.Targets
+	}
+	return nil
+}
+
 func (x *FieldOptions) GetUninterpretedOption() []*UninterpretedOption {
 	if x != nil {
 		return x.UninterpretedOption
@@ -2960,6 +3064,108 @@ func (x *DescriptorProto_ReservedRange) GetEnd() int32 {
 	return 0
 }
 
+type ExtensionRangeOptions_Declaration struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// The extension number declared within the extension range.
+	Number *int32 `protobuf:"varint,1,opt,name=number" json:"number,omitempty"`
+	// The fully-qualified name of the extension field. There must be a leading
+	// dot in front of the full name.
+	FullName *string `protobuf:"bytes,2,opt,name=full_name,json=fullName" json:"full_name,omitempty"`
+	// The fully-qualified type name of the extension field. Unlike
+	// Metadata.type, Declaration.type must have a leading dot for messages
+	// and enums.
+	Type *string `protobuf:"bytes,3,opt,name=type" json:"type,omitempty"`
+	// Deprecated. Please use "repeated".
+	//
+	// Deprecated: Marked as deprecated in google/protobuf/descriptor.proto.
+	IsRepeated *bool `protobuf:"varint,4,opt,name=is_repeated,json=isRepeated" json:"is_repeated,omitempty"`
+	// If true, indicates that the number is reserved in the extension range,
+	// and any extension field with the number will fail to compile. Set this
+	// when a declared extension field is deleted.
+	Reserved *bool `protobuf:"varint,5,opt,name=reserved" json:"reserved,omitempty"`
+	// If true, indicates that the extension must be defined as repeated.
+	// Otherwise the extension must be defined as optional.
+	Repeated *bool `protobuf:"varint,6,opt,name=repeated" json:"repeated,omitempty"`
+}
+
+func (x *ExtensionRangeOptions_Declaration) Reset() {
+	*x = ExtensionRangeOptions_Declaration{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_google_protobuf_descriptor_proto_msgTypes[23]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ExtensionRangeOptions_Declaration) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ExtensionRangeOptions_Declaration) ProtoMessage() {}
+
+func (x *ExtensionRangeOptions_Declaration) ProtoReflect() protoreflect.Message {
+	mi := &file_google_protobuf_descriptor_proto_msgTypes[23]
+	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 ExtensionRangeOptions_Declaration.ProtoReflect.Descriptor instead.
+func (*ExtensionRangeOptions_Declaration) Descriptor() ([]byte, []int) {
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{3, 0}
+}
+
+func (x *ExtensionRangeOptions_Declaration) GetNumber() int32 {
+	if x != nil && x.Number != nil {
+		return *x.Number
+	}
+	return 0
+}
+
+func (x *ExtensionRangeOptions_Declaration) GetFullName() string {
+	if x != nil && x.FullName != nil {
+		return *x.FullName
+	}
+	return ""
+}
+
+func (x *ExtensionRangeOptions_Declaration) GetType() string {
+	if x != nil && x.Type != nil {
+		return *x.Type
+	}
+	return ""
+}
+
+// Deprecated: Marked as deprecated in google/protobuf/descriptor.proto.
+func (x *ExtensionRangeOptions_Declaration) GetIsRepeated() bool {
+	if x != nil && x.IsRepeated != nil {
+		return *x.IsRepeated
+	}
+	return false
+}
+
+func (x *ExtensionRangeOptions_Declaration) GetReserved() bool {
+	if x != nil && x.Reserved != nil {
+		return *x.Reserved
+	}
+	return false
+}
+
+func (x *ExtensionRangeOptions_Declaration) GetRepeated() bool {
+	if x != nil && x.Repeated != nil {
+		return *x.Repeated
+	}
+	return false
+}
+
 // Range of reserved numeric values. Reserved values may not be used by
 // entries in the same enum. Reserved ranges may not overlap.
 //
@@ -2978,7 +3184,7 @@ type EnumDescriptorProto_EnumReservedRange struct {
 func (x *EnumDescriptorProto_EnumReservedRange) Reset() {
 	*x = EnumDescriptorProto_EnumReservedRange{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_google_protobuf_descriptor_proto_msgTypes[23]
+		mi := &file_google_protobuf_descriptor_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2991,7 +3197,7 @@ func (x *EnumDescriptorProto_EnumReservedRange) String() string {
 func (*EnumDescriptorProto_EnumReservedRange) ProtoMessage() {}
 
 func (x *EnumDescriptorProto_EnumReservedRange) ProtoReflect() protoreflect.Message {
-	mi := &file_google_protobuf_descriptor_proto_msgTypes[23]
+	mi := &file_google_protobuf_descriptor_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3038,7 +3244,7 @@ type UninterpretedOption_NamePart struct {
 func (x *UninterpretedOption_NamePart) Reset() {
 	*x = UninterpretedOption_NamePart{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_google_protobuf_descriptor_proto_msgTypes[24]
+		mi := &file_google_protobuf_descriptor_proto_msgTypes[25]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3051,7 +3257,7 @@ func (x *UninterpretedOption_NamePart) String() string {
 func (*UninterpretedOption_NamePart) ProtoMessage() {}
 
 func (x *UninterpretedOption_NamePart) ProtoReflect() protoreflect.Message {
-	mi := &file_google_protobuf_descriptor_proto_msgTypes[24]
+	mi := &file_google_protobuf_descriptor_proto_msgTypes[25]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3182,7 +3388,7 @@ type SourceCodeInfo_Location struct {
 func (x *SourceCodeInfo_Location) Reset() {
 	*x = SourceCodeInfo_Location{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_google_protobuf_descriptor_proto_msgTypes[25]
+		mi := &file_google_protobuf_descriptor_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3195,7 +3401,7 @@ func (x *SourceCodeInfo_Location) String() string {
 func (*SourceCodeInfo_Location) ProtoMessage() {}
 
 func (x *SourceCodeInfo_Location) ProtoReflect() protoreflect.Message {
-	mi := &file_google_protobuf_descriptor_proto_msgTypes[25]
+	mi := &file_google_protobuf_descriptor_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3269,7 +3475,7 @@ type GeneratedCodeInfo_Annotation struct {
 func (x *GeneratedCodeInfo_Annotation) Reset() {
 	*x = GeneratedCodeInfo_Annotation{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_google_protobuf_descriptor_proto_msgTypes[26]
+		mi := &file_google_protobuf_descriptor_proto_msgTypes[27]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3282,7 +3488,7 @@ func (x *GeneratedCodeInfo_Annotation) String() string {
 func (*GeneratedCodeInfo_Annotation) ProtoMessage() {}
 
 func (x *GeneratedCodeInfo_Annotation) ProtoReflect() protoreflect.Message {
-	mi := &file_google_protobuf_descriptor_proto_msgTypes[26]
+	mi := &file_google_protobuf_descriptor_proto_msgTypes[27]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3436,264 +3642,296 @@ var file_google_protobuf_descriptor_proto_rawDesc = []byte{
 	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,
+	0xad, 0x04, 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, 0x12, 0x59, 0x0a, 0x0b, 0x64, 0x65, 0x63, 0x6c, 0x61, 0x72, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 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,
+	0x2e, 0x44, 0x65, 0x63, 0x6c, 0x61, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x03, 0x88, 0x01,
+	0x02, 0x52, 0x0b, 0x64, 0x65, 0x63, 0x6c, 0x61, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x68,
+	0x0a, 0x0c, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0e, 0x32, 0x38, 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, 0x2e, 0x56, 0x65, 0x72,
+	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x3a, 0x0a,
+	0x55, 0x4e, 0x56, 0x45, 0x52, 0x49, 0x46, 0x49, 0x45, 0x44, 0x52, 0x0c, 0x76, 0x65, 0x72, 0x69,
+	0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0xb3, 0x01, 0x0a, 0x0b, 0x44, 0x65, 0x63,
+	0x6c, 0x61, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62,
+	0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+	0x12, 0x1b, 0x0a, 0x09, 0x66, 0x75, 0x6c, 0x6c, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a,
+	0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70,
+	0x65, 0x12, 0x23, 0x0a, 0x0b, 0x69, 0x73, 0x5f, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0a, 0x69, 0x73, 0x52, 0x65,
+	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76,
+	0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76,
+	0x65, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x18, 0x06,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x22, 0x34,
+	0x0a, 0x11, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74,
+	0x61, 0x74, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x45, 0x43, 0x4c, 0x41, 0x52, 0x41, 0x54, 0x49,
+	0x4f, 0x4e, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x4e, 0x56, 0x45, 0x52, 0x49, 0x46, 0x49,
+	0x45, 0x44, 0x10, 0x01, 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, 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,
+	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, 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, 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, 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,
+	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, 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, 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, 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, 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, 0x85, 0x09, 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, 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, 0x4a, 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, 0x42, 0x02, 0x18, 0x01, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65,
+	0x74, 0x12, 0x48, 0x0a, 0x07, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x18, 0x13, 0x20, 0x03,
+	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, 0x07, 0x74, 0x61, 0x72, 0x67, 0x65, 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,
@@ -3885,98 +4123,103 @@ 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, 9)
-var file_google_protobuf_descriptor_proto_msgTypes = make([]protoimpl.MessageInfo, 27)
+var file_google_protobuf_descriptor_proto_enumTypes = make([]protoimpl.EnumInfo, 10)
+var file_google_protobuf_descriptor_proto_msgTypes = make([]protoimpl.MessageInfo, 28)
 var file_google_protobuf_descriptor_proto_goTypes = []interface{}{
-	(FieldDescriptorProto_Type)(0),                // 0: google.protobuf.FieldDescriptorProto.Type
-	(FieldDescriptorProto_Label)(0),               // 1: google.protobuf.FieldDescriptorProto.Label
-	(FileOptions_OptimizeMode)(0),                 // 2: google.protobuf.FileOptions.OptimizeMode
-	(FieldOptions_CType)(0),                       // 3: google.protobuf.FieldOptions.CType
-	(FieldOptions_JSType)(0),                      // 4: google.protobuf.FieldOptions.JSType
-	(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
+	(ExtensionRangeOptions_VerificationState)(0),  // 0: google.protobuf.ExtensionRangeOptions.VerificationState
+	(FieldDescriptorProto_Type)(0),                // 1: google.protobuf.FieldDescriptorProto.Type
+	(FieldDescriptorProto_Label)(0),               // 2: google.protobuf.FieldDescriptorProto.Label
+	(FileOptions_OptimizeMode)(0),                 // 3: google.protobuf.FileOptions.OptimizeMode
+	(FieldOptions_CType)(0),                       // 4: google.protobuf.FieldOptions.CType
+	(FieldOptions_JSType)(0),                      // 5: google.protobuf.FieldOptions.JSType
+	(FieldOptions_OptionRetention)(0),             // 6: google.protobuf.FieldOptions.OptionRetention
+	(FieldOptions_OptionTargetType)(0),            // 7: google.protobuf.FieldOptions.OptionTargetType
+	(MethodOptions_IdempotencyLevel)(0),           // 8: google.protobuf.MethodOptions.IdempotencyLevel
+	(GeneratedCodeInfo_Annotation_Semantic)(0),    // 9: google.protobuf.GeneratedCodeInfo.Annotation.Semantic
+	(*FileDescriptorSet)(nil),                     // 10: google.protobuf.FileDescriptorSet
+	(*FileDescriptorProto)(nil),                   // 11: google.protobuf.FileDescriptorProto
+	(*DescriptorProto)(nil),                       // 12: google.protobuf.DescriptorProto
+	(*ExtensionRangeOptions)(nil),                 // 13: google.protobuf.ExtensionRangeOptions
+	(*FieldDescriptorProto)(nil),                  // 14: google.protobuf.FieldDescriptorProto
+	(*OneofDescriptorProto)(nil),                  // 15: google.protobuf.OneofDescriptorProto
+	(*EnumDescriptorProto)(nil),                   // 16: google.protobuf.EnumDescriptorProto
+	(*EnumValueDescriptorProto)(nil),              // 17: google.protobuf.EnumValueDescriptorProto
+	(*ServiceDescriptorProto)(nil),                // 18: google.protobuf.ServiceDescriptorProto
+	(*MethodDescriptorProto)(nil),                 // 19: google.protobuf.MethodDescriptorProto
+	(*FileOptions)(nil),                           // 20: google.protobuf.FileOptions
+	(*MessageOptions)(nil),                        // 21: google.protobuf.MessageOptions
+	(*FieldOptions)(nil),                          // 22: google.protobuf.FieldOptions
+	(*OneofOptions)(nil),                          // 23: google.protobuf.OneofOptions
+	(*EnumOptions)(nil),                           // 24: google.protobuf.EnumOptions
+	(*EnumValueOptions)(nil),                      // 25: google.protobuf.EnumValueOptions
+	(*ServiceOptions)(nil),                        // 26: google.protobuf.ServiceOptions
+	(*MethodOptions)(nil),                         // 27: google.protobuf.MethodOptions
+	(*UninterpretedOption)(nil),                   // 28: google.protobuf.UninterpretedOption
+	(*SourceCodeInfo)(nil),                        // 29: google.protobuf.SourceCodeInfo
+	(*GeneratedCodeInfo)(nil),                     // 30: google.protobuf.GeneratedCodeInfo
+	(*DescriptorProto_ExtensionRange)(nil),        // 31: google.protobuf.DescriptorProto.ExtensionRange
+	(*DescriptorProto_ReservedRange)(nil),         // 32: google.protobuf.DescriptorProto.ReservedRange
+	(*ExtensionRangeOptions_Declaration)(nil),     // 33: google.protobuf.ExtensionRangeOptions.Declaration
+	(*EnumDescriptorProto_EnumReservedRange)(nil), // 34: google.protobuf.EnumDescriptorProto.EnumReservedRange
+	(*UninterpretedOption_NamePart)(nil),          // 35: google.protobuf.UninterpretedOption.NamePart
+	(*SourceCodeInfo_Location)(nil),               // 36: google.protobuf.SourceCodeInfo.Location
+	(*GeneratedCodeInfo_Annotation)(nil),          // 37: google.protobuf.GeneratedCodeInfo.Annotation
 }
 var file_google_protobuf_descriptor_proto_depIdxs = []int32{
-	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
-	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
-	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
-	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
+	11, // 0: google.protobuf.FileDescriptorSet.file:type_name -> google.protobuf.FileDescriptorProto
+	12, // 1: google.protobuf.FileDescriptorProto.message_type:type_name -> google.protobuf.DescriptorProto
+	16, // 2: google.protobuf.FileDescriptorProto.enum_type:type_name -> google.protobuf.EnumDescriptorProto
+	18, // 3: google.protobuf.FileDescriptorProto.service:type_name -> google.protobuf.ServiceDescriptorProto
+	14, // 4: google.protobuf.FileDescriptorProto.extension:type_name -> google.protobuf.FieldDescriptorProto
+	20, // 5: google.protobuf.FileDescriptorProto.options:type_name -> google.protobuf.FileOptions
+	29, // 6: google.protobuf.FileDescriptorProto.source_code_info:type_name -> google.protobuf.SourceCodeInfo
+	14, // 7: google.protobuf.DescriptorProto.field:type_name -> google.protobuf.FieldDescriptorProto
+	14, // 8: google.protobuf.DescriptorProto.extension:type_name -> google.protobuf.FieldDescriptorProto
+	12, // 9: google.protobuf.DescriptorProto.nested_type:type_name -> google.protobuf.DescriptorProto
+	16, // 10: google.protobuf.DescriptorProto.enum_type:type_name -> google.protobuf.EnumDescriptorProto
+	31, // 11: google.protobuf.DescriptorProto.extension_range:type_name -> google.protobuf.DescriptorProto.ExtensionRange
+	15, // 12: google.protobuf.DescriptorProto.oneof_decl:type_name -> google.protobuf.OneofDescriptorProto
+	21, // 13: google.protobuf.DescriptorProto.options:type_name -> google.protobuf.MessageOptions
+	32, // 14: google.protobuf.DescriptorProto.reserved_range:type_name -> google.protobuf.DescriptorProto.ReservedRange
+	28, // 15: google.protobuf.ExtensionRangeOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	33, // 16: google.protobuf.ExtensionRangeOptions.declaration:type_name -> google.protobuf.ExtensionRangeOptions.Declaration
+	0,  // 17: google.protobuf.ExtensionRangeOptions.verification:type_name -> google.protobuf.ExtensionRangeOptions.VerificationState
+	2,  // 18: google.protobuf.FieldDescriptorProto.label:type_name -> google.protobuf.FieldDescriptorProto.Label
+	1,  // 19: google.protobuf.FieldDescriptorProto.type:type_name -> google.protobuf.FieldDescriptorProto.Type
+	22, // 20: google.protobuf.FieldDescriptorProto.options:type_name -> google.protobuf.FieldOptions
+	23, // 21: google.protobuf.OneofDescriptorProto.options:type_name -> google.protobuf.OneofOptions
+	17, // 22: google.protobuf.EnumDescriptorProto.value:type_name -> google.protobuf.EnumValueDescriptorProto
+	24, // 23: google.protobuf.EnumDescriptorProto.options:type_name -> google.protobuf.EnumOptions
+	34, // 24: google.protobuf.EnumDescriptorProto.reserved_range:type_name -> google.protobuf.EnumDescriptorProto.EnumReservedRange
+	25, // 25: google.protobuf.EnumValueDescriptorProto.options:type_name -> google.protobuf.EnumValueOptions
+	19, // 26: google.protobuf.ServiceDescriptorProto.method:type_name -> google.protobuf.MethodDescriptorProto
+	26, // 27: google.protobuf.ServiceDescriptorProto.options:type_name -> google.protobuf.ServiceOptions
+	27, // 28: google.protobuf.MethodDescriptorProto.options:type_name -> google.protobuf.MethodOptions
+	3,  // 29: google.protobuf.FileOptions.optimize_for:type_name -> google.protobuf.FileOptions.OptimizeMode
+	28, // 30: google.protobuf.FileOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	28, // 31: google.protobuf.MessageOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	4,  // 32: google.protobuf.FieldOptions.ctype:type_name -> google.protobuf.FieldOptions.CType
+	5,  // 33: google.protobuf.FieldOptions.jstype:type_name -> google.protobuf.FieldOptions.JSType
+	6,  // 34: google.protobuf.FieldOptions.retention:type_name -> google.protobuf.FieldOptions.OptionRetention
+	7,  // 35: google.protobuf.FieldOptions.target:type_name -> google.protobuf.FieldOptions.OptionTargetType
+	7,  // 36: google.protobuf.FieldOptions.targets:type_name -> google.protobuf.FieldOptions.OptionTargetType
+	28, // 37: google.protobuf.FieldOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	28, // 38: google.protobuf.OneofOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	28, // 39: google.protobuf.EnumOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	28, // 40: google.protobuf.EnumValueOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	28, // 41: google.protobuf.ServiceOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	8,  // 42: google.protobuf.MethodOptions.idempotency_level:type_name -> google.protobuf.MethodOptions.IdempotencyLevel
+	28, // 43: google.protobuf.MethodOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	35, // 44: google.protobuf.UninterpretedOption.name:type_name -> google.protobuf.UninterpretedOption.NamePart
+	36, // 45: google.protobuf.SourceCodeInfo.location:type_name -> google.protobuf.SourceCodeInfo.Location
+	37, // 46: google.protobuf.GeneratedCodeInfo.annotation:type_name -> google.protobuf.GeneratedCodeInfo.Annotation
+	13, // 47: google.protobuf.DescriptorProto.ExtensionRange.options:type_name -> google.protobuf.ExtensionRangeOptions
+	9,  // 48: google.protobuf.GeneratedCodeInfo.Annotation.semantic:type_name -> google.protobuf.GeneratedCodeInfo.Annotation.Semantic
+	49, // [49:49] is the sub-list for method output_type
+	49, // [49:49] is the sub-list for method input_type
+	49, // [49:49] is the sub-list for extension type_name
+	49, // [49:49] is the sub-list for extension extendee
+	0,  // [0:49] is the sub-list for field type_name
 }
 
 func init() { file_google_protobuf_descriptor_proto_init() }
@@ -4280,7 +4523,7 @@ func file_google_protobuf_descriptor_proto_init() {
 			}
 		}
 		file_google_protobuf_descriptor_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EnumDescriptorProto_EnumReservedRange); i {
+			switch v := v.(*ExtensionRangeOptions_Declaration); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4292,7 +4535,7 @@ func file_google_protobuf_descriptor_proto_init() {
 			}
 		}
 		file_google_protobuf_descriptor_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UninterpretedOption_NamePart); i {
+			switch v := v.(*EnumDescriptorProto_EnumReservedRange); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4304,7 +4547,7 @@ func file_google_protobuf_descriptor_proto_init() {
 			}
 		}
 		file_google_protobuf_descriptor_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SourceCodeInfo_Location); i {
+			switch v := v.(*UninterpretedOption_NamePart); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4316,6 +4559,18 @@ func file_google_protobuf_descriptor_proto_init() {
 			}
 		}
 		file_google_protobuf_descriptor_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SourceCodeInfo_Location); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GeneratedCodeInfo_Annotation); i {
 			case 0:
 				return &v.state
@@ -4333,8 +4588,8 @@ func file_google_protobuf_descriptor_proto_init() {
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_google_protobuf_descriptor_proto_rawDesc,
-			NumEnums:      9,
-			NumMessages:   27,
+			NumEnums:      10,
+			NumMessages:   28,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/vendor/modernc.org/libc/build_all_targets.sh b/vendor/modernc.org/libc/build_all_targets.sh
index 3fb79cf4..6d278e41 100644
--- a/vendor/modernc.org/libc/build_all_targets.sh
+++ b/vendor/modernc.org/libc/build_all_targets.sh
@@ -2,42 +2,67 @@ set -e
 for tag in none dmesg libc.membrk libc.memgrind
 do
 	echo "-tags=$tag"
+	echo "GOOS=darwin GOARCH=amd64"
 	GOOS=darwin GOARCH=amd64 go build -tags=$tag -v ./...
 	GOOS=darwin GOARCH=amd64 go test -tags=$tag -c -o /dev/null
+	echo "GOOS=darwin GOARCH=arm64"
 	GOOS=darwin GOARCH=arm64 go build -tags=$tag -v ./...
 	GOOS=darwin GOARCH=arm64 go test -tags=$tag -c -o /dev/null
+	echo "GOOS=freebsd GOARCH=386"
 	GOOS=freebsd GOARCH=386 go build -tags=$tag -v ./...
 	GOOS=freebsd GOARCH=386 go test -tags=$tag -c -o /dev/null
+	echo "GOOS=freebsd GOARCH=amd64"
 	GOOS=freebsd GOARCH=amd64 go build -tags=$tag -v ./...
 	GOOS=freebsd GOARCH=amd64 go test -tags=$tag -c -o /dev/null
+	echo "GOOS=freebsd GOARCH=arm"
 	GOOS=freebsd GOARCH=arm go build -tags=$tag -v ./...
 	GOOS=freebsd GOARCH=arm go test -tags=$tag -c -o /dev/null
+	echo "GOOS=linux GOARCH=386"
 	GOOS=linux GOARCH=386 go build -tags=$tag -v ./...
 	GOOS=linux GOARCH=386 go test -tags=$tag -c -o /dev/null
+	echo "GOOS=linux GOARCH=amd64"
 	GOOS=linux GOARCH=amd64 go build -tags=$tag -v ./...
 	GOOS=linux GOARCH=amd64 go test -tags=$tag -c -o /dev/null
+	echo "GOOS=linux GOARCH=arm"
 	GOOS=linux GOARCH=arm go build -tags=$tag -v ./...
 	GOOS=linux GOARCH=arm go test -tags=$tag -c -o /dev/null
+	echo "GOOS=linux GOARCH=arm64"
 	GOOS=linux GOARCH=arm64 go build -tags=$tag -v ./...
 	GOOS=linux GOARCH=arm64 go test -tags=$tag -c -o /dev/null
+	echo "GOOS=linux GOARCH=loong64"
+	GOOS=linux GOARCH=loong64 go build -tags=$tag -v ./...
+	GOOS=linux GOARCH=loong64 go test -tags=$tag -c -o /dev/null
+	echo "GOOS=linux GOARCH=ppc64le"
+	GOOS=linux GOARCH=ppc64le go build -tags=$tag -v ./...
 	GOOS=linux GOARCH=ppc64le go test -tags=$tag -c -o /dev/null
+	echo "GOOS=linux GOARCH=riscv64"
 	GOOS=linux GOARCH=riscv64 go build -tags=$tag -v ./...
+	GOOS=linux GOARCH=riscv64 go test -tags=$tag -c -o /dev/null
+	echo "GOOS=linux GOARCH=s390x"
 	GOOS=linux GOARCH=s390x go build -tags=$tag -v ./...
 	GOOS=linux GOARCH=s390x go test -tags=$tag -c -o /dev/null
+	echo "GOOS=netbsd GOARCH=amd64"
 	GOOS=netbsd GOARCH=amd64 go build -tags=$tag -v ./...
 	GOOS=netbsd GOARCH=amd64 go test -tags=$tag -c -o /dev/null
+	echo "GOOS=netbsd GOARCH=arm"
 	GOOS=netbsd GOARCH=arm go build -tags=$tag -v ./...
 	GOOS=netbsd GOARCH=arm go test -tags=$tag -c -o /dev/null
+	echo "GOOS=openbsd GOARCH=386"
 	GOOS=openbsd GOARCH=386 go build -tags=$tag -v ./...
 	GOOS=openbsd GOARCH=386 go test -tags=$tag -c -o /dev/null
+	echo "GOOS=openbsd GOARCH=amd64"
 	GOOS=openbsd GOARCH=amd64 go build -tags=$tag -v ./...
 	GOOS=openbsd GOARCH=amd64 go test -tags=$tag -c -o /dev/null
+	echo "GOOS=openbsd GOARCH=arm64"
 	GOOS=openbsd GOARCH=arm64 go build -tags=$tag -v ./...
 	GOOS=openbsd GOARCH=arm64 go test -tags=$tag -c -o /dev/null
+	echo "GOOS=windows GOARCH=386"
 	GOOS=windows GOARCH=386 go build -tags=$tag -v ./...
 	GOOS=windows GOARCH=386 go test -tags=$tag -c -o /dev/null
+	echo "GOOS=windows GOARCH=amd64"
 	GOOS=windows GOARCH=amd64 go build -tags=$tag -v ./...
 	GOOS=windows GOARCH=amd64 go test -tags=$tag -c -o /dev/null
+	echo "GOOS=windows GOARCH=arm64"
 	GOOS=windows GOARCH=arm64 go build -tags=$tag -v ./...
 	GOOS=windows GOARCH=arm64 go test -tags=$tag -c -o /dev/null
 done
diff --git a/vendor/modernc.org/libc/capi_freebsd_386.go b/vendor/modernc.org/libc/capi_freebsd_386.go
index fb198405..49a67bff 100644
--- a/vendor/modernc.org/libc/capi_freebsd_386.go
+++ b/vendor/modernc.org/libc/capi_freebsd_386.go
@@ -343,6 +343,7 @@ var CAPI = map[string]struct{}{
 	"poll":                             {},
 	"popen":                            {},
 	"pow":                              {},
+	"pread":                            {},
 	"printf":                           {},
 	"pselect":                          {},
 	"pthread_attr_destroy":             {},
diff --git a/vendor/modernc.org/libc/capi_freebsd_amd64.go b/vendor/modernc.org/libc/capi_freebsd_amd64.go
index fb198405..49a67bff 100644
--- a/vendor/modernc.org/libc/capi_freebsd_amd64.go
+++ b/vendor/modernc.org/libc/capi_freebsd_amd64.go
@@ -343,6 +343,7 @@ var CAPI = map[string]struct{}{
 	"poll":                             {},
 	"popen":                            {},
 	"pow":                              {},
+	"pread":                            {},
 	"printf":                           {},
 	"pselect":                          {},
 	"pthread_attr_destroy":             {},
diff --git a/vendor/modernc.org/libc/capi_freebsd_arm.go b/vendor/modernc.org/libc/capi_freebsd_arm.go
index fb198405..49a67bff 100644
--- a/vendor/modernc.org/libc/capi_freebsd_arm.go
+++ b/vendor/modernc.org/libc/capi_freebsd_arm.go
@@ -343,6 +343,7 @@ var CAPI = map[string]struct{}{
 	"poll":                             {},
 	"popen":                            {},
 	"pow":                              {},
+	"pread":                            {},
 	"printf":                           {},
 	"pselect":                          {},
 	"pthread_attr_destroy":             {},
diff --git a/vendor/modernc.org/libc/capi_freebsd_arm64.go b/vendor/modernc.org/libc/capi_freebsd_arm64.go
index fb198405..49a67bff 100644
--- a/vendor/modernc.org/libc/capi_freebsd_arm64.go
+++ b/vendor/modernc.org/libc/capi_freebsd_arm64.go
@@ -343,6 +343,7 @@ var CAPI = map[string]struct{}{
 	"poll":                             {},
 	"popen":                            {},
 	"pow":                              {},
+	"pread":                            {},
 	"printf":                           {},
 	"pselect":                          {},
 	"pthread_attr_destroy":             {},
diff --git a/vendor/modernc.org/libc/capi_linux_386.go b/vendor/modernc.org/libc/capi_linux_386.go
index 47cef2b5..98263426 100644
--- a/vendor/modernc.org/libc/capi_linux_386.go
+++ b/vendor/modernc.org/libc/capi_linux_386.go
@@ -339,6 +339,7 @@ var CAPI = map[string]struct{}{
 	"popen":                            {},
 	"posix_fadvise":                    {},
 	"pow":                              {},
+	"pread":                            {},
 	"printf":                           {},
 	"pselect":                          {},
 	"pthread_attr_destroy":             {},
diff --git a/vendor/modernc.org/libc/capi_linux_amd64.go b/vendor/modernc.org/libc/capi_linux_amd64.go
index 3741ba1f..c1ae9d02 100644
--- a/vendor/modernc.org/libc/capi_linux_amd64.go
+++ b/vendor/modernc.org/libc/capi_linux_amd64.go
@@ -350,6 +350,7 @@ var CAPI = map[string]struct{}{
 	"popen":                            {},
 	"posix_fadvise":                    {},
 	"pow":                              {},
+	"pread":                            {},
 	"printf":                           {},
 	"pselect":                          {},
 	"pthread_attr_destroy":             {},
diff --git a/vendor/modernc.org/libc/capi_linux_arm.go b/vendor/modernc.org/libc/capi_linux_arm.go
index 47cef2b5..98263426 100644
--- a/vendor/modernc.org/libc/capi_linux_arm.go
+++ b/vendor/modernc.org/libc/capi_linux_arm.go
@@ -339,6 +339,7 @@ var CAPI = map[string]struct{}{
 	"popen":                            {},
 	"posix_fadvise":                    {},
 	"pow":                              {},
+	"pread":                            {},
 	"printf":                           {},
 	"pselect":                          {},
 	"pthread_attr_destroy":             {},
diff --git a/vendor/modernc.org/libc/capi_linux_arm64.go b/vendor/modernc.org/libc/capi_linux_arm64.go
index 47cef2b5..98263426 100644
--- a/vendor/modernc.org/libc/capi_linux_arm64.go
+++ b/vendor/modernc.org/libc/capi_linux_arm64.go
@@ -339,6 +339,7 @@ var CAPI = map[string]struct{}{
 	"popen":                            {},
 	"posix_fadvise":                    {},
 	"pow":                              {},
+	"pread":                            {},
 	"printf":                           {},
 	"pselect":                          {},
 	"pthread_attr_destroy":             {},
diff --git a/vendor/modernc.org/libc/capi_linux_loong64.go b/vendor/modernc.org/libc/capi_linux_loong64.go
new file mode 100644
index 00000000..c1ae9d02
--- /dev/null
+++ b/vendor/modernc.org/libc/capi_linux_loong64.go
@@ -0,0 +1,528 @@
+// Code generated by 'go generate' - DO NOT EDIT.
+
+package libc // import "modernc.org/libc"
+
+var CAPI = map[string]struct{}{
+	"_IO_putc":                         {},
+	"___errno_location":                {},
+	"__assert_fail":                    {},
+	"__builtin___memcpy_chk":           {},
+	"__builtin___memmove_chk":          {},
+	"__builtin___memset_chk":           {},
+	"__builtin___snprintf_chk":         {},
+	"__builtin___sprintf_chk":          {},
+	"__builtin___strcat_chk":           {},
+	"__builtin___strcpy_chk":           {},
+	"__builtin___strncpy_chk":          {},
+	"__builtin___vsnprintf_chk":        {},
+	"__builtin_abort":                  {},
+	"__builtin_abs":                    {},
+	"__builtin_add_overflowInt64":      {},
+	"__builtin_add_overflowUint32":     {},
+	"__builtin_add_overflowUint64":     {},
+	"__builtin_bswap16":                {},
+	"__builtin_bswap32":                {},
+	"__builtin_bswap64":                {},
+	"__builtin_bzero":                  {},
+	"__builtin_clz":                    {},
+	"__builtin_clzl":                   {},
+	"__builtin_clzll":                  {},
+	"__builtin_constant_p_impl":        {},
+	"__builtin_copysign":               {},
+	"__builtin_copysignf":              {},
+	"__builtin_copysignl":              {},
+	"__builtin_exit":                   {},
+	"__builtin_expect":                 {},
+	"__builtin_fabs":                   {},
+	"__builtin_fabsf":                  {},
+	"__builtin_fabsl":                  {},
+	"__builtin_free":                   {},
+	"__builtin_getentropy":             {},
+	"__builtin_huge_val":               {},
+	"__builtin_huge_valf":              {},
+	"__builtin_inf":                    {},
+	"__builtin_inff":                   {},
+	"__builtin_infl":                   {},
+	"__builtin_isnan":                  {},
+	"__builtin_isunordered":            {},
+	"__builtin_llabs":                  {},
+	"__builtin_malloc":                 {},
+	"__builtin_memcmp":                 {},
+	"__builtin_memcpy":                 {},
+	"__builtin_memset":                 {},
+	"__builtin_mmap":                   {},
+	"__builtin_mul_overflowInt64":      {},
+	"__builtin_mul_overflowUint128":    {},
+	"__builtin_mul_overflowUint64":     {},
+	"__builtin_nan":                    {},
+	"__builtin_nanf":                   {},
+	"__builtin_nanl":                   {},
+	"__builtin_object_size":            {},
+	"__builtin_popcount":               {},
+	"__builtin_popcountl":              {},
+	"__builtin_prefetch":               {},
+	"__builtin_printf":                 {},
+	"__builtin_snprintf":               {},
+	"__builtin_sprintf":                {},
+	"__builtin_strchr":                 {},
+	"__builtin_strcmp":                 {},
+	"__builtin_strcpy":                 {},
+	"__builtin_strlen":                 {},
+	"__builtin_sub_overflowInt64":      {},
+	"__builtin_trap":                   {},
+	"__builtin_unreachable":            {},
+	"__ccgo_dmesg":                     {},
+	"__ccgo_getMutexType":              {},
+	"__ccgo_in6addr_anyp":              {},
+	"__ccgo_pthreadAttrGetDetachState": {},
+	"__ccgo_pthreadMutexattrGettype":   {},
+	"__ccgo_sqlite3_log":               {},
+	"__cmsg_nxthdr":                    {},
+	"__ctype_b_loc":                    {},
+	"__ctype_get_mb_cur_max":           {},
+	"__errno_location":                 {},
+	"__floatscan":                      {},
+	"__fpclassify":                     {},
+	"__fpclassifyf":                    {},
+	"__fpclassifyl":                    {},
+	"__fsmu8":                          {},
+	"__h_errno_location":               {},
+	"__inet_aton":                      {},
+	"__intscan":                        {},
+	"__isalnum_l":                      {},
+	"__isalpha_l":                      {},
+	"__isdigit_l":                      {},
+	"__islower_l":                      {},
+	"__isnan":                          {},
+	"__isnanf":                         {},
+	"__isnanl":                         {},
+	"__isoc99_sscanf":                  {},
+	"__isprint_l":                      {},
+	"__isupper_l":                      {},
+	"__isxdigit_l":                     {},
+	"__lockfile":                       {},
+	"__lookup_ipliteral":               {},
+	"__lookup_name":                    {},
+	"__lookup_serv":                    {},
+	"__shgetc":                         {},
+	"__shlim":                          {},
+	"__strncasecmp_l":                  {},
+	"__sync_add_and_fetch_uint32":      {},
+	"__sync_sub_and_fetch_uint32":      {},
+	"__syscall1":                       {},
+	"__syscall3":                       {},
+	"__syscall4":                       {},
+	"__toread":                         {},
+	"__toread_needs_stdio_exit":        {},
+	"__uflow":                          {},
+	"__unlockfile":                     {},
+	"_exit":                            {},
+	"_longjmp":                         {},
+	"_obstack_begin":                   {},
+	"_obstack_newchunk":                {},
+	"_setjmp":                          {},
+	"abort":                            {},
+	"abs":                              {},
+	"accept":                           {},
+	"access":                           {},
+	"acos":                             {},
+	"acosh":                            {},
+	"alarm":                            {},
+	"asin":                             {},
+	"asinh":                            {},
+	"atan":                             {},
+	"atan2":                            {},
+	"atanh":                            {},
+	"atexit":                           {},
+	"atof":                             {},
+	"atoi":                             {},
+	"atol":                             {},
+	"backtrace":                        {},
+	"backtrace_symbols_fd":             {},
+	"bind":                             {},
+	"bsearch":                          {},
+	"bzero":                            {},
+	"calloc":                           {},
+	"ceil":                             {},
+	"ceilf":                            {},
+	"cfgetospeed":                      {},
+	"cfsetispeed":                      {},
+	"cfsetospeed":                      {},
+	"chdir":                            {},
+	"chmod":                            {},
+	"chown":                            {},
+	"clock_gettime":                    {},
+	"close":                            {},
+	"closedir":                         {},
+	"confstr":                          {},
+	"connect":                          {},
+	"copysign":                         {},
+	"copysignf":                        {},
+	"copysignl":                        {},
+	"cos":                              {},
+	"cosf":                             {},
+	"cosh":                             {},
+	"ctime":                            {},
+	"ctime_r":                          {},
+	"dlclose":                          {},
+	"dlerror":                          {},
+	"dlopen":                           {},
+	"dlsym":                            {},
+	"dup2":                             {},
+	"dup3":                             {},
+	"endpwent":                         {},
+	"environ":                          {},
+	"execvp":                           {},
+	"exit":                             {},
+	"exp":                              {},
+	"fabs":                             {},
+	"fabsf":                            {},
+	"fabsl":                            {},
+	"faccessat":                        {},
+	"fchmod":                           {},
+	"fchmodat":                         {},
+	"fchown":                           {},
+	"fchownat":                         {},
+	"fclose":                           {},
+	"fcntl":                            {},
+	"fcntl64":                          {},
+	"fdopen":                           {},
+	"ferror":                           {},
+	"fflush":                           {},
+	"fgetc":                            {},
+	"fgets":                            {},
+	"fileno":                           {},
+	"floor":                            {},
+	"fmod":                             {},
+	"fmodl":                            {},
+	"fopen":                            {},
+	"fopen64":                          {},
+	"fork":                             {},
+	"fprintf":                          {},
+	"fputc":                            {},
+	"fputs":                            {},
+	"fread":                            {},
+	"free":                             {},
+	"freeaddrinfo":                     {},
+	"frexp":                            {},
+	"fscanf":                           {},
+	"fseek":                            {},
+	"fstat":                            {},
+	"fstat64":                          {},
+	"fstatfs":                          {},
+	"fsync":                            {},
+	"ftell":                            {},
+	"ftruncate":                        {},
+	"ftruncate64":                      {},
+	"fts64_close":                      {},
+	"fts64_open":                       {},
+	"fts64_read":                       {},
+	"fts_close":                        {},
+	"fts_open":                         {},
+	"fts_read":                         {},
+	"fwrite":                           {},
+	"gai_strerror":                     {},
+	"getaddrinfo":                      {},
+	"getc":                             {},
+	"getcwd":                           {},
+	"getegid":                          {},
+	"getentropy":                       {},
+	"getenv":                           {},
+	"geteuid":                          {},
+	"getgid":                           {},
+	"getgrgid":                         {},
+	"getgrgid_r":                       {},
+	"getgrnam":                         {},
+	"getgrnam_r":                       {},
+	"gethostbyaddr":                    {},
+	"gethostbyaddr_r":                  {},
+	"gethostbyname":                    {},
+	"gethostbyname2":                   {},
+	"gethostbyname2_r":                 {},
+	"gethostbyname_r":                  {},
+	"gethostname":                      {},
+	"getnameinfo":                      {},
+	"getpeername":                      {},
+	"getpid":                           {},
+	"getpwnam":                         {},
+	"getpwnam_r":                       {},
+	"getpwuid":                         {},
+	"getpwuid_r":                       {},
+	"getrandom":                        {},
+	"getresgid":                        {},
+	"getresuid":                        {},
+	"getrlimit":                        {},
+	"getrlimit64":                      {},
+	"getrusage":                        {},
+	"getservbyname":                    {},
+	"getsockname":                      {},
+	"getsockopt":                       {},
+	"gettimeofday":                     {},
+	"getuid":                           {},
+	"gmtime_r":                         {},
+	"h_errno":                          {},
+	"htonl":                            {},
+	"htons":                            {},
+	"hypot":                            {},
+	"inet_ntoa":                        {},
+	"inet_ntop":                        {},
+	"inet_pton":                        {},
+	"initstate":                        {},
+	"initstate_r":                      {},
+	"ioctl":                            {},
+	"isalnum":                          {},
+	"isalpha":                          {},
+	"isascii":                          {},
+	"isatty":                           {},
+	"isdigit":                          {},
+	"islower":                          {},
+	"isnan":                            {},
+	"isnanf":                           {},
+	"isnanl":                           {},
+	"isprint":                          {},
+	"isupper":                          {},
+	"iswalnum":                         {},
+	"iswspace":                         {},
+	"isxdigit":                         {},
+	"kill":                             {},
+	"ldexp":                            {},
+	"link":                             {},
+	"linkat":                           {},
+	"listen":                           {},
+	"llabs":                            {},
+	"localeconv":                       {},
+	"localtime":                        {},
+	"localtime_r":                      {},
+	"log":                              {},
+	"log10":                            {},
+	"log2":                             {},
+	"longjmp":                          {},
+	"lrand48":                          {},
+	"lseek":                            {},
+	"lseek64":                          {},
+	"lstat":                            {},
+	"lstat64":                          {},
+	"malloc":                           {},
+	"mblen":                            {},
+	"mbrtowc":                          {},
+	"mbsinit":                          {},
+	"mbstowcs":                         {},
+	"mbtowc":                           {},
+	"memchr":                           {},
+	"memcmp":                           {},
+	"memcpy":                           {},
+	"memmove":                          {},
+	"memset":                           {},
+	"mkdir":                            {},
+	"mkdirat":                          {},
+	"mkfifo":                           {},
+	"mknod":                            {},
+	"mknodat":                          {},
+	"mkostemp":                         {},
+	"mkstemp":                          {},
+	"mkstemp64":                        {},
+	"mkstemps":                         {},
+	"mkstemps64":                       {},
+	"mktime":                           {},
+	"mmap":                             {},
+	"mmap64":                           {},
+	"modf":                             {},
+	"mremap":                           {},
+	"munmap":                           {},
+	"nanf":                             {},
+	"nanosleep":                        {},
+	"nl_langinfo":                      {},
+	"ntohs":                            {},
+	"obstack_free":                     {},
+	"obstack_vprintf":                  {},
+	"open":                             {},
+	"open64":                           {},
+	"openat":                           {},
+	"opendir":                          {},
+	"openpty":                          {},
+	"pathconf":                         {},
+	"pause":                            {},
+	"pclose":                           {},
+	"perror":                           {},
+	"pipe":                             {},
+	"pipe2":                            {},
+	"poll":                             {},
+	"popen":                            {},
+	"posix_fadvise":                    {},
+	"pow":                              {},
+	"pread":                            {},
+	"printf":                           {},
+	"pselect":                          {},
+	"pthread_attr_destroy":             {},
+	"pthread_attr_getdetachstate":      {},
+	"pthread_attr_init":                {},
+	"pthread_attr_setdetachstate":      {},
+	"pthread_attr_setscope":            {},
+	"pthread_attr_setstacksize":        {},
+	"pthread_cond_broadcast":           {},
+	"pthread_cond_destroy":             {},
+	"pthread_cond_init":                {},
+	"pthread_cond_signal":              {},
+	"pthread_cond_timedwait":           {},
+	"pthread_cond_wait":                {},
+	"pthread_create":                   {},
+	"pthread_detach":                   {},
+	"pthread_equal":                    {},
+	"pthread_exit":                     {},
+	"pthread_getspecific":              {},
+	"pthread_join":                     {},
+	"pthread_key_create":               {},
+	"pthread_key_delete":               {},
+	"pthread_mutex_destroy":            {},
+	"pthread_mutex_init":               {},
+	"pthread_mutex_lock":               {},
+	"pthread_mutex_trylock":            {},
+	"pthread_mutex_unlock":             {},
+	"pthread_mutexattr_destroy":        {},
+	"pthread_mutexattr_init":           {},
+	"pthread_mutexattr_settype":        {},
+	"pthread_self":                     {},
+	"pthread_setspecific":              {},
+	"putc":                             {},
+	"putchar":                          {},
+	"puts":                             {},
+	"pwrite":                           {},
+	"qsort":                            {},
+	"raise":                            {},
+	"rand":                             {},
+	"rand_r":                           {},
+	"random":                           {},
+	"random_r":                         {},
+	"read":                             {},
+	"readdir":                          {},
+	"readdir64":                        {},
+	"readlink":                         {},
+	"readlinkat":                       {},
+	"readv":                            {},
+	"realloc":                          {},
+	"reallocarray":                     {},
+	"realpath":                         {},
+	"recv":                             {},
+	"recvfrom":                         {},
+	"recvmsg":                          {},
+	"remove":                           {},
+	"rename":                           {},
+	"renameat2":                        {},
+	"rewind":                           {},
+	"rindex":                           {},
+	"rint":                             {},
+	"rmdir":                            {},
+	"round":                            {},
+	"scalbn":                           {},
+	"scalbnl":                          {},
+	"sched_yield":                      {},
+	"select":                           {},
+	"send":                             {},
+	"sendmsg":                          {},
+	"sendto":                           {},
+	"setbuf":                           {},
+	"setenv":                           {},
+	"setjmp":                           {},
+	"setlocale":                        {},
+	"setrlimit":                        {},
+	"setrlimit64":                      {},
+	"setsid":                           {},
+	"setsockopt":                       {},
+	"setstate":                         {},
+	"setvbuf":                          {},
+	"shmat":                            {},
+	"shmctl":                           {},
+	"shmdt":                            {},
+	"shutdown":                         {},
+	"sigaction":                        {},
+	"signal":                           {},
+	"sin":                              {},
+	"sinf":                             {},
+	"sinh":                             {},
+	"sleep":                            {},
+	"snprintf":                         {},
+	"socket":                           {},
+	"sprintf":                          {},
+	"sqrt":                             {},
+	"srand48":                          {},
+	"sscanf":                           {},
+	"stat":                             {},
+	"stat64":                           {},
+	"stderr":                           {},
+	"stdin":                            {},
+	"stdout":                           {},
+	"strcasecmp":                       {},
+	"strcat":                           {},
+	"strchr":                           {},
+	"strcmp":                           {},
+	"strcpy":                           {},
+	"strcspn":                          {},
+	"strdup":                           {},
+	"strerror":                         {},
+	"strerror_r":                       {},
+	"strlcat":                          {},
+	"strlcpy":                          {},
+	"strlen":                           {},
+	"strncasecmp":                      {},
+	"strncat":                          {},
+	"strncmp":                          {},
+	"strncpy":                          {},
+	"strnlen":                          {},
+	"strpbrk":                          {},
+	"strrchr":                          {},
+	"strspn":                           {},
+	"strstr":                           {},
+	"strtod":                           {},
+	"strtof":                           {},
+	"strtoimax":                        {},
+	"strtok":                           {},
+	"strtol":                           {},
+	"strtold":                          {},
+	"strtoll":                          {},
+	"strtoul":                          {},
+	"strtoull":                         {},
+	"strtoumax":                        {},
+	"symlink":                          {},
+	"symlinkat":                        {},
+	"sysconf":                          {},
+	"system":                           {},
+	"tan":                              {},
+	"tanh":                             {},
+	"tcgetattr":                        {},
+	"tcsendbreak":                      {},
+	"tcsetattr":                        {},
+	"time":                             {},
+	"tmpfile":                          {},
+	"tolower":                          {},
+	"toupper":                          {},
+	"trunc":                            {},
+	"tzset":                            {},
+	"umask":                            {},
+	"uname":                            {},
+	"ungetc":                           {},
+	"unlink":                           {},
+	"unlinkat":                         {},
+	"unsetenv":                         {},
+	"usleep":                           {},
+	"utime":                            {},
+	"utimensat":                        {},
+	"utimes":                           {},
+	"uuid_copy":                        {},
+	"uuid_generate_random":             {},
+	"uuid_parse":                       {},
+	"uuid_unparse":                     {},
+	"vasprintf":                        {},
+	"vfprintf":                         {},
+	"vfscanf":                          {},
+	"vprintf":                          {},
+	"vsnprintf":                        {},
+	"vsprintf":                         {},
+	"vsscanf":                          {},
+	"waitpid":                          {},
+	"wcschr":                           {},
+	"wctomb":                           {},
+	"wcwidth":                          {},
+	"write":                            {},
+	"writev":                           {},
+	"zero_struct_address":              {},
+}
diff --git a/vendor/modernc.org/libc/capi_linux_ppc64le.go b/vendor/modernc.org/libc/capi_linux_ppc64le.go
index 3741ba1f..c1ae9d02 100644
--- a/vendor/modernc.org/libc/capi_linux_ppc64le.go
+++ b/vendor/modernc.org/libc/capi_linux_ppc64le.go
@@ -350,6 +350,7 @@ var CAPI = map[string]struct{}{
 	"popen":                            {},
 	"posix_fadvise":                    {},
 	"pow":                              {},
+	"pread":                            {},
 	"printf":                           {},
 	"pselect":                          {},
 	"pthread_attr_destroy":             {},
diff --git a/vendor/modernc.org/libc/capi_linux_riscv64.go b/vendor/modernc.org/libc/capi_linux_riscv64.go
index 6defbe83..669f86ea 100644
--- a/vendor/modernc.org/libc/capi_linux_riscv64.go
+++ b/vendor/modernc.org/libc/capi_linux_riscv64.go
@@ -341,6 +341,7 @@ var CAPI = map[string]struct{}{
 	"popen":                            {},
 	"posix_fadvise":                    {},
 	"pow":                              {},
+	"pread":                            {},
 	"printf":                           {},
 	"pselect":                          {},
 	"pthread_attr_destroy":             {},
diff --git a/vendor/modernc.org/libc/capi_linux_s390x.go b/vendor/modernc.org/libc/capi_linux_s390x.go
index 47cef2b5..98263426 100644
--- a/vendor/modernc.org/libc/capi_linux_s390x.go
+++ b/vendor/modernc.org/libc/capi_linux_s390x.go
@@ -339,6 +339,7 @@ var CAPI = map[string]struct{}{
 	"popen":                            {},
 	"posix_fadvise":                    {},
 	"pow":                              {},
+	"pread":                            {},
 	"printf":                           {},
 	"pselect":                          {},
 	"pthread_attr_destroy":             {},
diff --git a/vendor/modernc.org/libc/capi_netbsd_amd64.go b/vendor/modernc.org/libc/capi_netbsd_amd64.go
index 680fd730..7f827399 100644
--- a/vendor/modernc.org/libc/capi_netbsd_amd64.go
+++ b/vendor/modernc.org/libc/capi_netbsd_amd64.go
@@ -338,6 +338,7 @@ var CAPI = map[string]struct{}{
 	"poll":                             {},
 	"popen":                            {},
 	"pow":                              {},
+	"pread":                            {},
 	"printf":                           {},
 	"pselect":                          {},
 	"pthread_attr_destroy":             {},
diff --git a/vendor/modernc.org/libc/capi_netbsd_arm.go b/vendor/modernc.org/libc/capi_netbsd_arm.go
index 680fd730..7f827399 100644
--- a/vendor/modernc.org/libc/capi_netbsd_arm.go
+++ b/vendor/modernc.org/libc/capi_netbsd_arm.go
@@ -338,6 +338,7 @@ var CAPI = map[string]struct{}{
 	"poll":                             {},
 	"popen":                            {},
 	"pow":                              {},
+	"pread":                            {},
 	"printf":                           {},
 	"pselect":                          {},
 	"pthread_attr_destroy":             {},
diff --git a/vendor/modernc.org/libc/capi_openbsd_386.go b/vendor/modernc.org/libc/capi_openbsd_386.go
index ea4fbda9..cf0ce496 100644
--- a/vendor/modernc.org/libc/capi_openbsd_386.go
+++ b/vendor/modernc.org/libc/capi_openbsd_386.go
@@ -349,6 +349,7 @@ var CAPI = map[string]struct{}{
 	"poll":                             {},
 	"popen":                            {},
 	"pow":                              {},
+	"pread":                            {},
 	"printf":                           {},
 	"pselect":                          {},
 	"pthread_attr_destroy":             {},
diff --git a/vendor/modernc.org/libc/capi_openbsd_amd64.go b/vendor/modernc.org/libc/capi_openbsd_amd64.go
index 1c9327fc..90a27e1f 100644
--- a/vendor/modernc.org/libc/capi_openbsd_amd64.go
+++ b/vendor/modernc.org/libc/capi_openbsd_amd64.go
@@ -350,6 +350,7 @@ var CAPI = map[string]struct{}{
 	"poll":                             {},
 	"popen":                            {},
 	"pow":                              {},
+	"pread":                            {},
 	"printf":                           {},
 	"pselect":                          {},
 	"pthread_attr_destroy":             {},
diff --git a/vendor/modernc.org/libc/capi_openbsd_arm64.go b/vendor/modernc.org/libc/capi_openbsd_arm64.go
index 1c9327fc..90a27e1f 100644
--- a/vendor/modernc.org/libc/capi_openbsd_arm64.go
+++ b/vendor/modernc.org/libc/capi_openbsd_arm64.go
@@ -350,6 +350,7 @@ var CAPI = map[string]struct{}{
 	"poll":                             {},
 	"popen":                            {},
 	"pow":                              {},
+	"pread":                            {},
 	"printf":                           {},
 	"pselect":                          {},
 	"pthread_attr_destroy":             {},
diff --git a/vendor/modernc.org/libc/errno/capi_linux_loong64.go b/vendor/modernc.org/libc/errno/capi_linux_loong64.go
new file mode 100644
index 00000000..75a92265
--- /dev/null
+++ b/vendor/modernc.org/libc/errno/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo errno/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o errno/errno_linux_amd64.go -pkgname errno', DO NOT EDIT.
+
+package errno
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/errno/errno_linux_loong64.go b/vendor/modernc.org/libc/errno/errno_linux_loong64.go
new file mode 100644
index 00000000..000cb720
--- /dev/null
+++ b/vendor/modernc.org/libc/errno/errno_linux_loong64.go
@@ -0,0 +1,187 @@
+// Code generated by 'ccgo errno/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o errno/errno_linux_amd64.go -pkgname errno', DO NOT EDIT.
+
+package errno
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	E2BIG                      = 7      // errno-base.h:11:1:
+	EACCES                     = 13     // errno-base.h:17:1:
+	EADDRINUSE                 = 98     // errno.h:81:1:
+	EADDRNOTAVAIL              = 99     // errno.h:82:1:
+	EADV                       = 68     // errno.h:51:1:
+	EAFNOSUPPORT               = 97     // errno.h:80:1:
+	EAGAIN                     = 11     // errno-base.h:15:1:
+	EALREADY                   = 114    // errno.h:97:1:
+	EBADE                      = 52     // errno.h:33:1:
+	EBADF                      = 9      // errno-base.h:13:1:
+	EBADFD                     = 77     // errno.h:60:1:
+	EBADMSG                    = 74     // errno.h:57:1:
+	EBADR                      = 53     // errno.h:34:1:
+	EBADRQC                    = 56     // errno.h:37:1:
+	EBADSLT                    = 57     // errno.h:38:1:
+	EBFONT                     = 59     // errno.h:42:1:
+	EBUSY                      = 16     // errno-base.h:20:1:
+	ECANCELED                  = 125    // errno.h:109:1:
+	ECHILD                     = 10     // errno-base.h:14:1:
+	ECHRNG                     = 44     // errno.h:25:1:
+	ECOMM                      = 70     // errno.h:53:1:
+	ECONNABORTED               = 103    // errno.h:86:1:
+	ECONNREFUSED               = 111    // errno.h:94:1:
+	ECONNRESET                 = 104    // errno.h:87:1:
+	EDEADLK                    = 35     // errno.h:7:1:
+	EDEADLOCK                  = 35     // errno.h:40:1:
+	EDESTADDRREQ               = 89     // errno.h:72:1:
+	EDOM                       = 33     // errno-base.h:37:1:
+	EDOTDOT                    = 73     // errno.h:56:1:
+	EDQUOT                     = 122    // errno.h:105:1:
+	EEXIST                     = 17     // errno-base.h:21:1:
+	EFAULT                     = 14     // errno-base.h:18:1:
+	EFBIG                      = 27     // errno-base.h:31:1:
+	EHOSTDOWN                  = 112    // errno.h:95:1:
+	EHOSTUNREACH               = 113    // errno.h:96:1:
+	EHWPOISON                  = 133    // errno.h:121:1:
+	EIDRM                      = 43     // errno.h:24:1:
+	EILSEQ                     = 84     // errno.h:67:1:
+	EINPROGRESS                = 115    // errno.h:98:1:
+	EINTR                      = 4      // errno-base.h:8:1:
+	EINVAL                     = 22     // errno-base.h:26:1:
+	EIO                        = 5      // errno-base.h:9:1:
+	EISCONN                    = 106    // errno.h:89:1:
+	EISDIR                     = 21     // errno-base.h:25:1:
+	EISNAM                     = 120    // errno.h:103:1:
+	EKEYEXPIRED                = 127    // errno.h:111:1:
+	EKEYREJECTED               = 129    // errno.h:113:1:
+	EKEYREVOKED                = 128    // errno.h:112:1:
+	EL2HLT                     = 51     // errno.h:32:1:
+	EL2NSYNC                   = 45     // errno.h:26:1:
+	EL3HLT                     = 46     // errno.h:27:1:
+	EL3RST                     = 47     // errno.h:28:1:
+	ELIBACC                    = 79     // errno.h:62:1:
+	ELIBBAD                    = 80     // errno.h:63:1:
+	ELIBEXEC                   = 83     // errno.h:66:1:
+	ELIBMAX                    = 82     // errno.h:65:1:
+	ELIBSCN                    = 81     // errno.h:64:1:
+	ELNRNG                     = 48     // errno.h:29:1:
+	ELOOP                      = 40     // errno.h:21:1:
+	EMEDIUMTYPE                = 124    // errno.h:108:1:
+	EMFILE                     = 24     // errno-base.h:28:1:
+	EMLINK                     = 31     // errno-base.h:35:1:
+	EMSGSIZE                   = 90     // errno.h:73:1:
+	EMULTIHOP                  = 72     // errno.h:55:1:
+	ENAMETOOLONG               = 36     // errno.h:8:1:
+	ENAVAIL                    = 119    // errno.h:102:1:
+	ENETDOWN                   = 100    // errno.h:83:1:
+	ENETRESET                  = 102    // errno.h:85:1:
+	ENETUNREACH                = 101    // errno.h:84:1:
+	ENFILE                     = 23     // errno-base.h:27:1:
+	ENOANO                     = 55     // errno.h:36:1:
+	ENOBUFS                    = 105    // errno.h:88:1:
+	ENOCSI                     = 50     // errno.h:31:1:
+	ENODATA                    = 61     // errno.h:44:1:
+	ENODEV                     = 19     // errno-base.h:23:1:
+	ENOENT                     = 2      // errno-base.h:6:1:
+	ENOEXEC                    = 8      // errno-base.h:12:1:
+	ENOKEY                     = 126    // errno.h:110:1:
+	ENOLCK                     = 37     // errno.h:9:1:
+	ENOLINK                    = 67     // errno.h:50:1:
+	ENOMEDIUM                  = 123    // errno.h:107:1:
+	ENOMEM                     = 12     // errno-base.h:16:1:
+	ENOMSG                     = 42     // errno.h:23:1:
+	ENONET                     = 64     // errno.h:47:1:
+	ENOPKG                     = 65     // errno.h:48:1:
+	ENOPROTOOPT                = 92     // errno.h:75:1:
+	ENOSPC                     = 28     // errno-base.h:32:1:
+	ENOSR                      = 63     // errno.h:46:1:
+	ENOSTR                     = 60     // errno.h:43:1:
+	ENOSYS                     = 38     // errno.h:18:1:
+	ENOTBLK                    = 15     // errno-base.h:19:1:
+	ENOTCONN                   = 107    // errno.h:90:1:
+	ENOTDIR                    = 20     // errno-base.h:24:1:
+	ENOTEMPTY                  = 39     // errno.h:20:1:
+	ENOTNAM                    = 118    // errno.h:101:1:
+	ENOTRECOVERABLE            = 131    // errno.h:117:1:
+	ENOTSOCK                   = 88     // errno.h:71:1:
+	ENOTSUP                    = 95     // errno.h:30:1:
+	ENOTTY                     = 25     // errno-base.h:29:1:
+	ENOTUNIQ                   = 76     // errno.h:59:1:
+	ENXIO                      = 6      // errno-base.h:10:1:
+	EOPNOTSUPP                 = 95     // errno.h:78:1:
+	EOVERFLOW                  = 75     // errno.h:58:1:
+	EOWNERDEAD                 = 130    // errno.h:116:1:
+	EPERM                      = 1      // errno-base.h:5:1:
+	EPFNOSUPPORT               = 96     // errno.h:79:1:
+	EPIPE                      = 32     // errno-base.h:36:1:
+	EPROTO                     = 71     // errno.h:54:1:
+	EPROTONOSUPPORT            = 93     // errno.h:76:1:
+	EPROTOTYPE                 = 91     // errno.h:74:1:
+	ERANGE                     = 34     // errno-base.h:38:1:
+	EREMCHG                    = 78     // errno.h:61:1:
+	EREMOTE                    = 66     // errno.h:49:1:
+	EREMOTEIO                  = 121    // errno.h:104:1:
+	ERESTART                   = 85     // errno.h:68:1:
+	ERFKILL                    = 132    // errno.h:119:1:
+	EROFS                      = 30     // errno-base.h:34:1:
+	ESHUTDOWN                  = 108    // errno.h:91:1:
+	ESOCKTNOSUPPORT            = 94     // errno.h:77:1:
+	ESPIPE                     = 29     // errno-base.h:33:1:
+	ESRCH                      = 3      // errno-base.h:7:1:
+	ESRMNT                     = 69     // errno.h:52:1:
+	ESTALE                     = 116    // errno.h:99:1:
+	ESTRPIPE                   = 86     // errno.h:69:1:
+	ETIME                      = 62     // errno.h:45:1:
+	ETIMEDOUT                  = 110    // errno.h:93:1:
+	ETOOMANYREFS               = 109    // errno.h:92:1:
+	ETXTBSY                    = 26     // errno-base.h:30:1:
+	EUCLEAN                    = 117    // errno.h:100:1:
+	EUNATCH                    = 49     // errno.h:30:1:
+	EUSERS                     = 87     // errno.h:70:1:
+	EWOULDBLOCK                = 11     // errno.h:22:1:
+	EXDEV                      = 18     // errno-base.h:22:1:
+	EXFULL                     = 54     // errno.h:35:1:
+	X_ASM_GENERIC_ERRNO_BASE_H = 0      // errno-base.h:3:1:
+	X_ASM_GENERIC_ERRNO_H      = 0      // errno.h:3:1:
+	X_ATFILE_SOURCE            = 1      // features.h:342:1:
+	X_BITS_ERRNO_H             = 1      // errno.h:20:1:
+	X_DEFAULT_SOURCE           = 1      // features.h:227:1:
+	X_ERRNO_H                  = 1      // errno.h:23:1:
+	X_FEATURES_H               = 1      // features.h:19:1:
+	X_FILE_OFFSET_BITS         = 64     // <builtin>:25:1:
+	X_LP64                     = 1      // <predefined>:284:1:
+	X_POSIX_C_SOURCE           = 200809 // features.h:281:1:
+	X_POSIX_SOURCE             = 1      // features.h:279:1:
+	X_STDC_PREDEF_H            = 1      // <predefined>:162:1:
+	X_SYS_CDEFS_H              = 1      // cdefs.h:19:1:
+	Linux                      = 1      // <predefined>:231:1:
+	Unix                       = 1      // <predefined>:177:1:
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/fcntl/capi_linux_loong64.go b/vendor/modernc.org/libc/fcntl/capi_linux_loong64.go
new file mode 100644
index 00000000..9db297f1
--- /dev/null
+++ b/vendor/modernc.org/libc/fcntl/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo fcntl/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o fcntl/fcntl_linux_amd64.go -pkgname fcntl', DO NOT EDIT.
+
+package fcntl
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/fcntl/fcntl_linux_loong64.go b/vendor/modernc.org/libc/fcntl/fcntl_linux_loong64.go
new file mode 100644
index 00000000..8de6ac32
--- /dev/null
+++ b/vendor/modernc.org/libc/fcntl/fcntl_linux_loong64.go
@@ -0,0 +1,1087 @@
+// Code generated by 'ccgo fcntl/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o fcntl/fcntl_linux_amd64.go -pkgname fcntl', DO NOT EDIT.
+
+package fcntl
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	AT_EACCESS            = 0x200      // fcntl-linux.h:388:1:
+	AT_FDCWD              = -100       // fcntl-linux.h:371:1:
+	AT_REMOVEDIR          = 0x200      // fcntl-linux.h:375:1:
+	AT_SYMLINK_FOLLOW     = 0x400      // fcntl-linux.h:377:1:
+	AT_SYMLINK_NOFOLLOW   = 0x100      // fcntl-linux.h:374:1:
+	FAPPEND               = 1024       // fcntl-linux.h:304:1:
+	FASYNC                = 8192       // fcntl-linux.h:306:1:
+	FD_CLOEXEC            = 1          // fcntl-linux.h:219:1:
+	FFSYNC                = 1052672    // fcntl-linux.h:305:1:
+	FNDELAY               = 2048       // fcntl-linux.h:308:1:
+	FNONBLOCK             = 2048       // fcntl-linux.h:307:1:
+	F_DUPFD               = 0          // fcntl-linux.h:167:1:
+	F_DUPFD_CLOEXEC       = 1030       // fcntl-linux.h:214:1:
+	F_EXLCK               = 4          // fcntl-linux.h:231:1:
+	F_GETFD               = 1          // fcntl-linux.h:168:1:
+	F_GETFL               = 3          // fcntl-linux.h:170:1:
+	F_GETLK               = 5          // fcntl-linux.h:109:1:
+	F_GETLK64             = 5          // fcntl.h:29:1:
+	F_GETOWN              = 9          // fcntl-linux.h:180:1:
+	F_LOCK                = 1          // fcntl.h:238:1:
+	F_OK                  = 0          // fcntl.h:131:1:
+	F_RDLCK               = 0          // fcntl-linux.h:223:1:
+	F_SETFD               = 2          // fcntl-linux.h:169:1:
+	F_SETFL               = 4          // fcntl-linux.h:171:1:
+	F_SETLK               = 6          // fcntl-linux.h:110:1:
+	F_SETLK64             = 6          // fcntl.h:30:1:
+	F_SETLKW              = 7          // fcntl-linux.h:111:1:
+	F_SETLKW64            = 7          // fcntl.h:31:1:
+	F_SETOWN              = 8          // fcntl-linux.h:179:1:
+	F_SHLCK               = 8          // fcntl-linux.h:232:1:
+	F_TEST                = 3          // fcntl.h:240:1:
+	F_TLOCK               = 2          // fcntl.h:239:1:
+	F_ULOCK               = 0          // fcntl.h:237:1:
+	F_UNLCK               = 2          // fcntl-linux.h:225:1:
+	F_WRLCK               = 1          // fcntl-linux.h:224:1:
+	LOCK_EX               = 2          // fcntl-linux.h:238:1:
+	LOCK_NB               = 4          // fcntl-linux.h:239:1:
+	LOCK_SH               = 1          // fcntl-linux.h:237:1:
+	LOCK_UN               = 8          // fcntl-linux.h:241:1:
+	O_ACCMODE             = 0003       // fcntl-linux.h:42:1:
+	O_APPEND              = 02000      // fcntl-linux.h:59:1:
+	O_ASYNC               = 020000     // fcntl-linux.h:72:1:
+	O_CLOEXEC             = 524288     // fcntl-linux.h:144:1:
+	O_CREAT               = 0100       // fcntl-linux.h:47:1:
+	O_DIRECTORY           = 65536      // fcntl-linux.h:142:1:
+	O_DSYNC               = 4096       // fcntl-linux.h:158:1:
+	O_EXCL                = 0200       // fcntl-linux.h:50:1:
+	O_FSYNC               = 1052672    // fcntl-linux.h:70:1:
+	O_NDELAY              = 2048       // fcntl-linux.h:65:1:
+	O_NOCTTY              = 0400       // fcntl-linux.h:53:1:
+	O_NOFOLLOW            = 131072     // fcntl-linux.h:143:1:
+	O_NONBLOCK            = 04000      // fcntl-linux.h:62:1:
+	O_RDONLY              = 00         // fcntl-linux.h:43:1:
+	O_RDWR                = 02         // fcntl-linux.h:45:1:
+	O_RSYNC               = 1052672    // fcntl-linux.h:162:1:
+	O_SYNC                = 04010000   // fcntl-linux.h:68:1:
+	O_TRUNC               = 01000      // fcntl-linux.h:56:1:
+	O_WRONLY              = 01         // fcntl-linux.h:44:1:
+	POSIX_FADV_DONTNEED   = 4          // fcntl-linux.h:321:1:
+	POSIX_FADV_NOREUSE    = 5          // fcntl-linux.h:322:1:
+	POSIX_FADV_NORMAL     = 0          // fcntl-linux.h:317:1:
+	POSIX_FADV_RANDOM     = 1          // fcntl-linux.h:318:1:
+	POSIX_FADV_SEQUENTIAL = 2          // fcntl-linux.h:319:1:
+	POSIX_FADV_WILLNEED   = 3          // fcntl-linux.h:320:1:
+	R_OK                  = 4          // fcntl.h:128:1:
+	SEEK_CUR              = 1          // fcntl.h:138:1:
+	SEEK_END              = 2          // fcntl.h:139:1:
+	SEEK_SET              = 0          // fcntl.h:137:1:
+	S_IFBLK               = 24576      // fcntl.h:83:1:
+	S_IFCHR               = 8192       // fcntl.h:82:1:
+	S_IFDIR               = 16384      // fcntl.h:81:1:
+	S_IFIFO               = 4096       // fcntl.h:86:1:
+	S_IFLNK               = 40960      // fcntl.h:89:1:
+	S_IFMT                = 61440      // fcntl.h:80:1:
+	S_IFREG               = 32768      // fcntl.h:84:1:
+	S_IFSOCK              = 49152      // fcntl.h:92:1:
+	S_IRGRP               = 32         // fcntl.h:111:1:
+	S_IROTH               = 4          // fcntl.h:117:1:
+	S_IRUSR               = 256        // fcntl.h:105:1:
+	S_IRWXG               = 56         // fcntl.h:115:1:
+	S_IRWXO               = 7          // fcntl.h:121:1:
+	S_IRWXU               = 448        // fcntl.h:109:1:
+	S_ISGID               = 1024       // fcntl.h:98:1:
+	S_ISUID               = 2048       // fcntl.h:97:1:
+	S_ISVTX               = 512        // fcntl.h:102:1:
+	S_IWGRP               = 16         // fcntl.h:112:1:
+	S_IWOTH               = 2          // fcntl.h:118:1:
+	S_IWUSR               = 128        // fcntl.h:106:1:
+	S_IXGRP               = 8          // fcntl.h:113:1:
+	S_IXOTH               = 1          // fcntl.h:119:1:
+	S_IXUSR               = 64         // fcntl.h:107:1:
+	UTIME_NOW             = 1073741823 // stat.h:206:1:
+	UTIME_OMIT            = 1073741822 // stat.h:207:1:
+	W_OK                  = 2          // fcntl.h:129:1:
+	X_OK                  = 1          // fcntl.h:130:1:
+	X_ATFILE_SOURCE       = 1          // features.h:342:1:
+	X_BITS_ENDIANNESS_H   = 1          // endianness.h:2:1:
+	X_BITS_ENDIAN_H       = 1          // endian.h:20:1:
+	X_BITS_STAT_H         = 1          // stat.h:23:1:
+	X_BITS_TIME64_H       = 1          // time64.h:24:1:
+	X_BITS_TYPESIZES_H    = 1          // typesizes.h:24:1:
+	X_BITS_TYPES_H        = 1          // types.h:24:1:
+	X_DEFAULT_SOURCE      = 1          // features.h:227:1:
+	X_FCNTL_H             = 1          // fcntl.h:23:1:
+	X_FEATURES_H          = 1          // features.h:19:1:
+	X_FILE_OFFSET_BITS    = 64         // <builtin>:25:1:
+	X_LP64                = 1          // <predefined>:284:1:
+	X_MKNOD_VER_LINUX     = 0          // stat.h:41:1:
+	X_POSIX_C_SOURCE      = 200809     // features.h:281:1:
+	X_POSIX_SOURCE        = 1          // features.h:279:1:
+	X_STATBUF_ST_BLKSIZE  = 0          // stat.h:172:1:
+	X_STATBUF_ST_NSEC     = 0          // stat.h:175:1:
+	X_STATBUF_ST_RDEV     = 0          // stat.h:173:1:
+	X_STAT_VER            = 1          // stat.h:44:1:
+	X_STAT_VER_KERNEL     = 0          // stat.h:37:1:
+	X_STAT_VER_LINUX      = 1          // stat.h:38:1:
+	X_STDC_PREDEF_H       = 1          // <predefined>:162:1:
+	X_STRUCT_TIMESPEC     = 1          // struct_timespec.h:3:1:
+	X_SYS_CDEFS_H         = 1          // cdefs.h:19:1:
+	Linux                 = 1          // <predefined>:231:1:
+	Unix                  = 1          // <predefined>:177:1:
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX Standard: 6.5 File Control Operations	<fcntl.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// These are defined by the user (or the compiler)
+//    to specify the desired environment:
+//
+//    __STRICT_ANSI__	ISO Standard C.
+//    _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
+//    _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
+//    _ISOC2X_SOURCE	Extensions to ISO C99 from ISO C2X.
+//    __STDC_WANT_LIB_EXT2__
+// 			Extensions to ISO C99 from TR 27431-2:2010.
+//    __STDC_WANT_IEC_60559_BFP_EXT__
+// 			Extensions to ISO C11 from TS 18661-1:2014.
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__
+// 			Extensions to ISO C11 from TS 18661-4:2015.
+//    __STDC_WANT_IEC_60559_TYPES_EXT__
+// 			Extensions to ISO C11 from TS 18661-3:2015.
+//
+//    _POSIX_SOURCE	IEEE Std 1003.1.
+//    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
+// 			if >=199309L, add IEEE Std 1003.1b-1993;
+// 			if >=199506L, add IEEE Std 1003.1c-1995;
+// 			if >=200112L, all of IEEE 1003.1-2004
+// 			if >=200809L, all of IEEE 1003.1-2008
+//    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
+// 			Single Unix conformance is wanted, to 600 for the
+// 			sixth revision, to 700 for the seventh revision.
+//    _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
+//    _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
+//    _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
+//    _FILE_OFFSET_BITS=N	Select default filesystem interface.
+//    _ATFILE_SOURCE	Additional *at interfaces.
+//    _GNU_SOURCE		All of the above, plus GNU extensions.
+//    _DEFAULT_SOURCE	The default set of features (taking precedence over
+// 			__STRICT_ANSI__).
+//
+//    _FORTIFY_SOURCE	Add security hardening to many library functions.
+// 			Set to 1 or 2; 2 performs stricter checks than 1.
+//
+//    _REENTRANT, _THREAD_SAFE
+// 			Obsolete; equivalent to _POSIX_C_SOURCE=199506L.
+//
+//    The `-ansi' switch to the GNU C compiler, and standards conformance
+//    options such as `-std=c99', define __STRICT_ANSI__.  If none of
+//    these are defined, or if _DEFAULT_SOURCE is defined, the default is
+//    to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
+//    200809L, as well as enabling miscellaneous functions from BSD and
+//    SVID.  If more than one of these are defined, they accumulate.  For
+//    example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
+//    give you ISO C, 1003.1, and 1003.2, but nothing else.
+//
+//    These are defined by this file and are used by the
+//    header files to decide what to declare or define:
+//
+//    __GLIBC_USE (F)	Define things from feature set F.  This is defined
+// 			to 1 or 0; the subsequent macros are either defined
+// 			or undefined, and those tests should be moved to
+// 			__GLIBC_USE.
+//    __USE_ISOC11		Define ISO C11 things.
+//    __USE_ISOC99		Define ISO C99 things.
+//    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+//    __USE_ISOCXX11	Define ISO C++11 things.
+//    __USE_POSIX		Define IEEE Std 1003.1 things.
+//    __USE_POSIX2		Define IEEE Std 1003.2 things.
+//    __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
+//    __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
+//    __USE_XOPEN		Define XPG things.
+//    __USE_XOPEN_EXTENDED	Define X/Open Unix things.
+//    __USE_UNIX98		Define Single Unix V2 things.
+//    __USE_XOPEN2K        Define XPG6 things.
+//    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+//    __USE_XOPEN2K8       Define XPG7 things.
+//    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
+//    __USE_LARGEFILE	Define correct standard I/O things.
+//    __USE_LARGEFILE64	Define LFS things with separate names.
+//    __USE_FILE_OFFSET64	Define 64bit interface as default.
+//    __USE_MISC		Define things from 4.3BSD or System V Unix.
+//    __USE_ATFILE		Define *at interfaces and AT_* constants for them.
+//    __USE_GNU		Define GNU extensions.
+//    __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
+//
+//    The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
+//    defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
+//    only for compatibility.  All new code should use the other symbols
+//    to test for features.
+//
+//    All macros listed above as possibly being defined by this file are
+//    explicitly undefined if they are not explicitly defined.
+//    Feature-test macros that are not defined by the user or compiler
+//    but are implied by the other feature-test macros defined (or by the
+//    lack of any definitions) are defined by the file.
+//
+//    ISO C feature test macros depend on the definition of the macro
+//    when an affected header is included, not when the first system
+//    header is included, and so they are handled in
+//    <bits/libc-header-start.h>, which does not have a multiple include
+//    guard.  Feature test macros that can be handled from the first
+//    system header included are handled here.
+
+// Undefine everything, so we get a clean slate.
+
+// Suppress kernel-name space pollution unless user expressedly asks
+//    for it.
+
+// Convenience macro to test the version of gcc.
+//    Use like this:
+//    #if __GNUC_PREREQ (2,8)
+//    ... code requiring gcc 2.8 or later ...
+//    #endif
+//    Note: only works for GCC 2.0 and later, because __GNUC_MINOR__ was
+//    added in 2.0.
+
+// Similarly for clang.  Features added to GCC after version 4.2 may
+//    or may not also be available in clang, and clang's definitions of
+//    __GNUC(_MINOR)__ are fixed at 4 and 2 respectively.  Not all such
+//    features can be queried via __has_extension/__has_feature.
+
+// Whether to use feature set F.
+
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
+//    _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
+//    issue a warning; the expectation is that the source is being
+//    transitioned to use the new macro.
+
+// If _GNU_SOURCE was defined by the user, turn on all the other features.
+
+// If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
+//    define _DEFAULT_SOURCE.
+
+// This is to enable the ISO C2X extension.
+
+// This is to enable the ISO C11 extension.
+
+// This is to enable the ISO C99 extension.
+
+// This is to enable the ISO C90 Amendment 1:1995 extension.
+
+// If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
+//    is defined, use POSIX.1-2008 (or another version depending on
+//    _XOPEN_SOURCE).
+
+// Some C libraries once required _REENTRANT and/or _THREAD_SAFE to be
+//    defined in all multithreaded code.  GNU libc has not required this
+//    for many years.  We now treat them as compatibility synonyms for
+//    _POSIX_C_SOURCE=199506L, which is the earliest level of POSIX with
+//    comprehensive support for multithreaded code.  Using them never
+//    lowers the selected level of POSIX conformance, only raises it.
+
+// The function 'gets' existed in C89, but is impossible to use
+//    safely.  It has been removed from ISO C11 and ISO C++14.  Note: for
+//    compatibility with various implementations of <cstdio>, this test
+//    must consider only the value of __cplusplus when compiling C++.
+
+// GNU formerly extended the scanf functions with modified format
+//    specifiers %as, %aS, and %a[...] that allocate a buffer for the
+//    input using malloc.  This extension conflicts with ISO C99, which
+//    defines %a as a standalone format specifier that reads a floating-
+//    point number; moreover, POSIX.1-2008 provides the same feature
+//    using the modifier letter 'm' instead (%ms, %mS, %m[...]).
+//
+//    We now follow C99 unless GNU extensions are active and the compiler
+//    is specifically in C89 or C++98 mode (strict or not).  For
+//    instance, with GCC, -std=gnu11 will have C99-compliant scanf with
+//    or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
+//    old extension.
+
+// Get definitions of __STDC_* predefined macros, if the compiler has
+//    not preincluded this header automatically.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This macro indicates that the installed library is the GNU C Library.
+//    For historic reasons the value now is 6 and this will stay from now
+//    on.  The use of this variable is deprecated.  Use __GLIBC__ and
+//    __GLIBC_MINOR__ now (see below) when you want to test for a specific
+//    GNU C library version and use the values in <gnu/lib-names.h> to get
+//    the sonames of the shared libraries.
+
+// Major and minor version number of the GNU C library package.  Use
+//    these macros to test for features in specific releases.
+
+// This is here only because every header file already includes this one.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// We are almost always included from features.h.
+
+// The GNU libc does not support any K&R compilers or the traditional mode
+//    of ISO C compilers anymore.  Check for some of the combinations not
+//    anymore supported.
+
+// Some user header file might have defined this before.
+
+// All functions, except those with callbacks or those that
+//    synchronize memory, are leaf functions.
+
+// GCC can always grok prototypes.  For C++ programs we add throw()
+//    to help it optimize the function calls.  But this works only with
+//    gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+//    as non-throwing using a function attribute since programs can use
+//    the -fexceptions options for C code as well.
+
+// Compilers that are not clang may object to
+//        #if defined __clang__ && __has_extension(...)
+//    even though they do not need to evaluate the right-hand side of the &&.
+
+// These two macros are not used in glibc anymore.  They are kept here
+//    only because some other projects expect the macros to be defined.
+
+// For these things, GCC behaves the ANSI way normally,
+//    and the non-ANSI way under -traditional.
+
+// This is not a typedef so `const __ptr_t' does the right thing.
+
+// C++ needs to know that types and declarations are C, not C++.
+
+// Fortify support.
+
+// Support for flexible arrays.
+//    Headers that should use flexible arrays only if they're "real"
+//    (e.g. only if they won't affect sizeof()) should test
+//    #if __glibc_c99_flexarr_available.
+
+// __asm__ ("xyz") is used throughout the headers to rename functions
+//    at the assembly language level.  This is wrapped by the __REDIRECT
+//    macro, in order to support compilers that can do this some other
+//    way.  When compilers don't support asm-names at all, we have to do
+//    preprocessor tricks instead (which don't have exactly the right
+//    semantics, but it's the best we can do).
+//
+//    Example:
+//    int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid);
+
+//
+// #elif __SOME_OTHER_COMPILER__
+//
+// # define __REDIRECT(name, proto, alias) name proto; 	_Pragma("let " #name " = " #alias)
+
+// GCC has various useful declarations that can be made with the
+//    `__attribute__' syntax.  All of the ways we use this do fine if
+//    they are omitted for compilers that don't understand it.
+
+// At some point during the gcc 2.96 development the `malloc' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Tell the compiler which arguments to an allocation function
+//    indicate the size of the allocation.
+
+// At some point during the gcc 2.96 development the `pure' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// This declaration tells the compiler that the value is constant.
+
+// At some point during the gcc 3.1 development the `used' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Since version 3.2, gcc allows marking deprecated functions.
+
+// Since version 4.5, gcc also allows one to specify the message printed
+//    when a deprecated function is used.  clang claims to be gcc 4.2, but
+//    may also support this feature.
+
+// At some point during the gcc 2.8 development the `format_arg' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+//    If several `format_arg' attributes are given for the same function, in
+//    gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+//    all designated arguments are considered.
+
+// At some point during the gcc 2.97 development the `strfmon' format
+//    attribute for functions was introduced.  We don't want to use it
+//    unconditionally (although this would be possible) since it
+//    generates warnings.
+
+// The nonull function attribute allows to mark pointer parameters which
+//    must not be NULL.
+
+// If fortification mode, we warn about unused results of certain
+//    function calls which can lead to problems.
+
+// Forces a function to be always inlined.
+// The Linux kernel defines __always_inline in stddef.h (283d7573), and
+//    it conflicts with this definition.  Therefore undefine it first to
+//    allow either header to be included first.
+
+// Associate error messages with the source location of the call site rather
+//    than with the source location inside the function.
+
+// GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+//    inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
+//    or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+//    older than 4.3 may define these macros and still not guarantee GNU inlining
+//    semantics.
+//
+//    clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+//    semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
+//    __GNUC_GNU_INLINE__ macro definitions.
+
+// GCC 4.3 and above allow passing all anonymous arguments of an
+//    __extern_always_inline function to some other vararg function.
+
+// It is possible to compile containing GCC extensions even if GCC is
+//    run in pedantic mode if the uses are carefully marked using the
+//    `__extension__' keyword.  But this is not generally available before
+//    version 2.8.
+
+// __restrict is known in EGCS 1.2 and above.
+
+// ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+//      array_name[restrict]
+//    GCC 3.1 supports this.
+
+// Describes a char array whose address can safely be passed as the first
+//    argument to strncpy and strncat, as the char array is not necessarily
+//    a NUL-terminated string.
+
+// Undefine (also defined in libc-symbols.h).
+// Copies attributes from the declaration or type referenced by
+//    the argument.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// __glibc_macro_warning (MESSAGE) issues warning MESSAGE.  This is
+//    intended for use in preprocessor macros.
+//
+//    Note: MESSAGE must be a _single_ string; concatenation of string
+//    literals is not supported.
+
+// Generic selection (ISO C11) is a C-only feature, available in GCC
+//    since version 4.9.  Previous versions do not provide generic
+//    selection, even though they might set __STDC_VERSION__ to 201112L,
+//    when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
+//    when testing __STDC_VERSION__ for generic selection support.
+//    On the other hand, Clang also defines __GNUC__, so a clang-specific
+//    check is required to enable the use of generic selection.
+
+// If we don't have __REDIRECT, prototypes will be missing if
+//    __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64].
+
+// Decide whether we can define 'extern inline' functions in headers.
+
+// This is here only because every header file already includes this one.
+//    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
+//    <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+//    that will always return failure (and set errno to ENOSYS).
+// This file is automatically generated.
+//    This file selects the right generated file of `__stub_FUNCTION' macros
+//    based on the architecture being compiled for.
+
+// This file is automatically generated.
+//    It defines a symbol `__stub_FUNCTION' for each function
+//    in the C library which is a stub, meaning it will fail
+//    every time called, usually setting errno to ENOSYS.
+
+// This must be early so <bits/fcntl.h> can define types winningly.
+
+// Get __mode_t, __dev_t and __off_t  .
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Seconds since the Epoch, visible to user code when time_t is too
+//    narrow only for consistency with the old way of widening too-narrow
+//    types.  User code should never use __time64_t.
+
+// Get the definitions of O_*, F_*, FD_*: all the
+//    numbers and flag bits for `open', `fcntl', et al.
+// O_*, F_*, FD_* bit values for Linux/x86.
+//    Copyright (C) 2001-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Not necessary, we always have 64-bit offsets.
+
+type Flock = struct {
+	Fl_type      int16
+	Fl_whence    int16
+	F__ccgo_pad1 [4]byte
+	Fl_start     X__off64_t
+	Fl_len       X__off64_t
+	Fl_pid       X__pid_t
+	F__ccgo_pad2 [4]byte
+} /* fcntl.h:35:1 */
+
+// Include generic Linux declarations.
+// O_*, F_*, FD_* bit values for Linux.
+//    Copyright (C) 2001-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This file contains shared definitions between Linux architectures
+//    and is included by <bits/fcntl.h> to declare them.  The various
+//    #ifndef cases allow the architecture specific file to define those
+//    values with different values.
+//
+//    A minimal <bits/fcntl.h> contains just:
+//
+//    struct flock {...}
+//    #ifdef __USE_LARGEFILE64
+//    struct flock64 {...}
+//    #endif
+//    #include <bits/fcntl-linux.h>
+
+// open/fcntl.
+
+// open file description locks.
+//
+//    Usually record locks held by a process are released on *any* close and are
+//    not inherited across a fork.
+//
+//    These cmd values will set locks that conflict with process-associated record
+//    locks, but are "owned" by the opened file description, not the process.
+//    This means that they are inherited across fork or clone with CLONE_FILES
+//    like BSD (flock) locks, and they are only released automatically when the
+//    last reference to the the file description against which they were acquired
+//    is put.
+
+// For now, Linux has no separate synchronicity options for read
+//    operations.  We define O_RSYNC therefore as the same as O_SYNC
+//    since this is a superset.
+
+// Values for the second argument to `fcntl'.
+
+// For F_[GET|SET]FD.
+
+// For posix fcntl() and `l_type' field of a `struct flock' for lockf().
+
+// For old implementation of BSD flock.
+
+// Operations for BSD flock, also used by the kernel implementation.
+
+// Define some more compatibility macros to be backward compatible with
+//    BSD systems which did not managed to hide these kernel macros.
+
+// Advise to `posix_fadvise'.
+
+// Values for `*at' functions.
+
+// Detect if open needs mode as a third argument (or for openat as a fourth
+//    argument).
+
+// POSIX.1-2001 specifies that these types are defined by <fcntl.h>.
+//
+//	Earlier POSIX standards permitted any type ending in `_t' to be defined
+//	by any POSIX header, so we don't conditionalize the definitions here.
+type Mode_t = X__mode_t /* fcntl.h:50:18 */
+
+type Off_t = X__off64_t /* fcntl.h:58:19 */
+
+type Pid_t = X__pid_t /* fcntl.h:69:17 */
+
+// For XPG all symbols from <sys/stat.h> should also be available.
+// NB: Include guard matches what <linux/time.h> uses.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Endian macros for string.h functions
+//    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+// Definitions for byte order, according to significance of bytes,
+//    from low addresses to high addresses.  The value is what you get by
+//    putting '4' in the most significant byte, '3' in the second most
+//    significant byte, '2' in the second least significant byte, and '1'
+//    in the least significant byte, and then writing down one digit for
+//    each byte, starting with the byte at the lowest address at the left,
+//    and proceeding to the byte with the highest address at the right.
+
+// This file defines `__BYTE_ORDER' for the particular machine.
+
+// i386/x86_64 are little-endian.
+
+// Some machines may need to use a different endianness for floating point
+//    values.
+
+// POSIX.1b structure for a time value.  This is like a `struct timeval' but
+//
+//	has nanoseconds instead of microseconds.
+type Timespec = struct {
+	Ftv_sec  X__time_t
+	Ftv_nsec X__syscall_slong_t
+} /* struct_timespec.h:10:1 */
+
+// Copyright (C) 1999-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Versions of the `struct stat' data structure.
+
+// x86-64 versions of the `xmknod' interface.
+
+type Stat = struct {
+	Fst_dev     X__dev_t
+	Fst_ino     X__ino_t
+	Fst_nlink   X__nlink_t
+	Fst_mode    X__mode_t
+	Fst_uid     X__uid_t
+	Fst_gid     X__gid_t
+	F__pad0     int32
+	Fst_rdev    X__dev_t
+	Fst_size    X__off_t
+	Fst_blksize X__blksize_t
+	Fst_blocks  X__blkcnt_t
+	Fst_atim    struct {
+		Ftv_sec  X__time_t
+		Ftv_nsec X__syscall_slong_t
+	}
+	Fst_mtim struct {
+		Ftv_sec  X__time_t
+		Ftv_nsec X__syscall_slong_t
+	}
+	Fst_ctim struct {
+		Ftv_sec  X__time_t
+		Ftv_nsec X__syscall_slong_t
+	}
+	F__glibc_reserved [3]X__syscall_slong_t
+} /* stat.h:46:1 */
+
+// Define some inlines helping to catch common problems.
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/fts/capi_linux_loong64.go b/vendor/modernc.org/libc/fts/capi_linux_loong64.go
new file mode 100644
index 00000000..5dc389ba
--- /dev/null
+++ b/vendor/modernc.org/libc/fts/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo fts/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o fts/fts_linux_amd64.go -pkgname fts', DO NOT EDIT.
+
+package fts
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/fts/fts_linux_loong64.go b/vendor/modernc.org/libc/fts/fts_linux_loong64.go
new file mode 100644
index 00000000..e12eb02c
--- /dev/null
+++ b/vendor/modernc.org/libc/fts/fts_linux_loong64.go
@@ -0,0 +1,1904 @@
+// Code generated by 'ccgo fts/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o fts/fts_linux_amd64.go -pkgname fts', DO NOT EDIT.
+
+package fts
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	ACCESSPERMS                  = 511        // stat.h:195:1:
+	ALLPERMS                     = 4095       // stat.h:196:1:
+	BIG_ENDIAN                   = 4321       // endian.h:28:1:
+	BYTE_ORDER                   = 1234       // endian.h:30:1:
+	DEFFILEMODE                  = 438        // stat.h:197:1:
+	FD_SETSIZE                   = 1024       // select.h:73:1:
+	FTS_AGAIN                    = 1          // fts.h:139:1:
+	FTS_COMFOLLOW                = 0x0001     // fts.h:68:1:
+	FTS_D                        = 1          // fts.h:119:1:
+	FTS_DC                       = 2          // fts.h:120:1:
+	FTS_DEFAULT                  = 3          // fts.h:121:1:
+	FTS_DNR                      = 4          // fts.h:122:1:
+	FTS_DONTCHDIR                = 0x01       // fts.h:135:1:
+	FTS_DOT                      = 5          // fts.h:123:1:
+	FTS_DP                       = 6          // fts.h:124:1:
+	FTS_ERR                      = 7          // fts.h:125:1:
+	FTS_F                        = 8          // fts.h:126:1:
+	FTS_FOLLOW                   = 2          // fts.h:140:1:
+	FTS_INIT                     = 9          // fts.h:127:1:
+	FTS_LOGICAL                  = 0x0002     // fts.h:69:1:
+	FTS_NAMEONLY                 = 0x0100     // fts.h:78:1:
+	FTS_NOCHDIR                  = 0x0004     // fts.h:70:1:
+	FTS_NOINSTR                  = 3          // fts.h:141:1:
+	FTS_NOSTAT                   = 0x0008     // fts.h:71:1:
+	FTS_NS                       = 10         // fts.h:128:1:
+	FTS_NSOK                     = 11         // fts.h:129:1:
+	FTS_OPTIONMASK               = 0x00ff     // fts.h:76:1:
+	FTS_PHYSICAL                 = 0x0010     // fts.h:72:1:
+	FTS_ROOTLEVEL                = 0          // fts.h:116:1:
+	FTS_ROOTPARENTLEVEL          = -1         // fts.h:115:1:
+	FTS_SEEDOT                   = 0x0020     // fts.h:73:1:
+	FTS_SKIP                     = 4          // fts.h:142:1:
+	FTS_SL                       = 12         // fts.h:130:1:
+	FTS_SLNONE                   = 13         // fts.h:131:1:
+	FTS_STOP                     = 0x0200     // fts.h:79:1:
+	FTS_SYMFOLLOW                = 0x02       // fts.h:136:1:
+	FTS_W                        = 14         // fts.h:132:1:
+	FTS_WHITEOUT                 = 0x0080     // fts.h:75:1:
+	FTS_XDEV                     = 0x0040     // fts.h:74:1:
+	LITTLE_ENDIAN                = 1234       // endian.h:27:1:
+	PDP_ENDIAN                   = 3412       // endian.h:29:1:
+	S_BLKSIZE                    = 512        // stat.h:199:1:
+	S_IEXEC                      = 64         // stat.h:177:1:
+	S_IFBLK                      = 24576      // stat.h:107:1:
+	S_IFCHR                      = 8192       // stat.h:106:1:
+	S_IFDIR                      = 16384      // stat.h:105:1:
+	S_IFIFO                      = 4096       // stat.h:110:1:
+	S_IFLNK                      = 40960      // stat.h:113:1:
+	S_IFMT                       = 61440      // stat.h:104:1:
+	S_IFREG                      = 32768      // stat.h:108:1:
+	S_IFSOCK                     = 49152      // stat.h:117:1:
+	S_IREAD                      = 256        // stat.h:175:1:
+	S_IRGRP                      = 32         // stat.h:180:1:
+	S_IROTH                      = 4          // stat.h:186:1:
+	S_IRUSR                      = 256        // stat.h:168:1:
+	S_IRWXG                      = 56         // stat.h:184:1:
+	S_IRWXO                      = 7          // stat.h:190:1:
+	S_IRWXU                      = 448        // stat.h:172:1:
+	S_ISGID                      = 1024       // stat.h:161:1:
+	S_ISUID                      = 2048       // stat.h:160:1:
+	S_ISVTX                      = 512        // stat.h:165:1:
+	S_IWGRP                      = 16         // stat.h:181:1:
+	S_IWOTH                      = 2          // stat.h:187:1:
+	S_IWRITE                     = 128        // stat.h:176:1:
+	S_IWUSR                      = 128        // stat.h:169:1:
+	S_IXGRP                      = 8          // stat.h:182:1:
+	S_IXOTH                      = 1          // stat.h:188:1:
+	S_IXUSR                      = 64         // stat.h:170:1:
+	UTIME_NOW                    = 1073741823 // stat.h:206:1:
+	UTIME_OMIT                   = 1073741822 // stat.h:207:1:
+	X_ATFILE_SOURCE              = 1          // features.h:342:1:
+	X_BITS_BYTESWAP_H            = 1          // byteswap.h:24:1:
+	X_BITS_ENDIANNESS_H          = 1          // endianness.h:2:1:
+	X_BITS_ENDIAN_H              = 1          // endian.h:20:1:
+	X_BITS_PTHREADTYPES_ARCH_H   = 1          // pthreadtypes-arch.h:19:1:
+	X_BITS_PTHREADTYPES_COMMON_H = 1          // pthreadtypes.h:20:1:
+	X_BITS_STAT_H                = 1          // stat.h:23:1:
+	X_BITS_STDINT_INTN_H         = 1          // stdint-intn.h:20:1:
+	X_BITS_TIME64_H              = 1          // time64.h:24:1:
+	X_BITS_TYPESIZES_H           = 1          // typesizes.h:24:1:
+	X_BITS_TYPES_H               = 1          // types.h:24:1:
+	X_BITS_UINTN_IDENTITY_H      = 1          // uintn-identity.h:24:1:
+	X_BSD_SIZE_T_                = 0          // stddef.h:189:1:
+	X_BSD_SIZE_T_DEFINED_        = 0          // stddef.h:192:1:
+	X_DEFAULT_SOURCE             = 1          // features.h:227:1:
+	X_ENDIAN_H                   = 1          // endian.h:19:1:
+	X_FEATURES_H                 = 1          // features.h:19:1:
+	X_FILE_OFFSET_BITS           = 64         // <builtin>:25:1:
+	X_FTS_H                      = 1          // fts.h:51:1:
+	X_GCC_SIZE_T                 = 0          // stddef.h:195:1:
+	X_LP64                       = 1          // <predefined>:284:1:
+	X_MKNOD_VER                  = 0          // stat.h:390:1:
+	X_MKNOD_VER_LINUX            = 0          // stat.h:41:1:
+	X_POSIX_C_SOURCE             = 200809     // features.h:281:1:
+	X_POSIX_SOURCE               = 1          // features.h:279:1:
+	X_RWLOCK_INTERNAL_H          = 0          // struct_rwlock.h:21:1:
+	X_SIZET_                     = 0          // stddef.h:196:1:
+	X_SIZE_T                     = 0          // stddef.h:183:1:
+	X_SIZE_T_                    = 0          // stddef.h:188:1:
+	X_SIZE_T_DECLARED            = 0          // stddef.h:193:1:
+	X_SIZE_T_DEFINED             = 0          // stddef.h:191:1:
+	X_SIZE_T_DEFINED_            = 0          // stddef.h:190:1:
+	X_STATBUF_ST_BLKSIZE         = 0          // stat.h:172:1:
+	X_STATBUF_ST_NSEC            = 0          // stat.h:175:1:
+	X_STATBUF_ST_RDEV            = 0          // stat.h:173:1:
+	X_STAT_VER                   = 1          // stat.h:44:1:
+	X_STAT_VER_KERNEL            = 0          // stat.h:37:1:
+	X_STAT_VER_LINUX             = 1          // stat.h:38:1:
+	X_STDC_PREDEF_H              = 1          // <predefined>:162:1:
+	X_STRUCT_TIMESPEC            = 1          // struct_timespec.h:3:1:
+	X_SYS_CDEFS_H                = 1          // cdefs.h:19:1:
+	X_SYS_SELECT_H               = 1          // select.h:22:1:
+	X_SYS_SIZE_T_H               = 0          // stddef.h:184:1:
+	X_SYS_STAT_H                 = 1          // stat.h:23:1:
+	X_SYS_TYPES_H                = 1          // types.h:23:1:
+	X_THREAD_MUTEX_INTERNAL_H    = 1          // struct_mutex.h:20:1:
+	X_THREAD_SHARED_TYPES_H      = 1          // thread-shared-types.h:20:1:
+	X_T_SIZE                     = 0          // stddef.h:186:1:
+	X_T_SIZE_                    = 0          // stddef.h:185:1:
+	Linux                        = 1          // <predefined>:231:1:
+	Unix                         = 1          // <predefined>:177:1:
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX Standard: 2.6 Primitive System Data Types	<sys/types.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// These are defined by the user (or the compiler)
+//    to specify the desired environment:
+//
+//    __STRICT_ANSI__	ISO Standard C.
+//    _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
+//    _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
+//    _ISOC2X_SOURCE	Extensions to ISO C99 from ISO C2X.
+//    __STDC_WANT_LIB_EXT2__
+// 			Extensions to ISO C99 from TR 27431-2:2010.
+//    __STDC_WANT_IEC_60559_BFP_EXT__
+// 			Extensions to ISO C11 from TS 18661-1:2014.
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__
+// 			Extensions to ISO C11 from TS 18661-4:2015.
+//    __STDC_WANT_IEC_60559_TYPES_EXT__
+// 			Extensions to ISO C11 from TS 18661-3:2015.
+//
+//    _POSIX_SOURCE	IEEE Std 1003.1.
+//    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
+// 			if >=199309L, add IEEE Std 1003.1b-1993;
+// 			if >=199506L, add IEEE Std 1003.1c-1995;
+// 			if >=200112L, all of IEEE 1003.1-2004
+// 			if >=200809L, all of IEEE 1003.1-2008
+//    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
+// 			Single Unix conformance is wanted, to 600 for the
+// 			sixth revision, to 700 for the seventh revision.
+//    _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
+//    _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
+//    _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
+//    _FILE_OFFSET_BITS=N	Select default filesystem interface.
+//    _ATFILE_SOURCE	Additional *at interfaces.
+//    _GNU_SOURCE		All of the above, plus GNU extensions.
+//    _DEFAULT_SOURCE	The default set of features (taking precedence over
+// 			__STRICT_ANSI__).
+//
+//    _FORTIFY_SOURCE	Add security hardening to many library functions.
+// 			Set to 1 or 2; 2 performs stricter checks than 1.
+//
+//    _REENTRANT, _THREAD_SAFE
+// 			Obsolete; equivalent to _POSIX_C_SOURCE=199506L.
+//
+//    The `-ansi' switch to the GNU C compiler, and standards conformance
+//    options such as `-std=c99', define __STRICT_ANSI__.  If none of
+//    these are defined, or if _DEFAULT_SOURCE is defined, the default is
+//    to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
+//    200809L, as well as enabling miscellaneous functions from BSD and
+//    SVID.  If more than one of these are defined, they accumulate.  For
+//    example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
+//    give you ISO C, 1003.1, and 1003.2, but nothing else.
+//
+//    These are defined by this file and are used by the
+//    header files to decide what to declare or define:
+//
+//    __GLIBC_USE (F)	Define things from feature set F.  This is defined
+// 			to 1 or 0; the subsequent macros are either defined
+// 			or undefined, and those tests should be moved to
+// 			__GLIBC_USE.
+//    __USE_ISOC11		Define ISO C11 things.
+//    __USE_ISOC99		Define ISO C99 things.
+//    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+//    __USE_ISOCXX11	Define ISO C++11 things.
+//    __USE_POSIX		Define IEEE Std 1003.1 things.
+//    __USE_POSIX2		Define IEEE Std 1003.2 things.
+//    __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
+//    __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
+//    __USE_XOPEN		Define XPG things.
+//    __USE_XOPEN_EXTENDED	Define X/Open Unix things.
+//    __USE_UNIX98		Define Single Unix V2 things.
+//    __USE_XOPEN2K        Define XPG6 things.
+//    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+//    __USE_XOPEN2K8       Define XPG7 things.
+//    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
+//    __USE_LARGEFILE	Define correct standard I/O things.
+//    __USE_LARGEFILE64	Define LFS things with separate names.
+//    __USE_FILE_OFFSET64	Define 64bit interface as default.
+//    __USE_MISC		Define things from 4.3BSD or System V Unix.
+//    __USE_ATFILE		Define *at interfaces and AT_* constants for them.
+//    __USE_GNU		Define GNU extensions.
+//    __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
+//
+//    The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
+//    defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
+//    only for compatibility.  All new code should use the other symbols
+//    to test for features.
+//
+//    All macros listed above as possibly being defined by this file are
+//    explicitly undefined if they are not explicitly defined.
+//    Feature-test macros that are not defined by the user or compiler
+//    but are implied by the other feature-test macros defined (or by the
+//    lack of any definitions) are defined by the file.
+//
+//    ISO C feature test macros depend on the definition of the macro
+//    when an affected header is included, not when the first system
+//    header is included, and so they are handled in
+//    <bits/libc-header-start.h>, which does not have a multiple include
+//    guard.  Feature test macros that can be handled from the first
+//    system header included are handled here.
+
+// Undefine everything, so we get a clean slate.
+
+// Suppress kernel-name space pollution unless user expressedly asks
+//    for it.
+
+// Convenience macro to test the version of gcc.
+//    Use like this:
+//    #if __GNUC_PREREQ (2,8)
+//    ... code requiring gcc 2.8 or later ...
+//    #endif
+//    Note: only works for GCC 2.0 and later, because __GNUC_MINOR__ was
+//    added in 2.0.
+
+// Similarly for clang.  Features added to GCC after version 4.2 may
+//    or may not also be available in clang, and clang's definitions of
+//    __GNUC(_MINOR)__ are fixed at 4 and 2 respectively.  Not all such
+//    features can be queried via __has_extension/__has_feature.
+
+// Whether to use feature set F.
+
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
+//    _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
+//    issue a warning; the expectation is that the source is being
+//    transitioned to use the new macro.
+
+// If _GNU_SOURCE was defined by the user, turn on all the other features.
+
+// If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
+//    define _DEFAULT_SOURCE.
+
+// This is to enable the ISO C2X extension.
+
+// This is to enable the ISO C11 extension.
+
+// This is to enable the ISO C99 extension.
+
+// This is to enable the ISO C90 Amendment 1:1995 extension.
+
+// If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
+//    is defined, use POSIX.1-2008 (or another version depending on
+//    _XOPEN_SOURCE).
+
+// Some C libraries once required _REENTRANT and/or _THREAD_SAFE to be
+//    defined in all multithreaded code.  GNU libc has not required this
+//    for many years.  We now treat them as compatibility synonyms for
+//    _POSIX_C_SOURCE=199506L, which is the earliest level of POSIX with
+//    comprehensive support for multithreaded code.  Using them never
+//    lowers the selected level of POSIX conformance, only raises it.
+
+// The function 'gets' existed in C89, but is impossible to use
+//    safely.  It has been removed from ISO C11 and ISO C++14.  Note: for
+//    compatibility with various implementations of <cstdio>, this test
+//    must consider only the value of __cplusplus when compiling C++.
+
+// GNU formerly extended the scanf functions with modified format
+//    specifiers %as, %aS, and %a[...] that allocate a buffer for the
+//    input using malloc.  This extension conflicts with ISO C99, which
+//    defines %a as a standalone format specifier that reads a floating-
+//    point number; moreover, POSIX.1-2008 provides the same feature
+//    using the modifier letter 'm' instead (%ms, %mS, %m[...]).
+//
+//    We now follow C99 unless GNU extensions are active and the compiler
+//    is specifically in C89 or C++98 mode (strict or not).  For
+//    instance, with GCC, -std=gnu11 will have C99-compliant scanf with
+//    or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
+//    old extension.
+
+// Get definitions of __STDC_* predefined macros, if the compiler has
+//    not preincluded this header automatically.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This macro indicates that the installed library is the GNU C Library.
+//    For historic reasons the value now is 6 and this will stay from now
+//    on.  The use of this variable is deprecated.  Use __GLIBC__ and
+//    __GLIBC_MINOR__ now (see below) when you want to test for a specific
+//    GNU C library version and use the values in <gnu/lib-names.h> to get
+//    the sonames of the shared libraries.
+
+// Major and minor version number of the GNU C library package.  Use
+//    these macros to test for features in specific releases.
+
+// This is here only because every header file already includes this one.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// We are almost always included from features.h.
+
+// The GNU libc does not support any K&R compilers or the traditional mode
+//    of ISO C compilers anymore.  Check for some of the combinations not
+//    anymore supported.
+
+// Some user header file might have defined this before.
+
+// All functions, except those with callbacks or those that
+//    synchronize memory, are leaf functions.
+
+// GCC can always grok prototypes.  For C++ programs we add throw()
+//    to help it optimize the function calls.  But this works only with
+//    gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+//    as non-throwing using a function attribute since programs can use
+//    the -fexceptions options for C code as well.
+
+// Compilers that are not clang may object to
+//        #if defined __clang__ && __has_extension(...)
+//    even though they do not need to evaluate the right-hand side of the &&.
+
+// These two macros are not used in glibc anymore.  They are kept here
+//    only because some other projects expect the macros to be defined.
+
+// For these things, GCC behaves the ANSI way normally,
+//    and the non-ANSI way under -traditional.
+
+// This is not a typedef so `const __ptr_t' does the right thing.
+
+// C++ needs to know that types and declarations are C, not C++.
+
+// Fortify support.
+
+// Support for flexible arrays.
+//    Headers that should use flexible arrays only if they're "real"
+//    (e.g. only if they won't affect sizeof()) should test
+//    #if __glibc_c99_flexarr_available.
+
+// __asm__ ("xyz") is used throughout the headers to rename functions
+//    at the assembly language level.  This is wrapped by the __REDIRECT
+//    macro, in order to support compilers that can do this some other
+//    way.  When compilers don't support asm-names at all, we have to do
+//    preprocessor tricks instead (which don't have exactly the right
+//    semantics, but it's the best we can do).
+//
+//    Example:
+//    int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid);
+
+//
+// #elif __SOME_OTHER_COMPILER__
+//
+// # define __REDIRECT(name, proto, alias) name proto; 	_Pragma("let " #name " = " #alias)
+
+// GCC has various useful declarations that can be made with the
+//    `__attribute__' syntax.  All of the ways we use this do fine if
+//    they are omitted for compilers that don't understand it.
+
+// At some point during the gcc 2.96 development the `malloc' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Tell the compiler which arguments to an allocation function
+//    indicate the size of the allocation.
+
+// At some point during the gcc 2.96 development the `pure' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// This declaration tells the compiler that the value is constant.
+
+// At some point during the gcc 3.1 development the `used' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Since version 3.2, gcc allows marking deprecated functions.
+
+// Since version 4.5, gcc also allows one to specify the message printed
+//    when a deprecated function is used.  clang claims to be gcc 4.2, but
+//    may also support this feature.
+
+// At some point during the gcc 2.8 development the `format_arg' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+//    If several `format_arg' attributes are given for the same function, in
+//    gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+//    all designated arguments are considered.
+
+// At some point during the gcc 2.97 development the `strfmon' format
+//    attribute for functions was introduced.  We don't want to use it
+//    unconditionally (although this would be possible) since it
+//    generates warnings.
+
+// The nonull function attribute allows to mark pointer parameters which
+//    must not be NULL.
+
+// If fortification mode, we warn about unused results of certain
+//    function calls which can lead to problems.
+
+// Forces a function to be always inlined.
+// The Linux kernel defines __always_inline in stddef.h (283d7573), and
+//    it conflicts with this definition.  Therefore undefine it first to
+//    allow either header to be included first.
+
+// Associate error messages with the source location of the call site rather
+//    than with the source location inside the function.
+
+// GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+//    inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
+//    or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+//    older than 4.3 may define these macros and still not guarantee GNU inlining
+//    semantics.
+//
+//    clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+//    semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
+//    __GNUC_GNU_INLINE__ macro definitions.
+
+// GCC 4.3 and above allow passing all anonymous arguments of an
+//    __extern_always_inline function to some other vararg function.
+
+// It is possible to compile containing GCC extensions even if GCC is
+//    run in pedantic mode if the uses are carefully marked using the
+//    `__extension__' keyword.  But this is not generally available before
+//    version 2.8.
+
+// __restrict is known in EGCS 1.2 and above.
+
+// ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+//      array_name[restrict]
+//    GCC 3.1 supports this.
+
+// Describes a char array whose address can safely be passed as the first
+//    argument to strncpy and strncat, as the char array is not necessarily
+//    a NUL-terminated string.
+
+// Undefine (also defined in libc-symbols.h).
+// Copies attributes from the declaration or type referenced by
+//    the argument.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// __glibc_macro_warning (MESSAGE) issues warning MESSAGE.  This is
+//    intended for use in preprocessor macros.
+//
+//    Note: MESSAGE must be a _single_ string; concatenation of string
+//    literals is not supported.
+
+// Generic selection (ISO C11) is a C-only feature, available in GCC
+//    since version 4.9.  Previous versions do not provide generic
+//    selection, even though they might set __STDC_VERSION__ to 201112L,
+//    when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
+//    when testing __STDC_VERSION__ for generic selection support.
+//    On the other hand, Clang also defines __GNUC__, so a clang-specific
+//    check is required to enable the use of generic selection.
+
+// If we don't have __REDIRECT, prototypes will be missing if
+//    __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64].
+
+// Decide whether we can define 'extern inline' functions in headers.
+
+// This is here only because every header file already includes this one.
+//    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
+//    <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+//    that will always return failure (and set errno to ENOSYS).
+// This file is automatically generated.
+//    This file selects the right generated file of `__stub_FUNCTION' macros
+//    based on the architecture being compiled for.
+
+// This file is automatically generated.
+//    It defines a symbol `__stub_FUNCTION' for each function
+//    in the C library which is a stub, meaning it will fail
+//    every time called, usually setting errno to ENOSYS.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Seconds since the Epoch, visible to user code when time_t is too
+//    narrow only for consistency with the old way of widening too-narrow
+//    types.  User code should never use __time64_t.
+
+type U_char = X__u_char     /* types.h:33:18 */
+type U_short = X__u_short   /* types.h:34:19 */
+type U_int = X__u_int       /* types.h:35:17 */
+type U_long = X__u_long     /* types.h:36:18 */
+type Quad_t = X__quad_t     /* types.h:37:18 */
+type U_quad_t = X__u_quad_t /* types.h:38:20 */
+type Fsid_t = X__fsid_t     /* types.h:39:18 */
+type Loff_t = X__loff_t     /* types.h:42:18 */
+
+type Ino_t = X__ino64_t /* types.h:49:19 */
+
+type Dev_t = X__dev_t /* types.h:59:17 */
+
+type Gid_t = X__gid_t /* types.h:64:17 */
+
+type Mode_t = X__mode_t /* types.h:69:18 */
+
+type Nlink_t = X__nlink_t /* types.h:74:19 */
+
+type Uid_t = X__uid_t /* types.h:79:17 */
+
+type Off_t = X__off64_t /* types.h:87:19 */
+
+type Pid_t = X__pid_t /* types.h:97:17 */
+
+type Id_t = X__id_t /* types.h:103:16 */
+
+type Ssize_t = X__ssize_t /* types.h:108:19 */
+
+type Daddr_t = X__daddr_t /* types.h:114:19 */
+type Caddr_t = X__caddr_t /* types.h:115:19 */
+
+type Key_t = X__key_t /* types.h:121:17 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `clock'.
+type Clock_t = X__clock_t /* clock_t.h:7:19 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Clock ID used in clock and timer functions.
+type Clockid_t = X__clockid_t /* clockid_t.h:7:21 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `time'.
+type Time_t = X__time_t /* time_t.h:7:18 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Timer ID returned by `timer_create'.
+type Timer_t = X__timer_t /* timer_t.h:7:19 */
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// Old compatibility names for C types.
+type Ulong = uint64  /* types.h:148:27 */
+type Ushort = uint16 /* types.h:149:28 */
+type Uint = uint32   /* types.h:150:22 */
+
+// These size-specific names are used by some of the inet code.
+
+// Define intN_t types.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+type Int8_t = X__int8_t   /* stdint-intn.h:24:18 */
+type Int16_t = X__int16_t /* stdint-intn.h:25:19 */
+type Int32_t = X__int32_t /* stdint-intn.h:26:19 */
+type Int64_t = X__int64_t /* stdint-intn.h:27:19 */
+
+// These were defined by ISO C without the first `_'.
+type U_int8_t = X__uint8_t   /* types.h:158:19 */
+type U_int16_t = X__uint16_t /* types.h:159:20 */
+type U_int32_t = X__uint32_t /* types.h:160:20 */
+type U_int64_t = X__uint64_t /* types.h:161:20 */
+
+type Register_t = int32 /* types.h:164:13 */
+
+// It also defines `fd_set' and the FD_* macros for `select'.
+// `fd_set' type and related macros, and `select'/`pselect' declarations.
+//    Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX 1003.1g: 6.2 Select from File Descriptor Sets <sys/select.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Get definition of needed basic types.
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Get __FD_* definitions.
+// Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Get sigset_t.
+
+type X__sigset_t = struct{ F__val [16]uint64 } /* __sigset_t.h:8:3 */
+
+// A set of signals to be blocked, unblocked, or waited for.
+type Sigset_t = X__sigset_t /* sigset_t.h:7:20 */
+
+// Get definition of timer specification structures.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// A time value that is accurate to the nearest
+//
+//	microsecond but also has a range of years.
+type Timeval = struct {
+	Ftv_sec  X__time_t
+	Ftv_usec X__suseconds_t
+} /* struct_timeval.h:8:1 */
+
+// NB: Include guard matches what <linux/time.h> uses.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Endian macros for string.h functions
+//    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+// POSIX.1b structure for a time value.  This is like a `struct timeval' but
+//
+//	has nanoseconds instead of microseconds.
+type Timespec = struct {
+	Ftv_sec  X__time_t
+	Ftv_nsec X__syscall_slong_t
+} /* struct_timespec.h:10:1 */
+
+type Suseconds_t = X__suseconds_t /* select.h:43:23 */
+
+// The fd_set member is required to be an array of longs.
+type X__fd_mask = int64 /* select.h:49:18 */
+
+// Some versions of <linux/posix_types.h> define this macros.
+// It's easier to assume 8-bit bytes than to get CHAR_BIT.
+
+// fd_set for select and pselect.
+type Fd_set = struct{ F__fds_bits [16]X__fd_mask } /* select.h:70:5 */
+
+// Maximum number of file descriptors in `fd_set'.
+
+// Sometimes the fd_set member is assumed to have this type.
+type Fd_mask = X__fd_mask /* select.h:77:19 */
+
+// Define some inlines helping to catch common problems.
+
+type Blksize_t = X__blksize_t /* types.h:185:21 */
+
+// Types from the Large File Support interface.
+type Blkcnt_t = X__blkcnt64_t     /* types.h:205:22 */ // Type to count number of disk blocks.
+type Fsblkcnt_t = X__fsblkcnt64_t /* types.h:209:24 */ // Type to count file system blocks.
+type Fsfilcnt_t = X__fsfilcnt64_t /* types.h:213:24 */ // Type to count file system inodes.
+
+// Now add the thread types.
+// Declaration of common pthread types for all architectures.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For internal mutex and condition variable definitions.
+// Common threading primitives definitions for both POSIX and C11.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Arch-specific definitions.  Each architecture must define the following
+//    macros to define the expected sizes of pthread data types:
+//
+//    __SIZEOF_PTHREAD_ATTR_T        - size of pthread_attr_t.
+//    __SIZEOF_PTHREAD_MUTEX_T       - size of pthread_mutex_t.
+//    __SIZEOF_PTHREAD_MUTEXATTR_T   - size of pthread_mutexattr_t.
+//    __SIZEOF_PTHREAD_COND_T        - size of pthread_cond_t.
+//    __SIZEOF_PTHREAD_CONDATTR_T    - size of pthread_condattr_t.
+//    __SIZEOF_PTHREAD_RWLOCK_T      - size of pthread_rwlock_t.
+//    __SIZEOF_PTHREAD_RWLOCKATTR_T  - size of pthread_rwlockattr_t.
+//    __SIZEOF_PTHREAD_BARRIER_T     - size of pthread_barrier_t.
+//    __SIZEOF_PTHREAD_BARRIERATTR_T - size of pthread_barrierattr_t.
+//
+//    The additional macro defines any constraint for the lock alignment
+//    inside the thread structures:
+//
+//    __LOCK_ALIGNMENT - for internal lock/futex usage.
+//
+//    Same idea but for the once locking primitive:
+//
+//    __ONCE_ALIGNMENT - for pthread_once_t/once_flag definition.
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Common definition of pthread_mutex_t.
+
+type X__pthread_internal_list = struct {
+	F__prev uintptr
+	F__next uintptr
+} /* thread-shared-types.h:49:9 */
+
+// Type to count file system inodes.
+
+// Now add the thread types.
+// Declaration of common pthread types for all architectures.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For internal mutex and condition variable definitions.
+// Common threading primitives definitions for both POSIX and C11.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Arch-specific definitions.  Each architecture must define the following
+//    macros to define the expected sizes of pthread data types:
+//
+//    __SIZEOF_PTHREAD_ATTR_T        - size of pthread_attr_t.
+//    __SIZEOF_PTHREAD_MUTEX_T       - size of pthread_mutex_t.
+//    __SIZEOF_PTHREAD_MUTEXATTR_T   - size of pthread_mutexattr_t.
+//    __SIZEOF_PTHREAD_COND_T        - size of pthread_cond_t.
+//    __SIZEOF_PTHREAD_CONDATTR_T    - size of pthread_condattr_t.
+//    __SIZEOF_PTHREAD_RWLOCK_T      - size of pthread_rwlock_t.
+//    __SIZEOF_PTHREAD_RWLOCKATTR_T  - size of pthread_rwlockattr_t.
+//    __SIZEOF_PTHREAD_BARRIER_T     - size of pthread_barrier_t.
+//    __SIZEOF_PTHREAD_BARRIERATTR_T - size of pthread_barrierattr_t.
+//
+//    The additional macro defines any constraint for the lock alignment
+//    inside the thread structures:
+//
+//    __LOCK_ALIGNMENT - for internal lock/futex usage.
+//
+//    Same idea but for the once locking primitive:
+//
+//    __ONCE_ALIGNMENT - for pthread_once_t/once_flag definition.
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Common definition of pthread_mutex_t.
+
+type X__pthread_list_t = X__pthread_internal_list /* thread-shared-types.h:53:3 */
+
+type X__pthread_internal_slist = struct{ F__next uintptr } /* thread-shared-types.h:55:9 */
+
+type X__pthread_slist_t = X__pthread_internal_slist /* thread-shared-types.h:58:3 */
+
+// Arch-specific mutex definitions.  A generic implementation is provided
+//    by sysdeps/nptl/bits/struct_mutex.h.  If required, an architecture
+//    can override it by defining:
+//
+//    1. struct __pthread_mutex_s (used on both pthread_mutex_t and mtx_t
+//       definition).  It should contains at least the internal members
+//       defined in the generic version.
+//
+//    2. __LOCK_ALIGNMENT for any extra attribute for internal lock used with
+//       atomic operations.
+//
+//    3. The macro __PTHREAD_MUTEX_INITIALIZER used for static initialization.
+//       It should initialize the mutex internal flag.
+
+// x86 internal mutex struct definitions.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+type X__pthread_mutex_s = struct {
+	F__lock    int32
+	F__count   uint32
+	F__owner   int32
+	F__nusers  uint32
+	F__kind    int32
+	F__spins   int16
+	F__elision int16
+	F__list    X__pthread_list_t
+} /* struct_mutex.h:22:1 */
+
+// Arch-sepecific read-write lock definitions.  A generic implementation is
+//    provided by struct_rwlock.h.  If required, an architecture can override it
+//    by defining:
+//
+//    1. struct __pthread_rwlock_arch_t (used on pthread_rwlock_t definition).
+//       It should contain at least the internal members defined in the
+//       generic version.
+//
+//    2. The macro __PTHREAD_RWLOCK_INITIALIZER used for static initialization.
+//       It should initialize the rwlock internal type.
+
+// x86 internal rwlock struct definitions.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+type X__pthread_rwlock_arch_t = struct {
+	F__readers       uint32
+	F__writers       uint32
+	F__wrphase_futex uint32
+	F__writers_futex uint32
+	F__pad3          uint32
+	F__pad4          uint32
+	F__cur_writer    int32
+	F__shared        int32
+	F__rwelision     int8
+	F__pad1          [7]uint8
+	F__pad2          uint64
+	F__flags         uint32
+	F__ccgo_pad1     [4]byte
+} /* struct_rwlock.h:23:1 */
+
+// Common definition of pthread_cond_t.
+
+type X__pthread_cond_s = struct {
+	F__0            struct{ F__wseq uint64 }
+	F__8            struct{ F__g1_start uint64 }
+	F__g_refs       [2]uint32
+	F__g_size       [2]uint32
+	F__g1_orig_size uint32
+	F__wrefs        uint32
+	F__g_signals    [2]uint32
+} /* thread-shared-types.h:92:1 */
+
+// Thread identifiers.  The structure of the attribute type is not
+//
+//	exposed on purpose.
+type Pthread_t = uint64 /* pthreadtypes.h:27:27 */
+
+// Data structures for mutex handling.  The structure of the attribute
+//
+//	type is not exposed on purpose.
+type Pthread_mutexattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:36:3 */
+
+// Data structure for condition variable handling.  The structure of
+//
+//	the attribute type is not exposed on purpose.
+type Pthread_condattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:45:3 */
+
+// Keys for thread-specific data
+type Pthread_key_t = uint32 /* pthreadtypes.h:49:22 */
+
+// Once-only execution
+type Pthread_once_t = int32 /* pthreadtypes.h:53:30 */
+
+type Pthread_attr_t1 = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [56]int8
+} /* pthreadtypes.h:56:1 */
+
+type Pthread_attr_t = Pthread_attr_t1 /* pthreadtypes.h:62:30 */
+
+type Pthread_mutex_t = struct{ F__data X__pthread_mutex_s } /* pthreadtypes.h:72:3 */
+
+type Pthread_cond_t = struct{ F__data X__pthread_cond_s } /* pthreadtypes.h:80:3 */
+
+// Data structure for reader-writer lock variable handling.  The
+//
+//	structure of the attribute type is deliberately not exposed.
+type Pthread_rwlock_t = struct{ F__data X__pthread_rwlock_arch_t } /* pthreadtypes.h:91:3 */
+
+type Pthread_rwlockattr_t = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [8]int8
+} /* pthreadtypes.h:97:3 */
+
+// POSIX spinlock data type.
+type Pthread_spinlock_t = int32 /* pthreadtypes.h:103:22 */
+
+// POSIX barriers data type.  The structure of the type is
+//
+//	deliberately not exposed.
+type Pthread_barrier_t = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [32]int8
+} /* pthreadtypes.h:112:3 */
+
+type Pthread_barrierattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:118:3 */
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX Standard: 5.6 File Characteristics	<sys/stat.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// NB: Include guard matches what <linux/time.h> uses.
+
+// The Single Unix specification says that some more types are
+//    available here.
+
+// Copyright (C) 1999-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Versions of the `struct stat' data structure.
+
+// x86-64 versions of the `xmknod' interface.
+
+type Stat = struct {
+	Fst_dev     X__dev_t
+	Fst_ino     X__ino_t
+	Fst_nlink   X__nlink_t
+	Fst_mode    X__mode_t
+	Fst_uid     X__uid_t
+	Fst_gid     X__gid_t
+	F__pad0     int32
+	Fst_rdev    X__dev_t
+	Fst_size    X__off_t
+	Fst_blksize X__blksize_t
+	Fst_blocks  X__blkcnt_t
+	Fst_atim    struct {
+		Ftv_sec  X__time_t
+		Ftv_nsec X__syscall_slong_t
+	}
+	Fst_mtim struct {
+		Ftv_sec  X__time_t
+		Ftv_nsec X__syscall_slong_t
+	}
+	Fst_ctim struct {
+		Ftv_sec  X__time_t
+		Ftv_nsec X__syscall_slong_t
+	}
+	F__glibc_reserved [3]X__syscall_slong_t
+} /* stat.h:46:1 */
+
+// File tree traversal functions declarations.
+//    Copyright (C) 1994-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (c) 1989, 1993
+//	The Regents of the University of California.  All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+// 4. Neither the name of the University nor the names of its contributors
+//    may be used to endorse or promote products derived from this software
+//    without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+// SUCH DAMAGE.
+//
+//	@(#)fts.h	8.3 (Berkeley) 8/14/94
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX Standard: 2.6 Primitive System Data Types	<sys/types.h>
+
+type X_ftsent = struct {
+	Ffts_cycle   uintptr
+	Ffts_parent  uintptr
+	Ffts_link    uintptr
+	Ffts_number  int64
+	Ffts_pointer uintptr
+	Ffts_accpath uintptr
+	Ffts_path    uintptr
+	Ffts_errno   int32
+	Ffts_symfd   int32
+	Ffts_pathlen uint16
+	Ffts_namelen uint16
+	F__ccgo_pad1 [4]byte
+	Ffts_ino     Ino_t
+	Ffts_dev     Dev_t
+	Ffts_nlink   Nlink_t
+	Ffts_level   int16
+	Ffts_info    uint16
+	Ffts_flags   uint16
+	Ffts_instr   uint16
+	Ffts_statp   uintptr
+	Ffts_name    [1]int8
+	F__ccgo_pad2 [7]byte
+} /* fts.h:58:2 */
+
+// File tree traversal functions declarations.
+//    Copyright (C) 1994-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (c) 1989, 1993
+//	The Regents of the University of California.  All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+// 4. Neither the name of the University nor the names of its contributors
+//    may be used to endorse or promote products derived from this software
+//    without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+// SUCH DAMAGE.
+//
+//	@(#)fts.h	8.3 (Berkeley) 8/14/94
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX Standard: 2.6 Primitive System Data Types	<sys/types.h>
+
+type FTS = struct {
+	Ffts_cur     uintptr
+	Ffts_child   uintptr
+	Ffts_array   uintptr
+	Ffts_dev     Dev_t
+	Ffts_path    uintptr
+	Ffts_rfd     int32
+	Ffts_pathlen int32
+	Ffts_nitems  int32
+	F__ccgo_pad1 [4]byte
+	Ffts_compar  uintptr
+	Ffts_options int32
+	F__ccgo_pad2 [4]byte
+} /* fts.h:81:3 */
+
+type FTSENT = X_ftsent /* fts.h:147:3 */
+
+var _ int8 /* gen.c:5:13: */
diff --git a/vendor/modernc.org/libc/grp/capi_linux_loong64.go b/vendor/modernc.org/libc/grp/capi_linux_loong64.go
new file mode 100644
index 00000000..39c1b899
--- /dev/null
+++ b/vendor/modernc.org/libc/grp/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo grp/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o grp/grp_linux_amd64.go -pkgname grp', DO NOT EDIT.
+
+package grp
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/grp/grp_linux_loong64.go b/vendor/modernc.org/libc/grp/grp_linux_loong64.go
new file mode 100644
index 00000000..2a52cae7
--- /dev/null
+++ b/vendor/modernc.org/libc/grp/grp_linux_loong64.go
@@ -0,0 +1,783 @@
+// Code generated by 'ccgo grp/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o grp/grp_linux_amd64.go -pkgname grp', DO NOT EDIT.
+
+package grp
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	NSS_BUFLEN_GROUP      = 1024   // grp.h:114:1:
+	X_ATFILE_SOURCE       = 1      // features.h:342:1:
+	X_BITS_TIME64_H       = 1      // time64.h:24:1:
+	X_BITS_TYPESIZES_H    = 1      // typesizes.h:24:1:
+	X_BITS_TYPES_H        = 1      // types.h:24:1:
+	X_BSD_SIZE_T_         = 0      // stddef.h:189:1:
+	X_BSD_SIZE_T_DEFINED_ = 0      // stddef.h:192:1:
+	X_DEFAULT_SOURCE      = 1      // features.h:227:1:
+	X_FEATURES_H          = 1      // features.h:19:1:
+	X_FILE_OFFSET_BITS    = 64     // <builtin>:25:1:
+	X_GCC_SIZE_T          = 0      // stddef.h:195:1:
+	X_GRP_H               = 1      // grp.h:23:1:
+	X_LP64                = 1      // <predefined>:284:1:
+	X_POSIX_C_SOURCE      = 200809 // features.h:281:1:
+	X_POSIX_SOURCE        = 1      // features.h:279:1:
+	X_SIZET_              = 0      // stddef.h:196:1:
+	X_SIZE_T              = 0      // stddef.h:183:1:
+	X_SIZE_T_             = 0      // stddef.h:188:1:
+	X_SIZE_T_DECLARED     = 0      // stddef.h:193:1:
+	X_SIZE_T_DEFINED      = 0      // stddef.h:191:1:
+	X_SIZE_T_DEFINED_     = 0      // stddef.h:190:1:
+	X_STDC_PREDEF_H       = 1      // <predefined>:162:1:
+	X_SYS_CDEFS_H         = 1      // cdefs.h:19:1:
+	X_SYS_SIZE_T_H        = 0      // stddef.h:184:1:
+	X_T_SIZE              = 0      // stddef.h:186:1:
+	X_T_SIZE_             = 0      // stddef.h:185:1:
+	Linux                 = 1      // <predefined>:231:1:
+	Unix                  = 1      // <predefined>:177:1:
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX Standard: 9.2.1 Group Database Access	<grp.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// These are defined by the user (or the compiler)
+//    to specify the desired environment:
+//
+//    __STRICT_ANSI__	ISO Standard C.
+//    _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
+//    _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
+//    _ISOC2X_SOURCE	Extensions to ISO C99 from ISO C2X.
+//    __STDC_WANT_LIB_EXT2__
+// 			Extensions to ISO C99 from TR 27431-2:2010.
+//    __STDC_WANT_IEC_60559_BFP_EXT__
+// 			Extensions to ISO C11 from TS 18661-1:2014.
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__
+// 			Extensions to ISO C11 from TS 18661-4:2015.
+//    __STDC_WANT_IEC_60559_TYPES_EXT__
+// 			Extensions to ISO C11 from TS 18661-3:2015.
+//
+//    _POSIX_SOURCE	IEEE Std 1003.1.
+//    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
+// 			if >=199309L, add IEEE Std 1003.1b-1993;
+// 			if >=199506L, add IEEE Std 1003.1c-1995;
+// 			if >=200112L, all of IEEE 1003.1-2004
+// 			if >=200809L, all of IEEE 1003.1-2008
+//    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
+// 			Single Unix conformance is wanted, to 600 for the
+// 			sixth revision, to 700 for the seventh revision.
+//    _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
+//    _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
+//    _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
+//    _FILE_OFFSET_BITS=N	Select default filesystem interface.
+//    _ATFILE_SOURCE	Additional *at interfaces.
+//    _GNU_SOURCE		All of the above, plus GNU extensions.
+//    _DEFAULT_SOURCE	The default set of features (taking precedence over
+// 			__STRICT_ANSI__).
+//
+//    _FORTIFY_SOURCE	Add security hardening to many library functions.
+// 			Set to 1 or 2; 2 performs stricter checks than 1.
+//
+//    _REENTRANT, _THREAD_SAFE
+// 			Obsolete; equivalent to _POSIX_C_SOURCE=199506L.
+//
+//    The `-ansi' switch to the GNU C compiler, and standards conformance
+//    options such as `-std=c99', define __STRICT_ANSI__.  If none of
+//    these are defined, or if _DEFAULT_SOURCE is defined, the default is
+//    to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
+//    200809L, as well as enabling miscellaneous functions from BSD and
+//    SVID.  If more than one of these are defined, they accumulate.  For
+//    example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
+//    give you ISO C, 1003.1, and 1003.2, but nothing else.
+//
+//    These are defined by this file and are used by the
+//    header files to decide what to declare or define:
+//
+//    __GLIBC_USE (F)	Define things from feature set F.  This is defined
+// 			to 1 or 0; the subsequent macros are either defined
+// 			or undefined, and those tests should be moved to
+// 			__GLIBC_USE.
+//    __USE_ISOC11		Define ISO C11 things.
+//    __USE_ISOC99		Define ISO C99 things.
+//    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+//    __USE_ISOCXX11	Define ISO C++11 things.
+//    __USE_POSIX		Define IEEE Std 1003.1 things.
+//    __USE_POSIX2		Define IEEE Std 1003.2 things.
+//    __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
+//    __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
+//    __USE_XOPEN		Define XPG things.
+//    __USE_XOPEN_EXTENDED	Define X/Open Unix things.
+//    __USE_UNIX98		Define Single Unix V2 things.
+//    __USE_XOPEN2K        Define XPG6 things.
+//    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+//    __USE_XOPEN2K8       Define XPG7 things.
+//    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
+//    __USE_LARGEFILE	Define correct standard I/O things.
+//    __USE_LARGEFILE64	Define LFS things with separate names.
+//    __USE_FILE_OFFSET64	Define 64bit interface as default.
+//    __USE_MISC		Define things from 4.3BSD or System V Unix.
+//    __USE_ATFILE		Define *at interfaces and AT_* constants for them.
+//    __USE_GNU		Define GNU extensions.
+//    __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
+//
+//    The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
+//    defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
+//    only for compatibility.  All new code should use the other symbols
+//    to test for features.
+//
+//    All macros listed above as possibly being defined by this file are
+//    explicitly undefined if they are not explicitly defined.
+//    Feature-test macros that are not defined by the user or compiler
+//    but are implied by the other feature-test macros defined (or by the
+//    lack of any definitions) are defined by the file.
+//
+//    ISO C feature test macros depend on the definition of the macro
+//    when an affected header is included, not when the first system
+//    header is included, and so they are handled in
+//    <bits/libc-header-start.h>, which does not have a multiple include
+//    guard.  Feature test macros that can be handled from the first
+//    system header included are handled here.
+
+// Undefine everything, so we get a clean slate.
+
+// Suppress kernel-name space pollution unless user expressedly asks
+//    for it.
+
+// Convenience macro to test the version of gcc.
+//    Use like this:
+//    #if __GNUC_PREREQ (2,8)
+//    ... code requiring gcc 2.8 or later ...
+//    #endif
+//    Note: only works for GCC 2.0 and later, because __GNUC_MINOR__ was
+//    added in 2.0.
+
+// Similarly for clang.  Features added to GCC after version 4.2 may
+//    or may not also be available in clang, and clang's definitions of
+//    __GNUC(_MINOR)__ are fixed at 4 and 2 respectively.  Not all such
+//    features can be queried via __has_extension/__has_feature.
+
+// Whether to use feature set F.
+
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
+//    _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
+//    issue a warning; the expectation is that the source is being
+//    transitioned to use the new macro.
+
+// If _GNU_SOURCE was defined by the user, turn on all the other features.
+
+// If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
+//    define _DEFAULT_SOURCE.
+
+// This is to enable the ISO C2X extension.
+
+// This is to enable the ISO C11 extension.
+
+// This is to enable the ISO C99 extension.
+
+// This is to enable the ISO C90 Amendment 1:1995 extension.
+
+// If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
+//    is defined, use POSIX.1-2008 (or another version depending on
+//    _XOPEN_SOURCE).
+
+// Some C libraries once required _REENTRANT and/or _THREAD_SAFE to be
+//    defined in all multithreaded code.  GNU libc has not required this
+//    for many years.  We now treat them as compatibility synonyms for
+//    _POSIX_C_SOURCE=199506L, which is the earliest level of POSIX with
+//    comprehensive support for multithreaded code.  Using them never
+//    lowers the selected level of POSIX conformance, only raises it.
+
+// The function 'gets' existed in C89, but is impossible to use
+//    safely.  It has been removed from ISO C11 and ISO C++14.  Note: for
+//    compatibility with various implementations of <cstdio>, this test
+//    must consider only the value of __cplusplus when compiling C++.
+
+// GNU formerly extended the scanf functions with modified format
+//    specifiers %as, %aS, and %a[...] that allocate a buffer for the
+//    input using malloc.  This extension conflicts with ISO C99, which
+//    defines %a as a standalone format specifier that reads a floating-
+//    point number; moreover, POSIX.1-2008 provides the same feature
+//    using the modifier letter 'm' instead (%ms, %mS, %m[...]).
+//
+//    We now follow C99 unless GNU extensions are active and the compiler
+//    is specifically in C89 or C++98 mode (strict or not).  For
+//    instance, with GCC, -std=gnu11 will have C99-compliant scanf with
+//    or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
+//    old extension.
+
+// Get definitions of __STDC_* predefined macros, if the compiler has
+//    not preincluded this header automatically.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This macro indicates that the installed library is the GNU C Library.
+//    For historic reasons the value now is 6 and this will stay from now
+//    on.  The use of this variable is deprecated.  Use __GLIBC__ and
+//    __GLIBC_MINOR__ now (see below) when you want to test for a specific
+//    GNU C library version and use the values in <gnu/lib-names.h> to get
+//    the sonames of the shared libraries.
+
+// Major and minor version number of the GNU C library package.  Use
+//    these macros to test for features in specific releases.
+
+// This is here only because every header file already includes this one.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// We are almost always included from features.h.
+
+// The GNU libc does not support any K&R compilers or the traditional mode
+//    of ISO C compilers anymore.  Check for some of the combinations not
+//    anymore supported.
+
+// Some user header file might have defined this before.
+
+// All functions, except those with callbacks or those that
+//    synchronize memory, are leaf functions.
+
+// GCC can always grok prototypes.  For C++ programs we add throw()
+//    to help it optimize the function calls.  But this works only with
+//    gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+//    as non-throwing using a function attribute since programs can use
+//    the -fexceptions options for C code as well.
+
+// Compilers that are not clang may object to
+//        #if defined __clang__ && __has_extension(...)
+//    even though they do not need to evaluate the right-hand side of the &&.
+
+// These two macros are not used in glibc anymore.  They are kept here
+//    only because some other projects expect the macros to be defined.
+
+// For these things, GCC behaves the ANSI way normally,
+//    and the non-ANSI way under -traditional.
+
+// This is not a typedef so `const __ptr_t' does the right thing.
+
+// C++ needs to know that types and declarations are C, not C++.
+
+// Fortify support.
+
+// Support for flexible arrays.
+//    Headers that should use flexible arrays only if they're "real"
+//    (e.g. only if they won't affect sizeof()) should test
+//    #if __glibc_c99_flexarr_available.
+
+// __asm__ ("xyz") is used throughout the headers to rename functions
+//    at the assembly language level.  This is wrapped by the __REDIRECT
+//    macro, in order to support compilers that can do this some other
+//    way.  When compilers don't support asm-names at all, we have to do
+//    preprocessor tricks instead (which don't have exactly the right
+//    semantics, but it's the best we can do).
+//
+//    Example:
+//    int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid);
+
+//
+// #elif __SOME_OTHER_COMPILER__
+//
+// # define __REDIRECT(name, proto, alias) name proto; 	_Pragma("let " #name " = " #alias)
+
+// GCC has various useful declarations that can be made with the
+//    `__attribute__' syntax.  All of the ways we use this do fine if
+//    they are omitted for compilers that don't understand it.
+
+// At some point during the gcc 2.96 development the `malloc' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Tell the compiler which arguments to an allocation function
+//    indicate the size of the allocation.
+
+// At some point during the gcc 2.96 development the `pure' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// This declaration tells the compiler that the value is constant.
+
+// At some point during the gcc 3.1 development the `used' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Since version 3.2, gcc allows marking deprecated functions.
+
+// Since version 4.5, gcc also allows one to specify the message printed
+//    when a deprecated function is used.  clang claims to be gcc 4.2, but
+//    may also support this feature.
+
+// At some point during the gcc 2.8 development the `format_arg' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+//    If several `format_arg' attributes are given for the same function, in
+//    gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+//    all designated arguments are considered.
+
+// At some point during the gcc 2.97 development the `strfmon' format
+//    attribute for functions was introduced.  We don't want to use it
+//    unconditionally (although this would be possible) since it
+//    generates warnings.
+
+// The nonull function attribute allows to mark pointer parameters which
+//    must not be NULL.
+
+// If fortification mode, we warn about unused results of certain
+//    function calls which can lead to problems.
+
+// Forces a function to be always inlined.
+// The Linux kernel defines __always_inline in stddef.h (283d7573), and
+//    it conflicts with this definition.  Therefore undefine it first to
+//    allow either header to be included first.
+
+// Associate error messages with the source location of the call site rather
+//    than with the source location inside the function.
+
+// GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+//    inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
+//    or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+//    older than 4.3 may define these macros and still not guarantee GNU inlining
+//    semantics.
+//
+//    clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+//    semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
+//    __GNUC_GNU_INLINE__ macro definitions.
+
+// GCC 4.3 and above allow passing all anonymous arguments of an
+//    __extern_always_inline function to some other vararg function.
+
+// It is possible to compile containing GCC extensions even if GCC is
+//    run in pedantic mode if the uses are carefully marked using the
+//    `__extension__' keyword.  But this is not generally available before
+//    version 2.8.
+
+// __restrict is known in EGCS 1.2 and above.
+
+// ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+//      array_name[restrict]
+//    GCC 3.1 supports this.
+
+// Describes a char array whose address can safely be passed as the first
+//    argument to strncpy and strncat, as the char array is not necessarily
+//    a NUL-terminated string.
+
+// Undefine (also defined in libc-symbols.h).
+// Copies attributes from the declaration or type referenced by
+//    the argument.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// __glibc_macro_warning (MESSAGE) issues warning MESSAGE.  This is
+//    intended for use in preprocessor macros.
+//
+//    Note: MESSAGE must be a _single_ string; concatenation of string
+//    literals is not supported.
+
+// Generic selection (ISO C11) is a C-only feature, available in GCC
+//    since version 4.9.  Previous versions do not provide generic
+//    selection, even though they might set __STDC_VERSION__ to 201112L,
+//    when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
+//    when testing __STDC_VERSION__ for generic selection support.
+//    On the other hand, Clang also defines __GNUC__, so a clang-specific
+//    check is required to enable the use of generic selection.
+
+// If we don't have __REDIRECT, prototypes will be missing if
+//    __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64].
+
+// Decide whether we can define 'extern inline' functions in headers.
+
+// This is here only because every header file already includes this one.
+//    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
+//    <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+//    that will always return failure (and set errno to ENOSYS).
+// This file is automatically generated.
+//    This file selects the right generated file of `__stub_FUNCTION' macros
+//    based on the architecture being compiled for.
+
+// This file is automatically generated.
+//    It defines a symbol `__stub_FUNCTION' for each function
+//    in the C library which is a stub, meaning it will fail
+//    every time called, usually setting errno to ENOSYS.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// For the Single Unix specification we must define this type here.
+type Gid_t = X__gid_t /* grp.h:37:17 */
+
+// The group structure.
+type Group = struct {
+	Fgr_name     uintptr
+	Fgr_passwd   uintptr
+	Fgr_gid      X__gid_t
+	F__ccgo_pad1 [4]byte
+	Fgr_mem      uintptr
+} /* grp.h:42:1 */
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/langinfo/capi_linux_loong64.go b/vendor/modernc.org/libc/langinfo/capi_linux_loong64.go
new file mode 100644
index 00000000..f9c787ba
--- /dev/null
+++ b/vendor/modernc.org/libc/langinfo/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo langinfo/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o langinfo/langinfo_linux_amd64.go -pkgname langinfo', DO NOT EDIT.
+
+package langinfo
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/langinfo/langinfo_linux_loong64.go b/vendor/modernc.org/libc/langinfo/langinfo_linux_loong64.go
new file mode 100644
index 00000000..dee83b91
--- /dev/null
+++ b/vendor/modernc.org/libc/langinfo/langinfo_linux_loong64.go
@@ -0,0 +1,1058 @@
+// Code generated by 'ccgo langinfo/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o langinfo/langinfo_linux_amd64.go -pkgname langinfo', DO NOT EDIT.
+
+package langinfo
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	NL_CAT_LOCALE             = 1      // nl_types.h:27:1:
+	NL_SETD                   = 1      // nl_types.h:24:1:
+	X_ATFILE_SOURCE           = 1      // features.h:342:1:
+	X_BITS_LOCALE_H           = 1      // locale.h:24:1:
+	X_BITS_TYPES_LOCALE_T_H   = 1      // locale_t.h:20:1:
+	X_BITS_TYPES___LOCALE_T_H = 1      // __locale_t.h:21:1:
+	X_DEFAULT_SOURCE          = 1      // features.h:227:1:
+	X_FEATURES_H              = 1      // features.h:19:1:
+	X_FILE_OFFSET_BITS        = 64     // <builtin>:25:1:
+	X_LANGINFO_H              = 1      // langinfo.h:20:1:
+	X_LP64                    = 1      // <predefined>:284:1:
+	X_NL_TYPES_H              = 1      // nl_types.h:19:1:
+	X_POSIX_C_SOURCE          = 200809 // features.h:281:1:
+	X_POSIX_SOURCE            = 1      // features.h:279:1:
+	X_STDC_PREDEF_H           = 1      // <predefined>:162:1:
+	X_SYS_CDEFS_H             = 1      // cdefs.h:19:1:
+	Linux                     = 1      // <predefined>:231:1:
+	Unix                      = 1      // <predefined>:177:1:
+)
+
+// Definition of locale category symbol values.
+//    Copyright (C) 2001-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Construct an `nl_item' value for `nl_langinfo' from a locale category
+//    (LC_*) and an item index within the category.  Some code may depend on
+//    the item values within a category increasing monotonically with the
+//    indices.
+
+// Extract the category and item index from a constructed `nl_item' value.
+
+// Enumeration of locale items that can be queried with `nl_langinfo'.
+const ( /* langinfo.h:41:1: */
+	// LC_TIME category: date and time formatting.
+
+	// Abbreviated days of the week.
+	ABDAY_1 = 131072 // Sun
+	ABDAY_2 = 131073
+	ABDAY_3 = 131074
+	ABDAY_4 = 131075
+	ABDAY_5 = 131076
+	ABDAY_6 = 131077
+	ABDAY_7 = 131078
+
+	// Long-named days of the week.
+	DAY_1 = 131079 // Sunday
+	DAY_2 = 131080 // Monday
+	DAY_3 = 131081 // Tuesday
+	DAY_4 = 131082 // Wednesday
+	DAY_5 = 131083 // Thursday
+	DAY_6 = 131084 // Friday
+	DAY_7 = 131085 // Saturday
+
+	// Abbreviated month names, in the grammatical form used when the month
+	//      is a part of a complete date.
+	ABMON_1  = 131086 // Jan
+	ABMON_2  = 131087
+	ABMON_3  = 131088
+	ABMON_4  = 131089
+	ABMON_5  = 131090
+	ABMON_6  = 131091
+	ABMON_7  = 131092
+	ABMON_8  = 131093
+	ABMON_9  = 131094
+	ABMON_10 = 131095
+	ABMON_11 = 131096
+	ABMON_12 = 131097
+
+	// Long month names, in the grammatical form used when the month
+	//      is a part of a complete date.
+	MON_1  = 131098 // January
+	MON_2  = 131099
+	MON_3  = 131100
+	MON_4  = 131101
+	MON_5  = 131102
+	MON_6  = 131103
+	MON_7  = 131104
+	MON_8  = 131105
+	MON_9  = 131106
+	MON_10 = 131107
+	MON_11 = 131108
+	MON_12 = 131109
+
+	AM_STR = 131110 // Ante meridiem string.
+	PM_STR = 131111 // Post meridiem string.
+
+	D_T_FMT    = 131112 // Date and time format for strftime.
+	D_FMT      = 131113 // Date format for strftime.
+	T_FMT      = 131114 // Time format for strftime.
+	T_FMT_AMPM = 131115 // 12-hour time format for strftime.
+
+	ERA         = 131116 // Alternate era.
+	X__ERA_YEAR = 131117 // Year in alternate era format.
+	ERA_D_FMT   = 131118 // Date in alternate era format.
+	ALT_DIGITS  = 131119 // Alternate symbols for digits.
+	ERA_D_T_FMT = 131120 // Date and time in alternate era format.
+	ERA_T_FMT   = 131121 // Time in alternate era format.
+
+	X_NL_TIME_ERA_NUM_ENTRIES = 131122 // Number entries in the era arrays.
+	X_NL_TIME_ERA_ENTRIES     = 131123 // Structure with era entries in usable form.
+
+	X_NL_WABDAY_1 = 131124 // Sun
+	X_NL_WABDAY_2 = 131125
+	X_NL_WABDAY_3 = 131126
+	X_NL_WABDAY_4 = 131127
+	X_NL_WABDAY_5 = 131128
+	X_NL_WABDAY_6 = 131129
+	X_NL_WABDAY_7 = 131130
+
+	// Long-named days of the week.
+	X_NL_WDAY_1 = 131131 // Sunday
+	X_NL_WDAY_2 = 131132 // Monday
+	X_NL_WDAY_3 = 131133 // Tuesday
+	X_NL_WDAY_4 = 131134 // Wednesday
+	X_NL_WDAY_5 = 131135 // Thursday
+	X_NL_WDAY_6 = 131136 // Friday
+	X_NL_WDAY_7 = 131137 // Saturday
+
+	// Abbreviated month names, in the grammatical form used when the month
+	//      is a part of a complete date.
+	X_NL_WABMON_1  = 131138 // Jan
+	X_NL_WABMON_2  = 131139
+	X_NL_WABMON_3  = 131140
+	X_NL_WABMON_4  = 131141
+	X_NL_WABMON_5  = 131142
+	X_NL_WABMON_6  = 131143
+	X_NL_WABMON_7  = 131144
+	X_NL_WABMON_8  = 131145
+	X_NL_WABMON_9  = 131146
+	X_NL_WABMON_10 = 131147
+	X_NL_WABMON_11 = 131148
+	X_NL_WABMON_12 = 131149
+
+	// Long month names, in the grammatical form used when the month
+	//      is a part of a complete date.
+	X_NL_WMON_1  = 131150 // January
+	X_NL_WMON_2  = 131151
+	X_NL_WMON_3  = 131152
+	X_NL_WMON_4  = 131153
+	X_NL_WMON_5  = 131154
+	X_NL_WMON_6  = 131155
+	X_NL_WMON_7  = 131156
+	X_NL_WMON_8  = 131157
+	X_NL_WMON_9  = 131158
+	X_NL_WMON_10 = 131159
+	X_NL_WMON_11 = 131160
+	X_NL_WMON_12 = 131161
+
+	X_NL_WAM_STR = 131162 // Ante meridiem string.
+	X_NL_WPM_STR = 131163 // Post meridiem string.
+
+	X_NL_WD_T_FMT    = 131164 // Date and time format for strftime.
+	X_NL_WD_FMT      = 131165 // Date format for strftime.
+	X_NL_WT_FMT      = 131166 // Time format for strftime.
+	X_NL_WT_FMT_AMPM = 131167 // 12-hour time format for strftime.
+
+	X_NL_WERA_YEAR    = 131168 // Year in alternate era format.
+	X_NL_WERA_D_FMT   = 131169 // Date in alternate era format.
+	X_NL_WALT_DIGITS  = 131170 // Alternate symbols for digits.
+	X_NL_WERA_D_T_FMT = 131171 // Date and time in alternate era format.
+	X_NL_WERA_T_FMT   = 131172 // Time in alternate era format.
+
+	X_NL_TIME_WEEK_NDAYS    = 131173
+	X_NL_TIME_WEEK_1STDAY   = 131174
+	X_NL_TIME_WEEK_1STWEEK  = 131175
+	X_NL_TIME_FIRST_WEEKDAY = 131176
+	X_NL_TIME_FIRST_WORKDAY = 131177
+	X_NL_TIME_CAL_DIRECTION = 131178
+	X_NL_TIME_TIMEZONE      = 131179
+
+	X_DATE_FMT      = 131180 // strftime format for date.
+	X_NL_W_DATE_FMT = 131181
+
+	X_NL_TIME_CODESET = 131182
+
+	// Long month names, in the grammatical form used when the month
+	//      is named by itself.
+	X__ALTMON_1  = 131183 // January
+	X__ALTMON_2  = 131184
+	X__ALTMON_3  = 131185
+	X__ALTMON_4  = 131186
+	X__ALTMON_5  = 131187
+	X__ALTMON_6  = 131188
+	X__ALTMON_7  = 131189
+	X__ALTMON_8  = 131190
+	X__ALTMON_9  = 131191
+	X__ALTMON_10 = 131192
+	X__ALTMON_11 = 131193
+	X__ALTMON_12 = 131194
+
+	// Long month names, in the grammatical form used when the month
+	//      is named by itself.
+	X_NL_WALTMON_1  = 131195 // January
+	X_NL_WALTMON_2  = 131196
+	X_NL_WALTMON_3  = 131197
+	X_NL_WALTMON_4  = 131198
+	X_NL_WALTMON_5  = 131199
+	X_NL_WALTMON_6  = 131200
+	X_NL_WALTMON_7  = 131201
+	X_NL_WALTMON_8  = 131202
+	X_NL_WALTMON_9  = 131203
+	X_NL_WALTMON_10 = 131204
+	X_NL_WALTMON_11 = 131205
+	X_NL_WALTMON_12 = 131206
+
+	// Abbreviated month names, in the grammatical form used when the month
+	//      is named by itself.
+	X_NL_ABALTMON_1  = 131207 // Jan
+	X_NL_ABALTMON_2  = 131208
+	X_NL_ABALTMON_3  = 131209
+	X_NL_ABALTMON_4  = 131210
+	X_NL_ABALTMON_5  = 131211
+	X_NL_ABALTMON_6  = 131212
+	X_NL_ABALTMON_7  = 131213
+	X_NL_ABALTMON_8  = 131214
+	X_NL_ABALTMON_9  = 131215
+	X_NL_ABALTMON_10 = 131216
+	X_NL_ABALTMON_11 = 131217
+	X_NL_ABALTMON_12 = 131218
+
+	// Abbreviated month names, in the grammatical form used when the month
+	//      is named by itself.
+	X_NL_WABALTMON_1  = 131219 // Jan
+	X_NL_WABALTMON_2  = 131220
+	X_NL_WABALTMON_3  = 131221
+	X_NL_WABALTMON_4  = 131222
+	X_NL_WABALTMON_5  = 131223
+	X_NL_WABALTMON_6  = 131224
+	X_NL_WABALTMON_7  = 131225
+	X_NL_WABALTMON_8  = 131226
+	X_NL_WABALTMON_9  = 131227
+	X_NL_WABALTMON_10 = 131228
+	X_NL_WABALTMON_11 = 131229
+	X_NL_WABALTMON_12 = 131230
+
+	X_NL_NUM_LC_TIME = 131231 // Number of indices in LC_TIME category.
+
+	// LC_COLLATE category: text sorting.
+	//      This information is accessed by the strcoll and strxfrm functions.
+	//      These `nl_langinfo' names are used only internally.
+	X_NL_COLLATE_NRULES           = 196608
+	X_NL_COLLATE_RULESETS         = 196609
+	X_NL_COLLATE_TABLEMB          = 196610
+	X_NL_COLLATE_WEIGHTMB         = 196611
+	X_NL_COLLATE_EXTRAMB          = 196612
+	X_NL_COLLATE_INDIRECTMB       = 196613
+	X_NL_COLLATE_GAP1             = 196614
+	X_NL_COLLATE_GAP2             = 196615
+	X_NL_COLLATE_GAP3             = 196616
+	X_NL_COLLATE_TABLEWC          = 196617
+	X_NL_COLLATE_WEIGHTWC         = 196618
+	X_NL_COLLATE_EXTRAWC          = 196619
+	X_NL_COLLATE_INDIRECTWC       = 196620
+	X_NL_COLLATE_SYMB_HASH_SIZEMB = 196621
+	X_NL_COLLATE_SYMB_TABLEMB     = 196622
+	X_NL_COLLATE_SYMB_EXTRAMB     = 196623
+	X_NL_COLLATE_COLLSEQMB        = 196624
+	X_NL_COLLATE_COLLSEQWC        = 196625
+	X_NL_COLLATE_CODESET          = 196626
+	X_NL_NUM_LC_COLLATE           = 196627
+
+	// LC_CTYPE category: character classification.
+	//      This information is accessed by the functions in <ctype.h>.
+	//      These `nl_langinfo' names are used only internally.
+	X_NL_CTYPE_CLASS                        = 0
+	X_NL_CTYPE_TOUPPER                      = 1
+	X_NL_CTYPE_GAP1                         = 2
+	X_NL_CTYPE_TOLOWER                      = 3
+	X_NL_CTYPE_GAP2                         = 4
+	X_NL_CTYPE_CLASS32                      = 5
+	X_NL_CTYPE_GAP3                         = 6
+	X_NL_CTYPE_GAP4                         = 7
+	X_NL_CTYPE_GAP5                         = 8
+	X_NL_CTYPE_GAP6                         = 9
+	X_NL_CTYPE_CLASS_NAMES                  = 10
+	X_NL_CTYPE_MAP_NAMES                    = 11
+	X_NL_CTYPE_WIDTH                        = 12
+	X_NL_CTYPE_MB_CUR_MAX                   = 13
+	X_NL_CTYPE_CODESET_NAME                 = 14
+	CODESET                                 = 14
+	X_NL_CTYPE_TOUPPER32                    = 15
+	X_NL_CTYPE_TOLOWER32                    = 16
+	X_NL_CTYPE_CLASS_OFFSET                 = 17
+	X_NL_CTYPE_MAP_OFFSET                   = 18
+	X_NL_CTYPE_INDIGITS_MB_LEN              = 19
+	X_NL_CTYPE_INDIGITS0_MB                 = 20
+	X_NL_CTYPE_INDIGITS1_MB                 = 21
+	X_NL_CTYPE_INDIGITS2_MB                 = 22
+	X_NL_CTYPE_INDIGITS3_MB                 = 23
+	X_NL_CTYPE_INDIGITS4_MB                 = 24
+	X_NL_CTYPE_INDIGITS5_MB                 = 25
+	X_NL_CTYPE_INDIGITS6_MB                 = 26
+	X_NL_CTYPE_INDIGITS7_MB                 = 27
+	X_NL_CTYPE_INDIGITS8_MB                 = 28
+	X_NL_CTYPE_INDIGITS9_MB                 = 29
+	X_NL_CTYPE_INDIGITS_WC_LEN              = 30
+	X_NL_CTYPE_INDIGITS0_WC                 = 31
+	X_NL_CTYPE_INDIGITS1_WC                 = 32
+	X_NL_CTYPE_INDIGITS2_WC                 = 33
+	X_NL_CTYPE_INDIGITS3_WC                 = 34
+	X_NL_CTYPE_INDIGITS4_WC                 = 35
+	X_NL_CTYPE_INDIGITS5_WC                 = 36
+	X_NL_CTYPE_INDIGITS6_WC                 = 37
+	X_NL_CTYPE_INDIGITS7_WC                 = 38
+	X_NL_CTYPE_INDIGITS8_WC                 = 39
+	X_NL_CTYPE_INDIGITS9_WC                 = 40
+	X_NL_CTYPE_OUTDIGIT0_MB                 = 41
+	X_NL_CTYPE_OUTDIGIT1_MB                 = 42
+	X_NL_CTYPE_OUTDIGIT2_MB                 = 43
+	X_NL_CTYPE_OUTDIGIT3_MB                 = 44
+	X_NL_CTYPE_OUTDIGIT4_MB                 = 45
+	X_NL_CTYPE_OUTDIGIT5_MB                 = 46
+	X_NL_CTYPE_OUTDIGIT6_MB                 = 47
+	X_NL_CTYPE_OUTDIGIT7_MB                 = 48
+	X_NL_CTYPE_OUTDIGIT8_MB                 = 49
+	X_NL_CTYPE_OUTDIGIT9_MB                 = 50
+	X_NL_CTYPE_OUTDIGIT0_WC                 = 51
+	X_NL_CTYPE_OUTDIGIT1_WC                 = 52
+	X_NL_CTYPE_OUTDIGIT2_WC                 = 53
+	X_NL_CTYPE_OUTDIGIT3_WC                 = 54
+	X_NL_CTYPE_OUTDIGIT4_WC                 = 55
+	X_NL_CTYPE_OUTDIGIT5_WC                 = 56
+	X_NL_CTYPE_OUTDIGIT6_WC                 = 57
+	X_NL_CTYPE_OUTDIGIT7_WC                 = 58
+	X_NL_CTYPE_OUTDIGIT8_WC                 = 59
+	X_NL_CTYPE_OUTDIGIT9_WC                 = 60
+	X_NL_CTYPE_TRANSLIT_TAB_SIZE            = 61
+	X_NL_CTYPE_TRANSLIT_FROM_IDX            = 62
+	X_NL_CTYPE_TRANSLIT_FROM_TBL            = 63
+	X_NL_CTYPE_TRANSLIT_TO_IDX              = 64
+	X_NL_CTYPE_TRANSLIT_TO_TBL              = 65
+	X_NL_CTYPE_TRANSLIT_DEFAULT_MISSING_LEN = 66
+	X_NL_CTYPE_TRANSLIT_DEFAULT_MISSING     = 67
+	X_NL_CTYPE_TRANSLIT_IGNORE_LEN          = 68
+	X_NL_CTYPE_TRANSLIT_IGNORE              = 69
+	X_NL_CTYPE_MAP_TO_NONASCII              = 70
+	X_NL_CTYPE_NONASCII_CASE                = 71
+	X_NL_CTYPE_EXTRA_MAP_1                  = 72
+	X_NL_CTYPE_EXTRA_MAP_2                  = 73
+	X_NL_CTYPE_EXTRA_MAP_3                  = 74
+	X_NL_CTYPE_EXTRA_MAP_4                  = 75
+	X_NL_CTYPE_EXTRA_MAP_5                  = 76
+	X_NL_CTYPE_EXTRA_MAP_6                  = 77
+	X_NL_CTYPE_EXTRA_MAP_7                  = 78
+	X_NL_CTYPE_EXTRA_MAP_8                  = 79
+	X_NL_CTYPE_EXTRA_MAP_9                  = 80
+	X_NL_CTYPE_EXTRA_MAP_10                 = 81
+	X_NL_CTYPE_EXTRA_MAP_11                 = 82
+	X_NL_CTYPE_EXTRA_MAP_12                 = 83
+	X_NL_CTYPE_EXTRA_MAP_13                 = 84
+	X_NL_CTYPE_EXTRA_MAP_14                 = 85
+	X_NL_NUM_LC_CTYPE                       = 86
+
+	// LC_MONETARY category: formatting of monetary quantities.
+	//      These items each correspond to a member of `struct lconv',
+	//      defined in <locale.h>.
+	X__INT_CURR_SYMBOL                   = 262144
+	X__CURRENCY_SYMBOL                   = 262145
+	X__MON_DECIMAL_POINT                 = 262146
+	X__MON_THOUSANDS_SEP                 = 262147
+	X__MON_GROUPING                      = 262148
+	X__POSITIVE_SIGN                     = 262149
+	X__NEGATIVE_SIGN                     = 262150
+	X__INT_FRAC_DIGITS                   = 262151
+	X__FRAC_DIGITS                       = 262152
+	X__P_CS_PRECEDES                     = 262153
+	X__P_SEP_BY_SPACE                    = 262154
+	X__N_CS_PRECEDES                     = 262155
+	X__N_SEP_BY_SPACE                    = 262156
+	X__P_SIGN_POSN                       = 262157
+	X__N_SIGN_POSN                       = 262158
+	X_NL_MONETARY_CRNCYSTR               = 262159
+	X__INT_P_CS_PRECEDES                 = 262160
+	X__INT_P_SEP_BY_SPACE                = 262161
+	X__INT_N_CS_PRECEDES                 = 262162
+	X__INT_N_SEP_BY_SPACE                = 262163
+	X__INT_P_SIGN_POSN                   = 262164
+	X__INT_N_SIGN_POSN                   = 262165
+	X_NL_MONETARY_DUO_INT_CURR_SYMBOL    = 262166
+	X_NL_MONETARY_DUO_CURRENCY_SYMBOL    = 262167
+	X_NL_MONETARY_DUO_INT_FRAC_DIGITS    = 262168
+	X_NL_MONETARY_DUO_FRAC_DIGITS        = 262169
+	X_NL_MONETARY_DUO_P_CS_PRECEDES      = 262170
+	X_NL_MONETARY_DUO_P_SEP_BY_SPACE     = 262171
+	X_NL_MONETARY_DUO_N_CS_PRECEDES      = 262172
+	X_NL_MONETARY_DUO_N_SEP_BY_SPACE     = 262173
+	X_NL_MONETARY_DUO_INT_P_CS_PRECEDES  = 262174
+	X_NL_MONETARY_DUO_INT_P_SEP_BY_SPACE = 262175
+	X_NL_MONETARY_DUO_INT_N_CS_PRECEDES  = 262176
+	X_NL_MONETARY_DUO_INT_N_SEP_BY_SPACE = 262177
+	X_NL_MONETARY_DUO_P_SIGN_POSN        = 262178
+	X_NL_MONETARY_DUO_N_SIGN_POSN        = 262179
+	X_NL_MONETARY_DUO_INT_P_SIGN_POSN    = 262180
+	X_NL_MONETARY_DUO_INT_N_SIGN_POSN    = 262181
+	X_NL_MONETARY_UNO_VALID_FROM         = 262182
+	X_NL_MONETARY_UNO_VALID_TO           = 262183
+	X_NL_MONETARY_DUO_VALID_FROM         = 262184
+	X_NL_MONETARY_DUO_VALID_TO           = 262185
+	X_NL_MONETARY_CONVERSION_RATE        = 262186
+	X_NL_MONETARY_DECIMAL_POINT_WC       = 262187
+	X_NL_MONETARY_THOUSANDS_SEP_WC       = 262188
+	X_NL_MONETARY_CODESET                = 262189
+	X_NL_NUM_LC_MONETARY                 = 262190
+
+	// LC_NUMERIC category: formatting of numbers.
+	//      These also correspond to members of `struct lconv'; see <locale.h>.
+	X__DECIMAL_POINT              = 65536
+	RADIXCHAR                     = 65536
+	X__THOUSANDS_SEP              = 65537
+	THOUSEP                       = 65537
+	X__GROUPING                   = 65538
+	X_NL_NUMERIC_DECIMAL_POINT_WC = 65539
+	X_NL_NUMERIC_THOUSANDS_SEP_WC = 65540
+	X_NL_NUMERIC_CODESET          = 65541
+	X_NL_NUM_LC_NUMERIC           = 65542
+
+	X__YESEXPR            = 327680 // Regex matching ``yes'' input.
+	X__NOEXPR             = 327681 // Regex matching ``no'' input.
+	X__YESSTR             = 327682 // Output string for ``yes''.
+	X__NOSTR              = 327683 // Output string for ``no''.
+	X_NL_MESSAGES_CODESET = 327684
+	X_NL_NUM_LC_MESSAGES  = 327685
+
+	X_NL_PAPER_HEIGHT  = 458752
+	X_NL_PAPER_WIDTH   = 458753
+	X_NL_PAPER_CODESET = 458754
+	X_NL_NUM_LC_PAPER  = 458755
+
+	X_NL_NAME_NAME_FMT  = 524288
+	X_NL_NAME_NAME_GEN  = 524289
+	X_NL_NAME_NAME_MR   = 524290
+	X_NL_NAME_NAME_MRS  = 524291
+	X_NL_NAME_NAME_MISS = 524292
+	X_NL_NAME_NAME_MS   = 524293
+	X_NL_NAME_CODESET   = 524294
+	X_NL_NUM_LC_NAME    = 524295
+
+	X_NL_ADDRESS_POSTAL_FMT   = 589824
+	X_NL_ADDRESS_COUNTRY_NAME = 589825
+	X_NL_ADDRESS_COUNTRY_POST = 589826
+	X_NL_ADDRESS_COUNTRY_AB2  = 589827
+	X_NL_ADDRESS_COUNTRY_AB3  = 589828
+	X_NL_ADDRESS_COUNTRY_CAR  = 589829
+	X_NL_ADDRESS_COUNTRY_NUM  = 589830
+	X_NL_ADDRESS_COUNTRY_ISBN = 589831
+	X_NL_ADDRESS_LANG_NAME    = 589832
+	X_NL_ADDRESS_LANG_AB      = 589833
+	X_NL_ADDRESS_LANG_TERM    = 589834
+	X_NL_ADDRESS_LANG_LIB     = 589835
+	X_NL_ADDRESS_CODESET      = 589836
+	X_NL_NUM_LC_ADDRESS       = 589837
+
+	X_NL_TELEPHONE_TEL_INT_FMT = 655360
+	X_NL_TELEPHONE_TEL_DOM_FMT = 655361
+	X_NL_TELEPHONE_INT_SELECT  = 655362
+	X_NL_TELEPHONE_INT_PREFIX  = 655363
+	X_NL_TELEPHONE_CODESET     = 655364
+	X_NL_NUM_LC_TELEPHONE      = 655365
+
+	X_NL_MEASUREMENT_MEASUREMENT = 720896
+	X_NL_MEASUREMENT_CODESET     = 720897
+	X_NL_NUM_LC_MEASUREMENT      = 720898
+
+	X_NL_IDENTIFICATION_TITLE        = 786432
+	X_NL_IDENTIFICATION_SOURCE       = 786433
+	X_NL_IDENTIFICATION_ADDRESS      = 786434
+	X_NL_IDENTIFICATION_CONTACT      = 786435
+	X_NL_IDENTIFICATION_EMAIL        = 786436
+	X_NL_IDENTIFICATION_TEL          = 786437
+	X_NL_IDENTIFICATION_FAX          = 786438
+	X_NL_IDENTIFICATION_LANGUAGE     = 786439
+	X_NL_IDENTIFICATION_TERRITORY    = 786440
+	X_NL_IDENTIFICATION_AUDIENCE     = 786441
+	X_NL_IDENTIFICATION_APPLICATION  = 786442
+	X_NL_IDENTIFICATION_ABBREVIATION = 786443
+	X_NL_IDENTIFICATION_REVISION     = 786444
+	X_NL_IDENTIFICATION_DATE         = 786445
+	X_NL_IDENTIFICATION_CATEGORY     = 786446
+	X_NL_IDENTIFICATION_CODESET      = 786447
+	X_NL_NUM_LC_IDENTIFICATION       = 786448
+
+	// This marks the highest value used.
+	X_NL_NUM = 786449
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Access to locale-dependent parameters.
+//    Copyright (C) 1995-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Get the type definition.
+// Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// These are defined by the user (or the compiler)
+//    to specify the desired environment:
+//
+//    __STRICT_ANSI__	ISO Standard C.
+//    _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
+//    _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
+//    _ISOC2X_SOURCE	Extensions to ISO C99 from ISO C2X.
+//    __STDC_WANT_LIB_EXT2__
+// 			Extensions to ISO C99 from TR 27431-2:2010.
+//    __STDC_WANT_IEC_60559_BFP_EXT__
+// 			Extensions to ISO C11 from TS 18661-1:2014.
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__
+// 			Extensions to ISO C11 from TS 18661-4:2015.
+//    __STDC_WANT_IEC_60559_TYPES_EXT__
+// 			Extensions to ISO C11 from TS 18661-3:2015.
+//
+//    _POSIX_SOURCE	IEEE Std 1003.1.
+//    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
+// 			if >=199309L, add IEEE Std 1003.1b-1993;
+// 			if >=199506L, add IEEE Std 1003.1c-1995;
+// 			if >=200112L, all of IEEE 1003.1-2004
+// 			if >=200809L, all of IEEE 1003.1-2008
+//    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
+// 			Single Unix conformance is wanted, to 600 for the
+// 			sixth revision, to 700 for the seventh revision.
+//    _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
+//    _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
+//    _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
+//    _FILE_OFFSET_BITS=N	Select default filesystem interface.
+//    _ATFILE_SOURCE	Additional *at interfaces.
+//    _GNU_SOURCE		All of the above, plus GNU extensions.
+//    _DEFAULT_SOURCE	The default set of features (taking precedence over
+// 			__STRICT_ANSI__).
+//
+//    _FORTIFY_SOURCE	Add security hardening to many library functions.
+// 			Set to 1 or 2; 2 performs stricter checks than 1.
+//
+//    _REENTRANT, _THREAD_SAFE
+// 			Obsolete; equivalent to _POSIX_C_SOURCE=199506L.
+//
+//    The `-ansi' switch to the GNU C compiler, and standards conformance
+//    options such as `-std=c99', define __STRICT_ANSI__.  If none of
+//    these are defined, or if _DEFAULT_SOURCE is defined, the default is
+//    to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
+//    200809L, as well as enabling miscellaneous functions from BSD and
+//    SVID.  If more than one of these are defined, they accumulate.  For
+//    example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
+//    give you ISO C, 1003.1, and 1003.2, but nothing else.
+//
+//    These are defined by this file and are used by the
+//    header files to decide what to declare or define:
+//
+//    __GLIBC_USE (F)	Define things from feature set F.  This is defined
+// 			to 1 or 0; the subsequent macros are either defined
+// 			or undefined, and those tests should be moved to
+// 			__GLIBC_USE.
+//    __USE_ISOC11		Define ISO C11 things.
+//    __USE_ISOC99		Define ISO C99 things.
+//    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+//    __USE_ISOCXX11	Define ISO C++11 things.
+//    __USE_POSIX		Define IEEE Std 1003.1 things.
+//    __USE_POSIX2		Define IEEE Std 1003.2 things.
+//    __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
+//    __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
+//    __USE_XOPEN		Define XPG things.
+//    __USE_XOPEN_EXTENDED	Define X/Open Unix things.
+//    __USE_UNIX98		Define Single Unix V2 things.
+//    __USE_XOPEN2K        Define XPG6 things.
+//    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+//    __USE_XOPEN2K8       Define XPG7 things.
+//    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
+//    __USE_LARGEFILE	Define correct standard I/O things.
+//    __USE_LARGEFILE64	Define LFS things with separate names.
+//    __USE_FILE_OFFSET64	Define 64bit interface as default.
+//    __USE_MISC		Define things from 4.3BSD or System V Unix.
+//    __USE_ATFILE		Define *at interfaces and AT_* constants for them.
+//    __USE_GNU		Define GNU extensions.
+//    __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
+//
+//    The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
+//    defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
+//    only for compatibility.  All new code should use the other symbols
+//    to test for features.
+//
+//    All macros listed above as possibly being defined by this file are
+//    explicitly undefined if they are not explicitly defined.
+//    Feature-test macros that are not defined by the user or compiler
+//    but are implied by the other feature-test macros defined (or by the
+//    lack of any definitions) are defined by the file.
+//
+//    ISO C feature test macros depend on the definition of the macro
+//    when an affected header is included, not when the first system
+//    header is included, and so they are handled in
+//    <bits/libc-header-start.h>, which does not have a multiple include
+//    guard.  Feature test macros that can be handled from the first
+//    system header included are handled here.
+
+// Undefine everything, so we get a clean slate.
+
+// Suppress kernel-name space pollution unless user expressedly asks
+//    for it.
+
+// Convenience macro to test the version of gcc.
+//    Use like this:
+//    #if __GNUC_PREREQ (2,8)
+//    ... code requiring gcc 2.8 or later ...
+//    #endif
+//    Note: only works for GCC 2.0 and later, because __GNUC_MINOR__ was
+//    added in 2.0.
+
+// Similarly for clang.  Features added to GCC after version 4.2 may
+//    or may not also be available in clang, and clang's definitions of
+//    __GNUC(_MINOR)__ are fixed at 4 and 2 respectively.  Not all such
+//    features can be queried via __has_extension/__has_feature.
+
+// Whether to use feature set F.
+
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
+//    _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
+//    issue a warning; the expectation is that the source is being
+//    transitioned to use the new macro.
+
+// If _GNU_SOURCE was defined by the user, turn on all the other features.
+
+// If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
+//    define _DEFAULT_SOURCE.
+
+// This is to enable the ISO C2X extension.
+
+// This is to enable the ISO C11 extension.
+
+// This is to enable the ISO C99 extension.
+
+// This is to enable the ISO C90 Amendment 1:1995 extension.
+
+// If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
+//    is defined, use POSIX.1-2008 (or another version depending on
+//    _XOPEN_SOURCE).
+
+// Some C libraries once required _REENTRANT and/or _THREAD_SAFE to be
+//    defined in all multithreaded code.  GNU libc has not required this
+//    for many years.  We now treat them as compatibility synonyms for
+//    _POSIX_C_SOURCE=199506L, which is the earliest level of POSIX with
+//    comprehensive support for multithreaded code.  Using them never
+//    lowers the selected level of POSIX conformance, only raises it.
+
+// The function 'gets' existed in C89, but is impossible to use
+//    safely.  It has been removed from ISO C11 and ISO C++14.  Note: for
+//    compatibility with various implementations of <cstdio>, this test
+//    must consider only the value of __cplusplus when compiling C++.
+
+// GNU formerly extended the scanf functions with modified format
+//    specifiers %as, %aS, and %a[...] that allocate a buffer for the
+//    input using malloc.  This extension conflicts with ISO C99, which
+//    defines %a as a standalone format specifier that reads a floating-
+//    point number; moreover, POSIX.1-2008 provides the same feature
+//    using the modifier letter 'm' instead (%ms, %mS, %m[...]).
+//
+//    We now follow C99 unless GNU extensions are active and the compiler
+//    is specifically in C89 or C++98 mode (strict or not).  For
+//    instance, with GCC, -std=gnu11 will have C99-compliant scanf with
+//    or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
+//    old extension.
+
+// Get definitions of __STDC_* predefined macros, if the compiler has
+//    not preincluded this header automatically.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This macro indicates that the installed library is the GNU C Library.
+//    For historic reasons the value now is 6 and this will stay from now
+//    on.  The use of this variable is deprecated.  Use __GLIBC__ and
+//    __GLIBC_MINOR__ now (see below) when you want to test for a specific
+//    GNU C library version and use the values in <gnu/lib-names.h> to get
+//    the sonames of the shared libraries.
+
+// Major and minor version number of the GNU C library package.  Use
+//    these macros to test for features in specific releases.
+
+// This is here only because every header file already includes this one.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// We are almost always included from features.h.
+
+// The GNU libc does not support any K&R compilers or the traditional mode
+//    of ISO C compilers anymore.  Check for some of the combinations not
+//    anymore supported.
+
+// Some user header file might have defined this before.
+
+// All functions, except those with callbacks or those that
+//    synchronize memory, are leaf functions.
+
+// GCC can always grok prototypes.  For C++ programs we add throw()
+//    to help it optimize the function calls.  But this works only with
+//    gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+//    as non-throwing using a function attribute since programs can use
+//    the -fexceptions options for C code as well.
+
+// Compilers that are not clang may object to
+//        #if defined __clang__ && __has_extension(...)
+//    even though they do not need to evaluate the right-hand side of the &&.
+
+// These two macros are not used in glibc anymore.  They are kept here
+//    only because some other projects expect the macros to be defined.
+
+// For these things, GCC behaves the ANSI way normally,
+//    and the non-ANSI way under -traditional.
+
+// This is not a typedef so `const __ptr_t' does the right thing.
+
+// C++ needs to know that types and declarations are C, not C++.
+
+// Fortify support.
+
+// Support for flexible arrays.
+//    Headers that should use flexible arrays only if they're "real"
+//    (e.g. only if they won't affect sizeof()) should test
+//    #if __glibc_c99_flexarr_available.
+
+// __asm__ ("xyz") is used throughout the headers to rename functions
+//    at the assembly language level.  This is wrapped by the __REDIRECT
+//    macro, in order to support compilers that can do this some other
+//    way.  When compilers don't support asm-names at all, we have to do
+//    preprocessor tricks instead (which don't have exactly the right
+//    semantics, but it's the best we can do).
+//
+//    Example:
+//    int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid);
+
+//
+// #elif __SOME_OTHER_COMPILER__
+//
+// # define __REDIRECT(name, proto, alias) name proto; 	_Pragma("let " #name " = " #alias)
+
+// GCC has various useful declarations that can be made with the
+//    `__attribute__' syntax.  All of the ways we use this do fine if
+//    they are omitted for compilers that don't understand it.
+
+// At some point during the gcc 2.96 development the `malloc' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Tell the compiler which arguments to an allocation function
+//    indicate the size of the allocation.
+
+// At some point during the gcc 2.96 development the `pure' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// This declaration tells the compiler that the value is constant.
+
+// At some point during the gcc 3.1 development the `used' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Since version 3.2, gcc allows marking deprecated functions.
+
+// Since version 4.5, gcc also allows one to specify the message printed
+//    when a deprecated function is used.  clang claims to be gcc 4.2, but
+//    may also support this feature.
+
+// At some point during the gcc 2.8 development the `format_arg' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+//    If several `format_arg' attributes are given for the same function, in
+//    gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+//    all designated arguments are considered.
+
+// At some point during the gcc 2.97 development the `strfmon' format
+//    attribute for functions was introduced.  We don't want to use it
+//    unconditionally (although this would be possible) since it
+//    generates warnings.
+
+// The nonull function attribute allows to mark pointer parameters which
+//    must not be NULL.
+
+// If fortification mode, we warn about unused results of certain
+//    function calls which can lead to problems.
+
+// Forces a function to be always inlined.
+// The Linux kernel defines __always_inline in stddef.h (283d7573), and
+//    it conflicts with this definition.  Therefore undefine it first to
+//    allow either header to be included first.
+
+// Associate error messages with the source location of the call site rather
+//    than with the source location inside the function.
+
+// GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+//    inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
+//    or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+//    older than 4.3 may define these macros and still not guarantee GNU inlining
+//    semantics.
+//
+//    clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+//    semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
+//    __GNUC_GNU_INLINE__ macro definitions.
+
+// GCC 4.3 and above allow passing all anonymous arguments of an
+//    __extern_always_inline function to some other vararg function.
+
+// It is possible to compile containing GCC extensions even if GCC is
+//    run in pedantic mode if the uses are carefully marked using the
+//    `__extension__' keyword.  But this is not generally available before
+//    version 2.8.
+
+// __restrict is known in EGCS 1.2 and above.
+
+// ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+//      array_name[restrict]
+//    GCC 3.1 supports this.
+
+// Describes a char array whose address can safely be passed as the first
+//    argument to strncpy and strncat, as the char array is not necessarily
+//    a NUL-terminated string.
+
+// Undefine (also defined in libc-symbols.h).
+// Copies attributes from the declaration or type referenced by
+//    the argument.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// __glibc_macro_warning (MESSAGE) issues warning MESSAGE.  This is
+//    intended for use in preprocessor macros.
+//
+//    Note: MESSAGE must be a _single_ string; concatenation of string
+//    literals is not supported.
+
+// Generic selection (ISO C11) is a C-only feature, available in GCC
+//    since version 4.9.  Previous versions do not provide generic
+//    selection, even though they might set __STDC_VERSION__ to 201112L,
+//    when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
+//    when testing __STDC_VERSION__ for generic selection support.
+//    On the other hand, Clang also defines __GNUC__, so a clang-specific
+//    check is required to enable the use of generic selection.
+
+// If we don't have __REDIRECT, prototypes will be missing if
+//    __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64].
+
+// Decide whether we can define 'extern inline' functions in headers.
+
+// This is here only because every header file already includes this one.
+//    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
+//    <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+//    that will always return failure (and set errno to ENOSYS).
+// This file is automatically generated.
+//    This file selects the right generated file of `__stub_FUNCTION' macros
+//    based on the architecture being compiled for.
+
+// This file is automatically generated.
+//    It defines a symbol `__stub_FUNCTION' for each function
+//    in the C library which is a stub, meaning it will fail
+//    every time called, usually setting errno to ENOSYS.
+
+// The default message set used by the gencat program.
+
+// Value for FLAG parameter of `catgets' to say we want XPG4 compliance.
+
+// Message catalog descriptor type.
+type Nl_catd = uintptr /* nl_types.h:33:14 */
+
+// Type used by `nl_langinfo'.
+type Nl_item = int32 /* nl_types.h:36:13 */
+
+// POSIX.1-2008 extended locale interface (see locale.h).
+// Definition of locale_t.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Definition of struct __locale_struct and __locale_t.
+//    Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// POSIX.1-2008: the locale_t type, representing a locale context
+//    (implementation-namespace version).  This type should be treated
+//    as opaque by applications; some details are exposed for the sake of
+//    efficiency in e.g. ctype functions.
+
+type X__locale_struct = struct {
+	F__locales       [13]uintptr
+	F__ctype_b       uintptr
+	F__ctype_tolower uintptr
+	F__ctype_toupper uintptr
+	F__names         [13]uintptr
+} /* __locale_t.h:28:1 */
+
+type X__locale_t = uintptr /* __locale_t.h:42:32 */
+
+type Locale_t = X__locale_t /* locale_t.h:24:20 */
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/libc.go b/vendor/modernc.org/libc/libc.go
index e1c00b0f..01d6793a 100644
--- a/vendor/modernc.org/libc/libc.go
+++ b/vendor/modernc.org/libc/libc.go
@@ -970,13 +970,24 @@ func Xatol(t *TLS, nptr uintptr) long {
 	}
 }
 
+func getLocalLocation() (loc *gotime.Location) {
+	loc = gotime.Local
+	if r := getenv(Environ(), "TZ"); r != 0 {
+		zname := GoString(r)
+		zone, off := parseZone(zname)
+		loc = gotime.FixedZone(zone, -off)
+		loc2, _ := gotime.LoadLocation(zname)
+		if loc2 != nil {
+			loc = loc2
+		}
+	}
+	return loc
+
+}
+
 // time_t mktime(struct tm *tm);
 func Xmktime(t *TLS, ptm uintptr) time.Time_t {
-	loc := gotime.Local
-	if r := getenv(Environ(), "TZ"); r != 0 {
-		zone, off := parseZone(GoString(r))
-		loc = gotime.FixedZone(zone, off)
-	}
+	loc := getLocalLocation()
 	tt := gotime.Date(
 		int((*time.Tm)(unsafe.Pointer(ptm)).Ftm_year+1900),
 		gotime.Month((*time.Tm)(unsafe.Pointer(ptm)).Ftm_mon+1),
diff --git a/vendor/modernc.org/libc/libc64.go b/vendor/modernc.org/libc/libc64.go
index 35d1443c..01690fe8 100644
--- a/vendor/modernc.org/libc/libc64.go
+++ b/vendor/modernc.org/libc/libc64.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build amd64 || arm64 || ppc64le || riscv64 || s390x
-// +build amd64 arm64 ppc64le riscv64 s390x
+//go:build amd64 || arm64 || ppc64le || riscv64 || s390x || loong64
+// +build amd64 arm64 ppc64le riscv64 s390x loong64
 
 package libc // import "modernc.org/libc"
 
diff --git a/vendor/modernc.org/libc/libc_darwin.go b/vendor/modernc.org/libc/libc_darwin.go
index 1dc5b926..334bf8fe 100644
--- a/vendor/modernc.org/libc/libc_darwin.go
+++ b/vendor/modernc.org/libc/libc_darwin.go
@@ -277,11 +277,7 @@ var localtime time.Tm
 
 // struct tm *localtime(const time_t *timep);
 func Xlocaltime(_ *TLS, timep uintptr) uintptr {
-	loc := gotime.Local
-	if r := getenv(Environ(), "TZ"); r != 0 {
-		zone, off := parseZone(GoString(r))
-		loc = gotime.FixedZone(zone, -off)
-	}
+	loc := getLocalLocation()
 	ut := *(*time.Time_t)(unsafe.Pointer(timep))
 	t := gotime.Unix(int64(ut), 0).In(loc)
 	localtime.Ftm_sec = int32(t.Second())
@@ -298,11 +294,7 @@ func Xlocaltime(_ *TLS, timep uintptr) uintptr {
 
 // struct tm *localtime_r(const time_t *timep, struct tm *result);
 func Xlocaltime_r(_ *TLS, timep, result uintptr) uintptr {
-	loc := gotime.Local
-	if r := getenv(Environ(), "TZ"); r != 0 {
-		zone, off := parseZone(GoString(r))
-		loc = gotime.FixedZone(zone, -off)
-	}
+	loc := getLocalLocation()
 	ut := *(*time_t)(unsafe.Pointer(timep))
 	t := gotime.Unix(int64(ut), 0).In(loc)
 	(*time.Tm)(unsafe.Pointer(result)).Ftm_sec = int32(t.Second())
@@ -1534,33 +1526,6 @@ func fcntlCmdStr(cmd int32) string {
 // 	panic(todo(""))
 // }
 
-// ssize_t pread(int fd, void *buf, size_t count, off_t offset);
-func Xpread(t *TLS, fd int32, buf uintptr, count types.Size_t, offset types.Off_t) types.Ssize_t {
-	var n int
-	var err error
-	switch {
-	case count == 0:
-		n, err = unix.Pread(int(fd), nil, int64(offset))
-	default:
-		n, err = unix.Pread(int(fd), (*RawMem)(unsafe.Pointer(buf))[:count:count], int64(offset))
-		if dmesgs && err == nil {
-			dmesg("%v: fd %v, off %#x, count %#x, n %#x\n%s", origin(1), fd, offset, count, n, hex.Dump((*RawMem)(unsafe.Pointer(buf))[:n:n]))
-		}
-	}
-	if err != nil {
-		if dmesgs {
-			dmesg("%v: %v FAIL", origin(1), err)
-		}
-		t.setErrno(err)
-		return -1
-	}
-
-	if dmesgs {
-		dmesg("%v: ok", origin(1))
-	}
-	return types.Ssize_t(n)
-}
-
 // ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset);
 func Xpwrite(t *TLS, fd int32, buf uintptr, count types.Size_t, offset types.Off_t) types.Ssize_t {
 	var n int
diff --git a/vendor/modernc.org/libc/libc_freebsd.go b/vendor/modernc.org/libc/libc_freebsd.go
index 486f8ec4..96282190 100644
--- a/vendor/modernc.org/libc/libc_freebsd.go
+++ b/vendor/modernc.org/libc/libc_freebsd.go
@@ -171,11 +171,7 @@ var localtime time.Tm
 
 // struct tm *localtime(const time_t *timep);
 func Xlocaltime(_ *TLS, timep uintptr) uintptr {
-	loc := gotime.Local
-	if r := getenv(Environ(), "TZ"); r != 0 {
-		zone, off := parseZone(GoString(r))
-		loc = gotime.FixedZone(zone, -off)
-	}
+	loc := getLocalLocation()
 	ut := *(*time.Time_t)(unsafe.Pointer(timep))
 	t := gotime.Unix(int64(ut), 0).In(loc)
 	localtime.Ftm_sec = int32(t.Second())
@@ -192,11 +188,7 @@ func Xlocaltime(_ *TLS, timep uintptr) uintptr {
 
 // struct tm *localtime_r(const time_t *timep, struct tm *result);
 func Xlocaltime_r(_ *TLS, timep, result uintptr) uintptr {
-	loc := gotime.Local
-	if r := getenv(Environ(), "TZ"); r != 0 {
-		zone, off := parseZone(GoString(r))
-		loc = gotime.FixedZone(zone, -off)
-	}
+	loc := getLocalLocation()
 	ut := *(*unix.Time_t)(unsafe.Pointer(timep))
 	t := gotime.Unix(int64(ut), 0).In(loc)
 	(*time.Tm)(unsafe.Pointer(result)).Ftm_sec = int32(t.Second())
diff --git a/vendor/modernc.org/libc/libc_linux.go b/vendor/modernc.org/libc/libc_linux.go
index 1c2f4826..08f67be8 100644
--- a/vendor/modernc.org/libc/libc_linux.go
+++ b/vendor/modernc.org/libc/libc_linux.go
@@ -133,11 +133,7 @@ var localtime ctime.Tm
 
 // struct tm *localtime(const time_t *timep);
 func Xlocaltime(_ *TLS, timep uintptr) uintptr {
-	loc := time.Local
-	if r := getenv(Environ(), "TZ"); r != 0 {
-		zone, off := parseZone(GoString(r))
-		loc = time.FixedZone(zone, -off)
-	}
+	loc := getLocalLocation()
 	ut := *(*unix.Time_t)(unsafe.Pointer(timep))
 	t := time.Unix(int64(ut), 0).In(loc)
 	localtime.Ftm_sec = int32(t.Second())
@@ -154,11 +150,7 @@ func Xlocaltime(_ *TLS, timep uintptr) uintptr {
 
 // struct tm *localtime_r(const time_t *timep, struct tm *result);
 func Xlocaltime_r(_ *TLS, timep, result uintptr) uintptr {
-	loc := time.Local
-	if r := getenv(Environ(), "TZ"); r != 0 {
-		zone, off := parseZone(GoString(r))
-		loc = time.FixedZone(zone, -off)
-	}
+	loc := getLocalLocation()
 	ut := *(*unix.Time_t)(unsafe.Pointer(timep))
 	t := time.Unix(int64(ut), 0).In(loc)
 	(*ctime.Tm)(unsafe.Pointer(result)).Ftm_sec = int32(t.Second())
@@ -645,16 +637,6 @@ func Xsetrlimit(t *TLS, resource int32, rlim uintptr) int32 {
 	return Xsetrlimit64(t, resource, rlim)
 }
 
-// int setrlimit(int resource, const struct rlimit *rlim);
-func Xsetrlimit64(t *TLS, resource int32, rlim uintptr) int32 {
-	if _, _, err := unix.Syscall(unix.SYS_SETRLIMIT, uintptr(resource), uintptr(rlim), 0); err != 0 {
-		t.setErrno(err)
-		return -1
-	}
-
-	return 0
-}
-
 // uid_t getuid(void);
 func Xgetuid(t *TLS) types.Uid_t {
 	return types.Uid_t(os.Getuid())
diff --git a/vendor/modernc.org/libc/libc_linux_386.go b/vendor/modernc.org/libc/libc_linux_386.go
index a8e5c526..c1369dd5 100644
--- a/vendor/modernc.org/libc/libc_linux_386.go
+++ b/vendor/modernc.org/libc/libc_linux_386.go
@@ -455,3 +455,13 @@ func Xfopen64(t *TLS, pathname, mode uintptr) uintptr {
 	t.setErrno(errno.ENOMEM)
 	return 0
 }
+
+// int setrlimit(int resource, const struct rlimit *rlim);
+func Xsetrlimit64(t *TLS, resource int32, rlim uintptr) int32 {
+	if _, _, err := unix.Syscall(unix.SYS_SETRLIMIT, uintptr(resource), uintptr(rlim), 0); err != 0 {
+		t.setErrno(err)
+		return -1
+	}
+
+	return 0
+}
diff --git a/vendor/modernc.org/libc/libc_linux_amd64.go b/vendor/modernc.org/libc/libc_linux_amd64.go
index 23e4f853..4d3bf1a5 100644
--- a/vendor/modernc.org/libc/libc_linux_amd64.go
+++ b/vendor/modernc.org/libc/libc_linux_amd64.go
@@ -465,3 +465,13 @@ func Xiswspace(t *TLS, wc wctype.Wint_t) int32 {
 func Xiswalnum(t *TLS, wc wctype.Wint_t) int32 {
 	return Bool32(unicode.IsLetter(rune(wc)) || unicode.IsNumber(rune(wc)))
 }
+
+// int setrlimit(int resource, const struct rlimit *rlim);
+func Xsetrlimit64(t *TLS, resource int32, rlim uintptr) int32 {
+	if _, _, err := unix.Syscall(unix.SYS_SETRLIMIT, uintptr(resource), uintptr(rlim), 0); err != 0 {
+		t.setErrno(err)
+		return -1
+	}
+
+	return 0
+}
diff --git a/vendor/modernc.org/libc/libc_linux_arm.go b/vendor/modernc.org/libc/libc_linux_arm.go
index cfabe77f..ce45b1ae 100644
--- a/vendor/modernc.org/libc/libc_linux_arm.go
+++ b/vendor/modernc.org/libc/libc_linux_arm.go
@@ -447,3 +447,13 @@ func Xmkdir(t *TLS, path uintptr, mode types.Mode_t) int32 {
 //TODO- 	// }
 //TODO- 	return r
 //TODO- }
+
+// int setrlimit(int resource, const struct rlimit *rlim);
+func Xsetrlimit64(t *TLS, resource int32, rlim uintptr) int32 {
+	if _, _, err := unix.Syscall(unix.SYS_SETRLIMIT, uintptr(resource), uintptr(rlim), 0); err != 0 {
+		t.setErrno(err)
+		return -1
+	}
+
+	return 0
+}
diff --git a/vendor/modernc.org/libc/libc_linux_arm64.go b/vendor/modernc.org/libc/libc_linux_arm64.go
index b8607c9c..1b83364e 100644
--- a/vendor/modernc.org/libc/libc_linux_arm64.go
+++ b/vendor/modernc.org/libc/libc_linux_arm64.go
@@ -437,3 +437,13 @@ func Xutime(t *TLS, filename, times uintptr) int32 {
 func Xalarm(t *TLS, seconds uint32) uint32 {
 	panic(todo(""))
 }
+
+// int setrlimit(int resource, const struct rlimit *rlim);
+func Xsetrlimit64(t *TLS, resource int32, rlim uintptr) int32 {
+	if _, _, err := unix.Syscall(unix.SYS_SETRLIMIT, uintptr(resource), uintptr(rlim), 0); err != 0 {
+		t.setErrno(err)
+		return -1
+	}
+
+	return 0
+}
diff --git a/vendor/modernc.org/libc/libc_linux_loong64.go b/vendor/modernc.org/libc/libc_linux_loong64.go
new file mode 100644
index 00000000..5dc8d5e0
--- /dev/null
+++ b/vendor/modernc.org/libc/libc_linux_loong64.go
@@ -0,0 +1,498 @@
+// Copyright 2020 The Libc 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 libc // import "modernc.org/libc"
+
+import (
+	"unicode"
+	"unsafe"
+	"os"
+	"strings"
+
+	"golang.org/x/sys/unix"
+	"modernc.org/libc/errno"
+	"modernc.org/libc/fcntl"
+	"modernc.org/libc/signal"
+	"modernc.org/libc/sys/types"
+	"modernc.org/libc/wctype"
+)
+
+// int sigaction(int signum, const struct sigaction *act, struct sigaction *oldact);
+func Xsigaction(t *TLS, signum int32, act, oldact uintptr) int32 {
+	// 	musl/arch/x86_64/ksigaction.h
+	//
+	//	struct k_sigaction {
+	//		void (*handler)(int);
+	//		unsigned long flags;
+	//		void (*restorer)(void);
+	//		unsigned mask[2];
+	//	};
+	type k_sigaction struct {
+		handler  uintptr
+		flags    ulong
+		restorer uintptr
+		mask     [2]uint32
+	}
+
+	var kact, koldact uintptr
+	if act != 0 {
+		sz := int(unsafe.Sizeof(k_sigaction{}))
+		kact = t.Alloc(sz)
+		defer t.Free(sz)
+		*(*k_sigaction)(unsafe.Pointer(kact)) = k_sigaction{
+			handler:  (*signal.Sigaction)(unsafe.Pointer(act)).F__sigaction_handler.Fsa_handler,
+			flags:    ulong((*signal.Sigaction)(unsafe.Pointer(act)).Fsa_flags),
+			restorer: (*signal.Sigaction)(unsafe.Pointer(act)).Fsa_restorer,
+		}
+		Xmemcpy(t, kact+unsafe.Offsetof(k_sigaction{}.mask), act+unsafe.Offsetof(signal.Sigaction{}.Fsa_mask), types.Size_t(unsafe.Sizeof(k_sigaction{}.mask)))
+	}
+	if oldact != 0 {
+		panic(todo(""))
+	}
+
+	if _, _, err := unix.Syscall6(unix.SYS_RT_SIGACTION, uintptr(signum), kact, koldact, unsafe.Sizeof(k_sigaction{}.mask), 0, 0); err != 0 {
+		t.setErrno(err)
+		return -1
+	}
+
+	if oldact != 0 {
+		panic(todo(""))
+	}
+
+	return 0
+}
+
+// int fcntl(int fd, int cmd, ... /* arg */ );
+func Xfcntl64(t *TLS, fd, cmd int32, args uintptr) int32 {
+	var arg uintptr
+	if args != 0 {
+		arg = *(*uintptr)(unsafe.Pointer(args))
+	}
+	if cmd == fcntl.F_SETFL {
+		arg |= unix.O_LARGEFILE
+	}
+	n, _, err := unix.Syscall(unix.SYS_FCNTL, uintptr(fd), uintptr(cmd), arg)
+	if err != 0 {
+		// if dmesgs {
+		// 	dmesg("%v: fd %v cmd %v", origin(1), fcntlCmdStr(fd), cmd)
+		// }
+		t.setErrno(err)
+		return -1
+	}
+
+	// if dmesgs {
+	// 	dmesg("%v: %d %s %#x: %d", origin(1), fd, fcntlCmdStr(cmd), arg, n)
+	// }
+	return int32(n)
+}
+
+// int lstat(const char *pathname, struct stat *statbuf);
+func Xlstat64(t *TLS, pathname, statbuf uintptr) int32 {
+	panic(todo(""))
+	// if _, _, err := unix.Syscall(unix.SYS_LSTAT, pathname, statbuf, 0); err != 0 {
+	// 	// if dmesgs {
+	// 	// 	dmesg("%v: %q: %v", origin(1), GoString(pathname), err)
+	// 	// }
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// // if dmesgs {
+	// // 	dmesg("%v: %q: ok", origin(1), GoString(pathname))
+	// // }
+	// return 0
+}
+
+// int stat(const char *pathname, struct stat *statbuf);
+func Xstat64(t *TLS, pathname, statbuf uintptr) int32 {
+	panic(todo(""))
+	// if _, _, err := unix.Syscall(unix.SYS_STAT, pathname, statbuf, 0); err != 0 {
+	// 	// if dmesgs {
+	// 	// 	dmesg("%v: %q: %v", origin(1), GoString(pathname), err)
+	// 	// }
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// // if dmesgs {
+	// // 	dmesg("%v: %q: ok", origin(1), GoString(pathname))
+	// // }
+	// return 0
+}
+
+// int fstat(int fd, struct stat *statbuf);
+func Xfstat64(t *TLS, fd int32, statbuf uintptr) int32 {
+	panic(todo(""))
+	// if _, _, err := unix.Syscall(unix.SYS_FSTAT, uintptr(fd), statbuf, 0); err != 0 {
+	// 	// if dmesgs {
+	// 	// 	dmesg("%v: fd %d: %v", origin(1), fd, err)
+	// 	// }
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// // if dmesgs {
+	// // 	dmesg("%v: %d size %#x: ok\n%+v", origin(1), fd, (*stat.Stat)(unsafe.Pointer(statbuf)).Fst_size, (*stat.Stat)(unsafe.Pointer(statbuf)))
+	// // }
+	// return 0
+}
+
+func Xmmap(t *TLS, addr uintptr, length types.Size_t, prot, flags, fd int32, offset types.Off_t) uintptr {
+	return Xmmap64(t, addr, length, prot, flags, fd, offset)
+}
+
+// void *mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset);
+func Xmmap64(t *TLS, addr uintptr, length types.Size_t, prot, flags, fd int32, offset types.Off_t) uintptr {
+	data, _, err := unix.Syscall6(unix.SYS_MMAP, addr, uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	if err != 0 {
+		// if dmesgs {
+		// 	dmesg("%v: %v", origin(1), err)
+		// }
+		t.setErrno(err)
+		return ^uintptr(0) // (void*)-1
+	}
+
+	// if dmesgs {
+	// 	dmesg("%v: %#x", origin(1), data)
+	// }
+	return data
+}
+
+// void *mremap(void *old_address, size_t old_size, size_t new_size, int flags, ... /* void *new_address */);
+func Xmremap(t *TLS, old_address uintptr, old_size, new_size types.Size_t, flags int32, args uintptr) uintptr {
+	var arg uintptr
+	if args != 0 {
+		arg = *(*uintptr)(unsafe.Pointer(args))
+	}
+	data, _, err := unix.Syscall6(unix.SYS_MREMAP, old_address, uintptr(old_size), uintptr(new_size), uintptr(flags), arg, 0)
+	if err != 0 {
+		// if dmesgs {
+		// 	dmesg("%v: %v", origin(1), err)
+		// }
+		t.setErrno(err)
+		return ^uintptr(0) // (void*)-1
+	}
+
+	// if dmesgs {
+	// 	dmesg("%v: %#x", origin(1), data)
+	// }
+	return data
+}
+
+// int ftruncate(int fd, off_t length);
+func Xftruncate64(t *TLS, fd int32, length types.Off_t) int32 {
+	if _, _, err := unix.Syscall(unix.SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0); err != 0 {
+		// if dmesgs {
+		// 	dmesg("%v: fd %d: %v", origin(1), fd, err)
+		// }
+		t.setErrno(err)
+		return -1
+	}
+
+	// if dmesgs {
+	// 	dmesg("%v: %d %#x: ok", origin(1), fd, length)
+	// }
+	return 0
+}
+
+// off64_t lseek64(int fd, off64_t offset, int whence);
+func Xlseek64(t *TLS, fd int32, offset types.Off_t, whence int32) types.Off_t {
+	n, _, err := unix.Syscall(unix.SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	if err != 0 {
+		// if dmesgs {
+		// 	dmesg("%v: fd %v, off %#x, whence %v: %v", origin(1), fd, offset, whenceStr(whence), err)
+		// }
+		t.setErrno(err)
+		return -1
+	}
+
+	// if dmesgs {
+	// 	dmesg("%v: fd %v, off %#x, whence %v: %#x", origin(1), fd, offset, whenceStr(whence), n)
+	// }
+	return types.Off_t(n)
+}
+
+// int utime(const char *filename, const struct utimbuf *times);
+func Xutime(t *TLS, filename, times uintptr) int32 {
+	panic(todo(""))
+	// if _, _, err := unix.Syscall(unix.SYS_UTIME, filename, times, 0); err != 0 {
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// return 0
+}
+
+// unsigned int alarm(unsigned int seconds);
+func Xalarm(t *TLS, seconds uint32) uint32 {
+	panic(todo(""))
+	// n, _, err := unix.Syscall(unix.SYS_ALARM, uintptr(seconds), 0, 0)
+	// if err != 0 {
+	// 	panic(todo(""))
+	// }
+
+	// return uint32(n)
+}
+
+// time_t time(time_t *tloc);
+func Xtime(t *TLS, tloc uintptr) types.Time_t {
+	panic(todo(""))
+	// n, _, err := unix.Syscall(unix.SYS_TIME, tloc, 0, 0)
+	// if err != 0 {
+	// 	t.setErrno(err)
+	// 	return types.Time_t(-1)
+	// }
+
+	// if tloc != 0 {
+	// 	*(*types.Time_t)(unsafe.Pointer(tloc)) = types.Time_t(n)
+	// }
+	// return types.Time_t(n)
+}
+
+// int getrlimit(int resource, struct rlimit *rlim);
+func Xgetrlimit64(t *TLS, resource int32, rlim uintptr) int32 {
+	panic(todo(""))
+	// if _, _, err := unix.Syscall(unix.SYS_GETRLIMIT, uintptr(resource), uintptr(rlim), 0); err != 0 {
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// return 0
+}
+
+// int mkdir(const char *path, mode_t mode);
+func Xmkdir(t *TLS, path uintptr, mode types.Mode_t) int32 {
+	panic(todo(""))
+	// if _, _, err := unix.Syscall(unix.SYS_MKDIR, path, uintptr(mode), 0); err != 0 {
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// // if dmesgs {
+	// // 	dmesg("%v: %q: ok", origin(1), GoString(path))
+	// // }
+	// return 0
+}
+
+// int symlink(const char *target, const char *linkpath);
+func Xsymlink(t *TLS, target, linkpath uintptr) int32 {
+	panic(todo(""))
+	// if _, _, err := unix.Syscall(unix.SYS_SYMLINK, target, linkpath, 0); err != 0 {
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// // if dmesgs {
+	// // 	dmesg("%v: %q %q: ok", origin(1), GoString(target), GoString(linkpath))
+	// // }
+	// return 0
+}
+
+// int chmod(const char *pathname, mode_t mode)
+func Xchmod(t *TLS, pathname uintptr, mode types.Mode_t) int32 {
+	panic(todo(""))
+	// if _, _, err := unix.Syscall(unix.SYS_CHMOD, pathname, uintptr(mode), 0); err != 0 {
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// // if dmesgs {
+	// // 	dmesg("%v: %q %#o: ok", origin(1), GoString(pathname), mode)
+	// // }
+	// return 0
+}
+
+// int utimes(const char *filename, const struct timeval times[2]);
+func Xutimes(t *TLS, filename, times uintptr) int32 {
+	panic(todo(""))
+	// if _, _, err := unix.Syscall(unix.SYS_UTIMES, filename, times, 0); err != 0 {
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// // if dmesgs {
+	// // 	dmesg("%v: %q: ok", origin(1), GoString(filename))
+	// // }
+	// return 0
+}
+
+// int unlink(const char *pathname);
+func Xunlink(t *TLS, pathname uintptr) int32 {
+	panic(todo(""))
+	// if _, _, err := unix.Syscall(unix.SYS_UNLINK, pathname, 0, 0); err != 0 {
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// // if dmesgs {
+	// // 	dmesg("%v: %q: ok", origin(1), GoString(pathname))
+	// // }
+	// return 0
+}
+
+// int access(const char *pathname, int mode);
+func Xaccess(t *TLS, pathname uintptr, mode int32) int32 {
+	panic(todo(""))
+	// if _, _, err := unix.Syscall(unix.SYS_ACCESS, pathname, uintptr(mode), 0); err != 0 {
+	// 	// if dmesgs {
+	// 	// 	dmesg("%v: %q: %v", origin(1), GoString(pathname), err)
+	// 	// }
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// // if dmesgs {
+	// // 	dmesg("%v: %q %#o: ok", origin(1), GoString(pathname), mode)
+	// // }
+	// return 0
+}
+
+// int rmdir(const char *pathname);
+func Xrmdir(t *TLS, pathname uintptr) int32 {
+	panic(todo(""))
+	// if _, _, err := unix.Syscall(unix.SYS_RMDIR, pathname, 0, 0); err != 0 {
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// // if dmesgs {
+	// // 	dmesg("%v: %q: ok", origin(1), GoString(pathname))
+	// // }
+	// return 0
+}
+
+// int rename(const char *oldpath, const char *newpath);
+func Xrename(t *TLS, oldpath, newpath uintptr) int32 {
+	panic(todo(""))
+	// if _, _, err := unix.Syscall(unix.SYS_RENAME, oldpath, newpath, 0); err != 0 {
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// return 0
+}
+
+// int mknod(const char *pathname, mode_t mode, dev_t dev);
+func Xmknod(t *TLS, pathname uintptr, mode types.Mode_t, dev types.Dev_t) int32 {
+	panic(todo(""))
+	// if _, _, err := unix.Syscall(unix.SYS_MKNOD, pathname, uintptr(mode), uintptr(dev)); err != 0 {
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// return 0
+}
+
+// int chown(const char *pathname, uid_t owner, gid_t group);
+func Xchown(t *TLS, pathname uintptr, owner types.Uid_t, group types.Gid_t) int32 {
+	panic(todo(""))
+	// // if _, _, err := unix.Syscall(unix.SYS_CHOWN, pathname, uintptr(owner), uintptr(group)); err != 0 {
+	// // 	t.setErrno(err)
+	// // 	return -1
+	// // }
+
+	// // return 0
+}
+
+// int link(const char *oldpath, const char *newpath);
+func Xlink(t *TLS, oldpath, newpath uintptr) int32 {
+	panic(todo(""))
+	// if _, _, err := unix.Syscall(unix.SYS_LINK, oldpath, newpath, 0); err != 0 {
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// return 0
+}
+
+// int pipe(int pipefd[2]);
+func Xpipe(t *TLS, pipefd uintptr) int32 {
+	panic(todo(""))
+	// if _, _, err := unix.Syscall(unix.SYS_PIPE, pipefd, 0, 0); err != 0 {
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// return 0
+}
+
+// int dup2(int oldfd, int newfd);
+func Xdup2(t *TLS, oldfd, newfd int32) int32 {
+	panic(todo(""))
+	// n, _, err := unix.Syscall(unix.SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	// if err != 0 {
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// return int32(n)
+}
+
+// ssize_t readlink(const char *restrict path, char *restrict buf, size_t bufsize);
+func Xreadlink(t *TLS, path, buf uintptr, bufsize types.Size_t) types.Ssize_t {
+	panic(todo(""))
+	// n, _, err := unix.Syscall(unix.SYS_READLINK, path, buf, uintptr(bufsize))
+	// if err != 0 {
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// return types.Ssize_t(n)
+}
+
+// FILE *fopen64(const char *pathname, const char *mode);
+func Xfopen64(t *TLS, pathname, mode uintptr) uintptr {
+	m := strings.ReplaceAll(GoString(mode), "b", "")
+	var flags int
+	switch m {
+	case "r":
+		flags = os.O_RDONLY
+	case "r+":
+		flags = os.O_RDWR
+	case "w":
+		flags = os.O_WRONLY | os.O_CREATE | os.O_TRUNC
+	case "w+":
+		flags = os.O_RDWR | os.O_CREATE | os.O_TRUNC
+	case "a":
+		flags = os.O_WRONLY | os.O_CREATE | os.O_APPEND
+	case "a+":
+		flags = os.O_RDWR | os.O_CREATE | os.O_APPEND
+	default:
+		panic(m)
+	}
+	fd, err := unix.Open(GoString(pathname), flags|unix.O_LARGEFILE, 0666)
+	if err != nil {
+		t.setErrno(err)
+		return 0
+	}
+
+	if p := newFile(t, int32(fd)); p != 0 {
+		return p
+	}
+
+	Xclose(t, int32(fd))
+	t.setErrno(errno.ENOMEM)
+	return 0
+}
+
+// int iswspace(wint_t wc);
+func Xiswspace(t *TLS, wc wctype.Wint_t) int32 {
+	return Bool32(unicode.IsSpace(rune(wc)))
+}
+
+// int iswalnum(wint_t wc);
+func Xiswalnum(t *TLS, wc wctype.Wint_t) int32 {
+	return Bool32(unicode.IsLetter(rune(wc)) || unicode.IsNumber(rune(wc)))
+}
+
+// int setrlimit(int resource, const struct rlimit *rlim);
+func Xsetrlimit64(t *TLS, resource int32, rlim uintptr) int32 {
+	panic(todo(""))
+	// if _, _, err := unix.Syscall(unix.SYS_SETRLIMIT, uintptr(resource), uintptr(rlim), 0); err != 0 {
+	// 	t.setErrno(err)
+	// 	return -1
+	// }
+
+	// return 0
+}
diff --git a/vendor/modernc.org/libc/libc_linux_ppc64le.go b/vendor/modernc.org/libc/libc_linux_ppc64le.go
index f04d1376..d23be04f 100644
--- a/vendor/modernc.org/libc/libc_linux_ppc64le.go
+++ b/vendor/modernc.org/libc/libc_linux_ppc64le.go
@@ -485,3 +485,13 @@ func __syscall3(t *TLS, trap, p1, p2, p3 long) long {
 func __syscall4(t *TLS, trap, p1, p2, p3, p4 long) long {
 	return __syscall(unix.Syscall6(uintptr(trap), uintptr(p1), uintptr(p2), uintptr(p3), uintptr(p4), 0, 0))
 }
+
+// int setrlimit(int resource, const struct rlimit *rlim);
+func Xsetrlimit64(t *TLS, resource int32, rlim uintptr) int32 {
+	if _, _, err := unix.Syscall(unix.SYS_SETRLIMIT, uintptr(resource), uintptr(rlim), 0); err != 0 {
+		t.setErrno(err)
+		return -1
+	}
+
+	return 0
+}
diff --git a/vendor/modernc.org/libc/libc_linux_riscv64.go b/vendor/modernc.org/libc/libc_linux_riscv64.go
index 0efb296a..e49c0f44 100644
--- a/vendor/modernc.org/libc/libc_linux_riscv64.go
+++ b/vendor/modernc.org/libc/libc_linux_riscv64.go
@@ -411,3 +411,13 @@ func __syscall3(t *TLS, trap, p1, p2, p3 long) long {
 func __syscall4(t *TLS, trap, p1, p2, p3, p4 long) long {
 	return __syscall(unix.Syscall6(uintptr(trap), uintptr(p1), uintptr(p2), uintptr(p3), uintptr(p4), 0, 0))
 }
+
+// int setrlimit(int resource, const struct rlimit *rlim);
+func Xsetrlimit64(t *TLS, resource int32, rlim uintptr) int32 {
+	if _, _, err := unix.Syscall(unix.SYS_SETRLIMIT, uintptr(resource), uintptr(rlim), 0); err != 0 {
+		t.setErrno(err)
+		return -1
+	}
+
+	return 0
+}
diff --git a/vendor/modernc.org/libc/libc_linux_s390x.go b/vendor/modernc.org/libc/libc_linux_s390x.go
index a877924c..d5a0aa6e 100644
--- a/vendor/modernc.org/libc/libc_linux_s390x.go
+++ b/vendor/modernc.org/libc/libc_linux_s390x.go
@@ -464,3 +464,13 @@ func __syscall3(t *TLS, trap, p1, p2, p3 long) long {
 func __syscall4(t *TLS, trap, p1, p2, p3, p4 long) long {
 	return __syscall(unix.Syscall6(uintptr(trap), uintptr(p1), uintptr(p2), uintptr(p3), uintptr(p4), 0, 0))
 }
+
+// int setrlimit(int resource, const struct rlimit *rlim);
+func Xsetrlimit64(t *TLS, resource int32, rlim uintptr) int32 {
+	if _, _, err := unix.Syscall(unix.SYS_SETRLIMIT, uintptr(resource), uintptr(rlim), 0); err != 0 {
+		t.setErrno(err)
+		return -1
+	}
+
+	return 0
+}
diff --git a/vendor/modernc.org/libc/libc_netbsd.go b/vendor/modernc.org/libc/libc_netbsd.go
index 77a28cb5..f4ed268f 100644
--- a/vendor/modernc.org/libc/libc_netbsd.go
+++ b/vendor/modernc.org/libc/libc_netbsd.go
@@ -205,11 +205,7 @@ var localtime time.Tm
 
 // struct tm *localtime(const time_t *timep);
 func Xlocaltime(_ *TLS, timep uintptr) uintptr {
-	loc := gotime.Local
-	if r := getenv(Environ(), "TZ"); r != 0 {
-		zone, off := parseZone(GoString(r))
-		loc = gotime.FixedZone(zone, -off)
-	}
+	loc := getLocalLocation()
 	ut := *(*time.Time_t)(unsafe.Pointer(timep))
 	t := gotime.Unix(int64(ut), 0).In(loc)
 	localtime.Ftm_sec = int32(t.Second())
@@ -226,11 +222,7 @@ func Xlocaltime(_ *TLS, timep uintptr) uintptr {
 
 // struct tm *localtime_r(const time_t *timep, struct tm *result);
 func Xlocaltime_r(_ *TLS, timep, result uintptr) uintptr {
-	loc := gotime.Local
-	if r := getenv(Environ(), "TZ"); r != 0 {
-		zone, off := parseZone(GoString(r))
-		loc = gotime.FixedZone(zone, -off)
-	}
+	loc := getLocalLocation()
 	ut := *(*time.Time_t)(unsafe.Pointer(timep))
 	t := gotime.Unix(int64(ut), 0).In(loc)
 	(*time.Tm)(unsafe.Pointer(result)).Ftm_sec = int32(t.Second())
diff --git a/vendor/modernc.org/libc/libc_openbsd.go b/vendor/modernc.org/libc/libc_openbsd.go
index 62a820cd..767fddfe 100644
--- a/vendor/modernc.org/libc/libc_openbsd.go
+++ b/vendor/modernc.org/libc/libc_openbsd.go
@@ -205,11 +205,7 @@ var localtime time.Tm
 
 // struct tm *localtime(const time_t *timep);
 func Xlocaltime(_ *TLS, timep uintptr) uintptr {
-	loc := gotime.Local
-	if r := getenv(Environ(), "TZ"); r != 0 {
-		zone, off := parseZone(GoString(r))
-		loc = gotime.FixedZone(zone, -off)
-	}
+	loc := getLocalLocation()
 	ut := *(*time.Time_t)(unsafe.Pointer(timep))
 	t := gotime.Unix(int64(ut), 0).In(loc)
 	localtime.Ftm_sec = int32(t.Second())
@@ -226,11 +222,7 @@ func Xlocaltime(_ *TLS, timep uintptr) uintptr {
 
 // struct tm *localtime_r(const time_t *timep, struct tm *result);
 func Xlocaltime_r(_ *TLS, timep, result uintptr) uintptr {
-	loc := gotime.Local
-	if r := getenv(Environ(), "TZ"); r != 0 {
-		zone, off := parseZone(GoString(r))
-		loc = gotime.FixedZone(zone, -off)
-	}
+	loc := getLocalLocation()
 	ut := *(*time.Time_t)(unsafe.Pointer(timep))
 	t := gotime.Unix(int64(ut), 0).In(loc)
 	(*time.Tm)(unsafe.Pointer(result)).Ftm_sec = int32(t.Second())
@@ -362,7 +354,7 @@ func Xftruncate(t *TLS, fd int32, length types.Off_t) int32 {
 	}
 
 	if dmesgs {
-		dmesg("%v: %d %#x: ok", origin(1), fd, length)
+		dmesg("%v: fd %d length %#0x: ok", origin(1), fd, length)
 	}
 	return 0
 }
@@ -380,10 +372,10 @@ func Xread(t *TLS, fd int32, buf uintptr, count types.Size_t) types.Ssize_t {
 		return -1
 	}
 
-	// if dmesgs {
-	// 	// dmesg("%v: %d %#x: %#x\n%s", origin(1), fd, count, n, hex.Dump(GoBytes(buf, int(n))))
-	// 	dmesg("%v: %d %#x: %#x", origin(1), fd, count, n)
-	// }
+	if dmesgs {
+		// dmesg("%v: %d %#x: %#x\n%s", origin(1), fd, count, n, hex.Dump(GoBytes(buf, int(n))))
+		dmesg("%v: fd %d, buf %#0x, count %#x: n %#x", origin(1), fd, count, n)
+	}
 	return types.Ssize_t(n)
 }
 
@@ -395,19 +387,19 @@ func Xwrite(t *TLS, fd int32, buf uintptr, count types.Size_t) types.Ssize_t {
 		var n uintptr
 		switch n, _, err = unix.Syscall(unix.SYS_WRITE, uintptr(fd), buf, uintptr(count)); err {
 		case 0:
-			// if dmesgs {
-			// 	// dmesg("%v: %d %#x: %#x\n%s", origin(1), fd, count, n, hex.Dump(GoBytes(buf, int(n))))
-			// 	dmesg("%v: %d %#x: %#x", origin(1), fd, count, n)
-			// }
+			if dmesgs {
+				// dmesg("%v: %d %#x: %#x\n%s", origin(1), fd, count, n, hex.Dump(GoBytes(buf, int(n))))
+				dmesg("%v: %d %#x: %#x", origin(1), fd, count, n)
+			}
 			return types.Ssize_t(n)
 		case errno.EAGAIN:
 			// nop
 		}
 	}
 
-	// if dmesgs {
-	// 	dmesg("%v: fd %v, count %#x: %v", origin(1), fd, count, err)
-	// }
+	if dmesgs {
+		dmesg("%v: fd %v, buf %#0x, count %#x: %v", origin(1), fd, count, err)
+	}
 	t.setErrno(err)
 	return -1
 }
@@ -1468,8 +1460,16 @@ func X__inet_ntoa(t *TLS, in1 in.In_addr) uintptr {
 }
 
 func Xmmap(t *TLS, addr uintptr, length types.Size_t, prot, flags, fd int32, offset types.Off_t) uintptr {
+	// On 2021-12-23, a new syscall for mmap was introduced:
+	//
+	// 	49	STD NOLOCK	{ void *sys_mmap(void *addr, size_t len, int prot, \
+	// 			    int flags, int fd, off_t pos); }
+	//  src: https://github.com/golang/go/issues/59661
+
+	const unix_SYS_MMAP = 49
+
 	// Cannot avoid the syscall here, addr sometimes matter.
-	data, _, err := unix.Syscall6(unix.SYS_MMAP, addr, uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	data, _, err := unix.Syscall6(unix_SYS_MMAP, addr, uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
 	if err != 0 {
 		if dmesgs {
 			dmesg("%v: %v FAIL", origin(1), err)
@@ -1479,7 +1479,7 @@ func Xmmap(t *TLS, addr uintptr, length types.Size_t, prot, flags, fd int32, off
 	}
 
 	if dmesgs {
-		dmesg("%v: %#x", origin(1), data)
+		dmesg("%v: addr %#0x, length %#x0, prot %#0x, flags %#0x, fd %d, offset %#0x returns %#0x", origin(1), addr, length, prot, flags, fd, offset, data)
 	}
 	return data
 }
diff --git a/vendor/modernc.org/libc/libc_openbsd_amd64.go b/vendor/modernc.org/libc/libc_openbsd_amd64.go
index 8843f989..434f06bb 100644
--- a/vendor/modernc.org/libc/libc_openbsd_amd64.go
+++ b/vendor/modernc.org/libc/libc_openbsd_amd64.go
@@ -268,7 +268,7 @@ func Xlseek64(t *TLS, fd int32, offset types.Off_t, whence int32) types.Off_t {
 	}
 
 	if dmesgs {
-		dmesg("%v: ok", origin(1))
+		dmesg("%v: fd %d, offset %#0x, whence %d, ok", origin(1), fd, offset, whence)
 	}
 	return types.Off_t(n)
 }
diff --git a/vendor/modernc.org/libc/libc_unix.go b/vendor/modernc.org/libc/libc_unix.go
index eb31f1d3..085c86b3 100644
--- a/vendor/modernc.org/libc/libc_unix.go
+++ b/vendor/modernc.org/libc/libc_unix.go
@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux || darwin || freebsd || netbsd || openbsd
-// +build linux darwin freebsd netbsd openbsd
+//go:build unix
+// +build unix
 
 package libc // import "modernc.org/libc"
 
 import (
 	"bufio"
+	"encoding/hex"
 	"io/ioutil"
 	"math"
 	"math/rand"
@@ -992,3 +993,30 @@ func Xctime_r(t *TLS, timep, buf uintptr) uintptr {
 	copy((*RawMem)(unsafe.Pointer(buf))[:26:26], s)
 	return buf
 }
+
+// ssize_t pread(int fd, void *buf, size_t count, off_t offset);
+func Xpread(t *TLS, fd int32, buf uintptr, count types.Size_t, offset types.Off_t) types.Ssize_t {
+	var n int
+	var err error
+	switch {
+	case count == 0:
+		n, err = unix.Pread(int(fd), nil, int64(offset))
+	default:
+		n, err = unix.Pread(int(fd), (*RawMem)(unsafe.Pointer(buf))[:count:count], int64(offset))
+		if dmesgs && err == nil {
+			dmesg("%v: fd %v, off %#x, count %#x, n %#x\n%s", origin(1), fd, offset, count, n, hex.Dump((*RawMem)(unsafe.Pointer(buf))[:n:n]))
+		}
+	}
+	if err != nil {
+		if dmesgs {
+			dmesg("%v: %v FAIL", origin(1), err)
+		}
+		t.setErrno(err)
+		return -1
+	}
+
+	if dmesgs {
+		dmesg("%v: ok", origin(1))
+	}
+	return types.Ssize_t(n)
+}
diff --git a/vendor/modernc.org/libc/libc_windows.go b/vendor/modernc.org/libc/libc_windows.go
index dc947a55..fc36dc5a 100644
--- a/vendor/modernc.org/libc/libc_windows.go
+++ b/vendor/modernc.org/libc/libc_windows.go
@@ -399,11 +399,7 @@ var localtime time.Tm
 
 // struct tm *localtime(const time_t *timep);
 func Xlocaltime(_ *TLS, timep uintptr) uintptr {
-	loc := gotime.Local
-	if r := getenv(Environ(), "TZ"); r != 0 {
-		zone, off := parseZone(GoString(r))
-		loc = gotime.FixedZone(zone, -off)
-	}
+	loc := getLocalLocation()
 	ut := *(*time.Time_t)(unsafe.Pointer(timep))
 	t := gotime.Unix(int64(ut), 0).In(loc)
 	localtime.Ftm_sec = int32(t.Second())
@@ -426,11 +422,7 @@ func X_localtime64(_ *TLS, timep uintptr) uintptr {
 // struct tm *localtime_r(const time_t *timep, struct tm *result);
 func Xlocaltime_r(_ *TLS, timep, result uintptr) uintptr {
 	panic(todo(""))
-	// loc := gotime.Local
-	// if r := getenv(Environ(), "TZ"); r != 0 {
-	// 	zone, off := parseZone(GoString(r))
-	// 	loc = gotime.FixedZone(zone, -off)
-	// }
+	// loc := getLocalLocation()
 	// ut := *(*unix.Time_t)(unsafe.Pointer(timep))
 	// t := gotime.Unix(int64(ut), 0).In(loc)
 	// (*time.Tm)(unsafe.Pointer(result)).Ftm_sec = int32(t.Second())
diff --git a/vendor/modernc.org/libc/limits/capi_linux_loong64.go b/vendor/modernc.org/libc/limits/capi_linux_loong64.go
new file mode 100644
index 00000000..dbe66d82
--- /dev/null
+++ b/vendor/modernc.org/libc/limits/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo limits/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o limits/limits_linux_amd64.go -pkgname limits', DO NOT EDIT.
+
+package limits
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/limits/limits_linux_loong64.go b/vendor/modernc.org/libc/limits/limits_linux_loong64.go
new file mode 100644
index 00000000..a9e1bafd
--- /dev/null
+++ b/vendor/modernc.org/libc/limits/limits_linux_loong64.go
@@ -0,0 +1,943 @@
+// Code generated by 'ccgo limits/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o limits/limits_linux_amd64.go -pkgname limits', DO NOT EDIT.
+
+package limits
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	AIO_PRIO_DELTA_MAX                   = 20                   // local_lim.h:78:1:
+	BC_BASE_MAX                          = 99                   // posix2_lim.h:63:1:
+	BC_DIM_MAX                           = 2048                 // posix2_lim.h:66:1:
+	BC_SCALE_MAX                         = 99                   // posix2_lim.h:69:1:
+	BC_STRING_MAX                        = 1000                 // posix2_lim.h:72:1:
+	CHARCLASS_NAME_MAX                   = 2048                 // posix2_lim.h:84:1:
+	CHAR_BIT                             = 8                    // limits.h:64:1:
+	CHAR_MAX                             = 127                  // limits.h:99:1:
+	CHAR_MIN                             = -128                 // limits.h:97:1:
+	COLL_WEIGHTS_MAX                     = 255                  // posix2_lim.h:75:1:
+	DELAYTIMER_MAX                       = 2147483647           // local_lim.h:84:1:
+	EXPR_NEST_MAX                        = 32                   // posix2_lim.h:78:1:
+	HOST_NAME_MAX                        = 64                   // local_lim.h:93:1:
+	INT_MAX                              = 2147483647           // limits.h:120:1:
+	INT_MIN                              = -2147483648          // limits.h:118:1:
+	LINE_MAX                             = 2048                 // posix2_lim.h:81:1:
+	LLONG_MAX                            = 9223372036854775807  // limits.h:142:1:
+	LLONG_MIN                            = -9223372036854775808 // limits.h:140:1:
+	LOGIN_NAME_MAX                       = 256                  // local_lim.h:90:1:
+	LONG_MAX                             = 9223372036854775807  // limits.h:131:1:
+	LONG_MIN                             = -9223372036854775808 // limits.h:129:1:
+	MAX_CANON                            = 255                  // limits.h:10:1:
+	MAX_INPUT                            = 255                  // limits.h:11:1:
+	MB_LEN_MAX                           = 16                   // limits.h:32:1:
+	MQ_PRIO_MAX                          = 32768                // local_lim.h:96:1:
+	NAME_MAX                             = 255                  // limits.h:12:1:
+	NGROUPS_MAX                          = 65536                // limits.h:7:1:
+	PATH_MAX                             = 4096                 // limits.h:13:1:
+	PIPE_BUF                             = 4096                 // limits.h:14:1:
+	PTHREAD_DESTRUCTOR_ITERATIONS        = 4                    // local_lim.h:69:1:
+	PTHREAD_KEYS_MAX                     = 1024                 // local_lim.h:64:1:
+	PTHREAD_STACK_MIN                    = 16384                // local_lim.h:81:1:
+	RE_DUP_MAX                           = 32767                // posix2_lim.h:88:1:
+	RTSIG_MAX                            = 32                   // limits.h:19:1:
+	SCHAR_MAX                            = 127                  // limits.h:75:1:
+	SCHAR_MIN                            = -128                 // limits.h:73:1:
+	SEM_VALUE_MAX                        = 2147483647           // local_lim.h:99:1:
+	SHRT_MAX                             = 32767                // limits.h:106:1:
+	SHRT_MIN                             = -32768               // limits.h:104:1:
+	SSIZE_MAX                            = 9223372036854775807  // posix1_lim.h:169:1:
+	TTY_NAME_MAX                         = 32                   // local_lim.h:87:1:
+	UCHAR_MAX                            = 255                  // limits.h:82:1:
+	UINT_MAX                             = 4294967295           // limits.h:124:1:
+	ULLONG_MAX                           = 18446744073709551615 // limits.h:146:1:
+	ULONG_MAX                            = 18446744073709551615 // limits.h:135:1:
+	USHRT_MAX                            = 65535                // limits.h:113:1:
+	XATTR_LIST_MAX                       = 65536                // limits.h:17:1:
+	XATTR_NAME_MAX                       = 255                  // limits.h:15:1:
+	XATTR_SIZE_MAX                       = 65536                // limits.h:16:1:
+	X_ATFILE_SOURCE                      = 1                    // features.h:342:1:
+	X_BITS_POSIX1_LIM_H                  = 1                    // posix1_lim.h:25:1:
+	X_BITS_POSIX2_LIM_H                  = 1                    // posix2_lim.h:23:1:
+	X_DEFAULT_SOURCE                     = 1                    // features.h:227:1:
+	X_FEATURES_H                         = 1                    // features.h:19:1:
+	X_FILE_OFFSET_BITS                   = 64                   // <builtin>:25:1:
+	X_GCC_LIMITS_H_                      = 0                    // limits.h:30:1:
+	X_LIBC_LIMITS_H_                     = 1                    // limits.h:23:1:
+	X_LIMITS_H___                        = 0                    // limits.h:60:1:
+	X_LINUX_LIMITS_H                     = 0                    // limits.h:3:1:
+	X_LP64                               = 1                    // <predefined>:284:1:
+	X_POSIX2_BC_BASE_MAX                 = 99                   // posix2_lim.h:27:1:
+	X_POSIX2_BC_DIM_MAX                  = 2048                 // posix2_lim.h:30:1:
+	X_POSIX2_BC_SCALE_MAX                = 99                   // posix2_lim.h:33:1:
+	X_POSIX2_BC_STRING_MAX               = 1000                 // posix2_lim.h:36:1:
+	X_POSIX2_CHARCLASS_NAME_MAX          = 14                   // posix2_lim.h:55:1:
+	X_POSIX2_COLL_WEIGHTS_MAX            = 2                    // posix2_lim.h:40:1:
+	X_POSIX2_EXPR_NEST_MAX               = 32                   // posix2_lim.h:44:1:
+	X_POSIX2_LINE_MAX                    = 2048                 // posix2_lim.h:47:1:
+	X_POSIX2_RE_DUP_MAX                  = 255                  // posix2_lim.h:51:1:
+	X_POSIX_AIO_LISTIO_MAX               = 2                    // posix1_lim.h:32:1:
+	X_POSIX_AIO_MAX                      = 1                    // posix1_lim.h:35:1:
+	X_POSIX_ARG_MAX                      = 4096                 // posix1_lim.h:38:1:
+	X_POSIX_CHILD_MAX                    = 25                   // posix1_lim.h:42:1:
+	X_POSIX_CLOCKRES_MIN                 = 20000000             // posix1_lim.h:157:1:
+	X_POSIX_C_SOURCE                     = 200809               // features.h:281:1:
+	X_POSIX_DELAYTIMER_MAX               = 32                   // posix1_lim.h:48:1:
+	X_POSIX_HOST_NAME_MAX                = 255                  // posix1_lim.h:52:1:
+	X_POSIX_LINK_MAX                     = 8                    // posix1_lim.h:55:1:
+	X_POSIX_LOGIN_NAME_MAX               = 9                    // posix1_lim.h:58:1:
+	X_POSIX_MAX_CANON                    = 255                  // posix1_lim.h:61:1:
+	X_POSIX_MAX_INPUT                    = 255                  // posix1_lim.h:65:1:
+	X_POSIX_MQ_OPEN_MAX                  = 8                    // posix1_lim.h:68:1:
+	X_POSIX_MQ_PRIO_MAX                  = 32                   // posix1_lim.h:71:1:
+	X_POSIX_NAME_MAX                     = 14                   // posix1_lim.h:74:1:
+	X_POSIX_NGROUPS_MAX                  = 8                    // posix1_lim.h:78:1:
+	X_POSIX_OPEN_MAX                     = 20                   // posix1_lim.h:85:1:
+	X_POSIX_PATH_MAX                     = 256                  // posix1_lim.h:97:1:
+	X_POSIX_PIPE_BUF                     = 512                  // posix1_lim.h:100:1:
+	X_POSIX_RE_DUP_MAX                   = 255                  // posix1_lim.h:104:1:
+	X_POSIX_RTSIG_MAX                    = 8                    // posix1_lim.h:107:1:
+	X_POSIX_SEM_NSEMS_MAX                = 256                  // posix1_lim.h:110:1:
+	X_POSIX_SEM_VALUE_MAX                = 32767                // posix1_lim.h:113:1:
+	X_POSIX_SIGQUEUE_MAX                 = 32                   // posix1_lim.h:116:1:
+	X_POSIX_SOURCE                       = 1                    // features.h:279:1:
+	X_POSIX_SSIZE_MAX                    = 32767                // posix1_lim.h:119:1:
+	X_POSIX_STREAM_MAX                   = 8                    // posix1_lim.h:122:1:
+	X_POSIX_SYMLINK_MAX                  = 255                  // posix1_lim.h:125:1:
+	X_POSIX_SYMLOOP_MAX                  = 8                    // posix1_lim.h:129:1:
+	X_POSIX_THREAD_DESTRUCTOR_ITERATIONS = 4                    // local_lim.h:67:1:
+	X_POSIX_THREAD_KEYS_MAX              = 128                  // local_lim.h:62:1:
+	X_POSIX_THREAD_THREADS_MAX           = 64                   // local_lim.h:72:1:
+	X_POSIX_TIMER_MAX                    = 32                   // posix1_lim.h:132:1:
+	X_POSIX_TTY_NAME_MAX                 = 9                    // posix1_lim.h:135:1:
+	X_POSIX_TZNAME_MAX                   = 6                    // posix1_lim.h:139:1:
+	X_STDC_PREDEF_H                      = 1                    // <predefined>:162:1:
+	X_SYS_CDEFS_H                        = 1                    // cdefs.h:19:1:
+	Linux                                = 1                    // <predefined>:231:1:
+	Unix                                 = 1                    // <predefined>:177:1:
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//
+// This file is part of GCC.
+//
+// GCC is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 3, or (at your option) any later
+// version.
+//
+// GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// for more details.
+//
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+//
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+// This administrivia gets added to the beginning of limits.h
+//    if the system has its own version of limits.h.
+
+// We use _GCC_LIMITS_H_ because we want this not to match
+//    any macros that the system's limits.h uses for its own purposes.
+
+// Use "..." so that we find syslimits.h only in this same directory.
+// syslimits.h stands for the system's own limits.h file.
+//    If we can use it ok unmodified, then we install this text.
+//    If fixincludes fixes it, then the fixed version is installed
+//    instead of this text.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	ISO C99 Standard: 7.10/5.2.4.2.1 Sizes of integer types	<limits.h>
+
+// Handle feature test macros at the start of a header.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This header is internal to glibc and should not be included outside
+//    of glibc headers.  Headers including it must define
+//    __GLIBC_INTERNAL_STARTING_HEADER_IMPLEMENTATION first.  This header
+//    cannot have multiple include guards because ISO C feature test
+//    macros depend on the definition of the macro when an affected
+//    header is included, not when the first system header is
+//    included.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// These are defined by the user (or the compiler)
+//    to specify the desired environment:
+//
+//    __STRICT_ANSI__	ISO Standard C.
+//    _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
+//    _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
+//    _ISOC2X_SOURCE	Extensions to ISO C99 from ISO C2X.
+//    __STDC_WANT_LIB_EXT2__
+// 			Extensions to ISO C99 from TR 27431-2:2010.
+//    __STDC_WANT_IEC_60559_BFP_EXT__
+// 			Extensions to ISO C11 from TS 18661-1:2014.
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__
+// 			Extensions to ISO C11 from TS 18661-4:2015.
+//    __STDC_WANT_IEC_60559_TYPES_EXT__
+// 			Extensions to ISO C11 from TS 18661-3:2015.
+//
+//    _POSIX_SOURCE	IEEE Std 1003.1.
+//    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
+// 			if >=199309L, add IEEE Std 1003.1b-1993;
+// 			if >=199506L, add IEEE Std 1003.1c-1995;
+// 			if >=200112L, all of IEEE 1003.1-2004
+// 			if >=200809L, all of IEEE 1003.1-2008
+//    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
+// 			Single Unix conformance is wanted, to 600 for the
+// 			sixth revision, to 700 for the seventh revision.
+//    _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
+//    _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
+//    _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
+//    _FILE_OFFSET_BITS=N	Select default filesystem interface.
+//    _ATFILE_SOURCE	Additional *at interfaces.
+//    _GNU_SOURCE		All of the above, plus GNU extensions.
+//    _DEFAULT_SOURCE	The default set of features (taking precedence over
+// 			__STRICT_ANSI__).
+//
+//    _FORTIFY_SOURCE	Add security hardening to many library functions.
+// 			Set to 1 or 2; 2 performs stricter checks than 1.
+//
+//    _REENTRANT, _THREAD_SAFE
+// 			Obsolete; equivalent to _POSIX_C_SOURCE=199506L.
+//
+//    The `-ansi' switch to the GNU C compiler, and standards conformance
+//    options such as `-std=c99', define __STRICT_ANSI__.  If none of
+//    these are defined, or if _DEFAULT_SOURCE is defined, the default is
+//    to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
+//    200809L, as well as enabling miscellaneous functions from BSD and
+//    SVID.  If more than one of these are defined, they accumulate.  For
+//    example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
+//    give you ISO C, 1003.1, and 1003.2, but nothing else.
+//
+//    These are defined by this file and are used by the
+//    header files to decide what to declare or define:
+//
+//    __GLIBC_USE (F)	Define things from feature set F.  This is defined
+// 			to 1 or 0; the subsequent macros are either defined
+// 			or undefined, and those tests should be moved to
+// 			__GLIBC_USE.
+//    __USE_ISOC11		Define ISO C11 things.
+//    __USE_ISOC99		Define ISO C99 things.
+//    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+//    __USE_ISOCXX11	Define ISO C++11 things.
+//    __USE_POSIX		Define IEEE Std 1003.1 things.
+//    __USE_POSIX2		Define IEEE Std 1003.2 things.
+//    __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
+//    __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
+//    __USE_XOPEN		Define XPG things.
+//    __USE_XOPEN_EXTENDED	Define X/Open Unix things.
+//    __USE_UNIX98		Define Single Unix V2 things.
+//    __USE_XOPEN2K        Define XPG6 things.
+//    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+//    __USE_XOPEN2K8       Define XPG7 things.
+//    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
+//    __USE_LARGEFILE	Define correct standard I/O things.
+//    __USE_LARGEFILE64	Define LFS things with separate names.
+//    __USE_FILE_OFFSET64	Define 64bit interface as default.
+//    __USE_MISC		Define things from 4.3BSD or System V Unix.
+//    __USE_ATFILE		Define *at interfaces and AT_* constants for them.
+//    __USE_GNU		Define GNU extensions.
+//    __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
+//
+//    The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
+//    defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
+//    only for compatibility.  All new code should use the other symbols
+//    to test for features.
+//
+//    All macros listed above as possibly being defined by this file are
+//    explicitly undefined if they are not explicitly defined.
+//    Feature-test macros that are not defined by the user or compiler
+//    but are implied by the other feature-test macros defined (or by the
+//    lack of any definitions) are defined by the file.
+//
+//    ISO C feature test macros depend on the definition of the macro
+//    when an affected header is included, not when the first system
+//    header is included, and so they are handled in
+//    <bits/libc-header-start.h>, which does not have a multiple include
+//    guard.  Feature test macros that can be handled from the first
+//    system header included are handled here.
+
+// Undefine everything, so we get a clean slate.
+
+// Suppress kernel-name space pollution unless user expressedly asks
+//    for it.
+
+// Convenience macro to test the version of gcc.
+//    Use like this:
+//    #if __GNUC_PREREQ (2,8)
+//    ... code requiring gcc 2.8 or later ...
+//    #endif
+//    Note: only works for GCC 2.0 and later, because __GNUC_MINOR__ was
+//    added in 2.0.
+
+// Similarly for clang.  Features added to GCC after version 4.2 may
+//    or may not also be available in clang, and clang's definitions of
+//    __GNUC(_MINOR)__ are fixed at 4 and 2 respectively.  Not all such
+//    features can be queried via __has_extension/__has_feature.
+
+// Whether to use feature set F.
+
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
+//    _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
+//    issue a warning; the expectation is that the source is being
+//    transitioned to use the new macro.
+
+// If _GNU_SOURCE was defined by the user, turn on all the other features.
+
+// If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
+//    define _DEFAULT_SOURCE.
+
+// This is to enable the ISO C2X extension.
+
+// This is to enable the ISO C11 extension.
+
+// This is to enable the ISO C99 extension.
+
+// This is to enable the ISO C90 Amendment 1:1995 extension.
+
+// If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
+//    is defined, use POSIX.1-2008 (or another version depending on
+//    _XOPEN_SOURCE).
+
+// Some C libraries once required _REENTRANT and/or _THREAD_SAFE to be
+//    defined in all multithreaded code.  GNU libc has not required this
+//    for many years.  We now treat them as compatibility synonyms for
+//    _POSIX_C_SOURCE=199506L, which is the earliest level of POSIX with
+//    comprehensive support for multithreaded code.  Using them never
+//    lowers the selected level of POSIX conformance, only raises it.
+
+// The function 'gets' existed in C89, but is impossible to use
+//    safely.  It has been removed from ISO C11 and ISO C++14.  Note: for
+//    compatibility with various implementations of <cstdio>, this test
+//    must consider only the value of __cplusplus when compiling C++.
+
+// GNU formerly extended the scanf functions with modified format
+//    specifiers %as, %aS, and %a[...] that allocate a buffer for the
+//    input using malloc.  This extension conflicts with ISO C99, which
+//    defines %a as a standalone format specifier that reads a floating-
+//    point number; moreover, POSIX.1-2008 provides the same feature
+//    using the modifier letter 'm' instead (%ms, %mS, %m[...]).
+//
+//    We now follow C99 unless GNU extensions are active and the compiler
+//    is specifically in C89 or C++98 mode (strict or not).  For
+//    instance, with GCC, -std=gnu11 will have C99-compliant scanf with
+//    or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
+//    old extension.
+
+// Get definitions of __STDC_* predefined macros, if the compiler has
+//    not preincluded this header automatically.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This macro indicates that the installed library is the GNU C Library.
+//    For historic reasons the value now is 6 and this will stay from now
+//    on.  The use of this variable is deprecated.  Use __GLIBC__ and
+//    __GLIBC_MINOR__ now (see below) when you want to test for a specific
+//    GNU C library version and use the values in <gnu/lib-names.h> to get
+//    the sonames of the shared libraries.
+
+// Major and minor version number of the GNU C library package.  Use
+//    these macros to test for features in specific releases.
+
+// This is here only because every header file already includes this one.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// We are almost always included from features.h.
+
+// The GNU libc does not support any K&R compilers or the traditional mode
+//    of ISO C compilers anymore.  Check for some of the combinations not
+//    anymore supported.
+
+// Some user header file might have defined this before.
+
+// All functions, except those with callbacks or those that
+//    synchronize memory, are leaf functions.
+
+// GCC can always grok prototypes.  For C++ programs we add throw()
+//    to help it optimize the function calls.  But this works only with
+//    gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+//    as non-throwing using a function attribute since programs can use
+//    the -fexceptions options for C code as well.
+
+// Compilers that are not clang may object to
+//        #if defined __clang__ && __has_extension(...)
+//    even though they do not need to evaluate the right-hand side of the &&.
+
+// These two macros are not used in glibc anymore.  They are kept here
+//    only because some other projects expect the macros to be defined.
+
+// For these things, GCC behaves the ANSI way normally,
+//    and the non-ANSI way under -traditional.
+
+// This is not a typedef so `const __ptr_t' does the right thing.
+
+// C++ needs to know that types and declarations are C, not C++.
+
+// Fortify support.
+
+// Support for flexible arrays.
+//    Headers that should use flexible arrays only if they're "real"
+//    (e.g. only if they won't affect sizeof()) should test
+//    #if __glibc_c99_flexarr_available.
+
+// __asm__ ("xyz") is used throughout the headers to rename functions
+//    at the assembly language level.  This is wrapped by the __REDIRECT
+//    macro, in order to support compilers that can do this some other
+//    way.  When compilers don't support asm-names at all, we have to do
+//    preprocessor tricks instead (which don't have exactly the right
+//    semantics, but it's the best we can do).
+//
+//    Example:
+//    int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid);
+
+//
+// #elif __SOME_OTHER_COMPILER__
+//
+// # define __REDIRECT(name, proto, alias) name proto; 	_Pragma("let " #name " = " #alias)
+
+// GCC has various useful declarations that can be made with the
+//    `__attribute__' syntax.  All of the ways we use this do fine if
+//    they are omitted for compilers that don't understand it.
+
+// At some point during the gcc 2.96 development the `malloc' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Tell the compiler which arguments to an allocation function
+//    indicate the size of the allocation.
+
+// At some point during the gcc 2.96 development the `pure' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// This declaration tells the compiler that the value is constant.
+
+// At some point during the gcc 3.1 development the `used' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Since version 3.2, gcc allows marking deprecated functions.
+
+// Since version 4.5, gcc also allows one to specify the message printed
+//    when a deprecated function is used.  clang claims to be gcc 4.2, but
+//    may also support this feature.
+
+// At some point during the gcc 2.8 development the `format_arg' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+//    If several `format_arg' attributes are given for the same function, in
+//    gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+//    all designated arguments are considered.
+
+// At some point during the gcc 2.97 development the `strfmon' format
+//    attribute for functions was introduced.  We don't want to use it
+//    unconditionally (although this would be possible) since it
+//    generates warnings.
+
+// The nonull function attribute allows to mark pointer parameters which
+//    must not be NULL.
+
+// If fortification mode, we warn about unused results of certain
+//    function calls which can lead to problems.
+
+// Forces a function to be always inlined.
+// The Linux kernel defines __always_inline in stddef.h (283d7573), and
+//    it conflicts with this definition.  Therefore undefine it first to
+//    allow either header to be included first.
+
+// Associate error messages with the source location of the call site rather
+//    than with the source location inside the function.
+
+// GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+//    inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
+//    or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+//    older than 4.3 may define these macros and still not guarantee GNU inlining
+//    semantics.
+//
+//    clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+//    semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
+//    __GNUC_GNU_INLINE__ macro definitions.
+
+// GCC 4.3 and above allow passing all anonymous arguments of an
+//    __extern_always_inline function to some other vararg function.
+
+// It is possible to compile containing GCC extensions even if GCC is
+//    run in pedantic mode if the uses are carefully marked using the
+//    `__extension__' keyword.  But this is not generally available before
+//    version 2.8.
+
+// __restrict is known in EGCS 1.2 and above.
+
+// ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+//      array_name[restrict]
+//    GCC 3.1 supports this.
+
+// Describes a char array whose address can safely be passed as the first
+//    argument to strncpy and strncat, as the char array is not necessarily
+//    a NUL-terminated string.
+
+// Undefine (also defined in libc-symbols.h).
+// Copies attributes from the declaration or type referenced by
+//    the argument.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// __glibc_macro_warning (MESSAGE) issues warning MESSAGE.  This is
+//    intended for use in preprocessor macros.
+//
+//    Note: MESSAGE must be a _single_ string; concatenation of string
+//    literals is not supported.
+
+// Generic selection (ISO C11) is a C-only feature, available in GCC
+//    since version 4.9.  Previous versions do not provide generic
+//    selection, even though they might set __STDC_VERSION__ to 201112L,
+//    when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
+//    when testing __STDC_VERSION__ for generic selection support.
+//    On the other hand, Clang also defines __GNUC__, so a clang-specific
+//    check is required to enable the use of generic selection.
+
+// If we don't have __REDIRECT, prototypes will be missing if
+//    __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64].
+
+// Decide whether we can define 'extern inline' functions in headers.
+
+// This is here only because every header file already includes this one.
+//    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
+//    <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+//    that will always return failure (and set errno to ENOSYS).
+// This file is automatically generated.
+//    This file selects the right generated file of `__stub_FUNCTION' macros
+//    based on the architecture being compiled for.
+
+// This file is automatically generated.
+//    It defines a symbol `__stub_FUNCTION' for each function
+//    in the C library which is a stub, meaning it will fail
+//    every time called, usually setting errno to ENOSYS.
+
+// ISO/IEC TR 24731-2:2010 defines the __STDC_WANT_LIB_EXT2__
+//    macro.
+
+// ISO/IEC TS 18661-1:2014 defines the __STDC_WANT_IEC_60559_BFP_EXT__
+//    macro.  Most but not all symbols enabled by that macro in TS
+//    18661-1 are enabled unconditionally in C2X; the symbols in Annex F
+//    still require that macro in C2X.
+
+// ISO/IEC TS 18661-4:2015 defines the
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__ macro.  Other than the reduction
+//    functions, the symbols from this TS are enabled unconditionally in
+//    C2X.
+
+// ISO/IEC TS 18661-3:2015 defines the
+//    __STDC_WANT_IEC_60559_TYPES_EXT__ macro.
+
+// Maximum length of any multibyte character in any locale.
+//    We define this value here since the gcc header does not define
+//    the correct value.
+
+// If we are not using GNU CC we have to define all the symbols ourself.
+//    Otherwise use gcc's definitions (see below).
+
+// Get the compiler's limits.h, which defines almost all the ISO constants.
+//
+//     We put this #include_next outside the double inclusion check because
+//     it should be possible to include this file more than once and still get
+//     the definitions from gcc's header.
+
+// The <limits.h> files in some gcc versions don't define LLONG_MIN,
+//    LLONG_MAX, and ULLONG_MAX.  Instead only the values gcc defined for
+//    ages are available.
+
+// The integer width macros are not defined by GCC's <limits.h> before
+//    GCC 7, or if _GNU_SOURCE rather than
+//    __STDC_WANT_IEC_60559_BFP_EXT__ is used to enable this feature.
+
+// POSIX adds things to <limits.h>.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX Standard: 2.9.2 Minimum Values	Added to <limits.h>
+//
+//	Never include this file directly; use <limits.h> instead.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// These are the standard-mandated minimum values.
+
+// Minimum number of operations in one list I/O call.
+
+// Minimal number of outstanding asynchronous I/O operations.
+
+// Maximum length of arguments to `execve', including environment.
+
+// Maximum simultaneous processes per real user ID.
+
+// Minimal number of timer expiration overruns.
+
+// Maximum length of a host name (not including the terminating null)
+//    as returned from the GETHOSTNAME function.
+
+// Maximum link count of a file.
+
+// Maximum length of login name.
+
+// Number of bytes in a terminal canonical input queue.
+
+// Number of bytes for which space will be
+//    available in a terminal input queue.
+
+// Maximum number of message queues open for a process.
+
+// Maximum number of supported message priorities.
+
+// Number of bytes in a filename.
+
+// Number of simultaneous supplementary group IDs per process.
+
+// Number of files one process can have open at once.
+
+// Number of bytes in a pathname.
+
+// Number of bytes than can be written atomically to a pipe.
+
+// The number of repeated occurrences of a BRE permitted by the
+//    REGEXEC and REGCOMP functions when using the interval notation.
+
+// Minimal number of realtime signals reserved for the application.
+
+// Number of semaphores a process can have.
+
+// Maximal value of a semaphore.
+
+// Number of pending realtime signals.
+
+// Largest value of a `ssize_t'.
+
+// Number of streams a process can have open at once.
+
+// The number of bytes in a symbolic link.
+
+// The number of symbolic links that can be traversed in the
+//    resolution of a pathname in the absence of a loop.
+
+// Number of timer for a process.
+
+// Maximum number of characters in a tty name.
+
+// Maximum length of a timezone name (element of `tzname').
+
+// Maximum clock resolution in nanoseconds.
+
+// Get the implementation-specific values for the above.
+// Minimum guaranteed maximum values for system limits.  Linux version.
+//    Copyright (C) 1993-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public License as
+//    published by the Free Software Foundation; either version 2.1 of the
+//    License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; see the file COPYING.LIB.  If
+//    not, see <https://www.gnu.org/licenses/>.
+
+// The kernel header pollutes the namespace with the NR_OPEN symbol
+//    and defines LINK_MAX although filesystems have different maxima.  A
+//    similar thing is true for OPEN_MAX: the limit can be changed at
+//    runtime and therefore the macro must not be defined.  Remove this
+//    after including the header if necessary.
+
+// The kernel sources contain a file with all the needed information.
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// Have to remove NR_OPEN?
+// Have to remove LINK_MAX?
+// Have to remove OPEN_MAX?
+// Have to remove ARG_MAX?
+
+// The number of data keys per process.
+// This is the value this implementation supports.
+
+// Controlling the iterations of destructors for thread-specific data.
+// Number of iterations this implementation does.
+
+// The number of threads per process.
+// We have no predefined limit on the number of threads.
+
+// Maximum amount by which a process can descrease its asynchronous I/O
+//    priority level.
+
+// Minimum size for a thread.  We are free to choose a reasonable value.
+
+// Maximum number of timer expiration overruns.
+
+// Maximum tty name length.
+
+// Maximum login name length.  This is arbitrary.
+
+// Maximum host name length.
+
+// Maximum message queue priority level.
+
+// Maximum value the semaphore can have.
+
+// ssize_t is not formally required to be the signed type
+//    corresponding to size_t, but it is for all configurations supported
+//    by glibc.
+
+// This value is a guaranteed minimum maximum.
+//    The current maximum can be got from `sysconf'.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; include <limits.h> instead.
+
+// The maximum `ibase' and `obase' values allowed by the `bc' utility.
+
+// The maximum number of elements allowed in an array by the `bc' utility.
+
+// The maximum `scale' value allowed by the `bc' utility.
+
+// The maximum length of a string constant accepted by the `bc' utility.
+
+// The maximum number of weights that can be assigned to an entry of
+//    the LC_COLLATE `order' keyword in the locale definition file.
+
+// The maximum number of expressions that can be nested
+//    within parentheses by the `expr' utility.
+
+// The maximum length, in bytes, of an input line.
+
+// The maximum number of repeated occurrences of a regular expression
+//    permitted when using the interval notation `\{M,N\}'.
+
+// The maximum number of bytes in a character class name.  We have no
+//    fixed limit, 2048 is a high number.
+
+// These values are implementation-specific,
+//    and may vary within the implementation.
+//    Their precise values can be obtained from sysconf.
+
+// This value is defined like this in regex.h.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//
+// This file is part of GCC.
+//
+// GCC is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 3, or (at your option) any later
+// version.
+//
+// GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// for more details.
+//
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+//
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+// Number of bits in a `char'.
+
+// Maximum length of a multibyte character.
+
+// Minimum and maximum values a `signed char' can hold.
+
+// Maximum value an `unsigned char' can hold.  (Minimum is 0).
+
+// Minimum and maximum values a `char' can hold.
+
+// Minimum and maximum values a `signed short int' can hold.
+
+// Maximum value an `unsigned short int' can hold.  (Minimum is 0).
+
+// Minimum and maximum values a `signed int' can hold.
+
+// Maximum value an `unsigned int' can hold.  (Minimum is 0).
+
+// Minimum and maximum values a `signed long int' can hold.
+//    (Same as `int').
+
+// Maximum value an `unsigned long int' can hold.  (Minimum is 0).
+
+// Minimum and maximum values a `signed long long int' can hold.
+
+// Maximum value an `unsigned long long int' can hold.  (Minimum is 0).
+
+// This administrivia gets added to the end of limits.h
+//    if the system has its own version of limits.h.
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/musl_linux_loong64.go b/vendor/modernc.org/libc/musl_linux_loong64.go
new file mode 100644
index 00000000..7921d992
--- /dev/null
+++ b/vendor/modernc.org/libc/musl_linux_loong64.go
@@ -0,0 +1,6940 @@
+// Code generated by 'ccgo -export-externs X -hide __syscall0,__syscall1,__syscall2,__syscall3,__syscall4,__syscall5,__syscall6 -nostdinc -nostdlib -o ../musl_linux_amd64.go -pkgname libc -static-locals-prefix _s -Iarch/x86_64 -Iarch/generic -Iobj/src/internal -Isrc/include -Isrc/internal -Iobj/include -Iinclude copyright.c src/ctype/__ctype_b_loc.c src/ctype/isalnum.c src/ctype/isalpha.c src/ctype/isdigit.c src/ctype/islower.c src/ctype/isprint.c src/ctype/isupper.c src/ctype/isxdigit.c src/dirent/closedir.c src/dirent/opendir.c src/dirent/readdir.c src/internal/floatscan.c src/internal/intscan.c src/internal/shgetc.c src/locale/localeconv.c src/math/__fpclassify.c src/math/__fpclassifyf.c src/math/__fpclassifyl.c src/math/copysignl.c src/math/fabsl.c src/math/fmodl.c src/math/nanf.c src/math/rint.c src/math/scalbn.c src/math/scalbnl.c src/multibyte/internal.c src/multibyte/mbrtowc.c src/multibyte/mbsinit.c src/network/freeaddrinfo.c src/network/getaddrinfo.c src/network/gethostbyaddr.c src/network/gethostbyaddr_r.c src/network/gethostbyname.c src/network/gethostbyname2.c src/network/gethostbyname2_r.c src/network/gethostbyname_r.c src/network/getnameinfo.c src/network/h_errno.c src/network/inet_aton.c src/network/inet_ntop.c src/network/inet_pton.c src/network/lookup_ipliteral.c src/network/lookup_name.c src/network/lookup_serv.c src/prng/rand_r.c src/stdio/__lockfile.c src/stdio/__toread.c src/stdio/__uflow.c src/stdio/sscanf.c src/stdio/vfscanf.c src/stdio/vsscanf.c src/stdlib/bsearch.c src/stdlib/strtod.c src/stdlib/strtol.c src/string/strdup.c src/string/strlcat.c src/string/strlcpy.c src/string/strncasecmp.c src/string/strncat.c src/string/strnlen.c src/string/strspn.c src/string/strtok.c src/thread/pthread_attr_get.c src/thread/pthread_attr_setdetachstate.c src/thread/pthread_mutex_lock.c src/thread/pthread_mutexattr_destroy.c src/thread/pthread_mutexattr_init.c src/thread/pthread_mutexattr_settype.c', DO NOT EDIT.
+
+package libc
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+// musl as a whole is licensed under the following standard MIT license:
+//
+// ----------------------------------------------------------------------
+// Copyright © 2005-2020 Rich Felker, et al.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// ----------------------------------------------------------------------
+//
+// Authors/contributors include:
+//
+// A. Wilcox
+// Ada Worcester
+// Alex Dowad
+// Alex Suykov
+// Alexander Monakov
+// Andre McCurdy
+// Andrew Kelley
+// Anthony G. Basile
+// Aric Belsito
+// Arvid Picciani
+// Bartosz Brachaczek
+// Benjamin Peterson
+// Bobby Bingham
+// Boris Brezillon
+// Brent Cook
+// Chris Spiegel
+// Clément Vasseur
+// Daniel Micay
+// Daniel Sabogal
+// Daurnimator
+// David Carlier
+// David Edelsohn
+// Denys Vlasenko
+// Dmitry Ivanov
+// Dmitry V. Levin
+// Drew DeVault
+// Emil Renner Berthing
+// Fangrui Song
+// Felix Fietkau
+// Felix Janda
+// Gianluca Anzolin
+// Hauke Mehrtens
+// He X
+// Hiltjo Posthuma
+// Isaac Dunham
+// Jaydeep Patil
+// Jens Gustedt
+// Jeremy Huntwork
+// Jo-Philipp Wich
+// Joakim Sindholt
+// John Spencer
+// Julien Ramseier
+// Justin Cormack
+// Kaarle Ritvanen
+// Khem Raj
+// Kylie McClain
+// Leah Neukirchen
+// Luca Barbato
+// Luka Perkov
+// M Farkas-Dyck (Strake)
+// Mahesh Bodapati
+// Markus Wichmann
+// Masanori Ogino
+// Michael Clark
+// Michael Forney
+// Mikhail Kremnyov
+// Natanael Copa
+// Nicholas J. Kain
+// orc
+// Pascal Cuoq
+// Patrick Oppenlander
+// Petr Hosek
+// Petr Skocik
+// Pierre Carrier
+// Reini Urban
+// Rich Felker
+// Richard Pennington
+// Ryan Fairfax
+// Samuel Holland
+// Segev Finer
+// Shiz
+// sin
+// Solar Designer
+// Stefan Kristiansson
+// Stefan O'Rear
+// Szabolcs Nagy
+// Timo Teräs
+// Trutz Behn
+// Valentin Ochs
+// Will Dietz
+// William Haddon
+// William Pitcock
+//
+// Portions of this software are derived from third-party works licensed
+// under terms compatible with the above MIT license:
+//
+// The TRE regular expression implementation (src/regex/reg* and
+// src/regex/tre*) is Copyright © 2001-2008 Ville Laurikari and licensed
+// under a 2-clause BSD license (license text in the source files). The
+// included version has been heavily modified by Rich Felker in 2012, in
+// the interests of size, simplicity, and namespace cleanliness.
+//
+// Much of the math library code (src/math/* and src/complex/*) is
+// Copyright © 1993,2004 Sun Microsystems or
+// Copyright © 2003-2011 David Schultz or
+// Copyright © 2003-2009 Steven G. Kargl or
+// Copyright © 2003-2009 Bruce D. Evans or
+// Copyright © 2008 Stephen L. Moshier or
+// Copyright © 2017-2018 Arm Limited
+// and labelled as such in comments in the individual source files. All
+// have been licensed under extremely permissive terms.
+//
+// The ARM memcpy code (src/string/arm/memcpy.S) is Copyright © 2008
+// The Android Open Source Project and is licensed under a two-clause BSD
+// license. It was taken from Bionic libc, used on Android.
+//
+// The AArch64 memcpy and memset code (src/string/aarch64/*) are
+// Copyright © 1999-2019, Arm Limited.
+//
+// The implementation of DES for crypt (src/crypt/crypt_des.c) is
+// Copyright © 1994 David Burren. It is licensed under a BSD license.
+//
+// The implementation of blowfish crypt (src/crypt/crypt_blowfish.c) was
+// originally written by Solar Designer and placed into the public
+// domain. The code also comes with a fallback permissive license for use
+// in jurisdictions that may not recognize the public domain.
+//
+// The smoothsort implementation (src/stdlib/qsort.c) is Copyright © 2011
+// Valentin Ochs and is licensed under an MIT-style license.
+//
+// The x86_64 port was written by Nicholas J. Kain and is licensed under
+// the standard MIT terms.
+//
+// The mips and microblaze ports were originally written by Richard
+// Pennington for use in the ellcc project. The original code was adapted
+// by Rich Felker for build system and code conventions during upstream
+// integration. It is licensed under the standard MIT terms.
+//
+// The mips64 port was contributed by Imagination Technologies and is
+// licensed under the standard MIT terms.
+//
+// The powerpc port was also originally written by Richard Pennington,
+// and later supplemented and integrated by John Spencer. It is licensed
+// under the standard MIT terms.
+//
+// All other files which have no copyright comments are original works
+// produced specifically for use as part of this library, written either
+// by Rich Felker, the main author of the library, or by one or more
+// contibutors listed above. Details on authorship of individual files
+// can be found in the git version control history of the project. The
+// omission of copyright and license comments in each file is in the
+// interest of source tree size.
+//
+// In addition, permission is hereby granted for all public header files
+// (include/* and arch/*/bits/*) and crt files intended to be linked into
+// applications (crt/*, ldso/dlstart.c, and arch/*/crt_arch.h) to omit
+// the copyright notice and permission notice otherwise required by the
+// license, and to use these files without any requirement of
+// attribution. These files include substantial contributions from:
+//
+// Bobby Bingham
+// John Spencer
+// Nicholas J. Kain
+// Rich Felker
+// Richard Pennington
+// Stefan Kristiansson
+// Szabolcs Nagy
+//
+// all of whom have explicitly granted such permission.
+//
+// This file previously contained text expressing a belief that most of
+// the files covered by the above exception were sufficiently trivial not
+// to be subject to copyright, resulting in confusion over whether it
+// negated the permissions granted in the license. In the spirit of
+// permissive licensing, and of not having licensing issues being an
+// obstacle to adoption, that text has been removed.
+const ( /* copyright.c:194:1: */
+	__musl__copyright__ = 0
+)
+
+const ( /* nameser.h:117:1: */
+	ns_uop_delete = 0
+	ns_uop_add    = 1
+	ns_uop_max    = 2
+)
+
+const ( /* nameser.h:147:1: */
+	ns_t_invalid  = 0
+	ns_t_a        = 1
+	ns_t_ns       = 2
+	ns_t_md       = 3
+	ns_t_mf       = 4
+	ns_t_cname    = 5
+	ns_t_soa      = 6
+	ns_t_mb       = 7
+	ns_t_mg       = 8
+	ns_t_mr       = 9
+	ns_t_null     = 10
+	ns_t_wks      = 11
+	ns_t_ptr      = 12
+	ns_t_hinfo    = 13
+	ns_t_minfo    = 14
+	ns_t_mx       = 15
+	ns_t_txt      = 16
+	ns_t_rp       = 17
+	ns_t_afsdb    = 18
+	ns_t_x25      = 19
+	ns_t_isdn     = 20
+	ns_t_rt       = 21
+	ns_t_nsap     = 22
+	ns_t_nsap_ptr = 23
+	ns_t_sig      = 24
+	ns_t_key      = 25
+	ns_t_px       = 26
+	ns_t_gpos     = 27
+	ns_t_aaaa     = 28
+	ns_t_loc      = 29
+	ns_t_nxt      = 30
+	ns_t_eid      = 31
+	ns_t_nimloc   = 32
+	ns_t_srv      = 33
+	ns_t_atma     = 34
+	ns_t_naptr    = 35
+	ns_t_kx       = 36
+	ns_t_cert     = 37
+	ns_t_a6       = 38
+	ns_t_dname    = 39
+	ns_t_sink     = 40
+	ns_t_opt      = 41
+	ns_t_apl      = 42
+	ns_t_tkey     = 249
+	ns_t_tsig     = 250
+	ns_t_ixfr     = 251
+	ns_t_axfr     = 252
+	ns_t_mailb    = 253
+	ns_t_maila    = 254
+	ns_t_any      = 255
+	ns_t_zxfr     = 256
+	ns_t_max      = 65536
+)
+
+const ( /* nameser.h:210:1: */
+	ns_c_invalid = 0
+	ns_c_in      = 1
+	ns_c_2       = 2
+	ns_c_chaos   = 3
+	ns_c_hs      = 4
+	ns_c_none    = 254
+	ns_c_any     = 255
+	ns_c_max     = 65536
+)
+
+const ( /* nameser.h:221:1: */
+	ns_kt_rsa     = 1
+	ns_kt_dh      = 2
+	ns_kt_dsa     = 3
+	ns_kt_private = 254
+)
+
+const ( /* nameser.h:228:1: */
+	cert_t_pkix = 1
+	cert_t_spki = 2
+	cert_t_pgp  = 3
+	cert_t_url  = 253
+	cert_t_oid  = 254
+)
+
+const ( /* nameser.h:28:1: */
+	ns_s_qd  = 0
+	ns_s_zn  = 0
+	ns_s_an  = 1
+	ns_s_pr  = 1
+	ns_s_ns  = 2
+	ns_s_ud  = 2
+	ns_s_ar  = 3
+	ns_s_max = 4
+)
+
+const ( /* nameser.h:75:1: */
+	ns_f_qr     = 0
+	ns_f_opcode = 1
+	ns_f_aa     = 2
+	ns_f_tc     = 3
+	ns_f_rd     = 4
+	ns_f_ra     = 5
+	ns_f_z      = 6
+	ns_f_ad     = 7
+	ns_f_cd     = 8
+	ns_f_rcode  = 9
+	ns_f_max    = 10
+)
+
+const ( /* nameser.h:89:1: */
+	ns_o_query  = 0
+	ns_o_iquery = 1
+	ns_o_status = 2
+	ns_o_notify = 4
+	ns_o_update = 5
+	ns_o_max    = 6
+)
+
+const ( /* nameser.h:98:1: */
+	ns_r_noerror  = 0
+	ns_r_formerr  = 1
+	ns_r_servfail = 2
+	ns_r_nxdomain = 3
+	ns_r_notimpl  = 4
+	ns_r_refused  = 5
+	ns_r_yxdomain = 6
+	ns_r_yxrrset  = 7
+	ns_r_nxrrset  = 8
+	ns_r_notauth  = 9
+	ns_r_notzone  = 10
+	ns_r_max      = 11
+	ns_r_badvers  = 16
+	ns_r_badsig   = 16
+	ns_r_badkey   = 17
+	ns_r_badtime  = 18
+)
+
+const ( /* pthread_impl.h:58:1: */
+	DT_EXITING  = 0
+	DT_JOINABLE = 1
+	DT_DETACHED = 2
+)
+
+type ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type size_t = uint64 /* <builtin>:9:23 */
+
+type wchar_t = int32 /* <builtin>:15:24 */
+
+type uint16_t = uint16 /* alltypes.h:126:25 */
+
+type uint32_t = uint32 /* alltypes.h:131:25 */
+
+type uint64_t = uint64 /* alltypes.h:136:25 */
+
+func __bswap32(tls *TLS, __x uint32_t) uint32_t { /* endian.h:24:26: */
+	return __x>>24 | __x>>8&uint32_t(0xff00) | __x<<8&uint32_t(0xff0000) | __x<<24
+}
+
+var table = [384]uint16{
+	uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0),
+	uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0),
+	uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0),
+	uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0),
+	uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536),
+	uint16((0x200/256 | 0x200*256) % 65536), uint16((0x320/256 | 0x320*256) % 65536), uint16((0x220/256 | 0x220*256) % 65536), uint16((0x220/256 | 0x220*256) % 65536), uint16((0x220/256 | 0x220*256) % 65536), uint16((0x220/256 | 0x220*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536),
+	uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536),
+	uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536),
+	uint16((0x160/256 | 0x160*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536),
+	uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536),
+	uint16((0x8d8/256 | 0x8d8*256) % 65536), uint16((0x8d8/256 | 0x8d8*256) % 65536), uint16((0x8d8/256 | 0x8d8*256) % 65536), uint16((0x8d8/256 | 0x8d8*256) % 65536), uint16((0x8d8/256 | 0x8d8*256) % 65536), uint16((0x8d8/256 | 0x8d8*256) % 65536), uint16((0x8d8/256 | 0x8d8*256) % 65536), uint16((0x8d8/256 | 0x8d8*256) % 65536),
+	uint16((0x8d8/256 | 0x8d8*256) % 65536), uint16((0x8d8/256 | 0x8d8*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536),
+	uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x8d5/256 | 0x8d5*256) % 65536), uint16((0x8d5/256 | 0x8d5*256) % 65536), uint16((0x8d5/256 | 0x8d5*256) % 65536), uint16((0x8d5/256 | 0x8d5*256) % 65536), uint16((0x8d5/256 | 0x8d5*256) % 65536), uint16((0x8d5/256 | 0x8d5*256) % 65536), uint16((0x8c5/256 | 0x8c5*256) % 65536),
+	uint16((0x8c5/256 | 0x8c5*256) % 65536), uint16((0x8c5/256 | 0x8c5*256) % 65536), uint16((0x8c5/256 | 0x8c5*256) % 65536), uint16((0x8c5/256 | 0x8c5*256) % 65536), uint16((0x8c5/256 | 0x8c5*256) % 65536), uint16((0x8c5/256 | 0x8c5*256) % 65536), uint16((0x8c5/256 | 0x8c5*256) % 65536), uint16((0x8c5/256 | 0x8c5*256) % 65536),
+	uint16((0x8c5/256 | 0x8c5*256) % 65536), uint16((0x8c5/256 | 0x8c5*256) % 65536), uint16((0x8c5/256 | 0x8c5*256) % 65536), uint16((0x8c5/256 | 0x8c5*256) % 65536), uint16((0x8c5/256 | 0x8c5*256) % 65536), uint16((0x8c5/256 | 0x8c5*256) % 65536), uint16((0x8c5/256 | 0x8c5*256) % 65536), uint16((0x8c5/256 | 0x8c5*256) % 65536),
+	uint16((0x8c5/256 | 0x8c5*256) % 65536), uint16((0x8c5/256 | 0x8c5*256) % 65536), uint16((0x8c5/256 | 0x8c5*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536),
+	uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x8d6/256 | 0x8d6*256) % 65536), uint16((0x8d6/256 | 0x8d6*256) % 65536), uint16((0x8d6/256 | 0x8d6*256) % 65536), uint16((0x8d6/256 | 0x8d6*256) % 65536), uint16((0x8d6/256 | 0x8d6*256) % 65536), uint16((0x8d6/256 | 0x8d6*256) % 65536), uint16((0x8c6/256 | 0x8c6*256) % 65536),
+	uint16((0x8c6/256 | 0x8c6*256) % 65536), uint16((0x8c6/256 | 0x8c6*256) % 65536), uint16((0x8c6/256 | 0x8c6*256) % 65536), uint16((0x8c6/256 | 0x8c6*256) % 65536), uint16((0x8c6/256 | 0x8c6*256) % 65536), uint16((0x8c6/256 | 0x8c6*256) % 65536), uint16((0x8c6/256 | 0x8c6*256) % 65536), uint16((0x8c6/256 | 0x8c6*256) % 65536),
+	uint16((0x8c6/256 | 0x8c6*256) % 65536), uint16((0x8c6/256 | 0x8c6*256) % 65536), uint16((0x8c6/256 | 0x8c6*256) % 65536), uint16((0x8c6/256 | 0x8c6*256) % 65536), uint16((0x8c6/256 | 0x8c6*256) % 65536), uint16((0x8c6/256 | 0x8c6*256) % 65536), uint16((0x8c6/256 | 0x8c6*256) % 65536), uint16((0x8c6/256 | 0x8c6*256) % 65536),
+	uint16((0x8c6/256 | 0x8c6*256) % 65536), uint16((0x8c6/256 | 0x8c6*256) % 65536), uint16((0x8c6/256 | 0x8c6*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x4c0/256 | 0x4c0*256) % 65536), uint16((0x200/256 | 0x200*256) % 65536),
+	uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0),
+	uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0),
+	uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0),
+	uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0), uint16(0),
+} /* __ctype_b_loc.c:9:29 */
+
+var ptable uintptr = 0 /* __ctype_b_loc.c:36:29 */
+
+func X__ctype_b_loc(tls *TLS) uintptr { /* __ctype_b_loc.c:38:22: */
+	return uintptr(unsafe.Pointer(&ptable))
+}
+
+func __isspace(tls *TLS, _c int32) int32 { /* ctype.h:26:21: */
+	return Bool32(_c == ' ' || uint32(_c)-uint32('\t') < uint32(5))
+}
+
+type __locale_struct = struct{ cat [6]uintptr } /* alltypes.h:343:9 */
+
+type locale_t = uintptr /* alltypes.h:343:32 */
+
+func Xisalnum(tls *TLS, c int32) int32 { /* isalnum.c:3:5: */
+	return Bool32(func() int32 {
+		if 0 != 0 {
+			return Xisalpha(tls, c)
+		}
+		return Bool32(uint32(c)|uint32(32)-uint32('a') < uint32(26))
+	}() != 0 || func() int32 {
+		if 0 != 0 {
+			return Xisdigit(tls, c)
+		}
+		return Bool32(uint32(c)-uint32('0') < uint32(10))
+	}() != 0)
+}
+
+func X__isalnum_l(tls *TLS, c int32, l locale_t) int32 { /* isalnum.c:8:5: */
+	return Xisalnum(tls, c)
+}
+
+func Xisalpha(tls *TLS, c int32) int32 { /* isalpha.c:4:5: */
+	return Bool32(uint32(c)|uint32(32)-uint32('a') < uint32(26))
+}
+
+func X__isalpha_l(tls *TLS, c int32, l locale_t) int32 { /* isalpha.c:9:5: */
+	return Xisalpha(tls, c)
+}
+
+func Xisdigit(tls *TLS, c int32) int32 { /* isdigit.c:4:5: */
+	return Bool32(uint32(c)-uint32('0') < uint32(10))
+}
+
+func X__isdigit_l(tls *TLS, c int32, l locale_t) int32 { /* isdigit.c:9:5: */
+	return Xisdigit(tls, c)
+}
+
+func Xislower(tls *TLS, c int32) int32 { /* islower.c:4:5: */
+	return Bool32(uint32(c)-uint32('a') < uint32(26))
+}
+
+func X__islower_l(tls *TLS, c int32, l locale_t) int32 { /* islower.c:9:5: */
+	return Xislower(tls, c)
+}
+
+func Xisprint(tls *TLS, c int32) int32 { /* isprint.c:4:5: */
+	return Bool32(uint32(c)-uint32(0x20) < uint32(0x5f))
+}
+
+func X__isprint_l(tls *TLS, c int32, l locale_t) int32 { /* isprint.c:9:5: */
+	return Xisprint(tls, c)
+}
+
+func Xisupper(tls *TLS, c int32) int32 { /* isupper.c:4:5: */
+	return Bool32(uint32(c)-uint32('A') < uint32(26))
+}
+
+func X__isupper_l(tls *TLS, c int32, l locale_t) int32 { /* isupper.c:9:5: */
+	return Xisupper(tls, c)
+}
+
+func Xisxdigit(tls *TLS, c int32) int32 { /* isxdigit.c:3:5: */
+	return Bool32(func() int32 {
+		if 0 != 0 {
+			return Xisdigit(tls, c)
+		}
+		return Bool32(uint32(c)-uint32('0') < uint32(10))
+	}() != 0 || uint32(c)|uint32(32)-uint32('a') < uint32(6))
+}
+
+func X__isxdigit_l(tls *TLS, c int32, l locale_t) int32 { /* isxdigit.c:8:5: */
+	return Xisxdigit(tls, c)
+}
+
+type off_t = int64 /* alltypes.h:162:16 */
+
+type ino_t = uint64 /* alltypes.h:167:25 */
+
+type dirent = struct {
+	d_ino    ino_t
+	d_off    off_t
+	d_reclen uint16
+	d_type   uint8
+	d_name   [256]int8
+	_        [5]byte
+} /* dirent.h:5:1 */
+
+type __dirstream = struct {
+	tell    off_t
+	fd      int32
+	buf_pos int32
+	buf_end int32
+	lock    [1]int32
+	buf     [2048]int8
+} /* dirent.h:20:9 */
+
+type DIR = __dirstream /* dirent.h:20:28 */
+
+type ssize_t = int64 /* alltypes.h:65:15 */
+
+type intptr_t = int64 /* alltypes.h:70:15 */
+
+type pid_t = int32 /* alltypes.h:235:13 */
+
+type uid_t = uint32 /* alltypes.h:245:18 */
+
+type gid_t = uint32 /* alltypes.h:250:18 */
+
+type useconds_t = uint32 /* alltypes.h:260:18 */
+
+type div_t = struct {
+	quot int32
+	rem  int32
+} /* stdlib.h:62:35 */
+type ldiv_t = struct {
+	quot int64
+	rem  int64
+} /* stdlib.h:63:36 */
+type lldiv_t = struct {
+	quot int64
+	rem  int64
+} /* stdlib.h:64:41 */
+
+func Xclosedir(tls *TLS, dir uintptr) int32 { /* closedir.c:6:5: */
+	var ret int32 = Xclose(tls, (*DIR)(unsafe.Pointer(dir)).fd)
+	Xfree(tls, dir)
+	return ret
+}
+
+type mode_t = uint32 /* alltypes.h:152:18 */
+
+type iovec = struct {
+	iov_base uintptr
+	iov_len  size_t
+} /* alltypes.h:355:1 */
+
+type flock = struct {
+	l_type   int16
+	l_whence int16
+	_        [4]byte
+	l_start  off_t
+	l_len    off_t
+	l_pid    pid_t
+	_        [4]byte
+} /* fcntl.h:24:1 */
+
+type file_handle = struct {
+	_            [0]uint32
+	handle_bytes uint32
+	handle_type  int32
+} /* fcntl.h:167:1 */
+
+type f_owner_ex = struct {
+	__type int32
+	pid    pid_t
+} /* fcntl.h:172:1 */
+
+type syscall_arg_t = int64 /* syscall.h:22:14 */
+
+func Xopendir(tls *TLS, name uintptr) uintptr { /* opendir.c:8:5: */
+	var fd int32
+	var dir uintptr
+
+	if AssignInt32(&fd, Xopen(tls, name, 00|0200000|02000000, 0)) < 0 {
+		return uintptr(0)
+	}
+	if !(int32(AssignUintptr(&dir, Xcalloc(tls, uint64(1), uint64(unsafe.Sizeof(DIR{}))))) != 0) {
+		X__syscall1(tls, int64(3), int64(fd))
+		return uintptr(0)
+	}
+	(*DIR)(unsafe.Pointer(dir)).fd = fd
+	return dir
+}
+
+type max_align_t = struct {
+	__ll int64
+	__ld float64
+} /* alltypes.h:41:54 */
+
+type dirstream_buf_alignment_check = [1]int8 /* readdir.c:7:14 */
+
+func Xreaddir(tls *TLS, dir uintptr) uintptr { /* readdir.c:10:15: */
+	var de uintptr
+
+	if (*DIR)(unsafe.Pointer(dir)).buf_pos >= (*DIR)(unsafe.Pointer(dir)).buf_end {
+		var len int32 = int32(X__syscall3(tls, int64(217), int64((*DIR)(unsafe.Pointer(dir)).fd), int64(dir+24), int64(unsafe.Sizeof([2048]int8{}))))
+		if len <= 0 {
+			if len < 0 && len != -2 {
+				*(*int32)(unsafe.Pointer(X___errno_location(tls))) = -len
+			}
+			return uintptr(0)
+		}
+		(*DIR)(unsafe.Pointer(dir)).buf_end = len
+		(*DIR)(unsafe.Pointer(dir)).buf_pos = 0
+	}
+	de = dir + 24 + uintptr((*DIR)(unsafe.Pointer(dir)).buf_pos)
+	*(*int32)(unsafe.Pointer(dir + 12)) += int32((*dirent)(unsafe.Pointer(de)).d_reclen)
+	(*DIR)(unsafe.Pointer(dir)).tell = (*dirent)(unsafe.Pointer(de)).d_off
+	return de
+}
+
+type uintptr_t = uint64 /* alltypes.h:55:24 */
+
+type int8_t = int8 /* alltypes.h:96:25 */
+
+type int16_t = int16 /* alltypes.h:101:25 */
+
+type int32_t = int32 /* alltypes.h:106:25 */
+
+type int64_t = int64 /* alltypes.h:111:25 */
+
+type intmax_t = int64 /* alltypes.h:116:25 */
+
+type uint8_t = uint8 /* alltypes.h:121:25 */
+
+type uintmax_t = uint64 /* alltypes.h:146:25 */
+
+type int_fast8_t = int8_t   /* stdint.h:22:16 */
+type int_fast64_t = int64_t /* stdint.h:23:17 */
+
+type int_least8_t = int8_t   /* stdint.h:25:17 */
+type int_least16_t = int16_t /* stdint.h:26:17 */
+type int_least32_t = int32_t /* stdint.h:27:17 */
+type int_least64_t = int64_t /* stdint.h:28:17 */
+
+type uint_fast8_t = uint8_t   /* stdint.h:30:17 */
+type uint_fast64_t = uint64_t /* stdint.h:31:18 */
+
+type uint_least8_t = uint8_t   /* stdint.h:33:18 */
+type uint_least16_t = uint16_t /* stdint.h:34:18 */
+type uint_least32_t = uint32_t /* stdint.h:35:18 */
+type uint_least64_t = uint64_t /* stdint.h:36:18 */
+
+type int_fast16_t = int32_t   /* stdint.h:1:17 */
+type int_fast32_t = int32_t   /* stdint.h:2:17 */
+type uint_fast16_t = uint32_t /* stdint.h:3:18 */
+type uint_fast32_t = uint32_t /* stdint.h:4:18 */
+
+type _IO_FILE = struct {
+	flags        uint32
+	_            [4]byte
+	rpos         uintptr
+	rend         uintptr
+	close        uintptr
+	wend         uintptr
+	wpos         uintptr
+	mustbezero_1 uintptr
+	wbase        uintptr
+	read         uintptr
+	write        uintptr
+	seek         uintptr
+	buf          uintptr
+	buf_size     size_t
+	prev         uintptr
+	next         uintptr
+	fd           int32
+	pipe_pid     int32
+	lockcount    int64
+	mode         int32
+	lock         int32
+	lbf          int32
+	_            [4]byte
+	cookie       uintptr
+	off          off_t
+	getln_buf    uintptr
+	mustbezero_2 uintptr
+	shend        uintptr
+	shlim        off_t
+	shcnt        off_t
+	prev_locked  uintptr
+	next_locked  uintptr
+	locale       uintptr
+} /* alltypes.h:320:9 */
+
+type FILE = _IO_FILE /* alltypes.h:320:25 */
+
+type va_list = uintptr /* alltypes.h:326:27 */
+
+type _G_fpos64_t = struct {
+	_        [0]uint64
+	__opaque [16]int8
+} /* stdio.h:54:9 */
+
+type fpos_t = _G_fpos64_t /* stdio.h:58:3 */
+
+type float_t = float32 /* alltypes.h:29:15 */
+
+type double_t = float64 /* alltypes.h:34:16 */
+
+func __FLOAT_BITS(tls *TLS, __f float32) uint32 { /* math.h:55:26: */
+	bp := tls.Alloc(4)
+	defer tls.Free(4)
+
+	// var __u struct {__f float32;} at bp, 4
+
+	*(*float32)(unsafe.Pointer(bp)) = __f
+	return *(*uint32)(unsafe.Pointer(bp))
+}
+
+func __DOUBLE_BITS(tls *TLS, __f float64) uint64 { /* math.h:61:36: */
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	// var __u struct {__f float64;} at bp, 8
+
+	*(*float64)(unsafe.Pointer(bp)) = __f
+	return *(*uint64)(unsafe.Pointer(bp))
+}
+
+type __pthread = struct {
+	self          uintptr
+	dtv           uintptr
+	prev          uintptr
+	next          uintptr
+	sysinfo       uintptr_t
+	canary        uintptr_t
+	canary2       uintptr_t
+	tid           int32
+	errno_val     int32
+	detach_state  int32
+	cancel        int32
+	canceldisable uint8
+	cancelasync   uint8
+	tsd_used      uint8 /* unsigned char tsd_used: 1, unsigned char dlerror_flag: 1 */
+	_             [5]byte
+	map_base      uintptr
+	map_size      size_t
+	stack         uintptr
+	stack_size    size_t
+	guard_size    size_t
+	result        uintptr
+	cancelbuf     uintptr
+	tsd           uintptr
+	robust_list   struct {
+		head    uintptr
+		off     int64
+		pending uintptr
+	}
+	timer_id      int32
+	_             [4]byte
+	locale        locale_t
+	killlock      [1]int32
+	_             [4]byte
+	dlerror_buf   uintptr
+	stdio_locks   uintptr
+	canary_at_end uintptr_t
+	dtv_copy      uintptr
+} /* alltypes.h:273:9 */
+
+func scanexp(tls *TLS, f uintptr, pok int32) int64 { /* floatscan.c:37:18: */
+	var c int32
+	var x int32
+	var y int64
+	var neg int32 = 0
+
+	c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}()
+	if c == '+' || c == '-' {
+		neg = Bool32(c == '-')
+		c = func() int32 {
+			if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+				return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+			}
+			return X__shgetc(tls, f)
+		}()
+		if uint32(c-'0') >= 10 && pok != 0 {
+			if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+				(*FILE)(unsafe.Pointer(f)).rpos--
+			} else {
+			}
+		}
+	}
+	if uint32(c-'0') >= 10 {
+		if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+			(*FILE)(unsafe.Pointer(f)).rpos--
+		} else {
+		}
+		return -0x7fffffffffffffff - int64(1)
+	}
+	for x = 0; uint32(c-'0') < 10 && x < 0x7fffffff/10; c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}() {
+		x = 10*x + c - '0'
+	}
+	for y = int64(x); uint32(c-'0') < 10 && y < 0x7fffffffffffffff/int64(100); c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}() {
+		y = int64(10)*y + int64(c) - int64('0')
+	}
+	for ; uint32(c-'0') < 10; c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}() {
+	}
+	if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+		(*FILE)(unsafe.Pointer(f)).rpos--
+	} else {
+	}
+	if neg != 0 {
+		return -y
+	}
+	return y
+}
+
+func decfloat(tls *TLS, f uintptr, c int32, bits int32, emin int32, sign int32, pok int32) float64 { /* floatscan.c:64:20: */
+	bp := tls.Alloc(512)
+	defer tls.Free(512)
+
+	// var x [128]uint32_t at bp, 512
+
+	var i int32
+	var j int32
+	var k int32
+	var a int32
+	var z int32
+	var lrp int64 = int64(0)
+	var dc int64 = int64(0)
+	var e10 int64 = int64(0)
+	var lnz int32 = 0
+	var gotdig int32 = 0
+	var gotrad int32 = 0
+	var rp int32
+	var e2 int32
+	var emax int32 = -emin - bits + 3
+	var denormal int32 = 0
+	var y float64
+	var frac float64 = float64(0)
+	var bias float64 = float64(0)
+
+	j = 0
+	k = 0
+
+	// Don't let leading zeros consume buffer space
+	for ; c == '0'; c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}() {
+		gotdig = 1
+	}
+	if c == '.' {
+		gotrad = 1
+		for c = func() int32 {
+			if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+				return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+			}
+			return X__shgetc(tls, f)
+		}(); c == '0'; c = func() int32 {
+			if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+				return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+			}
+			return X__shgetc(tls, f)
+		}() {
+			gotdig = 1
+			lrp--
+		}
+	}
+
+	*(*uint32_t)(unsafe.Pointer(bp)) = uint32_t(0)
+	for ; uint32(c-'0') < 10 || c == '.'; c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}() {
+		if c == '.' {
+			if gotrad != 0 {
+				break
+			}
+			gotrad = 1
+			lrp = dc
+		} else if k < 128-3 {
+			dc++
+			if c != '0' {
+				lnz = int32(dc)
+			}
+			if j != 0 {
+				*(*uint32_t)(unsafe.Pointer(bp + uintptr(k)*4)) = *(*uint32_t)(unsafe.Pointer(bp + uintptr(k)*4))*uint32_t(10) + uint32_t(c) - uint32_t('0')
+			} else {
+				*(*uint32_t)(unsafe.Pointer(bp + uintptr(k)*4)) = uint32_t(c - '0')
+			}
+			if PreIncInt32(&j, 1) == 9 {
+				k++
+				j = 0
+			}
+			gotdig = 1
+		} else {
+			dc++
+			if c != '0' {
+				lnz = (128 - 4) * 9
+				*(*uint32_t)(unsafe.Pointer(bp + 124*4)) |= uint32_t(1)
+			}
+		}
+	}
+	if !(gotrad != 0) {
+		lrp = dc
+	}
+
+	if gotdig != 0 && c|32 == 'e' {
+		e10 = scanexp(tls, f, pok)
+		if e10 == -0x7fffffffffffffff-int64(1) {
+			if pok != 0 {
+				if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+					(*FILE)(unsafe.Pointer(f)).rpos--
+				} else {
+				}
+			} else {
+				X__shlim(tls, f, int64(0))
+				return float64(0)
+			}
+			e10 = int64(0)
+		}
+		lrp = lrp + e10
+	} else if c >= 0 {
+		if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+			(*FILE)(unsafe.Pointer(f)).rpos--
+		} else {
+		}
+	}
+	if !(gotdig != 0) {
+		*(*int32)(unsafe.Pointer(X___errno_location(tls))) = 22
+		X__shlim(tls, f, int64(0))
+		return float64(0)
+	}
+
+	// Handle zero specially to avoid nasty special cases later
+	if !(int32(*(*uint32_t)(unsafe.Pointer(bp))) != 0) {
+		return float64(sign) * 0.0
+	}
+
+	// Optimize small integers (w/no exponent) and over/under-flow
+	if lrp == dc && dc < int64(10) && (bits > 30 || *(*uint32_t)(unsafe.Pointer(bp))>>bits == uint32_t(0)) {
+		return float64(sign) * float64(*(*uint32_t)(unsafe.Pointer(bp)))
+	}
+	if lrp > int64(-emin/2) {
+		*(*int32)(unsafe.Pointer(X___errno_location(tls))) = 34
+		return float64(sign) * 1.79769313486231570815e+308 * 1.79769313486231570815e+308
+	}
+	if lrp < int64(emin-2*53) {
+		*(*int32)(unsafe.Pointer(X___errno_location(tls))) = 34
+		return float64(sign) * 2.22507385850720138309e-308 * 2.22507385850720138309e-308
+	}
+
+	// Align incomplete final B1B digit
+	if j != 0 {
+		for ; j < 9; j++ {
+			*(*uint32_t)(unsafe.Pointer(bp + uintptr(k)*4)) *= uint32_t(10)
+		}
+		k++
+		j = 0
+	}
+
+	a = 0
+	z = k
+	e2 = 0
+	rp = int32(lrp)
+
+	// Optimize small to mid-size integers (even in exp. notation)
+	if lnz < 9 && lnz <= rp && rp < 18 {
+		if rp == 9 {
+			return float64(sign) * float64(*(*uint32_t)(unsafe.Pointer(bp)))
+		}
+		if rp < 9 {
+			return float64(sign) * float64(*(*uint32_t)(unsafe.Pointer(bp))) / float64(_sp10s[8-rp])
+		}
+		var bitlim int32 = bits - 3*(rp-9)
+		if bitlim > 30 || *(*uint32_t)(unsafe.Pointer(bp))>>bitlim == uint32_t(0) {
+			return float64(sign) * float64(*(*uint32_t)(unsafe.Pointer(bp))) * float64(_sp10s[rp-10])
+		}
+	}
+
+	// Drop trailing zeros
+	for ; !(int32(*(*uint32_t)(unsafe.Pointer(bp + uintptr(z-1)*4))) != 0); z-- {
+	}
+
+	// Align radix point to B1B digit boundary
+	if rp%9 != 0 {
+		var rpm9 int32
+		if rp >= 0 {
+			rpm9 = rp % 9
+		} else {
+			rpm9 = rp%9 + 9
+		}
+		var p10 int32 = _sp10s[8-rpm9]
+		var carry uint32_t = uint32_t(0)
+		for k = a; k != z; k++ {
+			var tmp uint32_t = *(*uint32_t)(unsafe.Pointer(bp + uintptr(k)*4)) % uint32_t(p10)
+			*(*uint32_t)(unsafe.Pointer(bp + uintptr(k)*4)) = *(*uint32_t)(unsafe.Pointer(bp + uintptr(k)*4))/uint32_t(p10) + carry
+			carry = uint32_t(1000000000/p10) * tmp
+			if k == a && !(int32(*(*uint32_t)(unsafe.Pointer(bp + uintptr(k)*4))) != 0) {
+				a = (a + 1) & (128 - 1)
+				rp = rp - 9
+			}
+		}
+		if carry != 0 {
+			*(*uint32_t)(unsafe.Pointer(bp + uintptr(PostIncInt32(&z, 1))*4)) = carry
+		}
+		rp = rp + (9 - rpm9)
+	}
+
+	// Upscale until desired number of bits are left of radix point
+	for rp < 9*2 || rp == 9*2 && *(*uint32_t)(unsafe.Pointer(bp + uintptr(a)*4)) < _sth[0] {
+		var carry uint32_t = uint32_t(0)
+		e2 = e2 - 29
+		for k = (z - 1) & (128 - 1); ; k = (k - 1) & (128 - 1) {
+			var tmp uint64_t = uint64_t(*(*uint32_t)(unsafe.Pointer(bp + uintptr(k)*4)))<<29 + uint64_t(carry)
+			if tmp > uint64(1000000000) {
+				carry = uint32_t(tmp / uint64(1000000000))
+				*(*uint32_t)(unsafe.Pointer(bp + uintptr(k)*4)) = uint32_t(tmp % uint64(1000000000))
+			} else {
+				carry = uint32_t(0)
+				*(*uint32_t)(unsafe.Pointer(bp + uintptr(k)*4)) = uint32_t(tmp)
+			}
+			if k == (z-1)&(128-1) && k != a && !(int32(*(*uint32_t)(unsafe.Pointer(bp + uintptr(k)*4))) != 0) {
+				z = k
+			}
+			if k == a {
+				break
+			}
+		}
+		if carry != 0 {
+			rp = rp + 9
+			a = (a - 1) & (128 - 1)
+			if a == z {
+				z = (z - 1) & (128 - 1)
+				*(*uint32_t)(unsafe.Pointer(bp + uintptr((z-1)&(128-1))*4)) |= *(*uint32_t)(unsafe.Pointer(bp + uintptr(z)*4))
+			}
+			*(*uint32_t)(unsafe.Pointer(bp + uintptr(a)*4)) = carry
+		}
+	}
+
+	// Downscale until exactly number of bits are left of radix point
+	for {
+		var carry uint32_t = uint32_t(0)
+		var sh int32 = 1
+		for i = 0; i < 2; i++ {
+			k = (a + i) & (128 - 1)
+			if k == z || *(*uint32_t)(unsafe.Pointer(bp + uintptr(k)*4)) < _sth[i] {
+				i = 2
+				break
+			}
+			if *(*uint32_t)(unsafe.Pointer(bp + uintptr((a+i)&(128-1))*4)) > _sth[i] {
+				break
+			}
+		}
+		if i == 2 && rp == 9*2 {
+			break
+		}
+		// FIXME: find a way to compute optimal sh
+		if rp > 9+9*2 {
+			sh = 9
+		}
+		e2 = e2 + sh
+		for k = a; k != z; k = (k + 1) & (128 - 1) {
+			var tmp uint32_t = *(*uint32_t)(unsafe.Pointer(bp + uintptr(k)*4)) & uint32_t(int32(1)<<sh-1)
+			*(*uint32_t)(unsafe.Pointer(bp + uintptr(k)*4)) = *(*uint32_t)(unsafe.Pointer(bp + uintptr(k)*4))>>sh + carry
+			carry = uint32_t(int32(1000000000)>>sh) * tmp
+			if k == a && !(int32(*(*uint32_t)(unsafe.Pointer(bp + uintptr(k)*4))) != 0) {
+				a = (a + 1) & (128 - 1)
+				i--
+				rp = rp - 9
+			}
+		}
+		if carry != 0 {
+			if (z+1)&(128-1) != a {
+				*(*uint32_t)(unsafe.Pointer(bp + uintptr(z)*4)) = carry
+				z = (z + 1) & (128 - 1)
+			} else {
+				*(*uint32_t)(unsafe.Pointer(bp + uintptr((z-1)&(128-1))*4)) |= uint32_t(1)
+			}
+		}
+	}
+
+	// Assemble desired bits into floating point variable
+	for y = float64(AssignInt32(&i, 0)); i < 2; i++ {
+		if (a+i)&(128-1) == z {
+			*(*uint32_t)(unsafe.Pointer(bp + uintptr(AssignInt32(&z, (z+1)&(128-1))-1)*4)) = uint32_t(0)
+		}
+		y = 1000000000.0*y + float64(*(*uint32_t)(unsafe.Pointer(bp + uintptr((a+i)&(128-1))*4)))
+	}
+
+	y = y * float64(sign)
+
+	// Limit precision for denormal results
+	if bits > 53+e2-emin {
+		bits = 53 + e2 - emin
+		if bits < 0 {
+			bits = 0
+		}
+		denormal = 1
+	}
+
+	// Calculate bias term to force rounding, move out lower bits
+	if bits < 53 {
+		bias = Xcopysignl(tls, Xscalbn(tls, float64(1), 2*53-bits-1), y)
+		frac = Xfmodl(tls, y, Xscalbn(tls, float64(1), 53-bits))
+		y = y - frac
+		y = y + bias
+	}
+
+	// Process tail of decimal input so it can affect rounding
+	if (a+i)&(128-1) != z {
+		var t uint32_t = *(*uint32_t)(unsafe.Pointer(bp + uintptr((a+i)&(128-1))*4))
+		if t < uint32_t(500000000) && (t != 0 || (a+i+1)&(128-1) != z) {
+			frac = frac + 0.25*float64(sign)
+		} else if t > uint32_t(500000000) {
+			frac = frac + 0.75*float64(sign)
+		} else if t == uint32_t(500000000) {
+			if (a+i+1)&(128-1) == z {
+				frac = frac + 0.5*float64(sign)
+			} else {
+				frac = frac + 0.75*float64(sign)
+			}
+		}
+		if 53-bits >= 2 && !(Xfmodl(tls, frac, float64(1)) != 0) {
+			frac += 1
+		}
+	}
+
+	y = y + frac
+	y = y - bias
+
+	if (e2+53)&0x7fffffff > emax-5 {
+		if Xfabsl(tls, y) >= float64(float64(2))/2.22044604925031308085e-16 {
+			if denormal != 0 && bits == 53+e2-emin {
+				denormal = 0
+			}
+			y = y * 0.5
+			e2++
+		}
+		if e2+53 > emax || denormal != 0 && frac != 0 {
+			*(*int32)(unsafe.Pointer(X___errno_location(tls))) = 34
+		}
+	}
+
+	return Xscalbnl(tls, y, e2)
+}
+
+var _sth = [2]uint32_t{uint32_t(9007199), uint32_t(254740991)} /* floatscan.c:67:24 */
+var _sp10s = [8]int32{10, 100, 1000, 10000,
+	100000, 1000000, 10000000, 100000000} /* floatscan.c:80:19 */
+
+func hexfloat(tls *TLS, f uintptr, bits int32, emin int32, sign int32, pok int32) float64 { /* floatscan.c:315:20: */
+	var x uint32_t = uint32_t(0)
+	var y float64 = float64(0)
+	var scale float64 = float64(1)
+	var bias float64 = float64(0)
+	var gottail int32 = 0
+	var gotrad int32 = 0
+	var gotdig int32 = 0
+	var rp int64 = int64(0)
+	var dc int64 = int64(0)
+	var e2 int64 = int64(0)
+	var d int32
+	var c int32
+
+	c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}()
+
+	// Skip leading zeros
+	for ; c == '0'; c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}() {
+		gotdig = 1
+	}
+
+	if c == '.' {
+		gotrad = 1
+		c = func() int32 {
+			if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+				return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+			}
+			return X__shgetc(tls, f)
+		}()
+		// Count zeros after the radix point before significand
+		rp = int64(0)
+	__1:
+		if !(c == '0') {
+			goto __3
+		}
+		gotdig = 1
+		goto __2
+	__2:
+		c = func() int32 {
+			if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+				return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+			}
+			return X__shgetc(tls, f)
+		}()
+		rp--
+		goto __1
+		goto __3
+	__3:
+	}
+
+	for ; uint32(c-'0') < 10 || uint32(c|32-'a') < 6 || c == '.'; c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}() {
+		if c == '.' {
+			if gotrad != 0 {
+				break
+			}
+			rp = dc
+			gotrad = 1
+		} else {
+			gotdig = 1
+			if c > '9' {
+				d = c | 32 + 10 - 'a'
+			} else {
+				d = c - '0'
+			}
+			if dc < int64(8) {
+				x = x*uint32_t(16) + uint32_t(d)
+			} else if dc < int64(53/4+1) {
+				y = y + float64(d)*AssignDivFloat64(&scale, float64(16))
+			} else if d != 0 && !(gottail != 0) {
+				y = y + 0.5*scale
+				gottail = 1
+			}
+			dc++
+		}
+	}
+	if !(gotdig != 0) {
+		if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+			(*FILE)(unsafe.Pointer(f)).rpos--
+		} else {
+		}
+		if pok != 0 {
+			if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+				(*FILE)(unsafe.Pointer(f)).rpos--
+			} else {
+			}
+			if gotrad != 0 {
+				if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+					(*FILE)(unsafe.Pointer(f)).rpos--
+				} else {
+				}
+			}
+		} else {
+			X__shlim(tls, f, int64(0))
+		}
+		return float64(sign) * 0.0
+	}
+	if !(gotrad != 0) {
+		rp = dc
+	}
+	for dc < int64(8) {
+		x = x * uint32_t(16)
+		dc++
+	}
+	if c|32 == 'p' {
+		e2 = scanexp(tls, f, pok)
+		if e2 == -0x7fffffffffffffff-int64(1) {
+			if pok != 0 {
+				if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+					(*FILE)(unsafe.Pointer(f)).rpos--
+				} else {
+				}
+			} else {
+				X__shlim(tls, f, int64(0))
+				return float64(0)
+			}
+			e2 = int64(0)
+		}
+	} else {
+		if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+			(*FILE)(unsafe.Pointer(f)).rpos--
+		} else {
+		}
+	}
+	e2 = e2 + (int64(4)*rp - int64(32))
+
+	if !(x != 0) {
+		return float64(sign) * 0.0
+	}
+	if e2 > int64(-emin) {
+		*(*int32)(unsafe.Pointer(X___errno_location(tls))) = 34
+		return float64(sign) * 1.79769313486231570815e+308 * 1.79769313486231570815e+308
+	}
+	if e2 < int64(emin-2*53) {
+		*(*int32)(unsafe.Pointer(X___errno_location(tls))) = 34
+		return float64(sign) * 2.22507385850720138309e-308 * 2.22507385850720138309e-308
+	}
+
+	for x < 0x80000000 {
+		if y >= 0.5 {
+			x = x + (x + uint32_t(1))
+			y = y + (y - float64(1))
+		} else {
+			x = x + x
+			y = y + y
+		}
+		e2--
+	}
+
+	if int64(bits) > int64(32)+e2-int64(emin) {
+		bits = int32(int64(32) + e2 - int64(emin))
+		if bits < 0 {
+			bits = 0
+		}
+	}
+
+	if bits < 53 {
+		bias = Xcopysignl(tls, Xscalbn(tls, float64(1), 32+53-bits-1), float64(sign))
+	}
+
+	if bits < 32 && y != 0 && !(x&uint32_t(1) != 0) {
+		x++
+		y = float64(0)
+	}
+
+	y = bias + float64(sign)*float64(x) + float64(sign)*y
+	y = y - bias
+
+	if !(y != 0) {
+		*(*int32)(unsafe.Pointer(X___errno_location(tls))) = 34
+	}
+
+	return Xscalbnl(tls, y, int32(e2))
+}
+
+func X__floatscan(tls *TLS, f uintptr, prec int32, pok int32) float64 { /* floatscan.c:427:13: */
+	var sign int32 = 1
+	var i size_t
+	var bits int32
+	var emin int32
+	var c int32
+
+	switch prec {
+	case 0:
+		bits = 24
+		emin = -125 - bits
+		break
+	case 1:
+		bits = 53
+		emin = -1021 - bits
+		break
+	case 2:
+		bits = 53
+		emin = -1021 - bits
+		break
+	default:
+		return float64(0)
+	}
+
+	for __isspace(tls, AssignInt32(&c, func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}())) != 0 {
+	}
+
+	if c == '+' || c == '-' {
+		sign = sign - 2*Bool32(c == '-')
+		c = func() int32 {
+			if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+				return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+			}
+			return X__shgetc(tls, f)
+		}()
+	}
+
+	for i = uint64(0); i < uint64(8) && c|32 == int32(*(*int8)(unsafe.Pointer(ts /* "infinity" */ + uintptr(i)))); i++ {
+		if i < uint64(7) {
+			c = func() int32 {
+				if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+					return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+				}
+				return X__shgetc(tls, f)
+			}()
+		}
+	}
+	if i == uint64(3) || i == uint64(8) || i > uint64(3) && pok != 0 {
+		if i != uint64(8) {
+			if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+				(*FILE)(unsafe.Pointer(f)).rpos--
+			} else {
+			}
+			if pok != 0 {
+				for ; i > uint64(3); i-- {
+					if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+						(*FILE)(unsafe.Pointer(f)).rpos--
+					} else {
+					}
+				}
+			}
+		}
+		return float64(float32(sign) * X__builtin_inff(tls))
+	}
+	if !(i != 0) {
+		for i = uint64(0); i < uint64(3) && c|32 == int32(*(*int8)(unsafe.Pointer(ts + 9 /* "nan" */ + uintptr(i)))); i++ {
+			if i < uint64(2) {
+				c = func() int32 {
+					if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+						return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+					}
+					return X__shgetc(tls, f)
+				}()
+			}
+		}
+	}
+	if i == uint64(3) {
+		if func() int32 {
+			if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+				return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+			}
+			return X__shgetc(tls, f)
+		}() != '(' {
+			if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+				(*FILE)(unsafe.Pointer(f)).rpos--
+			} else {
+			}
+			return float64(X__builtin_nanf(tls, ts+13))
+		}
+		for i = uint64(1); ; i++ {
+			c = func() int32 {
+				if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+					return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+				}
+				return X__shgetc(tls, f)
+			}()
+			if uint32(c-'0') < 10 || uint32(c-'A') < 26 || uint32(c-'a') < 26 || c == '_' {
+				continue
+			}
+			if c == ')' {
+				return float64(X__builtin_nanf(tls, ts+13))
+			}
+			if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+				(*FILE)(unsafe.Pointer(f)).rpos--
+			} else {
+			}
+			if !(pok != 0) {
+				*(*int32)(unsafe.Pointer(X___errno_location(tls))) = 22
+				X__shlim(tls, f, int64(0))
+				return float64(0)
+			}
+			for PostDecUint64(&i, 1) != 0 {
+				if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+					(*FILE)(unsafe.Pointer(f)).rpos--
+				} else {
+				}
+			}
+			return float64(X__builtin_nanf(tls, ts+13))
+		}
+		return float64(X__builtin_nanf(tls, ts+13))
+	}
+
+	if i != 0 {
+		if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+			(*FILE)(unsafe.Pointer(f)).rpos--
+		} else {
+		}
+		*(*int32)(unsafe.Pointer(X___errno_location(tls))) = 22
+		X__shlim(tls, f, int64(0))
+		return float64(0)
+	}
+
+	if c == '0' {
+		c = func() int32 {
+			if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+				return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+			}
+			return X__shgetc(tls, f)
+		}()
+		if c|32 == 'x' {
+			return hexfloat(tls, f, bits, emin, sign, pok)
+		}
+		if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+			(*FILE)(unsafe.Pointer(f)).rpos--
+		} else {
+		}
+		c = '0'
+	}
+
+	return decfloat(tls, f, c, bits, emin, sign, pok)
+}
+
+// Lookup table for digit values. -1==255>=36 -> invalid
+var table1 = [257]uint8{Uint8FromInt32(-1),
+	Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1),
+	Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1),
+	Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1),
+	uint8(0), uint8(1), uint8(2), uint8(3), uint8(4), uint8(5), uint8(6), uint8(7), uint8(8), uint8(9), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1),
+	Uint8FromInt32(-1), uint8(10), uint8(11), uint8(12), uint8(13), uint8(14), uint8(15), uint8(16), uint8(17), uint8(18), uint8(19), uint8(20), uint8(21), uint8(22), uint8(23), uint8(24),
+	uint8(25), uint8(26), uint8(27), uint8(28), uint8(29), uint8(30), uint8(31), uint8(32), uint8(33), uint8(34), uint8(35), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1),
+	Uint8FromInt32(-1), uint8(10), uint8(11), uint8(12), uint8(13), uint8(14), uint8(15), uint8(16), uint8(17), uint8(18), uint8(19), uint8(20), uint8(21), uint8(22), uint8(23), uint8(24),
+	uint8(25), uint8(26), uint8(27), uint8(28), uint8(29), uint8(30), uint8(31), uint8(32), uint8(33), uint8(34), uint8(35), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1),
+	Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1),
+	Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1),
+	Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1),
+	Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1),
+	Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1),
+	Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1),
+	Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1),
+	Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1), Uint8FromInt32(-1),
+} /* intscan.c:7:28 */
+
+func X__intscan(tls *TLS, f uintptr, base uint32, pok int32, lim uint64) uint64 { /* intscan.c:26:20: */
+	var val uintptr
+	var c int32
+	var neg int32
+	var x uint32
+	var y uint64
+	var bs int32
+	val = uintptr(unsafe.Pointer(&table1)) + uintptr(1)
+	neg = 0
+	if !(base > uint32(36) || base == uint32(1)) {
+		goto __1
+	}
+	*(*int32)(unsafe.Pointer(X___errno_location(tls))) = 22
+	return uint64(0)
+__1:
+	;
+__2:
+	if !(__isspace(tls, AssignInt32(&c, func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}())) != 0) {
+		goto __3
+	}
+	goto __2
+__3:
+	;
+	if !(c == '+' || c == '-') {
+		goto __4
+	}
+	neg = -Bool32(c == '-')
+	c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}()
+__4:
+	;
+	if !((base == uint32(0) || base == uint32(16)) && c == '0') {
+		goto __5
+	}
+	c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}()
+	if !(c|32 == 'x') {
+		goto __7
+	}
+	c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}()
+	if !(int32(*(*uint8)(unsafe.Pointer(val + uintptr(c)))) >= 16) {
+		goto __9
+	}
+	if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+		(*FILE)(unsafe.Pointer(f)).rpos--
+	} else {
+	}
+	if !(pok != 0) {
+		goto __10
+	}
+	if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+		(*FILE)(unsafe.Pointer(f)).rpos--
+	} else {
+	}
+	goto __11
+__10:
+	X__shlim(tls, f, int64(0))
+__11:
+	;
+	return uint64(0)
+__9:
+	;
+	base = uint32(16)
+	goto __8
+__7:
+	if !(base == uint32(0)) {
+		goto __12
+	}
+	base = uint32(8)
+__12:
+	;
+__8:
+	;
+	goto __6
+__5:
+	if !(base == uint32(0)) {
+		goto __13
+	}
+	base = uint32(10)
+__13:
+	;
+	if !(uint32(*(*uint8)(unsafe.Pointer(val + uintptr(c)))) >= base) {
+		goto __14
+	}
+	if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+		(*FILE)(unsafe.Pointer(f)).rpos--
+	} else {
+	}
+	X__shlim(tls, f, int64(0))
+	*(*int32)(unsafe.Pointer(X___errno_location(tls))) = 22
+	return uint64(0)
+__14:
+	;
+__6:
+	;
+	if !(base == uint32(10)) {
+		goto __15
+	}
+	x = uint32(0)
+__17:
+	if !(uint32(c-'0') < 10 && x <= 0xffffffff/uint32(10)-uint32(1)) {
+		goto __19
+	}
+	x = x*uint32(10) + uint32(c-'0')
+	goto __18
+__18:
+	c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}()
+	goto __17
+	goto __19
+__19:
+	;
+	y = uint64(x)
+__20:
+	if !(uint32(c-'0') < 10 && y <= (2*uint64(0x7fffffffffffffff)+uint64(1))/uint64(10) && uint64(10)*y <= 2*uint64(0x7fffffffffffffff)+uint64(1)-uint64(c-'0')) {
+		goto __22
+	}
+	y = y*uint64(10) + uint64(c-'0')
+	goto __21
+__21:
+	c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}()
+	goto __20
+	goto __22
+__22:
+	;
+	if !(uint32(c-'0') >= 10) {
+		goto __23
+	}
+	goto done
+__23:
+	;
+	goto __16
+__15:
+	if !!(base&(base-uint32(1)) != 0) {
+		goto __24
+	}
+	bs = int32(*(*int8)(unsafe.Pointer(ts + 14 + uintptr(uint32(0x17)*base>>5&uint32(7)))))
+	x = uint32(0)
+__26:
+	if !(uint32(*(*uint8)(unsafe.Pointer(val + uintptr(c)))) < base && x <= 0xffffffff/uint32(32)) {
+		goto __28
+	}
+	x = x<<bs | uint32(*(*uint8)(unsafe.Pointer(val + uintptr(c))))
+	goto __27
+__27:
+	c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}()
+	goto __26
+	goto __28
+__28:
+	;
+	y = uint64(x)
+__29:
+	if !(uint32(*(*uint8)(unsafe.Pointer(val + uintptr(c)))) < base && y <= uint64(2*uint64(0x7fffffffffffffff)+uint64(1))>>bs) {
+		goto __31
+	}
+	y = y<<bs | uint64(*(*uint8)(unsafe.Pointer(val + uintptr(c))))
+	goto __30
+__30:
+	c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}()
+	goto __29
+	goto __31
+__31:
+	;
+	goto __25
+__24:
+	x = uint32(0)
+__32:
+	if !(uint32(*(*uint8)(unsafe.Pointer(val + uintptr(c)))) < base && x <= 0xffffffff/uint32(36)-uint32(1)) {
+		goto __34
+	}
+	x = x*base + uint32(*(*uint8)(unsafe.Pointer(val + uintptr(c))))
+	goto __33
+__33:
+	c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}()
+	goto __32
+	goto __34
+__34:
+	;
+	y = uint64(x)
+__35:
+	if !(uint32(*(*uint8)(unsafe.Pointer(val + uintptr(c)))) < base && y <= (2*uint64(0x7fffffffffffffff)+uint64(1))/uint64(base) && uint64(base)*y <= 2*uint64(0x7fffffffffffffff)+uint64(1)-uint64(*(*uint8)(unsafe.Pointer(val + uintptr(c))))) {
+		goto __37
+	}
+	y = y*uint64(base) + uint64(*(*uint8)(unsafe.Pointer(val + uintptr(c))))
+	goto __36
+__36:
+	c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}()
+	goto __35
+	goto __37
+__37:
+	;
+__25:
+	;
+__16:
+	;
+	if !(uint32(*(*uint8)(unsafe.Pointer(val + uintptr(c)))) < base) {
+		goto __38
+	}
+__39:
+	if !(uint32(*(*uint8)(unsafe.Pointer(val + uintptr(c)))) < base) {
+		goto __41
+	}
+	goto __40
+__40:
+	c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}()
+	goto __39
+	goto __41
+__41:
+	;
+	*(*int32)(unsafe.Pointer(X___errno_location(tls))) = 34
+	y = lim
+	if !(lim&uint64(1) != 0) {
+		goto __42
+	}
+	neg = 0
+__42:
+	;
+__38:
+	;
+done:
+	if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+		(*FILE)(unsafe.Pointer(f)).rpos--
+	} else {
+	}
+	if !(y >= lim) {
+		goto __43
+	}
+	if !(!(lim&uint64(1) != 0) && !(neg != 0)) {
+		goto __44
+	}
+	*(*int32)(unsafe.Pointer(X___errno_location(tls))) = 34
+	return lim - uint64(1)
+	goto __45
+__44:
+	if !(y > lim) {
+		goto __46
+	}
+	*(*int32)(unsafe.Pointer(X___errno_location(tls))) = 34
+	return lim
+__46:
+	;
+__45:
+	;
+__43:
+	;
+	return y ^ uint64(neg) - uint64(neg)
+}
+
+// The shcnt field stores the number of bytes read so far, offset by
+// the value of buf-rpos at the last function call (__shlim or __shgetc),
+// so that between calls the inline shcnt macro can add rpos-buf to get
+// the actual count.
+
+func X__shlim(tls *TLS, f uintptr, lim off_t) { /* shgetc.c:8:6: */
+	(*FILE)(unsafe.Pointer(f)).shlim = lim
+	(*FILE)(unsafe.Pointer(f)).shcnt = (int64((*FILE)(unsafe.Pointer(f)).buf) - int64((*FILE)(unsafe.Pointer(f)).rpos)) / 1
+	// If lim is nonzero, rend must be a valid pointer.
+	if lim != 0 && (int64((*FILE)(unsafe.Pointer(f)).rend)-int64((*FILE)(unsafe.Pointer(f)).rpos))/1 > lim {
+		(*FILE)(unsafe.Pointer(f)).shend = (*FILE)(unsafe.Pointer(f)).rpos + uintptr(lim)
+	} else {
+		(*FILE)(unsafe.Pointer(f)).shend = (*FILE)(unsafe.Pointer(f)).rend
+	}
+}
+
+func X__shgetc(tls *TLS, f uintptr) int32 { /* shgetc.c:19:5: */
+	var c int32
+	var cnt off_t = (*FILE)(unsafe.Pointer(f)).shcnt + (int64((*FILE)(unsafe.Pointer(f)).rpos)-int64((*FILE)(unsafe.Pointer(f)).buf))/1
+	if (*FILE)(unsafe.Pointer(f)).shlim != 0 && cnt >= (*FILE)(unsafe.Pointer(f)).shlim || AssignInt32(&c, X__uflow(tls, f)) < 0 {
+		(*FILE)(unsafe.Pointer(f)).shcnt = (int64((*FILE)(unsafe.Pointer(f)).buf)-int64((*FILE)(unsafe.Pointer(f)).rpos))/1 + cnt
+		(*FILE)(unsafe.Pointer(f)).shend = (*FILE)(unsafe.Pointer(f)).rpos
+		(*FILE)(unsafe.Pointer(f)).shlim = int64(-1)
+		return -1
+	}
+	cnt++
+	if (*FILE)(unsafe.Pointer(f)).shlim != 0 && (int64((*FILE)(unsafe.Pointer(f)).rend)-int64((*FILE)(unsafe.Pointer(f)).rpos))/1 > (*FILE)(unsafe.Pointer(f)).shlim-cnt {
+		(*FILE)(unsafe.Pointer(f)).shend = (*FILE)(unsafe.Pointer(f)).rpos + uintptr((*FILE)(unsafe.Pointer(f)).shlim-cnt)
+	} else {
+		(*FILE)(unsafe.Pointer(f)).shend = (*FILE)(unsafe.Pointer(f)).rend
+	}
+	(*FILE)(unsafe.Pointer(f)).shcnt = (int64((*FILE)(unsafe.Pointer(f)).buf)-int64((*FILE)(unsafe.Pointer(f)).rpos))/1 + cnt
+	if (*FILE)(unsafe.Pointer(f)).rpos <= (*FILE)(unsafe.Pointer(f)).buf {
+		*(*uint8)(unsafe.Pointer((*FILE)(unsafe.Pointer(f)).rpos + UintptrFromInt32(-1))) = uint8(c)
+	}
+	return c
+}
+
+type lconv = struct {
+	decimal_point      uintptr
+	thousands_sep      uintptr
+	grouping           uintptr
+	int_curr_symbol    uintptr
+	currency_symbol    uintptr
+	mon_decimal_point  uintptr
+	mon_thousands_sep  uintptr
+	mon_grouping       uintptr
+	positive_sign      uintptr
+	negative_sign      uintptr
+	int_frac_digits    int8
+	frac_digits        int8
+	p_cs_precedes      int8
+	p_sep_by_space     int8
+	n_cs_precedes      int8
+	n_sep_by_space     int8
+	p_sign_posn        int8
+	n_sign_posn        int8
+	int_p_cs_precedes  int8
+	int_p_sep_by_space int8
+	int_n_cs_precedes  int8
+	int_n_sep_by_space int8
+	int_p_sign_posn    int8
+	int_n_sign_posn    int8
+	_                  [2]byte
+} /* locale.h:24:1 */
+
+// Support signed or unsigned plain-char
+
+// Implementation choices...
+
+// Arbitrary numbers...
+
+// POSIX/SUS requirements follow. These numbers come directly
+// from SUS and have nothing to do with the host system.
+
+var posix_lconv = lconv{decimal_point: ts + 23, thousands_sep: ts + 13, grouping: ts + 13, int_curr_symbol: ts + 13, currency_symbol: ts + 13, mon_decimal_point: ts + 13, mon_thousands_sep: ts + 13, mon_grouping: ts + 13, positive_sign: ts + 13, negative_sign: ts + 13, int_frac_digits: Int8FromInt32(255), frac_digits: Int8FromInt32(255), p_cs_precedes: Int8FromInt32(255), p_sep_by_space: Int8FromInt32(255), n_cs_precedes: Int8FromInt32(255), n_sep_by_space: Int8FromInt32(255), p_sign_posn: Int8FromInt32(255), n_sign_posn: Int8FromInt32(255), int_p_cs_precedes: Int8FromInt32(255), int_p_sep_by_space: Int8FromInt32(255), int_n_cs_precedes: Int8FromInt32(255), int_n_sep_by_space: Int8FromInt32(255), int_p_sign_posn: Int8FromInt32(255), int_n_sign_posn: Int8FromInt32(255)} /* localeconv.c:4:27 */
+
+func Xlocaleconv(tls *TLS) uintptr { /* localeconv.c:31:14: */
+	return uintptr(unsafe.Pointer(&posix_lconv))
+}
+
+func X__fpclassify(tls *TLS, x float64) int32 { /* __fpclassify.c:4:5: */
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	*(*struct{ f float64 })(unsafe.Pointer(bp)) = func() (r struct{ f float64 }) {
+		*(*float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&r)) + 0)) = x
+		return r
+	}()
+	var e int32 = int32(*(*uint64_t)(unsafe.Pointer(bp)) >> 52 & uint64(0x7ff))
+	if !(e != 0) {
+		if *(*uint64_t)(unsafe.Pointer(bp))<<1 != 0 {
+			return 3
+		}
+		return 2
+	}
+	if e == 0x7ff {
+		if *(*uint64_t)(unsafe.Pointer(bp))<<12 != 0 {
+			return 0
+		}
+		return 1
+	}
+	return 4
+}
+
+func X__fpclassifyf(tls *TLS, x float32) int32 { /* __fpclassifyf.c:4:5: */
+	bp := tls.Alloc(4)
+	defer tls.Free(4)
+
+	*(*struct{ f float32 })(unsafe.Pointer(bp)) = func() (r struct{ f float32 }) {
+		*(*float32)(unsafe.Pointer(uintptr(unsafe.Pointer(&r)) + 0)) = x
+		return r
+	}()
+	var e int32 = int32(*(*uint32_t)(unsafe.Pointer(bp)) >> 23 & uint32_t(0xff))
+	if !(e != 0) {
+		if *(*uint32_t)(unsafe.Pointer(bp))<<1 != 0 {
+			return 3
+		}
+		return 2
+	}
+	if e == 0xff {
+		if *(*uint32_t)(unsafe.Pointer(bp))<<9 != 0 {
+			return 0
+		}
+		return 1
+	}
+	return 4
+}
+
+func X__fpclassifyl(tls *TLS, x float64) int32 { /* __fpclassifyl.c:4:5: */
+	return X__fpclassify(tls, x)
+}
+
+func Xcopysignl(tls *TLS, x float64, y float64) float64 { /* copysignl.c:4:13: */
+	return Xcopysign(tls, x, y)
+}
+
+func Xfabsl(tls *TLS, x float64) float64 { /* fabsl.c:3:13: */
+	return Xfabs(tls, x)
+}
+
+func Xfmodl(tls *TLS, x float64, y float64) float64 { /* fmodl.c:4:13: */
+	return Xfmod(tls, x, y)
+}
+
+func Xnanf(tls *TLS, s uintptr) float32 { /* nanf.c:3:7: */
+	return X__builtin_nanf(tls, ts+13)
+}
+
+var toint double_t = float64(float64(1)) / 2.22044604925031308085e-16 /* rint.c:10:23 */
+
+func Xrint(tls *TLS, x float64) float64 { /* rint.c:12:8: */
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	*(*struct{ f float64 })(unsafe.Pointer(bp)) = func() (r struct{ f float64 }) {
+		*(*float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&r)) + 0)) = x
+		return r
+	}()
+	var e int32 = int32(*(*uint64_t)(unsafe.Pointer(bp)) >> 52 & uint64(0x7ff))
+	var s int32 = int32(*(*uint64_t)(unsafe.Pointer(bp)) >> 63)
+	var y double_t
+
+	if e >= 0x3ff+52 {
+		return x
+	}
+	if s != 0 {
+		y = x - toint + toint
+	} else {
+		y = x + toint - toint
+	}
+	if y == float64(0) {
+		if s != 0 {
+			return -Float64FromFloat64(0.0)
+		}
+		return float64(0)
+	}
+	return y
+}
+
+func Xscalbn(tls *TLS, x float64, n int32) float64 { /* scalbn.c:4:8: */
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	// var u struct {f float64;} at bp, 8
+
+	var y double_t = x
+
+	if n > 1023 {
+		y = y * 0x1p1023
+		n = n - 1023
+		if n > 1023 {
+			y = y * 0x1p1023
+			n = n - 1023
+			if n > 1023 {
+				n = 1023
+			}
+		}
+	} else if n < -1022 {
+		// make sure final n < -53 to avoid double
+		// 		   rounding in the subnormal range
+		y = y * (float64(0x1p-1022) * 0x1p53)
+		n = n + (1022 - 53)
+		if n < -1022 {
+			y = y * (float64(0x1p-1022) * 0x1p53)
+			n = n + (1022 - 53)
+			if n < -1022 {
+				n = -1022
+			}
+		}
+	}
+	*(*uint64_t)(unsafe.Pointer(bp)) = uint64_t(0x3ff+n) << 52
+	x = y * *(*float64)(unsafe.Pointer(bp))
+	return x
+}
+
+func Xscalbnl(tls *TLS, x float64, n int32) float64 { /* scalbnl.c:4:13: */
+	return Xscalbn(tls, x, n)
+}
+
+// Support signed or unsigned plain-char
+
+// Implementation choices...
+
+// Arbitrary numbers...
+
+// POSIX/SUS requirements follow. These numbers come directly
+// from SUS and have nothing to do with the host system.
+
+type __locale_map = struct {
+	__map    uintptr
+	map_size size_t
+	name     [24]int8
+	next     uintptr
+} /* alltypes.h:343:9 */
+
+type tls_module = struct {
+	next   uintptr
+	image  uintptr
+	len    size_t
+	size   size_t
+	align  size_t
+	offset size_t
+} /* libc.h:14:1 */
+
+type __libc = struct {
+	can_do_threads  int8
+	threaded        int8
+	secure          int8
+	need_locks      int8
+	threads_minus_1 int32
+	auxv            uintptr
+	tls_head        uintptr
+	tls_size        size_t
+	tls_align       size_t
+	tls_cnt         size_t
+	page_size       size_t
+	global_locale   struct{ cat [6]uintptr }
+} /* libc.h:20:1 */
+
+type time_t = int64 /* alltypes.h:85:16 */
+
+type clockid_t = int32 /* alltypes.h:214:13 */
+
+type timespec = struct {
+	tv_sec  time_t
+	tv_nsec int64
+} /* alltypes.h:229:1 */
+
+type pthread_t = uintptr /* alltypes.h:273:26 */
+
+type pthread_once_t = int32 /* alltypes.h:279:13 */
+
+type pthread_key_t = uint32 /* alltypes.h:284:18 */
+
+type pthread_spinlock_t = int32 /* alltypes.h:289:13 */
+
+type pthread_mutexattr_t = struct{ __attr uint32 } /* alltypes.h:294:37 */
+
+type pthread_condattr_t = struct{ __attr uint32 } /* alltypes.h:299:37 */
+
+type pthread_barrierattr_t = struct{ __attr uint32 } /* alltypes.h:304:37 */
+
+type pthread_rwlockattr_t = struct{ __attr [2]uint32 } /* alltypes.h:309:40 */
+
+type __sigset_t = struct{ __bits [16]uint64 } /* alltypes.h:349:9 */
+
+type sigset_t = __sigset_t /* alltypes.h:349:71 */
+
+type pthread_attr_t = struct {
+	__u struct {
+		_   [0]uint64
+		__i [14]int32
+	}
+} /* alltypes.h:372:147 */
+
+type pthread_mutex_t = struct {
+	__u struct {
+		_   [0]uint64
+		__i [10]int32
+	}
+} /* alltypes.h:377:157 */
+
+type pthread_cond_t = struct {
+	__u struct {
+		_   [0]uint64
+		__i [12]int32
+	}
+} /* alltypes.h:387:112 */
+
+type pthread_rwlock_t = struct {
+	__u struct {
+		_   [0]uint64
+		__i [14]int32
+	}
+} /* alltypes.h:397:139 */
+
+type pthread_barrier_t = struct {
+	__u struct {
+		_   [0]uint64
+		__i [8]int32
+	}
+} /* alltypes.h:402:137 */
+
+type sched_param = struct {
+	sched_priority int32
+	__reserved1    int32
+	__reserved2    [2]struct {
+		__reserved1 time_t
+		__reserved2 int64
+	}
+	__reserved3 int32
+	_           [4]byte
+} /* sched.h:19:1 */
+
+type timer_t = uintptr /* alltypes.h:209:14 */
+
+type clock_t = int64 /* alltypes.h:219:14 */
+
+type tm = struct {
+	tm_sec    int32
+	tm_min    int32
+	tm_hour   int32
+	tm_mday   int32
+	tm_mon    int32
+	tm_year   int32
+	tm_wday   int32
+	tm_yday   int32
+	tm_isdst  int32
+	_         [4]byte
+	tm_gmtoff int64
+	tm_zone   uintptr
+} /* time.h:38:1 */
+
+type itimerspec = struct {
+	it_interval struct {
+		tv_sec  time_t
+		tv_nsec int64
+	}
+	it_value struct {
+		tv_sec  time_t
+		tv_nsec int64
+	}
+} /* time.h:80:1 */
+
+type sigevent = struct {
+	sigev_value struct {
+		_         [0]uint64
+		sival_int int32
+		_         [4]byte
+	}
+	sigev_signo             int32
+	sigev_notify            int32
+	sigev_notify_function   uintptr
+	sigev_notify_attributes uintptr
+	__pad                   [32]int8
+} /* time.h:107:1 */
+
+type __ptcb = struct {
+	__f    uintptr
+	__x    uintptr
+	__next uintptr
+} /* alltypes.h:273:9 */
+
+type sigaltstack = struct {
+	ss_sp    uintptr
+	ss_flags int32
+	_        [4]byte
+	ss_size  size_t
+} /* signal.h:44:9 */
+
+type stack_t = sigaltstack /* signal.h:44:28 */
+
+type greg_t = int64        /* signal.h:59:19 */
+type gregset_t = [23]int64 /* signal.h:59:27 */
+type _fpstate = struct {
+	cwd       uint16
+	swd       uint16
+	ftw       uint16
+	fop       uint16
+	rip       uint64
+	rdp       uint64
+	mxcsr     uint32
+	mxcr_mask uint32
+	_st       [8]struct {
+		significand [4]uint16
+		exponent    uint16
+		padding     [3]uint16
+	}
+	_xmm    [16]struct{ element [4]uint32 }
+	padding [24]uint32
+} /* signal.h:60:9 */
+
+type fpregset_t = uintptr /* signal.h:71:3 */
+type sigcontext = struct {
+	r8          uint64
+	r9          uint64
+	r10         uint64
+	r11         uint64
+	r12         uint64
+	r13         uint64
+	r14         uint64
+	r15         uint64
+	rdi         uint64
+	rsi         uint64
+	rbp         uint64
+	rbx         uint64
+	rdx         uint64
+	rax         uint64
+	rcx         uint64
+	rsp         uint64
+	rip         uint64
+	eflags      uint64
+	cs          uint16
+	gs          uint16
+	fs          uint16
+	__pad0      uint16
+	err         uint64
+	trapno      uint64
+	oldmask     uint64
+	cr2         uint64
+	fpstate     uintptr
+	__reserved1 [8]uint64
+} /* signal.h:72:1 */
+
+type mcontext_t = struct {
+	gregs       gregset_t
+	fpregs      fpregset_t
+	__reserved1 [8]uint64
+} /* signal.h:84:3 */
+
+type __ucontext = struct {
+	uc_flags     uint64
+	uc_link      uintptr
+	uc_stack     stack_t
+	uc_mcontext  mcontext_t
+	uc_sigmask   sigset_t
+	__fpregs_mem [64]uint64
+} /* signal.h:97:9 */
+
+type ucontext_t = __ucontext /* signal.h:104:3 */
+
+type sigval = struct {
+	_         [0]uint64
+	sival_int int32
+	_         [4]byte
+} /* time.h:107:1 */
+
+type siginfo_t = struct {
+	si_signo    int32
+	si_errno    int32
+	si_code     int32
+	_           [4]byte
+	__si_fields struct {
+		_     [0]uint64
+		__pad [112]int8
+	}
+} /* signal.h:145:3 */
+
+type sigaction = struct {
+	__sa_handler struct{ sa_handler uintptr }
+	sa_mask      sigset_t
+	sa_flags     int32
+	_            [4]byte
+	sa_restorer  uintptr
+} /* signal.h:167:1 */
+
+type sig_t = uintptr /* signal.h:251:14 */
+
+type sig_atomic_t = int32 /* signal.h:269:13 */
+
+func a_cas(tls *TLS, p uintptr, t int32, s int32) int32 { /* atomic_arch.h:2:19: */
+	panic(`arch/x86_64/atomic_arch.h:4:2: assembler statements not supported`)
+	return t
+}
+
+func a_swap(tls *TLS, p uintptr, v int32) int32 { /* atomic_arch.h:20:19: */
+	panic(`arch/x86_64/atomic_arch.h:22:2: assembler statements not supported`)
+	return v
+}
+
+func a_or(tls *TLS, p uintptr, v int32) { /* atomic_arch.h:46:20: */
+	panic(`arch/x86_64/atomic_arch.h:48:2: assembler statements not supported`)
+}
+
+func a_or_64(tls *TLS, p uintptr, v uint64_t) { /* atomic_arch.h:62:20: */
+	panic(`arch/x86_64/atomic_arch.h:64:2: assembler statements not supported`)
+}
+
+func a_ctz_64(tls *TLS, x uint64_t) int32 { /* atomic_arch.h:112:19: */
+	panic(`arch/x86_64/atomic_arch.h:114:2: assembler statements not supported`)
+	return int32(x)
+}
+
+func a_ctz_32(tls *TLS, x uint32_t) int32 { /* atomic.h:256:19: */
+	return int32(_sdebruijn328[x&-x*uint32_t(0x076be629)>>27])
+}
+
+var _sdebruijn328 = [32]int8{
+	int8(0), int8(1), int8(23), int8(2), int8(29), int8(24), int8(19), int8(3), int8(30), int8(27), int8(25), int8(11), int8(20), int8(8), int8(4), int8(13),
+	int8(31), int8(22), int8(28), int8(18), int8(26), int8(10), int8(7), int8(12), int8(21), int8(17), int8(9), int8(6), int8(16), int8(5), int8(15), int8(14),
+} /* atomic.h:261:20 */
+
+type __timer = struct {
+	timerid int32
+	_       [4]byte
+	thread  pthread_t
+} /* pthread_impl.h:64:1 */
+
+func __pthread_self(tls *TLS) uintptr { /* pthread_arch.h:1:30: */
+	var self uintptr
+	panic(`arch/x86_64/pthread_arch.h:4:2: assembler statements not supported`)
+	return self
+}
+
+func __wake(tls *TLS, addr uintptr, cnt int32, priv int32) { /* pthread_impl.h:155:20: */
+	if priv != 0 {
+		priv = 128
+	}
+	if cnt < 0 {
+		cnt = 0x7fffffff
+	}
+	_ = Bool32(X__syscall3(tls, int64(202), int64(addr), int64(1|priv), int64(cnt)) != int64(-38) || X__syscall3(tls, int64(202), int64(addr), int64(1), int64(cnt)) != 0)
+}
+
+func __futexwait(tls *TLS, addr uintptr, val int32, priv int32) { /* pthread_impl.h:162:20: */
+	if priv != 0 {
+		priv = 128
+	}
+	_ = Bool32(X__syscall4(tls, int64(202), int64(addr), int64(0|priv), int64(val), int64(0)) != int64(-38) || X__syscall4(tls, int64(202), int64(addr), int64(0), int64(val), int64(0)) != 0)
+}
+
+var X__fsmu8 = [51]uint32_t{
+	func() uint32 {
+		if 0x2 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0x2)
+	}(), func() uint32 {
+		if 0x3 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0x3)
+	}(), func() uint32 {
+		if 0x4 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0x4)
+	}(), func() uint32 {
+		if 0x5 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0x5)
+	}(), func() uint32 {
+		if 0x6 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0x6)
+	}(), func() uint32 {
+		if 0x7 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0x7)
+	}(),
+	func() uint32 {
+		if 0x8 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0x8)
+	}(), func() uint32 {
+		if 0x9 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0x9)
+	}(), func() uint32 {
+		if 0xa < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0xa)
+	}(), func() uint32 {
+		if 0xb < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0xb)
+	}(), func() uint32 {
+		if 0xc < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0xc)
+	}(), func() uint32 {
+		if 0xd < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0xd)
+	}(), func() uint32 {
+		if 0xe < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0xe)
+	}(), func() uint32 {
+		if 0xf < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0xf)
+	}(),
+	func() uint32 {
+		if 0x0+16 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0x0+16)
+	}(), func() uint32 {
+		if 0x1+16 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0x1+16)
+	}(), func() uint32 {
+		if 0x2+16 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0x2+16)
+	}(), func() uint32 {
+		if 0x3+16 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0x3+16)
+	}(), func() uint32 {
+		if 0x4+16 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0x4+16)
+	}(), func() uint32 {
+		if 0x5+16 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0x5+16)
+	}(), func() uint32 {
+		if 0x6+16 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0x6+16)
+	}(), func() uint32 {
+		if 0x7+16 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0x7+16)
+	}(),
+	func() uint32 {
+		if 0x8+16 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0x8+16)
+	}(), func() uint32 {
+		if 0x9+16 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0x9+16)
+	}(), func() uint32 {
+		if 0xa+16 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0xa+16)
+	}(), func() uint32 {
+		if 0xb+16 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0xb+16)
+	}(), func() uint32 {
+		if 0xc+16 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0xc+16)
+	}(), func() uint32 {
+		if 0xd+16 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0xd+16)
+	}(), func() uint32 {
+		if 0xe+16 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0xe+16)
+	}(), func() uint32 {
+		if 0xf+16 < 2 {
+			return Uint32FromInt32(-1)
+		}
+		return func() uint32 {
+			if Int32(0x80) == Int32(0x80) {
+				return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+			}
+			return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+		}()<<23 | uint32_t(0xf+16)
+	}(),
+	func() uint32 {
+		if 0x0 == 0 {
+			return func() uint32 {
+				if Int32(0xa0) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0xa0))
+			}() << 23
+		}
+		return func() uint32 {
+			if 0x0 == 0xd {
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xa0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}
+			return func() uint32 {
+				if Int32(0x80) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+			}() << 23
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(0x0), func() uint32 {
+		if 0x1 == 0 {
+			return func() uint32 {
+				if Int32(0xa0) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0xa0))
+			}() << 23
+		}
+		return func() uint32 {
+			if 0x1 == 0xd {
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xa0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}
+			return func() uint32 {
+				if Int32(0x80) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+			}() << 23
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(0x1), func() uint32 {
+		if 0x2 == 0 {
+			return func() uint32 {
+				if Int32(0xa0) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0xa0))
+			}() << 23
+		}
+		return func() uint32 {
+			if 0x2 == 0xd {
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xa0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}
+			return func() uint32 {
+				if Int32(0x80) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+			}() << 23
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(0x2), func() uint32 {
+		if 0x3 == 0 {
+			return func() uint32 {
+				if Int32(0xa0) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0xa0))
+			}() << 23
+		}
+		return func() uint32 {
+			if 0x3 == 0xd {
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xa0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}
+			return func() uint32 {
+				if Int32(0x80) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+			}() << 23
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(0x3), func() uint32 {
+		if 0x4 == 0 {
+			return func() uint32 {
+				if Int32(0xa0) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0xa0))
+			}() << 23
+		}
+		return func() uint32 {
+			if 0x4 == 0xd {
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xa0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}
+			return func() uint32 {
+				if Int32(0x80) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+			}() << 23
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(0x4), func() uint32 {
+		if 0x5 == 0 {
+			return func() uint32 {
+				if Int32(0xa0) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0xa0))
+			}() << 23
+		}
+		return func() uint32 {
+			if 0x5 == 0xd {
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xa0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}
+			return func() uint32 {
+				if Int32(0x80) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+			}() << 23
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(0x5), func() uint32 {
+		if 0x6 == 0 {
+			return func() uint32 {
+				if Int32(0xa0) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0xa0))
+			}() << 23
+		}
+		return func() uint32 {
+			if 0x6 == 0xd {
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xa0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}
+			return func() uint32 {
+				if Int32(0x80) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+			}() << 23
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(0x6), func() uint32 {
+		if 0x7 == 0 {
+			return func() uint32 {
+				if Int32(0xa0) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0xa0))
+			}() << 23
+		}
+		return func() uint32 {
+			if 0x7 == 0xd {
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xa0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}
+			return func() uint32 {
+				if Int32(0x80) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+			}() << 23
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(0x7),
+	func() uint32 {
+		if 0x8 == 0 {
+			return func() uint32 {
+				if Int32(0xa0) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0xa0))
+			}() << 23
+		}
+		return func() uint32 {
+			if 0x8 == 0xd {
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xa0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}
+			return func() uint32 {
+				if Int32(0x80) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+			}() << 23
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(0x8), func() uint32 {
+		if 0x9 == 0 {
+			return func() uint32 {
+				if Int32(0xa0) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0xa0))
+			}() << 23
+		}
+		return func() uint32 {
+			if 0x9 == 0xd {
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xa0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}
+			return func() uint32 {
+				if Int32(0x80) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+			}() << 23
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(0x9), func() uint32 {
+		if 0xa == 0 {
+			return func() uint32 {
+				if Int32(0xa0) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0xa0))
+			}() << 23
+		}
+		return func() uint32 {
+			if 0xa == 0xd {
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xa0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}
+			return func() uint32 {
+				if Int32(0x80) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+			}() << 23
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(0xa), func() uint32 {
+		if 0xb == 0 {
+			return func() uint32 {
+				if Int32(0xa0) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0xa0))
+			}() << 23
+		}
+		return func() uint32 {
+			if 0xb == 0xd {
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xa0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}
+			return func() uint32 {
+				if Int32(0x80) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+			}() << 23
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(0xb), func() uint32 {
+		if 0xc == 0 {
+			return func() uint32 {
+				if Int32(0xa0) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0xa0))
+			}() << 23
+		}
+		return func() uint32 {
+			if 0xc == 0xd {
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xa0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}
+			return func() uint32 {
+				if Int32(0x80) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+			}() << 23
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(0xc), func() uint32 {
+		if 0xd == 0 {
+			return func() uint32 {
+				if Int32(0xa0) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0xa0))
+			}() << 23
+		}
+		return func() uint32 {
+			if 0xd == 0xd {
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xa0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}
+			return func() uint32 {
+				if Int32(0x80) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+			}() << 23
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(0xd), func() uint32 {
+		if 0xe == 0 {
+			return func() uint32 {
+				if Int32(0xa0) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0xa0))
+			}() << 23
+		}
+		return func() uint32 {
+			if 0xe == 0xd {
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xa0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}
+			return func() uint32 {
+				if Int32(0x80) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+			}() << 23
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(0xe), func() uint32 {
+		if 0xf == 0 {
+			return func() uint32 {
+				if Int32(0xa0) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0xa0))
+			}() << 23
+		}
+		return func() uint32 {
+			if 0xf == 0xd {
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xa0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}
+			return func() uint32 {
+				if Int32(0x80) == Int32(0x80) {
+					return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+				}
+				return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+			}() << 23
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(0xf),
+	func() uint32 {
+		if 0x0 >= 5 {
+			return uint32(0)
+		}
+		return func() uint32 {
+			if 0x0 == 0 {
+				return func() uint32 {
+					if Int32(0x90) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x90))
+				}() << 23
+			}
+			return func() uint32 {
+				if 0x0 == 4 {
+					return func() uint32 {
+						if Int32(0x80) == Int32(0x80) {
+							return Uint32(Uint32(0x40) - Uint32FromInt32(0x90))
+						}
+						return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+					}() << 23
+				}
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}()
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>12 | uint32_t(0x0), func() uint32 {
+		if 0x1 >= 5 {
+			return uint32(0)
+		}
+		return func() uint32 {
+			if 0x1 == 0 {
+				return func() uint32 {
+					if Int32(0x90) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x90))
+				}() << 23
+			}
+			return func() uint32 {
+				if 0x1 == 4 {
+					return func() uint32 {
+						if Int32(0x80) == Int32(0x80) {
+							return Uint32(Uint32(0x40) - Uint32FromInt32(0x90))
+						}
+						return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+					}() << 23
+				}
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}()
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>12 | uint32_t(0x1), func() uint32 {
+		if 0x2 >= 5 {
+			return uint32(0)
+		}
+		return func() uint32 {
+			if 0x2 == 0 {
+				return func() uint32 {
+					if Int32(0x90) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x90))
+				}() << 23
+			}
+			return func() uint32 {
+				if 0x2 == 4 {
+					return func() uint32 {
+						if Int32(0x80) == Int32(0x80) {
+							return Uint32(Uint32(0x40) - Uint32FromInt32(0x90))
+						}
+						return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+					}() << 23
+				}
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}()
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>12 | uint32_t(0x2), func() uint32 {
+		if 0x3 >= 5 {
+			return uint32(0)
+		}
+		return func() uint32 {
+			if 0x3 == 0 {
+				return func() uint32 {
+					if Int32(0x90) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x90))
+				}() << 23
+			}
+			return func() uint32 {
+				if 0x3 == 4 {
+					return func() uint32 {
+						if Int32(0x80) == Int32(0x80) {
+							return Uint32(Uint32(0x40) - Uint32FromInt32(0x90))
+						}
+						return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+					}() << 23
+				}
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}()
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>12 | uint32_t(0x3), func() uint32 {
+		if 0x4 >= 5 {
+			return uint32(0)
+		}
+		return func() uint32 {
+			if 0x4 == 0 {
+				return func() uint32 {
+					if Int32(0x90) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x90))
+				}() << 23
+			}
+			return func() uint32 {
+				if 0x4 == 4 {
+					return func() uint32 {
+						if Int32(0x80) == Int32(0x80) {
+							return Uint32(Uint32(0x40) - Uint32FromInt32(0x90))
+						}
+						return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+					}() << 23
+				}
+				return func() uint32 {
+					if Int32(0x80) == Int32(0x80) {
+						return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+					}
+					return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+				}() << 23
+			}()
+		}()
+	}() | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>6 | uint32_t(func() uint32 {
+		if Int32(0x80) == Int32(0x80) {
+			return Uint32(Uint32(0x40) - Uint32FromInt32(0xc0))
+		}
+		return Uint32(Uint32(0) - Uint32FromInt32(0x80))
+	}()<<23)>>12 | uint32_t(0x4),
+} /* internal.c:18:16 */
+
+type wint_t = uint32 /* alltypes.h:198:18 */
+
+type wctype_t = uint64 /* alltypes.h:203:23 */
+
+type __mbstate_t = struct {
+	__opaque1 uint32
+	__opaque2 uint32
+} /* alltypes.h:337:9 */
+
+type mbstate_t = __mbstate_t /* alltypes.h:337:63 */
+
+func Xmbrtowc(tls *TLS, wc uintptr, src uintptr, n size_t, st uintptr) size_t { /* mbrtowc.c:6:8: */
+	bp := tls.Alloc(4)
+	defer tls.Free(4)
+
+	var c uint32
+	var s uintptr
+	var N uint32
+	// var dummy wchar_t at bp, 4
+	s = src
+	N = uint32(n)
+
+	if !!(st != 0) {
+		goto __1
+	}
+	st = uintptr(unsafe.Pointer(&_sinternal_state))
+__1:
+	;
+	c = *(*uint32)(unsafe.Pointer(st))
+
+	if !!(s != 0) {
+		goto __2
+	}
+	if !(c != 0) {
+		goto __4
+	}
+	goto ilseq
+__4:
+	;
+	return uint64(0)
+	goto __3
+__2:
+	if !!(wc != 0) {
+		goto __5
+	}
+	wc = bp /* &dummy */
+__5:
+	;
+__3:
+	;
+
+	if !!(n != 0) {
+		goto __6
+	}
+	return Uint64FromInt32(-2)
+__6:
+	;
+	if !!(c != 0) {
+		goto __7
+	}
+	if !(int32(*(*uint8)(unsafe.Pointer(s))) < 0x80) {
+		goto __8
+	}
+	return BoolUint64(!!(AssignPtrInt32(wc, wchar_t(*(*uint8)(unsafe.Pointer(s)))) != 0))
+__8:
+	;
+	if !(func() int32 {
+		if !!(int32(*(*uintptr)(unsafe.Pointer((*__pthread)(unsafe.Pointer(__pthread_self(tls))).locale))) != 0) {
+			return 4
+		}
+		return 1
+	}() == 1) {
+		goto __9
+	}
+	*(*wchar_t)(unsafe.Pointer(wc)) = 0xdfff & int32(int8(*(*uint8)(unsafe.Pointer(s))))
+	return 1
+__9:
+	;
+	if !(uint32(*(*uint8)(unsafe.Pointer(s)))-0xc2 > 0xf4-0xc2) {
+		goto __10
+	}
+	goto ilseq
+__10:
+	;
+	c = X__fsmu8[uint32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&s, 1))))-0xc2]
+	n--
+__7:
+	;
+
+	if !(n != 0) {
+		goto __11
+	}
+	if !((int32(*(*uint8)(unsafe.Pointer(s)))>>3-0x10|(int32(*(*uint8)(unsafe.Pointer(s)))>>3+int32_t(c)>>26))&CplInt32(7) != 0) {
+		goto __12
+	}
+	goto ilseq
+__12:
+	;
+loop:
+	c = c<<6 | uint32(int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&s, 1))))-0x80)
+	n--
+	if !!(c&(uint32(1)<<31) != 0) {
+		goto __13
+	}
+	*(*uint32)(unsafe.Pointer(st)) = uint32(0)
+	*(*wchar_t)(unsafe.Pointer(wc)) = wchar_t(c)
+	return size_t(N) - n
+__13:
+	;
+	if !(n != 0) {
+		goto __14
+	}
+	if !(uint32(*(*uint8)(unsafe.Pointer(s)))-0x80 >= uint32(0x40)) {
+		goto __15
+	}
+	goto ilseq
+__15:
+	;
+	goto loop
+__14:
+	;
+__11:
+	;
+
+	*(*uint32)(unsafe.Pointer(st)) = c
+	return Uint64FromInt32(-2)
+ilseq:
+	*(*uint32)(unsafe.Pointer(st)) = uint32(0)
+	*(*int32)(unsafe.Pointer(X___errno_location(tls))) = 84
+	return Uint64FromInt32(-1)
+}
+
+var _sinternal_state uint32 /* mbrtowc.c:8:18: */
+
+func Xmbsinit(tls *TLS, st uintptr) int32 { /* mbsinit.c:3:5: */
+	return Bool32(!(st != 0) || !(int32(*(*uint32)(unsafe.Pointer(st))) != 0))
+}
+
+type imaxdiv_t = struct {
+	quot intmax_t
+	rem  intmax_t
+} /* inttypes.h:14:40 */
+
+type socklen_t = uint32 /* alltypes.h:361:18 */
+
+type sa_family_t = uint16 /* alltypes.h:366:24 */
+
+type msghdr = struct {
+	msg_name       uintptr
+	msg_namelen    socklen_t
+	_              [4]byte
+	msg_iov        uintptr
+	msg_iovlen     int32
+	__pad1         int32
+	msg_control    uintptr
+	msg_controllen socklen_t
+	__pad2         int32
+	msg_flags      int32
+	_              [4]byte
+} /* socket.h:22:1 */
+
+type cmsghdr = struct {
+	cmsg_len   socklen_t
+	__pad1     int32
+	cmsg_level int32
+	cmsg_type  int32
+} /* socket.h:44:1 */
+
+type linger = struct {
+	l_onoff  int32
+	l_linger int32
+} /* socket.h:74:1 */
+
+type sockaddr = struct {
+	sa_family sa_family_t
+	sa_data   [14]int8
+} /* socket.h:367:1 */
+
+type sockaddr_storage = struct {
+	ss_family    sa_family_t
+	__ss_padding [118]int8
+	__ss_align   uint64
+} /* socket.h:372:1 */
+
+type in_port_t = uint16_t                 /* in.h:12:18 */
+type in_addr_t = uint32_t                 /* in.h:13:18 */
+type in_addr = struct{ s_addr in_addr_t } /* in.h:14:1 */
+
+type sockaddr_in = struct {
+	sin_family sa_family_t
+	sin_port   in_port_t
+	sin_addr   struct{ s_addr in_addr_t }
+	sin_zero   [8]uint8_t
+} /* in.h:16:1 */
+
+type in6_addr = struct {
+	__in6_union struct {
+		_         [0]uint32
+		__s6_addr [16]uint8_t
+	}
+} /* in.h:23:1 */
+
+type sockaddr_in6 = struct {
+	sin6_family   sa_family_t
+	sin6_port     in_port_t
+	sin6_flowinfo uint32_t
+	sin6_addr     struct {
+		__in6_union struct {
+			_         [0]uint32
+			__s6_addr [16]uint8_t
+		}
+	}
+	sin6_scope_id uint32_t
+} /* in.h:34:1 */
+
+type ipv6_mreq = struct {
+	ipv6mr_multiaddr struct {
+		__in6_union struct {
+			_         [0]uint32
+			__s6_addr [16]uint8_t
+		}
+	}
+	ipv6mr_interface uint32
+} /* in.h:42:1 */
+
+type ip_opts = struct {
+	ip_dst  struct{ s_addr in_addr_t }
+	ip_opts [40]int8
+} /* in.h:229:1 */
+
+type ip_mreq = struct {
+	imr_multiaddr struct{ s_addr in_addr_t }
+	imr_interface struct{ s_addr in_addr_t }
+} /* in.h:247:1 */
+
+type ip_mreqn = struct {
+	imr_multiaddr struct{ s_addr in_addr_t }
+	imr_address   struct{ s_addr in_addr_t }
+	imr_ifindex   int32
+} /* in.h:252:1 */
+
+type ip_mreq_source = struct {
+	imr_multiaddr  struct{ s_addr in_addr_t }
+	imr_interface  struct{ s_addr in_addr_t }
+	imr_sourceaddr struct{ s_addr in_addr_t }
+} /* in.h:258:1 */
+
+type ip_msfilter = struct {
+	imsf_multiaddr struct{ s_addr in_addr_t }
+	imsf_interface struct{ s_addr in_addr_t }
+	imsf_fmode     uint32_t
+	imsf_numsrc    uint32_t
+	imsf_slist     [1]struct{ s_addr in_addr_t }
+} /* in.h:264:1 */
+
+type group_req = struct {
+	gr_interface uint32_t
+	_            [4]byte
+	gr_group     struct {
+		ss_family    sa_family_t
+		__ss_padding [118]int8
+		__ss_align   uint64
+	}
+} /* in.h:275:1 */
+
+type group_source_req = struct {
+	gsr_interface uint32_t
+	_             [4]byte
+	gsr_group     struct {
+		ss_family    sa_family_t
+		__ss_padding [118]int8
+		__ss_align   uint64
+	}
+	gsr_source struct {
+		ss_family    sa_family_t
+		__ss_padding [118]int8
+		__ss_align   uint64
+	}
+} /* in.h:280:1 */
+
+type group_filter = struct {
+	gf_interface uint32_t
+	_            [4]byte
+	gf_group     struct {
+		ss_family    sa_family_t
+		__ss_padding [118]int8
+		__ss_align   uint64
+	}
+	gf_fmode  uint32_t
+	gf_numsrc uint32_t
+	gf_slist  [1]struct {
+		ss_family    sa_family_t
+		__ss_padding [118]int8
+		__ss_align   uint64
+	}
+} /* in.h:286:1 */
+
+type in_pktinfo = struct {
+	ipi_ifindex  int32
+	ipi_spec_dst struct{ s_addr in_addr_t }
+	ipi_addr     struct{ s_addr in_addr_t }
+} /* in.h:297:1 */
+
+type in6_pktinfo = struct {
+	ipi6_addr struct {
+		__in6_union struct {
+			_         [0]uint32
+			__s6_addr [16]uint8_t
+		}
+	}
+	ipi6_ifindex uint32
+} /* in.h:303:1 */
+
+type ip6_mtuinfo = struct {
+	ip6m_addr struct {
+		sin6_family   sa_family_t
+		sin6_port     in_port_t
+		sin6_flowinfo uint32_t
+		sin6_addr     struct {
+			__in6_union struct {
+				_         [0]uint32
+				__s6_addr [16]uint8_t
+			}
+		}
+		sin6_scope_id uint32_t
+	}
+	ip6m_mtu uint32_t
+} /* in.h:308:1 */
+
+type addrinfo = struct {
+	ai_flags     int32
+	ai_family    int32
+	ai_socktype  int32
+	ai_protocol  int32
+	ai_addrlen   socklen_t
+	_            [4]byte
+	ai_addr      uintptr
+	ai_canonname uintptr
+	ai_next      uintptr
+} /* netdb.h:16:1 */
+
+// Legacy functions follow (marked OBsolete in SUS)
+
+type netent = struct {
+	n_name     uintptr
+	n_aliases  uintptr
+	n_addrtype int32
+	n_net      uint32_t
+} /* netdb.h:62:1 */
+
+type hostent = struct {
+	h_name      uintptr
+	h_aliases   uintptr
+	h_addrtype  int32
+	h_length    int32
+	h_addr_list uintptr
+} /* netdb.h:69:1 */
+
+type servent = struct {
+	s_name    uintptr
+	s_aliases uintptr
+	s_port    int32
+	_         [4]byte
+	s_proto   uintptr
+} /* netdb.h:78:1 */
+
+type protoent = struct {
+	p_name    uintptr
+	p_aliases uintptr
+	p_proto   int32
+	_         [4]byte
+} /* netdb.h:85:1 */
+
+type aibuf = struct {
+	ai struct {
+		ai_flags     int32
+		ai_family    int32
+		ai_socktype  int32
+		ai_protocol  int32
+		ai_addrlen   socklen_t
+		_            [4]byte
+		ai_addr      uintptr
+		ai_canonname uintptr
+		ai_next      uintptr
+	}
+	sa struct {
+		sin struct {
+			sin_family sa_family_t
+			sin_port   in_port_t
+			sin_addr   struct{ s_addr in_addr_t }
+			sin_zero   [8]uint8_t
+		}
+		_ [12]byte
+	}
+	lock [1]int32
+	slot int16
+	ref  int16
+	_    [4]byte
+} /* lookup.h:10:1 */
+
+type sa = struct {
+	sin struct {
+		sin_family sa_family_t
+		sin_port   in_port_t
+		sin_addr   struct{ s_addr in_addr_t }
+		sin_zero   [8]uint8_t
+	}
+	_ [12]byte
+} /* lookup.h:10:1 */
+
+type address = struct {
+	family  int32
+	scopeid uint32
+	addr    [16]uint8_t
+	sortkey int32
+} /* lookup.h:20:1 */
+
+type service = struct {
+	port     uint16_t
+	proto    uint8
+	socktype uint8
+} /* lookup.h:27:1 */
+
+type resolvconf = struct {
+	ns [3]struct {
+		family  int32
+		scopeid uint32
+		addr    [16]uint8_t
+		sortkey int32
+	}
+	nns      uint32
+	attempts uint32
+	ndots    uint32
+	timeout  uint32
+} /* lookup.h:34:1 */
+
+func Xfreeaddrinfo(tls *TLS, p uintptr) { /* freeaddrinfo.c:7:6: */
+	var cnt size_t
+	cnt = uint64(1)
+__1:
+	if !((*addrinfo)(unsafe.Pointer(p)).ai_next != 0) {
+		goto __3
+	}
+	goto __2
+__2:
+	cnt++
+	p = (*addrinfo)(unsafe.Pointer(p)).ai_next
+	goto __1
+	goto __3
+__3:
+	;
+	var b uintptr = p - uintptr(uint64(uintptr(0)))
+	b -= 88 * uintptr((*aibuf)(unsafe.Pointer(b)).slot)
+	//TODO LOCK(b->lock);
+	if !(int32(AssignSubPtrInt16(b+82, int16(cnt))) != 0) {
+		Xfree(tls, b)
+	}
+	//TODO else UNLOCK(b->lock);
+}
+
+func Xgetaddrinfo(tls *TLS, host uintptr, serv uintptr, hint uintptr, res uintptr) int32 { /* getaddrinfo.c:12:5: */
+	bp := tls.Alloc(1608)
+	defer tls.Free(1608)
+
+	// var ports [2]service at bp, 8
+
+	// var addrs [48]address at bp+8, 1344
+
+	// var canon [256]int8 at bp+1352, 256
+
+	var outcanon uintptr
+	var nservs int32
+	var naddrs int32
+	var nais int32
+	var canon_len int32
+	var i int32
+	var j int32
+	var k int32
+	var family int32 = 0
+	var flags int32 = 0
+	var proto int32 = 0
+	var socktype int32 = 0
+	var out uintptr
+
+	if !(host != 0) && !(serv != 0) {
+		return -2
+	}
+
+	if hint != 0 {
+		family = (*addrinfo)(unsafe.Pointer(hint)).ai_family
+		flags = (*addrinfo)(unsafe.Pointer(hint)).ai_flags
+		proto = (*addrinfo)(unsafe.Pointer(hint)).ai_protocol
+		socktype = (*addrinfo)(unsafe.Pointer(hint)).ai_socktype
+
+		var mask int32 = 0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x400
+		if flags&mask != flags {
+			return -1
+		}
+
+		switch family {
+		case 2:
+			fallthrough
+		case 10:
+			fallthrough
+		case 0:
+			break
+			fallthrough
+		default:
+			return -6
+		}
+	}
+
+	if flags&0x20 != 0 {
+		Xabort(tls) //TODO-
+		// 	/* Define the "an address is configured" condition for address
+		// 	 * families via ability to create a socket for the family plus
+		// 	 * routability of the loopback address for the family. */
+		// 	static const struct sockaddr_in lo4 = {
+		// 		.sin_family = AF_INET, .sin_port = 65535,
+		// 		.sin_addr.s_addr = __BYTE_ORDER == __BIG_ENDIAN
+		// 			? 0x7f000001 : 0x0100007f
+		// 	};
+		// 	static const struct sockaddr_in6 lo6 = {
+		// 		.sin6_family = AF_INET6, .sin6_port = 65535,
+		// 		.sin6_addr = IN6ADDR_LOOPBACK_INIT
+		// 	};
+		// 	int tf[2] = { AF_INET, AF_INET6 };
+		// 	const void *ta[2] = { &lo4, &lo6 };
+		// 	socklen_t tl[2] = { sizeof lo4, sizeof lo6 };
+		// 	for (i=0; i<2; i++) {
+		// 		if (family==tf[1-i]) continue;
+		// 		int s = socket(tf[i], SOCK_CLOEXEC|SOCK_DGRAM,
+		// 			IPPROTO_UDP);
+		// 		if (s>=0) {
+		// 			int cs;
+		// 			pthread_setcancelstate(
+		// 				PTHREAD_CANCEL_DISABLE, &cs);
+		// 			int r = connect(s, ta[i], tl[i]);
+		// 			pthread_setcancelstate(cs, 0);
+		// 			close(s);
+		// 			if (!r) continue;
+		// 		}
+		// 		switch (errno) {
+		// 		case EADDRNOTAVAIL:
+		// 		case EAFNOSUPPORT:
+		// 		case EHOSTUNREACH:
+		// 		case ENETDOWN:
+		// 		case ENETUNREACH:
+		// 			break;
+		// 		default:
+		// 			return EAI_SYSTEM;
+		// 		}
+		// 		if (family == tf[i]) return EAI_NONAME;
+		// 		family = tf[1-i];
+		// 	}
+	}
+
+	nservs = X__lookup_serv(tls, bp, serv, proto, socktype, flags)
+	if nservs < 0 {
+		return nservs
+	}
+
+	naddrs = X__lookup_name(tls, bp+8, bp+1352, host, family, flags)
+	if naddrs < 0 {
+		return naddrs
+	}
+
+	nais = nservs * naddrs
+	canon_len = int32(Xstrlen(tls, bp+1352))
+	out = Xcalloc(tls, uint64(1), uint64(nais)*uint64(unsafe.Sizeof(aibuf{}))+uint64(canon_len)+uint64(1))
+	if !(out != 0) {
+		return -10
+	}
+
+	if canon_len != 0 {
+		outcanon = out + uintptr(nais)*88
+		Xmemcpy(tls, outcanon, bp+1352, uint64(canon_len+1))
+	} else {
+		outcanon = uintptr(0)
+	}
+
+	for k = AssignInt32(&i, 0); i < naddrs; i++ {
+		j = 0
+	__1:
+		if !(j < nservs) {
+			goto __3
+		}
+		{
+			(*aibuf)(unsafe.Pointer(out + uintptr(k)*88)).slot = int16(k)
+			//TODO out[k].ai = (struct addrinfo){
+			//TODO 	.ai_family = addrs[i].family,
+			//TODO 	.ai_socktype = ports[j].socktype,
+			//TODO 	.ai_protocol = ports[j].proto,
+			//TODO 	.ai_addrlen = addrs[i].family == AF_INET
+			//TODO 		? sizeof(struct sockaddr_in)
+			//TODO 		: sizeof(struct sockaddr_in6),
+			//TODO 	.ai_addr = (void *)&out[k].sa,
+			//TODO 	.ai_canonname = outcanon };
+			(*aibuf)(unsafe.Pointer(out + uintptr(k)*88)).ai.ai_family = (*address)(unsafe.Pointer(bp + 8 + uintptr(i)*28)).family
+			(*aibuf)(unsafe.Pointer(out + uintptr(k)*88)).ai.ai_socktype = int32((*service)(unsafe.Pointer(bp + uintptr(j)*4)).socktype)
+			(*aibuf)(unsafe.Pointer(out + uintptr(k)*88)).ai.ai_protocol = int32((*service)(unsafe.Pointer(bp + uintptr(j)*4)).proto)
+			(*aibuf)(unsafe.Pointer(out + uintptr(k)*88)).ai.ai_addrlen = func() uint32 {
+				if (*address)(unsafe.Pointer(bp+8+uintptr(i)*28)).family == 2 {
+					return uint32(unsafe.Sizeof(sockaddr_in{}))
+				}
+				return uint32(unsafe.Sizeof(sockaddr_in6{}))
+			}()
+			(*aibuf)(unsafe.Pointer(out + uintptr(k)*88)).ai.ai_addr = out + uintptr(k)*88 + 48
+			(*aibuf)(unsafe.Pointer(out + uintptr(k)*88)).ai.ai_canonname = outcanon
+			if k != 0 {
+				(*aibuf)(unsafe.Pointer(out + uintptr(k-1)*88)).ai.ai_next = out + uintptr(k)*88
+			}
+			switch (*address)(unsafe.Pointer(bp + 8 + uintptr(i)*28)).family {
+			case 2:
+				(*sockaddr_in)(unsafe.Pointer(out + uintptr(k)*88 + 48)).sin_family = sa_family_t(2)
+				(*sockaddr_in)(unsafe.Pointer(out + uintptr(k)*88 + 48)).sin_port = Xhtons(tls, (*service)(unsafe.Pointer(bp+uintptr(j)*4)).port)
+				Xmemcpy(tls, out+uintptr(k)*88+48+4, bp+8+uintptr(i)*28+8, uint64(4))
+				break
+			case 10:
+				(*sockaddr_in6)(unsafe.Pointer(out + uintptr(k)*88 + 48)).sin6_family = sa_family_t(10)
+				(*sockaddr_in6)(unsafe.Pointer(out + uintptr(k)*88 + 48)).sin6_port = Xhtons(tls, (*service)(unsafe.Pointer(bp+uintptr(j)*4)).port)
+				(*sockaddr_in6)(unsafe.Pointer(out + uintptr(k)*88 + 48)).sin6_scope_id = (*address)(unsafe.Pointer(bp + 8 + uintptr(i)*28)).scopeid
+				Xmemcpy(tls, out+uintptr(k)*88+48+8, bp+8+uintptr(i)*28+8, uint64(16))
+				break
+			}
+
+		}
+		goto __2
+	__2:
+		j++
+		k++
+		goto __1
+		goto __3
+	__3:
+	}
+	(*aibuf)(unsafe.Pointer(out)).ref = int16(nais)
+	*(*uintptr)(unsafe.Pointer(res)) = out
+	return 0
+}
+
+type ucred = struct {
+	pid pid_t
+	uid uid_t
+	gid gid_t
+} /* socket.h:57:1 */
+
+type mmsghdr = struct {
+	msg_hdr struct {
+		msg_name       uintptr
+		msg_namelen    socklen_t
+		_              [4]byte
+		msg_iov        uintptr
+		msg_iovlen     int32
+		__pad1         int32
+		msg_control    uintptr
+		msg_controllen socklen_t
+		__pad2         int32
+		msg_flags      int32
+		_              [4]byte
+	}
+	msg_len uint32
+	_       [4]byte
+} /* socket.h:63:1 */
+
+func Xgethostbyaddr(tls *TLS, a uintptr, l socklen_t, af int32) uintptr { /* gethostbyaddr.c:7:16: */
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var size size_t = uint64(63)
+	// var res uintptr at bp, 8
+
+	var err int32
+	for __ccgo := true; __ccgo; __ccgo = err == 34 {
+		Xfree(tls, _sh)
+		_sh = Xmalloc(tls, AssignAddUint64(&size, size+uint64(1)))
+		if !(_sh != 0) {
+			*(*int32)(unsafe.Pointer(X__h_errno_location(tls))) = 3
+			return uintptr(0)
+		}
+		err = Xgethostbyaddr_r(tls, a, l, af, _sh,
+			_sh+uintptr(1)*32, size-size_t(unsafe.Sizeof(hostent{})), bp, X__h_errno_location(tls))
+	}
+	if err != 0 {
+		return uintptr(0)
+	}
+	return _sh
+}
+
+var _sh uintptr /* gethostbyaddr.c:9:24: */
+
+func Xgethostbyaddr_r(tls *TLS, a uintptr, l socklen_t, af int32, h uintptr, buf uintptr, buflen size_t, res uintptr, err uintptr) int32 { /* gethostbyaddr_r.c:10:5: */
+	bp := tls.Alloc(28)
+	defer tls.Free(28)
+
+	//TODO union {
+	//TODO 	struct sockaddr_in sin;
+	//TODO 	struct sockaddr_in6 sin6;
+	//TODO } sa = { .sin.sin_family = af };
+	*(*struct {
+		sin sockaddr_in
+		_   [12]byte
+	})(unsafe.Pointer(bp)) = struct {
+		sin sockaddr_in
+		_   [12]byte
+	}{} //TODO-
+	(*sockaddr_in)(unsafe.Pointer(bp)).sin_family = sa_family_t(af) //TODO-
+	var sl socklen_t
+	if af == 10 {
+		sl = uint32(unsafe.Sizeof(sockaddr_in6{}))
+	} else {
+		sl = uint32(unsafe.Sizeof(sockaddr_in{}))
+	}
+	var i int32
+
+	*(*uintptr)(unsafe.Pointer(res)) = uintptr(0)
+
+	// Load address argument into sockaddr structure
+	if af == 10 && l == socklen_t(16) {
+		Xmemcpy(tls, bp+8, a, uint64(16))
+	} else if af == 2 && l == socklen_t(4) {
+		Xmemcpy(tls, bp+4, a, uint64(4))
+	} else {
+		*(*int32)(unsafe.Pointer(err)) = 3
+		return 22
+	}
+
+	// Align buffer and check for space for pointers and ip address
+	i = int32(uintptr_t(buf) & (uint64(unsafe.Sizeof(uintptr(0))) - uint64(1)))
+	if !(i != 0) {
+		i = int32(unsafe.Sizeof(uintptr(0)))
+	}
+	if buflen <= uint64(5)*uint64(unsafe.Sizeof(uintptr(0)))-uint64(i)+uint64(l) {
+		return 34
+	}
+	buf += uintptr(uint64(unsafe.Sizeof(uintptr(0))) - uint64(i))
+	buflen = buflen - (uint64(5)*uint64(unsafe.Sizeof(uintptr(0))) - uint64(i) + uint64(l))
+
+	(*hostent)(unsafe.Pointer(h)).h_addr_list = buf
+	buf += uintptr(uint64(2) * uint64(unsafe.Sizeof(uintptr(0))))
+	(*hostent)(unsafe.Pointer(h)).h_aliases = buf
+	buf += uintptr(uint64(2) * uint64(unsafe.Sizeof(uintptr(0))))
+
+	*(*uintptr)(unsafe.Pointer((*hostent)(unsafe.Pointer(h)).h_addr_list)) = buf
+	Xmemcpy(tls, *(*uintptr)(unsafe.Pointer((*hostent)(unsafe.Pointer(h)).h_addr_list)), a, uint64(l))
+	buf += uintptr(l)
+	*(*uintptr)(unsafe.Pointer((*hostent)(unsafe.Pointer(h)).h_addr_list + 1*8)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer((*hostent)(unsafe.Pointer(h)).h_aliases)) = buf
+	*(*uintptr)(unsafe.Pointer((*hostent)(unsafe.Pointer(h)).h_aliases + 1*8)) = uintptr(0)
+
+	switch Xgetnameinfo(tls, bp, sl, buf, uint32(buflen), uintptr(0), uint32(0), 0) {
+	case -3:
+		*(*int32)(unsafe.Pointer(err)) = 2
+		return 11
+	case -12:
+		return 34
+	default:
+		fallthrough
+	case -10:
+		fallthrough
+	case -11:
+		fallthrough
+	case -4:
+		*(*int32)(unsafe.Pointer(err)) = 3
+		return *(*int32)(unsafe.Pointer(X___errno_location(tls)))
+	case 0:
+		break
+	}
+
+	(*hostent)(unsafe.Pointer(h)).h_addrtype = af
+	(*hostent)(unsafe.Pointer(h)).h_length = int32(l)
+	(*hostent)(unsafe.Pointer(h)).h_name = *(*uintptr)(unsafe.Pointer((*hostent)(unsafe.Pointer(h)).h_aliases))
+	*(*uintptr)(unsafe.Pointer(res)) = h
+	return 0
+}
+
+func Xgethostbyname(tls *TLS, name uintptr) uintptr { /* gethostbyname.c:8:16: */
+	return Xgethostbyname2(tls, name, 2)
+}
+
+func Xgethostbyname2(tls *TLS, name uintptr, af int32) uintptr { /* gethostbyname2.c:8:16: */
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var size size_t = uint64(63)
+	// var res uintptr at bp, 8
+
+	var err int32
+	for __ccgo := true; __ccgo; __ccgo = err == 34 {
+		Xfree(tls, _sh1)
+		_sh1 = Xmalloc(tls, AssignAddUint64(&size, size+uint64(1)))
+		if !(_sh1 != 0) {
+			*(*int32)(unsafe.Pointer(X__h_errno_location(tls))) = 3
+			return uintptr(0)
+		}
+		err = Xgethostbyname2_r(tls, name, af, _sh1,
+			_sh1+uintptr(1)*32, size-size_t(unsafe.Sizeof(hostent{})), bp, X__h_errno_location(tls))
+	}
+	if err != 0 {
+		return uintptr(0)
+	}
+	return _sh1
+}
+
+var _sh1 uintptr /* gethostbyname2.c:10:24: */
+
+func Xgethostbyname2_r(tls *TLS, name uintptr, af int32, h uintptr, buf uintptr, buflen size_t, res uintptr, err uintptr) int32 { /* gethostbyname2_r.c:11:5: */
+	bp := tls.Alloc(1600)
+	defer tls.Free(1600)
+
+	// var addrs [48]address at bp, 1344
+
+	// var canon [256]int8 at bp+1344, 256
+
+	var i int32
+	var cnt int32
+	var align size_t
+	var need size_t
+
+	*(*uintptr)(unsafe.Pointer(res)) = uintptr(0)
+	cnt = X__lookup_name(tls, bp, bp+1344, name, af, 0x02)
+	if cnt < 0 {
+		switch cnt {
+		case -2:
+			*(*int32)(unsafe.Pointer(err)) = 1
+			return 2
+			fallthrough
+		case -3:
+			*(*int32)(unsafe.Pointer(err)) = 2
+			return 11
+			fallthrough
+		default:
+			fallthrough
+		case -4:
+			*(*int32)(unsafe.Pointer(err)) = 3
+			return 74
+			fallthrough
+		case -10:
+			fallthrough
+		case -11:
+			*(*int32)(unsafe.Pointer(err)) = 3
+			return *(*int32)(unsafe.Pointer(X___errno_location(tls)))
+		}
+	}
+
+	(*hostent)(unsafe.Pointer(h)).h_addrtype = af
+	(*hostent)(unsafe.Pointer(h)).h_length = func() int32 {
+		if af == 10 {
+			return 16
+		}
+		return 4
+	}()
+
+	// Align buffer
+	align = -uintptr_t(buf) & (uint64(unsafe.Sizeof(uintptr(0))) - uint64(1))
+
+	need = uint64(4) * uint64(unsafe.Sizeof(uintptr(0)))
+	need = need + uint64(cnt+1)*(uint64(unsafe.Sizeof(uintptr(0)))+uint64((*hostent)(unsafe.Pointer(h)).h_length))
+	need = need + (Xstrlen(tls, name) + uint64(1))
+	need = need + (Xstrlen(tls, bp+1344) + uint64(1))
+	need = need + align
+
+	if need > buflen {
+		return 34
+	}
+
+	buf += uintptr(align)
+	(*hostent)(unsafe.Pointer(h)).h_aliases = buf
+	buf += uintptr(uint64(3) * uint64(unsafe.Sizeof(uintptr(0))))
+	(*hostent)(unsafe.Pointer(h)).h_addr_list = buf
+	buf += uintptr(uint64(cnt+1) * uint64(unsafe.Sizeof(uintptr(0))))
+
+	for i = 0; i < cnt; i++ {
+		*(*uintptr)(unsafe.Pointer((*hostent)(unsafe.Pointer(h)).h_addr_list + uintptr(i)*8)) = buf
+		buf += uintptr((*hostent)(unsafe.Pointer(h)).h_length)
+		Xmemcpy(tls, *(*uintptr)(unsafe.Pointer((*hostent)(unsafe.Pointer(h)).h_addr_list + uintptr(i)*8)), bp+uintptr(i)*28+8, uint64((*hostent)(unsafe.Pointer(h)).h_length))
+	}
+	*(*uintptr)(unsafe.Pointer((*hostent)(unsafe.Pointer(h)).h_addr_list + uintptr(i)*8)) = uintptr(0)
+
+	(*hostent)(unsafe.Pointer(h)).h_name = AssignPtrUintptr((*hostent)(unsafe.Pointer(h)).h_aliases, buf)
+	Xstrcpy(tls, (*hostent)(unsafe.Pointer(h)).h_name, bp+1344)
+	buf += uintptr(Xstrlen(tls, (*hostent)(unsafe.Pointer(h)).h_name) + uint64(1))
+
+	if Xstrcmp(tls, (*hostent)(unsafe.Pointer(h)).h_name, name) != 0 {
+		*(*uintptr)(unsafe.Pointer((*hostent)(unsafe.Pointer(h)).h_aliases + 1*8)) = buf
+		Xstrcpy(tls, *(*uintptr)(unsafe.Pointer((*hostent)(unsafe.Pointer(h)).h_aliases + 1*8)), name)
+		buf += uintptr(Xstrlen(tls, *(*uintptr)(unsafe.Pointer((*hostent)(unsafe.Pointer(h)).h_aliases + 1*8))) + uint64(1))
+	} else {
+		*(*uintptr)(unsafe.Pointer((*hostent)(unsafe.Pointer(h)).h_aliases + 1*8)) = uintptr(0)
+	}
+
+	*(*uintptr)(unsafe.Pointer((*hostent)(unsafe.Pointer(h)).h_aliases + 2*8)) = uintptr(0)
+
+	*(*uintptr)(unsafe.Pointer(res)) = h
+	return 0
+}
+
+func Xgethostbyname_r(tls *TLS, name uintptr, h uintptr, buf uintptr, buflen size_t, res uintptr, err uintptr) int32 { /* gethostbyname_r.c:6:5: */
+	return Xgethostbyname2_r(tls, name, 2, h, buf, buflen, res, err)
+}
+
+type if_nameindex = struct {
+	if_index uint32
+	_        [4]byte
+	if_name  uintptr
+} /* if.h:12:1 */
+
+type ifaddr = struct {
+	ifa_addr struct {
+		sa_family sa_family_t
+		sa_data   [14]int8
+	}
+	ifa_ifu struct {
+		ifu_broadaddr struct {
+			sa_family sa_family_t
+			sa_data   [14]int8
+		}
+	}
+	ifa_ifp  uintptr
+	ifa_next uintptr
+} /* if.h:51:1 */
+
+type ifmap = struct {
+	mem_start uint64
+	mem_end   uint64
+	base_addr uint16
+	irq       uint8
+	dma       uint8
+	port      uint8
+	_         [3]byte
+} /* if.h:64:1 */
+
+type ifreq = struct {
+	ifr_ifrn struct{ ifrn_name [16]int8 }
+	ifr_ifru struct {
+		_         [0]uint64
+		ifru_addr struct {
+			sa_family sa_family_t
+			sa_data   [14]int8
+		}
+		_ [8]byte
+	}
+} /* if.h:76:1 */
+
+type ifconf = struct {
+	ifc_len  int32
+	_        [4]byte
+	ifc_ifcu struct{ ifcu_buf uintptr }
+} /* if.h:116:1 */
+
+type ns_sect = uint32 /* nameser.h:37:3 */
+
+type __ns_msg = struct {
+	_msg      uintptr
+	_eom      uintptr
+	_id       uint16_t
+	_flags    uint16_t
+	_counts   [4]uint16_t
+	_         [4]byte
+	_sections [4]uintptr
+	_sect     ns_sect
+	_rrnum    int32
+	_msg_ptr  uintptr
+} /* nameser.h:39:9 */
+
+type ns_msg = __ns_msg /* nameser.h:46:3 */
+
+type _ns_flagdata = struct {
+	mask  int32
+	shift int32
+} /* nameser.h:48:1 */
+
+type __ns_rr = struct {
+	name     [1025]int8
+	_        [1]byte
+	__type   uint16_t
+	rr_class uint16_t
+	_        [2]byte
+	ttl      uint32_t
+	rdlength uint16_t
+	_        [2]byte
+	rdata    uintptr
+} /* nameser.h:59:9 */
+
+type ns_rr = __ns_rr /* nameser.h:66:3 */
+
+type ns_flag = uint32 /* nameser.h:87:3 */
+
+type ns_opcode = uint32 /* nameser.h:96:3 */
+
+type ns_rcode = uint32 /* nameser.h:115:3 */
+
+type ns_update_operation = uint32 /* nameser.h:121:3 */
+
+type ns_tsig_key1 = struct {
+	name [1025]int8
+	alg  [1025]int8
+	_    [6]byte
+	data uintptr
+	len  int32
+	_    [4]byte
+} /* nameser.h:123:1 */
+
+type ns_tsig_key = ns_tsig_key1 /* nameser.h:128:28 */
+
+type ns_tcp_tsig_state1 = struct {
+	counter int32
+	_       [4]byte
+	key     uintptr
+	ctx     uintptr
+	sig     [512]uint8
+	siglen  int32
+	_       [4]byte
+} /* nameser.h:130:1 */
+
+type ns_tcp_tsig_state = ns_tcp_tsig_state1 /* nameser.h:137:34 */
+
+type ns_type = uint32 /* nameser.h:200:3 */
+
+type ns_class = uint32 /* nameser.h:219:3 */
+
+type ns_key_types = uint32 /* nameser.h:226:3 */
+
+type ns_cert_types = uint32 /* nameser.h:234:3 */
+
+type HEADER = struct {
+	_       [0]uint32
+	id      uint32 /* unsigned id: 16, unsigned rd: 1, unsigned tc: 1, unsigned aa: 1, unsigned opcode: 4, unsigned qr: 1, unsigned rcode: 4, unsigned cd: 1, unsigned ad: 1, unsigned unused: 1, unsigned ra: 1 */
+	qdcount uint32 /* unsigned qdcount: 16, unsigned ancount: 16 */
+	nscount uint32 /* unsigned nscount: 16, unsigned arcount: 16 */
+} /* nameser.h:353:3 */
+
+// unused; purely for broken apps
+type __res_state = struct {
+	retrans     int32
+	retry       int32
+	options     uint64
+	nscount     int32
+	nsaddr_list [3]struct {
+		sin_family sa_family_t
+		sin_port   in_port_t
+		sin_addr   struct{ s_addr in_addr_t }
+		sin_zero   [8]uint8_t
+	}
+	id        uint16
+	_         [2]byte
+	dnsrch    [7]uintptr
+	defdname  [256]int8
+	pfcode    uint64
+	ndots     uint32 /* unsigned ndots: 4, unsigned nsort: 4, unsigned ipv6_unavail: 1, unsigned unused: 23 */
+	_         [4]byte
+	sort_list [10]struct {
+		addr struct{ s_addr in_addr_t }
+		mask uint32_t
+	}
+	qhook       uintptr
+	rhook       uintptr
+	res_h_errno int32
+	_vcsock     int32
+	_flags      uint32
+	_           [4]byte
+	_u          struct {
+		_   [0]uint64
+		pad [52]int8
+		_   [4]byte
+	}
+} /* resolv.h:26:9 */
+
+// unused; purely for broken apps
+type res_state = uintptr /* resolv.h:62:3 */
+
+type res_sym = struct {
+	number    int32
+	_         [4]byte
+	name      uintptr
+	humanname uintptr
+} /* resolv.h:70:1 */
+
+func itoa(tls *TLS, p uintptr, x uint32) uintptr { /* getnameinfo.c:18:13: */
+	p += uintptr(uint64(3) * uint64(unsafe.Sizeof(int32(0))))
+	*(*int8)(unsafe.Pointer(PreDecUintptr(&p, 1))) = int8(0)
+	for __ccgo := true; __ccgo; __ccgo = x != 0 {
+		*(*int8)(unsafe.Pointer(PreDecUintptr(&p, 1))) = int8(uint32('0') + x%uint32(10))
+		x = x / uint32(10)
+	}
+	return p
+}
+
+func mkptr4(tls *TLS, s uintptr, ip uintptr) { /* getnameinfo.c:28:13: */
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
+
+	Xsprintf(tls, s, ts+25,
+		VaList(bp, int32(*(*uint8)(unsafe.Pointer(ip + 3))), int32(*(*uint8)(unsafe.Pointer(ip + 2))), int32(*(*uint8)(unsafe.Pointer(ip + 1))), int32(*(*uint8)(unsafe.Pointer(ip)))))
+}
+
+func mkptr6(tls *TLS, s uintptr, ip uintptr) { /* getnameinfo.c:34:13: */
+	var i int32
+	for i = 15; i >= 0; i-- {
+		*(*int8)(unsafe.Pointer(PostIncUintptr(&s, 1))) = _sxdigits[int32(*(*uint8)(unsafe.Pointer(ip + uintptr(i))))&15]
+		*(*int8)(unsafe.Pointer(PostIncUintptr(&s, 1))) = int8('.')
+		*(*int8)(unsafe.Pointer(PostIncUintptr(&s, 1))) = _sxdigits[int32(*(*uint8)(unsafe.Pointer(ip + uintptr(i))))>>4]
+		*(*int8)(unsafe.Pointer(PostIncUintptr(&s, 1))) = int8('.')
+	}
+	Xstrcpy(tls, s, ts+50)
+}
+
+var _sxdigits = *(*[17]int8)(unsafe.Pointer(ts + 59)) /* getnameinfo.c:36:20 */
+
+func reverse_hosts(tls *TLS, buf uintptr, a uintptr, scopeid uint32, family int32) { /* getnameinfo.c:45:13: */
+	bp := tls.Alloc(556)
+	defer tls.Free(556)
+
+	// var line [512]int8 at bp+16, 512
+
+	var p uintptr
+	var z uintptr
+	var _buf [1032]uint8
+	_ = _buf
+	// var atmp [16]uint8 at bp, 16
+
+	// var iplit address at bp+528, 28
+
+	//TODO FILE _f, *f = __fopen_rb_ca("/etc/hosts", &_f, _buf, sizeof _buf);
+	var f uintptr = Xfopen(tls, ts+76, ts+87)
+	if !(f != 0) {
+		return
+	}
+	if family == 2 {
+		Xmemcpy(tls, bp+uintptr(12), a, uint64(4))
+		Xmemcpy(tls, bp, ts+90, uint64(12))
+		a = bp /* &atmp[0] */
+	}
+	for Xfgets(tls, bp+16, int32(unsafe.Sizeof([512]int8{})), f) != 0 {
+		if AssignUintptr(&p, Xstrchr(tls, bp+16, '#')) != 0 {
+			*(*int8)(unsafe.Pointer(PostIncUintptr(&p, 1))) = int8('\n')
+			*(*int8)(unsafe.Pointer(p)) = int8(0)
+		}
+
+		for p = bp + 16; /* &line[0] */ *(*int8)(unsafe.Pointer(p)) != 0 && !(__isspace(tls, int32(*(*int8)(unsafe.Pointer(p)))) != 0); p++ {
+		}
+		*(*int8)(unsafe.Pointer(PostIncUintptr(&p, 1))) = int8(0)
+		if X__lookup_ipliteral(tls, bp+528, bp+16, 0) <= 0 {
+			continue
+		}
+
+		if (*address)(unsafe.Pointer(bp+528)).family == 2 {
+			Xmemcpy(tls, bp+528+8+uintptr(12), bp+528+8, uint64(4))
+			Xmemcpy(tls, bp+528+8, ts+90, uint64(12))
+			(*address)(unsafe.Pointer(bp + 528 /* &iplit */)).scopeid = uint32(0)
+		}
+
+		if Xmemcmp(tls, a, bp+528+8, uint64(16)) != 0 || (*address)(unsafe.Pointer(bp+528)).scopeid != scopeid {
+			continue
+		}
+
+		for ; *(*int8)(unsafe.Pointer(p)) != 0 && __isspace(tls, int32(*(*int8)(unsafe.Pointer(p)))) != 0; p++ {
+		}
+		for z = p; *(*int8)(unsafe.Pointer(z)) != 0 && !(__isspace(tls, int32(*(*int8)(unsafe.Pointer(z)))) != 0); z++ {
+		}
+		*(*int8)(unsafe.Pointer(z)) = int8(0)
+		if (int64(z)-int64(p))/1 < int64(256) {
+			Xmemcpy(tls, buf, p, uint64((int64(z)-int64(p))/1+int64(1)))
+			break
+		}
+	}
+	//TODO __fclose_ca(f);
+	Xfclose(tls, f)
+}
+
+func reverse_services(tls *TLS, buf uintptr, port int32, dgram int32) { /* getnameinfo.c:87:13: */
+	Xabort(tls) //TODO-
+	// unsigned long svport;
+	// char line[128], *p, *z;
+	// unsigned char _buf[1032];
+	// FILE _f, *f = __fopen_rb_ca("/etc/services", &_f, _buf, sizeof _buf);
+	// if (!f) return;
+	// while (fgets(line, sizeof line, f)) {
+	// 	if ((p=strchr(line, '#'))) *p++='\n', *p=0;
+
+	// 	for (p=line; *p && !isspace(*p); p++);
+	// 	if (!*p) continue;
+	// 	*p++ = 0;
+	// 	svport = strtoul(p, &z, 10);
+
+	// 	if (svport != port || z==p) continue;
+	// 	if (dgram && strncmp(z, "/udp", 4)) continue;
+	// 	if (!dgram && strncmp(z, "/tcp", 4)) continue;
+	// 	if (p-line > 32) continue;
+
+	// 	memcpy(buf, line, p-line);
+	// 	break;
+	// }
+	// __fclose_ca(f);
+}
+
+func Xgetnameinfo(tls *TLS, sa1 uintptr, sl socklen_t, node uintptr, nodelen socklen_t, serv uintptr, servlen socklen_t, flags int32) int32 { /* getnameinfo.c:125:5: */
+	bp := tls.Alloc(347)
+	defer tls.Free(347)
+
+	// var ptr [78]int8 at bp, 78
+
+	// var buf [256]int8 at bp+78, 256
+
+	// var num [13]int8 at bp+334, 13
+
+	var af int32 = int32((*sockaddr)(unsafe.Pointer(sa1)).sa_family)
+	var a uintptr
+	var scopeid uint32
+
+	switch af {
+	case 2:
+		a = sa1 + 4
+		if uint64(sl) < uint64(unsafe.Sizeof(sockaddr_in{})) {
+			return -6
+		}
+		mkptr4(tls, bp, a)
+		scopeid = uint32(0)
+		break
+	case 10:
+		a = sa1 + 8
+		if uint64(sl) < uint64(unsafe.Sizeof(sockaddr_in6{})) {
+			return -6
+		}
+		if Xmemcmp(tls, a, ts+90, uint64(12)) != 0 {
+			mkptr6(tls, bp, a)
+		} else {
+			mkptr4(tls, bp, a+uintptr(12))
+		}
+		scopeid = (*sockaddr_in6)(unsafe.Pointer(sa1)).sin6_scope_id
+		break
+	default:
+		return -6
+	}
+
+	if node != 0 && nodelen != 0 {
+		*(*int8)(unsafe.Pointer(bp + 78)) = int8(0)
+		if !(flags&0x01 != 0) {
+			reverse_hosts(tls, bp+78, a, scopeid, af)
+		}
+		if !(int32(*(*int8)(unsafe.Pointer(bp + 78))) != 0) && !(flags&0x01 != 0) {
+			Xabort(tls) //TODO-
+			// unsigned char query[18+PTR_MAX], reply[512];
+			// int qlen = __res_mkquery(0, ptr, 1, RR_PTR,
+			// 	0, 0, 0, query, sizeof query);
+			// query[3] = 0; /* don't need AD flag */
+			// int rlen = __res_send(query, qlen, reply, sizeof reply);
+			// buf[0] = 0;
+			// if (rlen > 0)
+			// 	__dns_parse(reply, rlen, dns_parse_callback, buf);
+		}
+		if !(int32(*(*int8)(unsafe.Pointer(bp + 78))) != 0) {
+			if flags&0x08 != 0 {
+				return -2
+			}
+			Xinet_ntop(tls, af, a, bp+78, uint32(unsafe.Sizeof([256]int8{})))
+			if scopeid != 0 {
+				Xabort(tls) //TODO-
+				// char *p = 0, tmp[IF_NAMESIZE+1];
+				// if (!(flags & NI_NUMERICSCOPE) &&
+				//     (IN6_IS_ADDR_LINKLOCAL(a) ||
+				//      IN6_IS_ADDR_MC_LINKLOCAL(a)))
+				// 	p = if_indextoname(scopeid, tmp+1);
+				// if (!p)
+				// 	p = itoa(num, scopeid);
+				// *--p = '%';
+				// strcat(buf, p);
+			}
+		}
+		if Xstrlen(tls, bp+78) >= size_t(nodelen) {
+			return -12
+		}
+		Xstrcpy(tls, node, bp+78)
+	}
+
+	if serv != 0 && servlen != 0 {
+		var p uintptr = bp + 78 /* buf */
+		var port int32 = int32(Xntohs(tls, (*sockaddr_in)(unsafe.Pointer(sa1)).sin_port))
+		*(*int8)(unsafe.Pointer(bp + 78)) = int8(0)
+		if !(flags&0x02 != 0) {
+			reverse_services(tls, bp+78, port, flags&0x10)
+		}
+		if !(int32(*(*int8)(unsafe.Pointer(p))) != 0) {
+			p = itoa(tls, bp+334, uint32(port))
+		}
+		if Xstrlen(tls, p) >= size_t(servlen) {
+			return -12
+		}
+		Xstrcpy(tls, serv, p)
+	}
+
+	return 0
+}
+
+var Xh_errno int32 /* h_errno.c:4:5: */
+
+func X__h_errno_location(tls *TLS) uintptr { /* h_errno.c:6:5: */
+	return uintptr(unsafe.Pointer(&Xh_errno))
+}
+
+func X__inet_aton(tls *TLS, s0 uintptr, dest uintptr) int32 { /* inet_aton.c:7:5: */
+	bp := tls.Alloc(40)
+	defer tls.Free(40)
+
+	var s uintptr = s0
+	var d uintptr = dest
+	*(*[4]uint64)(unsafe.Pointer(bp /* a */)) = [4]uint64{0: uint64(0)}
+	// var z uintptr at bp+32, 8
+
+	var i int32
+
+	for i = 0; i < 4; i++ {
+		*(*uint64)(unsafe.Pointer(bp + uintptr(i)*8)) = Xstrtoul(tls, s, bp+32, 0)
+		if *(*uintptr)(unsafe.Pointer(bp + 32)) == s || *(*int8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 32)))) != 0 && int32(*(*int8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 32))))) != '.' || !(func() int32 {
+			if 0 != 0 {
+				return Xisdigit(tls, int32(*(*int8)(unsafe.Pointer(s))))
+			}
+			return Bool32(uint32(*(*int8)(unsafe.Pointer(s)))-uint32('0') < uint32(10))
+		}() != 0) {
+			return 0
+		}
+		if !(int32(*(*int8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 32))))) != 0) {
+			break
+		}
+		s = *(*uintptr)(unsafe.Pointer(bp + 32)) + uintptr(1)
+	}
+	if i == 4 {
+		return 0
+	}
+	switch i {
+	case 0:
+		*(*uint64)(unsafe.Pointer(bp + 1*8)) = *(*uint64)(unsafe.Pointer(bp)) & uint64(0xffffff)
+		AssignShrPtrUint64(bp, int(24))
+		fallthrough
+	case 1:
+		*(*uint64)(unsafe.Pointer(bp + 2*8)) = *(*uint64)(unsafe.Pointer(bp + 1*8)) & uint64(0xffff)
+		AssignShrPtrUint64(bp+1*8, int(16))
+		fallthrough
+	case 2:
+		*(*uint64)(unsafe.Pointer(bp + 3*8)) = *(*uint64)(unsafe.Pointer(bp + 2*8)) & uint64(0xff)
+		AssignShrPtrUint64(bp+2*8, int(8))
+	}
+	for i = 0; i < 4; i++ {
+		if *(*uint64)(unsafe.Pointer(bp + uintptr(i)*8)) > uint64(255) {
+			return 0
+		}
+		*(*uint8)(unsafe.Pointer(d + uintptr(i))) = uint8(*(*uint64)(unsafe.Pointer(bp + uintptr(i)*8)))
+	}
+	return 1
+}
+
+func Xinet_ntop(tls *TLS, af int32, a0 uintptr, s uintptr, l socklen_t) uintptr { /* inet_ntop.c:7:12: */
+	bp := tls.Alloc(276)
+	defer tls.Free(276)
+
+	var a uintptr = a0
+	var i int32
+	var j int32
+	var max int32
+	var best int32
+	// var buf [100]int8 at bp+176, 100
+
+	switch af {
+	case 2:
+		if socklen_t(Xsnprintf(tls, s, uint64(l), ts+103, VaList(bp, int32(*(*uint8)(unsafe.Pointer(a))), int32(*(*uint8)(unsafe.Pointer(a + 1))), int32(*(*uint8)(unsafe.Pointer(a + 2))), int32(*(*uint8)(unsafe.Pointer(a + 3)))))) < l {
+			return s
+		}
+		break
+	case 10:
+		if Xmemcmp(tls, a, ts+90, uint64(12)) != 0 {
+			Xsnprintf(tls, bp+176, uint64(unsafe.Sizeof([100]int8{})),
+				ts+115,
+				VaList(bp+32, 256*int32(*(*uint8)(unsafe.Pointer(a)))+int32(*(*uint8)(unsafe.Pointer(a + 1))), 256*int32(*(*uint8)(unsafe.Pointer(a + 2)))+int32(*(*uint8)(unsafe.Pointer(a + 3))),
+					256*int32(*(*uint8)(unsafe.Pointer(a + 4)))+int32(*(*uint8)(unsafe.Pointer(a + 5))), 256*int32(*(*uint8)(unsafe.Pointer(a + 6)))+int32(*(*uint8)(unsafe.Pointer(a + 7))),
+					256*int32(*(*uint8)(unsafe.Pointer(a + 8)))+int32(*(*uint8)(unsafe.Pointer(a + 9))), 256*int32(*(*uint8)(unsafe.Pointer(a + 10)))+int32(*(*uint8)(unsafe.Pointer(a + 11))),
+					256*int32(*(*uint8)(unsafe.Pointer(a + 12)))+int32(*(*uint8)(unsafe.Pointer(a + 13))), 256*int32(*(*uint8)(unsafe.Pointer(a + 14)))+int32(*(*uint8)(unsafe.Pointer(a + 15)))))
+		} else {
+			Xsnprintf(tls, bp+176, uint64(unsafe.Sizeof([100]int8{})),
+				ts+139,
+				VaList(bp+96, 256*int32(*(*uint8)(unsafe.Pointer(a)))+int32(*(*uint8)(unsafe.Pointer(a + 1))), 256*int32(*(*uint8)(unsafe.Pointer(a + 2)))+int32(*(*uint8)(unsafe.Pointer(a + 3))),
+					256*int32(*(*uint8)(unsafe.Pointer(a + 4)))+int32(*(*uint8)(unsafe.Pointer(a + 5))), 256*int32(*(*uint8)(unsafe.Pointer(a + 6)))+int32(*(*uint8)(unsafe.Pointer(a + 7))),
+					256*int32(*(*uint8)(unsafe.Pointer(a + 8)))+int32(*(*uint8)(unsafe.Pointer(a + 9))), 256*int32(*(*uint8)(unsafe.Pointer(a + 10)))+int32(*(*uint8)(unsafe.Pointer(a + 11))),
+					int32(*(*uint8)(unsafe.Pointer(a + 12))), int32(*(*uint8)(unsafe.Pointer(a + 13))), int32(*(*uint8)(unsafe.Pointer(a + 14))), int32(*(*uint8)(unsafe.Pointer(a + 15)))))
+		}
+		// Replace longest /(^0|:)[:0]{2,}/ with "::"
+		i = AssignInt32(&best, 0)
+		max = 2
+		for ; *(*int8)(unsafe.Pointer(bp + 176 + uintptr(i))) != 0; i++ {
+			if i != 0 && int32(*(*int8)(unsafe.Pointer(bp + 176 + uintptr(i)))) != ':' {
+				continue
+			}
+			j = int32(Xstrspn(tls, bp+176+uintptr(i), ts+169))
+			if j > max {
+				best = i
+				max = j
+			}
+		}
+		if max > 3 {
+			*(*int8)(unsafe.Pointer(bp + 176 + uintptr(best))) = AssignPtrInt8(bp+176+uintptr(best+1), int8(':'))
+			Xmemmove(tls, bp+176+uintptr(best)+uintptr(2), bp+176+uintptr(best)+uintptr(max), uint64(i-best-max+1))
+		}
+		if Xstrlen(tls, bp+176) < size_t(l) {
+			Xstrcpy(tls, s, bp+176)
+			return s
+		}
+		break
+	default:
+		*(*int32)(unsafe.Pointer(X___errno_location(tls))) = 97
+		return uintptr(0)
+	}
+	*(*int32)(unsafe.Pointer(X___errno_location(tls))) = 28
+	return uintptr(0)
+}
+
+func hexval(tls *TLS, c uint32) int32 { /* inet_pton.c:7:12: */
+	if c-uint32('0') < uint32(10) {
+		return int32(c - uint32('0'))
+	}
+	c = c | uint32(32)
+	if c-uint32('a') < uint32(6) {
+		return int32(c - uint32('a') + uint32(10))
+	}
+	return -1
+}
+
+func Xinet_pton(tls *TLS, af int32, s uintptr, a0 uintptr) int32 { /* inet_pton.c:15:5: */
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	// var ip [8]uint16_t at bp, 16
+
+	var a uintptr = a0
+	var i int32
+	var j int32
+	var v int32
+	var d int32
+	var brk int32 = -1
+	var need_v4 int32 = 0
+
+	if af == 2 {
+		for i = 0; i < 4; i++ {
+			for v = AssignInt32(&j, 0); j < 3 && func() int32 {
+				if 0 != 0 {
+					return Xisdigit(tls, int32(*(*int8)(unsafe.Pointer(s + uintptr(j)))))
+				}
+				return Bool32(uint32(*(*int8)(unsafe.Pointer(s + uintptr(j))))-uint32('0') < uint32(10))
+			}() != 0; j++ {
+				v = 10*v + int32(*(*int8)(unsafe.Pointer(s + uintptr(j)))) - '0'
+			}
+			if j == 0 || j > 1 && int32(*(*int8)(unsafe.Pointer(s))) == '0' || v > 255 {
+				return 0
+			}
+			*(*uint8)(unsafe.Pointer(a + uintptr(i))) = uint8(v)
+			if int32(*(*int8)(unsafe.Pointer(s + uintptr(j)))) == 0 && i == 3 {
+				return 1
+			}
+			if int32(*(*int8)(unsafe.Pointer(s + uintptr(j)))) != '.' {
+				return 0
+			}
+			s += uintptr(j + 1)
+		}
+		return 0
+	} else if af != 10 {
+		*(*int32)(unsafe.Pointer(X___errno_location(tls))) = 97
+		return -1
+	}
+
+	if int32(*(*int8)(unsafe.Pointer(s))) == ':' && int32(*(*int8)(unsafe.Pointer(PreIncUintptr(&s, 1)))) != ':' {
+		return 0
+	}
+
+	for i = 0; ; i++ {
+		if int32(*(*int8)(unsafe.Pointer(s))) == ':' && brk < 0 {
+			brk = i
+			*(*uint16_t)(unsafe.Pointer(bp + uintptr(i&7)*2)) = uint16_t(0)
+			if !(int32(*(*int8)(unsafe.Pointer(PreIncUintptr(&s, 1)))) != 0) {
+				break
+			}
+			if i == 7 {
+				return 0
+			}
+			continue
+		}
+		for v = AssignInt32(&j, 0); j < 4 && AssignInt32(&d, hexval(tls, uint32(*(*int8)(unsafe.Pointer(s + uintptr(j)))))) >= 0; j++ {
+			v = 16*v + d
+		}
+		if j == 0 {
+			return 0
+		}
+		*(*uint16_t)(unsafe.Pointer(bp + uintptr(i&7)*2)) = uint16_t(v)
+		if !(int32(*(*int8)(unsafe.Pointer(s + uintptr(j)))) != 0) && (brk >= 0 || i == 7) {
+			break
+		}
+		if i == 7 {
+			return 0
+		}
+		if int32(*(*int8)(unsafe.Pointer(s + uintptr(j)))) != ':' {
+			if int32(*(*int8)(unsafe.Pointer(s + uintptr(j)))) != '.' || i < 6 && brk < 0 {
+				return 0
+			}
+			need_v4 = 1
+			i++
+			break
+		}
+		s += uintptr(j + 1)
+	}
+	if brk >= 0 {
+		Xmemmove(tls, bp+uintptr(brk)*2+uintptr(7)*2-uintptr(i)*2, bp+uintptr(brk)*2, uint64(2*(i+1-brk)))
+		for j = 0; j < 7-i; j++ {
+			*(*uint16_t)(unsafe.Pointer(bp + uintptr(brk+j)*2)) = uint16_t(0)
+		}
+	}
+	for j = 0; j < 8; j++ {
+		*(*uint8)(unsafe.Pointer(PostIncUintptr(&a, 1))) = uint8(int32(*(*uint16_t)(unsafe.Pointer(bp + uintptr(j)*2))) >> 8)
+		*(*uint8)(unsafe.Pointer(PostIncUintptr(&a, 1))) = uint8(*(*uint16_t)(unsafe.Pointer(bp + uintptr(j)*2)))
+	}
+	if need_v4 != 0 && Xinet_pton(tls, 2, s, a-uintptr(4)) <= 0 {
+		return 0
+	}
+	return 1
+}
+
+func X__lookup_ipliteral(tls *TLS, buf uintptr, name uintptr, family int32) int32 { /* lookup_ipliteral.c:12:5: */
+	bp := tls.Alloc(96)
+	defer tls.Free(96)
+
+	// var a4 in_addr at bp, 4
+
+	// var a6 in6_addr at bp+68, 16
+
+	if X__inet_aton(tls, name, bp) > 0 {
+		if family == 10 { // wrong family
+			return -2
+		}
+		Xmemcpy(tls, buf+8, bp, uint64(unsafe.Sizeof(in_addr{})))
+		(*address)(unsafe.Pointer(buf)).family = 2
+		(*address)(unsafe.Pointer(buf)).scopeid = uint32(0)
+		return 1
+	}
+	// var tmp [64]int8 at bp+4, 64
+
+	var p uintptr = Xstrchr(tls, name, '%')
+	// var z uintptr at bp+88, 8
+
+	var scopeid uint64 = uint64(0)
+	if p != 0 && (int64(p)-int64(name))/1 < int64(64) {
+		Xmemcpy(tls, bp+4, name, uint64((int64(p)-int64(name))/1))
+		*(*int8)(unsafe.Pointer(bp + 4 + uintptr((int64(p)-int64(name))/1))) = int8(0)
+		name = bp + 4 /* &tmp[0] */
+	}
+
+	if Xinet_pton(tls, 10, name, bp+68) <= 0 {
+		return 0
+	}
+	if family == 2 { // wrong family
+		return -2
+	}
+
+	Xmemcpy(tls, buf+8, bp+68, uint64(unsafe.Sizeof(in6_addr{})))
+	(*address)(unsafe.Pointer(buf)).family = 10
+	if p != 0 {
+		if func() int32 {
+			if 0 != 0 {
+				return Xisdigit(tls, int32(*(*int8)(unsafe.Pointer(PreIncUintptr(&p, 1)))))
+			}
+			return Bool32(uint32(*(*int8)(unsafe.Pointer(PreIncUintptr(&p, 1))))-uint32('0') < uint32(10))
+		}() != 0 {
+			scopeid = Xstrtoull(tls, p, bp+88, 10)
+		} else {
+			*(*uintptr)(unsafe.Pointer(bp + 88 /* z */)) = p - uintptr(1)
+		}
+		if *(*int8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 88)))) != 0 {
+			Xabort(tls) //TODO-
+			// if (!IN6_IS_ADDR_LINKLOCAL(&a6) &&
+			//     !IN6_IS_ADDR_MC_LINKLOCAL(&a6))
+			// 	return EAI_NONAME;
+			// scopeid = if_nametoindex(p);
+			// if (!scopeid) return EAI_NONAME;
+		}
+		if scopeid > uint64(0xffffffff) {
+			return -2
+		}
+	}
+	(*address)(unsafe.Pointer(buf)).scopeid = uint32(scopeid)
+	return 1
+}
+
+func is_valid_hostname(tls *TLS, host uintptr) int32 { /* lookup_name.c:18:12: */
+	var s uintptr
+	//TODO if (strnlen(host, 255)-1 >= 254 || mbstowcs(0, host, 0) == -1) return 0;
+	if Xstrnlen(tls, host, uint64(255))-uint64(1) >= uint64(254) {
+		return 0
+	}
+	for s = host; int32(*(*uint8)(unsafe.Pointer(s))) >= 0x80 || int32(*(*uint8)(unsafe.Pointer(s))) == '.' || int32(*(*uint8)(unsafe.Pointer(s))) == '-' || Xisalnum(tls, int32(*(*uint8)(unsafe.Pointer(s)))) != 0; s++ {
+	}
+	return BoolInt32(!(*(*uint8)(unsafe.Pointer(s)) != 0))
+}
+
+var Xzero_struct_address address /* lookup_name.c:27:16: */
+
+func name_from_null(tls *TLS, buf uintptr, name uintptr, family int32, flags int32) int32 { /* lookup_name.c:29:12: */
+	var cnt int32 = 0
+	if name != 0 {
+		return 0
+	}
+	if flags&0x01 != 0 {
+		//TODO if (family != AF_INET6)
+		//TODO 	buf[cnt++] = (struct address){ .family = AF_INET };
+		if family != 10 {
+			var x = Xzero_struct_address
+			x.family = 2
+			*(*address)(unsafe.Pointer(buf + uintptr(PostIncInt32(&cnt, 1))*28)) = x
+		}
+		//TODO if (family != AF_INET)
+		//TODO 	buf[cnt++] = (struct address){ .family = AF_INET6 };
+		if family != 2 {
+			var x = Xzero_struct_address
+			x.family = 10
+			*(*address)(unsafe.Pointer(buf + uintptr(PostIncInt32(&cnt, 1))*28)) = x
+		}
+	} else {
+		Xabort(tls) //TODO-
+		// 	if (family != AF_INET6)
+		// 		buf[cnt++] = (struct address){ .family = AF_INET, .addr = { 127,0,0,1 } };
+		// 	if (family != AF_INET)
+		// 		buf[cnt++] = (struct address){ .family = AF_INET6, .addr = { [15] = 1 } };
+	}
+	return cnt
+}
+
+func name_from_numeric(tls *TLS, buf uintptr, name uintptr, family int32) int32 { /* lookup_name.c:58:12: */
+	return X__lookup_ipliteral(tls, buf, name, family)
+}
+
+func name_from_hosts(tls *TLS, buf uintptr, canon uintptr, name uintptr, family int32) int32 { /* lookup_name.c:63:12: */
+	bp := tls.Alloc(512)
+	defer tls.Free(512)
+
+	// var line [512]int8 at bp, 512
+
+	var l size_t = Xstrlen(tls, name)
+	var cnt int32 = 0
+	var badfam int32 = 0
+	var _buf [1032]uint8
+	_ = _buf
+	//TODO FILE _f, *f = __fopen_rb_ca("/etc/hosts", &_f, _buf, sizeof _buf);
+	var _f FILE
+	_ = _f
+	var f uintptr = Xfopen(tls, ts+76, ts+87)
+	if !(f != 0) {
+		switch *(*int32)(unsafe.Pointer(X___errno_location(tls))) {
+		case 2:
+			fallthrough
+		case 20:
+			fallthrough
+		case 13:
+			return 0
+			fallthrough
+		default:
+			return -11
+		}
+	}
+	for Xfgets(tls, bp, int32(unsafe.Sizeof([512]int8{})), f) != 0 && cnt < 48 {
+		var p uintptr
+		var z uintptr
+
+		if AssignUintptr(&p, Xstrchr(tls, bp, '#')) != 0 {
+			*(*int8)(unsafe.Pointer(PostIncUintptr(&p, 1))) = int8('\n')
+			*(*int8)(unsafe.Pointer(p)) = int8(0)
+		}
+		for p = bp + uintptr(1); AssignUintptr(&p, Xstrstr(tls, p, name)) != 0 && (!(__isspace(tls, int32(*(*int8)(unsafe.Pointer(p + UintptrFromInt32(-1))))) != 0) || !(__isspace(tls, int32(*(*int8)(unsafe.Pointer(p + uintptr(l))))) != 0)); p++ {
+		}
+		if !(p != 0) {
+			continue
+		}
+
+		// Isolate IP address to parse
+		for p = bp; /* &line[0] */ *(*int8)(unsafe.Pointer(p)) != 0 && !(__isspace(tls, int32(*(*int8)(unsafe.Pointer(p)))) != 0); p++ {
+		}
+		*(*int8)(unsafe.Pointer(PostIncUintptr(&p, 1))) = int8(0)
+		switch name_from_numeric(tls, buf+uintptr(cnt)*28, bp, family) {
+		case 1:
+			cnt++
+			break
+		case 0:
+			continue
+		default:
+			badfam = -2
+			continue
+		}
+
+		// Extract first name as canonical name
+		for ; *(*int8)(unsafe.Pointer(p)) != 0 && __isspace(tls, int32(*(*int8)(unsafe.Pointer(p)))) != 0; p++ {
+		}
+		for z = p; *(*int8)(unsafe.Pointer(z)) != 0 && !(__isspace(tls, int32(*(*int8)(unsafe.Pointer(z)))) != 0); z++ {
+		}
+		*(*int8)(unsafe.Pointer(z)) = int8(0)
+		if is_valid_hostname(tls, p) != 0 {
+			Xmemcpy(tls, canon, p, uint64((int64(z)-int64(p))/1+int64(1)))
+		}
+	}
+	//TODO __fclose_ca(f);
+	Xfclose(tls, f)
+	if cnt != 0 {
+		return cnt
+	}
+	return badfam
+}
+
+type dpc_ctx = struct {
+	addrs uintptr
+	canon uintptr
+	cnt   int32
+	_     [4]byte
+} /* lookup_name.c:112:1 */
+
+func name_from_dns_search(tls *TLS, buf uintptr, canon uintptr, name uintptr, family int32) int32 { /* lookup_name.c:191:12: */
+	return -1 //TODO-
+	Xabort(tls)
+	return int32(0) //TODO-
+	// char search[256];
+	// struct resolvconf conf;
+	// size_t l, dots;
+	// char *p, *z;
+
+	// if (__get_resolv_conf(&conf, search, sizeof search) < 0) return -1;
+
+	// /* Count dots, suppress search when >=ndots or name ends in
+	//  * a dot, which is an explicit request for global scope. */
+	// for (dots=l=0; name[l]; l++) if (name[l]=='.') dots++;
+	// if (dots >= conf.ndots || name[l-1]=='.') *search = 0;
+
+	// /* Strip final dot for canon, fail if multiple trailing dots. */
+	// if (name[l-1]=='.') l--;
+	// if (!l || name[l-1]=='.') return EAI_NONAME;
+
+	// /* This can never happen; the caller already checked length. */
+	// if (l >= 256) return EAI_NONAME;
+
+	// /* Name with search domain appended is setup in canon[]. This both
+	//  * provides the desired default canonical name (if the requested
+	//  * name is not a CNAME record) and serves as a buffer for passing
+	//  * the full requested name to name_from_dns. */
+	// memcpy(canon, name, l);
+	// canon[l] = '.';
+
+	// for (p=search; *p; p=z) {
+	// 	for (; isspace(*p); p++);
+	// 	for (z=p; *z && !isspace(*z); z++);
+	// 	if (z==p) break;
+	// 	if (z-p < 256 - l - 1) {
+	// 		memcpy(canon+l+1, p, z-p);
+	// 		canon[z-p+1+l] = 0;
+	// 		int cnt = name_from_dns(buf, canon, canon, family, &conf);
+	// 		if (cnt) return cnt;
+	// 	}
+	// }
+
+	// canon[l] = 0;
+	// return name_from_dns(buf, canon, name, family, &conf);
+}
+
+type policy = struct {
+	addr  [16]uint8
+	len   uint8
+	mask  uint8
+	prec  uint8
+	label uint8
+} /* lookup_name.c:237:14 */
+
+var defpolicy = [6]policy{
+	{addr: *(*[16]uint8)(unsafe.Pointer(ts + 172)), len: uint8(15), mask: uint8(0xff), prec: uint8(50)},
+	{addr: *(*[16]uint8)(unsafe.Pointer(ts + 189)), len: uint8(11), mask: uint8(0xff), prec: uint8(35), label: uint8(4)},
+	{addr: *(*[16]uint8)(unsafe.Pointer(ts + 205)), len: uint8(1), mask: uint8(0xff), prec: uint8(30), label: uint8(2)},
+	{addr: *(*[16]uint8)(unsafe.Pointer(ts + 221)), len: uint8(3), mask: uint8(0xff), prec: uint8(5), label: uint8(5)},
+	{addr: *(*[16]uint8)(unsafe.Pointer(ts + 237)), mask: uint8(0xfe), prec: uint8(3), label: uint8(13)},
+	// Last rule must match all addresses to stop loop.
+	{addr: *(*[16]uint8)(unsafe.Pointer(ts + 253)), prec: uint8(40), label: uint8(1)},
+} /* lookup_name.c:241:3 */
+
+func policyof(tls *TLS, a uintptr) uintptr { /* lookup_name.c:259:28: */
+	var i int32
+	for i = 0; ; i++ {
+		if Xmemcmp(tls, a, uintptr(unsafe.Pointer(&defpolicy))+uintptr(i)*20, uint64(defpolicy[i].len)) != 0 {
+			continue
+		}
+		if int32(*(*uint8_t)(unsafe.Pointer(a + uintptr(defpolicy[i].len))))&int32(defpolicy[i].mask) !=
+			int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&defpolicy)) + uintptr(i)*20 + uintptr(defpolicy[i].len)))) {
+			continue
+		}
+		return uintptr(unsafe.Pointer(&defpolicy)) + uintptr(i)*20
+	}
+	return uintptr(0)
+}
+
+func labelof(tls *TLS, a uintptr) int32 { /* lookup_name.c:272:12: */
+	return int32((*policy)(unsafe.Pointer(policyof(tls, a))).label)
+}
+
+func scopeof(tls *TLS, a uintptr) int32 { /* lookup_name.c:277:12: */
+	if int32(*(*uint8_t)(unsafe.Pointer(a))) == 0xff {
+		return int32(*(*uint8_t)(unsafe.Pointer(a + 1))) & 15
+	}
+	if int32(*(*uint8_t)(unsafe.Pointer(a))) == 0xfe && int32(*(*uint8_t)(unsafe.Pointer(a + 1)))&0xc0 == 0x80 {
+		return 2
+	}
+	if *(*uint32_t)(unsafe.Pointer(a)) == uint32_t(0) && *(*uint32_t)(unsafe.Pointer(a + 1*4)) == uint32_t(0) && *(*uint32_t)(unsafe.Pointer(a + 2*4)) == uint32_t(0) && int32(*(*uint8_t)(unsafe.Pointer(a + 12))) == 0 && int32(*(*uint8_t)(unsafe.Pointer(a + 13))) == 0 && int32(*(*uint8_t)(unsafe.Pointer(a + 14))) == 0 && int32(*(*uint8_t)(unsafe.Pointer(a + 15))) == 1 {
+		return 2
+	}
+	if int32(*(*uint8_t)(unsafe.Pointer(a))) == 0xfe && int32(*(*uint8_t)(unsafe.Pointer(a + 1)))&0xc0 == 0xc0 {
+		return 5
+	}
+	return 14
+}
+
+func prefixmatch(tls *TLS, s uintptr, d uintptr) int32 { /* lookup_name.c:286:12: */
+	// FIXME: The common prefix length should be limited to no greater
+	// than the nominal length of the prefix portion of the source
+	// address. However the definition of the source prefix length is
+	// not clear and thus this limiting is not yet implemented.
+	var i uint32
+	for i = uint32(0); i < uint32(128) && !((int32(*(*uint8_t)(unsafe.Pointer(s /* &.__in6_union */ /* &.__s6_addr */ + uintptr(i/uint32(8)))))^int32(*(*uint8_t)(unsafe.Pointer(d /* &.__in6_union */ /* &.__s6_addr */ + uintptr(i/uint32(8))))))&(int32(128)>>(i%uint32(8))) != 0); i++ {
+	}
+	return int32(i)
+}
+
+func addrcmp(tls *TLS, _a uintptr, _b uintptr) int32 { /* lookup_name.c:305:12: */
+	var a uintptr = _a
+	var b uintptr = _b
+	return (*address)(unsafe.Pointer(b)).sortkey - (*address)(unsafe.Pointer(a)).sortkey
+}
+
+func X__lookup_name(tls *TLS, buf uintptr, canon uintptr, name uintptr, family int32, flags int32) int32 { /* lookup_name.c:311:5: */
+	bp := tls.Alloc(92)
+	defer tls.Free(92)
+
+	var cnt int32 = 0
+	var i int32
+	var j int32
+	_ = j
+
+	*(*int8)(unsafe.Pointer(canon)) = int8(0)
+	if name != 0 {
+		// reject empty name and check len so it fits into temp bufs
+		var l size_t = Xstrnlen(tls, name, uint64(255))
+		if l-uint64(1) >= uint64(254) {
+			return -2
+		}
+		Xmemcpy(tls, canon, name, l+uint64(1))
+	}
+
+	// Procedurally, a request for v6 addresses with the v4-mapped
+	// flag set is like a request for unspecified family, followed
+	// by filtering of the results.
+	if flags&0x08 != 0 {
+		if family == 10 {
+			family = 0
+		} else {
+			flags = flags - 0x08
+		}
+	}
+
+	// Try each backend until there's at least one result.
+	cnt = name_from_null(tls, buf, name, family, flags)
+	if !(cnt != 0) {
+		cnt = name_from_numeric(tls, buf, name, family)
+	}
+	if !(cnt != 0) && !(flags&0x04 != 0) {
+		cnt = name_from_hosts(tls, buf, canon, name, family)
+		if !(cnt != 0) {
+			cnt = name_from_dns_search(tls, buf, canon, name, family)
+		}
+	}
+	if cnt <= 0 {
+		if cnt != 0 {
+			return cnt
+		}
+		return -2
+	}
+
+	// Filter/transform results for v4-mapped lookup, if requested.
+	if flags&0x08 != 0 {
+		Xabort(tls) //TODO-
+		// 	if (!(flags & AI_ALL)) {
+		// 		/* If any v6 results exist, remove v4 results. */
+		// 		for (i=0; i<cnt && buf[i].family != AF_INET6; i++);
+		// 		if (i<cnt) {
+		// 			for (j=0; i<cnt; i++) {
+		// 				if (buf[i].family == AF_INET6)
+		// 					buf[j++] = buf[i];
+		// 			}
+		// 			cnt = i = j;
+		// 		}
+		// 	}
+		// 	/* Translate any remaining v4 results to v6 */
+		// 	for (i=0; i<cnt; i++) {
+		// 		if (buf[i].family != AF_INET) continue;
+		// 		memcpy(buf[i].addr+12, buf[i].addr, 4);
+		// 		memcpy(buf[i].addr, "\0\0\0\0\0\0\0\0\0\0\xff\xff", 12);
+		// 		buf[i].family = AF_INET6;
+		// 	}
+	}
+
+	// No further processing is needed if there are fewer than 2
+	// results or if there are only IPv4 results.
+	if cnt < 2 || family == 2 {
+		return cnt
+	}
+	for i = 0; i < cnt; i++ {
+		if (*address)(unsafe.Pointer(buf+uintptr(i)*28)).family != 2 {
+			break
+		}
+	}
+	if i == cnt {
+		return cnt
+	}
+	var cs int32
+	_ = cs
+	//TODO pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+
+	// The following implements a subset of RFC 3484/6724 destination
+	// address selection by generating a single 31-bit sort key for
+	// each address. Rules 3, 4, and 7 are omitted for having
+	// excessive runtime and code size cost and dubious benefit.
+	// So far the label/precedence table cannot be customized.
+	for i = 0; i < cnt; i++ {
+		var family int32 = (*address)(unsafe.Pointer(buf + uintptr(i)*28)).family
+		var key int32 = 0
+		*(*sockaddr_in6)(unsafe.Pointer(bp + 28 /* sa6 */)) = sockaddr_in6{}
+		*(*sockaddr_in6)(unsafe.Pointer(bp /* da6 */)) = sockaddr_in6{sin6_family: sa_family_t(10), sin6_port: in_port_t(65535), sin6_scope_id: (*address)(unsafe.Pointer(buf + uintptr(i)*28)).scopeid}
+		*(*sockaddr_in)(unsafe.Pointer(bp + 72 /* sa4 */)) = sockaddr_in{}
+		*(*sockaddr_in)(unsafe.Pointer(bp + 56 /* da4 */)) = sockaddr_in{sin_family: sa_family_t(2), sin_port: in_port_t(65535)}
+		var sa1 uintptr
+		var da uintptr
+		// var salen socklen_t at bp+88, 4
+
+		var dalen socklen_t
+		if family == 10 {
+			Xmemcpy(tls, bp+8, buf+uintptr(i)*28+8, uint64(16))
+			da = bp /* &da6 */
+			dalen = socklen_t(unsafe.Sizeof(sockaddr_in6{}))
+			sa1 = bp + 28 /* &sa6 */
+			*(*socklen_t)(unsafe.Pointer(bp + 88 /* salen */)) = socklen_t(unsafe.Sizeof(sockaddr_in6{}))
+		} else {
+			Xmemcpy(tls, bp+28+8,
+				ts+90, uint64(12))
+			Xmemcpy(tls, bp+8+uintptr(12), buf+uintptr(i)*28+8, uint64(4))
+			Xmemcpy(tls, bp+8,
+				ts+90, uint64(12))
+			Xmemcpy(tls, bp+8+uintptr(12), buf+uintptr(i)*28+8, uint64(4))
+			Xmemcpy(tls, bp+56+4, buf+uintptr(i)*28+8, uint64(4))
+			da = bp + 56 /* &da4 */
+			dalen = socklen_t(unsafe.Sizeof(sockaddr_in{}))
+			sa1 = bp + 72 /* &sa4 */
+			*(*socklen_t)(unsafe.Pointer(bp + 88 /* salen */)) = socklen_t(unsafe.Sizeof(sockaddr_in{}))
+		}
+		var dpolicy uintptr = policyof(tls, bp+8)
+		var dscope int32 = scopeof(tls, bp+8)
+		var dlabel int32 = int32((*policy)(unsafe.Pointer(dpolicy)).label)
+		var dprec int32 = int32((*policy)(unsafe.Pointer(dpolicy)).prec)
+		var prefixlen int32 = 0
+		var fd int32 = Xsocket(tls, family, 2|02000000, 17)
+		if fd >= 0 {
+			if !(Xconnect(tls, fd, da, dalen) != 0) {
+				key = key | 0x40000000
+				if !(Xgetsockname(tls, fd, sa1, bp+88) != 0) {
+					if family == 2 {
+						Xmemcpy(tls,
+							bp+28+8+uintptr(12),
+							bp+72+4, uint64(4))
+					}
+					if dscope == scopeof(tls, bp+28+8) {
+						key = key | 0x20000000
+					}
+					if dlabel == labelof(tls, bp+28+8) {
+						key = key | 0x10000000
+					}
+					prefixlen = prefixmatch(tls, bp+28+8,
+						bp+8)
+				}
+			}
+			Xclose(tls, fd)
+		}
+		key = key | dprec<<20
+		key = key | (15-dscope)<<16
+		key = key | prefixlen<<8
+		key = key | (48-i)<<0
+		(*address)(unsafe.Pointer(buf + uintptr(i)*28)).sortkey = key
+	}
+	Xqsort(tls, buf, uint64(cnt), uint64(unsafe.Sizeof(address{})), *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*TLS, uintptr, uintptr) int32
+	}{addrcmp})))
+
+	//TODO pthread_setcancelstate(cs, 0);
+
+	return cnt
+}
+
+func X__lookup_serv(tls *TLS, buf uintptr, name uintptr, proto int32, socktype int32, flags int32) int32 { /* lookup_serv.c:12:5: */
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var line [128]int8
+	_ = line
+	var cnt int32 = 0
+	var p uintptr
+	_ = p
+	*(*uintptr)(unsafe.Pointer(bp /* z */)) = ts + 13 /* "" */
+	var port uint64 = uint64(0)
+
+	switch socktype {
+	case 1:
+		switch proto {
+		case 0:
+			proto = 6
+			fallthrough
+		case 6:
+			break
+		default:
+			return -8
+		}
+		break
+	case 2:
+		switch proto {
+		case 0:
+			proto = 17
+			fallthrough
+		case 17:
+			break
+		default:
+			return -8
+		}
+		fallthrough
+	case 0:
+		break
+	default:
+		if name != 0 {
+			return -8
+		}
+		(*service)(unsafe.Pointer(buf)).port = uint16_t(0)
+		(*service)(unsafe.Pointer(buf)).proto = uint8(proto)
+		(*service)(unsafe.Pointer(buf)).socktype = uint8(socktype)
+		return 1
+	}
+
+	if name != 0 {
+		if !(int32(*(*int8)(unsafe.Pointer(name))) != 0) {
+			return -8
+		}
+		port = Xstrtoul(tls, name, bp, 10)
+	}
+	if !(int32(*(*int8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) != 0) {
+		if port > uint64(65535) {
+			return -8
+		}
+		if proto != 17 {
+			(*service)(unsafe.Pointer(buf + uintptr(cnt)*4)).port = uint16_t(port)
+			(*service)(unsafe.Pointer(buf + uintptr(cnt)*4)).socktype = uint8(1)
+			(*service)(unsafe.Pointer(buf + uintptr(PostIncInt32(&cnt, 1))*4)).proto = uint8(6)
+		}
+		if proto != 6 {
+			(*service)(unsafe.Pointer(buf + uintptr(cnt)*4)).port = uint16_t(port)
+			(*service)(unsafe.Pointer(buf + uintptr(cnt)*4)).socktype = uint8(2)
+			(*service)(unsafe.Pointer(buf + uintptr(PostIncInt32(&cnt, 1))*4)).proto = uint8(17)
+		}
+		return cnt
+	}
+
+	if flags&0x400 != 0 {
+		return -2
+	}
+
+	var l size_t = Xstrlen(tls, name)
+	_ = l
+
+	Xabort(tls) //TODO-
+	// unsigned char _buf[1032];
+	// FILE _f, *f = __fopen_rb_ca("/etc/services", &_f, _buf, sizeof _buf);
+	// if (!f) switch (errno) {
+	// case ENOENT:
+	// case ENOTDIR:
+	// case EACCES:
+	// 	return EAI_SERVICE;
+	// default:
+	// 	return EAI_SYSTEM;
+	// }
+
+	Xabort(tls) //TODO-
+	// while (fgets(line, sizeof line, f) && cnt < MAXSERVS) {
+	// 	if ((p=strchr(line, '#'))) *p++='\n', *p=0;
+
+	// 	/* Find service name */
+	// 	for(p=line; (p=strstr(p, name)); p++) {
+	// 		if (p>line && !isspace(p[-1])) continue;
+	// 		if (p[l] && !isspace(p[l])) continue;
+	// 		break;
+	// 	}
+	// 	if (!p) continue;
+
+	// 	/* Skip past canonical name at beginning of line */
+	// 	for (p=line; *p && !isspace(*p); p++);
+
+	// 	port = strtoul(p, &z, 10);
+	// 	if (port > 65535 || z==p) continue;
+	// 	if (!strncmp(z, "/udp", 4)) {
+	// 		if (proto == IPPROTO_TCP) continue;
+	// 		buf[cnt].port = port;
+	// 		buf[cnt].socktype = SOCK_DGRAM;
+	// 		buf[cnt++].proto = IPPROTO_UDP;
+	// 	}
+	// 	if (!strncmp(z, "/tcp", 4)) {
+	// 		if (proto == IPPROTO_UDP) continue;
+	// 		buf[cnt].port = port;
+	// 		buf[cnt].socktype = SOCK_STREAM;
+	// 		buf[cnt++].proto = IPPROTO_TCP;
+	// 	}
+	// }
+	// __fclose_ca(f);
+	// return cnt > 0 ? cnt : EAI_SERVICE;
+	Xabort(tls)
+	return int32(0) //TODO-
+}
+
+func temper(tls *TLS, x uint32) uint32 { /* rand_r.c:3:17: */
+	x = x ^ x>>11
+	x = x ^ x<<7&0x9D2C5680
+	x = x ^ x<<15&0xEFC60000
+	x = x ^ x>>18
+	return x
+}
+
+func Xrand_r(tls *TLS, seed uintptr) int32 { /* rand_r.c:12:5: */
+	return int32(temper(tls, AssignPtrUint32(seed, *(*uint32)(unsafe.Pointer(seed))*uint32(1103515245)+uint32(12345))) / uint32(2))
+}
+
+func X__lockfile(tls *TLS, f uintptr) int32 { /* __lockfile.c:4:5: */
+	var owner int32 = (*FILE)(unsafe.Pointer(f)).lock
+	var tid int32 = (*__pthread)(unsafe.Pointer(__pthread_self(tls))).tid
+	if owner&CplInt32(0x40000000) == tid {
+		return 0
+	}
+	owner = a_cas(tls, f+140, 0, tid)
+	if !(owner != 0) {
+		return 1
+	}
+	for AssignInt32(&owner, a_cas(tls, f+140, 0, tid|0x40000000)) != 0 {
+		if owner&0x40000000 != 0 || a_cas(tls, f+140, owner, owner|0x40000000) == owner {
+			__futexwait(tls, f+140, owner|0x40000000, 1)
+		}
+	}
+	return 1
+}
+
+func X__unlockfile(tls *TLS, f uintptr) { /* __lockfile.c:19:6: */
+	if a_swap(tls, f+140, 0)&0x40000000 != 0 {
+		__wake(tls, f+140, 1, 1)
+	}
+}
+
+func X__toread(tls *TLS, f uintptr) int32 { /* __toread.c:3:5: */
+	*(*int32)(unsafe.Pointer(f + 136)) |= (*FILE)(unsafe.Pointer(f)).mode - 1
+	if (*FILE)(unsafe.Pointer(f)).wpos != (*FILE)(unsafe.Pointer(f)).wbase {
+		(*struct {
+			f func(*TLS, uintptr, uintptr, size_t) size_t
+		})(unsafe.Pointer(&struct{ uintptr }{(*FILE)(unsafe.Pointer(f)).write})).f(tls, f, uintptr(0), uint64(0))
+	}
+	(*FILE)(unsafe.Pointer(f)).wpos = AssignPtrUintptr(f+56, AssignPtrUintptr(f+32, uintptr(0)))
+	if (*FILE)(unsafe.Pointer(f)).flags&uint32(4) != 0 {
+		*(*uint32)(unsafe.Pointer(f)) |= uint32(32)
+		return -1
+	}
+	(*FILE)(unsafe.Pointer(f)).rpos = AssignPtrUintptr(f+16, (*FILE)(unsafe.Pointer(f)).buf+uintptr((*FILE)(unsafe.Pointer(f)).buf_size))
+	if (*FILE)(unsafe.Pointer(f)).flags&uint32(16) != 0 {
+		return -1
+	}
+	return 0
+}
+
+func X__toread_needs_stdio_exit(tls *TLS) { /* __toread.c:16:13: */
+	X__builtin_abort(tls) //TODO-
+	// __stdio_exit_needed();
+}
+
+// This function assumes it will never be called if there is already
+// data buffered for reading.
+
+func X__uflow(tls *TLS, f uintptr) int32 { /* __uflow.c:6:5: */
+	bp := tls.Alloc(1)
+	defer tls.Free(1)
+
+	// var c uint8 at bp, 1
+
+	if !(X__toread(tls, f) != 0) && (*struct {
+		f func(*TLS, uintptr, uintptr, size_t) size_t
+	})(unsafe.Pointer(&struct{ uintptr }{(*FILE)(unsafe.Pointer(f)).read})).f(tls, f, bp, uint64(1)) == uint64(1) {
+		return int32(*(*uint8)(unsafe.Pointer(bp)))
+	}
+	return -1
+}
+
+func Xsscanf(tls *TLS, s uintptr, fmt uintptr, va uintptr) int32 { /* sscanf.c:4:5: */
+	var ret int32
+	var ap va_list
+	_ = ap
+	ap = va
+	ret = Xvsscanf(tls, s, fmt, ap)
+	_ = ap
+	return ret
+}
+
+type wctrans_t = uintptr /* wctype.h:20:19 */
+
+func store_int(tls *TLS, dest uintptr, size int32, i uint64) { /* vfscanf.c:22:13: */
+	if !(dest != 0) {
+		return
+	}
+	switch size {
+	case -2:
+		*(*int8)(unsafe.Pointer(dest)) = int8(i)
+		break
+	case -1:
+		*(*int16)(unsafe.Pointer(dest)) = int16(i)
+		break
+	case 0:
+		*(*int32)(unsafe.Pointer(dest)) = int32(i)
+		break
+	case 1:
+		*(*int64)(unsafe.Pointer(dest)) = int64(i)
+		break
+	case 3:
+		*(*int64)(unsafe.Pointer(dest)) = int64(i)
+		break
+	}
+}
+
+func arg_n(tls *TLS, ap va_list, n uint32) uintptr { /* vfscanf.c:44:13: */
+	var p uintptr
+	var i uint32
+	var ap2 va_list
+	_ = ap2
+	ap2 = ap
+	for i = n; i > uint32(1); i-- {
+		VaUintptr(&ap2)
+	}
+	p = VaUintptr(&ap2)
+	_ = ap2
+	return p
+}
+
+func Xvfscanf(tls *TLS, f uintptr, fmt uintptr, ap va_list) int32 { /* vfscanf.c:56:5: */
+	bp := tls.Alloc(276)
+	defer tls.Free(276)
+
+	var width int32
+	var size int32
+	var alloc int32
+	var base int32
+	var p uintptr
+	var c int32
+	var t int32
+	var s uintptr
+	var wcs uintptr
+	// var st mbstate_t at bp+268, 8
+
+	var dest uintptr
+	var invert int32
+	var matches int32
+	var x uint64
+	var y float64
+	var pos off_t
+	// var scanset [257]uint8 at bp, 257
+
+	var i size_t
+	var k size_t
+	// var wc wchar_t at bp+260, 4
+
+	var __need_unlock int32
+	var tmp uintptr
+	var tmp1 uintptr
+	alloc = 0
+	dest = uintptr(0)
+	matches = 0
+	pos = int64(0)
+	__need_unlock = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).lock >= 0 {
+			return X__lockfile(tls, f)
+		}
+		return 0
+	}()
+
+	if !!(int32((*FILE)(unsafe.Pointer(f)).rpos) != 0) {
+		goto __1
+	}
+	X__toread(tls, f)
+__1:
+	;
+	if !!(int32((*FILE)(unsafe.Pointer(f)).rpos) != 0) {
+		goto __2
+	}
+	goto input_fail
+__2:
+	;
+
+	p = fmt
+__3:
+	if !(*(*uint8)(unsafe.Pointer(p)) != 0) {
+		goto __5
+	}
+
+	alloc = 0
+
+	if !(__isspace(tls, int32(*(*uint8)(unsafe.Pointer(p)))) != 0) {
+		goto __6
+	}
+__7:
+	if !(__isspace(tls, int32(*(*uint8)(unsafe.Pointer(p + 1)))) != 0) {
+		goto __8
+	}
+	p++
+	goto __7
+__8:
+	;
+	X__shlim(tls, f, int64(0))
+__9:
+	if !(__isspace(tls, func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}()) != 0) {
+		goto __10
+	}
+	goto __9
+__10:
+	;
+	if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+		(*FILE)(unsafe.Pointer(f)).rpos--
+	} else {
+	}
+	pos = pos + ((*FILE)(unsafe.Pointer(f)).shcnt + (int64((*FILE)(unsafe.Pointer(f)).rpos)-int64((*FILE)(unsafe.Pointer(f)).buf))/1)
+	goto __4
+__6:
+	;
+	if !(int32(*(*uint8)(unsafe.Pointer(p))) != '%' || int32(*(*uint8)(unsafe.Pointer(p + 1))) == '%') {
+		goto __11
+	}
+	X__shlim(tls, f, int64(0))
+	if !(int32(*(*uint8)(unsafe.Pointer(p))) == '%') {
+		goto __12
+	}
+	p++
+__14:
+	if !(__isspace(tls, AssignInt32(&c, func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}())) != 0) {
+		goto __15
+	}
+	goto __14
+__15:
+	;
+	goto __13
+__12:
+	c = func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}()
+__13:
+	;
+	if !(c != int32(*(*uint8)(unsafe.Pointer(p)))) {
+		goto __16
+	}
+	if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+		(*FILE)(unsafe.Pointer(f)).rpos--
+	} else {
+	}
+	if !(c < 0) {
+		goto __17
+	}
+	goto input_fail
+__17:
+	;
+	goto match_fail
+__16:
+	;
+	pos = pos + ((*FILE)(unsafe.Pointer(f)).shcnt + (int64((*FILE)(unsafe.Pointer(f)).rpos)-int64((*FILE)(unsafe.Pointer(f)).buf))/1)
+	goto __4
+__11:
+	;
+
+	p++
+	if !(int32(*(*uint8)(unsafe.Pointer(p))) == '*') {
+		goto __18
+	}
+	dest = uintptr(0)
+	p++
+	goto __19
+__18:
+	if !(func() int32 {
+		if 0 != 0 {
+			return Xisdigit(tls, int32(*(*uint8)(unsafe.Pointer(p))))
+		}
+		return Bool32(uint32(*(*uint8)(unsafe.Pointer(p)))-uint32('0') < uint32(10))
+	}() != 0 && int32(*(*uint8)(unsafe.Pointer(p + 1))) == '$') {
+		goto __20
+	}
+	dest = arg_n(tls, ap, uint32(int32(*(*uint8)(unsafe.Pointer(p)))-'0'))
+	p += uintptr(2)
+	goto __21
+__20:
+	dest = VaUintptr(&ap)
+__21:
+	;
+__19:
+	;
+
+	width = 0
+__22:
+	if !(func() int32 {
+		if 0 != 0 {
+			return Xisdigit(tls, int32(*(*uint8)(unsafe.Pointer(p))))
+		}
+		return Bool32(uint32(*(*uint8)(unsafe.Pointer(p)))-uint32('0') < uint32(10))
+	}() != 0) {
+		goto __24
+	}
+	width = 10*width + int32(*(*uint8)(unsafe.Pointer(p))) - '0'
+	goto __23
+__23:
+	p++
+	goto __22
+	goto __24
+__24:
+	;
+
+	if !(int32(*(*uint8)(unsafe.Pointer(p))) == 'm') {
+		goto __25
+	}
+	wcs = uintptr(0)
+	s = uintptr(0)
+	alloc = BoolInt32(!!(dest != 0))
+	p++
+	goto __26
+__25:
+	alloc = 0
+__26:
+	;
+
+	size = 0
+	switch int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&p, 1)))) {
+	case 'h':
+		goto __28
+	case 'l':
+		goto __29
+	case 'j':
+		goto __30
+	case 'z':
+		goto __31
+	case 't':
+		goto __32
+	case 'L':
+		goto __33
+	case 'd':
+		goto __34
+	case 'i':
+		goto __35
+	case 'o':
+		goto __36
+	case 'u':
+		goto __37
+	case 'x':
+		goto __38
+	case 'a':
+		goto __39
+	case 'e':
+		goto __40
+	case 'f':
+		goto __41
+	case 'g':
+		goto __42
+	case 'A':
+		goto __43
+	case 'E':
+		goto __44
+	case 'F':
+		goto __45
+	case 'G':
+		goto __46
+	case 'X':
+		goto __47
+	case 's':
+		goto __48
+	case 'c':
+		goto __49
+	case '[':
+		goto __50
+	case 'S':
+		goto __51
+	case 'C':
+		goto __52
+	case 'p':
+		goto __53
+	case 'n':
+		goto __54
+	default:
+		goto __55
+	}
+	goto __27
+__28:
+	if !(int32(*(*uint8)(unsafe.Pointer(p))) == 'h') {
+		goto __56
+	}
+	p++
+	size = -2
+	goto __57
+__56:
+	size = -1
+__57:
+	;
+	goto __27
+__29:
+	if !(int32(*(*uint8)(unsafe.Pointer(p))) == 'l') {
+		goto __58
+	}
+	p++
+	size = 3
+	goto __59
+__58:
+	size = 1
+__59:
+	;
+	goto __27
+__30:
+	size = 3
+	goto __27
+__31:
+__32:
+	size = 1
+	goto __27
+__33:
+	size = 2
+	goto __27
+__34:
+__35:
+__36:
+__37:
+__38:
+__39:
+__40:
+__41:
+__42:
+__43:
+__44:
+__45:
+__46:
+__47:
+__48:
+__49:
+__50:
+__51:
+__52:
+__53:
+__54:
+	p--
+	goto __27
+__55:
+	goto fmt_fail
+__27:
+	;
+
+	t = int32(*(*uint8)(unsafe.Pointer(p)))
+
+	// C or S
+	if !(t&0x2f == 3) {
+		goto __60
+	}
+	t = t | 32
+	size = 1
+__60:
+	;
+
+	switch t {
+	case 'c':
+		goto __62
+	case '[':
+		goto __63
+	case 'n':
+		goto __64
+	default:
+		goto __65
+	}
+	goto __61
+__62:
+	if !(width < 1) {
+		goto __66
+	}
+	width = 1
+__66:
+	;
+__63:
+	goto __61
+__64:
+	store_int(tls, dest, size, uint64(pos))
+	// do not increment match count, etc!
+	goto __4
+__65:
+	X__shlim(tls, f, int64(0))
+__67:
+	if !(__isspace(tls, func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}()) != 0) {
+		goto __68
+	}
+	goto __67
+__68:
+	;
+	if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+		(*FILE)(unsafe.Pointer(f)).rpos--
+	} else {
+	}
+	pos = pos + ((*FILE)(unsafe.Pointer(f)).shcnt + (int64((*FILE)(unsafe.Pointer(f)).rpos)-int64((*FILE)(unsafe.Pointer(f)).buf))/1)
+__61:
+	;
+
+	X__shlim(tls, f, int64(width))
+	if !(func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}() < 0) {
+		goto __69
+	}
+	goto input_fail
+__69:
+	;
+	if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+		(*FILE)(unsafe.Pointer(f)).rpos--
+	} else {
+	}
+
+	switch t {
+	case 's':
+		goto __71
+	case 'c':
+		goto __72
+	case '[':
+		goto __73
+	case 'p':
+		goto __74
+	case 'X':
+		goto __75
+	case 'x':
+		goto __76
+	case 'o':
+		goto __77
+	case 'd':
+		goto __78
+	case 'u':
+		goto __79
+	case 'i':
+		goto __80
+	case 'a':
+		goto __81
+	case 'A':
+		goto __82
+	case 'e':
+		goto __83
+	case 'E':
+		goto __84
+	case 'f':
+		goto __85
+	case 'F':
+		goto __86
+	case 'g':
+		goto __87
+	case 'G':
+		goto __88
+	}
+	goto __70
+__71:
+__72:
+__73:
+	if !(t == 'c' || t == 's') {
+		goto __89
+	}
+	Xmemset(tls, bp, -1, uint64(unsafe.Sizeof([257]uint8{})))
+	*(*uint8)(unsafe.Pointer(bp)) = uint8(0)
+	if !(t == 's') {
+		goto __91
+	}
+	*(*uint8)(unsafe.Pointer(bp + 10)) = uint8(0)
+	*(*uint8)(unsafe.Pointer(bp + 11)) = uint8(0)
+	*(*uint8)(unsafe.Pointer(bp + 12)) = uint8(0)
+	*(*uint8)(unsafe.Pointer(bp + 13)) = uint8(0)
+	*(*uint8)(unsafe.Pointer(bp + 14)) = uint8(0)
+	*(*uint8)(unsafe.Pointer(bp + 33)) = uint8(0)
+__91:
+	;
+	goto __90
+__89:
+	if !(int32(*(*uint8)(unsafe.Pointer(PreIncUintptr(&p, 1)))) == '^') {
+		goto __92
+	}
+	p++
+	invert = 1
+	goto __93
+__92:
+	invert = 0
+__93:
+	;
+	Xmemset(tls, bp, invert, uint64(unsafe.Sizeof([257]uint8{})))
+	*(*uint8)(unsafe.Pointer(bp)) = uint8(0)
+	if !(int32(*(*uint8)(unsafe.Pointer(p))) == '-') {
+		goto __94
+	}
+	p++
+	*(*uint8)(unsafe.Pointer(bp + 46)) = uint8(1 - invert)
+	goto __95
+__94:
+	if !(int32(*(*uint8)(unsafe.Pointer(p))) == ']') {
+		goto __96
+	}
+	p++
+	*(*uint8)(unsafe.Pointer(bp + 94)) = uint8(1 - invert)
+__96:
+	;
+__95:
+	;
+__97:
+	if !(int32(*(*uint8)(unsafe.Pointer(p))) != ']') {
+		goto __99
+	}
+	if !!(int32(*(*uint8)(unsafe.Pointer(p))) != 0) {
+		goto __100
+	}
+	goto fmt_fail
+__100:
+	;
+	if !(int32(*(*uint8)(unsafe.Pointer(p))) == '-' && *(*uint8)(unsafe.Pointer(p + 1)) != 0 && int32(*(*uint8)(unsafe.Pointer(p + 1))) != ']') {
+		goto __101
+	}
+	c = int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&p, 1) + UintptrFromInt32(-1))))
+__102:
+	if !(c < int32(*(*uint8)(unsafe.Pointer(p)))) {
+		goto __104
+	}
+	*(*uint8)(unsafe.Pointer(bp + uintptr(1+c))) = uint8(1 - invert)
+	goto __103
+__103:
+	c++
+	goto __102
+	goto __104
+__104:
+	;
+__101:
+	;
+	*(*uint8)(unsafe.Pointer(bp + uintptr(1+int32(*(*uint8)(unsafe.Pointer(p)))))) = uint8(1 - invert)
+	goto __98
+__98:
+	p++
+	goto __97
+	goto __99
+__99:
+	;
+__90:
+	;
+	wcs = uintptr(0)
+	s = uintptr(0)
+	i = uint64(0)
+	if t == 'c' {
+		k = uint64(uint32(width) + 1)
+	} else {
+		k = uint64(31)
+	}
+	if !(size == 1) {
+		goto __105
+	}
+	if !(alloc != 0) {
+		goto __107
+	}
+	wcs = Xmalloc(tls, k*size_t(unsafe.Sizeof(wchar_t(0))))
+	if !!(wcs != 0) {
+		goto __109
+	}
+	goto alloc_fail
+__109:
+	;
+	goto __108
+__107:
+	wcs = dest
+__108:
+	;
+	*(*mbstate_t)(unsafe.Pointer(bp + 268 /* st */)) = mbstate_t{}
+__110:
+	if !(*(*uint8)(unsafe.Pointer(bp + uintptr(AssignInt32(&c, func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}())+1))) != 0) {
+		goto __111
+	}
+	switch Xmbrtowc(tls, bp+260, func() uintptr { *(*int8)(unsafe.Pointer(bp + 264)) = int8(c); return bp + 264 }(), uint64(1), bp+268 /* &st */) {
+	case Uint64FromInt32(-1):
+		goto __113
+	case Uint64FromInt32(-2):
+		goto __114
+	}
+	goto __112
+__113:
+	goto input_fail
+__114:
+	goto __110
+__112:
+	;
+	if !(wcs != 0) {
+		goto __115
+	}
+	*(*wchar_t)(unsafe.Pointer(wcs + uintptr(PostIncUint64(&i, 1))*4)) = *(*wchar_t)(unsafe.Pointer(bp + 260 /* wc */))
+__115:
+	;
+	if !(alloc != 0 && i == k) {
+		goto __116
+	}
+	k = k + (k + uint64(1))
+	tmp = Xrealloc(tls, wcs, k*size_t(unsafe.Sizeof(wchar_t(0))))
+	if !!(tmp != 0) {
+		goto __117
+	}
+	goto alloc_fail
+__117:
+	;
+	wcs = tmp
+__116:
+	;
+	goto __110
+__111:
+	;
+	if !!(Xmbsinit(tls, bp+268) != 0) {
+		goto __118
+	}
+	goto input_fail
+__118:
+	;
+	goto __106
+__105:
+	if !(alloc != 0) {
+		goto __119
+	}
+	s = Xmalloc(tls, k)
+	if !!(s != 0) {
+		goto __121
+	}
+	goto alloc_fail
+__121:
+	;
+__122:
+	if !(*(*uint8)(unsafe.Pointer(bp + uintptr(AssignInt32(&c, func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}())+1))) != 0) {
+		goto __123
+	}
+	*(*int8)(unsafe.Pointer(s + uintptr(PostIncUint64(&i, 1)))) = int8(c)
+	if !(i == k) {
+		goto __124
+	}
+	k = k + (k + uint64(1))
+	tmp1 = Xrealloc(tls, s, k)
+	if !!(tmp1 != 0) {
+		goto __125
+	}
+	goto alloc_fail
+__125:
+	;
+	s = tmp1
+__124:
+	;
+	goto __122
+__123:
+	;
+	goto __120
+__119:
+	if !(AssignUintptr(&s, dest) != 0) {
+		goto __126
+	}
+__128:
+	if !(*(*uint8)(unsafe.Pointer(bp + uintptr(AssignInt32(&c, func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}())+1))) != 0) {
+		goto __129
+	}
+	*(*int8)(unsafe.Pointer(s + uintptr(PostIncUint64(&i, 1)))) = int8(c)
+	goto __128
+__129:
+	;
+	goto __127
+__126:
+__130:
+	if !(*(*uint8)(unsafe.Pointer(bp + uintptr(AssignInt32(&c, func() int32 {
+		if (*FILE)(unsafe.Pointer(f)).rpos != (*FILE)(unsafe.Pointer(f)).shend {
+			return int32(*(*uint8)(unsafe.Pointer(PostIncUintptr(&(*FILE)(unsafe.Pointer(f)).rpos, 1))))
+		}
+		return X__shgetc(tls, f)
+	}())+1))) != 0) {
+		goto __131
+	}
+	goto __130
+__131:
+	;
+__127:
+	;
+__120:
+	;
+__106:
+	;
+	if (*FILE)(unsafe.Pointer(f)).shlim >= int64(0) {
+		(*FILE)(unsafe.Pointer(f)).rpos--
+	} else {
+	}
+	if !!((*FILE)(unsafe.Pointer(f)).shcnt+(int64((*FILE)(unsafe.Pointer(f)).rpos)-int64((*FILE)(unsafe.Pointer(f)).buf))/1 != 0) {
+		goto __132
+	}
+	goto match_fail
+__132:
+	;
+	if !(t == 'c' && (*FILE)(unsafe.Pointer(f)).shcnt+(int64((*FILE)(unsafe.Pointer(f)).rpos)-int64((*FILE)(unsafe.Pointer(f)).buf))/1 != off_t(width)) {
+		goto __133
+	}
+	goto match_fail
+__133:
+	;
+	if !(alloc != 0) {
+		goto __134
+	}
+	if !(size == 1) {
+		goto __135
+	}
+	*(*uintptr)(unsafe.Pointer(dest)) = wcs
+	goto __136
+__135:
+	*(*uintptr)(unsafe.Pointer(dest)) = s
+__136:
+	;
+__134:
+	;
+	if !(t != 'c') {
+		goto __137
+	}
+	if !(wcs != 0) {
+		goto __138
+	}
+	*(*wchar_t)(unsafe.Pointer(wcs + uintptr(i)*4)) = 0
+__138:
+	;
+	if !(s != 0) {
+		goto __139
+	}
+	*(*int8)(unsafe.Pointer(s + uintptr(i))) = int8(0)
+__139:
+	;
+__137:
+	;
+	goto __70
+__74:
+__75:
+__76:
+	base = 16
+	goto int_common
+__77:
+	base = 8
+	goto int_common
+__78:
+__79:
+	base = 10
+	goto int_common
+__80:
+	base = 0
+int_common:
+	x = X__intscan(tls, f, uint32(base), 0, 2*uint64(0x7fffffffffffffff)+uint64(1))
+	if !!((*FILE)(unsafe.Pointer(f)).shcnt+(int64((*FILE)(unsafe.Pointer(f)).rpos)-int64((*FILE)(unsafe.Pointer(f)).buf))/1 != 0) {
+		goto __140
+	}
+	goto match_fail
+__140:
+	;
+	if !(t == 'p' && dest != 0) {
+		goto __141
+	}
+	*(*uintptr)(unsafe.Pointer(dest)) = uintptr(uintptr_t(x))
+	goto __142
+__141:
+	store_int(tls, dest, size, x)
+__142:
+	;
+	goto __70
+__81:
+__82:
+__83:
+__84:
+__85:
+__86:
+__87:
+__88:
+	y = X__floatscan(tls, f, size, 0)
+	if !!((*FILE)(unsafe.Pointer(f)).shcnt+(int64((*FILE)(unsafe.Pointer(f)).rpos)-int64((*FILE)(unsafe.Pointer(f)).buf))/1 != 0) {
+		goto __143
+	}
+	goto match_fail
+__143:
+	;
+	if !(dest != 0) {
+		goto __144
+	}
+	switch size {
+	case 0:
+		goto __146
+	case 1:
+		goto __147
+	case 2:
+		goto __148
+	}
+	goto __145
+__146:
+	*(*float32)(unsafe.Pointer(dest)) = float32(y)
+	goto __145
+__147:
+	*(*float64)(unsafe.Pointer(dest)) = y
+	goto __145
+__148:
+	*(*float64)(unsafe.Pointer(dest)) = y
+	goto __145
+__145:
+	;
+__144:
+	;
+	goto __70
+__70:
+	;
+
+	pos = pos + ((*FILE)(unsafe.Pointer(f)).shcnt + (int64((*FILE)(unsafe.Pointer(f)).rpos)-int64((*FILE)(unsafe.Pointer(f)).buf))/1)
+	if !(dest != 0) {
+		goto __149
+	}
+	matches++
+__149:
+	;
+	goto __4
+__4:
+	p++
+	goto __3
+	goto __5
+__5:
+	;
+	if !(0 != 0) {
+		goto __150
+	}
+fmt_fail:
+alloc_fail:
+input_fail:
+	if !!(matches != 0) {
+		goto __151
+	}
+	matches--
+__151:
+	;
+match_fail:
+	if !(alloc != 0) {
+		goto __152
+	}
+	Xfree(tls, s)
+	Xfree(tls, wcs)
+__152:
+	;
+__150:
+	;
+__153:
+	if !(__need_unlock != 0) {
+		goto __156
+	}
+	X__unlockfile(tls, f)
+__156:
+	;
+	goto __154
+__154:
+	if 0 != 0 {
+		goto __153
+	}
+	goto __155
+__155:
+	;
+	return matches
+}
+
+func string_read(tls *TLS, f uintptr, buf uintptr, len size_t) size_t { /* vsscanf.c:4:15: */
+	var src uintptr = (*FILE)(unsafe.Pointer(f)).cookie
+	var k size_t = len + uint64(256)
+	var end uintptr = Xmemchr(tls, src, 0, k)
+	if end != 0 {
+		k = size_t((int64(end) - int64(src)) / 1)
+	}
+	if k < len {
+		len = k
+	}
+	Xmemcpy(tls, buf, src, len)
+	(*FILE)(unsafe.Pointer(f)).rpos = src + uintptr(len)
+	(*FILE)(unsafe.Pointer(f)).rend = src + uintptr(k)
+	(*FILE)(unsafe.Pointer(f)).cookie = src + uintptr(k)
+	return len
+}
+
+func Xvsscanf(tls *TLS, s uintptr, fmt uintptr, ap va_list) int32 { /* vsscanf.c:18:5: */
+	bp := tls.Alloc(232)
+	defer tls.Free(232)
+
+	*(*FILE)(unsafe.Pointer(bp /* f */)) = FILE{read: *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*TLS, uintptr, uintptr, size_t) size_t
+	}{string_read})), buf: s, lock: -1, cookie: s}
+	return Xvfscanf(tls, bp, fmt, ap)
+}
+
+func Xbsearch(tls *TLS, key uintptr, base uintptr, nel size_t, width size_t, cmp uintptr) uintptr { /* bsearch.c:3:6: */
+	var try uintptr
+	var sign int32
+	for nel > uint64(0) {
+		try = base + uintptr(width*(nel/uint64(2)))
+		sign = (*struct {
+			f func(*TLS, uintptr, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{cmp})).f(tls, key, try)
+		if sign < 0 {
+			nel = nel / uint64(2)
+		} else if sign > 0 {
+			base = try + uintptr(width)
+			nel = nel - (nel/uint64(2) + uint64(1))
+		} else {
+			return try
+		}
+	}
+	return uintptr(0)
+}
+
+func strtox(tls *TLS, s uintptr, p uintptr, prec int32) float64 { /* strtod.c:6:20: */
+	bp := tls.Alloc(232)
+	defer tls.Free(232)
+
+	// var f FILE at bp, 232
+
+	(*FILE)(unsafe.Pointer(bp)).buf = AssignPtrUintptr(bp+8, s)
+	(*FILE)(unsafe.Pointer(bp)).rend = UintptrFromInt32(-1)
+	X__shlim(tls, bp, int64(0))
+	var y float64 = X__floatscan(tls, bp, prec, 1)
+	var cnt off_t = (*FILE)(unsafe.Pointer(bp)).shcnt + (int64((*FILE)(unsafe.Pointer(bp)).rpos)-int64((*FILE)(unsafe.Pointer(bp)).buf))/1
+	if p != 0 {
+		*(*uintptr)(unsafe.Pointer(p)) = func() uintptr {
+			if cnt != 0 {
+				return s + uintptr(cnt)
+			}
+			return s
+		}()
+	}
+	return y
+}
+
+func Xstrtof(tls *TLS, s uintptr, p uintptr) float32 { /* strtod.c:17:7: */
+	return float32(strtox(tls, s, p, 0))
+}
+
+func Xstrtod(tls *TLS, s uintptr, p uintptr) float64 { /* strtod.c:22:8: */
+	return strtox(tls, s, p, 1)
+}
+
+func Xstrtold(tls *TLS, s uintptr, p uintptr) float64 { /* strtod.c:27:13: */
+	return strtox(tls, s, p, 2)
+}
+
+func strtox1(tls *TLS, s uintptr, p uintptr, base int32, lim uint64) uint64 { /* strtol.c:8:27: */
+	bp := tls.Alloc(232)
+	defer tls.Free(232)
+
+	// var f FILE at bp, 232
+
+	(*FILE)(unsafe.Pointer(bp)).buf = AssignPtrUintptr(bp+8, s)
+	(*FILE)(unsafe.Pointer(bp)).rend = UintptrFromInt32(-1)
+	X__shlim(tls, bp, int64(0))
+	var y uint64 = X__intscan(tls, bp, uint32(base), 1, lim)
+	if p != 0 {
+		var cnt size_t = size_t((*FILE)(unsafe.Pointer(bp)).shcnt + (int64((*FILE)(unsafe.Pointer(bp)).rpos)-int64((*FILE)(unsafe.Pointer(bp)).buf))/1)
+		*(*uintptr)(unsafe.Pointer(p)) = s + uintptr(cnt)
+	}
+	return y
+}
+
+func Xstrtoull(tls *TLS, s uintptr, p uintptr, base int32) uint64 { /* strtol.c:21:20: */
+	return strtox1(tls, s, p, base, 2*uint64(0x7fffffffffffffff)+uint64(1))
+}
+
+func Xstrtoll(tls *TLS, s uintptr, p uintptr, base int32) int64 { /* strtol.c:26:11: */
+	return int64(strtox1(tls, s, p, base, Uint64FromInt64(-0x7fffffffffffffff-int64(1))))
+}
+
+func Xstrtoul(tls *TLS, s uintptr, p uintptr, base int32) uint64 { /* strtol.c:31:15: */
+	return uint64(strtox1(tls, s, p, base, 2*uint64(0x7fffffffffffffff)+uint64(1)))
+}
+
+func Xstrtol(tls *TLS, s uintptr, p uintptr, base int32) int64 { /* strtol.c:36:6: */
+	return int64(strtox1(tls, s, p, base, 0+Uint64FromInt64(Int64(-Int64(0x7fffffffffffffff))-Int64FromInt32(1))))
+}
+
+func Xstrtoimax(tls *TLS, s uintptr, p uintptr, base int32) intmax_t { /* strtol.c:41:10: */
+	return intmax_t(Xstrtoll(tls, s, p, base))
+}
+
+func Xstrtoumax(tls *TLS, s uintptr, p uintptr, base int32) uintmax_t { /* strtol.c:46:11: */
+	return uintmax_t(Xstrtoull(tls, s, p, base))
+}
+
+func Xstrdup(tls *TLS, s uintptr) uintptr { /* strdup.c:4:6: */
+	var l size_t = Xstrlen(tls, s)
+	var d uintptr = Xmalloc(tls, l+uint64(1))
+	if !(d != 0) {
+		return uintptr(0)
+	}
+	return Xmemcpy(tls, d, s, l+uint64(1))
+}
+
+func Xstrlcat(tls *TLS, d uintptr, s uintptr, n size_t) size_t { /* strlcat.c:4:8: */
+	var l size_t = Xstrnlen(tls, d, n)
+	if l == n {
+		return l + Xstrlen(tls, s)
+	}
+	return l + Xstrlcpy(tls, d+uintptr(l), s, n-l)
+}
+
+// Support signed or unsigned plain-char
+
+// Implementation choices...
+
+// Arbitrary numbers...
+
+// POSIX/SUS requirements follow. These numbers come directly
+// from SUS and have nothing to do with the host system.
+
+func Xstrlcpy(tls *TLS, d uintptr, s uintptr, n size_t) size_t { /* strlcpy.c:11:8: */
+	var d0 uintptr
+	var wd uintptr
+	var ws uintptr
+	d0 = d
+
+	if !!(int32(PostDecUint64(&n, 1)) != 0) {
+		goto __1
+	}
+	goto finish
+__1:
+	;
+	if !(uintptr_t(s)&(uint64(unsafe.Sizeof(size_t(0)))-uint64(1)) == uintptr_t(d)&(uint64(unsafe.Sizeof(size_t(0)))-uint64(1))) {
+		goto __2
+	}
+__3:
+	if !(uintptr_t(s)&(uint64(unsafe.Sizeof(size_t(0)))-uint64(1)) != 0 && n != 0 && AssignPtrInt8(d, *(*int8)(unsafe.Pointer(s))) != 0) {
+		goto __5
+	}
+	goto __4
+__4:
+	n--
+	s++
+	d++
+	goto __3
+	goto __5
+__5:
+	;
+	if !(n != 0 && *(*int8)(unsafe.Pointer(s)) != 0) {
+		goto __6
+	}
+	wd = d
+	ws = s
+__7:
+	if !(n >= size_t(unsafe.Sizeof(size_t(0))) && !((*(*uint64)(unsafe.Pointer(ws))-Uint64(Uint64FromInt32(-1))/uint64(255)) & ^*(*uint64)(unsafe.Pointer(ws)) & (Uint64(Uint64FromInt32(-1))/uint64(255)*uint64(255/2+1)) != 0)) {
+		goto __9
+	}
+	*(*size_t)(unsafe.Pointer(wd)) = *(*uint64)(unsafe.Pointer(ws))
+	goto __8
+__8:
+	n = n - size_t(unsafe.Sizeof(size_t(0)))
+	ws += 8
+	wd += 8
+	goto __7
+	goto __9
+__9:
+	;
+	d = wd
+	s = ws
+__6:
+	;
+__2:
+	;
+__10:
+	if !(n != 0 && AssignPtrInt8(d, *(*int8)(unsafe.Pointer(s))) != 0) {
+		goto __12
+	}
+	goto __11
+__11:
+	n--
+	s++
+	d++
+	goto __10
+	goto __12
+__12:
+	;
+	*(*int8)(unsafe.Pointer(d)) = int8(0)
+finish:
+	return size_t((int64(d)-int64(d0))/1) + Xstrlen(tls, s)
+}
+
+func Xstrncasecmp(tls *TLS, _l uintptr, _r uintptr, n size_t) int32 { /* strncasecmp.c:4:5: */
+	var l uintptr = _l
+	var r uintptr = _r
+	if !(int32(PostDecUint64(&n, 1)) != 0) {
+		return 0
+	}
+__1:
+	if !(*(*uint8)(unsafe.Pointer(l)) != 0 && *(*uint8)(unsafe.Pointer(r)) != 0 && n != 0 && (int32(*(*uint8)(unsafe.Pointer(l))) == int32(*(*uint8)(unsafe.Pointer(r))) || Xtolower(tls, int32(*(*uint8)(unsafe.Pointer(l)))) == Xtolower(tls, int32(*(*uint8)(unsafe.Pointer(r)))))) {
+		goto __3
+	}
+	goto __2
+__2:
+	l++
+	r++
+	n--
+	goto __1
+	goto __3
+__3:
+	;
+	return Xtolower(tls, int32(*(*uint8)(unsafe.Pointer(l)))) - Xtolower(tls, int32(*(*uint8)(unsafe.Pointer(r))))
+}
+
+func X__strncasecmp_l(tls *TLS, l uintptr, r uintptr, n size_t, loc locale_t) int32 { /* strncasecmp.c:12:5: */
+	return Xstrncasecmp(tls, l, r, n)
+}
+
+func Xstrncat(tls *TLS, d uintptr, s uintptr, n size_t) uintptr { /* strncat.c:3:6: */
+	var a uintptr = d
+	d += uintptr(Xstrlen(tls, d))
+	for n != 0 && *(*int8)(unsafe.Pointer(s)) != 0 {
+		n--
+		*(*int8)(unsafe.Pointer(PostIncUintptr(&d, 1))) = *(*int8)(unsafe.Pointer(PostIncUintptr(&s, 1)))
+	}
+	*(*int8)(unsafe.Pointer(PostIncUintptr(&d, 1))) = int8(0)
+	return a
+}
+
+func Xstrnlen(tls *TLS, s uintptr, n size_t) size_t { /* strnlen.c:3:8: */
+	var p uintptr = Xmemchr(tls, s, 0, n)
+	if p != 0 {
+		return uint64((int64(p) - int64(s)) / 1)
+	}
+	return n
+}
+
+func Xstrspn(tls *TLS, s uintptr, c uintptr) size_t { /* strspn.c:6:8: */
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
+
+	var a uintptr = s
+	*(*[4]size_t)(unsafe.Pointer(bp /* byteset */)) = [4]size_t{0: uint64(0)}
+
+	if !(int32(*(*int8)(unsafe.Pointer(c))) != 0) {
+		return uint64(0)
+	}
+	if !(int32(*(*int8)(unsafe.Pointer(c + 1))) != 0) {
+		for ; int32(*(*int8)(unsafe.Pointer(s))) == int32(*(*int8)(unsafe.Pointer(c))); s++ {
+		}
+		return size_t((int64(s) - int64(a)) / 1)
+	}
+
+	for ; *(*int8)(unsafe.Pointer(c)) != 0 && AssignOrPtrUint64(bp+uintptr(size_t(*(*uint8)(unsafe.Pointer(c)))/(uint64(8)*uint64(unsafe.Sizeof(size_t(0)))))*8, size_t(uint64(1))<<(size_t(*(*uint8)(unsafe.Pointer(c)))%(uint64(8)*uint64(unsafe.Sizeof(size_t(0)))))) != 0; c++ {
+	}
+	for ; *(*int8)(unsafe.Pointer(s)) != 0 && *(*size_t)(unsafe.Pointer(bp + uintptr(size_t(*(*uint8)(unsafe.Pointer(s)))/(uint64(8)*uint64(unsafe.Sizeof(size_t(0)))))*8))&(size_t(uint64(1))<<(size_t(*(*uint8)(unsafe.Pointer(s)))%(uint64(8)*uint64(unsafe.Sizeof(size_t(0)))))) != 0; s++ {
+	}
+	return size_t((int64(s) - int64(a)) / 1)
+}
+
+func Xstrtok(tls *TLS, s uintptr, sep uintptr) uintptr { /* strtok.c:3:6: */
+	if !(s != 0) && !(int32(AssignUintptr(&s, _sp)) != 0) {
+		return uintptr(0)
+	}
+	s += uintptr(Xstrspn(tls, s, sep))
+	if !(int32(*(*int8)(unsafe.Pointer(s))) != 0) {
+		return AssignPtrUintptr(uintptr(unsafe.Pointer(&_sp)), uintptr(0))
+	}
+	_sp = s + uintptr(Xstrcspn(tls, s, sep))
+	if *(*int8)(unsafe.Pointer(_sp)) != 0 {
+		*(*int8)(unsafe.Pointer(PostIncUintptr(&_sp, 1))) = int8(0)
+	} else {
+		_sp = uintptr(0)
+	}
+	return s
+}
+
+var _sp uintptr /* strtok.c:5:14: */
+
+func X__ccgo_pthreadAttrGetDetachState(tls *TLS, a uintptr) int32 { /* pthread_attr_get.c:3:5: */
+	return *(*int32)(unsafe.Pointer(a + 6*4))
+}
+
+func Xpthread_attr_getdetachstate(tls *TLS, a uintptr, state uintptr) int32 { /* pthread_attr_get.c:7:5: */
+	*(*int32)(unsafe.Pointer(state)) = *(*int32)(unsafe.Pointer(a + 6*4))
+	return 0
+}
+
+//
+// int pthread_attr_getguardsize(const pthread_attr_t *restrict a, size_t *restrict size)
+// {
+// 	*size = a->_a_guardsize;
+// 	return 0;
+// }
+//
+// int pthread_attr_getinheritsched(const pthread_attr_t *restrict a, int *restrict inherit)
+// {
+// 	*inherit = a->_a_sched;
+// 	return 0;
+// }
+//
+// int pthread_attr_getschedparam(const pthread_attr_t *restrict a, struct sched_param *restrict param)
+// {
+// 	param->sched_priority = a->_a_prio;
+// 	return 0;
+// }
+//
+// int pthread_attr_getschedpolicy(const pthread_attr_t *restrict a, int *restrict policy)
+// {
+// 	*policy = a->_a_policy;
+// 	return 0;
+// }
+//
+// int pthread_attr_getscope(const pthread_attr_t *restrict a, int *restrict scope)
+// {
+// 	*scope = PTHREAD_SCOPE_SYSTEM;
+// 	return 0;
+// }
+//
+// int pthread_attr_getstack(const pthread_attr_t *restrict a, void **restrict addr, size_t *restrict size)
+// {
+// 	if (!a->_a_stackaddr)
+// 		return EINVAL;
+// 	*size = a->_a_stacksize;
+// 	*addr = (void *)(a->_a_stackaddr - *size);
+// 	return 0;
+// }
+//
+// int pthread_attr_getstacksize(const pthread_attr_t *restrict a, size_t *restrict size)
+// {
+// 	*size = a->_a_stacksize;
+// 	return 0;
+// }
+//
+// int pthread_barrierattr_getpshared(const pthread_barrierattr_t *restrict a, int *restrict pshared)
+// {
+// 	*pshared = !!a->__attr;
+// 	return 0;
+// }
+//
+// int pthread_condattr_getclock(const pthread_condattr_t *restrict a, clockid_t *restrict clk)
+// {
+// 	*clk = a->__attr & 0x7fffffff;
+// 	return 0;
+// }
+//
+// int pthread_condattr_getpshared(const pthread_condattr_t *restrict a, int *restrict pshared)
+// {
+// 	*pshared = a->__attr>>31;
+// 	return 0;
+// }
+//
+// int pthread_mutexattr_getprotocol(const pthread_mutexattr_t *restrict a, int *restrict protocol)
+// {
+// 	*protocol = PTHREAD_PRIO_NONE;
+// 	return 0;
+// }
+// int pthread_mutexattr_getpshared(const pthread_mutexattr_t *restrict a, int *restrict pshared)
+// {
+// 	*pshared = a->__attr / 128U % 2;
+// 	return 0;
+// }
+//
+// int pthread_mutexattr_getrobust(const pthread_mutexattr_t *restrict a, int *restrict robust)
+// {
+// 	*robust = a->__attr / 4U % 2;
+// 	return 0;
+// }
+
+func X__ccgo_pthreadMutexattrGettype(tls *TLS, a uintptr) int32 { /* pthread_attr_get.c:93:5: */
+	return int32((*pthread_mutexattr_t)(unsafe.Pointer(a)).__attr & uint32(3))
+}
+
+// int pthread_mutexattr_gettype(const pthread_mutexattr_t *restrict a, int *restrict type)
+// {
+// 	*type = a->__attr & 3;
+// 	return 0;
+// }
+//
+// int pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *restrict a, int *restrict pshared)
+// {
+// 	*pshared = a->__attr[0];
+// 	return 0;
+// }
+
+func Xpthread_attr_setdetachstate(tls *TLS, a uintptr, state int32) int32 { /* pthread_attr_setdetachstate.c:3:5: */
+	if uint32(state) > 1 {
+		return 22
+	}
+	*(*int32)(unsafe.Pointer(a + 6*4)) = state
+	return 0
+}
+
+func X__ccgo_getMutexType(tls *TLS, m uintptr) int32 { /* pthread_mutex_lock.c:3:5: */
+	return *(*int32)(unsafe.Pointer(m)) & 15
+}
+
+// int __pthread_mutex_lock(pthread_mutex_t *m)
+// {
+// 	if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL
+// 	    && !a_cas(&m->_m_lock, 0, EBUSY))
+// 		return 0;
+//
+// 	return __pthread_mutex_timedlock(m, 0);
+// }
+//
+// weak_alias(__pthread_mutex_lock, pthread_mutex_lock);
+
+func Xpthread_mutexattr_destroy(tls *TLS, a uintptr) int32 { /* pthread_mutexattr_destroy.c:3:5: */
+	return 0
+}
+
+func Xpthread_mutexattr_init(tls *TLS, a uintptr) int32 { /* pthread_mutexattr_init.c:3:5: */
+	*(*pthread_mutexattr_t)(unsafe.Pointer(a)) = pthread_mutexattr_t{}
+	return 0
+}
+
+func Xpthread_mutexattr_settype(tls *TLS, a uintptr, type1 int32) int32 { /* pthread_mutexattr_settype.c:3:5: */
+	if uint32(type1) > uint32(2) {
+		return 22
+	}
+	(*pthread_mutexattr_t)(unsafe.Pointer(a)).__attr = (*pthread_mutexattr_t)(unsafe.Pointer(a)).__attr&Uint32FromInt32(CplInt32(3)) | uint32(type1)
+	return 0
+}
+
+func init() {
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&ptable)) + 0)) = uintptr(unsafe.Pointer(&table)) + uintptr(128)*2 // __ctype_b_loc.c:36:45:
+}
+
+var ts1 = "infinity\x00nan\x00\x00\x00\x01\x02\x04\a\x03\x06\x05\x00.\x00%d.%d.%d.%d.in-addr.arpa\x00ip6.arpa\x000123456789abcdef\x00/etc/hosts\x00rb\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x00%d.%d.%d.%d\x00%x:%x:%x:%x:%x:%x:%x:%x\x00%x:%x:%x:%x:%x:%x:%d.%d.%d.%d\x00:0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x00\x00\x00\x00 \x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 \x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xfc\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"
+var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/libc/netdb/capi_linux_loong64.go b/vendor/modernc.org/libc/netdb/capi_linux_loong64.go
new file mode 100644
index 00000000..8be6cacf
--- /dev/null
+++ b/vendor/modernc.org/libc/netdb/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo netdb/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o netdb/netdb_linux_amd64.go -pkgname netdb', DO NOT EDIT.
+
+package netdb
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/netdb/netdb_linux_loong64.go b/vendor/modernc.org/libc/netdb/netdb_linux_loong64.go
new file mode 100644
index 00000000..a995ad8d
--- /dev/null
+++ b/vendor/modernc.org/libc/netdb/netdb_linux_loong64.go
@@ -0,0 +1,3081 @@
+// Code generated by 'ccgo netdb/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o netdb/netdb_linux_amd64.go -pkgname netdb', DO NOT EDIT.
+
+package netdb
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	AF_ALG                           = 38                   // socket.h:133:1:
+	AF_APPLETALK                     = 5                    // socket.h:99:1:
+	AF_ASH                           = 18                   // socket.h:113:1:
+	AF_ATMPVC                        = 8                    // socket.h:102:1:
+	AF_ATMSVC                        = 20                   // socket.h:115:1:
+	AF_AX25                          = 3                    // socket.h:97:1:
+	AF_BLUETOOTH                     = 31                   // socket.h:126:1:
+	AF_BRIDGE                        = 7                    // socket.h:101:1:
+	AF_CAIF                          = 37                   // socket.h:132:1:
+	AF_CAN                           = 29                   // socket.h:124:1:
+	AF_DECnet                        = 12                   // socket.h:106:1:
+	AF_ECONET                        = 19                   // socket.h:114:1:
+	AF_FILE                          = 1                    // socket.h:95:1:
+	AF_IB                            = 27                   // socket.h:122:1:
+	AF_IEEE802154                    = 36                   // socket.h:131:1:
+	AF_INET                          = 2                    // socket.h:96:1:
+	AF_INET6                         = 10                   // socket.h:104:1:
+	AF_IPX                           = 4                    // socket.h:98:1:
+	AF_IRDA                          = 23                   // socket.h:118:1:
+	AF_ISDN                          = 34                   // socket.h:129:1:
+	AF_IUCV                          = 32                   // socket.h:127:1:
+	AF_KCM                           = 41                   // socket.h:136:1:
+	AF_KEY                           = 15                   // socket.h:109:1:
+	AF_LLC                           = 26                   // socket.h:121:1:
+	AF_LOCAL                         = 1                    // socket.h:93:1:
+	AF_MAX                           = 45                   // socket.h:140:1:
+	AF_MPLS                          = 28                   // socket.h:123:1:
+	AF_NETBEUI                       = 13                   // socket.h:107:1:
+	AF_NETLINK                       = 16                   // socket.h:110:1:
+	AF_NETROM                        = 6                    // socket.h:100:1:
+	AF_NFC                           = 39                   // socket.h:134:1:
+	AF_PACKET                        = 17                   // socket.h:112:1:
+	AF_PHONET                        = 35                   // socket.h:130:1:
+	AF_PPPOX                         = 24                   // socket.h:119:1:
+	AF_QIPCRTR                       = 42                   // socket.h:137:1:
+	AF_RDS                           = 21                   // socket.h:116:1:
+	AF_ROSE                          = 11                   // socket.h:105:1:
+	AF_ROUTE                         = 16                   // socket.h:111:1:
+	AF_RXRPC                         = 33                   // socket.h:128:1:
+	AF_SECURITY                      = 14                   // socket.h:108:1:
+	AF_SMC                           = 43                   // socket.h:138:1:
+	AF_SNA                           = 22                   // socket.h:117:1:
+	AF_TIPC                          = 30                   // socket.h:125:1:
+	AF_UNIX                          = 1                    // socket.h:94:1:
+	AF_UNSPEC                        = 0                    // socket.h:92:1:
+	AF_VSOCK                         = 40                   // socket.h:135:1:
+	AF_WANPIPE                       = 25                   // socket.h:120:1:
+	AF_X25                           = 9                    // socket.h:103:1:
+	AF_XDP                           = 44                   // socket.h:139:1:
+	AI_ADDRCONFIG                    = 0x0020               // netdb.h:601:1:
+	AI_ALL                           = 0x0010               // netdb.h:600:1:
+	AI_CANONNAME                     = 0x0002               // netdb.h:597:1:
+	AI_NUMERICHOST                   = 0x0004               // netdb.h:598:1:
+	AI_NUMERICSERV                   = 0x0400               // netdb.h:613:1:
+	AI_PASSIVE                       = 0x0001               // netdb.h:596:1:
+	AI_V4MAPPED                      = 0x0008               // netdb.h:599:1:
+	BIG_ENDIAN                       = 4321                 // endian.h:28:1:
+	BYTE_ORDER                       = 1234                 // endian.h:30:1:
+	EAI_AGAIN                        = -3                   // netdb.h:618:1:
+	EAI_BADFLAGS                     = -1                   // netdb.h:616:1:
+	EAI_FAIL                         = -4                   // netdb.h:619:1:
+	EAI_FAMILY                       = -6                   // netdb.h:620:1:
+	EAI_MEMORY                       = -10                  // netdb.h:623:1:
+	EAI_NONAME                       = -2                   // netdb.h:617:1:
+	EAI_OVERFLOW                     = -12                  // netdb.h:625:1:
+	EAI_SERVICE                      = -8                   // netdb.h:622:1:
+	EAI_SOCKTYPE                     = -7                   // netdb.h:621:1:
+	EAI_SYSTEM                       = -11                  // netdb.h:624:1:
+	FD_SETSIZE                       = 1024                 // select.h:73:1:
+	FIOGETOWN                        = 0x8903               // sockios.h:8:1:
+	FIOSETOWN                        = 0x8901               // sockios.h:6:1:
+	HOST_NOT_FOUND                   = 1                    // netdb.h:63:1:
+	INET6_ADDRSTRLEN                 = 46                   // in.h:234:1:
+	INET_ADDRSTRLEN                  = 16                   // in.h:233:1:
+	IN_CLASSA_HOST                   = 16777215             // in.h:169:1:
+	IN_CLASSA_MAX                    = 128                  // in.h:170:1:
+	IN_CLASSA_NET                    = 0xff000000           // in.h:167:1:
+	IN_CLASSA_NSHIFT                 = 24                   // in.h:168:1:
+	IN_CLASSB_HOST                   = 65535                // in.h:175:1:
+	IN_CLASSB_MAX                    = 65536                // in.h:176:1:
+	IN_CLASSB_NET                    = 0xffff0000           // in.h:173:1:
+	IN_CLASSB_NSHIFT                 = 16                   // in.h:174:1:
+	IN_CLASSC_HOST                   = 255                  // in.h:181:1:
+	IN_CLASSC_NET                    = 0xffffff00           // in.h:179:1:
+	IN_CLASSC_NSHIFT                 = 8                    // in.h:180:1:
+	IN_LOOPBACKNET                   = 127                  // in.h:197:1:
+	IPPORT_RESERVED1                 = 1024                 // netdb.h:79:1:
+	IPV6_2292DSTOPTS                 = 4                    // in.h:171:1:
+	IPV6_2292HOPLIMIT                = 8                    // in.h:175:1:
+	IPV6_2292HOPOPTS                 = 3                    // in.h:170:1:
+	IPV6_2292PKTINFO                 = 2                    // in.h:169:1:
+	IPV6_2292PKTOPTIONS              = 6                    // in.h:173:1:
+	IPV6_2292RTHDR                   = 5                    // in.h:172:1:
+	IPV6_ADDRFORM                    = 1                    // in.h:168:1:
+	IPV6_ADDR_PREFERENCES            = 72                   // in.h:223:1:
+	IPV6_ADD_MEMBERSHIP              = 20                   // in.h:237:1:
+	IPV6_AUTHHDR                     = 10                   // in.h:180:1:
+	IPV6_AUTOFLOWLABEL               = 70                   // in.h:220:1:
+	IPV6_CHECKSUM                    = 7                    // in.h:174:1:
+	IPV6_DONTFRAG                    = 62                   // in.h:214:1:
+	IPV6_DROP_MEMBERSHIP             = 21                   // in.h:238:1:
+	IPV6_DSTOPTS                     = 59                   // in.h:211:1:
+	IPV6_FREEBIND                    = 78                   // in.h:233:1:
+	IPV6_HDRINCL                     = 36                   // in.h:198:1:
+	IPV6_HOPLIMIT                    = 52                   // in.h:204:1:
+	IPV6_HOPOPTS                     = 54                   // in.h:206:1:
+	IPV6_IPSEC_POLICY                = 34                   // in.h:196:1:
+	IPV6_JOIN_ANYCAST                = 27                   // in.h:192:1:
+	IPV6_JOIN_GROUP                  = 20                   // in.h:185:1:
+	IPV6_LEAVE_ANYCAST               = 28                   // in.h:193:1:
+	IPV6_LEAVE_GROUP                 = 21                   // in.h:186:1:
+	IPV6_MINHOPCOUNT                 = 73                   // in.h:226:1:
+	IPV6_MTU                         = 24                   // in.h:189:1:
+	IPV6_MTU_DISCOVER                = 23                   // in.h:188:1:
+	IPV6_MULTICAST_ALL               = 29                   // in.h:194:1:
+	IPV6_MULTICAST_HOPS              = 18                   // in.h:183:1:
+	IPV6_MULTICAST_IF                = 17                   // in.h:182:1:
+	IPV6_MULTICAST_LOOP              = 19                   // in.h:184:1:
+	IPV6_NEXTHOP                     = 9                    // in.h:179:1:
+	IPV6_ORIGDSTADDR                 = 74                   // in.h:228:1:
+	IPV6_PATHMTU                     = 61                   // in.h:213:1:
+	IPV6_PKTINFO                     = 50                   // in.h:202:1:
+	IPV6_PMTUDISC_DO                 = 2                    // in.h:246:1:
+	IPV6_PMTUDISC_DONT               = 0                    // in.h:244:1:
+	IPV6_PMTUDISC_INTERFACE          = 4                    // in.h:248:1:
+	IPV6_PMTUDISC_OMIT               = 5                    // in.h:249:1:
+	IPV6_PMTUDISC_PROBE              = 3                    // in.h:247:1:
+	IPV6_PMTUDISC_WANT               = 1                    // in.h:245:1:
+	IPV6_RECVDSTOPTS                 = 58                   // in.h:210:1:
+	IPV6_RECVERR                     = 25                   // in.h:190:1:
+	IPV6_RECVFRAGSIZE                = 77                   // in.h:232:1:
+	IPV6_RECVHOPLIMIT                = 51                   // in.h:203:1:
+	IPV6_RECVHOPOPTS                 = 53                   // in.h:205:1:
+	IPV6_RECVORIGDSTADDR             = 74                   // in.h:229:1:
+	IPV6_RECVPATHMTU                 = 60                   // in.h:212:1:
+	IPV6_RECVPKTINFO                 = 49                   // in.h:201:1:
+	IPV6_RECVRTHDR                   = 56                   // in.h:208:1:
+	IPV6_RECVTCLASS                  = 66                   // in.h:217:1:
+	IPV6_ROUTER_ALERT                = 22                   // in.h:187:1:
+	IPV6_ROUTER_ALERT_ISOLATE        = 30                   // in.h:195:1:
+	IPV6_RTHDR                       = 57                   // in.h:209:1:
+	IPV6_RTHDRDSTOPTS                = 55                   // in.h:207:1:
+	IPV6_RTHDR_LOOSE                 = 0                    // in.h:256:1:
+	IPV6_RTHDR_STRICT                = 1                    // in.h:257:1:
+	IPV6_RTHDR_TYPE_0                = 0                    // in.h:259:1:
+	IPV6_RXDSTOPTS                   = 59                   // in.h:241:1:
+	IPV6_RXHOPOPTS                   = 54                   // in.h:240:1:
+	IPV6_TCLASS                      = 67                   // in.h:218:1:
+	IPV6_TRANSPARENT                 = 75                   // in.h:230:1:
+	IPV6_UNICAST_HOPS                = 16                   // in.h:181:1:
+	IPV6_UNICAST_IF                  = 76                   // in.h:231:1:
+	IPV6_V6ONLY                      = 26                   // in.h:191:1:
+	IPV6_XFRM_POLICY                 = 35                   // in.h:197:1:
+	IP_ADD_MEMBERSHIP                = 35                   // in.h:121:1:
+	IP_ADD_SOURCE_MEMBERSHIP         = 39                   // in.h:125:1:
+	IP_BIND_ADDRESS_NO_PORT          = 24                   // in.h:103:1:
+	IP_BLOCK_SOURCE                  = 38                   // in.h:124:1:
+	IP_CHECKSUM                      = 23                   // in.h:102:1:
+	IP_DEFAULT_MULTICAST_LOOP        = 1                    // in.h:135:1:
+	IP_DEFAULT_MULTICAST_TTL         = 1                    // in.h:134:1:
+	IP_DROP_MEMBERSHIP               = 36                   // in.h:122:1:
+	IP_DROP_SOURCE_MEMBERSHIP        = 40                   // in.h:126:1:
+	IP_FREEBIND                      = 15                   // in.h:89:1:
+	IP_HDRINCL                       = 3                    // in.h:48:1:
+	IP_IPSEC_POLICY                  = 16                   // in.h:90:1:
+	IP_MAX_MEMBERSHIPS               = 20                   // in.h:136:1:
+	IP_MINTTL                        = 21                   // in.h:100:1:
+	IP_MSFILTER                      = 41                   // in.h:127:1:
+	IP_MTU                           = 14                   // in.h:88:1:
+	IP_MTU_DISCOVER                  = 10                   // in.h:84:1:
+	IP_MULTICAST_ALL                 = 49                   // in.h:128:1:
+	IP_MULTICAST_IF                  = 32                   // in.h:118:1:
+	IP_MULTICAST_LOOP                = 34                   // in.h:120:1:
+	IP_MULTICAST_TTL                 = 33                   // in.h:119:1:
+	IP_NODEFRAG                      = 22                   // in.h:101:1:
+	IP_OPTIONS                       = 4                    // in.h:47:1:
+	IP_ORIGDSTADDR                   = 20                   // in.h:97:1:
+	IP_PASSSEC                       = 18                   // in.h:92:1:
+	IP_PKTINFO                       = 8                    // in.h:81:1:
+	IP_PKTOPTIONS                    = 9                    // in.h:82:1:
+	IP_PMTUDISC                      = 10                   // in.h:83:1:
+	IP_PMTUDISC_DO                   = 2                    // in.h:109:1:
+	IP_PMTUDISC_DONT                 = 0                    // in.h:107:1:
+	IP_PMTUDISC_INTERFACE            = 4                    // in.h:114:1:
+	IP_PMTUDISC_OMIT                 = 5                    // in.h:116:1:
+	IP_PMTUDISC_PROBE                = 3                    // in.h:110:1:
+	IP_PMTUDISC_WANT                 = 1                    // in.h:108:1:
+	IP_RECVERR                       = 11                   // in.h:85:1:
+	IP_RECVFRAGSIZE                  = 25                   // in.h:104:1:
+	IP_RECVOPTS                      = 6                    // in.h:51:1:
+	IP_RECVORIGDSTADDR               = 20                   // in.h:98:1:
+	IP_RECVRETOPTS                   = 7                    // in.h:53:1:
+	IP_RECVTOS                       = 13                   // in.h:87:1:
+	IP_RECVTTL                       = 12                   // in.h:86:1:
+	IP_RETOPTS                       = 7                    // in.h:54:1:
+	IP_ROUTER_ALERT                  = 5                    // in.h:80:1:
+	IP_TOS                           = 1                    // in.h:49:1:
+	IP_TRANSPARENT                   = 19                   // in.h:93:1:
+	IP_TTL                           = 2                    // in.h:50:1:
+	IP_UNBLOCK_SOURCE                = 37                   // in.h:123:1:
+	IP_UNICAST_IF                    = 50                   // in.h:129:1:
+	IP_XFRM_POLICY                   = 17                   // in.h:91:1:
+	LITTLE_ENDIAN                    = 1234                 // endian.h:27:1:
+	MCAST_BLOCK_SOURCE               = 43                   // in.h:67:1:
+	MCAST_EXCLUDE                    = 0                    // in.h:76:1:
+	MCAST_INCLUDE                    = 1                    // in.h:77:1:
+	MCAST_JOIN_GROUP                 = 42                   // in.h:66:1:
+	MCAST_JOIN_SOURCE_GROUP          = 46                   // in.h:70:1:
+	MCAST_LEAVE_GROUP                = 45                   // in.h:69:1:
+	MCAST_LEAVE_SOURCE_GROUP         = 47                   // in.h:71:1:
+	MCAST_MSFILTER                   = 48                   // in.h:72:1:
+	MCAST_UNBLOCK_SOURCE             = 44                   // in.h:68:1:
+	NETDB_INTERNAL                   = -1                   // netdb.h:72:1:
+	NETDB_SUCCESS                    = 0                    // netdb.h:73:1:
+	NI_DGRAM                         = 16                   // netdb.h:646:1:
+	NI_MAXHOST                       = 1025                 // netdb.h:638:1:
+	NI_MAXSERV                       = 32                   // netdb.h:639:1:
+	NI_NAMEREQD                      = 8                    // netdb.h:645:1:
+	NI_NOFQDN                        = 4                    // netdb.h:644:1:
+	NI_NUMERICHOST                   = 1                    // netdb.h:642:1:
+	NI_NUMERICSERV                   = 2                    // netdb.h:643:1:
+	NO_ADDRESS                       = 4                    // netdb.h:74:1:
+	NO_DATA                          = 4                    // netdb.h:68:1:
+	NO_RECOVERY                      = 3                    // netdb.h:66:1:
+	PDP_ENDIAN                       = 3412                 // endian.h:29:1:
+	PF_ALG                           = 38                   // socket.h:82:1:
+	PF_APPLETALK                     = 5                    // socket.h:48:1:
+	PF_ASH                           = 18                   // socket.h:62:1:
+	PF_ATMPVC                        = 8                    // socket.h:51:1:
+	PF_ATMSVC                        = 20                   // socket.h:64:1:
+	PF_AX25                          = 3                    // socket.h:46:1:
+	PF_BLUETOOTH                     = 31                   // socket.h:75:1:
+	PF_BRIDGE                        = 7                    // socket.h:50:1:
+	PF_CAIF                          = 37                   // socket.h:81:1:
+	PF_CAN                           = 29                   // socket.h:73:1:
+	PF_DECnet                        = 12                   // socket.h:55:1:
+	PF_ECONET                        = 19                   // socket.h:63:1:
+	PF_FILE                          = 1                    // socket.h:44:1:
+	PF_IB                            = 27                   // socket.h:71:1:
+	PF_IEEE802154                    = 36                   // socket.h:80:1:
+	PF_INET                          = 2                    // socket.h:45:1:
+	PF_INET6                         = 10                   // socket.h:53:1:
+	PF_IPX                           = 4                    // socket.h:47:1:
+	PF_IRDA                          = 23                   // socket.h:67:1:
+	PF_ISDN                          = 34                   // socket.h:78:1:
+	PF_IUCV                          = 32                   // socket.h:76:1:
+	PF_KCM                           = 41                   // socket.h:85:1:
+	PF_KEY                           = 15                   // socket.h:58:1:
+	PF_LLC                           = 26                   // socket.h:70:1:
+	PF_LOCAL                         = 1                    // socket.h:42:1:
+	PF_MAX                           = 45                   // socket.h:89:1:
+	PF_MPLS                          = 28                   // socket.h:72:1:
+	PF_NETBEUI                       = 13                   // socket.h:56:1:
+	PF_NETLINK                       = 16                   // socket.h:59:1:
+	PF_NETROM                        = 6                    // socket.h:49:1:
+	PF_NFC                           = 39                   // socket.h:83:1:
+	PF_PACKET                        = 17                   // socket.h:61:1:
+	PF_PHONET                        = 35                   // socket.h:79:1:
+	PF_PPPOX                         = 24                   // socket.h:68:1:
+	PF_QIPCRTR                       = 42                   // socket.h:86:1:
+	PF_RDS                           = 21                   // socket.h:65:1:
+	PF_ROSE                          = 11                   // socket.h:54:1:
+	PF_ROUTE                         = 16                   // socket.h:60:1:
+	PF_RXRPC                         = 33                   // socket.h:77:1:
+	PF_SECURITY                      = 14                   // socket.h:57:1:
+	PF_SMC                           = 43                   // socket.h:87:1:
+	PF_SNA                           = 22                   // socket.h:66:1:
+	PF_TIPC                          = 30                   // socket.h:74:1:
+	PF_UNIX                          = 1                    // socket.h:43:1:
+	PF_UNSPEC                        = 0                    // socket.h:41:1:
+	PF_VSOCK                         = 40                   // socket.h:84:1:
+	PF_WANPIPE                       = 25                   // socket.h:69:1:
+	PF_X25                           = 9                    // socket.h:52:1:
+	PF_XDP                           = 44                   // socket.h:88:1:
+	SCM_TIMESTAMP                    = 29                   // socket.h:140:1:
+	SCM_TIMESTAMPING                 = 37                   // socket.h:142:1:
+	SCM_TIMESTAMPING_OPT_STATS       = 54                   // socket.h:90:1:
+	SCM_TIMESTAMPING_PKTINFO         = 58                   // socket.h:98:1:
+	SCM_TIMESTAMPNS                  = 35                   // socket.h:141:1:
+	SCM_TXTIME                       = 61                   // socket.h:105:1:
+	SCM_WIFI_STATUS                  = 41                   // socket.h:64:1:
+	SIOCATMARK                       = 0x8905               // sockios.h:10:1:
+	SIOCGPGRP                        = 0x8904               // sockios.h:9:1:
+	SIOCGSTAMP                       = 0x8906               // sockios.h:11:1:
+	SIOCGSTAMPNS                     = 0x8907               // sockios.h:12:1:
+	SIOCSPGRP                        = 0x8902               // sockios.h:7:1:
+	SOL_AAL                          = 265                  // socket.h:151:1:
+	SOL_ALG                          = 279                  // socket.h:165:1:
+	SOL_ATM                          = 264                  // socket.h:150:1:
+	SOL_BLUETOOTH                    = 274                  // socket.h:160:1:
+	SOL_CAIF                         = 278                  // socket.h:164:1:
+	SOL_DCCP                         = 269                  // socket.h:155:1:
+	SOL_DECNET                       = 261                  // socket.h:147:1:
+	SOL_ICMPV6                       = 58                   // in.h:253:1:
+	SOL_IP                           = 0                    // in.h:132:1:
+	SOL_IPV6                         = 41                   // in.h:252:1:
+	SOL_IRDA                         = 266                  // socket.h:152:1:
+	SOL_IUCV                         = 277                  // socket.h:163:1:
+	SOL_KCM                          = 281                  // socket.h:167:1:
+	SOL_LLC                          = 268                  // socket.h:154:1:
+	SOL_NETBEUI                      = 267                  // socket.h:153:1:
+	SOL_NETLINK                      = 270                  // socket.h:156:1:
+	SOL_NFC                          = 280                  // socket.h:166:1:
+	SOL_PACKET                       = 263                  // socket.h:149:1:
+	SOL_PNPIPE                       = 275                  // socket.h:161:1:
+	SOL_PPPOL2TP                     = 273                  // socket.h:159:1:
+	SOL_RAW                          = 255                  // socket.h:146:1:
+	SOL_RDS                          = 276                  // socket.h:162:1:
+	SOL_RXRPC                        = 272                  // socket.h:158:1:
+	SOL_SOCKET                       = 1                    // socket.h:9:1:
+	SOL_TIPC                         = 271                  // socket.h:157:1:
+	SOL_TLS                          = 282                  // socket.h:168:1:
+	SOL_X25                          = 262                  // socket.h:148:1:
+	SOL_XDP                          = 283                  // socket.h:169:1:
+	SOMAXCONN                        = 4096                 // socket.h:172:1:
+	SO_ACCEPTCONN                    = 30                   // socket.h:51:1:
+	SO_ATTACH_BPF                    = 50                   // socket.h:82:1:
+	SO_ATTACH_FILTER                 = 26                   // socket.h:45:1:
+	SO_ATTACH_REUSEPORT_CBPF         = 51                   // socket.h:85:1:
+	SO_ATTACH_REUSEPORT_EBPF         = 52                   // socket.h:86:1:
+	SO_BINDTODEVICE                  = 25                   // socket.h:42:1:
+	SO_BINDTOIFINDEX                 = 62                   // socket.h:107:1:
+	SO_BPF_EXTENSIONS                = 48                   // socket.h:78:1:
+	SO_BROADCAST                     = 6                    // socket.h:16:1:
+	SO_BSDCOMPAT                     = 14                   // socket.h:26:1:
+	SO_BUSY_POLL                     = 46                   // socket.h:74:1:
+	SO_CNX_ADVICE                    = 53                   // socket.h:88:1:
+	SO_COOKIE                        = 57                   // socket.h:96:1:
+	SO_DEBUG                         = 1                    // socket.h:11:1:
+	SO_DETACH_BPF                    = 27                   // socket.h:83:1:
+	SO_DETACH_FILTER                 = 27                   // socket.h:46:1:
+	SO_DETACH_REUSEPORT_BPF          = 68                   // socket.h:120:1:
+	SO_DOMAIN                        = 39                   // socket.h:59:1:
+	SO_DONTROUTE                     = 5                    // socket.h:15:1:
+	SO_ERROR                         = 4                    // socket.h:14:1:
+	SO_GET_FILTER                    = 26                   // socket.h:47:1:
+	SO_INCOMING_CPU                  = 49                   // socket.h:80:1:
+	SO_INCOMING_NAPI_ID              = 56                   // socket.h:94:1:
+	SO_KEEPALIVE                     = 9                    // socket.h:21:1:
+	SO_LINGER                        = 13                   // socket.h:25:1:
+	SO_LOCK_FILTER                   = 44                   // socket.h:70:1:
+	SO_MARK                          = 36                   // socket.h:56:1:
+	SO_MAX_PACING_RATE               = 47                   // socket.h:76:1:
+	SO_MEMINFO                       = 55                   // socket.h:92:1:
+	SO_NOFCS                         = 43                   // socket.h:68:1:
+	SO_NO_CHECK                      = 11                   // socket.h:23:1:
+	SO_OOBINLINE                     = 10                   // socket.h:22:1:
+	SO_PASSCRED                      = 16                   // socket.h:29:1:
+	SO_PASSSEC                       = 34                   // socket.h:54:1:
+	SO_PEEK_OFF                      = 42                   // socket.h:65:1:
+	SO_PEERCRED                      = 17                   // socket.h:30:1:
+	SO_PEERGROUPS                    = 59                   // socket.h:100:1:
+	SO_PEERNAME                      = 28                   // socket.h:49:1:
+	SO_PEERSEC                       = 31                   // socket.h:53:1:
+	SO_PRIORITY                      = 12                   // socket.h:24:1:
+	SO_PROTOCOL                      = 38                   // socket.h:58:1:
+	SO_RCVBUF                        = 8                    // socket.h:18:1:
+	SO_RCVBUFFORCE                   = 33                   // socket.h:20:1:
+	SO_RCVLOWAT                      = 18                   // socket.h:31:1:
+	SO_RCVTIMEO                      = 20                   // socket.h:129:1:
+	SO_RCVTIMEO_NEW                  = 66                   // socket.h:117:1:
+	SO_RCVTIMEO_OLD                  = 20                   // socket.h:33:1:
+	SO_REUSEADDR                     = 2                    // socket.h:12:1:
+	SO_REUSEPORT                     = 15                   // socket.h:27:1:
+	SO_RXQ_OVFL                      = 40                   // socket.h:61:1:
+	SO_SECURITY_AUTHENTICATION       = 22                   // socket.h:38:1:
+	SO_SECURITY_ENCRYPTION_NETWORK   = 24                   // socket.h:40:1:
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 23                   // socket.h:39:1:
+	SO_SELECT_ERR_QUEUE              = 45                   // socket.h:72:1:
+	SO_SNDBUF                        = 7                    // socket.h:17:1:
+	SO_SNDBUFFORCE                   = 32                   // socket.h:19:1:
+	SO_SNDLOWAT                      = 19                   // socket.h:32:1:
+	SO_SNDTIMEO                      = 21                   // socket.h:130:1:
+	SO_SNDTIMEO_NEW                  = 67                   // socket.h:118:1:
+	SO_SNDTIMEO_OLD                  = 21                   // socket.h:34:1:
+	SO_TIMESTAMP                     = 29                   // socket.h:125:1:
+	SO_TIMESTAMPING                  = 37                   // socket.h:127:1:
+	SO_TIMESTAMPING_NEW              = 65                   // socket.h:115:1:
+	SO_TIMESTAMPING_OLD              = 37                   // socket.h:111:1:
+	SO_TIMESTAMPNS                   = 35                   // socket.h:126:1:
+	SO_TIMESTAMPNS_NEW               = 64                   // socket.h:114:1:
+	SO_TIMESTAMPNS_OLD               = 35                   // socket.h:110:1:
+	SO_TIMESTAMP_NEW                 = 63                   // socket.h:113:1:
+	SO_TIMESTAMP_OLD                 = 29                   // socket.h:109:1:
+	SO_TXTIME                        = 61                   // socket.h:104:1:
+	SO_TYPE                          = 3                    // socket.h:13:1:
+	SO_WIFI_STATUS                   = 41                   // socket.h:63:1:
+	SO_ZEROCOPY                      = 60                   // socket.h:102:1:
+	TRY_AGAIN                        = 2                    // netdb.h:64:1:
+	X_ASM_X86_POSIX_TYPES_64_H       = 0                    // posix_types_64.h:3:1:
+	X_ATFILE_SOURCE                  = 1                    // features.h:342:1:
+	X_BITS_BYTESWAP_H                = 1                    // byteswap.h:24:1:
+	X_BITS_ENDIANNESS_H              = 1                    // endianness.h:2:1:
+	X_BITS_ENDIAN_H                  = 1                    // endian.h:20:1:
+	X_BITS_PTHREADTYPES_ARCH_H       = 1                    // pthreadtypes-arch.h:19:1:
+	X_BITS_PTHREADTYPES_COMMON_H     = 1                    // pthreadtypes.h:20:1:
+	X_BITS_SOCKADDR_H                = 1                    // sockaddr.h:24:1:
+	X_BITS_STDINT_INTN_H             = 1                    // stdint-intn.h:20:1:
+	X_BITS_STDINT_UINTN_H            = 1                    // stdint-uintn.h:20:1:
+	X_BITS_TIME64_H                  = 1                    // time64.h:24:1:
+	X_BITS_TYPESIZES_H               = 1                    // typesizes.h:24:1:
+	X_BITS_TYPES_H                   = 1                    // types.h:24:1:
+	X_BITS_UINTN_IDENTITY_H          = 1                    // uintn-identity.h:24:1:
+	X_BSD_SIZE_T_                    = 0                    // stddef.h:189:1:
+	X_BSD_SIZE_T_DEFINED_            = 0                    // stddef.h:192:1:
+	X_DEFAULT_SOURCE                 = 1                    // features.h:227:1:
+	X_ENDIAN_H                       = 1                    // endian.h:19:1:
+	X_FEATURES_H                     = 1                    // features.h:19:1:
+	X_FILE_OFFSET_BITS               = 64                   // <builtin>:25:1:
+	X_GCC_SIZE_T                     = 0                    // stddef.h:195:1:
+	X_LINUX_POSIX_TYPES_H            = 0                    // posix_types.h:3:1:
+	X_LP64                           = 1                    // <predefined>:284:1:
+	X_NETDB_H                        = 1                    // netdb.h:23:1:
+	X_NETINET_IN_H                   = 1                    // in.h:19:1:
+	X_PATH_HEQUIV                    = "/etc/hosts.equiv"   // netdb.h:43:1:
+	X_PATH_HOSTS                     = "/etc/hosts"         // netdb.h:44:1:
+	X_PATH_NETWORKS                  = "/etc/networks"      // netdb.h:45:1:
+	X_PATH_NSSWITCH_CONF             = "/etc/nsswitch.conf" // netdb.h:46:1:
+	X_PATH_PROTOCOLS                 = "/etc/protocols"     // netdb.h:47:1:
+	X_PATH_SERVICES                  = "/etc/services"      // netdb.h:48:1:
+	X_POSIX_C_SOURCE                 = 200809               // features.h:281:1:
+	X_POSIX_SOURCE                   = 1                    // features.h:279:1:
+	X_RPC_NETDB_H                    = 1                    // netdb.h:37:1:
+	X_RWLOCK_INTERNAL_H              = 0                    // struct_rwlock.h:21:1:
+	X_SIZET_                         = 0                    // stddef.h:196:1:
+	X_SIZE_T                         = 0                    // stddef.h:183:1:
+	X_SIZE_T_                        = 0                    // stddef.h:188:1:
+	X_SIZE_T_DECLARED                = 0                    // stddef.h:193:1:
+	X_SIZE_T_DEFINED                 = 0                    // stddef.h:191:1:
+	X_SIZE_T_DEFINED_                = 0                    // stddef.h:190:1:
+	X_SS_SIZE                        = 128                  // sockaddr.h:40:1:
+	X_STDC_PREDEF_H                  = 1                    // <predefined>:162:1:
+	X_STRUCT_TIMESPEC                = 1                    // struct_timespec.h:3:1:
+	X_SYS_CDEFS_H                    = 1                    // cdefs.h:19:1:
+	X_SYS_SELECT_H                   = 1                    // select.h:22:1:
+	X_SYS_SIZE_T_H                   = 0                    // stddef.h:184:1:
+	X_SYS_SOCKET_H                   = 1                    // socket.h:20:1:
+	X_SYS_TYPES_H                    = 1                    // types.h:23:1:
+	X_THREAD_MUTEX_INTERNAL_H        = 1                    // struct_mutex.h:20:1:
+	X_THREAD_SHARED_TYPES_H          = 1                    // thread-shared-types.h:20:1:
+	X_T_SIZE                         = 0                    // stddef.h:186:1:
+	X_T_SIZE_                        = 0                    // stddef.h:185:1:
+	Linux                            = 1                    // <predefined>:231:1:
+	Unix                             = 1                    // <predefined>:177:1:
+)
+
+// Standard well-known ports.
+const ( /* in.h:122:1: */
+	IPPORT_ECHO       = 7  // Echo service.
+	IPPORT_DISCARD    = 9  // Discard transmissions service.
+	IPPORT_SYSTAT     = 11 // System status service.
+	IPPORT_DAYTIME    = 13 // Time of day service.
+	IPPORT_NETSTAT    = 15 // Network status service.
+	IPPORT_FTP        = 21 // File Transfer Protocol.
+	IPPORT_TELNET     = 23 // Telnet protocol.
+	IPPORT_SMTP       = 25 // Simple Mail Transfer Protocol.
+	IPPORT_TIMESERVER = 37 // Timeserver service.
+	IPPORT_NAMESERVER = 42 // Domain Name Service.
+	IPPORT_WHOIS      = 43 // Internet Whois service.
+	IPPORT_MTP        = 57
+
+	IPPORT_TFTP    = 69 // Trivial File Transfer Protocol.
+	IPPORT_RJE     = 77
+	IPPORT_FINGER  = 79 // Finger service.
+	IPPORT_TTYLINK = 87
+	IPPORT_SUPDUP  = 95 // SUPDUP protocol.
+
+	IPPORT_EXECSERVER  = 512 // execd service.
+	IPPORT_LOGINSERVER = 513 // rlogind service.
+	IPPORT_CMDSERVER   = 514
+	IPPORT_EFSSERVER   = 520
+
+	// UDP ports.
+	IPPORT_BIFFUDP     = 512
+	IPPORT_WHOSERVER   = 513
+	IPPORT_ROUTESERVER = 520
+
+	// Ports less than this value are reserved for privileged processes.
+	IPPORT_RESERVED = 1024
+
+	// Ports greater this value are reserved for (non-privileged) servers.
+	IPPORT_USERRESERVED = 5000
+)
+
+// Options for use with `getsockopt' and `setsockopt' at the IPv6 level.
+//    The first word in the comment at the right is the data type used;
+//    "bool" means a boolean value stored in an `int'.
+
+// Advanced API (RFC3542) (1).
+
+// Advanced API (RFC3542) (2).
+
+// RFC5014.
+
+// RFC5082.
+
+// Obsolete synonyms for the above.
+
+// IPV6_MTU_DISCOVER values.
+
+// Socket level values for IPv6.
+
+// Routing header options for IPv6.
+
+// Standard well-defined IP protocols.
+const ( /* in.h:40:1: */
+	IPPROTO_IP      = 0   // Dummy protocol for TCP.
+	IPPROTO_ICMP    = 1   // Internet Control Message Protocol.
+	IPPROTO_IGMP    = 2   // Internet Group Management Protocol.
+	IPPROTO_IPIP    = 4   // IPIP tunnels (older KA9Q tunnels use 94).
+	IPPROTO_TCP     = 6   // Transmission Control Protocol.
+	IPPROTO_EGP     = 8   // Exterior Gateway Protocol.
+	IPPROTO_PUP     = 12  // PUP protocol.
+	IPPROTO_UDP     = 17  // User Datagram Protocol.
+	IPPROTO_IDP     = 22  // XNS IDP protocol.
+	IPPROTO_TP      = 29  // SO Transport Protocol Class 4.
+	IPPROTO_DCCP    = 33  // Datagram Congestion Control Protocol.
+	IPPROTO_IPV6    = 41  // IPv6 header.
+	IPPROTO_RSVP    = 46  // Reservation Protocol.
+	IPPROTO_GRE     = 47  // General Routing Encapsulation.
+	IPPROTO_ESP     = 50  // encapsulating security payload.
+	IPPROTO_AH      = 51  // authentication header.
+	IPPROTO_MTP     = 92  // Multicast Transport Protocol.
+	IPPROTO_BEETPH  = 94  // IP option pseudo header for BEET.
+	IPPROTO_ENCAP   = 98  // Encapsulation Header.
+	IPPROTO_PIM     = 103 // Protocol Independent Multicast.
+	IPPROTO_COMP    = 108 // Compression Header Protocol.
+	IPPROTO_SCTP    = 132 // Stream Control Transmission Protocol.
+	IPPROTO_UDPLITE = 136 // UDP-Lite protocol.
+	IPPROTO_MPLS    = 137 // MPLS in IP.
+	IPPROTO_RAW     = 255 // Raw IP packets.
+	IPPROTO_MAX     = 256
+)
+
+// If __USE_KERNEL_IPV6_DEFS is 1 then the user has included the kernel
+//
+//	network headers first and we should use those ABI-identical definitions
+//	instead of our own, otherwise 0.
+const ( /* in.h:99:1: */
+	IPPROTO_HOPOPTS  = 0  // IPv6 Hop-by-Hop options.
+	IPPROTO_ROUTING  = 43 // IPv6 routing header.
+	IPPROTO_FRAGMENT = 44 // IPv6 fragmentation header.
+	IPPROTO_ICMPV6   = 58 // ICMPv6.
+	IPPROTO_NONE     = 59 // IPv6 no next header.
+	IPPROTO_DSTOPTS  = 60 // IPv6 destination options.
+	IPPROTO_MH       = 135
+)
+
+// Bits in the FLAGS argument to `send', `recv', et al.
+const ( /* socket.h:200:1: */
+	MSG_OOB        = 1  // Process out-of-band data.
+	MSG_PEEK       = 2  // Peek at incoming messages.
+	MSG_DONTROUTE  = 4  // Don't use local routing.
+	MSG_CTRUNC     = 8  // Control data lost before delivery.
+	MSG_PROXY      = 16 // Supply or ask second address.
+	MSG_TRUNC      = 32
+	MSG_DONTWAIT   = 64  // Nonblocking IO.
+	MSG_EOR        = 128 // End of record.
+	MSG_WAITALL    = 256 // Wait for a full request.
+	MSG_FIN        = 512
+	MSG_SYN        = 1024
+	MSG_CONFIRM    = 2048 // Confirm path validity.
+	MSG_RST        = 4096
+	MSG_ERRQUEUE   = 8192      // Fetch message from error queue.
+	MSG_NOSIGNAL   = 16384     // Do not generate SIGPIPE.
+	MSG_MORE       = 32768     // Sender will send more.
+	MSG_WAITFORONE = 65536     // Wait for at least one packet to return.
+	MSG_BATCH      = 262144    // sendmmsg: more messages coming.
+	MSG_ZEROCOPY   = 67108864  // Use user data in kernel path.
+	MSG_FASTOPEN   = 536870912 // Send data in TCP SYN.
+
+	MSG_CMSG_CLOEXEC = 1073741824
+)
+
+// Socket level message types.  This must match the definitions in
+//
+//	<linux/socket.h>.
+const ( /* socket.h:332:1: */
+	SCM_RIGHTS = 1
+)
+
+// Get the architecture-dependent definition of enum __socket_type.
+// Define enum __socket_type for generic Linux.
+//    Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Types of sockets.
+const ( /* socket_type.h:24:1: */
+	SOCK_STREAM = 1 // Sequenced, reliable, connection-based
+	// 				   byte streams.
+	SOCK_DGRAM = 2 // Connectionless, unreliable datagrams
+	// 				   of fixed maximum length.
+	SOCK_RAW       = 3 // Raw protocol interface.
+	SOCK_RDM       = 4 // Reliably-delivered messages.
+	SOCK_SEQPACKET = 5 // Sequenced, reliable, connection-based,
+	// 				   datagrams of fixed maximum length.
+	SOCK_DCCP   = 6  // Datagram Congestion Control Protocol.
+	SOCK_PACKET = 10 // Linux specific way of getting packets
+	// 				   at the dev level.  For writing rarp and
+	// 				   other similar things on the user level.
+
+	// Flags to be ORed into the type parameter of socket and socketpair and
+	//      used for the flags parameter of paccept.
+
+	SOCK_CLOEXEC = 524288 // Atomically set close-on-exec flag for the
+	// 				   new descriptor(s).
+	SOCK_NONBLOCK = 2048
+)
+
+// The following constants should be used for the second parameter of
+//
+//	`shutdown'.
+const ( /* socket.h:41:1: */
+	SHUT_RD   = 0 // No more receptions.
+	SHUT_WR   = 1 // No more transmissions.
+	SHUT_RDWR = 2
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// All data returned by the network data base library are supplied in
+//    host order and returned in network order (suitable for use in
+//    system calls).
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// These are defined by the user (or the compiler)
+//    to specify the desired environment:
+//
+//    __STRICT_ANSI__	ISO Standard C.
+//    _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
+//    _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
+//    _ISOC2X_SOURCE	Extensions to ISO C99 from ISO C2X.
+//    __STDC_WANT_LIB_EXT2__
+// 			Extensions to ISO C99 from TR 27431-2:2010.
+//    __STDC_WANT_IEC_60559_BFP_EXT__
+// 			Extensions to ISO C11 from TS 18661-1:2014.
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__
+// 			Extensions to ISO C11 from TS 18661-4:2015.
+//    __STDC_WANT_IEC_60559_TYPES_EXT__
+// 			Extensions to ISO C11 from TS 18661-3:2015.
+//
+//    _POSIX_SOURCE	IEEE Std 1003.1.
+//    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
+// 			if >=199309L, add IEEE Std 1003.1b-1993;
+// 			if >=199506L, add IEEE Std 1003.1c-1995;
+// 			if >=200112L, all of IEEE 1003.1-2004
+// 			if >=200809L, all of IEEE 1003.1-2008
+//    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
+// 			Single Unix conformance is wanted, to 600 for the
+// 			sixth revision, to 700 for the seventh revision.
+//    _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
+//    _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
+//    _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
+//    _FILE_OFFSET_BITS=N	Select default filesystem interface.
+//    _ATFILE_SOURCE	Additional *at interfaces.
+//    _GNU_SOURCE		All of the above, plus GNU extensions.
+//    _DEFAULT_SOURCE	The default set of features (taking precedence over
+// 			__STRICT_ANSI__).
+//
+//    _FORTIFY_SOURCE	Add security hardening to many library functions.
+// 			Set to 1 or 2; 2 performs stricter checks than 1.
+//
+//    _REENTRANT, _THREAD_SAFE
+// 			Obsolete; equivalent to _POSIX_C_SOURCE=199506L.
+//
+//    The `-ansi' switch to the GNU C compiler, and standards conformance
+//    options such as `-std=c99', define __STRICT_ANSI__.  If none of
+//    these are defined, or if _DEFAULT_SOURCE is defined, the default is
+//    to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
+//    200809L, as well as enabling miscellaneous functions from BSD and
+//    SVID.  If more than one of these are defined, they accumulate.  For
+//    example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
+//    give you ISO C, 1003.1, and 1003.2, but nothing else.
+//
+//    These are defined by this file and are used by the
+//    header files to decide what to declare or define:
+//
+//    __GLIBC_USE (F)	Define things from feature set F.  This is defined
+// 			to 1 or 0; the subsequent macros are either defined
+// 			or undefined, and those tests should be moved to
+// 			__GLIBC_USE.
+//    __USE_ISOC11		Define ISO C11 things.
+//    __USE_ISOC99		Define ISO C99 things.
+//    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+//    __USE_ISOCXX11	Define ISO C++11 things.
+//    __USE_POSIX		Define IEEE Std 1003.1 things.
+//    __USE_POSIX2		Define IEEE Std 1003.2 things.
+//    __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
+//    __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
+//    __USE_XOPEN		Define XPG things.
+//    __USE_XOPEN_EXTENDED	Define X/Open Unix things.
+//    __USE_UNIX98		Define Single Unix V2 things.
+//    __USE_XOPEN2K        Define XPG6 things.
+//    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+//    __USE_XOPEN2K8       Define XPG7 things.
+//    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
+//    __USE_LARGEFILE	Define correct standard I/O things.
+//    __USE_LARGEFILE64	Define LFS things with separate names.
+//    __USE_FILE_OFFSET64	Define 64bit interface as default.
+//    __USE_MISC		Define things from 4.3BSD or System V Unix.
+//    __USE_ATFILE		Define *at interfaces and AT_* constants for them.
+//    __USE_GNU		Define GNU extensions.
+//    __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
+//
+//    The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
+//    defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
+//    only for compatibility.  All new code should use the other symbols
+//    to test for features.
+//
+//    All macros listed above as possibly being defined by this file are
+//    explicitly undefined if they are not explicitly defined.
+//    Feature-test macros that are not defined by the user or compiler
+//    but are implied by the other feature-test macros defined (or by the
+//    lack of any definitions) are defined by the file.
+//
+//    ISO C feature test macros depend on the definition of the macro
+//    when an affected header is included, not when the first system
+//    header is included, and so they are handled in
+//    <bits/libc-header-start.h>, which does not have a multiple include
+//    guard.  Feature test macros that can be handled from the first
+//    system header included are handled here.
+
+// Undefine everything, so we get a clean slate.
+
+// Suppress kernel-name space pollution unless user expressedly asks
+//    for it.
+
+// Convenience macro to test the version of gcc.
+//    Use like this:
+//    #if __GNUC_PREREQ (2,8)
+//    ... code requiring gcc 2.8 or later ...
+//    #endif
+//    Note: only works for GCC 2.0 and later, because __GNUC_MINOR__ was
+//    added in 2.0.
+
+// Similarly for clang.  Features added to GCC after version 4.2 may
+//    or may not also be available in clang, and clang's definitions of
+//    __GNUC(_MINOR)__ are fixed at 4 and 2 respectively.  Not all such
+//    features can be queried via __has_extension/__has_feature.
+
+// Whether to use feature set F.
+
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
+//    _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
+//    issue a warning; the expectation is that the source is being
+//    transitioned to use the new macro.
+
+// If _GNU_SOURCE was defined by the user, turn on all the other features.
+
+// If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
+//    define _DEFAULT_SOURCE.
+
+// This is to enable the ISO C2X extension.
+
+// This is to enable the ISO C11 extension.
+
+// This is to enable the ISO C99 extension.
+
+// This is to enable the ISO C90 Amendment 1:1995 extension.
+
+// If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
+//    is defined, use POSIX.1-2008 (or another version depending on
+//    _XOPEN_SOURCE).
+
+// Some C libraries once required _REENTRANT and/or _THREAD_SAFE to be
+//    defined in all multithreaded code.  GNU libc has not required this
+//    for many years.  We now treat them as compatibility synonyms for
+//    _POSIX_C_SOURCE=199506L, which is the earliest level of POSIX with
+//    comprehensive support for multithreaded code.  Using them never
+//    lowers the selected level of POSIX conformance, only raises it.
+
+// The function 'gets' existed in C89, but is impossible to use
+//    safely.  It has been removed from ISO C11 and ISO C++14.  Note: for
+//    compatibility with various implementations of <cstdio>, this test
+//    must consider only the value of __cplusplus when compiling C++.
+
+// GNU formerly extended the scanf functions with modified format
+//    specifiers %as, %aS, and %a[...] that allocate a buffer for the
+//    input using malloc.  This extension conflicts with ISO C99, which
+//    defines %a as a standalone format specifier that reads a floating-
+//    point number; moreover, POSIX.1-2008 provides the same feature
+//    using the modifier letter 'm' instead (%ms, %mS, %m[...]).
+//
+//    We now follow C99 unless GNU extensions are active and the compiler
+//    is specifically in C89 or C++98 mode (strict or not).  For
+//    instance, with GCC, -std=gnu11 will have C99-compliant scanf with
+//    or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
+//    old extension.
+
+// Get definitions of __STDC_* predefined macros, if the compiler has
+//    not preincluded this header automatically.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This macro indicates that the installed library is the GNU C Library.
+//    For historic reasons the value now is 6 and this will stay from now
+//    on.  The use of this variable is deprecated.  Use __GLIBC__ and
+//    __GLIBC_MINOR__ now (see below) when you want to test for a specific
+//    GNU C library version and use the values in <gnu/lib-names.h> to get
+//    the sonames of the shared libraries.
+
+// Major and minor version number of the GNU C library package.  Use
+//    these macros to test for features in specific releases.
+
+// This is here only because every header file already includes this one.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// We are almost always included from features.h.
+
+// The GNU libc does not support any K&R compilers or the traditional mode
+//    of ISO C compilers anymore.  Check for some of the combinations not
+//    anymore supported.
+
+// Some user header file might have defined this before.
+
+// All functions, except those with callbacks or those that
+//    synchronize memory, are leaf functions.
+
+// GCC can always grok prototypes.  For C++ programs we add throw()
+//    to help it optimize the function calls.  But this works only with
+//    gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+//    as non-throwing using a function attribute since programs can use
+//    the -fexceptions options for C code as well.
+
+// Compilers that are not clang may object to
+//        #if defined __clang__ && __has_extension(...)
+//    even though they do not need to evaluate the right-hand side of the &&.
+
+// These two macros are not used in glibc anymore.  They are kept here
+//    only because some other projects expect the macros to be defined.
+
+// For these things, GCC behaves the ANSI way normally,
+//    and the non-ANSI way under -traditional.
+
+// This is not a typedef so `const __ptr_t' does the right thing.
+
+// C++ needs to know that types and declarations are C, not C++.
+
+// Fortify support.
+
+// Support for flexible arrays.
+//    Headers that should use flexible arrays only if they're "real"
+//    (e.g. only if they won't affect sizeof()) should test
+//    #if __glibc_c99_flexarr_available.
+
+// __asm__ ("xyz") is used throughout the headers to rename functions
+//    at the assembly language level.  This is wrapped by the __REDIRECT
+//    macro, in order to support compilers that can do this some other
+//    way.  When compilers don't support asm-names at all, we have to do
+//    preprocessor tricks instead (which don't have exactly the right
+//    semantics, but it's the best we can do).
+//
+//    Example:
+//    int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid);
+
+//
+// #elif __SOME_OTHER_COMPILER__
+//
+// # define __REDIRECT(name, proto, alias) name proto; 	_Pragma("let " #name " = " #alias)
+
+// GCC has various useful declarations that can be made with the
+//    `__attribute__' syntax.  All of the ways we use this do fine if
+//    they are omitted for compilers that don't understand it.
+
+// At some point during the gcc 2.96 development the `malloc' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Tell the compiler which arguments to an allocation function
+//    indicate the size of the allocation.
+
+// At some point during the gcc 2.96 development the `pure' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// This declaration tells the compiler that the value is constant.
+
+// At some point during the gcc 3.1 development the `used' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Since version 3.2, gcc allows marking deprecated functions.
+
+// Since version 4.5, gcc also allows one to specify the message printed
+//    when a deprecated function is used.  clang claims to be gcc 4.2, but
+//    may also support this feature.
+
+// At some point during the gcc 2.8 development the `format_arg' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+//    If several `format_arg' attributes are given for the same function, in
+//    gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+//    all designated arguments are considered.
+
+// At some point during the gcc 2.97 development the `strfmon' format
+//    attribute for functions was introduced.  We don't want to use it
+//    unconditionally (although this would be possible) since it
+//    generates warnings.
+
+// The nonull function attribute allows to mark pointer parameters which
+//    must not be NULL.
+
+// If fortification mode, we warn about unused results of certain
+//    function calls which can lead to problems.
+
+// Forces a function to be always inlined.
+// The Linux kernel defines __always_inline in stddef.h (283d7573), and
+//    it conflicts with this definition.  Therefore undefine it first to
+//    allow either header to be included first.
+
+// Associate error messages with the source location of the call site rather
+//    than with the source location inside the function.
+
+// GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+//    inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
+//    or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+//    older than 4.3 may define these macros and still not guarantee GNU inlining
+//    semantics.
+//
+//    clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+//    semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
+//    __GNUC_GNU_INLINE__ macro definitions.
+
+// GCC 4.3 and above allow passing all anonymous arguments of an
+//    __extern_always_inline function to some other vararg function.
+
+// It is possible to compile containing GCC extensions even if GCC is
+//    run in pedantic mode if the uses are carefully marked using the
+//    `__extension__' keyword.  But this is not generally available before
+//    version 2.8.
+
+// __restrict is known in EGCS 1.2 and above.
+
+// ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+//      array_name[restrict]
+//    GCC 3.1 supports this.
+
+// Describes a char array whose address can safely be passed as the first
+//    argument to strncpy and strncat, as the char array is not necessarily
+//    a NUL-terminated string.
+
+// Undefine (also defined in libc-symbols.h).
+// Copies attributes from the declaration or type referenced by
+//    the argument.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// __glibc_macro_warning (MESSAGE) issues warning MESSAGE.  This is
+//    intended for use in preprocessor macros.
+//
+//    Note: MESSAGE must be a _single_ string; concatenation of string
+//    literals is not supported.
+
+// Generic selection (ISO C11) is a C-only feature, available in GCC
+//    since version 4.9.  Previous versions do not provide generic
+//    selection, even though they might set __STDC_VERSION__ to 201112L,
+//    when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
+//    when testing __STDC_VERSION__ for generic selection support.
+//    On the other hand, Clang also defines __GNUC__, so a clang-specific
+//    check is required to enable the use of generic selection.
+
+// If we don't have __REDIRECT, prototypes will be missing if
+//    __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64].
+
+// Decide whether we can define 'extern inline' functions in headers.
+
+// This is here only because every header file already includes this one.
+//    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
+//    <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+//    that will always return failure (and set errno to ENOSYS).
+// This file is automatically generated.
+//    This file selects the right generated file of `__stub_FUNCTION' macros
+//    based on the architecture being compiled for.
+
+// This file is automatically generated.
+//    It defines a symbol `__stub_FUNCTION' for each function
+//    in the C library which is a stub, meaning it will fail
+//    every time called, usually setting errno to ENOSYS.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define uintN_t types.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Seconds since the Epoch, visible to user code when time_t is too
+//    narrow only for consistency with the old way of widening too-narrow
+//    types.  User code should never use __time64_t.
+
+type Uint8_t = X__uint8_t   /* stdint-uintn.h:24:19 */
+type Uint16_t = X__uint16_t /* stdint-uintn.h:25:20 */
+type Uint32_t = X__uint32_t /* stdint-uintn.h:26:20 */
+type Uint64_t = X__uint64_t /* stdint-uintn.h:27:20 */
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// Structure for scatter/gather I/O.
+type Iovec = struct {
+	Fiov_base uintptr
+	Fiov_len  Size_t
+} /* struct_iovec.h:26:1 */
+
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
+//
+// This file is part of GCC.
+//
+// GCC is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// GCC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+//
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+// ISO C Standard:  7.17  Common definitions  <stddef.h>
+
+// Any one of these symbols __need_* means that GNU libc
+//    wants us just to define one data type.  So don't define
+//    the symbols that indicate this file's entire job has been done.
+
+// This avoids lossage on SunOS but only if stdtypes.h comes first.
+//    There's no way to win with the other order!  Sun lossage.
+
+// Sequent's header files use _PTRDIFF_T_ in some conflicting way.
+//    Just ignore it.
+
+// On VxWorks, <type/vxTypesBase.h> may have defined macros like
+//    _TYPE_size_t which will typedef size_t.  fixincludes patched the
+//    vxTypesBase.h so that this macro is only defined if _GCC_SIZE_T is
+//    not defined, and so that defining this macro defines _GCC_SIZE_T.
+//    If we find that the macros are still defined at this point, we must
+//    invoke them so that the type is defined as expected.
+
+// In case nobody has defined these types, but we aren't running under
+//    GCC 2.00, make sure that __PTRDIFF_TYPE__, __SIZE_TYPE__, and
+//    __WCHAR_TYPE__ have reasonable values.  This can happen if the
+//    parts of GCC is compiled by an older compiler, that actually
+//    include gstddef.h, such as collect2.
+
+// Signed type of difference of two pointers.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Unsigned type of `sizeof' something.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// This operating system-specific header file defines the SOCK_*, PF_*,
+//    AF_*, MSG_*, SOL_*, and SO_* constants, and the `struct sockaddr',
+//    `struct msghdr', and `struct linger' types.
+// System-specific socket constants and types.  Linux version.
+//    Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
+//
+// This file is part of GCC.
+//
+// GCC is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// GCC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+//
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+// ISO C Standard:  7.17  Common definitions  <stddef.h>
+
+// Any one of these symbols __need_* means that GNU libc
+//    wants us just to define one data type.  So don't define
+//    the symbols that indicate this file's entire job has been done.
+
+// This avoids lossage on SunOS but only if stdtypes.h comes first.
+//    There's no way to win with the other order!  Sun lossage.
+
+// Sequent's header files use _PTRDIFF_T_ in some conflicting way.
+//    Just ignore it.
+
+// On VxWorks, <type/vxTypesBase.h> may have defined macros like
+//    _TYPE_size_t which will typedef size_t.  fixincludes patched the
+//    vxTypesBase.h so that this macro is only defined if _GCC_SIZE_T is
+//    not defined, and so that defining this macro defines _GCC_SIZE_T.
+//    If we find that the macros are still defined at this point, we must
+//    invoke them so that the type is defined as expected.
+
+// In case nobody has defined these types, but we aren't running under
+//    GCC 2.00, make sure that __PTRDIFF_TYPE__, __SIZE_TYPE__, and
+//    __WCHAR_TYPE__ have reasonable values.  This can happen if the
+//    parts of GCC is compiled by an older compiler, that actually
+//    include gstddef.h, such as collect2.
+
+// Signed type of difference of two pointers.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Unsigned type of `sizeof' something.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX Standard: 2.6 Primitive System Data Types	<sys/types.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+type U_char = X__u_char     /* types.h:33:18 */
+type U_short = X__u_short   /* types.h:34:19 */
+type U_int = X__u_int       /* types.h:35:17 */
+type U_long = X__u_long     /* types.h:36:18 */
+type Quad_t = X__quad_t     /* types.h:37:18 */
+type U_quad_t = X__u_quad_t /* types.h:38:20 */
+type Fsid_t = X__fsid_t     /* types.h:39:18 */
+type Loff_t = X__loff_t     /* types.h:42:18 */
+
+type Ino_t = X__ino64_t /* types.h:49:19 */
+
+type Dev_t = X__dev_t /* types.h:59:17 */
+
+type Gid_t = X__gid_t /* types.h:64:17 */
+
+type Mode_t = X__mode_t /* types.h:69:18 */
+
+type Nlink_t = X__nlink_t /* types.h:74:19 */
+
+type Uid_t = X__uid_t /* types.h:79:17 */
+
+type Off_t = X__off64_t /* types.h:87:19 */
+
+type Pid_t = X__pid_t /* types.h:97:17 */
+
+type Id_t = X__id_t /* types.h:103:16 */
+
+type Ssize_t = X__ssize_t /* types.h:108:19 */
+
+type Daddr_t = X__daddr_t /* types.h:114:19 */
+type Caddr_t = X__caddr_t /* types.h:115:19 */
+
+type Key_t = X__key_t /* types.h:121:17 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `clock'.
+type Clock_t = X__clock_t /* clock_t.h:7:19 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Clock ID used in clock and timer functions.
+type Clockid_t = X__clockid_t /* clockid_t.h:7:21 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `time'.
+type Time_t = X__time_t /* time_t.h:7:18 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Timer ID returned by `timer_create'.
+type Timer_t = X__timer_t /* timer_t.h:7:19 */
+
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
+//
+// This file is part of GCC.
+//
+// GCC is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// GCC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+//
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+// ISO C Standard:  7.17  Common definitions  <stddef.h>
+
+// Any one of these symbols __need_* means that GNU libc
+//    wants us just to define one data type.  So don't define
+//    the symbols that indicate this file's entire job has been done.
+
+// This avoids lossage on SunOS but only if stdtypes.h comes first.
+//    There's no way to win with the other order!  Sun lossage.
+
+// Sequent's header files use _PTRDIFF_T_ in some conflicting way.
+//    Just ignore it.
+
+// On VxWorks, <type/vxTypesBase.h> may have defined macros like
+//    _TYPE_size_t which will typedef size_t.  fixincludes patched the
+//    vxTypesBase.h so that this macro is only defined if _GCC_SIZE_T is
+//    not defined, and so that defining this macro defines _GCC_SIZE_T.
+//    If we find that the macros are still defined at this point, we must
+//    invoke them so that the type is defined as expected.
+
+// In case nobody has defined these types, but we aren't running under
+//    GCC 2.00, make sure that __PTRDIFF_TYPE__, __SIZE_TYPE__, and
+//    __WCHAR_TYPE__ have reasonable values.  This can happen if the
+//    parts of GCC is compiled by an older compiler, that actually
+//    include gstddef.h, such as collect2.
+
+// Signed type of difference of two pointers.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Unsigned type of `sizeof' something.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// Old compatibility names for C types.
+type Ulong = uint64  /* types.h:148:27 */
+type Ushort = uint16 /* types.h:149:28 */
+type Uint = uint32   /* types.h:150:22 */
+
+// These size-specific names are used by some of the inet code.
+
+// Define intN_t types.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+type Int8_t = X__int8_t   /* stdint-intn.h:24:18 */
+type Int16_t = X__int16_t /* stdint-intn.h:25:19 */
+type Int32_t = X__int32_t /* stdint-intn.h:26:19 */
+type Int64_t = X__int64_t /* stdint-intn.h:27:19 */
+
+// These were defined by ISO C without the first `_'.
+type U_int8_t = X__uint8_t   /* types.h:158:19 */
+type U_int16_t = X__uint16_t /* types.h:159:20 */
+type U_int32_t = X__uint32_t /* types.h:160:20 */
+type U_int64_t = X__uint64_t /* types.h:161:20 */
+
+type Register_t = int32 /* types.h:164:13 */
+
+// It also defines `fd_set' and the FD_* macros for `select'.
+// `fd_set' type and related macros, and `select'/`pselect' declarations.
+//    Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX 1003.1g: 6.2 Select from File Descriptor Sets <sys/select.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Get definition of needed basic types.
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Get __FD_* definitions.
+// Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Get sigset_t.
+
+type X__sigset_t = struct{ F__val [16]uint64 } /* __sigset_t.h:8:3 */
+
+// A set of signals to be blocked, unblocked, or waited for.
+type Sigset_t = X__sigset_t /* sigset_t.h:7:20 */
+
+// Get definition of timer specification structures.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// A time value that is accurate to the nearest
+//
+//	microsecond but also has a range of years.
+type Timeval = struct {
+	Ftv_sec  X__time_t
+	Ftv_usec X__suseconds_t
+} /* struct_timeval.h:8:1 */
+
+// NB: Include guard matches what <linux/time.h> uses.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Endian macros for string.h functions
+//    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+// POSIX.1b structure for a time value.  This is like a `struct timeval' but
+//
+//	has nanoseconds instead of microseconds.
+type Timespec = struct {
+	Ftv_sec  X__time_t
+	Ftv_nsec X__syscall_slong_t
+} /* struct_timespec.h:10:1 */
+
+type Suseconds_t = X__suseconds_t /* select.h:43:23 */
+
+// The fd_set member is required to be an array of longs.
+type X__fd_mask = int64 /* select.h:49:18 */
+
+// Some versions of <linux/posix_types.h> define this macros.
+// It's easier to assume 8-bit bytes than to get CHAR_BIT.
+
+// fd_set for select and pselect.
+type Fd_set = struct{ F__fds_bits [16]X__fd_mask } /* select.h:70:5 */
+
+// Maximum number of file descriptors in `fd_set'.
+
+// Sometimes the fd_set member is assumed to have this type.
+type Fd_mask = X__fd_mask /* select.h:77:19 */
+
+// Define some inlines helping to catch common problems.
+
+type Blksize_t = X__blksize_t /* types.h:185:21 */
+
+// Types from the Large File Support interface.
+type Blkcnt_t = X__blkcnt64_t     /* types.h:205:22 */ // Type to count number of disk blocks.
+type Fsblkcnt_t = X__fsblkcnt64_t /* types.h:209:24 */ // Type to count file system blocks.
+type Fsfilcnt_t = X__fsfilcnt64_t /* types.h:213:24 */ // Type to count file system inodes.
+
+// Now add the thread types.
+// Declaration of common pthread types for all architectures.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For internal mutex and condition variable definitions.
+// Common threading primitives definitions for both POSIX and C11.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Arch-specific definitions.  Each architecture must define the following
+//    macros to define the expected sizes of pthread data types:
+//
+//    __SIZEOF_PTHREAD_ATTR_T        - size of pthread_attr_t.
+//    __SIZEOF_PTHREAD_MUTEX_T       - size of pthread_mutex_t.
+//    __SIZEOF_PTHREAD_MUTEXATTR_T   - size of pthread_mutexattr_t.
+//    __SIZEOF_PTHREAD_COND_T        - size of pthread_cond_t.
+//    __SIZEOF_PTHREAD_CONDATTR_T    - size of pthread_condattr_t.
+//    __SIZEOF_PTHREAD_RWLOCK_T      - size of pthread_rwlock_t.
+//    __SIZEOF_PTHREAD_RWLOCKATTR_T  - size of pthread_rwlockattr_t.
+//    __SIZEOF_PTHREAD_BARRIER_T     - size of pthread_barrier_t.
+//    __SIZEOF_PTHREAD_BARRIERATTR_T - size of pthread_barrierattr_t.
+//
+//    The additional macro defines any constraint for the lock alignment
+//    inside the thread structures:
+//
+//    __LOCK_ALIGNMENT - for internal lock/futex usage.
+//
+//    Same idea but for the once locking primitive:
+//
+//    __ONCE_ALIGNMENT - for pthread_once_t/once_flag definition.
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Common definition of pthread_mutex_t.
+
+type X__pthread_internal_list = struct {
+	F__prev uintptr
+	F__next uintptr
+} /* thread-shared-types.h:49:9 */
+
+// Type to count file system inodes.
+
+// Now add the thread types.
+// Declaration of common pthread types for all architectures.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For internal mutex and condition variable definitions.
+// Common threading primitives definitions for both POSIX and C11.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Arch-specific definitions.  Each architecture must define the following
+//    macros to define the expected sizes of pthread data types:
+//
+//    __SIZEOF_PTHREAD_ATTR_T        - size of pthread_attr_t.
+//    __SIZEOF_PTHREAD_MUTEX_T       - size of pthread_mutex_t.
+//    __SIZEOF_PTHREAD_MUTEXATTR_T   - size of pthread_mutexattr_t.
+//    __SIZEOF_PTHREAD_COND_T        - size of pthread_cond_t.
+//    __SIZEOF_PTHREAD_CONDATTR_T    - size of pthread_condattr_t.
+//    __SIZEOF_PTHREAD_RWLOCK_T      - size of pthread_rwlock_t.
+//    __SIZEOF_PTHREAD_RWLOCKATTR_T  - size of pthread_rwlockattr_t.
+//    __SIZEOF_PTHREAD_BARRIER_T     - size of pthread_barrier_t.
+//    __SIZEOF_PTHREAD_BARRIERATTR_T - size of pthread_barrierattr_t.
+//
+//    The additional macro defines any constraint for the lock alignment
+//    inside the thread structures:
+//
+//    __LOCK_ALIGNMENT - for internal lock/futex usage.
+//
+//    Same idea but for the once locking primitive:
+//
+//    __ONCE_ALIGNMENT - for pthread_once_t/once_flag definition.
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Common definition of pthread_mutex_t.
+
+type X__pthread_list_t = X__pthread_internal_list /* thread-shared-types.h:53:3 */
+
+type X__pthread_internal_slist = struct{ F__next uintptr } /* thread-shared-types.h:55:9 */
+
+type X__pthread_slist_t = X__pthread_internal_slist /* thread-shared-types.h:58:3 */
+
+// Arch-specific mutex definitions.  A generic implementation is provided
+//    by sysdeps/nptl/bits/struct_mutex.h.  If required, an architecture
+//    can override it by defining:
+//
+//    1. struct __pthread_mutex_s (used on both pthread_mutex_t and mtx_t
+//       definition).  It should contains at least the internal members
+//       defined in the generic version.
+//
+//    2. __LOCK_ALIGNMENT for any extra attribute for internal lock used with
+//       atomic operations.
+//
+//    3. The macro __PTHREAD_MUTEX_INITIALIZER used for static initialization.
+//       It should initialize the mutex internal flag.
+
+// x86 internal mutex struct definitions.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+type X__pthread_mutex_s = struct {
+	F__lock    int32
+	F__count   uint32
+	F__owner   int32
+	F__nusers  uint32
+	F__kind    int32
+	F__spins   int16
+	F__elision int16
+	F__list    X__pthread_list_t
+} /* struct_mutex.h:22:1 */
+
+// Arch-sepecific read-write lock definitions.  A generic implementation is
+//    provided by struct_rwlock.h.  If required, an architecture can override it
+//    by defining:
+//
+//    1. struct __pthread_rwlock_arch_t (used on pthread_rwlock_t definition).
+//       It should contain at least the internal members defined in the
+//       generic version.
+//
+//    2. The macro __PTHREAD_RWLOCK_INITIALIZER used for static initialization.
+//       It should initialize the rwlock internal type.
+
+// x86 internal rwlock struct definitions.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+type X__pthread_rwlock_arch_t = struct {
+	F__readers       uint32
+	F__writers       uint32
+	F__wrphase_futex uint32
+	F__writers_futex uint32
+	F__pad3          uint32
+	F__pad4          uint32
+	F__cur_writer    int32
+	F__shared        int32
+	F__rwelision     int8
+	F__pad1          [7]uint8
+	F__pad2          uint64
+	F__flags         uint32
+	F__ccgo_pad1     [4]byte
+} /* struct_rwlock.h:23:1 */
+
+// Common definition of pthread_cond_t.
+
+type X__pthread_cond_s = struct {
+	F__0            struct{ F__wseq uint64 }
+	F__8            struct{ F__g1_start uint64 }
+	F__g_refs       [2]uint32
+	F__g_size       [2]uint32
+	F__g1_orig_size uint32
+	F__wrefs        uint32
+	F__g_signals    [2]uint32
+} /* thread-shared-types.h:92:1 */
+
+// Thread identifiers.  The structure of the attribute type is not
+//
+//	exposed on purpose.
+type Pthread_t = uint64 /* pthreadtypes.h:27:27 */
+
+// Data structures for mutex handling.  The structure of the attribute
+//
+//	type is not exposed on purpose.
+type Pthread_mutexattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:36:3 */
+
+// Data structure for condition variable handling.  The structure of
+//
+//	the attribute type is not exposed on purpose.
+type Pthread_condattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:45:3 */
+
+// Keys for thread-specific data
+type Pthread_key_t = uint32 /* pthreadtypes.h:49:22 */
+
+// Once-only execution
+type Pthread_once_t = int32 /* pthreadtypes.h:53:30 */
+
+type Pthread_attr_t1 = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [56]int8
+} /* pthreadtypes.h:56:1 */
+
+type Pthread_attr_t = Pthread_attr_t1 /* pthreadtypes.h:62:30 */
+
+type Pthread_mutex_t = struct{ F__data X__pthread_mutex_s } /* pthreadtypes.h:72:3 */
+
+type Pthread_cond_t = struct{ F__data X__pthread_cond_s } /* pthreadtypes.h:80:3 */
+
+// Data structure for reader-writer lock variable handling.  The
+//
+//	structure of the attribute type is deliberately not exposed.
+type Pthread_rwlock_t = struct{ F__data X__pthread_rwlock_arch_t } /* pthreadtypes.h:91:3 */
+
+type Pthread_rwlockattr_t = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [8]int8
+} /* pthreadtypes.h:97:3 */
+
+// POSIX spinlock data type.
+type Pthread_spinlock_t = int32 /* pthreadtypes.h:103:22 */
+
+// POSIX barriers data type.  The structure of the type is
+//
+//	deliberately not exposed.
+type Pthread_barrier_t = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [32]int8
+} /* pthreadtypes.h:112:3 */
+
+type Pthread_barrierattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:118:3 */
+
+// Type for length arguments in socket calls.
+type Socklen_t = X__socklen_t /* socket.h:33:21 */
+
+// Protocol families.
+
+// Address families.
+
+// Socket level values.  Others are defined in the appropriate headers.
+//
+//    XXX These definitions also should go into the appropriate headers as
+//    far as they are available.
+
+// Maximum queue length specifiable by listen.
+
+// Get the definition of the macro to define the common sockaddr members.
+// Definition of struct sockaddr_* common members and sizes, generic version.
+//    Copyright (C) 1995-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/socket.h> instead.
+
+// POSIX.1g specifies this type name for the `sa_family' member.
+type Sa_family_t = uint16 /* sockaddr.h:28:28 */
+
+// This macro is used to declare the initial common members
+//    of the data types used for socket addresses, `struct sockaddr',
+//    `struct sockaddr_in', `struct sockaddr_un', etc.
+
+// Size of struct sockaddr_storage.
+
+// Structure describing a generic socket address.
+type Sockaddr = struct {
+	Fsa_family Sa_family_t
+	Fsa_data   [14]int8
+} /* socket.h:178:1 */
+
+// Structure large enough to hold any socket address (with the historical
+//    exception of AF_UNIX).
+
+type Sockaddr_storage = struct {
+	Fss_family    Sa_family_t
+	F__ss_padding [118]int8
+	F__ss_align   uint64
+} /* socket.h:191:1 */
+
+// Structure describing messages sent by
+//
+//	`sendmsg' and received by `recvmsg'.
+type Msghdr = struct {
+	Fmsg_name       uintptr
+	Fmsg_namelen    Socklen_t
+	F__ccgo_pad1    [4]byte
+	Fmsg_iov        uintptr
+	Fmsg_iovlen     Size_t
+	Fmsg_control    uintptr
+	Fmsg_controllen Size_t
+	Fmsg_flags      int32
+	F__ccgo_pad2    [4]byte
+} /* socket.h:257:1 */
+
+// Structure used for storage of ancillary data object information.
+type Cmsghdr = struct {
+	F__ccgo_pad1 [0]uint64
+	Fcmsg_len    Size_t
+	Fcmsg_level  int32
+	Fcmsg_type   int32
+} /* socket.h:275:1 */
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// This allows for 1024 file descriptors: if NR_OPEN is ever grown
+// beyond that you'll have to change this too. But 1024 fd's seem to be
+// enough even for such "real" unices like OSF/1, so hopefully this is
+// one limit that doesn't have to be changed [again].
+//
+// Note that POSIX wants the FD_CLEAR(fd,fdsetp) defines to be in
+// <sys/time.h> (and thus <linux/time.h>) - but this is a more logical
+// place for them. Solved by having dummy defines in <sys/time.h>.
+
+// This macro may have been defined in <gnu/types.h>. But we always
+// use the one here.
+
+type X__kernel_fd_set = struct{ Ffds_bits [16]uint64 } /* posix_types.h:27:3 */
+
+// Type of a signal handler.
+type X__kernel_sighandler_t = uintptr /* posix_types.h:30:14 */
+
+// Type of a SYSV IPC key.
+type X__kernel_key_t = int32 /* posix_types.h:33:13 */
+type X__kernel_mqd_t = int32 /* posix_types.h:34:13 */
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// This file is generally used by user-level software, so you need to
+// be a little careful about namespace pollution etc.  Also, we cannot
+// assume GCC is being used.
+
+type X__kernel_old_uid_t = uint16 /* posix_types_64.h:11:24 */
+type X__kernel_old_gid_t = uint16 /* posix_types_64.h:12:24 */
+
+type X__kernel_old_dev_t = uint64 /* posix_types_64.h:15:23 */
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// There seems to be no way of detecting this automatically from user
+// space, so 64 bit architectures should override this in their
+// bitsperlong.h. In particular, an architecture that supports
+// both 32 and 64 bit user space must not rely on CONFIG_64BIT
+// to decide it, but rather check a compiler provided macro.
+
+// This file is generally used by user-level software, so you need to
+// be a little careful about namespace pollution etc.
+//
+// First the types that are often defined in different ways across
+// architectures, so that you can override them.
+
+type X__kernel_long_t = int64   /* posix_types.h:15:15 */
+type X__kernel_ulong_t = uint64 /* posix_types.h:16:23 */
+
+type X__kernel_ino_t = X__kernel_ulong_t /* posix_types.h:20:26 */
+
+type X__kernel_mode_t = uint32 /* posix_types.h:24:22 */
+
+type X__kernel_pid_t = int32 /* posix_types.h:28:14 */
+
+type X__kernel_ipc_pid_t = int32 /* posix_types.h:32:14 */
+
+type X__kernel_uid_t = uint32 /* posix_types.h:36:22 */
+type X__kernel_gid_t = uint32 /* posix_types.h:37:22 */
+
+type X__kernel_suseconds_t = X__kernel_long_t /* posix_types.h:41:26 */
+
+type X__kernel_daddr_t = int32 /* posix_types.h:45:14 */
+
+type X__kernel_uid32_t = uint32 /* posix_types.h:49:22 */
+type X__kernel_gid32_t = uint32 /* posix_types.h:50:22 */
+
+// Most 32 bit architectures use "unsigned int" size_t,
+// and all 64 bit architectures use "unsigned long" size_t.
+type X__kernel_size_t = X__kernel_ulong_t   /* posix_types.h:72:26 */
+type X__kernel_ssize_t = X__kernel_long_t   /* posix_types.h:73:25 */
+type X__kernel_ptrdiff_t = X__kernel_long_t /* posix_types.h:74:25 */
+
+type X__kernel_fsid_t = struct{ Fval [2]int32 } /* posix_types.h:81:3 */
+
+// anything below here should be completely generic
+type X__kernel_off_t = X__kernel_long_t      /* posix_types.h:87:25 */
+type X__kernel_loff_t = int64                /* posix_types.h:88:19 */
+type X__kernel_old_time_t = X__kernel_long_t /* posix_types.h:89:25 */
+type X__kernel_time_t = X__kernel_long_t     /* posix_types.h:90:25 */
+type X__kernel_time64_t = int64              /* posix_types.h:91:19 */
+type X__kernel_clock_t = X__kernel_long_t    /* posix_types.h:92:25 */
+type X__kernel_timer_t = int32               /* posix_types.h:93:14 */
+type X__kernel_clockid_t = int32             /* posix_types.h:94:14 */
+type X__kernel_caddr_t = uintptr             /* posix_types.h:95:14 */
+type X__kernel_uid16_t = uint16              /* posix_types.h:96:24 */
+type X__kernel_gid16_t = uint16              /* posix_types.h:97:24 */
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// Socket-level I/O control calls.
+
+// For setsockopt(2)
+
+// Security levels - as per NRL IPv6 - don't actually do anything
+
+// Socket filtering
+
+// Instruct lower device to use last 4-bytes of skb data as FCS
+
+// on 64-bit and x32, avoid the ?: operator
+
+// Structure used to manipulate the SO_LINGER option.
+type Linger = struct {
+	Fl_onoff  int32
+	Fl_linger int32
+} /* socket.h:361:1 */
+
+// This is the 4.3 BSD `struct sockaddr' format, which is used as wire
+//
+//	format in the grotty old 4.3 `talk' protocol.
+type Osockaddr = struct {
+	Fsa_family uint16
+	Fsa_data   [14]uint8
+} /* struct_osockaddr.h:6:1 */
+
+// Define some macros helping to catch buffer overflows.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Internet address.
+type In_addr_t = Uint32_t                  /* in.h:30:18 */
+type In_addr = struct{ Fs_addr In_addr_t } /* in.h:31:1 */
+
+// Get system-specific definitions.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Linux version.
+
+// If the application has already included linux/in6.h from a linux-based
+//    kernel then we will not define the IPv6 IPPROTO_* defines, in6_addr (nor the
+//    defines), sockaddr_in6, or ipv6_mreq. Same for in6_ptkinfo or ip6_mtuinfo
+//    in linux/ipv6.h. The ABI used by the linux-kernel and glibc match exactly.
+//    Neither the linux kernel nor glibc should break this ABI without coordination.
+//    In upstream kernel 56c176c9 the _UAPI prefix was stripped so we need to check
+//    for _LINUX_IN6_H and _IPV6_H now, and keep checking the old versions for
+//    maximum backwards compatibility.
+
+// Options for use with `getsockopt' and `setsockopt' at the IP level.
+//    The first word in the comment at the right is the data type used;
+//    "bool" means a boolean value stored in an `int'.
+// For BSD compatibility.
+
+// TProxy original addresses
+
+// IP_MTU_DISCOVER arguments.
+// Always use interface mtu (ignores dst pmtu) but don't set DF flag.
+//    Also incoming ICMP frag_needed notifications will be ignored on
+//    this socket to prevent accepting spoofed ones.
+// Like IP_PMTUDISC_INTERFACE but allow packets to be fragmented.
+
+// To select the IP level.
+
+// Structure used to describe IP options for IP_OPTIONS and IP_RETOPTS.
+//
+//	The `ip_dst' field is used for the first-hop gateway when using a
+//	source route (this gets put into the header proper).
+type Ip_opts = struct {
+	Fip_dst  struct{ Fs_addr In_addr_t }
+	Fip_opts [40]int8
+} /* in.h:142:1 */
+
+// Like `struct ip_mreq' but including interface specification by index.
+type Ip_mreqn = struct {
+	Fimr_multiaddr struct{ Fs_addr In_addr_t }
+	Fimr_address   struct{ Fs_addr In_addr_t }
+	Fimr_ifindex   int32
+} /* in.h:149:1 */
+
+// Structure used for IP_PKTINFO.
+type In_pktinfo = struct {
+	Fipi_ifindex  int32
+	Fipi_spec_dst struct{ Fs_addr In_addr_t }
+	Fipi_addr     struct{ Fs_addr In_addr_t }
+} /* in.h:157:1 */
+
+// Type to represent a port.
+type In_port_t = Uint16_t /* in.h:119:18 */
+
+// Definitions of the bits in an Internet address integer.
+//
+//    On subnets, host and network parts are found according to
+//    the subnet mask, not these masks.
+
+// Address to accept any incoming messages.
+// Address to send to all hosts.
+// Address indicating an error return.
+
+// Network number for local host loopback.
+// Address to loopback in software to local host.
+
+// Defines for Multicast INADDR.
+
+// IPv6 address
+type In6_addr = struct {
+	F__in6_u struct {
+		F__ccgo_pad1 [0]uint32
+		F__u6_addr8  [16]Uint8_t
+	}
+} /* in.h:212:1 */
+
+// ::1
+
+// Structure describing an Internet socket address.
+type Sockaddr_in = struct {
+	Fsin_family Sa_family_t
+	Fsin_port   In_port_t
+	Fsin_addr   struct{ Fs_addr In_addr_t }
+	Fsin_zero   [8]uint8
+} /* in.h:238:1 */
+
+// Ditto, for IPv6.
+type Sockaddr_in6 = struct {
+	Fsin6_family   Sa_family_t
+	Fsin6_port     In_port_t
+	Fsin6_flowinfo Uint32_t
+	Fsin6_addr     struct {
+		F__in6_u struct {
+			F__ccgo_pad1 [0]uint32
+			F__u6_addr8  [16]Uint8_t
+		}
+	}
+	Fsin6_scope_id Uint32_t
+} /* in.h:253:1 */
+
+// IPv4 multicast request.
+type Ip_mreq = struct {
+	Fimr_multiaddr struct{ Fs_addr In_addr_t }
+	Fimr_interface struct{ Fs_addr In_addr_t }
+} /* in.h:265:1 */
+
+type Ip_mreq_source = struct {
+	Fimr_multiaddr  struct{ Fs_addr In_addr_t }
+	Fimr_interface  struct{ Fs_addr In_addr_t }
+	Fimr_sourceaddr struct{ Fs_addr In_addr_t }
+} /* in.h:274:1 */
+
+// Likewise, for IPv6.
+type Ipv6_mreq = struct {
+	Fipv6mr_multiaddr struct {
+		F__in6_u struct {
+			F__ccgo_pad1 [0]uint32
+			F__u6_addr8  [16]Uint8_t
+		}
+	}
+	Fipv6mr_interface uint32
+} /* in.h:289:1 */
+
+// Multicast group request.
+type Group_req = struct {
+	Fgr_interface Uint32_t
+	F__ccgo_pad1  [4]byte
+	Fgr_group     struct {
+		Fss_family    Sa_family_t
+		F__ss_padding [118]int8
+		F__ss_align   uint64
+	}
+} /* in.h:301:1 */
+
+type Group_source_req = struct {
+	Fgsr_interface Uint32_t
+	F__ccgo_pad1   [4]byte
+	Fgsr_group     struct {
+		Fss_family    Sa_family_t
+		F__ss_padding [118]int8
+		F__ss_align   uint64
+	}
+	Fgsr_source struct {
+		Fss_family    Sa_family_t
+		F__ss_padding [118]int8
+		F__ss_align   uint64
+	}
+} /* in.h:310:1 */
+
+// Full-state filter operations.
+type Ip_msfilter = struct {
+	Fimsf_multiaddr struct{ Fs_addr In_addr_t }
+	Fimsf_interface struct{ Fs_addr In_addr_t }
+	Fimsf_fmode     Uint32_t
+	Fimsf_numsrc    Uint32_t
+	Fimsf_slist     [1]struct{ Fs_addr In_addr_t }
+} /* in.h:324:1 */
+
+type Group_filter = struct {
+	Fgf_interface Uint32_t
+	F__ccgo_pad1  [4]byte
+	Fgf_group     struct {
+		Fss_family    Sa_family_t
+		F__ss_padding [118]int8
+		F__ss_align   uint64
+	}
+	Fgf_fmode  Uint32_t
+	Fgf_numsrc Uint32_t
+	Fgf_slist  [1]struct {
+		Fss_family    Sa_family_t
+		F__ss_padding [118]int8
+		F__ss_align   uint64
+	}
+} /* in.h:345:1 */
+
+// Define uintN_t types.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This is necessary to make this include file properly replace the
+//    Sun version.
+// @(#)netdb.h	2.1 88/07/29 3.9 RPCSRC
+// Copyright (c) 2010, Oracle America, Inc.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+//       notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+//       copyright notice, this list of conditions and the following
+//       disclaimer in the documentation and/or other materials
+//       provided with the distribution.
+//     * Neither the name of the "Oracle America, Inc." nor the names of its
+//       contributors may be used to endorse or promote products derived
+//       from this software without specific prior written permission.
+//
+//   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+//   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+//   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+//   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+//   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+//   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+//   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+//   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+//   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Cleaned up for GNU C library roland@gnu.ai.mit.edu:
+//    added multiple inclusion protection and use of <sys/cdefs.h>.
+//    In GNU this file is #include'd by <netdb.h>.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
+//
+// This file is part of GCC.
+//
+// GCC is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// GCC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+//
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+// ISO C Standard:  7.17  Common definitions  <stddef.h>
+
+// Any one of these symbols __need_* means that GNU libc
+//    wants us just to define one data type.  So don't define
+//    the symbols that indicate this file's entire job has been done.
+
+// This avoids lossage on SunOS but only if stdtypes.h comes first.
+//    There's no way to win with the other order!  Sun lossage.
+
+// Sequent's header files use _PTRDIFF_T_ in some conflicting way.
+//    Just ignore it.
+
+// On VxWorks, <type/vxTypesBase.h> may have defined macros like
+//    _TYPE_size_t which will typedef size_t.  fixincludes patched the
+//    vxTypesBase.h so that this macro is only defined if _GCC_SIZE_T is
+//    not defined, and so that defining this macro defines _GCC_SIZE_T.
+//    If we find that the macros are still defined at this point, we must
+//    invoke them so that the type is defined as expected.
+
+// In case nobody has defined these types, but we aren't running under
+//    GCC 2.00, make sure that __PTRDIFF_TYPE__, __SIZE_TYPE__, and
+//    __WCHAR_TYPE__ have reasonable values.  This can happen if the
+//    parts of GCC is compiled by an older compiler, that actually
+//    include gstddef.h, such as collect2.
+
+// Signed type of difference of two pointers.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Unsigned type of `sizeof' something.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+type Rpcent = struct {
+	Fr_name      uintptr
+	Fr_aliases   uintptr
+	Fr_number    int32
+	F__ccgo_pad1 [4]byte
+} /* netdb.h:46:1 */
+
+// Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Description of data base entry for a single network.  NOTE: here a
+//
+//	poor assumption is made.  The network number is expected to fit
+//	into an unsigned long int variable.
+type Netent = struct {
+	Fn_name     uintptr
+	Fn_aliases  uintptr
+	Fn_addrtype int32
+	Fn_net      Uint32_t
+} /* netdb.h:26:1 */
+
+// Description of data base entry for a single host.
+type Hostent = struct {
+	Fh_name      uintptr
+	Fh_aliases   uintptr
+	Fh_addrtype  int32
+	Fh_length    int32
+	Fh_addr_list uintptr
+} /* netdb.h:98:1 */
+
+// Description of data base entry for a single service.
+type Servent = struct {
+	Fs_name      uintptr
+	Fs_aliases   uintptr
+	Fs_port      int32
+	F__ccgo_pad1 [4]byte
+	Fs_proto     uintptr
+} /* netdb.h:255:1 */
+
+// Description of data base entry for a single service.
+type Protoent = struct {
+	Fp_name      uintptr
+	Fp_aliases   uintptr
+	Fp_proto     int32
+	F__ccgo_pad1 [4]byte
+} /* netdb.h:324:1 */
+
+// Extension from POSIX.1:2001.
+// Structure to contain information about address of a service provider.
+type Addrinfo = struct {
+	Fai_flags     int32
+	Fai_family    int32
+	Fai_socktype  int32
+	Fai_protocol  int32
+	Fai_addrlen   Socklen_t
+	F__ccgo_pad1  [4]byte
+	Fai_addr      uintptr
+	Fai_canonname uintptr
+	Fai_next      uintptr
+} /* netdb.h:565:1 */
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/netinet/in/capi_linux_loong64.go b/vendor/modernc.org/libc/netinet/in/capi_linux_loong64.go
new file mode 100644
index 00000000..953ed094
--- /dev/null
+++ b/vendor/modernc.org/libc/netinet/in/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo netinet/in/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o netinet/in/in_linux_amd64.go -pkgname in', DO NOT EDIT.
+
+package in
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/netinet/in/in_linux_loong64.go b/vendor/modernc.org/libc/netinet/in/in_linux_loong64.go
new file mode 100644
index 00000000..cfd5e88a
--- /dev/null
+++ b/vendor/modernc.org/libc/netinet/in/in_linux_loong64.go
@@ -0,0 +1,2790 @@
+// Code generated by 'ccgo netinet/in/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o netinet/in/in_linux_amd64.go -pkgname in', DO NOT EDIT.
+
+package in
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	AF_ALG                           = 38         // socket.h:133:1:
+	AF_APPLETALK                     = 5          // socket.h:99:1:
+	AF_ASH                           = 18         // socket.h:113:1:
+	AF_ATMPVC                        = 8          // socket.h:102:1:
+	AF_ATMSVC                        = 20         // socket.h:115:1:
+	AF_AX25                          = 3          // socket.h:97:1:
+	AF_BLUETOOTH                     = 31         // socket.h:126:1:
+	AF_BRIDGE                        = 7          // socket.h:101:1:
+	AF_CAIF                          = 37         // socket.h:132:1:
+	AF_CAN                           = 29         // socket.h:124:1:
+	AF_DECnet                        = 12         // socket.h:106:1:
+	AF_ECONET                        = 19         // socket.h:114:1:
+	AF_FILE                          = 1          // socket.h:95:1:
+	AF_IB                            = 27         // socket.h:122:1:
+	AF_IEEE802154                    = 36         // socket.h:131:1:
+	AF_INET                          = 2          // socket.h:96:1:
+	AF_INET6                         = 10         // socket.h:104:1:
+	AF_IPX                           = 4          // socket.h:98:1:
+	AF_IRDA                          = 23         // socket.h:118:1:
+	AF_ISDN                          = 34         // socket.h:129:1:
+	AF_IUCV                          = 32         // socket.h:127:1:
+	AF_KCM                           = 41         // socket.h:136:1:
+	AF_KEY                           = 15         // socket.h:109:1:
+	AF_LLC                           = 26         // socket.h:121:1:
+	AF_LOCAL                         = 1          // socket.h:93:1:
+	AF_MAX                           = 45         // socket.h:140:1:
+	AF_MPLS                          = 28         // socket.h:123:1:
+	AF_NETBEUI                       = 13         // socket.h:107:1:
+	AF_NETLINK                       = 16         // socket.h:110:1:
+	AF_NETROM                        = 6          // socket.h:100:1:
+	AF_NFC                           = 39         // socket.h:134:1:
+	AF_PACKET                        = 17         // socket.h:112:1:
+	AF_PHONET                        = 35         // socket.h:130:1:
+	AF_PPPOX                         = 24         // socket.h:119:1:
+	AF_QIPCRTR                       = 42         // socket.h:137:1:
+	AF_RDS                           = 21         // socket.h:116:1:
+	AF_ROSE                          = 11         // socket.h:105:1:
+	AF_ROUTE                         = 16         // socket.h:111:1:
+	AF_RXRPC                         = 33         // socket.h:128:1:
+	AF_SECURITY                      = 14         // socket.h:108:1:
+	AF_SMC                           = 43         // socket.h:138:1:
+	AF_SNA                           = 22         // socket.h:117:1:
+	AF_TIPC                          = 30         // socket.h:125:1:
+	AF_UNIX                          = 1          // socket.h:94:1:
+	AF_UNSPEC                        = 0          // socket.h:92:1:
+	AF_VSOCK                         = 40         // socket.h:135:1:
+	AF_WANPIPE                       = 25         // socket.h:120:1:
+	AF_X25                           = 9          // socket.h:103:1:
+	AF_XDP                           = 44         // socket.h:139:1:
+	BIG_ENDIAN                       = 4321       // endian.h:28:1:
+	BYTE_ORDER                       = 1234       // endian.h:30:1:
+	FD_SETSIZE                       = 1024       // select.h:73:1:
+	FIOGETOWN                        = 0x8903     // sockios.h:8:1:
+	FIOSETOWN                        = 0x8901     // sockios.h:6:1:
+	INET6_ADDRSTRLEN                 = 46         // in.h:234:1:
+	INET_ADDRSTRLEN                  = 16         // in.h:233:1:
+	IN_CLASSA_HOST                   = 16777215   // in.h:169:1:
+	IN_CLASSA_MAX                    = 128        // in.h:170:1:
+	IN_CLASSA_NET                    = 0xff000000 // in.h:167:1:
+	IN_CLASSA_NSHIFT                 = 24         // in.h:168:1:
+	IN_CLASSB_HOST                   = 65535      // in.h:175:1:
+	IN_CLASSB_MAX                    = 65536      // in.h:176:1:
+	IN_CLASSB_NET                    = 0xffff0000 // in.h:173:1:
+	IN_CLASSB_NSHIFT                 = 16         // in.h:174:1:
+	IN_CLASSC_HOST                   = 255        // in.h:181:1:
+	IN_CLASSC_NET                    = 0xffffff00 // in.h:179:1:
+	IN_CLASSC_NSHIFT                 = 8          // in.h:180:1:
+	IN_LOOPBACKNET                   = 127        // in.h:197:1:
+	IPV6_2292DSTOPTS                 = 4          // in.h:171:1:
+	IPV6_2292HOPLIMIT                = 8          // in.h:175:1:
+	IPV6_2292HOPOPTS                 = 3          // in.h:170:1:
+	IPV6_2292PKTINFO                 = 2          // in.h:169:1:
+	IPV6_2292PKTOPTIONS              = 6          // in.h:173:1:
+	IPV6_2292RTHDR                   = 5          // in.h:172:1:
+	IPV6_ADDRFORM                    = 1          // in.h:168:1:
+	IPV6_ADDR_PREFERENCES            = 72         // in.h:223:1:
+	IPV6_ADD_MEMBERSHIP              = 20         // in.h:237:1:
+	IPV6_AUTHHDR                     = 10         // in.h:180:1:
+	IPV6_AUTOFLOWLABEL               = 70         // in.h:220:1:
+	IPV6_CHECKSUM                    = 7          // in.h:174:1:
+	IPV6_DONTFRAG                    = 62         // in.h:214:1:
+	IPV6_DROP_MEMBERSHIP             = 21         // in.h:238:1:
+	IPV6_DSTOPTS                     = 59         // in.h:211:1:
+	IPV6_FREEBIND                    = 78         // in.h:233:1:
+	IPV6_HDRINCL                     = 36         // in.h:198:1:
+	IPV6_HOPLIMIT                    = 52         // in.h:204:1:
+	IPV6_HOPOPTS                     = 54         // in.h:206:1:
+	IPV6_IPSEC_POLICY                = 34         // in.h:196:1:
+	IPV6_JOIN_ANYCAST                = 27         // in.h:192:1:
+	IPV6_JOIN_GROUP                  = 20         // in.h:185:1:
+	IPV6_LEAVE_ANYCAST               = 28         // in.h:193:1:
+	IPV6_LEAVE_GROUP                 = 21         // in.h:186:1:
+	IPV6_MINHOPCOUNT                 = 73         // in.h:226:1:
+	IPV6_MTU                         = 24         // in.h:189:1:
+	IPV6_MTU_DISCOVER                = 23         // in.h:188:1:
+	IPV6_MULTICAST_ALL               = 29         // in.h:194:1:
+	IPV6_MULTICAST_HOPS              = 18         // in.h:183:1:
+	IPV6_MULTICAST_IF                = 17         // in.h:182:1:
+	IPV6_MULTICAST_LOOP              = 19         // in.h:184:1:
+	IPV6_NEXTHOP                     = 9          // in.h:179:1:
+	IPV6_ORIGDSTADDR                 = 74         // in.h:228:1:
+	IPV6_PATHMTU                     = 61         // in.h:213:1:
+	IPV6_PKTINFO                     = 50         // in.h:202:1:
+	IPV6_PMTUDISC_DO                 = 2          // in.h:246:1:
+	IPV6_PMTUDISC_DONT               = 0          // in.h:244:1:
+	IPV6_PMTUDISC_INTERFACE          = 4          // in.h:248:1:
+	IPV6_PMTUDISC_OMIT               = 5          // in.h:249:1:
+	IPV6_PMTUDISC_PROBE              = 3          // in.h:247:1:
+	IPV6_PMTUDISC_WANT               = 1          // in.h:245:1:
+	IPV6_RECVDSTOPTS                 = 58         // in.h:210:1:
+	IPV6_RECVERR                     = 25         // in.h:190:1:
+	IPV6_RECVFRAGSIZE                = 77         // in.h:232:1:
+	IPV6_RECVHOPLIMIT                = 51         // in.h:203:1:
+	IPV6_RECVHOPOPTS                 = 53         // in.h:205:1:
+	IPV6_RECVORIGDSTADDR             = 74         // in.h:229:1:
+	IPV6_RECVPATHMTU                 = 60         // in.h:212:1:
+	IPV6_RECVPKTINFO                 = 49         // in.h:201:1:
+	IPV6_RECVRTHDR                   = 56         // in.h:208:1:
+	IPV6_RECVTCLASS                  = 66         // in.h:217:1:
+	IPV6_ROUTER_ALERT                = 22         // in.h:187:1:
+	IPV6_ROUTER_ALERT_ISOLATE        = 30         // in.h:195:1:
+	IPV6_RTHDR                       = 57         // in.h:209:1:
+	IPV6_RTHDRDSTOPTS                = 55         // in.h:207:1:
+	IPV6_RTHDR_LOOSE                 = 0          // in.h:256:1:
+	IPV6_RTHDR_STRICT                = 1          // in.h:257:1:
+	IPV6_RTHDR_TYPE_0                = 0          // in.h:259:1:
+	IPV6_RXDSTOPTS                   = 59         // in.h:241:1:
+	IPV6_RXHOPOPTS                   = 54         // in.h:240:1:
+	IPV6_TCLASS                      = 67         // in.h:218:1:
+	IPV6_TRANSPARENT                 = 75         // in.h:230:1:
+	IPV6_UNICAST_HOPS                = 16         // in.h:181:1:
+	IPV6_UNICAST_IF                  = 76         // in.h:231:1:
+	IPV6_V6ONLY                      = 26         // in.h:191:1:
+	IPV6_XFRM_POLICY                 = 35         // in.h:197:1:
+	IP_ADD_MEMBERSHIP                = 35         // in.h:121:1:
+	IP_ADD_SOURCE_MEMBERSHIP         = 39         // in.h:125:1:
+	IP_BIND_ADDRESS_NO_PORT          = 24         // in.h:103:1:
+	IP_BLOCK_SOURCE                  = 38         // in.h:124:1:
+	IP_CHECKSUM                      = 23         // in.h:102:1:
+	IP_DEFAULT_MULTICAST_LOOP        = 1          // in.h:135:1:
+	IP_DEFAULT_MULTICAST_TTL         = 1          // in.h:134:1:
+	IP_DROP_MEMBERSHIP               = 36         // in.h:122:1:
+	IP_DROP_SOURCE_MEMBERSHIP        = 40         // in.h:126:1:
+	IP_FREEBIND                      = 15         // in.h:89:1:
+	IP_HDRINCL                       = 3          // in.h:48:1:
+	IP_IPSEC_POLICY                  = 16         // in.h:90:1:
+	IP_MAX_MEMBERSHIPS               = 20         // in.h:136:1:
+	IP_MINTTL                        = 21         // in.h:100:1:
+	IP_MSFILTER                      = 41         // in.h:127:1:
+	IP_MTU                           = 14         // in.h:88:1:
+	IP_MTU_DISCOVER                  = 10         // in.h:84:1:
+	IP_MULTICAST_ALL                 = 49         // in.h:128:1:
+	IP_MULTICAST_IF                  = 32         // in.h:118:1:
+	IP_MULTICAST_LOOP                = 34         // in.h:120:1:
+	IP_MULTICAST_TTL                 = 33         // in.h:119:1:
+	IP_NODEFRAG                      = 22         // in.h:101:1:
+	IP_OPTIONS                       = 4          // in.h:47:1:
+	IP_ORIGDSTADDR                   = 20         // in.h:97:1:
+	IP_PASSSEC                       = 18         // in.h:92:1:
+	IP_PKTINFO                       = 8          // in.h:81:1:
+	IP_PKTOPTIONS                    = 9          // in.h:82:1:
+	IP_PMTUDISC                      = 10         // in.h:83:1:
+	IP_PMTUDISC_DO                   = 2          // in.h:109:1:
+	IP_PMTUDISC_DONT                 = 0          // in.h:107:1:
+	IP_PMTUDISC_INTERFACE            = 4          // in.h:114:1:
+	IP_PMTUDISC_OMIT                 = 5          // in.h:116:1:
+	IP_PMTUDISC_PROBE                = 3          // in.h:110:1:
+	IP_PMTUDISC_WANT                 = 1          // in.h:108:1:
+	IP_RECVERR                       = 11         // in.h:85:1:
+	IP_RECVFRAGSIZE                  = 25         // in.h:104:1:
+	IP_RECVOPTS                      = 6          // in.h:51:1:
+	IP_RECVORIGDSTADDR               = 20         // in.h:98:1:
+	IP_RECVRETOPTS                   = 7          // in.h:53:1:
+	IP_RECVTOS                       = 13         // in.h:87:1:
+	IP_RECVTTL                       = 12         // in.h:86:1:
+	IP_RETOPTS                       = 7          // in.h:54:1:
+	IP_ROUTER_ALERT                  = 5          // in.h:80:1:
+	IP_TOS                           = 1          // in.h:49:1:
+	IP_TRANSPARENT                   = 19         // in.h:93:1:
+	IP_TTL                           = 2          // in.h:50:1:
+	IP_UNBLOCK_SOURCE                = 37         // in.h:123:1:
+	IP_UNICAST_IF                    = 50         // in.h:129:1:
+	IP_XFRM_POLICY                   = 17         // in.h:91:1:
+	LITTLE_ENDIAN                    = 1234       // endian.h:27:1:
+	MCAST_BLOCK_SOURCE               = 43         // in.h:67:1:
+	MCAST_EXCLUDE                    = 0          // in.h:76:1:
+	MCAST_INCLUDE                    = 1          // in.h:77:1:
+	MCAST_JOIN_GROUP                 = 42         // in.h:66:1:
+	MCAST_JOIN_SOURCE_GROUP          = 46         // in.h:70:1:
+	MCAST_LEAVE_GROUP                = 45         // in.h:69:1:
+	MCAST_LEAVE_SOURCE_GROUP         = 47         // in.h:71:1:
+	MCAST_MSFILTER                   = 48         // in.h:72:1:
+	MCAST_UNBLOCK_SOURCE             = 44         // in.h:68:1:
+	PDP_ENDIAN                       = 3412       // endian.h:29:1:
+	PF_ALG                           = 38         // socket.h:82:1:
+	PF_APPLETALK                     = 5          // socket.h:48:1:
+	PF_ASH                           = 18         // socket.h:62:1:
+	PF_ATMPVC                        = 8          // socket.h:51:1:
+	PF_ATMSVC                        = 20         // socket.h:64:1:
+	PF_AX25                          = 3          // socket.h:46:1:
+	PF_BLUETOOTH                     = 31         // socket.h:75:1:
+	PF_BRIDGE                        = 7          // socket.h:50:1:
+	PF_CAIF                          = 37         // socket.h:81:1:
+	PF_CAN                           = 29         // socket.h:73:1:
+	PF_DECnet                        = 12         // socket.h:55:1:
+	PF_ECONET                        = 19         // socket.h:63:1:
+	PF_FILE                          = 1          // socket.h:44:1:
+	PF_IB                            = 27         // socket.h:71:1:
+	PF_IEEE802154                    = 36         // socket.h:80:1:
+	PF_INET                          = 2          // socket.h:45:1:
+	PF_INET6                         = 10         // socket.h:53:1:
+	PF_IPX                           = 4          // socket.h:47:1:
+	PF_IRDA                          = 23         // socket.h:67:1:
+	PF_ISDN                          = 34         // socket.h:78:1:
+	PF_IUCV                          = 32         // socket.h:76:1:
+	PF_KCM                           = 41         // socket.h:85:1:
+	PF_KEY                           = 15         // socket.h:58:1:
+	PF_LLC                           = 26         // socket.h:70:1:
+	PF_LOCAL                         = 1          // socket.h:42:1:
+	PF_MAX                           = 45         // socket.h:89:1:
+	PF_MPLS                          = 28         // socket.h:72:1:
+	PF_NETBEUI                       = 13         // socket.h:56:1:
+	PF_NETLINK                       = 16         // socket.h:59:1:
+	PF_NETROM                        = 6          // socket.h:49:1:
+	PF_NFC                           = 39         // socket.h:83:1:
+	PF_PACKET                        = 17         // socket.h:61:1:
+	PF_PHONET                        = 35         // socket.h:79:1:
+	PF_PPPOX                         = 24         // socket.h:68:1:
+	PF_QIPCRTR                       = 42         // socket.h:86:1:
+	PF_RDS                           = 21         // socket.h:65:1:
+	PF_ROSE                          = 11         // socket.h:54:1:
+	PF_ROUTE                         = 16         // socket.h:60:1:
+	PF_RXRPC                         = 33         // socket.h:77:1:
+	PF_SECURITY                      = 14         // socket.h:57:1:
+	PF_SMC                           = 43         // socket.h:87:1:
+	PF_SNA                           = 22         // socket.h:66:1:
+	PF_TIPC                          = 30         // socket.h:74:1:
+	PF_UNIX                          = 1          // socket.h:43:1:
+	PF_UNSPEC                        = 0          // socket.h:41:1:
+	PF_VSOCK                         = 40         // socket.h:84:1:
+	PF_WANPIPE                       = 25         // socket.h:69:1:
+	PF_X25                           = 9          // socket.h:52:1:
+	PF_XDP                           = 44         // socket.h:88:1:
+	SCM_TIMESTAMP                    = 29         // socket.h:140:1:
+	SCM_TIMESTAMPING                 = 37         // socket.h:142:1:
+	SCM_TIMESTAMPING_OPT_STATS       = 54         // socket.h:90:1:
+	SCM_TIMESTAMPING_PKTINFO         = 58         // socket.h:98:1:
+	SCM_TIMESTAMPNS                  = 35         // socket.h:141:1:
+	SCM_TXTIME                       = 61         // socket.h:105:1:
+	SCM_WIFI_STATUS                  = 41         // socket.h:64:1:
+	SIOCATMARK                       = 0x8905     // sockios.h:10:1:
+	SIOCGPGRP                        = 0x8904     // sockios.h:9:1:
+	SIOCGSTAMP                       = 0x8906     // sockios.h:11:1:
+	SIOCGSTAMPNS                     = 0x8907     // sockios.h:12:1:
+	SIOCSPGRP                        = 0x8902     // sockios.h:7:1:
+	SOL_AAL                          = 265        // socket.h:151:1:
+	SOL_ALG                          = 279        // socket.h:165:1:
+	SOL_ATM                          = 264        // socket.h:150:1:
+	SOL_BLUETOOTH                    = 274        // socket.h:160:1:
+	SOL_CAIF                         = 278        // socket.h:164:1:
+	SOL_DCCP                         = 269        // socket.h:155:1:
+	SOL_DECNET                       = 261        // socket.h:147:1:
+	SOL_ICMPV6                       = 58         // in.h:253:1:
+	SOL_IP                           = 0          // in.h:132:1:
+	SOL_IPV6                         = 41         // in.h:252:1:
+	SOL_IRDA                         = 266        // socket.h:152:1:
+	SOL_IUCV                         = 277        // socket.h:163:1:
+	SOL_KCM                          = 281        // socket.h:167:1:
+	SOL_LLC                          = 268        // socket.h:154:1:
+	SOL_NETBEUI                      = 267        // socket.h:153:1:
+	SOL_NETLINK                      = 270        // socket.h:156:1:
+	SOL_NFC                          = 280        // socket.h:166:1:
+	SOL_PACKET                       = 263        // socket.h:149:1:
+	SOL_PNPIPE                       = 275        // socket.h:161:1:
+	SOL_PPPOL2TP                     = 273        // socket.h:159:1:
+	SOL_RAW                          = 255        // socket.h:146:1:
+	SOL_RDS                          = 276        // socket.h:162:1:
+	SOL_RXRPC                        = 272        // socket.h:158:1:
+	SOL_SOCKET                       = 1          // socket.h:9:1:
+	SOL_TIPC                         = 271        // socket.h:157:1:
+	SOL_TLS                          = 282        // socket.h:168:1:
+	SOL_X25                          = 262        // socket.h:148:1:
+	SOL_XDP                          = 283        // socket.h:169:1:
+	SOMAXCONN                        = 4096       // socket.h:172:1:
+	SO_ACCEPTCONN                    = 30         // socket.h:51:1:
+	SO_ATTACH_BPF                    = 50         // socket.h:82:1:
+	SO_ATTACH_FILTER                 = 26         // socket.h:45:1:
+	SO_ATTACH_REUSEPORT_CBPF         = 51         // socket.h:85:1:
+	SO_ATTACH_REUSEPORT_EBPF         = 52         // socket.h:86:1:
+	SO_BINDTODEVICE                  = 25         // socket.h:42:1:
+	SO_BINDTOIFINDEX                 = 62         // socket.h:107:1:
+	SO_BPF_EXTENSIONS                = 48         // socket.h:78:1:
+	SO_BROADCAST                     = 6          // socket.h:16:1:
+	SO_BSDCOMPAT                     = 14         // socket.h:26:1:
+	SO_BUSY_POLL                     = 46         // socket.h:74:1:
+	SO_CNX_ADVICE                    = 53         // socket.h:88:1:
+	SO_COOKIE                        = 57         // socket.h:96:1:
+	SO_DEBUG                         = 1          // socket.h:11:1:
+	SO_DETACH_BPF                    = 27         // socket.h:83:1:
+	SO_DETACH_FILTER                 = 27         // socket.h:46:1:
+	SO_DETACH_REUSEPORT_BPF          = 68         // socket.h:120:1:
+	SO_DOMAIN                        = 39         // socket.h:59:1:
+	SO_DONTROUTE                     = 5          // socket.h:15:1:
+	SO_ERROR                         = 4          // socket.h:14:1:
+	SO_GET_FILTER                    = 26         // socket.h:47:1:
+	SO_INCOMING_CPU                  = 49         // socket.h:80:1:
+	SO_INCOMING_NAPI_ID              = 56         // socket.h:94:1:
+	SO_KEEPALIVE                     = 9          // socket.h:21:1:
+	SO_LINGER                        = 13         // socket.h:25:1:
+	SO_LOCK_FILTER                   = 44         // socket.h:70:1:
+	SO_MARK                          = 36         // socket.h:56:1:
+	SO_MAX_PACING_RATE               = 47         // socket.h:76:1:
+	SO_MEMINFO                       = 55         // socket.h:92:1:
+	SO_NOFCS                         = 43         // socket.h:68:1:
+	SO_NO_CHECK                      = 11         // socket.h:23:1:
+	SO_OOBINLINE                     = 10         // socket.h:22:1:
+	SO_PASSCRED                      = 16         // socket.h:29:1:
+	SO_PASSSEC                       = 34         // socket.h:54:1:
+	SO_PEEK_OFF                      = 42         // socket.h:65:1:
+	SO_PEERCRED                      = 17         // socket.h:30:1:
+	SO_PEERGROUPS                    = 59         // socket.h:100:1:
+	SO_PEERNAME                      = 28         // socket.h:49:1:
+	SO_PEERSEC                       = 31         // socket.h:53:1:
+	SO_PRIORITY                      = 12         // socket.h:24:1:
+	SO_PROTOCOL                      = 38         // socket.h:58:1:
+	SO_RCVBUF                        = 8          // socket.h:18:1:
+	SO_RCVBUFFORCE                   = 33         // socket.h:20:1:
+	SO_RCVLOWAT                      = 18         // socket.h:31:1:
+	SO_RCVTIMEO                      = 20         // socket.h:129:1:
+	SO_RCVTIMEO_NEW                  = 66         // socket.h:117:1:
+	SO_RCVTIMEO_OLD                  = 20         // socket.h:33:1:
+	SO_REUSEADDR                     = 2          // socket.h:12:1:
+	SO_REUSEPORT                     = 15         // socket.h:27:1:
+	SO_RXQ_OVFL                      = 40         // socket.h:61:1:
+	SO_SECURITY_AUTHENTICATION       = 22         // socket.h:38:1:
+	SO_SECURITY_ENCRYPTION_NETWORK   = 24         // socket.h:40:1:
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 23         // socket.h:39:1:
+	SO_SELECT_ERR_QUEUE              = 45         // socket.h:72:1:
+	SO_SNDBUF                        = 7          // socket.h:17:1:
+	SO_SNDBUFFORCE                   = 32         // socket.h:19:1:
+	SO_SNDLOWAT                      = 19         // socket.h:32:1:
+	SO_SNDTIMEO                      = 21         // socket.h:130:1:
+	SO_SNDTIMEO_NEW                  = 67         // socket.h:118:1:
+	SO_SNDTIMEO_OLD                  = 21         // socket.h:34:1:
+	SO_TIMESTAMP                     = 29         // socket.h:125:1:
+	SO_TIMESTAMPING                  = 37         // socket.h:127:1:
+	SO_TIMESTAMPING_NEW              = 65         // socket.h:115:1:
+	SO_TIMESTAMPING_OLD              = 37         // socket.h:111:1:
+	SO_TIMESTAMPNS                   = 35         // socket.h:126:1:
+	SO_TIMESTAMPNS_NEW               = 64         // socket.h:114:1:
+	SO_TIMESTAMPNS_OLD               = 35         // socket.h:110:1:
+	SO_TIMESTAMP_NEW                 = 63         // socket.h:113:1:
+	SO_TIMESTAMP_OLD                 = 29         // socket.h:109:1:
+	SO_TXTIME                        = 61         // socket.h:104:1:
+	SO_TYPE                          = 3          // socket.h:13:1:
+	SO_WIFI_STATUS                   = 41         // socket.h:63:1:
+	SO_ZEROCOPY                      = 60         // socket.h:102:1:
+	X_ASM_X86_POSIX_TYPES_64_H       = 0          // posix_types_64.h:3:1:
+	X_ATFILE_SOURCE                  = 1          // features.h:342:1:
+	X_BITS_BYTESWAP_H                = 1          // byteswap.h:24:1:
+	X_BITS_ENDIANNESS_H              = 1          // endianness.h:2:1:
+	X_BITS_ENDIAN_H                  = 1          // endian.h:20:1:
+	X_BITS_PTHREADTYPES_ARCH_H       = 1          // pthreadtypes-arch.h:19:1:
+	X_BITS_PTHREADTYPES_COMMON_H     = 1          // pthreadtypes.h:20:1:
+	X_BITS_SOCKADDR_H                = 1          // sockaddr.h:24:1:
+	X_BITS_STDINT_INTN_H             = 1          // stdint-intn.h:20:1:
+	X_BITS_STDINT_UINTN_H            = 1          // stdint-uintn.h:20:1:
+	X_BITS_TIME64_H                  = 1          // time64.h:24:1:
+	X_BITS_TYPESIZES_H               = 1          // typesizes.h:24:1:
+	X_BITS_TYPES_H                   = 1          // types.h:24:1:
+	X_BITS_UINTN_IDENTITY_H          = 1          // uintn-identity.h:24:1:
+	X_BSD_SIZE_T_                    = 0          // stddef.h:189:1:
+	X_BSD_SIZE_T_DEFINED_            = 0          // stddef.h:192:1:
+	X_DEFAULT_SOURCE                 = 1          // features.h:227:1:
+	X_ENDIAN_H                       = 1          // endian.h:19:1:
+	X_FEATURES_H                     = 1          // features.h:19:1:
+	X_FILE_OFFSET_BITS               = 64         // <builtin>:25:1:
+	X_GCC_SIZE_T                     = 0          // stddef.h:195:1:
+	X_LINUX_POSIX_TYPES_H            = 0          // posix_types.h:3:1:
+	X_LP64                           = 1          // <predefined>:284:1:
+	X_NETINET_IN_H                   = 1          // in.h:19:1:
+	X_POSIX_C_SOURCE                 = 200809     // features.h:281:1:
+	X_POSIX_SOURCE                   = 1          // features.h:279:1:
+	X_RWLOCK_INTERNAL_H              = 0          // struct_rwlock.h:21:1:
+	X_SIZET_                         = 0          // stddef.h:196:1:
+	X_SIZE_T                         = 0          // stddef.h:183:1:
+	X_SIZE_T_                        = 0          // stddef.h:188:1:
+	X_SIZE_T_DECLARED                = 0          // stddef.h:193:1:
+	X_SIZE_T_DEFINED                 = 0          // stddef.h:191:1:
+	X_SIZE_T_DEFINED_                = 0          // stddef.h:190:1:
+	X_SS_SIZE                        = 128        // sockaddr.h:40:1:
+	X_STDC_PREDEF_H                  = 1          // <predefined>:162:1:
+	X_STRUCT_TIMESPEC                = 1          // struct_timespec.h:3:1:
+	X_SYS_CDEFS_H                    = 1          // cdefs.h:19:1:
+	X_SYS_SELECT_H                   = 1          // select.h:22:1:
+	X_SYS_SIZE_T_H                   = 0          // stddef.h:184:1:
+	X_SYS_SOCKET_H                   = 1          // socket.h:20:1:
+	X_SYS_TYPES_H                    = 1          // types.h:23:1:
+	X_THREAD_MUTEX_INTERNAL_H        = 1          // struct_mutex.h:20:1:
+	X_THREAD_SHARED_TYPES_H          = 1          // thread-shared-types.h:20:1:
+	X_T_SIZE                         = 0          // stddef.h:186:1:
+	X_T_SIZE_                        = 0          // stddef.h:185:1:
+	Linux                            = 1          // <predefined>:231:1:
+	Unix                             = 1          // <predefined>:177:1:
+)
+
+// Standard well-known ports.
+const ( /* in.h:122:1: */
+	IPPORT_ECHO       = 7  // Echo service.
+	IPPORT_DISCARD    = 9  // Discard transmissions service.
+	IPPORT_SYSTAT     = 11 // System status service.
+	IPPORT_DAYTIME    = 13 // Time of day service.
+	IPPORT_NETSTAT    = 15 // Network status service.
+	IPPORT_FTP        = 21 // File Transfer Protocol.
+	IPPORT_TELNET     = 23 // Telnet protocol.
+	IPPORT_SMTP       = 25 // Simple Mail Transfer Protocol.
+	IPPORT_TIMESERVER = 37 // Timeserver service.
+	IPPORT_NAMESERVER = 42 // Domain Name Service.
+	IPPORT_WHOIS      = 43 // Internet Whois service.
+	IPPORT_MTP        = 57
+
+	IPPORT_TFTP    = 69 // Trivial File Transfer Protocol.
+	IPPORT_RJE     = 77
+	IPPORT_FINGER  = 79 // Finger service.
+	IPPORT_TTYLINK = 87
+	IPPORT_SUPDUP  = 95 // SUPDUP protocol.
+
+	IPPORT_EXECSERVER  = 512 // execd service.
+	IPPORT_LOGINSERVER = 513 // rlogind service.
+	IPPORT_CMDSERVER   = 514
+	IPPORT_EFSSERVER   = 520
+
+	// UDP ports.
+	IPPORT_BIFFUDP     = 512
+	IPPORT_WHOSERVER   = 513
+	IPPORT_ROUTESERVER = 520
+
+	// Ports less than this value are reserved for privileged processes.
+	IPPORT_RESERVED = 1024
+
+	// Ports greater this value are reserved for (non-privileged) servers.
+	IPPORT_USERRESERVED = 5000
+)
+
+// Options for use with `getsockopt' and `setsockopt' at the IPv6 level.
+//    The first word in the comment at the right is the data type used;
+//    "bool" means a boolean value stored in an `int'.
+
+// Advanced API (RFC3542) (1).
+
+// Advanced API (RFC3542) (2).
+
+// RFC5014.
+
+// RFC5082.
+
+// Obsolete synonyms for the above.
+
+// IPV6_MTU_DISCOVER values.
+
+// Socket level values for IPv6.
+
+// Routing header options for IPv6.
+
+// Standard well-defined IP protocols.
+const ( /* in.h:40:1: */
+	IPPROTO_IP      = 0   // Dummy protocol for TCP.
+	IPPROTO_ICMP    = 1   // Internet Control Message Protocol.
+	IPPROTO_IGMP    = 2   // Internet Group Management Protocol.
+	IPPROTO_IPIP    = 4   // IPIP tunnels (older KA9Q tunnels use 94).
+	IPPROTO_TCP     = 6   // Transmission Control Protocol.
+	IPPROTO_EGP     = 8   // Exterior Gateway Protocol.
+	IPPROTO_PUP     = 12  // PUP protocol.
+	IPPROTO_UDP     = 17  // User Datagram Protocol.
+	IPPROTO_IDP     = 22  // XNS IDP protocol.
+	IPPROTO_TP      = 29  // SO Transport Protocol Class 4.
+	IPPROTO_DCCP    = 33  // Datagram Congestion Control Protocol.
+	IPPROTO_IPV6    = 41  // IPv6 header.
+	IPPROTO_RSVP    = 46  // Reservation Protocol.
+	IPPROTO_GRE     = 47  // General Routing Encapsulation.
+	IPPROTO_ESP     = 50  // encapsulating security payload.
+	IPPROTO_AH      = 51  // authentication header.
+	IPPROTO_MTP     = 92  // Multicast Transport Protocol.
+	IPPROTO_BEETPH  = 94  // IP option pseudo header for BEET.
+	IPPROTO_ENCAP   = 98  // Encapsulation Header.
+	IPPROTO_PIM     = 103 // Protocol Independent Multicast.
+	IPPROTO_COMP    = 108 // Compression Header Protocol.
+	IPPROTO_SCTP    = 132 // Stream Control Transmission Protocol.
+	IPPROTO_UDPLITE = 136 // UDP-Lite protocol.
+	IPPROTO_MPLS    = 137 // MPLS in IP.
+	IPPROTO_RAW     = 255 // Raw IP packets.
+	IPPROTO_MAX     = 256
+)
+
+// If __USE_KERNEL_IPV6_DEFS is 1 then the user has included the kernel
+//
+//	network headers first and we should use those ABI-identical definitions
+//	instead of our own, otherwise 0.
+const ( /* in.h:99:1: */
+	IPPROTO_HOPOPTS  = 0  // IPv6 Hop-by-Hop options.
+	IPPROTO_ROUTING  = 43 // IPv6 routing header.
+	IPPROTO_FRAGMENT = 44 // IPv6 fragmentation header.
+	IPPROTO_ICMPV6   = 58 // ICMPv6.
+	IPPROTO_NONE     = 59 // IPv6 no next header.
+	IPPROTO_DSTOPTS  = 60 // IPv6 destination options.
+	IPPROTO_MH       = 135
+)
+
+// Bits in the FLAGS argument to `send', `recv', et al.
+const ( /* socket.h:200:1: */
+	MSG_OOB        = 1  // Process out-of-band data.
+	MSG_PEEK       = 2  // Peek at incoming messages.
+	MSG_DONTROUTE  = 4  // Don't use local routing.
+	MSG_CTRUNC     = 8  // Control data lost before delivery.
+	MSG_PROXY      = 16 // Supply or ask second address.
+	MSG_TRUNC      = 32
+	MSG_DONTWAIT   = 64  // Nonblocking IO.
+	MSG_EOR        = 128 // End of record.
+	MSG_WAITALL    = 256 // Wait for a full request.
+	MSG_FIN        = 512
+	MSG_SYN        = 1024
+	MSG_CONFIRM    = 2048 // Confirm path validity.
+	MSG_RST        = 4096
+	MSG_ERRQUEUE   = 8192      // Fetch message from error queue.
+	MSG_NOSIGNAL   = 16384     // Do not generate SIGPIPE.
+	MSG_MORE       = 32768     // Sender will send more.
+	MSG_WAITFORONE = 65536     // Wait for at least one packet to return.
+	MSG_BATCH      = 262144    // sendmmsg: more messages coming.
+	MSG_ZEROCOPY   = 67108864  // Use user data in kernel path.
+	MSG_FASTOPEN   = 536870912 // Send data in TCP SYN.
+
+	MSG_CMSG_CLOEXEC = 1073741824
+)
+
+// Socket level message types.  This must match the definitions in
+//
+//	<linux/socket.h>.
+const ( /* socket.h:332:1: */
+	SCM_RIGHTS = 1
+)
+
+// Get the architecture-dependent definition of enum __socket_type.
+// Define enum __socket_type for generic Linux.
+//    Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Types of sockets.
+const ( /* socket_type.h:24:1: */
+	SOCK_STREAM = 1 // Sequenced, reliable, connection-based
+	// 				   byte streams.
+	SOCK_DGRAM = 2 // Connectionless, unreliable datagrams
+	// 				   of fixed maximum length.
+	SOCK_RAW       = 3 // Raw protocol interface.
+	SOCK_RDM       = 4 // Reliably-delivered messages.
+	SOCK_SEQPACKET = 5 // Sequenced, reliable, connection-based,
+	// 				   datagrams of fixed maximum length.
+	SOCK_DCCP   = 6  // Datagram Congestion Control Protocol.
+	SOCK_PACKET = 10 // Linux specific way of getting packets
+	// 				   at the dev level.  For writing rarp and
+	// 				   other similar things on the user level.
+
+	// Flags to be ORed into the type parameter of socket and socketpair and
+	//      used for the flags parameter of paccept.
+
+	SOCK_CLOEXEC = 524288 // Atomically set close-on-exec flag for the
+	// 				   new descriptor(s).
+	SOCK_NONBLOCK = 2048
+)
+
+// The following constants should be used for the second parameter of
+//
+//	`shutdown'.
+const ( /* socket.h:41:1: */
+	SHUT_RD   = 0 // No more receptions.
+	SHUT_WR   = 1 // No more transmissions.
+	SHUT_RDWR = 2
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// These are defined by the user (or the compiler)
+//    to specify the desired environment:
+//
+//    __STRICT_ANSI__	ISO Standard C.
+//    _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
+//    _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
+//    _ISOC2X_SOURCE	Extensions to ISO C99 from ISO C2X.
+//    __STDC_WANT_LIB_EXT2__
+// 			Extensions to ISO C99 from TR 27431-2:2010.
+//    __STDC_WANT_IEC_60559_BFP_EXT__
+// 			Extensions to ISO C11 from TS 18661-1:2014.
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__
+// 			Extensions to ISO C11 from TS 18661-4:2015.
+//    __STDC_WANT_IEC_60559_TYPES_EXT__
+// 			Extensions to ISO C11 from TS 18661-3:2015.
+//
+//    _POSIX_SOURCE	IEEE Std 1003.1.
+//    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
+// 			if >=199309L, add IEEE Std 1003.1b-1993;
+// 			if >=199506L, add IEEE Std 1003.1c-1995;
+// 			if >=200112L, all of IEEE 1003.1-2004
+// 			if >=200809L, all of IEEE 1003.1-2008
+//    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
+// 			Single Unix conformance is wanted, to 600 for the
+// 			sixth revision, to 700 for the seventh revision.
+//    _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
+//    _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
+//    _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
+//    _FILE_OFFSET_BITS=N	Select default filesystem interface.
+//    _ATFILE_SOURCE	Additional *at interfaces.
+//    _GNU_SOURCE		All of the above, plus GNU extensions.
+//    _DEFAULT_SOURCE	The default set of features (taking precedence over
+// 			__STRICT_ANSI__).
+//
+//    _FORTIFY_SOURCE	Add security hardening to many library functions.
+// 			Set to 1 or 2; 2 performs stricter checks than 1.
+//
+//    _REENTRANT, _THREAD_SAFE
+// 			Obsolete; equivalent to _POSIX_C_SOURCE=199506L.
+//
+//    The `-ansi' switch to the GNU C compiler, and standards conformance
+//    options such as `-std=c99', define __STRICT_ANSI__.  If none of
+//    these are defined, or if _DEFAULT_SOURCE is defined, the default is
+//    to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
+//    200809L, as well as enabling miscellaneous functions from BSD and
+//    SVID.  If more than one of these are defined, they accumulate.  For
+//    example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
+//    give you ISO C, 1003.1, and 1003.2, but nothing else.
+//
+//    These are defined by this file and are used by the
+//    header files to decide what to declare or define:
+//
+//    __GLIBC_USE (F)	Define things from feature set F.  This is defined
+// 			to 1 or 0; the subsequent macros are either defined
+// 			or undefined, and those tests should be moved to
+// 			__GLIBC_USE.
+//    __USE_ISOC11		Define ISO C11 things.
+//    __USE_ISOC99		Define ISO C99 things.
+//    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+//    __USE_ISOCXX11	Define ISO C++11 things.
+//    __USE_POSIX		Define IEEE Std 1003.1 things.
+//    __USE_POSIX2		Define IEEE Std 1003.2 things.
+//    __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
+//    __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
+//    __USE_XOPEN		Define XPG things.
+//    __USE_XOPEN_EXTENDED	Define X/Open Unix things.
+//    __USE_UNIX98		Define Single Unix V2 things.
+//    __USE_XOPEN2K        Define XPG6 things.
+//    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+//    __USE_XOPEN2K8       Define XPG7 things.
+//    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
+//    __USE_LARGEFILE	Define correct standard I/O things.
+//    __USE_LARGEFILE64	Define LFS things with separate names.
+//    __USE_FILE_OFFSET64	Define 64bit interface as default.
+//    __USE_MISC		Define things from 4.3BSD or System V Unix.
+//    __USE_ATFILE		Define *at interfaces and AT_* constants for them.
+//    __USE_GNU		Define GNU extensions.
+//    __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
+//
+//    The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
+//    defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
+//    only for compatibility.  All new code should use the other symbols
+//    to test for features.
+//
+//    All macros listed above as possibly being defined by this file are
+//    explicitly undefined if they are not explicitly defined.
+//    Feature-test macros that are not defined by the user or compiler
+//    but are implied by the other feature-test macros defined (or by the
+//    lack of any definitions) are defined by the file.
+//
+//    ISO C feature test macros depend on the definition of the macro
+//    when an affected header is included, not when the first system
+//    header is included, and so they are handled in
+//    <bits/libc-header-start.h>, which does not have a multiple include
+//    guard.  Feature test macros that can be handled from the first
+//    system header included are handled here.
+
+// Undefine everything, so we get a clean slate.
+
+// Suppress kernel-name space pollution unless user expressedly asks
+//    for it.
+
+// Convenience macro to test the version of gcc.
+//    Use like this:
+//    #if __GNUC_PREREQ (2,8)
+//    ... code requiring gcc 2.8 or later ...
+//    #endif
+//    Note: only works for GCC 2.0 and later, because __GNUC_MINOR__ was
+//    added in 2.0.
+
+// Similarly for clang.  Features added to GCC after version 4.2 may
+//    or may not also be available in clang, and clang's definitions of
+//    __GNUC(_MINOR)__ are fixed at 4 and 2 respectively.  Not all such
+//    features can be queried via __has_extension/__has_feature.
+
+// Whether to use feature set F.
+
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
+//    _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
+//    issue a warning; the expectation is that the source is being
+//    transitioned to use the new macro.
+
+// If _GNU_SOURCE was defined by the user, turn on all the other features.
+
+// If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
+//    define _DEFAULT_SOURCE.
+
+// This is to enable the ISO C2X extension.
+
+// This is to enable the ISO C11 extension.
+
+// This is to enable the ISO C99 extension.
+
+// This is to enable the ISO C90 Amendment 1:1995 extension.
+
+// If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
+//    is defined, use POSIX.1-2008 (or another version depending on
+//    _XOPEN_SOURCE).
+
+// Some C libraries once required _REENTRANT and/or _THREAD_SAFE to be
+//    defined in all multithreaded code.  GNU libc has not required this
+//    for many years.  We now treat them as compatibility synonyms for
+//    _POSIX_C_SOURCE=199506L, which is the earliest level of POSIX with
+//    comprehensive support for multithreaded code.  Using them never
+//    lowers the selected level of POSIX conformance, only raises it.
+
+// The function 'gets' existed in C89, but is impossible to use
+//    safely.  It has been removed from ISO C11 and ISO C++14.  Note: for
+//    compatibility with various implementations of <cstdio>, this test
+//    must consider only the value of __cplusplus when compiling C++.
+
+// GNU formerly extended the scanf functions with modified format
+//    specifiers %as, %aS, and %a[...] that allocate a buffer for the
+//    input using malloc.  This extension conflicts with ISO C99, which
+//    defines %a as a standalone format specifier that reads a floating-
+//    point number; moreover, POSIX.1-2008 provides the same feature
+//    using the modifier letter 'm' instead (%ms, %mS, %m[...]).
+//
+//    We now follow C99 unless GNU extensions are active and the compiler
+//    is specifically in C89 or C++98 mode (strict or not).  For
+//    instance, with GCC, -std=gnu11 will have C99-compliant scanf with
+//    or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
+//    old extension.
+
+// Get definitions of __STDC_* predefined macros, if the compiler has
+//    not preincluded this header automatically.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This macro indicates that the installed library is the GNU C Library.
+//    For historic reasons the value now is 6 and this will stay from now
+//    on.  The use of this variable is deprecated.  Use __GLIBC__ and
+//    __GLIBC_MINOR__ now (see below) when you want to test for a specific
+//    GNU C library version and use the values in <gnu/lib-names.h> to get
+//    the sonames of the shared libraries.
+
+// Major and minor version number of the GNU C library package.  Use
+//    these macros to test for features in specific releases.
+
+// This is here only because every header file already includes this one.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// We are almost always included from features.h.
+
+// The GNU libc does not support any K&R compilers or the traditional mode
+//    of ISO C compilers anymore.  Check for some of the combinations not
+//    anymore supported.
+
+// Some user header file might have defined this before.
+
+// All functions, except those with callbacks or those that
+//    synchronize memory, are leaf functions.
+
+// GCC can always grok prototypes.  For C++ programs we add throw()
+//    to help it optimize the function calls.  But this works only with
+//    gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+//    as non-throwing using a function attribute since programs can use
+//    the -fexceptions options for C code as well.
+
+// Compilers that are not clang may object to
+//        #if defined __clang__ && __has_extension(...)
+//    even though they do not need to evaluate the right-hand side of the &&.
+
+// These two macros are not used in glibc anymore.  They are kept here
+//    only because some other projects expect the macros to be defined.
+
+// For these things, GCC behaves the ANSI way normally,
+//    and the non-ANSI way under -traditional.
+
+// This is not a typedef so `const __ptr_t' does the right thing.
+
+// C++ needs to know that types and declarations are C, not C++.
+
+// Fortify support.
+
+// Support for flexible arrays.
+//    Headers that should use flexible arrays only if they're "real"
+//    (e.g. only if they won't affect sizeof()) should test
+//    #if __glibc_c99_flexarr_available.
+
+// __asm__ ("xyz") is used throughout the headers to rename functions
+//    at the assembly language level.  This is wrapped by the __REDIRECT
+//    macro, in order to support compilers that can do this some other
+//    way.  When compilers don't support asm-names at all, we have to do
+//    preprocessor tricks instead (which don't have exactly the right
+//    semantics, but it's the best we can do).
+//
+//    Example:
+//    int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid);
+
+//
+// #elif __SOME_OTHER_COMPILER__
+//
+// # define __REDIRECT(name, proto, alias) name proto; 	_Pragma("let " #name " = " #alias)
+
+// GCC has various useful declarations that can be made with the
+//    `__attribute__' syntax.  All of the ways we use this do fine if
+//    they are omitted for compilers that don't understand it.
+
+// At some point during the gcc 2.96 development the `malloc' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Tell the compiler which arguments to an allocation function
+//    indicate the size of the allocation.
+
+// At some point during the gcc 2.96 development the `pure' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// This declaration tells the compiler that the value is constant.
+
+// At some point during the gcc 3.1 development the `used' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Since version 3.2, gcc allows marking deprecated functions.
+
+// Since version 4.5, gcc also allows one to specify the message printed
+//    when a deprecated function is used.  clang claims to be gcc 4.2, but
+//    may also support this feature.
+
+// At some point during the gcc 2.8 development the `format_arg' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+//    If several `format_arg' attributes are given for the same function, in
+//    gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+//    all designated arguments are considered.
+
+// At some point during the gcc 2.97 development the `strfmon' format
+//    attribute for functions was introduced.  We don't want to use it
+//    unconditionally (although this would be possible) since it
+//    generates warnings.
+
+// The nonull function attribute allows to mark pointer parameters which
+//    must not be NULL.
+
+// If fortification mode, we warn about unused results of certain
+//    function calls which can lead to problems.
+
+// Forces a function to be always inlined.
+// The Linux kernel defines __always_inline in stddef.h (283d7573), and
+//    it conflicts with this definition.  Therefore undefine it first to
+//    allow either header to be included first.
+
+// Associate error messages with the source location of the call site rather
+//    than with the source location inside the function.
+
+// GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+//    inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
+//    or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+//    older than 4.3 may define these macros and still not guarantee GNU inlining
+//    semantics.
+//
+//    clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+//    semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
+//    __GNUC_GNU_INLINE__ macro definitions.
+
+// GCC 4.3 and above allow passing all anonymous arguments of an
+//    __extern_always_inline function to some other vararg function.
+
+// It is possible to compile containing GCC extensions even if GCC is
+//    run in pedantic mode if the uses are carefully marked using the
+//    `__extension__' keyword.  But this is not generally available before
+//    version 2.8.
+
+// __restrict is known in EGCS 1.2 and above.
+
+// ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+//      array_name[restrict]
+//    GCC 3.1 supports this.
+
+// Describes a char array whose address can safely be passed as the first
+//    argument to strncpy and strncat, as the char array is not necessarily
+//    a NUL-terminated string.
+
+// Undefine (also defined in libc-symbols.h).
+// Copies attributes from the declaration or type referenced by
+//    the argument.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// __glibc_macro_warning (MESSAGE) issues warning MESSAGE.  This is
+//    intended for use in preprocessor macros.
+//
+//    Note: MESSAGE must be a _single_ string; concatenation of string
+//    literals is not supported.
+
+// Generic selection (ISO C11) is a C-only feature, available in GCC
+//    since version 4.9.  Previous versions do not provide generic
+//    selection, even though they might set __STDC_VERSION__ to 201112L,
+//    when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
+//    when testing __STDC_VERSION__ for generic selection support.
+//    On the other hand, Clang also defines __GNUC__, so a clang-specific
+//    check is required to enable the use of generic selection.
+
+// If we don't have __REDIRECT, prototypes will be missing if
+//    __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64].
+
+// Decide whether we can define 'extern inline' functions in headers.
+
+// This is here only because every header file already includes this one.
+//    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
+//    <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+//    that will always return failure (and set errno to ENOSYS).
+// This file is automatically generated.
+//    This file selects the right generated file of `__stub_FUNCTION' macros
+//    based on the architecture being compiled for.
+
+// This file is automatically generated.
+//    It defines a symbol `__stub_FUNCTION' for each function
+//    in the C library which is a stub, meaning it will fail
+//    every time called, usually setting errno to ENOSYS.
+
+// Define uintN_t types.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Seconds since the Epoch, visible to user code when time_t is too
+//    narrow only for consistency with the old way of widening too-narrow
+//    types.  User code should never use __time64_t.
+
+type Uint8_t = X__uint8_t   /* stdint-uintn.h:24:19 */
+type Uint16_t = X__uint16_t /* stdint-uintn.h:25:20 */
+type Uint32_t = X__uint32_t /* stdint-uintn.h:26:20 */
+type Uint64_t = X__uint64_t /* stdint-uintn.h:27:20 */
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// Structure for scatter/gather I/O.
+type Iovec = struct {
+	Fiov_base uintptr
+	Fiov_len  Size_t
+} /* struct_iovec.h:26:1 */
+
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
+//
+// This file is part of GCC.
+//
+// GCC is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// GCC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+//
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+// ISO C Standard:  7.17  Common definitions  <stddef.h>
+
+// Any one of these symbols __need_* means that GNU libc
+//    wants us just to define one data type.  So don't define
+//    the symbols that indicate this file's entire job has been done.
+
+// This avoids lossage on SunOS but only if stdtypes.h comes first.
+//    There's no way to win with the other order!  Sun lossage.
+
+// Sequent's header files use _PTRDIFF_T_ in some conflicting way.
+//    Just ignore it.
+
+// On VxWorks, <type/vxTypesBase.h> may have defined macros like
+//    _TYPE_size_t which will typedef size_t.  fixincludes patched the
+//    vxTypesBase.h so that this macro is only defined if _GCC_SIZE_T is
+//    not defined, and so that defining this macro defines _GCC_SIZE_T.
+//    If we find that the macros are still defined at this point, we must
+//    invoke them so that the type is defined as expected.
+
+// In case nobody has defined these types, but we aren't running under
+//    GCC 2.00, make sure that __PTRDIFF_TYPE__, __SIZE_TYPE__, and
+//    __WCHAR_TYPE__ have reasonable values.  This can happen if the
+//    parts of GCC is compiled by an older compiler, that actually
+//    include gstddef.h, such as collect2.
+
+// Signed type of difference of two pointers.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Unsigned type of `sizeof' something.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// This operating system-specific header file defines the SOCK_*, PF_*,
+//    AF_*, MSG_*, SOL_*, and SO_* constants, and the `struct sockaddr',
+//    `struct msghdr', and `struct linger' types.
+// System-specific socket constants and types.  Linux version.
+//    Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
+//
+// This file is part of GCC.
+//
+// GCC is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// GCC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+//
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+// ISO C Standard:  7.17  Common definitions  <stddef.h>
+
+// Any one of these symbols __need_* means that GNU libc
+//    wants us just to define one data type.  So don't define
+//    the symbols that indicate this file's entire job has been done.
+
+// This avoids lossage on SunOS but only if stdtypes.h comes first.
+//    There's no way to win with the other order!  Sun lossage.
+
+// Sequent's header files use _PTRDIFF_T_ in some conflicting way.
+//    Just ignore it.
+
+// On VxWorks, <type/vxTypesBase.h> may have defined macros like
+//    _TYPE_size_t which will typedef size_t.  fixincludes patched the
+//    vxTypesBase.h so that this macro is only defined if _GCC_SIZE_T is
+//    not defined, and so that defining this macro defines _GCC_SIZE_T.
+//    If we find that the macros are still defined at this point, we must
+//    invoke them so that the type is defined as expected.
+
+// In case nobody has defined these types, but we aren't running under
+//    GCC 2.00, make sure that __PTRDIFF_TYPE__, __SIZE_TYPE__, and
+//    __WCHAR_TYPE__ have reasonable values.  This can happen if the
+//    parts of GCC is compiled by an older compiler, that actually
+//    include gstddef.h, such as collect2.
+
+// Signed type of difference of two pointers.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Unsigned type of `sizeof' something.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX Standard: 2.6 Primitive System Data Types	<sys/types.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+type U_char = X__u_char     /* types.h:33:18 */
+type U_short = X__u_short   /* types.h:34:19 */
+type U_int = X__u_int       /* types.h:35:17 */
+type U_long = X__u_long     /* types.h:36:18 */
+type Quad_t = X__quad_t     /* types.h:37:18 */
+type U_quad_t = X__u_quad_t /* types.h:38:20 */
+type Fsid_t = X__fsid_t     /* types.h:39:18 */
+type Loff_t = X__loff_t     /* types.h:42:18 */
+
+type Ino_t = X__ino64_t /* types.h:49:19 */
+
+type Dev_t = X__dev_t /* types.h:59:17 */
+
+type Gid_t = X__gid_t /* types.h:64:17 */
+
+type Mode_t = X__mode_t /* types.h:69:18 */
+
+type Nlink_t = X__nlink_t /* types.h:74:19 */
+
+type Uid_t = X__uid_t /* types.h:79:17 */
+
+type Off_t = X__off64_t /* types.h:87:19 */
+
+type Pid_t = X__pid_t /* types.h:97:17 */
+
+type Id_t = X__id_t /* types.h:103:16 */
+
+type Ssize_t = X__ssize_t /* types.h:108:19 */
+
+type Daddr_t = X__daddr_t /* types.h:114:19 */
+type Caddr_t = X__caddr_t /* types.h:115:19 */
+
+type Key_t = X__key_t /* types.h:121:17 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `clock'.
+type Clock_t = X__clock_t /* clock_t.h:7:19 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Clock ID used in clock and timer functions.
+type Clockid_t = X__clockid_t /* clockid_t.h:7:21 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `time'.
+type Time_t = X__time_t /* time_t.h:7:18 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Timer ID returned by `timer_create'.
+type Timer_t = X__timer_t /* timer_t.h:7:19 */
+
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
+//
+// This file is part of GCC.
+//
+// GCC is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// GCC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+//
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+// ISO C Standard:  7.17  Common definitions  <stddef.h>
+
+// Any one of these symbols __need_* means that GNU libc
+//    wants us just to define one data type.  So don't define
+//    the symbols that indicate this file's entire job has been done.
+
+// This avoids lossage on SunOS but only if stdtypes.h comes first.
+//    There's no way to win with the other order!  Sun lossage.
+
+// Sequent's header files use _PTRDIFF_T_ in some conflicting way.
+//    Just ignore it.
+
+// On VxWorks, <type/vxTypesBase.h> may have defined macros like
+//    _TYPE_size_t which will typedef size_t.  fixincludes patched the
+//    vxTypesBase.h so that this macro is only defined if _GCC_SIZE_T is
+//    not defined, and so that defining this macro defines _GCC_SIZE_T.
+//    If we find that the macros are still defined at this point, we must
+//    invoke them so that the type is defined as expected.
+
+// In case nobody has defined these types, but we aren't running under
+//    GCC 2.00, make sure that __PTRDIFF_TYPE__, __SIZE_TYPE__, and
+//    __WCHAR_TYPE__ have reasonable values.  This can happen if the
+//    parts of GCC is compiled by an older compiler, that actually
+//    include gstddef.h, such as collect2.
+
+// Signed type of difference of two pointers.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Unsigned type of `sizeof' something.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// Old compatibility names for C types.
+type Ulong = uint64  /* types.h:148:27 */
+type Ushort = uint16 /* types.h:149:28 */
+type Uint = uint32   /* types.h:150:22 */
+
+// These size-specific names are used by some of the inet code.
+
+// Define intN_t types.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+type Int8_t = X__int8_t   /* stdint-intn.h:24:18 */
+type Int16_t = X__int16_t /* stdint-intn.h:25:19 */
+type Int32_t = X__int32_t /* stdint-intn.h:26:19 */
+type Int64_t = X__int64_t /* stdint-intn.h:27:19 */
+
+// These were defined by ISO C without the first `_'.
+type U_int8_t = X__uint8_t   /* types.h:158:19 */
+type U_int16_t = X__uint16_t /* types.h:159:20 */
+type U_int32_t = X__uint32_t /* types.h:160:20 */
+type U_int64_t = X__uint64_t /* types.h:161:20 */
+
+type Register_t = int32 /* types.h:164:13 */
+
+// It also defines `fd_set' and the FD_* macros for `select'.
+// `fd_set' type and related macros, and `select'/`pselect' declarations.
+//    Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX 1003.1g: 6.2 Select from File Descriptor Sets <sys/select.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Get definition of needed basic types.
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Get __FD_* definitions.
+// Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Get sigset_t.
+
+type X__sigset_t = struct{ F__val [16]uint64 } /* __sigset_t.h:8:3 */
+
+// A set of signals to be blocked, unblocked, or waited for.
+type Sigset_t = X__sigset_t /* sigset_t.h:7:20 */
+
+// Get definition of timer specification structures.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// A time value that is accurate to the nearest
+//
+//	microsecond but also has a range of years.
+type Timeval = struct {
+	Ftv_sec  X__time_t
+	Ftv_usec X__suseconds_t
+} /* struct_timeval.h:8:1 */
+
+// NB: Include guard matches what <linux/time.h> uses.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Endian macros for string.h functions
+//    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+// POSIX.1b structure for a time value.  This is like a `struct timeval' but
+//
+//	has nanoseconds instead of microseconds.
+type Timespec = struct {
+	Ftv_sec  X__time_t
+	Ftv_nsec X__syscall_slong_t
+} /* struct_timespec.h:10:1 */
+
+type Suseconds_t = X__suseconds_t /* select.h:43:23 */
+
+// The fd_set member is required to be an array of longs.
+type X__fd_mask = int64 /* select.h:49:18 */
+
+// Some versions of <linux/posix_types.h> define this macros.
+// It's easier to assume 8-bit bytes than to get CHAR_BIT.
+
+// fd_set for select and pselect.
+type Fd_set = struct{ F__fds_bits [16]X__fd_mask } /* select.h:70:5 */
+
+// Maximum number of file descriptors in `fd_set'.
+
+// Sometimes the fd_set member is assumed to have this type.
+type Fd_mask = X__fd_mask /* select.h:77:19 */
+
+// Define some inlines helping to catch common problems.
+
+type Blksize_t = X__blksize_t /* types.h:185:21 */
+
+// Types from the Large File Support interface.
+type Blkcnt_t = X__blkcnt64_t     /* types.h:205:22 */ // Type to count number of disk blocks.
+type Fsblkcnt_t = X__fsblkcnt64_t /* types.h:209:24 */ // Type to count file system blocks.
+type Fsfilcnt_t = X__fsfilcnt64_t /* types.h:213:24 */ // Type to count file system inodes.
+
+// Now add the thread types.
+// Declaration of common pthread types for all architectures.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For internal mutex and condition variable definitions.
+// Common threading primitives definitions for both POSIX and C11.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Arch-specific definitions.  Each architecture must define the following
+//    macros to define the expected sizes of pthread data types:
+//
+//    __SIZEOF_PTHREAD_ATTR_T        - size of pthread_attr_t.
+//    __SIZEOF_PTHREAD_MUTEX_T       - size of pthread_mutex_t.
+//    __SIZEOF_PTHREAD_MUTEXATTR_T   - size of pthread_mutexattr_t.
+//    __SIZEOF_PTHREAD_COND_T        - size of pthread_cond_t.
+//    __SIZEOF_PTHREAD_CONDATTR_T    - size of pthread_condattr_t.
+//    __SIZEOF_PTHREAD_RWLOCK_T      - size of pthread_rwlock_t.
+//    __SIZEOF_PTHREAD_RWLOCKATTR_T  - size of pthread_rwlockattr_t.
+//    __SIZEOF_PTHREAD_BARRIER_T     - size of pthread_barrier_t.
+//    __SIZEOF_PTHREAD_BARRIERATTR_T - size of pthread_barrierattr_t.
+//
+//    The additional macro defines any constraint for the lock alignment
+//    inside the thread structures:
+//
+//    __LOCK_ALIGNMENT - for internal lock/futex usage.
+//
+//    Same idea but for the once locking primitive:
+//
+//    __ONCE_ALIGNMENT - for pthread_once_t/once_flag definition.
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Common definition of pthread_mutex_t.
+
+type X__pthread_internal_list = struct {
+	F__prev uintptr
+	F__next uintptr
+} /* thread-shared-types.h:49:9 */
+
+// Type to count file system inodes.
+
+// Now add the thread types.
+// Declaration of common pthread types for all architectures.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For internal mutex and condition variable definitions.
+// Common threading primitives definitions for both POSIX and C11.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Arch-specific definitions.  Each architecture must define the following
+//    macros to define the expected sizes of pthread data types:
+//
+//    __SIZEOF_PTHREAD_ATTR_T        - size of pthread_attr_t.
+//    __SIZEOF_PTHREAD_MUTEX_T       - size of pthread_mutex_t.
+//    __SIZEOF_PTHREAD_MUTEXATTR_T   - size of pthread_mutexattr_t.
+//    __SIZEOF_PTHREAD_COND_T        - size of pthread_cond_t.
+//    __SIZEOF_PTHREAD_CONDATTR_T    - size of pthread_condattr_t.
+//    __SIZEOF_PTHREAD_RWLOCK_T      - size of pthread_rwlock_t.
+//    __SIZEOF_PTHREAD_RWLOCKATTR_T  - size of pthread_rwlockattr_t.
+//    __SIZEOF_PTHREAD_BARRIER_T     - size of pthread_barrier_t.
+//    __SIZEOF_PTHREAD_BARRIERATTR_T - size of pthread_barrierattr_t.
+//
+//    The additional macro defines any constraint for the lock alignment
+//    inside the thread structures:
+//
+//    __LOCK_ALIGNMENT - for internal lock/futex usage.
+//
+//    Same idea but for the once locking primitive:
+//
+//    __ONCE_ALIGNMENT - for pthread_once_t/once_flag definition.
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Common definition of pthread_mutex_t.
+
+type X__pthread_list_t = X__pthread_internal_list /* thread-shared-types.h:53:3 */
+
+type X__pthread_internal_slist = struct{ F__next uintptr } /* thread-shared-types.h:55:9 */
+
+type X__pthread_slist_t = X__pthread_internal_slist /* thread-shared-types.h:58:3 */
+
+// Arch-specific mutex definitions.  A generic implementation is provided
+//    by sysdeps/nptl/bits/struct_mutex.h.  If required, an architecture
+//    can override it by defining:
+//
+//    1. struct __pthread_mutex_s (used on both pthread_mutex_t and mtx_t
+//       definition).  It should contains at least the internal members
+//       defined in the generic version.
+//
+//    2. __LOCK_ALIGNMENT for any extra attribute for internal lock used with
+//       atomic operations.
+//
+//    3. The macro __PTHREAD_MUTEX_INITIALIZER used for static initialization.
+//       It should initialize the mutex internal flag.
+
+// x86 internal mutex struct definitions.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+type X__pthread_mutex_s = struct {
+	F__lock    int32
+	F__count   uint32
+	F__owner   int32
+	F__nusers  uint32
+	F__kind    int32
+	F__spins   int16
+	F__elision int16
+	F__list    X__pthread_list_t
+} /* struct_mutex.h:22:1 */
+
+// Arch-sepecific read-write lock definitions.  A generic implementation is
+//    provided by struct_rwlock.h.  If required, an architecture can override it
+//    by defining:
+//
+//    1. struct __pthread_rwlock_arch_t (used on pthread_rwlock_t definition).
+//       It should contain at least the internal members defined in the
+//       generic version.
+//
+//    2. The macro __PTHREAD_RWLOCK_INITIALIZER used for static initialization.
+//       It should initialize the rwlock internal type.
+
+// x86 internal rwlock struct definitions.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+type X__pthread_rwlock_arch_t = struct {
+	F__readers       uint32
+	F__writers       uint32
+	F__wrphase_futex uint32
+	F__writers_futex uint32
+	F__pad3          uint32
+	F__pad4          uint32
+	F__cur_writer    int32
+	F__shared        int32
+	F__rwelision     int8
+	F__pad1          [7]uint8
+	F__pad2          uint64
+	F__flags         uint32
+	F__ccgo_pad1     [4]byte
+} /* struct_rwlock.h:23:1 */
+
+// Common definition of pthread_cond_t.
+
+type X__pthread_cond_s = struct {
+	F__0            struct{ F__wseq uint64 }
+	F__8            struct{ F__g1_start uint64 }
+	F__g_refs       [2]uint32
+	F__g_size       [2]uint32
+	F__g1_orig_size uint32
+	F__wrefs        uint32
+	F__g_signals    [2]uint32
+} /* thread-shared-types.h:92:1 */
+
+// Thread identifiers.  The structure of the attribute type is not
+//
+//	exposed on purpose.
+type Pthread_t = uint64 /* pthreadtypes.h:27:27 */
+
+// Data structures for mutex handling.  The structure of the attribute
+//
+//	type is not exposed on purpose.
+type Pthread_mutexattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:36:3 */
+
+// Data structure for condition variable handling.  The structure of
+//
+//	the attribute type is not exposed on purpose.
+type Pthread_condattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:45:3 */
+
+// Keys for thread-specific data
+type Pthread_key_t = uint32 /* pthreadtypes.h:49:22 */
+
+// Once-only execution
+type Pthread_once_t = int32 /* pthreadtypes.h:53:30 */
+
+type Pthread_attr_t1 = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [56]int8
+} /* pthreadtypes.h:56:1 */
+
+type Pthread_attr_t = Pthread_attr_t1 /* pthreadtypes.h:62:30 */
+
+type Pthread_mutex_t = struct{ F__data X__pthread_mutex_s } /* pthreadtypes.h:72:3 */
+
+type Pthread_cond_t = struct{ F__data X__pthread_cond_s } /* pthreadtypes.h:80:3 */
+
+// Data structure for reader-writer lock variable handling.  The
+//
+//	structure of the attribute type is deliberately not exposed.
+type Pthread_rwlock_t = struct{ F__data X__pthread_rwlock_arch_t } /* pthreadtypes.h:91:3 */
+
+type Pthread_rwlockattr_t = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [8]int8
+} /* pthreadtypes.h:97:3 */
+
+// POSIX spinlock data type.
+type Pthread_spinlock_t = int32 /* pthreadtypes.h:103:22 */
+
+// POSIX barriers data type.  The structure of the type is
+//
+//	deliberately not exposed.
+type Pthread_barrier_t = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [32]int8
+} /* pthreadtypes.h:112:3 */
+
+type Pthread_barrierattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:118:3 */
+
+// Type for length arguments in socket calls.
+type Socklen_t = X__socklen_t /* socket.h:33:21 */
+
+// Protocol families.
+
+// Address families.
+
+// Socket level values.  Others are defined in the appropriate headers.
+//
+//    XXX These definitions also should go into the appropriate headers as
+//    far as they are available.
+
+// Maximum queue length specifiable by listen.
+
+// Get the definition of the macro to define the common sockaddr members.
+// Definition of struct sockaddr_* common members and sizes, generic version.
+//    Copyright (C) 1995-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/socket.h> instead.
+
+// POSIX.1g specifies this type name for the `sa_family' member.
+type Sa_family_t = uint16 /* sockaddr.h:28:28 */
+
+// This macro is used to declare the initial common members
+//    of the data types used for socket addresses, `struct sockaddr',
+//    `struct sockaddr_in', `struct sockaddr_un', etc.
+
+// Size of struct sockaddr_storage.
+
+// Structure describing a generic socket address.
+type Sockaddr = struct {
+	Fsa_family Sa_family_t
+	Fsa_data   [14]int8
+} /* socket.h:178:1 */
+
+// Structure large enough to hold any socket address (with the historical
+//    exception of AF_UNIX).
+
+type Sockaddr_storage = struct {
+	Fss_family    Sa_family_t
+	F__ss_padding [118]int8
+	F__ss_align   uint64
+} /* socket.h:191:1 */
+
+// Structure describing messages sent by
+//
+//	`sendmsg' and received by `recvmsg'.
+type Msghdr = struct {
+	Fmsg_name       uintptr
+	Fmsg_namelen    Socklen_t
+	F__ccgo_pad1    [4]byte
+	Fmsg_iov        uintptr
+	Fmsg_iovlen     Size_t
+	Fmsg_control    uintptr
+	Fmsg_controllen Size_t
+	Fmsg_flags      int32
+	F__ccgo_pad2    [4]byte
+} /* socket.h:257:1 */
+
+// Structure used for storage of ancillary data object information.
+type Cmsghdr = struct {
+	F__ccgo_pad1 [0]uint64
+	Fcmsg_len    Size_t
+	Fcmsg_level  int32
+	Fcmsg_type   int32
+} /* socket.h:275:1 */
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// This allows for 1024 file descriptors: if NR_OPEN is ever grown
+// beyond that you'll have to change this too. But 1024 fd's seem to be
+// enough even for such "real" unices like OSF/1, so hopefully this is
+// one limit that doesn't have to be changed [again].
+//
+// Note that POSIX wants the FD_CLEAR(fd,fdsetp) defines to be in
+// <sys/time.h> (and thus <linux/time.h>) - but this is a more logical
+// place for them. Solved by having dummy defines in <sys/time.h>.
+
+// This macro may have been defined in <gnu/types.h>. But we always
+// use the one here.
+
+type X__kernel_fd_set = struct{ Ffds_bits [16]uint64 } /* posix_types.h:27:3 */
+
+// Type of a signal handler.
+type X__kernel_sighandler_t = uintptr /* posix_types.h:30:14 */
+
+// Type of a SYSV IPC key.
+type X__kernel_key_t = int32 /* posix_types.h:33:13 */
+type X__kernel_mqd_t = int32 /* posix_types.h:34:13 */
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// This file is generally used by user-level software, so you need to
+// be a little careful about namespace pollution etc.  Also, we cannot
+// assume GCC is being used.
+
+type X__kernel_old_uid_t = uint16 /* posix_types_64.h:11:24 */
+type X__kernel_old_gid_t = uint16 /* posix_types_64.h:12:24 */
+
+type X__kernel_old_dev_t = uint64 /* posix_types_64.h:15:23 */
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// There seems to be no way of detecting this automatically from user
+// space, so 64 bit architectures should override this in their
+// bitsperlong.h. In particular, an architecture that supports
+// both 32 and 64 bit user space must not rely on CONFIG_64BIT
+// to decide it, but rather check a compiler provided macro.
+
+// This file is generally used by user-level software, so you need to
+// be a little careful about namespace pollution etc.
+//
+// First the types that are often defined in different ways across
+// architectures, so that you can override them.
+
+type X__kernel_long_t = int64   /* posix_types.h:15:15 */
+type X__kernel_ulong_t = uint64 /* posix_types.h:16:23 */
+
+type X__kernel_ino_t = X__kernel_ulong_t /* posix_types.h:20:26 */
+
+type X__kernel_mode_t = uint32 /* posix_types.h:24:22 */
+
+type X__kernel_pid_t = int32 /* posix_types.h:28:14 */
+
+type X__kernel_ipc_pid_t = int32 /* posix_types.h:32:14 */
+
+type X__kernel_uid_t = uint32 /* posix_types.h:36:22 */
+type X__kernel_gid_t = uint32 /* posix_types.h:37:22 */
+
+type X__kernel_suseconds_t = X__kernel_long_t /* posix_types.h:41:26 */
+
+type X__kernel_daddr_t = int32 /* posix_types.h:45:14 */
+
+type X__kernel_uid32_t = uint32 /* posix_types.h:49:22 */
+type X__kernel_gid32_t = uint32 /* posix_types.h:50:22 */
+
+// Most 32 bit architectures use "unsigned int" size_t,
+// and all 64 bit architectures use "unsigned long" size_t.
+type X__kernel_size_t = X__kernel_ulong_t   /* posix_types.h:72:26 */
+type X__kernel_ssize_t = X__kernel_long_t   /* posix_types.h:73:25 */
+type X__kernel_ptrdiff_t = X__kernel_long_t /* posix_types.h:74:25 */
+
+type X__kernel_fsid_t = struct{ Fval [2]int32 } /* posix_types.h:81:3 */
+
+// anything below here should be completely generic
+type X__kernel_off_t = X__kernel_long_t      /* posix_types.h:87:25 */
+type X__kernel_loff_t = int64                /* posix_types.h:88:19 */
+type X__kernel_old_time_t = X__kernel_long_t /* posix_types.h:89:25 */
+type X__kernel_time_t = X__kernel_long_t     /* posix_types.h:90:25 */
+type X__kernel_time64_t = int64              /* posix_types.h:91:19 */
+type X__kernel_clock_t = X__kernel_long_t    /* posix_types.h:92:25 */
+type X__kernel_timer_t = int32               /* posix_types.h:93:14 */
+type X__kernel_clockid_t = int32             /* posix_types.h:94:14 */
+type X__kernel_caddr_t = uintptr             /* posix_types.h:95:14 */
+type X__kernel_uid16_t = uint16              /* posix_types.h:96:24 */
+type X__kernel_gid16_t = uint16              /* posix_types.h:97:24 */
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// Socket-level I/O control calls.
+
+// For setsockopt(2)
+
+// Security levels - as per NRL IPv6 - don't actually do anything
+
+// Socket filtering
+
+// Instruct lower device to use last 4-bytes of skb data as FCS
+
+// on 64-bit and x32, avoid the ?: operator
+
+// Structure used to manipulate the SO_LINGER option.
+type Linger = struct {
+	Fl_onoff  int32
+	Fl_linger int32
+} /* socket.h:361:1 */
+
+// This is the 4.3 BSD `struct sockaddr' format, which is used as wire
+//
+//	format in the grotty old 4.3 `talk' protocol.
+type Osockaddr = struct {
+	Fsa_family uint16
+	Fsa_data   [14]uint8
+} /* struct_osockaddr.h:6:1 */
+
+// Define some macros helping to catch buffer overflows.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Internet address.
+type In_addr_t = Uint32_t                  /* in.h:30:18 */
+type In_addr = struct{ Fs_addr In_addr_t } /* in.h:31:1 */
+
+// Get system-specific definitions.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Linux version.
+
+// If the application has already included linux/in6.h from a linux-based
+//    kernel then we will not define the IPv6 IPPROTO_* defines, in6_addr (nor the
+//    defines), sockaddr_in6, or ipv6_mreq. Same for in6_ptkinfo or ip6_mtuinfo
+//    in linux/ipv6.h. The ABI used by the linux-kernel and glibc match exactly.
+//    Neither the linux kernel nor glibc should break this ABI without coordination.
+//    In upstream kernel 56c176c9 the _UAPI prefix was stripped so we need to check
+//    for _LINUX_IN6_H and _IPV6_H now, and keep checking the old versions for
+//    maximum backwards compatibility.
+
+// Options for use with `getsockopt' and `setsockopt' at the IP level.
+//    The first word in the comment at the right is the data type used;
+//    "bool" means a boolean value stored in an `int'.
+// For BSD compatibility.
+
+// TProxy original addresses
+
+// IP_MTU_DISCOVER arguments.
+// Always use interface mtu (ignores dst pmtu) but don't set DF flag.
+//    Also incoming ICMP frag_needed notifications will be ignored on
+//    this socket to prevent accepting spoofed ones.
+// Like IP_PMTUDISC_INTERFACE but allow packets to be fragmented.
+
+// To select the IP level.
+
+// Structure used to describe IP options for IP_OPTIONS and IP_RETOPTS.
+//
+//	The `ip_dst' field is used for the first-hop gateway when using a
+//	source route (this gets put into the header proper).
+type Ip_opts = struct {
+	Fip_dst  struct{ Fs_addr In_addr_t }
+	Fip_opts [40]int8
+} /* in.h:142:1 */
+
+// Like `struct ip_mreq' but including interface specification by index.
+type Ip_mreqn = struct {
+	Fimr_multiaddr struct{ Fs_addr In_addr_t }
+	Fimr_address   struct{ Fs_addr In_addr_t }
+	Fimr_ifindex   int32
+} /* in.h:149:1 */
+
+// Structure used for IP_PKTINFO.
+type In_pktinfo = struct {
+	Fipi_ifindex  int32
+	Fipi_spec_dst struct{ Fs_addr In_addr_t }
+	Fipi_addr     struct{ Fs_addr In_addr_t }
+} /* in.h:157:1 */
+
+// Type to represent a port.
+type In_port_t = Uint16_t /* in.h:119:18 */
+
+// Definitions of the bits in an Internet address integer.
+//
+//    On subnets, host and network parts are found according to
+//    the subnet mask, not these masks.
+
+// Address to accept any incoming messages.
+// Address to send to all hosts.
+// Address indicating an error return.
+
+// Network number for local host loopback.
+// Address to loopback in software to local host.
+
+// Defines for Multicast INADDR.
+
+// IPv6 address
+type In6_addr = struct {
+	F__in6_u struct {
+		F__ccgo_pad1 [0]uint32
+		F__u6_addr8  [16]Uint8_t
+	}
+} /* in.h:212:1 */
+
+// ::1
+
+// Structure describing an Internet socket address.
+type Sockaddr_in = struct {
+	Fsin_family Sa_family_t
+	Fsin_port   In_port_t
+	Fsin_addr   struct{ Fs_addr In_addr_t }
+	Fsin_zero   [8]uint8
+} /* in.h:238:1 */
+
+// Ditto, for IPv6.
+type Sockaddr_in6 = struct {
+	Fsin6_family   Sa_family_t
+	Fsin6_port     In_port_t
+	Fsin6_flowinfo Uint32_t
+	Fsin6_addr     struct {
+		F__in6_u struct {
+			F__ccgo_pad1 [0]uint32
+			F__u6_addr8  [16]Uint8_t
+		}
+	}
+	Fsin6_scope_id Uint32_t
+} /* in.h:253:1 */
+
+// IPv4 multicast request.
+type Ip_mreq = struct {
+	Fimr_multiaddr struct{ Fs_addr In_addr_t }
+	Fimr_interface struct{ Fs_addr In_addr_t }
+} /* in.h:265:1 */
+
+type Ip_mreq_source = struct {
+	Fimr_multiaddr  struct{ Fs_addr In_addr_t }
+	Fimr_interface  struct{ Fs_addr In_addr_t }
+	Fimr_sourceaddr struct{ Fs_addr In_addr_t }
+} /* in.h:274:1 */
+
+// Likewise, for IPv6.
+type Ipv6_mreq = struct {
+	Fipv6mr_multiaddr struct {
+		F__in6_u struct {
+			F__ccgo_pad1 [0]uint32
+			F__u6_addr8  [16]Uint8_t
+		}
+	}
+	Fipv6mr_interface uint32
+} /* in.h:289:1 */
+
+// Multicast group request.
+type Group_req = struct {
+	Fgr_interface Uint32_t
+	F__ccgo_pad1  [4]byte
+	Fgr_group     struct {
+		Fss_family    Sa_family_t
+		F__ss_padding [118]int8
+		F__ss_align   uint64
+	}
+} /* in.h:301:1 */
+
+type Group_source_req = struct {
+	Fgsr_interface Uint32_t
+	F__ccgo_pad1   [4]byte
+	Fgsr_group     struct {
+		Fss_family    Sa_family_t
+		F__ss_padding [118]int8
+		F__ss_align   uint64
+	}
+	Fgsr_source struct {
+		Fss_family    Sa_family_t
+		F__ss_padding [118]int8
+		F__ss_align   uint64
+	}
+} /* in.h:310:1 */
+
+// Full-state filter operations.
+type Ip_msfilter = struct {
+	Fimsf_multiaddr struct{ Fs_addr In_addr_t }
+	Fimsf_interface struct{ Fs_addr In_addr_t }
+	Fimsf_fmode     Uint32_t
+	Fimsf_numsrc    Uint32_t
+	Fimsf_slist     [1]struct{ Fs_addr In_addr_t }
+} /* in.h:324:1 */
+
+type Group_filter = struct {
+	Fgf_interface Uint32_t
+	F__ccgo_pad1  [4]byte
+	Fgf_group     struct {
+		Fss_family    Sa_family_t
+		F__ss_padding [118]int8
+		F__ss_align   uint64
+	}
+	Fgf_fmode  Uint32_t
+	Fgf_numsrc Uint32_t
+	Fgf_slist  [1]struct {
+		Fss_family    Sa_family_t
+		F__ss_padding [118]int8
+		F__ss_align   uint64
+	}
+} /* in.h:345:1 */
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/poll/capi_linux_loong64.go b/vendor/modernc.org/libc/poll/capi_linux_loong64.go
new file mode 100644
index 00000000..52c3f3a2
--- /dev/null
+++ b/vendor/modernc.org/libc/poll/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo poll/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o poll/poll_linux_amd64.go -pkgname poll', DO NOT EDIT.
+
+package poll
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/poll/poll_linux_loong64.go b/vendor/modernc.org/libc/poll/poll_linux_loong64.go
new file mode 100644
index 00000000..83aca0f2
--- /dev/null
+++ b/vendor/modernc.org/libc/poll/poll_linux_loong64.go
@@ -0,0 +1,540 @@
+// Code generated by 'ccgo poll/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o poll/poll_linux_amd64.go -pkgname poll', DO NOT EDIT.
+
+package poll
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	POLLERR            = 0x008  // poll.h:47:1:
+	POLLHUP            = 0x010  // poll.h:48:1:
+	POLLIN             = 0x001  // poll.h:25:1:
+	POLLNVAL           = 0x020  // poll.h:49:1:
+	POLLOUT            = 0x004  // poll.h:27:1:
+	POLLPRI            = 0x002  // poll.h:26:1:
+	POLLRDBAND         = 0x080  // poll.h:32:1:
+	POLLRDNORM         = 0x040  // poll.h:31:1:
+	POLLWRBAND         = 0x200  // poll.h:34:1:
+	POLLWRNORM         = 0x100  // poll.h:33:1:
+	X_ATFILE_SOURCE    = 1      // features.h:342:1:
+	X_DEFAULT_SOURCE   = 1      // features.h:227:1:
+	X_FEATURES_H       = 1      // features.h:19:1:
+	X_FILE_OFFSET_BITS = 64     // <builtin>:25:1:
+	X_LP64             = 1      // <predefined>:284:1:
+	X_POSIX_C_SOURCE   = 200809 // features.h:281:1:
+	X_POSIX_SOURCE     = 1      // features.h:279:1:
+	X_STDC_PREDEF_H    = 1      // <predefined>:162:1:
+	X_SYS_CDEFS_H      = 1      // cdefs.h:19:1:
+	X_SYS_POLL_H       = 1      // poll.h:20:1:
+	Linux              = 1      // <predefined>:231:1:
+	Unix               = 1      // <predefined>:177:1:
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Compatibility definitions for System V `poll' interface.
+//    Copyright (C) 1994-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// These are defined by the user (or the compiler)
+//    to specify the desired environment:
+//
+//    __STRICT_ANSI__	ISO Standard C.
+//    _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
+//    _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
+//    _ISOC2X_SOURCE	Extensions to ISO C99 from ISO C2X.
+//    __STDC_WANT_LIB_EXT2__
+// 			Extensions to ISO C99 from TR 27431-2:2010.
+//    __STDC_WANT_IEC_60559_BFP_EXT__
+// 			Extensions to ISO C11 from TS 18661-1:2014.
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__
+// 			Extensions to ISO C11 from TS 18661-4:2015.
+//    __STDC_WANT_IEC_60559_TYPES_EXT__
+// 			Extensions to ISO C11 from TS 18661-3:2015.
+//
+//    _POSIX_SOURCE	IEEE Std 1003.1.
+//    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
+// 			if >=199309L, add IEEE Std 1003.1b-1993;
+// 			if >=199506L, add IEEE Std 1003.1c-1995;
+// 			if >=200112L, all of IEEE 1003.1-2004
+// 			if >=200809L, all of IEEE 1003.1-2008
+//    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
+// 			Single Unix conformance is wanted, to 600 for the
+// 			sixth revision, to 700 for the seventh revision.
+//    _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
+//    _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
+//    _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
+//    _FILE_OFFSET_BITS=N	Select default filesystem interface.
+//    _ATFILE_SOURCE	Additional *at interfaces.
+//    _GNU_SOURCE		All of the above, plus GNU extensions.
+//    _DEFAULT_SOURCE	The default set of features (taking precedence over
+// 			__STRICT_ANSI__).
+//
+//    _FORTIFY_SOURCE	Add security hardening to many library functions.
+// 			Set to 1 or 2; 2 performs stricter checks than 1.
+//
+//    _REENTRANT, _THREAD_SAFE
+// 			Obsolete; equivalent to _POSIX_C_SOURCE=199506L.
+//
+//    The `-ansi' switch to the GNU C compiler, and standards conformance
+//    options such as `-std=c99', define __STRICT_ANSI__.  If none of
+//    these are defined, or if _DEFAULT_SOURCE is defined, the default is
+//    to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
+//    200809L, as well as enabling miscellaneous functions from BSD and
+//    SVID.  If more than one of these are defined, they accumulate.  For
+//    example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
+//    give you ISO C, 1003.1, and 1003.2, but nothing else.
+//
+//    These are defined by this file and are used by the
+//    header files to decide what to declare or define:
+//
+//    __GLIBC_USE (F)	Define things from feature set F.  This is defined
+// 			to 1 or 0; the subsequent macros are either defined
+// 			or undefined, and those tests should be moved to
+// 			__GLIBC_USE.
+//    __USE_ISOC11		Define ISO C11 things.
+//    __USE_ISOC99		Define ISO C99 things.
+//    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+//    __USE_ISOCXX11	Define ISO C++11 things.
+//    __USE_POSIX		Define IEEE Std 1003.1 things.
+//    __USE_POSIX2		Define IEEE Std 1003.2 things.
+//    __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
+//    __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
+//    __USE_XOPEN		Define XPG things.
+//    __USE_XOPEN_EXTENDED	Define X/Open Unix things.
+//    __USE_UNIX98		Define Single Unix V2 things.
+//    __USE_XOPEN2K        Define XPG6 things.
+//    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+//    __USE_XOPEN2K8       Define XPG7 things.
+//    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
+//    __USE_LARGEFILE	Define correct standard I/O things.
+//    __USE_LARGEFILE64	Define LFS things with separate names.
+//    __USE_FILE_OFFSET64	Define 64bit interface as default.
+//    __USE_MISC		Define things from 4.3BSD or System V Unix.
+//    __USE_ATFILE		Define *at interfaces and AT_* constants for them.
+//    __USE_GNU		Define GNU extensions.
+//    __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
+//
+//    The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
+//    defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
+//    only for compatibility.  All new code should use the other symbols
+//    to test for features.
+//
+//    All macros listed above as possibly being defined by this file are
+//    explicitly undefined if they are not explicitly defined.
+//    Feature-test macros that are not defined by the user or compiler
+//    but are implied by the other feature-test macros defined (or by the
+//    lack of any definitions) are defined by the file.
+//
+//    ISO C feature test macros depend on the definition of the macro
+//    when an affected header is included, not when the first system
+//    header is included, and so they are handled in
+//    <bits/libc-header-start.h>, which does not have a multiple include
+//    guard.  Feature test macros that can be handled from the first
+//    system header included are handled here.
+
+// Undefine everything, so we get a clean slate.
+
+// Suppress kernel-name space pollution unless user expressedly asks
+//    for it.
+
+// Convenience macro to test the version of gcc.
+//    Use like this:
+//    #if __GNUC_PREREQ (2,8)
+//    ... code requiring gcc 2.8 or later ...
+//    #endif
+//    Note: only works for GCC 2.0 and later, because __GNUC_MINOR__ was
+//    added in 2.0.
+
+// Similarly for clang.  Features added to GCC after version 4.2 may
+//    or may not also be available in clang, and clang's definitions of
+//    __GNUC(_MINOR)__ are fixed at 4 and 2 respectively.  Not all such
+//    features can be queried via __has_extension/__has_feature.
+
+// Whether to use feature set F.
+
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
+//    _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
+//    issue a warning; the expectation is that the source is being
+//    transitioned to use the new macro.
+
+// If _GNU_SOURCE was defined by the user, turn on all the other features.
+
+// If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
+//    define _DEFAULT_SOURCE.
+
+// This is to enable the ISO C2X extension.
+
+// This is to enable the ISO C11 extension.
+
+// This is to enable the ISO C99 extension.
+
+// This is to enable the ISO C90 Amendment 1:1995 extension.
+
+// If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
+//    is defined, use POSIX.1-2008 (or another version depending on
+//    _XOPEN_SOURCE).
+
+// Some C libraries once required _REENTRANT and/or _THREAD_SAFE to be
+//    defined in all multithreaded code.  GNU libc has not required this
+//    for many years.  We now treat them as compatibility synonyms for
+//    _POSIX_C_SOURCE=199506L, which is the earliest level of POSIX with
+//    comprehensive support for multithreaded code.  Using them never
+//    lowers the selected level of POSIX conformance, only raises it.
+
+// The function 'gets' existed in C89, but is impossible to use
+//    safely.  It has been removed from ISO C11 and ISO C++14.  Note: for
+//    compatibility with various implementations of <cstdio>, this test
+//    must consider only the value of __cplusplus when compiling C++.
+
+// GNU formerly extended the scanf functions with modified format
+//    specifiers %as, %aS, and %a[...] that allocate a buffer for the
+//    input using malloc.  This extension conflicts with ISO C99, which
+//    defines %a as a standalone format specifier that reads a floating-
+//    point number; moreover, POSIX.1-2008 provides the same feature
+//    using the modifier letter 'm' instead (%ms, %mS, %m[...]).
+//
+//    We now follow C99 unless GNU extensions are active and the compiler
+//    is specifically in C89 or C++98 mode (strict or not).  For
+//    instance, with GCC, -std=gnu11 will have C99-compliant scanf with
+//    or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
+//    old extension.
+
+// Get definitions of __STDC_* predefined macros, if the compiler has
+//    not preincluded this header automatically.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This macro indicates that the installed library is the GNU C Library.
+//    For historic reasons the value now is 6 and this will stay from now
+//    on.  The use of this variable is deprecated.  Use __GLIBC__ and
+//    __GLIBC_MINOR__ now (see below) when you want to test for a specific
+//    GNU C library version and use the values in <gnu/lib-names.h> to get
+//    the sonames of the shared libraries.
+
+// Major and minor version number of the GNU C library package.  Use
+//    these macros to test for features in specific releases.
+
+// This is here only because every header file already includes this one.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// We are almost always included from features.h.
+
+// The GNU libc does not support any K&R compilers or the traditional mode
+//    of ISO C compilers anymore.  Check for some of the combinations not
+//    anymore supported.
+
+// Some user header file might have defined this before.
+
+// All functions, except those with callbacks or those that
+//    synchronize memory, are leaf functions.
+
+// GCC can always grok prototypes.  For C++ programs we add throw()
+//    to help it optimize the function calls.  But this works only with
+//    gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+//    as non-throwing using a function attribute since programs can use
+//    the -fexceptions options for C code as well.
+
+// Compilers that are not clang may object to
+//        #if defined __clang__ && __has_extension(...)
+//    even though they do not need to evaluate the right-hand side of the &&.
+
+// These two macros are not used in glibc anymore.  They are kept here
+//    only because some other projects expect the macros to be defined.
+
+// For these things, GCC behaves the ANSI way normally,
+//    and the non-ANSI way under -traditional.
+
+// This is not a typedef so `const __ptr_t' does the right thing.
+
+// C++ needs to know that types and declarations are C, not C++.
+
+// Fortify support.
+
+// Support for flexible arrays.
+//    Headers that should use flexible arrays only if they're "real"
+//    (e.g. only if they won't affect sizeof()) should test
+//    #if __glibc_c99_flexarr_available.
+
+// __asm__ ("xyz") is used throughout the headers to rename functions
+//    at the assembly language level.  This is wrapped by the __REDIRECT
+//    macro, in order to support compilers that can do this some other
+//    way.  When compilers don't support asm-names at all, we have to do
+//    preprocessor tricks instead (which don't have exactly the right
+//    semantics, but it's the best we can do).
+//
+//    Example:
+//    int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid);
+
+//
+// #elif __SOME_OTHER_COMPILER__
+//
+// # define __REDIRECT(name, proto, alias) name proto; 	_Pragma("let " #name " = " #alias)
+
+// GCC has various useful declarations that can be made with the
+//    `__attribute__' syntax.  All of the ways we use this do fine if
+//    they are omitted for compilers that don't understand it.
+
+// At some point during the gcc 2.96 development the `malloc' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Tell the compiler which arguments to an allocation function
+//    indicate the size of the allocation.
+
+// At some point during the gcc 2.96 development the `pure' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// This declaration tells the compiler that the value is constant.
+
+// At some point during the gcc 3.1 development the `used' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Since version 3.2, gcc allows marking deprecated functions.
+
+// Since version 4.5, gcc also allows one to specify the message printed
+//    when a deprecated function is used.  clang claims to be gcc 4.2, but
+//    may also support this feature.
+
+// At some point during the gcc 2.8 development the `format_arg' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+//    If several `format_arg' attributes are given for the same function, in
+//    gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+//    all designated arguments are considered.
+
+// At some point during the gcc 2.97 development the `strfmon' format
+//    attribute for functions was introduced.  We don't want to use it
+//    unconditionally (although this would be possible) since it
+//    generates warnings.
+
+// The nonull function attribute allows to mark pointer parameters which
+//    must not be NULL.
+
+// If fortification mode, we warn about unused results of certain
+//    function calls which can lead to problems.
+
+// Forces a function to be always inlined.
+// The Linux kernel defines __always_inline in stddef.h (283d7573), and
+//    it conflicts with this definition.  Therefore undefine it first to
+//    allow either header to be included first.
+
+// Associate error messages with the source location of the call site rather
+//    than with the source location inside the function.
+
+// GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+//    inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
+//    or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+//    older than 4.3 may define these macros and still not guarantee GNU inlining
+//    semantics.
+//
+//    clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+//    semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
+//    __GNUC_GNU_INLINE__ macro definitions.
+
+// GCC 4.3 and above allow passing all anonymous arguments of an
+//    __extern_always_inline function to some other vararg function.
+
+// It is possible to compile containing GCC extensions even if GCC is
+//    run in pedantic mode if the uses are carefully marked using the
+//    `__extension__' keyword.  But this is not generally available before
+//    version 2.8.
+
+// __restrict is known in EGCS 1.2 and above.
+
+// ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+//      array_name[restrict]
+//    GCC 3.1 supports this.
+
+// Describes a char array whose address can safely be passed as the first
+//    argument to strncpy and strncat, as the char array is not necessarily
+//    a NUL-terminated string.
+
+// Undefine (also defined in libc-symbols.h).
+// Copies attributes from the declaration or type referenced by
+//    the argument.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// __glibc_macro_warning (MESSAGE) issues warning MESSAGE.  This is
+//    intended for use in preprocessor macros.
+//
+//    Note: MESSAGE must be a _single_ string; concatenation of string
+//    literals is not supported.
+
+// Generic selection (ISO C11) is a C-only feature, available in GCC
+//    since version 4.9.  Previous versions do not provide generic
+//    selection, even though they might set __STDC_VERSION__ to 201112L,
+//    when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
+//    when testing __STDC_VERSION__ for generic selection support.
+//    On the other hand, Clang also defines __GNUC__, so a clang-specific
+//    check is required to enable the use of generic selection.
+
+// If we don't have __REDIRECT, prototypes will be missing if
+//    __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64].
+
+// Decide whether we can define 'extern inline' functions in headers.
+
+// This is here only because every header file already includes this one.
+//    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
+//    <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+//    that will always return failure (and set errno to ENOSYS).
+// This file is automatically generated.
+//    This file selects the right generated file of `__stub_FUNCTION' macros
+//    based on the architecture being compiled for.
+
+// This file is automatically generated.
+//    It defines a symbol `__stub_FUNCTION' for each function
+//    in the C library which is a stub, meaning it will fail
+//    every time called, usually setting errno to ENOSYS.
+
+// Get the platform dependent bits of `poll'.
+// Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Event types that can be polled for.  These bits may be set in `events'
+//    to indicate the interesting event types; they will appear in `revents'
+//    to indicate the status of the file descriptor.
+
+// These values are defined in XPG4.2.
+
+// Event types always implicitly polled for.  These bits need not be set in
+//    `events', but they will appear in `revents' to indicate the status of
+//    the file descriptor.
+
+// Type used for the number of file descriptors.
+type Nfds_t = uint64 /* poll.h:33:27 */
+
+// Data structure describing a polling request.
+type Pollfd = struct {
+	Ffd      int32
+	Fevents  int16
+	Frevents int16
+} /* poll.h:36:1 */
+
+// Define some inlines helping to catch common problems.
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/pthread/capi_linux_loong64.go b/vendor/modernc.org/libc/pthread/capi_linux_loong64.go
new file mode 100644
index 00000000..fd760fda
--- /dev/null
+++ b/vendor/modernc.org/libc/pthread/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo pthread/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o pthread/pthread_linux_amd64.go -pkgname pthread', DO NOT EDIT.
+
+package pthread
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/pthread/pthread_linux_loong64.go b/vendor/modernc.org/libc/pthread/pthread_linux_loong64.go
new file mode 100644
index 00000000..c7762fdd
--- /dev/null
+++ b/vendor/modernc.org/libc/pthread/pthread_linux_loong64.go
@@ -0,0 +1,1873 @@
+// Code generated by 'ccgo pthread/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o pthread/pthread_linux_amd64.go -pkgname pthread', DO NOT EDIT.
+
+package pthread
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	CLOCK_BOOTTIME                  = 7      // time.h:60:1:
+	CLOCK_BOOTTIME_ALARM            = 9      // time.h:64:1:
+	CLOCK_MONOTONIC                 = 1      // time.h:48:1:
+	CLOCK_MONOTONIC_COARSE          = 6      // time.h:58:1:
+	CLOCK_MONOTONIC_RAW             = 4      // time.h:54:1:
+	CLOCK_PROCESS_CPUTIME_ID        = 2      // time.h:50:1:
+	CLOCK_REALTIME                  = 0      // time.h:46:1:
+	CLOCK_REALTIME_ALARM            = 8      // time.h:62:1:
+	CLOCK_REALTIME_COARSE           = 5      // time.h:56:1:
+	CLOCK_TAI                       = 11     // time.h:66:1:
+	CLOCK_THREAD_CPUTIME_ID         = 3      // time.h:52:1:
+	PTHREAD_BARRIER_SERIAL_THREAD   = -1     // pthread.h:189:1:
+	PTHREAD_ONCE_INIT               = 0      // pthread.h:182:1:
+	SCHED_FIFO                      = 1      // sched.h:29:1:
+	SCHED_OTHER                     = 0      // sched.h:28:1:
+	SCHED_RR                        = 2      // sched.h:30:1:
+	TIMER_ABSTIME                   = 1      // time.h:69:1:
+	TIME_UTC                        = 1      // time.h:65:1:
+	X_ATFILE_SOURCE                 = 1      // features.h:342:1:
+	X_BITS_CPU_SET_H                = 1      // cpu-set.h:21:1:
+	X_BITS_ENDIANNESS_H             = 1      // endianness.h:2:1:
+	X_BITS_ENDIAN_H                 = 1      // endian.h:20:1:
+	X_BITS_PTHREADTYPES_ARCH_H      = 1      // pthreadtypes-arch.h:19:1:
+	X_BITS_PTHREADTYPES_COMMON_H    = 1      // pthreadtypes.h:20:1:
+	X_BITS_SCHED_H                  = 1      // sched.h:21:1:
+	X_BITS_SETJMP_H                 = 1      // setjmp.h:20:1:
+	X_BITS_TIME64_H                 = 1      // time64.h:24:1:
+	X_BITS_TIME_H                   = 1      // time.h:24:1:
+	X_BITS_TYPESIZES_H              = 1      // typesizes.h:24:1:
+	X_BITS_TYPES_H                  = 1      // types.h:24:1:
+	X_BITS_TYPES_LOCALE_T_H         = 1      // locale_t.h:20:1:
+	X_BITS_TYPES_STRUCT_SCHED_PARAM = 1      // struct_sched_param.h:20:1:
+	X_BITS_TYPES___LOCALE_T_H       = 1      // __locale_t.h:21:1:
+	X_BSD_SIZE_T_                   = 0      // stddef.h:189:1:
+	X_BSD_SIZE_T_DEFINED_           = 0      // stddef.h:192:1:
+	X_DEFAULT_SOURCE                = 1      // features.h:227:1:
+	X_FEATURES_H                    = 1      // features.h:19:1:
+	X_FILE_OFFSET_BITS              = 64     // <builtin>:25:1:
+	X_GCC_SIZE_T                    = 0      // stddef.h:195:1:
+	X_LP64                          = 1      // <predefined>:284:1:
+	X_POSIX_C_SOURCE                = 200809 // features.h:281:1:
+	X_POSIX_SOURCE                  = 1      // features.h:279:1:
+	X_PTHREAD_H                     = 1      // pthread.h:19:1:
+	X_RWLOCK_INTERNAL_H             = 0      // struct_rwlock.h:21:1:
+	X_SCHED_H                       = 1      // sched.h:20:1:
+	X_SIZET_                        = 0      // stddef.h:196:1:
+	X_SIZE_T                        = 0      // stddef.h:183:1:
+	X_SIZE_T_                       = 0      // stddef.h:188:1:
+	X_SIZE_T_DECLARED               = 0      // stddef.h:193:1:
+	X_SIZE_T_DEFINED                = 0      // stddef.h:191:1:
+	X_SIZE_T_DEFINED_               = 0      // stddef.h:190:1:
+	X_STDC_PREDEF_H                 = 1      // <predefined>:162:1:
+	X_STRUCT_TIMESPEC               = 1      // struct_timespec.h:3:1:
+	X_SYS_CDEFS_H                   = 1      // cdefs.h:19:1:
+	X_SYS_SIZE_T_H                  = 0      // stddef.h:184:1:
+	X_THREAD_MUTEX_INTERNAL_H       = 1      // struct_mutex.h:20:1:
+	X_THREAD_SHARED_TYPES_H         = 1      // thread-shared-types.h:20:1:
+	X_TIME_H                        = 1      // time.h:23:1:
+	X_T_SIZE                        = 0      // stddef.h:186:1:
+	X_T_SIZE_                       = 0      // stddef.h:185:1:
+	Linux                           = 1      // <predefined>:231:1:
+	Unix                            = 1      // <predefined>:177:1:
+)
+
+// Read-write lock types.
+const ( /* pthread.h:100:1: */
+	PTHREAD_RWLOCK_PREFER_READER_NP              = 0
+	PTHREAD_RWLOCK_PREFER_WRITER_NP              = 1
+	PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP = 2
+	PTHREAD_RWLOCK_DEFAULT_NP                    = 0
+)
+
+// Read-write lock initializers.
+
+// Scheduler inheritance.
+const ( /* pthread.h:120:1: */
+	PTHREAD_INHERIT_SCHED  = 0
+	PTHREAD_EXPLICIT_SCHED = 1
+)
+
+// Scope handling.
+const ( /* pthread.h:130:1: */
+	PTHREAD_SCOPE_SYSTEM  = 0
+	PTHREAD_SCOPE_PROCESS = 1
+)
+
+// Process shared or private flag.
+const ( /* pthread.h:140:1: */
+	PTHREAD_PROCESS_PRIVATE = 0
+	PTHREAD_PROCESS_SHARED  = 1
+)
+
+// Cancellation
+const ( /* pthread.h:164:1: */
+	PTHREAD_CANCEL_ENABLE  = 0
+	PTHREAD_CANCEL_DISABLE = 1
+)
+const ( /* pthread.h:171:1: */
+	PTHREAD_CANCEL_DEFERRED     = 0
+	PTHREAD_CANCEL_ASYNCHRONOUS = 1
+)
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// NB: Include guard matches what <linux/time.h> uses.
+
+// Detach state.
+const ( /* pthread.h:33:1: */
+	PTHREAD_CREATE_JOINABLE = 0
+	PTHREAD_CREATE_DETACHED = 1
+)
+
+// Mutex types.
+const ( /* pthread.h:43:1: */
+	PTHREAD_MUTEX_TIMED_NP      = 0
+	PTHREAD_MUTEX_RECURSIVE_NP  = 1
+	PTHREAD_MUTEX_ERRORCHECK_NP = 2
+	PTHREAD_MUTEX_ADAPTIVE_NP   = 3
+	PTHREAD_MUTEX_NORMAL        = 0
+	PTHREAD_MUTEX_RECURSIVE     = 1
+	PTHREAD_MUTEX_ERRORCHECK    = 2
+	PTHREAD_MUTEX_DEFAULT       = 0
+)
+
+// Robust mutex or not flags.
+const ( /* pthread.h:65:1: */
+	PTHREAD_MUTEX_STALLED    = 0
+	PTHREAD_MUTEX_STALLED_NP = 0
+	PTHREAD_MUTEX_ROBUST     = 1
+	PTHREAD_MUTEX_ROBUST_NP  = 1
+)
+
+// Mutex protocols.
+const ( /* pthread.h:77:1: */
+	PTHREAD_PRIO_NONE    = 0
+	PTHREAD_PRIO_INHERIT = 1
+	PTHREAD_PRIO_PROTECT = 2
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// These are defined by the user (or the compiler)
+//    to specify the desired environment:
+//
+//    __STRICT_ANSI__	ISO Standard C.
+//    _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
+//    _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
+//    _ISOC2X_SOURCE	Extensions to ISO C99 from ISO C2X.
+//    __STDC_WANT_LIB_EXT2__
+// 			Extensions to ISO C99 from TR 27431-2:2010.
+//    __STDC_WANT_IEC_60559_BFP_EXT__
+// 			Extensions to ISO C11 from TS 18661-1:2014.
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__
+// 			Extensions to ISO C11 from TS 18661-4:2015.
+//    __STDC_WANT_IEC_60559_TYPES_EXT__
+// 			Extensions to ISO C11 from TS 18661-3:2015.
+//
+//    _POSIX_SOURCE	IEEE Std 1003.1.
+//    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
+// 			if >=199309L, add IEEE Std 1003.1b-1993;
+// 			if >=199506L, add IEEE Std 1003.1c-1995;
+// 			if >=200112L, all of IEEE 1003.1-2004
+// 			if >=200809L, all of IEEE 1003.1-2008
+//    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
+// 			Single Unix conformance is wanted, to 600 for the
+// 			sixth revision, to 700 for the seventh revision.
+//    _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
+//    _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
+//    _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
+//    _FILE_OFFSET_BITS=N	Select default filesystem interface.
+//    _ATFILE_SOURCE	Additional *at interfaces.
+//    _GNU_SOURCE		All of the above, plus GNU extensions.
+//    _DEFAULT_SOURCE	The default set of features (taking precedence over
+// 			__STRICT_ANSI__).
+//
+//    _FORTIFY_SOURCE	Add security hardening to many library functions.
+// 			Set to 1 or 2; 2 performs stricter checks than 1.
+//
+//    _REENTRANT, _THREAD_SAFE
+// 			Obsolete; equivalent to _POSIX_C_SOURCE=199506L.
+//
+//    The `-ansi' switch to the GNU C compiler, and standards conformance
+//    options such as `-std=c99', define __STRICT_ANSI__.  If none of
+//    these are defined, or if _DEFAULT_SOURCE is defined, the default is
+//    to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
+//    200809L, as well as enabling miscellaneous functions from BSD and
+//    SVID.  If more than one of these are defined, they accumulate.  For
+//    example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
+//    give you ISO C, 1003.1, and 1003.2, but nothing else.
+//
+//    These are defined by this file and are used by the
+//    header files to decide what to declare or define:
+//
+//    __GLIBC_USE (F)	Define things from feature set F.  This is defined
+// 			to 1 or 0; the subsequent macros are either defined
+// 			or undefined, and those tests should be moved to
+// 			__GLIBC_USE.
+//    __USE_ISOC11		Define ISO C11 things.
+//    __USE_ISOC99		Define ISO C99 things.
+//    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+//    __USE_ISOCXX11	Define ISO C++11 things.
+//    __USE_POSIX		Define IEEE Std 1003.1 things.
+//    __USE_POSIX2		Define IEEE Std 1003.2 things.
+//    __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
+//    __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
+//    __USE_XOPEN		Define XPG things.
+//    __USE_XOPEN_EXTENDED	Define X/Open Unix things.
+//    __USE_UNIX98		Define Single Unix V2 things.
+//    __USE_XOPEN2K        Define XPG6 things.
+//    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+//    __USE_XOPEN2K8       Define XPG7 things.
+//    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
+//    __USE_LARGEFILE	Define correct standard I/O things.
+//    __USE_LARGEFILE64	Define LFS things with separate names.
+//    __USE_FILE_OFFSET64	Define 64bit interface as default.
+//    __USE_MISC		Define things from 4.3BSD or System V Unix.
+//    __USE_ATFILE		Define *at interfaces and AT_* constants for them.
+//    __USE_GNU		Define GNU extensions.
+//    __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
+//
+//    The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
+//    defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
+//    only for compatibility.  All new code should use the other symbols
+//    to test for features.
+//
+//    All macros listed above as possibly being defined by this file are
+//    explicitly undefined if they are not explicitly defined.
+//    Feature-test macros that are not defined by the user or compiler
+//    but are implied by the other feature-test macros defined (or by the
+//    lack of any definitions) are defined by the file.
+//
+//    ISO C feature test macros depend on the definition of the macro
+//    when an affected header is included, not when the first system
+//    header is included, and so they are handled in
+//    <bits/libc-header-start.h>, which does not have a multiple include
+//    guard.  Feature test macros that can be handled from the first
+//    system header included are handled here.
+
+// Undefine everything, so we get a clean slate.
+
+// Suppress kernel-name space pollution unless user expressedly asks
+//    for it.
+
+// Convenience macro to test the version of gcc.
+//    Use like this:
+//    #if __GNUC_PREREQ (2,8)
+//    ... code requiring gcc 2.8 or later ...
+//    #endif
+//    Note: only works for GCC 2.0 and later, because __GNUC_MINOR__ was
+//    added in 2.0.
+
+// Similarly for clang.  Features added to GCC after version 4.2 may
+//    or may not also be available in clang, and clang's definitions of
+//    __GNUC(_MINOR)__ are fixed at 4 and 2 respectively.  Not all such
+//    features can be queried via __has_extension/__has_feature.
+
+// Whether to use feature set F.
+
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
+//    _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
+//    issue a warning; the expectation is that the source is being
+//    transitioned to use the new macro.
+
+// If _GNU_SOURCE was defined by the user, turn on all the other features.
+
+// If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
+//    define _DEFAULT_SOURCE.
+
+// This is to enable the ISO C2X extension.
+
+// This is to enable the ISO C11 extension.
+
+// This is to enable the ISO C99 extension.
+
+// This is to enable the ISO C90 Amendment 1:1995 extension.
+
+// If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
+//    is defined, use POSIX.1-2008 (or another version depending on
+//    _XOPEN_SOURCE).
+
+// Some C libraries once required _REENTRANT and/or _THREAD_SAFE to be
+//    defined in all multithreaded code.  GNU libc has not required this
+//    for many years.  We now treat them as compatibility synonyms for
+//    _POSIX_C_SOURCE=199506L, which is the earliest level of POSIX with
+//    comprehensive support for multithreaded code.  Using them never
+//    lowers the selected level of POSIX conformance, only raises it.
+
+// The function 'gets' existed in C89, but is impossible to use
+//    safely.  It has been removed from ISO C11 and ISO C++14.  Note: for
+//    compatibility with various implementations of <cstdio>, this test
+//    must consider only the value of __cplusplus when compiling C++.
+
+// GNU formerly extended the scanf functions with modified format
+//    specifiers %as, %aS, and %a[...] that allocate a buffer for the
+//    input using malloc.  This extension conflicts with ISO C99, which
+//    defines %a as a standalone format specifier that reads a floating-
+//    point number; moreover, POSIX.1-2008 provides the same feature
+//    using the modifier letter 'm' instead (%ms, %mS, %m[...]).
+//
+//    We now follow C99 unless GNU extensions are active and the compiler
+//    is specifically in C89 or C++98 mode (strict or not).  For
+//    instance, with GCC, -std=gnu11 will have C99-compliant scanf with
+//    or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
+//    old extension.
+
+// Get definitions of __STDC_* predefined macros, if the compiler has
+//    not preincluded this header automatically.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This macro indicates that the installed library is the GNU C Library.
+//    For historic reasons the value now is 6 and this will stay from now
+//    on.  The use of this variable is deprecated.  Use __GLIBC__ and
+//    __GLIBC_MINOR__ now (see below) when you want to test for a specific
+//    GNU C library version and use the values in <gnu/lib-names.h> to get
+//    the sonames of the shared libraries.
+
+// Major and minor version number of the GNU C library package.  Use
+//    these macros to test for features in specific releases.
+
+// This is here only because every header file already includes this one.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// We are almost always included from features.h.
+
+// The GNU libc does not support any K&R compilers or the traditional mode
+//    of ISO C compilers anymore.  Check for some of the combinations not
+//    anymore supported.
+
+// Some user header file might have defined this before.
+
+// All functions, except those with callbacks or those that
+//    synchronize memory, are leaf functions.
+
+// GCC can always grok prototypes.  For C++ programs we add throw()
+//    to help it optimize the function calls.  But this works only with
+//    gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+//    as non-throwing using a function attribute since programs can use
+//    the -fexceptions options for C code as well.
+
+// Compilers that are not clang may object to
+//        #if defined __clang__ && __has_extension(...)
+//    even though they do not need to evaluate the right-hand side of the &&.
+
+// These two macros are not used in glibc anymore.  They are kept here
+//    only because some other projects expect the macros to be defined.
+
+// For these things, GCC behaves the ANSI way normally,
+//    and the non-ANSI way under -traditional.
+
+// This is not a typedef so `const __ptr_t' does the right thing.
+
+// C++ needs to know that types and declarations are C, not C++.
+
+// Fortify support.
+
+// Support for flexible arrays.
+//    Headers that should use flexible arrays only if they're "real"
+//    (e.g. only if they won't affect sizeof()) should test
+//    #if __glibc_c99_flexarr_available.
+
+// __asm__ ("xyz") is used throughout the headers to rename functions
+//    at the assembly language level.  This is wrapped by the __REDIRECT
+//    macro, in order to support compilers that can do this some other
+//    way.  When compilers don't support asm-names at all, we have to do
+//    preprocessor tricks instead (which don't have exactly the right
+//    semantics, but it's the best we can do).
+//
+//    Example:
+//    int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid);
+
+//
+// #elif __SOME_OTHER_COMPILER__
+//
+// # define __REDIRECT(name, proto, alias) name proto; 	_Pragma("let " #name " = " #alias)
+
+// GCC has various useful declarations that can be made with the
+//    `__attribute__' syntax.  All of the ways we use this do fine if
+//    they are omitted for compilers that don't understand it.
+
+// At some point during the gcc 2.96 development the `malloc' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Tell the compiler which arguments to an allocation function
+//    indicate the size of the allocation.
+
+// At some point during the gcc 2.96 development the `pure' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// This declaration tells the compiler that the value is constant.
+
+// At some point during the gcc 3.1 development the `used' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Since version 3.2, gcc allows marking deprecated functions.
+
+// Since version 4.5, gcc also allows one to specify the message printed
+//    when a deprecated function is used.  clang claims to be gcc 4.2, but
+//    may also support this feature.
+
+// At some point during the gcc 2.8 development the `format_arg' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+//    If several `format_arg' attributes are given for the same function, in
+//    gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+//    all designated arguments are considered.
+
+// At some point during the gcc 2.97 development the `strfmon' format
+//    attribute for functions was introduced.  We don't want to use it
+//    unconditionally (although this would be possible) since it
+//    generates warnings.
+
+// The nonull function attribute allows to mark pointer parameters which
+//    must not be NULL.
+
+// If fortification mode, we warn about unused results of certain
+//    function calls which can lead to problems.
+
+// Forces a function to be always inlined.
+// The Linux kernel defines __always_inline in stddef.h (283d7573), and
+//    it conflicts with this definition.  Therefore undefine it first to
+//    allow either header to be included first.
+
+// Associate error messages with the source location of the call site rather
+//    than with the source location inside the function.
+
+// GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+//    inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
+//    or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+//    older than 4.3 may define these macros and still not guarantee GNU inlining
+//    semantics.
+//
+//    clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+//    semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
+//    __GNUC_GNU_INLINE__ macro definitions.
+
+// GCC 4.3 and above allow passing all anonymous arguments of an
+//    __extern_always_inline function to some other vararg function.
+
+// It is possible to compile containing GCC extensions even if GCC is
+//    run in pedantic mode if the uses are carefully marked using the
+//    `__extension__' keyword.  But this is not generally available before
+//    version 2.8.
+
+// __restrict is known in EGCS 1.2 and above.
+
+// ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+//      array_name[restrict]
+//    GCC 3.1 supports this.
+
+// Describes a char array whose address can safely be passed as the first
+//    argument to strncpy and strncat, as the char array is not necessarily
+//    a NUL-terminated string.
+
+// Undefine (also defined in libc-symbols.h).
+// Copies attributes from the declaration or type referenced by
+//    the argument.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// __glibc_macro_warning (MESSAGE) issues warning MESSAGE.  This is
+//    intended for use in preprocessor macros.
+//
+//    Note: MESSAGE must be a _single_ string; concatenation of string
+//    literals is not supported.
+
+// Generic selection (ISO C11) is a C-only feature, available in GCC
+//    since version 4.9.  Previous versions do not provide generic
+//    selection, even though they might set __STDC_VERSION__ to 201112L,
+//    when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
+//    when testing __STDC_VERSION__ for generic selection support.
+//    On the other hand, Clang also defines __GNUC__, so a clang-specific
+//    check is required to enable the use of generic selection.
+
+// If we don't have __REDIRECT, prototypes will be missing if
+//    __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64].
+
+// Decide whether we can define 'extern inline' functions in headers.
+
+// This is here only because every header file already includes this one.
+//    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
+//    <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+//    that will always return failure (and set errno to ENOSYS).
+// This file is automatically generated.
+//    This file selects the right generated file of `__stub_FUNCTION' macros
+//    based on the architecture being compiled for.
+
+// This file is automatically generated.
+//    It defines a symbol `__stub_FUNCTION' for each function
+//    in the C library which is a stub, meaning it will fail
+//    every time called, usually setting errno to ENOSYS.
+
+// Definitions for POSIX 1003.1b-1993 (aka POSIX.4) scheduling interface.
+//    Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Get type definitions.
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `time'.
+type Time_t = X__time_t /* time_t.h:7:18 */
+
+// NB: Include guard matches what <linux/time.h> uses.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Endian macros for string.h functions
+//    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+// Definitions for byte order, according to significance of bytes,
+//    from low addresses to high addresses.  The value is what you get by
+//    putting '4' in the most significant byte, '3' in the second most
+//    significant byte, '2' in the second least significant byte, and '1'
+//    in the least significant byte, and then writing down one digit for
+//    each byte, starting with the byte at the lowest address at the left,
+//    and proceeding to the byte with the highest address at the right.
+
+// This file defines `__BYTE_ORDER' for the particular machine.
+
+// i386/x86_64 are little-endian.
+
+// Some machines may need to use a different endianness for floating point
+//    values.
+
+// POSIX.1b structure for a time value.  This is like a `struct timeval' but
+//
+//	has nanoseconds instead of microseconds.
+type Timespec = struct {
+	Ftv_sec  X__time_t
+	Ftv_nsec X__syscall_slong_t
+} /* struct_timespec.h:10:1 */
+
+type Pid_t = X__pid_t /* sched.h:38:17 */
+
+// Get system specific constant and data structure definitions.
+// Definitions of constants and data structure for POSIX 1003.1b-1993
+//    scheduling interface.
+//    Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Scheduling algorithms.
+
+// Sched parameter structure.  Generic version.
+//    Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library;  if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Data structure to describe a process' schedulability.
+type Sched_param = struct{ Fsched_priority int32 } /* struct_sched_param.h:23:1 */
+
+// Definition of the cpu_set_t structure used by the POSIX 1003.1b-1993
+//    scheduling interface.
+//    Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Size definition for CPU sets.
+
+// Type for array elements in 'cpu_set_t'.
+type X__cpu_mask = uint64 /* cpu-set.h:32:25 */
+
+// Basic access functions.
+
+// Data structure to describe CPU mask.
+type Cpu_set_t = struct{ F__bits [16]X__cpu_mask } /* cpu-set.h:42:3 */
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	ISO C99 Standard: 7.23 Date and time	<time.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
+//
+// This file is part of GCC.
+//
+// GCC is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// GCC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+//
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+// ISO C Standard:  7.17  Common definitions  <stddef.h>
+
+// Any one of these symbols __need_* means that GNU libc
+//    wants us just to define one data type.  So don't define
+//    the symbols that indicate this file's entire job has been done.
+
+// This avoids lossage on SunOS but only if stdtypes.h comes first.
+//    There's no way to win with the other order!  Sun lossage.
+
+// Sequent's header files use _PTRDIFF_T_ in some conflicting way.
+//    Just ignore it.
+
+// On VxWorks, <type/vxTypesBase.h> may have defined macros like
+//    _TYPE_size_t which will typedef size_t.  fixincludes patched the
+//    vxTypesBase.h so that this macro is only defined if _GCC_SIZE_T is
+//    not defined, and so that defining this macro defines _GCC_SIZE_T.
+//    If we find that the macros are still defined at this point, we must
+//    invoke them so that the type is defined as expected.
+
+// In case nobody has defined these types, but we aren't running under
+//    GCC 2.00, make sure that __PTRDIFF_TYPE__, __SIZE_TYPE__, and
+//    __WCHAR_TYPE__ have reasonable values.  This can happen if the
+//    parts of GCC is compiled by an older compiler, that actually
+//    include gstddef.h, such as collect2.
+
+// Signed type of difference of two pointers.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Unsigned type of `sizeof' something.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// This defines CLOCKS_PER_SEC, which is the number of processor clock
+//    ticks per second, and possibly a number of other constants.
+// System-dependent timing definitions.  Linux version.
+//    Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <time.h> instead.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// ISO/IEC 9899:1999 7.23.1: Components of time
+//    The macro `CLOCKS_PER_SEC' is an expression with type `clock_t' that is
+//    the number per second of the value returned by the `clock' function.
+// CAE XSH, Issue 4, Version 2: <time.h>
+//    The value of CLOCKS_PER_SEC is required to be 1 million on all
+//    XSI-conformant systems.
+
+// Identifier for system-wide realtime clock.
+// Monotonic system-wide clock.
+// High-resolution timer from the CPU.
+// Thread-specific CPU-time clock.
+// Monotonic system-wide clock, not adjusted for frequency scaling.
+// Identifier for system-wide realtime clock, updated only on ticks.
+// Monotonic system-wide clock, updated only on ticks.
+// Monotonic system-wide clock that includes time spent in suspension.
+// Like CLOCK_REALTIME but also wakes suspended system.
+// Like CLOCK_BOOTTIME but also wakes suspended system.
+// Like CLOCK_REALTIME but in International Atomic Time.
+
+// Flag to indicate time is absolute.
+
+// Many of the typedefs and structs whose official home is this header
+//    may also need to be defined by other headers.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `clock'.
+type Clock_t = X__clock_t /* clock_t.h:7:19 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// ISO C `broken-down time' structure.
+type Tm = struct {
+	Ftm_sec      int32
+	Ftm_min      int32
+	Ftm_hour     int32
+	Ftm_mday     int32
+	Ftm_mon      int32
+	Ftm_year     int32
+	Ftm_wday     int32
+	Ftm_yday     int32
+	Ftm_isdst    int32
+	F__ccgo_pad1 [4]byte
+	Ftm_gmtoff   int64
+	Ftm_zone     uintptr
+} /* struct_tm.h:7:1 */
+
+// NB: Include guard matches what <linux/time.h> uses.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Clock ID used in clock and timer functions.
+type Clockid_t = X__clockid_t /* clockid_t.h:7:21 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Timer ID returned by `timer_create'.
+type Timer_t = X__timer_t /* timer_t.h:7:19 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// NB: Include guard matches what <linux/time.h> uses.
+
+// POSIX.1b structure for timer start values and intervals.
+type Itimerspec = struct {
+	Fit_interval struct {
+		Ftv_sec  X__time_t
+		Ftv_nsec X__syscall_slong_t
+	}
+	Fit_value struct {
+		Ftv_sec  X__time_t
+		Ftv_nsec X__syscall_slong_t
+	}
+} /* struct_itimerspec.h:8:1 */
+
+// Definition of locale_t.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Definition of struct __locale_struct and __locale_t.
+//    Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// POSIX.1-2008: the locale_t type, representing a locale context
+//    (implementation-namespace version).  This type should be treated
+//    as opaque by applications; some details are exposed for the sake of
+//    efficiency in e.g. ctype functions.
+
+type X__locale_struct = struct {
+	F__locales       [13]uintptr
+	F__ctype_b       uintptr
+	F__ctype_tolower uintptr
+	F__ctype_toupper uintptr
+	F__names         [13]uintptr
+} /* __locale_t.h:28:1 */
+
+type X__locale_t = uintptr /* __locale_t.h:42:32 */
+
+type Locale_t = X__locale_t /* locale_t.h:24:20 */
+
+// Endian macros for string.h functions
+//    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+// Declaration of common pthread types for all architectures.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For internal mutex and condition variable definitions.
+// Common threading primitives definitions for both POSIX and C11.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Arch-specific definitions.  Each architecture must define the following
+//    macros to define the expected sizes of pthread data types:
+//
+//    __SIZEOF_PTHREAD_ATTR_T        - size of pthread_attr_t.
+//    __SIZEOF_PTHREAD_MUTEX_T       - size of pthread_mutex_t.
+//    __SIZEOF_PTHREAD_MUTEXATTR_T   - size of pthread_mutexattr_t.
+//    __SIZEOF_PTHREAD_COND_T        - size of pthread_cond_t.
+//    __SIZEOF_PTHREAD_CONDATTR_T    - size of pthread_condattr_t.
+//    __SIZEOF_PTHREAD_RWLOCK_T      - size of pthread_rwlock_t.
+//    __SIZEOF_PTHREAD_RWLOCKATTR_T  - size of pthread_rwlockattr_t.
+//    __SIZEOF_PTHREAD_BARRIER_T     - size of pthread_barrier_t.
+//    __SIZEOF_PTHREAD_BARRIERATTR_T - size of pthread_barrierattr_t.
+//
+//    The additional macro defines any constraint for the lock alignment
+//    inside the thread structures:
+//
+//    __LOCK_ALIGNMENT - for internal lock/futex usage.
+//
+//    Same idea but for the once locking primitive:
+//
+//    __ONCE_ALIGNMENT - for pthread_once_t/once_flag definition.
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Common definition of pthread_mutex_t.
+
+type X__pthread_internal_list = struct {
+	F__prev uintptr
+	F__next uintptr
+} /* thread-shared-types.h:49:9 */
+
+// Endian macros for string.h functions
+//    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+// Declaration of common pthread types for all architectures.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For internal mutex and condition variable definitions.
+// Common threading primitives definitions for both POSIX and C11.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Arch-specific definitions.  Each architecture must define the following
+//    macros to define the expected sizes of pthread data types:
+//
+//    __SIZEOF_PTHREAD_ATTR_T        - size of pthread_attr_t.
+//    __SIZEOF_PTHREAD_MUTEX_T       - size of pthread_mutex_t.
+//    __SIZEOF_PTHREAD_MUTEXATTR_T   - size of pthread_mutexattr_t.
+//    __SIZEOF_PTHREAD_COND_T        - size of pthread_cond_t.
+//    __SIZEOF_PTHREAD_CONDATTR_T    - size of pthread_condattr_t.
+//    __SIZEOF_PTHREAD_RWLOCK_T      - size of pthread_rwlock_t.
+//    __SIZEOF_PTHREAD_RWLOCKATTR_T  - size of pthread_rwlockattr_t.
+//    __SIZEOF_PTHREAD_BARRIER_T     - size of pthread_barrier_t.
+//    __SIZEOF_PTHREAD_BARRIERATTR_T - size of pthread_barrierattr_t.
+//
+//    The additional macro defines any constraint for the lock alignment
+//    inside the thread structures:
+//
+//    __LOCK_ALIGNMENT - for internal lock/futex usage.
+//
+//    Same idea but for the once locking primitive:
+//
+//    __ONCE_ALIGNMENT - for pthread_once_t/once_flag definition.
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Common definition of pthread_mutex_t.
+
+type X__pthread_list_t = X__pthread_internal_list /* thread-shared-types.h:53:3 */
+
+type X__pthread_internal_slist = struct{ F__next uintptr } /* thread-shared-types.h:55:9 */
+
+type X__pthread_slist_t = X__pthread_internal_slist /* thread-shared-types.h:58:3 */
+
+// Arch-specific mutex definitions.  A generic implementation is provided
+//    by sysdeps/nptl/bits/struct_mutex.h.  If required, an architecture
+//    can override it by defining:
+//
+//    1. struct __pthread_mutex_s (used on both pthread_mutex_t and mtx_t
+//       definition).  It should contains at least the internal members
+//       defined in the generic version.
+//
+//    2. __LOCK_ALIGNMENT for any extra attribute for internal lock used with
+//       atomic operations.
+//
+//    3. The macro __PTHREAD_MUTEX_INITIALIZER used for static initialization.
+//       It should initialize the mutex internal flag.
+
+// x86 internal mutex struct definitions.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+type X__pthread_mutex_s = struct {
+	F__lock    int32
+	F__count   uint32
+	F__owner   int32
+	F__nusers  uint32
+	F__kind    int32
+	F__spins   int16
+	F__elision int16
+	F__list    X__pthread_list_t
+} /* struct_mutex.h:22:1 */
+
+// Arch-sepecific read-write lock definitions.  A generic implementation is
+//    provided by struct_rwlock.h.  If required, an architecture can override it
+//    by defining:
+//
+//    1. struct __pthread_rwlock_arch_t (used on pthread_rwlock_t definition).
+//       It should contain at least the internal members defined in the
+//       generic version.
+//
+//    2. The macro __PTHREAD_RWLOCK_INITIALIZER used for static initialization.
+//       It should initialize the rwlock internal type.
+
+// x86 internal rwlock struct definitions.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+type X__pthread_rwlock_arch_t = struct {
+	F__readers       uint32
+	F__writers       uint32
+	F__wrphase_futex uint32
+	F__writers_futex uint32
+	F__pad3          uint32
+	F__pad4          uint32
+	F__cur_writer    int32
+	F__shared        int32
+	F__rwelision     int8
+	F__pad1          [7]uint8
+	F__pad2          uint64
+	F__flags         uint32
+	F__ccgo_pad1     [4]byte
+} /* struct_rwlock.h:23:1 */
+
+// Common definition of pthread_cond_t.
+
+type X__pthread_cond_s = struct {
+	F__0            struct{ F__wseq uint64 }
+	F__8            struct{ F__g1_start uint64 }
+	F__g_refs       [2]uint32
+	F__g_size       [2]uint32
+	F__g1_orig_size uint32
+	F__wrefs        uint32
+	F__g_signals    [2]uint32
+} /* thread-shared-types.h:92:1 */
+
+// Thread identifiers.  The structure of the attribute type is not
+//
+//	exposed on purpose.
+type Pthread_t = uint64 /* pthreadtypes.h:27:27 */
+
+// Data structures for mutex handling.  The structure of the attribute
+//
+//	type is not exposed on purpose.
+type Pthread_mutexattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:36:3 */
+
+// Data structure for condition variable handling.  The structure of
+//
+//	the attribute type is not exposed on purpose.
+type Pthread_condattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:45:3 */
+
+// Keys for thread-specific data
+type Pthread_key_t = uint32 /* pthreadtypes.h:49:22 */
+
+// Once-only execution
+type Pthread_once_t = int32 /* pthreadtypes.h:53:30 */
+
+type Pthread_attr_t1 = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [56]int8
+} /* pthreadtypes.h:56:1 */
+
+type Pthread_attr_t = Pthread_attr_t1 /* pthreadtypes.h:62:30 */
+
+type Pthread_mutex_t = struct{ F__data X__pthread_mutex_s } /* pthreadtypes.h:72:3 */
+
+type Pthread_cond_t = struct{ F__data X__pthread_cond_s } /* pthreadtypes.h:80:3 */
+
+// Data structure for reader-writer lock variable handling.  The
+//
+//	structure of the attribute type is deliberately not exposed.
+type Pthread_rwlock_t = struct{ F__data X__pthread_rwlock_arch_t } /* pthreadtypes.h:91:3 */
+
+type Pthread_rwlockattr_t = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [8]int8
+} /* pthreadtypes.h:97:3 */
+
+// POSIX spinlock data type.
+type Pthread_spinlock_t = int32 /* pthreadtypes.h:103:22 */
+
+// POSIX barriers data type.  The structure of the type is
+//
+//	deliberately not exposed.
+type Pthread_barrier_t = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [32]int8
+} /* pthreadtypes.h:112:3 */
+
+type Pthread_barrierattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:118:3 */
+
+// Copyright (C) 2001-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define the machine-dependent type `jmp_buf'.  x86-64 version.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+type X__jmp_buf = [8]int64 /* setjmp.h:31:18 */
+
+// Conditional variable handling.
+
+// Cleanup buffers
+type X_pthread_cleanup_buffer = struct {
+	F__routine    uintptr
+	F__arg        uintptr
+	F__canceltype int32
+	F__ccgo_pad1  [4]byte
+	F__prev       uintptr
+} /* pthread.h:155:1 */
+
+// Cancellation handling with integration into exception handling.
+
+type X__pthread_unwind_buf_t = struct {
+	F__cancel_jmp_buf [1]struct {
+		F__cancel_jmp_buf X__jmp_buf
+		F__mask_was_saved int32
+		F__ccgo_pad1      [4]byte
+	}
+	F__pad [4]uintptr
+} /* pthread.h:507:3 */
+
+// No special attributes by default.
+
+// Structure to hold the cleanup handler information.
+type X__pthread_cleanup_frame = struct {
+	F__cancel_routine uintptr
+	F__cancel_arg     uintptr
+	F__do_it          int32
+	F__cancel_type    int32
+} /* pthread.h:516:1 */
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/pwd/capi_linux_loong64.go b/vendor/modernc.org/libc/pwd/capi_linux_loong64.go
new file mode 100644
index 00000000..2a479f58
--- /dev/null
+++ b/vendor/modernc.org/libc/pwd/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo pwd/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o pwd/pwd_linux_amd64.go -pkgname pwd', DO NOT EDIT.
+
+package pwd
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/pwd/pwd_linux_loong64.go b/vendor/modernc.org/libc/pwd/pwd_linux_loong64.go
new file mode 100644
index 00000000..922d6ef3
--- /dev/null
+++ b/vendor/modernc.org/libc/pwd/pwd_linux_loong64.go
@@ -0,0 +1,789 @@
+// Code generated by 'ccgo pwd/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o pwd/pwd_linux_amd64.go -pkgname pwd', DO NOT EDIT.
+
+package pwd
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	NSS_BUFLEN_PASSWD     = 1024   // pwd.h:123:1:
+	X_ATFILE_SOURCE       = 1      // features.h:342:1:
+	X_BITS_TIME64_H       = 1      // time64.h:24:1:
+	X_BITS_TYPESIZES_H    = 1      // typesizes.h:24:1:
+	X_BITS_TYPES_H        = 1      // types.h:24:1:
+	X_BSD_SIZE_T_         = 0      // stddef.h:189:1:
+	X_BSD_SIZE_T_DEFINED_ = 0      // stddef.h:192:1:
+	X_DEFAULT_SOURCE      = 1      // features.h:227:1:
+	X_FEATURES_H          = 1      // features.h:19:1:
+	X_FILE_OFFSET_BITS    = 64     // <builtin>:25:1:
+	X_GCC_SIZE_T          = 0      // stddef.h:195:1:
+	X_LP64                = 1      // <predefined>:284:1:
+	X_POSIX_C_SOURCE      = 200809 // features.h:281:1:
+	X_POSIX_SOURCE        = 1      // features.h:279:1:
+	X_PWD_H               = 1      // pwd.h:23:1:
+	X_SIZET_              = 0      // stddef.h:196:1:
+	X_SIZE_T              = 0      // stddef.h:183:1:
+	X_SIZE_T_             = 0      // stddef.h:188:1:
+	X_SIZE_T_DECLARED     = 0      // stddef.h:193:1:
+	X_SIZE_T_DEFINED      = 0      // stddef.h:191:1:
+	X_SIZE_T_DEFINED_     = 0      // stddef.h:190:1:
+	X_STDC_PREDEF_H       = 1      // <predefined>:162:1:
+	X_SYS_CDEFS_H         = 1      // cdefs.h:19:1:
+	X_SYS_SIZE_T_H        = 0      // stddef.h:184:1:
+	X_T_SIZE              = 0      // stddef.h:186:1:
+	X_T_SIZE_             = 0      // stddef.h:185:1:
+	Linux                 = 1      // <predefined>:231:1:
+	Unix                  = 1      // <predefined>:177:1:
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX Standard: 9.2.2 User Database Access	<pwd.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// These are defined by the user (or the compiler)
+//    to specify the desired environment:
+//
+//    __STRICT_ANSI__	ISO Standard C.
+//    _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
+//    _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
+//    _ISOC2X_SOURCE	Extensions to ISO C99 from ISO C2X.
+//    __STDC_WANT_LIB_EXT2__
+// 			Extensions to ISO C99 from TR 27431-2:2010.
+//    __STDC_WANT_IEC_60559_BFP_EXT__
+// 			Extensions to ISO C11 from TS 18661-1:2014.
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__
+// 			Extensions to ISO C11 from TS 18661-4:2015.
+//    __STDC_WANT_IEC_60559_TYPES_EXT__
+// 			Extensions to ISO C11 from TS 18661-3:2015.
+//
+//    _POSIX_SOURCE	IEEE Std 1003.1.
+//    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
+// 			if >=199309L, add IEEE Std 1003.1b-1993;
+// 			if >=199506L, add IEEE Std 1003.1c-1995;
+// 			if >=200112L, all of IEEE 1003.1-2004
+// 			if >=200809L, all of IEEE 1003.1-2008
+//    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
+// 			Single Unix conformance is wanted, to 600 for the
+// 			sixth revision, to 700 for the seventh revision.
+//    _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
+//    _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
+//    _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
+//    _FILE_OFFSET_BITS=N	Select default filesystem interface.
+//    _ATFILE_SOURCE	Additional *at interfaces.
+//    _GNU_SOURCE		All of the above, plus GNU extensions.
+//    _DEFAULT_SOURCE	The default set of features (taking precedence over
+// 			__STRICT_ANSI__).
+//
+//    _FORTIFY_SOURCE	Add security hardening to many library functions.
+// 			Set to 1 or 2; 2 performs stricter checks than 1.
+//
+//    _REENTRANT, _THREAD_SAFE
+// 			Obsolete; equivalent to _POSIX_C_SOURCE=199506L.
+//
+//    The `-ansi' switch to the GNU C compiler, and standards conformance
+//    options such as `-std=c99', define __STRICT_ANSI__.  If none of
+//    these are defined, or if _DEFAULT_SOURCE is defined, the default is
+//    to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
+//    200809L, as well as enabling miscellaneous functions from BSD and
+//    SVID.  If more than one of these are defined, they accumulate.  For
+//    example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
+//    give you ISO C, 1003.1, and 1003.2, but nothing else.
+//
+//    These are defined by this file and are used by the
+//    header files to decide what to declare or define:
+//
+//    __GLIBC_USE (F)	Define things from feature set F.  This is defined
+// 			to 1 or 0; the subsequent macros are either defined
+// 			or undefined, and those tests should be moved to
+// 			__GLIBC_USE.
+//    __USE_ISOC11		Define ISO C11 things.
+//    __USE_ISOC99		Define ISO C99 things.
+//    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+//    __USE_ISOCXX11	Define ISO C++11 things.
+//    __USE_POSIX		Define IEEE Std 1003.1 things.
+//    __USE_POSIX2		Define IEEE Std 1003.2 things.
+//    __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
+//    __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
+//    __USE_XOPEN		Define XPG things.
+//    __USE_XOPEN_EXTENDED	Define X/Open Unix things.
+//    __USE_UNIX98		Define Single Unix V2 things.
+//    __USE_XOPEN2K        Define XPG6 things.
+//    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+//    __USE_XOPEN2K8       Define XPG7 things.
+//    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
+//    __USE_LARGEFILE	Define correct standard I/O things.
+//    __USE_LARGEFILE64	Define LFS things with separate names.
+//    __USE_FILE_OFFSET64	Define 64bit interface as default.
+//    __USE_MISC		Define things from 4.3BSD or System V Unix.
+//    __USE_ATFILE		Define *at interfaces and AT_* constants for them.
+//    __USE_GNU		Define GNU extensions.
+//    __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
+//
+//    The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
+//    defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
+//    only for compatibility.  All new code should use the other symbols
+//    to test for features.
+//
+//    All macros listed above as possibly being defined by this file are
+//    explicitly undefined if they are not explicitly defined.
+//    Feature-test macros that are not defined by the user or compiler
+//    but are implied by the other feature-test macros defined (or by the
+//    lack of any definitions) are defined by the file.
+//
+//    ISO C feature test macros depend on the definition of the macro
+//    when an affected header is included, not when the first system
+//    header is included, and so they are handled in
+//    <bits/libc-header-start.h>, which does not have a multiple include
+//    guard.  Feature test macros that can be handled from the first
+//    system header included are handled here.
+
+// Undefine everything, so we get a clean slate.
+
+// Suppress kernel-name space pollution unless user expressedly asks
+//    for it.
+
+// Convenience macro to test the version of gcc.
+//    Use like this:
+//    #if __GNUC_PREREQ (2,8)
+//    ... code requiring gcc 2.8 or later ...
+//    #endif
+//    Note: only works for GCC 2.0 and later, because __GNUC_MINOR__ was
+//    added in 2.0.
+
+// Similarly for clang.  Features added to GCC after version 4.2 may
+//    or may not also be available in clang, and clang's definitions of
+//    __GNUC(_MINOR)__ are fixed at 4 and 2 respectively.  Not all such
+//    features can be queried via __has_extension/__has_feature.
+
+// Whether to use feature set F.
+
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
+//    _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
+//    issue a warning; the expectation is that the source is being
+//    transitioned to use the new macro.
+
+// If _GNU_SOURCE was defined by the user, turn on all the other features.
+
+// If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
+//    define _DEFAULT_SOURCE.
+
+// This is to enable the ISO C2X extension.
+
+// This is to enable the ISO C11 extension.
+
+// This is to enable the ISO C99 extension.
+
+// This is to enable the ISO C90 Amendment 1:1995 extension.
+
+// If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
+//    is defined, use POSIX.1-2008 (or another version depending on
+//    _XOPEN_SOURCE).
+
+// Some C libraries once required _REENTRANT and/or _THREAD_SAFE to be
+//    defined in all multithreaded code.  GNU libc has not required this
+//    for many years.  We now treat them as compatibility synonyms for
+//    _POSIX_C_SOURCE=199506L, which is the earliest level of POSIX with
+//    comprehensive support for multithreaded code.  Using them never
+//    lowers the selected level of POSIX conformance, only raises it.
+
+// The function 'gets' existed in C89, but is impossible to use
+//    safely.  It has been removed from ISO C11 and ISO C++14.  Note: for
+//    compatibility with various implementations of <cstdio>, this test
+//    must consider only the value of __cplusplus when compiling C++.
+
+// GNU formerly extended the scanf functions with modified format
+//    specifiers %as, %aS, and %a[...] that allocate a buffer for the
+//    input using malloc.  This extension conflicts with ISO C99, which
+//    defines %a as a standalone format specifier that reads a floating-
+//    point number; moreover, POSIX.1-2008 provides the same feature
+//    using the modifier letter 'm' instead (%ms, %mS, %m[...]).
+//
+//    We now follow C99 unless GNU extensions are active and the compiler
+//    is specifically in C89 or C++98 mode (strict or not).  For
+//    instance, with GCC, -std=gnu11 will have C99-compliant scanf with
+//    or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
+//    old extension.
+
+// Get definitions of __STDC_* predefined macros, if the compiler has
+//    not preincluded this header automatically.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This macro indicates that the installed library is the GNU C Library.
+//    For historic reasons the value now is 6 and this will stay from now
+//    on.  The use of this variable is deprecated.  Use __GLIBC__ and
+//    __GLIBC_MINOR__ now (see below) when you want to test for a specific
+//    GNU C library version and use the values in <gnu/lib-names.h> to get
+//    the sonames of the shared libraries.
+
+// Major and minor version number of the GNU C library package.  Use
+//    these macros to test for features in specific releases.
+
+// This is here only because every header file already includes this one.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// We are almost always included from features.h.
+
+// The GNU libc does not support any K&R compilers or the traditional mode
+//    of ISO C compilers anymore.  Check for some of the combinations not
+//    anymore supported.
+
+// Some user header file might have defined this before.
+
+// All functions, except those with callbacks or those that
+//    synchronize memory, are leaf functions.
+
+// GCC can always grok prototypes.  For C++ programs we add throw()
+//    to help it optimize the function calls.  But this works only with
+//    gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+//    as non-throwing using a function attribute since programs can use
+//    the -fexceptions options for C code as well.
+
+// Compilers that are not clang may object to
+//        #if defined __clang__ && __has_extension(...)
+//    even though they do not need to evaluate the right-hand side of the &&.
+
+// These two macros are not used in glibc anymore.  They are kept here
+//    only because some other projects expect the macros to be defined.
+
+// For these things, GCC behaves the ANSI way normally,
+//    and the non-ANSI way under -traditional.
+
+// This is not a typedef so `const __ptr_t' does the right thing.
+
+// C++ needs to know that types and declarations are C, not C++.
+
+// Fortify support.
+
+// Support for flexible arrays.
+//    Headers that should use flexible arrays only if they're "real"
+//    (e.g. only if they won't affect sizeof()) should test
+//    #if __glibc_c99_flexarr_available.
+
+// __asm__ ("xyz") is used throughout the headers to rename functions
+//    at the assembly language level.  This is wrapped by the __REDIRECT
+//    macro, in order to support compilers that can do this some other
+//    way.  When compilers don't support asm-names at all, we have to do
+//    preprocessor tricks instead (which don't have exactly the right
+//    semantics, but it's the best we can do).
+//
+//    Example:
+//    int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid);
+
+//
+// #elif __SOME_OTHER_COMPILER__
+//
+// # define __REDIRECT(name, proto, alias) name proto; 	_Pragma("let " #name " = " #alias)
+
+// GCC has various useful declarations that can be made with the
+//    `__attribute__' syntax.  All of the ways we use this do fine if
+//    they are omitted for compilers that don't understand it.
+
+// At some point during the gcc 2.96 development the `malloc' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Tell the compiler which arguments to an allocation function
+//    indicate the size of the allocation.
+
+// At some point during the gcc 2.96 development the `pure' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// This declaration tells the compiler that the value is constant.
+
+// At some point during the gcc 3.1 development the `used' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Since version 3.2, gcc allows marking deprecated functions.
+
+// Since version 4.5, gcc also allows one to specify the message printed
+//    when a deprecated function is used.  clang claims to be gcc 4.2, but
+//    may also support this feature.
+
+// At some point during the gcc 2.8 development the `format_arg' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+//    If several `format_arg' attributes are given for the same function, in
+//    gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+//    all designated arguments are considered.
+
+// At some point during the gcc 2.97 development the `strfmon' format
+//    attribute for functions was introduced.  We don't want to use it
+//    unconditionally (although this would be possible) since it
+//    generates warnings.
+
+// The nonull function attribute allows to mark pointer parameters which
+//    must not be NULL.
+
+// If fortification mode, we warn about unused results of certain
+//    function calls which can lead to problems.
+
+// Forces a function to be always inlined.
+// The Linux kernel defines __always_inline in stddef.h (283d7573), and
+//    it conflicts with this definition.  Therefore undefine it first to
+//    allow either header to be included first.
+
+// Associate error messages with the source location of the call site rather
+//    than with the source location inside the function.
+
+// GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+//    inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
+//    or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+//    older than 4.3 may define these macros and still not guarantee GNU inlining
+//    semantics.
+//
+//    clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+//    semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
+//    __GNUC_GNU_INLINE__ macro definitions.
+
+// GCC 4.3 and above allow passing all anonymous arguments of an
+//    __extern_always_inline function to some other vararg function.
+
+// It is possible to compile containing GCC extensions even if GCC is
+//    run in pedantic mode if the uses are carefully marked using the
+//    `__extension__' keyword.  But this is not generally available before
+//    version 2.8.
+
+// __restrict is known in EGCS 1.2 and above.
+
+// ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+//      array_name[restrict]
+//    GCC 3.1 supports this.
+
+// Describes a char array whose address can safely be passed as the first
+//    argument to strncpy and strncat, as the char array is not necessarily
+//    a NUL-terminated string.
+
+// Undefine (also defined in libc-symbols.h).
+// Copies attributes from the declaration or type referenced by
+//    the argument.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// __glibc_macro_warning (MESSAGE) issues warning MESSAGE.  This is
+//    intended for use in preprocessor macros.
+//
+//    Note: MESSAGE must be a _single_ string; concatenation of string
+//    literals is not supported.
+
+// Generic selection (ISO C11) is a C-only feature, available in GCC
+//    since version 4.9.  Previous versions do not provide generic
+//    selection, even though they might set __STDC_VERSION__ to 201112L,
+//    when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
+//    when testing __STDC_VERSION__ for generic selection support.
+//    On the other hand, Clang also defines __GNUC__, so a clang-specific
+//    check is required to enable the use of generic selection.
+
+// If we don't have __REDIRECT, prototypes will be missing if
+//    __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64].
+
+// Decide whether we can define 'extern inline' functions in headers.
+
+// This is here only because every header file already includes this one.
+//    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
+//    <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+//    that will always return failure (and set errno to ENOSYS).
+// This file is automatically generated.
+//    This file selects the right generated file of `__stub_FUNCTION' macros
+//    based on the architecture being compiled for.
+
+// This file is automatically generated.
+//    It defines a symbol `__stub_FUNCTION' for each function
+//    in the C library which is a stub, meaning it will fail
+//    every time called, usually setting errno to ENOSYS.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// The Single Unix specification says that some more types are
+//
+//	available here.
+type Gid_t = X__gid_t /* pwd.h:38:17 */
+
+type Uid_t = X__uid_t /* pwd.h:43:17 */
+
+// A record in the user database.
+type Passwd = struct {
+	Fpw_name   uintptr
+	Fpw_passwd uintptr
+	Fpw_uid    X__uid_t
+	Fpw_gid    X__gid_t
+	Fpw_gecos  uintptr
+	Fpw_dir    uintptr
+	Fpw_shell  uintptr
+} /* pwd.h:49:1 */
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/signal/capi_linux_loong64.go b/vendor/modernc.org/libc/signal/capi_linux_loong64.go
new file mode 100644
index 00000000..20eeb2da
--- /dev/null
+++ b/vendor/modernc.org/libc/signal/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo signal/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o signal/signal_linux_amd64.go -pkgname signal', DO NOT EDIT.
+
+package signal
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/signal/more_linux_loong64.go b/vendor/modernc.org/libc/signal/more_linux_loong64.go
new file mode 100644
index 00000000..25cc318b
--- /dev/null
+++ b/vendor/modernc.org/libc/signal/more_linux_loong64.go
@@ -0,0 +1,12 @@
+// Copyright 2020 The Libc 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 signal
+
+const (
+	//	/usr/include/asm-generic/signal-defs.h:24:#define SIG_DFL	((__sighandler_t)0)	/* default signal handling */
+	SIG_DFL = 0
+	//	/usr/include/asm-generic/signal-defs.h:25:#define SIG_IGN	((__sighandler_t)1)	/* ignore signal */
+	SIG_IGN = 1
+)
diff --git a/vendor/modernc.org/libc/signal/signal_linux_loong64.go b/vendor/modernc.org/libc/signal/signal_linux_loong64.go
new file mode 100644
index 00000000..b7cdcd8e
--- /dev/null
+++ b/vendor/modernc.org/libc/signal/signal_linux_loong64.go
@@ -0,0 +1,2198 @@
+// Code generated by 'ccgo signal/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o signal/signal_linux_amd64.go -pkgname signal', DO NOT EDIT.
+
+package signal
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	FP_XSTATE_MAGIC1             = 0x46505853 // sigcontext.h:27:1:
+	FP_XSTATE_MAGIC2             = 0x46505845 // sigcontext.h:28:1:
+	MINSIGSTKSZ                  = 2048       // sigstack.h:27:1:
+	NGREG                        = 23         // ucontext.h:42:1:
+	NSIG                         = 65         // signal.h:181:1:
+	SA_INTERRUPT                 = 0x20000000 // sigaction.h:70:1:
+	SA_NOCLDSTOP                 = 1          // sigaction.h:56:1:
+	SA_NOCLDWAIT                 = 2          // sigaction.h:57:1:
+	SA_NODEFER                   = 0x40000000 // sigaction.h:65:1:
+	SA_NOMASK                    = 1073741824 // sigaction.h:73:1:
+	SA_ONESHOT                   = 2147483648 // sigaction.h:74:1:
+	SA_ONSTACK                   = 0x08000000 // sigaction.h:61:1:
+	SA_RESETHAND                 = 0x80000000 // sigaction.h:67:1:
+	SA_RESTART                   = 0x10000000 // sigaction.h:64:1:
+	SA_SIGINFO                   = 4          // sigaction.h:58:1:
+	SA_STACK                     = 134217728  // sigaction.h:75:1:
+	SIGABRT                      = 6          // signum-generic.h:50:1:
+	SIGALRM                      = 14         // signum-generic.h:63:1:
+	SIGBUS                       = 7          // signum.h:35:1:
+	SIGCHLD                      = 17         // signum.h:41:1:
+	SIGCLD                       = 17         // signum-generic.h:88:1:
+	SIGCONT                      = 18         // signum.h:43:1:
+	SIGFPE                       = 8          // signum-generic.h:51:1:
+	SIGHUP                       = 1          // signum-generic.h:56:1:
+	SIGILL                       = 4          // signum-generic.h:49:1:
+	SIGINT                       = 2          // signum-generic.h:48:1:
+	SIGIO                        = 29         // signum-generic.h:86:1:
+	SIGIOT                       = 6          // signum-generic.h:87:1:
+	SIGKILL                      = 9          // signum-generic.h:59:1:
+	SIGPIPE                      = 13         // signum-generic.h:62:1:
+	SIGPOLL                      = 29         // signum.h:51:1:
+	SIGPROF                      = 27         // signum-generic.h:77:1:
+	SIGPWR                       = 30         // signum.h:32:1:
+	SIGQUIT                      = 3          // signum-generic.h:57:1:
+	SIGSEGV                      = 11         // signum-generic.h:52:1:
+	SIGSTKFLT                    = 16         // signum.h:31:1:
+	SIGSTKSZ                     = 8192       // sigstack.h:30:1:
+	SIGSTOP                      = 19         // signum.h:45:1:
+	SIGSYS                       = 31         // signum.h:53:1:
+	SIGTERM                      = 15         // signum-generic.h:53:1:
+	SIGTRAP                      = 5          // signum-generic.h:58:1:
+	SIGTSTP                      = 20         // signum.h:47:1:
+	SIGTTIN                      = 21         // signum-generic.h:71:1:
+	SIGTTOU                      = 22         // signum-generic.h:72:1:
+	SIGURG                       = 23         // signum.h:49:1:
+	SIGUSR1                      = 10         // signum.h:37:1:
+	SIGUSR2                      = 12         // signum.h:39:1:
+	SIGVTALRM                    = 26         // signum-generic.h:76:1:
+	SIGWINCH                     = 28         // signum-generic.h:83:1:
+	SIGXCPU                      = 24         // signum-generic.h:74:1:
+	SIGXFSZ                      = 25         // signum-generic.h:75:1:
+	SIG_BLOCK                    = 0          // sigaction.h:79:1:
+	SIG_SETMASK                  = 2          // sigaction.h:81:1:
+	SIG_UNBLOCK                  = 1          // sigaction.h:80:1:
+	X_ATFILE_SOURCE              = 1          // features.h:342:1:
+	X_BITS_ENDIANNESS_H          = 1          // endianness.h:2:1:
+	X_BITS_ENDIAN_H              = 1          // endian.h:20:1:
+	X_BITS_PTHREADTYPES_ARCH_H   = 1          // pthreadtypes-arch.h:19:1:
+	X_BITS_PTHREADTYPES_COMMON_H = 1          // pthreadtypes.h:20:1:
+	X_BITS_SIGACTION_H           = 1          // sigaction.h:20:1:
+	X_BITS_SIGCONTEXT_H          = 1          // sigcontext.h:19:1:
+	X_BITS_SIGEVENT_CONSTS_H     = 1          // sigevent-consts.h:20:1:
+	X_BITS_SIGINFO_ARCH_H        = 1          // siginfo-arch.h:3:1:
+	X_BITS_SIGINFO_CONSTS_H      = 1          // siginfo-consts.h:20:1:
+	X_BITS_SIGNUM_GENERIC_H      = 1          // signum-generic.h:20:1:
+	X_BITS_SIGNUM_H              = 1          // signum.h:20:1:
+	X_BITS_SIGSTACK_H            = 1          // sigstack.h:20:1:
+	X_BITS_SIGTHREAD_H           = 1          // sigthread.h:20:1:
+	X_BITS_SS_FLAGS_H            = 1          // ss_flags.h:20:1:
+	X_BITS_TIME64_H              = 1          // time64.h:24:1:
+	X_BITS_TYPESIZES_H           = 1          // typesizes.h:24:1:
+	X_BITS_TYPES_H               = 1          // types.h:24:1:
+	X_BSD_SIZE_T_                = 0          // stddef.h:189:1:
+	X_BSD_SIZE_T_DEFINED_        = 0          // stddef.h:192:1:
+	X_DEFAULT_SOURCE             = 1          // features.h:227:1:
+	X_FEATURES_H                 = 1          // features.h:19:1:
+	X_FILE_OFFSET_BITS           = 64         // <builtin>:25:1:
+	X_GCC_SIZE_T                 = 0          // stddef.h:195:1:
+	X_LP64                       = 1          // <predefined>:284:1:
+	X_NSIG                       = 65         // signum-generic.h:100:1:
+	X_POSIX_C_SOURCE             = 200809     // features.h:281:1:
+	X_POSIX_SOURCE               = 1          // features.h:279:1:
+	X_RWLOCK_INTERNAL_H          = 0          // struct_rwlock.h:21:1:
+	X_SIGNAL_H                   = 0          // signal.h:23:1:
+	X_SIZET_                     = 0          // stddef.h:196:1:
+	X_SIZE_T                     = 0          // stddef.h:183:1:
+	X_SIZE_T_                    = 0          // stddef.h:188:1:
+	X_SIZE_T_DECLARED            = 0          // stddef.h:193:1:
+	X_SIZE_T_DEFINED             = 0          // stddef.h:191:1:
+	X_SIZE_T_DEFINED_            = 0          // stddef.h:190:1:
+	X_STDC_PREDEF_H              = 1          // <predefined>:162:1:
+	X_STRUCT_TIMESPEC            = 1          // struct_timespec.h:3:1:
+	X_SYS_CDEFS_H                = 1          // cdefs.h:19:1:
+	X_SYS_SIZE_T_H               = 0          // stddef.h:184:1:
+	X_SYS_UCONTEXT_H             = 1          // ucontext.h:19:1:
+	X_THREAD_MUTEX_INTERNAL_H    = 1          // struct_mutex.h:20:1:
+	X_THREAD_SHARED_TYPES_H      = 1          // thread-shared-types.h:20:1:
+	X_T_SIZE                     = 0          // stddef.h:186:1:
+	X_T_SIZE_                    = 0          // stddef.h:185:1:
+	Linux                        = 1          // <predefined>:231:1:
+	Unix                         = 1          // <predefined>:177:1:
+)
+
+// POSIX names to access some of the members.
+
+// sigevent constants.  Linux version.
+//    Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// `sigev_notify' values.
+const ( /* sigevent-consts.h:27:1: */
+	SIGEV_SIGNAL = 0 // Notify via signal.
+	SIGEV_NONE   = 1 // Other notification: meaningless.
+	SIGEV_THREAD = 2 // Deliver via thread creation.
+
+	SIGEV_THREAD_ID = 4
+)
+
+// `si_code' values for SIGSEGV signal.
+const ( /* siginfo-consts.h:119:1: */
+	SEGV_MAPERR  = 1 // Address not mapped to object.
+	SEGV_ACCERR  = 2 // Invalid permissions for mapped object.
+	SEGV_BNDERR  = 3 // Bounds checking failure.
+	SEGV_PKUERR  = 4 // Protection key checking failure.
+	SEGV_ACCADI  = 5 // ADI not enabled for mapped object.
+	SEGV_ADIDERR = 6 // Disrupting MCD error.
+	SEGV_ADIPERR = 7
+)
+
+// `si_code' values for SIGBUS signal.
+const ( /* siginfo-consts.h:138:1: */
+	BUS_ADRALN    = 1 // Invalid address alignment.
+	BUS_ADRERR    = 2 // Non-existant physical address.
+	BUS_OBJERR    = 3 // Object specific hardware error.
+	BUS_MCEERR_AR = 4 // Hardware memory error: action required.
+	BUS_MCEERR_AO = 5
+)
+
+// `si_code' values for SIGCHLD signal.
+const ( /* siginfo-consts.h:172:1: */
+	CLD_EXITED    = 1 // Child has exited.
+	CLD_KILLED    = 2 // Child was killed.
+	CLD_DUMPED    = 3 // Child terminated abnormally.
+	CLD_TRAPPED   = 4 // Traced child has trapped.
+	CLD_STOPPED   = 5 // Child has stopped.
+	CLD_CONTINUED = 6
+)
+
+// `si_code' values for SIGPOLL signal.
+const ( /* siginfo-consts.h:189:1: */
+	POLL_IN  = 1 // Data input available.
+	POLL_OUT = 2 // Output buffers available.
+	POLL_MSG = 3 // Input message available.
+	POLL_ERR = 4 // I/O error.
+	POLL_PRI = 5 // High priority input available.
+	POLL_HUP = 6
+)
+
+// X/Open requires some more fields with fixed names.
+
+// siginfo constants.  Linux version.
+//    Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Most of these constants are uniform across all architectures, but there
+//    is one exception.
+// Architecture-specific adjustments to siginfo_t.  x86 version.
+
+// Values for `si_code'.  Positive values are reserved for kernel-generated
+//
+//	signals.
+const ( /* siginfo-consts.h:35:1: */
+	SI_ASYNCNL  = -60 // Sent by asynch name lookup completion.
+	SI_DETHREAD = -7  // Sent by execve killing subsidiary
+	// 				   threads.
+	SI_TKILL   = -6 // Sent by tkill.
+	SI_SIGIO   = -5 // Sent by queued SIGIO.
+	SI_ASYNCIO = -4 // Sent by AIO completion.
+	SI_MESGQ   = -3 // Sent by real time mesq state change.
+	SI_TIMER   = -2 // Sent by timer expiration.
+	SI_QUEUE   = -1 // Sent by sigqueue.
+	SI_USER    = 0  // Sent by kill, sigsend.
+	SI_KERNEL  = 128
+)
+
+// `si_code' values for SIGILL signal.
+const ( /* siginfo-consts.h:71:1: */
+	ILL_ILLOPC   = 1 // Illegal opcode.
+	ILL_ILLOPN   = 2 // Illegal operand.
+	ILL_ILLADR   = 3 // Illegal addressing mode.
+	ILL_ILLTRP   = 4 // Illegal trap.
+	ILL_PRVOPC   = 5 // Privileged opcode.
+	ILL_PRVREG   = 6 // Privileged register.
+	ILL_COPROC   = 7 // Coprocessor error.
+	ILL_BADSTK   = 8 // Internal stack error.
+	ILL_BADIADDR = 9
+)
+
+// `si_code' values for SIGFPE signal.
+const ( /* siginfo-consts.h:94:1: */
+	FPE_INTDIV   = 1  // Integer divide by zero.
+	FPE_INTOVF   = 2  // Integer overflow.
+	FPE_FLTDIV   = 3  // Floating point divide by zero.
+	FPE_FLTOVF   = 4  // Floating point overflow.
+	FPE_FLTUND   = 5  // Floating point underflow.
+	FPE_FLTRES   = 6  // Floating point inexact result.
+	FPE_FLTINV   = 7  // Floating point invalid operation.
+	FPE_FLTSUB   = 8  // Subscript out of range.
+	FPE_FLTUNK   = 14 // Undiagnosed floating-point exception.
+	FPE_CONDTRAP = 15
+)
+
+// sigstack, sigaltstack definitions.
+//    Copyright (C) 1998-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Minimum stack size for a signal handler.
+
+// System default stack size.
+
+// ss_flags values for stack_t.  Linux version.
+//    Copyright (C) 1998-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Possible values for `ss_flags'.
+const ( /* ss_flags.h:27:1: */
+	SS_ONSTACK = 1
+	SS_DISABLE = 2
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	ISO C99 Standard: 7.14 Signal handling <signal.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// These are defined by the user (or the compiler)
+//    to specify the desired environment:
+//
+//    __STRICT_ANSI__	ISO Standard C.
+//    _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
+//    _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
+//    _ISOC2X_SOURCE	Extensions to ISO C99 from ISO C2X.
+//    __STDC_WANT_LIB_EXT2__
+// 			Extensions to ISO C99 from TR 27431-2:2010.
+//    __STDC_WANT_IEC_60559_BFP_EXT__
+// 			Extensions to ISO C11 from TS 18661-1:2014.
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__
+// 			Extensions to ISO C11 from TS 18661-4:2015.
+//    __STDC_WANT_IEC_60559_TYPES_EXT__
+// 			Extensions to ISO C11 from TS 18661-3:2015.
+//
+//    _POSIX_SOURCE	IEEE Std 1003.1.
+//    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
+// 			if >=199309L, add IEEE Std 1003.1b-1993;
+// 			if >=199506L, add IEEE Std 1003.1c-1995;
+// 			if >=200112L, all of IEEE 1003.1-2004
+// 			if >=200809L, all of IEEE 1003.1-2008
+//    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
+// 			Single Unix conformance is wanted, to 600 for the
+// 			sixth revision, to 700 for the seventh revision.
+//    _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
+//    _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
+//    _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
+//    _FILE_OFFSET_BITS=N	Select default filesystem interface.
+//    _ATFILE_SOURCE	Additional *at interfaces.
+//    _GNU_SOURCE		All of the above, plus GNU extensions.
+//    _DEFAULT_SOURCE	The default set of features (taking precedence over
+// 			__STRICT_ANSI__).
+//
+//    _FORTIFY_SOURCE	Add security hardening to many library functions.
+// 			Set to 1 or 2; 2 performs stricter checks than 1.
+//
+//    _REENTRANT, _THREAD_SAFE
+// 			Obsolete; equivalent to _POSIX_C_SOURCE=199506L.
+//
+//    The `-ansi' switch to the GNU C compiler, and standards conformance
+//    options such as `-std=c99', define __STRICT_ANSI__.  If none of
+//    these are defined, or if _DEFAULT_SOURCE is defined, the default is
+//    to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
+//    200809L, as well as enabling miscellaneous functions from BSD and
+//    SVID.  If more than one of these are defined, they accumulate.  For
+//    example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
+//    give you ISO C, 1003.1, and 1003.2, but nothing else.
+//
+//    These are defined by this file and are used by the
+//    header files to decide what to declare or define:
+//
+//    __GLIBC_USE (F)	Define things from feature set F.  This is defined
+// 			to 1 or 0; the subsequent macros are either defined
+// 			or undefined, and those tests should be moved to
+// 			__GLIBC_USE.
+//    __USE_ISOC11		Define ISO C11 things.
+//    __USE_ISOC99		Define ISO C99 things.
+//    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+//    __USE_ISOCXX11	Define ISO C++11 things.
+//    __USE_POSIX		Define IEEE Std 1003.1 things.
+//    __USE_POSIX2		Define IEEE Std 1003.2 things.
+//    __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
+//    __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
+//    __USE_XOPEN		Define XPG things.
+//    __USE_XOPEN_EXTENDED	Define X/Open Unix things.
+//    __USE_UNIX98		Define Single Unix V2 things.
+//    __USE_XOPEN2K        Define XPG6 things.
+//    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+//    __USE_XOPEN2K8       Define XPG7 things.
+//    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
+//    __USE_LARGEFILE	Define correct standard I/O things.
+//    __USE_LARGEFILE64	Define LFS things with separate names.
+//    __USE_FILE_OFFSET64	Define 64bit interface as default.
+//    __USE_MISC		Define things from 4.3BSD or System V Unix.
+//    __USE_ATFILE		Define *at interfaces and AT_* constants for them.
+//    __USE_GNU		Define GNU extensions.
+//    __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
+//
+//    The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
+//    defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
+//    only for compatibility.  All new code should use the other symbols
+//    to test for features.
+//
+//    All macros listed above as possibly being defined by this file are
+//    explicitly undefined if they are not explicitly defined.
+//    Feature-test macros that are not defined by the user or compiler
+//    but are implied by the other feature-test macros defined (or by the
+//    lack of any definitions) are defined by the file.
+//
+//    ISO C feature test macros depend on the definition of the macro
+//    when an affected header is included, not when the first system
+//    header is included, and so they are handled in
+//    <bits/libc-header-start.h>, which does not have a multiple include
+//    guard.  Feature test macros that can be handled from the first
+//    system header included are handled here.
+
+// Undefine everything, so we get a clean slate.
+
+// Suppress kernel-name space pollution unless user expressedly asks
+//    for it.
+
+// Convenience macro to test the version of gcc.
+//    Use like this:
+//    #if __GNUC_PREREQ (2,8)
+//    ... code requiring gcc 2.8 or later ...
+//    #endif
+//    Note: only works for GCC 2.0 and later, because __GNUC_MINOR__ was
+//    added in 2.0.
+
+// Similarly for clang.  Features added to GCC after version 4.2 may
+//    or may not also be available in clang, and clang's definitions of
+//    __GNUC(_MINOR)__ are fixed at 4 and 2 respectively.  Not all such
+//    features can be queried via __has_extension/__has_feature.
+
+// Whether to use feature set F.
+
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
+//    _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
+//    issue a warning; the expectation is that the source is being
+//    transitioned to use the new macro.
+
+// If _GNU_SOURCE was defined by the user, turn on all the other features.
+
+// If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
+//    define _DEFAULT_SOURCE.
+
+// This is to enable the ISO C2X extension.
+
+// This is to enable the ISO C11 extension.
+
+// This is to enable the ISO C99 extension.
+
+// This is to enable the ISO C90 Amendment 1:1995 extension.
+
+// If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
+//    is defined, use POSIX.1-2008 (or another version depending on
+//    _XOPEN_SOURCE).
+
+// Some C libraries once required _REENTRANT and/or _THREAD_SAFE to be
+//    defined in all multithreaded code.  GNU libc has not required this
+//    for many years.  We now treat them as compatibility synonyms for
+//    _POSIX_C_SOURCE=199506L, which is the earliest level of POSIX with
+//    comprehensive support for multithreaded code.  Using them never
+//    lowers the selected level of POSIX conformance, only raises it.
+
+// The function 'gets' existed in C89, but is impossible to use
+//    safely.  It has been removed from ISO C11 and ISO C++14.  Note: for
+//    compatibility with various implementations of <cstdio>, this test
+//    must consider only the value of __cplusplus when compiling C++.
+
+// GNU formerly extended the scanf functions with modified format
+//    specifiers %as, %aS, and %a[...] that allocate a buffer for the
+//    input using malloc.  This extension conflicts with ISO C99, which
+//    defines %a as a standalone format specifier that reads a floating-
+//    point number; moreover, POSIX.1-2008 provides the same feature
+//    using the modifier letter 'm' instead (%ms, %mS, %m[...]).
+//
+//    We now follow C99 unless GNU extensions are active and the compiler
+//    is specifically in C89 or C++98 mode (strict or not).  For
+//    instance, with GCC, -std=gnu11 will have C99-compliant scanf with
+//    or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
+//    old extension.
+
+// Get definitions of __STDC_* predefined macros, if the compiler has
+//    not preincluded this header automatically.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This macro indicates that the installed library is the GNU C Library.
+//    For historic reasons the value now is 6 and this will stay from now
+//    on.  The use of this variable is deprecated.  Use __GLIBC__ and
+//    __GLIBC_MINOR__ now (see below) when you want to test for a specific
+//    GNU C library version and use the values in <gnu/lib-names.h> to get
+//    the sonames of the shared libraries.
+
+// Major and minor version number of the GNU C library package.  Use
+//    these macros to test for features in specific releases.
+
+// This is here only because every header file already includes this one.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// We are almost always included from features.h.
+
+// The GNU libc does not support any K&R compilers or the traditional mode
+//    of ISO C compilers anymore.  Check for some of the combinations not
+//    anymore supported.
+
+// Some user header file might have defined this before.
+
+// All functions, except those with callbacks or those that
+//    synchronize memory, are leaf functions.
+
+// GCC can always grok prototypes.  For C++ programs we add throw()
+//    to help it optimize the function calls.  But this works only with
+//    gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+//    as non-throwing using a function attribute since programs can use
+//    the -fexceptions options for C code as well.
+
+// Compilers that are not clang may object to
+//        #if defined __clang__ && __has_extension(...)
+//    even though they do not need to evaluate the right-hand side of the &&.
+
+// These two macros are not used in glibc anymore.  They are kept here
+//    only because some other projects expect the macros to be defined.
+
+// For these things, GCC behaves the ANSI way normally,
+//    and the non-ANSI way under -traditional.
+
+// This is not a typedef so `const __ptr_t' does the right thing.
+
+// C++ needs to know that types and declarations are C, not C++.
+
+// Fortify support.
+
+// Support for flexible arrays.
+//    Headers that should use flexible arrays only if they're "real"
+//    (e.g. only if they won't affect sizeof()) should test
+//    #if __glibc_c99_flexarr_available.
+
+// __asm__ ("xyz") is used throughout the headers to rename functions
+//    at the assembly language level.  This is wrapped by the __REDIRECT
+//    macro, in order to support compilers that can do this some other
+//    way.  When compilers don't support asm-names at all, we have to do
+//    preprocessor tricks instead (which don't have exactly the right
+//    semantics, but it's the best we can do).
+//
+//    Example:
+//    int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid);
+
+//
+// #elif __SOME_OTHER_COMPILER__
+//
+// # define __REDIRECT(name, proto, alias) name proto; 	_Pragma("let " #name " = " #alias)
+
+// GCC has various useful declarations that can be made with the
+//    `__attribute__' syntax.  All of the ways we use this do fine if
+//    they are omitted for compilers that don't understand it.
+
+// At some point during the gcc 2.96 development the `malloc' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Tell the compiler which arguments to an allocation function
+//    indicate the size of the allocation.
+
+// At some point during the gcc 2.96 development the `pure' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// This declaration tells the compiler that the value is constant.
+
+// At some point during the gcc 3.1 development the `used' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Since version 3.2, gcc allows marking deprecated functions.
+
+// Since version 4.5, gcc also allows one to specify the message printed
+//    when a deprecated function is used.  clang claims to be gcc 4.2, but
+//    may also support this feature.
+
+// At some point during the gcc 2.8 development the `format_arg' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+//    If several `format_arg' attributes are given for the same function, in
+//    gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+//    all designated arguments are considered.
+
+// At some point during the gcc 2.97 development the `strfmon' format
+//    attribute for functions was introduced.  We don't want to use it
+//    unconditionally (although this would be possible) since it
+//    generates warnings.
+
+// The nonull function attribute allows to mark pointer parameters which
+//    must not be NULL.
+
+// If fortification mode, we warn about unused results of certain
+//    function calls which can lead to problems.
+
+// Forces a function to be always inlined.
+// The Linux kernel defines __always_inline in stddef.h (283d7573), and
+//    it conflicts with this definition.  Therefore undefine it first to
+//    allow either header to be included first.
+
+// Associate error messages with the source location of the call site rather
+//    than with the source location inside the function.
+
+// GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+//    inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
+//    or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+//    older than 4.3 may define these macros and still not guarantee GNU inlining
+//    semantics.
+//
+//    clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+//    semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
+//    __GNUC_GNU_INLINE__ macro definitions.
+
+// GCC 4.3 and above allow passing all anonymous arguments of an
+//    __extern_always_inline function to some other vararg function.
+
+// It is possible to compile containing GCC extensions even if GCC is
+//    run in pedantic mode if the uses are carefully marked using the
+//    `__extension__' keyword.  But this is not generally available before
+//    version 2.8.
+
+// __restrict is known in EGCS 1.2 and above.
+
+// ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+//      array_name[restrict]
+//    GCC 3.1 supports this.
+
+// Describes a char array whose address can safely be passed as the first
+//    argument to strncpy and strncat, as the char array is not necessarily
+//    a NUL-terminated string.
+
+// Undefine (also defined in libc-symbols.h).
+// Copies attributes from the declaration or type referenced by
+//    the argument.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// __glibc_macro_warning (MESSAGE) issues warning MESSAGE.  This is
+//    intended for use in preprocessor macros.
+//
+//    Note: MESSAGE must be a _single_ string; concatenation of string
+//    literals is not supported.
+
+// Generic selection (ISO C11) is a C-only feature, available in GCC
+//    since version 4.9.  Previous versions do not provide generic
+//    selection, even though they might set __STDC_VERSION__ to 201112L,
+//    when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
+//    when testing __STDC_VERSION__ for generic selection support.
+//    On the other hand, Clang also defines __GNUC__, so a clang-specific
+//    check is required to enable the use of generic selection.
+
+// If we don't have __REDIRECT, prototypes will be missing if
+//    __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64].
+
+// Decide whether we can define 'extern inline' functions in headers.
+
+// This is here only because every header file already includes this one.
+//    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
+//    <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+//    that will always return failure (and set errno to ENOSYS).
+// This file is automatically generated.
+//    This file selects the right generated file of `__stub_FUNCTION' macros
+//    based on the architecture being compiled for.
+
+// This file is automatically generated.
+//    It defines a symbol `__stub_FUNCTION' for each function
+//    in the C library which is a stub, meaning it will fail
+//    every time called, usually setting errno to ENOSYS.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Seconds since the Epoch, visible to user code when time_t is too
+//    narrow only for consistency with the old way of widening too-narrow
+//    types.  User code should never use __time64_t.
+
+// Signal number definitions.  Linux version.
+//    Copyright (C) 1995-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Signal number constants.  Generic template.
+//    Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Fake signal functions.
+
+// We define here all the signal names listed in POSIX (1003.1-2008);
+//    as of 1003.1-2013, no additional signals have been added by POSIX.
+//    We also define here signal names that historically exist in every
+//    real-world POSIX variant (e.g. SIGWINCH).
+//
+//    Signals in the 1-15 range are defined with their historical numbers.
+//    For other signals, we use the BSD numbers.
+//    There are two unallocated signal numbers in the 1-31 range: 7 and 29.
+//    Signal number 0 is reserved for use as kill(pid, 0), to test whether
+//    a process exists without sending it a signal.
+
+// ISO C99 signals.
+
+// Historical signals specified by POSIX.
+
+// New(er) POSIX signals (1003.1-2008, 1003.1-2013).
+
+// Nonstandard signals found in all modern POSIX systems
+//    (including both BSD and Linux).
+
+// Archaic names for compatibility.
+
+// Not all systems support real-time signals.  bits/signum.h indicates
+//    that they are supported by overriding __SIGRTMAX to a value greater
+//    than __SIGRTMIN.  These constants give the kernel-level hard limits,
+//    but some real-time signals may be used internally by glibc.  Do not
+//    use these constants in application code; use SIGRTMIN and SIGRTMAX
+//    (defined in signal.h) instead.
+
+// Biggest signal number + 1 (including real-time signals).
+
+// Adjustments and additions to the signal number constants for
+//    most Linux systems.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// An integral type that can be modified atomically, without the
+//
+//	possibility of a signal arriving in the middle of the operation.
+type Sig_atomic_t = X__sig_atomic_t /* sig_atomic_t.h:8:24 */
+
+type X__sigset_t = struct{ F__val [16]uint64 } /* __sigset_t.h:8:3 */
+
+// A set of signals to be blocked, unblocked, or waited for.
+type Sigset_t = X__sigset_t /* sigset_t.h:7:20 */
+
+type Pid_t = X__pid_t /* signal.h:40:17 */
+type Uid_t = X__uid_t /* signal.h:46:17 */
+
+// We need `struct timespec' later on.
+// NB: Include guard matches what <linux/time.h> uses.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Endian macros for string.h functions
+//    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+// Definitions for byte order, according to significance of bytes,
+//    from low addresses to high addresses.  The value is what you get by
+//    putting '4' in the most significant byte, '3' in the second most
+//    significant byte, '2' in the second least significant byte, and '1'
+//    in the least significant byte, and then writing down one digit for
+//    each byte, starting with the byte at the lowest address at the left,
+//    and proceeding to the byte with the highest address at the right.
+
+// This file defines `__BYTE_ORDER' for the particular machine.
+
+// i386/x86_64 are little-endian.
+
+// Some machines may need to use a different endianness for floating point
+//    values.
+
+// POSIX.1b structure for a time value.  This is like a `struct timeval' but
+//
+//	has nanoseconds instead of microseconds.
+type Timespec = struct {
+	Ftv_sec  X__time_t
+	Ftv_nsec X__syscall_slong_t
+} /* struct_timespec.h:10:1 */
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Define __sigval_t.
+//    Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Type for data associated with a signal.
+type Sigval = struct {
+	F__ccgo_pad1 [0]uint64
+	Fsival_int   int32
+	F__ccgo_pad2 [4]byte
+} /* __sigval_t.h:24:1 */
+
+type X__sigval_t = Sigval /* __sigval_t.h:30:22 */
+
+// Some fields of siginfo_t have architecture-specific variations.
+// Architecture-specific adjustments to siginfo_t.  x86 version.
+
+type Siginfo_t = struct {
+	Fsi_signo  int32
+	Fsi_errno  int32
+	Fsi_code   int32
+	F__pad0    int32
+	F_sifields struct {
+		F__ccgo_pad1 [0]uint64
+		F_pad        [28]int32
+	}
+} /* siginfo_t.h:124:5 */
+
+// Architectures might also add architecture-specific constants.
+//    These are all considered GNU extensions.
+
+// Define __sigval_t.
+//    Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// To avoid sigval_t (not a standard type name) having C++ name
+//    mangling depending on whether the selected standard includes union
+//    sigval, it should not be defined at all when using a standard for
+//    which the sigval name is not reserved; in that case, headers should
+//    not include <bits/types/sigval_t.h> and should use only the
+//    internal __sigval_t name.
+
+type Sigval_t = X__sigval_t /* sigval_t.h:16:20 */
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Define __sigval_t.
+//    Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Forward declaration.
+type Pthread_attr_t1 = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [56]int8
+} /* sigevent_t.h:17:9 */
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Define __sigval_t.
+//    Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Forward declaration.
+type Pthread_attr_t = Pthread_attr_t1 /* sigevent_t.h:17:30 */
+
+// Structure to transport application-defined values with signals.
+type Sigevent = struct {
+	Fsigev_value  X__sigval_t
+	Fsigev_signo  int32
+	Fsigev_notify int32
+	F_sigev_un    struct {
+		F__ccgo_pad1 [0]uint64
+		F_pad        [12]int32
+	}
+} /* sigevent_t.h:22:9 */
+
+// Structure to transport application-defined values with signals.
+type Sigevent_t = Sigevent /* sigevent_t.h:42:5 */
+
+// Type of a signal handler.
+type X__sighandler_t = uintptr /* signal.h:72:14 */
+
+// 4.4 BSD uses the name `sig_t' for this.
+type Sig_t = X__sighandler_t /* signal.h:190:24 */
+
+// Get the system-specific definitions of `struct sigaction'
+//    and the `SA_*' and `SIG_*'. constants.
+// The proper definitions for Linux's sigaction.
+//    Copyright (C) 1993-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Structure describing the action to be taken when a signal arrives.
+type Sigaction = struct {
+	F__sigaction_handler struct{ Fsa_handler X__sighandler_t }
+	Fsa_mask             X__sigset_t
+	Fsa_flags            int32
+	F__ccgo_pad1         [4]byte
+	Fsa_restorer         uintptr
+} /* sigaction.h:27:1 */
+
+// Get machine-dependent `struct sigcontext' and signal subcodes.
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+type X_fpx_sw_bytes = struct {
+	Fmagic1            X__uint32_t
+	Fextended_size     X__uint32_t
+	Fxstate_bv         X__uint64_t
+	Fxstate_size       X__uint32_t
+	F__glibc_reserved1 [7]X__uint32_t
+} /* sigcontext.h:31:1 */
+
+type X_fpreg = struct {
+	Fsignificand [4]uint16
+	Fexponent    uint16
+} /* sigcontext.h:40:1 */
+
+type X_fpxreg = struct {
+	Fsignificand       [4]uint16
+	Fexponent          uint16
+	F__glibc_reserved1 [3]uint16
+} /* sigcontext.h:46:1 */
+
+type X_xmmreg = struct{ Felement [4]X__uint32_t } /* sigcontext.h:53:1 */
+
+type X_fpstate = struct {
+	Fcwd       X__uint16_t
+	Fswd       X__uint16_t
+	Fftw       X__uint16_t
+	Ffop       X__uint16_t
+	Frip       X__uint64_t
+	Frdp       X__uint64_t
+	Fmxcsr     X__uint32_t
+	Fmxcr_mask X__uint32_t
+	F_st       [8]struct {
+		Fsignificand       [4]uint16
+		Fexponent          uint16
+		F__glibc_reserved1 [3]uint16
+	}
+	F_xmm              [16]struct{ Felement [4]X__uint32_t }
+	F__glibc_reserved1 [24]X__uint32_t
+} /* sigcontext.h:123:1 */
+
+type Sigcontext = struct {
+	Fr8          X__uint64_t
+	Fr9          X__uint64_t
+	Fr10         X__uint64_t
+	Fr11         X__uint64_t
+	Fr12         X__uint64_t
+	Fr13         X__uint64_t
+	Fr14         X__uint64_t
+	Fr15         X__uint64_t
+	Frdi         X__uint64_t
+	Frsi         X__uint64_t
+	Frbp         X__uint64_t
+	Frbx         X__uint64_t
+	Frdx         X__uint64_t
+	Frax         X__uint64_t
+	Frcx         X__uint64_t
+	Frsp         X__uint64_t
+	Frip         X__uint64_t
+	Feflags      X__uint64_t
+	Fcs          uint16
+	Fgs          uint16
+	Ffs          uint16
+	F__pad0      uint16
+	Ferr         X__uint64_t
+	Ftrapno      X__uint64_t
+	Foldmask     X__uint64_t
+	Fcr2         X__uint64_t
+	F__184       struct{ Ffpstate uintptr }
+	F__reserved1 [8]X__uint64_t
+} /* sigcontext.h:139:1 */
+
+type X_xsave_hdr = struct {
+	Fxstate_bv         X__uint64_t
+	F__glibc_reserved1 [2]X__uint64_t
+	F__glibc_reserved2 [5]X__uint64_t
+} /* sigcontext.h:177:1 */
+
+type X_ymmh_state = struct{ Fymmh_space [64]X__uint32_t } /* sigcontext.h:184:1 */
+
+type X_xstate = struct {
+	Ffpstate struct {
+		Fcwd       X__uint16_t
+		Fswd       X__uint16_t
+		Fftw       X__uint16_t
+		Ffop       X__uint16_t
+		Frip       X__uint64_t
+		Frdp       X__uint64_t
+		Fmxcsr     X__uint32_t
+		Fmxcr_mask X__uint32_t
+		F_st       [8]struct {
+			Fsignificand       [4]uint16
+			Fexponent          uint16
+			F__glibc_reserved1 [3]uint16
+		}
+		F_xmm              [16]struct{ Felement [4]X__uint32_t }
+		F__glibc_reserved1 [24]X__uint32_t
+	}
+	Fxstate_hdr struct {
+		Fxstate_bv         X__uint64_t
+		F__glibc_reserved1 [2]X__uint64_t
+		F__glibc_reserved2 [5]X__uint64_t
+	}
+	Fymmh struct{ Fymmh_space [64]X__uint32_t }
+} /* sigcontext.h:189:1 */
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// Define stack_t.  Linux version.
+//    Copyright (C) 1998-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
+//
+// This file is part of GCC.
+//
+// GCC is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// GCC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+//
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+// ISO C Standard:  7.17  Common definitions  <stddef.h>
+
+// Any one of these symbols __need_* means that GNU libc
+//    wants us just to define one data type.  So don't define
+//    the symbols that indicate this file's entire job has been done.
+
+// This avoids lossage on SunOS but only if stdtypes.h comes first.
+//    There's no way to win with the other order!  Sun lossage.
+
+// Sequent's header files use _PTRDIFF_T_ in some conflicting way.
+//    Just ignore it.
+
+// On VxWorks, <type/vxTypesBase.h> may have defined macros like
+//    _TYPE_size_t which will typedef size_t.  fixincludes patched the
+//    vxTypesBase.h so that this macro is only defined if _GCC_SIZE_T is
+//    not defined, and so that defining this macro defines _GCC_SIZE_T.
+//    If we find that the macros are still defined at this point, we must
+//    invoke them so that the type is defined as expected.
+
+// In case nobody has defined these types, but we aren't running under
+//    GCC 2.00, make sure that __PTRDIFF_TYPE__, __SIZE_TYPE__, and
+//    __WCHAR_TYPE__ have reasonable values.  This can happen if the
+//    parts of GCC is compiled by an older compiler, that actually
+//    include gstddef.h, such as collect2.
+
+// Signed type of difference of two pointers.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Unsigned type of `sizeof' something.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// Structure describing a signal stack.
+type Stack_t = struct {
+	Fss_sp       uintptr
+	Fss_flags    int32
+	F__ccgo_pad1 [4]byte
+	Fss_size     Size_t
+} /* stack_t.h:31:5 */
+
+// This will define `ucontext_t' and `mcontext_t'.
+// Copyright (C) 2001-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Define stack_t.  Linux version.
+//    Copyright (C) 1998-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Type for general register.
+type Greg_t = int64 /* ucontext.h:37:37 */
+
+// Number of general registers.
+
+// Container for all general registers.
+type Gregset_t = [23]Greg_t /* ucontext.h:46:16 */
+
+type X_libc_fpxreg = struct {
+	Fsignificand       [4]uint16
+	Fexponent          uint16
+	F__glibc_reserved1 [3]uint16
+} /* ucontext.h:101:1 */
+
+type X_libc_xmmreg = struct{ Felement [4]X__uint32_t } /* ucontext.h:108:1 */
+
+type X_libc_fpstate = struct {
+	Fcwd       X__uint16_t
+	Fswd       X__uint16_t
+	Fftw       X__uint16_t
+	Ffop       X__uint16_t
+	Frip       X__uint64_t
+	Frdp       X__uint64_t
+	Fmxcsr     X__uint32_t
+	Fmxcr_mask X__uint32_t
+	F_st       [8]struct {
+		Fsignificand       [4]uint16
+		Fexponent          uint16
+		F__glibc_reserved1 [3]uint16
+	}
+	F_xmm              [16]struct{ Felement [4]X__uint32_t }
+	F__glibc_reserved1 [24]X__uint32_t
+} /* ucontext.h:113:1 */
+
+// Structure to describe FPU registers.
+type Fpregset_t = uintptr /* ucontext.h:130:30 */
+
+// Context to describe whole processor state.
+type Mcontext_t = struct {
+	Fgregs       Gregset_t
+	Ffpregs      Fpregset_t
+	F__reserved1 [8]uint64
+} /* ucontext.h:139:3 */
+
+// Userlevel context.
+type Ucontext_t1 = struct {
+	Fuc_flags     uint64
+	Fuc_link      uintptr
+	Fuc_stack     Stack_t
+	Fuc_mcontext  Mcontext_t
+	Fuc_sigmask   Sigset_t
+	F__fpregs_mem struct {
+		Fcwd       X__uint16_t
+		Fswd       X__uint16_t
+		Fftw       X__uint16_t
+		Ffop       X__uint16_t
+		Frip       X__uint64_t
+		Frdp       X__uint64_t
+		Fmxcsr     X__uint32_t
+		Fmxcr_mask X__uint32_t
+		F_st       [8]struct {
+			Fsignificand       [4]uint16
+			Fexponent          uint16
+			F__glibc_reserved1 [3]uint16
+		}
+		F_xmm              [16]struct{ Felement [4]X__uint32_t }
+		F__glibc_reserved1 [24]X__uint32_t
+	}
+	F__ssp [4]uint64
+} /* ucontext.h:142:9 */
+
+// Userlevel context.
+type Ucontext_t = Ucontext_t1 /* ucontext.h:151:5 */
+
+// Define struct sigstack.
+//    Copyright (C) 1998-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Structure describing a signal stack (obsolete).
+type Sigstack = struct {
+	Fss_sp       uintptr
+	Fss_onstack  int32
+	F__ccgo_pad1 [4]byte
+} /* struct_sigstack.h:23:1 */
+
+// Some of the functions for handling signals in threaded programs must
+//    be defined here.
+// Declaration of common pthread types for all architectures.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For internal mutex and condition variable definitions.
+// Common threading primitives definitions for both POSIX and C11.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Arch-specific definitions.  Each architecture must define the following
+//    macros to define the expected sizes of pthread data types:
+//
+//    __SIZEOF_PTHREAD_ATTR_T        - size of pthread_attr_t.
+//    __SIZEOF_PTHREAD_MUTEX_T       - size of pthread_mutex_t.
+//    __SIZEOF_PTHREAD_MUTEXATTR_T   - size of pthread_mutexattr_t.
+//    __SIZEOF_PTHREAD_COND_T        - size of pthread_cond_t.
+//    __SIZEOF_PTHREAD_CONDATTR_T    - size of pthread_condattr_t.
+//    __SIZEOF_PTHREAD_RWLOCK_T      - size of pthread_rwlock_t.
+//    __SIZEOF_PTHREAD_RWLOCKATTR_T  - size of pthread_rwlockattr_t.
+//    __SIZEOF_PTHREAD_BARRIER_T     - size of pthread_barrier_t.
+//    __SIZEOF_PTHREAD_BARRIERATTR_T - size of pthread_barrierattr_t.
+//
+//    The additional macro defines any constraint for the lock alignment
+//    inside the thread structures:
+//
+//    __LOCK_ALIGNMENT - for internal lock/futex usage.
+//
+//    Same idea but for the once locking primitive:
+//
+//    __ONCE_ALIGNMENT - for pthread_once_t/once_flag definition.
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Common definition of pthread_mutex_t.
+
+type X__pthread_internal_list = struct {
+	F__prev uintptr
+	F__next uintptr
+} /* thread-shared-types.h:49:9 */
+
+// Some of the functions for handling signals in threaded programs must
+//    be defined here.
+// Declaration of common pthread types for all architectures.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For internal mutex and condition variable definitions.
+// Common threading primitives definitions for both POSIX and C11.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Arch-specific definitions.  Each architecture must define the following
+//    macros to define the expected sizes of pthread data types:
+//
+//    __SIZEOF_PTHREAD_ATTR_T        - size of pthread_attr_t.
+//    __SIZEOF_PTHREAD_MUTEX_T       - size of pthread_mutex_t.
+//    __SIZEOF_PTHREAD_MUTEXATTR_T   - size of pthread_mutexattr_t.
+//    __SIZEOF_PTHREAD_COND_T        - size of pthread_cond_t.
+//    __SIZEOF_PTHREAD_CONDATTR_T    - size of pthread_condattr_t.
+//    __SIZEOF_PTHREAD_RWLOCK_T      - size of pthread_rwlock_t.
+//    __SIZEOF_PTHREAD_RWLOCKATTR_T  - size of pthread_rwlockattr_t.
+//    __SIZEOF_PTHREAD_BARRIER_T     - size of pthread_barrier_t.
+//    __SIZEOF_PTHREAD_BARRIERATTR_T - size of pthread_barrierattr_t.
+//
+//    The additional macro defines any constraint for the lock alignment
+//    inside the thread structures:
+//
+//    __LOCK_ALIGNMENT - for internal lock/futex usage.
+//
+//    Same idea but for the once locking primitive:
+//
+//    __ONCE_ALIGNMENT - for pthread_once_t/once_flag definition.
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Common definition of pthread_mutex_t.
+
+type X__pthread_list_t = X__pthread_internal_list /* thread-shared-types.h:53:3 */
+
+type X__pthread_internal_slist = struct{ F__next uintptr } /* thread-shared-types.h:55:9 */
+
+type X__pthread_slist_t = X__pthread_internal_slist /* thread-shared-types.h:58:3 */
+
+// Arch-specific mutex definitions.  A generic implementation is provided
+//    by sysdeps/nptl/bits/struct_mutex.h.  If required, an architecture
+//    can override it by defining:
+//
+//    1. struct __pthread_mutex_s (used on both pthread_mutex_t and mtx_t
+//       definition).  It should contains at least the internal members
+//       defined in the generic version.
+//
+//    2. __LOCK_ALIGNMENT for any extra attribute for internal lock used with
+//       atomic operations.
+//
+//    3. The macro __PTHREAD_MUTEX_INITIALIZER used for static initialization.
+//       It should initialize the mutex internal flag.
+
+// x86 internal mutex struct definitions.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+type X__pthread_mutex_s = struct {
+	F__lock    int32
+	F__count   uint32
+	F__owner   int32
+	F__nusers  uint32
+	F__kind    int32
+	F__spins   int16
+	F__elision int16
+	F__list    X__pthread_list_t
+} /* struct_mutex.h:22:1 */
+
+// Arch-sepecific read-write lock definitions.  A generic implementation is
+//    provided by struct_rwlock.h.  If required, an architecture can override it
+//    by defining:
+//
+//    1. struct __pthread_rwlock_arch_t (used on pthread_rwlock_t definition).
+//       It should contain at least the internal members defined in the
+//       generic version.
+//
+//    2. The macro __PTHREAD_RWLOCK_INITIALIZER used for static initialization.
+//       It should initialize the rwlock internal type.
+
+// x86 internal rwlock struct definitions.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+type X__pthread_rwlock_arch_t = struct {
+	F__readers       uint32
+	F__writers       uint32
+	F__wrphase_futex uint32
+	F__writers_futex uint32
+	F__pad3          uint32
+	F__pad4          uint32
+	F__cur_writer    int32
+	F__shared        int32
+	F__rwelision     int8
+	F__pad1          [7]uint8
+	F__pad2          uint64
+	F__flags         uint32
+	F__ccgo_pad1     [4]byte
+} /* struct_rwlock.h:23:1 */
+
+// Common definition of pthread_cond_t.
+
+type X__pthread_cond_s = struct {
+	F__0            struct{ F__wseq uint64 }
+	F__8            struct{ F__g1_start uint64 }
+	F__g_refs       [2]uint32
+	F__g_size       [2]uint32
+	F__g1_orig_size uint32
+	F__wrefs        uint32
+	F__g_signals    [2]uint32
+} /* thread-shared-types.h:92:1 */
+
+// Thread identifiers.  The structure of the attribute type is not
+//
+//	exposed on purpose.
+type Pthread_t = uint64 /* pthreadtypes.h:27:27 */
+
+// Data structures for mutex handling.  The structure of the attribute
+//
+//	type is not exposed on purpose.
+type Pthread_mutexattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:36:3 */
+
+// Data structure for condition variable handling.  The structure of
+//
+//	the attribute type is not exposed on purpose.
+type Pthread_condattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:45:3 */
+
+// Keys for thread-specific data
+type Pthread_key_t = uint32 /* pthreadtypes.h:49:22 */
+
+// Once-only execution
+type Pthread_once_t = int32 /* pthreadtypes.h:53:30 */
+
+type Pthread_mutex_t = struct{ F__data X__pthread_mutex_s } /* pthreadtypes.h:72:3 */
+
+type Pthread_cond_t = struct{ F__data X__pthread_cond_s } /* pthreadtypes.h:80:3 */
+
+// Data structure for reader-writer lock variable handling.  The
+//
+//	structure of the attribute type is deliberately not exposed.
+type Pthread_rwlock_t = struct{ F__data X__pthread_rwlock_arch_t } /* pthreadtypes.h:91:3 */
+
+type Pthread_rwlockattr_t = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [8]int8
+} /* pthreadtypes.h:97:3 */
+
+// POSIX spinlock data type.
+type Pthread_spinlock_t = int32 /* pthreadtypes.h:103:22 */
+
+// POSIX barriers data type.  The structure of the type is
+//
+//	deliberately not exposed.
+type Pthread_barrier_t = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [32]int8
+} /* pthreadtypes.h:112:3 */
+
+type Pthread_barrierattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:118:3 */
+
+// System-specific extensions.
+// System-specific extensions of <signal.h>, Linux version.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/stdio/capi_linux_loong64.go b/vendor/modernc.org/libc/stdio/capi_linux_loong64.go
new file mode 100644
index 00000000..e327db42
--- /dev/null
+++ b/vendor/modernc.org/libc/stdio/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo stdio/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o stdio/stdio_linux_amd64.go -pkgname stdio', DO NOT EDIT.
+
+package stdio
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/stdio/stdio_linux_loong64.go b/vendor/modernc.org/libc/stdio/stdio_linux_loong64.go
new file mode 100644
index 00000000..b11d50c8
--- /dev/null
+++ b/vendor/modernc.org/libc/stdio/stdio_linux_loong64.go
@@ -0,0 +1,540 @@
+// Code generated by 'ccgo stdio/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o stdio/stdio_linux_amd64.go -pkgname stdio', DO NOT EDIT.
+
+package stdio
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	BUFSIZ                = 8192   // stdio.h:99:1:
+	EOF                   = -1     // stdio.h:104:1:
+	FILENAME_MAX          = 4096   // stdio_lim.h:27:1:
+	FOPEN_MAX             = 16     // stdio_lim.h:37:1:
+	L_ctermid             = 9      // stdio_lim.h:30:1:
+	L_tmpnam              = 20     // stdio_lim.h:25:1:
+	P_tmpdir              = "/tmp" // stdio.h:120:1:
+	SEEK_CUR              = 1      // stdio.h:110:1:
+	SEEK_END              = 2      // stdio.h:111:1:
+	SEEK_SET              = 0      // stdio.h:109:1:
+	TMP_MAX               = 238328 // stdio_lim.h:26:1:
+	X_ATFILE_SOURCE       = 1      // features.h:342:1:
+	X_BITS_STDIO_LIM_H    = 1      // stdio_lim.h:19:1:
+	X_BITS_TIME64_H       = 1      // time64.h:24:1:
+	X_BITS_TYPESIZES_H    = 1      // typesizes.h:24:1:
+	X_BITS_TYPES_H        = 1      // types.h:24:1:
+	X_BSD_SIZE_T_         = 0      // stddef.h:189:1:
+	X_BSD_SIZE_T_DEFINED_ = 0      // stddef.h:192:1:
+	X_DEFAULT_SOURCE      = 1      // features.h:227:1:
+	X_FEATURES_H          = 1      // features.h:19:1:
+	X_FILE_OFFSET_BITS    = 64     // <builtin>:25:1:
+	X_GCC_SIZE_T          = 0      // stddef.h:195:1:
+	X_IOFBF               = 0      // stdio.h:93:1:
+	X_IOLBF               = 1      // stdio.h:94:1:
+	X_IONBF               = 2      // stdio.h:95:1:
+	X_IO_EOF_SEEN         = 0x0010 // struct_FILE.h:111:1:
+	X_IO_ERR_SEEN         = 0x0020 // struct_FILE.h:114:1:
+	X_IO_USER_LOCK        = 0x8000 // struct_FILE.h:117:1:
+	X_LP64                = 1      // <predefined>:284:1:
+	X_POSIX_C_SOURCE      = 200809 // features.h:281:1:
+	X_POSIX_SOURCE        = 1      // features.h:279:1:
+	X_SIZET_              = 0      // stddef.h:196:1:
+	X_SIZE_T              = 0      // stddef.h:183:1:
+	X_SIZE_T_             = 0      // stddef.h:188:1:
+	X_SIZE_T_DECLARED     = 0      // stddef.h:193:1:
+	X_SIZE_T_DEFINED      = 0      // stddef.h:191:1:
+	X_SIZE_T_DEFINED_     = 0      // stddef.h:190:1:
+	X_STDC_PREDEF_H       = 1      // <predefined>:162:1:
+	X_STDIO_H             = 1      // stdio.h:24:1:
+	X_SYS_CDEFS_H         = 1      // cdefs.h:19:1:
+	X_SYS_SIZE_T_H        = 0      // stddef.h:184:1:
+	X_T_SIZE              = 0      // stddef.h:186:1:
+	X_T_SIZE_             = 0      // stddef.h:185:1:
+	X_VA_LIST_DEFINED     = 0      // stdio.h:53:1:
+	Linux                 = 1      // <predefined>:231:1:
+	Unix                  = 1      // <predefined>:177:1:
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
+//
+// This file is part of GCC.
+//
+// GCC is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// GCC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+//
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+// ISO C Standard:  7.15  Variable arguments  <stdarg.h>
+
+// Define __gnuc_va_list.
+
+type X__gnuc_va_list = X__builtin_va_list /* stdarg.h:40:27 */
+
+// Define the standard macros for the user,
+//    if this invocation was from the user program.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Seconds since the Epoch, visible to user code when time_t is too
+//    narrow only for consistency with the old way of widening too-narrow
+//    types.  User code should never use __time64_t.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Integral type unchanged by default argument promotions that can
+//    hold any value corresponding to members of the extended character
+//    set, as well as at least one value that does not correspond to any
+//    member of the extended character set.
+
+// Conversion state information.
+type X__mbstate_t = struct {
+	F__count int32
+	F__value struct{ F__wch uint32 }
+} /* __mbstate_t.h:21:3 */
+
+// The tag name of this struct is _G_fpos_t to preserve historic
+//
+//	C++ mangled names for functions taking fpos_t arguments.
+//	That name should not be used in new code.
+type X_G_fpos_t = struct {
+	F__pos   X__off_t
+	F__state X__mbstate_t
+} /* __fpos_t.h:10:9 */
+
+// The tag name of this struct is _G_fpos_t to preserve historic
+//
+//	C++ mangled names for functions taking fpos_t arguments.
+//	That name should not be used in new code.
+type X__fpos_t = X_G_fpos_t /* __fpos_t.h:14:3 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// The tag name of this struct is _G_fpos64_t to preserve historic
+//
+//	C++ mangled names for functions taking fpos_t and/or fpos64_t
+//	arguments.  That name should not be used in new code.
+type X_G_fpos64_t = struct {
+	F__pos   X__off64_t
+	F__state X__mbstate_t
+} /* __fpos64_t.h:10:9 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// The tag name of this struct is _G_fpos64_t to preserve historic
+//
+//	C++ mangled names for functions taking fpos_t and/or fpos64_t
+//	arguments.  That name should not be used in new code.
+type X__fpos64_t = X_G_fpos64_t /* __fpos64_t.h:14:3 */
+
+type X_IO_FILE = struct {
+	F_flags          int32
+	F__ccgo_pad1     [4]byte
+	F_IO_read_ptr    uintptr
+	F_IO_read_end    uintptr
+	F_IO_read_base   uintptr
+	F_IO_write_base  uintptr
+	F_IO_write_ptr   uintptr
+	F_IO_write_end   uintptr
+	F_IO_buf_base    uintptr
+	F_IO_buf_end     uintptr
+	F_IO_save_base   uintptr
+	F_IO_backup_base uintptr
+	F_IO_save_end    uintptr
+	F_markers        uintptr
+	F_chain          uintptr
+	F_fileno         int32
+	F_flags2         int32
+	F_old_offset     X__off_t
+	F_cur_column     uint16
+	F_vtable_offset  int8
+	F_shortbuf       [1]int8
+	F__ccgo_pad2     [4]byte
+	F_lock           uintptr
+	F_offset         X__off64_t
+	F_codecvt        uintptr
+	F_wide_data      uintptr
+	F_freeres_list   uintptr
+	F_freeres_buf    uintptr
+	F__pad5          Size_t
+	F_mode           int32
+	F_unused2        [20]int8
+} /* __FILE.h:4:1 */
+
+type X__FILE = X_IO_FILE /* __FILE.h:5:25 */
+
+// The opaque type of streams.  This is the definition used elsewhere.
+type FILE = X_IO_FILE /* FILE.h:7:25 */
+
+// These macros are used by bits/stdio.h and internal headers.
+
+// Many more flag bits are defined internally.
+
+type Va_list = X__gnuc_va_list /* stdio.h:52:24 */
+
+type Off_t = X__off64_t /* stdio.h:65:19 */
+
+type Ssize_t = X__ssize_t /* stdio.h:77:19 */
+
+// The type of the second argument to `fgetpos' and `fsetpos'.
+type Fpos_t = X__fpos64_t /* stdio.h:86:20 */
+
+// If we are compiling with optimizing read this file.  It contains
+//    several optimizing inline functions and macros.
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/stdlib/capi_linux_loong64.go b/vendor/modernc.org/libc/stdlib/capi_linux_loong64.go
new file mode 100644
index 00000000..bc0091ea
--- /dev/null
+++ b/vendor/modernc.org/libc/stdlib/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo stdlib/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o stdlib/stdlib_linux_amd64.go -pkgname stdlib', DO NOT EDIT.
+
+package stdlib
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/stdlib/stdlib_linux_loong64.go b/vendor/modernc.org/libc/stdlib/stdlib_linux_loong64.go
new file mode 100644
index 00000000..242876b7
--- /dev/null
+++ b/vendor/modernc.org/libc/stdlib/stdlib_linux_loong64.go
@@ -0,0 +1,1541 @@
+// Code generated by 'ccgo stdlib/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o stdlib/stdlib_linux_amd64.go -pkgname stdlib', DO NOT EDIT.
+
+package stdlib
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	BIG_ENDIAN                   = 4321       // endian.h:28:1:
+	BYTE_ORDER                   = 1234       // endian.h:30:1:
+	EXIT_FAILURE                 = 1          // stdlib.h:91:1:
+	EXIT_SUCCESS                 = 0          // stdlib.h:92:1:
+	FD_SETSIZE                   = 1024       // select.h:73:1:
+	LITTLE_ENDIAN                = 1234       // endian.h:27:1:
+	PDP_ENDIAN                   = 3412       // endian.h:29:1:
+	RAND_MAX                     = 2147483647 // stdlib.h:86:1:
+	WCONTINUED                   = 8          // waitflags.h:32:1:
+	WEXITED                      = 4          // waitflags.h:31:1:
+	WNOHANG                      = 1          // waitflags.h:25:1:
+	WNOWAIT                      = 0x01000000 // waitflags.h:33:1:
+	WSTOPPED                     = 2          // waitflags.h:30:1:
+	WUNTRACED                    = 2          // waitflags.h:26:1:
+	X_ALLOCA_H                   = 1          // alloca.h:19:1:
+	X_ATFILE_SOURCE              = 1          // features.h:342:1:
+	X_BITS_BYTESWAP_H            = 1          // byteswap.h:24:1:
+	X_BITS_ENDIANNESS_H          = 1          // endianness.h:2:1:
+	X_BITS_ENDIAN_H              = 1          // endian.h:20:1:
+	X_BITS_FLOATN_COMMON_H       = 0          // floatn-common.h:21:1:
+	X_BITS_FLOATN_H              = 0          // floatn.h:20:1:
+	X_BITS_PTHREADTYPES_ARCH_H   = 1          // pthreadtypes-arch.h:19:1:
+	X_BITS_PTHREADTYPES_COMMON_H = 1          // pthreadtypes.h:20:1:
+	X_BITS_STDINT_INTN_H         = 1          // stdint-intn.h:20:1:
+	X_BITS_TIME64_H              = 1          // time64.h:24:1:
+	X_BITS_TYPESIZES_H           = 1          // typesizes.h:24:1:
+	X_BITS_TYPES_H               = 1          // types.h:24:1:
+	X_BITS_UINTN_IDENTITY_H      = 1          // uintn-identity.h:24:1:
+	X_BSD_SIZE_T_                = 0          // stddef.h:189:1:
+	X_BSD_SIZE_T_DEFINED_        = 0          // stddef.h:192:1:
+	X_DEFAULT_SOURCE             = 1          // features.h:227:1:
+	X_ENDIAN_H                   = 1          // endian.h:19:1:
+	X_FEATURES_H                 = 1          // features.h:19:1:
+	X_FILE_OFFSET_BITS           = 64         // <builtin>:25:1:
+	X_GCC_SIZE_T                 = 0          // stddef.h:195:1:
+	X_GCC_WCHAR_T                = 0          // stddef.h:273:1:
+	X_LP64                       = 1          // <predefined>:284:1:
+	X_POSIX_C_SOURCE             = 200809     // features.h:281:1:
+	X_POSIX_SOURCE               = 1          // features.h:279:1:
+	X_RWLOCK_INTERNAL_H          = 0          // struct_rwlock.h:21:1:
+	X_SIZET_                     = 0          // stddef.h:196:1:
+	X_SIZE_T                     = 0          // stddef.h:183:1:
+	X_SIZE_T_                    = 0          // stddef.h:188:1:
+	X_SIZE_T_DECLARED            = 0          // stddef.h:193:1:
+	X_SIZE_T_DEFINED             = 0          // stddef.h:191:1:
+	X_SIZE_T_DEFINED_            = 0          // stddef.h:190:1:
+	X_STDC_PREDEF_H              = 1          // <predefined>:162:1:
+	X_STDLIB_H                   = 1          // stdlib.h:35:1:
+	X_STRUCT_TIMESPEC            = 1          // struct_timespec.h:3:1:
+	X_SYS_CDEFS_H                = 1          // cdefs.h:19:1:
+	X_SYS_SELECT_H               = 1          // select.h:22:1:
+	X_SYS_SIZE_T_H               = 0          // stddef.h:184:1:
+	X_SYS_TYPES_H                = 1          // types.h:23:1:
+	X_THREAD_MUTEX_INTERNAL_H    = 1          // struct_mutex.h:20:1:
+	X_THREAD_SHARED_TYPES_H      = 1          // thread-shared-types.h:20:1:
+	X_T_SIZE                     = 0          // stddef.h:186:1:
+	X_T_SIZE_                    = 0          // stddef.h:185:1:
+	X_T_WCHAR                    = 0          // stddef.h:264:1:
+	X_T_WCHAR_                   = 0          // stddef.h:263:1:
+	X_WCHAR_T                    = 0          // stddef.h:262:1:
+	X_WCHAR_T_                   = 0          // stddef.h:266:1:
+	X_WCHAR_T_DECLARED           = 0          // stddef.h:274:1:
+	X_WCHAR_T_DEFINED            = 0          // stddef.h:269:1:
+	X_WCHAR_T_DEFINED_           = 0          // stddef.h:268:1:
+	X_WCHAR_T_H                  = 0          // stddef.h:270:1:
+	Linux                        = 1          // <predefined>:231:1:
+	Unix                         = 1          // <predefined>:177:1:
+)
+
+// A null pointer constant.
+
+// XPG requires a few symbols from <sys/wait.h> being defined.
+// Definitions of flag bits for `waitpid' et al.
+//    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Bits in the third argument to `waitpid'.
+
+// Bits in the fourth argument to `waitid'.
+
+// The following values are used by the `waitid' function.
+
+// The Linux kernel defines these bare, rather than an enum,
+//    which causes a conflict if the include order is reversed.
+
+const ( /* waitflags.h:52:1: */
+	P_ALL  = 0 // Wait for any child.
+	P_PID  = 1 // Wait for specified process.
+	P_PGID = 2
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// A null pointer constant.
+
+// XPG requires a few symbols from <sys/wait.h> being defined.
+// Definitions of flag bits for `waitpid' et al.
+//    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Bits in the third argument to `waitpid'.
+
+// Bits in the fourth argument to `waitid'.
+
+// The following values are used by the `waitid' function.
+
+// The Linux kernel defines these bare, rather than an enum,
+//    which causes a conflict if the include order is reversed.
+
+type Idtype_t = uint32 /* waitflags.h:57:3 */
+// Definitions of status bits for `wait' et al.
+//    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Everything extant so far uses these same bits.
+
+// If WIFEXITED(STATUS), the low-order 8 bits of the status.
+
+// If WIFSIGNALED(STATUS), the terminating signal.
+
+// If WIFSTOPPED(STATUS), the signal that stopped the child.
+
+// Nonzero if STATUS indicates normal termination.
+
+// Nonzero if STATUS indicates termination by a signal.
+
+// Nonzero if STATUS indicates the child is stopped.
+
+// Nonzero if STATUS indicates the child continued after a stop.  We only
+//    define this if <bits/waitflags.h> provides the WCONTINUED flag bit.
+
+// Nonzero if STATUS indicates the child dumped core.
+
+// Macros for constructing status values.
+
+// Define the macros <sys/wait.h> also would define this way.
+
+// _FloatN API tests for enablement.
+// Macros to control TS 18661-3 glibc features on x86.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Defined to 1 if the current compiler invocation provides a
+//    floating-point type with the IEEE 754 binary128 format, and this
+//    glibc includes corresponding *f128 interfaces for it.  The required
+//    libgcc support was added some time after the basic compiler
+//    support, for x86_64 and x86.
+
+// Defined to 1 if __HAVE_FLOAT128 is 1 and the type is ABI-distinct
+//    from the default float, double and long double types in this glibc.
+
+// Defined to 1 if the current compiler invocation provides a
+//    floating-point type with the right format for _Float64x, and this
+//    glibc includes corresponding *f64x interfaces for it.
+
+// Defined to 1 if __HAVE_FLOAT64X is 1 and _Float64x has the format
+//    of long double.  Otherwise, if __HAVE_FLOAT64X is 1, _Float64x has
+//    the format of _Float128, which must be different from that of long
+//    double.
+
+// Defined to concatenate the literal suffix to be used with _Float128
+//    types, if __HAVE_FLOAT128 is 1.
+
+// Defined to a complex binary128 type if __HAVE_FLOAT128 is 1.
+
+// The remaining of this file provides support for older compilers.
+
+// The type _Float128 exists only since GCC 7.0.
+
+// __builtin_huge_valf128 doesn't exist before GCC 7.0.
+
+// Older GCC has only a subset of built-in functions for _Float128 on
+//    x86, and __builtin_infq is not usable in static initializers.
+//    Converting a narrower sNaN to _Float128 produces a quiet NaN, so
+//    attempts to use _Float128 sNaNs will not work properly with older
+//    compilers.
+
+// In math/math.h, __MATH_TG will expand signbit to __builtin_signbit*,
+//    e.g.: __builtin_signbitf128, before GCC 6.  However, there has never
+//    been a __builtin_signbitf128 in GCC and the type-generic builtin is
+//    only available since GCC 6.
+
+// Macros to control TS 18661-3 glibc features where the same
+//    definitions are appropriate for all platforms.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// This header should be included at the bottom of each bits/floatn.h.
+//    It defines the following macros for each _FloatN and _FloatNx type,
+//    where the same definitions, or definitions based only on the macros
+//    in bits/floatn.h, are appropriate for all glibc configurations.
+
+// Defined to 1 if the current compiler invocation provides a
+//    floating-point type with the right format for this type, and this
+//    glibc includes corresponding *fN or *fNx interfaces for it.
+
+// Defined to 1 if the corresponding __HAVE_<type> macro is 1 and the
+//    type is the first with its format in the sequence of (the default
+//    choices for) float, double, long double, _Float16, _Float32,
+//    _Float64, _Float128, _Float32x, _Float64x, _Float128x for this
+//    glibc; that is, if functions present once per floating-point format
+//    rather than once per type are present for this type.
+//
+//    All configurations supported by glibc have _Float32 the same format
+//    as float, _Float64 and _Float32x the same format as double, the
+//    _Float64x the same format as either long double or _Float128.  No
+//    configurations support _Float128x or, as of GCC 7, have compiler
+//    support for a type meeting the requirements for _Float128x.
+
+// Defined to 1 if the corresponding _FloatN type is not binary compatible
+//    with the corresponding ISO C type in the current compilation unit as
+//    opposed to __HAVE_DISTINCT_FLOATN, which indicates the default types built
+//    in glibc.
+
+// Defined to 1 if any _FloatN or _FloatNx types that are not
+//    ABI-distinct are however distinct types at the C language level (so
+//    for the purposes of __builtin_types_compatible_p and _Generic).
+
+// Defined to concatenate the literal suffix to be used with _FloatN
+//    or _FloatNx types, if __HAVE_<type> is 1.  The corresponding
+//    literal suffixes exist since GCC 7, for C only.
+
+// Defined to a complex type if __HAVE_<type> is 1.
+
+// The remaining of this file provides support for older compilers.
+
+// If double, long double and _Float64 all have the same set of
+//    values, TS 18661-3 requires the usual arithmetic conversions on
+//    long double and _Float64 to produce _Float64.  For this to be the
+//    case when building with a compiler without a distinct _Float64
+//    type, _Float64 must be a typedef for long double, not for
+//    double.
+
+// Returned by `div'.
+type Div_t = struct {
+	Fquot int32
+	Frem  int32
+} /* stdlib.h:62:5 */
+
+// Returned by `ldiv'.
+type Ldiv_t = struct {
+	Fquot int64
+	Frem  int64
+} /* stdlib.h:70:5 */
+
+// Returned by `lldiv'.
+type Lldiv_t = struct {
+	Fquot int64
+	Frem  int64
+} /* stdlib.h:80:5 */
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX Standard: 2.6 Primitive System Data Types	<sys/types.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Seconds since the Epoch, visible to user code when time_t is too
+//    narrow only for consistency with the old way of widening too-narrow
+//    types.  User code should never use __time64_t.
+
+type U_char = X__u_char     /* types.h:33:18 */
+type U_short = X__u_short   /* types.h:34:19 */
+type U_int = X__u_int       /* types.h:35:17 */
+type U_long = X__u_long     /* types.h:36:18 */
+type Quad_t = X__quad_t     /* types.h:37:18 */
+type U_quad_t = X__u_quad_t /* types.h:38:20 */
+type Fsid_t = X__fsid_t     /* types.h:39:18 */
+type Loff_t = X__loff_t     /* types.h:42:18 */
+
+type Ino_t = X__ino64_t /* types.h:49:19 */
+
+type Dev_t = X__dev_t /* types.h:59:17 */
+
+type Gid_t = X__gid_t /* types.h:64:17 */
+
+type Mode_t = X__mode_t /* types.h:69:18 */
+
+type Nlink_t = X__nlink_t /* types.h:74:19 */
+
+type Uid_t = X__uid_t /* types.h:79:17 */
+
+type Off_t = X__off64_t /* types.h:87:19 */
+
+type Pid_t = X__pid_t /* types.h:97:17 */
+
+type Id_t = X__id_t /* types.h:103:16 */
+
+type Ssize_t = X__ssize_t /* types.h:108:19 */
+
+type Daddr_t = X__daddr_t /* types.h:114:19 */
+type Caddr_t = X__caddr_t /* types.h:115:19 */
+
+type Key_t = X__key_t /* types.h:121:17 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `clock'.
+type Clock_t = X__clock_t /* clock_t.h:7:19 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Clock ID used in clock and timer functions.
+type Clockid_t = X__clockid_t /* clockid_t.h:7:21 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `time'.
+type Time_t = X__time_t /* time_t.h:7:18 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Timer ID returned by `timer_create'.
+type Timer_t = X__timer_t /* timer_t.h:7:19 */
+
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
+//
+// This file is part of GCC.
+//
+// GCC is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// GCC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+//
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+// ISO C Standard:  7.17  Common definitions  <stddef.h>
+
+// Any one of these symbols __need_* means that GNU libc
+//    wants us just to define one data type.  So don't define
+//    the symbols that indicate this file's entire job has been done.
+
+// This avoids lossage on SunOS but only if stdtypes.h comes first.
+//    There's no way to win with the other order!  Sun lossage.
+
+// Sequent's header files use _PTRDIFF_T_ in some conflicting way.
+//    Just ignore it.
+
+// On VxWorks, <type/vxTypesBase.h> may have defined macros like
+//    _TYPE_size_t which will typedef size_t.  fixincludes patched the
+//    vxTypesBase.h so that this macro is only defined if _GCC_SIZE_T is
+//    not defined, and so that defining this macro defines _GCC_SIZE_T.
+//    If we find that the macros are still defined at this point, we must
+//    invoke them so that the type is defined as expected.
+
+// In case nobody has defined these types, but we aren't running under
+//    GCC 2.00, make sure that __PTRDIFF_TYPE__, __SIZE_TYPE__, and
+//    __WCHAR_TYPE__ have reasonable values.  This can happen if the
+//    parts of GCC is compiled by an older compiler, that actually
+//    include gstddef.h, such as collect2.
+
+// Signed type of difference of two pointers.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Unsigned type of `sizeof' something.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// Old compatibility names for C types.
+type Ulong = uint64  /* types.h:148:27 */
+type Ushort = uint16 /* types.h:149:28 */
+type Uint = uint32   /* types.h:150:22 */
+
+// These size-specific names are used by some of the inet code.
+
+// Define intN_t types.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+type Int8_t = X__int8_t   /* stdint-intn.h:24:18 */
+type Int16_t = X__int16_t /* stdint-intn.h:25:19 */
+type Int32_t = X__int32_t /* stdint-intn.h:26:19 */
+type Int64_t = X__int64_t /* stdint-intn.h:27:19 */
+
+// These were defined by ISO C without the first `_'.
+type U_int8_t = X__uint8_t   /* types.h:158:19 */
+type U_int16_t = X__uint16_t /* types.h:159:20 */
+type U_int32_t = X__uint32_t /* types.h:160:20 */
+type U_int64_t = X__uint64_t /* types.h:161:20 */
+
+type Register_t = int32 /* types.h:164:13 */
+
+// It also defines `fd_set' and the FD_* macros for `select'.
+// `fd_set' type and related macros, and `select'/`pselect' declarations.
+//    Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX 1003.1g: 6.2 Select from File Descriptor Sets <sys/select.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Get definition of needed basic types.
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Get __FD_* definitions.
+// Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Get sigset_t.
+
+type X__sigset_t = struct{ F__val [16]uint64 } /* __sigset_t.h:8:3 */
+
+// A set of signals to be blocked, unblocked, or waited for.
+type Sigset_t = X__sigset_t /* sigset_t.h:7:20 */
+
+// Get definition of timer specification structures.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// A time value that is accurate to the nearest
+//
+//	microsecond but also has a range of years.
+type Timeval = struct {
+	Ftv_sec  X__time_t
+	Ftv_usec X__suseconds_t
+} /* struct_timeval.h:8:1 */
+
+// NB: Include guard matches what <linux/time.h> uses.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Endian macros for string.h functions
+//    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+// POSIX.1b structure for a time value.  This is like a `struct timeval' but
+//
+//	has nanoseconds instead of microseconds.
+type Timespec = struct {
+	Ftv_sec  X__time_t
+	Ftv_nsec X__syscall_slong_t
+} /* struct_timespec.h:10:1 */
+
+type Suseconds_t = X__suseconds_t /* select.h:43:23 */
+
+// The fd_set member is required to be an array of longs.
+type X__fd_mask = int64 /* select.h:49:18 */
+
+// Some versions of <linux/posix_types.h> define this macros.
+// It's easier to assume 8-bit bytes than to get CHAR_BIT.
+
+// fd_set for select and pselect.
+type Fd_set = struct{ F__fds_bits [16]X__fd_mask } /* select.h:70:5 */
+
+// Maximum number of file descriptors in `fd_set'.
+
+// Sometimes the fd_set member is assumed to have this type.
+type Fd_mask = X__fd_mask /* select.h:77:19 */
+
+// Define some inlines helping to catch common problems.
+
+type Blksize_t = X__blksize_t /* types.h:185:21 */
+
+// Types from the Large File Support interface.
+type Blkcnt_t = X__blkcnt64_t     /* types.h:205:22 */ // Type to count number of disk blocks.
+type Fsblkcnt_t = X__fsblkcnt64_t /* types.h:209:24 */ // Type to count file system blocks.
+type Fsfilcnt_t = X__fsfilcnt64_t /* types.h:213:24 */ // Type to count file system inodes.
+
+// Now add the thread types.
+// Declaration of common pthread types for all architectures.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For internal mutex and condition variable definitions.
+// Common threading primitives definitions for both POSIX and C11.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Arch-specific definitions.  Each architecture must define the following
+//    macros to define the expected sizes of pthread data types:
+//
+//    __SIZEOF_PTHREAD_ATTR_T        - size of pthread_attr_t.
+//    __SIZEOF_PTHREAD_MUTEX_T       - size of pthread_mutex_t.
+//    __SIZEOF_PTHREAD_MUTEXATTR_T   - size of pthread_mutexattr_t.
+//    __SIZEOF_PTHREAD_COND_T        - size of pthread_cond_t.
+//    __SIZEOF_PTHREAD_CONDATTR_T    - size of pthread_condattr_t.
+//    __SIZEOF_PTHREAD_RWLOCK_T      - size of pthread_rwlock_t.
+//    __SIZEOF_PTHREAD_RWLOCKATTR_T  - size of pthread_rwlockattr_t.
+//    __SIZEOF_PTHREAD_BARRIER_T     - size of pthread_barrier_t.
+//    __SIZEOF_PTHREAD_BARRIERATTR_T - size of pthread_barrierattr_t.
+//
+//    The additional macro defines any constraint for the lock alignment
+//    inside the thread structures:
+//
+//    __LOCK_ALIGNMENT - for internal lock/futex usage.
+//
+//    Same idea but for the once locking primitive:
+//
+//    __ONCE_ALIGNMENT - for pthread_once_t/once_flag definition.
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Common definition of pthread_mutex_t.
+
+type X__pthread_internal_list = struct {
+	F__prev uintptr
+	F__next uintptr
+} /* thread-shared-types.h:49:9 */
+
+// Type to count file system inodes.
+
+// Now add the thread types.
+// Declaration of common pthread types for all architectures.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For internal mutex and condition variable definitions.
+// Common threading primitives definitions for both POSIX and C11.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Arch-specific definitions.  Each architecture must define the following
+//    macros to define the expected sizes of pthread data types:
+//
+//    __SIZEOF_PTHREAD_ATTR_T        - size of pthread_attr_t.
+//    __SIZEOF_PTHREAD_MUTEX_T       - size of pthread_mutex_t.
+//    __SIZEOF_PTHREAD_MUTEXATTR_T   - size of pthread_mutexattr_t.
+//    __SIZEOF_PTHREAD_COND_T        - size of pthread_cond_t.
+//    __SIZEOF_PTHREAD_CONDATTR_T    - size of pthread_condattr_t.
+//    __SIZEOF_PTHREAD_RWLOCK_T      - size of pthread_rwlock_t.
+//    __SIZEOF_PTHREAD_RWLOCKATTR_T  - size of pthread_rwlockattr_t.
+//    __SIZEOF_PTHREAD_BARRIER_T     - size of pthread_barrier_t.
+//    __SIZEOF_PTHREAD_BARRIERATTR_T - size of pthread_barrierattr_t.
+//
+//    The additional macro defines any constraint for the lock alignment
+//    inside the thread structures:
+//
+//    __LOCK_ALIGNMENT - for internal lock/futex usage.
+//
+//    Same idea but for the once locking primitive:
+//
+//    __ONCE_ALIGNMENT - for pthread_once_t/once_flag definition.
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Common definition of pthread_mutex_t.
+
+type X__pthread_list_t = X__pthread_internal_list /* thread-shared-types.h:53:3 */
+
+type X__pthread_internal_slist = struct{ F__next uintptr } /* thread-shared-types.h:55:9 */
+
+type X__pthread_slist_t = X__pthread_internal_slist /* thread-shared-types.h:58:3 */
+
+// Arch-specific mutex definitions.  A generic implementation is provided
+//    by sysdeps/nptl/bits/struct_mutex.h.  If required, an architecture
+//    can override it by defining:
+//
+//    1. struct __pthread_mutex_s (used on both pthread_mutex_t and mtx_t
+//       definition).  It should contains at least the internal members
+//       defined in the generic version.
+//
+//    2. __LOCK_ALIGNMENT for any extra attribute for internal lock used with
+//       atomic operations.
+//
+//    3. The macro __PTHREAD_MUTEX_INITIALIZER used for static initialization.
+//       It should initialize the mutex internal flag.
+
+// x86 internal mutex struct definitions.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+type X__pthread_mutex_s = struct {
+	F__lock    int32
+	F__count   uint32
+	F__owner   int32
+	F__nusers  uint32
+	F__kind    int32
+	F__spins   int16
+	F__elision int16
+	F__list    X__pthread_list_t
+} /* struct_mutex.h:22:1 */
+
+// Arch-sepecific read-write lock definitions.  A generic implementation is
+//    provided by struct_rwlock.h.  If required, an architecture can override it
+//    by defining:
+//
+//    1. struct __pthread_rwlock_arch_t (used on pthread_rwlock_t definition).
+//       It should contain at least the internal members defined in the
+//       generic version.
+//
+//    2. The macro __PTHREAD_RWLOCK_INITIALIZER used for static initialization.
+//       It should initialize the rwlock internal type.
+
+// x86 internal rwlock struct definitions.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+type X__pthread_rwlock_arch_t = struct {
+	F__readers       uint32
+	F__writers       uint32
+	F__wrphase_futex uint32
+	F__writers_futex uint32
+	F__pad3          uint32
+	F__pad4          uint32
+	F__cur_writer    int32
+	F__shared        int32
+	F__rwelision     int8
+	F__pad1          [7]uint8
+	F__pad2          uint64
+	F__flags         uint32
+	F__ccgo_pad1     [4]byte
+} /* struct_rwlock.h:23:1 */
+
+// Common definition of pthread_cond_t.
+
+type X__pthread_cond_s = struct {
+	F__0            struct{ F__wseq uint64 }
+	F__8            struct{ F__g1_start uint64 }
+	F__g_refs       [2]uint32
+	F__g_size       [2]uint32
+	F__g1_orig_size uint32
+	F__wrefs        uint32
+	F__g_signals    [2]uint32
+} /* thread-shared-types.h:92:1 */
+
+// Thread identifiers.  The structure of the attribute type is not
+//
+//	exposed on purpose.
+type Pthread_t = uint64 /* pthreadtypes.h:27:27 */
+
+// Data structures for mutex handling.  The structure of the attribute
+//
+//	type is not exposed on purpose.
+type Pthread_mutexattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:36:3 */
+
+// Data structure for condition variable handling.  The structure of
+//
+//	the attribute type is not exposed on purpose.
+type Pthread_condattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:45:3 */
+
+// Keys for thread-specific data
+type Pthread_key_t = uint32 /* pthreadtypes.h:49:22 */
+
+// Once-only execution
+type Pthread_once_t = int32 /* pthreadtypes.h:53:30 */
+
+type Pthread_attr_t1 = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [56]int8
+} /* pthreadtypes.h:56:1 */
+
+type Pthread_attr_t = Pthread_attr_t1 /* pthreadtypes.h:62:30 */
+
+type Pthread_mutex_t = struct{ F__data X__pthread_mutex_s } /* pthreadtypes.h:72:3 */
+
+type Pthread_cond_t = struct{ F__data X__pthread_cond_s } /* pthreadtypes.h:80:3 */
+
+// Data structure for reader-writer lock variable handling.  The
+//
+//	structure of the attribute type is deliberately not exposed.
+type Pthread_rwlock_t = struct{ F__data X__pthread_rwlock_arch_t } /* pthreadtypes.h:91:3 */
+
+type Pthread_rwlockattr_t = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [8]int8
+} /* pthreadtypes.h:97:3 */
+
+// POSIX spinlock data type.
+type Pthread_spinlock_t = int32 /* pthreadtypes.h:103:22 */
+
+// POSIX barriers data type.  The structure of the type is
+//
+//	deliberately not exposed.
+type Pthread_barrier_t = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [32]int8
+} /* pthreadtypes.h:112:3 */
+
+type Pthread_barrierattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:118:3 */
+
+// Reentrant versions of the `random' family of functions.
+//    These functions all use the following data structure to contain
+//    state, rather than global state variables.
+
+type Random_data = struct {
+	Ffptr        uintptr
+	Frptr        uintptr
+	Fstate       uintptr
+	Frand_type   int32
+	Frand_deg    int32
+	Frand_sep    int32
+	F__ccgo_pad1 [4]byte
+	Fend_ptr     uintptr
+} /* stdlib.h:423:1 */
+
+// Data structure for communication with thread safe versions.  This
+//
+//	type is to be regarded as opaque.  It's only exported because users
+//	have to allocate objects of this type.
+type Drand48_data = struct {
+	F__x     [3]uint16
+	F__old_x [3]uint16
+	F__c     uint16
+	F__init  uint16
+	F__a     uint64
+} /* stdlib.h:490:1 */
+
+// Shorthand for type of comparison functions.
+type X__compar_fn_t = uintptr /* stdlib.h:808:13 */
+
+// Floating-point inline functions for stdlib.h.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define some macros helping to catch buffer overflows.
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/sys/socket/capi_linux_loong64.go b/vendor/modernc.org/libc/sys/socket/capi_linux_loong64.go
new file mode 100644
index 00000000..41ea29c8
--- /dev/null
+++ b/vendor/modernc.org/libc/sys/socket/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo sys/socket/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o sys/socket/socket_linux_amd64.go -pkgname socket', DO NOT EDIT.
+
+package socket
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/sys/socket/socket_linux_loong64.go b/vendor/modernc.org/libc/sys/socket/socket_linux_loong64.go
new file mode 100644
index 00000000..c5ca270f
--- /dev/null
+++ b/vendor/modernc.org/libc/sys/socket/socket_linux_loong64.go
@@ -0,0 +1,1848 @@
+// Code generated by 'ccgo sys/socket/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o sys/socket/socket_linux_amd64.go -pkgname socket', DO NOT EDIT.
+
+package socket
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	AF_ALG                           = 38     // socket.h:133:1:
+	AF_APPLETALK                     = 5      // socket.h:99:1:
+	AF_ASH                           = 18     // socket.h:113:1:
+	AF_ATMPVC                        = 8      // socket.h:102:1:
+	AF_ATMSVC                        = 20     // socket.h:115:1:
+	AF_AX25                          = 3      // socket.h:97:1:
+	AF_BLUETOOTH                     = 31     // socket.h:126:1:
+	AF_BRIDGE                        = 7      // socket.h:101:1:
+	AF_CAIF                          = 37     // socket.h:132:1:
+	AF_CAN                           = 29     // socket.h:124:1:
+	AF_DECnet                        = 12     // socket.h:106:1:
+	AF_ECONET                        = 19     // socket.h:114:1:
+	AF_FILE                          = 1      // socket.h:95:1:
+	AF_IB                            = 27     // socket.h:122:1:
+	AF_IEEE802154                    = 36     // socket.h:131:1:
+	AF_INET                          = 2      // socket.h:96:1:
+	AF_INET6                         = 10     // socket.h:104:1:
+	AF_IPX                           = 4      // socket.h:98:1:
+	AF_IRDA                          = 23     // socket.h:118:1:
+	AF_ISDN                          = 34     // socket.h:129:1:
+	AF_IUCV                          = 32     // socket.h:127:1:
+	AF_KCM                           = 41     // socket.h:136:1:
+	AF_KEY                           = 15     // socket.h:109:1:
+	AF_LLC                           = 26     // socket.h:121:1:
+	AF_LOCAL                         = 1      // socket.h:93:1:
+	AF_MAX                           = 45     // socket.h:140:1:
+	AF_MPLS                          = 28     // socket.h:123:1:
+	AF_NETBEUI                       = 13     // socket.h:107:1:
+	AF_NETLINK                       = 16     // socket.h:110:1:
+	AF_NETROM                        = 6      // socket.h:100:1:
+	AF_NFC                           = 39     // socket.h:134:1:
+	AF_PACKET                        = 17     // socket.h:112:1:
+	AF_PHONET                        = 35     // socket.h:130:1:
+	AF_PPPOX                         = 24     // socket.h:119:1:
+	AF_QIPCRTR                       = 42     // socket.h:137:1:
+	AF_RDS                           = 21     // socket.h:116:1:
+	AF_ROSE                          = 11     // socket.h:105:1:
+	AF_ROUTE                         = 16     // socket.h:111:1:
+	AF_RXRPC                         = 33     // socket.h:128:1:
+	AF_SECURITY                      = 14     // socket.h:108:1:
+	AF_SMC                           = 43     // socket.h:138:1:
+	AF_SNA                           = 22     // socket.h:117:1:
+	AF_TIPC                          = 30     // socket.h:125:1:
+	AF_UNIX                          = 1      // socket.h:94:1:
+	AF_UNSPEC                        = 0      // socket.h:92:1:
+	AF_VSOCK                         = 40     // socket.h:135:1:
+	AF_WANPIPE                       = 25     // socket.h:120:1:
+	AF_X25                           = 9      // socket.h:103:1:
+	AF_XDP                           = 44     // socket.h:139:1:
+	BIG_ENDIAN                       = 4321   // endian.h:28:1:
+	BYTE_ORDER                       = 1234   // endian.h:30:1:
+	FD_SETSIZE                       = 1024   // select.h:73:1:
+	FIOGETOWN                        = 0x8903 // sockios.h:8:1:
+	FIOSETOWN                        = 0x8901 // sockios.h:6:1:
+	LITTLE_ENDIAN                    = 1234   // endian.h:27:1:
+	PDP_ENDIAN                       = 3412   // endian.h:29:1:
+	PF_ALG                           = 38     // socket.h:82:1:
+	PF_APPLETALK                     = 5      // socket.h:48:1:
+	PF_ASH                           = 18     // socket.h:62:1:
+	PF_ATMPVC                        = 8      // socket.h:51:1:
+	PF_ATMSVC                        = 20     // socket.h:64:1:
+	PF_AX25                          = 3      // socket.h:46:1:
+	PF_BLUETOOTH                     = 31     // socket.h:75:1:
+	PF_BRIDGE                        = 7      // socket.h:50:1:
+	PF_CAIF                          = 37     // socket.h:81:1:
+	PF_CAN                           = 29     // socket.h:73:1:
+	PF_DECnet                        = 12     // socket.h:55:1:
+	PF_ECONET                        = 19     // socket.h:63:1:
+	PF_FILE                          = 1      // socket.h:44:1:
+	PF_IB                            = 27     // socket.h:71:1:
+	PF_IEEE802154                    = 36     // socket.h:80:1:
+	PF_INET                          = 2      // socket.h:45:1:
+	PF_INET6                         = 10     // socket.h:53:1:
+	PF_IPX                           = 4      // socket.h:47:1:
+	PF_IRDA                          = 23     // socket.h:67:1:
+	PF_ISDN                          = 34     // socket.h:78:1:
+	PF_IUCV                          = 32     // socket.h:76:1:
+	PF_KCM                           = 41     // socket.h:85:1:
+	PF_KEY                           = 15     // socket.h:58:1:
+	PF_LLC                           = 26     // socket.h:70:1:
+	PF_LOCAL                         = 1      // socket.h:42:1:
+	PF_MAX                           = 45     // socket.h:89:1:
+	PF_MPLS                          = 28     // socket.h:72:1:
+	PF_NETBEUI                       = 13     // socket.h:56:1:
+	PF_NETLINK                       = 16     // socket.h:59:1:
+	PF_NETROM                        = 6      // socket.h:49:1:
+	PF_NFC                           = 39     // socket.h:83:1:
+	PF_PACKET                        = 17     // socket.h:61:1:
+	PF_PHONET                        = 35     // socket.h:79:1:
+	PF_PPPOX                         = 24     // socket.h:68:1:
+	PF_QIPCRTR                       = 42     // socket.h:86:1:
+	PF_RDS                           = 21     // socket.h:65:1:
+	PF_ROSE                          = 11     // socket.h:54:1:
+	PF_ROUTE                         = 16     // socket.h:60:1:
+	PF_RXRPC                         = 33     // socket.h:77:1:
+	PF_SECURITY                      = 14     // socket.h:57:1:
+	PF_SMC                           = 43     // socket.h:87:1:
+	PF_SNA                           = 22     // socket.h:66:1:
+	PF_TIPC                          = 30     // socket.h:74:1:
+	PF_UNIX                          = 1      // socket.h:43:1:
+	PF_UNSPEC                        = 0      // socket.h:41:1:
+	PF_VSOCK                         = 40     // socket.h:84:1:
+	PF_WANPIPE                       = 25     // socket.h:69:1:
+	PF_X25                           = 9      // socket.h:52:1:
+	PF_XDP                           = 44     // socket.h:88:1:
+	SCM_TIMESTAMP                    = 29     // socket.h:140:1:
+	SCM_TIMESTAMPING                 = 37     // socket.h:142:1:
+	SCM_TIMESTAMPING_OPT_STATS       = 54     // socket.h:90:1:
+	SCM_TIMESTAMPING_PKTINFO         = 58     // socket.h:98:1:
+	SCM_TIMESTAMPNS                  = 35     // socket.h:141:1:
+	SCM_TXTIME                       = 61     // socket.h:105:1:
+	SCM_WIFI_STATUS                  = 41     // socket.h:64:1:
+	SIOCATMARK                       = 0x8905 // sockios.h:10:1:
+	SIOCGPGRP                        = 0x8904 // sockios.h:9:1:
+	SIOCGSTAMP                       = 0x8906 // sockios.h:11:1:
+	SIOCGSTAMPNS                     = 0x8907 // sockios.h:12:1:
+	SIOCSPGRP                        = 0x8902 // sockios.h:7:1:
+	SOL_AAL                          = 265    // socket.h:151:1:
+	SOL_ALG                          = 279    // socket.h:165:1:
+	SOL_ATM                          = 264    // socket.h:150:1:
+	SOL_BLUETOOTH                    = 274    // socket.h:160:1:
+	SOL_CAIF                         = 278    // socket.h:164:1:
+	SOL_DCCP                         = 269    // socket.h:155:1:
+	SOL_DECNET                       = 261    // socket.h:147:1:
+	SOL_IRDA                         = 266    // socket.h:152:1:
+	SOL_IUCV                         = 277    // socket.h:163:1:
+	SOL_KCM                          = 281    // socket.h:167:1:
+	SOL_LLC                          = 268    // socket.h:154:1:
+	SOL_NETBEUI                      = 267    // socket.h:153:1:
+	SOL_NETLINK                      = 270    // socket.h:156:1:
+	SOL_NFC                          = 280    // socket.h:166:1:
+	SOL_PACKET                       = 263    // socket.h:149:1:
+	SOL_PNPIPE                       = 275    // socket.h:161:1:
+	SOL_PPPOL2TP                     = 273    // socket.h:159:1:
+	SOL_RAW                          = 255    // socket.h:146:1:
+	SOL_RDS                          = 276    // socket.h:162:1:
+	SOL_RXRPC                        = 272    // socket.h:158:1:
+	SOL_SOCKET                       = 1      // socket.h:9:1:
+	SOL_TIPC                         = 271    // socket.h:157:1:
+	SOL_TLS                          = 282    // socket.h:168:1:
+	SOL_X25                          = 262    // socket.h:148:1:
+	SOL_XDP                          = 283    // socket.h:169:1:
+	SOMAXCONN                        = 4096   // socket.h:172:1:
+	SO_ACCEPTCONN                    = 30     // socket.h:51:1:
+	SO_ATTACH_BPF                    = 50     // socket.h:82:1:
+	SO_ATTACH_FILTER                 = 26     // socket.h:45:1:
+	SO_ATTACH_REUSEPORT_CBPF         = 51     // socket.h:85:1:
+	SO_ATTACH_REUSEPORT_EBPF         = 52     // socket.h:86:1:
+	SO_BINDTODEVICE                  = 25     // socket.h:42:1:
+	SO_BINDTOIFINDEX                 = 62     // socket.h:107:1:
+	SO_BPF_EXTENSIONS                = 48     // socket.h:78:1:
+	SO_BROADCAST                     = 6      // socket.h:16:1:
+	SO_BSDCOMPAT                     = 14     // socket.h:26:1:
+	SO_BUSY_POLL                     = 46     // socket.h:74:1:
+	SO_CNX_ADVICE                    = 53     // socket.h:88:1:
+	SO_COOKIE                        = 57     // socket.h:96:1:
+	SO_DEBUG                         = 1      // socket.h:11:1:
+	SO_DETACH_BPF                    = 27     // socket.h:83:1:
+	SO_DETACH_FILTER                 = 27     // socket.h:46:1:
+	SO_DETACH_REUSEPORT_BPF          = 68     // socket.h:120:1:
+	SO_DOMAIN                        = 39     // socket.h:59:1:
+	SO_DONTROUTE                     = 5      // socket.h:15:1:
+	SO_ERROR                         = 4      // socket.h:14:1:
+	SO_GET_FILTER                    = 26     // socket.h:47:1:
+	SO_INCOMING_CPU                  = 49     // socket.h:80:1:
+	SO_INCOMING_NAPI_ID              = 56     // socket.h:94:1:
+	SO_KEEPALIVE                     = 9      // socket.h:21:1:
+	SO_LINGER                        = 13     // socket.h:25:1:
+	SO_LOCK_FILTER                   = 44     // socket.h:70:1:
+	SO_MARK                          = 36     // socket.h:56:1:
+	SO_MAX_PACING_RATE               = 47     // socket.h:76:1:
+	SO_MEMINFO                       = 55     // socket.h:92:1:
+	SO_NOFCS                         = 43     // socket.h:68:1:
+	SO_NO_CHECK                      = 11     // socket.h:23:1:
+	SO_OOBINLINE                     = 10     // socket.h:22:1:
+	SO_PASSCRED                      = 16     // socket.h:29:1:
+	SO_PASSSEC                       = 34     // socket.h:54:1:
+	SO_PEEK_OFF                      = 42     // socket.h:65:1:
+	SO_PEERCRED                      = 17     // socket.h:30:1:
+	SO_PEERGROUPS                    = 59     // socket.h:100:1:
+	SO_PEERNAME                      = 28     // socket.h:49:1:
+	SO_PEERSEC                       = 31     // socket.h:53:1:
+	SO_PRIORITY                      = 12     // socket.h:24:1:
+	SO_PROTOCOL                      = 38     // socket.h:58:1:
+	SO_RCVBUF                        = 8      // socket.h:18:1:
+	SO_RCVBUFFORCE                   = 33     // socket.h:20:1:
+	SO_RCVLOWAT                      = 18     // socket.h:31:1:
+	SO_RCVTIMEO                      = 20     // socket.h:129:1:
+	SO_RCVTIMEO_NEW                  = 66     // socket.h:117:1:
+	SO_RCVTIMEO_OLD                  = 20     // socket.h:33:1:
+	SO_REUSEADDR                     = 2      // socket.h:12:1:
+	SO_REUSEPORT                     = 15     // socket.h:27:1:
+	SO_RXQ_OVFL                      = 40     // socket.h:61:1:
+	SO_SECURITY_AUTHENTICATION       = 22     // socket.h:38:1:
+	SO_SECURITY_ENCRYPTION_NETWORK   = 24     // socket.h:40:1:
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 23     // socket.h:39:1:
+	SO_SELECT_ERR_QUEUE              = 45     // socket.h:72:1:
+	SO_SNDBUF                        = 7      // socket.h:17:1:
+	SO_SNDBUFFORCE                   = 32     // socket.h:19:1:
+	SO_SNDLOWAT                      = 19     // socket.h:32:1:
+	SO_SNDTIMEO                      = 21     // socket.h:130:1:
+	SO_SNDTIMEO_NEW                  = 67     // socket.h:118:1:
+	SO_SNDTIMEO_OLD                  = 21     // socket.h:34:1:
+	SO_TIMESTAMP                     = 29     // socket.h:125:1:
+	SO_TIMESTAMPING                  = 37     // socket.h:127:1:
+	SO_TIMESTAMPING_NEW              = 65     // socket.h:115:1:
+	SO_TIMESTAMPING_OLD              = 37     // socket.h:111:1:
+	SO_TIMESTAMPNS                   = 35     // socket.h:126:1:
+	SO_TIMESTAMPNS_NEW               = 64     // socket.h:114:1:
+	SO_TIMESTAMPNS_OLD               = 35     // socket.h:110:1:
+	SO_TIMESTAMP_NEW                 = 63     // socket.h:113:1:
+	SO_TIMESTAMP_OLD                 = 29     // socket.h:109:1:
+	SO_TXTIME                        = 61     // socket.h:104:1:
+	SO_TYPE                          = 3      // socket.h:13:1:
+	SO_WIFI_STATUS                   = 41     // socket.h:63:1:
+	SO_ZEROCOPY                      = 60     // socket.h:102:1:
+	X_ASM_X86_POSIX_TYPES_64_H       = 0      // posix_types_64.h:3:1:
+	X_ATFILE_SOURCE                  = 1      // features.h:342:1:
+	X_BITS_BYTESWAP_H                = 1      // byteswap.h:24:1:
+	X_BITS_ENDIANNESS_H              = 1      // endianness.h:2:1:
+	X_BITS_ENDIAN_H                  = 1      // endian.h:20:1:
+	X_BITS_PTHREADTYPES_ARCH_H       = 1      // pthreadtypes-arch.h:19:1:
+	X_BITS_PTHREADTYPES_COMMON_H     = 1      // pthreadtypes.h:20:1:
+	X_BITS_SOCKADDR_H                = 1      // sockaddr.h:24:1:
+	X_BITS_STDINT_INTN_H             = 1      // stdint-intn.h:20:1:
+	X_BITS_TIME64_H                  = 1      // time64.h:24:1:
+	X_BITS_TYPESIZES_H               = 1      // typesizes.h:24:1:
+	X_BITS_TYPES_H                   = 1      // types.h:24:1:
+	X_BITS_UINTN_IDENTITY_H          = 1      // uintn-identity.h:24:1:
+	X_BSD_SIZE_T_                    = 0      // stddef.h:189:1:
+	X_BSD_SIZE_T_DEFINED_            = 0      // stddef.h:192:1:
+	X_DEFAULT_SOURCE                 = 1      // features.h:227:1:
+	X_ENDIAN_H                       = 1      // endian.h:19:1:
+	X_FEATURES_H                     = 1      // features.h:19:1:
+	X_FILE_OFFSET_BITS               = 64     // <builtin>:25:1:
+	X_GCC_SIZE_T                     = 0      // stddef.h:195:1:
+	X_LINUX_POSIX_TYPES_H            = 0      // posix_types.h:3:1:
+	X_LP64                           = 1      // <predefined>:284:1:
+	X_POSIX_C_SOURCE                 = 200809 // features.h:281:1:
+	X_POSIX_SOURCE                   = 1      // features.h:279:1:
+	X_RWLOCK_INTERNAL_H              = 0      // struct_rwlock.h:21:1:
+	X_SIZET_                         = 0      // stddef.h:196:1:
+	X_SIZE_T                         = 0      // stddef.h:183:1:
+	X_SIZE_T_                        = 0      // stddef.h:188:1:
+	X_SIZE_T_DECLARED                = 0      // stddef.h:193:1:
+	X_SIZE_T_DEFINED                 = 0      // stddef.h:191:1:
+	X_SIZE_T_DEFINED_                = 0      // stddef.h:190:1:
+	X_SS_SIZE                        = 128    // sockaddr.h:40:1:
+	X_STDC_PREDEF_H                  = 1      // <predefined>:162:1:
+	X_STRUCT_TIMESPEC                = 1      // struct_timespec.h:3:1:
+	X_SYS_CDEFS_H                    = 1      // cdefs.h:19:1:
+	X_SYS_SELECT_H                   = 1      // select.h:22:1:
+	X_SYS_SIZE_T_H                   = 0      // stddef.h:184:1:
+	X_SYS_SOCKET_H                   = 1      // socket.h:20:1:
+	X_SYS_TYPES_H                    = 1      // types.h:23:1:
+	X_THREAD_MUTEX_INTERNAL_H        = 1      // struct_mutex.h:20:1:
+	X_THREAD_SHARED_TYPES_H          = 1      // thread-shared-types.h:20:1:
+	X_T_SIZE                         = 0      // stddef.h:186:1:
+	X_T_SIZE_                        = 0      // stddef.h:185:1:
+	Linux                            = 1      // <predefined>:231:1:
+	Unix                             = 1      // <predefined>:177:1:
+)
+
+// Bits in the FLAGS argument to `send', `recv', et al.
+const ( /* socket.h:200:1: */
+	MSG_OOB        = 1  // Process out-of-band data.
+	MSG_PEEK       = 2  // Peek at incoming messages.
+	MSG_DONTROUTE  = 4  // Don't use local routing.
+	MSG_CTRUNC     = 8  // Control data lost before delivery.
+	MSG_PROXY      = 16 // Supply or ask second address.
+	MSG_TRUNC      = 32
+	MSG_DONTWAIT   = 64  // Nonblocking IO.
+	MSG_EOR        = 128 // End of record.
+	MSG_WAITALL    = 256 // Wait for a full request.
+	MSG_FIN        = 512
+	MSG_SYN        = 1024
+	MSG_CONFIRM    = 2048 // Confirm path validity.
+	MSG_RST        = 4096
+	MSG_ERRQUEUE   = 8192      // Fetch message from error queue.
+	MSG_NOSIGNAL   = 16384     // Do not generate SIGPIPE.
+	MSG_MORE       = 32768     // Sender will send more.
+	MSG_WAITFORONE = 65536     // Wait for at least one packet to return.
+	MSG_BATCH      = 262144    // sendmmsg: more messages coming.
+	MSG_ZEROCOPY   = 67108864  // Use user data in kernel path.
+	MSG_FASTOPEN   = 536870912 // Send data in TCP SYN.
+
+	MSG_CMSG_CLOEXEC = 1073741824
+)
+
+// Socket level message types.  This must match the definitions in
+//
+//	<linux/socket.h>.
+const ( /* socket.h:332:1: */
+	SCM_RIGHTS = 1
+)
+
+// Get the architecture-dependent definition of enum __socket_type.
+// Define enum __socket_type for generic Linux.
+//    Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Types of sockets.
+const ( /* socket_type.h:24:1: */
+	SOCK_STREAM = 1 // Sequenced, reliable, connection-based
+	// 				   byte streams.
+	SOCK_DGRAM = 2 // Connectionless, unreliable datagrams
+	// 				   of fixed maximum length.
+	SOCK_RAW       = 3 // Raw protocol interface.
+	SOCK_RDM       = 4 // Reliably-delivered messages.
+	SOCK_SEQPACKET = 5 // Sequenced, reliable, connection-based,
+	// 				   datagrams of fixed maximum length.
+	SOCK_DCCP   = 6  // Datagram Congestion Control Protocol.
+	SOCK_PACKET = 10 // Linux specific way of getting packets
+	// 				   at the dev level.  For writing rarp and
+	// 				   other similar things on the user level.
+
+	// Flags to be ORed into the type parameter of socket and socketpair and
+	//      used for the flags parameter of paccept.
+
+	SOCK_CLOEXEC = 524288 // Atomically set close-on-exec flag for the
+	// 				   new descriptor(s).
+	SOCK_NONBLOCK = 2048
+)
+
+// The following constants should be used for the second parameter of
+//
+//	`shutdown'.
+const ( /* socket.h:41:1: */
+	SHUT_RD   = 0 // No more receptions.
+	SHUT_WR   = 1 // No more transmissions.
+	SHUT_RDWR = 2
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// Structure for scatter/gather I/O.
+type Iovec = struct {
+	Fiov_base uintptr
+	Fiov_len  Size_t
+} /* struct_iovec.h:26:1 */
+
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
+//
+// This file is part of GCC.
+//
+// GCC is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// GCC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+//
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+// ISO C Standard:  7.17  Common definitions  <stddef.h>
+
+// Any one of these symbols __need_* means that GNU libc
+//    wants us just to define one data type.  So don't define
+//    the symbols that indicate this file's entire job has been done.
+
+// This avoids lossage on SunOS but only if stdtypes.h comes first.
+//    There's no way to win with the other order!  Sun lossage.
+
+// Sequent's header files use _PTRDIFF_T_ in some conflicting way.
+//    Just ignore it.
+
+// On VxWorks, <type/vxTypesBase.h> may have defined macros like
+//    _TYPE_size_t which will typedef size_t.  fixincludes patched the
+//    vxTypesBase.h so that this macro is only defined if _GCC_SIZE_T is
+//    not defined, and so that defining this macro defines _GCC_SIZE_T.
+//    If we find that the macros are still defined at this point, we must
+//    invoke them so that the type is defined as expected.
+
+// In case nobody has defined these types, but we aren't running under
+//    GCC 2.00, make sure that __PTRDIFF_TYPE__, __SIZE_TYPE__, and
+//    __WCHAR_TYPE__ have reasonable values.  This can happen if the
+//    parts of GCC is compiled by an older compiler, that actually
+//    include gstddef.h, such as collect2.
+
+// Signed type of difference of two pointers.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Unsigned type of `sizeof' something.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// This operating system-specific header file defines the SOCK_*, PF_*,
+//    AF_*, MSG_*, SOL_*, and SO_* constants, and the `struct sockaddr',
+//    `struct msghdr', and `struct linger' types.
+// System-specific socket constants and types.  Linux version.
+//    Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
+//
+// This file is part of GCC.
+//
+// GCC is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// GCC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+//
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+// ISO C Standard:  7.17  Common definitions  <stddef.h>
+
+// Any one of these symbols __need_* means that GNU libc
+//    wants us just to define one data type.  So don't define
+//    the symbols that indicate this file's entire job has been done.
+
+// This avoids lossage on SunOS but only if stdtypes.h comes first.
+//    There's no way to win with the other order!  Sun lossage.
+
+// Sequent's header files use _PTRDIFF_T_ in some conflicting way.
+//    Just ignore it.
+
+// On VxWorks, <type/vxTypesBase.h> may have defined macros like
+//    _TYPE_size_t which will typedef size_t.  fixincludes patched the
+//    vxTypesBase.h so that this macro is only defined if _GCC_SIZE_T is
+//    not defined, and so that defining this macro defines _GCC_SIZE_T.
+//    If we find that the macros are still defined at this point, we must
+//    invoke them so that the type is defined as expected.
+
+// In case nobody has defined these types, but we aren't running under
+//    GCC 2.00, make sure that __PTRDIFF_TYPE__, __SIZE_TYPE__, and
+//    __WCHAR_TYPE__ have reasonable values.  This can happen if the
+//    parts of GCC is compiled by an older compiler, that actually
+//    include gstddef.h, such as collect2.
+
+// Signed type of difference of two pointers.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Unsigned type of `sizeof' something.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX Standard: 2.6 Primitive System Data Types	<sys/types.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Seconds since the Epoch, visible to user code when time_t is too
+//    narrow only for consistency with the old way of widening too-narrow
+//    types.  User code should never use __time64_t.
+
+type U_char = X__u_char     /* types.h:33:18 */
+type U_short = X__u_short   /* types.h:34:19 */
+type U_int = X__u_int       /* types.h:35:17 */
+type U_long = X__u_long     /* types.h:36:18 */
+type Quad_t = X__quad_t     /* types.h:37:18 */
+type U_quad_t = X__u_quad_t /* types.h:38:20 */
+type Fsid_t = X__fsid_t     /* types.h:39:18 */
+type Loff_t = X__loff_t     /* types.h:42:18 */
+
+type Ino_t = X__ino64_t /* types.h:49:19 */
+
+type Dev_t = X__dev_t /* types.h:59:17 */
+
+type Gid_t = X__gid_t /* types.h:64:17 */
+
+type Mode_t = X__mode_t /* types.h:69:18 */
+
+type Nlink_t = X__nlink_t /* types.h:74:19 */
+
+type Uid_t = X__uid_t /* types.h:79:17 */
+
+type Off_t = X__off64_t /* types.h:87:19 */
+
+type Pid_t = X__pid_t /* types.h:97:17 */
+
+type Id_t = X__id_t /* types.h:103:16 */
+
+type Ssize_t = X__ssize_t /* types.h:108:19 */
+
+type Daddr_t = X__daddr_t /* types.h:114:19 */
+type Caddr_t = X__caddr_t /* types.h:115:19 */
+
+type Key_t = X__key_t /* types.h:121:17 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `clock'.
+type Clock_t = X__clock_t /* clock_t.h:7:19 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Clock ID used in clock and timer functions.
+type Clockid_t = X__clockid_t /* clockid_t.h:7:21 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `time'.
+type Time_t = X__time_t /* time_t.h:7:18 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Timer ID returned by `timer_create'.
+type Timer_t = X__timer_t /* timer_t.h:7:19 */
+
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
+//
+// This file is part of GCC.
+//
+// GCC is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// GCC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+//
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+// ISO C Standard:  7.17  Common definitions  <stddef.h>
+
+// Any one of these symbols __need_* means that GNU libc
+//    wants us just to define one data type.  So don't define
+//    the symbols that indicate this file's entire job has been done.
+
+// This avoids lossage on SunOS but only if stdtypes.h comes first.
+//    There's no way to win with the other order!  Sun lossage.
+
+// Sequent's header files use _PTRDIFF_T_ in some conflicting way.
+//    Just ignore it.
+
+// On VxWorks, <type/vxTypesBase.h> may have defined macros like
+//    _TYPE_size_t which will typedef size_t.  fixincludes patched the
+//    vxTypesBase.h so that this macro is only defined if _GCC_SIZE_T is
+//    not defined, and so that defining this macro defines _GCC_SIZE_T.
+//    If we find that the macros are still defined at this point, we must
+//    invoke them so that the type is defined as expected.
+
+// In case nobody has defined these types, but we aren't running under
+//    GCC 2.00, make sure that __PTRDIFF_TYPE__, __SIZE_TYPE__, and
+//    __WCHAR_TYPE__ have reasonable values.  This can happen if the
+//    parts of GCC is compiled by an older compiler, that actually
+//    include gstddef.h, such as collect2.
+
+// Signed type of difference of two pointers.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Unsigned type of `sizeof' something.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// Old compatibility names for C types.
+type Ulong = uint64  /* types.h:148:27 */
+type Ushort = uint16 /* types.h:149:28 */
+type Uint = uint32   /* types.h:150:22 */
+
+// These size-specific names are used by some of the inet code.
+
+// Define intN_t types.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+type Int8_t = X__int8_t   /* stdint-intn.h:24:18 */
+type Int16_t = X__int16_t /* stdint-intn.h:25:19 */
+type Int32_t = X__int32_t /* stdint-intn.h:26:19 */
+type Int64_t = X__int64_t /* stdint-intn.h:27:19 */
+
+// These were defined by ISO C without the first `_'.
+type U_int8_t = X__uint8_t   /* types.h:158:19 */
+type U_int16_t = X__uint16_t /* types.h:159:20 */
+type U_int32_t = X__uint32_t /* types.h:160:20 */
+type U_int64_t = X__uint64_t /* types.h:161:20 */
+
+type Register_t = int32 /* types.h:164:13 */
+
+// It also defines `fd_set' and the FD_* macros for `select'.
+// `fd_set' type and related macros, and `select'/`pselect' declarations.
+//    Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX 1003.1g: 6.2 Select from File Descriptor Sets <sys/select.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Get definition of needed basic types.
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Get __FD_* definitions.
+// Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Get sigset_t.
+
+type X__sigset_t = struct{ F__val [16]uint64 } /* __sigset_t.h:8:3 */
+
+// A set of signals to be blocked, unblocked, or waited for.
+type Sigset_t = X__sigset_t /* sigset_t.h:7:20 */
+
+// Get definition of timer specification structures.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// A time value that is accurate to the nearest
+//
+//	microsecond but also has a range of years.
+type Timeval = struct {
+	Ftv_sec  X__time_t
+	Ftv_usec X__suseconds_t
+} /* struct_timeval.h:8:1 */
+
+// NB: Include guard matches what <linux/time.h> uses.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Endian macros for string.h functions
+//    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+// POSIX.1b structure for a time value.  This is like a `struct timeval' but
+//
+//	has nanoseconds instead of microseconds.
+type Timespec = struct {
+	Ftv_sec  X__time_t
+	Ftv_nsec X__syscall_slong_t
+} /* struct_timespec.h:10:1 */
+
+type Suseconds_t = X__suseconds_t /* select.h:43:23 */
+
+// The fd_set member is required to be an array of longs.
+type X__fd_mask = int64 /* select.h:49:18 */
+
+// Some versions of <linux/posix_types.h> define this macros.
+// It's easier to assume 8-bit bytes than to get CHAR_BIT.
+
+// fd_set for select and pselect.
+type Fd_set = struct{ F__fds_bits [16]X__fd_mask } /* select.h:70:5 */
+
+// Maximum number of file descriptors in `fd_set'.
+
+// Sometimes the fd_set member is assumed to have this type.
+type Fd_mask = X__fd_mask /* select.h:77:19 */
+
+// Define some inlines helping to catch common problems.
+
+type Blksize_t = X__blksize_t /* types.h:185:21 */
+
+// Types from the Large File Support interface.
+type Blkcnt_t = X__blkcnt64_t     /* types.h:205:22 */ // Type to count number of disk blocks.
+type Fsblkcnt_t = X__fsblkcnt64_t /* types.h:209:24 */ // Type to count file system blocks.
+type Fsfilcnt_t = X__fsfilcnt64_t /* types.h:213:24 */ // Type to count file system inodes.
+
+// Now add the thread types.
+// Declaration of common pthread types for all architectures.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For internal mutex and condition variable definitions.
+// Common threading primitives definitions for both POSIX and C11.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Arch-specific definitions.  Each architecture must define the following
+//    macros to define the expected sizes of pthread data types:
+//
+//    __SIZEOF_PTHREAD_ATTR_T        - size of pthread_attr_t.
+//    __SIZEOF_PTHREAD_MUTEX_T       - size of pthread_mutex_t.
+//    __SIZEOF_PTHREAD_MUTEXATTR_T   - size of pthread_mutexattr_t.
+//    __SIZEOF_PTHREAD_COND_T        - size of pthread_cond_t.
+//    __SIZEOF_PTHREAD_CONDATTR_T    - size of pthread_condattr_t.
+//    __SIZEOF_PTHREAD_RWLOCK_T      - size of pthread_rwlock_t.
+//    __SIZEOF_PTHREAD_RWLOCKATTR_T  - size of pthread_rwlockattr_t.
+//    __SIZEOF_PTHREAD_BARRIER_T     - size of pthread_barrier_t.
+//    __SIZEOF_PTHREAD_BARRIERATTR_T - size of pthread_barrierattr_t.
+//
+//    The additional macro defines any constraint for the lock alignment
+//    inside the thread structures:
+//
+//    __LOCK_ALIGNMENT - for internal lock/futex usage.
+//
+//    Same idea but for the once locking primitive:
+//
+//    __ONCE_ALIGNMENT - for pthread_once_t/once_flag definition.
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Common definition of pthread_mutex_t.
+
+type X__pthread_internal_list = struct {
+	F__prev uintptr
+	F__next uintptr
+} /* thread-shared-types.h:49:9 */
+
+// Type to count file system inodes.
+
+// Now add the thread types.
+// Declaration of common pthread types for all architectures.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For internal mutex and condition variable definitions.
+// Common threading primitives definitions for both POSIX and C11.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Arch-specific definitions.  Each architecture must define the following
+//    macros to define the expected sizes of pthread data types:
+//
+//    __SIZEOF_PTHREAD_ATTR_T        - size of pthread_attr_t.
+//    __SIZEOF_PTHREAD_MUTEX_T       - size of pthread_mutex_t.
+//    __SIZEOF_PTHREAD_MUTEXATTR_T   - size of pthread_mutexattr_t.
+//    __SIZEOF_PTHREAD_COND_T        - size of pthread_cond_t.
+//    __SIZEOF_PTHREAD_CONDATTR_T    - size of pthread_condattr_t.
+//    __SIZEOF_PTHREAD_RWLOCK_T      - size of pthread_rwlock_t.
+//    __SIZEOF_PTHREAD_RWLOCKATTR_T  - size of pthread_rwlockattr_t.
+//    __SIZEOF_PTHREAD_BARRIER_T     - size of pthread_barrier_t.
+//    __SIZEOF_PTHREAD_BARRIERATTR_T - size of pthread_barrierattr_t.
+//
+//    The additional macro defines any constraint for the lock alignment
+//    inside the thread structures:
+//
+//    __LOCK_ALIGNMENT - for internal lock/futex usage.
+//
+//    Same idea but for the once locking primitive:
+//
+//    __ONCE_ALIGNMENT - for pthread_once_t/once_flag definition.
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Common definition of pthread_mutex_t.
+
+type X__pthread_list_t = X__pthread_internal_list /* thread-shared-types.h:53:3 */
+
+type X__pthread_internal_slist = struct{ F__next uintptr } /* thread-shared-types.h:55:9 */
+
+type X__pthread_slist_t = X__pthread_internal_slist /* thread-shared-types.h:58:3 */
+
+// Arch-specific mutex definitions.  A generic implementation is provided
+//    by sysdeps/nptl/bits/struct_mutex.h.  If required, an architecture
+//    can override it by defining:
+//
+//    1. struct __pthread_mutex_s (used on both pthread_mutex_t and mtx_t
+//       definition).  It should contains at least the internal members
+//       defined in the generic version.
+//
+//    2. __LOCK_ALIGNMENT for any extra attribute for internal lock used with
+//       atomic operations.
+//
+//    3. The macro __PTHREAD_MUTEX_INITIALIZER used for static initialization.
+//       It should initialize the mutex internal flag.
+
+// x86 internal mutex struct definitions.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+type X__pthread_mutex_s = struct {
+	F__lock    int32
+	F__count   uint32
+	F__owner   int32
+	F__nusers  uint32
+	F__kind    int32
+	F__spins   int16
+	F__elision int16
+	F__list    X__pthread_list_t
+} /* struct_mutex.h:22:1 */
+
+// Arch-sepecific read-write lock definitions.  A generic implementation is
+//    provided by struct_rwlock.h.  If required, an architecture can override it
+//    by defining:
+//
+//    1. struct __pthread_rwlock_arch_t (used on pthread_rwlock_t definition).
+//       It should contain at least the internal members defined in the
+//       generic version.
+//
+//    2. The macro __PTHREAD_RWLOCK_INITIALIZER used for static initialization.
+//       It should initialize the rwlock internal type.
+
+// x86 internal rwlock struct definitions.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+type X__pthread_rwlock_arch_t = struct {
+	F__readers       uint32
+	F__writers       uint32
+	F__wrphase_futex uint32
+	F__writers_futex uint32
+	F__pad3          uint32
+	F__pad4          uint32
+	F__cur_writer    int32
+	F__shared        int32
+	F__rwelision     int8
+	F__pad1          [7]uint8
+	F__pad2          uint64
+	F__flags         uint32
+	F__ccgo_pad1     [4]byte
+} /* struct_rwlock.h:23:1 */
+
+// Common definition of pthread_cond_t.
+
+type X__pthread_cond_s = struct {
+	F__0            struct{ F__wseq uint64 }
+	F__8            struct{ F__g1_start uint64 }
+	F__g_refs       [2]uint32
+	F__g_size       [2]uint32
+	F__g1_orig_size uint32
+	F__wrefs        uint32
+	F__g_signals    [2]uint32
+} /* thread-shared-types.h:92:1 */
+
+// Thread identifiers.  The structure of the attribute type is not
+//
+//	exposed on purpose.
+type Pthread_t = uint64 /* pthreadtypes.h:27:27 */
+
+// Data structures for mutex handling.  The structure of the attribute
+//
+//	type is not exposed on purpose.
+type Pthread_mutexattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:36:3 */
+
+// Data structure for condition variable handling.  The structure of
+//
+//	the attribute type is not exposed on purpose.
+type Pthread_condattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:45:3 */
+
+// Keys for thread-specific data
+type Pthread_key_t = uint32 /* pthreadtypes.h:49:22 */
+
+// Once-only execution
+type Pthread_once_t = int32 /* pthreadtypes.h:53:30 */
+
+type Pthread_attr_t1 = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [56]int8
+} /* pthreadtypes.h:56:1 */
+
+type Pthread_attr_t = Pthread_attr_t1 /* pthreadtypes.h:62:30 */
+
+type Pthread_mutex_t = struct{ F__data X__pthread_mutex_s } /* pthreadtypes.h:72:3 */
+
+type Pthread_cond_t = struct{ F__data X__pthread_cond_s } /* pthreadtypes.h:80:3 */
+
+// Data structure for reader-writer lock variable handling.  The
+//
+//	structure of the attribute type is deliberately not exposed.
+type Pthread_rwlock_t = struct{ F__data X__pthread_rwlock_arch_t } /* pthreadtypes.h:91:3 */
+
+type Pthread_rwlockattr_t = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [8]int8
+} /* pthreadtypes.h:97:3 */
+
+// POSIX spinlock data type.
+type Pthread_spinlock_t = int32 /* pthreadtypes.h:103:22 */
+
+// POSIX barriers data type.  The structure of the type is
+//
+//	deliberately not exposed.
+type Pthread_barrier_t = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [32]int8
+} /* pthreadtypes.h:112:3 */
+
+type Pthread_barrierattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:118:3 */
+
+// Type for length arguments in socket calls.
+type Socklen_t = X__socklen_t /* socket.h:33:21 */
+
+// Protocol families.
+
+// Address families.
+
+// Socket level values.  Others are defined in the appropriate headers.
+//
+//    XXX These definitions also should go into the appropriate headers as
+//    far as they are available.
+
+// Maximum queue length specifiable by listen.
+
+// Get the definition of the macro to define the common sockaddr members.
+// Definition of struct sockaddr_* common members and sizes, generic version.
+//    Copyright (C) 1995-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/socket.h> instead.
+
+// POSIX.1g specifies this type name for the `sa_family' member.
+type Sa_family_t = uint16 /* sockaddr.h:28:28 */
+
+// This macro is used to declare the initial common members
+//    of the data types used for socket addresses, `struct sockaddr',
+//    `struct sockaddr_in', `struct sockaddr_un', etc.
+
+// Size of struct sockaddr_storage.
+
+// Structure describing a generic socket address.
+type Sockaddr = struct {
+	Fsa_family Sa_family_t
+	Fsa_data   [14]int8
+} /* socket.h:178:1 */
+
+// Structure large enough to hold any socket address (with the historical
+//    exception of AF_UNIX).
+
+type Sockaddr_storage = struct {
+	Fss_family    Sa_family_t
+	F__ss_padding [118]int8
+	F__ss_align   uint64
+} /* socket.h:191:1 */
+
+// Structure describing messages sent by
+//
+//	`sendmsg' and received by `recvmsg'.
+type Msghdr = struct {
+	Fmsg_name       uintptr
+	Fmsg_namelen    Socklen_t
+	F__ccgo_pad1    [4]byte
+	Fmsg_iov        uintptr
+	Fmsg_iovlen     Size_t
+	Fmsg_control    uintptr
+	Fmsg_controllen Size_t
+	Fmsg_flags      int32
+	F__ccgo_pad2    [4]byte
+} /* socket.h:257:1 */
+
+// Structure used for storage of ancillary data object information.
+type Cmsghdr = struct {
+	F__ccgo_pad1 [0]uint64
+	Fcmsg_len    Size_t
+	Fcmsg_level  int32
+	Fcmsg_type   int32
+} /* socket.h:275:1 */
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// This allows for 1024 file descriptors: if NR_OPEN is ever grown
+// beyond that you'll have to change this too. But 1024 fd's seem to be
+// enough even for such "real" unices like OSF/1, so hopefully this is
+// one limit that doesn't have to be changed [again].
+//
+// Note that POSIX wants the FD_CLEAR(fd,fdsetp) defines to be in
+// <sys/time.h> (and thus <linux/time.h>) - but this is a more logical
+// place for them. Solved by having dummy defines in <sys/time.h>.
+
+// This macro may have been defined in <gnu/types.h>. But we always
+// use the one here.
+
+type X__kernel_fd_set = struct{ Ffds_bits [16]uint64 } /* posix_types.h:27:3 */
+
+// Type of a signal handler.
+type X__kernel_sighandler_t = uintptr /* posix_types.h:30:14 */
+
+// Type of a SYSV IPC key.
+type X__kernel_key_t = int32 /* posix_types.h:33:13 */
+type X__kernel_mqd_t = int32 /* posix_types.h:34:13 */
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// This file is generally used by user-level software, so you need to
+// be a little careful about namespace pollution etc.  Also, we cannot
+// assume GCC is being used.
+
+type X__kernel_old_uid_t = uint16 /* posix_types_64.h:11:24 */
+type X__kernel_old_gid_t = uint16 /* posix_types_64.h:12:24 */
+
+type X__kernel_old_dev_t = uint64 /* posix_types_64.h:15:23 */
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// There seems to be no way of detecting this automatically from user
+// space, so 64 bit architectures should override this in their
+// bitsperlong.h. In particular, an architecture that supports
+// both 32 and 64 bit user space must not rely on CONFIG_64BIT
+// to decide it, but rather check a compiler provided macro.
+
+// This file is generally used by user-level software, so you need to
+// be a little careful about namespace pollution etc.
+//
+// First the types that are often defined in different ways across
+// architectures, so that you can override them.
+
+type X__kernel_long_t = int64   /* posix_types.h:15:15 */
+type X__kernel_ulong_t = uint64 /* posix_types.h:16:23 */
+
+type X__kernel_ino_t = X__kernel_ulong_t /* posix_types.h:20:26 */
+
+type X__kernel_mode_t = uint32 /* posix_types.h:24:22 */
+
+type X__kernel_pid_t = int32 /* posix_types.h:28:14 */
+
+type X__kernel_ipc_pid_t = int32 /* posix_types.h:32:14 */
+
+type X__kernel_uid_t = uint32 /* posix_types.h:36:22 */
+type X__kernel_gid_t = uint32 /* posix_types.h:37:22 */
+
+type X__kernel_suseconds_t = X__kernel_long_t /* posix_types.h:41:26 */
+
+type X__kernel_daddr_t = int32 /* posix_types.h:45:14 */
+
+type X__kernel_uid32_t = uint32 /* posix_types.h:49:22 */
+type X__kernel_gid32_t = uint32 /* posix_types.h:50:22 */
+
+// Most 32 bit architectures use "unsigned int" size_t,
+// and all 64 bit architectures use "unsigned long" size_t.
+type X__kernel_size_t = X__kernel_ulong_t   /* posix_types.h:72:26 */
+type X__kernel_ssize_t = X__kernel_long_t   /* posix_types.h:73:25 */
+type X__kernel_ptrdiff_t = X__kernel_long_t /* posix_types.h:74:25 */
+
+type X__kernel_fsid_t = struct{ Fval [2]int32 } /* posix_types.h:81:3 */
+
+// anything below here should be completely generic
+type X__kernel_off_t = X__kernel_long_t      /* posix_types.h:87:25 */
+type X__kernel_loff_t = int64                /* posix_types.h:88:19 */
+type X__kernel_old_time_t = X__kernel_long_t /* posix_types.h:89:25 */
+type X__kernel_time_t = X__kernel_long_t     /* posix_types.h:90:25 */
+type X__kernel_time64_t = int64              /* posix_types.h:91:19 */
+type X__kernel_clock_t = X__kernel_long_t    /* posix_types.h:92:25 */
+type X__kernel_timer_t = int32               /* posix_types.h:93:14 */
+type X__kernel_clockid_t = int32             /* posix_types.h:94:14 */
+type X__kernel_caddr_t = uintptr             /* posix_types.h:95:14 */
+type X__kernel_uid16_t = uint16              /* posix_types.h:96:24 */
+type X__kernel_gid16_t = uint16              /* posix_types.h:97:24 */
+
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+
+// Socket-level I/O control calls.
+
+// For setsockopt(2)
+
+// Security levels - as per NRL IPv6 - don't actually do anything
+
+// Socket filtering
+
+// Instruct lower device to use last 4-bytes of skb data as FCS
+
+// on 64-bit and x32, avoid the ?: operator
+
+// Structure used to manipulate the SO_LINGER option.
+type Linger = struct {
+	Fl_onoff  int32
+	Fl_linger int32
+} /* socket.h:361:1 */
+
+// This is the 4.3 BSD `struct sockaddr' format, which is used as wire
+//
+//	format in the grotty old 4.3 `talk' protocol.
+type Osockaddr = struct {
+	Fsa_family uint16
+	Fsa_data   [14]uint8
+} /* struct_osockaddr.h:6:1 */
+
+// Define some macros helping to catch buffer overflows.
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/sys/stat/capi_linux_loong64.go b/vendor/modernc.org/libc/sys/stat/capi_linux_loong64.go
new file mode 100644
index 00000000..7ab15123
--- /dev/null
+++ b/vendor/modernc.org/libc/sys/stat/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo sys/stat/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o sys/stat/stat_linux_amd64.go -pkgname stat', DO NOT EDIT.
+
+package stat
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/sys/stat/stat_linux_loong64.go b/vendor/modernc.org/libc/sys/stat/stat_linux_loong64.go
new file mode 100644
index 00000000..9c460d3a
--- /dev/null
+++ b/vendor/modernc.org/libc/sys/stat/stat_linux_loong64.go
@@ -0,0 +1,947 @@
+// Code generated by 'ccgo sys/stat/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o sys/stat/stat_linux_amd64.go -pkgname stat', DO NOT EDIT.
+
+package stat
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	ACCESSPERMS          = 511        // stat.h:195:1:
+	ALLPERMS             = 4095       // stat.h:196:1:
+	DEFFILEMODE          = 438        // stat.h:197:1:
+	S_BLKSIZE            = 512        // stat.h:199:1:
+	S_IEXEC              = 64         // stat.h:177:1:
+	S_IFBLK              = 24576      // stat.h:107:1:
+	S_IFCHR              = 8192       // stat.h:106:1:
+	S_IFDIR              = 16384      // stat.h:105:1:
+	S_IFIFO              = 4096       // stat.h:110:1:
+	S_IFLNK              = 40960      // stat.h:113:1:
+	S_IFMT               = 61440      // stat.h:104:1:
+	S_IFREG              = 32768      // stat.h:108:1:
+	S_IFSOCK             = 49152      // stat.h:117:1:
+	S_IREAD              = 256        // stat.h:175:1:
+	S_IRGRP              = 32         // stat.h:180:1:
+	S_IROTH              = 4          // stat.h:186:1:
+	S_IRUSR              = 256        // stat.h:168:1:
+	S_IRWXG              = 56         // stat.h:184:1:
+	S_IRWXO              = 7          // stat.h:190:1:
+	S_IRWXU              = 448        // stat.h:172:1:
+	S_ISGID              = 1024       // stat.h:161:1:
+	S_ISUID              = 2048       // stat.h:160:1:
+	S_ISVTX              = 512        // stat.h:165:1:
+	S_IWGRP              = 16         // stat.h:181:1:
+	S_IWOTH              = 2          // stat.h:187:1:
+	S_IWRITE             = 128        // stat.h:176:1:
+	S_IWUSR              = 128        // stat.h:169:1:
+	S_IXGRP              = 8          // stat.h:182:1:
+	S_IXOTH              = 1          // stat.h:188:1:
+	S_IXUSR              = 64         // stat.h:170:1:
+	UTIME_NOW            = 1073741823 // stat.h:206:1:
+	UTIME_OMIT           = 1073741822 // stat.h:207:1:
+	X_ATFILE_SOURCE      = 1          // features.h:342:1:
+	X_BITS_ENDIANNESS_H  = 1          // endianness.h:2:1:
+	X_BITS_ENDIAN_H      = 1          // endian.h:20:1:
+	X_BITS_STAT_H        = 1          // stat.h:23:1:
+	X_BITS_TIME64_H      = 1          // time64.h:24:1:
+	X_BITS_TYPESIZES_H   = 1          // typesizes.h:24:1:
+	X_BITS_TYPES_H       = 1          // types.h:24:1:
+	X_DEFAULT_SOURCE     = 1          // features.h:227:1:
+	X_FEATURES_H         = 1          // features.h:19:1:
+	X_FILE_OFFSET_BITS   = 64         // <builtin>:25:1:
+	X_LP64               = 1          // <predefined>:284:1:
+	X_MKNOD_VER          = 0          // stat.h:390:1:
+	X_MKNOD_VER_LINUX    = 0          // stat.h:41:1:
+	X_POSIX_C_SOURCE     = 200809     // features.h:281:1:
+	X_POSIX_SOURCE       = 1          // features.h:279:1:
+	X_STATBUF_ST_BLKSIZE = 0          // stat.h:172:1:
+	X_STATBUF_ST_NSEC    = 0          // stat.h:175:1:
+	X_STATBUF_ST_RDEV    = 0          // stat.h:173:1:
+	X_STAT_VER           = 1          // stat.h:44:1:
+	X_STAT_VER_KERNEL    = 0          // stat.h:37:1:
+	X_STAT_VER_LINUX     = 1          // stat.h:38:1:
+	X_STDC_PREDEF_H      = 1          // <predefined>:162:1:
+	X_STRUCT_TIMESPEC    = 1          // struct_timespec.h:3:1:
+	X_SYS_CDEFS_H        = 1          // cdefs.h:19:1:
+	X_SYS_STAT_H         = 1          // stat.h:23:1:
+	Linux                = 1          // <predefined>:231:1:
+	Unix                 = 1          // <predefined>:177:1:
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX Standard: 5.6 File Characteristics	<sys/stat.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// These are defined by the user (or the compiler)
+//    to specify the desired environment:
+//
+//    __STRICT_ANSI__	ISO Standard C.
+//    _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
+//    _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
+//    _ISOC2X_SOURCE	Extensions to ISO C99 from ISO C2X.
+//    __STDC_WANT_LIB_EXT2__
+// 			Extensions to ISO C99 from TR 27431-2:2010.
+//    __STDC_WANT_IEC_60559_BFP_EXT__
+// 			Extensions to ISO C11 from TS 18661-1:2014.
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__
+// 			Extensions to ISO C11 from TS 18661-4:2015.
+//    __STDC_WANT_IEC_60559_TYPES_EXT__
+// 			Extensions to ISO C11 from TS 18661-3:2015.
+//
+//    _POSIX_SOURCE	IEEE Std 1003.1.
+//    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
+// 			if >=199309L, add IEEE Std 1003.1b-1993;
+// 			if >=199506L, add IEEE Std 1003.1c-1995;
+// 			if >=200112L, all of IEEE 1003.1-2004
+// 			if >=200809L, all of IEEE 1003.1-2008
+//    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
+// 			Single Unix conformance is wanted, to 600 for the
+// 			sixth revision, to 700 for the seventh revision.
+//    _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
+//    _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
+//    _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
+//    _FILE_OFFSET_BITS=N	Select default filesystem interface.
+//    _ATFILE_SOURCE	Additional *at interfaces.
+//    _GNU_SOURCE		All of the above, plus GNU extensions.
+//    _DEFAULT_SOURCE	The default set of features (taking precedence over
+// 			__STRICT_ANSI__).
+//
+//    _FORTIFY_SOURCE	Add security hardening to many library functions.
+// 			Set to 1 or 2; 2 performs stricter checks than 1.
+//
+//    _REENTRANT, _THREAD_SAFE
+// 			Obsolete; equivalent to _POSIX_C_SOURCE=199506L.
+//
+//    The `-ansi' switch to the GNU C compiler, and standards conformance
+//    options such as `-std=c99', define __STRICT_ANSI__.  If none of
+//    these are defined, or if _DEFAULT_SOURCE is defined, the default is
+//    to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
+//    200809L, as well as enabling miscellaneous functions from BSD and
+//    SVID.  If more than one of these are defined, they accumulate.  For
+//    example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
+//    give you ISO C, 1003.1, and 1003.2, but nothing else.
+//
+//    These are defined by this file and are used by the
+//    header files to decide what to declare or define:
+//
+//    __GLIBC_USE (F)	Define things from feature set F.  This is defined
+// 			to 1 or 0; the subsequent macros are either defined
+// 			or undefined, and those tests should be moved to
+// 			__GLIBC_USE.
+//    __USE_ISOC11		Define ISO C11 things.
+//    __USE_ISOC99		Define ISO C99 things.
+//    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+//    __USE_ISOCXX11	Define ISO C++11 things.
+//    __USE_POSIX		Define IEEE Std 1003.1 things.
+//    __USE_POSIX2		Define IEEE Std 1003.2 things.
+//    __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
+//    __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
+//    __USE_XOPEN		Define XPG things.
+//    __USE_XOPEN_EXTENDED	Define X/Open Unix things.
+//    __USE_UNIX98		Define Single Unix V2 things.
+//    __USE_XOPEN2K        Define XPG6 things.
+//    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+//    __USE_XOPEN2K8       Define XPG7 things.
+//    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
+//    __USE_LARGEFILE	Define correct standard I/O things.
+//    __USE_LARGEFILE64	Define LFS things with separate names.
+//    __USE_FILE_OFFSET64	Define 64bit interface as default.
+//    __USE_MISC		Define things from 4.3BSD or System V Unix.
+//    __USE_ATFILE		Define *at interfaces and AT_* constants for them.
+//    __USE_GNU		Define GNU extensions.
+//    __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
+//
+//    The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
+//    defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
+//    only for compatibility.  All new code should use the other symbols
+//    to test for features.
+//
+//    All macros listed above as possibly being defined by this file are
+//    explicitly undefined if they are not explicitly defined.
+//    Feature-test macros that are not defined by the user or compiler
+//    but are implied by the other feature-test macros defined (or by the
+//    lack of any definitions) are defined by the file.
+//
+//    ISO C feature test macros depend on the definition of the macro
+//    when an affected header is included, not when the first system
+//    header is included, and so they are handled in
+//    <bits/libc-header-start.h>, which does not have a multiple include
+//    guard.  Feature test macros that can be handled from the first
+//    system header included are handled here.
+
+// Undefine everything, so we get a clean slate.
+
+// Suppress kernel-name space pollution unless user expressedly asks
+//    for it.
+
+// Convenience macro to test the version of gcc.
+//    Use like this:
+//    #if __GNUC_PREREQ (2,8)
+//    ... code requiring gcc 2.8 or later ...
+//    #endif
+//    Note: only works for GCC 2.0 and later, because __GNUC_MINOR__ was
+//    added in 2.0.
+
+// Similarly for clang.  Features added to GCC after version 4.2 may
+//    or may not also be available in clang, and clang's definitions of
+//    __GNUC(_MINOR)__ are fixed at 4 and 2 respectively.  Not all such
+//    features can be queried via __has_extension/__has_feature.
+
+// Whether to use feature set F.
+
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
+//    _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
+//    issue a warning; the expectation is that the source is being
+//    transitioned to use the new macro.
+
+// If _GNU_SOURCE was defined by the user, turn on all the other features.
+
+// If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
+//    define _DEFAULT_SOURCE.
+
+// This is to enable the ISO C2X extension.
+
+// This is to enable the ISO C11 extension.
+
+// This is to enable the ISO C99 extension.
+
+// This is to enable the ISO C90 Amendment 1:1995 extension.
+
+// If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
+//    is defined, use POSIX.1-2008 (or another version depending on
+//    _XOPEN_SOURCE).
+
+// Some C libraries once required _REENTRANT and/or _THREAD_SAFE to be
+//    defined in all multithreaded code.  GNU libc has not required this
+//    for many years.  We now treat them as compatibility synonyms for
+//    _POSIX_C_SOURCE=199506L, which is the earliest level of POSIX with
+//    comprehensive support for multithreaded code.  Using them never
+//    lowers the selected level of POSIX conformance, only raises it.
+
+// The function 'gets' existed in C89, but is impossible to use
+//    safely.  It has been removed from ISO C11 and ISO C++14.  Note: for
+//    compatibility with various implementations of <cstdio>, this test
+//    must consider only the value of __cplusplus when compiling C++.
+
+// GNU formerly extended the scanf functions with modified format
+//    specifiers %as, %aS, and %a[...] that allocate a buffer for the
+//    input using malloc.  This extension conflicts with ISO C99, which
+//    defines %a as a standalone format specifier that reads a floating-
+//    point number; moreover, POSIX.1-2008 provides the same feature
+//    using the modifier letter 'm' instead (%ms, %mS, %m[...]).
+//
+//    We now follow C99 unless GNU extensions are active and the compiler
+//    is specifically in C89 or C++98 mode (strict or not).  For
+//    instance, with GCC, -std=gnu11 will have C99-compliant scanf with
+//    or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
+//    old extension.
+
+// Get definitions of __STDC_* predefined macros, if the compiler has
+//    not preincluded this header automatically.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This macro indicates that the installed library is the GNU C Library.
+//    For historic reasons the value now is 6 and this will stay from now
+//    on.  The use of this variable is deprecated.  Use __GLIBC__ and
+//    __GLIBC_MINOR__ now (see below) when you want to test for a specific
+//    GNU C library version and use the values in <gnu/lib-names.h> to get
+//    the sonames of the shared libraries.
+
+// Major and minor version number of the GNU C library package.  Use
+//    these macros to test for features in specific releases.
+
+// This is here only because every header file already includes this one.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// We are almost always included from features.h.
+
+// The GNU libc does not support any K&R compilers or the traditional mode
+//    of ISO C compilers anymore.  Check for some of the combinations not
+//    anymore supported.
+
+// Some user header file might have defined this before.
+
+// All functions, except those with callbacks or those that
+//    synchronize memory, are leaf functions.
+
+// GCC can always grok prototypes.  For C++ programs we add throw()
+//    to help it optimize the function calls.  But this works only with
+//    gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+//    as non-throwing using a function attribute since programs can use
+//    the -fexceptions options for C code as well.
+
+// Compilers that are not clang may object to
+//        #if defined __clang__ && __has_extension(...)
+//    even though they do not need to evaluate the right-hand side of the &&.
+
+// These two macros are not used in glibc anymore.  They are kept here
+//    only because some other projects expect the macros to be defined.
+
+// For these things, GCC behaves the ANSI way normally,
+//    and the non-ANSI way under -traditional.
+
+// This is not a typedef so `const __ptr_t' does the right thing.
+
+// C++ needs to know that types and declarations are C, not C++.
+
+// Fortify support.
+
+// Support for flexible arrays.
+//    Headers that should use flexible arrays only if they're "real"
+//    (e.g. only if they won't affect sizeof()) should test
+//    #if __glibc_c99_flexarr_available.
+
+// __asm__ ("xyz") is used throughout the headers to rename functions
+//    at the assembly language level.  This is wrapped by the __REDIRECT
+//    macro, in order to support compilers that can do this some other
+//    way.  When compilers don't support asm-names at all, we have to do
+//    preprocessor tricks instead (which don't have exactly the right
+//    semantics, but it's the best we can do).
+//
+//    Example:
+//    int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid);
+
+//
+// #elif __SOME_OTHER_COMPILER__
+//
+// # define __REDIRECT(name, proto, alias) name proto; 	_Pragma("let " #name " = " #alias)
+
+// GCC has various useful declarations that can be made with the
+//    `__attribute__' syntax.  All of the ways we use this do fine if
+//    they are omitted for compilers that don't understand it.
+
+// At some point during the gcc 2.96 development the `malloc' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Tell the compiler which arguments to an allocation function
+//    indicate the size of the allocation.
+
+// At some point during the gcc 2.96 development the `pure' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// This declaration tells the compiler that the value is constant.
+
+// At some point during the gcc 3.1 development the `used' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Since version 3.2, gcc allows marking deprecated functions.
+
+// Since version 4.5, gcc also allows one to specify the message printed
+//    when a deprecated function is used.  clang claims to be gcc 4.2, but
+//    may also support this feature.
+
+// At some point during the gcc 2.8 development the `format_arg' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+//    If several `format_arg' attributes are given for the same function, in
+//    gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+//    all designated arguments are considered.
+
+// At some point during the gcc 2.97 development the `strfmon' format
+//    attribute for functions was introduced.  We don't want to use it
+//    unconditionally (although this would be possible) since it
+//    generates warnings.
+
+// The nonull function attribute allows to mark pointer parameters which
+//    must not be NULL.
+
+// If fortification mode, we warn about unused results of certain
+//    function calls which can lead to problems.
+
+// Forces a function to be always inlined.
+// The Linux kernel defines __always_inline in stddef.h (283d7573), and
+//    it conflicts with this definition.  Therefore undefine it first to
+//    allow either header to be included first.
+
+// Associate error messages with the source location of the call site rather
+//    than with the source location inside the function.
+
+// GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+//    inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
+//    or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+//    older than 4.3 may define these macros and still not guarantee GNU inlining
+//    semantics.
+//
+//    clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+//    semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
+//    __GNUC_GNU_INLINE__ macro definitions.
+
+// GCC 4.3 and above allow passing all anonymous arguments of an
+//    __extern_always_inline function to some other vararg function.
+
+// It is possible to compile containing GCC extensions even if GCC is
+//    run in pedantic mode if the uses are carefully marked using the
+//    `__extension__' keyword.  But this is not generally available before
+//    version 2.8.
+
+// __restrict is known in EGCS 1.2 and above.
+
+// ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+//      array_name[restrict]
+//    GCC 3.1 supports this.
+
+// Describes a char array whose address can safely be passed as the first
+//    argument to strncpy and strncat, as the char array is not necessarily
+//    a NUL-terminated string.
+
+// Undefine (also defined in libc-symbols.h).
+// Copies attributes from the declaration or type referenced by
+//    the argument.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// __glibc_macro_warning (MESSAGE) issues warning MESSAGE.  This is
+//    intended for use in preprocessor macros.
+//
+//    Note: MESSAGE must be a _single_ string; concatenation of string
+//    literals is not supported.
+
+// Generic selection (ISO C11) is a C-only feature, available in GCC
+//    since version 4.9.  Previous versions do not provide generic
+//    selection, even though they might set __STDC_VERSION__ to 201112L,
+//    when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
+//    when testing __STDC_VERSION__ for generic selection support.
+//    On the other hand, Clang also defines __GNUC__, so a clang-specific
+//    check is required to enable the use of generic selection.
+
+// If we don't have __REDIRECT, prototypes will be missing if
+//    __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64].
+
+// Decide whether we can define 'extern inline' functions in headers.
+
+// This is here only because every header file already includes this one.
+//    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
+//    <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+//    that will always return failure (and set errno to ENOSYS).
+// This file is automatically generated.
+//    This file selects the right generated file of `__stub_FUNCTION' macros
+//    based on the architecture being compiled for.
+
+// This file is automatically generated.
+//    It defines a symbol `__stub_FUNCTION' for each function
+//    in the C library which is a stub, meaning it will fail
+//    every time called, usually setting errno to ENOSYS.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Seconds since the Epoch, visible to user code when time_t is too
+//    narrow only for consistency with the old way of widening too-narrow
+//    types.  User code should never use __time64_t.
+
+// NB: Include guard matches what <linux/time.h> uses.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Endian macros for string.h functions
+//    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+// Definitions for byte order, according to significance of bytes,
+//    from low addresses to high addresses.  The value is what you get by
+//    putting '4' in the most significant byte, '3' in the second most
+//    significant byte, '2' in the second least significant byte, and '1'
+//    in the least significant byte, and then writing down one digit for
+//    each byte, starting with the byte at the lowest address at the left,
+//    and proceeding to the byte with the highest address at the right.
+
+// This file defines `__BYTE_ORDER' for the particular machine.
+
+// i386/x86_64 are little-endian.
+
+// Some machines may need to use a different endianness for floating point
+//    values.
+
+// POSIX.1b structure for a time value.  This is like a `struct timeval' but
+//
+//	has nanoseconds instead of microseconds.
+type Timespec = struct {
+	Ftv_sec  X__time_t
+	Ftv_nsec X__syscall_slong_t
+} /* struct_timespec.h:10:1 */
+
+// The Single Unix specification says that some more types are
+//    available here.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `time'.
+type Time_t = X__time_t /* time_t.h:7:18 */
+
+type Dev_t = X__dev_t /* stat.h:40:17 */
+
+type Gid_t = X__gid_t /* stat.h:45:17 */
+
+type Ino_t = X__ino64_t /* stat.h:53:19 */
+
+type Mode_t = X__mode_t /* stat.h:59:18 */
+
+type Nlink_t = X__nlink_t /* stat.h:64:19 */
+
+type Off_t = X__off64_t /* stat.h:72:19 */
+
+type Uid_t = X__uid_t /* stat.h:78:17 */
+
+// Copyright (C) 1999-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Versions of the `struct stat' data structure.
+
+// x86-64 versions of the `xmknod' interface.
+
+type Stat = struct {
+	Fst_dev     X__dev_t
+	Fst_ino     X__ino_t
+	Fst_nlink   X__nlink_t
+	Fst_mode    X__mode_t
+	Fst_uid     X__uid_t
+	Fst_gid     X__gid_t
+	F__pad0     int32
+	Fst_rdev    X__dev_t
+	Fst_size    X__off_t
+	Fst_blksize X__blksize_t
+	Fst_blocks  X__blkcnt_t
+	Fst_atim    struct {
+		Ftv_sec  X__time_t
+		Ftv_nsec X__syscall_slong_t
+	}
+	Fst_mtim struct {
+		Ftv_sec  X__time_t
+		Ftv_nsec X__syscall_slong_t
+	}
+	Fst_ctim struct {
+		Ftv_sec  X__time_t
+		Ftv_nsec X__syscall_slong_t
+	}
+	F__glibc_reserved [3]X__syscall_slong_t
+} /* stat.h:46:1 */
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/sys/types/capi_linux_loong64.go b/vendor/modernc.org/libc/sys/types/capi_linux_loong64.go
new file mode 100644
index 00000000..76280065
--- /dev/null
+++ b/vendor/modernc.org/libc/sys/types/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo sys/types/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o sys/types/types_linux_amd64.go -pkgname types', DO NOT EDIT.
+
+package types
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/sys/types/types_linux_loong64.go b/vendor/modernc.org/libc/sys/types/types_linux_loong64.go
new file mode 100644
index 00000000..8a758d4c
--- /dev/null
+++ b/vendor/modernc.org/libc/sys/types/types_linux_loong64.go
@@ -0,0 +1,1511 @@
+// Code generated by 'ccgo sys/types/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o sys/types/types_linux_amd64.go -pkgname types', DO NOT EDIT.
+
+package types
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	BIG_ENDIAN                   = 4321   // endian.h:28:1:
+	BYTE_ORDER                   = 1234   // endian.h:30:1:
+	FD_SETSIZE                   = 1024   // select.h:73:1:
+	LITTLE_ENDIAN                = 1234   // endian.h:27:1:
+	PDP_ENDIAN                   = 3412   // endian.h:29:1:
+	X_ATFILE_SOURCE              = 1      // features.h:342:1:
+	X_BITS_BYTESWAP_H            = 1      // byteswap.h:24:1:
+	X_BITS_ENDIANNESS_H          = 1      // endianness.h:2:1:
+	X_BITS_ENDIAN_H              = 1      // endian.h:20:1:
+	X_BITS_PTHREADTYPES_ARCH_H   = 1      // pthreadtypes-arch.h:19:1:
+	X_BITS_PTHREADTYPES_COMMON_H = 1      // pthreadtypes.h:20:1:
+	X_BITS_STDINT_INTN_H         = 1      // stdint-intn.h:20:1:
+	X_BITS_TIME64_H              = 1      // time64.h:24:1:
+	X_BITS_TYPESIZES_H           = 1      // typesizes.h:24:1:
+	X_BITS_TYPES_H               = 1      // types.h:24:1:
+	X_BITS_UINTN_IDENTITY_H      = 1      // uintn-identity.h:24:1:
+	X_BSD_SIZE_T_                = 0      // stddef.h:189:1:
+	X_BSD_SIZE_T_DEFINED_        = 0      // stddef.h:192:1:
+	X_DEFAULT_SOURCE             = 1      // features.h:227:1:
+	X_ENDIAN_H                   = 1      // endian.h:19:1:
+	X_FEATURES_H                 = 1      // features.h:19:1:
+	X_FILE_OFFSET_BITS           = 64     // <builtin>:25:1:
+	X_GCC_SIZE_T                 = 0      // stddef.h:195:1:
+	X_LP64                       = 1      // <predefined>:284:1:
+	X_POSIX_C_SOURCE             = 200809 // features.h:281:1:
+	X_POSIX_SOURCE               = 1      // features.h:279:1:
+	X_RWLOCK_INTERNAL_H          = 0      // struct_rwlock.h:21:1:
+	X_SIZET_                     = 0      // stddef.h:196:1:
+	X_SIZE_T                     = 0      // stddef.h:183:1:
+	X_SIZE_T_                    = 0      // stddef.h:188:1:
+	X_SIZE_T_DECLARED            = 0      // stddef.h:193:1:
+	X_SIZE_T_DEFINED             = 0      // stddef.h:191:1:
+	X_SIZE_T_DEFINED_            = 0      // stddef.h:190:1:
+	X_STDC_PREDEF_H              = 1      // <predefined>:162:1:
+	X_STRUCT_TIMESPEC            = 1      // struct_timespec.h:3:1:
+	X_SYS_CDEFS_H                = 1      // cdefs.h:19:1:
+	X_SYS_SELECT_H               = 1      // select.h:22:1:
+	X_SYS_SIZE_T_H               = 0      // stddef.h:184:1:
+	X_SYS_TYPES_H                = 1      // types.h:23:1:
+	X_THREAD_MUTEX_INTERNAL_H    = 1      // struct_mutex.h:20:1:
+	X_THREAD_SHARED_TYPES_H      = 1      // thread-shared-types.h:20:1:
+	X_T_SIZE                     = 0      // stddef.h:186:1:
+	X_T_SIZE_                    = 0      // stddef.h:185:1:
+	Linux                        = 1      // <predefined>:231:1:
+	Unix                         = 1      // <predefined>:177:1:
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX Standard: 2.6 Primitive System Data Types	<sys/types.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// These are defined by the user (or the compiler)
+//    to specify the desired environment:
+//
+//    __STRICT_ANSI__	ISO Standard C.
+//    _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
+//    _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
+//    _ISOC2X_SOURCE	Extensions to ISO C99 from ISO C2X.
+//    __STDC_WANT_LIB_EXT2__
+// 			Extensions to ISO C99 from TR 27431-2:2010.
+//    __STDC_WANT_IEC_60559_BFP_EXT__
+// 			Extensions to ISO C11 from TS 18661-1:2014.
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__
+// 			Extensions to ISO C11 from TS 18661-4:2015.
+//    __STDC_WANT_IEC_60559_TYPES_EXT__
+// 			Extensions to ISO C11 from TS 18661-3:2015.
+//
+//    _POSIX_SOURCE	IEEE Std 1003.1.
+//    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
+// 			if >=199309L, add IEEE Std 1003.1b-1993;
+// 			if >=199506L, add IEEE Std 1003.1c-1995;
+// 			if >=200112L, all of IEEE 1003.1-2004
+// 			if >=200809L, all of IEEE 1003.1-2008
+//    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
+// 			Single Unix conformance is wanted, to 600 for the
+// 			sixth revision, to 700 for the seventh revision.
+//    _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
+//    _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
+//    _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
+//    _FILE_OFFSET_BITS=N	Select default filesystem interface.
+//    _ATFILE_SOURCE	Additional *at interfaces.
+//    _GNU_SOURCE		All of the above, plus GNU extensions.
+//    _DEFAULT_SOURCE	The default set of features (taking precedence over
+// 			__STRICT_ANSI__).
+//
+//    _FORTIFY_SOURCE	Add security hardening to many library functions.
+// 			Set to 1 or 2; 2 performs stricter checks than 1.
+//
+//    _REENTRANT, _THREAD_SAFE
+// 			Obsolete; equivalent to _POSIX_C_SOURCE=199506L.
+//
+//    The `-ansi' switch to the GNU C compiler, and standards conformance
+//    options such as `-std=c99', define __STRICT_ANSI__.  If none of
+//    these are defined, or if _DEFAULT_SOURCE is defined, the default is
+//    to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
+//    200809L, as well as enabling miscellaneous functions from BSD and
+//    SVID.  If more than one of these are defined, they accumulate.  For
+//    example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
+//    give you ISO C, 1003.1, and 1003.2, but nothing else.
+//
+//    These are defined by this file and are used by the
+//    header files to decide what to declare or define:
+//
+//    __GLIBC_USE (F)	Define things from feature set F.  This is defined
+// 			to 1 or 0; the subsequent macros are either defined
+// 			or undefined, and those tests should be moved to
+// 			__GLIBC_USE.
+//    __USE_ISOC11		Define ISO C11 things.
+//    __USE_ISOC99		Define ISO C99 things.
+//    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+//    __USE_ISOCXX11	Define ISO C++11 things.
+//    __USE_POSIX		Define IEEE Std 1003.1 things.
+//    __USE_POSIX2		Define IEEE Std 1003.2 things.
+//    __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
+//    __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
+//    __USE_XOPEN		Define XPG things.
+//    __USE_XOPEN_EXTENDED	Define X/Open Unix things.
+//    __USE_UNIX98		Define Single Unix V2 things.
+//    __USE_XOPEN2K        Define XPG6 things.
+//    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+//    __USE_XOPEN2K8       Define XPG7 things.
+//    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
+//    __USE_LARGEFILE	Define correct standard I/O things.
+//    __USE_LARGEFILE64	Define LFS things with separate names.
+//    __USE_FILE_OFFSET64	Define 64bit interface as default.
+//    __USE_MISC		Define things from 4.3BSD or System V Unix.
+//    __USE_ATFILE		Define *at interfaces and AT_* constants for them.
+//    __USE_GNU		Define GNU extensions.
+//    __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
+//
+//    The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
+//    defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
+//    only for compatibility.  All new code should use the other symbols
+//    to test for features.
+//
+//    All macros listed above as possibly being defined by this file are
+//    explicitly undefined if they are not explicitly defined.
+//    Feature-test macros that are not defined by the user or compiler
+//    but are implied by the other feature-test macros defined (or by the
+//    lack of any definitions) are defined by the file.
+//
+//    ISO C feature test macros depend on the definition of the macro
+//    when an affected header is included, not when the first system
+//    header is included, and so they are handled in
+//    <bits/libc-header-start.h>, which does not have a multiple include
+//    guard.  Feature test macros that can be handled from the first
+//    system header included are handled here.
+
+// Undefine everything, so we get a clean slate.
+
+// Suppress kernel-name space pollution unless user expressedly asks
+//    for it.
+
+// Convenience macro to test the version of gcc.
+//    Use like this:
+//    #if __GNUC_PREREQ (2,8)
+//    ... code requiring gcc 2.8 or later ...
+//    #endif
+//    Note: only works for GCC 2.0 and later, because __GNUC_MINOR__ was
+//    added in 2.0.
+
+// Similarly for clang.  Features added to GCC after version 4.2 may
+//    or may not also be available in clang, and clang's definitions of
+//    __GNUC(_MINOR)__ are fixed at 4 and 2 respectively.  Not all such
+//    features can be queried via __has_extension/__has_feature.
+
+// Whether to use feature set F.
+
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
+//    _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
+//    issue a warning; the expectation is that the source is being
+//    transitioned to use the new macro.
+
+// If _GNU_SOURCE was defined by the user, turn on all the other features.
+
+// If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
+//    define _DEFAULT_SOURCE.
+
+// This is to enable the ISO C2X extension.
+
+// This is to enable the ISO C11 extension.
+
+// This is to enable the ISO C99 extension.
+
+// This is to enable the ISO C90 Amendment 1:1995 extension.
+
+// If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
+//    is defined, use POSIX.1-2008 (or another version depending on
+//    _XOPEN_SOURCE).
+
+// Some C libraries once required _REENTRANT and/or _THREAD_SAFE to be
+//    defined in all multithreaded code.  GNU libc has not required this
+//    for many years.  We now treat them as compatibility synonyms for
+//    _POSIX_C_SOURCE=199506L, which is the earliest level of POSIX with
+//    comprehensive support for multithreaded code.  Using them never
+//    lowers the selected level of POSIX conformance, only raises it.
+
+// The function 'gets' existed in C89, but is impossible to use
+//    safely.  It has been removed from ISO C11 and ISO C++14.  Note: for
+//    compatibility with various implementations of <cstdio>, this test
+//    must consider only the value of __cplusplus when compiling C++.
+
+// GNU formerly extended the scanf functions with modified format
+//    specifiers %as, %aS, and %a[...] that allocate a buffer for the
+//    input using malloc.  This extension conflicts with ISO C99, which
+//    defines %a as a standalone format specifier that reads a floating-
+//    point number; moreover, POSIX.1-2008 provides the same feature
+//    using the modifier letter 'm' instead (%ms, %mS, %m[...]).
+//
+//    We now follow C99 unless GNU extensions are active and the compiler
+//    is specifically in C89 or C++98 mode (strict or not).  For
+//    instance, with GCC, -std=gnu11 will have C99-compliant scanf with
+//    or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
+//    old extension.
+
+// Get definitions of __STDC_* predefined macros, if the compiler has
+//    not preincluded this header automatically.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This macro indicates that the installed library is the GNU C Library.
+//    For historic reasons the value now is 6 and this will stay from now
+//    on.  The use of this variable is deprecated.  Use __GLIBC__ and
+//    __GLIBC_MINOR__ now (see below) when you want to test for a specific
+//    GNU C library version and use the values in <gnu/lib-names.h> to get
+//    the sonames of the shared libraries.
+
+// Major and minor version number of the GNU C library package.  Use
+//    these macros to test for features in specific releases.
+
+// This is here only because every header file already includes this one.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// We are almost always included from features.h.
+
+// The GNU libc does not support any K&R compilers or the traditional mode
+//    of ISO C compilers anymore.  Check for some of the combinations not
+//    anymore supported.
+
+// Some user header file might have defined this before.
+
+// All functions, except those with callbacks or those that
+//    synchronize memory, are leaf functions.
+
+// GCC can always grok prototypes.  For C++ programs we add throw()
+//    to help it optimize the function calls.  But this works only with
+//    gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+//    as non-throwing using a function attribute since programs can use
+//    the -fexceptions options for C code as well.
+
+// Compilers that are not clang may object to
+//        #if defined __clang__ && __has_extension(...)
+//    even though they do not need to evaluate the right-hand side of the &&.
+
+// These two macros are not used in glibc anymore.  They are kept here
+//    only because some other projects expect the macros to be defined.
+
+// For these things, GCC behaves the ANSI way normally,
+//    and the non-ANSI way under -traditional.
+
+// This is not a typedef so `const __ptr_t' does the right thing.
+
+// C++ needs to know that types and declarations are C, not C++.
+
+// Fortify support.
+
+// Support for flexible arrays.
+//    Headers that should use flexible arrays only if they're "real"
+//    (e.g. only if they won't affect sizeof()) should test
+//    #if __glibc_c99_flexarr_available.
+
+// __asm__ ("xyz") is used throughout the headers to rename functions
+//    at the assembly language level.  This is wrapped by the __REDIRECT
+//    macro, in order to support compilers that can do this some other
+//    way.  When compilers don't support asm-names at all, we have to do
+//    preprocessor tricks instead (which don't have exactly the right
+//    semantics, but it's the best we can do).
+//
+//    Example:
+//    int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid);
+
+//
+// #elif __SOME_OTHER_COMPILER__
+//
+// # define __REDIRECT(name, proto, alias) name proto; 	_Pragma("let " #name " = " #alias)
+
+// GCC has various useful declarations that can be made with the
+//    `__attribute__' syntax.  All of the ways we use this do fine if
+//    they are omitted for compilers that don't understand it.
+
+// At some point during the gcc 2.96 development the `malloc' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Tell the compiler which arguments to an allocation function
+//    indicate the size of the allocation.
+
+// At some point during the gcc 2.96 development the `pure' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// This declaration tells the compiler that the value is constant.
+
+// At some point during the gcc 3.1 development the `used' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Since version 3.2, gcc allows marking deprecated functions.
+
+// Since version 4.5, gcc also allows one to specify the message printed
+//    when a deprecated function is used.  clang claims to be gcc 4.2, but
+//    may also support this feature.
+
+// At some point during the gcc 2.8 development the `format_arg' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+//    If several `format_arg' attributes are given for the same function, in
+//    gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+//    all designated arguments are considered.
+
+// At some point during the gcc 2.97 development the `strfmon' format
+//    attribute for functions was introduced.  We don't want to use it
+//    unconditionally (although this would be possible) since it
+//    generates warnings.
+
+// The nonull function attribute allows to mark pointer parameters which
+//    must not be NULL.
+
+// If fortification mode, we warn about unused results of certain
+//    function calls which can lead to problems.
+
+// Forces a function to be always inlined.
+// The Linux kernel defines __always_inline in stddef.h (283d7573), and
+//    it conflicts with this definition.  Therefore undefine it first to
+//    allow either header to be included first.
+
+// Associate error messages with the source location of the call site rather
+//    than with the source location inside the function.
+
+// GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+//    inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
+//    or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+//    older than 4.3 may define these macros and still not guarantee GNU inlining
+//    semantics.
+//
+//    clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+//    semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
+//    __GNUC_GNU_INLINE__ macro definitions.
+
+// GCC 4.3 and above allow passing all anonymous arguments of an
+//    __extern_always_inline function to some other vararg function.
+
+// It is possible to compile containing GCC extensions even if GCC is
+//    run in pedantic mode if the uses are carefully marked using the
+//    `__extension__' keyword.  But this is not generally available before
+//    version 2.8.
+
+// __restrict is known in EGCS 1.2 and above.
+
+// ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+//      array_name[restrict]
+//    GCC 3.1 supports this.
+
+// Describes a char array whose address can safely be passed as the first
+//    argument to strncpy and strncat, as the char array is not necessarily
+//    a NUL-terminated string.
+
+// Undefine (also defined in libc-symbols.h).
+// Copies attributes from the declaration or type referenced by
+//    the argument.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// __glibc_macro_warning (MESSAGE) issues warning MESSAGE.  This is
+//    intended for use in preprocessor macros.
+//
+//    Note: MESSAGE must be a _single_ string; concatenation of string
+//    literals is not supported.
+
+// Generic selection (ISO C11) is a C-only feature, available in GCC
+//    since version 4.9.  Previous versions do not provide generic
+//    selection, even though they might set __STDC_VERSION__ to 201112L,
+//    when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
+//    when testing __STDC_VERSION__ for generic selection support.
+//    On the other hand, Clang also defines __GNUC__, so a clang-specific
+//    check is required to enable the use of generic selection.
+
+// If we don't have __REDIRECT, prototypes will be missing if
+//    __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64].
+
+// Decide whether we can define 'extern inline' functions in headers.
+
+// This is here only because every header file already includes this one.
+//    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
+//    <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+//    that will always return failure (and set errno to ENOSYS).
+// This file is automatically generated.
+//    This file selects the right generated file of `__stub_FUNCTION' macros
+//    based on the architecture being compiled for.
+
+// This file is automatically generated.
+//    It defines a symbol `__stub_FUNCTION' for each function
+//    in the C library which is a stub, meaning it will fail
+//    every time called, usually setting errno to ENOSYS.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Seconds since the Epoch, visible to user code when time_t is too
+//    narrow only for consistency with the old way of widening too-narrow
+//    types.  User code should never use __time64_t.
+
+type U_char = X__u_char     /* types.h:33:18 */
+type U_short = X__u_short   /* types.h:34:19 */
+type U_int = X__u_int       /* types.h:35:17 */
+type U_long = X__u_long     /* types.h:36:18 */
+type Quad_t = X__quad_t     /* types.h:37:18 */
+type U_quad_t = X__u_quad_t /* types.h:38:20 */
+type Fsid_t = X__fsid_t     /* types.h:39:18 */
+type Loff_t = X__loff_t     /* types.h:42:18 */
+
+type Ino_t = X__ino64_t /* types.h:49:19 */
+
+type Dev_t = X__dev_t /* types.h:59:17 */
+
+type Gid_t = X__gid_t /* types.h:64:17 */
+
+type Mode_t = X__mode_t /* types.h:69:18 */
+
+type Nlink_t = X__nlink_t /* types.h:74:19 */
+
+type Uid_t = X__uid_t /* types.h:79:17 */
+
+type Off_t = X__off64_t /* types.h:87:19 */
+
+type Pid_t = X__pid_t /* types.h:97:17 */
+
+type Id_t = X__id_t /* types.h:103:16 */
+
+type Ssize_t = X__ssize_t /* types.h:108:19 */
+
+type Daddr_t = X__daddr_t /* types.h:114:19 */
+type Caddr_t = X__caddr_t /* types.h:115:19 */
+
+type Key_t = X__key_t /* types.h:121:17 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `clock'.
+type Clock_t = X__clock_t /* clock_t.h:7:19 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Clock ID used in clock and timer functions.
+type Clockid_t = X__clockid_t /* clockid_t.h:7:21 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `time'.
+type Time_t = X__time_t /* time_t.h:7:18 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Timer ID returned by `timer_create'.
+type Timer_t = X__timer_t /* timer_t.h:7:19 */
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// Old compatibility names for C types.
+type Ulong = uint64  /* types.h:148:27 */
+type Ushort = uint16 /* types.h:149:28 */
+type Uint = uint32   /* types.h:150:22 */
+
+// These size-specific names are used by some of the inet code.
+
+// Define intN_t types.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+type Int8_t = X__int8_t   /* stdint-intn.h:24:18 */
+type Int16_t = X__int16_t /* stdint-intn.h:25:19 */
+type Int32_t = X__int32_t /* stdint-intn.h:26:19 */
+type Int64_t = X__int64_t /* stdint-intn.h:27:19 */
+
+// These were defined by ISO C without the first `_'.
+type U_int8_t = X__uint8_t   /* types.h:158:19 */
+type U_int16_t = X__uint16_t /* types.h:159:20 */
+type U_int32_t = X__uint32_t /* types.h:160:20 */
+type U_int64_t = X__uint64_t /* types.h:161:20 */
+
+type Register_t = int32 /* types.h:164:13 */
+
+// It also defines `fd_set' and the FD_* macros for `select'.
+// `fd_set' type and related macros, and `select'/`pselect' declarations.
+//    Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX 1003.1g: 6.2 Select from File Descriptor Sets <sys/select.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Get definition of needed basic types.
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Get __FD_* definitions.
+// Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Get sigset_t.
+
+type X__sigset_t = struct{ F__val [16]uint64 } /* __sigset_t.h:8:3 */
+
+// A set of signals to be blocked, unblocked, or waited for.
+type Sigset_t = X__sigset_t /* sigset_t.h:7:20 */
+
+// Get definition of timer specification structures.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// A time value that is accurate to the nearest
+//
+//	microsecond but also has a range of years.
+type Timeval = struct {
+	Ftv_sec  X__time_t
+	Ftv_usec X__suseconds_t
+} /* struct_timeval.h:8:1 */
+
+// NB: Include guard matches what <linux/time.h> uses.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Endian macros for string.h functions
+//    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+// POSIX.1b structure for a time value.  This is like a `struct timeval' but
+//
+//	has nanoseconds instead of microseconds.
+type Timespec = struct {
+	Ftv_sec  X__time_t
+	Ftv_nsec X__syscall_slong_t
+} /* struct_timespec.h:10:1 */
+
+type Suseconds_t = X__suseconds_t /* select.h:43:23 */
+
+// The fd_set member is required to be an array of longs.
+type X__fd_mask = int64 /* select.h:49:18 */
+
+// Some versions of <linux/posix_types.h> define this macros.
+// It's easier to assume 8-bit bytes than to get CHAR_BIT.
+
+// fd_set for select and pselect.
+type Fd_set = struct{ F__fds_bits [16]X__fd_mask } /* select.h:70:5 */
+
+// Maximum number of file descriptors in `fd_set'.
+
+// Sometimes the fd_set member is assumed to have this type.
+type Fd_mask = X__fd_mask /* select.h:77:19 */
+
+// Define some inlines helping to catch common problems.
+
+type Blksize_t = X__blksize_t /* types.h:185:21 */
+
+// Types from the Large File Support interface.
+type Blkcnt_t = X__blkcnt64_t     /* types.h:205:22 */ // Type to count number of disk blocks.
+type Fsblkcnt_t = X__fsblkcnt64_t /* types.h:209:24 */ // Type to count file system blocks.
+type Fsfilcnt_t = X__fsfilcnt64_t /* types.h:213:24 */ // Type to count file system inodes.
+
+// Now add the thread types.
+// Declaration of common pthread types for all architectures.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For internal mutex and condition variable definitions.
+// Common threading primitives definitions for both POSIX and C11.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Arch-specific definitions.  Each architecture must define the following
+//    macros to define the expected sizes of pthread data types:
+//
+//    __SIZEOF_PTHREAD_ATTR_T        - size of pthread_attr_t.
+//    __SIZEOF_PTHREAD_MUTEX_T       - size of pthread_mutex_t.
+//    __SIZEOF_PTHREAD_MUTEXATTR_T   - size of pthread_mutexattr_t.
+//    __SIZEOF_PTHREAD_COND_T        - size of pthread_cond_t.
+//    __SIZEOF_PTHREAD_CONDATTR_T    - size of pthread_condattr_t.
+//    __SIZEOF_PTHREAD_RWLOCK_T      - size of pthread_rwlock_t.
+//    __SIZEOF_PTHREAD_RWLOCKATTR_T  - size of pthread_rwlockattr_t.
+//    __SIZEOF_PTHREAD_BARRIER_T     - size of pthread_barrier_t.
+//    __SIZEOF_PTHREAD_BARRIERATTR_T - size of pthread_barrierattr_t.
+//
+//    The additional macro defines any constraint for the lock alignment
+//    inside the thread structures:
+//
+//    __LOCK_ALIGNMENT - for internal lock/futex usage.
+//
+//    Same idea but for the once locking primitive:
+//
+//    __ONCE_ALIGNMENT - for pthread_once_t/once_flag definition.
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Common definition of pthread_mutex_t.
+
+type X__pthread_internal_list = struct {
+	F__prev uintptr
+	F__next uintptr
+} /* thread-shared-types.h:49:9 */
+
+// Type to count file system inodes.
+
+// Now add the thread types.
+// Declaration of common pthread types for all architectures.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For internal mutex and condition variable definitions.
+// Common threading primitives definitions for both POSIX and C11.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Arch-specific definitions.  Each architecture must define the following
+//    macros to define the expected sizes of pthread data types:
+//
+//    __SIZEOF_PTHREAD_ATTR_T        - size of pthread_attr_t.
+//    __SIZEOF_PTHREAD_MUTEX_T       - size of pthread_mutex_t.
+//    __SIZEOF_PTHREAD_MUTEXATTR_T   - size of pthread_mutexattr_t.
+//    __SIZEOF_PTHREAD_COND_T        - size of pthread_cond_t.
+//    __SIZEOF_PTHREAD_CONDATTR_T    - size of pthread_condattr_t.
+//    __SIZEOF_PTHREAD_RWLOCK_T      - size of pthread_rwlock_t.
+//    __SIZEOF_PTHREAD_RWLOCKATTR_T  - size of pthread_rwlockattr_t.
+//    __SIZEOF_PTHREAD_BARRIER_T     - size of pthread_barrier_t.
+//    __SIZEOF_PTHREAD_BARRIERATTR_T - size of pthread_barrierattr_t.
+//
+//    The additional macro defines any constraint for the lock alignment
+//    inside the thread structures:
+//
+//    __LOCK_ALIGNMENT - for internal lock/futex usage.
+//
+//    Same idea but for the once locking primitive:
+//
+//    __ONCE_ALIGNMENT - for pthread_once_t/once_flag definition.
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Common definition of pthread_mutex_t.
+
+type X__pthread_list_t = X__pthread_internal_list /* thread-shared-types.h:53:3 */
+
+type X__pthread_internal_slist = struct{ F__next uintptr } /* thread-shared-types.h:55:9 */
+
+type X__pthread_slist_t = X__pthread_internal_slist /* thread-shared-types.h:58:3 */
+
+// Arch-specific mutex definitions.  A generic implementation is provided
+//    by sysdeps/nptl/bits/struct_mutex.h.  If required, an architecture
+//    can override it by defining:
+//
+//    1. struct __pthread_mutex_s (used on both pthread_mutex_t and mtx_t
+//       definition).  It should contains at least the internal members
+//       defined in the generic version.
+//
+//    2. __LOCK_ALIGNMENT for any extra attribute for internal lock used with
+//       atomic operations.
+//
+//    3. The macro __PTHREAD_MUTEX_INITIALIZER used for static initialization.
+//       It should initialize the mutex internal flag.
+
+// x86 internal mutex struct definitions.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+type X__pthread_mutex_s = struct {
+	F__lock    int32
+	F__count   uint32
+	F__owner   int32
+	F__nusers  uint32
+	F__kind    int32
+	F__spins   int16
+	F__elision int16
+	F__list    X__pthread_list_t
+} /* struct_mutex.h:22:1 */
+
+// Arch-sepecific read-write lock definitions.  A generic implementation is
+//    provided by struct_rwlock.h.  If required, an architecture can override it
+//    by defining:
+//
+//    1. struct __pthread_rwlock_arch_t (used on pthread_rwlock_t definition).
+//       It should contain at least the internal members defined in the
+//       generic version.
+//
+//    2. The macro __PTHREAD_RWLOCK_INITIALIZER used for static initialization.
+//       It should initialize the rwlock internal type.
+
+// x86 internal rwlock struct definitions.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+type X__pthread_rwlock_arch_t = struct {
+	F__readers       uint32
+	F__writers       uint32
+	F__wrphase_futex uint32
+	F__writers_futex uint32
+	F__pad3          uint32
+	F__pad4          uint32
+	F__cur_writer    int32
+	F__shared        int32
+	F__rwelision     int8
+	F__pad1          [7]uint8
+	F__pad2          uint64
+	F__flags         uint32
+	F__ccgo_pad1     [4]byte
+} /* struct_rwlock.h:23:1 */
+
+// Common definition of pthread_cond_t.
+
+type X__pthread_cond_s = struct {
+	F__0            struct{ F__wseq uint64 }
+	F__8            struct{ F__g1_start uint64 }
+	F__g_refs       [2]uint32
+	F__g_size       [2]uint32
+	F__g1_orig_size uint32
+	F__wrefs        uint32
+	F__g_signals    [2]uint32
+} /* thread-shared-types.h:92:1 */
+
+// Thread identifiers.  The structure of the attribute type is not
+//
+//	exposed on purpose.
+type Pthread_t = uint64 /* pthreadtypes.h:27:27 */
+
+// Data structures for mutex handling.  The structure of the attribute
+//
+//	type is not exposed on purpose.
+type Pthread_mutexattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:36:3 */
+
+// Data structure for condition variable handling.  The structure of
+//
+//	the attribute type is not exposed on purpose.
+type Pthread_condattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:45:3 */
+
+// Keys for thread-specific data
+type Pthread_key_t = uint32 /* pthreadtypes.h:49:22 */
+
+// Once-only execution
+type Pthread_once_t = int32 /* pthreadtypes.h:53:30 */
+
+type Pthread_attr_t1 = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [56]int8
+} /* pthreadtypes.h:56:1 */
+
+type Pthread_attr_t = Pthread_attr_t1 /* pthreadtypes.h:62:30 */
+
+type Pthread_mutex_t = struct{ F__data X__pthread_mutex_s } /* pthreadtypes.h:72:3 */
+
+type Pthread_cond_t = struct{ F__data X__pthread_cond_s } /* pthreadtypes.h:80:3 */
+
+// Data structure for reader-writer lock variable handling.  The
+//
+//	structure of the attribute type is deliberately not exposed.
+type Pthread_rwlock_t = struct{ F__data X__pthread_rwlock_arch_t } /* pthreadtypes.h:91:3 */
+
+type Pthread_rwlockattr_t = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [8]int8
+} /* pthreadtypes.h:97:3 */
+
+// POSIX spinlock data type.
+type Pthread_spinlock_t = int32 /* pthreadtypes.h:103:22 */
+
+// POSIX barriers data type.  The structure of the type is
+//
+//	deliberately not exposed.
+type Pthread_barrier_t = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [32]int8
+} /* pthreadtypes.h:112:3 */
+
+type Pthread_barrierattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:118:3 */
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/termios/capi_linux_loong64.go b/vendor/modernc.org/libc/termios/capi_linux_loong64.go
new file mode 100644
index 00000000..193dc60e
--- /dev/null
+++ b/vendor/modernc.org/libc/termios/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo termios/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o termios/termios_linux_amd64.go -pkgname termios', DO NOT EDIT.
+
+package termios
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/termios/termios_linux_loong64.go b/vendor/modernc.org/libc/termios/termios_linux_loong64.go
new file mode 100644
index 00000000..494b2017
--- /dev/null
+++ b/vendor/modernc.org/libc/termios/termios_linux_loong64.go
@@ -0,0 +1,1024 @@
+// Code generated by 'ccgo termios/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o termios/termios_linux_amd64.go -pkgname termios', DO NOT EDIT.
+
+package termios
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	B0                             = 0000000      // termios.h:33:1:
+	B1000000                       = 0010010      // termios-baud.h:40:1:
+	B110                           = 0000003      // termios.h:36:1:
+	B115200                        = 0010002      // termios-baud.h:34:1:
+	B1152000                       = 0010011      // termios-baud.h:41:1:
+	B1200                          = 0000011      // termios.h:42:1:
+	B134                           = 0000004      // termios.h:37:1:
+	B150                           = 0000005      // termios.h:38:1:
+	B1500000                       = 0010012      // termios-baud.h:42:1:
+	B1800                          = 0000012      // termios.h:43:1:
+	B19200                         = 0000016      // termios.h:47:1:
+	B200                           = 0000006      // termios.h:39:1:
+	B2000000                       = 0010013      // termios-baud.h:43:1:
+	B230400                        = 0010003      // termios-baud.h:35:1:
+	B2400                          = 0000013      // termios.h:44:1:
+	B2500000                       = 0010014      // termios-baud.h:44:1:
+	B300                           = 0000007      // termios.h:40:1:
+	B3000000                       = 0010015      // termios-baud.h:45:1:
+	B3500000                       = 0010016      // termios-baud.h:46:1:
+	B38400                         = 0000017      // termios.h:48:1:
+	B4000000                       = 0010017      // termios-baud.h:47:1:
+	B460800                        = 0010004      // termios-baud.h:36:1:
+	B4800                          = 0000014      // termios.h:45:1:
+	B50                            = 0000001      // termios.h:34:1:
+	B500000                        = 0010005      // termios-baud.h:37:1:
+	B57600                         = 0010001      // termios-baud.h:33:1:
+	B576000                        = 0010006      // termios-baud.h:38:1:
+	B600                           = 0000010      // termios.h:41:1:
+	B75                            = 0000002      // termios.h:35:1:
+	B921600                        = 0010007      // termios-baud.h:39:1:
+	B9600                          = 0000015      // termios.h:46:1:
+	BRKINT                         = 0000002      // termios-c_iflag.h:25:1:
+	BS0                            = 0000000      // termios-c_oflag.h:48:1:
+	BS1                            = 0020000      // termios-c_oflag.h:49:1:
+	BSDLY                          = 0020000      // termios-c_oflag.h:47:1:
+	CBAUD                          = 000000010017 // termios-baud.h:24:1:
+	CBAUDEX                        = 000000010000 // termios-baud.h:25:1:
+	CBRK                           = 0            // ttydefaults.h:83:1:
+	CDISCARD                       = 15           // ttydefaults.h:78:1:
+	CDSUSP                         = 25           // ttydefaults.h:74:1:
+	CEOF                           = 4            // ttydefaults.h:56:1:
+	CEOL                           = 0            // ttydefaults.h:60:1:
+	CEOT                           = 4            // ttydefaults.h:81:1:
+	CERASE                         = 0177         // ttydefaults.h:62:1:
+	CFLUSH                         = 15           // ttydefaults.h:85:1:
+	CIBAUD                         = 002003600000 // termios-baud.h:27:1:
+	CINTR                          = 3            // ttydefaults.h:63:1:
+	CKILL                          = 21           // ttydefaults.h:69:1:
+	CLNEXT                         = 22           // ttydefaults.h:77:1:
+	CLOCAL                         = 0004000      // termios-c_cflag.h:34:1:
+	CMIN                           = 1            // ttydefaults.h:70:1:
+	CMSPAR                         = 010000000000 // termios-baud.h:28:1:
+	CQUIT                          = 034          // ttydefaults.h:71:1:
+	CR0                            = 0000000      // termios-c_oflag.h:38:1:
+	CR1                            = 0001000      // termios-c_oflag.h:39:1:
+	CR2                            = 0002000      // termios-c_oflag.h:40:1:
+	CR3                            = 0003000      // termios-c_oflag.h:41:1:
+	CRDLY                          = 0003000      // termios-c_oflag.h:37:1:
+	CREAD                          = 0000200      // termios-c_cflag.h:30:1:
+	CREPRINT                       = 18           // ttydefaults.h:80:1:
+	CRPRNT                         = 18           // ttydefaults.h:84:1:
+	CRTSCTS                        = 020000000000 // termios-baud.h:29:1:
+	CS5                            = 0000000      // termios-c_cflag.h:25:1:
+	CS6                            = 0000020      // termios-c_cflag.h:26:1:
+	CS7                            = 0000040      // termios-c_cflag.h:27:1:
+	CS8                            = 0000060      // termios-c_cflag.h:28:1:
+	CSIZE                          = 0000060      // termios-c_cflag.h:24:1:
+	CSTART                         = 17           // ttydefaults.h:75:1:
+	CSTATUS                        = 0            // ttydefaults.h:67:1:
+	CSTOP                          = 19           // ttydefaults.h:76:1:
+	CSTOPB                         = 0000100      // termios-c_cflag.h:29:1:
+	CSUSP                          = 26           // ttydefaults.h:72:1:
+	CTIME                          = 0            // ttydefaults.h:73:1:
+	CWERASE                        = 23           // ttydefaults.h:79:1:
+	ECHO                           = 0000010      // termios-c_lflag.h:29:1:
+	ECHOCTL                        = 0001000      // termios-c_lflag.h:37:1:
+	ECHOE                          = 0000020      // termios-c_lflag.h:30:1:
+	ECHOK                          = 0000040      // termios-c_lflag.h:32:1:
+	ECHOKE                         = 0004000      // termios-c_lflag.h:45:1:
+	ECHONL                         = 0000100      // termios-c_lflag.h:33:1:
+	ECHOPRT                        = 0002000      // termios-c_lflag.h:42:1:
+	EXTA                           = 14           // termios.h:50:1:
+	EXTB                           = 15           // termios.h:51:1:
+	EXTPROC                        = 0200000      // termios-c_lflag.h:57:1:
+	FF0                            = 0000000      // termios-c_oflag.h:51:1:
+	FF1                            = 0100000      // termios-c_oflag.h:52:1:
+	FFDLY                          = 0100000      // termios-c_oflag.h:50:1:
+	FLUSHO                         = 0010000      // termios-c_lflag.h:48:1:
+	HUPCL                          = 0002000      // termios-c_cflag.h:33:1:
+	ICANON                         = 0000002      // termios-c_lflag.h:25:1:
+	ICRNL                          = 0000400      // termios-c_iflag.h:32:1:
+	IEXTEN                         = 0100000      // termios-c_lflag.h:54:1:
+	IGNBRK                         = 0000001      // termios-c_iflag.h:24:1:
+	IGNCR                          = 0000200      // termios-c_iflag.h:31:1:
+	IGNPAR                         = 0000004      // termios-c_iflag.h:26:1:
+	IMAXBEL                        = 0020000      // termios-c_iflag.h:38:1:
+	INLCR                          = 0000100      // termios-c_iflag.h:30:1:
+	INPCK                          = 0000020      // termios-c_iflag.h:28:1:
+	ISIG                           = 0000001      // termios-c_lflag.h:24:1:
+	ISTRIP                         = 0000040      // termios-c_iflag.h:29:1:
+	IUCLC                          = 0001000      // termios-c_iflag.h:33:1:
+	IUTF8                          = 0040000      // termios-c_iflag.h:40:1:
+	IXANY                          = 0004000      // termios-c_iflag.h:36:1:
+	IXOFF                          = 0010000      // termios-c_iflag.h:37:1:
+	IXON                           = 0002000      // termios-c_iflag.h:35:1:
+	NCCS                           = 32           // termios-struct.h:23:1:
+	NL0                            = 0000000      // termios-c_oflag.h:35:1:
+	NL1                            = 0000400      // termios-c_oflag.h:36:1:
+	NLDLY                          = 0000400      // termios-c_oflag.h:34:1:
+	NOFLSH                         = 0000200      // termios-c_lflag.h:34:1:
+	OCRNL                          = 0000010      // termios-c_oflag.h:28:1:
+	OFDEL                          = 0000200      // termios-c_oflag.h:32:1:
+	OFILL                          = 0000100      // termios-c_oflag.h:31:1:
+	OLCUC                          = 0000002      // termios-c_oflag.h:25:1:
+	ONLCR                          = 0000004      // termios-c_oflag.h:27:1:
+	ONLRET                         = 0000040      // termios-c_oflag.h:30:1:
+	ONOCR                          = 0000020      // termios-c_oflag.h:29:1:
+	OPOST                          = 0000001      // termios-c_oflag.h:24:1:
+	PARENB                         = 0000400      // termios-c_cflag.h:31:1:
+	PARMRK                         = 0000010      // termios-c_iflag.h:27:1:
+	PARODD                         = 0001000      // termios-c_cflag.h:32:1:
+	PENDIN                         = 0040000      // termios-c_lflag.h:50:1:
+	TAB0                           = 0000000      // termios-c_oflag.h:43:1:
+	TAB1                           = 0004000      // termios-c_oflag.h:44:1:
+	TAB2                           = 0010000      // termios-c_oflag.h:45:1:
+	TAB3                           = 0014000      // termios-c_oflag.h:46:1:
+	TABDLY                         = 0014000      // termios-c_oflag.h:42:1:
+	TCIFLUSH                       = 0            // termios.h:70:1:
+	TCIOFF                         = 2            // termios.h:66:1:
+	TCIOFLUSH                      = 2            // termios.h:72:1:
+	TCION                          = 3            // termios.h:67:1:
+	TCOFLUSH                       = 1            // termios.h:71:1:
+	TCOOFF                         = 0            // termios.h:64:1:
+	TCOON                          = 1            // termios.h:65:1:
+	TCSADRAIN                      = 1            // termios-tcflow.h:25:1:
+	TCSAFLUSH                      = 2            // termios-tcflow.h:26:1:
+	TCSANOW                        = 0            // termios-tcflow.h:24:1:
+	TIOCSER_TEMT                   = 0x01         // termios.h:60:1:
+	TOSTOP                         = 0000400      // termios-c_lflag.h:35:1:
+	TTYDEF_CFLAG                   = 1440         // ttydefaults.h:49:1:
+	TTYDEF_IFLAG                   = 11554        // ttydefaults.h:46:1:
+	TTYDEF_LFLAG                   = 35355        // ttydefaults.h:48:1:
+	TTYDEF_OFLAG                   = 6149         // ttydefaults.h:47:1:
+	TTYDEF_SPEED                   = 13           // ttydefaults.h:50:1:
+	VDISCARD                       = 13           // termios-c_cc.h:37:1:
+	VEOF                           = 4            // termios-c_cc.h:28:1:
+	VEOL                           = 11           // termios-c_cc.h:35:1:
+	VEOL2                          = 16           // termios-c_cc.h:40:1:
+	VERASE                         = 2            // termios-c_cc.h:26:1:
+	VINTR                          = 0            // termios-c_cc.h:24:1:
+	VKILL                          = 3            // termios-c_cc.h:27:1:
+	VLNEXT                         = 15           // termios-c_cc.h:39:1:
+	VMIN                           = 6            // termios-c_cc.h:30:1:
+	VQUIT                          = 1            // termios-c_cc.h:25:1:
+	VREPRINT                       = 12           // termios-c_cc.h:36:1:
+	VSTART                         = 8            // termios-c_cc.h:32:1:
+	VSTOP                          = 9            // termios-c_cc.h:33:1:
+	VSUSP                          = 10           // termios-c_cc.h:34:1:
+	VSWTC                          = 7            // termios-c_cc.h:31:1:
+	VT0                            = 0000000      // termios-c_oflag.h:56:1:
+	VT1                            = 0040000      // termios-c_oflag.h:57:1:
+	VTDLY                          = 0040000      // termios-c_oflag.h:55:1:
+	VTIME                          = 5            // termios-c_cc.h:29:1:
+	VWERASE                        = 14           // termios-c_cc.h:38:1:
+	XCASE                          = 0000004      // termios-c_lflag.h:27:1:
+	XTABS                          = 0014000      // termios-c_oflag.h:60:1:
+	X_ATFILE_SOURCE                = 1            // features.h:342:1:
+	X_BITS_TIME64_H                = 1            // time64.h:24:1:
+	X_BITS_TYPESIZES_H             = 1            // typesizes.h:24:1:
+	X_BITS_TYPES_H                 = 1            // types.h:24:1:
+	X_DEFAULT_SOURCE               = 1            // features.h:227:1:
+	X_FEATURES_H                   = 1            // features.h:19:1:
+	X_FILE_OFFSET_BITS             = 64           // <builtin>:25:1:
+	X_HAVE_STRUCT_TERMIOS_C_ISPEED = 1            // termios-struct.h:34:1:
+	X_HAVE_STRUCT_TERMIOS_C_OSPEED = 1            // termios-struct.h:35:1:
+	X_LP64                         = 1            // <predefined>:284:1:
+	X_POSIX_C_SOURCE               = 200809       // features.h:281:1:
+	X_POSIX_SOURCE                 = 1            // features.h:279:1:
+	X_STDC_PREDEF_H                = 1            // <predefined>:162:1:
+	X_SYS_CDEFS_H                  = 1            // cdefs.h:19:1:
+	X_SYS_TTYDEFAULTS_H_           = 0            // ttydefaults.h:41:1:
+	X_TERMIOS_H                    = 1            // termios.h:23:1:
+	Linux                          = 1            // <predefined>:231:1:
+	Unix                           = 1            // <predefined>:177:1:
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX Standard: 7.1-2 General Terminal Interface	<termios.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// These are defined by the user (or the compiler)
+//    to specify the desired environment:
+//
+//    __STRICT_ANSI__	ISO Standard C.
+//    _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
+//    _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
+//    _ISOC2X_SOURCE	Extensions to ISO C99 from ISO C2X.
+//    __STDC_WANT_LIB_EXT2__
+// 			Extensions to ISO C99 from TR 27431-2:2010.
+//    __STDC_WANT_IEC_60559_BFP_EXT__
+// 			Extensions to ISO C11 from TS 18661-1:2014.
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__
+// 			Extensions to ISO C11 from TS 18661-4:2015.
+//    __STDC_WANT_IEC_60559_TYPES_EXT__
+// 			Extensions to ISO C11 from TS 18661-3:2015.
+//
+//    _POSIX_SOURCE	IEEE Std 1003.1.
+//    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
+// 			if >=199309L, add IEEE Std 1003.1b-1993;
+// 			if >=199506L, add IEEE Std 1003.1c-1995;
+// 			if >=200112L, all of IEEE 1003.1-2004
+// 			if >=200809L, all of IEEE 1003.1-2008
+//    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
+// 			Single Unix conformance is wanted, to 600 for the
+// 			sixth revision, to 700 for the seventh revision.
+//    _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
+//    _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
+//    _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
+//    _FILE_OFFSET_BITS=N	Select default filesystem interface.
+//    _ATFILE_SOURCE	Additional *at interfaces.
+//    _GNU_SOURCE		All of the above, plus GNU extensions.
+//    _DEFAULT_SOURCE	The default set of features (taking precedence over
+// 			__STRICT_ANSI__).
+//
+//    _FORTIFY_SOURCE	Add security hardening to many library functions.
+// 			Set to 1 or 2; 2 performs stricter checks than 1.
+//
+//    _REENTRANT, _THREAD_SAFE
+// 			Obsolete; equivalent to _POSIX_C_SOURCE=199506L.
+//
+//    The `-ansi' switch to the GNU C compiler, and standards conformance
+//    options such as `-std=c99', define __STRICT_ANSI__.  If none of
+//    these are defined, or if _DEFAULT_SOURCE is defined, the default is
+//    to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
+//    200809L, as well as enabling miscellaneous functions from BSD and
+//    SVID.  If more than one of these are defined, they accumulate.  For
+//    example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
+//    give you ISO C, 1003.1, and 1003.2, but nothing else.
+//
+//    These are defined by this file and are used by the
+//    header files to decide what to declare or define:
+//
+//    __GLIBC_USE (F)	Define things from feature set F.  This is defined
+// 			to 1 or 0; the subsequent macros are either defined
+// 			or undefined, and those tests should be moved to
+// 			__GLIBC_USE.
+//    __USE_ISOC11		Define ISO C11 things.
+//    __USE_ISOC99		Define ISO C99 things.
+//    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+//    __USE_ISOCXX11	Define ISO C++11 things.
+//    __USE_POSIX		Define IEEE Std 1003.1 things.
+//    __USE_POSIX2		Define IEEE Std 1003.2 things.
+//    __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
+//    __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
+//    __USE_XOPEN		Define XPG things.
+//    __USE_XOPEN_EXTENDED	Define X/Open Unix things.
+//    __USE_UNIX98		Define Single Unix V2 things.
+//    __USE_XOPEN2K        Define XPG6 things.
+//    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+//    __USE_XOPEN2K8       Define XPG7 things.
+//    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
+//    __USE_LARGEFILE	Define correct standard I/O things.
+//    __USE_LARGEFILE64	Define LFS things with separate names.
+//    __USE_FILE_OFFSET64	Define 64bit interface as default.
+//    __USE_MISC		Define things from 4.3BSD or System V Unix.
+//    __USE_ATFILE		Define *at interfaces and AT_* constants for them.
+//    __USE_GNU		Define GNU extensions.
+//    __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
+//
+//    The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
+//    defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
+//    only for compatibility.  All new code should use the other symbols
+//    to test for features.
+//
+//    All macros listed above as possibly being defined by this file are
+//    explicitly undefined if they are not explicitly defined.
+//    Feature-test macros that are not defined by the user or compiler
+//    but are implied by the other feature-test macros defined (or by the
+//    lack of any definitions) are defined by the file.
+//
+//    ISO C feature test macros depend on the definition of the macro
+//    when an affected header is included, not when the first system
+//    header is included, and so they are handled in
+//    <bits/libc-header-start.h>, which does not have a multiple include
+//    guard.  Feature test macros that can be handled from the first
+//    system header included are handled here.
+
+// Undefine everything, so we get a clean slate.
+
+// Suppress kernel-name space pollution unless user expressedly asks
+//    for it.
+
+// Convenience macro to test the version of gcc.
+//    Use like this:
+//    #if __GNUC_PREREQ (2,8)
+//    ... code requiring gcc 2.8 or later ...
+//    #endif
+//    Note: only works for GCC 2.0 and later, because __GNUC_MINOR__ was
+//    added in 2.0.
+
+// Similarly for clang.  Features added to GCC after version 4.2 may
+//    or may not also be available in clang, and clang's definitions of
+//    __GNUC(_MINOR)__ are fixed at 4 and 2 respectively.  Not all such
+//    features can be queried via __has_extension/__has_feature.
+
+// Whether to use feature set F.
+
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
+//    _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
+//    issue a warning; the expectation is that the source is being
+//    transitioned to use the new macro.
+
+// If _GNU_SOURCE was defined by the user, turn on all the other features.
+
+// If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
+//    define _DEFAULT_SOURCE.
+
+// This is to enable the ISO C2X extension.
+
+// This is to enable the ISO C11 extension.
+
+// This is to enable the ISO C99 extension.
+
+// This is to enable the ISO C90 Amendment 1:1995 extension.
+
+// If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
+//    is defined, use POSIX.1-2008 (or another version depending on
+//    _XOPEN_SOURCE).
+
+// Some C libraries once required _REENTRANT and/or _THREAD_SAFE to be
+//    defined in all multithreaded code.  GNU libc has not required this
+//    for many years.  We now treat them as compatibility synonyms for
+//    _POSIX_C_SOURCE=199506L, which is the earliest level of POSIX with
+//    comprehensive support for multithreaded code.  Using them never
+//    lowers the selected level of POSIX conformance, only raises it.
+
+// The function 'gets' existed in C89, but is impossible to use
+//    safely.  It has been removed from ISO C11 and ISO C++14.  Note: for
+//    compatibility with various implementations of <cstdio>, this test
+//    must consider only the value of __cplusplus when compiling C++.
+
+// GNU formerly extended the scanf functions with modified format
+//    specifiers %as, %aS, and %a[...] that allocate a buffer for the
+//    input using malloc.  This extension conflicts with ISO C99, which
+//    defines %a as a standalone format specifier that reads a floating-
+//    point number; moreover, POSIX.1-2008 provides the same feature
+//    using the modifier letter 'm' instead (%ms, %mS, %m[...]).
+//
+//    We now follow C99 unless GNU extensions are active and the compiler
+//    is specifically in C89 or C++98 mode (strict or not).  For
+//    instance, with GCC, -std=gnu11 will have C99-compliant scanf with
+//    or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
+//    old extension.
+
+// Get definitions of __STDC_* predefined macros, if the compiler has
+//    not preincluded this header automatically.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This macro indicates that the installed library is the GNU C Library.
+//    For historic reasons the value now is 6 and this will stay from now
+//    on.  The use of this variable is deprecated.  Use __GLIBC__ and
+//    __GLIBC_MINOR__ now (see below) when you want to test for a specific
+//    GNU C library version and use the values in <gnu/lib-names.h> to get
+//    the sonames of the shared libraries.
+
+// Major and minor version number of the GNU C library package.  Use
+//    these macros to test for features in specific releases.
+
+// This is here only because every header file already includes this one.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// We are almost always included from features.h.
+
+// The GNU libc does not support any K&R compilers or the traditional mode
+//    of ISO C compilers anymore.  Check for some of the combinations not
+//    anymore supported.
+
+// Some user header file might have defined this before.
+
+// All functions, except those with callbacks or those that
+//    synchronize memory, are leaf functions.
+
+// GCC can always grok prototypes.  For C++ programs we add throw()
+//    to help it optimize the function calls.  But this works only with
+//    gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+//    as non-throwing using a function attribute since programs can use
+//    the -fexceptions options for C code as well.
+
+// Compilers that are not clang may object to
+//        #if defined __clang__ && __has_extension(...)
+//    even though they do not need to evaluate the right-hand side of the &&.
+
+// These two macros are not used in glibc anymore.  They are kept here
+//    only because some other projects expect the macros to be defined.
+
+// For these things, GCC behaves the ANSI way normally,
+//    and the non-ANSI way under -traditional.
+
+// This is not a typedef so `const __ptr_t' does the right thing.
+
+// C++ needs to know that types and declarations are C, not C++.
+
+// Fortify support.
+
+// Support for flexible arrays.
+//    Headers that should use flexible arrays only if they're "real"
+//    (e.g. only if they won't affect sizeof()) should test
+//    #if __glibc_c99_flexarr_available.
+
+// __asm__ ("xyz") is used throughout the headers to rename functions
+//    at the assembly language level.  This is wrapped by the __REDIRECT
+//    macro, in order to support compilers that can do this some other
+//    way.  When compilers don't support asm-names at all, we have to do
+//    preprocessor tricks instead (which don't have exactly the right
+//    semantics, but it's the best we can do).
+//
+//    Example:
+//    int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid);
+
+//
+// #elif __SOME_OTHER_COMPILER__
+//
+// # define __REDIRECT(name, proto, alias) name proto; 	_Pragma("let " #name " = " #alias)
+
+// GCC has various useful declarations that can be made with the
+//    `__attribute__' syntax.  All of the ways we use this do fine if
+//    they are omitted for compilers that don't understand it.
+
+// At some point during the gcc 2.96 development the `malloc' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Tell the compiler which arguments to an allocation function
+//    indicate the size of the allocation.
+
+// At some point during the gcc 2.96 development the `pure' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// This declaration tells the compiler that the value is constant.
+
+// At some point during the gcc 3.1 development the `used' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Since version 3.2, gcc allows marking deprecated functions.
+
+// Since version 4.5, gcc also allows one to specify the message printed
+//    when a deprecated function is used.  clang claims to be gcc 4.2, but
+//    may also support this feature.
+
+// At some point during the gcc 2.8 development the `format_arg' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+//    If several `format_arg' attributes are given for the same function, in
+//    gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+//    all designated arguments are considered.
+
+// At some point during the gcc 2.97 development the `strfmon' format
+//    attribute for functions was introduced.  We don't want to use it
+//    unconditionally (although this would be possible) since it
+//    generates warnings.
+
+// The nonull function attribute allows to mark pointer parameters which
+//    must not be NULL.
+
+// If fortification mode, we warn about unused results of certain
+//    function calls which can lead to problems.
+
+// Forces a function to be always inlined.
+// The Linux kernel defines __always_inline in stddef.h (283d7573), and
+//    it conflicts with this definition.  Therefore undefine it first to
+//    allow either header to be included first.
+
+// Associate error messages with the source location of the call site rather
+//    than with the source location inside the function.
+
+// GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+//    inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
+//    or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+//    older than 4.3 may define these macros and still not guarantee GNU inlining
+//    semantics.
+//
+//    clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+//    semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
+//    __GNUC_GNU_INLINE__ macro definitions.
+
+// GCC 4.3 and above allow passing all anonymous arguments of an
+//    __extern_always_inline function to some other vararg function.
+
+// It is possible to compile containing GCC extensions even if GCC is
+//    run in pedantic mode if the uses are carefully marked using the
+//    `__extension__' keyword.  But this is not generally available before
+//    version 2.8.
+
+// __restrict is known in EGCS 1.2 and above.
+
+// ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+//      array_name[restrict]
+//    GCC 3.1 supports this.
+
+// Describes a char array whose address can safely be passed as the first
+//    argument to strncpy and strncat, as the char array is not necessarily
+//    a NUL-terminated string.
+
+// Undefine (also defined in libc-symbols.h).
+// Copies attributes from the declaration or type referenced by
+//    the argument.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// __glibc_macro_warning (MESSAGE) issues warning MESSAGE.  This is
+//    intended for use in preprocessor macros.
+//
+//    Note: MESSAGE must be a _single_ string; concatenation of string
+//    literals is not supported.
+
+// Generic selection (ISO C11) is a C-only feature, available in GCC
+//    since version 4.9.  Previous versions do not provide generic
+//    selection, even though they might set __STDC_VERSION__ to 201112L,
+//    when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
+//    when testing __STDC_VERSION__ for generic selection support.
+//    On the other hand, Clang also defines __GNUC__, so a clang-specific
+//    check is required to enable the use of generic selection.
+
+// If we don't have __REDIRECT, prototypes will be missing if
+//    __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64].
+
+// Decide whether we can define 'extern inline' functions in headers.
+
+// This is here only because every header file already includes this one.
+//    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
+//    <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+//    that will always return failure (and set errno to ENOSYS).
+// This file is automatically generated.
+//    This file selects the right generated file of `__stub_FUNCTION' macros
+//    based on the architecture being compiled for.
+
+// This file is automatically generated.
+//    It defines a symbol `__stub_FUNCTION' for each function
+//    in the C library which is a stub, meaning it will fail
+//    every time called, usually setting errno to ENOSYS.
+
+// We need `pid_t'.
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Seconds since the Epoch, visible to user code when time_t is too
+//    narrow only for consistency with the old way of widening too-narrow
+//    types.  User code should never use __time64_t.
+
+type Pid_t = X__pid_t /* termios.h:30:17 */
+
+// Get the system-dependent definitions of `struct termios', `tcflag_t',
+//    `cc_t', `speed_t', and all the macros specifying the flag bits.
+// termios type and macro definitions.  Linux version.
+//    Copyright (C) 1993-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+type Cc_t = uint8      /* termios.h:23:23 */
+type Speed_t = uint32  /* termios.h:24:22 */
+type Tcflag_t = uint32 /* termios.h:25:22 */
+
+// struct termios definition.  Linux/generic version.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library.  If not, see
+//    <https://www.gnu.org/licenses/>.
+
+type Termios = struct {
+	Fc_iflag     Tcflag_t
+	Fc_oflag     Tcflag_t
+	Fc_cflag     Tcflag_t
+	Fc_lflag     Tcflag_t
+	Fc_line      Cc_t
+	Fc_cc        [32]Cc_t
+	F__ccgo_pad1 [3]byte
+	Fc_ispeed    Speed_t
+	Fc_ospeed    Speed_t
+} /* termios-struct.h:24:1 */
+
+// -
+// Copyright (c) 1982, 1986, 1993
+//	The Regents of the University of California.  All rights reserved.
+// (c) UNIX System Laboratories, Inc.
+// All or some portions of this file are derived from material licensed
+// to the University of California by American Telephone and Telegraph
+// Co. or Unix System Laboratories, Inc. and are reproduced herein with
+// the permission of UNIX System Laboratories, Inc.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+// 4. Neither the name of the University nor the names of its contributors
+//    may be used to endorse or promote products derived from this software
+//    without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+// SUCH DAMAGE.
+//
+//	@(#)ttydefaults.h	8.4 (Berkeley) 1/21/94
+
+// System wide defaults for terminal state.  Linux version.
+
+// Defaults on "first" open.
+
+// Control Character Defaults
+// compat
+
+// PROTECTED INCLUSION ENDS HERE
+
+// #define TTYDEFCHARS to include an array of default control characters.
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/time/capi_linux_loong64.go b/vendor/modernc.org/libc/time/capi_linux_loong64.go
new file mode 100644
index 00000000..fef9264d
--- /dev/null
+++ b/vendor/modernc.org/libc/time/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo time/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o time/time_linux_amd64.go -pkgname time', DO NOT EDIT.
+
+package time
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/time/time_linux_loong64.go b/vendor/modernc.org/libc/time/time_linux_loong64.go
new file mode 100644
index 00000000..e7f73f0d
--- /dev/null
+++ b/vendor/modernc.org/libc/time/time_linux_loong64.go
@@ -0,0 +1,679 @@
+// Code generated by 'ccgo time/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o time/time_linux_amd64.go -pkgname time', DO NOT EDIT.
+
+package time
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	CLOCK_BOOTTIME            = 7      // time.h:60:1:
+	CLOCK_BOOTTIME_ALARM      = 9      // time.h:64:1:
+	CLOCK_MONOTONIC           = 1      // time.h:48:1:
+	CLOCK_MONOTONIC_COARSE    = 6      // time.h:58:1:
+	CLOCK_MONOTONIC_RAW       = 4      // time.h:54:1:
+	CLOCK_PROCESS_CPUTIME_ID  = 2      // time.h:50:1:
+	CLOCK_REALTIME            = 0      // time.h:46:1:
+	CLOCK_REALTIME_ALARM      = 8      // time.h:62:1:
+	CLOCK_REALTIME_COARSE     = 5      // time.h:56:1:
+	CLOCK_TAI                 = 11     // time.h:66:1:
+	CLOCK_THREAD_CPUTIME_ID   = 3      // time.h:52:1:
+	TIMER_ABSTIME             = 1      // time.h:69:1:
+	TIME_UTC                  = 1      // time.h:65:1:
+	X_ATFILE_SOURCE           = 1      // features.h:342:1:
+	X_BITS_ENDIANNESS_H       = 1      // endianness.h:2:1:
+	X_BITS_ENDIAN_H           = 1      // endian.h:20:1:
+	X_BITS_TIME64_H           = 1      // time64.h:24:1:
+	X_BITS_TIME_H             = 1      // time.h:24:1:
+	X_BITS_TYPESIZES_H        = 1      // typesizes.h:24:1:
+	X_BITS_TYPES_H            = 1      // types.h:24:1:
+	X_BITS_TYPES_LOCALE_T_H   = 1      // locale_t.h:20:1:
+	X_BITS_TYPES___LOCALE_T_H = 1      // __locale_t.h:21:1:
+	X_BSD_SIZE_T_             = 0      // stddef.h:189:1:
+	X_BSD_SIZE_T_DEFINED_     = 0      // stddef.h:192:1:
+	X_DEFAULT_SOURCE          = 1      // features.h:227:1:
+	X_FEATURES_H              = 1      // features.h:19:1:
+	X_FILE_OFFSET_BITS        = 64     // <builtin>:25:1:
+	X_GCC_SIZE_T              = 0      // stddef.h:195:1:
+	X_LP64                    = 1      // <predefined>:284:1:
+	X_POSIX_C_SOURCE          = 200809 // features.h:281:1:
+	X_POSIX_SOURCE            = 1      // features.h:279:1:
+	X_SIZET_                  = 0      // stddef.h:196:1:
+	X_SIZE_T                  = 0      // stddef.h:183:1:
+	X_SIZE_T_                 = 0      // stddef.h:188:1:
+	X_SIZE_T_DECLARED         = 0      // stddef.h:193:1:
+	X_SIZE_T_DEFINED          = 0      // stddef.h:191:1:
+	X_SIZE_T_DEFINED_         = 0      // stddef.h:190:1:
+	X_STDC_PREDEF_H           = 1      // <predefined>:162:1:
+	X_STRUCT_TIMESPEC         = 1      // struct_timespec.h:3:1:
+	X_SYS_CDEFS_H             = 1      // cdefs.h:19:1:
+	X_SYS_SIZE_T_H            = 0      // stddef.h:184:1:
+	X_TIME_H                  = 1      // time.h:23:1:
+	X_T_SIZE                  = 0      // stddef.h:186:1:
+	X_T_SIZE_                 = 0      // stddef.h:185:1:
+	Linux                     = 1      // <predefined>:231:1:
+	Unix                      = 1      // <predefined>:177:1:
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// This defines CLOCKS_PER_SEC, which is the number of processor clock
+//    ticks per second, and possibly a number of other constants.
+// System-dependent timing definitions.  Linux version.
+//    Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <time.h> instead.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Seconds since the Epoch, visible to user code when time_t is too
+//    narrow only for consistency with the old way of widening too-narrow
+//    types.  User code should never use __time64_t.
+
+// ISO/IEC 9899:1999 7.23.1: Components of time
+//    The macro `CLOCKS_PER_SEC' is an expression with type `clock_t' that is
+//    the number per second of the value returned by the `clock' function.
+// CAE XSH, Issue 4, Version 2: <time.h>
+//    The value of CLOCKS_PER_SEC is required to be 1 million on all
+//    XSI-conformant systems.
+
+// Identifier for system-wide realtime clock.
+// Monotonic system-wide clock.
+// High-resolution timer from the CPU.
+// Thread-specific CPU-time clock.
+// Monotonic system-wide clock, not adjusted for frequency scaling.
+// Identifier for system-wide realtime clock, updated only on ticks.
+// Monotonic system-wide clock, updated only on ticks.
+// Monotonic system-wide clock that includes time spent in suspension.
+// Like CLOCK_REALTIME but also wakes suspended system.
+// Like CLOCK_BOOTTIME but also wakes suspended system.
+// Like CLOCK_REALTIME but in International Atomic Time.
+
+// Flag to indicate time is absolute.
+
+// Many of the typedefs and structs whose official home is this header
+//    may also need to be defined by other headers.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `clock'.
+type Clock_t = X__clock_t /* clock_t.h:7:19 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `time'.
+type Time_t = X__time_t /* time_t.h:7:18 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// ISO C `broken-down time' structure.
+type Tm = struct {
+	Ftm_sec      int32
+	Ftm_min      int32
+	Ftm_hour     int32
+	Ftm_mday     int32
+	Ftm_mon      int32
+	Ftm_year     int32
+	Ftm_wday     int32
+	Ftm_yday     int32
+	Ftm_isdst    int32
+	F__ccgo_pad1 [4]byte
+	Ftm_gmtoff   int64
+	Ftm_zone     uintptr
+} /* struct_tm.h:7:1 */
+
+// NB: Include guard matches what <linux/time.h> uses.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Endian macros for string.h functions
+//    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+// Definitions for byte order, according to significance of bytes,
+//    from low addresses to high addresses.  The value is what you get by
+//    putting '4' in the most significant byte, '3' in the second most
+//    significant byte, '2' in the second least significant byte, and '1'
+//    in the least significant byte, and then writing down one digit for
+//    each byte, starting with the byte at the lowest address at the left,
+//    and proceeding to the byte with the highest address at the right.
+
+// This file defines `__BYTE_ORDER' for the particular machine.
+
+// i386/x86_64 are little-endian.
+
+// Some machines may need to use a different endianness for floating point
+//    values.
+
+// POSIX.1b structure for a time value.  This is like a `struct timeval' but
+//
+//	has nanoseconds instead of microseconds.
+type Timespec = struct {
+	Ftv_sec  X__time_t
+	Ftv_nsec X__syscall_slong_t
+} /* struct_timespec.h:10:1 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Clock ID used in clock and timer functions.
+type Clockid_t = X__clockid_t /* clockid_t.h:7:21 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Timer ID returned by `timer_create'.
+type Timer_t = X__timer_t /* timer_t.h:7:19 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// NB: Include guard matches what <linux/time.h> uses.
+
+// POSIX.1b structure for timer start values and intervals.
+type Itimerspec = struct {
+	Fit_interval struct {
+		Ftv_sec  X__time_t
+		Ftv_nsec X__syscall_slong_t
+	}
+	Fit_value struct {
+		Ftv_sec  X__time_t
+		Ftv_nsec X__syscall_slong_t
+	}
+} /* struct_itimerspec.h:8:1 */
+
+type Pid_t = X__pid_t /* time.h:54:17 */
+
+// Definition of locale_t.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Definition of struct __locale_struct and __locale_t.
+//    Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// POSIX.1-2008: the locale_t type, representing a locale context
+//    (implementation-namespace version).  This type should be treated
+//    as opaque by applications; some details are exposed for the sake of
+//    efficiency in e.g. ctype functions.
+
+type X__locale_struct = struct {
+	F__locales       [13]uintptr
+	F__ctype_b       uintptr
+	F__ctype_tolower uintptr
+	F__ctype_toupper uintptr
+	F__names         [13]uintptr
+} /* __locale_t.h:28:1 */
+
+type X__locale_t = uintptr /* __locale_t.h:42:32 */
+
+type Locale_t = X__locale_t /* locale_t.h:24:20 */
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/unistd/capi_linux_loong64.go b/vendor/modernc.org/libc/unistd/capi_linux_loong64.go
new file mode 100644
index 00000000..4e94243c
--- /dev/null
+++ b/vendor/modernc.org/libc/unistd/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo unistd/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o unistd/unistd_linux_amd64.go -pkgname unistd', DO NOT EDIT.
+
+package unistd
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/unistd/unistd_linux_loong64.go b/vendor/modernc.org/libc/unistd/unistd_linux_loong64.go
new file mode 100644
index 00000000..7a83d48f
--- /dev/null
+++ b/vendor/modernc.org/libc/unistd/unistd_linux_loong64.go
@@ -0,0 +1,1592 @@
+// Code generated by 'ccgo unistd/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o unistd/unistd_linux_amd64.go -pkgname unistd', DO NOT EDIT.
+
+package unistd
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	F_LOCK                             = 1      // unistd.h:1074:1:
+	F_OK                               = 0      // unistd.h:284:1:
+	F_TEST                             = 3      // unistd.h:1076:1:
+	F_TLOCK                            = 2      // unistd.h:1075:1:
+	F_ULOCK                            = 0      // unistd.h:1073:1:
+	L_INCR                             = 1      // unistd.h:323:1:
+	L_SET                              = 0      // unistd.h:322:1:
+	L_XTND                             = 2      // unistd.h:324:1:
+	R_OK                               = 4      // unistd.h:281:1:
+	SEEK_CUR                           = 1      // unistd.h:312:1:
+	SEEK_END                           = 2      // unistd.h:313:1:
+	SEEK_SET                           = 0      // unistd.h:311:1:
+	STDERR_FILENO                      = 2      // unistd.h:212:1:
+	STDIN_FILENO                       = 0      // unistd.h:210:1:
+	STDOUT_FILENO                      = 1      // unistd.h:211:1:
+	W_OK                               = 2      // unistd.h:282:1:
+	X_OK                               = 1      // unistd.h:283:1:
+	X_ATFILE_SOURCE                    = 1      // features.h:342:1:
+	X_BITS_POSIX_OPT_H                 = 1      // posix_opt.h:20:1:
+	X_BITS_TIME64_H                    = 1      // time64.h:24:1:
+	X_BITS_TYPESIZES_H                 = 1      // typesizes.h:24:1:
+	X_BITS_TYPES_H                     = 1      // types.h:24:1:
+	X_BSD_SIZE_T_                      = 0      // stddef.h:189:1:
+	X_BSD_SIZE_T_DEFINED_              = 0      // stddef.h:192:1:
+	X_DEFAULT_SOURCE                   = 1      // features.h:227:1:
+	X_FEATURES_H                       = 1      // features.h:19:1:
+	X_FILE_OFFSET_BITS                 = 64     // <builtin>:25:1:
+	X_GCC_SIZE_T                       = 0      // stddef.h:195:1:
+	X_GETOPT_CORE_H                    = 1      // getopt_core.h:21:1:
+	X_GETOPT_POSIX_H                   = 1      // getopt_posix.h:21:1:
+	X_LFS64_ASYNCHRONOUS_IO            = 1      // posix_opt.h:117:1:
+	X_LFS64_LARGEFILE                  = 1      // posix_opt.h:121:1:
+	X_LFS64_STDIO                      = 1      // posix_opt.h:122:1:
+	X_LFS_ASYNCHRONOUS_IO              = 1      // posix_opt.h:112:1:
+	X_LFS_LARGEFILE                    = 1      // posix_opt.h:120:1:
+	X_LP64                             = 1      // <predefined>:284:1:
+	X_POSIX2_CHAR_TERM                 = 200809 // posix_opt.h:179:1:
+	X_POSIX2_C_BIND                    = 200809 // unistd.h:74:1:
+	X_POSIX2_C_DEV                     = 200809 // unistd.h:78:1:
+	X_POSIX2_C_VERSION                 = 200809 // unistd.h:70:1:
+	X_POSIX2_LOCALEDEF                 = 200809 // unistd.h:86:1:
+	X_POSIX2_SW_DEV                    = 200809 // unistd.h:82:1:
+	X_POSIX2_VERSION                   = 200809 // unistd.h:67:1:
+	X_POSIX_ADVISORY_INFO              = 200809 // posix_opt.h:170:1:
+	X_POSIX_ASYNCHRONOUS_IO            = 200809 // posix_opt.h:109:1:
+	X_POSIX_ASYNC_IO                   = 1      // posix_opt.h:110:1:
+	X_POSIX_BARRIERS                   = 200809 // posix_opt.h:155:1:
+	X_POSIX_CHOWN_RESTRICTED           = 0      // posix_opt.h:53:1:
+	X_POSIX_CLOCK_SELECTION            = 200809 // posix_opt.h:167:1:
+	X_POSIX_CPUTIME                    = 0      // posix_opt.h:128:1:
+	X_POSIX_C_SOURCE                   = 200809 // features.h:281:1:
+	X_POSIX_FSYNC                      = 200809 // posix_opt.h:38:1:
+	X_POSIX_IPV6                       = 200809 // posix_opt.h:173:1:
+	X_POSIX_JOB_CONTROL                = 1      // posix_opt.h:23:1:
+	X_POSIX_MAPPED_FILES               = 200809 // posix_opt.h:41:1:
+	X_POSIX_MEMLOCK                    = 200809 // posix_opt.h:44:1:
+	X_POSIX_MEMLOCK_RANGE              = 200809 // posix_opt.h:47:1:
+	X_POSIX_MEMORY_PROTECTION          = 200809 // posix_opt.h:50:1:
+	X_POSIX_MESSAGE_PASSING            = 200809 // posix_opt.h:158:1:
+	X_POSIX_MONOTONIC_CLOCK            = 0      // posix_opt.h:164:1:
+	X_POSIX_NO_TRUNC                   = 1      // posix_opt.h:60:1:
+	X_POSIX_PRIORITIZED_IO             = 200809 // posix_opt.h:114:1:
+	X_POSIX_PRIORITY_SCHEDULING        = 200809 // posix_opt.h:32:1:
+	X_POSIX_RAW_SOCKETS                = 200809 // posix_opt.h:176:1:
+	X_POSIX_READER_WRITER_LOCKS        = 200809 // posix_opt.h:137:1:
+	X_POSIX_REALTIME_SIGNALS           = 200809 // posix_opt.h:106:1:
+	X_POSIX_REENTRANT_FUNCTIONS        = 1      // posix_opt.h:75:1:
+	X_POSIX_REGEXP                     = 1      // posix_opt.h:134:1:
+	X_POSIX_SAVED_IDS                  = 1      // posix_opt.h:26:1:
+	X_POSIX_SEMAPHORES                 = 200809 // posix_opt.h:103:1:
+	X_POSIX_SHARED_MEMORY_OBJECTS      = 200809 // posix_opt.h:125:1:
+	X_POSIX_SHELL                      = 1      // posix_opt.h:140:1:
+	X_POSIX_SOURCE                     = 1      // features.h:279:1:
+	X_POSIX_SPAWN                      = 200809 // posix_opt.h:149:1:
+	X_POSIX_SPIN_LOCKS                 = 200809 // posix_opt.h:146:1:
+	X_POSIX_SPORADIC_SERVER            = -1     // posix_opt.h:182:1:
+	X_POSIX_SYNCHRONIZED_IO            = 200809 // posix_opt.h:35:1:
+	X_POSIX_THREADS                    = 200809 // posix_opt.h:72:1:
+	X_POSIX_THREAD_ATTR_STACKADDR      = 200809 // posix_opt.h:85:1:
+	X_POSIX_THREAD_ATTR_STACKSIZE      = 200809 // posix_opt.h:82:1:
+	X_POSIX_THREAD_CPUTIME             = 0      // posix_opt.h:131:1:
+	X_POSIX_THREAD_PRIORITY_SCHEDULING = 200809 // posix_opt.h:79:1:
+	X_POSIX_THREAD_PRIO_INHERIT        = 200809 // posix_opt.h:88:1:
+	X_POSIX_THREAD_PRIO_PROTECT        = 200809 // posix_opt.h:92:1:
+	X_POSIX_THREAD_PROCESS_SHARED      = 200809 // posix_opt.h:161:1:
+	X_POSIX_THREAD_ROBUST_PRIO_INHERIT = 200809 // posix_opt.h:96:1:
+	X_POSIX_THREAD_ROBUST_PRIO_PROTECT = -1     // posix_opt.h:99:1:
+	X_POSIX_THREAD_SAFE_FUNCTIONS      = 200809 // posix_opt.h:76:1:
+	X_POSIX_THREAD_SPORADIC_SERVER     = -1     // posix_opt.h:183:1:
+	X_POSIX_TIMEOUTS                   = 200809 // posix_opt.h:143:1:
+	X_POSIX_TIMERS                     = 200809 // posix_opt.h:152:1:
+	X_POSIX_TRACE                      = -1     // posix_opt.h:186:1:
+	X_POSIX_TRACE_EVENT_FILTER         = -1     // posix_opt.h:187:1:
+	X_POSIX_TRACE_INHERIT              = -1     // posix_opt.h:188:1:
+	X_POSIX_TRACE_LOG                  = -1     // posix_opt.h:189:1:
+	X_POSIX_TYPED_MEMORY_OBJECTS       = -1     // posix_opt.h:192:1:
+	X_POSIX_V6_LP64_OFF64              = 1      // environments.h:62:1:
+	X_POSIX_V6_LPBIG_OFFBIG            = -1     // environments.h:57:1:
+	X_POSIX_V7_LP64_OFF64              = 1      // environments.h:61:1:
+	X_POSIX_V7_LPBIG_OFFBIG            = -1     // environments.h:56:1:
+	X_POSIX_VDISABLE                   = 0      // posix_opt.h:57:1:
+	X_POSIX_VERSION                    = 200809 // unistd.h:34:1:
+	X_SIZET_                           = 0      // stddef.h:196:1:
+	X_SIZE_T                           = 0      // stddef.h:183:1:
+	X_SIZE_T_                          = 0      // stddef.h:188:1:
+	X_SIZE_T_DECLARED                  = 0      // stddef.h:193:1:
+	X_SIZE_T_DEFINED                   = 0      // stddef.h:191:1:
+	X_SIZE_T_DEFINED_                  = 0      // stddef.h:190:1:
+	X_STDC_PREDEF_H                    = 1      // <predefined>:162:1:
+	X_SYS_CDEFS_H                      = 1      // cdefs.h:19:1:
+	X_SYS_SIZE_T_H                     = 0      // stddef.h:184:1:
+	X_T_SIZE                           = 0      // stddef.h:186:1:
+	X_T_SIZE_                          = 0      // stddef.h:185:1:
+	X_UNISTD_H                         = 1      // unistd.h:23:1:
+	X_XBS5_LP64_OFF64                  = 1      // environments.h:63:1:
+	X_XBS5_LPBIG_OFFBIG                = -1     // environments.h:58:1:
+	X_XOPEN_ENH_I18N                   = 1      // unistd.h:112:1:
+	X_XOPEN_LEGACY                     = 1      // unistd.h:115:1:
+	X_XOPEN_REALTIME                   = 1      // posix_opt.h:63:1:
+	X_XOPEN_REALTIME_THREADS           = 1      // posix_opt.h:66:1:
+	X_XOPEN_SHM                        = 1      // posix_opt.h:69:1:
+	X_XOPEN_UNIX                       = 1      // unistd.h:108:1:
+	X_XOPEN_VERSION                    = 700    // unistd.h:90:1:
+	X_XOPEN_XCU_VERSION                = 4      // unistd.h:100:1:
+	X_XOPEN_XPG2                       = 1      // unistd.h:103:1:
+	X_XOPEN_XPG3                       = 1      // unistd.h:104:1:
+	X_XOPEN_XPG4                       = 1      // unistd.h:105:1:
+	Linux                              = 1      // <predefined>:231:1:
+	Unix                               = 1      // <predefined>:177:1:
+)
+
+// Get the `_PC_*' symbols for the NAME argument to `pathconf' and `fpathconf';
+//    the `_SC_*' symbols for the NAME argument to `sysconf';
+//    and the `_CS_*' symbols for the NAME argument to `confstr'.
+// `sysconf', `pathconf', and `confstr' NAME values.  Generic version.
+//    Copyright (C) 1993-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Values for the NAME argument to `pathconf' and `fpathconf'.
+const ( /* confname.h:24:1: */
+	X_PC_LINK_MAX           = 0
+	X_PC_MAX_CANON          = 1
+	X_PC_MAX_INPUT          = 2
+	X_PC_NAME_MAX           = 3
+	X_PC_PATH_MAX           = 4
+	X_PC_PIPE_BUF           = 5
+	X_PC_CHOWN_RESTRICTED   = 6
+	X_PC_NO_TRUNC           = 7
+	X_PC_VDISABLE           = 8
+	X_PC_SYNC_IO            = 9
+	X_PC_ASYNC_IO           = 10
+	X_PC_PRIO_IO            = 11
+	X_PC_SOCK_MAXBUF        = 12
+	X_PC_FILESIZEBITS       = 13
+	X_PC_REC_INCR_XFER_SIZE = 14
+	X_PC_REC_MAX_XFER_SIZE  = 15
+	X_PC_REC_MIN_XFER_SIZE  = 16
+	X_PC_REC_XFER_ALIGN     = 17
+	X_PC_ALLOC_SIZE_MIN     = 18
+	X_PC_SYMLINK_MAX        = 19
+	X_PC_2_SYMLINKS         = 20
+)
+
+// Values for the NAME argument to `confstr'.
+const ( /* confname.h:533:1: */
+	X_CS_PATH = 0 // The default search path.
+
+	X_CS_V6_WIDTH_RESTRICTED_ENVS = 1
+
+	X_CS_GNU_LIBC_VERSION       = 2
+	X_CS_GNU_LIBPTHREAD_VERSION = 3
+
+	X_CS_V5_WIDTH_RESTRICTED_ENVS = 4
+
+	X_CS_V7_WIDTH_RESTRICTED_ENVS = 5
+
+	X_CS_LFS_CFLAGS      = 1000
+	X_CS_LFS_LDFLAGS     = 1001
+	X_CS_LFS_LIBS        = 1002
+	X_CS_LFS_LINTFLAGS   = 1003
+	X_CS_LFS64_CFLAGS    = 1004
+	X_CS_LFS64_LDFLAGS   = 1005
+	X_CS_LFS64_LIBS      = 1006
+	X_CS_LFS64_LINTFLAGS = 1007
+
+	X_CS_XBS5_ILP32_OFF32_CFLAGS     = 1100
+	X_CS_XBS5_ILP32_OFF32_LDFLAGS    = 1101
+	X_CS_XBS5_ILP32_OFF32_LIBS       = 1102
+	X_CS_XBS5_ILP32_OFF32_LINTFLAGS  = 1103
+	X_CS_XBS5_ILP32_OFFBIG_CFLAGS    = 1104
+	X_CS_XBS5_ILP32_OFFBIG_LDFLAGS   = 1105
+	X_CS_XBS5_ILP32_OFFBIG_LIBS      = 1106
+	X_CS_XBS5_ILP32_OFFBIG_LINTFLAGS = 1107
+	X_CS_XBS5_LP64_OFF64_CFLAGS      = 1108
+	X_CS_XBS5_LP64_OFF64_LDFLAGS     = 1109
+	X_CS_XBS5_LP64_OFF64_LIBS        = 1110
+	X_CS_XBS5_LP64_OFF64_LINTFLAGS   = 1111
+	X_CS_XBS5_LPBIG_OFFBIG_CFLAGS    = 1112
+	X_CS_XBS5_LPBIG_OFFBIG_LDFLAGS   = 1113
+	X_CS_XBS5_LPBIG_OFFBIG_LIBS      = 1114
+	X_CS_XBS5_LPBIG_OFFBIG_LINTFLAGS = 1115
+
+	X_CS_POSIX_V6_ILP32_OFF32_CFLAGS     = 1116
+	X_CS_POSIX_V6_ILP32_OFF32_LDFLAGS    = 1117
+	X_CS_POSIX_V6_ILP32_OFF32_LIBS       = 1118
+	X_CS_POSIX_V6_ILP32_OFF32_LINTFLAGS  = 1119
+	X_CS_POSIX_V6_ILP32_OFFBIG_CFLAGS    = 1120
+	X_CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS   = 1121
+	X_CS_POSIX_V6_ILP32_OFFBIG_LIBS      = 1122
+	X_CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS = 1123
+	X_CS_POSIX_V6_LP64_OFF64_CFLAGS      = 1124
+	X_CS_POSIX_V6_LP64_OFF64_LDFLAGS     = 1125
+	X_CS_POSIX_V6_LP64_OFF64_LIBS        = 1126
+	X_CS_POSIX_V6_LP64_OFF64_LINTFLAGS   = 1127
+	X_CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS    = 1128
+	X_CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS   = 1129
+	X_CS_POSIX_V6_LPBIG_OFFBIG_LIBS      = 1130
+	X_CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS = 1131
+
+	X_CS_POSIX_V7_ILP32_OFF32_CFLAGS     = 1132
+	X_CS_POSIX_V7_ILP32_OFF32_LDFLAGS    = 1133
+	X_CS_POSIX_V7_ILP32_OFF32_LIBS       = 1134
+	X_CS_POSIX_V7_ILP32_OFF32_LINTFLAGS  = 1135
+	X_CS_POSIX_V7_ILP32_OFFBIG_CFLAGS    = 1136
+	X_CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS   = 1137
+	X_CS_POSIX_V7_ILP32_OFFBIG_LIBS      = 1138
+	X_CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS = 1139
+	X_CS_POSIX_V7_LP64_OFF64_CFLAGS      = 1140
+	X_CS_POSIX_V7_LP64_OFF64_LDFLAGS     = 1141
+	X_CS_POSIX_V7_LP64_OFF64_LIBS        = 1142
+	X_CS_POSIX_V7_LP64_OFF64_LINTFLAGS   = 1143
+	X_CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS    = 1144
+	X_CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS   = 1145
+	X_CS_POSIX_V7_LPBIG_OFFBIG_LIBS      = 1146
+	X_CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS = 1147
+
+	X_CS_V6_ENV = 1148
+	X_CS_V7_ENV = 1149
+)
+
+// Values for the argument to `sysconf'.
+const ( /* confname.h:71:1: */
+	X_SC_ARG_MAX               = 0
+	X_SC_CHILD_MAX             = 1
+	X_SC_CLK_TCK               = 2
+	X_SC_NGROUPS_MAX           = 3
+	X_SC_OPEN_MAX              = 4
+	X_SC_STREAM_MAX            = 5
+	X_SC_TZNAME_MAX            = 6
+	X_SC_JOB_CONTROL           = 7
+	X_SC_SAVED_IDS             = 8
+	X_SC_REALTIME_SIGNALS      = 9
+	X_SC_PRIORITY_SCHEDULING   = 10
+	X_SC_TIMERS                = 11
+	X_SC_ASYNCHRONOUS_IO       = 12
+	X_SC_PRIORITIZED_IO        = 13
+	X_SC_SYNCHRONIZED_IO       = 14
+	X_SC_FSYNC                 = 15
+	X_SC_MAPPED_FILES          = 16
+	X_SC_MEMLOCK               = 17
+	X_SC_MEMLOCK_RANGE         = 18
+	X_SC_MEMORY_PROTECTION     = 19
+	X_SC_MESSAGE_PASSING       = 20
+	X_SC_SEMAPHORES            = 21
+	X_SC_SHARED_MEMORY_OBJECTS = 22
+	X_SC_AIO_LISTIO_MAX        = 23
+	X_SC_AIO_MAX               = 24
+	X_SC_AIO_PRIO_DELTA_MAX    = 25
+	X_SC_DELAYTIMER_MAX        = 26
+	X_SC_MQ_OPEN_MAX           = 27
+	X_SC_MQ_PRIO_MAX           = 28
+	X_SC_VERSION               = 29
+	X_SC_PAGESIZE              = 30
+	X_SC_RTSIG_MAX             = 31
+	X_SC_SEM_NSEMS_MAX         = 32
+	X_SC_SEM_VALUE_MAX         = 33
+	X_SC_SIGQUEUE_MAX          = 34
+	X_SC_TIMER_MAX             = 35
+
+	// Values for the argument to `sysconf'
+	//        corresponding to _POSIX2_* symbols.
+	X_SC_BC_BASE_MAX        = 36
+	X_SC_BC_DIM_MAX         = 37
+	X_SC_BC_SCALE_MAX       = 38
+	X_SC_BC_STRING_MAX      = 39
+	X_SC_COLL_WEIGHTS_MAX   = 40
+	X_SC_EQUIV_CLASS_MAX    = 41
+	X_SC_EXPR_NEST_MAX      = 42
+	X_SC_LINE_MAX           = 43
+	X_SC_RE_DUP_MAX         = 44
+	X_SC_CHARCLASS_NAME_MAX = 45
+
+	X_SC_2_VERSION   = 46
+	X_SC_2_C_BIND    = 47
+	X_SC_2_C_DEV     = 48
+	X_SC_2_FORT_DEV  = 49
+	X_SC_2_FORT_RUN  = 50
+	X_SC_2_SW_DEV    = 51
+	X_SC_2_LOCALEDEF = 52
+
+	X_SC_PII                 = 53
+	X_SC_PII_XTI             = 54
+	X_SC_PII_SOCKET          = 55
+	X_SC_PII_INTERNET        = 56
+	X_SC_PII_OSI             = 57
+	X_SC_POLL                = 58
+	X_SC_SELECT              = 59
+	X_SC_UIO_MAXIOV          = 60
+	X_SC_IOV_MAX             = 60
+	X_SC_PII_INTERNET_STREAM = 61
+	X_SC_PII_INTERNET_DGRAM  = 62
+	X_SC_PII_OSI_COTS        = 63
+	X_SC_PII_OSI_CLTS        = 64
+	X_SC_PII_OSI_M           = 65
+	X_SC_T_IOV_MAX           = 66
+
+	// Values according to POSIX 1003.1c (POSIX threads).
+	X_SC_THREADS                      = 67
+	X_SC_THREAD_SAFE_FUNCTIONS        = 68
+	X_SC_GETGR_R_SIZE_MAX             = 69
+	X_SC_GETPW_R_SIZE_MAX             = 70
+	X_SC_LOGIN_NAME_MAX               = 71
+	X_SC_TTY_NAME_MAX                 = 72
+	X_SC_THREAD_DESTRUCTOR_ITERATIONS = 73
+	X_SC_THREAD_KEYS_MAX              = 74
+	X_SC_THREAD_STACK_MIN             = 75
+	X_SC_THREAD_THREADS_MAX           = 76
+	X_SC_THREAD_ATTR_STACKADDR        = 77
+	X_SC_THREAD_ATTR_STACKSIZE        = 78
+	X_SC_THREAD_PRIORITY_SCHEDULING   = 79
+	X_SC_THREAD_PRIO_INHERIT          = 80
+	X_SC_THREAD_PRIO_PROTECT          = 81
+	X_SC_THREAD_PROCESS_SHARED        = 82
+
+	X_SC_NPROCESSORS_CONF = 83
+	X_SC_NPROCESSORS_ONLN = 84
+	X_SC_PHYS_PAGES       = 85
+	X_SC_AVPHYS_PAGES     = 86
+	X_SC_ATEXIT_MAX       = 87
+	X_SC_PASS_MAX         = 88
+
+	X_SC_XOPEN_VERSION     = 89
+	X_SC_XOPEN_XCU_VERSION = 90
+	X_SC_XOPEN_UNIX        = 91
+	X_SC_XOPEN_CRYPT       = 92
+	X_SC_XOPEN_ENH_I18N    = 93
+	X_SC_XOPEN_SHM         = 94
+
+	X_SC_2_CHAR_TERM = 95
+	X_SC_2_C_VERSION = 96
+	X_SC_2_UPE       = 97
+
+	X_SC_XOPEN_XPG2 = 98
+	X_SC_XOPEN_XPG3 = 99
+	X_SC_XOPEN_XPG4 = 100
+
+	X_SC_CHAR_BIT   = 101
+	X_SC_CHAR_MAX   = 102
+	X_SC_CHAR_MIN   = 103
+	X_SC_INT_MAX    = 104
+	X_SC_INT_MIN    = 105
+	X_SC_LONG_BIT   = 106
+	X_SC_WORD_BIT   = 107
+	X_SC_MB_LEN_MAX = 108
+	X_SC_NZERO      = 109
+	X_SC_SSIZE_MAX  = 110
+	X_SC_SCHAR_MAX  = 111
+	X_SC_SCHAR_MIN  = 112
+	X_SC_SHRT_MAX   = 113
+	X_SC_SHRT_MIN   = 114
+	X_SC_UCHAR_MAX  = 115
+	X_SC_UINT_MAX   = 116
+	X_SC_ULONG_MAX  = 117
+	X_SC_USHRT_MAX  = 118
+
+	X_SC_NL_ARGMAX  = 119
+	X_SC_NL_LANGMAX = 120
+	X_SC_NL_MSGMAX  = 121
+	X_SC_NL_NMAX    = 122
+	X_SC_NL_SETMAX  = 123
+	X_SC_NL_TEXTMAX = 124
+
+	X_SC_XBS5_ILP32_OFF32  = 125
+	X_SC_XBS5_ILP32_OFFBIG = 126
+	X_SC_XBS5_LP64_OFF64   = 127
+	X_SC_XBS5_LPBIG_OFFBIG = 128
+
+	X_SC_XOPEN_LEGACY           = 129
+	X_SC_XOPEN_REALTIME         = 130
+	X_SC_XOPEN_REALTIME_THREADS = 131
+
+	X_SC_ADVISORY_INFO          = 132
+	X_SC_BARRIERS               = 133
+	X_SC_BASE                   = 134
+	X_SC_C_LANG_SUPPORT         = 135
+	X_SC_C_LANG_SUPPORT_R       = 136
+	X_SC_CLOCK_SELECTION        = 137
+	X_SC_CPUTIME                = 138
+	X_SC_THREAD_CPUTIME         = 139
+	X_SC_DEVICE_IO              = 140
+	X_SC_DEVICE_SPECIFIC        = 141
+	X_SC_DEVICE_SPECIFIC_R      = 142
+	X_SC_FD_MGMT                = 143
+	X_SC_FIFO                   = 144
+	X_SC_PIPE                   = 145
+	X_SC_FILE_ATTRIBUTES        = 146
+	X_SC_FILE_LOCKING           = 147
+	X_SC_FILE_SYSTEM            = 148
+	X_SC_MONOTONIC_CLOCK        = 149
+	X_SC_MULTI_PROCESS          = 150
+	X_SC_SINGLE_PROCESS         = 151
+	X_SC_NETWORKING             = 152
+	X_SC_READER_WRITER_LOCKS    = 153
+	X_SC_SPIN_LOCKS             = 154
+	X_SC_REGEXP                 = 155
+	X_SC_REGEX_VERSION          = 156
+	X_SC_SHELL                  = 157
+	X_SC_SIGNALS                = 158
+	X_SC_SPAWN                  = 159
+	X_SC_SPORADIC_SERVER        = 160
+	X_SC_THREAD_SPORADIC_SERVER = 161
+	X_SC_SYSTEM_DATABASE        = 162
+	X_SC_SYSTEM_DATABASE_R      = 163
+	X_SC_TIMEOUTS               = 164
+	X_SC_TYPED_MEMORY_OBJECTS   = 165
+	X_SC_USER_GROUPS            = 166
+	X_SC_USER_GROUPS_R          = 167
+	X_SC_2_PBS                  = 168
+	X_SC_2_PBS_ACCOUNTING       = 169
+	X_SC_2_PBS_LOCATE           = 170
+	X_SC_2_PBS_MESSAGE          = 171
+	X_SC_2_PBS_TRACK            = 172
+	X_SC_SYMLOOP_MAX            = 173
+	X_SC_STREAMS                = 174
+	X_SC_2_PBS_CHECKPOINT       = 175
+
+	X_SC_V6_ILP32_OFF32  = 176
+	X_SC_V6_ILP32_OFFBIG = 177
+	X_SC_V6_LP64_OFF64   = 178
+	X_SC_V6_LPBIG_OFFBIG = 179
+
+	X_SC_HOST_NAME_MAX      = 180
+	X_SC_TRACE              = 181
+	X_SC_TRACE_EVENT_FILTER = 182
+	X_SC_TRACE_INHERIT      = 183
+	X_SC_TRACE_LOG          = 184
+
+	X_SC_LEVEL1_ICACHE_SIZE     = 185
+	X_SC_LEVEL1_ICACHE_ASSOC    = 186
+	X_SC_LEVEL1_ICACHE_LINESIZE = 187
+	X_SC_LEVEL1_DCACHE_SIZE     = 188
+	X_SC_LEVEL1_DCACHE_ASSOC    = 189
+	X_SC_LEVEL1_DCACHE_LINESIZE = 190
+	X_SC_LEVEL2_CACHE_SIZE      = 191
+	X_SC_LEVEL2_CACHE_ASSOC     = 192
+	X_SC_LEVEL2_CACHE_LINESIZE  = 193
+	X_SC_LEVEL3_CACHE_SIZE      = 194
+	X_SC_LEVEL3_CACHE_ASSOC     = 195
+	X_SC_LEVEL3_CACHE_LINESIZE  = 196
+	X_SC_LEVEL4_CACHE_SIZE      = 197
+	X_SC_LEVEL4_CACHE_ASSOC     = 198
+	X_SC_LEVEL4_CACHE_LINESIZE  = 199
+	// Leave room here, maybe we need a few more cache levels some day.
+
+	X_SC_IPV6        = 235
+	X_SC_RAW_SOCKETS = 236
+
+	X_SC_V7_ILP32_OFF32  = 237
+	X_SC_V7_ILP32_OFFBIG = 238
+	X_SC_V7_LP64_OFF64   = 239
+	X_SC_V7_LPBIG_OFFBIG = 240
+
+	X_SC_SS_REPL_MAX = 241
+
+	X_SC_TRACE_EVENT_NAME_MAX = 242
+	X_SC_TRACE_NAME_MAX       = 243
+	X_SC_TRACE_SYS_MAX        = 244
+	X_SC_TRACE_USER_EVENT_MAX = 245
+
+	X_SC_XOPEN_STREAMS = 246
+
+	X_SC_THREAD_ROBUST_PRIO_INHERIT = 247
+	X_SC_THREAD_ROBUST_PRIO_PROTECT = 248
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX Standard: 2.10 Symbolic Constants		<unistd.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// These are defined by the user (or the compiler)
+//    to specify the desired environment:
+//
+//    __STRICT_ANSI__	ISO Standard C.
+//    _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
+//    _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
+//    _ISOC2X_SOURCE	Extensions to ISO C99 from ISO C2X.
+//    __STDC_WANT_LIB_EXT2__
+// 			Extensions to ISO C99 from TR 27431-2:2010.
+//    __STDC_WANT_IEC_60559_BFP_EXT__
+// 			Extensions to ISO C11 from TS 18661-1:2014.
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__
+// 			Extensions to ISO C11 from TS 18661-4:2015.
+//    __STDC_WANT_IEC_60559_TYPES_EXT__
+// 			Extensions to ISO C11 from TS 18661-3:2015.
+//
+//    _POSIX_SOURCE	IEEE Std 1003.1.
+//    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
+// 			if >=199309L, add IEEE Std 1003.1b-1993;
+// 			if >=199506L, add IEEE Std 1003.1c-1995;
+// 			if >=200112L, all of IEEE 1003.1-2004
+// 			if >=200809L, all of IEEE 1003.1-2008
+//    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
+// 			Single Unix conformance is wanted, to 600 for the
+// 			sixth revision, to 700 for the seventh revision.
+//    _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
+//    _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
+//    _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
+//    _FILE_OFFSET_BITS=N	Select default filesystem interface.
+//    _ATFILE_SOURCE	Additional *at interfaces.
+//    _GNU_SOURCE		All of the above, plus GNU extensions.
+//    _DEFAULT_SOURCE	The default set of features (taking precedence over
+// 			__STRICT_ANSI__).
+//
+//    _FORTIFY_SOURCE	Add security hardening to many library functions.
+// 			Set to 1 or 2; 2 performs stricter checks than 1.
+//
+//    _REENTRANT, _THREAD_SAFE
+// 			Obsolete; equivalent to _POSIX_C_SOURCE=199506L.
+//
+//    The `-ansi' switch to the GNU C compiler, and standards conformance
+//    options such as `-std=c99', define __STRICT_ANSI__.  If none of
+//    these are defined, or if _DEFAULT_SOURCE is defined, the default is
+//    to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
+//    200809L, as well as enabling miscellaneous functions from BSD and
+//    SVID.  If more than one of these are defined, they accumulate.  For
+//    example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
+//    give you ISO C, 1003.1, and 1003.2, but nothing else.
+//
+//    These are defined by this file and are used by the
+//    header files to decide what to declare or define:
+//
+//    __GLIBC_USE (F)	Define things from feature set F.  This is defined
+// 			to 1 or 0; the subsequent macros are either defined
+// 			or undefined, and those tests should be moved to
+// 			__GLIBC_USE.
+//    __USE_ISOC11		Define ISO C11 things.
+//    __USE_ISOC99		Define ISO C99 things.
+//    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+//    __USE_ISOCXX11	Define ISO C++11 things.
+//    __USE_POSIX		Define IEEE Std 1003.1 things.
+//    __USE_POSIX2		Define IEEE Std 1003.2 things.
+//    __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
+//    __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
+//    __USE_XOPEN		Define XPG things.
+//    __USE_XOPEN_EXTENDED	Define X/Open Unix things.
+//    __USE_UNIX98		Define Single Unix V2 things.
+//    __USE_XOPEN2K        Define XPG6 things.
+//    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+//    __USE_XOPEN2K8       Define XPG7 things.
+//    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
+//    __USE_LARGEFILE	Define correct standard I/O things.
+//    __USE_LARGEFILE64	Define LFS things with separate names.
+//    __USE_FILE_OFFSET64	Define 64bit interface as default.
+//    __USE_MISC		Define things from 4.3BSD or System V Unix.
+//    __USE_ATFILE		Define *at interfaces and AT_* constants for them.
+//    __USE_GNU		Define GNU extensions.
+//    __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
+//
+//    The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
+//    defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
+//    only for compatibility.  All new code should use the other symbols
+//    to test for features.
+//
+//    All macros listed above as possibly being defined by this file are
+//    explicitly undefined if they are not explicitly defined.
+//    Feature-test macros that are not defined by the user or compiler
+//    but are implied by the other feature-test macros defined (or by the
+//    lack of any definitions) are defined by the file.
+//
+//    ISO C feature test macros depend on the definition of the macro
+//    when an affected header is included, not when the first system
+//    header is included, and so they are handled in
+//    <bits/libc-header-start.h>, which does not have a multiple include
+//    guard.  Feature test macros that can be handled from the first
+//    system header included are handled here.
+
+// Undefine everything, so we get a clean slate.
+
+// Suppress kernel-name space pollution unless user expressedly asks
+//    for it.
+
+// Convenience macro to test the version of gcc.
+//    Use like this:
+//    #if __GNUC_PREREQ (2,8)
+//    ... code requiring gcc 2.8 or later ...
+//    #endif
+//    Note: only works for GCC 2.0 and later, because __GNUC_MINOR__ was
+//    added in 2.0.
+
+// Similarly for clang.  Features added to GCC after version 4.2 may
+//    or may not also be available in clang, and clang's definitions of
+//    __GNUC(_MINOR)__ are fixed at 4 and 2 respectively.  Not all such
+//    features can be queried via __has_extension/__has_feature.
+
+// Whether to use feature set F.
+
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
+//    _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
+//    issue a warning; the expectation is that the source is being
+//    transitioned to use the new macro.
+
+// If _GNU_SOURCE was defined by the user, turn on all the other features.
+
+// If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
+//    define _DEFAULT_SOURCE.
+
+// This is to enable the ISO C2X extension.
+
+// This is to enable the ISO C11 extension.
+
+// This is to enable the ISO C99 extension.
+
+// This is to enable the ISO C90 Amendment 1:1995 extension.
+
+// If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
+//    is defined, use POSIX.1-2008 (or another version depending on
+//    _XOPEN_SOURCE).
+
+// Some C libraries once required _REENTRANT and/or _THREAD_SAFE to be
+//    defined in all multithreaded code.  GNU libc has not required this
+//    for many years.  We now treat them as compatibility synonyms for
+//    _POSIX_C_SOURCE=199506L, which is the earliest level of POSIX with
+//    comprehensive support for multithreaded code.  Using them never
+//    lowers the selected level of POSIX conformance, only raises it.
+
+// The function 'gets' existed in C89, but is impossible to use
+//    safely.  It has been removed from ISO C11 and ISO C++14.  Note: for
+//    compatibility with various implementations of <cstdio>, this test
+//    must consider only the value of __cplusplus when compiling C++.
+
+// GNU formerly extended the scanf functions with modified format
+//    specifiers %as, %aS, and %a[...] that allocate a buffer for the
+//    input using malloc.  This extension conflicts with ISO C99, which
+//    defines %a as a standalone format specifier that reads a floating-
+//    point number; moreover, POSIX.1-2008 provides the same feature
+//    using the modifier letter 'm' instead (%ms, %mS, %m[...]).
+//
+//    We now follow C99 unless GNU extensions are active and the compiler
+//    is specifically in C89 or C++98 mode (strict or not).  For
+//    instance, with GCC, -std=gnu11 will have C99-compliant scanf with
+//    or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
+//    old extension.
+
+// Get definitions of __STDC_* predefined macros, if the compiler has
+//    not preincluded this header automatically.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This macro indicates that the installed library is the GNU C Library.
+//    For historic reasons the value now is 6 and this will stay from now
+//    on.  The use of this variable is deprecated.  Use __GLIBC__ and
+//    __GLIBC_MINOR__ now (see below) when you want to test for a specific
+//    GNU C library version and use the values in <gnu/lib-names.h> to get
+//    the sonames of the shared libraries.
+
+// Major and minor version number of the GNU C library package.  Use
+//    these macros to test for features in specific releases.
+
+// This is here only because every header file already includes this one.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// We are almost always included from features.h.
+
+// The GNU libc does not support any K&R compilers or the traditional mode
+//    of ISO C compilers anymore.  Check for some of the combinations not
+//    anymore supported.
+
+// Some user header file might have defined this before.
+
+// All functions, except those with callbacks or those that
+//    synchronize memory, are leaf functions.
+
+// GCC can always grok prototypes.  For C++ programs we add throw()
+//    to help it optimize the function calls.  But this works only with
+//    gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+//    as non-throwing using a function attribute since programs can use
+//    the -fexceptions options for C code as well.
+
+// Compilers that are not clang may object to
+//        #if defined __clang__ && __has_extension(...)
+//    even though they do not need to evaluate the right-hand side of the &&.
+
+// These two macros are not used in glibc anymore.  They are kept here
+//    only because some other projects expect the macros to be defined.
+
+// For these things, GCC behaves the ANSI way normally,
+//    and the non-ANSI way under -traditional.
+
+// This is not a typedef so `const __ptr_t' does the right thing.
+
+// C++ needs to know that types and declarations are C, not C++.
+
+// Fortify support.
+
+// Support for flexible arrays.
+//    Headers that should use flexible arrays only if they're "real"
+//    (e.g. only if they won't affect sizeof()) should test
+//    #if __glibc_c99_flexarr_available.
+
+// __asm__ ("xyz") is used throughout the headers to rename functions
+//    at the assembly language level.  This is wrapped by the __REDIRECT
+//    macro, in order to support compilers that can do this some other
+//    way.  When compilers don't support asm-names at all, we have to do
+//    preprocessor tricks instead (which don't have exactly the right
+//    semantics, but it's the best we can do).
+//
+//    Example:
+//    int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid);
+
+//
+// #elif __SOME_OTHER_COMPILER__
+//
+// # define __REDIRECT(name, proto, alias) name proto; 	_Pragma("let " #name " = " #alias)
+
+// GCC has various useful declarations that can be made with the
+//    `__attribute__' syntax.  All of the ways we use this do fine if
+//    they are omitted for compilers that don't understand it.
+
+// At some point during the gcc 2.96 development the `malloc' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Tell the compiler which arguments to an allocation function
+//    indicate the size of the allocation.
+
+// At some point during the gcc 2.96 development the `pure' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// This declaration tells the compiler that the value is constant.
+
+// At some point during the gcc 3.1 development the `used' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Since version 3.2, gcc allows marking deprecated functions.
+
+// Since version 4.5, gcc also allows one to specify the message printed
+//    when a deprecated function is used.  clang claims to be gcc 4.2, but
+//    may also support this feature.
+
+// At some point during the gcc 2.8 development the `format_arg' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+//    If several `format_arg' attributes are given for the same function, in
+//    gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+//    all designated arguments are considered.
+
+// At some point during the gcc 2.97 development the `strfmon' format
+//    attribute for functions was introduced.  We don't want to use it
+//    unconditionally (although this would be possible) since it
+//    generates warnings.
+
+// The nonull function attribute allows to mark pointer parameters which
+//    must not be NULL.
+
+// If fortification mode, we warn about unused results of certain
+//    function calls which can lead to problems.
+
+// Forces a function to be always inlined.
+// The Linux kernel defines __always_inline in stddef.h (283d7573), and
+//    it conflicts with this definition.  Therefore undefine it first to
+//    allow either header to be included first.
+
+// Associate error messages with the source location of the call site rather
+//    than with the source location inside the function.
+
+// GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+//    inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
+//    or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+//    older than 4.3 may define these macros and still not guarantee GNU inlining
+//    semantics.
+//
+//    clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+//    semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
+//    __GNUC_GNU_INLINE__ macro definitions.
+
+// GCC 4.3 and above allow passing all anonymous arguments of an
+//    __extern_always_inline function to some other vararg function.
+
+// It is possible to compile containing GCC extensions even if GCC is
+//    run in pedantic mode if the uses are carefully marked using the
+//    `__extension__' keyword.  But this is not generally available before
+//    version 2.8.
+
+// __restrict is known in EGCS 1.2 and above.
+
+// ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+//      array_name[restrict]
+//    GCC 3.1 supports this.
+
+// Describes a char array whose address can safely be passed as the first
+//    argument to strncpy and strncat, as the char array is not necessarily
+//    a NUL-terminated string.
+
+// Undefine (also defined in libc-symbols.h).
+// Copies attributes from the declaration or type referenced by
+//    the argument.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// __glibc_macro_warning (MESSAGE) issues warning MESSAGE.  This is
+//    intended for use in preprocessor macros.
+//
+//    Note: MESSAGE must be a _single_ string; concatenation of string
+//    literals is not supported.
+
+// Generic selection (ISO C11) is a C-only feature, available in GCC
+//    since version 4.9.  Previous versions do not provide generic
+//    selection, even though they might set __STDC_VERSION__ to 201112L,
+//    when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
+//    when testing __STDC_VERSION__ for generic selection support.
+//    On the other hand, Clang also defines __GNUC__, so a clang-specific
+//    check is required to enable the use of generic selection.
+
+// If we don't have __REDIRECT, prototypes will be missing if
+//    __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64].
+
+// Decide whether we can define 'extern inline' functions in headers.
+
+// This is here only because every header file already includes this one.
+//    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
+//    <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+//    that will always return failure (and set errno to ENOSYS).
+// This file is automatically generated.
+//    This file selects the right generated file of `__stub_FUNCTION' macros
+//    based on the architecture being compiled for.
+
+// This file is automatically generated.
+//    It defines a symbol `__stub_FUNCTION' for each function
+//    in the C library which is a stub, meaning it will fail
+//    every time called, usually setting errno to ENOSYS.
+
+// These may be used to determine what facilities are present at compile time.
+//    Their values can be obtained at run time from `sysconf'.
+
+// POSIX Standard approved as ISO/IEC 9945-1 as of September 2008.
+
+// These are not #ifdef __USE_POSIX2 because they are
+//    in the theoretically application-owned namespace.
+
+// The utilities on GNU systems also correspond to this version.
+
+// The utilities on GNU systems also correspond to this version.
+
+// This symbol was required until the 2001 edition of POSIX.
+
+// If defined, the implementation supports the
+//    C Language Bindings Option.
+
+// If defined, the implementation supports the
+//    C Language Development Utilities Option.
+
+// If defined, the implementation supports the
+//    Software Development Utilities Option.
+
+// If defined, the implementation supports the
+//    creation of locales with the localedef utility.
+
+// X/Open version number to which the library conforms.  It is selectable.
+
+// Commands and utilities from XPG4 are available.
+
+// We are compatible with the old published standards as well.
+
+// The X/Open Unix extensions are available.
+
+// The enhanced internationalization capabilities according to XPG4.2
+//    are present.
+
+// The legacy interfaces are also available.
+
+// Get values of POSIX options:
+//
+//    If these symbols are defined, the corresponding features are
+//    always available.  If not, they may be available sometimes.
+//    The current values can be obtained with `sysconf'.
+//
+//    _POSIX_JOB_CONTROL		Job control is supported.
+//    _POSIX_SAVED_IDS		Processes have a saved set-user-ID
+// 				and a saved set-group-ID.
+//    _POSIX_REALTIME_SIGNALS	Real-time, queued signals are supported.
+//    _POSIX_PRIORITY_SCHEDULING	Priority scheduling is supported.
+//    _POSIX_TIMERS		POSIX.4 clocks and timers are supported.
+//    _POSIX_ASYNCHRONOUS_IO	Asynchronous I/O is supported.
+//    _POSIX_PRIORITIZED_IO	Prioritized asynchronous I/O is supported.
+//    _POSIX_SYNCHRONIZED_IO	Synchronizing file data is supported.
+//    _POSIX_FSYNC			The fsync function is present.
+//    _POSIX_MAPPED_FILES		Mapping of files to memory is supported.
+//    _POSIX_MEMLOCK		Locking of all memory is supported.
+//    _POSIX_MEMLOCK_RANGE		Locking of ranges of memory is supported.
+//    _POSIX_MEMORY_PROTECTION	Setting of memory protections is supported.
+//    _POSIX_MESSAGE_PASSING	POSIX.4 message queues are supported.
+//    _POSIX_SEMAPHORES		POSIX.4 counting semaphores are supported.
+//    _POSIX_SHARED_MEMORY_OBJECTS	POSIX.4 shared memory objects are supported.
+//    _POSIX_THREADS		POSIX.1c pthreads are supported.
+//    _POSIX_THREAD_ATTR_STACKADDR	Thread stack address attribute option supported.
+//    _POSIX_THREAD_ATTR_STACKSIZE	Thread stack size attribute option supported.
+//    _POSIX_THREAD_SAFE_FUNCTIONS	Thread-safe functions are supported.
+//    _POSIX_THREAD_PRIORITY_SCHEDULING
+// 				POSIX.1c thread execution scheduling supported.
+//    _POSIX_THREAD_PRIO_INHERIT	Thread priority inheritance option supported.
+//    _POSIX_THREAD_PRIO_PROTECT	Thread priority protection option supported.
+//    _POSIX_THREAD_PROCESS_SHARED	Process-shared synchronization supported.
+//    _POSIX_PII			Protocol-independent interfaces are supported.
+//    _POSIX_PII_XTI		XTI protocol-indep. interfaces are supported.
+//    _POSIX_PII_SOCKET		Socket protocol-indep. interfaces are supported.
+//    _POSIX_PII_INTERNET		Internet family of protocols supported.
+//    _POSIX_PII_INTERNET_STREAM	Connection-mode Internet protocol supported.
+//    _POSIX_PII_INTERNET_DGRAM	Connectionless Internet protocol supported.
+//    _POSIX_PII_OSI		ISO/OSI family of protocols supported.
+//    _POSIX_PII_OSI_COTS		Connection-mode ISO/OSI service supported.
+//    _POSIX_PII_OSI_CLTS		Connectionless ISO/OSI service supported.
+//    _POSIX_POLL			Implementation supports `poll' function.
+//    _POSIX_SELECT		Implementation supports `select' and `pselect'.
+//
+//    _XOPEN_REALTIME		X/Open realtime support is available.
+//    _XOPEN_REALTIME_THREADS	X/Open realtime thread support is available.
+//    _XOPEN_SHM			Shared memory interface according to XPG4.2.
+//
+//    _XBS5_ILP32_OFF32		Implementation provides environment with 32-bit
+// 				int, long, pointer, and off_t types.
+//    _XBS5_ILP32_OFFBIG		Implementation provides environment with 32-bit
+// 				int, long, and pointer and off_t with at least
+// 				64 bits.
+//    _XBS5_LP64_OFF64		Implementation provides environment with 32-bit
+// 				int, and 64-bit long, pointer, and off_t types.
+//    _XBS5_LPBIG_OFFBIG		Implementation provides environment with at
+// 				least 32 bits int and long, pointer, and off_t
+// 				with at least 64 bits.
+//
+//    If any of these symbols is defined as -1, the corresponding option is not
+//    true for any file.  If any is defined as other than -1, the corresponding
+//    option is true for all files.  If a symbol is not defined at all, the value
+//    for a specific file can be obtained from `pathconf' and `fpathconf'.
+//
+//    _POSIX_CHOWN_RESTRICTED	Only the super user can use `chown' to change
+// 				the owner of a file.  `chown' can only be used
+// 				to change the group ID of a file to a group of
+// 				which the calling process is a member.
+//    _POSIX_NO_TRUNC		Pathname components longer than
+// 				NAME_MAX generate an error.
+//    _POSIX_VDISABLE		If defined, if the value of an element of the
+// 				`c_cc' member of `struct termios' is
+// 				_POSIX_VDISABLE, no character will have the
+// 				effect associated with that element.
+//    _POSIX_SYNC_IO		Synchronous I/O may be performed.
+//    _POSIX_ASYNC_IO		Asynchronous I/O may be performed.
+//    _POSIX_PRIO_IO		Prioritized Asynchronous I/O may be performed.
+//
+//    Support for the Large File Support interface is not generally available.
+//    If it is available the following constants are defined to one.
+//    _LFS64_LARGEFILE		Low-level I/O supports large files.
+//    _LFS64_STDIO			Standard I/O supports large files.
+//
+
+// Define POSIX options for Linux.
+//    Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public License as
+//    published by the Free Software Foundation; either version 2.1 of the
+//    License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; see the file COPYING.LIB.  If
+//    not, see <https://www.gnu.org/licenses/>.
+
+// Job control is supported.
+
+// Processes have a saved set-user-ID and a saved set-group-ID.
+
+// Priority scheduling is not supported with the correct semantics,
+//    but GNU/Linux applications expect that the corresponding interfaces
+//    are available, even though the semantics do not meet the POSIX
+//    requirements.  See glibc bug 14829.
+
+// Synchronizing file data is supported.
+
+// The fsync function is present.
+
+// Mapping of files to memory is supported.
+
+// Locking of all memory is supported.
+
+// Locking of ranges of memory is supported.
+
+// Setting of memory protections is supported.
+
+// Some filesystems allow all users to change file ownership.
+
+// `c_cc' member of 'struct termios' structure can be disabled by
+//    using the value _POSIX_VDISABLE.
+
+// Filenames are not silently truncated.
+
+// X/Open realtime support is available.
+
+// X/Open thread realtime support is available.
+
+// XPG4.2 shared memory is supported.
+
+// Tell we have POSIX threads.
+
+// We have the reentrant functions described in POSIX.
+
+// We provide priority scheduling for threads.
+
+// We support user-defined stack sizes.
+
+// We support user-defined stacks.
+
+// We support priority inheritence.
+
+// We support priority protection, though only for non-robust
+//    mutexes.
+
+// We support priority inheritence for robust mutexes.
+
+// We do not support priority protection for robust mutexes.
+
+// We support POSIX.1b semaphores.
+
+// Real-time signals are supported.
+
+// We support asynchronous I/O.
+// Alternative name for Unix98.
+// Support for prioritization is also available.
+
+// The LFS support in asynchronous I/O is also available.
+
+// The rest of the LFS is also available.
+
+// POSIX shared memory objects are implemented.
+
+// CPU-time clocks support needs to be checked at runtime.
+
+// Clock support in threads must be also checked at runtime.
+
+// GNU libc provides regular expression handling.
+
+// Reader/Writer locks are available.
+
+// We have a POSIX shell.
+
+// We support the Timeouts option.
+
+// We support spinlocks.
+
+// The `spawn' function family is supported.
+
+// We have POSIX timers.
+
+// The barrier functions are available.
+
+// POSIX message queues are available.
+
+// Thread process-shared synchronization is supported.
+
+// The monotonic clock might be available.
+
+// The clock selection interfaces are available.
+
+// Advisory information interfaces are available.
+
+// IPv6 support is available.
+
+// Raw socket support is available.
+
+// We have at least one terminal.
+
+// Neither process nor thread sporadic server interfaces is available.
+
+// trace.h is not available.
+
+// Typed memory objects are not available.
+
+// Get the environment definitions from Unix98.
+// Copyright (C) 1999-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// This header should define the following symbols under the described
+//    situations.  A value `1' means that the model is always supported,
+//    `-1' means it is never supported.  Undefined means it cannot be
+//    statically decided.
+//
+//    _POSIX_V7_ILP32_OFF32   32bit int, long, pointers, and off_t type
+//    _POSIX_V7_ILP32_OFFBIG  32bit int, long, and pointers and larger off_t type
+//
+//    _POSIX_V7_LP64_OFF32	   64bit long and pointers and 32bit off_t type
+//    _POSIX_V7_LPBIG_OFFBIG  64bit long and pointers and large off_t type
+//
+//    The macros _POSIX_V6_ILP32_OFF32, _POSIX_V6_ILP32_OFFBIG,
+//    _POSIX_V6_LP64_OFF32, _POSIX_V6_LPBIG_OFFBIG, _XBS5_ILP32_OFF32,
+//    _XBS5_ILP32_OFFBIG, _XBS5_LP64_OFF32, and _XBS5_LPBIG_OFFBIG were
+//    used in previous versions of the Unix standard and are available
+//    only for compatibility.
+
+// Environments with 32-bit wide pointers are optionally provided.
+//    Therefore following macros aren't defined:
+//    # undef _POSIX_V7_ILP32_OFF32
+//    # undef _POSIX_V7_ILP32_OFFBIG
+//    # undef _POSIX_V6_ILP32_OFF32
+//    # undef _POSIX_V6_ILP32_OFFBIG
+//    # undef _XBS5_ILP32_OFF32
+//    # undef _XBS5_ILP32_OFFBIG
+//    and users need to check at runtime.
+
+// We also have no use (for now) for an environment with bigger pointers
+//    and offsets.
+
+// By default we have 64-bit wide `long int', pointers and `off_t'.
+
+// Standard file descriptors.
+
+// All functions that are not declared anywhere else.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Seconds since the Epoch, visible to user code when time_t is too
+//    narrow only for consistency with the old way of widening too-narrow
+//    types.  User code should never use __time64_t.
+
+type Ssize_t = X__ssize_t /* unistd.h:220:19 */
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// The Single Unix specification says that some more types are
+//
+//	available here.
+type Gid_t = X__gid_t /* unistd.h:232:17 */
+
+type Uid_t = X__uid_t /* unistd.h:237:17 */
+
+type Off_t = X__off64_t /* unistd.h:245:19 */
+
+type Useconds_t = X__useconds_t /* unistd.h:255:22 */
+
+type Pid_t = X__pid_t /* unistd.h:260:17 */
+
+type Intptr_t = X__intptr_t /* unistd.h:267:20 */
+
+type Socklen_t = X__socklen_t /* unistd.h:274:21 */
+
+// Define some macros helping to catch buffer overflows.
+
+// System-specific extensions.
+// System-specific extensions of <unistd.h>, Linux version.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/utime/capi_linux_loong64.go b/vendor/modernc.org/libc/utime/capi_linux_loong64.go
new file mode 100644
index 00000000..8f7c87f4
--- /dev/null
+++ b/vendor/modernc.org/libc/utime/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo utime/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o utime/utime_linux_amd64.go -pkgname utime', DO NOT EDIT.
+
+package utime
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/utime/utime_linux_loong64.go b/vendor/modernc.org/libc/utime/utime_linux_loong64.go
new file mode 100644
index 00000000..9d673aca
--- /dev/null
+++ b/vendor/modernc.org/libc/utime/utime_linux_loong64.go
@@ -0,0 +1,781 @@
+// Code generated by 'ccgo utime/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o utime/utime_linux_amd64.go -pkgname utime', DO NOT EDIT.
+
+package utime
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	X_ATFILE_SOURCE    = 1      // features.h:342:1:
+	X_BITS_TIME64_H    = 1      // time64.h:24:1:
+	X_BITS_TYPESIZES_H = 1      // typesizes.h:24:1:
+	X_BITS_TYPES_H     = 1      // types.h:24:1:
+	X_DEFAULT_SOURCE   = 1      // features.h:227:1:
+	X_FEATURES_H       = 1      // features.h:19:1:
+	X_FILE_OFFSET_BITS = 64     // <builtin>:25:1:
+	X_LP64             = 1      // <predefined>:284:1:
+	X_POSIX_C_SOURCE   = 200809 // features.h:281:1:
+	X_POSIX_SOURCE     = 1      // features.h:279:1:
+	X_STDC_PREDEF_H    = 1      // <predefined>:162:1:
+	X_SYS_CDEFS_H      = 1      // cdefs.h:19:1:
+	X_UTIME_H          = 1      // utime.h:23:1:
+	Linux              = 1      // <predefined>:231:1:
+	Unix               = 1      // <predefined>:177:1:
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX Standard: 5.6.6 Set File Access and Modification Times  <utime.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// These are defined by the user (or the compiler)
+//    to specify the desired environment:
+//
+//    __STRICT_ANSI__	ISO Standard C.
+//    _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
+//    _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
+//    _ISOC2X_SOURCE	Extensions to ISO C99 from ISO C2X.
+//    __STDC_WANT_LIB_EXT2__
+// 			Extensions to ISO C99 from TR 27431-2:2010.
+//    __STDC_WANT_IEC_60559_BFP_EXT__
+// 			Extensions to ISO C11 from TS 18661-1:2014.
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__
+// 			Extensions to ISO C11 from TS 18661-4:2015.
+//    __STDC_WANT_IEC_60559_TYPES_EXT__
+// 			Extensions to ISO C11 from TS 18661-3:2015.
+//
+//    _POSIX_SOURCE	IEEE Std 1003.1.
+//    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
+// 			if >=199309L, add IEEE Std 1003.1b-1993;
+// 			if >=199506L, add IEEE Std 1003.1c-1995;
+// 			if >=200112L, all of IEEE 1003.1-2004
+// 			if >=200809L, all of IEEE 1003.1-2008
+//    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
+// 			Single Unix conformance is wanted, to 600 for the
+// 			sixth revision, to 700 for the seventh revision.
+//    _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
+//    _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
+//    _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
+//    _FILE_OFFSET_BITS=N	Select default filesystem interface.
+//    _ATFILE_SOURCE	Additional *at interfaces.
+//    _GNU_SOURCE		All of the above, plus GNU extensions.
+//    _DEFAULT_SOURCE	The default set of features (taking precedence over
+// 			__STRICT_ANSI__).
+//
+//    _FORTIFY_SOURCE	Add security hardening to many library functions.
+// 			Set to 1 or 2; 2 performs stricter checks than 1.
+//
+//    _REENTRANT, _THREAD_SAFE
+// 			Obsolete; equivalent to _POSIX_C_SOURCE=199506L.
+//
+//    The `-ansi' switch to the GNU C compiler, and standards conformance
+//    options such as `-std=c99', define __STRICT_ANSI__.  If none of
+//    these are defined, or if _DEFAULT_SOURCE is defined, the default is
+//    to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
+//    200809L, as well as enabling miscellaneous functions from BSD and
+//    SVID.  If more than one of these are defined, they accumulate.  For
+//    example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
+//    give you ISO C, 1003.1, and 1003.2, but nothing else.
+//
+//    These are defined by this file and are used by the
+//    header files to decide what to declare or define:
+//
+//    __GLIBC_USE (F)	Define things from feature set F.  This is defined
+// 			to 1 or 0; the subsequent macros are either defined
+// 			or undefined, and those tests should be moved to
+// 			__GLIBC_USE.
+//    __USE_ISOC11		Define ISO C11 things.
+//    __USE_ISOC99		Define ISO C99 things.
+//    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+//    __USE_ISOCXX11	Define ISO C++11 things.
+//    __USE_POSIX		Define IEEE Std 1003.1 things.
+//    __USE_POSIX2		Define IEEE Std 1003.2 things.
+//    __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
+//    __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
+//    __USE_XOPEN		Define XPG things.
+//    __USE_XOPEN_EXTENDED	Define X/Open Unix things.
+//    __USE_UNIX98		Define Single Unix V2 things.
+//    __USE_XOPEN2K        Define XPG6 things.
+//    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+//    __USE_XOPEN2K8       Define XPG7 things.
+//    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
+//    __USE_LARGEFILE	Define correct standard I/O things.
+//    __USE_LARGEFILE64	Define LFS things with separate names.
+//    __USE_FILE_OFFSET64	Define 64bit interface as default.
+//    __USE_MISC		Define things from 4.3BSD or System V Unix.
+//    __USE_ATFILE		Define *at interfaces and AT_* constants for them.
+//    __USE_GNU		Define GNU extensions.
+//    __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
+//
+//    The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
+//    defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
+//    only for compatibility.  All new code should use the other symbols
+//    to test for features.
+//
+//    All macros listed above as possibly being defined by this file are
+//    explicitly undefined if they are not explicitly defined.
+//    Feature-test macros that are not defined by the user or compiler
+//    but are implied by the other feature-test macros defined (or by the
+//    lack of any definitions) are defined by the file.
+//
+//    ISO C feature test macros depend on the definition of the macro
+//    when an affected header is included, not when the first system
+//    header is included, and so they are handled in
+//    <bits/libc-header-start.h>, which does not have a multiple include
+//    guard.  Feature test macros that can be handled from the first
+//    system header included are handled here.
+
+// Undefine everything, so we get a clean slate.
+
+// Suppress kernel-name space pollution unless user expressedly asks
+//    for it.
+
+// Convenience macro to test the version of gcc.
+//    Use like this:
+//    #if __GNUC_PREREQ (2,8)
+//    ... code requiring gcc 2.8 or later ...
+//    #endif
+//    Note: only works for GCC 2.0 and later, because __GNUC_MINOR__ was
+//    added in 2.0.
+
+// Similarly for clang.  Features added to GCC after version 4.2 may
+//    or may not also be available in clang, and clang's definitions of
+//    __GNUC(_MINOR)__ are fixed at 4 and 2 respectively.  Not all such
+//    features can be queried via __has_extension/__has_feature.
+
+// Whether to use feature set F.
+
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
+//    _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
+//    issue a warning; the expectation is that the source is being
+//    transitioned to use the new macro.
+
+// If _GNU_SOURCE was defined by the user, turn on all the other features.
+
+// If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
+//    define _DEFAULT_SOURCE.
+
+// This is to enable the ISO C2X extension.
+
+// This is to enable the ISO C11 extension.
+
+// This is to enable the ISO C99 extension.
+
+// This is to enable the ISO C90 Amendment 1:1995 extension.
+
+// If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
+//    is defined, use POSIX.1-2008 (or another version depending on
+//    _XOPEN_SOURCE).
+
+// Some C libraries once required _REENTRANT and/or _THREAD_SAFE to be
+//    defined in all multithreaded code.  GNU libc has not required this
+//    for many years.  We now treat them as compatibility synonyms for
+//    _POSIX_C_SOURCE=199506L, which is the earliest level of POSIX with
+//    comprehensive support for multithreaded code.  Using them never
+//    lowers the selected level of POSIX conformance, only raises it.
+
+// The function 'gets' existed in C89, but is impossible to use
+//    safely.  It has been removed from ISO C11 and ISO C++14.  Note: for
+//    compatibility with various implementations of <cstdio>, this test
+//    must consider only the value of __cplusplus when compiling C++.
+
+// GNU formerly extended the scanf functions with modified format
+//    specifiers %as, %aS, and %a[...] that allocate a buffer for the
+//    input using malloc.  This extension conflicts with ISO C99, which
+//    defines %a as a standalone format specifier that reads a floating-
+//    point number; moreover, POSIX.1-2008 provides the same feature
+//    using the modifier letter 'm' instead (%ms, %mS, %m[...]).
+//
+//    We now follow C99 unless GNU extensions are active and the compiler
+//    is specifically in C89 or C++98 mode (strict or not).  For
+//    instance, with GCC, -std=gnu11 will have C99-compliant scanf with
+//    or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
+//    old extension.
+
+// Get definitions of __STDC_* predefined macros, if the compiler has
+//    not preincluded this header automatically.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This macro indicates that the installed library is the GNU C Library.
+//    For historic reasons the value now is 6 and this will stay from now
+//    on.  The use of this variable is deprecated.  Use __GLIBC__ and
+//    __GLIBC_MINOR__ now (see below) when you want to test for a specific
+//    GNU C library version and use the values in <gnu/lib-names.h> to get
+//    the sonames of the shared libraries.
+
+// Major and minor version number of the GNU C library package.  Use
+//    these macros to test for features in specific releases.
+
+// This is here only because every header file already includes this one.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// We are almost always included from features.h.
+
+// The GNU libc does not support any K&R compilers or the traditional mode
+//    of ISO C compilers anymore.  Check for some of the combinations not
+//    anymore supported.
+
+// Some user header file might have defined this before.
+
+// All functions, except those with callbacks or those that
+//    synchronize memory, are leaf functions.
+
+// GCC can always grok prototypes.  For C++ programs we add throw()
+//    to help it optimize the function calls.  But this works only with
+//    gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+//    as non-throwing using a function attribute since programs can use
+//    the -fexceptions options for C code as well.
+
+// Compilers that are not clang may object to
+//        #if defined __clang__ && __has_extension(...)
+//    even though they do not need to evaluate the right-hand side of the &&.
+
+// These two macros are not used in glibc anymore.  They are kept here
+//    only because some other projects expect the macros to be defined.
+
+// For these things, GCC behaves the ANSI way normally,
+//    and the non-ANSI way under -traditional.
+
+// This is not a typedef so `const __ptr_t' does the right thing.
+
+// C++ needs to know that types and declarations are C, not C++.
+
+// Fortify support.
+
+// Support for flexible arrays.
+//    Headers that should use flexible arrays only if they're "real"
+//    (e.g. only if they won't affect sizeof()) should test
+//    #if __glibc_c99_flexarr_available.
+
+// __asm__ ("xyz") is used throughout the headers to rename functions
+//    at the assembly language level.  This is wrapped by the __REDIRECT
+//    macro, in order to support compilers that can do this some other
+//    way.  When compilers don't support asm-names at all, we have to do
+//    preprocessor tricks instead (which don't have exactly the right
+//    semantics, but it's the best we can do).
+//
+//    Example:
+//    int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid);
+
+//
+// #elif __SOME_OTHER_COMPILER__
+//
+// # define __REDIRECT(name, proto, alias) name proto; 	_Pragma("let " #name " = " #alias)
+
+// GCC has various useful declarations that can be made with the
+//    `__attribute__' syntax.  All of the ways we use this do fine if
+//    they are omitted for compilers that don't understand it.
+
+// At some point during the gcc 2.96 development the `malloc' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Tell the compiler which arguments to an allocation function
+//    indicate the size of the allocation.
+
+// At some point during the gcc 2.96 development the `pure' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// This declaration tells the compiler that the value is constant.
+
+// At some point during the gcc 3.1 development the `used' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Since version 3.2, gcc allows marking deprecated functions.
+
+// Since version 4.5, gcc also allows one to specify the message printed
+//    when a deprecated function is used.  clang claims to be gcc 4.2, but
+//    may also support this feature.
+
+// At some point during the gcc 2.8 development the `format_arg' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+//    If several `format_arg' attributes are given for the same function, in
+//    gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+//    all designated arguments are considered.
+
+// At some point during the gcc 2.97 development the `strfmon' format
+//    attribute for functions was introduced.  We don't want to use it
+//    unconditionally (although this would be possible) since it
+//    generates warnings.
+
+// The nonull function attribute allows to mark pointer parameters which
+//    must not be NULL.
+
+// If fortification mode, we warn about unused results of certain
+//    function calls which can lead to problems.
+
+// Forces a function to be always inlined.
+// The Linux kernel defines __always_inline in stddef.h (283d7573), and
+//    it conflicts with this definition.  Therefore undefine it first to
+//    allow either header to be included first.
+
+// Associate error messages with the source location of the call site rather
+//    than with the source location inside the function.
+
+// GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+//    inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
+//    or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+//    older than 4.3 may define these macros and still not guarantee GNU inlining
+//    semantics.
+//
+//    clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+//    semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
+//    __GNUC_GNU_INLINE__ macro definitions.
+
+// GCC 4.3 and above allow passing all anonymous arguments of an
+//    __extern_always_inline function to some other vararg function.
+
+// It is possible to compile containing GCC extensions even if GCC is
+//    run in pedantic mode if the uses are carefully marked using the
+//    `__extension__' keyword.  But this is not generally available before
+//    version 2.8.
+
+// __restrict is known in EGCS 1.2 and above.
+
+// ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+//      array_name[restrict]
+//    GCC 3.1 supports this.
+
+// Describes a char array whose address can safely be passed as the first
+//    argument to strncpy and strncat, as the char array is not necessarily
+//    a NUL-terminated string.
+
+// Undefine (also defined in libc-symbols.h).
+// Copies attributes from the declaration or type referenced by
+//    the argument.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// __glibc_macro_warning (MESSAGE) issues warning MESSAGE.  This is
+//    intended for use in preprocessor macros.
+//
+//    Note: MESSAGE must be a _single_ string; concatenation of string
+//    literals is not supported.
+
+// Generic selection (ISO C11) is a C-only feature, available in GCC
+//    since version 4.9.  Previous versions do not provide generic
+//    selection, even though they might set __STDC_VERSION__ to 201112L,
+//    when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
+//    when testing __STDC_VERSION__ for generic selection support.
+//    On the other hand, Clang also defines __GNUC__, so a clang-specific
+//    check is required to enable the use of generic selection.
+
+// If we don't have __REDIRECT, prototypes will be missing if
+//    __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64].
+
+// Decide whether we can define 'extern inline' functions in headers.
+
+// This is here only because every header file already includes this one.
+//    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
+//    <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+//    that will always return failure (and set errno to ENOSYS).
+// This file is automatically generated.
+//    This file selects the right generated file of `__stub_FUNCTION' macros
+//    based on the architecture being compiled for.
+
+// This file is automatically generated.
+//    It defines a symbol `__stub_FUNCTION' for each function
+//    in the C library which is a stub, meaning it will fail
+//    every time called, usually setting errno to ENOSYS.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Seconds since the Epoch, visible to user code when time_t is too
+//    narrow only for consistency with the old way of widening too-narrow
+//    types.  User code should never use __time64_t.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `time'.
+type Time_t = X__time_t /* time_t.h:7:18 */
+
+// Structure describing file times.
+type Utimbuf = struct {
+	Factime  X__time_t
+	Fmodtime X__time_t
+} /* utime.h:36:1 */
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/uuid/uuid/capi_linux_loong64.go b/vendor/modernc.org/libc/uuid/uuid/capi_linux_loong64.go
new file mode 100644
index 00000000..68331799
--- /dev/null
+++ b/vendor/modernc.org/libc/uuid/uuid/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo uuid/uuid/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o uuid/uuid/uuid_linux_amd64.go -pkgname uuid', DO NOT EDIT.
+
+package uuid
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/uuid/uuid/uuid_linux_loong64.go b/vendor/modernc.org/libc/uuid/uuid/uuid_linux_loong64.go
new file mode 100644
index 00000000..dfd5ff6a
--- /dev/null
+++ b/vendor/modernc.org/libc/uuid/uuid/uuid_linux_loong64.go
@@ -0,0 +1,1986 @@
+// Code generated by 'ccgo uuid/uuid/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o uuid/uuid/uuid_linux_amd64.go -pkgname uuid', DO NOT EDIT.
+
+package uuid
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	BIG_ENDIAN                   = 4321   // endian.h:28:1:
+	BYTE_ORDER                   = 1234   // endian.h:30:1:
+	CLOCK_BOOTTIME               = 7      // time.h:60:1:
+	CLOCK_BOOTTIME_ALARM         = 9      // time.h:64:1:
+	CLOCK_MONOTONIC              = 1      // time.h:48:1:
+	CLOCK_MONOTONIC_COARSE       = 6      // time.h:58:1:
+	CLOCK_MONOTONIC_RAW          = 4      // time.h:54:1:
+	CLOCK_PROCESS_CPUTIME_ID     = 2      // time.h:50:1:
+	CLOCK_REALTIME               = 0      // time.h:46:1:
+	CLOCK_REALTIME_ALARM         = 8      // time.h:62:1:
+	CLOCK_REALTIME_COARSE        = 5      // time.h:56:1:
+	CLOCK_TAI                    = 11     // time.h:66:1:
+	CLOCK_THREAD_CPUTIME_ID      = 3      // time.h:52:1:
+	FD_SETSIZE                   = 1024   // select.h:73:1:
+	LITTLE_ENDIAN                = 1234   // endian.h:27:1:
+	PDP_ENDIAN                   = 3412   // endian.h:29:1:
+	TIMER_ABSTIME                = 1      // time.h:69:1:
+	TIME_UTC                     = 1      // time.h:65:1:
+	UUID_STR_LEN                 = 37     // uuid.h:65:1:
+	UUID_TYPE_DCE_MD5            = 3      // uuid.h:58:1:
+	UUID_TYPE_DCE_RANDOM         = 4      // uuid.h:59:1:
+	UUID_TYPE_DCE_SECURITY       = 2      // uuid.h:57:1:
+	UUID_TYPE_DCE_SHA1           = 5      // uuid.h:60:1:
+	UUID_TYPE_DCE_TIME           = 1      // uuid.h:56:1:
+	UUID_TYPE_MASK               = 0xf    // uuid.h:63:1:
+	UUID_TYPE_SHIFT              = 4      // uuid.h:62:1:
+	UUID_VARIANT_DCE             = 1      // uuid.h:48:1:
+	UUID_VARIANT_MASK            = 0x7    // uuid.h:53:1:
+	UUID_VARIANT_MICROSOFT       = 2      // uuid.h:49:1:
+	UUID_VARIANT_NCS             = 0      // uuid.h:47:1:
+	UUID_VARIANT_OTHER           = 3      // uuid.h:50:1:
+	UUID_VARIANT_SHIFT           = 5      // uuid.h:52:1:
+	X_ATFILE_SOURCE              = 1      // features.h:342:1:
+	X_BITS_BYTESWAP_H            = 1      // byteswap.h:24:1:
+	X_BITS_ENDIANNESS_H          = 1      // endianness.h:2:1:
+	X_BITS_ENDIAN_H              = 1      // endian.h:20:1:
+	X_BITS_PTHREADTYPES_ARCH_H   = 1      // pthreadtypes-arch.h:19:1:
+	X_BITS_PTHREADTYPES_COMMON_H = 1      // pthreadtypes.h:20:1:
+	X_BITS_STDINT_INTN_H         = 1      // stdint-intn.h:20:1:
+	X_BITS_TIME64_H              = 1      // time64.h:24:1:
+	X_BITS_TIME_H                = 1      // time.h:24:1:
+	X_BITS_TYPESIZES_H           = 1      // typesizes.h:24:1:
+	X_BITS_TYPES_H               = 1      // types.h:24:1:
+	X_BITS_TYPES_LOCALE_T_H      = 1      // locale_t.h:20:1:
+	X_BITS_TYPES___LOCALE_T_H    = 1      // __locale_t.h:21:1:
+	X_BITS_UINTN_IDENTITY_H      = 1      // uintn-identity.h:24:1:
+	X_BSD_SIZE_T_                = 0      // stddef.h:189:1:
+	X_BSD_SIZE_T_DEFINED_        = 0      // stddef.h:192:1:
+	X_DEFAULT_SOURCE             = 1      // features.h:227:1:
+	X_ENDIAN_H                   = 1      // endian.h:19:1:
+	X_FEATURES_H                 = 1      // features.h:19:1:
+	X_FILE_OFFSET_BITS           = 64     // <builtin>:25:1:
+	X_GCC_SIZE_T                 = 0      // stddef.h:195:1:
+	X_LP64                       = 1      // <predefined>:284:1:
+	X_POSIX_C_SOURCE             = 200809 // features.h:281:1:
+	X_POSIX_SOURCE               = 1      // features.h:279:1:
+	X_RWLOCK_INTERNAL_H          = 0      // struct_rwlock.h:21:1:
+	X_SIZET_                     = 0      // stddef.h:196:1:
+	X_SIZE_T                     = 0      // stddef.h:183:1:
+	X_SIZE_T_                    = 0      // stddef.h:188:1:
+	X_SIZE_T_DECLARED            = 0      // stddef.h:193:1:
+	X_SIZE_T_DEFINED             = 0      // stddef.h:191:1:
+	X_SIZE_T_DEFINED_            = 0      // stddef.h:190:1:
+	X_STDC_PREDEF_H              = 1      // <predefined>:162:1:
+	X_STRUCT_TIMESPEC            = 1      // struct_timespec.h:3:1:
+	X_SYS_CDEFS_H                = 1      // cdefs.h:19:1:
+	X_SYS_SELECT_H               = 1      // select.h:22:1:
+	X_SYS_SIZE_T_H               = 0      // stddef.h:184:1:
+	X_SYS_TIME_H                 = 1      // time.h:19:1:
+	X_SYS_TYPES_H                = 1      // types.h:23:1:
+	X_THREAD_MUTEX_INTERNAL_H    = 1      // struct_mutex.h:20:1:
+	X_THREAD_SHARED_TYPES_H      = 1      // thread-shared-types.h:20:1:
+	X_TIME_H                     = 1      // time.h:23:1:
+	X_T_SIZE                     = 0      // stddef.h:186:1:
+	X_T_SIZE_                    = 0      // stddef.h:185:1:
+	X_UUID_UUID_H                = 0      // uuid.h:36:1:
+	Linux                        = 1      // <predefined>:231:1:
+	Unix                         = 1      // <predefined>:177:1:
+)
+
+// Values for the first argument to `getitimer' and `setitimer'.
+const ( /* time.h:89:1: */
+	// Timers run in real time.
+	ITIMER_REAL = 0
+	// Timers run only when the process is executing.
+	ITIMER_VIRTUAL = 1
+	// Timers run when the process is executing and when
+	//        the system is executing on behalf of the process.
+	ITIMER_PROF = 2
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Public include file for the UUID library
+//
+// Copyright (C) 1996, 1997, 1998 Theodore Ts'o.
+//
+// %Begin-Header%
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, and the entire permission notice in its entirety,
+//    including the disclaimer of warranties.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+// 3. The name of the author may not be used to endorse or promote
+//    products derived from this software without specific prior
+//    written permission.
+//
+// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+// WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+// OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+// BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+// USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+// DAMAGE.
+// %End-Header%
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX Standard: 2.6 Primitive System Data Types	<sys/types.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// These are defined by the user (or the compiler)
+//    to specify the desired environment:
+//
+//    __STRICT_ANSI__	ISO Standard C.
+//    _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
+//    _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
+//    _ISOC2X_SOURCE	Extensions to ISO C99 from ISO C2X.
+//    __STDC_WANT_LIB_EXT2__
+// 			Extensions to ISO C99 from TR 27431-2:2010.
+//    __STDC_WANT_IEC_60559_BFP_EXT__
+// 			Extensions to ISO C11 from TS 18661-1:2014.
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__
+// 			Extensions to ISO C11 from TS 18661-4:2015.
+//    __STDC_WANT_IEC_60559_TYPES_EXT__
+// 			Extensions to ISO C11 from TS 18661-3:2015.
+//
+//    _POSIX_SOURCE	IEEE Std 1003.1.
+//    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
+// 			if >=199309L, add IEEE Std 1003.1b-1993;
+// 			if >=199506L, add IEEE Std 1003.1c-1995;
+// 			if >=200112L, all of IEEE 1003.1-2004
+// 			if >=200809L, all of IEEE 1003.1-2008
+//    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
+// 			Single Unix conformance is wanted, to 600 for the
+// 			sixth revision, to 700 for the seventh revision.
+//    _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
+//    _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
+//    _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
+//    _FILE_OFFSET_BITS=N	Select default filesystem interface.
+//    _ATFILE_SOURCE	Additional *at interfaces.
+//    _GNU_SOURCE		All of the above, plus GNU extensions.
+//    _DEFAULT_SOURCE	The default set of features (taking precedence over
+// 			__STRICT_ANSI__).
+//
+//    _FORTIFY_SOURCE	Add security hardening to many library functions.
+// 			Set to 1 or 2; 2 performs stricter checks than 1.
+//
+//    _REENTRANT, _THREAD_SAFE
+// 			Obsolete; equivalent to _POSIX_C_SOURCE=199506L.
+//
+//    The `-ansi' switch to the GNU C compiler, and standards conformance
+//    options such as `-std=c99', define __STRICT_ANSI__.  If none of
+//    these are defined, or if _DEFAULT_SOURCE is defined, the default is
+//    to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
+//    200809L, as well as enabling miscellaneous functions from BSD and
+//    SVID.  If more than one of these are defined, they accumulate.  For
+//    example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
+//    give you ISO C, 1003.1, and 1003.2, but nothing else.
+//
+//    These are defined by this file and are used by the
+//    header files to decide what to declare or define:
+//
+//    __GLIBC_USE (F)	Define things from feature set F.  This is defined
+// 			to 1 or 0; the subsequent macros are either defined
+// 			or undefined, and those tests should be moved to
+// 			__GLIBC_USE.
+//    __USE_ISOC11		Define ISO C11 things.
+//    __USE_ISOC99		Define ISO C99 things.
+//    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+//    __USE_ISOCXX11	Define ISO C++11 things.
+//    __USE_POSIX		Define IEEE Std 1003.1 things.
+//    __USE_POSIX2		Define IEEE Std 1003.2 things.
+//    __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
+//    __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
+//    __USE_XOPEN		Define XPG things.
+//    __USE_XOPEN_EXTENDED	Define X/Open Unix things.
+//    __USE_UNIX98		Define Single Unix V2 things.
+//    __USE_XOPEN2K        Define XPG6 things.
+//    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+//    __USE_XOPEN2K8       Define XPG7 things.
+//    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
+//    __USE_LARGEFILE	Define correct standard I/O things.
+//    __USE_LARGEFILE64	Define LFS things with separate names.
+//    __USE_FILE_OFFSET64	Define 64bit interface as default.
+//    __USE_MISC		Define things from 4.3BSD or System V Unix.
+//    __USE_ATFILE		Define *at interfaces and AT_* constants for them.
+//    __USE_GNU		Define GNU extensions.
+//    __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
+//
+//    The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
+//    defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
+//    only for compatibility.  All new code should use the other symbols
+//    to test for features.
+//
+//    All macros listed above as possibly being defined by this file are
+//    explicitly undefined if they are not explicitly defined.
+//    Feature-test macros that are not defined by the user or compiler
+//    but are implied by the other feature-test macros defined (or by the
+//    lack of any definitions) are defined by the file.
+//
+//    ISO C feature test macros depend on the definition of the macro
+//    when an affected header is included, not when the first system
+//    header is included, and so they are handled in
+//    <bits/libc-header-start.h>, which does not have a multiple include
+//    guard.  Feature test macros that can be handled from the first
+//    system header included are handled here.
+
+// Undefine everything, so we get a clean slate.
+
+// Suppress kernel-name space pollution unless user expressedly asks
+//    for it.
+
+// Convenience macro to test the version of gcc.
+//    Use like this:
+//    #if __GNUC_PREREQ (2,8)
+//    ... code requiring gcc 2.8 or later ...
+//    #endif
+//    Note: only works for GCC 2.0 and later, because __GNUC_MINOR__ was
+//    added in 2.0.
+
+// Similarly for clang.  Features added to GCC after version 4.2 may
+//    or may not also be available in clang, and clang's definitions of
+//    __GNUC(_MINOR)__ are fixed at 4 and 2 respectively.  Not all such
+//    features can be queried via __has_extension/__has_feature.
+
+// Whether to use feature set F.
+
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
+//    _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
+//    issue a warning; the expectation is that the source is being
+//    transitioned to use the new macro.
+
+// If _GNU_SOURCE was defined by the user, turn on all the other features.
+
+// If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
+//    define _DEFAULT_SOURCE.
+
+// This is to enable the ISO C2X extension.
+
+// This is to enable the ISO C11 extension.
+
+// This is to enable the ISO C99 extension.
+
+// This is to enable the ISO C90 Amendment 1:1995 extension.
+
+// If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
+//    is defined, use POSIX.1-2008 (or another version depending on
+//    _XOPEN_SOURCE).
+
+// Some C libraries once required _REENTRANT and/or _THREAD_SAFE to be
+//    defined in all multithreaded code.  GNU libc has not required this
+//    for many years.  We now treat them as compatibility synonyms for
+//    _POSIX_C_SOURCE=199506L, which is the earliest level of POSIX with
+//    comprehensive support for multithreaded code.  Using them never
+//    lowers the selected level of POSIX conformance, only raises it.
+
+// The function 'gets' existed in C89, but is impossible to use
+//    safely.  It has been removed from ISO C11 and ISO C++14.  Note: for
+//    compatibility with various implementations of <cstdio>, this test
+//    must consider only the value of __cplusplus when compiling C++.
+
+// GNU formerly extended the scanf functions with modified format
+//    specifiers %as, %aS, and %a[...] that allocate a buffer for the
+//    input using malloc.  This extension conflicts with ISO C99, which
+//    defines %a as a standalone format specifier that reads a floating-
+//    point number; moreover, POSIX.1-2008 provides the same feature
+//    using the modifier letter 'm' instead (%ms, %mS, %m[...]).
+//
+//    We now follow C99 unless GNU extensions are active and the compiler
+//    is specifically in C89 or C++98 mode (strict or not).  For
+//    instance, with GCC, -std=gnu11 will have C99-compliant scanf with
+//    or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
+//    old extension.
+
+// Get definitions of __STDC_* predefined macros, if the compiler has
+//    not preincluded this header automatically.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This macro indicates that the installed library is the GNU C Library.
+//    For historic reasons the value now is 6 and this will stay from now
+//    on.  The use of this variable is deprecated.  Use __GLIBC__ and
+//    __GLIBC_MINOR__ now (see below) when you want to test for a specific
+//    GNU C library version and use the values in <gnu/lib-names.h> to get
+//    the sonames of the shared libraries.
+
+// Major and minor version number of the GNU C library package.  Use
+//    these macros to test for features in specific releases.
+
+// This is here only because every header file already includes this one.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// We are almost always included from features.h.
+
+// The GNU libc does not support any K&R compilers or the traditional mode
+//    of ISO C compilers anymore.  Check for some of the combinations not
+//    anymore supported.
+
+// Some user header file might have defined this before.
+
+// All functions, except those with callbacks or those that
+//    synchronize memory, are leaf functions.
+
+// GCC can always grok prototypes.  For C++ programs we add throw()
+//    to help it optimize the function calls.  But this works only with
+//    gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+//    as non-throwing using a function attribute since programs can use
+//    the -fexceptions options for C code as well.
+
+// Compilers that are not clang may object to
+//        #if defined __clang__ && __has_extension(...)
+//    even though they do not need to evaluate the right-hand side of the &&.
+
+// These two macros are not used in glibc anymore.  They are kept here
+//    only because some other projects expect the macros to be defined.
+
+// For these things, GCC behaves the ANSI way normally,
+//    and the non-ANSI way under -traditional.
+
+// This is not a typedef so `const __ptr_t' does the right thing.
+
+// C++ needs to know that types and declarations are C, not C++.
+
+// Fortify support.
+
+// Support for flexible arrays.
+//    Headers that should use flexible arrays only if they're "real"
+//    (e.g. only if they won't affect sizeof()) should test
+//    #if __glibc_c99_flexarr_available.
+
+// __asm__ ("xyz") is used throughout the headers to rename functions
+//    at the assembly language level.  This is wrapped by the __REDIRECT
+//    macro, in order to support compilers that can do this some other
+//    way.  When compilers don't support asm-names at all, we have to do
+//    preprocessor tricks instead (which don't have exactly the right
+//    semantics, but it's the best we can do).
+//
+//    Example:
+//    int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid);
+
+//
+// #elif __SOME_OTHER_COMPILER__
+//
+// # define __REDIRECT(name, proto, alias) name proto; 	_Pragma("let " #name " = " #alias)
+
+// GCC has various useful declarations that can be made with the
+//    `__attribute__' syntax.  All of the ways we use this do fine if
+//    they are omitted for compilers that don't understand it.
+
+// At some point during the gcc 2.96 development the `malloc' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Tell the compiler which arguments to an allocation function
+//    indicate the size of the allocation.
+
+// At some point during the gcc 2.96 development the `pure' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// This declaration tells the compiler that the value is constant.
+
+// At some point during the gcc 3.1 development the `used' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Since version 3.2, gcc allows marking deprecated functions.
+
+// Since version 4.5, gcc also allows one to specify the message printed
+//    when a deprecated function is used.  clang claims to be gcc 4.2, but
+//    may also support this feature.
+
+// At some point during the gcc 2.8 development the `format_arg' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+//    If several `format_arg' attributes are given for the same function, in
+//    gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+//    all designated arguments are considered.
+
+// At some point during the gcc 2.97 development the `strfmon' format
+//    attribute for functions was introduced.  We don't want to use it
+//    unconditionally (although this would be possible) since it
+//    generates warnings.
+
+// The nonull function attribute allows to mark pointer parameters which
+//    must not be NULL.
+
+// If fortification mode, we warn about unused results of certain
+//    function calls which can lead to problems.
+
+// Forces a function to be always inlined.
+// The Linux kernel defines __always_inline in stddef.h (283d7573), and
+//    it conflicts with this definition.  Therefore undefine it first to
+//    allow either header to be included first.
+
+// Associate error messages with the source location of the call site rather
+//    than with the source location inside the function.
+
+// GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+//    inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
+//    or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+//    older than 4.3 may define these macros and still not guarantee GNU inlining
+//    semantics.
+//
+//    clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+//    semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
+//    __GNUC_GNU_INLINE__ macro definitions.
+
+// GCC 4.3 and above allow passing all anonymous arguments of an
+//    __extern_always_inline function to some other vararg function.
+
+// It is possible to compile containing GCC extensions even if GCC is
+//    run in pedantic mode if the uses are carefully marked using the
+//    `__extension__' keyword.  But this is not generally available before
+//    version 2.8.
+
+// __restrict is known in EGCS 1.2 and above.
+
+// ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+//      array_name[restrict]
+//    GCC 3.1 supports this.
+
+// Describes a char array whose address can safely be passed as the first
+//    argument to strncpy and strncat, as the char array is not necessarily
+//    a NUL-terminated string.
+
+// Undefine (also defined in libc-symbols.h).
+// Copies attributes from the declaration or type referenced by
+//    the argument.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// __glibc_macro_warning (MESSAGE) issues warning MESSAGE.  This is
+//    intended for use in preprocessor macros.
+//
+//    Note: MESSAGE must be a _single_ string; concatenation of string
+//    literals is not supported.
+
+// Generic selection (ISO C11) is a C-only feature, available in GCC
+//    since version 4.9.  Previous versions do not provide generic
+//    selection, even though they might set __STDC_VERSION__ to 201112L,
+//    when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
+//    when testing __STDC_VERSION__ for generic selection support.
+//    On the other hand, Clang also defines __GNUC__, so a clang-specific
+//    check is required to enable the use of generic selection.
+
+// If we don't have __REDIRECT, prototypes will be missing if
+//    __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64].
+
+// Decide whether we can define 'extern inline' functions in headers.
+
+// This is here only because every header file already includes this one.
+//    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
+//    <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+//    that will always return failure (and set errno to ENOSYS).
+// This file is automatically generated.
+//    This file selects the right generated file of `__stub_FUNCTION' macros
+//    based on the architecture being compiled for.
+
+// This file is automatically generated.
+//    It defines a symbol `__stub_FUNCTION' for each function
+//    in the C library which is a stub, meaning it will fail
+//    every time called, usually setting errno to ENOSYS.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Seconds since the Epoch, visible to user code when time_t is too
+//    narrow only for consistency with the old way of widening too-narrow
+//    types.  User code should never use __time64_t.
+
+type U_char = X__u_char     /* types.h:33:18 */
+type U_short = X__u_short   /* types.h:34:19 */
+type U_int = X__u_int       /* types.h:35:17 */
+type U_long = X__u_long     /* types.h:36:18 */
+type Quad_t = X__quad_t     /* types.h:37:18 */
+type U_quad_t = X__u_quad_t /* types.h:38:20 */
+type Fsid_t = X__fsid_t     /* types.h:39:18 */
+type Loff_t = X__loff_t     /* types.h:42:18 */
+
+type Ino_t = X__ino64_t /* types.h:49:19 */
+
+type Dev_t = X__dev_t /* types.h:59:17 */
+
+type Gid_t = X__gid_t /* types.h:64:17 */
+
+type Mode_t = X__mode_t /* types.h:69:18 */
+
+type Nlink_t = X__nlink_t /* types.h:74:19 */
+
+type Uid_t = X__uid_t /* types.h:79:17 */
+
+type Off_t = X__off64_t /* types.h:87:19 */
+
+type Pid_t = X__pid_t /* types.h:97:17 */
+
+type Id_t = X__id_t /* types.h:103:16 */
+
+type Ssize_t = X__ssize_t /* types.h:108:19 */
+
+type Daddr_t = X__daddr_t /* types.h:114:19 */
+type Caddr_t = X__caddr_t /* types.h:115:19 */
+
+type Key_t = X__key_t /* types.h:121:17 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `clock'.
+type Clock_t = X__clock_t /* clock_t.h:7:19 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Clock ID used in clock and timer functions.
+type Clockid_t = X__clockid_t /* clockid_t.h:7:21 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Returned by `time'.
+type Time_t = X__time_t /* time_t.h:7:18 */
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Timer ID returned by `timer_create'.
+type Timer_t = X__timer_t /* timer_t.h:7:19 */
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// Old compatibility names for C types.
+type Ulong = uint64  /* types.h:148:27 */
+type Ushort = uint16 /* types.h:149:28 */
+type Uint = uint32   /* types.h:150:22 */
+
+// These size-specific names are used by some of the inet code.
+
+// Define intN_t types.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+type Int8_t = X__int8_t   /* stdint-intn.h:24:18 */
+type Int16_t = X__int16_t /* stdint-intn.h:25:19 */
+type Int32_t = X__int32_t /* stdint-intn.h:26:19 */
+type Int64_t = X__int64_t /* stdint-intn.h:27:19 */
+
+// These were defined by ISO C without the first `_'.
+type U_int8_t = X__uint8_t   /* types.h:158:19 */
+type U_int16_t = X__uint16_t /* types.h:159:20 */
+type U_int32_t = X__uint32_t /* types.h:160:20 */
+type U_int64_t = X__uint64_t /* types.h:161:20 */
+
+type Register_t = int32 /* types.h:164:13 */
+
+// It also defines `fd_set' and the FD_* macros for `select'.
+// `fd_set' type and related macros, and `select'/`pselect' declarations.
+//    Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX 1003.1g: 6.2 Select from File Descriptor Sets <sys/select.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Get definition of needed basic types.
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Get __FD_* definitions.
+// Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Get sigset_t.
+
+type X__sigset_t = struct{ F__val [16]uint64 } /* __sigset_t.h:8:3 */
+
+// A set of signals to be blocked, unblocked, or waited for.
+type Sigset_t = X__sigset_t /* sigset_t.h:7:20 */
+
+// Get definition of timer specification structures.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// A time value that is accurate to the nearest
+//
+//	microsecond but also has a range of years.
+type Timeval = struct {
+	Ftv_sec  X__time_t
+	Ftv_usec X__suseconds_t
+} /* struct_timeval.h:8:1 */
+
+// NB: Include guard matches what <linux/time.h> uses.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Endian macros for string.h functions
+//    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+// POSIX.1b structure for a time value.  This is like a `struct timeval' but
+//
+//	has nanoseconds instead of microseconds.
+type Timespec = struct {
+	Ftv_sec  X__time_t
+	Ftv_nsec X__syscall_slong_t
+} /* struct_timespec.h:10:1 */
+
+type Suseconds_t = X__suseconds_t /* select.h:43:23 */
+
+// The fd_set member is required to be an array of longs.
+type X__fd_mask = int64 /* select.h:49:18 */
+
+// Some versions of <linux/posix_types.h> define this macros.
+// It's easier to assume 8-bit bytes than to get CHAR_BIT.
+
+// fd_set for select and pselect.
+type Fd_set = struct{ F__fds_bits [16]X__fd_mask } /* select.h:70:5 */
+
+// Maximum number of file descriptors in `fd_set'.
+
+// Sometimes the fd_set member is assumed to have this type.
+type Fd_mask = X__fd_mask /* select.h:77:19 */
+
+// Define some inlines helping to catch common problems.
+
+type Blksize_t = X__blksize_t /* types.h:185:21 */
+
+// Types from the Large File Support interface.
+type Blkcnt_t = X__blkcnt64_t     /* types.h:205:22 */ // Type to count number of disk blocks.
+type Fsblkcnt_t = X__fsblkcnt64_t /* types.h:209:24 */ // Type to count file system blocks.
+type Fsfilcnt_t = X__fsfilcnt64_t /* types.h:213:24 */ // Type to count file system inodes.
+
+// Now add the thread types.
+// Declaration of common pthread types for all architectures.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For internal mutex and condition variable definitions.
+// Common threading primitives definitions for both POSIX and C11.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Arch-specific definitions.  Each architecture must define the following
+//    macros to define the expected sizes of pthread data types:
+//
+//    __SIZEOF_PTHREAD_ATTR_T        - size of pthread_attr_t.
+//    __SIZEOF_PTHREAD_MUTEX_T       - size of pthread_mutex_t.
+//    __SIZEOF_PTHREAD_MUTEXATTR_T   - size of pthread_mutexattr_t.
+//    __SIZEOF_PTHREAD_COND_T        - size of pthread_cond_t.
+//    __SIZEOF_PTHREAD_CONDATTR_T    - size of pthread_condattr_t.
+//    __SIZEOF_PTHREAD_RWLOCK_T      - size of pthread_rwlock_t.
+//    __SIZEOF_PTHREAD_RWLOCKATTR_T  - size of pthread_rwlockattr_t.
+//    __SIZEOF_PTHREAD_BARRIER_T     - size of pthread_barrier_t.
+//    __SIZEOF_PTHREAD_BARRIERATTR_T - size of pthread_barrierattr_t.
+//
+//    The additional macro defines any constraint for the lock alignment
+//    inside the thread structures:
+//
+//    __LOCK_ALIGNMENT - for internal lock/futex usage.
+//
+//    Same idea but for the once locking primitive:
+//
+//    __ONCE_ALIGNMENT - for pthread_once_t/once_flag definition.
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Common definition of pthread_mutex_t.
+
+type X__pthread_internal_list = struct {
+	F__prev uintptr
+	F__next uintptr
+} /* thread-shared-types.h:49:9 */
+
+// Type to count file system inodes.
+
+// Now add the thread types.
+// Declaration of common pthread types for all architectures.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For internal mutex and condition variable definitions.
+// Common threading primitives definitions for both POSIX and C11.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Arch-specific definitions.  Each architecture must define the following
+//    macros to define the expected sizes of pthread data types:
+//
+//    __SIZEOF_PTHREAD_ATTR_T        - size of pthread_attr_t.
+//    __SIZEOF_PTHREAD_MUTEX_T       - size of pthread_mutex_t.
+//    __SIZEOF_PTHREAD_MUTEXATTR_T   - size of pthread_mutexattr_t.
+//    __SIZEOF_PTHREAD_COND_T        - size of pthread_cond_t.
+//    __SIZEOF_PTHREAD_CONDATTR_T    - size of pthread_condattr_t.
+//    __SIZEOF_PTHREAD_RWLOCK_T      - size of pthread_rwlock_t.
+//    __SIZEOF_PTHREAD_RWLOCKATTR_T  - size of pthread_rwlockattr_t.
+//    __SIZEOF_PTHREAD_BARRIER_T     - size of pthread_barrier_t.
+//    __SIZEOF_PTHREAD_BARRIERATTR_T - size of pthread_barrierattr_t.
+//
+//    The additional macro defines any constraint for the lock alignment
+//    inside the thread structures:
+//
+//    __LOCK_ALIGNMENT - for internal lock/futex usage.
+//
+//    Same idea but for the once locking primitive:
+//
+//    __ONCE_ALIGNMENT - for pthread_once_t/once_flag definition.
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+
+// Common definition of pthread_mutex_t.
+
+type X__pthread_list_t = X__pthread_internal_list /* thread-shared-types.h:53:3 */
+
+type X__pthread_internal_slist = struct{ F__next uintptr } /* thread-shared-types.h:55:9 */
+
+type X__pthread_slist_t = X__pthread_internal_slist /* thread-shared-types.h:58:3 */
+
+// Arch-specific mutex definitions.  A generic implementation is provided
+//    by sysdeps/nptl/bits/struct_mutex.h.  If required, an architecture
+//    can override it by defining:
+//
+//    1. struct __pthread_mutex_s (used on both pthread_mutex_t and mtx_t
+//       definition).  It should contains at least the internal members
+//       defined in the generic version.
+//
+//    2. __LOCK_ALIGNMENT for any extra attribute for internal lock used with
+//       atomic operations.
+//
+//    3. The macro __PTHREAD_MUTEX_INITIALIZER used for static initialization.
+//       It should initialize the mutex internal flag.
+
+// x86 internal mutex struct definitions.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+type X__pthread_mutex_s = struct {
+	F__lock    int32
+	F__count   uint32
+	F__owner   int32
+	F__nusers  uint32
+	F__kind    int32
+	F__spins   int16
+	F__elision int16
+	F__list    X__pthread_list_t
+} /* struct_mutex.h:22:1 */
+
+// Arch-sepecific read-write lock definitions.  A generic implementation is
+//    provided by struct_rwlock.h.  If required, an architecture can override it
+//    by defining:
+//
+//    1. struct __pthread_rwlock_arch_t (used on pthread_rwlock_t definition).
+//       It should contain at least the internal members defined in the
+//       generic version.
+//
+//    2. The macro __PTHREAD_RWLOCK_INITIALIZER used for static initialization.
+//       It should initialize the rwlock internal type.
+
+// x86 internal rwlock struct definitions.
+//    Copyright (C) 2019-2020 Free Software Foundation, Inc.
+//
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+type X__pthread_rwlock_arch_t = struct {
+	F__readers       uint32
+	F__writers       uint32
+	F__wrphase_futex uint32
+	F__writers_futex uint32
+	F__pad3          uint32
+	F__pad4          uint32
+	F__cur_writer    int32
+	F__shared        int32
+	F__rwelision     int8
+	F__pad1          [7]uint8
+	F__pad2          uint64
+	F__flags         uint32
+	F__ccgo_pad1     [4]byte
+} /* struct_rwlock.h:23:1 */
+
+// Common definition of pthread_cond_t.
+
+type X__pthread_cond_s = struct {
+	F__0            struct{ F__wseq uint64 }
+	F__8            struct{ F__g1_start uint64 }
+	F__g_refs       [2]uint32
+	F__g_size       [2]uint32
+	F__g1_orig_size uint32
+	F__wrefs        uint32
+	F__g_signals    [2]uint32
+} /* thread-shared-types.h:92:1 */
+
+// Thread identifiers.  The structure of the attribute type is not
+//
+//	exposed on purpose.
+type Pthread_t = uint64 /* pthreadtypes.h:27:27 */
+
+// Data structures for mutex handling.  The structure of the attribute
+//
+//	type is not exposed on purpose.
+type Pthread_mutexattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:36:3 */
+
+// Data structure for condition variable handling.  The structure of
+//
+//	the attribute type is not exposed on purpose.
+type Pthread_condattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:45:3 */
+
+// Keys for thread-specific data
+type Pthread_key_t = uint32 /* pthreadtypes.h:49:22 */
+
+// Once-only execution
+type Pthread_once_t = int32 /* pthreadtypes.h:53:30 */
+
+type Pthread_attr_t1 = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [56]int8
+} /* pthreadtypes.h:56:1 */
+
+type Pthread_attr_t = Pthread_attr_t1 /* pthreadtypes.h:62:30 */
+
+type Pthread_mutex_t = struct{ F__data X__pthread_mutex_s } /* pthreadtypes.h:72:3 */
+
+type Pthread_cond_t = struct{ F__data X__pthread_cond_s } /* pthreadtypes.h:80:3 */
+
+// Data structure for reader-writer lock variable handling.  The
+//
+//	structure of the attribute type is deliberately not exposed.
+type Pthread_rwlock_t = struct{ F__data X__pthread_rwlock_arch_t } /* pthreadtypes.h:91:3 */
+
+type Pthread_rwlockattr_t = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [8]int8
+} /* pthreadtypes.h:97:3 */
+
+// POSIX spinlock data type.
+type Pthread_spinlock_t = int32 /* pthreadtypes.h:103:22 */
+
+// POSIX barriers data type.  The structure of the type is
+//
+//	deliberately not exposed.
+type Pthread_barrier_t = struct {
+	F__ccgo_pad1 [0]uint64
+	F__size      [32]int8
+} /* pthreadtypes.h:112:3 */
+
+type Pthread_barrierattr_t = struct {
+	F__ccgo_pad1 [0]uint32
+	F__size      [4]int8
+} /* pthreadtypes.h:118:3 */
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// `fd_set' type and related macros, and `select'/`pselect' declarations.
+//    Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	POSIX 1003.1g: 6.2 Select from File Descriptor Sets <sys/select.h>
+
+// Structure crudely representing a timezone.
+//
+//	This is obsolete and should never be used.
+type Timezone = struct {
+	Ftz_minuteswest int32
+	Ftz_dsttime     int32
+} /* time.h:52:1 */
+
+// Type of the second argument to `getitimer' and
+//
+//	the second and third arguments `setitimer'.
+type Itimerval = struct {
+	Fit_interval struct {
+		Ftv_sec  X__time_t
+		Ftv_usec X__suseconds_t
+	}
+	Fit_value struct {
+		Ftv_sec  X__time_t
+		Ftv_usec X__suseconds_t
+	}
+} /* time.h:105:1 */
+
+type X__itimer_which_t = int32 /* time.h:118:13 */
+
+// Convenience macros for operations on timevals.
+//    NOTE: `timercmp' does not work for >= or <=.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	ISO C99 Standard: 7.23 Date and time	<time.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
+//
+// This file is part of GCC.
+//
+// GCC is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// GCC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+//
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+// ISO C Standard:  7.17  Common definitions  <stddef.h>
+
+// Any one of these symbols __need_* means that GNU libc
+//    wants us just to define one data type.  So don't define
+//    the symbols that indicate this file's entire job has been done.
+
+// This avoids lossage on SunOS but only if stdtypes.h comes first.
+//    There's no way to win with the other order!  Sun lossage.
+
+// Sequent's header files use _PTRDIFF_T_ in some conflicting way.
+//    Just ignore it.
+
+// On VxWorks, <type/vxTypesBase.h> may have defined macros like
+//    _TYPE_size_t which will typedef size_t.  fixincludes patched the
+//    vxTypesBase.h so that this macro is only defined if _GCC_SIZE_T is
+//    not defined, and so that defining this macro defines _GCC_SIZE_T.
+//    If we find that the macros are still defined at this point, we must
+//    invoke them so that the type is defined as expected.
+
+// In case nobody has defined these types, but we aren't running under
+//    GCC 2.00, make sure that __PTRDIFF_TYPE__, __SIZE_TYPE__, and
+//    __WCHAR_TYPE__ have reasonable values.  This can happen if the
+//    parts of GCC is compiled by an older compiler, that actually
+//    include gstddef.h, such as collect2.
+
+// Signed type of difference of two pointers.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Unsigned type of `sizeof' something.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// Wide character type.
+//    Locale-writers should change this as necessary to
+//    be big enough to hold unique values not between 0 and 127,
+//    and not (wchar_t) -1, for each defined multibyte character.
+
+// Define this type if we are doing the whole job,
+//    or if we want this type in particular.
+
+// A null pointer constant.
+
+// This defines CLOCKS_PER_SEC, which is the number of processor clock
+//    ticks per second, and possibly a number of other constants.
+// System-dependent timing definitions.  Linux version.
+//    Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <time.h> instead.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// ISO/IEC 9899:1999 7.23.1: Components of time
+//    The macro `CLOCKS_PER_SEC' is an expression with type `clock_t' that is
+//    the number per second of the value returned by the `clock' function.
+// CAE XSH, Issue 4, Version 2: <time.h>
+//    The value of CLOCKS_PER_SEC is required to be 1 million on all
+//    XSI-conformant systems.
+
+// Identifier for system-wide realtime clock.
+// Monotonic system-wide clock.
+// High-resolution timer from the CPU.
+// Thread-specific CPU-time clock.
+// Monotonic system-wide clock, not adjusted for frequency scaling.
+// Identifier for system-wide realtime clock, updated only on ticks.
+// Monotonic system-wide clock, updated only on ticks.
+// Monotonic system-wide clock that includes time spent in suspension.
+// Like CLOCK_REALTIME but also wakes suspended system.
+// Like CLOCK_BOOTTIME but also wakes suspended system.
+// Like CLOCK_REALTIME but in International Atomic Time.
+
+// Flag to indicate time is absolute.
+
+// Many of the typedefs and structs whose official home is this header
+//    may also need to be defined by other headers.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// ISO C `broken-down time' structure.
+type Tm = struct {
+	Ftm_sec      int32
+	Ftm_min      int32
+	Ftm_hour     int32
+	Ftm_mday     int32
+	Ftm_mon      int32
+	Ftm_year     int32
+	Ftm_wday     int32
+	Ftm_yday     int32
+	Ftm_isdst    int32
+	F__ccgo_pad1 [4]byte
+	Ftm_gmtoff   int64
+	Ftm_zone     uintptr
+} /* struct_tm.h:7:1 */
+
+// NB: Include guard matches what <linux/time.h> uses.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// NB: Include guard matches what <linux/time.h> uses.
+
+// POSIX.1b structure for timer start values and intervals.
+type Itimerspec = struct {
+	Fit_interval struct {
+		Ftv_sec  X__time_t
+		Ftv_nsec X__syscall_slong_t
+	}
+	Fit_value struct {
+		Ftv_sec  X__time_t
+		Ftv_nsec X__syscall_slong_t
+	}
+} /* struct_itimerspec.h:8:1 */
+
+// Definition of locale_t.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Definition of struct __locale_struct and __locale_t.
+//    Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// POSIX.1-2008: the locale_t type, representing a locale context
+//    (implementation-namespace version).  This type should be treated
+//    as opaque by applications; some details are exposed for the sake of
+//    efficiency in e.g. ctype functions.
+
+type X__locale_struct = struct {
+	F__locales       [13]uintptr
+	F__ctype_b       uintptr
+	F__ctype_tolower uintptr
+	F__ctype_toupper uintptr
+	F__names         [13]uintptr
+} /* __locale_t.h:28:1 */
+
+type X__locale_t = uintptr /* __locale_t.h:42:32 */
+
+type Locale_t = X__locale_t /* locale_t.h:24:20 */
+
+type Uuid_t = [16]uint8 /* uuid.h:44:23 */
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/libc/wctype/capi_linux_loong64.go b/vendor/modernc.org/libc/wctype/capi_linux_loong64.go
new file mode 100644
index 00000000..e1138ccd
--- /dev/null
+++ b/vendor/modernc.org/libc/wctype/capi_linux_loong64.go
@@ -0,0 +1,5 @@
+// Code generated by 'ccgo wctype/gen.c -crt-import-path  -export-defines  -export-enums  -export-externs X -export-fields F -export-structs  -export-typedefs  -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o wctype/wctype_linux_amd64.go -pkgname wctype', DO NOT EDIT.
+
+package wctype
+
+var CAPI = map[string]struct{}{}
diff --git a/vendor/modernc.org/libc/wctype/wctype_linux_loong64.go b/vendor/modernc.org/libc/wctype/wctype_linux_loong64.go
new file mode 100644
index 00000000..a36ea7c5
--- /dev/null
+++ b/vendor/modernc.org/libc/wctype/wctype_linux_loong64.go
@@ -0,0 +1,953 @@
+// Code generated by 'ccgo wctype/gen.c -crt-import-path "" -export-defines "" -export-enums "" -export-externs X -export-fields F -export-structs "" -export-typedefs "" -header -hide _OSSwapInt16,_OSSwapInt32,_OSSwapInt64 -ignore-unsupported-alignment -o wctype/wctype_linux_amd64.go -pkgname wctype', DO NOT EDIT.
+
+package wctype
+
+import (
+	"math"
+	"reflect"
+	"sync/atomic"
+	"unsafe"
+)
+
+var _ = math.Pi
+var _ reflect.Kind
+var _ atomic.Value
+var _ unsafe.Pointer
+
+const (
+	WEOF                      = 4294967295 // wctype.h:33:1:
+	X_ATFILE_SOURCE           = 1          // features.h:342:1:
+	X_BITS_ENDIANNESS_H       = 1          // endianness.h:2:1:
+	X_BITS_ENDIAN_H           = 1          // endian.h:20:1:
+	X_BITS_TIME64_H           = 1          // time64.h:24:1:
+	X_BITS_TYPESIZES_H        = 1          // typesizes.h:24:1:
+	X_BITS_TYPES_H            = 1          // types.h:24:1:
+	X_BITS_TYPES_LOCALE_T_H   = 1          // locale_t.h:20:1:
+	X_BITS_TYPES___LOCALE_T_H = 1          // __locale_t.h:21:1:
+	X_BITS_WCTYPE_WCHAR_H     = 1          // wctype-wchar.h:24:1:
+	X_DEFAULT_SOURCE          = 1          // features.h:227:1:
+	X_FEATURES_H              = 1          // features.h:19:1:
+	X_FILE_OFFSET_BITS        = 64         // <builtin>:25:1:
+	X_LP64                    = 1          // <predefined>:284:1:
+	X_POSIX_C_SOURCE          = 200809     // features.h:281:1:
+	X_POSIX_SOURCE            = 1          // features.h:279:1:
+	X_STDC_PREDEF_H           = 1          // <predefined>:162:1:
+	X_SYS_CDEFS_H             = 1          // cdefs.h:19:1:
+	X_WCTYPE_H                = 1          // wctype.h:24:1:
+	X_WINT_T                  = 1          // wint_t.h:10:1:
+	Linux                     = 1          // <predefined>:231:1:
+	Unix                      = 1          // <predefined>:177:1:
+)
+
+// The characteristics are stored always in network byte order (big
+//    endian).  We define the bit value interpretations here dependent on the
+//    machine's byte order.
+
+// Endian macros for string.h functions
+//    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <http://www.gnu.org/licenses/>.
+
+// Definitions for byte order, according to significance of bytes,
+//    from low addresses to high addresses.  The value is what you get by
+//    putting '4' in the most significant byte, '3' in the second most
+//    significant byte, '2' in the second least significant byte, and '1'
+//    in the least significant byte, and then writing down one digit for
+//    each byte, starting with the byte at the lowest address at the left,
+//    and proceeding to the byte with the highest address at the right.
+
+// This file defines `__BYTE_ORDER' for the particular machine.
+
+// i386/x86_64 are little-endian.
+
+// Some machines may need to use a different endianness for floating point
+//    values.
+
+const ( /* wctype-wchar.h:56:1: */
+	X__ISwupper  = 0  // UPPERCASE.
+	X__ISwlower  = 1  // lowercase.
+	X__ISwalpha  = 2  // Alphabetic.
+	X__ISwdigit  = 3  // Numeric.
+	X__ISwxdigit = 4  // Hexadecimal numeric.
+	X__ISwspace  = 5  // Whitespace.
+	X__ISwprint  = 6  // Printing.
+	X__ISwgraph  = 7  // Graphical.
+	X__ISwblank  = 8  // Blank (usually SPC and TAB).
+	X__ISwcntrl  = 9  // Control character.
+	X__ISwpunct  = 10 // Punctuation.
+	X__ISwalnum  = 11 // Alphanumeric.
+
+	X_ISwupper  = 16777216    // UPPERCASE.
+	X_ISwlower  = 33554432    // lowercase.
+	X_ISwalpha  = 67108864    // Alphabetic.
+	X_ISwdigit  = 134217728   // Numeric.
+	X_ISwxdigit = 268435456   // Hexadecimal numeric.
+	X_ISwspace  = 536870912   // Whitespace.
+	X_ISwprint  = 1073741824  // Printing.
+	X_ISwgraph  = -2147483648 // Graphical.
+	X_ISwblank  = 65536       // Blank (usually SPC and TAB).
+	X_ISwcntrl  = 131072      // Control character.
+	X_ISwpunct  = 262144      // Punctuation.
+	X_ISwalnum  = 524288
+)
+
+type Ptrdiff_t = int64 /* <builtin>:3:26 */
+
+type Size_t = uint64 /* <builtin>:9:23 */
+
+type Wchar_t = int32 /* <builtin>:15:24 */
+
+type X__int128_t = struct {
+	Flo int64
+	Fhi int64
+} /* <builtin>:21:43 */ // must match modernc.org/mathutil.Int128
+type X__uint128_t = struct {
+	Flo uint64
+	Fhi uint64
+} /* <builtin>:22:44 */ // must match modernc.org/mathutil.Int128
+
+type X__builtin_va_list = uintptr /* <builtin>:46:14 */
+type X__float128 = float64        /* <builtin>:47:21 */
+
+// Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	ISO C99 Standard: 7.25
+//	Wide character classification and mapping utilities  <wctype.h>
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// These are defined by the user (or the compiler)
+//    to specify the desired environment:
+//
+//    __STRICT_ANSI__	ISO Standard C.
+//    _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
+//    _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
+//    _ISOC2X_SOURCE	Extensions to ISO C99 from ISO C2X.
+//    __STDC_WANT_LIB_EXT2__
+// 			Extensions to ISO C99 from TR 27431-2:2010.
+//    __STDC_WANT_IEC_60559_BFP_EXT__
+// 			Extensions to ISO C11 from TS 18661-1:2014.
+//    __STDC_WANT_IEC_60559_FUNCS_EXT__
+// 			Extensions to ISO C11 from TS 18661-4:2015.
+//    __STDC_WANT_IEC_60559_TYPES_EXT__
+// 			Extensions to ISO C11 from TS 18661-3:2015.
+//
+//    _POSIX_SOURCE	IEEE Std 1003.1.
+//    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
+// 			if >=199309L, add IEEE Std 1003.1b-1993;
+// 			if >=199506L, add IEEE Std 1003.1c-1995;
+// 			if >=200112L, all of IEEE 1003.1-2004
+// 			if >=200809L, all of IEEE 1003.1-2008
+//    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
+// 			Single Unix conformance is wanted, to 600 for the
+// 			sixth revision, to 700 for the seventh revision.
+//    _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
+//    _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
+//    _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
+//    _FILE_OFFSET_BITS=N	Select default filesystem interface.
+//    _ATFILE_SOURCE	Additional *at interfaces.
+//    _GNU_SOURCE		All of the above, plus GNU extensions.
+//    _DEFAULT_SOURCE	The default set of features (taking precedence over
+// 			__STRICT_ANSI__).
+//
+//    _FORTIFY_SOURCE	Add security hardening to many library functions.
+// 			Set to 1 or 2; 2 performs stricter checks than 1.
+//
+//    _REENTRANT, _THREAD_SAFE
+// 			Obsolete; equivalent to _POSIX_C_SOURCE=199506L.
+//
+//    The `-ansi' switch to the GNU C compiler, and standards conformance
+//    options such as `-std=c99', define __STRICT_ANSI__.  If none of
+//    these are defined, or if _DEFAULT_SOURCE is defined, the default is
+//    to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
+//    200809L, as well as enabling miscellaneous functions from BSD and
+//    SVID.  If more than one of these are defined, they accumulate.  For
+//    example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
+//    give you ISO C, 1003.1, and 1003.2, but nothing else.
+//
+//    These are defined by this file and are used by the
+//    header files to decide what to declare or define:
+//
+//    __GLIBC_USE (F)	Define things from feature set F.  This is defined
+// 			to 1 or 0; the subsequent macros are either defined
+// 			or undefined, and those tests should be moved to
+// 			__GLIBC_USE.
+//    __USE_ISOC11		Define ISO C11 things.
+//    __USE_ISOC99		Define ISO C99 things.
+//    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+//    __USE_ISOCXX11	Define ISO C++11 things.
+//    __USE_POSIX		Define IEEE Std 1003.1 things.
+//    __USE_POSIX2		Define IEEE Std 1003.2 things.
+//    __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
+//    __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
+//    __USE_XOPEN		Define XPG things.
+//    __USE_XOPEN_EXTENDED	Define X/Open Unix things.
+//    __USE_UNIX98		Define Single Unix V2 things.
+//    __USE_XOPEN2K        Define XPG6 things.
+//    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+//    __USE_XOPEN2K8       Define XPG7 things.
+//    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
+//    __USE_LARGEFILE	Define correct standard I/O things.
+//    __USE_LARGEFILE64	Define LFS things with separate names.
+//    __USE_FILE_OFFSET64	Define 64bit interface as default.
+//    __USE_MISC		Define things from 4.3BSD or System V Unix.
+//    __USE_ATFILE		Define *at interfaces and AT_* constants for them.
+//    __USE_GNU		Define GNU extensions.
+//    __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
+//
+//    The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
+//    defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
+//    only for compatibility.  All new code should use the other symbols
+//    to test for features.
+//
+//    All macros listed above as possibly being defined by this file are
+//    explicitly undefined if they are not explicitly defined.
+//    Feature-test macros that are not defined by the user or compiler
+//    but are implied by the other feature-test macros defined (or by the
+//    lack of any definitions) are defined by the file.
+//
+//    ISO C feature test macros depend on the definition of the macro
+//    when an affected header is included, not when the first system
+//    header is included, and so they are handled in
+//    <bits/libc-header-start.h>, which does not have a multiple include
+//    guard.  Feature test macros that can be handled from the first
+//    system header included are handled here.
+
+// Undefine everything, so we get a clean slate.
+
+// Suppress kernel-name space pollution unless user expressedly asks
+//    for it.
+
+// Convenience macro to test the version of gcc.
+//    Use like this:
+//    #if __GNUC_PREREQ (2,8)
+//    ... code requiring gcc 2.8 or later ...
+//    #endif
+//    Note: only works for GCC 2.0 and later, because __GNUC_MINOR__ was
+//    added in 2.0.
+
+// Similarly for clang.  Features added to GCC after version 4.2 may
+//    or may not also be available in clang, and clang's definitions of
+//    __GNUC(_MINOR)__ are fixed at 4 and 2 respectively.  Not all such
+//    features can be queried via __has_extension/__has_feature.
+
+// Whether to use feature set F.
+
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
+//    _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
+//    issue a warning; the expectation is that the source is being
+//    transitioned to use the new macro.
+
+// If _GNU_SOURCE was defined by the user, turn on all the other features.
+
+// If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
+//    define _DEFAULT_SOURCE.
+
+// This is to enable the ISO C2X extension.
+
+// This is to enable the ISO C11 extension.
+
+// This is to enable the ISO C99 extension.
+
+// This is to enable the ISO C90 Amendment 1:1995 extension.
+
+// If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
+//    is defined, use POSIX.1-2008 (or another version depending on
+//    _XOPEN_SOURCE).
+
+// Some C libraries once required _REENTRANT and/or _THREAD_SAFE to be
+//    defined in all multithreaded code.  GNU libc has not required this
+//    for many years.  We now treat them as compatibility synonyms for
+//    _POSIX_C_SOURCE=199506L, which is the earliest level of POSIX with
+//    comprehensive support for multithreaded code.  Using them never
+//    lowers the selected level of POSIX conformance, only raises it.
+
+// The function 'gets' existed in C89, but is impossible to use
+//    safely.  It has been removed from ISO C11 and ISO C++14.  Note: for
+//    compatibility with various implementations of <cstdio>, this test
+//    must consider only the value of __cplusplus when compiling C++.
+
+// GNU formerly extended the scanf functions with modified format
+//    specifiers %as, %aS, and %a[...] that allocate a buffer for the
+//    input using malloc.  This extension conflicts with ISO C99, which
+//    defines %a as a standalone format specifier that reads a floating-
+//    point number; moreover, POSIX.1-2008 provides the same feature
+//    using the modifier letter 'm' instead (%ms, %mS, %m[...]).
+//
+//    We now follow C99 unless GNU extensions are active and the compiler
+//    is specifically in C89 or C++98 mode (strict or not).  For
+//    instance, with GCC, -std=gnu11 will have C99-compliant scanf with
+//    or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
+//    old extension.
+
+// Get definitions of __STDC_* predefined macros, if the compiler has
+//    not preincluded this header automatically.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// This macro indicates that the installed library is the GNU C Library.
+//    For historic reasons the value now is 6 and this will stay from now
+//    on.  The use of this variable is deprecated.  Use __GLIBC__ and
+//    __GLIBC_MINOR__ now (see below) when you want to test for a specific
+//    GNU C library version and use the values in <gnu/lib-names.h> to get
+//    the sonames of the shared libraries.
+
+// Major and minor version number of the GNU C library package.  Use
+//    these macros to test for features in specific releases.
+
+// This is here only because every header file already includes this one.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// We are almost always included from features.h.
+
+// The GNU libc does not support any K&R compilers or the traditional mode
+//    of ISO C compilers anymore.  Check for some of the combinations not
+//    anymore supported.
+
+// Some user header file might have defined this before.
+
+// All functions, except those with callbacks or those that
+//    synchronize memory, are leaf functions.
+
+// GCC can always grok prototypes.  For C++ programs we add throw()
+//    to help it optimize the function calls.  But this works only with
+//    gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+//    as non-throwing using a function attribute since programs can use
+//    the -fexceptions options for C code as well.
+
+// Compilers that are not clang may object to
+//        #if defined __clang__ && __has_extension(...)
+//    even though they do not need to evaluate the right-hand side of the &&.
+
+// These two macros are not used in glibc anymore.  They are kept here
+//    only because some other projects expect the macros to be defined.
+
+// For these things, GCC behaves the ANSI way normally,
+//    and the non-ANSI way under -traditional.
+
+// This is not a typedef so `const __ptr_t' does the right thing.
+
+// C++ needs to know that types and declarations are C, not C++.
+
+// Fortify support.
+
+// Support for flexible arrays.
+//    Headers that should use flexible arrays only if they're "real"
+//    (e.g. only if they won't affect sizeof()) should test
+//    #if __glibc_c99_flexarr_available.
+
+// __asm__ ("xyz") is used throughout the headers to rename functions
+//    at the assembly language level.  This is wrapped by the __REDIRECT
+//    macro, in order to support compilers that can do this some other
+//    way.  When compilers don't support asm-names at all, we have to do
+//    preprocessor tricks instead (which don't have exactly the right
+//    semantics, but it's the best we can do).
+//
+//    Example:
+//    int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid);
+
+//
+// #elif __SOME_OTHER_COMPILER__
+//
+// # define __REDIRECT(name, proto, alias) name proto; 	_Pragma("let " #name " = " #alias)
+
+// GCC has various useful declarations that can be made with the
+//    `__attribute__' syntax.  All of the ways we use this do fine if
+//    they are omitted for compilers that don't understand it.
+
+// At some point during the gcc 2.96 development the `malloc' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Tell the compiler which arguments to an allocation function
+//    indicate the size of the allocation.
+
+// At some point during the gcc 2.96 development the `pure' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// This declaration tells the compiler that the value is constant.
+
+// At some point during the gcc 3.1 development the `used' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+
+// Since version 3.2, gcc allows marking deprecated functions.
+
+// Since version 4.5, gcc also allows one to specify the message printed
+//    when a deprecated function is used.  clang claims to be gcc 4.2, but
+//    may also support this feature.
+
+// At some point during the gcc 2.8 development the `format_arg' attribute
+//    for functions was introduced.  We don't want to use it unconditionally
+//    (although this would be possible) since it generates warnings.
+//    If several `format_arg' attributes are given for the same function, in
+//    gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+//    all designated arguments are considered.
+
+// At some point during the gcc 2.97 development the `strfmon' format
+//    attribute for functions was introduced.  We don't want to use it
+//    unconditionally (although this would be possible) since it
+//    generates warnings.
+
+// The nonull function attribute allows to mark pointer parameters which
+//    must not be NULL.
+
+// If fortification mode, we warn about unused results of certain
+//    function calls which can lead to problems.
+
+// Forces a function to be always inlined.
+// The Linux kernel defines __always_inline in stddef.h (283d7573), and
+//    it conflicts with this definition.  Therefore undefine it first to
+//    allow either header to be included first.
+
+// Associate error messages with the source location of the call site rather
+//    than with the source location inside the function.
+
+// GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+//    inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
+//    or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+//    older than 4.3 may define these macros and still not guarantee GNU inlining
+//    semantics.
+//
+//    clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+//    semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
+//    __GNUC_GNU_INLINE__ macro definitions.
+
+// GCC 4.3 and above allow passing all anonymous arguments of an
+//    __extern_always_inline function to some other vararg function.
+
+// It is possible to compile containing GCC extensions even if GCC is
+//    run in pedantic mode if the uses are carefully marked using the
+//    `__extension__' keyword.  But this is not generally available before
+//    version 2.8.
+
+// __restrict is known in EGCS 1.2 and above.
+
+// ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+//      array_name[restrict]
+//    GCC 3.1 supports this.
+
+// Describes a char array whose address can safely be passed as the first
+//    argument to strncpy and strncat, as the char array is not necessarily
+//    a NUL-terminated string.
+
+// Undefine (also defined in libc-symbols.h).
+// Copies attributes from the declaration or type referenced by
+//    the argument.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Properties of long double type.  ldbl-96 version.
+//    Copyright (C) 2016-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License  published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// long double is distinct from double, so there is nothing to
+//    define here.
+
+// __glibc_macro_warning (MESSAGE) issues warning MESSAGE.  This is
+//    intended for use in preprocessor macros.
+//
+//    Note: MESSAGE must be a _single_ string; concatenation of string
+//    literals is not supported.
+
+// Generic selection (ISO C11) is a C-only feature, available in GCC
+//    since version 4.9.  Previous versions do not provide generic
+//    selection, even though they might set __STDC_VERSION__ to 201112L,
+//    when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
+//    when testing __STDC_VERSION__ for generic selection support.
+//    On the other hand, Clang also defines __GNUC__, so a clang-specific
+//    check is required to enable the use of generic selection.
+
+// If we don't have __REDIRECT, prototypes will be missing if
+//    __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64].
+
+// Decide whether we can define 'extern inline' functions in headers.
+
+// This is here only because every header file already includes this one.
+//    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
+//    <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+//    that will always return failure (and set errno to ENOSYS).
+// This file is automatically generated.
+//    This file selects the right generated file of `__stub_FUNCTION' macros
+//    based on the architecture being compiled for.
+
+// This file is automatically generated.
+//    It defines a symbol `__stub_FUNCTION' for each function
+//    in the C library which is a stub, meaning it will fail
+//    every time called, usually setting errno to ENOSYS.
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Determine the wordsize from the preprocessor defines.
+
+// Both x86-64 and x32 use the 64-bit system call interface.
+// Bit size of the time_t type at glibc build time, x86-64 and x32 case.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// For others, time size is word size.
+
+// Convenience types.
+type X__u_char = uint8   /* types.h:31:23 */
+type X__u_short = uint16 /* types.h:32:28 */
+type X__u_int = uint32   /* types.h:33:22 */
+type X__u_long = uint64  /* types.h:34:27 */
+
+// Fixed-size types, underlying types depend on word size and compiler.
+type X__int8_t = int8     /* types.h:37:21 */
+type X__uint8_t = uint8   /* types.h:38:23 */
+type X__int16_t = int16   /* types.h:39:26 */
+type X__uint16_t = uint16 /* types.h:40:28 */
+type X__int32_t = int32   /* types.h:41:20 */
+type X__uint32_t = uint32 /* types.h:42:22 */
+type X__int64_t = int64   /* types.h:44:25 */
+type X__uint64_t = uint64 /* types.h:45:27 */
+
+// Smallest types with at least a given width.
+type X__int_least8_t = X__int8_t     /* types.h:52:18 */
+type X__uint_least8_t = X__uint8_t   /* types.h:53:19 */
+type X__int_least16_t = X__int16_t   /* types.h:54:19 */
+type X__uint_least16_t = X__uint16_t /* types.h:55:20 */
+type X__int_least32_t = X__int32_t   /* types.h:56:19 */
+type X__uint_least32_t = X__uint32_t /* types.h:57:20 */
+type X__int_least64_t = X__int64_t   /* types.h:58:19 */
+type X__uint_least64_t = X__uint64_t /* types.h:59:20 */
+
+// quad_t is also 64 bits.
+type X__quad_t = int64    /* types.h:63:18 */
+type X__u_quad_t = uint64 /* types.h:64:27 */
+
+// Largest integral types.
+type X__intmax_t = int64   /* types.h:72:18 */
+type X__uintmax_t = uint64 /* types.h:73:27 */
+
+// The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+//    macros for each of the OS types we define below.  The definitions
+//    of those macros must use the following macros for underlying types.
+//    We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+//    variants of each of the following integer types on this machine.
+//
+// 	16		-- "natural" 16-bit type (always short)
+// 	32		-- "natural" 32-bit type (always int)
+// 	64		-- "natural" 64-bit type (long or long long)
+// 	LONG32		-- 32-bit type, traditionally long
+// 	QUAD		-- 64-bit type, traditionally long long
+// 	WORD		-- natural type of __WORDSIZE bits (int or long)
+// 	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+//
+//    We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+//    conventional uses of `long' or `long long' type modifiers match the
+//    types we define, even when a less-adorned type would be the same size.
+//    This matters for (somewhat) portably writing printf/scanf formats for
+//    these types, where using the appropriate l or ll format modifiers can
+//    make the typedefs and the formats match up across all GNU platforms.  If
+//    we used `long' when it's 64 bits where `long long' is expected, then the
+//    compiler would warn about the formats not matching the argument types,
+//    and the programmer changing them to shut up the compiler would break the
+//    program's portability.
+//
+//    Here we assume what is presently the case in all the GCC configurations
+//    we support: long long is always 64 bits, long is always word/address size,
+//    and int is always 32 bits.
+
+// No need to mark the typedef with __extension__.
+// bits/typesizes.h -- underlying types for *_t.  Linux/x86-64 version.
+//    Copyright (C) 2012-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// See <bits/types.h> for the meaning of these macros.  This file exists so
+//    that <bits/types.h> need not vary across different GNU platforms.
+
+// X32 kernel interface is 64-bit.
+
+// Tell the libc code that off_t and off64_t are actually the same type
+//    for all ABI purposes, even if possibly expressed as different base types
+//    for C type-checking purposes.
+
+// Same for ino_t and ino64_t.
+
+// And for __rlim_t and __rlim64_t.
+
+// And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.
+
+// Number of descriptors that can fit in an `fd_set'.
+
+// bits/time64.h -- underlying types for __time64_t.  Generic version.
+//    Copyright (C) 2018-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Define __TIME64_T_TYPE so that it is always a 64-bit type.
+
+// If we already have 64-bit time type then use it.
+
+type X__dev_t = uint64                     /* types.h:145:25 */ // Type of device numbers.
+type X__uid_t = uint32                     /* types.h:146:25 */ // Type of user identifications.
+type X__gid_t = uint32                     /* types.h:147:25 */ // Type of group identifications.
+type X__ino_t = uint64                     /* types.h:148:25 */ // Type of file serial numbers.
+type X__ino64_t = uint64                   /* types.h:149:27 */ // Type of file serial numbers (LFS).
+type X__mode_t = uint32                    /* types.h:150:26 */ // Type of file attribute bitmasks.
+type X__nlink_t = uint64                   /* types.h:151:27 */ // Type of file link counts.
+type X__off_t = int64                      /* types.h:152:25 */ // Type of file sizes and offsets.
+type X__off64_t = int64                    /* types.h:153:27 */ // Type of file sizes and offsets (LFS).
+type X__pid_t = int32                      /* types.h:154:25 */ // Type of process identifications.
+type X__fsid_t = struct{ F__val [2]int32 } /* types.h:155:26 */ // Type of file system IDs.
+type X__clock_t = int64                    /* types.h:156:27 */ // Type of CPU usage counts.
+type X__rlim_t = uint64                    /* types.h:157:26 */ // Type for resource measurement.
+type X__rlim64_t = uint64                  /* types.h:158:28 */ // Type for resource measurement (LFS).
+type X__id_t = uint32                      /* types.h:159:24 */ // General type for IDs.
+type X__time_t = int64                     /* types.h:160:26 */ // Seconds since the Epoch.
+type X__useconds_t = uint32                /* types.h:161:30 */ // Count of microseconds.
+type X__suseconds_t = int64                /* types.h:162:31 */ // Signed count of microseconds.
+
+type X__daddr_t = int32 /* types.h:164:27 */ // The type of a disk address.
+type X__key_t = int32   /* types.h:165:25 */ // Type of an IPC key.
+
+// Clock ID used in clock and timer functions.
+type X__clockid_t = int32 /* types.h:168:29 */
+
+// Timer ID returned by `timer_create'.
+type X__timer_t = uintptr /* types.h:171:12 */
+
+// Type to represent block size.
+type X__blksize_t = int64 /* types.h:174:29 */
+
+// Types from the Large File Support interface.
+
+// Type to count number of disk blocks.
+type X__blkcnt_t = int64   /* types.h:179:28 */
+type X__blkcnt64_t = int64 /* types.h:180:30 */
+
+// Type to count file system blocks.
+type X__fsblkcnt_t = uint64   /* types.h:183:30 */
+type X__fsblkcnt64_t = uint64 /* types.h:184:32 */
+
+// Type to count file system nodes.
+type X__fsfilcnt_t = uint64   /* types.h:187:30 */
+type X__fsfilcnt64_t = uint64 /* types.h:188:32 */
+
+// Type of miscellaneous file system fields.
+type X__fsword_t = int64 /* types.h:191:28 */
+
+type X__ssize_t = int64 /* types.h:193:27 */ // Type of a byte count, or error.
+
+// Signed long type used in system calls.
+type X__syscall_slong_t = int64 /* types.h:196:33 */
+// Unsigned long type used in system calls.
+type X__syscall_ulong_t = uint64 /* types.h:198:33 */
+
+// These few don't really vary by system, they always correspond
+//
+//	to one of the other defined types.
+type X__loff_t = X__off64_t /* types.h:202:19 */ // Type of file sizes and offsets (LFS).
+type X__caddr_t = uintptr   /* types.h:203:14 */
+
+// Duplicates info from stdint.h but this is used in unistd.h.
+type X__intptr_t = int64 /* types.h:206:25 */
+
+// Duplicate info from sys/socket.h.
+type X__socklen_t = uint32 /* types.h:209:23 */
+
+// C99: An integer type that can be accessed as an atomic entity,
+//
+//	even in the presence of asynchronous interrupts.
+//	It is not currently necessary for this to be machine-specific.
+type X__sig_atomic_t = int32 /* types.h:214:13 */
+
+// Seconds since the Epoch, visible to user code when time_t is too
+//    narrow only for consistency with the old way of widening too-narrow
+//    types.  User code should never use __time64_t.
+
+// Some versions of stddef.h provide wint_t, even though neither the
+//    C nor C++ standards, nor POSIX, specifies this.  We assume that
+//    stddef.h will define the macro _WINT_T if and only if it provides
+//    wint_t, and conversely, that it will avoid providing wint_t if
+//    _WINT_T is already defined.
+
+// Integral type unchanged by default argument promotions that can
+//    hold any value corresponding to members of the extended character
+//    set, as well as at least one value that does not correspond to any
+//    member of the extended character set.
+
+type Wint_t = uint32 /* wint_t.h:20:23 */
+
+// Constant expression of type `wint_t' whose value does not correspond
+//    to any member of the extended character set.
+
+// Some definitions from this header also appear in <wchar.h> in
+//    Unix98 mode.
+// Copyright (C) 1996-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+//	ISO C99 Standard: 7.25
+//	Wide character classification and mapping utilities  <wctype.h>
+
+// bits/types.h -- definitions of __*_t types underlying *_t types.
+//    Copyright (C) 2002-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Never include this file directly; use <sys/types.h> instead.
+
+// The definitions in this header are specified to appear in <wctype.h>
+//    in ISO C99, but in <wchar.h> in Unix98.  _GNU_SOURCE follows C99.
+
+// Scalar type that can hold values which represent locale-specific
+//
+//	character classifications.
+type Wctype_t = uint64 /* wctype-wchar.h:38:27 */
+
+// Extensible wide-character mapping functions: 7.15.3.2.
+
+// Scalar type that can hold values which represent locale-specific
+//
+//	character mappings.
+type Wctrans_t = uintptr /* wctype.h:48:25 */
+
+// POSIX.1-2008 extended locale interface (see locale.h).
+// Definition of locale_t.
+//    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// Definition of struct __locale_struct and __locale_t.
+//    Copyright (C) 1997-2020 Free Software Foundation, Inc.
+//    This file is part of the GNU C Library.
+//    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+//
+//    The GNU C Library is free software; you can redistribute it and/or
+//    modify it under the terms of the GNU Lesser General Public
+//    License as published by the Free Software Foundation; either
+//    version 2.1 of the License, or (at your option) any later version.
+//
+//    The GNU C Library is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public
+//    License along with the GNU C Library; if not, see
+//    <https://www.gnu.org/licenses/>.
+
+// POSIX.1-2008: the locale_t type, representing a locale context
+//    (implementation-namespace version).  This type should be treated
+//    as opaque by applications; some details are exposed for the sake of
+//    efficiency in e.g. ctype functions.
+
+type X__locale_struct = struct {
+	F__locales       [13]uintptr
+	F__ctype_b       uintptr
+	F__ctype_tolower uintptr
+	F__ctype_toupper uintptr
+	F__names         [13]uintptr
+} /* __locale_t.h:28:1 */
+
+type X__locale_t = uintptr /* __locale_t.h:42:32 */
+
+type Locale_t = X__locale_t /* locale_t.h:24:20 */
+
+var _ int8 /* gen.c:2:13: */
diff --git a/vendor/modernc.org/memory/Makefile b/vendor/modernc.org/memory/Makefile
index 466c940e..1c033fc5 100644
--- a/vendor/modernc.org/memory/Makefile
+++ b/vendor/modernc.org/memory/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-.PHONY:	all clean cover cpu editor internalError later mem nuke todo edit
+.PHONY:	all clean cover cpu editor internalError later mem nuke todo edit build_all_targets
 
 grep=--include=*.go --include=*.l --include=*.y --include=*.yy
 ngrep='TODOOK\|parser\.go\|scanner\.go\|.*_string\.go'
@@ -34,6 +34,8 @@ edit:
 
 editor:
 	gofmt -l -s -w *.go
+
+build_all_targets:
 	GOOS=darwin GOARCH=amd64 go build
 	GOOS=darwin GOARCH=arm64 go build
 	GOOS=freebsd GOARCH=386 go build
@@ -45,6 +47,7 @@ editor:
 	GOOS=linux GOARCH=amd64 go build
 	GOOS=linux GOARCH=arm go build
 	GOOS=linux GOARCH=arm64 go build
+	GOOS=linux GOARCH=loong64 go build
 	GOOS=linux GOARCH=mips go build
 	GOOS=linux GOARCH=mips64le go build
 	GOOS=linux GOARCH=mipsle go build
diff --git a/vendor/modernc.org/memory/memory64.go b/vendor/modernc.org/memory/memory64.go
index 2e51bb29..63392925 100644
--- a/vendor/modernc.org/memory/memory64.go
+++ b/vendor/modernc.org/memory/memory64.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build amd64 || amd64p32 || arm64 || arm64be || mips64 || mips64le || mips64p32 || mips64p32le || ppc64 || ppc64le || sparc64 || riscv64
-// +build amd64 amd64p32 arm64 arm64be mips64 mips64le mips64p32 mips64p32le ppc64 ppc64le sparc64 riscv64
+//go:build amd64 || amd64p32 || arm64 || arm64be || mips64 || mips64le || mips64p32 || mips64p32le || ppc64 || ppc64le || sparc64 || riscv64 || loong64
+// +build amd64 amd64p32 arm64 arm64be mips64 mips64le mips64p32 mips64p32le ppc64 ppc64le sparc64 riscv64 loong64
 
 package memory // import "modernc.org/memory"
 
diff --git a/vendor/modernc.org/memory/mmap_linux_64.go b/vendor/modernc.org/memory/mmap_linux_64.go
index 3780c149..6b7e93dc 100644
--- a/vendor/modernc.org/memory/mmap_linux_64.go
+++ b/vendor/modernc.org/memory/mmap_linux_64.go
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE-GO file.
 
-//go:build linux && (amd64 || arm64 || mips64 || mips64le || riscv64 || ppc64le)
+//go:build linux && (amd64 || arm64 || mips64 || mips64le || riscv64 || ppc64le || loong64)
 // +build linux
-// +build amd64 arm64 mips64 mips64le riscv64 ppc64le
+// +build amd64 arm64 mips64 mips64le riscv64 ppc64le loong64
 
 package memory
 
diff --git a/vendor/modernc.org/sqlite/AUTHORS b/vendor/modernc.org/sqlite/AUTHORS
index dae34d6b..c3925152 100644
--- a/vendor/modernc.org/sqlite/AUTHORS
+++ b/vendor/modernc.org/sqlite/AUTHORS
@@ -9,15 +9,17 @@
 # Please keep the list sorted.
 
 Artyom Pervukhin <github@artyom.dev>
+Dan Kortschak <dan@kortschak.io>
 Dan Peterson <danp@danp.net>
 David Walton <david@davidwalton.com>
 Davsk Ltd Co <skinner.david@gmail.com>
+FerretDB Inc.
 Jaap Aarts <jaap.aarts1@gmail.com>
 Jan Mercl <0xjnml@gmail.com>
 Josh Bleecher Snyder <josharian@gmail.com>
 Logan Snow <logansnow@protonmail.com>
 Michael Hoffmann <mhoffm@posteo.de>
+Michael Rykov <mrykov@gmail.com>
 Ross Light <ross@zombiezen.com>
 Saed SayedAhmed <saadmtsa@gmail.com>
 Steffen Butzer <steffen(dot)butzer@outlook.com>
-Michael Rykov <mrykov@gmail.com>
diff --git a/vendor/modernc.org/sqlite/CONTRIBUTORS b/vendor/modernc.org/sqlite/CONTRIBUTORS
index 04e28754..8e196430 100644
--- a/vendor/modernc.org/sqlite/CONTRIBUTORS
+++ b/vendor/modernc.org/sqlite/CONTRIBUTORS
@@ -7,7 +7,9 @@
 # Please keep the list sorted.
 
 Alexander Menzhinsky <amenzhinsky@gmail.com>
+Alexey Palazhchenko <alexey.palazhchenko@gmail.com>
 Artyom Pervukhin <github@artyom.dev>
+Dan Kortschak <dan@kortschak.io>
 Dan Peterson <danp@danp.net>
 David Skinner <skinner.david@gmail.com>
 David Walton <david@davidwalton.com>
@@ -20,8 +22,10 @@ Josh Bleecher Snyder <josharian@gmail.com>
 Logan Snow <logansnow@protonmail.com>
 Matthew Gabeler-Lee <fastcat@gmail.com>
 Michael Hoffmann <mhoffm@posteo.de>
+Michael Rykov <mrykov@gmail.com>
+Romain Le Disez <r.gitlab@ledisez.net>
 Ross Light <ross@zombiezen.com>
 Saed SayedAhmed <saadmtsa@gmail.com>
+Sean McGivern <sean@mcgivern.me.uk>
 Steffen Butzer <steffen(dot)butzer@outlook.com>
 Yaacov Akiba Slama <ya@slamail.org>
-Michael Rykov <mrykov@gmail.com>
diff --git a/vendor/modernc.org/sqlite/README.md b/vendor/modernc.org/sqlite/README.md
index a47f345f..aa45ff87 100644
--- a/vendor/modernc.org/sqlite/README.md
+++ b/vendor/modernc.org/sqlite/README.md
@@ -21,3 +21,56 @@ allowing one of the maintainers to work on it also in office hours.
 ## Builders
 
 [modern-c.appspot.com/-/builder/?importpath=modernc.org%2fsqlite](https://modern-c.appspot.com/-/builder/?importpath=modernc.org%2fsqlite)
+
+## Speedtest1
+
+Numbers for the pure Go version were produced by
+
+     ~/src/modernc.org/sqlite/speedtest1$ go build && ./speedtest1
+
+Numbers for the pure C version were produced by
+
+     ~/src/modernc.org/sqlite/testdata/sqlite-src-3410200/test$ gcc speedtest1.c ../../sqlite-amalgamation-3410200/sqlite3.c -lpthread -ldl && ./a.out
+
+The results are from Go version 1.20.4 and GCC version 10.2.1 on a
+Linux/amd64 machine, CPU: AMD Ryzen 9 3900X 12-Core Processor × 24, 128GB
+RAM. Shown are the best of 3 runs.
+
+     Go											C
+
+     -- Speedtest1 for SQLite 3.41.2 2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69	-- Speedtest1 for SQLite 3.41.2 2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69
+      100 - 50000 INSERTs into table with no index......................    0.071s            100 - 50000 INSERTs into table with no index......................    0.077s
+      110 - 50000 ordered INSERTS with one index/PK.....................    0.114s            110 - 50000 ordered INSERTS with one index/PK.....................    0.082s
+      120 - 50000 unordered INSERTS with one index/PK...................    0.137s            120 - 50000 unordered INSERTS with one index/PK...................    0.099s
+      130 - 25 SELECTS, numeric BETWEEN, unindexed......................    0.083s            130 - 25 SELECTS, numeric BETWEEN, unindexed......................    0.091s
+      140 - 10 SELECTS, LIKE, unindexed.................................    0.210s            140 - 10 SELECTS, LIKE, unindexed.................................    0.120s
+      142 - 10 SELECTS w/ORDER BY, unindexed............................    0.276s            142 - 10 SELECTS w/ORDER BY, unindexed............................    0.182s
+      145 - 10 SELECTS w/ORDER BY and LIMIT, unindexed..................    0.183s            145 - 10 SELECTS w/ORDER BY and LIMIT, unindexed..................    0.099s
+      150 - CREATE INDEX five times.....................................    0.172s            150 - CREATE INDEX five times.....................................    0.127s
+      160 - 10000 SELECTS, numeric BETWEEN, indexed.....................    0.080s            160 - 10000 SELECTS, numeric BETWEEN, indexed.....................    0.078s
+      161 - 10000 SELECTS, numeric BETWEEN, PK..........................    0.080s            161 - 10000 SELECTS, numeric BETWEEN, PK..........................    0.078s
+      170 - 10000 SELECTS, text BETWEEN, indexed........................    0.187s            170 - 10000 SELECTS, text BETWEEN, indexed........................    0.169s
+      180 - 50000 INSERTS with three indexes............................    0.196s            180 - 50000 INSERTS with three indexes............................    0.154s
+      190 - DELETE and REFILL one table.................................    0.200s            190 - DELETE and REFILL one table.................................    0.155s
+      200 - VACUUM......................................................    0.180s            200 - VACUUM......................................................    0.142s
+      210 - ALTER TABLE ADD COLUMN, and query...........................    0.004s            210 - ALTER TABLE ADD COLUMN, and query...........................    0.005s
+      230 - 10000 UPDATES, numeric BETWEEN, indexed.....................    0.093s            230 - 10000 UPDATES, numeric BETWEEN, indexed.....................    0.080s
+      240 - 50000 UPDATES of individual rows............................    0.153s            240 - 50000 UPDATES of individual rows............................    0.137s
+      250 - One big UPDATE of the whole 50000-row table.................    0.024s            250 - One big UPDATE of the whole 50000-row table.................    0.019s
+      260 - Query added column after filling............................    0.004s            260 - Query added column after filling............................    0.005s
+      270 - 10000 DELETEs, numeric BETWEEN, indexed.....................    0.278s            270 - 10000 DELETEs, numeric BETWEEN, indexed.....................    0.263s
+      280 - 50000 DELETEs of individual rows............................    0.188s            280 - 50000 DELETEs of individual rows............................    0.180s
+      290 - Refill two 50000-row tables using REPLACE...................    0.411s            290 - Refill two 50000-row tables using REPLACE...................    0.359s
+      300 - Refill a 50000-row table using (b&1)==(a&1).................    0.175s            300 - Refill a 50000-row table using (b&1)==(a&1).................    0.151s
+      310 - 10000 four-ways joins.......................................    0.427s            310 - 10000 four-ways joins.......................................    0.365s
+      320 - subquery in result set......................................    0.440s            320 - subquery in result set......................................    0.521s
+      400 - 70000 REPLACE ops on an IPK.................................    0.125s            400 - 70000 REPLACE ops on an IPK.................................    0.106s
+      410 - 70000 SELECTS on an IPK.....................................    0.081s            410 - 70000 SELECTS on an IPK.....................................    0.078s
+      500 - 70000 REPLACE on TEXT PK....................................    0.174s            500 - 70000 REPLACE on TEXT PK....................................    0.116s
+      510 - 70000 SELECTS on a TEXT PK..................................    0.153s            510 - 70000 SELECTS on a TEXT PK..................................    0.117s
+      520 - 70000 SELECT DISTINCT.......................................    0.083s            520 - 70000 SELECT DISTINCT.......................................    0.067s
+      980 - PRAGMA integrity_check......................................    0.436s            980 - PRAGMA integrity_check......................................    0.377s
+      990 - ANALYZE.....................................................    0.107s            990 - ANALYZE.....................................................    0.038s
+            TOTAL.......................................................    5.525s                  TOTAL.......................................................    4.637s
+
+This particular test executes 16.1% faster in the C version.
diff --git a/vendor/modernc.org/sqlite/dmesg.go b/vendor/modernc.org/sqlite/dmesg.go
new file mode 100644
index 00000000..5670301e
--- /dev/null
+++ b/vendor/modernc.org/sqlite/dmesg.go
@@ -0,0 +1,56 @@
+// Copyright 2023 The Sqlite 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 sqlite.dmesg
+// +build sqlite.dmesg
+
+package sqlite // import "modernc.org/sqlite"
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+)
+
+const dmesgs = true
+
+var (
+	pid  = fmt.Sprintf("[%v %v] ", os.Getpid(), filepath.Base(os.Args[0]))
+	logf *os.File
+)
+
+func init() {
+	t := time.Now()
+	// 01/02 03:04:05PM '06 -0700
+	dn := t.Format("sqlite-dmesg-2006-01-02-03-150405")
+	dn = filepath.Join(os.TempDir(), fmt.Sprintf("%s.%d", dn, os.Getpid()))
+	if err := os.Mkdir(dn, 0770); err != nil {
+		panic(err.Error())
+	}
+
+	fn := filepath.Join(dn, "dmesg.log")
+	var err error
+	if logf, err = os.OpenFile(fn, os.O_APPEND|os.O_CREATE|os.O_WRONLY|os.O_SYNC, 0644); err != nil {
+		panic(err.Error())
+	}
+
+	dmesg("%v", time.Now())
+	fmt.Fprintf(os.Stderr, "debug messages in %s\n", fn)
+}
+
+func dmesg(s string, args ...interface{}) {
+	if s == "" {
+		s = strings.Repeat("%v ", len(args))
+	}
+	s = fmt.Sprintf(pid+s, args...)
+	s += fmt.Sprintf(" (%v: %v:)", origin(3), origin(2))
+	switch {
+	case len(s) != 0 && s[len(s)-1] == '\n':
+		fmt.Fprint(logf, s)
+	default:
+		fmt.Fprintln(logf, s)
+	}
+}
diff --git a/vendor/modernc.org/sqlite/doc.go b/vendor/modernc.org/sqlite/doc.go
index 121810ce..923a8db7 100644
--- a/vendor/modernc.org/sqlite/doc.go
+++ b/vendor/modernc.org/sqlite/doc.go
@@ -8,37 +8,105 @@
 // SQLite is an in-process implementation of a self-contained, serverless,
 // zero-configuration, transactional SQL database engine.
 //
-// Thanks
+// # Thanks
 //
 // This project is sponsored by Schleibinger Geräte Teubert u. Greim GmbH by
 // allowing one of the maintainers to work on it also in office hours.
 //
-// Supported platforms and architectures
+// # Supported platforms and architectures
 //
 // These combinations of GOOS and GOARCH are currently supported
 //
 //	OS      Arch    SQLite version
 //	------------------------------
-//	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
+//	darwin	amd64   3.41.2
+//	darwin	arm64   3.41.2
+//	freebsd	amd64   3.41.2
+//	freebsd	arm64   3.41.2
+//	linux	386     3.41.2
+//	linux	amd64   3.41.2
+//	linux	arm     3.41.2
+//	linux	arm64   3.41.2
+//	linux	ppc64le 3.41.2
+//	linux	riscv64 3.41.2
+//	linux	s390x   3.41.2
+//	windows	amd64   3.41.2
+//	windows	arm64   3.41.2
 //
-// Builders
+// # Builders
 //
-// Builder results available at
+// Builder results available at:
 //
 // https://modern-c.appspot.com/-/builder/?importpath=modernc.org%2fsqlite
 //
-// Changelog
+// # Speedtest1
+//
+// Numbers for the pure Go version were produced by
+//
+//	~/src/modernc.org/sqlite/speedtest1$ go build && ./speedtest1
+//
+// Numbers for the pure C version were produced by
+//
+//	~/src/modernc.org/sqlite/testdata/sqlite-src-3410200/test$ gcc speedtest1.c ../../sqlite-amalgamation-3410200/sqlite3.c -lpthread -ldl && ./a.out
+//
+// The results are from Go version 1.20.4 and GCC version 10.2.1 on a
+// Linux/amd64 machine, CPU: AMD Ryzen 9 3900X 12-Core Processor × 24, 128GB
+// RAM. Shown are the best of 3 runs.
+//
+//	Go											C
+//
+//	-- Speedtest1 for SQLite 3.41.2 2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69	-- Speedtest1 for SQLite 3.41.2 2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69
+//	 100 - 50000 INSERTs into table with no index......................    0.071s            100 - 50000 INSERTs into table with no index......................    0.077s
+//	 110 - 50000 ordered INSERTS with one index/PK.....................    0.114s            110 - 50000 ordered INSERTS with one index/PK.....................    0.082s
+//	 120 - 50000 unordered INSERTS with one index/PK...................    0.137s            120 - 50000 unordered INSERTS with one index/PK...................    0.099s
+//	 130 - 25 SELECTS, numeric BETWEEN, unindexed......................    0.083s            130 - 25 SELECTS, numeric BETWEEN, unindexed......................    0.091s
+//	 140 - 10 SELECTS, LIKE, unindexed.................................    0.210s            140 - 10 SELECTS, LIKE, unindexed.................................    0.120s
+//	 142 - 10 SELECTS w/ORDER BY, unindexed............................    0.276s            142 - 10 SELECTS w/ORDER BY, unindexed............................    0.182s
+//	 145 - 10 SELECTS w/ORDER BY and LIMIT, unindexed..................    0.183s            145 - 10 SELECTS w/ORDER BY and LIMIT, unindexed..................    0.099s
+//	 150 - CREATE INDEX five times.....................................    0.172s            150 - CREATE INDEX five times.....................................    0.127s
+//	 160 - 10000 SELECTS, numeric BETWEEN, indexed.....................    0.080s            160 - 10000 SELECTS, numeric BETWEEN, indexed.....................    0.078s
+//	 161 - 10000 SELECTS, numeric BETWEEN, PK..........................    0.080s            161 - 10000 SELECTS, numeric BETWEEN, PK..........................    0.078s
+//	 170 - 10000 SELECTS, text BETWEEN, indexed........................    0.187s            170 - 10000 SELECTS, text BETWEEN, indexed........................    0.169s
+//	 180 - 50000 INSERTS with three indexes............................    0.196s            180 - 50000 INSERTS with three indexes............................    0.154s
+//	 190 - DELETE and REFILL one table.................................    0.200s            190 - DELETE and REFILL one table.................................    0.155s
+//	 200 - VACUUM......................................................    0.180s            200 - VACUUM......................................................    0.142s
+//	 210 - ALTER TABLE ADD COLUMN, and query...........................    0.004s            210 - ALTER TABLE ADD COLUMN, and query...........................    0.005s
+//	 230 - 10000 UPDATES, numeric BETWEEN, indexed.....................    0.093s            230 - 10000 UPDATES, numeric BETWEEN, indexed.....................    0.080s
+//	 240 - 50000 UPDATES of individual rows............................    0.153s            240 - 50000 UPDATES of individual rows............................    0.137s
+//	 250 - One big UPDATE of the whole 50000-row table.................    0.024s            250 - One big UPDATE of the whole 50000-row table.................    0.019s
+//	 260 - Query added column after filling............................    0.004s            260 - Query added column after filling............................    0.005s
+//	 270 - 10000 DELETEs, numeric BETWEEN, indexed.....................    0.278s            270 - 10000 DELETEs, numeric BETWEEN, indexed.....................    0.263s
+//	 280 - 50000 DELETEs of individual rows............................    0.188s            280 - 50000 DELETEs of individual rows............................    0.180s
+//	 290 - Refill two 50000-row tables using REPLACE...................    0.411s            290 - Refill two 50000-row tables using REPLACE...................    0.359s
+//	 300 - Refill a 50000-row table using (b&1)==(a&1).................    0.175s            300 - Refill a 50000-row table using (b&1)==(a&1).................    0.151s
+//	 310 - 10000 four-ways joins.......................................    0.427s            310 - 10000 four-ways joins.......................................    0.365s
+//	 320 - subquery in result set......................................    0.440s            320 - subquery in result set......................................    0.521s
+//	 400 - 70000 REPLACE ops on an IPK.................................    0.125s            400 - 70000 REPLACE ops on an IPK.................................    0.106s
+//	 410 - 70000 SELECTS on an IPK.....................................    0.081s            410 - 70000 SELECTS on an IPK.....................................    0.078s
+//	 500 - 70000 REPLACE on TEXT PK....................................    0.174s            500 - 70000 REPLACE on TEXT PK....................................    0.116s
+//	 510 - 70000 SELECTS on a TEXT PK..................................    0.153s            510 - 70000 SELECTS on a TEXT PK..................................    0.117s
+//	 520 - 70000 SELECT DISTINCT.......................................    0.083s            520 - 70000 SELECT DISTINCT.......................................    0.067s
+//	 980 - PRAGMA integrity_check......................................    0.436s            980 - PRAGMA integrity_check......................................    0.377s
+//	 990 - ANALYZE.....................................................    0.107s            990 - ANALYZE.....................................................    0.038s
+//	       TOTAL.......................................................    5.525s                  TOTAL.......................................................    4.637s
+//
+// This particular test executes 16.1% faster in the C version.
+//
+// # Changelog
+//
+// 2023-08-03 v1.25.0: enable SQLITE_ENABLE_DBSTAT_VTAB.
+//
+// 2023-07-11 v1.24.0:
+//
+// Add (*conn).{Serialize,Deserialize,NewBackup,NewRestore} methods, add Backup type.
+//
+// 2023-06-01 v1.23.0:
+//
+// Allow registering aggregate functions.
+//
+// 2023-04-22 v1.22.0:
+//
+// Support linux/s390x.
 //
 // 2023-02-23 v1.21.0:
 //
@@ -65,7 +133,7 @@
 //
 // Support scalar application defined functions written in Go.
 //
-//  https://www.sqlite.org/appfunc.html
+//	https://www.sqlite.org/appfunc.html
 //
 // 2022-03-13 v1.15.0:
 //
@@ -80,8 +148,6 @@
 //
 // Support freebsd/amd64.
 //
-// Changelog
-//
 // 2021-06-23 v1.11.0:
 //
 // Upgrade to use sqlite 3.36.0, release notes at https://www.sqlite.org/releaselog/3_36_0.html.
@@ -169,7 +235,7 @@
 //
 // 2017-06-05 Linux/Intel no more uses the VM (cznic/virtual).
 //
-// Connecting to a database
+// # Connecting to a database
 //
 // To access a Sqlite database do something like
 //
@@ -186,7 +252,7 @@
 //
 //	...
 //
-// Debug and development versions
+// # Debug and development versions
 //
 // A comma separated list of options can be passed to `go generate` via the
 // environment variable GO_GENERATE. Some useful options include for example:
@@ -201,7 +267,117 @@
 //
 // Note: To run `go generate` you need to have modernc.org/ccgo/v3 installed.
 //
-// Sqlite documentation
+// # Hacking
+//
+// This is an example of how to use the debug logs in modernc.org/libc when hunting a bug.
+//
+//	0:jnml@e5-1650:~/src/modernc.org/sqlite$ git status
+//	On branch master
+//	Your branch is up to date with 'origin/master'.
+//
+//	nothing to commit, working tree clean
+//	0:jnml@e5-1650:~/src/modernc.org/sqlite$ git log -1
+//	commit df33b8d15107f3cc777799c0fe105f74ef499e62 (HEAD -> master, tag: v1.21.1, origin/master, origin/HEAD, wips, ok)
+//	Author: Jan Mercl <0xjnml@gmail.com>
+//	Date:   Mon Mar 27 16:18:28 2023 +0200
+//
+//	    upgrade to SQLite 3.41.2
+//	0:jnml@e5-1650:~/src/modernc.org/sqlite$ rm -f /tmp/libc.log ; go test -v -tags=libc.dmesg -run TestScalar ; ls -l /tmp/libc.log
+//	test binary compiled for linux/amd64
+//	=== RUN   TestScalar
+//	--- PASS: TestScalar (0.09s)
+//	PASS
+//	ok  modernc.org/sqlite 0.128s
+//	-rw-r--r-- 1 jnml jnml 76 Apr  6 11:22 /tmp/libc.log
+//	0:jnml@e5-1650:~/src/modernc.org/sqlite$ cat /tmp/libc.log
+//	[10723 sqlite.test] 2023-04-06 11:22:48.288066057 +0200 CEST m=+0.000707150
+//	0:jnml@e5-1650:~/src/modernc.org/sqlite$
+//
+// The /tmp/libc.log file is created as requested. No useful messages there because none are enabled in libc. Let's try to enable Xwrite as an example.
+//
+//	0:jnml@e5-1650:~/src/modernc.org/libc$ git status
+//	On branch master
+//	Your branch is up to date with 'origin/master'.
+//
+//	Changes not staged for commit:
+//	  (use "git add <file>..." to update what will be committed)
+//	  (use "git restore <file>..." to discard changes in working directory)
+//	modified:   libc_linux.go
+//
+//	no changes added to commit (use "git add" and/or "git commit -a")
+//	0:jnml@e5-1650:~/src/modernc.org/libc$ git log -1
+//	commit 1e22c18cf2de8aa86d5b19b165f354f99c70479c (HEAD -> master, tag: v1.22.3, origin/master, origin/HEAD)
+//	Author: Jan Mercl <0xjnml@gmail.com>
+//	Date:   Wed Feb 22 20:27:45 2023 +0100
+//
+//	    support sqlite 3.41 on linux targets
+//	0:jnml@e5-1650:~/src/modernc.org/libc$ git diff
+//	diff --git a/libc_linux.go b/libc_linux.go
+//	index 1c2f482..ac1f08d 100644
+//	--- a/libc_linux.go
+//	+++ b/libc_linux.go
+//	@@ -332,19 +332,19 @@ func Xwrite(t *TLS, fd int32, buf uintptr, count types.Size_t) types.Ssize_t {
+//	                var n uintptr
+//	                switch n, _, err = unix.Syscall(unix.SYS_WRITE, uintptr(fd), buf, uintptr(count)); err {
+//	                case 0:
+//	-                       // if dmesgs {
+//	-                       //      // dmesg("%v: %d %#x: %#x\n%s", origin(1), fd, count, n, hex.Dump(GoBytes(buf, int(n))))
+//	-                       //      dmesg("%v: %d %#x: %#x", origin(1), fd, count, n)
+//	-                       // }
+//	+                       if dmesgs {
+//	+                               // dmesg("%v: %d %#x: %#x\n%s", origin(1), fd, count, n, hex.Dump(GoBytes(buf, int(n))))
+//	+                               dmesg("%v: %d %#x: %#x", origin(1), fd, count, n)
+//	+                       }
+//	                        return types.Ssize_t(n)
+//	                case errno.EAGAIN:
+//	                        // nop
+//	                }
+//	        }
+//
+//	-       // if dmesgs {
+//	-       //      dmesg("%v: fd %v, count %#x: %v", origin(1), fd, count, err)
+//	-       // }
+//	+       if dmesgs {
+//	+               dmesg("%v: fd %v, count %#x: %v", origin(1), fd, count, err)
+//	+       }
+//	        t.setErrno(err)
+//	        return -1
+//	 }
+//	0:jnml@e5-1650:~/src/modernc.org/libc$
+//
+// We need to tell the Go build system to use our local, patched/debug libc:
+//
+//	0:jnml@e5-1650:~/src/modernc.org/sqlite$ go work use $(go env GOPATH)/src/modernc.org/libc
+//	0:jnml@e5-1650:~/src/modernc.org/sqlite$ go work use .
+//
+// And run the test again:
+//
+//	0:jnml@e5-1650:~/src/modernc.org/sqlite$ rm -f /tmp/libc.log ; go test -v -tags=libc.dmesg -run TestScalar ; ls -l /tmp/libc.log
+//	test binary compiled for linux/amd64
+//	=== RUN   TestScalar
+//	--- PASS: TestScalar (0.26s)
+//	PASS
+//	ok   modernc.org/sqlite 0.285s
+//	-rw-r--r-- 1 jnml jnml 918 Apr  6 11:29 /tmp/libc.log
+//	0:jnml@e5-1650:~/src/modernc.org/sqlite$ cat /tmp/libc.log
+//	[11910 sqlite.test] 2023-04-06 11:29:13.143589542 +0200 CEST m=+0.000689270
+//	[11910 sqlite.test] libc_linux.go:337:Xwrite: 8 0x200: 0x200
+//	[11910 sqlite.test] libc_linux.go:337:Xwrite: 8 0xc: 0xc
+//	[11910 sqlite.test] libc_linux.go:337:Xwrite: 7 0x1000: 0x1000
+//	[11910 sqlite.test] libc_linux.go:337:Xwrite: 7 0x1000: 0x1000
+//	[11910 sqlite.test] libc_linux.go:337:Xwrite: 8 0x200: 0x200
+//	[11910 sqlite.test] libc_linux.go:337:Xwrite: 8 0x4: 0x4
+//	[11910 sqlite.test] libc_linux.go:337:Xwrite: 8 0x1000: 0x1000
+//	[11910 sqlite.test] libc_linux.go:337:Xwrite: 8 0x4: 0x4
+//	[11910 sqlite.test] libc_linux.go:337:Xwrite: 8 0x4: 0x4
+//	[11910 sqlite.test] libc_linux.go:337:Xwrite: 8 0x1000: 0x1000
+//	[11910 sqlite.test] libc_linux.go:337:Xwrite: 8 0x4: 0x4
+//	[11910 sqlite.test] libc_linux.go:337:Xwrite: 8 0xc: 0xc
+//	[11910 sqlite.test] libc_linux.go:337:Xwrite: 7 0x1000: 0x1000
+//	[11910 sqlite.test] libc_linux.go:337:Xwrite: 7 0x1000: 0x1000
+//	0:jnml@e5-1650:~/src/modernc.org/sqlite$
+//
+// # Sqlite documentation
 //
 // See https://sqlite.org/docs.html
 package sqlite // import "modernc.org/sqlite"
diff --git a/vendor/modernc.org/sqlite/generator.go b/vendor/modernc.org/sqlite/generator.go
index cd6437ca..f4386691 100644
--- a/vendor/modernc.org/sqlite/generator.go
+++ b/vendor/modernc.org/sqlite/generator.go
@@ -170,6 +170,7 @@ var (
 		"-DSQLITE_CORE",
 		"-DSQLITE_DEFAULT_MEMSTATUS=0",
 		"-DSQLITE_ENABLE_COLUMN_METADATA",
+		"-DSQLITE_ENABLE_DBSTAT_VTAB",
 		"-DSQLITE_ENABLE_FTS5",
 		"-DSQLITE_ENABLE_GEOPOLY",
 		"-DSQLITE_ENABLE_MATH_FUNCTIONS",
@@ -269,12 +270,12 @@ var (
 		sz       int
 		dev      bool
 	}{
-		{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, "https://www.sqlite.org/2023/sqlite-amalgamation-3410200.zip", 2457, false},
+		{sqliteSrcDir, "https://www.sqlite.org/2023/sqlite-src-3410200.zip", 12814, false},
 	}
 
-	sqliteDir    = filepath.FromSlash("testdata/sqlite-amalgamation-3410000")
-	sqliteSrcDir = filepath.FromSlash("testdata/sqlite-src-3410000")
+	sqliteDir    = filepath.FromSlash("testdata/sqlite-amalgamation-3410200")
+	sqliteSrcDir = filepath.FromSlash("testdata/sqlite-src-3410200")
 )
 
 func download() {
diff --git a/vendor/modernc.org/sqlite/issue120.diff b/vendor/modernc.org/sqlite/issue120.diff
new file mode 100644
index 00000000..e5160790
--- /dev/null
+++ b/vendor/modernc.org/sqlite/issue120.diff
@@ -0,0 +1,78 @@
+--- /home/jnml/tmp/test_syscall.c	2023-04-21 16:26:44.302689709 +0200
++++ testdata/sqlite-src-3410200/src/test_syscall.c	2023-04-21 16:29:28.000869993 +0200
+@@ -110,15 +110,15 @@
+ static int ts_fstat(int fd, struct stat *p);
+ static int ts_ftruncate(int fd, off_t n);
+ static int ts_fcntl(int fd, int cmd, ... );
+-static int ts_read(int fd, void *aBuf, size_t nBuf);
+-static int ts_pread(int fd, void *aBuf, size_t nBuf, off_t off);
++static ssize_t ts_read(int fd, void *aBuf, size_t nBuf);
++static ssize_t ts_pread(int fd, void *aBuf, size_t nBuf, off_t off);
+ /* Note:  pread64() and pwrite64() actually use off64_t as the type on their
+ ** last parameter.  But that datatype is not defined on many systems 
+ ** (ex: Mac, OpenBSD).  So substitute a likely equivalent: sqlite3_uint64 */
+-static int ts_pread64(int fd, void *aBuf, size_t nBuf, sqlite3_uint64 off);
+-static int ts_write(int fd, const void *aBuf, size_t nBuf);
+-static int ts_pwrite(int fd, const void *aBuf, size_t nBuf, off_t off);
+-static int ts_pwrite64(int fd, const void *aBuf, size_t nBuf, sqlite3_uint64 off);
++static ssize_t ts_pread64(int fd, void *aBuf, size_t nBuf, sqlite3_uint64 off);
++static ssize_t ts_write(int fd, const void *aBuf, size_t nBuf);
++static ssize_t ts_pwrite(int fd, const void *aBuf, size_t nBuf, off_t off);
++static ssize_t ts_pwrite64(int fd, const void *aBuf, size_t nBuf, sqlite3_uint64 off);
+ static int ts_fchmod(int fd, mode_t mode);
+ static int ts_fallocate(int fd, off_t off, off_t len);
+ static void *ts_mmap(void *, size_t, int, int, int, off_t);
+@@ -313,7 +313,7 @@
+ /*
+ ** A wrapper around read().
+ */
+-static int ts_read(int fd, void *aBuf, size_t nBuf){
++static ssize_t ts_read(int fd, void *aBuf, size_t nBuf){
+   if( tsIsFailErrno("read") ){
+     return -1;
+   }
+@@ -323,7 +323,7 @@
+ /*
+ ** A wrapper around pread().
+ */
+-static int ts_pread(int fd, void *aBuf, size_t nBuf, off_t off){
++static ssize_t ts_pread(int fd, void *aBuf, size_t nBuf, off_t off){
+   if( tsIsFailErrno("pread") ){
+     return -1;
+   }
+@@ -333,7 +333,7 @@
+ /*
+ ** A wrapper around pread64().
+ */
+-static int ts_pread64(int fd, void *aBuf, size_t nBuf, sqlite3_uint64 off){
++static ssize_t ts_pread64(int fd, void *aBuf, size_t nBuf, sqlite3_uint64 off){
+   if( tsIsFailErrno("pread64") ){
+     return -1;
+   }
+@@ -343,7 +343,7 @@
+ /*
+ ** A wrapper around write().
+ */
+-static int ts_write(int fd, const void *aBuf, size_t nBuf){
++static ssize_t ts_write(int fd, const void *aBuf, size_t nBuf){
+   if( tsIsFailErrno("write") ){
+     if( tsErrno("write")==EINTR ) orig_write(fd, aBuf, nBuf/2);
+     return -1;
+@@ -354,7 +354,7 @@
+ /*
+ ** A wrapper around pwrite().
+ */
+-static int ts_pwrite(int fd, const void *aBuf, size_t nBuf, off_t off){
++static ssize_t ts_pwrite(int fd, const void *aBuf, size_t nBuf, off_t off){
+   if( tsIsFailErrno("pwrite") ){
+     return -1;
+   }
+@@ -364,7 +364,7 @@
+ /*
+ ** A wrapper around pwrite64().
+ */
+-static int ts_pwrite64(int fd, const void *aBuf, size_t nBuf, sqlite3_uint64 off){
++static ssize_t ts_pwrite64(int fd, const void *aBuf, size_t nBuf, sqlite3_uint64 off){
+   if( tsIsFailErrno("pwrite64") ){
+     return -1;
+   }
diff --git a/vendor/modernc.org/sqlite/lib/capi_darwin_amd64.go b/vendor/modernc.org/sqlite/lib/capi_darwin_amd64.go
index 367cb141..9f03557d 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -225,6 +225,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3DbSpanDup":                             {},
 	"sqlite3DbStrDup":                              {},
 	"sqlite3DbStrNDup":                             {},
+	"sqlite3DbstatRegister":                        {},
 	"sqlite3DecOrHexToI64":                         {},
 	"sqlite3DefaultMutex":                          {},
 	"sqlite3DefaultRowEst":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_darwin_arm64.go b/vendor/modernc.org/sqlite/lib/capi_darwin_arm64.go
index 5b22e931..4839a0f1 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -225,6 +225,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3DbSpanDup":                             {},
 	"sqlite3DbStrDup":                              {},
 	"sqlite3DbStrNDup":                             {},
+	"sqlite3DbstatRegister":                        {},
 	"sqlite3DecOrHexToI64":                         {},
 	"sqlite3DefaultMutex":                          {},
 	"sqlite3DefaultRowEst":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_freebsd_386.go b/vendor/modernc.org/sqlite/lib/capi_freebsd_386.go
index 420a5353..6ef3f859 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -201,6 +201,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3DbSpanDup":                             {},
 	"sqlite3DbStrDup":                              {},
 	"sqlite3DbStrNDup":                             {},
+	"sqlite3DbstatRegister":                        {},
 	"sqlite3DecOrHexToI64":                         {},
 	"sqlite3DefaultMutex":                          {},
 	"sqlite3DefaultRowEst":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_freebsd_amd64.go b/vendor/modernc.org/sqlite/lib/capi_freebsd_amd64.go
index 4cd04252..859742d2 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -201,6 +201,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3DbSpanDup":                             {},
 	"sqlite3DbStrDup":                              {},
 	"sqlite3DbStrNDup":                             {},
+	"sqlite3DbstatRegister":                        {},
 	"sqlite3DecOrHexToI64":                         {},
 	"sqlite3DefaultMutex":                          {},
 	"sqlite3DefaultRowEst":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_freebsd_arm.go b/vendor/modernc.org/sqlite/lib/capi_freebsd_arm.go
index cd59687d..2acf5112 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -201,6 +201,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3DbSpanDup":                             {},
 	"sqlite3DbStrDup":                              {},
 	"sqlite3DbStrNDup":                             {},
+	"sqlite3DbstatRegister":                        {},
 	"sqlite3DecOrHexToI64":                         {},
 	"sqlite3DefaultMutex":                          {},
 	"sqlite3DefaultRowEst":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_freebsd_arm64.go b/vendor/modernc.org/sqlite/lib/capi_freebsd_arm64.go
index 4cd04252..859742d2 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -201,6 +201,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3DbSpanDup":                             {},
 	"sqlite3DbStrDup":                              {},
 	"sqlite3DbStrNDup":                             {},
+	"sqlite3DbstatRegister":                        {},
 	"sqlite3DecOrHexToI64":                         {},
 	"sqlite3DefaultMutex":                          {},
 	"sqlite3DefaultRowEst":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_linux_386.go b/vendor/modernc.org/sqlite/lib/capi_linux_386.go
index bb0fd5e8..8748a323 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -201,6 +201,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3DbSpanDup":                             {},
 	"sqlite3DbStrDup":                              {},
 	"sqlite3DbStrNDup":                             {},
+	"sqlite3DbstatRegister":                        {},
 	"sqlite3DecOrHexToI64":                         {},
 	"sqlite3DefaultMutex":                          {},
 	"sqlite3DefaultRowEst":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_linux_amd64.go b/vendor/modernc.org/sqlite/lib/capi_linux_amd64.go
index ef86ef7f..7674268a 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -201,6 +201,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3DbSpanDup":                             {},
 	"sqlite3DbStrDup":                              {},
 	"sqlite3DbStrNDup":                             {},
+	"sqlite3DbstatRegister":                        {},
 	"sqlite3DecOrHexToI64":                         {},
 	"sqlite3DefaultMutex":                          {},
 	"sqlite3DefaultRowEst":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_linux_arm.go b/vendor/modernc.org/sqlite/lib/capi_linux_arm.go
index e7e52e78..31a951ad 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -201,6 +201,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3DbSpanDup":                             {},
 	"sqlite3DbStrDup":                              {},
 	"sqlite3DbStrNDup":                             {},
+	"sqlite3DbstatRegister":                        {},
 	"sqlite3DecOrHexToI64":                         {},
 	"sqlite3DefaultMutex":                          {},
 	"sqlite3DefaultRowEst":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_linux_arm64.go b/vendor/modernc.org/sqlite/lib/capi_linux_arm64.go
index 98b1031f..e5ffa95c 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -201,6 +201,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3DbSpanDup":                             {},
 	"sqlite3DbStrDup":                              {},
 	"sqlite3DbStrNDup":                             {},
+	"sqlite3DbstatRegister":                        {},
 	"sqlite3DecOrHexToI64":                         {},
 	"sqlite3DefaultMutex":                          {},
 	"sqlite3DefaultRowEst":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_linux_ppc64le.go b/vendor/modernc.org/sqlite/lib/capi_linux_ppc64le.go
index 0b4e2e1a..c0278c3f 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -201,6 +201,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3DbSpanDup":                             {},
 	"sqlite3DbStrDup":                              {},
 	"sqlite3DbStrNDup":                             {},
+	"sqlite3DbstatRegister":                        {},
 	"sqlite3DecOrHexToI64":                         {},
 	"sqlite3DefaultMutex":                          {},
 	"sqlite3DefaultRowEst":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_linux_riscv64.go b/vendor/modernc.org/sqlite/lib/capi_linux_riscv64.go
index eaded130..b4e29d9c 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -201,6 +201,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3DbSpanDup":                             {},
 	"sqlite3DbStrDup":                              {},
 	"sqlite3DbStrNDup":                             {},
+	"sqlite3DbstatRegister":                        {},
 	"sqlite3DecOrHexToI64":                         {},
 	"sqlite3DefaultMutex":                          {},
 	"sqlite3DefaultRowEst":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_linux_s390x.go b/vendor/modernc.org/sqlite/lib/capi_linux_s390x.go
index 4a6842a2..7e2a8bc7 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -201,6 +201,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3DbSpanDup":                             {},
 	"sqlite3DbStrDup":                              {},
 	"sqlite3DbStrNDup":                             {},
+	"sqlite3DbstatRegister":                        {},
 	"sqlite3DecOrHexToI64":                         {},
 	"sqlite3DefaultMutex":                          {},
 	"sqlite3DefaultRowEst":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_openbsd_amd64.go b/vendor/modernc.org/sqlite/lib/capi_openbsd_amd64.go
index 64643835..6fa5c38e 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -200,6 +200,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3DbSpanDup":                             {},
 	"sqlite3DbStrDup":                              {},
 	"sqlite3DbStrNDup":                             {},
+	"sqlite3DbstatRegister":                        {},
 	"sqlite3DecOrHexToI64":                         {},
 	"sqlite3DefaultMutex":                          {},
 	"sqlite3DefaultRowEst":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_openbsd_arm64.go b/vendor/modernc.org/sqlite/lib/capi_openbsd_arm64.go
index 3e0fb802..cc8c800c 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -200,6 +200,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3DbSpanDup":                             {},
 	"sqlite3DbStrDup":                              {},
 	"sqlite3DbStrNDup":                             {},
+	"sqlite3DbstatRegister":                        {},
 	"sqlite3DecOrHexToI64":                         {},
 	"sqlite3DefaultMutex":                          {},
 	"sqlite3DefaultRowEst":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_windows_amd64.go b/vendor/modernc.org/sqlite/lib/capi_windows_amd64.go
index 068f7ca1..dffac7be 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -205,6 +205,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3DbSpanDup":                             {},
 	"sqlite3DbStrDup":                              {},
 	"sqlite3DbStrNDup":                             {},
+	"sqlite3DbstatRegister":                        {},
 	"sqlite3DecOrHexToI64":                         {},
 	"sqlite3DefaultMutex":                          {},
 	"sqlite3DefaultRowEst":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_windows_arm64.go b/vendor/modernc.org/sqlite/lib/capi_windows_arm64.go
index 068f7ca1..dffac7be 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -205,6 +205,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3DbSpanDup":                             {},
 	"sqlite3DbStrDup":                              {},
 	"sqlite3DbStrNDup":                             {},
+	"sqlite3DbstatRegister":                        {},
 	"sqlite3DecOrHexToI64":                         {},
 	"sqlite3DefaultMutex":                          {},
 	"sqlite3DefaultRowEst":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/mutex.go b/vendor/modernc.org/sqlite/lib/mutex.go
index be44263a..4dd679a3 100644
--- a/vendor/modernc.org/sqlite/lib/mutex.go
+++ b/vendor/modernc.org/sqlite/lib/mutex.go
@@ -92,13 +92,17 @@ func mutexFromPtr(p uintptr) *mutex {
 	if p == 0 {
 		return nil
 	}
+
 	ix := p - 1
+
+	mutexes.Lock()
+	defer mutexes.Unlock()
+
 	return &mutexes.a[ix>>8][ix&255]
 }
 
 func (m *mutexPool) alloc(recursive bool) uintptr {
 	m.Lock()
-
 	defer m.Unlock()
 
 	n := len(m.freeList)
@@ -124,8 +128,8 @@ func (m *mutexPool) free(p uintptr) {
 	ptr := mutexFromPtr(p)
 	ix := ptr.poolIndex
 	*ptr = mutex{}
-	m.Lock()
 
+	m.Lock()
 	defer m.Unlock()
 
 	m.freeList = append(m.freeList, ix)
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_darwin_amd64.go b/vendor/modernc.org/sqlite/lib/sqlite_darwin_amd64.go
index be1a6768..0d379f76 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -388,6 +388,7 @@ const (
 	DBFLAG_SchemaKnownOk                          = 0x0010
 	DBFLAG_Vacuum                                 = 0x0004
 	DBFLAG_VacuumInto                             = 0x0008
+	DBSTAT_PAGE_PADDING_BYTES                     = 256
 	DB_ResetWanted                                = 0x0008
 	DB_SchemaLoaded                               = 0x0001
 	DB_UnresetViews                               = 0x0002
@@ -1203,11 +1204,11 @@ const (
 	NC_OrderAgg                                   = 0x8000000
 	NC_PartIdx                                    = 0x000002
 	NC_SelfRef                                    = 0x00002e
+	NC_Subquery                                   = 0x000040
 	NC_UAggInfo                                   = 0x000100
 	NC_UBaseReg                                   = 0x000400
 	NC_UEList                                     = 0x000080
 	NC_UUpsert                                    = 0x000200
-	NC_VarSelect                                  = 0x000040
 	NDEBUG                                        = 1
 	NFSV2_MAX_FH_SIZE                             = 32
 	NFSV3_MAX_FH_SIZE                             = 64
@@ -2137,6 +2138,7 @@ const (
 	SQLITE_ECEL_REF                               = 0x04
 	SQLITE_EMPTY                                  = 16
 	SQLITE_ENABLE_COLUMN_METADATA                 = 1
+	SQLITE_ENABLE_DBSTAT_VTAB                     = 1
 	SQLITE_ENABLE_FTS5                            = 1
 	SQLITE_ENABLE_GEOPOLY                         = 1
 	SQLITE_ENABLE_LOCKING_STYLE                   = 1
@@ -2537,7 +2539,7 @@ const (
 	SQLITE_SHM_UNLOCK                             = 1
 	SQLITE_SORTER_PMASZ                           = 250
 	SQLITE_SOUNDEX                                = 1
-	SQLITE_SOURCE_ID                              = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
+	SQLITE_SOURCE_ID                              = "2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da"
 	SQLITE_SO_ASC                                 = 0
 	SQLITE_SO_DESC                                = 1
 	SQLITE_SO_UNDEFINED                           = -1
@@ -2645,8 +2647,8 @@ const (
 	SQLITE_UTF8                                   = 1
 	SQLITE_VDBEINT_H                              = 0
 	SQLITE_VDBE_H                                 = 0
-	SQLITE_VERSION                                = "3.41.0"
-	SQLITE_VERSION_NUMBER                         = 3041000
+	SQLITE_VERSION                                = "3.41.2"
+	SQLITE_VERSION_NUMBER                         = 3041002
 	SQLITE_VTABRISK_High                          = 2
 	SQLITE_VTABRISK_Low                           = 0
 	SQLITE_VTABRISK_Normal                        = 1
@@ -8736,7 +8738,8 @@ type IndexedExpr1 = struct {
 	FiIdxCur       int32
 	FiIdxCol       int32
 	FbMaybeNullRow U8
-	F__ccgo_pad1   [3]byte
+	Faff           U8
+	F__ccgo_pad1   [2]byte
 	FpIENext       uintptr
 }
 
@@ -9378,17 +9381,18 @@ type Pager = Pager1
 
 // Handle type for pages.
 type PgHdr2 = struct {
-	FpPage      uintptr
-	FpData      uintptr
-	FpExtra     uintptr
-	FpCache     uintptr
-	FpDirty     uintptr
-	FpPager     uintptr
-	Fpgno       Pgno
-	Fflags      U16
-	FnRef       I16
-	FpDirtyNext uintptr
-	FpDirtyPrev uintptr
+	FpPage       uintptr
+	FpData       uintptr
+	FpExtra      uintptr
+	FpCache      uintptr
+	FpDirty      uintptr
+	FpPager      uintptr
+	Fpgno        Pgno
+	Fflags       U16
+	F__ccgo_pad1 [2]byte
+	FnRef        I64
+	FpDirtyNext  uintptr
+	FpDirtyPrev  uintptr
 }
 
 // Handle type for pages.
@@ -9609,14 +9613,14 @@ type PCache2 = struct {
 	FpDirty      uintptr
 	FpDirtyTail  uintptr
 	FpSynced     uintptr
-	FnRefSum     int32
+	FnRefSum     I64
 	FszCache     int32
 	FszSpill     int32
 	FszPage      int32
 	FszExtra     int32
 	FbPurgeable  U8
 	FeCreate     U8
-	F__ccgo_pad1 [2]byte
+	F__ccgo_pad1 [6]byte
 	FxStress     uintptr
 	FpStress     uintptr
 	FpCache      uintptr
@@ -9875,7 +9879,7 @@ type CoveringIndexCheck1 = struct {
 	F__ccgo_pad1 [2]byte
 }
 
-var sqlite3azCompileOpt = [52]uintptr{
+var sqlite3azCompileOpt = [53]uintptr{
 	ts + 7,
 	ts + 27,
 	ts + 49,
@@ -9894,40 +9898,41 @@ var sqlite3azCompileOpt = [52]uintptr{
 	ts + 365,
 	ts + 390,
 	ts + 413,
-	ts + 425,
-	ts + 440,
-	ts + 462,
-	ts + 487,
-	ts + 510,
-	ts + 532,
-	ts + 543,
-	ts + 556,
-	ts + 571,
-	ts + 587,
-	ts + 600,
-	ts + 621,
-	ts + 645,
-	ts + 668,
-	ts + 684,
-	ts + 700,
-	ts + 724,
-	ts + 751,
-	ts + 771,
-	ts + 792,
-	ts + 814,
-	ts + 844,
-	ts + 869,
-	ts + 895,
-	ts + 915,
-	ts + 941,
-	ts + 964,
-	ts + 990,
-	ts + 1012,
-	ts + 1033,
-	ts + 1044,
+	ts + 432,
+	ts + 444,
+	ts + 459,
+	ts + 481,
+	ts + 506,
+	ts + 529,
+	ts + 551,
+	ts + 562,
+	ts + 575,
+	ts + 590,
+	ts + 606,
+	ts + 619,
+	ts + 640,
+	ts + 664,
+	ts + 687,
+	ts + 703,
+	ts + 719,
+	ts + 743,
+	ts + 770,
+	ts + 790,
+	ts + 811,
+	ts + 833,
+	ts + 863,
+	ts + 888,
+	ts + 914,
+	ts + 934,
+	ts + 960,
+	ts + 983,
+	ts + 1009,
+	ts + 1031,
 	ts + 1052,
-	ts + 1066,
-	ts + 1079,
+	ts + 1063,
+	ts + 1071,
+	ts + 1085,
+	ts + 1098,
 }
 
 func Xsqlite3CompileOptions(tls *libc.TLS, pnOpt uintptr) uintptr {
@@ -10079,7 +10084,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 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))
+var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1111))
 
 // Standard typenames.  These names must match the COLTYPE_* definitions.
 // Adjust the SQLITE_N_STDTYPE value if adding or removing entries.
@@ -10101,12 +10106,12 @@ var Xsqlite3StdTypeAffinity = [6]int8{
 	int8(SQLITE_AFF_TEXT),
 }
 var Xsqlite3StdType = [6]uintptr{
-	ts + 1099,
-	ts + 1103,
-	ts + 1108,
-	ts + 1112,
-	ts + 1120,
-	ts + 1125,
+	ts + 1118,
+	ts + 1122,
+	ts + 1127,
+	ts + 1131,
+	ts + 1139,
+	ts + 1144,
 }
 
 // SQL is translated into a sequence of instructions to be
@@ -10423,7 +10428,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, 23229)
+		return Xsqlite3MisuseError(tls, 23233)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -10963,7 +10968,7 @@ __6:
 __4:
 	;
 	zDate++
-	if !(getDigits(tls, zDate, ts+1130, libc.VaList(bp, bp+16, bp+20)) != 2) {
+	if !(getDigits(tls, zDate, ts+1149, libc.VaList(bp, bp+16, bp+20)) != 2) {
 		goto __9
 	}
 	return 1
@@ -10989,13 +10994,13 @@ func parseHhMmSs(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	defer tls.Free(36)
 
 	var ms float64 = 0.0
-	if getDigits(tls, zDate, ts+1138, libc.VaList(bp, bp+24, bp+28)) != 2 {
+	if getDigits(tls, zDate, ts+1157, libc.VaList(bp, bp+24, bp+28)) != 2 {
 		return 1
 	}
 	zDate += uintptr(5)
 	if int32(*(*int8)(unsafe.Pointer(zDate))) == ':' {
 		zDate++
-		if getDigits(tls, zDate, ts+1146, libc.VaList(bp+16, bp+32)) != 1 {
+		if getDigits(tls, zDate, ts+1165, libc.VaList(bp+16, bp+32)) != 1 {
 			return 1
 		}
 		zDate += uintptr(2)
@@ -11093,7 +11098,7 @@ func parseYyyyMmDd(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	} else {
 		neg = 0
 	}
-	if getDigits(tls, zDate, ts+1150, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
+	if getDigits(tls, zDate, ts+1169, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
 		return 1
 	}
 	zDate += uintptr(10)
@@ -11150,7 +11155,7 @@ func parseDateOrTime(tls *libc.TLS, context uintptr, zDate uintptr, p uintptr) i
 		return 0
 	} else if parseHhMmSs(tls, zDate, p) == 0 {
 		return 0
-	} else if Xsqlite3StrICmp(tls, zDate, ts+1162) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
+	} else if Xsqlite3StrICmp(tls, zDate, ts+1181) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
 		return setDateTimeToCurrent(tls, context, p)
 	} else if Xsqlite3AtoF(tls, zDate, bp, Xsqlite3Strlen30(tls, zDate), uint8(SQLITE_UTF8)) > 0 {
 		setRawDateNumber(tls, p, *(*float64)(unsafe.Pointer(bp)))
@@ -11283,7 +11288,7 @@ func toLocaltime(tls *libc.TLS, p uintptr, pCtx uintptr) int32 {
 		*(*Time_t)(unsafe.Pointer(bp + 104)) = (*DateTime)(unsafe.Pointer(p)).FiJD/int64(1000) - int64(21086676)*int64(10000)
 	}
 	if osLocaltime(tls, bp+104, bp) != 0 {
-		Xsqlite3_result_error(tls, pCtx, ts+1166, -1)
+		Xsqlite3_result_error(tls, pCtx, ts+1185, -1)
 		return SQLITE_ERROR
 	}
 	(*DateTime)(unsafe.Pointer(p)).FY = (*tm)(unsafe.Pointer(bp)).Ftm_year + 1900 - iYearDiff
@@ -11307,12 +11312,12 @@ var aXformType = [6]struct {
 	FrLimit float32
 	FrXform float32
 }{
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1189)), FrLimit: 4.6427e+14, FrXform: 1.0},
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1196)), FrLimit: 7.7379e+12, FrXform: 60.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1203)), FrLimit: 1.2897e+11, FrXform: 3600.0},
-	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1210)), FrLimit: 5373485.0, FrXform: 86400.0},
-	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1217)), FrLimit: 176546.0, FrXform: 2592000.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1224)), FrLimit: 14713.0, FrXform: 31536000.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1208)), FrLimit: 4.6427e+14, FrXform: 1.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1215)), FrLimit: 7.7379e+12, FrXform: 60.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1222)), FrLimit: 1.2897e+11, FrXform: 3600.0},
+	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1229)), FrLimit: 5373485.0, FrXform: 86400.0},
+	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1236)), FrLimit: 176546.0, FrXform: 2592000.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1243)), FrLimit: 14713.0, FrXform: 31536000.0},
 }
 
 func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, idx int32) int32 {
@@ -11324,7 +11329,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 	switch int32(Xsqlite3UpperToLower[U8(*(*int8)(unsafe.Pointer(z)))]) {
 	case 'a':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1231) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1250) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -11346,7 +11351,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'j':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1236) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1255) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -11360,7 +11365,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'l':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1246) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1265) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				rc = toLocaltime(tls, p, pCtx)
 			}
 			break
@@ -11368,7 +11373,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'u':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1256) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1275) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -11380,7 +11385,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 					rc = 0
 				}
-			} else if Xsqlite3_stricmp(tls, z, ts+1266) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1285) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				if int32((*DateTime)(unsafe.Pointer(p)).FtzSet) == 0 {
 					var iOrigJD I64
 					var iGuess I64
@@ -11414,7 +11419,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'w':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1270, 8) == 0 &&
+			if Xsqlite3_strnicmp(tls, z, ts+1289, 8) == 0 &&
 				Xsqlite3AtoF(tls, z+8, bp+48, Xsqlite3Strlen30(tls, z+8), uint8(SQLITE_UTF8)) > 0 &&
 				*(*float64)(unsafe.Pointer(bp + 48)) >= 0.0 && *(*float64)(unsafe.Pointer(bp + 48)) < 7.0 && float64(libc.AssignInt32(&n, int32(*(*float64)(unsafe.Pointer(bp + 48))))) == *(*float64)(unsafe.Pointer(bp + 48)) {
 				var Z Sqlite3_int64
@@ -11435,7 +11440,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 's':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1279, 9) != 0 {
+			if Xsqlite3_strnicmp(tls, z, ts+1298, 9) != 0 {
 				break
 			}
 			if !(int32((*DateTime)(unsafe.Pointer(p)).FvalidJD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidYMD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidHMS) != 0) {
@@ -11449,14 +11454,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 			(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidTZ = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidJD = int8(0)
-			if Xsqlite3_stricmp(tls, z, ts+1289) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1308) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1295) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1314) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FM = 1
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1300) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1319) == 0 {
 				rc = 0
 			}
 			break
@@ -11782,7 +11787,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		switch int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) {
 		case 'd':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
 				break
 
 			}
@@ -11792,13 +11797,13 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if s > 59.999 {
 					s = 59.999
 				}
-				Xsqlite3_str_appendf(tls, bp+136, ts+1309, libc.VaList(bp+8, s))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1328, libc.VaList(bp+8, s))
 				break
 
 			}
 		case 'H':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
 				break
 
 			}
@@ -11816,41 +11821,41 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) == 'W' {
 					var wd int32
 					wd = int32(((*DateTime)(unsafe.Pointer(bp+88)).FiJD + int64(43200000)) / int64(86400000) % int64(7))
-					Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+24, (nDay+7-wd)/7))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+24, (nDay+7-wd)/7))
 				} else {
-					Xsqlite3_str_appendf(tls, bp+136, ts+1316, libc.VaList(bp+32, nDay+1))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1335, libc.VaList(bp+32, nDay+1))
 				}
 				break
 
 			}
 		case 'J':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1321, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1340, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
 				break
 
 			}
 		case 'm':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
 				break
 
 			}
 		case 'M':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
 				break
 
 			}
 		case 's':
 			{
 				var iS I64 = (*DateTime)(unsafe.Pointer(bp+88)).FiJD/int64(1000) - int64(21086676)*int64(10000)
-				Xsqlite3_str_appendf(tls, bp+136, ts+1327, libc.VaList(bp+64, iS))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1346, libc.VaList(bp+64, iS))
 				break
 
 			}
 		case 'S':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
 				break
 
 			}
@@ -11863,7 +11868,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			}
 		case 'Y':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1332, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1351, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
 				break
 
 			}
@@ -11913,15 +11918,15 @@ func Xsqlite3RegisterDateTimeFunctions(tls *libc.TLS) {
 }
 
 var aDateTimeFuncs = [9]FuncDef{
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1236},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1256},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1337},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1342},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1347},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1255},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1275},
 	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1356},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1365},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1378},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1396}}
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1361},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1366},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1375},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1384},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1397},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1415}}
 
 // The following routines are convenience wrappers around methods
 // of the sqlite3_file object.  This is mostly just syntactic sugar. All
@@ -12336,7 +12341,7 @@ func sqlite3MemMalloc(tls *libc.TLS, nByte int32) uintptr {
 		*(*Sqlite3_int64)(unsafe.Pointer(p)) = Sqlite3_int64(nByte)
 		p += 8
 	} else {
-		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1409, libc.VaList(bp, nByte))
+		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1428, libc.VaList(bp, nByte))
 	}
 	return p
 }
@@ -12369,7 +12374,7 @@ func sqlite3MemRealloc(tls *libc.TLS, pPrior uintptr, nByte int32) uintptr {
 		p += 8
 	} else {
 		Xsqlite3_log(tls, SQLITE_NOMEM,
-			ts+1447,
+			ts+1466,
 			libc.VaList(bp, sqlite3MemSize(tls, pPrior), nByte))
 	}
 	return p
@@ -13245,7 +13250,7 @@ func Xsqlite3OomFault(tls *libc.TLS, db uintptr) uintptr {
 		(*Sqlite3)(unsafe.Pointer(db)).Flookaside.Fsz = U16(0)
 		if (*Sqlite3)(unsafe.Pointer(db)).FpParse != 0 {
 			var pParse uintptr
-			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1483, 0)
+			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1502, 0)
 			(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 			for pParse = (*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).FpOuterParse; pParse != 0; pParse = (*Parse)(unsafe.Pointer(pParse)).FpOuterParse {
 				(*Parse)(unsafe.Pointer(pParse)).FnErr++
@@ -13318,8 +13323,8 @@ type et_info = struct {
 // by an instance of the following structure
 type Et_info = et_info
 
-var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1497))
-var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1530))
+var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1516))
+var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1549))
 var fmtinfo = [23]Et_info{
 	{Ffmttype: int8('d'), Fbase: EtByte(10), Fflags: EtByte(1), Ftype: EtByte(EtDECIMAL)},
 	{Ffmttype: int8('s'), Fflags: EtByte(4), Ftype: EtByte(EtSTRING)},
@@ -13533,7 +13538,7 @@ __6:
 	if !(libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(libc.PreIncUintptr(&fmt, 1))))) == 0) {
 		goto __11
 	}
-	Xsqlite3_str_append(tls, pAccum, ts+1537, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1556, 1)
 	goto __5
 __11:
 	;
@@ -14094,7 +14099,7 @@ __125:
 	if !(Xsqlite3IsNaN(tls, *(*float64)(unsafe.Pointer(bp + 104))) != 0) {
 		goto __127
 	}
-	bufpt = ts + 1539
+	bufpt = ts + 1558
 	length = 3
 	goto __58
 __127:
@@ -14154,7 +14159,7 @@ __138:
 	}
 	bufpt = bp + 16
 	*(*int8)(unsafe.Pointer(bp + 16)) = prefix
-	libc.X__builtin___memcpy_chk(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1543, uint64(4), libc.X__builtin_object_size(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), 0))
+	libc.X__builtin___memcpy_chk(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1562, uint64(4), libc.X__builtin_object_size(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), 0))
 	length = 3 + libc.Bool32(int32(prefix) != 0)
 	goto __58
 __139:
@@ -14520,7 +14525,7 @@ __200:
 	if !(bufpt == uintptr(0)) {
 		goto __201
 	}
-	bufpt = ts + 1547
+	bufpt = ts + 1566
 	goto __202
 __201:
 	if !(int32(xtype) == EtDYNSTRING) {
@@ -14644,9 +14649,9 @@ __222:
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
-			return ts + 1548
+			return ts + 1567
 		}
-		return ts + 1553
+		return ts + 1572
 	}()
 __223:
 	;
@@ -14794,7 +14799,7 @@ __246:
 		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
-	Xsqlite3_str_append(tls, pAccum, ts+1560, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1579, 1)
 __250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
@@ -14811,10 +14816,10 @@ __251:
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
 		goto __253
 	}
-	Xsqlite3_str_appendf(tls, pAccum, ts+1562, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1581, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 	goto __254
 __253:
-	Xsqlite3_str_appendf(tls, pAccum, ts+1572, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1591, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
 __254:
 	;
 __252:
@@ -14869,7 +14874,7 @@ __4:
 __5:
 }
 
-var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1586))
+var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1605))
 
 // The z string points to the first character of a token that is
 // associated with an error.  If db does not already have an error
@@ -15034,7 +15039,7 @@ func Xsqlite3ResultStrAccum(tls *libc.TLS, pCtx uintptr, p uintptr) {
 	} else if int32((*StrAccum)(unsafe.Pointer(p)).FprintfFlags)&SQLITE_PRINTF_MALLOCED != 0 {
 		Xsqlite3_result_text(tls, pCtx, (*StrAccum)(unsafe.Pointer(p)).FzText, int32((*StrAccum)(unsafe.Pointer(p)).FnChar), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 	} else {
-		Xsqlite3_result_text(tls, pCtx, ts+1547, 0, uintptr(0))
+		Xsqlite3_result_text(tls, pCtx, ts+1566, 0, uintptr(0))
 		Xsqlite3_str_reset(tls, p)
 	}
 }
@@ -16868,7 +16873,7 @@ func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
 	var c int32 = 0
 	var i int32
 
-	var pow63 uintptr = ts + 1595
+	var pow63 uintptr = ts + 1614
 	for i = 0; c == 0 && i < 18; i++ {
 		c = (int32(*(*int8)(unsafe.Pointer(zNum + uintptr(i*incr)))) - int32(*(*int8)(unsafe.Pointer(pow63 + uintptr(i))))) * 10
 	}
@@ -17414,7 +17419,7 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 	defer tls.Free(8)
 
 	Xsqlite3_log(tls, SQLITE_MISUSE,
-		ts+1614,
+		ts+1633,
 		libc.VaList(bp, zType))
 }
 
@@ -17433,13 +17438,13 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 func Xsqlite3SafetyCheckOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	if db == uintptr(0) {
-		logBadConnection(tls, ts+1548)
+		logBadConnection(tls, ts+1567)
 		return 0
 	}
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_OPEN {
 		if Xsqlite3SafetyCheckSickOrOk(tls, db) != 0 {
-			logBadConnection(tls, ts+1659)
+			logBadConnection(tls, ts+1678)
 		}
 		return 0
 	} else {
@@ -17452,7 +17457,7 @@ func Xsqlite3SafetyCheckSickOrOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_SICK && int32(eOpenState) != SQLITE_STATE_OPEN && int32(eOpenState) != SQLITE_STATE_BUSY {
-		logBadConnection(tls, ts+1668)
+		logBadConnection(tls, ts+1687)
 		return 0
 	} else {
 		return 1
@@ -17978,193 +17983,193 @@ func Xsqlite3OpcodeName(tls *libc.TLS, i int32) uintptr {
 }
 
 var azName = [187]uintptr{
-	ts + 1676,
-	ts + 1686,
-	ts + 1697,
-	ts + 1709,
-	ts + 1720,
-	ts + 1732,
+	ts + 1695,
+	ts + 1705,
+	ts + 1716,
+	ts + 1728,
 	ts + 1739,
-	ts + 1747,
-	ts + 1755,
-	ts + 1760,
-	ts + 1765,
-	ts + 1771,
-	ts + 1785,
-	ts + 1791,
-	ts + 1801,
-	ts + 1806,
-	ts + 1811,
-	ts + 1814,
+	ts + 1751,
+	ts + 1758,
+	ts + 1766,
+	ts + 1774,
+	ts + 1779,
+	ts + 1784,
+	ts + 1790,
+	ts + 1804,
+	ts + 1810,
 	ts + 1820,
-	ts + 1827,
-	ts + 1831,
-	ts + 1841,
-	ts + 1848,
-	ts + 1855,
-	ts + 1862,
-	ts + 1869,
-	ts + 1879,
+	ts + 1825,
+	ts + 1830,
+	ts + 1833,
+	ts + 1839,
+	ts + 1846,
+	ts + 1850,
+	ts + 1860,
+	ts + 1867,
+	ts + 1874,
+	ts + 1881,
 	ts + 1888,
-	ts + 1899,
-	ts + 1908,
-	ts + 1914,
-	ts + 1924,
-	ts + 1934,
-	ts + 1939,
-	ts + 1949,
-	ts + 1960,
-	ts + 1965,
-	ts + 1972,
-	ts + 1983,
-	ts + 1988,
-	ts + 1993,
-	ts + 1999,
-	ts + 2005,
-	ts + 2011,
-	ts + 2014,
+	ts + 1898,
+	ts + 1907,
+	ts + 1918,
+	ts + 1927,
+	ts + 1933,
+	ts + 1943,
+	ts + 1953,
+	ts + 1958,
+	ts + 1968,
+	ts + 1979,
+	ts + 1984,
+	ts + 1991,
+	ts + 2002,
+	ts + 2007,
+	ts + 2012,
 	ts + 2018,
 	ts + 2024,
-	ts + 2035,
-	ts + 2046,
+	ts + 2030,
+	ts + 2033,
+	ts + 2037,
+	ts + 2043,
 	ts + 2054,
-	ts + 2063,
-	ts + 2070,
-	ts + 2078,
-	ts + 2081,
-	ts + 2084,
-	ts + 2087,
-	ts + 2090,
-	ts + 2093,
-	ts + 2096,
+	ts + 2065,
+	ts + 2073,
+	ts + 2082,
+	ts + 2089,
+	ts + 2097,
+	ts + 2100,
 	ts + 2103,
+	ts + 2106,
 	ts + 2109,
-	ts + 2119,
-	ts + 2132,
-	ts + 2143,
-	ts + 2149,
-	ts + 2156,
-	ts + 2165,
-	ts + 2174,
-	ts + 2181,
-	ts + 2194,
-	ts + 2205,
-	ts + 2210,
-	ts + 2218,
+	ts + 2112,
+	ts + 2115,
+	ts + 2122,
+	ts + 2128,
+	ts + 2138,
+	ts + 2151,
+	ts + 2162,
+	ts + 2168,
+	ts + 2175,
+	ts + 2184,
+	ts + 2193,
+	ts + 2200,
+	ts + 2213,
 	ts + 2224,
-	ts + 2231,
+	ts + 2229,
+	ts + 2237,
 	ts + 2243,
-	ts + 2248,
-	ts + 2257,
+	ts + 2250,
 	ts + 2262,
-	ts + 2271,
+	ts + 2267,
 	ts + 2276,
 	ts + 2281,
-	ts + 2287,
+	ts + 2290,
 	ts + 2295,
-	ts + 2303,
-	ts + 2313,
-	ts + 2321,
-	ts + 2328,
-	ts + 2341,
-	ts + 2346,
-	ts + 2358,
-	ts + 2366,
-	ts + 2373,
-	ts + 2384,
-	ts + 2391,
-	ts + 2398,
-	ts + 2408,
+	ts + 2300,
+	ts + 2306,
+	ts + 2314,
+	ts + 2322,
+	ts + 2332,
+	ts + 2340,
+	ts + 2347,
+	ts + 2360,
+	ts + 2365,
+	ts + 2377,
+	ts + 2385,
+	ts + 2392,
+	ts + 2403,
+	ts + 2410,
 	ts + 2417,
-	ts + 2428,
-	ts + 2434,
-	ts + 2445,
-	ts + 2455,
-	ts + 2465,
-	ts + 2472,
-	ts + 2478,
-	ts + 2488,
-	ts + 2499,
-	ts + 2503,
-	ts + 2512,
-	ts + 2521,
-	ts + 2528,
-	ts + 2538,
-	ts + 2545,
-	ts + 2554,
+	ts + 2427,
+	ts + 2436,
+	ts + 2447,
+	ts + 2453,
+	ts + 2464,
+	ts + 2474,
+	ts + 2484,
+	ts + 2491,
+	ts + 2497,
+	ts + 2507,
+	ts + 2518,
+	ts + 2522,
+	ts + 2531,
+	ts + 2540,
+	ts + 2547,
+	ts + 2557,
 	ts + 2564,
-	ts + 2571,
-	ts + 2579,
-	ts + 2593,
-	ts + 2601,
-	ts + 2615,
-	ts + 2626,
-	ts + 2639,
-	ts + 2650,
-	ts + 2656,
-	ts + 2668,
-	ts + 2677,
-	ts + 2685,
-	ts + 2694,
-	ts + 2703,
-	ts + 2710,
-	ts + 2718,
-	ts + 2725,
-	ts + 2736,
-	ts + 2750,
-	ts + 2761,
+	ts + 2573,
+	ts + 2583,
+	ts + 2590,
+	ts + 2598,
+	ts + 2612,
+	ts + 2620,
+	ts + 2634,
+	ts + 2645,
+	ts + 2658,
+	ts + 2669,
+	ts + 2675,
+	ts + 2687,
+	ts + 2696,
+	ts + 2704,
+	ts + 2713,
+	ts + 2722,
+	ts + 2729,
+	ts + 2737,
+	ts + 2744,
+	ts + 2755,
 	ts + 2769,
-	ts + 2775,
-	ts + 2783,
-	ts + 2791,
-	ts + 2801,
-	ts + 2814,
-	ts + 2824,
-	ts + 2837,
-	ts + 2846,
-	ts + 2857,
+	ts + 2780,
+	ts + 2788,
+	ts + 2794,
+	ts + 2802,
+	ts + 2810,
+	ts + 2820,
+	ts + 2833,
+	ts + 2843,
+	ts + 2856,
 	ts + 2865,
-	ts + 2871,
-	ts + 2883,
-	ts + 2895,
-	ts + 2903,
-	ts + 2915,
-	ts + 2928,
-	ts + 2938,
-	ts + 2948,
-	ts + 2953,
-	ts + 2965,
-	ts + 2977,
-	ts + 2987,
-	ts + 2993,
-	ts + 3003,
-	ts + 3010,
+	ts + 2876,
+	ts + 2884,
+	ts + 2890,
+	ts + 2902,
+	ts + 2914,
+	ts + 2922,
+	ts + 2934,
+	ts + 2947,
+	ts + 2957,
+	ts + 2967,
+	ts + 2972,
+	ts + 2984,
+	ts + 2996,
+	ts + 3006,
+	ts + 3012,
 	ts + 3022,
-	ts + 3033,
+	ts + 3029,
 	ts + 3041,
-	ts + 3050,
-	ts + 3059,
-	ts + 3068,
-	ts + 3075,
-	ts + 3086,
-	ts + 3099,
-	ts + 3109,
-	ts + 3116,
-	ts + 3124,
-	ts + 3133,
-	ts + 3139,
-	ts + 3147,
-	ts + 3155,
-	ts + 3163,
-	ts + 3173,
+	ts + 3052,
+	ts + 3060,
+	ts + 3069,
+	ts + 3078,
+	ts + 3087,
+	ts + 3094,
+	ts + 3105,
+	ts + 3118,
+	ts + 3128,
+	ts + 3135,
+	ts + 3143,
+	ts + 3152,
+	ts + 3158,
+	ts + 3166,
+	ts + 3174,
 	ts + 3182,
-	ts + 3193,
-	ts + 3203,
-	ts + 3209,
-	ts + 3220,
-	ts + 3231,
-	ts + 3236,
-	ts + 3244,
+	ts + 3192,
+	ts + 3201,
+	ts + 3212,
+	ts + 3222,
+	ts + 3228,
+	ts + 3239,
+	ts + 3250,
+	ts + 3255,
+	ts + 3263,
 }
 
 // Copyright (c) 2017 Apple Inc. All rights reserved.
@@ -19566,35 +19571,35 @@ type unix_syscall = struct {
 }
 
 var aSyscall = [29]unix_syscall{
-	{FzName: ts + 3254, FpCurrent: 0},
-	{FzName: ts + 3259, FpCurrent: 0},
-	{FzName: ts + 3265, FpCurrent: 0},
-	{FzName: ts + 3272, FpCurrent: 0},
-	{FzName: ts + 3279, FpCurrent: 0},
+	{FzName: ts + 3273, FpCurrent: 0},
+	{FzName: ts + 3278, FpCurrent: 0},
 	{FzName: ts + 3284, FpCurrent: 0},
-	{FzName: ts + 3290, FpCurrent: 0},
-	{FzName: ts + 3300, FpCurrent: 0},
-	{FzName: ts + 3306, FpCurrent: 0},
-	{FzName: ts + 3311, FpCurrent: 0},
-	{FzName: ts + 3317},
+	{FzName: ts + 3291, FpCurrent: 0},
+	{FzName: ts + 3298, FpCurrent: 0},
+	{FzName: ts + 3303, FpCurrent: 0},
+	{FzName: ts + 3309, FpCurrent: 0},
+	{FzName: ts + 3319, FpCurrent: 0},
 	{FzName: ts + 3325, FpCurrent: 0},
-	{FzName: ts + 3331, FpCurrent: 0},
-	{FzName: ts + 3338},
-	{FzName: ts + 3347, FpCurrent: 0},
-	{FzName: ts + 3354},
-	{FzName: ts + 3364, FpCurrent: 0},
-	{FzName: ts + 3371, FpCurrent: 0},
-	{FzName: ts + 3385, FpCurrent: 0},
-	{FzName: ts + 3391, FpCurrent: 0},
-	{FzName: ts + 3397, FpCurrent: 0},
+	{FzName: ts + 3330, FpCurrent: 0},
+	{FzName: ts + 3336},
+	{FzName: ts + 3344, FpCurrent: 0},
+	{FzName: ts + 3350, FpCurrent: 0},
+	{FzName: ts + 3357},
+	{FzName: ts + 3366, FpCurrent: 0},
+	{FzName: ts + 3373},
+	{FzName: ts + 3383, FpCurrent: 0},
+	{FzName: ts + 3390, FpCurrent: 0},
 	{FzName: ts + 3404, FpCurrent: 0},
-	{FzName: ts + 3412, FpCurrent: 0},
-	{FzName: ts + 3417, FpCurrent: 0},
-	{FzName: ts + 3424},
+	{FzName: ts + 3410, FpCurrent: 0},
+	{FzName: ts + 3416, FpCurrent: 0},
+	{FzName: ts + 3423, FpCurrent: 0},
 	{FzName: ts + 3431, FpCurrent: 0},
-	{FzName: ts + 3443, FpCurrent: 0},
-	{FzName: ts + 3452, FpCurrent: 0},
-	{FzName: ts + 3458},
+	{FzName: ts + 3436, FpCurrent: 0},
+	{FzName: ts + 3443},
+	{FzName: ts + 3450, FpCurrent: 0},
+	{FzName: ts + 3462, FpCurrent: 0},
+	{FzName: ts + 3471, FpCurrent: 0},
+	{FzName: ts + 3477},
 }
 
 func robustFchown(tls *libc.TLS, fd int32, uid Uid_t, gid Gid_t) int32 {
@@ -19692,9 +19697,9 @@ func robust_open(tls *libc.TLS, z uintptr, f int32, m Mode_t) int32 {
 		}
 		(*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, fd)
 		Xsqlite3_log(tls, SQLITE_WARNING,
-			ts+3464, libc.VaList(bp, z, fd))
+			ts+3483, libc.VaList(bp, z, fd))
 		fd = -1
-		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3507, O_RDONLY, int32(m)) < 0 {
+		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3526, O_RDONLY, int32(m)) < 0 {
 			break
 		}
 	}
@@ -19774,13 +19779,13 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 	var zErr uintptr
 	var iErrno int32 = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 
-	zErr = ts + 1547
+	zErr = ts + 1566
 
 	if zPath == uintptr(0) {
-		zPath = ts + 1547
+		zPath = ts + 1566
 	}
 	Xsqlite3_log(tls, errcode,
-		ts+3517,
+		ts+3536,
 		libc.VaList(bp, iLine, iErrno, zFunc, zPath, zErr))
 
 	return errcode
@@ -19788,7 +19793,7 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 
 func robust_close(tls *libc.TLS, pFile uintptr, h int32, lineno int32) {
 	if (*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, h) != 0 {
-		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3259,
+		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3278,
 			func() uintptr {
 				if pFile != 0 {
 					return (*UnixFile)(unsafe.Pointer(pFile)).FzPath
@@ -19809,7 +19814,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, 38271)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38275)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -19856,7 +19861,7 @@ func findInodeInfo(tls *libc.TLS, pFile uintptr, ppInode uintptr) int32 {
 
 	if (*stat)(unsafe.Pointer(bp)).Fst_size == int64(0) && (*UnixFile)(unsafe.Pointer(pFile)).FfsFlags&uint32(SQLITE_FSFLAGS_IS_MSDOS) != uint32(0) {
 		for __ccgo := true; __ccgo; __ccgo = rc < 0 && *(*int32)(unsafe.Pointer(libc.X__error(tls))) == EINTR {
-			rc = int32((*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 11*24 + 8)))(tls, fd, ts+3548, uint64(1)))
+			rc = int32((*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 11*24 + 8)))(tls, fd, ts+3567, uint64(1)))
 		}
 		if rc != 1 {
 			storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
@@ -19926,19 +19931,19 @@ func verifyDbFile(tls *libc.TLS, pFile uintptr) {
 
 	rc = (*(*func(*libc.TLS, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 5*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, bp+32)
 	if rc != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3550, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3569, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if int32((*stat)(unsafe.Pointer(bp+32)).Fst_nlink) == 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3574, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3593, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if int32((*stat)(unsafe.Pointer(bp+32)).Fst_nlink) > 1 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3603, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3622, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if fileHasMoved(tls, pFile) != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3630, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3649, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 }
@@ -20354,7 +20359,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, 39055)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39059)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -21103,7 +21108,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	var ii int32
 	var fd int32 = -1
 
-	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3658, libc.VaList(bp, zFilename))
+	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3677, libc.VaList(bp, zFilename))
 	for ii = int32(libc.Xstrlen(tls, bp+8)); ii > 0 && int32(*(*int8)(unsafe.Pointer(bp + 8 + uintptr(ii)))) != '/'; ii-- {
 	}
 	if ii > 0 {
@@ -21121,7 +21126,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3371, bp+8, 40676)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40680), ts+3390, bp+8, 40680)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -21138,14 +21143,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, 40717)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3680, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40721)
 	}
 
 	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)), 40731)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40735)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -21165,7 +21170,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, 40762)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3309, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40766)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -21220,7 +21225,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 				if iWrite >= nSize {
 					iWrite = nSize - int64(1)
 				}
-				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1547, 1)
+				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1566, 1)
 				if nWrite != 1 {
 					return SQLITE_IOERR | int32(3)<<8
 				}
@@ -21233,7 +21238,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, 40883)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3309, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40887)
 			}
 		}
 
@@ -21301,7 +21306,7 @@ func unixFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 		}
 	case SQLITE_FCNTL_VFSNAME:
 		{
-			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
+			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
 			return SQLITE_OK
 
 		}
@@ -21467,7 +21472,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, 41442)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41446)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -21495,7 +21500,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, 41499)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3309, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41503)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -21558,7 +21563,7 @@ __4:
 	;
 	libc.X__builtin___memset_chk(tls, pShmNode, 0, uint64(unsafe.Sizeof(unixShmNode{}))+uint64(nShmFilename), libc.X__builtin_object_size(tls, pShmNode, 0))
 	zShm = libc.AssignPtrUintptr(pShmNode+16, pShmNode+1*96)
-	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3672, libc.VaList(bp, zBasePath))
+	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3691, libc.VaList(bp, zBasePath))
 
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = -1
 	(*UnixInodeInfo)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pDbFd)).FpInode)).FpShmNode = pShmNode
@@ -21579,7 +21584,7 @@ __5:
 	if !(int32((*UnixInodeInfo)(unsafe.Pointer(pInode)).FbProcessLock) == 0) {
 		goto __7
 	}
-	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3679, 0)) {
+	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3698, 0)) {
 		goto __8
 	}
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = robust_open(tls, zShm, O_RDWR|O_CREAT|O_NOFOLLOW,
@@ -21594,7 +21599,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3254, zShm, 41624)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41628), ts+3273, zShm, 41628)
 	goto shm_open_err
 __10:
 	;
@@ -21720,11 +21725,11 @@ __11:
 		goto __13
 	}
 	*(*int32)(unsafe.Pointer(bp + 144)) = 0
-	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1547, 1, bp+144) != 1) {
+	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1566, 1, bp+144) != 1) {
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3325, zFile, 41768)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3344, zFile, 41772)
 	goto shmpage_out
 __14:
 	;
@@ -21770,7 +21775,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3412, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3431, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41799)
 	goto shmpage_out
 __20:
 	;
@@ -21971,7 +21976,7 @@ func unixUnmapfile(tls *libc.TLS, pFd uintptr) {
 }
 
 func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
-	var zErr uintptr = ts + 3412
+	var zErr uintptr = ts + 3431
 	var h int32 = (*UnixFile)(unsafe.Pointer(pFd)).Fh
 	var pOrig uintptr = (*UnixFile)(unsafe.Pointer(pFd)).FpMapRegion
 	var nOrig I64 = (*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeActual
@@ -22009,7 +22014,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, 42169)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42173)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -22166,7 +22171,7 @@ func autolockIoFinderImpl(tls *libc.TLS, filePath uintptr, pNew uintptr) uintptr
 	(*flock)(unsafe.Pointer(bp + 2176)).Fl_whence = int16(SEEK_SET)
 	(*flock)(unsafe.Pointer(bp + 2176)).Fl_type = int16(F_RDLCK)
 	if (*(*func(*libc.TLS, int32, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 7*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pNew)).Fh, F_GETLK, libc.VaList(bp, bp+2176)) != -1 {
-		if libc.Xstrcmp(tls, bp+8+72, ts+3692) == 0 {
+		if libc.Xstrcmp(tls, bp+8+72, ts+3711) == 0 {
 			return uintptr(unsafe.Pointer(&nfsIoMethods))
 		} else {
 			return uintptr(unsafe.Pointer(&posixIoMethods))
@@ -22183,11 +22188,11 @@ type Mapping = struct {
 }
 
 var aMap = [6]Mapping{
-	{FzFilesystem: ts + 3696, FpMethods: 0},
-	{FzFilesystem: ts + 3700, FpMethods: 0},
-	{FzFilesystem: ts + 3704, FpMethods: 0},
-	{FzFilesystem: ts + 3710, FpMethods: 0},
-	{FzFilesystem: ts + 3716, FpMethods: 0},
+	{FzFilesystem: ts + 3715, FpMethods: 0},
+	{FzFilesystem: ts + 3719, FpMethods: 0},
+	{FzFilesystem: ts + 3723, FpMethods: 0},
+	{FzFilesystem: ts + 3729, FpMethods: 0},
+	{FzFilesystem: ts + 3735, FpMethods: 0},
 	{},
 }
 var autolockIoFinder uintptr = 0
@@ -22214,10 +22219,10 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		}
 		return uintptr(0)
 	}(),
-		ts+3723, SQLITE_POWERSAFE_OVERWRITE) != 0 {
+		ts+3742, SQLITE_POWERSAFE_OVERWRITE) != 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_PSOW)
 	}
-	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3728) == 0 {
+	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3747) == 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_EXCL)
 	}
 
@@ -22236,7 +22241,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, 42672)
+			robust_close(tls, pNew, h, 42676)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -22253,7 +22258,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, 42698)
+				robust_close(tls, pNew, h, 42702)
 				h = -1
 			}
 			unixLeaveMutex(tls)
@@ -22267,7 +22272,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		if zLockFile == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
-			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3738, libc.VaList(bp, zFilename))
+			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3757, libc.VaList(bp, zFilename))
 		}
 		(*UnixFile)(unsafe.Pointer(pNew)).FlockingContext = zLockFile
 	}
@@ -22275,7 +22280,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, 42757)
+			robust_close(tls, pNew, h, 42761)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -22288,15 +22293,15 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 var azTempDirs = [6]uintptr{
 	uintptr(0),
 	uintptr(0),
-	ts + 3746,
-	ts + 3755,
-	ts + 3764,
-	ts + 1560,
+	ts + 3765,
+	ts + 3774,
+	ts + 3783,
+	ts + 1579,
 }
 
 func unixTempFileInit(tls *libc.TLS) {
-	azTempDirs[0] = libc.Xgetenv(tls, ts+3769)
-	azTempDirs[1] = libc.Xgetenv(tls, ts+3783)
+	azTempDirs[0] = libc.Xgetenv(tls, ts+3788)
+	azTempDirs[1] = libc.Xgetenv(tls, ts+3802)
 }
 
 func unixTempFileDir(tls *libc.TLS) uintptr {
@@ -22341,7 +22346,7 @@ func unixGetTempname(tls *libc.TLS, nBuf int32, zBuf uintptr) int32 {
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U64(0))), bp+24)
 
 			*(*int8)(unsafe.Pointer(zBuf + uintptr(nBuf-2))) = int8(0)
-			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3790,
+			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3809,
 				libc.VaList(bp, zDir, *(*U64)(unsafe.Pointer(bp + 24)), 0))
 			if int32(*(*int8)(unsafe.Pointer(zBuf + uintptr(nBuf-2)))) != 0 || libc.PostIncInt32(&iLimit, 1) > 10 {
 				rc = SQLITE_ERROR
@@ -22426,7 +22431,7 @@ func findCreateFileMode(tls *libc.TLS, zPath uintptr, flags int32, pMode uintptr
 	} else if flags&SQLITE_OPEN_DELETEONCLOSE != 0 {
 		*(*Mode_t)(unsafe.Pointer(pMode)) = Mode_t(0600)
 	} else if flags&SQLITE_OPEN_URI != 0 {
-		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3807)
+		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3826)
 		if z != 0 {
 			rc = getFileMode(tls, z, pMode, pUid, pGid)
 		}
@@ -22595,7 +22600,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3254, zName, 43198)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43202), ts+3273, zName, 43202)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -22639,17 +22644,17 @@ __25:
 		goto __26
 	}
 	storeLastErrno(tls, p, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-	robust_close(tls, p, fd, 43252)
+	robust_close(tls, p, fd, 43256)
 	return SQLITE_IOERR | int32(13)<<8
 __26:
 	;
-	if !(0 == libc.Xstrncmp(tls, ts+3814, bp+528+72, uint64(5))) {
+	if !(0 == libc.Xstrncmp(tls, ts+3833, bp+528+72, uint64(5))) {
 		goto __27
 	}
 	*(*uint32)(unsafe.Pointer(pFile + 124)) |= uint32(SQLITE_FSFLAGS_IS_MSDOS)
 __27:
 	;
-	if !(0 == libc.Xstrncmp(tls, ts+3820, bp+528+72, uint64(5))) {
+	if !(0 == libc.Xstrncmp(tls, ts+3839, bp+528+72, uint64(5))) {
 		goto __28
 	}
 	*(*uint32)(unsafe.Pointer(pFile + 124)) |= uint32(SQLITE_FSFLAGS_IS_MSDOS)
@@ -22689,7 +22694,7 @@ __33:
 	if !(isAutoProxy != 0 && zPath != uintptr(0) && !(noLock != 0) && (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxOpen != 0) {
 		goto __34
 	}
-	envforce = libc.Xgetenv(tls, ts+3826)
+	envforce = libc.Xgetenv(tls, ts+3845)
 	useProxy = 0
 
 	if !(envforce != uintptr(0)) {
@@ -22708,7 +22713,7 @@ __36:
 	if !(rc == SQLITE_OK) {
 		goto __38
 	}
-	rc = proxyTransformUnixFile(tls, pFile, ts+3853)
+	rc = proxyTransformUnixFile(tls, pFile, ts+3872)
 	if !(rc != SQLITE_OK) {
 		goto __39
 	}
@@ -22747,7 +22752,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, 43337)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3383, zPath, 43341)
 		}
 		return rc
 	}
@@ -22755,9 +22760,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, 43347)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3879, zPath, 43351)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43353)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -22821,18 +22826,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, 43443), ts+3452, zIn, 43443)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43447), ts+3471, zIn, 43447)
 			}
 		} 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, 43449)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43453)
 				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, 43454), ts+3443, zIn, 43454)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43458), ts+3462, zIn, 43458)
 				return
 			}
 			*(*int8)(unsafe.Pointer(bp + 144 + uintptr(got))) = int8(0)
@@ -22872,14 +22877,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, 43512), ts+3272, zPath, 43512)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43516), ts+3291, zPath, 43516)
 		}
 		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, 43518)
+		return Xsqlite3CantopenError(tls, 43522)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+1032)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -22911,7 +22916,7 @@ func unixDlError(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBufOut uintptr) {
 	unixEnterMutex(tls)
 	zErr = libc.Xdlerror(tls)
 	if zErr != 0 {
-		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3658, libc.VaList(bp, zErr))
+		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3677, libc.VaList(bp, zErr))
 	}
 	unixLeaveMutex(tls)
 }
@@ -22943,7 +22948,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 	{
 		var fd int32
 		var got int32
-		fd = robust_open(tls, ts+3866, O_RDONLY, uint16(0))
+		fd = robust_open(tls, ts+3885, O_RDONLY, uint16(0))
 		if fd < 0 {
 			libc.Xtime(tls, bp)
 			libc.X__builtin___memcpy_chk(tls, zBuf, bp, uint64(unsafe.Sizeof(Time_t(0))), libc.X__builtin_object_size(tls, zBuf, 0))
@@ -22954,7 +22959,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, 43619)
+			robust_close(tls, uintptr(0), fd, 43623)
 		}
 
 	}
@@ -23031,12 +23036,12 @@ func proxyGetLockPath(tls *libc.TLS, dbPath uintptr, lPath uintptr, maxLen Size_
 		if !(libc.Xconfstr(tls, X_CS_DARWIN_USER_TEMP_DIR, lPath, maxLen) != 0) {
 			return SQLITE_IOERR | int32(15)<<8
 		}
-		len = int32(libc.Xstrlcat(tls, lPath, ts+3879, maxLen))
+		len = int32(libc.Xstrlcat(tls, lPath, ts+3898, maxLen))
 
 	}
 
 	if int32(*(*int8)(unsafe.Pointer(lPath + uintptr(len-1)))) != '/' {
-		len = int32(libc.Xstrlcat(tls, lPath, ts+3892, maxLen))
+		len = int32(libc.Xstrlcat(tls, lPath, ts+3911, maxLen))
 	}
 
 	dbLen = int32(libc.Xstrlen(tls, dbPath))
@@ -23050,7 +23055,7 @@ func proxyGetLockPath(tls *libc.TLS, dbPath uintptr, lPath uintptr, maxLen Size_
 		}()
 	}
 	*(*int8)(unsafe.Pointer(lPath + uintptr(i+len))) = int8(0)
-	libc.Xstrlcat(tls, lPath, ts+3853, maxLen)
+	libc.Xstrlcat(tls, lPath, ts+3872, maxLen)
 
 	return SQLITE_OK
 }
@@ -23168,7 +23173,7 @@ __11:
 __12:
 	return SQLITE_IOERR | int32(15)<<8
 __13:
-	return Xsqlite3CantopenError(tls, 44048)
+	return Xsqlite3CantopenError(tls, 44052)
 __10:
 	;
 __8:
@@ -23185,7 +23190,7 @@ __14:
 	(*UnixFile)(unsafe.Pointer(pNew)).FopenFlags = openFlags
 	libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(Sqlite3_vfs{})), libc.X__builtin_object_size(tls, bp, 0))
 	(*Sqlite3_vfs)(unsafe.Pointer(bp)).FpAppData = uintptr(unsafe.Pointer(&autolockIoFinder))
-	(*Sqlite3_vfs)(unsafe.Pointer(bp)).FzName = ts + 3894
+	(*Sqlite3_vfs)(unsafe.Pointer(bp)).FzName = ts + 3913
 	(*UnixUnusedFd)(unsafe.Pointer(pUnused)).Ffd = fd
 	(*UnixUnusedFd)(unsafe.Pointer(pUnused)).Fflags = openFlags
 	(*UnixFile)(unsafe.Pointer(pNew)).FpPreallocatedUnused = pUnused
@@ -23199,7 +23204,7 @@ __14:
 __15:
 	;
 end_create_proxy:
-	robust_close(tls, pNew, fd, 44072)
+	robust_close(tls, pNew, fd, 44076)
 	Xsqlite3_free(tls, pNew)
 	Xsqlite3_free(tls, pUnused)
 	return rc
@@ -23243,16 +23248,16 @@ func proxyBreakConchLock(tls *libc.TLS, pFile uintptr, myHostID uintptr) int32 {
 	cPath = (*ProxyLockingContext)(unsafe.Pointer(pCtx)).FconchFilePath
 	readLen = uint64(0)
 	pathLen = uint64(0)
-	*(*[64]int8)(unsafe.Pointer(bp + 1088)) = *(*[64]int8)(unsafe.Pointer(ts + 3900))
+	*(*[64]int8)(unsafe.Pointer(bp + 1088)) = *(*[64]int8)(unsafe.Pointer(ts + 3919))
 	fd = -1
 	rc = -1
 	_ = myHostID
 
 	pathLen = libc.Xstrlcpy(tls, bp+64, cPath, uint64(PATH_MAX))
-	if !(pathLen > uint64(PATH_MAX) || pathLen < uint64(6) || libc.Xstrlcpy(tls, bp+64+uintptr(pathLen-uint64(5)), ts+3964, uint64(6)) != uint64(5)) {
+	if !(pathLen > uint64(PATH_MAX) || pathLen < uint64(6) || libc.Xstrlcpy(tls, bp+64+uintptr(pathLen-uint64(5)), ts+3983, uint64(6)) != uint64(5)) {
 		goto __1
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+3970, libc.VaList(bp, int32(pathLen)))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+3989, libc.VaList(bp, int32(pathLen)))
 	goto end_breaklock
 __1:
 	;
@@ -23260,7 +23265,7 @@ __1:
 	if !(readLen < uint64(PROXY_HEADERLEN+PROXY_HOSTIDLEN)) {
 		goto __2
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+3990, libc.VaList(bp+8, int32(readLen)))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+4009, libc.VaList(bp+8, int32(readLen)))
 	goto end_breaklock
 __2:
 	;
@@ -23268,27 +23273,27 @@ __2:
 	if !(fd < 0) {
 		goto __3
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+4010, libc.VaList(bp+16, *(*int32)(unsafe.Pointer(libc.X__error(tls)))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+4029, libc.VaList(bp+16, *(*int32)(unsafe.Pointer(libc.X__error(tls)))))
 	goto end_breaklock
 __3:
 	;
 	if !((*(*func(*libc.TLS, int32, uintptr, Size_t, Off_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 12*24 + 8)))(tls, fd, bp+1152, readLen, int64(0)) != Ssize_t(readLen)) {
 		goto __4
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+4029, libc.VaList(bp+24, *(*int32)(unsafe.Pointer(libc.X__error(tls)))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+4048, libc.VaList(bp+24, *(*int32)(unsafe.Pointer(libc.X__error(tls)))))
 	goto end_breaklock
 __4:
 	;
 	if !(libc.Xrename(tls, bp+64, cPath) != 0) {
 		goto __5
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+4047, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(libc.X__error(tls)))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+4066, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(libc.X__error(tls)))))
 	goto end_breaklock
 __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, 44175)
+	libc.Xfprintf(tls, libc.X__stderrp, ts+4085, libc.VaList(bp+40, cPath))
+	robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(conchFile)).Fh, 44179)
 	(*UnixFile)(unsafe.Pointer(conchFile)).Fh = fd
 	(*UnixFile)(unsafe.Pointer(conchFile)).FopenFlags = O_RDWR | O_CREAT
 
@@ -23300,10 +23305,10 @@ 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, 44183)
+	robust_close(tls, pFile, fd, 44187)
 __7:
 	;
-	libc.Xfprintf(tls, libc.X__stderrp, ts+4090, libc.VaList(bp+48, cPath, bp+1088))
+	libc.Xfprintf(tls, libc.X__stderrp, ts+4109, libc.VaList(bp+48, cPath, bp+1088))
 __6:
 	;
 	return rc
@@ -23580,7 +23585,7 @@ end_takeconch:
 	if !((*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0) {
 		goto __29
 	}
-	robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 44436)
+	robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 44440)
 __29:
 	;
 	(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
@@ -23592,7 +23597,7 @@ __29:
 	(*UnixFile)(unsafe.Pointer(pFile)).Fh = fd
 	goto __31
 __30:
-	rc = Xsqlite3CantopenError(tls, 44444)
+	rc = Xsqlite3CantopenError(tls, 44448)
 
 __31:
 	;
@@ -23710,7 +23715,7 @@ func proxyCreateConchPathname(tls *libc.TLS, dbPath uintptr, pConchPath uintptr)
 		i++
 	}
 
-	libc.X__builtin___memcpy_chk(tls, conchPath+uintptr(i+1), ts+4128, uint64(7), libc.X__builtin_object_size(tls, conchPath+uintptr(i+1), 0))
+	libc.X__builtin___memcpy_chk(tls, conchPath+uintptr(i+1), ts+4147, uint64(7), libc.X__builtin_object_size(tls, conchPath+uintptr(i+1), 0))
 
 	return SQLITE_OK
 }
@@ -23724,7 +23729,7 @@ func switchLockProxyPath(tls *libc.TLS, pFile uintptr, path uintptr) int32 {
 		return SQLITE_BUSY
 	}
 
-	if !(path != 0) || int32(*(*int8)(unsafe.Pointer(path))) == 0 || !(libc.Xstrcmp(tls, path, ts+3853) != 0) || oldPath != 0 && !(libc.Xstrncmp(tls, oldPath, path, uint64(PATH_MAX)) != 0) {
+	if !(path != 0) || int32(*(*int8)(unsafe.Pointer(path))) == 0 || !(libc.Xstrcmp(tls, path, ts+3872) != 0) || oldPath != 0 && !(libc.Xstrncmp(tls, oldPath, path, uint64(PATH_MAX)) != 0) {
 		return SQLITE_OK
 	} else {
 		var lockProxy uintptr = (*ProxyLockingContext)(unsafe.Pointer(pCtx)).FlockProxy
@@ -23751,7 +23756,7 @@ func proxyGetDbPathForUnixFile(tls *libc.TLS, pFile uintptr, dbPath uintptr) int
 		libc.Xstrlcpy(tls, dbPath, (*AfpLockingContext)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FlockingContext)).FdbPath,
 			uint64(PATH_MAX))
 	} else if (*UnixFile)(unsafe.Pointer(pFile)).FpMethod == uintptr(unsafe.Pointer(&dotlockIoMethods)) {
-		var len int32 = int32(libc.Xstrlen(tls, (*UnixFile)(unsafe.Pointer(pFile)).FlockingContext) - libc.Xstrlen(tls, ts+4135))
+		var len int32 = int32(libc.Xstrlen(tls, (*UnixFile)(unsafe.Pointer(pFile)).FlockingContext) - libc.Xstrlen(tls, ts+4154))
 		libc.X__builtin___memcpy_chk(tls, dbPath, (*UnixFile)(unsafe.Pointer(pFile)).FlockingContext, uint64(len+1), libc.X__builtin_object_size(tls, dbPath, 0))
 	} else {
 		libc.Xstrlcpy(tls, dbPath, (*UnixFile)(unsafe.Pointer(pFile)).FlockingContext, uint64(PATH_MAX))
@@ -23772,7 +23777,7 @@ func proxyTransformUnixFile(tls *libc.TLS, pFile uintptr, path uintptr) int32 {
 		return SQLITE_BUSY
 	}
 	proxyGetDbPathForUnixFile(tls, pFile, bp)
-	if !(path != 0) || int32(*(*int8)(unsafe.Pointer(path))) == 0 || !(libc.Xstrcmp(tls, path, ts+3853) != 0) {
+	if !(path != 0) || int32(*(*int8)(unsafe.Pointer(path))) == 0 || !(libc.Xstrcmp(tls, path, ts+3872) != 0) {
 		lockPath = uintptr(0)
 	} else {
 		lockPath = path
@@ -23843,7 +23848,7 @@ func proxyFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 				if (*ProxyLockingContext)(unsafe.Pointer(pCtx)).FlockProxyPath != 0 {
 					*(*uintptr)(unsafe.Pointer(pArg)) = (*ProxyLockingContext)(unsafe.Pointer(pCtx)).FlockProxyPath
 				} else {
-					*(*uintptr)(unsafe.Pointer(pArg)) = ts + 4141
+					*(*uintptr)(unsafe.Pointer(pArg)) = ts + 4160
 				}
 			} else {
 				*(*uintptr)(unsafe.Pointer(pArg)) = uintptr(0)
@@ -23866,7 +23871,7 @@ func proxyFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 				var proxyPath uintptr = pArg
 				if isProxyStyle != 0 {
 					var pCtx uintptr = (*UnixFile)(unsafe.Pointer(pFile)).FlockingContext
-					if !(libc.Xstrcmp(tls, pArg, ts+3853) != 0) ||
+					if !(libc.Xstrcmp(tls, pArg, ts+3872) != 0) ||
 						(*ProxyLockingContext)(unsafe.Pointer(pCtx)).FlockProxyPath != 0 && !(libc.Xstrncmp(tls, (*ProxyLockingContext)(unsafe.Pointer(pCtx)).FlockProxyPath, proxyPath, uint64(PATH_MAX)) != 0) {
 						rc = SQLITE_OK
 					} else {
@@ -24016,15 +24021,15 @@ func Xsqlite3_os_init(tls *libc.TLS) int32 {
 }
 
 var aVfs = [9]Sqlite3_vfs{
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4159, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4164, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4174, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3728, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4187, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4198, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4209, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4218, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4227, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4178, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4183, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4193, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3747, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4206, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4217, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4228, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4237, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4246, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
 }
 
 // Shutdown the operating system interface.
@@ -24079,7 +24084,7 @@ var memdb_g MemFS
 var memdb_vfs = Sqlite3_vfs{
 	FiVersion:          2,
 	FmxPathname:        1024,
-	FzName:             ts + 4238,
+	FzName:             ts + 4257,
 	FxOpen:             0,
 	FxAccess:           0,
 	FxFullPathname:     0,
@@ -24335,7 +24340,7 @@ func memdbFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int3
 	var rc int32 = SQLITE_NOTFOUND
 	memdbEnter(tls, p)
 	if op == SQLITE_FCNTL_VFSNAME {
-		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+4244, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
+		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+4263, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
 		rc = SQLITE_OK
 	}
 	if op == SQLITE_FCNTL_SIZE_LIMIT {
@@ -24467,7 +24472,7 @@ func memdbFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, z
 	defer tls.Free(8)
 
 	_ = pVfs
-	Xsqlite3_snprintf(tls, nOut, zOut, ts+3658, libc.VaList(bp, zPath))
+	Xsqlite3_snprintf(tls, nOut, zOut, ts+3677, libc.VaList(bp, zPath))
 	return SQLITE_OK
 }
 
@@ -24588,7 +24593,7 @@ func Xsqlite3_serialize(tls *libc.TLS, db uintptr, zSchema uintptr, piSize uintp
 		return uintptr(0)
 	}
 	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
-	zSql = Xsqlite3_mprintf(tls, ts+4259, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+4278, libc.VaList(bp, zSchema))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, db, zSql, -1, bp+8, uintptr(0))
 	} else {
@@ -24661,7 +24666,7 @@ __1:
 	goto end_deserialize
 __2:
 	;
-	zSql = Xsqlite3_mprintf(tls, ts+4282, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+4301, libc.VaList(bp, zSchema))
 	if !(zSql == uintptr(0)) {
 		goto __3
 	}
@@ -25377,7 +25382,7 @@ func pcacheFetchFinishWithInit(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 	libc.X__builtin___memset_chk(tls, pPgHdr+32, 0, uint64(unsafe.Sizeof(PgHdr{}))-uint64(uintptr(0)+32), libc.X__builtin_object_size(tls, pPgHdr+32, 0))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpPage = pPage
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpData = (*Sqlite3_pcache_page)(unsafe.Pointer(pPage)).FpBuf
-	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*72
+	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*80
 	libc.X__builtin___memset_chk(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0, uint64(8), libc.X__builtin_object_size(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpCache = pCache
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).Fpgno = pgno
@@ -25407,7 +25412,7 @@ func Xsqlite3PcacheFetchFinish(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 // reference count drops to 0, then it is made eligible for recycling.
 func Xsqlite3PcacheRelease(tls *libc.TLS, p uintptr) {
 	(*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FnRefSum--
-	if int32(libc.PreDecInt16(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1)) == 0 {
+	if libc.PreDecInt64(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1) == int64(0) {
 		if int32((*PgHdr)(unsafe.Pointer(p)).Fflags)&PGHDR_CLEAN != 0 {
 			pcacheUnpin(tls, p)
 		} else {
@@ -25458,7 +25463,7 @@ func Xsqlite3PcacheMakeClean(tls *libc.TLS, p uintptr) {
 	*(*U16)(unsafe.Pointer(p + 52)) &= libc.Uint16FromInt32(libc.CplInt32(PGHDR_DIRTY | PGHDR_NEED_SYNC | PGHDR_WRITEABLE))
 	*(*U16)(unsafe.Pointer(p + 52)) |= U16(PGHDR_CLEAN)
 
-	if int32((*PgHdr)(unsafe.Pointer(p)).FnRef) == 0 {
+	if (*PgHdr)(unsafe.Pointer(p)).FnRef == int64(0) {
 		pcacheUnpin(tls, p)
 	}
 }
@@ -25562,8 +25567,8 @@ func Xsqlite3PcacheClear(tls *libc.TLS, pCache uintptr) {
 }
 
 func pcacheMergeDirtyList(tls *libc.TLS, pA uintptr, pB uintptr) uintptr {
-	bp := tls.Alloc(72)
-	defer tls.Free(72)
+	bp := tls.Alloc(80)
+	defer tls.Free(80)
 
 	var pTail uintptr
 	pTail = bp
@@ -25641,13 +25646,13 @@ func Xsqlite3PcacheDirtyList(tls *libc.TLS, pCache uintptr) uintptr {
 //
 // This is not the total number of pages referenced, but the sum of the
 // reference count for all pages.
-func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) int32 {
+func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) I64 {
 	return (*PCache)(unsafe.Pointer(pCache)).FnRefSum
 }
 
 // Return the number of references to the page supplied as an argument.
-func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) int32 {
-	return int32((*PgHdr)(unsafe.Pointer(p)).FnRef)
+func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) I64 {
+	return (*PgHdr)(unsafe.Pointer(p)).FnRef
 }
 
 // Return the total number of pages in the cache.
@@ -27875,7 +27880,7 @@ __27:
 	if !(isHot != 0 && nPlayback != 0) {
 		goto __28
 	}
-	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+4297,
+	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+4316,
 		libc.VaList(bp, nPlayback, (*Pager)(unsafe.Pointer(pPager)).FzJournal))
 __28:
 	;
@@ -27940,7 +27945,7 @@ func pagerUndoCallback(tls *libc.TLS, pCtx uintptr, iPg Pgno) int32 {
 
 	pPg = Xsqlite3PagerLookup(tls, pPager, iPg)
 	if pPg != 0 {
-		if Xsqlite3PcachePageRefcount(tls, pPg) == 1 {
+		if Xsqlite3PcachePageRefcount(tls, pPg) == int64(1) {
 			Xsqlite3PcacheDrop(tls, pPg)
 		} else {
 			rc = readDbPage(tls, pPg)
@@ -28373,7 +28378,7 @@ func Xsqlite3PagerSetPagesize(tls *libc.TLS, pPager uintptr, pPageSize uintptr,
 	var pageSize U32 = *(*U32)(unsafe.Pointer(pPageSize))
 
 	if (int32((*Pager)(unsafe.Pointer(pPager)).FmemDb) == 0 || (*Pager)(unsafe.Pointer(pPager)).FdbSize == Pgno(0)) &&
-		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 &&
+		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) &&
 		pageSize != 0 && pageSize != U32((*Pager)(unsafe.Pointer(pPager)).FpageSize) {
 		var pNew uintptr = uintptr(0)
 		*(*I64)(unsafe.Pointer(bp)) = int64(0)
@@ -28525,9 +28530,9 @@ func pagerAcquireMapPage(tls *libc.TLS, pPager uintptr, pgno Pgno, pData uintptr
 			Xsqlite3OsUnfetch(tls, (*Pager)(unsafe.Pointer(pPager)).Ffd, I64(pgno-Pgno(1))*(*Pager)(unsafe.Pointer(pPager)).FpageSize, pData)
 			return SQLITE_NOMEM
 		}
-		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*72
+		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*80
 		(*PgHdr)(unsafe.Pointer(p)).Fflags = U16(PGHDR_MMAP)
-		(*PgHdr)(unsafe.Pointer(p)).FnRef = int16(1)
+		(*PgHdr)(unsafe.Pointer(p)).FnRef = int64(1)
 		(*PgHdr)(unsafe.Pointer(p)).FpPager = pPager
 	}
 
@@ -28859,7 +28864,7 @@ func Xsqlite3PagerFlush(tls *libc.TLS, pPager uintptr) int32 {
 
 		for rc == SQLITE_OK && pList != 0 {
 			var pNext uintptr = (*PgHdr)(unsafe.Pointer(pList)).FpDirty
-			if int32((*PgHdr)(unsafe.Pointer(pList)).FnRef) == 0 {
+			if (*PgHdr)(unsafe.Pointer(pList)).FnRef == int64(0) {
 				rc = pagerStress(tls, pPager, pList)
 			}
 			pList = pNext
@@ -29009,7 +29014,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 60235)
+	rc = Xsqlite3CantopenError(tls, 60239)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -29070,7 +29075,7 @@ __15:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzJournal = pPtr
 	libc.X__builtin___memcpy_chk(tls, pPtr, zPathname, uint64(nPathname), libc.X__builtin_object_size(tls, pPtr, 0))
 	pPtr += uintptr(nPathname)
-	libc.X__builtin___memcpy_chk(tls, pPtr, ts+4324, uint64(8), libc.X__builtin_object_size(tls, pPtr, 0))
+	libc.X__builtin___memcpy_chk(tls, pPtr, ts+4343, uint64(8), libc.X__builtin_object_size(tls, pPtr, 0))
 	pPtr += uintptr(8 + 1)
 	goto __19
 __18:
@@ -29083,7 +29088,7 @@ __19:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzWal = pPtr
 	libc.X__builtin___memcpy_chk(tls, pPtr, zPathname, uint64(nPathname), libc.X__builtin_object_size(tls, pPtr, 0))
 	pPtr += uintptr(nPathname)
-	libc.X__builtin___memcpy_chk(tls, pPtr, ts+4333, uint64(4), libc.X__builtin_object_size(tls, pPtr, 0))
+	libc.X__builtin___memcpy_chk(tls, pPtr, ts+4352, uint64(4), libc.X__builtin_object_size(tls, pPtr, 0))
 	pPtr += uintptr(4 + 1)
 	goto __21
 __20:
@@ -29135,9 +29140,9 @@ __27:
 	;
 __26:
 	;
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+4338, 0))
+	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+4357, 0))
 	if !(iDc&SQLITE_IOCAP_IMMUTABLE != 0 ||
-		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+4345, 0) != 0) {
+		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+4364, 0) != 0) {
 		goto __30
 	}
 	vfsFlags = vfsFlags | SQLITE_OPEN_READONLY
@@ -29390,7 +29395,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60754)
+	rc = Xsqlite3CantopenError(tls, 60758)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -29496,7 +29501,7 @@ __24:
 }
 
 func pagerUnlockIfUnused(tls *libc.TLS, pPager uintptr) {
-	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 {
+	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) {
 		pagerUnlockAndRollback(tls, pPager)
 	}
 }
@@ -29514,7 +29519,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60967)
+	return Xsqlite3CorruptError(tls, 60971)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -29553,7 +29558,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60999)
+	rc = Xsqlite3CorruptError(tls, 61003)
 	goto pager_acquire_err
 __7:
 	;
@@ -29630,7 +29635,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, 61078)
+		return Xsqlite3CorruptError(tls, 61082)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -30388,7 +30393,7 @@ func Xsqlite3PagerMemUsed(tls *libc.TLS, pPager uintptr) int32 {
 
 // Return the number of references to the specified page.
 func Xsqlite3PagerPageRefcount(tls *libc.TLS, pPage uintptr) int32 {
-	return Xsqlite3PcachePageRefcount(tls, pPage)
+	return int32(Xsqlite3PcachePageRefcount(tls, pPage))
 }
 
 // Parameter eStat must be one of SQLITE_DBSTATUS_CACHE_HIT, _MISS, _WRITE,
@@ -30631,9 +30636,9 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	pPgOld = Xsqlite3PagerLookup(tls, pPager, pgno)
 
 	if pPgOld != 0 {
-		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
+		if (*PgHdr)(unsafe.Pointer(pPgOld)).FnRef > int64(1) {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62623)
+			return Xsqlite3CorruptError(tls, 62627)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -30818,7 +30823,7 @@ func Xsqlite3PagerClearCache(tls *libc.TLS, pPager uintptr) {
 func Xsqlite3PagerCheckpoint(tls *libc.TLS, pPager uintptr, db uintptr, eMode int32, pnLog uintptr, pnCkpt uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal == uintptr(0) && int32((*Pager)(unsafe.Pointer(pPager)).FjournalMode) == PAGER_JOURNALMODE_WAL {
-		Xsqlite3_exec(tls, db, ts+4355, uintptr(0), uintptr(0), uintptr(0))
+		Xsqlite3_exec(tls, db, ts+4374, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal != 0 {
 		rc = Xsqlite3WalCheckpoint(tls, (*Pager)(unsafe.Pointer(pPager)).FpWal, db, eMode,
@@ -31389,7 +31394,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, 64387)
+				return Xsqlite3CorruptError(tls, 64391)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -31488,7 +31493,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64519)
+	rc = Xsqlite3CantopenError(tls, 64523)
 	goto finished
 __7:
 	;
@@ -31656,7 +31661,7 @@ __24:
 		goto __30
 	}
 	Xsqlite3_log(tls, SQLITE_NOTICE|int32(1)<<8,
-		ts+4373,
+		ts+4392,
 		libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 __30:
 	;
@@ -32074,7 +32079,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65333)
+	rc = Xsqlite3CorruptError(tls, 65337)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -32219,7 +32224,7 @@ func walLimitSize(tls *libc.TLS, pWal uintptr, nMax I64) {
 	}
 	Xsqlite3EndBenignMalloc(tls)
 	if rx != 0 {
-		Xsqlite3_log(tls, rx, ts+4410, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
+		Xsqlite3_log(tls, rx, ts+4429, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 	}
 }
 
@@ -32349,7 +32354,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, 65682)
+		rc = Xsqlite3CantopenError(tls, 65686)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -32822,7 +32827,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66419)
+				return Xsqlite3CorruptError(tls, 66423)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -33327,7 +33332,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, 67138)
+			rc = Xsqlite3CorruptError(tls, 67142)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -33720,7 +33725,7 @@ func Xsqlite3BtreeLeaveCursor(tls *libc.TLS, pCur uintptr) {
 	Xsqlite3BtreeLeave(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpBtree)
 }
 
-var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 4436))
+var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 4455))
 
 var sqlite3SharedCacheList uintptr = uintptr(0)
 
@@ -33985,7 +33990,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, 69249)
+			rc = Xsqlite3CorruptError(tls, 69253)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -34122,7 +34127,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69434)
 	return
 __2:
 	;
@@ -34139,7 +34144,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69447)
 	goto ptrmap_exit
 __4:
 	;
@@ -34147,7 +34152,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69452)
 	goto ptrmap_exit
 __5:
 	;
@@ -34190,7 +34195,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, 69493)
+		return Xsqlite3CorruptError(tls, 69497)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -34200,7 +34205,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, 69501)
+		return Xsqlite3CorruptError(tls, 69505)
 	}
 	return SQLITE_OK
 }
@@ -34450,7 +34455,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, 69893)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69897)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -34497,7 +34502,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69951)
+	return Xsqlite3CorruptError(tls, 69955)
 __2:
 	;
 	if !(iFree != 0) {
@@ -34507,7 +34512,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69954)
+	return Xsqlite3CorruptError(tls, 69958)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -34520,7 +34525,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69962)
+	return Xsqlite3CorruptError(tls, 69966)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -34529,14 +34534,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69965)
+	return Xsqlite3CorruptError(tls, 69969)
 __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, 69967)
+	return Xsqlite3CorruptError(tls, 69971)
 __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))
@@ -34546,7 +34551,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69971)
+	return Xsqlite3CorruptError(tls, 69975)
 __11:
 	;
 __8:
@@ -34610,7 +34615,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 70004)
+	return Xsqlite3CorruptError(tls, 70008)
 __22:
 	;
 	size = int32((*struct {
@@ -34620,7 +34625,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 70010)
+	return Xsqlite3CorruptError(tls, 70014)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -34642,7 +34647,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 70024)
+	return Xsqlite3CorruptError(tls, 70028)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -34677,7 +34682,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, 70081)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70085)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -34690,13 +34695,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, 70096)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70100)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70107)
 	}
 	return uintptr(0)
 }
@@ -34721,7 +34726,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, 70152)
+			return Xsqlite3CorruptError(tls, 70156)
 		}
 	}
 
@@ -34732,7 +34737,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, 70170)
+				return Xsqlite3CorruptError(tls, 70174)
 			} else {
 				return SQLITE_OK
 			}
@@ -34784,22 +34789,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 70249)
+				return Xsqlite3CorruptError(tls, 70253)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 70254)
+			return Xsqlite3CorruptError(tls, 70258)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 70266)
+				return Xsqlite3CorruptError(tls, 70270)
 			}
 			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, 70269)
+				return Xsqlite3CorruptError(tls, 70273)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -34809,7 +34814,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, 70282)
+					return Xsqlite3CorruptError(tls, 70286)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -34817,7 +34822,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, 70288)
+			return Xsqlite3CorruptError(tls, 70292)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -34825,10 +34830,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, 70297)
+			return Xsqlite3CorruptError(tls, 70301)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70298)
+			return Xsqlite3CorruptError(tls, 70302)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -34888,7 +34893,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70357)
+			return Xsqlite3CorruptError(tls, 70361)
 		}
 	} else {
 		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
@@ -34924,7 +34929,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70381)
+			return Xsqlite3CorruptError(tls, 70385)
 		}
 	}
 	return SQLITE_OK
@@ -34954,11 +34959,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70432)
+			return Xsqlite3CorruptError(tls, 70436)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70437)
+				return Xsqlite3CorruptError(tls, 70441)
 			}
 			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))))
@@ -34969,15 +34974,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70447)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70451)
+			return Xsqlite3CorruptError(tls, 70455)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70463)
+		return Xsqlite3CorruptError(tls, 70467)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -35005,14 +35010,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, 70494)
+			return Xsqlite3CorruptError(tls, 70498)
 		}
 		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, 70499)
+			return Xsqlite3CorruptError(tls, 70503)
 		}
 	}
 	return SQLITE_OK
@@ -35026,7 +35031,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, 70531)
+		return Xsqlite3CorruptError(tls, 70535)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -35038,7 +35043,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, 70545)
+		return Xsqlite3CorruptError(tls, 70549)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -35141,7 +35146,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70700)
+	rc = Xsqlite3CorruptError(tls, 70704)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -35169,7 +35174,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, 70721)
+	rc = Xsqlite3CorruptError(tls, 70725)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -35208,7 +35213,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, 70787)
+			return Xsqlite3CorruptError(tls, 70791)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -35281,7 +35286,7 @@ func Xsqlite3BtreeOpen(tls *libc.TLS, pVfs uintptr, zFilename uintptr, db uintpt
 	mutexOpen = uintptr(0)
 	rc = SQLITE_OK
 	isTempDb = libc.Bool32(zFilename == uintptr(0) || int32(*(*int8)(unsafe.Pointer(zFilename))) == 0)
-	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4452) == 0 ||
+	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4471) == 0 ||
 		isTempDb != 0 && Xsqlite3TempInMemory(tls, db) != 0 ||
 		vfsFlags&SQLITE_OPEN_MEMORY != 0)
 
@@ -36053,7 +36058,7 @@ __9:
 	;
 __10:
 	;
-	if !(libc.Xmemcmp(tls, page1+21, ts+4461, uint64(3)) != 0) {
+	if !(libc.Xmemcmp(tls, page1+21, ts+4480, uint64(3)) != 0) {
 		goto __14
 	}
 	goto page1_init_failed
@@ -36091,7 +36096,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71722)
+	rc = Xsqlite3CorruptError(tls, 71726)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -36506,7 +36511,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, 72143)
+			return Xsqlite3CorruptError(tls, 72147)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -36532,7 +36537,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, 72162)
+						return Xsqlite3CorruptError(tls, 72166)
 					}
 					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)
@@ -36541,7 +36546,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, 72171)
+					return Xsqlite3CorruptError(tls, 72175)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -36552,7 +36557,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, 72183)
+				return Xsqlite3CorruptError(tls, 72187)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -36568,7 +36573,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, 72218)
+		return Xsqlite3CorruptError(tls, 72222)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -36629,7 +36634,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, 72316)
+			return Xsqlite3CorruptError(tls, 72320)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -36664,7 +36669,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, 72368)
+					return Xsqlite3CorruptError(tls, 72372)
 				}
 			}
 
@@ -36724,7 +36729,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, 72436)
+			rc = Xsqlite3CorruptError(tls, 72440)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -36763,7 +36768,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, 72487)
+			return Xsqlite3CorruptError(tls, 72491)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -36794,7 +36799,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72514)
+			return Xsqlite3CorruptError(tls, 72518)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -37135,7 +37140,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, 72978)
+			return Xsqlite3CorruptError(tls, 72982)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -37379,14 +37384,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, 73385)
+		return Xsqlite3CorruptError(tls, 73389)
 	}
 
 	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, 73400)
+		return Xsqlite3CorruptError(tls, 73404)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -37431,7 +37436,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, 73462)
+				return Xsqlite3CorruptError(tls, 73466)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -37480,7 +37485,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73547)
+		return Xsqlite3CorruptError(tls, 73551)
 	}
 	return rc
 }
@@ -37560,7 +37565,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, 73684)
+		return Xsqlite3CorruptError(tls, 73688)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -37651,7 +37656,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, 73823)
+	return Xsqlite3CorruptError(tls, 73827)
 __11:
 	;
 skip_init:
@@ -37671,7 +37676,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73835)
+	return Xsqlite3CorruptError(tls, 73839)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -37881,7 +37886,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 74077)
+	return Xsqlite3CorruptError(tls, 74081)
 __21:
 	;
 	goto __19
@@ -38085,7 +38090,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 74273)
+	return Xsqlite3CorruptError(tls, 74277)
 __4:
 	;
 	goto bypass_moveto_root
@@ -38150,7 +38155,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, 74360)
+	rc = Xsqlite3CorruptError(tls, 74364)
 	goto moveto_index_finish
 __17:
 	;
@@ -38198,7 +38203,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74392)
+	rc = Xsqlite3CorruptError(tls, 74396)
 __24:
 	;
 	goto moveto_index_finish
@@ -38317,7 +38322,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, 74508)
+		return Xsqlite3CorruptError(tls, 74512)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -38477,7 +38482,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74688)
+	return Xsqlite3CorruptError(tls, 74692)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -38542,7 +38547,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74744)
+	rc = Xsqlite3CorruptError(tls, 74748)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -38578,7 +38583,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74773)
+	rc = Xsqlite3CorruptError(tls, 74777)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -38622,7 +38627,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74807)
+	rc = Xsqlite3CorruptError(tls, 74811)
 	goto end_allocate_page
 __32:
 	;
@@ -38734,7 +38739,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74872)
+	rc = Xsqlite3CorruptError(tls, 74876)
 	goto end_allocate_page
 __51:
 	;
@@ -38892,7 +38897,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, 74999)
+	return Xsqlite3CorruptError(tls, 75003)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -38949,7 +38954,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75050)
 	goto freepage_out
 __10:
 	;
@@ -38965,7 +38970,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75061)
 	goto freepage_out
 __12:
 	;
@@ -39039,7 +39044,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, 75146)
+		return Xsqlite3CorruptError(tls, 75150)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -39051,7 +39056,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, 75163)
+			return Xsqlite3CorruptError(tls, 75167)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -39062,7 +39067,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, 75183)
+			rc = Xsqlite3CorruptError(tls, 75187)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -39227,7 +39232,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, 75436)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75440)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -39506,12 +39511,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, 75737)
+				return Xsqlite3CorruptError(tls, 75741)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75742)
+			return Xsqlite3CorruptError(tls, 75746)
 		}
 
 		pData -= uintptr(sz)
@@ -39519,7 +39524,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, 75748)
+			return Xsqlite3CorruptError(tls, 75752)
 		}
 		libc.X__builtin___memmove_chk(tls, pData, pCell, uint64(sz), libc.X__builtin_object_size(tls, pData, 0))
 
@@ -39579,7 +39584,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, 75833)
+			Xsqlite3CorruptError(tls, 75837)
 			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))
@@ -39668,7 +39673,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75947)
+	return Xsqlite3CorruptError(tls, 75951)
 __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))
@@ -39784,7 +39789,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, 76060)
+		return Xsqlite3CorruptError(tls, 76064)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -40104,7 +40109,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, 76481)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76485)
 	goto balance_cleanup
 __25:
 	;
@@ -40115,7 +40120,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76509)
 	goto balance_cleanup
 __27:
 	;
@@ -40273,7 +40278,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76610)
 	goto balance_cleanup
 __55:
 	;
@@ -40347,7 +40352,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76643)
 	goto balance_cleanup
 __67:
 	;
@@ -40410,7 +40415,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76687)
 	goto balance_cleanup
 __75:
 	;
@@ -40438,7 +40443,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76720)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -40699,7 +40704,7 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76920)
 	goto balance_cleanup
 __121:
 	;
@@ -40889,7 +40894,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, 77146)
+			return Xsqlite3CorruptError(tls, 77150)
 		}
 	}
 	return SQLITE_OK
@@ -40927,7 +40932,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 77206)
+			rc = Xsqlite3CorruptError(tls, 77210)
 		} 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)))
@@ -41033,7 +41038,7 @@ func btreeOverwriteOverflowCell(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, 77370)
+			rc = Xsqlite3CorruptError(tls, 77374)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -41058,7 +41063,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 
 	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)
+		return Xsqlite3CorruptError(tls, 77402)
 	}
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
 		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
@@ -41128,7 +41133,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77479)
+	return Xsqlite3CorruptError(tls, 77483)
 __3:
 	;
 __1:
@@ -41241,7 +41246,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77606)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -41301,6 +41306,7 @@ __30:
 __25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
+	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
 		goto __31
 	}
@@ -41308,7 +41314,7 @@ __25:
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
 		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77640)
+	return Xsqlite3CorruptError(tls, 77645)
 __33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
@@ -41346,13 +41352,13 @@ __37:
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77667)
+	return Xsqlite3CorruptError(tls, 77672)
 __39:
 	;
 	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __40
 	}
-	return Xsqlite3CorruptError(tls, 77670)
+	return Xsqlite3CorruptError(tls, 77675)
 __40:
 	;
 	libc.X__builtin___memcpy_chk(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))), libc.X__builtin_object_size(tls, oldCell, 0))
@@ -41383,7 +41389,6 @@ __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 __44
 	}
@@ -41458,7 +41463,7 @@ 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, 77773)
+		return Xsqlite3CorruptError(tls, 77777)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
@@ -41483,7 +41488,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, 77798)
+				return Xsqlite3CorruptError(tls, 77802)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -41584,7 +41589,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77894)
+			return Xsqlite3CorruptError(tls, 77898)
 		}
 	}
 
@@ -41592,11 +41597,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, 77903)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 	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, 77907)
+		return Xsqlite3CorruptError(tls, 77911)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -41671,7 +41676,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, 77998)
+			return Xsqlite3CorruptError(tls, 78002)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -41740,7 +41745,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, 78114)
+			return Xsqlite3CorruptError(tls, 78118)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -41769,7 +41774,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, 78162)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78166)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -41845,7 +41850,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 78252)
+	return Xsqlite3CorruptError(tls, 78256)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -41859,7 +41864,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, 78259)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78263)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -41993,7 +41998,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, 78363)
+		return Xsqlite3CorruptError(tls, 78367)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -42210,7 +42215,7 @@ 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+64, ts+4465, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4484, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
 		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
@@ -42235,11 +42240,11 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 	defer tls.Free(16)
 
 	if iPage > (*IntegrityCk)(unsafe.Pointer(pCheck)).FnPage || iPage == Pgno(0) {
-		checkAppendMsg(tls, pCheck, ts+4467, libc.VaList(bp, iPage))
+		checkAppendMsg(tls, pCheck, ts+4486, libc.VaList(bp, iPage))
 		return 1
 	}
 	if getPageReferenced(tls, pCheck, iPage) != 0 {
-		checkAppendMsg(tls, pCheck, ts+4490, libc.VaList(bp+8, iPage))
+		checkAppendMsg(tls, pCheck, ts+4509, libc.VaList(bp+8, iPage))
 		return 1
 	}
 	setPageReferenced(tls, pCheck, iPage)
@@ -42257,13 +42262,13 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
 			checkOom(tls, pCheck)
 		}
-		checkAppendMsg(tls, pCheck, ts+4515, libc.VaList(bp, iChild))
+		checkAppendMsg(tls, pCheck, ts+4534, libc.VaList(bp, iChild))
 		return
 	}
 
 	if int32(*(*U8)(unsafe.Pointer(bp + 48))) != int32(eType) || *(*Pgno)(unsafe.Pointer(bp + 52)) != iParent {
 		checkAppendMsg(tls, pCheck,
-			ts+4544,
+			ts+4563,
 			libc.VaList(bp+8, iChild, int32(eType), iParent, int32(*(*U8)(unsafe.Pointer(bp + 48))), *(*Pgno)(unsafe.Pointer(bp + 52))))
 	}
 }
@@ -42282,7 +42287,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 		}
 		N--
 		if Xsqlite3PagerGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpPager, iPage, bp+40, 0) != 0 {
-			checkAppendMsg(tls, pCheck, ts+4598, libc.VaList(bp, iPage))
+			checkAppendMsg(tls, pCheck, ts+4617, libc.VaList(bp, iPage))
 			break
 		}
 		pOvflData = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
@@ -42293,7 +42298,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 			}
 			if n > (*BtShared)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt)).FusableSize/U32(4)-U32(2) {
 				checkAppendMsg(tls, pCheck,
-					ts+4620, libc.VaList(bp+8, iPage))
+					ts+4639, libc.VaList(bp+8, iPage))
 				N--
 			} else {
 				for i = 0; i < int32(n); i++ {
@@ -42316,12 +42321,12 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 	}
 	if N != 0 && nErrAtStart == (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr {
 		checkAppendMsg(tls, pCheck,
-			ts+4659,
+			ts+4678,
 			libc.VaList(bp+16, func() uintptr {
 				if isFreeList != 0 {
-					return ts + 4685
+					return ts + 4704
 				}
-				return ts + 4690
+				return ts + 4709
 			}(),
 				expected-N, expected))
 	}
@@ -42437,13 +42442,13 @@ __2:
 	return 0
 __3:
 	;
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4711
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4730
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
 		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4721, libc.VaList(bp, rc))
+		ts+4740, libc.VaList(bp, rc))
 	goto end_of_check
 __4:
 	;
@@ -42454,7 +42459,7 @@ __4:
 	}
 
 	checkAppendMsg(tls, pCheck,
-		ts+4759, libc.VaList(bp+8, rc))
+		ts+4778, libc.VaList(bp+8, rc))
 	goto end_of_check
 __5:
 	;
@@ -42462,14 +42467,14 @@ __5:
 		goto __6
 	}
 
-	checkAppendMsg(tls, pCheck, ts+4797, libc.VaList(bp+16, rc))
+	checkAppendMsg(tls, pCheck, ts+4816, libc.VaList(bp+16, rc))
 	goto end_of_check
 __6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
 
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4819
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4838
 	contentOffset = U32((int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5))))<<8|int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5) + 1)))-1)&0xffff + 1)
 
 	nCell = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3) + 1)))
@@ -42486,7 +42491,7 @@ __6:
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
 		goto __9
 	}
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4845
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4864
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
 __9:
 	;
@@ -42511,7 +42516,7 @@ __10:
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
 		goto __13
 	}
-	checkAppendMsg(tls, pCheck, ts+4873,
+	checkAppendMsg(tls, pCheck, ts+4892,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
 	goto __11
@@ -42524,7 +42529,7 @@ __13:
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
 		goto __14
 	}
-	checkAppendMsg(tls, pCheck, ts+4903, 0)
+	checkAppendMsg(tls, pCheck, ts+4922, 0)
 	doCoverageCheck = 0
 	goto __11
 __14:
@@ -42540,7 +42545,7 @@ __14:
 	}() != 0) {
 		goto __16
 	}
-	checkAppendMsg(tls, pCheck, ts+4927, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
+	checkAppendMsg(tls, pCheck, ts+4946, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
 __16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
@@ -42578,7 +42583,7 @@ __21:
 	if !(d2 != depth) {
 		goto __22
 	}
-	checkAppendMsg(tls, pCheck, ts+4951, 0)
+	checkAppendMsg(tls, pCheck, ts+4970, 0)
 	depth = d2
 __22:
 	;
@@ -42651,7 +42656,7 @@ __30:
 		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4976, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
+		ts+4995, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
 	goto __31
 	goto __33
 __32:
@@ -42668,7 +42673,7 @@ __31:
 		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+5013,
+		ts+5032,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
 __34:
 	;
@@ -42782,7 +42787,7 @@ __6:
 	if !(bCkFreelist != 0) {
 		goto __7
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 5065
+	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 5084
 	checkList(tls, bp+32, 1, Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+32),
 		Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
@@ -42818,7 +42823,7 @@ __13:
 		goto __15
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+5081,
+		ts+5100,
 		libc.VaList(bp, mx, mxInHdr))
 __15:
 	;
@@ -42828,7 +42833,7 @@ __9:
 		goto __16
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+5126, 0)
+		ts+5145, 0)
 __16:
 	;
 __10:
@@ -42875,13 +42880,13 @@ __23:
 	if !(getPageReferenced(tls, bp+32, i) == 0 && (ptrmapPageno(tls, pBt, i) != i || !(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0))) {
 		goto __26
 	}
-	checkAppendMsg(tls, bp+32, ts+5181, libc.VaList(bp+16, i))
+	checkAppendMsg(tls, bp+32, ts+5200, libc.VaList(bp+16, i))
 __26:
 	;
 	if !(getPageReferenced(tls, bp+32, i) != 0 && (ptrmapPageno(tls, pBt, i) == i && (*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0)) {
 		goto __27
 	}
-	checkAppendMsg(tls, bp+32, ts+5203, libc.VaList(bp+24, i))
+	checkAppendMsg(tls, bp+32, ts+5222, libc.VaList(bp+24, i))
 __27:
 	;
 	goto __24
@@ -43144,7 +43149,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 		var rc int32 = 0
 		Xsqlite3ParseObjectInit(tls, bp+16, pDb)
 		if Xsqlite3OpenTempDatabase(tls, bp+16) != 0 {
-			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3658, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3677, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 			rc = SQLITE_ERROR
 		}
 		Xsqlite3DbFree(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
@@ -43155,7 +43160,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 	}
 
 	if i < 0 {
-		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+5237, libc.VaList(bp+8, zDb))
+		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+5256, libc.VaList(bp+8, zDb))
 		return uintptr(0)
 	}
 
@@ -43170,7 +43175,7 @@ func setDestPgsz(tls *libc.TLS, p uintptr) int32 {
 
 func checkReadTransaction(tls *libc.TLS, db uintptr, p uintptr) int32 {
 	if Xsqlite3BtreeTxnState(tls, p) != SQLITE_TXN_NONE {
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+5257, 0)
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+5276, 0)
 		return SQLITE_ERROR
 	}
 	return SQLITE_OK
@@ -43190,7 +43195,7 @@ func Xsqlite3_backup_init(tls *libc.TLS, pDestDb uintptr, zDestDb uintptr, pSrcD
 
 	if pSrcDb == pDestDb {
 		Xsqlite3ErrorWithMsg(tls,
-			pDestDb, SQLITE_ERROR, ts+5288, 0)
+			pDestDb, SQLITE_ERROR, ts+5307, 0)
 		p = uintptr(0)
 	} else {
 		p = Xsqlite3MallocZero(tls, uint64(unsafe.Sizeof(Sqlite3_backup{})))
@@ -43638,7 +43643,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 		(*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,
+		Xsqlite3_str_appendf(tls, bp+8, ts+5347,
 			libc.VaList(bp, func() float64 {
 				if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_IntReal != 0 {
 					return float64(*(*I64)(unsafe.Pointer(p)))
@@ -44230,7 +44235,7 @@ func Xsqlite3VdbeMemSetPointer(tls *libc.TLS, pMem uintptr, pPtr uintptr, zPType
 		if zPType != 0 {
 			return zPType
 		}
-		return ts + 1547
+		return ts + 1566
 	}()
 	(*Mem)(unsafe.Pointer(pMem)).Fz = pPtr
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null | MEM_Dyn | MEM_Subtype | MEM_Term)
@@ -44462,7 +44467,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, 81630)
+		return Xsqlite3CorruptError(tls, 81634)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -44694,7 +44699,7 @@ __9:
 		goto __10
 	}
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 8)).FisError
-	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3658, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
+	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3677, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
 	goto __11
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
@@ -44747,7 +44752,7 @@ func valueFromExpr(tls *libc.TLS, db uintptr, pExpr uintptr, enc U8, affinity U8
 	zVal = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	negInt = 1
-	zNeg = ts + 1547
+	zNeg = ts + 1566
 	rc = SQLITE_OK
 
 __1:
@@ -44788,7 +44793,7 @@ __4:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
 	negInt = -1
-	zNeg = ts + 5335
+	zNeg = ts + 5354
 __6:
 	;
 	if !(op == TK_STRING || op == TK_FLOAT || op == TK_INTEGER) {
@@ -44807,7 +44812,7 @@ __9:
 	Xsqlite3VdbeMemSetInt64(tls, *(*uintptr)(unsafe.Pointer(bp + 16)), I64(*(*int32)(unsafe.Pointer(pExpr + 8)))*I64(negInt))
 	goto __11
 __10:
-	zVal = Xsqlite3MPrintf(tls, db, ts+5337, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+	zVal = Xsqlite3MPrintf(tls, db, ts+5356, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	if !(zVal == uintptr(0)) {
 		goto __12
 	}
@@ -45111,7 +45116,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, 82270)
+		return Xsqlite3CorruptError(tls, 82274)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -45126,14 +45131,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 82276)
+			return Xsqlite3CorruptError(tls, 82280)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 82282)
+		return Xsqlite3CorruptError(tls, 82286)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -46141,34 +46146,34 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var j int32
 			var pKeyInfo uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+5342, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+5361, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
 			for j = 0; j < int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField); j++ {
 				var pColl uintptr = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(j)*8))
 				var zColl uintptr
 				if pColl != 0 {
 					zColl = (*CollSeq)(unsafe.Pointer(pColl)).FzName
 				} else {
-					zColl = ts + 1547
+					zColl = ts + 1566
 				}
-				if libc.Xstrcmp(tls, zColl, ts+1092) == 0 {
-					zColl = ts + 5347
+				if libc.Xstrcmp(tls, zColl, ts+1111) == 0 {
+					zColl = ts + 5366
 				}
-				Xsqlite3_str_appendf(tls, bp+144, ts+5349,
+				Xsqlite3_str_appendf(tls, bp+144, ts+5368,
 					libc.VaList(bp+8, func() uintptr {
 						if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_DESC != 0 {
-							return ts + 5335
+							return ts + 5354
 						}
-						return ts + 1547
+						return ts + 1566
 					}(),
 						func() uintptr {
 							if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_BIGNULL != 0 {
-								return ts + 5357
+								return ts + 5376
 							}
-							return ts + 1547
+							return ts + 1566
 						}(),
 						zColl))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+5360, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+5379, 1)
 			break
 
 		}
@@ -46176,7 +46181,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 		{
 			var pColl uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+5362, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
+			Xsqlite3_str_appendf(tls, bp+144, ts+5381, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
 				encnames[(*CollSeq)(unsafe.Pointer(pColl)).Fenc]))
 			break
 
@@ -46184,32 +46189,32 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -7:
 		{
 			var pDef uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
-			Xsqlite3_str_appendf(tls, bp+144, ts+5371, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+5390, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -15:
 		{
 			var pDef uintptr = (*Sqlite3_context)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpFunc
-			Xsqlite3_str_appendf(tls, bp+144, ts+5371, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+5390, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -13:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1327, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1346, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
 	case -3:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+5378, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+5397, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
 			break
 
 		}
 	case -12:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1321, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1340, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
@@ -46219,13 +46224,13 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Str != 0 {
 				zP4 = (*Mem)(unsafe.Pointer(pMem)).Fz
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1327, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1346, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1321, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1340, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Null != 0 {
-				zP4 = ts + 1548
+				zP4 = ts + 1567
 			} else {
-				zP4 = ts + 5381
+				zP4 = ts + 5400
 			}
 			break
 
@@ -46233,7 +46238,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -11:
 		{
 			var pVtab uintptr = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-			Xsqlite3_str_appendf(tls, bp+144, ts+5388, libc.VaList(bp+120, pVtab))
+			Xsqlite3_str_appendf(tls, bp+144, ts+5407, libc.VaList(bp+120, pVtab))
 			break
 
 		}
@@ -46244,20 +46249,20 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var n U32 = *(*U32)(unsafe.Pointer(ai))
 
 			for i = U32(1); i <= n; i++ {
-				Xsqlite3_str_appendf(tls, bp+144, ts+5396, libc.VaList(bp+128, func() int32 {
+				Xsqlite3_str_appendf(tls, bp+144, ts+5415, libc.VaList(bp+128, func() int32 {
 					if i == U32(1) {
 						return '['
 					}
 					return ','
 				}(), *(*U32)(unsafe.Pointer(ai + uintptr(i)*4))))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+5401, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+5420, 1)
 			break
 
 		}
 	case -4:
 		{
-			zP4 = ts + 5403
+			zP4 = ts + 5422
 			break
 
 		}
@@ -46282,7 +46287,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	return Xsqlite3StrAccumFinish(tls, bp+144)
 }
 
-var encnames = [4]uintptr{ts + 5411, ts + 5413, ts + 5415, ts + 5420}
+var encnames = [4]uintptr{ts + 5430, ts + 5432, ts + 5434, ts + 5439}
 
 // Declare to the Vdbe that the BTree object at db->aDb[i] is used.
 //
@@ -46732,8 +46737,8 @@ func Xsqlite3VdbeMakeReady(tls *libc.TLS, p uintptr, pParse uintptr) {
 }
 
 var azColName = [12]uintptr{
-	ts + 5425, ts + 5430, ts + 5437, ts + 5440, ts + 5443, ts + 5446, ts + 5449, ts + 5452,
-	ts + 5460, ts + 5463, ts + 5470, ts + 5478,
+	ts + 5444, ts + 5449, ts + 5456, ts + 5459, ts + 5462, ts + 5465, ts + 5468, ts + 5471,
+	ts + 5479, ts + 5482, ts + 5489, ts + 5497,
 }
 
 // Close a VDBE cursor and release all the resources that cursor
@@ -46942,7 +46947,7 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		var nMainFile int32
 
 		nMainFile = Xsqlite3Strlen30(tls, zMainFile)
-		zSuper = Xsqlite3MPrintf(tls, db, ts+5485, libc.VaList(bp, 0, zMainFile, 0))
+		zSuper = Xsqlite3MPrintf(tls, db, ts+5504, libc.VaList(bp, 0, zMainFile, 0))
 		if zSuper == uintptr(0) {
 			return SQLITE_NOMEM
 		}
@@ -46950,16 +46955,16 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		for __ccgo := true; __ccgo; __ccgo = rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 60)) != 0 {
 			if retryCount != 0 {
 				if retryCount > 100 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5497, libc.VaList(bp+24, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5516, libc.VaList(bp+24, zSuper))
 					Xsqlite3OsDelete(tls, pVfs, zSuper, 0)
 					break
 				} else if retryCount == 1 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5511, libc.VaList(bp+32, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5530, libc.VaList(bp+32, zSuper))
 				}
 			}
 			retryCount++
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
-			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5526,
+			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5545,
 				libc.VaList(bp+40, *(*U32)(unsafe.Pointer(bp + 56))>>8&U32(0xffffff), *(*U32)(unsafe.Pointer(bp + 56))&U32(0xff)))
 
 			rc = Xsqlite3OsAccess(tls, pVfs, zSuper, SQLITE_ACCESS_EXISTS, bp+60)
@@ -47105,7 +47110,7 @@ func Xsqlite3VdbeCheckFk(tls *libc.TLS, p uintptr, deferred int32) int32 {
 		!(deferred != 0) && (*Vdbe)(unsafe.Pointer(p)).FnFkConstraint > int64(0) {
 		(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_CONSTRAINT | int32(3)<<8
 		(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
-		Xsqlite3VdbeError(tls, p, ts+5539, 0)
+		Xsqlite3VdbeError(tls, p, ts+5558, 0)
 		if int32((*Vdbe)(unsafe.Pointer(p)).FprepFlags)&SQLITE_PREPARE_SAVESQL == 0 {
 			return SQLITE_ERROR
 		}
@@ -47437,7 +47442,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 86058)
+		return Xsqlite3CorruptError(tls, 86062)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -47988,7 +47993,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86989))
 		return 0
 	}
 
@@ -48053,7 +48058,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, 87062))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87066))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -48087,7 +48092,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, 87092))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87096))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -48137,7 +48142,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, 87136))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87140))
 			return 0
 		}
 	}
@@ -48283,7 +48288,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87303))
 	return 0
 __7:
 	;
@@ -48454,7 +48459,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87457)
+	return Xsqlite3CorruptError(tls, 87461)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -48480,7 +48485,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, 87490)
+		return Xsqlite3CorruptError(tls, 87494)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -48591,13 +48596,13 @@ func Xsqlite3NotPureFunc(tls *libc.TLS, pCtx uintptr) int32 {
 		var zContext uintptr
 		var zMsg uintptr
 		if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_IsCheck != 0 {
-			zContext = ts + 5569
-		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5588
-		} else {
+		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5607
+		} else {
+			zContext = ts + 5626
 		}
-		zMsg = Xsqlite3_mprintf(tls, ts+5616,
+		zMsg = Xsqlite3_mprintf(tls, ts+5635,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx)).FpFunc)).FzName, zContext))
 		Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 		Xsqlite3_free(tls, zMsg)
@@ -48702,7 +48707,7 @@ func Xsqlite3_expired(tls *libc.TLS, pStmt uintptr) int32 {
 
 func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 	if (*Vdbe)(unsafe.Pointer(p)).Fdb == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5652, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5671, 0)
 		return 1
 	} else {
 		return 0
@@ -48712,7 +48717,7 @@ func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 
 func vdbeSafetyNotNull(tls *libc.TLS, p uintptr) int32 {
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5697, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5716, 0)
 		return 1
 	} else {
 		return vdbeSafety(tls, p)
@@ -48754,7 +48759,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, 87854)
+			return Xsqlite3MisuseError(tls, 87858)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -49177,7 +49182,7 @@ func Xsqlite3_result_error_code(tls *libc.TLS, pCtx uintptr, errCode int32) {
 // Force an SQLITE_TOOBIG error.
 func Xsqlite3_result_error_toobig(tls *libc.TLS, pCtx uintptr) {
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FisError = SQLITE_TOOBIG
-	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5737, int64(-1),
+	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5756, int64(-1),
 		uint8(SQLITE_UTF8), uintptr(0))
 }
 
@@ -49369,7 +49374,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88544)
+		return Xsqlite3MisuseError(tls, 88548)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -49889,15 +49894,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 89208)
+		return Xsqlite3MisuseError(tls, 89212)
 	}
 	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+5760, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 89216)
+			ts+5779, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89220)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -50302,7 +50307,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, 89707)
+	rc = Xsqlite3MisuseError(tls, 89711)
 	goto preupdate_old_out
 __1:
 	;
@@ -50446,7 +50451,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, 89809)
+	rc = Xsqlite3MisuseError(tls, 89813)
 	goto preupdate_new_out
 __1:
 	;
@@ -50618,7 +50623,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+5800, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5819, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -50654,11 +50659,11 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 
 			pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr(*(*int32)(unsafe.Pointer(bp + 84))-1)*56
 			if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Null != 0 {
-				Xsqlite3_str_append(tls, bp+48, ts+1548, 4)
+				Xsqlite3_str_append(tls, bp+48, ts+1567, 4)
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+1327, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+1346, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+5328, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5347, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Str != 0 {
 				var nOut int32
 				var enc U8 = (*Sqlite3)(unsafe.Pointer(db)).Fenc
@@ -50673,21 +50678,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+5804, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5823, 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+5811, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5830, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5824, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5843, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					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_appendf(tls, bp+48, ts+5846, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5832, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5851, 1)
 			}
 		}
 	}
@@ -50890,10 +50895,6 @@ func filterHash(tls *libc.TLS, aMem uintptr, pOp uintptr) U64 {
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Real != 0 {
 			h = h + U64(Xsqlite3VdbeIntValue(tls, p))
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&(MEM_Str|MEM_Blob) != 0 {
-			h = h + U64((*Mem)(unsafe.Pointer(p)).Fn)
-			if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Zero != 0 {
-				h = h + U64(*(*int32)(unsafe.Pointer(p)))
-			}
 		}
 	}
 	return h
@@ -50904,11 +50905,11 @@ func vdbeMemTypeName(tls *libc.TLS, pMem uintptr) uintptr {
 }
 
 var azTypes = [5]uintptr{
-	ts + 1108,
-	ts + 1120,
-	ts + 1125,
-	ts + 1103,
-	ts + 1548,
+	ts + 1127,
+	ts + 1139,
+	ts + 1144,
+	ts + 1122,
+	ts + 1567,
 }
 
 // Execute as much of a VDBE program as we can.
@@ -51951,20 +51952,20 @@ __202:
 		goto __205
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5834, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	Xsqlite3VdbeError(tls, p, ts+5853, 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))))
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5874, 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))))
+	Xsqlite3VdbeError(tls, p, ts+3677, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	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))
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5881, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 __204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
@@ -53542,7 +53543,7 @@ op_column_corrupt:
 	goto __9
 	goto __425
 __424:
-	rc = Xsqlite3CorruptError(tls, 93317)
+	rc = Xsqlite3CorruptError(tls, 93320)
 	goto abort_due_to_error
 __425:
 	;
@@ -53670,7 +53671,7 @@ __428:
 	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5886,
+	Xsqlite3VdbeError(tls, p, ts+5905,
 		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
@@ -54102,7 +54103,7 @@ __78:
 		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5927, 0)
+	Xsqlite3VdbeError(tls, p, ts+5946, 0)
 	rc = SQLITE_BUSY
 	goto __523
 __522:
@@ -54162,7 +54163,7 @@ __530:
 	if !!(pSavepoint != 0) {
 		goto __531
 	}
-	Xsqlite3VdbeError(tls, p, ts+5978, libc.VaList(bp+88, zName))
+	Xsqlite3VdbeError(tls, p, ts+5997, libc.VaList(bp+88, zName))
 	rc = SQLITE_ERROR
 	goto __532
 __531:
@@ -54171,7 +54172,7 @@ __531:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+6000, 0)
+		ts+6019, 0)
 	rc = SQLITE_BUSY
 	goto __534
 __533:
@@ -54357,7 +54358,7 @@ __564:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+6054, 0)
+		ts+6073, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
 	goto __567
@@ -54400,13 +54401,13 @@ __562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 6109
+				return ts + 6128
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 6157
+					return ts + 6176
 				}
-				return ts + 6200
+				return ts + 6219
 			}()
 		}(), 0)
 
@@ -54489,7 +54490,7 @@ __576:
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+6241)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+6260)
 
 	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 __583
@@ -54693,7 +54694,7 @@ __88:
 	}
 
 	(*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
+	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1566
 __602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -55302,7 +55303,7 @@ notExistsWithKey:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
 		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95560)
+	rc = Xsqlite3CorruptError(tls, 95563)
 	goto __683
 __682:
 	goto jump_to_p2
@@ -56080,7 +56081,7 @@ __767:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
 		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+6269)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96638, ts+6288)
 	goto abort_due_to_error
 __770:
 	;
@@ -56190,7 +56191,7 @@ __780:
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
 		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96840)
+	rc = Xsqlite3CorruptError(tls, 96843)
 	goto abort_due_to_error
 __781:
 	;
@@ -56351,14 +56352,14 @@ __141:
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	goto __799
 __798:
-	zSchema = ts + 6286
+	zSchema = ts + 6305
 	(*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+6300,
+		ts+6319,
 		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 __800
@@ -56384,7 +56385,7 @@ __802:
 		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 97092)
+	rc = Xsqlite3CorruptError(tls, 97095)
 __803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
@@ -56574,7 +56575,7 @@ __820:
 		goto __825
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+6343, 0)
+	Xsqlite3VdbeError(tls, p, ts+6362, 0)
 	goto abort_due_to_error
 __825:
 	;
@@ -56886,7 +56887,7 @@ __860:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
 		goto __862
 	}
-	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
+	Xsqlite3VdbeError(tls, p, ts+3677, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
 __862:
 	;
@@ -56936,7 +56937,7 @@ __867:
 	if !(rc != 0) {
 		goto __868
 	}
-	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
+	Xsqlite3VdbeError(tls, p, ts+3677, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
 __868:
 	;
@@ -57018,12 +57019,12 @@ __876:
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+6380,
+		ts+6399,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6432
+				return ts + 6451
 			}
-			return ts + 6437
+			return ts + 6456
 		}()))
 	goto abort_due_to_error
 	goto __879
@@ -57165,7 +57166,7 @@ __171:
 		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6444, libc.VaList(bp+144, z1))
+	Xsqlite3VdbeError(tls, p, ts+6463, libc.VaList(bp+144, z1))
 __894:
 	;
 	goto abort_due_to_error
@@ -57283,7 +57284,7 @@ __904:
 	(*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+6473, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6492, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
 	goto __9
 
 __177:
@@ -57372,7 +57373,7 @@ __912:
 	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)))
+	Xsqlite3VdbeError(tls, p, ts+3677, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
 __913:
 	;
@@ -57602,7 +57603,7 @@ __935:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
 		goto __940
 	}
-	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
+	Xsqlite3VdbeError(tls, p, ts+3677, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
 __940:
 	;
@@ -57678,7 +57679,7 @@ __945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
 		goto __947
 	}
-	z3 = Xsqlite3MPrintf(tls, db, ts+6483, libc.VaList(bp+168, zTrace))
+	z3 = Xsqlite3MPrintf(tls, db, ts+6502, 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)
@@ -57751,7 +57752,7 @@ __955:
 	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __957
 	}
-	rc = Xsqlite3CorruptError(tls, 99031)
+	rc = Xsqlite3CorruptError(tls, 99034)
 __957:
 	;
 __956:
@@ -57759,13 +57760,13 @@ __956:
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
 		goto __958
 	}
-	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
+	Xsqlite3VdbeError(tls, p, ts+3677, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
 __958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
 
-	Xsqlite3_log(tls, rc, ts+6489,
+	Xsqlite3_log(tls, rc, ts+6508,
 		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 __959
@@ -57821,13 +57822,13 @@ __966:
 	return rc
 
 too_big:
-	Xsqlite3VdbeError(tls, p, ts+5737, 0)
+	Xsqlite3VdbeError(tls, p, ts+5756, 0)
 	rc = SQLITE_TOOBIG
 	goto abort_due_to_error
 
 no_mem:
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3VdbeError(tls, p, ts+1483, 0)
+	Xsqlite3VdbeError(tls, p, ts+1502, 0)
 	rc = SQLITE_NOMEM
 	goto abort_due_to_error
 
@@ -57838,8 +57839,8 @@ abort_due_to_interrupt:
 	return int32(0)
 }
 
-var azType = [4]uintptr{ts + 6521, ts + 6530, ts + 6537,
-	ts + 6543}
+var azType = [4]uintptr{ts + 6540, ts + 6549, ts + 6556,
+	ts + 6562}
 var and_logic = [9]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(1), uint8(2), uint8(0), uint8(2), uint8(2)}
 var or_logic = [9]uint8{uint8(0), uint8(1), uint8(2), uint8(1), uint8(1), uint8(1), uint8(2), uint8(1), uint8(2)}
 var aMask = [12]uint8{
@@ -57894,16 +57895,16 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		}
 
 		if type1 < U32(12) {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6555,
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6574,
 				libc.VaList(bp, func() uintptr {
 					if type1 == U32(0) {
-						return ts + 6584
+						return ts + 6603
 					}
 					return func() uintptr {
 						if type1 == U32(7) {
-							return ts + 6589
+							return ts + 6608
 						}
-						return ts + 6594
+						return ts + 6613
 					}()
 				}()))
 			rc = SQLITE_ERROR
@@ -57923,10 +57924,10 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		rc = Xsqlite3_finalize(tls, (*Incrblob)(unsafe.Pointer(p)).FpStmt)
 		(*Incrblob)(unsafe.Pointer(p)).FpStmt = uintptr(0)
 		if rc == SQLITE_OK {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6602, libc.VaList(bp+8, iRow))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6621, libc.VaList(bp+8, iRow))
 			rc = SQLITE_ERROR
 		} else {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3658, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3677, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
 		}
 	}
 
@@ -57986,21 +57987,21 @@ __3:
 		goto __4
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6622, libc.VaList(bp, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6641, libc.VaList(bp, zTable))
 __4:
 	;
 	if !(pTab != 0 && !((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0))) {
 		goto __5
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6652, libc.VaList(bp+8, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6671, libc.VaList(bp+8, zTable))
 __5:
 	;
 	if !(pTab != 0 && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __6
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6688, libc.VaList(bp+16, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6707, libc.VaList(bp+16, zTable))
 __6:
 	;
 	if !!(pTab != 0) {
@@ -58044,7 +58045,7 @@ __11:
 		goto __13
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6709, libc.VaList(bp+24, zColumn))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6728, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -58071,7 +58072,7 @@ __19:
 	if !((*sColMap)(unsafe.Pointer(pFKey+64+uintptr(j)*16)).FiFrom == iCol) {
 		goto __22
 	}
-	zFault = ts + 6730
+	zFault = ts + 6749
 __22:
 	;
 	goto __20
@@ -58104,7 +58105,7 @@ __26:
 	if !(int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == iCol || int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == -2) {
 		goto __29
 	}
-	zFault = ts + 6742
+	zFault = ts + 6761
 __29:
 	;
 	goto __27
@@ -58125,7 +58126,7 @@ __25:
 		goto __30
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6750, libc.VaList(bp+32, zFault))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6769, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -58223,7 +58224,7 @@ __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
-			return ts + 3658
+			return ts + 3677
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
@@ -58271,7 +58272,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99516)
+		return Xsqlite3MisuseError(tls, 99519)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -58354,7 +58355,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99616)
+		return Xsqlite3MisuseError(tls, 99619)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -58367,7 +58368,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 				if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-					return ts + 3658
+					return ts + 3677
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
@@ -60896,25 +60897,25 @@ 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 {
+	if Xsqlite3_strnicmp(tls, zTab, ts+6803, 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 {
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6811+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6830+7) == 0 {
 			return 1
 		}
 		if pSchema == uintptr(0) {
 			return 0
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6286+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6305+7) == 0 {
 			return 1
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6830+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6849+7) == 0 {
 			return 1
 		}
 	} else {
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6830+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6849+7) == 0 {
 			return 1
 		}
 	}
@@ -60994,7 +60995,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6844, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6863, zDb) == 0) {
 		goto __8
 	}
 
@@ -61115,7 +61116,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6849) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6868) != 0) {
 		goto __33
 	}
 	goto __14
@@ -61289,14 +61290,14 @@ __60:
 	;
 	goto __59
 __58:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6851, zTab) == 0) {
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6870, zTab) == 0) {
 		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
 	goto __62
 __61:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6855, zTab) == 0) {
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6874, zTab) == 0) {
 		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
@@ -61313,7 +61314,7 @@ __57:
 		goto __64
 	}
 	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6859, zTab) == 0) {
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6878, zTab) == 0) {
 		goto __65
 	}
 	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
@@ -61472,7 +61473,7 @@ __86:
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
 		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6868, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6887, libc.VaList(bp, zAs))
 	return WRC_Abort
 __90:
 	;
@@ -61480,14 +61481,14 @@ __90:
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
 		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6899, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6918, libc.VaList(bp+8, zAs))
 	return WRC_Abort
 __91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
 		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6936, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6955, 0)
 	return WRC_Abort
 __92:
 	;
@@ -61539,7 +61540,7 @@ __11:
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6954, libc.VaList(bp+16, zCol))
+		ts+6973, 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
@@ -61576,7 +61577,7 @@ __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 + 6989
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7008
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
@@ -61589,23 +61590,23 @@ __101:
 __99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6998
+		zErr = ts + 7017
 	} else {
-		zErr = ts + 7013
+		zErr = ts + 7032
 	}
 	if !(zDb != 0) {
 		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7035, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+7054, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
 	goto __105
 __104:
 	if !(zTab != 0) {
 		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7048, libc.VaList(bp+56, zErr, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+7067, libc.VaList(bp+56, zErr, zTab, zCol))
 	goto __107
 __106:
-	Xsqlite3ErrorMsg(tls, pParse, ts+7058, libc.VaList(bp+80, zErr, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+7077, libc.VaList(bp+80, zErr, zCol))
 __107:
 	;
 __105:
@@ -61708,15 +61709,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 + 7065
+	var zIn uintptr = ts + 7084
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 7093
+		zIn = ts + 7112
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 7111
+		zIn = ts + 7130
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 7129
+		zIn = ts + 7148
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7147, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+7166, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -61794,14 +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 + 7167
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
-				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7172
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
-				}
-				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
+				*(*int32)(unsafe.Pointer(pExpr + 8)) = libc.Bool32(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL)
+				*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IntValue)
+				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_INTEGER)
+
 				i = 0
 				p = pNC
 			__4:
@@ -61845,7 +61842,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+7178, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7186, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -61909,7 +61906,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+7195, libc.VaList(bp, pExpr))
+								ts+7203, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -61925,7 +61922,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+7259,
+							Xsqlite3ErrorMsg(tls, pParse, ts+7267,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -61939,7 +61936,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+7295, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+7303, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -61962,30 +61959,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+7323, libc.VaList(bp+16, pExpr))
+						ts+7331, 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 + 7366
+						zType = ts + 7374
 					} else {
-						zType = ts + 7373
+						zType = ts + 7381
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+7383, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7391, 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+7411, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7419, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7433,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7441,
 						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+7477,
+						ts+7485,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -62057,15 +62054,15 @@ 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+7525, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7533, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
 
 				if nRef != (*NameContext)(unsafe.Pointer(pNC)).FnRef {
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_VarSelect)
-					*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_VarSelect
 				}
+				*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_Subquery
 			}
 			break
 
@@ -62073,7 +62070,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+7536, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7544, pExpr, pExpr)
 			}
 
 			break
@@ -62129,7 +62126,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+6936, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6955, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -62204,7 +62201,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7547, libc.VaList(bp, i, zType, mx))
+		ts+7555, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -62224,7 +62221,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+7603, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7611, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -62259,7 +62256,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+7637, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7645, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -62316,7 +62313,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+7643, libc.VaList(bp, i+1))
+				ts+7651, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -62344,7 +62341,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+7704, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7712, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -62558,7 +62555,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+7735, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7743, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -62598,7 +62595,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+7637) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7645) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -62609,7 +62606,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7774) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7782) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -62621,7 +62618,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+7780, 0)
+						ts+7788, 0)
 					return WRC_Abort
 				}
 
@@ -63410,7 +63407,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6936, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6955, 0)
 		return
 	}
 
@@ -63485,7 +63482,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+7839, libc.VaList(bp, mxHeight))
+			ts+7847, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -63734,12 +63731,12 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7887,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7895,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7931
+						return ts + 7939
 					}
-					return ts + 1547
+					return ts + 1566
 				}(), nElem))
 			break
 		}
@@ -63778,7 +63775,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+7933)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7941)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -63804,7 +63801,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+7935, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7943, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -63832,7 +63829,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+7969, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7977, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -63879,7 +63876,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+7989,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7997,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -63904,7 +63901,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+8032, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+8040, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -64479,7 +64476,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+8055,
+	Xsqlite3ErrorMsg(tls, pParse, ts+8063,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -64602,7 +64599,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+8085, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8093, libc.VaList(bp, zObject))
 	}
 }
 
@@ -64658,10 +64655,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+7167) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+8116) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+7172) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+8121) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -65092,13 +65089,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+8108) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+8127) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+8116) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+8135) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+8122) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+8141) == 0 {
 		return 1
 	}
 	return 0
@@ -65302,7 +65299,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+8126, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8145, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -65380,7 +65377,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+8173, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8192, 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)
 
@@ -65474,7 +65471,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 + 8204
+		var zFmt uintptr = ts + 8223
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -65492,7 +65489,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+6936, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6955, 0)
 	}
 }
 
@@ -65533,7 +65530,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+8248, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8267, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -65563,11 +65560,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+8271, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+8290, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
-				return ts + 1547
+				return ts + 1566
 			}
-			return ts + 8290
+			return ts + 8309
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -65694,7 +65691,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+8302, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8321, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -65709,11 +65706,11 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+8320, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+8339, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
-			return ts + 1547
+			return ts + 1566
 		}
-		return ts + 8290
+		return ts + 8309
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
@@ -65736,7 +65733,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+7933)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7941)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -65745,7 +65742,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+8341)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+8360)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -66131,13 +66128,13 @@ 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+8343, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+8346,
+			if Xsqlite3_strnicmp(tls, z, ts+8362, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+8365,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
-							return ts + 5335
+							return ts + 5354
 						}
-						return ts + 1547
+						return ts + 1566
 					}(), pExpr))
 			} else {
 				codeReal(tls, v, z, negFlag, iMem)
@@ -66174,6 +66171,7 @@ func Xsqlite3ExprCodeLoadIndexColumn(tls *libc.TLS, pParse uintptr, pIdx uintptr
 func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr, pCol uintptr, regOut int32) {
 	var iAddr int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
+	var nErr int32 = (*Parse)(unsafe.Pointer(pParse)).FnErr
 
 	if (*Parse)(unsafe.Pointer(pParse)).FiSelfTab > 0 {
 		iAddr = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Parse)(unsafe.Pointer(pParse)).FiSelfTab-1, 0, regOut)
@@ -66187,6 +66185,9 @@ func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr
 	if iAddr != 0 {
 		Xsqlite3VdbeJumpHere(tls, v, iAddr)
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr > nErr {
+		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FerrByteOffset = -1
+	}
 }
 
 // Generate code to extract the value of the iCol-th column of a table.
@@ -66208,7 +66209,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+8373,
+				Xsqlite3ErrorMsg(tls, pParse, ts+8392,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -66381,8 +66382,8 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8403, ts + 8408, ts + 8413, ts + 6594,
-				ts + 6589, ts + 8421}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8422, ts + 8427, ts + 8432, ts + 6613,
+				ts + 6608, ts + 8440}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
@@ -66390,7 +66391,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 8429
+						return ts + 8448
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -66405,6 +66406,7 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 	var p uintptr
 	var v uintptr
 	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+		var exprAff U8
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -66418,6 +66420,14 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 		if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr, iDataCur) != 0 {
 			continue
 		}
+
+		exprAff = U8(Xsqlite3ExprAffinity(tls, pExpr))
+		if int32(exprAff) <= SQLITE_AFF_BLOB && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_BLOB ||
+			int32(exprAff) == SQLITE_AFF_TEXT && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_TEXT ||
+			int32(exprAff) >= SQLITE_AFF_NUMERIC && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_NUMERIC {
+			continue
+		}
+
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 
 		if (*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow != 0 {
@@ -66757,7 +66767,7 @@ __73:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
 		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8373,
+	Xsqlite3ErrorMsg(tls, pParse, ts+8392,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
 __76:
@@ -66990,7 +67000,7 @@ __43:
 		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+8434, libc.VaList(bp+8, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8453, libc.VaList(bp+8, pExpr))
 	goto __91
 __90:
 	return func() int32 {
@@ -67031,7 +67041,7 @@ __93:
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
 		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8461, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8480, libc.VaList(bp+16, pExpr))
 	goto __5
 __94:
 	;
@@ -67191,7 +67201,7 @@ __121:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
 		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8055,
+	Xsqlite3ErrorMsg(tls, pParse, ts+8063,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
 __122:
 	;
@@ -67213,11 +67223,10 @@ __49:
 	return target
 
 __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) {
+	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) {
 		goto __123
 	}
+
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
 		goto __125
@@ -67257,7 +67266,7 @@ __126:
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6936, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6955, 0)
 	goto __5
 
 __55:
@@ -67288,13 +67297,19 @@ __129:
 	;
 __127:
 	;
-	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
+	addrINR = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable, 0, target)
 
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = U8(0)
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = okConstFactor
+	if !(inReg != target) {
+		goto __130
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
+	inReg = target
+__130:
+	;
 	Xsqlite3VdbeJumpHere(tls, v, addrINR)
-	Xsqlite3VdbeChangeP3(tls, v, addrINR, inReg)
 	goto __5
 
 __56:
@@ -67307,15 +67322,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __130
+		goto __131
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __131
+		goto __132
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__131:
+__132:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -67325,22 +67340,22 @@ __131:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__130:
+__131:
 	;
 	i1 = 0
-__132:
+__133:
 	if !(i1 < nExpr-1) {
-		goto __134
+		goto __135
 	}
 	if !(pX != 0) {
-		goto __135
+		goto __136
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __136
-__135:
-	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+	goto __137
 __136:
+	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+__137:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -67349,21 +67364,21 @@ __136:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __133
-__133:
-	i1 = i1 + 2
-	goto __132
 	goto __134
 __134:
+	i1 = i1 + 2
+	goto __133
+	goto __135
+__135:
 	;
 	if !(nExpr&1 != 0) {
-		goto __137
+		goto __138
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __138
-__137:
-	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+	goto __139
 __138:
+	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+__139:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -67373,27 +67388,27 @@ __138:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __139
-	}
-	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8485, 0)
-	return 0
-__139:
-	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __140
 	}
-	Xsqlite3MayAbort(tls, pParse)
+	Xsqlite3ErrorMsg(tls, pParse,
+		ts+8504, 0)
+	return 0
 __140:
 	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __141
 	}
+	Xsqlite3MayAbort(tls, pParse)
+__141:
+	;
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+		goto __142
+	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __142
-__141:
+	goto __143
+__142:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -67402,7 +67417,7 @@ __141:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__142:
+__143:
 	;
 	goto __5
 
@@ -67413,7 +67428,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8535))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8554))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -69205,11 +69220,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+6784, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6803, 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+8545, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8564, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -69221,13 +69236,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8573,
+		ts+8592,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8748,
+			ts+8767,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -69237,10 +69252,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8922, libc.VaList(bp, zDb, zDb))
+		ts+8941, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9069, 0)
+			ts+9088, 0)
 	}
 }
 
@@ -69304,7 +69319,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+9220, libc.VaList(bp, zName))
+		ts+9239, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -69314,7 +69329,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+9279, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+9298, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -69323,7 +69338,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+9285, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+9304, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -69364,19 +69379,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9312, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+9331, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9496,
+		ts+9515,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9801, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9820, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9817,
+		ts+9836,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -69384,7 +69399,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9875, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9894, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -69396,7 +69411,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+10140, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+10159, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -69408,7 +69423,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10153,
+		ts+10172,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -69454,12 +69469,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10191, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+10210, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+10223, 0)
+			ts+10242, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -69469,11 +69484,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+10250)
+				ts+10269)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+10309)
+				ts+10328)
 		}
 
 		if pDflt != 0 {
@@ -69486,12 +69501,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+10362)
+					ts+10381)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10408)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10427)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -69502,7 +69517,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10435,
+			ts+10454,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -69524,7 +69539,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+10581,
+				ts+10600,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -69572,14 +69587,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10811, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10830, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10845, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10864, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -69607,7 +69622,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+10875, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10894, 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
 	}
@@ -69647,18 +69662,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 + 10894
+		zType = ts + 10913
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10899
+		zType = ts + 10918
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10913,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10932,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10931
+					return ts + 10950
 				}
-				return ts + 10948
+				return ts + 10967
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -69742,11 +69757,11 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10966, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10985, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1547, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1566, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iSchema == 1))
 
 	Xsqlite3MayAbort(tls, pParse)
@@ -69759,17 +69774,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10987,
+		ts+11006,
 		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+11169,
+		ts+11188,
 		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+10140, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+10159, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -70027,12 +70042,12 @@ 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+11300,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11319,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 11323
+				return ts + 11342
 			}
-			return ts + 1547
+			return ts + 1566
 		}(), zWhen,
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg))
 	Xsqlite3_result_error(tls, pCtx, zErr, -1)
@@ -70072,8 +70087,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+11325, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 113494)
+	if Xsqlite3_strnicmp(tls, zSql, ts+11344, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113516)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -70090,7 +70105,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, 113505)
+		rc = Xsqlite3CorruptError(tls, 113527)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -70112,7 +70127,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+11333, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+11352, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -70152,12 +70167,12 @@ 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+11339, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+11358, 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 + 11323
+							return ts + 11342
 						}
-						return ts + 1547
+						return ts + 1566
 					}()))
 				zReplace = zBuf2
 				nReplace = U32(Xsqlite3Strlen30(tls, zReplace))
@@ -70642,7 +70657,7 @@ __45:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FzErrMsg != 0) {
 		goto __47
 	}
-	renameColumnParseError(tls, context, ts+1547, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
+	renameColumnParseError(tls, context, ts+1566, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
 	goto __48
 __47:
 	Xsqlite3_result_error_code(tls, context, rc)
@@ -70807,7 +70822,7 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 			if rc == SQLITE_ERROR && Xsqlite3WritableSchema(tls, db) != 0 {
 				Xsqlite3_result_value(tls, context, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 			} else if (*Parse)(unsafe.Pointer(bp+80)).FzErrMsg != 0 {
-				renameColumnParseError(tls, context, ts+1547, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
+				renameColumnParseError(tls, context, ts+1566, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
 			} else {
 				Xsqlite3_result_error_code(tls, context, rc)
 			}
@@ -71010,7 +71025,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 114441)
+	rc = Xsqlite3CorruptError(tls, 114463)
 	goto drop_column_done
 __2:
 	;
@@ -71034,7 +71049,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+11344, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+11363, 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)
 
@@ -71115,19 +71130,19 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10966, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10985, 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+11351,
+	Xsqlite3ErrorMsg(tls, pParse, ts+11370,
 		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 + 11379
+				return ts + 11398
 			}
-			return ts + 6530
+			return ts + 6549
 		}(),
 			zCol))
 	goto exit_drop_column
@@ -71136,7 +71151,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11391, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11410, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -71150,13 +71165,13 @@ __8:
 	goto exit_drop_column
 __9:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1547, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1566, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11439, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11458, 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+11560, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11579, 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
@@ -71274,11 +71289,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 + 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}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11597},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11618},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11638},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11657},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11676}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -71312,7 +71327,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+11680, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11699, 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)
 			}
@@ -71321,10 +71336,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+11703,
+					ts+11722,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11733, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11752, 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)
 			}
@@ -71342,9 +71357,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11751, FzCols: ts + 11764},
-	{FzName: ts + 11777, FzCols: ts + 11790},
-	{FzName: ts + 11818},
+	{FzName: ts + 11770, FzCols: ts + 11783},
+	{FzName: ts + 11796, FzCols: ts + 11809},
+	{FzName: ts + 11837},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -71534,7 +71549,7 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11831}
+	FzName:     ts + 11850}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
@@ -71785,7 +71800,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11841}
+	FzName:     ts + 11860}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -71799,7 +71814,7 @@ 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+11851,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11870,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
 					return (*StatAccum)(unsafe.Pointer(p)).FnEst
@@ -71812,7 +71827,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11856, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11875, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -71854,7 +71869,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+11862, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11881, 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--
@@ -71868,7 +71883,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11868}
+	FzName:     ts + 11887}
 
 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)
@@ -71912,7 +71927,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+11877, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11896, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -71929,7 +71944,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+11751, 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+11770, 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)
@@ -72085,7 +72100,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+11887, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11906, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -72142,7 +72157,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+11887, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11906, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -72189,9 +72204,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+11891)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11910)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11895)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11914)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -72274,7 +72289,7 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 	var v TRowcnt
 
 	if z == uintptr(0) {
-		z = ts + 1547
+		z = ts + 1566
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
 		v = uint64(0)
@@ -72296,15 +72311,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+11899, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11918, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11910, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11929, 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+11920, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11939, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -72580,11 +72595,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+11777, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11796, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11932,
-			ts+11986,
+			ts+11951,
+			ts+12005,
 			zDb)
 	}
 	return rc
@@ -72631,10 +72646,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+11751, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11770, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+12038, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+12057, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -72692,7 +72707,7 @@ 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+6844, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6863, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -72725,13 +72740,13 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zFile == uintptr(0)) {
 		goto __1
 	}
-	zFile = ts + 1547
+	zFile = ts + 1566
 __1:
 	;
 	if !(zName == uintptr(0)) {
 		goto __2
 	}
-	zName = ts + 1547
+	zName = ts + 1566
 __2:
 	;
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2)) != 0) {
@@ -72739,14 +72754,14 @@ __2:
 	}
 
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+4238)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+4257)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+12079, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+12098, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
 	if !(rc == SQLITE_OK) {
 		goto __6
 	}
@@ -72783,7 +72798,7 @@ __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12082,
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12101,
 		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
@@ -72797,7 +72812,7 @@ __12:
 	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __15
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12119, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12138, libc.VaList(bp+8, zName))
 	goto attach_error
 __15:
 	;
@@ -72861,7 +72876,7 @@ __4:
 		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12149, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12168, 0)
 	goto __23
 __22:
 	if !(rc == SQLITE_OK) {
@@ -72878,7 +72893,7 @@ __25:
 		goto __27
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
-		ts+12178, 0)
+		ts+12197, 0)
 	rc = SQLITE_ERROR
 __27:
 	;
@@ -72944,13 +72959,13 @@ __33:
 	}
 	Xsqlite3OomFault(tls, db)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1483, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1502, 0)
 	goto __35
 __34:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
 		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12246, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12265, libc.VaList(bp+16, zFile))
 __36:
 	;
 __35:
@@ -72997,7 +73012,7 @@ func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zName == uintptr(0)) {
 		goto __1
 	}
-	zName = ts + 1547
+	zName = ts + 1566
 __1:
 	;
 	i = 0
@@ -73028,14 +73043,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12274, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12293, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12295, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12314, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -73043,7 +73058,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12321, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12340, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -73160,7 +73175,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12343}
+	FzName:     ts + 12362}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -73173,7 +73188,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12357}
+	FzName:     ts + 12376}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -73187,7 +73202,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+12371, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+12390, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -73219,7 +73234,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+12395,
+						ts+12414,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -73394,7 +73409,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+12441, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12460, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -73420,11 +73435,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+12464, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12483, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12470, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12489, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12476, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12495, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -73471,7 +73486,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 + 8116
+		zCol = ts + 8135
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -73495,7 +73510,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+12503, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12522, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -73766,25 +73781,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6844) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6863) == 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+6784, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6803, 7) == 0 {
 			if i == 1 {
-				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 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6830+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6849+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6305+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+6792)
+						ts+6811)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6830+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6849+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+6286)
+						ts+6305)
 				}
 			}
 		}
@@ -73805,12 +73820,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		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 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6803, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6849+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+6305)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6830+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+6792)
+					ts+6811)
 			}
 		}
 	}
@@ -73841,7 +73856,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+12518, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12537, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -73859,14 +73874,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 + 12526
+			zMsg = ts + 12545
 		} else {
-			zMsg = ts + 12539
+			zMsg = ts + 12558
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7048, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7067, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7058, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7077, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -73896,12 +73911,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+6784, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6286+7) == 0 {
-			return ts + 6830
+	if Xsqlite3_strnicmp(tls, zName, ts+6803, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6305+7) == 0 {
+			return ts + 6849
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6792+7) == 0 {
-			return ts + 6811
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6811+7) == 0 {
+			return ts + 6830
 		}
 	}
 	return zName
@@ -74259,7 +74274,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+6286)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+6305)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -74285,7 +74300,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6844, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6863, zName) {
 				goto __3
 			}
 
@@ -74338,13 +74353,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+12553, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12572, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12570, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12589, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -74382,13 +74397,13 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 		if Xsqlite3_stricmp(tls, zType, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit))) != 0 ||
 			Xsqlite3_stricmp(tls, zName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 1*8))) != 0 ||
 			Xsqlite3_stricmp(tls, zTblName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 2*8))) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1547, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1566, 0)
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6784, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6803, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12590,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12609,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -74548,9 +74563,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 + 6792
+			return ts + 6811
 		}
-		return ts + 6286
+		return ts + 6305
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -74566,7 +74581,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12632, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12651, 0)
 	return
 __4:
 	;
@@ -74594,9 +74609,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10894
+			return ts + 10913
 		}
-		return ts + 9279
+		return ts + 9298
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -74612,9 +74627,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 + 6792
+			return ts + 6811
 		}
-		return ts + 6286
+		return ts + 6305
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -74645,12 +74660,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12673,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12692,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10894
+				return ts + 10913
 			}
-			return ts + 9279
+			return ts + 9298
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -74665,7 +74680,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12694, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12713, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -74752,7 +74767,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+12729, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12748, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -74776,7 +74791,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+12746, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12765, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -74796,7 +74811,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 + 12729
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12748
 	(*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)
@@ -74808,7 +74823,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+12729, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12748, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -74842,7 +74857,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+12780, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12799, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -74850,13 +74865,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+12803, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12822, 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+12810, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12829, 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--
@@ -74893,7 +74908,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+12820, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12839, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -75057,10 +75072,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+12846,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12865,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12891, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12910, 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))
@@ -75091,7 +75106,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+12932, 0)
+			ts+12951, 0)
 	}
 }
 
@@ -75136,7 +75151,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12984, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+13003, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -75225,7 +75240,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13025, 0)
+		ts+13044, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -75320,7 +75335,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13081, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13100, 0)
 	goto generated_done
 __2:
 	;
@@ -75333,13 +75348,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+13124, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+13143, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+13132, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+13151, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -75373,13 +75388,19 @@ __10:
 
 	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
 __11:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_RAISE) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = (*Column)(unsafe.Pointer(pCol)).Faffinity
+__12:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+13139,
+	Xsqlite3ErrorMsg(tls, pParse, ts+13158,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -75500,13 +75521,13 @@ __3:
 	;
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
-		zSep = ts + 1547
-		zSep2 = ts + 13170
-		zEnd = ts + 5360
+		zSep = ts + 1566
+		zSep2 = ts + 13189
+		zEnd = ts + 5379
 	} else {
-		zSep = ts + 13172
-		zSep2 = ts + 13176
-		zEnd = ts + 13181
+		zSep = ts + 13191
+		zSep2 = ts + 13195
+		zEnd = ts + 13200
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -75514,7 +75535,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+13184, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+13203, 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('(')
@@ -75548,17 +75569,17 @@ __5:
 	goto __6
 __6:
 	;
-	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3658, libc.VaList(bp, zEnd))
+	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3677, libc.VaList(bp, zEnd))
 	return zStmt
 }
 
 var azType1 = [6]uintptr{
-	ts + 1547,
-	ts + 13198,
-	ts + 13204,
-	ts + 13209,
-	ts + 13214,
-	ts + 13204,
+	ts + 1566,
+	ts + 13217,
+	ts + 13223,
+	ts + 13228,
+	ts + 13233,
+	ts + 13223,
 }
 
 func resizeIndexObject(tls *libc.TLS, db uintptr, pIdx uintptr, N int32) int32 {
@@ -75948,7 +75969,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
 		if pSelect != 0 || !(int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM) && (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1547, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1566, 0)
 			return
 		}
 		(*Table)(unsafe.Pointer(p)).Ftnum = (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum
@@ -75965,10 +75986,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+13220,
-						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1547)))
+						ts+13239,
+						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1566)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+13253,
+					Xsqlite3ErrorMsg(tls, pParse, ts+13272,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -75987,11 +76008,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+13280, 0)
+				ts+13299, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13330, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+13349, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -76025,7 +76046,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13362, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+13381, 0)
 			return
 		}
 	}
@@ -76050,11 +76071,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 + 9279
-			zType2 = ts + 13406
+			zType = ts + 9298
+			zType2 = ts + 13425
 		} else {
-			zType = ts + 10894
-			zType2 = ts + 13412
+			zType = ts + 10913
+			zType2 = ts + 13431
 		}
 
 		if pSelect != 0 {
@@ -76125,11 +76146,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+13417, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13436, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13432,
+			ts+13451,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -76145,13 +76166,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+13530,
+					ts+13549,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13572, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13591, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -76166,7 +76187,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+9801) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9820) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -76196,7 +76217,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+13606, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13625, 0)
 	goto create_view_fail
 __1:
 	;
@@ -76212,7 +76233,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10894, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10913, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -76294,7 +76315,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13642, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13661, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -76419,13 +76440,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+13672, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13691, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13687,
+		ts+13706,
 		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)
 }
@@ -76466,10 +76487,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+13754, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13773, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11703,
+				ts+11722,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -76501,12 +76522,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+13768,
+			ts+13787,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13813,
+		ts+13832,
 		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)
@@ -76534,11 +76555,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+6784, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3279, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6803, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3298, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7536, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7544, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -76616,9 +76637,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6792
+			return ts + 6811
 		}
-		return ts + 6286
+		return ts + 6305
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -76677,21 +76698,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13880, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13899, 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+13908, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13927, 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+13942, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13961, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -76703,7 +76724,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11895, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11914, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -76767,7 +76788,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13974,
+		ts+13993,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -76779,7 +76800,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14037, 0)
+		ts+14056, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -76864,7 +76885,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14131,
+		ts+14150,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -77091,12 +77112,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+14177,
+				Xsqlite3ErrorMsg(tls, pParse, ts+14196,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 14205
+							return ts + 14224
 						}
-						return ts + 14211
+						return ts + 14230
 					}()))
 				return 1
 			}
@@ -77217,7 +77238,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+14216, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+14235, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -77236,7 +77257,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14222,
+		ts+14241,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -77262,26 +77283,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6784, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6803, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14272, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14291, 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+14300, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14319, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14325, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14344, 0)
 	goto exit_create_index
 __17:
 	;
@@ -77295,7 +77316,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+14216, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+14235, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -77310,7 +77331,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14359, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14378, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -77322,7 +77343,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14393, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14412, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -77351,7 +77372,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14417, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14436, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -77372,9 +77393,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6792
+			return ts + 6811
 		}
-		return ts + 6286
+		return ts + 6305
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -77413,7 +77434,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+14216)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+14235)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -77514,7 +77535,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14440, 0)
+		ts+14459, 0)
 	goto exit_create_index
 __56:
 	;
@@ -77731,7 +77752,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14501, libc.VaList(bp+48, 0))
+		ts+14520, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -77783,8 +77804,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14543, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14562, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121859)
 	goto exit_create_index
 __101:
 	;
@@ -77830,12 +77851,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14560,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14579,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
-				return ts + 1547
+				return ts + 1566
 			}
-			return ts + 14580
+			return ts + 14599
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -77843,7 +77864,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14588,
+		ts+14607,
 		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,
@@ -77857,7 +77878,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14647, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14666, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -78018,7 +78039,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14674, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14693, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -78033,7 +78054,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14692, libc.VaList(bp+8, 0))
+		ts+14711, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -78044,9 +78065,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 + 6792
+			return ts + 6811
 		}
-		return ts + 6286
+		return ts + 6305
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -78072,9 +78093,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14765,
+		ts+14784,
 		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+11891, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11910, (*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)
@@ -78209,7 +78230,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+14825,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14844,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -78417,12 +78438,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+14861,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14880,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14897
+				return ts + 14916
 			}
-			return ts + 14900
+			return ts + 14919
 		}()))
 	goto append_from_error
 __1:
@@ -78591,7 +78612,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14906, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14925, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -78627,9 +78648,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14912
+				return ts + 14931
 			}
-			return ts + 14921
+			return ts + 14940
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -78654,7 +78675,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14906, ts + 14928, ts + 14912}
+var az = [3]uintptr{ts + 14925, ts + 14947, ts + 14931}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -78669,7 +78690,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+14936, 0)
+				ts+14955, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -78806,17 +78827,17 @@ 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+15006, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+15025, 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+15017, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+15036, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
-			Xsqlite3_str_append(tls, bp+8, ts+1560, 1)
+			Xsqlite3_str_append(tls, bp+8, ts+1579, 1)
 			Xsqlite3_str_appendall(tls, bp+8, zCol)
 		}
 	}
@@ -78839,11 +78860,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+12464, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12483, 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+15020, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+15039, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -78973,7 +78994,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15029, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15048, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -79069,7 +79090,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+15075, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+15094, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -79262,7 +79283,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+15105, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+15124, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -79542,7 +79563,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+15136,
+		Xsqlite3ErrorMsg(tls, pParse, ts+15155,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -79574,11 +79595,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+15169, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+15188, 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+15198, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+15217, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -79829,7 +79850,7 @@ __20:
 	goto __16
 __15:
 	wcf = U16(WHERE_ONEPASS_DESIRED | WHERE_DUPLICATES_OK)
-	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_VarSelect != 0) {
+	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_Subquery != 0) {
 		goto __23
 	}
 	bComplex = 1
@@ -80082,7 +80103,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+15236)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+15255)
 __62:
 	;
 delete_from_cleanup:
@@ -80197,7 +80218,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+11751) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11770) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -80427,7 +80448,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 + 8408, ts + 8403, ts + 6584}
+var azType2 = [5]uintptr{ts + 6613, ts + 6608, ts + 8427, ts + 8422, ts + 6603}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -80486,7 +80507,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+15249, -1)
+					Xsqlite3_result_error(tls, context, ts+15268, -1)
 					return
 				}
 				iVal = -iVal
@@ -80790,7 +80811,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+15266, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+15285, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -81136,7 +81157,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+15271, -1)
+		Xsqlite3_result_error(tls, context, ts+15290, -1)
 		return
 	}
 	if argc == 3 {
@@ -81146,7 +81167,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+15304, -1)
+				ts+15323, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -81199,7 +81220,7 @@ func errlogFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	_ = argc
 	_ = context
-	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3658, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
+	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3677, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
 }
 
 func compileoptionusedFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
@@ -81239,13 +81260,13 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 
 			var zVal uintptr
 			r1 = Xsqlite3_value_double(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+5328, libc.VaList(bp, r1))
+			Xsqlite3_str_appendf(tls, pStr, ts+5347, libc.VaList(bp, r1))
 			zVal = Xsqlite3_str_value(tls, pStr)
 			if zVal != 0 {
 				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+15349, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+15368, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -81253,7 +81274,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 		}
 	case SQLITE_INTEGER:
 		{
-			Xsqlite3_str_appendf(tls, pStr, ts+1327, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
+			Xsqlite3_str_appendf(tls, pStr, ts+1346, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
 			break
 
 		}
@@ -81282,13 +81303,13 @@ 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+15356, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+15375, libc.VaList(bp+24, zArg))
 			break
 
 		}
 	default:
 		{
-			Xsqlite3_str_append(tls, pStr, ts+1548, 4)
+			Xsqlite3_str_append(tls, pStr, ts+1567, 4)
 			break
 
 		}
@@ -81429,7 +81450,7 @@ func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 	var ch U32
 	var c U8
 	var d U8
-	zPass = ts + 1547
+	zPass = ts + 1566
 	nPass = 0
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -81711,7 +81732,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 11323}
+var azOne = [1]uintptr{ts + 11342}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -81723,7 +81744,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	zIn = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	if zIn == uintptr(0) {
-		zIn = ts + 1547
+		zIn = ts + 1566
 	}
 	for i = 0; *(*U8)(unsafe.Pointer(zIn + uintptr(i))) != 0 && !(int32(Xsqlite3CtypeMap[*(*U8)(unsafe.Pointer(zIn + uintptr(i)))])&0x02 != 0); i++ {
 	}
@@ -81747,7 +81768,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+15359, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+15378, 4, uintptr(0))
 	}
 }
 
@@ -81772,7 +81793,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+12503, -1)
+		Xsqlite3_result_error(tls, context, ts+12522, -1)
 		return
 	}
 
@@ -81850,7 +81871,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+15249, -1)
+			Xsqlite3_result_error(tls, context, ts+15268, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -82111,7 +82132,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+15364, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+15383, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -82131,14 +82152,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+15370, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+15389, 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+15370, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+15389, 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+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)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+15389, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+15389, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -82379,109 +82400,109 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 }
 
 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 + 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(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(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 + 15394},
+	{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 + 15414},
+	{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 + 15427},
+	{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 + 15445},
+	{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_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15462},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15462},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15477},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15503},
+	{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 + 15528},
+	{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 + 15537},
+	{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 + 15548},
+	{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 + 15555},
+	{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 + 15569},
+	{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 + 15569},
+	{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 + 15575},
+	{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 + 15575},
+	{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 + 15581},
+	{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 + 15581},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15586},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15586},
+	{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 + 15586},
+	{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 + 15590},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15590},
+	{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 + 15590},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15594},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15601},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15609},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15616},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15622},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15629},
+	{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 + 15644},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15649},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15653},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15653},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15659},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15665},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15671},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15675},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15675},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15681},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15688},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15695},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15706},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15713},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15728},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15745},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15756},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15762},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15780},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15788},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15802},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15810},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15819},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15819},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15826},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15826},
+	{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 + 15836},
+	{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 + 15840},
+	{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 + 15846},
+	{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 + 15850},
+	{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 + 15850},
+	{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 + 15856},
+	{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 + 15856},
+	{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 + 15869},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15389},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15389},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 7008},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 7008},
 	{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 + 15926},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15879},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15887},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15893},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15899},
+	{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 + 15902},
+	{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 + 15906},
+	{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 + 15912},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15902},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15917},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15921},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15925},
 	{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 + 15935},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15940},
 	{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 + 15959},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15950},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15956},
+	{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 + 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 + 15968},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15973},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15978},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15983},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15989},
 	{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}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16001},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16006},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16014},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16022},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16025},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 7008},
+	{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 + 16030}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -82602,7 +82623,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+16015,
+				ts+16034,
 				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)
@@ -83262,8 +83283,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 + 6855, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6851, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6874, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6870, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -83342,7 +83363,7 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 			(*Token)(unsafe.Pointer(bp + 80)).Fz = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 			(*Token)(unsafe.Pointer(bp + 80)).Fn = uint32(Xsqlite3Strlen30(tls, (*Token)(unsafe.Pointer(bp+80)).Fz))
 
-			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5539)
+			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5558)
 			if pRaise != 0 {
 				(*Expr)(unsafe.Pointer(pRaise)).FaffExpr = int8(OE_Abort)
 			}
@@ -83763,7 +83784,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8373, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8392, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -84231,7 +84252,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+16060,
+		ts+16079,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -84256,7 +84277,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+16101,
+	Xsqlite3ErrorMsg(tls, pParse, ts+16120,
 		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
@@ -84405,7 +84426,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+16133,
+		ts+16152,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -84415,7 +84436,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+16185, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+16204, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -84467,7 +84488,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+16210,
+	Xsqlite3ErrorMsg(tls, pParse, ts+16229,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -84475,7 +84496,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+16256, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+16275, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -84887,7 +84908,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+16277)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+16296)
 __125:
 	;
 insert_cleanup:
@@ -85203,7 +85224,7 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 					fallthrough
 				case OE_Fail:
 					{
-						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12464, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12483, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 							(*Column)(unsafe.Pointer(pCol)).FzCnName))
 
 						Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
@@ -86294,13 +86315,13 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131895)
+	return Xsqlite3MisuseError(tls, 131931)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
 		goto __2
 	}
-	zSql = ts + 1547
+	zSql = ts + 1566
 __2:
 	;
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -86779,7 +86800,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12503, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12522, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -86788,7 +86809,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 16291
+		zEntry = ts + 16310
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -86803,7 +86824,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+12464, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12483, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -86839,7 +86860,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.X__builtin___memcpy_chk(tls, zAltEntry, ts+16314, uint64(8), libc.X__builtin_object_size(tls, zAltEntry, 0))
+	libc.X__builtin___memcpy_chk(tls, zAltEntry, ts+16333, uint64(8), libc.X__builtin_object_size(tls, zAltEntry, 0))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -86853,7 +86874,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+16323, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+16342, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -86877,7 +86898,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.X__builtin___memcpy_chk(tls, zAltEntry+uintptr(iEntry), ts+16327, uint64(6), libc.X__builtin_object_size(tls, zAltEntry+uintptr(iEntry), 0))
+	libc.X__builtin___memcpy_chk(tls, zAltEntry+uintptr(iEntry), ts+16346, uint64(6), libc.X__builtin_object_size(tls, zAltEntry+uintptr(iEntry), 0))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -86895,7 +86916,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+16333, libc.VaList(bp+16, zEntry, zFile))
+		ts+16352, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -86922,7 +86943,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+16376, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+16395, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -86960,7 +86981,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+16408, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16427, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -86970,7 +86991,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16445,
+	ts + 16464,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -87126,7 +87147,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+16451, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16470, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -87134,63 +87155,63 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 }
 
 var pragCName = [57]uintptr{
-	ts + 5460,
-	ts + 16490,
-	ts + 9279,
-	ts + 16494,
-	ts + 16499,
-	ts + 16502,
-	ts + 16512,
-	ts + 16522,
-	ts + 16528,
-	ts + 16532,
-	ts + 16537,
-	ts + 16542,
-	ts + 16550,
+	ts + 5479,
+	ts + 16509,
+	ts + 9298,
+	ts + 16513,
+	ts + 16518,
+	ts + 16521,
+	ts + 16531,
+	ts + 16541,
+	ts + 16547,
+	ts + 16551,
+	ts + 16556,
 	ts + 16561,
-	ts + 16564,
-	ts + 16571,
-	ts + 16532,
-	ts + 16537,
-	ts + 16578,
+	ts + 16569,
+	ts + 16580,
 	ts + 16583,
-	ts + 16586,
-	ts + 16593,
-	ts + 16528,
-	ts + 16532,
-	ts + 16599,
-	ts + 16604,
-	ts + 16609,
-	ts + 16532,
-	ts + 16613,
-	ts + 16537,
-	ts + 16621,
-	ts + 16625,
-	ts + 16630,
-	ts + 11895,
-	ts + 11891,
-	ts + 16636,
-	ts + 16641,
-	ts + 16646,
-	ts + 16490,
-	ts + 16532,
-	ts + 16651,
-	ts + 16658,
+	ts + 16590,
+	ts + 16551,
+	ts + 16556,
+	ts + 16597,
+	ts + 16602,
+	ts + 16605,
+	ts + 16612,
+	ts + 16547,
+	ts + 16551,
+	ts + 16618,
+	ts + 16623,
+	ts + 16628,
+	ts + 16551,
+	ts + 16632,
+	ts + 16556,
+	ts + 16640,
+	ts + 16644,
+	ts + 16649,
+	ts + 11914,
+	ts + 11910,
+	ts + 16655,
+	ts + 16660,
 	ts + 16665,
-	ts + 9279,
-	ts + 16673,
-	ts + 5463,
-	ts + 16679,
-	ts + 16490,
-	ts + 16532,
+	ts + 16509,
+	ts + 16551,
+	ts + 16670,
+	ts + 16677,
 	ts + 16684,
-	ts + 16689,
-	ts + 15883,
-	ts + 16694,
-	ts + 16707,
-	ts + 16716,
-	ts + 16723,
-	ts + 16734,
+	ts + 9298,
+	ts + 16692,
+	ts + 5482,
+	ts + 16698,
+	ts + 16509,
+	ts + 16551,
+	ts + 16703,
+	ts + 16708,
+	ts + 15902,
+	ts + 16713,
+	ts + 16726,
+	ts + 16735,
+	ts + 16742,
+	ts + 16753,
 }
 
 // Definitions of all built-in pragmas
@@ -87208,241 +87229,241 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [67]PragmaName{
-	{FzName: ts + 16742,
+	{FzName: ts + 16761,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16757,
+	{FzName: ts + 16776,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16772,
+	{FzName: ts + 16791,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16784,
+	{FzName: ts + 16803,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16800,
+	{FzName: ts + 16819,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16723,
+	{FzName: ts + 16742,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16813,
+	{FzName: ts + 16832,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16825,
+	{FzName: ts + 16844,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16845,
+	{FzName: ts + 16864,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CellSizeCk)},
-	{FzName: ts + 16861,
+	{FzName: ts + 16880,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16882,
+	{FzName: ts + 16901,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16897,
+	{FzName: ts + 16916,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16913,
+	{FzName: ts + 16932,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16927,
+	{FzName: ts + 16946,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16940,
+	{FzName: ts + 16959,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16954,
+	{FzName: ts + 16973,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16973,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_DeferFKs)},
 	{FzName: ts + 16992,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_DeferFKs)},
+	{FzName: ts + 17011,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 17015,
+	{FzName: ts + 17034,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17024,
+	{FzName: ts + 17043,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 17042,
+	{FzName: ts + 17061,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 17059,
+	{FzName: ts + 17078,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 17072,
+	{FzName: ts + 17091,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 17087,
+	{FzName: ts + 17106,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 17105,
+	{FzName: ts + 17124,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 17115,
+	{FzName: ts + 17134,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 17129,
+	{FzName: ts + 17148,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17145,
+	{FzName: ts + 17164,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 17170,
+	{FzName: ts + 17189,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 17189,
+	{FzName: ts + 17208,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 17200,
+	{FzName: ts + 17219,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 17211,
+	{FzName: ts + 17230,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 17223,
+	{FzName: ts + 17242,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 17239,
+	{FzName: ts + 17258,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17252,
+	{FzName: ts + 17271,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17271,
+	{FzName: ts + 17290,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 17290,
+	{FzName: ts + 17309,
 		FePragTyp: U8(PragTyp_LOCK_PROXY_FILE),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17306,
+	{FzName: ts + 17325,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17319,
+	{FzName: ts + 17338,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17334,
+	{FzName: ts + 17353,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 17344,
+	{FzName: ts + 17363,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 17356,
+	{FzName: ts + 17375,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 17365,
+	{FzName: ts + 17384,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17376,
+	{FzName: ts + 17395,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17386,
+	{FzName: ts + 17405,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 17398,
+	{FzName: ts + 17417,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 17409,
+	{FzName: ts + 17428,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 17421,
+	{FzName: ts + 17440,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17438,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_RecTriggers)},
 	{FzName: ts + 17457,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_RecTriggers)},
+	{FzName: ts + 17476,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17483,
+	{FzName: ts + 17502,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17498,
+	{FzName: ts + 17517,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17512,
+	{FzName: ts + 17531,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17531,
+	{FzName: ts + 17550,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17545,
+	{FzName: ts + 17564,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17561,
+	{FzName: ts + 17580,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17573,
+	{FzName: ts + 17592,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17584,
+	{FzName: ts + 17603,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17595,
+	{FzName: ts + 17614,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17607,
+	{FzName: ts + 17626,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17618,
+	{FzName: ts + 17637,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17639,
+	{FzName: ts + 17658,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17647,
+	{FzName: ts + 17666,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17662,
+	{FzName: ts + 17681,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17675,
-		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
 	{FzName: ts + 17694,
+		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
+	{FzName: ts + 17713,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17709,
+	{FzName: ts + 17728,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -87464,7 +87485,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 17725))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 17744))
 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)}
@@ -87476,10 +87497,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+17750) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17769) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17760) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17779) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -87488,13 +87509,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+8429) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8448) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17767) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17786) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17772) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17791) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -87509,9 +87530,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+16684) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16703) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17784) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17803) == 0 {
 		return 2
 	} else {
 		return 0
@@ -87525,7 +87546,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+17791, 0)
+				ts+17810, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -87616,19 +87637,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17853
+		zName = ts + 17872
 		break
 	case OE_SetDflt:
-		zName = ts + 17862
+		zName = ts + 17881
 		break
 	case OE_Cascade:
-		zName = ts + 17874
+		zName = ts + 17893
 		break
 	case OE_Restrict:
-		zName = ts + 17882
+		zName = ts + 17901
 		break
 	default:
-		zName = ts + 17891
+		zName = ts + 17910
 		break
 	}
 	return zName
@@ -87645,7 +87666,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17901, ts + 17908, ts + 17916, ts + 17920, ts + 17784, ts + 17929,
+	ts + 17920, ts + 17927, ts + 17935, ts + 17939, ts + 17803, ts + 17948,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -87692,13 +87713,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17933
+			zType = ts + 17952
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17935
+			zType = ts + 17954
 		} else {
-			zType = ts + 7931
+			zType = ts + 7939
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17937,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17956,
 			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),
@@ -87706,7 +87727,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17944, ts + 17949, ts + 17957}
+var azEnc = [4]uintptr{uintptr(0), ts + 17963, ts + 17968, ts + 17976}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -87863,6 +87884,7 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp7 int32
 	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
@@ -87959,7 +87981,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17965, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17984, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -87998,7 +88020,7 @@ __8:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 488)) != 0) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+3658, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+3677, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 488)))
 __10:
 	;
@@ -88223,7 +88245,7 @@ __18:
 	if !(zRight != 0) {
 		goto __64
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17969) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17988) == 0) {
 		goto __65
 	}
 	b = 2
@@ -88295,7 +88317,7 @@ __72:
 	goto __15
 
 __20:
-	zRet = ts + 17760
+	zRet = ts + 17779
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -88333,7 +88355,7 @@ __79:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __84
 	}
-	zRet = ts + 17750
+	zRet = ts + 17769
 __84:
 	;
 	returnSingleText(tls, v, zRet)
@@ -88620,7 +88642,7 @@ __124:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 552)) == 0) {
 		goto __127
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17974, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17993, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __127:
@@ -88639,7 +88661,7 @@ __128:
 	if !(*(*int8)(unsafe.Pointer(zRight)) != 0) {
 		goto __129
 	}
-	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+16, zRight))
+	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+16, zRight))
 	goto __130
 __129:
 	Xsqlite3_temp_directory = uintptr(0)
@@ -88678,7 +88700,7 @@ __134:
 	if !(res1 != SQLITE_OK) {
 		goto __135
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17999, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18018, 0)
 	goto pragma_out
 __135:
 	;
@@ -88697,7 +88719,7 @@ __136:
 		goto __138
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+18029, 0)
+		ts+18048, 0)
 	goto __139
 __138:
 	if !(iDb != 1) {
@@ -88751,7 +88773,7 @@ __145:
 __147:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+18082) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+18101) == 0) {
 		goto __148
 	}
 
@@ -88848,13 +88870,13 @@ __161:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 18088
+			return ts + 18107
 		}
-		return ts + 18096
+		return ts + 18115
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
-			Xsqlite3ColumnType(tls, pCol, ts+1547),
+			Xsqlite3ColumnType(tls, pCol, ts+1566),
 			func() int32 {
 				if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 {
 					return 1
@@ -88919,7 +88941,7 @@ __176:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __177
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+18103, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+18122, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __178
 	}
@@ -88932,7 +88954,7 @@ __178:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __179
 	}
-	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1483, 0)
+	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1502, 0)
 	(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 __179:
 	;
@@ -88965,29 +88987,29 @@ __183:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __184
 	}
-	zType = ts + 10894
+	zType = ts + 10913
 	goto __185
 __184:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __186
 	}
-	zType = ts + 13124
+	zType = ts + 13143
 	goto __187
 __186:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __188
 	}
-	zType = ts + 18119
+	zType = ts + 18138
 	goto __189
 __188:
-	zType = ts + 9279
+	zType = ts + 9298
 __189:
 	;
 __187:
 	;
 __185:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18126,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18145,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -89053,7 +89075,7 @@ __196:
 		goto __198
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18133, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18152, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -89063,7 +89085,7 @@ __196:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __199
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+18138,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+18157,
 		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))))
@@ -89100,8 +89122,8 @@ __202:
 	if !(pIdx1 != 0) {
 		goto __204
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 576)) = [3]uintptr{ts + 18143, ts + 18145, ts + 16561}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18147,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 576)) = [3]uintptr{ts + 18162, ts + 18164, ts + 16580}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18166,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -89134,7 +89156,7 @@ __205:
 	goto __206
 __208:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18153,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18172,
 		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)))
@@ -89156,7 +89178,7 @@ __209:
 		goto __211
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18157, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18176, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __210
 __210:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -89220,7 +89242,7 @@ __221:
 		goto __223
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7931, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7939, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __222
 __222:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -89236,7 +89258,7 @@ __224:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __226
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7931, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7939, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __225
 __225:
 	i6++
@@ -89271,7 +89293,7 @@ __232:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __234
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18160,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18179,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -89279,7 +89301,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+18169))
+			ts+18188))
 	goto __233
 __233:
 	j2++
@@ -89468,7 +89490,7 @@ __262:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __263:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+18174, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+18193, 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)))
@@ -89685,7 +89707,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+18178, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+18197, 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)
@@ -89796,7 +89818,7 @@ __313:
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+18202,
+		ts+18221,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
@@ -89895,7 +89917,7 @@ __327:
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+18238, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+18257, 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) {
@@ -89917,7 +89939,7 @@ __332:
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+18258,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+18277,
 		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)
@@ -89930,7 +89952,7 @@ __335:
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+18280,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+18299,
 		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 __338
@@ -89948,11 +89970,11 @@ __337:
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 620)), j4, 3)
 __340:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+18303, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+18322, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+18305,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+18324,
 		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)
 __339:
@@ -89998,7 +90020,7 @@ __345:
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+18325,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+18344,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
@@ -90032,89 +90054,103 @@ __350:
 
 	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+18355)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18374)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+18360)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+18379)
 	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)
 
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __351
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_IdxRowid, *(*int32)(unsafe.Pointer(bp + 624))+j4, 3)
+	jmp7 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 3, 0, r1+int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn)-1)
+
+	Xsqlite3VdbeLoadString(tls, v, 3,
+		ts+18400)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+18436)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp7)
+__351:
+	;
 	label6 = 0
 	kk = 0
-__351:
+__352:
 	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) {
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
 		goto __355
 	}
-	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+	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 __352
-__352:
-	kk++
-	goto __351
 	goto __353
 __353:
+	kk++
+	goto __352
+	goto __354
+__354:
 	;
 	if !(label6 != 0) {
-		goto __356
+		goto __357
 	}
 	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
 	Xsqlite3VdbeResolveLabel(tls, v, label6)
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+18355)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18374)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+18381)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+18447)
 	Xsqlite3VdbeGoto(tls, v, jmp5-1)
 	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-__356:
+__357:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __357
+		goto __358
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__358:
+__359:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __360
+		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 __361
+		goto __362
 	}
-	goto __359
-__361:
+	goto __360
+__362:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
-	goto __359
-__359:
-	kk++
-	goto __358
 	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+18408)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18474)
 	Xsqlite3VdbeGoto(tls, v, jmp5)
 	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
-__357:
+__358:
 	;
 	Xsqlite3VdbeJumpHere(tls, v, jmp4)
 	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 640)))
@@ -90131,20 +90167,20 @@ __346:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 620)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __362
+		goto __363
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+18435)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+18501)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__363:
+__364:
 	if !(pIdx5 != 0) {
-		goto __365
-	}
-	if !(pPk1 == pIdx5) {
 		goto __366
 	}
-	goto __364
-__366:
+	if !(pPk1 == pIdx5) {
+		goto __367
+	}
+	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)
@@ -90153,21 +90189,21 @@ __366:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __364
-__364:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __363
 	goto __365
 __365:
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
+	goto __364
+	goto __366
+__366:
 	;
 	if !(pPk1 != 0) {
-		goto __367
+		goto __368
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__367:
+__368:
 	;
-__362:
+__363:
 	;
 	goto __297
 __297:
@@ -90185,14 +90221,14 @@ __272:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __368
+		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 + 18464
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18530
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__368:
+__369:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -90200,27 +90236,27 @@ __368:
 
 __46:
 	if !!(zRight != 0) {
-		goto __369
+		goto __370
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __371
-	}
-	goto pragma_out
-__371:
-	;
-	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __370
-__369:
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
 		goto __372
 	}
+	goto pragma_out
+__372:
+	;
+	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
+	goto __371
+__370:
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
+		goto __373
+	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__373:
+__374:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __375
+		goto __376
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __376
+		goto __377
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -90229,25 +90265,25 @@ __373:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __375
-__376:
-	;
-	goto __374
-__374:
-	pEnc += 16
-	goto __373
-	goto __375
-__375:
-	;
-	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __377
-	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18467, libc.VaList(bp+456, zRight))
+	goto __376
 __377:
 	;
-__372:
+	goto __375
+__375:
+	pEnc += 16
+	goto __374
+	goto __376
+__376:
 	;
-__370:
+	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
+		goto __378
+	}
+	Xsqlite3ErrorMsg(tls, pParse, ts+18533, libc.VaList(bp+456, zRight))
+__378:
+	;
+__373:
+	;
+__371:
 	;
 	goto __15
 
@@ -90255,15 +90291,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 __378
+		goto __379
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __380
+		goto __381
 	}
 	goto __15
-__380:
+__381:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -90271,41 +90307,41 @@ __380:
 	(*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 __381
+		goto __382
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__381:
+__382:
 	;
-	goto __379
-__378:
+	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 __382
+		goto __383
 	}
 	goto __15
-__382:
+__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)
-__379:
+__380:
 	;
 	goto __15
 
 __48:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__383:
+__384:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __384
+		goto __385
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __383
-__384:
+	goto __384
+__385:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -90320,31 +90356,31 @@ __49:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __385
-	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17767) == 0) {
 		goto __386
 	}
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17786) == 0) {
+		goto __387
+	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __387
-__386:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18492) == 0) {
-		goto __388
+	goto __388
+__387:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18558) == 0) {
+		goto __389
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __389
-__388:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17920) == 0) {
-		goto __390
+	goto __390
+__389:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17939) == 0) {
+		goto __391
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
+__391:
+	;
 __390:
 	;
-__389:
+__388:
 	;
-__387:
-	;
-__385:
+__386:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -90354,10 +90390,10 @@ __385:
 
 __50:
 	if !(zRight != 0) {
-		goto __391
+		goto __392
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__391:
+__392:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -90377,19 +90413,19 @@ __51:
 
 __52:
 	if !(zRight != 0) {
-		goto __392
+		goto __393
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __394
+		goto __395
 	}
 	goto __15
-__394:
+__395:
 	;
-	goto __393
-__392:
-	opMask = U32(0xfffe)
+	goto __394
 __393:
+	opMask = U32(0xfffe)
+__394:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -90398,86 +90434,86 @@ __393:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__395:
+__396:
 	if !(iDb <= iDbLast) {
-		goto __397
-	}
-	if !(iDb == 1) {
 		goto __398
 	}
-	goto __396
-__398:
+	if !(iDb == 1) {
+		goto __399
+	}
+	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
-__399:
+__400:
 	if !(k4 != 0) {
-		goto __401
+		goto __402
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __402
+		goto __403
 	}
-	goto __400
-__402:
+	goto __401
+__403:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__403:
+__404:
 	if !(pIdx6 != 0) {
-		goto __405
-	}
-	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
 		goto __406
 	}
+	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
+		goto __407
+	}
 	szThreshold = int16(0)
-	goto __405
-__406:
+	goto __406
+__407:
 	;
-	goto __404
-__404:
-	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __403
 	goto __405
 __405:
+	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
+	goto __404
+	goto __406
+__406:
 	;
 	if !(szThreshold != 0) {
-		goto __407
+		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))
 
-__407:
+__408:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18500,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18566,
 		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 __408
+		goto __409
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __409
-__408:
-	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+	goto __410
 __409:
+	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+__410:
 	;
-	goto __400
-__400:
-	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __399
 	goto __401
 __401:
+	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
+	goto __400
+	goto __402
+__402:
 	;
-	goto __396
-__396:
-	iDb++
-	goto __395
 	goto __397
 __397:
+	iDb++
+	goto __396
+	goto __398
+__398:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -90485,36 +90521,36 @@ __397:
 __53:
 	;
 	if !(zRight != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__410:
+__411:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __411
+		goto __412
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__411:
+__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 __412
+		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 __413
+		goto __414
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 656)))
-__413:
+__414:
 	;
-__412:
+__413:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -90523,10 +90559,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __414
+		goto __415
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664))&int64(0x7fffffff)))
-__414:
+__415:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -90535,10 +90571,10 @@ __57:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+672) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 672)) >= int64(0)) {
-		goto __415
+		goto __416
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 672)) & int64(0x7fffffff))
-__415:
+__416:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -90546,10 +90582,10 @@ __415:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __416
+		goto __417
 	}
 
-__416:
+__417:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -90601,14 +90637,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{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},
+	{FzName: ts + 18584, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18589, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18595, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18604, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18613, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18621, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18629},
+	{FzName: ts + 18636},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -90660,7 +90696,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+18576)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18642)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -90668,7 +90704,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18591, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18657, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -90681,19 +90717,19 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18598, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18664, 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+18604)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18670)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18616)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18682)
 		j++
 	}
-	Xsqlite3_str_append(tls, bp+32, ts+5360, 1)
+	Xsqlite3_str_append(tls, bp+32, ts+5379, 1)
 	Xsqlite3StrAccumFinish(tls, bp+32)
 
 	rc = Xsqlite3_declare_vtab(tls, db, bp+64)
@@ -90709,7 +90745,7 @@ __3:
 			(*PragmaVtab)(unsafe.Pointer(pTab)).FnHidden = U8(j)
 		}
 	} else {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	}
 
 	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
@@ -90857,7 +90893,7 @@ __1:
 		var zText uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 
 		if zText != 0 {
-			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, zText))
+			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, zText))
 			if *(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) == uintptr(0) {
 				return SQLITE_NOMEM
 			}
@@ -90873,13 +90909,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+18631)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18697)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18639, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18705, 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+18643, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18709, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -90888,7 +90924,7 @@ __3:
 	rc = Xsqlite3_prepare_v2(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
 	Xsqlite3_free(tls, zSql)
 	if rc != SQLITE_OK {
-		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
+		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
 		return rc
 	}
 	return pragmaVtabNext(tls, pVtabCursor)
@@ -90956,33 +90992,33 @@ 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+18647, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18713, 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, 137196)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137249)
 	} else {
 		var z uintptr
 		var zObj uintptr
 		if *(*uintptr)(unsafe.Pointer(azObj + 1*8)) != 0 {
 			zObj = *(*uintptr)(unsafe.Pointer(azObj + 1*8))
 		} else {
-			zObj = ts + 5411
+			zObj = ts + 5430
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18675, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18741, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18706, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18772, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137256)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18714,
-	ts + 18721,
-	ts + 18733,
+	ts + 18780,
+	ts + 18787,
+	ts + 18799,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -91042,7 +91078,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+14543)
+				corruptSchema(tls, pData, argv, ts+14562)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -91074,13 +91110,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+18744)
+			corruptSchema(tls, pData, argv, ts+18810)
 		} 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+14543)
+				corruptSchema(tls, pData, argv, ts+14562)
 			}
 		}
 	}
@@ -91113,16 +91149,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 + 9279
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 9298
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6792
+			return ts + 6811
 		}
-		return ts + 6286
+		return ts + 6305
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 8341
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18757
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 8360
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18823
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -91216,7 +91252,7 @@ __10:
 		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+12178)
+		ts+12197)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __15:
@@ -91251,7 +91287,7 @@ __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)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18895)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __19:
@@ -91265,7 +91301,7 @@ __20:
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18853,
+		ts+18919,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -91538,7 +91574,7 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
 	(*Parse)(unsafe.Pointer(pParse)).Fdb = db
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1483, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1502, 0)
 	}
 }
 
@@ -91566,7 +91602,7 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, bp+16, ts+1483, 0)
+	Xsqlite3ErrorMsg(tls, bp+16, ts+1502, 0)
 __1:
 	;
 	if !(prepFlags&U32(SQLITE_PREPARE_PERSISTENT) != 0) {
@@ -91597,7 +91633,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18887, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18953, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -91627,7 +91663,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18917, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18983, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -91687,7 +91723,7 @@ __21:
 	if !((*Parse)(unsafe.Pointer(bp+16)).FzErrMsg != 0) {
 		goto __22
 	}
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3658, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3677, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 	Xsqlite3DbFree(tls, db, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
 	goto __23
 __22:
@@ -91723,7 +91759,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, 137995)
+		return Xsqlite3MisuseError(tls, 138048)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -91822,7 +91858,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, 138143)
+		return Xsqlite3MisuseError(tls, 138196)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -92140,8 +92176,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 + 11323
-		var zSp2 uintptr = ts + 11323
+		var zSp1 uintptr = ts + 11342
+		var zSp2 uintptr = ts + 11342
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -92149,13 +92185,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18936, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+19002, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18966))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 19032))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -92330,7 +92366,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+19000, libc.VaList(bp, 0))
+					ts+19066, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -92375,7 +92411,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+19050, libc.VaList(bp+8, zName))
+						ts+19116, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -92386,7 +92422,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+19114,
+							Xsqlite3ErrorMsg(tls, pParse, ts+19180,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -92430,7 +92466,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6989, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 7008, 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.
@@ -93014,16 +93050,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 19151
+		z = ts + 19217
 		break
 	case TK_INTERSECT:
-		z = ts + 19161
+		z = ts + 19227
 		break
 	case TK_EXCEPT:
-		z = ts + 19171
+		z = ts + 19237
 		break
 	default:
-		z = ts + 19178
+		z = ts + 19244
 		break
 	}
 	return z
@@ -93033,7 +93069,7 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19184, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19250, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
@@ -93059,11 +93095,11 @@ 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 {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19273, libc.VaList(bp, func() uintptr {
 		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
-			return ts + 19238
+			return ts + 19304
 		}
-		return ts + 1547
+		return ts + 1566
 	}()))
 
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
@@ -93251,8 +93287,8 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 				}
 
 				if iCol < 0 {
-					zType = ts + 1112
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16673
+					zType = ts + 1131
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16692
 				} 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))
@@ -93391,13 +93427,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16673
+				zCol = ts + 16692
 			} 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+12464, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12483, 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))
@@ -93405,7 +93441,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+19253, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+19319, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -93495,7 +93531,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16673
+					zName = ts + 16692
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -93505,7 +93541,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+19253, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+19319, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -93521,7 +93557,7 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+19262, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+19328, 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)
@@ -93604,8 +93640,6 @@ __1:
 		(*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
@@ -93620,12 +93654,15 @@ __1:
 			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
 				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
 			}
+			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)
+			}
 		}
 		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
+				zType = ts + 19336
 			} else {
 				zType = uintptr(0)
 				for j = 1; j < SQLITE_N_STDTYPE; j++ {
@@ -93841,7 +93878,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19274, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19340, 0)
 	return
 __1:
 	;
@@ -93932,7 +93969,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19323, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19389, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -93952,7 +93989,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19365, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19431, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -93989,7 +94026,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19371, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19437, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -94023,11 +94060,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+19386, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19452, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
-			return ts + 1547
+			return ts + 1566
 		}
-		return ts + 3548
+		return ts + 3567
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -94128,8 +94165,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19409, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19424, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19475, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19490, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -94176,7 +94213,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19151, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19217, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -94243,7 +94280,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+19443, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19509, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -94305,7 +94342,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+19443, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19509, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -94458,10 +94495,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+19464, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19530, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19510,
+			ts+19576,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -94715,8 +94752,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+7637)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7637)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7645)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7645)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -94743,13 +94780,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+19592, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19658, 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+19603, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19669, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -94761,7 +94798,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+19608, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19674, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -94949,7 +94986,8 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 				Xsqlite3VectorErrorMsg(tls, (*SubstContext)(unsafe.Pointer(pSubst)).FpParse, pCopy)
 			} else {
 				var db uintptr = (*Parse)(unsafe.Pointer((*SubstContext)(unsafe.Pointer(pSubst)).FpParse)).Fdb
-				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 && int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN {
+				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 &&
+					(int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN || (*Expr)(unsafe.Pointer(pCopy)).FiTable != (*SubstContext)(unsafe.Pointer(pSubst)).FiNewTable) {
 					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_IF_NULL_ROW)
 					(*Expr)(unsafe.Pointer(bp)).FpLeft = pCopy
@@ -94989,7 +95027,7 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 								if pColl != 0 {
 									return (*CollSeq)(unsafe.Pointer(pColl)).FzName
 								}
-								return ts + 1092
+								return ts + 1111
 							}())
 					}
 
@@ -95777,12 +95815,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15567) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15586) == 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+15571) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15590) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -95848,7 +95886,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+19614, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19680, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -95931,7 +95969,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+19632, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19698, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -96060,7 +96098,7 @@ 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+19655, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19721, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
@@ -96083,7 +96121,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+19675, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19741, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -96099,7 +96137,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19718
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19784
 		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 {
@@ -96125,7 +96163,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+19741,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19807,
 					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
@@ -96136,9 +96174,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 + 19779
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19845
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19813
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19879
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -96185,7 +96223,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+19851, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19917, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -96297,7 +96335,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19855,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19921,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -96316,7 +96354,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+19894,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19960,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -96324,7 +96362,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+15136,
+					Xsqlite3ErrorMsg(tls, pParse, ts+15155,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -96425,7 +96463,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6849
+							zSchemaName = ts + 6868
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -96440,7 +96478,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+19925, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19991, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -96505,7 +96543,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+19930,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19996,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -96517,7 +96555,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+12464, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12483, 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)
@@ -96536,9 +96574,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19939, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+20005, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19957, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+20023, 0)
 					}
 				}
 			}
@@ -96548,7 +96586,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+19977, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+20043, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -96686,7 +96724,7 @@ func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect ui
 	(*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)
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSelect)).FpGroupBy)).FnExpr)
 		} 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)
 		}
@@ -96770,13 +96808,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+20008, 0)
+					ts+20074, 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+20059, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20125, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -96965,19 +97003,19 @@ 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+20092,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20158,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 20104
+						return ts + 20170
 					}
-					return ts + 1547
+					return ts + 1566
 				}(),
 				func() uintptr {
 					if bCover != 0 {
 						return (*Index)(unsafe.Pointer(pIdx)).FzName
 					}
-					return ts + 1547
+					return ts + 1566
 				}()))
 	}
 }
@@ -96990,7 +97028,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+8341)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+8360)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -97297,7 +97335,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20127,
+		ts+20193,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -97358,7 +97396,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20181,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20247,
 		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:
@@ -97462,7 +97500,7 @@ __27:
 	if !((*SrcItem)(unsafe.Pointer(pItem1)).FcolUsed == uint64(0) && (*SrcItem)(unsafe.Pointer(pItem1)).FzName != uintptr(0)) {
 		goto __30
 	}
-	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1547, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
+	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1566, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
 __30:
 	;
 	pSub1 = (*SrcItem)(unsafe.Pointer(pItem1)).FpSelect
@@ -97500,7 +97538,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+20221, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20287, 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)
@@ -97559,7 +97597,7 @@ __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20236, libc.VaList(bp+40, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20302, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
@@ -98030,9 +98068,9 @@ __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 + 20252
+				return ts + 20318
 			}
-			return ts + 20261
+			return ts + 20327
 		}())
 
 	groupBySort = 1
@@ -98383,7 +98421,7 @@ __65:
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
 		goto __146
 	}
-	explainTempTable(tls, pParse, ts+20252)
+	explainTempTable(tls, pParse, ts+20318)
 __146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
@@ -98466,7 +98504,7 @@ __7:
 	if !(i < nCol) {
 		goto __9
 	}
-	z = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
+	z = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
 	if !(z == uintptr(0)) {
 		goto __10
 	}
@@ -98488,7 +98526,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+20270, 0)
+		ts+20336, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -98584,7 +98622,7 @@ func Xsqlite3_get_table(tls *libc.TLS, db uintptr, zSql uintptr, pazResult uintp
 		if (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
 			if pzErrMsg != 0 {
 				Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(pzErrMsg)))
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
 			}
 			Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg)
 		}
@@ -98721,7 +98759,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+20335, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20401, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -98765,7 +98803,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+20381, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+20447, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -98783,7 +98821,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20389, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20455, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -98795,7 +98833,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+20381, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+20447, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -98810,11 +98848,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20430, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20496, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
+
 __17:
 	;
 	goto trigger_cleanup
@@ -98822,22 +98861,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6784, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6803, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20456, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20522, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20494,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20560,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20531
+				return ts + 20597
 			}
-			return ts + 20538
+			return ts + 20604
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -98846,7 +98885,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20544, libc.VaList(bp+24, pTableName+8))
+		ts+20610, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -98875,9 +98914,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 6792
+			return ts + 6811
 		}
-		return ts + 6286
+		return ts + 6305
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -98995,7 +99034,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+20381, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+20447, 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
@@ -99028,7 +99067,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20590,
+		ts+20656,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -99053,13 +99092,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20638,
+		ts+20704,
 		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+20713, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20779, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -99315,7 +99354,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20742, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20808, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -99354,9 +99393,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 + 6792
+				return ts + 6811
 			}
-			return ts + 6286
+			return ts + 6305
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -99368,7 +99407,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20762,
+			ts+20828,
 			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)
@@ -99482,12 +99521,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20824,
+		ts+20890,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20872
+				return ts + 20938
 			}
-			return ts + 20879
+			return ts + 20945
 		}()))
 __15:
 	;
@@ -99601,7 +99640,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+20886, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20952, 0)
 	return 1
 }
 
@@ -99667,7 +99706,7 @@ func codeReturningTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab
 	}
 	Xsqlite3ExprListDelete(tls, db, (*Select)(unsafe.Pointer(bp)).FpEList)
 	pNew = sqlite3ExpandReturning(tls, pParse, (*Returning)(unsafe.Pointer(pReturning)).FpReturnEL, pTab)
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0) {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
 		libc.X__builtin___memset_chk(tls, bp+240, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp+240, 0))
 		if (*Returning)(unsafe.Pointer(pReturning)).FnRetCol == 0 {
 			(*Returning)(unsafe.Pointer(pReturning)).FnRetCol = (*ExprList)(unsafe.Pointer(pNew)).FnExpr
@@ -99721,7 +99760,7 @@ func codeTriggerProgram(tls *libc.TLS, pParse uintptr, pStepList uintptr, orconf
 
 		if (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan != 0 {
 			Xsqlite3VdbeAddOp4(tls, v, OP_Trace, 0x7fffffff, 1, 0,
-				Xsqlite3MPrintf(tls, db, ts+6483, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
+				Xsqlite3MPrintf(tls, db, ts+6502, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
 				-6)
 		}
 
@@ -99831,7 +99870,7 @@ 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+20928, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20994, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
@@ -100424,7 +100463,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20942,
+		ts+21008,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -100456,7 +100495,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20978, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+21044, 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:
@@ -100466,7 +100505,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 8116
+				return ts + 8135
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -100782,7 +100821,12 @@ __74:
 	goto __77
 __76:
 	flags = WHERE_ONEPASS_DESIRED
-	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) && !(pTrigger != 0) && !(hasFK != 0) && !(chngKey != 0) && !(*(*int32)(unsafe.Pointer(bp + 104)) != 0)) {
+	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) &&
+		!(pTrigger != 0) &&
+		!(hasFK != 0) &&
+		!(chngKey != 0) &&
+		!(*(*int32)(unsafe.Pointer(bp + 104)) != 0) &&
+		(*NameContext)(unsafe.Pointer(bp+40)).FncFlags&NC_Subquery == 0) {
 		goto __78
 	}
 	flags = flags | WHERE_ONEPASS_MULTIROW
@@ -101336,7 +101380,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20997)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+21063)
 __169:
 	;
 update_cleanup:
@@ -101642,10 +101686,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+21010, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+21076, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+21014, libc.VaList(bp+8, bp+216))
+				ts+21080, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -101736,7 +101780,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+12553, -1)
+				ts+12572, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -101768,7 +101812,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+21087, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+21091, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+21153, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+21157, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -101916,14 +101960,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+21095)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+21161)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+21135)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+21201)
 	return SQLITE_ERROR
 __2:
 	;
@@ -101934,7 +101978,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+21178)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+21244)
 	return SQLITE_ERROR
 __5:
 	;
@@ -101943,7 +101987,7 @@ __5:
 	*(*uint32)(unsafe.Pointer(db + 76)) |= uint32(SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE)
 	goto __4
 __3:
-	zOut = ts + 1547
+	zOut = ts + 1566
 __4:
 	;
 	saved_flags = (*Sqlite3)(unsafe.Pointer(db)).Fflags
@@ -101962,7 +102006,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+21196, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+21262, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -101982,7 +102026,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+21219)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+21285)
 	goto end_of_vacuum
 __8:
 	;
@@ -101997,7 +102041,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14906)
+	rc = execSql(tls, db, pzErrMsg, ts+14925)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -102042,7 +102086,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21246,
+		ts+21312,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -102051,7 +102095,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21354,
+		ts+21420,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -102062,7 +102106,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21408,
+		ts+21474,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -102073,7 +102117,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21559,
+		ts+21625,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -102418,7 +102462,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+12780, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12799, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -102502,11 +102546,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+21689, libc.VaList(bp, pParse+272))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21755, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21713,
+			ts+21779,
 			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,
@@ -102516,7 +102560,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21812, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21878, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -102577,7 +102621,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+21831, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21897, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -102605,9 +102649,11 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FbDeclared = 0
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = bp + 32
+	(*Table)(unsafe.Pointer(pTab)).FnTabRef++
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{xConstruct})).f(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, pVTable+16, bp+64)
+	Xsqlite3DeleteTable(tls, db, pTab)
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = (*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -102615,9 +102661,9 @@ 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+21873, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21939, libc.VaList(bp+8, zModuleName))
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3658, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3677, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 		}
 		Xsqlite3DbFree(tls, db, pVTable)
@@ -102627,7 +102673,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 + 21903
+			var zFormat uintptr = ts + 21969
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -102639,12 +102685,12 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 			*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) = pVTable
 
 			for iCol = 0; iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol); iCol++ {
-				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1547)
+				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1566)
 				var nType int32
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16564, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16583, 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
@@ -102701,13 +102747,13 @@ 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+21949, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22015, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxConnect, bp+16)
 		if rc != SQLITE_OK {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3658, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3677, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 		}
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 16)))
@@ -102759,7 +102805,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+21949, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+22015, 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)
@@ -102793,7 +102839,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, 151030)
+		return Xsqlite3MisuseError(tls, 151102)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -102835,7 +102881,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR,
 			func() uintptr {
 				if (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
-					return ts + 3658
+					return ts + 3677
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg))
@@ -103203,7 +103249,7 @@ func Xsqlite3VtabEponymousTableInit(tls *libc.TLS, pParse uintptr, pMod uintptr)
 	addModuleArgument(tls, pParse, pTab, Xsqlite3DbStrDup(tls, db, (*Table)(unsafe.Pointer(pTab)).FzName))
 	rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer(pModule)).FxConnect, bp+8)
 	if rc != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+3658, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+		Xsqlite3ErrorMsg(tls, pParse, ts+3677, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		Xsqlite3VtabEponymousTableClear(tls, db, pMod)
 	}
@@ -103246,7 +103292,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, 151521)
+		rc = Xsqlite3MisuseError(tls, 151593)
 	} else {
 		ap = va
 		switch op {
@@ -103273,7 +103319,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 151539)
+				rc = Xsqlite3MisuseError(tls, 151611)
 				break
 
 			}
@@ -103504,10 +103550,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 + 21968
+		return ts + 22034
 	}
 	if i == -1 {
-		return ts + 16673
+		return ts + 16692
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -103516,35 +103562,35 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21975, 5)
+		Xsqlite3_str_append(tls, pStr, ts+22041, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21981, 1)
+		Xsqlite3_str_append(tls, pStr, ts+22047, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+13170, 1)
+			Xsqlite3_str_append(tls, pStr, ts+13189, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+5360, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5379, 1)
 	}
 
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21981, 1)
+		Xsqlite3_str_append(tls, pStr, ts+22047, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+13170, 1)
+			Xsqlite3_str_append(tls, pStr, ts+13189, 1)
 		}
-		Xsqlite3_str_append(tls, pStr, ts+5411, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5430, 1)
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+5360, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5379, 1)
 	}
 }
 
@@ -103561,29 +103607,29 @@ 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+21983, 2)
+	Xsqlite3_str_append(tls, pStr, ts+22049, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21975, 5)
+			Xsqlite3_str_append(tls, pStr, ts+22041, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21986
+				return ts + 22052
 			}
-			return ts + 21991
+			return ts + 22057
 		}(), 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+21999)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+22065)
 		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+22001)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+22067)
 	}
-	Xsqlite3_str_append(tls, pStr, ts+5360, 1)
+	Xsqlite3_str_append(tls, pStr, ts+5379, 1)
 }
 
 // This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
@@ -103624,11 +103670,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+22003, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+22069, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 22009
+				return ts + 22075
 			}
-			return ts + 22016
+			return ts + 22082
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -103638,43 +103684,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 + 11379
+					zFmt = ts + 11398
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 22021
+				zFmt = ts + 22087
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 22054
+				zFmt = ts + 22120
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 22079
+				zFmt = ts + 22145
 			} else {
-				zFmt = ts + 22097
+				zFmt = ts + 22163
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+22106, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+22172, 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 + 16673
-			Xsqlite3_str_appendf(tls, bp+64, ts+22114, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16692
+			Xsqlite3_str_appendf(tls, bp+64, ts+22180, 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+22145, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+22211, 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+22155, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+22221, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+22160,
+			Xsqlite3_str_appendf(tls, bp+64, ts+22226,
 				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+22187, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+22253, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -103706,25 +103752,25 @@ 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+22198, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+22264, 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+21986, 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+22052, 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+22219, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+22285, 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+21975, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+22041, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21986, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+22052, libc.VaList(bp+16, z))
 		}
 	}
-	Xsqlite3_str_append(tls, bp+24, ts+5360, 1)
+	Xsqlite3_str_append(tls, bp+24, ts+5379, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
@@ -105318,7 +105364,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22227, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22293, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -105346,7 +105392,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22242, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22308, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -105864,7 +105910,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+22251, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22317, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -106221,10 +106267,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{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)},
+	{FzOp: ts + 16541, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15869, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 15389, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 22331, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -106714,12 +106760,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22272, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+22338, 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+22272, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+22338, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -106798,7 +106844,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 + 7172
+			*(*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)
@@ -106892,7 +106938,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 22313
+				return ts + 22379
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -107268,7 +107314,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22320,
+			Xsqlite3ErrorMsg(tls, pParse, ts+22386,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -107284,7 +107330,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 		pRhs = Xsqlite3PExpr(tls, pParse, TK_UPLUS,
 			Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*ExprList_item)(unsafe.Pointer(pArgs+8+uintptr(j)*32)).FpExpr, 0), uintptr(0))
 		pTerm = Xsqlite3PExpr(tls, pParse, TK_EQ, pColRef, pRhs)
-		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ|JT_RIGHT) != 0 {
 			joinType = U32(EP_OuterON)
 		} else {
 			joinType = U32(EP_InnerON)
@@ -108002,7 +108048,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+22356, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+22422, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -108073,7 +108119,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 22382
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 22448
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -108247,6 +108293,10 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	var iCur int32
+	var saved_pIdxEpr uintptr
+
+	saved_pIdxEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 
 	addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	for __ccgo := true; __ccgo; __ccgo = iLevel < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel) {
@@ -108290,9 +108340,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, n)
 			var jj int32
 			for jj = 0; jj < n; jj++ {
-				var iCol int32 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(jj)*2)))
-
-				Xsqlite3ExprCodeGetColumnOfTable(tls, v, (*Index)(unsafe.Pointer(pIdx)).FpTable, iCur, iCol, r1+jj)
+				Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pIdx, iCur, jj, r1+jj)
 			}
 			Xsqlite3VdbeAddOp4Int(tls, v, OP_FilterAdd, (*WhereLevel)(unsafe.Pointer(pLevel)).FregFilter, 0, r1, n)
 			Xsqlite3ReleaseTempRange(tls, pParse, r1, n)
@@ -108326,6 +108374,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 		}
 	}
 	Xsqlite3VdbeJumpHere(tls, v, addrOnce)
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = saved_pIdxEpr
 }
 
 func allocateIndexInfo(tls *libc.TLS, pWInfo uintptr, pWC uintptr, mUnusable Bitmask, pSrc uintptr, pmNoOmit uintptr) uintptr {
@@ -108439,7 +108488,7 @@ __3:
 		uint64(unsafe.Sizeof(sqlite3_index_orderby{}))*uint64(nOrderBy)+uint64(unsafe.Sizeof(HiddenIndexInfo1{}))+
 		uint64(unsafe.Sizeof(uintptr(0)))*uint64(nTerm))
 	if pIdxInfo == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1483, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1502, 0)
 		return uintptr(0)
 	}
 	pHidden = pIdxInfo + 1*96
@@ -108561,9 +108610,9 @@ func vtabBestIndex(tls *libc.TLS, pParse uintptr, pTab uintptr, p uintptr) int32
 		if rc == SQLITE_NOMEM {
 			Xsqlite3OomFault(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb)
 		} else if !(int32((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3658, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3677, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3658, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3677, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
 		}
 	}
 	Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg)
@@ -108584,11 +108633,16 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 
 	_ = pParse
 
+	if !((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol)
+	} else {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnColumn)
+	}
 	nField = func() int32 {
-		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < (*Index)(unsafe.Pointer(pIdx)).FnSample {
+		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < nField {
 			return int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField)
 		}
-		return (*Index)(unsafe.Pointer(pIdx)).FnSample
+		return nField
 	}()
 	iCol = 0
 	iSample = (*Index)(unsafe.Pointer(pIdx)).FnSample * nField
@@ -110169,7 +110223,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+22393, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+22459, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -110227,7 +110281,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+22393, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+22459, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -110625,7 +110679,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+22419, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+22485, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -111232,7 +111286,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22454, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22520, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -111267,6 +111321,10 @@ __3:
 			if int32((*WherePath)(unsafe.Pointer(pFrom)).FisOrdered) == (*ExprList)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpOrderBy)).FnExpr {
 				(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_ORDERED)
 			}
+			if (*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy != 0 &&
+				int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) > (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr {
+				(*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat = I8((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr)
+			}
 		} else {
 			(*WhereInfo)(unsafe.Pointer(pWInfo)).FrevMask = (*WherePath)(unsafe.Pointer(pFrom)).FrevLoop
 			if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) <= 0 {
@@ -111561,6 +111619,9 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
+		if Xsqlite3IndexAffinityStr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pIdx) != 0 {
+			(*IndexedExpr)(unsafe.Pointer(p)).Faff = U8(*(*int8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FzColAff + uintptr(i))))
+		}
 		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
@@ -111713,7 +111774,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22472, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22538, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -111776,7 +111837,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22500, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22566, 0)
 	goto __5
 __4:
 	ii = 0
@@ -112658,7 +112719,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22518, -1)
+		pCtx, ts+22584, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -112791,7 +112852,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+22574, -1)
+					pCtx, ts+22640, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -112881,17 +112942,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-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))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22685))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22696))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22707))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22712))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22725))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22735))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22741))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22752))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22762))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22774))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22779))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -112937,7 +112998,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22717, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22783, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -112981,12 +113042,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+22736, 0)
+			ts+22802, 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+22807, 0)
+				ts+22873, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -113009,7 +113070,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+8341)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+8360)
 					}
 					break
 				}
@@ -113213,7 +113274,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+22870, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22936, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -113329,7 +113390,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+7933))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7941))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -113444,7 +113505,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22896, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22962, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -113509,15 +113570,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 + 22928
+				zErr = ts + 22994
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22945
+				zErr = ts + 23011
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22961
+				zErr = ts + 23027
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22981, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+23047, 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 {
@@ -113538,7 +113599,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+23014, 0)
+				ts+23080, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -113676,7 +113737,7 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regZero)
 	if eCond >= WINDOW_STARTING_NUM {
 		var regString int32 = Xsqlite3GetTempReg(tls, pParse)
-		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1547, -1)
+		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1566, -1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, Xsqlite3VdbeCurrentAddr(tls, v)+2, reg)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL))
 
@@ -113694,11 +113755,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 23061,
-	ts + 23114,
-	ts + 22518,
-	ts + 23165,
-	ts + 23217,
+	ts + 23127,
+	ts + 23180,
+	ts + 22584,
+	ts + 23231,
+	ts + 23283,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -114189,7 +114250,7 @@ func windowCodeRangeTest(tls *libc.TLS, p uintptr, op int32, csr1 int32, regVal
 
 	}
 
-	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1547, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1566, -1)
 	addrGe = Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, 0, reg1)
 
 	if op == OP_Ge && arith == OP_Add || op == OP_Le && arith == OP_Subtract {
@@ -115093,19 +115154,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+23267,
+				Xsqlite3ErrorMsg(tls, pParse, ts+23333,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 23309
+							return ts + 23375
 						}
-						return ts + 23318
+						return ts + 23384
 					}(),
 						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+23324, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+23390, 0)
 		}
 	}
 
@@ -115173,7 +115234,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+23358,
+		Xsqlite3ErrorMsg(tls, pParse, ts+23424,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -116270,7 +116331,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+23396, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23462, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -117245,21 +117306,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+16673, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16692, 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+23418, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23484, 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+16586, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16605, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+23418, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23484, 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))
@@ -118002,7 +118063,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+23445)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+23511)
 				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 {
@@ -118166,7 +118227,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+23454, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23520, 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))
@@ -118383,9 +118444,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 + 7167
+							return ts + 8116
 						}
-						return ts + 7172
+						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)))
@@ -118669,19 +118730,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+23478, 0)
+					ts+23544, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23573, 0)
+					ts+23639, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23657, 0)
+					ts+23723, 0)
 			}
 			break
 		case uint32(273):
@@ -119060,9 +119121,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+23454, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23520, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23742, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23808, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -119830,7 +119891,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+23759, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23825, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -119851,9 +119912,9 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 	}
 	if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg != 0 || (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_OK && (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_DONE {
 		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)))
+			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3677, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23784, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23850, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -120026,7 +120087,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23795, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23861, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -120039,11 +120100,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+20381, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+20447, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23802, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23868, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23807, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23873, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -120056,9 +120117,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23817, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23883, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23821, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23887, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -120128,7 +120189,8 @@ func sqlite3TestExtInit(tls *libc.TLS, db uintptr) int32 {
 	return Xsqlite3FaultSim(tls, 500)
 }
 
-var sqlite3BuiltinExtensions = [4]uintptr{
+var sqlite3BuiltinExtensions = [5]uintptr{
+	0,
 	0,
 	0,
 	0,
@@ -120292,7 +120354,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 174337)
+		return Xsqlite3MisuseError(tls, 174426)
 	}
 
 	ap = va
@@ -120867,7 +120929,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175111)
+		return Xsqlite3MisuseError(tls, 175200)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -120882,7 +120944,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23829, 0)
+			ts+23895, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -121073,23 +121135,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 + 23897
+	var zErr uintptr = ts + 23963
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23911
+			zErr = ts + 23977
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23933
+			zErr = ts + 23999
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23955
+			zErr = ts + 24021
 			break
 
 		}
@@ -121107,35 +121169,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23978,
-	ts + 23991,
+	ts + 24044,
+	ts + 24057,
 	uintptr(0),
-	ts + 24007,
-	ts + 24032,
-	ts + 24046,
-	ts + 24065,
-	ts + 1483,
-	ts + 24090,
-	ts + 24127,
-	ts + 24139,
-	ts + 24154,
-	ts + 24187,
+	ts + 24073,
+	ts + 24098,
+	ts + 24112,
+	ts + 24131,
+	ts + 1502,
+	ts + 24156,
+	ts + 24193,
 	ts + 24205,
-	ts + 24230,
-	ts + 24259,
+	ts + 24220,
+	ts + 24253,
+	ts + 24271,
+	ts + 24296,
+	ts + 24325,
 	uintptr(0),
-	ts + 6241,
-	ts + 5737,
-	ts + 24276,
-	ts + 24294,
-	ts + 24312,
+	ts + 6260,
+	ts + 5756,
+	ts + 24342,
+	ts + 24360,
+	ts + 24378,
 	uintptr(0),
-	ts + 24346,
+	ts + 24412,
 	uintptr(0),
-	ts + 24367,
-	ts + 24393,
-	ts + 24416,
-	ts + 24437,
+	ts + 24433,
+	ts + 24459,
+	ts + 24482,
+	ts + 24503,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -121256,7 +121318,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, 175758)
+		return Xsqlite3MisuseError(tls, 175847)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -121301,7 +121363,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+24453, 0)
+				ts+24519, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -121418,7 +121480,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+24516, libc.VaList(bp, zName))
+		ts+24582, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -121446,7 +121508,7 @@ func Xsqlite3_overload_function(tls *libc.TLS, db uintptr, zName uintptr, nArg i
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, zName))
+	zCopy = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, zName))
 	if zCopy == uintptr(0) {
 		return SQLITE_NOMEM
 	}
@@ -121654,7 +121716,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+24567, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24633, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -121747,7 +121809,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, 176503))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176592))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -121817,7 +121879,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, 176582)
+		return Xsqlite3MisuseError(tls, 176671)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -121827,7 +121889,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, 176591)
+		return Xsqlite3MisuseError(tls, 176680)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -121859,14 +121921,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, 176639)
+		return Xsqlite3MisuseError(tls, 176728)
 	}
 
 	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+24588, 0)
+				ts+24654, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -121996,7 +122058,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+24656, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24722, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -122041,10 +122103,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24662, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24728, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24672,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24738,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -122149,7 +122211,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24700, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24766, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -122160,17 +122222,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24704, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24770, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24704
+	zModeType = ts + 24770
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24710, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24776, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -122178,7 +122240,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 3265
+	zModeType = ts + 3284
 __32:
 	;
 	if !(aMode != 0) {
@@ -122208,7 +122270,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24715, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24781, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -122216,7 +122278,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24735,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24801,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -122256,7 +122318,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24759, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24825, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -122280,15 +122342,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24775, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24782, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24841, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24848, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{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},
+	{Fz: ts + 24856, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24859, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24862, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17803, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -122434,10 +122496,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+22313, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+22379, 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+24800, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24866, 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) {
@@ -122451,7 +122513,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 177308)
+	rc = Xsqlite3MisuseError(tls, 177397)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -122468,7 +122530,7 @@ __19:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3658
+			return ts + 3677
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -122502,9 +122564,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 + 6844
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6863
 	(*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 + 23802
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23868
 	(*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)
@@ -122609,7 +122671,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24806
+		zFilename = ts + 24872
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -122712,21 +122774,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+24809,
+	Xsqlite3_log(tls, iErr, ts+24875,
 		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+24834)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24900)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24854)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24920)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24861)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24927)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -122837,7 +122899,7 @@ __4:
 	autoinc = libc.Bool32(int32((*Table)(unsafe.Pointer(pTab)).FiPKey) == iCol && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != U32(0))
 	goto __13
 __12:
-	zDataType = ts + 1112
+	zDataType = ts + 1131
 	primarykey = 1
 __13:
 	;
@@ -122884,14 +122946,14 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24878, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24944, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3658
+			return ts + 3677
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -123540,7 +123602,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24906, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24972, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -123658,7 +123720,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 + 24914
+			return ts + 24980
 		}
 		return uintptr(0)
 	}(), 0)
@@ -123836,7 +123898,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6584, ts + 7167, ts + 7172, ts + 6594, ts + 6589, ts + 8408, ts + 24937, ts + 24943,
+	ts + 6603, ts + 8116, ts + 8121, ts + 6613, ts + 6608, ts + 8427, ts + 25003, ts + 25009,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -123989,7 +124051,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 + 24950 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 25016 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -124015,7 +124077,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	switch Xsqlite3_value_type(tls, pValue) {
 	case SQLITE_NULL:
 		{
-			jsonAppendRaw(tls, p, ts+6584, uint32(4))
+			jsonAppendRaw(tls, p, ts+6603, uint32(4))
 			break
 
 		}
@@ -124044,7 +124106,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+24967, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+25033, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -124102,19 +124164,19 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 	switch int32((*JsonNode)(unsafe.Pointer(pNode)).FeType) {
 	default:
 		{
-			jsonAppendRaw(tls, pOut, ts+6584, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6603, uint32(4))
 			break
 
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+7167, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+8116, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+7172, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+8121, uint32(5))
 			break
 
 		}
@@ -124659,17 +124721,17 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		}
 		return int32(j + U32(1))
 	} else if int32(c) == 'n' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6584, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6603, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		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+7167, 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+7172, 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))
@@ -124770,7 +124832,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+24996, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+25062, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -125076,7 +125138,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+25011, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+25077, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -125091,7 +125153,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+25015, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+25081, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -125145,7 +125207,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+25041,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+25107,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -125250,11 +125312,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+25084, uint32(2))
+					jsonAppendRaw(tls, bp, ts+25150, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
-					jsonAppendRaw(tls, bp, ts+5401, uint32(2))
+					jsonAppendRaw(tls, bp, ts+5420, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+25087, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+25153, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -125295,7 +125357,7 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if pNode != 0 {
 				jsonRenderNode(tls, pNode, bp, uintptr(0))
 			} else {
-				jsonAppendRaw(tls, bp, ts+6584, uint32(4))
+				jsonAppendRaw(tls, bp, ts+6603, uint32(4))
 			}
 		}
 		if i == argc {
@@ -125411,14 +125473,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+25090, -1)
+			ts+25156, -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+25141, -1)
+			Xsqlite3_result_error(tls, ctx, ts+25207, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -125513,7 +125575,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15783)
+	jsonWrongNumArgs(tls, ctx, ts+15802)
 	return
 __2:
 	;
@@ -125588,9 +125650,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 25175
+			return ts + 25241
 		}
-		return ts + 25179
+		return ts + 25245
 	}())
 	return
 __2:
@@ -125723,7 +125785,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+25186, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+25252, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -125820,7 +125882,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+25189, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+25255, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -125864,7 +125926,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+25192)
+		ts+25258)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -125995,7 +126057,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+25275, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+25341, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -126014,7 +126076,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+25281, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+25347, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -126110,7 +126172,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+25281, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+25347, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -126134,7 +126196,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 + 25286
+				zRoot = ts + 25352
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -126256,7 +126318,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+24996, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+25062, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -126351,25 +126413,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{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 + 25354},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25359},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25370},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25370},
 	{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}}
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 25401},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 25404},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25408},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25420},
+	{FnArg: int8(2), 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_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25443},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25454},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25466},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 25479},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25488},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25488},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25498},
+	{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 + 25509},
+	{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 + 25526}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -126388,8 +126450,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 25478, FpModule: 0},
-	{FzName: ts + 25488, FpModule: 0},
+	{FzName: ts + 25544, FpModule: 0},
+	{FzName: ts + 25554, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -126649,11 +126711,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+25498, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25564, 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+25506, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25572, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -126864,7 +126926,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+25511,
+		ts+25577,
 		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))
@@ -127567,7 +127629,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25593)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25659)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -127779,7 +127841,7 @@ func rtreeBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 2
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FneedToFreeIdxStr = 1
-	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, bp+8))) {
+	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, bp+8))) {
 		return SQLITE_NOMEM
 	}
 
@@ -128908,7 +128970,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25607, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25673, 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 {
@@ -128920,12 +128982,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+25627, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25693, 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+25659, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25725, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -129151,7 +129213,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+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))
+		ts+25762, 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))
@@ -129174,14 +129236,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25841
+	var zFmt uintptr = ts + 25907
 	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+11751, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11770, 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 {
@@ -129222,7 +129284,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25897, ts + 5463, ts + 16673,
+	ts + 25963, ts + 5482, ts + 16692,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -129265,19 +129327,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+25902,
+			ts+25968,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25964, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+26030, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25969,
+			ts+26035,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+26033,
+			ts+26099,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+26103,
+			ts+26169,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -129306,7 +129368,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 + 26152
+			zFormat = ts + 26218
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -129318,7 +129380,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+26260,
+			ts+26326,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -129326,18 +129388,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+26305, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+26371, 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+13170, 1)
+					Xsqlite3_str_append(tls, p, ts+13189, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+26332, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+26398, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+26354, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+26420, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+26362, 0)
+			Xsqlite3_str_appendf(tls, p, ts+26428, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -129352,14 +129414,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 26378,
-	ts + 26431,
-	ts + 26476,
-	ts + 26528,
-	ts + 26582,
-	ts + 26627,
-	ts + 26685,
-	ts + 26740,
+	ts + 26444,
+	ts + 26497,
+	ts + 26542,
+	ts + 26594,
+	ts + 26648,
+	ts + 26693,
+	ts + 26751,
+	ts + 26806,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -129388,7 +129450,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+26787, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26853, 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
@@ -129396,19 +129458,19 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 				(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = 4 + int32((*Rtree)(unsafe.Pointer(pRtree)).FnBytesPerCell)*RTREE_MAXCELLS
 			}
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26807,
+			ts+26873,
 			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 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26864,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26930,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -129450,16 +129512,16 @@ 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 + 26899,
-		ts + 26942,
-		ts + 26977,
-		ts + 27013,
+		ts + 26965,
+		ts + 27008,
+		ts + 27043,
+		ts + 27079,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
 		goto __1
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
 	return SQLITE_ERROR
 __1:
 	;
@@ -129484,7 +129546,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+27050,
+	Xsqlite3_str_appendf(tls, pSql, ts+27116,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -129496,7 +129558,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27074, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+27140, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -129519,7 +129581,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+27080, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27146, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -129530,14 +129592,14 @@ __10:
 	if !(ii < argc) {
 		goto __12
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
 	rc = SQLITE_ERROR
 	goto __13
 __12:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __14
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
 __14:
 	;
 __13:
@@ -129580,7 +129642,7 @@ __17:
 	if !(iErr != 0) {
 		goto __22
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
 	goto rtreeInit_fail
 __22:
 	;
@@ -129597,7 +129659,7 @@ __23:
 	if !(rc != 0) {
 		goto __24
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
 	goto rtreeInit_fail
 __24:
 	;
@@ -129615,7 +129677,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 27083, ts + 27094}
+var azFormat = [2]uintptr{ts + 27149, ts + 27160}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -129653,13 +129715,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+11323, 1)
+			Xsqlite3_str_append(tls, pOut, ts+11342, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+27104, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+27170, 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+27110, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+27176, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+27114, 1)
+		Xsqlite3_str_append(tls, pOut, ts+27180, 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})))
@@ -129670,7 +129732,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+27116, -1)
+		Xsqlite3_result_error(tls, ctx, ts+27182, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -129748,12 +129810,12 @@ 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+27149,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+27215,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
-						return ts + 4465
+						return ts + 4484
 					}
-					return ts + 1547
+					return ts + 1566
 				}(), z))
 			if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport == uintptr(0) {
 				(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
@@ -129772,7 +129834,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+27156,
+			ts+27222,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -129791,7 +129853,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+27201, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+27267, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -129805,8 +129867,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 + 27233,
-		ts + 27287,
+		ts + 27299,
+		ts + 27353,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -129821,23 +129883,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+27335,
+		rtreeCheckAppendMsg(tls, pCheck, ts+27401,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 27380
+					return ts + 27446
 				}
-				return ts + 27388
+				return ts + 27454
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27397,
+				ts+27463,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 27380
+						return ts + 27446
 					}
-					return ts + 27388
+					return ts + 27454
 				}(), iKey, iVal))
 		}
 	}
@@ -129861,7 +129923,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+27455, libc.VaList(bp, i, iCell, iNode))
+				ts+27521, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -129881,7 +129943,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+27503, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27569, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -129898,14 +129960,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+27570, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27636, 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+27604, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27670, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -129913,7 +129975,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+27634,
+					ts+27700,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -129942,14 +130004,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+27689,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27755,
 			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+27720, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27786, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -129971,12 +130033,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+14906, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14925, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27787, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27853, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -129985,12 +130047,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25607, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25673, 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+27815, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27881, 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)
 		}
@@ -130004,8 +130066,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+27846, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27853, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27912, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27919, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -130013,7 +130075,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+27861, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27927, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -130028,7 +130090,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27865, -1)
+			ts+27931, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -130036,7 +130098,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6844
+			zDb = ts + 6863
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -130046,7 +130108,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 + 18464
+				return ts + 18530
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -130417,11 +130479,11 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		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+27916, 1)
+		Xsqlite3_str_append(tls, x, ts+27982, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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+27984, 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+27929, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27995, 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)
 	}
@@ -130441,19 +130503,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+27940, 0)
+		Xsqlite3_str_appendf(tls, x, ts+28006, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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)))))
+			Xsqlite3_str_appendf(tls, x, ts+28024, 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+27966, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+28032, 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+27974, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+28040, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27978, 0)
+		Xsqlite3_str_appendf(tls, x, ts+28044, 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)
 	}
@@ -131373,7 +131435,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+27991, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+28057, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -131382,7 +131444,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+28013, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+28079, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -131390,7 +131452,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+27080, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27146, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -131401,7 +131463,7 @@ __5:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __7
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
 __7:
 	;
 __6:
@@ -131426,7 +131488,7 @@ __9:
 	if !(rc != 0) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	goto geopolyInit_fail
 __10:
 	;
@@ -131617,7 +131679,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 + 16673
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16692
 		(*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
@@ -131627,7 +131689,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 + 28017
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 28083
 		(*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
@@ -131635,7 +131697,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 + 28023
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 28089
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -131747,7 +131809,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+28032, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+28098, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -131879,14 +131941,14 @@ geopoly_update_end:
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
 	_ = pVtab
 	_ = nArg
-	if Xsqlite3_stricmp(tls, zName, ts+28072) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+28138) == 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+28088) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+28154) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -131951,7 +132013,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+28103, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+28169, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -131963,25 +132025,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{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},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28177},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28190},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28203},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 28216},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 28154},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 28228},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 28138},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 28251},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28265},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 28278},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 28292},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28308},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 28254},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 28320},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -131991,26 +132053,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+28273, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+28339, 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+28283, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+28349, 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+28294, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+28360, -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+28017, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+28083, 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+28305, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+28371, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -132064,7 +132126,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+25593, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25659, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -132391,7 +132453,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+28315, -1)
+		Xsqlite3_result_error(tls, context, ts+28381, -1)
 		return
 	}
 
@@ -132402,7 +132464,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+28315, -1)
+			Xsqlite3_result_error(tls, context, ts+28381, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -132415,7 +132477,7 @@ func prepareAndCollectError(tls *libc.TLS, db uintptr, ppStmt uintptr, pzErrmsg
 
 	var rc int32 = Xsqlite3_prepare_v2(tls, db, zSql, -1, ppStmt, uintptr(0))
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 		*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	}
 	return rc
@@ -132427,7 +132489,7 @@ func resetAndCollectError(tls *libc.TLS, pStmt uintptr, pzErrmsg uintptr) int32
 
 	var rc int32 = Xsqlite3_reset(tls, pStmt)
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
 	}
 	return rc
 }
@@ -132503,7 +132565,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+28336, uintptr(0), uintptr(0), p+64)
+				ts+28402, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -132567,7 +132629,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+25506, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25572, 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++ {
 				}
@@ -132588,16 +132650,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+28507, libc.VaList(bp, func() uintptr {
+			ts+28573, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28657
+					return ts + 28723
 				}
-				return ts + 1547
+				return ts + 1566
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28698)
+			ts+28764)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -132695,7 +132757,7 @@ func rbuFinalize(tls *libc.TLS, p uintptr, pStmt uintptr) {
 	var rc int32 = Xsqlite3_finalize(tls, pStmt)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && rc != SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 	}
 }
 
@@ -132713,7 +132775,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+28823, libc.VaList(bp, zTab)))
+			ts+28889, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -132731,7 +132793,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+28942, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+29008, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -132749,7 +132811,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28963, libc.VaList(bp+16, zIdx)))
+			ts+29029, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -132772,7 +132834,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+29014, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+29080, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -132818,7 +132880,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+29035, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+29101, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -132833,7 +132895,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+29063, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+29129, 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 {
@@ -132873,7 +132935,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+19939, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+20005, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -132883,18 +132945,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+29092, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+29158, 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+29111, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+29177, 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+29116, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+29182, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -132906,18 +132968,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+29126, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+29192, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 29155
+							return ts + 29221
 						}
-						return ts + 29168
+						return ts + 29234
 					}()))
 		}
 
 		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+29177, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+29243, 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)
@@ -132931,7 +132993,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+29199,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29265,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -132974,12 +133036,12 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	defer tls.Free(24)
 
 	var zList uintptr = uintptr(0)
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	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+29226, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 15017
+		zList = rbuMPrintf(tls, p, ts+29292, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 15036
 	}
 	return zList
 }
@@ -132990,13 +133052,13 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 
 	var iPk int32 = 1
 	var zRet uintptr = uintptr(0)
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	for 1 != 0 {
 		var i int32
 		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+29235, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+29301, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -133018,25 +133080,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+29248, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+29314, 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+29280, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+29346, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		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)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1566, ts+15036, ts+29369)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+29375, ts+29382, ts+5379)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1566, ts+15036, ts+1566)
 
 		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+29324,
+					ts+29390,
 					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+29366, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+29432, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -133073,12 +133135,12 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	zVector = uintptr(0)
 	zRet = uintptr(0)
 	bFailed = 0
-	zSep = ts + 1547
+	zSep = ts + 1566
 	iCol = 0
 	*(*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+29063, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+29129, 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
@@ -133113,7 +133175,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 29386
+	zCol = ts + 29452
 __7:
 	;
 	goto __5
@@ -133121,13 +133183,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+29394,
+	zLhs = rbuMPrintf(tls, p, ts+29460,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+29415,
+	zOrder = rbuMPrintf(tls, p, ts+29481,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+29451,
+	zSelect = rbuMPrintf(tls, p, ts+29517,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 15017
+	zSep = ts + 15036
 	iCol++
 	goto __1
 __2:
@@ -133145,12 +133207,12 @@ __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+29478,
+		Xsqlite3_mprintf(tls, ts+29544,
 			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
 	}
-	zSep = ts + 1547
+	zSep = ts + 1566
 	iCol = 0
 __14:
 	if !(iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnCol) {
@@ -133172,8 +133234,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29526, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 15017
+	zVector = rbuMPrintf(tls, p, ts+29592, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 15036
 	goto __15
 __15:
 	iCol++
@@ -133184,7 +133246,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29533, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29599, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -133211,13 +133273,13 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 	var zImpPK uintptr = uintptr(0)
 	var zWhere uintptr = uintptr(0)
 	var nBind int32 = 0
-	var zCom uintptr = ts + 1547
-	var zAnd uintptr = ts + 1547
+	var zCom uintptr = ts + 1566
+	var zAnd uintptr = ts + 1566
 	*(*uintptr)(unsafe.Pointer(bp + 200)) = uintptr(0)
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+29063, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+29129, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -133229,9 +133291,9 @@ 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+29545, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29611, 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
+			zType = ts + 1566
 		} else {
 			if iCid < 0 {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK {
@@ -133241,37 +133303,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 + 29386
+					zCol = ts + 29452
 				} else {
-					zCol = ts + 29116
+					zCol = ts + 29182
 				}
-				zType = ts + 1112
+				zType = ts + 1131
 			} 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+29567, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29633, 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 + 29303
+					return ts + 29369
 				}
-				return ts + 1547
+				return ts + 1566
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29587,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29653,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29608,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29674,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29641, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29707, 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 + 15017
-		zAnd = ts + 21975
+		zCom = ts + 15036
+		zAnd = ts + 22041
 		nBind++
 	}
 
@@ -133305,16 +133367,16 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 
 	var zList uintptr = uintptr(0)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
-		var zS uintptr = ts + 1547
+		var zS uintptr = ts + 1566
 		var i int32
 		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+29665, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29731, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29677, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29743, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 15017
+			zS = ts + 15036
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -133322,7 +133384,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+29686, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29752, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -133334,27 +133396,27 @@ 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+29701, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29767, 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 zSep uintptr = ts + 1566
 		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+29715, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21975
+				zList = rbuMPrintf(tls, p, ts+29781, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 22041
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29727, libc.VaList(bp+40, zList))
+			ts+29793, libc.VaList(bp+40, zList))
 
 	} else {
-		var zSep uintptr = ts + 1547
+		var zSep uintptr = ts + 1566
 		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 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29777, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21975
+				zList = rbuMPrintf(tls, p, ts+29843, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 22041
 			}
 		}
 	}
@@ -133363,7 +133425,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+29790, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29856, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -133377,21 +133439,21 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 		if int32(libc.Xstrlen(tls, zMask)) != (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 			rbuBadControlError(tls, p)
 		} else {
-			var zSep uintptr = ts + 1547
+			var zSep uintptr = ts + 1566
 			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+29777,
+					zList = rbuMPrintf(tls, p, ts+29843,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 15017
+					zSep = ts + 15036
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29816,
+					zList = rbuMPrintf(tls, p, ts+29882,
 						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 + 15017
+					zSep = ts + 15036
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29846,
+					zList = rbuMPrintf(tls, p, ts+29912,
 						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 + 15017
+					zSep = ts + 15036
 				}
 			}
 		}
@@ -133426,19 +133488,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 + 29883
+		var zSep uintptr = ts + 29949
 		*(*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+29035, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+29101, 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+16561) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16580) == 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+29063, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+29129, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -133450,15 +133512,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 + 29303
+					zDesc = ts + 29369
 				} else {
-					zDesc = ts + 1547
+					zDesc = ts + 1566
 				}
-				z = rbuMPrintf(tls, p, ts+29896, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 15017
+				z = rbuMPrintf(tls, p, ts+29962, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 15036
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29907, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29973, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -133473,12 +133535,12 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		*(*uintptr)(unsafe.Pointer(bp + 168)) = uintptr(0)
 		var zIdx uintptr = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
-		var zComma uintptr = ts + 1547
+		var zComma uintptr = ts + 1566
 		var zCols uintptr = uintptr(0)
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29911)
+			ts+29977)
 		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))) {
@@ -133487,7 +133549,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+29063, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+29129, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -133497,25 +133559,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+29961, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+30027, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29983, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+30049, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 29303
+						return ts + 29369
 					}
-					return ts + 1547
+					return ts + 1566
 				}()))
-				zComma = ts + 15017
+				zComma = ts + 15036
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29993, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+30059, 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+6844, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+30008,
+			ts+30074,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, 0, 0))
 	}
 }
 
@@ -133525,50 +133587,50 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
 		var tnum int32 = (*RbuObjIter)(unsafe.Pointer(pIter)).FiTnum
-		var zComma uintptr = ts + 1547
+		var zComma uintptr = ts + 1566
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
-			var zPk uintptr = ts + 1547
+			var zPk uintptr = ts + 1566
 			var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCol)*8))
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, (*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 + 30070
+				zPk = ts + 30136
 			}
-			zSql = rbuMPrintf(tls, p, ts+30083,
+			zSql = rbuMPrintf(tls, p, ts+30149,
 				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 + 30110
+							return ts + 30176
 						}
-						return ts + 1547
+						return ts + 1566
 					}()))
-			zComma = ts + 15017
+			zComma = ts + 15036
 		}
 
 		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+30120, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+30186, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		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,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+30193,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 30159
+						return ts + 30225
 					}
-					return ts + 1547
+					return ts + 1566
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, 0, 0))
 	}
 }
 
@@ -133581,7 +133643,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+30174,
+				ts+30240,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -133618,7 +133680,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+30231)
+			ts+30297)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -133723,7 +133785,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+30297, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+30363, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -133743,24 +133805,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+6844, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+30317,
+				ts+30383,
 				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+6844, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, 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+30382, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+30448, 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+30418, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+30484, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -133776,7 +133838,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30452,
+						ts+30518,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -133784,31 +133846,31 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 30513
+											return ts + 30579
 										}
-										return ts + 30517
+										return ts + 30583
 									}()
 								}
-								return ts + 1547
+								return ts + 1566
 							}(), zStart,
 							zCollist, zLimit))
 					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+30523,
+						ts+30589,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30584,
+						ts+30650,
 						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 + 30513
+									return ts + 30579
 								}
-								return ts + 30517
+								return ts + 30583
 							}(),
 							zCollist, zLimit))
 				}
@@ -133833,8 +133895,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+6855)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6851)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6874)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6870)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -133843,52 +133905,52 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			rbuCreateImposterTable2(tls, p, pIter)
 			zWrite = func() uintptr {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
-					return ts + 1547
+					return ts + 1566
 				}
-				return ts + 30743
+				return ts + 30809
 			}()
 
 			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+30752,
+						ts+30818,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30788
+								return ts + 30854
 							}
-							return ts + 1547
+							return ts + 1566
 						}(), zBindings)))
 			}
 
 			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+30798, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30864, 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
+				var zRbuRowid uintptr = ts + 1566
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30826
+					zRbuRowid = ts + 30892
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30838, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30904, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30914
+							return ts + 30980
 						}
-						return ts + 1547
+						return ts + 1566
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30931,
+					ts+30997,
 					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+31230,
+						ts+31296,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -133896,14 +133958,14 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-				var zRbuRowid uintptr = ts + 1547
+				var zRbuRowid uintptr = ts + 1566
 				var zStart uintptr = uintptr(0)
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 31329
+						zRbuRowid = ts + 31395
 					} else {
-						zRbuRowid = ts + 31339
+						zRbuRowid = ts + 31405
 					}
 				}
 
@@ -133916,35 +133978,35 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+29386, 0)
+						zOrder = rbuMPrintf(tls, p, ts+29452, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+15017, ts+1547)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1566, ts+15036, ts+1566)
 					}
 				}
 
 				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+31350,
+							ts+31416,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 31398
+										return ts + 31464
 									}
-									return ts + 1547
+									return ts + 1566
 								}(),
 								zRbuRowid,
 								(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 									if zStart != 0 {
 										return zStart
 									}
-									return ts + 1547
+									return ts + 1566
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 23309
+										return ts + 23375
 									}
-									return ts + 1547
+									return ts + 1566
 								}(), zOrder,
 								zLimit)))
 				}
@@ -134007,12 +134069,12 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 		(*RbuObjIter)(unsafe.Pointer(pIter)).FpRbuUpdate = pUp
 
 		if zSet != 0 {
-			var zPrefix uintptr = ts + 1547
+			var zPrefix uintptr = ts + 1566
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30743
+				zPrefix = ts + 30809
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+31404,
+			zUpdate = Xsqlite3_mprintf(tls, ts+31470,
 				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)
@@ -134039,7 +134101,7 @@ func rbuOpenDbhandle(tls *libc.TLS, p uintptr, zName uintptr, bUseVfs int32) uin
 			return uintptr(0)
 		}())
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
 			Xsqlite3_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 			*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 		}
@@ -134071,7 +134133,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+31434, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+31500, 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:
@@ -134141,28 +134203,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+6844, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6863, 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+6844)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31464, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6863)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31530, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		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))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31558, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.X__builtin___memcpy_chk(tls, p+48, ts+3298, uint64(4), libc.X__builtin_object_size(tls, p+48, 0))
 	} else {
-		libc.X__builtin___memcpy_chk(tls, p+48, ts+6844, uint64(4), libc.X__builtin_object_size(tls, p+48, 0))
+		libc.X__builtin___memcpy_chk(tls, p+48, ts+6863, uint64(4), libc.X__builtin_object_size(tls, p+48, 0))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31510, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31576, 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+6844, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6863, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -134195,11 +134257,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+31576, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31642, 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+24656, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24722, (*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)))) == '?' {
@@ -134211,16 +134273,16 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31608,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6844),
+			zTarget = Xsqlite3_mprintf(tls, ts+31674,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6863),
 					func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1547
+							return ts + 1566
 						}
-						return ts + 31640
+						return ts + 31706
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1547
+							return ts + 1566
 						}
 						return zExtra
 					}()))
@@ -134236,37 +134298,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+31642, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31708, -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+31657, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31723, 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+31674, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31740, -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+6844, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31690, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31756, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, 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+31718, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31784, 0)
 	}
 }
 
@@ -134295,14 +134357,14 @@ 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+31690, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31756, 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+31736, uintptr(0), uintptr(0), uintptr(0))
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31802, uintptr(0), uintptr(0), uintptr(0))
 		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
@@ -134411,7 +134473,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+6844, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6863, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -134428,23 +134490,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+31771, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31837, 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+6844)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863)
 	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+6844)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6863)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31796, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31803, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31862, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31869, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -134561,7 +134623,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+24294, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+24360, 0)
 			return
 		}
 
@@ -134654,7 +134716,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+31810)
+			ts+31876)
 		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)
@@ -134662,7 +134724,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+31832, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31898, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -134683,7 +134745,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+31859,
+				ts+31925,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -134713,9 +134775,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+32017, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+32083, 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+32032,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32098,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -134729,10 +134791,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+32052, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32118, 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+32077)
+			ts+32143)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -134746,12 +134808,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+32185)
+			ts+32251)
 	}
 
 	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+32250)
+			ts+32316)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -134763,7 +134825,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+32294, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32360, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -134783,15 +134845,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+17662)
-					rbuCopyPragma(tls, p, ts+16757)
+					rbuCopyPragma(tls, p, ts+17681)
+					rbuCopyPragma(tls, p, ts+16776)
 				}
 
 				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+32319, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+32385, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -134815,10 +134877,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+14921, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14940, 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+14921, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14940, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -134913,7 +134975,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+32347, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32413, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -134929,10 +134991,10 @@ func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31796, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31862, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 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)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
@@ -134946,7 +135008,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+32372, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+32438, 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)
@@ -134980,7 +135042,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+32383, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+32449, 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 {
@@ -135010,13 +135072,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+32455, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32521, 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+32469)
+				ts+32535)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -135027,7 +135089,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+32526)
+				ts+32592)
 			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)
@@ -135072,7 +135134,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			libc.X__builtin___memcpy_chk(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, zRbu, nRbu+uint64(1), libc.X__builtin_object_size(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, 0))
 			pCsr += uintptr(nRbu + uint64(1))
 			if zState != 0 {
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3658, libc.VaList(bp, zState))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3677, libc.VaList(bp, zState))
 			}
 
 			rbuOpenDatabase(tls, p, uintptr(0), bp+16)
@@ -135101,7 +135163,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+32600, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32666, 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
@@ -135119,12 +135181,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+32632,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32698,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32664
+							return ts + 32730
 						}
-						return ts + 32671
+						return ts + 32737
 					}()))
 			}
 		}
@@ -135132,7 +135194,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+14906, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14925, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -135143,19 +135205,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+17376)
-						rbuCopyPragma(tls, p, ts+16772)
+						rbuCopyPragma(tls, p, ts+17395)
+						rbuCopyPragma(tls, p, ts+16791)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32678, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32744, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6844, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6863, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32694, uintptr(0), uintptr(0), p+64)
+								db, ts+32760, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -135209,7 +135271,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+32718, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32784, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -135236,7 +135298,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+30743, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30809, 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++
@@ -135253,7 +135315,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+14921, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14940, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -135266,13 +135328,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+14921, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14940, 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+32726, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32792, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -135367,7 +135429,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+14921, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14940, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -135384,19 +135446,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+14921, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14940, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14906
+				zBegin = ts + 14925
 			} else {
-				zBegin = ts + 32678
+				zBegin = ts + 32744
 			}
 			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+32678, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32744, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -135742,7 +135804,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+32753, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32819, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -135767,7 +135829,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+32776, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32842, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -135912,7 +135974,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+6844)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6863)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -135927,7 +135989,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+32787, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32853, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -136172,6 +136234,970 @@ func Xsqlite3rbu_temp_size(tls *libc.TLS, pRbu uintptr) Sqlite3_int64 {
 	return (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FszTemp
 }
 
+var zDbstatSchema = *(*[258]int8)(unsafe.Pointer(ts + 32864))
+
+// Forward reference to data structured used in this module
+type StatTable1 = struct {
+	Fbase        Sqlite3_vtab
+	Fdb          uintptr
+	FiDb         int32
+	F__ccgo_pad1 [4]byte
+}
+
+// Forward reference to data structured used in this module
+type StatTable = StatTable1
+type StatCursor1 = struct {
+	Fbase        Sqlite3_vtab_cursor
+	FpStmt       uintptr
+	FisEof       U8
+	FisAgg       U8
+	F__ccgo_pad1 [2]byte
+	FiDb         int32
+	FaPage       [32]StatPage
+	FiPage       int32
+	FiPageno     U32
+	FzName       uintptr
+	FzPath       uintptr
+	FzPagetype   uintptr
+	FnPage       int32
+	FnCell       int32
+	FnMxPayload  int32
+	F__ccgo_pad2 [4]byte
+	FnUnused     I64
+	FnPayload    I64
+	FiOffset     I64
+	FszPage      I64
+}
+
+type StatCursor = StatCursor1
+type StatPage1 = struct {
+	FiPgno         U32
+	F__ccgo_pad1   [4]byte
+	FaPg           uintptr
+	FiCell         int32
+	F__ccgo_pad2   [4]byte
+	FzPath         uintptr
+	Fflags         U8
+	F__ccgo_pad3   [3]byte
+	FnCell         int32
+	FnUnused       int32
+	F__ccgo_pad4   [4]byte
+	FaCell         uintptr
+	FiRightChildPg U32
+	FnMxPayload    int32
+}
+
+type StatPage = StatPage1
+type StatCell1 = struct {
+	FnLocal      int32
+	FiChildPg    U32
+	FnOvfl       int32
+	F__ccgo_pad1 [4]byte
+	FaOvfl       uintptr
+	FnLastOvfl   int32
+	FiOvfl       int32
+}
+
+type StatCell = StatCell1
+
+func statConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var pTab uintptr = uintptr(0)
+	var rc int32 = SQLITE_OK
+	var iDb int32
+	_ = pAux
+
+	if argc >= 4 {
+		Xsqlite3TokenInit(tls, bp+8, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
+		iDb = Xsqlite3FindDb(tls, db, bp+8)
+		if iDb < 0 {
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+12293, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
+			return SQLITE_ERROR
+		}
+	} else {
+		iDb = 0
+	}
+	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_DIRECTONLY, 0)
+	rc = Xsqlite3_declare_vtab(tls, db, uintptr(unsafe.Pointer(&zDbstatSchema)))
+	if rc == SQLITE_OK {
+		pTab = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatTable{})))
+		if pTab == uintptr(0) {
+			rc = SQLITE_NOMEM
+		}
+	}
+
+	if rc == SQLITE_OK {
+		libc.X__builtin___memset_chk(tls, pTab, 0, uint64(unsafe.Sizeof(StatTable{})), libc.X__builtin_object_size(tls, pTab, 0))
+		(*StatTable)(unsafe.Pointer(pTab)).Fdb = db
+		(*StatTable)(unsafe.Pointer(pTab)).FiDb = iDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
+	return rc
+}
+
+func statDisconnect(tls *libc.TLS, pVtab uintptr) int32 {
+	Xsqlite3_free(tls, pVtab)
+	return SQLITE_OK
+}
+
+func statBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
+	var i int32
+	var iSchema int32 = -1
+	var iName int32 = -1
+	var iAgg int32 = -1
+	_ = tab
+
+	for i = 0; i < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; i++ {
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fop) != SQLITE_INDEX_CONSTRAINT_EQ {
+			continue
+		}
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fusable) == 0 {
+			return SQLITE_CONSTRAINT
+		}
+		switch (*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(i)*12)).FiColumn {
+		case 0:
+			{
+				iName = i
+				break
+
+			}
+		case 10:
+			{
+				iSchema = i
+				break
+
+			}
+		case 11:
+			{
+				iAgg = i
+				break
+
+			}
+		}
+	}
+	i = 0
+	if iSchema >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).Fomit = uint8(1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x01
+	}
+	if iName >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iName)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x02
+	}
+	if iAgg >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iAgg)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x04
+	}
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 1.0
+
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy == 1 &&
+		(*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)).FnOrderBy == 2 &&
+		(*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_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).FiColumn == 1 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x08
+	}
+
+	return SQLITE_OK
+}
+
+func statOpen(tls *libc.TLS, pVTab uintptr, ppCursor uintptr) int32 {
+	var pTab uintptr = pVTab
+	var pCsr uintptr
+
+	pCsr = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatCursor{})))
+	if pCsr == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		libc.X__builtin___memset_chk(tls, pCsr, 0, uint64(unsafe.Sizeof(StatCursor{})), libc.X__builtin_object_size(tls, pCsr, 0))
+		(*StatCursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab = pVTab
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppCursor)) = pCsr
+	return SQLITE_OK
+}
+
+func statClearCells(tls *libc.TLS, p uintptr) {
+	var i int32
+	if (*StatPage)(unsafe.Pointer(p)).FaCell != 0 {
+		for i = 0; i < (*StatPage)(unsafe.Pointer(p)).FnCell; i++ {
+			Xsqlite3_free(tls, (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell+uintptr(i)*32)).FaOvfl)
+		}
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FaCell)
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnCell = 0
+	(*StatPage)(unsafe.Pointer(p)).FaCell = uintptr(0)
+}
+
+func statClearPage(tls *libc.TLS, p uintptr) {
+	var aPg uintptr = (*StatPage)(unsafe.Pointer(p)).FaPg
+	statClearCells(tls, p)
+	Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FzPath)
+	libc.X__builtin___memset_chk(tls, p, 0, uint64(unsafe.Sizeof(StatPage{})), libc.X__builtin_object_size(tls, p, 0))
+	(*StatPage)(unsafe.Pointer(p)).FaPg = aPg
+}
+
+func statResetCsr(tls *libc.TLS, pCsr uintptr) {
+	var i int32
+
+	for i = 0; i < int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{}))); i++ {
+		statClearPage(tls, pCsr+24+uintptr(i)*64)
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(pCsr+24+uintptr(i)*64)).FaPg)
+		(*StatPage)(unsafe.Pointer(pCsr + 24 + uintptr(i)*64)).FaPg = uintptr(0)
+	}
+	Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(0)
+}
+
+func statResetCounts(tls *libc.TLS, pCsr uintptr) {
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnCell = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnUnused = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPayload = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FszPage = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 0
+}
+
+func statClose(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	Xsqlite3_free(tls, pCsr)
+	return SQLITE_OK
+}
+
+func getLocalPayload(tls *libc.TLS, nUsable int32, flags U8, nTotal int32) int32 {
+	var nLocal int32
+	var nMinLocal int32
+	var nMaxLocal int32
+
+	if int32(flags) == 0x0D {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = nUsable - 35
+	} else {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = (nUsable-12)*64/255 - 23
+	}
+
+	nLocal = nMinLocal + (nTotal-nMinLocal)%(nUsable-4)
+	if nLocal > nMaxLocal {
+		nLocal = nMinLocal
+	}
+	return nLocal
+}
+
+func statDecodePage(tls *libc.TLS, pBt uintptr, p uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var nUnused int32
+	var iOff int32
+	var nHdr int32
+	var isLeaf int32
+	var szPage int32
+	var aData uintptr
+	var aHdr uintptr
+	var iNext int32
+
+	var rc int32
+	var iPrev U32
+
+	var j int32
+	var nOvfl int32
+
+	var nLocal int32
+	var pCell uintptr
+	var i int32
+	var nUsable int32
+	aData = (*StatPage)(unsafe.Pointer(p)).FaPg
+	aHdr = aData + uintptr(func() int32 {
+		if (*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1) {
+			return 100
+		}
+		return 0
+	}())
+
+	(*StatPage)(unsafe.Pointer(p)).Fflags = *(*U8)(unsafe.Pointer(aHdr))
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0A || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __1
+	}
+	isLeaf = 1
+	nHdr = 8
+	goto __2
+__1:
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05 || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x02) {
+		goto __3
+	}
+	isLeaf = 0
+	nHdr = 12
+	goto __4
+__3:
+	goto statPageIsCorrupt
+__4:
+	;
+__2:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1)) {
+		goto __5
+	}
+	nHdr = nHdr + 100
+__5:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnCell = int32(*(*U8)(unsafe.Pointer(aHdr + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 3 + 1)))
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = 0
+	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
+
+	nUnused = int32(*(*U8)(unsafe.Pointer(aHdr + 5)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 5 + 1))) - nHdr - 2*(*StatPage)(unsafe.Pointer(p)).FnCell
+	nUnused = nUnused + int32(*(*U8)(unsafe.Pointer(aHdr + 7)))
+	iOff = int32(*(*U8)(unsafe.Pointer(aHdr + 1)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 1 + 1)))
+__6:
+	if !(iOff != 0) {
+		goto __7
+	}
+	if !(iOff >= szPage) {
+		goto __8
+	}
+	goto statPageIsCorrupt
+__8:
+	;
+	nUnused = nUnused + (int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2) + 1))))
+	iNext = int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff) + 1)))
+	if !(iNext < iOff+4 && iNext > 0) {
+		goto __9
+	}
+	goto statPageIsCorrupt
+__9:
+	;
+	iOff = iNext
+	goto __6
+__7:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnUnused = nUnused
+	(*StatPage)(unsafe.Pointer(p)).FiRightChildPg = func() uint32 {
+		if isLeaf != 0 {
+			return uint32(0)
+		}
+		return Xsqlite3Get4byte(tls, aHdr+8)
+	}()
+
+	if !((*StatPage)(unsafe.Pointer(p)).FnCell != 0) {
+		goto __10
+	}
+
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = szPage - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatPage)(unsafe.Pointer(p)).FaCell = Xsqlite3_malloc64(tls, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+	if !((*StatPage)(unsafe.Pointer(p)).FaCell == uintptr(0)) {
+		goto __11
+	}
+	return SQLITE_NOMEM
+__11:
+	;
+	libc.X__builtin___memset_chk(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})), libc.X__builtin_object_size(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0))
+
+	i = 0
+__12:
+	if !(i < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __14
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr(i)*32
+
+	iOff = int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2) + 1)))
+	if !(iOff < nHdr || iOff >= szPage) {
+		goto __15
+	}
+	goto statPageIsCorrupt
+__15:
+	;
+	if !!(isLeaf != 0) {
+		goto __16
+	}
+	(*StatCell)(unsafe.Pointer(pCell)).FiChildPg = Xsqlite3Get4byte(tls, aData+uintptr(iOff))
+	iOff = iOff + 4
+__16:
+	;
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05) {
+		goto __17
+	}
+
+	goto __18
+__17:
+	iOff = iOff + int32(func() uint8 {
+		if int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff)))) < int32(U8(0x80)) {
+			return uint8(func() int32 {
+				*(*U32)(unsafe.Pointer(bp)) = U32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))
+				return 1
+			}())
+		}
+		return Xsqlite3GetVarint32(tls, aData+uintptr(iOff), bp)
+	}())
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __19
+	}
+	iOff = iOff + int32(Xsqlite3GetVarint(tls, aData+uintptr(iOff), bp+8))
+__19:
+	;
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32((*StatPage)(unsafe.Pointer(p)).FnMxPayload)) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = int32(*(*U32)(unsafe.Pointer(bp)))
+__20:
+	;
+	nLocal = getLocalPayload(tls, nUsable, (*StatPage)(unsafe.Pointer(p)).Fflags, int32(*(*U32)(unsafe.Pointer(bp))))
+	if !(nLocal < 0) {
+		goto __21
+	}
+	goto statPageIsCorrupt
+__21:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLocal = nLocal
+
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32(nLocal)) {
+		goto __22
+	}
+	nOvfl = int32((*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) + U32(nUsable) - U32(4) - U32(1)) / U32(nUsable-4))
+	if !(iOff+nLocal+4 > nUsable || *(*U32)(unsafe.Pointer(bp)) > U32(0x7fffffff)) {
+		goto __23
+	}
+	goto statPageIsCorrupt
+__23:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl = int32(*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) - U32((nOvfl-1)*(nUsable-4)))
+	(*StatCell)(unsafe.Pointer(pCell)).FnOvfl = nOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FaOvfl = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(U32(0)))*uint64(nOvfl))
+	if !((*StatCell)(unsafe.Pointer(pCell)).FaOvfl == uintptr(0)) {
+		goto __24
+	}
+	return SQLITE_NOMEM
+__24:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl)) = Xsqlite3Get4byte(tls, aData+uintptr(iOff+nLocal))
+	j = 1
+__25:
+	if !(j < nOvfl) {
+		goto __27
+	}
+	iPrev = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j-1)*4))
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPrev, bp+16, 0)
+	if !(rc != SQLITE_OK) {
+		goto __28
+	}
+
+	return rc
+__28:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j)*4)) = Xsqlite3Get4byte(tls, Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 16))))
+	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
+	goto __26
+__26:
+	j++
+	goto __25
+	goto __27
+__27:
+	;
+__22:
+	;
+__18:
+	;
+	goto __13
+__13:
+	i++
+	goto __12
+	goto __14
+__14:
+	;
+__10:
+	;
+	return SQLITE_OK
+
+statPageIsCorrupt:
+	(*StatPage)(unsafe.Pointer(p)).Fflags = U8(0)
+	statClearCells(tls, p)
+	return SQLITE_OK
+}
+
+func statSizeAndOffset(tls *libc.TLS, pCsr uintptr) {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCsr)).FpVtab
+	var pBt uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatTable)(unsafe.Pointer(pTab)).FiDb)*32)).FpBt
+	var pPager uintptr = Xsqlite3BtreePager(tls, pBt)
+	var fd uintptr
+
+	fd = Xsqlite3PagerFile(tls, pPager)
+	*(*Sqlite3_int64)(unsafe.Pointer(bp)) = Sqlite3_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	if Xsqlite3OsFileControl(tls, fd, 230440, bp) == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = *(*Sqlite3_int64)(unsafe.Pointer(bp))
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += *(*Sqlite3_int64)(unsafe.Pointer(bp + 1*8))
+	} else {
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += I64(Xsqlite3BtreeGetPageSize(tls, pBt))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = (*StatCursor)(unsafe.Pointer(pCsr)).FszPage * I64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno-U32(1))
+	}
+}
+
+func statGetPage(tls *libc.TLS, pBt uintptr, iPg U32, pPg uintptr) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var pgsz int32 = Xsqlite3BtreeGetPageSize(tls, pBt)
+	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
+	var rc int32
+
+	if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+		(*StatPage)(unsafe.Pointer(pPg)).FaPg = Xsqlite3_malloc(tls, pgsz+DBSTAT_PAGE_PADDING_BYTES)
+		if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+			return SQLITE_NOMEM
+		}
+		libc.X__builtin___memset_chk(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0, uint64(DBSTAT_PAGE_PADDING_BYTES), libc.X__builtin_object_size(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0))
+	}
+
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPg, bp, 0)
+	if rc == SQLITE_OK {
+		var a uintptr = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		libc.X__builtin___memcpy_chk(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, a, uint64(pgsz), libc.X__builtin_object_size(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, 0))
+		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+	}
+
+	return rc
+}
+
+func statNext(tls *libc.TLS, pCursor uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
+	var rc int32
+	var nPayload int32
+	var z uintptr
+	var pCsr uintptr
+	var pTab uintptr
+	var pBt uintptr
+	var pPager uintptr
+
+	var iRoot U32
+	var nUsable int32
+	var iOvfl int32
+	var pCell uintptr
+
+	var p uintptr
+	var i int32
+	var p1 uintptr
+	pCsr = pCursor
+	pTab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	pBt = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FpBt
+	pPager = Xsqlite3BtreePager(tls, pBt)
+
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+
+statNextRestart:
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __1
+	}
+
+	statResetCounts(tls, pCsr)
+	rc = Xsqlite3_step(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	if !(rc == SQLITE_ROW) {
+		goto __3
+	}
+	iRoot = U32(Xsqlite3_column_int64(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 1))
+	Xsqlite3PagerPagecount(tls, pPager, bp+48)
+	if !(*(*int32)(unsafe.Pointer(bp + 48)) == 0) {
+		goto __5
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__5:
+	;
+	rc = statGetPage(tls, pBt, iRoot, pCsr+24)
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiPgno = iRoot
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __6
+	}
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+3911, 0))
+	if !(z == uintptr(0)) {
+		goto __7
+	}
+	rc = SQLITE_NOMEM
+__7:
+	;
+__6:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 1
+	goto __4
+__3:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__4:
+	;
+	goto __2
+__1:
+	p = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __8
+	}
+	statResetCounts(tls, pCsr)
+__8:
+	;
+__9:
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __10
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32
+__11:
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl) {
+		goto __12
+	}
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = Xsqlite3BtreeGetPageSize(tls, pBt) - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	statSizeAndOffset(tls, pCsr)
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl-1) {
+		goto __13
+	}
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nUsable - 4)
+	goto __14
+__13:
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64((*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64(nUsable - 4 - (*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+__14:
+	;
+	iOvfl = (*StatCell)(unsafe.Pointer(pCell)).FiOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FiOvfl++
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __15
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(iOvfl)*4))
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 33122
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls,
+		ts+33131, libc.VaList(bp, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell, iOvfl)))
+	if z == uintptr(0) {
+		return SQLITE_NOMEM
+	}
+	return SQLITE_OK
+__15:
+	;
+	goto __11
+__12:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiRightChildPg != 0) {
+		goto __16
+	}
+	goto __10
+__16:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+	goto __9
+__10:
+	;
+	if !(!(int32((*StatPage)(unsafe.Pointer(p)).FiRightChildPg) != 0) || (*StatPage)(unsafe.Pointer(p)).FiCell > (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __17
+	}
+	statClearPage(tls, p)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage--
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 && (*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __18
+	}
+
+	return SQLITE_OK
+__18:
+	;
+	goto statNextRestart
+__17:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage++
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage >= int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{})))) {
+		goto __19
+	}
+	statResetCsr(tls, pCsr)
+	return Xsqlite3CorruptError(tls, 215455)
+__19:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell == (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatPage)(unsafe.Pointer(p)).FiRightChildPg
+	goto __21
+__20:
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32)).FiChildPg
+__21:
+	;
+	rc = statGetPage(tls, pBt, (*StatPage)(unsafe.Pointer(p+1*64)).FiPgno, p+1*64)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __22
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+33143, libc.VaList(bp+24, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell)))
+	if !(z == uintptr(0)) {
+		goto __23
+	}
+	rc = SQLITE_NOMEM
+__23:
+	;
+__22:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+__2:
+	;
+	if !(rc == SQLITE_OK) {
+		goto __24
+	}
+	p1 = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = (*StatPage)(unsafe.Pointer(p1)).FiPgno
+
+	rc = statDecodePage(tls, pBt, p1)
+	if !(rc == SQLITE_OK) {
+		goto __25
+	}
+	statSizeAndOffset(tls, pCsr)
+
+	switch int32((*StatPage)(unsafe.Pointer(p1)).Fflags) {
+	case 0x05:
+		goto __27
+	case 0x02:
+		goto __28
+	case 0x0D:
+		goto __29
+	case 0x0A:
+		goto __30
+	default:
+		goto __31
+	}
+	goto __26
+__27:
+__28:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 33151
+	goto __26
+__29:
+__30:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 33160
+	goto __26
+__31:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 33165
+	goto __26
+__26:
+	;
+	*(*int32)(unsafe.Pointer(pCsr + 2108)) += (*StatPage)(unsafe.Pointer(p1)).FnCell
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64((*StatPage)(unsafe.Pointer(p1)).FnUnused)
+	if !((*StatPage)(unsafe.Pointer(p1)).FnMxPayload > (*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload) {
+		goto __32
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = (*StatPage)(unsafe.Pointer(p1)).FnMxPayload
+__32:
+	;
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __33
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+40, (*StatPage)(unsafe.Pointer(p1)).FzPath)))
+	if !(z == uintptr(0)) {
+		goto __34
+	}
+	rc = SQLITE_NOMEM
+__34:
+	;
+__33:
+	;
+	nPayload = 0
+	i = 0
+__35:
+	if !(i < (*StatPage)(unsafe.Pointer(p1)).FnCell) {
+		goto __37
+	}
+	nPayload = nPayload + (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p1)).FaCell+uintptr(i)*32)).FnLocal
+	goto __36
+__36:
+	i++
+	goto __35
+	goto __37
+__37:
+	;
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nPayload)
+
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0) {
+		goto __38
+	}
+	goto statNextRestart
+__38:
+	;
+__25:
+	;
+__24:
+	;
+	return rc
+}
+
+func statEof(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	return int32((*StatCursor)(unsafe.Pointer(pCsr)).FisEof)
+}
+
+func statFilter(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintptr, argc int32, argv uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pCsr uintptr = pCursor
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	var pSql uintptr
+	var zSql uintptr
+	var iArg int32 = 0
+	var rc int32 = SQLITE_OK
+	var zName uintptr = uintptr(0)
+	_ = argc
+	_ = idxStr
+
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FpStmt = uintptr(0)
+	if idxNum&0x01 != 0 {
+		var zDbase uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = Xsqlite3FindDbName(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zDbase)
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FiDb < 0 {
+			(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = 0
+			(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+			return SQLITE_OK
+		}
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+	if idxNum&0x02 != 0 {
+		zName = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+	}
+	if idxNum&0x04 != 0 {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(libc.Bool32(Xsqlite3_value_double(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8))) != 0.0))
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(0)
+	}
+	pSql = Xsqlite3_str_new(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb)
+	Xsqlite3_str_appendf(tls, pSql,
+		ts+33175,
+		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb+uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FzDbSName))
+	if zName != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+33330, libc.VaList(bp+8, zName))
+	}
+	if idxNum&0x08 != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+33344, 0)
+	}
+	zSql = Xsqlite3_str_finish(tls, pSql)
+	if zSql == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		rc = Xsqlite3_prepare_v2(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
+		Xsqlite3_free(tls, zSql)
+	}
+
+	if rc == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = -1
+		rc = statNext(tls, pCursor)
+	}
+	return rc
+}
+
+func statColumn(tls *libc.TLS, pCursor uintptr, ctx uintptr, i int32) int32 {
+	var pCsr uintptr = pCursor
+	switch i {
+	case 0:
+		Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzName, -1, libc.UintptrFromInt32(-1))
+		break
+	case 1:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath, -1, libc.UintptrFromInt32(-1))
+		}
+		break
+	case 2:
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnPage))
+		} else {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno))
+		}
+		break
+	case 3:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype, -1, uintptr(0))
+		}
+		break
+	case 4:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnCell))
+		break
+	case 5:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnPayload)
+		break
+	case 6:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnUnused)
+		break
+	case 7:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload))
+		break
+	case 8:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FiOffset)
+		}
+		break
+	case 9:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FszPage)
+		break
+	case 10:
+		{
+			var db uintptr = Xsqlite3_context_db_handle(tls, ctx)
+			var iDb int32 = (*StatCursor)(unsafe.Pointer(pCsr)).FiDb
+			Xsqlite3_result_text(tls, ctx, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, -1, uintptr(0))
+			break
+
+		}
+	default:
+		{
+			Xsqlite3_result_int(tls, ctx, int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg))
+			break
+
+		}
+	}
+	return SQLITE_OK
+}
+
+func statRowid(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32 {
+	var pCsr uintptr = pCursor
+	*(*Sqlite_int64)(unsafe.Pointer(pRowid)) = Sqlite_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	return SQLITE_OK
+}
+
+// Invoke this routine to register the "dbstat" virtual table module
+func Xsqlite3DbstatRegister(tls *libc.TLS, db uintptr) int32 {
+	return Xsqlite3_create_module(tls, db, ts+33359, uintptr(unsafe.Pointer(&dbstat_module)), uintptr(0))
+}
+
+var dbstat_module = Sqlite3_module{
+	FxCreate:     0,
+	FxConnect:    0,
+	FxBestIndex:  0,
+	FxDisconnect: 0,
+	FxDestroy:    0,
+	FxOpen:       0,
+	FxClose:      0,
+	FxFilter:     0,
+	FxNext:       0,
+	FxEof:        0,
+	FxColumn:     0,
+	FxRowid:      0,
+}
+
 type SessionTable1 = struct {
 	FpNext    uintptr
 	FzName    uintptr
@@ -136752,13 +137778,13 @@ 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+11751, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11770, 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+32798, 0)
+				ts+33366, 0)
 		} else if rc == SQLITE_ERROR {
-			zPragma = Xsqlite3_mprintf(tls, ts+1547, 0)
+			zPragma = Xsqlite3_mprintf(tls, ts+1566, 0)
 		} else {
 			*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
 			*(*uintptr)(unsafe.Pointer(pabPK)) = uintptr(0)
@@ -136769,7 +137795,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32919, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+33487, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -136867,7 +137893,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11751, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11770, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -137116,7 +138142,7 @@ __4:
 	goto error_out
 __7:
 	;
-	Xsqlite3ValueSetStr(tls, p, 0, ts+1547, uint8(0), uintptr(0))
+	Xsqlite3ValueSetStr(tls, p, 0, ts+1566, uint8(0), uintptr(0))
 	(*Sqlite3_session)(unsafe.Pointer(pSession)).FpZeroBlob = p
 __6:
 	;
@@ -137444,14 +138470,14 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	var zRet uintptr = uintptr(0)
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32948,
+			zRet = Xsqlite3_mprintf(tls, ts+33516,
 				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 + 21975
+			zSep = ts + 22041
 			if zRet == uintptr(0) {
 				break
 			}
@@ -137466,7 +138492,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	var zRet uintptr = uintptr(0)
 	var bHave int32 = 0
 
@@ -137474,9 +138500,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+32982,
+				ts+33550,
 				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 + 33023
+			zSep = ts + 33591
 			if zRet == uintptr(0) {
 				break
 			}
@@ -137484,7 +138510,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7933, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7941, 0)
 	}
 
 	return zRet
@@ -137495,7 +138521,7 @@ func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintpt
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+33028,
+		ts+33596,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -137538,7 +138564,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+33106,
+			ts+33674,
 			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
@@ -137665,7 +138691,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33159, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33727, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -137930,7 +138956,7 @@ func sessionAppendInteger(tls *libc.TLS, p uintptr, iVal int32, pRc uintptr) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
-	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]int8{}))-uint64(1)), bp+8, ts+5378, libc.VaList(bp, iVal))
+	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]int8{}))-uint64(1)), bp+8, ts+5397, libc.VaList(bp, iVal))
 	sessionAppendStr(tls, p, bp+8, pRc)
 }
 
@@ -138139,29 +139165,29 @@ 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+11751, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11770, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+33186, libc.VaList(bp, zDb))
+			ts+33754, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
 	} else {
 		var i int32
-		var zSep uintptr = ts + 1547
+		var zSep uintptr = ts + 1566
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+33296, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33864, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
-		sessionAppendStr(tls, bp+8, ts+1560, bp+24)
+		sessionAppendStr(tls, bp+8, ts+1579, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+33311, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33879, 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+33319, bp+24)
+				sessionAppendStr(tls, bp+8, ts+33887, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21975
+				zSep = ts + 22041
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -138270,7 +139296,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+33325, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33893, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -138362,7 +139388,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+33345, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33913, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -138625,7 +139651,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, 219078)
+				rc = Xsqlite3CorruptError(tls, 219169)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -138648,7 +139674,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, 219098)
+						rc = Xsqlite3CorruptError(tls, 219189)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -138690,7 +139716,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, 219152)
+			rc = Xsqlite3CorruptError(tls, 219243)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -138751,7 +139777,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, 219240)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219331)
 		}
 	}
 
@@ -138825,13 +139851,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, 219326))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219417))
 	}
 
 	(*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, 219332))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219423))
 	}
 
 	if paRec != 0 {
@@ -138893,7 +139919,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, 219376))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219467))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -139266,7 +140292,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219832)
 	goto finished_invert
 __6:
 	;
@@ -139434,45 +140460,45 @@ 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+11751) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11770) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
 			} else {
-				var zSep uintptr = ts + 1547
+				var zSep uintptr = ts + 1566
 
 				libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(SessionBuffer{})), libc.X__builtin_object_size(tls, bp, 0))
 				(*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+33363, bp+16)
+				sessionAppendStr(tls, bp, ts+33931, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+33376, bp+16)
+				sessionAppendStr(tls, bp, ts+33944, 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+33382, bp+16)
+						sessionAppendStr(tls, bp, ts+33950, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 15017
+						zSep = ts + 15036
 					}
 				}
 
-				zSep = ts + 1547
-				sessionAppendStr(tls, bp, ts+33311, bp+16)
+				zSep = ts + 1566
+				sessionAppendStr(tls, bp, ts+33879, 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+33387, bp+16)
+								ts+33955, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+33319, bp+16)
+							sessionAppendStr(tls, bp, ts+33887, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21975
+						zSep = ts + 22041
 					}
 				}
 
@@ -139519,42 +140545,42 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	defer tls.Free(20)
 
 	var i int32
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+33462, bp+16)
+	sessionAppendStr(tls, bp, ts+34030, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+33311, bp+16)
+	sessionAppendStr(tls, bp, ts+33879, 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+33382, bp+16)
+			sessionAppendStr(tls, bp, ts+33950, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21975
+			zSep = ts + 22041
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+33480, bp+16)
+		sessionAppendStr(tls, bp, ts+34048, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+33023, bp+16)
+		sessionAppendStr(tls, bp, ts+33591, bp+16)
 
-		zSep = ts + 1547
+		zSep = ts + 1566
 		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+33319, bp+16)
+				sessionAppendStr(tls, bp, ts+33887, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 33488
+				zSep = ts + 34056
 			}
 		}
-		sessionAppendStr(tls, bp, ts+5360, bp+16)
+		sessionAppendStr(tls, bp, ts+5379, bp+16)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
@@ -139567,7 +140593,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+6844, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6863, 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 {
@@ -139578,21 +140604,21 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+33493, bp+16)
+	sessionAppendStr(tls, bp, ts+34061, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21981, bp+16)
+	sessionAppendStr(tls, bp, ts+22047, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+15017, bp+16)
+			sessionAppendStr(tls, bp, ts+15036, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+33511, bp+16)
+	sessionAppendStr(tls, bp, ts+34079, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33522, bp+16)
+		sessionAppendStr(tls, bp, ts+34090, bp+16)
 	}
-	sessionAppendStr(tls, bp, ts+5360, bp+16)
+	sessionAppendStr(tls, bp, ts+5379, bp+16)
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v2(tls, db, (*SessionBuffer)(unsafe.Pointer(bp)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp)).FnBuf, p+16, uintptr(0))
@@ -139606,14 +140632,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+11751, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11770, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+33526)
+			ts+34094)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33639)
+			ts+34207)
 	}
 	return rc
 }
@@ -139641,7 +140667,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, 220219)
+				rc = Xsqlite3CorruptError(tls, 220310)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -139894,7 +140920,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+33783, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34351, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -139910,7 +140936,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+33804, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+34372, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -139983,10 +141009,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+33823, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+34391, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33849, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+34417, 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))
@@ -140019,7 +141045,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				f func(*libc.TLS, uintptr, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xFilter})).f(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 176))))
 			if schemaMismatch != 0 {
-				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
+				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
 				if *(*uintptr)(unsafe.Pointer(bp + 200)) == uintptr(0) {
 					rc = SQLITE_NOMEM
 					break
@@ -140032,7 +141058,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+6844, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6863, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -140045,19 +141071,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+33879, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+34447, 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+33923,
+						ts+34491,
 						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+33994, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+34562, 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+11751) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11770) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -140108,14 +141134,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+34054, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34622, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+34084, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34652, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+34108, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+34084, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34676, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34652, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -141363,7 +142389,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+34136, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+34704, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -141651,7 +142677,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+34164, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+34732, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -141838,7 +142864,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+34195, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34763, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -141906,7 +142932,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 34202
+		var zErr uintptr = ts + 34770
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -142065,7 +143091,7 @@ func fts5ValueToText(tls *libc.TLS, pVal uintptr) uintptr {
 	if zRet != 0 {
 		return zRet
 	}
-	return ts + 1547
+	return ts + 1566
 }
 
 func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, nVal int32, apVal uintptr) {
@@ -142088,7 +143114,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 34252
+		var zErr uintptr = ts + 34820
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -142412,13 +143438,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 34300, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34868, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 34308, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34876, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 34318, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34886, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -142829,7 +143855,7 @@ func fts5ConfigSkipLiteral(tls *libc.TLS, pIn uintptr) uintptr {
 	case 'n':
 		fallthrough
 	case 'N':
-		if Xsqlite3_strnicmp(tls, ts+6584, p, 4) == 0 {
+		if Xsqlite3_strnicmp(tls, ts+6603, p, 4) == 0 {
 			p = p + 4
 		} else {
 			p = uintptr(0)
@@ -142969,7 +143995,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+34323, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34891, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -142996,14 +144022,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+34330, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34898, 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+34361, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+34929, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -143014,7 +144040,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34394, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34962, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -143027,7 +144053,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34431, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34999, 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)))
@@ -143036,7 +144062,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+34440, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35008, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -143055,7 +144081,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34473, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35041, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -143070,14 +144096,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34507, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35075, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34515, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35083, 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+34547, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+35115, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -143085,9 +144111,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34553, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35121, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34567, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35135, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -143095,9 +144121,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34605, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35173, 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+34616, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35184, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -143105,21 +144131,21 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+5478, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+5497, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 8429, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17767},
-			{FzName: ts + 34651, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8448, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17786},
+			{FzName: ts + 35219, 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+34659, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35227, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34690, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35258, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -143166,15 +144192,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+22641) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16673) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34718, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22707) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16692) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35286, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34748) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+35316) {
 			*(*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+34758, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35326, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -143191,13 +144217,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+34789, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35357, 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+34794, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35362, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34801, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35369, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -143235,8 +144261,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+22641) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34809, 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+22707) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35377, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -143268,7 +144294,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+34838, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35406, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -143277,13 +144303,13 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 							if *(*uintptr)(unsafe.Pointer(bp + 48)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 48))
 							}
-							return ts + 1547
+							return ts + 1566
 						}(),
 						func() uintptr {
 							if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 64))
 							}
-							return ts + 1547
+							return ts + 1566
 						}(),
 						pzErr)
 				} else {
@@ -143305,19 +144331,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 + 34507
+			zTail = ts + 35075
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34858
+			zTail = ts + 35426
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34866, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+35434, 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+16673, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16692, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -143361,18 +144387,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+34877, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35445, 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 + 1566
 			}
-			return ts + 15017
+			return ts + 15036
 		}()
-		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+35461, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34900,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22641))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35468,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22707))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -143482,7 +144508,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34926) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35494) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -143492,7 +144518,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+34931) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35499) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -143502,7 +144528,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+34940) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35508) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -143515,7 +144541,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+34950) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35518) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -143525,7 +144551,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+34960) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35528) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -143541,7 +144567,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+22641) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22707) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -143564,7 +144590,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34972
+	var zSelect uintptr = ts + 35540
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -143586,7 +144612,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+35004) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35572) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -143600,7 +144626,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+35012,
+				ts+35580,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -143698,7 +144724,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+35077, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+35645, 0)
 					return FTS5_EOF
 				}
 			}
@@ -143711,20 +144737,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+35097, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+35665, 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+35128, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35696, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35131, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35699, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30513, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30579, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -145502,9 +146528,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+35135, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35703, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+34164, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+34732, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -145520,7 +146546,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+35140, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+35708, 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')
@@ -145607,7 +146633,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20978, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+21044, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -145688,7 +146714,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+35169, 0)
+			ts+35737, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -145858,12 +146884,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+35222,
+								ts+35790,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 35272
+										return ts + 35840
 									}
-									return ts + 35135
+									return ts + 35703
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -146806,7 +147832,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+35279, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35847, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -146885,7 +147911,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+35285,
+			ts+35853,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -146910,7 +147936,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+35336,
+			ts+35904,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -146933,7 +147959,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+35385,
+			ts+35953,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -147172,7 +148198,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+35425, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+35993, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -148371,7 +149397,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+35448,
+			ts+36016,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -149564,7 +150590,7 @@ func fts5WriteFlushBtree(tls *libc.TLS, p uintptr, pWriter uintptr) {
 			if (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn > 0 {
 				return (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fp
 			}
-			return ts + 1547
+			return ts + 1566
 		}()
 
 		Xsqlite3_bind_blob(tls, (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter, 2, z, (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn, uintptr(0))
@@ -149837,7 +150863,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+35532,
+			ts+36100,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -150903,7 +151929,7 @@ func sqlite3Fts5IndexReinit(tls *libc.TLS, p uintptr) int32 {
 	fts5StructureInvalidate(tls, p)
 	fts5IndexDiscardData(tls, p)
 	libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(Fts5Structure{})), libc.X__builtin_object_size(tls, bp, 0))
-	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1547, 0)
+	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1566, 0)
 	fts5StructureWrite(tls, p, bp)
 	return fts5IndexReturn(tls, p)
 }
@@ -150919,13 +151945,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+35589, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+36157, 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+25506, ts+35597, 0, pzErr)
+				pConfig, ts+25572, ts+36165, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11891,
-					ts+35632,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11910,
+					ts+36200,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -151178,7 +152204,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+35279, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+35847, 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)))
@@ -151292,7 +152318,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35676,
+		ts+36244,
 		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))) {
@@ -151462,7 +152488,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+35762)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+36330)
 			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))
@@ -151733,7 +152759,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+35767, 0)
+			ts+36335, 0)
 		return SQLITE_ERROR
 	}
 
@@ -151764,7 +152790,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 				} else if iCol >= 0 {
 					bSeenMatch = 1
 					*(*int8)(unsafe.Pointer(idxStr + uintptr(libc.PostIncInt32(&iIdxStr, 1)))) = int8('M')
-					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+5378, libc.VaList(bp, iCol))
+					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+5397, libc.VaList(bp, iCol))
 					idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 
 				}
@@ -151779,7 +152805,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 					}
 					return int8('G')
 				}()
-				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+5378, libc.VaList(bp+8, iCol))
+				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+5397, libc.VaList(bp+8, iCol))
 				idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 				(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pInfo)).FaConstraintUsage + uintptr(i)*8)).FargvIndex = libc.PreIncInt32(&iCons, 1)
 
@@ -152093,7 +153119,7 @@ func fts5NextMethod(tls *libc.TLS, pCursor uintptr) int32 {
 					rc = Xsqlite3_reset(tls, (*Fts5Cursor)(unsafe.Pointer(pCsr)).FpStmt)
 					if rc != SQLITE_OK {
 						(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-							ts+3658, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+							ts+3677, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 					}
 				} else {
 					rc = SQLITE_OK
@@ -152125,7 +153151,7 @@ func fts5PrepareStatement(tls *libc.TLS, ppStmt uintptr, pConfig uintptr, zFmt u
 		rc = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
 			uint32(SQLITE_PREPARE_PERSISTENT), bp+8, uintptr(0))
 		if rc != SQLITE_OK {
-			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 		}
 		Xsqlite3_free(tls, zSql)
 	}
@@ -152157,25 +153183,25 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35806,
+		ts+36374,
 		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 + 15017
+					return ts + 15036
 				}
-				return ts + 1547
+				return ts + 1566
 			}(),
 			func() uintptr {
 				if zRankArgs != 0 {
 					return zRankArgs
 				}
-				return ts + 1547
+				return ts + 1566
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35861
+					return ts + 36429
 				}
-				return ts + 35866
+				return ts + 36434
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -152221,12 +153247,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+35870, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+36438, 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) {
+	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5479, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35876, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36444, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -152257,7 +153283,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+35904, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36472, 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,
@@ -152288,7 +153314,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+35914, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36482, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -152320,14 +153346,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+35935, libc.VaList(bp, z))
+				ts+36503, 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 + 34318
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34886
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -152383,7 +153409,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+35767, 0)
+		ts+36335, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -152426,7 +153452,7 @@ __8:
 	if !(zText == uintptr(0)) {
 		goto __14
 	}
-	zText = ts + 1547
+	zText = ts + 1566
 __14:
 	;
 	iCol = 0
@@ -152600,7 +153626,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35968, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+36536, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -152721,7 +153747,7 @@ func fts5SeekCursor(tls *libc.TLS, pCsr uintptr, bErrormsg int32) int32 {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			} else if (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg != 0 {
 				*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-					ts+3658, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
+					ts+3677, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
 			}
 		}
 	}
@@ -152745,28 +153771,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+36004, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36572, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+36015, 0)
+				ts+36583, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+36095, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36663, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+36103, 0)
+				ts+36671, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+17356, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+17375, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+36159, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36727, 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+36165, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36733, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -152824,7 +153850,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+17901, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17920, 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)))
@@ -152837,12 +153863,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+36181,
+				ts+36749,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20879
+						return ts + 20945
 					}
-					return ts + 36218
+					return ts + 36786
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -153472,7 +154498,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+36230, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36798, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -153716,7 +154742,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+36251, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36819, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -153735,7 +154761,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+36273, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36841, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -153782,7 +154808,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+36304)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36872)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -153791,7 +154817,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+36317, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+36885, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -153805,7 +154831,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 36408, ts + 34507, ts + 25506, ts + 34858, ts + 11891,
+	ts + 36976, ts + 35075, ts + 25572, ts + 35426, ts + 11910,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -153829,7 +154855,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+36415, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+36983, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -153847,13 +154873,13 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+36415, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36983, 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+36420, 0,
+				db, ts+36988, 0,
 				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
 				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
@@ -153910,17 +154936,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 + 36435,
-			ts + 36503,
-			ts + 36572,
-			ts + 36605,
-			ts + 36644,
-			ts + 36684,
-			ts + 36723,
-			ts + 36764,
-			ts + 36803,
-			ts + 36845,
-			ts + 36885,
+			ts + 37003,
+			ts + 37071,
+			ts + 37140,
+			ts + 37173,
+			ts + 37212,
+			ts + 37252,
+			ts + 37291,
+			ts + 37332,
+			ts + 37371,
+			ts + 37413,
+			ts + 37453,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -153987,7 +155013,7 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 			(*Fts5Config)(unsafe.Pointer((*Fts5Storage)(unsafe.Pointer(p)).FpConfig)).FbLock--
 			Xsqlite3_free(tls, zSql)
 			if rc != SQLITE_OK && pzErrMsg != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
 			}
 		}
 	}
@@ -154022,18 +155048,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+36908,
+		ts+37476,
 		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+37012,
+			ts+37580,
 			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+37050,
+			ts+37618,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -154045,7 +155071,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+37088,
+			ts+37656,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -154057,14 +155083,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+25506, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11891, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+36408, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25572, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11910, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+36976, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34858, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+35426, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34507, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+35075, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -154076,17 +155102,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+37130,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37698,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 30159
+					return ts + 30225
 				}
-				return ts + 1547
+				return ts + 1566
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+37160,
+			ts+37728,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -154123,27 +155149,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37204, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37772, 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+37227, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37795, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34507, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+35075, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34858, ts+37233, 0, pzErr)
+				pConfig, ts+35426, ts+37801, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+36408, ts+37265, 1, pzErr)
+				pConfig, ts+36976, ts+37833, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35004, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35572, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -154349,12 +155375,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+37282,
+		ts+37850,
 		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+37332,
+			ts+37900,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -154362,7 +155388,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+35004, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35572, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -154538,7 +155564,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+37361,
+	zSql = Xsqlite3_mprintf(tls, ts+37929,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -154720,14 +155746,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+34507, bp+48)
+			rc = fts5StorageCount(tls, p, ts+35075, 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+34858, bp+56)
+			rc = fts5StorageCount(tls, p, ts+35426, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -154922,9 +155948,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+37393) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37961) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37404) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37972) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -155139,7 +156165,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 + 37415
+			var zCat uintptr = ts + 37983
 			var i int32
 			libc.X__builtin___memset_chk(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})), libc.X__builtin_object_size(tls, p, 0))
 
@@ -155151,7 +156177,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+37424) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37992) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -155162,18 +156188,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+37435) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38003) {
 					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+37393) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37961) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37404) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37972) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37424) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37992) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -155449,7 +156475,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 + 37453
+	var zBase uintptr = ts + 38021
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -155591,7 +156617,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+37463, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38031, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -155599,11 +156625,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37466, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38034, 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+37471, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38039, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -155611,7 +156637,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37476, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38044, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -155619,7 +156645,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37479, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38047, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -155627,11 +156653,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37482, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38050, 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+37487, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38055, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -155639,19 +156665,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37492, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38060, 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+37496, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38064, 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+37502, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38070, 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+37507, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38075, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -155659,11 +156685,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37511, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38079, 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+37515, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38083, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -155671,7 +156697,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37518, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38086, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -155679,11 +156705,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37522, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38090, 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+37526, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38094, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -155691,7 +156717,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37530, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38098, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -155699,7 +156725,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37534, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38102, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -155707,7 +156733,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37538, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38106, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -155723,24 +156749,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+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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38110, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-2), ts+38090, 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+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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38113, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-2), ts+38116, 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+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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38120, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-2), ts+38106, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-2), 0))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -155755,137 +156781,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+37555, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38123, 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+37522, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+38090, 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+37563, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+38131, 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+37570, uint64(4), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-6), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-6), ts+38138, 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+37575, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38143, 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+37471, uint64(4), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+38039, 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+37580, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38148, 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+37466, uint64(4), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+38034, 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+37585, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38153, 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+37538, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+38106, 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+37590, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38158, 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+15883, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+15902, 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+37595, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38163, 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+37548, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-3), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-3), ts+38116, 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+37599, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38167, 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+37463, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+38031, 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+37604, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38172, 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+37507, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+38075, 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+37610, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38178, 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+37614, uint64(1), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-3), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-3), ts+38182, 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+37616, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38184, 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+37530, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+38098, 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+37622, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38190, 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+37538, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+38106, 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+37630, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38198, 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+37522, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+38090, 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+37636, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38204, 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+37522, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+38090, 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+37641, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38209, 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+37463, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+38031, 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+37647, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38215, 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+37534, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+38102, 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+37655, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38223, 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+37663, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+38231, 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+37667, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38235, 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+37530, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+38098, 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+37675, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38243, 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+37463, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+38031, 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+37681, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38249, 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+37534, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+38102, 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+37687, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+38255, 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+37548, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-6), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-6), ts+38116, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-6), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -155900,16 +156926,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+37694, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38262, 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+37479, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+38047, 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+37699, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38267, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -155917,21 +156943,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37704, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38272, 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+37479, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+38047, 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+37710, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38278, 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+37479, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+38047, 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+37663, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38231, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -155939,7 +156965,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37716, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38284, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -155947,9 +156973,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37722, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38290, 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+37463, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+38031, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -155964,12 +156990,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+37728, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38296, 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+37732, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-3), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-3), ts+38300, 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+37735, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38303, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -155978,7 +157004,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37738, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38306, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -156134,7 +157160,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+37742) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38310) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -156314,22 +157340,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 37453, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 38021, 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 + 37757, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 38325, 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 + 37763, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 38331, 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 + 37770, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 38338, 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
@@ -157472,14 +158498,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+37778) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+38346) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37782) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+38350) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37786) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+38354) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37795, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38363, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -157505,19 +158531,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 + 37829,
-		ts + 37869,
-		ts + 37904,
+		ts + 38397,
+		ts + 38437,
+		ts + 38472,
 	}
 
 	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+23802, *(*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+23868, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37947, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38515, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -157650,11 +158676,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+37980, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+38548, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+38011,
+		ts+38579,
 		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))
@@ -157678,7 +158704,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+38062, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38630, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -157962,7 +158988,7 @@ func fts5VocabFilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, zUnused
 		if pLe != 0 {
 			var zCopy uintptr = Xsqlite3_value_text(tls, pLe)
 			if zCopy == uintptr(0) {
-				zCopy = ts + 1547
+				zCopy = ts + 1566
 			}
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm = Xsqlite3_value_bytes(tls, pLe)
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FzLeTerm = Xsqlite3_malloc(tls, (*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm+1)
@@ -158073,7 +159099,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+38088, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+38656, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -158095,7 +159121,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 + 38098
+	return ts + 38666
 }
 
 func init() {
@@ -158633,6 +159659,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, I64, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&afpIoMethods)) + 144)) = unixUnfetch
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&attach_func)) + 24)) = attachFunc
 	*(*func(*libc.TLS, uintptr, uintptr) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&autolockIoFinder)) + 0)) = autolockIoFinderImpl
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 8)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 16)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 24)) = statBestIndex
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 32)) = statDisconnect
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 40)) = statDisconnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 48)) = statOpen
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 56)) = statClose
+	*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 64)) = statFilter
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 72)) = statNext
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 80)) = statEof
+	*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 88)) = statColumn
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 96)) = statRowid
 	*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 0)) = sqlite3MemMalloc
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 8)) = sqlite3MemFree
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 16)) = sqlite3MemRealloc
@@ -159219,8 +160257,9 @@ func init() {
 	*(*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
-	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = Xsqlite3JsonTableFunctions
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = Xsqlite3DbstatRegister
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = sqlite3TestExtInit
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 32)) = Xsqlite3JsonTableFunctions
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statGetFuncdef)) + 24)) = statGet
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statInitFuncdef)) + 24)) = statInit
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statPushFuncdef)) + 24)) = statPush
@@ -159238,5 +160277,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-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 ts1 = "3.41.2\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_DBSTAT_VTAB\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\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\x00true\x00false\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 \x00rowid not at end-of-record for row \x00 of 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\x00CREATE TABLE x( name       TEXT, path       TEXT, pageno     INTEGER, pagetype   TEXT, ncell      INTEGER, payload    INTEGER, unused     INTEGER, mx_payload INTEGER, pgoffset   INTEGER, pgsize     INTEGER, schema     TEXT HIDDEN, aggregate  BOOLEAN HIDDEN)\x00overflow\x00%s%.3x+%.6x\x00%s%.3x/\x00internal\x00leaf\x00corrupted\x00SELECT * FROM (SELECT 'sqlite_schema' AS name,1 AS rootpage,'table' AS type UNION ALL SELECT name,rootpage,type FROM \"%w\".sqlite_schema WHERE rootpage!=0)\x00WHERE name=%Q\x00 ORDER BY name\x00dbstat\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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 985e1aa2..aab6e1b8 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -117,7 +117,9 @@ const (
 	ATTR_VOL_DIRCOUNT                              = 0x00000400
 	ATTR_VOL_ENCODINGSUSED                         = 0x00010000
 	ATTR_VOL_FILECOUNT                             = 0x00000200
+	ATTR_VOL_FSSUBTYPE                             = 0x00200000
 	ATTR_VOL_FSTYPE                                = 0x00000001
+	ATTR_VOL_FSTYPENAME                            = 0x00100000
 	ATTR_VOL_INFO                                  = 0x80000000
 	ATTR_VOL_IOBLOCKSIZE                           = 0x00000080
 	ATTR_VOL_MAXOBJCOUNT                           = 0x00000800
@@ -136,7 +138,7 @@ const (
 	ATTR_VOL_SPACEFREE                             = 0x00000008
 	ATTR_VOL_SPACEUSED                             = 0x00800000
 	ATTR_VOL_UUID                                  = 0x00040000
-	ATTR_VOL_VALIDMASK                             = 0xF087FFFF
+	ATTR_VOL_VALIDMASK                             = 0xF0B7FFFF
 	AT_EACCESS                                     = 0x0010
 	AT_FDCWD                                       = -2
 	AT_FDONLY                                      = 0x0400
@@ -390,6 +392,7 @@ const (
 	DBFLAG_SchemaKnownOk                           = 0x0010
 	DBFLAG_Vacuum                                  = 0x0004
 	DBFLAG_VacuumInto                              = 0x0008
+	DBSTAT_PAGE_PADDING_BYTES                      = 256
 	DB_ResetWanted                                 = 0x0008
 	DB_SchemaLoaded                                = 0x0001
 	DB_UnresetViews                                = 0x0002
@@ -1098,6 +1101,7 @@ const (
 	MAP_RESILIENT_CODESIGN                         = 0x2000
 	MAP_RESILIENT_MEDIA                            = 0x4000
 	MAP_SHARED                                     = 0x0001
+	MAP_TPRO                                       = 0x80000
 	MAP_TRANSLATED_ALLOW_EXECUTE                   = 0x20000
 	MAP_UNIX03                                     = 0x40000
 	MATH_ERREXCEPT                                 = 2
@@ -1277,11 +1281,11 @@ const (
 	NC_OrderAgg                                    = 0x8000000
 	NC_PartIdx                                     = 0x000002
 	NC_SelfRef                                     = 0x00002e
+	NC_Subquery                                    = 0x000040
 	NC_UAggInfo                                    = 0x000100
 	NC_UBaseReg                                    = 0x000400
 	NC_UEList                                      = 0x000080
 	NC_UUpsert                                     = 0x000200
-	NC_VarSelect                                   = 0x000040
 	NDEBUG                                         = 1
 	NFSV2_MAX_FH_SIZE                              = 32
 	NFSV3_MAX_FH_SIZE                              = 64
@@ -2220,6 +2224,7 @@ const (
 	SQLITE_ECEL_REF                                = 0x04
 	SQLITE_EMPTY                                   = 16
 	SQLITE_ENABLE_COLUMN_METADATA                  = 1
+	SQLITE_ENABLE_DBSTAT_VTAB                      = 1
 	SQLITE_ENABLE_FTS5                             = 1
 	SQLITE_ENABLE_GEOPOLY                          = 1
 	SQLITE_ENABLE_LOCKING_STYLE                    = 1
@@ -2620,7 +2625,7 @@ const (
 	SQLITE_SHM_UNLOCK                              = 1
 	SQLITE_SORTER_PMASZ                            = 250
 	SQLITE_SOUNDEX                                 = 1
-	SQLITE_SOURCE_ID                               = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
+	SQLITE_SOURCE_ID                               = "2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da"
 	SQLITE_SO_ASC                                  = 0
 	SQLITE_SO_DESC                                 = 1
 	SQLITE_SO_UNDEFINED                            = -1
@@ -2728,8 +2733,8 @@ const (
 	SQLITE_UTF8                                    = 1
 	SQLITE_VDBEINT_H                               = 0
 	SQLITE_VDBE_H                                  = 0
-	SQLITE_VERSION                                 = "3.41.0"
-	SQLITE_VERSION_NUMBER                          = 3041000
+	SQLITE_VERSION                                 = "3.41.2"
+	SQLITE_VERSION_NUMBER                          = 3041002
 	SQLITE_VTABRISK_High                           = 2
 	SQLITE_VTABRISK_Low                            = 0
 	SQLITE_VTABRISK_Normal                         = 1
@@ -3583,7 +3588,7 @@ const (
 	X_POSIX_SEMAPHORES                             = -1
 	X_POSIX_SHARED_MEMORY_OBJECTS                  = -1
 	X_POSIX_SHELL                                  = 200112
-	X_POSIX_SPAWN                                  = -1
+	X_POSIX_SPAWN                                  = 200112
 	X_POSIX_SPIN_LOCKS                             = -1
 	X_POSIX_SPORADIC_SERVER                        = -1
 	X_POSIX_SYNCHRONIZED_IO                        = -1
@@ -3923,15 +3928,16 @@ const (
 )
 
 const (
-	KGUARD_EXC_DESTROY         = 1
-	KGUARD_EXC_MOD_REFS        = 2
-	KGUARD_EXC_INVALID_OPTIONS = 3
-	KGUARD_EXC_SET_CONTEXT     = 4
-	KGUARD_EXC_UNGUARDED       = 8
-	KGUARD_EXC_INCORRECT_GUARD = 16
-	KGUARD_EXC_IMMOVABLE       = 32
-	KGUARD_EXC_STRICT_REPLY    = 64
-	KGUARD_EXC_MSG_FILTERED    = 128
+	KGUARD_EXC_DESTROY          = 1
+	KGUARD_EXC_MOD_REFS         = 2
+	KGUARD_EXC_INVALID_OPTIONS  = 3
+	KGUARD_EXC_SET_CONTEXT      = 4
+	KGUARD_EXC_THREAD_SET_STATE = 5
+	KGUARD_EXC_UNGUARDED        = 8
+	KGUARD_EXC_INCORRECT_GUARD  = 16
+	KGUARD_EXC_IMMOVABLE        = 32
+	KGUARD_EXC_STRICT_REPLY     = 64
+	KGUARD_EXC_MSG_FILTERED     = 128
 
 	KGUARD_EXC_INVALID_RIGHT        = 256
 	KGUARD_EXC_INVALID_NAME         = 512
@@ -3968,6 +3974,10 @@ const (
 	GRAFTDMG_CRYPTEX_PREBOOT   = 2
 	GRAFTDMG_CRYPTEX_DOWNLEVEL = 3
 )
+const (
+	CRYPTEX1_AUTH_ENV_GENERIC              = 4
+	CRYPTEX1_AUTH_ENV_GENERIC_SUPPLEMENTAL = 5
+)
 
 const (
 	P_ALL  = 0
@@ -7273,7 +7283,8 @@ type IndexedExpr1 = struct {
 	FiIdxCur       int32
 	FiIdxCol       int32
 	FbMaybeNullRow U8
-	F__ccgo_pad1   [3]byte
+	Faff           U8
+	F__ccgo_pad1   [2]byte
 	FpIENext       uintptr
 }
 
@@ -7915,17 +7926,18 @@ type Pager = Pager1
 
 // Handle type for pages.
 type PgHdr2 = struct {
-	FpPage      uintptr
-	FpData      uintptr
-	FpExtra     uintptr
-	FpCache     uintptr
-	FpDirty     uintptr
-	FpPager     uintptr
-	Fpgno       Pgno
-	Fflags      U16
-	FnRef       I16
-	FpDirtyNext uintptr
-	FpDirtyPrev uintptr
+	FpPage       uintptr
+	FpData       uintptr
+	FpExtra      uintptr
+	FpCache      uintptr
+	FpDirty      uintptr
+	FpPager      uintptr
+	Fpgno        Pgno
+	Fflags       U16
+	F__ccgo_pad1 [2]byte
+	FnRef        I64
+	FpDirtyNext  uintptr
+	FpDirtyPrev  uintptr
 }
 
 // Handle type for pages.
@@ -8146,14 +8158,14 @@ type PCache2 = struct {
 	FpDirty      uintptr
 	FpDirtyTail  uintptr
 	FpSynced     uintptr
-	FnRefSum     int32
+	FnRefSum     I64
 	FszCache     int32
 	FszSpill     int32
 	FszPage      int32
 	FszExtra     int32
 	FbPurgeable  U8
 	FeCreate     U8
-	F__ccgo_pad1 [2]byte
+	F__ccgo_pad1 [6]byte
 	FxStress     uintptr
 	FpStress     uintptr
 	FpCache      uintptr
@@ -8412,7 +8424,7 @@ type CoveringIndexCheck1 = struct {
 	F__ccgo_pad1 [2]byte
 }
 
-var sqlite3azCompileOpt = [52]uintptr{
+var sqlite3azCompileOpt = [53]uintptr{
 	ts + 7,
 	ts + 27,
 	ts + 49,
@@ -8431,40 +8443,41 @@ var sqlite3azCompileOpt = [52]uintptr{
 	ts + 365,
 	ts + 390,
 	ts + 413,
-	ts + 425,
-	ts + 440,
-	ts + 462,
-	ts + 487,
-	ts + 510,
-	ts + 532,
-	ts + 543,
-	ts + 556,
-	ts + 571,
-	ts + 587,
-	ts + 600,
-	ts + 621,
-	ts + 645,
-	ts + 668,
-	ts + 684,
-	ts + 700,
-	ts + 724,
-	ts + 751,
-	ts + 771,
-	ts + 792,
-	ts + 814,
-	ts + 844,
-	ts + 869,
-	ts + 895,
-	ts + 915,
-	ts + 941,
-	ts + 964,
-	ts + 990,
-	ts + 1012,
-	ts + 1033,
-	ts + 1044,
+	ts + 432,
+	ts + 444,
+	ts + 459,
+	ts + 481,
+	ts + 506,
+	ts + 529,
+	ts + 551,
+	ts + 562,
+	ts + 575,
+	ts + 590,
+	ts + 606,
+	ts + 619,
+	ts + 640,
+	ts + 664,
+	ts + 687,
+	ts + 703,
+	ts + 719,
+	ts + 743,
+	ts + 770,
+	ts + 790,
+	ts + 811,
+	ts + 833,
+	ts + 863,
+	ts + 888,
+	ts + 914,
+	ts + 934,
+	ts + 960,
+	ts + 983,
+	ts + 1009,
+	ts + 1031,
 	ts + 1052,
-	ts + 1066,
-	ts + 1079,
+	ts + 1063,
+	ts + 1071,
+	ts + 1085,
+	ts + 1098,
 }
 
 func Xsqlite3CompileOptions(tls *libc.TLS, pnOpt uintptr) uintptr {
@@ -8616,7 +8629,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 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))
+var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1111))
 
 // Standard typenames.  These names must match the COLTYPE_* definitions.
 // Adjust the SQLITE_N_STDTYPE value if adding or removing entries.
@@ -8638,12 +8651,12 @@ var Xsqlite3StdTypeAffinity = [6]int8{
 	int8(SQLITE_AFF_TEXT),
 }
 var Xsqlite3StdType = [6]uintptr{
-	ts + 1099,
-	ts + 1103,
-	ts + 1108,
-	ts + 1112,
-	ts + 1120,
-	ts + 1125,
+	ts + 1118,
+	ts + 1122,
+	ts + 1127,
+	ts + 1131,
+	ts + 1139,
+	ts + 1144,
 }
 
 // SQL is translated into a sequence of instructions to be
@@ -8960,7 +8973,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, 23229)
+		return Xsqlite3MisuseError(tls, 23233)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -9500,7 +9513,7 @@ __6:
 __4:
 	;
 	zDate++
-	if !(getDigits(tls, zDate, ts+1130, libc.VaList(bp, bp+16, bp+20)) != 2) {
+	if !(getDigits(tls, zDate, ts+1149, libc.VaList(bp, bp+16, bp+20)) != 2) {
 		goto __9
 	}
 	return 1
@@ -9526,13 +9539,13 @@ func parseHhMmSs(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	defer tls.Free(36)
 
 	var ms float64 = 0.0
-	if getDigits(tls, zDate, ts+1138, libc.VaList(bp, bp+24, bp+28)) != 2 {
+	if getDigits(tls, zDate, ts+1157, libc.VaList(bp, bp+24, bp+28)) != 2 {
 		return 1
 	}
 	zDate += uintptr(5)
 	if int32(*(*int8)(unsafe.Pointer(zDate))) == ':' {
 		zDate++
-		if getDigits(tls, zDate, ts+1146, libc.VaList(bp+16, bp+32)) != 1 {
+		if getDigits(tls, zDate, ts+1165, libc.VaList(bp+16, bp+32)) != 1 {
 			return 1
 		}
 		zDate += uintptr(2)
@@ -9630,7 +9643,7 @@ func parseYyyyMmDd(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	} else {
 		neg = 0
 	}
-	if getDigits(tls, zDate, ts+1150, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
+	if getDigits(tls, zDate, ts+1169, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
 		return 1
 	}
 	zDate += uintptr(10)
@@ -9687,7 +9700,7 @@ func parseDateOrTime(tls *libc.TLS, context uintptr, zDate uintptr, p uintptr) i
 		return 0
 	} else if parseHhMmSs(tls, zDate, p) == 0 {
 		return 0
-	} else if Xsqlite3StrICmp(tls, zDate, ts+1162) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
+	} else if Xsqlite3StrICmp(tls, zDate, ts+1181) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
 		return setDateTimeToCurrent(tls, context, p)
 	} else if Xsqlite3AtoF(tls, zDate, bp, Xsqlite3Strlen30(tls, zDate), uint8(SQLITE_UTF8)) > 0 {
 		setRawDateNumber(tls, p, *(*float64)(unsafe.Pointer(bp)))
@@ -9820,7 +9833,7 @@ func toLocaltime(tls *libc.TLS, p uintptr, pCtx uintptr) int32 {
 		*(*Time_t)(unsafe.Pointer(bp + 104)) = (*DateTime)(unsafe.Pointer(p)).FiJD/int64(1000) - int64(21086676)*int64(10000)
 	}
 	if osLocaltime(tls, bp+104, bp) != 0 {
-		Xsqlite3_result_error(tls, pCtx, ts+1166, -1)
+		Xsqlite3_result_error(tls, pCtx, ts+1185, -1)
 		return SQLITE_ERROR
 	}
 	(*DateTime)(unsafe.Pointer(p)).FY = (*tm)(unsafe.Pointer(bp)).Ftm_year + 1900 - iYearDiff
@@ -9844,12 +9857,12 @@ var aXformType = [6]struct {
 	FrLimit float32
 	FrXform float32
 }{
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1189)), FrLimit: 4.6427e+14, FrXform: 1.0},
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1196)), FrLimit: 7.7379e+12, FrXform: 60.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1203)), FrLimit: 1.2897e+11, FrXform: 3600.0},
-	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1210)), FrLimit: 5373485.0, FrXform: 86400.0},
-	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1217)), FrLimit: 176546.0, FrXform: 2592000.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1224)), FrLimit: 14713.0, FrXform: 31536000.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1208)), FrLimit: 4.6427e+14, FrXform: 1.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1215)), FrLimit: 7.7379e+12, FrXform: 60.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1222)), FrLimit: 1.2897e+11, FrXform: 3600.0},
+	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1229)), FrLimit: 5373485.0, FrXform: 86400.0},
+	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1236)), FrLimit: 176546.0, FrXform: 2592000.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1243)), FrLimit: 14713.0, FrXform: 31536000.0},
 }
 
 func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, idx int32) int32 {
@@ -9861,7 +9874,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 	switch int32(Xsqlite3UpperToLower[U8(*(*int8)(unsafe.Pointer(z)))]) {
 	case 'a':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1231) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1250) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -9883,7 +9896,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'j':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1236) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1255) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -9897,7 +9910,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'l':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1246) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1265) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				rc = toLocaltime(tls, p, pCtx)
 			}
 			break
@@ -9905,7 +9918,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'u':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1256) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1275) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -9917,7 +9930,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 					rc = 0
 				}
-			} else if Xsqlite3_stricmp(tls, z, ts+1266) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1285) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				if int32((*DateTime)(unsafe.Pointer(p)).FtzSet) == 0 {
 					var iOrigJD I64
 					var iGuess I64
@@ -9951,7 +9964,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'w':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1270, 8) == 0 &&
+			if Xsqlite3_strnicmp(tls, z, ts+1289, 8) == 0 &&
 				Xsqlite3AtoF(tls, z+8, bp+48, Xsqlite3Strlen30(tls, z+8), uint8(SQLITE_UTF8)) > 0 &&
 				*(*float64)(unsafe.Pointer(bp + 48)) >= 0.0 && *(*float64)(unsafe.Pointer(bp + 48)) < 7.0 && float64(libc.AssignInt32(&n, int32(*(*float64)(unsafe.Pointer(bp + 48))))) == *(*float64)(unsafe.Pointer(bp + 48)) {
 				var Z Sqlite3_int64
@@ -9972,7 +9985,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 's':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1279, 9) != 0 {
+			if Xsqlite3_strnicmp(tls, z, ts+1298, 9) != 0 {
 				break
 			}
 			if !(int32((*DateTime)(unsafe.Pointer(p)).FvalidJD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidYMD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidHMS) != 0) {
@@ -9986,14 +9999,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 			(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidTZ = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidJD = int8(0)
-			if Xsqlite3_stricmp(tls, z, ts+1289) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1308) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1295) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1314) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FM = 1
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1300) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1319) == 0 {
 				rc = 0
 			}
 			break
@@ -10319,7 +10332,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		switch int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) {
 		case 'd':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
 				break
 
 			}
@@ -10329,13 +10342,13 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if s > 59.999 {
 					s = 59.999
 				}
-				Xsqlite3_str_appendf(tls, bp+136, ts+1309, libc.VaList(bp+8, s))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1328, libc.VaList(bp+8, s))
 				break
 
 			}
 		case 'H':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
 				break
 
 			}
@@ -10353,41 +10366,41 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) == 'W' {
 					var wd int32
 					wd = int32(((*DateTime)(unsafe.Pointer(bp+88)).FiJD + int64(43200000)) / int64(86400000) % int64(7))
-					Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+24, (nDay+7-wd)/7))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+24, (nDay+7-wd)/7))
 				} else {
-					Xsqlite3_str_appendf(tls, bp+136, ts+1316, libc.VaList(bp+32, nDay+1))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1335, libc.VaList(bp+32, nDay+1))
 				}
 				break
 
 			}
 		case 'J':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1321, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1340, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
 				break
 
 			}
 		case 'm':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
 				break
 
 			}
 		case 'M':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
 				break
 
 			}
 		case 's':
 			{
 				var iS I64 = (*DateTime)(unsafe.Pointer(bp+88)).FiJD/int64(1000) - int64(21086676)*int64(10000)
-				Xsqlite3_str_appendf(tls, bp+136, ts+1327, libc.VaList(bp+64, iS))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1346, libc.VaList(bp+64, iS))
 				break
 
 			}
 		case 'S':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
 				break
 
 			}
@@ -10400,7 +10413,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			}
 		case 'Y':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1332, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1351, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
 				break
 
 			}
@@ -10450,15 +10463,15 @@ func Xsqlite3RegisterDateTimeFunctions(tls *libc.TLS) {
 }
 
 var aDateTimeFuncs = [9]FuncDef{
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1236},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1256},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1337},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1342},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1347},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1255},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1275},
 	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1356},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1365},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1378},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1396}}
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1361},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1366},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1375},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1384},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1397},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1415}}
 
 // The following routines are convenience wrappers around methods
 // of the sqlite3_file object.  This is mostly just syntactic sugar. All
@@ -10873,7 +10886,7 @@ func sqlite3MemMalloc(tls *libc.TLS, nByte int32) uintptr {
 		*(*Sqlite3_int64)(unsafe.Pointer(p)) = Sqlite3_int64(nByte)
 		p += 8
 	} else {
-		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1409, libc.VaList(bp, nByte))
+		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1428, libc.VaList(bp, nByte))
 	}
 	return p
 }
@@ -10906,7 +10919,7 @@ func sqlite3MemRealloc(tls *libc.TLS, pPrior uintptr, nByte int32) uintptr {
 		p += 8
 	} else {
 		Xsqlite3_log(tls, SQLITE_NOMEM,
-			ts+1447,
+			ts+1466,
 			libc.VaList(bp, sqlite3MemSize(tls, pPrior), nByte))
 	}
 	return p
@@ -11782,7 +11795,7 @@ func Xsqlite3OomFault(tls *libc.TLS, db uintptr) uintptr {
 		(*Sqlite3)(unsafe.Pointer(db)).Flookaside.Fsz = U16(0)
 		if (*Sqlite3)(unsafe.Pointer(db)).FpParse != 0 {
 			var pParse uintptr
-			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1483, 0)
+			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1502, 0)
 			(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 			for pParse = (*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).FpOuterParse; pParse != 0; pParse = (*Parse)(unsafe.Pointer(pParse)).FpOuterParse {
 				(*Parse)(unsafe.Pointer(pParse)).FnErr++
@@ -11855,8 +11868,8 @@ type et_info = struct {
 // by an instance of the following structure
 type Et_info = et_info
 
-var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1497))
-var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1530))
+var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1516))
+var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1549))
 var fmtinfo = [23]Et_info{
 	{Ffmttype: int8('d'), Fbase: EtByte(10), Fflags: EtByte(1), Ftype: EtByte(EtDECIMAL)},
 	{Ffmttype: int8('s'), Fflags: EtByte(4), Ftype: EtByte(EtSTRING)},
@@ -12070,7 +12083,7 @@ __6:
 	if !(libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(libc.PreIncUintptr(&fmt, 1))))) == 0) {
 		goto __11
 	}
-	Xsqlite3_str_append(tls, pAccum, ts+1537, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1556, 1)
 	goto __5
 __11:
 	;
@@ -12631,7 +12644,7 @@ __125:
 	if !(Xsqlite3IsNaN(tls, *(*float64)(unsafe.Pointer(bp + 104))) != 0) {
 		goto __127
 	}
-	bufpt = ts + 1539
+	bufpt = ts + 1558
 	length = 3
 	goto __58
 __127:
@@ -12691,7 +12704,7 @@ __138:
 	}
 	bufpt = bp + 16
 	*(*int8)(unsafe.Pointer(bp + 16)) = prefix
-	libc.X__builtin___memcpy_chk(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1543, uint64(4), libc.X__builtin_object_size(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), 0))
+	libc.X__builtin___memcpy_chk(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1562, uint64(4), libc.X__builtin_object_size(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), 0))
 	length = 3 + libc.Bool32(int32(prefix) != 0)
 	goto __58
 __139:
@@ -13057,7 +13070,7 @@ __200:
 	if !(bufpt == uintptr(0)) {
 		goto __201
 	}
-	bufpt = ts + 1547
+	bufpt = ts + 1566
 	goto __202
 __201:
 	if !(int32(xtype) == EtDYNSTRING) {
@@ -13181,9 +13194,9 @@ __222:
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
-			return ts + 1548
+			return ts + 1567
 		}
-		return ts + 1553
+		return ts + 1572
 	}()
 __223:
 	;
@@ -13331,7 +13344,7 @@ __246:
 		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
-	Xsqlite3_str_append(tls, pAccum, ts+1560, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1579, 1)
 __250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
@@ -13348,10 +13361,10 @@ __251:
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
 		goto __253
 	}
-	Xsqlite3_str_appendf(tls, pAccum, ts+1562, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1581, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 	goto __254
 __253:
-	Xsqlite3_str_appendf(tls, pAccum, ts+1572, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1591, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
 __254:
 	;
 __252:
@@ -13406,7 +13419,7 @@ __4:
 __5:
 }
 
-var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1586))
+var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1605))
 
 // The z string points to the first character of a token that is
 // associated with an error.  If db does not already have an error
@@ -13571,7 +13584,7 @@ func Xsqlite3ResultStrAccum(tls *libc.TLS, pCtx uintptr, p uintptr) {
 	} else if int32((*StrAccum)(unsafe.Pointer(p)).FprintfFlags)&SQLITE_PRINTF_MALLOCED != 0 {
 		Xsqlite3_result_text(tls, pCtx, (*StrAccum)(unsafe.Pointer(p)).FzText, int32((*StrAccum)(unsafe.Pointer(p)).FnChar), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 	} else {
-		Xsqlite3_result_text(tls, pCtx, ts+1547, 0, uintptr(0))
+		Xsqlite3_result_text(tls, pCtx, ts+1566, 0, uintptr(0))
 		Xsqlite3_str_reset(tls, p)
 	}
 }
@@ -15405,7 +15418,7 @@ func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
 	var c int32 = 0
 	var i int32
 
-	var pow63 uintptr = ts + 1595
+	var pow63 uintptr = ts + 1614
 	for i = 0; c == 0 && i < 18; i++ {
 		c = (int32(*(*int8)(unsafe.Pointer(zNum + uintptr(i*incr)))) - int32(*(*int8)(unsafe.Pointer(pow63 + uintptr(i))))) * 10
 	}
@@ -15951,7 +15964,7 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 	defer tls.Free(8)
 
 	Xsqlite3_log(tls, SQLITE_MISUSE,
-		ts+1614,
+		ts+1633,
 		libc.VaList(bp, zType))
 }
 
@@ -15970,13 +15983,13 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 func Xsqlite3SafetyCheckOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	if db == uintptr(0) {
-		logBadConnection(tls, ts+1548)
+		logBadConnection(tls, ts+1567)
 		return 0
 	}
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_OPEN {
 		if Xsqlite3SafetyCheckSickOrOk(tls, db) != 0 {
-			logBadConnection(tls, ts+1659)
+			logBadConnection(tls, ts+1678)
 		}
 		return 0
 	} else {
@@ -15989,7 +16002,7 @@ func Xsqlite3SafetyCheckSickOrOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_SICK && int32(eOpenState) != SQLITE_STATE_OPEN && int32(eOpenState) != SQLITE_STATE_BUSY {
-		logBadConnection(tls, ts+1668)
+		logBadConnection(tls, ts+1687)
 		return 0
 	} else {
 		return 1
@@ -16515,193 +16528,193 @@ func Xsqlite3OpcodeName(tls *libc.TLS, i int32) uintptr {
 }
 
 var azName = [187]uintptr{
-	ts + 1676,
-	ts + 1686,
-	ts + 1697,
-	ts + 1709,
-	ts + 1720,
-	ts + 1732,
+	ts + 1695,
+	ts + 1705,
+	ts + 1716,
+	ts + 1728,
 	ts + 1739,
-	ts + 1747,
-	ts + 1755,
-	ts + 1760,
-	ts + 1765,
-	ts + 1771,
-	ts + 1785,
-	ts + 1791,
-	ts + 1801,
-	ts + 1806,
-	ts + 1811,
-	ts + 1814,
+	ts + 1751,
+	ts + 1758,
+	ts + 1766,
+	ts + 1774,
+	ts + 1779,
+	ts + 1784,
+	ts + 1790,
+	ts + 1804,
+	ts + 1810,
 	ts + 1820,
-	ts + 1827,
-	ts + 1831,
-	ts + 1841,
-	ts + 1848,
-	ts + 1855,
-	ts + 1862,
-	ts + 1869,
-	ts + 1879,
+	ts + 1825,
+	ts + 1830,
+	ts + 1833,
+	ts + 1839,
+	ts + 1846,
+	ts + 1850,
+	ts + 1860,
+	ts + 1867,
+	ts + 1874,
+	ts + 1881,
 	ts + 1888,
-	ts + 1899,
-	ts + 1908,
-	ts + 1914,
-	ts + 1924,
-	ts + 1934,
-	ts + 1939,
-	ts + 1949,
-	ts + 1960,
-	ts + 1965,
-	ts + 1972,
-	ts + 1983,
-	ts + 1988,
-	ts + 1993,
-	ts + 1999,
-	ts + 2005,
-	ts + 2011,
-	ts + 2014,
+	ts + 1898,
+	ts + 1907,
+	ts + 1918,
+	ts + 1927,
+	ts + 1933,
+	ts + 1943,
+	ts + 1953,
+	ts + 1958,
+	ts + 1968,
+	ts + 1979,
+	ts + 1984,
+	ts + 1991,
+	ts + 2002,
+	ts + 2007,
+	ts + 2012,
 	ts + 2018,
 	ts + 2024,
-	ts + 2035,
-	ts + 2046,
+	ts + 2030,
+	ts + 2033,
+	ts + 2037,
+	ts + 2043,
 	ts + 2054,
-	ts + 2063,
-	ts + 2070,
-	ts + 2078,
-	ts + 2081,
-	ts + 2084,
-	ts + 2087,
-	ts + 2090,
-	ts + 2093,
-	ts + 2096,
+	ts + 2065,
+	ts + 2073,
+	ts + 2082,
+	ts + 2089,
+	ts + 2097,
+	ts + 2100,
 	ts + 2103,
+	ts + 2106,
 	ts + 2109,
-	ts + 2119,
-	ts + 2132,
-	ts + 2143,
-	ts + 2149,
-	ts + 2156,
-	ts + 2165,
-	ts + 2174,
-	ts + 2181,
-	ts + 2194,
-	ts + 2205,
-	ts + 2210,
-	ts + 2218,
+	ts + 2112,
+	ts + 2115,
+	ts + 2122,
+	ts + 2128,
+	ts + 2138,
+	ts + 2151,
+	ts + 2162,
+	ts + 2168,
+	ts + 2175,
+	ts + 2184,
+	ts + 2193,
+	ts + 2200,
+	ts + 2213,
 	ts + 2224,
-	ts + 2231,
+	ts + 2229,
+	ts + 2237,
 	ts + 2243,
-	ts + 2248,
-	ts + 2257,
+	ts + 2250,
 	ts + 2262,
-	ts + 2271,
+	ts + 2267,
 	ts + 2276,
 	ts + 2281,
-	ts + 2287,
+	ts + 2290,
 	ts + 2295,
-	ts + 2303,
-	ts + 2313,
-	ts + 2321,
-	ts + 2328,
-	ts + 2341,
-	ts + 2346,
-	ts + 2358,
-	ts + 2366,
-	ts + 2373,
-	ts + 2384,
-	ts + 2391,
-	ts + 2398,
-	ts + 2408,
+	ts + 2300,
+	ts + 2306,
+	ts + 2314,
+	ts + 2322,
+	ts + 2332,
+	ts + 2340,
+	ts + 2347,
+	ts + 2360,
+	ts + 2365,
+	ts + 2377,
+	ts + 2385,
+	ts + 2392,
+	ts + 2403,
+	ts + 2410,
 	ts + 2417,
-	ts + 2428,
-	ts + 2434,
-	ts + 2445,
-	ts + 2455,
-	ts + 2465,
-	ts + 2472,
-	ts + 2478,
-	ts + 2488,
-	ts + 2499,
-	ts + 2503,
-	ts + 2512,
-	ts + 2521,
-	ts + 2528,
-	ts + 2538,
-	ts + 2545,
-	ts + 2554,
+	ts + 2427,
+	ts + 2436,
+	ts + 2447,
+	ts + 2453,
+	ts + 2464,
+	ts + 2474,
+	ts + 2484,
+	ts + 2491,
+	ts + 2497,
+	ts + 2507,
+	ts + 2518,
+	ts + 2522,
+	ts + 2531,
+	ts + 2540,
+	ts + 2547,
+	ts + 2557,
 	ts + 2564,
-	ts + 2571,
-	ts + 2579,
-	ts + 2593,
-	ts + 2601,
-	ts + 2615,
-	ts + 2626,
-	ts + 2639,
-	ts + 2650,
-	ts + 2656,
-	ts + 2668,
-	ts + 2677,
-	ts + 2685,
-	ts + 2694,
-	ts + 2703,
-	ts + 2710,
-	ts + 2718,
-	ts + 2725,
-	ts + 2736,
-	ts + 2750,
-	ts + 2761,
+	ts + 2573,
+	ts + 2583,
+	ts + 2590,
+	ts + 2598,
+	ts + 2612,
+	ts + 2620,
+	ts + 2634,
+	ts + 2645,
+	ts + 2658,
+	ts + 2669,
+	ts + 2675,
+	ts + 2687,
+	ts + 2696,
+	ts + 2704,
+	ts + 2713,
+	ts + 2722,
+	ts + 2729,
+	ts + 2737,
+	ts + 2744,
+	ts + 2755,
 	ts + 2769,
-	ts + 2775,
-	ts + 2783,
-	ts + 2791,
-	ts + 2801,
-	ts + 2814,
-	ts + 2824,
-	ts + 2837,
-	ts + 2846,
-	ts + 2857,
+	ts + 2780,
+	ts + 2788,
+	ts + 2794,
+	ts + 2802,
+	ts + 2810,
+	ts + 2820,
+	ts + 2833,
+	ts + 2843,
+	ts + 2856,
 	ts + 2865,
-	ts + 2871,
-	ts + 2883,
-	ts + 2895,
-	ts + 2903,
-	ts + 2915,
-	ts + 2928,
-	ts + 2938,
-	ts + 2948,
-	ts + 2953,
-	ts + 2965,
-	ts + 2977,
-	ts + 2987,
-	ts + 2993,
-	ts + 3003,
-	ts + 3010,
+	ts + 2876,
+	ts + 2884,
+	ts + 2890,
+	ts + 2902,
+	ts + 2914,
+	ts + 2922,
+	ts + 2934,
+	ts + 2947,
+	ts + 2957,
+	ts + 2967,
+	ts + 2972,
+	ts + 2984,
+	ts + 2996,
+	ts + 3006,
+	ts + 3012,
 	ts + 3022,
-	ts + 3033,
+	ts + 3029,
 	ts + 3041,
-	ts + 3050,
-	ts + 3059,
-	ts + 3068,
-	ts + 3075,
-	ts + 3086,
-	ts + 3099,
-	ts + 3109,
-	ts + 3116,
-	ts + 3124,
-	ts + 3133,
-	ts + 3139,
-	ts + 3147,
-	ts + 3155,
-	ts + 3163,
-	ts + 3173,
+	ts + 3052,
+	ts + 3060,
+	ts + 3069,
+	ts + 3078,
+	ts + 3087,
+	ts + 3094,
+	ts + 3105,
+	ts + 3118,
+	ts + 3128,
+	ts + 3135,
+	ts + 3143,
+	ts + 3152,
+	ts + 3158,
+	ts + 3166,
+	ts + 3174,
 	ts + 3182,
-	ts + 3193,
-	ts + 3203,
-	ts + 3209,
-	ts + 3220,
-	ts + 3231,
-	ts + 3236,
-	ts + 3244,
+	ts + 3192,
+	ts + 3201,
+	ts + 3212,
+	ts + 3222,
+	ts + 3228,
+	ts + 3239,
+	ts + 3250,
+	ts + 3255,
+	ts + 3263,
 }
 
 // Copyright (c) 2017 Apple Inc. All rights reserved.
@@ -17967,6 +17980,8 @@ type Fhandle_t = fhandle
 
 type Graftdmg_type_t = Uint32_t
 
+type Cryptex_auth_type_t = Uint32_t
+
 type unixShm = struct {
 	FpShmNode    uintptr
 	FpNext       uintptr
@@ -18076,35 +18091,35 @@ type unix_syscall = struct {
 }
 
 var aSyscall = [29]unix_syscall{
-	{FzName: ts + 3254, FpCurrent: 0},
-	{FzName: ts + 3259, FpCurrent: 0},
-	{FzName: ts + 3265, FpCurrent: 0},
-	{FzName: ts + 3272, FpCurrent: 0},
-	{FzName: ts + 3279, FpCurrent: 0},
+	{FzName: ts + 3273, FpCurrent: 0},
+	{FzName: ts + 3278, FpCurrent: 0},
 	{FzName: ts + 3284, FpCurrent: 0},
-	{FzName: ts + 3290, FpCurrent: 0},
-	{FzName: ts + 3300, FpCurrent: 0},
-	{FzName: ts + 3306, FpCurrent: 0},
-	{FzName: ts + 3311, FpCurrent: 0},
-	{FzName: ts + 3317},
+	{FzName: ts + 3291, FpCurrent: 0},
+	{FzName: ts + 3298, FpCurrent: 0},
+	{FzName: ts + 3303, FpCurrent: 0},
+	{FzName: ts + 3309, FpCurrent: 0},
+	{FzName: ts + 3319, FpCurrent: 0},
 	{FzName: ts + 3325, FpCurrent: 0},
-	{FzName: ts + 3331, FpCurrent: 0},
-	{FzName: ts + 3338},
-	{FzName: ts + 3347, FpCurrent: 0},
-	{FzName: ts + 3354},
-	{FzName: ts + 3364, FpCurrent: 0},
-	{FzName: ts + 3371, FpCurrent: 0},
-	{FzName: ts + 3385, FpCurrent: 0},
-	{FzName: ts + 3391, FpCurrent: 0},
-	{FzName: ts + 3397, FpCurrent: 0},
+	{FzName: ts + 3330, FpCurrent: 0},
+	{FzName: ts + 3336},
+	{FzName: ts + 3344, FpCurrent: 0},
+	{FzName: ts + 3350, FpCurrent: 0},
+	{FzName: ts + 3357},
+	{FzName: ts + 3366, FpCurrent: 0},
+	{FzName: ts + 3373},
+	{FzName: ts + 3383, FpCurrent: 0},
+	{FzName: ts + 3390, FpCurrent: 0},
 	{FzName: ts + 3404, FpCurrent: 0},
-	{FzName: ts + 3412, FpCurrent: 0},
-	{FzName: ts + 3417, FpCurrent: 0},
-	{FzName: ts + 3424},
+	{FzName: ts + 3410, FpCurrent: 0},
+	{FzName: ts + 3416, FpCurrent: 0},
+	{FzName: ts + 3423, FpCurrent: 0},
 	{FzName: ts + 3431, FpCurrent: 0},
-	{FzName: ts + 3443, FpCurrent: 0},
-	{FzName: ts + 3452, FpCurrent: 0},
-	{FzName: ts + 3458},
+	{FzName: ts + 3436, FpCurrent: 0},
+	{FzName: ts + 3443},
+	{FzName: ts + 3450, FpCurrent: 0},
+	{FzName: ts + 3462, FpCurrent: 0},
+	{FzName: ts + 3471, FpCurrent: 0},
+	{FzName: ts + 3477},
 }
 
 func robustFchown(tls *libc.TLS, fd int32, uid Uid_t, gid Gid_t) int32 {
@@ -18202,9 +18217,9 @@ func robust_open(tls *libc.TLS, z uintptr, f int32, m Mode_t) int32 {
 		}
 		(*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, fd)
 		Xsqlite3_log(tls, SQLITE_WARNING,
-			ts+3464, libc.VaList(bp, z, fd))
+			ts+3483, libc.VaList(bp, z, fd))
 		fd = -1
-		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3507, O_RDONLY, int32(m)) < 0 {
+		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3526, O_RDONLY, int32(m)) < 0 {
 			break
 		}
 	}
@@ -18284,13 +18299,13 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 	var zErr uintptr
 	var iErrno int32 = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 
-	zErr = ts + 1547
+	zErr = ts + 1566
 
 	if zPath == uintptr(0) {
-		zPath = ts + 1547
+		zPath = ts + 1566
 	}
 	Xsqlite3_log(tls, errcode,
-		ts+3517,
+		ts+3536,
 		libc.VaList(bp, iLine, iErrno, zFunc, zPath, zErr))
 
 	return errcode
@@ -18298,7 +18313,7 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 
 func robust_close(tls *libc.TLS, pFile uintptr, h int32, lineno int32) {
 	if (*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, h) != 0 {
-		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3259,
+		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3278,
 			func() uintptr {
 				if pFile != 0 {
 					return (*UnixFile)(unsafe.Pointer(pFile)).FzPath
@@ -18319,7 +18334,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, 38271)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38275)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -18366,7 +18381,7 @@ func findInodeInfo(tls *libc.TLS, pFile uintptr, ppInode uintptr) int32 {
 
 	if (*stat)(unsafe.Pointer(bp)).Fst_size == int64(0) && (*UnixFile)(unsafe.Pointer(pFile)).FfsFlags&uint32(SQLITE_FSFLAGS_IS_MSDOS) != uint32(0) {
 		for __ccgo := true; __ccgo; __ccgo = rc < 0 && *(*int32)(unsafe.Pointer(libc.X__error(tls))) == EINTR {
-			rc = int32((*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 11*24 + 8)))(tls, fd, ts+3548, uint64(1)))
+			rc = int32((*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 11*24 + 8)))(tls, fd, ts+3567, uint64(1)))
 		}
 		if rc != 1 {
 			storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
@@ -18436,19 +18451,19 @@ func verifyDbFile(tls *libc.TLS, pFile uintptr) {
 
 	rc = (*(*func(*libc.TLS, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 5*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, bp+32)
 	if rc != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3550, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3569, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if int32((*stat)(unsafe.Pointer(bp+32)).Fst_nlink) == 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3574, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3593, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if int32((*stat)(unsafe.Pointer(bp+32)).Fst_nlink) > 1 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3603, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3622, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if fileHasMoved(tls, pFile) != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3630, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3649, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 }
@@ -18864,7 +18879,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, 39055)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39059)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -19613,7 +19628,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	var ii int32
 	var fd int32 = -1
 
-	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3658, libc.VaList(bp, zFilename))
+	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3677, libc.VaList(bp, zFilename))
 	for ii = int32(libc.Xstrlen(tls, bp+8)); ii > 0 && int32(*(*int8)(unsafe.Pointer(bp + 8 + uintptr(ii)))) != '/'; ii-- {
 	}
 	if ii > 0 {
@@ -19631,7 +19646,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3371, bp+8, 40676)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40680), ts+3390, bp+8, 40680)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -19648,14 +19663,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, 40717)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3680, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40721)
 	}
 
 	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)), 40731)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40735)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -19675,7 +19690,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, 40762)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3309, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40766)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -19730,7 +19745,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 				if iWrite >= nSize {
 					iWrite = nSize - int64(1)
 				}
-				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1547, 1)
+				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1566, 1)
 				if nWrite != 1 {
 					return SQLITE_IOERR | int32(3)<<8
 				}
@@ -19743,7 +19758,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, 40883)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3309, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40887)
 			}
 		}
 
@@ -19811,7 +19826,7 @@ func unixFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 		}
 	case SQLITE_FCNTL_VFSNAME:
 		{
-			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
+			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
 			return SQLITE_OK
 
 		}
@@ -19977,7 +19992,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, 41442)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41446)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -20005,7 +20020,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, 41499)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3309, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41503)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -20068,7 +20083,7 @@ __4:
 	;
 	libc.X__builtin___memset_chk(tls, pShmNode, 0, uint64(unsafe.Sizeof(unixShmNode{}))+uint64(nShmFilename), libc.X__builtin_object_size(tls, pShmNode, 0))
 	zShm = libc.AssignPtrUintptr(pShmNode+16, pShmNode+1*96)
-	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3672, libc.VaList(bp, zBasePath))
+	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3691, libc.VaList(bp, zBasePath))
 
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = -1
 	(*UnixInodeInfo)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pDbFd)).FpInode)).FpShmNode = pShmNode
@@ -20089,7 +20104,7 @@ __5:
 	if !(int32((*UnixInodeInfo)(unsafe.Pointer(pInode)).FbProcessLock) == 0) {
 		goto __7
 	}
-	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3679, 0)) {
+	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3698, 0)) {
 		goto __8
 	}
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = robust_open(tls, zShm, O_RDWR|O_CREAT|O_NOFOLLOW,
@@ -20104,7 +20119,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3254, zShm, 41624)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41628), ts+3273, zShm, 41628)
 	goto shm_open_err
 __10:
 	;
@@ -20230,11 +20245,11 @@ __11:
 		goto __13
 	}
 	*(*int32)(unsafe.Pointer(bp + 144)) = 0
-	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1547, 1, bp+144) != 1) {
+	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1566, 1, bp+144) != 1) {
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3325, zFile, 41768)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3344, zFile, 41772)
 	goto shmpage_out
 __14:
 	;
@@ -20280,7 +20295,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3412, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3431, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41799)
 	goto shmpage_out
 __20:
 	;
@@ -20481,7 +20496,7 @@ func unixUnmapfile(tls *libc.TLS, pFd uintptr) {
 }
 
 func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
-	var zErr uintptr = ts + 3412
+	var zErr uintptr = ts + 3431
 	var h int32 = (*UnixFile)(unsafe.Pointer(pFd)).Fh
 	var pOrig uintptr = (*UnixFile)(unsafe.Pointer(pFd)).FpMapRegion
 	var nOrig I64 = (*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeActual
@@ -20519,7 +20534,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, 42169)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42173)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -20676,7 +20691,7 @@ func autolockIoFinderImpl(tls *libc.TLS, filePath uintptr, pNew uintptr) uintptr
 	(*flock)(unsafe.Pointer(bp + 2176)).Fl_whence = int16(SEEK_SET)
 	(*flock)(unsafe.Pointer(bp + 2176)).Fl_type = int16(F_RDLCK)
 	if (*(*func(*libc.TLS, int32, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 7*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pNew)).Fh, F_GETLK, libc.VaList(bp, bp+2176)) != -1 {
-		if libc.Xstrcmp(tls, bp+8+72, ts+3692) == 0 {
+		if libc.Xstrcmp(tls, bp+8+72, ts+3711) == 0 {
 			return uintptr(unsafe.Pointer(&nfsIoMethods))
 		} else {
 			return uintptr(unsafe.Pointer(&posixIoMethods))
@@ -20693,11 +20708,11 @@ type Mapping = struct {
 }
 
 var aMap = [6]Mapping{
-	{FzFilesystem: ts + 3696, FpMethods: 0},
-	{FzFilesystem: ts + 3700, FpMethods: 0},
-	{FzFilesystem: ts + 3704, FpMethods: 0},
-	{FzFilesystem: ts + 3710, FpMethods: 0},
-	{FzFilesystem: ts + 3716, FpMethods: 0},
+	{FzFilesystem: ts + 3715, FpMethods: 0},
+	{FzFilesystem: ts + 3719, FpMethods: 0},
+	{FzFilesystem: ts + 3723, FpMethods: 0},
+	{FzFilesystem: ts + 3729, FpMethods: 0},
+	{FzFilesystem: ts + 3735, FpMethods: 0},
 	{},
 }
 var autolockIoFinder uintptr = 0
@@ -20724,10 +20739,10 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		}
 		return uintptr(0)
 	}(),
-		ts+3723, SQLITE_POWERSAFE_OVERWRITE) != 0 {
+		ts+3742, SQLITE_POWERSAFE_OVERWRITE) != 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_PSOW)
 	}
-	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3728) == 0 {
+	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3747) == 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_EXCL)
 	}
 
@@ -20746,7 +20761,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, 42672)
+			robust_close(tls, pNew, h, 42676)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -20763,7 +20778,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, 42698)
+				robust_close(tls, pNew, h, 42702)
 				h = -1
 			}
 			unixLeaveMutex(tls)
@@ -20777,7 +20792,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		if zLockFile == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
-			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3738, libc.VaList(bp, zFilename))
+			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3757, libc.VaList(bp, zFilename))
 		}
 		(*UnixFile)(unsafe.Pointer(pNew)).FlockingContext = zLockFile
 	}
@@ -20785,7 +20800,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, 42757)
+			robust_close(tls, pNew, h, 42761)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -20798,15 +20813,15 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 var azTempDirs = [6]uintptr{
 	uintptr(0),
 	uintptr(0),
-	ts + 3746,
-	ts + 3755,
-	ts + 3764,
-	ts + 1560,
+	ts + 3765,
+	ts + 3774,
+	ts + 3783,
+	ts + 1579,
 }
 
 func unixTempFileInit(tls *libc.TLS) {
-	azTempDirs[0] = libc.Xgetenv(tls, ts+3769)
-	azTempDirs[1] = libc.Xgetenv(tls, ts+3783)
+	azTempDirs[0] = libc.Xgetenv(tls, ts+3788)
+	azTempDirs[1] = libc.Xgetenv(tls, ts+3802)
 }
 
 func unixTempFileDir(tls *libc.TLS) uintptr {
@@ -20851,7 +20866,7 @@ func unixGetTempname(tls *libc.TLS, nBuf int32, zBuf uintptr) int32 {
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U64(0))), bp+24)
 
 			*(*int8)(unsafe.Pointer(zBuf + uintptr(nBuf-2))) = int8(0)
-			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3790,
+			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3809,
 				libc.VaList(bp, zDir, *(*U64)(unsafe.Pointer(bp + 24)), 0))
 			if int32(*(*int8)(unsafe.Pointer(zBuf + uintptr(nBuf-2)))) != 0 || libc.PostIncInt32(&iLimit, 1) > 10 {
 				rc = SQLITE_ERROR
@@ -20936,7 +20951,7 @@ func findCreateFileMode(tls *libc.TLS, zPath uintptr, flags int32, pMode uintptr
 	} else if flags&SQLITE_OPEN_DELETEONCLOSE != 0 {
 		*(*Mode_t)(unsafe.Pointer(pMode)) = Mode_t(0600)
 	} else if flags&SQLITE_OPEN_URI != 0 {
-		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3807)
+		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3826)
 		if z != 0 {
 			rc = getFileMode(tls, z, pMode, pUid, pGid)
 		}
@@ -21105,7 +21120,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3254, zName, 43198)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43202), ts+3273, zName, 43202)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -21149,17 +21164,17 @@ __25:
 		goto __26
 	}
 	storeLastErrno(tls, p, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-	robust_close(tls, p, fd, 43252)
+	robust_close(tls, p, fd, 43256)
 	return SQLITE_IOERR | int32(13)<<8
 __26:
 	;
-	if !(0 == libc.Xstrncmp(tls, ts+3814, bp+528+72, uint64(5))) {
+	if !(0 == libc.Xstrncmp(tls, ts+3833, bp+528+72, uint64(5))) {
 		goto __27
 	}
 	*(*uint32)(unsafe.Pointer(pFile + 124)) |= uint32(SQLITE_FSFLAGS_IS_MSDOS)
 __27:
 	;
-	if !(0 == libc.Xstrncmp(tls, ts+3820, bp+528+72, uint64(5))) {
+	if !(0 == libc.Xstrncmp(tls, ts+3839, bp+528+72, uint64(5))) {
 		goto __28
 	}
 	*(*uint32)(unsafe.Pointer(pFile + 124)) |= uint32(SQLITE_FSFLAGS_IS_MSDOS)
@@ -21199,7 +21214,7 @@ __33:
 	if !(isAutoProxy != 0 && zPath != uintptr(0) && !(noLock != 0) && (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxOpen != 0) {
 		goto __34
 	}
-	envforce = libc.Xgetenv(tls, ts+3826)
+	envforce = libc.Xgetenv(tls, ts+3845)
 	useProxy = 0
 
 	if !(envforce != uintptr(0)) {
@@ -21218,7 +21233,7 @@ __36:
 	if !(rc == SQLITE_OK) {
 		goto __38
 	}
-	rc = proxyTransformUnixFile(tls, pFile, ts+3853)
+	rc = proxyTransformUnixFile(tls, pFile, ts+3872)
 	if !(rc != SQLITE_OK) {
 		goto __39
 	}
@@ -21257,7 +21272,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, 43337)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3383, zPath, 43341)
 		}
 		return rc
 	}
@@ -21265,9 +21280,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, 43347)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3879, zPath, 43351)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43353)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -21331,18 +21346,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, 43443), ts+3452, zIn, 43443)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43447), ts+3471, zIn, 43447)
 			}
 		} 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, 43449)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43453)
 				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, 43454), ts+3443, zIn, 43454)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43458), ts+3462, zIn, 43458)
 				return
 			}
 			*(*int8)(unsafe.Pointer(bp + 144 + uintptr(got))) = int8(0)
@@ -21382,14 +21397,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, 43512), ts+3272, zPath, 43512)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43516), ts+3291, zPath, 43516)
 		}
 		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, 43518)
+		return Xsqlite3CantopenError(tls, 43522)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+1032)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -21421,7 +21436,7 @@ func unixDlError(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBufOut uintptr) {
 	unixEnterMutex(tls)
 	zErr = libc.Xdlerror(tls)
 	if zErr != 0 {
-		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3658, libc.VaList(bp, zErr))
+		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3677, libc.VaList(bp, zErr))
 	}
 	unixLeaveMutex(tls)
 }
@@ -21453,7 +21468,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 	{
 		var fd int32
 		var got int32
-		fd = robust_open(tls, ts+3866, O_RDONLY, uint16(0))
+		fd = robust_open(tls, ts+3885, O_RDONLY, uint16(0))
 		if fd < 0 {
 			libc.Xtime(tls, bp)
 			libc.X__builtin___memcpy_chk(tls, zBuf, bp, uint64(unsafe.Sizeof(Time_t(0))), libc.X__builtin_object_size(tls, zBuf, 0))
@@ -21464,7 +21479,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, 43619)
+			robust_close(tls, uintptr(0), fd, 43623)
 		}
 
 	}
@@ -21541,12 +21556,12 @@ func proxyGetLockPath(tls *libc.TLS, dbPath uintptr, lPath uintptr, maxLen Size_
 		if !(libc.Xconfstr(tls, X_CS_DARWIN_USER_TEMP_DIR, lPath, maxLen) != 0) {
 			return SQLITE_IOERR | int32(15)<<8
 		}
-		len = int32(libc.Xstrlcat(tls, lPath, ts+3879, maxLen))
+		len = int32(libc.Xstrlcat(tls, lPath, ts+3898, maxLen))
 
 	}
 
 	if int32(*(*int8)(unsafe.Pointer(lPath + uintptr(len-1)))) != '/' {
-		len = int32(libc.Xstrlcat(tls, lPath, ts+3892, maxLen))
+		len = int32(libc.Xstrlcat(tls, lPath, ts+3911, maxLen))
 	}
 
 	dbLen = int32(libc.Xstrlen(tls, dbPath))
@@ -21560,7 +21575,7 @@ func proxyGetLockPath(tls *libc.TLS, dbPath uintptr, lPath uintptr, maxLen Size_
 		}()
 	}
 	*(*int8)(unsafe.Pointer(lPath + uintptr(i+len))) = int8(0)
-	libc.Xstrlcat(tls, lPath, ts+3853, maxLen)
+	libc.Xstrlcat(tls, lPath, ts+3872, maxLen)
 
 	return SQLITE_OK
 }
@@ -21678,7 +21693,7 @@ __11:
 __12:
 	return SQLITE_IOERR | int32(15)<<8
 __13:
-	return Xsqlite3CantopenError(tls, 44048)
+	return Xsqlite3CantopenError(tls, 44052)
 __10:
 	;
 __8:
@@ -21695,7 +21710,7 @@ __14:
 	(*UnixFile)(unsafe.Pointer(pNew)).FopenFlags = openFlags
 	libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(Sqlite3_vfs{})), libc.X__builtin_object_size(tls, bp, 0))
 	(*Sqlite3_vfs)(unsafe.Pointer(bp)).FpAppData = uintptr(unsafe.Pointer(&autolockIoFinder))
-	(*Sqlite3_vfs)(unsafe.Pointer(bp)).FzName = ts + 3894
+	(*Sqlite3_vfs)(unsafe.Pointer(bp)).FzName = ts + 3913
 	(*UnixUnusedFd)(unsafe.Pointer(pUnused)).Ffd = fd
 	(*UnixUnusedFd)(unsafe.Pointer(pUnused)).Fflags = openFlags
 	(*UnixFile)(unsafe.Pointer(pNew)).FpPreallocatedUnused = pUnused
@@ -21709,7 +21724,7 @@ __14:
 __15:
 	;
 end_create_proxy:
-	robust_close(tls, pNew, fd, 44072)
+	robust_close(tls, pNew, fd, 44076)
 	Xsqlite3_free(tls, pNew)
 	Xsqlite3_free(tls, pUnused)
 	return rc
@@ -21753,16 +21768,16 @@ func proxyBreakConchLock(tls *libc.TLS, pFile uintptr, myHostID uintptr) int32 {
 	cPath = (*ProxyLockingContext)(unsafe.Pointer(pCtx)).FconchFilePath
 	readLen = uint64(0)
 	pathLen = uint64(0)
-	*(*[64]int8)(unsafe.Pointer(bp + 1088)) = *(*[64]int8)(unsafe.Pointer(ts + 3900))
+	*(*[64]int8)(unsafe.Pointer(bp + 1088)) = *(*[64]int8)(unsafe.Pointer(ts + 3919))
 	fd = -1
 	rc = -1
 	_ = myHostID
 
 	pathLen = libc.Xstrlcpy(tls, bp+64, cPath, uint64(PATH_MAX))
-	if !(pathLen > uint64(PATH_MAX) || pathLen < uint64(6) || libc.Xstrlcpy(tls, bp+64+uintptr(pathLen-uint64(5)), ts+3964, uint64(6)) != uint64(5)) {
+	if !(pathLen > uint64(PATH_MAX) || pathLen < uint64(6) || libc.Xstrlcpy(tls, bp+64+uintptr(pathLen-uint64(5)), ts+3983, uint64(6)) != uint64(5)) {
 		goto __1
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+3970, libc.VaList(bp, int32(pathLen)))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+3989, libc.VaList(bp, int32(pathLen)))
 	goto end_breaklock
 __1:
 	;
@@ -21770,7 +21785,7 @@ __1:
 	if !(readLen < uint64(PROXY_HEADERLEN+PROXY_HOSTIDLEN)) {
 		goto __2
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+3990, libc.VaList(bp+8, int32(readLen)))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+4009, libc.VaList(bp+8, int32(readLen)))
 	goto end_breaklock
 __2:
 	;
@@ -21778,27 +21793,27 @@ __2:
 	if !(fd < 0) {
 		goto __3
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+4010, libc.VaList(bp+16, *(*int32)(unsafe.Pointer(libc.X__error(tls)))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+4029, libc.VaList(bp+16, *(*int32)(unsafe.Pointer(libc.X__error(tls)))))
 	goto end_breaklock
 __3:
 	;
 	if !((*(*func(*libc.TLS, int32, uintptr, Size_t, Off_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 12*24 + 8)))(tls, fd, bp+1152, readLen, int64(0)) != Ssize_t(readLen)) {
 		goto __4
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+4029, libc.VaList(bp+24, *(*int32)(unsafe.Pointer(libc.X__error(tls)))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+4048, libc.VaList(bp+24, *(*int32)(unsafe.Pointer(libc.X__error(tls)))))
 	goto end_breaklock
 __4:
 	;
 	if !(libc.Xrename(tls, bp+64, cPath) != 0) {
 		goto __5
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+4047, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(libc.X__error(tls)))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+1088, ts+4066, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(libc.X__error(tls)))))
 	goto end_breaklock
 __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, 44175)
+	libc.Xfprintf(tls, libc.X__stderrp, ts+4085, libc.VaList(bp+40, cPath))
+	robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(conchFile)).Fh, 44179)
 	(*UnixFile)(unsafe.Pointer(conchFile)).Fh = fd
 	(*UnixFile)(unsafe.Pointer(conchFile)).FopenFlags = O_RDWR | O_CREAT
 
@@ -21810,10 +21825,10 @@ 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, 44183)
+	robust_close(tls, pFile, fd, 44187)
 __7:
 	;
-	libc.Xfprintf(tls, libc.X__stderrp, ts+4090, libc.VaList(bp+48, cPath, bp+1088))
+	libc.Xfprintf(tls, libc.X__stderrp, ts+4109, libc.VaList(bp+48, cPath, bp+1088))
 __6:
 	;
 	return rc
@@ -22090,7 +22105,7 @@ end_takeconch:
 	if !((*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0) {
 		goto __29
 	}
-	robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 44436)
+	robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 44440)
 __29:
 	;
 	(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
@@ -22102,7 +22117,7 @@ __29:
 	(*UnixFile)(unsafe.Pointer(pFile)).Fh = fd
 	goto __31
 __30:
-	rc = Xsqlite3CantopenError(tls, 44444)
+	rc = Xsqlite3CantopenError(tls, 44448)
 
 __31:
 	;
@@ -22220,7 +22235,7 @@ func proxyCreateConchPathname(tls *libc.TLS, dbPath uintptr, pConchPath uintptr)
 		i++
 	}
 
-	libc.X__builtin___memcpy_chk(tls, conchPath+uintptr(i+1), ts+4128, uint64(7), libc.X__builtin_object_size(tls, conchPath+uintptr(i+1), 0))
+	libc.X__builtin___memcpy_chk(tls, conchPath+uintptr(i+1), ts+4147, uint64(7), libc.X__builtin_object_size(tls, conchPath+uintptr(i+1), 0))
 
 	return SQLITE_OK
 }
@@ -22234,7 +22249,7 @@ func switchLockProxyPath(tls *libc.TLS, pFile uintptr, path uintptr) int32 {
 		return SQLITE_BUSY
 	}
 
-	if !(path != 0) || int32(*(*int8)(unsafe.Pointer(path))) == 0 || !(libc.Xstrcmp(tls, path, ts+3853) != 0) || oldPath != 0 && !(libc.Xstrncmp(tls, oldPath, path, uint64(PATH_MAX)) != 0) {
+	if !(path != 0) || int32(*(*int8)(unsafe.Pointer(path))) == 0 || !(libc.Xstrcmp(tls, path, ts+3872) != 0) || oldPath != 0 && !(libc.Xstrncmp(tls, oldPath, path, uint64(PATH_MAX)) != 0) {
 		return SQLITE_OK
 	} else {
 		var lockProxy uintptr = (*ProxyLockingContext)(unsafe.Pointer(pCtx)).FlockProxy
@@ -22261,7 +22276,7 @@ func proxyGetDbPathForUnixFile(tls *libc.TLS, pFile uintptr, dbPath uintptr) int
 		libc.Xstrlcpy(tls, dbPath, (*AfpLockingContext)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FlockingContext)).FdbPath,
 			uint64(PATH_MAX))
 	} else if (*UnixFile)(unsafe.Pointer(pFile)).FpMethod == uintptr(unsafe.Pointer(&dotlockIoMethods)) {
-		var len int32 = int32(libc.Xstrlen(tls, (*UnixFile)(unsafe.Pointer(pFile)).FlockingContext) - libc.Xstrlen(tls, ts+4135))
+		var len int32 = int32(libc.Xstrlen(tls, (*UnixFile)(unsafe.Pointer(pFile)).FlockingContext) - libc.Xstrlen(tls, ts+4154))
 		libc.X__builtin___memcpy_chk(tls, dbPath, (*UnixFile)(unsafe.Pointer(pFile)).FlockingContext, uint64(len+1), libc.X__builtin_object_size(tls, dbPath, 0))
 	} else {
 		libc.Xstrlcpy(tls, dbPath, (*UnixFile)(unsafe.Pointer(pFile)).FlockingContext, uint64(PATH_MAX))
@@ -22282,7 +22297,7 @@ func proxyTransformUnixFile(tls *libc.TLS, pFile uintptr, path uintptr) int32 {
 		return SQLITE_BUSY
 	}
 	proxyGetDbPathForUnixFile(tls, pFile, bp)
-	if !(path != 0) || int32(*(*int8)(unsafe.Pointer(path))) == 0 || !(libc.Xstrcmp(tls, path, ts+3853) != 0) {
+	if !(path != 0) || int32(*(*int8)(unsafe.Pointer(path))) == 0 || !(libc.Xstrcmp(tls, path, ts+3872) != 0) {
 		lockPath = uintptr(0)
 	} else {
 		lockPath = path
@@ -22353,7 +22368,7 @@ func proxyFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 				if (*ProxyLockingContext)(unsafe.Pointer(pCtx)).FlockProxyPath != 0 {
 					*(*uintptr)(unsafe.Pointer(pArg)) = (*ProxyLockingContext)(unsafe.Pointer(pCtx)).FlockProxyPath
 				} else {
-					*(*uintptr)(unsafe.Pointer(pArg)) = ts + 4141
+					*(*uintptr)(unsafe.Pointer(pArg)) = ts + 4160
 				}
 			} else {
 				*(*uintptr)(unsafe.Pointer(pArg)) = uintptr(0)
@@ -22376,7 +22391,7 @@ func proxyFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 				var proxyPath uintptr = pArg
 				if isProxyStyle != 0 {
 					var pCtx uintptr = (*UnixFile)(unsafe.Pointer(pFile)).FlockingContext
-					if !(libc.Xstrcmp(tls, pArg, ts+3853) != 0) ||
+					if !(libc.Xstrcmp(tls, pArg, ts+3872) != 0) ||
 						(*ProxyLockingContext)(unsafe.Pointer(pCtx)).FlockProxyPath != 0 && !(libc.Xstrncmp(tls, (*ProxyLockingContext)(unsafe.Pointer(pCtx)).FlockProxyPath, proxyPath, uint64(PATH_MAX)) != 0) {
 						rc = SQLITE_OK
 					} else {
@@ -22526,15 +22541,15 @@ func Xsqlite3_os_init(tls *libc.TLS) int32 {
 }
 
 var aVfs = [9]Sqlite3_vfs{
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4159, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4164, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4174, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3728, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4187, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4198, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4209, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4218, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4227, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4178, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4183, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4193, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3747, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4206, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4217, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4228, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4237, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 4246, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
 }
 
 // Shutdown the operating system interface.
@@ -22589,7 +22604,7 @@ var memdb_g MemFS
 var memdb_vfs = Sqlite3_vfs{
 	FiVersion:          2,
 	FmxPathname:        1024,
-	FzName:             ts + 4238,
+	FzName:             ts + 4257,
 	FxOpen:             0,
 	FxAccess:           0,
 	FxFullPathname:     0,
@@ -22845,7 +22860,7 @@ func memdbFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int3
 	var rc int32 = SQLITE_NOTFOUND
 	memdbEnter(tls, p)
 	if op == SQLITE_FCNTL_VFSNAME {
-		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+4244, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
+		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+4263, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
 		rc = SQLITE_OK
 	}
 	if op == SQLITE_FCNTL_SIZE_LIMIT {
@@ -22977,7 +22992,7 @@ func memdbFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, z
 	defer tls.Free(8)
 
 	_ = pVfs
-	Xsqlite3_snprintf(tls, nOut, zOut, ts+3658, libc.VaList(bp, zPath))
+	Xsqlite3_snprintf(tls, nOut, zOut, ts+3677, libc.VaList(bp, zPath))
 	return SQLITE_OK
 }
 
@@ -23098,7 +23113,7 @@ func Xsqlite3_serialize(tls *libc.TLS, db uintptr, zSchema uintptr, piSize uintp
 		return uintptr(0)
 	}
 	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
-	zSql = Xsqlite3_mprintf(tls, ts+4259, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+4278, libc.VaList(bp, zSchema))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, db, zSql, -1, bp+8, uintptr(0))
 	} else {
@@ -23171,7 +23186,7 @@ __1:
 	goto end_deserialize
 __2:
 	;
-	zSql = Xsqlite3_mprintf(tls, ts+4282, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+4301, libc.VaList(bp, zSchema))
 	if !(zSql == uintptr(0)) {
 		goto __3
 	}
@@ -23887,7 +23902,7 @@ func pcacheFetchFinishWithInit(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 	libc.X__builtin___memset_chk(tls, pPgHdr+32, 0, uint64(unsafe.Sizeof(PgHdr{}))-uint64(uintptr(0)+32), libc.X__builtin_object_size(tls, pPgHdr+32, 0))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpPage = pPage
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpData = (*Sqlite3_pcache_page)(unsafe.Pointer(pPage)).FpBuf
-	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*72
+	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*80
 	libc.X__builtin___memset_chk(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0, uint64(8), libc.X__builtin_object_size(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpCache = pCache
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).Fpgno = pgno
@@ -23917,7 +23932,7 @@ func Xsqlite3PcacheFetchFinish(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 // reference count drops to 0, then it is made eligible for recycling.
 func Xsqlite3PcacheRelease(tls *libc.TLS, p uintptr) {
 	(*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FnRefSum--
-	if int32(libc.PreDecInt16(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1)) == 0 {
+	if libc.PreDecInt64(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1) == int64(0) {
 		if int32((*PgHdr)(unsafe.Pointer(p)).Fflags)&PGHDR_CLEAN != 0 {
 			pcacheUnpin(tls, p)
 		} else {
@@ -23968,7 +23983,7 @@ func Xsqlite3PcacheMakeClean(tls *libc.TLS, p uintptr) {
 	*(*U16)(unsafe.Pointer(p + 52)) &= libc.Uint16FromInt32(libc.CplInt32(PGHDR_DIRTY | PGHDR_NEED_SYNC | PGHDR_WRITEABLE))
 	*(*U16)(unsafe.Pointer(p + 52)) |= U16(PGHDR_CLEAN)
 
-	if int32((*PgHdr)(unsafe.Pointer(p)).FnRef) == 0 {
+	if (*PgHdr)(unsafe.Pointer(p)).FnRef == int64(0) {
 		pcacheUnpin(tls, p)
 	}
 }
@@ -24072,8 +24087,8 @@ func Xsqlite3PcacheClear(tls *libc.TLS, pCache uintptr) {
 }
 
 func pcacheMergeDirtyList(tls *libc.TLS, pA uintptr, pB uintptr) uintptr {
-	bp := tls.Alloc(72)
-	defer tls.Free(72)
+	bp := tls.Alloc(80)
+	defer tls.Free(80)
 
 	var pTail uintptr
 	pTail = bp
@@ -24151,13 +24166,13 @@ func Xsqlite3PcacheDirtyList(tls *libc.TLS, pCache uintptr) uintptr {
 //
 // This is not the total number of pages referenced, but the sum of the
 // reference count for all pages.
-func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) int32 {
+func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) I64 {
 	return (*PCache)(unsafe.Pointer(pCache)).FnRefSum
 }
 
 // Return the number of references to the page supplied as an argument.
-func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) int32 {
-	return int32((*PgHdr)(unsafe.Pointer(p)).FnRef)
+func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) I64 {
+	return (*PgHdr)(unsafe.Pointer(p)).FnRef
 }
 
 // Return the total number of pages in the cache.
@@ -26385,7 +26400,7 @@ __27:
 	if !(isHot != 0 && nPlayback != 0) {
 		goto __28
 	}
-	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+4297,
+	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+4316,
 		libc.VaList(bp, nPlayback, (*Pager)(unsafe.Pointer(pPager)).FzJournal))
 __28:
 	;
@@ -26450,7 +26465,7 @@ func pagerUndoCallback(tls *libc.TLS, pCtx uintptr, iPg Pgno) int32 {
 
 	pPg = Xsqlite3PagerLookup(tls, pPager, iPg)
 	if pPg != 0 {
-		if Xsqlite3PcachePageRefcount(tls, pPg) == 1 {
+		if Xsqlite3PcachePageRefcount(tls, pPg) == int64(1) {
 			Xsqlite3PcacheDrop(tls, pPg)
 		} else {
 			rc = readDbPage(tls, pPg)
@@ -26883,7 +26898,7 @@ func Xsqlite3PagerSetPagesize(tls *libc.TLS, pPager uintptr, pPageSize uintptr,
 	var pageSize U32 = *(*U32)(unsafe.Pointer(pPageSize))
 
 	if (int32((*Pager)(unsafe.Pointer(pPager)).FmemDb) == 0 || (*Pager)(unsafe.Pointer(pPager)).FdbSize == Pgno(0)) &&
-		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 &&
+		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) &&
 		pageSize != 0 && pageSize != U32((*Pager)(unsafe.Pointer(pPager)).FpageSize) {
 		var pNew uintptr = uintptr(0)
 		*(*I64)(unsafe.Pointer(bp)) = int64(0)
@@ -27035,9 +27050,9 @@ func pagerAcquireMapPage(tls *libc.TLS, pPager uintptr, pgno Pgno, pData uintptr
 			Xsqlite3OsUnfetch(tls, (*Pager)(unsafe.Pointer(pPager)).Ffd, I64(pgno-Pgno(1))*(*Pager)(unsafe.Pointer(pPager)).FpageSize, pData)
 			return SQLITE_NOMEM
 		}
-		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*72
+		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*80
 		(*PgHdr)(unsafe.Pointer(p)).Fflags = U16(PGHDR_MMAP)
-		(*PgHdr)(unsafe.Pointer(p)).FnRef = int16(1)
+		(*PgHdr)(unsafe.Pointer(p)).FnRef = int64(1)
 		(*PgHdr)(unsafe.Pointer(p)).FpPager = pPager
 	}
 
@@ -27369,7 +27384,7 @@ func Xsqlite3PagerFlush(tls *libc.TLS, pPager uintptr) int32 {
 
 		for rc == SQLITE_OK && pList != 0 {
 			var pNext uintptr = (*PgHdr)(unsafe.Pointer(pList)).FpDirty
-			if int32((*PgHdr)(unsafe.Pointer(pList)).FnRef) == 0 {
+			if (*PgHdr)(unsafe.Pointer(pList)).FnRef == int64(0) {
 				rc = pagerStress(tls, pPager, pList)
 			}
 			pList = pNext
@@ -27519,7 +27534,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 60235)
+	rc = Xsqlite3CantopenError(tls, 60239)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -27580,7 +27595,7 @@ __15:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzJournal = pPtr
 	libc.X__builtin___memcpy_chk(tls, pPtr, zPathname, uint64(nPathname), libc.X__builtin_object_size(tls, pPtr, 0))
 	pPtr += uintptr(nPathname)
-	libc.X__builtin___memcpy_chk(tls, pPtr, ts+4324, uint64(8), libc.X__builtin_object_size(tls, pPtr, 0))
+	libc.X__builtin___memcpy_chk(tls, pPtr, ts+4343, uint64(8), libc.X__builtin_object_size(tls, pPtr, 0))
 	pPtr += uintptr(8 + 1)
 	goto __19
 __18:
@@ -27593,7 +27608,7 @@ __19:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzWal = pPtr
 	libc.X__builtin___memcpy_chk(tls, pPtr, zPathname, uint64(nPathname), libc.X__builtin_object_size(tls, pPtr, 0))
 	pPtr += uintptr(nPathname)
-	libc.X__builtin___memcpy_chk(tls, pPtr, ts+4333, uint64(4), libc.X__builtin_object_size(tls, pPtr, 0))
+	libc.X__builtin___memcpy_chk(tls, pPtr, ts+4352, uint64(4), libc.X__builtin_object_size(tls, pPtr, 0))
 	pPtr += uintptr(4 + 1)
 	goto __21
 __20:
@@ -27645,9 +27660,9 @@ __27:
 	;
 __26:
 	;
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+4338, 0))
+	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+4357, 0))
 	if !(iDc&SQLITE_IOCAP_IMMUTABLE != 0 ||
-		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+4345, 0) != 0) {
+		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+4364, 0) != 0) {
 		goto __30
 	}
 	vfsFlags = vfsFlags | SQLITE_OPEN_READONLY
@@ -27900,7 +27915,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60754)
+	rc = Xsqlite3CantopenError(tls, 60758)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -28006,7 +28021,7 @@ __24:
 }
 
 func pagerUnlockIfUnused(tls *libc.TLS, pPager uintptr) {
-	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 {
+	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) {
 		pagerUnlockAndRollback(tls, pPager)
 	}
 }
@@ -28024,7 +28039,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60967)
+	return Xsqlite3CorruptError(tls, 60971)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -28063,7 +28078,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60999)
+	rc = Xsqlite3CorruptError(tls, 61003)
 	goto pager_acquire_err
 __7:
 	;
@@ -28140,7 +28155,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, 61078)
+		return Xsqlite3CorruptError(tls, 61082)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -28898,7 +28913,7 @@ func Xsqlite3PagerMemUsed(tls *libc.TLS, pPager uintptr) int32 {
 
 // Return the number of references to the specified page.
 func Xsqlite3PagerPageRefcount(tls *libc.TLS, pPage uintptr) int32 {
-	return Xsqlite3PcachePageRefcount(tls, pPage)
+	return int32(Xsqlite3PcachePageRefcount(tls, pPage))
 }
 
 // Parameter eStat must be one of SQLITE_DBSTATUS_CACHE_HIT, _MISS, _WRITE,
@@ -29141,9 +29156,9 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	pPgOld = Xsqlite3PagerLookup(tls, pPager, pgno)
 
 	if pPgOld != 0 {
-		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
+		if (*PgHdr)(unsafe.Pointer(pPgOld)).FnRef > int64(1) {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62623)
+			return Xsqlite3CorruptError(tls, 62627)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -29328,7 +29343,7 @@ func Xsqlite3PagerClearCache(tls *libc.TLS, pPager uintptr) {
 func Xsqlite3PagerCheckpoint(tls *libc.TLS, pPager uintptr, db uintptr, eMode int32, pnLog uintptr, pnCkpt uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal == uintptr(0) && int32((*Pager)(unsafe.Pointer(pPager)).FjournalMode) == PAGER_JOURNALMODE_WAL {
-		Xsqlite3_exec(tls, db, ts+4355, uintptr(0), uintptr(0), uintptr(0))
+		Xsqlite3_exec(tls, db, ts+4374, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal != 0 {
 		rc = Xsqlite3WalCheckpoint(tls, (*Pager)(unsafe.Pointer(pPager)).FpWal, db, eMode,
@@ -29899,7 +29914,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, 64387)
+				return Xsqlite3CorruptError(tls, 64391)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -29998,7 +30013,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64519)
+	rc = Xsqlite3CantopenError(tls, 64523)
 	goto finished
 __7:
 	;
@@ -30166,7 +30181,7 @@ __24:
 		goto __30
 	}
 	Xsqlite3_log(tls, SQLITE_NOTICE|int32(1)<<8,
-		ts+4373,
+		ts+4392,
 		libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 __30:
 	;
@@ -30584,7 +30599,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65333)
+	rc = Xsqlite3CorruptError(tls, 65337)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -30729,7 +30744,7 @@ func walLimitSize(tls *libc.TLS, pWal uintptr, nMax I64) {
 	}
 	Xsqlite3EndBenignMalloc(tls)
 	if rx != 0 {
-		Xsqlite3_log(tls, rx, ts+4410, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
+		Xsqlite3_log(tls, rx, ts+4429, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 	}
 }
 
@@ -30859,7 +30874,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, 65682)
+		rc = Xsqlite3CantopenError(tls, 65686)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -31332,7 +31347,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66419)
+				return Xsqlite3CorruptError(tls, 66423)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -31837,7 +31852,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, 67138)
+			rc = Xsqlite3CorruptError(tls, 67142)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -32230,7 +32245,7 @@ func Xsqlite3BtreeLeaveCursor(tls *libc.TLS, pCur uintptr) {
 	Xsqlite3BtreeLeave(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpBtree)
 }
 
-var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 4436))
+var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 4455))
 
 var sqlite3SharedCacheList uintptr = uintptr(0)
 
@@ -32495,7 +32510,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, 69249)
+			rc = Xsqlite3CorruptError(tls, 69253)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -32632,7 +32647,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69434)
 	return
 __2:
 	;
@@ -32649,7 +32664,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69447)
 	goto ptrmap_exit
 __4:
 	;
@@ -32657,7 +32672,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69452)
 	goto ptrmap_exit
 __5:
 	;
@@ -32700,7 +32715,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, 69493)
+		return Xsqlite3CorruptError(tls, 69497)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -32710,7 +32725,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, 69501)
+		return Xsqlite3CorruptError(tls, 69505)
 	}
 	return SQLITE_OK
 }
@@ -32960,7 +32975,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, 69893)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69897)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -33007,7 +33022,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69951)
+	return Xsqlite3CorruptError(tls, 69955)
 __2:
 	;
 	if !(iFree != 0) {
@@ -33017,7 +33032,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69954)
+	return Xsqlite3CorruptError(tls, 69958)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -33030,7 +33045,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69962)
+	return Xsqlite3CorruptError(tls, 69966)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -33039,14 +33054,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69965)
+	return Xsqlite3CorruptError(tls, 69969)
 __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, 69967)
+	return Xsqlite3CorruptError(tls, 69971)
 __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))
@@ -33056,7 +33071,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69971)
+	return Xsqlite3CorruptError(tls, 69975)
 __11:
 	;
 __8:
@@ -33120,7 +33135,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 70004)
+	return Xsqlite3CorruptError(tls, 70008)
 __22:
 	;
 	size = int32((*struct {
@@ -33130,7 +33145,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 70010)
+	return Xsqlite3CorruptError(tls, 70014)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -33152,7 +33167,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 70024)
+	return Xsqlite3CorruptError(tls, 70028)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -33187,7 +33202,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, 70081)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70085)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -33200,13 +33215,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, 70096)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70100)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70107)
 	}
 	return uintptr(0)
 }
@@ -33231,7 +33246,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, 70152)
+			return Xsqlite3CorruptError(tls, 70156)
 		}
 	}
 
@@ -33242,7 +33257,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, 70170)
+				return Xsqlite3CorruptError(tls, 70174)
 			} else {
 				return SQLITE_OK
 			}
@@ -33294,22 +33309,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 70249)
+				return Xsqlite3CorruptError(tls, 70253)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 70254)
+			return Xsqlite3CorruptError(tls, 70258)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 70266)
+				return Xsqlite3CorruptError(tls, 70270)
 			}
 			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, 70269)
+				return Xsqlite3CorruptError(tls, 70273)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -33319,7 +33334,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, 70282)
+					return Xsqlite3CorruptError(tls, 70286)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -33327,7 +33342,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, 70288)
+			return Xsqlite3CorruptError(tls, 70292)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -33335,10 +33350,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, 70297)
+			return Xsqlite3CorruptError(tls, 70301)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70298)
+			return Xsqlite3CorruptError(tls, 70302)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -33398,7 +33413,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70357)
+			return Xsqlite3CorruptError(tls, 70361)
 		}
 	} else {
 		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
@@ -33434,7 +33449,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70381)
+			return Xsqlite3CorruptError(tls, 70385)
 		}
 	}
 	return SQLITE_OK
@@ -33464,11 +33479,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70432)
+			return Xsqlite3CorruptError(tls, 70436)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70437)
+				return Xsqlite3CorruptError(tls, 70441)
 			}
 			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))))
@@ -33479,15 +33494,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70447)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70451)
+			return Xsqlite3CorruptError(tls, 70455)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70463)
+		return Xsqlite3CorruptError(tls, 70467)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -33515,14 +33530,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, 70494)
+			return Xsqlite3CorruptError(tls, 70498)
 		}
 		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, 70499)
+			return Xsqlite3CorruptError(tls, 70503)
 		}
 	}
 	return SQLITE_OK
@@ -33536,7 +33551,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, 70531)
+		return Xsqlite3CorruptError(tls, 70535)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -33548,7 +33563,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, 70545)
+		return Xsqlite3CorruptError(tls, 70549)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -33651,7 +33666,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70700)
+	rc = Xsqlite3CorruptError(tls, 70704)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -33679,7 +33694,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, 70721)
+	rc = Xsqlite3CorruptError(tls, 70725)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -33718,7 +33733,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, 70787)
+			return Xsqlite3CorruptError(tls, 70791)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -33791,7 +33806,7 @@ func Xsqlite3BtreeOpen(tls *libc.TLS, pVfs uintptr, zFilename uintptr, db uintpt
 	mutexOpen = uintptr(0)
 	rc = SQLITE_OK
 	isTempDb = libc.Bool32(zFilename == uintptr(0) || int32(*(*int8)(unsafe.Pointer(zFilename))) == 0)
-	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4452) == 0 ||
+	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4471) == 0 ||
 		isTempDb != 0 && Xsqlite3TempInMemory(tls, db) != 0 ||
 		vfsFlags&SQLITE_OPEN_MEMORY != 0)
 
@@ -34563,7 +34578,7 @@ __9:
 	;
 __10:
 	;
-	if !(libc.Xmemcmp(tls, page1+21, ts+4461, uint64(3)) != 0) {
+	if !(libc.Xmemcmp(tls, page1+21, ts+4480, uint64(3)) != 0) {
 		goto __14
 	}
 	goto page1_init_failed
@@ -34601,7 +34616,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71722)
+	rc = Xsqlite3CorruptError(tls, 71726)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -35016,7 +35031,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, 72143)
+			return Xsqlite3CorruptError(tls, 72147)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -35042,7 +35057,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, 72162)
+						return Xsqlite3CorruptError(tls, 72166)
 					}
 					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)
@@ -35051,7 +35066,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, 72171)
+					return Xsqlite3CorruptError(tls, 72175)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -35062,7 +35077,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, 72183)
+				return Xsqlite3CorruptError(tls, 72187)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -35078,7 +35093,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, 72218)
+		return Xsqlite3CorruptError(tls, 72222)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -35139,7 +35154,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, 72316)
+			return Xsqlite3CorruptError(tls, 72320)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -35174,7 +35189,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, 72368)
+					return Xsqlite3CorruptError(tls, 72372)
 				}
 			}
 
@@ -35234,7 +35249,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, 72436)
+			rc = Xsqlite3CorruptError(tls, 72440)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -35273,7 +35288,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, 72487)
+			return Xsqlite3CorruptError(tls, 72491)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -35304,7 +35319,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72514)
+			return Xsqlite3CorruptError(tls, 72518)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -35645,7 +35660,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, 72978)
+			return Xsqlite3CorruptError(tls, 72982)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -35889,14 +35904,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, 73385)
+		return Xsqlite3CorruptError(tls, 73389)
 	}
 
 	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, 73400)
+		return Xsqlite3CorruptError(tls, 73404)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -35941,7 +35956,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, 73462)
+				return Xsqlite3CorruptError(tls, 73466)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -35990,7 +36005,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73547)
+		return Xsqlite3CorruptError(tls, 73551)
 	}
 	return rc
 }
@@ -36070,7 +36085,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, 73684)
+		return Xsqlite3CorruptError(tls, 73688)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -36161,7 +36176,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, 73823)
+	return Xsqlite3CorruptError(tls, 73827)
 __11:
 	;
 skip_init:
@@ -36181,7 +36196,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73835)
+	return Xsqlite3CorruptError(tls, 73839)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -36391,7 +36406,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 74077)
+	return Xsqlite3CorruptError(tls, 74081)
 __21:
 	;
 	goto __19
@@ -36595,7 +36610,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 74273)
+	return Xsqlite3CorruptError(tls, 74277)
 __4:
 	;
 	goto bypass_moveto_root
@@ -36660,7 +36675,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, 74360)
+	rc = Xsqlite3CorruptError(tls, 74364)
 	goto moveto_index_finish
 __17:
 	;
@@ -36708,7 +36723,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74392)
+	rc = Xsqlite3CorruptError(tls, 74396)
 __24:
 	;
 	goto moveto_index_finish
@@ -36827,7 +36842,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, 74508)
+		return Xsqlite3CorruptError(tls, 74512)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -36987,7 +37002,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74688)
+	return Xsqlite3CorruptError(tls, 74692)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -37052,7 +37067,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74744)
+	rc = Xsqlite3CorruptError(tls, 74748)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -37088,7 +37103,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74773)
+	rc = Xsqlite3CorruptError(tls, 74777)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -37132,7 +37147,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74807)
+	rc = Xsqlite3CorruptError(tls, 74811)
 	goto end_allocate_page
 __32:
 	;
@@ -37244,7 +37259,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74872)
+	rc = Xsqlite3CorruptError(tls, 74876)
 	goto end_allocate_page
 __51:
 	;
@@ -37402,7 +37417,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, 74999)
+	return Xsqlite3CorruptError(tls, 75003)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -37459,7 +37474,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75050)
 	goto freepage_out
 __10:
 	;
@@ -37475,7 +37490,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75061)
 	goto freepage_out
 __12:
 	;
@@ -37549,7 +37564,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, 75146)
+		return Xsqlite3CorruptError(tls, 75150)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -37561,7 +37576,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, 75163)
+			return Xsqlite3CorruptError(tls, 75167)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -37572,7 +37587,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, 75183)
+			rc = Xsqlite3CorruptError(tls, 75187)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -37737,7 +37752,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, 75436)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75440)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -38016,12 +38031,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, 75737)
+				return Xsqlite3CorruptError(tls, 75741)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75742)
+			return Xsqlite3CorruptError(tls, 75746)
 		}
 
 		pData -= uintptr(sz)
@@ -38029,7 +38044,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, 75748)
+			return Xsqlite3CorruptError(tls, 75752)
 		}
 		libc.X__builtin___memmove_chk(tls, pData, pCell, uint64(sz), libc.X__builtin_object_size(tls, pData, 0))
 
@@ -38089,7 +38104,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, 75833)
+			Xsqlite3CorruptError(tls, 75837)
 			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))
@@ -38178,7 +38193,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75947)
+	return Xsqlite3CorruptError(tls, 75951)
 __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))
@@ -38294,7 +38309,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, 76060)
+		return Xsqlite3CorruptError(tls, 76064)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -38614,7 +38629,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, 76481)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76485)
 	goto balance_cleanup
 __25:
 	;
@@ -38625,7 +38640,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76509)
 	goto balance_cleanup
 __27:
 	;
@@ -38783,7 +38798,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76610)
 	goto balance_cleanup
 __55:
 	;
@@ -38857,7 +38872,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76643)
 	goto balance_cleanup
 __67:
 	;
@@ -38920,7 +38935,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76687)
 	goto balance_cleanup
 __75:
 	;
@@ -38948,7 +38963,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76720)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -39209,7 +39224,7 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76920)
 	goto balance_cleanup
 __121:
 	;
@@ -39399,7 +39414,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, 77146)
+			return Xsqlite3CorruptError(tls, 77150)
 		}
 	}
 	return SQLITE_OK
@@ -39437,7 +39452,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 77206)
+			rc = Xsqlite3CorruptError(tls, 77210)
 		} 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)))
@@ -39543,7 +39558,7 @@ func btreeOverwriteOverflowCell(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, 77370)
+			rc = Xsqlite3CorruptError(tls, 77374)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -39568,7 +39583,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 
 	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)
+		return Xsqlite3CorruptError(tls, 77402)
 	}
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
 		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
@@ -39638,7 +39653,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77479)
+	return Xsqlite3CorruptError(tls, 77483)
 __3:
 	;
 __1:
@@ -39751,7 +39766,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77606)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -39811,6 +39826,7 @@ __30:
 __25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
+	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
 		goto __31
 	}
@@ -39818,7 +39834,7 @@ __25:
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
 		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77640)
+	return Xsqlite3CorruptError(tls, 77645)
 __33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
@@ -39856,13 +39872,13 @@ __37:
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77667)
+	return Xsqlite3CorruptError(tls, 77672)
 __39:
 	;
 	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __40
 	}
-	return Xsqlite3CorruptError(tls, 77670)
+	return Xsqlite3CorruptError(tls, 77675)
 __40:
 	;
 	libc.X__builtin___memcpy_chk(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))), libc.X__builtin_object_size(tls, oldCell, 0))
@@ -39893,7 +39909,6 @@ __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 __44
 	}
@@ -39968,7 +39983,7 @@ 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, 77773)
+		return Xsqlite3CorruptError(tls, 77777)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
@@ -39993,7 +40008,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, 77798)
+				return Xsqlite3CorruptError(tls, 77802)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -40094,7 +40109,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77894)
+			return Xsqlite3CorruptError(tls, 77898)
 		}
 	}
 
@@ -40102,11 +40117,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, 77903)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 	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, 77907)
+		return Xsqlite3CorruptError(tls, 77911)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -40181,7 +40196,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, 77998)
+			return Xsqlite3CorruptError(tls, 78002)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -40250,7 +40265,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, 78114)
+			return Xsqlite3CorruptError(tls, 78118)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -40279,7 +40294,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, 78162)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78166)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -40355,7 +40370,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 78252)
+	return Xsqlite3CorruptError(tls, 78256)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -40369,7 +40384,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, 78259)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78263)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -40503,7 +40518,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, 78363)
+		return Xsqlite3CorruptError(tls, 78367)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -40720,7 +40735,7 @@ 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+64, ts+4465, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4484, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
 		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
@@ -40745,11 +40760,11 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 	defer tls.Free(16)
 
 	if iPage > (*IntegrityCk)(unsafe.Pointer(pCheck)).FnPage || iPage == Pgno(0) {
-		checkAppendMsg(tls, pCheck, ts+4467, libc.VaList(bp, iPage))
+		checkAppendMsg(tls, pCheck, ts+4486, libc.VaList(bp, iPage))
 		return 1
 	}
 	if getPageReferenced(tls, pCheck, iPage) != 0 {
-		checkAppendMsg(tls, pCheck, ts+4490, libc.VaList(bp+8, iPage))
+		checkAppendMsg(tls, pCheck, ts+4509, libc.VaList(bp+8, iPage))
 		return 1
 	}
 	setPageReferenced(tls, pCheck, iPage)
@@ -40767,13 +40782,13 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
 			checkOom(tls, pCheck)
 		}
-		checkAppendMsg(tls, pCheck, ts+4515, libc.VaList(bp, iChild))
+		checkAppendMsg(tls, pCheck, ts+4534, libc.VaList(bp, iChild))
 		return
 	}
 
 	if int32(*(*U8)(unsafe.Pointer(bp + 48))) != int32(eType) || *(*Pgno)(unsafe.Pointer(bp + 52)) != iParent {
 		checkAppendMsg(tls, pCheck,
-			ts+4544,
+			ts+4563,
 			libc.VaList(bp+8, iChild, int32(eType), iParent, int32(*(*U8)(unsafe.Pointer(bp + 48))), *(*Pgno)(unsafe.Pointer(bp + 52))))
 	}
 }
@@ -40792,7 +40807,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 		}
 		N--
 		if Xsqlite3PagerGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpPager, iPage, bp+40, 0) != 0 {
-			checkAppendMsg(tls, pCheck, ts+4598, libc.VaList(bp, iPage))
+			checkAppendMsg(tls, pCheck, ts+4617, libc.VaList(bp, iPage))
 			break
 		}
 		pOvflData = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
@@ -40803,7 +40818,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 			}
 			if n > (*BtShared)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt)).FusableSize/U32(4)-U32(2) {
 				checkAppendMsg(tls, pCheck,
-					ts+4620, libc.VaList(bp+8, iPage))
+					ts+4639, libc.VaList(bp+8, iPage))
 				N--
 			} else {
 				for i = 0; i < int32(n); i++ {
@@ -40826,12 +40841,12 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 	}
 	if N != 0 && nErrAtStart == (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr {
 		checkAppendMsg(tls, pCheck,
-			ts+4659,
+			ts+4678,
 			libc.VaList(bp+16, func() uintptr {
 				if isFreeList != 0 {
-					return ts + 4685
+					return ts + 4704
 				}
-				return ts + 4690
+				return ts + 4709
 			}(),
 				expected-N, expected))
 	}
@@ -40947,13 +40962,13 @@ __2:
 	return 0
 __3:
 	;
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4711
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4730
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
 		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4721, libc.VaList(bp, rc))
+		ts+4740, libc.VaList(bp, rc))
 	goto end_of_check
 __4:
 	;
@@ -40964,7 +40979,7 @@ __4:
 	}
 
 	checkAppendMsg(tls, pCheck,
-		ts+4759, libc.VaList(bp+8, rc))
+		ts+4778, libc.VaList(bp+8, rc))
 	goto end_of_check
 __5:
 	;
@@ -40972,14 +40987,14 @@ __5:
 		goto __6
 	}
 
-	checkAppendMsg(tls, pCheck, ts+4797, libc.VaList(bp+16, rc))
+	checkAppendMsg(tls, pCheck, ts+4816, libc.VaList(bp+16, rc))
 	goto end_of_check
 __6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
 
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4819
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4838
 	contentOffset = U32((int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5))))<<8|int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5) + 1)))-1)&0xffff + 1)
 
 	nCell = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3) + 1)))
@@ -40996,7 +41011,7 @@ __6:
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
 		goto __9
 	}
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4845
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4864
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
 __9:
 	;
@@ -41021,7 +41036,7 @@ __10:
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
 		goto __13
 	}
-	checkAppendMsg(tls, pCheck, ts+4873,
+	checkAppendMsg(tls, pCheck, ts+4892,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
 	goto __11
@@ -41034,7 +41049,7 @@ __13:
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
 		goto __14
 	}
-	checkAppendMsg(tls, pCheck, ts+4903, 0)
+	checkAppendMsg(tls, pCheck, ts+4922, 0)
 	doCoverageCheck = 0
 	goto __11
 __14:
@@ -41050,7 +41065,7 @@ __14:
 	}() != 0) {
 		goto __16
 	}
-	checkAppendMsg(tls, pCheck, ts+4927, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
+	checkAppendMsg(tls, pCheck, ts+4946, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
 __16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
@@ -41088,7 +41103,7 @@ __21:
 	if !(d2 != depth) {
 		goto __22
 	}
-	checkAppendMsg(tls, pCheck, ts+4951, 0)
+	checkAppendMsg(tls, pCheck, ts+4970, 0)
 	depth = d2
 __22:
 	;
@@ -41161,7 +41176,7 @@ __30:
 		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4976, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
+		ts+4995, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
 	goto __31
 	goto __33
 __32:
@@ -41178,7 +41193,7 @@ __31:
 		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+5013,
+		ts+5032,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
 __34:
 	;
@@ -41292,7 +41307,7 @@ __6:
 	if !(bCkFreelist != 0) {
 		goto __7
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 5065
+	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 5084
 	checkList(tls, bp+32, 1, Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+32),
 		Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
@@ -41328,7 +41343,7 @@ __13:
 		goto __15
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+5081,
+		ts+5100,
 		libc.VaList(bp, mx, mxInHdr))
 __15:
 	;
@@ -41338,7 +41353,7 @@ __9:
 		goto __16
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+5126, 0)
+		ts+5145, 0)
 __16:
 	;
 __10:
@@ -41385,13 +41400,13 @@ __23:
 	if !(getPageReferenced(tls, bp+32, i) == 0 && (ptrmapPageno(tls, pBt, i) != i || !(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0))) {
 		goto __26
 	}
-	checkAppendMsg(tls, bp+32, ts+5181, libc.VaList(bp+16, i))
+	checkAppendMsg(tls, bp+32, ts+5200, libc.VaList(bp+16, i))
 __26:
 	;
 	if !(getPageReferenced(tls, bp+32, i) != 0 && (ptrmapPageno(tls, pBt, i) == i && (*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0)) {
 		goto __27
 	}
-	checkAppendMsg(tls, bp+32, ts+5203, libc.VaList(bp+24, i))
+	checkAppendMsg(tls, bp+32, ts+5222, libc.VaList(bp+24, i))
 __27:
 	;
 	goto __24
@@ -41654,7 +41669,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 		var rc int32 = 0
 		Xsqlite3ParseObjectInit(tls, bp+16, pDb)
 		if Xsqlite3OpenTempDatabase(tls, bp+16) != 0 {
-			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3658, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3677, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 			rc = SQLITE_ERROR
 		}
 		Xsqlite3DbFree(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
@@ -41665,7 +41680,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 	}
 
 	if i < 0 {
-		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+5237, libc.VaList(bp+8, zDb))
+		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+5256, libc.VaList(bp+8, zDb))
 		return uintptr(0)
 	}
 
@@ -41680,7 +41695,7 @@ func setDestPgsz(tls *libc.TLS, p uintptr) int32 {
 
 func checkReadTransaction(tls *libc.TLS, db uintptr, p uintptr) int32 {
 	if Xsqlite3BtreeTxnState(tls, p) != SQLITE_TXN_NONE {
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+5257, 0)
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+5276, 0)
 		return SQLITE_ERROR
 	}
 	return SQLITE_OK
@@ -41700,7 +41715,7 @@ func Xsqlite3_backup_init(tls *libc.TLS, pDestDb uintptr, zDestDb uintptr, pSrcD
 
 	if pSrcDb == pDestDb {
 		Xsqlite3ErrorWithMsg(tls,
-			pDestDb, SQLITE_ERROR, ts+5288, 0)
+			pDestDb, SQLITE_ERROR, ts+5307, 0)
 		p = uintptr(0)
 	} else {
 		p = Xsqlite3MallocZero(tls, uint64(unsafe.Sizeof(Sqlite3_backup{})))
@@ -42148,7 +42163,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 		(*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,
+		Xsqlite3_str_appendf(tls, bp+8, ts+5347,
 			libc.VaList(bp, func() float64 {
 				if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_IntReal != 0 {
 					return float64(*(*I64)(unsafe.Pointer(p)))
@@ -42740,7 +42755,7 @@ func Xsqlite3VdbeMemSetPointer(tls *libc.TLS, pMem uintptr, pPtr uintptr, zPType
 		if zPType != 0 {
 			return zPType
 		}
-		return ts + 1547
+		return ts + 1566
 	}()
 	(*Mem)(unsafe.Pointer(pMem)).Fz = pPtr
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null | MEM_Dyn | MEM_Subtype | MEM_Term)
@@ -42972,7 +42987,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, 81630)
+		return Xsqlite3CorruptError(tls, 81634)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -43204,7 +43219,7 @@ __9:
 		goto __10
 	}
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 8)).FisError
-	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3658, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
+	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3677, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
 	goto __11
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
@@ -43257,7 +43272,7 @@ func valueFromExpr(tls *libc.TLS, db uintptr, pExpr uintptr, enc U8, affinity U8
 	zVal = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	negInt = 1
-	zNeg = ts + 1547
+	zNeg = ts + 1566
 	rc = SQLITE_OK
 
 __1:
@@ -43298,7 +43313,7 @@ __4:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
 	negInt = -1
-	zNeg = ts + 5335
+	zNeg = ts + 5354
 __6:
 	;
 	if !(op == TK_STRING || op == TK_FLOAT || op == TK_INTEGER) {
@@ -43317,7 +43332,7 @@ __9:
 	Xsqlite3VdbeMemSetInt64(tls, *(*uintptr)(unsafe.Pointer(bp + 16)), I64(*(*int32)(unsafe.Pointer(pExpr + 8)))*I64(negInt))
 	goto __11
 __10:
-	zVal = Xsqlite3MPrintf(tls, db, ts+5337, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+	zVal = Xsqlite3MPrintf(tls, db, ts+5356, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	if !(zVal == uintptr(0)) {
 		goto __12
 	}
@@ -43621,7 +43636,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, 82270)
+		return Xsqlite3CorruptError(tls, 82274)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -43636,14 +43651,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 82276)
+			return Xsqlite3CorruptError(tls, 82280)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 82282)
+		return Xsqlite3CorruptError(tls, 82286)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -44651,34 +44666,34 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var j int32
 			var pKeyInfo uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+5342, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+5361, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
 			for j = 0; j < int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField); j++ {
 				var pColl uintptr = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(j)*8))
 				var zColl uintptr
 				if pColl != 0 {
 					zColl = (*CollSeq)(unsafe.Pointer(pColl)).FzName
 				} else {
-					zColl = ts + 1547
+					zColl = ts + 1566
 				}
-				if libc.Xstrcmp(tls, zColl, ts+1092) == 0 {
-					zColl = ts + 5347
+				if libc.Xstrcmp(tls, zColl, ts+1111) == 0 {
+					zColl = ts + 5366
 				}
-				Xsqlite3_str_appendf(tls, bp+144, ts+5349,
+				Xsqlite3_str_appendf(tls, bp+144, ts+5368,
 					libc.VaList(bp+8, func() uintptr {
 						if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_DESC != 0 {
-							return ts + 5335
+							return ts + 5354
 						}
-						return ts + 1547
+						return ts + 1566
 					}(),
 						func() uintptr {
 							if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_BIGNULL != 0 {
-								return ts + 5357
+								return ts + 5376
 							}
-							return ts + 1547
+							return ts + 1566
 						}(),
 						zColl))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+5360, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+5379, 1)
 			break
 
 		}
@@ -44686,7 +44701,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 		{
 			var pColl uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+5362, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
+			Xsqlite3_str_appendf(tls, bp+144, ts+5381, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
 				encnames[(*CollSeq)(unsafe.Pointer(pColl)).Fenc]))
 			break
 
@@ -44694,32 +44709,32 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -7:
 		{
 			var pDef uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
-			Xsqlite3_str_appendf(tls, bp+144, ts+5371, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+5390, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -15:
 		{
 			var pDef uintptr = (*Sqlite3_context)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpFunc
-			Xsqlite3_str_appendf(tls, bp+144, ts+5371, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+5390, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -13:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1327, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1346, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
 	case -3:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+5378, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+5397, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
 			break
 
 		}
 	case -12:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1321, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1340, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
@@ -44729,13 +44744,13 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Str != 0 {
 				zP4 = (*Mem)(unsafe.Pointer(pMem)).Fz
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1327, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1346, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1321, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1340, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Null != 0 {
-				zP4 = ts + 1548
+				zP4 = ts + 1567
 			} else {
-				zP4 = ts + 5381
+				zP4 = ts + 5400
 			}
 			break
 
@@ -44743,7 +44758,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -11:
 		{
 			var pVtab uintptr = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-			Xsqlite3_str_appendf(tls, bp+144, ts+5388, libc.VaList(bp+120, pVtab))
+			Xsqlite3_str_appendf(tls, bp+144, ts+5407, libc.VaList(bp+120, pVtab))
 			break
 
 		}
@@ -44754,20 +44769,20 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var n U32 = *(*U32)(unsafe.Pointer(ai))
 
 			for i = U32(1); i <= n; i++ {
-				Xsqlite3_str_appendf(tls, bp+144, ts+5396, libc.VaList(bp+128, func() int32 {
+				Xsqlite3_str_appendf(tls, bp+144, ts+5415, libc.VaList(bp+128, func() int32 {
 					if i == U32(1) {
 						return '['
 					}
 					return ','
 				}(), *(*U32)(unsafe.Pointer(ai + uintptr(i)*4))))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+5401, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+5420, 1)
 			break
 
 		}
 	case -4:
 		{
-			zP4 = ts + 5403
+			zP4 = ts + 5422
 			break
 
 		}
@@ -44792,7 +44807,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	return Xsqlite3StrAccumFinish(tls, bp+144)
 }
 
-var encnames = [4]uintptr{ts + 5411, ts + 5413, ts + 5415, ts + 5420}
+var encnames = [4]uintptr{ts + 5430, ts + 5432, ts + 5434, ts + 5439}
 
 // Declare to the Vdbe that the BTree object at db->aDb[i] is used.
 //
@@ -45242,8 +45257,8 @@ func Xsqlite3VdbeMakeReady(tls *libc.TLS, p uintptr, pParse uintptr) {
 }
 
 var azColName = [12]uintptr{
-	ts + 5425, ts + 5430, ts + 5437, ts + 5440, ts + 5443, ts + 5446, ts + 5449, ts + 5452,
-	ts + 5460, ts + 5463, ts + 5470, ts + 5478,
+	ts + 5444, ts + 5449, ts + 5456, ts + 5459, ts + 5462, ts + 5465, ts + 5468, ts + 5471,
+	ts + 5479, ts + 5482, ts + 5489, ts + 5497,
 }
 
 // Close a VDBE cursor and release all the resources that cursor
@@ -45452,7 +45467,7 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		var nMainFile int32
 
 		nMainFile = Xsqlite3Strlen30(tls, zMainFile)
-		zSuper = Xsqlite3MPrintf(tls, db, ts+5485, libc.VaList(bp, 0, zMainFile, 0))
+		zSuper = Xsqlite3MPrintf(tls, db, ts+5504, libc.VaList(bp, 0, zMainFile, 0))
 		if zSuper == uintptr(0) {
 			return SQLITE_NOMEM
 		}
@@ -45460,16 +45475,16 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		for __ccgo := true; __ccgo; __ccgo = rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 60)) != 0 {
 			if retryCount != 0 {
 				if retryCount > 100 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5497, libc.VaList(bp+24, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5516, libc.VaList(bp+24, zSuper))
 					Xsqlite3OsDelete(tls, pVfs, zSuper, 0)
 					break
 				} else if retryCount == 1 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5511, libc.VaList(bp+32, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5530, libc.VaList(bp+32, zSuper))
 				}
 			}
 			retryCount++
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
-			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5526,
+			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5545,
 				libc.VaList(bp+40, *(*U32)(unsafe.Pointer(bp + 56))>>8&U32(0xffffff), *(*U32)(unsafe.Pointer(bp + 56))&U32(0xff)))
 
 			rc = Xsqlite3OsAccess(tls, pVfs, zSuper, SQLITE_ACCESS_EXISTS, bp+60)
@@ -45615,7 +45630,7 @@ func Xsqlite3VdbeCheckFk(tls *libc.TLS, p uintptr, deferred int32) int32 {
 		!(deferred != 0) && (*Vdbe)(unsafe.Pointer(p)).FnFkConstraint > int64(0) {
 		(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_CONSTRAINT | int32(3)<<8
 		(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
-		Xsqlite3VdbeError(tls, p, ts+5539, 0)
+		Xsqlite3VdbeError(tls, p, ts+5558, 0)
 		if int32((*Vdbe)(unsafe.Pointer(p)).FprepFlags)&SQLITE_PREPARE_SAVESQL == 0 {
 			return SQLITE_ERROR
 		}
@@ -45947,7 +45962,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 86058)
+		return Xsqlite3CorruptError(tls, 86062)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -46498,7 +46513,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86989))
 		return 0
 	}
 
@@ -46563,7 +46578,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, 87062))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87066))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -46597,7 +46612,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, 87092))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87096))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -46647,7 +46662,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, 87136))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87140))
 			return 0
 		}
 	}
@@ -46793,7 +46808,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87303))
 	return 0
 __7:
 	;
@@ -46964,7 +46979,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87457)
+	return Xsqlite3CorruptError(tls, 87461)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -46990,7 +47005,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, 87490)
+		return Xsqlite3CorruptError(tls, 87494)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -47101,13 +47116,13 @@ func Xsqlite3NotPureFunc(tls *libc.TLS, pCtx uintptr) int32 {
 		var zContext uintptr
 		var zMsg uintptr
 		if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_IsCheck != 0 {
-			zContext = ts + 5569
-		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5588
-		} else {
+		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5607
+		} else {
+			zContext = ts + 5626
 		}
-		zMsg = Xsqlite3_mprintf(tls, ts+5616,
+		zMsg = Xsqlite3_mprintf(tls, ts+5635,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx)).FpFunc)).FzName, zContext))
 		Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 		Xsqlite3_free(tls, zMsg)
@@ -47212,7 +47227,7 @@ func Xsqlite3_expired(tls *libc.TLS, pStmt uintptr) int32 {
 
 func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 	if (*Vdbe)(unsafe.Pointer(p)).Fdb == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5652, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5671, 0)
 		return 1
 	} else {
 		return 0
@@ -47222,7 +47237,7 @@ func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 
 func vdbeSafetyNotNull(tls *libc.TLS, p uintptr) int32 {
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5697, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5716, 0)
 		return 1
 	} else {
 		return vdbeSafety(tls, p)
@@ -47264,7 +47279,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, 87854)
+			return Xsqlite3MisuseError(tls, 87858)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -47687,7 +47702,7 @@ func Xsqlite3_result_error_code(tls *libc.TLS, pCtx uintptr, errCode int32) {
 // Force an SQLITE_TOOBIG error.
 func Xsqlite3_result_error_toobig(tls *libc.TLS, pCtx uintptr) {
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FisError = SQLITE_TOOBIG
-	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5737, int64(-1),
+	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5756, int64(-1),
 		uint8(SQLITE_UTF8), uintptr(0))
 }
 
@@ -47879,7 +47894,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88544)
+		return Xsqlite3MisuseError(tls, 88548)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -48399,15 +48414,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 89208)
+		return Xsqlite3MisuseError(tls, 89212)
 	}
 	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+5760, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 89216)
+			ts+5779, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89220)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -48812,7 +48827,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, 89707)
+	rc = Xsqlite3MisuseError(tls, 89711)
 	goto preupdate_old_out
 __1:
 	;
@@ -48956,7 +48971,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, 89809)
+	rc = Xsqlite3MisuseError(tls, 89813)
 	goto preupdate_new_out
 __1:
 	;
@@ -49128,7 +49143,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+5800, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5819, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -49164,11 +49179,11 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 
 			pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr(*(*int32)(unsafe.Pointer(bp + 84))-1)*56
 			if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Null != 0 {
-				Xsqlite3_str_append(tls, bp+48, ts+1548, 4)
+				Xsqlite3_str_append(tls, bp+48, ts+1567, 4)
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+1327, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+1346, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+5328, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5347, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Str != 0 {
 				var nOut int32
 				var enc U8 = (*Sqlite3)(unsafe.Pointer(db)).Fenc
@@ -49183,21 +49198,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+5804, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5823, 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+5811, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5830, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5824, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5843, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					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_appendf(tls, bp+48, ts+5846, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5832, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5851, 1)
 			}
 		}
 	}
@@ -49400,10 +49415,6 @@ func filterHash(tls *libc.TLS, aMem uintptr, pOp uintptr) U64 {
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Real != 0 {
 			h = h + U64(Xsqlite3VdbeIntValue(tls, p))
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&(MEM_Str|MEM_Blob) != 0 {
-			h = h + U64((*Mem)(unsafe.Pointer(p)).Fn)
-			if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Zero != 0 {
-				h = h + U64(*(*int32)(unsafe.Pointer(p)))
-			}
 		}
 	}
 	return h
@@ -49414,11 +49425,11 @@ func vdbeMemTypeName(tls *libc.TLS, pMem uintptr) uintptr {
 }
 
 var azTypes = [5]uintptr{
-	ts + 1108,
-	ts + 1120,
-	ts + 1125,
-	ts + 1103,
-	ts + 1548,
+	ts + 1127,
+	ts + 1139,
+	ts + 1144,
+	ts + 1122,
+	ts + 1567,
 }
 
 // Execute as much of a VDBE program as we can.
@@ -50461,20 +50472,20 @@ __202:
 		goto __205
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5834, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	Xsqlite3VdbeError(tls, p, ts+5853, 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))))
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5874, 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))))
+	Xsqlite3VdbeError(tls, p, ts+3677, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	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))
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5881, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 __204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
@@ -52052,7 +52063,7 @@ op_column_corrupt:
 	goto __9
 	goto __425
 __424:
-	rc = Xsqlite3CorruptError(tls, 93317)
+	rc = Xsqlite3CorruptError(tls, 93320)
 	goto abort_due_to_error
 __425:
 	;
@@ -52180,7 +52191,7 @@ __428:
 	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5886,
+	Xsqlite3VdbeError(tls, p, ts+5905,
 		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
@@ -52612,7 +52623,7 @@ __78:
 		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5927, 0)
+	Xsqlite3VdbeError(tls, p, ts+5946, 0)
 	rc = SQLITE_BUSY
 	goto __523
 __522:
@@ -52672,7 +52683,7 @@ __530:
 	if !!(pSavepoint != 0) {
 		goto __531
 	}
-	Xsqlite3VdbeError(tls, p, ts+5978, libc.VaList(bp+88, zName))
+	Xsqlite3VdbeError(tls, p, ts+5997, libc.VaList(bp+88, zName))
 	rc = SQLITE_ERROR
 	goto __532
 __531:
@@ -52681,7 +52692,7 @@ __531:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+6000, 0)
+		ts+6019, 0)
 	rc = SQLITE_BUSY
 	goto __534
 __533:
@@ -52867,7 +52878,7 @@ __564:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+6054, 0)
+		ts+6073, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
 	goto __567
@@ -52910,13 +52921,13 @@ __562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 6109
+				return ts + 6128
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 6157
+					return ts + 6176
 				}
-				return ts + 6200
+				return ts + 6219
 			}()
 		}(), 0)
 
@@ -52999,7 +53010,7 @@ __576:
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+6241)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+6260)
 
 	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 __583
@@ -53203,7 +53214,7 @@ __88:
 	}
 
 	(*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
+	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1566
 __602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -53812,7 +53823,7 @@ notExistsWithKey:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
 		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95560)
+	rc = Xsqlite3CorruptError(tls, 95563)
 	goto __683
 __682:
 	goto jump_to_p2
@@ -54590,7 +54601,7 @@ __767:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
 		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+6269)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96638, ts+6288)
 	goto abort_due_to_error
 __770:
 	;
@@ -54700,7 +54711,7 @@ __780:
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
 		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96840)
+	rc = Xsqlite3CorruptError(tls, 96843)
 	goto abort_due_to_error
 __781:
 	;
@@ -54861,14 +54872,14 @@ __141:
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	goto __799
 __798:
-	zSchema = ts + 6286
+	zSchema = ts + 6305
 	(*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+6300,
+		ts+6319,
 		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 __800
@@ -54894,7 +54905,7 @@ __802:
 		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 97092)
+	rc = Xsqlite3CorruptError(tls, 97095)
 __803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
@@ -55084,7 +55095,7 @@ __820:
 		goto __825
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+6343, 0)
+	Xsqlite3VdbeError(tls, p, ts+6362, 0)
 	goto abort_due_to_error
 __825:
 	;
@@ -55396,7 +55407,7 @@ __860:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
 		goto __862
 	}
-	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
+	Xsqlite3VdbeError(tls, p, ts+3677, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
 __862:
 	;
@@ -55446,7 +55457,7 @@ __867:
 	if !(rc != 0) {
 		goto __868
 	}
-	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
+	Xsqlite3VdbeError(tls, p, ts+3677, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
 __868:
 	;
@@ -55528,12 +55539,12 @@ __876:
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+6380,
+		ts+6399,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6432
+				return ts + 6451
 			}
-			return ts + 6437
+			return ts + 6456
 		}()))
 	goto abort_due_to_error
 	goto __879
@@ -55675,7 +55686,7 @@ __171:
 		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6444, libc.VaList(bp+144, z1))
+	Xsqlite3VdbeError(tls, p, ts+6463, libc.VaList(bp+144, z1))
 __894:
 	;
 	goto abort_due_to_error
@@ -55793,7 +55804,7 @@ __904:
 	(*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+6473, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6492, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
 	goto __9
 
 __177:
@@ -55882,7 +55893,7 @@ __912:
 	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)))
+	Xsqlite3VdbeError(tls, p, ts+3677, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
 __913:
 	;
@@ -56112,7 +56123,7 @@ __935:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
 		goto __940
 	}
-	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
+	Xsqlite3VdbeError(tls, p, ts+3677, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
 __940:
 	;
@@ -56188,7 +56199,7 @@ __945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
 		goto __947
 	}
-	z3 = Xsqlite3MPrintf(tls, db, ts+6483, libc.VaList(bp+168, zTrace))
+	z3 = Xsqlite3MPrintf(tls, db, ts+6502, 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)
@@ -56261,7 +56272,7 @@ __955:
 	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __957
 	}
-	rc = Xsqlite3CorruptError(tls, 99031)
+	rc = Xsqlite3CorruptError(tls, 99034)
 __957:
 	;
 __956:
@@ -56269,13 +56280,13 @@ __956:
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
 		goto __958
 	}
-	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
+	Xsqlite3VdbeError(tls, p, ts+3677, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
 __958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
 
-	Xsqlite3_log(tls, rc, ts+6489,
+	Xsqlite3_log(tls, rc, ts+6508,
 		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 __959
@@ -56331,13 +56342,13 @@ __966:
 	return rc
 
 too_big:
-	Xsqlite3VdbeError(tls, p, ts+5737, 0)
+	Xsqlite3VdbeError(tls, p, ts+5756, 0)
 	rc = SQLITE_TOOBIG
 	goto abort_due_to_error
 
 no_mem:
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3VdbeError(tls, p, ts+1483, 0)
+	Xsqlite3VdbeError(tls, p, ts+1502, 0)
 	rc = SQLITE_NOMEM
 	goto abort_due_to_error
 
@@ -56348,8 +56359,8 @@ abort_due_to_interrupt:
 	return int32(0)
 }
 
-var azType = [4]uintptr{ts + 6521, ts + 6530, ts + 6537,
-	ts + 6543}
+var azType = [4]uintptr{ts + 6540, ts + 6549, ts + 6556,
+	ts + 6562}
 var and_logic = [9]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(1), uint8(2), uint8(0), uint8(2), uint8(2)}
 var or_logic = [9]uint8{uint8(0), uint8(1), uint8(2), uint8(1), uint8(1), uint8(1), uint8(2), uint8(1), uint8(2)}
 var aMask = [12]uint8{
@@ -56404,16 +56415,16 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		}
 
 		if type1 < U32(12) {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6555,
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6574,
 				libc.VaList(bp, func() uintptr {
 					if type1 == U32(0) {
-						return ts + 6584
+						return ts + 6603
 					}
 					return func() uintptr {
 						if type1 == U32(7) {
-							return ts + 6589
+							return ts + 6608
 						}
-						return ts + 6594
+						return ts + 6613
 					}()
 				}()))
 			rc = SQLITE_ERROR
@@ -56433,10 +56444,10 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		rc = Xsqlite3_finalize(tls, (*Incrblob)(unsafe.Pointer(p)).FpStmt)
 		(*Incrblob)(unsafe.Pointer(p)).FpStmt = uintptr(0)
 		if rc == SQLITE_OK {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6602, libc.VaList(bp+8, iRow))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6621, libc.VaList(bp+8, iRow))
 			rc = SQLITE_ERROR
 		} else {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3658, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3677, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
 		}
 	}
 
@@ -56496,21 +56507,21 @@ __3:
 		goto __4
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6622, libc.VaList(bp, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6641, libc.VaList(bp, zTable))
 __4:
 	;
 	if !(pTab != 0 && !((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0))) {
 		goto __5
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6652, libc.VaList(bp+8, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6671, libc.VaList(bp+8, zTable))
 __5:
 	;
 	if !(pTab != 0 && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __6
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6688, libc.VaList(bp+16, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6707, libc.VaList(bp+16, zTable))
 __6:
 	;
 	if !!(pTab != 0) {
@@ -56554,7 +56565,7 @@ __11:
 		goto __13
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6709, libc.VaList(bp+24, zColumn))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6728, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -56581,7 +56592,7 @@ __19:
 	if !((*sColMap)(unsafe.Pointer(pFKey+64+uintptr(j)*16)).FiFrom == iCol) {
 		goto __22
 	}
-	zFault = ts + 6730
+	zFault = ts + 6749
 __22:
 	;
 	goto __20
@@ -56614,7 +56625,7 @@ __26:
 	if !(int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == iCol || int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == -2) {
 		goto __29
 	}
-	zFault = ts + 6742
+	zFault = ts + 6761
 __29:
 	;
 	goto __27
@@ -56635,7 +56646,7 @@ __25:
 		goto __30
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6750, libc.VaList(bp+32, zFault))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6769, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -56733,7 +56744,7 @@ __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
-			return ts + 3658
+			return ts + 3677
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
@@ -56781,7 +56792,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99516)
+		return Xsqlite3MisuseError(tls, 99519)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -56864,7 +56875,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99616)
+		return Xsqlite3MisuseError(tls, 99619)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -56877,7 +56888,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 				if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-					return ts + 3658
+					return ts + 3677
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
@@ -59406,25 +59417,25 @@ 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 {
+	if Xsqlite3_strnicmp(tls, zTab, ts+6803, 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 {
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6811+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6830+7) == 0 {
 			return 1
 		}
 		if pSchema == uintptr(0) {
 			return 0
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6286+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6305+7) == 0 {
 			return 1
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6830+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6849+7) == 0 {
 			return 1
 		}
 	} else {
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6830+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6849+7) == 0 {
 			return 1
 		}
 	}
@@ -59504,7 +59515,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6844, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6863, zDb) == 0) {
 		goto __8
 	}
 
@@ -59625,7 +59636,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6849) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6868) != 0) {
 		goto __33
 	}
 	goto __14
@@ -59799,14 +59810,14 @@ __60:
 	;
 	goto __59
 __58:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6851, zTab) == 0) {
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6870, zTab) == 0) {
 		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
 	goto __62
 __61:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6855, zTab) == 0) {
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6874, zTab) == 0) {
 		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
@@ -59823,7 +59834,7 @@ __57:
 		goto __64
 	}
 	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6859, zTab) == 0) {
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6878, zTab) == 0) {
 		goto __65
 	}
 	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
@@ -59982,7 +59993,7 @@ __86:
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
 		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6868, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6887, libc.VaList(bp, zAs))
 	return WRC_Abort
 __90:
 	;
@@ -59990,14 +60001,14 @@ __90:
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
 		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6899, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6918, libc.VaList(bp+8, zAs))
 	return WRC_Abort
 __91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
 		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6936, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6955, 0)
 	return WRC_Abort
 __92:
 	;
@@ -60049,7 +60060,7 @@ __11:
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6954, libc.VaList(bp+16, zCol))
+		ts+6973, 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
@@ -60086,7 +60097,7 @@ __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 + 6989
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7008
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
@@ -60099,23 +60110,23 @@ __101:
 __99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6998
+		zErr = ts + 7017
 	} else {
-		zErr = ts + 7013
+		zErr = ts + 7032
 	}
 	if !(zDb != 0) {
 		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7035, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+7054, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
 	goto __105
 __104:
 	if !(zTab != 0) {
 		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7048, libc.VaList(bp+56, zErr, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+7067, libc.VaList(bp+56, zErr, zTab, zCol))
 	goto __107
 __106:
-	Xsqlite3ErrorMsg(tls, pParse, ts+7058, libc.VaList(bp+80, zErr, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+7077, libc.VaList(bp+80, zErr, zCol))
 __107:
 	;
 __105:
@@ -60218,15 +60229,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 + 7065
+	var zIn uintptr = ts + 7084
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 7093
+		zIn = ts + 7112
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 7111
+		zIn = ts + 7130
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 7129
+		zIn = ts + 7148
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7147, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+7166, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -60304,14 +60315,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 + 7167
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
-				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7172
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
-				}
-				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
+				*(*int32)(unsafe.Pointer(pExpr + 8)) = libc.Bool32(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL)
+				*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IntValue)
+				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_INTEGER)
+
 				i = 0
 				p = pNC
 			__4:
@@ -60355,7 +60362,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+7178, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7186, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -60419,7 +60426,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+7195, libc.VaList(bp, pExpr))
+								ts+7203, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -60435,7 +60442,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+7259,
+							Xsqlite3ErrorMsg(tls, pParse, ts+7267,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -60449,7 +60456,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+7295, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+7303, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -60472,30 +60479,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+7323, libc.VaList(bp+16, pExpr))
+						ts+7331, 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 + 7366
+						zType = ts + 7374
 					} else {
-						zType = ts + 7373
+						zType = ts + 7381
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+7383, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7391, 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+7411, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7419, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7433,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7441,
 						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+7477,
+						ts+7485,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -60567,15 +60574,15 @@ 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+7525, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7533, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
 
 				if nRef != (*NameContext)(unsafe.Pointer(pNC)).FnRef {
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_VarSelect)
-					*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_VarSelect
 				}
+				*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_Subquery
 			}
 			break
 
@@ -60583,7 +60590,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+7536, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7544, pExpr, pExpr)
 			}
 
 			break
@@ -60639,7 +60646,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+6936, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6955, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -60714,7 +60721,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7547, libc.VaList(bp, i, zType, mx))
+		ts+7555, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -60734,7 +60741,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+7603, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7611, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -60769,7 +60776,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+7637, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7645, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -60826,7 +60833,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+7643, libc.VaList(bp, i+1))
+				ts+7651, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -60854,7 +60861,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+7704, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7712, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -61068,7 +61075,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+7735, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7743, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -61108,7 +61115,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+7637) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7645) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -61119,7 +61126,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7774) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7782) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -61131,7 +61138,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+7780, 0)
+						ts+7788, 0)
 					return WRC_Abort
 				}
 
@@ -61920,7 +61927,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6936, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6955, 0)
 		return
 	}
 
@@ -61995,7 +62002,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+7839, libc.VaList(bp, mxHeight))
+			ts+7847, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -62244,12 +62251,12 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7887,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7895,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7931
+						return ts + 7939
 					}
-					return ts + 1547
+					return ts + 1566
 				}(), nElem))
 			break
 		}
@@ -62288,7 +62295,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+7933)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7941)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -62314,7 +62321,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+7935, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7943, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -62342,7 +62349,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+7969, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7977, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -62389,7 +62396,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+7989,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7997,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -62414,7 +62421,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+8032, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+8040, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -62989,7 +62996,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+8055,
+	Xsqlite3ErrorMsg(tls, pParse, ts+8063,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -63112,7 +63119,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+8085, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8093, libc.VaList(bp, zObject))
 	}
 }
 
@@ -63168,10 +63175,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+7167) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+8116) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+7172) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+8121) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -63602,13 +63609,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+8108) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+8127) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+8116) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+8135) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+8122) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+8141) == 0 {
 		return 1
 	}
 	return 0
@@ -63812,7 +63819,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+8126, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8145, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -63890,7 +63897,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+8173, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8192, 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)
 
@@ -63984,7 +63991,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 + 8204
+		var zFmt uintptr = ts + 8223
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -64002,7 +64009,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+6936, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6955, 0)
 	}
 }
 
@@ -64043,7 +64050,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+8248, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8267, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -64073,11 +64080,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+8271, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+8290, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
-				return ts + 1547
+				return ts + 1566
 			}
-			return ts + 8290
+			return ts + 8309
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -64204,7 +64211,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+8302, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8321, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -64219,11 +64226,11 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+8320, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+8339, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
-			return ts + 1547
+			return ts + 1566
 		}
-		return ts + 8290
+		return ts + 8309
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
@@ -64246,7 +64253,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+7933)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7941)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -64255,7 +64262,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+8341)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+8360)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -64641,13 +64648,13 @@ 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+8343, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+8346,
+			if Xsqlite3_strnicmp(tls, z, ts+8362, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+8365,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
-							return ts + 5335
+							return ts + 5354
 						}
-						return ts + 1547
+						return ts + 1566
 					}(), pExpr))
 			} else {
 				codeReal(tls, v, z, negFlag, iMem)
@@ -64684,6 +64691,7 @@ func Xsqlite3ExprCodeLoadIndexColumn(tls *libc.TLS, pParse uintptr, pIdx uintptr
 func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr, pCol uintptr, regOut int32) {
 	var iAddr int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
+	var nErr int32 = (*Parse)(unsafe.Pointer(pParse)).FnErr
 
 	if (*Parse)(unsafe.Pointer(pParse)).FiSelfTab > 0 {
 		iAddr = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Parse)(unsafe.Pointer(pParse)).FiSelfTab-1, 0, regOut)
@@ -64697,6 +64705,9 @@ func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr
 	if iAddr != 0 {
 		Xsqlite3VdbeJumpHere(tls, v, iAddr)
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr > nErr {
+		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FerrByteOffset = -1
+	}
 }
 
 // Generate code to extract the value of the iCol-th column of a table.
@@ -64718,7 +64729,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+8373,
+				Xsqlite3ErrorMsg(tls, pParse, ts+8392,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -64891,8 +64902,8 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8403, ts + 8408, ts + 8413, ts + 6594,
-				ts + 6589, ts + 8421}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8422, ts + 8427, ts + 8432, ts + 6613,
+				ts + 6608, ts + 8440}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
@@ -64900,7 +64911,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 8429
+						return ts + 8448
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -64915,6 +64926,7 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 	var p uintptr
 	var v uintptr
 	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+		var exprAff U8
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -64928,6 +64940,14 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 		if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr, iDataCur) != 0 {
 			continue
 		}
+
+		exprAff = U8(Xsqlite3ExprAffinity(tls, pExpr))
+		if int32(exprAff) <= SQLITE_AFF_BLOB && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_BLOB ||
+			int32(exprAff) == SQLITE_AFF_TEXT && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_TEXT ||
+			int32(exprAff) >= SQLITE_AFF_NUMERIC && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_NUMERIC {
+			continue
+		}
+
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 
 		if (*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow != 0 {
@@ -65267,7 +65287,7 @@ __73:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
 		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8373,
+	Xsqlite3ErrorMsg(tls, pParse, ts+8392,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
 __76:
@@ -65500,7 +65520,7 @@ __43:
 		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+8434, libc.VaList(bp+8, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8453, libc.VaList(bp+8, pExpr))
 	goto __91
 __90:
 	return func() int32 {
@@ -65541,7 +65561,7 @@ __93:
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
 		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8461, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8480, libc.VaList(bp+16, pExpr))
 	goto __5
 __94:
 	;
@@ -65701,7 +65721,7 @@ __121:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
 		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8055,
+	Xsqlite3ErrorMsg(tls, pParse, ts+8063,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
 __122:
 	;
@@ -65723,11 +65743,10 @@ __49:
 	return target
 
 __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) {
+	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) {
 		goto __123
 	}
+
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
 		goto __125
@@ -65767,7 +65786,7 @@ __126:
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6936, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6955, 0)
 	goto __5
 
 __55:
@@ -65798,13 +65817,19 @@ __129:
 	;
 __127:
 	;
-	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
+	addrINR = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable, 0, target)
 
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = U8(0)
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = okConstFactor
+	if !(inReg != target) {
+		goto __130
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
+	inReg = target
+__130:
+	;
 	Xsqlite3VdbeJumpHere(tls, v, addrINR)
-	Xsqlite3VdbeChangeP3(tls, v, addrINR, inReg)
 	goto __5
 
 __56:
@@ -65817,15 +65842,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __130
+		goto __131
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __131
+		goto __132
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__131:
+__132:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -65835,22 +65860,22 @@ __131:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__130:
+__131:
 	;
 	i1 = 0
-__132:
+__133:
 	if !(i1 < nExpr-1) {
-		goto __134
+		goto __135
 	}
 	if !(pX != 0) {
-		goto __135
+		goto __136
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __136
-__135:
-	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+	goto __137
 __136:
+	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+__137:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -65859,21 +65884,21 @@ __136:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __133
-__133:
-	i1 = i1 + 2
-	goto __132
 	goto __134
 __134:
+	i1 = i1 + 2
+	goto __133
+	goto __135
+__135:
 	;
 	if !(nExpr&1 != 0) {
-		goto __137
+		goto __138
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __138
-__137:
-	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+	goto __139
 __138:
+	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+__139:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -65883,27 +65908,27 @@ __138:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __139
-	}
-	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8485, 0)
-	return 0
-__139:
-	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __140
 	}
-	Xsqlite3MayAbort(tls, pParse)
+	Xsqlite3ErrorMsg(tls, pParse,
+		ts+8504, 0)
+	return 0
 __140:
 	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __141
 	}
+	Xsqlite3MayAbort(tls, pParse)
+__141:
+	;
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+		goto __142
+	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __142
-__141:
+	goto __143
+__142:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -65912,7 +65937,7 @@ __141:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__142:
+__143:
 	;
 	goto __5
 
@@ -65923,7 +65948,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8535))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8554))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -67715,11 +67740,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+6784, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6803, 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+8545, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8564, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -67731,13 +67756,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8573,
+		ts+8592,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8748,
+			ts+8767,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -67747,10 +67772,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8922, libc.VaList(bp, zDb, zDb))
+		ts+8941, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9069, 0)
+			ts+9088, 0)
 	}
 }
 
@@ -67814,7 +67839,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+9220, libc.VaList(bp, zName))
+		ts+9239, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -67824,7 +67849,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+9279, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+9298, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -67833,7 +67858,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+9285, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+9304, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -67874,19 +67899,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9312, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+9331, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9496,
+		ts+9515,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9801, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9820, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9817,
+		ts+9836,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -67894,7 +67919,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9875, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9894, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -67906,7 +67931,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+10140, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+10159, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -67918,7 +67943,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10153,
+		ts+10172,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -67964,12 +67989,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10191, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+10210, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+10223, 0)
+			ts+10242, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -67979,11 +68004,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+10250)
+				ts+10269)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+10309)
+				ts+10328)
 		}
 
 		if pDflt != 0 {
@@ -67996,12 +68021,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+10362)
+					ts+10381)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10408)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10427)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -68012,7 +68037,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10435,
+			ts+10454,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -68034,7 +68059,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+10581,
+				ts+10600,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -68082,14 +68107,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10811, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10830, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10845, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10864, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -68117,7 +68142,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+10875, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10894, 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
 	}
@@ -68157,18 +68182,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 + 10894
+		zType = ts + 10913
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10899
+		zType = ts + 10918
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10913,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10932,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10931
+					return ts + 10950
 				}
-				return ts + 10948
+				return ts + 10967
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -68252,11 +68277,11 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10966, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10985, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1547, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1566, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iSchema == 1))
 
 	Xsqlite3MayAbort(tls, pParse)
@@ -68269,17 +68294,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10987,
+		ts+11006,
 		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+11169,
+		ts+11188,
 		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+10140, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+10159, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -68537,12 +68562,12 @@ 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+11300,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11319,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 11323
+				return ts + 11342
 			}
-			return ts + 1547
+			return ts + 1566
 		}(), zWhen,
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg))
 	Xsqlite3_result_error(tls, pCtx, zErr, -1)
@@ -68582,8 +68607,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+11325, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 113494)
+	if Xsqlite3_strnicmp(tls, zSql, ts+11344, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113516)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -68600,7 +68625,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, 113505)
+		rc = Xsqlite3CorruptError(tls, 113527)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -68622,7 +68647,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+11333, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+11352, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -68662,12 +68687,12 @@ 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+11339, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+11358, 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 + 11323
+							return ts + 11342
 						}
-						return ts + 1547
+						return ts + 1566
 					}()))
 				zReplace = zBuf2
 				nReplace = U32(Xsqlite3Strlen30(tls, zReplace))
@@ -69152,7 +69177,7 @@ __45:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FzErrMsg != 0) {
 		goto __47
 	}
-	renameColumnParseError(tls, context, ts+1547, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
+	renameColumnParseError(tls, context, ts+1566, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
 	goto __48
 __47:
 	Xsqlite3_result_error_code(tls, context, rc)
@@ -69317,7 +69342,7 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 			if rc == SQLITE_ERROR && Xsqlite3WritableSchema(tls, db) != 0 {
 				Xsqlite3_result_value(tls, context, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 			} else if (*Parse)(unsafe.Pointer(bp+80)).FzErrMsg != 0 {
-				renameColumnParseError(tls, context, ts+1547, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
+				renameColumnParseError(tls, context, ts+1566, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
 			} else {
 				Xsqlite3_result_error_code(tls, context, rc)
 			}
@@ -69520,7 +69545,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 114441)
+	rc = Xsqlite3CorruptError(tls, 114463)
 	goto drop_column_done
 __2:
 	;
@@ -69544,7 +69569,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+11344, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+11363, 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)
 
@@ -69625,19 +69650,19 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10966, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10985, 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+11351,
+	Xsqlite3ErrorMsg(tls, pParse, ts+11370,
 		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 + 11379
+				return ts + 11398
 			}
-			return ts + 6530
+			return ts + 6549
 		}(),
 			zCol))
 	goto exit_drop_column
@@ -69646,7 +69671,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11391, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11410, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -69660,13 +69685,13 @@ __8:
 	goto exit_drop_column
 __9:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1547, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1566, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11439, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11458, 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+11560, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11579, 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
@@ -69784,11 +69809,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 + 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}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11597},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11618},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11638},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11657},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11676}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -69822,7 +69847,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+11680, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11699, 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)
 			}
@@ -69831,10 +69856,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+11703,
+					ts+11722,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11733, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11752, 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)
 			}
@@ -69852,9 +69877,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11751, FzCols: ts + 11764},
-	{FzName: ts + 11777, FzCols: ts + 11790},
-	{FzName: ts + 11818},
+	{FzName: ts + 11770, FzCols: ts + 11783},
+	{FzName: ts + 11796, FzCols: ts + 11809},
+	{FzName: ts + 11837},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -70044,7 +70069,7 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11831}
+	FzName:     ts + 11850}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
@@ -70295,7 +70320,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11841}
+	FzName:     ts + 11860}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -70309,7 +70334,7 @@ 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+11851,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11870,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
 					return (*StatAccum)(unsafe.Pointer(p)).FnEst
@@ -70322,7 +70347,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11856, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11875, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -70364,7 +70389,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+11862, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11881, 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--
@@ -70378,7 +70403,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11868}
+	FzName:     ts + 11887}
 
 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)
@@ -70422,7 +70447,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+11877, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11896, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -70439,7 +70464,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+11751, 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+11770, 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)
@@ -70595,7 +70620,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+11887, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11906, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -70652,7 +70677,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+11887, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11906, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -70699,9 +70724,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+11891)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11910)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11895)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11914)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -70784,7 +70809,7 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 	var v TRowcnt
 
 	if z == uintptr(0) {
-		z = ts + 1547
+		z = ts + 1566
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
 		v = uint64(0)
@@ -70806,15 +70831,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+11899, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11918, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11910, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11929, 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+11920, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11939, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -71090,11 +71115,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+11777, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11796, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11932,
-			ts+11986,
+			ts+11951,
+			ts+12005,
 			zDb)
 	}
 	return rc
@@ -71141,10 +71166,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+11751, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11770, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+12038, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+12057, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -71202,7 +71227,7 @@ 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+6844, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6863, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -71235,13 +71260,13 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zFile == uintptr(0)) {
 		goto __1
 	}
-	zFile = ts + 1547
+	zFile = ts + 1566
 __1:
 	;
 	if !(zName == uintptr(0)) {
 		goto __2
 	}
-	zName = ts + 1547
+	zName = ts + 1566
 __2:
 	;
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2)) != 0) {
@@ -71249,14 +71274,14 @@ __2:
 	}
 
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+4238)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+4257)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+12079, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+12098, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
 	if !(rc == SQLITE_OK) {
 		goto __6
 	}
@@ -71293,7 +71318,7 @@ __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12082,
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12101,
 		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
@@ -71307,7 +71332,7 @@ __12:
 	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __15
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12119, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12138, libc.VaList(bp+8, zName))
 	goto attach_error
 __15:
 	;
@@ -71371,7 +71396,7 @@ __4:
 		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12149, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12168, 0)
 	goto __23
 __22:
 	if !(rc == SQLITE_OK) {
@@ -71388,7 +71413,7 @@ __25:
 		goto __27
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
-		ts+12178, 0)
+		ts+12197, 0)
 	rc = SQLITE_ERROR
 __27:
 	;
@@ -71454,13 +71479,13 @@ __33:
 	}
 	Xsqlite3OomFault(tls, db)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1483, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1502, 0)
 	goto __35
 __34:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
 		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12246, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12265, libc.VaList(bp+16, zFile))
 __36:
 	;
 __35:
@@ -71507,7 +71532,7 @@ func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zName == uintptr(0)) {
 		goto __1
 	}
-	zName = ts + 1547
+	zName = ts + 1566
 __1:
 	;
 	i = 0
@@ -71538,14 +71563,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12274, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12293, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12295, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12314, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -71553,7 +71578,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12321, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12340, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -71670,7 +71695,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12343}
+	FzName:     ts + 12362}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -71683,7 +71708,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12357}
+	FzName:     ts + 12376}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -71697,7 +71722,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+12371, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+12390, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -71729,7 +71754,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+12395,
+						ts+12414,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -71904,7 +71929,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+12441, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12460, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -71930,11 +71955,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+12464, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12483, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12470, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12489, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12476, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12495, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -71981,7 +72006,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 + 8116
+		zCol = ts + 8135
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -72005,7 +72030,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+12503, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12522, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -72276,25 +72301,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6844) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6863) == 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+6784, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6803, 7) == 0 {
 			if i == 1 {
-				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 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6830+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6849+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6305+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+6792)
+						ts+6811)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6830+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6849+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+6286)
+						ts+6305)
 				}
 			}
 		}
@@ -72315,12 +72340,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		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 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6803, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6849+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+6305)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6830+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+6792)
+					ts+6811)
 			}
 		}
 	}
@@ -72351,7 +72376,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+12518, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12537, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -72369,14 +72394,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 + 12526
+			zMsg = ts + 12545
 		} else {
-			zMsg = ts + 12539
+			zMsg = ts + 12558
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7048, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7067, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7058, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7077, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -72406,12 +72431,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+6784, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6286+7) == 0 {
-			return ts + 6830
+	if Xsqlite3_strnicmp(tls, zName, ts+6803, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6305+7) == 0 {
+			return ts + 6849
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6792+7) == 0 {
-			return ts + 6811
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6811+7) == 0 {
+			return ts + 6830
 		}
 	}
 	return zName
@@ -72769,7 +72794,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+6286)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+6305)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -72795,7 +72820,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6844, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6863, zName) {
 				goto __3
 			}
 
@@ -72848,13 +72873,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+12553, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12572, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12570, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12589, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -72892,13 +72917,13 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 		if Xsqlite3_stricmp(tls, zType, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit))) != 0 ||
 			Xsqlite3_stricmp(tls, zName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 1*8))) != 0 ||
 			Xsqlite3_stricmp(tls, zTblName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 2*8))) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1547, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1566, 0)
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6784, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6803, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12590,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12609,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -73058,9 +73083,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 + 6792
+			return ts + 6811
 		}
-		return ts + 6286
+		return ts + 6305
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -73076,7 +73101,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12632, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12651, 0)
 	return
 __4:
 	;
@@ -73104,9 +73129,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10894
+			return ts + 10913
 		}
-		return ts + 9279
+		return ts + 9298
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -73122,9 +73147,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 + 6792
+			return ts + 6811
 		}
-		return ts + 6286
+		return ts + 6305
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -73155,12 +73180,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12673,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12692,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10894
+				return ts + 10913
 			}
-			return ts + 9279
+			return ts + 9298
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -73175,7 +73200,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12694, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12713, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -73262,7 +73287,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+12729, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12748, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -73286,7 +73311,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+12746, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12765, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -73306,7 +73331,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 + 12729
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12748
 	(*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)
@@ -73318,7 +73343,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+12729, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12748, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -73352,7 +73377,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+12780, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12799, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -73360,13 +73385,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+12803, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12822, 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+12810, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12829, 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--
@@ -73403,7 +73428,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+12820, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12839, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -73567,10 +73592,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+12846,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12865,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12891, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12910, 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))
@@ -73601,7 +73626,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+12932, 0)
+			ts+12951, 0)
 	}
 }
 
@@ -73646,7 +73671,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12984, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+13003, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -73735,7 +73760,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13025, 0)
+		ts+13044, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -73830,7 +73855,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13081, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13100, 0)
 	goto generated_done
 __2:
 	;
@@ -73843,13 +73868,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+13124, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+13143, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+13132, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+13151, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -73883,13 +73908,19 @@ __10:
 
 	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
 __11:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_RAISE) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = (*Column)(unsafe.Pointer(pCol)).Faffinity
+__12:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+13139,
+	Xsqlite3ErrorMsg(tls, pParse, ts+13158,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -74010,13 +74041,13 @@ __3:
 	;
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
-		zSep = ts + 1547
-		zSep2 = ts + 13170
-		zEnd = ts + 5360
+		zSep = ts + 1566
+		zSep2 = ts + 13189
+		zEnd = ts + 5379
 	} else {
-		zSep = ts + 13172
-		zSep2 = ts + 13176
-		zEnd = ts + 13181
+		zSep = ts + 13191
+		zSep2 = ts + 13195
+		zEnd = ts + 13200
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -74024,7 +74055,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+13184, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+13203, 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('(')
@@ -74058,17 +74089,17 @@ __5:
 	goto __6
 __6:
 	;
-	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3658, libc.VaList(bp, zEnd))
+	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3677, libc.VaList(bp, zEnd))
 	return zStmt
 }
 
 var azType1 = [6]uintptr{
-	ts + 1547,
-	ts + 13198,
-	ts + 13204,
-	ts + 13209,
-	ts + 13214,
-	ts + 13204,
+	ts + 1566,
+	ts + 13217,
+	ts + 13223,
+	ts + 13228,
+	ts + 13233,
+	ts + 13223,
 }
 
 func resizeIndexObject(tls *libc.TLS, db uintptr, pIdx uintptr, N int32) int32 {
@@ -74458,7 +74489,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
 		if pSelect != 0 || !(int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM) && (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1547, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1566, 0)
 			return
 		}
 		(*Table)(unsafe.Pointer(p)).Ftnum = (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum
@@ -74475,10 +74506,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+13220,
-						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1547)))
+						ts+13239,
+						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1566)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+13253,
+					Xsqlite3ErrorMsg(tls, pParse, ts+13272,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -74497,11 +74528,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+13280, 0)
+				ts+13299, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13330, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+13349, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -74535,7 +74566,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13362, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+13381, 0)
 			return
 		}
 	}
@@ -74560,11 +74591,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 + 9279
-			zType2 = ts + 13406
+			zType = ts + 9298
+			zType2 = ts + 13425
 		} else {
-			zType = ts + 10894
-			zType2 = ts + 13412
+			zType = ts + 10913
+			zType2 = ts + 13431
 		}
 
 		if pSelect != 0 {
@@ -74635,11 +74666,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+13417, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13436, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13432,
+			ts+13451,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -74655,13 +74686,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+13530,
+					ts+13549,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13572, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13591, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -74676,7 +74707,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+9801) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9820) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -74706,7 +74737,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+13606, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13625, 0)
 	goto create_view_fail
 __1:
 	;
@@ -74722,7 +74753,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10894, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10913, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -74804,7 +74835,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13642, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13661, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -74929,13 +74960,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+13672, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13691, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13687,
+		ts+13706,
 		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)
 }
@@ -74976,10 +75007,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+13754, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13773, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11703,
+				ts+11722,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -75011,12 +75042,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+13768,
+			ts+13787,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13813,
+		ts+13832,
 		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)
@@ -75044,11 +75075,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+6784, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3279, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6803, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3298, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7536, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7544, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -75126,9 +75157,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6792
+			return ts + 6811
 		}
-		return ts + 6286
+		return ts + 6305
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -75187,21 +75218,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13880, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13899, 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+13908, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13927, 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+13942, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13961, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -75213,7 +75244,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11895, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11914, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -75277,7 +75308,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13974,
+		ts+13993,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -75289,7 +75320,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14037, 0)
+		ts+14056, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -75374,7 +75405,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14131,
+		ts+14150,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -75601,12 +75632,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+14177,
+				Xsqlite3ErrorMsg(tls, pParse, ts+14196,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 14205
+							return ts + 14224
 						}
-						return ts + 14211
+						return ts + 14230
 					}()))
 				return 1
 			}
@@ -75727,7 +75758,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+14216, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+14235, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -75746,7 +75777,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14222,
+		ts+14241,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -75772,26 +75803,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6784, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6803, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14272, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14291, 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+14300, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14319, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14325, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14344, 0)
 	goto exit_create_index
 __17:
 	;
@@ -75805,7 +75836,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+14216, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+14235, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -75820,7 +75851,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14359, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14378, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -75832,7 +75863,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14393, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14412, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -75861,7 +75892,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14417, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14436, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -75882,9 +75913,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6792
+			return ts + 6811
 		}
-		return ts + 6286
+		return ts + 6305
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -75923,7 +75954,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+14216)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+14235)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -76024,7 +76055,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14440, 0)
+		ts+14459, 0)
 	goto exit_create_index
 __56:
 	;
@@ -76241,7 +76272,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14501, libc.VaList(bp+48, 0))
+		ts+14520, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -76293,8 +76324,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14543, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14562, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121859)
 	goto exit_create_index
 __101:
 	;
@@ -76340,12 +76371,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14560,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14579,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
-				return ts + 1547
+				return ts + 1566
 			}
-			return ts + 14580
+			return ts + 14599
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -76353,7 +76384,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14588,
+		ts+14607,
 		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,
@@ -76367,7 +76398,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14647, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14666, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -76528,7 +76559,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14674, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14693, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -76543,7 +76574,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14692, libc.VaList(bp+8, 0))
+		ts+14711, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -76554,9 +76585,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 + 6792
+			return ts + 6811
 		}
-		return ts + 6286
+		return ts + 6305
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -76582,9 +76613,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14765,
+		ts+14784,
 		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+11891, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11910, (*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)
@@ -76719,7 +76750,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+14825,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14844,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -76927,12 +76958,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+14861,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14880,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14897
+				return ts + 14916
 			}
-			return ts + 14900
+			return ts + 14919
 		}()))
 	goto append_from_error
 __1:
@@ -77101,7 +77132,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14906, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14925, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -77137,9 +77168,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14912
+				return ts + 14931
 			}
-			return ts + 14921
+			return ts + 14940
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -77164,7 +77195,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14906, ts + 14928, ts + 14912}
+var az = [3]uintptr{ts + 14925, ts + 14947, ts + 14931}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -77179,7 +77210,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+14936, 0)
+				ts+14955, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -77316,17 +77347,17 @@ 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+15006, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+15025, 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+15017, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+15036, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
-			Xsqlite3_str_append(tls, bp+8, ts+1560, 1)
+			Xsqlite3_str_append(tls, bp+8, ts+1579, 1)
 			Xsqlite3_str_appendall(tls, bp+8, zCol)
 		}
 	}
@@ -77349,11 +77380,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+12464, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12483, 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+15020, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+15039, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -77483,7 +77514,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15029, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15048, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -77579,7 +77610,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+15075, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+15094, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -77772,7 +77803,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+15105, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+15124, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -78052,7 +78083,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+15136,
+		Xsqlite3ErrorMsg(tls, pParse, ts+15155,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -78084,11 +78115,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+15169, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+15188, 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+15198, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+15217, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -78339,7 +78370,7 @@ __20:
 	goto __16
 __15:
 	wcf = U16(WHERE_ONEPASS_DESIRED | WHERE_DUPLICATES_OK)
-	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_VarSelect != 0) {
+	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_Subquery != 0) {
 		goto __23
 	}
 	bComplex = 1
@@ -78592,7 +78623,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+15236)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+15255)
 __62:
 	;
 delete_from_cleanup:
@@ -78707,7 +78738,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+11751) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11770) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -78937,7 +78968,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 + 8408, ts + 8403, ts + 6584}
+var azType2 = [5]uintptr{ts + 6613, ts + 6608, ts + 8427, ts + 8422, ts + 6603}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -78996,7 +79027,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+15249, -1)
+					Xsqlite3_result_error(tls, context, ts+15268, -1)
 					return
 				}
 				iVal = -iVal
@@ -79300,7 +79331,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+15266, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+15285, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -79646,7 +79677,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+15271, -1)
+		Xsqlite3_result_error(tls, context, ts+15290, -1)
 		return
 	}
 	if argc == 3 {
@@ -79656,7 +79687,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+15304, -1)
+				ts+15323, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -79709,7 +79740,7 @@ func errlogFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	_ = argc
 	_ = context
-	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3658, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
+	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3677, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
 }
 
 func compileoptionusedFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
@@ -79749,13 +79780,13 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 
 			var zVal uintptr
 			r1 = Xsqlite3_value_double(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+5328, libc.VaList(bp, r1))
+			Xsqlite3_str_appendf(tls, pStr, ts+5347, libc.VaList(bp, r1))
 			zVal = Xsqlite3_str_value(tls, pStr)
 			if zVal != 0 {
 				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+15349, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+15368, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -79763,7 +79794,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 		}
 	case SQLITE_INTEGER:
 		{
-			Xsqlite3_str_appendf(tls, pStr, ts+1327, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
+			Xsqlite3_str_appendf(tls, pStr, ts+1346, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
 			break
 
 		}
@@ -79792,13 +79823,13 @@ 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+15356, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+15375, libc.VaList(bp+24, zArg))
 			break
 
 		}
 	default:
 		{
-			Xsqlite3_str_append(tls, pStr, ts+1548, 4)
+			Xsqlite3_str_append(tls, pStr, ts+1567, 4)
 			break
 
 		}
@@ -79939,7 +79970,7 @@ func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 	var ch U32
 	var c U8
 	var d U8
-	zPass = ts + 1547
+	zPass = ts + 1566
 	nPass = 0
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -80221,7 +80252,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 11323}
+var azOne = [1]uintptr{ts + 11342}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -80233,7 +80264,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	zIn = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	if zIn == uintptr(0) {
-		zIn = ts + 1547
+		zIn = ts + 1566
 	}
 	for i = 0; *(*U8)(unsafe.Pointer(zIn + uintptr(i))) != 0 && !(int32(Xsqlite3CtypeMap[*(*U8)(unsafe.Pointer(zIn + uintptr(i)))])&0x02 != 0); i++ {
 	}
@@ -80257,7 +80288,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+15359, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+15378, 4, uintptr(0))
 	}
 }
 
@@ -80282,7 +80313,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+12503, -1)
+		Xsqlite3_result_error(tls, context, ts+12522, -1)
 		return
 	}
 
@@ -80360,7 +80391,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+15249, -1)
+			Xsqlite3_result_error(tls, context, ts+15268, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -80621,7 +80652,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+15364, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+15383, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -80641,14 +80672,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+15370, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+15389, 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+15370, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+15389, 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+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)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+15389, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+15389, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -80889,109 +80920,109 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 }
 
 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 + 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(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(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 + 15394},
+	{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 + 15414},
+	{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 + 15427},
+	{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 + 15445},
+	{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_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15462},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15462},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15477},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15503},
+	{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 + 15528},
+	{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 + 15537},
+	{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 + 15548},
+	{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 + 15555},
+	{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 + 15569},
+	{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 + 15569},
+	{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 + 15575},
+	{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 + 15575},
+	{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 + 15581},
+	{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 + 15581},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15586},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15586},
+	{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 + 15586},
+	{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 + 15590},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15590},
+	{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 + 15590},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15594},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15601},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15609},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15616},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15622},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15629},
+	{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 + 15644},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15649},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15653},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15653},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15659},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15665},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15671},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15675},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15675},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15681},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15688},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15695},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15706},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15713},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15728},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15745},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15756},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15762},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15780},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15788},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15802},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15810},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15819},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15819},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15826},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15826},
+	{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 + 15836},
+	{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 + 15840},
+	{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 + 15846},
+	{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 + 15850},
+	{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 + 15850},
+	{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 + 15856},
+	{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 + 15856},
+	{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 + 15869},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15389},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15389},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 7008},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 7008},
 	{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 + 15926},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15879},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15887},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15893},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15899},
+	{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 + 15902},
+	{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 + 15906},
+	{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 + 15912},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15902},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15917},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15921},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15925},
 	{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 + 15935},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15940},
 	{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 + 15959},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15950},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15956},
+	{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 + 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 + 15968},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15973},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15978},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15983},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15989},
 	{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}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16001},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16006},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16014},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16022},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16025},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 7008},
+	{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 + 16030}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -81112,7 +81143,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+16015,
+				ts+16034,
 				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)
@@ -81772,8 +81803,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 + 6855, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6851, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6874, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6870, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -81852,7 +81883,7 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 			(*Token)(unsafe.Pointer(bp + 80)).Fz = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 			(*Token)(unsafe.Pointer(bp + 80)).Fn = uint32(Xsqlite3Strlen30(tls, (*Token)(unsafe.Pointer(bp+80)).Fz))
 
-			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5539)
+			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5558)
 			if pRaise != 0 {
 				(*Expr)(unsafe.Pointer(pRaise)).FaffExpr = int8(OE_Abort)
 			}
@@ -82273,7 +82304,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8373, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8392, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -82741,7 +82772,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+16060,
+		ts+16079,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -82766,7 +82797,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+16101,
+	Xsqlite3ErrorMsg(tls, pParse, ts+16120,
 		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
@@ -82915,7 +82946,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+16133,
+		ts+16152,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -82925,7 +82956,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+16185, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+16204, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -82977,7 +83008,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+16210,
+	Xsqlite3ErrorMsg(tls, pParse, ts+16229,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -82985,7 +83016,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+16256, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+16275, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -83397,7 +83428,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+16277)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+16296)
 __125:
 	;
 insert_cleanup:
@@ -83713,7 +83744,7 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 					fallthrough
 				case OE_Fail:
 					{
-						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12464, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12483, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 							(*Column)(unsafe.Pointer(pCol)).FzCnName))
 
 						Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
@@ -84804,13 +84835,13 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131895)
+	return Xsqlite3MisuseError(tls, 131931)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
 		goto __2
 	}
-	zSql = ts + 1547
+	zSql = ts + 1566
 __2:
 	;
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -85289,7 +85320,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12503, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12522, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -85298,7 +85329,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 16291
+		zEntry = ts + 16310
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -85313,7 +85344,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+12464, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12483, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -85349,7 +85380,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.X__builtin___memcpy_chk(tls, zAltEntry, ts+16314, uint64(8), libc.X__builtin_object_size(tls, zAltEntry, 0))
+	libc.X__builtin___memcpy_chk(tls, zAltEntry, ts+16333, uint64(8), libc.X__builtin_object_size(tls, zAltEntry, 0))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -85363,7 +85394,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+16323, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+16342, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -85387,7 +85418,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.X__builtin___memcpy_chk(tls, zAltEntry+uintptr(iEntry), ts+16327, uint64(6), libc.X__builtin_object_size(tls, zAltEntry+uintptr(iEntry), 0))
+	libc.X__builtin___memcpy_chk(tls, zAltEntry+uintptr(iEntry), ts+16346, uint64(6), libc.X__builtin_object_size(tls, zAltEntry+uintptr(iEntry), 0))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -85405,7 +85436,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+16333, libc.VaList(bp+16, zEntry, zFile))
+		ts+16352, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -85432,7 +85463,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+16376, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+16395, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -85470,7 +85501,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+16408, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16427, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -85480,7 +85511,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16445,
+	ts + 16464,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -85636,7 +85667,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+16451, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16470, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -85644,63 +85675,63 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 }
 
 var pragCName = [57]uintptr{
-	ts + 5460,
-	ts + 16490,
-	ts + 9279,
-	ts + 16494,
-	ts + 16499,
-	ts + 16502,
-	ts + 16512,
-	ts + 16522,
-	ts + 16528,
-	ts + 16532,
-	ts + 16537,
-	ts + 16542,
-	ts + 16550,
+	ts + 5479,
+	ts + 16509,
+	ts + 9298,
+	ts + 16513,
+	ts + 16518,
+	ts + 16521,
+	ts + 16531,
+	ts + 16541,
+	ts + 16547,
+	ts + 16551,
+	ts + 16556,
 	ts + 16561,
-	ts + 16564,
-	ts + 16571,
-	ts + 16532,
-	ts + 16537,
-	ts + 16578,
+	ts + 16569,
+	ts + 16580,
 	ts + 16583,
-	ts + 16586,
-	ts + 16593,
-	ts + 16528,
-	ts + 16532,
-	ts + 16599,
-	ts + 16604,
-	ts + 16609,
-	ts + 16532,
-	ts + 16613,
-	ts + 16537,
-	ts + 16621,
-	ts + 16625,
-	ts + 16630,
-	ts + 11895,
-	ts + 11891,
-	ts + 16636,
-	ts + 16641,
-	ts + 16646,
-	ts + 16490,
-	ts + 16532,
-	ts + 16651,
-	ts + 16658,
+	ts + 16590,
+	ts + 16551,
+	ts + 16556,
+	ts + 16597,
+	ts + 16602,
+	ts + 16605,
+	ts + 16612,
+	ts + 16547,
+	ts + 16551,
+	ts + 16618,
+	ts + 16623,
+	ts + 16628,
+	ts + 16551,
+	ts + 16632,
+	ts + 16556,
+	ts + 16640,
+	ts + 16644,
+	ts + 16649,
+	ts + 11914,
+	ts + 11910,
+	ts + 16655,
+	ts + 16660,
 	ts + 16665,
-	ts + 9279,
-	ts + 16673,
-	ts + 5463,
-	ts + 16679,
-	ts + 16490,
-	ts + 16532,
+	ts + 16509,
+	ts + 16551,
+	ts + 16670,
+	ts + 16677,
 	ts + 16684,
-	ts + 16689,
-	ts + 15883,
-	ts + 16694,
-	ts + 16707,
-	ts + 16716,
-	ts + 16723,
-	ts + 16734,
+	ts + 9298,
+	ts + 16692,
+	ts + 5482,
+	ts + 16698,
+	ts + 16509,
+	ts + 16551,
+	ts + 16703,
+	ts + 16708,
+	ts + 15902,
+	ts + 16713,
+	ts + 16726,
+	ts + 16735,
+	ts + 16742,
+	ts + 16753,
 }
 
 // Definitions of all built-in pragmas
@@ -85718,241 +85749,241 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [67]PragmaName{
-	{FzName: ts + 16742,
+	{FzName: ts + 16761,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16757,
+	{FzName: ts + 16776,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16772,
+	{FzName: ts + 16791,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16784,
+	{FzName: ts + 16803,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16800,
+	{FzName: ts + 16819,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16723,
+	{FzName: ts + 16742,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16813,
+	{FzName: ts + 16832,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16825,
+	{FzName: ts + 16844,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16845,
+	{FzName: ts + 16864,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CellSizeCk)},
-	{FzName: ts + 16861,
+	{FzName: ts + 16880,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16882,
+	{FzName: ts + 16901,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16897,
+	{FzName: ts + 16916,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16913,
+	{FzName: ts + 16932,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16927,
+	{FzName: ts + 16946,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16940,
+	{FzName: ts + 16959,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16954,
+	{FzName: ts + 16973,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16973,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_DeferFKs)},
 	{FzName: ts + 16992,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_DeferFKs)},
+	{FzName: ts + 17011,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 17015,
+	{FzName: ts + 17034,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17024,
+	{FzName: ts + 17043,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 17042,
+	{FzName: ts + 17061,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 17059,
+	{FzName: ts + 17078,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 17072,
+	{FzName: ts + 17091,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 17087,
+	{FzName: ts + 17106,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 17105,
+	{FzName: ts + 17124,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 17115,
+	{FzName: ts + 17134,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 17129,
+	{FzName: ts + 17148,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17145,
+	{FzName: ts + 17164,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 17170,
+	{FzName: ts + 17189,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 17189,
+	{FzName: ts + 17208,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 17200,
+	{FzName: ts + 17219,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 17211,
+	{FzName: ts + 17230,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 17223,
+	{FzName: ts + 17242,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 17239,
+	{FzName: ts + 17258,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17252,
+	{FzName: ts + 17271,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17271,
+	{FzName: ts + 17290,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 17290,
+	{FzName: ts + 17309,
 		FePragTyp: U8(PragTyp_LOCK_PROXY_FILE),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17306,
+	{FzName: ts + 17325,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17319,
+	{FzName: ts + 17338,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17334,
+	{FzName: ts + 17353,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 17344,
+	{FzName: ts + 17363,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 17356,
+	{FzName: ts + 17375,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 17365,
+	{FzName: ts + 17384,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17376,
+	{FzName: ts + 17395,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17386,
+	{FzName: ts + 17405,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 17398,
+	{FzName: ts + 17417,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 17409,
+	{FzName: ts + 17428,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 17421,
+	{FzName: ts + 17440,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17438,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_RecTriggers)},
 	{FzName: ts + 17457,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_RecTriggers)},
+	{FzName: ts + 17476,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17483,
+	{FzName: ts + 17502,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17498,
+	{FzName: ts + 17517,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17512,
+	{FzName: ts + 17531,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17531,
+	{FzName: ts + 17550,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17545,
+	{FzName: ts + 17564,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17561,
+	{FzName: ts + 17580,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17573,
+	{FzName: ts + 17592,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17584,
+	{FzName: ts + 17603,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17595,
+	{FzName: ts + 17614,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17607,
+	{FzName: ts + 17626,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17618,
+	{FzName: ts + 17637,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17639,
+	{FzName: ts + 17658,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17647,
+	{FzName: ts + 17666,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17662,
+	{FzName: ts + 17681,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17675,
-		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
 	{FzName: ts + 17694,
+		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
+	{FzName: ts + 17713,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17709,
+	{FzName: ts + 17728,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -85974,7 +86005,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 17725))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 17744))
 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)}
@@ -85986,10 +86017,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+17750) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17769) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17760) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17779) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -85998,13 +86029,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+8429) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8448) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17767) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17786) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17772) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17791) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -86019,9 +86050,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+16684) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16703) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17784) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17803) == 0 {
 		return 2
 	} else {
 		return 0
@@ -86035,7 +86066,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+17791, 0)
+				ts+17810, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -86126,19 +86157,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17853
+		zName = ts + 17872
 		break
 	case OE_SetDflt:
-		zName = ts + 17862
+		zName = ts + 17881
 		break
 	case OE_Cascade:
-		zName = ts + 17874
+		zName = ts + 17893
 		break
 	case OE_Restrict:
-		zName = ts + 17882
+		zName = ts + 17901
 		break
 	default:
-		zName = ts + 17891
+		zName = ts + 17910
 		break
 	}
 	return zName
@@ -86155,7 +86186,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17901, ts + 17908, ts + 17916, ts + 17920, ts + 17784, ts + 17929,
+	ts + 17920, ts + 17927, ts + 17935, ts + 17939, ts + 17803, ts + 17948,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -86202,13 +86233,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17933
+			zType = ts + 17952
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17935
+			zType = ts + 17954
 		} else {
-			zType = ts + 7931
+			zType = ts + 7939
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17937,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17956,
 			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),
@@ -86216,7 +86247,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17944, ts + 17949, ts + 17957}
+var azEnc = [4]uintptr{uintptr(0), ts + 17963, ts + 17968, ts + 17976}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -86373,6 +86404,7 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp7 int32
 	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
@@ -86469,7 +86501,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17965, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17984, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -86508,7 +86540,7 @@ __8:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 488)) != 0) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+3658, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+3677, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 488)))
 __10:
 	;
@@ -86733,7 +86765,7 @@ __18:
 	if !(zRight != 0) {
 		goto __64
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17969) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17988) == 0) {
 		goto __65
 	}
 	b = 2
@@ -86805,7 +86837,7 @@ __72:
 	goto __15
 
 __20:
-	zRet = ts + 17760
+	zRet = ts + 17779
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -86843,7 +86875,7 @@ __79:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __84
 	}
-	zRet = ts + 17750
+	zRet = ts + 17769
 __84:
 	;
 	returnSingleText(tls, v, zRet)
@@ -87130,7 +87162,7 @@ __124:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 552)) == 0) {
 		goto __127
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17974, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17993, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __127:
@@ -87149,7 +87181,7 @@ __128:
 	if !(*(*int8)(unsafe.Pointer(zRight)) != 0) {
 		goto __129
 	}
-	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+16, zRight))
+	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+16, zRight))
 	goto __130
 __129:
 	Xsqlite3_temp_directory = uintptr(0)
@@ -87188,7 +87220,7 @@ __134:
 	if !(res1 != SQLITE_OK) {
 		goto __135
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17999, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18018, 0)
 	goto pragma_out
 __135:
 	;
@@ -87207,7 +87239,7 @@ __136:
 		goto __138
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+18029, 0)
+		ts+18048, 0)
 	goto __139
 __138:
 	if !(iDb != 1) {
@@ -87261,7 +87293,7 @@ __145:
 __147:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+18082) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+18101) == 0) {
 		goto __148
 	}
 
@@ -87358,13 +87390,13 @@ __161:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 18088
+			return ts + 18107
 		}
-		return ts + 18096
+		return ts + 18115
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
-			Xsqlite3ColumnType(tls, pCol, ts+1547),
+			Xsqlite3ColumnType(tls, pCol, ts+1566),
 			func() int32 {
 				if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 {
 					return 1
@@ -87429,7 +87461,7 @@ __176:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __177
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+18103, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+18122, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __178
 	}
@@ -87442,7 +87474,7 @@ __178:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __179
 	}
-	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1483, 0)
+	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1502, 0)
 	(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 __179:
 	;
@@ -87475,29 +87507,29 @@ __183:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __184
 	}
-	zType = ts + 10894
+	zType = ts + 10913
 	goto __185
 __184:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __186
 	}
-	zType = ts + 13124
+	zType = ts + 13143
 	goto __187
 __186:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __188
 	}
-	zType = ts + 18119
+	zType = ts + 18138
 	goto __189
 __188:
-	zType = ts + 9279
+	zType = ts + 9298
 __189:
 	;
 __187:
 	;
 __185:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18126,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18145,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -87563,7 +87595,7 @@ __196:
 		goto __198
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18133, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18152, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -87573,7 +87605,7 @@ __196:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __199
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+18138,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+18157,
 		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))))
@@ -87610,8 +87642,8 @@ __202:
 	if !(pIdx1 != 0) {
 		goto __204
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 576)) = [3]uintptr{ts + 18143, ts + 18145, ts + 16561}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18147,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 576)) = [3]uintptr{ts + 18162, ts + 18164, ts + 16580}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18166,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -87644,7 +87676,7 @@ __205:
 	goto __206
 __208:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18153,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18172,
 		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)))
@@ -87666,7 +87698,7 @@ __209:
 		goto __211
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18157, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18176, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __210
 __210:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -87730,7 +87762,7 @@ __221:
 		goto __223
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7931, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7939, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __222
 __222:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -87746,7 +87778,7 @@ __224:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __226
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7931, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7939, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __225
 __225:
 	i6++
@@ -87781,7 +87813,7 @@ __232:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __234
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18160,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18179,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -87789,7 +87821,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+18169))
+			ts+18188))
 	goto __233
 __233:
 	j2++
@@ -87978,7 +88010,7 @@ __262:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __263:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+18174, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+18193, 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)))
@@ -88195,7 +88227,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+18178, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+18197, 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)
@@ -88306,7 +88338,7 @@ __313:
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+18202,
+		ts+18221,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
@@ -88405,7 +88437,7 @@ __327:
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+18238, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+18257, 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) {
@@ -88427,7 +88459,7 @@ __332:
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+18258,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+18277,
 		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)
@@ -88440,7 +88472,7 @@ __335:
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+18280,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+18299,
 		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 __338
@@ -88458,11 +88490,11 @@ __337:
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 620)), j4, 3)
 __340:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+18303, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+18322, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+18305,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+18324,
 		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)
 __339:
@@ -88508,7 +88540,7 @@ __345:
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+18325,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+18344,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
@@ -88542,89 +88574,103 @@ __350:
 
 	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+18355)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18374)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+18360)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+18379)
 	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)
 
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __351
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_IdxRowid, *(*int32)(unsafe.Pointer(bp + 624))+j4, 3)
+	jmp7 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 3, 0, r1+int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn)-1)
+
+	Xsqlite3VdbeLoadString(tls, v, 3,
+		ts+18400)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+18436)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp7)
+__351:
+	;
 	label6 = 0
 	kk = 0
-__351:
+__352:
 	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) {
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
 		goto __355
 	}
-	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+	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 __352
-__352:
-	kk++
-	goto __351
 	goto __353
 __353:
+	kk++
+	goto __352
+	goto __354
+__354:
 	;
 	if !(label6 != 0) {
-		goto __356
+		goto __357
 	}
 	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
 	Xsqlite3VdbeResolveLabel(tls, v, label6)
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+18355)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18374)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+18381)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+18447)
 	Xsqlite3VdbeGoto(tls, v, jmp5-1)
 	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-__356:
+__357:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __357
+		goto __358
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__358:
+__359:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __360
+		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 __361
+		goto __362
 	}
-	goto __359
-__361:
+	goto __360
+__362:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
-	goto __359
-__359:
-	kk++
-	goto __358
 	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+18408)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18474)
 	Xsqlite3VdbeGoto(tls, v, jmp5)
 	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
-__357:
+__358:
 	;
 	Xsqlite3VdbeJumpHere(tls, v, jmp4)
 	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 640)))
@@ -88641,20 +88687,20 @@ __346:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 620)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __362
+		goto __363
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+18435)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+18501)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__363:
+__364:
 	if !(pIdx5 != 0) {
-		goto __365
-	}
-	if !(pPk1 == pIdx5) {
 		goto __366
 	}
-	goto __364
-__366:
+	if !(pPk1 == pIdx5) {
+		goto __367
+	}
+	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)
@@ -88663,21 +88709,21 @@ __366:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __364
-__364:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __363
 	goto __365
 __365:
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
+	goto __364
+	goto __366
+__366:
 	;
 	if !(pPk1 != 0) {
-		goto __367
+		goto __368
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__367:
+__368:
 	;
-__362:
+__363:
 	;
 	goto __297
 __297:
@@ -88695,14 +88741,14 @@ __272:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __368
+		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 + 18464
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18530
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__368:
+__369:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -88710,27 +88756,27 @@ __368:
 
 __46:
 	if !!(zRight != 0) {
-		goto __369
+		goto __370
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __371
-	}
-	goto pragma_out
-__371:
-	;
-	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __370
-__369:
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
 		goto __372
 	}
+	goto pragma_out
+__372:
+	;
+	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
+	goto __371
+__370:
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
+		goto __373
+	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__373:
+__374:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __375
+		goto __376
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __376
+		goto __377
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -88739,25 +88785,25 @@ __373:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __375
-__376:
-	;
-	goto __374
-__374:
-	pEnc += 16
-	goto __373
-	goto __375
-__375:
-	;
-	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __377
-	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18467, libc.VaList(bp+456, zRight))
+	goto __376
 __377:
 	;
-__372:
+	goto __375
+__375:
+	pEnc += 16
+	goto __374
+	goto __376
+__376:
 	;
-__370:
+	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
+		goto __378
+	}
+	Xsqlite3ErrorMsg(tls, pParse, ts+18533, libc.VaList(bp+456, zRight))
+__378:
+	;
+__373:
+	;
+__371:
 	;
 	goto __15
 
@@ -88765,15 +88811,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 __378
+		goto __379
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __380
+		goto __381
 	}
 	goto __15
-__380:
+__381:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -88781,41 +88827,41 @@ __380:
 	(*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 __381
+		goto __382
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__381:
+__382:
 	;
-	goto __379
-__378:
+	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 __382
+		goto __383
 	}
 	goto __15
-__382:
+__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)
-__379:
+__380:
 	;
 	goto __15
 
 __48:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__383:
+__384:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __384
+		goto __385
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __383
-__384:
+	goto __384
+__385:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -88830,31 +88876,31 @@ __49:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __385
-	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17767) == 0) {
 		goto __386
 	}
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17786) == 0) {
+		goto __387
+	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __387
-__386:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18492) == 0) {
-		goto __388
+	goto __388
+__387:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18558) == 0) {
+		goto __389
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __389
-__388:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17920) == 0) {
-		goto __390
+	goto __390
+__389:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17939) == 0) {
+		goto __391
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
+__391:
+	;
 __390:
 	;
-__389:
+__388:
 	;
-__387:
-	;
-__385:
+__386:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -88864,10 +88910,10 @@ __385:
 
 __50:
 	if !(zRight != 0) {
-		goto __391
+		goto __392
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__391:
+__392:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -88887,19 +88933,19 @@ __51:
 
 __52:
 	if !(zRight != 0) {
-		goto __392
+		goto __393
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __394
+		goto __395
 	}
 	goto __15
-__394:
+__395:
 	;
-	goto __393
-__392:
-	opMask = U32(0xfffe)
+	goto __394
 __393:
+	opMask = U32(0xfffe)
+__394:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -88908,86 +88954,86 @@ __393:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__395:
+__396:
 	if !(iDb <= iDbLast) {
-		goto __397
-	}
-	if !(iDb == 1) {
 		goto __398
 	}
-	goto __396
-__398:
+	if !(iDb == 1) {
+		goto __399
+	}
+	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
-__399:
+__400:
 	if !(k4 != 0) {
-		goto __401
+		goto __402
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __402
+		goto __403
 	}
-	goto __400
-__402:
+	goto __401
+__403:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__403:
+__404:
 	if !(pIdx6 != 0) {
-		goto __405
-	}
-	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
 		goto __406
 	}
+	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
+		goto __407
+	}
 	szThreshold = int16(0)
-	goto __405
-__406:
+	goto __406
+__407:
 	;
-	goto __404
-__404:
-	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __403
 	goto __405
 __405:
+	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
+	goto __404
+	goto __406
+__406:
 	;
 	if !(szThreshold != 0) {
-		goto __407
+		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))
 
-__407:
+__408:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18500,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18566,
 		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 __408
+		goto __409
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __409
-__408:
-	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+	goto __410
 __409:
+	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+__410:
 	;
-	goto __400
-__400:
-	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __399
 	goto __401
 __401:
+	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
+	goto __400
+	goto __402
+__402:
 	;
-	goto __396
-__396:
-	iDb++
-	goto __395
 	goto __397
 __397:
+	iDb++
+	goto __396
+	goto __398
+__398:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -88995,36 +89041,36 @@ __397:
 __53:
 	;
 	if !(zRight != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__410:
+__411:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __411
+		goto __412
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__411:
+__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 __412
+		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 __413
+		goto __414
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 656)))
-__413:
+__414:
 	;
-__412:
+__413:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -89033,10 +89079,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __414
+		goto __415
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664))&int64(0x7fffffff)))
-__414:
+__415:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -89045,10 +89091,10 @@ __57:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+672) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 672)) >= int64(0)) {
-		goto __415
+		goto __416
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 672)) & int64(0x7fffffff))
-__415:
+__416:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -89056,10 +89102,10 @@ __415:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __416
+		goto __417
 	}
 
-__416:
+__417:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -89111,14 +89157,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{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},
+	{FzName: ts + 18584, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18589, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18595, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18604, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18613, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18621, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18629},
+	{FzName: ts + 18636},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -89170,7 +89216,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+18576)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18642)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -89178,7 +89224,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18591, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18657, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -89191,19 +89237,19 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18598, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18664, 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+18604)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18670)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18616)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18682)
 		j++
 	}
-	Xsqlite3_str_append(tls, bp+32, ts+5360, 1)
+	Xsqlite3_str_append(tls, bp+32, ts+5379, 1)
 	Xsqlite3StrAccumFinish(tls, bp+32)
 
 	rc = Xsqlite3_declare_vtab(tls, db, bp+64)
@@ -89219,7 +89265,7 @@ __3:
 			(*PragmaVtab)(unsafe.Pointer(pTab)).FnHidden = U8(j)
 		}
 	} else {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	}
 
 	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
@@ -89367,7 +89413,7 @@ __1:
 		var zText uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 
 		if zText != 0 {
-			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, zText))
+			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, zText))
 			if *(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) == uintptr(0) {
 				return SQLITE_NOMEM
 			}
@@ -89383,13 +89429,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+18631)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18697)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18639, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18705, 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+18643, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18709, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -89398,7 +89444,7 @@ __3:
 	rc = Xsqlite3_prepare_v2(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
 	Xsqlite3_free(tls, zSql)
 	if rc != SQLITE_OK {
-		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
+		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
 		return rc
 	}
 	return pragmaVtabNext(tls, pVtabCursor)
@@ -89466,33 +89512,33 @@ 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+18647, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18713, 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, 137196)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137249)
 	} else {
 		var z uintptr
 		var zObj uintptr
 		if *(*uintptr)(unsafe.Pointer(azObj + 1*8)) != 0 {
 			zObj = *(*uintptr)(unsafe.Pointer(azObj + 1*8))
 		} else {
-			zObj = ts + 5411
+			zObj = ts + 5430
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18675, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18741, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18706, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18772, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137256)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18714,
-	ts + 18721,
-	ts + 18733,
+	ts + 18780,
+	ts + 18787,
+	ts + 18799,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -89552,7 +89598,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+14543)
+				corruptSchema(tls, pData, argv, ts+14562)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -89584,13 +89630,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+18744)
+			corruptSchema(tls, pData, argv, ts+18810)
 		} 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+14543)
+				corruptSchema(tls, pData, argv, ts+14562)
 			}
 		}
 	}
@@ -89623,16 +89669,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 + 9279
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 9298
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6792
+			return ts + 6811
 		}
-		return ts + 6286
+		return ts + 6305
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 8341
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18757
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 8360
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18823
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -89726,7 +89772,7 @@ __10:
 		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+12178)
+		ts+12197)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __15:
@@ -89761,7 +89807,7 @@ __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)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18895)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __19:
@@ -89775,7 +89821,7 @@ __20:
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18853,
+		ts+18919,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -90048,7 +90094,7 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
 	(*Parse)(unsafe.Pointer(pParse)).Fdb = db
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1483, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1502, 0)
 	}
 }
 
@@ -90076,7 +90122,7 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, bp+16, ts+1483, 0)
+	Xsqlite3ErrorMsg(tls, bp+16, ts+1502, 0)
 __1:
 	;
 	if !(prepFlags&U32(SQLITE_PREPARE_PERSISTENT) != 0) {
@@ -90107,7 +90153,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18887, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18953, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -90137,7 +90183,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18917, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18983, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -90197,7 +90243,7 @@ __21:
 	if !((*Parse)(unsafe.Pointer(bp+16)).FzErrMsg != 0) {
 		goto __22
 	}
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3658, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3677, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 	Xsqlite3DbFree(tls, db, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
 	goto __23
 __22:
@@ -90233,7 +90279,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, 137995)
+		return Xsqlite3MisuseError(tls, 138048)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -90332,7 +90378,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, 138143)
+		return Xsqlite3MisuseError(tls, 138196)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -90650,8 +90696,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 + 11323
-		var zSp2 uintptr = ts + 11323
+		var zSp1 uintptr = ts + 11342
+		var zSp2 uintptr = ts + 11342
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -90659,13 +90705,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18936, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+19002, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18966))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 19032))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -90840,7 +90886,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+19000, libc.VaList(bp, 0))
+					ts+19066, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -90885,7 +90931,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+19050, libc.VaList(bp+8, zName))
+						ts+19116, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -90896,7 +90942,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+19114,
+							Xsqlite3ErrorMsg(tls, pParse, ts+19180,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -90940,7 +90986,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6989, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 7008, 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.
@@ -91524,16 +91570,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 19151
+		z = ts + 19217
 		break
 	case TK_INTERSECT:
-		z = ts + 19161
+		z = ts + 19227
 		break
 	case TK_EXCEPT:
-		z = ts + 19171
+		z = ts + 19237
 		break
 	default:
-		z = ts + 19178
+		z = ts + 19244
 		break
 	}
 	return z
@@ -91543,7 +91589,7 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19184, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19250, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
@@ -91569,11 +91615,11 @@ 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 {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19273, libc.VaList(bp, func() uintptr {
 		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
-			return ts + 19238
+			return ts + 19304
 		}
-		return ts + 1547
+		return ts + 1566
 	}()))
 
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
@@ -91761,8 +91807,8 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 				}
 
 				if iCol < 0 {
-					zType = ts + 1112
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16673
+					zType = ts + 1131
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16692
 				} 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))
@@ -91901,13 +91947,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16673
+				zCol = ts + 16692
 			} 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+12464, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12483, 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))
@@ -91915,7 +91961,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+19253, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+19319, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -92005,7 +92051,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16673
+					zName = ts + 16692
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -92015,7 +92061,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+19253, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+19319, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -92031,7 +92077,7 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+19262, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+19328, 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)
@@ -92114,8 +92160,6 @@ __1:
 		(*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
@@ -92130,12 +92174,15 @@ __1:
 			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
 				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
 			}
+			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)
+			}
 		}
 		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
+				zType = ts + 19336
 			} else {
 				zType = uintptr(0)
 				for j = 1; j < SQLITE_N_STDTYPE; j++ {
@@ -92351,7 +92398,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19274, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19340, 0)
 	return
 __1:
 	;
@@ -92442,7 +92489,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19323, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19389, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -92462,7 +92509,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19365, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19431, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -92499,7 +92546,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19371, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19437, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -92533,11 +92580,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+19386, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19452, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
-			return ts + 1547
+			return ts + 1566
 		}
-		return ts + 3548
+		return ts + 3567
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -92638,8 +92685,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19409, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19424, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19475, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19490, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -92686,7 +92733,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19151, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19217, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -92753,7 +92800,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+19443, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19509, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -92815,7 +92862,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+19443, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19509, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -92968,10 +93015,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+19464, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19530, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19510,
+			ts+19576,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -93225,8 +93272,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+7637)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7637)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7645)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7645)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -93253,13 +93300,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+19592, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19658, 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+19603, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19669, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -93271,7 +93318,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+19608, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19674, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -93459,7 +93506,8 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 				Xsqlite3VectorErrorMsg(tls, (*SubstContext)(unsafe.Pointer(pSubst)).FpParse, pCopy)
 			} else {
 				var db uintptr = (*Parse)(unsafe.Pointer((*SubstContext)(unsafe.Pointer(pSubst)).FpParse)).Fdb
-				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 && int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN {
+				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 &&
+					(int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN || (*Expr)(unsafe.Pointer(pCopy)).FiTable != (*SubstContext)(unsafe.Pointer(pSubst)).FiNewTable) {
 					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_IF_NULL_ROW)
 					(*Expr)(unsafe.Pointer(bp)).FpLeft = pCopy
@@ -93499,7 +93547,7 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 								if pColl != 0 {
 									return (*CollSeq)(unsafe.Pointer(pColl)).FzName
 								}
-								return ts + 1092
+								return ts + 1111
 							}())
 					}
 
@@ -94287,12 +94335,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15567) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15586) == 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+15571) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15590) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -94358,7 +94406,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+19614, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19680, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -94441,7 +94489,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+19632, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19698, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -94570,7 +94618,7 @@ 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+19655, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19721, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
@@ -94593,7 +94641,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+19675, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19741, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -94609,7 +94657,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19718
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19784
 		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 {
@@ -94635,7 +94683,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+19741,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19807,
 					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
@@ -94646,9 +94694,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 + 19779
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19845
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19813
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19879
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -94695,7 +94743,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+19851, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19917, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -94807,7 +94855,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19855,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19921,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -94826,7 +94874,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+19894,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19960,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -94834,7 +94882,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+15136,
+					Xsqlite3ErrorMsg(tls, pParse, ts+15155,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -94935,7 +94983,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6849
+							zSchemaName = ts + 6868
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -94950,7 +94998,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+19925, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19991, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -95015,7 +95063,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+19930,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19996,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -95027,7 +95075,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+12464, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12483, 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)
@@ -95046,9 +95094,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19939, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+20005, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19957, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+20023, 0)
 					}
 				}
 			}
@@ -95058,7 +95106,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+19977, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+20043, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -95196,7 +95244,7 @@ func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect ui
 	(*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)
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSelect)).FpGroupBy)).FnExpr)
 		} 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)
 		}
@@ -95280,13 +95328,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+20008, 0)
+					ts+20074, 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+20059, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20125, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -95475,19 +95523,19 @@ 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+20092,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20158,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 20104
+						return ts + 20170
 					}
-					return ts + 1547
+					return ts + 1566
 				}(),
 				func() uintptr {
 					if bCover != 0 {
 						return (*Index)(unsafe.Pointer(pIdx)).FzName
 					}
-					return ts + 1547
+					return ts + 1566
 				}()))
 	}
 }
@@ -95500,7 +95548,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+8341)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+8360)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -95807,7 +95855,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20127,
+		ts+20193,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -95868,7 +95916,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20181,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20247,
 		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:
@@ -95972,7 +96020,7 @@ __27:
 	if !((*SrcItem)(unsafe.Pointer(pItem1)).FcolUsed == uint64(0) && (*SrcItem)(unsafe.Pointer(pItem1)).FzName != uintptr(0)) {
 		goto __30
 	}
-	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1547, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
+	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1566, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
 __30:
 	;
 	pSub1 = (*SrcItem)(unsafe.Pointer(pItem1)).FpSelect
@@ -96010,7 +96058,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+20221, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20287, 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)
@@ -96069,7 +96117,7 @@ __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20236, libc.VaList(bp+40, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20302, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
@@ -96540,9 +96588,9 @@ __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 + 20252
+				return ts + 20318
 			}
-			return ts + 20261
+			return ts + 20327
 		}())
 
 	groupBySort = 1
@@ -96893,7 +96941,7 @@ __65:
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
 		goto __146
 	}
-	explainTempTable(tls, pParse, ts+20252)
+	explainTempTable(tls, pParse, ts+20318)
 __146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
@@ -96976,7 +97024,7 @@ __7:
 	if !(i < nCol) {
 		goto __9
 	}
-	z = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
+	z = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
 	if !(z == uintptr(0)) {
 		goto __10
 	}
@@ -96998,7 +97046,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+20270, 0)
+		ts+20336, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -97094,7 +97142,7 @@ func Xsqlite3_get_table(tls *libc.TLS, db uintptr, zSql uintptr, pazResult uintp
 		if (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
 			if pzErrMsg != 0 {
 				Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(pzErrMsg)))
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
 			}
 			Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg)
 		}
@@ -97231,7 +97279,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+20335, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20401, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -97275,7 +97323,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+20381, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+20447, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -97293,7 +97341,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20389, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20455, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -97305,7 +97353,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+20381, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+20447, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -97320,11 +97368,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20430, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20496, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
+
 __17:
 	;
 	goto trigger_cleanup
@@ -97332,22 +97381,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6784, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6803, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20456, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20522, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20494,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20560,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20531
+				return ts + 20597
 			}
-			return ts + 20538
+			return ts + 20604
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -97356,7 +97405,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20544, libc.VaList(bp+24, pTableName+8))
+		ts+20610, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -97385,9 +97434,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 6792
+			return ts + 6811
 		}
-		return ts + 6286
+		return ts + 6305
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -97505,7 +97554,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+20381, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+20447, 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
@@ -97538,7 +97587,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20590,
+		ts+20656,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -97563,13 +97612,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20638,
+		ts+20704,
 		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+20713, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20779, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -97825,7 +97874,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20742, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20808, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -97864,9 +97913,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 + 6792
+				return ts + 6811
 			}
-			return ts + 6286
+			return ts + 6305
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -97878,7 +97927,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20762,
+			ts+20828,
 			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)
@@ -97992,12 +98041,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20824,
+		ts+20890,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20872
+				return ts + 20938
 			}
-			return ts + 20879
+			return ts + 20945
 		}()))
 __15:
 	;
@@ -98111,7 +98160,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+20886, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20952, 0)
 	return 1
 }
 
@@ -98177,7 +98226,7 @@ func codeReturningTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab
 	}
 	Xsqlite3ExprListDelete(tls, db, (*Select)(unsafe.Pointer(bp)).FpEList)
 	pNew = sqlite3ExpandReturning(tls, pParse, (*Returning)(unsafe.Pointer(pReturning)).FpReturnEL, pTab)
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0) {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
 		libc.X__builtin___memset_chk(tls, bp+240, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp+240, 0))
 		if (*Returning)(unsafe.Pointer(pReturning)).FnRetCol == 0 {
 			(*Returning)(unsafe.Pointer(pReturning)).FnRetCol = (*ExprList)(unsafe.Pointer(pNew)).FnExpr
@@ -98231,7 +98280,7 @@ func codeTriggerProgram(tls *libc.TLS, pParse uintptr, pStepList uintptr, orconf
 
 		if (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan != 0 {
 			Xsqlite3VdbeAddOp4(tls, v, OP_Trace, 0x7fffffff, 1, 0,
-				Xsqlite3MPrintf(tls, db, ts+6483, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
+				Xsqlite3MPrintf(tls, db, ts+6502, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
 				-6)
 		}
 
@@ -98341,7 +98390,7 @@ 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+20928, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20994, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
@@ -98934,7 +98983,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20942,
+		ts+21008,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -98966,7 +99015,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20978, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+21044, 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:
@@ -98976,7 +99025,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 8116
+				return ts + 8135
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -99292,7 +99341,12 @@ __74:
 	goto __77
 __76:
 	flags = WHERE_ONEPASS_DESIRED
-	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) && !(pTrigger != 0) && !(hasFK != 0) && !(chngKey != 0) && !(*(*int32)(unsafe.Pointer(bp + 104)) != 0)) {
+	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) &&
+		!(pTrigger != 0) &&
+		!(hasFK != 0) &&
+		!(chngKey != 0) &&
+		!(*(*int32)(unsafe.Pointer(bp + 104)) != 0) &&
+		(*NameContext)(unsafe.Pointer(bp+40)).FncFlags&NC_Subquery == 0) {
 		goto __78
 	}
 	flags = flags | WHERE_ONEPASS_MULTIROW
@@ -99846,7 +99900,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20997)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+21063)
 __169:
 	;
 update_cleanup:
@@ -100152,10 +100206,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+21010, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+21076, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+21014, libc.VaList(bp+8, bp+216))
+				ts+21080, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -100246,7 +100300,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+12553, -1)
+				ts+12572, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -100278,7 +100332,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+21087, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+21091, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+21153, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+21157, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -100426,14 +100480,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+21095)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+21161)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+21135)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+21201)
 	return SQLITE_ERROR
 __2:
 	;
@@ -100444,7 +100498,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+21178)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+21244)
 	return SQLITE_ERROR
 __5:
 	;
@@ -100453,7 +100507,7 @@ __5:
 	*(*uint32)(unsafe.Pointer(db + 76)) |= uint32(SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE)
 	goto __4
 __3:
-	zOut = ts + 1547
+	zOut = ts + 1566
 __4:
 	;
 	saved_flags = (*Sqlite3)(unsafe.Pointer(db)).Fflags
@@ -100472,7 +100526,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+21196, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+21262, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -100492,7 +100546,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+21219)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+21285)
 	goto end_of_vacuum
 __8:
 	;
@@ -100507,7 +100561,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14906)
+	rc = execSql(tls, db, pzErrMsg, ts+14925)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -100552,7 +100606,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21246,
+		ts+21312,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -100561,7 +100615,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21354,
+		ts+21420,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -100572,7 +100626,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21408,
+		ts+21474,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -100583,7 +100637,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21559,
+		ts+21625,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -100928,7 +100982,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+12780, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12799, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -101012,11 +101066,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+21689, libc.VaList(bp, pParse+272))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21755, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21713,
+			ts+21779,
 			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,
@@ -101026,7 +101080,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21812, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21878, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -101087,7 +101141,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+21831, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21897, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -101115,9 +101169,11 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FbDeclared = 0
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = bp + 32
+	(*Table)(unsafe.Pointer(pTab)).FnTabRef++
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{xConstruct})).f(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, pVTable+16, bp+64)
+	Xsqlite3DeleteTable(tls, db, pTab)
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = (*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -101125,9 +101181,9 @@ 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+21873, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21939, libc.VaList(bp+8, zModuleName))
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3658, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3677, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 		}
 		Xsqlite3DbFree(tls, db, pVTable)
@@ -101137,7 +101193,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 + 21903
+			var zFormat uintptr = ts + 21969
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -101149,12 +101205,12 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 			*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) = pVTable
 
 			for iCol = 0; iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol); iCol++ {
-				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1547)
+				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1566)
 				var nType int32
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16564, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16583, 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
@@ -101211,13 +101267,13 @@ 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+21949, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22015, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxConnect, bp+16)
 		if rc != SQLITE_OK {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3658, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3677, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 		}
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 16)))
@@ -101269,7 +101325,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+21949, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+22015, 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)
@@ -101303,7 +101359,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, 151030)
+		return Xsqlite3MisuseError(tls, 151102)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -101345,7 +101401,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR,
 			func() uintptr {
 				if (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
-					return ts + 3658
+					return ts + 3677
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg))
@@ -101713,7 +101769,7 @@ func Xsqlite3VtabEponymousTableInit(tls *libc.TLS, pParse uintptr, pMod uintptr)
 	addModuleArgument(tls, pParse, pTab, Xsqlite3DbStrDup(tls, db, (*Table)(unsafe.Pointer(pTab)).FzName))
 	rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer(pModule)).FxConnect, bp+8)
 	if rc != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+3658, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+		Xsqlite3ErrorMsg(tls, pParse, ts+3677, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		Xsqlite3VtabEponymousTableClear(tls, db, pMod)
 	}
@@ -101756,7 +101812,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, 151521)
+		rc = Xsqlite3MisuseError(tls, 151593)
 	} else {
 		ap = va
 		switch op {
@@ -101783,7 +101839,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 151539)
+				rc = Xsqlite3MisuseError(tls, 151611)
 				break
 
 			}
@@ -102014,10 +102070,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 + 21968
+		return ts + 22034
 	}
 	if i == -1 {
-		return ts + 16673
+		return ts + 16692
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -102026,35 +102082,35 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21975, 5)
+		Xsqlite3_str_append(tls, pStr, ts+22041, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21981, 1)
+		Xsqlite3_str_append(tls, pStr, ts+22047, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+13170, 1)
+			Xsqlite3_str_append(tls, pStr, ts+13189, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+5360, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5379, 1)
 	}
 
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21981, 1)
+		Xsqlite3_str_append(tls, pStr, ts+22047, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+13170, 1)
+			Xsqlite3_str_append(tls, pStr, ts+13189, 1)
 		}
-		Xsqlite3_str_append(tls, pStr, ts+5411, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5430, 1)
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+5360, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5379, 1)
 	}
 }
 
@@ -102071,29 +102127,29 @@ 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+21983, 2)
+	Xsqlite3_str_append(tls, pStr, ts+22049, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21975, 5)
+			Xsqlite3_str_append(tls, pStr, ts+22041, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21986
+				return ts + 22052
 			}
-			return ts + 21991
+			return ts + 22057
 		}(), 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+21999)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+22065)
 		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+22001)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+22067)
 	}
-	Xsqlite3_str_append(tls, pStr, ts+5360, 1)
+	Xsqlite3_str_append(tls, pStr, ts+5379, 1)
 }
 
 // This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
@@ -102134,11 +102190,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+22003, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+22069, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 22009
+				return ts + 22075
 			}
-			return ts + 22016
+			return ts + 22082
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -102148,43 +102204,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 + 11379
+					zFmt = ts + 11398
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 22021
+				zFmt = ts + 22087
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 22054
+				zFmt = ts + 22120
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 22079
+				zFmt = ts + 22145
 			} else {
-				zFmt = ts + 22097
+				zFmt = ts + 22163
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+22106, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+22172, 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 + 16673
-			Xsqlite3_str_appendf(tls, bp+64, ts+22114, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16692
+			Xsqlite3_str_appendf(tls, bp+64, ts+22180, 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+22145, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+22211, 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+22155, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+22221, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+22160,
+			Xsqlite3_str_appendf(tls, bp+64, ts+22226,
 				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+22187, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+22253, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -102216,25 +102272,25 @@ 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+22198, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+22264, 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+21986, 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+22052, 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+22219, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+22285, 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+21975, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+22041, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21986, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+22052, libc.VaList(bp+16, z))
 		}
 	}
-	Xsqlite3_str_append(tls, bp+24, ts+5360, 1)
+	Xsqlite3_str_append(tls, bp+24, ts+5379, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
@@ -103828,7 +103884,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22227, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22293, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -103856,7 +103912,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22242, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22308, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -104374,7 +104430,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+22251, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22317, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -104731,10 +104787,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{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)},
+	{FzOp: ts + 16541, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15869, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 15389, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 22331, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -105224,12 +105280,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22272, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+22338, 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+22272, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+22338, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -105308,7 +105364,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 + 7172
+			*(*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)
@@ -105402,7 +105458,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 22313
+				return ts + 22379
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -105778,7 +105834,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22320,
+			Xsqlite3ErrorMsg(tls, pParse, ts+22386,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -105794,7 +105850,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 		pRhs = Xsqlite3PExpr(tls, pParse, TK_UPLUS,
 			Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*ExprList_item)(unsafe.Pointer(pArgs+8+uintptr(j)*32)).FpExpr, 0), uintptr(0))
 		pTerm = Xsqlite3PExpr(tls, pParse, TK_EQ, pColRef, pRhs)
-		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ|JT_RIGHT) != 0 {
 			joinType = U32(EP_OuterON)
 		} else {
 			joinType = U32(EP_InnerON)
@@ -106512,7 +106568,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+22356, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+22422, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -106583,7 +106639,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 22382
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 22448
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -106757,6 +106813,10 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	var iCur int32
+	var saved_pIdxEpr uintptr
+
+	saved_pIdxEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 
 	addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	for __ccgo := true; __ccgo; __ccgo = iLevel < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel) {
@@ -106800,9 +106860,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, n)
 			var jj int32
 			for jj = 0; jj < n; jj++ {
-				var iCol int32 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(jj)*2)))
-
-				Xsqlite3ExprCodeGetColumnOfTable(tls, v, (*Index)(unsafe.Pointer(pIdx)).FpTable, iCur, iCol, r1+jj)
+				Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pIdx, iCur, jj, r1+jj)
 			}
 			Xsqlite3VdbeAddOp4Int(tls, v, OP_FilterAdd, (*WhereLevel)(unsafe.Pointer(pLevel)).FregFilter, 0, r1, n)
 			Xsqlite3ReleaseTempRange(tls, pParse, r1, n)
@@ -106836,6 +106894,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 		}
 	}
 	Xsqlite3VdbeJumpHere(tls, v, addrOnce)
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = saved_pIdxEpr
 }
 
 func allocateIndexInfo(tls *libc.TLS, pWInfo uintptr, pWC uintptr, mUnusable Bitmask, pSrc uintptr, pmNoOmit uintptr) uintptr {
@@ -106949,7 +107008,7 @@ __3:
 		uint64(unsafe.Sizeof(sqlite3_index_orderby{}))*uint64(nOrderBy)+uint64(unsafe.Sizeof(HiddenIndexInfo1{}))+
 		uint64(unsafe.Sizeof(uintptr(0)))*uint64(nTerm))
 	if pIdxInfo == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1483, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1502, 0)
 		return uintptr(0)
 	}
 	pHidden = pIdxInfo + 1*96
@@ -107071,9 +107130,9 @@ func vtabBestIndex(tls *libc.TLS, pParse uintptr, pTab uintptr, p uintptr) int32
 		if rc == SQLITE_NOMEM {
 			Xsqlite3OomFault(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb)
 		} else if !(int32((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3658, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3677, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3658, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3677, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
 		}
 	}
 	Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg)
@@ -107094,11 +107153,16 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 
 	_ = pParse
 
+	if !((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol)
+	} else {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnColumn)
+	}
 	nField = func() int32 {
-		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < (*Index)(unsafe.Pointer(pIdx)).FnSample {
+		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < nField {
 			return int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField)
 		}
-		return (*Index)(unsafe.Pointer(pIdx)).FnSample
+		return nField
 	}()
 	iCol = 0
 	iSample = (*Index)(unsafe.Pointer(pIdx)).FnSample * nField
@@ -108679,7 +108743,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+22393, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+22459, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -108737,7 +108801,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+22393, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+22459, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -109135,7 +109199,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+22419, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+22485, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -109742,7 +109806,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22454, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22520, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -109777,6 +109841,10 @@ __3:
 			if int32((*WherePath)(unsafe.Pointer(pFrom)).FisOrdered) == (*ExprList)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpOrderBy)).FnExpr {
 				(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_ORDERED)
 			}
+			if (*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy != 0 &&
+				int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) > (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr {
+				(*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat = I8((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr)
+			}
 		} else {
 			(*WhereInfo)(unsafe.Pointer(pWInfo)).FrevMask = (*WherePath)(unsafe.Pointer(pFrom)).FrevLoop
 			if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) <= 0 {
@@ -110071,6 +110139,9 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
+		if Xsqlite3IndexAffinityStr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pIdx) != 0 {
+			(*IndexedExpr)(unsafe.Pointer(p)).Faff = U8(*(*int8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FzColAff + uintptr(i))))
+		}
 		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
@@ -110223,7 +110294,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22472, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22538, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -110286,7 +110357,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22500, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22566, 0)
 	goto __5
 __4:
 	ii = 0
@@ -111168,7 +111239,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22518, -1)
+		pCtx, ts+22584, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -111301,7 +111372,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+22574, -1)
+					pCtx, ts+22640, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -111391,17 +111462,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-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))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22685))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22696))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22707))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22712))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22725))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22735))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22741))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22752))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22762))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22774))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22779))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -111447,7 +111518,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22717, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22783, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -111491,12 +111562,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+22736, 0)
+			ts+22802, 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+22807, 0)
+				ts+22873, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -111519,7 +111590,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+8341)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+8360)
 					}
 					break
 				}
@@ -111723,7 +111794,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+22870, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22936, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -111839,7 +111910,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+7933))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7941))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -111954,7 +112025,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22896, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22962, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -112019,15 +112090,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 + 22928
+				zErr = ts + 22994
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22945
+				zErr = ts + 23011
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22961
+				zErr = ts + 23027
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22981, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+23047, 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 {
@@ -112048,7 +112119,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+23014, 0)
+				ts+23080, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -112186,7 +112257,7 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regZero)
 	if eCond >= WINDOW_STARTING_NUM {
 		var regString int32 = Xsqlite3GetTempReg(tls, pParse)
-		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1547, -1)
+		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1566, -1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, Xsqlite3VdbeCurrentAddr(tls, v)+2, reg)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL))
 
@@ -112204,11 +112275,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 23061,
-	ts + 23114,
-	ts + 22518,
-	ts + 23165,
-	ts + 23217,
+	ts + 23127,
+	ts + 23180,
+	ts + 22584,
+	ts + 23231,
+	ts + 23283,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -112699,7 +112770,7 @@ func windowCodeRangeTest(tls *libc.TLS, p uintptr, op int32, csr1 int32, regVal
 
 	}
 
-	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1547, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1566, -1)
 	addrGe = Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, 0, reg1)
 
 	if op == OP_Ge && arith == OP_Add || op == OP_Le && arith == OP_Subtract {
@@ -113603,19 +113674,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+23267,
+				Xsqlite3ErrorMsg(tls, pParse, ts+23333,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 23309
+							return ts + 23375
 						}
-						return ts + 23318
+						return ts + 23384
 					}(),
 						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+23324, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+23390, 0)
 		}
 	}
 
@@ -113683,7 +113754,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+23358,
+		Xsqlite3ErrorMsg(tls, pParse, ts+23424,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -114780,7 +114851,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+23396, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23462, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -115755,21 +115826,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+16673, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16692, 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+23418, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23484, 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+16586, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16605, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+23418, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23484, 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))
@@ -116512,7 +116583,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+23445)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+23511)
 				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 {
@@ -116676,7 +116747,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+23454, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23520, 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))
@@ -116893,9 +116964,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 + 7167
+							return ts + 8116
 						}
-						return ts + 7172
+						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)))
@@ -117179,19 +117250,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+23478, 0)
+					ts+23544, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23573, 0)
+					ts+23639, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23657, 0)
+					ts+23723, 0)
 			}
 			break
 		case uint32(273):
@@ -117570,9 +117641,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+23454, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23520, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23742, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23808, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -118340,7 +118411,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+23759, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23825, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -118361,9 +118432,9 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 	}
 	if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg != 0 || (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_OK && (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_DONE {
 		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)))
+			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3677, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23784, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23850, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -118536,7 +118607,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23795, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23861, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -118549,11 +118620,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+20381, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+20447, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23802, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23868, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23807, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23873, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -118566,9 +118637,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23817, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23883, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23821, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23887, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -118638,7 +118709,8 @@ func sqlite3TestExtInit(tls *libc.TLS, db uintptr) int32 {
 	return Xsqlite3FaultSim(tls, 500)
 }
 
-var sqlite3BuiltinExtensions = [4]uintptr{
+var sqlite3BuiltinExtensions = [5]uintptr{
+	0,
 	0,
 	0,
 	0,
@@ -118802,7 +118874,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 174337)
+		return Xsqlite3MisuseError(tls, 174426)
 	}
 
 	ap = va
@@ -119377,7 +119449,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175111)
+		return Xsqlite3MisuseError(tls, 175200)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -119392,7 +119464,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23829, 0)
+			ts+23895, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -119583,23 +119655,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 + 23897
+	var zErr uintptr = ts + 23963
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23911
+			zErr = ts + 23977
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23933
+			zErr = ts + 23999
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23955
+			zErr = ts + 24021
 			break
 
 		}
@@ -119617,35 +119689,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23978,
-	ts + 23991,
+	ts + 24044,
+	ts + 24057,
 	uintptr(0),
-	ts + 24007,
-	ts + 24032,
-	ts + 24046,
-	ts + 24065,
-	ts + 1483,
-	ts + 24090,
-	ts + 24127,
-	ts + 24139,
-	ts + 24154,
-	ts + 24187,
+	ts + 24073,
+	ts + 24098,
+	ts + 24112,
+	ts + 24131,
+	ts + 1502,
+	ts + 24156,
+	ts + 24193,
 	ts + 24205,
-	ts + 24230,
-	ts + 24259,
+	ts + 24220,
+	ts + 24253,
+	ts + 24271,
+	ts + 24296,
+	ts + 24325,
 	uintptr(0),
-	ts + 6241,
-	ts + 5737,
-	ts + 24276,
-	ts + 24294,
-	ts + 24312,
+	ts + 6260,
+	ts + 5756,
+	ts + 24342,
+	ts + 24360,
+	ts + 24378,
 	uintptr(0),
-	ts + 24346,
+	ts + 24412,
 	uintptr(0),
-	ts + 24367,
-	ts + 24393,
-	ts + 24416,
-	ts + 24437,
+	ts + 24433,
+	ts + 24459,
+	ts + 24482,
+	ts + 24503,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -119766,7 +119838,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, 175758)
+		return Xsqlite3MisuseError(tls, 175847)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -119811,7 +119883,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+24453, 0)
+				ts+24519, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -119928,7 +120000,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+24516, libc.VaList(bp, zName))
+		ts+24582, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -119956,7 +120028,7 @@ func Xsqlite3_overload_function(tls *libc.TLS, db uintptr, zName uintptr, nArg i
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, zName))
+	zCopy = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, zName))
 	if zCopy == uintptr(0) {
 		return SQLITE_NOMEM
 	}
@@ -120164,7 +120236,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+24567, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24633, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -120257,7 +120329,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, 176503))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176592))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -120327,7 +120399,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, 176582)
+		return Xsqlite3MisuseError(tls, 176671)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -120337,7 +120409,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, 176591)
+		return Xsqlite3MisuseError(tls, 176680)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -120369,14 +120441,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, 176639)
+		return Xsqlite3MisuseError(tls, 176728)
 	}
 
 	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+24588, 0)
+				ts+24654, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -120506,7 +120578,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+24656, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24722, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -120551,10 +120623,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24662, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24728, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24672,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24738,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -120659,7 +120731,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24700, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24766, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -120670,17 +120742,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24704, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24770, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24704
+	zModeType = ts + 24770
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24710, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24776, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -120688,7 +120760,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 3265
+	zModeType = ts + 3284
 __32:
 	;
 	if !(aMode != 0) {
@@ -120718,7 +120790,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24715, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24781, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -120726,7 +120798,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24735,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24801,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -120766,7 +120838,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24759, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24825, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -120790,15 +120862,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24775, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24782, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24841, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24848, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{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},
+	{Fz: ts + 24856, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24859, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24862, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17803, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -120944,10 +121016,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+22313, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+22379, 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+24800, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24866, 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) {
@@ -120961,7 +121033,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 177308)
+	rc = Xsqlite3MisuseError(tls, 177397)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -120978,7 +121050,7 @@ __19:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3658
+			return ts + 3677
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -121012,9 +121084,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 + 6844
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6863
 	(*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 + 23802
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23868
 	(*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)
@@ -121119,7 +121191,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24806
+		zFilename = ts + 24872
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -121222,21 +121294,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+24809,
+	Xsqlite3_log(tls, iErr, ts+24875,
 		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+24834)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24900)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24854)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24920)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24861)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24927)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -121347,7 +121419,7 @@ __4:
 	autoinc = libc.Bool32(int32((*Table)(unsafe.Pointer(pTab)).FiPKey) == iCol && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != U32(0))
 	goto __13
 __12:
-	zDataType = ts + 1112
+	zDataType = ts + 1131
 	primarykey = 1
 __13:
 	;
@@ -121394,14 +121466,14 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24878, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24944, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3658
+			return ts + 3677
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -122050,7 +122122,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24906, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24972, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -122168,7 +122240,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 + 24914
+			return ts + 24980
 		}
 		return uintptr(0)
 	}(), 0)
@@ -122346,7 +122418,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6584, ts + 7167, ts + 7172, ts + 6594, ts + 6589, ts + 8408, ts + 24937, ts + 24943,
+	ts + 6603, ts + 8116, ts + 8121, ts + 6613, ts + 6608, ts + 8427, ts + 25003, ts + 25009,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -122499,7 +122571,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 + 24950 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 25016 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -122525,7 +122597,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	switch Xsqlite3_value_type(tls, pValue) {
 	case SQLITE_NULL:
 		{
-			jsonAppendRaw(tls, p, ts+6584, uint32(4))
+			jsonAppendRaw(tls, p, ts+6603, uint32(4))
 			break
 
 		}
@@ -122554,7 +122626,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+24967, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+25033, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -122612,19 +122684,19 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 	switch int32((*JsonNode)(unsafe.Pointer(pNode)).FeType) {
 	default:
 		{
-			jsonAppendRaw(tls, pOut, ts+6584, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6603, uint32(4))
 			break
 
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+7167, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+8116, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+7172, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+8121, uint32(5))
 			break
 
 		}
@@ -123169,17 +123241,17 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		}
 		return int32(j + U32(1))
 	} else if int32(c) == 'n' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6584, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6603, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		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+7167, 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+7172, 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))
@@ -123280,7 +123352,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+24996, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+25062, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -123586,7 +123658,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+25011, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+25077, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -123601,7 +123673,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+25015, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+25081, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -123655,7 +123727,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+25041,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+25107,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -123760,11 +123832,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+25084, uint32(2))
+					jsonAppendRaw(tls, bp, ts+25150, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
-					jsonAppendRaw(tls, bp, ts+5401, uint32(2))
+					jsonAppendRaw(tls, bp, ts+5420, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+25087, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+25153, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -123805,7 +123877,7 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if pNode != 0 {
 				jsonRenderNode(tls, pNode, bp, uintptr(0))
 			} else {
-				jsonAppendRaw(tls, bp, ts+6584, uint32(4))
+				jsonAppendRaw(tls, bp, ts+6603, uint32(4))
 			}
 		}
 		if i == argc {
@@ -123921,14 +123993,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+25090, -1)
+			ts+25156, -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+25141, -1)
+			Xsqlite3_result_error(tls, ctx, ts+25207, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -124023,7 +124095,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15783)
+	jsonWrongNumArgs(tls, ctx, ts+15802)
 	return
 __2:
 	;
@@ -124098,9 +124170,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 25175
+			return ts + 25241
 		}
-		return ts + 25179
+		return ts + 25245
 	}())
 	return
 __2:
@@ -124233,7 +124305,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+25186, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+25252, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -124330,7 +124402,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+25189, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+25255, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -124374,7 +124446,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+25192)
+		ts+25258)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -124505,7 +124577,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+25275, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+25341, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -124524,7 +124596,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+25281, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+25347, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -124620,7 +124692,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+25281, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+25347, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -124644,7 +124716,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 + 25286
+				zRoot = ts + 25352
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -124766,7 +124838,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+24996, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+25062, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -124861,25 +124933,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{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 + 25354},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25359},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25370},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25370},
 	{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}}
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 25401},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 25404},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25408},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25420},
+	{FnArg: int8(2), 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_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25443},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25454},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25466},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 25479},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25488},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25488},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25498},
+	{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 + 25509},
+	{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 + 25526}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -124898,8 +124970,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 25478, FpModule: 0},
-	{FzName: ts + 25488, FpModule: 0},
+	{FzName: ts + 25544, FpModule: 0},
+	{FzName: ts + 25554, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -125159,11 +125231,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+25498, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25564, 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+25506, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25572, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -125374,7 +125446,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+25511,
+		ts+25577,
 		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))
@@ -126077,7 +126149,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25593)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25659)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -126289,7 +126361,7 @@ func rtreeBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 2
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FneedToFreeIdxStr = 1
-	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, bp+8))) {
+	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, bp+8))) {
 		return SQLITE_NOMEM
 	}
 
@@ -127418,7 +127490,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25607, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25673, 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 {
@@ -127430,12 +127502,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+25627, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25693, 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+25659, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25725, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -127661,7 +127733,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+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))
+		ts+25762, 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))
@@ -127684,14 +127756,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25841
+	var zFmt uintptr = ts + 25907
 	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+11751, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11770, 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 {
@@ -127732,7 +127804,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25897, ts + 5463, ts + 16673,
+	ts + 25963, ts + 5482, ts + 16692,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -127775,19 +127847,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+25902,
+			ts+25968,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25964, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+26030, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25969,
+			ts+26035,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+26033,
+			ts+26099,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+26103,
+			ts+26169,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -127816,7 +127888,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 + 26152
+			zFormat = ts + 26218
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -127828,7 +127900,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+26260,
+			ts+26326,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -127836,18 +127908,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+26305, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+26371, 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+13170, 1)
+					Xsqlite3_str_append(tls, p, ts+13189, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+26332, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+26398, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+26354, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+26420, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+26362, 0)
+			Xsqlite3_str_appendf(tls, p, ts+26428, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -127862,14 +127934,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 26378,
-	ts + 26431,
-	ts + 26476,
-	ts + 26528,
-	ts + 26582,
-	ts + 26627,
-	ts + 26685,
-	ts + 26740,
+	ts + 26444,
+	ts + 26497,
+	ts + 26542,
+	ts + 26594,
+	ts + 26648,
+	ts + 26693,
+	ts + 26751,
+	ts + 26806,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -127898,7 +127970,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+26787, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26853, 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
@@ -127906,19 +127978,19 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 				(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = 4 + int32((*Rtree)(unsafe.Pointer(pRtree)).FnBytesPerCell)*RTREE_MAXCELLS
 			}
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26807,
+			ts+26873,
 			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 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26864,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26930,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -127960,16 +128032,16 @@ 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 + 26899,
-		ts + 26942,
-		ts + 26977,
-		ts + 27013,
+		ts + 26965,
+		ts + 27008,
+		ts + 27043,
+		ts + 27079,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
 		goto __1
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
 	return SQLITE_ERROR
 __1:
 	;
@@ -127994,7 +128066,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+27050,
+	Xsqlite3_str_appendf(tls, pSql, ts+27116,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -128006,7 +128078,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27074, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+27140, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -128029,7 +128101,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+27080, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27146, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -128040,14 +128112,14 @@ __10:
 	if !(ii < argc) {
 		goto __12
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
 	rc = SQLITE_ERROR
 	goto __13
 __12:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __14
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
 __14:
 	;
 __13:
@@ -128090,7 +128162,7 @@ __17:
 	if !(iErr != 0) {
 		goto __22
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
 	goto rtreeInit_fail
 __22:
 	;
@@ -128107,7 +128179,7 @@ __23:
 	if !(rc != 0) {
 		goto __24
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
 	goto rtreeInit_fail
 __24:
 	;
@@ -128125,7 +128197,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 27083, ts + 27094}
+var azFormat = [2]uintptr{ts + 27149, ts + 27160}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -128163,13 +128235,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+11323, 1)
+			Xsqlite3_str_append(tls, pOut, ts+11342, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+27104, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+27170, 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+27110, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+27176, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+27114, 1)
+		Xsqlite3_str_append(tls, pOut, ts+27180, 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})))
@@ -128180,7 +128252,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+27116, -1)
+		Xsqlite3_result_error(tls, ctx, ts+27182, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -128258,12 +128330,12 @@ 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+27149,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+27215,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
-						return ts + 4465
+						return ts + 4484
 					}
-					return ts + 1547
+					return ts + 1566
 				}(), z))
 			if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport == uintptr(0) {
 				(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
@@ -128282,7 +128354,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+27156,
+			ts+27222,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -128301,7 +128373,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+27201, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+27267, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -128315,8 +128387,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 + 27233,
-		ts + 27287,
+		ts + 27299,
+		ts + 27353,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -128331,23 +128403,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+27335,
+		rtreeCheckAppendMsg(tls, pCheck, ts+27401,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 27380
+					return ts + 27446
 				}
-				return ts + 27388
+				return ts + 27454
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27397,
+				ts+27463,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 27380
+						return ts + 27446
 					}
-					return ts + 27388
+					return ts + 27454
 				}(), iKey, iVal))
 		}
 	}
@@ -128371,7 +128443,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+27455, libc.VaList(bp, i, iCell, iNode))
+				ts+27521, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -128391,7 +128463,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+27503, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27569, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -128408,14 +128480,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+27570, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27636, 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+27604, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27670, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -128423,7 +128495,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+27634,
+					ts+27700,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -128452,14 +128524,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+27689,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27755,
 			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+27720, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27786, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -128481,12 +128553,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+14906, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14925, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27787, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27853, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -128495,12 +128567,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25607, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25673, 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+27815, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27881, 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)
 		}
@@ -128514,8 +128586,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+27846, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27853, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27912, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27919, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -128523,7 +128595,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+27861, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27927, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -128538,7 +128610,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27865, -1)
+			ts+27931, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -128546,7 +128618,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6844
+			zDb = ts + 6863
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -128556,7 +128628,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 + 18464
+				return ts + 18530
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -128927,11 +128999,11 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		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+27916, 1)
+		Xsqlite3_str_append(tls, x, ts+27982, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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+27984, 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+27929, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27995, 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)
 	}
@@ -128951,19 +129023,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+27940, 0)
+		Xsqlite3_str_appendf(tls, x, ts+28006, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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)))))
+			Xsqlite3_str_appendf(tls, x, ts+28024, 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+27966, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+28032, 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+27974, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+28040, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27978, 0)
+		Xsqlite3_str_appendf(tls, x, ts+28044, 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)
 	}
@@ -129883,7 +129955,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+27991, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+28057, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -129892,7 +129964,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+28013, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+28079, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -129900,7 +129972,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+27080, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27146, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -129911,7 +129983,7 @@ __5:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __7
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
 __7:
 	;
 __6:
@@ -129936,7 +130008,7 @@ __9:
 	if !(rc != 0) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	goto geopolyInit_fail
 __10:
 	;
@@ -130127,7 +130199,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 + 16673
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16692
 		(*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
@@ -130137,7 +130209,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 + 28017
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 28083
 		(*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
@@ -130145,7 +130217,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 + 28023
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 28089
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -130257,7 +130329,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+28032, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+28098, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -130389,14 +130461,14 @@ geopoly_update_end:
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
 	_ = pVtab
 	_ = nArg
-	if Xsqlite3_stricmp(tls, zName, ts+28072) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+28138) == 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+28088) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+28154) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -130461,7 +130533,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+28103, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+28169, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -130473,25 +130545,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{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},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28177},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28190},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28203},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 28216},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 28154},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 28228},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 28138},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 28251},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28265},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 28278},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 28292},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28308},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 28254},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 28320},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -130501,26 +130573,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+28273, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+28339, 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+28283, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+28349, 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+28294, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+28360, -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+28017, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+28083, 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+28305, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+28371, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -130574,7 +130646,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+25593, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25659, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -130901,7 +130973,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+28315, -1)
+		Xsqlite3_result_error(tls, context, ts+28381, -1)
 		return
 	}
 
@@ -130912,7 +130984,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+28315, -1)
+			Xsqlite3_result_error(tls, context, ts+28381, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -130925,7 +130997,7 @@ func prepareAndCollectError(tls *libc.TLS, db uintptr, ppStmt uintptr, pzErrmsg
 
 	var rc int32 = Xsqlite3_prepare_v2(tls, db, zSql, -1, ppStmt, uintptr(0))
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 		*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	}
 	return rc
@@ -130937,7 +131009,7 @@ func resetAndCollectError(tls *libc.TLS, pStmt uintptr, pzErrmsg uintptr) int32
 
 	var rc int32 = Xsqlite3_reset(tls, pStmt)
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
 	}
 	return rc
 }
@@ -131013,7 +131085,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+28336, uintptr(0), uintptr(0), p+64)
+				ts+28402, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -131077,7 +131149,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+25506, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25572, 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++ {
 				}
@@ -131098,16 +131170,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+28507, libc.VaList(bp, func() uintptr {
+			ts+28573, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28657
+					return ts + 28723
 				}
-				return ts + 1547
+				return ts + 1566
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28698)
+			ts+28764)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -131205,7 +131277,7 @@ func rbuFinalize(tls *libc.TLS, p uintptr, pStmt uintptr) {
 	var rc int32 = Xsqlite3_finalize(tls, pStmt)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && rc != SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 	}
 }
 
@@ -131223,7 +131295,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+28823, libc.VaList(bp, zTab)))
+			ts+28889, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -131241,7 +131313,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+28942, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+29008, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -131259,7 +131331,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28963, libc.VaList(bp+16, zIdx)))
+			ts+29029, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -131282,7 +131354,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+29014, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+29080, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -131328,7 +131400,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+29035, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+29101, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -131343,7 +131415,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+29063, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+29129, 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 {
@@ -131383,7 +131455,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+19939, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+20005, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -131393,18 +131465,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+29092, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+29158, 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+29111, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+29177, 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+29116, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+29182, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -131416,18 +131488,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+29126, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+29192, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 29155
+							return ts + 29221
 						}
-						return ts + 29168
+						return ts + 29234
 					}()))
 		}
 
 		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+29177, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+29243, 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)
@@ -131441,7 +131513,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+29199,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29265,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -131484,12 +131556,12 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	defer tls.Free(24)
 
 	var zList uintptr = uintptr(0)
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	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+29226, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 15017
+		zList = rbuMPrintf(tls, p, ts+29292, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 15036
 	}
 	return zList
 }
@@ -131500,13 +131572,13 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 
 	var iPk int32 = 1
 	var zRet uintptr = uintptr(0)
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	for 1 != 0 {
 		var i int32
 		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+29235, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+29301, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -131528,25 +131600,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+29248, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+29314, 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+29280, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+29346, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		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)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1566, ts+15036, ts+29369)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+29375, ts+29382, ts+5379)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1566, ts+15036, ts+1566)
 
 		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+29324,
+					ts+29390,
 					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+29366, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+29432, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -131583,12 +131655,12 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	zVector = uintptr(0)
 	zRet = uintptr(0)
 	bFailed = 0
-	zSep = ts + 1547
+	zSep = ts + 1566
 	iCol = 0
 	*(*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+29063, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+29129, 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
@@ -131623,7 +131695,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 29386
+	zCol = ts + 29452
 __7:
 	;
 	goto __5
@@ -131631,13 +131703,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+29394,
+	zLhs = rbuMPrintf(tls, p, ts+29460,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+29415,
+	zOrder = rbuMPrintf(tls, p, ts+29481,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+29451,
+	zSelect = rbuMPrintf(tls, p, ts+29517,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 15017
+	zSep = ts + 15036
 	iCol++
 	goto __1
 __2:
@@ -131655,12 +131727,12 @@ __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+29478,
+		Xsqlite3_mprintf(tls, ts+29544,
 			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
 	}
-	zSep = ts + 1547
+	zSep = ts + 1566
 	iCol = 0
 __14:
 	if !(iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnCol) {
@@ -131682,8 +131754,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29526, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 15017
+	zVector = rbuMPrintf(tls, p, ts+29592, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 15036
 	goto __15
 __15:
 	iCol++
@@ -131694,7 +131766,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29533, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29599, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -131721,13 +131793,13 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 	var zImpPK uintptr = uintptr(0)
 	var zWhere uintptr = uintptr(0)
 	var nBind int32 = 0
-	var zCom uintptr = ts + 1547
-	var zAnd uintptr = ts + 1547
+	var zCom uintptr = ts + 1566
+	var zAnd uintptr = ts + 1566
 	*(*uintptr)(unsafe.Pointer(bp + 200)) = uintptr(0)
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+29063, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+29129, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -131739,9 +131811,9 @@ 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+29545, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29611, 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
+			zType = ts + 1566
 		} else {
 			if iCid < 0 {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK {
@@ -131751,37 +131823,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 + 29386
+					zCol = ts + 29452
 				} else {
-					zCol = ts + 29116
+					zCol = ts + 29182
 				}
-				zType = ts + 1112
+				zType = ts + 1131
 			} 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+29567, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29633, 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 + 29303
+					return ts + 29369
 				}
-				return ts + 1547
+				return ts + 1566
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29587,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29653,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29608,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29674,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29641, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29707, 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 + 15017
-		zAnd = ts + 21975
+		zCom = ts + 15036
+		zAnd = ts + 22041
 		nBind++
 	}
 
@@ -131815,16 +131887,16 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 
 	var zList uintptr = uintptr(0)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
-		var zS uintptr = ts + 1547
+		var zS uintptr = ts + 1566
 		var i int32
 		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+29665, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29731, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29677, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29743, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 15017
+			zS = ts + 15036
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -131832,7 +131904,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+29686, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29752, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -131844,27 +131916,27 @@ 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+29701, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29767, 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 zSep uintptr = ts + 1566
 		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+29715, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21975
+				zList = rbuMPrintf(tls, p, ts+29781, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 22041
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29727, libc.VaList(bp+40, zList))
+			ts+29793, libc.VaList(bp+40, zList))
 
 	} else {
-		var zSep uintptr = ts + 1547
+		var zSep uintptr = ts + 1566
 		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 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29777, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21975
+				zList = rbuMPrintf(tls, p, ts+29843, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 22041
 			}
 		}
 	}
@@ -131873,7 +131945,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+29790, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29856, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -131887,21 +131959,21 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 		if int32(libc.Xstrlen(tls, zMask)) != (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 			rbuBadControlError(tls, p)
 		} else {
-			var zSep uintptr = ts + 1547
+			var zSep uintptr = ts + 1566
 			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+29777,
+					zList = rbuMPrintf(tls, p, ts+29843,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 15017
+					zSep = ts + 15036
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29816,
+					zList = rbuMPrintf(tls, p, ts+29882,
 						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 + 15017
+					zSep = ts + 15036
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29846,
+					zList = rbuMPrintf(tls, p, ts+29912,
 						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 + 15017
+					zSep = ts + 15036
 				}
 			}
 		}
@@ -131936,19 +132008,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 + 29883
+		var zSep uintptr = ts + 29949
 		*(*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+29035, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+29101, 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+16561) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16580) == 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+29063, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+29129, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -131960,15 +132032,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 + 29303
+					zDesc = ts + 29369
 				} else {
-					zDesc = ts + 1547
+					zDesc = ts + 1566
 				}
-				z = rbuMPrintf(tls, p, ts+29896, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 15017
+				z = rbuMPrintf(tls, p, ts+29962, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 15036
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29907, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29973, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -131983,12 +132055,12 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		*(*uintptr)(unsafe.Pointer(bp + 168)) = uintptr(0)
 		var zIdx uintptr = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
-		var zComma uintptr = ts + 1547
+		var zComma uintptr = ts + 1566
 		var zCols uintptr = uintptr(0)
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29911)
+			ts+29977)
 		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))) {
@@ -131997,7 +132069,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+29063, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+29129, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -132007,25 +132079,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+29961, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+30027, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29983, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+30049, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 29303
+						return ts + 29369
 					}
-					return ts + 1547
+					return ts + 1566
 				}()))
-				zComma = ts + 15017
+				zComma = ts + 15036
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29993, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+30059, 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+6844, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+30008,
+			ts+30074,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, 0, 0))
 	}
 }
 
@@ -132035,50 +132107,50 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
 		var tnum int32 = (*RbuObjIter)(unsafe.Pointer(pIter)).FiTnum
-		var zComma uintptr = ts + 1547
+		var zComma uintptr = ts + 1566
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
-			var zPk uintptr = ts + 1547
+			var zPk uintptr = ts + 1566
 			var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCol)*8))
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, (*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 + 30070
+				zPk = ts + 30136
 			}
-			zSql = rbuMPrintf(tls, p, ts+30083,
+			zSql = rbuMPrintf(tls, p, ts+30149,
 				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 + 30110
+							return ts + 30176
 						}
-						return ts + 1547
+						return ts + 1566
 					}()))
-			zComma = ts + 15017
+			zComma = ts + 15036
 		}
 
 		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+30120, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+30186, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		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,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+30193,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 30159
+						return ts + 30225
 					}
-					return ts + 1547
+					return ts + 1566
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, 0, 0))
 	}
 }
 
@@ -132091,7 +132163,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+30174,
+				ts+30240,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -132128,7 +132200,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+30231)
+			ts+30297)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -132233,7 +132305,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+30297, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+30363, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -132253,24 +132325,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+6844, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+30317,
+				ts+30383,
 				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+6844, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, 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+30382, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+30448, 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+30418, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+30484, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -132286,7 +132358,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30452,
+						ts+30518,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -132294,31 +132366,31 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 30513
+											return ts + 30579
 										}
-										return ts + 30517
+										return ts + 30583
 									}()
 								}
-								return ts + 1547
+								return ts + 1566
 							}(), zStart,
 							zCollist, zLimit))
 					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+30523,
+						ts+30589,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30584,
+						ts+30650,
 						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 + 30513
+									return ts + 30579
 								}
-								return ts + 30517
+								return ts + 30583
 							}(),
 							zCollist, zLimit))
 				}
@@ -132343,8 +132415,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+6855)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6851)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6874)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6870)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -132353,52 +132425,52 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			rbuCreateImposterTable2(tls, p, pIter)
 			zWrite = func() uintptr {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
-					return ts + 1547
+					return ts + 1566
 				}
-				return ts + 30743
+				return ts + 30809
 			}()
 
 			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+30752,
+						ts+30818,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30788
+								return ts + 30854
 							}
-							return ts + 1547
+							return ts + 1566
 						}(), zBindings)))
 			}
 
 			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+30798, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30864, 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
+				var zRbuRowid uintptr = ts + 1566
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30826
+					zRbuRowid = ts + 30892
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30838, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30904, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30914
+							return ts + 30980
 						}
-						return ts + 1547
+						return ts + 1566
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30931,
+					ts+30997,
 					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+31230,
+						ts+31296,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -132406,14 +132478,14 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-				var zRbuRowid uintptr = ts + 1547
+				var zRbuRowid uintptr = ts + 1566
 				var zStart uintptr = uintptr(0)
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 31329
+						zRbuRowid = ts + 31395
 					} else {
-						zRbuRowid = ts + 31339
+						zRbuRowid = ts + 31405
 					}
 				}
 
@@ -132426,35 +132498,35 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+29386, 0)
+						zOrder = rbuMPrintf(tls, p, ts+29452, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+15017, ts+1547)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1566, ts+15036, ts+1566)
 					}
 				}
 
 				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+31350,
+							ts+31416,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 31398
+										return ts + 31464
 									}
-									return ts + 1547
+									return ts + 1566
 								}(),
 								zRbuRowid,
 								(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 									if zStart != 0 {
 										return zStart
 									}
-									return ts + 1547
+									return ts + 1566
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 23309
+										return ts + 23375
 									}
-									return ts + 1547
+									return ts + 1566
 								}(), zOrder,
 								zLimit)))
 				}
@@ -132517,12 +132589,12 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 		(*RbuObjIter)(unsafe.Pointer(pIter)).FpRbuUpdate = pUp
 
 		if zSet != 0 {
-			var zPrefix uintptr = ts + 1547
+			var zPrefix uintptr = ts + 1566
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30743
+				zPrefix = ts + 30809
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+31404,
+			zUpdate = Xsqlite3_mprintf(tls, ts+31470,
 				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)
@@ -132549,7 +132621,7 @@ func rbuOpenDbhandle(tls *libc.TLS, p uintptr, zName uintptr, bUseVfs int32) uin
 			return uintptr(0)
 		}())
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
 			Xsqlite3_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 			*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 		}
@@ -132581,7 +132653,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+31434, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+31500, 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:
@@ -132651,28 +132723,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+6844, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6863, 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+6844)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31464, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6863)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31530, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		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))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31558, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.X__builtin___memcpy_chk(tls, p+48, ts+3298, uint64(4), libc.X__builtin_object_size(tls, p+48, 0))
 	} else {
-		libc.X__builtin___memcpy_chk(tls, p+48, ts+6844, uint64(4), libc.X__builtin_object_size(tls, p+48, 0))
+		libc.X__builtin___memcpy_chk(tls, p+48, ts+6863, uint64(4), libc.X__builtin_object_size(tls, p+48, 0))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31510, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31576, 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+6844, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6863, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -132705,11 +132777,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+31576, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31642, 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+24656, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24722, (*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)))) == '?' {
@@ -132721,16 +132793,16 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31608,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6844),
+			zTarget = Xsqlite3_mprintf(tls, ts+31674,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6863),
 					func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1547
+							return ts + 1566
 						}
-						return ts + 31640
+						return ts + 31706
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1547
+							return ts + 1566
 						}
 						return zExtra
 					}()))
@@ -132746,37 +132818,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+31642, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31708, -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+31657, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31723, 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+31674, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31740, -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+6844, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31690, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31756, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, 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+31718, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31784, 0)
 	}
 }
 
@@ -132805,14 +132877,14 @@ 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+31690, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31756, 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+31736, uintptr(0), uintptr(0), uintptr(0))
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31802, uintptr(0), uintptr(0), uintptr(0))
 		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
@@ -132921,7 +132993,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+6844, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6863, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -132938,23 +133010,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+31771, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31837, 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+6844)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863)
 	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+6844)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6863)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31796, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31803, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31862, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31869, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -133071,7 +133143,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+24294, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+24360, 0)
 			return
 		}
 
@@ -133164,7 +133236,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+31810)
+			ts+31876)
 		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)
@@ -133172,7 +133244,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+31832, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31898, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -133193,7 +133265,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+31859,
+				ts+31925,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -133223,9 +133295,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+32017, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+32083, 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+32032,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32098,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -133239,10 +133311,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+32052, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32118, 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+32077)
+			ts+32143)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -133256,12 +133328,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+32185)
+			ts+32251)
 	}
 
 	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+32250)
+			ts+32316)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -133273,7 +133345,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+32294, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32360, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -133293,15 +133365,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+17662)
-					rbuCopyPragma(tls, p, ts+16757)
+					rbuCopyPragma(tls, p, ts+17681)
+					rbuCopyPragma(tls, p, ts+16776)
 				}
 
 				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+32319, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+32385, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -133325,10 +133397,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+14921, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14940, 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+14921, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14940, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -133423,7 +133495,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+32347, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32413, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -133439,10 +133511,10 @@ func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31796, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31862, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 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)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6863, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
@@ -133456,7 +133528,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+32372, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+32438, 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)
@@ -133490,7 +133562,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+32383, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+32449, 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 {
@@ -133520,13 +133592,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+32455, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32521, 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+32469)
+				ts+32535)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -133537,7 +133609,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+32526)
+				ts+32592)
 			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)
@@ -133582,7 +133654,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			libc.X__builtin___memcpy_chk(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, zRbu, nRbu+uint64(1), libc.X__builtin_object_size(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, 0))
 			pCsr += uintptr(nRbu + uint64(1))
 			if zState != 0 {
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3658, libc.VaList(bp, zState))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3677, libc.VaList(bp, zState))
 			}
 
 			rbuOpenDatabase(tls, p, uintptr(0), bp+16)
@@ -133611,7 +133683,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+32600, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32666, 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
@@ -133629,12 +133701,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+32632,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32698,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32664
+							return ts + 32730
 						}
-						return ts + 32671
+						return ts + 32737
 					}()))
 			}
 		}
@@ -133642,7 +133714,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+14906, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14925, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -133653,19 +133725,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+17376)
-						rbuCopyPragma(tls, p, ts+16772)
+						rbuCopyPragma(tls, p, ts+17395)
+						rbuCopyPragma(tls, p, ts+16791)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32678, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32744, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6844, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6863, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32694, uintptr(0), uintptr(0), p+64)
+								db, ts+32760, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -133719,7 +133791,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+32718, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32784, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -133746,7 +133818,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+30743, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30809, 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++
@@ -133763,7 +133835,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+14921, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14940, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -133776,13 +133848,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+14921, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14940, 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+32726, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32792, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -133877,7 +133949,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+14921, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14940, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -133894,19 +133966,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+14921, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14940, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14906
+				zBegin = ts + 14925
 			} else {
-				zBegin = ts + 32678
+				zBegin = ts + 32744
 			}
 			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+32678, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32744, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -134252,7 +134324,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+32753, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32819, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -134277,7 +134349,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+32776, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32842, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -134422,7 +134494,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+6844)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6863)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -134437,7 +134509,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+32787, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32853, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -134682,6 +134754,970 @@ func Xsqlite3rbu_temp_size(tls *libc.TLS, pRbu uintptr) Sqlite3_int64 {
 	return (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FszTemp
 }
 
+var zDbstatSchema = *(*[258]int8)(unsafe.Pointer(ts + 32864))
+
+// Forward reference to data structured used in this module
+type StatTable1 = struct {
+	Fbase        Sqlite3_vtab
+	Fdb          uintptr
+	FiDb         int32
+	F__ccgo_pad1 [4]byte
+}
+
+// Forward reference to data structured used in this module
+type StatTable = StatTable1
+type StatCursor1 = struct {
+	Fbase        Sqlite3_vtab_cursor
+	FpStmt       uintptr
+	FisEof       U8
+	FisAgg       U8
+	F__ccgo_pad1 [2]byte
+	FiDb         int32
+	FaPage       [32]StatPage
+	FiPage       int32
+	FiPageno     U32
+	FzName       uintptr
+	FzPath       uintptr
+	FzPagetype   uintptr
+	FnPage       int32
+	FnCell       int32
+	FnMxPayload  int32
+	F__ccgo_pad2 [4]byte
+	FnUnused     I64
+	FnPayload    I64
+	FiOffset     I64
+	FszPage      I64
+}
+
+type StatCursor = StatCursor1
+type StatPage1 = struct {
+	FiPgno         U32
+	F__ccgo_pad1   [4]byte
+	FaPg           uintptr
+	FiCell         int32
+	F__ccgo_pad2   [4]byte
+	FzPath         uintptr
+	Fflags         U8
+	F__ccgo_pad3   [3]byte
+	FnCell         int32
+	FnUnused       int32
+	F__ccgo_pad4   [4]byte
+	FaCell         uintptr
+	FiRightChildPg U32
+	FnMxPayload    int32
+}
+
+type StatPage = StatPage1
+type StatCell1 = struct {
+	FnLocal      int32
+	FiChildPg    U32
+	FnOvfl       int32
+	F__ccgo_pad1 [4]byte
+	FaOvfl       uintptr
+	FnLastOvfl   int32
+	FiOvfl       int32
+}
+
+type StatCell = StatCell1
+
+func statConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var pTab uintptr = uintptr(0)
+	var rc int32 = SQLITE_OK
+	var iDb int32
+	_ = pAux
+
+	if argc >= 4 {
+		Xsqlite3TokenInit(tls, bp+8, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
+		iDb = Xsqlite3FindDb(tls, db, bp+8)
+		if iDb < 0 {
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+12293, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
+			return SQLITE_ERROR
+		}
+	} else {
+		iDb = 0
+	}
+	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_DIRECTONLY, 0)
+	rc = Xsqlite3_declare_vtab(tls, db, uintptr(unsafe.Pointer(&zDbstatSchema)))
+	if rc == SQLITE_OK {
+		pTab = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatTable{})))
+		if pTab == uintptr(0) {
+			rc = SQLITE_NOMEM
+		}
+	}
+
+	if rc == SQLITE_OK {
+		libc.X__builtin___memset_chk(tls, pTab, 0, uint64(unsafe.Sizeof(StatTable{})), libc.X__builtin_object_size(tls, pTab, 0))
+		(*StatTable)(unsafe.Pointer(pTab)).Fdb = db
+		(*StatTable)(unsafe.Pointer(pTab)).FiDb = iDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
+	return rc
+}
+
+func statDisconnect(tls *libc.TLS, pVtab uintptr) int32 {
+	Xsqlite3_free(tls, pVtab)
+	return SQLITE_OK
+}
+
+func statBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
+	var i int32
+	var iSchema int32 = -1
+	var iName int32 = -1
+	var iAgg int32 = -1
+	_ = tab
+
+	for i = 0; i < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; i++ {
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fop) != SQLITE_INDEX_CONSTRAINT_EQ {
+			continue
+		}
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fusable) == 0 {
+			return SQLITE_CONSTRAINT
+		}
+		switch (*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(i)*12)).FiColumn {
+		case 0:
+			{
+				iName = i
+				break
+
+			}
+		case 10:
+			{
+				iSchema = i
+				break
+
+			}
+		case 11:
+			{
+				iAgg = i
+				break
+
+			}
+		}
+	}
+	i = 0
+	if iSchema >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).Fomit = uint8(1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x01
+	}
+	if iName >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iName)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x02
+	}
+	if iAgg >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iAgg)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x04
+	}
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 1.0
+
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy == 1 &&
+		(*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)).FnOrderBy == 2 &&
+		(*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_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).FiColumn == 1 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x08
+	}
+
+	return SQLITE_OK
+}
+
+func statOpen(tls *libc.TLS, pVTab uintptr, ppCursor uintptr) int32 {
+	var pTab uintptr = pVTab
+	var pCsr uintptr
+
+	pCsr = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatCursor{})))
+	if pCsr == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		libc.X__builtin___memset_chk(tls, pCsr, 0, uint64(unsafe.Sizeof(StatCursor{})), libc.X__builtin_object_size(tls, pCsr, 0))
+		(*StatCursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab = pVTab
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppCursor)) = pCsr
+	return SQLITE_OK
+}
+
+func statClearCells(tls *libc.TLS, p uintptr) {
+	var i int32
+	if (*StatPage)(unsafe.Pointer(p)).FaCell != 0 {
+		for i = 0; i < (*StatPage)(unsafe.Pointer(p)).FnCell; i++ {
+			Xsqlite3_free(tls, (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell+uintptr(i)*32)).FaOvfl)
+		}
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FaCell)
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnCell = 0
+	(*StatPage)(unsafe.Pointer(p)).FaCell = uintptr(0)
+}
+
+func statClearPage(tls *libc.TLS, p uintptr) {
+	var aPg uintptr = (*StatPage)(unsafe.Pointer(p)).FaPg
+	statClearCells(tls, p)
+	Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FzPath)
+	libc.X__builtin___memset_chk(tls, p, 0, uint64(unsafe.Sizeof(StatPage{})), libc.X__builtin_object_size(tls, p, 0))
+	(*StatPage)(unsafe.Pointer(p)).FaPg = aPg
+}
+
+func statResetCsr(tls *libc.TLS, pCsr uintptr) {
+	var i int32
+
+	for i = 0; i < int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{}))); i++ {
+		statClearPage(tls, pCsr+24+uintptr(i)*64)
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(pCsr+24+uintptr(i)*64)).FaPg)
+		(*StatPage)(unsafe.Pointer(pCsr + 24 + uintptr(i)*64)).FaPg = uintptr(0)
+	}
+	Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(0)
+}
+
+func statResetCounts(tls *libc.TLS, pCsr uintptr) {
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnCell = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnUnused = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPayload = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FszPage = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 0
+}
+
+func statClose(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	Xsqlite3_free(tls, pCsr)
+	return SQLITE_OK
+}
+
+func getLocalPayload(tls *libc.TLS, nUsable int32, flags U8, nTotal int32) int32 {
+	var nLocal int32
+	var nMinLocal int32
+	var nMaxLocal int32
+
+	if int32(flags) == 0x0D {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = nUsable - 35
+	} else {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = (nUsable-12)*64/255 - 23
+	}
+
+	nLocal = nMinLocal + (nTotal-nMinLocal)%(nUsable-4)
+	if nLocal > nMaxLocal {
+		nLocal = nMinLocal
+	}
+	return nLocal
+}
+
+func statDecodePage(tls *libc.TLS, pBt uintptr, p uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var nUnused int32
+	var iOff int32
+	var nHdr int32
+	var isLeaf int32
+	var szPage int32
+	var aData uintptr
+	var aHdr uintptr
+	var iNext int32
+
+	var rc int32
+	var iPrev U32
+
+	var j int32
+	var nOvfl int32
+
+	var nLocal int32
+	var pCell uintptr
+	var i int32
+	var nUsable int32
+	aData = (*StatPage)(unsafe.Pointer(p)).FaPg
+	aHdr = aData + uintptr(func() int32 {
+		if (*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1) {
+			return 100
+		}
+		return 0
+	}())
+
+	(*StatPage)(unsafe.Pointer(p)).Fflags = *(*U8)(unsafe.Pointer(aHdr))
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0A || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __1
+	}
+	isLeaf = 1
+	nHdr = 8
+	goto __2
+__1:
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05 || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x02) {
+		goto __3
+	}
+	isLeaf = 0
+	nHdr = 12
+	goto __4
+__3:
+	goto statPageIsCorrupt
+__4:
+	;
+__2:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1)) {
+		goto __5
+	}
+	nHdr = nHdr + 100
+__5:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnCell = int32(*(*U8)(unsafe.Pointer(aHdr + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 3 + 1)))
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = 0
+	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
+
+	nUnused = int32(*(*U8)(unsafe.Pointer(aHdr + 5)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 5 + 1))) - nHdr - 2*(*StatPage)(unsafe.Pointer(p)).FnCell
+	nUnused = nUnused + int32(*(*U8)(unsafe.Pointer(aHdr + 7)))
+	iOff = int32(*(*U8)(unsafe.Pointer(aHdr + 1)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 1 + 1)))
+__6:
+	if !(iOff != 0) {
+		goto __7
+	}
+	if !(iOff >= szPage) {
+		goto __8
+	}
+	goto statPageIsCorrupt
+__8:
+	;
+	nUnused = nUnused + (int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2) + 1))))
+	iNext = int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff) + 1)))
+	if !(iNext < iOff+4 && iNext > 0) {
+		goto __9
+	}
+	goto statPageIsCorrupt
+__9:
+	;
+	iOff = iNext
+	goto __6
+__7:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnUnused = nUnused
+	(*StatPage)(unsafe.Pointer(p)).FiRightChildPg = func() uint32 {
+		if isLeaf != 0 {
+			return uint32(0)
+		}
+		return Xsqlite3Get4byte(tls, aHdr+8)
+	}()
+
+	if !((*StatPage)(unsafe.Pointer(p)).FnCell != 0) {
+		goto __10
+	}
+
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = szPage - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatPage)(unsafe.Pointer(p)).FaCell = Xsqlite3_malloc64(tls, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+	if !((*StatPage)(unsafe.Pointer(p)).FaCell == uintptr(0)) {
+		goto __11
+	}
+	return SQLITE_NOMEM
+__11:
+	;
+	libc.X__builtin___memset_chk(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})), libc.X__builtin_object_size(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0))
+
+	i = 0
+__12:
+	if !(i < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __14
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr(i)*32
+
+	iOff = int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2) + 1)))
+	if !(iOff < nHdr || iOff >= szPage) {
+		goto __15
+	}
+	goto statPageIsCorrupt
+__15:
+	;
+	if !!(isLeaf != 0) {
+		goto __16
+	}
+	(*StatCell)(unsafe.Pointer(pCell)).FiChildPg = Xsqlite3Get4byte(tls, aData+uintptr(iOff))
+	iOff = iOff + 4
+__16:
+	;
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05) {
+		goto __17
+	}
+
+	goto __18
+__17:
+	iOff = iOff + int32(func() uint8 {
+		if int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff)))) < int32(U8(0x80)) {
+			return uint8(func() int32 {
+				*(*U32)(unsafe.Pointer(bp)) = U32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))
+				return 1
+			}())
+		}
+		return Xsqlite3GetVarint32(tls, aData+uintptr(iOff), bp)
+	}())
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __19
+	}
+	iOff = iOff + int32(Xsqlite3GetVarint(tls, aData+uintptr(iOff), bp+8))
+__19:
+	;
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32((*StatPage)(unsafe.Pointer(p)).FnMxPayload)) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = int32(*(*U32)(unsafe.Pointer(bp)))
+__20:
+	;
+	nLocal = getLocalPayload(tls, nUsable, (*StatPage)(unsafe.Pointer(p)).Fflags, int32(*(*U32)(unsafe.Pointer(bp))))
+	if !(nLocal < 0) {
+		goto __21
+	}
+	goto statPageIsCorrupt
+__21:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLocal = nLocal
+
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32(nLocal)) {
+		goto __22
+	}
+	nOvfl = int32((*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) + U32(nUsable) - U32(4) - U32(1)) / U32(nUsable-4))
+	if !(iOff+nLocal+4 > nUsable || *(*U32)(unsafe.Pointer(bp)) > U32(0x7fffffff)) {
+		goto __23
+	}
+	goto statPageIsCorrupt
+__23:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl = int32(*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) - U32((nOvfl-1)*(nUsable-4)))
+	(*StatCell)(unsafe.Pointer(pCell)).FnOvfl = nOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FaOvfl = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(U32(0)))*uint64(nOvfl))
+	if !((*StatCell)(unsafe.Pointer(pCell)).FaOvfl == uintptr(0)) {
+		goto __24
+	}
+	return SQLITE_NOMEM
+__24:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl)) = Xsqlite3Get4byte(tls, aData+uintptr(iOff+nLocal))
+	j = 1
+__25:
+	if !(j < nOvfl) {
+		goto __27
+	}
+	iPrev = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j-1)*4))
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPrev, bp+16, 0)
+	if !(rc != SQLITE_OK) {
+		goto __28
+	}
+
+	return rc
+__28:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j)*4)) = Xsqlite3Get4byte(tls, Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 16))))
+	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
+	goto __26
+__26:
+	j++
+	goto __25
+	goto __27
+__27:
+	;
+__22:
+	;
+__18:
+	;
+	goto __13
+__13:
+	i++
+	goto __12
+	goto __14
+__14:
+	;
+__10:
+	;
+	return SQLITE_OK
+
+statPageIsCorrupt:
+	(*StatPage)(unsafe.Pointer(p)).Fflags = U8(0)
+	statClearCells(tls, p)
+	return SQLITE_OK
+}
+
+func statSizeAndOffset(tls *libc.TLS, pCsr uintptr) {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCsr)).FpVtab
+	var pBt uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatTable)(unsafe.Pointer(pTab)).FiDb)*32)).FpBt
+	var pPager uintptr = Xsqlite3BtreePager(tls, pBt)
+	var fd uintptr
+
+	fd = Xsqlite3PagerFile(tls, pPager)
+	*(*Sqlite3_int64)(unsafe.Pointer(bp)) = Sqlite3_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	if Xsqlite3OsFileControl(tls, fd, 230440, bp) == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = *(*Sqlite3_int64)(unsafe.Pointer(bp))
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += *(*Sqlite3_int64)(unsafe.Pointer(bp + 1*8))
+	} else {
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += I64(Xsqlite3BtreeGetPageSize(tls, pBt))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = (*StatCursor)(unsafe.Pointer(pCsr)).FszPage * I64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno-U32(1))
+	}
+}
+
+func statGetPage(tls *libc.TLS, pBt uintptr, iPg U32, pPg uintptr) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var pgsz int32 = Xsqlite3BtreeGetPageSize(tls, pBt)
+	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
+	var rc int32
+
+	if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+		(*StatPage)(unsafe.Pointer(pPg)).FaPg = Xsqlite3_malloc(tls, pgsz+DBSTAT_PAGE_PADDING_BYTES)
+		if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+			return SQLITE_NOMEM
+		}
+		libc.X__builtin___memset_chk(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0, uint64(DBSTAT_PAGE_PADDING_BYTES), libc.X__builtin_object_size(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0))
+	}
+
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPg, bp, 0)
+	if rc == SQLITE_OK {
+		var a uintptr = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		libc.X__builtin___memcpy_chk(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, a, uint64(pgsz), libc.X__builtin_object_size(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, 0))
+		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+	}
+
+	return rc
+}
+
+func statNext(tls *libc.TLS, pCursor uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
+	var rc int32
+	var nPayload int32
+	var z uintptr
+	var pCsr uintptr
+	var pTab uintptr
+	var pBt uintptr
+	var pPager uintptr
+
+	var iRoot U32
+	var nUsable int32
+	var iOvfl int32
+	var pCell uintptr
+
+	var p uintptr
+	var i int32
+	var p1 uintptr
+	pCsr = pCursor
+	pTab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	pBt = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FpBt
+	pPager = Xsqlite3BtreePager(tls, pBt)
+
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+
+statNextRestart:
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __1
+	}
+
+	statResetCounts(tls, pCsr)
+	rc = Xsqlite3_step(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	if !(rc == SQLITE_ROW) {
+		goto __3
+	}
+	iRoot = U32(Xsqlite3_column_int64(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 1))
+	Xsqlite3PagerPagecount(tls, pPager, bp+48)
+	if !(*(*int32)(unsafe.Pointer(bp + 48)) == 0) {
+		goto __5
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__5:
+	;
+	rc = statGetPage(tls, pBt, iRoot, pCsr+24)
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiPgno = iRoot
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __6
+	}
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+3911, 0))
+	if !(z == uintptr(0)) {
+		goto __7
+	}
+	rc = SQLITE_NOMEM
+__7:
+	;
+__6:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 1
+	goto __4
+__3:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__4:
+	;
+	goto __2
+__1:
+	p = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __8
+	}
+	statResetCounts(tls, pCsr)
+__8:
+	;
+__9:
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __10
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32
+__11:
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl) {
+		goto __12
+	}
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = Xsqlite3BtreeGetPageSize(tls, pBt) - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	statSizeAndOffset(tls, pCsr)
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl-1) {
+		goto __13
+	}
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nUsable - 4)
+	goto __14
+__13:
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64((*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64(nUsable - 4 - (*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+__14:
+	;
+	iOvfl = (*StatCell)(unsafe.Pointer(pCell)).FiOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FiOvfl++
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __15
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(iOvfl)*4))
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 33122
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls,
+		ts+33131, libc.VaList(bp, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell, iOvfl)))
+	if z == uintptr(0) {
+		return SQLITE_NOMEM
+	}
+	return SQLITE_OK
+__15:
+	;
+	goto __11
+__12:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiRightChildPg != 0) {
+		goto __16
+	}
+	goto __10
+__16:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+	goto __9
+__10:
+	;
+	if !(!(int32((*StatPage)(unsafe.Pointer(p)).FiRightChildPg) != 0) || (*StatPage)(unsafe.Pointer(p)).FiCell > (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __17
+	}
+	statClearPage(tls, p)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage--
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 && (*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __18
+	}
+
+	return SQLITE_OK
+__18:
+	;
+	goto statNextRestart
+__17:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage++
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage >= int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{})))) {
+		goto __19
+	}
+	statResetCsr(tls, pCsr)
+	return Xsqlite3CorruptError(tls, 215455)
+__19:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell == (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatPage)(unsafe.Pointer(p)).FiRightChildPg
+	goto __21
+__20:
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32)).FiChildPg
+__21:
+	;
+	rc = statGetPage(tls, pBt, (*StatPage)(unsafe.Pointer(p+1*64)).FiPgno, p+1*64)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __22
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+33143, libc.VaList(bp+24, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell)))
+	if !(z == uintptr(0)) {
+		goto __23
+	}
+	rc = SQLITE_NOMEM
+__23:
+	;
+__22:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+__2:
+	;
+	if !(rc == SQLITE_OK) {
+		goto __24
+	}
+	p1 = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = (*StatPage)(unsafe.Pointer(p1)).FiPgno
+
+	rc = statDecodePage(tls, pBt, p1)
+	if !(rc == SQLITE_OK) {
+		goto __25
+	}
+	statSizeAndOffset(tls, pCsr)
+
+	switch int32((*StatPage)(unsafe.Pointer(p1)).Fflags) {
+	case 0x05:
+		goto __27
+	case 0x02:
+		goto __28
+	case 0x0D:
+		goto __29
+	case 0x0A:
+		goto __30
+	default:
+		goto __31
+	}
+	goto __26
+__27:
+__28:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 33151
+	goto __26
+__29:
+__30:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 33160
+	goto __26
+__31:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 33165
+	goto __26
+__26:
+	;
+	*(*int32)(unsafe.Pointer(pCsr + 2108)) += (*StatPage)(unsafe.Pointer(p1)).FnCell
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64((*StatPage)(unsafe.Pointer(p1)).FnUnused)
+	if !((*StatPage)(unsafe.Pointer(p1)).FnMxPayload > (*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload) {
+		goto __32
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = (*StatPage)(unsafe.Pointer(p1)).FnMxPayload
+__32:
+	;
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __33
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+40, (*StatPage)(unsafe.Pointer(p1)).FzPath)))
+	if !(z == uintptr(0)) {
+		goto __34
+	}
+	rc = SQLITE_NOMEM
+__34:
+	;
+__33:
+	;
+	nPayload = 0
+	i = 0
+__35:
+	if !(i < (*StatPage)(unsafe.Pointer(p1)).FnCell) {
+		goto __37
+	}
+	nPayload = nPayload + (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p1)).FaCell+uintptr(i)*32)).FnLocal
+	goto __36
+__36:
+	i++
+	goto __35
+	goto __37
+__37:
+	;
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nPayload)
+
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0) {
+		goto __38
+	}
+	goto statNextRestart
+__38:
+	;
+__25:
+	;
+__24:
+	;
+	return rc
+}
+
+func statEof(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	return int32((*StatCursor)(unsafe.Pointer(pCsr)).FisEof)
+}
+
+func statFilter(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintptr, argc int32, argv uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pCsr uintptr = pCursor
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	var pSql uintptr
+	var zSql uintptr
+	var iArg int32 = 0
+	var rc int32 = SQLITE_OK
+	var zName uintptr = uintptr(0)
+	_ = argc
+	_ = idxStr
+
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FpStmt = uintptr(0)
+	if idxNum&0x01 != 0 {
+		var zDbase uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = Xsqlite3FindDbName(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zDbase)
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FiDb < 0 {
+			(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = 0
+			(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+			return SQLITE_OK
+		}
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+	if idxNum&0x02 != 0 {
+		zName = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+	}
+	if idxNum&0x04 != 0 {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(libc.Bool32(Xsqlite3_value_double(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8))) != 0.0))
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(0)
+	}
+	pSql = Xsqlite3_str_new(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb)
+	Xsqlite3_str_appendf(tls, pSql,
+		ts+33175,
+		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb+uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FzDbSName))
+	if zName != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+33330, libc.VaList(bp+8, zName))
+	}
+	if idxNum&0x08 != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+33344, 0)
+	}
+	zSql = Xsqlite3_str_finish(tls, pSql)
+	if zSql == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		rc = Xsqlite3_prepare_v2(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
+		Xsqlite3_free(tls, zSql)
+	}
+
+	if rc == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = -1
+		rc = statNext(tls, pCursor)
+	}
+	return rc
+}
+
+func statColumn(tls *libc.TLS, pCursor uintptr, ctx uintptr, i int32) int32 {
+	var pCsr uintptr = pCursor
+	switch i {
+	case 0:
+		Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzName, -1, libc.UintptrFromInt32(-1))
+		break
+	case 1:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath, -1, libc.UintptrFromInt32(-1))
+		}
+		break
+	case 2:
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnPage))
+		} else {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno))
+		}
+		break
+	case 3:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype, -1, uintptr(0))
+		}
+		break
+	case 4:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnCell))
+		break
+	case 5:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnPayload)
+		break
+	case 6:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnUnused)
+		break
+	case 7:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload))
+		break
+	case 8:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FiOffset)
+		}
+		break
+	case 9:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FszPage)
+		break
+	case 10:
+		{
+			var db uintptr = Xsqlite3_context_db_handle(tls, ctx)
+			var iDb int32 = (*StatCursor)(unsafe.Pointer(pCsr)).FiDb
+			Xsqlite3_result_text(tls, ctx, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, -1, uintptr(0))
+			break
+
+		}
+	default:
+		{
+			Xsqlite3_result_int(tls, ctx, int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg))
+			break
+
+		}
+	}
+	return SQLITE_OK
+}
+
+func statRowid(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32 {
+	var pCsr uintptr = pCursor
+	*(*Sqlite_int64)(unsafe.Pointer(pRowid)) = Sqlite_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	return SQLITE_OK
+}
+
+// Invoke this routine to register the "dbstat" virtual table module
+func Xsqlite3DbstatRegister(tls *libc.TLS, db uintptr) int32 {
+	return Xsqlite3_create_module(tls, db, ts+33359, uintptr(unsafe.Pointer(&dbstat_module)), uintptr(0))
+}
+
+var dbstat_module = Sqlite3_module{
+	FxCreate:     0,
+	FxConnect:    0,
+	FxBestIndex:  0,
+	FxDisconnect: 0,
+	FxDestroy:    0,
+	FxOpen:       0,
+	FxClose:      0,
+	FxFilter:     0,
+	FxNext:       0,
+	FxEof:        0,
+	FxColumn:     0,
+	FxRowid:      0,
+}
+
 type SessionTable1 = struct {
 	FpNext    uintptr
 	FzName    uintptr
@@ -135262,13 +136298,13 @@ 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+11751, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11770, 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+32798, 0)
+				ts+33366, 0)
 		} else if rc == SQLITE_ERROR {
-			zPragma = Xsqlite3_mprintf(tls, ts+1547, 0)
+			zPragma = Xsqlite3_mprintf(tls, ts+1566, 0)
 		} else {
 			*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
 			*(*uintptr)(unsafe.Pointer(pabPK)) = uintptr(0)
@@ -135279,7 +136315,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32919, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+33487, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -135377,7 +136413,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11751, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11770, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -135626,7 +136662,7 @@ __4:
 	goto error_out
 __7:
 	;
-	Xsqlite3ValueSetStr(tls, p, 0, ts+1547, uint8(0), uintptr(0))
+	Xsqlite3ValueSetStr(tls, p, 0, ts+1566, uint8(0), uintptr(0))
 	(*Sqlite3_session)(unsafe.Pointer(pSession)).FpZeroBlob = p
 __6:
 	;
@@ -135954,14 +136990,14 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	var zRet uintptr = uintptr(0)
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32948,
+			zRet = Xsqlite3_mprintf(tls, ts+33516,
 				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 + 21975
+			zSep = ts + 22041
 			if zRet == uintptr(0) {
 				break
 			}
@@ -135976,7 +137012,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	var zRet uintptr = uintptr(0)
 	var bHave int32 = 0
 
@@ -135984,9 +137020,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+32982,
+				ts+33550,
 				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 + 33023
+			zSep = ts + 33591
 			if zRet == uintptr(0) {
 				break
 			}
@@ -135994,7 +137030,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7933, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7941, 0)
 	}
 
 	return zRet
@@ -136005,7 +137041,7 @@ func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintpt
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+33028,
+		ts+33596,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -136048,7 +137084,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+33106,
+			ts+33674,
 			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
@@ -136175,7 +137211,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33159, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33727, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -136440,7 +137476,7 @@ func sessionAppendInteger(tls *libc.TLS, p uintptr, iVal int32, pRc uintptr) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
-	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]int8{}))-uint64(1)), bp+8, ts+5378, libc.VaList(bp, iVal))
+	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]int8{}))-uint64(1)), bp+8, ts+5397, libc.VaList(bp, iVal))
 	sessionAppendStr(tls, p, bp+8, pRc)
 }
 
@@ -136649,29 +137685,29 @@ 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+11751, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11770, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+33186, libc.VaList(bp, zDb))
+			ts+33754, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
 	} else {
 		var i int32
-		var zSep uintptr = ts + 1547
+		var zSep uintptr = ts + 1566
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+33296, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33864, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
-		sessionAppendStr(tls, bp+8, ts+1560, bp+24)
+		sessionAppendStr(tls, bp+8, ts+1579, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+33311, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33879, 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+33319, bp+24)
+				sessionAppendStr(tls, bp+8, ts+33887, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21975
+				zSep = ts + 22041
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -136780,7 +137816,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+33325, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33893, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -136872,7 +137908,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+33345, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33913, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -137135,7 +138171,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, 219078)
+				rc = Xsqlite3CorruptError(tls, 219169)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -137158,7 +138194,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, 219098)
+						rc = Xsqlite3CorruptError(tls, 219189)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -137200,7 +138236,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, 219152)
+			rc = Xsqlite3CorruptError(tls, 219243)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -137261,7 +138297,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, 219240)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219331)
 		}
 	}
 
@@ -137335,13 +138371,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, 219326))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219417))
 	}
 
 	(*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, 219332))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219423))
 	}
 
 	if paRec != 0 {
@@ -137403,7 +138439,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, 219376))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219467))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -137776,7 +138812,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219832)
 	goto finished_invert
 __6:
 	;
@@ -137944,45 +138980,45 @@ 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+11751) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11770) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
 			} else {
-				var zSep uintptr = ts + 1547
+				var zSep uintptr = ts + 1566
 
 				libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(SessionBuffer{})), libc.X__builtin_object_size(tls, bp, 0))
 				(*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+33363, bp+16)
+				sessionAppendStr(tls, bp, ts+33931, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+33376, bp+16)
+				sessionAppendStr(tls, bp, ts+33944, 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+33382, bp+16)
+						sessionAppendStr(tls, bp, ts+33950, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 15017
+						zSep = ts + 15036
 					}
 				}
 
-				zSep = ts + 1547
-				sessionAppendStr(tls, bp, ts+33311, bp+16)
+				zSep = ts + 1566
+				sessionAppendStr(tls, bp, ts+33879, 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+33387, bp+16)
+								ts+33955, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+33319, bp+16)
+							sessionAppendStr(tls, bp, ts+33887, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21975
+						zSep = ts + 22041
 					}
 				}
 
@@ -138029,42 +139065,42 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	defer tls.Free(20)
 
 	var i int32
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+33462, bp+16)
+	sessionAppendStr(tls, bp, ts+34030, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+33311, bp+16)
+	sessionAppendStr(tls, bp, ts+33879, 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+33382, bp+16)
+			sessionAppendStr(tls, bp, ts+33950, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21975
+			zSep = ts + 22041
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+33480, bp+16)
+		sessionAppendStr(tls, bp, ts+34048, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+33023, bp+16)
+		sessionAppendStr(tls, bp, ts+33591, bp+16)
 
-		zSep = ts + 1547
+		zSep = ts + 1566
 		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+33319, bp+16)
+				sessionAppendStr(tls, bp, ts+33887, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 33488
+				zSep = ts + 34056
 			}
 		}
-		sessionAppendStr(tls, bp, ts+5360, bp+16)
+		sessionAppendStr(tls, bp, ts+5379, bp+16)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
@@ -138077,7 +139113,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+6844, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6863, 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 {
@@ -138088,21 +139124,21 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+33493, bp+16)
+	sessionAppendStr(tls, bp, ts+34061, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21981, bp+16)
+	sessionAppendStr(tls, bp, ts+22047, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+15017, bp+16)
+			sessionAppendStr(tls, bp, ts+15036, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+33511, bp+16)
+	sessionAppendStr(tls, bp, ts+34079, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33522, bp+16)
+		sessionAppendStr(tls, bp, ts+34090, bp+16)
 	}
-	sessionAppendStr(tls, bp, ts+5360, bp+16)
+	sessionAppendStr(tls, bp, ts+5379, bp+16)
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v2(tls, db, (*SessionBuffer)(unsafe.Pointer(bp)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp)).FnBuf, p+16, uintptr(0))
@@ -138116,14 +139152,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+11751, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11770, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+33526)
+			ts+34094)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33639)
+			ts+34207)
 	}
 	return rc
 }
@@ -138151,7 +139187,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, 220219)
+				rc = Xsqlite3CorruptError(tls, 220310)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -138404,7 +139440,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+33783, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34351, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -138420,7 +139456,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+33804, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+34372, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -138493,10 +139529,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+33823, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+34391, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33849, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+34417, 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))
@@ -138529,7 +139565,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				f func(*libc.TLS, uintptr, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xFilter})).f(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 176))))
 			if schemaMismatch != 0 {
-				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
+				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
 				if *(*uintptr)(unsafe.Pointer(bp + 200)) == uintptr(0) {
 					rc = SQLITE_NOMEM
 					break
@@ -138542,7 +139578,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+6844, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6863, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -138555,19 +139591,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+33879, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+34447, 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+33923,
+						ts+34491,
 						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+33994, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+34562, 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+11751) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11770) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -138618,14 +139654,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+34054, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34622, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+34084, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34652, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+34108, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+34084, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34676, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34652, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -139873,7 +140909,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+34136, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+34704, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -140161,7 +141197,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+34164, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+34732, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -140348,7 +141384,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+34195, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34763, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -140416,7 +141452,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 34202
+		var zErr uintptr = ts + 34770
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -140575,7 +141611,7 @@ func fts5ValueToText(tls *libc.TLS, pVal uintptr) uintptr {
 	if zRet != 0 {
 		return zRet
 	}
-	return ts + 1547
+	return ts + 1566
 }
 
 func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, nVal int32, apVal uintptr) {
@@ -140598,7 +141634,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 34252
+		var zErr uintptr = ts + 34820
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -140922,13 +141958,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 34300, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34868, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 34308, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34876, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 34318, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34886, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -141339,7 +142375,7 @@ func fts5ConfigSkipLiteral(tls *libc.TLS, pIn uintptr) uintptr {
 	case 'n':
 		fallthrough
 	case 'N':
-		if Xsqlite3_strnicmp(tls, ts+6584, p, 4) == 0 {
+		if Xsqlite3_strnicmp(tls, ts+6603, p, 4) == 0 {
 			p = p + 4
 		} else {
 			p = uintptr(0)
@@ -141479,7 +142515,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+34323, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34891, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -141506,14 +142542,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+34330, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34898, 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+34361, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+34929, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -141524,7 +142560,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34394, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34962, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -141537,7 +142573,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34431, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34999, 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)))
@@ -141546,7 +142582,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+34440, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35008, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -141565,7 +142601,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34473, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35041, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -141580,14 +142616,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34507, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35075, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34515, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35083, 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+34547, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+35115, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -141595,9 +142631,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34553, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35121, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34567, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35135, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -141605,9 +142641,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34605, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35173, 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+34616, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35184, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -141615,21 +142651,21 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+5478, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+5497, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 8429, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17767},
-			{FzName: ts + 34651, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8448, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17786},
+			{FzName: ts + 35219, 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+34659, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35227, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34690, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35258, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -141676,15 +142712,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+22641) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16673) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34718, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22707) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16692) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35286, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34748) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+35316) {
 			*(*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+34758, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35326, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -141701,13 +142737,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+34789, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35357, 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+34794, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35362, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34801, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35369, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -141745,8 +142781,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+22641) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34809, 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+22707) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35377, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -141778,7 +142814,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+34838, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35406, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -141787,13 +142823,13 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 							if *(*uintptr)(unsafe.Pointer(bp + 48)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 48))
 							}
-							return ts + 1547
+							return ts + 1566
 						}(),
 						func() uintptr {
 							if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 64))
 							}
-							return ts + 1547
+							return ts + 1566
 						}(),
 						pzErr)
 				} else {
@@ -141815,19 +142851,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 + 34507
+			zTail = ts + 35075
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34858
+			zTail = ts + 35426
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34866, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+35434, 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+16673, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16692, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -141871,18 +142907,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+34877, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35445, 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 + 1566
 			}
-			return ts + 15017
+			return ts + 15036
 		}()
-		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+35461, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34900,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22641))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35468,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22707))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -141992,7 +143028,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34926) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35494) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -142002,7 +143038,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+34931) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35499) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -142012,7 +143048,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+34940) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35508) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -142025,7 +143061,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+34950) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35518) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -142035,7 +143071,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+34960) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35528) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -142051,7 +143087,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+22641) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22707) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -142074,7 +143110,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34972
+	var zSelect uintptr = ts + 35540
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -142096,7 +143132,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+35004) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35572) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -142110,7 +143146,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+35012,
+				ts+35580,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -142208,7 +143244,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+35077, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+35645, 0)
 					return FTS5_EOF
 				}
 			}
@@ -142221,20 +143257,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+35097, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+35665, 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+35128, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35696, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35131, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35699, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30513, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30579, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -144012,9 +145048,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+35135, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35703, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+34164, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+34732, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -144030,7 +145066,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+35140, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+35708, 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')
@@ -144117,7 +145153,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20978, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+21044, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -144198,7 +145234,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+35169, 0)
+			ts+35737, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -144368,12 +145404,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+35222,
+								ts+35790,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 35272
+										return ts + 35840
 									}
-									return ts + 35135
+									return ts + 35703
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -145316,7 +146352,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+35279, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35847, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -145395,7 +146431,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+35285,
+			ts+35853,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -145420,7 +146456,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+35336,
+			ts+35904,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -145443,7 +146479,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+35385,
+			ts+35953,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -145682,7 +146718,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+35425, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+35993, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -146881,7 +147917,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+35448,
+			ts+36016,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -148074,7 +149110,7 @@ func fts5WriteFlushBtree(tls *libc.TLS, p uintptr, pWriter uintptr) {
 			if (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn > 0 {
 				return (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fp
 			}
-			return ts + 1547
+			return ts + 1566
 		}()
 
 		Xsqlite3_bind_blob(tls, (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter, 2, z, (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn, uintptr(0))
@@ -148347,7 +149383,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+35532,
+			ts+36100,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -149413,7 +150449,7 @@ func sqlite3Fts5IndexReinit(tls *libc.TLS, p uintptr) int32 {
 	fts5StructureInvalidate(tls, p)
 	fts5IndexDiscardData(tls, p)
 	libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(Fts5Structure{})), libc.X__builtin_object_size(tls, bp, 0))
-	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1547, 0)
+	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1566, 0)
 	fts5StructureWrite(tls, p, bp)
 	return fts5IndexReturn(tls, p)
 }
@@ -149429,13 +150465,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+35589, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+36157, 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+25506, ts+35597, 0, pzErr)
+				pConfig, ts+25572, ts+36165, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11891,
-					ts+35632,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11910,
+					ts+36200,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -149688,7 +150724,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+35279, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+35847, 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)))
@@ -149802,7 +150838,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35676,
+		ts+36244,
 		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))) {
@@ -149972,7 +151008,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+35762)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+36330)
 			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))
@@ -150243,7 +151279,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+35767, 0)
+			ts+36335, 0)
 		return SQLITE_ERROR
 	}
 
@@ -150274,7 +151310,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 				} else if iCol >= 0 {
 					bSeenMatch = 1
 					*(*int8)(unsafe.Pointer(idxStr + uintptr(libc.PostIncInt32(&iIdxStr, 1)))) = int8('M')
-					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+5378, libc.VaList(bp, iCol))
+					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+5397, libc.VaList(bp, iCol))
 					idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 
 				}
@@ -150289,7 +151325,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 					}
 					return int8('G')
 				}()
-				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+5378, libc.VaList(bp+8, iCol))
+				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+5397, libc.VaList(bp+8, iCol))
 				idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 				(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pInfo)).FaConstraintUsage + uintptr(i)*8)).FargvIndex = libc.PreIncInt32(&iCons, 1)
 
@@ -150603,7 +151639,7 @@ func fts5NextMethod(tls *libc.TLS, pCursor uintptr) int32 {
 					rc = Xsqlite3_reset(tls, (*Fts5Cursor)(unsafe.Pointer(pCsr)).FpStmt)
 					if rc != SQLITE_OK {
 						(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-							ts+3658, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+							ts+3677, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 					}
 				} else {
 					rc = SQLITE_OK
@@ -150635,7 +151671,7 @@ func fts5PrepareStatement(tls *libc.TLS, ppStmt uintptr, pConfig uintptr, zFmt u
 		rc = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
 			uint32(SQLITE_PREPARE_PERSISTENT), bp+8, uintptr(0))
 		if rc != SQLITE_OK {
-			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 		}
 		Xsqlite3_free(tls, zSql)
 	}
@@ -150667,25 +151703,25 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35806,
+		ts+36374,
 		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 + 15017
+					return ts + 15036
 				}
-				return ts + 1547
+				return ts + 1566
 			}(),
 			func() uintptr {
 				if zRankArgs != 0 {
 					return zRankArgs
 				}
-				return ts + 1547
+				return ts + 1566
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35861
+					return ts + 36429
 				}
-				return ts + 35866
+				return ts + 36434
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -150731,12 +151767,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+35870, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+36438, 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) {
+	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5479, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35876, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36444, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -150767,7 +151803,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+35904, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36472, 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,
@@ -150798,7 +151834,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+35914, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36482, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -150830,14 +151866,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+35935, libc.VaList(bp, z))
+				ts+36503, 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 + 34318
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34886
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -150893,7 +151929,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+35767, 0)
+		ts+36335, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -150936,7 +151972,7 @@ __8:
 	if !(zText == uintptr(0)) {
 		goto __14
 	}
-	zText = ts + 1547
+	zText = ts + 1566
 __14:
 	;
 	iCol = 0
@@ -151110,7 +152146,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35968, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+36536, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -151231,7 +152267,7 @@ func fts5SeekCursor(tls *libc.TLS, pCsr uintptr, bErrormsg int32) int32 {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			} else if (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg != 0 {
 				*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-					ts+3658, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
+					ts+3677, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
 			}
 		}
 	}
@@ -151255,28 +152291,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+36004, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36572, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+36015, 0)
+				ts+36583, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+36095, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36663, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+36103, 0)
+				ts+36671, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+17356, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+17375, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+36159, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36727, 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+36165, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36733, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -151334,7 +152370,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+17901, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17920, 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)))
@@ -151347,12 +152383,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+36181,
+				ts+36749,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20879
+						return ts + 20945
 					}
-					return ts + 36218
+					return ts + 36786
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -151982,7 +153018,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+36230, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36798, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -152226,7 +153262,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+36251, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36819, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -152245,7 +153281,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+36273, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36841, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -152292,7 +153328,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+36304)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36872)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -152301,7 +153337,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+36317, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+36885, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -152315,7 +153351,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 36408, ts + 34507, ts + 25506, ts + 34858, ts + 11891,
+	ts + 36976, ts + 35075, ts + 25572, ts + 35426, ts + 11910,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -152339,7 +153375,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+36415, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+36983, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -152357,13 +153393,13 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+36415, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36983, 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+36420, 0,
+				db, ts+36988, 0,
 				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
 				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
@@ -152420,17 +153456,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 + 36435,
-			ts + 36503,
-			ts + 36572,
-			ts + 36605,
-			ts + 36644,
-			ts + 36684,
-			ts + 36723,
-			ts + 36764,
-			ts + 36803,
-			ts + 36845,
-			ts + 36885,
+			ts + 37003,
+			ts + 37071,
+			ts + 37140,
+			ts + 37173,
+			ts + 37212,
+			ts + 37252,
+			ts + 37291,
+			ts + 37332,
+			ts + 37371,
+			ts + 37413,
+			ts + 37453,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -152497,7 +153533,7 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 			(*Fts5Config)(unsafe.Pointer((*Fts5Storage)(unsafe.Pointer(p)).FpConfig)).FbLock--
 			Xsqlite3_free(tls, zSql)
 			if rc != SQLITE_OK && pzErrMsg != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3658, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3677, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
 			}
 		}
 	}
@@ -152532,18 +153568,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+36908,
+		ts+37476,
 		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+37012,
+			ts+37580,
 			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+37050,
+			ts+37618,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -152555,7 +153591,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+37088,
+			ts+37656,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -152567,14 +153603,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+25506, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11891, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+36408, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25572, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11910, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+36976, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34858, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+35426, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34507, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+35075, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -152586,17 +153622,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+37130,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37698,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 30159
+					return ts + 30225
 				}
-				return ts + 1547
+				return ts + 1566
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+37160,
+			ts+37728,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -152633,27 +153669,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37204, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37772, 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+37227, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37795, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34507, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+35075, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34858, ts+37233, 0, pzErr)
+				pConfig, ts+35426, ts+37801, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+36408, ts+37265, 1, pzErr)
+				pConfig, ts+36976, ts+37833, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35004, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35572, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -152859,12 +153895,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+37282,
+		ts+37850,
 		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+37332,
+			ts+37900,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -152872,7 +153908,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+35004, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35572, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -153048,7 +154084,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+37361,
+	zSql = Xsqlite3_mprintf(tls, ts+37929,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -153230,14 +154266,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+34507, bp+48)
+			rc = fts5StorageCount(tls, p, ts+35075, 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+34858, bp+56)
+			rc = fts5StorageCount(tls, p, ts+35426, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -153432,9 +154468,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+37393) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37961) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37404) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37972) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -153649,7 +154685,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 + 37415
+			var zCat uintptr = ts + 37983
 			var i int32
 			libc.X__builtin___memset_chk(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})), libc.X__builtin_object_size(tls, p, 0))
 
@@ -153661,7 +154697,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+37424) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37992) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -153672,18 +154708,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+37435) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38003) {
 					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+37393) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37961) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37404) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37972) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37424) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37992) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -153959,7 +154995,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 + 37453
+	var zBase uintptr = ts + 38021
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -154101,7 +155137,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+37463, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38031, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -154109,11 +155145,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37466, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38034, 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+37471, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38039, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -154121,7 +155157,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37476, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38044, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -154129,7 +155165,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37479, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38047, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -154137,11 +155173,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37482, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38050, 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+37487, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38055, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -154149,19 +155185,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37492, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38060, 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+37496, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38064, 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+37502, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38070, 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+37507, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38075, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -154169,11 +155205,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37511, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38079, 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+37515, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38083, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -154181,7 +155217,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37518, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38086, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -154189,11 +155225,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37522, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38090, 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+37526, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38094, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -154201,7 +155237,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37530, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38098, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -154209,7 +155245,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37534, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38102, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -154217,7 +155253,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37538, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38106, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -154233,24 +155269,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+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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38110, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-2), ts+38090, 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+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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38113, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-2), ts+38116, 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+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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38120, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-2), ts+38106, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-2), 0))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -154265,137 +155301,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+37555, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38123, 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+37522, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+38090, 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+37563, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+38131, 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+37570, uint64(4), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-6), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-6), ts+38138, 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+37575, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38143, 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+37471, uint64(4), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+38039, 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+37580, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38148, 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+37466, uint64(4), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+38034, 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+37585, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38153, 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+37538, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+38106, 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+37590, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38158, 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+15883, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+15902, 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+37595, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38163, 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+37548, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-3), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-3), ts+38116, 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+37599, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38167, 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+37463, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+38031, 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+37604, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38172, 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+37507, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+38075, 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+37610, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38178, 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+37614, uint64(1), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-3), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-3), ts+38182, 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+37616, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38184, 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+37530, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+38098, 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+37622, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38190, 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+37538, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+38106, 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+37630, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38198, 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+37522, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+38090, 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+37636, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38204, 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+37522, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+38090, 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+37641, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38209, 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+37463, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+38031, 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+37647, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38215, 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+37534, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+38102, 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+37655, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38223, 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+37663, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+38231, 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+37667, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38235, 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+37530, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+38098, 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+37675, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38243, 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+37463, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+38031, 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+37681, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38249, 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+37534, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+38102, 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+37687, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+38255, 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+37548, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-6), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-6), ts+38116, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-6), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -154410,16 +155446,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+37694, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38262, 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+37479, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+38047, 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+37699, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38267, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -154427,21 +155463,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37704, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38272, 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+37479, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+38047, 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+37710, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38278, 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+37479, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+38047, 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+37663, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38231, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -154449,7 +155485,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37716, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38284, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -154457,9 +155493,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37722, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38290, 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+37463, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+38031, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -154474,12 +155510,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+37728, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38296, 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+37732, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-3), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-3), ts+38300, 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+37735, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38303, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -154488,7 +155524,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37738, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38306, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -154644,7 +155680,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+37742) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38310) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -154824,22 +155860,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 37453, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 38021, 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 + 37757, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 38325, 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 + 37763, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 38331, 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 + 37770, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 38338, 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
@@ -155982,14 +157018,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+37778) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+38346) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37782) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+38350) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37786) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+38354) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37795, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38363, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -156015,19 +157051,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 + 37829,
-		ts + 37869,
-		ts + 37904,
+		ts + 38397,
+		ts + 38437,
+		ts + 38472,
 	}
 
 	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+23802, *(*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+23868, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37947, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38515, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -156160,11 +157196,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+37980, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+38548, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+38011,
+		ts+38579,
 		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))
@@ -156188,7 +157224,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+38062, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38630, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -156472,7 +157508,7 @@ func fts5VocabFilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, zUnused
 		if pLe != 0 {
 			var zCopy uintptr = Xsqlite3_value_text(tls, pLe)
 			if zCopy == uintptr(0) {
-				zCopy = ts + 1547
+				zCopy = ts + 1566
 			}
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm = Xsqlite3_value_bytes(tls, pLe)
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FzLeTerm = Xsqlite3_malloc(tls, (*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm+1)
@@ -156583,7 +157619,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+38088, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+38656, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -156605,7 +157641,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 + 38098
+	return ts + 38666
 }
 
 func init() {
@@ -157143,6 +158179,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, I64, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&afpIoMethods)) + 144)) = unixUnfetch
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&attach_func)) + 24)) = attachFunc
 	*(*func(*libc.TLS, uintptr, uintptr) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&autolockIoFinder)) + 0)) = autolockIoFinderImpl
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 8)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 16)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 24)) = statBestIndex
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 32)) = statDisconnect
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 40)) = statDisconnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 48)) = statOpen
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 56)) = statClose
+	*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 64)) = statFilter
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 72)) = statNext
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 80)) = statEof
+	*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 88)) = statColumn
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 96)) = statRowid
 	*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 0)) = sqlite3MemMalloc
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 8)) = sqlite3MemFree
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 16)) = sqlite3MemRealloc
@@ -157729,8 +158777,9 @@ func init() {
 	*(*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
-	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = Xsqlite3JsonTableFunctions
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = Xsqlite3DbstatRegister
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = sqlite3TestExtInit
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 32)) = Xsqlite3JsonTableFunctions
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statGetFuncdef)) + 24)) = statGet
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statInitFuncdef)) + 24)) = statInit
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statPushFuncdef)) + 24)) = statPush
@@ -157748,5 +158797,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-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 ts1 = "3.41.2\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-14.0.3\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_DBSTAT_VTAB\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\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\x00true\x00false\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 \x00rowid not at end-of-record for row \x00 of 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\x00CREATE TABLE x( name       TEXT, path       TEXT, pageno     INTEGER, pagetype   TEXT, ncell      INTEGER, payload    INTEGER, unused     INTEGER, mx_payload INTEGER, pgoffset   INTEGER, pgsize     INTEGER, schema     TEXT HIDDEN, aggregate  BOOLEAN HIDDEN)\x00overflow\x00%s%.3x+%.6x\x00%s%.3x/\x00internal\x00leaf\x00corrupted\x00SELECT * FROM (SELECT 'sqlite_schema' AS name,1 AS rootpage,'table' AS type UNION ALL SELECT name,rootpage,type FROM \"%w\".sqlite_schema WHERE rootpage!=0)\x00WHERE name=%Q\x00 ORDER BY name\x00dbstat\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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 9baeb026..3fc6a830 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -180,6 +180,7 @@ const (
 	DBFLAG_SchemaKnownOk                  = 0x0010
 	DBFLAG_Vacuum                         = 0x0004
 	DBFLAG_VacuumInto                     = 0x0008
+	DBSTAT_PAGE_PADDING_BYTES             = 256
 	DB_ResetWanted                        = 0x0008
 	DB_SchemaLoaded                       = 0x0001
 	DB_UnresetViews                       = 0x0002
@@ -747,11 +748,11 @@ const (
 	NC_OrderAgg                           = 0x8000000
 	NC_PartIdx                            = 0x000002
 	NC_SelfRef                            = 0x00002e
+	NC_Subquery                           = 0x000040
 	NC_UAggInfo                           = 0x000100
 	NC_UBaseReg                           = 0x000400
 	NC_UEList                             = 0x000080
 	NC_UUpsert                            = 0x000200
-	NC_VarSelect                          = 0x000040
 	NDEBUG                                = 1
 	NETGRAPHDISC                          = 6
 	NN                                    = 1
@@ -1557,6 +1558,7 @@ const (
 	SQLITE_ECEL_REF                       = 0x04
 	SQLITE_EMPTY                          = 16
 	SQLITE_ENABLE_COLUMN_METADATA         = 1
+	SQLITE_ENABLE_DBSTAT_VTAB             = 1
 	SQLITE_ENABLE_FTS5                    = 1
 	SQLITE_ENABLE_GEOPOLY                 = 1
 	SQLITE_ENABLE_LOCKING_STYLE           = 0
@@ -1957,7 +1959,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
+	SQLITE_SOURCE_ID                      = "2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2065,8 +2067,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.41.0"
-	SQLITE_VERSION_NUMBER                 = 3041000
+	SQLITE_VERSION                        = "3.41.2"
+	SQLITE_VERSION_NUMBER                 = 3041002
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -5258,7 +5260,8 @@ type IndexedExpr1 = struct {
 	FiIdxCur       int32
 	FiIdxCol       int32
 	FbMaybeNullRow U8
-	F__ccgo_pad1   [3]byte
+	Faff           U8
+	F__ccgo_pad1   [2]byte
 	FpIENext       uintptr
 }
 
@@ -5879,17 +5882,18 @@ type Pager = Pager1
 
 // Handle type for pages.
 type PgHdr2 = struct {
-	FpPage      uintptr
-	FpData      uintptr
-	FpExtra     uintptr
-	FpCache     uintptr
-	FpDirty     uintptr
-	FpPager     uintptr
-	Fpgno       Pgno
-	Fflags      U16
-	FnRef       I16
-	FpDirtyNext uintptr
-	FpDirtyPrev uintptr
+	FpPage       uintptr
+	FpData       uintptr
+	FpExtra      uintptr
+	FpCache      uintptr
+	FpDirty      uintptr
+	FpPager      uintptr
+	Fpgno        Pgno
+	Fflags       U16
+	F__ccgo_pad1 [2]byte
+	FnRef        I64
+	FpDirtyNext  uintptr
+	FpDirtyPrev  uintptr
 }
 
 // Handle type for pages.
@@ -6096,7 +6100,7 @@ type PCache2 = struct {
 	FpDirty      uintptr
 	FpDirtyTail  uintptr
 	FpSynced     uintptr
-	FnRefSum     int32
+	FnRefSum     I64
 	FszCache     int32
 	FszSpill     int32
 	FszPage      int32
@@ -6350,7 +6354,7 @@ type CoveringIndexCheck1 = struct {
 	F__ccgo_pad1 [2]byte
 }
 
-var sqlite3azCompileOpt = [52]uintptr{
+var sqlite3azCompileOpt = [53]uintptr{
 	ts + 7,
 	ts + 27,
 	ts + 49,
@@ -6369,40 +6373,41 @@ var sqlite3azCompileOpt = [52]uintptr{
 	ts + 365,
 	ts + 390,
 	ts + 413,
-	ts + 425,
-	ts + 440,
-	ts + 462,
-	ts + 487,
-	ts + 510,
-	ts + 532,
-	ts + 543,
-	ts + 556,
-	ts + 571,
-	ts + 587,
-	ts + 600,
-	ts + 621,
-	ts + 645,
-	ts + 668,
-	ts + 684,
-	ts + 700,
-	ts + 724,
-	ts + 751,
-	ts + 771,
-	ts + 792,
-	ts + 814,
-	ts + 844,
-	ts + 869,
-	ts + 895,
-	ts + 915,
-	ts + 941,
-	ts + 964,
-	ts + 990,
-	ts + 1012,
-	ts + 1033,
-	ts + 1044,
+	ts + 432,
+	ts + 444,
+	ts + 459,
+	ts + 481,
+	ts + 506,
+	ts + 529,
+	ts + 551,
+	ts + 562,
+	ts + 575,
+	ts + 590,
+	ts + 606,
+	ts + 619,
+	ts + 640,
+	ts + 664,
+	ts + 687,
+	ts + 703,
+	ts + 719,
+	ts + 743,
+	ts + 770,
+	ts + 790,
+	ts + 811,
+	ts + 833,
+	ts + 863,
+	ts + 888,
+	ts + 914,
+	ts + 934,
+	ts + 960,
+	ts + 983,
+	ts + 1009,
+	ts + 1031,
 	ts + 1052,
-	ts + 1066,
-	ts + 1079,
+	ts + 1063,
+	ts + 1071,
+	ts + 1085,
+	ts + 1098,
 }
 
 func Xsqlite3CompileOptions(tls *libc.TLS, pnOpt uintptr) uintptr {
@@ -6554,7 +6559,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 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))
+var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1111))
 
 // Standard typenames.  These names must match the COLTYPE_* definitions.
 // Adjust the SQLITE_N_STDTYPE value if adding or removing entries.
@@ -6576,12 +6581,12 @@ var Xsqlite3StdTypeAffinity = [6]int8{
 	int8(SQLITE_AFF_TEXT),
 }
 var Xsqlite3StdType = [6]uintptr{
-	ts + 1099,
-	ts + 1103,
-	ts + 1108,
-	ts + 1112,
-	ts + 1120,
-	ts + 1125,
+	ts + 1118,
+	ts + 1122,
+	ts + 1127,
+	ts + 1131,
+	ts + 1139,
+	ts + 1144,
 }
 
 // SQL is translated into a sequence of instructions to be
@@ -6895,7 +6900,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, 23229)
+		return Xsqlite3MisuseError(tls, 23233)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -7298,7 +7303,7 @@ __6:
 __4:
 	;
 	zDate++
-	if !(getDigits(tls, zDate, ts+1130, libc.VaList(bp, bp+16, bp+20)) != 2) {
+	if !(getDigits(tls, zDate, ts+1149, libc.VaList(bp, bp+16, bp+20)) != 2) {
 		goto __9
 	}
 	return 1
@@ -7324,13 +7329,13 @@ func parseHhMmSs(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	defer tls.Free(36)
 
 	var ms float64 = 0.0
-	if getDigits(tls, zDate, ts+1138, libc.VaList(bp, bp+24, bp+28)) != 2 {
+	if getDigits(tls, zDate, ts+1157, libc.VaList(bp, bp+24, bp+28)) != 2 {
 		return 1
 	}
 	zDate += uintptr(5)
 	if int32(*(*int8)(unsafe.Pointer(zDate))) == ':' {
 		zDate++
-		if getDigits(tls, zDate, ts+1146, libc.VaList(bp+16, bp+32)) != 1 {
+		if getDigits(tls, zDate, ts+1165, libc.VaList(bp+16, bp+32)) != 1 {
 			return 1
 		}
 		zDate += uintptr(2)
@@ -7428,7 +7433,7 @@ func parseYyyyMmDd(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	} else {
 		neg = 0
 	}
-	if getDigits(tls, zDate, ts+1150, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
+	if getDigits(tls, zDate, ts+1169, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
 		return 1
 	}
 	zDate += uintptr(10)
@@ -7485,7 +7490,7 @@ func parseDateOrTime(tls *libc.TLS, context uintptr, zDate uintptr, p uintptr) i
 		return 0
 	} else if parseHhMmSs(tls, zDate, p) == 0 {
 		return 0
-	} else if Xsqlite3StrICmp(tls, zDate, ts+1162) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
+	} else if Xsqlite3StrICmp(tls, zDate, ts+1181) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
 		return setDateTimeToCurrent(tls, context, p)
 	} else if Xsqlite3AtoF(tls, zDate, bp, Xsqlite3Strlen30(tls, zDate), uint8(SQLITE_UTF8)) > 0 {
 		setRawDateNumber(tls, p, *(*float64)(unsafe.Pointer(bp)))
@@ -7618,7 +7623,7 @@ func toLocaltime(tls *libc.TLS, p uintptr, pCtx uintptr) int32 {
 		*(*Time_t)(unsafe.Pointer(bp + 92)) = Time_t((*DateTime)(unsafe.Pointer(p)).FiJD/int64(1000) - int64(21086676)*int64(10000))
 	}
 	if osLocaltime(tls, bp+92, bp) != 0 {
-		Xsqlite3_result_error(tls, pCtx, ts+1166, -1)
+		Xsqlite3_result_error(tls, pCtx, ts+1185, -1)
 		return SQLITE_ERROR
 	}
 	(*DateTime)(unsafe.Pointer(p)).FY = (*tm)(unsafe.Pointer(bp)).Ftm_year + 1900 - iYearDiff
@@ -7642,12 +7647,12 @@ var aXformType = [6]struct {
 	FrLimit float32
 	FrXform float32
 }{
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1189)), FrLimit: 4.6427e+14, FrXform: 1.0},
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1196)), FrLimit: 7.7379e+12, FrXform: 60.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1203)), FrLimit: 1.2897e+11, FrXform: 3600.0},
-	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1210)), FrLimit: 5373485.0, FrXform: 86400.0},
-	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1217)), FrLimit: 176546.0, FrXform: 2592000.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1224)), FrLimit: 14713.0, FrXform: 31536000.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1208)), FrLimit: 4.6427e+14, FrXform: 1.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1215)), FrLimit: 7.7379e+12, FrXform: 60.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1222)), FrLimit: 1.2897e+11, FrXform: 3600.0},
+	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1229)), FrLimit: 5373485.0, FrXform: 86400.0},
+	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1236)), FrLimit: 176546.0, FrXform: 2592000.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1243)), FrLimit: 14713.0, FrXform: 31536000.0},
 }
 
 func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, idx int32) int32 {
@@ -7659,7 +7664,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 	switch int32(Xsqlite3UpperToLower[U8(*(*int8)(unsafe.Pointer(z)))]) {
 	case 'a':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1231) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1250) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -7681,7 +7686,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'j':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1236) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1255) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -7695,7 +7700,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'l':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1246) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1265) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				rc = toLocaltime(tls, p, pCtx)
 			}
 			break
@@ -7703,7 +7708,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'u':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1256) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1275) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -7715,7 +7720,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 					rc = 0
 				}
-			} else if Xsqlite3_stricmp(tls, z, ts+1266) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1285) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				if int32((*DateTime)(unsafe.Pointer(p)).FtzSet) == 0 {
 					var iOrigJD I64
 					var iGuess I64
@@ -7749,7 +7754,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'w':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1270, 8) == 0 &&
+			if Xsqlite3_strnicmp(tls, z, ts+1289, 8) == 0 &&
 				Xsqlite3AtoF(tls, z+8, bp+48, Xsqlite3Strlen30(tls, z+8), uint8(SQLITE_UTF8)) > 0 &&
 				*(*float64)(unsafe.Pointer(bp + 48)) >= 0.0 && *(*float64)(unsafe.Pointer(bp + 48)) < 7.0 && float64(libc.AssignInt32(&n, int32(*(*float64)(unsafe.Pointer(bp + 48))))) == *(*float64)(unsafe.Pointer(bp + 48)) {
 				var Z Sqlite3_int64
@@ -7770,7 +7775,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 's':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1279, 9) != 0 {
+			if Xsqlite3_strnicmp(tls, z, ts+1298, 9) != 0 {
 				break
 			}
 			if !(int32((*DateTime)(unsafe.Pointer(p)).FvalidJD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidYMD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidHMS) != 0) {
@@ -7784,14 +7789,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 			(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidTZ = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidJD = int8(0)
-			if Xsqlite3_stricmp(tls, z, ts+1289) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1308) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1295) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1314) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FM = 1
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1300) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1319) == 0 {
 				rc = 0
 			}
 			break
@@ -8117,7 +8122,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		switch int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) {
 		case 'd':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
 				break
 
 			}
@@ -8127,13 +8132,13 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if s > 59.999 {
 					s = 59.999
 				}
-				Xsqlite3_str_appendf(tls, bp+136, ts+1309, libc.VaList(bp+8, s))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1328, libc.VaList(bp+8, s))
 				break
 
 			}
 		case 'H':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
 				break
 
 			}
@@ -8151,41 +8156,41 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) == 'W' {
 					var wd int32
 					wd = int32(((*DateTime)(unsafe.Pointer(bp+88)).FiJD + int64(43200000)) / int64(86400000) % int64(7))
-					Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+24, (nDay+7-wd)/7))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+24, (nDay+7-wd)/7))
 				} else {
-					Xsqlite3_str_appendf(tls, bp+136, ts+1316, libc.VaList(bp+32, nDay+1))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1335, libc.VaList(bp+32, nDay+1))
 				}
 				break
 
 			}
 		case 'J':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1321, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1340, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
 				break
 
 			}
 		case 'm':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
 				break
 
 			}
 		case 'M':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
 				break
 
 			}
 		case 's':
 			{
 				var iS I64 = (*DateTime)(unsafe.Pointer(bp+88)).FiJD/int64(1000) - int64(21086676)*int64(10000)
-				Xsqlite3_str_appendf(tls, bp+136, ts+1327, libc.VaList(bp+64, iS))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1346, libc.VaList(bp+64, iS))
 				break
 
 			}
 		case 'S':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
 				break
 
 			}
@@ -8198,7 +8203,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			}
 		case 'Y':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1332, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1351, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
 				break
 
 			}
@@ -8248,15 +8253,15 @@ func Xsqlite3RegisterDateTimeFunctions(tls *libc.TLS) {
 }
 
 var aDateTimeFuncs = [9]FuncDef{
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1236},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1256},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1337},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1342},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1347},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1255},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1275},
 	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1356},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1365},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1378},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1396}}
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1361},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1366},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1375},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1384},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1397},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1415}}
 
 // The following routines are convenience wrappers around methods
 // of the sqlite3_file object.  This is mostly just syntactic sugar. All
@@ -8671,7 +8676,7 @@ func sqlite3MemMalloc(tls *libc.TLS, nByte int32) uintptr {
 		*(*Sqlite3_int64)(unsafe.Pointer(p)) = Sqlite3_int64(nByte)
 		p += 8
 	} else {
-		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1409, libc.VaList(bp, nByte))
+		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1428, libc.VaList(bp, nByte))
 	}
 	return p
 }
@@ -8704,7 +8709,7 @@ func sqlite3MemRealloc(tls *libc.TLS, pPrior uintptr, nByte int32) uintptr {
 		p += 8
 	} else {
 		Xsqlite3_log(tls, SQLITE_NOMEM,
-			ts+1447,
+			ts+1466,
 			libc.VaList(bp, sqlite3MemSize(tls, pPrior), nByte))
 	}
 	return p
@@ -9579,7 +9584,7 @@ func Xsqlite3OomFault(tls *libc.TLS, db uintptr) uintptr {
 		(*Sqlite3)(unsafe.Pointer(db)).Flookaside.Fsz = U16(0)
 		if (*Sqlite3)(unsafe.Pointer(db)).FpParse != 0 {
 			var pParse uintptr
-			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1483, 0)
+			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1502, 0)
 			(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 			for pParse = (*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).FpOuterParse; pParse != 0; pParse = (*Parse)(unsafe.Pointer(pParse)).FpOuterParse {
 				(*Parse)(unsafe.Pointer(pParse)).FnErr++
@@ -9652,8 +9657,8 @@ type et_info = struct {
 // by an instance of the following structure
 type Et_info = et_info
 
-var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1497))
-var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1530))
+var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1516))
+var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1549))
 var fmtinfo = [23]Et_info{
 	{Ffmttype: int8('d'), Fbase: EtByte(10), Fflags: EtByte(1), Ftype: EtByte(EtDECIMAL)},
 	{Ffmttype: int8('s'), Fflags: EtByte(4), Ftype: EtByte(EtSTRING)},
@@ -9867,7 +9872,7 @@ __6:
 	if !(libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(libc.PreIncUintptr(&fmt, 1))))) == 0) {
 		goto __11
 	}
-	Xsqlite3_str_append(tls, pAccum, ts+1537, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1556, 1)
 	goto __5
 __11:
 	;
@@ -10428,7 +10433,7 @@ __125:
 	if !(Xsqlite3IsNaN(tls, *(*float64)(unsafe.Pointer(bp + 104))) != 0) {
 		goto __127
 	}
-	bufpt = ts + 1539
+	bufpt = ts + 1558
 	length = 3
 	goto __58
 __127:
@@ -10488,7 +10493,7 @@ __138:
 	}
 	bufpt = bp + 16
 	*(*int8)(unsafe.Pointer(bp + 16)) = prefix
-	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1543, uint32(4))
+	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1562, uint32(4))
 	length = 3 + libc.Bool32(int32(prefix) != 0)
 	goto __58
 __139:
@@ -10854,7 +10859,7 @@ __200:
 	if !(bufpt == uintptr(0)) {
 		goto __201
 	}
-	bufpt = ts + 1547
+	bufpt = ts + 1566
 	goto __202
 __201:
 	if !(int32(xtype) == EtDYNSTRING) {
@@ -10978,9 +10983,9 @@ __222:
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
-			return ts + 1548
+			return ts + 1567
 		}
-		return ts + 1553
+		return ts + 1572
 	}()
 __223:
 	;
@@ -11128,7 +11133,7 @@ __246:
 		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
-	Xsqlite3_str_append(tls, pAccum, ts+1560, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1579, 1)
 __250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
@@ -11145,10 +11150,10 @@ __251:
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
 		goto __253
 	}
-	Xsqlite3_str_appendf(tls, pAccum, ts+1562, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1581, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 	goto __254
 __253:
-	Xsqlite3_str_appendf(tls, pAccum, ts+1572, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1591, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
 __254:
 	;
 __252:
@@ -11203,7 +11208,7 @@ __4:
 __5:
 }
 
-var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1586))
+var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1605))
 
 // The z string points to the first character of a token that is
 // associated with an error.  If db does not already have an error
@@ -11368,7 +11373,7 @@ func Xsqlite3ResultStrAccum(tls *libc.TLS, pCtx uintptr, p uintptr) {
 	} else if int32((*StrAccum)(unsafe.Pointer(p)).FprintfFlags)&SQLITE_PRINTF_MALLOCED != 0 {
 		Xsqlite3_result_text(tls, pCtx, (*StrAccum)(unsafe.Pointer(p)).FzText, int32((*StrAccum)(unsafe.Pointer(p)).FnChar), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 	} else {
-		Xsqlite3_result_text(tls, pCtx, ts+1547, 0, uintptr(0))
+		Xsqlite3_result_text(tls, pCtx, ts+1566, 0, uintptr(0))
 		Xsqlite3_str_reset(tls, p)
 	}
 }
@@ -13098,7 +13103,7 @@ func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
 	var c int32 = 0
 	var i int32
 
-	var pow63 uintptr = ts + 1595
+	var pow63 uintptr = ts + 1614
 	for i = 0; c == 0 && i < 18; i++ {
 		c = (int32(*(*int8)(unsafe.Pointer(zNum + uintptr(i*incr)))) - int32(*(*int8)(unsafe.Pointer(pow63 + uintptr(i))))) * 10
 	}
@@ -13644,7 +13649,7 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 	defer tls.Free(8)
 
 	Xsqlite3_log(tls, SQLITE_MISUSE,
-		ts+1614,
+		ts+1633,
 		libc.VaList(bp, zType))
 }
 
@@ -13663,13 +13668,13 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 func Xsqlite3SafetyCheckOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	if db == uintptr(0) {
-		logBadConnection(tls, ts+1548)
+		logBadConnection(tls, ts+1567)
 		return 0
 	}
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_OPEN {
 		if Xsqlite3SafetyCheckSickOrOk(tls, db) != 0 {
-			logBadConnection(tls, ts+1659)
+			logBadConnection(tls, ts+1678)
 		}
 		return 0
 	} else {
@@ -13682,7 +13687,7 @@ func Xsqlite3SafetyCheckSickOrOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_SICK && int32(eOpenState) != SQLITE_STATE_OPEN && int32(eOpenState) != SQLITE_STATE_BUSY {
-		logBadConnection(tls, ts+1668)
+		logBadConnection(tls, ts+1687)
 		return 0
 	} else {
 		return 1
@@ -14208,193 +14213,193 @@ func Xsqlite3OpcodeName(tls *libc.TLS, i int32) uintptr {
 }
 
 var azName = [187]uintptr{
-	ts + 1676,
-	ts + 1686,
-	ts + 1697,
-	ts + 1709,
-	ts + 1720,
-	ts + 1732,
+	ts + 1695,
+	ts + 1705,
+	ts + 1716,
+	ts + 1728,
 	ts + 1739,
-	ts + 1747,
-	ts + 1755,
-	ts + 1760,
-	ts + 1765,
-	ts + 1771,
-	ts + 1785,
-	ts + 1791,
-	ts + 1801,
-	ts + 1806,
-	ts + 1811,
-	ts + 1814,
+	ts + 1751,
+	ts + 1758,
+	ts + 1766,
+	ts + 1774,
+	ts + 1779,
+	ts + 1784,
+	ts + 1790,
+	ts + 1804,
+	ts + 1810,
 	ts + 1820,
-	ts + 1827,
-	ts + 1831,
-	ts + 1841,
-	ts + 1848,
-	ts + 1855,
-	ts + 1862,
-	ts + 1869,
-	ts + 1879,
+	ts + 1825,
+	ts + 1830,
+	ts + 1833,
+	ts + 1839,
+	ts + 1846,
+	ts + 1850,
+	ts + 1860,
+	ts + 1867,
+	ts + 1874,
+	ts + 1881,
 	ts + 1888,
-	ts + 1899,
-	ts + 1908,
-	ts + 1914,
-	ts + 1924,
-	ts + 1934,
-	ts + 1939,
-	ts + 1949,
-	ts + 1960,
-	ts + 1965,
-	ts + 1972,
-	ts + 1983,
-	ts + 1988,
-	ts + 1993,
-	ts + 1999,
-	ts + 2005,
-	ts + 2011,
-	ts + 2014,
+	ts + 1898,
+	ts + 1907,
+	ts + 1918,
+	ts + 1927,
+	ts + 1933,
+	ts + 1943,
+	ts + 1953,
+	ts + 1958,
+	ts + 1968,
+	ts + 1979,
+	ts + 1984,
+	ts + 1991,
+	ts + 2002,
+	ts + 2007,
+	ts + 2012,
 	ts + 2018,
 	ts + 2024,
-	ts + 2035,
-	ts + 2046,
+	ts + 2030,
+	ts + 2033,
+	ts + 2037,
+	ts + 2043,
 	ts + 2054,
-	ts + 2063,
-	ts + 2070,
-	ts + 2078,
-	ts + 2081,
-	ts + 2084,
-	ts + 2087,
-	ts + 2090,
-	ts + 2093,
-	ts + 2096,
+	ts + 2065,
+	ts + 2073,
+	ts + 2082,
+	ts + 2089,
+	ts + 2097,
+	ts + 2100,
 	ts + 2103,
+	ts + 2106,
 	ts + 2109,
-	ts + 2119,
-	ts + 2132,
-	ts + 2143,
-	ts + 2149,
-	ts + 2156,
-	ts + 2165,
-	ts + 2174,
-	ts + 2181,
-	ts + 2194,
-	ts + 2205,
-	ts + 2210,
-	ts + 2218,
+	ts + 2112,
+	ts + 2115,
+	ts + 2122,
+	ts + 2128,
+	ts + 2138,
+	ts + 2151,
+	ts + 2162,
+	ts + 2168,
+	ts + 2175,
+	ts + 2184,
+	ts + 2193,
+	ts + 2200,
+	ts + 2213,
 	ts + 2224,
-	ts + 2231,
+	ts + 2229,
+	ts + 2237,
 	ts + 2243,
-	ts + 2248,
-	ts + 2257,
+	ts + 2250,
 	ts + 2262,
-	ts + 2271,
+	ts + 2267,
 	ts + 2276,
 	ts + 2281,
-	ts + 2287,
+	ts + 2290,
 	ts + 2295,
-	ts + 2303,
-	ts + 2313,
-	ts + 2321,
-	ts + 2328,
-	ts + 2341,
-	ts + 2346,
-	ts + 2358,
-	ts + 2366,
-	ts + 2373,
-	ts + 2384,
-	ts + 2391,
-	ts + 2398,
-	ts + 2408,
+	ts + 2300,
+	ts + 2306,
+	ts + 2314,
+	ts + 2322,
+	ts + 2332,
+	ts + 2340,
+	ts + 2347,
+	ts + 2360,
+	ts + 2365,
+	ts + 2377,
+	ts + 2385,
+	ts + 2392,
+	ts + 2403,
+	ts + 2410,
 	ts + 2417,
-	ts + 2428,
-	ts + 2434,
-	ts + 2445,
-	ts + 2455,
-	ts + 2465,
-	ts + 2472,
-	ts + 2478,
-	ts + 2488,
-	ts + 2499,
-	ts + 2503,
-	ts + 2512,
-	ts + 2521,
-	ts + 2528,
-	ts + 2538,
-	ts + 2545,
-	ts + 2554,
+	ts + 2427,
+	ts + 2436,
+	ts + 2447,
+	ts + 2453,
+	ts + 2464,
+	ts + 2474,
+	ts + 2484,
+	ts + 2491,
+	ts + 2497,
+	ts + 2507,
+	ts + 2518,
+	ts + 2522,
+	ts + 2531,
+	ts + 2540,
+	ts + 2547,
+	ts + 2557,
 	ts + 2564,
-	ts + 2571,
-	ts + 2579,
-	ts + 2593,
-	ts + 2601,
-	ts + 2615,
-	ts + 2626,
-	ts + 2639,
-	ts + 2650,
-	ts + 2656,
-	ts + 2668,
-	ts + 2677,
-	ts + 2685,
-	ts + 2694,
-	ts + 2703,
-	ts + 2710,
-	ts + 2718,
-	ts + 2725,
-	ts + 2736,
-	ts + 2750,
-	ts + 2761,
+	ts + 2573,
+	ts + 2583,
+	ts + 2590,
+	ts + 2598,
+	ts + 2612,
+	ts + 2620,
+	ts + 2634,
+	ts + 2645,
+	ts + 2658,
+	ts + 2669,
+	ts + 2675,
+	ts + 2687,
+	ts + 2696,
+	ts + 2704,
+	ts + 2713,
+	ts + 2722,
+	ts + 2729,
+	ts + 2737,
+	ts + 2744,
+	ts + 2755,
 	ts + 2769,
-	ts + 2775,
-	ts + 2783,
-	ts + 2791,
-	ts + 2801,
-	ts + 2814,
-	ts + 2824,
-	ts + 2837,
-	ts + 2846,
-	ts + 2857,
+	ts + 2780,
+	ts + 2788,
+	ts + 2794,
+	ts + 2802,
+	ts + 2810,
+	ts + 2820,
+	ts + 2833,
+	ts + 2843,
+	ts + 2856,
 	ts + 2865,
-	ts + 2871,
-	ts + 2883,
-	ts + 2895,
-	ts + 2903,
-	ts + 2915,
-	ts + 2928,
-	ts + 2938,
-	ts + 2948,
-	ts + 2953,
-	ts + 2965,
-	ts + 2977,
-	ts + 2987,
-	ts + 2993,
-	ts + 3003,
-	ts + 3010,
+	ts + 2876,
+	ts + 2884,
+	ts + 2890,
+	ts + 2902,
+	ts + 2914,
+	ts + 2922,
+	ts + 2934,
+	ts + 2947,
+	ts + 2957,
+	ts + 2967,
+	ts + 2972,
+	ts + 2984,
+	ts + 2996,
+	ts + 3006,
+	ts + 3012,
 	ts + 3022,
-	ts + 3033,
+	ts + 3029,
 	ts + 3041,
-	ts + 3050,
-	ts + 3059,
-	ts + 3068,
-	ts + 3075,
-	ts + 3086,
-	ts + 3099,
-	ts + 3109,
-	ts + 3116,
-	ts + 3124,
-	ts + 3133,
-	ts + 3139,
-	ts + 3147,
-	ts + 3155,
-	ts + 3163,
-	ts + 3173,
+	ts + 3052,
+	ts + 3060,
+	ts + 3069,
+	ts + 3078,
+	ts + 3087,
+	ts + 3094,
+	ts + 3105,
+	ts + 3118,
+	ts + 3128,
+	ts + 3135,
+	ts + 3143,
+	ts + 3152,
+	ts + 3158,
+	ts + 3166,
+	ts + 3174,
 	ts + 3182,
-	ts + 3193,
-	ts + 3203,
-	ts + 3209,
-	ts + 3220,
-	ts + 3231,
-	ts + 3236,
-	ts + 3244,
+	ts + 3192,
+	ts + 3201,
+	ts + 3212,
+	ts + 3222,
+	ts + 3228,
+	ts + 3239,
+	ts + 3250,
+	ts + 3255,
+	ts + 3263,
 }
 
 type pthread_once = struct {
@@ -14582,45 +14587,62 @@ type bintime = struct {
 	Ffrac Uint64_t
 }
 
-func sbttons(tls *libc.TLS, _sbt Sbintime_t) Int64_t {
-	var ns Uint64_t
+func __stime64_scale32_ceil(tls *libc.TLS, x Int64_t, factor Int32_t, divisor Int32_t) Int64_t {
+	var rem Int64_t = x % Int64_t(divisor)
 
-	ns = Uint64_t(_sbt)
-	if ns >= uint64(int64(1)<<32) {
-		ns = ns >> 32 * uint64(1000000000)
-	} else {
-		ns = uint64(0)
-	}
-
-	return Int64_t(ns + Uint64_t(int64(1000000000)*(_sbt&int64(0xffffffff))>>32))
+	return x/Int64_t(divisor)*Int64_t(factor) + (rem*Int64_t(factor)+Int64_t(divisor)-int64(1))/Int64_t(divisor)
 }
 
-func nstosbt(tls *libc.TLS, _ns Int64_t) Sbintime_t {
-	var sb Sbintime_t = int64(0)
+func __stime64_scale32_floor(tls *libc.TLS, x Int64_t, factor Int32_t, divisor Int32_t) Int64_t {
+	var rem Int64_t = x % Int64_t(divisor)
 
-	if _ns >= int64(1000000000) {
-		sb = _ns / int64(1000000000) * (int64(1) << 32)
-		_ns = _ns % int64(1000000000)
-	}
-
-	sb = Sbintime_t(uint64(sb) + (uint64(_ns)*9223372037+uint64(0x7fffffff))>>31)
-	return sb
+	return x/Int64_t(divisor)*Int64_t(factor) + rem*Int64_t(factor)/Int64_t(divisor)
 }
 
-func sbttous(tls *libc.TLS, _sbt Sbintime_t) Int64_t {
-	return int64(1000000) * _sbt >> 32
+func __utime64_scale32_ceil(tls *libc.TLS, x Uint64_t, factor Uint32_t, divisor Uint32_t) Uint64_t {
+	var rem Uint64_t = x % Uint64_t(divisor)
+
+	return x/Uint64_t(divisor)*Uint64_t(factor) + (rem*Uint64_t(factor)+Uint64_t(divisor)-uint64(1))/Uint64_t(divisor)
 }
 
-func ustosbt(tls *libc.TLS, _us Int64_t) Sbintime_t {
-	var sb Sbintime_t = int64(0)
+func __utime64_scale32_floor(tls *libc.TLS, x Uint64_t, factor Uint32_t, divisor Uint32_t) Uint64_t {
+	var rem Uint64_t = x % Uint64_t(divisor)
 
-	if _us >= int64(1000000) {
-		sb = _us / int64(1000000) * (int64(1) << 32)
-		_us = _us % int64(1000000)
-	}
+	return x/Uint64_t(divisor)*Uint64_t(factor) + rem*Uint64_t(factor)/Uint64_t(divisor)
+}
 
-	sb = Sbintime_t(uint64(sb) + (uint64(_us)*9223372036855+uint64(0x7fffffff))>>31)
-	return sb
+func __stime64_scale64_ceil(tls *libc.TLS, x Int64_t, factor Int64_t, divisor Int64_t) Int64_t {
+	var gcd Int64_t = ^factor&(factor-int64(1)) & ^divisor & (divisor-int64(1)) + int64(1)
+
+	return __stime64_scale32_ceil(tls, x, int32(factor/gcd), int32(divisor/gcd))
+}
+
+func __stime64_scale64_floor(tls *libc.TLS, x Int64_t, factor Int64_t, divisor Int64_t) Int64_t {
+	var gcd Int64_t = ^factor&(factor-int64(1)) & ^divisor & (divisor-int64(1)) + int64(1)
+
+	return __stime64_scale32_floor(tls, x, int32(factor/gcd), int32(divisor/gcd))
+}
+
+func __utime64_scale64_floor(tls *libc.TLS, x Uint64_t, factor Uint64_t, divisor Uint64_t) Uint64_t {
+	var gcd Uint64_t = ^factor&(factor-uint64(1)) & ^divisor & (divisor-uint64(1)) + uint64(1)
+
+	return __utime64_scale32_floor(tls, x, uint32(factor/gcd), uint32(divisor/gcd))
+}
+
+func sbttons(tls *libc.TLS, sbt Sbintime_t) Int64_t {
+	return __stime64_scale64_floor(tls, sbt, int64(1000000000), int64(1)<<32)
+}
+
+func nstosbt(tls *libc.TLS, ns Int64_t) Sbintime_t {
+	return __stime64_scale64_ceil(tls, ns, int64(1)<<32, int64(1000000000))
+}
+
+func sbttous(tls *libc.TLS, sbt Sbintime_t) Int64_t {
+	return __stime64_scale64_floor(tls, sbt, int64(1000000), int64(1)<<32)
+}
+
+func ustosbt(tls *libc.TLS, us Int64_t) Sbintime_t {
+	return __stime64_scale64_ceil(tls, us, int64(1)<<32, int64(1000000))
 }
 
 type itimerval = struct {
@@ -14827,35 +14849,35 @@ type unix_syscall = struct {
 }
 
 var aSyscall = [29]unix_syscall{
-	{FzName: ts + 3254, FpCurrent: 0},
-	{FzName: ts + 3259, FpCurrent: 0},
-	{FzName: ts + 3265, FpCurrent: 0},
-	{FzName: ts + 3272, FpCurrent: 0},
-	{FzName: ts + 3279, FpCurrent: 0},
+	{FzName: ts + 3273, FpCurrent: 0},
+	{FzName: ts + 3278, FpCurrent: 0},
 	{FzName: ts + 3284, FpCurrent: 0},
-	{FzName: ts + 3290, FpCurrent: 0},
-	{FzName: ts + 3300, FpCurrent: 0},
-	{FzName: ts + 3306, FpCurrent: 0},
-	{FzName: ts + 3311},
-	{FzName: ts + 3317},
+	{FzName: ts + 3291, FpCurrent: 0},
+	{FzName: ts + 3298, FpCurrent: 0},
+	{FzName: ts + 3303, FpCurrent: 0},
+	{FzName: ts + 3309, FpCurrent: 0},
+	{FzName: ts + 3319, FpCurrent: 0},
 	{FzName: ts + 3325, FpCurrent: 0},
-	{FzName: ts + 3331},
-	{FzName: ts + 3338},
-	{FzName: ts + 3347, FpCurrent: 0},
-	{FzName: ts + 3354},
-	{FzName: ts + 3364, FpCurrent: 0},
-	{FzName: ts + 3371, FpCurrent: 0},
-	{FzName: ts + 3385, FpCurrent: 0},
-	{FzName: ts + 3391, FpCurrent: 0},
-	{FzName: ts + 3397, FpCurrent: 0},
+	{FzName: ts + 3330},
+	{FzName: ts + 3336},
+	{FzName: ts + 3344, FpCurrent: 0},
+	{FzName: ts + 3350},
+	{FzName: ts + 3357},
+	{FzName: ts + 3366, FpCurrent: 0},
+	{FzName: ts + 3373},
+	{FzName: ts + 3383, FpCurrent: 0},
+	{FzName: ts + 3390, FpCurrent: 0},
 	{FzName: ts + 3404, FpCurrent: 0},
-	{FzName: ts + 3412, FpCurrent: 0},
-	{FzName: ts + 3417, FpCurrent: 0},
-	{FzName: ts + 3424},
+	{FzName: ts + 3410, FpCurrent: 0},
+	{FzName: ts + 3416, FpCurrent: 0},
+	{FzName: ts + 3423, FpCurrent: 0},
 	{FzName: ts + 3431, FpCurrent: 0},
-	{FzName: ts + 3443, FpCurrent: 0},
-	{FzName: ts + 3452, FpCurrent: 0},
-	{FzName: ts + 3458},
+	{FzName: ts + 3436, FpCurrent: 0},
+	{FzName: ts + 3443},
+	{FzName: ts + 3450, FpCurrent: 0},
+	{FzName: ts + 3462, FpCurrent: 0},
+	{FzName: ts + 3471, FpCurrent: 0},
+	{FzName: ts + 3477},
 }
 
 func robustFchown(tls *libc.TLS, fd int32, uid Uid_t, gid Gid_t) int32 {
@@ -14953,9 +14975,9 @@ func robust_open(tls *libc.TLS, z uintptr, f int32, m Mode_t) int32 {
 		}
 		(*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*12 + 4)))(tls, fd)
 		Xsqlite3_log(tls, SQLITE_WARNING,
-			ts+3464, libc.VaList(bp, z, fd))
+			ts+3483, libc.VaList(bp, z, fd))
 		fd = -1
-		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 4)))(tls, ts+3507, O_RDONLY, int32(m)) < 0 {
+		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 4)))(tls, ts+3526, O_RDONLY, int32(m)) < 0 {
 			break
 		}
 	}
@@ -15034,13 +15056,13 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 	var zErr uintptr
 	var iErrno int32 = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 
-	zErr = ts + 1547
+	zErr = ts + 1566
 
 	if zPath == uintptr(0) {
-		zPath = ts + 1547
+		zPath = ts + 1566
 	}
 	Xsqlite3_log(tls, errcode,
-		ts+3517,
+		ts+3536,
 		libc.VaList(bp, iLine, iErrno, zFunc, zPath, zErr))
 
 	return errcode
@@ -15048,7 +15070,7 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 
 func robust_close(tls *libc.TLS, pFile uintptr, h int32, lineno int32) {
 	if (*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*12 + 4)))(tls, h) != 0 {
-		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3259,
+		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3278,
 			func() uintptr {
 				if pFile != 0 {
 					return (*UnixFile)(unsafe.Pointer(pFile)).FzPath
@@ -15069,7 +15091,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, 38271)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38275)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -15171,19 +15193,19 @@ func verifyDbFile(tls *libc.TLS, pFile uintptr) {
 
 	rc = (*(*func(*libc.TLS, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 5*12 + 4)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, bp+32)
 	if rc != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3548, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3567, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink == uint64(0) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3572, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3591, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink > uint64(1) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3601, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3620, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if fileHasMoved(tls, pFile) != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3628, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3647, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 }
@@ -15546,7 +15568,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, 39055)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39059)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -15819,7 +15841,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	var ii int32
 	var fd int32 = -1
 
-	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3656, libc.VaList(bp, zFilename))
+	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3675, libc.VaList(bp, zFilename))
 	for ii = int32(libc.Xstrlen(tls, bp+8)); ii > 0 && int32(*(*int8)(unsafe.Pointer(bp + 8 + uintptr(ii)))) != '/'; ii-- {
 	}
 	if ii > 0 {
@@ -15837,7 +15859,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3371, bp+8, 40676)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40680), ts+3390, bp+8, 40680)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -15854,14 +15876,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, 40717)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3678, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40721)
 	}
 
 	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)), 40731)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40735)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -15881,7 +15903,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, 40762)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3309, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40766)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -15936,7 +15958,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 				if iWrite >= nSize {
 					iWrite = nSize - int64(1)
 				}
-				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1547, 1)
+				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1566, 1)
 				if nWrite != 1 {
 					return SQLITE_IOERR | int32(3)<<8
 				}
@@ -15949,7 +15971,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, 40883)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3309, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40887)
 			}
 		}
 
@@ -16017,7 +16039,7 @@ func unixFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 		}
 	case SQLITE_FCNTL_VFSNAME:
 		{
-			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
+			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
 			return SQLITE_OK
 
 		}
@@ -16176,7 +16198,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, 41442)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41446)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -16204,7 +16226,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, 41499)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3309, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41503)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -16267,7 +16289,7 @@ __4:
 	;
 	libc.Xmemset(tls, pShmNode, 0, uint32(unsafe.Sizeof(unixShmNode{}))+uint32(nShmFilename))
 	zShm = libc.AssignPtrUintptr(pShmNode+8, pShmNode+1*68)
-	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3670, libc.VaList(bp, zBasePath))
+	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3689, libc.VaList(bp, zBasePath))
 
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = -1
 	(*UnixInodeInfo)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pDbFd)).FpInode)).FpShmNode = pShmNode
@@ -16288,7 +16310,7 @@ __5:
 	if !(int32((*UnixInodeInfo)(unsafe.Pointer(pInode)).FbProcessLock) == 0) {
 		goto __7
 	}
-	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3677, 0)) {
+	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3696, 0)) {
 		goto __8
 	}
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = robust_open(tls, zShm, O_RDWR|O_CREAT|O_NOFOLLOW,
@@ -16303,7 +16325,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3254, zShm, 41624)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41628), ts+3273, zShm, 41628)
 	goto shm_open_err
 __10:
 	;
@@ -16429,11 +16451,11 @@ __11:
 		goto __13
 	}
 	*(*int32)(unsafe.Pointer(bp + 208)) = 0
-	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1547, 1, bp+208) != 1) {
+	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1566, 1, bp+208) != 1) {
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3325, zFile, 41768)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3344, zFile, 41772)
 	goto shmpage_out
 __14:
 	;
@@ -16479,7 +16501,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3412, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3431, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41799)
 	goto shmpage_out
 __20:
 	;
@@ -16680,7 +16702,7 @@ func unixUnmapfile(tls *libc.TLS, pFd uintptr) {
 }
 
 func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
-	var zErr uintptr = ts + 3412
+	var zErr uintptr = ts + 3431
 	var h int32 = (*UnixFile)(unsafe.Pointer(pFd)).Fh
 	var pOrig uintptr = (*UnixFile)(unsafe.Pointer(pFd)).FpMapRegion
 	var nOrig I64 = (*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeActual
@@ -16718,7 +16740,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, 42169)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42173)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -16833,10 +16855,10 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		}
 		return uintptr(0)
 	}(),
-		ts+3690, SQLITE_POWERSAFE_OVERWRITE) != 0 {
+		ts+3709, SQLITE_POWERSAFE_OVERWRITE) != 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 18)) |= uint16(UNIXFILE_PSOW)
 	}
-	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3695) == 0 {
+	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3714) == 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 18)) |= uint16(UNIXFILE_EXCL)
 	}
 
@@ -16852,7 +16874,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, 42672)
+			robust_close(tls, pNew, h, 42676)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -16865,7 +16887,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		if zLockFile == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
-			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3705, libc.VaList(bp, zFilename))
+			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3724, libc.VaList(bp, zFilename))
 		}
 		(*UnixFile)(unsafe.Pointer(pNew)).FlockingContext = zLockFile
 	}
@@ -16873,7 +16895,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, 42757)
+			robust_close(tls, pNew, h, 42761)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -16886,15 +16908,15 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 var azTempDirs = [6]uintptr{
 	uintptr(0),
 	uintptr(0),
-	ts + 3713,
-	ts + 3722,
-	ts + 3731,
-	ts + 1560,
+	ts + 3732,
+	ts + 3741,
+	ts + 3750,
+	ts + 1579,
 }
 
 func unixTempFileInit(tls *libc.TLS) {
-	azTempDirs[0] = libc.Xgetenv(tls, ts+3736)
-	azTempDirs[1] = libc.Xgetenv(tls, ts+3750)
+	azTempDirs[0] = libc.Xgetenv(tls, ts+3755)
+	azTempDirs[1] = libc.Xgetenv(tls, ts+3769)
 }
 
 func unixTempFileDir(tls *libc.TLS) uintptr {
@@ -16939,7 +16961,7 @@ func unixGetTempname(tls *libc.TLS, nBuf int32, zBuf uintptr) int32 {
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U64(0))), bp+24)
 
 			*(*int8)(unsafe.Pointer(zBuf + uintptr(nBuf-2))) = int8(0)
-			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3757,
+			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3776,
 				libc.VaList(bp, zDir, *(*U64)(unsafe.Pointer(bp + 24)), 0))
 			if int32(*(*int8)(unsafe.Pointer(zBuf + uintptr(nBuf-2)))) != 0 || libc.PostIncInt32(&iLimit, 1) > 10 {
 				rc = SQLITE_ERROR
@@ -17024,7 +17046,7 @@ func findCreateFileMode(tls *libc.TLS, zPath uintptr, flags int32, pMode uintptr
 	} else if flags&SQLITE_OPEN_DELETEONCLOSE != 0 {
 		*(*Mode_t)(unsafe.Pointer(pMode)) = Mode_t(0600)
 	} else if flags&SQLITE_OPEN_URI != 0 {
-		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3774)
+		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3793)
 		if z != 0 {
 			rc = getFileMode(tls, z, pMode, pUid, pGid)
 		}
@@ -17189,7 +17211,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3254, zName, 43198)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43202), ts+3273, zName, 43202)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -17280,7 +17302,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, 43337)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3383, zPath, 43341)
 		}
 		return rc
 	}
@@ -17288,9 +17310,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, 43347)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3800, zPath, 43351)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43353)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -17354,18 +17376,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, 43443), ts+3452, zIn, 43443)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43447), ts+3471, zIn, 43447)
 			}
 		} 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, 43449)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43453)
 				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, 43454), ts+3443, zIn, 43454)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43458), ts+3462, zIn, 43458)
 				return
 			}
 			*(*int8)(unsafe.Pointer(bp + 208 + uintptr(got))) = int8(0)
@@ -17405,14 +17427,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, 43512), ts+3272, zPath, 43512)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43516), ts+3291, zPath, 43516)
 		}
 		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, 43518)
+		return Xsqlite3CantopenError(tls, 43522)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+1028)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -17464,7 +17486,7 @@ func unixDlError(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBufOut uintptr) {
 	unixEnterMutex(tls)
 	zErr = libc.Xdlerror(tls)
 	if zErr != 0 {
-		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3656, libc.VaList(bp, zErr))
+		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3675, libc.VaList(bp, zErr))
 	}
 	unixLeaveMutex(tls)
 }
@@ -17496,7 +17518,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 	{
 		var fd int32
 		var got int32
-		fd = robust_open(tls, ts+3787, O_RDONLY, uint16(0))
+		fd = robust_open(tls, ts+3806, O_RDONLY, uint16(0))
 		if fd < 0 {
 			libc.Xtime(tls, bp)
 			libc.Xmemcpy(tls, zBuf, bp, uint32(unsafe.Sizeof(Time_t(0))))
@@ -17507,7 +17529,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, 43619)
+			robust_close(tls, uintptr(0), fd, 43623)
 		}
 
 	}
@@ -17584,10 +17606,10 @@ func Xsqlite3_os_init(tls *libc.TLS) int32 {
 }
 
 var aVfs = [4]Sqlite3_vfs{
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3800, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3805, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3815, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3695, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3819, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3824, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3834, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3714, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
 }
 
 // Shutdown the operating system interface.
@@ -17639,7 +17661,7 @@ var memdb_g MemFS
 var memdb_vfs = Sqlite3_vfs{
 	FiVersion:          2,
 	FmxPathname:        1024,
-	FzName:             ts + 3828,
+	FzName:             ts + 3847,
 	FxOpen:             0,
 	FxAccess:           0,
 	FxFullPathname:     0,
@@ -17895,7 +17917,7 @@ func memdbFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int3
 	var rc int32 = SQLITE_NOTFOUND
 	memdbEnter(tls, p)
 	if op == SQLITE_FCNTL_VFSNAME {
-		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3834, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
+		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3853, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
 		rc = SQLITE_OK
 	}
 	if op == SQLITE_FCNTL_SIZE_LIMIT {
@@ -18027,7 +18049,7 @@ func memdbFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, z
 	defer tls.Free(8)
 
 	_ = pVfs
-	Xsqlite3_snprintf(tls, nOut, zOut, ts+3656, libc.VaList(bp, zPath))
+	Xsqlite3_snprintf(tls, nOut, zOut, ts+3675, libc.VaList(bp, zPath))
 	return SQLITE_OK
 }
 
@@ -18148,7 +18170,7 @@ func Xsqlite3_serialize(tls *libc.TLS, db uintptr, zSchema uintptr, piSize uintp
 		return uintptr(0)
 	}
 	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
-	zSql = Xsqlite3_mprintf(tls, ts+3849, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3868, libc.VaList(bp, zSchema))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, db, zSql, -1, bp+8, uintptr(0))
 	} else {
@@ -18221,7 +18243,7 @@ __1:
 	goto end_deserialize
 __2:
 	;
-	zSql = Xsqlite3_mprintf(tls, ts+3872, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3891, libc.VaList(bp, zSchema))
 	if !(zSql == uintptr(0)) {
 		goto __3
 	}
@@ -18937,7 +18959,7 @@ func pcacheFetchFinishWithInit(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 	libc.Xmemset(tls, pPgHdr+16, 0, uint32(unsafe.Sizeof(PgHdr{}))-uint32(uintptr(0)+16))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpPage = pPage
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpData = (*Sqlite3_pcache_page)(unsafe.Pointer(pPage)).FpBuf
-	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*40
+	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*48
 	libc.Xmemset(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0, uint32(8))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpCache = pCache
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).Fpgno = pgno
@@ -18967,7 +18989,7 @@ func Xsqlite3PcacheFetchFinish(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 // reference count drops to 0, then it is made eligible for recycling.
 func Xsqlite3PcacheRelease(tls *libc.TLS, p uintptr) {
 	(*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FnRefSum--
-	if int32(libc.PreDecInt16(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1)) == 0 {
+	if libc.PreDecInt64(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1) == int64(0) {
 		if int32((*PgHdr)(unsafe.Pointer(p)).Fflags)&PGHDR_CLEAN != 0 {
 			pcacheUnpin(tls, p)
 		} else {
@@ -19018,7 +19040,7 @@ func Xsqlite3PcacheMakeClean(tls *libc.TLS, p uintptr) {
 	*(*U16)(unsafe.Pointer(p + 28)) &= libc.Uint16FromInt32(libc.CplInt32(PGHDR_DIRTY | PGHDR_NEED_SYNC | PGHDR_WRITEABLE))
 	*(*U16)(unsafe.Pointer(p + 28)) |= U16(PGHDR_CLEAN)
 
-	if int32((*PgHdr)(unsafe.Pointer(p)).FnRef) == 0 {
+	if (*PgHdr)(unsafe.Pointer(p)).FnRef == int64(0) {
 		pcacheUnpin(tls, p)
 	}
 }
@@ -19122,8 +19144,8 @@ func Xsqlite3PcacheClear(tls *libc.TLS, pCache uintptr) {
 }
 
 func pcacheMergeDirtyList(tls *libc.TLS, pA uintptr, pB uintptr) uintptr {
-	bp := tls.Alloc(40)
-	defer tls.Free(40)
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
 
 	var pTail uintptr
 	pTail = bp
@@ -19201,13 +19223,13 @@ func Xsqlite3PcacheDirtyList(tls *libc.TLS, pCache uintptr) uintptr {
 //
 // This is not the total number of pages referenced, but the sum of the
 // reference count for all pages.
-func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) int32 {
+func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) I64 {
 	return (*PCache)(unsafe.Pointer(pCache)).FnRefSum
 }
 
 // Return the number of references to the page supplied as an argument.
-func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) int32 {
-	return int32((*PgHdr)(unsafe.Pointer(p)).FnRef)
+func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) I64 {
+	return (*PgHdr)(unsafe.Pointer(p)).FnRef
 }
 
 // Return the total number of pages in the cache.
@@ -21433,7 +21455,7 @@ __27:
 	if !(isHot != 0 && nPlayback != 0) {
 		goto __28
 	}
-	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3887,
+	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3906,
 		libc.VaList(bp, nPlayback, (*Pager)(unsafe.Pointer(pPager)).FzJournal))
 __28:
 	;
@@ -21498,7 +21520,7 @@ func pagerUndoCallback(tls *libc.TLS, pCtx uintptr, iPg Pgno) int32 {
 
 	pPg = Xsqlite3PagerLookup(tls, pPager, iPg)
 	if pPg != 0 {
-		if Xsqlite3PcachePageRefcount(tls, pPg) == 1 {
+		if Xsqlite3PcachePageRefcount(tls, pPg) == int64(1) {
 			Xsqlite3PcacheDrop(tls, pPg)
 		} else {
 			rc = readDbPage(tls, pPg)
@@ -21931,7 +21953,7 @@ func Xsqlite3PagerSetPagesize(tls *libc.TLS, pPager uintptr, pPageSize uintptr,
 	var pageSize U32 = *(*U32)(unsafe.Pointer(pPageSize))
 
 	if (int32((*Pager)(unsafe.Pointer(pPager)).FmemDb) == 0 || (*Pager)(unsafe.Pointer(pPager)).FdbSize == Pgno(0)) &&
-		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 &&
+		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) &&
 		pageSize != 0 && pageSize != U32((*Pager)(unsafe.Pointer(pPager)).FpageSize) {
 		var pNew uintptr = uintptr(0)
 		*(*I64)(unsafe.Pointer(bp)) = int64(0)
@@ -22083,9 +22105,9 @@ func pagerAcquireMapPage(tls *libc.TLS, pPager uintptr, pgno Pgno, pData uintptr
 			Xsqlite3OsUnfetch(tls, (*Pager)(unsafe.Pointer(pPager)).Ffd, I64(pgno-Pgno(1))*(*Pager)(unsafe.Pointer(pPager)).FpageSize, pData)
 			return SQLITE_NOMEM
 		}
-		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*40
+		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*48
 		(*PgHdr)(unsafe.Pointer(p)).Fflags = U16(PGHDR_MMAP)
-		(*PgHdr)(unsafe.Pointer(p)).FnRef = int16(1)
+		(*PgHdr)(unsafe.Pointer(p)).FnRef = int64(1)
 		(*PgHdr)(unsafe.Pointer(p)).FpPager = pPager
 	}
 
@@ -22417,7 +22439,7 @@ func Xsqlite3PagerFlush(tls *libc.TLS, pPager uintptr) int32 {
 
 		for rc == SQLITE_OK && pList != 0 {
 			var pNext uintptr = (*PgHdr)(unsafe.Pointer(pList)).FpDirty
-			if int32((*PgHdr)(unsafe.Pointer(pList)).FnRef) == 0 {
+			if (*PgHdr)(unsafe.Pointer(pList)).FnRef == int64(0) {
 				rc = pagerStress(tls, pPager, pList)
 			}
 			pList = pNext
@@ -22567,7 +22589,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 60235)
+	rc = Xsqlite3CantopenError(tls, 60239)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -22628,7 +22650,7 @@ __15:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzJournal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint32(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3914, uint32(8))
+	libc.Xmemcpy(tls, pPtr, ts+3933, uint32(8))
 	pPtr += uintptr(8 + 1)
 	goto __19
 __18:
@@ -22641,7 +22663,7 @@ __19:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzWal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint32(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3923, uint32(4))
+	libc.Xmemcpy(tls, pPtr, ts+3942, uint32(4))
 	pPtr += uintptr(4 + 1)
 	goto __21
 __20:
@@ -22693,9 +22715,9 @@ __27:
 	;
 __26:
 	;
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3928, 0))
+	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3947, 0))
 	if !(iDc&SQLITE_IOCAP_IMMUTABLE != 0 ||
-		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3935, 0) != 0) {
+		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3954, 0) != 0) {
 		goto __30
 	}
 	vfsFlags = vfsFlags | SQLITE_OPEN_READONLY
@@ -22948,7 +22970,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60754)
+	rc = Xsqlite3CantopenError(tls, 60758)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23054,7 +23076,7 @@ __24:
 }
 
 func pagerUnlockIfUnused(tls *libc.TLS, pPager uintptr) {
-	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 {
+	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) {
 		pagerUnlockAndRollback(tls, pPager)
 	}
 }
@@ -23072,7 +23094,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60967)
+	return Xsqlite3CorruptError(tls, 60971)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23111,7 +23133,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60999)
+	rc = Xsqlite3CorruptError(tls, 61003)
 	goto pager_acquire_err
 __7:
 	;
@@ -23188,7 +23210,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, 61078)
+		return Xsqlite3CorruptError(tls, 61082)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -23946,7 +23968,7 @@ func Xsqlite3PagerMemUsed(tls *libc.TLS, pPager uintptr) int32 {
 
 // Return the number of references to the specified page.
 func Xsqlite3PagerPageRefcount(tls *libc.TLS, pPage uintptr) int32 {
-	return Xsqlite3PcachePageRefcount(tls, pPage)
+	return int32(Xsqlite3PcachePageRefcount(tls, pPage))
 }
 
 // Parameter eStat must be one of SQLITE_DBSTATUS_CACHE_HIT, _MISS, _WRITE,
@@ -24189,9 +24211,9 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	pPgOld = Xsqlite3PagerLookup(tls, pPager, pgno)
 
 	if pPgOld != 0 {
-		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
+		if (*PgHdr)(unsafe.Pointer(pPgOld)).FnRef > int64(1) {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62623)
+			return Xsqlite3CorruptError(tls, 62627)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 28)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -24376,7 +24398,7 @@ func Xsqlite3PagerClearCache(tls *libc.TLS, pPager uintptr) {
 func Xsqlite3PagerCheckpoint(tls *libc.TLS, pPager uintptr, db uintptr, eMode int32, pnLog uintptr, pnCkpt uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal == uintptr(0) && int32((*Pager)(unsafe.Pointer(pPager)).FjournalMode) == PAGER_JOURNALMODE_WAL {
-		Xsqlite3_exec(tls, db, ts+3945, uintptr(0), uintptr(0), uintptr(0))
+		Xsqlite3_exec(tls, db, ts+3964, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal != 0 {
 		rc = Xsqlite3WalCheckpoint(tls, (*Pager)(unsafe.Pointer(pPager)).FpWal, db, eMode,
@@ -24945,7 +24967,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, 64387)
+				return Xsqlite3CorruptError(tls, 64391)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25044,7 +25066,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64519)
+	rc = Xsqlite3CantopenError(tls, 64523)
 	goto finished
 __7:
 	;
@@ -25212,7 +25234,7 @@ __24:
 		goto __30
 	}
 	Xsqlite3_log(tls, SQLITE_NOTICE|int32(1)<<8,
-		ts+3963,
+		ts+3982,
 		libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 __30:
 	;
@@ -25629,7 +25651,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65333)
+	rc = Xsqlite3CorruptError(tls, 65337)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+12)
@@ -25774,7 +25796,7 @@ func walLimitSize(tls *libc.TLS, pWal uintptr, nMax I64) {
 	}
 	Xsqlite3EndBenignMalloc(tls)
 	if rx != 0 {
-		Xsqlite3_log(tls, rx, ts+4000, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
+		Xsqlite3_log(tls, rx, ts+4019, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 	}
 }
 
@@ -25904,7 +25926,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, 65682)
+		rc = Xsqlite3CantopenError(tls, 65686)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -26377,7 +26399,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66419)
+				return Xsqlite3CorruptError(tls, 66423)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -26882,7 +26904,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, 67138)
+			rc = Xsqlite3CorruptError(tls, 67142)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -27273,7 +27295,7 @@ func Xsqlite3BtreeLeaveCursor(tls *libc.TLS, pCur uintptr) {
 	Xsqlite3BtreeLeave(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpBtree)
 }
 
-var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 4026))
+var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 4045))
 
 var sqlite3SharedCacheList uintptr = uintptr(0)
 
@@ -27538,7 +27560,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, 69249)
+			rc = Xsqlite3CorruptError(tls, 69253)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -27675,7 +27697,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69434)
 	return
 __2:
 	;
@@ -27692,7 +27714,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69447)
 	goto ptrmap_exit
 __4:
 	;
@@ -27700,7 +27722,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69452)
 	goto ptrmap_exit
 __5:
 	;
@@ -27743,7 +27765,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, 69493)
+		return Xsqlite3CorruptError(tls, 69497)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -27753,7 +27775,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, 69501)
+		return Xsqlite3CorruptError(tls, 69505)
 	}
 	return SQLITE_OK
 }
@@ -28003,7 +28025,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, 69893)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69897)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28050,7 +28072,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69951)
+	return Xsqlite3CorruptError(tls, 69955)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28060,7 +28082,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69954)
+	return Xsqlite3CorruptError(tls, 69958)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28073,7 +28095,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69962)
+	return Xsqlite3CorruptError(tls, 69966)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28082,14 +28104,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69965)
+	return Xsqlite3CorruptError(tls, 69969)
 __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, 69967)
+	return Xsqlite3CorruptError(tls, 69971)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint32(iFree2-(iFree+sz)))
@@ -28099,7 +28121,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69971)
+	return Xsqlite3CorruptError(tls, 69975)
 __11:
 	;
 __8:
@@ -28163,7 +28185,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 70004)
+	return Xsqlite3CorruptError(tls, 70008)
 __22:
 	;
 	size = int32((*struct {
@@ -28173,7 +28195,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 70010)
+	return Xsqlite3CorruptError(tls, 70014)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -28195,7 +28217,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 70024)
+	return Xsqlite3CorruptError(tls, 70028)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -28230,7 +28252,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, 70081)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70085)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -28243,13 +28265,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, 70096)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70100)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70107)
 	}
 	return uintptr(0)
 }
@@ -28274,7 +28296,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, 70152)
+			return Xsqlite3CorruptError(tls, 70156)
 		}
 	}
 
@@ -28285,7 +28307,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, 70170)
+				return Xsqlite3CorruptError(tls, 70174)
 			} else {
 				return SQLITE_OK
 			}
@@ -28337,22 +28359,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 70249)
+				return Xsqlite3CorruptError(tls, 70253)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 70254)
+			return Xsqlite3CorruptError(tls, 70258)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 70266)
+				return Xsqlite3CorruptError(tls, 70270)
 			}
 			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, 70269)
+				return Xsqlite3CorruptError(tls, 70273)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -28362,7 +28384,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, 70282)
+					return Xsqlite3CorruptError(tls, 70286)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -28370,7 +28392,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, 70288)
+			return Xsqlite3CorruptError(tls, 70292)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -28378,10 +28400,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, 70297)
+			return Xsqlite3CorruptError(tls, 70301)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70298)
+			return Xsqlite3CorruptError(tls, 70302)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -28441,7 +28463,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70357)
+			return Xsqlite3CorruptError(tls, 70361)
 		}
 	} else {
 		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
@@ -28477,7 +28499,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70381)
+			return Xsqlite3CorruptError(tls, 70385)
 		}
 	}
 	return SQLITE_OK
@@ -28507,11 +28529,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70432)
+			return Xsqlite3CorruptError(tls, 70436)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70437)
+				return Xsqlite3CorruptError(tls, 70441)
 			}
 			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))))
@@ -28522,15 +28544,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70447)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70451)
+			return Xsqlite3CorruptError(tls, 70455)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70463)
+		return Xsqlite3CorruptError(tls, 70467)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -28558,14 +28580,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, 70494)
+			return Xsqlite3CorruptError(tls, 70498)
 		}
 		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, 70499)
+			return Xsqlite3CorruptError(tls, 70503)
 		}
 	}
 	return SQLITE_OK
@@ -28579,7 +28601,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, 70531)
+		return Xsqlite3CorruptError(tls, 70535)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -28591,7 +28613,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, 70545)
+		return Xsqlite3CorruptError(tls, 70549)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -28694,7 +28716,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70700)
+	rc = Xsqlite3CorruptError(tls, 70704)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -28722,7 +28744,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, 70721)
+	rc = Xsqlite3CorruptError(tls, 70725)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -28761,7 +28783,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, 70787)
+			return Xsqlite3CorruptError(tls, 70791)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -28834,7 +28856,7 @@ func Xsqlite3BtreeOpen(tls *libc.TLS, pVfs uintptr, zFilename uintptr, db uintpt
 	mutexOpen = uintptr(0)
 	rc = SQLITE_OK
 	isTempDb = libc.Bool32(zFilename == uintptr(0) || int32(*(*int8)(unsafe.Pointer(zFilename))) == 0)
-	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4042) == 0 ||
+	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4061) == 0 ||
 		isTempDb != 0 && Xsqlite3TempInMemory(tls, db) != 0 ||
 		vfsFlags&SQLITE_OPEN_MEMORY != 0)
 
@@ -29606,7 +29628,7 @@ __9:
 	;
 __10:
 	;
-	if !(libc.Xmemcmp(tls, page1+21, ts+4051, uint32(3)) != 0) {
+	if !(libc.Xmemcmp(tls, page1+21, ts+4070, uint32(3)) != 0) {
 		goto __14
 	}
 	goto page1_init_failed
@@ -29644,7 +29666,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71722)
+	rc = Xsqlite3CorruptError(tls, 71726)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30059,7 +30081,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, 72143)
+			return Xsqlite3CorruptError(tls, 72147)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30085,7 +30107,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, 72162)
+						return Xsqlite3CorruptError(tls, 72166)
 					}
 					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)
@@ -30094,7 +30116,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, 72171)
+					return Xsqlite3CorruptError(tls, 72175)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30105,7 +30127,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, 72183)
+				return Xsqlite3CorruptError(tls, 72187)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30121,7 +30143,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, 72218)
+		return Xsqlite3CorruptError(tls, 72222)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -30182,7 +30204,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, 72316)
+			return Xsqlite3CorruptError(tls, 72320)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -30217,7 +30239,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, 72368)
+					return Xsqlite3CorruptError(tls, 72372)
 				}
 			}
 
@@ -30277,7 +30299,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, 72436)
+			rc = Xsqlite3CorruptError(tls, 72440)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -30316,7 +30338,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, 72487)
+			return Xsqlite3CorruptError(tls, 72491)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -30347,7 +30369,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72514)
+			return Xsqlite3CorruptError(tls, 72518)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -30688,7 +30710,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, 72978)
+			return Xsqlite3CorruptError(tls, 72982)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -30932,14 +30954,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, 73385)
+		return Xsqlite3CorruptError(tls, 73389)
 	}
 
 	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, 73400)
+		return Xsqlite3CorruptError(tls, 73404)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -30984,7 +31006,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, 73462)
+				return Xsqlite3CorruptError(tls, 73466)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31033,7 +31055,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73547)
+		return Xsqlite3CorruptError(tls, 73551)
 	}
 	return rc
 }
@@ -31113,7 +31135,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, 73684)
+		return Xsqlite3CorruptError(tls, 73688)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -31204,7 +31226,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, 73823)
+	return Xsqlite3CorruptError(tls, 73827)
 __11:
 	;
 skip_init:
@@ -31224,7 +31246,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73835)
+	return Xsqlite3CorruptError(tls, 73839)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -31434,7 +31456,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 74077)
+	return Xsqlite3CorruptError(tls, 74081)
 __21:
 	;
 	goto __19
@@ -31638,7 +31660,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 74273)
+	return Xsqlite3CorruptError(tls, 74277)
 __4:
 	;
 	goto bypass_moveto_root
@@ -31703,7 +31725,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, 74360)
+	rc = Xsqlite3CorruptError(tls, 74364)
 	goto moveto_index_finish
 __17:
 	;
@@ -31751,7 +31773,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74392)
+	rc = Xsqlite3CorruptError(tls, 74396)
 __24:
 	;
 	goto moveto_index_finish
@@ -31870,7 +31892,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, 74508)
+		return Xsqlite3CorruptError(tls, 74512)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32030,7 +32052,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74688)
+	return Xsqlite3CorruptError(tls, 74692)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32095,7 +32117,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74744)
+	rc = Xsqlite3CorruptError(tls, 74748)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+4, 0)
@@ -32131,7 +32153,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74773)
+	rc = Xsqlite3CorruptError(tls, 74777)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -32175,7 +32197,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74807)
+	rc = Xsqlite3CorruptError(tls, 74811)
 	goto end_allocate_page
 __32:
 	;
@@ -32287,7 +32309,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74872)
+	rc = Xsqlite3CorruptError(tls, 74876)
 	goto end_allocate_page
 __51:
 	;
@@ -32445,7 +32467,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, 74999)
+	return Xsqlite3CorruptError(tls, 75003)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -32502,7 +32524,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75046)
+	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75050)
 	goto freepage_out
 __10:
 	;
@@ -32518,7 +32540,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75057)
+	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75061)
 	goto freepage_out
 __12:
 	;
@@ -32592,7 +32614,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, 75146)
+		return Xsqlite3CorruptError(tls, 75150)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -32604,7 +32626,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, 75163)
+			return Xsqlite3CorruptError(tls, 75167)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+4)
@@ -32615,7 +32637,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, 75183)
+			rc = Xsqlite3CorruptError(tls, 75187)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -32780,7 +32802,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, 75436)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75440)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -33058,12 +33080,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, 75737)
+				return Xsqlite3CorruptError(tls, 75741)
 			}
 			pCell = pTmp + uintptr((int32(pCell)-int32(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75742)
+			return Xsqlite3CorruptError(tls, 75746)
 		}
 
 		pData -= uintptr(sz)
@@ -33071,7 +33093,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, 75748)
+			return Xsqlite3CorruptError(tls, 75752)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint32(sz))
 
@@ -33131,7 +33153,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, 75833)
+			Xsqlite3CorruptError(tls, 75837)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*4)), uint32(sz))
@@ -33220,7 +33242,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75947)
+	return Xsqlite3CorruptError(tls, 75951)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint32(nCell*2))
@@ -33336,7 +33358,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, 76060)
+		return Xsqlite3CorruptError(tls, 76064)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 80)) = allocateBtreePage(tls, pBt, bp, bp+4, uint32(0), uint8(0))
@@ -33656,7 +33678,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, 76481)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76485)
 	goto balance_cleanup
 __25:
 	;
@@ -33667,7 +33689,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76505)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76509)
 	goto balance_cleanup
 __27:
 	;
@@ -33825,7 +33847,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76606)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76610)
 	goto balance_cleanup
 __55:
 	;
@@ -33899,7 +33921,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76639)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76643)
 	goto balance_cleanup
 __67:
 	;
@@ -33962,7 +33984,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76683)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76687)
 	goto balance_cleanup
 __75:
 	;
@@ -33990,7 +34012,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 112)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76716)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76720)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 112)) != 0) {
@@ -34251,7 +34273,7 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76916)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76920)
 	goto balance_cleanup
 __121:
 	;
@@ -34443,7 +34465,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, 77146)
+			return Xsqlite3CorruptError(tls, 77150)
 		}
 	}
 	return SQLITE_OK
@@ -34481,7 +34503,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 77206)
+			rc = Xsqlite3CorruptError(tls, 77210)
 		} 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)))
@@ -34587,7 +34609,7 @@ func btreeOverwriteOverflowCell(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, 77370)
+			rc = Xsqlite3CorruptError(tls, 77374)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -34612,7 +34634,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 
 	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)
+		return Xsqlite3CorruptError(tls, 77402)
 	}
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
 		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
@@ -34682,7 +34704,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77479)
+	return Xsqlite3CorruptError(tls, 77483)
 __3:
 	;
 __1:
@@ -34795,7 +34817,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 84)) = Xsqlite3CorruptError(tls, 77602)
+	*(*int32)(unsafe.Pointer(bp + 84)) = Xsqlite3CorruptError(tls, 77606)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 84)) = btreeComputeFreeSpace(tls, pPage)
@@ -34855,6 +34877,7 @@ __30:
 __25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
+	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
 		goto __31
 	}
@@ -34862,7 +34885,7 @@ __25:
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
 		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77640)
+	return Xsqlite3CorruptError(tls, 77645)
 __33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 84)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
@@ -34900,13 +34923,13 @@ __37:
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77667)
+	return Xsqlite3CorruptError(tls, 77672)
 __39:
 	;
 	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 88))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __40
 	}
-	return Xsqlite3CorruptError(tls, 77670)
+	return Xsqlite3CorruptError(tls, 77675)
 __40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint32(*(*int32)(unsafe.Pointer(bp + 88))))
@@ -34937,7 +34960,6 @@ __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 __44
 	}
@@ -35012,7 +35034,7 @@ 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, 77773)
+		return Xsqlite3CorruptError(tls, 77777)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
@@ -35037,7 +35059,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, 77798)
+				return Xsqlite3CorruptError(tls, 77802)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35138,7 +35160,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 20))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77894)
+			return Xsqlite3CorruptError(tls, 77898)
 		}
 	}
 
@@ -35146,11 +35168,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, 77903)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 	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, 77907)
+		return Xsqlite3CorruptError(tls, 77911)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -35225,7 +35247,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, 77998)
+			return Xsqlite3CorruptError(tls, 78002)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -35294,7 +35316,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, 78114)
+			return Xsqlite3CorruptError(tls, 78118)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -35323,7 +35345,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, 78162)
+				*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3CorruptError(tls, 78166)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 24)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 12)))
@@ -35399,7 +35421,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 78252)
+	return Xsqlite3CorruptError(tls, 78256)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 24)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -35413,7 +35435,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, 78259)
+	*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3CorruptError(tls, 78263)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -35547,7 +35569,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, 78363)
+		return Xsqlite3CorruptError(tls, 78367)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -35764,7 +35786,7 @@ 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+44, ts+4055, 1)
+		Xsqlite3_str_append(tls, pCheck+44, ts+4074, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
 		Xsqlite3_str_appendf(tls, pCheck+44, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
@@ -35789,11 +35811,11 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 	defer tls.Free(16)
 
 	if iPage > (*IntegrityCk)(unsafe.Pointer(pCheck)).FnPage || iPage == Pgno(0) {
-		checkAppendMsg(tls, pCheck, ts+4057, libc.VaList(bp, iPage))
+		checkAppendMsg(tls, pCheck, ts+4076, libc.VaList(bp, iPage))
 		return 1
 	}
 	if getPageReferenced(tls, pCheck, iPage) != 0 {
-		checkAppendMsg(tls, pCheck, ts+4080, libc.VaList(bp+8, iPage))
+		checkAppendMsg(tls, pCheck, ts+4099, libc.VaList(bp+8, iPage))
 		return 1
 	}
 	setPageReferenced(tls, pCheck, iPage)
@@ -35811,13 +35833,13 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
 			checkOom(tls, pCheck)
 		}
-		checkAppendMsg(tls, pCheck, ts+4105, libc.VaList(bp, iChild))
+		checkAppendMsg(tls, pCheck, ts+4124, libc.VaList(bp, iChild))
 		return
 	}
 
 	if int32(*(*U8)(unsafe.Pointer(bp + 48))) != int32(eType) || *(*Pgno)(unsafe.Pointer(bp + 52)) != iParent {
 		checkAppendMsg(tls, pCheck,
-			ts+4134,
+			ts+4153,
 			libc.VaList(bp+8, iChild, int32(eType), iParent, int32(*(*U8)(unsafe.Pointer(bp + 48))), *(*Pgno)(unsafe.Pointer(bp + 52))))
 	}
 }
@@ -35836,7 +35858,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 		}
 		N--
 		if Xsqlite3PagerGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpPager, iPage, bp+40, 0) != 0 {
-			checkAppendMsg(tls, pCheck, ts+4188, libc.VaList(bp, iPage))
+			checkAppendMsg(tls, pCheck, ts+4207, libc.VaList(bp, iPage))
 			break
 		}
 		pOvflData = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
@@ -35847,7 +35869,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 			}
 			if n > (*BtShared)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt)).FusableSize/U32(4)-U32(2) {
 				checkAppendMsg(tls, pCheck,
-					ts+4210, libc.VaList(bp+8, iPage))
+					ts+4229, libc.VaList(bp+8, iPage))
 				N--
 			} else {
 				for i = 0; i < int32(n); i++ {
@@ -35870,12 +35892,12 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 	}
 	if N != 0 && nErrAtStart == (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr {
 		checkAppendMsg(tls, pCheck,
-			ts+4249,
+			ts+4268,
 			libc.VaList(bp+16, func() uintptr {
 				if isFreeList != 0 {
-					return ts + 4275
+					return ts + 4294
 				}
-				return ts + 4280
+				return ts + 4299
 			}(),
 				expected-N, expected))
 	}
@@ -35991,13 +36013,13 @@ __2:
 	return 0
 __3:
 	;
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4301
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4320
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
 		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4311, libc.VaList(bp, rc))
+		ts+4330, libc.VaList(bp, rc))
 	goto end_of_check
 __4:
 	;
@@ -36008,7 +36030,7 @@ __4:
 	}
 
 	checkAppendMsg(tls, pCheck,
-		ts+4349, libc.VaList(bp+8, rc))
+		ts+4368, libc.VaList(bp+8, rc))
 	goto end_of_check
 __5:
 	;
@@ -36016,14 +36038,14 @@ __5:
 		goto __6
 	}
 
-	checkAppendMsg(tls, pCheck, ts+4387, libc.VaList(bp+16, rc))
+	checkAppendMsg(tls, pCheck, ts+4406, libc.VaList(bp+16, rc))
 	goto end_of_check
 __6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
 
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4409
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4428
 	contentOffset = U32((int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5))))<<8|int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5) + 1)))-1)&0xffff + 1)
 
 	nCell = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3) + 1)))
@@ -36040,7 +36062,7 @@ __6:
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
 		goto __9
 	}
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4435
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4454
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
 __9:
 	;
@@ -36065,7 +36087,7 @@ __10:
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
 		goto __13
 	}
-	checkAppendMsg(tls, pCheck, ts+4463,
+	checkAppendMsg(tls, pCheck, ts+4482,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
 	goto __11
@@ -36078,7 +36100,7 @@ __13:
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+108)).FnSize) > usableSize) {
 		goto __14
 	}
-	checkAppendMsg(tls, pCheck, ts+4493, 0)
+	checkAppendMsg(tls, pCheck, ts+4512, 0)
 	doCoverageCheck = 0
 	goto __11
 __14:
@@ -36094,7 +36116,7 @@ __14:
 	}() != 0) {
 		goto __16
 	}
-	checkAppendMsg(tls, pCheck, ts+4517, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+108)).FnKey))
+	checkAppendMsg(tls, pCheck, ts+4536, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+108)).FnKey))
 __16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 100)) = (*CellInfo)(unsafe.Pointer(bp + 108)).FnKey
@@ -36132,7 +36154,7 @@ __21:
 	if !(d2 != depth) {
 		goto __22
 	}
-	checkAppendMsg(tls, pCheck, ts+4541, 0)
+	checkAppendMsg(tls, pCheck, ts+4560, 0)
 	depth = d2
 __22:
 	;
@@ -36205,7 +36227,7 @@ __30:
 		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4566, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 128))>>16, iPage))
+		ts+4585, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 128))>>16, iPage))
 	goto __31
 	goto __33
 __32:
@@ -36222,7 +36244,7 @@ __31:
 		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4603,
+		ts+4622,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
 __34:
 	;
@@ -36336,7 +36358,7 @@ __6:
 	if !(bCkFreelist != 0) {
 		goto __7
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4655
+	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4674
 	checkList(tls, bp+32, 1, Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+32),
 		Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
@@ -36372,7 +36394,7 @@ __13:
 		goto __15
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4671,
+		ts+4690,
 		libc.VaList(bp, mx, mxInHdr))
 __15:
 	;
@@ -36382,7 +36404,7 @@ __9:
 		goto __16
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4716, 0)
+		ts+4735, 0)
 __16:
 	;
 __10:
@@ -36429,13 +36451,13 @@ __23:
 	if !(getPageReferenced(tls, bp+32, i) == 0 && (ptrmapPageno(tls, pBt, i) != i || !(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0))) {
 		goto __26
 	}
-	checkAppendMsg(tls, bp+32, ts+4771, libc.VaList(bp+16, i))
+	checkAppendMsg(tls, bp+32, ts+4790, libc.VaList(bp+16, i))
 __26:
 	;
 	if !(getPageReferenced(tls, bp+32, i) != 0 && (ptrmapPageno(tls, pBt, i) == i && (*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0)) {
 		goto __27
 	}
-	checkAppendMsg(tls, bp+32, ts+4793, libc.VaList(bp+24, i))
+	checkAppendMsg(tls, bp+32, ts+4812, libc.VaList(bp+24, i))
 __27:
 	;
 	goto __24
@@ -36698,7 +36720,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 		var rc int32 = 0
 		Xsqlite3ParseObjectInit(tls, bp+16, pDb)
 		if Xsqlite3OpenTempDatabase(tls, bp+16) != 0 {
-			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3656, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3675, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 			rc = SQLITE_ERROR
 		}
 		Xsqlite3DbFree(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
@@ -36709,7 +36731,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 	}
 
 	if i < 0 {
-		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4827, libc.VaList(bp+8, zDb))
+		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4846, libc.VaList(bp+8, zDb))
 		return uintptr(0)
 	}
 
@@ -36724,7 +36746,7 @@ func setDestPgsz(tls *libc.TLS, p uintptr) int32 {
 
 func checkReadTransaction(tls *libc.TLS, db uintptr, p uintptr) int32 {
 	if Xsqlite3BtreeTxnState(tls, p) != SQLITE_TXN_NONE {
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4847, 0)
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4866, 0)
 		return SQLITE_ERROR
 	}
 	return SQLITE_OK
@@ -36744,7 +36766,7 @@ func Xsqlite3_backup_init(tls *libc.TLS, pDestDb uintptr, zDestDb uintptr, pSrcD
 
 	if pSrcDb == pDestDb {
 		Xsqlite3ErrorWithMsg(tls,
-			pDestDb, SQLITE_ERROR, ts+4878, 0)
+			pDestDb, SQLITE_ERROR, ts+4897, 0)
 		p = uintptr(0)
 	} else {
 		p = Xsqlite3MallocZero(tls, uint64(unsafe.Sizeof(Sqlite3_backup{})))
@@ -37192,7 +37214,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 		(*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,
+		Xsqlite3_str_appendf(tls, bp+8, ts+4937,
 			libc.VaList(bp, func() float64 {
 				if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_IntReal != 0 {
 					return float64(*(*I64)(unsafe.Pointer(p)))
@@ -37784,7 +37806,7 @@ func Xsqlite3VdbeMemSetPointer(tls *libc.TLS, pMem uintptr, pPtr uintptr, zPType
 		if zPType != 0 {
 			return zPType
 		}
-		return ts + 1547
+		return ts + 1566
 	}()
 	(*Mem)(unsafe.Pointer(pMem)).Fz = pPtr
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null | MEM_Dyn | MEM_Subtype | MEM_Term)
@@ -38016,7 +38038,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, 81630)
+		return Xsqlite3CorruptError(tls, 81634)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -38247,7 +38269,7 @@ __9:
 		goto __10
 	}
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 8)).FisError
-	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3656, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
+	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3675, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
 	goto __11
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
@@ -38300,7 +38322,7 @@ func valueFromExpr(tls *libc.TLS, db uintptr, pExpr uintptr, enc U8, affinity U8
 	zVal = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	negInt = 1
-	zNeg = ts + 1547
+	zNeg = ts + 1566
 	rc = SQLITE_OK
 
 __1:
@@ -38341,7 +38363,7 @@ __4:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
 	negInt = -1
-	zNeg = ts + 4925
+	zNeg = ts + 4944
 __6:
 	;
 	if !(op == TK_STRING || op == TK_FLOAT || op == TK_INTEGER) {
@@ -38360,7 +38382,7 @@ __9:
 	Xsqlite3VdbeMemSetInt64(tls, *(*uintptr)(unsafe.Pointer(bp + 16)), I64(*(*int32)(unsafe.Pointer(pExpr + 8)))*I64(negInt))
 	goto __11
 __10:
-	zVal = Xsqlite3MPrintf(tls, db, ts+4927, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+	zVal = Xsqlite3MPrintf(tls, db, ts+4946, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	if !(zVal == uintptr(0)) {
 		goto __12
 	}
@@ -38664,7 +38686,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, 82270)
+		return Xsqlite3CorruptError(tls, 82274)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -38679,14 +38701,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 82276)
+			return Xsqlite3CorruptError(tls, 82280)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 82282)
+		return Xsqlite3CorruptError(tls, 82286)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -39694,34 +39716,34 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var j int32
 			var pKeyInfo uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4932, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4951, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
 			for j = 0; j < int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField); j++ {
 				var pColl uintptr = *(*uintptr)(unsafe.Pointer(pKeyInfo + 20 + uintptr(j)*4))
 				var zColl uintptr
 				if pColl != 0 {
 					zColl = (*CollSeq)(unsafe.Pointer(pColl)).FzName
 				} else {
-					zColl = ts + 1547
+					zColl = ts + 1566
 				}
-				if libc.Xstrcmp(tls, zColl, ts+1092) == 0 {
-					zColl = ts + 4937
+				if libc.Xstrcmp(tls, zColl, ts+1111) == 0 {
+					zColl = ts + 4956
 				}
-				Xsqlite3_str_appendf(tls, bp+144, ts+4939,
+				Xsqlite3_str_appendf(tls, bp+144, ts+4958,
 					libc.VaList(bp+8, func() uintptr {
 						if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_DESC != 0 {
-							return ts + 4925
+							return ts + 4944
 						}
-						return ts + 1547
+						return ts + 1566
 					}(),
 						func() uintptr {
 							if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_BIGNULL != 0 {
-								return ts + 4947
+								return ts + 4966
 							}
-							return ts + 1547
+							return ts + 1566
 						}(),
 						zColl))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4950, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+4969, 1)
 			break
 
 		}
@@ -39729,7 +39751,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 		{
 			var pColl uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4952, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
+			Xsqlite3_str_appendf(tls, bp+144, ts+4971, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
 				encnames[(*CollSeq)(unsafe.Pointer(pColl)).Fenc]))
 			break
 
@@ -39737,32 +39759,32 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -7:
 		{
 			var pDef uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
-			Xsqlite3_str_appendf(tls, bp+144, ts+4961, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4980, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -15:
 		{
 			var pDef uintptr = (*Sqlite3_context)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpFunc
-			Xsqlite3_str_appendf(tls, bp+144, ts+4961, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4980, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -13:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1327, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1346, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
 	case -3:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+4968, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4987, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
 			break
 
 		}
 	case -12:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1321, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1340, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
@@ -39772,13 +39794,13 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Str != 0 {
 				zP4 = (*Mem)(unsafe.Pointer(pMem)).Fz
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1327, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1346, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1321, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1340, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Null != 0 {
-				zP4 = ts + 1548
+				zP4 = ts + 1567
 			} else {
-				zP4 = ts + 4971
+				zP4 = ts + 4990
 			}
 			break
 
@@ -39786,7 +39808,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -11:
 		{
 			var pVtab uintptr = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-			Xsqlite3_str_appendf(tls, bp+144, ts+4978, libc.VaList(bp+120, pVtab))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4997, libc.VaList(bp+120, pVtab))
 			break
 
 		}
@@ -39797,20 +39819,20 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var n U32 = *(*U32)(unsafe.Pointer(ai))
 
 			for i = U32(1); i <= n; i++ {
-				Xsqlite3_str_appendf(tls, bp+144, ts+4986, libc.VaList(bp+128, func() int32 {
+				Xsqlite3_str_appendf(tls, bp+144, ts+5005, libc.VaList(bp+128, func() int32 {
 					if i == U32(1) {
 						return '['
 					}
 					return ','
 				}(), *(*U32)(unsafe.Pointer(ai + uintptr(i)*4))))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4991, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+5010, 1)
 			break
 
 		}
 	case -4:
 		{
-			zP4 = ts + 4993
+			zP4 = ts + 5012
 			break
 
 		}
@@ -39835,7 +39857,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	return Xsqlite3StrAccumFinish(tls, bp+144)
 }
 
-var encnames = [4]uintptr{ts + 5001, ts + 5003, ts + 5005, ts + 5010}
+var encnames = [4]uintptr{ts + 5020, ts + 5022, ts + 5024, ts + 5029}
 
 // Declare to the Vdbe that the BTree object at db->aDb[i] is used.
 //
@@ -40285,8 +40307,8 @@ func Xsqlite3VdbeMakeReady(tls *libc.TLS, p uintptr, pParse uintptr) {
 }
 
 var azColName = [12]uintptr{
-	ts + 5015, ts + 5020, ts + 5027, ts + 5030, ts + 5033, ts + 5036, ts + 5039, ts + 5042,
-	ts + 5050, ts + 5053, ts + 5060, ts + 5068,
+	ts + 5034, ts + 5039, ts + 5046, ts + 5049, ts + 5052, ts + 5055, ts + 5058, ts + 5061,
+	ts + 5069, ts + 5072, ts + 5079, ts + 5087,
 }
 
 // Close a VDBE cursor and release all the resources that cursor
@@ -40495,7 +40517,7 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		var nMainFile int32
 
 		nMainFile = Xsqlite3Strlen30(tls, zMainFile)
-		zSuper = Xsqlite3MPrintf(tls, db, ts+5075, libc.VaList(bp, 0, zMainFile, 0))
+		zSuper = Xsqlite3MPrintf(tls, db, ts+5094, libc.VaList(bp, 0, zMainFile, 0))
 		if zSuper == uintptr(0) {
 			return SQLITE_NOMEM
 		}
@@ -40503,16 +40525,16 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		for __ccgo := true; __ccgo; __ccgo = rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 60)) != 0 {
 			if retryCount != 0 {
 				if retryCount > 100 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5087, libc.VaList(bp+24, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5106, libc.VaList(bp+24, zSuper))
 					Xsqlite3OsDelete(tls, pVfs, zSuper, 0)
 					break
 				} else if retryCount == 1 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5101, libc.VaList(bp+32, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5120, libc.VaList(bp+32, zSuper))
 				}
 			}
 			retryCount++
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
-			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5116,
+			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5135,
 				libc.VaList(bp+40, *(*U32)(unsafe.Pointer(bp + 56))>>8&U32(0xffffff), *(*U32)(unsafe.Pointer(bp + 56))&U32(0xff)))
 
 			rc = Xsqlite3OsAccess(tls, pVfs, zSuper, SQLITE_ACCESS_EXISTS, bp+60)
@@ -40658,7 +40680,7 @@ func Xsqlite3VdbeCheckFk(tls *libc.TLS, p uintptr, deferred int32) int32 {
 		!(deferred != 0) && (*Vdbe)(unsafe.Pointer(p)).FnFkConstraint > int64(0) {
 		(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_CONSTRAINT | int32(3)<<8
 		(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
-		Xsqlite3VdbeError(tls, p, ts+5129, 0)
+		Xsqlite3VdbeError(tls, p, ts+5148, 0)
 		if int32((*Vdbe)(unsafe.Pointer(p)).FprepFlags)&SQLITE_PREPARE_SAVESQL == 0 {
 			return SQLITE_ERROR
 		}
@@ -40990,7 +41012,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 86058)
+		return Xsqlite3CorruptError(tls, 86062)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -41541,7 +41563,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86989))
 		return 0
 	}
 
@@ -41606,7 +41628,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, 87062))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87066))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 20 + uintptr(i)*4)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -41640,7 +41662,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, 87092))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87096))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -41690,7 +41712,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, 87136))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87140))
 			return 0
 		}
 	}
@@ -41836,7 +41858,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87303))
 	return 0
 __7:
 	;
@@ -42007,7 +42029,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87457)
+	return Xsqlite3CorruptError(tls, 87461)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42033,7 +42055,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, 87490)
+		return Xsqlite3CorruptError(tls, 87494)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -42144,13 +42166,13 @@ func Xsqlite3NotPureFunc(tls *libc.TLS, pCtx uintptr) int32 {
 		var zContext uintptr
 		var zMsg uintptr
 		if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_IsCheck != 0 {
-			zContext = ts + 5159
-		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5178
-		} else {
+		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5197
+		} else {
+			zContext = ts + 5216
 		}
-		zMsg = Xsqlite3_mprintf(tls, ts+5206,
+		zMsg = Xsqlite3_mprintf(tls, ts+5225,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx)).FpFunc)).FzName, zContext))
 		Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 		Xsqlite3_free(tls, zMsg)
@@ -42255,7 +42277,7 @@ func Xsqlite3_expired(tls *libc.TLS, pStmt uintptr) int32 {
 
 func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 	if (*Vdbe)(unsafe.Pointer(p)).Fdb == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5242, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5261, 0)
 		return 1
 	} else {
 		return 0
@@ -42265,7 +42287,7 @@ func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 
 func vdbeSafetyNotNull(tls *libc.TLS, p uintptr) int32 {
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5287, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5306, 0)
 		return 1
 	} else {
 		return vdbeSafety(tls, p)
@@ -42307,7 +42329,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, 87854)
+			return Xsqlite3MisuseError(tls, 87858)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -42730,7 +42752,7 @@ func Xsqlite3_result_error_code(tls *libc.TLS, pCtx uintptr, errCode int32) {
 // Force an SQLITE_TOOBIG error.
 func Xsqlite3_result_error_toobig(tls *libc.TLS, pCtx uintptr) {
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FisError = SQLITE_TOOBIG
-	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5327, int64(-1),
+	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5346, int64(-1),
 		uint8(SQLITE_UTF8), uintptr(0))
 }
 
@@ -42922,7 +42944,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88544)
+		return Xsqlite3MisuseError(tls, 88548)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -43442,15 +43464,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 89208)
+		return Xsqlite3MisuseError(tls, 89212)
 	}
 	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+5350, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 89216)
+			ts+5369, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89220)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -43855,7 +43877,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, 89707)
+	rc = Xsqlite3MisuseError(tls, 89711)
 	goto preupdate_old_out
 __1:
 	;
@@ -43999,7 +44021,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, 89809)
+	rc = Xsqlite3MisuseError(tls, 89813)
 	goto preupdate_new_out
 __1:
 	;
@@ -44171,7 +44193,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+5390, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5409, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, (int32(zRawSql)-int32(zStart))/1)
 		}
@@ -44207,11 +44229,11 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 
 			pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr(*(*int32)(unsafe.Pointer(bp + 76))-1)*40
 			if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Null != 0 {
-				Xsqlite3_str_append(tls, bp+48, ts+1548, 4)
+				Xsqlite3_str_append(tls, bp+48, ts+1567, 4)
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+1327, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+1346, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+4918, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+4937, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Str != 0 {
 				var nOut int32
 				var enc U8 = (*Sqlite3)(unsafe.Pointer(db)).Fenc
@@ -44226,21 +44248,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+5394, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5413, 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+5401, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5420, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5414, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5433, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					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_appendf(tls, bp+48, ts+5436, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5422, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5441, 1)
 			}
 		}
 	}
@@ -44443,10 +44465,6 @@ func filterHash(tls *libc.TLS, aMem uintptr, pOp uintptr) U64 {
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Real != 0 {
 			h = h + U64(Xsqlite3VdbeIntValue(tls, p))
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&(MEM_Str|MEM_Blob) != 0 {
-			h = h + U64((*Mem)(unsafe.Pointer(p)).Fn)
-			if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Zero != 0 {
-				h = h + U64(*(*int32)(unsafe.Pointer(p)))
-			}
 		}
 	}
 	return h
@@ -44457,11 +44475,11 @@ func vdbeMemTypeName(tls *libc.TLS, pMem uintptr) uintptr {
 }
 
 var azTypes = [5]uintptr{
-	ts + 1108,
-	ts + 1120,
-	ts + 1125,
-	ts + 1103,
-	ts + 1548,
+	ts + 1127,
+	ts + 1139,
+	ts + 1144,
+	ts + 1122,
+	ts + 1567,
 }
 
 // Execute as much of a VDBE program as we can.
@@ -45504,20 +45522,20 @@ __202:
 		goto __205
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5424, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	Xsqlite3VdbeError(tls, p, ts+5443, 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))))
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5464, 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))))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
 	;
 	pcx = (int32(pOp) - int32(aOp)) / 20
-	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))
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5471, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 __204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
@@ -47095,7 +47113,7 @@ op_column_corrupt:
 	goto __9
 	goto __425
 __424:
-	rc = Xsqlite3CorruptError(tls, 93317)
+	rc = Xsqlite3CorruptError(tls, 93320)
 	goto abort_due_to_error
 __425:
 	;
@@ -47223,7 +47241,7 @@ __428:
 	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5476,
+	Xsqlite3VdbeError(tls, p, ts+5495,
 		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
@@ -47655,7 +47673,7 @@ __78:
 		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5517, 0)
+	Xsqlite3VdbeError(tls, p, ts+5536, 0)
 	rc = SQLITE_BUSY
 	goto __523
 __522:
@@ -47715,7 +47733,7 @@ __530:
 	if !!(pSavepoint != 0) {
 		goto __531
 	}
-	Xsqlite3VdbeError(tls, p, ts+5568, libc.VaList(bp+88, zName))
+	Xsqlite3VdbeError(tls, p, ts+5587, libc.VaList(bp+88, zName))
 	rc = SQLITE_ERROR
 	goto __532
 __531:
@@ -47724,7 +47742,7 @@ __531:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5590, 0)
+		ts+5609, 0)
 	rc = SQLITE_BUSY
 	goto __534
 __533:
@@ -47910,7 +47928,7 @@ __564:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5644, 0)
+		ts+5663, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
 	goto __567
@@ -47953,13 +47971,13 @@ __562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5699
+				return ts + 5718
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5747
+					return ts + 5766
 				}
-				return ts + 5790
+				return ts + 5809
 			}()
 		}(), 0)
 
@@ -48042,7 +48060,7 @@ __576:
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5831)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5850)
 
 	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 __583
@@ -48246,7 +48264,7 @@ __88:
 	}
 
 	(*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
+	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fz = ts + 1566
 __602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
@@ -48855,7 +48873,7 @@ notExistsWithKey:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
 		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95560)
+	rc = Xsqlite3CorruptError(tls, 95563)
 	goto __683
 __682:
 	goto jump_to_p2
@@ -49633,7 +49651,7 @@ __767:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
 		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5859)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96638, ts+5878)
 	goto abort_due_to_error
 __770:
 	;
@@ -49743,7 +49761,7 @@ __780:
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
 		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96840)
+	rc = Xsqlite3CorruptError(tls, 96843)
 	goto abort_due_to_error
 __781:
 	;
@@ -49904,14 +49922,14 @@ __141:
 	libc.SetBitFieldPtr8Uint32(p+144, Bft(0), 0, 0x3)
 	goto __799
 __798:
-	zSchema = ts + 5876
+	zSchema = ts + 5895
 	(*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+5890,
+		ts+5909,
 		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 __800
@@ -49937,7 +49955,7 @@ __802:
 		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 97092)
+	rc = Xsqlite3CorruptError(tls, 97095)
 __803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
@@ -50127,7 +50145,7 @@ __820:
 		goto __825
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5933, 0)
+	Xsqlite3VdbeError(tls, p, ts+5952, 0)
 	goto abort_due_to_error
 __825:
 	;
@@ -50439,7 +50457,7 @@ __860:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
 		goto __862
 	}
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
 __862:
 	;
@@ -50489,7 +50507,7 @@ __867:
 	if !(rc != 0) {
 		goto __868
 	}
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
 __868:
 	;
@@ -50571,12 +50589,12 @@ __876:
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5970,
+		ts+5989,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6022
+				return ts + 6041
 			}
-			return ts + 6027
+			return ts + 6046
 		}()))
 	goto abort_due_to_error
 	goto __879
@@ -50718,7 +50736,7 @@ __171:
 		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6034, libc.VaList(bp+144, z1))
+	Xsqlite3VdbeError(tls, p, ts+6053, libc.VaList(bp+144, z1))
 __894:
 	;
 	goto abort_due_to_error
@@ -50836,7 +50854,7 @@ __904:
 	(*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+6063, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6082, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
 	goto __9
 
 __177:
@@ -50925,7 +50943,7 @@ __912:
 	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)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 768)).FisError
 __913:
 	;
@@ -51155,7 +51173,7 @@ __935:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
 		goto __940
 	}
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
 __940:
 	;
@@ -51231,7 +51249,7 @@ __945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
 		goto __947
 	}
-	z3 = Xsqlite3MPrintf(tls, db, ts+6073, libc.VaList(bp+168, zTrace))
+	z3 = Xsqlite3MPrintf(tls, db, ts+6092, 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)
@@ -51304,7 +51322,7 @@ __955:
 	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __957
 	}
-	rc = Xsqlite3CorruptError(tls, 99031)
+	rc = Xsqlite3CorruptError(tls, 99034)
 __957:
 	;
 __956:
@@ -51312,13 +51330,13 @@ __956:
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
 		goto __958
 	}
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
 __958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
 
-	Xsqlite3_log(tls, rc, ts+6079,
+	Xsqlite3_log(tls, rc, ts+6098,
 		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 __959
@@ -51374,13 +51392,13 @@ __966:
 	return rc
 
 too_big:
-	Xsqlite3VdbeError(tls, p, ts+5327, 0)
+	Xsqlite3VdbeError(tls, p, ts+5346, 0)
 	rc = SQLITE_TOOBIG
 	goto abort_due_to_error
 
 no_mem:
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3VdbeError(tls, p, ts+1483, 0)
+	Xsqlite3VdbeError(tls, p, ts+1502, 0)
 	rc = SQLITE_NOMEM
 	goto abort_due_to_error
 
@@ -51391,8 +51409,8 @@ abort_due_to_interrupt:
 	return int32(0)
 }
 
-var azType = [4]uintptr{ts + 6111, ts + 6120, ts + 6127,
-	ts + 6133}
+var azType = [4]uintptr{ts + 6130, ts + 6139, ts + 6146,
+	ts + 6152}
 var and_logic = [9]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(1), uint8(2), uint8(0), uint8(2), uint8(2)}
 var or_logic = [9]uint8{uint8(0), uint8(1), uint8(2), uint8(1), uint8(1), uint8(1), uint8(2), uint8(1), uint8(2)}
 var aMask = [12]uint8{
@@ -51447,16 +51465,16 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		}
 
 		if type1 < U32(12) {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6145,
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6164,
 				libc.VaList(bp, func() uintptr {
 					if type1 == U32(0) {
-						return ts + 6174
+						return ts + 6193
 					}
 					return func() uintptr {
 						if type1 == U32(7) {
-							return ts + 6179
+							return ts + 6198
 						}
-						return ts + 6184
+						return ts + 6203
 					}()
 				}()))
 			rc = SQLITE_ERROR
@@ -51476,10 +51494,10 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		rc = Xsqlite3_finalize(tls, (*Incrblob)(unsafe.Pointer(p)).FpStmt)
 		(*Incrblob)(unsafe.Pointer(p)).FpStmt = uintptr(0)
 		if rc == SQLITE_OK {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6192, libc.VaList(bp+8, iRow))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6211, libc.VaList(bp+8, iRow))
 			rc = SQLITE_ERROR
 		} else {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3656, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3675, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
 		}
 	}
 
@@ -51539,21 +51557,21 @@ __3:
 		goto __4
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6212, libc.VaList(bp, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6231, libc.VaList(bp, zTable))
 __4:
 	;
 	if !(pTab != 0 && !((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0))) {
 		goto __5
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6242, libc.VaList(bp+8, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6261, libc.VaList(bp+8, zTable))
 __5:
 	;
 	if !(pTab != 0 && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __6
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6278, libc.VaList(bp+16, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6297, libc.VaList(bp+16, zTable))
 __6:
 	;
 	if !!(pTab != 0) {
@@ -51597,7 +51615,7 @@ __11:
 		goto __13
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
-	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6299, libc.VaList(bp+24, zColumn))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6318, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51624,7 +51642,7 @@ __19:
 	if !((*sColMap)(unsafe.Pointer(pFKey+36+uintptr(j)*8)).FiFrom == iCol) {
 		goto __22
 	}
-	zFault = ts + 6320
+	zFault = ts + 6339
 __22:
 	;
 	goto __20
@@ -51657,7 +51675,7 @@ __26:
 	if !(int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == iCol || int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == -2) {
 		goto __29
 	}
-	zFault = ts + 6332
+	zFault = ts + 6351
 __29:
 	;
 	goto __27
@@ -51678,7 +51696,7 @@ __25:
 		goto __30
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
-	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6340, libc.VaList(bp+32, zFault))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6359, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51776,7 +51794,7 @@ __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 328)) != 0 {
-			return ts + 3656
+			return ts + 3675
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 328))))
@@ -51824,7 +51842,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99516)
+		return Xsqlite3MisuseError(tls, 99519)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51907,7 +51925,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99616)
+		return Xsqlite3MisuseError(tls, 99619)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51920,7 +51938,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 				if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-					return ts + 3656
+					return ts + 3675
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
@@ -54439,25 +54457,25 @@ 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 {
+	if Xsqlite3_strnicmp(tls, zTab, ts+6393, 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 {
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6401+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
 			return 1
 		}
 		if pSchema == uintptr(0) {
 			return 0
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5876+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5895+7) == 0 {
 			return 1
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6439+7) == 0 {
 			return 1
 		}
 	} else {
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6439+7) == 0 {
 			return 1
 		}
 	}
@@ -54537,7 +54555,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6434, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6453, zDb) == 0) {
 		goto __8
 	}
 
@@ -54658,7 +54676,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6439) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6458) != 0) {
 		goto __33
 	}
 	goto __14
@@ -54832,14 +54850,14 @@ __60:
 	;
 	goto __59
 __58:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6441, zTab) == 0) {
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6460, zTab) == 0) {
 		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
 	goto __62
 __61:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6445, zTab) == 0) {
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6464, zTab) == 0) {
 		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
@@ -54856,7 +54874,7 @@ __57:
 		goto __64
 	}
 	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 8))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6449, zTab) == 0) {
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6468, zTab) == 0) {
 		goto __65
 	}
 	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
@@ -55015,7 +55033,7 @@ __86:
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
 		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6458, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6477, libc.VaList(bp, zAs))
 	return WRC_Abort
 __90:
 	;
@@ -55023,14 +55041,14 @@ __90:
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
 		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6489, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6508, libc.VaList(bp+8, zAs))
 	return WRC_Abort
 __91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
 		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 	return WRC_Abort
 __92:
 	;
@@ -55082,7 +55100,7 @@ __11:
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6544, libc.VaList(bp+16, zCol))
+		ts+6563, 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
@@ -55122,7 +55140,7 @@ __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 + 6579
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6598
 	*(*uintptr)(unsafe.Pointer(pExpr + 20)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
@@ -55135,23 +55153,23 @@ __101:
 __99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6588
+		zErr = ts + 6607
 	} else {
-		zErr = ts + 6603
+		zErr = ts + 6622
 	}
 	if !(zDb != 0) {
 		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6625, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6644, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
 	goto __105
 __104:
 	if !(zTab != 0) {
 		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6638, libc.VaList(bp+56, zErr, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6657, libc.VaList(bp+56, zErr, zTab, zCol))
 	goto __107
 __106:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp+80, zErr, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6667, libc.VaList(bp+80, zErr, zCol))
 __107:
 	;
 __105:
@@ -55254,15 +55272,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 + 6655
+	var zIn uintptr = ts + 6674
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6683
+		zIn = ts + 6702
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6701
+		zIn = ts + 6720
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6719
+		zIn = ts + 6738
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6737, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6756, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -55340,14 +55358,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 + 6757
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
-				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6762
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
-				}
-				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
+				*(*int32)(unsafe.Pointer(pExpr + 8)) = libc.Bool32(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL)
+				*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IntValue)
+				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_INTEGER)
+
 				i = 0
 				p = pNC
 			__4:
@@ -55391,7 +55405,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+6768, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6776, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -55455,7 +55469,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+6785, libc.VaList(bp, pExpr))
+								ts+6793, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -55471,7 +55485,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+6849,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6857,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -55485,7 +55499,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+6885, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6893, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -55508,30 +55522,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+6913, libc.VaList(bp+16, pExpr))
+						ts+6921, 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 + 6956
+						zType = ts + 6964
 					} else {
-						zType = ts + 6963
+						zType = ts + 6971
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6973, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6981, 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+7001, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7009, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7023,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7031,
 						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+7067,
+						ts+7075,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -55603,15 +55617,15 @@ 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+7115, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7123, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 20)))
 				}
 
 				if nRef != (*NameContext)(unsafe.Pointer(pNC)).FnRef {
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_VarSelect)
-					*(*int32)(unsafe.Pointer(pNC + 24)) |= NC_VarSelect
 				}
+				*(*int32)(unsafe.Pointer(pNC + 24)) |= NC_Subquery
 			}
 			break
 
@@ -55619,7 +55633,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+7126, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7134, pExpr, pExpr)
 			}
 
 			break
@@ -55675,7 +55689,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+6526, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -55750,7 +55764,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7137, libc.VaList(bp, i, zType, mx))
+		ts+7145, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -55770,7 +55784,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+7193, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7201, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -55805,7 +55819,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+7227, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7235, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -55862,7 +55876,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+7233, libc.VaList(bp, i+1))
+				ts+7241, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -55890,7 +55904,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+7294, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7302, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -56104,7 +56118,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+7325, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7333, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -56144,7 +56158,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+7227) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7235) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -56155,7 +56169,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7364) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7372) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -56167,7 +56181,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+7370, 0)
+						ts+7378, 0)
 					return WRC_Abort
 				}
 
@@ -56956,7 +56970,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 		return
 	}
 
@@ -57031,7 +57045,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+7429, libc.VaList(bp, mxHeight))
+			ts+7437, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -57280,12 +57294,12 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7477,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7485,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7521
+						return ts + 7529
 					}
-					return ts + 1547
+					return ts + 1566
 				}(), nElem))
 			break
 		}
@@ -57324,7 +57338,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+7523)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7531)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -57350,7 +57364,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+7525, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7533, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 20)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -57378,7 +57392,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+7559, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7567, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -57425,7 +57439,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+7579,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7587,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 116 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -57450,7 +57464,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+7622, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7630, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -58025,7 +58039,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+7645,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7653,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -58148,7 +58162,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+7675, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7683, libc.VaList(bp, zObject))
 	}
 }
 
@@ -58204,10 +58218,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+6757) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7706) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6762) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7711) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -58638,13 +58652,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+7698) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7717) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7706) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7725) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7712) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7731) == 0 {
 		return 1
 	}
 	return 0
@@ -58848,7 +58862,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+7716, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7735, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -58926,7 +58940,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+7763, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7782, 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)
 
@@ -59020,7 +59034,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 + 7794
+		var zFmt uintptr = ts + 7813
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -59038,7 +59052,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+6526, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 	}
 }
 
@@ -59079,7 +59093,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+7838, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7857, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 44 + 4)),
@@ -59109,11 +59123,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+7861, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7880, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
-				return ts + 1547
+				return ts + 1566
 			}
-			return ts + 7880
+			return ts + 7899
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -59240,7 +59254,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+7892, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7911, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 44 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 44)))
@@ -59255,11 +59269,11 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7910, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7929, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
-			return ts + 1547
+			return ts + 1566
 		}
-		return ts + 7880
+		return ts + 7899
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
@@ -59282,7 +59296,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+7523)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7531)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -59291,7 +59305,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+7931)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7950)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -59677,13 +59691,13 @@ 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+7933, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7936,
+			if Xsqlite3_strnicmp(tls, z, ts+7952, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7955,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
-							return ts + 4925
+							return ts + 4944
 						}
-						return ts + 1547
+						return ts + 1566
 					}(), pExpr))
 			} else {
 				codeReal(tls, v, z, negFlag, iMem)
@@ -59720,6 +59734,7 @@ func Xsqlite3ExprCodeLoadIndexColumn(tls *libc.TLS, pParse uintptr, pIdx uintptr
 func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr, pCol uintptr, regOut int32) {
 	var iAddr int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
+	var nErr int32 = (*Parse)(unsafe.Pointer(pParse)).FnErr
 
 	if (*Parse)(unsafe.Pointer(pParse)).FiSelfTab > 0 {
 		iAddr = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Parse)(unsafe.Pointer(pParse)).FiSelfTab-1, 0, regOut)
@@ -59733,6 +59748,9 @@ func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr
 	if iAddr != 0 {
 		Xsqlite3VdbeJumpHere(tls, v, iAddr)
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr > nErr {
+		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FerrByteOffset = -1
+	}
 }
 
 // Generate code to extract the value of the iCol-th column of a table.
@@ -59754,7 +59772,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+7963,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7982,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -59927,8 +59945,8 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[6]uintptr)(unsafe.Pointer(bp + 52)) = [6]uintptr{ts + 7993, ts + 7998, ts + 8003, ts + 6184,
-				ts + 6179, ts + 8011}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 52)) = [6]uintptr{ts + 8012, ts + 8017, ts + 8022, ts + 6203,
+				ts + 6198, ts + 8030}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
@@ -59936,7 +59954,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 8019
+						return ts + 8038
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 52 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*4))
 				}())
@@ -59951,6 +59969,7 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 	var p uintptr
 	var v uintptr
 	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+		var exprAff U8
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -59964,6 +59983,14 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 		if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr, iDataCur) != 0 {
 			continue
 		}
+
+		exprAff = U8(Xsqlite3ExprAffinity(tls, pExpr))
+		if int32(exprAff) <= SQLITE_AFF_BLOB && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_BLOB ||
+			int32(exprAff) == SQLITE_AFF_TEXT && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_TEXT ||
+			int32(exprAff) >= SQLITE_AFF_NUMERIC && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_NUMERIC {
+			continue
+		}
+
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 
 		if (*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow != 0 {
@@ -60303,7 +60330,7 @@ __73:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
 		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7963,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7982,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
 __76:
@@ -60536,7 +60563,7 @@ __43:
 		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+8024, libc.VaList(bp+8, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8043, libc.VaList(bp+8, pExpr))
 	goto __91
 __90:
 	return func() int32 {
@@ -60577,7 +60604,7 @@ __93:
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
 		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8051, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8070, libc.VaList(bp+16, pExpr))
 	goto __5
 __94:
 	;
@@ -60737,7 +60764,7 @@ __121:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
 		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7645,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7653,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
 __122:
 	;
@@ -60759,11 +60786,10 @@ __49:
 	return target
 
 __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) {
+	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) {
 		goto __123
 	}
+
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
 		goto __125
@@ -60803,7 +60829,7 @@ __126:
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 	goto __5
 
 __55:
@@ -60834,13 +60860,19 @@ __129:
 	;
 __127:
 	;
-	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
+	addrINR = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable, 0, target)
 
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = U8(0)
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = okConstFactor
+	if !(inReg != target) {
+		goto __130
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
+	inReg = target
+__130:
+	;
 	Xsqlite3VdbeJumpHere(tls, v, addrINR)
-	Xsqlite3VdbeChangeP3(tls, v, addrINR, inReg)
 	goto __5
 
 __56:
@@ -60853,15 +60885,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __130
+		goto __131
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __131
+		goto __132
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__131:
+__132:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -60871,22 +60903,22 @@ __131:
 	pTest = bp + 100
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__130:
+__131:
 	;
 	i1 = 0
-__132:
+__133:
 	if !(i1 < nExpr-1) {
-		goto __134
+		goto __135
 	}
 	if !(pX != 0) {
-		goto __135
+		goto __136
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 100)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
-	goto __136
-__135:
-	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
+	goto __137
 __136:
+	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
+__137:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -60895,21 +60927,21 @@ __136:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*20)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __133
-__133:
-	i1 = i1 + 2
-	goto __132
 	goto __134
 __134:
+	i1 = i1 + 2
+	goto __133
+	goto __135
+__135:
 	;
 	if !(nExpr&1 != 0) {
-		goto __137
+		goto __138
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*20)).FpExpr, target)
-	goto __138
-__137:
-	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+	goto __139
 __138:
+	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+__139:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -60919,27 +60951,27 @@ __138:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __139
-	}
-	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8075, 0)
-	return 0
-__139:
-	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __140
 	}
-	Xsqlite3MayAbort(tls, pParse)
+	Xsqlite3ErrorMsg(tls, pParse,
+		ts+8094, 0)
+	return 0
 __140:
 	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __141
 	}
+	Xsqlite3MayAbort(tls, pParse)
+__141:
+	;
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+		goto __142
+	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __142
-__141:
+	goto __143
+__142:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -60948,7 +60980,7 @@ __141:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__142:
+__143:
 	;
 	goto __5
 
@@ -60959,7 +60991,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8125))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8144))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -62751,11 +62783,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+6374, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6393, 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+8135, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8154, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -62767,13 +62799,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8163,
+		ts+8182,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8338,
+			ts+8357,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -62783,10 +62815,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8512, libc.VaList(bp, zDb, zDb))
+		ts+8531, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8659, 0)
+			ts+8678, 0)
 	}
 }
 
@@ -62850,7 +62882,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8810, libc.VaList(bp, zName))
+		ts+8829, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -62860,7 +62892,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8869, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8888, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -62869,7 +62901,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8875, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8894, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -62910,19 +62942,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8902, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8921, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9086,
+		ts+9105,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9391, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9410, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9407,
+		ts+9426,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -62930,7 +62962,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9465, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9484, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -62942,7 +62974,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9730, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9749, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -62954,7 +62986,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9743,
+		ts+9762,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -63000,12 +63032,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9781, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9800, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9813, 0)
+			ts+9832, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -63015,11 +63047,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+9840)
+				ts+9859)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9899)
+				ts+9918)
 		}
 
 		if pDflt != 0 {
@@ -63032,12 +63064,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9952)
+					ts+9971)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9998)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10017)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -63048,7 +63080,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10025,
+			ts+10044,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 44)), zCol, *(*int32)(unsafe.Pointer(pNew + 44)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -63070,7 +63102,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+10171,
+				ts+10190,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -63118,14 +63150,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10401, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10420, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10435, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10454, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -63153,7 +63185,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+10465, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10484, 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
 	}
@@ -63193,18 +63225,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 + 10484
+		zType = ts + 10503
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10489
+		zType = ts + 10508
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10503,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10522,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10521
+					return ts + 10540
 				}
-				return ts + 10538
+				return ts + 10557
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -63288,11 +63320,11 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10556, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10575, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1547, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1566, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iSchema == 1))
 
 	Xsqlite3MayAbort(tls, pParse)
@@ -63305,17 +63337,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10577,
+		ts+10596,
 		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+10759,
+		ts+10778,
 		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+9730, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9749, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63573,12 +63605,12 @@ 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+10890,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10909,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10913
+				return ts + 10932
 			}
-			return ts + 1547
+			return ts + 1566
 		}(), zWhen,
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg))
 	Xsqlite3_result_error(tls, pCtx, zErr, -1)
@@ -63618,8 +63650,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+10915, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 113494)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10934, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113516)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -63636,7 +63668,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, 113505)
+		rc = Xsqlite3CorruptError(tls, 113527)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -63658,7 +63690,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+10923, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10942, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -63698,12 +63730,12 @@ 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+10929, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10948, 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 + 10913
+							return ts + 10932
 						}
-						return ts + 1547
+						return ts + 1566
 					}()))
 				zReplace = zBuf2
 				nReplace = U32(Xsqlite3Strlen30(tls, zReplace))
@@ -64189,7 +64221,7 @@ __45:
 	if !((*Parse)(unsafe.Pointer(bp+20)).FzErrMsg != 0) {
 		goto __47
 	}
-	renameColumnParseError(tls, context, ts+1547, *(*uintptr)(unsafe.Pointer(argv + 1*4)), *(*uintptr)(unsafe.Pointer(argv + 2*4)), bp+20)
+	renameColumnParseError(tls, context, ts+1566, *(*uintptr)(unsafe.Pointer(argv + 1*4)), *(*uintptr)(unsafe.Pointer(argv + 2*4)), bp+20)
 	goto __48
 __47:
 	Xsqlite3_result_error_code(tls, context, rc)
@@ -64354,7 +64386,7 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 			if rc == SQLITE_ERROR && Xsqlite3WritableSchema(tls, db) != 0 {
 				Xsqlite3_result_value(tls, context, *(*uintptr)(unsafe.Pointer(argv + 3*4)))
 			} else if (*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0 {
-				renameColumnParseError(tls, context, ts+1547, *(*uintptr)(unsafe.Pointer(argv + 1*4)), *(*uintptr)(unsafe.Pointer(argv + 2*4)), bp+48)
+				renameColumnParseError(tls, context, ts+1566, *(*uintptr)(unsafe.Pointer(argv + 1*4)), *(*uintptr)(unsafe.Pointer(argv + 2*4)), bp+48)
 			} else {
 				Xsqlite3_result_error_code(tls, context, rc)
 			}
@@ -64557,7 +64589,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 114441)
+	rc = Xsqlite3CorruptError(tls, 114463)
 	goto drop_column_done
 __2:
 	;
@@ -64581,7 +64613,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10934, libc.VaList(bp, (int32((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int32(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10953, 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)
 
@@ -64662,19 +64694,19 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10556, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10575, 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+10941,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10960,
 		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 + 10969
+				return ts + 10988
 			}
-			return ts + 6120
+			return ts + 6139
 		}(),
 			zCol))
 	goto exit_drop_column
@@ -64683,7 +64715,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10981, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11000, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -64697,13 +64729,13 @@ __8:
 	goto exit_drop_column
 __9:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1547, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1566, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11029, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11048, 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+11150, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11169, 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
@@ -64821,11 +64853,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 + 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}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11187},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11208},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11228},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11247},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11266}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -64859,7 +64891,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+11270, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11289, 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)
 			}
@@ -64868,10 +64900,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+11293,
+					ts+11312,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11323, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11342, 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)
 			}
@@ -64889,9 +64921,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11341, FzCols: ts + 11354},
-	{FzName: ts + 11367, FzCols: ts + 11380},
-	{FzName: ts + 11408},
+	{FzName: ts + 11360, FzCols: ts + 11373},
+	{FzName: ts + 11386, FzCols: ts + 11399},
+	{FzName: ts + 11427},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65081,7 +65113,7 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11421}
+	FzName:     ts + 11440}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
@@ -65332,7 +65364,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11431}
+	FzName:     ts + 11450}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(72)
@@ -65346,7 +65378,7 @@ 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+11441,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11460,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
 					return (*StatAccum)(unsafe.Pointer(p)).FnEst
@@ -65359,7 +65391,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11446, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11465, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -65401,7 +65433,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+11452, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
+			Xsqlite3_str_appendf(tls, bp+48, ts+11471, 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--
@@ -65415,7 +65447,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11458}
+	FzName:     ts + 11477}
 
 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)
@@ -65459,7 +65491,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+11467, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11486, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -65476,7 +65508,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+11341, uint32(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11360, 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)
@@ -65632,7 +65664,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+11477, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11496, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -65689,7 +65721,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+11477, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11496, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -65736,9 +65768,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+11481)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11500)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11485)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11504)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -65821,7 +65853,7 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 	var v TRowcnt
 
 	if z == uintptr(0) {
-		z = ts + 1547
+		z = ts + 1566
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
 		v = uint64(0)
@@ -65843,15 +65875,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+11489, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11508, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11500, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11519, 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+11510, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11529, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -66127,11 +66159,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+11367, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11386, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11522,
-			ts+11576,
+			ts+11541,
+			ts+11595,
 			zDb)
 	}
 	return rc
@@ -66178,10 +66210,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+11341, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11360, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11628, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11647, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -66239,7 +66271,7 @@ 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+6434, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6453, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -66272,13 +66304,13 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zFile == uintptr(0)) {
 		goto __1
 	}
-	zFile = ts + 1547
+	zFile = ts + 1566
 __1:
 	;
 	if !(zName == uintptr(0)) {
 		goto __2
 	}
-	zName = ts + 1547
+	zName = ts + 1566
 __2:
 	;
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(db + 168 + 8))&0x4>>2)) != 0) {
@@ -66286,14 +66318,14 @@ __2:
 	}
 
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3828)
+	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3847)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11669, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11688, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
 	if !(rc == SQLITE_OK) {
 		goto __6
 	}
@@ -66330,7 +66362,7 @@ __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 116 + 7*4))+2) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11672,
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11691,
 		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 116 + 7*4))))
 	goto attach_error
 __11:
@@ -66344,7 +66376,7 @@ __12:
 	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __15
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11709, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11728, libc.VaList(bp+8, zName))
 	goto attach_error
 __15:
 	;
@@ -66408,7 +66440,7 @@ __4:
 		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11739, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11758, 0)
 	goto __23
 __22:
 	if !(rc == SQLITE_OK) {
@@ -66425,7 +66457,7 @@ __25:
 		goto __27
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db,
-		ts+11768, 0)
+		ts+11787, 0)
 	rc = SQLITE_ERROR
 __27:
 	;
@@ -66491,13 +66523,13 @@ __33:
 	}
 	Xsqlite3OomFault(tls, db)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 44)))
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+1483, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+1502, 0)
 	goto __35
 __34:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 44)) == uintptr(0)) {
 		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11836, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11855, libc.VaList(bp+16, zFile))
 __36:
 	;
 __35:
@@ -66544,7 +66576,7 @@ func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zName == uintptr(0)) {
 		goto __1
 	}
-	zName = ts + 1547
+	zName = ts + 1566
 __1:
 	;
 	i = 0
@@ -66575,14 +66607,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11864, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11883, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11885, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11904, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -66590,7 +66622,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11911, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11930, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -66707,7 +66739,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11933}
+	FzName:     ts + 11952}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -66720,7 +66752,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11947}
+	FzName:     ts + 11966}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -66734,7 +66766,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+11961, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11980, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -66766,7 +66798,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+11985,
+						ts+12004,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -66941,7 +66973,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+12031, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12050, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -66967,11 +66999,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+12054, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12073, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12060, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12079, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12066, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12085, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -67018,7 +67050,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 + 7706
+		zCol = ts + 7725
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -67042,7 +67074,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+12093, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12112, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -67313,25 +67345,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6434) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6453) == 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+6374, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6393, 7) == 0 {
 			if i == 1 {
-				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 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6439+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5895+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema+8,
-						ts+6382)
+						ts+6401)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6439+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*16)).FpSchema+8,
-						ts+5876)
+						ts+5895)
 				}
 			}
 		}
@@ -67352,12 +67384,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		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 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6393, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6439+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5895)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema+8,
-					ts+6382)
+					ts+6401)
 			}
 		}
 	}
@@ -67388,7 +67420,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+12108, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12127, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -67406,14 +67438,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 + 12116
+			zMsg = ts + 12135
 		} else {
-			zMsg = ts + 12129
+			zMsg = ts + 12148
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6638, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6657, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6667, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -67443,12 +67475,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+6374, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5876+7) == 0 {
-			return ts + 6420
+	if Xsqlite3_strnicmp(tls, zName, ts+6393, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5895+7) == 0 {
+			return ts + 6439
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6382+7) == 0 {
-			return ts + 6401
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6401+7) == 0 {
+			return ts + 6420
 		}
 	}
 	return zName
@@ -67806,7 +67838,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+5876)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5895)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -67832,7 +67864,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6434, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6453, zName) {
 				goto __3
 			}
 
@@ -67885,13 +67917,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+12143, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12162, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12160, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12179, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -67929,13 +67961,13 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 		if Xsqlite3_stricmp(tls, zType, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit))) != 0 ||
 			Xsqlite3_stricmp(tls, zName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 1*4))) != 0 ||
 			Xsqlite3_stricmp(tls, zTblName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 2*4))) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1547, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1566, 0)
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6374, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6393, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12180,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12199,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -68095,9 +68127,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 + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -68113,7 +68145,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12222, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12241, 0)
 	return
 __4:
 	;
@@ -68141,9 +68173,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10484
+			return ts + 10503
 		}
-		return ts + 8869
+		return ts + 8888
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -68159,9 +68191,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 + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -68192,12 +68224,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12263,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12282,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10484
+				return ts + 10503
 			}
-			return ts + 8869
+			return ts + 8888
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -68212,7 +68244,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12284, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12303, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -68299,7 +68331,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+12319, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12338, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -68323,7 +68355,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+12336, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12355, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -68343,7 +68375,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 + 12319
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12338
 	(*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)
@@ -68355,7 +68387,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+12319, pRet+8) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12338, pRet+8) ==
 		pRet+8 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -68389,7 +68421,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+12370, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12389, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -68397,13 +68429,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+12393, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(6)), ts+12412, 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+12400, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(9)), ts+12419, 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--
@@ -68440,7 +68472,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+12410, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12429, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -68604,10 +68636,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+12436,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12455,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12481, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12500, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint32(unsafe.Sizeof(Expr{})))
@@ -68638,7 +68670,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+12522, 0)
+			ts+12541, 0)
 	}
 }
 
@@ -68683,7 +68715,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12574, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12593, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -68772,7 +68804,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12615, 0)
+		ts+12634, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -68867,7 +68899,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12671, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12690, 0)
 	goto generated_done
 __2:
 	;
@@ -68880,13 +68912,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12714, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12733, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12722, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12741, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -68920,13 +68952,19 @@ __10:
 
 	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
 __11:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_RAISE) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = (*Column)(unsafe.Pointer(pCol)).Faffinity
+__12:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12729,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12748,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -69047,13 +69085,13 @@ __3:
 	;
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
-		zSep = ts + 1547
-		zSep2 = ts + 12760
-		zEnd = ts + 4950
+		zSep = ts + 1566
+		zSep2 = ts + 12779
+		zEnd = ts + 4969
 	} else {
-		zSep = ts + 12762
-		zSep2 = ts + 12766
-		zEnd = ts + 12771
+		zSep = ts + 12781
+		zSep2 = ts + 12785
+		zEnd = ts + 12790
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -69061,7 +69099,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12774, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12793, 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('(')
@@ -69095,17 +69133,17 @@ __5:
 	goto __6
 __6:
 	;
-	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3656, libc.VaList(bp, zEnd))
+	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3675, libc.VaList(bp, zEnd))
 	return zStmt
 }
 
 var azType1 = [6]uintptr{
-	ts + 1547,
-	ts + 12788,
-	ts + 12794,
-	ts + 12799,
-	ts + 12804,
-	ts + 12794,
+	ts + 1566,
+	ts + 12807,
+	ts + 12813,
+	ts + 12818,
+	ts + 12823,
+	ts + 12813,
 }
 
 func resizeIndexObject(tls *libc.TLS, db uintptr, pIdx uintptr, N int32) int32 {
@@ -69495,7 +69533,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
 		if pSelect != 0 || !(int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM) && (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1547, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1566, 0)
 			return
 		}
 		(*Table)(unsafe.Pointer(p)).Ftnum = (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum
@@ -69512,10 +69550,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+12810,
-						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1547)))
+						ts+12829,
+						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1566)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12843,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12862,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -69534,11 +69572,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+12870, 0)
+				ts+12889, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12920, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12939, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 28)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -69572,7 +69610,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12952, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12971, 0)
 			return
 		}
 	}
@@ -69597,11 +69635,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 + 8869
-			zType2 = ts + 12996
+			zType = ts + 8888
+			zType2 = ts + 13015
 		} else {
-			zType = ts + 10484
-			zType2 = ts + 13002
+			zType = ts + 10503
+			zType2 = ts + 13021
 		}
 
 		if pSelect != 0 {
@@ -69672,11 +69710,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+13007, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13026, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13022,
+			ts+13041,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -69692,13 +69730,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+13120,
+					ts+13139,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13162, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13181, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -69713,7 +69751,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+9391) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9410) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -69743,7 +69781,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+13196, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13215, 0)
 	goto create_view_fail
 __1:
 	;
@@ -69759,7 +69797,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+4, pParse, iDb, ts+10484, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+4, pParse, iDb, ts+10503, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+4, pSelect) != 0) {
 		goto __3
 	}
@@ -69841,7 +69879,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13232, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13251, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -69966,13 +70004,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+13262, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13281, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13277,
+		ts+13296,
 		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)
 }
@@ -70013,10 +70051,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+13344, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13363, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11293,
+				ts+11312,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -70048,12 +70086,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+13358,
+			ts+13377,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13403,
+		ts+13422,
 		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)
@@ -70081,11 +70119,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+6374, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3279, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6393, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3298, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7126, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7134, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -70163,9 +70201,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 	zArg2 = uintptr(0)
@@ -70224,21 +70262,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13470, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13489, 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+13498, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13517, 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+13532, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13551, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -70250,7 +70288,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11485, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11504, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -70314,7 +70352,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13564,
+		ts+13583,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*16)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -70326,7 +70364,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13627, 0)
+		ts+13646, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -70411,7 +70449,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13721,
+		ts+13740,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*20)).FzEName))
 	goto fk_end
 __23:
@@ -70638,12 +70676,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+13767,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13786,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13795
+							return ts + 13814
 						}
-						return ts + 13801
+						return ts + 13820
 					}()))
 				return 1
 			}
@@ -70764,7 +70802,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+132, pParse, iDb, ts+13806, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+132, pParse, iDb, ts+13825, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+132, pTblName) != 0) {
 		goto __10
 	}
@@ -70783,7 +70821,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13812,
+		ts+13831,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -70809,26 +70847,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6393, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13862, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13881, 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+13890, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13909, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13915, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13934, 0)
 	goto exit_create_index
 __17:
 	;
@@ -70842,7 +70880,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13806, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13825, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -70857,7 +70895,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13949, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13968, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -70869,7 +70907,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13983, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14002, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -70898,7 +70936,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14007, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14026, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -70919,9 +70957,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -70960,7 +70998,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13806)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13825)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -71061,7 +71099,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14030, 0)
+		ts+14049, 0)
 	goto exit_create_index
 __56:
 	;
@@ -71278,7 +71316,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14091, libc.VaList(bp+48, 0))
+		ts+14110, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -71330,8 +71368,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14133, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14152, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121859)
 	goto exit_create_index
 __101:
 	;
@@ -71377,12 +71415,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14150,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14169,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
-				return ts + 1547
+				return ts + 1566
 			}
-			return ts + 14170
+			return ts + 14189
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -71390,7 +71428,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14178,
+		ts+14197,
 		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,
@@ -71404,7 +71442,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14237, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14256, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -71565,7 +71603,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14264, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14283, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -71580,7 +71618,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14282, libc.VaList(bp+8, 0))
+		ts+14301, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -71591,9 +71629,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 + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -71619,9 +71657,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14355,
+		ts+14374,
 		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+11481, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11500, (*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)
@@ -71756,7 +71794,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+14415,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14434,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -71964,12 +72002,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+14451,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14470,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14487
+				return ts + 14506
 			}
-			return ts + 14490
+			return ts + 14509
 		}()))
 	goto append_from_error
 __1:
@@ -72138,7 +72176,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14496, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14515, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -72174,9 +72212,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14502
+				return ts + 14521
 			}
-			return ts + 14511
+			return ts + 14530
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -72201,7 +72239,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14496, ts + 14518, ts + 14502}
+var az = [3]uintptr{ts + 14515, ts + 14537, ts + 14521}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -72216,7 +72254,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+14526, 0)
+				ts+14545, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -72353,17 +72391,17 @@ 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+14596, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14615, 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+14607, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14626, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
-			Xsqlite3_str_append(tls, bp+8, ts+1560, 1)
+			Xsqlite3_str_append(tls, bp+8, ts+1579, 1)
 			Xsqlite3_str_appendall(tls, bp+8, zCol)
 		}
 	}
@@ -72386,11 +72424,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+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12073, 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+14610, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14629, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -72520,7 +72558,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14619, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14638, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -72616,7 +72654,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+14665, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14684, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -72809,7 +72847,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14695, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14714, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -73089,7 +73127,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+14726,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14745,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -73121,11 +73159,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+14759, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14778, 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+14788, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14807, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -73376,7 +73414,7 @@ __20:
 	goto __16
 __15:
 	wcf = U16(WHERE_ONEPASS_DESIRED | WHERE_DUPLICATES_OK)
-	if !((*NameContext)(unsafe.Pointer(bp+8)).FncFlags&NC_VarSelect != 0) {
+	if !((*NameContext)(unsafe.Pointer(bp+8)).FncFlags&NC_Subquery != 0) {
 		goto __23
 	}
 	bComplex = 1
@@ -73629,7 +73667,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14826)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14845)
 __62:
 	;
 delete_from_cleanup:
@@ -73744,7 +73782,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+11341) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11360) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -73974,7 +74012,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 + 7998, ts + 7993, ts + 6174}
+var azType2 = [5]uintptr{ts + 6203, ts + 6198, ts + 8017, ts + 8012, ts + 6193}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -74033,7 +74071,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+14839, -1)
+					Xsqlite3_result_error(tls, context, ts+14858, -1)
 					return
 				}
 				iVal = -iVal
@@ -74337,7 +74375,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14856, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14875, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -74683,7 +74721,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+14861, -1)
+		Xsqlite3_result_error(tls, context, ts+14880, -1)
 		return
 	}
 	if argc == 3 {
@@ -74693,7 +74731,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+14894, -1)
+				ts+14913, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -74746,7 +74784,7 @@ func errlogFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	_ = argc
 	_ = context
-	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3656, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4)))))
+	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3675, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4)))))
 }
 
 func compileoptionusedFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
@@ -74786,13 +74824,13 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 
 			var zVal uintptr
 			r1 = Xsqlite3_value_double(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+4918, libc.VaList(bp, r1))
+			Xsqlite3_str_appendf(tls, pStr, ts+4937, libc.VaList(bp, r1))
 			zVal = Xsqlite3_str_value(tls, pStr)
 			if zVal != 0 {
 				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+14939, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14958, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -74800,7 +74838,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 		}
 	case SQLITE_INTEGER:
 		{
-			Xsqlite3_str_appendf(tls, pStr, ts+1327, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
+			Xsqlite3_str_appendf(tls, pStr, ts+1346, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
 			break
 
 		}
@@ -74829,13 +74867,13 @@ 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+14946, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14965, libc.VaList(bp+24, zArg))
 			break
 
 		}
 	default:
 		{
-			Xsqlite3_str_append(tls, pStr, ts+1548, 4)
+			Xsqlite3_str_append(tls, pStr, ts+1567, 4)
 			break
 
 		}
@@ -74976,7 +75014,7 @@ func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 	var ch U32
 	var c U8
 	var d U8
-	zPass = ts + 1547
+	zPass = ts + 1566
 	nPass = 0
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -75258,7 +75296,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10913}
+var azOne = [1]uintptr{ts + 10932}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -75270,7 +75308,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	zIn = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	if zIn == uintptr(0) {
-		zIn = ts + 1547
+		zIn = ts + 1566
 	}
 	for i = 0; *(*U8)(unsafe.Pointer(zIn + uintptr(i))) != 0 && !(int32(Xsqlite3CtypeMap[*(*U8)(unsafe.Pointer(zIn + uintptr(i)))])&0x02 != 0); i++ {
 	}
@@ -75294,7 +75332,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+14949, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14968, 4, uintptr(0))
 	}
 }
 
@@ -75319,7 +75357,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+12093, -1)
+		Xsqlite3_result_error(tls, context, ts+12112, -1)
 		return
 	}
 
@@ -75397,7 +75435,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+14839, -1)
+			Xsqlite3_result_error(tls, context, ts+14858, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -75659,7 +75697,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+14954, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14973, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -75679,14 +75717,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14960, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14979, 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+14960, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14979, 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+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)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14979, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14979, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -75927,109 +75965,109 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 }
 
 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 + 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(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(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 + 14984},
+	{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 + 15004},
+	{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 + 15017},
+	{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 + 15035},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15044},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15052},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15052},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15067},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15093},
+	{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 + 15118},
+	{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 + 15127},
+	{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 + 15138},
+	{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 + 15145},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15159},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15159},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15165},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15165},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15171},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15171},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15176},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15176},
+	{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 + 15176},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15180},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FzName: ts + 15180},
+	{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 + 15180},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15184},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15191},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15199},
+	{FnArg: int8(2), 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 + 15212},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15219},
+	{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 + 15234},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15239},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15243},
+	{FnArg: int8(2), 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 + 15255},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15261},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15265},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15265},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15271},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15278},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15285},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15296},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15303},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15318},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15335},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15346},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15352},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15370},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15378},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15392},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15400},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15409},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15409},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{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 + 15426},
+	{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 + 15430},
+	{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 + 15436},
+	{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 + 15440},
+	{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 + 15440},
+	{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 + 15446},
+	{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 + 15446},
+	{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 + 15459},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14979},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14979},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6598},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6598},
 	{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 + 15516},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15469},
+	{FnArg: int8(1), 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 + 15483},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15489},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15492},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15496},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15502},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15492},
+	{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 + 15511},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15515},
 	{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 + 15525},
+	{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 + 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 + 15549},
+	{FnArg: int8(2), 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 + 15546},
+	{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 + 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 + 15558},
+	{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 + 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 + 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}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15591},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15596},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15604},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15612},
+	{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_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6598},
+	{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 + 15620}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -76150,7 +76188,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+15605,
+				ts+15624,
 				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)
@@ -76810,8 +76848,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 + 6445, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 32)) = Token{Fz: ts + 6441, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 24)) = Token{Fz: ts + 6464, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 32)) = Token{Fz: ts + 6460, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -76890,7 +76928,7 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 			(*Token)(unsafe.Pointer(bp + 40)).Fz = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 			(*Token)(unsafe.Pointer(bp + 40)).Fn = uint32(Xsqlite3Strlen30(tls, (*Token)(unsafe.Pointer(bp+40)).Fz))
 
-			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5129)
+			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5148)
 			if pRaise != 0 {
 				(*Expr)(unsafe.Pointer(pRaise)).FaffExpr = int8(OE_Abort)
 			}
@@ -77311,7 +77349,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7963, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7982, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -77779,7 +77817,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15650,
+		ts+15669,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*16)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -77804,7 +77842,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15691,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15710,
 		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
@@ -77953,7 +77991,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15723,
+		ts+15742,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -77963,7 +78001,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15775, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15794, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -78015,7 +78053,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15800,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15819,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -78023,7 +78061,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15846, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15865, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -78435,7 +78473,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15867)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15886)
 __125:
 	;
 insert_cleanup:
@@ -78750,7 +78788,7 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 					fallthrough
 				case OE_Fail:
 					{
-						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12073, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 							(*Column)(unsafe.Pointer(pCol)).FzCnName))
 
 						Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
@@ -79841,13 +79879,13 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131895)
+	return Xsqlite3MisuseError(tls, 131931)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
 		goto __2
 	}
-	zSql = ts + 1547
+	zSql = ts + 1566
 __2:
 	;
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -80326,7 +80364,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12093, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12112, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -80335,7 +80373,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15881
+		zEntry = ts + 15900
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -80350,7 +80388,7 @@ __5:
 	if !(ii < int32(uint32(unsafe.Sizeof(azEndings))/uint32(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+12054, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12073, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -80386,7 +80424,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15904, uint32(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15923, uint32(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -80400,7 +80438,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15913, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15932, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -80424,7 +80462,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15917, uint32(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15936, uint32(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -80442,7 +80480,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15923, libc.VaList(bp+16, zEntry, zFile))
+		ts+15942, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -80469,7 +80507,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15966, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15985, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -80507,7 +80545,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15998, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16017, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -80517,7 +80555,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16035,
+	ts + 16054,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80672,7 +80710,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+16038, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16057, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -80680,63 +80718,63 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 }
 
 var pragCName = [57]uintptr{
-	ts + 5050,
-	ts + 16077,
-	ts + 8869,
-	ts + 16081,
-	ts + 16086,
-	ts + 16089,
-	ts + 16099,
-	ts + 16109,
-	ts + 16115,
-	ts + 16119,
-	ts + 16124,
-	ts + 16129,
-	ts + 16137,
+	ts + 5069,
+	ts + 16096,
+	ts + 8888,
+	ts + 16100,
+	ts + 16105,
+	ts + 16108,
+	ts + 16118,
+	ts + 16128,
+	ts + 16134,
+	ts + 16138,
+	ts + 16143,
 	ts + 16148,
-	ts + 16151,
-	ts + 16158,
-	ts + 16119,
-	ts + 16124,
-	ts + 16165,
+	ts + 16156,
+	ts + 16167,
 	ts + 16170,
-	ts + 16173,
-	ts + 16180,
-	ts + 16115,
-	ts + 16119,
-	ts + 16186,
-	ts + 16191,
-	ts + 16196,
-	ts + 16119,
-	ts + 16200,
-	ts + 16124,
-	ts + 16208,
-	ts + 16212,
-	ts + 16217,
-	ts + 11485,
-	ts + 11481,
-	ts + 16223,
-	ts + 16228,
-	ts + 16233,
-	ts + 16077,
-	ts + 16119,
-	ts + 16238,
-	ts + 16245,
+	ts + 16177,
+	ts + 16138,
+	ts + 16143,
+	ts + 16184,
+	ts + 16189,
+	ts + 16192,
+	ts + 16199,
+	ts + 16134,
+	ts + 16138,
+	ts + 16205,
+	ts + 16210,
+	ts + 16215,
+	ts + 16138,
+	ts + 16219,
+	ts + 16143,
+	ts + 16227,
+	ts + 16231,
+	ts + 16236,
+	ts + 11504,
+	ts + 11500,
+	ts + 16242,
+	ts + 16247,
 	ts + 16252,
-	ts + 8869,
-	ts + 16260,
-	ts + 5053,
-	ts + 16266,
-	ts + 16077,
-	ts + 16119,
+	ts + 16096,
+	ts + 16138,
+	ts + 16257,
+	ts + 16264,
 	ts + 16271,
-	ts + 16276,
-	ts + 15473,
-	ts + 16281,
-	ts + 16294,
-	ts + 16303,
-	ts + 16310,
-	ts + 16321,
+	ts + 8888,
+	ts + 16279,
+	ts + 5072,
+	ts + 16285,
+	ts + 16096,
+	ts + 16138,
+	ts + 16290,
+	ts + 16295,
+	ts + 15492,
+	ts + 16300,
+	ts + 16313,
+	ts + 16322,
+	ts + 16329,
+	ts + 16340,
 }
 
 // Definitions of all built-in pragmas
@@ -80753,238 +80791,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16329,
+	{FzName: ts + 16348,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16344,
+	{FzName: ts + 16363,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16359,
+	{FzName: ts + 16378,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16371,
+	{FzName: ts + 16390,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16387,
+	{FzName: ts + 16406,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16310,
+	{FzName: ts + 16329,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16400,
+	{FzName: ts + 16419,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16412,
+	{FzName: ts + 16431,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16432,
+	{FzName: ts + 16451,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CellSizeCk)},
-	{FzName: ts + 16448,
+	{FzName: ts + 16467,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16469,
+	{FzName: ts + 16488,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16484,
+	{FzName: ts + 16503,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16500,
+	{FzName: ts + 16519,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16514,
+	{FzName: ts + 16533,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16527,
+	{FzName: ts + 16546,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16541,
+	{FzName: ts + 16560,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16560,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_DeferFKs)},
 	{FzName: ts + 16579,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_DeferFKs)},
+	{FzName: ts + 16598,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16602,
+	{FzName: ts + 16621,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16611,
+	{FzName: ts + 16630,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16629,
+	{FzName: ts + 16648,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16646,
+	{FzName: ts + 16665,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16659,
+	{FzName: ts + 16678,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16674,
+	{FzName: ts + 16693,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16692,
+	{FzName: ts + 16711,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16702,
+	{FzName: ts + 16721,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16716,
+	{FzName: ts + 16735,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16732,
+	{FzName: ts + 16751,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16757,
+	{FzName: ts + 16776,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16776,
+	{FzName: ts + 16795,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16787,
+	{FzName: ts + 16806,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16798,
+	{FzName: ts + 16817,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16810,
+	{FzName: ts + 16829,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16826,
+	{FzName: ts + 16845,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16839,
+	{FzName: ts + 16858,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16858,
+	{FzName: ts + 16877,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16877,
+	{FzName: ts + 16896,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16890,
+	{FzName: ts + 16909,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16905,
+	{FzName: ts + 16924,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16915,
+	{FzName: ts + 16934,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16927,
+	{FzName: ts + 16946,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16936,
+	{FzName: ts + 16955,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16947,
+	{FzName: ts + 16966,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16957,
+	{FzName: ts + 16976,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16969,
+	{FzName: ts + 16988,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16980,
+	{FzName: ts + 16999,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16992,
+	{FzName: ts + 17011,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17009,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_RecTriggers)},
 	{FzName: ts + 17028,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_RecTriggers)},
+	{FzName: ts + 17047,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17054,
+	{FzName: ts + 17073,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17069,
+	{FzName: ts + 17088,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17083,
+	{FzName: ts + 17102,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17102,
+	{FzName: ts + 17121,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17116,
+	{FzName: ts + 17135,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17132,
+	{FzName: ts + 17151,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17144,
+	{FzName: ts + 17163,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17155,
+	{FzName: ts + 17174,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17166,
+	{FzName: ts + 17185,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17178,
+	{FzName: ts + 17197,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17189,
+	{FzName: ts + 17208,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17210,
+	{FzName: ts + 17229,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17218,
+	{FzName: ts + 17237,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17233,
+	{FzName: ts + 17252,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17246,
-		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
 	{FzName: ts + 17265,
+		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
+	{FzName: ts + 17284,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17280,
+	{FzName: ts + 17299,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -81006,7 +81044,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 17296))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 17315))
 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)}
@@ -81018,10 +81056,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+17321) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17340) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17331) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17350) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -81030,13 +81068,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+8019) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8038) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17357) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17343) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17362) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -81051,9 +81089,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+16271) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16290) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17355) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17374) == 0 {
 		return 2
 	} else {
 		return 0
@@ -81067,7 +81105,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+17362, 0)
+				ts+17381, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpBt)
@@ -81158,19 +81196,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17424
+		zName = ts + 17443
 		break
 	case OE_SetDflt:
-		zName = ts + 17433
+		zName = ts + 17452
 		break
 	case OE_Cascade:
-		zName = ts + 17445
+		zName = ts + 17464
 		break
 	case OE_Restrict:
-		zName = ts + 17453
+		zName = ts + 17472
 		break
 	default:
-		zName = ts + 17462
+		zName = ts + 17481
 		break
 	}
 	return zName
@@ -81187,7 +81225,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17472, ts + 17479, ts + 17487, ts + 17491, ts + 17355, ts + 17500,
+	ts + 17491, ts + 17498, ts + 17506, ts + 17510, ts + 17374, ts + 17519,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -81234,13 +81272,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17504
+			zType = ts + 17523
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17506
+			zType = ts + 17525
 		} else {
-			zType = ts + 7521
+			zType = ts + 7529
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17508,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17527,
 			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),
@@ -81248,7 +81286,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17515, ts + 17520, ts + 17528}
+var azEnc = [4]uintptr{uintptr(0), ts + 17534, ts + 17539, ts + 17547}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -81399,6 +81437,7 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp7 int32
 	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
@@ -81495,7 +81534,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17536, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17555, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -81534,7 +81573,7 @@ __8:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 484)) != 0) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 484))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 484))))
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 484)))
 __10:
 	;
@@ -81756,7 +81795,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17540) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17559) == 0) {
 		goto __64
 	}
 	b = 2
@@ -81828,7 +81867,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17331
+	zRet = ts + 17350
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -81866,7 +81905,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17321
+	zRet = ts + 17340
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -82153,7 +82192,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 532)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17545, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17564, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -82172,7 +82211,7 @@ __127:
 	if !(*(*int8)(unsafe.Pointer(zRight)) != 0) {
 		goto __128
 	}
-	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+16, zRight))
+	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+16, zRight))
 	goto __129
 __128:
 	Xsqlite3_temp_directory = uintptr(0)
@@ -82194,7 +82233,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17570, 0)
+		ts+17589, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -82248,7 +82287,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17623) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17642) == 0) {
 		goto __142
 	}
 
@@ -82345,13 +82384,13 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17629
+			return ts + 17648
 		}
-		return ts + 17637
+		return ts + 17656
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
-			Xsqlite3ColumnType(tls, pCol, ts+1547),
+			Xsqlite3ColumnType(tls, pCol, ts+1566),
 			func() int32 {
 				if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf>>0)) != 0 {
 					return 1
@@ -82416,7 +82455,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17644, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17663, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -82429,7 +82468,7 @@ __172:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __173
 	}
-	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1483, 0)
+	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1502, 0)
 	(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 __173:
 	;
@@ -82462,29 +82501,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10484
+	zType = ts + 10503
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12714
+	zType = ts + 12733
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17660
+	zType = ts + 17679
 	goto __183
 __182:
-	zType = ts + 8869
+	zType = ts + 8888
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17667,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17686,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*16)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -82550,7 +82589,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17693, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -82560,7 +82599,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17679,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17698,
 		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))))
@@ -82597,8 +82636,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 540)) = [3]uintptr{ts + 17684, ts + 17686, ts + 16148}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17688,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 540)) = [3]uintptr{ts + 17703, ts + 17705, ts + 16167}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17707,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -82631,7 +82670,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17694,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17713,
 		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)))
@@ -82653,7 +82692,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17698, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17717, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -82717,7 +82756,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7521, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7529, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -82733,7 +82772,7 @@ __218:
 	if !(i6 < int32(uint32(unsafe.Sizeof(aPragmaName))/uint32(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7521, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7529, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -82768,7 +82807,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17720,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -82776,7 +82815,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+17710))
+			ts+17729))
 	goto __227
 __227:
 	j2++
@@ -82965,7 +83004,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17715, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17734, 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)))
@@ -83182,7 +83221,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+17719, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*16)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17738, 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)
@@ -83293,7 +83332,7 @@ __307:
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17743,
+		ts+17762,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
@@ -83392,7 +83431,7 @@ __321:
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17779, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17798, 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) {
@@ -83414,7 +83453,7 @@ __326:
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17799,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17818,
 		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)
@@ -83427,7 +83466,7 @@ __329:
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17821,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17840,
 		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 __332
@@ -83445,11 +83484,11 @@ __331:
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 564)), j4, 3)
 __334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17844, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17863, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17846,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17865,
 		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)
 __333:
@@ -83495,7 +83534,7 @@ __339:
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17866,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17885,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
@@ -83529,89 +83568,103 @@ __344:
 
 	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+17896)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17915)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17901)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17920)
 	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)
 
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __345
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_IdxRowid, *(*int32)(unsafe.Pointer(bp + 568))+j4, 3)
+	jmp7 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 3, 0, r1+int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn)-1)
+
+	Xsqlite3VdbeLoadString(tls, v, 3,
+		ts+17941)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17977)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp7)
+__345:
+	;
 	label6 = 0
 	kk = 0
-__345:
+__346:
 	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) {
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*4)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
 		goto __349
 	}
-	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+	goto __347
 __349:
+	;
+	if !(label6 == 0) {
+		goto __350
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__350:
 	;
 	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:
+	kk++
+	goto __346
+	goto __348
+__348:
 	;
 	if !(label6 != 0) {
-		goto __350
+		goto __351
 	}
 	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
 	Xsqlite3VdbeResolveLabel(tls, v, label6)
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17896)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17915)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17922)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17988)
 	Xsqlite3VdbeGoto(tls, v, jmp5-1)
 	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-__350:
+__351:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __351
+		goto __352
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__352:
+__353:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __354
+		goto __355
 	}
 	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 __355
+		goto __356
 	}
-	goto __353
-__355:
+	goto __354
+__356:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
-	goto __353
-__353:
-	kk++
-	goto __352
 	goto __354
 __354:
+	kk++
+	goto __353
+	goto __355
+__355:
 	;
 	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)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18015)
 	Xsqlite3VdbeGoto(tls, v, jmp5)
 	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
-__351:
+__352:
 	;
 	Xsqlite3VdbeJumpHere(tls, v, jmp4)
 	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 576)))
@@ -83628,20 +83681,20 @@ __340:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 564)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __356
+		goto __357
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17976)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+18042)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__357:
+__358:
 	if !(pIdx5 != 0) {
-		goto __359
-	}
-	if !(pPk1 == pIdx5) {
 		goto __360
 	}
-	goto __358
-__360:
+	if !(pPk1 == pIdx5) {
+		goto __361
+	}
+	goto __359
+__361:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 568))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -83650,21 +83703,21 @@ __360:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __358
-__358:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __357
 	goto __359
 __359:
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
+	goto __358
+	goto __360
+__360:
 	;
 	if !(pPk1 != 0) {
-		goto __361
+		goto __362
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__361:
+__362:
 	;
-__356:
+__357:
 	;
 	goto __291
 __291:
@@ -83682,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 __362
+		goto __363
 	}
 	(*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 + 18005
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*20 + 16)) = ts + 18071
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*20)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*20 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__362:
+__363:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -83697,27 +83750,27 @@ __362:
 
 __45:
 	if !!(zRight != 0) {
-		goto __363
+		goto __364
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __365
-	}
-	goto pragma_out
-__365:
-	;
-	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __364
-__363:
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
 		goto __366
 	}
+	goto pragma_out
+__366:
+	;
+	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
+	goto __365
+__364:
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
+		goto __367
+	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__367:
+__368:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __369
+		goto __370
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __370
+		goto __371
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -83726,25 +83779,25 @@ __367:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __369
-__370:
-	;
-	goto __368
-__368:
-	pEnc += 8
-	goto __367
-	goto __369
-__369:
-	;
-	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __371
-	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18008, libc.VaList(bp+456, zRight))
+	goto __370
 __371:
 	;
-__366:
+	goto __369
+__369:
+	pEnc += 8
+	goto __368
+	goto __370
+__370:
 	;
-__364:
+	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
+		goto __372
+	}
+	Xsqlite3ErrorMsg(tls, pParse, ts+18074, libc.VaList(bp+456, zRight))
+__372:
+	;
+__367:
+	;
+__365:
 	;
 	goto __15
 
@@ -83752,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 __372
+		goto __373
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(setCookie))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __374
+		goto __375
 	}
 	goto __15
-__374:
+__375:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fp1 = iDb
@@ -83768,41 +83821,41 @@ __374:
 	(*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 __375
+		goto __376
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fopcode = U8(OP_Noop)
-__375:
+__376:
 	;
-	goto __373
-__372:
+	goto __374
+__373:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(readCookie))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __376
+		goto __377
 	}
 	goto __15
-__376:
+__377:
 	;
 	(*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)
-__373:
+__374:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__377:
+__378:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __378
+		goto __379
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __377
-__378:
+	goto __378
+__379:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -83817,31 +83870,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __379
-	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17338) == 0) {
 		goto __380
 	}
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17357) == 0) {
+		goto __381
+	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __381
-__380:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18033) == 0) {
-		goto __382
+	goto __382
+__381:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18099) == 0) {
+		goto __383
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __383
-__382:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17491) == 0) {
-		goto __384
+	goto __384
+__383:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17510) == 0) {
+		goto __385
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
+__385:
+	;
 __384:
 	;
-__383:
+__382:
 	;
-__381:
-	;
-__379:
+__380:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -83851,10 +83904,10 @@ __379:
 
 __49:
 	if !(zRight != 0) {
-		goto __385
+		goto __386
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__385:
+__386:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -83874,19 +83927,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __386
+		goto __387
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __388
+		goto __389
 	}
 	goto __15
-__388:
+__389:
 	;
-	goto __387
-__386:
-	opMask = U32(0xfffe)
+	goto __388
 __387:
+	opMask = U32(0xfffe)
+__388:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -83895,86 +83948,86 @@ __387:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__389:
+__390:
 	if !(iDb <= iDbLast) {
-		goto __391
-	}
-	if !(iDb == 1) {
 		goto __392
 	}
-	goto __390
-__392:
+	if !(iDb == 1) {
+		goto __393
+	}
+	goto __391
+__393:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__393:
+__394:
 	if !(k4 != 0) {
-		goto __395
+		goto __396
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __396
+		goto __397
 	}
-	goto __394
-__396:
+	goto __395
+__397:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__397:
+__398:
 	if !(pIdx6 != 0) {
-		goto __399
-	}
-	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 56))&0x80>>7) != 0) {
 		goto __400
 	}
+	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 56))&0x80>>7) != 0) {
+		goto __401
+	}
 	szThreshold = int16(0)
-	goto __399
-__400:
+	goto __400
+__401:
 	;
-	goto __398
-__398:
-	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __397
 	goto __399
 __399:
+	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
+	goto __398
+	goto __400
+__400:
 	;
 	if !(szThreshold != 0) {
-		goto __401
+		goto __402
 	}
 	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))
 
-__401:
+__402:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18041,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18107,
 		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 __402
+		goto __403
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __403
-__402:
-	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+	goto __404
 __403:
+	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+__404:
 	;
-	goto __394
-__394:
-	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __393
 	goto __395
 __395:
+	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
+	goto __394
+	goto __396
+__396:
 	;
-	goto __390
-__390:
-	iDb++
-	goto __389
 	goto __391
 __391:
+	iDb++
+	goto __390
+	goto __392
+__392:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -83982,36 +84035,36 @@ __391:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __404
+		goto __405
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__404:
+__405:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+580) == SQLITE_OK) {
-		goto __405
+		goto __406
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 580)))
-__405:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+588) == SQLITE_OK) {
-		goto __406
+		goto __407
 	}
 	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 __407
+		goto __408
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 588)))
-__407:
+__408:
 	;
-__406:
+__407:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -84020,10 +84073,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+596) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 596)) >= int64(0)) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 596))&int64(0x7fffffff)))
-__408:
+__409:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -84032,10 +84085,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+604) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 604)) >= int64(0)) {
-		goto __409
+		goto __410
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 604)) & int64(0x7fffffff))
-__409:
+__410:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -84043,10 +84096,10 @@ __409:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __410
+		goto __411
 	}
 
-__410:
+__411:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -84098,14 +84151,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{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},
+	{FzName: ts + 18125, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18130, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18136, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18145, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18154, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18162, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18170},
+	{FzName: ts + 18177},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -84157,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]int8{})), 0)
-	Xsqlite3_str_appendall(tls, bp+32, ts+18117)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18183)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -84165,7 +84218,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18132, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18198, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -84178,19 +84231,19 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18205, 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+18145)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18211)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18157)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18223)
 		j++
 	}
-	Xsqlite3_str_append(tls, bp+32, ts+4950, 1)
+	Xsqlite3_str_append(tls, bp+32, ts+4969, 1)
 	Xsqlite3StrAccumFinish(tls, bp+32)
 
 	rc = Xsqlite3_declare_vtab(tls, db, bp+56)
@@ -84206,7 +84259,7 @@ __3:
 			(*PragmaVtab)(unsafe.Pointer(pTab)).FnHidden = U8(j)
 		}
 	} else {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	}
 
 	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
@@ -84354,7 +84407,7 @@ __1:
 		var zText uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*4)))
 
 		if zText != 0 {
-			*(*uintptr)(unsafe.Pointer(pCsr + 16 + uintptr(j)*4)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, zText))
+			*(*uintptr)(unsafe.Pointer(pCsr + 16 + uintptr(j)*4)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, zText))
 			if *(*uintptr)(unsafe.Pointer(pCsr + 16 + uintptr(j)*4)) == uintptr(0) {
 				return SQLITE_NOMEM
 			}
@@ -84370,13 +84423,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+18172)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18238)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18180, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18246, 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+18184, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 16))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18250, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 16))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -84385,7 +84438,7 @@ __3:
 	rc = Xsqlite3_prepare_v2(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+4, uintptr(0))
 	Xsqlite3_free(tls, zSql)
 	if rc != SQLITE_OK {
-		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
+		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
 		return rc
 	}
 	return pragmaVtabNext(tls, pVtabCursor)
@@ -84453,33 +84506,33 @@ 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+18188, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*4)),
+			ts+18254, 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, 137196)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137249)
 	} else {
 		var z uintptr
 		var zObj uintptr
 		if *(*uintptr)(unsafe.Pointer(azObj + 1*4)) != 0 {
 			zObj = *(*uintptr)(unsafe.Pointer(azObj + 1*4))
 		} else {
-			zObj = ts + 5001
+			zObj = ts + 5020
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18216, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18282, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18247, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18313, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137256)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18255,
-	ts + 18262,
-	ts + 18274,
+	ts + 18321,
+	ts + 18328,
+	ts + 18340,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -84539,7 +84592,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+14133)
+				corruptSchema(tls, pData, argv, ts+14152)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+168+8, uint32(0), 0, 0x1)
@@ -84571,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+18285)
+			corruptSchema(tls, pData, argv, ts+18351)
 		} 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+14133)
+				corruptSchema(tls, pData, argv, ts+14152)
 			}
 		}
 	}
@@ -84610,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 + 8869
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8888
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*4)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*4)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*4))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*4)) = ts + 7931
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*4)) = ts + 18298
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*4)) = ts + 7950
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*4)) = ts + 18364
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*4)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 40)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 40)).FiDb = iDb
@@ -84713,7 +84766,7 @@ __10:
 		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11768)
+		ts+11787)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __15:
@@ -84748,7 +84801,7 @@ __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)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18436)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __19:
@@ -84762,7 +84815,7 @@ __20:
 	(*InitData)(unsafe.Pointer(bp + 40)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18394,
+		ts+18460,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -85035,7 +85088,7 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
 	(*Parse)(unsafe.Pointer(pParse)).Fdb = db
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1483, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1502, 0)
 	}
 }
 
@@ -85063,7 +85116,7 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, bp+16, ts+1483, 0)
+	Xsqlite3ErrorMsg(tls, bp+16, ts+1502, 0)
 __1:
 	;
 	if !(prepFlags&U32(SQLITE_PREPARE_PERSISTENT) != 0) {
@@ -85094,7 +85147,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*16)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18428, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18494, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -85124,7 +85177,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18458, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18524, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -85184,7 +85237,7 @@ __21:
 	if !((*Parse)(unsafe.Pointer(bp+16)).FzErrMsg != 0) {
 		goto __22
 	}
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3656, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3675, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 	Xsqlite3DbFree(tls, db, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
 	goto __23
 __22:
@@ -85220,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, 137995)
+		return Xsqlite3MisuseError(tls, 138048)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -85319,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, 138143)
+		return Xsqlite3MisuseError(tls, 138196)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -85637,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 + 10913
-		var zSp2 uintptr = ts + 10913
+		var zSp1 uintptr = ts + 10932
+		var zSp2 uintptr = ts + 10932
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -85646,13 +85699,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18477, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18543, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18507))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18573))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -85827,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+18541, libc.VaList(bp, 0))
+					ts+18607, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -85872,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+18591, libc.VaList(bp+8, zName))
+						ts+18657, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -85883,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)))*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+18655,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18721,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -85927,7 +85980,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6579, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6598, 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.
@@ -86511,16 +86564,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18692
+		z = ts + 18758
 		break
 	case TK_INTERSECT:
-		z = ts + 18702
+		z = ts + 18768
 		break
 	case TK_EXCEPT:
-		z = ts + 18712
+		z = ts + 18778
 		break
 	default:
-		z = ts + 18719
+		z = ts + 18785
 		break
 	}
 	return z
@@ -86530,7 +86583,7 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18725, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18791, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
@@ -86556,11 +86609,11 @@ 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 {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18814, libc.VaList(bp, func() uintptr {
 		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
-			return ts + 18779
+			return ts + 18845
 		}
-		return ts + 1547
+		return ts + 1566
 	}()))
 
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
@@ -86748,8 +86801,8 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 				}
 
 				if iCol < 0 {
-					zType = ts + 1112
-					*(*uintptr)(unsafe.Pointer(bp + 40)) = ts + 16260
+					zType = ts + 1131
+					*(*uintptr)(unsafe.Pointer(bp + 40)) = ts + 16279
 				} 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))
@@ -86888,13 +86941,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16260
+				zCol = ts + 16279
 			} 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+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12073, 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))
@@ -86902,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+18794, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18860, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -86992,7 +87045,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*16)).FzCnName
 				} else {
-					zName = ts + 16260
+					zName = ts + 16279
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -87002,7 +87055,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18794, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18860, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 48)) = U32(0)
@@ -87018,7 +87071,7 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18803, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 48)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18869, 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)
@@ -87101,8 +87154,6 @@ __1:
 		(*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
@@ -87117,12 +87168,15 @@ __1:
 			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
 				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
 			}
+			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)
+			}
 		}
 		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
+				zType = ts + 18877
 			} else {
 				zType = uintptr(0)
 				for j = 1; j < SQLITE_N_STDTYPE; j++ {
@@ -87338,7 +87392,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18815, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18881, 0)
 	return
 __1:
 	;
@@ -87429,7 +87483,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18864, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18930, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -87449,7 +87503,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18906, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18972, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -87486,7 +87540,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18912, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18978, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -87520,11 +87574,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+18927, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18993, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
-			return ts + 1547
+			return ts + 1566
 		}
-		return ts + 18950
+		return ts + 19016
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -87625,8 +87679,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18952, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18967, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19018, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19033, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -87673,7 +87727,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18692, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18758, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -87740,7 +87794,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+18986, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19052, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+48)
 
@@ -87802,7 +87856,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+18986, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19052, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+76)
 
@@ -87955,10 +88009,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+19007, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19073, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19053,
+			ts+19119,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -88212,8 +88266,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+7227)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7227)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7235)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7235)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -88240,13 +88294,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+19135, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19201, 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+19146, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19212, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -88258,7 +88312,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+19151, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19217, 0)
 	Xsqlite3Select(tls, pParse, p, bp+36)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -88445,7 +88499,8 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 				Xsqlite3VectorErrorMsg(tls, (*SubstContext)(unsafe.Pointer(pSubst)).FpParse, pCopy)
 			} else {
 				var db uintptr = (*Parse)(unsafe.Pointer((*SubstContext)(unsafe.Pointer(pSubst)).FpParse)).Fdb
-				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 && int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN {
+				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 &&
+					(int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN || (*Expr)(unsafe.Pointer(pCopy)).FiTable != (*SubstContext)(unsafe.Pointer(pSubst)).FiNewTable) {
 					libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Expr{})))
 					(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_IF_NULL_ROW)
 					(*Expr)(unsafe.Pointer(bp)).FpLeft = pCopy
@@ -88485,7 +88540,7 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 								if pColl != 0 {
 									return (*CollSeq)(unsafe.Pointer(pColl)).FzName
 								}
-								return ts + 1092
+								return ts + 1111
 							}())
 					}
 
@@ -89273,12 +89328,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15157) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15176) == 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+15161) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15180) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -89344,7 +89399,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+19157, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19223, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -89427,7 +89482,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+19175, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19241, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -89556,7 +89611,7 @@ 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+19198, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 60))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19264, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 60))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+36+4, uint32(1), 8, 0x100)
@@ -89579,7 +89634,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+19218, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19284, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -89595,7 +89650,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19261
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19327
 		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 {
@@ -89621,7 +89676,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+19284,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19350,
 					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
@@ -89632,9 +89687,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 + 19322
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19388
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19356
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19422
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -89681,7 +89736,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+19394, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19460, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -89793,7 +89848,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19398,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19464,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -89812,7 +89867,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+19437,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19503,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 44)), 0)
@@ -89820,7 +89875,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+14726,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14745,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -89921,7 +89976,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 						} else {
-							zSchemaName = ts + 6439
+							zSchemaName = ts + 6458
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -89936,7 +89991,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+19468, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19534, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(1), 7, 0x80)
 							}
@@ -90001,7 +90056,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+19473,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19539,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -90013,7 +90068,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+12054, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12073, 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)
@@ -90032,9 +90087,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19482, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19548, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19500, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19566, 0)
 					}
 				}
 			}
@@ -90044,7 +90099,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+19520, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19586, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -90182,7 +90237,7 @@ func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect ui
 	(*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)
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSelect)).FpGroupBy)).FnExpr)
 		} 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)
 		}
@@ -90266,13 +90321,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 20)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 20)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19551, 0)
+					ts+19617, 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+19602, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19668, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -90461,19 +90516,19 @@ 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+19635,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19701,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19647
+						return ts + 19713
 					}
-					return ts + 1547
+					return ts + 1566
 				}(),
 				func() uintptr {
 					if bCover != 0 {
 						return (*Index)(unsafe.Pointer(pIdx)).FzName
 					}
-					return ts + 1547
+					return ts + 1566
 				}()))
 	}
 }
@@ -90486,7 +90541,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+7931)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7950)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -90793,7 +90848,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19670,
+		ts+19736,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -90854,7 +90909,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19724,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19790,
 		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:
@@ -90958,7 +91013,7 @@ __27:
 	if !((*SrcItem)(unsafe.Pointer(pItem1)).FcolUsed == uint64(0) && (*SrcItem)(unsafe.Pointer(pItem1)).FzName != uintptr(0)) {
 		goto __30
 	}
-	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1547, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
+	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1566, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
 __30:
 	;
 	pSub1 = (*SrcItem)(unsafe.Pointer(pItem1)).FpSelect
@@ -90996,7 +91051,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+19764, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19830, 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)
@@ -91055,7 +91110,7 @@ __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+88, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19779, libc.VaList(bp+40, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19845, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+88)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
@@ -91526,9 +91581,9 @@ __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 + 19795
+				return ts + 19861
 			}
-			return ts + 19804
+			return ts + 19870
 		}())
 
 	groupBySort = 1
@@ -91879,7 +91934,7 @@ __65:
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+116)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
 		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19795)
+	explainTempTable(tls, pParse, ts+19861)
 __146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
@@ -91961,7 +92016,7 @@ __7:
 	if !(i < nCol) {
 		goto __9
 	}
-	z = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*4))))
+	z = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*4))))
 	if !(z == uintptr(0)) {
 		goto __10
 	}
@@ -91983,7 +92038,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19813, 0)
+		ts+19879, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -92079,7 +92134,7 @@ func Xsqlite3_get_table(tls *libc.TLS, db uintptr, zSql uintptr, pazResult uintp
 		if (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
 			if pzErrMsg != 0 {
 				Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(pzErrMsg)))
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
 			}
 			Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg)
 		}
@@ -92216,7 +92271,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+19878, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19944, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -92260,7 +92315,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+36, pParse, iDb, ts+19924, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+36, pParse, iDb, ts+19990, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+36, pTableName) != 0) {
 		goto __9
 	}
@@ -92278,7 +92333,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19932, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19998, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -92290,7 +92345,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19924, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19990, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -92305,11 +92360,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19973, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20039, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
+
 __17:
 	;
 	goto trigger_cleanup
@@ -92317,22 +92373,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6393, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19999, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20065, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20037,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20103,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20074
+				return ts + 20140
 			}
-			return ts + 20081
+			return ts + 20147
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -92341,7 +92397,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20087, libc.VaList(bp+24, pTableName+8))
+		ts+20153, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -92370,9 +92426,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -92490,7 +92546,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+64, pParse, iDb, ts+19924, bp+56)
+	Xsqlite3FixInit(tls, bp+64, pParse, iDb, ts+19990, 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
@@ -92523,7 +92579,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20133,
+		ts+20199,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -92548,13 +92604,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20181,
+		ts+20247,
 		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+20256, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20322, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -92810,7 +92866,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20285, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20351, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -92849,9 +92905,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 + 6382
+				return ts + 6401
 			}
-			return ts + 5876
+			return ts + 5895
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -92863,7 +92919,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20305,
+			ts+20371,
 			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)
@@ -92977,12 +93033,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20367,
+		ts+20433,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20415
+				return ts + 20481
 			}
-			return ts + 20422
+			return ts + 20488
 		}()))
 __15:
 	;
@@ -93096,7 +93152,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+20429, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20495, 0)
 	return 1
 }
 
@@ -93162,7 +93218,7 @@ func codeReturningTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab
 	}
 	Xsqlite3ExprListDelete(tls, db, (*Select)(unsafe.Pointer(bp)).FpEList)
 	pNew = sqlite3ExpandReturning(tls, pParse, (*Returning)(unsafe.Pointer(pReturning)).FpReturnEL, pTab)
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0) {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
 		libc.Xmemset(tls, bp+152, 0, uint32(unsafe.Sizeof(NameContext{})))
 		if (*Returning)(unsafe.Pointer(pReturning)).FnRetCol == 0 {
 			(*Returning)(unsafe.Pointer(pReturning)).FnRetCol = (*ExprList)(unsafe.Pointer(pNew)).FnExpr
@@ -93216,7 +93272,7 @@ func codeTriggerProgram(tls *libc.TLS, pParse uintptr, pStepList uintptr, orconf
 
 		if (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan != 0 {
 			Xsqlite3VdbeAddOp4(tls, v, OP_Trace, 0x7fffffff, 1, 0,
-				Xsqlite3MPrintf(tls, db, ts+6073, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
+				Xsqlite3MPrintf(tls, db, ts+6092, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
 				-6)
 		}
 
@@ -93326,7 +93382,7 @@ 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+20471, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20537, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
@@ -93919,7 +93975,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20485,
+		ts+20551,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*16)).FzCnName))
 	goto update_cleanup
 __27:
@@ -93951,7 +94007,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20521, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*20)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20587, 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:
@@ -93961,7 +94017,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7706
+				return ts + 7725
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*16)).FzCnName
 		}(),
@@ -94277,7 +94333,12 @@ __74:
 	goto __77
 __76:
 	flags = WHERE_ONEPASS_DESIRED
-	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) && !(pTrigger != 0) && !(hasFK != 0) && !(chngKey != 0) && !(*(*int32)(unsafe.Pointer(bp + 68)) != 0)) {
+	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) &&
+		!(pTrigger != 0) &&
+		!(hasFK != 0) &&
+		!(chngKey != 0) &&
+		!(*(*int32)(unsafe.Pointer(bp + 68)) != 0) &&
+		(*NameContext)(unsafe.Pointer(bp+28)).FncFlags&NC_Subquery == 0) {
 		goto __78
 	}
 	flags = flags | WHERE_ONEPASS_MULTIROW
@@ -94831,7 +94892,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20540)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20606)
 __169:
 	;
 update_cleanup:
@@ -95137,10 +95198,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+20553, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+152, ts+20619, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20557, libc.VaList(bp+8, bp+152))
+				ts+20623, libc.VaList(bp+8, bp+152))
 			return SQLITE_ERROR
 		}
 
@@ -95231,7 +95292,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+12143, -1)
+				ts+12162, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -95263,7 +95324,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+20630, uint32(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20634, uint32(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20696, uint32(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20700, uint32(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -95411,14 +95472,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+20638)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20704)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20678)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20744)
 	return SQLITE_ERROR
 __2:
 	;
@@ -95429,7 +95490,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20721)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20787)
 	return SQLITE_ERROR
 __5:
 	;
@@ -95438,7 +95499,7 @@ __5:
 	*(*uint32)(unsafe.Pointer(db + 56)) |= uint32(SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE)
 	goto __4
 __3:
-	zOut = ts + 1547
+	zOut = ts + 1566
 __4:
 	;
 	saved_flags = (*Sqlite3)(unsafe.Pointer(db)).Fflags
@@ -95457,7 +95518,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20739, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20805, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -95477,7 +95538,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20762)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20828)
 	goto end_of_vacuum
 __8:
 	;
@@ -95492,7 +95553,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14496)
+	rc = execSql(tls, db, pzErrMsg, ts+14515)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -95537,7 +95598,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20789,
+		ts+20855,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -95546,7 +95607,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20897,
+		ts+20963,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -95557,7 +95618,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20951,
+		ts+21017,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 24)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -95568,7 +95629,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21102,
+		ts+21168,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -95913,7 +95974,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+12370, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12389, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 44 + 4)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -95997,11 +96058,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+21232, libc.VaList(bp, pParse+196))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21298, libc.VaList(bp, pParse+196))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21256,
+			ts+21322,
 			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,
@@ -96011,7 +96072,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21355, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21421, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -96072,7 +96133,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+21374, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21440, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -96100,9 +96161,11 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FbDeclared = 0
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = bp + 32
+	(*Table)(unsafe.Pointer(pTab)).FnTabRef++
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{xConstruct})).f(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, pVTable+8, bp+48)
+	Xsqlite3DeleteTable(tls, db, pTab)
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = (*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -96110,9 +96173,9 @@ 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+21416, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21482, libc.VaList(bp+8, zModuleName))
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3656, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 48))))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3675, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 48))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
 		}
 		Xsqlite3DbFree(tls, db, pVTable)
@@ -96122,7 +96185,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 + 21446
+			var zFormat uintptr = ts + 21512
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -96134,12 +96197,12 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 			*(*uintptr)(unsafe.Pointer(pTab + 44 + 8)) = pVTable
 
 			for iCol = 0; iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol); iCol++ {
-				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16, ts+1547)
+				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16, ts+1566)
 				var nType int32
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16151, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16170, 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
@@ -96196,13 +96259,13 @@ 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+21492, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21558, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxConnect, bp+16)
 		if rc != SQLITE_OK {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 		}
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 16)))
@@ -96254,7 +96317,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+21492, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21558, 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)
@@ -96288,7 +96351,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, 151030)
+		return Xsqlite3MisuseError(tls, 151102)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -96330,7 +96393,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR,
 			func() uintptr {
 				if (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
-					return ts + 3656
+					return ts + 3675
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg))
@@ -96698,7 +96761,7 @@ func Xsqlite3VtabEponymousTableInit(tls *libc.TLS, pParse uintptr, pMod uintptr)
 	addModuleArgument(tls, pParse, pTab, Xsqlite3DbStrDup(tls, db, (*Table)(unsafe.Pointer(pTab)).FzName))
 	rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer(pModule)).FxConnect, bp+8)
 	if rc != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+		Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		Xsqlite3VtabEponymousTableClear(tls, db, pMod)
 	}
@@ -96741,7 +96804,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, 151521)
+		rc = Xsqlite3MisuseError(tls, 151593)
 	} else {
 		ap = va
 		switch op {
@@ -96768,7 +96831,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 151539)
+				rc = Xsqlite3MisuseError(tls, 151611)
 				break
 
 			}
@@ -96994,10 +97057,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 + 21511
+		return ts + 21577
 	}
 	if i == -1 {
-		return ts + 16260
+		return ts + 16279
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*16)).FzCnName
 }
@@ -97006,35 +97069,35 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21518, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21584, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21524, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21590, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12760, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12779, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4950, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4969, 1)
 	}
 
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21524, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21590, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12760, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12779, 1)
 		}
-		Xsqlite3_str_append(tls, pStr, ts+5001, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5020, 1)
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4950, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4969, 1)
 	}
 }
 
@@ -97051,29 +97114,29 @@ 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+21526, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21592, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21518, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21584, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21529
+				return ts + 21595
 			}
-			return ts + 21534
+			return ts + 21600
 		}(), 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+21542)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21608)
 		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+21544)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21610)
 	}
-	Xsqlite3_str_append(tls, pStr, ts+4950, 1)
+	Xsqlite3_str_append(tls, pStr, ts+4969, 1)
 }
 
 // This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
@@ -97114,11 +97177,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+21546, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21612, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21552
+				return ts + 21618
 			}
-			return ts + 21559
+			return ts + 21625
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -97128,43 +97191,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 + 10969
+					zFmt = ts + 10988
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21564
+				zFmt = ts + 21630
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21597
+				zFmt = ts + 21663
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21622
+				zFmt = ts + 21688
 			} else {
-				zFmt = ts + 21640
+				zFmt = ts + 21706
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21649, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21715, 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 + 16260
-			Xsqlite3_str_appendf(tls, bp+64, ts+21657, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16279
+			Xsqlite3_str_appendf(tls, bp+64, ts+21723, 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+21688, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21754, 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+21698, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21764, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21703,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21769,
 				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+21730, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21796, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -97196,25 +97259,25 @@ 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+21741, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21807, 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+21529, 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+21595, 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+21762, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21828, 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+21518, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21584, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21529, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21595, libc.VaList(bp+16, z))
 		}
 	}
-	Xsqlite3_str_append(tls, bp+24, ts+4950, 1)
+	Xsqlite3_str_append(tls, bp+24, ts+4969, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
@@ -98808,7 +98871,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21770, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21836, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -98836,7 +98899,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21785, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21851, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -99354,7 +99417,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+21794, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21860, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -99712,10 +99775,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{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)},
+	{FzOp: ts + 16128, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15459, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14979, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21874, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -100205,12 +100268,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21815, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21881, 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+21815, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21881, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -100289,7 +100352,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 + 6762
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7711
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -100383,7 +100446,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
-				return ts + 21856
+				return ts + 21922
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -100759,7 +100822,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21863,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21929,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -100775,7 +100838,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 		pRhs = Xsqlite3PExpr(tls, pParse, TK_UPLUS,
 			Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*ExprList_item)(unsafe.Pointer(pArgs+8+uintptr(j)*20)).FpExpr, 0), uintptr(0))
 		pTerm = Xsqlite3PExpr(tls, pParse, TK_EQ, pColRef, pRhs)
-		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ|JT_RIGHT) != 0 {
 			joinType = U32(EP_OuterON)
 		} else {
 			joinType = U32(EP_InnerON)
@@ -101492,7 +101555,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21899, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21965, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*16)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -101563,7 +101626,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21925
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21991
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -101737,6 +101800,10 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	var iCur int32
+	var saved_pIdxEpr uintptr
+
+	saved_pIdxEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 
 	addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	for __ccgo := true; __ccgo; __ccgo = iLevel < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel) {
@@ -101780,9 +101847,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, n)
 			var jj int32
 			for jj = 0; jj < n; jj++ {
-				var iCol int32 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(jj)*2)))
-
-				Xsqlite3ExprCodeGetColumnOfTable(tls, v, (*Index)(unsafe.Pointer(pIdx)).FpTable, iCur, iCol, r1+jj)
+				Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pIdx, iCur, jj, r1+jj)
 			}
 			Xsqlite3VdbeAddOp4Int(tls, v, OP_FilterAdd, (*WhereLevel)(unsafe.Pointer(pLevel)).FregFilter, 0, r1, n)
 			Xsqlite3ReleaseTempRange(tls, pParse, r1, n)
@@ -101816,6 +101881,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 		}
 	}
 	Xsqlite3VdbeJumpHere(tls, v, addrOnce)
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = saved_pIdxEpr
 }
 
 func allocateIndexInfo(tls *libc.TLS, pWInfo uintptr, pWC uintptr, mUnusable Bitmask, pSrc uintptr, pmNoOmit uintptr) uintptr {
@@ -101929,7 +101995,7 @@ __3:
 		uint32(unsafe.Sizeof(sqlite3_index_orderby{}))*uint32(nOrderBy)+uint32(unsafe.Sizeof(HiddenIndexInfo1{}))+
 		uint32(unsafe.Sizeof(uintptr(0)))*uint32(nTerm)))
 	if pIdxInfo == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1483, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1502, 0)
 		return uintptr(0)
 	}
 	pHidden = pIdxInfo + 1*64
@@ -102051,9 +102117,9 @@ func vtabBestIndex(tls *libc.TLS, pParse uintptr, pTab uintptr, p uintptr) int32
 		if rc == SQLITE_NOMEM {
 			Xsqlite3OomFault(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb)
 		} else if !(int32((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
 		}
 	}
 	Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg)
@@ -102074,11 +102140,16 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 
 	_ = pParse
 
+	if !((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol)
+	} else {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnColumn)
+	}
 	nField = func() int32 {
-		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < (*Index)(unsafe.Pointer(pIdx)).FnSample {
+		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < nField {
 			return int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField)
 		}
-		return (*Index)(unsafe.Pointer(pIdx)).FnSample
+		return nField
 	}()
 	iCol = 0
 	iSample = (*Index)(unsafe.Pointer(pIdx)).FnSample * nField
@@ -103658,7 +103729,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+21936, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+22002, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -103716,7 +103787,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+21936, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+22002, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -104114,7 +104185,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+21962, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+22028, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -104721,7 +104792,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21997, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22063, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -104756,6 +104827,10 @@ __3:
 			if int32((*WherePath)(unsafe.Pointer(pFrom)).FisOrdered) == (*ExprList)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpOrderBy)).FnExpr {
 				(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_ORDERED)
 			}
+			if (*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy != 0 &&
+				int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) > (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr {
+				(*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat = I8((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr)
+			}
 		} else {
 			(*WhereInfo)(unsafe.Pointer(pWInfo)).FrevMask = (*WherePath)(unsafe.Pointer(pFrom)).FrevLoop
 			if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) <= 0 {
@@ -105050,6 +105125,9 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
+		if Xsqlite3IndexAffinityStr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pIdx) != 0 {
+			(*IndexedExpr)(unsafe.Pointer(p)).Faff = U8(*(*int8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FzColAff + uintptr(i))))
+		}
 		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
@@ -105202,7 +105280,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22015, libc.VaList(bp, int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22081, libc.VaList(bp, int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))))
 	return uintptr(0)
 __2:
 	;
@@ -105266,7 +105344,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22043, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22109, 0)
 	goto __5
 __4:
 	ii = 0
@@ -106148,7 +106226,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22061, -1)
+		pCtx, ts+22127, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -106281,7 +106359,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+22117, -1)
+					pCtx, ts+22183, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -106370,17 +106448,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-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))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22228))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22239))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22250))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22255))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22268))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22278))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22284))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22295))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22305))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22317))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22322))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -106426,7 +106504,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22260, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22326, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -106470,12 +106548,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+22279, 0)
+			ts+22345, 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+22350, 0)
+				ts+22416, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -106498,7 +106576,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+7931)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7950)
 					}
 					break
 				}
@@ -106701,7 +106779,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+22413, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22479, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -106817,7 +106895,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+7523))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7531))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -106932,7 +107010,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22439, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22505, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -106997,15 +107075,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 + 22471
+				zErr = ts + 22537
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22488
+				zErr = ts + 22554
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22504
+				zErr = ts + 22570
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22524, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22590, 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 {
@@ -107026,7 +107104,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+22557, 0)
+				ts+22623, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -107164,7 +107242,7 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regZero)
 	if eCond >= WINDOW_STARTING_NUM {
 		var regString int32 = Xsqlite3GetTempReg(tls, pParse)
-		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1547, -1)
+		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1566, -1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, Xsqlite3VdbeCurrentAddr(tls, v)+2, reg)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL))
 
@@ -107182,11 +107260,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22604,
-	ts + 22657,
-	ts + 22061,
-	ts + 22708,
-	ts + 22760,
+	ts + 22670,
+	ts + 22723,
+	ts + 22127,
+	ts + 22774,
+	ts + 22826,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -107676,7 +107754,7 @@ func windowCodeRangeTest(tls *libc.TLS, p uintptr, op int32, csr1 int32, regVal
 
 	}
 
-	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1547, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1566, -1)
 	addrGe = Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, 0, reg1)
 
 	if op == OP_Ge && arith == OP_Add || op == OP_Le && arith == OP_Subtract {
@@ -108578,19 +108656,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+22810,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22876,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 22852
+							return ts + 22918
 						}
-						return ts + 22861
+						return ts + 22927
 					}(),
 						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+22867, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22933, 0)
 		}
 	}
 
@@ -108661,7 +108739,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+22901,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22967,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -109756,7 +109834,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22939, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23005, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -110731,21 +110809,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+16260, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16279, 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+22961, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23027, 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+16173, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16192, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22961, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23027, 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))
@@ -111488,7 +111566,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+22988)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*12 + 4)), ts+23054)
 				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 {
@@ -111652,7 +111730,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+22997, libc.VaList(bp+32, bp+92))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23063, 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))
@@ -111869,9 +111947,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 + 6757
+							return ts + 7706
 						}
-						return ts + 6762
+						return ts + 7711
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)))
@@ -112155,19 +112233,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+23021, 0)
+					ts+23087, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23116, 0)
+					ts+23182, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23200, 0)
+					ts+23266, 0)
 			}
 			break
 		case uint32(273):
@@ -112546,9 +112624,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+22997, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23063, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23285, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23351, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -113316,7 +113394,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+23302, libc.VaList(bp, bp+1248))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23368, libc.VaList(bp, bp+1248))
 				break
 			}
 		}
@@ -113337,9 +113415,9 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 	}
 	if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg != 0 || (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_OK && (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_DONE {
 		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)))
+			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3675, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23327, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23393, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -113512,7 +113590,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23338, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23404, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -113525,11 +113603,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19924, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19990, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23411, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23350, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23416, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -113542,9 +113620,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23360, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23426, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23364, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23430, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -113614,7 +113692,8 @@ func sqlite3TestExtInit(tls *libc.TLS, db uintptr) int32 {
 	return Xsqlite3FaultSim(tls, 500)
 }
 
-var sqlite3BuiltinExtensions = [4]uintptr{
+var sqlite3BuiltinExtensions = [5]uintptr{
+	0,
 	0,
 	0,
 	0,
@@ -113778,7 +113857,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 174337)
+		return Xsqlite3MisuseError(tls, 174426)
 	}
 
 	ap = va
@@ -114353,7 +114432,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175111)
+		return Xsqlite3MisuseError(tls, 175200)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -114368,7 +114447,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23372, 0)
+			ts+23438, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -114559,23 +114638,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 + 23440
+	var zErr uintptr = ts + 23506
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23454
+			zErr = ts + 23520
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23476
+			zErr = ts + 23542
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23498
+			zErr = ts + 23564
 			break
 
 		}
@@ -114593,35 +114672,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23521,
-	ts + 23534,
+	ts + 23587,
+	ts + 23600,
 	uintptr(0),
-	ts + 23550,
-	ts + 23575,
-	ts + 23589,
-	ts + 23608,
-	ts + 1483,
-	ts + 23633,
-	ts + 23670,
-	ts + 23682,
-	ts + 23697,
-	ts + 23730,
+	ts + 23616,
+	ts + 23641,
+	ts + 23655,
+	ts + 23674,
+	ts + 1502,
+	ts + 23699,
+	ts + 23736,
 	ts + 23748,
-	ts + 23773,
-	ts + 23802,
+	ts + 23763,
+	ts + 23796,
+	ts + 23814,
+	ts + 23839,
+	ts + 23868,
 	uintptr(0),
-	ts + 5831,
-	ts + 5327,
-	ts + 23819,
-	ts + 23837,
-	ts + 23855,
+	ts + 5850,
+	ts + 5346,
+	ts + 23885,
+	ts + 23903,
+	ts + 23921,
 	uintptr(0),
-	ts + 23889,
+	ts + 23955,
 	uintptr(0),
-	ts + 23910,
-	ts + 23936,
-	ts + 23959,
-	ts + 23980,
+	ts + 23976,
+	ts + 24002,
+	ts + 24025,
+	ts + 24046,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -114742,7 +114821,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, 175758)
+		return Xsqlite3MisuseError(tls, 175847)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -114787,7 +114866,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+23996, 0)
+				ts+24062, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -114904,7 +114983,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+24059, libc.VaList(bp, zName))
+		ts+24125, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -114932,7 +115011,7 @@ func Xsqlite3_overload_function(tls *libc.TLS, db uintptr, zName uintptr, nArg i
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, zName))
+	zCopy = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, zName))
 	if zCopy == uintptr(0) {
 		return SQLITE_NOMEM
 	}
@@ -115140,7 +115219,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+24110, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24176, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -115233,7 +115312,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, 176503))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176592))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -115303,7 +115382,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, 176582)
+		return Xsqlite3MisuseError(tls, 176671)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115313,7 +115392,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, 176591)
+		return Xsqlite3MisuseError(tls, 176680)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115345,14 +115424,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, 176639)
+		return Xsqlite3MisuseError(tls, 176728)
 	}
 
 	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+24131, 0)
+				ts+24197, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -115482,7 +115561,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+24199, uint32(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24265, uint32(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -115527,10 +115606,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24205, zUri+7, uint32(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24271, zUri+7, uint32(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24215,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24281,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -115635,7 +115714,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24243, zOpt, uint32(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24309, zOpt, uint32(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -115646,17 +115725,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24247, zOpt, uint32(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24313, zOpt, uint32(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24247
+	zModeType = ts + 24313
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24253, zOpt, uint32(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24319, zOpt, uint32(4)) == 0) {
 		goto __32
 	}
 
@@ -115664,7 +115743,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 3265
+	zModeType = ts + 3284
 __32:
 	;
 	if !(aMode != 0) {
@@ -115694,7 +115773,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24258, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24324, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -115702,7 +115781,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24278,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24344,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -115742,7 +115821,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24302, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24368, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -115765,15 +115844,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24318, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24325, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24384, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24391, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{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},
+	{Fz: ts + 24399, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24402, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24405, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17374, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -115919,10 +115998,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+21856, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21922, 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+24343, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24409, 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) {
@@ -115936,7 +116015,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 177308)
+	rc = Xsqlite3MisuseError(tls, 177397)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+12, bp+16)
@@ -115953,7 +116032,7 @@ __19:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
-			return ts + 3656
+			return ts + 3675
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 16))))
@@ -115987,9 +116066,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 + 6434
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6453
 	(*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 + 23345
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).FzDbSName = ts + 23411
 	(*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)
@@ -116094,7 +116173,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24349
+		zFilename = ts + 24415
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -116197,21 +116276,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+24352,
+	Xsqlite3_log(tls, iErr, ts+24418,
 		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+24377)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24443)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24397)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24463)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24404)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24470)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -116322,7 +116401,7 @@ __4:
 	autoinc = libc.Bool32(int32((*Table)(unsafe.Pointer(pTab)).FiPKey) == iCol && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != U32(0))
 	goto __13
 __12:
-	zDataType = ts + 1112
+	zDataType = ts + 1131
 	primarykey = 1
 __13:
 	;
@@ -116369,14 +116448,14 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24421, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24487, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3656
+			return ts + 3675
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -117025,7 +117104,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24449, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24515, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -117143,7 +117222,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 + 24457
+			return ts + 24523
 		}
 		return uintptr(0)
 	}(), 0)
@@ -117320,7 +117399,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6174, ts + 6757, ts + 6762, ts + 6184, ts + 6179, ts + 7998, ts + 24480, ts + 24486,
+	ts + 6193, ts + 7706, ts + 7711, ts + 6203, ts + 6198, ts + 8017, ts + 24546, ts + 24552,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -117473,7 +117552,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 + 24493 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 24559 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -117499,7 +117578,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	switch Xsqlite3_value_type(tls, pValue) {
 	case SQLITE_NULL:
 		{
-			jsonAppendRaw(tls, p, ts+6174, uint32(4))
+			jsonAppendRaw(tls, p, ts+6193, uint32(4))
 			break
 
 		}
@@ -117528,7 +117607,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+24510, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24576, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -117586,19 +117665,19 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 	switch int32((*JsonNode)(unsafe.Pointer(pNode)).FeType) {
 	default:
 		{
-			jsonAppendRaw(tls, pOut, ts+6174, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6193, uint32(4))
 			break
 
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6757, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+7706, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6762, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+7711, uint32(5))
 			break
 
 		}
@@ -118143,17 +118222,17 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		}
 		return int32(j + U32(1))
 	} else if int32(c) == 'n' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6174, uint32(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6193, uint32(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		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+6757, uint32(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7706, 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+6762, uint32(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7711, 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))
@@ -118254,7 +118333,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+24539, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24605, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -118560,7 +118639,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+24554, uint32(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24620, uint32(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -118575,7 +118654,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24558, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24624, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -118629,7 +118708,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+24584,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24650,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -118734,11 +118813,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+24627, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24693, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
-					jsonAppendRaw(tls, bp, ts+4991, uint32(2))
+					jsonAppendRaw(tls, bp, ts+5010, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24630, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24696, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -118779,7 +118858,7 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if pNode != 0 {
 				jsonRenderNode(tls, pNode, bp, uintptr(0))
 			} else {
-				jsonAppendRaw(tls, bp, ts+6174, uint32(4))
+				jsonAppendRaw(tls, bp, ts+6193, uint32(4))
 			}
 		}
 		if i == argc {
@@ -118895,14 +118974,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24633, -1)
+			ts+24699, -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+24684, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24750, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -118997,7 +119076,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15373)
+	jsonWrongNumArgs(tls, ctx, ts+15392)
 	return
 __2:
 	;
@@ -119072,9 +119151,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24718
+			return ts + 24784
 		}
-		return ts + 24722
+		return ts + 24788
 	}())
 	return
 __2:
@@ -119207,7 +119286,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24729, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24795, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119304,7 +119383,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24732, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24798, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119348,7 +119427,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24735)
+		ts+24801)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -119479,7 +119558,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24818, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24884, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -119498,7 +119577,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+24824, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24890, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 12
@@ -119594,7 +119673,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+24824, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24890, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -119618,7 +119697,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 + 24829
+				zRoot = ts + 24895
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -119740,7 +119819,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+24539, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24605, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -119835,25 +119914,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{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 + 24897},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24902},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24913},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24913},
 	{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}}
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_JSON), FxSFunc: 0, FzName: ts + 24944},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_SQL), FxSFunc: 0, FzName: ts + 24947},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24951},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24963},
+	{FnArg: int8(2), 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_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24986},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24997},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25009},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_ISSET), FxSFunc: 0, FzName: ts + 25022},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25031},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25031},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25041},
+	{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 + 25052},
+	{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 + 25069}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -119872,8 +119951,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 25021, FpModule: 0},
-	{FzName: ts + 25031, FpModule: 0},
+	{FzName: ts + 25087, FpModule: 0},
+	{FzName: ts + 25097, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -120126,11 +120205,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+25041, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25107, 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+25049, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25115, iNode, 0,
 			pRtree+72)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -120341,7 +120420,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+25054,
+		ts+25120,
 		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))
@@ -121044,7 +121123,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25136)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25202)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -121256,7 +121335,7 @@ func rtreeBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 2
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FneedToFreeIdxStr = 1
-	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+24, Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, bp+8))) {
+	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+24, Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, bp+8))) {
 		return SQLITE_NOMEM
 	}
 
@@ -122385,7 +122464,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25150, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25216, 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 {
@@ -122397,12 +122476,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+25170, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25236, 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+25202, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25268, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -122628,7 +122707,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+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))
+		ts+25305, 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))
@@ -122651,14 +122730,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(20)
 	defer tls.Free(20)
 
-	var zFmt uintptr = ts + 25384
+	var zFmt uintptr = ts + 25450
 	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+11341, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11360, 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 {
@@ -122699,7 +122778,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25440, ts + 5053, ts + 16260,
+	ts + 25506, ts + 5072, ts + 16279,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -122742,19 +122821,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+25445,
+			ts+25511,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25507, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25573, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25512,
+			ts+25578,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25576,
+			ts+25642,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25646,
+			ts+25712,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -122783,7 +122862,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 + 25695
+			zFormat = ts + 25761
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -122795,7 +122874,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+25803,
+			ts+25869,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -122803,18 +122882,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+25848, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25914, 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+12760, 1)
+					Xsqlite3_str_append(tls, p, ts+12779, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25875, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25941, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25897, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25963, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25905, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25971, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -122829,14 +122908,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25921,
-	ts + 25974,
-	ts + 26019,
-	ts + 26071,
-	ts + 26125,
-	ts + 26170,
-	ts + 26228,
-	ts + 26283,
+	ts + 25987,
+	ts + 26040,
+	ts + 26085,
+	ts + 26137,
+	ts + 26191,
+	ts + 26236,
+	ts + 26294,
+	ts + 26349,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -122865,7 +122944,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+26330, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26396, 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
@@ -122873,19 +122952,19 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 				(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = 4 + int32((*Rtree)(unsafe.Pointer(pRtree)).FnBytesPerCell)*RTREE_MAXCELLS
 			}
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26350,
+			ts+26416,
 			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 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26407,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26473,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -122927,16 +123006,16 @@ 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 + 26442,
-		ts + 26485,
-		ts + 26520,
-		ts + 26556,
+		ts + 26508,
+		ts + 26551,
+		ts + 26586,
+		ts + 26622,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
 		goto __1
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*4))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*4))))
 	return SQLITE_ERROR
 __1:
 	;
@@ -122961,7 +123040,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+26593,
+	Xsqlite3_str_appendf(tls, pSql, ts+26659,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4))), *(*uintptr)(unsafe.Pointer(argv + 3*4))))
 	ii = 4
 __3:
@@ -122973,7 +123052,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26617, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26683, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -122996,7 +123075,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26623, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26689, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -123007,14 +123086,14 @@ __10:
 	if !(ii < argc) {
 		goto __12
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*4))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*4))))
 	rc = SQLITE_ERROR
 	goto __13
 __12:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __14
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
 __14:
 	;
 __13:
@@ -123057,7 +123136,7 @@ __17:
 	if !(iErr != 0) {
 		goto __22
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*4))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*4))))
 	goto rtreeInit_fail
 __22:
 	;
@@ -123074,7 +123153,7 @@ __23:
 	if !(rc != 0) {
 		goto __24
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
 	goto rtreeInit_fail
 __24:
 	;
@@ -123092,7 +123171,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26626, ts + 26637}
+var azFormat = [2]uintptr{ts + 26692, ts + 26703}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(592)
@@ -123130,13 +123209,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+10913, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10932, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26647, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+544)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26713, 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+26653, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 544 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26719, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 544 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26657, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26723, 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})))
@@ -123147,7 +123226,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+26659, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26725, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -123223,12 +123302,12 @@ 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+26692,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26758,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
-						return ts + 4055
+						return ts + 4074
 					}
-					return ts + 1547
+					return ts + 1566
 				}(), z))
 			if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport == uintptr(0) {
 				(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
@@ -123247,7 +123326,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+26699,
+			ts+26765,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -123266,7 +123345,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+26744, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26810, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -123280,8 +123359,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 + 26776,
-		ts + 26830,
+		ts + 26842,
+		ts + 26896,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 24 + uintptr(bLeaf)*4)) == uintptr(0) {
@@ -123296,23 +123375,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+26878,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26944,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26923
+					return ts + 26989
 				}
-				return ts + 26931
+				return ts + 26997
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26940,
+				ts+27006,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26923
+						return ts + 26989
 					}
-					return ts + 26931
+					return ts + 26997
 				}(), iKey, iVal))
 		}
 	}
@@ -123336,7 +123415,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+26998, libc.VaList(bp, i, iCell, iNode))
+				ts+27064, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -123356,7 +123435,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+27046, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27112, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -123373,14 +123452,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+27113, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27179, 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+27147, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27213, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -123388,7 +123467,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+27177,
+					ts+27243,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -123417,14 +123496,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+27232,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27298,
 			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+27263, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27329, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -123446,12 +123525,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+14496, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14515, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27330, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27396, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -123460,12 +123539,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25150, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25216, 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+27358, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27424, 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)
 		}
@@ -123479,8 +123558,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+27389, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27455, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27462, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -123488,7 +123567,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+27404, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27470, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -123503,7 +123582,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27408, -1)
+			ts+27474, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -123511,7 +123590,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6434
+			zDb = ts + 6453
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*4)))
 		}
@@ -123521,7 +123600,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 + 18005
+				return ts + 18071
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -123891,11 +123970,11 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		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+27459, 1)
+		Xsqlite3_str_append(tls, x, ts+27525, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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+27527, 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+27472, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27538, 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)
 	}
@@ -123915,19 +123994,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+27483, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27549, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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)))))
+			Xsqlite3_str_appendf(tls, x, ts+27567, 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+27509, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27575, 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+27517, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27583, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27521, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27587, 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)
 	}
@@ -124845,7 +124924,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+27534, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27600, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -124854,7 +124933,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27556, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*4))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27622, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*4))))
 	goto __3
 __3:
 	ii++
@@ -124862,7 +124941,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26623, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26689, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -124873,7 +124952,7 @@ __5:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __7
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
 __7:
 	;
 __6:
@@ -124898,7 +124977,7 @@ __9:
 	if !(rc != 0) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	goto geopolyInit_fail
 __10:
 	;
@@ -125089,7 +125168,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 + 16260
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16279
 		(*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
@@ -125099,7 +125178,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 + 27560
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27626
 		(*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
@@ -125107,7 +125186,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 + 27566
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27632
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -125219,7 +125298,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27575, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27641, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -125351,14 +125430,14 @@ geopoly_update_end:
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
 	_ = pVtab
 	_ = nArg
-	if Xsqlite3_stricmp(tls, zName, ts+27615) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27681) == 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+27631) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27697) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -125423,7 +125502,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+27646, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27712, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -125435,25 +125514,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [2]byte
 	FzName       uintptr
 }{
-	{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},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27720},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27733},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27746},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27759},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27697},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27771},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27681},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27794},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27808},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27821},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27835},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27851},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27797},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27863},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -125463,26 +125542,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27816, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27882, 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+27826, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27892, 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+27837, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27903, -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+27560, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27626, 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+27848, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27914, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -125536,7 +125615,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+25136, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25202, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -125851,7 +125930,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+27858, -1)
+		Xsqlite3_result_error(tls, context, ts+27924, -1)
 		return
 	}
 
@@ -125862,7 +125941,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+27858, -1)
+			Xsqlite3_result_error(tls, context, ts+27924, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -125875,7 +125954,7 @@ func prepareAndCollectError(tls *libc.TLS, db uintptr, ppStmt uintptr, pzErrmsg
 
 	var rc int32 = Xsqlite3_prepare_v2(tls, db, zSql, -1, ppStmt, uintptr(0))
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 		*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	}
 	return rc
@@ -125887,7 +125966,7 @@ func resetAndCollectError(tls *libc.TLS, pStmt uintptr, pzErrmsg uintptr) int32
 
 	var rc int32 = Xsqlite3_reset(tls, pStmt)
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
 	}
 	return rc
 }
@@ -125963,7 +126042,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+27879, uintptr(0), uintptr(0), p+36)
+				ts+27945, uintptr(0), uintptr(0), p+36)
 		}
 
 		if rc == SQLITE_OK {
@@ -126027,7 +126106,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+25049, zIn, uint32(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > Size_t(4) && libc.Xmemcmp(tls, ts+25115, 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++ {
 				}
@@ -126048,16 +126127,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+28050, libc.VaList(bp, func() uintptr {
+			ts+28116, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28200
+					return ts + 28266
 				}
-				return ts + 1547
+				return ts + 1566
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+4, p+36,
-			ts+28241)
+			ts+28307)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -126155,7 +126234,7 @@ func rbuFinalize(tls *libc.TLS, p uintptr, pStmt uintptr) {
 	var rc int32 = Xsqlite3_finalize(tls, pStmt)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && rc != SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 	}
 }
 
@@ -126173,7 +126252,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+28366, libc.VaList(bp, zTab)))
+			ts+28432, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -126191,7 +126270,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+28485, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28551, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -126209,7 +126288,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*4, p+36,
 		Xsqlite3_mprintf(tls,
-			ts+28506, libc.VaList(bp+16, zIdx)))
+			ts+28572, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -126232,7 +126311,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+28557, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28623, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -126278,7 +126357,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+28578, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28644, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -126293,7 +126372,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+28606, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28672, 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 {
@@ -126333,7 +126412,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+19482, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19548, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -126343,18 +126422,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+28635, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28701, 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+28654, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28720, 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+28659, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28725, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -126366,18 +126445,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+28669, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28735, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28698
+							return ts + 28764
 						}
-						return ts + 28711
+						return ts + 28777
 					}()))
 		}
 
 		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+28720, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28786, 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)
@@ -126391,7 +126470,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+28742,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28808,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 5)
@@ -126434,12 +126513,12 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	defer tls.Free(24)
 
 	var zList uintptr = uintptr(0)
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	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+28769, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14607
+		zList = rbuMPrintf(tls, p, ts+28835, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14626
 	}
 	return zList
 }
@@ -126450,13 +126529,13 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 
 	var iPk int32 = 1
 	var zRet uintptr = uintptr(0)
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	for 1 != 0 {
 		var i int32
 		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+28778, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28844, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -126478,25 +126557,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+28791, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28857, 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+28823, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28889, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		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)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1566, ts+14626, ts+28912)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28918, ts+28925, ts+4969)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1566, ts+14626, ts+1566)
 
 		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+28867,
+					ts+28933,
 					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+28909, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28975, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -126533,12 +126612,12 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	zVector = uintptr(0)
 	zRet = uintptr(0)
 	bFailed = 0
-	zSep = ts + 1547
+	zSep = ts + 1566
 	iCol = 0
 	*(*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+28606, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28672, 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
@@ -126573,7 +126652,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
 	goto __7
 __6:
-	zCol = ts + 28929
+	zCol = ts + 28995
 __7:
 	;
 	goto __5
@@ -126581,13 +126660,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*4))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28937,
+	zLhs = rbuMPrintf(tls, p, ts+29003,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28958,
+	zOrder = rbuMPrintf(tls, p, ts+29024,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28994,
+	zSelect = rbuMPrintf(tls, p, ts+29060,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14607
+	zSep = ts + 14626
 	iCol++
 	goto __1
 __2:
@@ -126605,12 +126684,12 @@ __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+29021,
+		Xsqlite3_mprintf(tls, ts+29087,
 			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
 	}
-	zSep = ts + 1547
+	zSep = ts + 1566
 	iCol = 0
 __14:
 	if !(iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnCol) {
@@ -126632,8 +126711,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29069, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14607
+	zVector = rbuMPrintf(tls, p, ts+29135, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14626
 	goto __15
 __15:
 	iCol++
@@ -126644,7 +126723,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29142, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -126671,13 +126750,13 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 	var zImpPK uintptr = uintptr(0)
 	var zWhere uintptr = uintptr(0)
 	var nBind int32 = 0
-	var zCom uintptr = ts + 1547
-	var zAnd uintptr = ts + 1547
+	var zCom uintptr = ts + 1566
+	var zAnd uintptr = ts + 1566
 	*(*uintptr)(unsafe.Pointer(bp + 200)) = uintptr(0)
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+36,
-			Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28672, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -126689,9 +126768,9 @@ 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+29088, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29154, 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
+			zType = ts + 1566
 		} else {
 			if iCid < 0 {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK {
@@ -126701,37 +126780,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 + 28929
+					zCol = ts + 28995
 				} else {
-					zCol = ts + 28659
+					zCol = ts + 28725
 				}
-				zType = ts + 1112
+				zType = ts + 1131
 			} 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+29110, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29176, 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 + 28846
+					return ts + 28912
 				}
-				return ts + 1547
+				return ts + 1566
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29130,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29196,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29151,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29217,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29184, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29250, 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 + 14607
-		zAnd = ts + 21518
+		zCom = ts + 14626
+		zAnd = ts + 21584
 		nBind++
 	}
 
@@ -126765,16 +126844,16 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 
 	var zList uintptr = uintptr(0)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
-		var zS uintptr = ts + 1547
+		var zS uintptr = ts + 1566
 		var i int32
 		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+29208, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29274, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29220, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29286, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14607
+			zS = ts + 14626
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -126782,7 +126861,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+29229, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29295, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -126794,27 +126873,27 @@ 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+29244, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29310, 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 zSep uintptr = ts + 1566
 		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+29258, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21518
+				zList = rbuMPrintf(tls, p, ts+29324, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21584
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29270, libc.VaList(bp+40, zList))
+			ts+29336, libc.VaList(bp+40, zList))
 
 	} else {
-		var zSep uintptr = ts + 1547
+		var zSep uintptr = ts + 1566
 		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 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-				zList = rbuMPrintf(tls, p, ts+29320, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21518
+				zList = rbuMPrintf(tls, p, ts+29386, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21584
 			}
 		}
 	}
@@ -126823,7 +126902,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+29333, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29399, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -126837,21 +126916,21 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 		if int32(libc.Xstrlen(tls, zMask)) != (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 			rbuBadControlError(tls, p)
 		} else {
-			var zSep uintptr = ts + 1547
+			var zSep uintptr = ts + 1566
 			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+29320,
+					zList = rbuMPrintf(tls, p, ts+29386,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), i+1))
-					zSep = ts + 14607
+					zSep = ts + 14626
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29359,
+					zList = rbuMPrintf(tls, p, ts+29425,
 						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 + 14607
+					zSep = ts + 14626
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29389,
+					zList = rbuMPrintf(tls, p, ts+29455,
 						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 + 14607
+					zSep = ts + 14626
 				}
 			}
 		}
@@ -126886,19 +126965,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 + 29426
+		var zSep uintptr = ts + 29492
 		*(*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+28578, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28644, 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+16148) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16167) == 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+28606, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28672, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -126910,15 +126989,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 + 28846
+					zDesc = ts + 28912
 				} else {
-					zDesc = ts + 1547
+					zDesc = ts + 1566
 				}
-				z = rbuMPrintf(tls, p, ts+29439, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14607
+				z = rbuMPrintf(tls, p, ts+29505, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14626
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29450, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29516, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 60)))
 	}
 	return z
@@ -126933,12 +127012,12 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		*(*uintptr)(unsafe.Pointer(bp + 168)) = uintptr(0)
 		var zIdx uintptr = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 172)) = uintptr(0)
-		var zComma uintptr = ts + 1547
+		var zComma uintptr = ts + 1566
 		var zCols uintptr = uintptr(0)
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+36,
-			ts+29454)
+			ts+29520)
 		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))) {
@@ -126947,7 +127026,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+28606, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28672, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -126957,25 +127036,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+29504, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29570, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*4)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29526, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29592, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28846
+						return ts + 28912
 					}
-					return ts + 1547
+					return ts + 1566
 				}()))
-				zComma = ts + 14607
+				zComma = ts + 14626
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29536, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29602, 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+6434, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29551,
+			ts+29617,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 0, 0))
 	}
 }
 
@@ -126985,50 +127064,50 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
 		var tnum int32 = (*RbuObjIter)(unsafe.Pointer(pIter)).FiTnum
-		var zComma uintptr = ts + 1547
+		var zComma uintptr = ts + 1566
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
-			var zPk uintptr = ts + 1547
+			var zPk uintptr = ts + 1566
 			var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCol)*4))
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, (*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 + 29613
+				zPk = ts + 29679
 			}
-			zSql = rbuMPrintf(tls, p, ts+29626,
+			zSql = rbuMPrintf(tls, p, ts+29692,
 				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 + 29653
+							return ts + 29719
 						}
-						return ts + 1547
+						return ts + 1566
 					}()))
-			zComma = ts + 14607
+			zComma = ts + 14626
 		}
 
 		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+29663, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29729, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		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,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29736,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29702
+						return ts + 29768
 					}
-					return ts + 1547
+					return ts + 1566
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 0, 0))
 	}
 }
 
@@ -127041,7 +127120,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+29717,
+				ts+29783,
 				libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -127078,7 +127157,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+29774)
+			ts+29840)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 4)) == SQLITE_OK {
 		var rc2 int32
@@ -127183,7 +127262,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+29840, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29906, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -127203,24 +127282,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+6434, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29860,
+				ts+29926,
 				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+6434, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 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+29925, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29991, 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+29961, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 608)))))
+					Xsqlite3_mprintf(tls, ts+30027, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 608)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -127236,7 +127315,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29995,
+						ts+30061,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -127244,31 +127323,31 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 30056
+											return ts + 30122
 										}
-										return ts + 30060
+										return ts + 30126
 									}()
 								}
-								return ts + 1547
+								return ts + 1566
 							}(), zStart,
 							zCollist, zLimit))
 					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+30066,
+						ts+30132,
 						libc.VaList(bp+216, zCollist, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30127,
+						ts+30193,
 						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 + 30056
+									return ts + 30122
 								}
-								return ts + 30060
+								return ts + 30126
 							}(),
 							zCollist, zLimit))
 				}
@@ -127293,8 +127372,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+6445)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6441)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6464)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6460)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -127303,52 +127382,52 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			rbuCreateImposterTable2(tls, p, pIter)
 			zWrite = func() uintptr {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
-					return ts + 1547
+					return ts + 1566
 				}
-				return ts + 30286
+				return ts + 30352
 			}()
 
 			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+30295,
+						ts+30361,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30331
+								return ts + 30397
 							}
-							return ts + 1547
+							return ts + 1566
 						}(), zBindings)))
 			}
 
 			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+30341, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30407, 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
+				var zRbuRowid uintptr = ts + 1566
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30369
+					zRbuRowid = ts + 30435
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30381, libc.VaList(bp+408, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30447, libc.VaList(bp+408, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30457
+							return ts + 30523
 						}
-						return ts + 1547
+						return ts + 1566
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30474,
+					ts+30540,
 					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+30773,
+						ts+30839,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -127356,14 +127435,14 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-				var zRbuRowid uintptr = ts + 1547
+				var zRbuRowid uintptr = ts + 1566
 				var zStart uintptr = uintptr(0)
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30872
+						zRbuRowid = ts + 30938
 					} else {
-						zRbuRowid = ts + 30882
+						zRbuRowid = ts + 30948
 					}
 				}
 
@@ -127376,35 +127455,35 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28929, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28995, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14607, ts+1547)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1566, ts+14626, ts+1566)
 					}
 				}
 
 				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+30893,
+							ts+30959,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30941
+										return ts + 31007
 									}
-									return ts + 1547
+									return ts + 1566
 								}(),
 								zRbuRowid,
 								(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 									if zStart != 0 {
 										return zStart
 									}
-									return ts + 1547
+									return ts + 1566
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 22852
+										return ts + 22918
 									}
-									return ts + 1547
+									return ts + 1566
 								}(), zOrder,
 								zLimit)))
 				}
@@ -127467,12 +127546,12 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 		(*RbuObjIter)(unsafe.Pointer(pIter)).FpRbuUpdate = pUp
 
 		if zSet != 0 {
-			var zPrefix uintptr = ts + 1547
+			var zPrefix uintptr = ts + 1566
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30286
+				zPrefix = ts + 30352
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30947,
+			zUpdate = Xsqlite3_mprintf(tls, ts+31013,
 				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)
@@ -127499,7 +127578,7 @@ func rbuOpenDbhandle(tls *libc.TLS, p uintptr, zName uintptr, bUseVfs int32) uin
 			return uintptr(0)
 		}())
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
 			Xsqlite3_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 			*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 		}
@@ -127531,7 +127610,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+30977, libc.VaList(bp, p+24)))
+		Xsqlite3_mprintf(tls, ts+31043, 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:
@@ -127601,28 +127680,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+6434, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453, 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+6434)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31007, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31073, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		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))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31101, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.Xmemcpy(tls, p+24, ts+3298, uint32(4))
 	} else {
-		libc.Xmemcpy(tls, p+24, ts+6434, uint32(4))
+		libc.Xmemcpy(tls, p+24, ts+6453, uint32(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31053, libc.VaList(bp+24, p+24))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31119, 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+6434, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -127655,11 +127734,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+31119, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31185, 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+24199, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint32(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= Size_t(5) && 0 == libc.Xmemcmp(tls, ts+24265, (*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)))) == '?' {
@@ -127671,16 +127750,16 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31151,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434),
+			zTarget = Xsqlite3_mprintf(tls, ts+31217,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453),
 					func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1547
+							return ts + 1566
 						}
-						return ts + 31183
+						return ts + 31249
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1547
+							return ts + 1566
 						}
 						return zExtra
 					}()))
@@ -127696,37 +127775,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+31185, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31251, -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+31200, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31266, 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+31217, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31283, -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+6434, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31233, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31299, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 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+31261, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31327, 0)
 	}
 }
 
@@ -127755,14 +127834,14 @@ 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+31233, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31299, 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+31279, uintptr(0), uintptr(0), uintptr(0))
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31345, uintptr(0), uintptr(0), uintptr(0))
 		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
@@ -127871,7 +127950,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+6434, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6453, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -127888,23 +127967,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+31314, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31380, 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+6434)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453)
 	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+6434)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31339, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31405, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31412, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -128021,7 +128100,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+23837, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23903, 0)
 			return
 		}
 
@@ -128114,7 +128193,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+31353)
+			ts+31419)
 		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)
@@ -128122,7 +128201,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+31375, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31441, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -128143,7 +128222,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+31402,
+				ts+31468,
 				libc.VaList(bp, p+24,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -128173,9 +128252,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+31560, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31626, 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+31575,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31641,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -128189,10 +128268,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+31595, uintptr(0), uintptr(0), p+36)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31661, 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+31620)
+			ts+31686)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128206,12 +128285,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+31728)
+			ts+31794)
 	}
 
 	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+31793)
+			ts+31859)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128223,7 +128302,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+31837, uintptr(0), uintptr(0), p+36)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31903, uintptr(0), uintptr(0), p+36)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -128243,15 +128322,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+17233)
-					rbuCopyPragma(tls, p, ts+16344)
+					rbuCopyPragma(tls, p, ts+17252)
+					rbuCopyPragma(tls, p, ts+16363)
 				}
 
 				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+31862, libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31928, libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -128275,10 +128354,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+14511, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14530, 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+14511, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14530, uintptr(0), uintptr(0), p+36)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -128373,7 +128452,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+31890, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31956, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -128389,10 +128468,10 @@ func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(12)
 	defer tls.Free(12)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31339, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31405, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 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)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
@@ -128406,7 +128485,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+31915, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31981, 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)
@@ -128440,7 +128519,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+12,
 		Xsqlite3_mprintf(tls,
-			ts+31926, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31992, 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 {
@@ -128470,13 +128549,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+31998, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32064, 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+32012)
+				ts+32078)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -128487,7 +128566,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+32069)
+				ts+32135)
 			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)
@@ -128532,7 +128611,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			libc.Xmemcpy(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, zRbu, nRbu+Size_t(1))
 			pCsr += uintptr(nRbu + Size_t(1))
 			if zState != 0 {
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3656, libc.VaList(bp, zState))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3675, libc.VaList(bp, zState))
 			}
 
 			rbuOpenDatabase(tls, p, uintptr(0), bp+16)
@@ -128561,7 +128640,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+32143, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32209, 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
@@ -128579,12 +128658,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+32175,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32241,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32207
+							return ts + 32273
 						}
-						return ts + 32214
+						return ts + 32280
 					}()))
 			}
 		}
@@ -128592,7 +128671,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+14496, uintptr(0), uintptr(0), p+36)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14515, uintptr(0), uintptr(0), p+36)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+48)
@@ -128603,19 +128682,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+16947)
-						rbuCopyPragma(tls, p, ts+16359)
+						rbuCopyPragma(tls, p, ts+16966)
+						rbuCopyPragma(tls, p, ts+16378)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32221, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32287, uintptr(0), uintptr(0), p+36)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6434, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6453, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32237, uintptr(0), uintptr(0), p+36)
+								db, ts+32303, uintptr(0), uintptr(0), p+36)
 						}
 					}
 
@@ -128669,7 +128748,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+32261, zState+uintptr(n-7), uint32(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32327, zState+uintptr(n-7), uint32(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -128696,7 +128775,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+30286, uint32(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30352, 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++
@@ -128713,7 +128792,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+14511, uintptr(0), uintptr(0), p+36)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14530, uintptr(0), uintptr(0), p+36)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -128726,13 +128805,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+14511, uintptr(0), uintptr(0), p+36)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14530, 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+32269, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32335, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -128827,7 +128906,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+14511, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14530, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128844,19 +128923,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+14511, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14530, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14496
+				zBegin = ts + 14515
 			} else {
-				zBegin = ts + 32221
+				zBegin = ts + 32287
 			}
 			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+32221, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32287, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -129202,7 +129281,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+32296, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32362, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -129227,7 +129306,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+32319, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32385, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -129372,7 +129451,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+6434)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6453)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -129387,7 +129466,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+32330, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32396, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -129632,6 +129711,964 @@ func Xsqlite3rbu_temp_size(tls *libc.TLS, pRbu uintptr) Sqlite3_int64 {
 	return (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FszTemp
 }
 
+var zDbstatSchema = *(*[258]int8)(unsafe.Pointer(ts + 32407))
+
+// Forward reference to data structured used in this module
+type StatTable1 = struct {
+	Fbase Sqlite3_vtab
+	Fdb   uintptr
+	FiDb  int32
+}
+
+// Forward reference to data structured used in this module
+type StatTable = StatTable1
+type StatCursor1 = struct {
+	Fbase        Sqlite3_vtab_cursor
+	FpStmt       uintptr
+	FisEof       U8
+	FisAgg       U8
+	F__ccgo_pad1 [2]byte
+	FiDb         int32
+	FaPage       [32]StatPage
+	FiPage       int32
+	FiPageno     U32
+	FzName       uintptr
+	FzPath       uintptr
+	FzPagetype   uintptr
+	FnPage       int32
+	FnCell       int32
+	FnMxPayload  int32
+	FnUnused     I64
+	FnPayload    I64
+	FiOffset     I64
+	FszPage      I64
+}
+
+type StatCursor = StatCursor1
+type StatPage1 = struct {
+	FiPgno         U32
+	FaPg           uintptr
+	FiCell         int32
+	FzPath         uintptr
+	Fflags         U8
+	F__ccgo_pad1   [3]byte
+	FnCell         int32
+	FnUnused       int32
+	FaCell         uintptr
+	FiRightChildPg U32
+	FnMxPayload    int32
+}
+
+type StatPage = StatPage1
+type StatCell1 = struct {
+	FnLocal    int32
+	FiChildPg  U32
+	FnOvfl     int32
+	FaOvfl     uintptr
+	FnLastOvfl int32
+	FiOvfl     int32
+}
+
+type StatCell = StatCell1
+
+func statConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = uintptr(0)
+	var rc int32 = SQLITE_OK
+	var iDb int32
+	_ = pAux
+
+	if argc >= 4 {
+		Xsqlite3TokenInit(tls, bp+8, *(*uintptr)(unsafe.Pointer(argv + 3*4)))
+		iDb = Xsqlite3FindDb(tls, db, bp+8)
+		if iDb < 0 {
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+11883, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(argv + 3*4))))
+			return SQLITE_ERROR
+		}
+	} else {
+		iDb = 0
+	}
+	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_DIRECTONLY, 0)
+	rc = Xsqlite3_declare_vtab(tls, db, uintptr(unsafe.Pointer(&zDbstatSchema)))
+	if rc == SQLITE_OK {
+		pTab = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatTable{})))
+		if pTab == uintptr(0) {
+			rc = SQLITE_NOMEM
+		}
+	}
+
+	if rc == SQLITE_OK {
+		libc.Xmemset(tls, pTab, 0, uint32(unsafe.Sizeof(StatTable{})))
+		(*StatTable)(unsafe.Pointer(pTab)).Fdb = db
+		(*StatTable)(unsafe.Pointer(pTab)).FiDb = iDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
+	return rc
+}
+
+func statDisconnect(tls *libc.TLS, pVtab uintptr) int32 {
+	Xsqlite3_free(tls, pVtab)
+	return SQLITE_OK
+}
+
+func statBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
+	var i int32
+	var iSchema int32 = -1
+	var iName int32 = -1
+	var iAgg int32 = -1
+	_ = tab
+
+	for i = 0; i < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; i++ {
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fop) != SQLITE_INDEX_CONSTRAINT_EQ {
+			continue
+		}
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fusable) == 0 {
+			return SQLITE_CONSTRAINT
+		}
+		switch (*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(i)*12)).FiColumn {
+		case 0:
+			{
+				iName = i
+				break
+
+			}
+		case 10:
+			{
+				iSchema = i
+				break
+
+			}
+		case 11:
+			{
+				iAgg = i
+				break
+
+			}
+		}
+	}
+	i = 0
+	if iSchema >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).Fomit = uint8(1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 20)) |= 0x01
+	}
+	if iName >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iName)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 20)) |= 0x02
+	}
+	if iAgg >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iAgg)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 20)) |= 0x04
+	}
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 1.0
+
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy == 1 &&
+		(*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)).FnOrderBy == 2 &&
+		(*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_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).FiColumn == 1 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+		*(*int32)(unsafe.Pointer(pIdxInfo + 20)) |= 0x08
+	}
+
+	return SQLITE_OK
+}
+
+func statOpen(tls *libc.TLS, pVTab uintptr, ppCursor uintptr) int32 {
+	var pTab uintptr = pVTab
+	var pCsr uintptr
+
+	pCsr = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatCursor{})))
+	if pCsr == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		libc.Xmemset(tls, pCsr, 0, uint32(unsafe.Sizeof(StatCursor{})))
+		(*StatCursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab = pVTab
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppCursor)) = pCsr
+	return SQLITE_OK
+}
+
+func statClearCells(tls *libc.TLS, p uintptr) {
+	var i int32
+	if (*StatPage)(unsafe.Pointer(p)).FaCell != 0 {
+		for i = 0; i < (*StatPage)(unsafe.Pointer(p)).FnCell; i++ {
+			Xsqlite3_free(tls, (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell+uintptr(i)*24)).FaOvfl)
+		}
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FaCell)
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnCell = 0
+	(*StatPage)(unsafe.Pointer(p)).FaCell = uintptr(0)
+}
+
+func statClearPage(tls *libc.TLS, p uintptr) {
+	var aPg uintptr = (*StatPage)(unsafe.Pointer(p)).FaPg
+	statClearCells(tls, p)
+	Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FzPath)
+	libc.Xmemset(tls, p, 0, uint32(unsafe.Sizeof(StatPage{})))
+	(*StatPage)(unsafe.Pointer(p)).FaPg = aPg
+}
+
+func statResetCsr(tls *libc.TLS, pCsr uintptr) {
+	var i int32
+
+	for i = 0; i < int32(uint32(unsafe.Sizeof([32]StatPage{}))/uint32(unsafe.Sizeof(StatPage{}))); i++ {
+		statClearPage(tls, pCsr+16+uintptr(i)*40)
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(pCsr+16+uintptr(i)*40)).FaPg)
+		(*StatPage)(unsafe.Pointer(pCsr + 16 + uintptr(i)*40)).FaPg = uintptr(0)
+	}
+	Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(0)
+}
+
+func statResetCounts(tls *libc.TLS, pCsr uintptr) {
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnCell = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnUnused = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPayload = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FszPage = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 0
+}
+
+func statClose(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	Xsqlite3_free(tls, pCsr)
+	return SQLITE_OK
+}
+
+func getLocalPayload(tls *libc.TLS, nUsable int32, flags U8, nTotal int32) int32 {
+	var nLocal int32
+	var nMinLocal int32
+	var nMaxLocal int32
+
+	if int32(flags) == 0x0D {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = nUsable - 35
+	} else {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = (nUsable-12)*64/255 - 23
+	}
+
+	nLocal = nMinLocal + (nTotal-nMinLocal)%(nUsable-4)
+	if nLocal > nMaxLocal {
+		nLocal = nMinLocal
+	}
+	return nLocal
+}
+
+func statDecodePage(tls *libc.TLS, pBt uintptr, p uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var nUnused int32
+	var iOff int32
+	var nHdr int32
+	var isLeaf int32
+	var szPage int32
+	var aData uintptr
+	var aHdr uintptr
+	var iNext int32
+
+	var rc int32
+	var iPrev U32
+
+	var j int32
+	var nOvfl int32
+
+	var nLocal int32
+	var pCell uintptr
+	var i int32
+	var nUsable int32
+	aData = (*StatPage)(unsafe.Pointer(p)).FaPg
+	aHdr = aData + uintptr(func() int32 {
+		if (*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1) {
+			return 100
+		}
+		return 0
+	}())
+
+	(*StatPage)(unsafe.Pointer(p)).Fflags = *(*U8)(unsafe.Pointer(aHdr))
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0A || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __1
+	}
+	isLeaf = 1
+	nHdr = 8
+	goto __2
+__1:
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05 || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x02) {
+		goto __3
+	}
+	isLeaf = 0
+	nHdr = 12
+	goto __4
+__3:
+	goto statPageIsCorrupt
+__4:
+	;
+__2:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1)) {
+		goto __5
+	}
+	nHdr = nHdr + 100
+__5:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnCell = int32(*(*U8)(unsafe.Pointer(aHdr + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 3 + 1)))
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = 0
+	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
+
+	nUnused = int32(*(*U8)(unsafe.Pointer(aHdr + 5)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 5 + 1))) - nHdr - 2*(*StatPage)(unsafe.Pointer(p)).FnCell
+	nUnused = nUnused + int32(*(*U8)(unsafe.Pointer(aHdr + 7)))
+	iOff = int32(*(*U8)(unsafe.Pointer(aHdr + 1)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 1 + 1)))
+__6:
+	if !(iOff != 0) {
+		goto __7
+	}
+	if !(iOff >= szPage) {
+		goto __8
+	}
+	goto statPageIsCorrupt
+__8:
+	;
+	nUnused = nUnused + (int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2) + 1))))
+	iNext = int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff) + 1)))
+	if !(iNext < iOff+4 && iNext > 0) {
+		goto __9
+	}
+	goto statPageIsCorrupt
+__9:
+	;
+	iOff = iNext
+	goto __6
+__7:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnUnused = nUnused
+	(*StatPage)(unsafe.Pointer(p)).FiRightChildPg = func() uint32 {
+		if isLeaf != 0 {
+			return uint32(0)
+		}
+		return Xsqlite3Get4byte(tls, aHdr+8)
+	}()
+
+	if !((*StatPage)(unsafe.Pointer(p)).FnCell != 0) {
+		goto __10
+	}
+
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = szPage - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatPage)(unsafe.Pointer(p)).FaCell = Xsqlite3_malloc64(tls, uint64(uint32((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint32(unsafe.Sizeof(StatCell{}))))
+	if !((*StatPage)(unsafe.Pointer(p)).FaCell == uintptr(0)) {
+		goto __11
+	}
+	return SQLITE_NOMEM
+__11:
+	;
+	libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0, uint32((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint32(unsafe.Sizeof(StatCell{})))
+
+	i = 0
+__12:
+	if !(i < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __14
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr(i)*24
+
+	iOff = int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2) + 1)))
+	if !(iOff < nHdr || iOff >= szPage) {
+		goto __15
+	}
+	goto statPageIsCorrupt
+__15:
+	;
+	if !!(isLeaf != 0) {
+		goto __16
+	}
+	(*StatCell)(unsafe.Pointer(pCell)).FiChildPg = Xsqlite3Get4byte(tls, aData+uintptr(iOff))
+	iOff = iOff + 4
+__16:
+	;
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05) {
+		goto __17
+	}
+
+	goto __18
+__17:
+	iOff = iOff + int32(func() uint8 {
+		if int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff)))) < int32(U8(0x80)) {
+			return uint8(func() int32 {
+				*(*U32)(unsafe.Pointer(bp)) = U32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))
+				return 1
+			}())
+		}
+		return Xsqlite3GetVarint32(tls, aData+uintptr(iOff), bp)
+	}())
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __19
+	}
+	iOff = iOff + int32(Xsqlite3GetVarint(tls, aData+uintptr(iOff), bp+4))
+__19:
+	;
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32((*StatPage)(unsafe.Pointer(p)).FnMxPayload)) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = int32(*(*U32)(unsafe.Pointer(bp)))
+__20:
+	;
+	nLocal = getLocalPayload(tls, nUsable, (*StatPage)(unsafe.Pointer(p)).Fflags, int32(*(*U32)(unsafe.Pointer(bp))))
+	if !(nLocal < 0) {
+		goto __21
+	}
+	goto statPageIsCorrupt
+__21:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLocal = nLocal
+
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32(nLocal)) {
+		goto __22
+	}
+	nOvfl = int32((*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) + U32(nUsable) - U32(4) - U32(1)) / U32(nUsable-4))
+	if !(iOff+nLocal+4 > nUsable || *(*U32)(unsafe.Pointer(bp)) > U32(0x7fffffff)) {
+		goto __23
+	}
+	goto statPageIsCorrupt
+__23:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl = int32(*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) - U32((nOvfl-1)*(nUsable-4)))
+	(*StatCell)(unsafe.Pointer(pCell)).FnOvfl = nOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FaOvfl = Xsqlite3_malloc64(tls, uint64(uint32(unsafe.Sizeof(U32(0)))*uint32(nOvfl)))
+	if !((*StatCell)(unsafe.Pointer(pCell)).FaOvfl == uintptr(0)) {
+		goto __24
+	}
+	return SQLITE_NOMEM
+__24:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl)) = Xsqlite3Get4byte(tls, aData+uintptr(iOff+nLocal))
+	j = 1
+__25:
+	if !(j < nOvfl) {
+		goto __27
+	}
+	iPrev = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j-1)*4))
+	*(*uintptr)(unsafe.Pointer(bp + 12)) = uintptr(0)
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPrev, bp+12, 0)
+	if !(rc != SQLITE_OK) {
+		goto __28
+	}
+
+	return rc
+__28:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j)*4)) = Xsqlite3Get4byte(tls, Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 12))))
+	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp + 12)))
+	goto __26
+__26:
+	j++
+	goto __25
+	goto __27
+__27:
+	;
+__22:
+	;
+__18:
+	;
+	goto __13
+__13:
+	i++
+	goto __12
+	goto __14
+__14:
+	;
+__10:
+	;
+	return SQLITE_OK
+
+statPageIsCorrupt:
+	(*StatPage)(unsafe.Pointer(p)).Fflags = U8(0)
+	statClearCells(tls, p)
+	return SQLITE_OK
+}
+
+func statSizeAndOffset(tls *libc.TLS, pCsr uintptr) {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCsr)).FpVtab
+	var pBt uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatTable)(unsafe.Pointer(pTab)).FiDb)*16)).FpBt
+	var pPager uintptr = Xsqlite3BtreePager(tls, pBt)
+	var fd uintptr
+
+	fd = Xsqlite3PagerFile(tls, pPager)
+	*(*Sqlite3_int64)(unsafe.Pointer(bp)) = Sqlite3_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	if Xsqlite3OsFileControl(tls, fd, 230440, bp) == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = *(*Sqlite3_int64)(unsafe.Pointer(bp))
+		*(*I64)(unsafe.Pointer(pCsr + 1352)) += *(*Sqlite3_int64)(unsafe.Pointer(bp + 1*8))
+	} else {
+		*(*I64)(unsafe.Pointer(pCsr + 1352)) += I64(Xsqlite3BtreeGetPageSize(tls, pBt))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = (*StatCursor)(unsafe.Pointer(pCsr)).FszPage * I64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno-U32(1))
+	}
+}
+
+func statGetPage(tls *libc.TLS, pBt uintptr, iPg U32, pPg uintptr) int32 {
+	bp := tls.Alloc(4)
+	defer tls.Free(4)
+
+	var pgsz int32 = Xsqlite3BtreeGetPageSize(tls, pBt)
+	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
+	var rc int32
+
+	if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+		(*StatPage)(unsafe.Pointer(pPg)).FaPg = Xsqlite3_malloc(tls, pgsz+DBSTAT_PAGE_PADDING_BYTES)
+		if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+			return SQLITE_NOMEM
+		}
+		libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0, uint32(DBSTAT_PAGE_PADDING_BYTES))
+	}
+
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPg, bp, 0)
+	if rc == SQLITE_OK {
+		var a uintptr = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		libc.Xmemcpy(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, a, uint32(pgsz))
+		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+	}
+
+	return rc
+}
+
+func statNext(tls *libc.TLS, pCursor uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
+	var rc int32
+	var nPayload int32
+	var z uintptr
+	var pCsr uintptr
+	var pTab uintptr
+	var pBt uintptr
+	var pPager uintptr
+
+	var iRoot U32
+	var nUsable int32
+	var iOvfl int32
+	var pCell uintptr
+
+	var p uintptr
+	var i int32
+	var p1 uintptr
+	pCsr = pCursor
+	pTab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	pBt = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*16)).FpBt
+	pPager = Xsqlite3BtreePager(tls, pBt)
+
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+
+statNextRestart:
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __1
+	}
+
+	statResetCounts(tls, pCsr)
+	rc = Xsqlite3_step(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	if !(rc == SQLITE_ROW) {
+		goto __3
+	}
+	iRoot = U32(Xsqlite3_column_int64(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 1))
+	Xsqlite3PagerPagecount(tls, pPager, bp+48)
+	if !(*(*int32)(unsafe.Pointer(bp + 48)) == 0) {
+		goto __5
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__5:
+	;
+	rc = statGetPage(tls, pBt, iRoot, pCsr+16)
+	(*StatPage)(unsafe.Pointer(pCsr + 16)).FiPgno = iRoot
+	(*StatPage)(unsafe.Pointer(pCsr + 16)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __6
+	}
+	(*StatPage)(unsafe.Pointer(pCsr + 16)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32665, 0))
+	if !(z == uintptr(0)) {
+		goto __7
+	}
+	rc = SQLITE_NOMEM
+__7:
+	;
+__6:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 1
+	goto __4
+__3:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__4:
+	;
+	goto __2
+__1:
+	p = pCsr + 16 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*40
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __8
+	}
+	statResetCounts(tls, pCsr)
+__8:
+	;
+__9:
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __10
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*24
+__11:
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl) {
+		goto __12
+	}
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = Xsqlite3BtreeGetPageSize(tls, pBt) - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	statSizeAndOffset(tls, pCsr)
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl-1) {
+		goto __13
+	}
+	*(*I64)(unsafe.Pointer(pCsr + 1336)) += I64(nUsable - 4)
+	goto __14
+__13:
+	*(*I64)(unsafe.Pointer(pCsr + 1336)) += I64((*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+	*(*I64)(unsafe.Pointer(pCsr + 1328)) += I64(nUsable - 4 - (*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+__14:
+	;
+	iOvfl = (*StatCell)(unsafe.Pointer(pCell)).FiOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FiOvfl++
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __15
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(iOvfl)*4))
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32667
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls,
+		ts+32676, libc.VaList(bp, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell, iOvfl)))
+	if z == uintptr(0) {
+		return SQLITE_NOMEM
+	}
+	return SQLITE_OK
+__15:
+	;
+	goto __11
+__12:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiRightChildPg != 0) {
+		goto __16
+	}
+	goto __10
+__16:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+	goto __9
+__10:
+	;
+	if !(!(int32((*StatPage)(unsafe.Pointer(p)).FiRightChildPg) != 0) || (*StatPage)(unsafe.Pointer(p)).FiCell > (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __17
+	}
+	statClearPage(tls, p)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage--
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 && (*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __18
+	}
+
+	return SQLITE_OK
+__18:
+	;
+	goto statNextRestart
+__17:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage++
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage >= int32(uint32(unsafe.Sizeof([32]StatPage{}))/uint32(unsafe.Sizeof(StatPage{})))) {
+		goto __19
+	}
+	statResetCsr(tls, pCsr)
+	return Xsqlite3CorruptError(tls, 215455)
+__19:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell == (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*40)).FiPgno = (*StatPage)(unsafe.Pointer(p)).FiRightChildPg
+	goto __21
+__20:
+	(*StatPage)(unsafe.Pointer(p + 1*40)).FiPgno = (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*24)).FiChildPg
+__21:
+	;
+	rc = statGetPage(tls, pBt, (*StatPage)(unsafe.Pointer(p+1*40)).FiPgno, p+1*40)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	(*StatPage)(unsafe.Pointer(p + 1*40)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __22
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*40)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32688, libc.VaList(bp+24, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell)))
+	if !(z == uintptr(0)) {
+		goto __23
+	}
+	rc = SQLITE_NOMEM
+__23:
+	;
+__22:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+__2:
+	;
+	if !(rc == SQLITE_OK) {
+		goto __24
+	}
+	p1 = pCsr + 16 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*40
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = (*StatPage)(unsafe.Pointer(p1)).FiPgno
+
+	rc = statDecodePage(tls, pBt, p1)
+	if !(rc == SQLITE_OK) {
+		goto __25
+	}
+	statSizeAndOffset(tls, pCsr)
+
+	switch int32((*StatPage)(unsafe.Pointer(p1)).Fflags) {
+	case 0x05:
+		goto __27
+	case 0x02:
+		goto __28
+	case 0x0D:
+		goto __29
+	case 0x0A:
+		goto __30
+	default:
+		goto __31
+	}
+	goto __26
+__27:
+__28:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32696
+	goto __26
+__29:
+__30:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32705
+	goto __26
+__31:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32710
+	goto __26
+__26:
+	;
+	*(*int32)(unsafe.Pointer(pCsr + 1320)) += (*StatPage)(unsafe.Pointer(p1)).FnCell
+	*(*I64)(unsafe.Pointer(pCsr + 1328)) += I64((*StatPage)(unsafe.Pointer(p1)).FnUnused)
+	if !((*StatPage)(unsafe.Pointer(p1)).FnMxPayload > (*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload) {
+		goto __32
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = (*StatPage)(unsafe.Pointer(p1)).FnMxPayload
+__32:
+	;
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __33
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+40, (*StatPage)(unsafe.Pointer(p1)).FzPath)))
+	if !(z == uintptr(0)) {
+		goto __34
+	}
+	rc = SQLITE_NOMEM
+__34:
+	;
+__33:
+	;
+	nPayload = 0
+	i = 0
+__35:
+	if !(i < (*StatPage)(unsafe.Pointer(p1)).FnCell) {
+		goto __37
+	}
+	nPayload = nPayload + (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p1)).FaCell+uintptr(i)*24)).FnLocal
+	goto __36
+__36:
+	i++
+	goto __35
+	goto __37
+__37:
+	;
+	*(*I64)(unsafe.Pointer(pCsr + 1336)) += I64(nPayload)
+
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0) {
+		goto __38
+	}
+	goto statNextRestart
+__38:
+	;
+__25:
+	;
+__24:
+	;
+	return rc
+}
+
+func statEof(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	return int32((*StatCursor)(unsafe.Pointer(pCsr)).FisEof)
+}
+
+func statFilter(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintptr, argc int32, argv uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pCsr uintptr = pCursor
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	var pSql uintptr
+	var zSql uintptr
+	var iArg int32 = 0
+	var rc int32 = SQLITE_OK
+	var zName uintptr = uintptr(0)
+	_ = argc
+	_ = idxStr
+
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FpStmt = uintptr(0)
+	if idxNum&0x01 != 0 {
+		var zDbase uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*4)))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = Xsqlite3FindDbName(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zDbase)
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FiDb < 0 {
+			(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = 0
+			(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+			return SQLITE_OK
+		}
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+	if idxNum&0x02 != 0 {
+		zName = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*4)))
+	}
+	if idxNum&0x04 != 0 {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(libc.Bool32(Xsqlite3_value_double(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*4))) != 0.0))
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(0)
+	}
+	pSql = Xsqlite3_str_new(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb)
+	Xsqlite3_str_appendf(tls, pSql,
+		ts+32720,
+		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb+uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*16)).FzDbSName))
+	if zName != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32875, libc.VaList(bp+8, zName))
+	}
+	if idxNum&0x08 != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32889, 0)
+	}
+	zSql = Xsqlite3_str_finish(tls, pSql)
+	if zSql == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		rc = Xsqlite3_prepare_v2(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+4, uintptr(0))
+		Xsqlite3_free(tls, zSql)
+	}
+
+	if rc == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = -1
+		rc = statNext(tls, pCursor)
+	}
+	return rc
+}
+
+func statColumn(tls *libc.TLS, pCursor uintptr, ctx uintptr, i int32) int32 {
+	var pCsr uintptr = pCursor
+	switch i {
+	case 0:
+		Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzName, -1, libc.UintptrFromInt32(-1))
+		break
+	case 1:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath, -1, libc.UintptrFromInt32(-1))
+		}
+		break
+	case 2:
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnPage))
+		} else {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno))
+		}
+		break
+	case 3:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype, -1, uintptr(0))
+		}
+		break
+	case 4:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnCell))
+		break
+	case 5:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnPayload)
+		break
+	case 6:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnUnused)
+		break
+	case 7:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload))
+		break
+	case 8:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FiOffset)
+		}
+		break
+	case 9:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FszPage)
+		break
+	case 10:
+		{
+			var db uintptr = Xsqlite3_context_db_handle(tls, ctx)
+			var iDb int32 = (*StatCursor)(unsafe.Pointer(pCsr)).FiDb
+			Xsqlite3_result_text(tls, ctx, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, -1, uintptr(0))
+			break
+
+		}
+	default:
+		{
+			Xsqlite3_result_int(tls, ctx, int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg))
+			break
+
+		}
+	}
+	return SQLITE_OK
+}
+
+func statRowid(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32 {
+	var pCsr uintptr = pCursor
+	*(*Sqlite_int64)(unsafe.Pointer(pRowid)) = Sqlite_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	return SQLITE_OK
+}
+
+// Invoke this routine to register the "dbstat" virtual table module
+func Xsqlite3DbstatRegister(tls *libc.TLS, db uintptr) int32 {
+	return Xsqlite3_create_module(tls, db, ts+32904, uintptr(unsafe.Pointer(&dbstat_module)), uintptr(0))
+}
+
+var dbstat_module = Sqlite3_module{
+	FxCreate:     0,
+	FxConnect:    0,
+	FxBestIndex:  0,
+	FxDisconnect: 0,
+	FxDestroy:    0,
+	FxOpen:       0,
+	FxClose:      0,
+	FxFilter:     0,
+	FxNext:       0,
+	FxEof:        0,
+	FxColumn:     0,
+	FxRowid:      0,
+}
+
 type SessionTable1 = struct {
 	FpNext    uintptr
 	FzName    uintptr
@@ -130208,13 +131245,13 @@ 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+11341, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11360, 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+32341, 0)
+				ts+32911, 0)
 		} else if rc == SQLITE_ERROR {
-			zPragma = Xsqlite3_mprintf(tls, ts+1547, 0)
+			zPragma = Xsqlite3_mprintf(tls, ts+1566, 0)
 		} else {
 			*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
 			*(*uintptr)(unsafe.Pointer(pabPK)) = uintptr(0)
@@ -130225,7 +131262,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32462, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+33032, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -130323,7 +131360,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11341, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11360, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -130572,7 +131609,7 @@ __4:
 	goto error_out
 __7:
 	;
-	Xsqlite3ValueSetStr(tls, p, 0, ts+1547, uint8(0), uintptr(0))
+	Xsqlite3ValueSetStr(tls, p, 0, ts+1566, uint8(0), uintptr(0))
 	(*Sqlite3_session)(unsafe.Pointer(pSession)).FpZeroBlob = p
 __6:
 	;
@@ -130899,14 +131936,14 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	var zRet uintptr = uintptr(0)
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32491,
+			zRet = Xsqlite3_mprintf(tls, ts+33061,
 				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 + 21518
+			zSep = ts + 21584
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130921,7 +131958,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	var zRet uintptr = uintptr(0)
 	var bHave int32 = 0
 
@@ -130929,9 +131966,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+32525,
+				ts+33095,
 				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 + 32566
+			zSep = ts + 33136
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130939,7 +131976,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7523, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7531, 0)
 	}
 
 	return zRet
@@ -130950,7 +131987,7 @@ func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintpt
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32571,
+		ts+33141,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -130993,7 +132030,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32649,
+			ts+33219,
 			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
@@ -131120,7 +132157,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32702, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33272, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -131385,7 +132422,7 @@ func sessionAppendInteger(tls *libc.TLS, p uintptr, iVal int32, pRc uintptr) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
-	Xsqlite3_snprintf(tls, int32(uint32(unsafe.Sizeof([24]int8{}))-uint32(1)), bp+8, ts+4968, libc.VaList(bp, iVal))
+	Xsqlite3_snprintf(tls, int32(uint32(unsafe.Sizeof([24]int8{}))-uint32(1)), bp+8, ts+4987, libc.VaList(bp, iVal))
 	sessionAppendStr(tls, p, bp+8, pRc)
 }
 
@@ -131594,29 +132631,29 @@ 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+11341, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11360, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32729, libc.VaList(bp, zDb))
+			ts+33299, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_NOMEM
 		}
 	} else {
 		var i int32
-		var zSep uintptr = ts + 1547
+		var zSep uintptr = ts + 1566
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32839, bp+20)
+		sessionAppendStr(tls, bp+8, ts+33409, bp+20)
 		sessionAppendIdent(tls, bp+8, zDb, bp+20)
-		sessionAppendStr(tls, bp+8, ts+1560, bp+20)
+		sessionAppendStr(tls, bp+8, ts+1579, bp+20)
 		sessionAppendIdent(tls, bp+8, zTab, bp+20)
-		sessionAppendStr(tls, bp+8, ts+32854, bp+20)
+		sessionAppendStr(tls, bp+8, ts+33424, 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+32862, bp+20)
+				sessionAppendStr(tls, bp+8, ts+33432, bp+20)
 				sessionAppendInteger(tls, bp+8, i+1, bp+20)
-				zSep = ts + 21518
+				zSep = ts + 21584
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -131725,7 +132762,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+32868, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33438, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 24)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 24))
 	}
@@ -131817,7 +132854,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+12)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32888, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33458, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 24))
 }
@@ -132080,7 +133117,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, 219078)
+				rc = Xsqlite3CorruptError(tls, 219169)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -132103,7 +133140,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, 219098)
+						rc = Xsqlite3CorruptError(tls, 219189)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -132145,7 +133182,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, 219152)
+			rc = Xsqlite3CorruptError(tls, 219243)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -132206,7 +133243,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, 219240)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219331)
 		}
 	}
 
@@ -132280,13 +133317,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, 219326))
+		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219417))
 	}
 
 	(*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, 219332))
+		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219423))
 	}
 
 	if paRec != 0 {
@@ -132348,7 +133385,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, 219376))
+						return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219467))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*4)) = uintptr(0)
 				}
@@ -132721,7 +133758,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 219741)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 219832)
 	goto finished_invert
 __6:
 	;
@@ -132887,45 +133924,45 @@ 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+11341) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11360) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_NOMEM
 			} else {
-				var zSep uintptr = ts + 1547
+				var zSep uintptr = ts + 1566
 
 				libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(SessionBuffer{})))
 				(*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+32906, bp+12)
+				sessionAppendStr(tls, bp, ts+33476, bp+12)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+12)
-				sessionAppendStr(tls, bp, ts+32919, bp+12)
+				sessionAppendStr(tls, bp, ts+33489, 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+32925, bp+12)
+						sessionAppendStr(tls, bp, ts+33495, bp+12)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+12)
-						zSep = ts + 14607
+						zSep = ts + 14626
 					}
 				}
 
-				zSep = ts + 1547
-				sessionAppendStr(tls, bp, ts+32854, bp+12)
+				zSep = ts + 1566
+				sessionAppendStr(tls, bp, ts+33424, 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+32930, bp+12)
+								ts+33500, bp+12)
 						} else {
 							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+33432, bp+12)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+12)
 						}
-						zSep = ts + 21518
+						zSep = ts + 21584
 					}
 				}
 
@@ -132972,42 +134009,42 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	defer tls.Free(16)
 
 	var i int32
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_OK
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+33005, bp+12)
+	sessionAppendStr(tls, bp, ts+33575, bp+12)
 	sessionAppendIdent(tls, bp, zTab, bp+12)
-	sessionAppendStr(tls, bp, ts+32854, bp+12)
+	sessionAppendStr(tls, bp, ts+33424, 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+32925, bp+12)
+			sessionAppendStr(tls, bp, ts+33495, bp+12)
 			sessionAppendInteger(tls, bp, i+1, bp+12)
-			zSep = ts + 21518
+			zSep = ts + 21584
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+33023, bp+12)
+		sessionAppendStr(tls, bp, ts+33593, bp+12)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+12)
-		sessionAppendStr(tls, bp, ts+32566, bp+12)
+		sessionAppendStr(tls, bp, ts+33136, bp+12)
 
-		zSep = ts + 1547
+		zSep = ts + 1566
 		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+32862, bp+12)
+				sessionAppendStr(tls, bp, ts+33432, bp+12)
 				sessionAppendInteger(tls, bp, i+1, bp+12)
-				zSep = ts + 33031
+				zSep = ts + 33601
 			}
 		}
-		sessionAppendStr(tls, bp, ts+4950, bp+12)
+		sessionAppendStr(tls, bp, ts+4969, bp+12)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 12)) == SQLITE_OK {
@@ -133020,7 +134057,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+6434, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+12)
+		db, ts+6453, 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 {
@@ -133031,21 +134068,21 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+33036, bp+12)
+	sessionAppendStr(tls, bp, ts+33606, bp+12)
 	sessionAppendIdent(tls, bp, zTab, bp+12)
-	sessionAppendStr(tls, bp, ts+21524, bp+12)
+	sessionAppendStr(tls, bp, ts+21590, bp+12)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14607, bp+12)
+			sessionAppendStr(tls, bp, ts+14626, bp+12)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*4)), bp+12)
 	}
 
-	sessionAppendStr(tls, bp, ts+33054, bp+12)
+	sessionAppendStr(tls, bp, ts+33624, bp+12)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33065, bp+12)
+		sessionAppendStr(tls, bp, ts+33635, bp+12)
 	}
-	sessionAppendStr(tls, bp, ts+4950, bp+12)
+	sessionAppendStr(tls, bp, ts+4969, bp+12)
 
 	if *(*int32)(unsafe.Pointer(bp + 12)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3_prepare_v2(tls, db, (*SessionBuffer)(unsafe.Pointer(bp)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp)).FnBuf, p+8, uintptr(0))
@@ -133059,14 +134096,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+11341, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11360, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33069)
+			ts+33639)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+4,
-			ts+33182)
+			ts+33752)
 	}
 	return rc
 }
@@ -133094,7 +134131,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, 220219)
+				rc = Xsqlite3CorruptError(tls, 220310)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -133347,7 +134384,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+33326, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33896, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -133363,7 +134400,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+33347, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33917, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -133436,10 +134473,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+33366, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33936, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33392, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33962, 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))
@@ -133472,7 +134509,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				f func(*libc.TLS, uintptr, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xFilter})).f(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 124))))
 			if schemaMismatch != 0 {
-				*(*uintptr)(unsafe.Pointer(bp + 140)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 124))))
+				*(*uintptr)(unsafe.Pointer(bp + 140)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 124))))
 				if *(*uintptr)(unsafe.Pointer(bp + 140)) == uintptr(0) {
 					rc = SQLITE_NOMEM
 					break
@@ -133485,7 +134522,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+6434, *(*uintptr)(unsafe.Pointer(bp + 124)), bp+48+16, bp+140, bp+48+20, bp+48+24)
+					db, ts+6453, *(*uintptr)(unsafe.Pointer(bp + 124)), bp+48+16, bp+140, bp+48+20, bp+48+24)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -133498,19 +134535,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+33422, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 140))))
+						ts+33992, 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+33466,
+						ts+34036,
 						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+33537, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 140))))
+						ts+34107, 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+11341) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 140)), ts+11360) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -133561,14 +134598,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33597, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34167, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33627, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34197, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33651, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33627, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34221, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34197, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -134800,7 +135837,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33679, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+34249, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135088,7 +136125,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33707, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+34277, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135273,7 +136310,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+33738, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34308, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -135341,7 +136378,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33745
+		var zErr uintptr = ts + 34315
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135499,7 +136536,7 @@ func fts5ValueToText(tls *libc.TLS, pVal uintptr) uintptr {
 	if zRet != 0 {
 		return zRet
 	}
-	return ts + 1547
+	return ts + 1566
 }
 
 func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, nVal int32, apVal uintptr) {
@@ -135522,7 +136559,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33795
+		var zErr uintptr = ts + 34365
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135845,13 +136882,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(48)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33843, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34413, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33851, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34421, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33861, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34431, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -136262,7 +137299,7 @@ func fts5ConfigSkipLiteral(tls *libc.TLS, pIn uintptr) uintptr {
 	case 'n':
 		fallthrough
 	case 'N':
-		if Xsqlite3_strnicmp(tls, ts+6174, p, 4) == 0 {
+		if Xsqlite3_strnicmp(tls, ts+6193, p, 4) == 0 {
 			p = p + 4
 		} else {
 			p = uintptr(0)
@@ -136401,7 +137438,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+33866, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34436, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint32(unsafe.Sizeof(int32(0))) * uint32(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -136428,14 +137465,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+33873, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34443, 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+33904, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+34474, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136446,7 +137483,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33937, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34507, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136459,7 +137496,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33974, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34544, 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)
@@ -136468,7 +137505,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+33983, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34553, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -136487,7 +137524,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34016, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34586, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -136502,14 +137539,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34050, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34620, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34058, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34628, 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+34090, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34660, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -136517,9 +137554,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34096, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34666, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34110, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34680, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -136527,9 +137564,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34148, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34718, 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+34159, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34729, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -136537,21 +137574,21 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+5068, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+5087, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 44)) = [4]Fts5Enum{
-			{FzName: ts + 8019, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17338},
-			{FzName: ts + 34194, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8038, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17357},
+			{FzName: ts + 34764, 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+34202, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34772, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34233, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34803, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -136598,15 +137635,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+22184) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16260) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34261, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22250) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16279) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34831, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34291) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34861) {
 			*(*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+34301, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34871, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -136623,13 +137660,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+34332, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34902, 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+34337, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*4))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34907, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*4))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34344, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34914, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -136667,8 +137704,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+22184) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34352, 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+22250) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34922, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -136700,7 +137737,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+34381, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34951, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -136709,13 +137746,13 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 							if *(*uintptr)(unsafe.Pointer(bp + 44)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 44))
 							}
-							return ts + 1547
+							return ts + 1566
 						}(),
 						func() uintptr {
 							if *(*uintptr)(unsafe.Pointer(bp + 52)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 52))
 							}
-							return ts + 1547
+							return ts + 1566
 						}(),
 						pzErr)
 				} else {
@@ -136737,19 +137774,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 + 34050
+			zTail = ts + 34620
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34401
+			zTail = ts + 34971
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34409, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34979, 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+16260, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16279, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -136793,18 +137830,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+34420, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34990, 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 + 1566
 			}
-			return ts + 14607
+			return ts + 14626
 		}()
-		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+35006, 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+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22184))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35013,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22250))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -136914,7 +137951,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34469) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35039) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -136924,7 +137961,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+34474) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35044) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -136934,7 +137971,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+34483) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35053) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -136947,7 +137984,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+34493) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35063) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -136957,7 +137994,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+34503) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35073) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -136973,7 +138010,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+22184) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22250) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+4)
@@ -136996,7 +138033,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(44)
 	defer tls.Free(44)
 
-	var zSelect uintptr = ts + 34515
+	var zSelect uintptr = ts + 35085
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 36)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -137018,7 +138055,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+34547) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35117) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 40)) = 0
@@ -137032,7 +138069,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+34555,
+				ts+35125,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -137130,7 +138167,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34620, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+35190, 0)
 					return FTS5_EOF
 				}
 			}
@@ -137143,20 +138180,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+34640, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+35210, 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+34671, uint32(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35241, uint32(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34674, uint32(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35244, uint32(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30056, uint32(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30122, uint32(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -138933,9 +139970,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+34678, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint32(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35248, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint32(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33707, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+34277, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -138951,7 +139988,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+34683, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+35253, 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')
@@ -139038,7 +140075,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20521, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20587, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -139119,7 +140156,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+34712, 0)
+			ts+35282, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -139289,12 +140326,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+34765,
+								ts+35335,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34815
+										return ts + 35385
 									}
-									return ts + 34678
+									return ts + 35248
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -140234,7 +141271,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+34822, iRowid, 0, p+36)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35392, iRowid, 0, p+36)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -140313,7 +141350,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+34828,
+			ts+35398,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -140338,7 +141375,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+34879,
+			ts+35449,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+44, zSql) != 0 {
 			return
@@ -140361,7 +141398,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+34928,
+			ts+35498,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -140600,7 +141637,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+34968, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+35538, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -141799,7 +142836,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+34991,
+			ts+35561,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -142991,7 +144028,7 @@ func fts5WriteFlushBtree(tls *libc.TLS, p uintptr, pWriter uintptr) {
 			if (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn > 0 {
 				return (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fp
 			}
-			return ts + 1547
+			return ts + 1566
 		}()
 
 		Xsqlite3_bind_blob(tls, (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter, 2, z, (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn, uintptr(0))
@@ -143264,7 +144301,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+35075,
+			ts+35645,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -144329,7 +145366,7 @@ func sqlite3Fts5IndexReinit(tls *libc.TLS, p uintptr) int32 {
 	fts5StructureInvalidate(tls, p)
 	fts5IndexDiscardData(tls, p)
 	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Fts5Structure{})))
-	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1547, 0)
+	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1566, 0)
 	fts5StructureWrite(tls, p, bp)
 	return fts5IndexReturn(tls, p)
 }
@@ -144345,13 +145382,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+35132, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35702, 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+25049, ts+35140, 0, pzErr)
+				pConfig, ts+25115, ts+35710, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11481,
-					ts+35175,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11500,
+					ts+35745,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -144604,7 +145641,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+34822, int64(FTS5_STRUCTURE_ROWID), 1, bp+4)
+		ts+35392, 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)))
@@ -144718,7 +145755,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35219,
+		ts+35789,
 		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))) {
@@ -144888,7 +145925,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+35305)
+			sqlite3Fts5BufferAppendBlob(tls, p+32, bp+8, uint32(4), ts+35875)
 			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))
@@ -145156,7 +146193,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+35310, 0)
+			ts+35880, 0)
 		return SQLITE_ERROR
 	}
 
@@ -145187,7 +146224,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 				} else if iCol >= 0 {
 					bSeenMatch = 1
 					*(*int8)(unsafe.Pointer(idxStr + uintptr(libc.PostIncInt32(&iIdxStr, 1)))) = int8('M')
-					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4968, libc.VaList(bp, iCol))
+					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4987, libc.VaList(bp, iCol))
 					idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 
 				}
@@ -145202,7 +146239,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 					}
 					return int8('G')
 				}()
-				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4968, libc.VaList(bp+8, iCol))
+				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4987, libc.VaList(bp+8, iCol))
 				idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 				(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pInfo)).FaConstraintUsage + uintptr(i)*8)).FargvIndex = libc.PreIncInt32(&iCons, 1)
 
@@ -145516,7 +146553,7 @@ func fts5NextMethod(tls *libc.TLS, pCursor uintptr) int32 {
 					rc = Xsqlite3_reset(tls, (*Fts5Cursor)(unsafe.Pointer(pCsr)).FpStmt)
 					if rc != SQLITE_OK {
 						(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-							ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+							ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 					}
 				} else {
 					rc = SQLITE_OK
@@ -145548,7 +146585,7 @@ func fts5PrepareStatement(tls *libc.TLS, ppStmt uintptr, pConfig uintptr, zFmt u
 		rc = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
 			uint32(SQLITE_PREPARE_PERSISTENT), bp+8, uintptr(0))
 		if rc != SQLITE_OK {
-			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 		}
 		Xsqlite3_free(tls, zSql)
 	}
@@ -145580,25 +146617,25 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35349,
+		ts+35919,
 		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 + 14607
+					return ts + 14626
 				}
-				return ts + 1547
+				return ts + 1566
 			}(),
 			func() uintptr {
 				if zRankArgs != 0 {
 					return zRankArgs
 				}
-				return ts + 1547
+				return ts + 1566
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35404
+					return ts + 35974
 				}
-				return ts + 35409
+				return ts + 35979
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -145644,12 +146681,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+35413, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35983, 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) {
+	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5069, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35419, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35989, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -145680,7 +146717,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+35447, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36017, 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,
@@ -145711,7 +146748,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+35457, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36027, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -145743,14 +146780,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+35478, libc.VaList(bp, z))
+				ts+36048, 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 + 33861
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34431
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -145806,7 +146843,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+35310, 0)
+		ts+35880, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -145849,7 +146886,7 @@ __8:
 	if !(zText == uintptr(0)) {
 		goto __14
 	}
-	zText = ts + 1547
+	zText = ts + 1566
 __14:
 	;
 	iCol = 0
@@ -146023,7 +147060,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35511, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+36081, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -146144,7 +147181,7 @@ func fts5SeekCursor(tls *libc.TLS, pCsr uintptr, bErrormsg int32) int32 {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			} else if (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg != 0 {
 				*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-					ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
+					ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
 			}
 		}
 	}
@@ -146168,28 +147205,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+35547, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36117, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35558, 0)
+				ts+36128, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35638, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36208, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35646, 0)
+				ts+36216, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16927, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16946, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35702, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36272, 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+35708, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36278, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -146247,7 +147284,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+17472, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17491, 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)))
@@ -146260,12 +147297,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+35724,
+				ts+36294,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20422
+						return ts + 20488
 					}
-					return ts + 35761
+					return ts + 36331
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -146895,7 +147932,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+35773, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36343, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -147139,7 +148176,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+35794, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36364, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -147158,7 +148195,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+35816, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36386, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -147205,7 +148242,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+35847)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36417)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -147214,7 +148251,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+35860, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+36430, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -147228,7 +148265,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35951, ts + 34050, ts + 25049, ts + 34401, ts + 11481,
+	ts + 36521, ts + 34620, ts + 25115, ts + 34971, ts + 11500,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -147252,7 +148289,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+35958, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+36528, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -147270,13 +148307,13 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35958, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36528, 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+35963, 0,
+				db, ts+36533, 0,
 				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
 				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
@@ -147333,17 +148370,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 + 35978,
-			ts + 36046,
-			ts + 36115,
-			ts + 36148,
-			ts + 36187,
-			ts + 36227,
-			ts + 36266,
-			ts + 36307,
-			ts + 36346,
-			ts + 36388,
-			ts + 36428,
+			ts + 36548,
+			ts + 36616,
+			ts + 36685,
+			ts + 36718,
+			ts + 36757,
+			ts + 36797,
+			ts + 36836,
+			ts + 36877,
+			ts + 36916,
+			ts + 36958,
+			ts + 36998,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -147410,7 +148447,7 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 			(*Fts5Config)(unsafe.Pointer((*Fts5Storage)(unsafe.Pointer(p)).FpConfig)).FbLock--
 			Xsqlite3_free(tls, zSql)
 			if rc != SQLITE_OK && pzErrMsg != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
 			}
 		}
 	}
@@ -147445,18 +148482,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+36451,
+		ts+37021,
 		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+36555,
+			ts+37125,
 			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+36593,
+			ts+37163,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -147468,7 +148505,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+36631,
+			ts+37201,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -147480,14 +148517,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+25049, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11481, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35951, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25115, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11500, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+36521, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34401, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34971, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34050, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34620, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -147499,17 +148536,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+36673,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37243,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29702
+					return ts + 29768
 				}
-				return ts + 1547
+				return ts + 1566
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36703,
+			ts+37273,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -147546,27 +148583,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36747, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37317, 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+36770, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37340, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34050, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34620, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34401, ts+36776, 0, pzErr)
+				pConfig, ts+34971, ts+37346, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35951, ts+36808, 1, pzErr)
+				pConfig, ts+36521, ts+37378, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34547, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35117, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -147772,12 +148809,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+36825,
+		ts+37395,
 		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+36875,
+			ts+37445,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -147785,7 +148822,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+34547, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35117, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -147961,7 +148998,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36904,
+	zSql = Xsqlite3_mprintf(tls, ts+37474,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -148143,14 +149180,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+34050, bp+36)
+			rc = fts5StorageCount(tls, p, ts+34620, 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+34401, bp+44)
+			rc = fts5StorageCount(tls, p, ts+34971, bp+44)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 44)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -148345,9 +149382,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+36936) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37506) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36947) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37517) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -148561,7 +149598,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 + 36958
+			var zCat uintptr = ts + 37528
 			var i int32
 			libc.Xmemset(tls, p, 0, uint32(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -148573,7 +149610,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+36967) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37537) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
 				}
 			}
@@ -148584,18 +149621,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+36978) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37548) {
 					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+36936) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37506) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36947) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37517) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36967) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37537) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -148871,7 +149908,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 + 36996
+	var zBase uintptr = ts + 37566
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -149011,7 +150048,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+37006, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37576, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149019,11 +150056,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37009, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37579, 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+37014, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37584, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149031,7 +150068,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37019, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37589, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149039,7 +150076,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37022, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37592, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149047,11 +150084,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37595, 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+37030, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37600, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149059,19 +150096,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37035, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37605, 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+37039, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37609, 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+37045, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37615, 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+37050, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37620, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149079,11 +150116,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37054, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37624, 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+37058, aBuf+uintptr(nBuf-2), uint32(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37628, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149091,7 +150128,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37631, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149099,11 +150136,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37635, 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+37069, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37639, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149111,7 +150148,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37073, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37643, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149119,7 +150156,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37077, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37647, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149127,7 +150164,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37081, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37651, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149143,24 +150180,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+37085, aBuf+uintptr(nBuf-2), uint32(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37065, uint32(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37655, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37635, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37658, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37661, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37665, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37651, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -149175,137 +150212,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+37098, aBuf+uintptr(nBuf-7), uint32(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37668, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37065, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37635, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37106, aBuf+uintptr(nBuf-6), uint32(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37676, aBuf+uintptr(nBuf-6), uint32(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37113, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37683, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37118, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37688, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37014, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37584, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37123, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37693, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37009, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37579, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37128, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37698, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37081, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37651, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37133, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37703, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15473, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15492, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37138, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37708, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37091, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37661, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37142, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37712, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37006, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37576, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37147, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37717, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37050, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37620, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37153, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37723, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37157, uint32(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37727, uint32(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37159, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37729, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37073, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37643, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37165, aBuf+uintptr(nBuf-7), uint32(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37735, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37081, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37651, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37173, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37743, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37065, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37635, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37179, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37749, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37065, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37635, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37184, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37754, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37576, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37190, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37760, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37077, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37647, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37198, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37768, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37206, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37776, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37210, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37780, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37073, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37643, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37218, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37788, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37576, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37224, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37794, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37077, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37647, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37230, aBuf+uintptr(nBuf-6), uint32(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37800, aBuf+uintptr(nBuf-6), uint32(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37091, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37661, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -149320,16 +150357,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+37237, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37807, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37022, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37592, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37242, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37812, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149337,21 +150374,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37247, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37817, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37022, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37592, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37253, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37823, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37022, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37592, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37206, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37776, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149359,7 +150396,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37259, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37829, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -149367,9 +150404,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37265, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37835, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37576, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -149384,12 +150421,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+37271, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37841, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37275, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37845, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37278, aBuf+uintptr(nBuf-2), uint32(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37848, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -149398,7 +150435,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37281, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37851, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -149554,7 +150591,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+37285) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37855) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -149734,22 +150771,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(64)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36996, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37566, 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 + 37300, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37870, 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 + 37306, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37876, 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 + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37883, 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
@@ -150888,14 +151925,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+37321) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37891) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37325) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37895) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37329) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37899) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37338, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37908, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -150921,19 +151958,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 + 37372,
-		ts + 37412,
-		ts + 37447,
+		ts + 37942,
+		ts + 37982,
+		ts + 38017,
 	}
 
 	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+23345, *(*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+23411, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uint32(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37490, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38060, 0)
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -151066,11 +152103,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+37523, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+38093, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37554,
+		ts+38124,
 		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))
@@ -151094,7 +152131,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+37605, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38175, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -151378,7 +152415,7 @@ func fts5VocabFilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, zUnused
 		if pLe != 0 {
 			var zCopy uintptr = Xsqlite3_value_text(tls, pLe)
 			if zCopy == uintptr(0) {
-				zCopy = ts + 1547
+				zCopy = ts + 1566
 			}
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm = Xsqlite3_value_bytes(tls, pLe)
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FzLeTerm = Xsqlite3_malloc(tls, (*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm+1)
@@ -151489,7 +152526,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+37631, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+38201, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -151511,7 +152548,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 + 37641
+	return ts + 38211
 }
 
 func init() {
@@ -151934,6 +152971,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 588)) = noopStepFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 592)) = uintptr(unsafe.Pointer(&lagName))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&attach_func)) + 16)) = attachFunc
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 4)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 8)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 12)) = statBestIndex
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 16)) = statDisconnect
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 20)) = statDisconnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 24)) = statOpen
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 28)) = statClose
+	*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 32)) = statFilter
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 36)) = statNext
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 40)) = statEof
+	*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 44)) = statColumn
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 48)) = statRowid
 	*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 0)) = sqlite3MemMalloc
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 4)) = sqlite3MemFree
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 8)) = sqlite3MemRealloc
@@ -152466,8 +153515,9 @@ func init() {
 	*(*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
-	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 12)) = Xsqlite3JsonTableFunctions
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = Xsqlite3DbstatRegister
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 12)) = sqlite3TestExtInit
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = Xsqlite3JsonTableFunctions
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statGetFuncdef)) + 16)) = statGet
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statInitFuncdef)) + 16)) = statInit
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statPushFuncdef)) + 16)) = statPush
@@ -152485,5 +153535,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 68)) = rbuVfsGetLastError
 }
 
-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 ts1 = "3.41.2\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-14.0.5\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_DBSTAT_VTAB\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\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\x00true\x00false\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 \x00rowid not at end-of-record for row \x00 of 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\x00CREATE TABLE x( name       TEXT, path       TEXT, pageno     INTEGER, pagetype   TEXT, ncell      INTEGER, payload    INTEGER, unused     INTEGER, mx_payload INTEGER, pgoffset   INTEGER, pgsize     INTEGER, schema     TEXT HIDDEN, aggregate  BOOLEAN HIDDEN)\x00/\x00overflow\x00%s%.3x+%.6x\x00%s%.3x/\x00internal\x00leaf\x00corrupted\x00SELECT * FROM (SELECT 'sqlite_schema' AS name,1 AS rootpage,'table' AS type UNION ALL SELECT name,rootpage,type FROM \"%w\".sqlite_schema WHERE rootpage!=0)\x00WHERE name=%Q\x00 ORDER BY name\x00dbstat\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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 7f59008b..8c860b4f 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -180,6 +180,7 @@ const (
 	DBFLAG_SchemaKnownOk                  = 0x0010
 	DBFLAG_Vacuum                         = 0x0004
 	DBFLAG_VacuumInto                     = 0x0008
+	DBSTAT_PAGE_PADDING_BYTES             = 256
 	DB_ResetWanted                        = 0x0008
 	DB_SchemaLoaded                       = 0x0001
 	DB_UnresetViews                       = 0x0002
@@ -748,11 +749,11 @@ const (
 	NC_OrderAgg                           = 0x8000000
 	NC_PartIdx                            = 0x000002
 	NC_SelfRef                            = 0x00002e
+	NC_Subquery                           = 0x000040
 	NC_UAggInfo                           = 0x000100
 	NC_UBaseReg                           = 0x000400
 	NC_UEList                             = 0x000080
 	NC_UUpsert                            = 0x000200
-	NC_VarSelect                          = 0x000040
 	NDEBUG                                = 1
 	NETGRAPHDISC                          = 6
 	NN                                    = 1
@@ -1558,6 +1559,7 @@ const (
 	SQLITE_ECEL_REF                       = 0x04
 	SQLITE_EMPTY                          = 16
 	SQLITE_ENABLE_COLUMN_METADATA         = 1
+	SQLITE_ENABLE_DBSTAT_VTAB             = 1
 	SQLITE_ENABLE_FTS5                    = 1
 	SQLITE_ENABLE_GEOPOLY                 = 1
 	SQLITE_ENABLE_LOCKING_STYLE           = 0
@@ -1958,7 +1960,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
+	SQLITE_SOURCE_ID                      = "2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2066,8 +2068,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.41.0"
-	SQLITE_VERSION_NUMBER                 = 3041000
+	SQLITE_VERSION                        = "3.41.2"
+	SQLITE_VERSION_NUMBER                 = 3041002
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -5299,7 +5301,8 @@ type IndexedExpr1 = struct {
 	FiIdxCur       int32
 	FiIdxCol       int32
 	FbMaybeNullRow U8
-	F__ccgo_pad1   [3]byte
+	Faff           U8
+	F__ccgo_pad1   [2]byte
 	FpIENext       uintptr
 }
 
@@ -5941,17 +5944,18 @@ type Pager = Pager1
 
 // Handle type for pages.
 type PgHdr2 = struct {
-	FpPage      uintptr
-	FpData      uintptr
-	FpExtra     uintptr
-	FpCache     uintptr
-	FpDirty     uintptr
-	FpPager     uintptr
-	Fpgno       Pgno
-	Fflags      U16
-	FnRef       I16
-	FpDirtyNext uintptr
-	FpDirtyPrev uintptr
+	FpPage       uintptr
+	FpData       uintptr
+	FpExtra      uintptr
+	FpCache      uintptr
+	FpDirty      uintptr
+	FpPager      uintptr
+	Fpgno        Pgno
+	Fflags       U16
+	F__ccgo_pad1 [2]byte
+	FnRef        I64
+	FpDirtyNext  uintptr
+	FpDirtyPrev  uintptr
 }
 
 // Handle type for pages.
@@ -6172,14 +6176,14 @@ type PCache2 = struct {
 	FpDirty      uintptr
 	FpDirtyTail  uintptr
 	FpSynced     uintptr
-	FnRefSum     int32
+	FnRefSum     I64
 	FszCache     int32
 	FszSpill     int32
 	FszPage      int32
 	FszExtra     int32
 	FbPurgeable  U8
 	FeCreate     U8
-	F__ccgo_pad1 [2]byte
+	F__ccgo_pad1 [6]byte
 	FxStress     uintptr
 	FpStress     uintptr
 	FpCache      uintptr
@@ -6438,7 +6442,7 @@ type CoveringIndexCheck1 = struct {
 	F__ccgo_pad1 [2]byte
 }
 
-var sqlite3azCompileOpt = [52]uintptr{
+var sqlite3azCompileOpt = [53]uintptr{
 	ts + 7,
 	ts + 27,
 	ts + 49,
@@ -6457,40 +6461,41 @@ var sqlite3azCompileOpt = [52]uintptr{
 	ts + 365,
 	ts + 390,
 	ts + 413,
-	ts + 425,
-	ts + 440,
-	ts + 462,
-	ts + 487,
-	ts + 510,
-	ts + 532,
-	ts + 543,
-	ts + 556,
-	ts + 571,
-	ts + 587,
-	ts + 600,
-	ts + 621,
-	ts + 645,
-	ts + 668,
-	ts + 684,
-	ts + 700,
-	ts + 724,
-	ts + 751,
-	ts + 771,
-	ts + 792,
-	ts + 814,
-	ts + 844,
-	ts + 869,
-	ts + 895,
-	ts + 915,
-	ts + 941,
-	ts + 964,
-	ts + 990,
-	ts + 1012,
-	ts + 1033,
-	ts + 1044,
+	ts + 432,
+	ts + 444,
+	ts + 459,
+	ts + 481,
+	ts + 506,
+	ts + 529,
+	ts + 551,
+	ts + 562,
+	ts + 575,
+	ts + 590,
+	ts + 606,
+	ts + 619,
+	ts + 640,
+	ts + 664,
+	ts + 687,
+	ts + 703,
+	ts + 719,
+	ts + 743,
+	ts + 770,
+	ts + 790,
+	ts + 811,
+	ts + 833,
+	ts + 863,
+	ts + 888,
+	ts + 914,
+	ts + 934,
+	ts + 960,
+	ts + 983,
+	ts + 1009,
+	ts + 1031,
 	ts + 1052,
-	ts + 1066,
-	ts + 1079,
+	ts + 1063,
+	ts + 1071,
+	ts + 1085,
+	ts + 1098,
 }
 
 func Xsqlite3CompileOptions(tls *libc.TLS, pnOpt uintptr) uintptr {
@@ -6642,7 +6647,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 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))
+var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1111))
 
 // Standard typenames.  These names must match the COLTYPE_* definitions.
 // Adjust the SQLITE_N_STDTYPE value if adding or removing entries.
@@ -6664,12 +6669,12 @@ var Xsqlite3StdTypeAffinity = [6]int8{
 	int8(SQLITE_AFF_TEXT),
 }
 var Xsqlite3StdType = [6]uintptr{
-	ts + 1099,
-	ts + 1103,
-	ts + 1108,
-	ts + 1112,
-	ts + 1120,
-	ts + 1125,
+	ts + 1118,
+	ts + 1122,
+	ts + 1127,
+	ts + 1131,
+	ts + 1139,
+	ts + 1144,
 }
 
 // SQL is translated into a sequence of instructions to be
@@ -6986,7 +6991,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, 23229)
+		return Xsqlite3MisuseError(tls, 23233)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -7390,7 +7395,7 @@ __6:
 __4:
 	;
 	zDate++
-	if !(getDigits(tls, zDate, ts+1130, libc.VaList(bp, bp+16, bp+20)) != 2) {
+	if !(getDigits(tls, zDate, ts+1149, libc.VaList(bp, bp+16, bp+20)) != 2) {
 		goto __9
 	}
 	return 1
@@ -7416,13 +7421,13 @@ func parseHhMmSs(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	defer tls.Free(36)
 
 	var ms float64 = 0.0
-	if getDigits(tls, zDate, ts+1138, libc.VaList(bp, bp+24, bp+28)) != 2 {
+	if getDigits(tls, zDate, ts+1157, libc.VaList(bp, bp+24, bp+28)) != 2 {
 		return 1
 	}
 	zDate += uintptr(5)
 	if int32(*(*int8)(unsafe.Pointer(zDate))) == ':' {
 		zDate++
-		if getDigits(tls, zDate, ts+1146, libc.VaList(bp+16, bp+32)) != 1 {
+		if getDigits(tls, zDate, ts+1165, libc.VaList(bp+16, bp+32)) != 1 {
 			return 1
 		}
 		zDate += uintptr(2)
@@ -7520,7 +7525,7 @@ func parseYyyyMmDd(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	} else {
 		neg = 0
 	}
-	if getDigits(tls, zDate, ts+1150, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
+	if getDigits(tls, zDate, ts+1169, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
 		return 1
 	}
 	zDate += uintptr(10)
@@ -7577,7 +7582,7 @@ func parseDateOrTime(tls *libc.TLS, context uintptr, zDate uintptr, p uintptr) i
 		return 0
 	} else if parseHhMmSs(tls, zDate, p) == 0 {
 		return 0
-	} else if Xsqlite3StrICmp(tls, zDate, ts+1162) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
+	} else if Xsqlite3StrICmp(tls, zDate, ts+1181) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
 		return setDateTimeToCurrent(tls, context, p)
 	} else if Xsqlite3AtoF(tls, zDate, bp, Xsqlite3Strlen30(tls, zDate), uint8(SQLITE_UTF8)) > 0 {
 		setRawDateNumber(tls, p, *(*float64)(unsafe.Pointer(bp)))
@@ -7710,7 +7715,7 @@ func toLocaltime(tls *libc.TLS, p uintptr, pCtx uintptr) int32 {
 		*(*Time_t)(unsafe.Pointer(bp + 104)) = (*DateTime)(unsafe.Pointer(p)).FiJD/int64(1000) - int64(21086676)*int64(10000)
 	}
 	if osLocaltime(tls, bp+104, bp) != 0 {
-		Xsqlite3_result_error(tls, pCtx, ts+1166, -1)
+		Xsqlite3_result_error(tls, pCtx, ts+1185, -1)
 		return SQLITE_ERROR
 	}
 	(*DateTime)(unsafe.Pointer(p)).FY = (*tm)(unsafe.Pointer(bp)).Ftm_year + 1900 - iYearDiff
@@ -7734,12 +7739,12 @@ var aXformType = [6]struct {
 	FrLimit float32
 	FrXform float32
 }{
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1189)), FrLimit: 4.6427e+14, FrXform: 1.0},
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1196)), FrLimit: 7.7379e+12, FrXform: 60.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1203)), FrLimit: 1.2897e+11, FrXform: 3600.0},
-	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1210)), FrLimit: 5373485.0, FrXform: 86400.0},
-	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1217)), FrLimit: 176546.0, FrXform: 2592000.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1224)), FrLimit: 14713.0, FrXform: 31536000.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1208)), FrLimit: 4.6427e+14, FrXform: 1.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1215)), FrLimit: 7.7379e+12, FrXform: 60.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1222)), FrLimit: 1.2897e+11, FrXform: 3600.0},
+	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1229)), FrLimit: 5373485.0, FrXform: 86400.0},
+	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1236)), FrLimit: 176546.0, FrXform: 2592000.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1243)), FrLimit: 14713.0, FrXform: 31536000.0},
 }
 
 func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, idx int32) int32 {
@@ -7751,7 +7756,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 	switch int32(Xsqlite3UpperToLower[U8(*(*int8)(unsafe.Pointer(z)))]) {
 	case 'a':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1231) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1250) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -7773,7 +7778,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'j':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1236) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1255) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -7787,7 +7792,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'l':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1246) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1265) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				rc = toLocaltime(tls, p, pCtx)
 			}
 			break
@@ -7795,7 +7800,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'u':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1256) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1275) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -7807,7 +7812,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 					rc = 0
 				}
-			} else if Xsqlite3_stricmp(tls, z, ts+1266) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1285) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				if int32((*DateTime)(unsafe.Pointer(p)).FtzSet) == 0 {
 					var iOrigJD I64
 					var iGuess I64
@@ -7841,7 +7846,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'w':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1270, 8) == 0 &&
+			if Xsqlite3_strnicmp(tls, z, ts+1289, 8) == 0 &&
 				Xsqlite3AtoF(tls, z+8, bp+48, Xsqlite3Strlen30(tls, z+8), uint8(SQLITE_UTF8)) > 0 &&
 				*(*float64)(unsafe.Pointer(bp + 48)) >= 0.0 && *(*float64)(unsafe.Pointer(bp + 48)) < 7.0 && float64(libc.AssignInt32(&n, int32(*(*float64)(unsafe.Pointer(bp + 48))))) == *(*float64)(unsafe.Pointer(bp + 48)) {
 				var Z Sqlite3_int64
@@ -7862,7 +7867,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 's':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1279, 9) != 0 {
+			if Xsqlite3_strnicmp(tls, z, ts+1298, 9) != 0 {
 				break
 			}
 			if !(int32((*DateTime)(unsafe.Pointer(p)).FvalidJD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidYMD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidHMS) != 0) {
@@ -7876,14 +7881,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 			(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidTZ = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidJD = int8(0)
-			if Xsqlite3_stricmp(tls, z, ts+1289) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1308) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1295) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1314) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FM = 1
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1300) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1319) == 0 {
 				rc = 0
 			}
 			break
@@ -8209,7 +8214,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		switch int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) {
 		case 'd':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
 				break
 
 			}
@@ -8219,13 +8224,13 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if s > 59.999 {
 					s = 59.999
 				}
-				Xsqlite3_str_appendf(tls, bp+136, ts+1309, libc.VaList(bp+8, s))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1328, libc.VaList(bp+8, s))
 				break
 
 			}
 		case 'H':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
 				break
 
 			}
@@ -8243,41 +8248,41 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) == 'W' {
 					var wd int32
 					wd = int32(((*DateTime)(unsafe.Pointer(bp+88)).FiJD + int64(43200000)) / int64(86400000) % int64(7))
-					Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+24, (nDay+7-wd)/7))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+24, (nDay+7-wd)/7))
 				} else {
-					Xsqlite3_str_appendf(tls, bp+136, ts+1316, libc.VaList(bp+32, nDay+1))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1335, libc.VaList(bp+32, nDay+1))
 				}
 				break
 
 			}
 		case 'J':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1321, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1340, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
 				break
 
 			}
 		case 'm':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
 				break
 
 			}
 		case 'M':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
 				break
 
 			}
 		case 's':
 			{
 				var iS I64 = (*DateTime)(unsafe.Pointer(bp+88)).FiJD/int64(1000) - int64(21086676)*int64(10000)
-				Xsqlite3_str_appendf(tls, bp+136, ts+1327, libc.VaList(bp+64, iS))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1346, libc.VaList(bp+64, iS))
 				break
 
 			}
 		case 'S':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
 				break
 
 			}
@@ -8290,7 +8295,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			}
 		case 'Y':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1332, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1351, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
 				break
 
 			}
@@ -8340,15 +8345,15 @@ func Xsqlite3RegisterDateTimeFunctions(tls *libc.TLS) {
 }
 
 var aDateTimeFuncs = [9]FuncDef{
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1236},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1256},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1337},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1342},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1347},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1255},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1275},
 	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1356},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1365},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1378},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1396}}
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1361},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1366},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1375},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1384},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1397},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1415}}
 
 // The following routines are convenience wrappers around methods
 // of the sqlite3_file object.  This is mostly just syntactic sugar. All
@@ -8763,7 +8768,7 @@ func sqlite3MemMalloc(tls *libc.TLS, nByte int32) uintptr {
 		*(*Sqlite3_int64)(unsafe.Pointer(p)) = Sqlite3_int64(nByte)
 		p += 8
 	} else {
-		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1409, libc.VaList(bp, nByte))
+		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1428, libc.VaList(bp, nByte))
 	}
 	return p
 }
@@ -8796,7 +8801,7 @@ func sqlite3MemRealloc(tls *libc.TLS, pPrior uintptr, nByte int32) uintptr {
 		p += 8
 	} else {
 		Xsqlite3_log(tls, SQLITE_NOMEM,
-			ts+1447,
+			ts+1466,
 			libc.VaList(bp, sqlite3MemSize(tls, pPrior), nByte))
 	}
 	return p
@@ -9672,7 +9677,7 @@ func Xsqlite3OomFault(tls *libc.TLS, db uintptr) uintptr {
 		(*Sqlite3)(unsafe.Pointer(db)).Flookaside.Fsz = U16(0)
 		if (*Sqlite3)(unsafe.Pointer(db)).FpParse != 0 {
 			var pParse uintptr
-			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1483, 0)
+			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1502, 0)
 			(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 			for pParse = (*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).FpOuterParse; pParse != 0; pParse = (*Parse)(unsafe.Pointer(pParse)).FpOuterParse {
 				(*Parse)(unsafe.Pointer(pParse)).FnErr++
@@ -9745,8 +9750,8 @@ type et_info = struct {
 // by an instance of the following structure
 type Et_info = et_info
 
-var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1497))
-var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1530))
+var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1516))
+var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1549))
 var fmtinfo = [23]Et_info{
 	{Ffmttype: int8('d'), Fbase: EtByte(10), Fflags: EtByte(1), Ftype: EtByte(EtDECIMAL)},
 	{Ffmttype: int8('s'), Fflags: EtByte(4), Ftype: EtByte(EtSTRING)},
@@ -9960,7 +9965,7 @@ __6:
 	if !(libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(libc.PreIncUintptr(&fmt, 1))))) == 0) {
 		goto __11
 	}
-	Xsqlite3_str_append(tls, pAccum, ts+1537, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1556, 1)
 	goto __5
 __11:
 	;
@@ -10521,7 +10526,7 @@ __125:
 	if !(Xsqlite3IsNaN(tls, *(*float64)(unsafe.Pointer(bp + 104))) != 0) {
 		goto __127
 	}
-	bufpt = ts + 1539
+	bufpt = ts + 1558
 	length = 3
 	goto __58
 __127:
@@ -10581,7 +10586,7 @@ __138:
 	}
 	bufpt = bp + 16
 	*(*int8)(unsafe.Pointer(bp + 16)) = prefix
-	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1543, uint64(4))
+	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1562, uint64(4))
 	length = 3 + libc.Bool32(int32(prefix) != 0)
 	goto __58
 __139:
@@ -10947,7 +10952,7 @@ __200:
 	if !(bufpt == uintptr(0)) {
 		goto __201
 	}
-	bufpt = ts + 1547
+	bufpt = ts + 1566
 	goto __202
 __201:
 	if !(int32(xtype) == EtDYNSTRING) {
@@ -11071,9 +11076,9 @@ __222:
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
-			return ts + 1548
+			return ts + 1567
 		}
-		return ts + 1553
+		return ts + 1572
 	}()
 __223:
 	;
@@ -11221,7 +11226,7 @@ __246:
 		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
-	Xsqlite3_str_append(tls, pAccum, ts+1560, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1579, 1)
 __250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
@@ -11238,10 +11243,10 @@ __251:
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
 		goto __253
 	}
-	Xsqlite3_str_appendf(tls, pAccum, ts+1562, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1581, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 	goto __254
 __253:
-	Xsqlite3_str_appendf(tls, pAccum, ts+1572, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1591, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
 __254:
 	;
 __252:
@@ -11296,7 +11301,7 @@ __4:
 __5:
 }
 
-var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1586))
+var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1605))
 
 // The z string points to the first character of a token that is
 // associated with an error.  If db does not already have an error
@@ -11461,7 +11466,7 @@ func Xsqlite3ResultStrAccum(tls *libc.TLS, pCtx uintptr, p uintptr) {
 	} else if int32((*StrAccum)(unsafe.Pointer(p)).FprintfFlags)&SQLITE_PRINTF_MALLOCED != 0 {
 		Xsqlite3_result_text(tls, pCtx, (*StrAccum)(unsafe.Pointer(p)).FzText, int32((*StrAccum)(unsafe.Pointer(p)).FnChar), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 	} else {
-		Xsqlite3_result_text(tls, pCtx, ts+1547, 0, uintptr(0))
+		Xsqlite3_result_text(tls, pCtx, ts+1566, 0, uintptr(0))
 		Xsqlite3_str_reset(tls, p)
 	}
 }
@@ -13191,7 +13196,7 @@ func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
 	var c int32 = 0
 	var i int32
 
-	var pow63 uintptr = ts + 1595
+	var pow63 uintptr = ts + 1614
 	for i = 0; c == 0 && i < 18; i++ {
 		c = (int32(*(*int8)(unsafe.Pointer(zNum + uintptr(i*incr)))) - int32(*(*int8)(unsafe.Pointer(pow63 + uintptr(i))))) * 10
 	}
@@ -13737,7 +13742,7 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 	defer tls.Free(8)
 
 	Xsqlite3_log(tls, SQLITE_MISUSE,
-		ts+1614,
+		ts+1633,
 		libc.VaList(bp, zType))
 }
 
@@ -13756,13 +13761,13 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 func Xsqlite3SafetyCheckOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	if db == uintptr(0) {
-		logBadConnection(tls, ts+1548)
+		logBadConnection(tls, ts+1567)
 		return 0
 	}
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_OPEN {
 		if Xsqlite3SafetyCheckSickOrOk(tls, db) != 0 {
-			logBadConnection(tls, ts+1659)
+			logBadConnection(tls, ts+1678)
 		}
 		return 0
 	} else {
@@ -13775,7 +13780,7 @@ func Xsqlite3SafetyCheckSickOrOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_SICK && int32(eOpenState) != SQLITE_STATE_OPEN && int32(eOpenState) != SQLITE_STATE_BUSY {
-		logBadConnection(tls, ts+1668)
+		logBadConnection(tls, ts+1687)
 		return 0
 	} else {
 		return 1
@@ -14301,193 +14306,193 @@ func Xsqlite3OpcodeName(tls *libc.TLS, i int32) uintptr {
 }
 
 var azName = [187]uintptr{
-	ts + 1676,
-	ts + 1686,
-	ts + 1697,
-	ts + 1709,
-	ts + 1720,
-	ts + 1732,
+	ts + 1695,
+	ts + 1705,
+	ts + 1716,
+	ts + 1728,
 	ts + 1739,
-	ts + 1747,
-	ts + 1755,
-	ts + 1760,
-	ts + 1765,
-	ts + 1771,
-	ts + 1785,
-	ts + 1791,
-	ts + 1801,
-	ts + 1806,
-	ts + 1811,
-	ts + 1814,
+	ts + 1751,
+	ts + 1758,
+	ts + 1766,
+	ts + 1774,
+	ts + 1779,
+	ts + 1784,
+	ts + 1790,
+	ts + 1804,
+	ts + 1810,
 	ts + 1820,
-	ts + 1827,
-	ts + 1831,
-	ts + 1841,
-	ts + 1848,
-	ts + 1855,
-	ts + 1862,
-	ts + 1869,
-	ts + 1879,
+	ts + 1825,
+	ts + 1830,
+	ts + 1833,
+	ts + 1839,
+	ts + 1846,
+	ts + 1850,
+	ts + 1860,
+	ts + 1867,
+	ts + 1874,
+	ts + 1881,
 	ts + 1888,
-	ts + 1899,
-	ts + 1908,
-	ts + 1914,
-	ts + 1924,
-	ts + 1934,
-	ts + 1939,
-	ts + 1949,
-	ts + 1960,
-	ts + 1965,
-	ts + 1972,
-	ts + 1983,
-	ts + 1988,
-	ts + 1993,
-	ts + 1999,
-	ts + 2005,
-	ts + 2011,
-	ts + 2014,
+	ts + 1898,
+	ts + 1907,
+	ts + 1918,
+	ts + 1927,
+	ts + 1933,
+	ts + 1943,
+	ts + 1953,
+	ts + 1958,
+	ts + 1968,
+	ts + 1979,
+	ts + 1984,
+	ts + 1991,
+	ts + 2002,
+	ts + 2007,
+	ts + 2012,
 	ts + 2018,
 	ts + 2024,
-	ts + 2035,
-	ts + 2046,
+	ts + 2030,
+	ts + 2033,
+	ts + 2037,
+	ts + 2043,
 	ts + 2054,
-	ts + 2063,
-	ts + 2070,
-	ts + 2078,
-	ts + 2081,
-	ts + 2084,
-	ts + 2087,
-	ts + 2090,
-	ts + 2093,
-	ts + 2096,
+	ts + 2065,
+	ts + 2073,
+	ts + 2082,
+	ts + 2089,
+	ts + 2097,
+	ts + 2100,
 	ts + 2103,
+	ts + 2106,
 	ts + 2109,
-	ts + 2119,
-	ts + 2132,
-	ts + 2143,
-	ts + 2149,
-	ts + 2156,
-	ts + 2165,
-	ts + 2174,
-	ts + 2181,
-	ts + 2194,
-	ts + 2205,
-	ts + 2210,
-	ts + 2218,
+	ts + 2112,
+	ts + 2115,
+	ts + 2122,
+	ts + 2128,
+	ts + 2138,
+	ts + 2151,
+	ts + 2162,
+	ts + 2168,
+	ts + 2175,
+	ts + 2184,
+	ts + 2193,
+	ts + 2200,
+	ts + 2213,
 	ts + 2224,
-	ts + 2231,
+	ts + 2229,
+	ts + 2237,
 	ts + 2243,
-	ts + 2248,
-	ts + 2257,
+	ts + 2250,
 	ts + 2262,
-	ts + 2271,
+	ts + 2267,
 	ts + 2276,
 	ts + 2281,
-	ts + 2287,
+	ts + 2290,
 	ts + 2295,
-	ts + 2303,
-	ts + 2313,
-	ts + 2321,
-	ts + 2328,
-	ts + 2341,
-	ts + 2346,
-	ts + 2358,
-	ts + 2366,
-	ts + 2373,
-	ts + 2384,
-	ts + 2391,
-	ts + 2398,
-	ts + 2408,
+	ts + 2300,
+	ts + 2306,
+	ts + 2314,
+	ts + 2322,
+	ts + 2332,
+	ts + 2340,
+	ts + 2347,
+	ts + 2360,
+	ts + 2365,
+	ts + 2377,
+	ts + 2385,
+	ts + 2392,
+	ts + 2403,
+	ts + 2410,
 	ts + 2417,
-	ts + 2428,
-	ts + 2434,
-	ts + 2445,
-	ts + 2455,
-	ts + 2465,
-	ts + 2472,
-	ts + 2478,
-	ts + 2488,
-	ts + 2499,
-	ts + 2503,
-	ts + 2512,
-	ts + 2521,
-	ts + 2528,
-	ts + 2538,
-	ts + 2545,
-	ts + 2554,
+	ts + 2427,
+	ts + 2436,
+	ts + 2447,
+	ts + 2453,
+	ts + 2464,
+	ts + 2474,
+	ts + 2484,
+	ts + 2491,
+	ts + 2497,
+	ts + 2507,
+	ts + 2518,
+	ts + 2522,
+	ts + 2531,
+	ts + 2540,
+	ts + 2547,
+	ts + 2557,
 	ts + 2564,
-	ts + 2571,
-	ts + 2579,
-	ts + 2593,
-	ts + 2601,
-	ts + 2615,
-	ts + 2626,
-	ts + 2639,
-	ts + 2650,
-	ts + 2656,
-	ts + 2668,
-	ts + 2677,
-	ts + 2685,
-	ts + 2694,
-	ts + 2703,
-	ts + 2710,
-	ts + 2718,
-	ts + 2725,
-	ts + 2736,
-	ts + 2750,
-	ts + 2761,
+	ts + 2573,
+	ts + 2583,
+	ts + 2590,
+	ts + 2598,
+	ts + 2612,
+	ts + 2620,
+	ts + 2634,
+	ts + 2645,
+	ts + 2658,
+	ts + 2669,
+	ts + 2675,
+	ts + 2687,
+	ts + 2696,
+	ts + 2704,
+	ts + 2713,
+	ts + 2722,
+	ts + 2729,
+	ts + 2737,
+	ts + 2744,
+	ts + 2755,
 	ts + 2769,
-	ts + 2775,
-	ts + 2783,
-	ts + 2791,
-	ts + 2801,
-	ts + 2814,
-	ts + 2824,
-	ts + 2837,
-	ts + 2846,
-	ts + 2857,
+	ts + 2780,
+	ts + 2788,
+	ts + 2794,
+	ts + 2802,
+	ts + 2810,
+	ts + 2820,
+	ts + 2833,
+	ts + 2843,
+	ts + 2856,
 	ts + 2865,
-	ts + 2871,
-	ts + 2883,
-	ts + 2895,
-	ts + 2903,
-	ts + 2915,
-	ts + 2928,
-	ts + 2938,
-	ts + 2948,
-	ts + 2953,
-	ts + 2965,
-	ts + 2977,
-	ts + 2987,
-	ts + 2993,
-	ts + 3003,
-	ts + 3010,
+	ts + 2876,
+	ts + 2884,
+	ts + 2890,
+	ts + 2902,
+	ts + 2914,
+	ts + 2922,
+	ts + 2934,
+	ts + 2947,
+	ts + 2957,
+	ts + 2967,
+	ts + 2972,
+	ts + 2984,
+	ts + 2996,
+	ts + 3006,
+	ts + 3012,
 	ts + 3022,
-	ts + 3033,
+	ts + 3029,
 	ts + 3041,
-	ts + 3050,
-	ts + 3059,
-	ts + 3068,
-	ts + 3075,
-	ts + 3086,
-	ts + 3099,
-	ts + 3109,
-	ts + 3116,
-	ts + 3124,
-	ts + 3133,
-	ts + 3139,
-	ts + 3147,
-	ts + 3155,
-	ts + 3163,
-	ts + 3173,
+	ts + 3052,
+	ts + 3060,
+	ts + 3069,
+	ts + 3078,
+	ts + 3087,
+	ts + 3094,
+	ts + 3105,
+	ts + 3118,
+	ts + 3128,
+	ts + 3135,
+	ts + 3143,
+	ts + 3152,
+	ts + 3158,
+	ts + 3166,
+	ts + 3174,
 	ts + 3182,
-	ts + 3193,
-	ts + 3203,
-	ts + 3209,
-	ts + 3220,
-	ts + 3231,
-	ts + 3236,
-	ts + 3244,
+	ts + 3192,
+	ts + 3201,
+	ts + 3212,
+	ts + 3222,
+	ts + 3228,
+	ts + 3239,
+	ts + 3250,
+	ts + 3255,
+	ts + 3263,
 }
 
 type pthread_once = struct {
@@ -14667,45 +14672,62 @@ type bintime = struct {
 	Ffrac Uint64_t
 }
 
-func sbttons(tls *libc.TLS, _sbt Sbintime_t) Int64_t {
-	var ns Uint64_t
+func __stime64_scale32_ceil(tls *libc.TLS, x Int64_t, factor Int32_t, divisor Int32_t) Int64_t {
+	var rem Int64_t = x % Int64_t(divisor)
 
-	ns = Uint64_t(_sbt)
-	if ns >= uint64(int64(1)<<32) {
-		ns = ns >> 32 * uint64(1000000000)
-	} else {
-		ns = uint64(0)
-	}
-
-	return Int64_t(ns + Uint64_t(int64(1000000000)*(_sbt&int64(0xffffffff))>>32))
+	return x/Int64_t(divisor)*Int64_t(factor) + (rem*Int64_t(factor)+Int64_t(divisor)-int64(1))/Int64_t(divisor)
 }
 
-func nstosbt(tls *libc.TLS, _ns Int64_t) Sbintime_t {
-	var sb Sbintime_t = int64(0)
+func __stime64_scale32_floor(tls *libc.TLS, x Int64_t, factor Int32_t, divisor Int32_t) Int64_t {
+	var rem Int64_t = x % Int64_t(divisor)
 
-	if _ns >= int64(1000000000) {
-		sb = _ns / int64(1000000000) * (int64(1) << 32)
-		_ns = _ns % int64(1000000000)
-	}
-
-	sb = Sbintime_t(uint64(sb) + (uint64(_ns)*9223372037+uint64(0x7fffffff))>>31)
-	return sb
+	return x/Int64_t(divisor)*Int64_t(factor) + rem*Int64_t(factor)/Int64_t(divisor)
 }
 
-func sbttous(tls *libc.TLS, _sbt Sbintime_t) Int64_t {
-	return int64(1000000) * _sbt >> 32
+func __utime64_scale32_ceil(tls *libc.TLS, x Uint64_t, factor Uint32_t, divisor Uint32_t) Uint64_t {
+	var rem Uint64_t = x % Uint64_t(divisor)
+
+	return x/Uint64_t(divisor)*Uint64_t(factor) + (rem*Uint64_t(factor)+Uint64_t(divisor)-uint64(1))/Uint64_t(divisor)
 }
 
-func ustosbt(tls *libc.TLS, _us Int64_t) Sbintime_t {
-	var sb Sbintime_t = int64(0)
+func __utime64_scale32_floor(tls *libc.TLS, x Uint64_t, factor Uint32_t, divisor Uint32_t) Uint64_t {
+	var rem Uint64_t = x % Uint64_t(divisor)
 
-	if _us >= int64(1000000) {
-		sb = _us / int64(1000000) * (int64(1) << 32)
-		_us = _us % int64(1000000)
-	}
+	return x/Uint64_t(divisor)*Uint64_t(factor) + rem*Uint64_t(factor)/Uint64_t(divisor)
+}
 
-	sb = Sbintime_t(uint64(sb) + (uint64(_us)*9223372036855+uint64(0x7fffffff))>>31)
-	return sb
+func __stime64_scale64_ceil(tls *libc.TLS, x Int64_t, factor Int64_t, divisor Int64_t) Int64_t {
+	var gcd Int64_t = ^factor&(factor-int64(1)) & ^divisor & (divisor-int64(1)) + int64(1)
+
+	return __stime64_scale32_ceil(tls, x, int32(factor/gcd), int32(divisor/gcd))
+}
+
+func __stime64_scale64_floor(tls *libc.TLS, x Int64_t, factor Int64_t, divisor Int64_t) Int64_t {
+	var gcd Int64_t = ^factor&(factor-int64(1)) & ^divisor & (divisor-int64(1)) + int64(1)
+
+	return __stime64_scale32_floor(tls, x, int32(factor/gcd), int32(divisor/gcd))
+}
+
+func __utime64_scale64_floor(tls *libc.TLS, x Uint64_t, factor Uint64_t, divisor Uint64_t) Uint64_t {
+	var gcd Uint64_t = ^factor&(factor-uint64(1)) & ^divisor & (divisor-uint64(1)) + uint64(1)
+
+	return __utime64_scale32_floor(tls, x, uint32(factor/gcd), uint32(divisor/gcd))
+}
+
+func sbttons(tls *libc.TLS, sbt Sbintime_t) Int64_t {
+	return __stime64_scale64_floor(tls, sbt, int64(1000000000), int64(1)<<32)
+}
+
+func nstosbt(tls *libc.TLS, ns Int64_t) Sbintime_t {
+	return __stime64_scale64_ceil(tls, ns, int64(1)<<32, int64(1000000000))
+}
+
+func sbttous(tls *libc.TLS, sbt Sbintime_t) Int64_t {
+	return __stime64_scale64_floor(tls, sbt, int64(1000000), int64(1)<<32)
+}
+
+func ustosbt(tls *libc.TLS, us Int64_t) Sbintime_t {
+	return __stime64_scale64_ceil(tls, us, int64(1)<<32, int64(1000000))
 }
 
 type itimerval = struct {
@@ -14914,35 +14936,35 @@ type unix_syscall = struct {
 }
 
 var aSyscall = [29]unix_syscall{
-	{FzName: ts + 3254, FpCurrent: 0},
-	{FzName: ts + 3259, FpCurrent: 0},
-	{FzName: ts + 3265, FpCurrent: 0},
-	{FzName: ts + 3272, FpCurrent: 0},
-	{FzName: ts + 3279, FpCurrent: 0},
+	{FzName: ts + 3273, FpCurrent: 0},
+	{FzName: ts + 3278, FpCurrent: 0},
 	{FzName: ts + 3284, FpCurrent: 0},
-	{FzName: ts + 3290, FpCurrent: 0},
-	{FzName: ts + 3300, FpCurrent: 0},
-	{FzName: ts + 3306, FpCurrent: 0},
-	{FzName: ts + 3311},
-	{FzName: ts + 3317},
+	{FzName: ts + 3291, FpCurrent: 0},
+	{FzName: ts + 3298, FpCurrent: 0},
+	{FzName: ts + 3303, FpCurrent: 0},
+	{FzName: ts + 3309, FpCurrent: 0},
+	{FzName: ts + 3319, FpCurrent: 0},
 	{FzName: ts + 3325, FpCurrent: 0},
-	{FzName: ts + 3331},
-	{FzName: ts + 3338},
-	{FzName: ts + 3347, FpCurrent: 0},
-	{FzName: ts + 3354},
-	{FzName: ts + 3364, FpCurrent: 0},
-	{FzName: ts + 3371, FpCurrent: 0},
-	{FzName: ts + 3385, FpCurrent: 0},
-	{FzName: ts + 3391, FpCurrent: 0},
-	{FzName: ts + 3397, FpCurrent: 0},
+	{FzName: ts + 3330},
+	{FzName: ts + 3336},
+	{FzName: ts + 3344, FpCurrent: 0},
+	{FzName: ts + 3350},
+	{FzName: ts + 3357},
+	{FzName: ts + 3366, FpCurrent: 0},
+	{FzName: ts + 3373},
+	{FzName: ts + 3383, FpCurrent: 0},
+	{FzName: ts + 3390, FpCurrent: 0},
 	{FzName: ts + 3404, FpCurrent: 0},
-	{FzName: ts + 3412, FpCurrent: 0},
-	{FzName: ts + 3417, FpCurrent: 0},
-	{FzName: ts + 3424},
+	{FzName: ts + 3410, FpCurrent: 0},
+	{FzName: ts + 3416, FpCurrent: 0},
+	{FzName: ts + 3423, FpCurrent: 0},
 	{FzName: ts + 3431, FpCurrent: 0},
-	{FzName: ts + 3443, FpCurrent: 0},
-	{FzName: ts + 3452, FpCurrent: 0},
-	{FzName: ts + 3458},
+	{FzName: ts + 3436, FpCurrent: 0},
+	{FzName: ts + 3443},
+	{FzName: ts + 3450, FpCurrent: 0},
+	{FzName: ts + 3462, FpCurrent: 0},
+	{FzName: ts + 3471, FpCurrent: 0},
+	{FzName: ts + 3477},
 }
 
 func robustFchown(tls *libc.TLS, fd int32, uid Uid_t, gid Gid_t) int32 {
@@ -15040,9 +15062,9 @@ func robust_open(tls *libc.TLS, z uintptr, f int32, m Mode_t) int32 {
 		}
 		(*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, fd)
 		Xsqlite3_log(tls, SQLITE_WARNING,
-			ts+3464, libc.VaList(bp, z, fd))
+			ts+3483, libc.VaList(bp, z, fd))
 		fd = -1
-		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3507, O_RDONLY, int32(m)) < 0 {
+		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3526, O_RDONLY, int32(m)) < 0 {
 			break
 		}
 	}
@@ -15121,13 +15143,13 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 	var zErr uintptr
 	var iErrno int32 = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 
-	zErr = ts + 1547
+	zErr = ts + 1566
 
 	if zPath == uintptr(0) {
-		zPath = ts + 1547
+		zPath = ts + 1566
 	}
 	Xsqlite3_log(tls, errcode,
-		ts+3517,
+		ts+3536,
 		libc.VaList(bp, iLine, iErrno, zFunc, zPath, zErr))
 
 	return errcode
@@ -15135,7 +15157,7 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 
 func robust_close(tls *libc.TLS, pFile uintptr, h int32, lineno int32) {
 	if (*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, h) != 0 {
-		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3259,
+		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3278,
 			func() uintptr {
 				if pFile != 0 {
 					return (*UnixFile)(unsafe.Pointer(pFile)).FzPath
@@ -15156,7 +15178,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, 38271)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38275)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -15258,19 +15280,19 @@ func verifyDbFile(tls *libc.TLS, pFile uintptr) {
 
 	rc = (*(*func(*libc.TLS, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 5*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, bp+32)
 	if rc != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3548, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3567, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink == uint64(0) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3572, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3591, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink > uint64(1) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3601, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3620, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if fileHasMoved(tls, pFile) != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3628, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3647, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 }
@@ -15633,7 +15655,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, 39055)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39059)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -15906,7 +15928,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	var ii int32
 	var fd int32 = -1
 
-	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3656, libc.VaList(bp, zFilename))
+	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3675, libc.VaList(bp, zFilename))
 	for ii = int32(libc.Xstrlen(tls, bp+8)); ii > 0 && int32(*(*int8)(unsafe.Pointer(bp + 8 + uintptr(ii)))) != '/'; ii-- {
 	}
 	if ii > 0 {
@@ -15924,7 +15946,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3371, bp+8, 40676)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40680), ts+3390, bp+8, 40680)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -15941,14 +15963,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, 40717)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3678, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40721)
 	}
 
 	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)), 40731)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40735)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -15968,7 +15990,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, 40762)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3309, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40766)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -16023,7 +16045,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 				if iWrite >= nSize {
 					iWrite = nSize - int64(1)
 				}
-				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1547, 1)
+				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1566, 1)
 				if nWrite != 1 {
 					return SQLITE_IOERR | int32(3)<<8
 				}
@@ -16036,7 +16058,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, 40883)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3309, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40887)
 			}
 		}
 
@@ -16104,7 +16126,7 @@ func unixFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 		}
 	case SQLITE_FCNTL_VFSNAME:
 		{
-			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
+			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
 			return SQLITE_OK
 
 		}
@@ -16263,7 +16285,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, 41442)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41446)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -16291,7 +16313,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, 41499)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3309, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41503)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -16354,7 +16376,7 @@ __4:
 	;
 	libc.Xmemset(tls, pShmNode, 0, uint64(unsafe.Sizeof(unixShmNode{}))+uint64(nShmFilename))
 	zShm = libc.AssignPtrUintptr(pShmNode+16, pShmNode+1*96)
-	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3670, libc.VaList(bp, zBasePath))
+	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3689, libc.VaList(bp, zBasePath))
 
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = -1
 	(*UnixInodeInfo)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pDbFd)).FpInode)).FpShmNode = pShmNode
@@ -16375,7 +16397,7 @@ __5:
 	if !(int32((*UnixInodeInfo)(unsafe.Pointer(pInode)).FbProcessLock) == 0) {
 		goto __7
 	}
-	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3677, 0)) {
+	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3696, 0)) {
 		goto __8
 	}
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = robust_open(tls, zShm, O_RDWR|O_CREAT|O_NOFOLLOW,
@@ -16390,7 +16412,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3254, zShm, 41624)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41628), ts+3273, zShm, 41628)
 	goto shm_open_err
 __10:
 	;
@@ -16516,11 +16538,11 @@ __11:
 		goto __13
 	}
 	*(*int32)(unsafe.Pointer(bp + 224)) = 0
-	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1547, 1, bp+224) != 1) {
+	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1566, 1, bp+224) != 1) {
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3325, zFile, 41768)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3344, zFile, 41772)
 	goto shmpage_out
 __14:
 	;
@@ -16566,7 +16588,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3412, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3431, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41799)
 	goto shmpage_out
 __20:
 	;
@@ -16767,7 +16789,7 @@ func unixUnmapfile(tls *libc.TLS, pFd uintptr) {
 }
 
 func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
-	var zErr uintptr = ts + 3412
+	var zErr uintptr = ts + 3431
 	var h int32 = (*UnixFile)(unsafe.Pointer(pFd)).Fh
 	var pOrig uintptr = (*UnixFile)(unsafe.Pointer(pFd)).FpMapRegion
 	var nOrig I64 = (*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeActual
@@ -16805,7 +16827,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, 42169)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42173)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -16920,10 +16942,10 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		}
 		return uintptr(0)
 	}(),
-		ts+3690, SQLITE_POWERSAFE_OVERWRITE) != 0 {
+		ts+3709, SQLITE_POWERSAFE_OVERWRITE) != 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_PSOW)
 	}
-	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3695) == 0 {
+	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3714) == 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_EXCL)
 	}
 
@@ -16939,7 +16961,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, 42672)
+			robust_close(tls, pNew, h, 42676)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -16952,7 +16974,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		if zLockFile == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
-			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3705, libc.VaList(bp, zFilename))
+			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3724, libc.VaList(bp, zFilename))
 		}
 		(*UnixFile)(unsafe.Pointer(pNew)).FlockingContext = zLockFile
 	}
@@ -16960,7 +16982,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, 42757)
+			robust_close(tls, pNew, h, 42761)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -16973,15 +16995,15 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 var azTempDirs = [6]uintptr{
 	uintptr(0),
 	uintptr(0),
-	ts + 3713,
-	ts + 3722,
-	ts + 3731,
-	ts + 1560,
+	ts + 3732,
+	ts + 3741,
+	ts + 3750,
+	ts + 1579,
 }
 
 func unixTempFileInit(tls *libc.TLS) {
-	azTempDirs[0] = libc.Xgetenv(tls, ts+3736)
-	azTempDirs[1] = libc.Xgetenv(tls, ts+3750)
+	azTempDirs[0] = libc.Xgetenv(tls, ts+3755)
+	azTempDirs[1] = libc.Xgetenv(tls, ts+3769)
 }
 
 func unixTempFileDir(tls *libc.TLS) uintptr {
@@ -17026,7 +17048,7 @@ func unixGetTempname(tls *libc.TLS, nBuf int32, zBuf uintptr) int32 {
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U64(0))), bp+24)
 
 			*(*int8)(unsafe.Pointer(zBuf + uintptr(nBuf-2))) = int8(0)
-			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3757,
+			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3776,
 				libc.VaList(bp, zDir, *(*U64)(unsafe.Pointer(bp + 24)), 0))
 			if int32(*(*int8)(unsafe.Pointer(zBuf + uintptr(nBuf-2)))) != 0 || libc.PostIncInt32(&iLimit, 1) > 10 {
 				rc = SQLITE_ERROR
@@ -17111,7 +17133,7 @@ func findCreateFileMode(tls *libc.TLS, zPath uintptr, flags int32, pMode uintptr
 	} else if flags&SQLITE_OPEN_DELETEONCLOSE != 0 {
 		*(*Mode_t)(unsafe.Pointer(pMode)) = Mode_t(0600)
 	} else if flags&SQLITE_OPEN_URI != 0 {
-		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3774)
+		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3793)
 		if z != 0 {
 			rc = getFileMode(tls, z, pMode, pUid, pGid)
 		}
@@ -17276,7 +17298,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3254, zName, 43198)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43202), ts+3273, zName, 43202)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -17367,7 +17389,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, 43337)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3383, zPath, 43341)
 		}
 		return rc
 	}
@@ -17375,9 +17397,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, 43347)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3800, zPath, 43351)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43353)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -17441,18 +17463,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, 43443), ts+3452, zIn, 43443)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43447), ts+3471, zIn, 43447)
 			}
 		} 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, 43449)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43453)
 				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, 43454), ts+3443, zIn, 43454)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43458), ts+3462, zIn, 43458)
 				return
 			}
 			*(*int8)(unsafe.Pointer(bp + 224 + uintptr(got))) = int8(0)
@@ -17492,14 +17514,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, 43512), ts+3272, zPath, 43512)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43516), ts+3291, zPath, 43516)
 		}
 		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, 43518)
+		return Xsqlite3CantopenError(tls, 43522)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+1032)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -17553,7 +17575,7 @@ func unixDlError(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBufOut uintptr) {
 	unixEnterMutex(tls)
 	zErr = libc.Xdlerror(tls)
 	if zErr != 0 {
-		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3656, libc.VaList(bp, zErr))
+		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3675, libc.VaList(bp, zErr))
 	}
 	unixLeaveMutex(tls)
 }
@@ -17585,7 +17607,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 	{
 		var fd int32
 		var got int32
-		fd = robust_open(tls, ts+3787, O_RDONLY, uint16(0))
+		fd = robust_open(tls, ts+3806, O_RDONLY, uint16(0))
 		if fd < 0 {
 			libc.Xtime(tls, bp)
 			libc.Xmemcpy(tls, zBuf, bp, uint64(unsafe.Sizeof(Time_t(0))))
@@ -17596,7 +17618,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, 43619)
+			robust_close(tls, uintptr(0), fd, 43623)
 		}
 
 	}
@@ -17673,10 +17695,10 @@ func Xsqlite3_os_init(tls *libc.TLS) int32 {
 }
 
 var aVfs = [4]Sqlite3_vfs{
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3800, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3805, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3815, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3695, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3819, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3824, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3834, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3714, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
 }
 
 // Shutdown the operating system interface.
@@ -17731,7 +17753,7 @@ var memdb_g MemFS
 var memdb_vfs = Sqlite3_vfs{
 	FiVersion:          2,
 	FmxPathname:        1024,
-	FzName:             ts + 3828,
+	FzName:             ts + 3847,
 	FxOpen:             0,
 	FxAccess:           0,
 	FxFullPathname:     0,
@@ -17987,7 +18009,7 @@ func memdbFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int3
 	var rc int32 = SQLITE_NOTFOUND
 	memdbEnter(tls, p)
 	if op == SQLITE_FCNTL_VFSNAME {
-		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3834, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
+		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3853, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
 		rc = SQLITE_OK
 	}
 	if op == SQLITE_FCNTL_SIZE_LIMIT {
@@ -18119,7 +18141,7 @@ func memdbFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, z
 	defer tls.Free(8)
 
 	_ = pVfs
-	Xsqlite3_snprintf(tls, nOut, zOut, ts+3656, libc.VaList(bp, zPath))
+	Xsqlite3_snprintf(tls, nOut, zOut, ts+3675, libc.VaList(bp, zPath))
 	return SQLITE_OK
 }
 
@@ -18240,7 +18262,7 @@ func Xsqlite3_serialize(tls *libc.TLS, db uintptr, zSchema uintptr, piSize uintp
 		return uintptr(0)
 	}
 	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
-	zSql = Xsqlite3_mprintf(tls, ts+3849, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3868, libc.VaList(bp, zSchema))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, db, zSql, -1, bp+8, uintptr(0))
 	} else {
@@ -18313,7 +18335,7 @@ __1:
 	goto end_deserialize
 __2:
 	;
-	zSql = Xsqlite3_mprintf(tls, ts+3872, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3891, libc.VaList(bp, zSchema))
 	if !(zSql == uintptr(0)) {
 		goto __3
 	}
@@ -19029,7 +19051,7 @@ func pcacheFetchFinishWithInit(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 	libc.Xmemset(tls, pPgHdr+32, 0, uint64(unsafe.Sizeof(PgHdr{}))-uint64(uintptr(0)+32))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpPage = pPage
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpData = (*Sqlite3_pcache_page)(unsafe.Pointer(pPage)).FpBuf
-	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*72
+	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*80
 	libc.Xmemset(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0, uint64(8))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpCache = pCache
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).Fpgno = pgno
@@ -19059,7 +19081,7 @@ func Xsqlite3PcacheFetchFinish(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 // reference count drops to 0, then it is made eligible for recycling.
 func Xsqlite3PcacheRelease(tls *libc.TLS, p uintptr) {
 	(*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FnRefSum--
-	if int32(libc.PreDecInt16(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1)) == 0 {
+	if libc.PreDecInt64(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1) == int64(0) {
 		if int32((*PgHdr)(unsafe.Pointer(p)).Fflags)&PGHDR_CLEAN != 0 {
 			pcacheUnpin(tls, p)
 		} else {
@@ -19110,7 +19132,7 @@ func Xsqlite3PcacheMakeClean(tls *libc.TLS, p uintptr) {
 	*(*U16)(unsafe.Pointer(p + 52)) &= libc.Uint16FromInt32(libc.CplInt32(PGHDR_DIRTY | PGHDR_NEED_SYNC | PGHDR_WRITEABLE))
 	*(*U16)(unsafe.Pointer(p + 52)) |= U16(PGHDR_CLEAN)
 
-	if int32((*PgHdr)(unsafe.Pointer(p)).FnRef) == 0 {
+	if (*PgHdr)(unsafe.Pointer(p)).FnRef == int64(0) {
 		pcacheUnpin(tls, p)
 	}
 }
@@ -19214,8 +19236,8 @@ func Xsqlite3PcacheClear(tls *libc.TLS, pCache uintptr) {
 }
 
 func pcacheMergeDirtyList(tls *libc.TLS, pA uintptr, pB uintptr) uintptr {
-	bp := tls.Alloc(72)
-	defer tls.Free(72)
+	bp := tls.Alloc(80)
+	defer tls.Free(80)
 
 	var pTail uintptr
 	pTail = bp
@@ -19293,13 +19315,13 @@ func Xsqlite3PcacheDirtyList(tls *libc.TLS, pCache uintptr) uintptr {
 //
 // This is not the total number of pages referenced, but the sum of the
 // reference count for all pages.
-func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) int32 {
+func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) I64 {
 	return (*PCache)(unsafe.Pointer(pCache)).FnRefSum
 }
 
 // Return the number of references to the page supplied as an argument.
-func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) int32 {
-	return int32((*PgHdr)(unsafe.Pointer(p)).FnRef)
+func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) I64 {
+	return (*PgHdr)(unsafe.Pointer(p)).FnRef
 }
 
 // Return the total number of pages in the cache.
@@ -21528,7 +21550,7 @@ __27:
 	if !(isHot != 0 && nPlayback != 0) {
 		goto __28
 	}
-	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3887,
+	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3906,
 		libc.VaList(bp, nPlayback, (*Pager)(unsafe.Pointer(pPager)).FzJournal))
 __28:
 	;
@@ -21593,7 +21615,7 @@ func pagerUndoCallback(tls *libc.TLS, pCtx uintptr, iPg Pgno) int32 {
 
 	pPg = Xsqlite3PagerLookup(tls, pPager, iPg)
 	if pPg != 0 {
-		if Xsqlite3PcachePageRefcount(tls, pPg) == 1 {
+		if Xsqlite3PcachePageRefcount(tls, pPg) == int64(1) {
 			Xsqlite3PcacheDrop(tls, pPg)
 		} else {
 			rc = readDbPage(tls, pPg)
@@ -22026,7 +22048,7 @@ func Xsqlite3PagerSetPagesize(tls *libc.TLS, pPager uintptr, pPageSize uintptr,
 	var pageSize U32 = *(*U32)(unsafe.Pointer(pPageSize))
 
 	if (int32((*Pager)(unsafe.Pointer(pPager)).FmemDb) == 0 || (*Pager)(unsafe.Pointer(pPager)).FdbSize == Pgno(0)) &&
-		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 &&
+		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) &&
 		pageSize != 0 && pageSize != U32((*Pager)(unsafe.Pointer(pPager)).FpageSize) {
 		var pNew uintptr = uintptr(0)
 		*(*I64)(unsafe.Pointer(bp)) = int64(0)
@@ -22178,9 +22200,9 @@ func pagerAcquireMapPage(tls *libc.TLS, pPager uintptr, pgno Pgno, pData uintptr
 			Xsqlite3OsUnfetch(tls, (*Pager)(unsafe.Pointer(pPager)).Ffd, I64(pgno-Pgno(1))*(*Pager)(unsafe.Pointer(pPager)).FpageSize, pData)
 			return SQLITE_NOMEM
 		}
-		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*72
+		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*80
 		(*PgHdr)(unsafe.Pointer(p)).Fflags = U16(PGHDR_MMAP)
-		(*PgHdr)(unsafe.Pointer(p)).FnRef = int16(1)
+		(*PgHdr)(unsafe.Pointer(p)).FnRef = int64(1)
 		(*PgHdr)(unsafe.Pointer(p)).FpPager = pPager
 	}
 
@@ -22512,7 +22534,7 @@ func Xsqlite3PagerFlush(tls *libc.TLS, pPager uintptr) int32 {
 
 		for rc == SQLITE_OK && pList != 0 {
 			var pNext uintptr = (*PgHdr)(unsafe.Pointer(pList)).FpDirty
-			if int32((*PgHdr)(unsafe.Pointer(pList)).FnRef) == 0 {
+			if (*PgHdr)(unsafe.Pointer(pList)).FnRef == int64(0) {
 				rc = pagerStress(tls, pPager, pList)
 			}
 			pList = pNext
@@ -22662,7 +22684,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 60235)
+	rc = Xsqlite3CantopenError(tls, 60239)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -22723,7 +22745,7 @@ __15:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzJournal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3914, uint64(8))
+	libc.Xmemcpy(tls, pPtr, ts+3933, uint64(8))
 	pPtr += uintptr(8 + 1)
 	goto __19
 __18:
@@ -22736,7 +22758,7 @@ __19:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzWal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3923, uint64(4))
+	libc.Xmemcpy(tls, pPtr, ts+3942, uint64(4))
 	pPtr += uintptr(4 + 1)
 	goto __21
 __20:
@@ -22788,9 +22810,9 @@ __27:
 	;
 __26:
 	;
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3928, 0))
+	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3947, 0))
 	if !(iDc&SQLITE_IOCAP_IMMUTABLE != 0 ||
-		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3935, 0) != 0) {
+		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3954, 0) != 0) {
 		goto __30
 	}
 	vfsFlags = vfsFlags | SQLITE_OPEN_READONLY
@@ -23043,7 +23065,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60754)
+	rc = Xsqlite3CantopenError(tls, 60758)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23149,7 +23171,7 @@ __24:
 }
 
 func pagerUnlockIfUnused(tls *libc.TLS, pPager uintptr) {
-	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 {
+	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) {
 		pagerUnlockAndRollback(tls, pPager)
 	}
 }
@@ -23167,7 +23189,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60967)
+	return Xsqlite3CorruptError(tls, 60971)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23206,7 +23228,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60999)
+	rc = Xsqlite3CorruptError(tls, 61003)
 	goto pager_acquire_err
 __7:
 	;
@@ -23283,7 +23305,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, 61078)
+		return Xsqlite3CorruptError(tls, 61082)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24041,7 +24063,7 @@ func Xsqlite3PagerMemUsed(tls *libc.TLS, pPager uintptr) int32 {
 
 // Return the number of references to the specified page.
 func Xsqlite3PagerPageRefcount(tls *libc.TLS, pPage uintptr) int32 {
-	return Xsqlite3PcachePageRefcount(tls, pPage)
+	return int32(Xsqlite3PcachePageRefcount(tls, pPage))
 }
 
 // Parameter eStat must be one of SQLITE_DBSTATUS_CACHE_HIT, _MISS, _WRITE,
@@ -24284,9 +24306,9 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	pPgOld = Xsqlite3PagerLookup(tls, pPager, pgno)
 
 	if pPgOld != 0 {
-		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
+		if (*PgHdr)(unsafe.Pointer(pPgOld)).FnRef > int64(1) {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62623)
+			return Xsqlite3CorruptError(tls, 62627)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -24471,7 +24493,7 @@ func Xsqlite3PagerClearCache(tls *libc.TLS, pPager uintptr) {
 func Xsqlite3PagerCheckpoint(tls *libc.TLS, pPager uintptr, db uintptr, eMode int32, pnLog uintptr, pnCkpt uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal == uintptr(0) && int32((*Pager)(unsafe.Pointer(pPager)).FjournalMode) == PAGER_JOURNALMODE_WAL {
-		Xsqlite3_exec(tls, db, ts+3945, uintptr(0), uintptr(0), uintptr(0))
+		Xsqlite3_exec(tls, db, ts+3964, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal != 0 {
 		rc = Xsqlite3WalCheckpoint(tls, (*Pager)(unsafe.Pointer(pPager)).FpWal, db, eMode,
@@ -25043,7 +25065,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, 64387)
+				return Xsqlite3CorruptError(tls, 64391)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25142,7 +25164,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64519)
+	rc = Xsqlite3CantopenError(tls, 64523)
 	goto finished
 __7:
 	;
@@ -25310,7 +25332,7 @@ __24:
 		goto __30
 	}
 	Xsqlite3_log(tls, SQLITE_NOTICE|int32(1)<<8,
-		ts+3963,
+		ts+3982,
 		libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 __30:
 	;
@@ -25728,7 +25750,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65333)
+	rc = Xsqlite3CorruptError(tls, 65337)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -25873,7 +25895,7 @@ func walLimitSize(tls *libc.TLS, pWal uintptr, nMax I64) {
 	}
 	Xsqlite3EndBenignMalloc(tls)
 	if rx != 0 {
-		Xsqlite3_log(tls, rx, ts+4000, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
+		Xsqlite3_log(tls, rx, ts+4019, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 	}
 }
 
@@ -26003,7 +26025,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, 65682)
+		rc = Xsqlite3CantopenError(tls, 65686)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -26476,7 +26498,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66419)
+				return Xsqlite3CorruptError(tls, 66423)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -26981,7 +27003,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, 67138)
+			rc = Xsqlite3CorruptError(tls, 67142)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -27374,7 +27396,7 @@ func Xsqlite3BtreeLeaveCursor(tls *libc.TLS, pCur uintptr) {
 	Xsqlite3BtreeLeave(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpBtree)
 }
 
-var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 4026))
+var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 4045))
 
 var sqlite3SharedCacheList uintptr = uintptr(0)
 
@@ -27639,7 +27661,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, 69249)
+			rc = Xsqlite3CorruptError(tls, 69253)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -27776,7 +27798,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69434)
 	return
 __2:
 	;
@@ -27793,7 +27815,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69447)
 	goto ptrmap_exit
 __4:
 	;
@@ -27801,7 +27823,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69452)
 	goto ptrmap_exit
 __5:
 	;
@@ -27844,7 +27866,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, 69493)
+		return Xsqlite3CorruptError(tls, 69497)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -27854,7 +27876,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, 69501)
+		return Xsqlite3CorruptError(tls, 69505)
 	}
 	return SQLITE_OK
 }
@@ -28104,7 +28126,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, 69893)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69897)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28151,7 +28173,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69951)
+	return Xsqlite3CorruptError(tls, 69955)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28161,7 +28183,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69954)
+	return Xsqlite3CorruptError(tls, 69958)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28174,7 +28196,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69962)
+	return Xsqlite3CorruptError(tls, 69966)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28183,14 +28205,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69965)
+	return Xsqlite3CorruptError(tls, 69969)
 __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, 69967)
+	return Xsqlite3CorruptError(tls, 69971)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -28200,7 +28222,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69971)
+	return Xsqlite3CorruptError(tls, 69975)
 __11:
 	;
 __8:
@@ -28264,7 +28286,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 70004)
+	return Xsqlite3CorruptError(tls, 70008)
 __22:
 	;
 	size = int32((*struct {
@@ -28274,7 +28296,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 70010)
+	return Xsqlite3CorruptError(tls, 70014)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -28296,7 +28318,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 70024)
+	return Xsqlite3CorruptError(tls, 70028)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -28331,7 +28353,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, 70081)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70085)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -28344,13 +28366,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, 70096)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70100)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70107)
 	}
 	return uintptr(0)
 }
@@ -28375,7 +28397,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, 70152)
+			return Xsqlite3CorruptError(tls, 70156)
 		}
 	}
 
@@ -28386,7 +28408,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, 70170)
+				return Xsqlite3CorruptError(tls, 70174)
 			} else {
 				return SQLITE_OK
 			}
@@ -28438,22 +28460,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 70249)
+				return Xsqlite3CorruptError(tls, 70253)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 70254)
+			return Xsqlite3CorruptError(tls, 70258)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 70266)
+				return Xsqlite3CorruptError(tls, 70270)
 			}
 			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, 70269)
+				return Xsqlite3CorruptError(tls, 70273)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -28463,7 +28485,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, 70282)
+					return Xsqlite3CorruptError(tls, 70286)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -28471,7 +28493,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, 70288)
+			return Xsqlite3CorruptError(tls, 70292)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -28479,10 +28501,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, 70297)
+			return Xsqlite3CorruptError(tls, 70301)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70298)
+			return Xsqlite3CorruptError(tls, 70302)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -28542,7 +28564,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70357)
+			return Xsqlite3CorruptError(tls, 70361)
 		}
 	} else {
 		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
@@ -28578,7 +28600,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70381)
+			return Xsqlite3CorruptError(tls, 70385)
 		}
 	}
 	return SQLITE_OK
@@ -28608,11 +28630,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70432)
+			return Xsqlite3CorruptError(tls, 70436)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70437)
+				return Xsqlite3CorruptError(tls, 70441)
 			}
 			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))))
@@ -28623,15 +28645,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70447)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70451)
+			return Xsqlite3CorruptError(tls, 70455)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70463)
+		return Xsqlite3CorruptError(tls, 70467)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -28659,14 +28681,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, 70494)
+			return Xsqlite3CorruptError(tls, 70498)
 		}
 		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, 70499)
+			return Xsqlite3CorruptError(tls, 70503)
 		}
 	}
 	return SQLITE_OK
@@ -28680,7 +28702,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, 70531)
+		return Xsqlite3CorruptError(tls, 70535)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -28692,7 +28714,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, 70545)
+		return Xsqlite3CorruptError(tls, 70549)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -28795,7 +28817,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70700)
+	rc = Xsqlite3CorruptError(tls, 70704)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -28823,7 +28845,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, 70721)
+	rc = Xsqlite3CorruptError(tls, 70725)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -28862,7 +28884,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, 70787)
+			return Xsqlite3CorruptError(tls, 70791)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -28935,7 +28957,7 @@ func Xsqlite3BtreeOpen(tls *libc.TLS, pVfs uintptr, zFilename uintptr, db uintpt
 	mutexOpen = uintptr(0)
 	rc = SQLITE_OK
 	isTempDb = libc.Bool32(zFilename == uintptr(0) || int32(*(*int8)(unsafe.Pointer(zFilename))) == 0)
-	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4042) == 0 ||
+	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4061) == 0 ||
 		isTempDb != 0 && Xsqlite3TempInMemory(tls, db) != 0 ||
 		vfsFlags&SQLITE_OPEN_MEMORY != 0)
 
@@ -29707,7 +29729,7 @@ __9:
 	;
 __10:
 	;
-	if !(libc.Xmemcmp(tls, page1+21, ts+4051, uint64(3)) != 0) {
+	if !(libc.Xmemcmp(tls, page1+21, ts+4070, uint64(3)) != 0) {
 		goto __14
 	}
 	goto page1_init_failed
@@ -29745,7 +29767,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71722)
+	rc = Xsqlite3CorruptError(tls, 71726)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30160,7 +30182,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, 72143)
+			return Xsqlite3CorruptError(tls, 72147)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30186,7 +30208,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, 72162)
+						return Xsqlite3CorruptError(tls, 72166)
 					}
 					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)
@@ -30195,7 +30217,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, 72171)
+					return Xsqlite3CorruptError(tls, 72175)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30206,7 +30228,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, 72183)
+				return Xsqlite3CorruptError(tls, 72187)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30222,7 +30244,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, 72218)
+		return Xsqlite3CorruptError(tls, 72222)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -30283,7 +30305,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, 72316)
+			return Xsqlite3CorruptError(tls, 72320)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -30318,7 +30340,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, 72368)
+					return Xsqlite3CorruptError(tls, 72372)
 				}
 			}
 
@@ -30378,7 +30400,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, 72436)
+			rc = Xsqlite3CorruptError(tls, 72440)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -30417,7 +30439,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, 72487)
+			return Xsqlite3CorruptError(tls, 72491)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -30448,7 +30470,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72514)
+			return Xsqlite3CorruptError(tls, 72518)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -30789,7 +30811,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, 72978)
+			return Xsqlite3CorruptError(tls, 72982)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -31033,14 +31055,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, 73385)
+		return Xsqlite3CorruptError(tls, 73389)
 	}
 
 	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, 73400)
+		return Xsqlite3CorruptError(tls, 73404)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -31085,7 +31107,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, 73462)
+				return Xsqlite3CorruptError(tls, 73466)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31134,7 +31156,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73547)
+		return Xsqlite3CorruptError(tls, 73551)
 	}
 	return rc
 }
@@ -31214,7 +31236,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, 73684)
+		return Xsqlite3CorruptError(tls, 73688)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -31305,7 +31327,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, 73823)
+	return Xsqlite3CorruptError(tls, 73827)
 __11:
 	;
 skip_init:
@@ -31325,7 +31347,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73835)
+	return Xsqlite3CorruptError(tls, 73839)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -31535,7 +31557,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 74077)
+	return Xsqlite3CorruptError(tls, 74081)
 __21:
 	;
 	goto __19
@@ -31739,7 +31761,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 74273)
+	return Xsqlite3CorruptError(tls, 74277)
 __4:
 	;
 	goto bypass_moveto_root
@@ -31804,7 +31826,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, 74360)
+	rc = Xsqlite3CorruptError(tls, 74364)
 	goto moveto_index_finish
 __17:
 	;
@@ -31852,7 +31874,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74392)
+	rc = Xsqlite3CorruptError(tls, 74396)
 __24:
 	;
 	goto moveto_index_finish
@@ -31971,7 +31993,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, 74508)
+		return Xsqlite3CorruptError(tls, 74512)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32131,7 +32153,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74688)
+	return Xsqlite3CorruptError(tls, 74692)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32196,7 +32218,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74744)
+	rc = Xsqlite3CorruptError(tls, 74748)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -32232,7 +32254,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74773)
+	rc = Xsqlite3CorruptError(tls, 74777)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -32276,7 +32298,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74807)
+	rc = Xsqlite3CorruptError(tls, 74811)
 	goto end_allocate_page
 __32:
 	;
@@ -32388,7 +32410,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74872)
+	rc = Xsqlite3CorruptError(tls, 74876)
 	goto end_allocate_page
 __51:
 	;
@@ -32546,7 +32568,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, 74999)
+	return Xsqlite3CorruptError(tls, 75003)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -32603,7 +32625,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75050)
 	goto freepage_out
 __10:
 	;
@@ -32619,7 +32641,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75061)
 	goto freepage_out
 __12:
 	;
@@ -32693,7 +32715,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, 75146)
+		return Xsqlite3CorruptError(tls, 75150)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -32705,7 +32727,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, 75163)
+			return Xsqlite3CorruptError(tls, 75167)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -32716,7 +32738,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, 75183)
+			rc = Xsqlite3CorruptError(tls, 75187)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -32881,7 +32903,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, 75436)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75440)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -33160,12 +33182,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, 75737)
+				return Xsqlite3CorruptError(tls, 75741)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75742)
+			return Xsqlite3CorruptError(tls, 75746)
 		}
 
 		pData -= uintptr(sz)
@@ -33173,7 +33195,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, 75748)
+			return Xsqlite3CorruptError(tls, 75752)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -33233,7 +33255,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, 75833)
+			Xsqlite3CorruptError(tls, 75837)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -33322,7 +33344,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75947)
+	return Xsqlite3CorruptError(tls, 75951)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -33438,7 +33460,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, 76060)
+		return Xsqlite3CorruptError(tls, 76064)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -33758,7 +33780,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, 76481)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76485)
 	goto balance_cleanup
 __25:
 	;
@@ -33769,7 +33791,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76509)
 	goto balance_cleanup
 __27:
 	;
@@ -33927,7 +33949,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76610)
 	goto balance_cleanup
 __55:
 	;
@@ -34001,7 +34023,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76643)
 	goto balance_cleanup
 __67:
 	;
@@ -34064,7 +34086,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76687)
 	goto balance_cleanup
 __75:
 	;
@@ -34092,7 +34114,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76720)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -34353,7 +34375,7 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76920)
 	goto balance_cleanup
 __121:
 	;
@@ -34545,7 +34567,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, 77146)
+			return Xsqlite3CorruptError(tls, 77150)
 		}
 	}
 	return SQLITE_OK
@@ -34583,7 +34605,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 77206)
+			rc = Xsqlite3CorruptError(tls, 77210)
 		} 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)))
@@ -34689,7 +34711,7 @@ func btreeOverwriteOverflowCell(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, 77370)
+			rc = Xsqlite3CorruptError(tls, 77374)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -34714,7 +34736,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 
 	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)
+		return Xsqlite3CorruptError(tls, 77402)
 	}
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
 		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
@@ -34784,7 +34806,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77479)
+	return Xsqlite3CorruptError(tls, 77483)
 __3:
 	;
 __1:
@@ -34897,7 +34919,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77606)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -34957,6 +34979,7 @@ __30:
 __25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
+	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
 		goto __31
 	}
@@ -34964,7 +34987,7 @@ __25:
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
 		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77640)
+	return Xsqlite3CorruptError(tls, 77645)
 __33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
@@ -35002,13 +35025,13 @@ __37:
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77667)
+	return Xsqlite3CorruptError(tls, 77672)
 __39:
 	;
 	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __40
 	}
-	return Xsqlite3CorruptError(tls, 77670)
+	return Xsqlite3CorruptError(tls, 77675)
 __40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
@@ -35039,7 +35062,6 @@ __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 __44
 	}
@@ -35114,7 +35136,7 @@ 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, 77773)
+		return Xsqlite3CorruptError(tls, 77777)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
@@ -35139,7 +35161,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, 77798)
+				return Xsqlite3CorruptError(tls, 77802)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35240,7 +35262,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77894)
+			return Xsqlite3CorruptError(tls, 77898)
 		}
 	}
 
@@ -35248,11 +35270,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, 77903)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 	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, 77907)
+		return Xsqlite3CorruptError(tls, 77911)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -35327,7 +35349,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, 77998)
+			return Xsqlite3CorruptError(tls, 78002)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -35396,7 +35418,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, 78114)
+			return Xsqlite3CorruptError(tls, 78118)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -35425,7 +35447,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, 78162)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78166)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -35501,7 +35523,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 78252)
+	return Xsqlite3CorruptError(tls, 78256)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -35515,7 +35537,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, 78259)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78263)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -35649,7 +35671,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, 78363)
+		return Xsqlite3CorruptError(tls, 78367)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -35866,7 +35888,7 @@ 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+64, ts+4055, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4074, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
 		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
@@ -35891,11 +35913,11 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 	defer tls.Free(16)
 
 	if iPage > (*IntegrityCk)(unsafe.Pointer(pCheck)).FnPage || iPage == Pgno(0) {
-		checkAppendMsg(tls, pCheck, ts+4057, libc.VaList(bp, iPage))
+		checkAppendMsg(tls, pCheck, ts+4076, libc.VaList(bp, iPage))
 		return 1
 	}
 	if getPageReferenced(tls, pCheck, iPage) != 0 {
-		checkAppendMsg(tls, pCheck, ts+4080, libc.VaList(bp+8, iPage))
+		checkAppendMsg(tls, pCheck, ts+4099, libc.VaList(bp+8, iPage))
 		return 1
 	}
 	setPageReferenced(tls, pCheck, iPage)
@@ -35913,13 +35935,13 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
 			checkOom(tls, pCheck)
 		}
-		checkAppendMsg(tls, pCheck, ts+4105, libc.VaList(bp, iChild))
+		checkAppendMsg(tls, pCheck, ts+4124, libc.VaList(bp, iChild))
 		return
 	}
 
 	if int32(*(*U8)(unsafe.Pointer(bp + 48))) != int32(eType) || *(*Pgno)(unsafe.Pointer(bp + 52)) != iParent {
 		checkAppendMsg(tls, pCheck,
-			ts+4134,
+			ts+4153,
 			libc.VaList(bp+8, iChild, int32(eType), iParent, int32(*(*U8)(unsafe.Pointer(bp + 48))), *(*Pgno)(unsafe.Pointer(bp + 52))))
 	}
 }
@@ -35938,7 +35960,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 		}
 		N--
 		if Xsqlite3PagerGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpPager, iPage, bp+40, 0) != 0 {
-			checkAppendMsg(tls, pCheck, ts+4188, libc.VaList(bp, iPage))
+			checkAppendMsg(tls, pCheck, ts+4207, libc.VaList(bp, iPage))
 			break
 		}
 		pOvflData = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
@@ -35949,7 +35971,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 			}
 			if n > (*BtShared)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt)).FusableSize/U32(4)-U32(2) {
 				checkAppendMsg(tls, pCheck,
-					ts+4210, libc.VaList(bp+8, iPage))
+					ts+4229, libc.VaList(bp+8, iPage))
 				N--
 			} else {
 				for i = 0; i < int32(n); i++ {
@@ -35972,12 +35994,12 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 	}
 	if N != 0 && nErrAtStart == (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr {
 		checkAppendMsg(tls, pCheck,
-			ts+4249,
+			ts+4268,
 			libc.VaList(bp+16, func() uintptr {
 				if isFreeList != 0 {
-					return ts + 4275
+					return ts + 4294
 				}
-				return ts + 4280
+				return ts + 4299
 			}(),
 				expected-N, expected))
 	}
@@ -36093,13 +36115,13 @@ __2:
 	return 0
 __3:
 	;
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4301
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4320
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
 		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4311, libc.VaList(bp, rc))
+		ts+4330, libc.VaList(bp, rc))
 	goto end_of_check
 __4:
 	;
@@ -36110,7 +36132,7 @@ __4:
 	}
 
 	checkAppendMsg(tls, pCheck,
-		ts+4349, libc.VaList(bp+8, rc))
+		ts+4368, libc.VaList(bp+8, rc))
 	goto end_of_check
 __5:
 	;
@@ -36118,14 +36140,14 @@ __5:
 		goto __6
 	}
 
-	checkAppendMsg(tls, pCheck, ts+4387, libc.VaList(bp+16, rc))
+	checkAppendMsg(tls, pCheck, ts+4406, libc.VaList(bp+16, rc))
 	goto end_of_check
 __6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
 
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4409
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4428
 	contentOffset = U32((int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5))))<<8|int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5) + 1)))-1)&0xffff + 1)
 
 	nCell = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3) + 1)))
@@ -36142,7 +36164,7 @@ __6:
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
 		goto __9
 	}
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4435
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4454
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
 __9:
 	;
@@ -36167,7 +36189,7 @@ __10:
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
 		goto __13
 	}
-	checkAppendMsg(tls, pCheck, ts+4463,
+	checkAppendMsg(tls, pCheck, ts+4482,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
 	goto __11
@@ -36180,7 +36202,7 @@ __13:
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
 		goto __14
 	}
-	checkAppendMsg(tls, pCheck, ts+4493, 0)
+	checkAppendMsg(tls, pCheck, ts+4512, 0)
 	doCoverageCheck = 0
 	goto __11
 __14:
@@ -36196,7 +36218,7 @@ __14:
 	}() != 0) {
 		goto __16
 	}
-	checkAppendMsg(tls, pCheck, ts+4517, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
+	checkAppendMsg(tls, pCheck, ts+4536, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
 __16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
@@ -36234,7 +36256,7 @@ __21:
 	if !(d2 != depth) {
 		goto __22
 	}
-	checkAppendMsg(tls, pCheck, ts+4541, 0)
+	checkAppendMsg(tls, pCheck, ts+4560, 0)
 	depth = d2
 __22:
 	;
@@ -36307,7 +36329,7 @@ __30:
 		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4566, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
+		ts+4585, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
 	goto __31
 	goto __33
 __32:
@@ -36324,7 +36346,7 @@ __31:
 		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4603,
+		ts+4622,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
 __34:
 	;
@@ -36438,7 +36460,7 @@ __6:
 	if !(bCkFreelist != 0) {
 		goto __7
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4655
+	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4674
 	checkList(tls, bp+32, 1, Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+32),
 		Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
@@ -36474,7 +36496,7 @@ __13:
 		goto __15
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4671,
+		ts+4690,
 		libc.VaList(bp, mx, mxInHdr))
 __15:
 	;
@@ -36484,7 +36506,7 @@ __9:
 		goto __16
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4716, 0)
+		ts+4735, 0)
 __16:
 	;
 __10:
@@ -36531,13 +36553,13 @@ __23:
 	if !(getPageReferenced(tls, bp+32, i) == 0 && (ptrmapPageno(tls, pBt, i) != i || !(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0))) {
 		goto __26
 	}
-	checkAppendMsg(tls, bp+32, ts+4771, libc.VaList(bp+16, i))
+	checkAppendMsg(tls, bp+32, ts+4790, libc.VaList(bp+16, i))
 __26:
 	;
 	if !(getPageReferenced(tls, bp+32, i) != 0 && (ptrmapPageno(tls, pBt, i) == i && (*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0)) {
 		goto __27
 	}
-	checkAppendMsg(tls, bp+32, ts+4793, libc.VaList(bp+24, i))
+	checkAppendMsg(tls, bp+32, ts+4812, libc.VaList(bp+24, i))
 __27:
 	;
 	goto __24
@@ -36800,7 +36822,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 		var rc int32 = 0
 		Xsqlite3ParseObjectInit(tls, bp+16, pDb)
 		if Xsqlite3OpenTempDatabase(tls, bp+16) != 0 {
-			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3656, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3675, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 			rc = SQLITE_ERROR
 		}
 		Xsqlite3DbFree(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
@@ -36811,7 +36833,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 	}
 
 	if i < 0 {
-		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4827, libc.VaList(bp+8, zDb))
+		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4846, libc.VaList(bp+8, zDb))
 		return uintptr(0)
 	}
 
@@ -36826,7 +36848,7 @@ func setDestPgsz(tls *libc.TLS, p uintptr) int32 {
 
 func checkReadTransaction(tls *libc.TLS, db uintptr, p uintptr) int32 {
 	if Xsqlite3BtreeTxnState(tls, p) != SQLITE_TXN_NONE {
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4847, 0)
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4866, 0)
 		return SQLITE_ERROR
 	}
 	return SQLITE_OK
@@ -36846,7 +36868,7 @@ func Xsqlite3_backup_init(tls *libc.TLS, pDestDb uintptr, zDestDb uintptr, pSrcD
 
 	if pSrcDb == pDestDb {
 		Xsqlite3ErrorWithMsg(tls,
-			pDestDb, SQLITE_ERROR, ts+4878, 0)
+			pDestDb, SQLITE_ERROR, ts+4897, 0)
 		p = uintptr(0)
 	} else {
 		p = Xsqlite3MallocZero(tls, uint64(unsafe.Sizeof(Sqlite3_backup{})))
@@ -37294,7 +37316,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 		(*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,
+		Xsqlite3_str_appendf(tls, bp+8, ts+4937,
 			libc.VaList(bp, func() float64 {
 				if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_IntReal != 0 {
 					return float64(*(*I64)(unsafe.Pointer(p)))
@@ -37886,7 +37908,7 @@ func Xsqlite3VdbeMemSetPointer(tls *libc.TLS, pMem uintptr, pPtr uintptr, zPType
 		if zPType != 0 {
 			return zPType
 		}
-		return ts + 1547
+		return ts + 1566
 	}()
 	(*Mem)(unsafe.Pointer(pMem)).Fz = pPtr
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null | MEM_Dyn | MEM_Subtype | MEM_Term)
@@ -38118,7 +38140,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, 81630)
+		return Xsqlite3CorruptError(tls, 81634)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -38350,7 +38372,7 @@ __9:
 		goto __10
 	}
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 8)).FisError
-	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3656, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
+	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3675, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
 	goto __11
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
@@ -38403,7 +38425,7 @@ func valueFromExpr(tls *libc.TLS, db uintptr, pExpr uintptr, enc U8, affinity U8
 	zVal = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	negInt = 1
-	zNeg = ts + 1547
+	zNeg = ts + 1566
 	rc = SQLITE_OK
 
 __1:
@@ -38444,7 +38466,7 @@ __4:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
 	negInt = -1
-	zNeg = ts + 4925
+	zNeg = ts + 4944
 __6:
 	;
 	if !(op == TK_STRING || op == TK_FLOAT || op == TK_INTEGER) {
@@ -38463,7 +38485,7 @@ __9:
 	Xsqlite3VdbeMemSetInt64(tls, *(*uintptr)(unsafe.Pointer(bp + 16)), I64(*(*int32)(unsafe.Pointer(pExpr + 8)))*I64(negInt))
 	goto __11
 __10:
-	zVal = Xsqlite3MPrintf(tls, db, ts+4927, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+	zVal = Xsqlite3MPrintf(tls, db, ts+4946, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	if !(zVal == uintptr(0)) {
 		goto __12
 	}
@@ -38767,7 +38789,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, 82270)
+		return Xsqlite3CorruptError(tls, 82274)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -38782,14 +38804,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 82276)
+			return Xsqlite3CorruptError(tls, 82280)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 82282)
+		return Xsqlite3CorruptError(tls, 82286)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -39797,34 +39819,34 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var j int32
 			var pKeyInfo uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4932, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4951, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
 			for j = 0; j < int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField); j++ {
 				var pColl uintptr = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(j)*8))
 				var zColl uintptr
 				if pColl != 0 {
 					zColl = (*CollSeq)(unsafe.Pointer(pColl)).FzName
 				} else {
-					zColl = ts + 1547
+					zColl = ts + 1566
 				}
-				if libc.Xstrcmp(tls, zColl, ts+1092) == 0 {
-					zColl = ts + 4937
+				if libc.Xstrcmp(tls, zColl, ts+1111) == 0 {
+					zColl = ts + 4956
 				}
-				Xsqlite3_str_appendf(tls, bp+144, ts+4939,
+				Xsqlite3_str_appendf(tls, bp+144, ts+4958,
 					libc.VaList(bp+8, func() uintptr {
 						if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_DESC != 0 {
-							return ts + 4925
+							return ts + 4944
 						}
-						return ts + 1547
+						return ts + 1566
 					}(),
 						func() uintptr {
 							if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_BIGNULL != 0 {
-								return ts + 4947
+								return ts + 4966
 							}
-							return ts + 1547
+							return ts + 1566
 						}(),
 						zColl))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4950, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+4969, 1)
 			break
 
 		}
@@ -39832,7 +39854,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 		{
 			var pColl uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4952, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
+			Xsqlite3_str_appendf(tls, bp+144, ts+4971, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
 				encnames[(*CollSeq)(unsafe.Pointer(pColl)).Fenc]))
 			break
 
@@ -39840,32 +39862,32 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -7:
 		{
 			var pDef uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
-			Xsqlite3_str_appendf(tls, bp+144, ts+4961, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4980, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -15:
 		{
 			var pDef uintptr = (*Sqlite3_context)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpFunc
-			Xsqlite3_str_appendf(tls, bp+144, ts+4961, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4980, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -13:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1327, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1346, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
 	case -3:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+4968, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4987, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
 			break
 
 		}
 	case -12:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1321, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1340, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
@@ -39875,13 +39897,13 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Str != 0 {
 				zP4 = (*Mem)(unsafe.Pointer(pMem)).Fz
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1327, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1346, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1321, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1340, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Null != 0 {
-				zP4 = ts + 1548
+				zP4 = ts + 1567
 			} else {
-				zP4 = ts + 4971
+				zP4 = ts + 4990
 			}
 			break
 
@@ -39889,7 +39911,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -11:
 		{
 			var pVtab uintptr = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-			Xsqlite3_str_appendf(tls, bp+144, ts+4978, libc.VaList(bp+120, pVtab))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4997, libc.VaList(bp+120, pVtab))
 			break
 
 		}
@@ -39900,20 +39922,20 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var n U32 = *(*U32)(unsafe.Pointer(ai))
 
 			for i = U32(1); i <= n; i++ {
-				Xsqlite3_str_appendf(tls, bp+144, ts+4986, libc.VaList(bp+128, func() int32 {
+				Xsqlite3_str_appendf(tls, bp+144, ts+5005, libc.VaList(bp+128, func() int32 {
 					if i == U32(1) {
 						return '['
 					}
 					return ','
 				}(), *(*U32)(unsafe.Pointer(ai + uintptr(i)*4))))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4991, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+5010, 1)
 			break
 
 		}
 	case -4:
 		{
-			zP4 = ts + 4993
+			zP4 = ts + 5012
 			break
 
 		}
@@ -39938,7 +39960,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	return Xsqlite3StrAccumFinish(tls, bp+144)
 }
 
-var encnames = [4]uintptr{ts + 5001, ts + 5003, ts + 5005, ts + 5010}
+var encnames = [4]uintptr{ts + 5020, ts + 5022, ts + 5024, ts + 5029}
 
 // Declare to the Vdbe that the BTree object at db->aDb[i] is used.
 //
@@ -40388,8 +40410,8 @@ func Xsqlite3VdbeMakeReady(tls *libc.TLS, p uintptr, pParse uintptr) {
 }
 
 var azColName = [12]uintptr{
-	ts + 5015, ts + 5020, ts + 5027, ts + 5030, ts + 5033, ts + 5036, ts + 5039, ts + 5042,
-	ts + 5050, ts + 5053, ts + 5060, ts + 5068,
+	ts + 5034, ts + 5039, ts + 5046, ts + 5049, ts + 5052, ts + 5055, ts + 5058, ts + 5061,
+	ts + 5069, ts + 5072, ts + 5079, ts + 5087,
 }
 
 // Close a VDBE cursor and release all the resources that cursor
@@ -40598,7 +40620,7 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		var nMainFile int32
 
 		nMainFile = Xsqlite3Strlen30(tls, zMainFile)
-		zSuper = Xsqlite3MPrintf(tls, db, ts+5075, libc.VaList(bp, 0, zMainFile, 0))
+		zSuper = Xsqlite3MPrintf(tls, db, ts+5094, libc.VaList(bp, 0, zMainFile, 0))
 		if zSuper == uintptr(0) {
 			return SQLITE_NOMEM
 		}
@@ -40606,16 +40628,16 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		for __ccgo := true; __ccgo; __ccgo = rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 60)) != 0 {
 			if retryCount != 0 {
 				if retryCount > 100 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5087, libc.VaList(bp+24, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5106, libc.VaList(bp+24, zSuper))
 					Xsqlite3OsDelete(tls, pVfs, zSuper, 0)
 					break
 				} else if retryCount == 1 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5101, libc.VaList(bp+32, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5120, libc.VaList(bp+32, zSuper))
 				}
 			}
 			retryCount++
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
-			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5116,
+			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5135,
 				libc.VaList(bp+40, *(*U32)(unsafe.Pointer(bp + 56))>>8&U32(0xffffff), *(*U32)(unsafe.Pointer(bp + 56))&U32(0xff)))
 
 			rc = Xsqlite3OsAccess(tls, pVfs, zSuper, SQLITE_ACCESS_EXISTS, bp+60)
@@ -40761,7 +40783,7 @@ func Xsqlite3VdbeCheckFk(tls *libc.TLS, p uintptr, deferred int32) int32 {
 		!(deferred != 0) && (*Vdbe)(unsafe.Pointer(p)).FnFkConstraint > int64(0) {
 		(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_CONSTRAINT | int32(3)<<8
 		(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
-		Xsqlite3VdbeError(tls, p, ts+5129, 0)
+		Xsqlite3VdbeError(tls, p, ts+5148, 0)
 		if int32((*Vdbe)(unsafe.Pointer(p)).FprepFlags)&SQLITE_PREPARE_SAVESQL == 0 {
 			return SQLITE_ERROR
 		}
@@ -41093,7 +41115,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 86058)
+		return Xsqlite3CorruptError(tls, 86062)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -41644,7 +41666,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86989))
 		return 0
 	}
 
@@ -41709,7 +41731,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, 87062))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87066))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -41743,7 +41765,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, 87092))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87096))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -41793,7 +41815,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, 87136))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87140))
 			return 0
 		}
 	}
@@ -41939,7 +41961,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87303))
 	return 0
 __7:
 	;
@@ -42110,7 +42132,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87457)
+	return Xsqlite3CorruptError(tls, 87461)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42136,7 +42158,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, 87490)
+		return Xsqlite3CorruptError(tls, 87494)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -42247,13 +42269,13 @@ func Xsqlite3NotPureFunc(tls *libc.TLS, pCtx uintptr) int32 {
 		var zContext uintptr
 		var zMsg uintptr
 		if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_IsCheck != 0 {
-			zContext = ts + 5159
-		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5178
-		} else {
+		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5197
+		} else {
+			zContext = ts + 5216
 		}
-		zMsg = Xsqlite3_mprintf(tls, ts+5206,
+		zMsg = Xsqlite3_mprintf(tls, ts+5225,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx)).FpFunc)).FzName, zContext))
 		Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 		Xsqlite3_free(tls, zMsg)
@@ -42358,7 +42380,7 @@ func Xsqlite3_expired(tls *libc.TLS, pStmt uintptr) int32 {
 
 func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 	if (*Vdbe)(unsafe.Pointer(p)).Fdb == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5242, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5261, 0)
 		return 1
 	} else {
 		return 0
@@ -42368,7 +42390,7 @@ func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 
 func vdbeSafetyNotNull(tls *libc.TLS, p uintptr) int32 {
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5287, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5306, 0)
 		return 1
 	} else {
 		return vdbeSafety(tls, p)
@@ -42410,7 +42432,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, 87854)
+			return Xsqlite3MisuseError(tls, 87858)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -42833,7 +42855,7 @@ func Xsqlite3_result_error_code(tls *libc.TLS, pCtx uintptr, errCode int32) {
 // Force an SQLITE_TOOBIG error.
 func Xsqlite3_result_error_toobig(tls *libc.TLS, pCtx uintptr) {
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FisError = SQLITE_TOOBIG
-	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5327, int64(-1),
+	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5346, int64(-1),
 		uint8(SQLITE_UTF8), uintptr(0))
 }
 
@@ -43025,7 +43047,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88544)
+		return Xsqlite3MisuseError(tls, 88548)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -43545,15 +43567,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 89208)
+		return Xsqlite3MisuseError(tls, 89212)
 	}
 	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+5350, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 89216)
+			ts+5369, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89220)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -43958,7 +43980,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, 89707)
+	rc = Xsqlite3MisuseError(tls, 89711)
 	goto preupdate_old_out
 __1:
 	;
@@ -44102,7 +44124,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, 89809)
+	rc = Xsqlite3MisuseError(tls, 89813)
 	goto preupdate_new_out
 __1:
 	;
@@ -44274,7 +44296,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+5390, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5409, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -44310,11 +44332,11 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 
 			pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr(*(*int32)(unsafe.Pointer(bp + 84))-1)*56
 			if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Null != 0 {
-				Xsqlite3_str_append(tls, bp+48, ts+1548, 4)
+				Xsqlite3_str_append(tls, bp+48, ts+1567, 4)
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+1327, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+1346, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+4918, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+4937, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Str != 0 {
 				var nOut int32
 				var enc U8 = (*Sqlite3)(unsafe.Pointer(db)).Fenc
@@ -44329,21 +44351,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+5394, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5413, 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+5401, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5420, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5414, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5433, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					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_appendf(tls, bp+48, ts+5436, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5422, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5441, 1)
 			}
 		}
 	}
@@ -44546,10 +44568,6 @@ func filterHash(tls *libc.TLS, aMem uintptr, pOp uintptr) U64 {
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Real != 0 {
 			h = h + U64(Xsqlite3VdbeIntValue(tls, p))
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&(MEM_Str|MEM_Blob) != 0 {
-			h = h + U64((*Mem)(unsafe.Pointer(p)).Fn)
-			if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Zero != 0 {
-				h = h + U64(*(*int32)(unsafe.Pointer(p)))
-			}
 		}
 	}
 	return h
@@ -44560,11 +44578,11 @@ func vdbeMemTypeName(tls *libc.TLS, pMem uintptr) uintptr {
 }
 
 var azTypes = [5]uintptr{
-	ts + 1108,
-	ts + 1120,
-	ts + 1125,
-	ts + 1103,
-	ts + 1548,
+	ts + 1127,
+	ts + 1139,
+	ts + 1144,
+	ts + 1122,
+	ts + 1567,
 }
 
 // Execute as much of a VDBE program as we can.
@@ -45607,20 +45625,20 @@ __202:
 		goto __205
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5424, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	Xsqlite3VdbeError(tls, p, ts+5443, 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))))
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5464, 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))))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	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))
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5471, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 __204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
@@ -47198,7 +47216,7 @@ op_column_corrupt:
 	goto __9
 	goto __425
 __424:
-	rc = Xsqlite3CorruptError(tls, 93317)
+	rc = Xsqlite3CorruptError(tls, 93320)
 	goto abort_due_to_error
 __425:
 	;
@@ -47326,7 +47344,7 @@ __428:
 	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5476,
+	Xsqlite3VdbeError(tls, p, ts+5495,
 		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
@@ -47758,7 +47776,7 @@ __78:
 		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5517, 0)
+	Xsqlite3VdbeError(tls, p, ts+5536, 0)
 	rc = SQLITE_BUSY
 	goto __523
 __522:
@@ -47818,7 +47836,7 @@ __530:
 	if !!(pSavepoint != 0) {
 		goto __531
 	}
-	Xsqlite3VdbeError(tls, p, ts+5568, libc.VaList(bp+88, zName))
+	Xsqlite3VdbeError(tls, p, ts+5587, libc.VaList(bp+88, zName))
 	rc = SQLITE_ERROR
 	goto __532
 __531:
@@ -47827,7 +47845,7 @@ __531:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5590, 0)
+		ts+5609, 0)
 	rc = SQLITE_BUSY
 	goto __534
 __533:
@@ -48013,7 +48031,7 @@ __564:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5644, 0)
+		ts+5663, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
 	goto __567
@@ -48056,13 +48074,13 @@ __562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5699
+				return ts + 5718
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5747
+					return ts + 5766
 				}
-				return ts + 5790
+				return ts + 5809
 			}()
 		}(), 0)
 
@@ -48145,7 +48163,7 @@ __576:
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5831)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5850)
 
 	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 __583
@@ -48349,7 +48367,7 @@ __88:
 	}
 
 	(*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
+	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1566
 __602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -48958,7 +48976,7 @@ notExistsWithKey:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
 		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95560)
+	rc = Xsqlite3CorruptError(tls, 95563)
 	goto __683
 __682:
 	goto jump_to_p2
@@ -49736,7 +49754,7 @@ __767:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
 		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5859)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96638, ts+5878)
 	goto abort_due_to_error
 __770:
 	;
@@ -49846,7 +49864,7 @@ __780:
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
 		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96840)
+	rc = Xsqlite3CorruptError(tls, 96843)
 	goto abort_due_to_error
 __781:
 	;
@@ -50007,14 +50025,14 @@ __141:
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	goto __799
 __798:
-	zSchema = ts + 5876
+	zSchema = ts + 5895
 	(*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+5890,
+		ts+5909,
 		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 __800
@@ -50040,7 +50058,7 @@ __802:
 		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 97092)
+	rc = Xsqlite3CorruptError(tls, 97095)
 __803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
@@ -50230,7 +50248,7 @@ __820:
 		goto __825
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5933, 0)
+	Xsqlite3VdbeError(tls, p, ts+5952, 0)
 	goto abort_due_to_error
 __825:
 	;
@@ -50542,7 +50560,7 @@ __860:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
 		goto __862
 	}
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
 __862:
 	;
@@ -50592,7 +50610,7 @@ __867:
 	if !(rc != 0) {
 		goto __868
 	}
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
 __868:
 	;
@@ -50674,12 +50692,12 @@ __876:
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5970,
+		ts+5989,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6022
+				return ts + 6041
 			}
-			return ts + 6027
+			return ts + 6046
 		}()))
 	goto abort_due_to_error
 	goto __879
@@ -50821,7 +50839,7 @@ __171:
 		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6034, libc.VaList(bp+144, z1))
+	Xsqlite3VdbeError(tls, p, ts+6053, libc.VaList(bp+144, z1))
 __894:
 	;
 	goto abort_due_to_error
@@ -50939,7 +50957,7 @@ __904:
 	(*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+6063, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6082, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
 	goto __9
 
 __177:
@@ -51028,7 +51046,7 @@ __912:
 	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)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
 __913:
 	;
@@ -51258,7 +51276,7 @@ __935:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
 		goto __940
 	}
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
 __940:
 	;
@@ -51334,7 +51352,7 @@ __945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
 		goto __947
 	}
-	z3 = Xsqlite3MPrintf(tls, db, ts+6073, libc.VaList(bp+168, zTrace))
+	z3 = Xsqlite3MPrintf(tls, db, ts+6092, 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)
@@ -51407,7 +51425,7 @@ __955:
 	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __957
 	}
-	rc = Xsqlite3CorruptError(tls, 99031)
+	rc = Xsqlite3CorruptError(tls, 99034)
 __957:
 	;
 __956:
@@ -51415,13 +51433,13 @@ __956:
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
 		goto __958
 	}
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
 __958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
 
-	Xsqlite3_log(tls, rc, ts+6079,
+	Xsqlite3_log(tls, rc, ts+6098,
 		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 __959
@@ -51477,13 +51495,13 @@ __966:
 	return rc
 
 too_big:
-	Xsqlite3VdbeError(tls, p, ts+5327, 0)
+	Xsqlite3VdbeError(tls, p, ts+5346, 0)
 	rc = SQLITE_TOOBIG
 	goto abort_due_to_error
 
 no_mem:
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3VdbeError(tls, p, ts+1483, 0)
+	Xsqlite3VdbeError(tls, p, ts+1502, 0)
 	rc = SQLITE_NOMEM
 	goto abort_due_to_error
 
@@ -51494,8 +51512,8 @@ abort_due_to_interrupt:
 	return int32(0)
 }
 
-var azType = [4]uintptr{ts + 6111, ts + 6120, ts + 6127,
-	ts + 6133}
+var azType = [4]uintptr{ts + 6130, ts + 6139, ts + 6146,
+	ts + 6152}
 var and_logic = [9]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(1), uint8(2), uint8(0), uint8(2), uint8(2)}
 var or_logic = [9]uint8{uint8(0), uint8(1), uint8(2), uint8(1), uint8(1), uint8(1), uint8(2), uint8(1), uint8(2)}
 var aMask = [12]uint8{
@@ -51550,16 +51568,16 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		}
 
 		if type1 < U32(12) {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6145,
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6164,
 				libc.VaList(bp, func() uintptr {
 					if type1 == U32(0) {
-						return ts + 6174
+						return ts + 6193
 					}
 					return func() uintptr {
 						if type1 == U32(7) {
-							return ts + 6179
+							return ts + 6198
 						}
-						return ts + 6184
+						return ts + 6203
 					}()
 				}()))
 			rc = SQLITE_ERROR
@@ -51579,10 +51597,10 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		rc = Xsqlite3_finalize(tls, (*Incrblob)(unsafe.Pointer(p)).FpStmt)
 		(*Incrblob)(unsafe.Pointer(p)).FpStmt = uintptr(0)
 		if rc == SQLITE_OK {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6192, libc.VaList(bp+8, iRow))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6211, libc.VaList(bp+8, iRow))
 			rc = SQLITE_ERROR
 		} else {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3656, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3675, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
 		}
 	}
 
@@ -51642,21 +51660,21 @@ __3:
 		goto __4
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6212, libc.VaList(bp, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6231, libc.VaList(bp, zTable))
 __4:
 	;
 	if !(pTab != 0 && !((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0))) {
 		goto __5
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6242, libc.VaList(bp+8, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6261, libc.VaList(bp+8, zTable))
 __5:
 	;
 	if !(pTab != 0 && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __6
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6278, libc.VaList(bp+16, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6297, libc.VaList(bp+16, zTable))
 __6:
 	;
 	if !!(pTab != 0) {
@@ -51700,7 +51718,7 @@ __11:
 		goto __13
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6299, libc.VaList(bp+24, zColumn))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6318, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51727,7 +51745,7 @@ __19:
 	if !((*sColMap)(unsafe.Pointer(pFKey+64+uintptr(j)*16)).FiFrom == iCol) {
 		goto __22
 	}
-	zFault = ts + 6320
+	zFault = ts + 6339
 __22:
 	;
 	goto __20
@@ -51760,7 +51778,7 @@ __26:
 	if !(int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == iCol || int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == -2) {
 		goto __29
 	}
-	zFault = ts + 6332
+	zFault = ts + 6351
 __29:
 	;
 	goto __27
@@ -51781,7 +51799,7 @@ __25:
 		goto __30
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6340, libc.VaList(bp+32, zFault))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6359, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51879,7 +51897,7 @@ __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
-			return ts + 3656
+			return ts + 3675
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
@@ -51927,7 +51945,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99516)
+		return Xsqlite3MisuseError(tls, 99519)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52010,7 +52028,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99616)
+		return Xsqlite3MisuseError(tls, 99619)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52023,7 +52041,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 				if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-					return ts + 3656
+					return ts + 3675
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
@@ -54552,25 +54570,25 @@ 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 {
+	if Xsqlite3_strnicmp(tls, zTab, ts+6393, 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 {
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6401+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
 			return 1
 		}
 		if pSchema == uintptr(0) {
 			return 0
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5876+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5895+7) == 0 {
 			return 1
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6439+7) == 0 {
 			return 1
 		}
 	} else {
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6439+7) == 0 {
 			return 1
 		}
 	}
@@ -54650,7 +54668,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6434, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6453, zDb) == 0) {
 		goto __8
 	}
 
@@ -54771,7 +54789,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6439) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6458) != 0) {
 		goto __33
 	}
 	goto __14
@@ -54945,14 +54963,14 @@ __60:
 	;
 	goto __59
 __58:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6441, zTab) == 0) {
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6460, zTab) == 0) {
 		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
 	goto __62
 __61:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6445, zTab) == 0) {
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6464, zTab) == 0) {
 		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
@@ -54969,7 +54987,7 @@ __57:
 		goto __64
 	}
 	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6449, zTab) == 0) {
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6468, zTab) == 0) {
 		goto __65
 	}
 	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
@@ -55128,7 +55146,7 @@ __86:
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
 		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6458, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6477, libc.VaList(bp, zAs))
 	return WRC_Abort
 __90:
 	;
@@ -55136,14 +55154,14 @@ __90:
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
 		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6489, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6508, libc.VaList(bp+8, zAs))
 	return WRC_Abort
 __91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
 		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 	return WRC_Abort
 __92:
 	;
@@ -55195,7 +55213,7 @@ __11:
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6544, libc.VaList(bp+16, zCol))
+		ts+6563, 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
@@ -55232,7 +55250,7 @@ __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 + 6579
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6598
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
@@ -55245,23 +55263,23 @@ __101:
 __99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6588
+		zErr = ts + 6607
 	} else {
-		zErr = ts + 6603
+		zErr = ts + 6622
 	}
 	if !(zDb != 0) {
 		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6625, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6644, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
 	goto __105
 __104:
 	if !(zTab != 0) {
 		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6638, libc.VaList(bp+56, zErr, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6657, libc.VaList(bp+56, zErr, zTab, zCol))
 	goto __107
 __106:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp+80, zErr, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6667, libc.VaList(bp+80, zErr, zCol))
 __107:
 	;
 __105:
@@ -55364,15 +55382,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 + 6655
+	var zIn uintptr = ts + 6674
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6683
+		zIn = ts + 6702
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6701
+		zIn = ts + 6720
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6719
+		zIn = ts + 6738
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6737, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6756, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -55450,14 +55468,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 + 6757
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
-				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6762
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
-				}
-				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
+				*(*int32)(unsafe.Pointer(pExpr + 8)) = libc.Bool32(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL)
+				*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IntValue)
+				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_INTEGER)
+
 				i = 0
 				p = pNC
 			__4:
@@ -55501,7 +55515,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+6768, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6776, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -55565,7 +55579,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+6785, libc.VaList(bp, pExpr))
+								ts+6793, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -55581,7 +55595,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+6849,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6857,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -55595,7 +55609,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+6885, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6893, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -55618,30 +55632,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+6913, libc.VaList(bp+16, pExpr))
+						ts+6921, 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 + 6956
+						zType = ts + 6964
 					} else {
-						zType = ts + 6963
+						zType = ts + 6971
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6973, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6981, 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+7001, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7009, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7023,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7031,
 						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+7067,
+						ts+7075,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -55713,15 +55727,15 @@ 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+7115, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7123, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
 
 				if nRef != (*NameContext)(unsafe.Pointer(pNC)).FnRef {
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_VarSelect)
-					*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_VarSelect
 				}
+				*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_Subquery
 			}
 			break
 
@@ -55729,7 +55743,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+7126, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7134, pExpr, pExpr)
 			}
 
 			break
@@ -55785,7 +55799,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+6526, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -55860,7 +55874,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7137, libc.VaList(bp, i, zType, mx))
+		ts+7145, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -55880,7 +55894,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+7193, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7201, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -55915,7 +55929,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+7227, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7235, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -55972,7 +55986,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+7233, libc.VaList(bp, i+1))
+				ts+7241, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -56000,7 +56014,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+7294, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7302, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -56214,7 +56228,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+7325, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7333, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -56254,7 +56268,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+7227) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7235) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -56265,7 +56279,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7364) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7372) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -56277,7 +56291,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+7370, 0)
+						ts+7378, 0)
 					return WRC_Abort
 				}
 
@@ -57066,7 +57080,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 		return
 	}
 
@@ -57141,7 +57155,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+7429, libc.VaList(bp, mxHeight))
+			ts+7437, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -57390,12 +57404,12 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7477,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7485,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7521
+						return ts + 7529
 					}
-					return ts + 1547
+					return ts + 1566
 				}(), nElem))
 			break
 		}
@@ -57434,7 +57448,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+7523)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7531)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -57460,7 +57474,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+7525, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7533, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -57488,7 +57502,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+7559, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7567, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -57535,7 +57549,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+7579,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7587,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -57560,7 +57574,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+7622, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7630, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -58135,7 +58149,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+7645,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7653,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -58258,7 +58272,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+7675, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7683, libc.VaList(bp, zObject))
 	}
 }
 
@@ -58314,10 +58328,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+6757) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7706) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6762) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7711) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -58748,13 +58762,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+7698) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7717) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7706) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7725) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7712) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7731) == 0 {
 		return 1
 	}
 	return 0
@@ -58958,7 +58972,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+7716, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7735, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -59036,7 +59050,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+7763, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7782, 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)
 
@@ -59130,7 +59144,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 + 7794
+		var zFmt uintptr = ts + 7813
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -59148,7 +59162,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+6526, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 	}
 }
 
@@ -59189,7 +59203,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+7838, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7857, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -59219,11 +59233,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+7861, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7880, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
-				return ts + 1547
+				return ts + 1566
 			}
-			return ts + 7880
+			return ts + 7899
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -59350,7 +59364,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+7892, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7911, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -59365,11 +59379,11 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7910, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7929, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
-			return ts + 1547
+			return ts + 1566
 		}
-		return ts + 7880
+		return ts + 7899
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
@@ -59392,7 +59406,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+7523)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7531)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -59401,7 +59415,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+7931)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7950)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -59787,13 +59801,13 @@ 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+7933, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7936,
+			if Xsqlite3_strnicmp(tls, z, ts+7952, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7955,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
-							return ts + 4925
+							return ts + 4944
 						}
-						return ts + 1547
+						return ts + 1566
 					}(), pExpr))
 			} else {
 				codeReal(tls, v, z, negFlag, iMem)
@@ -59830,6 +59844,7 @@ func Xsqlite3ExprCodeLoadIndexColumn(tls *libc.TLS, pParse uintptr, pIdx uintptr
 func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr, pCol uintptr, regOut int32) {
 	var iAddr int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
+	var nErr int32 = (*Parse)(unsafe.Pointer(pParse)).FnErr
 
 	if (*Parse)(unsafe.Pointer(pParse)).FiSelfTab > 0 {
 		iAddr = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Parse)(unsafe.Pointer(pParse)).FiSelfTab-1, 0, regOut)
@@ -59843,6 +59858,9 @@ func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr
 	if iAddr != 0 {
 		Xsqlite3VdbeJumpHere(tls, v, iAddr)
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr > nErr {
+		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FerrByteOffset = -1
+	}
 }
 
 // Generate code to extract the value of the iCol-th column of a table.
@@ -59864,7 +59882,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+7963,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7982,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -60037,8 +60055,8 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 7993, ts + 7998, ts + 8003, ts + 6184,
-				ts + 6179, ts + 8011}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8012, ts + 8017, ts + 8022, ts + 6203,
+				ts + 6198, ts + 8030}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
@@ -60046,7 +60064,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 8019
+						return ts + 8038
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -60061,6 +60079,7 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 	var p uintptr
 	var v uintptr
 	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+		var exprAff U8
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -60074,6 +60093,14 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 		if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr, iDataCur) != 0 {
 			continue
 		}
+
+		exprAff = U8(Xsqlite3ExprAffinity(tls, pExpr))
+		if int32(exprAff) <= SQLITE_AFF_BLOB && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_BLOB ||
+			int32(exprAff) == SQLITE_AFF_TEXT && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_TEXT ||
+			int32(exprAff) >= SQLITE_AFF_NUMERIC && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_NUMERIC {
+			continue
+		}
+
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 
 		if (*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow != 0 {
@@ -60413,7 +60440,7 @@ __73:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
 		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7963,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7982,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
 __76:
@@ -60646,7 +60673,7 @@ __43:
 		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+8024, libc.VaList(bp+8, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8043, libc.VaList(bp+8, pExpr))
 	goto __91
 __90:
 	return func() int32 {
@@ -60687,7 +60714,7 @@ __93:
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
 		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8051, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8070, libc.VaList(bp+16, pExpr))
 	goto __5
 __94:
 	;
@@ -60847,7 +60874,7 @@ __121:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
 		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7645,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7653,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
 __122:
 	;
@@ -60869,11 +60896,10 @@ __49:
 	return target
 
 __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) {
+	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) {
 		goto __123
 	}
+
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
 		goto __125
@@ -60913,7 +60939,7 @@ __126:
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 	goto __5
 
 __55:
@@ -60944,13 +60970,19 @@ __129:
 	;
 __127:
 	;
-	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
+	addrINR = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable, 0, target)
 
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = U8(0)
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = okConstFactor
+	if !(inReg != target) {
+		goto __130
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
+	inReg = target
+__130:
+	;
 	Xsqlite3VdbeJumpHere(tls, v, addrINR)
-	Xsqlite3VdbeChangeP3(tls, v, addrINR, inReg)
 	goto __5
 
 __56:
@@ -60963,15 +60995,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __130
+		goto __131
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __131
+		goto __132
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__131:
+__132:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -60981,22 +61013,22 @@ __131:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__130:
+__131:
 	;
 	i1 = 0
-__132:
+__133:
 	if !(i1 < nExpr-1) {
-		goto __134
+		goto __135
 	}
 	if !(pX != 0) {
-		goto __135
+		goto __136
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __136
-__135:
-	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+	goto __137
 __136:
+	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+__137:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -61005,21 +61037,21 @@ __136:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __133
-__133:
-	i1 = i1 + 2
-	goto __132
 	goto __134
 __134:
+	i1 = i1 + 2
+	goto __133
+	goto __135
+__135:
 	;
 	if !(nExpr&1 != 0) {
-		goto __137
+		goto __138
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __138
-__137:
-	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+	goto __139
 __138:
+	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+__139:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -61029,27 +61061,27 @@ __138:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __139
-	}
-	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8075, 0)
-	return 0
-__139:
-	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __140
 	}
-	Xsqlite3MayAbort(tls, pParse)
+	Xsqlite3ErrorMsg(tls, pParse,
+		ts+8094, 0)
+	return 0
 __140:
 	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __141
 	}
+	Xsqlite3MayAbort(tls, pParse)
+__141:
+	;
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+		goto __142
+	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __142
-__141:
+	goto __143
+__142:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -61058,7 +61090,7 @@ __141:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__142:
+__143:
 	;
 	goto __5
 
@@ -61069,7 +61101,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8125))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8144))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -62861,11 +62893,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+6374, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6393, 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+8135, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8154, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -62877,13 +62909,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8163,
+		ts+8182,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8338,
+			ts+8357,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -62893,10 +62925,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8512, libc.VaList(bp, zDb, zDb))
+		ts+8531, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8659, 0)
+			ts+8678, 0)
 	}
 }
 
@@ -62960,7 +62992,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8810, libc.VaList(bp, zName))
+		ts+8829, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -62970,7 +63002,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8869, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8888, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -62979,7 +63011,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8875, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8894, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -63020,19 +63052,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8902, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8921, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9086,
+		ts+9105,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9391, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9410, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9407,
+		ts+9426,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -63040,7 +63072,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9465, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9484, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -63052,7 +63084,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9730, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9749, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63064,7 +63096,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9743,
+		ts+9762,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -63110,12 +63142,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9781, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9800, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9813, 0)
+			ts+9832, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -63125,11 +63157,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+9840)
+				ts+9859)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9899)
+				ts+9918)
 		}
 
 		if pDflt != 0 {
@@ -63142,12 +63174,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9952)
+					ts+9971)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9998)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10017)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -63158,7 +63190,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10025,
+			ts+10044,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -63180,7 +63212,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+10171,
+				ts+10190,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -63228,14 +63260,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10401, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10420, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10435, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10454, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -63263,7 +63295,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+10465, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10484, 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
 	}
@@ -63303,18 +63335,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 + 10484
+		zType = ts + 10503
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10489
+		zType = ts + 10508
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10503,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10522,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10521
+					return ts + 10540
 				}
-				return ts + 10538
+				return ts + 10557
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -63398,11 +63430,11 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10556, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10575, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1547, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1566, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iSchema == 1))
 
 	Xsqlite3MayAbort(tls, pParse)
@@ -63415,17 +63447,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10577,
+		ts+10596,
 		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+10759,
+		ts+10778,
 		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+9730, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9749, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63683,12 +63715,12 @@ 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+10890,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10909,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10913
+				return ts + 10932
 			}
-			return ts + 1547
+			return ts + 1566
 		}(), zWhen,
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg))
 	Xsqlite3_result_error(tls, pCtx, zErr, -1)
@@ -63728,8 +63760,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+10915, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 113494)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10934, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113516)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -63746,7 +63778,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, 113505)
+		rc = Xsqlite3CorruptError(tls, 113527)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -63768,7 +63800,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+10923, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10942, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -63808,12 +63840,12 @@ 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+10929, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10948, 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 + 10913
+							return ts + 10932
 						}
-						return ts + 1547
+						return ts + 1566
 					}()))
 				zReplace = zBuf2
 				nReplace = U32(Xsqlite3Strlen30(tls, zReplace))
@@ -64299,7 +64331,7 @@ __45:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FzErrMsg != 0) {
 		goto __47
 	}
-	renameColumnParseError(tls, context, ts+1547, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
+	renameColumnParseError(tls, context, ts+1566, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
 	goto __48
 __47:
 	Xsqlite3_result_error_code(tls, context, rc)
@@ -64464,7 +64496,7 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 			if rc == SQLITE_ERROR && Xsqlite3WritableSchema(tls, db) != 0 {
 				Xsqlite3_result_value(tls, context, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 			} else if (*Parse)(unsafe.Pointer(bp+80)).FzErrMsg != 0 {
-				renameColumnParseError(tls, context, ts+1547, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
+				renameColumnParseError(tls, context, ts+1566, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
 			} else {
 				Xsqlite3_result_error_code(tls, context, rc)
 			}
@@ -64667,7 +64699,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 114441)
+	rc = Xsqlite3CorruptError(tls, 114463)
 	goto drop_column_done
 __2:
 	;
@@ -64691,7 +64723,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10934, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10953, 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)
 
@@ -64772,19 +64804,19 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10556, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10575, 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+10941,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10960,
 		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 + 10969
+				return ts + 10988
 			}
-			return ts + 6120
+			return ts + 6139
 		}(),
 			zCol))
 	goto exit_drop_column
@@ -64793,7 +64825,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10981, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11000, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -64807,13 +64839,13 @@ __8:
 	goto exit_drop_column
 __9:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1547, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1566, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11029, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11048, 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+11150, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11169, 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
@@ -64931,11 +64963,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 + 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}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11187},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11208},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11228},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11247},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11266}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -64969,7 +65001,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+11270, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11289, 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)
 			}
@@ -64978,10 +65010,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+11293,
+					ts+11312,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11323, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11342, 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)
 			}
@@ -64999,9 +65031,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11341, FzCols: ts + 11354},
-	{FzName: ts + 11367, FzCols: ts + 11380},
-	{FzName: ts + 11408},
+	{FzName: ts + 11360, FzCols: ts + 11373},
+	{FzName: ts + 11386, FzCols: ts + 11399},
+	{FzName: ts + 11427},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65191,7 +65223,7 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11421}
+	FzName:     ts + 11440}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
@@ -65442,7 +65474,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11431}
+	FzName:     ts + 11450}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -65456,7 +65488,7 @@ 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+11441,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11460,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
 					return (*StatAccum)(unsafe.Pointer(p)).FnEst
@@ -65469,7 +65501,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11446, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11465, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -65511,7 +65543,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+11452, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11471, 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--
@@ -65525,7 +65557,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11458}
+	FzName:     ts + 11477}
 
 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)
@@ -65569,7 +65601,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+11467, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11486, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -65586,7 +65618,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+11341, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11360, 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)
@@ -65742,7 +65774,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+11477, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11496, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -65799,7 +65831,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+11477, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11496, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -65846,9 +65878,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+11481)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11500)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11485)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11504)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -65931,7 +65963,7 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 	var v TRowcnt
 
 	if z == uintptr(0) {
-		z = ts + 1547
+		z = ts + 1566
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
 		v = uint64(0)
@@ -65953,15 +65985,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+11489, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11508, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11500, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11519, 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+11510, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11529, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -66237,11 +66269,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+11367, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11386, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11522,
-			ts+11576,
+			ts+11541,
+			ts+11595,
 			zDb)
 	}
 	return rc
@@ -66288,10 +66320,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+11341, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11360, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11628, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11647, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -66349,7 +66381,7 @@ 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+6434, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6453, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -66382,13 +66414,13 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zFile == uintptr(0)) {
 		goto __1
 	}
-	zFile = ts + 1547
+	zFile = ts + 1566
 __1:
 	;
 	if !(zName == uintptr(0)) {
 		goto __2
 	}
-	zName = ts + 1547
+	zName = ts + 1566
 __2:
 	;
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2)) != 0) {
@@ -66396,14 +66428,14 @@ __2:
 	}
 
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3828)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3847)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11669, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11688, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
 	if !(rc == SQLITE_OK) {
 		goto __6
 	}
@@ -66440,7 +66472,7 @@ __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11672,
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11691,
 		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
@@ -66454,7 +66486,7 @@ __12:
 	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __15
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11709, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11728, libc.VaList(bp+8, zName))
 	goto attach_error
 __15:
 	;
@@ -66518,7 +66550,7 @@ __4:
 		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11739, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11758, 0)
 	goto __23
 __22:
 	if !(rc == SQLITE_OK) {
@@ -66535,7 +66567,7 @@ __25:
 		goto __27
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
-		ts+11768, 0)
+		ts+11787, 0)
 	rc = SQLITE_ERROR
 __27:
 	;
@@ -66601,13 +66633,13 @@ __33:
 	}
 	Xsqlite3OomFault(tls, db)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1483, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1502, 0)
 	goto __35
 __34:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
 		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11836, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11855, libc.VaList(bp+16, zFile))
 __36:
 	;
 __35:
@@ -66654,7 +66686,7 @@ func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zName == uintptr(0)) {
 		goto __1
 	}
-	zName = ts + 1547
+	zName = ts + 1566
 __1:
 	;
 	i = 0
@@ -66685,14 +66717,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11864, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11883, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11885, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11904, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -66700,7 +66732,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11911, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11930, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -66817,7 +66849,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11933}
+	FzName:     ts + 11952}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -66830,7 +66862,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11947}
+	FzName:     ts + 11966}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -66844,7 +66876,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+11961, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11980, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -66876,7 +66908,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+11985,
+						ts+12004,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -67051,7 +67083,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+12031, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12050, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -67077,11 +67109,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+12054, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12073, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12060, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12079, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12066, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12085, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -67128,7 +67160,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 + 7706
+		zCol = ts + 7725
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -67152,7 +67184,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+12093, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12112, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -67423,25 +67455,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6434) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6453) == 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+6374, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6393, 7) == 0 {
 			if i == 1 {
-				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 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6439+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5895+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+6382)
+						ts+6401)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6439+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+5876)
+						ts+5895)
 				}
 			}
 		}
@@ -67462,12 +67494,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		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 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6393, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6439+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5895)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+6382)
+					ts+6401)
 			}
 		}
 	}
@@ -67498,7 +67530,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+12108, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12127, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -67516,14 +67548,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 + 12116
+			zMsg = ts + 12135
 		} else {
-			zMsg = ts + 12129
+			zMsg = ts + 12148
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6638, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6657, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6667, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -67553,12 +67585,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+6374, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5876+7) == 0 {
-			return ts + 6420
+	if Xsqlite3_strnicmp(tls, zName, ts+6393, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5895+7) == 0 {
+			return ts + 6439
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6382+7) == 0 {
-			return ts + 6401
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6401+7) == 0 {
+			return ts + 6420
 		}
 	}
 	return zName
@@ -67916,7 +67948,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+5876)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5895)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -67942,7 +67974,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6434, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6453, zName) {
 				goto __3
 			}
 
@@ -67995,13 +68027,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+12143, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12162, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12160, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12179, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -68039,13 +68071,13 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 		if Xsqlite3_stricmp(tls, zType, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit))) != 0 ||
 			Xsqlite3_stricmp(tls, zName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 1*8))) != 0 ||
 			Xsqlite3_stricmp(tls, zTblName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 2*8))) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1547, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1566, 0)
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6374, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6393, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12180,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12199,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -68205,9 +68237,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 + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -68223,7 +68255,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12222, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12241, 0)
 	return
 __4:
 	;
@@ -68251,9 +68283,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10484
+			return ts + 10503
 		}
-		return ts + 8869
+		return ts + 8888
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -68269,9 +68301,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 + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -68302,12 +68334,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12263,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12282,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10484
+				return ts + 10503
 			}
-			return ts + 8869
+			return ts + 8888
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -68322,7 +68354,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12284, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12303, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -68409,7 +68441,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+12319, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12338, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -68433,7 +68465,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+12336, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12355, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -68453,7 +68485,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 + 12319
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12338
 	(*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)
@@ -68465,7 +68497,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+12319, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12338, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -68499,7 +68531,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+12370, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12389, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -68507,13 +68539,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+12393, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12412, 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+12400, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12419, 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--
@@ -68550,7 +68582,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+12410, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12429, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -68714,10 +68746,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+12436,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12455,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12481, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12500, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -68748,7 +68780,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+12522, 0)
+			ts+12541, 0)
 	}
 }
 
@@ -68793,7 +68825,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12574, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12593, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -68882,7 +68914,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12615, 0)
+		ts+12634, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -68977,7 +69009,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12671, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12690, 0)
 	goto generated_done
 __2:
 	;
@@ -68990,13 +69022,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12714, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12733, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12722, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12741, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -69030,13 +69062,19 @@ __10:
 
 	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
 __11:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_RAISE) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = (*Column)(unsafe.Pointer(pCol)).Faffinity
+__12:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12729,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12748,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -69157,13 +69195,13 @@ __3:
 	;
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
-		zSep = ts + 1547
-		zSep2 = ts + 12760
-		zEnd = ts + 4950
+		zSep = ts + 1566
+		zSep2 = ts + 12779
+		zEnd = ts + 4969
 	} else {
-		zSep = ts + 12762
-		zSep2 = ts + 12766
-		zEnd = ts + 12771
+		zSep = ts + 12781
+		zSep2 = ts + 12785
+		zEnd = ts + 12790
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -69171,7 +69209,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12774, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12793, 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('(')
@@ -69205,17 +69243,17 @@ __5:
 	goto __6
 __6:
 	;
-	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3656, libc.VaList(bp, zEnd))
+	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3675, libc.VaList(bp, zEnd))
 	return zStmt
 }
 
 var azType1 = [6]uintptr{
-	ts + 1547,
-	ts + 12788,
-	ts + 12794,
-	ts + 12799,
-	ts + 12804,
-	ts + 12794,
+	ts + 1566,
+	ts + 12807,
+	ts + 12813,
+	ts + 12818,
+	ts + 12823,
+	ts + 12813,
 }
 
 func resizeIndexObject(tls *libc.TLS, db uintptr, pIdx uintptr, N int32) int32 {
@@ -69605,7 +69643,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
 		if pSelect != 0 || !(int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM) && (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1547, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1566, 0)
 			return
 		}
 		(*Table)(unsafe.Pointer(p)).Ftnum = (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum
@@ -69622,10 +69660,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+12810,
-						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1547)))
+						ts+12829,
+						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1566)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12843,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12862,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -69644,11 +69682,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+12870, 0)
+				ts+12889, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12920, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12939, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -69682,7 +69720,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12952, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12971, 0)
 			return
 		}
 	}
@@ -69707,11 +69745,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 + 8869
-			zType2 = ts + 12996
+			zType = ts + 8888
+			zType2 = ts + 13015
 		} else {
-			zType = ts + 10484
-			zType2 = ts + 13002
+			zType = ts + 10503
+			zType2 = ts + 13021
 		}
 
 		if pSelect != 0 {
@@ -69782,11 +69820,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+13007, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13026, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13022,
+			ts+13041,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -69802,13 +69840,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+13120,
+					ts+13139,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13162, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13181, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -69823,7 +69861,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+9391) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9410) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -69853,7 +69891,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+13196, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13215, 0)
 	goto create_view_fail
 __1:
 	;
@@ -69869,7 +69907,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10484, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10503, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -69951,7 +69989,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13232, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13251, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -70076,13 +70114,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+13262, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13281, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13277,
+		ts+13296,
 		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)
 }
@@ -70123,10 +70161,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+13344, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13363, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11293,
+				ts+11312,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -70158,12 +70196,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+13358,
+			ts+13377,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13403,
+		ts+13422,
 		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)
@@ -70191,11 +70229,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+6374, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3279, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6393, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3298, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7126, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7134, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -70273,9 +70311,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -70334,21 +70372,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13470, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13489, 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+13498, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13517, 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+13532, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13551, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -70360,7 +70398,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11485, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11504, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -70424,7 +70462,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13564,
+		ts+13583,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -70436,7 +70474,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13627, 0)
+		ts+13646, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -70521,7 +70559,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13721,
+		ts+13740,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -70748,12 +70786,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+13767,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13786,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13795
+							return ts + 13814
 						}
-						return ts + 13801
+						return ts + 13820
 					}()))
 				return 1
 			}
@@ -70874,7 +70912,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13806, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13825, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -70893,7 +70931,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13812,
+		ts+13831,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -70919,26 +70957,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6393, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13862, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13881, 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+13890, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13909, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13915, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13934, 0)
 	goto exit_create_index
 __17:
 	;
@@ -70952,7 +70990,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13806, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13825, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -70967,7 +71005,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13949, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13968, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -70979,7 +71017,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13983, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14002, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -71008,7 +71046,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14007, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14026, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -71029,9 +71067,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -71070,7 +71108,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13806)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13825)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -71171,7 +71209,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14030, 0)
+		ts+14049, 0)
 	goto exit_create_index
 __56:
 	;
@@ -71388,7 +71426,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14091, libc.VaList(bp+48, 0))
+		ts+14110, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -71440,8 +71478,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14133, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14152, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121859)
 	goto exit_create_index
 __101:
 	;
@@ -71487,12 +71525,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14150,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14169,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
-				return ts + 1547
+				return ts + 1566
 			}
-			return ts + 14170
+			return ts + 14189
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -71500,7 +71538,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14178,
+		ts+14197,
 		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,
@@ -71514,7 +71552,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14237, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14256, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -71675,7 +71713,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14264, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14283, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -71690,7 +71728,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14282, libc.VaList(bp+8, 0))
+		ts+14301, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -71701,9 +71739,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 + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -71729,9 +71767,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14355,
+		ts+14374,
 		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+11481, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11500, (*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)
@@ -71866,7 +71904,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+14415,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14434,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -72074,12 +72112,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+14451,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14470,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14487
+				return ts + 14506
 			}
-			return ts + 14490
+			return ts + 14509
 		}()))
 	goto append_from_error
 __1:
@@ -72248,7 +72286,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14496, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14515, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -72284,9 +72322,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14502
+				return ts + 14521
 			}
-			return ts + 14511
+			return ts + 14530
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -72311,7 +72349,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14496, ts + 14518, ts + 14502}
+var az = [3]uintptr{ts + 14515, ts + 14537, ts + 14521}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -72326,7 +72364,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+14526, 0)
+				ts+14545, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -72463,17 +72501,17 @@ 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+14596, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14615, 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+14607, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14626, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
-			Xsqlite3_str_append(tls, bp+8, ts+1560, 1)
+			Xsqlite3_str_append(tls, bp+8, ts+1579, 1)
 			Xsqlite3_str_appendall(tls, bp+8, zCol)
 		}
 	}
@@ -72496,11 +72534,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+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12073, 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+14610, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14629, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -72630,7 +72668,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14619, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14638, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -72726,7 +72764,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+14665, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14684, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -72919,7 +72957,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14695, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14714, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -73199,7 +73237,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+14726,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14745,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -73231,11 +73269,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+14759, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14778, 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+14788, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14807, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -73486,7 +73524,7 @@ __20:
 	goto __16
 __15:
 	wcf = U16(WHERE_ONEPASS_DESIRED | WHERE_DUPLICATES_OK)
-	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_VarSelect != 0) {
+	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_Subquery != 0) {
 		goto __23
 	}
 	bComplex = 1
@@ -73739,7 +73777,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14826)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14845)
 __62:
 	;
 delete_from_cleanup:
@@ -73854,7 +73892,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+11341) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11360) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -74084,7 +74122,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 + 7998, ts + 7993, ts + 6174}
+var azType2 = [5]uintptr{ts + 6203, ts + 6198, ts + 8017, ts + 8012, ts + 6193}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -74143,7 +74181,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+14839, -1)
+					Xsqlite3_result_error(tls, context, ts+14858, -1)
 					return
 				}
 				iVal = -iVal
@@ -74447,7 +74485,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14856, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14875, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -74793,7 +74831,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+14861, -1)
+		Xsqlite3_result_error(tls, context, ts+14880, -1)
 		return
 	}
 	if argc == 3 {
@@ -74803,7 +74841,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+14894, -1)
+				ts+14913, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -74856,7 +74894,7 @@ func errlogFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	_ = argc
 	_ = context
-	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3656, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
+	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3675, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
 }
 
 func compileoptionusedFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
@@ -74896,13 +74934,13 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 
 			var zVal uintptr
 			r1 = Xsqlite3_value_double(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+4918, libc.VaList(bp, r1))
+			Xsqlite3_str_appendf(tls, pStr, ts+4937, libc.VaList(bp, r1))
 			zVal = Xsqlite3_str_value(tls, pStr)
 			if zVal != 0 {
 				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+14939, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14958, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -74910,7 +74948,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 		}
 	case SQLITE_INTEGER:
 		{
-			Xsqlite3_str_appendf(tls, pStr, ts+1327, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
+			Xsqlite3_str_appendf(tls, pStr, ts+1346, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
 			break
 
 		}
@@ -74939,13 +74977,13 @@ 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+14946, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14965, libc.VaList(bp+24, zArg))
 			break
 
 		}
 	default:
 		{
-			Xsqlite3_str_append(tls, pStr, ts+1548, 4)
+			Xsqlite3_str_append(tls, pStr, ts+1567, 4)
 			break
 
 		}
@@ -75086,7 +75124,7 @@ func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 	var ch U32
 	var c U8
 	var d U8
-	zPass = ts + 1547
+	zPass = ts + 1566
 	nPass = 0
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -75368,7 +75406,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10913}
+var azOne = [1]uintptr{ts + 10932}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -75380,7 +75418,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	zIn = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	if zIn == uintptr(0) {
-		zIn = ts + 1547
+		zIn = ts + 1566
 	}
 	for i = 0; *(*U8)(unsafe.Pointer(zIn + uintptr(i))) != 0 && !(int32(Xsqlite3CtypeMap[*(*U8)(unsafe.Pointer(zIn + uintptr(i)))])&0x02 != 0); i++ {
 	}
@@ -75404,7 +75442,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+14949, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14968, 4, uintptr(0))
 	}
 }
 
@@ -75429,7 +75467,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+12093, -1)
+		Xsqlite3_result_error(tls, context, ts+12112, -1)
 		return
 	}
 
@@ -75507,7 +75545,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+14839, -1)
+			Xsqlite3_result_error(tls, context, ts+14858, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -75769,7 +75807,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+14954, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14973, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -75789,14 +75827,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14960, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14979, 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+14960, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14979, 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+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)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14979, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14979, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -76037,109 +76075,109 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 }
 
 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 + 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(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(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 + 14984},
+	{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 + 15004},
+	{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 + 15017},
+	{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 + 15035},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15044},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15052},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15052},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15067},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15093},
+	{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 + 15118},
+	{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 + 15127},
+	{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 + 15138},
+	{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 + 15145},
+	{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 + 15159},
+	{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 + 15159},
+	{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 + 15165},
+	{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 + 15165},
+	{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 + 15171},
+	{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 + 15171},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15176},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15176},
+	{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 + 15176},
+	{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 + 15180},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15180},
+	{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 + 15180},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15184},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15191},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15199},
+	{FnArg: int8(2), 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 + 15212},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15219},
+	{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 + 15234},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15239},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15243},
+	{FnArg: int8(2), 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 + 15255},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15261},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15265},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15265},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15271},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15278},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15285},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15296},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15303},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15318},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15335},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15346},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15352},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15370},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15378},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15392},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15400},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15409},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15409},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{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 + 15426},
+	{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 + 15430},
+	{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 + 15436},
+	{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 + 15440},
+	{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 + 15440},
+	{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 + 15446},
+	{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 + 15446},
+	{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 + 15459},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14979},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14979},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6598},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6598},
 	{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 + 15516},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15469},
+	{FnArg: int8(1), 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 + 15483},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15489},
+	{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 + 15492},
+	{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 + 15496},
+	{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 + 15502},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15492},
+	{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 + 15511},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15515},
 	{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 + 15525},
+	{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 + 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 + 15549},
+	{FnArg: int8(2), 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 + 15546},
+	{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 + 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 + 15558},
+	{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 + 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 + 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}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15591},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15596},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15604},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15612},
+	{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_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6598},
+	{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 + 15620}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -76260,7 +76298,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+15605,
+				ts+15624,
 				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)
@@ -76920,8 +76958,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 + 6445, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6441, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6464, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6460, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -77000,7 +77038,7 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 			(*Token)(unsafe.Pointer(bp + 80)).Fz = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 			(*Token)(unsafe.Pointer(bp + 80)).Fn = uint32(Xsqlite3Strlen30(tls, (*Token)(unsafe.Pointer(bp+80)).Fz))
 
-			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5129)
+			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5148)
 			if pRaise != 0 {
 				(*Expr)(unsafe.Pointer(pRaise)).FaffExpr = int8(OE_Abort)
 			}
@@ -77421,7 +77459,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7963, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7982, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -77889,7 +77927,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15650,
+		ts+15669,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -77914,7 +77952,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15691,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15710,
 		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
@@ -78063,7 +78101,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15723,
+		ts+15742,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -78073,7 +78111,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15775, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15794, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -78125,7 +78163,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15800,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15819,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -78133,7 +78171,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15846, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15865, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -78545,7 +78583,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15867)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15886)
 __125:
 	;
 insert_cleanup:
@@ -78861,7 +78899,7 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 					fallthrough
 				case OE_Fail:
 					{
-						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12073, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 							(*Column)(unsafe.Pointer(pCol)).FzCnName))
 
 						Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
@@ -79952,13 +79990,13 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131895)
+	return Xsqlite3MisuseError(tls, 131931)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
 		goto __2
 	}
-	zSql = ts + 1547
+	zSql = ts + 1566
 __2:
 	;
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -80437,7 +80475,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12093, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12112, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -80446,7 +80484,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15881
+		zEntry = ts + 15900
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -80461,7 +80499,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+12054, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12073, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -80497,7 +80535,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15904, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15923, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -80511,7 +80549,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15913, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15932, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -80535,7 +80573,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15917, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15936, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -80553,7 +80591,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15923, libc.VaList(bp+16, zEntry, zFile))
+		ts+15942, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -80580,7 +80618,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15966, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15985, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -80618,7 +80656,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15998, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16017, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -80628,7 +80666,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16035,
+	ts + 16054,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80784,7 +80822,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+16038, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16057, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -80792,63 +80830,63 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 }
 
 var pragCName = [57]uintptr{
-	ts + 5050,
-	ts + 16077,
-	ts + 8869,
-	ts + 16081,
-	ts + 16086,
-	ts + 16089,
-	ts + 16099,
-	ts + 16109,
-	ts + 16115,
-	ts + 16119,
-	ts + 16124,
-	ts + 16129,
-	ts + 16137,
+	ts + 5069,
+	ts + 16096,
+	ts + 8888,
+	ts + 16100,
+	ts + 16105,
+	ts + 16108,
+	ts + 16118,
+	ts + 16128,
+	ts + 16134,
+	ts + 16138,
+	ts + 16143,
 	ts + 16148,
-	ts + 16151,
-	ts + 16158,
-	ts + 16119,
-	ts + 16124,
-	ts + 16165,
+	ts + 16156,
+	ts + 16167,
 	ts + 16170,
-	ts + 16173,
-	ts + 16180,
-	ts + 16115,
-	ts + 16119,
-	ts + 16186,
-	ts + 16191,
-	ts + 16196,
-	ts + 16119,
-	ts + 16200,
-	ts + 16124,
-	ts + 16208,
-	ts + 16212,
-	ts + 16217,
-	ts + 11485,
-	ts + 11481,
-	ts + 16223,
-	ts + 16228,
-	ts + 16233,
-	ts + 16077,
-	ts + 16119,
-	ts + 16238,
-	ts + 16245,
+	ts + 16177,
+	ts + 16138,
+	ts + 16143,
+	ts + 16184,
+	ts + 16189,
+	ts + 16192,
+	ts + 16199,
+	ts + 16134,
+	ts + 16138,
+	ts + 16205,
+	ts + 16210,
+	ts + 16215,
+	ts + 16138,
+	ts + 16219,
+	ts + 16143,
+	ts + 16227,
+	ts + 16231,
+	ts + 16236,
+	ts + 11504,
+	ts + 11500,
+	ts + 16242,
+	ts + 16247,
 	ts + 16252,
-	ts + 8869,
-	ts + 16260,
-	ts + 5053,
-	ts + 16266,
-	ts + 16077,
-	ts + 16119,
+	ts + 16096,
+	ts + 16138,
+	ts + 16257,
+	ts + 16264,
 	ts + 16271,
-	ts + 16276,
-	ts + 15473,
-	ts + 16281,
-	ts + 16294,
-	ts + 16303,
-	ts + 16310,
-	ts + 16321,
+	ts + 8888,
+	ts + 16279,
+	ts + 5072,
+	ts + 16285,
+	ts + 16096,
+	ts + 16138,
+	ts + 16290,
+	ts + 16295,
+	ts + 15492,
+	ts + 16300,
+	ts + 16313,
+	ts + 16322,
+	ts + 16329,
+	ts + 16340,
 }
 
 // Definitions of all built-in pragmas
@@ -80866,238 +80904,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16329,
+	{FzName: ts + 16348,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16344,
+	{FzName: ts + 16363,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16359,
+	{FzName: ts + 16378,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16371,
+	{FzName: ts + 16390,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16387,
+	{FzName: ts + 16406,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16310,
+	{FzName: ts + 16329,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16400,
+	{FzName: ts + 16419,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16412,
+	{FzName: ts + 16431,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16432,
+	{FzName: ts + 16451,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CellSizeCk)},
-	{FzName: ts + 16448,
+	{FzName: ts + 16467,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16469,
+	{FzName: ts + 16488,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16484,
+	{FzName: ts + 16503,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16500,
+	{FzName: ts + 16519,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16514,
+	{FzName: ts + 16533,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16527,
+	{FzName: ts + 16546,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16541,
+	{FzName: ts + 16560,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16560,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_DeferFKs)},
 	{FzName: ts + 16579,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_DeferFKs)},
+	{FzName: ts + 16598,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16602,
+	{FzName: ts + 16621,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16611,
+	{FzName: ts + 16630,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16629,
+	{FzName: ts + 16648,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16646,
+	{FzName: ts + 16665,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16659,
+	{FzName: ts + 16678,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16674,
+	{FzName: ts + 16693,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16692,
+	{FzName: ts + 16711,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16702,
+	{FzName: ts + 16721,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16716,
+	{FzName: ts + 16735,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16732,
+	{FzName: ts + 16751,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16757,
+	{FzName: ts + 16776,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16776,
+	{FzName: ts + 16795,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16787,
+	{FzName: ts + 16806,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16798,
+	{FzName: ts + 16817,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16810,
+	{FzName: ts + 16829,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16826,
+	{FzName: ts + 16845,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16839,
+	{FzName: ts + 16858,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16858,
+	{FzName: ts + 16877,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16877,
+	{FzName: ts + 16896,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16890,
+	{FzName: ts + 16909,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16905,
+	{FzName: ts + 16924,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16915,
+	{FzName: ts + 16934,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16927,
+	{FzName: ts + 16946,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16936,
+	{FzName: ts + 16955,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16947,
+	{FzName: ts + 16966,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16957,
+	{FzName: ts + 16976,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16969,
+	{FzName: ts + 16988,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16980,
+	{FzName: ts + 16999,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16992,
+	{FzName: ts + 17011,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17009,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_RecTriggers)},
 	{FzName: ts + 17028,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_RecTriggers)},
+	{FzName: ts + 17047,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17054,
+	{FzName: ts + 17073,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17069,
+	{FzName: ts + 17088,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17083,
+	{FzName: ts + 17102,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17102,
+	{FzName: ts + 17121,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17116,
+	{FzName: ts + 17135,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17132,
+	{FzName: ts + 17151,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17144,
+	{FzName: ts + 17163,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17155,
+	{FzName: ts + 17174,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17166,
+	{FzName: ts + 17185,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17178,
+	{FzName: ts + 17197,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17189,
+	{FzName: ts + 17208,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17210,
+	{FzName: ts + 17229,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17218,
+	{FzName: ts + 17237,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17233,
+	{FzName: ts + 17252,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17246,
-		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
 	{FzName: ts + 17265,
+		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
+	{FzName: ts + 17284,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17280,
+	{FzName: ts + 17299,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -81119,7 +81157,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 17296))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 17315))
 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)}
@@ -81131,10 +81169,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+17321) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17340) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17331) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17350) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -81143,13 +81181,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+8019) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8038) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17357) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17343) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17362) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -81164,9 +81202,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+16271) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16290) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17355) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17374) == 0 {
 		return 2
 	} else {
 		return 0
@@ -81180,7 +81218,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+17362, 0)
+				ts+17381, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -81271,19 +81309,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17424
+		zName = ts + 17443
 		break
 	case OE_SetDflt:
-		zName = ts + 17433
+		zName = ts + 17452
 		break
 	case OE_Cascade:
-		zName = ts + 17445
+		zName = ts + 17464
 		break
 	case OE_Restrict:
-		zName = ts + 17453
+		zName = ts + 17472
 		break
 	default:
-		zName = ts + 17462
+		zName = ts + 17481
 		break
 	}
 	return zName
@@ -81300,7 +81338,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17472, ts + 17479, ts + 17487, ts + 17491, ts + 17355, ts + 17500,
+	ts + 17491, ts + 17498, ts + 17506, ts + 17510, ts + 17374, ts + 17519,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -81347,13 +81385,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17504
+			zType = ts + 17523
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17506
+			zType = ts + 17525
 		} else {
-			zType = ts + 7521
+			zType = ts + 7529
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17508,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17527,
 			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),
@@ -81361,7 +81399,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17515, ts + 17520, ts + 17528}
+var azEnc = [4]uintptr{uintptr(0), ts + 17534, ts + 17539, ts + 17547}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -81512,6 +81550,7 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp7 int32
 	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
@@ -81608,7 +81647,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17536, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17555, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -81647,7 +81686,7 @@ __8:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 488)) != 0) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 488)))
 __10:
 	;
@@ -81869,7 +81908,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17540) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17559) == 0) {
 		goto __64
 	}
 	b = 2
@@ -81941,7 +81980,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17331
+	zRet = ts + 17350
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -81979,7 +82018,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17321
+	zRet = ts + 17340
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -82266,7 +82305,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 552)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17545, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17564, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -82285,7 +82324,7 @@ __127:
 	if !(*(*int8)(unsafe.Pointer(zRight)) != 0) {
 		goto __128
 	}
-	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+16, zRight))
+	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+16, zRight))
 	goto __129
 __128:
 	Xsqlite3_temp_directory = uintptr(0)
@@ -82307,7 +82346,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17570, 0)
+		ts+17589, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -82361,7 +82400,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17623) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17642) == 0) {
 		goto __142
 	}
 
@@ -82458,13 +82497,13 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17629
+			return ts + 17648
 		}
-		return ts + 17637
+		return ts + 17656
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
-			Xsqlite3ColumnType(tls, pCol, ts+1547),
+			Xsqlite3ColumnType(tls, pCol, ts+1566),
 			func() int32 {
 				if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 {
 					return 1
@@ -82529,7 +82568,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17644, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17663, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -82542,7 +82581,7 @@ __172:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __173
 	}
-	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1483, 0)
+	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1502, 0)
 	(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 __173:
 	;
@@ -82575,29 +82614,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10484
+	zType = ts + 10503
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12714
+	zType = ts + 12733
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17660
+	zType = ts + 17679
 	goto __183
 __182:
-	zType = ts + 8869
+	zType = ts + 8888
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17667,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17686,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -82663,7 +82702,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17693, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -82673,7 +82712,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17679,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17698,
 		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))))
@@ -82710,8 +82749,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17684, ts + 17686, ts + 16148}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17688,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17703, ts + 17705, ts + 16167}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17707,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -82744,7 +82783,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17694,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17713,
 		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)))
@@ -82766,7 +82805,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17698, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17717, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -82830,7 +82869,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7521, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7529, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -82846,7 +82885,7 @@ __218:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7521, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7529, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -82881,7 +82920,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17720,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -82889,7 +82928,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+17710))
+			ts+17729))
 	goto __227
 __227:
 	j2++
@@ -83078,7 +83117,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17715, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17734, 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)))
@@ -83295,7 +83334,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+17719, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17738, 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)
@@ -83406,7 +83445,7 @@ __307:
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17743,
+		ts+17762,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
@@ -83505,7 +83544,7 @@ __321:
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17779, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17798, 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) {
@@ -83527,7 +83566,7 @@ __326:
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17799,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17818,
 		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)
@@ -83540,7 +83579,7 @@ __329:
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17821,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17840,
 		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 __332
@@ -83558,11 +83597,11 @@ __331:
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
 __334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17844, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17863, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17846,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17865,
 		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)
 __333:
@@ -83608,7 +83647,7 @@ __339:
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17866,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17885,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
@@ -83642,89 +83681,103 @@ __344:
 
 	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+17896)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17915)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17901)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17920)
 	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)
 
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __345
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_IdxRowid, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
+	jmp7 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 3, 0, r1+int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn)-1)
+
+	Xsqlite3VdbeLoadString(tls, v, 3,
+		ts+17941)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17977)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp7)
+__345:
+	;
 	label6 = 0
 	kk = 0
-__345:
+__346:
 	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) {
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
 		goto __349
 	}
-	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+	goto __347
 __349:
+	;
+	if !(label6 == 0) {
+		goto __350
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__350:
 	;
 	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:
+	kk++
+	goto __346
+	goto __348
+__348:
 	;
 	if !(label6 != 0) {
-		goto __350
+		goto __351
 	}
 	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
 	Xsqlite3VdbeResolveLabel(tls, v, label6)
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17896)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17915)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17922)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17988)
 	Xsqlite3VdbeGoto(tls, v, jmp5-1)
 	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-__350:
+__351:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __351
+		goto __352
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__352:
+__353:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __354
+		goto __355
 	}
 	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 __355
+		goto __356
 	}
-	goto __353
-__355:
+	goto __354
+__356:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
-	goto __353
-__353:
-	kk++
-	goto __352
 	goto __354
 __354:
+	kk++
+	goto __353
+	goto __355
+__355:
 	;
 	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)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18015)
 	Xsqlite3VdbeGoto(tls, v, jmp5)
 	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
-__351:
+__352:
 	;
 	Xsqlite3VdbeJumpHere(tls, v, jmp4)
 	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
@@ -83741,20 +83794,20 @@ __340:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 612)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __356
+		goto __357
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17976)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+18042)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__357:
+__358:
 	if !(pIdx5 != 0) {
-		goto __359
-	}
-	if !(pPk1 == pIdx5) {
 		goto __360
 	}
-	goto __358
-__360:
+	if !(pPk1 == pIdx5) {
+		goto __361
+	}
+	goto __359
+__361:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -83763,21 +83816,21 @@ __360:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __358
-__358:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __357
 	goto __359
 __359:
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
+	goto __358
+	goto __360
+__360:
 	;
 	if !(pPk1 != 0) {
-		goto __361
+		goto __362
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__361:
+__362:
 	;
-__356:
+__357:
 	;
 	goto __291
 __291:
@@ -83795,14 +83848,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __362
+		goto __363
 	}
 	(*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 + 18005
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18071
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__362:
+__363:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -83810,27 +83863,27 @@ __362:
 
 __45:
 	if !!(zRight != 0) {
-		goto __363
+		goto __364
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __365
-	}
-	goto pragma_out
-__365:
-	;
-	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __364
-__363:
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
 		goto __366
 	}
+	goto pragma_out
+__366:
+	;
+	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
+	goto __365
+__364:
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
+		goto __367
+	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__367:
+__368:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __369
+		goto __370
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __370
+		goto __371
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -83839,25 +83892,25 @@ __367:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __369
-__370:
-	;
-	goto __368
-__368:
-	pEnc += 16
-	goto __367
-	goto __369
-__369:
-	;
-	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __371
-	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18008, libc.VaList(bp+456, zRight))
+	goto __370
 __371:
 	;
-__366:
+	goto __369
+__369:
+	pEnc += 16
+	goto __368
+	goto __370
+__370:
 	;
-__364:
+	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
+		goto __372
+	}
+	Xsqlite3ErrorMsg(tls, pParse, ts+18074, libc.VaList(bp+456, zRight))
+__372:
+	;
+__367:
+	;
+__365:
 	;
 	goto __15
 
@@ -83865,15 +83918,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 __372
+		goto __373
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __374
+		goto __375
 	}
 	goto __15
-__374:
+__375:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -83881,41 +83934,41 @@ __374:
 	(*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 __375
+		goto __376
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__375:
+__376:
 	;
-	goto __373
-__372:
+	goto __374
+__373:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __376
+		goto __377
 	}
 	goto __15
-__376:
+__377:
 	;
 	(*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)
-__373:
+__374:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__377:
+__378:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __378
+		goto __379
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __377
-__378:
+	goto __378
+__379:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -83930,31 +83983,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __379
-	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17338) == 0) {
 		goto __380
 	}
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17357) == 0) {
+		goto __381
+	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __381
-__380:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18033) == 0) {
-		goto __382
+	goto __382
+__381:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18099) == 0) {
+		goto __383
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __383
-__382:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17491) == 0) {
-		goto __384
+	goto __384
+__383:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17510) == 0) {
+		goto __385
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
+__385:
+	;
 __384:
 	;
-__383:
+__382:
 	;
-__381:
-	;
-__379:
+__380:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -83964,10 +84017,10 @@ __379:
 
 __49:
 	if !(zRight != 0) {
-		goto __385
+		goto __386
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__385:
+__386:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -83987,19 +84040,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __386
+		goto __387
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __388
+		goto __389
 	}
 	goto __15
-__388:
+__389:
 	;
-	goto __387
-__386:
-	opMask = U32(0xfffe)
+	goto __388
 __387:
+	opMask = U32(0xfffe)
+__388:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -84008,86 +84061,86 @@ __387:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__389:
+__390:
 	if !(iDb <= iDbLast) {
-		goto __391
-	}
-	if !(iDb == 1) {
 		goto __392
 	}
-	goto __390
-__392:
+	if !(iDb == 1) {
+		goto __393
+	}
+	goto __391
+__393:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__393:
+__394:
 	if !(k4 != 0) {
-		goto __395
+		goto __396
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __396
+		goto __397
 	}
-	goto __394
-__396:
+	goto __395
+__397:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__397:
+__398:
 	if !(pIdx6 != 0) {
-		goto __399
-	}
-	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
 		goto __400
 	}
+	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
+		goto __401
+	}
 	szThreshold = int16(0)
-	goto __399
-__400:
+	goto __400
+__401:
 	;
-	goto __398
-__398:
-	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __397
 	goto __399
 __399:
+	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
+	goto __398
+	goto __400
+__400:
 	;
 	if !(szThreshold != 0) {
-		goto __401
+		goto __402
 	}
 	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))
 
-__401:
+__402:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18041,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18107,
 		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 __402
+		goto __403
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __403
-__402:
-	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+	goto __404
 __403:
+	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+__404:
 	;
-	goto __394
-__394:
-	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __393
 	goto __395
 __395:
+	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
+	goto __394
+	goto __396
+__396:
 	;
-	goto __390
-__390:
-	iDb++
-	goto __389
 	goto __391
 __391:
+	iDb++
+	goto __390
+	goto __392
+__392:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -84095,36 +84148,36 @@ __391:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __404
+		goto __405
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__404:
+__405:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+640) == SQLITE_OK) {
-		goto __405
+		goto __406
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))
-__405:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __406
+		goto __407
 	}
 	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 __407
+		goto __408
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__407:
+__408:
 	;
-__406:
+__407:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -84133,10 +84186,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) >= int64(0)) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656))&int64(0x7fffffff)))
-__408:
+__409:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -84145,10 +84198,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __409
+		goto __410
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) & int64(0x7fffffff))
-__409:
+__410:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -84156,10 +84209,10 @@ __409:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __410
+		goto __411
 	}
 
-__410:
+__411:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -84211,14 +84264,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{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},
+	{FzName: ts + 18125, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18130, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18136, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18145, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18154, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18162, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18170},
+	{FzName: ts + 18177},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -84270,7 +84323,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+18117)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18183)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -84278,7 +84331,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18132, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18198, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -84291,19 +84344,19 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18205, 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+18145)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18211)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18157)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18223)
 		j++
 	}
-	Xsqlite3_str_append(tls, bp+32, ts+4950, 1)
+	Xsqlite3_str_append(tls, bp+32, ts+4969, 1)
 	Xsqlite3StrAccumFinish(tls, bp+32)
 
 	rc = Xsqlite3_declare_vtab(tls, db, bp+64)
@@ -84319,7 +84372,7 @@ __3:
 			(*PragmaVtab)(unsafe.Pointer(pTab)).FnHidden = U8(j)
 		}
 	} else {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	}
 
 	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
@@ -84467,7 +84520,7 @@ __1:
 		var zText uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 
 		if zText != 0 {
-			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, zText))
+			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, zText))
 			if *(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) == uintptr(0) {
 				return SQLITE_NOMEM
 			}
@@ -84483,13 +84536,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+18172)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18238)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18180, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18246, 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+18184, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18250, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -84498,7 +84551,7 @@ __3:
 	rc = Xsqlite3_prepare_v2(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
 	Xsqlite3_free(tls, zSql)
 	if rc != SQLITE_OK {
-		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
+		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
 		return rc
 	}
 	return pragmaVtabNext(tls, pVtabCursor)
@@ -84566,33 +84619,33 @@ 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+18188, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18254, 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, 137196)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137249)
 	} else {
 		var z uintptr
 		var zObj uintptr
 		if *(*uintptr)(unsafe.Pointer(azObj + 1*8)) != 0 {
 			zObj = *(*uintptr)(unsafe.Pointer(azObj + 1*8))
 		} else {
-			zObj = ts + 5001
+			zObj = ts + 5020
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18216, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18282, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18247, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18313, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137256)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18255,
-	ts + 18262,
-	ts + 18274,
+	ts + 18321,
+	ts + 18328,
+	ts + 18340,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -84652,7 +84705,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+14133)
+				corruptSchema(tls, pData, argv, ts+14152)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -84684,13 +84737,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+18285)
+			corruptSchema(tls, pData, argv, ts+18351)
 		} 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+14133)
+				corruptSchema(tls, pData, argv, ts+14152)
 			}
 		}
 	}
@@ -84723,16 +84776,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 + 8869
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8888
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7931
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18298
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7950
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18364
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -84826,7 +84879,7 @@ __10:
 		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11768)
+		ts+11787)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __15:
@@ -84861,7 +84914,7 @@ __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)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18436)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __19:
@@ -84875,7 +84928,7 @@ __20:
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18394,
+		ts+18460,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -85148,7 +85201,7 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
 	(*Parse)(unsafe.Pointer(pParse)).Fdb = db
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1483, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1502, 0)
 	}
 }
 
@@ -85176,7 +85229,7 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, bp+16, ts+1483, 0)
+	Xsqlite3ErrorMsg(tls, bp+16, ts+1502, 0)
 __1:
 	;
 	if !(prepFlags&U32(SQLITE_PREPARE_PERSISTENT) != 0) {
@@ -85207,7 +85260,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18428, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18494, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -85237,7 +85290,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18458, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18524, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -85297,7 +85350,7 @@ __21:
 	if !((*Parse)(unsafe.Pointer(bp+16)).FzErrMsg != 0) {
 		goto __22
 	}
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3656, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3675, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 	Xsqlite3DbFree(tls, db, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
 	goto __23
 __22:
@@ -85333,7 +85386,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, 137995)
+		return Xsqlite3MisuseError(tls, 138048)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -85432,7 +85485,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, 138143)
+		return Xsqlite3MisuseError(tls, 138196)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -85750,8 +85803,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 + 10913
-		var zSp2 uintptr = ts + 10913
+		var zSp1 uintptr = ts + 10932
+		var zSp2 uintptr = ts + 10932
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -85759,13 +85812,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18477, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18543, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18507))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18573))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -85940,7 +85993,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+18541, libc.VaList(bp, 0))
+					ts+18607, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -85985,7 +86038,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+18591, libc.VaList(bp+8, zName))
+						ts+18657, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -85996,7 +86049,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+18655,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18721,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -86040,7 +86093,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6579, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6598, 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.
@@ -86624,16 +86677,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18692
+		z = ts + 18758
 		break
 	case TK_INTERSECT:
-		z = ts + 18702
+		z = ts + 18768
 		break
 	case TK_EXCEPT:
-		z = ts + 18712
+		z = ts + 18778
 		break
 	default:
-		z = ts + 18719
+		z = ts + 18785
 		break
 	}
 	return z
@@ -86643,7 +86696,7 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18725, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18791, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
@@ -86669,11 +86722,11 @@ 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 {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18814, libc.VaList(bp, func() uintptr {
 		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
-			return ts + 18779
+			return ts + 18845
 		}
-		return ts + 1547
+		return ts + 1566
 	}()))
 
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
@@ -86861,8 +86914,8 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 				}
 
 				if iCol < 0 {
-					zType = ts + 1112
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16260
+					zType = ts + 1131
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16279
 				} 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))
@@ -87001,13 +87054,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16260
+				zCol = ts + 16279
 			} 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+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12073, 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))
@@ -87015,7 +87068,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+18794, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18860, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -87105,7 +87158,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16260
+					zName = ts + 16279
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -87115,7 +87168,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18794, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18860, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -87131,7 +87184,7 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18803, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18869, 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)
@@ -87214,8 +87267,6 @@ __1:
 		(*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
@@ -87230,12 +87281,15 @@ __1:
 			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
 				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
 			}
+			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)
+			}
 		}
 		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
+				zType = ts + 18877
 			} else {
 				zType = uintptr(0)
 				for j = 1; j < SQLITE_N_STDTYPE; j++ {
@@ -87451,7 +87505,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18815, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18881, 0)
 	return
 __1:
 	;
@@ -87542,7 +87596,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18864, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18930, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -87562,7 +87616,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18906, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18972, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -87599,7 +87653,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18912, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18978, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -87633,11 +87687,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+18927, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18993, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
-			return ts + 1547
+			return ts + 1566
 		}
-		return ts + 18950
+		return ts + 19016
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -87738,8 +87792,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18952, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18967, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19018, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19033, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -87786,7 +87840,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18692, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18758, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -87853,7 +87907,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+18986, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19052, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -87915,7 +87969,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+18986, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19052, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -88068,10 +88122,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+19007, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19073, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19053,
+			ts+19119,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -88325,8 +88379,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+7227)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7227)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7235)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7235)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -88353,13 +88407,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+19135, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19201, 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+19146, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19212, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -88371,7 +88425,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+19151, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19217, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -88559,7 +88613,8 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 				Xsqlite3VectorErrorMsg(tls, (*SubstContext)(unsafe.Pointer(pSubst)).FpParse, pCopy)
 			} else {
 				var db uintptr = (*Parse)(unsafe.Pointer((*SubstContext)(unsafe.Pointer(pSubst)).FpParse)).Fdb
-				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 && int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN {
+				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 &&
+					(int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN || (*Expr)(unsafe.Pointer(pCopy)).FiTable != (*SubstContext)(unsafe.Pointer(pSubst)).FiNewTable) {
 					libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
 					(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_IF_NULL_ROW)
 					(*Expr)(unsafe.Pointer(bp)).FpLeft = pCopy
@@ -88599,7 +88654,7 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 								if pColl != 0 {
 									return (*CollSeq)(unsafe.Pointer(pColl)).FzName
 								}
-								return ts + 1092
+								return ts + 1111
 							}())
 					}
 
@@ -89387,12 +89442,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15157) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15176) == 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+15161) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15180) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -89458,7 +89513,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+19157, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19223, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -89541,7 +89596,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+19175, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19241, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -89670,7 +89725,7 @@ 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+19198, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19264, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
@@ -89693,7 +89748,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+19218, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19284, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -89709,7 +89764,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19261
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19327
 		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 {
@@ -89735,7 +89790,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+19284,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19350,
 					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
@@ -89746,9 +89801,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 + 19322
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19388
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19356
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19422
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -89795,7 +89850,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+19394, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19460, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -89907,7 +89962,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19398,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19464,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -89926,7 +89981,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+19437,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19503,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -89934,7 +89989,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+14726,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14745,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -90035,7 +90090,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6439
+							zSchemaName = ts + 6458
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -90050,7 +90105,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+19468, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19534, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -90115,7 +90170,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+19473,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19539,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -90127,7 +90182,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+12054, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12073, 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)
@@ -90146,9 +90201,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19482, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19548, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19500, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19566, 0)
 					}
 				}
 			}
@@ -90158,7 +90213,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+19520, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19586, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -90296,7 +90351,7 @@ func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect ui
 	(*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)
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSelect)).FpGroupBy)).FnExpr)
 		} 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)
 		}
@@ -90380,13 +90435,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19551, 0)
+					ts+19617, 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+19602, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19668, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -90575,19 +90630,19 @@ 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+19635,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19701,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19647
+						return ts + 19713
 					}
-					return ts + 1547
+					return ts + 1566
 				}(),
 				func() uintptr {
 					if bCover != 0 {
 						return (*Index)(unsafe.Pointer(pIdx)).FzName
 					}
-					return ts + 1547
+					return ts + 1566
 				}()))
 	}
 }
@@ -90600,7 +90655,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+7931)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7950)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -90907,7 +90962,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19670,
+		ts+19736,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -90968,7 +91023,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19724,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19790,
 		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:
@@ -91072,7 +91127,7 @@ __27:
 	if !((*SrcItem)(unsafe.Pointer(pItem1)).FcolUsed == uint64(0) && (*SrcItem)(unsafe.Pointer(pItem1)).FzName != uintptr(0)) {
 		goto __30
 	}
-	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1547, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
+	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1566, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
 __30:
 	;
 	pSub1 = (*SrcItem)(unsafe.Pointer(pItem1)).FpSelect
@@ -91110,7 +91165,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+19764, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19830, 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)
@@ -91169,7 +91224,7 @@ __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19779, libc.VaList(bp+40, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19845, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
@@ -91640,9 +91695,9 @@ __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 + 19795
+				return ts + 19861
 			}
-			return ts + 19804
+			return ts + 19870
 		}())
 
 	groupBySort = 1
@@ -91993,7 +92048,7 @@ __65:
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
 		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19795)
+	explainTempTable(tls, pParse, ts+19861)
 __146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
@@ -92076,7 +92131,7 @@ __7:
 	if !(i < nCol) {
 		goto __9
 	}
-	z = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
+	z = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
 	if !(z == uintptr(0)) {
 		goto __10
 	}
@@ -92098,7 +92153,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19813, 0)
+		ts+19879, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -92194,7 +92249,7 @@ func Xsqlite3_get_table(tls *libc.TLS, db uintptr, zSql uintptr, pazResult uintp
 		if (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
 			if pzErrMsg != 0 {
 				Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(pzErrMsg)))
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
 			}
 			Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg)
 		}
@@ -92331,7 +92386,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+19878, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19944, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -92375,7 +92430,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19924, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19990, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -92393,7 +92448,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19932, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19998, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -92405,7 +92460,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19924, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19990, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -92420,11 +92475,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19973, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20039, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
+
 __17:
 	;
 	goto trigger_cleanup
@@ -92432,22 +92488,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6393, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19999, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20065, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20037,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20103,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20074
+				return ts + 20140
 			}
-			return ts + 20081
+			return ts + 20147
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -92456,7 +92512,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20087, libc.VaList(bp+24, pTableName+8))
+		ts+20153, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -92485,9 +92541,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -92605,7 +92661,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19924, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19990, 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
@@ -92638,7 +92694,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20133,
+		ts+20199,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -92663,13 +92719,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20181,
+		ts+20247,
 		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+20256, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20322, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -92925,7 +92981,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20285, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20351, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -92964,9 +93020,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 + 6382
+				return ts + 6401
 			}
-			return ts + 5876
+			return ts + 5895
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -92978,7 +93034,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20305,
+			ts+20371,
 			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)
@@ -93092,12 +93148,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20367,
+		ts+20433,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20415
+				return ts + 20481
 			}
-			return ts + 20422
+			return ts + 20488
 		}()))
 __15:
 	;
@@ -93211,7 +93267,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+20429, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20495, 0)
 	return 1
 }
 
@@ -93277,7 +93333,7 @@ func codeReturningTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab
 	}
 	Xsqlite3ExprListDelete(tls, db, (*Select)(unsafe.Pointer(bp)).FpEList)
 	pNew = sqlite3ExpandReturning(tls, pParse, (*Returning)(unsafe.Pointer(pReturning)).FpReturnEL, pTab)
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0) {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
 		libc.Xmemset(tls, bp+240, 0, uint64(unsafe.Sizeof(NameContext{})))
 		if (*Returning)(unsafe.Pointer(pReturning)).FnRetCol == 0 {
 			(*Returning)(unsafe.Pointer(pReturning)).FnRetCol = (*ExprList)(unsafe.Pointer(pNew)).FnExpr
@@ -93331,7 +93387,7 @@ func codeTriggerProgram(tls *libc.TLS, pParse uintptr, pStepList uintptr, orconf
 
 		if (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan != 0 {
 			Xsqlite3VdbeAddOp4(tls, v, OP_Trace, 0x7fffffff, 1, 0,
-				Xsqlite3MPrintf(tls, db, ts+6073, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
+				Xsqlite3MPrintf(tls, db, ts+6092, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
 				-6)
 		}
 
@@ -93441,7 +93497,7 @@ 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+20471, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20537, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
@@ -94034,7 +94090,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20485,
+		ts+20551,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -94066,7 +94122,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20521, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20587, 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:
@@ -94076,7 +94132,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7706
+				return ts + 7725
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -94392,7 +94448,12 @@ __74:
 	goto __77
 __76:
 	flags = WHERE_ONEPASS_DESIRED
-	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) && !(pTrigger != 0) && !(hasFK != 0) && !(chngKey != 0) && !(*(*int32)(unsafe.Pointer(bp + 104)) != 0)) {
+	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) &&
+		!(pTrigger != 0) &&
+		!(hasFK != 0) &&
+		!(chngKey != 0) &&
+		!(*(*int32)(unsafe.Pointer(bp + 104)) != 0) &&
+		(*NameContext)(unsafe.Pointer(bp+40)).FncFlags&NC_Subquery == 0) {
 		goto __78
 	}
 	flags = flags | WHERE_ONEPASS_MULTIROW
@@ -94946,7 +95007,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20540)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20606)
 __169:
 	;
 update_cleanup:
@@ -95252,10 +95313,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+20553, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+20619, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20557, libc.VaList(bp+8, bp+216))
+				ts+20623, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -95346,7 +95407,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+12143, -1)
+				ts+12162, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -95378,7 +95439,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+20630, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20634, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20696, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20700, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -95526,14 +95587,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+20638)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20704)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20678)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20744)
 	return SQLITE_ERROR
 __2:
 	;
@@ -95544,7 +95605,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20721)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20787)
 	return SQLITE_ERROR
 __5:
 	;
@@ -95553,7 +95614,7 @@ __5:
 	*(*uint32)(unsafe.Pointer(db + 76)) |= uint32(SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE)
 	goto __4
 __3:
-	zOut = ts + 1547
+	zOut = ts + 1566
 __4:
 	;
 	saved_flags = (*Sqlite3)(unsafe.Pointer(db)).Fflags
@@ -95572,7 +95633,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20739, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20805, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -95592,7 +95653,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20762)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20828)
 	goto end_of_vacuum
 __8:
 	;
@@ -95607,7 +95668,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14496)
+	rc = execSql(tls, db, pzErrMsg, ts+14515)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -95652,7 +95713,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20789,
+		ts+20855,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -95661,7 +95722,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20897,
+		ts+20963,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -95672,7 +95733,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20951,
+		ts+21017,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -95683,7 +95744,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21102,
+		ts+21168,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -96028,7 +96089,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+12370, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12389, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -96112,11 +96173,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+21232, libc.VaList(bp, pParse+272))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21298, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21256,
+			ts+21322,
 			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,
@@ -96126,7 +96187,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21355, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21421, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -96187,7 +96248,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+21374, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21440, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -96215,9 +96276,11 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FbDeclared = 0
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = bp + 32
+	(*Table)(unsafe.Pointer(pTab)).FnTabRef++
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{xConstruct})).f(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, pVTable+16, bp+64)
+	Xsqlite3DeleteTable(tls, db, pTab)
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = (*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -96225,9 +96288,9 @@ 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+21416, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21482, libc.VaList(bp+8, zModuleName))
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3656, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3675, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 		}
 		Xsqlite3DbFree(tls, db, pVTable)
@@ -96237,7 +96300,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 + 21446
+			var zFormat uintptr = ts + 21512
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -96249,12 +96312,12 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 			*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) = pVTable
 
 			for iCol = 0; iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol); iCol++ {
-				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1547)
+				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1566)
 				var nType int32
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16151, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16170, 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
@@ -96311,13 +96374,13 @@ 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+21492, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21558, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxConnect, bp+16)
 		if rc != SQLITE_OK {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 		}
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 16)))
@@ -96369,7 +96432,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+21492, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21558, 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)
@@ -96403,7 +96466,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, 151030)
+		return Xsqlite3MisuseError(tls, 151102)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -96445,7 +96508,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR,
 			func() uintptr {
 				if (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
-					return ts + 3656
+					return ts + 3675
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg))
@@ -96813,7 +96876,7 @@ func Xsqlite3VtabEponymousTableInit(tls *libc.TLS, pParse uintptr, pMod uintptr)
 	addModuleArgument(tls, pParse, pTab, Xsqlite3DbStrDup(tls, db, (*Table)(unsafe.Pointer(pTab)).FzName))
 	rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer(pModule)).FxConnect, bp+8)
 	if rc != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+		Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		Xsqlite3VtabEponymousTableClear(tls, db, pMod)
 	}
@@ -96856,7 +96919,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, 151521)
+		rc = Xsqlite3MisuseError(tls, 151593)
 	} else {
 		ap = va
 		switch op {
@@ -96883,7 +96946,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 151539)
+				rc = Xsqlite3MisuseError(tls, 151611)
 				break
 
 			}
@@ -97114,10 +97177,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 + 21511
+		return ts + 21577
 	}
 	if i == -1 {
-		return ts + 16260
+		return ts + 16279
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -97126,35 +97189,35 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21518, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21584, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21524, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21590, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12760, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12779, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4950, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4969, 1)
 	}
 
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21524, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21590, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12760, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12779, 1)
 		}
-		Xsqlite3_str_append(tls, pStr, ts+5001, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5020, 1)
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4950, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4969, 1)
 	}
 }
 
@@ -97171,29 +97234,29 @@ 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+21526, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21592, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21518, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21584, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21529
+				return ts + 21595
 			}
-			return ts + 21534
+			return ts + 21600
 		}(), 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+21542)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21608)
 		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+21544)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21610)
 	}
-	Xsqlite3_str_append(tls, pStr, ts+4950, 1)
+	Xsqlite3_str_append(tls, pStr, ts+4969, 1)
 }
 
 // This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
@@ -97234,11 +97297,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+21546, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21612, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21552
+				return ts + 21618
 			}
-			return ts + 21559
+			return ts + 21625
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -97248,43 +97311,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 + 10969
+					zFmt = ts + 10988
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21564
+				zFmt = ts + 21630
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21597
+				zFmt = ts + 21663
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21622
+				zFmt = ts + 21688
 			} else {
-				zFmt = ts + 21640
+				zFmt = ts + 21706
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21649, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21715, 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 + 16260
-			Xsqlite3_str_appendf(tls, bp+64, ts+21657, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16279
+			Xsqlite3_str_appendf(tls, bp+64, ts+21723, 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+21688, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21754, 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+21698, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21764, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21703,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21769,
 				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+21730, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21796, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -97316,25 +97379,25 @@ 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+21741, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21807, 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+21529, 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+21595, 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+21762, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21828, 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+21518, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21584, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21529, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21595, libc.VaList(bp+16, z))
 		}
 	}
-	Xsqlite3_str_append(tls, bp+24, ts+4950, 1)
+	Xsqlite3_str_append(tls, bp+24, ts+4969, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
@@ -98928,7 +98991,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21770, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21836, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -98956,7 +99019,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21785, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21851, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -99474,7 +99537,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+21794, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21860, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -99832,10 +99895,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{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)},
+	{FzOp: ts + 16128, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15459, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14979, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21874, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -100325,12 +100388,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21815, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21881, 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+21815, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21881, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -100409,7 +100472,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 + 6762
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7711
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -100503,7 +100566,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 21856
+				return ts + 21922
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -100879,7 +100942,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21863,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21929,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -100895,7 +100958,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 		pRhs = Xsqlite3PExpr(tls, pParse, TK_UPLUS,
 			Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*ExprList_item)(unsafe.Pointer(pArgs+8+uintptr(j)*32)).FpExpr, 0), uintptr(0))
 		pTerm = Xsqlite3PExpr(tls, pParse, TK_EQ, pColRef, pRhs)
-		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ|JT_RIGHT) != 0 {
 			joinType = U32(EP_OuterON)
 		} else {
 			joinType = U32(EP_InnerON)
@@ -101613,7 +101676,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21899, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21965, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -101684,7 +101747,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21925
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21991
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -101858,6 +101921,10 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	var iCur int32
+	var saved_pIdxEpr uintptr
+
+	saved_pIdxEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 
 	addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	for __ccgo := true; __ccgo; __ccgo = iLevel < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel) {
@@ -101901,9 +101968,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, n)
 			var jj int32
 			for jj = 0; jj < n; jj++ {
-				var iCol int32 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(jj)*2)))
-
-				Xsqlite3ExprCodeGetColumnOfTable(tls, v, (*Index)(unsafe.Pointer(pIdx)).FpTable, iCur, iCol, r1+jj)
+				Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pIdx, iCur, jj, r1+jj)
 			}
 			Xsqlite3VdbeAddOp4Int(tls, v, OP_FilterAdd, (*WhereLevel)(unsafe.Pointer(pLevel)).FregFilter, 0, r1, n)
 			Xsqlite3ReleaseTempRange(tls, pParse, r1, n)
@@ -101937,6 +102002,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 		}
 	}
 	Xsqlite3VdbeJumpHere(tls, v, addrOnce)
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = saved_pIdxEpr
 }
 
 func allocateIndexInfo(tls *libc.TLS, pWInfo uintptr, pWC uintptr, mUnusable Bitmask, pSrc uintptr, pmNoOmit uintptr) uintptr {
@@ -102050,7 +102116,7 @@ __3:
 		uint64(unsafe.Sizeof(sqlite3_index_orderby{}))*uint64(nOrderBy)+uint64(unsafe.Sizeof(HiddenIndexInfo1{}))+
 		uint64(unsafe.Sizeof(uintptr(0)))*uint64(nTerm))
 	if pIdxInfo == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1483, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1502, 0)
 		return uintptr(0)
 	}
 	pHidden = pIdxInfo + 1*96
@@ -102172,9 +102238,9 @@ func vtabBestIndex(tls *libc.TLS, pParse uintptr, pTab uintptr, p uintptr) int32
 		if rc == SQLITE_NOMEM {
 			Xsqlite3OomFault(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb)
 		} else if !(int32((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
 		}
 	}
 	Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg)
@@ -102195,11 +102261,16 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 
 	_ = pParse
 
+	if !((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol)
+	} else {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnColumn)
+	}
 	nField = func() int32 {
-		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < (*Index)(unsafe.Pointer(pIdx)).FnSample {
+		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < nField {
 			return int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField)
 		}
-		return (*Index)(unsafe.Pointer(pIdx)).FnSample
+		return nField
 	}()
 	iCol = 0
 	iSample = (*Index)(unsafe.Pointer(pIdx)).FnSample * nField
@@ -103780,7 +103851,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+21936, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+22002, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -103838,7 +103909,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+21936, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+22002, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -104236,7 +104307,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+21962, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+22028, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -104843,7 +104914,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21997, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22063, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -104878,6 +104949,10 @@ __3:
 			if int32((*WherePath)(unsafe.Pointer(pFrom)).FisOrdered) == (*ExprList)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpOrderBy)).FnExpr {
 				(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_ORDERED)
 			}
+			if (*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy != 0 &&
+				int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) > (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr {
+				(*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat = I8((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr)
+			}
 		} else {
 			(*WhereInfo)(unsafe.Pointer(pWInfo)).FrevMask = (*WherePath)(unsafe.Pointer(pFrom)).FrevLoop
 			if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) <= 0 {
@@ -105172,6 +105247,9 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
+		if Xsqlite3IndexAffinityStr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pIdx) != 0 {
+			(*IndexedExpr)(unsafe.Pointer(p)).Faff = U8(*(*int8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FzColAff + uintptr(i))))
+		}
 		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
@@ -105324,7 +105402,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22015, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22081, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -105388,7 +105466,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22043, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22109, 0)
 	goto __5
 __4:
 	ii = 0
@@ -106270,7 +106348,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22061, -1)
+		pCtx, ts+22127, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -106403,7 +106481,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+22117, -1)
+					pCtx, ts+22183, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -106493,17 +106571,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-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))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22228))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22239))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22250))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22255))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22268))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22278))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22284))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22295))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22305))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22317))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22322))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -106549,7 +106627,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22260, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22326, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -106593,12 +106671,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+22279, 0)
+			ts+22345, 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+22350, 0)
+				ts+22416, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -106621,7 +106699,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+7931)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7950)
 					}
 					break
 				}
@@ -106825,7 +106903,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+22413, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22479, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -106941,7 +107019,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+7523))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7531))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -107056,7 +107134,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22439, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22505, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -107121,15 +107199,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 + 22471
+				zErr = ts + 22537
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22488
+				zErr = ts + 22554
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22504
+				zErr = ts + 22570
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22524, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22590, 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 {
@@ -107150,7 +107228,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+22557, 0)
+				ts+22623, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -107288,7 +107366,7 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regZero)
 	if eCond >= WINDOW_STARTING_NUM {
 		var regString int32 = Xsqlite3GetTempReg(tls, pParse)
-		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1547, -1)
+		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1566, -1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, Xsqlite3VdbeCurrentAddr(tls, v)+2, reg)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL))
 
@@ -107306,11 +107384,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22604,
-	ts + 22657,
-	ts + 22061,
-	ts + 22708,
-	ts + 22760,
+	ts + 22670,
+	ts + 22723,
+	ts + 22127,
+	ts + 22774,
+	ts + 22826,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -107801,7 +107879,7 @@ func windowCodeRangeTest(tls *libc.TLS, p uintptr, op int32, csr1 int32, regVal
 
 	}
 
-	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1547, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1566, -1)
 	addrGe = Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, 0, reg1)
 
 	if op == OP_Ge && arith == OP_Add || op == OP_Le && arith == OP_Subtract {
@@ -108705,19 +108783,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+22810,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22876,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 22852
+							return ts + 22918
 						}
-						return ts + 22861
+						return ts + 22927
 					}(),
 						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+22867, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22933, 0)
 		}
 	}
 
@@ -108785,7 +108863,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+22901,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22967,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -109882,7 +109960,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22939, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23005, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -110857,21 +110935,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+16260, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16279, 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+22961, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23027, 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+16173, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16192, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22961, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23027, 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))
@@ -111614,7 +111692,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+22988)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+23054)
 				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 {
@@ -111778,7 +111856,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+22997, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23063, 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))
@@ -111995,9 +112073,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 + 6757
+							return ts + 7706
 						}
-						return ts + 6762
+						return ts + 7711
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -112281,19 +112359,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+23021, 0)
+					ts+23087, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23116, 0)
+					ts+23182, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23200, 0)
+					ts+23266, 0)
 			}
 			break
 		case uint32(273):
@@ -112672,9 +112750,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+22997, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23063, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23285, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23351, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -113442,7 +113520,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+23302, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23368, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -113463,9 +113541,9 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 	}
 	if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg != 0 || (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_OK && (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_DONE {
 		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)))
+			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3675, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23327, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23393, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -113638,7 +113716,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23338, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23404, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -113651,11 +113729,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19924, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19990, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23411, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23350, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23416, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -113668,9 +113746,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23360, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23426, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23364, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23430, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -113740,7 +113818,8 @@ func sqlite3TestExtInit(tls *libc.TLS, db uintptr) int32 {
 	return Xsqlite3FaultSim(tls, 500)
 }
 
-var sqlite3BuiltinExtensions = [4]uintptr{
+var sqlite3BuiltinExtensions = [5]uintptr{
+	0,
 	0,
 	0,
 	0,
@@ -113904,7 +113983,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 174337)
+		return Xsqlite3MisuseError(tls, 174426)
 	}
 
 	ap = va
@@ -114479,7 +114558,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175111)
+		return Xsqlite3MisuseError(tls, 175200)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -114494,7 +114573,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23372, 0)
+			ts+23438, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -114685,23 +114764,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 + 23440
+	var zErr uintptr = ts + 23506
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23454
+			zErr = ts + 23520
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23476
+			zErr = ts + 23542
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23498
+			zErr = ts + 23564
 			break
 
 		}
@@ -114719,35 +114798,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23521,
-	ts + 23534,
+	ts + 23587,
+	ts + 23600,
 	uintptr(0),
-	ts + 23550,
-	ts + 23575,
-	ts + 23589,
-	ts + 23608,
-	ts + 1483,
-	ts + 23633,
-	ts + 23670,
-	ts + 23682,
-	ts + 23697,
-	ts + 23730,
+	ts + 23616,
+	ts + 23641,
+	ts + 23655,
+	ts + 23674,
+	ts + 1502,
+	ts + 23699,
+	ts + 23736,
 	ts + 23748,
-	ts + 23773,
-	ts + 23802,
+	ts + 23763,
+	ts + 23796,
+	ts + 23814,
+	ts + 23839,
+	ts + 23868,
 	uintptr(0),
-	ts + 5831,
-	ts + 5327,
-	ts + 23819,
-	ts + 23837,
-	ts + 23855,
+	ts + 5850,
+	ts + 5346,
+	ts + 23885,
+	ts + 23903,
+	ts + 23921,
 	uintptr(0),
-	ts + 23889,
+	ts + 23955,
 	uintptr(0),
-	ts + 23910,
-	ts + 23936,
-	ts + 23959,
-	ts + 23980,
+	ts + 23976,
+	ts + 24002,
+	ts + 24025,
+	ts + 24046,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -114868,7 +114947,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, 175758)
+		return Xsqlite3MisuseError(tls, 175847)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -114913,7 +114992,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+23996, 0)
+				ts+24062, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -115030,7 +115109,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+24059, libc.VaList(bp, zName))
+		ts+24125, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -115058,7 +115137,7 @@ func Xsqlite3_overload_function(tls *libc.TLS, db uintptr, zName uintptr, nArg i
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, zName))
+	zCopy = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, zName))
 	if zCopy == uintptr(0) {
 		return SQLITE_NOMEM
 	}
@@ -115266,7 +115345,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+24110, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24176, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -115359,7 +115438,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, 176503))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176592))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -115429,7 +115508,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, 176582)
+		return Xsqlite3MisuseError(tls, 176671)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115439,7 +115518,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, 176591)
+		return Xsqlite3MisuseError(tls, 176680)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115471,14 +115550,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, 176639)
+		return Xsqlite3MisuseError(tls, 176728)
 	}
 
 	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+24131, 0)
+				ts+24197, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -115608,7 +115687,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+24199, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24265, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -115653,10 +115732,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24205, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24271, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24215,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24281,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -115761,7 +115840,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24243, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24309, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -115772,17 +115851,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24247, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24313, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24247
+	zModeType = ts + 24313
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24253, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24319, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -115790,7 +115869,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 3265
+	zModeType = ts + 3284
 __32:
 	;
 	if !(aMode != 0) {
@@ -115820,7 +115899,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24258, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24324, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -115828,7 +115907,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24278,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24344,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -115868,7 +115947,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24302, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24368, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -115892,15 +115971,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24318, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24325, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24384, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24391, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{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},
+	{Fz: ts + 24399, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24402, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24405, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17374, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -116046,10 +116125,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+21856, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21922, 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+24343, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24409, 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) {
@@ -116063,7 +116142,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 177308)
+	rc = Xsqlite3MisuseError(tls, 177397)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -116080,7 +116159,7 @@ __19:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3656
+			return ts + 3675
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -116114,9 +116193,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 + 6434
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6453
 	(*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 + 23345
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23411
 	(*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)
@@ -116221,7 +116300,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24349
+		zFilename = ts + 24415
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -116324,21 +116403,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+24352,
+	Xsqlite3_log(tls, iErr, ts+24418,
 		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+24377)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24443)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24397)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24463)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24404)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24470)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -116449,7 +116528,7 @@ __4:
 	autoinc = libc.Bool32(int32((*Table)(unsafe.Pointer(pTab)).FiPKey) == iCol && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != U32(0))
 	goto __13
 __12:
-	zDataType = ts + 1112
+	zDataType = ts + 1131
 	primarykey = 1
 __13:
 	;
@@ -116496,14 +116575,14 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24421, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24487, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3656
+			return ts + 3675
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -117152,7 +117231,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24449, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24515, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -117270,7 +117349,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 + 24457
+			return ts + 24523
 		}
 		return uintptr(0)
 	}(), 0)
@@ -117448,7 +117527,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6174, ts + 6757, ts + 6762, ts + 6184, ts + 6179, ts + 7998, ts + 24480, ts + 24486,
+	ts + 6193, ts + 7706, ts + 7711, ts + 6203, ts + 6198, ts + 8017, ts + 24546, ts + 24552,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -117601,7 +117680,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 + 24493 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 24559 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -117627,7 +117706,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	switch Xsqlite3_value_type(tls, pValue) {
 	case SQLITE_NULL:
 		{
-			jsonAppendRaw(tls, p, ts+6174, uint32(4))
+			jsonAppendRaw(tls, p, ts+6193, uint32(4))
 			break
 
 		}
@@ -117656,7 +117735,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+24510, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24576, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -117714,19 +117793,19 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 	switch int32((*JsonNode)(unsafe.Pointer(pNode)).FeType) {
 	default:
 		{
-			jsonAppendRaw(tls, pOut, ts+6174, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6193, uint32(4))
 			break
 
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6757, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+7706, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6762, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+7711, uint32(5))
 			break
 
 		}
@@ -118271,17 +118350,17 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		}
 		return int32(j + U32(1))
 	} else if int32(c) == 'n' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6174, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6193, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		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+6757, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7706, 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+6762, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7711, 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))
@@ -118382,7 +118461,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+24539, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24605, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -118688,7 +118767,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+24554, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24620, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -118703,7 +118782,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24558, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24624, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -118757,7 +118836,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+24584,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24650,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -118862,11 +118941,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+24627, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24693, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
-					jsonAppendRaw(tls, bp, ts+4991, uint32(2))
+					jsonAppendRaw(tls, bp, ts+5010, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24630, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24696, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -118907,7 +118986,7 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if pNode != 0 {
 				jsonRenderNode(tls, pNode, bp, uintptr(0))
 			} else {
-				jsonAppendRaw(tls, bp, ts+6174, uint32(4))
+				jsonAppendRaw(tls, bp, ts+6193, uint32(4))
 			}
 		}
 		if i == argc {
@@ -119023,14 +119102,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24633, -1)
+			ts+24699, -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+24684, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24750, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -119125,7 +119204,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15373)
+	jsonWrongNumArgs(tls, ctx, ts+15392)
 	return
 __2:
 	;
@@ -119200,9 +119279,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24718
+			return ts + 24784
 		}
-		return ts + 24722
+		return ts + 24788
 	}())
 	return
 __2:
@@ -119335,7 +119414,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24729, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24795, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119432,7 +119511,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24732, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24798, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119476,7 +119555,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24735)
+		ts+24801)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -119607,7 +119686,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24818, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24884, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -119626,7 +119705,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+24824, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24890, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -119722,7 +119801,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+24824, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24890, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -119746,7 +119825,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 + 24829
+				zRoot = ts + 24895
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -119868,7 +119947,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+24539, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24605, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -119963,25 +120042,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{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 + 24897},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24902},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24913},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24913},
 	{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}}
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24944},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24947},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24951},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24963},
+	{FnArg: int8(2), 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_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24986},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24997},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25009},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 25022},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25031},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25031},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25041},
+	{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 + 25052},
+	{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 + 25069}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -120000,8 +120079,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 25021, FpModule: 0},
-	{FzName: ts + 25031, FpModule: 0},
+	{FzName: ts + 25087, FpModule: 0},
+	{FzName: ts + 25097, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -120261,11 +120340,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+25041, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25107, 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+25049, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25115, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -120476,7 +120555,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+25054,
+		ts+25120,
 		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))
@@ -121179,7 +121258,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25136)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25202)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -121391,7 +121470,7 @@ func rtreeBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 2
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FneedToFreeIdxStr = 1
-	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, bp+8))) {
+	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, bp+8))) {
 		return SQLITE_NOMEM
 	}
 
@@ -122520,7 +122599,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25150, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25216, 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 {
@@ -122532,12 +122611,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+25170, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25236, 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+25202, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25268, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -122763,7 +122842,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+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))
+		ts+25305, 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))
@@ -122786,14 +122865,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25384
+	var zFmt uintptr = ts + 25450
 	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+11341, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11360, 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 {
@@ -122834,7 +122913,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25440, ts + 5053, ts + 16260,
+	ts + 25506, ts + 5072, ts + 16279,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -122877,19 +122956,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+25445,
+			ts+25511,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25507, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25573, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25512,
+			ts+25578,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25576,
+			ts+25642,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25646,
+			ts+25712,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -122918,7 +122997,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 + 25695
+			zFormat = ts + 25761
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -122930,7 +123009,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+25803,
+			ts+25869,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -122938,18 +123017,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+25848, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25914, 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+12760, 1)
+					Xsqlite3_str_append(tls, p, ts+12779, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25875, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25941, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25897, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25963, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25905, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25971, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -122964,14 +123043,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25921,
-	ts + 25974,
-	ts + 26019,
-	ts + 26071,
-	ts + 26125,
-	ts + 26170,
-	ts + 26228,
-	ts + 26283,
+	ts + 25987,
+	ts + 26040,
+	ts + 26085,
+	ts + 26137,
+	ts + 26191,
+	ts + 26236,
+	ts + 26294,
+	ts + 26349,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -123000,7 +123079,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+26330, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26396, 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
@@ -123008,19 +123087,19 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 				(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = 4 + int32((*Rtree)(unsafe.Pointer(pRtree)).FnBytesPerCell)*RTREE_MAXCELLS
 			}
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26350,
+			ts+26416,
 			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 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26407,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26473,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -123062,16 +123141,16 @@ 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 + 26442,
-		ts + 26485,
-		ts + 26520,
-		ts + 26556,
+		ts + 26508,
+		ts + 26551,
+		ts + 26586,
+		ts + 26622,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
 		goto __1
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
 	return SQLITE_ERROR
 __1:
 	;
@@ -123096,7 +123175,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+26593,
+	Xsqlite3_str_appendf(tls, pSql, ts+26659,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -123108,7 +123187,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26617, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26683, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -123131,7 +123210,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26623, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26689, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -123142,14 +123221,14 @@ __10:
 	if !(ii < argc) {
 		goto __12
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
 	rc = SQLITE_ERROR
 	goto __13
 __12:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __14
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
 __14:
 	;
 __13:
@@ -123192,7 +123271,7 @@ __17:
 	if !(iErr != 0) {
 		goto __22
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
 	goto rtreeInit_fail
 __22:
 	;
@@ -123209,7 +123288,7 @@ __23:
 	if !(rc != 0) {
 		goto __24
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
 	goto rtreeInit_fail
 __24:
 	;
@@ -123227,7 +123306,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26626, ts + 26637}
+var azFormat = [2]uintptr{ts + 26692, ts + 26703}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -123265,13 +123344,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+10913, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10932, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26647, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26713, 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+26653, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26719, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26657, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26723, 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})))
@@ -123282,7 +123361,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+26659, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26725, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -123360,12 +123439,12 @@ 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+26692,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26758,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
-						return ts + 4055
+						return ts + 4074
 					}
-					return ts + 1547
+					return ts + 1566
 				}(), z))
 			if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport == uintptr(0) {
 				(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
@@ -123384,7 +123463,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+26699,
+			ts+26765,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -123403,7 +123482,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+26744, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26810, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -123417,8 +123496,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 + 26776,
-		ts + 26830,
+		ts + 26842,
+		ts + 26896,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -123433,23 +123512,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+26878,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26944,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26923
+					return ts + 26989
 				}
-				return ts + 26931
+				return ts + 26997
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26940,
+				ts+27006,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26923
+						return ts + 26989
 					}
-					return ts + 26931
+					return ts + 26997
 				}(), iKey, iVal))
 		}
 	}
@@ -123473,7 +123552,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+26998, libc.VaList(bp, i, iCell, iNode))
+				ts+27064, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -123493,7 +123572,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+27046, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27112, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -123510,14 +123589,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+27113, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27179, 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+27147, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27213, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -123525,7 +123604,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+27177,
+					ts+27243,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -123554,14 +123633,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+27232,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27298,
 			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+27263, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27329, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -123583,12 +123662,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+14496, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14515, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27330, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27396, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -123597,12 +123676,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25150, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25216, 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+27358, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27424, 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)
 		}
@@ -123616,8 +123695,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+27389, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27455, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27462, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -123625,7 +123704,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+27404, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27470, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -123640,7 +123719,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27408, -1)
+			ts+27474, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -123648,7 +123727,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6434
+			zDb = ts + 6453
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -123658,7 +123737,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 + 18005
+				return ts + 18071
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -124029,11 +124108,11 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		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+27459, 1)
+		Xsqlite3_str_append(tls, x, ts+27525, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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+27527, 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+27472, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27538, 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)
 	}
@@ -124053,19 +124132,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+27483, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27549, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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)))))
+			Xsqlite3_str_appendf(tls, x, ts+27567, 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+27509, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27575, 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+27517, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27583, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27521, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27587, 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)
 	}
@@ -124985,7 +125064,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+27534, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27600, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -124994,7 +125073,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27556, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27622, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -125002,7 +125081,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26623, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26689, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -125013,7 +125092,7 @@ __5:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __7
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
 __7:
 	;
 __6:
@@ -125038,7 +125117,7 @@ __9:
 	if !(rc != 0) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	goto geopolyInit_fail
 __10:
 	;
@@ -125229,7 +125308,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 + 16260
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16279
 		(*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
@@ -125239,7 +125318,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 + 27560
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27626
 		(*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
@@ -125247,7 +125326,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 + 27566
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27632
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -125359,7 +125438,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27575, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27641, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -125491,14 +125570,14 @@ geopoly_update_end:
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
 	_ = pVtab
 	_ = nArg
-	if Xsqlite3_stricmp(tls, zName, ts+27615) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27681) == 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+27631) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27697) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -125563,7 +125642,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+27646, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27712, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -125575,25 +125654,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{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},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27720},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27733},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27746},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27759},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27697},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27771},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27681},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27794},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27808},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27821},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27835},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27851},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27797},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27863},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -125603,26 +125682,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27816, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27882, 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+27826, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27892, 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+27837, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27903, -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+27560, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27626, 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+27848, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27914, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -125676,7 +125755,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+25136, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25202, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -126003,7 +126082,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+27858, -1)
+		Xsqlite3_result_error(tls, context, ts+27924, -1)
 		return
 	}
 
@@ -126014,7 +126093,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+27858, -1)
+			Xsqlite3_result_error(tls, context, ts+27924, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -126027,7 +126106,7 @@ func prepareAndCollectError(tls *libc.TLS, db uintptr, ppStmt uintptr, pzErrmsg
 
 	var rc int32 = Xsqlite3_prepare_v2(tls, db, zSql, -1, ppStmt, uintptr(0))
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 		*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	}
 	return rc
@@ -126039,7 +126118,7 @@ func resetAndCollectError(tls *libc.TLS, pStmt uintptr, pzErrmsg uintptr) int32
 
 	var rc int32 = Xsqlite3_reset(tls, pStmt)
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
 	}
 	return rc
 }
@@ -126115,7 +126194,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+27879, uintptr(0), uintptr(0), p+64)
+				ts+27945, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -126179,7 +126258,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+25049, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25115, 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++ {
 				}
@@ -126200,16 +126279,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+28050, libc.VaList(bp, func() uintptr {
+			ts+28116, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28200
+					return ts + 28266
 				}
-				return ts + 1547
+				return ts + 1566
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28241)
+			ts+28307)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -126307,7 +126386,7 @@ func rbuFinalize(tls *libc.TLS, p uintptr, pStmt uintptr) {
 	var rc int32 = Xsqlite3_finalize(tls, pStmt)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && rc != SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 	}
 }
 
@@ -126325,7 +126404,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+28366, libc.VaList(bp, zTab)))
+			ts+28432, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -126343,7 +126422,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+28485, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28551, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -126361,7 +126440,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28506, libc.VaList(bp+16, zIdx)))
+			ts+28572, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -126384,7 +126463,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+28557, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28623, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -126430,7 +126509,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+28578, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28644, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -126445,7 +126524,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+28606, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28672, 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 {
@@ -126485,7 +126564,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+19482, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19548, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -126495,18 +126574,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+28635, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28701, 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+28654, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28720, 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+28659, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28725, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -126518,18 +126597,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+28669, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28735, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28698
+							return ts + 28764
 						}
-						return ts + 28711
+						return ts + 28777
 					}()))
 		}
 
 		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+28720, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28786, 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)
@@ -126543,7 +126622,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+28742,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28808,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -126586,12 +126665,12 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	defer tls.Free(24)
 
 	var zList uintptr = uintptr(0)
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	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+28769, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14607
+		zList = rbuMPrintf(tls, p, ts+28835, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14626
 	}
 	return zList
 }
@@ -126602,13 +126681,13 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 
 	var iPk int32 = 1
 	var zRet uintptr = uintptr(0)
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	for 1 != 0 {
 		var i int32
 		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+28778, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28844, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -126630,25 +126709,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+28791, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28857, 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+28823, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28889, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		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)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1566, ts+14626, ts+28912)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28918, ts+28925, ts+4969)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1566, ts+14626, ts+1566)
 
 		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+28867,
+					ts+28933,
 					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+28909, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28975, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -126685,12 +126764,12 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	zVector = uintptr(0)
 	zRet = uintptr(0)
 	bFailed = 0
-	zSep = ts + 1547
+	zSep = ts + 1566
 	iCol = 0
 	*(*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+28606, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28672, 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
@@ -126725,7 +126804,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 28929
+	zCol = ts + 28995
 __7:
 	;
 	goto __5
@@ -126733,13 +126812,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28937,
+	zLhs = rbuMPrintf(tls, p, ts+29003,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28958,
+	zOrder = rbuMPrintf(tls, p, ts+29024,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28994,
+	zSelect = rbuMPrintf(tls, p, ts+29060,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14607
+	zSep = ts + 14626
 	iCol++
 	goto __1
 __2:
@@ -126757,12 +126836,12 @@ __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+29021,
+		Xsqlite3_mprintf(tls, ts+29087,
 			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
 	}
-	zSep = ts + 1547
+	zSep = ts + 1566
 	iCol = 0
 __14:
 	if !(iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnCol) {
@@ -126784,8 +126863,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29069, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14607
+	zVector = rbuMPrintf(tls, p, ts+29135, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14626
 	goto __15
 __15:
 	iCol++
@@ -126796,7 +126875,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29142, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -126823,13 +126902,13 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 	var zImpPK uintptr = uintptr(0)
 	var zWhere uintptr = uintptr(0)
 	var nBind int32 = 0
-	var zCom uintptr = ts + 1547
-	var zAnd uintptr = ts + 1547
+	var zCom uintptr = ts + 1566
+	var zAnd uintptr = ts + 1566
 	*(*uintptr)(unsafe.Pointer(bp + 200)) = uintptr(0)
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28672, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -126841,9 +126920,9 @@ 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+29088, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29154, 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
+			zType = ts + 1566
 		} else {
 			if iCid < 0 {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK {
@@ -126853,37 +126932,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 + 28929
+					zCol = ts + 28995
 				} else {
-					zCol = ts + 28659
+					zCol = ts + 28725
 				}
-				zType = ts + 1112
+				zType = ts + 1131
 			} 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+29110, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29176, 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 + 28846
+					return ts + 28912
 				}
-				return ts + 1547
+				return ts + 1566
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29130,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29196,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29151,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29217,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29184, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29250, 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 + 14607
-		zAnd = ts + 21518
+		zCom = ts + 14626
+		zAnd = ts + 21584
 		nBind++
 	}
 
@@ -126917,16 +126996,16 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 
 	var zList uintptr = uintptr(0)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
-		var zS uintptr = ts + 1547
+		var zS uintptr = ts + 1566
 		var i int32
 		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+29208, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29274, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29220, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29286, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14607
+			zS = ts + 14626
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -126934,7 +127013,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+29229, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29295, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -126946,27 +127025,27 @@ 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+29244, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29310, 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 zSep uintptr = ts + 1566
 		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+29258, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21518
+				zList = rbuMPrintf(tls, p, ts+29324, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21584
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29270, libc.VaList(bp+40, zList))
+			ts+29336, libc.VaList(bp+40, zList))
 
 	} else {
-		var zSep uintptr = ts + 1547
+		var zSep uintptr = ts + 1566
 		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 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29320, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21518
+				zList = rbuMPrintf(tls, p, ts+29386, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21584
 			}
 		}
 	}
@@ -126975,7 +127054,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+29333, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29399, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -126989,21 +127068,21 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 		if int32(libc.Xstrlen(tls, zMask)) != (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 			rbuBadControlError(tls, p)
 		} else {
-			var zSep uintptr = ts + 1547
+			var zSep uintptr = ts + 1566
 			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+29320,
+					zList = rbuMPrintf(tls, p, ts+29386,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14607
+					zSep = ts + 14626
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29359,
+					zList = rbuMPrintf(tls, p, ts+29425,
 						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 + 14607
+					zSep = ts + 14626
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29389,
+					zList = rbuMPrintf(tls, p, ts+29455,
 						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 + 14607
+					zSep = ts + 14626
 				}
 			}
 		}
@@ -127038,19 +127117,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 + 29426
+		var zSep uintptr = ts + 29492
 		*(*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+28578, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28644, 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+16148) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16167) == 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+28606, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28672, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -127062,15 +127141,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 + 28846
+					zDesc = ts + 28912
 				} else {
-					zDesc = ts + 1547
+					zDesc = ts + 1566
 				}
-				z = rbuMPrintf(tls, p, ts+29439, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14607
+				z = rbuMPrintf(tls, p, ts+29505, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14626
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29450, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29516, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -127085,12 +127164,12 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		*(*uintptr)(unsafe.Pointer(bp + 168)) = uintptr(0)
 		var zIdx uintptr = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
-		var zComma uintptr = ts + 1547
+		var zComma uintptr = ts + 1566
 		var zCols uintptr = uintptr(0)
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29454)
+			ts+29520)
 		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))) {
@@ -127099,7 +127178,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+28606, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28672, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -127109,25 +127188,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+29504, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29570, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29526, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29592, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28846
+						return ts + 28912
 					}
-					return ts + 1547
+					return ts + 1566
 				}()))
-				zComma = ts + 14607
+				zComma = ts + 14626
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29536, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29602, 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+6434, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29551,
+			ts+29617,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 0, 0))
 	}
 }
 
@@ -127137,50 +127216,50 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
 		var tnum int32 = (*RbuObjIter)(unsafe.Pointer(pIter)).FiTnum
-		var zComma uintptr = ts + 1547
+		var zComma uintptr = ts + 1566
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
-			var zPk uintptr = ts + 1547
+			var zPk uintptr = ts + 1566
 			var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCol)*8))
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, (*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 + 29613
+				zPk = ts + 29679
 			}
-			zSql = rbuMPrintf(tls, p, ts+29626,
+			zSql = rbuMPrintf(tls, p, ts+29692,
 				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 + 29653
+							return ts + 29719
 						}
-						return ts + 1547
+						return ts + 1566
 					}()))
-			zComma = ts + 14607
+			zComma = ts + 14626
 		}
 
 		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+29663, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29729, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		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,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29736,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29702
+						return ts + 29768
 					}
-					return ts + 1547
+					return ts + 1566
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 0, 0))
 	}
 }
 
@@ -127193,7 +127272,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+29717,
+				ts+29783,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -127230,7 +127309,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+29774)
+			ts+29840)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -127335,7 +127414,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+29840, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29906, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -127355,24 +127434,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+6434, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29860,
+				ts+29926,
 				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+6434, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 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+29925, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29991, 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+29961, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+30027, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -127388,7 +127467,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29995,
+						ts+30061,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -127396,31 +127475,31 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 30056
+											return ts + 30122
 										}
-										return ts + 30060
+										return ts + 30126
 									}()
 								}
-								return ts + 1547
+								return ts + 1566
 							}(), zStart,
 							zCollist, zLimit))
 					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+30066,
+						ts+30132,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30127,
+						ts+30193,
 						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 + 30056
+									return ts + 30122
 								}
-								return ts + 30060
+								return ts + 30126
 							}(),
 							zCollist, zLimit))
 				}
@@ -127445,8 +127524,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+6445)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6441)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6464)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6460)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -127455,52 +127534,52 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			rbuCreateImposterTable2(tls, p, pIter)
 			zWrite = func() uintptr {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
-					return ts + 1547
+					return ts + 1566
 				}
-				return ts + 30286
+				return ts + 30352
 			}()
 
 			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+30295,
+						ts+30361,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30331
+								return ts + 30397
 							}
-							return ts + 1547
+							return ts + 1566
 						}(), zBindings)))
 			}
 
 			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+30341, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30407, 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
+				var zRbuRowid uintptr = ts + 1566
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30369
+					zRbuRowid = ts + 30435
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30381, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30447, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30457
+							return ts + 30523
 						}
-						return ts + 1547
+						return ts + 1566
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30474,
+					ts+30540,
 					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+30773,
+						ts+30839,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -127508,14 +127587,14 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-				var zRbuRowid uintptr = ts + 1547
+				var zRbuRowid uintptr = ts + 1566
 				var zStart uintptr = uintptr(0)
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30872
+						zRbuRowid = ts + 30938
 					} else {
-						zRbuRowid = ts + 30882
+						zRbuRowid = ts + 30948
 					}
 				}
 
@@ -127528,35 +127607,35 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28929, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28995, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14607, ts+1547)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1566, ts+14626, ts+1566)
 					}
 				}
 
 				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+30893,
+							ts+30959,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30941
+										return ts + 31007
 									}
-									return ts + 1547
+									return ts + 1566
 								}(),
 								zRbuRowid,
 								(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 									if zStart != 0 {
 										return zStart
 									}
-									return ts + 1547
+									return ts + 1566
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 22852
+										return ts + 22918
 									}
-									return ts + 1547
+									return ts + 1566
 								}(), zOrder,
 								zLimit)))
 				}
@@ -127619,12 +127698,12 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 		(*RbuObjIter)(unsafe.Pointer(pIter)).FpRbuUpdate = pUp
 
 		if zSet != 0 {
-			var zPrefix uintptr = ts + 1547
+			var zPrefix uintptr = ts + 1566
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30286
+				zPrefix = ts + 30352
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30947,
+			zUpdate = Xsqlite3_mprintf(tls, ts+31013,
 				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)
@@ -127651,7 +127730,7 @@ func rbuOpenDbhandle(tls *libc.TLS, p uintptr, zName uintptr, bUseVfs int32) uin
 			return uintptr(0)
 		}())
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
 			Xsqlite3_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 			*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 		}
@@ -127683,7 +127762,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+30977, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+31043, 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:
@@ -127753,28 +127832,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+6434, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453, 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+6434)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31007, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31073, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		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))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31101, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.Xmemcpy(tls, p+48, ts+3298, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+6434, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+6453, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31053, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31119, 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+6434, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -127807,11 +127886,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+31119, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31185, 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+24199, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24265, (*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)))) == '?' {
@@ -127823,16 +127902,16 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31151,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434),
+			zTarget = Xsqlite3_mprintf(tls, ts+31217,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453),
 					func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1547
+							return ts + 1566
 						}
-						return ts + 31183
+						return ts + 31249
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1547
+							return ts + 1566
 						}
 						return zExtra
 					}()))
@@ -127848,37 +127927,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+31185, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31251, -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+31200, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31266, 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+31217, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31283, -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+6434, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31233, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31299, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 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+31261, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31327, 0)
 	}
 }
 
@@ -127907,14 +127986,14 @@ 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+31233, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31299, 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+31279, uintptr(0), uintptr(0), uintptr(0))
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31345, uintptr(0), uintptr(0), uintptr(0))
 		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
@@ -128023,7 +128102,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+6434, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6453, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -128040,23 +128119,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+31314, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31380, 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+6434)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453)
 	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+6434)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31339, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31405, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31412, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -128173,7 +128252,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+23837, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23903, 0)
 			return
 		}
 
@@ -128266,7 +128345,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+31353)
+			ts+31419)
 		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)
@@ -128274,7 +128353,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+31375, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31441, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -128295,7 +128374,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+31402,
+				ts+31468,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -128325,9 +128404,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+31560, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31626, 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+31575,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31641,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -128341,10 +128420,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+31595, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31661, 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+31620)
+			ts+31686)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128358,12 +128437,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+31728)
+			ts+31794)
 	}
 
 	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+31793)
+			ts+31859)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128375,7 +128454,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+31837, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31903, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -128395,15 +128474,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+17233)
-					rbuCopyPragma(tls, p, ts+16344)
+					rbuCopyPragma(tls, p, ts+17252)
+					rbuCopyPragma(tls, p, ts+16363)
 				}
 
 				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+31862, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31928, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -128427,10 +128506,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+14511, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14530, 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+14511, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14530, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -128525,7 +128604,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+31890, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31956, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -128541,10 +128620,10 @@ func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31339, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31405, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 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)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
@@ -128558,7 +128637,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+31915, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31981, 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)
@@ -128592,7 +128671,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+31926, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31992, 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 {
@@ -128622,13 +128701,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+31998, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32064, 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+32012)
+				ts+32078)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -128639,7 +128718,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+32069)
+				ts+32135)
 			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)
@@ -128684,7 +128763,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			libc.Xmemcpy(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, zRbu, nRbu+uint64(1))
 			pCsr += uintptr(nRbu + uint64(1))
 			if zState != 0 {
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3656, libc.VaList(bp, zState))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3675, libc.VaList(bp, zState))
 			}
 
 			rbuOpenDatabase(tls, p, uintptr(0), bp+16)
@@ -128713,7 +128792,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+32143, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32209, 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
@@ -128731,12 +128810,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+32175,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32241,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32207
+							return ts + 32273
 						}
-						return ts + 32214
+						return ts + 32280
 					}()))
 			}
 		}
@@ -128744,7 +128823,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+14496, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14515, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -128755,19 +128834,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+16947)
-						rbuCopyPragma(tls, p, ts+16359)
+						rbuCopyPragma(tls, p, ts+16966)
+						rbuCopyPragma(tls, p, ts+16378)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32221, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32287, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6434, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6453, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32237, uintptr(0), uintptr(0), p+64)
+								db, ts+32303, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -128821,7 +128900,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+32261, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32327, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -128848,7 +128927,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+30286, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30352, 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++
@@ -128865,7 +128944,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+14511, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14530, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -128878,13 +128957,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+14511, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14530, 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+32269, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32335, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -128979,7 +129058,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+14511, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14530, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128996,19 +129075,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+14511, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14530, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14496
+				zBegin = ts + 14515
 			} else {
-				zBegin = ts + 32221
+				zBegin = ts + 32287
 			}
 			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+32221, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32287, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -129354,7 +129433,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+32296, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32362, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -129379,7 +129458,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+32319, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32385, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -129524,7 +129603,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+6434)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6453)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -129539,7 +129618,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+32330, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32396, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -129784,6 +129863,970 @@ func Xsqlite3rbu_temp_size(tls *libc.TLS, pRbu uintptr) Sqlite3_int64 {
 	return (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FszTemp
 }
 
+var zDbstatSchema = *(*[258]int8)(unsafe.Pointer(ts + 32407))
+
+// Forward reference to data structured used in this module
+type StatTable1 = struct {
+	Fbase        Sqlite3_vtab
+	Fdb          uintptr
+	FiDb         int32
+	F__ccgo_pad1 [4]byte
+}
+
+// Forward reference to data structured used in this module
+type StatTable = StatTable1
+type StatCursor1 = struct {
+	Fbase        Sqlite3_vtab_cursor
+	FpStmt       uintptr
+	FisEof       U8
+	FisAgg       U8
+	F__ccgo_pad1 [2]byte
+	FiDb         int32
+	FaPage       [32]StatPage
+	FiPage       int32
+	FiPageno     U32
+	FzName       uintptr
+	FzPath       uintptr
+	FzPagetype   uintptr
+	FnPage       int32
+	FnCell       int32
+	FnMxPayload  int32
+	F__ccgo_pad2 [4]byte
+	FnUnused     I64
+	FnPayload    I64
+	FiOffset     I64
+	FszPage      I64
+}
+
+type StatCursor = StatCursor1
+type StatPage1 = struct {
+	FiPgno         U32
+	F__ccgo_pad1   [4]byte
+	FaPg           uintptr
+	FiCell         int32
+	F__ccgo_pad2   [4]byte
+	FzPath         uintptr
+	Fflags         U8
+	F__ccgo_pad3   [3]byte
+	FnCell         int32
+	FnUnused       int32
+	F__ccgo_pad4   [4]byte
+	FaCell         uintptr
+	FiRightChildPg U32
+	FnMxPayload    int32
+}
+
+type StatPage = StatPage1
+type StatCell1 = struct {
+	FnLocal      int32
+	FiChildPg    U32
+	FnOvfl       int32
+	F__ccgo_pad1 [4]byte
+	FaOvfl       uintptr
+	FnLastOvfl   int32
+	FiOvfl       int32
+}
+
+type StatCell = StatCell1
+
+func statConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var pTab uintptr = uintptr(0)
+	var rc int32 = SQLITE_OK
+	var iDb int32
+	_ = pAux
+
+	if argc >= 4 {
+		Xsqlite3TokenInit(tls, bp+8, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
+		iDb = Xsqlite3FindDb(tls, db, bp+8)
+		if iDb < 0 {
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+11883, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
+			return SQLITE_ERROR
+		}
+	} else {
+		iDb = 0
+	}
+	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_DIRECTONLY, 0)
+	rc = Xsqlite3_declare_vtab(tls, db, uintptr(unsafe.Pointer(&zDbstatSchema)))
+	if rc == SQLITE_OK {
+		pTab = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatTable{})))
+		if pTab == uintptr(0) {
+			rc = SQLITE_NOMEM
+		}
+	}
+
+	if rc == SQLITE_OK {
+		libc.Xmemset(tls, pTab, 0, uint64(unsafe.Sizeof(StatTable{})))
+		(*StatTable)(unsafe.Pointer(pTab)).Fdb = db
+		(*StatTable)(unsafe.Pointer(pTab)).FiDb = iDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
+	return rc
+}
+
+func statDisconnect(tls *libc.TLS, pVtab uintptr) int32 {
+	Xsqlite3_free(tls, pVtab)
+	return SQLITE_OK
+}
+
+func statBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
+	var i int32
+	var iSchema int32 = -1
+	var iName int32 = -1
+	var iAgg int32 = -1
+	_ = tab
+
+	for i = 0; i < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; i++ {
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fop) != SQLITE_INDEX_CONSTRAINT_EQ {
+			continue
+		}
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fusable) == 0 {
+			return SQLITE_CONSTRAINT
+		}
+		switch (*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(i)*12)).FiColumn {
+		case 0:
+			{
+				iName = i
+				break
+
+			}
+		case 10:
+			{
+				iSchema = i
+				break
+
+			}
+		case 11:
+			{
+				iAgg = i
+				break
+
+			}
+		}
+	}
+	i = 0
+	if iSchema >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).Fomit = uint8(1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x01
+	}
+	if iName >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iName)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x02
+	}
+	if iAgg >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iAgg)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x04
+	}
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 1.0
+
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy == 1 &&
+		(*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)).FnOrderBy == 2 &&
+		(*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_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).FiColumn == 1 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x08
+	}
+
+	return SQLITE_OK
+}
+
+func statOpen(tls *libc.TLS, pVTab uintptr, ppCursor uintptr) int32 {
+	var pTab uintptr = pVTab
+	var pCsr uintptr
+
+	pCsr = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatCursor{})))
+	if pCsr == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		libc.Xmemset(tls, pCsr, 0, uint64(unsafe.Sizeof(StatCursor{})))
+		(*StatCursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab = pVTab
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppCursor)) = pCsr
+	return SQLITE_OK
+}
+
+func statClearCells(tls *libc.TLS, p uintptr) {
+	var i int32
+	if (*StatPage)(unsafe.Pointer(p)).FaCell != 0 {
+		for i = 0; i < (*StatPage)(unsafe.Pointer(p)).FnCell; i++ {
+			Xsqlite3_free(tls, (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell+uintptr(i)*32)).FaOvfl)
+		}
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FaCell)
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnCell = 0
+	(*StatPage)(unsafe.Pointer(p)).FaCell = uintptr(0)
+}
+
+func statClearPage(tls *libc.TLS, p uintptr) {
+	var aPg uintptr = (*StatPage)(unsafe.Pointer(p)).FaPg
+	statClearCells(tls, p)
+	Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FzPath)
+	libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(StatPage{})))
+	(*StatPage)(unsafe.Pointer(p)).FaPg = aPg
+}
+
+func statResetCsr(tls *libc.TLS, pCsr uintptr) {
+	var i int32
+
+	for i = 0; i < int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{}))); i++ {
+		statClearPage(tls, pCsr+24+uintptr(i)*64)
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(pCsr+24+uintptr(i)*64)).FaPg)
+		(*StatPage)(unsafe.Pointer(pCsr + 24 + uintptr(i)*64)).FaPg = uintptr(0)
+	}
+	Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(0)
+}
+
+func statResetCounts(tls *libc.TLS, pCsr uintptr) {
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnCell = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnUnused = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPayload = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FszPage = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 0
+}
+
+func statClose(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	Xsqlite3_free(tls, pCsr)
+	return SQLITE_OK
+}
+
+func getLocalPayload(tls *libc.TLS, nUsable int32, flags U8, nTotal int32) int32 {
+	var nLocal int32
+	var nMinLocal int32
+	var nMaxLocal int32
+
+	if int32(flags) == 0x0D {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = nUsable - 35
+	} else {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = (nUsable-12)*64/255 - 23
+	}
+
+	nLocal = nMinLocal + (nTotal-nMinLocal)%(nUsable-4)
+	if nLocal > nMaxLocal {
+		nLocal = nMinLocal
+	}
+	return nLocal
+}
+
+func statDecodePage(tls *libc.TLS, pBt uintptr, p uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var nUnused int32
+	var iOff int32
+	var nHdr int32
+	var isLeaf int32
+	var szPage int32
+	var aData uintptr
+	var aHdr uintptr
+	var iNext int32
+
+	var rc int32
+	var iPrev U32
+
+	var j int32
+	var nOvfl int32
+
+	var nLocal int32
+	var pCell uintptr
+	var i int32
+	var nUsable int32
+	aData = (*StatPage)(unsafe.Pointer(p)).FaPg
+	aHdr = aData + uintptr(func() int32 {
+		if (*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1) {
+			return 100
+		}
+		return 0
+	}())
+
+	(*StatPage)(unsafe.Pointer(p)).Fflags = *(*U8)(unsafe.Pointer(aHdr))
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0A || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __1
+	}
+	isLeaf = 1
+	nHdr = 8
+	goto __2
+__1:
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05 || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x02) {
+		goto __3
+	}
+	isLeaf = 0
+	nHdr = 12
+	goto __4
+__3:
+	goto statPageIsCorrupt
+__4:
+	;
+__2:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1)) {
+		goto __5
+	}
+	nHdr = nHdr + 100
+__5:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnCell = int32(*(*U8)(unsafe.Pointer(aHdr + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 3 + 1)))
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = 0
+	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
+
+	nUnused = int32(*(*U8)(unsafe.Pointer(aHdr + 5)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 5 + 1))) - nHdr - 2*(*StatPage)(unsafe.Pointer(p)).FnCell
+	nUnused = nUnused + int32(*(*U8)(unsafe.Pointer(aHdr + 7)))
+	iOff = int32(*(*U8)(unsafe.Pointer(aHdr + 1)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 1 + 1)))
+__6:
+	if !(iOff != 0) {
+		goto __7
+	}
+	if !(iOff >= szPage) {
+		goto __8
+	}
+	goto statPageIsCorrupt
+__8:
+	;
+	nUnused = nUnused + (int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2) + 1))))
+	iNext = int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff) + 1)))
+	if !(iNext < iOff+4 && iNext > 0) {
+		goto __9
+	}
+	goto statPageIsCorrupt
+__9:
+	;
+	iOff = iNext
+	goto __6
+__7:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnUnused = nUnused
+	(*StatPage)(unsafe.Pointer(p)).FiRightChildPg = func() uint32 {
+		if isLeaf != 0 {
+			return uint32(0)
+		}
+		return Xsqlite3Get4byte(tls, aHdr+8)
+	}()
+
+	if !((*StatPage)(unsafe.Pointer(p)).FnCell != 0) {
+		goto __10
+	}
+
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = szPage - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatPage)(unsafe.Pointer(p)).FaCell = Xsqlite3_malloc64(tls, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+	if !((*StatPage)(unsafe.Pointer(p)).FaCell == uintptr(0)) {
+		goto __11
+	}
+	return SQLITE_NOMEM
+__11:
+	;
+	libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+
+	i = 0
+__12:
+	if !(i < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __14
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr(i)*32
+
+	iOff = int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2) + 1)))
+	if !(iOff < nHdr || iOff >= szPage) {
+		goto __15
+	}
+	goto statPageIsCorrupt
+__15:
+	;
+	if !!(isLeaf != 0) {
+		goto __16
+	}
+	(*StatCell)(unsafe.Pointer(pCell)).FiChildPg = Xsqlite3Get4byte(tls, aData+uintptr(iOff))
+	iOff = iOff + 4
+__16:
+	;
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05) {
+		goto __17
+	}
+
+	goto __18
+__17:
+	iOff = iOff + int32(func() uint8 {
+		if int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff)))) < int32(U8(0x80)) {
+			return uint8(func() int32 {
+				*(*U32)(unsafe.Pointer(bp)) = U32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))
+				return 1
+			}())
+		}
+		return Xsqlite3GetVarint32(tls, aData+uintptr(iOff), bp)
+	}())
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __19
+	}
+	iOff = iOff + int32(Xsqlite3GetVarint(tls, aData+uintptr(iOff), bp+8))
+__19:
+	;
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32((*StatPage)(unsafe.Pointer(p)).FnMxPayload)) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = int32(*(*U32)(unsafe.Pointer(bp)))
+__20:
+	;
+	nLocal = getLocalPayload(tls, nUsable, (*StatPage)(unsafe.Pointer(p)).Fflags, int32(*(*U32)(unsafe.Pointer(bp))))
+	if !(nLocal < 0) {
+		goto __21
+	}
+	goto statPageIsCorrupt
+__21:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLocal = nLocal
+
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32(nLocal)) {
+		goto __22
+	}
+	nOvfl = int32((*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) + U32(nUsable) - U32(4) - U32(1)) / U32(nUsable-4))
+	if !(iOff+nLocal+4 > nUsable || *(*U32)(unsafe.Pointer(bp)) > U32(0x7fffffff)) {
+		goto __23
+	}
+	goto statPageIsCorrupt
+__23:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl = int32(*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) - U32((nOvfl-1)*(nUsable-4)))
+	(*StatCell)(unsafe.Pointer(pCell)).FnOvfl = nOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FaOvfl = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(U32(0)))*uint64(nOvfl))
+	if !((*StatCell)(unsafe.Pointer(pCell)).FaOvfl == uintptr(0)) {
+		goto __24
+	}
+	return SQLITE_NOMEM
+__24:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl)) = Xsqlite3Get4byte(tls, aData+uintptr(iOff+nLocal))
+	j = 1
+__25:
+	if !(j < nOvfl) {
+		goto __27
+	}
+	iPrev = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j-1)*4))
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPrev, bp+16, 0)
+	if !(rc != SQLITE_OK) {
+		goto __28
+	}
+
+	return rc
+__28:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j)*4)) = Xsqlite3Get4byte(tls, Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 16))))
+	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
+	goto __26
+__26:
+	j++
+	goto __25
+	goto __27
+__27:
+	;
+__22:
+	;
+__18:
+	;
+	goto __13
+__13:
+	i++
+	goto __12
+	goto __14
+__14:
+	;
+__10:
+	;
+	return SQLITE_OK
+
+statPageIsCorrupt:
+	(*StatPage)(unsafe.Pointer(p)).Fflags = U8(0)
+	statClearCells(tls, p)
+	return SQLITE_OK
+}
+
+func statSizeAndOffset(tls *libc.TLS, pCsr uintptr) {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCsr)).FpVtab
+	var pBt uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatTable)(unsafe.Pointer(pTab)).FiDb)*32)).FpBt
+	var pPager uintptr = Xsqlite3BtreePager(tls, pBt)
+	var fd uintptr
+
+	fd = Xsqlite3PagerFile(tls, pPager)
+	*(*Sqlite3_int64)(unsafe.Pointer(bp)) = Sqlite3_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	if Xsqlite3OsFileControl(tls, fd, 230440, bp) == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = *(*Sqlite3_int64)(unsafe.Pointer(bp))
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += *(*Sqlite3_int64)(unsafe.Pointer(bp + 1*8))
+	} else {
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += I64(Xsqlite3BtreeGetPageSize(tls, pBt))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = (*StatCursor)(unsafe.Pointer(pCsr)).FszPage * I64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno-U32(1))
+	}
+}
+
+func statGetPage(tls *libc.TLS, pBt uintptr, iPg U32, pPg uintptr) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var pgsz int32 = Xsqlite3BtreeGetPageSize(tls, pBt)
+	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
+	var rc int32
+
+	if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+		(*StatPage)(unsafe.Pointer(pPg)).FaPg = Xsqlite3_malloc(tls, pgsz+DBSTAT_PAGE_PADDING_BYTES)
+		if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+			return SQLITE_NOMEM
+		}
+		libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0, uint64(DBSTAT_PAGE_PADDING_BYTES))
+	}
+
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPg, bp, 0)
+	if rc == SQLITE_OK {
+		var a uintptr = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		libc.Xmemcpy(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, a, uint64(pgsz))
+		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+	}
+
+	return rc
+}
+
+func statNext(tls *libc.TLS, pCursor uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
+	var rc int32
+	var nPayload int32
+	var z uintptr
+	var pCsr uintptr
+	var pTab uintptr
+	var pBt uintptr
+	var pPager uintptr
+
+	var iRoot U32
+	var nUsable int32
+	var iOvfl int32
+	var pCell uintptr
+
+	var p uintptr
+	var i int32
+	var p1 uintptr
+	pCsr = pCursor
+	pTab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	pBt = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FpBt
+	pPager = Xsqlite3BtreePager(tls, pBt)
+
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+
+statNextRestart:
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __1
+	}
+
+	statResetCounts(tls, pCsr)
+	rc = Xsqlite3_step(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	if !(rc == SQLITE_ROW) {
+		goto __3
+	}
+	iRoot = U32(Xsqlite3_column_int64(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 1))
+	Xsqlite3PagerPagecount(tls, pPager, bp+48)
+	if !(*(*int32)(unsafe.Pointer(bp + 48)) == 0) {
+		goto __5
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__5:
+	;
+	rc = statGetPage(tls, pBt, iRoot, pCsr+24)
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiPgno = iRoot
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __6
+	}
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32665, 0))
+	if !(z == uintptr(0)) {
+		goto __7
+	}
+	rc = SQLITE_NOMEM
+__7:
+	;
+__6:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 1
+	goto __4
+__3:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__4:
+	;
+	goto __2
+__1:
+	p = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __8
+	}
+	statResetCounts(tls, pCsr)
+__8:
+	;
+__9:
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __10
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32
+__11:
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl) {
+		goto __12
+	}
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = Xsqlite3BtreeGetPageSize(tls, pBt) - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	statSizeAndOffset(tls, pCsr)
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl-1) {
+		goto __13
+	}
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nUsable - 4)
+	goto __14
+__13:
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64((*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64(nUsable - 4 - (*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+__14:
+	;
+	iOvfl = (*StatCell)(unsafe.Pointer(pCell)).FiOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FiOvfl++
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __15
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(iOvfl)*4))
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32667
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls,
+		ts+32676, libc.VaList(bp, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell, iOvfl)))
+	if z == uintptr(0) {
+		return SQLITE_NOMEM
+	}
+	return SQLITE_OK
+__15:
+	;
+	goto __11
+__12:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiRightChildPg != 0) {
+		goto __16
+	}
+	goto __10
+__16:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+	goto __9
+__10:
+	;
+	if !(!(int32((*StatPage)(unsafe.Pointer(p)).FiRightChildPg) != 0) || (*StatPage)(unsafe.Pointer(p)).FiCell > (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __17
+	}
+	statClearPage(tls, p)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage--
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 && (*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __18
+	}
+
+	return SQLITE_OK
+__18:
+	;
+	goto statNextRestart
+__17:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage++
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage >= int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{})))) {
+		goto __19
+	}
+	statResetCsr(tls, pCsr)
+	return Xsqlite3CorruptError(tls, 215455)
+__19:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell == (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatPage)(unsafe.Pointer(p)).FiRightChildPg
+	goto __21
+__20:
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32)).FiChildPg
+__21:
+	;
+	rc = statGetPage(tls, pBt, (*StatPage)(unsafe.Pointer(p+1*64)).FiPgno, p+1*64)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __22
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32688, libc.VaList(bp+24, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell)))
+	if !(z == uintptr(0)) {
+		goto __23
+	}
+	rc = SQLITE_NOMEM
+__23:
+	;
+__22:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+__2:
+	;
+	if !(rc == SQLITE_OK) {
+		goto __24
+	}
+	p1 = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = (*StatPage)(unsafe.Pointer(p1)).FiPgno
+
+	rc = statDecodePage(tls, pBt, p1)
+	if !(rc == SQLITE_OK) {
+		goto __25
+	}
+	statSizeAndOffset(tls, pCsr)
+
+	switch int32((*StatPage)(unsafe.Pointer(p1)).Fflags) {
+	case 0x05:
+		goto __27
+	case 0x02:
+		goto __28
+	case 0x0D:
+		goto __29
+	case 0x0A:
+		goto __30
+	default:
+		goto __31
+	}
+	goto __26
+__27:
+__28:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32696
+	goto __26
+__29:
+__30:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32705
+	goto __26
+__31:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32710
+	goto __26
+__26:
+	;
+	*(*int32)(unsafe.Pointer(pCsr + 2108)) += (*StatPage)(unsafe.Pointer(p1)).FnCell
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64((*StatPage)(unsafe.Pointer(p1)).FnUnused)
+	if !((*StatPage)(unsafe.Pointer(p1)).FnMxPayload > (*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload) {
+		goto __32
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = (*StatPage)(unsafe.Pointer(p1)).FnMxPayload
+__32:
+	;
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __33
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+40, (*StatPage)(unsafe.Pointer(p1)).FzPath)))
+	if !(z == uintptr(0)) {
+		goto __34
+	}
+	rc = SQLITE_NOMEM
+__34:
+	;
+__33:
+	;
+	nPayload = 0
+	i = 0
+__35:
+	if !(i < (*StatPage)(unsafe.Pointer(p1)).FnCell) {
+		goto __37
+	}
+	nPayload = nPayload + (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p1)).FaCell+uintptr(i)*32)).FnLocal
+	goto __36
+__36:
+	i++
+	goto __35
+	goto __37
+__37:
+	;
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nPayload)
+
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0) {
+		goto __38
+	}
+	goto statNextRestart
+__38:
+	;
+__25:
+	;
+__24:
+	;
+	return rc
+}
+
+func statEof(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	return int32((*StatCursor)(unsafe.Pointer(pCsr)).FisEof)
+}
+
+func statFilter(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintptr, argc int32, argv uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pCsr uintptr = pCursor
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	var pSql uintptr
+	var zSql uintptr
+	var iArg int32 = 0
+	var rc int32 = SQLITE_OK
+	var zName uintptr = uintptr(0)
+	_ = argc
+	_ = idxStr
+
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FpStmt = uintptr(0)
+	if idxNum&0x01 != 0 {
+		var zDbase uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = Xsqlite3FindDbName(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zDbase)
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FiDb < 0 {
+			(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = 0
+			(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+			return SQLITE_OK
+		}
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+	if idxNum&0x02 != 0 {
+		zName = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+	}
+	if idxNum&0x04 != 0 {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(libc.Bool32(Xsqlite3_value_double(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8))) != 0.0))
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(0)
+	}
+	pSql = Xsqlite3_str_new(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb)
+	Xsqlite3_str_appendf(tls, pSql,
+		ts+32720,
+		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb+uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FzDbSName))
+	if zName != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32875, libc.VaList(bp+8, zName))
+	}
+	if idxNum&0x08 != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32889, 0)
+	}
+	zSql = Xsqlite3_str_finish(tls, pSql)
+	if zSql == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		rc = Xsqlite3_prepare_v2(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
+		Xsqlite3_free(tls, zSql)
+	}
+
+	if rc == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = -1
+		rc = statNext(tls, pCursor)
+	}
+	return rc
+}
+
+func statColumn(tls *libc.TLS, pCursor uintptr, ctx uintptr, i int32) int32 {
+	var pCsr uintptr = pCursor
+	switch i {
+	case 0:
+		Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzName, -1, libc.UintptrFromInt32(-1))
+		break
+	case 1:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath, -1, libc.UintptrFromInt32(-1))
+		}
+		break
+	case 2:
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnPage))
+		} else {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno))
+		}
+		break
+	case 3:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype, -1, uintptr(0))
+		}
+		break
+	case 4:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnCell))
+		break
+	case 5:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnPayload)
+		break
+	case 6:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnUnused)
+		break
+	case 7:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload))
+		break
+	case 8:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FiOffset)
+		}
+		break
+	case 9:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FszPage)
+		break
+	case 10:
+		{
+			var db uintptr = Xsqlite3_context_db_handle(tls, ctx)
+			var iDb int32 = (*StatCursor)(unsafe.Pointer(pCsr)).FiDb
+			Xsqlite3_result_text(tls, ctx, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, -1, uintptr(0))
+			break
+
+		}
+	default:
+		{
+			Xsqlite3_result_int(tls, ctx, int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg))
+			break
+
+		}
+	}
+	return SQLITE_OK
+}
+
+func statRowid(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32 {
+	var pCsr uintptr = pCursor
+	*(*Sqlite_int64)(unsafe.Pointer(pRowid)) = Sqlite_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	return SQLITE_OK
+}
+
+// Invoke this routine to register the "dbstat" virtual table module
+func Xsqlite3DbstatRegister(tls *libc.TLS, db uintptr) int32 {
+	return Xsqlite3_create_module(tls, db, ts+32904, uintptr(unsafe.Pointer(&dbstat_module)), uintptr(0))
+}
+
+var dbstat_module = Sqlite3_module{
+	FxCreate:     0,
+	FxConnect:    0,
+	FxBestIndex:  0,
+	FxDisconnect: 0,
+	FxDestroy:    0,
+	FxOpen:       0,
+	FxClose:      0,
+	FxFilter:     0,
+	FxNext:       0,
+	FxEof:        0,
+	FxColumn:     0,
+	FxRowid:      0,
+}
+
 type SessionTable1 = struct {
 	FpNext    uintptr
 	FzName    uintptr
@@ -130364,13 +131407,13 @@ 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+11341, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11360, 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+32341, 0)
+				ts+32911, 0)
 		} else if rc == SQLITE_ERROR {
-			zPragma = Xsqlite3_mprintf(tls, ts+1547, 0)
+			zPragma = Xsqlite3_mprintf(tls, ts+1566, 0)
 		} else {
 			*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
 			*(*uintptr)(unsafe.Pointer(pabPK)) = uintptr(0)
@@ -130381,7 +131424,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32462, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+33032, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -130479,7 +131522,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11341, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11360, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -130728,7 +131771,7 @@ __4:
 	goto error_out
 __7:
 	;
-	Xsqlite3ValueSetStr(tls, p, 0, ts+1547, uint8(0), uintptr(0))
+	Xsqlite3ValueSetStr(tls, p, 0, ts+1566, uint8(0), uintptr(0))
 	(*Sqlite3_session)(unsafe.Pointer(pSession)).FpZeroBlob = p
 __6:
 	;
@@ -131056,14 +132099,14 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	var zRet uintptr = uintptr(0)
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32491,
+			zRet = Xsqlite3_mprintf(tls, ts+33061,
 				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 + 21518
+			zSep = ts + 21584
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131078,7 +132121,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	var zRet uintptr = uintptr(0)
 	var bHave int32 = 0
 
@@ -131086,9 +132129,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+32525,
+				ts+33095,
 				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 + 32566
+			zSep = ts + 33136
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131096,7 +132139,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7523, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7531, 0)
 	}
 
 	return zRet
@@ -131107,7 +132150,7 @@ func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintpt
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32571,
+		ts+33141,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -131150,7 +132193,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32649,
+			ts+33219,
 			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
@@ -131277,7 +132320,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32702, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33272, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -131542,7 +132585,7 @@ func sessionAppendInteger(tls *libc.TLS, p uintptr, iVal int32, pRc uintptr) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
-	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]int8{}))-uint64(1)), bp+8, ts+4968, libc.VaList(bp, iVal))
+	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]int8{}))-uint64(1)), bp+8, ts+4987, libc.VaList(bp, iVal))
 	sessionAppendStr(tls, p, bp+8, pRc)
 }
 
@@ -131751,29 +132794,29 @@ 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+11341, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11360, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32729, libc.VaList(bp, zDb))
+			ts+33299, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
 	} else {
 		var i int32
-		var zSep uintptr = ts + 1547
+		var zSep uintptr = ts + 1566
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32839, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33409, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
-		sessionAppendStr(tls, bp+8, ts+1560, bp+24)
+		sessionAppendStr(tls, bp+8, ts+1579, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+32854, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33424, 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+32862, bp+24)
+				sessionAppendStr(tls, bp+8, ts+33432, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21518
+				zSep = ts + 21584
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -131882,7 +132925,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+32868, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33438, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -131974,7 +133017,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32888, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33458, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -132237,7 +133280,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, 219078)
+				rc = Xsqlite3CorruptError(tls, 219169)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -132260,7 +133303,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, 219098)
+						rc = Xsqlite3CorruptError(tls, 219189)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -132302,7 +133345,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, 219152)
+			rc = Xsqlite3CorruptError(tls, 219243)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -132363,7 +133406,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, 219240)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219331)
 		}
 	}
 
@@ -132437,13 +133480,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, 219326))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219417))
 	}
 
 	(*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, 219332))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219423))
 	}
 
 	if paRec != 0 {
@@ -132505,7 +133548,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, 219376))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219467))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -132878,7 +133921,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219832)
 	goto finished_invert
 __6:
 	;
@@ -133046,45 +134089,45 @@ 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+11341) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11360) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
 			} else {
-				var zSep uintptr = ts + 1547
+				var zSep uintptr = ts + 1566
 
 				libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(SessionBuffer{})))
 				(*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+32906, bp+16)
+				sessionAppendStr(tls, bp, ts+33476, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+32919, bp+16)
+				sessionAppendStr(tls, bp, ts+33489, 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+32925, bp+16)
+						sessionAppendStr(tls, bp, ts+33495, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 14607
+						zSep = ts + 14626
 					}
 				}
 
-				zSep = ts + 1547
-				sessionAppendStr(tls, bp, ts+32854, bp+16)
+				zSep = ts + 1566
+				sessionAppendStr(tls, bp, ts+33424, 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+32930, bp+16)
+								ts+33500, bp+16)
 						} else {
 							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+33432, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21518
+						zSep = ts + 21584
 					}
 				}
 
@@ -133131,42 +134174,42 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	defer tls.Free(20)
 
 	var i int32
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+33005, bp+16)
+	sessionAppendStr(tls, bp, ts+33575, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+32854, bp+16)
+	sessionAppendStr(tls, bp, ts+33424, 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+32925, bp+16)
+			sessionAppendStr(tls, bp, ts+33495, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21518
+			zSep = ts + 21584
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+33023, bp+16)
+		sessionAppendStr(tls, bp, ts+33593, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32566, bp+16)
+		sessionAppendStr(tls, bp, ts+33136, bp+16)
 
-		zSep = ts + 1547
+		zSep = ts + 1566
 		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+32862, bp+16)
+				sessionAppendStr(tls, bp, ts+33432, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 33031
+				zSep = ts + 33601
 			}
 		}
-		sessionAppendStr(tls, bp, ts+4950, bp+16)
+		sessionAppendStr(tls, bp, ts+4969, bp+16)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
@@ -133179,7 +134222,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+6434, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6453, 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 {
@@ -133190,21 +134233,21 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+33036, bp+16)
+	sessionAppendStr(tls, bp, ts+33606, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21524, bp+16)
+	sessionAppendStr(tls, bp, ts+21590, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14607, bp+16)
+			sessionAppendStr(tls, bp, ts+14626, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+33054, bp+16)
+	sessionAppendStr(tls, bp, ts+33624, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33065, bp+16)
+		sessionAppendStr(tls, bp, ts+33635, bp+16)
 	}
-	sessionAppendStr(tls, bp, ts+4950, bp+16)
+	sessionAppendStr(tls, bp, ts+4969, bp+16)
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v2(tls, db, (*SessionBuffer)(unsafe.Pointer(bp)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp)).FnBuf, p+16, uintptr(0))
@@ -133218,14 +134261,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+11341, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11360, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+33069)
+			ts+33639)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33182)
+			ts+33752)
 	}
 	return rc
 }
@@ -133253,7 +134296,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, 220219)
+				rc = Xsqlite3CorruptError(tls, 220310)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -133506,7 +134549,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+33326, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33896, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -133522,7 +134565,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+33347, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33917, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -133595,10 +134638,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+33366, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33936, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33392, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33962, 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))
@@ -133631,7 +134674,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				f func(*libc.TLS, uintptr, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xFilter})).f(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 176))))
 			if schemaMismatch != 0 {
-				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
+				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
 				if *(*uintptr)(unsafe.Pointer(bp + 200)) == uintptr(0) {
 					rc = SQLITE_NOMEM
 					break
@@ -133644,7 +134687,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+6434, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6453, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -133657,19 +134700,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+33422, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33992, 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+33466,
+						ts+34036,
 						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+33537, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+34107, 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+11341) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11360) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -133720,14 +134763,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33597, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34167, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33627, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34197, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33651, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33627, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34221, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34197, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -134975,7 +136018,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33679, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+34249, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135263,7 +136306,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33707, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+34277, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135450,7 +136493,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+33738, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34308, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -135518,7 +136561,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33745
+		var zErr uintptr = ts + 34315
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135677,7 +136720,7 @@ func fts5ValueToText(tls *libc.TLS, pVal uintptr) uintptr {
 	if zRet != 0 {
 		return zRet
 	}
-	return ts + 1547
+	return ts + 1566
 }
 
 func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, nVal int32, apVal uintptr) {
@@ -135700,7 +136743,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33795
+		var zErr uintptr = ts + 34365
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -136024,13 +137067,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33843, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34413, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33851, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34421, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33861, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34431, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -136441,7 +137484,7 @@ func fts5ConfigSkipLiteral(tls *libc.TLS, pIn uintptr) uintptr {
 	case 'n':
 		fallthrough
 	case 'N':
-		if Xsqlite3_strnicmp(tls, ts+6174, p, 4) == 0 {
+		if Xsqlite3_strnicmp(tls, ts+6193, p, 4) == 0 {
 			p = p + 4
 		} else {
 			p = uintptr(0)
@@ -136581,7 +137624,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+33866, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34436, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -136608,14 +137651,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+33873, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34443, 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+33904, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+34474, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136626,7 +137669,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33937, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34507, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136639,7 +137682,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33974, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34544, 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)))
@@ -136648,7 +137691,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+33983, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34553, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -136667,7 +137710,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34016, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34586, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -136682,14 +137725,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34050, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34620, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34058, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34628, 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+34090, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34660, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -136697,9 +137740,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34096, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34666, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34110, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34680, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -136707,9 +137750,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34148, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34718, 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+34159, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34729, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -136717,21 +137760,21 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+5068, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+5087, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 8019, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17338},
-			{FzName: ts + 34194, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8038, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17357},
+			{FzName: ts + 34764, 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+34202, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34772, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34233, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34803, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -136778,15 +137821,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+22184) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16260) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34261, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22250) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16279) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34831, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34291) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34861) {
 			*(*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+34301, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34871, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -136803,13 +137846,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+34332, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34902, 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+34337, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34907, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34344, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34914, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -136847,8 +137890,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+22184) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34352, 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+22250) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34922, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -136880,7 +137923,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+34381, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34951, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -136889,13 +137932,13 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 							if *(*uintptr)(unsafe.Pointer(bp + 48)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 48))
 							}
-							return ts + 1547
+							return ts + 1566
 						}(),
 						func() uintptr {
 							if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 64))
 							}
-							return ts + 1547
+							return ts + 1566
 						}(),
 						pzErr)
 				} else {
@@ -136917,19 +137960,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 + 34050
+			zTail = ts + 34620
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34401
+			zTail = ts + 34971
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34409, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34979, 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+16260, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16279, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -136973,18 +138016,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+34420, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34990, 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 + 1566
 			}
-			return ts + 14607
+			return ts + 14626
 		}()
-		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+35006, 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+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22184))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35013,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22250))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -137094,7 +138137,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34469) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35039) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -137104,7 +138147,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+34474) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35044) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -137114,7 +138157,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+34483) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35053) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -137127,7 +138170,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+34493) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35063) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -137137,7 +138180,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+34503) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35073) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -137153,7 +138196,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+22184) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22250) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -137176,7 +138219,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34515
+	var zSelect uintptr = ts + 35085
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -137198,7 +138241,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+34547) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35117) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -137212,7 +138255,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+34555,
+				ts+35125,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -137310,7 +138353,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34620, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+35190, 0)
 					return FTS5_EOF
 				}
 			}
@@ -137323,20 +138366,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+34640, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+35210, 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+34671, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35241, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34674, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35244, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30056, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30122, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -139114,9 +140157,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+34678, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35248, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33707, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+34277, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -139132,7 +140175,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+34683, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+35253, 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')
@@ -139219,7 +140262,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20521, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20587, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -139300,7 +140343,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+34712, 0)
+			ts+35282, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -139470,12 +140513,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+34765,
+								ts+35335,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34815
+										return ts + 35385
 									}
-									return ts + 34678
+									return ts + 35248
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -140418,7 +141461,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+34822, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35392, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -140497,7 +141540,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+34828,
+			ts+35398,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -140522,7 +141565,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+34879,
+			ts+35449,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -140545,7 +141588,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+34928,
+			ts+35498,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -140784,7 +141827,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+34968, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+35538, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -141983,7 +143026,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+34991,
+			ts+35561,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -143176,7 +144219,7 @@ func fts5WriteFlushBtree(tls *libc.TLS, p uintptr, pWriter uintptr) {
 			if (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn > 0 {
 				return (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fp
 			}
-			return ts + 1547
+			return ts + 1566
 		}()
 
 		Xsqlite3_bind_blob(tls, (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter, 2, z, (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn, uintptr(0))
@@ -143449,7 +144492,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+35075,
+			ts+35645,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -144515,7 +145558,7 @@ func sqlite3Fts5IndexReinit(tls *libc.TLS, p uintptr) int32 {
 	fts5StructureInvalidate(tls, p)
 	fts5IndexDiscardData(tls, p)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Fts5Structure{})))
-	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1547, 0)
+	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1566, 0)
 	fts5StructureWrite(tls, p, bp)
 	return fts5IndexReturn(tls, p)
 }
@@ -144531,13 +145574,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+35132, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35702, 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+25049, ts+35140, 0, pzErr)
+				pConfig, ts+25115, ts+35710, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11481,
-					ts+35175,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11500,
+					ts+35745,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -144790,7 +145833,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+34822, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+35392, 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)))
@@ -144904,7 +145947,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35219,
+		ts+35789,
 		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))) {
@@ -145074,7 +146117,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+35305)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35875)
 			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))
@@ -145345,7 +146388,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+35310, 0)
+			ts+35880, 0)
 		return SQLITE_ERROR
 	}
 
@@ -145376,7 +146419,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 				} else if iCol >= 0 {
 					bSeenMatch = 1
 					*(*int8)(unsafe.Pointer(idxStr + uintptr(libc.PostIncInt32(&iIdxStr, 1)))) = int8('M')
-					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4968, libc.VaList(bp, iCol))
+					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4987, libc.VaList(bp, iCol))
 					idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 
 				}
@@ -145391,7 +146434,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 					}
 					return int8('G')
 				}()
-				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4968, libc.VaList(bp+8, iCol))
+				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4987, libc.VaList(bp+8, iCol))
 				idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 				(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pInfo)).FaConstraintUsage + uintptr(i)*8)).FargvIndex = libc.PreIncInt32(&iCons, 1)
 
@@ -145705,7 +146748,7 @@ func fts5NextMethod(tls *libc.TLS, pCursor uintptr) int32 {
 					rc = Xsqlite3_reset(tls, (*Fts5Cursor)(unsafe.Pointer(pCsr)).FpStmt)
 					if rc != SQLITE_OK {
 						(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-							ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+							ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 					}
 				} else {
 					rc = SQLITE_OK
@@ -145737,7 +146780,7 @@ func fts5PrepareStatement(tls *libc.TLS, ppStmt uintptr, pConfig uintptr, zFmt u
 		rc = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
 			uint32(SQLITE_PREPARE_PERSISTENT), bp+8, uintptr(0))
 		if rc != SQLITE_OK {
-			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 		}
 		Xsqlite3_free(tls, zSql)
 	}
@@ -145769,25 +146812,25 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35349,
+		ts+35919,
 		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 + 14607
+					return ts + 14626
 				}
-				return ts + 1547
+				return ts + 1566
 			}(),
 			func() uintptr {
 				if zRankArgs != 0 {
 					return zRankArgs
 				}
-				return ts + 1547
+				return ts + 1566
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35404
+					return ts + 35974
 				}
-				return ts + 35409
+				return ts + 35979
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -145833,12 +146876,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+35413, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35983, 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) {
+	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5069, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35419, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35989, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -145869,7 +146912,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+35447, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36017, 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,
@@ -145900,7 +146943,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+35457, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36027, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -145932,14 +146975,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+35478, libc.VaList(bp, z))
+				ts+36048, 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 + 33861
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34431
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -145995,7 +147038,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+35310, 0)
+		ts+35880, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -146038,7 +147081,7 @@ __8:
 	if !(zText == uintptr(0)) {
 		goto __14
 	}
-	zText = ts + 1547
+	zText = ts + 1566
 __14:
 	;
 	iCol = 0
@@ -146212,7 +147255,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35511, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+36081, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -146333,7 +147376,7 @@ func fts5SeekCursor(tls *libc.TLS, pCsr uintptr, bErrormsg int32) int32 {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			} else if (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg != 0 {
 				*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-					ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
+					ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
 			}
 		}
 	}
@@ -146357,28 +147400,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+35547, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36117, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35558, 0)
+				ts+36128, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35638, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36208, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35646, 0)
+				ts+36216, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16927, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16946, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35702, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36272, 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+35708, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36278, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -146436,7 +147479,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+17472, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17491, 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)))
@@ -146449,12 +147492,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+35724,
+				ts+36294,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20422
+						return ts + 20488
 					}
-					return ts + 35761
+					return ts + 36331
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -147084,7 +148127,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+35773, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36343, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -147328,7 +148371,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+35794, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36364, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -147347,7 +148390,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+35816, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36386, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -147394,7 +148437,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+35847)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36417)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -147403,7 +148446,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+35860, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+36430, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -147417,7 +148460,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35951, ts + 34050, ts + 25049, ts + 34401, ts + 11481,
+	ts + 36521, ts + 34620, ts + 25115, ts + 34971, ts + 11500,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -147441,7 +148484,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+35958, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+36528, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -147459,13 +148502,13 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35958, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36528, 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+35963, 0,
+				db, ts+36533, 0,
 				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
 				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
@@ -147522,17 +148565,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 + 35978,
-			ts + 36046,
-			ts + 36115,
-			ts + 36148,
-			ts + 36187,
-			ts + 36227,
-			ts + 36266,
-			ts + 36307,
-			ts + 36346,
-			ts + 36388,
-			ts + 36428,
+			ts + 36548,
+			ts + 36616,
+			ts + 36685,
+			ts + 36718,
+			ts + 36757,
+			ts + 36797,
+			ts + 36836,
+			ts + 36877,
+			ts + 36916,
+			ts + 36958,
+			ts + 36998,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -147599,7 +148642,7 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 			(*Fts5Config)(unsafe.Pointer((*Fts5Storage)(unsafe.Pointer(p)).FpConfig)).FbLock--
 			Xsqlite3_free(tls, zSql)
 			if rc != SQLITE_OK && pzErrMsg != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
 			}
 		}
 	}
@@ -147634,18 +148677,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+36451,
+		ts+37021,
 		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+36555,
+			ts+37125,
 			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+36593,
+			ts+37163,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -147657,7 +148700,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+36631,
+			ts+37201,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -147669,14 +148712,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+25049, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11481, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35951, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25115, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11500, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+36521, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34401, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34971, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34050, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34620, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -147688,17 +148731,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+36673,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37243,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29702
+					return ts + 29768
 				}
-				return ts + 1547
+				return ts + 1566
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36703,
+			ts+37273,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -147735,27 +148778,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36747, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37317, 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+36770, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37340, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34050, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34620, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34401, ts+36776, 0, pzErr)
+				pConfig, ts+34971, ts+37346, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35951, ts+36808, 1, pzErr)
+				pConfig, ts+36521, ts+37378, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34547, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35117, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -147961,12 +149004,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+36825,
+		ts+37395,
 		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+36875,
+			ts+37445,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -147974,7 +149017,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+34547, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35117, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -148150,7 +149193,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36904,
+	zSql = Xsqlite3_mprintf(tls, ts+37474,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -148332,14 +149375,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+34050, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34620, 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+34401, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34971, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -148534,9 +149577,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+36936) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37506) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36947) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37517) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -148751,7 +149794,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 + 36958
+			var zCat uintptr = ts + 37528
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -148763,7 +149806,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+36967) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37537) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -148774,18 +149817,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+36978) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37548) {
 					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+36936) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37506) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36947) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37517) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36967) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37537) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -149061,7 +150104,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 + 36996
+	var zBase uintptr = ts + 37566
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -149203,7 +150246,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+37006, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37576, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149211,11 +150254,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37009, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37579, 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+37014, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37584, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149223,7 +150266,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37019, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37589, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149231,7 +150274,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37022, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37592, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149239,11 +150282,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37595, 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+37030, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37600, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149251,19 +150294,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37035, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37605, 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+37039, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37609, 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+37045, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37615, 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+37050, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37620, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149271,11 +150314,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37054, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37624, 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+37058, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37628, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149283,7 +150326,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37631, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149291,11 +150334,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37635, 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+37069, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37639, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149303,7 +150346,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37073, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37643, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149311,7 +150354,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37077, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37647, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149319,7 +150362,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37081, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37651, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149335,24 +150378,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+37085, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37065, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37655, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37635, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37658, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37661, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37665, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37651, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -149367,137 +150410,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+37098, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37668, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37065, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37635, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37106, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37676, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37113, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37683, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37118, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37688, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37014, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37584, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37123, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37693, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37009, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37579, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37128, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37698, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37081, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37651, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37133, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37703, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15473, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15492, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37138, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37708, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37091, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37661, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37142, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37712, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37006, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37576, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37147, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37717, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37050, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37620, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37153, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37723, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37157, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37727, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37159, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37729, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37073, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37643, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37165, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37735, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37081, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37651, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37173, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37743, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37065, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37635, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37179, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37749, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37065, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37635, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37184, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37754, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37576, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37190, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37760, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37077, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37647, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37198, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37768, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37206, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37776, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37210, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37780, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37073, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37643, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37218, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37788, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37576, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37224, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37794, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37077, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37647, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37230, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37800, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37091, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37661, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -149512,16 +150555,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+37237, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37807, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37022, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37592, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37242, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37812, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149529,21 +150572,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37247, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37817, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37022, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37592, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37253, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37823, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37022, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37592, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37206, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37776, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149551,7 +150594,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37259, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37829, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -149559,9 +150602,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37265, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37835, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37576, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -149576,12 +150619,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+37271, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37841, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37275, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37845, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37278, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37848, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -149590,7 +150633,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37281, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37851, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -149746,7 +150789,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+37285) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37855) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -149926,22 +150969,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36996, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37566, 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 + 37300, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37870, 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 + 37306, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37876, 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 + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37883, 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
@@ -151084,14 +152127,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+37321) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37891) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37325) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37895) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37329) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37899) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37338, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37908, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -151117,19 +152160,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 + 37372,
-		ts + 37412,
-		ts + 37447,
+		ts + 37942,
+		ts + 37982,
+		ts + 38017,
 	}
 
 	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+23345, *(*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+23411, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37490, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38060, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -151262,11 +152305,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+37523, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+38093, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37554,
+		ts+38124,
 		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))
@@ -151290,7 +152333,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+37605, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38175, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -151574,7 +152617,7 @@ func fts5VocabFilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, zUnused
 		if pLe != 0 {
 			var zCopy uintptr = Xsqlite3_value_text(tls, pLe)
 			if zCopy == uintptr(0) {
-				zCopy = ts + 1547
+				zCopy = ts + 1566
 			}
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm = Xsqlite3_value_bytes(tls, pLe)
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FzLeTerm = Xsqlite3_malloc(tls, (*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm+1)
@@ -151685,7 +152728,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+37631, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+38201, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -151707,7 +152750,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 + 37641
+	return ts + 38211
 }
 
 func init() {
@@ -152130,6 +153173,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1056)) = noopStepFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1064)) = uintptr(unsafe.Pointer(&lagName))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&attach_func)) + 24)) = attachFunc
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 8)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 16)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 24)) = statBestIndex
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 32)) = statDisconnect
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 40)) = statDisconnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 48)) = statOpen
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 56)) = statClose
+	*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 64)) = statFilter
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 72)) = statNext
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 80)) = statEof
+	*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 88)) = statColumn
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 96)) = statRowid
 	*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 0)) = sqlite3MemMalloc
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 8)) = sqlite3MemFree
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 16)) = sqlite3MemRealloc
@@ -152662,8 +153717,9 @@ func init() {
 	*(*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
-	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = Xsqlite3JsonTableFunctions
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = Xsqlite3DbstatRegister
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = sqlite3TestExtInit
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 32)) = Xsqlite3JsonTableFunctions
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statGetFuncdef)) + 24)) = statGet
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statInitFuncdef)) + 24)) = statInit
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statPushFuncdef)) + 24)) = statPush
@@ -152681,5 +153737,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-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 ts1 = "3.41.2\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-14.0.5\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_DBSTAT_VTAB\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\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\x00true\x00false\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 \x00rowid not at end-of-record for row \x00 of 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\x00CREATE TABLE x( name       TEXT, path       TEXT, pageno     INTEGER, pagetype   TEXT, ncell      INTEGER, payload    INTEGER, unused     INTEGER, mx_payload INTEGER, pgoffset   INTEGER, pgsize     INTEGER, schema     TEXT HIDDEN, aggregate  BOOLEAN HIDDEN)\x00/\x00overflow\x00%s%.3x+%.6x\x00%s%.3x/\x00internal\x00leaf\x00corrupted\x00SELECT * FROM (SELECT 'sqlite_schema' AS name,1 AS rootpage,'table' AS type UNION ALL SELECT name,rootpage,type FROM \"%w\".sqlite_schema WHERE rootpage!=0)\x00WHERE name=%Q\x00 ORDER BY name\x00dbstat\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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 c565308b..fd1930ac 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -180,6 +180,7 @@ const (
 	DBFLAG_SchemaKnownOk                  = 0x0010
 	DBFLAG_Vacuum                         = 0x0004
 	DBFLAG_VacuumInto                     = 0x0008
+	DBSTAT_PAGE_PADDING_BYTES             = 256
 	DB_ResetWanted                        = 0x0008
 	DB_SchemaLoaded                       = 0x0001
 	DB_UnresetViews                       = 0x0002
@@ -747,11 +748,11 @@ const (
 	NC_OrderAgg                           = 0x8000000
 	NC_PartIdx                            = 0x000002
 	NC_SelfRef                            = 0x00002e
+	NC_Subquery                           = 0x000040
 	NC_UAggInfo                           = 0x000100
 	NC_UBaseReg                           = 0x000400
 	NC_UEList                             = 0x000080
 	NC_UUpsert                            = 0x000200
-	NC_VarSelect                          = 0x000040
 	NDEBUG                                = 1
 	NETGRAPHDISC                          = 6
 	NN                                    = 1
@@ -1557,6 +1558,7 @@ const (
 	SQLITE_ECEL_REF                       = 0x04
 	SQLITE_EMPTY                          = 16
 	SQLITE_ENABLE_COLUMN_METADATA         = 1
+	SQLITE_ENABLE_DBSTAT_VTAB             = 1
 	SQLITE_ENABLE_FTS5                    = 1
 	SQLITE_ENABLE_GEOPOLY                 = 1
 	SQLITE_ENABLE_LOCKING_STYLE           = 0
@@ -1957,7 +1959,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
+	SQLITE_SOURCE_ID                      = "2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2065,8 +2067,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.41.0"
-	SQLITE_VERSION_NUMBER                 = 3041000
+	SQLITE_VERSION                        = "3.41.2"
+	SQLITE_VERSION_NUMBER                 = 3041002
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -5268,7 +5270,8 @@ type IndexedExpr1 = struct {
 	FiIdxCur       int32
 	FiIdxCol       int32
 	FbMaybeNullRow U8
-	F__ccgo_pad1   [3]byte
+	Faff           U8
+	F__ccgo_pad1   [2]byte
 	FpIENext       uintptr
 }
 
@@ -5897,17 +5900,18 @@ type Pager = Pager1
 
 // Handle type for pages.
 type PgHdr2 = struct {
-	FpPage      uintptr
-	FpData      uintptr
-	FpExtra     uintptr
-	FpCache     uintptr
-	FpDirty     uintptr
-	FpPager     uintptr
-	Fpgno       Pgno
-	Fflags      U16
-	FnRef       I16
-	FpDirtyNext uintptr
-	FpDirtyPrev uintptr
+	FpPage       uintptr
+	FpData       uintptr
+	FpExtra      uintptr
+	FpCache      uintptr
+	FpDirty      uintptr
+	FpPager      uintptr
+	Fpgno        Pgno
+	Fflags       U16
+	F__ccgo_pad1 [2]byte
+	FnRef        I64
+	FpDirtyNext  uintptr
+	FpDirtyPrev  uintptr
 }
 
 // Handle type for pages.
@@ -6120,14 +6124,15 @@ type PCache2 = struct {
 	FpDirty      uintptr
 	FpDirtyTail  uintptr
 	FpSynced     uintptr
-	FnRefSum     int32
+	F__ccgo_pad1 [4]byte
+	FnRefSum     I64
 	FszCache     int32
 	FszSpill     int32
 	FszPage      int32
 	FszExtra     int32
 	FbPurgeable  U8
 	FeCreate     U8
-	F__ccgo_pad1 [2]byte
+	F__ccgo_pad2 [2]byte
 	FxStress     uintptr
 	FpStress     uintptr
 	FpCache      uintptr
@@ -6376,7 +6381,7 @@ type CoveringIndexCheck1 = struct {
 	F__ccgo_pad1 [2]byte
 }
 
-var sqlite3azCompileOpt = [52]uintptr{
+var sqlite3azCompileOpt = [53]uintptr{
 	ts + 7,
 	ts + 27,
 	ts + 49,
@@ -6395,40 +6400,41 @@ var sqlite3azCompileOpt = [52]uintptr{
 	ts + 365,
 	ts + 390,
 	ts + 413,
-	ts + 425,
-	ts + 440,
-	ts + 462,
-	ts + 487,
-	ts + 510,
-	ts + 532,
-	ts + 543,
-	ts + 556,
-	ts + 571,
-	ts + 587,
-	ts + 600,
-	ts + 621,
-	ts + 645,
-	ts + 668,
-	ts + 684,
-	ts + 700,
-	ts + 724,
-	ts + 751,
-	ts + 771,
-	ts + 792,
-	ts + 814,
-	ts + 844,
-	ts + 869,
-	ts + 895,
-	ts + 915,
-	ts + 941,
-	ts + 964,
-	ts + 990,
-	ts + 1012,
-	ts + 1033,
-	ts + 1044,
+	ts + 432,
+	ts + 444,
+	ts + 459,
+	ts + 481,
+	ts + 506,
+	ts + 529,
+	ts + 551,
+	ts + 562,
+	ts + 575,
+	ts + 590,
+	ts + 606,
+	ts + 619,
+	ts + 640,
+	ts + 664,
+	ts + 687,
+	ts + 703,
+	ts + 719,
+	ts + 743,
+	ts + 770,
+	ts + 790,
+	ts + 811,
+	ts + 833,
+	ts + 863,
+	ts + 888,
+	ts + 914,
+	ts + 934,
+	ts + 960,
+	ts + 983,
+	ts + 1009,
+	ts + 1031,
 	ts + 1052,
-	ts + 1066,
-	ts + 1079,
+	ts + 1063,
+	ts + 1071,
+	ts + 1085,
+	ts + 1098,
 }
 
 func Xsqlite3CompileOptions(tls *libc.TLS, pnOpt uintptr) uintptr {
@@ -6580,7 +6586,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 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))
+var Xsqlite3StrBINARY = *(*[7]uint8)(unsafe.Pointer(ts + 1111))
 
 // Standard typenames.  These names must match the COLTYPE_* definitions.
 // Adjust the SQLITE_N_STDTYPE value if adding or removing entries.
@@ -6602,12 +6608,12 @@ var Xsqlite3StdTypeAffinity = [6]uint8{
 	uint8(SQLITE_AFF_TEXT),
 }
 var Xsqlite3StdType = [6]uintptr{
-	ts + 1099,
-	ts + 1103,
-	ts + 1108,
-	ts + 1112,
-	ts + 1120,
-	ts + 1125,
+	ts + 1118,
+	ts + 1122,
+	ts + 1127,
+	ts + 1131,
+	ts + 1139,
+	ts + 1144,
 }
 
 // SQL is translated into a sequence of instructions to be
@@ -6924,7 +6930,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, 23229)
+		return Xsqlite3MisuseError(tls, 23233)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -7330,7 +7336,7 @@ __6:
 __4:
 	;
 	zDate++
-	if !(getDigits(tls, zDate, ts+1130, libc.VaList(bp, bp+16, bp+20)) != 2) {
+	if !(getDigits(tls, zDate, ts+1149, libc.VaList(bp, bp+16, bp+20)) != 2) {
 		goto __9
 	}
 	return 1
@@ -7356,13 +7362,13 @@ func parseHhMmSs(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	defer tls.Free(36)
 
 	var ms float64 = 0.0
-	if getDigits(tls, zDate, ts+1138, libc.VaList(bp, bp+24, bp+28)) != 2 {
+	if getDigits(tls, zDate, ts+1157, libc.VaList(bp, bp+24, bp+28)) != 2 {
 		return 1
 	}
 	zDate += uintptr(5)
 	if int32(*(*uint8)(unsafe.Pointer(zDate))) == ':' {
 		zDate++
-		if getDigits(tls, zDate, ts+1146, libc.VaList(bp+16, bp+32)) != 1 {
+		if getDigits(tls, zDate, ts+1165, libc.VaList(bp+16, bp+32)) != 1 {
 			return 1
 		}
 		zDate += uintptr(2)
@@ -7460,7 +7466,7 @@ func parseYyyyMmDd(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	} else {
 		neg = 0
 	}
-	if getDigits(tls, zDate, ts+1150, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
+	if getDigits(tls, zDate, ts+1169, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
 		return 1
 	}
 	zDate += uintptr(10)
@@ -7517,7 +7523,7 @@ func parseDateOrTime(tls *libc.TLS, context uintptr, zDate uintptr, p uintptr) i
 		return 0
 	} else if parseHhMmSs(tls, zDate, p) == 0 {
 		return 0
-	} else if Xsqlite3StrICmp(tls, zDate, ts+1162) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
+	} else if Xsqlite3StrICmp(tls, zDate, ts+1181) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
 		return setDateTimeToCurrent(tls, context, p)
 	} else if Xsqlite3AtoF(tls, zDate, bp, Xsqlite3Strlen30(tls, zDate), uint8(SQLITE_UTF8)) > 0 {
 		setRawDateNumber(tls, p, *(*float64)(unsafe.Pointer(bp)))
@@ -7650,7 +7656,7 @@ func toLocaltime(tls *libc.TLS, p uintptr, pCtx uintptr) int32 {
 		*(*Time_t)(unsafe.Pointer(bp + 96)) = (*DateTime)(unsafe.Pointer(p)).FiJD/int64(1000) - int64(21086676)*int64(10000)
 	}
 	if osLocaltime(tls, bp+96, bp) != 0 {
-		Xsqlite3_result_error(tls, pCtx, ts+1166, -1)
+		Xsqlite3_result_error(tls, pCtx, ts+1185, -1)
 		return SQLITE_ERROR
 	}
 	(*DateTime)(unsafe.Pointer(p)).FY = (*tm)(unsafe.Pointer(bp)).Ftm_year + 1900 - iYearDiff
@@ -7674,12 +7680,12 @@ var aXformType = [6]struct {
 	FrLimit float32
 	FrXform float32
 }{
-	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1189)), FrLimit: 4.6427e+14, FrXform: 1.0},
-	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1196)), FrLimit: 7.7379e+12, FrXform: 60.0},
-	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1203)), FrLimit: 1.2897e+11, FrXform: 3600.0},
-	{FnName: U8(3), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1210)), FrLimit: 5373485.0, FrXform: 86400.0},
-	{FnName: U8(5), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1217)), FrLimit: 176546.0, FrXform: 2592000.0},
-	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1224)), FrLimit: 14713.0, FrXform: 31536000.0},
+	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1208)), FrLimit: 4.6427e+14, FrXform: 1.0},
+	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1215)), FrLimit: 7.7379e+12, FrXform: 60.0},
+	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1222)), FrLimit: 1.2897e+11, FrXform: 3600.0},
+	{FnName: U8(3), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1229)), FrLimit: 5373485.0, FrXform: 86400.0},
+	{FnName: U8(5), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1236)), FrLimit: 176546.0, FrXform: 2592000.0},
+	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1243)), FrLimit: 14713.0, FrXform: 31536000.0},
 }
 
 func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, idx int32) int32 {
@@ -7691,7 +7697,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 	switch int32(Xsqlite3UpperToLower[*(*uint8)(unsafe.Pointer(z))]) {
 	case 'a':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1231) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1250) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -7713,7 +7719,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'j':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1236) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1255) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -7727,7 +7733,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'l':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1246) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1265) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				rc = toLocaltime(tls, p, pCtx)
 			}
 			break
@@ -7735,7 +7741,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'u':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1256) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1275) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -7747,7 +7753,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					(*DateTime)(unsafe.Pointer(p)).FrawS = uint8(0)
 					rc = 0
 				}
-			} else if Xsqlite3_stricmp(tls, z, ts+1266) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1285) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				if int32((*DateTime)(unsafe.Pointer(p)).FtzSet) == 0 {
 					var iOrigJD I64
 					var iGuess I64
@@ -7781,7 +7787,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'w':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1270, 8) == 0 &&
+			if Xsqlite3_strnicmp(tls, z, ts+1289, 8) == 0 &&
 				Xsqlite3AtoF(tls, z+8, bp+48, Xsqlite3Strlen30(tls, z+8), uint8(SQLITE_UTF8)) > 0 &&
 				*(*float64)(unsafe.Pointer(bp + 48)) >= 0.0 && *(*float64)(unsafe.Pointer(bp + 48)) < 7.0 && float64(libc.AssignInt32(&n, int32(*(*float64)(unsafe.Pointer(bp + 48))))) == *(*float64)(unsafe.Pointer(bp + 48)) {
 				var Z Sqlite3_int64
@@ -7802,7 +7808,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 's':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1279, 9) != 0 {
+			if Xsqlite3_strnicmp(tls, z, ts+1298, 9) != 0 {
 				break
 			}
 			if !(int32((*DateTime)(unsafe.Pointer(p)).FvalidJD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidYMD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidHMS) != 0) {
@@ -7816,14 +7822,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 			(*DateTime)(unsafe.Pointer(p)).FrawS = uint8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidTZ = uint8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidJD = uint8(0)
-			if Xsqlite3_stricmp(tls, z, ts+1289) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1308) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1295) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1314) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FM = 1
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1300) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1319) == 0 {
 				rc = 0
 			}
 			break
@@ -8149,7 +8155,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		switch int32(*(*uint8)(unsafe.Pointer(zFmt + uintptr(i)))) {
 		case 'd':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
 				break
 
 			}
@@ -8159,13 +8165,13 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if s > 59.999 {
 					s = 59.999
 				}
-				Xsqlite3_str_appendf(tls, bp+136, ts+1309, libc.VaList(bp+8, s))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1328, libc.VaList(bp+8, s))
 				break
 
 			}
 		case 'H':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
 				break
 
 			}
@@ -8183,41 +8189,41 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if int32(*(*uint8)(unsafe.Pointer(zFmt + uintptr(i)))) == 'W' {
 					var wd int32
 					wd = int32(((*DateTime)(unsafe.Pointer(bp+88)).FiJD + int64(43200000)) / int64(86400000) % int64(7))
-					Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+24, (nDay+7-wd)/7))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+24, (nDay+7-wd)/7))
 				} else {
-					Xsqlite3_str_appendf(tls, bp+136, ts+1316, libc.VaList(bp+32, nDay+1))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1335, libc.VaList(bp+32, nDay+1))
 				}
 				break
 
 			}
 		case 'J':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1321, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1340, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
 				break
 
 			}
 		case 'm':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
 				break
 
 			}
 		case 'M':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
 				break
 
 			}
 		case 's':
 			{
 				var iS I64 = (*DateTime)(unsafe.Pointer(bp+88)).FiJD/int64(1000) - int64(21086676)*int64(10000)
-				Xsqlite3_str_appendf(tls, bp+136, ts+1327, libc.VaList(bp+64, iS))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1346, libc.VaList(bp+64, iS))
 				break
 
 			}
 		case 'S':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
 				break
 
 			}
@@ -8230,7 +8236,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			}
 		case 'Y':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1332, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1351, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
 				break
 
 			}
@@ -8280,15 +8286,15 @@ func Xsqlite3RegisterDateTimeFunctions(tls *libc.TLS) {
 }
 
 var aDateTimeFuncs = [9]FuncDef{
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1236},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1256},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1337},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1342},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1347},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1255},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1275},
 	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1356},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1365},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1378},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1396}}
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1361},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1366},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1375},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1384},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1397},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1415}}
 
 // The following routines are convenience wrappers around methods
 // of the sqlite3_file object.  This is mostly just syntactic sugar. All
@@ -8703,7 +8709,7 @@ func sqlite3MemMalloc(tls *libc.TLS, nByte int32) uintptr {
 		*(*Sqlite3_int64)(unsafe.Pointer(p)) = Sqlite3_int64(nByte)
 		p += 8
 	} else {
-		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1409, libc.VaList(bp, nByte))
+		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1428, libc.VaList(bp, nByte))
 	}
 	return p
 }
@@ -8736,7 +8742,7 @@ func sqlite3MemRealloc(tls *libc.TLS, pPrior uintptr, nByte int32) uintptr {
 		p += 8
 	} else {
 		Xsqlite3_log(tls, SQLITE_NOMEM,
-			ts+1447,
+			ts+1466,
 			libc.VaList(bp, sqlite3MemSize(tls, pPrior), nByte))
 	}
 	return p
@@ -9613,7 +9619,7 @@ func Xsqlite3OomFault(tls *libc.TLS, db uintptr) uintptr {
 		(*Sqlite3)(unsafe.Pointer(db)).Flookaside.Fsz = U16(0)
 		if (*Sqlite3)(unsafe.Pointer(db)).FpParse != 0 {
 			var pParse uintptr
-			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1483, 0)
+			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1502, 0)
 			(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 			for pParse = (*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).FpOuterParse; pParse != 0; pParse = (*Parse)(unsafe.Pointer(pParse)).FpOuterParse {
 				(*Parse)(unsafe.Pointer(pParse)).FnErr++
@@ -9686,8 +9692,8 @@ type et_info = struct {
 // by an instance of the following structure
 type Et_info = et_info
 
-var aDigits = *(*[33]uint8)(unsafe.Pointer(ts + 1497))
-var aPrefix = *(*[7]uint8)(unsafe.Pointer(ts + 1530))
+var aDigits = *(*[33]uint8)(unsafe.Pointer(ts + 1516))
+var aPrefix = *(*[7]uint8)(unsafe.Pointer(ts + 1549))
 var fmtinfo = [23]Et_info{
 	{Ffmttype: uint8('d'), Fbase: EtByte(10), Fflags: EtByte(1), Ftype: EtByte(EtDECIMAL)},
 	{Ffmttype: uint8('s'), Fflags: EtByte(4), Ftype: EtByte(EtSTRING)},
@@ -9901,7 +9907,7 @@ __6:
 	if !(libc.AssignInt32(&c, int32(*(*uint8)(unsafe.Pointer(libc.PreIncUintptr(&fmt, 1))))) == 0) {
 		goto __11
 	}
-	Xsqlite3_str_append(tls, pAccum, ts+1537, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1556, 1)
 	goto __5
 __11:
 	;
@@ -10462,7 +10468,7 @@ __125:
 	if !(Xsqlite3IsNaN(tls, *(*float64)(unsafe.Pointer(bp + 104))) != 0) {
 		goto __127
 	}
-	bufpt = ts + 1539
+	bufpt = ts + 1558
 	length = 3
 	goto __58
 __127:
@@ -10522,7 +10528,7 @@ __138:
 	}
 	bufpt = bp + 16
 	*(*uint8)(unsafe.Pointer(bp + 16)) = prefix
-	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1543, uint32(4))
+	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1562, uint32(4))
 	length = 3 + libc.Bool32(int32(prefix) != 0)
 	goto __58
 __139:
@@ -10888,7 +10894,7 @@ __200:
 	if !(bufpt == uintptr(0)) {
 		goto __201
 	}
-	bufpt = ts + 1547
+	bufpt = ts + 1566
 	goto __202
 __201:
 	if !(int32(xtype) == EtDYNSTRING) {
@@ -11012,9 +11018,9 @@ __222:
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
-			return ts + 1548
+			return ts + 1567
 		}
-		return ts + 1553
+		return ts + 1572
 	}()
 __223:
 	;
@@ -11162,7 +11168,7 @@ __246:
 		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
-	Xsqlite3_str_append(tls, pAccum, ts+1560, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1579, 1)
 __250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
@@ -11179,10 +11185,10 @@ __251:
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
 		goto __253
 	}
-	Xsqlite3_str_appendf(tls, pAccum, ts+1562, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1581, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 	goto __254
 __253:
-	Xsqlite3_str_appendf(tls, pAccum, ts+1572, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1591, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
 __254:
 	;
 __252:
@@ -11237,7 +11243,7 @@ __4:
 __5:
 }
 
-var zOrd = *(*[9]uint8)(unsafe.Pointer(ts + 1586))
+var zOrd = *(*[9]uint8)(unsafe.Pointer(ts + 1605))
 
 // The z string points to the first character of a token that is
 // associated with an error.  If db does not already have an error
@@ -11402,7 +11408,7 @@ func Xsqlite3ResultStrAccum(tls *libc.TLS, pCtx uintptr, p uintptr) {
 	} else if int32((*StrAccum)(unsafe.Pointer(p)).FprintfFlags)&SQLITE_PRINTF_MALLOCED != 0 {
 		Xsqlite3_result_text(tls, pCtx, (*StrAccum)(unsafe.Pointer(p)).FzText, int32((*StrAccum)(unsafe.Pointer(p)).FnChar), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 	} else {
-		Xsqlite3_result_text(tls, pCtx, ts+1547, 0, uintptr(0))
+		Xsqlite3_result_text(tls, pCtx, ts+1566, 0, uintptr(0))
 		Xsqlite3_str_reset(tls, p)
 	}
 }
@@ -13132,7 +13138,7 @@ func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
 	var c int32 = 0
 	var i int32
 
-	var pow63 uintptr = ts + 1595
+	var pow63 uintptr = ts + 1614
 	for i = 0; c == 0 && i < 18; i++ {
 		c = (int32(*(*uint8)(unsafe.Pointer(zNum + uintptr(i*incr)))) - int32(*(*uint8)(unsafe.Pointer(pow63 + uintptr(i))))) * 10
 	}
@@ -13678,7 +13684,7 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 	defer tls.Free(8)
 
 	Xsqlite3_log(tls, SQLITE_MISUSE,
-		ts+1614,
+		ts+1633,
 		libc.VaList(bp, zType))
 }
 
@@ -13697,13 +13703,13 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 func Xsqlite3SafetyCheckOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	if db == uintptr(0) {
-		logBadConnection(tls, ts+1548)
+		logBadConnection(tls, ts+1567)
 		return 0
 	}
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_OPEN {
 		if Xsqlite3SafetyCheckSickOrOk(tls, db) != 0 {
-			logBadConnection(tls, ts+1659)
+			logBadConnection(tls, ts+1678)
 		}
 		return 0
 	} else {
@@ -13716,7 +13722,7 @@ func Xsqlite3SafetyCheckSickOrOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_SICK && int32(eOpenState) != SQLITE_STATE_OPEN && int32(eOpenState) != SQLITE_STATE_BUSY {
-		logBadConnection(tls, ts+1668)
+		logBadConnection(tls, ts+1687)
 		return 0
 	} else {
 		return 1
@@ -14242,193 +14248,193 @@ func Xsqlite3OpcodeName(tls *libc.TLS, i int32) uintptr {
 }
 
 var azName = [187]uintptr{
-	ts + 1676,
-	ts + 1686,
-	ts + 1697,
-	ts + 1709,
-	ts + 1720,
-	ts + 1732,
+	ts + 1695,
+	ts + 1705,
+	ts + 1716,
+	ts + 1728,
 	ts + 1739,
-	ts + 1747,
-	ts + 1755,
-	ts + 1760,
-	ts + 1765,
-	ts + 1771,
-	ts + 1785,
-	ts + 1791,
-	ts + 1801,
-	ts + 1806,
-	ts + 1811,
-	ts + 1814,
+	ts + 1751,
+	ts + 1758,
+	ts + 1766,
+	ts + 1774,
+	ts + 1779,
+	ts + 1784,
+	ts + 1790,
+	ts + 1804,
+	ts + 1810,
 	ts + 1820,
-	ts + 1827,
-	ts + 1831,
-	ts + 1841,
-	ts + 1848,
-	ts + 1855,
-	ts + 1862,
-	ts + 1869,
-	ts + 1879,
+	ts + 1825,
+	ts + 1830,
+	ts + 1833,
+	ts + 1839,
+	ts + 1846,
+	ts + 1850,
+	ts + 1860,
+	ts + 1867,
+	ts + 1874,
+	ts + 1881,
 	ts + 1888,
-	ts + 1899,
-	ts + 1908,
-	ts + 1914,
-	ts + 1924,
-	ts + 1934,
-	ts + 1939,
-	ts + 1949,
-	ts + 1960,
-	ts + 1965,
-	ts + 1972,
-	ts + 1983,
-	ts + 1988,
-	ts + 1993,
-	ts + 1999,
-	ts + 2005,
-	ts + 2011,
-	ts + 2014,
+	ts + 1898,
+	ts + 1907,
+	ts + 1918,
+	ts + 1927,
+	ts + 1933,
+	ts + 1943,
+	ts + 1953,
+	ts + 1958,
+	ts + 1968,
+	ts + 1979,
+	ts + 1984,
+	ts + 1991,
+	ts + 2002,
+	ts + 2007,
+	ts + 2012,
 	ts + 2018,
 	ts + 2024,
-	ts + 2035,
-	ts + 2046,
+	ts + 2030,
+	ts + 2033,
+	ts + 2037,
+	ts + 2043,
 	ts + 2054,
-	ts + 2063,
-	ts + 2070,
-	ts + 2078,
-	ts + 2081,
-	ts + 2084,
-	ts + 2087,
-	ts + 2090,
-	ts + 2093,
-	ts + 2096,
+	ts + 2065,
+	ts + 2073,
+	ts + 2082,
+	ts + 2089,
+	ts + 2097,
+	ts + 2100,
 	ts + 2103,
+	ts + 2106,
 	ts + 2109,
-	ts + 2119,
-	ts + 2132,
-	ts + 2143,
-	ts + 2149,
-	ts + 2156,
-	ts + 2165,
-	ts + 2174,
-	ts + 2181,
-	ts + 2194,
-	ts + 2205,
-	ts + 2210,
-	ts + 2218,
+	ts + 2112,
+	ts + 2115,
+	ts + 2122,
+	ts + 2128,
+	ts + 2138,
+	ts + 2151,
+	ts + 2162,
+	ts + 2168,
+	ts + 2175,
+	ts + 2184,
+	ts + 2193,
+	ts + 2200,
+	ts + 2213,
 	ts + 2224,
-	ts + 2231,
+	ts + 2229,
+	ts + 2237,
 	ts + 2243,
-	ts + 2248,
-	ts + 2257,
+	ts + 2250,
 	ts + 2262,
-	ts + 2271,
+	ts + 2267,
 	ts + 2276,
 	ts + 2281,
-	ts + 2287,
+	ts + 2290,
 	ts + 2295,
-	ts + 2303,
-	ts + 2313,
-	ts + 2321,
-	ts + 2328,
-	ts + 2341,
-	ts + 2346,
-	ts + 2358,
-	ts + 2366,
-	ts + 2373,
-	ts + 2384,
-	ts + 2391,
-	ts + 2398,
-	ts + 2408,
+	ts + 2300,
+	ts + 2306,
+	ts + 2314,
+	ts + 2322,
+	ts + 2332,
+	ts + 2340,
+	ts + 2347,
+	ts + 2360,
+	ts + 2365,
+	ts + 2377,
+	ts + 2385,
+	ts + 2392,
+	ts + 2403,
+	ts + 2410,
 	ts + 2417,
-	ts + 2428,
-	ts + 2434,
-	ts + 2445,
-	ts + 2455,
-	ts + 2465,
-	ts + 2472,
-	ts + 2478,
-	ts + 2488,
-	ts + 2499,
-	ts + 2503,
-	ts + 2512,
-	ts + 2521,
-	ts + 2528,
-	ts + 2538,
-	ts + 2545,
-	ts + 2554,
+	ts + 2427,
+	ts + 2436,
+	ts + 2447,
+	ts + 2453,
+	ts + 2464,
+	ts + 2474,
+	ts + 2484,
+	ts + 2491,
+	ts + 2497,
+	ts + 2507,
+	ts + 2518,
+	ts + 2522,
+	ts + 2531,
+	ts + 2540,
+	ts + 2547,
+	ts + 2557,
 	ts + 2564,
-	ts + 2571,
-	ts + 2579,
-	ts + 2593,
-	ts + 2601,
-	ts + 2615,
-	ts + 2626,
-	ts + 2639,
-	ts + 2650,
-	ts + 2656,
-	ts + 2668,
-	ts + 2677,
-	ts + 2685,
-	ts + 2694,
-	ts + 2703,
-	ts + 2710,
-	ts + 2718,
-	ts + 2725,
-	ts + 2736,
-	ts + 2750,
-	ts + 2761,
+	ts + 2573,
+	ts + 2583,
+	ts + 2590,
+	ts + 2598,
+	ts + 2612,
+	ts + 2620,
+	ts + 2634,
+	ts + 2645,
+	ts + 2658,
+	ts + 2669,
+	ts + 2675,
+	ts + 2687,
+	ts + 2696,
+	ts + 2704,
+	ts + 2713,
+	ts + 2722,
+	ts + 2729,
+	ts + 2737,
+	ts + 2744,
+	ts + 2755,
 	ts + 2769,
-	ts + 2775,
-	ts + 2783,
-	ts + 2791,
-	ts + 2801,
-	ts + 2814,
-	ts + 2824,
-	ts + 2837,
-	ts + 2846,
-	ts + 2857,
+	ts + 2780,
+	ts + 2788,
+	ts + 2794,
+	ts + 2802,
+	ts + 2810,
+	ts + 2820,
+	ts + 2833,
+	ts + 2843,
+	ts + 2856,
 	ts + 2865,
-	ts + 2871,
-	ts + 2883,
-	ts + 2895,
-	ts + 2903,
-	ts + 2915,
-	ts + 2928,
-	ts + 2938,
-	ts + 2948,
-	ts + 2953,
-	ts + 2965,
-	ts + 2977,
-	ts + 2987,
-	ts + 2993,
-	ts + 3003,
-	ts + 3010,
+	ts + 2876,
+	ts + 2884,
+	ts + 2890,
+	ts + 2902,
+	ts + 2914,
+	ts + 2922,
+	ts + 2934,
+	ts + 2947,
+	ts + 2957,
+	ts + 2967,
+	ts + 2972,
+	ts + 2984,
+	ts + 2996,
+	ts + 3006,
+	ts + 3012,
 	ts + 3022,
-	ts + 3033,
+	ts + 3029,
 	ts + 3041,
-	ts + 3050,
-	ts + 3059,
-	ts + 3068,
-	ts + 3075,
-	ts + 3086,
-	ts + 3099,
-	ts + 3109,
-	ts + 3116,
-	ts + 3124,
-	ts + 3133,
-	ts + 3139,
-	ts + 3147,
-	ts + 3155,
-	ts + 3163,
-	ts + 3173,
+	ts + 3052,
+	ts + 3060,
+	ts + 3069,
+	ts + 3078,
+	ts + 3087,
+	ts + 3094,
+	ts + 3105,
+	ts + 3118,
+	ts + 3128,
+	ts + 3135,
+	ts + 3143,
+	ts + 3152,
+	ts + 3158,
+	ts + 3166,
+	ts + 3174,
 	ts + 3182,
-	ts + 3193,
-	ts + 3203,
-	ts + 3209,
-	ts + 3220,
-	ts + 3231,
-	ts + 3236,
-	ts + 3244,
+	ts + 3192,
+	ts + 3201,
+	ts + 3212,
+	ts + 3222,
+	ts + 3228,
+	ts + 3239,
+	ts + 3250,
+	ts + 3255,
+	ts + 3263,
 }
 
 type pthread_once = struct {
@@ -14617,45 +14623,62 @@ type bintime = struct {
 	Ffrac Uint64_t
 }
 
-func sbttons(tls *libc.TLS, _sbt Sbintime_t) Int64_t {
-	var ns Uint64_t
+func __stime64_scale32_ceil(tls *libc.TLS, x Int64_t, factor Int32_t, divisor Int32_t) Int64_t {
+	var rem Int64_t = x % Int64_t(divisor)
 
-	ns = Uint64_t(_sbt)
-	if ns >= uint64(int64(1)<<32) {
-		ns = ns >> 32 * uint64(1000000000)
-	} else {
-		ns = uint64(0)
-	}
-
-	return Int64_t(ns + Uint64_t(int64(1000000000)*(_sbt&int64(0xffffffff))>>32))
+	return x/Int64_t(divisor)*Int64_t(factor) + (rem*Int64_t(factor)+Int64_t(divisor)-int64(1))/Int64_t(divisor)
 }
 
-func nstosbt(tls *libc.TLS, _ns Int64_t) Sbintime_t {
-	var sb Sbintime_t = int64(0)
+func __stime64_scale32_floor(tls *libc.TLS, x Int64_t, factor Int32_t, divisor Int32_t) Int64_t {
+	var rem Int64_t = x % Int64_t(divisor)
 
-	if _ns >= int64(1000000000) {
-		sb = _ns / int64(1000000000) * (int64(1) << 32)
-		_ns = _ns % int64(1000000000)
-	}
-
-	sb = Sbintime_t(uint64(sb) + (uint64(_ns)*9223372037+uint64(0x7fffffff))>>31)
-	return sb
+	return x/Int64_t(divisor)*Int64_t(factor) + rem*Int64_t(factor)/Int64_t(divisor)
 }
 
-func sbttous(tls *libc.TLS, _sbt Sbintime_t) Int64_t {
-	return int64(1000000) * _sbt >> 32
+func __utime64_scale32_ceil(tls *libc.TLS, x Uint64_t, factor Uint32_t, divisor Uint32_t) Uint64_t {
+	var rem Uint64_t = x % Uint64_t(divisor)
+
+	return x/Uint64_t(divisor)*Uint64_t(factor) + (rem*Uint64_t(factor)+Uint64_t(divisor)-uint64(1))/Uint64_t(divisor)
 }
 
-func ustosbt(tls *libc.TLS, _us Int64_t) Sbintime_t {
-	var sb Sbintime_t = int64(0)
+func __utime64_scale32_floor(tls *libc.TLS, x Uint64_t, factor Uint32_t, divisor Uint32_t) Uint64_t {
+	var rem Uint64_t = x % Uint64_t(divisor)
 
-	if _us >= int64(1000000) {
-		sb = _us / int64(1000000) * (int64(1) << 32)
-		_us = _us % int64(1000000)
-	}
+	return x/Uint64_t(divisor)*Uint64_t(factor) + rem*Uint64_t(factor)/Uint64_t(divisor)
+}
 
-	sb = Sbintime_t(uint64(sb) + (uint64(_us)*9223372036855+uint64(0x7fffffff))>>31)
-	return sb
+func __stime64_scale64_ceil(tls *libc.TLS, x Int64_t, factor Int64_t, divisor Int64_t) Int64_t {
+	var gcd Int64_t = ^factor&(factor-int64(1)) & ^divisor & (divisor-int64(1)) + int64(1)
+
+	return __stime64_scale32_ceil(tls, x, int32(factor/gcd), int32(divisor/gcd))
+}
+
+func __stime64_scale64_floor(tls *libc.TLS, x Int64_t, factor Int64_t, divisor Int64_t) Int64_t {
+	var gcd Int64_t = ^factor&(factor-int64(1)) & ^divisor & (divisor-int64(1)) + int64(1)
+
+	return __stime64_scale32_floor(tls, x, int32(factor/gcd), int32(divisor/gcd))
+}
+
+func __utime64_scale64_floor(tls *libc.TLS, x Uint64_t, factor Uint64_t, divisor Uint64_t) Uint64_t {
+	var gcd Uint64_t = ^factor&(factor-uint64(1)) & ^divisor & (divisor-uint64(1)) + uint64(1)
+
+	return __utime64_scale32_floor(tls, x, uint32(factor/gcd), uint32(divisor/gcd))
+}
+
+func sbttons(tls *libc.TLS, sbt Sbintime_t) Int64_t {
+	return __stime64_scale64_floor(tls, sbt, int64(1000000000), int64(1)<<32)
+}
+
+func nstosbt(tls *libc.TLS, ns Int64_t) Sbintime_t {
+	return __stime64_scale64_ceil(tls, ns, int64(1)<<32, int64(1000000000))
+}
+
+func sbttous(tls *libc.TLS, sbt Sbintime_t) Int64_t {
+	return __stime64_scale64_floor(tls, sbt, int64(1000000), int64(1)<<32)
+}
+
+func ustosbt(tls *libc.TLS, us Int64_t) Sbintime_t {
+	return __stime64_scale64_ceil(tls, us, int64(1)<<32, int64(1000000))
 }
 
 type itimerval = struct {
@@ -14867,35 +14890,35 @@ type unix_syscall = struct {
 }
 
 var aSyscall = [29]unix_syscall{
-	{FzName: ts + 3254, FpCurrent: 0},
-	{FzName: ts + 3259, FpCurrent: 0},
-	{FzName: ts + 3265, FpCurrent: 0},
-	{FzName: ts + 3272, FpCurrent: 0},
-	{FzName: ts + 3279, FpCurrent: 0},
+	{FzName: ts + 3273, FpCurrent: 0},
+	{FzName: ts + 3278, FpCurrent: 0},
 	{FzName: ts + 3284, FpCurrent: 0},
-	{FzName: ts + 3290, FpCurrent: 0},
-	{FzName: ts + 3300, FpCurrent: 0},
-	{FzName: ts + 3306, FpCurrent: 0},
-	{FzName: ts + 3311},
-	{FzName: ts + 3317},
+	{FzName: ts + 3291, FpCurrent: 0},
+	{FzName: ts + 3298, FpCurrent: 0},
+	{FzName: ts + 3303, FpCurrent: 0},
+	{FzName: ts + 3309, FpCurrent: 0},
+	{FzName: ts + 3319, FpCurrent: 0},
 	{FzName: ts + 3325, FpCurrent: 0},
-	{FzName: ts + 3331},
-	{FzName: ts + 3338},
-	{FzName: ts + 3347, FpCurrent: 0},
-	{FzName: ts + 3354},
-	{FzName: ts + 3364, FpCurrent: 0},
-	{FzName: ts + 3371, FpCurrent: 0},
-	{FzName: ts + 3385, FpCurrent: 0},
-	{FzName: ts + 3391, FpCurrent: 0},
-	{FzName: ts + 3397, FpCurrent: 0},
+	{FzName: ts + 3330},
+	{FzName: ts + 3336},
+	{FzName: ts + 3344, FpCurrent: 0},
+	{FzName: ts + 3350},
+	{FzName: ts + 3357},
+	{FzName: ts + 3366, FpCurrent: 0},
+	{FzName: ts + 3373},
+	{FzName: ts + 3383, FpCurrent: 0},
+	{FzName: ts + 3390, FpCurrent: 0},
 	{FzName: ts + 3404, FpCurrent: 0},
-	{FzName: ts + 3412, FpCurrent: 0},
-	{FzName: ts + 3417, FpCurrent: 0},
-	{FzName: ts + 3424},
+	{FzName: ts + 3410, FpCurrent: 0},
+	{FzName: ts + 3416, FpCurrent: 0},
+	{FzName: ts + 3423, FpCurrent: 0},
 	{FzName: ts + 3431, FpCurrent: 0},
-	{FzName: ts + 3443, FpCurrent: 0},
-	{FzName: ts + 3452, FpCurrent: 0},
-	{FzName: ts + 3458},
+	{FzName: ts + 3436, FpCurrent: 0},
+	{FzName: ts + 3443},
+	{FzName: ts + 3450, FpCurrent: 0},
+	{FzName: ts + 3462, FpCurrent: 0},
+	{FzName: ts + 3471, FpCurrent: 0},
+	{FzName: ts + 3477},
 }
 
 func robustFchown(tls *libc.TLS, fd int32, uid Uid_t, gid Gid_t) int32 {
@@ -14993,9 +15016,9 @@ func robust_open(tls *libc.TLS, z uintptr, f int32, m Mode_t) int32 {
 		}
 		(*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*12 + 4)))(tls, fd)
 		Xsqlite3_log(tls, SQLITE_WARNING,
-			ts+3464, libc.VaList(bp, z, fd))
+			ts+3483, libc.VaList(bp, z, fd))
 		fd = -1
-		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 4)))(tls, ts+3507, O_RDONLY, int32(m)) < 0 {
+		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 4)))(tls, ts+3526, O_RDONLY, int32(m)) < 0 {
 			break
 		}
 	}
@@ -15074,13 +15097,13 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 	var zErr uintptr
 	var iErrno int32 = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 
-	zErr = ts + 1547
+	zErr = ts + 1566
 
 	if zPath == uintptr(0) {
-		zPath = ts + 1547
+		zPath = ts + 1566
 	}
 	Xsqlite3_log(tls, errcode,
-		ts+3517,
+		ts+3536,
 		libc.VaList(bp, iLine, iErrno, zFunc, zPath, zErr))
 
 	return errcode
@@ -15088,7 +15111,7 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 
 func robust_close(tls *libc.TLS, pFile uintptr, h int32, lineno int32) {
 	if (*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*12 + 4)))(tls, h) != 0 {
-		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3259,
+		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3278,
 			func() uintptr {
 				if pFile != 0 {
 					return (*UnixFile)(unsafe.Pointer(pFile)).FzPath
@@ -15109,7 +15132,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, 38271)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38275)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -15211,19 +15234,19 @@ func verifyDbFile(tls *libc.TLS, pFile uintptr) {
 
 	rc = (*(*func(*libc.TLS, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 5*12 + 4)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, bp+32)
 	if rc != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3548, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3567, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink == uint64(0) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3572, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3591, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink > uint64(1) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3601, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3620, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if fileHasMoved(tls, pFile) != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3628, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3647, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 }
@@ -15586,7 +15609,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, 39055)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39059)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -15859,7 +15882,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	var ii int32
 	var fd int32 = -1
 
-	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3656, libc.VaList(bp, zFilename))
+	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3675, libc.VaList(bp, zFilename))
 	for ii = int32(libc.Xstrlen(tls, bp+8)); ii > 0 && int32(*(*uint8)(unsafe.Pointer(bp + 8 + uintptr(ii)))) != '/'; ii-- {
 	}
 	if ii > 0 {
@@ -15877,7 +15900,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3371, bp+8, 40676)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40680), ts+3390, bp+8, 40680)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -15894,14 +15917,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, 40717)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3678, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40721)
 	}
 
 	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)), 40731)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40735)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -15921,7 +15944,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, 40762)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3309, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40766)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -15976,7 +15999,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 				if iWrite >= nSize {
 					iWrite = nSize - int64(1)
 				}
-				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1547, 1)
+				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1566, 1)
 				if nWrite != 1 {
 					return SQLITE_IOERR | int32(3)<<8
 				}
@@ -15989,7 +16012,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, 40883)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3309, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40887)
 			}
 		}
 
@@ -16057,7 +16080,7 @@ func unixFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 		}
 	case SQLITE_FCNTL_VFSNAME:
 		{
-			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
+			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
 			return SQLITE_OK
 
 		}
@@ -16216,7 +16239,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, 41442)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41446)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -16244,7 +16267,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, 41499)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3309, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41503)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -16307,7 +16330,7 @@ __4:
 	;
 	libc.Xmemset(tls, pShmNode, 0, uint32(unsafe.Sizeof(unixShmNode{}))+uint32(nShmFilename))
 	zShm = libc.AssignPtrUintptr(pShmNode+8, pShmNode+1*68)
-	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3670, libc.VaList(bp, zBasePath))
+	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3689, libc.VaList(bp, zBasePath))
 
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = -1
 	(*UnixInodeInfo)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pDbFd)).FpInode)).FpShmNode = pShmNode
@@ -16328,7 +16351,7 @@ __5:
 	if !(int32((*UnixInodeInfo)(unsafe.Pointer(pInode)).FbProcessLock) == 0) {
 		goto __7
 	}
-	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3677, 0)) {
+	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3696, 0)) {
 		goto __8
 	}
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = robust_open(tls, zShm, O_RDWR|O_CREAT|O_NOFOLLOW,
@@ -16343,7 +16366,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3254, zShm, 41624)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41628), ts+3273, zShm, 41628)
 	goto shm_open_err
 __10:
 	;
@@ -16469,11 +16492,11 @@ __11:
 		goto __13
 	}
 	*(*int32)(unsafe.Pointer(bp + 224)) = 0
-	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1547, 1, bp+224) != 1) {
+	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1566, 1, bp+224) != 1) {
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3325, zFile, 41768)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3344, zFile, 41772)
 	goto shmpage_out
 __14:
 	;
@@ -16519,7 +16542,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3412, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3431, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41799)
 	goto shmpage_out
 __20:
 	;
@@ -16720,7 +16743,7 @@ func unixUnmapfile(tls *libc.TLS, pFd uintptr) {
 }
 
 func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
-	var zErr uintptr = ts + 3412
+	var zErr uintptr = ts + 3431
 	var h int32 = (*UnixFile)(unsafe.Pointer(pFd)).Fh
 	var pOrig uintptr = (*UnixFile)(unsafe.Pointer(pFd)).FpMapRegion
 	var nOrig I64 = (*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeActual
@@ -16758,7 +16781,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, 42169)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42173)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -16873,10 +16896,10 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		}
 		return uintptr(0)
 	}(),
-		ts+3690, SQLITE_POWERSAFE_OVERWRITE) != 0 {
+		ts+3709, SQLITE_POWERSAFE_OVERWRITE) != 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 18)) |= uint16(UNIXFILE_PSOW)
 	}
-	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3695) == 0 {
+	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3714) == 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 18)) |= uint16(UNIXFILE_EXCL)
 	}
 
@@ -16892,7 +16915,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, 42672)
+			robust_close(tls, pNew, h, 42676)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -16905,7 +16928,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		if zLockFile == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
-			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3705, libc.VaList(bp, zFilename))
+			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3724, libc.VaList(bp, zFilename))
 		}
 		(*UnixFile)(unsafe.Pointer(pNew)).FlockingContext = zLockFile
 	}
@@ -16913,7 +16936,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, 42757)
+			robust_close(tls, pNew, h, 42761)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -16926,15 +16949,15 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 var azTempDirs = [6]uintptr{
 	uintptr(0),
 	uintptr(0),
-	ts + 3713,
-	ts + 3722,
-	ts + 3731,
-	ts + 1560,
+	ts + 3732,
+	ts + 3741,
+	ts + 3750,
+	ts + 1579,
 }
 
 func unixTempFileInit(tls *libc.TLS) {
-	azTempDirs[0] = libc.Xgetenv(tls, ts+3736)
-	azTempDirs[1] = libc.Xgetenv(tls, ts+3750)
+	azTempDirs[0] = libc.Xgetenv(tls, ts+3755)
+	azTempDirs[1] = libc.Xgetenv(tls, ts+3769)
 }
 
 func unixTempFileDir(tls *libc.TLS) uintptr {
@@ -16979,7 +17002,7 @@ func unixGetTempname(tls *libc.TLS, nBuf int32, zBuf uintptr) int32 {
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U64(0))), bp+24)
 
 			*(*uint8)(unsafe.Pointer(zBuf + uintptr(nBuf-2))) = uint8(0)
-			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3757,
+			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3776,
 				libc.VaList(bp, zDir, *(*U64)(unsafe.Pointer(bp + 24)), 0))
 			if int32(*(*uint8)(unsafe.Pointer(zBuf + uintptr(nBuf-2)))) != 0 || libc.PostIncInt32(&iLimit, 1) > 10 {
 				rc = SQLITE_ERROR
@@ -17064,7 +17087,7 @@ func findCreateFileMode(tls *libc.TLS, zPath uintptr, flags int32, pMode uintptr
 	} else if flags&SQLITE_OPEN_DELETEONCLOSE != 0 {
 		*(*Mode_t)(unsafe.Pointer(pMode)) = Mode_t(0600)
 	} else if flags&SQLITE_OPEN_URI != 0 {
-		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3774)
+		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3793)
 		if z != 0 {
 			rc = getFileMode(tls, z, pMode, pUid, pGid)
 		}
@@ -17229,7 +17252,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3254, zName, 43198)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43202), ts+3273, zName, 43202)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -17320,7 +17343,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, 43337)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3383, zPath, 43341)
 		}
 		return rc
 	}
@@ -17328,9 +17351,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, 43347)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3800, zPath, 43351)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43353)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -17394,18 +17417,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, 43443), ts+3452, zIn, 43443)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43447), ts+3471, zIn, 43447)
 			}
 		} 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, 43449)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43453)
 				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, 43454), ts+3443, zIn, 43454)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43458), ts+3462, zIn, 43458)
 				return
 			}
 			*(*uint8)(unsafe.Pointer(bp + 224 + uintptr(got))) = uint8(0)
@@ -17445,14 +17468,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, 43512), ts+3272, zPath, 43512)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43516), ts+3291, zPath, 43516)
 		}
 		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, 43518)
+		return Xsqlite3CantopenError(tls, 43522)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+1028)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -17504,7 +17527,7 @@ func unixDlError(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBufOut uintptr) {
 	unixEnterMutex(tls)
 	zErr = libc.Xdlerror(tls)
 	if zErr != 0 {
-		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3656, libc.VaList(bp, zErr))
+		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3675, libc.VaList(bp, zErr))
 	}
 	unixLeaveMutex(tls)
 }
@@ -17536,7 +17559,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 	{
 		var fd int32
 		var got int32
-		fd = robust_open(tls, ts+3787, O_RDONLY, uint16(0))
+		fd = robust_open(tls, ts+3806, O_RDONLY, uint16(0))
 		if fd < 0 {
 			libc.Xtime(tls, bp)
 			libc.Xmemcpy(tls, zBuf, bp, uint32(unsafe.Sizeof(Time_t(0))))
@@ -17547,7 +17570,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, 43619)
+			robust_close(tls, uintptr(0), fd, 43623)
 		}
 
 	}
@@ -17624,10 +17647,10 @@ func Xsqlite3_os_init(tls *libc.TLS) int32 {
 }
 
 var aVfs = [4]Sqlite3_vfs{
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3800, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3805, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3815, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3695, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3819, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3824, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3834, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3714, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
 }
 
 // Shutdown the operating system interface.
@@ -17679,7 +17702,7 @@ var memdb_g MemFS
 var memdb_vfs = Sqlite3_vfs{
 	FiVersion:          2,
 	FmxPathname:        1024,
-	FzName:             ts + 3828,
+	FzName:             ts + 3847,
 	FxOpen:             0,
 	FxAccess:           0,
 	FxFullPathname:     0,
@@ -17935,7 +17958,7 @@ func memdbFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int3
 	var rc int32 = SQLITE_NOTFOUND
 	memdbEnter(tls, p)
 	if op == SQLITE_FCNTL_VFSNAME {
-		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3834, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
+		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3853, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
 		rc = SQLITE_OK
 	}
 	if op == SQLITE_FCNTL_SIZE_LIMIT {
@@ -18067,7 +18090,7 @@ func memdbFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, z
 	defer tls.Free(8)
 
 	_ = pVfs
-	Xsqlite3_snprintf(tls, nOut, zOut, ts+3656, libc.VaList(bp, zPath))
+	Xsqlite3_snprintf(tls, nOut, zOut, ts+3675, libc.VaList(bp, zPath))
 	return SQLITE_OK
 }
 
@@ -18188,7 +18211,7 @@ func Xsqlite3_serialize(tls *libc.TLS, db uintptr, zSchema uintptr, piSize uintp
 		return uintptr(0)
 	}
 	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
-	zSql = Xsqlite3_mprintf(tls, ts+3849, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3868, libc.VaList(bp, zSchema))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, db, zSql, -1, bp+8, uintptr(0))
 	} else {
@@ -18261,7 +18284,7 @@ __1:
 	goto end_deserialize
 __2:
 	;
-	zSql = Xsqlite3_mprintf(tls, ts+3872, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3891, libc.VaList(bp, zSchema))
 	if !(zSql == uintptr(0)) {
 		goto __3
 	}
@@ -18977,7 +19000,7 @@ func pcacheFetchFinishWithInit(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 	libc.Xmemset(tls, pPgHdr+16, 0, uint32(unsafe.Sizeof(PgHdr{}))-uint32(uintptr(0)+16))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpPage = pPage
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpData = (*Sqlite3_pcache_page)(unsafe.Pointer(pPage)).FpBuf
-	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*40
+	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*48
 	libc.Xmemset(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0, uint32(8))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpCache = pCache
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).Fpgno = pgno
@@ -19007,7 +19030,7 @@ func Xsqlite3PcacheFetchFinish(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 // reference count drops to 0, then it is made eligible for recycling.
 func Xsqlite3PcacheRelease(tls *libc.TLS, p uintptr) {
 	(*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FnRefSum--
-	if int32(libc.PreDecInt16(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1)) == 0 {
+	if libc.PreDecInt64(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1) == int64(0) {
 		if int32((*PgHdr)(unsafe.Pointer(p)).Fflags)&PGHDR_CLEAN != 0 {
 			pcacheUnpin(tls, p)
 		} else {
@@ -19058,7 +19081,7 @@ func Xsqlite3PcacheMakeClean(tls *libc.TLS, p uintptr) {
 	*(*U16)(unsafe.Pointer(p + 28)) &= libc.Uint16FromInt32(libc.CplInt32(PGHDR_DIRTY | PGHDR_NEED_SYNC | PGHDR_WRITEABLE))
 	*(*U16)(unsafe.Pointer(p + 28)) |= U16(PGHDR_CLEAN)
 
-	if int32((*PgHdr)(unsafe.Pointer(p)).FnRef) == 0 {
+	if (*PgHdr)(unsafe.Pointer(p)).FnRef == int64(0) {
 		pcacheUnpin(tls, p)
 	}
 }
@@ -19162,8 +19185,8 @@ func Xsqlite3PcacheClear(tls *libc.TLS, pCache uintptr) {
 }
 
 func pcacheMergeDirtyList(tls *libc.TLS, pA uintptr, pB uintptr) uintptr {
-	bp := tls.Alloc(40)
-	defer tls.Free(40)
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
 
 	var pTail uintptr
 	pTail = bp
@@ -19241,13 +19264,13 @@ func Xsqlite3PcacheDirtyList(tls *libc.TLS, pCache uintptr) uintptr {
 //
 // This is not the total number of pages referenced, but the sum of the
 // reference count for all pages.
-func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) int32 {
+func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) I64 {
 	return (*PCache)(unsafe.Pointer(pCache)).FnRefSum
 }
 
 // Return the number of references to the page supplied as an argument.
-func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) int32 {
-	return int32((*PgHdr)(unsafe.Pointer(p)).FnRef)
+func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) I64 {
+	return (*PgHdr)(unsafe.Pointer(p)).FnRef
 }
 
 // Return the total number of pages in the cache.
@@ -21474,7 +21497,7 @@ __27:
 	if !(isHot != 0 && nPlayback != 0) {
 		goto __28
 	}
-	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3887,
+	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3906,
 		libc.VaList(bp, nPlayback, (*Pager)(unsafe.Pointer(pPager)).FzJournal))
 __28:
 	;
@@ -21539,7 +21562,7 @@ func pagerUndoCallback(tls *libc.TLS, pCtx uintptr, iPg Pgno) int32 {
 
 	pPg = Xsqlite3PagerLookup(tls, pPager, iPg)
 	if pPg != 0 {
-		if Xsqlite3PcachePageRefcount(tls, pPg) == 1 {
+		if Xsqlite3PcachePageRefcount(tls, pPg) == int64(1) {
 			Xsqlite3PcacheDrop(tls, pPg)
 		} else {
 			rc = readDbPage(tls, pPg)
@@ -21972,7 +21995,7 @@ func Xsqlite3PagerSetPagesize(tls *libc.TLS, pPager uintptr, pPageSize uintptr,
 	var pageSize U32 = *(*U32)(unsafe.Pointer(pPageSize))
 
 	if (int32((*Pager)(unsafe.Pointer(pPager)).FmemDb) == 0 || (*Pager)(unsafe.Pointer(pPager)).FdbSize == Pgno(0)) &&
-		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 &&
+		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) &&
 		pageSize != 0 && pageSize != U32((*Pager)(unsafe.Pointer(pPager)).FpageSize) {
 		var pNew uintptr = uintptr(0)
 		*(*I64)(unsafe.Pointer(bp)) = int64(0)
@@ -22124,9 +22147,9 @@ func pagerAcquireMapPage(tls *libc.TLS, pPager uintptr, pgno Pgno, pData uintptr
 			Xsqlite3OsUnfetch(tls, (*Pager)(unsafe.Pointer(pPager)).Ffd, I64(pgno-Pgno(1))*(*Pager)(unsafe.Pointer(pPager)).FpageSize, pData)
 			return SQLITE_NOMEM
 		}
-		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*40
+		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*48
 		(*PgHdr)(unsafe.Pointer(p)).Fflags = U16(PGHDR_MMAP)
-		(*PgHdr)(unsafe.Pointer(p)).FnRef = int16(1)
+		(*PgHdr)(unsafe.Pointer(p)).FnRef = int64(1)
 		(*PgHdr)(unsafe.Pointer(p)).FpPager = pPager
 	}
 
@@ -22458,7 +22481,7 @@ func Xsqlite3PagerFlush(tls *libc.TLS, pPager uintptr) int32 {
 
 		for rc == SQLITE_OK && pList != 0 {
 			var pNext uintptr = (*PgHdr)(unsafe.Pointer(pList)).FpDirty
-			if int32((*PgHdr)(unsafe.Pointer(pList)).FnRef) == 0 {
+			if (*PgHdr)(unsafe.Pointer(pList)).FnRef == int64(0) {
 				rc = pagerStress(tls, pPager, pList)
 			}
 			pList = pNext
@@ -22608,7 +22631,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 60235)
+	rc = Xsqlite3CantopenError(tls, 60239)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -22669,7 +22692,7 @@ __15:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzJournal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint32(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3914, uint32(8))
+	libc.Xmemcpy(tls, pPtr, ts+3933, uint32(8))
 	pPtr += uintptr(8 + 1)
 	goto __19
 __18:
@@ -22682,7 +22705,7 @@ __19:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzWal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint32(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3923, uint32(4))
+	libc.Xmemcpy(tls, pPtr, ts+3942, uint32(4))
 	pPtr += uintptr(4 + 1)
 	goto __21
 __20:
@@ -22734,9 +22757,9 @@ __27:
 	;
 __26:
 	;
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3928, 0))
+	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3947, 0))
 	if !(iDc&SQLITE_IOCAP_IMMUTABLE != 0 ||
-		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3935, 0) != 0) {
+		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3954, 0) != 0) {
 		goto __30
 	}
 	vfsFlags = vfsFlags | SQLITE_OPEN_READONLY
@@ -22989,7 +23012,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60754)
+	rc = Xsqlite3CantopenError(tls, 60758)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23095,7 +23118,7 @@ __24:
 }
 
 func pagerUnlockIfUnused(tls *libc.TLS, pPager uintptr) {
-	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 {
+	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) {
 		pagerUnlockAndRollback(tls, pPager)
 	}
 }
@@ -23113,7 +23136,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60967)
+	return Xsqlite3CorruptError(tls, 60971)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23152,7 +23175,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60999)
+	rc = Xsqlite3CorruptError(tls, 61003)
 	goto pager_acquire_err
 __7:
 	;
@@ -23229,7 +23252,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, 61078)
+		return Xsqlite3CorruptError(tls, 61082)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -23987,7 +24010,7 @@ func Xsqlite3PagerMemUsed(tls *libc.TLS, pPager uintptr) int32 {
 
 // Return the number of references to the specified page.
 func Xsqlite3PagerPageRefcount(tls *libc.TLS, pPage uintptr) int32 {
-	return Xsqlite3PcachePageRefcount(tls, pPage)
+	return int32(Xsqlite3PcachePageRefcount(tls, pPage))
 }
 
 // Parameter eStat must be one of SQLITE_DBSTATUS_CACHE_HIT, _MISS, _WRITE,
@@ -24230,9 +24253,9 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	pPgOld = Xsqlite3PagerLookup(tls, pPager, pgno)
 
 	if pPgOld != 0 {
-		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
+		if (*PgHdr)(unsafe.Pointer(pPgOld)).FnRef > int64(1) {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62623)
+			return Xsqlite3CorruptError(tls, 62627)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 28)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -24417,7 +24440,7 @@ func Xsqlite3PagerClearCache(tls *libc.TLS, pPager uintptr) {
 func Xsqlite3PagerCheckpoint(tls *libc.TLS, pPager uintptr, db uintptr, eMode int32, pnLog uintptr, pnCkpt uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal == uintptr(0) && int32((*Pager)(unsafe.Pointer(pPager)).FjournalMode) == PAGER_JOURNALMODE_WAL {
-		Xsqlite3_exec(tls, db, ts+3945, uintptr(0), uintptr(0), uintptr(0))
+		Xsqlite3_exec(tls, db, ts+3964, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal != 0 {
 		rc = Xsqlite3WalCheckpoint(tls, (*Pager)(unsafe.Pointer(pPager)).FpWal, db, eMode,
@@ -24986,7 +25009,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, 64387)
+				return Xsqlite3CorruptError(tls, 64391)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25085,7 +25108,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64519)
+	rc = Xsqlite3CantopenError(tls, 64523)
 	goto finished
 __7:
 	;
@@ -25253,7 +25276,7 @@ __24:
 		goto __30
 	}
 	Xsqlite3_log(tls, SQLITE_NOTICE|int32(1)<<8,
-		ts+3963,
+		ts+3982,
 		libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 __30:
 	;
@@ -25670,7 +25693,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65333)
+	rc = Xsqlite3CorruptError(tls, 65337)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -25815,7 +25838,7 @@ func walLimitSize(tls *libc.TLS, pWal uintptr, nMax I64) {
 	}
 	Xsqlite3EndBenignMalloc(tls)
 	if rx != 0 {
-		Xsqlite3_log(tls, rx, ts+4000, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
+		Xsqlite3_log(tls, rx, ts+4019, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 	}
 }
 
@@ -25945,7 +25968,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, 65682)
+		rc = Xsqlite3CantopenError(tls, 65686)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -26418,7 +26441,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66419)
+				return Xsqlite3CorruptError(tls, 66423)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -26923,7 +26946,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, 67138)
+			rc = Xsqlite3CorruptError(tls, 67142)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -27315,7 +27338,7 @@ func Xsqlite3BtreeLeaveCursor(tls *libc.TLS, pCur uintptr) {
 	Xsqlite3BtreeLeave(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpBtree)
 }
 
-var zMagicHeader = *(*[16]uint8)(unsafe.Pointer(ts + 4026))
+var zMagicHeader = *(*[16]uint8)(unsafe.Pointer(ts + 4045))
 
 var sqlite3SharedCacheList uintptr = uintptr(0)
 
@@ -27580,7 +27603,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, 69249)
+			rc = Xsqlite3CorruptError(tls, 69253)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -27717,7 +27740,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69434)
 	return
 __2:
 	;
@@ -27734,7 +27757,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69447)
 	goto ptrmap_exit
 __4:
 	;
@@ -27742,7 +27765,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69452)
 	goto ptrmap_exit
 __5:
 	;
@@ -27785,7 +27808,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, 69493)
+		return Xsqlite3CorruptError(tls, 69497)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -27795,7 +27818,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, 69501)
+		return Xsqlite3CorruptError(tls, 69505)
 	}
 	return SQLITE_OK
 }
@@ -28045,7 +28068,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, 69893)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69897)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28092,7 +28115,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69951)
+	return Xsqlite3CorruptError(tls, 69955)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28102,7 +28125,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69954)
+	return Xsqlite3CorruptError(tls, 69958)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28115,7 +28138,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69962)
+	return Xsqlite3CorruptError(tls, 69966)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28124,14 +28147,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69965)
+	return Xsqlite3CorruptError(tls, 69969)
 __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, 69967)
+	return Xsqlite3CorruptError(tls, 69971)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint32(iFree2-(iFree+sz)))
@@ -28141,7 +28164,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69971)
+	return Xsqlite3CorruptError(tls, 69975)
 __11:
 	;
 __8:
@@ -28205,7 +28228,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 70004)
+	return Xsqlite3CorruptError(tls, 70008)
 __22:
 	;
 	size = int32((*struct {
@@ -28215,7 +28238,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 70010)
+	return Xsqlite3CorruptError(tls, 70014)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -28237,7 +28260,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 70024)
+	return Xsqlite3CorruptError(tls, 70028)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -28272,7 +28295,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, 70081)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70085)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -28285,13 +28308,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, 70096)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70100)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70107)
 	}
 	return uintptr(0)
 }
@@ -28316,7 +28339,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, 70152)
+			return Xsqlite3CorruptError(tls, 70156)
 		}
 	}
 
@@ -28327,7 +28350,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, 70170)
+				return Xsqlite3CorruptError(tls, 70174)
 			} else {
 				return SQLITE_OK
 			}
@@ -28379,22 +28402,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 70249)
+				return Xsqlite3CorruptError(tls, 70253)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 70254)
+			return Xsqlite3CorruptError(tls, 70258)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 70266)
+				return Xsqlite3CorruptError(tls, 70270)
 			}
 			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, 70269)
+				return Xsqlite3CorruptError(tls, 70273)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -28404,7 +28427,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, 70282)
+					return Xsqlite3CorruptError(tls, 70286)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -28412,7 +28435,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, 70288)
+			return Xsqlite3CorruptError(tls, 70292)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -28420,10 +28443,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, 70297)
+			return Xsqlite3CorruptError(tls, 70301)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70298)
+			return Xsqlite3CorruptError(tls, 70302)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -28483,7 +28506,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70357)
+			return Xsqlite3CorruptError(tls, 70361)
 		}
 	} else {
 		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
@@ -28519,7 +28542,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70381)
+			return Xsqlite3CorruptError(tls, 70385)
 		}
 	}
 	return SQLITE_OK
@@ -28549,11 +28572,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70432)
+			return Xsqlite3CorruptError(tls, 70436)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70437)
+				return Xsqlite3CorruptError(tls, 70441)
 			}
 			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))))
@@ -28564,15 +28587,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70447)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70451)
+			return Xsqlite3CorruptError(tls, 70455)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70463)
+		return Xsqlite3CorruptError(tls, 70467)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -28600,14 +28623,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, 70494)
+			return Xsqlite3CorruptError(tls, 70498)
 		}
 		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, 70499)
+			return Xsqlite3CorruptError(tls, 70503)
 		}
 	}
 	return SQLITE_OK
@@ -28621,7 +28644,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, 70531)
+		return Xsqlite3CorruptError(tls, 70535)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -28633,7 +28656,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, 70545)
+		return Xsqlite3CorruptError(tls, 70549)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -28736,7 +28759,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70700)
+	rc = Xsqlite3CorruptError(tls, 70704)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -28764,7 +28787,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, 70721)
+	rc = Xsqlite3CorruptError(tls, 70725)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -28803,7 +28826,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, 70787)
+			return Xsqlite3CorruptError(tls, 70791)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -28876,7 +28899,7 @@ func Xsqlite3BtreeOpen(tls *libc.TLS, pVfs uintptr, zFilename uintptr, db uintpt
 	mutexOpen = uintptr(0)
 	rc = SQLITE_OK
 	isTempDb = libc.Bool32(zFilename == uintptr(0) || int32(*(*uint8)(unsafe.Pointer(zFilename))) == 0)
-	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4042) == 0 ||
+	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4061) == 0 ||
 		isTempDb != 0 && Xsqlite3TempInMemory(tls, db) != 0 ||
 		vfsFlags&SQLITE_OPEN_MEMORY != 0)
 
@@ -29648,7 +29671,7 @@ __9:
 	;
 __10:
 	;
-	if !(libc.Xmemcmp(tls, page1+21, ts+4051, uint32(3)) != 0) {
+	if !(libc.Xmemcmp(tls, page1+21, ts+4070, uint32(3)) != 0) {
 		goto __14
 	}
 	goto page1_init_failed
@@ -29686,7 +29709,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71722)
+	rc = Xsqlite3CorruptError(tls, 71726)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30101,7 +30124,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, 72143)
+			return Xsqlite3CorruptError(tls, 72147)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30127,7 +30150,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, 72162)
+						return Xsqlite3CorruptError(tls, 72166)
 					}
 					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)
@@ -30136,7 +30159,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, 72171)
+					return Xsqlite3CorruptError(tls, 72175)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30147,7 +30170,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, 72183)
+				return Xsqlite3CorruptError(tls, 72187)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30163,7 +30186,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, 72218)
+		return Xsqlite3CorruptError(tls, 72222)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -30224,7 +30247,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, 72316)
+			return Xsqlite3CorruptError(tls, 72320)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -30259,7 +30282,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, 72368)
+					return Xsqlite3CorruptError(tls, 72372)
 				}
 			}
 
@@ -30319,7 +30342,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, 72436)
+			rc = Xsqlite3CorruptError(tls, 72440)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -30358,7 +30381,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, 72487)
+			return Xsqlite3CorruptError(tls, 72491)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -30389,7 +30412,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72514)
+			return Xsqlite3CorruptError(tls, 72518)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -30730,7 +30753,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, 72978)
+			return Xsqlite3CorruptError(tls, 72982)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -30974,14 +30997,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, 73385)
+		return Xsqlite3CorruptError(tls, 73389)
 	}
 
 	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, 73400)
+		return Xsqlite3CorruptError(tls, 73404)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -31026,7 +31049,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, 73462)
+				return Xsqlite3CorruptError(tls, 73466)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31075,7 +31098,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73547)
+		return Xsqlite3CorruptError(tls, 73551)
 	}
 	return rc
 }
@@ -31155,7 +31178,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, 73684)
+		return Xsqlite3CorruptError(tls, 73688)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -31246,7 +31269,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, 73823)
+	return Xsqlite3CorruptError(tls, 73827)
 __11:
 	;
 skip_init:
@@ -31266,7 +31289,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73835)
+	return Xsqlite3CorruptError(tls, 73839)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -31476,7 +31499,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 74077)
+	return Xsqlite3CorruptError(tls, 74081)
 __21:
 	;
 	goto __19
@@ -31680,7 +31703,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 74273)
+	return Xsqlite3CorruptError(tls, 74277)
 __4:
 	;
 	goto bypass_moveto_root
@@ -31745,7 +31768,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, 74360)
+	rc = Xsqlite3CorruptError(tls, 74364)
 	goto moveto_index_finish
 __17:
 	;
@@ -31793,7 +31816,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74392)
+	rc = Xsqlite3CorruptError(tls, 74396)
 __24:
 	;
 	goto moveto_index_finish
@@ -31912,7 +31935,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, 74508)
+		return Xsqlite3CorruptError(tls, 74512)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32072,7 +32095,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74688)
+	return Xsqlite3CorruptError(tls, 74692)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32137,7 +32160,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74744)
+	rc = Xsqlite3CorruptError(tls, 74748)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+4, 0)
@@ -32173,7 +32196,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74773)
+	rc = Xsqlite3CorruptError(tls, 74777)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -32217,7 +32240,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74807)
+	rc = Xsqlite3CorruptError(tls, 74811)
 	goto end_allocate_page
 __32:
 	;
@@ -32329,7 +32352,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74872)
+	rc = Xsqlite3CorruptError(tls, 74876)
 	goto end_allocate_page
 __51:
 	;
@@ -32487,7 +32510,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, 74999)
+	return Xsqlite3CorruptError(tls, 75003)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -32544,7 +32567,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75046)
+	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75050)
 	goto freepage_out
 __10:
 	;
@@ -32560,7 +32583,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75057)
+	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75061)
 	goto freepage_out
 __12:
 	;
@@ -32634,7 +32657,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, 75146)
+		return Xsqlite3CorruptError(tls, 75150)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -32646,7 +32669,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, 75163)
+			return Xsqlite3CorruptError(tls, 75167)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+4)
@@ -32657,7 +32680,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, 75183)
+			rc = Xsqlite3CorruptError(tls, 75187)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -32822,7 +32845,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, 75436)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75440)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -33100,12 +33123,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, 75737)
+				return Xsqlite3CorruptError(tls, 75741)
 			}
 			pCell = pTmp + uintptr((int32(pCell)-int32(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75742)
+			return Xsqlite3CorruptError(tls, 75746)
 		}
 
 		pData -= uintptr(sz)
@@ -33113,7 +33136,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, 75748)
+			return Xsqlite3CorruptError(tls, 75752)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint32(sz))
 
@@ -33173,7 +33196,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, 75833)
+			Xsqlite3CorruptError(tls, 75837)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*4)), uint32(sz))
@@ -33262,7 +33285,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75947)
+	return Xsqlite3CorruptError(tls, 75951)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint32(nCell*2))
@@ -33378,7 +33401,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, 76060)
+		return Xsqlite3CorruptError(tls, 76064)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 80)) = allocateBtreePage(tls, pBt, bp, bp+4, uint32(0), uint8(0))
@@ -33698,7 +33721,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, 76481)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76485)
 	goto balance_cleanup
 __25:
 	;
@@ -33709,7 +33732,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76505)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76509)
 	goto balance_cleanup
 __27:
 	;
@@ -33867,7 +33890,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76606)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76610)
 	goto balance_cleanup
 __55:
 	;
@@ -33941,7 +33964,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76639)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76643)
 	goto balance_cleanup
 __67:
 	;
@@ -34004,7 +34027,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76683)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76687)
 	goto balance_cleanup
 __75:
 	;
@@ -34032,7 +34055,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 112)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76716)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76720)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 112)) != 0) {
@@ -34293,7 +34316,7 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76916)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76920)
 	goto balance_cleanup
 __121:
 	;
@@ -34485,7 +34508,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, 77146)
+			return Xsqlite3CorruptError(tls, 77150)
 		}
 	}
 	return SQLITE_OK
@@ -34523,7 +34546,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 77206)
+			rc = Xsqlite3CorruptError(tls, 77210)
 		} 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)))
@@ -34629,7 +34652,7 @@ func btreeOverwriteOverflowCell(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, 77370)
+			rc = Xsqlite3CorruptError(tls, 77374)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -34654,7 +34677,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 
 	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)
+		return Xsqlite3CorruptError(tls, 77402)
 	}
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
 		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
@@ -34724,7 +34747,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77479)
+	return Xsqlite3CorruptError(tls, 77483)
 __3:
 	;
 __1:
@@ -34837,7 +34860,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 104)) = Xsqlite3CorruptError(tls, 77602)
+	*(*int32)(unsafe.Pointer(bp + 104)) = Xsqlite3CorruptError(tls, 77606)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 104)) = btreeComputeFreeSpace(tls, pPage)
@@ -34897,6 +34920,7 @@ __30:
 __25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
+	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
 		goto __31
 	}
@@ -34904,7 +34928,7 @@ __25:
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
 		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77640)
+	return Xsqlite3CorruptError(tls, 77645)
 __33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 104)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
@@ -34942,13 +34966,13 @@ __37:
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77667)
+	return Xsqlite3CorruptError(tls, 77672)
 __39:
 	;
 	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 108))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __40
 	}
-	return Xsqlite3CorruptError(tls, 77670)
+	return Xsqlite3CorruptError(tls, 77675)
 __40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint32(*(*int32)(unsafe.Pointer(bp + 108))))
@@ -34979,7 +35003,6 @@ __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 __44
 	}
@@ -35054,7 +35077,7 @@ 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, 77773)
+		return Xsqlite3CorruptError(tls, 77777)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
@@ -35079,7 +35102,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, 77798)
+				return Xsqlite3CorruptError(tls, 77802)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35180,7 +35203,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77894)
+			return Xsqlite3CorruptError(tls, 77898)
 		}
 	}
 
@@ -35188,11 +35211,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, 77903)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 	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, 77907)
+		return Xsqlite3CorruptError(tls, 77911)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -35267,7 +35290,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, 77998)
+			return Xsqlite3CorruptError(tls, 78002)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -35336,7 +35359,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, 78114)
+			return Xsqlite3CorruptError(tls, 78118)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -35365,7 +35388,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, 78162)
+				*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3CorruptError(tls, 78166)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 24)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 12)))
@@ -35441,7 +35464,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 78252)
+	return Xsqlite3CorruptError(tls, 78256)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -35455,7 +35478,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, 78259)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78263)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -35589,7 +35612,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, 78363)
+		return Xsqlite3CorruptError(tls, 78367)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -35806,7 +35829,7 @@ 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+44, ts+4055, 1)
+		Xsqlite3_str_append(tls, pCheck+44, ts+4074, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
 		Xsqlite3_str_appendf(tls, pCheck+44, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
@@ -35831,11 +35854,11 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 	defer tls.Free(16)
 
 	if iPage > (*IntegrityCk)(unsafe.Pointer(pCheck)).FnPage || iPage == Pgno(0) {
-		checkAppendMsg(tls, pCheck, ts+4057, libc.VaList(bp, iPage))
+		checkAppendMsg(tls, pCheck, ts+4076, libc.VaList(bp, iPage))
 		return 1
 	}
 	if getPageReferenced(tls, pCheck, iPage) != 0 {
-		checkAppendMsg(tls, pCheck, ts+4080, libc.VaList(bp+8, iPage))
+		checkAppendMsg(tls, pCheck, ts+4099, libc.VaList(bp+8, iPage))
 		return 1
 	}
 	setPageReferenced(tls, pCheck, iPage)
@@ -35853,13 +35876,13 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
 			checkOom(tls, pCheck)
 		}
-		checkAppendMsg(tls, pCheck, ts+4105, libc.VaList(bp, iChild))
+		checkAppendMsg(tls, pCheck, ts+4124, libc.VaList(bp, iChild))
 		return
 	}
 
 	if int32(*(*U8)(unsafe.Pointer(bp + 48))) != int32(eType) || *(*Pgno)(unsafe.Pointer(bp + 52)) != iParent {
 		checkAppendMsg(tls, pCheck,
-			ts+4134,
+			ts+4153,
 			libc.VaList(bp+8, iChild, int32(eType), iParent, int32(*(*U8)(unsafe.Pointer(bp + 48))), *(*Pgno)(unsafe.Pointer(bp + 52))))
 	}
 }
@@ -35878,7 +35901,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 		}
 		N--
 		if Xsqlite3PagerGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpPager, iPage, bp+40, 0) != 0 {
-			checkAppendMsg(tls, pCheck, ts+4188, libc.VaList(bp, iPage))
+			checkAppendMsg(tls, pCheck, ts+4207, libc.VaList(bp, iPage))
 			break
 		}
 		pOvflData = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
@@ -35889,7 +35912,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 			}
 			if n > (*BtShared)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt)).FusableSize/U32(4)-U32(2) {
 				checkAppendMsg(tls, pCheck,
-					ts+4210, libc.VaList(bp+8, iPage))
+					ts+4229, libc.VaList(bp+8, iPage))
 				N--
 			} else {
 				for i = 0; i < int32(n); i++ {
@@ -35912,12 +35935,12 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 	}
 	if N != 0 && nErrAtStart == (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr {
 		checkAppendMsg(tls, pCheck,
-			ts+4249,
+			ts+4268,
 			libc.VaList(bp+16, func() uintptr {
 				if isFreeList != 0 {
-					return ts + 4275
+					return ts + 4294
 				}
-				return ts + 4280
+				return ts + 4299
 			}(),
 				expected-N, expected))
 	}
@@ -36033,13 +36056,13 @@ __2:
 	return 0
 __3:
 	;
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4301
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4320
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
 		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4311, libc.VaList(bp, rc))
+		ts+4330, libc.VaList(bp, rc))
 	goto end_of_check
 __4:
 	;
@@ -36050,7 +36073,7 @@ __4:
 	}
 
 	checkAppendMsg(tls, pCheck,
-		ts+4349, libc.VaList(bp+8, rc))
+		ts+4368, libc.VaList(bp+8, rc))
 	goto end_of_check
 __5:
 	;
@@ -36058,14 +36081,14 @@ __5:
 		goto __6
 	}
 
-	checkAppendMsg(tls, pCheck, ts+4387, libc.VaList(bp+16, rc))
+	checkAppendMsg(tls, pCheck, ts+4406, libc.VaList(bp+16, rc))
 	goto end_of_check
 __6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
 
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4409
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4428
 	contentOffset = U32((int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5))))<<8|int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5) + 1)))-1)&0xffff + 1)
 
 	nCell = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3) + 1)))
@@ -36082,7 +36105,7 @@ __6:
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
 		goto __9
 	}
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4435
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4454
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
 __9:
 	;
@@ -36107,7 +36130,7 @@ __10:
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
 		goto __13
 	}
-	checkAppendMsg(tls, pCheck, ts+4463,
+	checkAppendMsg(tls, pCheck, ts+4482,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
 	goto __11
@@ -36120,7 +36143,7 @@ __13:
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
 		goto __14
 	}
-	checkAppendMsg(tls, pCheck, ts+4493, 0)
+	checkAppendMsg(tls, pCheck, ts+4512, 0)
 	doCoverageCheck = 0
 	goto __11
 __14:
@@ -36136,7 +36159,7 @@ __14:
 	}() != 0) {
 		goto __16
 	}
-	checkAppendMsg(tls, pCheck, ts+4517, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
+	checkAppendMsg(tls, pCheck, ts+4536, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
 __16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
@@ -36174,7 +36197,7 @@ __21:
 	if !(d2 != depth) {
 		goto __22
 	}
-	checkAppendMsg(tls, pCheck, ts+4541, 0)
+	checkAppendMsg(tls, pCheck, ts+4560, 0)
 	depth = d2
 __22:
 	;
@@ -36247,7 +36270,7 @@ __30:
 		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4566, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
+		ts+4585, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
 	goto __31
 	goto __33
 __32:
@@ -36264,7 +36287,7 @@ __31:
 		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4603,
+		ts+4622,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
 __34:
 	;
@@ -36378,7 +36401,7 @@ __6:
 	if !(bCkFreelist != 0) {
 		goto __7
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4655
+	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4674
 	checkList(tls, bp+32, 1, Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+32),
 		Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
@@ -36414,7 +36437,7 @@ __13:
 		goto __15
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4671,
+		ts+4690,
 		libc.VaList(bp, mx, mxInHdr))
 __15:
 	;
@@ -36424,7 +36447,7 @@ __9:
 		goto __16
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4716, 0)
+		ts+4735, 0)
 __16:
 	;
 __10:
@@ -36471,13 +36494,13 @@ __23:
 	if !(getPageReferenced(tls, bp+32, i) == 0 && (ptrmapPageno(tls, pBt, i) != i || !(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0))) {
 		goto __26
 	}
-	checkAppendMsg(tls, bp+32, ts+4771, libc.VaList(bp+16, i))
+	checkAppendMsg(tls, bp+32, ts+4790, libc.VaList(bp+16, i))
 __26:
 	;
 	if !(getPageReferenced(tls, bp+32, i) != 0 && (ptrmapPageno(tls, pBt, i) == i && (*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0)) {
 		goto __27
 	}
-	checkAppendMsg(tls, bp+32, ts+4793, libc.VaList(bp+24, i))
+	checkAppendMsg(tls, bp+32, ts+4812, libc.VaList(bp+24, i))
 __27:
 	;
 	goto __24
@@ -36740,7 +36763,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 		var rc int32 = 0
 		Xsqlite3ParseObjectInit(tls, bp+16, pDb)
 		if Xsqlite3OpenTempDatabase(tls, bp+16) != 0 {
-			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3656, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3675, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 			rc = SQLITE_ERROR
 		}
 		Xsqlite3DbFree(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
@@ -36751,7 +36774,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 	}
 
 	if i < 0 {
-		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4827, libc.VaList(bp+8, zDb))
+		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4846, libc.VaList(bp+8, zDb))
 		return uintptr(0)
 	}
 
@@ -36766,7 +36789,7 @@ func setDestPgsz(tls *libc.TLS, p uintptr) int32 {
 
 func checkReadTransaction(tls *libc.TLS, db uintptr, p uintptr) int32 {
 	if Xsqlite3BtreeTxnState(tls, p) != SQLITE_TXN_NONE {
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4847, 0)
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4866, 0)
 		return SQLITE_ERROR
 	}
 	return SQLITE_OK
@@ -36786,7 +36809,7 @@ func Xsqlite3_backup_init(tls *libc.TLS, pDestDb uintptr, zDestDb uintptr, pSrcD
 
 	if pSrcDb == pDestDb {
 		Xsqlite3ErrorWithMsg(tls,
-			pDestDb, SQLITE_ERROR, ts+4878, 0)
+			pDestDb, SQLITE_ERROR, ts+4897, 0)
 		p = uintptr(0)
 	} else {
 		p = Xsqlite3MallocZero(tls, uint64(unsafe.Sizeof(Sqlite3_backup{})))
@@ -37234,7 +37257,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 		(*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,
+		Xsqlite3_str_appendf(tls, bp+8, ts+4937,
 			libc.VaList(bp, func() float64 {
 				if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_IntReal != 0 {
 					return float64(*(*I64)(unsafe.Pointer(p)))
@@ -37826,7 +37849,7 @@ func Xsqlite3VdbeMemSetPointer(tls *libc.TLS, pMem uintptr, pPtr uintptr, zPType
 		if zPType != 0 {
 			return zPType
 		}
-		return ts + 1547
+		return ts + 1566
 	}()
 	(*Mem)(unsafe.Pointer(pMem)).Fz = pPtr
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null | MEM_Dyn | MEM_Subtype | MEM_Term)
@@ -38058,7 +38081,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, 81630)
+		return Xsqlite3CorruptError(tls, 81634)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -38289,7 +38312,7 @@ __9:
 		goto __10
 	}
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 8)).FisError
-	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3656, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
+	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3675, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
 	goto __11
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
@@ -38342,7 +38365,7 @@ func valueFromExpr(tls *libc.TLS, db uintptr, pExpr uintptr, enc U8, affinity U8
 	zVal = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	negInt = 1
-	zNeg = ts + 1547
+	zNeg = ts + 1566
 	rc = SQLITE_OK
 
 __1:
@@ -38383,7 +38406,7 @@ __4:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
 	negInt = -1
-	zNeg = ts + 4925
+	zNeg = ts + 4944
 __6:
 	;
 	if !(op == TK_STRING || op == TK_FLOAT || op == TK_INTEGER) {
@@ -38402,7 +38425,7 @@ __9:
 	Xsqlite3VdbeMemSetInt64(tls, *(*uintptr)(unsafe.Pointer(bp + 16)), I64(*(*int32)(unsafe.Pointer(pExpr + 8)))*I64(negInt))
 	goto __11
 __10:
-	zVal = Xsqlite3MPrintf(tls, db, ts+4927, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+	zVal = Xsqlite3MPrintf(tls, db, ts+4946, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	if !(zVal == uintptr(0)) {
 		goto __12
 	}
@@ -38706,7 +38729,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, 82270)
+		return Xsqlite3CorruptError(tls, 82274)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -38721,14 +38744,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 82276)
+			return Xsqlite3CorruptError(tls, 82280)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 82282)
+		return Xsqlite3CorruptError(tls, 82286)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -39736,34 +39759,34 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var j int32
 			var pKeyInfo uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4932, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4951, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
 			for j = 0; j < int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField); j++ {
 				var pColl uintptr = *(*uintptr)(unsafe.Pointer(pKeyInfo + 20 + uintptr(j)*4))
 				var zColl uintptr
 				if pColl != 0 {
 					zColl = (*CollSeq)(unsafe.Pointer(pColl)).FzName
 				} else {
-					zColl = ts + 1547
+					zColl = ts + 1566
 				}
-				if libc.Xstrcmp(tls, zColl, ts+1092) == 0 {
-					zColl = ts + 4937
+				if libc.Xstrcmp(tls, zColl, ts+1111) == 0 {
+					zColl = ts + 4956
 				}
-				Xsqlite3_str_appendf(tls, bp+144, ts+4939,
+				Xsqlite3_str_appendf(tls, bp+144, ts+4958,
 					libc.VaList(bp+8, func() uintptr {
 						if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_DESC != 0 {
-							return ts + 4925
+							return ts + 4944
 						}
-						return ts + 1547
+						return ts + 1566
 					}(),
 						func() uintptr {
 							if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_BIGNULL != 0 {
-								return ts + 4947
+								return ts + 4966
 							}
-							return ts + 1547
+							return ts + 1566
 						}(),
 						zColl))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4950, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+4969, 1)
 			break
 
 		}
@@ -39771,7 +39794,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 		{
 			var pColl uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4952, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
+			Xsqlite3_str_appendf(tls, bp+144, ts+4971, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
 				encnames[(*CollSeq)(unsafe.Pointer(pColl)).Fenc]))
 			break
 
@@ -39779,32 +39802,32 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -7:
 		{
 			var pDef uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
-			Xsqlite3_str_appendf(tls, bp+144, ts+4961, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4980, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -15:
 		{
 			var pDef uintptr = (*Sqlite3_context)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpFunc
-			Xsqlite3_str_appendf(tls, bp+144, ts+4961, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4980, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -13:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1327, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1346, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
 	case -3:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+4968, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4987, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
 			break
 
 		}
 	case -12:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1321, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1340, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
@@ -39814,13 +39837,13 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Str != 0 {
 				zP4 = (*Mem)(unsafe.Pointer(pMem)).Fz
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1327, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1346, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1321, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1340, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Null != 0 {
-				zP4 = ts + 1548
+				zP4 = ts + 1567
 			} else {
-				zP4 = ts + 4971
+				zP4 = ts + 4990
 			}
 			break
 
@@ -39828,7 +39851,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -11:
 		{
 			var pVtab uintptr = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-			Xsqlite3_str_appendf(tls, bp+144, ts+4978, libc.VaList(bp+120, pVtab))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4997, libc.VaList(bp+120, pVtab))
 			break
 
 		}
@@ -39839,20 +39862,20 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var n U32 = *(*U32)(unsafe.Pointer(ai))
 
 			for i = U32(1); i <= n; i++ {
-				Xsqlite3_str_appendf(tls, bp+144, ts+4986, libc.VaList(bp+128, func() int32 {
+				Xsqlite3_str_appendf(tls, bp+144, ts+5005, libc.VaList(bp+128, func() int32 {
 					if i == U32(1) {
 						return '['
 					}
 					return ','
 				}(), *(*U32)(unsafe.Pointer(ai + uintptr(i)*4))))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4991, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+5010, 1)
 			break
 
 		}
 	case -4:
 		{
-			zP4 = ts + 4993
+			zP4 = ts + 5012
 			break
 
 		}
@@ -39877,7 +39900,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	return Xsqlite3StrAccumFinish(tls, bp+144)
 }
 
-var encnames = [4]uintptr{ts + 5001, ts + 5003, ts + 5005, ts + 5010}
+var encnames = [4]uintptr{ts + 5020, ts + 5022, ts + 5024, ts + 5029}
 
 // Declare to the Vdbe that the BTree object at db->aDb[i] is used.
 //
@@ -40328,8 +40351,8 @@ func Xsqlite3VdbeMakeReady(tls *libc.TLS, p uintptr, pParse uintptr) {
 }
 
 var azColName = [12]uintptr{
-	ts + 5015, ts + 5020, ts + 5027, ts + 5030, ts + 5033, ts + 5036, ts + 5039, ts + 5042,
-	ts + 5050, ts + 5053, ts + 5060, ts + 5068,
+	ts + 5034, ts + 5039, ts + 5046, ts + 5049, ts + 5052, ts + 5055, ts + 5058, ts + 5061,
+	ts + 5069, ts + 5072, ts + 5079, ts + 5087,
 }
 
 // Close a VDBE cursor and release all the resources that cursor
@@ -40538,7 +40561,7 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		var nMainFile int32
 
 		nMainFile = Xsqlite3Strlen30(tls, zMainFile)
-		zSuper = Xsqlite3MPrintf(tls, db, ts+5075, libc.VaList(bp, 0, zMainFile, 0))
+		zSuper = Xsqlite3MPrintf(tls, db, ts+5094, libc.VaList(bp, 0, zMainFile, 0))
 		if zSuper == uintptr(0) {
 			return SQLITE_NOMEM
 		}
@@ -40546,16 +40569,16 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		for __ccgo := true; __ccgo; __ccgo = rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 60)) != 0 {
 			if retryCount != 0 {
 				if retryCount > 100 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5087, libc.VaList(bp+24, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5106, libc.VaList(bp+24, zSuper))
 					Xsqlite3OsDelete(tls, pVfs, zSuper, 0)
 					break
 				} else if retryCount == 1 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5101, libc.VaList(bp+32, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5120, libc.VaList(bp+32, zSuper))
 				}
 			}
 			retryCount++
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
-			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5116,
+			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5135,
 				libc.VaList(bp+40, *(*U32)(unsafe.Pointer(bp + 56))>>8&U32(0xffffff), *(*U32)(unsafe.Pointer(bp + 56))&U32(0xff)))
 
 			rc = Xsqlite3OsAccess(tls, pVfs, zSuper, SQLITE_ACCESS_EXISTS, bp+60)
@@ -40701,7 +40724,7 @@ func Xsqlite3VdbeCheckFk(tls *libc.TLS, p uintptr, deferred int32) int32 {
 		!(deferred != 0) && (*Vdbe)(unsafe.Pointer(p)).FnFkConstraint > int64(0) {
 		(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_CONSTRAINT | int32(3)<<8
 		(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
-		Xsqlite3VdbeError(tls, p, ts+5129, 0)
+		Xsqlite3VdbeError(tls, p, ts+5148, 0)
 		if int32((*Vdbe)(unsafe.Pointer(p)).FprepFlags)&SQLITE_PREPARE_SAVESQL == 0 {
 			return SQLITE_ERROR
 		}
@@ -41033,7 +41056,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 86058)
+		return Xsqlite3CorruptError(tls, 86062)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -41584,7 +41607,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86989))
 		return 0
 	}
 
@@ -41649,7 +41672,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, 87062))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87066))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 20 + uintptr(i)*4)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -41683,7 +41706,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, 87092))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87096))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -41733,7 +41756,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, 87136))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87140))
 			return 0
 		}
 	}
@@ -41879,7 +41902,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87303))
 	return 0
 __7:
 	;
@@ -42050,7 +42073,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87457)
+	return Xsqlite3CorruptError(tls, 87461)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42076,7 +42099,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, 87490)
+		return Xsqlite3CorruptError(tls, 87494)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -42187,13 +42210,13 @@ func Xsqlite3NotPureFunc(tls *libc.TLS, pCtx uintptr) int32 {
 		var zContext uintptr
 		var zMsg uintptr
 		if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_IsCheck != 0 {
-			zContext = ts + 5159
-		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5178
-		} else {
+		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5197
+		} else {
+			zContext = ts + 5216
 		}
-		zMsg = Xsqlite3_mprintf(tls, ts+5206,
+		zMsg = Xsqlite3_mprintf(tls, ts+5225,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx)).FpFunc)).FzName, zContext))
 		Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 		Xsqlite3_free(tls, zMsg)
@@ -42298,7 +42321,7 @@ func Xsqlite3_expired(tls *libc.TLS, pStmt uintptr) int32 {
 
 func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 	if (*Vdbe)(unsafe.Pointer(p)).Fdb == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5242, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5261, 0)
 		return 1
 	} else {
 		return 0
@@ -42308,7 +42331,7 @@ func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 
 func vdbeSafetyNotNull(tls *libc.TLS, p uintptr) int32 {
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5287, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5306, 0)
 		return 1
 	} else {
 		return vdbeSafety(tls, p)
@@ -42350,7 +42373,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, 87854)
+			return Xsqlite3MisuseError(tls, 87858)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -42773,7 +42796,7 @@ func Xsqlite3_result_error_code(tls *libc.TLS, pCtx uintptr, errCode int32) {
 // Force an SQLITE_TOOBIG error.
 func Xsqlite3_result_error_toobig(tls *libc.TLS, pCtx uintptr) {
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FisError = SQLITE_TOOBIG
-	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5327, int64(-1),
+	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5346, int64(-1),
 		uint8(SQLITE_UTF8), uintptr(0))
 }
 
@@ -42965,7 +42988,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88544)
+		return Xsqlite3MisuseError(tls, 88548)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -43485,15 +43508,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 89208)
+		return Xsqlite3MisuseError(tls, 89212)
 	}
 	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+5350, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 89216)
+			ts+5369, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89220)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -43898,7 +43921,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, 89707)
+	rc = Xsqlite3MisuseError(tls, 89711)
 	goto preupdate_old_out
 __1:
 	;
@@ -44042,7 +44065,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, 89809)
+	rc = Xsqlite3MisuseError(tls, 89813)
 	goto preupdate_new_out
 __1:
 	;
@@ -44214,7 +44237,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+5390, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5409, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, (int32(zRawSql)-int32(zStart))/1)
 		}
@@ -44250,11 +44273,11 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 
 			pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr(*(*int32)(unsafe.Pointer(bp + 76))-1)*40
 			if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Null != 0 {
-				Xsqlite3_str_append(tls, bp+48, ts+1548, 4)
+				Xsqlite3_str_append(tls, bp+48, ts+1567, 4)
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+1327, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+1346, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+4918, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+4937, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Str != 0 {
 				var nOut int32
 				var enc U8 = (*Sqlite3)(unsafe.Pointer(db)).Fenc
@@ -44269,21 +44292,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+5394, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5413, 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+5401, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5420, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5414, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5433, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					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_appendf(tls, bp+48, ts+5436, libc.VaList(bp+40, int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5422, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5441, 1)
 			}
 		}
 	}
@@ -44486,10 +44509,6 @@ func filterHash(tls *libc.TLS, aMem uintptr, pOp uintptr) U64 {
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Real != 0 {
 			h = h + U64(Xsqlite3VdbeIntValue(tls, p))
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&(MEM_Str|MEM_Blob) != 0 {
-			h = h + U64((*Mem)(unsafe.Pointer(p)).Fn)
-			if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Zero != 0 {
-				h = h + U64(*(*int32)(unsafe.Pointer(p)))
-			}
 		}
 	}
 	return h
@@ -44500,11 +44519,11 @@ func vdbeMemTypeName(tls *libc.TLS, pMem uintptr) uintptr {
 }
 
 var azTypes = [5]uintptr{
-	ts + 1108,
-	ts + 1120,
-	ts + 1125,
-	ts + 1103,
-	ts + 1548,
+	ts + 1127,
+	ts + 1139,
+	ts + 1144,
+	ts + 1122,
+	ts + 1567,
 }
 
 // Execute as much of a VDBE program as we can.
@@ -45547,20 +45566,20 @@ __202:
 		goto __205
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5424, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	Xsqlite3VdbeError(tls, p, ts+5443, 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))))
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5464, 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))))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
 	;
 	pcx = (int32(pOp) - int32(aOp)) / 20
-	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))
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5471, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 __204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
@@ -47138,7 +47157,7 @@ op_column_corrupt:
 	goto __9
 	goto __425
 __424:
-	rc = Xsqlite3CorruptError(tls, 93317)
+	rc = Xsqlite3CorruptError(tls, 93320)
 	goto abort_due_to_error
 __425:
 	;
@@ -47266,7 +47285,7 @@ __428:
 	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5476,
+	Xsqlite3VdbeError(tls, p, ts+5495,
 		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
@@ -47698,7 +47717,7 @@ __78:
 		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5517, 0)
+	Xsqlite3VdbeError(tls, p, ts+5536, 0)
 	rc = SQLITE_BUSY
 	goto __523
 __522:
@@ -47758,7 +47777,7 @@ __530:
 	if !!(pSavepoint != 0) {
 		goto __531
 	}
-	Xsqlite3VdbeError(tls, p, ts+5568, libc.VaList(bp+88, zName))
+	Xsqlite3VdbeError(tls, p, ts+5587, libc.VaList(bp+88, zName))
 	rc = SQLITE_ERROR
 	goto __532
 __531:
@@ -47767,7 +47786,7 @@ __531:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5590, 0)
+		ts+5609, 0)
 	rc = SQLITE_BUSY
 	goto __534
 __533:
@@ -47953,7 +47972,7 @@ __564:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5644, 0)
+		ts+5663, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
 	goto __567
@@ -47996,13 +48015,13 @@ __562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5699
+				return ts + 5718
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5747
+					return ts + 5766
 				}
-				return ts + 5790
+				return ts + 5809
 			}()
 		}(), 0)
 
@@ -48085,7 +48104,7 @@ __576:
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5831)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5850)
 
 	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 __583
@@ -48289,7 +48308,7 @@ __88:
 	}
 
 	(*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
+	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fz = ts + 1566
 __602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
@@ -48898,7 +48917,7 @@ notExistsWithKey:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
 		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95560)
+	rc = Xsqlite3CorruptError(tls, 95563)
 	goto __683
 __682:
 	goto jump_to_p2
@@ -49676,7 +49695,7 @@ __767:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
 		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5859)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96638, ts+5878)
 	goto abort_due_to_error
 __770:
 	;
@@ -49786,7 +49805,7 @@ __780:
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
 		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96840)
+	rc = Xsqlite3CorruptError(tls, 96843)
 	goto abort_due_to_error
 __781:
 	;
@@ -49947,14 +49966,14 @@ __141:
 	libc.SetBitFieldPtr8Uint32(p+152, Bft(0), 0, 0x3)
 	goto __799
 __798:
-	zSchema = ts + 5876
+	zSchema = ts + 5895
 	(*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+5890,
+		ts+5909,
 		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 __800
@@ -49980,7 +49999,7 @@ __802:
 		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 97092)
+	rc = Xsqlite3CorruptError(tls, 97095)
 __803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
@@ -50170,7 +50189,7 @@ __820:
 		goto __825
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5933, 0)
+	Xsqlite3VdbeError(tls, p, ts+5952, 0)
 	goto abort_due_to_error
 __825:
 	;
@@ -50482,7 +50501,7 @@ __860:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
 		goto __862
 	}
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
 __862:
 	;
@@ -50532,7 +50551,7 @@ __867:
 	if !(rc != 0) {
 		goto __868
 	}
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
 __868:
 	;
@@ -50614,12 +50633,12 @@ __876:
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5970,
+		ts+5989,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6022
+				return ts + 6041
 			}
-			return ts + 6027
+			return ts + 6046
 		}()))
 	goto abort_due_to_error
 	goto __879
@@ -50761,7 +50780,7 @@ __171:
 		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6034, libc.VaList(bp+144, z1))
+	Xsqlite3VdbeError(tls, p, ts+6053, libc.VaList(bp+144, z1))
 __894:
 	;
 	goto abort_due_to_error
@@ -50879,7 +50898,7 @@ __904:
 	(*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+6063, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6082, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
 	goto __9
 
 __177:
@@ -50968,7 +50987,7 @@ __912:
 	if !((*Sqlite3_context)(unsafe.Pointer(bp+836)).FisError > 0) {
 		goto __913
 	}
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 836)).FisError
 __913:
 	;
@@ -51198,7 +51217,7 @@ __935:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
 		goto __940
 	}
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
 __940:
 	;
@@ -51274,7 +51293,7 @@ __945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
 		goto __947
 	}
-	z3 = Xsqlite3MPrintf(tls, db, ts+6073, libc.VaList(bp+168, zTrace))
+	z3 = Xsqlite3MPrintf(tls, db, ts+6092, 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)
@@ -51347,7 +51366,7 @@ __955:
 	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __957
 	}
-	rc = Xsqlite3CorruptError(tls, 99031)
+	rc = Xsqlite3CorruptError(tls, 99034)
 __957:
 	;
 __956:
@@ -51355,13 +51374,13 @@ __956:
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
 		goto __958
 	}
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
 __958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
 
-	Xsqlite3_log(tls, rc, ts+6079,
+	Xsqlite3_log(tls, rc, ts+6098,
 		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 __959
@@ -51417,13 +51436,13 @@ __966:
 	return rc
 
 too_big:
-	Xsqlite3VdbeError(tls, p, ts+5327, 0)
+	Xsqlite3VdbeError(tls, p, ts+5346, 0)
 	rc = SQLITE_TOOBIG
 	goto abort_due_to_error
 
 no_mem:
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3VdbeError(tls, p, ts+1483, 0)
+	Xsqlite3VdbeError(tls, p, ts+1502, 0)
 	rc = SQLITE_NOMEM
 	goto abort_due_to_error
 
@@ -51434,8 +51453,8 @@ abort_due_to_interrupt:
 	return int32(0)
 }
 
-var azType = [4]uintptr{ts + 6111, ts + 6120, ts + 6127,
-	ts + 6133}
+var azType = [4]uintptr{ts + 6130, ts + 6139, ts + 6146,
+	ts + 6152}
 var and_logic = [9]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(1), uint8(2), uint8(0), uint8(2), uint8(2)}
 var or_logic = [9]uint8{uint8(0), uint8(1), uint8(2), uint8(1), uint8(1), uint8(1), uint8(2), uint8(1), uint8(2)}
 var aMask = [12]uint8{
@@ -51490,16 +51509,16 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		}
 
 		if type1 < U32(12) {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6145,
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6164,
 				libc.VaList(bp, func() uintptr {
 					if type1 == U32(0) {
-						return ts + 6174
+						return ts + 6193
 					}
 					return func() uintptr {
 						if type1 == U32(7) {
-							return ts + 6179
+							return ts + 6198
 						}
-						return ts + 6184
+						return ts + 6203
 					}()
 				}()))
 			rc = SQLITE_ERROR
@@ -51519,10 +51538,10 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		rc = Xsqlite3_finalize(tls, (*Incrblob)(unsafe.Pointer(p)).FpStmt)
 		(*Incrblob)(unsafe.Pointer(p)).FpStmt = uintptr(0)
 		if rc == SQLITE_OK {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6192, libc.VaList(bp+8, iRow))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6211, libc.VaList(bp+8, iRow))
 			rc = SQLITE_ERROR
 		} else {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3656, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3675, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
 		}
 	}
 
@@ -51582,21 +51601,21 @@ __3:
 		goto __4
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6212, libc.VaList(bp, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6231, libc.VaList(bp, zTable))
 __4:
 	;
 	if !(pTab != 0 && !((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0))) {
 		goto __5
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6242, libc.VaList(bp+8, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6261, libc.VaList(bp+8, zTable))
 __5:
 	;
 	if !(pTab != 0 && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __6
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6278, libc.VaList(bp+16, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6297, libc.VaList(bp+16, zTable))
 __6:
 	;
 	if !!(pTab != 0) {
@@ -51640,7 +51659,7 @@ __11:
 		goto __13
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
-	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6299, libc.VaList(bp+24, zColumn))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6318, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51667,7 +51686,7 @@ __19:
 	if !((*sColMap)(unsafe.Pointer(pFKey+36+uintptr(j)*8)).FiFrom == iCol) {
 		goto __22
 	}
-	zFault = ts + 6320
+	zFault = ts + 6339
 __22:
 	;
 	goto __20
@@ -51700,7 +51719,7 @@ __26:
 	if !(int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == iCol || int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == -2) {
 		goto __29
 	}
-	zFault = ts + 6332
+	zFault = ts + 6351
 __29:
 	;
 	goto __27
@@ -51721,7 +51740,7 @@ __25:
 		goto __30
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
-	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6340, libc.VaList(bp+32, zFault))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6359, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51819,7 +51838,7 @@ __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 328)) != 0 {
-			return ts + 3656
+			return ts + 3675
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 328))))
@@ -51867,7 +51886,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99516)
+		return Xsqlite3MisuseError(tls, 99519)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51950,7 +51969,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99616)
+		return Xsqlite3MisuseError(tls, 99619)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51963,7 +51982,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 				if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-					return ts + 3656
+					return ts + 3675
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
@@ -54490,25 +54509,25 @@ 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 {
+	if Xsqlite3_strnicmp(tls, zTab, ts+6393, 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 {
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6401+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
 			return 1
 		}
 		if pSchema == uintptr(0) {
 			return 0
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5876+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5895+7) == 0 {
 			return 1
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6439+7) == 0 {
 			return 1
 		}
 	} else {
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6439+7) == 0 {
 			return 1
 		}
 	}
@@ -54588,7 +54607,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6434, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6453, zDb) == 0) {
 		goto __8
 	}
 
@@ -54709,7 +54728,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6439) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6458) != 0) {
 		goto __33
 	}
 	goto __14
@@ -54883,14 +54902,14 @@ __60:
 	;
 	goto __59
 __58:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6441, zTab) == 0) {
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6460, zTab) == 0) {
 		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
 	goto __62
 __61:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6445, zTab) == 0) {
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6464, zTab) == 0) {
 		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
@@ -54907,7 +54926,7 @@ __57:
 		goto __64
 	}
 	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 8))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6449, zTab) == 0) {
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6468, zTab) == 0) {
 		goto __65
 	}
 	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
@@ -55066,7 +55085,7 @@ __86:
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
 		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6458, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6477, libc.VaList(bp, zAs))
 	return WRC_Abort
 __90:
 	;
@@ -55074,14 +55093,14 @@ __90:
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
 		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6489, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6508, libc.VaList(bp+8, zAs))
 	return WRC_Abort
 __91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
 		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 	return WRC_Abort
 __92:
 	;
@@ -55133,7 +55152,7 @@ __11:
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6544, libc.VaList(bp+16, zCol))
+		ts+6563, 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
@@ -55173,7 +55192,7 @@ __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 + 6579
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6598
 	*(*uintptr)(unsafe.Pointer(pExpr + 20)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
@@ -55186,23 +55205,23 @@ __101:
 __99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6588
+		zErr = ts + 6607
 	} else {
-		zErr = ts + 6603
+		zErr = ts + 6622
 	}
 	if !(zDb != 0) {
 		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6625, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6644, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
 	goto __105
 __104:
 	if !(zTab != 0) {
 		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6638, libc.VaList(bp+56, zErr, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6657, libc.VaList(bp+56, zErr, zTab, zCol))
 	goto __107
 __106:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp+80, zErr, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6667, libc.VaList(bp+80, zErr, zCol))
 __107:
 	;
 __105:
@@ -55305,15 +55324,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 + 6655
+	var zIn uintptr = ts + 6674
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6683
+		zIn = ts + 6702
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6701
+		zIn = ts + 6720
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6719
+		zIn = ts + 6738
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6737, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6756, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -55391,14 +55410,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 + 6757
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
-				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6762
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
-				}
-				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
+				*(*int32)(unsafe.Pointer(pExpr + 8)) = libc.Bool32(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL)
+				*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IntValue)
+				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_INTEGER)
+
 				i = 0
 				p = pNC
 			__4:
@@ -55442,7 +55457,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+6768, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6776, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -55506,7 +55521,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+6785, libc.VaList(bp, pExpr))
+								ts+6793, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -55522,7 +55537,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+6849,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6857,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -55536,7 +55551,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+6885, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6893, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -55559,30 +55574,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+6913, libc.VaList(bp+16, pExpr))
+						ts+6921, 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 + 6956
+						zType = ts + 6964
 					} else {
-						zType = ts + 6963
+						zType = ts + 6971
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6973, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6981, 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+7001, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7009, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7023,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7031,
 						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+7067,
+						ts+7075,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -55654,15 +55669,15 @@ 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+7115, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7123, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 20)))
 				}
 
 				if nRef != (*NameContext)(unsafe.Pointer(pNC)).FnRef {
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_VarSelect)
-					*(*int32)(unsafe.Pointer(pNC + 24)) |= NC_VarSelect
 				}
+				*(*int32)(unsafe.Pointer(pNC + 24)) |= NC_Subquery
 			}
 			break
 
@@ -55670,7 +55685,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+7126, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7134, pExpr, pExpr)
 			}
 
 			break
@@ -55726,7 +55741,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+6526, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -55801,7 +55816,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7137, libc.VaList(bp, i, zType, mx))
+		ts+7145, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -55821,7 +55836,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+7193, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7201, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -55856,7 +55871,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+7227, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7235, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -55913,7 +55928,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+7233, libc.VaList(bp, i+1))
+				ts+7241, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -55941,7 +55956,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+7294, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7302, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -56155,7 +56170,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+7325, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7333, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -56195,7 +56210,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+7227) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7235) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -56206,7 +56221,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7364) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7372) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -56218,7 +56233,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+7370, 0)
+						ts+7378, 0)
 					return WRC_Abort
 				}
 
@@ -57007,7 +57022,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 		return
 	}
 
@@ -57082,7 +57097,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+7429, libc.VaList(bp, mxHeight))
+			ts+7437, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -57331,12 +57346,12 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7477,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7485,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7521
+						return ts + 7529
 					}
-					return ts + 1547
+					return ts + 1566
 				}(), nElem))
 			break
 		}
@@ -57375,7 +57390,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+7523)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7531)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -57401,7 +57416,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+7525, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7533, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 20)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -57429,7 +57444,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+7559, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7567, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -57476,7 +57491,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+7579,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7587,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 120 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -57501,7 +57516,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+7622, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7630, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -58076,7 +58091,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+7645,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7653,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -58199,7 +58214,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+7675, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7683, libc.VaList(bp, zObject))
 	}
 }
 
@@ -58255,10 +58270,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+6757) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7706) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6762) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7711) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -58689,13 +58704,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+7698) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7717) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7706) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7725) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7712) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7731) == 0 {
 		return 1
 	}
 	return 0
@@ -58899,7 +58914,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+7716, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7735, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -58977,7 +58992,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+7763, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7782, 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)
 
@@ -59071,7 +59086,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 + 7794
+		var zFmt uintptr = ts + 7813
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -59089,7 +59104,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+6526, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 	}
 }
 
@@ -59130,7 +59145,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+7838, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7857, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 44 + 4)),
@@ -59160,11 +59175,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+7861, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7880, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
-				return ts + 1547
+				return ts + 1566
 			}
-			return ts + 7880
+			return ts + 7899
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -59291,7 +59306,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+7892, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7911, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 44 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 44)))
@@ -59306,11 +59321,11 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7910, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7929, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
-			return ts + 1547
+			return ts + 1566
 		}
-		return ts + 7880
+		return ts + 7899
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
@@ -59333,7 +59348,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+7523)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7531)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = uint8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -59342,7 +59357,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+7931)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7950)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -59728,13 +59743,13 @@ 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+7933, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7936,
+			if Xsqlite3_strnicmp(tls, z, ts+7952, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7955,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
-							return ts + 4925
+							return ts + 4944
 						}
-						return ts + 1547
+						return ts + 1566
 					}(), pExpr))
 			} else {
 				codeReal(tls, v, z, negFlag, iMem)
@@ -59771,6 +59786,7 @@ func Xsqlite3ExprCodeLoadIndexColumn(tls *libc.TLS, pParse uintptr, pIdx uintptr
 func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr, pCol uintptr, regOut int32) {
 	var iAddr int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
+	var nErr int32 = (*Parse)(unsafe.Pointer(pParse)).FnErr
 
 	if (*Parse)(unsafe.Pointer(pParse)).FiSelfTab > 0 {
 		iAddr = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Parse)(unsafe.Pointer(pParse)).FiSelfTab-1, 0, regOut)
@@ -59784,6 +59800,9 @@ func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr
 	if iAddr != 0 {
 		Xsqlite3VdbeJumpHere(tls, v, iAddr)
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr > nErr {
+		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FerrByteOffset = -1
+	}
 }
 
 // Generate code to extract the value of the iCol-th column of a table.
@@ -59805,7 +59824,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+7963,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7982,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -59978,8 +59997,8 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[6]uintptr)(unsafe.Pointer(bp + 52)) = [6]uintptr{ts + 7993, ts + 7998, ts + 8003, ts + 6184,
-				ts + 6179, ts + 8011}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 52)) = [6]uintptr{ts + 8012, ts + 8017, ts + 8022, ts + 6203,
+				ts + 6198, ts + 8030}
 			var aff uint8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
@@ -59987,7 +60006,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 8019
+						return ts + 8038
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 52 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*4))
 				}())
@@ -60002,6 +60021,7 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 	var p uintptr
 	var v uintptr
 	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+		var exprAff U8
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -60015,6 +60035,14 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 		if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr, iDataCur) != 0 {
 			continue
 		}
+
+		exprAff = Xsqlite3ExprAffinity(tls, pExpr)
+		if int32(exprAff) <= SQLITE_AFF_BLOB && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_BLOB ||
+			int32(exprAff) == SQLITE_AFF_TEXT && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_TEXT ||
+			int32(exprAff) >= SQLITE_AFF_NUMERIC && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_NUMERIC {
+			continue
+		}
+
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 
 		if (*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow != 0 {
@@ -60354,7 +60382,7 @@ __73:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
 		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7963,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7982,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
 __76:
@@ -60587,7 +60615,7 @@ __43:
 		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+8024, libc.VaList(bp+8, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8043, libc.VaList(bp+8, pExpr))
 	goto __91
 __90:
 	return func() int32 {
@@ -60628,7 +60656,7 @@ __93:
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
 		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8051, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8070, libc.VaList(bp+16, pExpr))
 	goto __5
 __94:
 	;
@@ -60788,7 +60816,7 @@ __121:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
 		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7645,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7653,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
 __122:
 	;
@@ -60810,11 +60838,10 @@ __49:
 	return target
 
 __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) {
+	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) {
 		goto __123
 	}
+
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
 		goto __125
@@ -60854,7 +60881,7 @@ __126:
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 	goto __5
 
 __55:
@@ -60885,13 +60912,19 @@ __129:
 	;
 __127:
 	;
-	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
+	addrINR = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable, 0, target)
 
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = U8(0)
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = okConstFactor
+	if !(inReg != target) {
+		goto __130
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
+	inReg = target
+__130:
+	;
 	Xsqlite3VdbeJumpHere(tls, v, addrINR)
-	Xsqlite3VdbeChangeP3(tls, v, addrINR, inReg)
 	goto __5
 
 __56:
@@ -60904,15 +60937,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __130
+		goto __131
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __131
+		goto __132
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__131:
+__132:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -60922,22 +60955,22 @@ __131:
 	pTest = bp + 100
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__130:
+__131:
 	;
 	i1 = 0
-__132:
+__133:
 	if !(i1 < nExpr-1) {
-		goto __134
+		goto __135
 	}
 	if !(pX != 0) {
-		goto __135
+		goto __136
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 100)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
-	goto __136
-__135:
-	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
+	goto __137
 __136:
+	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
+__137:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -60946,21 +60979,21 @@ __136:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*20)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __133
-__133:
-	i1 = i1 + 2
-	goto __132
 	goto __134
 __134:
+	i1 = i1 + 2
+	goto __133
+	goto __135
+__135:
 	;
 	if !(nExpr&1 != 0) {
-		goto __137
+		goto __138
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*20)).FpExpr, target)
-	goto __138
-__137:
-	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+	goto __139
 __138:
+	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+__139:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -60970,27 +61003,27 @@ __138:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __139
-	}
-	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8075, 0)
-	return 0
-__139:
-	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __140
 	}
-	Xsqlite3MayAbort(tls, pParse)
+	Xsqlite3ErrorMsg(tls, pParse,
+		ts+8094, 0)
+	return 0
 __140:
 	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __141
 	}
+	Xsqlite3MayAbort(tls, pParse)
+__141:
+	;
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+		goto __142
+	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __142
-__141:
+	goto __143
+__142:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -60999,7 +61032,7 @@ __141:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__142:
+__143:
 	;
 	goto __5
 
@@ -61010,7 +61043,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[10]uint8)(unsafe.Pointer(ts + 8125))
+var zAff = *(*[10]uint8)(unsafe.Pointer(ts + 8144))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -62802,11 +62835,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+6374, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6393, 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+8135, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8154, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -62818,13 +62851,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8163,
+		ts+8182,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8338,
+			ts+8357,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -62834,10 +62867,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8512, libc.VaList(bp, zDb, zDb))
+		ts+8531, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8659, 0)
+			ts+8678, 0)
 	}
 }
 
@@ -62901,7 +62934,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8810, libc.VaList(bp, zName))
+		ts+8829, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -62911,7 +62944,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8869, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8888, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -62920,7 +62953,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8875, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8894, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -62961,19 +62994,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8902, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8921, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9086,
+		ts+9105,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9391, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9410, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9407,
+		ts+9426,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -62981,7 +63014,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9465, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9484, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -62993,7 +63026,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9730, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9749, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63005,7 +63038,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9743,
+		ts+9762,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -63051,12 +63084,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9781, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9800, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9813, 0)
+			ts+9832, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -63066,11 +63099,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+9840)
+				ts+9859)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9899)
+				ts+9918)
 		}
 
 		if pDflt != 0 {
@@ -63083,12 +63116,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9952)
+					ts+9971)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9998)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10017)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -63099,7 +63132,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10025,
+			ts+10044,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 44)), zCol, *(*int32)(unsafe.Pointer(pNew + 44)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -63121,7 +63154,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+10171,
+				ts+10190,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -63169,14 +63202,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10401, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10420, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10435, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10454, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -63204,7 +63237,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+10465, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10484, 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
 	}
@@ -63244,18 +63277,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 + 10484
+		zType = ts + 10503
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10489
+		zType = ts + 10508
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10503,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10522,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10521
+					return ts + 10540
 				}
-				return ts + 10538
+				return ts + 10557
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -63339,11 +63372,11 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10556, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10575, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1547, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1566, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iSchema == 1))
 
 	Xsqlite3MayAbort(tls, pParse)
@@ -63356,17 +63389,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10577,
+		ts+10596,
 		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+10759,
+		ts+10778,
 		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+9730, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9749, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63624,12 +63657,12 @@ 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+10890,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10909,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*uint8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10913
+				return ts + 10932
 			}
-			return ts + 1547
+			return ts + 1566
 		}(), zWhen,
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg))
 	Xsqlite3_result_error(tls, pCtx, zErr, -1)
@@ -63669,8 +63702,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+10915, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 113494)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10934, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113516)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -63687,7 +63720,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, 113505)
+		rc = Xsqlite3CorruptError(tls, 113527)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -63709,7 +63742,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+10923, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10942, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -63749,12 +63782,12 @@ 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+10929, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10948, 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 + 10913
+							return ts + 10932
 						}
-						return ts + 1547
+						return ts + 1566
 					}()))
 				zReplace = zBuf2
 				nReplace = U32(Xsqlite3Strlen30(tls, zReplace))
@@ -64240,7 +64273,7 @@ __45:
 	if !((*Parse)(unsafe.Pointer(bp+20)).FzErrMsg != 0) {
 		goto __47
 	}
-	renameColumnParseError(tls, context, ts+1547, *(*uintptr)(unsafe.Pointer(argv + 1*4)), *(*uintptr)(unsafe.Pointer(argv + 2*4)), bp+20)
+	renameColumnParseError(tls, context, ts+1566, *(*uintptr)(unsafe.Pointer(argv + 1*4)), *(*uintptr)(unsafe.Pointer(argv + 2*4)), bp+20)
 	goto __48
 __47:
 	Xsqlite3_result_error_code(tls, context, rc)
@@ -64405,7 +64438,7 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 			if rc == SQLITE_ERROR && Xsqlite3WritableSchema(tls, db) != 0 {
 				Xsqlite3_result_value(tls, context, *(*uintptr)(unsafe.Pointer(argv + 3*4)))
 			} else if (*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0 {
-				renameColumnParseError(tls, context, ts+1547, *(*uintptr)(unsafe.Pointer(argv + 1*4)), *(*uintptr)(unsafe.Pointer(argv + 2*4)), bp+48)
+				renameColumnParseError(tls, context, ts+1566, *(*uintptr)(unsafe.Pointer(argv + 1*4)), *(*uintptr)(unsafe.Pointer(argv + 2*4)), bp+48)
 			} else {
 				Xsqlite3_result_error_code(tls, context, rc)
 			}
@@ -64608,7 +64641,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 114441)
+	rc = Xsqlite3CorruptError(tls, 114463)
 	goto drop_column_done
 __2:
 	;
@@ -64632,7 +64665,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10934, libc.VaList(bp, (int32((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int32(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10953, 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)
 
@@ -64713,19 +64746,19 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10556, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10575, 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+10941,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10960,
 		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 + 10969
+				return ts + 10988
 			}
-			return ts + 6120
+			return ts + 6139
 		}(),
 			zCol))
 	goto exit_drop_column
@@ -64734,7 +64767,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10981, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11000, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -64748,13 +64781,13 @@ __8:
 	goto exit_drop_column
 __9:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1547, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1566, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11029, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11048, 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+11150, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11169, 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
@@ -64872,11 +64905,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 + 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}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11187},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11208},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11228},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11247},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11266}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -64910,7 +64943,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+11270, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11289, 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)
 			}
@@ -64919,10 +64952,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+11293,
+					ts+11312,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11323, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11342, 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)
 			}
@@ -64940,9 +64973,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11341, FzCols: ts + 11354},
-	{FzName: ts + 11367, FzCols: ts + 11380},
-	{FzName: ts + 11408},
+	{FzName: ts + 11360, FzCols: ts + 11373},
+	{FzName: ts + 11386, FzCols: ts + 11399},
+	{FzName: ts + 11427},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65134,7 +65167,7 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11421}
+	FzName:     ts + 11440}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
@@ -65385,7 +65418,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11431}
+	FzName:     ts + 11450}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(72)
@@ -65399,7 +65432,7 @@ 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+11441,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11460,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
 					return (*StatAccum)(unsafe.Pointer(p)).FnEst
@@ -65412,7 +65445,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11446, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11465, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -65454,7 +65487,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+11452, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
+			Xsqlite3_str_appendf(tls, bp+48, ts+11471, 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--
@@ -65468,7 +65501,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11458}
+	FzName:     ts + 11477}
 
 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)
@@ -65512,7 +65545,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+11467, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11486, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -65529,7 +65562,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+11341, uint32(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11360, 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)
@@ -65685,7 +65718,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+11477, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11496, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -65742,7 +65775,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+11477, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11496, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -65789,9 +65822,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+11481)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11500)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11485)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11504)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -65874,7 +65907,7 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 	var v TRowcnt
 
 	if z == uintptr(0) {
-		z = ts + 1547
+		z = ts + 1566
 	}
 	for i = 0; *(*uint8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
 		v = uint64(0)
@@ -65896,15 +65929,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+11489, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11508, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11500, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11519, 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+11510, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11529, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(1), 6, 0x40)
 			}
 			for int32(*(*uint8)(unsafe.Pointer(z))) != 0 && int32(*(*uint8)(unsafe.Pointer(z))) != ' ' {
@@ -66180,11 +66213,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+11367, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11386, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11522,
-			ts+11576,
+			ts+11541,
+			ts+11595,
 			zDb)
 	}
 	return rc
@@ -66231,10 +66264,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+11341, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11360, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11628, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11647, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -66292,7 +66325,7 @@ 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+6434, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6453, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -66325,13 +66358,13 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zFile == uintptr(0)) {
 		goto __1
 	}
-	zFile = ts + 1547
+	zFile = ts + 1566
 __1:
 	;
 	if !(zName == uintptr(0)) {
 		goto __2
 	}
-	zName = ts + 1547
+	zName = ts + 1566
 __2:
 	;
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(db + 172 + 8))&0x4>>2)) != 0) {
@@ -66339,14 +66372,14 @@ __2:
 	}
 
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3828)
+	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3847)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11669, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11688, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
 	if !(rc == SQLITE_OK) {
 		goto __6
 	}
@@ -66383,7 +66416,7 @@ __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 120 + 7*4))+2) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11672,
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11691,
 		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 120 + 7*4))))
 	goto attach_error
 __11:
@@ -66397,7 +66430,7 @@ __12:
 	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __15
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11709, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11728, libc.VaList(bp+8, zName))
 	goto attach_error
 __15:
 	;
@@ -66461,7 +66494,7 @@ __4:
 		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11739, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11758, 0)
 	goto __23
 __22:
 	if !(rc == SQLITE_OK) {
@@ -66478,7 +66511,7 @@ __25:
 		goto __27
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db,
-		ts+11768, 0)
+		ts+11787, 0)
 	rc = SQLITE_ERROR
 __27:
 	;
@@ -66544,13 +66577,13 @@ __33:
 	}
 	Xsqlite3OomFault(tls, db)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 44)))
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+1483, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+1502, 0)
 	goto __35
 __34:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 44)) == uintptr(0)) {
 		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11836, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11855, libc.VaList(bp+16, zFile))
 __36:
 	;
 __35:
@@ -66597,7 +66630,7 @@ func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zName == uintptr(0)) {
 		goto __1
 	}
-	zName = ts + 1547
+	zName = ts + 1566
 __1:
 	;
 	i = 0
@@ -66628,14 +66661,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11864, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11883, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11885, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11904, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -66643,7 +66676,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11911, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11930, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -66760,7 +66793,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11933}
+	FzName:     ts + 11952}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -66773,7 +66806,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11947}
+	FzName:     ts + 11966}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -66787,7 +66820,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+11961, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11980, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -66819,7 +66852,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+11985,
+						ts+12004,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -66994,7 +67027,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+12031, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12050, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -67020,11 +67053,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+12054, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12073, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12060, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12079, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12066, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12085, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -67071,7 +67104,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 + 7706
+		zCol = ts + 7725
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -67095,7 +67128,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+12093, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12112, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -67366,25 +67399,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6434) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6453) == 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+6374, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6393, 7) == 0 {
 			if i == 1 {
-				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 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6439+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5895+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema+8,
-						ts+6382)
+						ts+6401)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6439+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*16)).FpSchema+8,
-						ts+5876)
+						ts+5895)
 				}
 			}
 		}
@@ -67405,12 +67438,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		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 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6393, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6439+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5895)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema+8,
-					ts+6382)
+					ts+6401)
 			}
 		}
 	}
@@ -67441,7 +67474,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+12108, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12127, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -67459,14 +67492,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 + 12116
+			zMsg = ts + 12135
 		} else {
-			zMsg = ts + 12129
+			zMsg = ts + 12148
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6638, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6657, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6667, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -67496,12 +67529,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+6374, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5876+7) == 0 {
-			return ts + 6420
+	if Xsqlite3_strnicmp(tls, zName, ts+6393, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5895+7) == 0 {
+			return ts + 6439
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6382+7) == 0 {
-			return ts + 6401
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6401+7) == 0 {
+			return ts + 6420
 		}
 	}
 	return zName
@@ -67859,7 +67892,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+5876)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5895)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -67885,7 +67918,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6434, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6453, zName) {
 				goto __3
 			}
 
@@ -67938,13 +67971,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+12143, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12162, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12160, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12179, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -67982,13 +68015,13 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 		if Xsqlite3_stricmp(tls, zType, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit))) != 0 ||
 			Xsqlite3_stricmp(tls, zName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 1*4))) != 0 ||
 			Xsqlite3_stricmp(tls, zTblName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 2*4))) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1547, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1566, 0)
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6374, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6393, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12180,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12199,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -68148,9 +68181,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 + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -68166,7 +68199,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12222, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12241, 0)
 	return
 __4:
 	;
@@ -68194,9 +68227,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10484
+			return ts + 10503
 		}
-		return ts + 8869
+		return ts + 8888
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -68212,9 +68245,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 + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -68245,12 +68278,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12263,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12282,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10484
+				return ts + 10503
 			}
-			return ts + 8869
+			return ts + 8888
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -68265,7 +68298,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12284, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12303, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -68352,7 +68385,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+12319, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12338, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -68376,7 +68409,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+12336, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12355, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -68396,7 +68429,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 + 12319
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12338
 	(*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)
@@ -68408,7 +68441,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+12319, pRet+8) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12338, pRet+8) ==
 		pRet+8 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -68442,7 +68475,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+12370, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12389, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -68450,13 +68483,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+12393, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(6)), ts+12412, 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+12400, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(9)), ts+12419, 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--
@@ -68493,7 +68526,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+12410, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12429, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -68657,10 +68690,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+12436,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12455,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12481, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12500, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint32(unsafe.Sizeof(Expr{})))
@@ -68691,7 +68724,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+12522, 0)
+			ts+12541, 0)
 	}
 }
 
@@ -68736,7 +68769,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12574, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12593, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -68825,7 +68858,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12615, 0)
+		ts+12634, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -68920,7 +68953,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12671, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12690, 0)
 	goto generated_done
 __2:
 	;
@@ -68933,13 +68966,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12714, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12733, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12722, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12741, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -68973,13 +69006,19 @@ __10:
 
 	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
 __11:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_RAISE) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = (*Column)(unsafe.Pointer(pCol)).Faffinity
+__12:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12729,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12748,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -69100,13 +69139,13 @@ __3:
 	;
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
-		zSep = ts + 1547
-		zSep2 = ts + 12760
-		zEnd = ts + 4950
+		zSep = ts + 1566
+		zSep2 = ts + 12779
+		zEnd = ts + 4969
 	} else {
-		zSep = ts + 12762
-		zSep2 = ts + 12766
-		zEnd = ts + 12771
+		zSep = ts + 12781
+		zSep2 = ts + 12785
+		zEnd = ts + 12790
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -69114,7 +69153,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12774, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12793, 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('(')
@@ -69148,17 +69187,17 @@ __5:
 	goto __6
 __6:
 	;
-	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3656, libc.VaList(bp, zEnd))
+	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3675, libc.VaList(bp, zEnd))
 	return zStmt
 }
 
 var azType1 = [6]uintptr{
-	ts + 1547,
-	ts + 12788,
-	ts + 12794,
-	ts + 12799,
-	ts + 12804,
-	ts + 12794,
+	ts + 1566,
+	ts + 12807,
+	ts + 12813,
+	ts + 12818,
+	ts + 12823,
+	ts + 12813,
 }
 
 func resizeIndexObject(tls *libc.TLS, db uintptr, pIdx uintptr, N int32) int32 {
@@ -69548,7 +69587,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
 		if pSelect != 0 || !(int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM) && (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1547, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1566, 0)
 			return
 		}
 		(*Table)(unsafe.Pointer(p)).Ftnum = (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum
@@ -69565,10 +69604,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+12810,
-						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1547)))
+						ts+12829,
+						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1566)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12843,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12862,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -69587,11 +69626,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+12870, 0)
+				ts+12889, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12920, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12939, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 28)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -69625,7 +69664,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12952, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12971, 0)
 			return
 		}
 	}
@@ -69650,11 +69689,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 + 8869
-			zType2 = ts + 12996
+			zType = ts + 8888
+			zType2 = ts + 13015
 		} else {
-			zType = ts + 10484
-			zType2 = ts + 13002
+			zType = ts + 10503
+			zType2 = ts + 13021
 		}
 
 		if pSelect != 0 {
@@ -69725,11 +69764,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+13007, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13026, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13022,
+			ts+13041,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -69745,13 +69784,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+13120,
+					ts+13139,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13162, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13181, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -69766,7 +69805,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+9391) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9410) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -69796,7 +69835,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+13196, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13215, 0)
 	goto create_view_fail
 __1:
 	;
@@ -69812,7 +69851,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+4, pParse, iDb, ts+10484, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+4, pParse, iDb, ts+10503, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+4, pSelect) != 0) {
 		goto __3
 	}
@@ -69894,7 +69933,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13232, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13251, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -70019,13 +70058,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+13262, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13281, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13277,
+		ts+13296,
 		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)
 }
@@ -70066,10 +70105,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+13344, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]uint8{})), bp+40, ts+13363, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11293,
+				ts+11312,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -70101,12 +70140,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+13358,
+			ts+13377,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13403,
+		ts+13422,
 		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)
@@ -70134,11 +70173,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+6374, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3279, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6393, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3298, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7126, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7134, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -70216,9 +70255,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 	zArg2 = uintptr(0)
@@ -70277,21 +70316,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13470, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13489, 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+13498, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13517, 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+13532, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13551, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -70303,7 +70342,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11485, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11504, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -70367,7 +70406,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13564,
+		ts+13583,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*16)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -70379,7 +70418,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13627, 0)
+		ts+13646, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -70464,7 +70503,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13721,
+		ts+13740,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*20)).FzEName))
 	goto fk_end
 __23:
@@ -70691,12 +70730,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+13767,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13786,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13795
+							return ts + 13814
 						}
-						return ts + 13801
+						return ts + 13820
 					}()))
 				return 1
 			}
@@ -70817,7 +70856,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+132, pParse, iDb, ts+13806, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+132, pParse, iDb, ts+13825, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+132, pTblName) != 0) {
 		goto __10
 	}
@@ -70836,7 +70875,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13812,
+		ts+13831,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -70862,26 +70901,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6393, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13862, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13881, 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+13890, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13909, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13915, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13934, 0)
 	goto exit_create_index
 __17:
 	;
@@ -70895,7 +70934,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13806, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13825, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -70910,7 +70949,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13949, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13968, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -70922,7 +70961,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13983, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14002, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -70951,7 +70990,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14007, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14026, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -70972,9 +71011,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -71013,7 +71052,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13806)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13825)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -71114,7 +71153,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14030, 0)
+		ts+14049, 0)
 	goto exit_create_index
 __56:
 	;
@@ -71331,7 +71370,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14091, libc.VaList(bp+48, 0))
+		ts+14110, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -71383,8 +71422,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14133, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14152, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121859)
 	goto exit_create_index
 __101:
 	;
@@ -71430,12 +71469,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14150,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14169,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
-				return ts + 1547
+				return ts + 1566
 			}
-			return ts + 14170
+			return ts + 14189
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -71443,7 +71482,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14178,
+		ts+14197,
 		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,
@@ -71457,7 +71496,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14237, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14256, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -71618,7 +71657,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14264, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14283, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -71633,7 +71672,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14282, libc.VaList(bp+8, 0))
+		ts+14301, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -71644,9 +71683,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 + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -71672,9 +71711,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14355,
+		ts+14374,
 		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+11481, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11500, (*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)
@@ -71809,7 +71848,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+14415,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14434,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -72017,12 +72056,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+14451,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14470,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14487
+				return ts + 14506
 			}
-			return ts + 14490
+			return ts + 14509
 		}()))
 	goto append_from_error
 __1:
@@ -72191,7 +72230,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14496, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14515, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -72227,9 +72266,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14502
+				return ts + 14521
 			}
-			return ts + 14511
+			return ts + 14530
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -72254,7 +72293,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14496, ts + 14518, ts + 14502}
+var az = [3]uintptr{ts + 14515, ts + 14537, ts + 14521}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -72269,7 +72308,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+14526, 0)
+				ts+14545, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -72406,17 +72445,17 @@ 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+14596, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14615, 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+14607, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14626, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
-			Xsqlite3_str_append(tls, bp+8, ts+1560, 1)
+			Xsqlite3_str_append(tls, bp+8, ts+1579, 1)
 			Xsqlite3_str_appendall(tls, bp+8, zCol)
 		}
 	}
@@ -72439,11 +72478,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+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12073, 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+14610, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14629, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -72573,7 +72612,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14619, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14638, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -72669,7 +72708,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+14665, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14684, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -72862,7 +72901,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14695, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14714, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -73142,7 +73181,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+14726,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14745,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -73174,11 +73213,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+14759, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14778, 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+14788, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14807, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -73429,7 +73468,7 @@ __20:
 	goto __16
 __15:
 	wcf = U16(WHERE_ONEPASS_DESIRED | WHERE_DUPLICATES_OK)
-	if !((*NameContext)(unsafe.Pointer(bp+8)).FncFlags&NC_VarSelect != 0) {
+	if !((*NameContext)(unsafe.Pointer(bp+8)).FncFlags&NC_Subquery != 0) {
 		goto __23
 	}
 	bComplex = 1
@@ -73682,7 +73721,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14826)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14845)
 __62:
 	;
 delete_from_cleanup:
@@ -73797,7 +73836,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+11341) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11360) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -74027,7 +74066,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 + 7998, ts + 7993, ts + 6174}
+var azType2 = [5]uintptr{ts + 6203, ts + 6198, ts + 8017, ts + 8012, ts + 6193}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -74086,7 +74125,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+14839, -1)
+					Xsqlite3_result_error(tls, context, ts+14858, -1)
 					return
 				}
 				iVal = -iVal
@@ -74390,7 +74429,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14856, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14875, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -74736,7 +74775,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+14861, -1)
+		Xsqlite3_result_error(tls, context, ts+14880, -1)
 		return
 	}
 	if argc == 3 {
@@ -74746,7 +74785,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+14894, -1)
+				ts+14913, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -74799,7 +74838,7 @@ func errlogFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	_ = argc
 	_ = context
-	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3656, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4)))))
+	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3675, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4)))))
 }
 
 func compileoptionusedFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
@@ -74839,13 +74878,13 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 
 			var zVal uintptr
 			r1 = Xsqlite3_value_double(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+4918, libc.VaList(bp, r1))
+			Xsqlite3_str_appendf(tls, pStr, ts+4937, libc.VaList(bp, r1))
 			zVal = Xsqlite3_str_value(tls, pStr)
 			if zVal != 0 {
 				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+14939, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14958, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -74853,7 +74892,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 		}
 	case SQLITE_INTEGER:
 		{
-			Xsqlite3_str_appendf(tls, pStr, ts+1327, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
+			Xsqlite3_str_appendf(tls, pStr, ts+1346, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
 			break
 
 		}
@@ -74882,13 +74921,13 @@ 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+14946, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14965, libc.VaList(bp+24, zArg))
 			break
 
 		}
 	default:
 		{
-			Xsqlite3_str_append(tls, pStr, ts+1548, 4)
+			Xsqlite3_str_append(tls, pStr, ts+1567, 4)
 			break
 
 		}
@@ -75029,7 +75068,7 @@ func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 	var ch U32
 	var c U8
 	var d U8
-	zPass = ts + 1547
+	zPass = ts + 1566
 	nPass = 0
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -75311,7 +75350,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10913}
+var azOne = [1]uintptr{ts + 10932}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -75323,7 +75362,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	zIn = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	if zIn == uintptr(0) {
-		zIn = ts + 1547
+		zIn = ts + 1566
 	}
 	for i = 0; *(*U8)(unsafe.Pointer(zIn + uintptr(i))) != 0 && !(int32(Xsqlite3CtypeMap[*(*U8)(unsafe.Pointer(zIn + uintptr(i)))])&0x02 != 0); i++ {
 	}
@@ -75347,7 +75386,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+14949, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14968, 4, uintptr(0))
 	}
 }
 
@@ -75372,7 +75411,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+12093, -1)
+		Xsqlite3_result_error(tls, context, ts+12112, -1)
 		return
 	}
 
@@ -75450,7 +75489,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+14839, -1)
+			Xsqlite3_result_error(tls, context, ts+14858, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -75712,7 +75751,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+14954, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14973, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -75732,14 +75771,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14960, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14979, 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+14960, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14979, 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+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)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14979, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14979, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -75980,109 +76019,109 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 }
 
 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 + 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(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(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 + 14984},
+	{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 + 15004},
+	{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 + 15017},
+	{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 + 15035},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15044},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15052},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15052},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15067},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15093},
+	{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 + 15118},
+	{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 + 15127},
+	{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 + 15138},
+	{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 + 15145},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15159},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15159},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15165},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15165},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15171},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15171},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15176},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15176},
+	{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 + 15176},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15180},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FzName: ts + 15180},
+	{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 + 15180},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15184},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15191},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15199},
+	{FnArg: int8(2), 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 + 15212},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15219},
+	{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 + 15234},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15239},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15243},
+	{FnArg: int8(2), 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 + 15255},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15261},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15265},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15265},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15271},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15278},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15285},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15296},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15303},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15318},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15335},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15346},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15352},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15370},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15378},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15392},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15400},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15409},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15409},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{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 + 15426},
+	{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 + 15430},
+	{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 + 15436},
+	{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 + 15440},
+	{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 + 15440},
+	{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 + 15446},
+	{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 + 15446},
+	{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 + 15459},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14979},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14979},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6598},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6598},
 	{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 + 15516},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15469},
+	{FnArg: int8(1), 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 + 15483},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15489},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15492},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15496},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15502},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15492},
+	{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 + 15511},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15515},
 	{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 + 15525},
+	{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 + 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 + 15549},
+	{FnArg: int8(2), 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 + 15546},
+	{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 + 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 + 15558},
+	{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 + 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 + 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}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15591},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15596},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15604},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15612},
+	{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_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6598},
+	{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 + 15620}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -76203,7 +76242,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+15605,
+				ts+15624,
 				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)
@@ -76863,8 +76902,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 + 6445, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 32)) = Token{Fz: ts + 6441, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 24)) = Token{Fz: ts + 6464, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 32)) = Token{Fz: ts + 6460, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -76943,7 +76982,7 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 			(*Token)(unsafe.Pointer(bp + 40)).Fz = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 			(*Token)(unsafe.Pointer(bp + 40)).Fn = uint32(Xsqlite3Strlen30(tls, (*Token)(unsafe.Pointer(bp+40)).Fz))
 
-			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5129)
+			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5148)
 			if pRaise != 0 {
 				(*Expr)(unsafe.Pointer(pRaise)).FaffExpr = uint8(OE_Abort)
 			}
@@ -77364,7 +77403,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7963, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7982, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -77832,7 +77871,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15650,
+		ts+15669,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*16)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -77857,7 +77896,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15691,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15710,
 		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
@@ -78006,7 +78045,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15723,
+		ts+15742,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -78016,7 +78055,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15775, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15794, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -78068,7 +78107,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15800,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15819,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -78076,7 +78115,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15846, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15865, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -78488,7 +78527,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15867)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15886)
 __125:
 	;
 insert_cleanup:
@@ -78803,7 +78842,7 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 					fallthrough
 				case OE_Fail:
 					{
-						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12073, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 							(*Column)(unsafe.Pointer(pCol)).FzCnName))
 
 						Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
@@ -79894,13 +79933,13 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131895)
+	return Xsqlite3MisuseError(tls, 131931)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
 		goto __2
 	}
-	zSql = ts + 1547
+	zSql = ts + 1566
 __2:
 	;
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -80379,7 +80418,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12093, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12112, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -80388,7 +80427,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15881
+		zEntry = ts + 15900
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -80403,7 +80442,7 @@ __5:
 	if !(ii < int32(uint32(unsafe.Sizeof(azEndings))/uint32(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+12054, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12073, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -80439,7 +80478,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15904, uint32(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15923, uint32(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*uint8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -80453,7 +80492,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15913, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15932, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -80477,7 +80516,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15917, uint32(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15936, uint32(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -80495,7 +80534,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15923, libc.VaList(bp+16, zEntry, zFile))
+		ts+15942, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -80522,7 +80561,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15966, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15985, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -80560,7 +80599,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15998, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16017, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -80570,7 +80609,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16035,
+	ts + 16054,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80725,7 +80764,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+16038, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16057, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -80733,63 +80772,63 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 }
 
 var pragCName = [57]uintptr{
-	ts + 5050,
-	ts + 16077,
-	ts + 8869,
-	ts + 16081,
-	ts + 16086,
-	ts + 16089,
-	ts + 16099,
-	ts + 16109,
-	ts + 16115,
-	ts + 16119,
-	ts + 16124,
-	ts + 16129,
-	ts + 16137,
+	ts + 5069,
+	ts + 16096,
+	ts + 8888,
+	ts + 16100,
+	ts + 16105,
+	ts + 16108,
+	ts + 16118,
+	ts + 16128,
+	ts + 16134,
+	ts + 16138,
+	ts + 16143,
 	ts + 16148,
-	ts + 16151,
-	ts + 16158,
-	ts + 16119,
-	ts + 16124,
-	ts + 16165,
+	ts + 16156,
+	ts + 16167,
 	ts + 16170,
-	ts + 16173,
-	ts + 16180,
-	ts + 16115,
-	ts + 16119,
-	ts + 16186,
-	ts + 16191,
-	ts + 16196,
-	ts + 16119,
-	ts + 16200,
-	ts + 16124,
-	ts + 16208,
-	ts + 16212,
-	ts + 16217,
-	ts + 11485,
-	ts + 11481,
-	ts + 16223,
-	ts + 16228,
-	ts + 16233,
-	ts + 16077,
-	ts + 16119,
-	ts + 16238,
-	ts + 16245,
+	ts + 16177,
+	ts + 16138,
+	ts + 16143,
+	ts + 16184,
+	ts + 16189,
+	ts + 16192,
+	ts + 16199,
+	ts + 16134,
+	ts + 16138,
+	ts + 16205,
+	ts + 16210,
+	ts + 16215,
+	ts + 16138,
+	ts + 16219,
+	ts + 16143,
+	ts + 16227,
+	ts + 16231,
+	ts + 16236,
+	ts + 11504,
+	ts + 11500,
+	ts + 16242,
+	ts + 16247,
 	ts + 16252,
-	ts + 8869,
-	ts + 16260,
-	ts + 5053,
-	ts + 16266,
-	ts + 16077,
-	ts + 16119,
+	ts + 16096,
+	ts + 16138,
+	ts + 16257,
+	ts + 16264,
 	ts + 16271,
-	ts + 16276,
-	ts + 15473,
-	ts + 16281,
-	ts + 16294,
-	ts + 16303,
-	ts + 16310,
-	ts + 16321,
+	ts + 8888,
+	ts + 16279,
+	ts + 5072,
+	ts + 16285,
+	ts + 16096,
+	ts + 16138,
+	ts + 16290,
+	ts + 16295,
+	ts + 15492,
+	ts + 16300,
+	ts + 16313,
+	ts + 16322,
+	ts + 16329,
+	ts + 16340,
 }
 
 // Definitions of all built-in pragmas
@@ -80806,238 +80845,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16329,
+	{FzName: ts + 16348,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16344,
+	{FzName: ts + 16363,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16359,
+	{FzName: ts + 16378,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16371,
+	{FzName: ts + 16390,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16387,
+	{FzName: ts + 16406,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16310,
+	{FzName: ts + 16329,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16400,
+	{FzName: ts + 16419,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16412,
+	{FzName: ts + 16431,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16432,
+	{FzName: ts + 16451,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CellSizeCk)},
-	{FzName: ts + 16448,
+	{FzName: ts + 16467,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16469,
+	{FzName: ts + 16488,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16484,
+	{FzName: ts + 16503,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16500,
+	{FzName: ts + 16519,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16514,
+	{FzName: ts + 16533,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16527,
+	{FzName: ts + 16546,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16541,
+	{FzName: ts + 16560,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16560,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_DeferFKs)},
 	{FzName: ts + 16579,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_DeferFKs)},
+	{FzName: ts + 16598,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16602,
+	{FzName: ts + 16621,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16611,
+	{FzName: ts + 16630,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16629,
+	{FzName: ts + 16648,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16646,
+	{FzName: ts + 16665,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16659,
+	{FzName: ts + 16678,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16674,
+	{FzName: ts + 16693,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16692,
+	{FzName: ts + 16711,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16702,
+	{FzName: ts + 16721,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16716,
+	{FzName: ts + 16735,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16732,
+	{FzName: ts + 16751,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16757,
+	{FzName: ts + 16776,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16776,
+	{FzName: ts + 16795,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16787,
+	{FzName: ts + 16806,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16798,
+	{FzName: ts + 16817,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16810,
+	{FzName: ts + 16829,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16826,
+	{FzName: ts + 16845,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16839,
+	{FzName: ts + 16858,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16858,
+	{FzName: ts + 16877,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16877,
+	{FzName: ts + 16896,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16890,
+	{FzName: ts + 16909,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16905,
+	{FzName: ts + 16924,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16915,
+	{FzName: ts + 16934,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16927,
+	{FzName: ts + 16946,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16936,
+	{FzName: ts + 16955,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16947,
+	{FzName: ts + 16966,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16957,
+	{FzName: ts + 16976,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16969,
+	{FzName: ts + 16988,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16980,
+	{FzName: ts + 16999,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16992,
+	{FzName: ts + 17011,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17009,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_RecTriggers)},
 	{FzName: ts + 17028,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_RecTriggers)},
+	{FzName: ts + 17047,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17054,
+	{FzName: ts + 17073,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17069,
+	{FzName: ts + 17088,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17083,
+	{FzName: ts + 17102,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17102,
+	{FzName: ts + 17121,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17116,
+	{FzName: ts + 17135,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17132,
+	{FzName: ts + 17151,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17144,
+	{FzName: ts + 17163,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17155,
+	{FzName: ts + 17174,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17166,
+	{FzName: ts + 17185,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17178,
+	{FzName: ts + 17197,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17189,
+	{FzName: ts + 17208,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17210,
+	{FzName: ts + 17229,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17218,
+	{FzName: ts + 17237,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17233,
+	{FzName: ts + 17252,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17246,
-		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
 	{FzName: ts + 17265,
+		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
+	{FzName: ts + 17284,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17280,
+	{FzName: ts + 17299,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -81059,7 +81098,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17296))
+var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17315))
 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)}
@@ -81071,10 +81110,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+17321) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17340) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17331) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17350) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -81083,13 +81122,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+8019) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8038) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17357) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17343) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17362) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -81104,9 +81143,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+16271) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16290) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17355) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17374) == 0 {
 		return 2
 	} else {
 		return 0
@@ -81120,7 +81159,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+17362, 0)
+				ts+17381, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpBt)
@@ -81211,19 +81250,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17424
+		zName = ts + 17443
 		break
 	case OE_SetDflt:
-		zName = ts + 17433
+		zName = ts + 17452
 		break
 	case OE_Cascade:
-		zName = ts + 17445
+		zName = ts + 17464
 		break
 	case OE_Restrict:
-		zName = ts + 17453
+		zName = ts + 17472
 		break
 	default:
-		zName = ts + 17462
+		zName = ts + 17481
 		break
 	}
 	return zName
@@ -81240,7 +81279,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17472, ts + 17479, ts + 17487, ts + 17491, ts + 17355, ts + 17500,
+	ts + 17491, ts + 17498, ts + 17506, ts + 17510, ts + 17374, ts + 17519,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -81287,13 +81326,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17504
+			zType = ts + 17523
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17506
+			zType = ts + 17525
 		} else {
-			zType = ts + 7521
+			zType = ts + 7529
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17508,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17527,
 			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),
@@ -81301,7 +81340,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17515, ts + 17520, ts + 17528}
+var azEnc = [4]uintptr{uintptr(0), ts + 17534, ts + 17539, ts + 17547}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -81452,6 +81491,7 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp7 int32
 	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
@@ -81548,7 +81588,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17536, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17555, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -81587,7 +81627,7 @@ __8:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 484)) != 0) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 484))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 484))))
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 484)))
 __10:
 	;
@@ -81809,7 +81849,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17540) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17559) == 0) {
 		goto __64
 	}
 	b = 2
@@ -81881,7 +81921,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17331
+	zRet = ts + 17350
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -81919,7 +81959,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17321
+	zRet = ts + 17340
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -82206,7 +82246,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 536)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17545, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17564, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -82225,7 +82265,7 @@ __127:
 	if !(*(*uint8)(unsafe.Pointer(zRight)) != 0) {
 		goto __128
 	}
-	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+16, zRight))
+	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+16, zRight))
 	goto __129
 __128:
 	Xsqlite3_temp_directory = uintptr(0)
@@ -82247,7 +82287,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17570, 0)
+		ts+17589, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -82301,7 +82341,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17623) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17642) == 0) {
 		goto __142
 	}
 
@@ -82398,13 +82438,13 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17629
+			return ts + 17648
 		}
-		return ts + 17637
+		return ts + 17656
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
-			Xsqlite3ColumnType(tls, pCol, ts+1547),
+			Xsqlite3ColumnType(tls, pCol, ts+1566),
 			func() int32 {
 				if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf>>0)) != 0 {
 					return 1
@@ -82469,7 +82509,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17644, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17663, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -82482,7 +82522,7 @@ __172:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __173
 	}
-	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1483, 0)
+	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1502, 0)
 	(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 __173:
 	;
@@ -82515,29 +82555,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10484
+	zType = ts + 10503
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12714
+	zType = ts + 12733
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17660
+	zType = ts + 17679
 	goto __183
 __182:
-	zType = ts + 8869
+	zType = ts + 8888
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17667,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17686,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*16)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -82603,7 +82643,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17693, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -82613,7 +82653,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17679,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17698,
 		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))))
@@ -82650,8 +82690,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 544)) = [3]uintptr{ts + 17684, ts + 17686, ts + 16148}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17688,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 544)) = [3]uintptr{ts + 17703, ts + 17705, ts + 16167}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17707,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -82684,7 +82724,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17694,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17713,
 		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)))
@@ -82706,7 +82746,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17698, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17717, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -82770,7 +82810,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7521, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7529, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -82786,7 +82826,7 @@ __218:
 	if !(i6 < int32(uint32(unsafe.Sizeof(aPragmaName))/uint32(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7521, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7529, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -82821,7 +82861,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17720,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -82829,7 +82869,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+17710))
+			ts+17729))
 	goto __227
 __227:
 	j2++
@@ -83018,7 +83058,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17715, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17734, 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)))
@@ -83235,7 +83275,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+17719, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*16)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17738, 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)
@@ -83346,7 +83386,7 @@ __307:
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17743,
+		ts+17762,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
@@ -83445,7 +83485,7 @@ __321:
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17779, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17798, 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) {
@@ -83467,7 +83507,7 @@ __326:
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17799,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17818,
 		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)
@@ -83480,7 +83520,7 @@ __329:
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17821,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17840,
 		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 __332
@@ -83498,11 +83538,11 @@ __331:
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 568)), j4, 3)
 __334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17844, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17863, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17846,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17865,
 		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)
 __333:
@@ -83548,7 +83588,7 @@ __339:
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17866,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17885,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
@@ -83582,89 +83622,103 @@ __344:
 
 	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+17896)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17915)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17901)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17920)
 	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)
 
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __345
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_IdxRowid, *(*int32)(unsafe.Pointer(bp + 572))+j4, 3)
+	jmp7 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 3, 0, r1+int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn)-1)
+
+	Xsqlite3VdbeLoadString(tls, v, 3,
+		ts+17941)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17977)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp7)
+__345:
+	;
 	label6 = 0
 	kk = 0
-__345:
+__346:
 	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) {
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*4)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
 		goto __349
 	}
-	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+	goto __347
 __349:
+	;
+	if !(label6 == 0) {
+		goto __350
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__350:
 	;
 	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:
+	kk++
+	goto __346
+	goto __348
+__348:
 	;
 	if !(label6 != 0) {
-		goto __350
+		goto __351
 	}
 	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
 	Xsqlite3VdbeResolveLabel(tls, v, label6)
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17896)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17915)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17922)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17988)
 	Xsqlite3VdbeGoto(tls, v, jmp5-1)
 	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-__350:
+__351:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __351
+		goto __352
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__352:
+__353:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __354
+		goto __355
 	}
 	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 __355
+		goto __356
 	}
-	goto __353
-__355:
+	goto __354
+__356:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
-	goto __353
-__353:
-	kk++
-	goto __352
 	goto __354
 __354:
+	kk++
+	goto __353
+	goto __355
+__355:
 	;
 	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)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18015)
 	Xsqlite3VdbeGoto(tls, v, jmp5)
 	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
-__351:
+__352:
 	;
 	Xsqlite3VdbeJumpHere(tls, v, jmp4)
 	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 580)))
@@ -83681,20 +83735,20 @@ __340:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 568)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __356
+		goto __357
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17976)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+18042)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__357:
+__358:
 	if !(pIdx5 != 0) {
-		goto __359
-	}
-	if !(pPk1 == pIdx5) {
 		goto __360
 	}
-	goto __358
-__360:
+	if !(pPk1 == pIdx5) {
+		goto __361
+	}
+	goto __359
+__361:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 572))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -83703,21 +83757,21 @@ __360:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __358
-__358:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __357
 	goto __359
 __359:
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
+	goto __358
+	goto __360
+__360:
 	;
 	if !(pPk1 != 0) {
-		goto __361
+		goto __362
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__361:
+__362:
 	;
-__356:
+__357:
 	;
 	goto __291
 __291:
@@ -83735,14 +83789,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(endCode))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __362
+		goto __363
 	}
 	(*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 + 18005
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*20 + 16)) = ts + 18071
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*20)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*20 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__362:
+__363:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -83750,27 +83804,27 @@ __362:
 
 __45:
 	if !!(zRight != 0) {
-		goto __363
+		goto __364
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __365
-	}
-	goto pragma_out
-__365:
-	;
-	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __364
-__363:
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
 		goto __366
 	}
+	goto pragma_out
+__366:
+	;
+	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
+	goto __365
+__364:
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
+		goto __367
+	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__367:
+__368:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __369
+		goto __370
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __370
+		goto __371
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -83779,25 +83833,25 @@ __367:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __369
-__370:
-	;
-	goto __368
-__368:
-	pEnc += 8
-	goto __367
-	goto __369
-__369:
-	;
-	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __371
-	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18008, libc.VaList(bp+456, zRight))
+	goto __370
 __371:
 	;
-__366:
+	goto __369
+__369:
+	pEnc += 8
+	goto __368
+	goto __370
+__370:
 	;
-__364:
+	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
+		goto __372
+	}
+	Xsqlite3ErrorMsg(tls, pParse, ts+18074, libc.VaList(bp+456, zRight))
+__372:
+	;
+__367:
+	;
+__365:
 	;
 	goto __15
 
@@ -83805,15 +83859,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 __372
+		goto __373
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(setCookie))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __374
+		goto __375
 	}
 	goto __15
-__374:
+__375:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fp1 = iDb
@@ -83821,41 +83875,41 @@ __374:
 	(*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 __375
+		goto __376
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fopcode = U8(OP_Noop)
-__375:
+__376:
 	;
-	goto __373
-__372:
+	goto __374
+__373:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(readCookie))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __376
+		goto __377
 	}
 	goto __15
-__376:
+__377:
 	;
 	(*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)
-__373:
+__374:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__377:
+__378:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __378
+		goto __379
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __377
-__378:
+	goto __378
+__379:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -83870,31 +83924,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __379
-	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17338) == 0) {
 		goto __380
 	}
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17357) == 0) {
+		goto __381
+	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __381
-__380:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18033) == 0) {
-		goto __382
+	goto __382
+__381:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18099) == 0) {
+		goto __383
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __383
-__382:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17491) == 0) {
-		goto __384
+	goto __384
+__383:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17510) == 0) {
+		goto __385
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
+__385:
+	;
 __384:
 	;
-__383:
+__382:
 	;
-__381:
-	;
-__379:
+__380:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -83904,10 +83958,10 @@ __379:
 
 __49:
 	if !(zRight != 0) {
-		goto __385
+		goto __386
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__385:
+__386:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -83927,19 +83981,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __386
+		goto __387
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __388
+		goto __389
 	}
 	goto __15
-__388:
+__389:
 	;
-	goto __387
-__386:
-	opMask = U32(0xfffe)
+	goto __388
 __387:
+	opMask = U32(0xfffe)
+__388:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -83948,86 +84002,86 @@ __387:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__389:
+__390:
 	if !(iDb <= iDbLast) {
-		goto __391
-	}
-	if !(iDb == 1) {
 		goto __392
 	}
-	goto __390
-__392:
+	if !(iDb == 1) {
+		goto __393
+	}
+	goto __391
+__393:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__393:
+__394:
 	if !(k4 != 0) {
-		goto __395
+		goto __396
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __396
+		goto __397
 	}
-	goto __394
-__396:
+	goto __395
+__397:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__397:
+__398:
 	if !(pIdx6 != 0) {
-		goto __399
-	}
-	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 56))&0x80>>7) != 0) {
 		goto __400
 	}
+	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 56))&0x80>>7) != 0) {
+		goto __401
+	}
 	szThreshold = int16(0)
-	goto __399
-__400:
+	goto __400
+__401:
 	;
-	goto __398
-__398:
-	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __397
 	goto __399
 __399:
+	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
+	goto __398
+	goto __400
+__400:
 	;
 	if !(szThreshold != 0) {
-		goto __401
+		goto __402
 	}
 	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))
 
-__401:
+__402:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18041,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18107,
 		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 __402
+		goto __403
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __403
-__402:
-	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+	goto __404
 __403:
+	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+__404:
 	;
-	goto __394
-__394:
-	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __393
 	goto __395
 __395:
+	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
+	goto __394
+	goto __396
+__396:
 	;
-	goto __390
-__390:
-	iDb++
-	goto __389
 	goto __391
 __391:
+	iDb++
+	goto __390
+	goto __392
+__392:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -84035,36 +84089,36 @@ __391:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __404
+		goto __405
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__404:
+__405:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+584) == SQLITE_OK) {
-		goto __405
+		goto __406
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 584)))
-__405:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+592) == SQLITE_OK) {
-		goto __406
+		goto __407
 	}
 	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 __407
+		goto __408
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 592)))
-__407:
+__408:
 	;
-__406:
+__407:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -84073,10 +84127,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+600) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 600)) >= int64(0)) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 600))&int64(0x7fffffff)))
-__408:
+__409:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -84085,10 +84139,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+608) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 608)) >= int64(0)) {
-		goto __409
+		goto __410
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 608)) & int64(0x7fffffff))
-__409:
+__410:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -84096,10 +84150,10 @@ __409:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __410
+		goto __411
 	}
 
-__410:
+__411:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -84151,14 +84205,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{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},
+	{FzName: ts + 18125, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18130, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18136, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18145, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18154, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18162, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18170},
+	{FzName: ts + 18177},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -84210,7 +84264,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+18117)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18183)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -84218,7 +84272,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18132, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18198, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = uint8(',')
 
 	}
@@ -84231,19 +84285,19 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18205, 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+18145)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18211)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18157)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18223)
 		j++
 	}
-	Xsqlite3_str_append(tls, bp+32, ts+4950, 1)
+	Xsqlite3_str_append(tls, bp+32, ts+4969, 1)
 	Xsqlite3StrAccumFinish(tls, bp+32)
 
 	rc = Xsqlite3_declare_vtab(tls, db, bp+56)
@@ -84259,7 +84313,7 @@ __3:
 			(*PragmaVtab)(unsafe.Pointer(pTab)).FnHidden = U8(j)
 		}
 	} else {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	}
 
 	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
@@ -84407,7 +84461,7 @@ __1:
 		var zText uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*4)))
 
 		if zText != 0 {
-			*(*uintptr)(unsafe.Pointer(pCsr + 16 + uintptr(j)*4)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, zText))
+			*(*uintptr)(unsafe.Pointer(pCsr + 16 + uintptr(j)*4)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, zText))
 			if *(*uintptr)(unsafe.Pointer(pCsr + 16 + uintptr(j)*4)) == uintptr(0) {
 				return SQLITE_NOMEM
 			}
@@ -84423,13 +84477,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+18172)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18238)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18180, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18246, 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+18184, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 16))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18250, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 16))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -84438,7 +84492,7 @@ __3:
 	rc = Xsqlite3_prepare_v2(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+4, uintptr(0))
 	Xsqlite3_free(tls, zSql)
 	if rc != SQLITE_OK {
-		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
+		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
 		return rc
 	}
 	return pragmaVtabNext(tls, pVtabCursor)
@@ -84506,33 +84560,33 @@ 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+18188, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*4)),
+			ts+18254, 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, 137196)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137249)
 	} else {
 		var z uintptr
 		var zObj uintptr
 		if *(*uintptr)(unsafe.Pointer(azObj + 1*4)) != 0 {
 			zObj = *(*uintptr)(unsafe.Pointer(azObj + 1*4))
 		} else {
-			zObj = ts + 5001
+			zObj = ts + 5020
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18216, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18282, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*uint8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18247, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18313, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137256)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18255,
-	ts + 18262,
-	ts + 18274,
+	ts + 18321,
+	ts + 18328,
+	ts + 18340,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -84592,7 +84646,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+14133)
+				corruptSchema(tls, pData, argv, ts+14152)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+172+8, uint32(0), 0, 0x1)
@@ -84624,13 +84678,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+18285)
+			corruptSchema(tls, pData, argv, ts+18351)
 		} 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+14133)
+				corruptSchema(tls, pData, argv, ts+14152)
 			}
 		}
 	}
@@ -84663,16 +84717,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 + 8869
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8888
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*4)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*4)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*4))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*4)) = ts + 7931
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*4)) = ts + 18298
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*4)) = ts + 7950
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*4)) = ts + 18364
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*4)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 40)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 40)).FiDb = iDb
@@ -84766,7 +84820,7 @@ __10:
 		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11768)
+		ts+11787)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __15:
@@ -84801,7 +84855,7 @@ __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)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18436)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __19:
@@ -84815,7 +84869,7 @@ __20:
 	(*InitData)(unsafe.Pointer(bp + 40)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18394,
+		ts+18460,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -85088,7 +85142,7 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
 	(*Parse)(unsafe.Pointer(pParse)).Fdb = db
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1483, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1502, 0)
 	}
 }
 
@@ -85116,7 +85170,7 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, bp+16, ts+1483, 0)
+	Xsqlite3ErrorMsg(tls, bp+16, ts+1502, 0)
 __1:
 	;
 	if !(prepFlags&U32(SQLITE_PREPARE_PERSISTENT) != 0) {
@@ -85147,7 +85201,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*16)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18428, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18494, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -85177,7 +85231,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18458, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18524, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -85237,7 +85291,7 @@ __21:
 	if !((*Parse)(unsafe.Pointer(bp+16)).FzErrMsg != 0) {
 		goto __22
 	}
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3656, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3675, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 	Xsqlite3DbFree(tls, db, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
 	goto __23
 __22:
@@ -85273,7 +85327,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, 137995)
+		return Xsqlite3MisuseError(tls, 138048)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -85372,7 +85426,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, 138143)
+		return Xsqlite3MisuseError(tls, 138196)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -85690,8 +85744,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 + 10913
-		var zSp2 uintptr = ts + 10913
+		var zSp1 uintptr = ts + 10932
+		var zSp2 uintptr = ts + 10932
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -85699,13 +85753,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18477, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18543, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18507))
+var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18573))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -85880,7 +85934,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+18541, libc.VaList(bp, 0))
+					ts+18607, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -85925,7 +85979,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+18591, libc.VaList(bp+8, zName))
+						ts+18657, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -85936,7 +85990,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+18655,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18721,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -85980,7 +86034,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6579, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6598, 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.
@@ -86564,16 +86618,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18692
+		z = ts + 18758
 		break
 	case TK_INTERSECT:
-		z = ts + 18702
+		z = ts + 18768
 		break
 	case TK_EXCEPT:
-		z = ts + 18712
+		z = ts + 18778
 		break
 	default:
-		z = ts + 18719
+		z = ts + 18785
 		break
 	}
 	return z
@@ -86583,7 +86637,7 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18725, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18791, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
@@ -86609,11 +86663,11 @@ 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 {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18814, libc.VaList(bp, func() uintptr {
 		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
-			return ts + 18779
+			return ts + 18845
 		}
-		return ts + 1547
+		return ts + 1566
 	}()))
 
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
@@ -86801,8 +86855,8 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 				}
 
 				if iCol < 0 {
-					zType = ts + 1112
-					*(*uintptr)(unsafe.Pointer(bp + 40)) = ts + 16260
+					zType = ts + 1131
+					*(*uintptr)(unsafe.Pointer(bp + 40)) = ts + 16279
 				} 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))
@@ -86941,13 +86995,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16260
+				zCol = ts + 16279
 			} 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+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12073, 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))
@@ -86955,7 +87009,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+18794, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18860, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -87045,7 +87099,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*16)).FzCnName
 				} else {
-					zName = ts + 16260
+					zName = ts + 16279
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -87055,7 +87109,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18794, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18860, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 48)) = U32(0)
@@ -87071,7 +87125,7 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18803, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 48)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18869, 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)
@@ -87154,8 +87208,6 @@ __1:
 		(*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
@@ -87170,12 +87222,15 @@ __1:
 			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
 				(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_BLOB)
 			}
+			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)
+			}
 		}
 		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
+				zType = ts + 18877
 			} else {
 				zType = uintptr(0)
 				for j = 1; j < SQLITE_N_STDTYPE; j++ {
@@ -87391,7 +87446,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18815, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18881, 0)
 	return
 __1:
 	;
@@ -87482,7 +87537,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18864, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18930, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -87502,7 +87557,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18906, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18972, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -87539,7 +87594,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18912, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18978, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -87573,11 +87628,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+18927, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18993, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
-			return ts + 1547
+			return ts + 1566
 		}
-		return ts + 18950
+		return ts + 19016
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -87678,8 +87733,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18952, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18967, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19018, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19033, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -87726,7 +87781,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18692, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18758, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -87793,7 +87848,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+18986, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19052, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+48)
 
@@ -87855,7 +87910,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+18986, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19052, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+76)
 
@@ -88008,10 +88063,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+19007, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19073, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19053,
+			ts+19119,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -88265,8 +88320,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+7227)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7227)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7235)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7235)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -88293,13 +88348,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+19135, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19201, 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+19146, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19212, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -88311,7 +88366,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+19151, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19217, 0)
 	Xsqlite3Select(tls, pParse, p, bp+36)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -88498,7 +88553,8 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 				Xsqlite3VectorErrorMsg(tls, (*SubstContext)(unsafe.Pointer(pSubst)).FpParse, pCopy)
 			} else {
 				var db uintptr = (*Parse)(unsafe.Pointer((*SubstContext)(unsafe.Pointer(pSubst)).FpParse)).Fdb
-				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 && int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN {
+				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 &&
+					(int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN || (*Expr)(unsafe.Pointer(pCopy)).FiTable != (*SubstContext)(unsafe.Pointer(pSubst)).FiNewTable) {
 					libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Expr{})))
 					(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_IF_NULL_ROW)
 					(*Expr)(unsafe.Pointer(bp)).FpLeft = pCopy
@@ -88538,7 +88594,7 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 								if pColl != 0 {
 									return (*CollSeq)(unsafe.Pointer(pColl)).FzName
 								}
-								return ts + 1092
+								return ts + 1111
 							}())
 					}
 
@@ -89326,12 +89382,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15157) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15176) == 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+15161) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15180) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -89397,7 +89453,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+19157, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19223, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -89480,7 +89536,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+19175, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19241, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -89609,7 +89665,7 @@ 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+19198, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 64))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19264, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 64))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+36+4, uint32(1), 8, 0x100)
@@ -89632,7 +89688,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+19218, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19284, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -89648,7 +89704,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19261
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19327
 		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 {
@@ -89674,7 +89730,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+19284,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19350,
 					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
@@ -89685,9 +89741,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 + 19322
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19388
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19356
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19422
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -89734,7 +89790,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+19394, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19460, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -89846,7 +89902,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19398,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19464,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -89865,7 +89921,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+19437,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19503,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 44)), 0)
@@ -89873,7 +89929,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+14726,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14745,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -89974,7 +90030,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 						} else {
-							zSchemaName = ts + 6439
+							zSchemaName = ts + 6458
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -89989,7 +90045,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+19468, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19534, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(1), 7, 0x80)
 							}
@@ -90054,7 +90110,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+19473,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19539,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -90066,7 +90122,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+12054, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12073, 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)
@@ -90085,9 +90141,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19482, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19548, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19500, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19566, 0)
 					}
 				}
 			}
@@ -90097,7 +90153,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+19520, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19586, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -90235,7 +90291,7 @@ func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect ui
 	(*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)
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSelect)).FpGroupBy)).FnExpr)
 		} 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)
 		}
@@ -90319,13 +90375,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 20)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 20)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19551, 0)
+					ts+19617, 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+19602, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19668, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -90514,19 +90570,19 @@ 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+19635,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19701,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19647
+						return ts + 19713
 					}
-					return ts + 1547
+					return ts + 1566
 				}(),
 				func() uintptr {
 					if bCover != 0 {
 						return (*Index)(unsafe.Pointer(pIdx)).FzName
 					}
-					return ts + 1547
+					return ts + 1566
 				}()))
 	}
 }
@@ -90539,7 +90595,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+7931)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7950)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -90846,7 +90902,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19670,
+		ts+19736,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -90907,7 +90963,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19724,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19790,
 		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:
@@ -91011,7 +91067,7 @@ __27:
 	if !((*SrcItem)(unsafe.Pointer(pItem1)).FcolUsed == uint64(0) && (*SrcItem)(unsafe.Pointer(pItem1)).FzName != uintptr(0)) {
 		goto __30
 	}
-	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1547, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
+	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1566, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
 __30:
 	;
 	pSub1 = (*SrcItem)(unsafe.Pointer(pItem1)).FpSelect
@@ -91049,7 +91105,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+19764, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19830, 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)
@@ -91108,7 +91164,7 @@ __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+88, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19779, libc.VaList(bp+40, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19845, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+88)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
@@ -91579,9 +91635,9 @@ __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 + 19795
+				return ts + 19861
 			}
-			return ts + 19804
+			return ts + 19870
 		}())
 
 	groupBySort = 1
@@ -91932,7 +91988,7 @@ __65:
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+116)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
 		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19795)
+	explainTempTable(tls, pParse, ts+19861)
 __146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
@@ -92014,7 +92070,7 @@ __7:
 	if !(i < nCol) {
 		goto __9
 	}
-	z = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*4))))
+	z = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*4))))
 	if !(z == uintptr(0)) {
 		goto __10
 	}
@@ -92036,7 +92092,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19813, 0)
+		ts+19879, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -92132,7 +92188,7 @@ func Xsqlite3_get_table(tls *libc.TLS, db uintptr, zSql uintptr, pazResult uintp
 		if (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
 			if pzErrMsg != 0 {
 				Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(pzErrMsg)))
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
 			}
 			Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg)
 		}
@@ -92269,7 +92325,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+19878, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19944, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -92313,7 +92369,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+36, pParse, iDb, ts+19924, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+36, pParse, iDb, ts+19990, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+36, pTableName) != 0) {
 		goto __9
 	}
@@ -92331,7 +92387,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19932, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19998, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -92343,7 +92399,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19924, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19990, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -92358,11 +92414,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19973, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20039, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
+
 __17:
 	;
 	goto trigger_cleanup
@@ -92370,22 +92427,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6393, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19999, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20065, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20037,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20103,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20074
+				return ts + 20140
 			}
-			return ts + 20081
+			return ts + 20147
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -92394,7 +92451,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20087, libc.VaList(bp+24, pTableName+8))
+		ts+20153, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -92423,9 +92480,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -92543,7 +92600,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+64, pParse, iDb, ts+19924, bp+56)
+	Xsqlite3FixInit(tls, bp+64, pParse, iDb, ts+19990, 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
@@ -92576,7 +92633,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20133,
+		ts+20199,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -92601,13 +92658,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20181,
+		ts+20247,
 		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+20256, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20322, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -92863,7 +92920,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20285, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20351, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -92902,9 +92959,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 + 6382
+				return ts + 6401
 			}
-			return ts + 5876
+			return ts + 5895
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -92916,7 +92973,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20305,
+			ts+20371,
 			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)
@@ -93030,12 +93087,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20367,
+		ts+20433,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20415
+				return ts + 20481
 			}
-			return ts + 20422
+			return ts + 20488
 		}()))
 __15:
 	;
@@ -93149,7 +93206,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+20429, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20495, 0)
 	return 1
 }
 
@@ -93215,7 +93272,7 @@ func codeReturningTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab
 	}
 	Xsqlite3ExprListDelete(tls, db, (*Select)(unsafe.Pointer(bp)).FpEList)
 	pNew = sqlite3ExpandReturning(tls, pParse, (*Returning)(unsafe.Pointer(pReturning)).FpReturnEL, pTab)
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0) {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
 		libc.Xmemset(tls, bp+160, 0, uint32(unsafe.Sizeof(NameContext{})))
 		if (*Returning)(unsafe.Pointer(pReturning)).FnRetCol == 0 {
 			(*Returning)(unsafe.Pointer(pReturning)).FnRetCol = (*ExprList)(unsafe.Pointer(pNew)).FnExpr
@@ -93269,7 +93326,7 @@ func codeTriggerProgram(tls *libc.TLS, pParse uintptr, pStepList uintptr, orconf
 
 		if (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan != 0 {
 			Xsqlite3VdbeAddOp4(tls, v, OP_Trace, 0x7fffffff, 1, 0,
-				Xsqlite3MPrintf(tls, db, ts+6073, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
+				Xsqlite3MPrintf(tls, db, ts+6092, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
 				-6)
 		}
 
@@ -93379,7 +93436,7 @@ 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+20471, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20537, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
@@ -93972,7 +94029,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20485,
+		ts+20551,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*16)).FzCnName))
 	goto update_cleanup
 __27:
@@ -94004,7 +94061,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20521, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*20)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20587, 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:
@@ -94014,7 +94071,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7706
+				return ts + 7725
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*16)).FzCnName
 		}(),
@@ -94330,7 +94387,12 @@ __74:
 	goto __77
 __76:
 	flags = WHERE_ONEPASS_DESIRED
-	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) && !(pTrigger != 0) && !(hasFK != 0) && !(chngKey != 0) && !(*(*int32)(unsafe.Pointer(bp + 68)) != 0)) {
+	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) &&
+		!(pTrigger != 0) &&
+		!(hasFK != 0) &&
+		!(chngKey != 0) &&
+		!(*(*int32)(unsafe.Pointer(bp + 68)) != 0) &&
+		(*NameContext)(unsafe.Pointer(bp+28)).FncFlags&NC_Subquery == 0) {
 		goto __78
 	}
 	flags = flags | WHERE_ONEPASS_MULTIROW
@@ -94884,7 +94946,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20540)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20606)
 __169:
 	;
 update_cleanup:
@@ -95190,10 +95252,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+20553, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]uint8{})), bp+152, ts+20619, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20557, libc.VaList(bp+8, bp+152))
+				ts+20623, libc.VaList(bp+8, bp+152))
 			return SQLITE_ERROR
 		}
 
@@ -95284,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+12143, -1)
+				ts+12162, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -95316,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+20630, uint32(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20634, uint32(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20696, uint32(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20700, uint32(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -95464,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+20638)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20704)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20678)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20744)
 	return SQLITE_ERROR
 __2:
 	;
@@ -95482,7 +95544,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20721)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20787)
 	return SQLITE_ERROR
 __5:
 	;
@@ -95491,7 +95553,7 @@ __5:
 	*(*uint32)(unsafe.Pointer(db + 60)) |= uint32(SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE)
 	goto __4
 __3:
-	zOut = ts + 1547
+	zOut = ts + 1566
 __4:
 	;
 	saved_flags = (*Sqlite3)(unsafe.Pointer(db)).Fflags
@@ -95510,7 +95572,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20739, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20805, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -95530,7 +95592,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20762)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20828)
 	goto end_of_vacuum
 __8:
 	;
@@ -95545,7 +95607,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14496)
+	rc = execSql(tls, db, pzErrMsg, ts+14515)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -95590,7 +95652,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20789,
+		ts+20855,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -95599,7 +95661,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20897,
+		ts+20963,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -95610,7 +95672,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20951,
+		ts+21017,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 24)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -95621,7 +95683,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21102,
+		ts+21168,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -95966,7 +96028,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+12370, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12389, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 44 + 4)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -96050,11 +96112,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+21232, libc.VaList(bp, pParse+196))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21298, libc.VaList(bp, pParse+196))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21256,
+			ts+21322,
 			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,
@@ -96064,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+21355, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21421, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -96125,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+21374, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21440, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -96153,9 +96215,11 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FbDeclared = 0
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = bp + 32
+	(*Table)(unsafe.Pointer(pTab)).FnTabRef++
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{xConstruct})).f(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, pVTable+8, bp+48)
+	Xsqlite3DeleteTable(tls, db, pTab)
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = (*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -96163,9 +96227,9 @@ 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+21416, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21482, libc.VaList(bp+8, zModuleName))
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3656, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 48))))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3675, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 48))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
 		}
 		Xsqlite3DbFree(tls, db, pVTable)
@@ -96175,7 +96239,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 + 21446
+			var zFormat uintptr = ts + 21512
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -96187,12 +96251,12 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 			*(*uintptr)(unsafe.Pointer(pTab + 44 + 8)) = pVTable
 
 			for iCol = 0; iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol); iCol++ {
-				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16, ts+1547)
+				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16, ts+1566)
 				var nType int32
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16151, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16170, 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
@@ -96249,13 +96313,13 @@ 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+21492, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21558, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxConnect, bp+16)
 		if rc != SQLITE_OK {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 		}
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 16)))
@@ -96307,7 +96371,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+21492, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21558, 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)
@@ -96341,7 +96405,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, 151030)
+		return Xsqlite3MisuseError(tls, 151102)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -96383,7 +96447,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR,
 			func() uintptr {
 				if (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
-					return ts + 3656
+					return ts + 3675
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg))
@@ -96751,7 +96815,7 @@ func Xsqlite3VtabEponymousTableInit(tls *libc.TLS, pParse uintptr, pMod uintptr)
 	addModuleArgument(tls, pParse, pTab, Xsqlite3DbStrDup(tls, db, (*Table)(unsafe.Pointer(pTab)).FzName))
 	rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer(pModule)).FxConnect, bp+8)
 	if rc != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+		Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		Xsqlite3VtabEponymousTableClear(tls, db, pMod)
 	}
@@ -96794,7 +96858,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, 151521)
+		rc = Xsqlite3MisuseError(tls, 151593)
 	} else {
 		ap = va
 		switch op {
@@ -96821,7 +96885,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 151539)
+				rc = Xsqlite3MisuseError(tls, 151611)
 				break
 
 			}
@@ -97053,10 +97117,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 + 21511
+		return ts + 21577
 	}
 	if i == -1 {
-		return ts + 16260
+		return ts + 16279
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*16)).FzCnName
 }
@@ -97065,35 +97129,35 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21518, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21584, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21524, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21590, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12760, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12779, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4950, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4969, 1)
 	}
 
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21524, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21590, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12760, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12779, 1)
 		}
-		Xsqlite3_str_append(tls, pStr, ts+5001, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5020, 1)
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4950, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4969, 1)
 	}
 }
 
@@ -97110,29 +97174,29 @@ 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+21526, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21592, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21518, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21584, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21529
+				return ts + 21595
 			}
-			return ts + 21534
+			return ts + 21600
 		}(), 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+21542)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21608)
 		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+21544)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21610)
 	}
-	Xsqlite3_str_append(tls, pStr, ts+4950, 1)
+	Xsqlite3_str_append(tls, pStr, ts+4969, 1)
 }
 
 // This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
@@ -97173,11 +97237,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+21546, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21612, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21552
+				return ts + 21618
 			}
-			return ts + 21559
+			return ts + 21625
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -97187,43 +97251,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 + 10969
+					zFmt = ts + 10988
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21564
+				zFmt = ts + 21630
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21597
+				zFmt = ts + 21663
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21622
+				zFmt = ts + 21688
 			} else {
-				zFmt = ts + 21640
+				zFmt = ts + 21706
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21649, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21715, 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 + 16260
-			Xsqlite3_str_appendf(tls, bp+64, ts+21657, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16279
+			Xsqlite3_str_appendf(tls, bp+64, ts+21723, 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+21688, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21754, 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+21698, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21764, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21703,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21769,
 				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+21730, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21796, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -97255,25 +97319,25 @@ 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+21741, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21807, 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+21529, 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+21595, 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+21762, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21828, 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+21518, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21584, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21529, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21595, libc.VaList(bp+16, z))
 		}
 	}
-	Xsqlite3_str_append(tls, bp+24, ts+4950, 1)
+	Xsqlite3_str_append(tls, bp+24, ts+4969, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
@@ -98867,7 +98931,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21770, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21836, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -98895,7 +98959,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21785, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21851, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -99413,7 +99477,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+21794, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21860, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -99771,10 +99835,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{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)},
+	{FzOp: ts + 16128, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15459, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14979, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21874, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -100264,12 +100328,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21815, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21881, 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+21815, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21881, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -100348,7 +100412,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 + 6762
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7711
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -100442,7 +100506,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
-				return ts + 21856
+				return ts + 21922
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -100818,7 +100882,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21863,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21929,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -100834,7 +100898,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 		pRhs = Xsqlite3PExpr(tls, pParse, TK_UPLUS,
 			Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*ExprList_item)(unsafe.Pointer(pArgs+8+uintptr(j)*20)).FpExpr, 0), uintptr(0))
 		pTerm = Xsqlite3PExpr(tls, pParse, TK_EQ, pColRef, pRhs)
-		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ|JT_RIGHT) != 0 {
 			joinType = U32(EP_OuterON)
 		} else {
 			joinType = U32(EP_InnerON)
@@ -101551,7 +101615,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21899, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21965, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*16)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -101622,7 +101686,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21925
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21991
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -101796,6 +101860,10 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	var iCur int32
+	var saved_pIdxEpr uintptr
+
+	saved_pIdxEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 
 	addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	for __ccgo := true; __ccgo; __ccgo = iLevel < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel) {
@@ -101839,9 +101907,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, n)
 			var jj int32
 			for jj = 0; jj < n; jj++ {
-				var iCol int32 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(jj)*2)))
-
-				Xsqlite3ExprCodeGetColumnOfTable(tls, v, (*Index)(unsafe.Pointer(pIdx)).FpTable, iCur, iCol, r1+jj)
+				Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pIdx, iCur, jj, r1+jj)
 			}
 			Xsqlite3VdbeAddOp4Int(tls, v, OP_FilterAdd, (*WhereLevel)(unsafe.Pointer(pLevel)).FregFilter, 0, r1, n)
 			Xsqlite3ReleaseTempRange(tls, pParse, r1, n)
@@ -101875,6 +101941,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 		}
 	}
 	Xsqlite3VdbeJumpHere(tls, v, addrOnce)
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = saved_pIdxEpr
 }
 
 func allocateIndexInfo(tls *libc.TLS, pWInfo uintptr, pWC uintptr, mUnusable Bitmask, pSrc uintptr, pmNoOmit uintptr) uintptr {
@@ -101988,7 +102055,7 @@ __3:
 		uint32(unsafe.Sizeof(sqlite3_index_orderby{}))*uint32(nOrderBy)+uint32(unsafe.Sizeof(HiddenIndexInfo1{}))+
 		uint32(unsafe.Sizeof(uintptr(0)))*uint32(nTerm)))
 	if pIdxInfo == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1483, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1502, 0)
 		return uintptr(0)
 	}
 	pHidden = pIdxInfo + 1*72
@@ -102110,9 +102177,9 @@ func vtabBestIndex(tls *libc.TLS, pParse uintptr, pTab uintptr, p uintptr) int32
 		if rc == SQLITE_NOMEM {
 			Xsqlite3OomFault(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb)
 		} else if !(int32((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
 		}
 	}
 	Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg)
@@ -102133,11 +102200,16 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 
 	_ = pParse
 
+	if !((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol)
+	} else {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnColumn)
+	}
 	nField = func() int32 {
-		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < (*Index)(unsafe.Pointer(pIdx)).FnSample {
+		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < nField {
 			return int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField)
 		}
-		return (*Index)(unsafe.Pointer(pIdx)).FnSample
+		return nField
 	}()
 	iCol = 0
 	iSample = (*Index)(unsafe.Pointer(pIdx)).FnSample * nField
@@ -103717,7 +103789,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+21936, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+22002, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -103775,7 +103847,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+21936, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+22002, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -104173,7 +104245,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+21962, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+22028, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -104780,7 +104852,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21997, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22063, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -104815,6 +104887,10 @@ __3:
 			if int32((*WherePath)(unsafe.Pointer(pFrom)).FisOrdered) == (*ExprList)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpOrderBy)).FnExpr {
 				(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_ORDERED)
 			}
+			if (*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy != 0 &&
+				int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) > (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr {
+				(*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat = I8((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr)
+			}
 		} else {
 			(*WhereInfo)(unsafe.Pointer(pWInfo)).FrevMask = (*WherePath)(unsafe.Pointer(pFrom)).FrevLoop
 			if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) <= 0 {
@@ -105109,6 +105185,9 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
+		if Xsqlite3IndexAffinityStr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pIdx) != 0 {
+			(*IndexedExpr)(unsafe.Pointer(p)).Faff = *(*uint8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FzColAff + uintptr(i)))
+		}
 		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
@@ -105261,7 +105340,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22015, libc.VaList(bp, int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22081, libc.VaList(bp, int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))))
 	return uintptr(0)
 __2:
 	;
@@ -105325,7 +105404,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22043, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22109, 0)
 	goto __5
 __4:
 	ii = 0
@@ -106208,7 +106287,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22061, -1)
+		pCtx, ts+22127, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -106341,7 +106420,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+22117, -1)
+					pCtx, ts+22183, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -106430,17 +106509,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-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))
+var row_numberName = *(*[11]uint8)(unsafe.Pointer(ts + 22228))
+var dense_rankName = *(*[11]uint8)(unsafe.Pointer(ts + 22239))
+var rankName = *(*[5]uint8)(unsafe.Pointer(ts + 22250))
+var percent_rankName = *(*[13]uint8)(unsafe.Pointer(ts + 22255))
+var cume_distName = *(*[10]uint8)(unsafe.Pointer(ts + 22268))
+var ntileName = *(*[6]uint8)(unsafe.Pointer(ts + 22278))
+var last_valueName = *(*[11]uint8)(unsafe.Pointer(ts + 22284))
+var nth_valueName = *(*[10]uint8)(unsafe.Pointer(ts + 22295))
+var first_valueName = *(*[12]uint8)(unsafe.Pointer(ts + 22305))
+var leadName = *(*[5]uint8)(unsafe.Pointer(ts + 22317))
+var lagName = *(*[4]uint8)(unsafe.Pointer(ts + 22322))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -106486,7 +106565,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22260, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22326, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -106530,12 +106609,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+22279, 0)
+			ts+22345, 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+22350, 0)
+				ts+22416, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -106558,7 +106637,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+7931)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7950)
 					}
 					break
 				}
@@ -106761,7 +106840,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+22413, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22479, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -106877,7 +106956,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+7523))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7531))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -106992,7 +107071,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22439, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22505, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -107057,15 +107136,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 + 22471
+				zErr = ts + 22537
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22488
+				zErr = ts + 22554
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22504
+				zErr = ts + 22570
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22524, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22590, 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 {
@@ -107086,7 +107165,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+22557, 0)
+				ts+22623, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -107224,7 +107303,7 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regZero)
 	if eCond >= WINDOW_STARTING_NUM {
 		var regString int32 = Xsqlite3GetTempReg(tls, pParse)
-		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1547, -1)
+		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1566, -1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, Xsqlite3VdbeCurrentAddr(tls, v)+2, reg)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL))
 
@@ -107242,11 +107321,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22604,
-	ts + 22657,
-	ts + 22061,
-	ts + 22708,
-	ts + 22760,
+	ts + 22670,
+	ts + 22723,
+	ts + 22127,
+	ts + 22774,
+	ts + 22826,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -107736,7 +107815,7 @@ func windowCodeRangeTest(tls *libc.TLS, p uintptr, op int32, csr1 int32, regVal
 
 	}
 
-	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1547, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1566, -1)
 	addrGe = Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, 0, reg1)
 
 	if op == OP_Ge && arith == OP_Add || op == OP_Le && arith == OP_Subtract {
@@ -108638,19 +108717,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+22810,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22876,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 22852
+							return ts + 22918
 						}
-						return ts + 22861
+						return ts + 22927
 					}(),
 						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+22867, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22933, 0)
 		}
 	}
 
@@ -108721,7 +108800,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+22901,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22967,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -109816,7 +109895,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22939, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23005, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -110791,21 +110870,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+16260, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16279, 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+22961, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23027, 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+16173, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16192, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22961, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23027, 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))
@@ -111548,7 +111627,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+22988)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*12 + 4)), ts+23054)
 				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 {
@@ -111712,7 +111791,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+22997, libc.VaList(bp+32, bp+92))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23063, 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))
@@ -111929,9 +112008,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 + 6757
+							return ts + 7706
 						}
-						return ts + 6762
+						return ts + 7711
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)))
@@ -112215,19 +112294,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+23021, 0)
+					ts+23087, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23116, 0)
+					ts+23182, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23200, 0)
+					ts+23266, 0)
 			}
 			break
 		case uint32(273):
@@ -112606,9 +112685,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+22997, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23063, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23285, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23351, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -113376,7 +113455,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+23302, libc.VaList(bp, bp+1248))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23368, libc.VaList(bp, bp+1248))
 				break
 			}
 		}
@@ -113397,9 +113476,9 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 	}
 	if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg != 0 || (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_OK && (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_DONE {
 		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)))
+			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3675, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23327, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23393, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -113572,7 +113651,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23338, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23404, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -113585,11 +113664,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19924, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19990, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23411, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23350, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23416, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -113602,9 +113681,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23360, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23426, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23364, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23430, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -113674,7 +113753,8 @@ func sqlite3TestExtInit(tls *libc.TLS, db uintptr) int32 {
 	return Xsqlite3FaultSim(tls, 500)
 }
 
-var sqlite3BuiltinExtensions = [4]uintptr{
+var sqlite3BuiltinExtensions = [5]uintptr{
+	0,
 	0,
 	0,
 	0,
@@ -113838,7 +113918,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 174337)
+		return Xsqlite3MisuseError(tls, 174426)
 	}
 
 	ap = va
@@ -114413,7 +114493,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175111)
+		return Xsqlite3MisuseError(tls, 175200)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -114428,7 +114508,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23372, 0)
+			ts+23438, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -114619,23 +114699,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 + 23440
+	var zErr uintptr = ts + 23506
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23454
+			zErr = ts + 23520
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23476
+			zErr = ts + 23542
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23498
+			zErr = ts + 23564
 			break
 
 		}
@@ -114653,35 +114733,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23521,
-	ts + 23534,
+	ts + 23587,
+	ts + 23600,
 	uintptr(0),
-	ts + 23550,
-	ts + 23575,
-	ts + 23589,
-	ts + 23608,
-	ts + 1483,
-	ts + 23633,
-	ts + 23670,
-	ts + 23682,
-	ts + 23697,
-	ts + 23730,
+	ts + 23616,
+	ts + 23641,
+	ts + 23655,
+	ts + 23674,
+	ts + 1502,
+	ts + 23699,
+	ts + 23736,
 	ts + 23748,
-	ts + 23773,
-	ts + 23802,
+	ts + 23763,
+	ts + 23796,
+	ts + 23814,
+	ts + 23839,
+	ts + 23868,
 	uintptr(0),
-	ts + 5831,
-	ts + 5327,
-	ts + 23819,
-	ts + 23837,
-	ts + 23855,
+	ts + 5850,
+	ts + 5346,
+	ts + 23885,
+	ts + 23903,
+	ts + 23921,
 	uintptr(0),
-	ts + 23889,
+	ts + 23955,
 	uintptr(0),
-	ts + 23910,
-	ts + 23936,
-	ts + 23959,
-	ts + 23980,
+	ts + 23976,
+	ts + 24002,
+	ts + 24025,
+	ts + 24046,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -114802,7 +114882,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, 175758)
+		return Xsqlite3MisuseError(tls, 175847)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -114847,7 +114927,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+23996, 0)
+				ts+24062, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -114964,7 +115044,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+24059, libc.VaList(bp, zName))
+		ts+24125, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -114992,7 +115072,7 @@ func Xsqlite3_overload_function(tls *libc.TLS, db uintptr, zName uintptr, nArg i
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, zName))
+	zCopy = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, zName))
 	if zCopy == uintptr(0) {
 		return SQLITE_NOMEM
 	}
@@ -115200,7 +115280,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+24110, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24176, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -115293,7 +115373,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, 176503))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176592))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -115363,7 +115443,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, 176582)
+		return Xsqlite3MisuseError(tls, 176671)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115373,7 +115453,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, 176591)
+		return Xsqlite3MisuseError(tls, 176680)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115405,14 +115485,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, 176639)
+		return Xsqlite3MisuseError(tls, 176728)
 	}
 
 	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+24131, 0)
+				ts+24197, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -115542,7 +115622,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+24199, uint32(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24265, uint32(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -115587,10 +115667,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24205, zUri+7, uint32(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24271, zUri+7, uint32(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24215,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24281,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -115695,7 +115775,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24243, zOpt, uint32(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24309, zOpt, uint32(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -115706,17 +115786,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24247, zOpt, uint32(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24313, zOpt, uint32(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24247
+	zModeType = ts + 24313
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24253, zOpt, uint32(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24319, zOpt, uint32(4)) == 0) {
 		goto __32
 	}
 
@@ -115724,7 +115804,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 3265
+	zModeType = ts + 3284
 __32:
 	;
 	if !(aMode != 0) {
@@ -115754,7 +115834,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24258, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24324, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -115762,7 +115842,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24278,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24344,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -115802,7 +115882,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24302, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24368, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -115825,15 +115905,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24318, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24325, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24384, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24391, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{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},
+	{Fz: ts + 24399, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24402, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24405, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17374, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -115979,10 +116059,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+21856, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21922, 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+24343, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24409, 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) {
@@ -115996,7 +116076,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 177308)
+	rc = Xsqlite3MisuseError(tls, 177397)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+12, bp+16)
@@ -116013,7 +116093,7 @@ __19:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
-			return ts + 3656
+			return ts + 3675
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 16))))
@@ -116047,9 +116127,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 + 6434
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6453
 	(*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 + 23345
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).FzDbSName = ts + 23411
 	(*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)
@@ -116154,7 +116234,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24349
+		zFilename = ts + 24415
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -116257,21 +116337,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+24352,
+	Xsqlite3_log(tls, iErr, ts+24418,
 		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+24377)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24443)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24397)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24463)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24404)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24470)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -116382,7 +116462,7 @@ __4:
 	autoinc = libc.Bool32(int32((*Table)(unsafe.Pointer(pTab)).FiPKey) == iCol && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != U32(0))
 	goto __13
 __12:
-	zDataType = ts + 1112
+	zDataType = ts + 1131
 	primarykey = 1
 __13:
 	;
@@ -116429,14 +116509,14 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24421, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24487, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3656
+			return ts + 3675
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -117085,7 +117165,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24449, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24515, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -117203,7 +117283,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 + 24457
+			return ts + 24523
 		}
 		return uintptr(0)
 	}(), 0)
@@ -117380,7 +117460,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6174, ts + 6757, ts + 6762, ts + 6184, ts + 6179, ts + 7998, ts + 24480, ts + 24486,
+	ts + 6193, ts + 7706, ts + 7711, ts + 6203, ts + 6198, ts + 8017, ts + 24546, ts + 24552,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -117533,7 +117613,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 + 24493 + uintptr(int32(c)&0xf)))
+	c = *(*uint8)(unsafe.Pointer(ts + 24559 + uintptr(int32(c)&0xf)))
 __8:
 	;
 __6:
@@ -117559,7 +117639,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	switch Xsqlite3_value_type(tls, pValue) {
 	case SQLITE_NULL:
 		{
-			jsonAppendRaw(tls, p, ts+6174, uint32(4))
+			jsonAppendRaw(tls, p, ts+6193, uint32(4))
 			break
 
 		}
@@ -117588,7 +117668,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+24510, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24576, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -117646,19 +117726,19 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 	switch int32((*JsonNode)(unsafe.Pointer(pNode)).FeType) {
 	default:
 		{
-			jsonAppendRaw(tls, pOut, ts+6174, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6193, uint32(4))
 			break
 
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6757, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+7706, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6762, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+7711, uint32(5))
 			break
 
 		}
@@ -118203,17 +118283,17 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		}
 		return int32(j + U32(1))
 	} else if int32(c) == 'n' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6174, uint32(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6193, uint32(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(z + uintptr(i+U32(4))))])&0x06 != 0) {
 		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+6757, uint32(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7706, 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+6762, uint32(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7711, 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))
@@ -118314,7 +118394,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+24539, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24605, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -118620,7 +118700,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+24554, uint32(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24620, uint32(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -118635,7 +118715,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24558, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24624, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -118689,7 +118769,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+24584,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24650,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -118794,11 +118874,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+24627, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24693, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
-					jsonAppendRaw(tls, bp, ts+4991, uint32(2))
+					jsonAppendRaw(tls, bp, ts+5010, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24630, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24696, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, uint8(0))
 				}
@@ -118839,7 +118919,7 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if pNode != 0 {
 				jsonRenderNode(tls, pNode, bp, uintptr(0))
 			} else {
-				jsonAppendRaw(tls, bp, ts+6174, uint32(4))
+				jsonAppendRaw(tls, bp, ts+6193, uint32(4))
 			}
 		}
 		if i == argc {
@@ -118955,14 +119035,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24633, -1)
+			ts+24699, -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+24684, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24750, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -119057,7 +119137,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15373)
+	jsonWrongNumArgs(tls, ctx, ts+15392)
 	return
 __2:
 	;
@@ -119132,9 +119212,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24718
+			return ts + 24784
 		}
-		return ts + 24722
+		return ts + 24788
 	}())
 	return
 __2:
@@ -119267,7 +119347,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24729, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24795, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119364,7 +119444,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24732, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24798, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119408,7 +119488,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24735)
+		ts+24801)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -119539,7 +119619,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24818, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24884, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -119558,7 +119638,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+24824, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24890, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 12
@@ -119654,7 +119734,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+24824, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24890, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -119678,7 +119758,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 + 24829
+				zRoot = ts + 24895
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -119800,7 +119880,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+24539, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24605, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -119895,25 +119975,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{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 + 24897},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24902},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24913},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24913},
 	{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}}
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_JSON), FxSFunc: 0, FzName: ts + 24944},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_SQL), FxSFunc: 0, FzName: ts + 24947},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24951},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24963},
+	{FnArg: int8(2), 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_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24986},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24997},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25009},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_ISSET), FxSFunc: 0, FzName: ts + 25022},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25031},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25031},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25041},
+	{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 + 25052},
+	{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 + 25069}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -119932,8 +120012,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 25021, FpModule: 0},
-	{FzName: ts + 25031, FpModule: 0},
+	{FzName: ts + 25087, FpModule: 0},
+	{FzName: ts + 25097, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -120190,11 +120270,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+25041, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25107, 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+25049, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25115, iNode, 0,
 			pRtree+76)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -120405,7 +120485,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+25054,
+		ts+25120,
 		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 +121188,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25136)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25202)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -121320,7 +121400,7 @@ func rtreeBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 2
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FneedToFreeIdxStr = 1
-	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+24, Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, bp+8))) {
+	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+24, Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, bp+8))) {
 		return SQLITE_NOMEM
 	}
 
@@ -122449,7 +122529,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25150, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25216, 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 +122541,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+25170, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25236, 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+25202, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25268, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -122692,7 +122772,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+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))
+		ts+25305, 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 +122795,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(20)
 	defer tls.Free(20)
 
-	var zFmt uintptr = ts + 25384
+	var zFmt uintptr = ts + 25450
 	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+11341, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11360, 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 +122843,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25440, ts + 5053, ts + 16260,
+	ts + 25506, ts + 5072, ts + 16279,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -122806,19 +122886,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+25445,
+			ts+25511,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25507, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25573, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25512,
+			ts+25578,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25576,
+			ts+25642,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25646,
+			ts+25712,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -122847,7 +122927,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 + 25695
+			zFormat = ts + 25761
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -122859,7 +122939,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+25803,
+			ts+25869,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -122867,18 +122947,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+25848, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25914, 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+12760, 1)
+					Xsqlite3_str_append(tls, p, ts+12779, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25875, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25941, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25897, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25963, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25905, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25971, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -122893,14 +122973,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25921,
-	ts + 25974,
-	ts + 26019,
-	ts + 26071,
-	ts + 26125,
-	ts + 26170,
-	ts + 26228,
-	ts + 26283,
+	ts + 25987,
+	ts + 26040,
+	ts + 26085,
+	ts + 26137,
+	ts + 26191,
+	ts + 26236,
+	ts + 26294,
+	ts + 26349,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -122929,7 +123009,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+26330, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26396, 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,19 +123017,19 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 				(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = 4 + int32((*Rtree)(unsafe.Pointer(pRtree)).FnBytesPerCell)*RTREE_MAXCELLS
 			}
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26350,
+			ts+26416,
 			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 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26407,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26473,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -122991,16 +123071,16 @@ 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 + 26442,
-		ts + 26485,
-		ts + 26520,
-		ts + 26556,
+		ts + 26508,
+		ts + 26551,
+		ts + 26586,
+		ts + 26622,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
 		goto __1
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*4))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*4))))
 	return SQLITE_ERROR
 __1:
 	;
@@ -123025,7 +123105,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+26593,
+	Xsqlite3_str_appendf(tls, pSql, ts+26659,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4))), *(*uintptr)(unsafe.Pointer(argv + 3*4))))
 	ii = 4
 __3:
@@ -123037,7 +123117,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26617, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26683, 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 +123140,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26623, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26689, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -123071,14 +123151,14 @@ __10:
 	if !(ii < argc) {
 		goto __12
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*4))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*4))))
 	rc = SQLITE_ERROR
 	goto __13
 __12:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __14
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
 __14:
 	;
 __13:
@@ -123121,7 +123201,7 @@ __17:
 	if !(iErr != 0) {
 		goto __22
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*4))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*4))))
 	goto rtreeInit_fail
 __22:
 	;
@@ -123138,7 +123218,7 @@ __23:
 	if !(rc != 0) {
 		goto __24
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
 	goto rtreeInit_fail
 __24:
 	;
@@ -123156,7 +123236,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26626, ts + 26637}
+var azFormat = [2]uintptr{ts + 26692, ts + 26703}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(600)
@@ -123194,13 +123274,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+10913, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10932, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26647, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+552)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26713, 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+26653, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 552 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26719, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 552 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26657, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26723, 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 +123291,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+26659, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26725, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -123287,12 +123367,12 @@ 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+26692,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26758,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
-						return ts + 4055
+						return ts + 4074
 					}
-					return ts + 1547
+					return ts + 1566
 				}(), z))
 			if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport == uintptr(0) {
 				(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
@@ -123311,7 +123391,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+26699,
+			ts+26765,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -123330,7 +123410,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+26744, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26810, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -123344,8 +123424,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 + 26776,
-		ts + 26830,
+		ts + 26842,
+		ts + 26896,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 24 + uintptr(bLeaf)*4)) == uintptr(0) {
@@ -123360,23 +123440,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+26878,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26944,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26923
+					return ts + 26989
 				}
-				return ts + 26931
+				return ts + 26997
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26940,
+				ts+27006,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26923
+						return ts + 26989
 					}
-					return ts + 26931
+					return ts + 26997
 				}(), iKey, iVal))
 		}
 	}
@@ -123400,7 +123480,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+26998, libc.VaList(bp, i, iCell, iNode))
+				ts+27064, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -123420,7 +123500,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+27046, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27112, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -123437,14 +123517,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+27113, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27179, 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+27147, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27213, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -123452,7 +123532,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+27177,
+					ts+27243,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -123481,14 +123561,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+27232,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27298,
 			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+27263, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27329, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -123510,12 +123590,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+14496, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14515, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27330, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27396, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -123524,12 +123604,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25150, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25216, 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+27358, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27424, 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)
 		}
@@ -123543,8 +123623,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+27389, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27455, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27462, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -123552,7 +123632,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+27404, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27470, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -123567,7 +123647,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27408, -1)
+			ts+27474, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -123575,7 +123655,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6434
+			zDb = ts + 6453
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*4)))
 		}
@@ -123585,7 +123665,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 + 18005
+				return ts + 18071
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -123955,11 +124035,11 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		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+27459, 1)
+		Xsqlite3_str_append(tls, x, ts+27525, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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+27527, 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+27472, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27538, 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)
 	}
@@ -123979,19 +124059,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+27483, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27549, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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)))))
+			Xsqlite3_str_appendf(tls, x, ts+27567, 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+27509, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27575, 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+27517, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27583, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27521, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27587, 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)
 	}
@@ -124910,7 +124990,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+27534, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27600, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -124919,7 +124999,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27556, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*4))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27622, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*4))))
 	goto __3
 __3:
 	ii++
@@ -124927,7 +125007,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26623, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26689, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -124938,7 +125018,7 @@ __5:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __7
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
 __7:
 	;
 __6:
@@ -124963,7 +125043,7 @@ __9:
 	if !(rc != 0) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	goto geopolyInit_fail
 __10:
 	;
@@ -125154,7 +125234,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 + 16260
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16279
 		(*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
@@ -125164,7 +125244,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 + 27560
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27626
 		(*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
@@ -125172,7 +125252,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 + 27566
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27632
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -125284,7 +125364,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27575, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27641, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -125416,14 +125496,14 @@ geopoly_update_end:
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
 	_ = pVtab
 	_ = nArg
-	if Xsqlite3_stricmp(tls, zName, ts+27615) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27681) == 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+27631) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27697) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -125488,7 +125568,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+27646, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27712, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -125500,25 +125580,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [2]byte
 	FzName       uintptr
 }{
-	{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},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27720},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27733},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27746},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27759},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27697},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27771},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27681},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27794},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27808},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27821},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27835},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27851},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27797},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27863},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -125528,26 +125608,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27816, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27882, 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+27826, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27892, 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+27837, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27903, -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+27560, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27626, 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+27848, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27914, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -125601,7 +125681,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+25136, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25202, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -125919,7 +125999,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+27858, -1)
+		Xsqlite3_result_error(tls, context, ts+27924, -1)
 		return
 	}
 
@@ -125930,7 +126010,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+27858, -1)
+			Xsqlite3_result_error(tls, context, ts+27924, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -125943,7 +126023,7 @@ func prepareAndCollectError(tls *libc.TLS, db uintptr, ppStmt uintptr, pzErrmsg
 
 	var rc int32 = Xsqlite3_prepare_v2(tls, db, zSql, -1, ppStmt, uintptr(0))
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 		*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	}
 	return rc
@@ -125955,7 +126035,7 @@ func resetAndCollectError(tls *libc.TLS, pStmt uintptr, pzErrmsg uintptr) int32
 
 	var rc int32 = Xsqlite3_reset(tls, pStmt)
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
 	}
 	return rc
 }
@@ -126031,7 +126111,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+27879, uintptr(0), uintptr(0), p+36)
+				ts+27945, uintptr(0), uintptr(0), p+36)
 		}
 
 		if rc == SQLITE_OK {
@@ -126095,7 +126175,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+25049, zIn, uint32(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > Size_t(4) && libc.Xmemcmp(tls, ts+25115, 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++ {
 				}
@@ -126116,16 +126196,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+28050, libc.VaList(bp, func() uintptr {
+			ts+28116, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28200
+					return ts + 28266
 				}
-				return ts + 1547
+				return ts + 1566
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+4, p+36,
-			ts+28241)
+			ts+28307)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -126223,7 +126303,7 @@ func rbuFinalize(tls *libc.TLS, p uintptr, pStmt uintptr) {
 	var rc int32 = Xsqlite3_finalize(tls, pStmt)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && rc != SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 	}
 }
 
@@ -126241,7 +126321,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+28366, libc.VaList(bp, zTab)))
+			ts+28432, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -126259,7 +126339,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+28485, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28551, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -126277,7 +126357,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*4, p+36,
 		Xsqlite3_mprintf(tls,
-			ts+28506, libc.VaList(bp+16, zIdx)))
+			ts+28572, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -126300,7 +126380,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+28557, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28623, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -126346,7 +126426,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+28578, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28644, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -126361,7 +126441,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+28606, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28672, 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 {
@@ -126401,7 +126481,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+19482, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19548, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -126411,18 +126491,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+28635, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28701, 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+28654, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28720, 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+28659, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28725, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -126434,18 +126514,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+28669, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28735, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28698
+							return ts + 28764
 						}
-						return ts + 28711
+						return ts + 28777
 					}()))
 		}
 
 		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+28720, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28786, 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)
@@ -126459,7 +126539,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+28742,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28808,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 5)
@@ -126502,12 +126582,12 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	defer tls.Free(24)
 
 	var zList uintptr = uintptr(0)
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	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+28769, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14607
+		zList = rbuMPrintf(tls, p, ts+28835, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14626
 	}
 	return zList
 }
@@ -126518,13 +126598,13 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 
 	var iPk int32 = 1
 	var zRet uintptr = uintptr(0)
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	for 1 != 0 {
 		var i int32
 		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+28778, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28844, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -126546,25 +126626,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+28791, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28857, 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+28823, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28889, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		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)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1566, ts+14626, ts+28912)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28918, ts+28925, ts+4969)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1566, ts+14626, ts+1566)
 
 		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+28867,
+					ts+28933,
 					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+28909, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28975, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -126601,12 +126681,12 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	zVector = uintptr(0)
 	zRet = uintptr(0)
 	bFailed = 0
-	zSep = ts + 1547
+	zSep = ts + 1566
 	iCol = 0
 	*(*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+28606, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28672, 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
@@ -126641,7 +126721,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
 	goto __7
 __6:
-	zCol = ts + 28929
+	zCol = ts + 28995
 __7:
 	;
 	goto __5
@@ -126649,13 +126729,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*4))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28937,
+	zLhs = rbuMPrintf(tls, p, ts+29003,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28958,
+	zOrder = rbuMPrintf(tls, p, ts+29024,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28994,
+	zSelect = rbuMPrintf(tls, p, ts+29060,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14607
+	zSep = ts + 14626
 	iCol++
 	goto __1
 __2:
@@ -126673,12 +126753,12 @@ __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+29021,
+		Xsqlite3_mprintf(tls, ts+29087,
 			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
 	}
-	zSep = ts + 1547
+	zSep = ts + 1566
 	iCol = 0
 __14:
 	if !(iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnCol) {
@@ -126700,8 +126780,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29069, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14607
+	zVector = rbuMPrintf(tls, p, ts+29135, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14626
 	goto __15
 __15:
 	iCol++
@@ -126712,7 +126792,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29142, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -126739,13 +126819,13 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 	var zImpPK uintptr = uintptr(0)
 	var zWhere uintptr = uintptr(0)
 	var nBind int32 = 0
-	var zCom uintptr = ts + 1547
-	var zAnd uintptr = ts + 1547
+	var zCom uintptr = ts + 1566
+	var zAnd uintptr = ts + 1566
 	*(*uintptr)(unsafe.Pointer(bp + 200)) = uintptr(0)
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+36,
-			Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28672, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -126757,9 +126837,9 @@ 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+29088, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29154, 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
+			zType = ts + 1566
 		} else {
 			if iCid < 0 {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK {
@@ -126769,37 +126849,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 + 28929
+					zCol = ts + 28995
 				} else {
-					zCol = ts + 28659
+					zCol = ts + 28725
 				}
-				zType = ts + 1112
+				zType = ts + 1131
 			} 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+29110, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29176, 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 + 28846
+					return ts + 28912
 				}
-				return ts + 1547
+				return ts + 1566
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29130,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29196,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29151,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29217,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29184, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29250, 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 + 14607
-		zAnd = ts + 21518
+		zCom = ts + 14626
+		zAnd = ts + 21584
 		nBind++
 	}
 
@@ -126833,16 +126913,16 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 
 	var zList uintptr = uintptr(0)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
-		var zS uintptr = ts + 1547
+		var zS uintptr = ts + 1566
 		var i int32
 		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+29208, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29274, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29220, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29286, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14607
+			zS = ts + 14626
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -126850,7 +126930,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+29229, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29295, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -126862,27 +126942,27 @@ 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+29244, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29310, 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 zSep uintptr = ts + 1566
 		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+29258, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21518
+				zList = rbuMPrintf(tls, p, ts+29324, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21584
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29270, libc.VaList(bp+40, zList))
+			ts+29336, libc.VaList(bp+40, zList))
 
 	} else {
-		var zSep uintptr = ts + 1547
+		var zSep uintptr = ts + 1566
 		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 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-				zList = rbuMPrintf(tls, p, ts+29320, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21518
+				zList = rbuMPrintf(tls, p, ts+29386, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21584
 			}
 		}
 	}
@@ -126891,7 +126971,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+29333, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29399, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -126905,21 +126985,21 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 		if int32(libc.Xstrlen(tls, zMask)) != (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 			rbuBadControlError(tls, p)
 		} else {
-			var zSep uintptr = ts + 1547
+			var zSep uintptr = ts + 1566
 			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+29320,
+					zList = rbuMPrintf(tls, p, ts+29386,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), i+1))
-					zSep = ts + 14607
+					zSep = ts + 14626
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29359,
+					zList = rbuMPrintf(tls, p, ts+29425,
 						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 + 14607
+					zSep = ts + 14626
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29389,
+					zList = rbuMPrintf(tls, p, ts+29455,
 						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 + 14607
+					zSep = ts + 14626
 				}
 			}
 		}
@@ -126954,19 +127034,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 + 29426
+		var zSep uintptr = ts + 29492
 		*(*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+28578, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28644, 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+16148) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16167) == 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+28606, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28672, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -126978,15 +127058,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 + 28846
+					zDesc = ts + 28912
 				} else {
-					zDesc = ts + 1547
+					zDesc = ts + 1566
 				}
-				z = rbuMPrintf(tls, p, ts+29439, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14607
+				z = rbuMPrintf(tls, p, ts+29505, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14626
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29450, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29516, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 60)))
 	}
 	return z
@@ -127001,12 +127081,12 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		*(*uintptr)(unsafe.Pointer(bp + 168)) = uintptr(0)
 		var zIdx uintptr = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 172)) = uintptr(0)
-		var zComma uintptr = ts + 1547
+		var zComma uintptr = ts + 1566
 		var zCols uintptr = uintptr(0)
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+36,
-			ts+29454)
+			ts+29520)
 		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))) {
@@ -127015,7 +127095,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+28606, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28672, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -127025,25 +127105,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+29504, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29570, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*4)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29526, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29592, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28846
+						return ts + 28912
 					}
-					return ts + 1547
+					return ts + 1566
 				}()))
-				zComma = ts + 14607
+				zComma = ts + 14626
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29536, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29602, 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+6434, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29551,
+			ts+29617,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 0, 0))
 	}
 }
 
@@ -127053,50 +127133,50 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
 		var tnum int32 = (*RbuObjIter)(unsafe.Pointer(pIter)).FiTnum
-		var zComma uintptr = ts + 1547
+		var zComma uintptr = ts + 1566
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
-			var zPk uintptr = ts + 1547
+			var zPk uintptr = ts + 1566
 			var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCol)*4))
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, (*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 + 29613
+				zPk = ts + 29679
 			}
-			zSql = rbuMPrintf(tls, p, ts+29626,
+			zSql = rbuMPrintf(tls, p, ts+29692,
 				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 + 29653
+							return ts + 29719
 						}
-						return ts + 1547
+						return ts + 1566
 					}()))
-			zComma = ts + 14607
+			zComma = ts + 14626
 		}
 
 		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+29663, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29729, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		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,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29736,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29702
+						return ts + 29768
 					}
-					return ts + 1547
+					return ts + 1566
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 0, 0))
 	}
 }
 
@@ -127109,7 +127189,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+29717,
+				ts+29783,
 				libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -127146,7 +127226,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+29774)
+			ts+29840)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 4)) == SQLITE_OK {
 		var rc2 int32
@@ -127251,7 +127331,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+29840, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29906, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -127271,24 +127351,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+6434, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29860,
+				ts+29926,
 				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+6434, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 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+29925, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29991, 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+29961, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 608)))))
+					Xsqlite3_mprintf(tls, ts+30027, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 608)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -127304,7 +127384,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29995,
+						ts+30061,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -127312,31 +127392,31 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 30056
+											return ts + 30122
 										}
-										return ts + 30060
+										return ts + 30126
 									}()
 								}
-								return ts + 1547
+								return ts + 1566
 							}(), zStart,
 							zCollist, zLimit))
 					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+30066,
+						ts+30132,
 						libc.VaList(bp+216, zCollist, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30127,
+						ts+30193,
 						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 + 30056
+									return ts + 30122
 								}
-								return ts + 30060
+								return ts + 30126
 							}(),
 							zCollist, zLimit))
 				}
@@ -127361,8 +127441,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+6445)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6441)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6464)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6460)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -127371,52 +127451,52 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			rbuCreateImposterTable2(tls, p, pIter)
 			zWrite = func() uintptr {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
-					return ts + 1547
+					return ts + 1566
 				}
-				return ts + 30286
+				return ts + 30352
 			}()
 
 			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+30295,
+						ts+30361,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30331
+								return ts + 30397
 							}
-							return ts + 1547
+							return ts + 1566
 						}(), zBindings)))
 			}
 
 			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+30341, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30407, 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
+				var zRbuRowid uintptr = ts + 1566
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30369
+					zRbuRowid = ts + 30435
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30381, libc.VaList(bp+408, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30447, libc.VaList(bp+408, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30457
+							return ts + 30523
 						}
-						return ts + 1547
+						return ts + 1566
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30474,
+					ts+30540,
 					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+30773,
+						ts+30839,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -127424,14 +127504,14 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-				var zRbuRowid uintptr = ts + 1547
+				var zRbuRowid uintptr = ts + 1566
 				var zStart uintptr = uintptr(0)
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30872
+						zRbuRowid = ts + 30938
 					} else {
-						zRbuRowid = ts + 30882
+						zRbuRowid = ts + 30948
 					}
 				}
 
@@ -127444,35 +127524,35 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28929, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28995, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14607, ts+1547)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1566, ts+14626, ts+1566)
 					}
 				}
 
 				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+30893,
+							ts+30959,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30941
+										return ts + 31007
 									}
-									return ts + 1547
+									return ts + 1566
 								}(),
 								zRbuRowid,
 								(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 									if zStart != 0 {
 										return zStart
 									}
-									return ts + 1547
+									return ts + 1566
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 22852
+										return ts + 22918
 									}
-									return ts + 1547
+									return ts + 1566
 								}(), zOrder,
 								zLimit)))
 				}
@@ -127535,12 +127615,12 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 		(*RbuObjIter)(unsafe.Pointer(pIter)).FpRbuUpdate = pUp
 
 		if zSet != 0 {
-			var zPrefix uintptr = ts + 1547
+			var zPrefix uintptr = ts + 1566
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30286
+				zPrefix = ts + 30352
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30947,
+			zUpdate = Xsqlite3_mprintf(tls, ts+31013,
 				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)
@@ -127567,7 +127647,7 @@ func rbuOpenDbhandle(tls *libc.TLS, p uintptr, zName uintptr, bUseVfs int32) uin
 			return uintptr(0)
 		}())
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
 			Xsqlite3_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 			*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 		}
@@ -127599,7 +127679,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+30977, libc.VaList(bp, p+24)))
+		Xsqlite3_mprintf(tls, ts+31043, 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:
@@ -127669,28 +127749,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+6434, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453, 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+6434)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31007, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31073, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		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))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31101, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.Xmemcpy(tls, p+24, ts+3298, uint32(4))
 	} else {
-		libc.Xmemcpy(tls, p+24, ts+6434, uint32(4))
+		libc.Xmemcpy(tls, p+24, ts+6453, uint32(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31053, libc.VaList(bp+24, p+24))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31119, 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+6434, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -127723,11 +127803,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+31119, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31185, 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+24199, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint32(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= Size_t(5) && 0 == libc.Xmemcmp(tls, ts+24265, (*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)))) == '?' {
@@ -127739,16 +127819,16 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31151,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434),
+			zTarget = Xsqlite3_mprintf(tls, ts+31217,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453),
 					func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1547
+							return ts + 1566
 						}
-						return ts + 31183
+						return ts + 31249
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1547
+							return ts + 1566
 						}
 						return zExtra
 					}()))
@@ -127764,37 +127844,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+31185, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31251, -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+31200, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31266, 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+31217, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31283, -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+6434, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31233, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31299, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 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+31261, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31327, 0)
 	}
 }
 
@@ -127823,14 +127903,14 @@ 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+31233, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31299, 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+31279, uintptr(0), uintptr(0), uintptr(0))
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31345, uintptr(0), uintptr(0), uintptr(0))
 		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
@@ -127939,7 +128019,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+6434, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6453, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -127956,23 +128036,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+31314, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31380, 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+6434)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453)
 	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+6434)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31339, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31405, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31412, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -128089,7 +128169,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+23837, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23903, 0)
 			return
 		}
 
@@ -128182,7 +128262,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+31353)
+			ts+31419)
 		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)
@@ -128190,7 +128270,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+31375, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31441, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -128211,7 +128291,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+31402,
+				ts+31468,
 				libc.VaList(bp, p+24,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -128241,9 +128321,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+31560, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31626, 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+31575,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31641,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -128257,10 +128337,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+31595, uintptr(0), uintptr(0), p+36)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31661, 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+31620)
+			ts+31686)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128274,12 +128354,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+31728)
+			ts+31794)
 	}
 
 	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+31793)
+			ts+31859)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128291,7 +128371,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+31837, uintptr(0), uintptr(0), p+36)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31903, uintptr(0), uintptr(0), p+36)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -128311,15 +128391,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+17233)
-					rbuCopyPragma(tls, p, ts+16344)
+					rbuCopyPragma(tls, p, ts+17252)
+					rbuCopyPragma(tls, p, ts+16363)
 				}
 
 				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+31862, libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31928, libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -128343,10 +128423,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+14511, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14530, 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+14511, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14530, uintptr(0), uintptr(0), p+36)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -128441,7 +128521,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+31890, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31956, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -128457,10 +128537,10 @@ func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(12)
 	defer tls.Free(12)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31339, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31405, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 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)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
@@ -128474,7 +128554,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+31915, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]uint8{})), bp+12, ts+31981, 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)
@@ -128508,7 +128588,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+12,
 		Xsqlite3_mprintf(tls,
-			ts+31926, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31992, 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 {
@@ -128538,13 +128618,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+31998, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32064, 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+32012)
+				ts+32078)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -128555,7 +128635,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+32069)
+				ts+32135)
 			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)
@@ -128600,7 +128680,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			libc.Xmemcpy(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, zRbu, nRbu+Size_t(1))
 			pCsr += uintptr(nRbu + Size_t(1))
 			if zState != 0 {
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3656, libc.VaList(bp, zState))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3675, libc.VaList(bp, zState))
 			}
 
 			rbuOpenDatabase(tls, p, uintptr(0), bp+16)
@@ -128629,7 +128709,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+32143, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32209, 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
@@ -128647,12 +128727,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+32175,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32241,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32207
+							return ts + 32273
 						}
-						return ts + 32214
+						return ts + 32280
 					}()))
 			}
 		}
@@ -128660,7 +128740,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+14496, uintptr(0), uintptr(0), p+36)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14515, uintptr(0), uintptr(0), p+36)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+48)
@@ -128671,19 +128751,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+16947)
-						rbuCopyPragma(tls, p, ts+16359)
+						rbuCopyPragma(tls, p, ts+16966)
+						rbuCopyPragma(tls, p, ts+16378)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32221, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32287, uintptr(0), uintptr(0), p+36)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6434, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6453, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32237, uintptr(0), uintptr(0), p+36)
+								db, ts+32303, uintptr(0), uintptr(0), p+36)
 						}
 					}
 
@@ -128737,7 +128817,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+32261, zState+uintptr(n-7), uint32(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32327, zState+uintptr(n-7), uint32(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -128764,7 +128844,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+30286, uint32(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30352, 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++
@@ -128781,7 +128861,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+14511, uintptr(0), uintptr(0), p+36)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14530, uintptr(0), uintptr(0), p+36)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -128794,13 +128874,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+14511, uintptr(0), uintptr(0), p+36)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14530, 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+32269, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32335, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -128895,7 +128975,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+14511, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14530, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128912,19 +128992,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+14511, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14530, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14496
+				zBegin = ts + 14515
 			} else {
-				zBegin = ts + 32221
+				zBegin = ts + 32287
 			}
 			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+32221, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32287, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -129270,7 +129350,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+32296, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32362, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -129295,7 +129375,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+32319, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32385, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -129440,7 +129520,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+6434)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6453)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -129455,7 +129535,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+32330, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32396, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -129700,6 +129780,964 @@ func Xsqlite3rbu_temp_size(tls *libc.TLS, pRbu uintptr) Sqlite3_int64 {
 	return (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FszTemp
 }
 
+var zDbstatSchema = *(*[258]uint8)(unsafe.Pointer(ts + 32407))
+
+// Forward reference to data structured used in this module
+type StatTable1 = struct {
+	Fbase Sqlite3_vtab
+	Fdb   uintptr
+	FiDb  int32
+}
+
+// Forward reference to data structured used in this module
+type StatTable = StatTable1
+type StatCursor1 = struct {
+	Fbase        Sqlite3_vtab_cursor
+	FpStmt       uintptr
+	FisEof       U8
+	FisAgg       U8
+	F__ccgo_pad1 [2]byte
+	FiDb         int32
+	FaPage       [32]StatPage
+	FiPage       int32
+	FiPageno     U32
+	FzName       uintptr
+	FzPath       uintptr
+	FzPagetype   uintptr
+	FnPage       int32
+	FnCell       int32
+	FnMxPayload  int32
+	FnUnused     I64
+	FnPayload    I64
+	FiOffset     I64
+	FszPage      I64
+}
+
+type StatCursor = StatCursor1
+type StatPage1 = struct {
+	FiPgno         U32
+	FaPg           uintptr
+	FiCell         int32
+	FzPath         uintptr
+	Fflags         U8
+	F__ccgo_pad1   [3]byte
+	FnCell         int32
+	FnUnused       int32
+	FaCell         uintptr
+	FiRightChildPg U32
+	FnMxPayload    int32
+}
+
+type StatPage = StatPage1
+type StatCell1 = struct {
+	FnLocal    int32
+	FiChildPg  U32
+	FnOvfl     int32
+	FaOvfl     uintptr
+	FnLastOvfl int32
+	FiOvfl     int32
+}
+
+type StatCell = StatCell1
+
+func statConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = uintptr(0)
+	var rc int32 = SQLITE_OK
+	var iDb int32
+	_ = pAux
+
+	if argc >= 4 {
+		Xsqlite3TokenInit(tls, bp+8, *(*uintptr)(unsafe.Pointer(argv + 3*4)))
+		iDb = Xsqlite3FindDb(tls, db, bp+8)
+		if iDb < 0 {
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+11883, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(argv + 3*4))))
+			return SQLITE_ERROR
+		}
+	} else {
+		iDb = 0
+	}
+	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_DIRECTONLY, 0)
+	rc = Xsqlite3_declare_vtab(tls, db, uintptr(unsafe.Pointer(&zDbstatSchema)))
+	if rc == SQLITE_OK {
+		pTab = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatTable{})))
+		if pTab == uintptr(0) {
+			rc = SQLITE_NOMEM
+		}
+	}
+
+	if rc == SQLITE_OK {
+		libc.Xmemset(tls, pTab, 0, uint32(unsafe.Sizeof(StatTable{})))
+		(*StatTable)(unsafe.Pointer(pTab)).Fdb = db
+		(*StatTable)(unsafe.Pointer(pTab)).FiDb = iDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
+	return rc
+}
+
+func statDisconnect(tls *libc.TLS, pVtab uintptr) int32 {
+	Xsqlite3_free(tls, pVtab)
+	return SQLITE_OK
+}
+
+func statBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
+	var i int32
+	var iSchema int32 = -1
+	var iName int32 = -1
+	var iAgg int32 = -1
+	_ = tab
+
+	for i = 0; i < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; i++ {
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fop) != SQLITE_INDEX_CONSTRAINT_EQ {
+			continue
+		}
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fusable) == 0 {
+			return SQLITE_CONSTRAINT
+		}
+		switch (*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(i)*12)).FiColumn {
+		case 0:
+			{
+				iName = i
+				break
+
+			}
+		case 10:
+			{
+				iSchema = i
+				break
+
+			}
+		case 11:
+			{
+				iAgg = i
+				break
+
+			}
+		}
+	}
+	i = 0
+	if iSchema >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).Fomit = uint8(1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 20)) |= 0x01
+	}
+	if iName >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iName)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 20)) |= 0x02
+	}
+	if iAgg >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iAgg)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 20)) |= 0x04
+	}
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 1.0
+
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy == 1 &&
+		(*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)).FnOrderBy == 2 &&
+		(*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_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).FiColumn == 1 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+		*(*int32)(unsafe.Pointer(pIdxInfo + 20)) |= 0x08
+	}
+
+	return SQLITE_OK
+}
+
+func statOpen(tls *libc.TLS, pVTab uintptr, ppCursor uintptr) int32 {
+	var pTab uintptr = pVTab
+	var pCsr uintptr
+
+	pCsr = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatCursor{})))
+	if pCsr == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		libc.Xmemset(tls, pCsr, 0, uint32(unsafe.Sizeof(StatCursor{})))
+		(*StatCursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab = pVTab
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppCursor)) = pCsr
+	return SQLITE_OK
+}
+
+func statClearCells(tls *libc.TLS, p uintptr) {
+	var i int32
+	if (*StatPage)(unsafe.Pointer(p)).FaCell != 0 {
+		for i = 0; i < (*StatPage)(unsafe.Pointer(p)).FnCell; i++ {
+			Xsqlite3_free(tls, (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell+uintptr(i)*24)).FaOvfl)
+		}
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FaCell)
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnCell = 0
+	(*StatPage)(unsafe.Pointer(p)).FaCell = uintptr(0)
+}
+
+func statClearPage(tls *libc.TLS, p uintptr) {
+	var aPg uintptr = (*StatPage)(unsafe.Pointer(p)).FaPg
+	statClearCells(tls, p)
+	Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FzPath)
+	libc.Xmemset(tls, p, 0, uint32(unsafe.Sizeof(StatPage{})))
+	(*StatPage)(unsafe.Pointer(p)).FaPg = aPg
+}
+
+func statResetCsr(tls *libc.TLS, pCsr uintptr) {
+	var i int32
+
+	for i = 0; i < int32(uint32(unsafe.Sizeof([32]StatPage{}))/uint32(unsafe.Sizeof(StatPage{}))); i++ {
+		statClearPage(tls, pCsr+16+uintptr(i)*40)
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(pCsr+16+uintptr(i)*40)).FaPg)
+		(*StatPage)(unsafe.Pointer(pCsr + 16 + uintptr(i)*40)).FaPg = uintptr(0)
+	}
+	Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(0)
+}
+
+func statResetCounts(tls *libc.TLS, pCsr uintptr) {
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnCell = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnUnused = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPayload = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FszPage = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 0
+}
+
+func statClose(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	Xsqlite3_free(tls, pCsr)
+	return SQLITE_OK
+}
+
+func getLocalPayload(tls *libc.TLS, nUsable int32, flags U8, nTotal int32) int32 {
+	var nLocal int32
+	var nMinLocal int32
+	var nMaxLocal int32
+
+	if int32(flags) == 0x0D {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = nUsable - 35
+	} else {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = (nUsable-12)*64/255 - 23
+	}
+
+	nLocal = nMinLocal + (nTotal-nMinLocal)%(nUsable-4)
+	if nLocal > nMaxLocal {
+		nLocal = nMinLocal
+	}
+	return nLocal
+}
+
+func statDecodePage(tls *libc.TLS, pBt uintptr, p uintptr) int32 {
+	bp := tls.Alloc(20)
+	defer tls.Free(20)
+
+	var nUnused int32
+	var iOff int32
+	var nHdr int32
+	var isLeaf int32
+	var szPage int32
+	var aData uintptr
+	var aHdr uintptr
+	var iNext int32
+
+	var rc int32
+	var iPrev U32
+
+	var j int32
+	var nOvfl int32
+
+	var nLocal int32
+	var pCell uintptr
+	var i int32
+	var nUsable int32
+	aData = (*StatPage)(unsafe.Pointer(p)).FaPg
+	aHdr = aData + uintptr(func() int32 {
+		if (*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1) {
+			return 100
+		}
+		return 0
+	}())
+
+	(*StatPage)(unsafe.Pointer(p)).Fflags = *(*U8)(unsafe.Pointer(aHdr))
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0A || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __1
+	}
+	isLeaf = 1
+	nHdr = 8
+	goto __2
+__1:
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05 || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x02) {
+		goto __3
+	}
+	isLeaf = 0
+	nHdr = 12
+	goto __4
+__3:
+	goto statPageIsCorrupt
+__4:
+	;
+__2:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1)) {
+		goto __5
+	}
+	nHdr = nHdr + 100
+__5:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnCell = int32(*(*U8)(unsafe.Pointer(aHdr + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 3 + 1)))
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = 0
+	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
+
+	nUnused = int32(*(*U8)(unsafe.Pointer(aHdr + 5)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 5 + 1))) - nHdr - 2*(*StatPage)(unsafe.Pointer(p)).FnCell
+	nUnused = nUnused + int32(*(*U8)(unsafe.Pointer(aHdr + 7)))
+	iOff = int32(*(*U8)(unsafe.Pointer(aHdr + 1)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 1 + 1)))
+__6:
+	if !(iOff != 0) {
+		goto __7
+	}
+	if !(iOff >= szPage) {
+		goto __8
+	}
+	goto statPageIsCorrupt
+__8:
+	;
+	nUnused = nUnused + (int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2) + 1))))
+	iNext = int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff) + 1)))
+	if !(iNext < iOff+4 && iNext > 0) {
+		goto __9
+	}
+	goto statPageIsCorrupt
+__9:
+	;
+	iOff = iNext
+	goto __6
+__7:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnUnused = nUnused
+	(*StatPage)(unsafe.Pointer(p)).FiRightChildPg = func() uint32 {
+		if isLeaf != 0 {
+			return uint32(0)
+		}
+		return Xsqlite3Get4byte(tls, aHdr+8)
+	}()
+
+	if !((*StatPage)(unsafe.Pointer(p)).FnCell != 0) {
+		goto __10
+	}
+
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = szPage - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatPage)(unsafe.Pointer(p)).FaCell = Xsqlite3_malloc64(tls, uint64(uint32((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint32(unsafe.Sizeof(StatCell{}))))
+	if !((*StatPage)(unsafe.Pointer(p)).FaCell == uintptr(0)) {
+		goto __11
+	}
+	return SQLITE_NOMEM
+__11:
+	;
+	libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0, uint32((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint32(unsafe.Sizeof(StatCell{})))
+
+	i = 0
+__12:
+	if !(i < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __14
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr(i)*24
+
+	iOff = int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2) + 1)))
+	if !(iOff < nHdr || iOff >= szPage) {
+		goto __15
+	}
+	goto statPageIsCorrupt
+__15:
+	;
+	if !!(isLeaf != 0) {
+		goto __16
+	}
+	(*StatCell)(unsafe.Pointer(pCell)).FiChildPg = Xsqlite3Get4byte(tls, aData+uintptr(iOff))
+	iOff = iOff + 4
+__16:
+	;
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05) {
+		goto __17
+	}
+
+	goto __18
+__17:
+	iOff = iOff + int32(func() uint8 {
+		if int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff)))) < int32(U8(0x80)) {
+			return uint8(func() int32 {
+				*(*U32)(unsafe.Pointer(bp)) = U32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))
+				return 1
+			}())
+		}
+		return Xsqlite3GetVarint32(tls, aData+uintptr(iOff), bp)
+	}())
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __19
+	}
+	iOff = iOff + int32(Xsqlite3GetVarint(tls, aData+uintptr(iOff), bp+8))
+__19:
+	;
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32((*StatPage)(unsafe.Pointer(p)).FnMxPayload)) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = int32(*(*U32)(unsafe.Pointer(bp)))
+__20:
+	;
+	nLocal = getLocalPayload(tls, nUsable, (*StatPage)(unsafe.Pointer(p)).Fflags, int32(*(*U32)(unsafe.Pointer(bp))))
+	if !(nLocal < 0) {
+		goto __21
+	}
+	goto statPageIsCorrupt
+__21:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLocal = nLocal
+
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32(nLocal)) {
+		goto __22
+	}
+	nOvfl = int32((*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) + U32(nUsable) - U32(4) - U32(1)) / U32(nUsable-4))
+	if !(iOff+nLocal+4 > nUsable || *(*U32)(unsafe.Pointer(bp)) > U32(0x7fffffff)) {
+		goto __23
+	}
+	goto statPageIsCorrupt
+__23:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl = int32(*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) - U32((nOvfl-1)*(nUsable-4)))
+	(*StatCell)(unsafe.Pointer(pCell)).FnOvfl = nOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FaOvfl = Xsqlite3_malloc64(tls, uint64(uint32(unsafe.Sizeof(U32(0)))*uint32(nOvfl)))
+	if !((*StatCell)(unsafe.Pointer(pCell)).FaOvfl == uintptr(0)) {
+		goto __24
+	}
+	return SQLITE_NOMEM
+__24:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl)) = Xsqlite3Get4byte(tls, aData+uintptr(iOff+nLocal))
+	j = 1
+__25:
+	if !(j < nOvfl) {
+		goto __27
+	}
+	iPrev = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j-1)*4))
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPrev, bp+16, 0)
+	if !(rc != SQLITE_OK) {
+		goto __28
+	}
+
+	return rc
+__28:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j)*4)) = Xsqlite3Get4byte(tls, Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 16))))
+	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
+	goto __26
+__26:
+	j++
+	goto __25
+	goto __27
+__27:
+	;
+__22:
+	;
+__18:
+	;
+	goto __13
+__13:
+	i++
+	goto __12
+	goto __14
+__14:
+	;
+__10:
+	;
+	return SQLITE_OK
+
+statPageIsCorrupt:
+	(*StatPage)(unsafe.Pointer(p)).Fflags = U8(0)
+	statClearCells(tls, p)
+	return SQLITE_OK
+}
+
+func statSizeAndOffset(tls *libc.TLS, pCsr uintptr) {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCsr)).FpVtab
+	var pBt uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatTable)(unsafe.Pointer(pTab)).FiDb)*16)).FpBt
+	var pPager uintptr = Xsqlite3BtreePager(tls, pBt)
+	var fd uintptr
+
+	fd = Xsqlite3PagerFile(tls, pPager)
+	*(*Sqlite3_int64)(unsafe.Pointer(bp)) = Sqlite3_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	if Xsqlite3OsFileControl(tls, fd, 230440, bp) == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = *(*Sqlite3_int64)(unsafe.Pointer(bp))
+		*(*I64)(unsafe.Pointer(pCsr + 1352)) += *(*Sqlite3_int64)(unsafe.Pointer(bp + 1*8))
+	} else {
+		*(*I64)(unsafe.Pointer(pCsr + 1352)) += I64(Xsqlite3BtreeGetPageSize(tls, pBt))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = (*StatCursor)(unsafe.Pointer(pCsr)).FszPage * I64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno-U32(1))
+	}
+}
+
+func statGetPage(tls *libc.TLS, pBt uintptr, iPg U32, pPg uintptr) int32 {
+	bp := tls.Alloc(4)
+	defer tls.Free(4)
+
+	var pgsz int32 = Xsqlite3BtreeGetPageSize(tls, pBt)
+	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
+	var rc int32
+
+	if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+		(*StatPage)(unsafe.Pointer(pPg)).FaPg = Xsqlite3_malloc(tls, pgsz+DBSTAT_PAGE_PADDING_BYTES)
+		if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+			return SQLITE_NOMEM
+		}
+		libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0, uint32(DBSTAT_PAGE_PADDING_BYTES))
+	}
+
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPg, bp, 0)
+	if rc == SQLITE_OK {
+		var a uintptr = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		libc.Xmemcpy(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, a, uint32(pgsz))
+		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+	}
+
+	return rc
+}
+
+func statNext(tls *libc.TLS, pCursor uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
+	var rc int32
+	var nPayload int32
+	var z uintptr
+	var pCsr uintptr
+	var pTab uintptr
+	var pBt uintptr
+	var pPager uintptr
+
+	var iRoot U32
+	var nUsable int32
+	var iOvfl int32
+	var pCell uintptr
+
+	var p uintptr
+	var i int32
+	var p1 uintptr
+	pCsr = pCursor
+	pTab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	pBt = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*16)).FpBt
+	pPager = Xsqlite3BtreePager(tls, pBt)
+
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+
+statNextRestart:
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __1
+	}
+
+	statResetCounts(tls, pCsr)
+	rc = Xsqlite3_step(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	if !(rc == SQLITE_ROW) {
+		goto __3
+	}
+	iRoot = U32(Xsqlite3_column_int64(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 1))
+	Xsqlite3PagerPagecount(tls, pPager, bp+48)
+	if !(*(*int32)(unsafe.Pointer(bp + 48)) == 0) {
+		goto __5
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__5:
+	;
+	rc = statGetPage(tls, pBt, iRoot, pCsr+16)
+	(*StatPage)(unsafe.Pointer(pCsr + 16)).FiPgno = iRoot
+	(*StatPage)(unsafe.Pointer(pCsr + 16)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __6
+	}
+	(*StatPage)(unsafe.Pointer(pCsr + 16)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32665, 0))
+	if !(z == uintptr(0)) {
+		goto __7
+	}
+	rc = SQLITE_NOMEM
+__7:
+	;
+__6:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 1
+	goto __4
+__3:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__4:
+	;
+	goto __2
+__1:
+	p = pCsr + 16 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*40
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __8
+	}
+	statResetCounts(tls, pCsr)
+__8:
+	;
+__9:
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __10
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*24
+__11:
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl) {
+		goto __12
+	}
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = Xsqlite3BtreeGetPageSize(tls, pBt) - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	statSizeAndOffset(tls, pCsr)
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl-1) {
+		goto __13
+	}
+	*(*I64)(unsafe.Pointer(pCsr + 1336)) += I64(nUsable - 4)
+	goto __14
+__13:
+	*(*I64)(unsafe.Pointer(pCsr + 1336)) += I64((*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+	*(*I64)(unsafe.Pointer(pCsr + 1328)) += I64(nUsable - 4 - (*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+__14:
+	;
+	iOvfl = (*StatCell)(unsafe.Pointer(pCell)).FiOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FiOvfl++
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __15
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(iOvfl)*4))
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32667
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls,
+		ts+32676, libc.VaList(bp, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell, iOvfl)))
+	if z == uintptr(0) {
+		return SQLITE_NOMEM
+	}
+	return SQLITE_OK
+__15:
+	;
+	goto __11
+__12:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiRightChildPg != 0) {
+		goto __16
+	}
+	goto __10
+__16:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+	goto __9
+__10:
+	;
+	if !(!(int32((*StatPage)(unsafe.Pointer(p)).FiRightChildPg) != 0) || (*StatPage)(unsafe.Pointer(p)).FiCell > (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __17
+	}
+	statClearPage(tls, p)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage--
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 && (*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __18
+	}
+
+	return SQLITE_OK
+__18:
+	;
+	goto statNextRestart
+__17:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage++
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage >= int32(uint32(unsafe.Sizeof([32]StatPage{}))/uint32(unsafe.Sizeof(StatPage{})))) {
+		goto __19
+	}
+	statResetCsr(tls, pCsr)
+	return Xsqlite3CorruptError(tls, 215455)
+__19:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell == (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*40)).FiPgno = (*StatPage)(unsafe.Pointer(p)).FiRightChildPg
+	goto __21
+__20:
+	(*StatPage)(unsafe.Pointer(p + 1*40)).FiPgno = (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*24)).FiChildPg
+__21:
+	;
+	rc = statGetPage(tls, pBt, (*StatPage)(unsafe.Pointer(p+1*40)).FiPgno, p+1*40)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	(*StatPage)(unsafe.Pointer(p + 1*40)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __22
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*40)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32688, libc.VaList(bp+24, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell)))
+	if !(z == uintptr(0)) {
+		goto __23
+	}
+	rc = SQLITE_NOMEM
+__23:
+	;
+__22:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+__2:
+	;
+	if !(rc == SQLITE_OK) {
+		goto __24
+	}
+	p1 = pCsr + 16 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*40
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = (*StatPage)(unsafe.Pointer(p1)).FiPgno
+
+	rc = statDecodePage(tls, pBt, p1)
+	if !(rc == SQLITE_OK) {
+		goto __25
+	}
+	statSizeAndOffset(tls, pCsr)
+
+	switch int32((*StatPage)(unsafe.Pointer(p1)).Fflags) {
+	case 0x05:
+		goto __27
+	case 0x02:
+		goto __28
+	case 0x0D:
+		goto __29
+	case 0x0A:
+		goto __30
+	default:
+		goto __31
+	}
+	goto __26
+__27:
+__28:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32696
+	goto __26
+__29:
+__30:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32705
+	goto __26
+__31:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32710
+	goto __26
+__26:
+	;
+	*(*int32)(unsafe.Pointer(pCsr + 1320)) += (*StatPage)(unsafe.Pointer(p1)).FnCell
+	*(*I64)(unsafe.Pointer(pCsr + 1328)) += I64((*StatPage)(unsafe.Pointer(p1)).FnUnused)
+	if !((*StatPage)(unsafe.Pointer(p1)).FnMxPayload > (*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload) {
+		goto __32
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = (*StatPage)(unsafe.Pointer(p1)).FnMxPayload
+__32:
+	;
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __33
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+40, (*StatPage)(unsafe.Pointer(p1)).FzPath)))
+	if !(z == uintptr(0)) {
+		goto __34
+	}
+	rc = SQLITE_NOMEM
+__34:
+	;
+__33:
+	;
+	nPayload = 0
+	i = 0
+__35:
+	if !(i < (*StatPage)(unsafe.Pointer(p1)).FnCell) {
+		goto __37
+	}
+	nPayload = nPayload + (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p1)).FaCell+uintptr(i)*24)).FnLocal
+	goto __36
+__36:
+	i++
+	goto __35
+	goto __37
+__37:
+	;
+	*(*I64)(unsafe.Pointer(pCsr + 1336)) += I64(nPayload)
+
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0) {
+		goto __38
+	}
+	goto statNextRestart
+__38:
+	;
+__25:
+	;
+__24:
+	;
+	return rc
+}
+
+func statEof(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	return int32((*StatCursor)(unsafe.Pointer(pCsr)).FisEof)
+}
+
+func statFilter(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintptr, argc int32, argv uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pCsr uintptr = pCursor
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	var pSql uintptr
+	var zSql uintptr
+	var iArg int32 = 0
+	var rc int32 = SQLITE_OK
+	var zName uintptr = uintptr(0)
+	_ = argc
+	_ = idxStr
+
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FpStmt = uintptr(0)
+	if idxNum&0x01 != 0 {
+		var zDbase uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*4)))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = Xsqlite3FindDbName(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zDbase)
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FiDb < 0 {
+			(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = 0
+			(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+			return SQLITE_OK
+		}
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+	if idxNum&0x02 != 0 {
+		zName = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*4)))
+	}
+	if idxNum&0x04 != 0 {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(libc.Bool32(Xsqlite3_value_double(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*4))) != 0.0))
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(0)
+	}
+	pSql = Xsqlite3_str_new(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb)
+	Xsqlite3_str_appendf(tls, pSql,
+		ts+32720,
+		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb+uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*16)).FzDbSName))
+	if zName != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32875, libc.VaList(bp+8, zName))
+	}
+	if idxNum&0x08 != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32889, 0)
+	}
+	zSql = Xsqlite3_str_finish(tls, pSql)
+	if zSql == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		rc = Xsqlite3_prepare_v2(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+4, uintptr(0))
+		Xsqlite3_free(tls, zSql)
+	}
+
+	if rc == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = -1
+		rc = statNext(tls, pCursor)
+	}
+	return rc
+}
+
+func statColumn(tls *libc.TLS, pCursor uintptr, ctx uintptr, i int32) int32 {
+	var pCsr uintptr = pCursor
+	switch i {
+	case 0:
+		Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzName, -1, libc.UintptrFromInt32(-1))
+		break
+	case 1:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath, -1, libc.UintptrFromInt32(-1))
+		}
+		break
+	case 2:
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnPage))
+		} else {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno))
+		}
+		break
+	case 3:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype, -1, uintptr(0))
+		}
+		break
+	case 4:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnCell))
+		break
+	case 5:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnPayload)
+		break
+	case 6:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnUnused)
+		break
+	case 7:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload))
+		break
+	case 8:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FiOffset)
+		}
+		break
+	case 9:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FszPage)
+		break
+	case 10:
+		{
+			var db uintptr = Xsqlite3_context_db_handle(tls, ctx)
+			var iDb int32 = (*StatCursor)(unsafe.Pointer(pCsr)).FiDb
+			Xsqlite3_result_text(tls, ctx, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, -1, uintptr(0))
+			break
+
+		}
+	default:
+		{
+			Xsqlite3_result_int(tls, ctx, int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg))
+			break
+
+		}
+	}
+	return SQLITE_OK
+}
+
+func statRowid(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32 {
+	var pCsr uintptr = pCursor
+	*(*Sqlite_int64)(unsafe.Pointer(pRowid)) = Sqlite_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	return SQLITE_OK
+}
+
+// Invoke this routine to register the "dbstat" virtual table module
+func Xsqlite3DbstatRegister(tls *libc.TLS, db uintptr) int32 {
+	return Xsqlite3_create_module(tls, db, ts+32904, uintptr(unsafe.Pointer(&dbstat_module)), uintptr(0))
+}
+
+var dbstat_module = Sqlite3_module{
+	FxCreate:     0,
+	FxConnect:    0,
+	FxBestIndex:  0,
+	FxDisconnect: 0,
+	FxDestroy:    0,
+	FxOpen:       0,
+	FxClose:      0,
+	FxFilter:     0,
+	FxNext:       0,
+	FxEof:        0,
+	FxColumn:     0,
+	FxRowid:      0,
+}
+
 type SessionTable1 = struct {
 	FpNext    uintptr
 	FzName    uintptr
@@ -130276,13 +131314,13 @@ 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+11341, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11360, 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+32341, 0)
+				ts+32911, 0)
 		} else if rc == SQLITE_ERROR {
-			zPragma = Xsqlite3_mprintf(tls, ts+1547, 0)
+			zPragma = Xsqlite3_mprintf(tls, ts+1566, 0)
 		} else {
 			*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
 			*(*uintptr)(unsafe.Pointer(pabPK)) = uintptr(0)
@@ -130293,7 +131331,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32462, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+33032, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -130391,7 +131429,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11341, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11360, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -130640,7 +131678,7 @@ __4:
 	goto error_out
 __7:
 	;
-	Xsqlite3ValueSetStr(tls, p, 0, ts+1547, uint8(0), uintptr(0))
+	Xsqlite3ValueSetStr(tls, p, 0, ts+1566, uint8(0), uintptr(0))
 	(*Sqlite3_session)(unsafe.Pointer(pSession)).FpZeroBlob = p
 __6:
 	;
@@ -130967,14 +132005,14 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	var zRet uintptr = uintptr(0)
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32491,
+			zRet = Xsqlite3_mprintf(tls, ts+33061,
 				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 + 21518
+			zSep = ts + 21584
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130989,7 +132027,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	var zRet uintptr = uintptr(0)
 	var bHave int32 = 0
 
@@ -130997,9 +132035,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+32525,
+				ts+33095,
 				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 + 32566
+			zSep = ts + 33136
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131007,7 +132045,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7523, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7531, 0)
 	}
 
 	return zRet
@@ -131018,7 +132056,7 @@ func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintpt
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32571,
+		ts+33141,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -131061,7 +132099,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32649,
+			ts+33219,
 			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
@@ -131188,7 +132226,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32702, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33272, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -131453,7 +132491,7 @@ func sessionAppendInteger(tls *libc.TLS, p uintptr, iVal int32, pRc uintptr) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
-	Xsqlite3_snprintf(tls, int32(uint32(unsafe.Sizeof([24]uint8{}))-uint32(1)), bp+8, ts+4968, libc.VaList(bp, iVal))
+	Xsqlite3_snprintf(tls, int32(uint32(unsafe.Sizeof([24]uint8{}))-uint32(1)), bp+8, ts+4987, libc.VaList(bp, iVal))
 	sessionAppendStr(tls, p, bp+8, pRc)
 }
 
@@ -131662,29 +132700,29 @@ 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+11341, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11360, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32729, libc.VaList(bp, zDb))
+			ts+33299, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_NOMEM
 		}
 	} else {
 		var i int32
-		var zSep uintptr = ts + 1547
+		var zSep uintptr = ts + 1566
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32839, bp+20)
+		sessionAppendStr(tls, bp+8, ts+33409, bp+20)
 		sessionAppendIdent(tls, bp+8, zDb, bp+20)
-		sessionAppendStr(tls, bp+8, ts+1560, bp+20)
+		sessionAppendStr(tls, bp+8, ts+1579, bp+20)
 		sessionAppendIdent(tls, bp+8, zTab, bp+20)
-		sessionAppendStr(tls, bp+8, ts+32854, bp+20)
+		sessionAppendStr(tls, bp+8, ts+33424, 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+32862, bp+20)
+				sessionAppendStr(tls, bp+8, ts+33432, bp+20)
 				sessionAppendInteger(tls, bp+8, i+1, bp+20)
-				zSep = ts + 21518
+				zSep = ts + 21584
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -131793,7 +132831,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+32868, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33438, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 24)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 24))
 	}
@@ -131885,7 +132923,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+12)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32888, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33458, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 24))
 }
@@ -132148,7 +133186,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, 219078)
+				rc = Xsqlite3CorruptError(tls, 219169)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -132171,7 +133209,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, 219098)
+						rc = Xsqlite3CorruptError(tls, 219189)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -132213,7 +133251,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, 219152)
+			rc = Xsqlite3CorruptError(tls, 219243)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -132274,7 +133312,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, 219240)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219331)
 		}
 	}
 
@@ -132348,13 +133386,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, 219326))
+		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219417))
 	}
 
 	(*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, 219332))
+		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219423))
 	}
 
 	if paRec != 0 {
@@ -132416,7 +133454,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, 219376))
+						return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219467))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*4)) = uintptr(0)
 				}
@@ -132789,7 +133827,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 219741)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 219832)
 	goto finished_invert
 __6:
 	;
@@ -132955,45 +133993,45 @@ 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+11341) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11360) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_NOMEM
 			} else {
-				var zSep uintptr = ts + 1547
+				var zSep uintptr = ts + 1566
 
 				libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(SessionBuffer{})))
 				(*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+32906, bp+12)
+				sessionAppendStr(tls, bp, ts+33476, bp+12)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+12)
-				sessionAppendStr(tls, bp, ts+32919, bp+12)
+				sessionAppendStr(tls, bp, ts+33489, 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+32925, bp+12)
+						sessionAppendStr(tls, bp, ts+33495, bp+12)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+12)
-						zSep = ts + 14607
+						zSep = ts + 14626
 					}
 				}
 
-				zSep = ts + 1547
-				sessionAppendStr(tls, bp, ts+32854, bp+12)
+				zSep = ts + 1566
+				sessionAppendStr(tls, bp, ts+33424, 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+32930, bp+12)
+								ts+33500, bp+12)
 						} else {
 							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+33432, bp+12)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+12)
 						}
-						zSep = ts + 21518
+						zSep = ts + 21584
 					}
 				}
 
@@ -133040,42 +134078,42 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	defer tls.Free(16)
 
 	var i int32
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_OK
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+33005, bp+12)
+	sessionAppendStr(tls, bp, ts+33575, bp+12)
 	sessionAppendIdent(tls, bp, zTab, bp+12)
-	sessionAppendStr(tls, bp, ts+32854, bp+12)
+	sessionAppendStr(tls, bp, ts+33424, 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+32925, bp+12)
+			sessionAppendStr(tls, bp, ts+33495, bp+12)
 			sessionAppendInteger(tls, bp, i+1, bp+12)
-			zSep = ts + 21518
+			zSep = ts + 21584
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+33023, bp+12)
+		sessionAppendStr(tls, bp, ts+33593, bp+12)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+12)
-		sessionAppendStr(tls, bp, ts+32566, bp+12)
+		sessionAppendStr(tls, bp, ts+33136, bp+12)
 
-		zSep = ts + 1547
+		zSep = ts + 1566
 		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+32862, bp+12)
+				sessionAppendStr(tls, bp, ts+33432, bp+12)
 				sessionAppendInteger(tls, bp, i+1, bp+12)
-				zSep = ts + 33031
+				zSep = ts + 33601
 			}
 		}
-		sessionAppendStr(tls, bp, ts+4950, bp+12)
+		sessionAppendStr(tls, bp, ts+4969, bp+12)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 12)) == SQLITE_OK {
@@ -133088,7 +134126,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+6434, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+12)
+		db, ts+6453, 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 {
@@ -133099,21 +134137,21 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+33036, bp+12)
+	sessionAppendStr(tls, bp, ts+33606, bp+12)
 	sessionAppendIdent(tls, bp, zTab, bp+12)
-	sessionAppendStr(tls, bp, ts+21524, bp+12)
+	sessionAppendStr(tls, bp, ts+21590, bp+12)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14607, bp+12)
+			sessionAppendStr(tls, bp, ts+14626, bp+12)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*4)), bp+12)
 	}
 
-	sessionAppendStr(tls, bp, ts+33054, bp+12)
+	sessionAppendStr(tls, bp, ts+33624, bp+12)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33065, bp+12)
+		sessionAppendStr(tls, bp, ts+33635, bp+12)
 	}
-	sessionAppendStr(tls, bp, ts+4950, bp+12)
+	sessionAppendStr(tls, bp, ts+4969, bp+12)
 
 	if *(*int32)(unsafe.Pointer(bp + 12)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3_prepare_v2(tls, db, (*SessionBuffer)(unsafe.Pointer(bp)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp)).FnBuf, p+8, uintptr(0))
@@ -133127,14 +134165,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+11341, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11360, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33069)
+			ts+33639)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+4,
-			ts+33182)
+			ts+33752)
 	}
 	return rc
 }
@@ -133162,7 +134200,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, 220219)
+				rc = Xsqlite3CorruptError(tls, 220310)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -133415,7 +134453,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+33326, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33896, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -133431,7 +134469,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+33347, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33917, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -133504,10 +134542,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+33366, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33936, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33392, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33962, 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))
@@ -133540,7 +134578,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				f func(*libc.TLS, uintptr, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xFilter})).f(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 124))))
 			if schemaMismatch != 0 {
-				*(*uintptr)(unsafe.Pointer(bp + 140)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 124))))
+				*(*uintptr)(unsafe.Pointer(bp + 140)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 124))))
 				if *(*uintptr)(unsafe.Pointer(bp + 140)) == uintptr(0) {
 					rc = SQLITE_NOMEM
 					break
@@ -133553,7 +134591,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+6434, *(*uintptr)(unsafe.Pointer(bp + 124)), bp+48+16, bp+140, bp+48+20, bp+48+24)
+					db, ts+6453, *(*uintptr)(unsafe.Pointer(bp + 124)), bp+48+16, bp+140, bp+48+20, bp+48+24)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -133566,19 +134604,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+33422, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 140))))
+						ts+33992, 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+33466,
+						ts+34036,
 						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+33537, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 140))))
+						ts+34107, 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+11341) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 140)), ts+11360) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -133629,14 +134667,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33597, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34167, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33627, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34197, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33651, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33627, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34221, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34197, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -134873,7 +135911,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33679, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+34249, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135161,7 +136199,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33707, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+34277, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135346,7 +136384,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+33738, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34308, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -135414,7 +136452,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33745
+		var zErr uintptr = ts + 34315
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135572,7 +136610,7 @@ func fts5ValueToText(tls *libc.TLS, pVal uintptr) uintptr {
 	if zRet != 0 {
 		return zRet
 	}
-	return ts + 1547
+	return ts + 1566
 }
 
 func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, nVal int32, apVal uintptr) {
@@ -135595,7 +136633,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33795
+		var zErr uintptr = ts + 34365
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135919,13 +136957,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(48)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33843, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34413, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33851, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34421, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33861, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34431, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -136336,7 +137374,7 @@ func fts5ConfigSkipLiteral(tls *libc.TLS, pIn uintptr) uintptr {
 	case 'n':
 		fallthrough
 	case 'N':
-		if Xsqlite3_strnicmp(tls, ts+6174, p, 4) == 0 {
+		if Xsqlite3_strnicmp(tls, ts+6193, p, 4) == 0 {
 			p = p + 4
 		} else {
 			p = uintptr(0)
@@ -136475,7 +137513,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+33866, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34436, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint32(unsafe.Sizeof(int32(0))) * uint32(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -136502,14 +137540,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+33873, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34443, 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+33904, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+34474, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136520,7 +137558,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33937, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34507, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136533,7 +137571,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33974, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34544, 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)
@@ -136542,7 +137580,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+33983, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34553, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*uint8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -136561,7 +137599,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34016, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34586, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -136576,14 +137614,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34050, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34620, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34058, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34628, 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+34090, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34660, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -136591,9 +137629,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34096, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34666, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34110, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34680, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -136601,9 +137639,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34148, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34718, 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+34159, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34729, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zArg))) == '1')
@@ -136611,21 +137649,21 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+5068, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+5087, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 44)) = [4]Fts5Enum{
-			{FzName: ts + 8019, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17338},
-			{FzName: ts + 34194, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8038, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17357},
+			{FzName: ts + 34764, 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+34202, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34772, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34233, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34803, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -136672,15 +137710,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+22184) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16260) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34261, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22250) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16279) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34831, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34291) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34861) {
 			*(*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+34301, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34871, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -136697,13 +137735,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+34332, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34902, 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+34337, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*4))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34907, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*4))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34344, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34914, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -136741,8 +137779,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+22184) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34352, 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+22250) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34922, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -136774,7 +137812,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+34381, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34951, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -136783,13 +137821,13 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 							if *(*uintptr)(unsafe.Pointer(bp + 44)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 44))
 							}
-							return ts + 1547
+							return ts + 1566
 						}(),
 						func() uintptr {
 							if *(*uintptr)(unsafe.Pointer(bp + 52)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 52))
 							}
-							return ts + 1547
+							return ts + 1566
 						}(),
 						pzErr)
 				} else {
@@ -136811,19 +137849,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 + 34050
+			zTail = ts + 34620
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34401
+			zTail = ts + 34971
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34409, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34979, 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+16260, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16279, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -136867,18 +137905,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+34420, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34990, 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 + 1566
 			}
-			return ts + 14607
+			return ts + 14626
 		}()
-		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+35006, 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+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22184))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35013,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22250))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -136988,7 +138026,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34469) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35039) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -136998,7 +138036,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+34474) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35044) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -137008,7 +138046,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+34483) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35053) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -137021,7 +138059,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+34493) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35063) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -137031,7 +138069,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+34503) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35073) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -137047,7 +138085,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+22184) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22250) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+4)
@@ -137070,7 +138108,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(44)
 	defer tls.Free(44)
 
-	var zSelect uintptr = ts + 34515
+	var zSelect uintptr = ts + 35085
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 36)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -137092,7 +138130,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+34547) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35117) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 40)) = 0
@@ -137106,7 +138144,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+34555,
+				ts+35125,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -137204,7 +138242,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*uint8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34620, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+35190, 0)
 					return FTS5_EOF
 				}
 			}
@@ -137217,20 +138255,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+34640, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+35210, 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+34671, uint32(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35241, uint32(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34674, uint32(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35244, uint32(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30056, uint32(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30122, uint32(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -139009,9 +140047,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+34678, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint32(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35248, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint32(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33707, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+34277, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -139027,7 +140065,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+34683, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+35253, 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')
@@ -139114,7 +140152,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20521, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20587, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -139195,7 +140233,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+34712, 0)
+			ts+35282, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -139365,12 +140403,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+34765,
+								ts+35335,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34815
+										return ts + 35385
 									}
-									return ts + 34678
+									return ts + 35248
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -140319,7 +141357,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+34822, iRowid, 0, p+40)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35392, iRowid, 0, p+40)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -140398,7 +141436,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+34828,
+			ts+35398,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -140423,7 +141461,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+34879,
+			ts+35449,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+48, zSql) != 0 {
 			return
@@ -140446,7 +141484,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+34928,
+			ts+35498,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -140685,7 +141723,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+34968, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+35538, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -141884,7 +142922,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+34991,
+			ts+35561,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -143076,7 +144114,7 @@ func fts5WriteFlushBtree(tls *libc.TLS, p uintptr, pWriter uintptr) {
 			if (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn > 0 {
 				return (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fp
 			}
-			return ts + 1547
+			return ts + 1566
 		}()
 
 		Xsqlite3_bind_blob(tls, (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter, 2, z, (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn, uintptr(0))
@@ -143349,7 +144387,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+35075,
+			ts+35645,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -144416,7 +145454,7 @@ func sqlite3Fts5IndexReinit(tls *libc.TLS, p uintptr) int32 {
 	fts5StructureInvalidate(tls, p)
 	fts5IndexDiscardData(tls, p)
 	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Fts5Structure{})))
-	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1547, 0)
+	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1566, 0)
 	fts5StructureWrite(tls, p, bp)
 	return fts5IndexReturn(tls, p)
 }
@@ -144432,13 +145470,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+35132, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35702, 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+25049, ts+35140, 0, pzErr)
+				pConfig, ts+25115, ts+35710, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11481,
-					ts+35175,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11500,
+					ts+35745,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -144691,7 +145729,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+34822, int64(FTS5_STRUCTURE_ROWID), 1, bp+4)
+		ts+35392, 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)))
@@ -144805,7 +145843,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35219,
+		ts+35789,
 		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))) {
@@ -144975,7 +146013,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+35305)
+			sqlite3Fts5BufferAppendBlob(tls, p+36, bp+8, uint32(4), ts+35875)
 			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))
@@ -145246,7 +146284,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+35310, 0)
+			ts+35880, 0)
 		return SQLITE_ERROR
 	}
 
@@ -145277,7 +146315,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 				} else if iCol >= 0 {
 					bSeenMatch = 1
 					*(*uint8)(unsafe.Pointer(idxStr + uintptr(libc.PostIncInt32(&iIdxStr, 1)))) = uint8('M')
-					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4968, libc.VaList(bp, iCol))
+					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4987, libc.VaList(bp, iCol))
 					idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 
 				}
@@ -145292,7 +146330,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 					}
 					return uint8('G')
 				}()
-				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4968, libc.VaList(bp+8, iCol))
+				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4987, libc.VaList(bp+8, iCol))
 				idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 				(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pInfo)).FaConstraintUsage + uintptr(i)*8)).FargvIndex = libc.PreIncInt32(&iCons, 1)
 
@@ -145606,7 +146644,7 @@ func fts5NextMethod(tls *libc.TLS, pCursor uintptr) int32 {
 					rc = Xsqlite3_reset(tls, (*Fts5Cursor)(unsafe.Pointer(pCsr)).FpStmt)
 					if rc != SQLITE_OK {
 						(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-							ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+							ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 					}
 				} else {
 					rc = SQLITE_OK
@@ -145638,7 +146676,7 @@ func fts5PrepareStatement(tls *libc.TLS, ppStmt uintptr, pConfig uintptr, zFmt u
 		rc = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
 			uint32(SQLITE_PREPARE_PERSISTENT), bp+8, uintptr(0))
 		if rc != SQLITE_OK {
-			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 		}
 		Xsqlite3_free(tls, zSql)
 	}
@@ -145670,25 +146708,25 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35349,
+		ts+35919,
 		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 + 14607
+					return ts + 14626
 				}
-				return ts + 1547
+				return ts + 1566
 			}(),
 			func() uintptr {
 				if zRankArgs != 0 {
 					return zRankArgs
 				}
-				return ts + 1547
+				return ts + 1566
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35404
+					return ts + 35974
 				}
-				return ts + 35409
+				return ts + 35979
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -145734,12 +146772,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+35413, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35983, 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) {
+	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5069, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35419, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35989, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -145770,7 +146808,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+35447, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36017, 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,
@@ -145801,7 +146839,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+35457, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36027, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -145833,14 +146871,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+35478, libc.VaList(bp, z))
+				ts+36048, 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 + 33861
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34431
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -145896,7 +146934,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+35310, 0)
+		ts+35880, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -145939,7 +146977,7 @@ __8:
 	if !(zText == uintptr(0)) {
 		goto __14
 	}
-	zText = ts + 1547
+	zText = ts + 1566
 __14:
 	;
 	iCol = 0
@@ -146113,7 +147151,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35511, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+36081, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -146234,7 +147272,7 @@ func fts5SeekCursor(tls *libc.TLS, pCsr uintptr, bErrormsg int32) int32 {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			} else if (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg != 0 {
 				*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-					ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
+					ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
 			}
 		}
 	}
@@ -146258,28 +147296,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+35547, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36117, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35558, 0)
+				ts+36128, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35638, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36208, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35646, 0)
+				ts+36216, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16927, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16946, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35702, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36272, 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+35708, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36278, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -146337,7 +147375,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+17472, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17491, 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)))
@@ -146350,12 +147388,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+35724,
+				ts+36294,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20422
+						return ts + 20488
 					}
-					return ts + 35761
+					return ts + 36331
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -146985,7 +148023,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+35773, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36343, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -147229,7 +148267,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+35794, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36364, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -147248,7 +148286,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+35816, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36386, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -147295,7 +148333,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+35847)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36417)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -147304,7 +148342,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+35860, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+36430, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -147318,7 +148356,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35951, ts + 34050, ts + 25049, ts + 34401, ts + 11481,
+	ts + 36521, ts + 34620, ts + 25115, ts + 34971, ts + 11500,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -147342,7 +148380,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+35958, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+36528, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -147360,13 +148398,13 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35958, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36528, 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+35963, 0,
+				db, ts+36533, 0,
 				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
 				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
@@ -147423,17 +148461,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 + 35978,
-			ts + 36046,
-			ts + 36115,
-			ts + 36148,
-			ts + 36187,
-			ts + 36227,
-			ts + 36266,
-			ts + 36307,
-			ts + 36346,
-			ts + 36388,
-			ts + 36428,
+			ts + 36548,
+			ts + 36616,
+			ts + 36685,
+			ts + 36718,
+			ts + 36757,
+			ts + 36797,
+			ts + 36836,
+			ts + 36877,
+			ts + 36916,
+			ts + 36958,
+			ts + 36998,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -147500,7 +148538,7 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 			(*Fts5Config)(unsafe.Pointer((*Fts5Storage)(unsafe.Pointer(p)).FpConfig)).FbLock--
 			Xsqlite3_free(tls, zSql)
 			if rc != SQLITE_OK && pzErrMsg != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
 			}
 		}
 	}
@@ -147535,18 +148573,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+36451,
+		ts+37021,
 		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+36555,
+			ts+37125,
 			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+36593,
+			ts+37163,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -147558,7 +148596,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+36631,
+			ts+37201,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -147570,14 +148608,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+25049, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11481, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35951, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25115, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11500, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+36521, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34401, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34971, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34050, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34620, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -147589,17 +148627,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+36673,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37243,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29702
+					return ts + 29768
 				}
-				return ts + 1547
+				return ts + 1566
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36703,
+			ts+37273,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -147636,27 +148674,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36747, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37317, 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+36770, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37340, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34050, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34620, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34401, ts+36776, 0, pzErr)
+				pConfig, ts+34971, ts+37346, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35951, ts+36808, 1, pzErr)
+				pConfig, ts+36521, ts+37378, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34547, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35117, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -147862,12 +148900,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+36825,
+		ts+37395,
 		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+36875,
+			ts+37445,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -147875,7 +148913,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+34547, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35117, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -148051,7 +149089,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36904,
+	zSql = Xsqlite3_mprintf(tls, ts+37474,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -148233,14 +149271,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+34050, bp+40)
+			rc = fts5StorageCount(tls, p, ts+34620, 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+34401, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34971, bp+48)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 48)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -148435,9 +149473,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+36936) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37506) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36947) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37517) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -148651,7 +149689,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 + 36958
+			var zCat uintptr = ts + 37528
 			var i int32
 			libc.Xmemset(tls, p, 0, uint32(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -148663,7 +149701,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+36967) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37537) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
 				}
 			}
@@ -148674,18 +149712,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+36978) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37548) {
 					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+36936) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37506) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36947) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37517) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36967) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37537) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -148961,7 +149999,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 + 36996
+	var zBase uintptr = ts + 37566
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -149101,7 +150139,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+37006, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37576, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149109,11 +150147,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37009, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37579, 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+37014, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37584, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149121,7 +150159,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37019, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37589, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149129,7 +150167,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37022, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37592, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149137,11 +150175,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37595, 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+37030, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37600, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149149,19 +150187,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37035, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37605, 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+37039, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37609, 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+37045, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37615, 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+37050, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37620, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149169,11 +150207,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37054, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37624, 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+37058, aBuf+uintptr(nBuf-2), uint32(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37628, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149181,7 +150219,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37631, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149189,11 +150227,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37635, 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+37069, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37639, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149201,7 +150239,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37073, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37643, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149209,7 +150247,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37077, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37647, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149217,7 +150255,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37081, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37651, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149233,24 +150271,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+37085, aBuf+uintptr(nBuf-2), uint32(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37065, uint32(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37655, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37635, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37658, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37661, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37665, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37651, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -149265,137 +150303,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+37098, aBuf+uintptr(nBuf-7), uint32(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37668, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37065, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37635, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37106, aBuf+uintptr(nBuf-6), uint32(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37676, aBuf+uintptr(nBuf-6), uint32(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37113, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37683, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37118, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37688, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37014, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37584, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37123, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37693, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37009, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37579, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37128, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37698, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37081, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37651, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37133, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37703, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15473, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15492, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37138, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37708, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37091, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37661, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37142, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37712, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37006, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37576, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37147, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37717, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37050, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37620, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37153, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37723, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37157, uint32(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37727, uint32(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37159, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37729, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37073, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37643, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37165, aBuf+uintptr(nBuf-7), uint32(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37735, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37081, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37651, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37173, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37743, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37065, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37635, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37179, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37749, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37065, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37635, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37184, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37754, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37576, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37190, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37760, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37077, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37647, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37198, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37768, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37206, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37776, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37210, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37780, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37073, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37643, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37218, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37788, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37576, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37224, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37794, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37077, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37647, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37230, aBuf+uintptr(nBuf-6), uint32(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37800, aBuf+uintptr(nBuf-6), uint32(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37091, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37661, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -149410,16 +150448,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+37237, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37807, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37022, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37592, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37242, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37812, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149427,21 +150465,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37247, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37817, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37022, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37592, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37253, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37823, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37022, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37592, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37206, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37776, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149449,7 +150487,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37259, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37829, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -149457,9 +150495,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37265, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37835, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37576, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -149474,12 +150512,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+37271, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37841, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37275, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37845, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37278, aBuf+uintptr(nBuf-2), uint32(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37848, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -149488,7 +150526,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37281, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37851, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -149644,7 +150682,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+37285) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37855) {
 				if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' || *(*uint8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -149824,22 +150862,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(64)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36996, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37566, 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 + 37300, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37870, 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 + 37306, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37876, 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 + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37883, 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
@@ -150981,14 +152019,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+37321) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37891) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37325) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37895) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37329) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37899) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37338, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37908, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -151014,19 +152052,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 + 37372,
-		ts + 37412,
-		ts + 37447,
+		ts + 37942,
+		ts + 37982,
+		ts + 38017,
 	}
 
 	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+23345, *(*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+23411, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uint32(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37490, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38060, 0)
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -151159,11 +152197,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+37523, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+38093, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37554,
+		ts+38124,
 		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))
@@ -151187,7 +152225,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+37605, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38175, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -151471,7 +152509,7 @@ func fts5VocabFilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, zUnused
 		if pLe != 0 {
 			var zCopy uintptr = Xsqlite3_value_text(tls, pLe)
 			if zCopy == uintptr(0) {
-				zCopy = ts + 1547
+				zCopy = ts + 1566
 			}
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm = Xsqlite3_value_bytes(tls, pLe)
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FzLeTerm = Xsqlite3_malloc(tls, (*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm+1)
@@ -151582,7 +152620,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+37631, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+38201, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -151604,7 +152642,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 + 37641
+	return ts + 38211
 }
 
 func init() {
@@ -152027,6 +153065,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 588)) = noopStepFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 592)) = uintptr(unsafe.Pointer(&lagName))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&attach_func)) + 16)) = attachFunc
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 4)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 8)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 12)) = statBestIndex
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 16)) = statDisconnect
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 20)) = statDisconnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 24)) = statOpen
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 28)) = statClose
+	*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 32)) = statFilter
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 36)) = statNext
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 40)) = statEof
+	*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 44)) = statColumn
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 48)) = statRowid
 	*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 0)) = sqlite3MemMalloc
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 4)) = sqlite3MemFree
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 8)) = sqlite3MemRealloc
@@ -152559,8 +153609,9 @@ func init() {
 	*(*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
-	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 12)) = Xsqlite3JsonTableFunctions
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = Xsqlite3DbstatRegister
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 12)) = sqlite3TestExtInit
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = Xsqlite3JsonTableFunctions
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statGetFuncdef)) + 16)) = statGet
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statInitFuncdef)) + 16)) = statInit
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statPushFuncdef)) + 16)) = statPush
@@ -152578,5 +153629,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 68)) = rbuVfsGetLastError
 }
 
-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 ts1 = "3.41.2\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-14.0.5\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_DBSTAT_VTAB\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\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\x00true\x00false\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 \x00rowid not at end-of-record for row \x00 of 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\x00CREATE TABLE x( name       TEXT, path       TEXT, pageno     INTEGER, pagetype   TEXT, ncell      INTEGER, payload    INTEGER, unused     INTEGER, mx_payload INTEGER, pgoffset   INTEGER, pgsize     INTEGER, schema     TEXT HIDDEN, aggregate  BOOLEAN HIDDEN)\x00/\x00overflow\x00%s%.3x+%.6x\x00%s%.3x/\x00internal\x00leaf\x00corrupted\x00SELECT * FROM (SELECT 'sqlite_schema' AS name,1 AS rootpage,'table' AS type UNION ALL SELECT name,rootpage,type FROM \"%w\".sqlite_schema WHERE rootpage!=0)\x00WHERE name=%Q\x00 ORDER BY name\x00dbstat\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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 7f59008b..8c860b4f 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -180,6 +180,7 @@ const (
 	DBFLAG_SchemaKnownOk                  = 0x0010
 	DBFLAG_Vacuum                         = 0x0004
 	DBFLAG_VacuumInto                     = 0x0008
+	DBSTAT_PAGE_PADDING_BYTES             = 256
 	DB_ResetWanted                        = 0x0008
 	DB_SchemaLoaded                       = 0x0001
 	DB_UnresetViews                       = 0x0002
@@ -748,11 +749,11 @@ const (
 	NC_OrderAgg                           = 0x8000000
 	NC_PartIdx                            = 0x000002
 	NC_SelfRef                            = 0x00002e
+	NC_Subquery                           = 0x000040
 	NC_UAggInfo                           = 0x000100
 	NC_UBaseReg                           = 0x000400
 	NC_UEList                             = 0x000080
 	NC_UUpsert                            = 0x000200
-	NC_VarSelect                          = 0x000040
 	NDEBUG                                = 1
 	NETGRAPHDISC                          = 6
 	NN                                    = 1
@@ -1558,6 +1559,7 @@ const (
 	SQLITE_ECEL_REF                       = 0x04
 	SQLITE_EMPTY                          = 16
 	SQLITE_ENABLE_COLUMN_METADATA         = 1
+	SQLITE_ENABLE_DBSTAT_VTAB             = 1
 	SQLITE_ENABLE_FTS5                    = 1
 	SQLITE_ENABLE_GEOPOLY                 = 1
 	SQLITE_ENABLE_LOCKING_STYLE           = 0
@@ -1958,7 +1960,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
+	SQLITE_SOURCE_ID                      = "2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2066,8 +2068,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.41.0"
-	SQLITE_VERSION_NUMBER                 = 3041000
+	SQLITE_VERSION                        = "3.41.2"
+	SQLITE_VERSION_NUMBER                 = 3041002
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -5299,7 +5301,8 @@ type IndexedExpr1 = struct {
 	FiIdxCur       int32
 	FiIdxCol       int32
 	FbMaybeNullRow U8
-	F__ccgo_pad1   [3]byte
+	Faff           U8
+	F__ccgo_pad1   [2]byte
 	FpIENext       uintptr
 }
 
@@ -5941,17 +5944,18 @@ type Pager = Pager1
 
 // Handle type for pages.
 type PgHdr2 = struct {
-	FpPage      uintptr
-	FpData      uintptr
-	FpExtra     uintptr
-	FpCache     uintptr
-	FpDirty     uintptr
-	FpPager     uintptr
-	Fpgno       Pgno
-	Fflags      U16
-	FnRef       I16
-	FpDirtyNext uintptr
-	FpDirtyPrev uintptr
+	FpPage       uintptr
+	FpData       uintptr
+	FpExtra      uintptr
+	FpCache      uintptr
+	FpDirty      uintptr
+	FpPager      uintptr
+	Fpgno        Pgno
+	Fflags       U16
+	F__ccgo_pad1 [2]byte
+	FnRef        I64
+	FpDirtyNext  uintptr
+	FpDirtyPrev  uintptr
 }
 
 // Handle type for pages.
@@ -6172,14 +6176,14 @@ type PCache2 = struct {
 	FpDirty      uintptr
 	FpDirtyTail  uintptr
 	FpSynced     uintptr
-	FnRefSum     int32
+	FnRefSum     I64
 	FszCache     int32
 	FszSpill     int32
 	FszPage      int32
 	FszExtra     int32
 	FbPurgeable  U8
 	FeCreate     U8
-	F__ccgo_pad1 [2]byte
+	F__ccgo_pad1 [6]byte
 	FxStress     uintptr
 	FpStress     uintptr
 	FpCache      uintptr
@@ -6438,7 +6442,7 @@ type CoveringIndexCheck1 = struct {
 	F__ccgo_pad1 [2]byte
 }
 
-var sqlite3azCompileOpt = [52]uintptr{
+var sqlite3azCompileOpt = [53]uintptr{
 	ts + 7,
 	ts + 27,
 	ts + 49,
@@ -6457,40 +6461,41 @@ var sqlite3azCompileOpt = [52]uintptr{
 	ts + 365,
 	ts + 390,
 	ts + 413,
-	ts + 425,
-	ts + 440,
-	ts + 462,
-	ts + 487,
-	ts + 510,
-	ts + 532,
-	ts + 543,
-	ts + 556,
-	ts + 571,
-	ts + 587,
-	ts + 600,
-	ts + 621,
-	ts + 645,
-	ts + 668,
-	ts + 684,
-	ts + 700,
-	ts + 724,
-	ts + 751,
-	ts + 771,
-	ts + 792,
-	ts + 814,
-	ts + 844,
-	ts + 869,
-	ts + 895,
-	ts + 915,
-	ts + 941,
-	ts + 964,
-	ts + 990,
-	ts + 1012,
-	ts + 1033,
-	ts + 1044,
+	ts + 432,
+	ts + 444,
+	ts + 459,
+	ts + 481,
+	ts + 506,
+	ts + 529,
+	ts + 551,
+	ts + 562,
+	ts + 575,
+	ts + 590,
+	ts + 606,
+	ts + 619,
+	ts + 640,
+	ts + 664,
+	ts + 687,
+	ts + 703,
+	ts + 719,
+	ts + 743,
+	ts + 770,
+	ts + 790,
+	ts + 811,
+	ts + 833,
+	ts + 863,
+	ts + 888,
+	ts + 914,
+	ts + 934,
+	ts + 960,
+	ts + 983,
+	ts + 1009,
+	ts + 1031,
 	ts + 1052,
-	ts + 1066,
-	ts + 1079,
+	ts + 1063,
+	ts + 1071,
+	ts + 1085,
+	ts + 1098,
 }
 
 func Xsqlite3CompileOptions(tls *libc.TLS, pnOpt uintptr) uintptr {
@@ -6642,7 +6647,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 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))
+var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1111))
 
 // Standard typenames.  These names must match the COLTYPE_* definitions.
 // Adjust the SQLITE_N_STDTYPE value if adding or removing entries.
@@ -6664,12 +6669,12 @@ var Xsqlite3StdTypeAffinity = [6]int8{
 	int8(SQLITE_AFF_TEXT),
 }
 var Xsqlite3StdType = [6]uintptr{
-	ts + 1099,
-	ts + 1103,
-	ts + 1108,
-	ts + 1112,
-	ts + 1120,
-	ts + 1125,
+	ts + 1118,
+	ts + 1122,
+	ts + 1127,
+	ts + 1131,
+	ts + 1139,
+	ts + 1144,
 }
 
 // SQL is translated into a sequence of instructions to be
@@ -6986,7 +6991,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, 23229)
+		return Xsqlite3MisuseError(tls, 23233)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -7390,7 +7395,7 @@ __6:
 __4:
 	;
 	zDate++
-	if !(getDigits(tls, zDate, ts+1130, libc.VaList(bp, bp+16, bp+20)) != 2) {
+	if !(getDigits(tls, zDate, ts+1149, libc.VaList(bp, bp+16, bp+20)) != 2) {
 		goto __9
 	}
 	return 1
@@ -7416,13 +7421,13 @@ func parseHhMmSs(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	defer tls.Free(36)
 
 	var ms float64 = 0.0
-	if getDigits(tls, zDate, ts+1138, libc.VaList(bp, bp+24, bp+28)) != 2 {
+	if getDigits(tls, zDate, ts+1157, libc.VaList(bp, bp+24, bp+28)) != 2 {
 		return 1
 	}
 	zDate += uintptr(5)
 	if int32(*(*int8)(unsafe.Pointer(zDate))) == ':' {
 		zDate++
-		if getDigits(tls, zDate, ts+1146, libc.VaList(bp+16, bp+32)) != 1 {
+		if getDigits(tls, zDate, ts+1165, libc.VaList(bp+16, bp+32)) != 1 {
 			return 1
 		}
 		zDate += uintptr(2)
@@ -7520,7 +7525,7 @@ func parseYyyyMmDd(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	} else {
 		neg = 0
 	}
-	if getDigits(tls, zDate, ts+1150, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
+	if getDigits(tls, zDate, ts+1169, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
 		return 1
 	}
 	zDate += uintptr(10)
@@ -7577,7 +7582,7 @@ func parseDateOrTime(tls *libc.TLS, context uintptr, zDate uintptr, p uintptr) i
 		return 0
 	} else if parseHhMmSs(tls, zDate, p) == 0 {
 		return 0
-	} else if Xsqlite3StrICmp(tls, zDate, ts+1162) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
+	} else if Xsqlite3StrICmp(tls, zDate, ts+1181) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
 		return setDateTimeToCurrent(tls, context, p)
 	} else if Xsqlite3AtoF(tls, zDate, bp, Xsqlite3Strlen30(tls, zDate), uint8(SQLITE_UTF8)) > 0 {
 		setRawDateNumber(tls, p, *(*float64)(unsafe.Pointer(bp)))
@@ -7710,7 +7715,7 @@ func toLocaltime(tls *libc.TLS, p uintptr, pCtx uintptr) int32 {
 		*(*Time_t)(unsafe.Pointer(bp + 104)) = (*DateTime)(unsafe.Pointer(p)).FiJD/int64(1000) - int64(21086676)*int64(10000)
 	}
 	if osLocaltime(tls, bp+104, bp) != 0 {
-		Xsqlite3_result_error(tls, pCtx, ts+1166, -1)
+		Xsqlite3_result_error(tls, pCtx, ts+1185, -1)
 		return SQLITE_ERROR
 	}
 	(*DateTime)(unsafe.Pointer(p)).FY = (*tm)(unsafe.Pointer(bp)).Ftm_year + 1900 - iYearDiff
@@ -7734,12 +7739,12 @@ var aXformType = [6]struct {
 	FrLimit float32
 	FrXform float32
 }{
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1189)), FrLimit: 4.6427e+14, FrXform: 1.0},
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1196)), FrLimit: 7.7379e+12, FrXform: 60.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1203)), FrLimit: 1.2897e+11, FrXform: 3600.0},
-	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1210)), FrLimit: 5373485.0, FrXform: 86400.0},
-	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1217)), FrLimit: 176546.0, FrXform: 2592000.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1224)), FrLimit: 14713.0, FrXform: 31536000.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1208)), FrLimit: 4.6427e+14, FrXform: 1.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1215)), FrLimit: 7.7379e+12, FrXform: 60.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1222)), FrLimit: 1.2897e+11, FrXform: 3600.0},
+	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1229)), FrLimit: 5373485.0, FrXform: 86400.0},
+	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1236)), FrLimit: 176546.0, FrXform: 2592000.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1243)), FrLimit: 14713.0, FrXform: 31536000.0},
 }
 
 func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, idx int32) int32 {
@@ -7751,7 +7756,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 	switch int32(Xsqlite3UpperToLower[U8(*(*int8)(unsafe.Pointer(z)))]) {
 	case 'a':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1231) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1250) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -7773,7 +7778,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'j':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1236) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1255) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -7787,7 +7792,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'l':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1246) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1265) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				rc = toLocaltime(tls, p, pCtx)
 			}
 			break
@@ -7795,7 +7800,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'u':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1256) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1275) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -7807,7 +7812,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 					rc = 0
 				}
-			} else if Xsqlite3_stricmp(tls, z, ts+1266) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1285) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				if int32((*DateTime)(unsafe.Pointer(p)).FtzSet) == 0 {
 					var iOrigJD I64
 					var iGuess I64
@@ -7841,7 +7846,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'w':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1270, 8) == 0 &&
+			if Xsqlite3_strnicmp(tls, z, ts+1289, 8) == 0 &&
 				Xsqlite3AtoF(tls, z+8, bp+48, Xsqlite3Strlen30(tls, z+8), uint8(SQLITE_UTF8)) > 0 &&
 				*(*float64)(unsafe.Pointer(bp + 48)) >= 0.0 && *(*float64)(unsafe.Pointer(bp + 48)) < 7.0 && float64(libc.AssignInt32(&n, int32(*(*float64)(unsafe.Pointer(bp + 48))))) == *(*float64)(unsafe.Pointer(bp + 48)) {
 				var Z Sqlite3_int64
@@ -7862,7 +7867,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 's':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1279, 9) != 0 {
+			if Xsqlite3_strnicmp(tls, z, ts+1298, 9) != 0 {
 				break
 			}
 			if !(int32((*DateTime)(unsafe.Pointer(p)).FvalidJD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidYMD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidHMS) != 0) {
@@ -7876,14 +7881,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 			(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidTZ = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidJD = int8(0)
-			if Xsqlite3_stricmp(tls, z, ts+1289) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1308) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1295) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1314) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FM = 1
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1300) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1319) == 0 {
 				rc = 0
 			}
 			break
@@ -8209,7 +8214,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		switch int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) {
 		case 'd':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
 				break
 
 			}
@@ -8219,13 +8224,13 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if s > 59.999 {
 					s = 59.999
 				}
-				Xsqlite3_str_appendf(tls, bp+136, ts+1309, libc.VaList(bp+8, s))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1328, libc.VaList(bp+8, s))
 				break
 
 			}
 		case 'H':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
 				break
 
 			}
@@ -8243,41 +8248,41 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) == 'W' {
 					var wd int32
 					wd = int32(((*DateTime)(unsafe.Pointer(bp+88)).FiJD + int64(43200000)) / int64(86400000) % int64(7))
-					Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+24, (nDay+7-wd)/7))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+24, (nDay+7-wd)/7))
 				} else {
-					Xsqlite3_str_appendf(tls, bp+136, ts+1316, libc.VaList(bp+32, nDay+1))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1335, libc.VaList(bp+32, nDay+1))
 				}
 				break
 
 			}
 		case 'J':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1321, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1340, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
 				break
 
 			}
 		case 'm':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
 				break
 
 			}
 		case 'M':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
 				break
 
 			}
 		case 's':
 			{
 				var iS I64 = (*DateTime)(unsafe.Pointer(bp+88)).FiJD/int64(1000) - int64(21086676)*int64(10000)
-				Xsqlite3_str_appendf(tls, bp+136, ts+1327, libc.VaList(bp+64, iS))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1346, libc.VaList(bp+64, iS))
 				break
 
 			}
 		case 'S':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1304, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
 				break
 
 			}
@@ -8290,7 +8295,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			}
 		case 'Y':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1332, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1351, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
 				break
 
 			}
@@ -8340,15 +8345,15 @@ func Xsqlite3RegisterDateTimeFunctions(tls *libc.TLS) {
 }
 
 var aDateTimeFuncs = [9]FuncDef{
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1236},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1256},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1337},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1342},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1347},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1255},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1275},
 	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1356},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1365},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1378},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1396}}
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1361},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1366},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1375},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1384},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1397},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1415}}
 
 // The following routines are convenience wrappers around methods
 // of the sqlite3_file object.  This is mostly just syntactic sugar. All
@@ -8763,7 +8768,7 @@ func sqlite3MemMalloc(tls *libc.TLS, nByte int32) uintptr {
 		*(*Sqlite3_int64)(unsafe.Pointer(p)) = Sqlite3_int64(nByte)
 		p += 8
 	} else {
-		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1409, libc.VaList(bp, nByte))
+		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1428, libc.VaList(bp, nByte))
 	}
 	return p
 }
@@ -8796,7 +8801,7 @@ func sqlite3MemRealloc(tls *libc.TLS, pPrior uintptr, nByte int32) uintptr {
 		p += 8
 	} else {
 		Xsqlite3_log(tls, SQLITE_NOMEM,
-			ts+1447,
+			ts+1466,
 			libc.VaList(bp, sqlite3MemSize(tls, pPrior), nByte))
 	}
 	return p
@@ -9672,7 +9677,7 @@ func Xsqlite3OomFault(tls *libc.TLS, db uintptr) uintptr {
 		(*Sqlite3)(unsafe.Pointer(db)).Flookaside.Fsz = U16(0)
 		if (*Sqlite3)(unsafe.Pointer(db)).FpParse != 0 {
 			var pParse uintptr
-			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1483, 0)
+			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1502, 0)
 			(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 			for pParse = (*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).FpOuterParse; pParse != 0; pParse = (*Parse)(unsafe.Pointer(pParse)).FpOuterParse {
 				(*Parse)(unsafe.Pointer(pParse)).FnErr++
@@ -9745,8 +9750,8 @@ type et_info = struct {
 // by an instance of the following structure
 type Et_info = et_info
 
-var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1497))
-var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1530))
+var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1516))
+var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1549))
 var fmtinfo = [23]Et_info{
 	{Ffmttype: int8('d'), Fbase: EtByte(10), Fflags: EtByte(1), Ftype: EtByte(EtDECIMAL)},
 	{Ffmttype: int8('s'), Fflags: EtByte(4), Ftype: EtByte(EtSTRING)},
@@ -9960,7 +9965,7 @@ __6:
 	if !(libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(libc.PreIncUintptr(&fmt, 1))))) == 0) {
 		goto __11
 	}
-	Xsqlite3_str_append(tls, pAccum, ts+1537, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1556, 1)
 	goto __5
 __11:
 	;
@@ -10521,7 +10526,7 @@ __125:
 	if !(Xsqlite3IsNaN(tls, *(*float64)(unsafe.Pointer(bp + 104))) != 0) {
 		goto __127
 	}
-	bufpt = ts + 1539
+	bufpt = ts + 1558
 	length = 3
 	goto __58
 __127:
@@ -10581,7 +10586,7 @@ __138:
 	}
 	bufpt = bp + 16
 	*(*int8)(unsafe.Pointer(bp + 16)) = prefix
-	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1543, uint64(4))
+	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1562, uint64(4))
 	length = 3 + libc.Bool32(int32(prefix) != 0)
 	goto __58
 __139:
@@ -10947,7 +10952,7 @@ __200:
 	if !(bufpt == uintptr(0)) {
 		goto __201
 	}
-	bufpt = ts + 1547
+	bufpt = ts + 1566
 	goto __202
 __201:
 	if !(int32(xtype) == EtDYNSTRING) {
@@ -11071,9 +11076,9 @@ __222:
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
-			return ts + 1548
+			return ts + 1567
 		}
-		return ts + 1553
+		return ts + 1572
 	}()
 __223:
 	;
@@ -11221,7 +11226,7 @@ __246:
 		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
-	Xsqlite3_str_append(tls, pAccum, ts+1560, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1579, 1)
 __250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
@@ -11238,10 +11243,10 @@ __251:
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
 		goto __253
 	}
-	Xsqlite3_str_appendf(tls, pAccum, ts+1562, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1581, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 	goto __254
 __253:
-	Xsqlite3_str_appendf(tls, pAccum, ts+1572, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1591, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
 __254:
 	;
 __252:
@@ -11296,7 +11301,7 @@ __4:
 __5:
 }
 
-var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1586))
+var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1605))
 
 // The z string points to the first character of a token that is
 // associated with an error.  If db does not already have an error
@@ -11461,7 +11466,7 @@ func Xsqlite3ResultStrAccum(tls *libc.TLS, pCtx uintptr, p uintptr) {
 	} else if int32((*StrAccum)(unsafe.Pointer(p)).FprintfFlags)&SQLITE_PRINTF_MALLOCED != 0 {
 		Xsqlite3_result_text(tls, pCtx, (*StrAccum)(unsafe.Pointer(p)).FzText, int32((*StrAccum)(unsafe.Pointer(p)).FnChar), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 	} else {
-		Xsqlite3_result_text(tls, pCtx, ts+1547, 0, uintptr(0))
+		Xsqlite3_result_text(tls, pCtx, ts+1566, 0, uintptr(0))
 		Xsqlite3_str_reset(tls, p)
 	}
 }
@@ -13191,7 +13196,7 @@ func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
 	var c int32 = 0
 	var i int32
 
-	var pow63 uintptr = ts + 1595
+	var pow63 uintptr = ts + 1614
 	for i = 0; c == 0 && i < 18; i++ {
 		c = (int32(*(*int8)(unsafe.Pointer(zNum + uintptr(i*incr)))) - int32(*(*int8)(unsafe.Pointer(pow63 + uintptr(i))))) * 10
 	}
@@ -13737,7 +13742,7 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 	defer tls.Free(8)
 
 	Xsqlite3_log(tls, SQLITE_MISUSE,
-		ts+1614,
+		ts+1633,
 		libc.VaList(bp, zType))
 }
 
@@ -13756,13 +13761,13 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 func Xsqlite3SafetyCheckOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	if db == uintptr(0) {
-		logBadConnection(tls, ts+1548)
+		logBadConnection(tls, ts+1567)
 		return 0
 	}
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_OPEN {
 		if Xsqlite3SafetyCheckSickOrOk(tls, db) != 0 {
-			logBadConnection(tls, ts+1659)
+			logBadConnection(tls, ts+1678)
 		}
 		return 0
 	} else {
@@ -13775,7 +13780,7 @@ func Xsqlite3SafetyCheckSickOrOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_SICK && int32(eOpenState) != SQLITE_STATE_OPEN && int32(eOpenState) != SQLITE_STATE_BUSY {
-		logBadConnection(tls, ts+1668)
+		logBadConnection(tls, ts+1687)
 		return 0
 	} else {
 		return 1
@@ -14301,193 +14306,193 @@ func Xsqlite3OpcodeName(tls *libc.TLS, i int32) uintptr {
 }
 
 var azName = [187]uintptr{
-	ts + 1676,
-	ts + 1686,
-	ts + 1697,
-	ts + 1709,
-	ts + 1720,
-	ts + 1732,
+	ts + 1695,
+	ts + 1705,
+	ts + 1716,
+	ts + 1728,
 	ts + 1739,
-	ts + 1747,
-	ts + 1755,
-	ts + 1760,
-	ts + 1765,
-	ts + 1771,
-	ts + 1785,
-	ts + 1791,
-	ts + 1801,
-	ts + 1806,
-	ts + 1811,
-	ts + 1814,
+	ts + 1751,
+	ts + 1758,
+	ts + 1766,
+	ts + 1774,
+	ts + 1779,
+	ts + 1784,
+	ts + 1790,
+	ts + 1804,
+	ts + 1810,
 	ts + 1820,
-	ts + 1827,
-	ts + 1831,
-	ts + 1841,
-	ts + 1848,
-	ts + 1855,
-	ts + 1862,
-	ts + 1869,
-	ts + 1879,
+	ts + 1825,
+	ts + 1830,
+	ts + 1833,
+	ts + 1839,
+	ts + 1846,
+	ts + 1850,
+	ts + 1860,
+	ts + 1867,
+	ts + 1874,
+	ts + 1881,
 	ts + 1888,
-	ts + 1899,
-	ts + 1908,
-	ts + 1914,
-	ts + 1924,
-	ts + 1934,
-	ts + 1939,
-	ts + 1949,
-	ts + 1960,
-	ts + 1965,
-	ts + 1972,
-	ts + 1983,
-	ts + 1988,
-	ts + 1993,
-	ts + 1999,
-	ts + 2005,
-	ts + 2011,
-	ts + 2014,
+	ts + 1898,
+	ts + 1907,
+	ts + 1918,
+	ts + 1927,
+	ts + 1933,
+	ts + 1943,
+	ts + 1953,
+	ts + 1958,
+	ts + 1968,
+	ts + 1979,
+	ts + 1984,
+	ts + 1991,
+	ts + 2002,
+	ts + 2007,
+	ts + 2012,
 	ts + 2018,
 	ts + 2024,
-	ts + 2035,
-	ts + 2046,
+	ts + 2030,
+	ts + 2033,
+	ts + 2037,
+	ts + 2043,
 	ts + 2054,
-	ts + 2063,
-	ts + 2070,
-	ts + 2078,
-	ts + 2081,
-	ts + 2084,
-	ts + 2087,
-	ts + 2090,
-	ts + 2093,
-	ts + 2096,
+	ts + 2065,
+	ts + 2073,
+	ts + 2082,
+	ts + 2089,
+	ts + 2097,
+	ts + 2100,
 	ts + 2103,
+	ts + 2106,
 	ts + 2109,
-	ts + 2119,
-	ts + 2132,
-	ts + 2143,
-	ts + 2149,
-	ts + 2156,
-	ts + 2165,
-	ts + 2174,
-	ts + 2181,
-	ts + 2194,
-	ts + 2205,
-	ts + 2210,
-	ts + 2218,
+	ts + 2112,
+	ts + 2115,
+	ts + 2122,
+	ts + 2128,
+	ts + 2138,
+	ts + 2151,
+	ts + 2162,
+	ts + 2168,
+	ts + 2175,
+	ts + 2184,
+	ts + 2193,
+	ts + 2200,
+	ts + 2213,
 	ts + 2224,
-	ts + 2231,
+	ts + 2229,
+	ts + 2237,
 	ts + 2243,
-	ts + 2248,
-	ts + 2257,
+	ts + 2250,
 	ts + 2262,
-	ts + 2271,
+	ts + 2267,
 	ts + 2276,
 	ts + 2281,
-	ts + 2287,
+	ts + 2290,
 	ts + 2295,
-	ts + 2303,
-	ts + 2313,
-	ts + 2321,
-	ts + 2328,
-	ts + 2341,
-	ts + 2346,
-	ts + 2358,
-	ts + 2366,
-	ts + 2373,
-	ts + 2384,
-	ts + 2391,
-	ts + 2398,
-	ts + 2408,
+	ts + 2300,
+	ts + 2306,
+	ts + 2314,
+	ts + 2322,
+	ts + 2332,
+	ts + 2340,
+	ts + 2347,
+	ts + 2360,
+	ts + 2365,
+	ts + 2377,
+	ts + 2385,
+	ts + 2392,
+	ts + 2403,
+	ts + 2410,
 	ts + 2417,
-	ts + 2428,
-	ts + 2434,
-	ts + 2445,
-	ts + 2455,
-	ts + 2465,
-	ts + 2472,
-	ts + 2478,
-	ts + 2488,
-	ts + 2499,
-	ts + 2503,
-	ts + 2512,
-	ts + 2521,
-	ts + 2528,
-	ts + 2538,
-	ts + 2545,
-	ts + 2554,
+	ts + 2427,
+	ts + 2436,
+	ts + 2447,
+	ts + 2453,
+	ts + 2464,
+	ts + 2474,
+	ts + 2484,
+	ts + 2491,
+	ts + 2497,
+	ts + 2507,
+	ts + 2518,
+	ts + 2522,
+	ts + 2531,
+	ts + 2540,
+	ts + 2547,
+	ts + 2557,
 	ts + 2564,
-	ts + 2571,
-	ts + 2579,
-	ts + 2593,
-	ts + 2601,
-	ts + 2615,
-	ts + 2626,
-	ts + 2639,
-	ts + 2650,
-	ts + 2656,
-	ts + 2668,
-	ts + 2677,
-	ts + 2685,
-	ts + 2694,
-	ts + 2703,
-	ts + 2710,
-	ts + 2718,
-	ts + 2725,
-	ts + 2736,
-	ts + 2750,
-	ts + 2761,
+	ts + 2573,
+	ts + 2583,
+	ts + 2590,
+	ts + 2598,
+	ts + 2612,
+	ts + 2620,
+	ts + 2634,
+	ts + 2645,
+	ts + 2658,
+	ts + 2669,
+	ts + 2675,
+	ts + 2687,
+	ts + 2696,
+	ts + 2704,
+	ts + 2713,
+	ts + 2722,
+	ts + 2729,
+	ts + 2737,
+	ts + 2744,
+	ts + 2755,
 	ts + 2769,
-	ts + 2775,
-	ts + 2783,
-	ts + 2791,
-	ts + 2801,
-	ts + 2814,
-	ts + 2824,
-	ts + 2837,
-	ts + 2846,
-	ts + 2857,
+	ts + 2780,
+	ts + 2788,
+	ts + 2794,
+	ts + 2802,
+	ts + 2810,
+	ts + 2820,
+	ts + 2833,
+	ts + 2843,
+	ts + 2856,
 	ts + 2865,
-	ts + 2871,
-	ts + 2883,
-	ts + 2895,
-	ts + 2903,
-	ts + 2915,
-	ts + 2928,
-	ts + 2938,
-	ts + 2948,
-	ts + 2953,
-	ts + 2965,
-	ts + 2977,
-	ts + 2987,
-	ts + 2993,
-	ts + 3003,
-	ts + 3010,
+	ts + 2876,
+	ts + 2884,
+	ts + 2890,
+	ts + 2902,
+	ts + 2914,
+	ts + 2922,
+	ts + 2934,
+	ts + 2947,
+	ts + 2957,
+	ts + 2967,
+	ts + 2972,
+	ts + 2984,
+	ts + 2996,
+	ts + 3006,
+	ts + 3012,
 	ts + 3022,
-	ts + 3033,
+	ts + 3029,
 	ts + 3041,
-	ts + 3050,
-	ts + 3059,
-	ts + 3068,
-	ts + 3075,
-	ts + 3086,
-	ts + 3099,
-	ts + 3109,
-	ts + 3116,
-	ts + 3124,
-	ts + 3133,
-	ts + 3139,
-	ts + 3147,
-	ts + 3155,
-	ts + 3163,
-	ts + 3173,
+	ts + 3052,
+	ts + 3060,
+	ts + 3069,
+	ts + 3078,
+	ts + 3087,
+	ts + 3094,
+	ts + 3105,
+	ts + 3118,
+	ts + 3128,
+	ts + 3135,
+	ts + 3143,
+	ts + 3152,
+	ts + 3158,
+	ts + 3166,
+	ts + 3174,
 	ts + 3182,
-	ts + 3193,
-	ts + 3203,
-	ts + 3209,
-	ts + 3220,
-	ts + 3231,
-	ts + 3236,
-	ts + 3244,
+	ts + 3192,
+	ts + 3201,
+	ts + 3212,
+	ts + 3222,
+	ts + 3228,
+	ts + 3239,
+	ts + 3250,
+	ts + 3255,
+	ts + 3263,
 }
 
 type pthread_once = struct {
@@ -14667,45 +14672,62 @@ type bintime = struct {
 	Ffrac Uint64_t
 }
 
-func sbttons(tls *libc.TLS, _sbt Sbintime_t) Int64_t {
-	var ns Uint64_t
+func __stime64_scale32_ceil(tls *libc.TLS, x Int64_t, factor Int32_t, divisor Int32_t) Int64_t {
+	var rem Int64_t = x % Int64_t(divisor)
 
-	ns = Uint64_t(_sbt)
-	if ns >= uint64(int64(1)<<32) {
-		ns = ns >> 32 * uint64(1000000000)
-	} else {
-		ns = uint64(0)
-	}
-
-	return Int64_t(ns + Uint64_t(int64(1000000000)*(_sbt&int64(0xffffffff))>>32))
+	return x/Int64_t(divisor)*Int64_t(factor) + (rem*Int64_t(factor)+Int64_t(divisor)-int64(1))/Int64_t(divisor)
 }
 
-func nstosbt(tls *libc.TLS, _ns Int64_t) Sbintime_t {
-	var sb Sbintime_t = int64(0)
+func __stime64_scale32_floor(tls *libc.TLS, x Int64_t, factor Int32_t, divisor Int32_t) Int64_t {
+	var rem Int64_t = x % Int64_t(divisor)
 
-	if _ns >= int64(1000000000) {
-		sb = _ns / int64(1000000000) * (int64(1) << 32)
-		_ns = _ns % int64(1000000000)
-	}
-
-	sb = Sbintime_t(uint64(sb) + (uint64(_ns)*9223372037+uint64(0x7fffffff))>>31)
-	return sb
+	return x/Int64_t(divisor)*Int64_t(factor) + rem*Int64_t(factor)/Int64_t(divisor)
 }
 
-func sbttous(tls *libc.TLS, _sbt Sbintime_t) Int64_t {
-	return int64(1000000) * _sbt >> 32
+func __utime64_scale32_ceil(tls *libc.TLS, x Uint64_t, factor Uint32_t, divisor Uint32_t) Uint64_t {
+	var rem Uint64_t = x % Uint64_t(divisor)
+
+	return x/Uint64_t(divisor)*Uint64_t(factor) + (rem*Uint64_t(factor)+Uint64_t(divisor)-uint64(1))/Uint64_t(divisor)
 }
 
-func ustosbt(tls *libc.TLS, _us Int64_t) Sbintime_t {
-	var sb Sbintime_t = int64(0)
+func __utime64_scale32_floor(tls *libc.TLS, x Uint64_t, factor Uint32_t, divisor Uint32_t) Uint64_t {
+	var rem Uint64_t = x % Uint64_t(divisor)
 
-	if _us >= int64(1000000) {
-		sb = _us / int64(1000000) * (int64(1) << 32)
-		_us = _us % int64(1000000)
-	}
+	return x/Uint64_t(divisor)*Uint64_t(factor) + rem*Uint64_t(factor)/Uint64_t(divisor)
+}
 
-	sb = Sbintime_t(uint64(sb) + (uint64(_us)*9223372036855+uint64(0x7fffffff))>>31)
-	return sb
+func __stime64_scale64_ceil(tls *libc.TLS, x Int64_t, factor Int64_t, divisor Int64_t) Int64_t {
+	var gcd Int64_t = ^factor&(factor-int64(1)) & ^divisor & (divisor-int64(1)) + int64(1)
+
+	return __stime64_scale32_ceil(tls, x, int32(factor/gcd), int32(divisor/gcd))
+}
+
+func __stime64_scale64_floor(tls *libc.TLS, x Int64_t, factor Int64_t, divisor Int64_t) Int64_t {
+	var gcd Int64_t = ^factor&(factor-int64(1)) & ^divisor & (divisor-int64(1)) + int64(1)
+
+	return __stime64_scale32_floor(tls, x, int32(factor/gcd), int32(divisor/gcd))
+}
+
+func __utime64_scale64_floor(tls *libc.TLS, x Uint64_t, factor Uint64_t, divisor Uint64_t) Uint64_t {
+	var gcd Uint64_t = ^factor&(factor-uint64(1)) & ^divisor & (divisor-uint64(1)) + uint64(1)
+
+	return __utime64_scale32_floor(tls, x, uint32(factor/gcd), uint32(divisor/gcd))
+}
+
+func sbttons(tls *libc.TLS, sbt Sbintime_t) Int64_t {
+	return __stime64_scale64_floor(tls, sbt, int64(1000000000), int64(1)<<32)
+}
+
+func nstosbt(tls *libc.TLS, ns Int64_t) Sbintime_t {
+	return __stime64_scale64_ceil(tls, ns, int64(1)<<32, int64(1000000000))
+}
+
+func sbttous(tls *libc.TLS, sbt Sbintime_t) Int64_t {
+	return __stime64_scale64_floor(tls, sbt, int64(1000000), int64(1)<<32)
+}
+
+func ustosbt(tls *libc.TLS, us Int64_t) Sbintime_t {
+	return __stime64_scale64_ceil(tls, us, int64(1)<<32, int64(1000000))
 }
 
 type itimerval = struct {
@@ -14914,35 +14936,35 @@ type unix_syscall = struct {
 }
 
 var aSyscall = [29]unix_syscall{
-	{FzName: ts + 3254, FpCurrent: 0},
-	{FzName: ts + 3259, FpCurrent: 0},
-	{FzName: ts + 3265, FpCurrent: 0},
-	{FzName: ts + 3272, FpCurrent: 0},
-	{FzName: ts + 3279, FpCurrent: 0},
+	{FzName: ts + 3273, FpCurrent: 0},
+	{FzName: ts + 3278, FpCurrent: 0},
 	{FzName: ts + 3284, FpCurrent: 0},
-	{FzName: ts + 3290, FpCurrent: 0},
-	{FzName: ts + 3300, FpCurrent: 0},
-	{FzName: ts + 3306, FpCurrent: 0},
-	{FzName: ts + 3311},
-	{FzName: ts + 3317},
+	{FzName: ts + 3291, FpCurrent: 0},
+	{FzName: ts + 3298, FpCurrent: 0},
+	{FzName: ts + 3303, FpCurrent: 0},
+	{FzName: ts + 3309, FpCurrent: 0},
+	{FzName: ts + 3319, FpCurrent: 0},
 	{FzName: ts + 3325, FpCurrent: 0},
-	{FzName: ts + 3331},
-	{FzName: ts + 3338},
-	{FzName: ts + 3347, FpCurrent: 0},
-	{FzName: ts + 3354},
-	{FzName: ts + 3364, FpCurrent: 0},
-	{FzName: ts + 3371, FpCurrent: 0},
-	{FzName: ts + 3385, FpCurrent: 0},
-	{FzName: ts + 3391, FpCurrent: 0},
-	{FzName: ts + 3397, FpCurrent: 0},
+	{FzName: ts + 3330},
+	{FzName: ts + 3336},
+	{FzName: ts + 3344, FpCurrent: 0},
+	{FzName: ts + 3350},
+	{FzName: ts + 3357},
+	{FzName: ts + 3366, FpCurrent: 0},
+	{FzName: ts + 3373},
+	{FzName: ts + 3383, FpCurrent: 0},
+	{FzName: ts + 3390, FpCurrent: 0},
 	{FzName: ts + 3404, FpCurrent: 0},
-	{FzName: ts + 3412, FpCurrent: 0},
-	{FzName: ts + 3417, FpCurrent: 0},
-	{FzName: ts + 3424},
+	{FzName: ts + 3410, FpCurrent: 0},
+	{FzName: ts + 3416, FpCurrent: 0},
+	{FzName: ts + 3423, FpCurrent: 0},
 	{FzName: ts + 3431, FpCurrent: 0},
-	{FzName: ts + 3443, FpCurrent: 0},
-	{FzName: ts + 3452, FpCurrent: 0},
-	{FzName: ts + 3458},
+	{FzName: ts + 3436, FpCurrent: 0},
+	{FzName: ts + 3443},
+	{FzName: ts + 3450, FpCurrent: 0},
+	{FzName: ts + 3462, FpCurrent: 0},
+	{FzName: ts + 3471, FpCurrent: 0},
+	{FzName: ts + 3477},
 }
 
 func robustFchown(tls *libc.TLS, fd int32, uid Uid_t, gid Gid_t) int32 {
@@ -15040,9 +15062,9 @@ func robust_open(tls *libc.TLS, z uintptr, f int32, m Mode_t) int32 {
 		}
 		(*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, fd)
 		Xsqlite3_log(tls, SQLITE_WARNING,
-			ts+3464, libc.VaList(bp, z, fd))
+			ts+3483, libc.VaList(bp, z, fd))
 		fd = -1
-		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3507, O_RDONLY, int32(m)) < 0 {
+		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3526, O_RDONLY, int32(m)) < 0 {
 			break
 		}
 	}
@@ -15121,13 +15143,13 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 	var zErr uintptr
 	var iErrno int32 = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 
-	zErr = ts + 1547
+	zErr = ts + 1566
 
 	if zPath == uintptr(0) {
-		zPath = ts + 1547
+		zPath = ts + 1566
 	}
 	Xsqlite3_log(tls, errcode,
-		ts+3517,
+		ts+3536,
 		libc.VaList(bp, iLine, iErrno, zFunc, zPath, zErr))
 
 	return errcode
@@ -15135,7 +15157,7 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 
 func robust_close(tls *libc.TLS, pFile uintptr, h int32, lineno int32) {
 	if (*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, h) != 0 {
-		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3259,
+		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3278,
 			func() uintptr {
 				if pFile != 0 {
 					return (*UnixFile)(unsafe.Pointer(pFile)).FzPath
@@ -15156,7 +15178,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, 38271)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38275)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -15258,19 +15280,19 @@ func verifyDbFile(tls *libc.TLS, pFile uintptr) {
 
 	rc = (*(*func(*libc.TLS, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 5*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, bp+32)
 	if rc != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3548, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3567, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink == uint64(0) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3572, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3591, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink > uint64(1) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3601, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3620, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if fileHasMoved(tls, pFile) != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3628, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3647, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 }
@@ -15633,7 +15655,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, 39055)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39059)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -15906,7 +15928,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	var ii int32
 	var fd int32 = -1
 
-	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3656, libc.VaList(bp, zFilename))
+	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3675, libc.VaList(bp, zFilename))
 	for ii = int32(libc.Xstrlen(tls, bp+8)); ii > 0 && int32(*(*int8)(unsafe.Pointer(bp + 8 + uintptr(ii)))) != '/'; ii-- {
 	}
 	if ii > 0 {
@@ -15924,7 +15946,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3371, bp+8, 40676)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40680), ts+3390, bp+8, 40680)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -15941,14 +15963,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, 40717)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3678, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40721)
 	}
 
 	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)), 40731)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40735)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -15968,7 +15990,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, 40762)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3309, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40766)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -16023,7 +16045,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 				if iWrite >= nSize {
 					iWrite = nSize - int64(1)
 				}
-				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1547, 1)
+				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1566, 1)
 				if nWrite != 1 {
 					return SQLITE_IOERR | int32(3)<<8
 				}
@@ -16036,7 +16058,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, 40883)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3309, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40887)
 			}
 		}
 
@@ -16104,7 +16126,7 @@ func unixFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 		}
 	case SQLITE_FCNTL_VFSNAME:
 		{
-			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
+			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
 			return SQLITE_OK
 
 		}
@@ -16263,7 +16285,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, 41442)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41446)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -16291,7 +16313,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, 41499)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3309, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41503)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -16354,7 +16376,7 @@ __4:
 	;
 	libc.Xmemset(tls, pShmNode, 0, uint64(unsafe.Sizeof(unixShmNode{}))+uint64(nShmFilename))
 	zShm = libc.AssignPtrUintptr(pShmNode+16, pShmNode+1*96)
-	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3670, libc.VaList(bp, zBasePath))
+	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3689, libc.VaList(bp, zBasePath))
 
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = -1
 	(*UnixInodeInfo)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pDbFd)).FpInode)).FpShmNode = pShmNode
@@ -16375,7 +16397,7 @@ __5:
 	if !(int32((*UnixInodeInfo)(unsafe.Pointer(pInode)).FbProcessLock) == 0) {
 		goto __7
 	}
-	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3677, 0)) {
+	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3696, 0)) {
 		goto __8
 	}
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = robust_open(tls, zShm, O_RDWR|O_CREAT|O_NOFOLLOW,
@@ -16390,7 +16412,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3254, zShm, 41624)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41628), ts+3273, zShm, 41628)
 	goto shm_open_err
 __10:
 	;
@@ -16516,11 +16538,11 @@ __11:
 		goto __13
 	}
 	*(*int32)(unsafe.Pointer(bp + 224)) = 0
-	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1547, 1, bp+224) != 1) {
+	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1566, 1, bp+224) != 1) {
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3325, zFile, 41768)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3344, zFile, 41772)
 	goto shmpage_out
 __14:
 	;
@@ -16566,7 +16588,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3412, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3431, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41799)
 	goto shmpage_out
 __20:
 	;
@@ -16767,7 +16789,7 @@ func unixUnmapfile(tls *libc.TLS, pFd uintptr) {
 }
 
 func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
-	var zErr uintptr = ts + 3412
+	var zErr uintptr = ts + 3431
 	var h int32 = (*UnixFile)(unsafe.Pointer(pFd)).Fh
 	var pOrig uintptr = (*UnixFile)(unsafe.Pointer(pFd)).FpMapRegion
 	var nOrig I64 = (*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeActual
@@ -16805,7 +16827,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, 42169)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42173)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -16920,10 +16942,10 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		}
 		return uintptr(0)
 	}(),
-		ts+3690, SQLITE_POWERSAFE_OVERWRITE) != 0 {
+		ts+3709, SQLITE_POWERSAFE_OVERWRITE) != 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_PSOW)
 	}
-	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3695) == 0 {
+	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3714) == 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_EXCL)
 	}
 
@@ -16939,7 +16961,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, 42672)
+			robust_close(tls, pNew, h, 42676)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -16952,7 +16974,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		if zLockFile == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
-			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3705, libc.VaList(bp, zFilename))
+			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3724, libc.VaList(bp, zFilename))
 		}
 		(*UnixFile)(unsafe.Pointer(pNew)).FlockingContext = zLockFile
 	}
@@ -16960,7 +16982,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, 42757)
+			robust_close(tls, pNew, h, 42761)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -16973,15 +16995,15 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 var azTempDirs = [6]uintptr{
 	uintptr(0),
 	uintptr(0),
-	ts + 3713,
-	ts + 3722,
-	ts + 3731,
-	ts + 1560,
+	ts + 3732,
+	ts + 3741,
+	ts + 3750,
+	ts + 1579,
 }
 
 func unixTempFileInit(tls *libc.TLS) {
-	azTempDirs[0] = libc.Xgetenv(tls, ts+3736)
-	azTempDirs[1] = libc.Xgetenv(tls, ts+3750)
+	azTempDirs[0] = libc.Xgetenv(tls, ts+3755)
+	azTempDirs[1] = libc.Xgetenv(tls, ts+3769)
 }
 
 func unixTempFileDir(tls *libc.TLS) uintptr {
@@ -17026,7 +17048,7 @@ func unixGetTempname(tls *libc.TLS, nBuf int32, zBuf uintptr) int32 {
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U64(0))), bp+24)
 
 			*(*int8)(unsafe.Pointer(zBuf + uintptr(nBuf-2))) = int8(0)
-			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3757,
+			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3776,
 				libc.VaList(bp, zDir, *(*U64)(unsafe.Pointer(bp + 24)), 0))
 			if int32(*(*int8)(unsafe.Pointer(zBuf + uintptr(nBuf-2)))) != 0 || libc.PostIncInt32(&iLimit, 1) > 10 {
 				rc = SQLITE_ERROR
@@ -17111,7 +17133,7 @@ func findCreateFileMode(tls *libc.TLS, zPath uintptr, flags int32, pMode uintptr
 	} else if flags&SQLITE_OPEN_DELETEONCLOSE != 0 {
 		*(*Mode_t)(unsafe.Pointer(pMode)) = Mode_t(0600)
 	} else if flags&SQLITE_OPEN_URI != 0 {
-		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3774)
+		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3793)
 		if z != 0 {
 			rc = getFileMode(tls, z, pMode, pUid, pGid)
 		}
@@ -17276,7 +17298,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3254, zName, 43198)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43202), ts+3273, zName, 43202)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -17367,7 +17389,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, 43337)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3383, zPath, 43341)
 		}
 		return rc
 	}
@@ -17375,9 +17397,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, 43347)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3800, zPath, 43351)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43353)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -17441,18 +17463,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, 43443), ts+3452, zIn, 43443)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43447), ts+3471, zIn, 43447)
 			}
 		} 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, 43449)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43453)
 				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, 43454), ts+3443, zIn, 43454)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43458), ts+3462, zIn, 43458)
 				return
 			}
 			*(*int8)(unsafe.Pointer(bp + 224 + uintptr(got))) = int8(0)
@@ -17492,14 +17514,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, 43512), ts+3272, zPath, 43512)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43516), ts+3291, zPath, 43516)
 		}
 		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, 43518)
+		return Xsqlite3CantopenError(tls, 43522)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+1032)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -17553,7 +17575,7 @@ func unixDlError(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBufOut uintptr) {
 	unixEnterMutex(tls)
 	zErr = libc.Xdlerror(tls)
 	if zErr != 0 {
-		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3656, libc.VaList(bp, zErr))
+		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3675, libc.VaList(bp, zErr))
 	}
 	unixLeaveMutex(tls)
 }
@@ -17585,7 +17607,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 	{
 		var fd int32
 		var got int32
-		fd = robust_open(tls, ts+3787, O_RDONLY, uint16(0))
+		fd = robust_open(tls, ts+3806, O_RDONLY, uint16(0))
 		if fd < 0 {
 			libc.Xtime(tls, bp)
 			libc.Xmemcpy(tls, zBuf, bp, uint64(unsafe.Sizeof(Time_t(0))))
@@ -17596,7 +17618,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, 43619)
+			robust_close(tls, uintptr(0), fd, 43623)
 		}
 
 	}
@@ -17673,10 +17695,10 @@ func Xsqlite3_os_init(tls *libc.TLS) int32 {
 }
 
 var aVfs = [4]Sqlite3_vfs{
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3800, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3805, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3815, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3695, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3819, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3824, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3834, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3714, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
 }
 
 // Shutdown the operating system interface.
@@ -17731,7 +17753,7 @@ var memdb_g MemFS
 var memdb_vfs = Sqlite3_vfs{
 	FiVersion:          2,
 	FmxPathname:        1024,
-	FzName:             ts + 3828,
+	FzName:             ts + 3847,
 	FxOpen:             0,
 	FxAccess:           0,
 	FxFullPathname:     0,
@@ -17987,7 +18009,7 @@ func memdbFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int3
 	var rc int32 = SQLITE_NOTFOUND
 	memdbEnter(tls, p)
 	if op == SQLITE_FCNTL_VFSNAME {
-		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3834, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
+		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3853, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
 		rc = SQLITE_OK
 	}
 	if op == SQLITE_FCNTL_SIZE_LIMIT {
@@ -18119,7 +18141,7 @@ func memdbFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, z
 	defer tls.Free(8)
 
 	_ = pVfs
-	Xsqlite3_snprintf(tls, nOut, zOut, ts+3656, libc.VaList(bp, zPath))
+	Xsqlite3_snprintf(tls, nOut, zOut, ts+3675, libc.VaList(bp, zPath))
 	return SQLITE_OK
 }
 
@@ -18240,7 +18262,7 @@ func Xsqlite3_serialize(tls *libc.TLS, db uintptr, zSchema uintptr, piSize uintp
 		return uintptr(0)
 	}
 	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
-	zSql = Xsqlite3_mprintf(tls, ts+3849, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3868, libc.VaList(bp, zSchema))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, db, zSql, -1, bp+8, uintptr(0))
 	} else {
@@ -18313,7 +18335,7 @@ __1:
 	goto end_deserialize
 __2:
 	;
-	zSql = Xsqlite3_mprintf(tls, ts+3872, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3891, libc.VaList(bp, zSchema))
 	if !(zSql == uintptr(0)) {
 		goto __3
 	}
@@ -19029,7 +19051,7 @@ func pcacheFetchFinishWithInit(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 	libc.Xmemset(tls, pPgHdr+32, 0, uint64(unsafe.Sizeof(PgHdr{}))-uint64(uintptr(0)+32))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpPage = pPage
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpData = (*Sqlite3_pcache_page)(unsafe.Pointer(pPage)).FpBuf
-	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*72
+	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*80
 	libc.Xmemset(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0, uint64(8))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpCache = pCache
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).Fpgno = pgno
@@ -19059,7 +19081,7 @@ func Xsqlite3PcacheFetchFinish(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 // reference count drops to 0, then it is made eligible for recycling.
 func Xsqlite3PcacheRelease(tls *libc.TLS, p uintptr) {
 	(*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FnRefSum--
-	if int32(libc.PreDecInt16(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1)) == 0 {
+	if libc.PreDecInt64(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1) == int64(0) {
 		if int32((*PgHdr)(unsafe.Pointer(p)).Fflags)&PGHDR_CLEAN != 0 {
 			pcacheUnpin(tls, p)
 		} else {
@@ -19110,7 +19132,7 @@ func Xsqlite3PcacheMakeClean(tls *libc.TLS, p uintptr) {
 	*(*U16)(unsafe.Pointer(p + 52)) &= libc.Uint16FromInt32(libc.CplInt32(PGHDR_DIRTY | PGHDR_NEED_SYNC | PGHDR_WRITEABLE))
 	*(*U16)(unsafe.Pointer(p + 52)) |= U16(PGHDR_CLEAN)
 
-	if int32((*PgHdr)(unsafe.Pointer(p)).FnRef) == 0 {
+	if (*PgHdr)(unsafe.Pointer(p)).FnRef == int64(0) {
 		pcacheUnpin(tls, p)
 	}
 }
@@ -19214,8 +19236,8 @@ func Xsqlite3PcacheClear(tls *libc.TLS, pCache uintptr) {
 }
 
 func pcacheMergeDirtyList(tls *libc.TLS, pA uintptr, pB uintptr) uintptr {
-	bp := tls.Alloc(72)
-	defer tls.Free(72)
+	bp := tls.Alloc(80)
+	defer tls.Free(80)
 
 	var pTail uintptr
 	pTail = bp
@@ -19293,13 +19315,13 @@ func Xsqlite3PcacheDirtyList(tls *libc.TLS, pCache uintptr) uintptr {
 //
 // This is not the total number of pages referenced, but the sum of the
 // reference count for all pages.
-func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) int32 {
+func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) I64 {
 	return (*PCache)(unsafe.Pointer(pCache)).FnRefSum
 }
 
 // Return the number of references to the page supplied as an argument.
-func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) int32 {
-	return int32((*PgHdr)(unsafe.Pointer(p)).FnRef)
+func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) I64 {
+	return (*PgHdr)(unsafe.Pointer(p)).FnRef
 }
 
 // Return the total number of pages in the cache.
@@ -21528,7 +21550,7 @@ __27:
 	if !(isHot != 0 && nPlayback != 0) {
 		goto __28
 	}
-	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3887,
+	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3906,
 		libc.VaList(bp, nPlayback, (*Pager)(unsafe.Pointer(pPager)).FzJournal))
 __28:
 	;
@@ -21593,7 +21615,7 @@ func pagerUndoCallback(tls *libc.TLS, pCtx uintptr, iPg Pgno) int32 {
 
 	pPg = Xsqlite3PagerLookup(tls, pPager, iPg)
 	if pPg != 0 {
-		if Xsqlite3PcachePageRefcount(tls, pPg) == 1 {
+		if Xsqlite3PcachePageRefcount(tls, pPg) == int64(1) {
 			Xsqlite3PcacheDrop(tls, pPg)
 		} else {
 			rc = readDbPage(tls, pPg)
@@ -22026,7 +22048,7 @@ func Xsqlite3PagerSetPagesize(tls *libc.TLS, pPager uintptr, pPageSize uintptr,
 	var pageSize U32 = *(*U32)(unsafe.Pointer(pPageSize))
 
 	if (int32((*Pager)(unsafe.Pointer(pPager)).FmemDb) == 0 || (*Pager)(unsafe.Pointer(pPager)).FdbSize == Pgno(0)) &&
-		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 &&
+		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) &&
 		pageSize != 0 && pageSize != U32((*Pager)(unsafe.Pointer(pPager)).FpageSize) {
 		var pNew uintptr = uintptr(0)
 		*(*I64)(unsafe.Pointer(bp)) = int64(0)
@@ -22178,9 +22200,9 @@ func pagerAcquireMapPage(tls *libc.TLS, pPager uintptr, pgno Pgno, pData uintptr
 			Xsqlite3OsUnfetch(tls, (*Pager)(unsafe.Pointer(pPager)).Ffd, I64(pgno-Pgno(1))*(*Pager)(unsafe.Pointer(pPager)).FpageSize, pData)
 			return SQLITE_NOMEM
 		}
-		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*72
+		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*80
 		(*PgHdr)(unsafe.Pointer(p)).Fflags = U16(PGHDR_MMAP)
-		(*PgHdr)(unsafe.Pointer(p)).FnRef = int16(1)
+		(*PgHdr)(unsafe.Pointer(p)).FnRef = int64(1)
 		(*PgHdr)(unsafe.Pointer(p)).FpPager = pPager
 	}
 
@@ -22512,7 +22534,7 @@ func Xsqlite3PagerFlush(tls *libc.TLS, pPager uintptr) int32 {
 
 		for rc == SQLITE_OK && pList != 0 {
 			var pNext uintptr = (*PgHdr)(unsafe.Pointer(pList)).FpDirty
-			if int32((*PgHdr)(unsafe.Pointer(pList)).FnRef) == 0 {
+			if (*PgHdr)(unsafe.Pointer(pList)).FnRef == int64(0) {
 				rc = pagerStress(tls, pPager, pList)
 			}
 			pList = pNext
@@ -22662,7 +22684,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 60235)
+	rc = Xsqlite3CantopenError(tls, 60239)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -22723,7 +22745,7 @@ __15:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzJournal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3914, uint64(8))
+	libc.Xmemcpy(tls, pPtr, ts+3933, uint64(8))
 	pPtr += uintptr(8 + 1)
 	goto __19
 __18:
@@ -22736,7 +22758,7 @@ __19:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzWal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3923, uint64(4))
+	libc.Xmemcpy(tls, pPtr, ts+3942, uint64(4))
 	pPtr += uintptr(4 + 1)
 	goto __21
 __20:
@@ -22788,9 +22810,9 @@ __27:
 	;
 __26:
 	;
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3928, 0))
+	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3947, 0))
 	if !(iDc&SQLITE_IOCAP_IMMUTABLE != 0 ||
-		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3935, 0) != 0) {
+		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3954, 0) != 0) {
 		goto __30
 	}
 	vfsFlags = vfsFlags | SQLITE_OPEN_READONLY
@@ -23043,7 +23065,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60754)
+	rc = Xsqlite3CantopenError(tls, 60758)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23149,7 +23171,7 @@ __24:
 }
 
 func pagerUnlockIfUnused(tls *libc.TLS, pPager uintptr) {
-	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 {
+	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) {
 		pagerUnlockAndRollback(tls, pPager)
 	}
 }
@@ -23167,7 +23189,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60967)
+	return Xsqlite3CorruptError(tls, 60971)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23206,7 +23228,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60999)
+	rc = Xsqlite3CorruptError(tls, 61003)
 	goto pager_acquire_err
 __7:
 	;
@@ -23283,7 +23305,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, 61078)
+		return Xsqlite3CorruptError(tls, 61082)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24041,7 +24063,7 @@ func Xsqlite3PagerMemUsed(tls *libc.TLS, pPager uintptr) int32 {
 
 // Return the number of references to the specified page.
 func Xsqlite3PagerPageRefcount(tls *libc.TLS, pPage uintptr) int32 {
-	return Xsqlite3PcachePageRefcount(tls, pPage)
+	return int32(Xsqlite3PcachePageRefcount(tls, pPage))
 }
 
 // Parameter eStat must be one of SQLITE_DBSTATUS_CACHE_HIT, _MISS, _WRITE,
@@ -24284,9 +24306,9 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	pPgOld = Xsqlite3PagerLookup(tls, pPager, pgno)
 
 	if pPgOld != 0 {
-		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
+		if (*PgHdr)(unsafe.Pointer(pPgOld)).FnRef > int64(1) {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62623)
+			return Xsqlite3CorruptError(tls, 62627)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -24471,7 +24493,7 @@ func Xsqlite3PagerClearCache(tls *libc.TLS, pPager uintptr) {
 func Xsqlite3PagerCheckpoint(tls *libc.TLS, pPager uintptr, db uintptr, eMode int32, pnLog uintptr, pnCkpt uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal == uintptr(0) && int32((*Pager)(unsafe.Pointer(pPager)).FjournalMode) == PAGER_JOURNALMODE_WAL {
-		Xsqlite3_exec(tls, db, ts+3945, uintptr(0), uintptr(0), uintptr(0))
+		Xsqlite3_exec(tls, db, ts+3964, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal != 0 {
 		rc = Xsqlite3WalCheckpoint(tls, (*Pager)(unsafe.Pointer(pPager)).FpWal, db, eMode,
@@ -25043,7 +25065,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, 64387)
+				return Xsqlite3CorruptError(tls, 64391)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25142,7 +25164,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64519)
+	rc = Xsqlite3CantopenError(tls, 64523)
 	goto finished
 __7:
 	;
@@ -25310,7 +25332,7 @@ __24:
 		goto __30
 	}
 	Xsqlite3_log(tls, SQLITE_NOTICE|int32(1)<<8,
-		ts+3963,
+		ts+3982,
 		libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 __30:
 	;
@@ -25728,7 +25750,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65333)
+	rc = Xsqlite3CorruptError(tls, 65337)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -25873,7 +25895,7 @@ func walLimitSize(tls *libc.TLS, pWal uintptr, nMax I64) {
 	}
 	Xsqlite3EndBenignMalloc(tls)
 	if rx != 0 {
-		Xsqlite3_log(tls, rx, ts+4000, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
+		Xsqlite3_log(tls, rx, ts+4019, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 	}
 }
 
@@ -26003,7 +26025,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, 65682)
+		rc = Xsqlite3CantopenError(tls, 65686)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -26476,7 +26498,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66419)
+				return Xsqlite3CorruptError(tls, 66423)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -26981,7 +27003,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, 67138)
+			rc = Xsqlite3CorruptError(tls, 67142)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -27374,7 +27396,7 @@ func Xsqlite3BtreeLeaveCursor(tls *libc.TLS, pCur uintptr) {
 	Xsqlite3BtreeLeave(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpBtree)
 }
 
-var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 4026))
+var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 4045))
 
 var sqlite3SharedCacheList uintptr = uintptr(0)
 
@@ -27639,7 +27661,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, 69249)
+			rc = Xsqlite3CorruptError(tls, 69253)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -27776,7 +27798,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69434)
 	return
 __2:
 	;
@@ -27793,7 +27815,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69447)
 	goto ptrmap_exit
 __4:
 	;
@@ -27801,7 +27823,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69452)
 	goto ptrmap_exit
 __5:
 	;
@@ -27844,7 +27866,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, 69493)
+		return Xsqlite3CorruptError(tls, 69497)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -27854,7 +27876,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, 69501)
+		return Xsqlite3CorruptError(tls, 69505)
 	}
 	return SQLITE_OK
 }
@@ -28104,7 +28126,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, 69893)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69897)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28151,7 +28173,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69951)
+	return Xsqlite3CorruptError(tls, 69955)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28161,7 +28183,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69954)
+	return Xsqlite3CorruptError(tls, 69958)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28174,7 +28196,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69962)
+	return Xsqlite3CorruptError(tls, 69966)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28183,14 +28205,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69965)
+	return Xsqlite3CorruptError(tls, 69969)
 __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, 69967)
+	return Xsqlite3CorruptError(tls, 69971)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -28200,7 +28222,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69971)
+	return Xsqlite3CorruptError(tls, 69975)
 __11:
 	;
 __8:
@@ -28264,7 +28286,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 70004)
+	return Xsqlite3CorruptError(tls, 70008)
 __22:
 	;
 	size = int32((*struct {
@@ -28274,7 +28296,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 70010)
+	return Xsqlite3CorruptError(tls, 70014)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -28296,7 +28318,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 70024)
+	return Xsqlite3CorruptError(tls, 70028)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -28331,7 +28353,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, 70081)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70085)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -28344,13 +28366,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, 70096)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70100)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70107)
 	}
 	return uintptr(0)
 }
@@ -28375,7 +28397,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, 70152)
+			return Xsqlite3CorruptError(tls, 70156)
 		}
 	}
 
@@ -28386,7 +28408,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, 70170)
+				return Xsqlite3CorruptError(tls, 70174)
 			} else {
 				return SQLITE_OK
 			}
@@ -28438,22 +28460,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 70249)
+				return Xsqlite3CorruptError(tls, 70253)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 70254)
+			return Xsqlite3CorruptError(tls, 70258)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 70266)
+				return Xsqlite3CorruptError(tls, 70270)
 			}
 			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, 70269)
+				return Xsqlite3CorruptError(tls, 70273)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -28463,7 +28485,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, 70282)
+					return Xsqlite3CorruptError(tls, 70286)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -28471,7 +28493,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, 70288)
+			return Xsqlite3CorruptError(tls, 70292)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -28479,10 +28501,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, 70297)
+			return Xsqlite3CorruptError(tls, 70301)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70298)
+			return Xsqlite3CorruptError(tls, 70302)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -28542,7 +28564,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70357)
+			return Xsqlite3CorruptError(tls, 70361)
 		}
 	} else {
 		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
@@ -28578,7 +28600,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70381)
+			return Xsqlite3CorruptError(tls, 70385)
 		}
 	}
 	return SQLITE_OK
@@ -28608,11 +28630,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70432)
+			return Xsqlite3CorruptError(tls, 70436)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70437)
+				return Xsqlite3CorruptError(tls, 70441)
 			}
 			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))))
@@ -28623,15 +28645,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70447)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70451)
+			return Xsqlite3CorruptError(tls, 70455)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70463)
+		return Xsqlite3CorruptError(tls, 70467)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -28659,14 +28681,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, 70494)
+			return Xsqlite3CorruptError(tls, 70498)
 		}
 		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, 70499)
+			return Xsqlite3CorruptError(tls, 70503)
 		}
 	}
 	return SQLITE_OK
@@ -28680,7 +28702,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, 70531)
+		return Xsqlite3CorruptError(tls, 70535)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -28692,7 +28714,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, 70545)
+		return Xsqlite3CorruptError(tls, 70549)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -28795,7 +28817,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70700)
+	rc = Xsqlite3CorruptError(tls, 70704)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -28823,7 +28845,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, 70721)
+	rc = Xsqlite3CorruptError(tls, 70725)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -28862,7 +28884,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, 70787)
+			return Xsqlite3CorruptError(tls, 70791)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -28935,7 +28957,7 @@ func Xsqlite3BtreeOpen(tls *libc.TLS, pVfs uintptr, zFilename uintptr, db uintpt
 	mutexOpen = uintptr(0)
 	rc = SQLITE_OK
 	isTempDb = libc.Bool32(zFilename == uintptr(0) || int32(*(*int8)(unsafe.Pointer(zFilename))) == 0)
-	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4042) == 0 ||
+	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4061) == 0 ||
 		isTempDb != 0 && Xsqlite3TempInMemory(tls, db) != 0 ||
 		vfsFlags&SQLITE_OPEN_MEMORY != 0)
 
@@ -29707,7 +29729,7 @@ __9:
 	;
 __10:
 	;
-	if !(libc.Xmemcmp(tls, page1+21, ts+4051, uint64(3)) != 0) {
+	if !(libc.Xmemcmp(tls, page1+21, ts+4070, uint64(3)) != 0) {
 		goto __14
 	}
 	goto page1_init_failed
@@ -29745,7 +29767,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71722)
+	rc = Xsqlite3CorruptError(tls, 71726)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30160,7 +30182,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, 72143)
+			return Xsqlite3CorruptError(tls, 72147)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30186,7 +30208,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, 72162)
+						return Xsqlite3CorruptError(tls, 72166)
 					}
 					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)
@@ -30195,7 +30217,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, 72171)
+					return Xsqlite3CorruptError(tls, 72175)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30206,7 +30228,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, 72183)
+				return Xsqlite3CorruptError(tls, 72187)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30222,7 +30244,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, 72218)
+		return Xsqlite3CorruptError(tls, 72222)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -30283,7 +30305,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, 72316)
+			return Xsqlite3CorruptError(tls, 72320)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -30318,7 +30340,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, 72368)
+					return Xsqlite3CorruptError(tls, 72372)
 				}
 			}
 
@@ -30378,7 +30400,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, 72436)
+			rc = Xsqlite3CorruptError(tls, 72440)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -30417,7 +30439,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, 72487)
+			return Xsqlite3CorruptError(tls, 72491)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -30448,7 +30470,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72514)
+			return Xsqlite3CorruptError(tls, 72518)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -30789,7 +30811,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, 72978)
+			return Xsqlite3CorruptError(tls, 72982)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -31033,14 +31055,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, 73385)
+		return Xsqlite3CorruptError(tls, 73389)
 	}
 
 	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, 73400)
+		return Xsqlite3CorruptError(tls, 73404)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -31085,7 +31107,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, 73462)
+				return Xsqlite3CorruptError(tls, 73466)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31134,7 +31156,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73547)
+		return Xsqlite3CorruptError(tls, 73551)
 	}
 	return rc
 }
@@ -31214,7 +31236,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, 73684)
+		return Xsqlite3CorruptError(tls, 73688)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -31305,7 +31327,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, 73823)
+	return Xsqlite3CorruptError(tls, 73827)
 __11:
 	;
 skip_init:
@@ -31325,7 +31347,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73835)
+	return Xsqlite3CorruptError(tls, 73839)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -31535,7 +31557,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 74077)
+	return Xsqlite3CorruptError(tls, 74081)
 __21:
 	;
 	goto __19
@@ -31739,7 +31761,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 74273)
+	return Xsqlite3CorruptError(tls, 74277)
 __4:
 	;
 	goto bypass_moveto_root
@@ -31804,7 +31826,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, 74360)
+	rc = Xsqlite3CorruptError(tls, 74364)
 	goto moveto_index_finish
 __17:
 	;
@@ -31852,7 +31874,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74392)
+	rc = Xsqlite3CorruptError(tls, 74396)
 __24:
 	;
 	goto moveto_index_finish
@@ -31971,7 +31993,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, 74508)
+		return Xsqlite3CorruptError(tls, 74512)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32131,7 +32153,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74688)
+	return Xsqlite3CorruptError(tls, 74692)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32196,7 +32218,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74744)
+	rc = Xsqlite3CorruptError(tls, 74748)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -32232,7 +32254,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74773)
+	rc = Xsqlite3CorruptError(tls, 74777)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -32276,7 +32298,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74807)
+	rc = Xsqlite3CorruptError(tls, 74811)
 	goto end_allocate_page
 __32:
 	;
@@ -32388,7 +32410,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74872)
+	rc = Xsqlite3CorruptError(tls, 74876)
 	goto end_allocate_page
 __51:
 	;
@@ -32546,7 +32568,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, 74999)
+	return Xsqlite3CorruptError(tls, 75003)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -32603,7 +32625,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75050)
 	goto freepage_out
 __10:
 	;
@@ -32619,7 +32641,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75061)
 	goto freepage_out
 __12:
 	;
@@ -32693,7 +32715,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, 75146)
+		return Xsqlite3CorruptError(tls, 75150)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -32705,7 +32727,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, 75163)
+			return Xsqlite3CorruptError(tls, 75167)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -32716,7 +32738,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, 75183)
+			rc = Xsqlite3CorruptError(tls, 75187)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -32881,7 +32903,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, 75436)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75440)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -33160,12 +33182,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, 75737)
+				return Xsqlite3CorruptError(tls, 75741)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75742)
+			return Xsqlite3CorruptError(tls, 75746)
 		}
 
 		pData -= uintptr(sz)
@@ -33173,7 +33195,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, 75748)
+			return Xsqlite3CorruptError(tls, 75752)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -33233,7 +33255,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, 75833)
+			Xsqlite3CorruptError(tls, 75837)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -33322,7 +33344,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75947)
+	return Xsqlite3CorruptError(tls, 75951)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -33438,7 +33460,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, 76060)
+		return Xsqlite3CorruptError(tls, 76064)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -33758,7 +33780,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, 76481)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76485)
 	goto balance_cleanup
 __25:
 	;
@@ -33769,7 +33791,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76509)
 	goto balance_cleanup
 __27:
 	;
@@ -33927,7 +33949,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76610)
 	goto balance_cleanup
 __55:
 	;
@@ -34001,7 +34023,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76643)
 	goto balance_cleanup
 __67:
 	;
@@ -34064,7 +34086,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76687)
 	goto balance_cleanup
 __75:
 	;
@@ -34092,7 +34114,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76720)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -34353,7 +34375,7 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76920)
 	goto balance_cleanup
 __121:
 	;
@@ -34545,7 +34567,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, 77146)
+			return Xsqlite3CorruptError(tls, 77150)
 		}
 	}
 	return SQLITE_OK
@@ -34583,7 +34605,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 77206)
+			rc = Xsqlite3CorruptError(tls, 77210)
 		} 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)))
@@ -34689,7 +34711,7 @@ func btreeOverwriteOverflowCell(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, 77370)
+			rc = Xsqlite3CorruptError(tls, 77374)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -34714,7 +34736,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 
 	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)
+		return Xsqlite3CorruptError(tls, 77402)
 	}
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
 		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
@@ -34784,7 +34806,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77479)
+	return Xsqlite3CorruptError(tls, 77483)
 __3:
 	;
 __1:
@@ -34897,7 +34919,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77606)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -34957,6 +34979,7 @@ __30:
 __25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
+	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
 		goto __31
 	}
@@ -34964,7 +34987,7 @@ __25:
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
 		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77640)
+	return Xsqlite3CorruptError(tls, 77645)
 __33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
@@ -35002,13 +35025,13 @@ __37:
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77667)
+	return Xsqlite3CorruptError(tls, 77672)
 __39:
 	;
 	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __40
 	}
-	return Xsqlite3CorruptError(tls, 77670)
+	return Xsqlite3CorruptError(tls, 77675)
 __40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
@@ -35039,7 +35062,6 @@ __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 __44
 	}
@@ -35114,7 +35136,7 @@ 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, 77773)
+		return Xsqlite3CorruptError(tls, 77777)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
@@ -35139,7 +35161,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, 77798)
+				return Xsqlite3CorruptError(tls, 77802)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35240,7 +35262,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77894)
+			return Xsqlite3CorruptError(tls, 77898)
 		}
 	}
 
@@ -35248,11 +35270,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, 77903)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 	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, 77907)
+		return Xsqlite3CorruptError(tls, 77911)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -35327,7 +35349,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, 77998)
+			return Xsqlite3CorruptError(tls, 78002)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -35396,7 +35418,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, 78114)
+			return Xsqlite3CorruptError(tls, 78118)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -35425,7 +35447,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, 78162)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78166)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -35501,7 +35523,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 78252)
+	return Xsqlite3CorruptError(tls, 78256)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -35515,7 +35537,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, 78259)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78263)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -35649,7 +35671,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, 78363)
+		return Xsqlite3CorruptError(tls, 78367)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -35866,7 +35888,7 @@ 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+64, ts+4055, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4074, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
 		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
@@ -35891,11 +35913,11 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 	defer tls.Free(16)
 
 	if iPage > (*IntegrityCk)(unsafe.Pointer(pCheck)).FnPage || iPage == Pgno(0) {
-		checkAppendMsg(tls, pCheck, ts+4057, libc.VaList(bp, iPage))
+		checkAppendMsg(tls, pCheck, ts+4076, libc.VaList(bp, iPage))
 		return 1
 	}
 	if getPageReferenced(tls, pCheck, iPage) != 0 {
-		checkAppendMsg(tls, pCheck, ts+4080, libc.VaList(bp+8, iPage))
+		checkAppendMsg(tls, pCheck, ts+4099, libc.VaList(bp+8, iPage))
 		return 1
 	}
 	setPageReferenced(tls, pCheck, iPage)
@@ -35913,13 +35935,13 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
 			checkOom(tls, pCheck)
 		}
-		checkAppendMsg(tls, pCheck, ts+4105, libc.VaList(bp, iChild))
+		checkAppendMsg(tls, pCheck, ts+4124, libc.VaList(bp, iChild))
 		return
 	}
 
 	if int32(*(*U8)(unsafe.Pointer(bp + 48))) != int32(eType) || *(*Pgno)(unsafe.Pointer(bp + 52)) != iParent {
 		checkAppendMsg(tls, pCheck,
-			ts+4134,
+			ts+4153,
 			libc.VaList(bp+8, iChild, int32(eType), iParent, int32(*(*U8)(unsafe.Pointer(bp + 48))), *(*Pgno)(unsafe.Pointer(bp + 52))))
 	}
 }
@@ -35938,7 +35960,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 		}
 		N--
 		if Xsqlite3PagerGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpPager, iPage, bp+40, 0) != 0 {
-			checkAppendMsg(tls, pCheck, ts+4188, libc.VaList(bp, iPage))
+			checkAppendMsg(tls, pCheck, ts+4207, libc.VaList(bp, iPage))
 			break
 		}
 		pOvflData = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
@@ -35949,7 +35971,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 			}
 			if n > (*BtShared)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt)).FusableSize/U32(4)-U32(2) {
 				checkAppendMsg(tls, pCheck,
-					ts+4210, libc.VaList(bp+8, iPage))
+					ts+4229, libc.VaList(bp+8, iPage))
 				N--
 			} else {
 				for i = 0; i < int32(n); i++ {
@@ -35972,12 +35994,12 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 	}
 	if N != 0 && nErrAtStart == (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr {
 		checkAppendMsg(tls, pCheck,
-			ts+4249,
+			ts+4268,
 			libc.VaList(bp+16, func() uintptr {
 				if isFreeList != 0 {
-					return ts + 4275
+					return ts + 4294
 				}
-				return ts + 4280
+				return ts + 4299
 			}(),
 				expected-N, expected))
 	}
@@ -36093,13 +36115,13 @@ __2:
 	return 0
 __3:
 	;
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4301
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4320
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
 		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4311, libc.VaList(bp, rc))
+		ts+4330, libc.VaList(bp, rc))
 	goto end_of_check
 __4:
 	;
@@ -36110,7 +36132,7 @@ __4:
 	}
 
 	checkAppendMsg(tls, pCheck,
-		ts+4349, libc.VaList(bp+8, rc))
+		ts+4368, libc.VaList(bp+8, rc))
 	goto end_of_check
 __5:
 	;
@@ -36118,14 +36140,14 @@ __5:
 		goto __6
 	}
 
-	checkAppendMsg(tls, pCheck, ts+4387, libc.VaList(bp+16, rc))
+	checkAppendMsg(tls, pCheck, ts+4406, libc.VaList(bp+16, rc))
 	goto end_of_check
 __6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
 
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4409
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4428
 	contentOffset = U32((int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5))))<<8|int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5) + 1)))-1)&0xffff + 1)
 
 	nCell = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3) + 1)))
@@ -36142,7 +36164,7 @@ __6:
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
 		goto __9
 	}
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4435
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4454
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
 __9:
 	;
@@ -36167,7 +36189,7 @@ __10:
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
 		goto __13
 	}
-	checkAppendMsg(tls, pCheck, ts+4463,
+	checkAppendMsg(tls, pCheck, ts+4482,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
 	goto __11
@@ -36180,7 +36202,7 @@ __13:
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
 		goto __14
 	}
-	checkAppendMsg(tls, pCheck, ts+4493, 0)
+	checkAppendMsg(tls, pCheck, ts+4512, 0)
 	doCoverageCheck = 0
 	goto __11
 __14:
@@ -36196,7 +36218,7 @@ __14:
 	}() != 0) {
 		goto __16
 	}
-	checkAppendMsg(tls, pCheck, ts+4517, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
+	checkAppendMsg(tls, pCheck, ts+4536, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
 __16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
@@ -36234,7 +36256,7 @@ __21:
 	if !(d2 != depth) {
 		goto __22
 	}
-	checkAppendMsg(tls, pCheck, ts+4541, 0)
+	checkAppendMsg(tls, pCheck, ts+4560, 0)
 	depth = d2
 __22:
 	;
@@ -36307,7 +36329,7 @@ __30:
 		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4566, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
+		ts+4585, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
 	goto __31
 	goto __33
 __32:
@@ -36324,7 +36346,7 @@ __31:
 		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4603,
+		ts+4622,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
 __34:
 	;
@@ -36438,7 +36460,7 @@ __6:
 	if !(bCkFreelist != 0) {
 		goto __7
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4655
+	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4674
 	checkList(tls, bp+32, 1, Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+32),
 		Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
@@ -36474,7 +36496,7 @@ __13:
 		goto __15
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4671,
+		ts+4690,
 		libc.VaList(bp, mx, mxInHdr))
 __15:
 	;
@@ -36484,7 +36506,7 @@ __9:
 		goto __16
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4716, 0)
+		ts+4735, 0)
 __16:
 	;
 __10:
@@ -36531,13 +36553,13 @@ __23:
 	if !(getPageReferenced(tls, bp+32, i) == 0 && (ptrmapPageno(tls, pBt, i) != i || !(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0))) {
 		goto __26
 	}
-	checkAppendMsg(tls, bp+32, ts+4771, libc.VaList(bp+16, i))
+	checkAppendMsg(tls, bp+32, ts+4790, libc.VaList(bp+16, i))
 __26:
 	;
 	if !(getPageReferenced(tls, bp+32, i) != 0 && (ptrmapPageno(tls, pBt, i) == i && (*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0)) {
 		goto __27
 	}
-	checkAppendMsg(tls, bp+32, ts+4793, libc.VaList(bp+24, i))
+	checkAppendMsg(tls, bp+32, ts+4812, libc.VaList(bp+24, i))
 __27:
 	;
 	goto __24
@@ -36800,7 +36822,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 		var rc int32 = 0
 		Xsqlite3ParseObjectInit(tls, bp+16, pDb)
 		if Xsqlite3OpenTempDatabase(tls, bp+16) != 0 {
-			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3656, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3675, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 			rc = SQLITE_ERROR
 		}
 		Xsqlite3DbFree(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
@@ -36811,7 +36833,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 	}
 
 	if i < 0 {
-		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4827, libc.VaList(bp+8, zDb))
+		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4846, libc.VaList(bp+8, zDb))
 		return uintptr(0)
 	}
 
@@ -36826,7 +36848,7 @@ func setDestPgsz(tls *libc.TLS, p uintptr) int32 {
 
 func checkReadTransaction(tls *libc.TLS, db uintptr, p uintptr) int32 {
 	if Xsqlite3BtreeTxnState(tls, p) != SQLITE_TXN_NONE {
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4847, 0)
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4866, 0)
 		return SQLITE_ERROR
 	}
 	return SQLITE_OK
@@ -36846,7 +36868,7 @@ func Xsqlite3_backup_init(tls *libc.TLS, pDestDb uintptr, zDestDb uintptr, pSrcD
 
 	if pSrcDb == pDestDb {
 		Xsqlite3ErrorWithMsg(tls,
-			pDestDb, SQLITE_ERROR, ts+4878, 0)
+			pDestDb, SQLITE_ERROR, ts+4897, 0)
 		p = uintptr(0)
 	} else {
 		p = Xsqlite3MallocZero(tls, uint64(unsafe.Sizeof(Sqlite3_backup{})))
@@ -37294,7 +37316,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 		(*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,
+		Xsqlite3_str_appendf(tls, bp+8, ts+4937,
 			libc.VaList(bp, func() float64 {
 				if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_IntReal != 0 {
 					return float64(*(*I64)(unsafe.Pointer(p)))
@@ -37886,7 +37908,7 @@ func Xsqlite3VdbeMemSetPointer(tls *libc.TLS, pMem uintptr, pPtr uintptr, zPType
 		if zPType != 0 {
 			return zPType
 		}
-		return ts + 1547
+		return ts + 1566
 	}()
 	(*Mem)(unsafe.Pointer(pMem)).Fz = pPtr
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null | MEM_Dyn | MEM_Subtype | MEM_Term)
@@ -38118,7 +38140,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, 81630)
+		return Xsqlite3CorruptError(tls, 81634)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -38350,7 +38372,7 @@ __9:
 		goto __10
 	}
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 8)).FisError
-	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3656, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
+	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3675, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
 	goto __11
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
@@ -38403,7 +38425,7 @@ func valueFromExpr(tls *libc.TLS, db uintptr, pExpr uintptr, enc U8, affinity U8
 	zVal = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	negInt = 1
-	zNeg = ts + 1547
+	zNeg = ts + 1566
 	rc = SQLITE_OK
 
 __1:
@@ -38444,7 +38466,7 @@ __4:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
 	negInt = -1
-	zNeg = ts + 4925
+	zNeg = ts + 4944
 __6:
 	;
 	if !(op == TK_STRING || op == TK_FLOAT || op == TK_INTEGER) {
@@ -38463,7 +38485,7 @@ __9:
 	Xsqlite3VdbeMemSetInt64(tls, *(*uintptr)(unsafe.Pointer(bp + 16)), I64(*(*int32)(unsafe.Pointer(pExpr + 8)))*I64(negInt))
 	goto __11
 __10:
-	zVal = Xsqlite3MPrintf(tls, db, ts+4927, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+	zVal = Xsqlite3MPrintf(tls, db, ts+4946, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	if !(zVal == uintptr(0)) {
 		goto __12
 	}
@@ -38767,7 +38789,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, 82270)
+		return Xsqlite3CorruptError(tls, 82274)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -38782,14 +38804,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 82276)
+			return Xsqlite3CorruptError(tls, 82280)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 82282)
+		return Xsqlite3CorruptError(tls, 82286)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -39797,34 +39819,34 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var j int32
 			var pKeyInfo uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4932, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4951, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
 			for j = 0; j < int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField); j++ {
 				var pColl uintptr = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(j)*8))
 				var zColl uintptr
 				if pColl != 0 {
 					zColl = (*CollSeq)(unsafe.Pointer(pColl)).FzName
 				} else {
-					zColl = ts + 1547
+					zColl = ts + 1566
 				}
-				if libc.Xstrcmp(tls, zColl, ts+1092) == 0 {
-					zColl = ts + 4937
+				if libc.Xstrcmp(tls, zColl, ts+1111) == 0 {
+					zColl = ts + 4956
 				}
-				Xsqlite3_str_appendf(tls, bp+144, ts+4939,
+				Xsqlite3_str_appendf(tls, bp+144, ts+4958,
 					libc.VaList(bp+8, func() uintptr {
 						if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_DESC != 0 {
-							return ts + 4925
+							return ts + 4944
 						}
-						return ts + 1547
+						return ts + 1566
 					}(),
 						func() uintptr {
 							if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_BIGNULL != 0 {
-								return ts + 4947
+								return ts + 4966
 							}
-							return ts + 1547
+							return ts + 1566
 						}(),
 						zColl))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4950, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+4969, 1)
 			break
 
 		}
@@ -39832,7 +39854,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 		{
 			var pColl uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4952, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
+			Xsqlite3_str_appendf(tls, bp+144, ts+4971, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
 				encnames[(*CollSeq)(unsafe.Pointer(pColl)).Fenc]))
 			break
 
@@ -39840,32 +39862,32 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -7:
 		{
 			var pDef uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
-			Xsqlite3_str_appendf(tls, bp+144, ts+4961, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4980, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -15:
 		{
 			var pDef uintptr = (*Sqlite3_context)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpFunc
-			Xsqlite3_str_appendf(tls, bp+144, ts+4961, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4980, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -13:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1327, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1346, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
 	case -3:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+4968, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4987, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
 			break
 
 		}
 	case -12:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1321, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1340, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
@@ -39875,13 +39897,13 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Str != 0 {
 				zP4 = (*Mem)(unsafe.Pointer(pMem)).Fz
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1327, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1346, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1321, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1340, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Null != 0 {
-				zP4 = ts + 1548
+				zP4 = ts + 1567
 			} else {
-				zP4 = ts + 4971
+				zP4 = ts + 4990
 			}
 			break
 
@@ -39889,7 +39911,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -11:
 		{
 			var pVtab uintptr = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-			Xsqlite3_str_appendf(tls, bp+144, ts+4978, libc.VaList(bp+120, pVtab))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4997, libc.VaList(bp+120, pVtab))
 			break
 
 		}
@@ -39900,20 +39922,20 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var n U32 = *(*U32)(unsafe.Pointer(ai))
 
 			for i = U32(1); i <= n; i++ {
-				Xsqlite3_str_appendf(tls, bp+144, ts+4986, libc.VaList(bp+128, func() int32 {
+				Xsqlite3_str_appendf(tls, bp+144, ts+5005, libc.VaList(bp+128, func() int32 {
 					if i == U32(1) {
 						return '['
 					}
 					return ','
 				}(), *(*U32)(unsafe.Pointer(ai + uintptr(i)*4))))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4991, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+5010, 1)
 			break
 
 		}
 	case -4:
 		{
-			zP4 = ts + 4993
+			zP4 = ts + 5012
 			break
 
 		}
@@ -39938,7 +39960,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	return Xsqlite3StrAccumFinish(tls, bp+144)
 }
 
-var encnames = [4]uintptr{ts + 5001, ts + 5003, ts + 5005, ts + 5010}
+var encnames = [4]uintptr{ts + 5020, ts + 5022, ts + 5024, ts + 5029}
 
 // Declare to the Vdbe that the BTree object at db->aDb[i] is used.
 //
@@ -40388,8 +40410,8 @@ func Xsqlite3VdbeMakeReady(tls *libc.TLS, p uintptr, pParse uintptr) {
 }
 
 var azColName = [12]uintptr{
-	ts + 5015, ts + 5020, ts + 5027, ts + 5030, ts + 5033, ts + 5036, ts + 5039, ts + 5042,
-	ts + 5050, ts + 5053, ts + 5060, ts + 5068,
+	ts + 5034, ts + 5039, ts + 5046, ts + 5049, ts + 5052, ts + 5055, ts + 5058, ts + 5061,
+	ts + 5069, ts + 5072, ts + 5079, ts + 5087,
 }
 
 // Close a VDBE cursor and release all the resources that cursor
@@ -40598,7 +40620,7 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		var nMainFile int32
 
 		nMainFile = Xsqlite3Strlen30(tls, zMainFile)
-		zSuper = Xsqlite3MPrintf(tls, db, ts+5075, libc.VaList(bp, 0, zMainFile, 0))
+		zSuper = Xsqlite3MPrintf(tls, db, ts+5094, libc.VaList(bp, 0, zMainFile, 0))
 		if zSuper == uintptr(0) {
 			return SQLITE_NOMEM
 		}
@@ -40606,16 +40628,16 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		for __ccgo := true; __ccgo; __ccgo = rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 60)) != 0 {
 			if retryCount != 0 {
 				if retryCount > 100 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5087, libc.VaList(bp+24, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5106, libc.VaList(bp+24, zSuper))
 					Xsqlite3OsDelete(tls, pVfs, zSuper, 0)
 					break
 				} else if retryCount == 1 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5101, libc.VaList(bp+32, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5120, libc.VaList(bp+32, zSuper))
 				}
 			}
 			retryCount++
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
-			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5116,
+			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5135,
 				libc.VaList(bp+40, *(*U32)(unsafe.Pointer(bp + 56))>>8&U32(0xffffff), *(*U32)(unsafe.Pointer(bp + 56))&U32(0xff)))
 
 			rc = Xsqlite3OsAccess(tls, pVfs, zSuper, SQLITE_ACCESS_EXISTS, bp+60)
@@ -40761,7 +40783,7 @@ func Xsqlite3VdbeCheckFk(tls *libc.TLS, p uintptr, deferred int32) int32 {
 		!(deferred != 0) && (*Vdbe)(unsafe.Pointer(p)).FnFkConstraint > int64(0) {
 		(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_CONSTRAINT | int32(3)<<8
 		(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
-		Xsqlite3VdbeError(tls, p, ts+5129, 0)
+		Xsqlite3VdbeError(tls, p, ts+5148, 0)
 		if int32((*Vdbe)(unsafe.Pointer(p)).FprepFlags)&SQLITE_PREPARE_SAVESQL == 0 {
 			return SQLITE_ERROR
 		}
@@ -41093,7 +41115,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 86058)
+		return Xsqlite3CorruptError(tls, 86062)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -41644,7 +41666,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86989))
 		return 0
 	}
 
@@ -41709,7 +41731,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, 87062))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87066))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -41743,7 +41765,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, 87092))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87096))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -41793,7 +41815,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, 87136))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87140))
 			return 0
 		}
 	}
@@ -41939,7 +41961,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87303))
 	return 0
 __7:
 	;
@@ -42110,7 +42132,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87457)
+	return Xsqlite3CorruptError(tls, 87461)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42136,7 +42158,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, 87490)
+		return Xsqlite3CorruptError(tls, 87494)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -42247,13 +42269,13 @@ func Xsqlite3NotPureFunc(tls *libc.TLS, pCtx uintptr) int32 {
 		var zContext uintptr
 		var zMsg uintptr
 		if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_IsCheck != 0 {
-			zContext = ts + 5159
-		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5178
-		} else {
+		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5197
+		} else {
+			zContext = ts + 5216
 		}
-		zMsg = Xsqlite3_mprintf(tls, ts+5206,
+		zMsg = Xsqlite3_mprintf(tls, ts+5225,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx)).FpFunc)).FzName, zContext))
 		Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 		Xsqlite3_free(tls, zMsg)
@@ -42358,7 +42380,7 @@ func Xsqlite3_expired(tls *libc.TLS, pStmt uintptr) int32 {
 
 func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 	if (*Vdbe)(unsafe.Pointer(p)).Fdb == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5242, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5261, 0)
 		return 1
 	} else {
 		return 0
@@ -42368,7 +42390,7 @@ func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 
 func vdbeSafetyNotNull(tls *libc.TLS, p uintptr) int32 {
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5287, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5306, 0)
 		return 1
 	} else {
 		return vdbeSafety(tls, p)
@@ -42410,7 +42432,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, 87854)
+			return Xsqlite3MisuseError(tls, 87858)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -42833,7 +42855,7 @@ func Xsqlite3_result_error_code(tls *libc.TLS, pCtx uintptr, errCode int32) {
 // Force an SQLITE_TOOBIG error.
 func Xsqlite3_result_error_toobig(tls *libc.TLS, pCtx uintptr) {
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FisError = SQLITE_TOOBIG
-	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5327, int64(-1),
+	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5346, int64(-1),
 		uint8(SQLITE_UTF8), uintptr(0))
 }
 
@@ -43025,7 +43047,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88544)
+		return Xsqlite3MisuseError(tls, 88548)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -43545,15 +43567,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 89208)
+		return Xsqlite3MisuseError(tls, 89212)
 	}
 	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+5350, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 89216)
+			ts+5369, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89220)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -43958,7 +43980,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, 89707)
+	rc = Xsqlite3MisuseError(tls, 89711)
 	goto preupdate_old_out
 __1:
 	;
@@ -44102,7 +44124,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, 89809)
+	rc = Xsqlite3MisuseError(tls, 89813)
 	goto preupdate_new_out
 __1:
 	;
@@ -44274,7 +44296,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+5390, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5409, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -44310,11 +44332,11 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 
 			pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr(*(*int32)(unsafe.Pointer(bp + 84))-1)*56
 			if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Null != 0 {
-				Xsqlite3_str_append(tls, bp+48, ts+1548, 4)
+				Xsqlite3_str_append(tls, bp+48, ts+1567, 4)
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+1327, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+1346, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+4918, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+4937, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Str != 0 {
 				var nOut int32
 				var enc U8 = (*Sqlite3)(unsafe.Pointer(db)).Fenc
@@ -44329,21 +44351,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+5394, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5413, 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+5401, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5420, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5414, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5433, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					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_appendf(tls, bp+48, ts+5436, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5422, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5441, 1)
 			}
 		}
 	}
@@ -44546,10 +44568,6 @@ func filterHash(tls *libc.TLS, aMem uintptr, pOp uintptr) U64 {
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Real != 0 {
 			h = h + U64(Xsqlite3VdbeIntValue(tls, p))
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&(MEM_Str|MEM_Blob) != 0 {
-			h = h + U64((*Mem)(unsafe.Pointer(p)).Fn)
-			if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Zero != 0 {
-				h = h + U64(*(*int32)(unsafe.Pointer(p)))
-			}
 		}
 	}
 	return h
@@ -44560,11 +44578,11 @@ func vdbeMemTypeName(tls *libc.TLS, pMem uintptr) uintptr {
 }
 
 var azTypes = [5]uintptr{
-	ts + 1108,
-	ts + 1120,
-	ts + 1125,
-	ts + 1103,
-	ts + 1548,
+	ts + 1127,
+	ts + 1139,
+	ts + 1144,
+	ts + 1122,
+	ts + 1567,
 }
 
 // Execute as much of a VDBE program as we can.
@@ -45607,20 +45625,20 @@ __202:
 		goto __205
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5424, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	Xsqlite3VdbeError(tls, p, ts+5443, 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))))
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5464, 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))))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	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))
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5471, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 __204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
@@ -47198,7 +47216,7 @@ op_column_corrupt:
 	goto __9
 	goto __425
 __424:
-	rc = Xsqlite3CorruptError(tls, 93317)
+	rc = Xsqlite3CorruptError(tls, 93320)
 	goto abort_due_to_error
 __425:
 	;
@@ -47326,7 +47344,7 @@ __428:
 	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5476,
+	Xsqlite3VdbeError(tls, p, ts+5495,
 		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
@@ -47758,7 +47776,7 @@ __78:
 		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5517, 0)
+	Xsqlite3VdbeError(tls, p, ts+5536, 0)
 	rc = SQLITE_BUSY
 	goto __523
 __522:
@@ -47818,7 +47836,7 @@ __530:
 	if !!(pSavepoint != 0) {
 		goto __531
 	}
-	Xsqlite3VdbeError(tls, p, ts+5568, libc.VaList(bp+88, zName))
+	Xsqlite3VdbeError(tls, p, ts+5587, libc.VaList(bp+88, zName))
 	rc = SQLITE_ERROR
 	goto __532
 __531:
@@ -47827,7 +47845,7 @@ __531:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5590, 0)
+		ts+5609, 0)
 	rc = SQLITE_BUSY
 	goto __534
 __533:
@@ -48013,7 +48031,7 @@ __564:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5644, 0)
+		ts+5663, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
 	goto __567
@@ -48056,13 +48074,13 @@ __562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5699
+				return ts + 5718
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5747
+					return ts + 5766
 				}
-				return ts + 5790
+				return ts + 5809
 			}()
 		}(), 0)
 
@@ -48145,7 +48163,7 @@ __576:
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5831)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5850)
 
 	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 __583
@@ -48349,7 +48367,7 @@ __88:
 	}
 
 	(*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
+	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1566
 __602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -48958,7 +48976,7 @@ notExistsWithKey:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
 		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95560)
+	rc = Xsqlite3CorruptError(tls, 95563)
 	goto __683
 __682:
 	goto jump_to_p2
@@ -49736,7 +49754,7 @@ __767:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
 		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5859)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96638, ts+5878)
 	goto abort_due_to_error
 __770:
 	;
@@ -49846,7 +49864,7 @@ __780:
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
 		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96840)
+	rc = Xsqlite3CorruptError(tls, 96843)
 	goto abort_due_to_error
 __781:
 	;
@@ -50007,14 +50025,14 @@ __141:
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	goto __799
 __798:
-	zSchema = ts + 5876
+	zSchema = ts + 5895
 	(*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+5890,
+		ts+5909,
 		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 __800
@@ -50040,7 +50058,7 @@ __802:
 		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 97092)
+	rc = Xsqlite3CorruptError(tls, 97095)
 __803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
@@ -50230,7 +50248,7 @@ __820:
 		goto __825
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5933, 0)
+	Xsqlite3VdbeError(tls, p, ts+5952, 0)
 	goto abort_due_to_error
 __825:
 	;
@@ -50542,7 +50560,7 @@ __860:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
 		goto __862
 	}
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
 __862:
 	;
@@ -50592,7 +50610,7 @@ __867:
 	if !(rc != 0) {
 		goto __868
 	}
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
 __868:
 	;
@@ -50674,12 +50692,12 @@ __876:
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5970,
+		ts+5989,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6022
+				return ts + 6041
 			}
-			return ts + 6027
+			return ts + 6046
 		}()))
 	goto abort_due_to_error
 	goto __879
@@ -50821,7 +50839,7 @@ __171:
 		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6034, libc.VaList(bp+144, z1))
+	Xsqlite3VdbeError(tls, p, ts+6053, libc.VaList(bp+144, z1))
 __894:
 	;
 	goto abort_due_to_error
@@ -50939,7 +50957,7 @@ __904:
 	(*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+6063, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6082, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
 	goto __9
 
 __177:
@@ -51028,7 +51046,7 @@ __912:
 	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)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
 __913:
 	;
@@ -51258,7 +51276,7 @@ __935:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
 		goto __940
 	}
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
 __940:
 	;
@@ -51334,7 +51352,7 @@ __945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
 		goto __947
 	}
-	z3 = Xsqlite3MPrintf(tls, db, ts+6073, libc.VaList(bp+168, zTrace))
+	z3 = Xsqlite3MPrintf(tls, db, ts+6092, 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)
@@ -51407,7 +51425,7 @@ __955:
 	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __957
 	}
-	rc = Xsqlite3CorruptError(tls, 99031)
+	rc = Xsqlite3CorruptError(tls, 99034)
 __957:
 	;
 __956:
@@ -51415,13 +51433,13 @@ __956:
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
 		goto __958
 	}
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
+	Xsqlite3VdbeError(tls, p, ts+3675, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
 __958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
 
-	Xsqlite3_log(tls, rc, ts+6079,
+	Xsqlite3_log(tls, rc, ts+6098,
 		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 __959
@@ -51477,13 +51495,13 @@ __966:
 	return rc
 
 too_big:
-	Xsqlite3VdbeError(tls, p, ts+5327, 0)
+	Xsqlite3VdbeError(tls, p, ts+5346, 0)
 	rc = SQLITE_TOOBIG
 	goto abort_due_to_error
 
 no_mem:
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3VdbeError(tls, p, ts+1483, 0)
+	Xsqlite3VdbeError(tls, p, ts+1502, 0)
 	rc = SQLITE_NOMEM
 	goto abort_due_to_error
 
@@ -51494,8 +51512,8 @@ abort_due_to_interrupt:
 	return int32(0)
 }
 
-var azType = [4]uintptr{ts + 6111, ts + 6120, ts + 6127,
-	ts + 6133}
+var azType = [4]uintptr{ts + 6130, ts + 6139, ts + 6146,
+	ts + 6152}
 var and_logic = [9]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(1), uint8(2), uint8(0), uint8(2), uint8(2)}
 var or_logic = [9]uint8{uint8(0), uint8(1), uint8(2), uint8(1), uint8(1), uint8(1), uint8(2), uint8(1), uint8(2)}
 var aMask = [12]uint8{
@@ -51550,16 +51568,16 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		}
 
 		if type1 < U32(12) {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6145,
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6164,
 				libc.VaList(bp, func() uintptr {
 					if type1 == U32(0) {
-						return ts + 6174
+						return ts + 6193
 					}
 					return func() uintptr {
 						if type1 == U32(7) {
-							return ts + 6179
+							return ts + 6198
 						}
-						return ts + 6184
+						return ts + 6203
 					}()
 				}()))
 			rc = SQLITE_ERROR
@@ -51579,10 +51597,10 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		rc = Xsqlite3_finalize(tls, (*Incrblob)(unsafe.Pointer(p)).FpStmt)
 		(*Incrblob)(unsafe.Pointer(p)).FpStmt = uintptr(0)
 		if rc == SQLITE_OK {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6192, libc.VaList(bp+8, iRow))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6211, libc.VaList(bp+8, iRow))
 			rc = SQLITE_ERROR
 		} else {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3656, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3675, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
 		}
 	}
 
@@ -51642,21 +51660,21 @@ __3:
 		goto __4
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6212, libc.VaList(bp, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6231, libc.VaList(bp, zTable))
 __4:
 	;
 	if !(pTab != 0 && !((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0))) {
 		goto __5
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6242, libc.VaList(bp+8, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6261, libc.VaList(bp+8, zTable))
 __5:
 	;
 	if !(pTab != 0 && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __6
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6278, libc.VaList(bp+16, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6297, libc.VaList(bp+16, zTable))
 __6:
 	;
 	if !!(pTab != 0) {
@@ -51700,7 +51718,7 @@ __11:
 		goto __13
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6299, libc.VaList(bp+24, zColumn))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6318, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51727,7 +51745,7 @@ __19:
 	if !((*sColMap)(unsafe.Pointer(pFKey+64+uintptr(j)*16)).FiFrom == iCol) {
 		goto __22
 	}
-	zFault = ts + 6320
+	zFault = ts + 6339
 __22:
 	;
 	goto __20
@@ -51760,7 +51778,7 @@ __26:
 	if !(int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == iCol || int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == -2) {
 		goto __29
 	}
-	zFault = ts + 6332
+	zFault = ts + 6351
 __29:
 	;
 	goto __27
@@ -51781,7 +51799,7 @@ __25:
 		goto __30
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6340, libc.VaList(bp+32, zFault))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6359, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51879,7 +51897,7 @@ __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
-			return ts + 3656
+			return ts + 3675
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
@@ -51927,7 +51945,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99516)
+		return Xsqlite3MisuseError(tls, 99519)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52010,7 +52028,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99616)
+		return Xsqlite3MisuseError(tls, 99619)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52023,7 +52041,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 				if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-					return ts + 3656
+					return ts + 3675
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
@@ -54552,25 +54570,25 @@ 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 {
+	if Xsqlite3_strnicmp(tls, zTab, ts+6393, 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 {
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6401+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
 			return 1
 		}
 		if pSchema == uintptr(0) {
 			return 0
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5876+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5895+7) == 0 {
 			return 1
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6439+7) == 0 {
 			return 1
 		}
 	} else {
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6439+7) == 0 {
 			return 1
 		}
 	}
@@ -54650,7 +54668,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6434, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6453, zDb) == 0) {
 		goto __8
 	}
 
@@ -54771,7 +54789,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6439) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6458) != 0) {
 		goto __33
 	}
 	goto __14
@@ -54945,14 +54963,14 @@ __60:
 	;
 	goto __59
 __58:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6441, zTab) == 0) {
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6460, zTab) == 0) {
 		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
 	goto __62
 __61:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6445, zTab) == 0) {
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6464, zTab) == 0) {
 		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
@@ -54969,7 +54987,7 @@ __57:
 		goto __64
 	}
 	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6449, zTab) == 0) {
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6468, zTab) == 0) {
 		goto __65
 	}
 	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
@@ -55128,7 +55146,7 @@ __86:
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
 		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6458, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6477, libc.VaList(bp, zAs))
 	return WRC_Abort
 __90:
 	;
@@ -55136,14 +55154,14 @@ __90:
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
 		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6489, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6508, libc.VaList(bp+8, zAs))
 	return WRC_Abort
 __91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
 		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 	return WRC_Abort
 __92:
 	;
@@ -55195,7 +55213,7 @@ __11:
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6544, libc.VaList(bp+16, zCol))
+		ts+6563, 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
@@ -55232,7 +55250,7 @@ __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 + 6579
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6598
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
@@ -55245,23 +55263,23 @@ __101:
 __99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6588
+		zErr = ts + 6607
 	} else {
-		zErr = ts + 6603
+		zErr = ts + 6622
 	}
 	if !(zDb != 0) {
 		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6625, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6644, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
 	goto __105
 __104:
 	if !(zTab != 0) {
 		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6638, libc.VaList(bp+56, zErr, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6657, libc.VaList(bp+56, zErr, zTab, zCol))
 	goto __107
 __106:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp+80, zErr, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6667, libc.VaList(bp+80, zErr, zCol))
 __107:
 	;
 __105:
@@ -55364,15 +55382,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 + 6655
+	var zIn uintptr = ts + 6674
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6683
+		zIn = ts + 6702
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6701
+		zIn = ts + 6720
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6719
+		zIn = ts + 6738
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6737, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6756, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -55450,14 +55468,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 + 6757
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
-				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6762
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
-				}
-				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
+				*(*int32)(unsafe.Pointer(pExpr + 8)) = libc.Bool32(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL)
+				*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IntValue)
+				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_INTEGER)
+
 				i = 0
 				p = pNC
 			__4:
@@ -55501,7 +55515,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+6768, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6776, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -55565,7 +55579,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+6785, libc.VaList(bp, pExpr))
+								ts+6793, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -55581,7 +55595,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+6849,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6857,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -55595,7 +55609,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+6885, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6893, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -55618,30 +55632,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+6913, libc.VaList(bp+16, pExpr))
+						ts+6921, 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 + 6956
+						zType = ts + 6964
 					} else {
-						zType = ts + 6963
+						zType = ts + 6971
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6973, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6981, 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+7001, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7009, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7023,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7031,
 						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+7067,
+						ts+7075,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -55713,15 +55727,15 @@ 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+7115, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7123, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
 
 				if nRef != (*NameContext)(unsafe.Pointer(pNC)).FnRef {
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_VarSelect)
-					*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_VarSelect
 				}
+				*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_Subquery
 			}
 			break
 
@@ -55729,7 +55743,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+7126, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7134, pExpr, pExpr)
 			}
 
 			break
@@ -55785,7 +55799,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+6526, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -55860,7 +55874,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7137, libc.VaList(bp, i, zType, mx))
+		ts+7145, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -55880,7 +55894,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+7193, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7201, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -55915,7 +55929,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+7227, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7235, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -55972,7 +55986,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+7233, libc.VaList(bp, i+1))
+				ts+7241, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -56000,7 +56014,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+7294, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7302, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -56214,7 +56228,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+7325, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7333, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -56254,7 +56268,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+7227) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7235) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -56265,7 +56279,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7364) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7372) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -56277,7 +56291,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+7370, 0)
+						ts+7378, 0)
 					return WRC_Abort
 				}
 
@@ -57066,7 +57080,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 		return
 	}
 
@@ -57141,7 +57155,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+7429, libc.VaList(bp, mxHeight))
+			ts+7437, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -57390,12 +57404,12 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7477,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7485,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7521
+						return ts + 7529
 					}
-					return ts + 1547
+					return ts + 1566
 				}(), nElem))
 			break
 		}
@@ -57434,7 +57448,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+7523)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7531)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -57460,7 +57474,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+7525, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7533, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -57488,7 +57502,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+7559, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7567, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -57535,7 +57549,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+7579,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7587,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -57560,7 +57574,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+7622, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7630, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -58135,7 +58149,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+7645,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7653,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -58258,7 +58272,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+7675, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7683, libc.VaList(bp, zObject))
 	}
 }
 
@@ -58314,10 +58328,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+6757) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7706) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6762) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7711) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -58748,13 +58762,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+7698) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7717) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7706) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7725) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7712) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7731) == 0 {
 		return 1
 	}
 	return 0
@@ -58958,7 +58972,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+7716, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7735, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -59036,7 +59050,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+7763, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7782, 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)
 
@@ -59130,7 +59144,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 + 7794
+		var zFmt uintptr = ts + 7813
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -59148,7 +59162,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+6526, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 	}
 }
 
@@ -59189,7 +59203,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+7838, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7857, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -59219,11 +59233,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+7861, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7880, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
-				return ts + 1547
+				return ts + 1566
 			}
-			return ts + 7880
+			return ts + 7899
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -59350,7 +59364,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+7892, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7911, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -59365,11 +59379,11 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7910, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7929, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
-			return ts + 1547
+			return ts + 1566
 		}
-		return ts + 7880
+		return ts + 7899
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
@@ -59392,7 +59406,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+7523)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7531)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -59401,7 +59415,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+7931)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7950)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -59787,13 +59801,13 @@ 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+7933, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7936,
+			if Xsqlite3_strnicmp(tls, z, ts+7952, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7955,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
-							return ts + 4925
+							return ts + 4944
 						}
-						return ts + 1547
+						return ts + 1566
 					}(), pExpr))
 			} else {
 				codeReal(tls, v, z, negFlag, iMem)
@@ -59830,6 +59844,7 @@ func Xsqlite3ExprCodeLoadIndexColumn(tls *libc.TLS, pParse uintptr, pIdx uintptr
 func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr, pCol uintptr, regOut int32) {
 	var iAddr int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
+	var nErr int32 = (*Parse)(unsafe.Pointer(pParse)).FnErr
 
 	if (*Parse)(unsafe.Pointer(pParse)).FiSelfTab > 0 {
 		iAddr = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Parse)(unsafe.Pointer(pParse)).FiSelfTab-1, 0, regOut)
@@ -59843,6 +59858,9 @@ func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr
 	if iAddr != 0 {
 		Xsqlite3VdbeJumpHere(tls, v, iAddr)
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr > nErr {
+		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FerrByteOffset = -1
+	}
 }
 
 // Generate code to extract the value of the iCol-th column of a table.
@@ -59864,7 +59882,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+7963,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7982,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -60037,8 +60055,8 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 7993, ts + 7998, ts + 8003, ts + 6184,
-				ts + 6179, ts + 8011}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8012, ts + 8017, ts + 8022, ts + 6203,
+				ts + 6198, ts + 8030}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
@@ -60046,7 +60064,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 8019
+						return ts + 8038
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -60061,6 +60079,7 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 	var p uintptr
 	var v uintptr
 	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+		var exprAff U8
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -60074,6 +60093,14 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 		if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr, iDataCur) != 0 {
 			continue
 		}
+
+		exprAff = U8(Xsqlite3ExprAffinity(tls, pExpr))
+		if int32(exprAff) <= SQLITE_AFF_BLOB && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_BLOB ||
+			int32(exprAff) == SQLITE_AFF_TEXT && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_TEXT ||
+			int32(exprAff) >= SQLITE_AFF_NUMERIC && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_NUMERIC {
+			continue
+		}
+
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 
 		if (*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow != 0 {
@@ -60413,7 +60440,7 @@ __73:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
 		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7963,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7982,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
 __76:
@@ -60646,7 +60673,7 @@ __43:
 		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+8024, libc.VaList(bp+8, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8043, libc.VaList(bp+8, pExpr))
 	goto __91
 __90:
 	return func() int32 {
@@ -60687,7 +60714,7 @@ __93:
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
 		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8051, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8070, libc.VaList(bp+16, pExpr))
 	goto __5
 __94:
 	;
@@ -60847,7 +60874,7 @@ __121:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
 		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7645,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7653,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
 __122:
 	;
@@ -60869,11 +60896,10 @@ __49:
 	return target
 
 __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) {
+	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) {
 		goto __123
 	}
+
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
 		goto __125
@@ -60913,7 +60939,7 @@ __126:
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6545, 0)
 	goto __5
 
 __55:
@@ -60944,13 +60970,19 @@ __129:
 	;
 __127:
 	;
-	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
+	addrINR = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable, 0, target)
 
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = U8(0)
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = okConstFactor
+	if !(inReg != target) {
+		goto __130
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
+	inReg = target
+__130:
+	;
 	Xsqlite3VdbeJumpHere(tls, v, addrINR)
-	Xsqlite3VdbeChangeP3(tls, v, addrINR, inReg)
 	goto __5
 
 __56:
@@ -60963,15 +60995,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __130
+		goto __131
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __131
+		goto __132
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__131:
+__132:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -60981,22 +61013,22 @@ __131:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__130:
+__131:
 	;
 	i1 = 0
-__132:
+__133:
 	if !(i1 < nExpr-1) {
-		goto __134
+		goto __135
 	}
 	if !(pX != 0) {
-		goto __135
+		goto __136
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __136
-__135:
-	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+	goto __137
 __136:
+	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+__137:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -61005,21 +61037,21 @@ __136:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __133
-__133:
-	i1 = i1 + 2
-	goto __132
 	goto __134
 __134:
+	i1 = i1 + 2
+	goto __133
+	goto __135
+__135:
 	;
 	if !(nExpr&1 != 0) {
-		goto __137
+		goto __138
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __138
-__137:
-	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+	goto __139
 __138:
+	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+__139:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -61029,27 +61061,27 @@ __138:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __139
-	}
-	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8075, 0)
-	return 0
-__139:
-	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __140
 	}
-	Xsqlite3MayAbort(tls, pParse)
+	Xsqlite3ErrorMsg(tls, pParse,
+		ts+8094, 0)
+	return 0
 __140:
 	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __141
 	}
+	Xsqlite3MayAbort(tls, pParse)
+__141:
+	;
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+		goto __142
+	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __142
-__141:
+	goto __143
+__142:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -61058,7 +61090,7 @@ __141:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__142:
+__143:
 	;
 	goto __5
 
@@ -61069,7 +61101,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8125))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8144))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -62861,11 +62893,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+6374, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6393, 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+8135, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8154, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -62877,13 +62909,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8163,
+		ts+8182,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8338,
+			ts+8357,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -62893,10 +62925,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8512, libc.VaList(bp, zDb, zDb))
+		ts+8531, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8659, 0)
+			ts+8678, 0)
 	}
 }
 
@@ -62960,7 +62992,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8810, libc.VaList(bp, zName))
+		ts+8829, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -62970,7 +63002,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8869, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8888, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -62979,7 +63011,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8875, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8894, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -63020,19 +63052,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8902, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8921, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9086,
+		ts+9105,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9391, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9410, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9407,
+		ts+9426,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -63040,7 +63072,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9465, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9484, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -63052,7 +63084,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9730, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9749, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63064,7 +63096,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9743,
+		ts+9762,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -63110,12 +63142,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9781, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9800, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9813, 0)
+			ts+9832, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -63125,11 +63157,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+9840)
+				ts+9859)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9899)
+				ts+9918)
 		}
 
 		if pDflt != 0 {
@@ -63142,12 +63174,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9952)
+					ts+9971)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9998)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10017)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -63158,7 +63190,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10025,
+			ts+10044,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -63180,7 +63212,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+10171,
+				ts+10190,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -63228,14 +63260,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10401, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10420, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10435, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10454, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -63263,7 +63295,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+10465, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10484, 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
 	}
@@ -63303,18 +63335,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 + 10484
+		zType = ts + 10503
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10489
+		zType = ts + 10508
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10503,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10522,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10521
+					return ts + 10540
 				}
-				return ts + 10538
+				return ts + 10557
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -63398,11 +63430,11 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10556, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10575, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1547, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1566, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iSchema == 1))
 
 	Xsqlite3MayAbort(tls, pParse)
@@ -63415,17 +63447,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10577,
+		ts+10596,
 		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+10759,
+		ts+10778,
 		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+9730, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9749, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63683,12 +63715,12 @@ 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+10890,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10909,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10913
+				return ts + 10932
 			}
-			return ts + 1547
+			return ts + 1566
 		}(), zWhen,
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg))
 	Xsqlite3_result_error(tls, pCtx, zErr, -1)
@@ -63728,8 +63760,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+10915, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 113494)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10934, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113516)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -63746,7 +63778,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, 113505)
+		rc = Xsqlite3CorruptError(tls, 113527)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -63768,7 +63800,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+10923, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10942, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -63808,12 +63840,12 @@ 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+10929, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10948, 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 + 10913
+							return ts + 10932
 						}
-						return ts + 1547
+						return ts + 1566
 					}()))
 				zReplace = zBuf2
 				nReplace = U32(Xsqlite3Strlen30(tls, zReplace))
@@ -64299,7 +64331,7 @@ __45:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FzErrMsg != 0) {
 		goto __47
 	}
-	renameColumnParseError(tls, context, ts+1547, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
+	renameColumnParseError(tls, context, ts+1566, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
 	goto __48
 __47:
 	Xsqlite3_result_error_code(tls, context, rc)
@@ -64464,7 +64496,7 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 			if rc == SQLITE_ERROR && Xsqlite3WritableSchema(tls, db) != 0 {
 				Xsqlite3_result_value(tls, context, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 			} else if (*Parse)(unsafe.Pointer(bp+80)).FzErrMsg != 0 {
-				renameColumnParseError(tls, context, ts+1547, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
+				renameColumnParseError(tls, context, ts+1566, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
 			} else {
 				Xsqlite3_result_error_code(tls, context, rc)
 			}
@@ -64667,7 +64699,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 114441)
+	rc = Xsqlite3CorruptError(tls, 114463)
 	goto drop_column_done
 __2:
 	;
@@ -64691,7 +64723,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10934, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10953, 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)
 
@@ -64772,19 +64804,19 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10556, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10575, 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+10941,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10960,
 		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 + 10969
+				return ts + 10988
 			}
-			return ts + 6120
+			return ts + 6139
 		}(),
 			zCol))
 	goto exit_drop_column
@@ -64793,7 +64825,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10981, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11000, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -64807,13 +64839,13 @@ __8:
 	goto exit_drop_column
 __9:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1547, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1566, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11029, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11048, 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+11150, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11169, 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
@@ -64931,11 +64963,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 + 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}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11187},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11208},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11228},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11247},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11266}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -64969,7 +65001,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+11270, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11289, 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)
 			}
@@ -64978,10 +65010,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+11293,
+					ts+11312,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11323, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11342, 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)
 			}
@@ -64999,9 +65031,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11341, FzCols: ts + 11354},
-	{FzName: ts + 11367, FzCols: ts + 11380},
-	{FzName: ts + 11408},
+	{FzName: ts + 11360, FzCols: ts + 11373},
+	{FzName: ts + 11386, FzCols: ts + 11399},
+	{FzName: ts + 11427},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65191,7 +65223,7 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11421}
+	FzName:     ts + 11440}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
@@ -65442,7 +65474,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11431}
+	FzName:     ts + 11450}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -65456,7 +65488,7 @@ 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+11441,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11460,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
 					return (*StatAccum)(unsafe.Pointer(p)).FnEst
@@ -65469,7 +65501,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11446, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11465, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -65511,7 +65543,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+11452, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11471, 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--
@@ -65525,7 +65557,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11458}
+	FzName:     ts + 11477}
 
 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)
@@ -65569,7 +65601,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+11467, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11486, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -65586,7 +65618,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+11341, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11360, 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)
@@ -65742,7 +65774,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+11477, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11496, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -65799,7 +65831,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+11477, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11496, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -65846,9 +65878,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+11481)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11500)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11485)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11504)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -65931,7 +65963,7 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 	var v TRowcnt
 
 	if z == uintptr(0) {
-		z = ts + 1547
+		z = ts + 1566
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
 		v = uint64(0)
@@ -65953,15 +65985,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+11489, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11508, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11500, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11519, 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+11510, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11529, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -66237,11 +66269,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+11367, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11386, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11522,
-			ts+11576,
+			ts+11541,
+			ts+11595,
 			zDb)
 	}
 	return rc
@@ -66288,10 +66320,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+11341, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11360, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11628, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11647, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -66349,7 +66381,7 @@ 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+6434, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6453, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -66382,13 +66414,13 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zFile == uintptr(0)) {
 		goto __1
 	}
-	zFile = ts + 1547
+	zFile = ts + 1566
 __1:
 	;
 	if !(zName == uintptr(0)) {
 		goto __2
 	}
-	zName = ts + 1547
+	zName = ts + 1566
 __2:
 	;
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2)) != 0) {
@@ -66396,14 +66428,14 @@ __2:
 	}
 
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3828)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3847)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11669, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11688, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
 	if !(rc == SQLITE_OK) {
 		goto __6
 	}
@@ -66440,7 +66472,7 @@ __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11672,
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11691,
 		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
@@ -66454,7 +66486,7 @@ __12:
 	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __15
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11709, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11728, libc.VaList(bp+8, zName))
 	goto attach_error
 __15:
 	;
@@ -66518,7 +66550,7 @@ __4:
 		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11739, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11758, 0)
 	goto __23
 __22:
 	if !(rc == SQLITE_OK) {
@@ -66535,7 +66567,7 @@ __25:
 		goto __27
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
-		ts+11768, 0)
+		ts+11787, 0)
 	rc = SQLITE_ERROR
 __27:
 	;
@@ -66601,13 +66633,13 @@ __33:
 	}
 	Xsqlite3OomFault(tls, db)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1483, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1502, 0)
 	goto __35
 __34:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
 		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11836, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11855, libc.VaList(bp+16, zFile))
 __36:
 	;
 __35:
@@ -66654,7 +66686,7 @@ func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zName == uintptr(0)) {
 		goto __1
 	}
-	zName = ts + 1547
+	zName = ts + 1566
 __1:
 	;
 	i = 0
@@ -66685,14 +66717,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11864, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11883, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11885, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11904, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -66700,7 +66732,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11911, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11930, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -66817,7 +66849,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11933}
+	FzName:     ts + 11952}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -66830,7 +66862,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11947}
+	FzName:     ts + 11966}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -66844,7 +66876,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+11961, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11980, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -66876,7 +66908,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+11985,
+						ts+12004,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -67051,7 +67083,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+12031, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12050, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -67077,11 +67109,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+12054, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12073, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12060, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12079, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12066, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12085, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -67128,7 +67160,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 + 7706
+		zCol = ts + 7725
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -67152,7 +67184,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+12093, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12112, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -67423,25 +67455,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6434) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6453) == 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+6374, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6393, 7) == 0 {
 			if i == 1 {
-				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 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6439+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5895+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+6382)
+						ts+6401)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6439+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+5876)
+						ts+5895)
 				}
 			}
 		}
@@ -67462,12 +67494,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		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 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6393, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6439+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5895)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+6382)
+					ts+6401)
 			}
 		}
 	}
@@ -67498,7 +67530,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+12108, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12127, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -67516,14 +67548,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 + 12116
+			zMsg = ts + 12135
 		} else {
-			zMsg = ts + 12129
+			zMsg = ts + 12148
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6638, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6657, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6667, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -67553,12 +67585,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+6374, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5876+7) == 0 {
-			return ts + 6420
+	if Xsqlite3_strnicmp(tls, zName, ts+6393, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5895+7) == 0 {
+			return ts + 6439
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6382+7) == 0 {
-			return ts + 6401
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6401+7) == 0 {
+			return ts + 6420
 		}
 	}
 	return zName
@@ -67916,7 +67948,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+5876)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5895)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -67942,7 +67974,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6434, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6453, zName) {
 				goto __3
 			}
 
@@ -67995,13 +68027,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+12143, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12162, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12160, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12179, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -68039,13 +68071,13 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 		if Xsqlite3_stricmp(tls, zType, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit))) != 0 ||
 			Xsqlite3_stricmp(tls, zName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 1*8))) != 0 ||
 			Xsqlite3_stricmp(tls, zTblName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 2*8))) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1547, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1566, 0)
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6374, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6393, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12180,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12199,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -68205,9 +68237,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 + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -68223,7 +68255,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12222, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12241, 0)
 	return
 __4:
 	;
@@ -68251,9 +68283,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10484
+			return ts + 10503
 		}
-		return ts + 8869
+		return ts + 8888
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -68269,9 +68301,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 + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -68302,12 +68334,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12263,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12282,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10484
+				return ts + 10503
 			}
-			return ts + 8869
+			return ts + 8888
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -68322,7 +68354,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12284, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12303, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -68409,7 +68441,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+12319, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12338, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -68433,7 +68465,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+12336, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12355, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -68453,7 +68485,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 + 12319
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12338
 	(*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)
@@ -68465,7 +68497,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+12319, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12338, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -68499,7 +68531,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+12370, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12389, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -68507,13 +68539,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+12393, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12412, 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+12400, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12419, 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--
@@ -68550,7 +68582,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+12410, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12429, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -68714,10 +68746,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+12436,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12455,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12481, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12500, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -68748,7 +68780,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+12522, 0)
+			ts+12541, 0)
 	}
 }
 
@@ -68793,7 +68825,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12574, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12593, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -68882,7 +68914,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12615, 0)
+		ts+12634, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -68977,7 +69009,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12671, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12690, 0)
 	goto generated_done
 __2:
 	;
@@ -68990,13 +69022,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12714, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12733, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12722, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12741, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -69030,13 +69062,19 @@ __10:
 
 	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
 __11:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_RAISE) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = (*Column)(unsafe.Pointer(pCol)).Faffinity
+__12:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12729,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12748,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -69157,13 +69195,13 @@ __3:
 	;
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
-		zSep = ts + 1547
-		zSep2 = ts + 12760
-		zEnd = ts + 4950
+		zSep = ts + 1566
+		zSep2 = ts + 12779
+		zEnd = ts + 4969
 	} else {
-		zSep = ts + 12762
-		zSep2 = ts + 12766
-		zEnd = ts + 12771
+		zSep = ts + 12781
+		zSep2 = ts + 12785
+		zEnd = ts + 12790
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -69171,7 +69209,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12774, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12793, 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('(')
@@ -69205,17 +69243,17 @@ __5:
 	goto __6
 __6:
 	;
-	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3656, libc.VaList(bp, zEnd))
+	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3675, libc.VaList(bp, zEnd))
 	return zStmt
 }
 
 var azType1 = [6]uintptr{
-	ts + 1547,
-	ts + 12788,
-	ts + 12794,
-	ts + 12799,
-	ts + 12804,
-	ts + 12794,
+	ts + 1566,
+	ts + 12807,
+	ts + 12813,
+	ts + 12818,
+	ts + 12823,
+	ts + 12813,
 }
 
 func resizeIndexObject(tls *libc.TLS, db uintptr, pIdx uintptr, N int32) int32 {
@@ -69605,7 +69643,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
 		if pSelect != 0 || !(int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM) && (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1547, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1566, 0)
 			return
 		}
 		(*Table)(unsafe.Pointer(p)).Ftnum = (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum
@@ -69622,10 +69660,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+12810,
-						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1547)))
+						ts+12829,
+						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1566)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12843,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12862,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -69644,11 +69682,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+12870, 0)
+				ts+12889, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12920, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12939, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -69682,7 +69720,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12952, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12971, 0)
 			return
 		}
 	}
@@ -69707,11 +69745,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 + 8869
-			zType2 = ts + 12996
+			zType = ts + 8888
+			zType2 = ts + 13015
 		} else {
-			zType = ts + 10484
-			zType2 = ts + 13002
+			zType = ts + 10503
+			zType2 = ts + 13021
 		}
 
 		if pSelect != 0 {
@@ -69782,11 +69820,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+13007, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13026, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13022,
+			ts+13041,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -69802,13 +69840,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+13120,
+					ts+13139,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13162, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13181, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -69823,7 +69861,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+9391) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9410) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -69853,7 +69891,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+13196, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13215, 0)
 	goto create_view_fail
 __1:
 	;
@@ -69869,7 +69907,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10484, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10503, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -69951,7 +69989,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13232, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13251, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -70076,13 +70114,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+13262, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13281, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13277,
+		ts+13296,
 		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)
 }
@@ -70123,10 +70161,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+13344, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13363, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11293,
+				ts+11312,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -70158,12 +70196,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+13358,
+			ts+13377,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13403,
+		ts+13422,
 		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)
@@ -70191,11 +70229,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+6374, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3279, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6393, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3298, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7126, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7134, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -70273,9 +70311,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -70334,21 +70372,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13470, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13489, 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+13498, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13517, 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+13532, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13551, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -70360,7 +70398,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11485, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11504, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -70424,7 +70462,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13564,
+		ts+13583,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -70436,7 +70474,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13627, 0)
+		ts+13646, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -70521,7 +70559,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13721,
+		ts+13740,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -70748,12 +70786,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+13767,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13786,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13795
+							return ts + 13814
 						}
-						return ts + 13801
+						return ts + 13820
 					}()))
 				return 1
 			}
@@ -70874,7 +70912,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13806, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13825, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -70893,7 +70931,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13812,
+		ts+13831,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -70919,26 +70957,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6393, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13862, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13881, 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+13890, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13909, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13915, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13934, 0)
 	goto exit_create_index
 __17:
 	;
@@ -70952,7 +70990,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13806, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13825, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -70967,7 +71005,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13949, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13968, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -70979,7 +71017,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13983, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14002, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -71008,7 +71046,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14007, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14026, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -71029,9 +71067,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -71070,7 +71108,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13806)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13825)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -71171,7 +71209,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14030, 0)
+		ts+14049, 0)
 	goto exit_create_index
 __56:
 	;
@@ -71388,7 +71426,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14091, libc.VaList(bp+48, 0))
+		ts+14110, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -71440,8 +71478,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14133, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14152, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121859)
 	goto exit_create_index
 __101:
 	;
@@ -71487,12 +71525,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14150,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14169,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
-				return ts + 1547
+				return ts + 1566
 			}
-			return ts + 14170
+			return ts + 14189
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -71500,7 +71538,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14178,
+		ts+14197,
 		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,
@@ -71514,7 +71552,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14237, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14256, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -71675,7 +71713,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14264, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14283, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -71690,7 +71728,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14282, libc.VaList(bp+8, 0))
+		ts+14301, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -71701,9 +71739,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 + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -71729,9 +71767,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14355,
+		ts+14374,
 		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+11481, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11500, (*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)
@@ -71866,7 +71904,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+14415,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14434,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -72074,12 +72112,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+14451,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14470,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14487
+				return ts + 14506
 			}
-			return ts + 14490
+			return ts + 14509
 		}()))
 	goto append_from_error
 __1:
@@ -72248,7 +72286,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14496, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14515, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -72284,9 +72322,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14502
+				return ts + 14521
 			}
-			return ts + 14511
+			return ts + 14530
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -72311,7 +72349,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14496, ts + 14518, ts + 14502}
+var az = [3]uintptr{ts + 14515, ts + 14537, ts + 14521}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -72326,7 +72364,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+14526, 0)
+				ts+14545, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -72463,17 +72501,17 @@ 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+14596, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14615, 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+14607, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14626, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
-			Xsqlite3_str_append(tls, bp+8, ts+1560, 1)
+			Xsqlite3_str_append(tls, bp+8, ts+1579, 1)
 			Xsqlite3_str_appendall(tls, bp+8, zCol)
 		}
 	}
@@ -72496,11 +72534,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+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12073, 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+14610, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14629, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -72630,7 +72668,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14619, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14638, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -72726,7 +72764,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+14665, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14684, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -72919,7 +72957,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14695, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14714, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -73199,7 +73237,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+14726,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14745,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -73231,11 +73269,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+14759, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14778, 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+14788, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14807, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -73486,7 +73524,7 @@ __20:
 	goto __16
 __15:
 	wcf = U16(WHERE_ONEPASS_DESIRED | WHERE_DUPLICATES_OK)
-	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_VarSelect != 0) {
+	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_Subquery != 0) {
 		goto __23
 	}
 	bComplex = 1
@@ -73739,7 +73777,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14826)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14845)
 __62:
 	;
 delete_from_cleanup:
@@ -73854,7 +73892,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+11341) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11360) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -74084,7 +74122,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 + 7998, ts + 7993, ts + 6174}
+var azType2 = [5]uintptr{ts + 6203, ts + 6198, ts + 8017, ts + 8012, ts + 6193}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -74143,7 +74181,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+14839, -1)
+					Xsqlite3_result_error(tls, context, ts+14858, -1)
 					return
 				}
 				iVal = -iVal
@@ -74447,7 +74485,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14856, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14875, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -74793,7 +74831,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+14861, -1)
+		Xsqlite3_result_error(tls, context, ts+14880, -1)
 		return
 	}
 	if argc == 3 {
@@ -74803,7 +74841,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+14894, -1)
+				ts+14913, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -74856,7 +74894,7 @@ func errlogFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	_ = argc
 	_ = context
-	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3656, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
+	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3675, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
 }
 
 func compileoptionusedFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
@@ -74896,13 +74934,13 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 
 			var zVal uintptr
 			r1 = Xsqlite3_value_double(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+4918, libc.VaList(bp, r1))
+			Xsqlite3_str_appendf(tls, pStr, ts+4937, libc.VaList(bp, r1))
 			zVal = Xsqlite3_str_value(tls, pStr)
 			if zVal != 0 {
 				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+14939, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14958, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -74910,7 +74948,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 		}
 	case SQLITE_INTEGER:
 		{
-			Xsqlite3_str_appendf(tls, pStr, ts+1327, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
+			Xsqlite3_str_appendf(tls, pStr, ts+1346, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
 			break
 
 		}
@@ -74939,13 +74977,13 @@ 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+14946, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14965, libc.VaList(bp+24, zArg))
 			break
 
 		}
 	default:
 		{
-			Xsqlite3_str_append(tls, pStr, ts+1548, 4)
+			Xsqlite3_str_append(tls, pStr, ts+1567, 4)
 			break
 
 		}
@@ -75086,7 +75124,7 @@ func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 	var ch U32
 	var c U8
 	var d U8
-	zPass = ts + 1547
+	zPass = ts + 1566
 	nPass = 0
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -75368,7 +75406,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10913}
+var azOne = [1]uintptr{ts + 10932}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -75380,7 +75418,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	zIn = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	if zIn == uintptr(0) {
-		zIn = ts + 1547
+		zIn = ts + 1566
 	}
 	for i = 0; *(*U8)(unsafe.Pointer(zIn + uintptr(i))) != 0 && !(int32(Xsqlite3CtypeMap[*(*U8)(unsafe.Pointer(zIn + uintptr(i)))])&0x02 != 0); i++ {
 	}
@@ -75404,7 +75442,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+14949, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14968, 4, uintptr(0))
 	}
 }
 
@@ -75429,7 +75467,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+12093, -1)
+		Xsqlite3_result_error(tls, context, ts+12112, -1)
 		return
 	}
 
@@ -75507,7 +75545,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+14839, -1)
+			Xsqlite3_result_error(tls, context, ts+14858, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -75769,7 +75807,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+14954, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14973, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -75789,14 +75827,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14960, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14979, 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+14960, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14979, 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+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)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14979, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14979, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -76037,109 +76075,109 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 }
 
 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 + 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(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(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 + 14984},
+	{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 + 15004},
+	{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 + 15017},
+	{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 + 15035},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15044},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15052},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15052},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15067},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15093},
+	{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 + 15118},
+	{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 + 15127},
+	{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 + 15138},
+	{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 + 15145},
+	{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 + 15159},
+	{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 + 15159},
+	{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 + 15165},
+	{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 + 15165},
+	{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 + 15171},
+	{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 + 15171},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15176},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15176},
+	{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 + 15176},
+	{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 + 15180},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15180},
+	{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 + 15180},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15184},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15191},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15199},
+	{FnArg: int8(2), 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 + 15212},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15219},
+	{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 + 15234},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15239},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15243},
+	{FnArg: int8(2), 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 + 15255},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15261},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15265},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15265},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15271},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15278},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15285},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15296},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15303},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15318},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15335},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15346},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15352},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15370},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15378},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15392},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15400},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15409},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15409},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{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 + 15426},
+	{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 + 15430},
+	{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 + 15436},
+	{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 + 15440},
+	{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 + 15440},
+	{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 + 15446},
+	{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 + 15446},
+	{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 + 15459},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14979},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14979},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6598},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6598},
 	{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 + 15516},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15469},
+	{FnArg: int8(1), 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 + 15483},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15489},
+	{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 + 15492},
+	{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 + 15496},
+	{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 + 15502},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15492},
+	{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 + 15511},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15515},
 	{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 + 15525},
+	{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 + 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 + 15549},
+	{FnArg: int8(2), 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 + 15546},
+	{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 + 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 + 15558},
+	{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 + 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 + 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}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15591},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15596},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15604},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15612},
+	{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_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6598},
+	{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 + 15620}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -76260,7 +76298,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+15605,
+				ts+15624,
 				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)
@@ -76920,8 +76958,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 + 6445, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6441, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6464, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6460, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -77000,7 +77038,7 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 			(*Token)(unsafe.Pointer(bp + 80)).Fz = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 			(*Token)(unsafe.Pointer(bp + 80)).Fn = uint32(Xsqlite3Strlen30(tls, (*Token)(unsafe.Pointer(bp+80)).Fz))
 
-			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5129)
+			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5148)
 			if pRaise != 0 {
 				(*Expr)(unsafe.Pointer(pRaise)).FaffExpr = int8(OE_Abort)
 			}
@@ -77421,7 +77459,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7963, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7982, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -77889,7 +77927,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15650,
+		ts+15669,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -77914,7 +77952,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15691,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15710,
 		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
@@ -78063,7 +78101,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15723,
+		ts+15742,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -78073,7 +78111,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15775, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15794, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -78125,7 +78163,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15800,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15819,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -78133,7 +78171,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15846, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15865, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -78545,7 +78583,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15867)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15886)
 __125:
 	;
 insert_cleanup:
@@ -78861,7 +78899,7 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 					fallthrough
 				case OE_Fail:
 					{
-						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12073, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 							(*Column)(unsafe.Pointer(pCol)).FzCnName))
 
 						Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
@@ -79952,13 +79990,13 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131895)
+	return Xsqlite3MisuseError(tls, 131931)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
 		goto __2
 	}
-	zSql = ts + 1547
+	zSql = ts + 1566
 __2:
 	;
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -80437,7 +80475,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12093, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12112, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -80446,7 +80484,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15881
+		zEntry = ts + 15900
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -80461,7 +80499,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+12054, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12073, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -80497,7 +80535,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15904, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15923, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -80511,7 +80549,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15913, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15932, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -80535,7 +80573,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15917, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15936, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -80553,7 +80591,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15923, libc.VaList(bp+16, zEntry, zFile))
+		ts+15942, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -80580,7 +80618,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15966, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15985, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -80618,7 +80656,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15998, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16017, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -80628,7 +80666,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16035,
+	ts + 16054,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80784,7 +80822,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+16038, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16057, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -80792,63 +80830,63 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 }
 
 var pragCName = [57]uintptr{
-	ts + 5050,
-	ts + 16077,
-	ts + 8869,
-	ts + 16081,
-	ts + 16086,
-	ts + 16089,
-	ts + 16099,
-	ts + 16109,
-	ts + 16115,
-	ts + 16119,
-	ts + 16124,
-	ts + 16129,
-	ts + 16137,
+	ts + 5069,
+	ts + 16096,
+	ts + 8888,
+	ts + 16100,
+	ts + 16105,
+	ts + 16108,
+	ts + 16118,
+	ts + 16128,
+	ts + 16134,
+	ts + 16138,
+	ts + 16143,
 	ts + 16148,
-	ts + 16151,
-	ts + 16158,
-	ts + 16119,
-	ts + 16124,
-	ts + 16165,
+	ts + 16156,
+	ts + 16167,
 	ts + 16170,
-	ts + 16173,
-	ts + 16180,
-	ts + 16115,
-	ts + 16119,
-	ts + 16186,
-	ts + 16191,
-	ts + 16196,
-	ts + 16119,
-	ts + 16200,
-	ts + 16124,
-	ts + 16208,
-	ts + 16212,
-	ts + 16217,
-	ts + 11485,
-	ts + 11481,
-	ts + 16223,
-	ts + 16228,
-	ts + 16233,
-	ts + 16077,
-	ts + 16119,
-	ts + 16238,
-	ts + 16245,
+	ts + 16177,
+	ts + 16138,
+	ts + 16143,
+	ts + 16184,
+	ts + 16189,
+	ts + 16192,
+	ts + 16199,
+	ts + 16134,
+	ts + 16138,
+	ts + 16205,
+	ts + 16210,
+	ts + 16215,
+	ts + 16138,
+	ts + 16219,
+	ts + 16143,
+	ts + 16227,
+	ts + 16231,
+	ts + 16236,
+	ts + 11504,
+	ts + 11500,
+	ts + 16242,
+	ts + 16247,
 	ts + 16252,
-	ts + 8869,
-	ts + 16260,
-	ts + 5053,
-	ts + 16266,
-	ts + 16077,
-	ts + 16119,
+	ts + 16096,
+	ts + 16138,
+	ts + 16257,
+	ts + 16264,
 	ts + 16271,
-	ts + 16276,
-	ts + 15473,
-	ts + 16281,
-	ts + 16294,
-	ts + 16303,
-	ts + 16310,
-	ts + 16321,
+	ts + 8888,
+	ts + 16279,
+	ts + 5072,
+	ts + 16285,
+	ts + 16096,
+	ts + 16138,
+	ts + 16290,
+	ts + 16295,
+	ts + 15492,
+	ts + 16300,
+	ts + 16313,
+	ts + 16322,
+	ts + 16329,
+	ts + 16340,
 }
 
 // Definitions of all built-in pragmas
@@ -80866,238 +80904,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16329,
+	{FzName: ts + 16348,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16344,
+	{FzName: ts + 16363,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16359,
+	{FzName: ts + 16378,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16371,
+	{FzName: ts + 16390,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16387,
+	{FzName: ts + 16406,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16310,
+	{FzName: ts + 16329,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16400,
+	{FzName: ts + 16419,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16412,
+	{FzName: ts + 16431,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16432,
+	{FzName: ts + 16451,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CellSizeCk)},
-	{FzName: ts + 16448,
+	{FzName: ts + 16467,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16469,
+	{FzName: ts + 16488,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16484,
+	{FzName: ts + 16503,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16500,
+	{FzName: ts + 16519,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16514,
+	{FzName: ts + 16533,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16527,
+	{FzName: ts + 16546,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16541,
+	{FzName: ts + 16560,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16560,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_DeferFKs)},
 	{FzName: ts + 16579,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_DeferFKs)},
+	{FzName: ts + 16598,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16602,
+	{FzName: ts + 16621,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16611,
+	{FzName: ts + 16630,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16629,
+	{FzName: ts + 16648,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16646,
+	{FzName: ts + 16665,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16659,
+	{FzName: ts + 16678,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16674,
+	{FzName: ts + 16693,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16692,
+	{FzName: ts + 16711,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16702,
+	{FzName: ts + 16721,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16716,
+	{FzName: ts + 16735,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16732,
+	{FzName: ts + 16751,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16757,
+	{FzName: ts + 16776,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16776,
+	{FzName: ts + 16795,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16787,
+	{FzName: ts + 16806,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16798,
+	{FzName: ts + 16817,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16810,
+	{FzName: ts + 16829,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16826,
+	{FzName: ts + 16845,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16839,
+	{FzName: ts + 16858,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16858,
+	{FzName: ts + 16877,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16877,
+	{FzName: ts + 16896,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16890,
+	{FzName: ts + 16909,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16905,
+	{FzName: ts + 16924,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16915,
+	{FzName: ts + 16934,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16927,
+	{FzName: ts + 16946,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16936,
+	{FzName: ts + 16955,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16947,
+	{FzName: ts + 16966,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16957,
+	{FzName: ts + 16976,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16969,
+	{FzName: ts + 16988,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16980,
+	{FzName: ts + 16999,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16992,
+	{FzName: ts + 17011,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17009,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_RecTriggers)},
 	{FzName: ts + 17028,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_RecTriggers)},
+	{FzName: ts + 17047,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17054,
+	{FzName: ts + 17073,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17069,
+	{FzName: ts + 17088,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17083,
+	{FzName: ts + 17102,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17102,
+	{FzName: ts + 17121,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17116,
+	{FzName: ts + 17135,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17132,
+	{FzName: ts + 17151,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17144,
+	{FzName: ts + 17163,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17155,
+	{FzName: ts + 17174,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17166,
+	{FzName: ts + 17185,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17178,
+	{FzName: ts + 17197,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17189,
+	{FzName: ts + 17208,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17210,
+	{FzName: ts + 17229,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17218,
+	{FzName: ts + 17237,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17233,
+	{FzName: ts + 17252,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17246,
-		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
 	{FzName: ts + 17265,
+		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
+	{FzName: ts + 17284,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17280,
+	{FzName: ts + 17299,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -81119,7 +81157,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 17296))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 17315))
 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)}
@@ -81131,10 +81169,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+17321) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17340) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17331) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17350) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -81143,13 +81181,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+8019) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8038) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17357) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17343) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17362) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -81164,9 +81202,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+16271) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16290) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17355) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17374) == 0 {
 		return 2
 	} else {
 		return 0
@@ -81180,7 +81218,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+17362, 0)
+				ts+17381, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -81271,19 +81309,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17424
+		zName = ts + 17443
 		break
 	case OE_SetDflt:
-		zName = ts + 17433
+		zName = ts + 17452
 		break
 	case OE_Cascade:
-		zName = ts + 17445
+		zName = ts + 17464
 		break
 	case OE_Restrict:
-		zName = ts + 17453
+		zName = ts + 17472
 		break
 	default:
-		zName = ts + 17462
+		zName = ts + 17481
 		break
 	}
 	return zName
@@ -81300,7 +81338,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17472, ts + 17479, ts + 17487, ts + 17491, ts + 17355, ts + 17500,
+	ts + 17491, ts + 17498, ts + 17506, ts + 17510, ts + 17374, ts + 17519,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -81347,13 +81385,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17504
+			zType = ts + 17523
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17506
+			zType = ts + 17525
 		} else {
-			zType = ts + 7521
+			zType = ts + 7529
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17508,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17527,
 			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),
@@ -81361,7 +81399,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17515, ts + 17520, ts + 17528}
+var azEnc = [4]uintptr{uintptr(0), ts + 17534, ts + 17539, ts + 17547}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -81512,6 +81550,7 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp7 int32
 	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
@@ -81608,7 +81647,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17536, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17555, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -81647,7 +81686,7 @@ __8:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 488)) != 0) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 488)))
 __10:
 	;
@@ -81869,7 +81908,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17540) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17559) == 0) {
 		goto __64
 	}
 	b = 2
@@ -81941,7 +81980,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17331
+	zRet = ts + 17350
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -81979,7 +82018,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17321
+	zRet = ts + 17340
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -82266,7 +82305,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 552)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17545, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17564, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -82285,7 +82324,7 @@ __127:
 	if !(*(*int8)(unsafe.Pointer(zRight)) != 0) {
 		goto __128
 	}
-	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+16, zRight))
+	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+16, zRight))
 	goto __129
 __128:
 	Xsqlite3_temp_directory = uintptr(0)
@@ -82307,7 +82346,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17570, 0)
+		ts+17589, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -82361,7 +82400,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17623) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17642) == 0) {
 		goto __142
 	}
 
@@ -82458,13 +82497,13 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17629
+			return ts + 17648
 		}
-		return ts + 17637
+		return ts + 17656
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
-			Xsqlite3ColumnType(tls, pCol, ts+1547),
+			Xsqlite3ColumnType(tls, pCol, ts+1566),
 			func() int32 {
 				if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 {
 					return 1
@@ -82529,7 +82568,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17644, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17663, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -82542,7 +82581,7 @@ __172:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __173
 	}
-	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1483, 0)
+	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1502, 0)
 	(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 __173:
 	;
@@ -82575,29 +82614,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10484
+	zType = ts + 10503
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12714
+	zType = ts + 12733
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17660
+	zType = ts + 17679
 	goto __183
 __182:
-	zType = ts + 8869
+	zType = ts + 8888
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17667,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17686,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -82663,7 +82702,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17693, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -82673,7 +82712,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17679,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17698,
 		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))))
@@ -82710,8 +82749,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17684, ts + 17686, ts + 16148}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17688,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17703, ts + 17705, ts + 16167}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17707,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -82744,7 +82783,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17694,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17713,
 		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)))
@@ -82766,7 +82805,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17698, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17717, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -82830,7 +82869,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7521, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7529, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -82846,7 +82885,7 @@ __218:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7521, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7529, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -82881,7 +82920,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17720,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -82889,7 +82928,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+17710))
+			ts+17729))
 	goto __227
 __227:
 	j2++
@@ -83078,7 +83117,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17715, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17734, 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)))
@@ -83295,7 +83334,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+17719, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17738, 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)
@@ -83406,7 +83445,7 @@ __307:
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17743,
+		ts+17762,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
@@ -83505,7 +83544,7 @@ __321:
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17779, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17798, 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) {
@@ -83527,7 +83566,7 @@ __326:
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17799,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17818,
 		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)
@@ -83540,7 +83579,7 @@ __329:
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17821,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17840,
 		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 __332
@@ -83558,11 +83597,11 @@ __331:
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
 __334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17844, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17863, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17846,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17865,
 		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)
 __333:
@@ -83608,7 +83647,7 @@ __339:
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17866,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17885,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
@@ -83642,89 +83681,103 @@ __344:
 
 	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+17896)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17915)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17901)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17920)
 	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)
 
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __345
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_IdxRowid, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
+	jmp7 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 3, 0, r1+int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn)-1)
+
+	Xsqlite3VdbeLoadString(tls, v, 3,
+		ts+17941)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17977)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp7)
+__345:
+	;
 	label6 = 0
 	kk = 0
-__345:
+__346:
 	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) {
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
 		goto __349
 	}
-	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+	goto __347
 __349:
+	;
+	if !(label6 == 0) {
+		goto __350
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__350:
 	;
 	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:
+	kk++
+	goto __346
+	goto __348
+__348:
 	;
 	if !(label6 != 0) {
-		goto __350
+		goto __351
 	}
 	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
 	Xsqlite3VdbeResolveLabel(tls, v, label6)
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17896)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17915)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17922)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17988)
 	Xsqlite3VdbeGoto(tls, v, jmp5-1)
 	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-__350:
+__351:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __351
+		goto __352
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__352:
+__353:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __354
+		goto __355
 	}
 	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 __355
+		goto __356
 	}
-	goto __353
-__355:
+	goto __354
+__356:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
-	goto __353
-__353:
-	kk++
-	goto __352
 	goto __354
 __354:
+	kk++
+	goto __353
+	goto __355
+__355:
 	;
 	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)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18015)
 	Xsqlite3VdbeGoto(tls, v, jmp5)
 	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
-__351:
+__352:
 	;
 	Xsqlite3VdbeJumpHere(tls, v, jmp4)
 	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
@@ -83741,20 +83794,20 @@ __340:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 612)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __356
+		goto __357
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17976)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+18042)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__357:
+__358:
 	if !(pIdx5 != 0) {
-		goto __359
-	}
-	if !(pPk1 == pIdx5) {
 		goto __360
 	}
-	goto __358
-__360:
+	if !(pPk1 == pIdx5) {
+		goto __361
+	}
+	goto __359
+__361:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -83763,21 +83816,21 @@ __360:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __358
-__358:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __357
 	goto __359
 __359:
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
+	goto __358
+	goto __360
+__360:
 	;
 	if !(pPk1 != 0) {
-		goto __361
+		goto __362
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__361:
+__362:
 	;
-__356:
+__357:
 	;
 	goto __291
 __291:
@@ -83795,14 +83848,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __362
+		goto __363
 	}
 	(*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 + 18005
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18071
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__362:
+__363:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -83810,27 +83863,27 @@ __362:
 
 __45:
 	if !!(zRight != 0) {
-		goto __363
+		goto __364
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __365
-	}
-	goto pragma_out
-__365:
-	;
-	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __364
-__363:
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
 		goto __366
 	}
+	goto pragma_out
+__366:
+	;
+	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
+	goto __365
+__364:
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
+		goto __367
+	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__367:
+__368:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __369
+		goto __370
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __370
+		goto __371
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -83839,25 +83892,25 @@ __367:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __369
-__370:
-	;
-	goto __368
-__368:
-	pEnc += 16
-	goto __367
-	goto __369
-__369:
-	;
-	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __371
-	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18008, libc.VaList(bp+456, zRight))
+	goto __370
 __371:
 	;
-__366:
+	goto __369
+__369:
+	pEnc += 16
+	goto __368
+	goto __370
+__370:
 	;
-__364:
+	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
+		goto __372
+	}
+	Xsqlite3ErrorMsg(tls, pParse, ts+18074, libc.VaList(bp+456, zRight))
+__372:
+	;
+__367:
+	;
+__365:
 	;
 	goto __15
 
@@ -83865,15 +83918,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 __372
+		goto __373
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __374
+		goto __375
 	}
 	goto __15
-__374:
+__375:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -83881,41 +83934,41 @@ __374:
 	(*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 __375
+		goto __376
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__375:
+__376:
 	;
-	goto __373
-__372:
+	goto __374
+__373:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __376
+		goto __377
 	}
 	goto __15
-__376:
+__377:
 	;
 	(*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)
-__373:
+__374:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__377:
+__378:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __378
+		goto __379
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __377
-__378:
+	goto __378
+__379:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -83930,31 +83983,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __379
-	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17338) == 0) {
 		goto __380
 	}
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17357) == 0) {
+		goto __381
+	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __381
-__380:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18033) == 0) {
-		goto __382
+	goto __382
+__381:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18099) == 0) {
+		goto __383
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __383
-__382:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17491) == 0) {
-		goto __384
+	goto __384
+__383:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17510) == 0) {
+		goto __385
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
+__385:
+	;
 __384:
 	;
-__383:
+__382:
 	;
-__381:
-	;
-__379:
+__380:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -83964,10 +84017,10 @@ __379:
 
 __49:
 	if !(zRight != 0) {
-		goto __385
+		goto __386
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__385:
+__386:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -83987,19 +84040,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __386
+		goto __387
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __388
+		goto __389
 	}
 	goto __15
-__388:
+__389:
 	;
-	goto __387
-__386:
-	opMask = U32(0xfffe)
+	goto __388
 __387:
+	opMask = U32(0xfffe)
+__388:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -84008,86 +84061,86 @@ __387:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__389:
+__390:
 	if !(iDb <= iDbLast) {
-		goto __391
-	}
-	if !(iDb == 1) {
 		goto __392
 	}
-	goto __390
-__392:
+	if !(iDb == 1) {
+		goto __393
+	}
+	goto __391
+__393:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__393:
+__394:
 	if !(k4 != 0) {
-		goto __395
+		goto __396
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __396
+		goto __397
 	}
-	goto __394
-__396:
+	goto __395
+__397:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__397:
+__398:
 	if !(pIdx6 != 0) {
-		goto __399
-	}
-	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
 		goto __400
 	}
+	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
+		goto __401
+	}
 	szThreshold = int16(0)
-	goto __399
-__400:
+	goto __400
+__401:
 	;
-	goto __398
-__398:
-	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __397
 	goto __399
 __399:
+	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
+	goto __398
+	goto __400
+__400:
 	;
 	if !(szThreshold != 0) {
-		goto __401
+		goto __402
 	}
 	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))
 
-__401:
+__402:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18041,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18107,
 		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 __402
+		goto __403
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __403
-__402:
-	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+	goto __404
 __403:
+	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+__404:
 	;
-	goto __394
-__394:
-	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __393
 	goto __395
 __395:
+	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
+	goto __394
+	goto __396
+__396:
 	;
-	goto __390
-__390:
-	iDb++
-	goto __389
 	goto __391
 __391:
+	iDb++
+	goto __390
+	goto __392
+__392:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -84095,36 +84148,36 @@ __391:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __404
+		goto __405
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__404:
+__405:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+640) == SQLITE_OK) {
-		goto __405
+		goto __406
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))
-__405:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __406
+		goto __407
 	}
 	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 __407
+		goto __408
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__407:
+__408:
 	;
-__406:
+__407:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -84133,10 +84186,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) >= int64(0)) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656))&int64(0x7fffffff)))
-__408:
+__409:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -84145,10 +84198,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __409
+		goto __410
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) & int64(0x7fffffff))
-__409:
+__410:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -84156,10 +84209,10 @@ __409:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __410
+		goto __411
 	}
 
-__410:
+__411:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -84211,14 +84264,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{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},
+	{FzName: ts + 18125, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18130, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18136, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18145, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18154, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18162, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18170},
+	{FzName: ts + 18177},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -84270,7 +84323,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+18117)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18183)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -84278,7 +84331,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18132, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18198, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -84291,19 +84344,19 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18205, 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+18145)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18211)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18157)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18223)
 		j++
 	}
-	Xsqlite3_str_append(tls, bp+32, ts+4950, 1)
+	Xsqlite3_str_append(tls, bp+32, ts+4969, 1)
 	Xsqlite3StrAccumFinish(tls, bp+32)
 
 	rc = Xsqlite3_declare_vtab(tls, db, bp+64)
@@ -84319,7 +84372,7 @@ __3:
 			(*PragmaVtab)(unsafe.Pointer(pTab)).FnHidden = U8(j)
 		}
 	} else {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	}
 
 	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
@@ -84467,7 +84520,7 @@ __1:
 		var zText uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 
 		if zText != 0 {
-			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, zText))
+			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, zText))
 			if *(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) == uintptr(0) {
 				return SQLITE_NOMEM
 			}
@@ -84483,13 +84536,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+18172)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18238)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18180, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18246, 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+18184, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18250, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -84498,7 +84551,7 @@ __3:
 	rc = Xsqlite3_prepare_v2(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
 	Xsqlite3_free(tls, zSql)
 	if rc != SQLITE_OK {
-		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
+		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
 		return rc
 	}
 	return pragmaVtabNext(tls, pVtabCursor)
@@ -84566,33 +84619,33 @@ 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+18188, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18254, 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, 137196)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137249)
 	} else {
 		var z uintptr
 		var zObj uintptr
 		if *(*uintptr)(unsafe.Pointer(azObj + 1*8)) != 0 {
 			zObj = *(*uintptr)(unsafe.Pointer(azObj + 1*8))
 		} else {
-			zObj = ts + 5001
+			zObj = ts + 5020
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18216, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18282, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18247, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18313, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137256)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18255,
-	ts + 18262,
-	ts + 18274,
+	ts + 18321,
+	ts + 18328,
+	ts + 18340,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -84652,7 +84705,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+14133)
+				corruptSchema(tls, pData, argv, ts+14152)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -84684,13 +84737,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+18285)
+			corruptSchema(tls, pData, argv, ts+18351)
 		} 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+14133)
+				corruptSchema(tls, pData, argv, ts+14152)
 			}
 		}
 	}
@@ -84723,16 +84776,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 + 8869
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8888
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7931
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18298
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7950
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18364
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -84826,7 +84879,7 @@ __10:
 		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11768)
+		ts+11787)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __15:
@@ -84861,7 +84914,7 @@ __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)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18436)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __19:
@@ -84875,7 +84928,7 @@ __20:
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18394,
+		ts+18460,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -85148,7 +85201,7 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
 	(*Parse)(unsafe.Pointer(pParse)).Fdb = db
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1483, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1502, 0)
 	}
 }
 
@@ -85176,7 +85229,7 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, bp+16, ts+1483, 0)
+	Xsqlite3ErrorMsg(tls, bp+16, ts+1502, 0)
 __1:
 	;
 	if !(prepFlags&U32(SQLITE_PREPARE_PERSISTENT) != 0) {
@@ -85207,7 +85260,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18428, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18494, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -85237,7 +85290,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18458, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18524, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -85297,7 +85350,7 @@ __21:
 	if !((*Parse)(unsafe.Pointer(bp+16)).FzErrMsg != 0) {
 		goto __22
 	}
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3656, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3675, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 	Xsqlite3DbFree(tls, db, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
 	goto __23
 __22:
@@ -85333,7 +85386,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, 137995)
+		return Xsqlite3MisuseError(tls, 138048)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -85432,7 +85485,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, 138143)
+		return Xsqlite3MisuseError(tls, 138196)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -85750,8 +85803,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 + 10913
-		var zSp2 uintptr = ts + 10913
+		var zSp1 uintptr = ts + 10932
+		var zSp2 uintptr = ts + 10932
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -85759,13 +85812,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18477, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18543, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18507))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18573))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -85940,7 +85993,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+18541, libc.VaList(bp, 0))
+					ts+18607, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -85985,7 +86038,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+18591, libc.VaList(bp+8, zName))
+						ts+18657, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -85996,7 +86049,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+18655,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18721,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -86040,7 +86093,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6579, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6598, 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.
@@ -86624,16 +86677,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18692
+		z = ts + 18758
 		break
 	case TK_INTERSECT:
-		z = ts + 18702
+		z = ts + 18768
 		break
 	case TK_EXCEPT:
-		z = ts + 18712
+		z = ts + 18778
 		break
 	default:
-		z = ts + 18719
+		z = ts + 18785
 		break
 	}
 	return z
@@ -86643,7 +86696,7 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18725, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18791, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
@@ -86669,11 +86722,11 @@ 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 {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18814, libc.VaList(bp, func() uintptr {
 		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
-			return ts + 18779
+			return ts + 18845
 		}
-		return ts + 1547
+		return ts + 1566
 	}()))
 
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
@@ -86861,8 +86914,8 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 				}
 
 				if iCol < 0 {
-					zType = ts + 1112
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16260
+					zType = ts + 1131
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16279
 				} 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))
@@ -87001,13 +87054,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16260
+				zCol = ts + 16279
 			} 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+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12073, 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))
@@ -87015,7 +87068,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+18794, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18860, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -87105,7 +87158,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16260
+					zName = ts + 16279
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -87115,7 +87168,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18794, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18860, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -87131,7 +87184,7 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18803, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18869, 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)
@@ -87214,8 +87267,6 @@ __1:
 		(*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
@@ -87230,12 +87281,15 @@ __1:
 			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
 				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
 			}
+			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)
+			}
 		}
 		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
+				zType = ts + 18877
 			} else {
 				zType = uintptr(0)
 				for j = 1; j < SQLITE_N_STDTYPE; j++ {
@@ -87451,7 +87505,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18815, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18881, 0)
 	return
 __1:
 	;
@@ -87542,7 +87596,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18864, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18930, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -87562,7 +87616,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18906, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18972, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -87599,7 +87653,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18912, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18978, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -87633,11 +87687,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+18927, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18993, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
-			return ts + 1547
+			return ts + 1566
 		}
-		return ts + 18950
+		return ts + 19016
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -87738,8 +87792,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18952, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18967, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19018, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19033, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -87786,7 +87840,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18692, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18758, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -87853,7 +87907,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+18986, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19052, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -87915,7 +87969,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+18986, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19052, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -88068,10 +88122,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+19007, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19073, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19053,
+			ts+19119,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -88325,8 +88379,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+7227)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7227)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7235)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7235)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -88353,13 +88407,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+19135, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19201, 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+19146, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19212, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -88371,7 +88425,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+19151, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19217, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -88559,7 +88613,8 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 				Xsqlite3VectorErrorMsg(tls, (*SubstContext)(unsafe.Pointer(pSubst)).FpParse, pCopy)
 			} else {
 				var db uintptr = (*Parse)(unsafe.Pointer((*SubstContext)(unsafe.Pointer(pSubst)).FpParse)).Fdb
-				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 && int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN {
+				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 &&
+					(int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN || (*Expr)(unsafe.Pointer(pCopy)).FiTable != (*SubstContext)(unsafe.Pointer(pSubst)).FiNewTable) {
 					libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
 					(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_IF_NULL_ROW)
 					(*Expr)(unsafe.Pointer(bp)).FpLeft = pCopy
@@ -88599,7 +88654,7 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 								if pColl != 0 {
 									return (*CollSeq)(unsafe.Pointer(pColl)).FzName
 								}
-								return ts + 1092
+								return ts + 1111
 							}())
 					}
 
@@ -89387,12 +89442,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15157) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15176) == 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+15161) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15180) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -89458,7 +89513,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+19157, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19223, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -89541,7 +89596,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+19175, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19241, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -89670,7 +89725,7 @@ 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+19198, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19264, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
@@ -89693,7 +89748,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+19218, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19284, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -89709,7 +89764,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19261
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19327
 		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 {
@@ -89735,7 +89790,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+19284,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19350,
 					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
@@ -89746,9 +89801,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 + 19322
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19388
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19356
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19422
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -89795,7 +89850,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+19394, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19460, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -89907,7 +89962,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19398,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19464,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -89926,7 +89981,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+19437,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19503,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -89934,7 +89989,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+14726,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14745,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -90035,7 +90090,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6439
+							zSchemaName = ts + 6458
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -90050,7 +90105,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+19468, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19534, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -90115,7 +90170,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+19473,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19539,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -90127,7 +90182,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+12054, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12073, 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)
@@ -90146,9 +90201,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19482, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19548, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19500, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19566, 0)
 					}
 				}
 			}
@@ -90158,7 +90213,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+19520, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19586, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -90296,7 +90351,7 @@ func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect ui
 	(*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)
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSelect)).FpGroupBy)).FnExpr)
 		} 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)
 		}
@@ -90380,13 +90435,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19551, 0)
+					ts+19617, 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+19602, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19668, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -90575,19 +90630,19 @@ 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+19635,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19701,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19647
+						return ts + 19713
 					}
-					return ts + 1547
+					return ts + 1566
 				}(),
 				func() uintptr {
 					if bCover != 0 {
 						return (*Index)(unsafe.Pointer(pIdx)).FzName
 					}
-					return ts + 1547
+					return ts + 1566
 				}()))
 	}
 }
@@ -90600,7 +90655,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+7931)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7950)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -90907,7 +90962,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19670,
+		ts+19736,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -90968,7 +91023,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19724,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19790,
 		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:
@@ -91072,7 +91127,7 @@ __27:
 	if !((*SrcItem)(unsafe.Pointer(pItem1)).FcolUsed == uint64(0) && (*SrcItem)(unsafe.Pointer(pItem1)).FzName != uintptr(0)) {
 		goto __30
 	}
-	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1547, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
+	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1566, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
 __30:
 	;
 	pSub1 = (*SrcItem)(unsafe.Pointer(pItem1)).FpSelect
@@ -91110,7 +91165,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+19764, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19830, 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)
@@ -91169,7 +91224,7 @@ __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19779, libc.VaList(bp+40, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19845, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
@@ -91640,9 +91695,9 @@ __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 + 19795
+				return ts + 19861
 			}
-			return ts + 19804
+			return ts + 19870
 		}())
 
 	groupBySort = 1
@@ -91993,7 +92048,7 @@ __65:
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
 		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19795)
+	explainTempTable(tls, pParse, ts+19861)
 __146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
@@ -92076,7 +92131,7 @@ __7:
 	if !(i < nCol) {
 		goto __9
 	}
-	z = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
+	z = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
 	if !(z == uintptr(0)) {
 		goto __10
 	}
@@ -92098,7 +92153,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19813, 0)
+		ts+19879, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -92194,7 +92249,7 @@ func Xsqlite3_get_table(tls *libc.TLS, db uintptr, zSql uintptr, pazResult uintp
 		if (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
 			if pzErrMsg != 0 {
 				Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(pzErrMsg)))
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
 			}
 			Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg)
 		}
@@ -92331,7 +92386,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+19878, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19944, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -92375,7 +92430,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19924, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19990, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -92393,7 +92448,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19932, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19998, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -92405,7 +92460,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19924, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19990, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -92420,11 +92475,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19973, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20039, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
+
 __17:
 	;
 	goto trigger_cleanup
@@ -92432,22 +92488,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6393, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19999, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20065, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20037,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20103,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20074
+				return ts + 20140
 			}
-			return ts + 20081
+			return ts + 20147
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -92456,7 +92512,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20087, libc.VaList(bp+24, pTableName+8))
+		ts+20153, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -92485,9 +92541,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 6382
+			return ts + 6401
 		}
-		return ts + 5876
+		return ts + 5895
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -92605,7 +92661,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19924, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19990, 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
@@ -92638,7 +92694,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20133,
+		ts+20199,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -92663,13 +92719,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20181,
+		ts+20247,
 		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+20256, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20322, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -92925,7 +92981,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20285, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20351, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -92964,9 +93020,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 + 6382
+				return ts + 6401
 			}
-			return ts + 5876
+			return ts + 5895
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -92978,7 +93034,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20305,
+			ts+20371,
 			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)
@@ -93092,12 +93148,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20367,
+		ts+20433,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20415
+				return ts + 20481
 			}
-			return ts + 20422
+			return ts + 20488
 		}()))
 __15:
 	;
@@ -93211,7 +93267,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+20429, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20495, 0)
 	return 1
 }
 
@@ -93277,7 +93333,7 @@ func codeReturningTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab
 	}
 	Xsqlite3ExprListDelete(tls, db, (*Select)(unsafe.Pointer(bp)).FpEList)
 	pNew = sqlite3ExpandReturning(tls, pParse, (*Returning)(unsafe.Pointer(pReturning)).FpReturnEL, pTab)
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0) {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
 		libc.Xmemset(tls, bp+240, 0, uint64(unsafe.Sizeof(NameContext{})))
 		if (*Returning)(unsafe.Pointer(pReturning)).FnRetCol == 0 {
 			(*Returning)(unsafe.Pointer(pReturning)).FnRetCol = (*ExprList)(unsafe.Pointer(pNew)).FnExpr
@@ -93331,7 +93387,7 @@ func codeTriggerProgram(tls *libc.TLS, pParse uintptr, pStepList uintptr, orconf
 
 		if (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan != 0 {
 			Xsqlite3VdbeAddOp4(tls, v, OP_Trace, 0x7fffffff, 1, 0,
-				Xsqlite3MPrintf(tls, db, ts+6073, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
+				Xsqlite3MPrintf(tls, db, ts+6092, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
 				-6)
 		}
 
@@ -93441,7 +93497,7 @@ 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+20471, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20537, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
@@ -94034,7 +94090,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20485,
+		ts+20551,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -94066,7 +94122,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20521, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20587, 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:
@@ -94076,7 +94132,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7706
+				return ts + 7725
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -94392,7 +94448,12 @@ __74:
 	goto __77
 __76:
 	flags = WHERE_ONEPASS_DESIRED
-	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) && !(pTrigger != 0) && !(hasFK != 0) && !(chngKey != 0) && !(*(*int32)(unsafe.Pointer(bp + 104)) != 0)) {
+	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) &&
+		!(pTrigger != 0) &&
+		!(hasFK != 0) &&
+		!(chngKey != 0) &&
+		!(*(*int32)(unsafe.Pointer(bp + 104)) != 0) &&
+		(*NameContext)(unsafe.Pointer(bp+40)).FncFlags&NC_Subquery == 0) {
 		goto __78
 	}
 	flags = flags | WHERE_ONEPASS_MULTIROW
@@ -94946,7 +95007,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20540)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20606)
 __169:
 	;
 update_cleanup:
@@ -95252,10 +95313,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+20553, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+20619, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20557, libc.VaList(bp+8, bp+216))
+				ts+20623, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -95346,7 +95407,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+12143, -1)
+				ts+12162, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -95378,7 +95439,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+20630, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20634, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20696, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20700, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -95526,14 +95587,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+20638)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20704)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20678)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20744)
 	return SQLITE_ERROR
 __2:
 	;
@@ -95544,7 +95605,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20721)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20787)
 	return SQLITE_ERROR
 __5:
 	;
@@ -95553,7 +95614,7 @@ __5:
 	*(*uint32)(unsafe.Pointer(db + 76)) |= uint32(SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE)
 	goto __4
 __3:
-	zOut = ts + 1547
+	zOut = ts + 1566
 __4:
 	;
 	saved_flags = (*Sqlite3)(unsafe.Pointer(db)).Fflags
@@ -95572,7 +95633,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20739, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20805, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -95592,7 +95653,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20762)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20828)
 	goto end_of_vacuum
 __8:
 	;
@@ -95607,7 +95668,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14496)
+	rc = execSql(tls, db, pzErrMsg, ts+14515)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -95652,7 +95713,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20789,
+		ts+20855,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -95661,7 +95722,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20897,
+		ts+20963,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -95672,7 +95733,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20951,
+		ts+21017,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -95683,7 +95744,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21102,
+		ts+21168,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -96028,7 +96089,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+12370, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12389, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -96112,11 +96173,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+21232, libc.VaList(bp, pParse+272))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21298, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21256,
+			ts+21322,
 			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,
@@ -96126,7 +96187,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21355, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21421, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -96187,7 +96248,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+21374, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21440, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -96215,9 +96276,11 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FbDeclared = 0
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = bp + 32
+	(*Table)(unsafe.Pointer(pTab)).FnTabRef++
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{xConstruct})).f(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, pVTable+16, bp+64)
+	Xsqlite3DeleteTable(tls, db, pTab)
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = (*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -96225,9 +96288,9 @@ 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+21416, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21482, libc.VaList(bp+8, zModuleName))
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3656, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3675, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 		}
 		Xsqlite3DbFree(tls, db, pVTable)
@@ -96237,7 +96300,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 + 21446
+			var zFormat uintptr = ts + 21512
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -96249,12 +96312,12 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 			*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) = pVTable
 
 			for iCol = 0; iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol); iCol++ {
-				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1547)
+				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1566)
 				var nType int32
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16151, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16170, 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
@@ -96311,13 +96374,13 @@ 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+21492, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21558, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxConnect, bp+16)
 		if rc != SQLITE_OK {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 		}
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 16)))
@@ -96369,7 +96432,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+21492, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21558, 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)
@@ -96403,7 +96466,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, 151030)
+		return Xsqlite3MisuseError(tls, 151102)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -96445,7 +96508,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR,
 			func() uintptr {
 				if (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
-					return ts + 3656
+					return ts + 3675
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg))
@@ -96813,7 +96876,7 @@ func Xsqlite3VtabEponymousTableInit(tls *libc.TLS, pParse uintptr, pMod uintptr)
 	addModuleArgument(tls, pParse, pTab, Xsqlite3DbStrDup(tls, db, (*Table)(unsafe.Pointer(pTab)).FzName))
 	rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer(pModule)).FxConnect, bp+8)
 	if rc != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+		Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		Xsqlite3VtabEponymousTableClear(tls, db, pMod)
 	}
@@ -96856,7 +96919,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, 151521)
+		rc = Xsqlite3MisuseError(tls, 151593)
 	} else {
 		ap = va
 		switch op {
@@ -96883,7 +96946,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 151539)
+				rc = Xsqlite3MisuseError(tls, 151611)
 				break
 
 			}
@@ -97114,10 +97177,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 + 21511
+		return ts + 21577
 	}
 	if i == -1 {
-		return ts + 16260
+		return ts + 16279
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -97126,35 +97189,35 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21518, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21584, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21524, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21590, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12760, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12779, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4950, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4969, 1)
 	}
 
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21524, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21590, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12760, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12779, 1)
 		}
-		Xsqlite3_str_append(tls, pStr, ts+5001, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5020, 1)
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4950, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4969, 1)
 	}
 }
 
@@ -97171,29 +97234,29 @@ 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+21526, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21592, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21518, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21584, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21529
+				return ts + 21595
 			}
-			return ts + 21534
+			return ts + 21600
 		}(), 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+21542)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21608)
 		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+21544)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21610)
 	}
-	Xsqlite3_str_append(tls, pStr, ts+4950, 1)
+	Xsqlite3_str_append(tls, pStr, ts+4969, 1)
 }
 
 // This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
@@ -97234,11 +97297,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+21546, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21612, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21552
+				return ts + 21618
 			}
-			return ts + 21559
+			return ts + 21625
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -97248,43 +97311,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 + 10969
+					zFmt = ts + 10988
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21564
+				zFmt = ts + 21630
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21597
+				zFmt = ts + 21663
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21622
+				zFmt = ts + 21688
 			} else {
-				zFmt = ts + 21640
+				zFmt = ts + 21706
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21649, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21715, 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 + 16260
-			Xsqlite3_str_appendf(tls, bp+64, ts+21657, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16279
+			Xsqlite3_str_appendf(tls, bp+64, ts+21723, 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+21688, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21754, 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+21698, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21764, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21703,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21769,
 				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+21730, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21796, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -97316,25 +97379,25 @@ 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+21741, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21807, 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+21529, 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+21595, 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+21762, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21828, 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+21518, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21584, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21529, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21595, libc.VaList(bp+16, z))
 		}
 	}
-	Xsqlite3_str_append(tls, bp+24, ts+4950, 1)
+	Xsqlite3_str_append(tls, bp+24, ts+4969, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
@@ -98928,7 +98991,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21770, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21836, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -98956,7 +99019,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21785, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21851, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -99474,7 +99537,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+21794, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21860, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -99832,10 +99895,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{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)},
+	{FzOp: ts + 16128, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15459, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14979, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21874, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -100325,12 +100388,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21815, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21881, 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+21815, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21881, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -100409,7 +100472,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 + 6762
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7711
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -100503,7 +100566,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 21856
+				return ts + 21922
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -100879,7 +100942,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21863,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21929,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -100895,7 +100958,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 		pRhs = Xsqlite3PExpr(tls, pParse, TK_UPLUS,
 			Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*ExprList_item)(unsafe.Pointer(pArgs+8+uintptr(j)*32)).FpExpr, 0), uintptr(0))
 		pTerm = Xsqlite3PExpr(tls, pParse, TK_EQ, pColRef, pRhs)
-		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ|JT_RIGHT) != 0 {
 			joinType = U32(EP_OuterON)
 		} else {
 			joinType = U32(EP_InnerON)
@@ -101613,7 +101676,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21899, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21965, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -101684,7 +101747,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21925
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21991
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -101858,6 +101921,10 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	var iCur int32
+	var saved_pIdxEpr uintptr
+
+	saved_pIdxEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 
 	addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	for __ccgo := true; __ccgo; __ccgo = iLevel < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel) {
@@ -101901,9 +101968,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, n)
 			var jj int32
 			for jj = 0; jj < n; jj++ {
-				var iCol int32 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(jj)*2)))
-
-				Xsqlite3ExprCodeGetColumnOfTable(tls, v, (*Index)(unsafe.Pointer(pIdx)).FpTable, iCur, iCol, r1+jj)
+				Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pIdx, iCur, jj, r1+jj)
 			}
 			Xsqlite3VdbeAddOp4Int(tls, v, OP_FilterAdd, (*WhereLevel)(unsafe.Pointer(pLevel)).FregFilter, 0, r1, n)
 			Xsqlite3ReleaseTempRange(tls, pParse, r1, n)
@@ -101937,6 +102002,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 		}
 	}
 	Xsqlite3VdbeJumpHere(tls, v, addrOnce)
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = saved_pIdxEpr
 }
 
 func allocateIndexInfo(tls *libc.TLS, pWInfo uintptr, pWC uintptr, mUnusable Bitmask, pSrc uintptr, pmNoOmit uintptr) uintptr {
@@ -102050,7 +102116,7 @@ __3:
 		uint64(unsafe.Sizeof(sqlite3_index_orderby{}))*uint64(nOrderBy)+uint64(unsafe.Sizeof(HiddenIndexInfo1{}))+
 		uint64(unsafe.Sizeof(uintptr(0)))*uint64(nTerm))
 	if pIdxInfo == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1483, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1502, 0)
 		return uintptr(0)
 	}
 	pHidden = pIdxInfo + 1*96
@@ -102172,9 +102238,9 @@ func vtabBestIndex(tls *libc.TLS, pParse uintptr, pTab uintptr, p uintptr) int32
 		if rc == SQLITE_NOMEM {
 			Xsqlite3OomFault(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb)
 		} else if !(int32((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3656, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3675, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
 		}
 	}
 	Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg)
@@ -102195,11 +102261,16 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 
 	_ = pParse
 
+	if !((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol)
+	} else {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnColumn)
+	}
 	nField = func() int32 {
-		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < (*Index)(unsafe.Pointer(pIdx)).FnSample {
+		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < nField {
 			return int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField)
 		}
-		return (*Index)(unsafe.Pointer(pIdx)).FnSample
+		return nField
 	}()
 	iCol = 0
 	iSample = (*Index)(unsafe.Pointer(pIdx)).FnSample * nField
@@ -103780,7 +103851,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+21936, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+22002, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -103838,7 +103909,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+21936, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+22002, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -104236,7 +104307,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+21962, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+22028, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -104843,7 +104914,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21997, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22063, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -104878,6 +104949,10 @@ __3:
 			if int32((*WherePath)(unsafe.Pointer(pFrom)).FisOrdered) == (*ExprList)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpOrderBy)).FnExpr {
 				(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_ORDERED)
 			}
+			if (*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy != 0 &&
+				int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) > (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr {
+				(*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat = I8((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr)
+			}
 		} else {
 			(*WhereInfo)(unsafe.Pointer(pWInfo)).FrevMask = (*WherePath)(unsafe.Pointer(pFrom)).FrevLoop
 			if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) <= 0 {
@@ -105172,6 +105247,9 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
+		if Xsqlite3IndexAffinityStr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pIdx) != 0 {
+			(*IndexedExpr)(unsafe.Pointer(p)).Faff = U8(*(*int8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FzColAff + uintptr(i))))
+		}
 		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
@@ -105324,7 +105402,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22015, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22081, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -105388,7 +105466,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22043, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22109, 0)
 	goto __5
 __4:
 	ii = 0
@@ -106270,7 +106348,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22061, -1)
+		pCtx, ts+22127, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -106403,7 +106481,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+22117, -1)
+					pCtx, ts+22183, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -106493,17 +106571,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-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))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22228))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22239))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22250))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22255))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22268))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22278))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22284))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22295))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22305))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22317))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22322))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -106549,7 +106627,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22260, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22326, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -106593,12 +106671,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+22279, 0)
+			ts+22345, 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+22350, 0)
+				ts+22416, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -106621,7 +106699,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+7931)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7950)
 					}
 					break
 				}
@@ -106825,7 +106903,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+22413, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22479, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -106941,7 +107019,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+7523))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7531))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -107056,7 +107134,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22439, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22505, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -107121,15 +107199,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 + 22471
+				zErr = ts + 22537
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22488
+				zErr = ts + 22554
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22504
+				zErr = ts + 22570
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22524, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22590, 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 {
@@ -107150,7 +107228,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+22557, 0)
+				ts+22623, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -107288,7 +107366,7 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regZero)
 	if eCond >= WINDOW_STARTING_NUM {
 		var regString int32 = Xsqlite3GetTempReg(tls, pParse)
-		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1547, -1)
+		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1566, -1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, Xsqlite3VdbeCurrentAddr(tls, v)+2, reg)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL))
 
@@ -107306,11 +107384,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22604,
-	ts + 22657,
-	ts + 22061,
-	ts + 22708,
-	ts + 22760,
+	ts + 22670,
+	ts + 22723,
+	ts + 22127,
+	ts + 22774,
+	ts + 22826,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -107801,7 +107879,7 @@ func windowCodeRangeTest(tls *libc.TLS, p uintptr, op int32, csr1 int32, regVal
 
 	}
 
-	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1547, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1566, -1)
 	addrGe = Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, 0, reg1)
 
 	if op == OP_Ge && arith == OP_Add || op == OP_Le && arith == OP_Subtract {
@@ -108705,19 +108783,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+22810,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22876,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 22852
+							return ts + 22918
 						}
-						return ts + 22861
+						return ts + 22927
 					}(),
 						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+22867, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22933, 0)
 		}
 	}
 
@@ -108785,7 +108863,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+22901,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22967,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -109882,7 +109960,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22939, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23005, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -110857,21 +110935,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+16260, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16279, 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+22961, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23027, 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+16173, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16192, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22961, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23027, 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))
@@ -111614,7 +111692,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+22988)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+23054)
 				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 {
@@ -111778,7 +111856,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+22997, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23063, 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))
@@ -111995,9 +112073,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 + 6757
+							return ts + 7706
 						}
-						return ts + 6762
+						return ts + 7711
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -112281,19 +112359,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+23021, 0)
+					ts+23087, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23116, 0)
+					ts+23182, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23200, 0)
+					ts+23266, 0)
 			}
 			break
 		case uint32(273):
@@ -112672,9 +112750,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+22997, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23063, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23285, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23351, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -113442,7 +113520,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+23302, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23368, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -113463,9 +113541,9 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 	}
 	if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg != 0 || (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_OK && (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_DONE {
 		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)))
+			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3675, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23327, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23393, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -113638,7 +113716,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23338, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23404, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -113651,11 +113729,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19924, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19990, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23411, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23350, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23416, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -113668,9 +113746,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23360, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23426, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23364, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23430, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -113740,7 +113818,8 @@ func sqlite3TestExtInit(tls *libc.TLS, db uintptr) int32 {
 	return Xsqlite3FaultSim(tls, 500)
 }
 
-var sqlite3BuiltinExtensions = [4]uintptr{
+var sqlite3BuiltinExtensions = [5]uintptr{
+	0,
 	0,
 	0,
 	0,
@@ -113904,7 +113983,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 174337)
+		return Xsqlite3MisuseError(tls, 174426)
 	}
 
 	ap = va
@@ -114479,7 +114558,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175111)
+		return Xsqlite3MisuseError(tls, 175200)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -114494,7 +114573,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23372, 0)
+			ts+23438, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -114685,23 +114764,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 + 23440
+	var zErr uintptr = ts + 23506
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23454
+			zErr = ts + 23520
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23476
+			zErr = ts + 23542
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23498
+			zErr = ts + 23564
 			break
 
 		}
@@ -114719,35 +114798,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23521,
-	ts + 23534,
+	ts + 23587,
+	ts + 23600,
 	uintptr(0),
-	ts + 23550,
-	ts + 23575,
-	ts + 23589,
-	ts + 23608,
-	ts + 1483,
-	ts + 23633,
-	ts + 23670,
-	ts + 23682,
-	ts + 23697,
-	ts + 23730,
+	ts + 23616,
+	ts + 23641,
+	ts + 23655,
+	ts + 23674,
+	ts + 1502,
+	ts + 23699,
+	ts + 23736,
 	ts + 23748,
-	ts + 23773,
-	ts + 23802,
+	ts + 23763,
+	ts + 23796,
+	ts + 23814,
+	ts + 23839,
+	ts + 23868,
 	uintptr(0),
-	ts + 5831,
-	ts + 5327,
-	ts + 23819,
-	ts + 23837,
-	ts + 23855,
+	ts + 5850,
+	ts + 5346,
+	ts + 23885,
+	ts + 23903,
+	ts + 23921,
 	uintptr(0),
-	ts + 23889,
+	ts + 23955,
 	uintptr(0),
-	ts + 23910,
-	ts + 23936,
-	ts + 23959,
-	ts + 23980,
+	ts + 23976,
+	ts + 24002,
+	ts + 24025,
+	ts + 24046,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -114868,7 +114947,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, 175758)
+		return Xsqlite3MisuseError(tls, 175847)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -114913,7 +114992,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+23996, 0)
+				ts+24062, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -115030,7 +115109,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+24059, libc.VaList(bp, zName))
+		ts+24125, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -115058,7 +115137,7 @@ func Xsqlite3_overload_function(tls *libc.TLS, db uintptr, zName uintptr, nArg i
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, zName))
+	zCopy = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, zName))
 	if zCopy == uintptr(0) {
 		return SQLITE_NOMEM
 	}
@@ -115266,7 +115345,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+24110, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24176, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -115359,7 +115438,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, 176503))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176592))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -115429,7 +115508,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, 176582)
+		return Xsqlite3MisuseError(tls, 176671)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115439,7 +115518,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, 176591)
+		return Xsqlite3MisuseError(tls, 176680)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115471,14 +115550,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, 176639)
+		return Xsqlite3MisuseError(tls, 176728)
 	}
 
 	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+24131, 0)
+				ts+24197, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -115608,7 +115687,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+24199, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24265, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -115653,10 +115732,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24205, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24271, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24215,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24281,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -115761,7 +115840,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24243, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24309, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -115772,17 +115851,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24247, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24313, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24247
+	zModeType = ts + 24313
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24253, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24319, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -115790,7 +115869,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 3265
+	zModeType = ts + 3284
 __32:
 	;
 	if !(aMode != 0) {
@@ -115820,7 +115899,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24258, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24324, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -115828,7 +115907,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24278,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24344,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -115868,7 +115947,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24302, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24368, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -115892,15 +115971,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24318, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24325, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24384, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24391, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{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},
+	{Fz: ts + 24399, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24402, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24405, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17374, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -116046,10 +116125,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+21856, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21922, 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+24343, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24409, 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) {
@@ -116063,7 +116142,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 177308)
+	rc = Xsqlite3MisuseError(tls, 177397)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -116080,7 +116159,7 @@ __19:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3656
+			return ts + 3675
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -116114,9 +116193,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 + 6434
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6453
 	(*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 + 23345
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23411
 	(*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)
@@ -116221,7 +116300,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24349
+		zFilename = ts + 24415
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -116324,21 +116403,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+24352,
+	Xsqlite3_log(tls, iErr, ts+24418,
 		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+24377)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24443)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24397)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24463)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24404)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24470)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -116449,7 +116528,7 @@ __4:
 	autoinc = libc.Bool32(int32((*Table)(unsafe.Pointer(pTab)).FiPKey) == iCol && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != U32(0))
 	goto __13
 __12:
-	zDataType = ts + 1112
+	zDataType = ts + 1131
 	primarykey = 1
 __13:
 	;
@@ -116496,14 +116575,14 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24421, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24487, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3656
+			return ts + 3675
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -117152,7 +117231,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24449, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24515, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -117270,7 +117349,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 + 24457
+			return ts + 24523
 		}
 		return uintptr(0)
 	}(), 0)
@@ -117448,7 +117527,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6174, ts + 6757, ts + 6762, ts + 6184, ts + 6179, ts + 7998, ts + 24480, ts + 24486,
+	ts + 6193, ts + 7706, ts + 7711, ts + 6203, ts + 6198, ts + 8017, ts + 24546, ts + 24552,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -117601,7 +117680,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 + 24493 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 24559 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -117627,7 +117706,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	switch Xsqlite3_value_type(tls, pValue) {
 	case SQLITE_NULL:
 		{
-			jsonAppendRaw(tls, p, ts+6174, uint32(4))
+			jsonAppendRaw(tls, p, ts+6193, uint32(4))
 			break
 
 		}
@@ -117656,7 +117735,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+24510, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24576, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -117714,19 +117793,19 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 	switch int32((*JsonNode)(unsafe.Pointer(pNode)).FeType) {
 	default:
 		{
-			jsonAppendRaw(tls, pOut, ts+6174, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6193, uint32(4))
 			break
 
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6757, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+7706, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6762, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+7711, uint32(5))
 			break
 
 		}
@@ -118271,17 +118350,17 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		}
 		return int32(j + U32(1))
 	} else if int32(c) == 'n' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6174, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6193, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		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+6757, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7706, 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+6762, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7711, 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))
@@ -118382,7 +118461,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+24539, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24605, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -118688,7 +118767,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+24554, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24620, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -118703,7 +118782,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24558, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24624, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -118757,7 +118836,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+24584,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24650,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -118862,11 +118941,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+24627, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24693, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
-					jsonAppendRaw(tls, bp, ts+4991, uint32(2))
+					jsonAppendRaw(tls, bp, ts+5010, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24630, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24696, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -118907,7 +118986,7 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if pNode != 0 {
 				jsonRenderNode(tls, pNode, bp, uintptr(0))
 			} else {
-				jsonAppendRaw(tls, bp, ts+6174, uint32(4))
+				jsonAppendRaw(tls, bp, ts+6193, uint32(4))
 			}
 		}
 		if i == argc {
@@ -119023,14 +119102,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24633, -1)
+			ts+24699, -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+24684, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24750, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -119125,7 +119204,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15373)
+	jsonWrongNumArgs(tls, ctx, ts+15392)
 	return
 __2:
 	;
@@ -119200,9 +119279,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24718
+			return ts + 24784
 		}
-		return ts + 24722
+		return ts + 24788
 	}())
 	return
 __2:
@@ -119335,7 +119414,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24729, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24795, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119432,7 +119511,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24732, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24798, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119476,7 +119555,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24735)
+		ts+24801)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -119607,7 +119686,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24818, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24884, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -119626,7 +119705,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+24824, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24890, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -119722,7 +119801,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+24824, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24890, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -119746,7 +119825,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 + 24829
+				zRoot = ts + 24895
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -119868,7 +119947,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+24539, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24605, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -119963,25 +120042,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{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 + 24897},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24902},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24913},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24913},
 	{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}}
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24944},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24947},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24951},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24963},
+	{FnArg: int8(2), 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_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24986},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24997},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25009},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 25022},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25031},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25031},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25041},
+	{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 + 25052},
+	{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 + 25069}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -120000,8 +120079,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 25021, FpModule: 0},
-	{FzName: ts + 25031, FpModule: 0},
+	{FzName: ts + 25087, FpModule: 0},
+	{FzName: ts + 25097, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -120261,11 +120340,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+25041, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25107, 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+25049, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25115, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -120476,7 +120555,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+25054,
+		ts+25120,
 		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))
@@ -121179,7 +121258,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25136)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25202)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -121391,7 +121470,7 @@ func rtreeBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 2
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FneedToFreeIdxStr = 1
-	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, bp+8))) {
+	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, bp+8))) {
 		return SQLITE_NOMEM
 	}
 
@@ -122520,7 +122599,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25150, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25216, 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 {
@@ -122532,12 +122611,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+25170, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25236, 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+25202, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25268, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -122763,7 +122842,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+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))
+		ts+25305, 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))
@@ -122786,14 +122865,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25384
+	var zFmt uintptr = ts + 25450
 	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+11341, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11360, 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 {
@@ -122834,7 +122913,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25440, ts + 5053, ts + 16260,
+	ts + 25506, ts + 5072, ts + 16279,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -122877,19 +122956,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+25445,
+			ts+25511,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25507, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25573, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25512,
+			ts+25578,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25576,
+			ts+25642,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25646,
+			ts+25712,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -122918,7 +122997,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 + 25695
+			zFormat = ts + 25761
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -122930,7 +123009,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+25803,
+			ts+25869,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -122938,18 +123017,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+25848, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25914, 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+12760, 1)
+					Xsqlite3_str_append(tls, p, ts+12779, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25875, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25941, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25897, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25963, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25905, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25971, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -122964,14 +123043,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25921,
-	ts + 25974,
-	ts + 26019,
-	ts + 26071,
-	ts + 26125,
-	ts + 26170,
-	ts + 26228,
-	ts + 26283,
+	ts + 25987,
+	ts + 26040,
+	ts + 26085,
+	ts + 26137,
+	ts + 26191,
+	ts + 26236,
+	ts + 26294,
+	ts + 26349,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -123000,7 +123079,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+26330, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26396, 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
@@ -123008,19 +123087,19 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 				(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = 4 + int32((*Rtree)(unsafe.Pointer(pRtree)).FnBytesPerCell)*RTREE_MAXCELLS
 			}
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26350,
+			ts+26416,
 			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 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26407,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26473,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -123062,16 +123141,16 @@ 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 + 26442,
-		ts + 26485,
-		ts + 26520,
-		ts + 26556,
+		ts + 26508,
+		ts + 26551,
+		ts + 26586,
+		ts + 26622,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
 		goto __1
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
 	return SQLITE_ERROR
 __1:
 	;
@@ -123096,7 +123175,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+26593,
+	Xsqlite3_str_appendf(tls, pSql, ts+26659,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -123108,7 +123187,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26617, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26683, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -123131,7 +123210,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26623, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26689, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -123142,14 +123221,14 @@ __10:
 	if !(ii < argc) {
 		goto __12
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
 	rc = SQLITE_ERROR
 	goto __13
 __12:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __14
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
 __14:
 	;
 __13:
@@ -123192,7 +123271,7 @@ __17:
 	if !(iErr != 0) {
 		goto __22
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
 	goto rtreeInit_fail
 __22:
 	;
@@ -123209,7 +123288,7 @@ __23:
 	if !(rc != 0) {
 		goto __24
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
 	goto rtreeInit_fail
 __24:
 	;
@@ -123227,7 +123306,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26626, ts + 26637}
+var azFormat = [2]uintptr{ts + 26692, ts + 26703}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -123265,13 +123344,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+10913, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10932, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26647, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26713, 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+26653, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26719, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26657, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26723, 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})))
@@ -123282,7 +123361,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+26659, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26725, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -123360,12 +123439,12 @@ 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+26692,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26758,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
-						return ts + 4055
+						return ts + 4074
 					}
-					return ts + 1547
+					return ts + 1566
 				}(), z))
 			if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport == uintptr(0) {
 				(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
@@ -123384,7 +123463,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+26699,
+			ts+26765,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -123403,7 +123482,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+26744, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26810, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -123417,8 +123496,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 + 26776,
-		ts + 26830,
+		ts + 26842,
+		ts + 26896,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -123433,23 +123512,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+26878,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26944,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26923
+					return ts + 26989
 				}
-				return ts + 26931
+				return ts + 26997
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26940,
+				ts+27006,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26923
+						return ts + 26989
 					}
-					return ts + 26931
+					return ts + 26997
 				}(), iKey, iVal))
 		}
 	}
@@ -123473,7 +123552,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+26998, libc.VaList(bp, i, iCell, iNode))
+				ts+27064, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -123493,7 +123572,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+27046, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27112, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -123510,14 +123589,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+27113, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27179, 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+27147, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27213, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -123525,7 +123604,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+27177,
+					ts+27243,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -123554,14 +123633,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+27232,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27298,
 			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+27263, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27329, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -123583,12 +123662,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+14496, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14515, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27330, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27396, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -123597,12 +123676,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25150, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25216, 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+27358, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27424, 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)
 		}
@@ -123616,8 +123695,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+27389, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27455, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27462, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -123625,7 +123704,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+27404, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27470, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -123640,7 +123719,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27408, -1)
+			ts+27474, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -123648,7 +123727,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6434
+			zDb = ts + 6453
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -123658,7 +123737,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 + 18005
+				return ts + 18071
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -124029,11 +124108,11 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		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+27459, 1)
+		Xsqlite3_str_append(tls, x, ts+27525, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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+27527, 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+27472, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27538, 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)
 	}
@@ -124053,19 +124132,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+27483, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27549, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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)))))
+			Xsqlite3_str_appendf(tls, x, ts+27567, 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+27509, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27575, 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+27517, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27583, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27521, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27587, 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)
 	}
@@ -124985,7 +125064,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+27534, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27600, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -124994,7 +125073,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27556, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27622, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -125002,7 +125081,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26623, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26689, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -125013,7 +125092,7 @@ __5:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __7
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
 __7:
 	;
 __6:
@@ -125038,7 +125117,7 @@ __9:
 	if !(rc != 0) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	goto geopolyInit_fail
 __10:
 	;
@@ -125229,7 +125308,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 + 16260
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16279
 		(*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
@@ -125239,7 +125318,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 + 27560
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27626
 		(*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
@@ -125247,7 +125326,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 + 27566
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27632
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -125359,7 +125438,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27575, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27641, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -125491,14 +125570,14 @@ geopoly_update_end:
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
 	_ = pVtab
 	_ = nArg
-	if Xsqlite3_stricmp(tls, zName, ts+27615) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27681) == 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+27631) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27697) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -125563,7 +125642,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+27646, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27712, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -125575,25 +125654,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{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},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27720},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27733},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27746},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27759},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27697},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27771},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27681},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27794},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27808},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27821},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27835},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27851},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27797},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27863},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -125603,26 +125682,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27816, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27882, 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+27826, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27892, 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+27837, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27903, -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+27560, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27626, 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+27848, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27914, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -125676,7 +125755,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+25136, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25202, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -126003,7 +126082,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+27858, -1)
+		Xsqlite3_result_error(tls, context, ts+27924, -1)
 		return
 	}
 
@@ -126014,7 +126093,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+27858, -1)
+			Xsqlite3_result_error(tls, context, ts+27924, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -126027,7 +126106,7 @@ func prepareAndCollectError(tls *libc.TLS, db uintptr, ppStmt uintptr, pzErrmsg
 
 	var rc int32 = Xsqlite3_prepare_v2(tls, db, zSql, -1, ppStmt, uintptr(0))
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 		*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	}
 	return rc
@@ -126039,7 +126118,7 @@ func resetAndCollectError(tls *libc.TLS, pStmt uintptr, pzErrmsg uintptr) int32
 
 	var rc int32 = Xsqlite3_reset(tls, pStmt)
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
 	}
 	return rc
 }
@@ -126115,7 +126194,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+27879, uintptr(0), uintptr(0), p+64)
+				ts+27945, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -126179,7 +126258,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+25049, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25115, 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++ {
 				}
@@ -126200,16 +126279,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+28050, libc.VaList(bp, func() uintptr {
+			ts+28116, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28200
+					return ts + 28266
 				}
-				return ts + 1547
+				return ts + 1566
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28241)
+			ts+28307)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -126307,7 +126386,7 @@ func rbuFinalize(tls *libc.TLS, p uintptr, pStmt uintptr) {
 	var rc int32 = Xsqlite3_finalize(tls, pStmt)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && rc != SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 	}
 }
 
@@ -126325,7 +126404,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+28366, libc.VaList(bp, zTab)))
+			ts+28432, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -126343,7 +126422,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+28485, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28551, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -126361,7 +126440,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28506, libc.VaList(bp+16, zIdx)))
+			ts+28572, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -126384,7 +126463,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+28557, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28623, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -126430,7 +126509,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+28578, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28644, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -126445,7 +126524,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+28606, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28672, 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 {
@@ -126485,7 +126564,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+19482, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19548, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -126495,18 +126574,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+28635, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28701, 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+28654, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28720, 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+28659, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28725, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -126518,18 +126597,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+28669, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28735, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28698
+							return ts + 28764
 						}
-						return ts + 28711
+						return ts + 28777
 					}()))
 		}
 
 		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+28720, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28786, 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)
@@ -126543,7 +126622,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+28742,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28808,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -126586,12 +126665,12 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	defer tls.Free(24)
 
 	var zList uintptr = uintptr(0)
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	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+28769, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14607
+		zList = rbuMPrintf(tls, p, ts+28835, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14626
 	}
 	return zList
 }
@@ -126602,13 +126681,13 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 
 	var iPk int32 = 1
 	var zRet uintptr = uintptr(0)
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	for 1 != 0 {
 		var i int32
 		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+28778, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28844, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -126630,25 +126709,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+28791, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28857, 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+28823, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28889, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		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)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1566, ts+14626, ts+28912)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28918, ts+28925, ts+4969)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1566, ts+14626, ts+1566)
 
 		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+28867,
+					ts+28933,
 					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+28909, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28975, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -126685,12 +126764,12 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	zVector = uintptr(0)
 	zRet = uintptr(0)
 	bFailed = 0
-	zSep = ts + 1547
+	zSep = ts + 1566
 	iCol = 0
 	*(*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+28606, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28672, 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
@@ -126725,7 +126804,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 28929
+	zCol = ts + 28995
 __7:
 	;
 	goto __5
@@ -126733,13 +126812,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28937,
+	zLhs = rbuMPrintf(tls, p, ts+29003,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28958,
+	zOrder = rbuMPrintf(tls, p, ts+29024,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28994,
+	zSelect = rbuMPrintf(tls, p, ts+29060,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14607
+	zSep = ts + 14626
 	iCol++
 	goto __1
 __2:
@@ -126757,12 +126836,12 @@ __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+29021,
+		Xsqlite3_mprintf(tls, ts+29087,
 			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
 	}
-	zSep = ts + 1547
+	zSep = ts + 1566
 	iCol = 0
 __14:
 	if !(iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnCol) {
@@ -126784,8 +126863,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29069, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14607
+	zVector = rbuMPrintf(tls, p, ts+29135, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14626
 	goto __15
 __15:
 	iCol++
@@ -126796,7 +126875,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29142, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -126823,13 +126902,13 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 	var zImpPK uintptr = uintptr(0)
 	var zWhere uintptr = uintptr(0)
 	var nBind int32 = 0
-	var zCom uintptr = ts + 1547
-	var zAnd uintptr = ts + 1547
+	var zCom uintptr = ts + 1566
+	var zAnd uintptr = ts + 1566
 	*(*uintptr)(unsafe.Pointer(bp + 200)) = uintptr(0)
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28672, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -126841,9 +126920,9 @@ 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+29088, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29154, 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
+			zType = ts + 1566
 		} else {
 			if iCid < 0 {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK {
@@ -126853,37 +126932,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 + 28929
+					zCol = ts + 28995
 				} else {
-					zCol = ts + 28659
+					zCol = ts + 28725
 				}
-				zType = ts + 1112
+				zType = ts + 1131
 			} 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+29110, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29176, 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 + 28846
+					return ts + 28912
 				}
-				return ts + 1547
+				return ts + 1566
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29130,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29196,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29151,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29217,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29184, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29250, 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 + 14607
-		zAnd = ts + 21518
+		zCom = ts + 14626
+		zAnd = ts + 21584
 		nBind++
 	}
 
@@ -126917,16 +126996,16 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 
 	var zList uintptr = uintptr(0)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
-		var zS uintptr = ts + 1547
+		var zS uintptr = ts + 1566
 		var i int32
 		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+29208, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29274, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29220, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29286, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14607
+			zS = ts + 14626
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -126934,7 +127013,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+29229, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29295, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -126946,27 +127025,27 @@ 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+29244, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29310, 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 zSep uintptr = ts + 1566
 		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+29258, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21518
+				zList = rbuMPrintf(tls, p, ts+29324, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21584
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29270, libc.VaList(bp+40, zList))
+			ts+29336, libc.VaList(bp+40, zList))
 
 	} else {
-		var zSep uintptr = ts + 1547
+		var zSep uintptr = ts + 1566
 		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 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29320, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21518
+				zList = rbuMPrintf(tls, p, ts+29386, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21584
 			}
 		}
 	}
@@ -126975,7 +127054,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+29333, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29399, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -126989,21 +127068,21 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 		if int32(libc.Xstrlen(tls, zMask)) != (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 			rbuBadControlError(tls, p)
 		} else {
-			var zSep uintptr = ts + 1547
+			var zSep uintptr = ts + 1566
 			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+29320,
+					zList = rbuMPrintf(tls, p, ts+29386,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14607
+					zSep = ts + 14626
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29359,
+					zList = rbuMPrintf(tls, p, ts+29425,
 						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 + 14607
+					zSep = ts + 14626
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29389,
+					zList = rbuMPrintf(tls, p, ts+29455,
 						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 + 14607
+					zSep = ts + 14626
 				}
 			}
 		}
@@ -127038,19 +127117,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 + 29426
+		var zSep uintptr = ts + 29492
 		*(*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+28578, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28644, 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+16148) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16167) == 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+28606, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28672, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -127062,15 +127141,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 + 28846
+					zDesc = ts + 28912
 				} else {
-					zDesc = ts + 1547
+					zDesc = ts + 1566
 				}
-				z = rbuMPrintf(tls, p, ts+29439, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14607
+				z = rbuMPrintf(tls, p, ts+29505, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14626
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29450, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29516, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -127085,12 +127164,12 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		*(*uintptr)(unsafe.Pointer(bp + 168)) = uintptr(0)
 		var zIdx uintptr = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
-		var zComma uintptr = ts + 1547
+		var zComma uintptr = ts + 1566
 		var zCols uintptr = uintptr(0)
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29454)
+			ts+29520)
 		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))) {
@@ -127099,7 +127178,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+28606, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28672, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -127109,25 +127188,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+29504, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29570, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29526, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29592, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28846
+						return ts + 28912
 					}
-					return ts + 1547
+					return ts + 1566
 				}()))
-				zComma = ts + 14607
+				zComma = ts + 14626
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29536, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29602, 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+6434, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29551,
+			ts+29617,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 0, 0))
 	}
 }
 
@@ -127137,50 +127216,50 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
 		var tnum int32 = (*RbuObjIter)(unsafe.Pointer(pIter)).FiTnum
-		var zComma uintptr = ts + 1547
+		var zComma uintptr = ts + 1566
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
-			var zPk uintptr = ts + 1547
+			var zPk uintptr = ts + 1566
 			var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCol)*8))
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, (*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 + 29613
+				zPk = ts + 29679
 			}
-			zSql = rbuMPrintf(tls, p, ts+29626,
+			zSql = rbuMPrintf(tls, p, ts+29692,
 				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 + 29653
+							return ts + 29719
 						}
-						return ts + 1547
+						return ts + 1566
 					}()))
-			zComma = ts + 14607
+			zComma = ts + 14626
 		}
 
 		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+29663, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29729, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		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,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29736,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29702
+						return ts + 29768
 					}
-					return ts + 1547
+					return ts + 1566
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 0, 0))
 	}
 }
 
@@ -127193,7 +127272,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+29717,
+				ts+29783,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -127230,7 +127309,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+29774)
+			ts+29840)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -127335,7 +127414,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+29840, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29906, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -127355,24 +127434,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+6434, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29860,
+				ts+29926,
 				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+6434, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 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+29925, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29991, 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+29961, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+30027, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -127388,7 +127467,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29995,
+						ts+30061,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -127396,31 +127475,31 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 30056
+											return ts + 30122
 										}
-										return ts + 30060
+										return ts + 30126
 									}()
 								}
-								return ts + 1547
+								return ts + 1566
 							}(), zStart,
 							zCollist, zLimit))
 					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+30066,
+						ts+30132,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30127,
+						ts+30193,
 						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 + 30056
+									return ts + 30122
 								}
-								return ts + 30060
+								return ts + 30126
 							}(),
 							zCollist, zLimit))
 				}
@@ -127445,8 +127524,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+6445)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6441)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6464)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6460)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -127455,52 +127534,52 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			rbuCreateImposterTable2(tls, p, pIter)
 			zWrite = func() uintptr {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
-					return ts + 1547
+					return ts + 1566
 				}
-				return ts + 30286
+				return ts + 30352
 			}()
 
 			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+30295,
+						ts+30361,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30331
+								return ts + 30397
 							}
-							return ts + 1547
+							return ts + 1566
 						}(), zBindings)))
 			}
 
 			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+30341, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30407, 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
+				var zRbuRowid uintptr = ts + 1566
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30369
+					zRbuRowid = ts + 30435
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30381, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30447, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30457
+							return ts + 30523
 						}
-						return ts + 1547
+						return ts + 1566
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30474,
+					ts+30540,
 					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+30773,
+						ts+30839,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -127508,14 +127587,14 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-				var zRbuRowid uintptr = ts + 1547
+				var zRbuRowid uintptr = ts + 1566
 				var zStart uintptr = uintptr(0)
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30872
+						zRbuRowid = ts + 30938
 					} else {
-						zRbuRowid = ts + 30882
+						zRbuRowid = ts + 30948
 					}
 				}
 
@@ -127528,35 +127607,35 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28929, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28995, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14607, ts+1547)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1566, ts+14626, ts+1566)
 					}
 				}
 
 				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+30893,
+							ts+30959,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30941
+										return ts + 31007
 									}
-									return ts + 1547
+									return ts + 1566
 								}(),
 								zRbuRowid,
 								(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 									if zStart != 0 {
 										return zStart
 									}
-									return ts + 1547
+									return ts + 1566
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 22852
+										return ts + 22918
 									}
-									return ts + 1547
+									return ts + 1566
 								}(), zOrder,
 								zLimit)))
 				}
@@ -127619,12 +127698,12 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 		(*RbuObjIter)(unsafe.Pointer(pIter)).FpRbuUpdate = pUp
 
 		if zSet != 0 {
-			var zPrefix uintptr = ts + 1547
+			var zPrefix uintptr = ts + 1566
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30286
+				zPrefix = ts + 30352
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30947,
+			zUpdate = Xsqlite3_mprintf(tls, ts+31013,
 				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)
@@ -127651,7 +127730,7 @@ func rbuOpenDbhandle(tls *libc.TLS, p uintptr, zName uintptr, bUseVfs int32) uin
 			return uintptr(0)
 		}())
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
 			Xsqlite3_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 			*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 		}
@@ -127683,7 +127762,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+30977, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+31043, 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:
@@ -127753,28 +127832,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+6434, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453, 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+6434)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31007, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31073, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		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))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31101, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.Xmemcpy(tls, p+48, ts+3298, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+6434, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+6453, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31053, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31119, 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+6434, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -127807,11 +127886,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+31119, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31185, 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+24199, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24265, (*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)))) == '?' {
@@ -127823,16 +127902,16 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31151,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434),
+			zTarget = Xsqlite3_mprintf(tls, ts+31217,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453),
 					func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1547
+							return ts + 1566
 						}
-						return ts + 31183
+						return ts + 31249
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1547
+							return ts + 1566
 						}
 						return zExtra
 					}()))
@@ -127848,37 +127927,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+31185, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31251, -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+31200, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31266, 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+31217, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31283, -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+6434, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31233, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31299, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, 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+31261, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31327, 0)
 	}
 }
 
@@ -127907,14 +127986,14 @@ 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+31233, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31299, 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+31279, uintptr(0), uintptr(0), uintptr(0))
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31345, uintptr(0), uintptr(0), uintptr(0))
 		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
@@ -128023,7 +128102,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+6434, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6453, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -128040,23 +128119,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+31314, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31380, 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+6434)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453)
 	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+6434)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6453)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31339, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31405, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31412, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -128173,7 +128252,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+23837, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23903, 0)
 			return
 		}
 
@@ -128266,7 +128345,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+31353)
+			ts+31419)
 		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)
@@ -128274,7 +128353,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+31375, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31441, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -128295,7 +128374,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+31402,
+				ts+31468,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -128325,9 +128404,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+31560, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31626, 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+31575,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31641,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -128341,10 +128420,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+31595, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31661, 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+31620)
+			ts+31686)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128358,12 +128437,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+31728)
+			ts+31794)
 	}
 
 	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+31793)
+			ts+31859)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128375,7 +128454,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+31837, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31903, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -128395,15 +128474,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+17233)
-					rbuCopyPragma(tls, p, ts+16344)
+					rbuCopyPragma(tls, p, ts+17252)
+					rbuCopyPragma(tls, p, ts+16363)
 				}
 
 				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+31862, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31928, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -128427,10 +128506,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+14511, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14530, 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+14511, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14530, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -128525,7 +128604,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+31890, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31956, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -128541,10 +128620,10 @@ func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31339, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31405, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 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)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6453, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
@@ -128558,7 +128637,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+31915, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31981, 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)
@@ -128592,7 +128671,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+31926, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31992, 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 {
@@ -128622,13 +128701,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+31998, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32064, 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+32012)
+				ts+32078)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -128639,7 +128718,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+32069)
+				ts+32135)
 			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)
@@ -128684,7 +128763,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			libc.Xmemcpy(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, zRbu, nRbu+uint64(1))
 			pCsr += uintptr(nRbu + uint64(1))
 			if zState != 0 {
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3656, libc.VaList(bp, zState))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3675, libc.VaList(bp, zState))
 			}
 
 			rbuOpenDatabase(tls, p, uintptr(0), bp+16)
@@ -128713,7 +128792,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+32143, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32209, 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
@@ -128731,12 +128810,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+32175,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32241,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32207
+							return ts + 32273
 						}
-						return ts + 32214
+						return ts + 32280
 					}()))
 			}
 		}
@@ -128744,7 +128823,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+14496, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14515, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -128755,19 +128834,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+16947)
-						rbuCopyPragma(tls, p, ts+16359)
+						rbuCopyPragma(tls, p, ts+16966)
+						rbuCopyPragma(tls, p, ts+16378)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32221, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32287, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6434, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6453, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32237, uintptr(0), uintptr(0), p+64)
+								db, ts+32303, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -128821,7 +128900,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+32261, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32327, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -128848,7 +128927,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+30286, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30352, 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++
@@ -128865,7 +128944,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+14511, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14530, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -128878,13 +128957,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+14511, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14530, 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+32269, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32335, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -128979,7 +129058,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+14511, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14530, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128996,19 +129075,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+14511, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14530, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14496
+				zBegin = ts + 14515
 			} else {
-				zBegin = ts + 32221
+				zBegin = ts + 32287
 			}
 			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+32221, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32287, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -129354,7 +129433,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+32296, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32362, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -129379,7 +129458,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+32319, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32385, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -129524,7 +129603,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+6434)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6453)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -129539,7 +129618,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+32330, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32396, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -129784,6 +129863,970 @@ func Xsqlite3rbu_temp_size(tls *libc.TLS, pRbu uintptr) Sqlite3_int64 {
 	return (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FszTemp
 }
 
+var zDbstatSchema = *(*[258]int8)(unsafe.Pointer(ts + 32407))
+
+// Forward reference to data structured used in this module
+type StatTable1 = struct {
+	Fbase        Sqlite3_vtab
+	Fdb          uintptr
+	FiDb         int32
+	F__ccgo_pad1 [4]byte
+}
+
+// Forward reference to data structured used in this module
+type StatTable = StatTable1
+type StatCursor1 = struct {
+	Fbase        Sqlite3_vtab_cursor
+	FpStmt       uintptr
+	FisEof       U8
+	FisAgg       U8
+	F__ccgo_pad1 [2]byte
+	FiDb         int32
+	FaPage       [32]StatPage
+	FiPage       int32
+	FiPageno     U32
+	FzName       uintptr
+	FzPath       uintptr
+	FzPagetype   uintptr
+	FnPage       int32
+	FnCell       int32
+	FnMxPayload  int32
+	F__ccgo_pad2 [4]byte
+	FnUnused     I64
+	FnPayload    I64
+	FiOffset     I64
+	FszPage      I64
+}
+
+type StatCursor = StatCursor1
+type StatPage1 = struct {
+	FiPgno         U32
+	F__ccgo_pad1   [4]byte
+	FaPg           uintptr
+	FiCell         int32
+	F__ccgo_pad2   [4]byte
+	FzPath         uintptr
+	Fflags         U8
+	F__ccgo_pad3   [3]byte
+	FnCell         int32
+	FnUnused       int32
+	F__ccgo_pad4   [4]byte
+	FaCell         uintptr
+	FiRightChildPg U32
+	FnMxPayload    int32
+}
+
+type StatPage = StatPage1
+type StatCell1 = struct {
+	FnLocal      int32
+	FiChildPg    U32
+	FnOvfl       int32
+	F__ccgo_pad1 [4]byte
+	FaOvfl       uintptr
+	FnLastOvfl   int32
+	FiOvfl       int32
+}
+
+type StatCell = StatCell1
+
+func statConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var pTab uintptr = uintptr(0)
+	var rc int32 = SQLITE_OK
+	var iDb int32
+	_ = pAux
+
+	if argc >= 4 {
+		Xsqlite3TokenInit(tls, bp+8, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
+		iDb = Xsqlite3FindDb(tls, db, bp+8)
+		if iDb < 0 {
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+11883, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
+			return SQLITE_ERROR
+		}
+	} else {
+		iDb = 0
+	}
+	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_DIRECTONLY, 0)
+	rc = Xsqlite3_declare_vtab(tls, db, uintptr(unsafe.Pointer(&zDbstatSchema)))
+	if rc == SQLITE_OK {
+		pTab = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatTable{})))
+		if pTab == uintptr(0) {
+			rc = SQLITE_NOMEM
+		}
+	}
+
+	if rc == SQLITE_OK {
+		libc.Xmemset(tls, pTab, 0, uint64(unsafe.Sizeof(StatTable{})))
+		(*StatTable)(unsafe.Pointer(pTab)).Fdb = db
+		(*StatTable)(unsafe.Pointer(pTab)).FiDb = iDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
+	return rc
+}
+
+func statDisconnect(tls *libc.TLS, pVtab uintptr) int32 {
+	Xsqlite3_free(tls, pVtab)
+	return SQLITE_OK
+}
+
+func statBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
+	var i int32
+	var iSchema int32 = -1
+	var iName int32 = -1
+	var iAgg int32 = -1
+	_ = tab
+
+	for i = 0; i < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; i++ {
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fop) != SQLITE_INDEX_CONSTRAINT_EQ {
+			continue
+		}
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fusable) == 0 {
+			return SQLITE_CONSTRAINT
+		}
+		switch (*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(i)*12)).FiColumn {
+		case 0:
+			{
+				iName = i
+				break
+
+			}
+		case 10:
+			{
+				iSchema = i
+				break
+
+			}
+		case 11:
+			{
+				iAgg = i
+				break
+
+			}
+		}
+	}
+	i = 0
+	if iSchema >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).Fomit = uint8(1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x01
+	}
+	if iName >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iName)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x02
+	}
+	if iAgg >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iAgg)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x04
+	}
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 1.0
+
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy == 1 &&
+		(*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)).FnOrderBy == 2 &&
+		(*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_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).FiColumn == 1 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x08
+	}
+
+	return SQLITE_OK
+}
+
+func statOpen(tls *libc.TLS, pVTab uintptr, ppCursor uintptr) int32 {
+	var pTab uintptr = pVTab
+	var pCsr uintptr
+
+	pCsr = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatCursor{})))
+	if pCsr == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		libc.Xmemset(tls, pCsr, 0, uint64(unsafe.Sizeof(StatCursor{})))
+		(*StatCursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab = pVTab
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppCursor)) = pCsr
+	return SQLITE_OK
+}
+
+func statClearCells(tls *libc.TLS, p uintptr) {
+	var i int32
+	if (*StatPage)(unsafe.Pointer(p)).FaCell != 0 {
+		for i = 0; i < (*StatPage)(unsafe.Pointer(p)).FnCell; i++ {
+			Xsqlite3_free(tls, (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell+uintptr(i)*32)).FaOvfl)
+		}
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FaCell)
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnCell = 0
+	(*StatPage)(unsafe.Pointer(p)).FaCell = uintptr(0)
+}
+
+func statClearPage(tls *libc.TLS, p uintptr) {
+	var aPg uintptr = (*StatPage)(unsafe.Pointer(p)).FaPg
+	statClearCells(tls, p)
+	Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FzPath)
+	libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(StatPage{})))
+	(*StatPage)(unsafe.Pointer(p)).FaPg = aPg
+}
+
+func statResetCsr(tls *libc.TLS, pCsr uintptr) {
+	var i int32
+
+	for i = 0; i < int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{}))); i++ {
+		statClearPage(tls, pCsr+24+uintptr(i)*64)
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(pCsr+24+uintptr(i)*64)).FaPg)
+		(*StatPage)(unsafe.Pointer(pCsr + 24 + uintptr(i)*64)).FaPg = uintptr(0)
+	}
+	Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(0)
+}
+
+func statResetCounts(tls *libc.TLS, pCsr uintptr) {
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnCell = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnUnused = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPayload = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FszPage = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 0
+}
+
+func statClose(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	Xsqlite3_free(tls, pCsr)
+	return SQLITE_OK
+}
+
+func getLocalPayload(tls *libc.TLS, nUsable int32, flags U8, nTotal int32) int32 {
+	var nLocal int32
+	var nMinLocal int32
+	var nMaxLocal int32
+
+	if int32(flags) == 0x0D {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = nUsable - 35
+	} else {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = (nUsable-12)*64/255 - 23
+	}
+
+	nLocal = nMinLocal + (nTotal-nMinLocal)%(nUsable-4)
+	if nLocal > nMaxLocal {
+		nLocal = nMinLocal
+	}
+	return nLocal
+}
+
+func statDecodePage(tls *libc.TLS, pBt uintptr, p uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var nUnused int32
+	var iOff int32
+	var nHdr int32
+	var isLeaf int32
+	var szPage int32
+	var aData uintptr
+	var aHdr uintptr
+	var iNext int32
+
+	var rc int32
+	var iPrev U32
+
+	var j int32
+	var nOvfl int32
+
+	var nLocal int32
+	var pCell uintptr
+	var i int32
+	var nUsable int32
+	aData = (*StatPage)(unsafe.Pointer(p)).FaPg
+	aHdr = aData + uintptr(func() int32 {
+		if (*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1) {
+			return 100
+		}
+		return 0
+	}())
+
+	(*StatPage)(unsafe.Pointer(p)).Fflags = *(*U8)(unsafe.Pointer(aHdr))
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0A || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __1
+	}
+	isLeaf = 1
+	nHdr = 8
+	goto __2
+__1:
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05 || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x02) {
+		goto __3
+	}
+	isLeaf = 0
+	nHdr = 12
+	goto __4
+__3:
+	goto statPageIsCorrupt
+__4:
+	;
+__2:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1)) {
+		goto __5
+	}
+	nHdr = nHdr + 100
+__5:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnCell = int32(*(*U8)(unsafe.Pointer(aHdr + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 3 + 1)))
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = 0
+	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
+
+	nUnused = int32(*(*U8)(unsafe.Pointer(aHdr + 5)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 5 + 1))) - nHdr - 2*(*StatPage)(unsafe.Pointer(p)).FnCell
+	nUnused = nUnused + int32(*(*U8)(unsafe.Pointer(aHdr + 7)))
+	iOff = int32(*(*U8)(unsafe.Pointer(aHdr + 1)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 1 + 1)))
+__6:
+	if !(iOff != 0) {
+		goto __7
+	}
+	if !(iOff >= szPage) {
+		goto __8
+	}
+	goto statPageIsCorrupt
+__8:
+	;
+	nUnused = nUnused + (int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2) + 1))))
+	iNext = int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff) + 1)))
+	if !(iNext < iOff+4 && iNext > 0) {
+		goto __9
+	}
+	goto statPageIsCorrupt
+__9:
+	;
+	iOff = iNext
+	goto __6
+__7:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnUnused = nUnused
+	(*StatPage)(unsafe.Pointer(p)).FiRightChildPg = func() uint32 {
+		if isLeaf != 0 {
+			return uint32(0)
+		}
+		return Xsqlite3Get4byte(tls, aHdr+8)
+	}()
+
+	if !((*StatPage)(unsafe.Pointer(p)).FnCell != 0) {
+		goto __10
+	}
+
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = szPage - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatPage)(unsafe.Pointer(p)).FaCell = Xsqlite3_malloc64(tls, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+	if !((*StatPage)(unsafe.Pointer(p)).FaCell == uintptr(0)) {
+		goto __11
+	}
+	return SQLITE_NOMEM
+__11:
+	;
+	libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+
+	i = 0
+__12:
+	if !(i < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __14
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr(i)*32
+
+	iOff = int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2) + 1)))
+	if !(iOff < nHdr || iOff >= szPage) {
+		goto __15
+	}
+	goto statPageIsCorrupt
+__15:
+	;
+	if !!(isLeaf != 0) {
+		goto __16
+	}
+	(*StatCell)(unsafe.Pointer(pCell)).FiChildPg = Xsqlite3Get4byte(tls, aData+uintptr(iOff))
+	iOff = iOff + 4
+__16:
+	;
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05) {
+		goto __17
+	}
+
+	goto __18
+__17:
+	iOff = iOff + int32(func() uint8 {
+		if int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff)))) < int32(U8(0x80)) {
+			return uint8(func() int32 {
+				*(*U32)(unsafe.Pointer(bp)) = U32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))
+				return 1
+			}())
+		}
+		return Xsqlite3GetVarint32(tls, aData+uintptr(iOff), bp)
+	}())
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __19
+	}
+	iOff = iOff + int32(Xsqlite3GetVarint(tls, aData+uintptr(iOff), bp+8))
+__19:
+	;
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32((*StatPage)(unsafe.Pointer(p)).FnMxPayload)) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = int32(*(*U32)(unsafe.Pointer(bp)))
+__20:
+	;
+	nLocal = getLocalPayload(tls, nUsable, (*StatPage)(unsafe.Pointer(p)).Fflags, int32(*(*U32)(unsafe.Pointer(bp))))
+	if !(nLocal < 0) {
+		goto __21
+	}
+	goto statPageIsCorrupt
+__21:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLocal = nLocal
+
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32(nLocal)) {
+		goto __22
+	}
+	nOvfl = int32((*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) + U32(nUsable) - U32(4) - U32(1)) / U32(nUsable-4))
+	if !(iOff+nLocal+4 > nUsable || *(*U32)(unsafe.Pointer(bp)) > U32(0x7fffffff)) {
+		goto __23
+	}
+	goto statPageIsCorrupt
+__23:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl = int32(*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) - U32((nOvfl-1)*(nUsable-4)))
+	(*StatCell)(unsafe.Pointer(pCell)).FnOvfl = nOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FaOvfl = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(U32(0)))*uint64(nOvfl))
+	if !((*StatCell)(unsafe.Pointer(pCell)).FaOvfl == uintptr(0)) {
+		goto __24
+	}
+	return SQLITE_NOMEM
+__24:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl)) = Xsqlite3Get4byte(tls, aData+uintptr(iOff+nLocal))
+	j = 1
+__25:
+	if !(j < nOvfl) {
+		goto __27
+	}
+	iPrev = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j-1)*4))
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPrev, bp+16, 0)
+	if !(rc != SQLITE_OK) {
+		goto __28
+	}
+
+	return rc
+__28:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j)*4)) = Xsqlite3Get4byte(tls, Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 16))))
+	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
+	goto __26
+__26:
+	j++
+	goto __25
+	goto __27
+__27:
+	;
+__22:
+	;
+__18:
+	;
+	goto __13
+__13:
+	i++
+	goto __12
+	goto __14
+__14:
+	;
+__10:
+	;
+	return SQLITE_OK
+
+statPageIsCorrupt:
+	(*StatPage)(unsafe.Pointer(p)).Fflags = U8(0)
+	statClearCells(tls, p)
+	return SQLITE_OK
+}
+
+func statSizeAndOffset(tls *libc.TLS, pCsr uintptr) {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCsr)).FpVtab
+	var pBt uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatTable)(unsafe.Pointer(pTab)).FiDb)*32)).FpBt
+	var pPager uintptr = Xsqlite3BtreePager(tls, pBt)
+	var fd uintptr
+
+	fd = Xsqlite3PagerFile(tls, pPager)
+	*(*Sqlite3_int64)(unsafe.Pointer(bp)) = Sqlite3_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	if Xsqlite3OsFileControl(tls, fd, 230440, bp) == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = *(*Sqlite3_int64)(unsafe.Pointer(bp))
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += *(*Sqlite3_int64)(unsafe.Pointer(bp + 1*8))
+	} else {
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += I64(Xsqlite3BtreeGetPageSize(tls, pBt))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = (*StatCursor)(unsafe.Pointer(pCsr)).FszPage * I64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno-U32(1))
+	}
+}
+
+func statGetPage(tls *libc.TLS, pBt uintptr, iPg U32, pPg uintptr) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var pgsz int32 = Xsqlite3BtreeGetPageSize(tls, pBt)
+	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
+	var rc int32
+
+	if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+		(*StatPage)(unsafe.Pointer(pPg)).FaPg = Xsqlite3_malloc(tls, pgsz+DBSTAT_PAGE_PADDING_BYTES)
+		if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+			return SQLITE_NOMEM
+		}
+		libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0, uint64(DBSTAT_PAGE_PADDING_BYTES))
+	}
+
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPg, bp, 0)
+	if rc == SQLITE_OK {
+		var a uintptr = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		libc.Xmemcpy(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, a, uint64(pgsz))
+		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+	}
+
+	return rc
+}
+
+func statNext(tls *libc.TLS, pCursor uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
+	var rc int32
+	var nPayload int32
+	var z uintptr
+	var pCsr uintptr
+	var pTab uintptr
+	var pBt uintptr
+	var pPager uintptr
+
+	var iRoot U32
+	var nUsable int32
+	var iOvfl int32
+	var pCell uintptr
+
+	var p uintptr
+	var i int32
+	var p1 uintptr
+	pCsr = pCursor
+	pTab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	pBt = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FpBt
+	pPager = Xsqlite3BtreePager(tls, pBt)
+
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+
+statNextRestart:
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __1
+	}
+
+	statResetCounts(tls, pCsr)
+	rc = Xsqlite3_step(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	if !(rc == SQLITE_ROW) {
+		goto __3
+	}
+	iRoot = U32(Xsqlite3_column_int64(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 1))
+	Xsqlite3PagerPagecount(tls, pPager, bp+48)
+	if !(*(*int32)(unsafe.Pointer(bp + 48)) == 0) {
+		goto __5
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__5:
+	;
+	rc = statGetPage(tls, pBt, iRoot, pCsr+24)
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiPgno = iRoot
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __6
+	}
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32665, 0))
+	if !(z == uintptr(0)) {
+		goto __7
+	}
+	rc = SQLITE_NOMEM
+__7:
+	;
+__6:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 1
+	goto __4
+__3:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__4:
+	;
+	goto __2
+__1:
+	p = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __8
+	}
+	statResetCounts(tls, pCsr)
+__8:
+	;
+__9:
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __10
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32
+__11:
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl) {
+		goto __12
+	}
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = Xsqlite3BtreeGetPageSize(tls, pBt) - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	statSizeAndOffset(tls, pCsr)
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl-1) {
+		goto __13
+	}
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nUsable - 4)
+	goto __14
+__13:
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64((*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64(nUsable - 4 - (*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+__14:
+	;
+	iOvfl = (*StatCell)(unsafe.Pointer(pCell)).FiOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FiOvfl++
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __15
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(iOvfl)*4))
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32667
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls,
+		ts+32676, libc.VaList(bp, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell, iOvfl)))
+	if z == uintptr(0) {
+		return SQLITE_NOMEM
+	}
+	return SQLITE_OK
+__15:
+	;
+	goto __11
+__12:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiRightChildPg != 0) {
+		goto __16
+	}
+	goto __10
+__16:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+	goto __9
+__10:
+	;
+	if !(!(int32((*StatPage)(unsafe.Pointer(p)).FiRightChildPg) != 0) || (*StatPage)(unsafe.Pointer(p)).FiCell > (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __17
+	}
+	statClearPage(tls, p)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage--
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 && (*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __18
+	}
+
+	return SQLITE_OK
+__18:
+	;
+	goto statNextRestart
+__17:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage++
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage >= int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{})))) {
+		goto __19
+	}
+	statResetCsr(tls, pCsr)
+	return Xsqlite3CorruptError(tls, 215455)
+__19:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell == (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatPage)(unsafe.Pointer(p)).FiRightChildPg
+	goto __21
+__20:
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32)).FiChildPg
+__21:
+	;
+	rc = statGetPage(tls, pBt, (*StatPage)(unsafe.Pointer(p+1*64)).FiPgno, p+1*64)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __22
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32688, libc.VaList(bp+24, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell)))
+	if !(z == uintptr(0)) {
+		goto __23
+	}
+	rc = SQLITE_NOMEM
+__23:
+	;
+__22:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+__2:
+	;
+	if !(rc == SQLITE_OK) {
+		goto __24
+	}
+	p1 = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = (*StatPage)(unsafe.Pointer(p1)).FiPgno
+
+	rc = statDecodePage(tls, pBt, p1)
+	if !(rc == SQLITE_OK) {
+		goto __25
+	}
+	statSizeAndOffset(tls, pCsr)
+
+	switch int32((*StatPage)(unsafe.Pointer(p1)).Fflags) {
+	case 0x05:
+		goto __27
+	case 0x02:
+		goto __28
+	case 0x0D:
+		goto __29
+	case 0x0A:
+		goto __30
+	default:
+		goto __31
+	}
+	goto __26
+__27:
+__28:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32696
+	goto __26
+__29:
+__30:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32705
+	goto __26
+__31:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32710
+	goto __26
+__26:
+	;
+	*(*int32)(unsafe.Pointer(pCsr + 2108)) += (*StatPage)(unsafe.Pointer(p1)).FnCell
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64((*StatPage)(unsafe.Pointer(p1)).FnUnused)
+	if !((*StatPage)(unsafe.Pointer(p1)).FnMxPayload > (*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload) {
+		goto __32
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = (*StatPage)(unsafe.Pointer(p1)).FnMxPayload
+__32:
+	;
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __33
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+40, (*StatPage)(unsafe.Pointer(p1)).FzPath)))
+	if !(z == uintptr(0)) {
+		goto __34
+	}
+	rc = SQLITE_NOMEM
+__34:
+	;
+__33:
+	;
+	nPayload = 0
+	i = 0
+__35:
+	if !(i < (*StatPage)(unsafe.Pointer(p1)).FnCell) {
+		goto __37
+	}
+	nPayload = nPayload + (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p1)).FaCell+uintptr(i)*32)).FnLocal
+	goto __36
+__36:
+	i++
+	goto __35
+	goto __37
+__37:
+	;
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nPayload)
+
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0) {
+		goto __38
+	}
+	goto statNextRestart
+__38:
+	;
+__25:
+	;
+__24:
+	;
+	return rc
+}
+
+func statEof(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	return int32((*StatCursor)(unsafe.Pointer(pCsr)).FisEof)
+}
+
+func statFilter(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintptr, argc int32, argv uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pCsr uintptr = pCursor
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	var pSql uintptr
+	var zSql uintptr
+	var iArg int32 = 0
+	var rc int32 = SQLITE_OK
+	var zName uintptr = uintptr(0)
+	_ = argc
+	_ = idxStr
+
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FpStmt = uintptr(0)
+	if idxNum&0x01 != 0 {
+		var zDbase uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = Xsqlite3FindDbName(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zDbase)
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FiDb < 0 {
+			(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = 0
+			(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+			return SQLITE_OK
+		}
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+	if idxNum&0x02 != 0 {
+		zName = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+	}
+	if idxNum&0x04 != 0 {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(libc.Bool32(Xsqlite3_value_double(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8))) != 0.0))
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(0)
+	}
+	pSql = Xsqlite3_str_new(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb)
+	Xsqlite3_str_appendf(tls, pSql,
+		ts+32720,
+		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb+uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FzDbSName))
+	if zName != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32875, libc.VaList(bp+8, zName))
+	}
+	if idxNum&0x08 != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32889, 0)
+	}
+	zSql = Xsqlite3_str_finish(tls, pSql)
+	if zSql == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		rc = Xsqlite3_prepare_v2(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
+		Xsqlite3_free(tls, zSql)
+	}
+
+	if rc == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = -1
+		rc = statNext(tls, pCursor)
+	}
+	return rc
+}
+
+func statColumn(tls *libc.TLS, pCursor uintptr, ctx uintptr, i int32) int32 {
+	var pCsr uintptr = pCursor
+	switch i {
+	case 0:
+		Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzName, -1, libc.UintptrFromInt32(-1))
+		break
+	case 1:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath, -1, libc.UintptrFromInt32(-1))
+		}
+		break
+	case 2:
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnPage))
+		} else {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno))
+		}
+		break
+	case 3:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype, -1, uintptr(0))
+		}
+		break
+	case 4:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnCell))
+		break
+	case 5:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnPayload)
+		break
+	case 6:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnUnused)
+		break
+	case 7:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload))
+		break
+	case 8:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FiOffset)
+		}
+		break
+	case 9:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FszPage)
+		break
+	case 10:
+		{
+			var db uintptr = Xsqlite3_context_db_handle(tls, ctx)
+			var iDb int32 = (*StatCursor)(unsafe.Pointer(pCsr)).FiDb
+			Xsqlite3_result_text(tls, ctx, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, -1, uintptr(0))
+			break
+
+		}
+	default:
+		{
+			Xsqlite3_result_int(tls, ctx, int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg))
+			break
+
+		}
+	}
+	return SQLITE_OK
+}
+
+func statRowid(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32 {
+	var pCsr uintptr = pCursor
+	*(*Sqlite_int64)(unsafe.Pointer(pRowid)) = Sqlite_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	return SQLITE_OK
+}
+
+// Invoke this routine to register the "dbstat" virtual table module
+func Xsqlite3DbstatRegister(tls *libc.TLS, db uintptr) int32 {
+	return Xsqlite3_create_module(tls, db, ts+32904, uintptr(unsafe.Pointer(&dbstat_module)), uintptr(0))
+}
+
+var dbstat_module = Sqlite3_module{
+	FxCreate:     0,
+	FxConnect:    0,
+	FxBestIndex:  0,
+	FxDisconnect: 0,
+	FxDestroy:    0,
+	FxOpen:       0,
+	FxClose:      0,
+	FxFilter:     0,
+	FxNext:       0,
+	FxEof:        0,
+	FxColumn:     0,
+	FxRowid:      0,
+}
+
 type SessionTable1 = struct {
 	FpNext    uintptr
 	FzName    uintptr
@@ -130364,13 +131407,13 @@ 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+11341, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11360, 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+32341, 0)
+				ts+32911, 0)
 		} else if rc == SQLITE_ERROR {
-			zPragma = Xsqlite3_mprintf(tls, ts+1547, 0)
+			zPragma = Xsqlite3_mprintf(tls, ts+1566, 0)
 		} else {
 			*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
 			*(*uintptr)(unsafe.Pointer(pabPK)) = uintptr(0)
@@ -130381,7 +131424,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32462, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+33032, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -130479,7 +131522,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11341, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11360, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -130728,7 +131771,7 @@ __4:
 	goto error_out
 __7:
 	;
-	Xsqlite3ValueSetStr(tls, p, 0, ts+1547, uint8(0), uintptr(0))
+	Xsqlite3ValueSetStr(tls, p, 0, ts+1566, uint8(0), uintptr(0))
 	(*Sqlite3_session)(unsafe.Pointer(pSession)).FpZeroBlob = p
 __6:
 	;
@@ -131056,14 +132099,14 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	var zRet uintptr = uintptr(0)
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32491,
+			zRet = Xsqlite3_mprintf(tls, ts+33061,
 				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 + 21518
+			zSep = ts + 21584
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131078,7 +132121,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	var zRet uintptr = uintptr(0)
 	var bHave int32 = 0
 
@@ -131086,9 +132129,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+32525,
+				ts+33095,
 				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 + 32566
+			zSep = ts + 33136
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131096,7 +132139,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7523, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7531, 0)
 	}
 
 	return zRet
@@ -131107,7 +132150,7 @@ func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintpt
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32571,
+		ts+33141,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -131150,7 +132193,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32649,
+			ts+33219,
 			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
@@ -131277,7 +132320,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32702, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33272, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -131542,7 +132585,7 @@ func sessionAppendInteger(tls *libc.TLS, p uintptr, iVal int32, pRc uintptr) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
-	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]int8{}))-uint64(1)), bp+8, ts+4968, libc.VaList(bp, iVal))
+	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]int8{}))-uint64(1)), bp+8, ts+4987, libc.VaList(bp, iVal))
 	sessionAppendStr(tls, p, bp+8, pRc)
 }
 
@@ -131751,29 +132794,29 @@ 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+11341, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11360, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32729, libc.VaList(bp, zDb))
+			ts+33299, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
 	} else {
 		var i int32
-		var zSep uintptr = ts + 1547
+		var zSep uintptr = ts + 1566
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32839, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33409, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
-		sessionAppendStr(tls, bp+8, ts+1560, bp+24)
+		sessionAppendStr(tls, bp+8, ts+1579, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+32854, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33424, 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+32862, bp+24)
+				sessionAppendStr(tls, bp+8, ts+33432, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21518
+				zSep = ts + 21584
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -131882,7 +132925,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+32868, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33438, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -131974,7 +133017,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32888, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33458, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -132237,7 +133280,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, 219078)
+				rc = Xsqlite3CorruptError(tls, 219169)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -132260,7 +133303,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, 219098)
+						rc = Xsqlite3CorruptError(tls, 219189)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -132302,7 +133345,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, 219152)
+			rc = Xsqlite3CorruptError(tls, 219243)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -132363,7 +133406,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, 219240)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219331)
 		}
 	}
 
@@ -132437,13 +133480,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, 219326))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219417))
 	}
 
 	(*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, 219332))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219423))
 	}
 
 	if paRec != 0 {
@@ -132505,7 +133548,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, 219376))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219467))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -132878,7 +133921,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219832)
 	goto finished_invert
 __6:
 	;
@@ -133046,45 +134089,45 @@ 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+11341) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11360) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
 			} else {
-				var zSep uintptr = ts + 1547
+				var zSep uintptr = ts + 1566
 
 				libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(SessionBuffer{})))
 				(*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+32906, bp+16)
+				sessionAppendStr(tls, bp, ts+33476, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+32919, bp+16)
+				sessionAppendStr(tls, bp, ts+33489, 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+32925, bp+16)
+						sessionAppendStr(tls, bp, ts+33495, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 14607
+						zSep = ts + 14626
 					}
 				}
 
-				zSep = ts + 1547
-				sessionAppendStr(tls, bp, ts+32854, bp+16)
+				zSep = ts + 1566
+				sessionAppendStr(tls, bp, ts+33424, 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+32930, bp+16)
+								ts+33500, bp+16)
 						} else {
 							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+33432, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21518
+						zSep = ts + 21584
 					}
 				}
 
@@ -133131,42 +134174,42 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	defer tls.Free(20)
 
 	var i int32
-	var zSep uintptr = ts + 1547
+	var zSep uintptr = ts + 1566
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+33005, bp+16)
+	sessionAppendStr(tls, bp, ts+33575, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+32854, bp+16)
+	sessionAppendStr(tls, bp, ts+33424, 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+32925, bp+16)
+			sessionAppendStr(tls, bp, ts+33495, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21518
+			zSep = ts + 21584
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+33023, bp+16)
+		sessionAppendStr(tls, bp, ts+33593, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32566, bp+16)
+		sessionAppendStr(tls, bp, ts+33136, bp+16)
 
-		zSep = ts + 1547
+		zSep = ts + 1566
 		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+32862, bp+16)
+				sessionAppendStr(tls, bp, ts+33432, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 33031
+				zSep = ts + 33601
 			}
 		}
-		sessionAppendStr(tls, bp, ts+4950, bp+16)
+		sessionAppendStr(tls, bp, ts+4969, bp+16)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
@@ -133179,7 +134222,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+6434, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6453, 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 {
@@ -133190,21 +134233,21 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+33036, bp+16)
+	sessionAppendStr(tls, bp, ts+33606, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21524, bp+16)
+	sessionAppendStr(tls, bp, ts+21590, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14607, bp+16)
+			sessionAppendStr(tls, bp, ts+14626, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+33054, bp+16)
+	sessionAppendStr(tls, bp, ts+33624, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33065, bp+16)
+		sessionAppendStr(tls, bp, ts+33635, bp+16)
 	}
-	sessionAppendStr(tls, bp, ts+4950, bp+16)
+	sessionAppendStr(tls, bp, ts+4969, bp+16)
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v2(tls, db, (*SessionBuffer)(unsafe.Pointer(bp)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp)).FnBuf, p+16, uintptr(0))
@@ -133218,14 +134261,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+11341, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11360, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+33069)
+			ts+33639)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33182)
+			ts+33752)
 	}
 	return rc
 }
@@ -133253,7 +134296,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, 220219)
+				rc = Xsqlite3CorruptError(tls, 220310)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -133506,7 +134549,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+33326, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33896, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -133522,7 +134565,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+33347, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33917, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -133595,10 +134638,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+33366, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33936, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33392, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33962, 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))
@@ -133631,7 +134674,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				f func(*libc.TLS, uintptr, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xFilter})).f(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 176))))
 			if schemaMismatch != 0 {
-				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
+				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
 				if *(*uintptr)(unsafe.Pointer(bp + 200)) == uintptr(0) {
 					rc = SQLITE_NOMEM
 					break
@@ -133644,7 +134687,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+6434, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6453, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -133657,19 +134700,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+33422, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33992, 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+33466,
+						ts+34036,
 						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+33537, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+34107, 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+11341) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11360) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -133720,14 +134763,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33597, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34167, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33627, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34197, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33651, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33627, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34221, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34197, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -134975,7 +136018,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33679, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+34249, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135263,7 +136306,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33707, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+34277, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135450,7 +136493,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+33738, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34308, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -135518,7 +136561,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33745
+		var zErr uintptr = ts + 34315
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135677,7 +136720,7 @@ func fts5ValueToText(tls *libc.TLS, pVal uintptr) uintptr {
 	if zRet != 0 {
 		return zRet
 	}
-	return ts + 1547
+	return ts + 1566
 }
 
 func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, nVal int32, apVal uintptr) {
@@ -135700,7 +136743,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33795
+		var zErr uintptr = ts + 34365
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -136024,13 +137067,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33843, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34413, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33851, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34421, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33861, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34431, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -136441,7 +137484,7 @@ func fts5ConfigSkipLiteral(tls *libc.TLS, pIn uintptr) uintptr {
 	case 'n':
 		fallthrough
 	case 'N':
-		if Xsqlite3_strnicmp(tls, ts+6174, p, 4) == 0 {
+		if Xsqlite3_strnicmp(tls, ts+6193, p, 4) == 0 {
 			p = p + 4
 		} else {
 			p = uintptr(0)
@@ -136581,7 +137624,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+33866, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34436, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -136608,14 +137651,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+33873, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34443, 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+33904, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+34474, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136626,7 +137669,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33937, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34507, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136639,7 +137682,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33974, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34544, 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)))
@@ -136648,7 +137691,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+33983, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34553, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -136667,7 +137710,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34016, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34586, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -136682,14 +137725,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34050, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34620, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34058, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34628, 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+34090, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34660, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -136697,9 +137740,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34096, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34666, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34110, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34680, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -136707,9 +137750,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34148, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34718, 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+34159, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34729, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -136717,21 +137760,21 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+5068, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+5087, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 8019, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17338},
-			{FzName: ts + 34194, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8038, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17357},
+			{FzName: ts + 34764, 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+34202, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34772, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34233, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34803, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -136778,15 +137821,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+22184) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16260) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34261, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22250) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16279) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34831, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34291) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34861) {
 			*(*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+34301, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34871, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -136803,13 +137846,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+34332, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34902, 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+34337, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34907, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34344, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34914, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -136847,8 +137890,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+22184) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34352, 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+22250) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34922, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -136880,7 +137923,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+34381, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34951, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -136889,13 +137932,13 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 							if *(*uintptr)(unsafe.Pointer(bp + 48)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 48))
 							}
-							return ts + 1547
+							return ts + 1566
 						}(),
 						func() uintptr {
 							if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 64))
 							}
-							return ts + 1547
+							return ts + 1566
 						}(),
 						pzErr)
 				} else {
@@ -136917,19 +137960,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 + 34050
+			zTail = ts + 34620
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34401
+			zTail = ts + 34971
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34409, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34979, 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+16260, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16279, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -136973,18 +138016,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+34420, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34990, 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 + 1566
 			}
-			return ts + 14607
+			return ts + 14626
 		}()
-		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+35006, 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+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22184))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35013,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22250))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -137094,7 +138137,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34469) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35039) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -137104,7 +138147,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+34474) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35044) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -137114,7 +138157,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+34483) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35053) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -137127,7 +138170,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+34493) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35063) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -137137,7 +138180,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+34503) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35073) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -137153,7 +138196,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+22184) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22250) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -137176,7 +138219,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34515
+	var zSelect uintptr = ts + 35085
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -137198,7 +138241,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+34547) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35117) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -137212,7 +138255,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+34555,
+				ts+35125,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -137310,7 +138353,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34620, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+35190, 0)
 					return FTS5_EOF
 				}
 			}
@@ -137323,20 +138366,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+34640, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+35210, 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+34671, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35241, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34674, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35244, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30056, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30122, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -139114,9 +140157,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+34678, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35248, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33707, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+34277, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -139132,7 +140175,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+34683, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+35253, 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')
@@ -139219,7 +140262,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20521, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20587, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -139300,7 +140343,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+34712, 0)
+			ts+35282, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -139470,12 +140513,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+34765,
+								ts+35335,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34815
+										return ts + 35385
 									}
-									return ts + 34678
+									return ts + 35248
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -140418,7 +141461,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+34822, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35392, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -140497,7 +141540,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+34828,
+			ts+35398,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -140522,7 +141565,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+34879,
+			ts+35449,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -140545,7 +141588,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+34928,
+			ts+35498,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -140784,7 +141827,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+34968, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+35538, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -141983,7 +143026,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+34991,
+			ts+35561,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -143176,7 +144219,7 @@ func fts5WriteFlushBtree(tls *libc.TLS, p uintptr, pWriter uintptr) {
 			if (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn > 0 {
 				return (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fp
 			}
-			return ts + 1547
+			return ts + 1566
 		}()
 
 		Xsqlite3_bind_blob(tls, (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter, 2, z, (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn, uintptr(0))
@@ -143449,7 +144492,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+35075,
+			ts+35645,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -144515,7 +145558,7 @@ func sqlite3Fts5IndexReinit(tls *libc.TLS, p uintptr) int32 {
 	fts5StructureInvalidate(tls, p)
 	fts5IndexDiscardData(tls, p)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Fts5Structure{})))
-	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1547, 0)
+	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1566, 0)
 	fts5StructureWrite(tls, p, bp)
 	return fts5IndexReturn(tls, p)
 }
@@ -144531,13 +145574,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+35132, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35702, 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+25049, ts+35140, 0, pzErr)
+				pConfig, ts+25115, ts+35710, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11481,
-					ts+35175,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11500,
+					ts+35745,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -144790,7 +145833,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+34822, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+35392, 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)))
@@ -144904,7 +145947,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35219,
+		ts+35789,
 		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))) {
@@ -145074,7 +146117,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+35305)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35875)
 			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))
@@ -145345,7 +146388,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+35310, 0)
+			ts+35880, 0)
 		return SQLITE_ERROR
 	}
 
@@ -145376,7 +146419,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 				} else if iCol >= 0 {
 					bSeenMatch = 1
 					*(*int8)(unsafe.Pointer(idxStr + uintptr(libc.PostIncInt32(&iIdxStr, 1)))) = int8('M')
-					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4968, libc.VaList(bp, iCol))
+					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4987, libc.VaList(bp, iCol))
 					idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 
 				}
@@ -145391,7 +146434,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 					}
 					return int8('G')
 				}()
-				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4968, libc.VaList(bp+8, iCol))
+				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4987, libc.VaList(bp+8, iCol))
 				idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 				(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pInfo)).FaConstraintUsage + uintptr(i)*8)).FargvIndex = libc.PreIncInt32(&iCons, 1)
 
@@ -145705,7 +146748,7 @@ func fts5NextMethod(tls *libc.TLS, pCursor uintptr) int32 {
 					rc = Xsqlite3_reset(tls, (*Fts5Cursor)(unsafe.Pointer(pCsr)).FpStmt)
 					if rc != SQLITE_OK {
 						(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-							ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+							ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 					}
 				} else {
 					rc = SQLITE_OK
@@ -145737,7 +146780,7 @@ func fts5PrepareStatement(tls *libc.TLS, ppStmt uintptr, pConfig uintptr, zFmt u
 		rc = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
 			uint32(SQLITE_PREPARE_PERSISTENT), bp+8, uintptr(0))
 		if rc != SQLITE_OK {
-			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 		}
 		Xsqlite3_free(tls, zSql)
 	}
@@ -145769,25 +146812,25 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35349,
+		ts+35919,
 		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 + 14607
+					return ts + 14626
 				}
-				return ts + 1547
+				return ts + 1566
 			}(),
 			func() uintptr {
 				if zRankArgs != 0 {
 					return zRankArgs
 				}
-				return ts + 1547
+				return ts + 1566
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35404
+					return ts + 35974
 				}
-				return ts + 35409
+				return ts + 35979
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -145833,12 +146876,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+35413, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35983, 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) {
+	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5069, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35419, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35989, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -145869,7 +146912,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+35447, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36017, 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,
@@ -145900,7 +146943,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+35457, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36027, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -145932,14 +146975,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+35478, libc.VaList(bp, z))
+				ts+36048, 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 + 33861
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34431
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -145995,7 +147038,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+35310, 0)
+		ts+35880, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -146038,7 +147081,7 @@ __8:
 	if !(zText == uintptr(0)) {
 		goto __14
 	}
-	zText = ts + 1547
+	zText = ts + 1566
 __14:
 	;
 	iCol = 0
@@ -146212,7 +147255,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35511, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+36081, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -146333,7 +147376,7 @@ func fts5SeekCursor(tls *libc.TLS, pCsr uintptr, bErrormsg int32) int32 {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			} else if (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg != 0 {
 				*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-					ts+3656, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
+					ts+3675, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
 			}
 		}
 	}
@@ -146357,28 +147400,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+35547, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36117, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35558, 0)
+				ts+36128, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35638, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36208, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35646, 0)
+				ts+36216, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16927, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16946, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35702, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36272, 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+35708, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36278, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -146436,7 +147479,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+17472, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17491, 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)))
@@ -146449,12 +147492,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+35724,
+				ts+36294,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20422
+						return ts + 20488
 					}
-					return ts + 35761
+					return ts + 36331
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -147084,7 +148127,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+35773, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36343, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -147328,7 +148371,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+35794, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36364, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -147347,7 +148390,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+35816, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36386, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -147394,7 +148437,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+35847)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36417)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -147403,7 +148446,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+35860, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+36430, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -147417,7 +148460,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35951, ts + 34050, ts + 25049, ts + 34401, ts + 11481,
+	ts + 36521, ts + 34620, ts + 25115, ts + 34971, ts + 11500,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -147441,7 +148484,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+35958, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+36528, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -147459,13 +148502,13 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35958, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36528, 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+35963, 0,
+				db, ts+36533, 0,
 				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
 				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
@@ -147522,17 +148565,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 + 35978,
-			ts + 36046,
-			ts + 36115,
-			ts + 36148,
-			ts + 36187,
-			ts + 36227,
-			ts + 36266,
-			ts + 36307,
-			ts + 36346,
-			ts + 36388,
-			ts + 36428,
+			ts + 36548,
+			ts + 36616,
+			ts + 36685,
+			ts + 36718,
+			ts + 36757,
+			ts + 36797,
+			ts + 36836,
+			ts + 36877,
+			ts + 36916,
+			ts + 36958,
+			ts + 36998,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -147599,7 +148642,7 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 			(*Fts5Config)(unsafe.Pointer((*Fts5Storage)(unsafe.Pointer(p)).FpConfig)).FbLock--
 			Xsqlite3_free(tls, zSql)
 			if rc != SQLITE_OK && pzErrMsg != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3656, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3675, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
 			}
 		}
 	}
@@ -147634,18 +148677,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+36451,
+		ts+37021,
 		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+36555,
+			ts+37125,
 			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+36593,
+			ts+37163,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -147657,7 +148700,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+36631,
+			ts+37201,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -147669,14 +148712,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+25049, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11481, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35951, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25115, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11500, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+36521, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34401, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34971, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34050, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34620, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -147688,17 +148731,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+36673,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37243,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29702
+					return ts + 29768
 				}
-				return ts + 1547
+				return ts + 1566
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36703,
+			ts+37273,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -147735,27 +148778,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36747, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37317, 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+36770, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37340, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34050, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34620, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34401, ts+36776, 0, pzErr)
+				pConfig, ts+34971, ts+37346, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35951, ts+36808, 1, pzErr)
+				pConfig, ts+36521, ts+37378, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34547, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35117, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -147961,12 +149004,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+36825,
+		ts+37395,
 		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+36875,
+			ts+37445,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -147974,7 +149017,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+34547, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35117, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -148150,7 +149193,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36904,
+	zSql = Xsqlite3_mprintf(tls, ts+37474,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -148332,14 +149375,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+34050, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34620, 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+34401, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34971, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -148534,9 +149577,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+36936) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37506) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36947) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37517) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -148751,7 +149794,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 + 36958
+			var zCat uintptr = ts + 37528
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -148763,7 +149806,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+36967) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37537) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -148774,18 +149817,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+36978) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37548) {
 					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+36936) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37506) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36947) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37517) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36967) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37537) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -149061,7 +150104,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 + 36996
+	var zBase uintptr = ts + 37566
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -149203,7 +150246,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+37006, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37576, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149211,11 +150254,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37009, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37579, 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+37014, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37584, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149223,7 +150266,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37019, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37589, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149231,7 +150274,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37022, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37592, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149239,11 +150282,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37595, 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+37030, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37600, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149251,19 +150294,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37035, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37605, 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+37039, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37609, 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+37045, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37615, 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+37050, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37620, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149271,11 +150314,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37054, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37624, 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+37058, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37628, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149283,7 +150326,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37631, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149291,11 +150334,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37635, 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+37069, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37639, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149303,7 +150346,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37073, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37643, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149311,7 +150354,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37077, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37647, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149319,7 +150362,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37081, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37651, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149335,24 +150378,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+37085, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37065, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37655, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37635, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37658, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37661, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37665, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37651, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -149367,137 +150410,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+37098, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37668, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37065, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37635, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37106, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37676, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37113, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37683, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37118, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37688, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37014, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37584, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37123, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37693, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37009, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37579, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37128, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37698, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37081, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37651, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37133, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37703, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15473, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15492, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37138, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37708, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37091, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37661, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37142, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37712, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37006, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37576, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37147, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37717, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37050, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37620, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37153, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37723, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37157, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37727, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37159, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37729, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37073, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37643, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37165, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37735, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37081, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37651, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37173, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37743, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37065, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37635, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37179, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37749, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37065, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37635, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37184, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37754, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37576, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37190, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37760, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37077, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37647, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37198, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37768, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37206, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37776, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37210, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37780, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37073, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37643, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37218, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37788, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37576, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37224, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37794, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37077, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37647, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37230, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37800, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37091, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37661, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -149512,16 +150555,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+37237, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37807, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37022, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37592, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37242, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37812, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149529,21 +150572,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37247, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37817, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37022, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37592, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37253, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37823, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37022, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37592, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37206, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37776, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149551,7 +150594,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37259, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37829, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -149559,9 +150602,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37265, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37835, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37576, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -149576,12 +150619,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+37271, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37841, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37275, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37845, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37278, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37848, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -149590,7 +150633,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37281, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37851, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -149746,7 +150789,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+37285) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37855) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -149926,22 +150969,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36996, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37566, 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 + 37300, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37870, 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 + 37306, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37876, 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 + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37883, 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
@@ -151084,14 +152127,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+37321) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37891) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37325) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37895) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37329) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37899) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37338, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37908, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -151117,19 +152160,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 + 37372,
-		ts + 37412,
-		ts + 37447,
+		ts + 37942,
+		ts + 37982,
+		ts + 38017,
 	}
 
 	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+23345, *(*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+23411, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37490, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38060, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -151262,11 +152305,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+37523, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+38093, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37554,
+		ts+38124,
 		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))
@@ -151290,7 +152333,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+37605, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38175, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -151574,7 +152617,7 @@ func fts5VocabFilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, zUnused
 		if pLe != 0 {
 			var zCopy uintptr = Xsqlite3_value_text(tls, pLe)
 			if zCopy == uintptr(0) {
-				zCopy = ts + 1547
+				zCopy = ts + 1566
 			}
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm = Xsqlite3_value_bytes(tls, pLe)
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FzLeTerm = Xsqlite3_malloc(tls, (*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm+1)
@@ -151685,7 +152728,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+37631, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+38201, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -151707,7 +152750,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 + 37641
+	return ts + 38211
 }
 
 func init() {
@@ -152130,6 +153173,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1056)) = noopStepFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1064)) = uintptr(unsafe.Pointer(&lagName))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&attach_func)) + 24)) = attachFunc
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 8)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 16)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 24)) = statBestIndex
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 32)) = statDisconnect
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 40)) = statDisconnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 48)) = statOpen
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 56)) = statClose
+	*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 64)) = statFilter
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 72)) = statNext
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 80)) = statEof
+	*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 88)) = statColumn
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 96)) = statRowid
 	*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 0)) = sqlite3MemMalloc
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 8)) = sqlite3MemFree
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 16)) = sqlite3MemRealloc
@@ -152662,8 +153717,9 @@ func init() {
 	*(*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
-	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = Xsqlite3JsonTableFunctions
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = Xsqlite3DbstatRegister
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = sqlite3TestExtInit
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 32)) = Xsqlite3JsonTableFunctions
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statGetFuncdef)) + 24)) = statGet
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statInitFuncdef)) + 24)) = statInit
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statPushFuncdef)) + 24)) = statPush
@@ -152681,5 +153737,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-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 ts1 = "3.41.2\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-14.0.5\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_DBSTAT_VTAB\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\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\x00true\x00false\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 \x00rowid not at end-of-record for row \x00 of 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\x00CREATE TABLE x( name       TEXT, path       TEXT, pageno     INTEGER, pagetype   TEXT, ncell      INTEGER, payload    INTEGER, unused     INTEGER, mx_payload INTEGER, pgoffset   INTEGER, pgsize     INTEGER, schema     TEXT HIDDEN, aggregate  BOOLEAN HIDDEN)\x00/\x00overflow\x00%s%.3x+%.6x\x00%s%.3x/\x00internal\x00leaf\x00corrupted\x00SELECT * FROM (SELECT 'sqlite_schema' AS name,1 AS rootpage,'table' AS type UNION ALL SELECT name,rootpage,type FROM \"%w\".sqlite_schema WHERE rootpage!=0)\x00WHERE name=%Q\x00 ORDER BY name\x00dbstat\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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 bffbc040..80ae8dd9 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -208,6 +208,7 @@ const (
 	DBFLAG_SchemaKnownOk                  = 0x0010
 	DBFLAG_Vacuum                         = 0x0004
 	DBFLAG_VacuumInto                     = 0x0008
+	DBSTAT_PAGE_PADDING_BYTES             = 256
 	DB_ResetWanted                        = 0x0008
 	DB_SchemaLoaded                       = 0x0001
 	DB_UnresetViews                       = 0x0002
@@ -920,11 +921,11 @@ const (
 	NC_OrderAgg                           = 0x8000000
 	NC_PartIdx                            = 0x000002
 	NC_SelfRef                            = 0x00002e
+	NC_Subquery                           = 0x000040
 	NC_UAggInfo                           = 0x000100
 	NC_UBaseReg                           = 0x000400
 	NC_UEList                             = 0x000080
 	NC_UUpsert                            = 0x000200
-	NC_VarSelect                          = 0x000040
 	NDEBUG                                = 1
 	NN                                    = 1
 	NOT_WITHIN                            = 0
@@ -1765,6 +1766,7 @@ const (
 	SQLITE_ECEL_REF                       = 0x04
 	SQLITE_EMPTY                          = 16
 	SQLITE_ENABLE_COLUMN_METADATA         = 1
+	SQLITE_ENABLE_DBSTAT_VTAB             = 1
 	SQLITE_ENABLE_FTS5                    = 1
 	SQLITE_ENABLE_GEOPOLY                 = 1
 	SQLITE_ENABLE_LOCKING_STYLE           = 0
@@ -2166,7 +2168,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
+	SQLITE_SOURCE_ID                      = "2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2274,8 +2276,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.41.0"
-	SQLITE_VERSION_NUMBER                 = 3041000
+	SQLITE_VERSION                        = "3.41.2"
+	SQLITE_VERSION_NUMBER                 = 3041002
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -6087,7 +6089,8 @@ type IndexedExpr1 = struct {
 	FiIdxCur       int32
 	FiIdxCol       int32
 	FbMaybeNullRow U8
-	F__ccgo_pad1   [3]byte
+	Faff           U8
+	F__ccgo_pad1   [2]byte
 	FpIENext       uintptr
 }
 
@@ -6708,17 +6711,18 @@ type Pager = Pager1
 
 // Handle type for pages.
 type PgHdr2 = struct {
-	FpPage      uintptr
-	FpData      uintptr
-	FpExtra     uintptr
-	FpCache     uintptr
-	FpDirty     uintptr
-	FpPager     uintptr
-	Fpgno       Pgno
-	Fflags      U16
-	FnRef       I16
-	FpDirtyNext uintptr
-	FpDirtyPrev uintptr
+	FpPage       uintptr
+	FpData       uintptr
+	FpExtra      uintptr
+	FpCache      uintptr
+	FpDirty      uintptr
+	FpPager      uintptr
+	Fpgno        Pgno
+	Fflags       U16
+	F__ccgo_pad1 [2]byte
+	FnRef        I64
+	FpDirtyNext  uintptr
+	FpDirtyPrev  uintptr
 }
 
 // Handle type for pages.
@@ -6925,7 +6929,7 @@ type PCache2 = struct {
 	FpDirty      uintptr
 	FpDirtyTail  uintptr
 	FpSynced     uintptr
-	FnRefSum     int32
+	FnRefSum     I64
 	FszCache     int32
 	FszSpill     int32
 	FszPage      int32
@@ -7179,7 +7183,7 @@ type CoveringIndexCheck1 = struct {
 	F__ccgo_pad1 [2]byte
 }
 
-var sqlite3azCompileOpt = [52]uintptr{
+var sqlite3azCompileOpt = [53]uintptr{
 	ts + 7,
 	ts + 27,
 	ts + 56,
@@ -7198,40 +7202,41 @@ var sqlite3azCompileOpt = [52]uintptr{
 	ts + 372,
 	ts + 397,
 	ts + 420,
-	ts + 432,
-	ts + 447,
-	ts + 469,
-	ts + 494,
-	ts + 517,
-	ts + 539,
-	ts + 550,
-	ts + 563,
-	ts + 578,
-	ts + 594,
-	ts + 607,
-	ts + 628,
-	ts + 652,
-	ts + 675,
-	ts + 691,
-	ts + 707,
-	ts + 731,
-	ts + 758,
-	ts + 778,
-	ts + 799,
-	ts + 821,
-	ts + 851,
-	ts + 876,
-	ts + 902,
-	ts + 922,
-	ts + 948,
-	ts + 971,
-	ts + 997,
-	ts + 1019,
-	ts + 1040,
-	ts + 1051,
+	ts + 439,
+	ts + 451,
+	ts + 466,
+	ts + 488,
+	ts + 513,
+	ts + 536,
+	ts + 558,
+	ts + 569,
+	ts + 582,
+	ts + 597,
+	ts + 613,
+	ts + 626,
+	ts + 647,
+	ts + 671,
+	ts + 694,
+	ts + 710,
+	ts + 726,
+	ts + 750,
+	ts + 777,
+	ts + 797,
+	ts + 818,
+	ts + 840,
+	ts + 870,
+	ts + 895,
+	ts + 921,
+	ts + 941,
+	ts + 967,
+	ts + 990,
+	ts + 1016,
+	ts + 1038,
 	ts + 1059,
-	ts + 1073,
-	ts + 1086,
+	ts + 1070,
+	ts + 1078,
+	ts + 1092,
+	ts + 1105,
 }
 
 func Xsqlite3CompileOptions(tls *libc.TLS, pnOpt uintptr) uintptr {
@@ -7383,7 +7388,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 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))
+var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1118))
 
 // Standard typenames.  These names must match the COLTYPE_* definitions.
 // Adjust the SQLITE_N_STDTYPE value if adding or removing entries.
@@ -7405,12 +7410,12 @@ var Xsqlite3StdTypeAffinity = [6]int8{
 	int8(SQLITE_AFF_TEXT),
 }
 var Xsqlite3StdType = [6]uintptr{
-	ts + 1106,
-	ts + 1110,
-	ts + 1115,
-	ts + 1119,
-	ts + 1127,
-	ts + 1132,
+	ts + 1125,
+	ts + 1129,
+	ts + 1134,
+	ts + 1138,
+	ts + 1146,
+	ts + 1151,
 }
 
 // SQL is translated into a sequence of instructions to be
@@ -7724,7 +7729,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, 23229)
+		return Xsqlite3MisuseError(tls, 23233)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -8149,7 +8154,7 @@ __6:
 __4:
 	;
 	zDate++
-	if !(getDigits(tls, zDate, ts+1137, libc.VaList(bp, bp+16, bp+20)) != 2) {
+	if !(getDigits(tls, zDate, ts+1156, libc.VaList(bp, bp+16, bp+20)) != 2) {
 		goto __9
 	}
 	return 1
@@ -8175,13 +8180,13 @@ func parseHhMmSs(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	defer tls.Free(36)
 
 	var ms float64 = 0.0
-	if getDigits(tls, zDate, ts+1145, libc.VaList(bp, bp+24, bp+28)) != 2 {
+	if getDigits(tls, zDate, ts+1164, libc.VaList(bp, bp+24, bp+28)) != 2 {
 		return 1
 	}
 	zDate += uintptr(5)
 	if int32(*(*int8)(unsafe.Pointer(zDate))) == ':' {
 		zDate++
-		if getDigits(tls, zDate, ts+1153, libc.VaList(bp+16, bp+32)) != 1 {
+		if getDigits(tls, zDate, ts+1172, libc.VaList(bp+16, bp+32)) != 1 {
 			return 1
 		}
 		zDate += uintptr(2)
@@ -8279,7 +8284,7 @@ func parseYyyyMmDd(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	} else {
 		neg = 0
 	}
-	if getDigits(tls, zDate, ts+1157, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
+	if getDigits(tls, zDate, ts+1176, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
 		return 1
 	}
 	zDate += uintptr(10)
@@ -8336,7 +8341,7 @@ func parseDateOrTime(tls *libc.TLS, context uintptr, zDate uintptr, p uintptr) i
 		return 0
 	} else if parseHhMmSs(tls, zDate, p) == 0 {
 		return 0
-	} else if Xsqlite3StrICmp(tls, zDate, ts+1169) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
+	} else if Xsqlite3StrICmp(tls, zDate, ts+1188) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
 		return setDateTimeToCurrent(tls, context, p)
 	} else if Xsqlite3AtoF(tls, zDate, bp, Xsqlite3Strlen30(tls, zDate), uint8(SQLITE_UTF8)) > 0 {
 		setRawDateNumber(tls, p, *(*float64)(unsafe.Pointer(bp)))
@@ -8469,7 +8474,7 @@ func toLocaltime(tls *libc.TLS, p uintptr, pCtx uintptr) int32 {
 		*(*Time_t)(unsafe.Pointer(bp + 92)) = Time_t((*DateTime)(unsafe.Pointer(p)).FiJD/int64(1000) - int64(21086676)*int64(10000))
 	}
 	if osLocaltime(tls, bp+92, bp) != 0 {
-		Xsqlite3_result_error(tls, pCtx, ts+1173, -1)
+		Xsqlite3_result_error(tls, pCtx, ts+1192, -1)
 		return SQLITE_ERROR
 	}
 	(*DateTime)(unsafe.Pointer(p)).FY = (*tm)(unsafe.Pointer(bp)).Ftm_year + 1900 - iYearDiff
@@ -8493,12 +8498,12 @@ var aXformType = [6]struct {
 	FrLimit float32
 	FrXform float32
 }{
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1196)), FrLimit: 4.6427e+14, FrXform: 1.0},
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1203)), FrLimit: 7.7379e+12, FrXform: 60.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1210)), FrLimit: 1.2897e+11, FrXform: 3600.0},
-	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1217)), FrLimit: 5373485.0, FrXform: 86400.0},
-	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1224)), FrLimit: 176546.0, FrXform: 2592000.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1231)), FrLimit: 14713.0, FrXform: 31536000.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1215)), FrLimit: 4.6427e+14, FrXform: 1.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1222)), FrLimit: 7.7379e+12, FrXform: 60.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1229)), FrLimit: 1.2897e+11, FrXform: 3600.0},
+	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1236)), FrLimit: 5373485.0, FrXform: 86400.0},
+	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1243)), FrLimit: 176546.0, FrXform: 2592000.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1250)), FrLimit: 14713.0, FrXform: 31536000.0},
 }
 
 func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, idx int32) int32 {
@@ -8510,7 +8515,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 	switch int32(Xsqlite3UpperToLower[U8(*(*int8)(unsafe.Pointer(z)))]) {
 	case 'a':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1238) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1257) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8532,7 +8537,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'j':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1243) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1262) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8546,7 +8551,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'l':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1253) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1272) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				rc = toLocaltime(tls, p, pCtx)
 			}
 			break
@@ -8554,7 +8559,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'u':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1263) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1282) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8566,7 +8571,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 					rc = 0
 				}
-			} else if Xsqlite3_stricmp(tls, z, ts+1273) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1292) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				if int32((*DateTime)(unsafe.Pointer(p)).FtzSet) == 0 {
 					var iOrigJD I64
 					var iGuess I64
@@ -8600,7 +8605,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'w':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1277, 8) == 0 &&
+			if Xsqlite3_strnicmp(tls, z, ts+1296, 8) == 0 &&
 				Xsqlite3AtoF(tls, z+8, bp+48, Xsqlite3Strlen30(tls, z+8), uint8(SQLITE_UTF8)) > 0 &&
 				*(*float64)(unsafe.Pointer(bp + 48)) >= 0.0 && *(*float64)(unsafe.Pointer(bp + 48)) < 7.0 && float64(libc.AssignInt32(&n, int32(*(*float64)(unsafe.Pointer(bp + 48))))) == *(*float64)(unsafe.Pointer(bp + 48)) {
 				var Z Sqlite3_int64
@@ -8621,7 +8626,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 's':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1286, 9) != 0 {
+			if Xsqlite3_strnicmp(tls, z, ts+1305, 9) != 0 {
 				break
 			}
 			if !(int32((*DateTime)(unsafe.Pointer(p)).FvalidJD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidYMD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidHMS) != 0) {
@@ -8635,14 +8640,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 			(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidTZ = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidJD = int8(0)
-			if Xsqlite3_stricmp(tls, z, ts+1296) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1315) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1302) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1321) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FM = 1
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1307) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1326) == 0 {
 				rc = 0
 			}
 			break
@@ -8968,7 +8973,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		switch int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) {
 		case 'd':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
 				break
 
 			}
@@ -8978,13 +8983,13 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if s > 59.999 {
 					s = 59.999
 				}
-				Xsqlite3_str_appendf(tls, bp+136, ts+1316, libc.VaList(bp+8, s))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1335, libc.VaList(bp+8, s))
 				break
 
 			}
 		case 'H':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
 				break
 
 			}
@@ -9002,41 +9007,41 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) == 'W' {
 					var wd int32
 					wd = int32(((*DateTime)(unsafe.Pointer(bp+88)).FiJD + int64(43200000)) / int64(86400000) % int64(7))
-					Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+24, (nDay+7-wd)/7))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+24, (nDay+7-wd)/7))
 				} else {
-					Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+32, nDay+1))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1342, libc.VaList(bp+32, nDay+1))
 				}
 				break
 
 			}
 		case 'J':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1328, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1347, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
 				break
 
 			}
 		case 'm':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
 				break
 
 			}
 		case 'M':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
 				break
 
 			}
 		case 's':
 			{
 				var iS I64 = (*DateTime)(unsafe.Pointer(bp+88)).FiJD/int64(1000) - int64(21086676)*int64(10000)
-				Xsqlite3_str_appendf(tls, bp+136, ts+1334, libc.VaList(bp+64, iS))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1353, libc.VaList(bp+64, iS))
 				break
 
 			}
 		case 'S':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
 				break
 
 			}
@@ -9049,7 +9054,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			}
 		case 'Y':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1339, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1358, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
 				break
 
 			}
@@ -9099,15 +9104,15 @@ func Xsqlite3RegisterDateTimeFunctions(tls *libc.TLS) {
 }
 
 var aDateTimeFuncs = [9]FuncDef{
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1243},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1263},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1344},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1349},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1354},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1262},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1282},
 	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1363},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1372},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1385},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1403}}
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1368},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1373},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1382},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1391},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1404},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1422}}
 
 // The following routines are convenience wrappers around methods
 // of the sqlite3_file object.  This is mostly just syntactic sugar. All
@@ -9522,7 +9527,7 @@ func sqlite3MemMalloc(tls *libc.TLS, nByte int32) uintptr {
 		*(*Sqlite3_int64)(unsafe.Pointer(p)) = Sqlite3_int64(nByte)
 		p += 8
 	} else {
-		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1416, libc.VaList(bp, nByte))
+		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1435, libc.VaList(bp, nByte))
 	}
 	return p
 }
@@ -9555,7 +9560,7 @@ func sqlite3MemRealloc(tls *libc.TLS, pPrior uintptr, nByte int32) uintptr {
 		p += 8
 	} else {
 		Xsqlite3_log(tls, SQLITE_NOMEM,
-			ts+1454,
+			ts+1473,
 			libc.VaList(bp, sqlite3MemSize(tls, pPrior), nByte))
 	}
 	return p
@@ -10430,7 +10435,7 @@ func Xsqlite3OomFault(tls *libc.TLS, db uintptr) uintptr {
 		(*Sqlite3)(unsafe.Pointer(db)).Flookaside.Fsz = U16(0)
 		if (*Sqlite3)(unsafe.Pointer(db)).FpParse != 0 {
 			var pParse uintptr
-			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1490, 0)
+			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1509, 0)
 			(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 			for pParse = (*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).FpOuterParse; pParse != 0; pParse = (*Parse)(unsafe.Pointer(pParse)).FpOuterParse {
 				(*Parse)(unsafe.Pointer(pParse)).FnErr++
@@ -10503,8 +10508,8 @@ type et_info = struct {
 // by an instance of the following structure
 type Et_info = et_info
 
-var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1504))
-var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1537))
+var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1523))
+var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1556))
 var fmtinfo = [23]Et_info{
 	{Ffmttype: int8('d'), Fbase: EtByte(10), Fflags: EtByte(1), Ftype: EtByte(EtDECIMAL)},
 	{Ffmttype: int8('s'), Fflags: EtByte(4), Ftype: EtByte(EtSTRING)},
@@ -10718,7 +10723,7 @@ __6:
 	if !(libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(libc.PreIncUintptr(&fmt, 1))))) == 0) {
 		goto __11
 	}
-	Xsqlite3_str_append(tls, pAccum, ts+1544, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1563, 1)
 	goto __5
 __11:
 	;
@@ -11275,7 +11280,7 @@ __125:
 	if !(Xsqlite3IsNaN(tls, *(*float64)(unsafe.Pointer(bp + 104))) != 0) {
 		goto __127
 	}
-	bufpt = ts + 1546
+	bufpt = ts + 1565
 	length = 3
 	goto __58
 __127:
@@ -11335,7 +11340,7 @@ __138:
 	}
 	bufpt = bp + 16
 	*(*int8)(unsafe.Pointer(bp + 16)) = prefix
-	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1550, uint32(4))
+	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1569, uint32(4))
 	length = 3 + libc.Bool32(int32(prefix) != 0)
 	goto __58
 __139:
@@ -11701,7 +11706,7 @@ __200:
 	if !(bufpt == uintptr(0)) {
 		goto __201
 	}
-	bufpt = ts + 1554
+	bufpt = ts + 1573
 	goto __202
 __201:
 	if !(int32(xtype) == EtDYNSTRING) {
@@ -11825,9 +11830,9 @@ __222:
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
-			return ts + 1555
+			return ts + 1574
 		}
-		return ts + 1560
+		return ts + 1579
 	}()
 __223:
 	;
@@ -11975,7 +11980,7 @@ __246:
 		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
-	Xsqlite3_str_append(tls, pAccum, ts+1567, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1586, 1)
 __250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
@@ -11992,10 +11997,10 @@ __251:
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
 		goto __253
 	}
-	Xsqlite3_str_appendf(tls, pAccum, ts+1569, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1588, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 	goto __254
 __253:
-	Xsqlite3_str_appendf(tls, pAccum, ts+1579, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1598, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
 __254:
 	;
 __252:
@@ -12050,7 +12055,7 @@ __4:
 __5:
 }
 
-var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1593))
+var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1612))
 
 // The z string points to the first character of a token that is
 // associated with an error.  If db does not already have an error
@@ -12215,7 +12220,7 @@ func Xsqlite3ResultStrAccum(tls *libc.TLS, pCtx uintptr, p uintptr) {
 	} else if int32((*StrAccum)(unsafe.Pointer(p)).FprintfFlags)&SQLITE_PRINTF_MALLOCED != 0 {
 		Xsqlite3_result_text(tls, pCtx, (*StrAccum)(unsafe.Pointer(p)).FzText, int32((*StrAccum)(unsafe.Pointer(p)).FnChar), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 	} else {
-		Xsqlite3_result_text(tls, pCtx, ts+1554, 0, uintptr(0))
+		Xsqlite3_result_text(tls, pCtx, ts+1573, 0, uintptr(0))
 		Xsqlite3_str_reset(tls, p)
 	}
 }
@@ -13941,7 +13946,7 @@ func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
 	var c int32 = 0
 	var i int32
 
-	var pow63 uintptr = ts + 1602
+	var pow63 uintptr = ts + 1621
 	for i = 0; c == 0 && i < 18; i++ {
 		c = (int32(*(*int8)(unsafe.Pointer(zNum + uintptr(i*incr)))) - int32(*(*int8)(unsafe.Pointer(pow63 + uintptr(i))))) * 10
 	}
@@ -14492,7 +14497,7 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 	defer tls.Free(8)
 
 	Xsqlite3_log(tls, SQLITE_MISUSE,
-		ts+1621,
+		ts+1640,
 		libc.VaList(bp, zType))
 }
 
@@ -14511,13 +14516,13 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 func Xsqlite3SafetyCheckOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	if db == uintptr(0) {
-		logBadConnection(tls, ts+1555)
+		logBadConnection(tls, ts+1574)
 		return 0
 	}
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_OPEN {
 		if Xsqlite3SafetyCheckSickOrOk(tls, db) != 0 {
-			logBadConnection(tls, ts+1666)
+			logBadConnection(tls, ts+1685)
 		}
 		return 0
 	} else {
@@ -14530,7 +14535,7 @@ func Xsqlite3SafetyCheckSickOrOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_SICK && int32(eOpenState) != SQLITE_STATE_OPEN && int32(eOpenState) != SQLITE_STATE_BUSY {
-		logBadConnection(tls, ts+1675)
+		logBadConnection(tls, ts+1694)
 		return 0
 	} else {
 		return 1
@@ -15004,193 +15009,193 @@ func Xsqlite3OpcodeName(tls *libc.TLS, i int32) uintptr {
 }
 
 var azName = [187]uintptr{
-	ts + 1683,
-	ts + 1693,
-	ts + 1704,
-	ts + 1716,
-	ts + 1727,
-	ts + 1739,
+	ts + 1702,
+	ts + 1712,
+	ts + 1723,
+	ts + 1735,
 	ts + 1746,
-	ts + 1754,
-	ts + 1762,
-	ts + 1767,
-	ts + 1772,
-	ts + 1778,
-	ts + 1792,
-	ts + 1798,
-	ts + 1808,
-	ts + 1813,
-	ts + 1818,
-	ts + 1821,
+	ts + 1758,
+	ts + 1765,
+	ts + 1773,
+	ts + 1781,
+	ts + 1786,
+	ts + 1791,
+	ts + 1797,
+	ts + 1811,
+	ts + 1817,
 	ts + 1827,
-	ts + 1834,
-	ts + 1838,
-	ts + 1848,
-	ts + 1855,
-	ts + 1862,
-	ts + 1869,
-	ts + 1876,
-	ts + 1886,
+	ts + 1832,
+	ts + 1837,
+	ts + 1840,
+	ts + 1846,
+	ts + 1853,
+	ts + 1857,
+	ts + 1867,
+	ts + 1874,
+	ts + 1881,
+	ts + 1888,
 	ts + 1895,
-	ts + 1906,
-	ts + 1915,
-	ts + 1921,
-	ts + 1931,
-	ts + 1941,
-	ts + 1946,
-	ts + 1956,
-	ts + 1967,
-	ts + 1972,
-	ts + 1979,
-	ts + 1990,
-	ts + 1995,
-	ts + 2000,
-	ts + 2006,
-	ts + 2012,
-	ts + 2018,
-	ts + 2021,
+	ts + 1905,
+	ts + 1914,
+	ts + 1925,
+	ts + 1934,
+	ts + 1940,
+	ts + 1950,
+	ts + 1960,
+	ts + 1965,
+	ts + 1975,
+	ts + 1986,
+	ts + 1991,
+	ts + 1998,
+	ts + 2009,
+	ts + 2014,
+	ts + 2019,
 	ts + 2025,
 	ts + 2031,
-	ts + 2042,
-	ts + 2053,
+	ts + 2037,
+	ts + 2040,
+	ts + 2044,
+	ts + 2050,
 	ts + 2061,
-	ts + 2070,
-	ts + 2077,
-	ts + 2085,
-	ts + 2088,
-	ts + 2091,
-	ts + 2094,
-	ts + 2097,
-	ts + 2100,
-	ts + 2103,
+	ts + 2072,
+	ts + 2080,
+	ts + 2089,
+	ts + 2096,
+	ts + 2104,
+	ts + 2107,
 	ts + 2110,
+	ts + 2113,
 	ts + 2116,
-	ts + 2126,
-	ts + 2139,
-	ts + 2150,
-	ts + 2156,
-	ts + 2163,
-	ts + 2172,
-	ts + 2181,
-	ts + 2188,
-	ts + 2201,
-	ts + 2212,
-	ts + 2217,
-	ts + 2225,
+	ts + 2119,
+	ts + 2122,
+	ts + 2129,
+	ts + 2135,
+	ts + 2145,
+	ts + 2158,
+	ts + 2169,
+	ts + 2175,
+	ts + 2182,
+	ts + 2191,
+	ts + 2200,
+	ts + 2207,
+	ts + 2220,
 	ts + 2231,
-	ts + 2238,
+	ts + 2236,
+	ts + 2244,
 	ts + 2250,
-	ts + 2255,
-	ts + 2264,
+	ts + 2257,
 	ts + 2269,
-	ts + 2278,
+	ts + 2274,
 	ts + 2283,
 	ts + 2288,
-	ts + 2294,
+	ts + 2297,
 	ts + 2302,
-	ts + 2310,
-	ts + 2320,
-	ts + 2328,
-	ts + 2335,
-	ts + 2348,
-	ts + 2353,
-	ts + 2365,
-	ts + 2373,
-	ts + 2380,
-	ts + 2391,
-	ts + 2398,
-	ts + 2405,
-	ts + 2415,
+	ts + 2307,
+	ts + 2313,
+	ts + 2321,
+	ts + 2329,
+	ts + 2339,
+	ts + 2347,
+	ts + 2354,
+	ts + 2367,
+	ts + 2372,
+	ts + 2384,
+	ts + 2392,
+	ts + 2399,
+	ts + 2410,
+	ts + 2417,
 	ts + 2424,
-	ts + 2435,
-	ts + 2441,
-	ts + 2452,
-	ts + 2462,
-	ts + 2472,
-	ts + 2479,
-	ts + 2485,
-	ts + 2495,
-	ts + 2506,
-	ts + 2510,
-	ts + 2519,
-	ts + 2528,
-	ts + 2535,
-	ts + 2545,
-	ts + 2552,
-	ts + 2561,
+	ts + 2434,
+	ts + 2443,
+	ts + 2454,
+	ts + 2460,
+	ts + 2471,
+	ts + 2481,
+	ts + 2491,
+	ts + 2498,
+	ts + 2504,
+	ts + 2514,
+	ts + 2525,
+	ts + 2529,
+	ts + 2538,
+	ts + 2547,
+	ts + 2554,
+	ts + 2564,
 	ts + 2571,
-	ts + 2578,
-	ts + 2586,
-	ts + 2600,
-	ts + 2608,
-	ts + 2622,
-	ts + 2633,
-	ts + 2646,
-	ts + 2657,
-	ts + 2663,
-	ts + 2675,
-	ts + 2684,
-	ts + 2692,
-	ts + 2701,
-	ts + 2710,
-	ts + 2717,
-	ts + 2725,
-	ts + 2732,
-	ts + 2743,
-	ts + 2757,
-	ts + 2768,
+	ts + 2580,
+	ts + 2590,
+	ts + 2597,
+	ts + 2605,
+	ts + 2619,
+	ts + 2627,
+	ts + 2641,
+	ts + 2652,
+	ts + 2665,
+	ts + 2676,
+	ts + 2682,
+	ts + 2694,
+	ts + 2703,
+	ts + 2711,
+	ts + 2720,
+	ts + 2729,
+	ts + 2736,
+	ts + 2744,
+	ts + 2751,
+	ts + 2762,
 	ts + 2776,
-	ts + 2782,
-	ts + 2790,
-	ts + 2798,
-	ts + 2808,
-	ts + 2821,
-	ts + 2831,
-	ts + 2844,
-	ts + 2853,
-	ts + 2864,
+	ts + 2787,
+	ts + 2795,
+	ts + 2801,
+	ts + 2809,
+	ts + 2817,
+	ts + 2827,
+	ts + 2840,
+	ts + 2850,
+	ts + 2863,
 	ts + 2872,
-	ts + 2878,
-	ts + 2890,
-	ts + 2902,
-	ts + 2910,
-	ts + 2922,
-	ts + 2935,
-	ts + 2945,
-	ts + 2955,
-	ts + 2960,
-	ts + 2972,
-	ts + 2984,
-	ts + 2994,
-	ts + 3000,
-	ts + 3010,
-	ts + 3017,
+	ts + 2883,
+	ts + 2891,
+	ts + 2897,
+	ts + 2909,
+	ts + 2921,
+	ts + 2929,
+	ts + 2941,
+	ts + 2954,
+	ts + 2964,
+	ts + 2974,
+	ts + 2979,
+	ts + 2991,
+	ts + 3003,
+	ts + 3013,
+	ts + 3019,
 	ts + 3029,
-	ts + 3040,
+	ts + 3036,
 	ts + 3048,
-	ts + 3057,
-	ts + 3066,
-	ts + 3075,
-	ts + 3082,
-	ts + 3093,
-	ts + 3106,
-	ts + 3116,
-	ts + 3123,
-	ts + 3131,
-	ts + 3140,
-	ts + 3146,
-	ts + 3154,
-	ts + 3162,
-	ts + 3170,
-	ts + 3180,
+	ts + 3059,
+	ts + 3067,
+	ts + 3076,
+	ts + 3085,
+	ts + 3094,
+	ts + 3101,
+	ts + 3112,
+	ts + 3125,
+	ts + 3135,
+	ts + 3142,
+	ts + 3150,
+	ts + 3159,
+	ts + 3165,
+	ts + 3173,
+	ts + 3181,
 	ts + 3189,
-	ts + 3200,
-	ts + 3210,
-	ts + 3216,
-	ts + 3227,
-	ts + 3238,
-	ts + 3243,
-	ts + 3251,
+	ts + 3199,
+	ts + 3208,
+	ts + 3219,
+	ts + 3229,
+	ts + 3235,
+	ts + 3246,
+	ts + 3257,
+	ts + 3262,
+	ts + 3270,
 }
 
 type stat = struct {
@@ -15556,35 +15561,35 @@ type unix_syscall = struct {
 }
 
 var aSyscall = [29]unix_syscall{
-	{FzName: ts + 3261, FpCurrent: 0},
-	{FzName: ts + 3266, FpCurrent: 0},
-	{FzName: ts + 3272, FpCurrent: 0},
-	{FzName: ts + 3279, FpCurrent: 0},
-	{FzName: ts + 3286, FpCurrent: 0},
+	{FzName: ts + 3280, FpCurrent: 0},
+	{FzName: ts + 3285, FpCurrent: 0},
 	{FzName: ts + 3291, FpCurrent: 0},
-	{FzName: ts + 3297, FpCurrent: 0},
-	{FzName: ts + 3307, FpCurrent: 0},
-	{FzName: ts + 3313, FpCurrent: 0},
-	{FzName: ts + 3318},
-	{FzName: ts + 3324},
+	{FzName: ts + 3298, FpCurrent: 0},
+	{FzName: ts + 3305, FpCurrent: 0},
+	{FzName: ts + 3310, FpCurrent: 0},
+	{FzName: ts + 3316, FpCurrent: 0},
+	{FzName: ts + 3326, FpCurrent: 0},
 	{FzName: ts + 3332, FpCurrent: 0},
-	{FzName: ts + 3338},
-	{FzName: ts + 3345},
-	{FzName: ts + 3354, FpCurrent: 0},
-	{FzName: ts + 3361},
-	{FzName: ts + 3371, FpCurrent: 0},
-	{FzName: ts + 3378, FpCurrent: 0},
-	{FzName: ts + 3392, FpCurrent: 0},
-	{FzName: ts + 3398, FpCurrent: 0},
-	{FzName: ts + 3404, FpCurrent: 0},
+	{FzName: ts + 3337},
+	{FzName: ts + 3343},
+	{FzName: ts + 3351, FpCurrent: 0},
+	{FzName: ts + 3357},
+	{FzName: ts + 3364},
+	{FzName: ts + 3373, FpCurrent: 0},
+	{FzName: ts + 3380},
+	{FzName: ts + 3390, FpCurrent: 0},
+	{FzName: ts + 3397, FpCurrent: 0},
 	{FzName: ts + 3411, FpCurrent: 0},
-	{FzName: ts + 3419, FpCurrent: 0},
-	{FzName: ts + 3424, FpCurrent: 0},
-	{FzName: ts + 3431, FpCurrent: 0},
+	{FzName: ts + 3417, FpCurrent: 0},
+	{FzName: ts + 3423, FpCurrent: 0},
+	{FzName: ts + 3430, FpCurrent: 0},
 	{FzName: ts + 3438, FpCurrent: 0},
+	{FzName: ts + 3443, FpCurrent: 0},
 	{FzName: ts + 3450, FpCurrent: 0},
-	{FzName: ts + 3459, FpCurrent: 0},
-	{FzName: ts + 3465},
+	{FzName: ts + 3457, FpCurrent: 0},
+	{FzName: ts + 3469, FpCurrent: 0},
+	{FzName: ts + 3478, FpCurrent: 0},
+	{FzName: ts + 3484},
 }
 
 func robustFchown(tls *libc.TLS, fd int32, uid Uid_t, gid Gid_t) int32 {
@@ -15682,9 +15687,9 @@ func robust_open(tls *libc.TLS, z uintptr, f int32, m Mode_t) int32 {
 		}
 		(*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*12 + 4)))(tls, fd)
 		Xsqlite3_log(tls, SQLITE_WARNING,
-			ts+3471, libc.VaList(bp, z, fd))
+			ts+3490, libc.VaList(bp, z, fd))
 		fd = -1
-		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 4)))(tls, ts+3514, O_RDONLY, int32(m)) < 0 {
+		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 4)))(tls, ts+3533, O_RDONLY, int32(m)) < 0 {
 			break
 		}
 	}
@@ -15763,13 +15768,13 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 	var zErr uintptr
 	var iErrno int32 = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 
-	zErr = ts + 1554
+	zErr = ts + 1573
 
 	if zPath == uintptr(0) {
-		zPath = ts + 1554
+		zPath = ts + 1573
 	}
 	Xsqlite3_log(tls, errcode,
-		ts+3524,
+		ts+3543,
 		libc.VaList(bp, iLine, iErrno, zFunc, zPath, zErr))
 
 	return errcode
@@ -15777,7 +15782,7 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 
 func robust_close(tls *libc.TLS, pFile uintptr, h int32, lineno int32) {
 	if (*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*12 + 4)))(tls, h) != 0 {
-		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3266,
+		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3285,
 			func() uintptr {
 				if pFile != 0 {
 					return (*UnixFile)(unsafe.Pointer(pFile)).FzPath
@@ -15798,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, 38271)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38275)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -15900,19 +15905,19 @@ func verifyDbFile(tls *libc.TLS, pFile uintptr) {
 
 	rc = (*(*func(*libc.TLS, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 5*12 + 4)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, bp+32)
 	if rc != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3555, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3574, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink == X__nlink_t(0) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3579, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3598, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink > X__nlink_t(1) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3608, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3627, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if fileHasMoved(tls, pFile) != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3635, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3654, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 }
@@ -16275,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, 39055)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39059)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -16548,7 +16553,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	var ii int32
 	var fd int32 = -1
 
-	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3663, libc.VaList(bp, zFilename))
+	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3682, libc.VaList(bp, zFilename))
 	for ii = int32(libc.Xstrlen(tls, bp+8)); ii > 0 && int32(*(*int8)(unsafe.Pointer(bp + 8 + uintptr(ii)))) != '/'; ii-- {
 	}
 	if ii > 0 {
@@ -16566,7 +16571,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3378, bp+8, 40676)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40680), ts+3397, bp+8, 40680)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -16583,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, 40717)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3685, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40721)
 	}
 
 	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)), 40731)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40735)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -16610,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, 40762)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3316, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40766)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -16665,7 +16670,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 				if iWrite >= nSize {
 					iWrite = nSize - int64(1)
 				}
-				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1554, 1)
+				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1573, 1)
 				if nWrite != 1 {
 					return SQLITE_IOERR | int32(3)<<8
 				}
@@ -16678,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, 40883)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3316, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40887)
 			}
 		}
 
@@ -16746,7 +16751,7 @@ func unixFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 		}
 	case SQLITE_FCNTL_VFSNAME:
 		{
-			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
+			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
 			return SQLITE_OK
 
 		}
@@ -16905,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, 41442)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41446)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -16933,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, 41499)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3316, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41503)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -16996,7 +17001,7 @@ __4:
 	;
 	libc.Xmemset(tls, pShmNode, 0, uint32(unsafe.Sizeof(unixShmNode{}))+uint32(nShmFilename))
 	zShm = libc.AssignPtrUintptr(pShmNode+8, pShmNode+1*68)
-	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3677, libc.VaList(bp, zBasePath))
+	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3696, libc.VaList(bp, zBasePath))
 
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = -1
 	(*UnixInodeInfo)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pDbFd)).FpInode)).FpShmNode = pShmNode
@@ -17017,7 +17022,7 @@ __5:
 	if !(int32((*UnixInodeInfo)(unsafe.Pointer(pInode)).FbProcessLock) == 0) {
 		goto __7
 	}
-	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3684, 0)) {
+	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3703, 0)) {
 		goto __8
 	}
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = robust_open(tls, zShm, O_RDWR|O_CREAT|0400000,
@@ -17032,7 +17037,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3261, zShm, 41624)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41628), ts+3280, zShm, 41628)
 	goto shm_open_err
 __10:
 	;
@@ -17158,11 +17163,11 @@ __11:
 		goto __13
 	}
 	*(*int32)(unsafe.Pointer(bp + 96)) = 0
-	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1554, 1, bp+96) != 1) {
+	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1573, 1, bp+96) != 1) {
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41768)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3351, zFile, 41772)
 	goto shmpage_out
 __14:
 	;
@@ -17208,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, 41795)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3438, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41799)
 	goto shmpage_out
 __20:
 	;
@@ -17409,7 +17414,7 @@ func unixUnmapfile(tls *libc.TLS, pFd uintptr) {
 }
 
 func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
-	var zErr uintptr = ts + 3419
+	var zErr uintptr = ts + 3438
 	var h int32 = (*UnixFile)(unsafe.Pointer(pFd)).Fh
 	var pOrig uintptr = (*UnixFile)(unsafe.Pointer(pFd)).FpMapRegion
 	var nOrig I64 = (*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeActual
@@ -17425,7 +17430,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 		}
 
 		pNew = (*(*func(*libc.TLS, uintptr, Size_t, Size_t, int32, uintptr) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 24*12 + 4)))(tls, pOrig, uint32(nReuse), uint32(nNew), MREMAP_MAYMOVE, 0)
-		zErr = ts + 3431
+		zErr = ts + 3450
 
 		if pNew == libc.UintptrFromInt32(-1) || pNew == uintptr(0) {
 			(*(*func(*libc.TLS, uintptr, Size_t) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 23*12 + 4)))(tls, pOrig, uint32(nReuse))
@@ -17439,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, 42169)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42173)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -17554,10 +17559,10 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		}
 		return uintptr(0)
 	}(),
-		ts+3697, SQLITE_POWERSAFE_OVERWRITE) != 0 {
+		ts+3716, SQLITE_POWERSAFE_OVERWRITE) != 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 18)) |= uint16(UNIXFILE_PSOW)
 	}
-	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3702) == 0 {
+	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3721) == 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 18)) |= uint16(UNIXFILE_EXCL)
 	}
 
@@ -17573,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, 42672)
+			robust_close(tls, pNew, h, 42676)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -17586,7 +17591,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		if zLockFile == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
-			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3712, libc.VaList(bp, zFilename))
+			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3731, libc.VaList(bp, zFilename))
 		}
 		(*UnixFile)(unsafe.Pointer(pNew)).FlockingContext = zLockFile
 	}
@@ -17594,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, 42757)
+			robust_close(tls, pNew, h, 42761)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -17607,15 +17612,15 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 var azTempDirs = [6]uintptr{
 	uintptr(0),
 	uintptr(0),
-	ts + 3720,
-	ts + 3729,
-	ts + 3738,
-	ts + 1567,
+	ts + 3739,
+	ts + 3748,
+	ts + 3757,
+	ts + 1586,
 }
 
 func unixTempFileInit(tls *libc.TLS) {
-	azTempDirs[0] = libc.Xgetenv(tls, ts+3743)
-	azTempDirs[1] = libc.Xgetenv(tls, ts+3757)
+	azTempDirs[0] = libc.Xgetenv(tls, ts+3762)
+	azTempDirs[1] = libc.Xgetenv(tls, ts+3776)
 }
 
 func unixTempFileDir(tls *libc.TLS) uintptr {
@@ -17660,7 +17665,7 @@ func unixGetTempname(tls *libc.TLS, nBuf int32, zBuf uintptr) int32 {
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U64(0))), bp+24)
 
 			*(*int8)(unsafe.Pointer(zBuf + uintptr(nBuf-2))) = int8(0)
-			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3764,
+			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3783,
 				libc.VaList(bp, zDir, *(*U64)(unsafe.Pointer(bp + 24)), 0))
 			if int32(*(*int8)(unsafe.Pointer(zBuf + uintptr(nBuf-2)))) != 0 || libc.PostIncInt32(&iLimit, 1) > 10 {
 				rc = SQLITE_ERROR
@@ -17745,7 +17750,7 @@ func findCreateFileMode(tls *libc.TLS, zPath uintptr, flags int32, pMode uintptr
 	} else if flags&SQLITE_OPEN_DELETEONCLOSE != 0 {
 		*(*Mode_t)(unsafe.Pointer(pMode)) = Mode_t(0600)
 	} else if flags&SQLITE_OPEN_URI != 0 {
-		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3781)
+		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3800)
 		if z != 0 {
 			rc = getFileMode(tls, z, pMode, pUid, pGid)
 		}
@@ -17910,7 +17915,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3261, zName, 43198)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43202), ts+3280, zName, 43202)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -18001,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, 43337)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3390, zPath, 43341)
 		}
 		return rc
 	}
@@ -18009,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, 43347)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3807, zPath, 43351)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43353)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -18075,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, 43443), ts+3459, zIn, 43443)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43447), ts+3478, zIn, 43447)
 			}
 		} 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, 43449)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43453)
 				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, 43454), ts+3450, zIn, 43454)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43458), ts+3469, zIn, 43458)
 				return
 			}
 			*(*int8)(unsafe.Pointer(bp + 96 + uintptr(got))) = int8(0)
@@ -18126,14 +18131,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, 43512), ts+3279, zPath, 43512)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43516), ts+3298, zPath, 43516)
 		}
 		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, 43518)
+		return Xsqlite3CantopenError(tls, 43522)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+4100)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -18189,7 +18194,7 @@ func unixDlError(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBufOut uintptr) {
 	unixEnterMutex(tls)
 	zErr = libc.Xdlerror(tls)
 	if zErr != 0 {
-		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3663, libc.VaList(bp, zErr))
+		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3682, libc.VaList(bp, zErr))
 	}
 	unixLeaveMutex(tls)
 }
@@ -18221,7 +18226,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 	{
 		var fd int32
 		var got int32
-		fd = robust_open(tls, ts+3794, O_RDONLY, uint32(0))
+		fd = robust_open(tls, ts+3813, O_RDONLY, uint32(0))
 		if fd < 0 {
 			libc.Xtime(tls, bp)
 			libc.Xmemcpy(tls, zBuf, bp, uint32(unsafe.Sizeof(Time_t(0))))
@@ -18232,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, 43619)
+			robust_close(tls, uintptr(0), fd, 43623)
 		}
 
 	}
@@ -18309,10 +18314,10 @@ func Xsqlite3_os_init(tls *libc.TLS) int32 {
 }
 
 var aVfs = [4]Sqlite3_vfs{
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3807, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3812, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3822, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3702, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3826, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3831, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3841, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3721, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
 }
 
 // Shutdown the operating system interface.
@@ -18364,7 +18369,7 @@ var memdb_g MemFS
 var memdb_vfs = Sqlite3_vfs{
 	FiVersion:          2,
 	FmxPathname:        1024,
-	FzName:             ts + 3835,
+	FzName:             ts + 3854,
 	FxOpen:             0,
 	FxAccess:           0,
 	FxFullPathname:     0,
@@ -18620,7 +18625,7 @@ func memdbFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int3
 	var rc int32 = SQLITE_NOTFOUND
 	memdbEnter(tls, p)
 	if op == SQLITE_FCNTL_VFSNAME {
-		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3841, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
+		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3860, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
 		rc = SQLITE_OK
 	}
 	if op == SQLITE_FCNTL_SIZE_LIMIT {
@@ -18752,7 +18757,7 @@ func memdbFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, z
 	defer tls.Free(8)
 
 	_ = pVfs
-	Xsqlite3_snprintf(tls, nOut, zOut, ts+3663, libc.VaList(bp, zPath))
+	Xsqlite3_snprintf(tls, nOut, zOut, ts+3682, libc.VaList(bp, zPath))
 	return SQLITE_OK
 }
 
@@ -18873,7 +18878,7 @@ func Xsqlite3_serialize(tls *libc.TLS, db uintptr, zSchema uintptr, piSize uintp
 		return uintptr(0)
 	}
 	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
-	zSql = Xsqlite3_mprintf(tls, ts+3856, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3875, libc.VaList(bp, zSchema))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, db, zSql, -1, bp+8, uintptr(0))
 	} else {
@@ -18946,7 +18951,7 @@ __1:
 	goto end_deserialize
 __2:
 	;
-	zSql = Xsqlite3_mprintf(tls, ts+3879, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3898, libc.VaList(bp, zSchema))
 	if !(zSql == uintptr(0)) {
 		goto __3
 	}
@@ -19662,7 +19667,7 @@ func pcacheFetchFinishWithInit(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 	libc.Xmemset(tls, pPgHdr+16, 0, uint32(unsafe.Sizeof(PgHdr{}))-uint32(uintptr(0)+16))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpPage = pPage
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpData = (*Sqlite3_pcache_page)(unsafe.Pointer(pPage)).FpBuf
-	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*40
+	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*48
 	libc.Xmemset(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0, uint32(8))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpCache = pCache
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).Fpgno = pgno
@@ -19692,7 +19697,7 @@ func Xsqlite3PcacheFetchFinish(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 // reference count drops to 0, then it is made eligible for recycling.
 func Xsqlite3PcacheRelease(tls *libc.TLS, p uintptr) {
 	(*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FnRefSum--
-	if int32(libc.PreDecInt16(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1)) == 0 {
+	if libc.PreDecInt64(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1) == int64(0) {
 		if int32((*PgHdr)(unsafe.Pointer(p)).Fflags)&PGHDR_CLEAN != 0 {
 			pcacheUnpin(tls, p)
 		} else {
@@ -19743,7 +19748,7 @@ func Xsqlite3PcacheMakeClean(tls *libc.TLS, p uintptr) {
 	*(*U16)(unsafe.Pointer(p + 28)) &= libc.Uint16FromInt32(libc.CplInt32(PGHDR_DIRTY | PGHDR_NEED_SYNC | PGHDR_WRITEABLE))
 	*(*U16)(unsafe.Pointer(p + 28)) |= U16(PGHDR_CLEAN)
 
-	if int32((*PgHdr)(unsafe.Pointer(p)).FnRef) == 0 {
+	if (*PgHdr)(unsafe.Pointer(p)).FnRef == int64(0) {
 		pcacheUnpin(tls, p)
 	}
 }
@@ -19847,8 +19852,8 @@ func Xsqlite3PcacheClear(tls *libc.TLS, pCache uintptr) {
 }
 
 func pcacheMergeDirtyList(tls *libc.TLS, pA uintptr, pB uintptr) uintptr {
-	bp := tls.Alloc(40)
-	defer tls.Free(40)
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
 
 	var pTail uintptr
 	pTail = bp
@@ -19926,13 +19931,13 @@ func Xsqlite3PcacheDirtyList(tls *libc.TLS, pCache uintptr) uintptr {
 //
 // This is not the total number of pages referenced, but the sum of the
 // reference count for all pages.
-func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) int32 {
+func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) I64 {
 	return (*PCache)(unsafe.Pointer(pCache)).FnRefSum
 }
 
 // Return the number of references to the page supplied as an argument.
-func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) int32 {
-	return int32((*PgHdr)(unsafe.Pointer(p)).FnRef)
+func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) I64 {
+	return (*PgHdr)(unsafe.Pointer(p)).FnRef
 }
 
 // Return the total number of pages in the cache.
@@ -22158,7 +22163,7 @@ __27:
 	if !(isHot != 0 && nPlayback != 0) {
 		goto __28
 	}
-	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3894,
+	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3913,
 		libc.VaList(bp, nPlayback, (*Pager)(unsafe.Pointer(pPager)).FzJournal))
 __28:
 	;
@@ -22223,7 +22228,7 @@ func pagerUndoCallback(tls *libc.TLS, pCtx uintptr, iPg Pgno) int32 {
 
 	pPg = Xsqlite3PagerLookup(tls, pPager, iPg)
 	if pPg != 0 {
-		if Xsqlite3PcachePageRefcount(tls, pPg) == 1 {
+		if Xsqlite3PcachePageRefcount(tls, pPg) == int64(1) {
 			Xsqlite3PcacheDrop(tls, pPg)
 		} else {
 			rc = readDbPage(tls, pPg)
@@ -22656,7 +22661,7 @@ func Xsqlite3PagerSetPagesize(tls *libc.TLS, pPager uintptr, pPageSize uintptr,
 	var pageSize U32 = *(*U32)(unsafe.Pointer(pPageSize))
 
 	if (int32((*Pager)(unsafe.Pointer(pPager)).FmemDb) == 0 || (*Pager)(unsafe.Pointer(pPager)).FdbSize == Pgno(0)) &&
-		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 &&
+		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) &&
 		pageSize != 0 && pageSize != U32((*Pager)(unsafe.Pointer(pPager)).FpageSize) {
 		var pNew uintptr = uintptr(0)
 		*(*I64)(unsafe.Pointer(bp)) = int64(0)
@@ -22808,9 +22813,9 @@ func pagerAcquireMapPage(tls *libc.TLS, pPager uintptr, pgno Pgno, pData uintptr
 			Xsqlite3OsUnfetch(tls, (*Pager)(unsafe.Pointer(pPager)).Ffd, I64(pgno-Pgno(1))*(*Pager)(unsafe.Pointer(pPager)).FpageSize, pData)
 			return SQLITE_NOMEM
 		}
-		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*40
+		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*48
 		(*PgHdr)(unsafe.Pointer(p)).Fflags = U16(PGHDR_MMAP)
-		(*PgHdr)(unsafe.Pointer(p)).FnRef = int16(1)
+		(*PgHdr)(unsafe.Pointer(p)).FnRef = int64(1)
 		(*PgHdr)(unsafe.Pointer(p)).FpPager = pPager
 	}
 
@@ -23142,7 +23147,7 @@ func Xsqlite3PagerFlush(tls *libc.TLS, pPager uintptr) int32 {
 
 		for rc == SQLITE_OK && pList != 0 {
 			var pNext uintptr = (*PgHdr)(unsafe.Pointer(pList)).FpDirty
-			if int32((*PgHdr)(unsafe.Pointer(pList)).FnRef) == 0 {
+			if (*PgHdr)(unsafe.Pointer(pList)).FnRef == int64(0) {
 				rc = pagerStress(tls, pPager, pList)
 			}
 			pList = pNext
@@ -23292,7 +23297,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 60235)
+	rc = Xsqlite3CantopenError(tls, 60239)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -23353,7 +23358,7 @@ __15:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzJournal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint32(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3921, uint32(8))
+	libc.Xmemcpy(tls, pPtr, ts+3940, uint32(8))
 	pPtr += uintptr(8 + 1)
 	goto __19
 __18:
@@ -23366,7 +23371,7 @@ __19:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzWal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint32(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3930, uint32(4))
+	libc.Xmemcpy(tls, pPtr, ts+3949, uint32(4))
 	pPtr += uintptr(4 + 1)
 	goto __21
 __20:
@@ -23418,9 +23423,9 @@ __27:
 	;
 __26:
 	;
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3935, 0))
+	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3954, 0))
 	if !(iDc&SQLITE_IOCAP_IMMUTABLE != 0 ||
-		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3942, 0) != 0) {
+		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3961, 0) != 0) {
 		goto __30
 	}
 	vfsFlags = vfsFlags | SQLITE_OPEN_READONLY
@@ -23673,7 +23678,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60754)
+	rc = Xsqlite3CantopenError(tls, 60758)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23779,7 +23784,7 @@ __24:
 }
 
 func pagerUnlockIfUnused(tls *libc.TLS, pPager uintptr) {
-	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 {
+	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) {
 		pagerUnlockAndRollback(tls, pPager)
 	}
 }
@@ -23797,7 +23802,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60967)
+	return Xsqlite3CorruptError(tls, 60971)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23836,7 +23841,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60999)
+	rc = Xsqlite3CorruptError(tls, 61003)
 	goto pager_acquire_err
 __7:
 	;
@@ -23913,7 +23918,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, 61078)
+		return Xsqlite3CorruptError(tls, 61082)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24671,7 +24676,7 @@ func Xsqlite3PagerMemUsed(tls *libc.TLS, pPager uintptr) int32 {
 
 // Return the number of references to the specified page.
 func Xsqlite3PagerPageRefcount(tls *libc.TLS, pPage uintptr) int32 {
-	return Xsqlite3PcachePageRefcount(tls, pPage)
+	return int32(Xsqlite3PcachePageRefcount(tls, pPage))
 }
 
 // Parameter eStat must be one of SQLITE_DBSTATUS_CACHE_HIT, _MISS, _WRITE,
@@ -24914,9 +24919,9 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	pPgOld = Xsqlite3PagerLookup(tls, pPager, pgno)
 
 	if pPgOld != 0 {
-		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
+		if (*PgHdr)(unsafe.Pointer(pPgOld)).FnRef > int64(1) {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62623)
+			return Xsqlite3CorruptError(tls, 62627)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 28)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -25101,7 +25106,7 @@ func Xsqlite3PagerClearCache(tls *libc.TLS, pPager uintptr) {
 func Xsqlite3PagerCheckpoint(tls *libc.TLS, pPager uintptr, db uintptr, eMode int32, pnLog uintptr, pnCkpt uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal == uintptr(0) && int32((*Pager)(unsafe.Pointer(pPager)).FjournalMode) == PAGER_JOURNALMODE_WAL {
-		Xsqlite3_exec(tls, db, ts+3952, uintptr(0), uintptr(0), uintptr(0))
+		Xsqlite3_exec(tls, db, ts+3971, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal != 0 {
 		rc = Xsqlite3WalCheckpoint(tls, (*Pager)(unsafe.Pointer(pPager)).FpWal, db, eMode,
@@ -25670,7 +25675,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, 64387)
+				return Xsqlite3CorruptError(tls, 64391)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25769,7 +25774,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64519)
+	rc = Xsqlite3CantopenError(tls, 64523)
 	goto finished
 __7:
 	;
@@ -25937,7 +25942,7 @@ __24:
 		goto __30
 	}
 	Xsqlite3_log(tls, SQLITE_NOTICE|int32(1)<<8,
-		ts+3970,
+		ts+3989,
 		libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 __30:
 	;
@@ -26354,7 +26359,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65333)
+	rc = Xsqlite3CorruptError(tls, 65337)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+12)
@@ -26499,7 +26504,7 @@ func walLimitSize(tls *libc.TLS, pWal uintptr, nMax I64) {
 	}
 	Xsqlite3EndBenignMalloc(tls)
 	if rx != 0 {
-		Xsqlite3_log(tls, rx, ts+4007, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
+		Xsqlite3_log(tls, rx, ts+4026, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 	}
 }
 
@@ -26629,7 +26634,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, 65682)
+		rc = Xsqlite3CantopenError(tls, 65686)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -27102,7 +27107,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66419)
+				return Xsqlite3CorruptError(tls, 66423)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -27607,7 +27612,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, 67138)
+			rc = Xsqlite3CorruptError(tls, 67142)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -27998,7 +28003,7 @@ func Xsqlite3BtreeLeaveCursor(tls *libc.TLS, pCur uintptr) {
 	Xsqlite3BtreeLeave(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpBtree)
 }
 
-var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 4033))
+var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 4052))
 
 var sqlite3SharedCacheList uintptr = uintptr(0)
 
@@ -28263,7 +28268,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, 69249)
+			rc = Xsqlite3CorruptError(tls, 69253)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -28400,7 +28405,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69434)
 	return
 __2:
 	;
@@ -28417,7 +28422,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69447)
 	goto ptrmap_exit
 __4:
 	;
@@ -28425,7 +28430,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69452)
 	goto ptrmap_exit
 __5:
 	;
@@ -28468,7 +28473,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, 69493)
+		return Xsqlite3CorruptError(tls, 69497)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -28478,7 +28483,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, 69501)
+		return Xsqlite3CorruptError(tls, 69505)
 	}
 	return SQLITE_OK
 }
@@ -28728,7 +28733,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, 69893)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69897)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28775,7 +28780,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69951)
+	return Xsqlite3CorruptError(tls, 69955)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28785,7 +28790,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69954)
+	return Xsqlite3CorruptError(tls, 69958)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28798,7 +28803,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69962)
+	return Xsqlite3CorruptError(tls, 69966)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28807,14 +28812,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69965)
+	return Xsqlite3CorruptError(tls, 69969)
 __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, 69967)
+	return Xsqlite3CorruptError(tls, 69971)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint32(iFree2-(iFree+sz)))
@@ -28824,7 +28829,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69971)
+	return Xsqlite3CorruptError(tls, 69975)
 __11:
 	;
 __8:
@@ -28888,7 +28893,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 70004)
+	return Xsqlite3CorruptError(tls, 70008)
 __22:
 	;
 	size = int32((*struct {
@@ -28898,7 +28903,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 70010)
+	return Xsqlite3CorruptError(tls, 70014)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -28920,7 +28925,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 70024)
+	return Xsqlite3CorruptError(tls, 70028)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -28955,7 +28960,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, 70081)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70085)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -28968,13 +28973,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, 70096)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70100)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70107)
 	}
 	return uintptr(0)
 }
@@ -28999,7 +29004,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, 70152)
+			return Xsqlite3CorruptError(tls, 70156)
 		}
 	}
 
@@ -29010,7 +29015,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, 70170)
+				return Xsqlite3CorruptError(tls, 70174)
 			} else {
 				return SQLITE_OK
 			}
@@ -29062,22 +29067,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 70249)
+				return Xsqlite3CorruptError(tls, 70253)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 70254)
+			return Xsqlite3CorruptError(tls, 70258)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 70266)
+				return Xsqlite3CorruptError(tls, 70270)
 			}
 			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, 70269)
+				return Xsqlite3CorruptError(tls, 70273)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -29087,7 +29092,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, 70282)
+					return Xsqlite3CorruptError(tls, 70286)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -29095,7 +29100,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, 70288)
+			return Xsqlite3CorruptError(tls, 70292)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -29103,10 +29108,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, 70297)
+			return Xsqlite3CorruptError(tls, 70301)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70298)
+			return Xsqlite3CorruptError(tls, 70302)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -29166,7 +29171,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70357)
+			return Xsqlite3CorruptError(tls, 70361)
 		}
 	} else {
 		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
@@ -29202,7 +29207,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70381)
+			return Xsqlite3CorruptError(tls, 70385)
 		}
 	}
 	return SQLITE_OK
@@ -29232,11 +29237,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70432)
+			return Xsqlite3CorruptError(tls, 70436)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70437)
+				return Xsqlite3CorruptError(tls, 70441)
 			}
 			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))))
@@ -29247,15 +29252,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70447)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70451)
+			return Xsqlite3CorruptError(tls, 70455)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70463)
+		return Xsqlite3CorruptError(tls, 70467)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -29283,14 +29288,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, 70494)
+			return Xsqlite3CorruptError(tls, 70498)
 		}
 		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, 70499)
+			return Xsqlite3CorruptError(tls, 70503)
 		}
 	}
 	return SQLITE_OK
@@ -29304,7 +29309,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, 70531)
+		return Xsqlite3CorruptError(tls, 70535)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -29316,7 +29321,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, 70545)
+		return Xsqlite3CorruptError(tls, 70549)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -29419,7 +29424,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70700)
+	rc = Xsqlite3CorruptError(tls, 70704)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -29447,7 +29452,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, 70721)
+	rc = Xsqlite3CorruptError(tls, 70725)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -29486,7 +29491,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, 70787)
+			return Xsqlite3CorruptError(tls, 70791)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -29559,7 +29564,7 @@ func Xsqlite3BtreeOpen(tls *libc.TLS, pVfs uintptr, zFilename uintptr, db uintpt
 	mutexOpen = uintptr(0)
 	rc = SQLITE_OK
 	isTempDb = libc.Bool32(zFilename == uintptr(0) || int32(*(*int8)(unsafe.Pointer(zFilename))) == 0)
-	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4049) == 0 ||
+	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4068) == 0 ||
 		isTempDb != 0 && Xsqlite3TempInMemory(tls, db) != 0 ||
 		vfsFlags&SQLITE_OPEN_MEMORY != 0)
 
@@ -30331,7 +30336,7 @@ __9:
 	;
 __10:
 	;
-	if !(libc.Xmemcmp(tls, page1+21, ts+4058, uint32(3)) != 0) {
+	if !(libc.Xmemcmp(tls, page1+21, ts+4077, uint32(3)) != 0) {
 		goto __14
 	}
 	goto page1_init_failed
@@ -30369,7 +30374,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71722)
+	rc = Xsqlite3CorruptError(tls, 71726)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30784,7 +30789,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, 72143)
+			return Xsqlite3CorruptError(tls, 72147)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30810,7 +30815,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, 72162)
+						return Xsqlite3CorruptError(tls, 72166)
 					}
 					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)
@@ -30819,7 +30824,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, 72171)
+					return Xsqlite3CorruptError(tls, 72175)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30830,7 +30835,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, 72183)
+				return Xsqlite3CorruptError(tls, 72187)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30846,7 +30851,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, 72218)
+		return Xsqlite3CorruptError(tls, 72222)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -30907,7 +30912,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, 72316)
+			return Xsqlite3CorruptError(tls, 72320)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -30942,7 +30947,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, 72368)
+					return Xsqlite3CorruptError(tls, 72372)
 				}
 			}
 
@@ -31002,7 +31007,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, 72436)
+			rc = Xsqlite3CorruptError(tls, 72440)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -31041,7 +31046,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, 72487)
+			return Xsqlite3CorruptError(tls, 72491)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -31072,7 +31077,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72514)
+			return Xsqlite3CorruptError(tls, 72518)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -31413,7 +31418,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, 72978)
+			return Xsqlite3CorruptError(tls, 72982)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -31657,14 +31662,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, 73385)
+		return Xsqlite3CorruptError(tls, 73389)
 	}
 
 	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, 73400)
+		return Xsqlite3CorruptError(tls, 73404)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -31709,7 +31714,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, 73462)
+				return Xsqlite3CorruptError(tls, 73466)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31758,7 +31763,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73547)
+		return Xsqlite3CorruptError(tls, 73551)
 	}
 	return rc
 }
@@ -31838,7 +31843,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, 73684)
+		return Xsqlite3CorruptError(tls, 73688)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -31929,7 +31934,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, 73823)
+	return Xsqlite3CorruptError(tls, 73827)
 __11:
 	;
 skip_init:
@@ -31949,7 +31954,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73835)
+	return Xsqlite3CorruptError(tls, 73839)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -32159,7 +32164,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 74077)
+	return Xsqlite3CorruptError(tls, 74081)
 __21:
 	;
 	goto __19
@@ -32363,7 +32368,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 74273)
+	return Xsqlite3CorruptError(tls, 74277)
 __4:
 	;
 	goto bypass_moveto_root
@@ -32428,7 +32433,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, 74360)
+	rc = Xsqlite3CorruptError(tls, 74364)
 	goto moveto_index_finish
 __17:
 	;
@@ -32476,7 +32481,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74392)
+	rc = Xsqlite3CorruptError(tls, 74396)
 __24:
 	;
 	goto moveto_index_finish
@@ -32595,7 +32600,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, 74508)
+		return Xsqlite3CorruptError(tls, 74512)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32755,7 +32760,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74688)
+	return Xsqlite3CorruptError(tls, 74692)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32820,7 +32825,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74744)
+	rc = Xsqlite3CorruptError(tls, 74748)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+4, 0)
@@ -32856,7 +32861,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74773)
+	rc = Xsqlite3CorruptError(tls, 74777)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -32900,7 +32905,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74807)
+	rc = Xsqlite3CorruptError(tls, 74811)
 	goto end_allocate_page
 __32:
 	;
@@ -33012,7 +33017,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74872)
+	rc = Xsqlite3CorruptError(tls, 74876)
 	goto end_allocate_page
 __51:
 	;
@@ -33170,7 +33175,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, 74999)
+	return Xsqlite3CorruptError(tls, 75003)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -33227,7 +33232,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75046)
+	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75050)
 	goto freepage_out
 __10:
 	;
@@ -33243,7 +33248,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75057)
+	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75061)
 	goto freepage_out
 __12:
 	;
@@ -33317,7 +33322,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, 75146)
+		return Xsqlite3CorruptError(tls, 75150)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -33329,7 +33334,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, 75163)
+			return Xsqlite3CorruptError(tls, 75167)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+4)
@@ -33340,7 +33345,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, 75183)
+			rc = Xsqlite3CorruptError(tls, 75187)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -33505,7 +33510,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, 75436)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75440)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -33783,12 +33788,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, 75737)
+				return Xsqlite3CorruptError(tls, 75741)
 			}
 			pCell = pTmp + uintptr((int32(pCell)-int32(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75742)
+			return Xsqlite3CorruptError(tls, 75746)
 		}
 
 		pData -= uintptr(sz)
@@ -33796,7 +33801,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, 75748)
+			return Xsqlite3CorruptError(tls, 75752)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint32(sz))
 
@@ -33856,7 +33861,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, 75833)
+			Xsqlite3CorruptError(tls, 75837)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*4)), uint32(sz))
@@ -33945,7 +33950,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75947)
+	return Xsqlite3CorruptError(tls, 75951)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint32(nCell*2))
@@ -34061,7 +34066,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, 76060)
+		return Xsqlite3CorruptError(tls, 76064)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 80)) = allocateBtreePage(tls, pBt, bp, bp+4, uint32(0), uint8(0))
@@ -34381,7 +34386,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, 76481)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76485)
 	goto balance_cleanup
 __25:
 	;
@@ -34392,7 +34397,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76505)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76509)
 	goto balance_cleanup
 __27:
 	;
@@ -34550,7 +34555,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76606)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76610)
 	goto balance_cleanup
 __55:
 	;
@@ -34624,7 +34629,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76639)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76643)
 	goto balance_cleanup
 __67:
 	;
@@ -34687,7 +34692,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76683)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76687)
 	goto balance_cleanup
 __75:
 	;
@@ -34715,7 +34720,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 112)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76716)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76720)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 112)) != 0) {
@@ -34976,7 +34981,7 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76916)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76920)
 	goto balance_cleanup
 __121:
 	;
@@ -35168,7 +35173,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, 77146)
+			return Xsqlite3CorruptError(tls, 77150)
 		}
 	}
 	return SQLITE_OK
@@ -35206,7 +35211,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 77206)
+			rc = Xsqlite3CorruptError(tls, 77210)
 		} 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)))
@@ -35312,7 +35317,7 @@ func btreeOverwriteOverflowCell(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, 77370)
+			rc = Xsqlite3CorruptError(tls, 77374)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -35337,7 +35342,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 
 	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)
+		return Xsqlite3CorruptError(tls, 77402)
 	}
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
 		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
@@ -35407,7 +35412,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77479)
+	return Xsqlite3CorruptError(tls, 77483)
 __3:
 	;
 __1:
@@ -35520,7 +35525,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 84)) = Xsqlite3CorruptError(tls, 77602)
+	*(*int32)(unsafe.Pointer(bp + 84)) = Xsqlite3CorruptError(tls, 77606)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 84)) = btreeComputeFreeSpace(tls, pPage)
@@ -35580,6 +35585,7 @@ __30:
 __25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
+	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
 		goto __31
 	}
@@ -35587,7 +35593,7 @@ __25:
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
 		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77640)
+	return Xsqlite3CorruptError(tls, 77645)
 __33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 84)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
@@ -35625,13 +35631,13 @@ __37:
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77667)
+	return Xsqlite3CorruptError(tls, 77672)
 __39:
 	;
 	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 88))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __40
 	}
-	return Xsqlite3CorruptError(tls, 77670)
+	return Xsqlite3CorruptError(tls, 77675)
 __40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint32(*(*int32)(unsafe.Pointer(bp + 88))))
@@ -35662,7 +35668,6 @@ __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 __44
 	}
@@ -35737,7 +35742,7 @@ 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, 77773)
+		return Xsqlite3CorruptError(tls, 77777)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
@@ -35762,7 +35767,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, 77798)
+				return Xsqlite3CorruptError(tls, 77802)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35863,7 +35868,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 20))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77894)
+			return Xsqlite3CorruptError(tls, 77898)
 		}
 	}
 
@@ -35871,11 +35876,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, 77903)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 	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, 77907)
+		return Xsqlite3CorruptError(tls, 77911)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -35950,7 +35955,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, 77998)
+			return Xsqlite3CorruptError(tls, 78002)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -36019,7 +36024,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, 78114)
+			return Xsqlite3CorruptError(tls, 78118)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -36048,7 +36053,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, 78162)
+				*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3CorruptError(tls, 78166)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 24)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 12)))
@@ -36124,7 +36129,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 78252)
+	return Xsqlite3CorruptError(tls, 78256)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 24)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -36138,7 +36143,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, 78259)
+	*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3CorruptError(tls, 78263)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -36272,7 +36277,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, 78363)
+		return Xsqlite3CorruptError(tls, 78367)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -36489,7 +36494,7 @@ 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+44, ts+4062, 1)
+		Xsqlite3_str_append(tls, pCheck+44, ts+4081, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
 		Xsqlite3_str_appendf(tls, pCheck+44, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
@@ -36514,11 +36519,11 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 	defer tls.Free(16)
 
 	if iPage > (*IntegrityCk)(unsafe.Pointer(pCheck)).FnPage || iPage == Pgno(0) {
-		checkAppendMsg(tls, pCheck, ts+4064, libc.VaList(bp, iPage))
+		checkAppendMsg(tls, pCheck, ts+4083, libc.VaList(bp, iPage))
 		return 1
 	}
 	if getPageReferenced(tls, pCheck, iPage) != 0 {
-		checkAppendMsg(tls, pCheck, ts+4087, libc.VaList(bp+8, iPage))
+		checkAppendMsg(tls, pCheck, ts+4106, libc.VaList(bp+8, iPage))
 		return 1
 	}
 	setPageReferenced(tls, pCheck, iPage)
@@ -36536,13 +36541,13 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
 			checkOom(tls, pCheck)
 		}
-		checkAppendMsg(tls, pCheck, ts+4112, libc.VaList(bp, iChild))
+		checkAppendMsg(tls, pCheck, ts+4131, libc.VaList(bp, iChild))
 		return
 	}
 
 	if int32(*(*U8)(unsafe.Pointer(bp + 48))) != int32(eType) || *(*Pgno)(unsafe.Pointer(bp + 52)) != iParent {
 		checkAppendMsg(tls, pCheck,
-			ts+4141,
+			ts+4160,
 			libc.VaList(bp+8, iChild, int32(eType), iParent, int32(*(*U8)(unsafe.Pointer(bp + 48))), *(*Pgno)(unsafe.Pointer(bp + 52))))
 	}
 }
@@ -36561,7 +36566,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 		}
 		N--
 		if Xsqlite3PagerGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpPager, iPage, bp+40, 0) != 0 {
-			checkAppendMsg(tls, pCheck, ts+4195, libc.VaList(bp, iPage))
+			checkAppendMsg(tls, pCheck, ts+4214, libc.VaList(bp, iPage))
 			break
 		}
 		pOvflData = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
@@ -36572,7 +36577,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 			}
 			if n > (*BtShared)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt)).FusableSize/U32(4)-U32(2) {
 				checkAppendMsg(tls, pCheck,
-					ts+4217, libc.VaList(bp+8, iPage))
+					ts+4236, libc.VaList(bp+8, iPage))
 				N--
 			} else {
 				for i = 0; i < int32(n); i++ {
@@ -36595,12 +36600,12 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 	}
 	if N != 0 && nErrAtStart == (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr {
 		checkAppendMsg(tls, pCheck,
-			ts+4256,
+			ts+4275,
 			libc.VaList(bp+16, func() uintptr {
 				if isFreeList != 0 {
-					return ts + 4282
+					return ts + 4301
 				}
-				return ts + 4287
+				return ts + 4306
 			}(),
 				expected-N, expected))
 	}
@@ -36716,13 +36721,13 @@ __2:
 	return 0
 __3:
 	;
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4308
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4327
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
 		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4318, libc.VaList(bp, rc))
+		ts+4337, libc.VaList(bp, rc))
 	goto end_of_check
 __4:
 	;
@@ -36733,7 +36738,7 @@ __4:
 	}
 
 	checkAppendMsg(tls, pCheck,
-		ts+4356, libc.VaList(bp+8, rc))
+		ts+4375, libc.VaList(bp+8, rc))
 	goto end_of_check
 __5:
 	;
@@ -36741,14 +36746,14 @@ __5:
 		goto __6
 	}
 
-	checkAppendMsg(tls, pCheck, ts+4394, libc.VaList(bp+16, rc))
+	checkAppendMsg(tls, pCheck, ts+4413, libc.VaList(bp+16, rc))
 	goto end_of_check
 __6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
 
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4416
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4435
 	contentOffset = U32((int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5))))<<8|int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5) + 1)))-1)&0xffff + 1)
 
 	nCell = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3) + 1)))
@@ -36765,7 +36770,7 @@ __6:
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
 		goto __9
 	}
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4442
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4461
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
 __9:
 	;
@@ -36790,7 +36795,7 @@ __10:
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
 		goto __13
 	}
-	checkAppendMsg(tls, pCheck, ts+4470,
+	checkAppendMsg(tls, pCheck, ts+4489,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
 	goto __11
@@ -36803,7 +36808,7 @@ __13:
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+108)).FnSize) > usableSize) {
 		goto __14
 	}
-	checkAppendMsg(tls, pCheck, ts+4500, 0)
+	checkAppendMsg(tls, pCheck, ts+4519, 0)
 	doCoverageCheck = 0
 	goto __11
 __14:
@@ -36819,7 +36824,7 @@ __14:
 	}() != 0) {
 		goto __16
 	}
-	checkAppendMsg(tls, pCheck, ts+4524, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+108)).FnKey))
+	checkAppendMsg(tls, pCheck, ts+4543, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+108)).FnKey))
 __16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 100)) = (*CellInfo)(unsafe.Pointer(bp + 108)).FnKey
@@ -36857,7 +36862,7 @@ __21:
 	if !(d2 != depth) {
 		goto __22
 	}
-	checkAppendMsg(tls, pCheck, ts+4548, 0)
+	checkAppendMsg(tls, pCheck, ts+4567, 0)
 	depth = d2
 __22:
 	;
@@ -36930,7 +36935,7 @@ __30:
 		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4573, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 128))>>16, iPage))
+		ts+4592, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 128))>>16, iPage))
 	goto __31
 	goto __33
 __32:
@@ -36947,7 +36952,7 @@ __31:
 		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4610,
+		ts+4629,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
 __34:
 	;
@@ -37061,7 +37066,7 @@ __6:
 	if !(bCkFreelist != 0) {
 		goto __7
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4662
+	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4681
 	checkList(tls, bp+32, 1, Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+32),
 		Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
@@ -37097,7 +37102,7 @@ __13:
 		goto __15
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4678,
+		ts+4697,
 		libc.VaList(bp, mx, mxInHdr))
 __15:
 	;
@@ -37107,7 +37112,7 @@ __9:
 		goto __16
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4723, 0)
+		ts+4742, 0)
 __16:
 	;
 __10:
@@ -37154,13 +37159,13 @@ __23:
 	if !(getPageReferenced(tls, bp+32, i) == 0 && (ptrmapPageno(tls, pBt, i) != i || !(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0))) {
 		goto __26
 	}
-	checkAppendMsg(tls, bp+32, ts+4778, libc.VaList(bp+16, i))
+	checkAppendMsg(tls, bp+32, ts+4797, libc.VaList(bp+16, i))
 __26:
 	;
 	if !(getPageReferenced(tls, bp+32, i) != 0 && (ptrmapPageno(tls, pBt, i) == i && (*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0)) {
 		goto __27
 	}
-	checkAppendMsg(tls, bp+32, ts+4800, libc.VaList(bp+24, i))
+	checkAppendMsg(tls, bp+32, ts+4819, libc.VaList(bp+24, i))
 __27:
 	;
 	goto __24
@@ -37423,7 +37428,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 		var rc int32 = 0
 		Xsqlite3ParseObjectInit(tls, bp+16, pDb)
 		if Xsqlite3OpenTempDatabase(tls, bp+16) != 0 {
-			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3663, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3682, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 			rc = SQLITE_ERROR
 		}
 		Xsqlite3DbFree(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
@@ -37434,7 +37439,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 	}
 
 	if i < 0 {
-		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4834, libc.VaList(bp+8, zDb))
+		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4853, libc.VaList(bp+8, zDb))
 		return uintptr(0)
 	}
 
@@ -37449,7 +37454,7 @@ func setDestPgsz(tls *libc.TLS, p uintptr) int32 {
 
 func checkReadTransaction(tls *libc.TLS, db uintptr, p uintptr) int32 {
 	if Xsqlite3BtreeTxnState(tls, p) != SQLITE_TXN_NONE {
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4854, 0)
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4873, 0)
 		return SQLITE_ERROR
 	}
 	return SQLITE_OK
@@ -37469,7 +37474,7 @@ func Xsqlite3_backup_init(tls *libc.TLS, pDestDb uintptr, zDestDb uintptr, pSrcD
 
 	if pSrcDb == pDestDb {
 		Xsqlite3ErrorWithMsg(tls,
-			pDestDb, SQLITE_ERROR, ts+4885, 0)
+			pDestDb, SQLITE_ERROR, ts+4904, 0)
 		p = uintptr(0)
 	} else {
 		p = Xsqlite3MallocZero(tls, uint64(unsafe.Sizeof(Sqlite3_backup{})))
@@ -37918,7 +37923,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 		(*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,
+		Xsqlite3_str_appendf(tls, bp+16, ts+4944,
 			libc.VaList(bp, func() float64 {
 				if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_IntReal != 0 {
 					return float64(*(*I64)(unsafe.Pointer(p)))
@@ -38510,7 +38515,7 @@ func Xsqlite3VdbeMemSetPointer(tls *libc.TLS, pMem uintptr, pPtr uintptr, zPType
 		if zPType != 0 {
 			return zPType
 		}
-		return ts + 1554
+		return ts + 1573
 	}()
 	(*Mem)(unsafe.Pointer(pMem)).Fz = pPtr
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null | MEM_Dyn | MEM_Subtype | MEM_Term)
@@ -38742,7 +38747,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, 81630)
+		return Xsqlite3CorruptError(tls, 81634)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -38973,7 +38978,7 @@ __9:
 		goto __10
 	}
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 8)).FisError
-	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3663, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
+	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3682, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
 	goto __11
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
@@ -39026,7 +39031,7 @@ func valueFromExpr(tls *libc.TLS, db uintptr, pExpr uintptr, enc U8, affinity U8
 	zVal = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	negInt = 1
-	zNeg = ts + 1554
+	zNeg = ts + 1573
 	rc = SQLITE_OK
 
 __1:
@@ -39067,7 +39072,7 @@ __4:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
 	negInt = -1
-	zNeg = ts + 4932
+	zNeg = ts + 4951
 __6:
 	;
 	if !(op == TK_STRING || op == TK_FLOAT || op == TK_INTEGER) {
@@ -39086,7 +39091,7 @@ __9:
 	Xsqlite3VdbeMemSetInt64(tls, *(*uintptr)(unsafe.Pointer(bp + 16)), I64(*(*int32)(unsafe.Pointer(pExpr + 8)))*I64(negInt))
 	goto __11
 __10:
-	zVal = Xsqlite3MPrintf(tls, db, ts+4934, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+	zVal = Xsqlite3MPrintf(tls, db, ts+4953, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	if !(zVal == uintptr(0)) {
 		goto __12
 	}
@@ -39390,7 +39395,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, 82270)
+		return Xsqlite3CorruptError(tls, 82274)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -39405,14 +39410,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 82276)
+			return Xsqlite3CorruptError(tls, 82280)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 82282)
+		return Xsqlite3CorruptError(tls, 82286)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -40420,34 +40425,34 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var j int32
 			var pKeyInfo uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4939, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4958, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
 			for j = 0; j < int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField); j++ {
 				var pColl uintptr = *(*uintptr)(unsafe.Pointer(pKeyInfo + 20 + uintptr(j)*4))
 				var zColl uintptr
 				if pColl != 0 {
 					zColl = (*CollSeq)(unsafe.Pointer(pColl)).FzName
 				} else {
-					zColl = ts + 1554
+					zColl = ts + 1573
 				}
-				if libc.Xstrcmp(tls, zColl, ts+1099) == 0 {
-					zColl = ts + 4944
+				if libc.Xstrcmp(tls, zColl, ts+1118) == 0 {
+					zColl = ts + 4963
 				}
-				Xsqlite3_str_appendf(tls, bp+144, ts+4946,
+				Xsqlite3_str_appendf(tls, bp+144, ts+4965,
 					libc.VaList(bp+8, func() uintptr {
 						if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_DESC != 0 {
-							return ts + 4932
+							return ts + 4951
 						}
-						return ts + 1554
+						return ts + 1573
 					}(),
 						func() uintptr {
 							if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_BIGNULL != 0 {
-								return ts + 4954
+								return ts + 4973
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						zColl))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4957, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+4976, 1)
 			break
 
 		}
@@ -40455,7 +40460,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 		{
 			var pColl uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4959, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
+			Xsqlite3_str_appendf(tls, bp+144, ts+4978, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
 				encnames[(*CollSeq)(unsafe.Pointer(pColl)).Fenc]))
 			break
 
@@ -40463,32 +40468,32 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -7:
 		{
 			var pDef uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
-			Xsqlite3_str_appendf(tls, bp+144, ts+4968, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4987, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -15:
 		{
 			var pDef uintptr = (*Sqlite3_context)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpFunc
-			Xsqlite3_str_appendf(tls, bp+144, ts+4968, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4987, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -13:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1334, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1353, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
 	case -3:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+4975, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4994, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
 			break
 
 		}
 	case -12:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1328, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1347, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
@@ -40498,13 +40503,13 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Str != 0 {
 				zP4 = (*Mem)(unsafe.Pointer(pMem)).Fz
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1334, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1353, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1328, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1347, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Null != 0 {
-				zP4 = ts + 1555
+				zP4 = ts + 1574
 			} else {
-				zP4 = ts + 4978
+				zP4 = ts + 4997
 			}
 			break
 
@@ -40512,7 +40517,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -11:
 		{
 			var pVtab uintptr = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-			Xsqlite3_str_appendf(tls, bp+144, ts+4985, libc.VaList(bp+120, pVtab))
+			Xsqlite3_str_appendf(tls, bp+144, ts+5004, libc.VaList(bp+120, pVtab))
 			break
 
 		}
@@ -40523,20 +40528,20 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var n U32 = *(*U32)(unsafe.Pointer(ai))
 
 			for i = U32(1); i <= n; i++ {
-				Xsqlite3_str_appendf(tls, bp+144, ts+4993, libc.VaList(bp+128, func() int32 {
+				Xsqlite3_str_appendf(tls, bp+144, ts+5012, libc.VaList(bp+128, func() int32 {
 					if i == U32(1) {
 						return '['
 					}
 					return ','
 				}(), *(*U32)(unsafe.Pointer(ai + uintptr(i)*4))))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4998, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+5017, 1)
 			break
 
 		}
 	case -4:
 		{
-			zP4 = ts + 5000
+			zP4 = ts + 5019
 			break
 
 		}
@@ -40561,7 +40566,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	return Xsqlite3StrAccumFinish(tls, bp+144)
 }
 
-var encnames = [4]uintptr{ts + 5008, ts + 5010, ts + 5012, ts + 5017}
+var encnames = [4]uintptr{ts + 5027, ts + 5029, ts + 5031, ts + 5036}
 
 // Declare to the Vdbe that the BTree object at db->aDb[i] is used.
 //
@@ -41011,8 +41016,8 @@ func Xsqlite3VdbeMakeReady(tls *libc.TLS, p uintptr, pParse uintptr) {
 }
 
 var azColName = [12]uintptr{
-	ts + 5022, ts + 5027, ts + 5034, ts + 5037, ts + 5040, ts + 5043, ts + 5046, ts + 5049,
-	ts + 5057, ts + 5060, ts + 5067, ts + 5075,
+	ts + 5041, ts + 5046, ts + 5053, ts + 5056, ts + 5059, ts + 5062, ts + 5065, ts + 5068,
+	ts + 5076, ts + 5079, ts + 5086, ts + 5094,
 }
 
 // Close a VDBE cursor and release all the resources that cursor
@@ -41221,7 +41226,7 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		var nMainFile int32
 
 		nMainFile = Xsqlite3Strlen30(tls, zMainFile)
-		zSuper = Xsqlite3MPrintf(tls, db, ts+5082, libc.VaList(bp, 0, zMainFile, 0))
+		zSuper = Xsqlite3MPrintf(tls, db, ts+5101, libc.VaList(bp, 0, zMainFile, 0))
 		if zSuper == uintptr(0) {
 			return SQLITE_NOMEM
 		}
@@ -41229,16 +41234,16 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		for __ccgo := true; __ccgo; __ccgo = rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 60)) != 0 {
 			if retryCount != 0 {
 				if retryCount > 100 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5094, libc.VaList(bp+24, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5113, libc.VaList(bp+24, zSuper))
 					Xsqlite3OsDelete(tls, pVfs, zSuper, 0)
 					break
 				} else if retryCount == 1 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5108, libc.VaList(bp+32, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5127, libc.VaList(bp+32, zSuper))
 				}
 			}
 			retryCount++
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
-			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5123,
+			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5142,
 				libc.VaList(bp+40, *(*U32)(unsafe.Pointer(bp + 56))>>8&U32(0xffffff), *(*U32)(unsafe.Pointer(bp + 56))&U32(0xff)))
 
 			rc = Xsqlite3OsAccess(tls, pVfs, zSuper, SQLITE_ACCESS_EXISTS, bp+60)
@@ -41384,7 +41389,7 @@ func Xsqlite3VdbeCheckFk(tls *libc.TLS, p uintptr, deferred int32) int32 {
 		!(deferred != 0) && (*Vdbe)(unsafe.Pointer(p)).FnFkConstraint > int64(0) {
 		(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_CONSTRAINT | int32(3)<<8
 		(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
-		Xsqlite3VdbeError(tls, p, ts+5136, 0)
+		Xsqlite3VdbeError(tls, p, ts+5155, 0)
 		if int32((*Vdbe)(unsafe.Pointer(p)).FprepFlags)&SQLITE_PREPARE_SAVESQL == 0 {
 			return SQLITE_ERROR
 		}
@@ -41716,7 +41721,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 86058)
+		return Xsqlite3CorruptError(tls, 86062)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -42267,7 +42272,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86989))
 		return 0
 	}
 
@@ -42332,7 +42337,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, 87062))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87066))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 20 + uintptr(i)*4)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -42366,7 +42371,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, 87092))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87096))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -42416,7 +42421,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, 87136))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87140))
 			return 0
 		}
 	}
@@ -42562,7 +42567,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87303))
 	return 0
 __7:
 	;
@@ -42733,7 +42738,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87457)
+	return Xsqlite3CorruptError(tls, 87461)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42759,7 +42764,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, 87490)
+		return Xsqlite3CorruptError(tls, 87494)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -42870,13 +42875,13 @@ func Xsqlite3NotPureFunc(tls *libc.TLS, pCtx uintptr) int32 {
 		var zContext uintptr
 		var zMsg uintptr
 		if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_IsCheck != 0 {
-			zContext = ts + 5166
-		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5185
-		} else {
+		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5204
+		} else {
+			zContext = ts + 5223
 		}
-		zMsg = Xsqlite3_mprintf(tls, ts+5213,
+		zMsg = Xsqlite3_mprintf(tls, ts+5232,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx)).FpFunc)).FzName, zContext))
 		Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 		Xsqlite3_free(tls, zMsg)
@@ -42981,7 +42986,7 @@ func Xsqlite3_expired(tls *libc.TLS, pStmt uintptr) int32 {
 
 func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 	if (*Vdbe)(unsafe.Pointer(p)).Fdb == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5249, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5268, 0)
 		return 1
 	} else {
 		return 0
@@ -42991,7 +42996,7 @@ func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 
 func vdbeSafetyNotNull(tls *libc.TLS, p uintptr) int32 {
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5294, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5313, 0)
 		return 1
 	} else {
 		return vdbeSafety(tls, p)
@@ -43033,7 +43038,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, 87854)
+			return Xsqlite3MisuseError(tls, 87858)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -43456,7 +43461,7 @@ func Xsqlite3_result_error_code(tls *libc.TLS, pCtx uintptr, errCode int32) {
 // Force an SQLITE_TOOBIG error.
 func Xsqlite3_result_error_toobig(tls *libc.TLS, pCtx uintptr) {
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FisError = SQLITE_TOOBIG
-	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5334, int64(-1),
+	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5353, int64(-1),
 		uint8(SQLITE_UTF8), uintptr(0))
 }
 
@@ -43648,7 +43653,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88544)
+		return Xsqlite3MisuseError(tls, 88548)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -44168,15 +44173,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 89208)
+		return Xsqlite3MisuseError(tls, 89212)
 	}
 	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+5357, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 89216)
+			ts+5376, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89220)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -44581,7 +44586,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, 89707)
+	rc = Xsqlite3MisuseError(tls, 89711)
 	goto preupdate_old_out
 __1:
 	;
@@ -44725,7 +44730,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, 89809)
+	rc = Xsqlite3MisuseError(tls, 89813)
 	goto preupdate_new_out
 __1:
 	;
@@ -44897,7 +44902,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+5397, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5416, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, (int32(zRawSql)-int32(zStart))/1)
 		}
@@ -44933,11 +44938,11 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 
 			pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr(*(*int32)(unsafe.Pointer(bp + 76))-1)*40
 			if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Null != 0 {
-				Xsqlite3_str_append(tls, bp+48, ts+1555, 4)
+				Xsqlite3_str_append(tls, bp+48, ts+1574, 4)
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+1334, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+1353, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+4925, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+4944, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Str != 0 {
 				var nOut int32
 				var enc U8 = (*Sqlite3)(unsafe.Pointer(db)).Fenc
@@ -44952,21 +44957,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+5401, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5420, 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+5408, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5427, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5421, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5440, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					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_appendf(tls, bp+48, ts+5443, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5429, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5448, 1)
 			}
 		}
 	}
@@ -45169,10 +45174,6 @@ func filterHash(tls *libc.TLS, aMem uintptr, pOp uintptr) U64 {
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Real != 0 {
 			h = h + U64(Xsqlite3VdbeIntValue(tls, p))
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&(MEM_Str|MEM_Blob) != 0 {
-			h = h + U64((*Mem)(unsafe.Pointer(p)).Fn)
-			if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Zero != 0 {
-				h = h + U64(*(*int32)(unsafe.Pointer(p)))
-			}
 		}
 	}
 	return h
@@ -45183,11 +45184,11 @@ func vdbeMemTypeName(tls *libc.TLS, pMem uintptr) uintptr {
 }
 
 var azTypes = [5]uintptr{
-	ts + 1115,
-	ts + 1127,
-	ts + 1132,
-	ts + 1110,
-	ts + 1555,
+	ts + 1134,
+	ts + 1146,
+	ts + 1151,
+	ts + 1129,
+	ts + 1574,
 }
 
 // Execute as much of a VDBE program as we can.
@@ -46229,20 +46230,20 @@ __202:
 		goto __205
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5431, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	Xsqlite3VdbeError(tls, p, ts+5450, 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))))
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5471, 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))))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
 	;
 	pcx = (int32(pOp) - int32(aOp)) / 20
-	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))
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5478, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 __204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
@@ -47820,7 +47821,7 @@ op_column_corrupt:
 	goto __9
 	goto __425
 __424:
-	rc = Xsqlite3CorruptError(tls, 93317)
+	rc = Xsqlite3CorruptError(tls, 93320)
 	goto abort_due_to_error
 __425:
 	;
@@ -47948,7 +47949,7 @@ __428:
 	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5483,
+	Xsqlite3VdbeError(tls, p, ts+5502,
 		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
@@ -48380,7 +48381,7 @@ __78:
 		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5524, 0)
+	Xsqlite3VdbeError(tls, p, ts+5543, 0)
 	rc = SQLITE_BUSY
 	goto __523
 __522:
@@ -48440,7 +48441,7 @@ __530:
 	if !!(pSavepoint != 0) {
 		goto __531
 	}
-	Xsqlite3VdbeError(tls, p, ts+5575, libc.VaList(bp+88, zName))
+	Xsqlite3VdbeError(tls, p, ts+5594, libc.VaList(bp+88, zName))
 	rc = SQLITE_ERROR
 	goto __532
 __531:
@@ -48449,7 +48450,7 @@ __531:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5597, 0)
+		ts+5616, 0)
 	rc = SQLITE_BUSY
 	goto __534
 __533:
@@ -48635,7 +48636,7 @@ __564:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5651, 0)
+		ts+5670, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
 	goto __567
@@ -48678,13 +48679,13 @@ __562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5706
+				return ts + 5725
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5754
+					return ts + 5773
 				}
-				return ts + 5797
+				return ts + 5816
 			}()
 		}(), 0)
 
@@ -48767,7 +48768,7 @@ __576:
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5838)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5857)
 
 	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 __583
@@ -48971,7 +48972,7 @@ __88:
 	}
 
 	(*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
+	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fz = ts + 1573
 __602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
@@ -49580,7 +49581,7 @@ notExistsWithKey:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
 		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95560)
+	rc = Xsqlite3CorruptError(tls, 95563)
 	goto __683
 __682:
 	goto jump_to_p2
@@ -50358,7 +50359,7 @@ __767:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
 		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5866)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96638, ts+5885)
 	goto abort_due_to_error
 __770:
 	;
@@ -50468,7 +50469,7 @@ __780:
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
 		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96840)
+	rc = Xsqlite3CorruptError(tls, 96843)
 	goto abort_due_to_error
 __781:
 	;
@@ -50629,14 +50630,14 @@ __141:
 	libc.SetBitFieldPtr8Uint32(p+144, Bft(0), 0, 0x3)
 	goto __799
 __798:
-	zSchema = ts + 5883
+	zSchema = ts + 5902
 	(*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+5897,
+		ts+5916,
 		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 __800
@@ -50662,7 +50663,7 @@ __802:
 		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 97092)
+	rc = Xsqlite3CorruptError(tls, 97095)
 __803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
@@ -50852,7 +50853,7 @@ __820:
 		goto __825
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5940, 0)
+	Xsqlite3VdbeError(tls, p, ts+5959, 0)
 	goto abort_due_to_error
 __825:
 	;
@@ -51164,7 +51165,7 @@ __860:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
 		goto __862
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
 __862:
 	;
@@ -51214,7 +51215,7 @@ __867:
 	if !(rc != 0) {
 		goto __868
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
 __868:
 	;
@@ -51296,12 +51297,12 @@ __876:
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5977,
+		ts+5996,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6029
+				return ts + 6048
 			}
-			return ts + 6034
+			return ts + 6053
 		}()))
 	goto abort_due_to_error
 	goto __879
@@ -51443,7 +51444,7 @@ __171:
 		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6041, libc.VaList(bp+144, z1))
+	Xsqlite3VdbeError(tls, p, ts+6060, libc.VaList(bp+144, z1))
 __894:
 	;
 	goto abort_due_to_error
@@ -51561,7 +51562,7 @@ __904:
 	(*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+6070, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6089, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
 	goto __9
 
 __177:
@@ -51650,7 +51651,7 @@ __912:
 	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)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 768)).FisError
 __913:
 	;
@@ -51880,7 +51881,7 @@ __935:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
 		goto __940
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
 __940:
 	;
@@ -51956,7 +51957,7 @@ __945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
 		goto __947
 	}
-	z3 = Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp+168, zTrace))
+	z3 = Xsqlite3MPrintf(tls, db, ts+6099, 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)
@@ -52029,7 +52030,7 @@ __955:
 	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __957
 	}
-	rc = Xsqlite3CorruptError(tls, 99031)
+	rc = Xsqlite3CorruptError(tls, 99034)
 __957:
 	;
 __956:
@@ -52037,13 +52038,13 @@ __956:
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
 		goto __958
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
 __958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
 
-	Xsqlite3_log(tls, rc, ts+6086,
+	Xsqlite3_log(tls, rc, ts+6105,
 		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 __959
@@ -52099,13 +52100,13 @@ __966:
 	return rc
 
 too_big:
-	Xsqlite3VdbeError(tls, p, ts+5334, 0)
+	Xsqlite3VdbeError(tls, p, ts+5353, 0)
 	rc = SQLITE_TOOBIG
 	goto abort_due_to_error
 
 no_mem:
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3VdbeError(tls, p, ts+1490, 0)
+	Xsqlite3VdbeError(tls, p, ts+1509, 0)
 	rc = SQLITE_NOMEM
 	goto abort_due_to_error
 
@@ -52116,8 +52117,8 @@ abort_due_to_interrupt:
 	return int32(0)
 }
 
-var azType = [4]uintptr{ts + 6118, ts + 6127, ts + 6134,
-	ts + 6140}
+var azType = [4]uintptr{ts + 6137, ts + 6146, ts + 6153,
+	ts + 6159}
 var and_logic = [9]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(1), uint8(2), uint8(0), uint8(2), uint8(2)}
 var or_logic = [9]uint8{uint8(0), uint8(1), uint8(2), uint8(1), uint8(1), uint8(1), uint8(2), uint8(1), uint8(2)}
 var aMask = [12]uint8{
@@ -52172,16 +52173,16 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		}
 
 		if type1 < U32(12) {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6152,
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6171,
 				libc.VaList(bp, func() uintptr {
 					if type1 == U32(0) {
-						return ts + 6181
+						return ts + 6200
 					}
 					return func() uintptr {
 						if type1 == U32(7) {
-							return ts + 6186
+							return ts + 6205
 						}
-						return ts + 6191
+						return ts + 6210
 					}()
 				}()))
 			rc = SQLITE_ERROR
@@ -52201,10 +52202,10 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		rc = Xsqlite3_finalize(tls, (*Incrblob)(unsafe.Pointer(p)).FpStmt)
 		(*Incrblob)(unsafe.Pointer(p)).FpStmt = uintptr(0)
 		if rc == SQLITE_OK {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6199, libc.VaList(bp+8, iRow))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6218, libc.VaList(bp+8, iRow))
 			rc = SQLITE_ERROR
 		} else {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3663, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3682, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
 		}
 	}
 
@@ -52264,21 +52265,21 @@ __3:
 		goto __4
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6219, libc.VaList(bp, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6238, libc.VaList(bp, zTable))
 __4:
 	;
 	if !(pTab != 0 && !((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0))) {
 		goto __5
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6249, libc.VaList(bp+8, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6268, libc.VaList(bp+8, zTable))
 __5:
 	;
 	if !(pTab != 0 && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __6
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6285, libc.VaList(bp+16, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6304, libc.VaList(bp+16, zTable))
 __6:
 	;
 	if !!(pTab != 0) {
@@ -52322,7 +52323,7 @@ __11:
 		goto __13
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
-	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6325, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52349,7 +52350,7 @@ __19:
 	if !((*sColMap)(unsafe.Pointer(pFKey+36+uintptr(j)*8)).FiFrom == iCol) {
 		goto __22
 	}
-	zFault = ts + 6327
+	zFault = ts + 6346
 __22:
 	;
 	goto __20
@@ -52382,7 +52383,7 @@ __26:
 	if !(int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == iCol || int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == -2) {
 		goto __29
 	}
-	zFault = ts + 6339
+	zFault = ts + 6358
 __29:
 	;
 	goto __27
@@ -52403,7 +52404,7 @@ __25:
 		goto __30
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
-	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6366, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52501,7 +52502,7 @@ __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 328)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 328))))
@@ -52549,7 +52550,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99516)
+		return Xsqlite3MisuseError(tls, 99519)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52632,7 +52633,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99616)
+		return Xsqlite3MisuseError(tls, 99619)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52645,7 +52646,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 				if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-					return ts + 3663
+					return ts + 3682
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
@@ -55164,25 +55165,25 @@ 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 {
+	if Xsqlite3_strnicmp(tls, zTab, ts+6400, 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 {
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6408+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
 			return 1
 		}
 		if pSchema == uintptr(0) {
 			return 0
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5883+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5902+7) == 0 {
 			return 1
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6446+7) == 0 {
 			return 1
 		}
 	} else {
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6446+7) == 0 {
 			return 1
 		}
 	}
@@ -55262,7 +55263,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6441, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6460, zDb) == 0) {
 		goto __8
 	}
 
@@ -55383,7 +55384,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6446) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6465) != 0) {
 		goto __33
 	}
 	goto __14
@@ -55557,14 +55558,14 @@ __60:
 	;
 	goto __59
 __58:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6448, zTab) == 0) {
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6467, zTab) == 0) {
 		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
 	goto __62
 __61:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6452, zTab) == 0) {
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6471, zTab) == 0) {
 		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
@@ -55581,7 +55582,7 @@ __57:
 		goto __64
 	}
 	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 8))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6456, zTab) == 0) {
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6475, zTab) == 0) {
 		goto __65
 	}
 	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
@@ -55740,7 +55741,7 @@ __86:
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
 		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6465, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6484, libc.VaList(bp, zAs))
 	return WRC_Abort
 __90:
 	;
@@ -55748,14 +55749,14 @@ __90:
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
 		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6496, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6515, libc.VaList(bp+8, zAs))
 	return WRC_Abort
 __91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
 		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	return WRC_Abort
 __92:
 	;
@@ -55807,7 +55808,7 @@ __11:
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6551, libc.VaList(bp+16, zCol))
+		ts+6570, 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
@@ -55847,7 +55848,7 @@ __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 + 6586
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6605
 	*(*uintptr)(unsafe.Pointer(pExpr + 20)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
@@ -55860,23 +55861,23 @@ __101:
 __99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6595
+		zErr = ts + 6614
 	} else {
-		zErr = ts + 6610
+		zErr = ts + 6629
 	}
 	if !(zDb != 0) {
 		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6632, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6651, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
 	goto __105
 __104:
 	if !(zTab != 0) {
 		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp+56, zErr, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6664, libc.VaList(bp+56, zErr, zTab, zCol))
 	goto __107
 __106:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+80, zErr, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6674, libc.VaList(bp+80, zErr, zCol))
 __107:
 	;
 __105:
@@ -55979,15 +55980,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 + 6662
+	var zIn uintptr = ts + 6681
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6690
+		zIn = ts + 6709
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6708
+		zIn = ts + 6727
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6726
+		zIn = ts + 6745
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6744, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6763, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -56065,14 +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 + 6764
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
-				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
-				}
-				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
+				*(*int32)(unsafe.Pointer(pExpr + 8)) = libc.Bool32(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL)
+				*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IntValue)
+				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_INTEGER)
+
 				i = 0
 				p = pNC
 			__4:
@@ -56116,7 +56113,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+6775, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6783, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -56180,7 +56177,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+6792, libc.VaList(bp, pExpr))
+								ts+6800, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -56196,7 +56193,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+6856,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6864,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -56210,7 +56207,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+6892, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6900, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -56233,30 +56230,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+6920, libc.VaList(bp+16, pExpr))
+						ts+6928, 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 + 6963
+						zType = ts + 6971
 					} else {
-						zType = ts + 6970
+						zType = ts + 6978
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6980, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6988, 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+7008, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7016, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7030,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7038,
 						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+7074,
+						ts+7082,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -56328,15 +56325,15 @@ 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+7122, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7130, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 20)))
 				}
 
 				if nRef != (*NameContext)(unsafe.Pointer(pNC)).FnRef {
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_VarSelect)
-					*(*int32)(unsafe.Pointer(pNC + 24)) |= NC_VarSelect
 				}
+				*(*int32)(unsafe.Pointer(pNC + 24)) |= NC_Subquery
 			}
 			break
 
@@ -56344,7 +56341,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+7133, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7141, pExpr, pExpr)
 			}
 
 			break
@@ -56400,7 +56397,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+6533, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -56475,7 +56472,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7144, libc.VaList(bp, i, zType, mx))
+		ts+7152, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -56495,7 +56492,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+7200, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7208, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -56530,7 +56527,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+7234, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7242, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -56587,7 +56584,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+7240, libc.VaList(bp, i+1))
+				ts+7248, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -56615,7 +56612,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+7301, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7309, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -56829,7 +56826,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+7332, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7340, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -56869,7 +56866,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+7234) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7242) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -56880,7 +56877,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7371) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7379) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -56892,7 +56889,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+7377, 0)
+						ts+7385, 0)
 					return WRC_Abort
 				}
 
@@ -57681,7 +57678,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 		return
 	}
 
@@ -57756,7 +57753,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+7436, libc.VaList(bp, mxHeight))
+			ts+7444, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -58005,12 +58002,12 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7484,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7492,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7528
+						return ts + 7536
 					}
-					return ts + 1554
+					return ts + 1573
 				}(), nElem))
 			break
 		}
@@ -58049,7 +58046,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+7530)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -58075,7 +58072,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+7532, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7540, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 20)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -58103,7 +58100,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+7566, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7574, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -58150,7 +58147,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+7586,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7594,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 116 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -58175,7 +58172,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+7629, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7637, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -58750,7 +58747,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+7652,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7660,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -58873,7 +58870,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+7682, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7690, libc.VaList(bp, zObject))
 	}
 }
 
@@ -58929,10 +58926,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+6764) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7713) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6769) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7718) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -59362,13 +59359,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+7705) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7724) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7713) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7732) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7719) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7738) == 0 {
 		return 1
 	}
 	return 0
@@ -59572,7 +59569,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+7723, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7742, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -59650,7 +59647,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+7770, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7789, 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)
 
@@ -59744,7 +59741,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 + 7801
+		var zFmt uintptr = ts + 7820
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -59762,7 +59759,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+6533, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	}
 }
 
@@ -59803,7 +59800,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+7845, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7864, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 44 + 4)),
@@ -59833,11 +59830,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+7868, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7887, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
-				return ts + 1554
+				return ts + 1573
 			}
-			return ts + 7887
+			return ts + 7906
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -59964,7 +59961,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+7899, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7918, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 44 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 44)))
@@ -59979,11 +59976,11 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7917, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7936, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
-			return ts + 1554
+			return ts + 1573
 		}
-		return ts + 7887
+		return ts + 7906
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
@@ -60006,7 +60003,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+7530)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -60015,7 +60012,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+7938)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7957)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -60401,13 +60398,13 @@ 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+7940, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7943,
+			if Xsqlite3_strnicmp(tls, z, ts+7959, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7962,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
-							return ts + 4932
+							return ts + 4951
 						}
-						return ts + 1554
+						return ts + 1573
 					}(), pExpr))
 			} else {
 				codeReal(tls, v, z, negFlag, iMem)
@@ -60444,6 +60441,7 @@ func Xsqlite3ExprCodeLoadIndexColumn(tls *libc.TLS, pParse uintptr, pIdx uintptr
 func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr, pCol uintptr, regOut int32) {
 	var iAddr int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
+	var nErr int32 = (*Parse)(unsafe.Pointer(pParse)).FnErr
 
 	if (*Parse)(unsafe.Pointer(pParse)).FiSelfTab > 0 {
 		iAddr = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Parse)(unsafe.Pointer(pParse)).FiSelfTab-1, 0, regOut)
@@ -60457,6 +60455,9 @@ func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr
 	if iAddr != 0 {
 		Xsqlite3VdbeJumpHere(tls, v, iAddr)
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr > nErr {
+		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FerrByteOffset = -1
+	}
 }
 
 // Generate code to extract the value of the iCol-th column of a table.
@@ -60478,7 +60479,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+7970,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7989,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -60651,8 +60652,8 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[6]uintptr)(unsafe.Pointer(bp + 52)) = [6]uintptr{ts + 8000, ts + 8005, ts + 8010, ts + 6191,
-				ts + 6186, ts + 8018}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 52)) = [6]uintptr{ts + 8019, ts + 8024, ts + 8029, ts + 6210,
+				ts + 6205, ts + 8037}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
@@ -60660,7 +60661,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 8026
+						return ts + 8045
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 52 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*4))
 				}())
@@ -60675,6 +60676,7 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 	var p uintptr
 	var v uintptr
 	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+		var exprAff U8
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -60688,6 +60690,14 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 		if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr, iDataCur) != 0 {
 			continue
 		}
+
+		exprAff = U8(Xsqlite3ExprAffinity(tls, pExpr))
+		if int32(exprAff) <= SQLITE_AFF_BLOB && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_BLOB ||
+			int32(exprAff) == SQLITE_AFF_TEXT && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_TEXT ||
+			int32(exprAff) >= SQLITE_AFF_NUMERIC && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_NUMERIC {
+			continue
+		}
+
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 
 		if (*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow != 0 {
@@ -61027,7 +61037,7 @@ __73:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
 		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7970,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7989,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
 __76:
@@ -61260,7 +61270,7 @@ __43:
 		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+8031, libc.VaList(bp+8, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8050, libc.VaList(bp+8, pExpr))
 	goto __91
 __90:
 	return func() int32 {
@@ -61301,7 +61311,7 @@ __93:
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
 		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8058, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8077, libc.VaList(bp+16, pExpr))
 	goto __5
 __94:
 	;
@@ -61461,7 +61471,7 @@ __121:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
 		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7660,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
 __122:
 	;
@@ -61483,11 +61493,10 @@ __49:
 	return target
 
 __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) {
+	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) {
 		goto __123
 	}
+
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
 		goto __125
@@ -61527,7 +61536,7 @@ __126:
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	goto __5
 
 __55:
@@ -61558,13 +61567,19 @@ __129:
 	;
 __127:
 	;
-	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
+	addrINR = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable, 0, target)
 
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = U8(0)
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = okConstFactor
+	if !(inReg != target) {
+		goto __130
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
+	inReg = target
+__130:
+	;
 	Xsqlite3VdbeJumpHere(tls, v, addrINR)
-	Xsqlite3VdbeChangeP3(tls, v, addrINR, inReg)
 	goto __5
 
 __56:
@@ -61577,15 +61592,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __130
+		goto __131
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __131
+		goto __132
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__131:
+__132:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -61595,22 +61610,22 @@ __131:
 	pTest = bp + 100
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__130:
+__131:
 	;
 	i1 = 0
-__132:
+__133:
 	if !(i1 < nExpr-1) {
-		goto __134
+		goto __135
 	}
 	if !(pX != 0) {
-		goto __135
+		goto __136
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 100)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
-	goto __136
-__135:
-	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
+	goto __137
 __136:
+	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
+__137:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -61619,21 +61634,21 @@ __136:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*20)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __133
-__133:
-	i1 = i1 + 2
-	goto __132
 	goto __134
 __134:
+	i1 = i1 + 2
+	goto __133
+	goto __135
+__135:
 	;
 	if !(nExpr&1 != 0) {
-		goto __137
+		goto __138
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*20)).FpExpr, target)
-	goto __138
-__137:
-	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+	goto __139
 __138:
+	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+__139:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -61643,27 +61658,27 @@ __138:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __139
-	}
-	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8082, 0)
-	return 0
-__139:
-	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __140
 	}
-	Xsqlite3MayAbort(tls, pParse)
+	Xsqlite3ErrorMsg(tls, pParse,
+		ts+8101, 0)
+	return 0
 __140:
 	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __141
 	}
+	Xsqlite3MayAbort(tls, pParse)
+__141:
+	;
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+		goto __142
+	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __142
-__141:
+	goto __143
+__142:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -61672,7 +61687,7 @@ __141:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__142:
+__143:
 	;
 	goto __5
 
@@ -61683,7 +61698,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8132))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8151))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -63472,11 +63487,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+6381, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 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+8142, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8161, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -63488,13 +63503,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8170,
+		ts+8189,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8345,
+			ts+8364,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -63504,10 +63519,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8519, libc.VaList(bp, zDb, zDb))
+		ts+8538, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8666, 0)
+			ts+8685, 0)
 	}
 }
 
@@ -63571,7 +63586,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8817, libc.VaList(bp, zName))
+		ts+8836, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -63581,7 +63596,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8876, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8895, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -63590,7 +63605,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8882, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8901, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -63631,19 +63646,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8909, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8928, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9093,
+		ts+9112,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9398, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9417, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9414,
+		ts+9433,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -63651,7 +63666,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9472, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9491, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -63663,7 +63678,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9737, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9756, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63675,7 +63690,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9750,
+		ts+9769,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -63721,12 +63736,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9788, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9807, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9820, 0)
+			ts+9839, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -63736,11 +63751,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+9847)
+				ts+9866)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9906)
+				ts+9925)
 		}
 
 		if pDflt != 0 {
@@ -63753,12 +63768,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9959)
+					ts+9978)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10005)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10024)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -63769,7 +63784,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10032,
+			ts+10051,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 44)), zCol, *(*int32)(unsafe.Pointer(pNew + 44)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -63791,7 +63806,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+10178,
+				ts+10197,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -63839,14 +63854,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10408, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10427, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10442, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10461, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -63874,7 +63889,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+10472, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10491, 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
 	}
@@ -63914,18 +63929,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 + 10491
+		zType = ts + 10510
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10496
+		zType = ts + 10515
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10510,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10529,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10528
+					return ts + 10547
 				}
-				return ts + 10545
+				return ts + 10564
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -64009,11 +64024,11 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10582, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1554, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1573, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iSchema == 1))
 
 	Xsqlite3MayAbort(tls, pParse)
@@ -64026,17 +64041,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10584,
+		ts+10603,
 		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+10766,
+		ts+10785,
 		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+9737, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9756, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -64294,12 +64309,12 @@ 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+10897,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10916,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10920
+				return ts + 10939
 			}
-			return ts + 1554
+			return ts + 1573
 		}(), zWhen,
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg))
 	Xsqlite3_result_error(tls, pCtx, zErr, -1)
@@ -64339,8 +64354,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+10922, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 113494)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10941, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113516)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -64357,7 +64372,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, 113505)
+		rc = Xsqlite3CorruptError(tls, 113527)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -64379,7 +64394,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+10930, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10949, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -64419,12 +64434,12 @@ 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+10936, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10955, 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 + 10920
+							return ts + 10939
 						}
-						return ts + 1554
+						return ts + 1573
 					}()))
 				zReplace = zBuf2
 				nReplace = U32(Xsqlite3Strlen30(tls, zReplace))
@@ -64910,7 +64925,7 @@ __45:
 	if !((*Parse)(unsafe.Pointer(bp+20)).FzErrMsg != 0) {
 		goto __47
 	}
-	renameColumnParseError(tls, context, ts+1554, *(*uintptr)(unsafe.Pointer(argv + 1*4)), *(*uintptr)(unsafe.Pointer(argv + 2*4)), bp+20)
+	renameColumnParseError(tls, context, ts+1573, *(*uintptr)(unsafe.Pointer(argv + 1*4)), *(*uintptr)(unsafe.Pointer(argv + 2*4)), bp+20)
 	goto __48
 __47:
 	Xsqlite3_result_error_code(tls, context, rc)
@@ -65075,7 +65090,7 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 			if rc == SQLITE_ERROR && Xsqlite3WritableSchema(tls, db) != 0 {
 				Xsqlite3_result_value(tls, context, *(*uintptr)(unsafe.Pointer(argv + 3*4)))
 			} else if (*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0 {
-				renameColumnParseError(tls, context, ts+1554, *(*uintptr)(unsafe.Pointer(argv + 1*4)), *(*uintptr)(unsafe.Pointer(argv + 2*4)), bp+48)
+				renameColumnParseError(tls, context, ts+1573, *(*uintptr)(unsafe.Pointer(argv + 1*4)), *(*uintptr)(unsafe.Pointer(argv + 2*4)), bp+48)
 			} else {
 				Xsqlite3_result_error_code(tls, context, rc)
 			}
@@ -65278,7 +65293,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 114441)
+	rc = Xsqlite3CorruptError(tls, 114463)
 	goto drop_column_done
 __2:
 	;
@@ -65302,7 +65317,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10941, libc.VaList(bp, (int32((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int32(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10960, 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)
 
@@ -65383,19 +65398,19 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10582, 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+10948,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10967,
 		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 + 10976
+				return ts + 10995
 			}
-			return ts + 6127
+			return ts + 6146
 		}(),
 			zCol))
 	goto exit_drop_column
@@ -65404,7 +65419,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10988, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11007, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -65418,13 +65433,13 @@ __8:
 	goto exit_drop_column
 __9:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1554, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1573, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11036, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11055, 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+11157, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11176, 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
@@ -65542,11 +65557,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 + 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}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11194},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11215},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11235},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11254},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11273}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -65580,7 +65595,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+11277, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11296, 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)
 			}
@@ -65589,10 +65604,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+11300,
+					ts+11319,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11330, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11349, 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)
 			}
@@ -65610,9 +65625,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11348, FzCols: ts + 11361},
-	{FzName: ts + 11374, FzCols: ts + 11387},
-	{FzName: ts + 11415},
+	{FzName: ts + 11367, FzCols: ts + 11380},
+	{FzName: ts + 11393, FzCols: ts + 11406},
+	{FzName: ts + 11434},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65802,7 +65817,7 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11428}
+	FzName:     ts + 11447}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
@@ -66053,7 +66068,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11438}
+	FzName:     ts + 11457}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(72)
@@ -66067,7 +66082,7 @@ 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+11448,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11467,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
 					return (*StatAccum)(unsafe.Pointer(p)).FnEst
@@ -66080,7 +66095,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11453, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11472, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -66122,7 +66137,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+11459, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
+			Xsqlite3_str_appendf(tls, bp+48, ts+11478, 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--
@@ -66136,7 +66151,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11465}
+	FzName:     ts + 11484}
 
 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)
@@ -66180,7 +66195,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+11474, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11493, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -66197,7 +66212,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+11348, uint32(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11367, 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)
@@ -66353,7 +66368,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+11484, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11503, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -66410,7 +66425,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+11484, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11503, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -66457,9 +66472,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+11488)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11507)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11492)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11511)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -66542,7 +66557,7 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 	var v TRowcnt
 
 	if z == uintptr(0) {
-		z = ts + 1554
+		z = ts + 1573
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
 		v = uint64(0)
@@ -66564,15 +66579,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+11496, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11515, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11507, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11526, 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+11517, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11536, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -66848,11 +66863,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+11374, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11393, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11529,
-			ts+11583,
+			ts+11548,
+			ts+11602,
 			zDb)
 	}
 	return rc
@@ -66899,10 +66914,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+11348, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11367, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11635, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11654, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -66960,7 +66975,7 @@ 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+6441, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6460, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -66993,13 +67008,13 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zFile == uintptr(0)) {
 		goto __1
 	}
-	zFile = ts + 1554
+	zFile = ts + 1573
 __1:
 	;
 	if !(zName == uintptr(0)) {
 		goto __2
 	}
-	zName = ts + 1554
+	zName = ts + 1573
 __2:
 	;
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(db + 168 + 8))&0x4>>2)) != 0) {
@@ -67007,14 +67022,14 @@ __2:
 	}
 
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3835)
+	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3854)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11676, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11695, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
 	if !(rc == SQLITE_OK) {
 		goto __6
 	}
@@ -67051,7 +67066,7 @@ __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 116 + 7*4))+2) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11679,
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11698,
 		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 116 + 7*4))))
 	goto attach_error
 __11:
@@ -67065,7 +67080,7 @@ __12:
 	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __15
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11716, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11735, libc.VaList(bp+8, zName))
 	goto attach_error
 __15:
 	;
@@ -67129,7 +67144,7 @@ __4:
 		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11746, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11765, 0)
 	goto __23
 __22:
 	if !(rc == SQLITE_OK) {
@@ -67146,7 +67161,7 @@ __25:
 		goto __27
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db,
-		ts+11775, 0)
+		ts+11794, 0)
 	rc = SQLITE_ERROR
 __27:
 	;
@@ -67212,13 +67227,13 @@ __33:
 	}
 	Xsqlite3OomFault(tls, db)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 44)))
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+1509, 0)
 	goto __35
 __34:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 44)) == uintptr(0)) {
 		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11843, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11862, libc.VaList(bp+16, zFile))
 __36:
 	;
 __35:
@@ -67265,7 +67280,7 @@ func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zName == uintptr(0)) {
 		goto __1
 	}
-	zName = ts + 1554
+	zName = ts + 1573
 __1:
 	;
 	i = 0
@@ -67296,14 +67311,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11871, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11890, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11892, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11911, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -67311,7 +67326,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11918, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11937, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -67428,7 +67443,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11940}
+	FzName:     ts + 11959}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -67441,7 +67456,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11954}
+	FzName:     ts + 11973}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -67455,7 +67470,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+11968, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11987, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -67487,7 +67502,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+11992,
+						ts+12011,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -67662,7 +67677,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+12038, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12057, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -67688,11 +67703,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+12061, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12080, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12067, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12086, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12073, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12092, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -67739,7 +67754,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 + 7713
+		zCol = ts + 7732
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -67763,7 +67778,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+12100, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12119, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -68034,25 +68049,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6441) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6460) == 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+6381, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
 			if i == 1 {
-				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 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5902+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema+8,
-						ts+6389)
+						ts+6408)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*16)).FpSchema+8,
-						ts+5883)
+						ts+5902)
 				}
 			}
 		}
@@ -68073,12 +68088,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		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 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5902)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema+8,
-					ts+6389)
+					ts+6408)
 			}
 		}
 	}
@@ -68109,7 +68124,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+12115, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12134, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -68127,14 +68142,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 + 12123
+			zMsg = ts + 12142
 		} else {
-			zMsg = ts + 12136
+			zMsg = ts + 12155
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6664, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6674, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -68164,12 +68179,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+6381, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
-			return ts + 6427
+	if Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5902+7) == 0 {
+			return ts + 6446
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6389+7) == 0 {
-			return ts + 6408
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 {
+			return ts + 6427
 		}
 	}
 	return zName
@@ -68527,7 +68542,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+5883)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5902)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -68553,7 +68568,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6441, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6460, zName) {
 				goto __3
 			}
 
@@ -68606,13 +68621,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+12150, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12169, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12167, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12186, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -68650,13 +68665,13 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 		if Xsqlite3_stricmp(tls, zType, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit))) != 0 ||
 			Xsqlite3_stricmp(tls, zName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 1*4))) != 0 ||
 			Xsqlite3_stricmp(tls, zTblName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 2*4))) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1554, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1573, 0)
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6381, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6400, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12187,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12206,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -68816,9 +68831,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -68834,7 +68849,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12229, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12248, 0)
 	return
 __4:
 	;
@@ -68862,9 +68877,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10491
+			return ts + 10510
 		}
-		return ts + 8876
+		return ts + 8895
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -68880,9 +68895,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -68913,12 +68928,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12270,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12289,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10491
+				return ts + 10510
 			}
-			return ts + 8876
+			return ts + 8895
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -68933,7 +68948,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12291, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12310, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -69020,7 +69035,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+12326, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12345, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -69044,7 +69059,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+12343, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12362, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -69064,7 +69079,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 + 12326
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12345
 	(*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)
@@ -69076,7 +69091,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+12326, pRet+8) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12345, pRet+8) ==
 		pRet+8 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -69110,7 +69125,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+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12396, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -69118,13 +69133,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+12400, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(6)), ts+12419, 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+12407, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(9)), ts+12426, 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--
@@ -69161,7 +69176,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+12417, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12436, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -69325,10 +69340,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+12443,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12462,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12488, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12507, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint32(unsafe.Sizeof(Expr{})))
@@ -69359,7 +69374,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+12529, 0)
+			ts+12548, 0)
 	}
 }
 
@@ -69404,7 +69419,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12581, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12600, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -69493,7 +69508,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12622, 0)
+		ts+12641, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -69588,7 +69603,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12678, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12697, 0)
 	goto generated_done
 __2:
 	;
@@ -69601,13 +69616,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12721, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12740, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12729, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12748, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -69641,13 +69656,19 @@ __10:
 
 	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
 __11:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_RAISE) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = (*Column)(unsafe.Pointer(pCol)).Faffinity
+__12:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12736,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12755,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -69768,13 +69789,13 @@ __3:
 	;
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
-		zSep = ts + 1554
-		zSep2 = ts + 12767
-		zEnd = ts + 4957
+		zSep = ts + 1573
+		zSep2 = ts + 12786
+		zEnd = ts + 4976
 	} else {
-		zSep = ts + 12769
-		zSep2 = ts + 12773
-		zEnd = ts + 12778
+		zSep = ts + 12788
+		zSep2 = ts + 12792
+		zEnd = ts + 12797
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -69782,7 +69803,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12781, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12800, 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('(')
@@ -69816,17 +69837,17 @@ __5:
 	goto __6
 __6:
 	;
-	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3663, libc.VaList(bp, zEnd))
+	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3682, libc.VaList(bp, zEnd))
 	return zStmt
 }
 
 var azType1 = [6]uintptr{
-	ts + 1554,
-	ts + 12795,
-	ts + 12801,
-	ts + 12806,
-	ts + 12811,
-	ts + 12801,
+	ts + 1573,
+	ts + 12814,
+	ts + 12820,
+	ts + 12825,
+	ts + 12830,
+	ts + 12820,
 }
 
 func resizeIndexObject(tls *libc.TLS, db uintptr, pIdx uintptr, N int32) int32 {
@@ -70216,7 +70237,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
 		if pSelect != 0 || !(int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM) && (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1554, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1573, 0)
 			return
 		}
 		(*Table)(unsafe.Pointer(p)).Ftnum = (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum
@@ -70233,10 +70254,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+12817,
-						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1554)))
+						ts+12836,
+						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1573)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12850,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12869,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -70255,11 +70276,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+12877, 0)
+				ts+12896, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12927, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12946, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 28)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -70293,7 +70314,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12959, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12978, 0)
 			return
 		}
 	}
@@ -70318,11 +70339,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 + 8876
-			zType2 = ts + 13003
+			zType = ts + 8895
+			zType2 = ts + 13022
 		} else {
-			zType = ts + 10491
-			zType2 = ts + 13009
+			zType = ts + 10510
+			zType2 = ts + 13028
 		}
 
 		if pSelect != 0 {
@@ -70393,11 +70414,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+13014, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13033, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13029,
+			ts+13048,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -70413,13 +70434,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+13127,
+					ts+13146,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13169, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13188, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -70434,7 +70455,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+9398) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9417) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -70464,7 +70485,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+13203, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13222, 0)
 	goto create_view_fail
 __1:
 	;
@@ -70480,7 +70501,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+4, pParse, iDb, ts+10491, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+4, pParse, iDb, ts+10510, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+4, pSelect) != 0) {
 		goto __3
 	}
@@ -70562,7 +70583,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13239, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13258, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -70687,13 +70708,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+13269, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13288, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13284,
+		ts+13303,
 		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)
 }
@@ -70734,10 +70755,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+13351, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13370, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11300,
+				ts+11319,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -70769,12 +70790,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+13365,
+			ts+13384,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13410,
+		ts+13429,
 		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)
@@ -70802,11 +70823,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+6381, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3286, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3305, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7133, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7141, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -70884,9 +70905,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 	zArg2 = uintptr(0)
@@ -70945,21 +70966,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13477, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13496, 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+13505, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13524, 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+13539, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13558, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -70971,7 +70992,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11492, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11511, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -71035,7 +71056,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13571,
+		ts+13590,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*16)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -71047,7 +71068,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13634, 0)
+		ts+13653, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -71132,7 +71153,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13728,
+		ts+13747,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*20)).FzEName))
 	goto fk_end
 __23:
@@ -71359,12 +71380,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+13774,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13793,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13802
+							return ts + 13821
 						}
-						return ts + 13808
+						return ts + 13827
 					}()))
 				return 1
 			}
@@ -71485,7 +71506,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+132, pParse, iDb, ts+13813, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+132, pParse, iDb, ts+13832, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+132, pTblName) != 0) {
 		goto __10
 	}
@@ -71504,7 +71525,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13819,
+		ts+13838,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -71530,26 +71551,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13869, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13888, 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+13897, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13916, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13922, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13941, 0)
 	goto exit_create_index
 __17:
 	;
@@ -71563,7 +71584,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13813, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13832, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -71578,7 +71599,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13956, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13975, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -71590,7 +71611,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13990, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14009, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -71619,7 +71640,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14014, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14033, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -71640,9 +71661,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -71681,7 +71702,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13813)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13832)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -71782,7 +71803,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14037, 0)
+		ts+14056, 0)
 	goto exit_create_index
 __56:
 	;
@@ -71999,7 +72020,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14098, libc.VaList(bp+48, 0))
+		ts+14117, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -72051,8 +72072,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14140, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14159, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121859)
 	goto exit_create_index
 __101:
 	;
@@ -72098,12 +72119,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14157,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14176,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
-				return ts + 1554
+				return ts + 1573
 			}
-			return ts + 14177
+			return ts + 14196
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -72111,7 +72132,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14185,
+		ts+14204,
 		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,
@@ -72125,7 +72146,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14244, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14263, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -72286,7 +72307,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14271, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14290, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -72301,7 +72322,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14289, libc.VaList(bp+8, 0))
+		ts+14308, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -72312,9 +72333,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -72340,9 +72361,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14362,
+		ts+14381,
 		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+11488, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11507, (*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)
@@ -72477,7 +72498,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+14422,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14441,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -72685,12 +72706,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+14458,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14477,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14494
+				return ts + 14513
 			}
-			return ts + 14497
+			return ts + 14516
 		}()))
 	goto append_from_error
 __1:
@@ -72859,7 +72880,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14503, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14522, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -72895,9 +72916,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14509
+				return ts + 14528
 			}
-			return ts + 14518
+			return ts + 14537
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -72922,7 +72943,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14503, ts + 14525, ts + 14509}
+var az = [3]uintptr{ts + 14522, ts + 14544, ts + 14528}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -72937,7 +72958,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+14533, 0)
+				ts+14552, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -73074,17 +73095,17 @@ 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+14603, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14622, 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+14614, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14633, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
-			Xsqlite3_str_append(tls, bp+8, ts+1567, 1)
+			Xsqlite3_str_append(tls, bp+8, ts+1586, 1)
 			Xsqlite3_str_appendall(tls, bp+8, zCol)
 		}
 	}
@@ -73107,11 +73128,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+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12080, 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+14617, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14636, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -73241,7 +73262,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14626, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14645, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -73337,7 +73358,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+14672, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14691, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -73530,7 +73551,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14702, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14721, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -73810,7 +73831,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+14733,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14752,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -73842,11 +73863,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+14766, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14785, 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+14795, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14814, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -74097,7 +74118,7 @@ __20:
 	goto __16
 __15:
 	wcf = U16(WHERE_ONEPASS_DESIRED | WHERE_DUPLICATES_OK)
-	if !((*NameContext)(unsafe.Pointer(bp+8)).FncFlags&NC_VarSelect != 0) {
+	if !((*NameContext)(unsafe.Pointer(bp+8)).FncFlags&NC_Subquery != 0) {
 		goto __23
 	}
 	bComplex = 1
@@ -74350,7 +74371,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14833)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14852)
 __62:
 	;
 delete_from_cleanup:
@@ -74465,7 +74486,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+11348) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11367) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -74695,7 +74716,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 + 8005, ts + 8000, ts + 6181}
+var azType2 = [5]uintptr{ts + 6210, ts + 6205, ts + 8024, ts + 8019, ts + 6200}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -74754,7 +74775,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+14846, -1)
+					Xsqlite3_result_error(tls, context, ts+14865, -1)
 					return
 				}
 				iVal = -iVal
@@ -75058,7 +75079,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14863, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14882, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -75404,7 +75425,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+14868, -1)
+		Xsqlite3_result_error(tls, context, ts+14887, -1)
 		return
 	}
 	if argc == 3 {
@@ -75414,7 +75435,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+14901, -1)
+				ts+14920, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -75467,7 +75488,7 @@ func errlogFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	_ = argc
 	_ = context
-	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3663, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4)))))
+	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3682, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4)))))
 }
 
 func compileoptionusedFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
@@ -75507,13 +75528,13 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 
 			var zVal uintptr
 			r1 = Xsqlite3_value_double(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+4925, libc.VaList(bp, r1))
+			Xsqlite3_str_appendf(tls, pStr, ts+4944, libc.VaList(bp, r1))
 			zVal = Xsqlite3_str_value(tls, pStr)
 			if zVal != 0 {
 				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+14946, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14965, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -75521,7 +75542,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 		}
 	case SQLITE_INTEGER:
 		{
-			Xsqlite3_str_appendf(tls, pStr, ts+1334, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
+			Xsqlite3_str_appendf(tls, pStr, ts+1353, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
 			break
 
 		}
@@ -75550,13 +75571,13 @@ 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+14953, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14972, libc.VaList(bp+24, zArg))
 			break
 
 		}
 	default:
 		{
-			Xsqlite3_str_append(tls, pStr, ts+1555, 4)
+			Xsqlite3_str_append(tls, pStr, ts+1574, 4)
 			break
 
 		}
@@ -75697,7 +75718,7 @@ func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 	var ch U32
 	var c U8
 	var d U8
-	zPass = ts + 1554
+	zPass = ts + 1573
 	nPass = 0
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -75979,7 +76000,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10920}
+var azOne = [1]uintptr{ts + 10939}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -75991,7 +76012,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	zIn = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	if zIn == uintptr(0) {
-		zIn = ts + 1554
+		zIn = ts + 1573
 	}
 	for i = 0; *(*U8)(unsafe.Pointer(zIn + uintptr(i))) != 0 && !(int32(Xsqlite3CtypeMap[*(*U8)(unsafe.Pointer(zIn + uintptr(i)))])&0x02 != 0); i++ {
 	}
@@ -76015,7 +76036,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+14956, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14975, 4, uintptr(0))
 	}
 }
 
@@ -76040,7 +76061,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+12100, -1)
+		Xsqlite3_result_error(tls, context, ts+12119, -1)
 		return
 	}
 
@@ -76118,7 +76139,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+14846, -1)
+			Xsqlite3_result_error(tls, context, ts+14865, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -76380,7 +76401,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+14961, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14980, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -76400,14 +76421,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14967, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14986, 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+14967, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14986, 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+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)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14986, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14986, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -76648,109 +76669,109 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 }
 
 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 + 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(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(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 + 14991},
+	{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 + 15011},
+	{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 + 15024},
+	{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 + 15042},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15051},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15059},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15059},
+	{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_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15100},
+	{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 + 15125},
+	{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 + 15134},
+	{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 + 15145},
+	{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 + 15152},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15166},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15166},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15172},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15172},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15178},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15178},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15183},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15183},
+	{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 + 15183},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15187},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FzName: ts + 15187},
+	{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 + 15187},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15191},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15198},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15206},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15213},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15219},
+	{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 + 15233},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15241},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15246},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15256},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15262},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15268},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15272},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15272},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15278},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15285},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15292},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15303},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15310},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15325},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15342},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15353},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15359},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15377},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15385},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15399},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15407},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15423},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15423},
+	{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 + 15433},
+	{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 + 15437},
+	{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 + 15443},
+	{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 + 15447},
+	{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 + 15447},
+	{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 + 15453},
+	{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 + 15453},
+	{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 + 15466},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14986},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14986},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6605},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6605},
 	{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 + 15523},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15476},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15484},
+	{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 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15496},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15499},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15503},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15509},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15499},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15514},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15518},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15522},
 	{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 + 15532},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15537},
 	{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 + 15556},
+	{FnArg: int8(2), 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 + 15553},
+	{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 + 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 + 15565},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15570},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15575},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15580},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15586},
 	{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}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15598},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15603},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15611},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15619},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15622},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6605},
+	{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 + 15627}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -76871,7 +76892,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+15612,
+				ts+15631,
 				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)
@@ -77531,8 +77552,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 + 6452, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 32)) = Token{Fz: ts + 6448, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 24)) = Token{Fz: ts + 6471, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 32)) = Token{Fz: ts + 6467, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -77611,7 +77632,7 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 			(*Token)(unsafe.Pointer(bp + 40)).Fz = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 			(*Token)(unsafe.Pointer(bp + 40)).Fn = uint32(Xsqlite3Strlen30(tls, (*Token)(unsafe.Pointer(bp+40)).Fz))
 
-			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5136)
+			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5155)
 			if pRaise != 0 {
 				(*Expr)(unsafe.Pointer(pRaise)).FaffExpr = int8(OE_Abort)
 			}
@@ -78033,7 +78054,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7970, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7989, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -78501,7 +78522,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15657,
+		ts+15676,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*16)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -78526,7 +78547,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15698,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15717,
 		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
@@ -78675,7 +78696,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15730,
+		ts+15749,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -78685,7 +78706,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15782, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15801, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -78737,7 +78758,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15807,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15826,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -78745,7 +78766,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15853, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15872, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -79157,7 +79178,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15874)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15893)
 __125:
 	;
 insert_cleanup:
@@ -79472,7 +79493,7 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 						fallthrough
 					case OE_Fail:
 						{
-							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12080, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 								(*Column)(unsafe.Pointer(pCol)).FzCnName))
 
 							Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
@@ -80564,13 +80585,13 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131895)
+	return Xsqlite3MisuseError(tls, 131931)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
 		goto __2
 	}
-	zSql = ts + 1554
+	zSql = ts + 1573
 __2:
 	;
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -81049,7 +81070,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12100, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12119, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -81058,7 +81079,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15888
+		zEntry = ts + 15907
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -81073,7 +81094,7 @@ __5:
 	if !(ii < int32(uint32(unsafe.Sizeof(azEndings))/uint32(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12080, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -81109,7 +81130,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15911, uint32(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15930, uint32(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -81123,7 +81144,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15920, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15939, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -81147,7 +81168,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15924, uint32(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15943, uint32(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -81165,7 +81186,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15930, libc.VaList(bp+16, zEntry, zFile))
+		ts+15949, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -81192,7 +81213,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15973, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15992, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -81230,7 +81251,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+16005, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16024, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -81240,7 +81261,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16042,
+	ts + 16061,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -81395,7 +81416,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+16045, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16064, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -81403,63 +81424,63 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 }
 
 var pragCName = [57]uintptr{
-	ts + 5057,
-	ts + 16084,
-	ts + 8876,
-	ts + 16088,
-	ts + 16093,
-	ts + 16096,
-	ts + 16106,
-	ts + 16116,
-	ts + 16122,
-	ts + 16126,
-	ts + 16131,
-	ts + 16136,
-	ts + 16144,
+	ts + 5076,
+	ts + 16103,
+	ts + 8895,
+	ts + 16107,
+	ts + 16112,
+	ts + 16115,
+	ts + 16125,
+	ts + 16135,
+	ts + 16141,
+	ts + 16145,
+	ts + 16150,
 	ts + 16155,
-	ts + 16158,
-	ts + 16165,
-	ts + 16126,
-	ts + 16131,
-	ts + 16172,
+	ts + 16163,
+	ts + 16174,
 	ts + 16177,
-	ts + 16180,
-	ts + 16187,
-	ts + 16122,
-	ts + 16126,
-	ts + 16193,
-	ts + 16198,
-	ts + 16203,
-	ts + 16126,
-	ts + 16207,
-	ts + 16131,
-	ts + 16215,
-	ts + 16219,
-	ts + 16224,
-	ts + 11492,
-	ts + 11488,
-	ts + 16230,
-	ts + 16235,
-	ts + 16240,
-	ts + 16084,
-	ts + 16126,
-	ts + 16245,
-	ts + 16252,
+	ts + 16184,
+	ts + 16145,
+	ts + 16150,
+	ts + 16191,
+	ts + 16196,
+	ts + 16199,
+	ts + 16206,
+	ts + 16141,
+	ts + 16145,
+	ts + 16212,
+	ts + 16217,
+	ts + 16222,
+	ts + 16145,
+	ts + 16226,
+	ts + 16150,
+	ts + 16234,
+	ts + 16238,
+	ts + 16243,
+	ts + 11511,
+	ts + 11507,
+	ts + 16249,
+	ts + 16254,
 	ts + 16259,
-	ts + 8876,
-	ts + 16267,
-	ts + 5060,
-	ts + 16273,
-	ts + 16084,
-	ts + 16126,
+	ts + 16103,
+	ts + 16145,
+	ts + 16264,
+	ts + 16271,
 	ts + 16278,
-	ts + 16283,
-	ts + 15480,
-	ts + 16288,
-	ts + 16301,
-	ts + 16310,
-	ts + 16317,
-	ts + 16328,
+	ts + 8895,
+	ts + 16286,
+	ts + 5079,
+	ts + 16292,
+	ts + 16103,
+	ts + 16145,
+	ts + 16297,
+	ts + 16302,
+	ts + 15499,
+	ts + 16307,
+	ts + 16320,
+	ts + 16329,
+	ts + 16336,
+	ts + 16347,
 }
 
 // Definitions of all built-in pragmas
@@ -81476,238 +81497,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16336,
+	{FzName: ts + 16355,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16351,
+	{FzName: ts + 16370,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16366,
+	{FzName: ts + 16385,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16378,
+	{FzName: ts + 16397,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16394,
+	{FzName: ts + 16413,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16317,
+	{FzName: ts + 16336,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16407,
+	{FzName: ts + 16426,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16419,
+	{FzName: ts + 16438,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16439,
+	{FzName: ts + 16458,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CellSizeCk)},
-	{FzName: ts + 16455,
+	{FzName: ts + 16474,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16476,
+	{FzName: ts + 16495,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16491,
+	{FzName: ts + 16510,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16507,
+	{FzName: ts + 16526,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16521,
+	{FzName: ts + 16540,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16534,
+	{FzName: ts + 16553,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16548,
+	{FzName: ts + 16567,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16567,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_DeferFKs)},
 	{FzName: ts + 16586,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_DeferFKs)},
+	{FzName: ts + 16605,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16609,
+	{FzName: ts + 16628,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16618,
+	{FzName: ts + 16637,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16636,
+	{FzName: ts + 16655,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16653,
+	{FzName: ts + 16672,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16666,
+	{FzName: ts + 16685,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16681,
+	{FzName: ts + 16700,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16699,
+	{FzName: ts + 16718,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16709,
+	{FzName: ts + 16728,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16723,
+	{FzName: ts + 16742,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16739,
+	{FzName: ts + 16758,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16764,
+	{FzName: ts + 16783,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16783,
+	{FzName: ts + 16802,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16794,
+	{FzName: ts + 16813,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16805,
+	{FzName: ts + 16824,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16817,
+	{FzName: ts + 16836,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16833,
+	{FzName: ts + 16852,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16846,
+	{FzName: ts + 16865,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16865,
+	{FzName: ts + 16884,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16884,
+	{FzName: ts + 16903,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16897,
+	{FzName: ts + 16916,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16912,
+	{FzName: ts + 16931,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16922,
+	{FzName: ts + 16941,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16934,
+	{FzName: ts + 16953,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16943,
+	{FzName: ts + 16962,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16954,
+	{FzName: ts + 16973,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16964,
+	{FzName: ts + 16983,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16976,
+	{FzName: ts + 16995,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16987,
+	{FzName: ts + 17006,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16999,
+	{FzName: ts + 17018,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17016,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_RecTriggers)},
 	{FzName: ts + 17035,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_RecTriggers)},
+	{FzName: ts + 17054,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17061,
+	{FzName: ts + 17080,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17076,
+	{FzName: ts + 17095,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17090,
+	{FzName: ts + 17109,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17109,
+	{FzName: ts + 17128,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17123,
+	{FzName: ts + 17142,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17139,
+	{FzName: ts + 17158,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17151,
+	{FzName: ts + 17170,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17162,
+	{FzName: ts + 17181,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17173,
+	{FzName: ts + 17192,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17185,
+	{FzName: ts + 17204,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17196,
+	{FzName: ts + 17215,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17217,
+	{FzName: ts + 17236,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17225,
+	{FzName: ts + 17244,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17240,
+	{FzName: ts + 17259,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17253,
-		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
 	{FzName: ts + 17272,
+		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
+	{FzName: ts + 17291,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17287,
+	{FzName: ts + 17306,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -81729,7 +81750,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 17303))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 17322))
 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)}
@@ -81741,10 +81762,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+17328) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17347) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17357) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -81753,13 +81774,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+8026) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8045) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17345) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17364) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17350) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17369) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -81774,9 +81795,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+16278) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16297) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17362) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17381) == 0 {
 		return 2
 	} else {
 		return 0
@@ -81790,7 +81811,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+17369, 0)
+				ts+17388, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpBt)
@@ -81881,19 +81902,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17431
+		zName = ts + 17450
 		break
 	case OE_SetDflt:
-		zName = ts + 17440
+		zName = ts + 17459
 		break
 	case OE_Cascade:
-		zName = ts + 17452
+		zName = ts + 17471
 		break
 	case OE_Restrict:
-		zName = ts + 17460
+		zName = ts + 17479
 		break
 	default:
-		zName = ts + 17469
+		zName = ts + 17488
 		break
 	}
 	return zName
@@ -81910,7 +81931,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17479, ts + 17486, ts + 17494, ts + 17498, ts + 17362, ts + 17507,
+	ts + 17498, ts + 17505, ts + 17513, ts + 17517, ts + 17381, ts + 17526,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -81957,13 +81978,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17511
+			zType = ts + 17530
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17513
+			zType = ts + 17532
 		} else {
-			zType = ts + 7528
+			zType = ts + 7536
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17515,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17534,
 			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),
@@ -81971,7 +81992,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17522, ts + 17527, ts + 17535}
+var azEnc = [4]uintptr{uintptr(0), ts + 17541, ts + 17546, ts + 17554}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -82122,6 +82143,7 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp7 int32
 	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
@@ -82218,7 +82240,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17543, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17562, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -82257,7 +82279,7 @@ __8:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 484)) != 0) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 484))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 484))))
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 484)))
 __10:
 	;
@@ -82479,7 +82501,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17547) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17566) == 0) {
 		goto __64
 	}
 	b = 2
@@ -82551,7 +82573,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17338
+	zRet = ts + 17357
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -82589,7 +82611,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17328
+	zRet = ts + 17347
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -82876,7 +82898,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 532)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17552, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17571, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -82895,7 +82917,7 @@ __127:
 	if !(*(*int8)(unsafe.Pointer(zRight)) != 0) {
 		goto __128
 	}
-	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+16, zRight))
+	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+16, zRight))
 	goto __129
 __128:
 	Xsqlite3_temp_directory = uintptr(0)
@@ -82917,7 +82939,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17577, 0)
+		ts+17596, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -82971,7 +82993,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17630) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17649) == 0) {
 		goto __142
 	}
 
@@ -83068,13 +83090,13 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17636
+			return ts + 17655
 		}
-		return ts + 17644
+		return ts + 17663
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
-			Xsqlite3ColumnType(tls, pCol, ts+1554),
+			Xsqlite3ColumnType(tls, pCol, ts+1573),
 			func() int32 {
 				if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf>>0)) != 0 {
 					return 1
@@ -83139,7 +83161,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17651, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17670, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -83152,7 +83174,7 @@ __172:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __173
 	}
-	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1490, 0)
+	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1509, 0)
 	(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 __173:
 	;
@@ -83185,29 +83207,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10491
+	zType = ts + 10510
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12721
+	zType = ts + 12740
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17667
+	zType = ts + 17686
 	goto __183
 __182:
-	zType = ts + 8876
+	zType = ts + 8895
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17693,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*16)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -83273,7 +83295,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17681, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17700, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -83283,7 +83305,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17686,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17705,
 		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))))
@@ -83320,8 +83342,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 540)) = [3]uintptr{ts + 17691, ts + 17693, ts + 16155}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17695,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 540)) = [3]uintptr{ts + 17710, ts + 17712, ts + 16174}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17714,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -83354,7 +83376,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17720,
 		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)))
@@ -83376,7 +83398,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17705, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17724, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -83440,7 +83462,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7536, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -83456,7 +83478,7 @@ __218:
 	if !(i6 < int32(uint32(unsafe.Sizeof(aPragmaName))/uint32(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7536, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -83491,7 +83513,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17708,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17727,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -83499,7 +83521,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+17717))
+			ts+17736))
 	goto __227
 __227:
 	j2++
@@ -83688,7 +83710,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17722, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17741, 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)))
@@ -83905,7 +83927,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+17726, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*16)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17745, 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)
@@ -84016,7 +84038,7 @@ __307:
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17750,
+		ts+17769,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
@@ -84115,7 +84137,7 @@ __321:
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17786, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17805, 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) {
@@ -84137,7 +84159,7 @@ __326:
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17806,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17825,
 		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)
@@ -84150,7 +84172,7 @@ __329:
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17828,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17847,
 		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 __332
@@ -84168,11 +84190,11 @@ __331:
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 564)), j4, 3)
 __334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17851, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17870, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17853,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17872,
 		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)
 __333:
@@ -84218,7 +84240,7 @@ __339:
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17873,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17892,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
@@ -84252,89 +84274,103 @@ __344:
 
 	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+17903)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17922)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17908)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17927)
 	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)
 
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __345
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_IdxRowid, *(*int32)(unsafe.Pointer(bp + 568))+j4, 3)
+	jmp7 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 3, 0, r1+int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn)-1)
+
+	Xsqlite3VdbeLoadString(tls, v, 3,
+		ts+17948)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17984)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp7)
+__345:
+	;
 	label6 = 0
 	kk = 0
-__345:
+__346:
 	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) {
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*4)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
 		goto __349
 	}
-	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+	goto __347
 __349:
+	;
+	if !(label6 == 0) {
+		goto __350
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__350:
 	;
 	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:
+	kk++
+	goto __346
+	goto __348
+__348:
 	;
 	if !(label6 != 0) {
-		goto __350
+		goto __351
 	}
 	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
 	Xsqlite3VdbeResolveLabel(tls, v, label6)
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17922)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17929)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17995)
 	Xsqlite3VdbeGoto(tls, v, jmp5-1)
 	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-__350:
+__351:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __351
+		goto __352
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__352:
+__353:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __354
+		goto __355
 	}
 	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 __355
+		goto __356
 	}
-	goto __353
-__355:
+	goto __354
+__356:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
-	goto __353
-__353:
-	kk++
-	goto __352
 	goto __354
 __354:
+	kk++
+	goto __353
+	goto __355
+__355:
 	;
 	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)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18022)
 	Xsqlite3VdbeGoto(tls, v, jmp5)
 	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
-__351:
+__352:
 	;
 	Xsqlite3VdbeJumpHere(tls, v, jmp4)
 	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 576)))
@@ -84351,20 +84387,20 @@ __340:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 564)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __356
+		goto __357
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17983)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+18049)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__357:
+__358:
 	if !(pIdx5 != 0) {
-		goto __359
-	}
-	if !(pPk1 == pIdx5) {
 		goto __360
 	}
-	goto __358
-__360:
+	if !(pPk1 == pIdx5) {
+		goto __361
+	}
+	goto __359
+__361:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 568))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -84373,21 +84409,21 @@ __360:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __358
-__358:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __357
 	goto __359
 __359:
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
+	goto __358
+	goto __360
+__360:
 	;
 	if !(pPk1 != 0) {
-		goto __361
+		goto __362
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__361:
+__362:
 	;
-__356:
+__357:
 	;
 	goto __291
 __291:
@@ -84405,14 +84441,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(endCode))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __362
+		goto __363
 	}
 	(*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 + 18012
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*20 + 16)) = ts + 18078
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*20)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*20 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__362:
+__363:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -84420,27 +84456,27 @@ __362:
 
 __45:
 	if !!(zRight != 0) {
-		goto __363
+		goto __364
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __365
-	}
-	goto pragma_out
-__365:
-	;
-	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __364
-__363:
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
 		goto __366
 	}
+	goto pragma_out
+__366:
+	;
+	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
+	goto __365
+__364:
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
+		goto __367
+	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__367:
+__368:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __369
+		goto __370
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __370
+		goto __371
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -84449,25 +84485,25 @@ __367:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __369
-__370:
-	;
-	goto __368
-__368:
-	pEnc += 8
-	goto __367
-	goto __369
-__369:
-	;
-	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __371
-	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18015, libc.VaList(bp+456, zRight))
+	goto __370
 __371:
 	;
-__366:
+	goto __369
+__369:
+	pEnc += 8
+	goto __368
+	goto __370
+__370:
 	;
-__364:
+	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
+		goto __372
+	}
+	Xsqlite3ErrorMsg(tls, pParse, ts+18081, libc.VaList(bp+456, zRight))
+__372:
+	;
+__367:
+	;
+__365:
 	;
 	goto __15
 
@@ -84475,15 +84511,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 __372
+		goto __373
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(setCookie))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __374
+		goto __375
 	}
 	goto __15
-__374:
+__375:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fp1 = iDb
@@ -84491,41 +84527,41 @@ __374:
 	(*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 __375
+		goto __376
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fopcode = U8(OP_Noop)
-__375:
+__376:
 	;
-	goto __373
-__372:
+	goto __374
+__373:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(readCookie))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __376
+		goto __377
 	}
 	goto __15
-__376:
+__377:
 	;
 	(*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)
-__373:
+__374:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__377:
+__378:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __378
+		goto __379
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __377
-__378:
+	goto __378
+__379:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -84540,31 +84576,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __379
-	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17345) == 0) {
 		goto __380
 	}
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17364) == 0) {
+		goto __381
+	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __381
-__380:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18040) == 0) {
-		goto __382
+	goto __382
+__381:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18106) == 0) {
+		goto __383
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __383
-__382:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17498) == 0) {
-		goto __384
+	goto __384
+__383:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17517) == 0) {
+		goto __385
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
+__385:
+	;
 __384:
 	;
-__383:
+__382:
 	;
-__381:
-	;
-__379:
+__380:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -84574,10 +84610,10 @@ __379:
 
 __49:
 	if !(zRight != 0) {
-		goto __385
+		goto __386
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__385:
+__386:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -84597,19 +84633,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __386
+		goto __387
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __388
+		goto __389
 	}
 	goto __15
-__388:
+__389:
 	;
-	goto __387
-__386:
-	opMask = U32(0xfffe)
+	goto __388
 __387:
+	opMask = U32(0xfffe)
+__388:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -84618,86 +84654,86 @@ __387:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__389:
+__390:
 	if !(iDb <= iDbLast) {
-		goto __391
-	}
-	if !(iDb == 1) {
 		goto __392
 	}
-	goto __390
-__392:
+	if !(iDb == 1) {
+		goto __393
+	}
+	goto __391
+__393:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__393:
+__394:
 	if !(k4 != 0) {
-		goto __395
+		goto __396
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __396
+		goto __397
 	}
-	goto __394
-__396:
+	goto __395
+__397:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__397:
+__398:
 	if !(pIdx6 != 0) {
-		goto __399
-	}
-	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 56))&0x80>>7) != 0) {
 		goto __400
 	}
+	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 56))&0x80>>7) != 0) {
+		goto __401
+	}
 	szThreshold = int16(0)
-	goto __399
-__400:
+	goto __400
+__401:
 	;
-	goto __398
-__398:
-	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __397
 	goto __399
 __399:
+	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
+	goto __398
+	goto __400
+__400:
 	;
 	if !(szThreshold != 0) {
-		goto __401
+		goto __402
 	}
 	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))
 
-__401:
+__402:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18048,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18114,
 		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 __402
+		goto __403
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __403
-__402:
-	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+	goto __404
 __403:
+	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+__404:
 	;
-	goto __394
-__394:
-	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __393
 	goto __395
 __395:
+	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
+	goto __394
+	goto __396
+__396:
 	;
-	goto __390
-__390:
-	iDb++
-	goto __389
 	goto __391
 __391:
+	iDb++
+	goto __390
+	goto __392
+__392:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -84705,36 +84741,36 @@ __391:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __404
+		goto __405
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__404:
+__405:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+580) == SQLITE_OK) {
-		goto __405
+		goto __406
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 580)))
-__405:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+588) == SQLITE_OK) {
-		goto __406
+		goto __407
 	}
 	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 __407
+		goto __408
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 588)))
-__407:
+__408:
 	;
-__406:
+__407:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -84743,10 +84779,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+596) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 596)) >= int64(0)) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 596))&int64(0x7fffffff)))
-__408:
+__409:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -84755,10 +84791,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+604) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 604)) >= int64(0)) {
-		goto __409
+		goto __410
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 604)) & int64(0x7fffffff))
-__409:
+__410:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -84766,10 +84802,10 @@ __409:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __410
+		goto __411
 	}
 
-__410:
+__411:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -84821,14 +84857,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{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},
+	{FzName: ts + 18132, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18137, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18143, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18152, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18161, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18169, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18177},
+	{FzName: ts + 18184},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -84880,7 +84916,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+18124)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18190)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -84888,7 +84924,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18205, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -84901,19 +84937,19 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18146, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18212, 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+18152)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18218)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18164)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18230)
 		j++
 	}
-	Xsqlite3_str_append(tls, bp+32, ts+4957, 1)
+	Xsqlite3_str_append(tls, bp+32, ts+4976, 1)
 	Xsqlite3StrAccumFinish(tls, bp+32)
 
 	rc = Xsqlite3_declare_vtab(tls, db, bp+56)
@@ -84929,7 +84965,7 @@ __3:
 			(*PragmaVtab)(unsafe.Pointer(pTab)).FnHidden = U8(j)
 		}
 	} else {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	}
 
 	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
@@ -85077,7 +85113,7 @@ __1:
 		var zText uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*4)))
 
 		if zText != 0 {
-			*(*uintptr)(unsafe.Pointer(pCsr + 16 + uintptr(j)*4)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, zText))
+			*(*uintptr)(unsafe.Pointer(pCsr + 16 + uintptr(j)*4)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, zText))
 			if *(*uintptr)(unsafe.Pointer(pCsr + 16 + uintptr(j)*4)) == uintptr(0) {
 				return SQLITE_NOMEM
 			}
@@ -85093,13 +85129,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+18179)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18245)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18187, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18253, 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+18191, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 16))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18257, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 16))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -85108,7 +85144,7 @@ __3:
 	rc = Xsqlite3_prepare_v2(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+4, uintptr(0))
 	Xsqlite3_free(tls, zSql)
 	if rc != SQLITE_OK {
-		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
+		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
 		return rc
 	}
 	return pragmaVtabNext(tls, pVtabCursor)
@@ -85176,33 +85212,33 @@ 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+18195, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*4)),
+			ts+18261, 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, 137196)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137249)
 	} else {
 		var z uintptr
 		var zObj uintptr
 		if *(*uintptr)(unsafe.Pointer(azObj + 1*4)) != 0 {
 			zObj = *(*uintptr)(unsafe.Pointer(azObj + 1*4))
 		} else {
-			zObj = ts + 5008
+			zObj = ts + 5027
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18223, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18289, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18254, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18320, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137256)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18262,
-	ts + 18269,
-	ts + 18281,
+	ts + 18328,
+	ts + 18335,
+	ts + 18347,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -85262,7 +85298,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+14140)
+				corruptSchema(tls, pData, argv, ts+14159)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+168+8, uint32(0), 0, 0x1)
@@ -85294,13 +85330,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+18292)
+			corruptSchema(tls, pData, argv, ts+18358)
 		} 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+14140)
+				corruptSchema(tls, pData, argv, ts+14159)
 			}
 		}
 	}
@@ -85333,16 +85369,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 + 8876
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8895
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*4)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*4)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*4))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*4)) = ts + 7938
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*4)) = ts + 18305
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*4)) = ts + 7957
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*4)) = ts + 18371
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*4)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 40)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 40)).FiDb = iDb
@@ -85436,7 +85472,7 @@ __10:
 		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11775)
+		ts+11794)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __15:
@@ -85471,7 +85507,7 @@ __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)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18443)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __19:
@@ -85485,7 +85521,7 @@ __20:
 	(*InitData)(unsafe.Pointer(bp + 40)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18401,
+		ts+18467,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -85758,7 +85794,7 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
 	(*Parse)(unsafe.Pointer(pParse)).Fdb = db
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1490, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1509, 0)
 	}
 }
 
@@ -85786,7 +85822,7 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, bp+16, ts+1490, 0)
+	Xsqlite3ErrorMsg(tls, bp+16, ts+1509, 0)
 __1:
 	;
 	if !(prepFlags&U32(SQLITE_PREPARE_PERSISTENT) != 0) {
@@ -85817,7 +85853,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*16)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18435, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18501, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -85847,7 +85883,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18465, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18531, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -85907,7 +85943,7 @@ __21:
 	if !((*Parse)(unsafe.Pointer(bp+16)).FzErrMsg != 0) {
 		goto __22
 	}
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3663, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3682, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 	Xsqlite3DbFree(tls, db, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
 	goto __23
 __22:
@@ -85943,7 +85979,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, 137995)
+		return Xsqlite3MisuseError(tls, 138048)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -86042,7 +86078,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, 138143)
+		return Xsqlite3MisuseError(tls, 138196)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -86360,8 +86396,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 + 10920
-		var zSp2 uintptr = ts + 10920
+		var zSp1 uintptr = ts + 10939
+		var zSp2 uintptr = ts + 10939
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -86369,13 +86405,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18484, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18550, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18514))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18580))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -86550,7 +86586,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+18548, libc.VaList(bp, 0))
+					ts+18614, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -86595,7 +86631,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+18598, libc.VaList(bp+8, zName))
+						ts+18664, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -86606,7 +86642,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+18662,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18728,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -86650,7 +86686,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6586, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6605, 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.
@@ -87234,16 +87270,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18699
+		z = ts + 18765
 		break
 	case TK_INTERSECT:
-		z = ts + 18709
+		z = ts + 18775
 		break
 	case TK_EXCEPT:
-		z = ts + 18719
+		z = ts + 18785
 		break
 	default:
-		z = ts + 18726
+		z = ts + 18792
 		break
 	}
 	return z
@@ -87253,7 +87289,7 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18732, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18798, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
@@ -87279,11 +87315,11 @@ 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 {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18821, libc.VaList(bp, func() uintptr {
 		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
-			return ts + 18786
+			return ts + 18852
 		}
-		return ts + 1554
+		return ts + 1573
 	}()))
 
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
@@ -87471,8 +87507,8 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 				}
 
 				if iCol < 0 {
-					zType = ts + 1119
-					*(*uintptr)(unsafe.Pointer(bp + 40)) = ts + 16267
+					zType = ts + 1138
+					*(*uintptr)(unsafe.Pointer(bp + 40)) = ts + 16286
 				} 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))
@@ -87611,13 +87647,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16267
+				zCol = ts + 16286
 			} 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+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12080, 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))
@@ -87625,7 +87661,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+18801, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18867, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -87715,7 +87751,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*16)).FzCnName
 				} else {
-					zName = ts + 16267
+					zName = ts + 16286
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -87725,7 +87761,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18867, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 48)) = U32(0)
@@ -87741,7 +87777,7 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18810, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 48)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18876, 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)
@@ -87824,8 +87860,6 @@ __1:
 		(*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
@@ -87840,12 +87874,15 @@ __1:
 			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
 				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
 			}
+			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)
+			}
 		}
 		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
+				zType = ts + 18884
 			} else {
 				zType = uintptr(0)
 				for j = 1; j < SQLITE_N_STDTYPE; j++ {
@@ -88061,7 +88098,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18822, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18888, 0)
 	return
 __1:
 	;
@@ -88152,7 +88189,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18871, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18937, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -88172,7 +88209,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18913, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18979, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -88209,7 +88246,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18919, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18985, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -88243,11 +88280,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+18934, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19000, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
-			return ts + 1554
+			return ts + 1573
 		}
-		return ts + 18957
+		return ts + 19023
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -88348,8 +88385,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18959, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18974, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19025, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19040, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -88396,7 +88433,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18699, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18765, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -88463,7 +88500,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+18993, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19059, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+48)
 
@@ -88525,7 +88562,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+18993, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19059, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+76)
 
@@ -88678,10 +88715,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+19014, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19080, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19060,
+			ts+19126,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -88935,8 +88972,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+7234)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7234)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7242)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7242)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -88963,13 +89000,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+19142, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19208, 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+19153, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19219, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -88981,7 +89018,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+19158, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19224, 0)
 	Xsqlite3Select(tls, pParse, p, bp+36)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -89168,7 +89205,8 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 				Xsqlite3VectorErrorMsg(tls, (*SubstContext)(unsafe.Pointer(pSubst)).FpParse, pCopy)
 			} else {
 				var db uintptr = (*Parse)(unsafe.Pointer((*SubstContext)(unsafe.Pointer(pSubst)).FpParse)).Fdb
-				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 && int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN {
+				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 &&
+					(int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN || (*Expr)(unsafe.Pointer(pCopy)).FiTable != (*SubstContext)(unsafe.Pointer(pSubst)).FiNewTable) {
 					libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Expr{})))
 					(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_IF_NULL_ROW)
 					(*Expr)(unsafe.Pointer(bp)).FpLeft = pCopy
@@ -89208,7 +89246,7 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 								if pColl != 0 {
 									return (*CollSeq)(unsafe.Pointer(pColl)).FzName
 								}
-								return ts + 1099
+								return ts + 1118
 							}())
 					}
 
@@ -89996,12 +90034,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15164) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15183) == 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+15168) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15187) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -90067,7 +90105,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+19164, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19230, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -90150,7 +90188,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+19182, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19248, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -90279,7 +90317,7 @@ 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+19205, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 60))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19271, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 60))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+36+4, uint32(1), 8, 0x100)
@@ -90302,7 +90340,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+19225, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19291, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -90318,7 +90356,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19268
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19334
 		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 {
@@ -90344,7 +90382,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+19291,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19357,
 					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
@@ -90355,9 +90393,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 + 19329
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19395
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19363
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19429
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -90404,7 +90442,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+19401, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19467, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -90516,7 +90554,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19405,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19471,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -90535,7 +90573,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+19444,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19510,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 44)), 0)
@@ -90543,7 +90581,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+14733,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14752,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -90644,7 +90682,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 						} else {
-							zSchemaName = ts + 6446
+							zSchemaName = ts + 6465
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -90659,7 +90697,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+19475, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19541, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(1), 7, 0x80)
 							}
@@ -90724,7 +90762,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+19480,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19546,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -90736,7 +90774,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+12061, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12080, 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)
@@ -90755,9 +90793,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19489, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19555, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19507, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19573, 0)
 					}
 				}
 			}
@@ -90767,7 +90805,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+19527, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19593, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -90905,7 +90943,7 @@ func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect ui
 	(*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)
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSelect)).FpGroupBy)).FnExpr)
 		} 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)
 		}
@@ -90989,13 +91027,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 20)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 20)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19558, 0)
+					ts+19624, 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+19609, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19675, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -91184,19 +91222,19 @@ 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+19642,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19708,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19654
+						return ts + 19720
 					}
-					return ts + 1554
+					return ts + 1573
 				}(),
 				func() uintptr {
 					if bCover != 0 {
 						return (*Index)(unsafe.Pointer(pIdx)).FzName
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
 	}
 }
@@ -91209,7 +91247,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+7938)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7957)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -91516,7 +91554,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19677,
+		ts+19743,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -91577,7 +91615,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19731,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19797,
 		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:
@@ -91681,7 +91719,7 @@ __27:
 	if !((*SrcItem)(unsafe.Pointer(pItem1)).FcolUsed == uint64(0) && (*SrcItem)(unsafe.Pointer(pItem1)).FzName != uintptr(0)) {
 		goto __30
 	}
-	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1554, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
+	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1573, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
 __30:
 	;
 	pSub1 = (*SrcItem)(unsafe.Pointer(pItem1)).FpSelect
@@ -91719,7 +91757,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+19771, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19837, 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)
@@ -91778,7 +91816,7 @@ __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+88, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19786, libc.VaList(bp+40, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19852, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+88)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
@@ -92249,9 +92287,9 @@ __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 + 19802
+				return ts + 19868
 			}
-			return ts + 19811
+			return ts + 19877
 		}())
 
 	groupBySort = 1
@@ -92602,7 +92640,7 @@ __65:
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+116)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
 		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19802)
+	explainTempTable(tls, pParse, ts+19868)
 __146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
@@ -92684,7 +92722,7 @@ __7:
 	if !(i < nCol) {
 		goto __9
 	}
-	z = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*4))))
+	z = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*4))))
 	if !(z == uintptr(0)) {
 		goto __10
 	}
@@ -92706,7 +92744,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19820, 0)
+		ts+19886, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -92802,7 +92840,7 @@ func Xsqlite3_get_table(tls *libc.TLS, db uintptr, zSql uintptr, pazResult uintp
 		if (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
 			if pzErrMsg != 0 {
 				Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(pzErrMsg)))
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
 			}
 			Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg)
 		}
@@ -92939,7 +92977,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+19885, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19951, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -92983,7 +93021,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+36, pParse, iDb, ts+19931, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+36, pParse, iDb, ts+19997, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+36, pTableName) != 0) {
 		goto __9
 	}
@@ -93001,7 +93039,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19939, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20005, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -93013,7 +93051,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19931, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19997, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -93028,11 +93066,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19980, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20046, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
+
 __17:
 	;
 	goto trigger_cleanup
@@ -93040,22 +93079,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20006, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20072, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20044,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20110,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20081
+				return ts + 20147
 			}
-			return ts + 20088
+			return ts + 20154
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -93064,7 +93103,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20094, libc.VaList(bp+24, pTableName+8))
+		ts+20160, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -93093,9 +93132,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -93213,7 +93252,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+64, pParse, iDb, ts+19931, bp+56)
+	Xsqlite3FixInit(tls, bp+64, pParse, iDb, ts+19997, 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
@@ -93246,7 +93285,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20140,
+		ts+20206,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -93271,13 +93310,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20188,
+		ts+20254,
 		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+20263, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20329, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -93533,7 +93572,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20292, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20358, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -93572,9 +93611,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 + 6389
+				return ts + 6408
 			}
-			return ts + 5883
+			return ts + 5902
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -93586,7 +93625,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20312,
+			ts+20378,
 			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)
@@ -93700,12 +93739,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20374,
+		ts+20440,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20422
+				return ts + 20488
 			}
-			return ts + 20429
+			return ts + 20495
 		}()))
 __15:
 	;
@@ -93819,7 +93858,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+20436, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20502, 0)
 	return 1
 }
 
@@ -93885,7 +93924,7 @@ func codeReturningTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab
 	}
 	Xsqlite3ExprListDelete(tls, db, (*Select)(unsafe.Pointer(bp)).FpEList)
 	pNew = sqlite3ExpandReturning(tls, pParse, (*Returning)(unsafe.Pointer(pReturning)).FpReturnEL, pTab)
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0) {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
 		libc.Xmemset(tls, bp+152, 0, uint32(unsafe.Sizeof(NameContext{})))
 		if (*Returning)(unsafe.Pointer(pReturning)).FnRetCol == 0 {
 			(*Returning)(unsafe.Pointer(pReturning)).FnRetCol = (*ExprList)(unsafe.Pointer(pNew)).FnExpr
@@ -93939,7 +93978,7 @@ func codeTriggerProgram(tls *libc.TLS, pParse uintptr, pStepList uintptr, orconf
 
 		if (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan != 0 {
 			Xsqlite3VdbeAddOp4(tls, v, OP_Trace, 0x7fffffff, 1, 0,
-				Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
+				Xsqlite3MPrintf(tls, db, ts+6099, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
 				-6)
 		}
 
@@ -94049,7 +94088,7 @@ 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+20478, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20544, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
@@ -94642,7 +94681,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20492,
+		ts+20558,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*16)).FzCnName))
 	goto update_cleanup
 __27:
@@ -94674,7 +94713,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20528, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*20)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20594, 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:
@@ -94684,7 +94723,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7713
+				return ts + 7732
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*16)).FzCnName
 		}(),
@@ -95000,7 +95039,12 @@ __74:
 	goto __77
 __76:
 	flags = WHERE_ONEPASS_DESIRED
-	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) && !(pTrigger != 0) && !(hasFK != 0) && !(chngKey != 0) && !(*(*int32)(unsafe.Pointer(bp + 68)) != 0)) {
+	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) &&
+		!(pTrigger != 0) &&
+		!(hasFK != 0) &&
+		!(chngKey != 0) &&
+		!(*(*int32)(unsafe.Pointer(bp + 68)) != 0) &&
+		(*NameContext)(unsafe.Pointer(bp+28)).FncFlags&NC_Subquery == 0) {
 		goto __78
 	}
 	flags = flags | WHERE_ONEPASS_MULTIROW
@@ -95554,7 +95598,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20547)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20613)
 __169:
 	;
 update_cleanup:
@@ -95860,10 +95904,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+20560, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+152, ts+20626, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20564, libc.VaList(bp+8, bp+152))
+				ts+20630, libc.VaList(bp+8, bp+152))
 			return SQLITE_ERROR
 		}
 
@@ -95954,7 +95998,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+12150, -1)
+				ts+12169, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -95986,7 +96030,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+20637, uint32(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20641, uint32(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20703, uint32(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20707, uint32(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -96134,14 +96178,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+20645)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20711)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20685)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20751)
 	return SQLITE_ERROR
 __2:
 	;
@@ -96152,7 +96196,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20728)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20794)
 	return SQLITE_ERROR
 __5:
 	;
@@ -96161,7 +96205,7 @@ __5:
 	*(*uint32)(unsafe.Pointer(db + 56)) |= uint32(SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE)
 	goto __4
 __3:
-	zOut = ts + 1554
+	zOut = ts + 1573
 __4:
 	;
 	saved_flags = (*Sqlite3)(unsafe.Pointer(db)).Fflags
@@ -96180,7 +96224,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20746, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20812, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -96200,7 +96244,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20769)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20835)
 	goto end_of_vacuum
 __8:
 	;
@@ -96215,7 +96259,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14503)
+	rc = execSql(tls, db, pzErrMsg, ts+14522)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -96260,7 +96304,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20796,
+		ts+20862,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -96269,7 +96313,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20904,
+		ts+20970,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -96280,7 +96324,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20958,
+		ts+21024,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 24)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -96291,7 +96335,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21109,
+		ts+21175,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -96636,7 +96680,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+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12396, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 44 + 4)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -96720,11 +96764,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+21239, libc.VaList(bp, pParse+196))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21305, libc.VaList(bp, pParse+196))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21263,
+			ts+21329,
 			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,
@@ -96734,7 +96778,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21428, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -96795,7 +96839,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+21381, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21447, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -96823,9 +96867,11 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FbDeclared = 0
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = bp + 32
+	(*Table)(unsafe.Pointer(pTab)).FnTabRef++
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{xConstruct})).f(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, pVTable+8, bp+48)
+	Xsqlite3DeleteTable(tls, db, pTab)
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = (*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -96833,9 +96879,9 @@ 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+21423, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21489, libc.VaList(bp+8, zModuleName))
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 48))))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3682, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 48))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
 		}
 		Xsqlite3DbFree(tls, db, pVTable)
@@ -96845,7 +96891,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 + 21453
+			var zFormat uintptr = ts + 21519
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -96857,12 +96903,12 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 			*(*uintptr)(unsafe.Pointer(pTab + 44 + 8)) = pVTable
 
 			for iCol = 0; iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol); iCol++ {
-				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16, ts+1554)
+				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16, ts+1573)
 				var nType int32
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16158, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16177, 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
@@ -96919,13 +96965,13 @@ 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+21499, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21565, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxConnect, bp+16)
 		if rc != SQLITE_OK {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 		}
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 16)))
@@ -96977,7 +97023,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+21499, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21565, 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)
@@ -97011,7 +97057,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, 151030)
+		return Xsqlite3MisuseError(tls, 151102)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -97053,7 +97099,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR,
 			func() uintptr {
 				if (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
-					return ts + 3663
+					return ts + 3682
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg))
@@ -97421,7 +97467,7 @@ func Xsqlite3VtabEponymousTableInit(tls *libc.TLS, pParse uintptr, pMod uintptr)
 	addModuleArgument(tls, pParse, pTab, Xsqlite3DbStrDup(tls, db, (*Table)(unsafe.Pointer(pTab)).FzName))
 	rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer(pModule)).FxConnect, bp+8)
 	if rc != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+		Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		Xsqlite3VtabEponymousTableClear(tls, db, pMod)
 	}
@@ -97464,7 +97510,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, 151521)
+		rc = Xsqlite3MisuseError(tls, 151593)
 	} else {
 		ap = va
 		switch op {
@@ -97491,7 +97537,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 151539)
+				rc = Xsqlite3MisuseError(tls, 151611)
 				break
 
 			}
@@ -97717,10 +97763,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 + 21518
+		return ts + 21584
 	}
 	if i == -1 {
-		return ts + 16267
+		return ts + 16286
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*16)).FzCnName
 }
@@ -97729,35 +97775,35 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21525, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21591, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21597, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12786, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 	}
 
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21597, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12786, 1)
 		}
-		Xsqlite3_str_append(tls, pStr, ts+5008, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5027, 1)
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 	}
 }
 
@@ -97774,29 +97820,29 @@ 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+21533, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21599, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21525, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21591, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21536
+				return ts + 21602
 			}
-			return ts + 21541
+			return ts + 21607
 		}(), 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+21549)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21615)
 		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+21551)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21617)
 	}
-	Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+	Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 }
 
 // This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
@@ -97837,11 +97883,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+21553, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21619, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21559
+				return ts + 21625
 			}
-			return ts + 21566
+			return ts + 21632
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -97851,43 +97897,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 + 10976
+					zFmt = ts + 10995
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21571
+				zFmt = ts + 21637
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21604
+				zFmt = ts + 21670
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21629
+				zFmt = ts + 21695
 			} else {
-				zFmt = ts + 21647
+				zFmt = ts + 21713
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21656, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21722, 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 + 16267
-			Xsqlite3_str_appendf(tls, bp+64, ts+21664, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16286
+			Xsqlite3_str_appendf(tls, bp+64, ts+21730, 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+21695, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21761, 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+21705, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21771, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21710,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21776,
 				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+21737, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21803, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -97919,25 +97965,25 @@ 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+21748, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21814, 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+21536, 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+21602, 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+21769, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21835, 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+21525, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21591, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21602, libc.VaList(bp+16, z))
 		}
 	}
-	Xsqlite3_str_append(tls, bp+24, ts+4957, 1)
+	Xsqlite3_str_append(tls, bp+24, ts+4976, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
@@ -99531,7 +99577,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21777, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21843, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -99559,7 +99605,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21792, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21858, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -100077,7 +100123,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+21801, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21867, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -100435,10 +100481,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{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)},
+	{FzOp: ts + 16135, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15466, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14986, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21881, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -100928,12 +100974,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21888, 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+21822, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21888, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -101012,7 +101058,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 + 6769
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7718
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -101106,7 +101152,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
-				return ts + 21863
+				return ts + 21929
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -101482,7 +101528,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21870,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21936,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -101498,7 +101544,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 		pRhs = Xsqlite3PExpr(tls, pParse, TK_UPLUS,
 			Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*ExprList_item)(unsafe.Pointer(pArgs+8+uintptr(j)*20)).FpExpr, 0), uintptr(0))
 		pTerm = Xsqlite3PExpr(tls, pParse, TK_EQ, pColRef, pRhs)
-		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ|JT_RIGHT) != 0 {
 			joinType = U32(EP_OuterON)
 		} else {
 			joinType = U32(EP_InnerON)
@@ -102215,7 +102261,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21906, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21972, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*16)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -102286,7 +102332,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21932
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21998
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -102460,6 +102506,10 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	var iCur int32
+	var saved_pIdxEpr uintptr
+
+	saved_pIdxEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 
 	addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	for __ccgo := true; __ccgo; __ccgo = iLevel < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel) {
@@ -102503,9 +102553,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, n)
 			var jj int32
 			for jj = 0; jj < n; jj++ {
-				var iCol int32 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(jj)*2)))
-
-				Xsqlite3ExprCodeGetColumnOfTable(tls, v, (*Index)(unsafe.Pointer(pIdx)).FpTable, iCur, iCol, r1+jj)
+				Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pIdx, iCur, jj, r1+jj)
 			}
 			Xsqlite3VdbeAddOp4Int(tls, v, OP_FilterAdd, (*WhereLevel)(unsafe.Pointer(pLevel)).FregFilter, 0, r1, n)
 			Xsqlite3ReleaseTempRange(tls, pParse, r1, n)
@@ -102539,6 +102587,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 		}
 	}
 	Xsqlite3VdbeJumpHere(tls, v, addrOnce)
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = saved_pIdxEpr
 }
 
 func allocateIndexInfo(tls *libc.TLS, pWInfo uintptr, pWC uintptr, mUnusable Bitmask, pSrc uintptr, pmNoOmit uintptr) uintptr {
@@ -102652,7 +102701,7 @@ __3:
 		uint32(unsafe.Sizeof(sqlite3_index_orderby{}))*uint32(nOrderBy)+uint32(unsafe.Sizeof(HiddenIndexInfo1{}))+
 		uint32(unsafe.Sizeof(uintptr(0)))*uint32(nTerm)))
 	if pIdxInfo == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1490, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1509, 0)
 		return uintptr(0)
 	}
 	pHidden = pIdxInfo + 1*64
@@ -102774,9 +102823,9 @@ func vtabBestIndex(tls *libc.TLS, pParse uintptr, pTab uintptr, p uintptr) int32
 		if rc == SQLITE_NOMEM {
 			Xsqlite3OomFault(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb)
 		} else if !(int32((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
 		}
 	}
 	Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg)
@@ -102797,11 +102846,16 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 
 	_ = pParse
 
+	if !((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol)
+	} else {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnColumn)
+	}
 	nField = func() int32 {
-		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < (*Index)(unsafe.Pointer(pIdx)).FnSample {
+		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < nField {
 			return int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField)
 		}
-		return (*Index)(unsafe.Pointer(pIdx)).FnSample
+		return nField
 	}()
 	iCol = 0
 	iSample = (*Index)(unsafe.Pointer(pIdx)).FnSample * nField
@@ -104381,7 +104435,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+21943, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+22009, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -104439,7 +104493,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+21943, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+22009, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -104837,7 +104891,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+21969, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+22035, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -105444,7 +105498,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22004, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22070, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -105479,6 +105533,10 @@ __3:
 			if int32((*WherePath)(unsafe.Pointer(pFrom)).FisOrdered) == (*ExprList)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpOrderBy)).FnExpr {
 				(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_ORDERED)
 			}
+			if (*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy != 0 &&
+				int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) > (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr {
+				(*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat = I8((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr)
+			}
 		} else {
 			(*WhereInfo)(unsafe.Pointer(pWInfo)).FrevMask = (*WherePath)(unsafe.Pointer(pFrom)).FrevLoop
 			if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) <= 0 {
@@ -105773,6 +105831,9 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
+		if Xsqlite3IndexAffinityStr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pIdx) != 0 {
+			(*IndexedExpr)(unsafe.Pointer(p)).Faff = U8(*(*int8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FzColAff + uintptr(i))))
+		}
 		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
@@ -105925,7 +105986,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22022, libc.VaList(bp, int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22088, libc.VaList(bp, int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))))
 	return uintptr(0)
 __2:
 	;
@@ -105989,7 +106050,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22050, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22116, 0)
 	goto __5
 __4:
 	ii = 0
@@ -106871,7 +106932,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22068, -1)
+		pCtx, ts+22134, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -107004,7 +107065,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+22124, -1)
+					pCtx, ts+22190, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -107093,17 +107154,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-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))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22235))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22246))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22257))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22262))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22275))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22285))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22291))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22302))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22312))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22324))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22329))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -107149,7 +107210,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22267, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22333, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -107193,12 +107254,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+22286, 0)
+			ts+22352, 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+22357, 0)
+				ts+22423, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -107221,7 +107282,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+7938)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7957)
 					}
 					break
 				}
@@ -107426,7 +107487,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+22420, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22486, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -107542,7 +107603,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+7530))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -107657,7 +107718,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22446, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22512, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -107722,15 +107783,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 + 22478
+				zErr = ts + 22544
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22495
+				zErr = ts + 22561
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22511
+				zErr = ts + 22577
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22531, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22597, 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 {
@@ -107751,7 +107812,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+22564, 0)
+				ts+22630, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -107889,7 +107950,7 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regZero)
 	if eCond >= WINDOW_STARTING_NUM {
 		var regString int32 = Xsqlite3GetTempReg(tls, pParse)
-		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1554, -1)
+		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1573, -1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, Xsqlite3VdbeCurrentAddr(tls, v)+2, reg)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL))
 
@@ -107907,11 +107968,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22611,
-	ts + 22664,
-	ts + 22068,
-	ts + 22715,
-	ts + 22767,
+	ts + 22677,
+	ts + 22730,
+	ts + 22134,
+	ts + 22781,
+	ts + 22833,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -108401,7 +108462,7 @@ func windowCodeRangeTest(tls *libc.TLS, p uintptr, op int32, csr1 int32, regVal
 
 	}
 
-	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1554, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1573, -1)
 	addrGe = Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, 0, reg1)
 
 	if op == OP_Ge && arith == OP_Add || op == OP_Le && arith == OP_Subtract {
@@ -109303,19 +109364,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+22817,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22883,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 22859
+							return ts + 22925
 						}
-						return ts + 22868
+						return ts + 22934
 					}(),
 						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+22874, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22940, 0)
 		}
 	}
 
@@ -109386,7 +109447,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+22908,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22974,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -110481,7 +110542,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22946, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23012, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -111456,21 +111517,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+16267, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16286, 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+22968, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23034, 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+16180, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16199, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23034, 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))
@@ -112213,7 +112274,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+22995)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*12 + 4)), ts+23061)
 				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 {
@@ -112377,7 +112438,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+23004, libc.VaList(bp+32, bp+92))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23070, 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))
@@ -112594,9 +112655,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 + 6764
+							return ts + 7713
 						}
-						return ts + 6769
+						return ts + 7718
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)))
@@ -112880,19 +112941,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+23028, 0)
+					ts+23094, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23123, 0)
+					ts+23189, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23207, 0)
+					ts+23273, 0)
 			}
 			break
 		case uint32(273):
@@ -113271,9 +113332,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+23004, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23070, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23292, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23358, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -114041,7 +114102,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+23309, libc.VaList(bp, bp+1248))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23375, libc.VaList(bp, bp+1248))
 				break
 			}
 		}
@@ -114062,9 +114123,9 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 	}
 	if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg != 0 || (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_OK && (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_DONE {
 		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)))
+			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3682, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23334, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23400, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -114237,7 +114298,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23411, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -114250,11 +114311,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19931, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19997, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23352, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23418, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23357, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23423, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -114267,9 +114328,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23367, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23433, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23371, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23437, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -114339,7 +114400,8 @@ func sqlite3TestExtInit(tls *libc.TLS, db uintptr) int32 {
 	return Xsqlite3FaultSim(tls, 500)
 }
 
-var sqlite3BuiltinExtensions = [4]uintptr{
+var sqlite3BuiltinExtensions = [5]uintptr{
+	0,
 	0,
 	0,
 	0,
@@ -114503,7 +114565,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 174337)
+		return Xsqlite3MisuseError(tls, 174426)
 	}
 
 	ap = va
@@ -115078,7 +115140,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175111)
+		return Xsqlite3MisuseError(tls, 175200)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -115093,7 +115155,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23379, 0)
+			ts+23445, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -115284,23 +115346,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 + 23447
+	var zErr uintptr = ts + 23513
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23461
+			zErr = ts + 23527
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23483
+			zErr = ts + 23549
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23505
+			zErr = ts + 23571
 			break
 
 		}
@@ -115318,35 +115380,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23528,
-	ts + 23541,
+	ts + 23594,
+	ts + 23607,
 	uintptr(0),
-	ts + 23557,
-	ts + 23582,
-	ts + 23596,
-	ts + 23615,
-	ts + 1490,
-	ts + 23640,
-	ts + 23677,
-	ts + 23689,
-	ts + 23704,
-	ts + 23737,
+	ts + 23623,
+	ts + 23648,
+	ts + 23662,
+	ts + 23681,
+	ts + 1509,
+	ts + 23706,
+	ts + 23743,
 	ts + 23755,
-	ts + 23780,
-	ts + 23809,
+	ts + 23770,
+	ts + 23803,
+	ts + 23821,
+	ts + 23846,
+	ts + 23875,
 	uintptr(0),
-	ts + 5838,
-	ts + 5334,
-	ts + 23826,
-	ts + 23844,
-	ts + 23862,
+	ts + 5857,
+	ts + 5353,
+	ts + 23892,
+	ts + 23910,
+	ts + 23928,
 	uintptr(0),
-	ts + 23896,
+	ts + 23962,
 	uintptr(0),
-	ts + 23917,
-	ts + 23943,
-	ts + 23966,
-	ts + 23987,
+	ts + 23983,
+	ts + 24009,
+	ts + 24032,
+	ts + 24053,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -115467,7 +115529,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, 175758)
+		return Xsqlite3MisuseError(tls, 175847)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -115512,7 +115574,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+24003, 0)
+				ts+24069, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -115629,7 +115691,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+24066, libc.VaList(bp, zName))
+		ts+24132, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -115657,7 +115719,7 @@ func Xsqlite3_overload_function(tls *libc.TLS, db uintptr, zName uintptr, nArg i
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, zName))
+	zCopy = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, zName))
 	if zCopy == uintptr(0) {
 		return SQLITE_NOMEM
 	}
@@ -115865,7 +115927,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+24117, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24183, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -115958,7 +116020,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, 176503))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176592))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -116028,7 +116090,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, 176582)
+		return Xsqlite3MisuseError(tls, 176671)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -116038,7 +116100,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, 176591)
+		return Xsqlite3MisuseError(tls, 176680)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -116070,14 +116132,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, 176639)
+		return Xsqlite3MisuseError(tls, 176728)
 	}
 
 	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+24138, 0)
+				ts+24204, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -116207,7 +116269,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+24206, uint32(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24272, uint32(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -116252,10 +116314,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24212, zUri+7, uint32(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24278, zUri+7, uint32(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24222,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24288,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -116360,7 +116422,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24250, zOpt, uint32(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24316, zOpt, uint32(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -116371,17 +116433,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24254, zOpt, uint32(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24320, zOpt, uint32(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24254
+	zModeType = ts + 24320
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24260, zOpt, uint32(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24326, zOpt, uint32(4)) == 0) {
 		goto __32
 	}
 
@@ -116389,7 +116451,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 3272
+	zModeType = ts + 3291
 __32:
 	;
 	if !(aMode != 0) {
@@ -116419,7 +116481,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24265, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24331, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -116427,7 +116489,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24285,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24351,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -116467,7 +116529,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24309, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24375, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -116490,15 +116552,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24325, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24332, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24391, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24398, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{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},
+	{Fz: ts + 24406, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24409, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24412, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17381, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -116644,10 +116706,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+21863, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21929, 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+24350, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24416, 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) {
@@ -116661,7 +116723,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 177308)
+	rc = Xsqlite3MisuseError(tls, 177397)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+12, bp+16)
@@ -116678,7 +116740,7 @@ __19:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 16))))
@@ -116712,9 +116774,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 + 6441
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6460
 	(*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 + 23352
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).FzDbSName = ts + 23418
 	(*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)
@@ -116819,7 +116881,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24356
+		zFilename = ts + 24422
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -116922,21 +116984,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+24359,
+	Xsqlite3_log(tls, iErr, ts+24425,
 		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+24384)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24450)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24404)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24470)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24411)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24477)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -117047,7 +117109,7 @@ __4:
 	autoinc = libc.Bool32(int32((*Table)(unsafe.Pointer(pTab)).FiPKey) == iCol && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != U32(0))
 	goto __13
 __12:
-	zDataType = ts + 1119
+	zDataType = ts + 1138
 	primarykey = 1
 __13:
 	;
@@ -117094,14 +117156,14 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24428, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24494, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -117750,7 +117812,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24456, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24522, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -117868,7 +117930,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 + 24464
+			return ts + 24530
 		}
 		return uintptr(0)
 	}(), 0)
@@ -118045,7 +118107,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6181, ts + 6764, ts + 6769, ts + 6191, ts + 6186, ts + 8005, ts + 24487, ts + 24493,
+	ts + 6200, ts + 7713, ts + 7718, ts + 6210, ts + 6205, ts + 8024, ts + 24553, ts + 24559,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -118198,7 +118260,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 + 24500 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 24566 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -118224,7 +118286,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	switch Xsqlite3_value_type(tls, pValue) {
 	case SQLITE_NULL:
 		{
-			jsonAppendRaw(tls, p, ts+6181, uint32(4))
+			jsonAppendRaw(tls, p, ts+6200, uint32(4))
 			break
 
 		}
@@ -118253,7 +118315,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+24517, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24583, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -118311,19 +118373,19 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 	switch int32((*JsonNode)(unsafe.Pointer(pNode)).FeType) {
 	default:
 		{
-			jsonAppendRaw(tls, pOut, ts+6181, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6200, uint32(4))
 			break
 
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6764, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+7713, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6769, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+7718, uint32(5))
 			break
 
 		}
@@ -118868,17 +118930,17 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		}
 		return int32(j + U32(1))
 	} else if int32(c) == 'n' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6181, uint32(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6200, uint32(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		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+6764, uint32(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7713, 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+6769, uint32(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7718, 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))
@@ -118979,7 +119041,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+24546, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24612, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -119285,7 +119347,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+24561, uint32(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24627, uint32(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -119300,7 +119362,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24565, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24631, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -119354,7 +119416,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+24591,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24657,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -119459,11 +119521,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+24634, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24700, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
-					jsonAppendRaw(tls, bp, ts+4998, uint32(2))
+					jsonAppendRaw(tls, bp, ts+5017, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24637, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24703, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -119504,7 +119566,7 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if pNode != 0 {
 				jsonRenderNode(tls, pNode, bp, uintptr(0))
 			} else {
-				jsonAppendRaw(tls, bp, ts+6181, uint32(4))
+				jsonAppendRaw(tls, bp, ts+6200, uint32(4))
 			}
 		}
 		if i == argc {
@@ -119620,14 +119682,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24640, -1)
+			ts+24706, -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+24691, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24757, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -119722,7 +119784,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15380)
+	jsonWrongNumArgs(tls, ctx, ts+15399)
 	return
 __2:
 	;
@@ -119797,9 +119859,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24725
+			return ts + 24791
 		}
-		return ts + 24729
+		return ts + 24795
 	}())
 	return
 __2:
@@ -119932,7 +119994,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24736, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24802, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -120029,7 +120091,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24739, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24805, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -120073,7 +120135,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24742)
+		ts+24808)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -120204,7 +120266,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24825, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24891, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -120223,7 +120285,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+24831, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24897, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 12
@@ -120319,7 +120381,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+24831, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24897, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -120343,7 +120405,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 + 24836
+				zRoot = ts + 24902
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -120465,7 +120527,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+24546, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24612, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -120560,25 +120622,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{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 + 24904},
+	{FnArg: int8(-1), 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(2), 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 + 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}}
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_JSON), FxSFunc: 0, FzName: ts + 24951},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_SQL), FxSFunc: 0, FzName: ts + 24954},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24958},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24970},
+	{FnArg: int8(2), 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_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24993},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25004},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25016},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_ISSET), FxSFunc: 0, FzName: ts + 25029},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25038},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25038},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25048},
+	{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 + 25059},
+	{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 + 25076}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -120597,8 +120659,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 25028, FpModule: 0},
-	{FzName: ts + 25038, FpModule: 0},
+	{FzName: ts + 25094, FpModule: 0},
+	{FzName: ts + 25104, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -120851,11 +120913,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+25048, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25114, 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+25056, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25122, iNode, 0,
 			pRtree+72)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -121066,7 +121128,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+25061,
+		ts+25127,
 		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))
@@ -121764,7 +121826,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25143)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25209)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -121976,7 +122038,7 @@ func rtreeBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 2
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FneedToFreeIdxStr = 1
-	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+24, Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, bp+8))) {
+	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+24, Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, bp+8))) {
 		return SQLITE_NOMEM
 	}
 
@@ -123105,7 +123167,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25157, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25223, 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 {
@@ -123117,12 +123179,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+25177, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25243, 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+25209, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25275, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -123348,7 +123410,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+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))
+		ts+25312, 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))
@@ -123371,14 +123433,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(20)
 	defer tls.Free(20)
 
-	var zFmt uintptr = ts + 25391
+	var zFmt uintptr = ts + 25457
 	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+11348, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11367, 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 {
@@ -123419,7 +123481,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25447, ts + 5060, ts + 16267,
+	ts + 25513, ts + 5079, ts + 16286,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -123462,19 +123524,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+25452,
+			ts+25518,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25514, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25580, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25519,
+			ts+25585,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25583,
+			ts+25649,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25653,
+			ts+25719,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -123503,7 +123565,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 + 25702
+			zFormat = ts + 25768
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -123515,7 +123577,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+25810,
+			ts+25876,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -123523,18 +123585,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+25855, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25921, 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+12767, 1)
+					Xsqlite3_str_append(tls, p, ts+12786, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25882, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25948, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25904, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25970, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25912, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25978, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -123549,14 +123611,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25928,
-	ts + 25981,
-	ts + 26026,
-	ts + 26078,
-	ts + 26132,
-	ts + 26177,
-	ts + 26235,
-	ts + 26290,
+	ts + 25994,
+	ts + 26047,
+	ts + 26092,
+	ts + 26144,
+	ts + 26198,
+	ts + 26243,
+	ts + 26301,
+	ts + 26356,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -123585,7 +123647,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+26337, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26403, 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
@@ -123593,19 +123655,19 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 				(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = 4 + int32((*Rtree)(unsafe.Pointer(pRtree)).FnBytesPerCell)*RTREE_MAXCELLS
 			}
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26357,
+			ts+26423,
 			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 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26414,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26480,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -123647,16 +123709,16 @@ 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 + 26449,
-		ts + 26492,
-		ts + 26527,
-		ts + 26563,
+		ts + 26515,
+		ts + 26558,
+		ts + 26593,
+		ts + 26629,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
 		goto __1
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*4))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*4))))
 	return SQLITE_ERROR
 __1:
 	;
@@ -123681,7 +123743,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+26600,
+	Xsqlite3_str_appendf(tls, pSql, ts+26666,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4))), *(*uintptr)(unsafe.Pointer(argv + 3*4))))
 	ii = 4
 __3:
@@ -123693,7 +123755,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26624, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26690, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -123716,7 +123778,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26696, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -123727,14 +123789,14 @@ __10:
 	if !(ii < argc) {
 		goto __12
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*4))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*4))))
 	rc = SQLITE_ERROR
 	goto __13
 __12:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __14
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
 __14:
 	;
 __13:
@@ -123777,7 +123839,7 @@ __17:
 	if !(iErr != 0) {
 		goto __22
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*4))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*4))))
 	goto rtreeInit_fail
 __22:
 	;
@@ -123794,7 +123856,7 @@ __23:
 	if !(rc != 0) {
 		goto __24
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
 	goto rtreeInit_fail
 __24:
 	;
@@ -123812,7 +123874,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26633, ts + 26644}
+var azFormat = [2]uintptr{ts + 26699, ts + 26710}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(592)
@@ -123850,13 +123912,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+10920, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10939, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26654, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+544)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26720, 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+26660, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 544 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26726, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 544 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26664, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26730, 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})))
@@ -123867,7 +123929,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+26666, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26732, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -123943,12 +124005,12 @@ 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+26699,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26765,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
-						return ts + 4062
+						return ts + 4081
 					}
-					return ts + 1554
+					return ts + 1573
 				}(), z))
 			if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport == uintptr(0) {
 				(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
@@ -123967,7 +124029,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+26706,
+			ts+26772,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -123986,7 +124048,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+26751, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26817, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -124000,8 +124062,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 + 26783,
-		ts + 26837,
+		ts + 26849,
+		ts + 26903,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 24 + uintptr(bLeaf)*4)) == uintptr(0) {
@@ -124016,23 +124078,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+26885,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26951,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26930
+					return ts + 26996
 				}
-				return ts + 26938
+				return ts + 27004
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26947,
+				ts+27013,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26930
+						return ts + 26996
 					}
-					return ts + 26938
+					return ts + 27004
 				}(), iKey, iVal))
 		}
 	}
@@ -124056,7 +124118,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+27005, libc.VaList(bp, i, iCell, iNode))
+				ts+27071, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -124076,7 +124138,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+27053, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27119, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -124093,14 +124155,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+27120, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27186, 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+27154, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27220, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -124108,7 +124170,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+27184,
+					ts+27250,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -124137,14 +124199,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+27239,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27305,
 			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+27270, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27336, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -124166,12 +124228,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+14503, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14522, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27337, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27403, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -124180,12 +124242,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25157, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25223, 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+27365, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27431, 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)
 		}
@@ -124199,8 +124261,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+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27403, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27462, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27469, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -124208,7 +124270,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+27411, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27477, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -124223,7 +124285,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27415, -1)
+			ts+27481, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -124231,7 +124293,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6441
+			zDb = ts + 6460
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*4)))
 		}
@@ -124241,7 +124303,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 + 18012
+				return ts + 18078
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -124611,11 +124673,11 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		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+27466, 1)
+		Xsqlite3_str_append(tls, x, ts+27532, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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+27534, 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+27479, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27545, 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)
 	}
@@ -124635,19 +124697,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+27490, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27556, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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)))))
+			Xsqlite3_str_appendf(tls, x, ts+27574, 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+27516, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27582, 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+27524, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27590, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27528, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27594, 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)
 	}
@@ -125565,7 +125627,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+27541, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27607, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -125574,7 +125636,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27563, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*4))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27629, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*4))))
 	goto __3
 __3:
 	ii++
@@ -125582,7 +125644,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26696, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -125593,7 +125655,7 @@ __5:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __7
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
 __7:
 	;
 __6:
@@ -125618,7 +125680,7 @@ __9:
 	if !(rc != 0) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	goto geopolyInit_fail
 __10:
 	;
@@ -125809,7 +125871,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 + 16267
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16286
 		(*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
@@ -125819,7 +125881,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 + 27567
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27633
 		(*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
@@ -125827,7 +125889,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 + 27573
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27639
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -125939,7 +126001,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27582, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27648, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -126071,14 +126133,14 @@ geopoly_update_end:
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
 	_ = pVtab
 	_ = nArg
-	if Xsqlite3_stricmp(tls, zName, ts+27622) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27688) == 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+27638) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27704) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -126143,7 +126205,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+27653, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27719, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -126155,25 +126217,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [2]byte
 	FzName       uintptr
 }{
-	{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},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27727},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27740},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27753},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27766},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27704},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27778},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27688},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27801},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27815},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27828},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27842},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27858},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27804},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27870},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -126183,26 +126245,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27823, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27889, 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+27833, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27899, 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+27844, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27910, -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+27567, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27633, 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+27855, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27921, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -126256,7 +126318,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+25143, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25209, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -126571,7 +126633,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+27865, -1)
+		Xsqlite3_result_error(tls, context, ts+27931, -1)
 		return
 	}
 
@@ -126582,7 +126644,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+27865, -1)
+			Xsqlite3_result_error(tls, context, ts+27931, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -126595,7 +126657,7 @@ func prepareAndCollectError(tls *libc.TLS, db uintptr, ppStmt uintptr, pzErrmsg
 
 	var rc int32 = Xsqlite3_prepare_v2(tls, db, zSql, -1, ppStmt, uintptr(0))
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 		*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	}
 	return rc
@@ -126607,7 +126669,7 @@ func resetAndCollectError(tls *libc.TLS, pStmt uintptr, pzErrmsg uintptr) int32
 
 	var rc int32 = Xsqlite3_reset(tls, pStmt)
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
 	}
 	return rc
 }
@@ -126683,7 +126745,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+27886, uintptr(0), uintptr(0), p+36)
+				ts+27952, uintptr(0), uintptr(0), p+36)
 		}
 
 		if rc == SQLITE_OK {
@@ -126747,7 +126809,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+25056, zIn, uint32(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > Size_t(4) && libc.Xmemcmp(tls, ts+25122, 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++ {
 				}
@@ -126768,16 +126830,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+28057, libc.VaList(bp, func() uintptr {
+			ts+28123, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28207
+					return ts + 28273
 				}
-				return ts + 1554
+				return ts + 1573
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+4, p+36,
-			ts+28248)
+			ts+28314)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -126875,7 +126937,7 @@ func rbuFinalize(tls *libc.TLS, p uintptr, pStmt uintptr) {
 	var rc int32 = Xsqlite3_finalize(tls, pStmt)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && rc != SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 	}
 }
 
@@ -126893,7 +126955,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+28373, libc.VaList(bp, zTab)))
+			ts+28439, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -126911,7 +126973,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+28492, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28558, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -126929,7 +126991,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*4, p+36,
 		Xsqlite3_mprintf(tls,
-			ts+28513, libc.VaList(bp+16, zIdx)))
+			ts+28579, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -126952,7 +127014,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+28564, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28630, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -126998,7 +127060,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+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28651, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -127013,7 +127075,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+28613, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28679, 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 {
@@ -127053,7 +127115,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+19489, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19555, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -127063,18 +127125,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+28642, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28708, 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+28661, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28727, 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+28666, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28732, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -127086,18 +127148,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+28676, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28742, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28705
+							return ts + 28771
 						}
-						return ts + 28718
+						return ts + 28784
 					}()))
 		}
 
 		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+28727, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28793, 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)
@@ -127111,7 +127173,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+28749,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28815,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 5)
@@ -127154,12 +127216,12 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	defer tls.Free(24)
 
 	var zList uintptr = uintptr(0)
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	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+28776, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14614
+		zList = rbuMPrintf(tls, p, ts+28842, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14633
 	}
 	return zList
 }
@@ -127170,13 +127232,13 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 
 	var iPk int32 = 1
 	var zRet uintptr = uintptr(0)
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	for 1 != 0 {
 		var i int32
 		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+28785, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28851, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -127198,25 +127260,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+28798, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28864, 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+28830, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28896, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		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)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+28919)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28925, ts+28932, ts+4976)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+1573)
 
 		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+28874,
+					ts+28940,
 					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+28916, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28982, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -127253,12 +127315,12 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	zVector = uintptr(0)
 	zRet = uintptr(0)
 	bFailed = 0
-	zSep = ts + 1554
+	zSep = ts + 1573
 	iCol = 0
 	*(*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+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28679, 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
@@ -127293,7 +127355,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
 	goto __7
 __6:
-	zCol = ts + 28936
+	zCol = ts + 29002
 __7:
 	;
 	goto __5
@@ -127301,13 +127363,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*4))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28944,
+	zLhs = rbuMPrintf(tls, p, ts+29010,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28965,
+	zOrder = rbuMPrintf(tls, p, ts+29031,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+29001,
+	zSelect = rbuMPrintf(tls, p, ts+29067,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14614
+	zSep = ts + 14633
 	iCol++
 	goto __1
 __2:
@@ -127325,12 +127387,12 @@ __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+29028,
+		Xsqlite3_mprintf(tls, ts+29094,
 			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
 	}
-	zSep = ts + 1554
+	zSep = ts + 1573
 	iCol = 0
 __14:
 	if !(iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnCol) {
@@ -127352,8 +127414,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14614
+	zVector = rbuMPrintf(tls, p, ts+29142, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14633
 	goto __15
 __15:
 	iCol++
@@ -127364,7 +127426,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29083, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29149, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -127391,13 +127453,13 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 	var zImpPK uintptr = uintptr(0)
 	var zWhere uintptr = uintptr(0)
 	var nBind int32 = 0
-	var zCom uintptr = ts + 1554
-	var zAnd uintptr = ts + 1554
+	var zCom uintptr = ts + 1573
+	var zAnd uintptr = ts + 1573
 	*(*uintptr)(unsafe.Pointer(bp + 200)) = uintptr(0)
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+36,
-			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -127409,9 +127471,9 @@ 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+29095, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29161, 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
+			zType = ts + 1573
 		} else {
 			if iCid < 0 {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK {
@@ -127421,37 +127483,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 + 28936
+					zCol = ts + 29002
 				} else {
-					zCol = ts + 28666
+					zCol = ts + 28732
 				}
-				zType = ts + 1119
+				zType = ts + 1138
 			} 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+29117, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29183, 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 + 28853
+					return ts + 28919
 				}
-				return ts + 1554
+				return ts + 1573
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29137,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29203,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29158,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29224,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29191, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29257, 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 + 14614
-		zAnd = ts + 21525
+		zCom = ts + 14633
+		zAnd = ts + 21591
 		nBind++
 	}
 
@@ -127485,16 +127547,16 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 
 	var zList uintptr = uintptr(0)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
-		var zS uintptr = ts + 1554
+		var zS uintptr = ts + 1573
 		var i int32
 		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+29215, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29281, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29227, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29293, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14614
+			zS = ts + 14633
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -127502,7 +127564,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+29236, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29302, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -127514,27 +127576,27 @@ 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+29251, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29317, 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 zSep uintptr = ts + 1573
 		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+29265, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21525
+				zList = rbuMPrintf(tls, p, ts+29331, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21591
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29277, libc.VaList(bp+40, zList))
+			ts+29343, libc.VaList(bp+40, zList))
 
 	} else {
-		var zSep uintptr = ts + 1554
+		var zSep uintptr = ts + 1573
 		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 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-				zList = rbuMPrintf(tls, p, ts+29327, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21525
+				zList = rbuMPrintf(tls, p, ts+29393, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21591
 			}
 		}
 	}
@@ -127543,7 +127605,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+29340, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29406, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -127557,21 +127619,21 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 		if int32(libc.Xstrlen(tls, zMask)) != (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 			rbuBadControlError(tls, p)
 		} else {
-			var zSep uintptr = ts + 1554
+			var zSep uintptr = ts + 1573
 			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+29327,
+					zList = rbuMPrintf(tls, p, ts+29393,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), i+1))
-					zSep = ts + 14614
+					zSep = ts + 14633
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29366,
+					zList = rbuMPrintf(tls, p, ts+29432,
 						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 + 14614
+					zSep = ts + 14633
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29396,
+					zList = rbuMPrintf(tls, p, ts+29462,
 						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 + 14614
+					zSep = ts + 14633
 				}
 			}
 		}
@@ -127606,19 +127668,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 + 29433
+		var zSep uintptr = ts + 29499
 		*(*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+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28651, 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+16155) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16174) == 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+28613, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -127630,15 +127692,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 + 28853
+					zDesc = ts + 28919
 				} else {
-					zDesc = ts + 1554
+					zDesc = ts + 1573
 				}
-				z = rbuMPrintf(tls, p, ts+29446, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14614
+				z = rbuMPrintf(tls, p, ts+29512, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14633
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29457, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29523, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 60)))
 	}
 	return z
@@ -127653,12 +127715,12 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		*(*uintptr)(unsafe.Pointer(bp + 168)) = uintptr(0)
 		var zIdx uintptr = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 172)) = uintptr(0)
-		var zComma uintptr = ts + 1554
+		var zComma uintptr = ts + 1573
 		var zCols uintptr = uintptr(0)
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+36,
-			ts+29461)
+			ts+29527)
 		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))) {
@@ -127667,7 +127729,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+28613, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -127677,25 +127739,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+29511, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29577, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*4)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29533, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29599, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28853
+						return ts + 28919
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
-				zComma = ts + 14614
+				zComma = ts + 14633
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29543, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29609, 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+6441, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29558,
+			ts+29624,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 0))
 	}
 }
 
@@ -127705,50 +127767,50 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
 		var tnum int32 = (*RbuObjIter)(unsafe.Pointer(pIter)).FiTnum
-		var zComma uintptr = ts + 1554
+		var zComma uintptr = ts + 1573
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
-			var zPk uintptr = ts + 1554
+			var zPk uintptr = ts + 1573
 			var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCol)*4))
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, (*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 + 29620
+				zPk = ts + 29686
 			}
-			zSql = rbuMPrintf(tls, p, ts+29633,
+			zSql = rbuMPrintf(tls, p, ts+29699,
 				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 + 29660
+							return ts + 29726
 						}
-						return ts + 1554
+						return ts + 1573
 					}()))
-			zComma = ts + 14614
+			zComma = ts + 14633
 		}
 
 		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+29670, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29736, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		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,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29743,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29709
+						return ts + 29775
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 0))
 	}
 }
 
@@ -127761,7 +127823,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+29724,
+				ts+29790,
 				libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -127798,7 +127860,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+29781)
+			ts+29847)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 4)) == SQLITE_OK {
 		var rc2 int32
@@ -127903,7 +127965,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+29847, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29913, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -127923,24 +127985,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+6441, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29867,
+				ts+29933,
 				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+6441, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 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+29932, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29998, 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+29968, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 608)))))
+					Xsqlite3_mprintf(tls, ts+30034, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 608)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -127956,7 +128018,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30002,
+						ts+30068,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -127964,31 +128026,31 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 30063
+											return ts + 30129
 										}
-										return ts + 30067
+										return ts + 30133
 									}()
 								}
-								return ts + 1554
+								return ts + 1573
 							}(), zStart,
 							zCollist, zLimit))
 					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+30073,
+						ts+30139,
 						libc.VaList(bp+216, zCollist, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30134,
+						ts+30200,
 						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 + 30063
+									return ts + 30129
 								}
-								return ts + 30067
+								return ts + 30133
 							}(),
 							zCollist, zLimit))
 				}
@@ -128013,8 +128075,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+6452)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6448)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6471)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6467)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -128023,52 +128085,52 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			rbuCreateImposterTable2(tls, p, pIter)
 			zWrite = func() uintptr {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
-					return ts + 1554
+					return ts + 1573
 				}
-				return ts + 30293
+				return ts + 30359
 			}()
 
 			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+30302,
+						ts+30368,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30338
+								return ts + 30404
 							}
-							return ts + 1554
+							return ts + 1573
 						}(), zBindings)))
 			}
 
 			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+30348, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30414, 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
+				var zRbuRowid uintptr = ts + 1573
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30376
+					zRbuRowid = ts + 30442
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30388, libc.VaList(bp+408, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30454, libc.VaList(bp+408, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30464
+							return ts + 30530
 						}
-						return ts + 1554
+						return ts + 1573
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30481,
+					ts+30547,
 					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+30780,
+						ts+30846,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -128076,14 +128138,14 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-				var zRbuRowid uintptr = ts + 1554
+				var zRbuRowid uintptr = ts + 1573
 				var zStart uintptr = uintptr(0)
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30879
+						zRbuRowid = ts + 30945
 					} else {
-						zRbuRowid = ts + 30889
+						zRbuRowid = ts + 30955
 					}
 				}
 
@@ -128096,35 +128158,35 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28936, 0)
+						zOrder = rbuMPrintf(tls, p, ts+29002, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+1573)
 					}
 				}
 
 				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+30900,
+							ts+30966,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30948
+										return ts + 31014
 									}
-									return ts + 1554
+									return ts + 1573
 								}(),
 								zRbuRowid,
 								(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 									if zStart != 0 {
 										return zStart
 									}
-									return ts + 1554
+									return ts + 1573
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 22859
+										return ts + 22925
 									}
-									return ts + 1554
+									return ts + 1573
 								}(), zOrder,
 								zLimit)))
 				}
@@ -128187,12 +128249,12 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 		(*RbuObjIter)(unsafe.Pointer(pIter)).FpRbuUpdate = pUp
 
 		if zSet != 0 {
-			var zPrefix uintptr = ts + 1554
+			var zPrefix uintptr = ts + 1573
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30293
+				zPrefix = ts + 30359
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30954,
+			zUpdate = Xsqlite3_mprintf(tls, ts+31020,
 				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)
@@ -128219,7 +128281,7 @@ func rbuOpenDbhandle(tls *libc.TLS, p uintptr, zName uintptr, bUseVfs int32) uin
 			return uintptr(0)
 		}())
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
 			Xsqlite3_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 			*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 		}
@@ -128251,7 +128313,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+30984, libc.VaList(bp, p+24)))
+		Xsqlite3_mprintf(tls, ts+31050, 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:
@@ -128321,28 +128383,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+6441, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460, 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+6441)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31014, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31080, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		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))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31108, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.Xmemcpy(tls, p+24, ts+3305, uint32(4))
 	} else {
-		libc.Xmemcpy(tls, p+24, ts+6441, uint32(4))
+		libc.Xmemcpy(tls, p+24, ts+6460, uint32(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31060, libc.VaList(bp+24, p+24))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31126, 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+6441, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -128375,11 +128437,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+31126, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31192, 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+24206, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint32(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= Size_t(5) && 0 == libc.Xmemcmp(tls, ts+24272, (*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)))) == '?' {
@@ -128391,16 +128453,16 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31158,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441),
+			zTarget = Xsqlite3_mprintf(tls, ts+31224,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460),
 					func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1554
+							return ts + 1573
 						}
-						return ts + 31190
+						return ts + 31256
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1554
+							return ts + 1573
 						}
 						return zExtra
 					}()))
@@ -128416,37 +128478,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+31192, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31258, -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+31207, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31273, 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+31224, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31290, -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+6441, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31306, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 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+31268, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31334, 0)
 	}
 }
 
@@ -128475,14 +128537,14 @@ 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+31240, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31306, 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+31286, uintptr(0), uintptr(0), uintptr(0))
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31352, uintptr(0), uintptr(0), uintptr(0))
 		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
@@ -128591,7 +128653,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+6441, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6460, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -128608,23 +128670,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+31321, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31387, 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+6441)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460)
 	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+6441)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31353, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31412, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31419, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -128741,7 +128803,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+23844, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23910, 0)
 			return
 		}
 
@@ -128834,7 +128896,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+31360)
+			ts+31426)
 		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)
@@ -128842,7 +128904,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+31382, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31448, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -128863,7 +128925,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+31409,
+				ts+31475,
 				libc.VaList(bp, p+24,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -128893,9 +128955,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+31567, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31633, 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+31582,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31648,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -128909,10 +128971,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+31602, uintptr(0), uintptr(0), p+36)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31668, 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+31627)
+			ts+31693)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128926,12 +128988,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+31735)
+			ts+31801)
 	}
 
 	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+31800)
+			ts+31866)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128943,7 +129005,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+31844, uintptr(0), uintptr(0), p+36)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31910, uintptr(0), uintptr(0), p+36)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -128963,15 +129025,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+17240)
-					rbuCopyPragma(tls, p, ts+16351)
+					rbuCopyPragma(tls, p, ts+17259)
+					rbuCopyPragma(tls, p, ts+16370)
 				}
 
 				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+31869, libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31935, libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -128995,10 +129057,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+14518, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, 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+14518, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, uintptr(0), uintptr(0), p+36)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -129093,7 +129155,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+31897, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31963, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -129109,10 +129171,10 @@ func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(12)
 	defer tls.Free(12)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31346, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31412, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 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)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
@@ -129126,7 +129188,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+31922, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31988, 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)
@@ -129160,7 +129222,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+12,
 		Xsqlite3_mprintf(tls,
-			ts+31933, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31999, 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 {
@@ -129190,13 +129252,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+32005, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32071, 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+32019)
+				ts+32085)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -129207,7 +129269,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+32076)
+				ts+32142)
 			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)
@@ -129252,7 +129314,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			libc.Xmemcpy(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, zRbu, nRbu+Size_t(1))
 			pCsr += uintptr(nRbu + Size_t(1))
 			if zState != 0 {
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3663, libc.VaList(bp, zState))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3682, libc.VaList(bp, zState))
 			}
 
 			rbuOpenDatabase(tls, p, uintptr(0), bp+16)
@@ -129281,7 +129343,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+32150, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32216, 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
@@ -129299,12 +129361,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+32182,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32248,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32214
+							return ts + 32280
 						}
-						return ts + 32221
+						return ts + 32287
 					}()))
 			}
 		}
@@ -129312,7 +129374,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+14503, uintptr(0), uintptr(0), p+36)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14522, uintptr(0), uintptr(0), p+36)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+48)
@@ -129323,19 +129385,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+16954)
-						rbuCopyPragma(tls, p, ts+16366)
+						rbuCopyPragma(tls, p, ts+16973)
+						rbuCopyPragma(tls, p, ts+16385)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32228, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32294, uintptr(0), uintptr(0), p+36)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6460, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32244, uintptr(0), uintptr(0), p+36)
+								db, ts+32310, uintptr(0), uintptr(0), p+36)
 						}
 					}
 
@@ -129389,7 +129451,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+32268, zState+uintptr(n-7), uint32(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32334, zState+uintptr(n-7), uint32(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -129416,7 +129478,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+30293, uint32(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30359, 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++
@@ -129433,7 +129495,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+14518, uintptr(0), uintptr(0), p+36)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, uintptr(0), uintptr(0), p+36)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -129446,13 +129508,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+14518, uintptr(0), uintptr(0), p+36)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, 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+32276, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32342, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -129547,7 +129609,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+14518, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -129564,19 +129626,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+14518, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14503
+				zBegin = ts + 14522
 			} else {
-				zBegin = ts + 32228
+				zBegin = ts + 32294
 			}
 			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+32228, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32294, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -129922,7 +129984,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+32303, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32369, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -129947,7 +130009,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+32326, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32392, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -130092,7 +130154,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+6441)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6460)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -130107,7 +130169,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+32337, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32403, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -130352,6 +130414,964 @@ func Xsqlite3rbu_temp_size(tls *libc.TLS, pRbu uintptr) Sqlite3_int64 {
 	return (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FszTemp
 }
 
+var zDbstatSchema = *(*[258]int8)(unsafe.Pointer(ts + 32414))
+
+// Forward reference to data structured used in this module
+type StatTable1 = struct {
+	Fbase Sqlite3_vtab
+	Fdb   uintptr
+	FiDb  int32
+}
+
+// Forward reference to data structured used in this module
+type StatTable = StatTable1
+type StatCursor1 = struct {
+	Fbase        Sqlite3_vtab_cursor
+	FpStmt       uintptr
+	FisEof       U8
+	FisAgg       U8
+	F__ccgo_pad1 [2]byte
+	FiDb         int32
+	FaPage       [32]StatPage
+	FiPage       int32
+	FiPageno     U32
+	FzName       uintptr
+	FzPath       uintptr
+	FzPagetype   uintptr
+	FnPage       int32
+	FnCell       int32
+	FnMxPayload  int32
+	FnUnused     I64
+	FnPayload    I64
+	FiOffset     I64
+	FszPage      I64
+}
+
+type StatCursor = StatCursor1
+type StatPage1 = struct {
+	FiPgno         U32
+	FaPg           uintptr
+	FiCell         int32
+	FzPath         uintptr
+	Fflags         U8
+	F__ccgo_pad1   [3]byte
+	FnCell         int32
+	FnUnused       int32
+	FaCell         uintptr
+	FiRightChildPg U32
+	FnMxPayload    int32
+}
+
+type StatPage = StatPage1
+type StatCell1 = struct {
+	FnLocal    int32
+	FiChildPg  U32
+	FnOvfl     int32
+	FaOvfl     uintptr
+	FnLastOvfl int32
+	FiOvfl     int32
+}
+
+type StatCell = StatCell1
+
+func statConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = uintptr(0)
+	var rc int32 = SQLITE_OK
+	var iDb int32
+	_ = pAux
+
+	if argc >= 4 {
+		Xsqlite3TokenInit(tls, bp+8, *(*uintptr)(unsafe.Pointer(argv + 3*4)))
+		iDb = Xsqlite3FindDb(tls, db, bp+8)
+		if iDb < 0 {
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+11890, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(argv + 3*4))))
+			return SQLITE_ERROR
+		}
+	} else {
+		iDb = 0
+	}
+	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_DIRECTONLY, 0)
+	rc = Xsqlite3_declare_vtab(tls, db, uintptr(unsafe.Pointer(&zDbstatSchema)))
+	if rc == SQLITE_OK {
+		pTab = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatTable{})))
+		if pTab == uintptr(0) {
+			rc = SQLITE_NOMEM
+		}
+	}
+
+	if rc == SQLITE_OK {
+		libc.Xmemset(tls, pTab, 0, uint32(unsafe.Sizeof(StatTable{})))
+		(*StatTable)(unsafe.Pointer(pTab)).Fdb = db
+		(*StatTable)(unsafe.Pointer(pTab)).FiDb = iDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
+	return rc
+}
+
+func statDisconnect(tls *libc.TLS, pVtab uintptr) int32 {
+	Xsqlite3_free(tls, pVtab)
+	return SQLITE_OK
+}
+
+func statBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
+	var i int32
+	var iSchema int32 = -1
+	var iName int32 = -1
+	var iAgg int32 = -1
+	_ = tab
+
+	for i = 0; i < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; i++ {
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fop) != SQLITE_INDEX_CONSTRAINT_EQ {
+			continue
+		}
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fusable) == 0 {
+			return SQLITE_CONSTRAINT
+		}
+		switch (*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(i)*12)).FiColumn {
+		case 0:
+			{
+				iName = i
+				break
+
+			}
+		case 10:
+			{
+				iSchema = i
+				break
+
+			}
+		case 11:
+			{
+				iAgg = i
+				break
+
+			}
+		}
+	}
+	i = 0
+	if iSchema >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).Fomit = uint8(1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 20)) |= 0x01
+	}
+	if iName >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iName)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 20)) |= 0x02
+	}
+	if iAgg >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iAgg)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 20)) |= 0x04
+	}
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 1.0
+
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy == 1 &&
+		(*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)).FnOrderBy == 2 &&
+		(*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_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).FiColumn == 1 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+		*(*int32)(unsafe.Pointer(pIdxInfo + 20)) |= 0x08
+	}
+
+	return SQLITE_OK
+}
+
+func statOpen(tls *libc.TLS, pVTab uintptr, ppCursor uintptr) int32 {
+	var pTab uintptr = pVTab
+	var pCsr uintptr
+
+	pCsr = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatCursor{})))
+	if pCsr == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		libc.Xmemset(tls, pCsr, 0, uint32(unsafe.Sizeof(StatCursor{})))
+		(*StatCursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab = pVTab
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppCursor)) = pCsr
+	return SQLITE_OK
+}
+
+func statClearCells(tls *libc.TLS, p uintptr) {
+	var i int32
+	if (*StatPage)(unsafe.Pointer(p)).FaCell != 0 {
+		for i = 0; i < (*StatPage)(unsafe.Pointer(p)).FnCell; i++ {
+			Xsqlite3_free(tls, (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell+uintptr(i)*24)).FaOvfl)
+		}
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FaCell)
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnCell = 0
+	(*StatPage)(unsafe.Pointer(p)).FaCell = uintptr(0)
+}
+
+func statClearPage(tls *libc.TLS, p uintptr) {
+	var aPg uintptr = (*StatPage)(unsafe.Pointer(p)).FaPg
+	statClearCells(tls, p)
+	Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FzPath)
+	libc.Xmemset(tls, p, 0, uint32(unsafe.Sizeof(StatPage{})))
+	(*StatPage)(unsafe.Pointer(p)).FaPg = aPg
+}
+
+func statResetCsr(tls *libc.TLS, pCsr uintptr) {
+	var i int32
+
+	for i = 0; i < int32(uint32(unsafe.Sizeof([32]StatPage{}))/uint32(unsafe.Sizeof(StatPage{}))); i++ {
+		statClearPage(tls, pCsr+16+uintptr(i)*40)
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(pCsr+16+uintptr(i)*40)).FaPg)
+		(*StatPage)(unsafe.Pointer(pCsr + 16 + uintptr(i)*40)).FaPg = uintptr(0)
+	}
+	Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(0)
+}
+
+func statResetCounts(tls *libc.TLS, pCsr uintptr) {
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnCell = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnUnused = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPayload = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FszPage = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 0
+}
+
+func statClose(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	Xsqlite3_free(tls, pCsr)
+	return SQLITE_OK
+}
+
+func getLocalPayload(tls *libc.TLS, nUsable int32, flags U8, nTotal int32) int32 {
+	var nLocal int32
+	var nMinLocal int32
+	var nMaxLocal int32
+
+	if int32(flags) == 0x0D {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = nUsable - 35
+	} else {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = (nUsable-12)*64/255 - 23
+	}
+
+	nLocal = nMinLocal + (nTotal-nMinLocal)%(nUsable-4)
+	if nLocal > nMaxLocal {
+		nLocal = nMinLocal
+	}
+	return nLocal
+}
+
+func statDecodePage(tls *libc.TLS, pBt uintptr, p uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var nUnused int32
+	var iOff int32
+	var nHdr int32
+	var isLeaf int32
+	var szPage int32
+	var aData uintptr
+	var aHdr uintptr
+	var iNext int32
+
+	var rc int32
+	var iPrev U32
+
+	var j int32
+	var nOvfl int32
+
+	var nLocal int32
+	var pCell uintptr
+	var i int32
+	var nUsable int32
+	aData = (*StatPage)(unsafe.Pointer(p)).FaPg
+	aHdr = aData + uintptr(func() int32 {
+		if (*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1) {
+			return 100
+		}
+		return 0
+	}())
+
+	(*StatPage)(unsafe.Pointer(p)).Fflags = *(*U8)(unsafe.Pointer(aHdr))
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0A || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __1
+	}
+	isLeaf = 1
+	nHdr = 8
+	goto __2
+__1:
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05 || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x02) {
+		goto __3
+	}
+	isLeaf = 0
+	nHdr = 12
+	goto __4
+__3:
+	goto statPageIsCorrupt
+__4:
+	;
+__2:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1)) {
+		goto __5
+	}
+	nHdr = nHdr + 100
+__5:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnCell = int32(*(*U8)(unsafe.Pointer(aHdr + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 3 + 1)))
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = 0
+	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
+
+	nUnused = int32(*(*U8)(unsafe.Pointer(aHdr + 5)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 5 + 1))) - nHdr - 2*(*StatPage)(unsafe.Pointer(p)).FnCell
+	nUnused = nUnused + int32(*(*U8)(unsafe.Pointer(aHdr + 7)))
+	iOff = int32(*(*U8)(unsafe.Pointer(aHdr + 1)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 1 + 1)))
+__6:
+	if !(iOff != 0) {
+		goto __7
+	}
+	if !(iOff >= szPage) {
+		goto __8
+	}
+	goto statPageIsCorrupt
+__8:
+	;
+	nUnused = nUnused + (int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2) + 1))))
+	iNext = int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff) + 1)))
+	if !(iNext < iOff+4 && iNext > 0) {
+		goto __9
+	}
+	goto statPageIsCorrupt
+__9:
+	;
+	iOff = iNext
+	goto __6
+__7:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnUnused = nUnused
+	(*StatPage)(unsafe.Pointer(p)).FiRightChildPg = func() uint32 {
+		if isLeaf != 0 {
+			return uint32(0)
+		}
+		return Xsqlite3Get4byte(tls, aHdr+8)
+	}()
+
+	if !((*StatPage)(unsafe.Pointer(p)).FnCell != 0) {
+		goto __10
+	}
+
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = szPage - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatPage)(unsafe.Pointer(p)).FaCell = Xsqlite3_malloc64(tls, uint64(uint32((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint32(unsafe.Sizeof(StatCell{}))))
+	if !((*StatPage)(unsafe.Pointer(p)).FaCell == uintptr(0)) {
+		goto __11
+	}
+	return SQLITE_NOMEM
+__11:
+	;
+	libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0, uint32((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint32(unsafe.Sizeof(StatCell{})))
+
+	i = 0
+__12:
+	if !(i < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __14
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr(i)*24
+
+	iOff = int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2) + 1)))
+	if !(iOff < nHdr || iOff >= szPage) {
+		goto __15
+	}
+	goto statPageIsCorrupt
+__15:
+	;
+	if !!(isLeaf != 0) {
+		goto __16
+	}
+	(*StatCell)(unsafe.Pointer(pCell)).FiChildPg = Xsqlite3Get4byte(tls, aData+uintptr(iOff))
+	iOff = iOff + 4
+__16:
+	;
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05) {
+		goto __17
+	}
+
+	goto __18
+__17:
+	iOff = iOff + int32(func() uint8 {
+		if int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff)))) < int32(U8(0x80)) {
+			return uint8(func() int32 {
+				*(*U32)(unsafe.Pointer(bp)) = U32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))
+				return 1
+			}())
+		}
+		return Xsqlite3GetVarint32(tls, aData+uintptr(iOff), bp)
+	}())
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __19
+	}
+	iOff = iOff + int32(Xsqlite3GetVarint(tls, aData+uintptr(iOff), bp+4))
+__19:
+	;
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32((*StatPage)(unsafe.Pointer(p)).FnMxPayload)) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = int32(*(*U32)(unsafe.Pointer(bp)))
+__20:
+	;
+	nLocal = getLocalPayload(tls, nUsable, (*StatPage)(unsafe.Pointer(p)).Fflags, int32(*(*U32)(unsafe.Pointer(bp))))
+	if !(nLocal < 0) {
+		goto __21
+	}
+	goto statPageIsCorrupt
+__21:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLocal = nLocal
+
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32(nLocal)) {
+		goto __22
+	}
+	nOvfl = int32((*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) + U32(nUsable) - U32(4) - U32(1)) / U32(nUsable-4))
+	if !(iOff+nLocal+4 > nUsable || *(*U32)(unsafe.Pointer(bp)) > U32(0x7fffffff)) {
+		goto __23
+	}
+	goto statPageIsCorrupt
+__23:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl = int32(*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) - U32((nOvfl-1)*(nUsable-4)))
+	(*StatCell)(unsafe.Pointer(pCell)).FnOvfl = nOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FaOvfl = Xsqlite3_malloc64(tls, uint64(uint32(unsafe.Sizeof(U32(0)))*uint32(nOvfl)))
+	if !((*StatCell)(unsafe.Pointer(pCell)).FaOvfl == uintptr(0)) {
+		goto __24
+	}
+	return SQLITE_NOMEM
+__24:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl)) = Xsqlite3Get4byte(tls, aData+uintptr(iOff+nLocal))
+	j = 1
+__25:
+	if !(j < nOvfl) {
+		goto __27
+	}
+	iPrev = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j-1)*4))
+	*(*uintptr)(unsafe.Pointer(bp + 12)) = uintptr(0)
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPrev, bp+12, 0)
+	if !(rc != SQLITE_OK) {
+		goto __28
+	}
+
+	return rc
+__28:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j)*4)) = Xsqlite3Get4byte(tls, Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 12))))
+	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp + 12)))
+	goto __26
+__26:
+	j++
+	goto __25
+	goto __27
+__27:
+	;
+__22:
+	;
+__18:
+	;
+	goto __13
+__13:
+	i++
+	goto __12
+	goto __14
+__14:
+	;
+__10:
+	;
+	return SQLITE_OK
+
+statPageIsCorrupt:
+	(*StatPage)(unsafe.Pointer(p)).Fflags = U8(0)
+	statClearCells(tls, p)
+	return SQLITE_OK
+}
+
+func statSizeAndOffset(tls *libc.TLS, pCsr uintptr) {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCsr)).FpVtab
+	var pBt uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatTable)(unsafe.Pointer(pTab)).FiDb)*16)).FpBt
+	var pPager uintptr = Xsqlite3BtreePager(tls, pBt)
+	var fd uintptr
+
+	fd = Xsqlite3PagerFile(tls, pPager)
+	*(*Sqlite3_int64)(unsafe.Pointer(bp)) = Sqlite3_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	if Xsqlite3OsFileControl(tls, fd, 230440, bp) == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = *(*Sqlite3_int64)(unsafe.Pointer(bp))
+		*(*I64)(unsafe.Pointer(pCsr + 1352)) += *(*Sqlite3_int64)(unsafe.Pointer(bp + 1*8))
+	} else {
+		*(*I64)(unsafe.Pointer(pCsr + 1352)) += I64(Xsqlite3BtreeGetPageSize(tls, pBt))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = (*StatCursor)(unsafe.Pointer(pCsr)).FszPage * I64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno-U32(1))
+	}
+}
+
+func statGetPage(tls *libc.TLS, pBt uintptr, iPg U32, pPg uintptr) int32 {
+	bp := tls.Alloc(4)
+	defer tls.Free(4)
+
+	var pgsz int32 = Xsqlite3BtreeGetPageSize(tls, pBt)
+	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
+	var rc int32
+
+	if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+		(*StatPage)(unsafe.Pointer(pPg)).FaPg = Xsqlite3_malloc(tls, pgsz+DBSTAT_PAGE_PADDING_BYTES)
+		if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+			return SQLITE_NOMEM
+		}
+		libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0, uint32(DBSTAT_PAGE_PADDING_BYTES))
+	}
+
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPg, bp, 0)
+	if rc == SQLITE_OK {
+		var a uintptr = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		libc.Xmemcpy(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, a, uint32(pgsz))
+		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+	}
+
+	return rc
+}
+
+func statNext(tls *libc.TLS, pCursor uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
+	var rc int32
+	var nPayload int32
+	var z uintptr
+	var pCsr uintptr
+	var pTab uintptr
+	var pBt uintptr
+	var pPager uintptr
+
+	var iRoot U32
+	var nUsable int32
+	var iOvfl int32
+	var pCell uintptr
+
+	var p uintptr
+	var i int32
+	var p1 uintptr
+	pCsr = pCursor
+	pTab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	pBt = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*16)).FpBt
+	pPager = Xsqlite3BtreePager(tls, pBt)
+
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+
+statNextRestart:
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __1
+	}
+
+	statResetCounts(tls, pCsr)
+	rc = Xsqlite3_step(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	if !(rc == SQLITE_ROW) {
+		goto __3
+	}
+	iRoot = U32(Xsqlite3_column_int64(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 1))
+	Xsqlite3PagerPagecount(tls, pPager, bp+48)
+	if !(*(*int32)(unsafe.Pointer(bp + 48)) == 0) {
+		goto __5
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__5:
+	;
+	rc = statGetPage(tls, pBt, iRoot, pCsr+16)
+	(*StatPage)(unsafe.Pointer(pCsr + 16)).FiPgno = iRoot
+	(*StatPage)(unsafe.Pointer(pCsr + 16)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __6
+	}
+	(*StatPage)(unsafe.Pointer(pCsr + 16)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32672, 0))
+	if !(z == uintptr(0)) {
+		goto __7
+	}
+	rc = SQLITE_NOMEM
+__7:
+	;
+__6:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 1
+	goto __4
+__3:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__4:
+	;
+	goto __2
+__1:
+	p = pCsr + 16 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*40
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __8
+	}
+	statResetCounts(tls, pCsr)
+__8:
+	;
+__9:
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __10
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*24
+__11:
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl) {
+		goto __12
+	}
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = Xsqlite3BtreeGetPageSize(tls, pBt) - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	statSizeAndOffset(tls, pCsr)
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl-1) {
+		goto __13
+	}
+	*(*I64)(unsafe.Pointer(pCsr + 1336)) += I64(nUsable - 4)
+	goto __14
+__13:
+	*(*I64)(unsafe.Pointer(pCsr + 1336)) += I64((*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+	*(*I64)(unsafe.Pointer(pCsr + 1328)) += I64(nUsable - 4 - (*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+__14:
+	;
+	iOvfl = (*StatCell)(unsafe.Pointer(pCell)).FiOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FiOvfl++
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __15
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(iOvfl)*4))
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32674
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls,
+		ts+32683, libc.VaList(bp, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell, iOvfl)))
+	if z == uintptr(0) {
+		return SQLITE_NOMEM
+	}
+	return SQLITE_OK
+__15:
+	;
+	goto __11
+__12:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiRightChildPg != 0) {
+		goto __16
+	}
+	goto __10
+__16:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+	goto __9
+__10:
+	;
+	if !(!(int32((*StatPage)(unsafe.Pointer(p)).FiRightChildPg) != 0) || (*StatPage)(unsafe.Pointer(p)).FiCell > (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __17
+	}
+	statClearPage(tls, p)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage--
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 && (*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __18
+	}
+
+	return SQLITE_OK
+__18:
+	;
+	goto statNextRestart
+__17:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage++
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage >= int32(uint32(unsafe.Sizeof([32]StatPage{}))/uint32(unsafe.Sizeof(StatPage{})))) {
+		goto __19
+	}
+	statResetCsr(tls, pCsr)
+	return Xsqlite3CorruptError(tls, 215455)
+__19:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell == (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*40)).FiPgno = (*StatPage)(unsafe.Pointer(p)).FiRightChildPg
+	goto __21
+__20:
+	(*StatPage)(unsafe.Pointer(p + 1*40)).FiPgno = (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*24)).FiChildPg
+__21:
+	;
+	rc = statGetPage(tls, pBt, (*StatPage)(unsafe.Pointer(p+1*40)).FiPgno, p+1*40)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	(*StatPage)(unsafe.Pointer(p + 1*40)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __22
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*40)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32695, libc.VaList(bp+24, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell)))
+	if !(z == uintptr(0)) {
+		goto __23
+	}
+	rc = SQLITE_NOMEM
+__23:
+	;
+__22:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+__2:
+	;
+	if !(rc == SQLITE_OK) {
+		goto __24
+	}
+	p1 = pCsr + 16 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*40
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = (*StatPage)(unsafe.Pointer(p1)).FiPgno
+
+	rc = statDecodePage(tls, pBt, p1)
+	if !(rc == SQLITE_OK) {
+		goto __25
+	}
+	statSizeAndOffset(tls, pCsr)
+
+	switch int32((*StatPage)(unsafe.Pointer(p1)).Fflags) {
+	case 0x05:
+		goto __27
+	case 0x02:
+		goto __28
+	case 0x0D:
+		goto __29
+	case 0x0A:
+		goto __30
+	default:
+		goto __31
+	}
+	goto __26
+__27:
+__28:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32703
+	goto __26
+__29:
+__30:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32712
+	goto __26
+__31:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32717
+	goto __26
+__26:
+	;
+	*(*int32)(unsafe.Pointer(pCsr + 1320)) += (*StatPage)(unsafe.Pointer(p1)).FnCell
+	*(*I64)(unsafe.Pointer(pCsr + 1328)) += I64((*StatPage)(unsafe.Pointer(p1)).FnUnused)
+	if !((*StatPage)(unsafe.Pointer(p1)).FnMxPayload > (*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload) {
+		goto __32
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = (*StatPage)(unsafe.Pointer(p1)).FnMxPayload
+__32:
+	;
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __33
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+40, (*StatPage)(unsafe.Pointer(p1)).FzPath)))
+	if !(z == uintptr(0)) {
+		goto __34
+	}
+	rc = SQLITE_NOMEM
+__34:
+	;
+__33:
+	;
+	nPayload = 0
+	i = 0
+__35:
+	if !(i < (*StatPage)(unsafe.Pointer(p1)).FnCell) {
+		goto __37
+	}
+	nPayload = nPayload + (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p1)).FaCell+uintptr(i)*24)).FnLocal
+	goto __36
+__36:
+	i++
+	goto __35
+	goto __37
+__37:
+	;
+	*(*I64)(unsafe.Pointer(pCsr + 1336)) += I64(nPayload)
+
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0) {
+		goto __38
+	}
+	goto statNextRestart
+__38:
+	;
+__25:
+	;
+__24:
+	;
+	return rc
+}
+
+func statEof(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	return int32((*StatCursor)(unsafe.Pointer(pCsr)).FisEof)
+}
+
+func statFilter(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintptr, argc int32, argv uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pCsr uintptr = pCursor
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	var pSql uintptr
+	var zSql uintptr
+	var iArg int32 = 0
+	var rc int32 = SQLITE_OK
+	var zName uintptr = uintptr(0)
+	_ = argc
+	_ = idxStr
+
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FpStmt = uintptr(0)
+	if idxNum&0x01 != 0 {
+		var zDbase uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*4)))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = Xsqlite3FindDbName(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zDbase)
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FiDb < 0 {
+			(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = 0
+			(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+			return SQLITE_OK
+		}
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+	if idxNum&0x02 != 0 {
+		zName = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*4)))
+	}
+	if idxNum&0x04 != 0 {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(libc.Bool32(Xsqlite3_value_double(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*4))) != 0.0))
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(0)
+	}
+	pSql = Xsqlite3_str_new(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb)
+	Xsqlite3_str_appendf(tls, pSql,
+		ts+32727,
+		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb+uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*16)).FzDbSName))
+	if zName != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32882, libc.VaList(bp+8, zName))
+	}
+	if idxNum&0x08 != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32896, 0)
+	}
+	zSql = Xsqlite3_str_finish(tls, pSql)
+	if zSql == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		rc = Xsqlite3_prepare_v2(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+4, uintptr(0))
+		Xsqlite3_free(tls, zSql)
+	}
+
+	if rc == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = -1
+		rc = statNext(tls, pCursor)
+	}
+	return rc
+}
+
+func statColumn(tls *libc.TLS, pCursor uintptr, ctx uintptr, i int32) int32 {
+	var pCsr uintptr = pCursor
+	switch i {
+	case 0:
+		Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzName, -1, libc.UintptrFromInt32(-1))
+		break
+	case 1:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath, -1, libc.UintptrFromInt32(-1))
+		}
+		break
+	case 2:
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnPage))
+		} else {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno))
+		}
+		break
+	case 3:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype, -1, uintptr(0))
+		}
+		break
+	case 4:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnCell))
+		break
+	case 5:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnPayload)
+		break
+	case 6:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnUnused)
+		break
+	case 7:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload))
+		break
+	case 8:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FiOffset)
+		}
+		break
+	case 9:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FszPage)
+		break
+	case 10:
+		{
+			var db uintptr = Xsqlite3_context_db_handle(tls, ctx)
+			var iDb int32 = (*StatCursor)(unsafe.Pointer(pCsr)).FiDb
+			Xsqlite3_result_text(tls, ctx, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, -1, uintptr(0))
+			break
+
+		}
+	default:
+		{
+			Xsqlite3_result_int(tls, ctx, int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg))
+			break
+
+		}
+	}
+	return SQLITE_OK
+}
+
+func statRowid(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32 {
+	var pCsr uintptr = pCursor
+	*(*Sqlite_int64)(unsafe.Pointer(pRowid)) = Sqlite_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	return SQLITE_OK
+}
+
+// Invoke this routine to register the "dbstat" virtual table module
+func Xsqlite3DbstatRegister(tls *libc.TLS, db uintptr) int32 {
+	return Xsqlite3_create_module(tls, db, ts+32911, uintptr(unsafe.Pointer(&dbstat_module)), uintptr(0))
+}
+
+var dbstat_module = Sqlite3_module{
+	FxCreate:     0,
+	FxConnect:    0,
+	FxBestIndex:  0,
+	FxDisconnect: 0,
+	FxDestroy:    0,
+	FxOpen:       0,
+	FxClose:      0,
+	FxFilter:     0,
+	FxNext:       0,
+	FxEof:        0,
+	FxColumn:     0,
+	FxRowid:      0,
+}
+
 type SessionTable1 = struct {
 	FpNext    uintptr
 	FzName    uintptr
@@ -130928,13 +131948,13 @@ 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+11348, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11367, 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+32348, 0)
+				ts+32918, 0)
 		} else if rc == SQLITE_ERROR {
-			zPragma = Xsqlite3_mprintf(tls, ts+1554, 0)
+			zPragma = Xsqlite3_mprintf(tls, ts+1573, 0)
 		} else {
 			*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
 			*(*uintptr)(unsafe.Pointer(pabPK)) = uintptr(0)
@@ -130945,7 +131965,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32469, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+33039, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -131043,7 +132063,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11348, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11367, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -131292,7 +132312,7 @@ __4:
 	goto error_out
 __7:
 	;
-	Xsqlite3ValueSetStr(tls, p, 0, ts+1554, uint8(0), uintptr(0))
+	Xsqlite3ValueSetStr(tls, p, 0, ts+1573, uint8(0), uintptr(0))
 	(*Sqlite3_session)(unsafe.Pointer(pSession)).FpZeroBlob = p
 __6:
 	;
@@ -131619,14 +132639,14 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	var zRet uintptr = uintptr(0)
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32498,
+			zRet = Xsqlite3_mprintf(tls, ts+33068,
 				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 + 21525
+			zSep = ts + 21591
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131641,7 +132661,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	var zRet uintptr = uintptr(0)
 	var bHave int32 = 0
 
@@ -131649,9 +132669,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+32532,
+				ts+33102,
 				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 + 32573
+			zSep = ts + 33143
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131659,7 +132679,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7530, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7538, 0)
 	}
 
 	return zRet
@@ -131670,7 +132690,7 @@ func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintpt
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32578,
+		ts+33148,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -131713,7 +132733,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32656,
+			ts+33226,
 			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
@@ -131840,7 +132860,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32709, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33279, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -132105,7 +133125,7 @@ func sessionAppendInteger(tls *libc.TLS, p uintptr, iVal int32, pRc uintptr) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
-	Xsqlite3_snprintf(tls, int32(uint32(unsafe.Sizeof([24]int8{}))-uint32(1)), bp+8, ts+4975, libc.VaList(bp, iVal))
+	Xsqlite3_snprintf(tls, int32(uint32(unsafe.Sizeof([24]int8{}))-uint32(1)), bp+8, ts+4994, libc.VaList(bp, iVal))
 	sessionAppendStr(tls, p, bp+8, pRc)
 }
 
@@ -132314,29 +133334,29 @@ 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+11348, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11367, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32736, libc.VaList(bp, zDb))
+			ts+33306, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_NOMEM
 		}
 	} else {
 		var i int32
-		var zSep uintptr = ts + 1554
+		var zSep uintptr = ts + 1573
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32846, bp+20)
+		sessionAppendStr(tls, bp+8, ts+33416, bp+20)
 		sessionAppendIdent(tls, bp+8, zDb, bp+20)
-		sessionAppendStr(tls, bp+8, ts+1567, bp+20)
+		sessionAppendStr(tls, bp+8, ts+1586, bp+20)
 		sessionAppendIdent(tls, bp+8, zTab, bp+20)
-		sessionAppendStr(tls, bp+8, ts+32861, bp+20)
+		sessionAppendStr(tls, bp+8, ts+33431, 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+32869, bp+20)
+				sessionAppendStr(tls, bp+8, ts+33439, bp+20)
 				sessionAppendInteger(tls, bp+8, i+1, bp+20)
-				zSep = ts + 21525
+				zSep = ts + 21591
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -132445,7 +133465,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+32875, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33445, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 24)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 24))
 	}
@@ -132537,7 +133557,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+12)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32895, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33465, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 24))
 }
@@ -132800,7 +133820,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, 219078)
+				rc = Xsqlite3CorruptError(tls, 219169)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -132823,7 +133843,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, 219098)
+						rc = Xsqlite3CorruptError(tls, 219189)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -132865,7 +133885,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, 219152)
+			rc = Xsqlite3CorruptError(tls, 219243)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -132926,7 +133946,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, 219240)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219331)
 		}
 	}
 
@@ -133000,13 +134020,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, 219326))
+		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219417))
 	}
 
 	(*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, 219332))
+		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219423))
 	}
 
 	if paRec != 0 {
@@ -133068,7 +134088,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, 219376))
+						return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219467))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*4)) = uintptr(0)
 				}
@@ -133441,7 +134461,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 219741)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 219832)
 	goto finished_invert
 __6:
 	;
@@ -133607,45 +134627,45 @@ 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+11348) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11367) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_NOMEM
 			} else {
-				var zSep uintptr = ts + 1554
+				var zSep uintptr = ts + 1573
 
 				libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(SessionBuffer{})))
 				(*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+32913, bp+12)
+				sessionAppendStr(tls, bp, ts+33483, bp+12)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+12)
-				sessionAppendStr(tls, bp, ts+32926, bp+12)
+				sessionAppendStr(tls, bp, ts+33496, 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+32932, bp+12)
+						sessionAppendStr(tls, bp, ts+33502, bp+12)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+12)
-						zSep = ts + 14614
+						zSep = ts + 14633
 					}
 				}
 
-				zSep = ts + 1554
-				sessionAppendStr(tls, bp, ts+32861, bp+12)
+				zSep = ts + 1573
+				sessionAppendStr(tls, bp, ts+33431, 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+32937, bp+12)
+								ts+33507, bp+12)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*4)), bp+12)
-							sessionAppendStr(tls, bp, ts+32869, bp+12)
+							sessionAppendStr(tls, bp, ts+33439, bp+12)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+12)
 						}
-						zSep = ts + 21525
+						zSep = ts + 21591
 					}
 				}
 
@@ -133692,42 +134712,42 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	defer tls.Free(16)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_OK
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+33012, bp+12)
+	sessionAppendStr(tls, bp, ts+33582, bp+12)
 	sessionAppendIdent(tls, bp, zTab, bp+12)
-	sessionAppendStr(tls, bp, ts+32861, bp+12)
+	sessionAppendStr(tls, bp, ts+33431, 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+32932, bp+12)
+			sessionAppendStr(tls, bp, ts+33502, bp+12)
 			sessionAppendInteger(tls, bp, i+1, bp+12)
-			zSep = ts + 21525
+			zSep = ts + 21591
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+33030, bp+12)
+		sessionAppendStr(tls, bp, ts+33600, bp+12)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+12)
-		sessionAppendStr(tls, bp, ts+32573, bp+12)
+		sessionAppendStr(tls, bp, ts+33143, bp+12)
 
-		zSep = ts + 1554
+		zSep = ts + 1573
 		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+32869, bp+12)
+				sessionAppendStr(tls, bp, ts+33439, bp+12)
 				sessionAppendInteger(tls, bp, i+1, bp+12)
-				zSep = ts + 33038
+				zSep = ts + 33608
 			}
 		}
-		sessionAppendStr(tls, bp, ts+4957, bp+12)
+		sessionAppendStr(tls, bp, ts+4976, bp+12)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 12)) == SQLITE_OK {
@@ -133740,7 +134760,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+6441, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+12)
+		db, ts+6460, 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 {
@@ -133751,21 +134771,21 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+33043, bp+12)
+	sessionAppendStr(tls, bp, ts+33613, bp+12)
 	sessionAppendIdent(tls, bp, zTab, bp+12)
-	sessionAppendStr(tls, bp, ts+21531, bp+12)
+	sessionAppendStr(tls, bp, ts+21597, bp+12)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14614, bp+12)
+			sessionAppendStr(tls, bp, ts+14633, bp+12)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*4)), bp+12)
 	}
 
-	sessionAppendStr(tls, bp, ts+33061, bp+12)
+	sessionAppendStr(tls, bp, ts+33631, bp+12)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33072, bp+12)
+		sessionAppendStr(tls, bp, ts+33642, bp+12)
 	}
-	sessionAppendStr(tls, bp, ts+4957, bp+12)
+	sessionAppendStr(tls, bp, ts+4976, bp+12)
 
 	if *(*int32)(unsafe.Pointer(bp + 12)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3_prepare_v2(tls, db, (*SessionBuffer)(unsafe.Pointer(bp)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp)).FnBuf, p+8, uintptr(0))
@@ -133779,14 +134799,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+11348, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11367, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33076)
+			ts+33646)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+4,
-			ts+33189)
+			ts+33759)
 	}
 	return rc
 }
@@ -133814,7 +134834,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, 220219)
+				rc = Xsqlite3CorruptError(tls, 220310)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -134067,7 +135087,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+33333, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33903, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -134083,7 +135103,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+33354, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33924, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -134156,10 +135176,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+33373, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33943, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33399, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33969, 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))
@@ -134192,7 +135212,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				f func(*libc.TLS, uintptr, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xFilter})).f(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 124))))
 			if schemaMismatch != 0 {
-				*(*uintptr)(unsafe.Pointer(bp + 140)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 124))))
+				*(*uintptr)(unsafe.Pointer(bp + 140)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 124))))
 				if *(*uintptr)(unsafe.Pointer(bp + 140)) == uintptr(0) {
 					rc = SQLITE_NOMEM
 					break
@@ -134205,7 +135225,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+6441, *(*uintptr)(unsafe.Pointer(bp + 124)), bp+48+16, bp+140, bp+48+20, bp+48+24)
+					db, ts+6460, *(*uintptr)(unsafe.Pointer(bp + 124)), bp+48+16, bp+140, bp+48+20, bp+48+24)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -134218,19 +135238,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+33429, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 140))))
+						ts+33999, 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+33473,
+						ts+34043,
 						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+33544, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 140))))
+						ts+34114, 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+11348) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 140)), ts+11367) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -134281,14 +135301,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33604, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34174, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34204, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33658, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34228, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34204, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -135520,7 +136540,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33686, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+34256, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135808,7 +136828,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33714, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+34284, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135993,7 +137013,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+33745, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34315, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -136061,7 +137081,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33752
+		var zErr uintptr = ts + 34322
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -136219,7 +137239,7 @@ func fts5ValueToText(tls *libc.TLS, pVal uintptr) uintptr {
 	if zRet != 0 {
 		return zRet
 	}
-	return ts + 1554
+	return ts + 1573
 }
 
 func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, nVal int32, apVal uintptr) {
@@ -136242,7 +137262,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33802
+		var zErr uintptr = ts + 34372
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -136565,13 +137585,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(48)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33850, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34420, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33858, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34428, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33868, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34438, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -136982,7 +138002,7 @@ func fts5ConfigSkipLiteral(tls *libc.TLS, pIn uintptr) uintptr {
 	case 'n':
 		fallthrough
 	case 'N':
-		if Xsqlite3_strnicmp(tls, ts+6181, p, 4) == 0 {
+		if Xsqlite3_strnicmp(tls, ts+6200, p, 4) == 0 {
 			p = p + 4
 		} else {
 			p = uintptr(0)
@@ -137121,7 +138141,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+33873, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34443, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint32(unsafe.Sizeof(int32(0))) * uint32(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -137148,14 +138168,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+33880, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34450, 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+33911, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+34481, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -137166,7 +138186,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33944, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34514, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -137179,7 +138199,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33981, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34551, 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)
@@ -137188,7 +138208,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+33990, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34560, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -137207,7 +138227,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34023, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34593, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -137222,14 +138242,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34057, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34627, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34065, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34635, 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+34097, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34667, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -137237,9 +138257,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34103, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34673, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34117, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34687, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -137247,9 +138267,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34155, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34725, 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+34166, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34736, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -137257,21 +138277,21 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+5075, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+5094, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 44)) = [4]Fts5Enum{
-			{FzName: ts + 8026, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17345},
-			{FzName: ts + 34201, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8045, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17364},
+			{FzName: ts + 34771, 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+34209, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34779, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34240, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34810, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -137318,15 +138338,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+22191) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16267) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34268, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22257) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16286) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34838, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34298) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34868) {
 			*(*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+34308, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34878, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -137343,13 +138363,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+34339, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34909, 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+34344, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*4))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34914, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*4))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34351, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34921, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -137387,8 +138407,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+22191) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34359, 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+22257) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34929, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -137420,7 +138440,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+34388, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34958, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -137429,13 +138449,13 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 							if *(*uintptr)(unsafe.Pointer(bp + 44)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 44))
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						func() uintptr {
 							if *(*uintptr)(unsafe.Pointer(bp + 52)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 52))
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						pzErr)
 				} else {
@@ -137457,19 +138477,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 + 34057
+			zTail = ts + 34627
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34408
+			zTail = ts + 34978
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34416, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34986, 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+16267, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16286, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -137513,18 +138533,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+34427, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34997, 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 + 1573
 			}
-			return ts + 14614
+			return ts + 14633
 		}()
-		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+35013, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*4))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34450,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22191))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35020,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22257))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -137634,7 +138654,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34476) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35046) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -137644,7 +138664,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+34481) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35051) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -137654,7 +138674,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+34490) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35060) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -137667,7 +138687,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+34500) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35070) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -137677,7 +138697,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+34510) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35080) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -137693,7 +138713,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+22191) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22257) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+4)
@@ -137716,7 +138736,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(44)
 	defer tls.Free(44)
 
-	var zSelect uintptr = ts + 34522
+	var zSelect uintptr = ts + 35092
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 36)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -137738,7 +138758,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+34554) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35124) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 40)) = 0
@@ -137752,7 +138772,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+34562,
+				ts+35132,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -137850,7 +138870,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34627, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+35197, 0)
 					return FTS5_EOF
 				}
 			}
@@ -137863,20 +138883,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+34647, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+35217, 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+34678, uint32(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35248, uint32(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34681, uint32(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35251, uint32(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30063, uint32(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30129, uint32(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -139653,9 +140673,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+34685, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint32(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35255, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint32(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33714, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+34284, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -139671,7 +140691,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+34690, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+35260, 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')
@@ -139758,7 +140778,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20528, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20594, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -139839,7 +140859,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+34719, 0)
+			ts+35289, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -140009,12 +141029,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+34772,
+								ts+35342,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34822
+										return ts + 35392
 									}
-									return ts + 34685
+									return ts + 35255
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -140954,7 +141974,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+34829, iRowid, 0, p+36)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35399, iRowid, 0, p+36)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -141033,7 +142053,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+34835,
+			ts+35405,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -141058,7 +142078,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+34886,
+			ts+35456,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+44, zSql) != 0 {
 			return
@@ -141081,7 +142101,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+34935,
+			ts+35505,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -141320,7 +142340,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+34975, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+35545, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -142519,7 +143539,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+34998,
+			ts+35568,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -143711,7 +144731,7 @@ func fts5WriteFlushBtree(tls *libc.TLS, p uintptr, pWriter uintptr) {
 			if (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn > 0 {
 				return (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fp
 			}
-			return ts + 1554
+			return ts + 1573
 		}()
 
 		Xsqlite3_bind_blob(tls, (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter, 2, z, (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn, uintptr(0))
@@ -143984,7 +145004,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+35082,
+			ts+35652,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -145049,7 +146069,7 @@ func sqlite3Fts5IndexReinit(tls *libc.TLS, p uintptr) int32 {
 	fts5StructureInvalidate(tls, p)
 	fts5IndexDiscardData(tls, p)
 	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Fts5Structure{})))
-	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1554, 0)
+	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1573, 0)
 	fts5StructureWrite(tls, p, bp)
 	return fts5IndexReturn(tls, p)
 }
@@ -145065,13 +146085,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+35139, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35709, 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+25056, ts+35147, 0, pzErr)
+				pConfig, ts+25122, ts+35717, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11488,
-					ts+35182,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11507,
+					ts+35752,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -145324,7 +146344,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+34829, int64(FTS5_STRUCTURE_ROWID), 1, bp+4)
+		ts+35399, 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)))
@@ -145438,7 +146458,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35226,
+		ts+35796,
 		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))) {
@@ -145608,7 +146628,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+35312)
+			sqlite3Fts5BufferAppendBlob(tls, p+32, bp+8, uint32(4), ts+35882)
 			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))
@@ -145876,7 +146896,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+35317, 0)
+			ts+35887, 0)
 		return SQLITE_ERROR
 	}
 
@@ -145907,7 +146927,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 				} else if iCol >= 0 {
 					bSeenMatch = 1
 					*(*int8)(unsafe.Pointer(idxStr + uintptr(libc.PostIncInt32(&iIdxStr, 1)))) = int8('M')
-					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4975, libc.VaList(bp, iCol))
+					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4994, libc.VaList(bp, iCol))
 					idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 
 				}
@@ -145922,7 +146942,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 					}
 					return int8('G')
 				}()
-				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4975, libc.VaList(bp+8, iCol))
+				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4994, libc.VaList(bp+8, iCol))
 				idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 				(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pInfo)).FaConstraintUsage + uintptr(i)*8)).FargvIndex = libc.PreIncInt32(&iCons, 1)
 
@@ -146236,7 +147256,7 @@ func fts5NextMethod(tls *libc.TLS, pCursor uintptr) int32 {
 					rc = Xsqlite3_reset(tls, (*Fts5Cursor)(unsafe.Pointer(pCsr)).FpStmt)
 					if rc != SQLITE_OK {
 						(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-							ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+							ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 					}
 				} else {
 					rc = SQLITE_OK
@@ -146268,7 +147288,7 @@ func fts5PrepareStatement(tls *libc.TLS, ppStmt uintptr, pConfig uintptr, zFmt u
 		rc = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
 			uint32(SQLITE_PREPARE_PERSISTENT), bp+8, uintptr(0))
 		if rc != SQLITE_OK {
-			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 		}
 		Xsqlite3_free(tls, zSql)
 	}
@@ -146300,25 +147320,25 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35356,
+		ts+35926,
 		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 + 14614
+					return ts + 14633
 				}
-				return ts + 1554
+				return ts + 1573
 			}(),
 			func() uintptr {
 				if zRankArgs != 0 {
 					return zRankArgs
 				}
-				return ts + 1554
+				return ts + 1573
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35411
+					return ts + 35981
 				}
-				return ts + 35416
+				return ts + 35986
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -146364,12 +147384,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+35420, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35990, 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) {
+	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5076, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35426, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35996, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -146400,7 +147420,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+35454, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36024, 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,
@@ -146431,7 +147451,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+35464, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36034, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -146463,14 +147483,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+35485, libc.VaList(bp, z))
+				ts+36055, 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 + 33868
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34438
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -146526,7 +147546,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+35317, 0)
+		ts+35887, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -146569,7 +147589,7 @@ __8:
 	if !(zText == uintptr(0)) {
 		goto __14
 	}
-	zText = ts + 1554
+	zText = ts + 1573
 __14:
 	;
 	iCol = 0
@@ -146743,7 +147763,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35518, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+36088, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -146864,7 +147884,7 @@ func fts5SeekCursor(tls *libc.TLS, pCsr uintptr, bErrormsg int32) int32 {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			} else if (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg != 0 {
 				*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-					ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
+					ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
 			}
 		}
 	}
@@ -146888,28 +147908,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+35554, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36124, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35565, 0)
+				ts+36135, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36215, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35653, 0)
+				ts+36223, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16934, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16953, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35709, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36279, 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+35715, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36285, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -146967,7 +147987,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+17479, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17498, 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)))
@@ -146980,12 +148000,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+35731,
+				ts+36301,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20429
+						return ts + 20495
 					}
-					return ts + 35768
+					return ts + 36338
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -147615,7 +148635,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+35780, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36350, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -147859,7 +148879,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+35801, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36371, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -147878,7 +148898,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+35823, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36393, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -147925,7 +148945,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+35854)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36424)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -147934,7 +148954,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+35867, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+36437, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -147948,7 +148968,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35958, ts + 34057, ts + 25056, ts + 34408, ts + 11488,
+	ts + 36528, ts + 34627, ts + 25122, ts + 34978, ts + 11507,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -147972,7 +148992,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+35965, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+36535, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -147990,13 +149010,13 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35965, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36535, 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+35970, 0,
+				db, ts+36540, 0,
 				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
 				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
@@ -148053,17 +149073,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 + 35985,
-			ts + 36053,
-			ts + 36122,
-			ts + 36155,
-			ts + 36194,
-			ts + 36234,
-			ts + 36273,
-			ts + 36314,
-			ts + 36353,
-			ts + 36395,
-			ts + 36435,
+			ts + 36555,
+			ts + 36623,
+			ts + 36692,
+			ts + 36725,
+			ts + 36764,
+			ts + 36804,
+			ts + 36843,
+			ts + 36884,
+			ts + 36923,
+			ts + 36965,
+			ts + 37005,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -148130,7 +149150,7 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 			(*Fts5Config)(unsafe.Pointer((*Fts5Storage)(unsafe.Pointer(p)).FpConfig)).FbLock--
 			Xsqlite3_free(tls, zSql)
 			if rc != SQLITE_OK && pzErrMsg != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
 			}
 		}
 	}
@@ -148165,18 +149185,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+36458,
+		ts+37028,
 		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+36562,
+			ts+37132,
 			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+36600,
+			ts+37170,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -148188,7 +149208,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+36638,
+			ts+37208,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -148200,14 +149220,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+25056, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11488, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35958, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25122, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11507, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+36528, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34408, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34978, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34057, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34627, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -148219,17 +149239,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+36680,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37250,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29709
+					return ts + 29775
 				}
-				return ts + 1554
+				return ts + 1573
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36710,
+			ts+37280,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -148266,27 +149286,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36754, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37324, 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+36777, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37347, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34057, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34627, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34408, ts+36783, 0, pzErr)
+				pConfig, ts+34978, ts+37353, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35958, ts+36815, 1, pzErr)
+				pConfig, ts+36528, ts+37385, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35124, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -148492,12 +149512,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+36832,
+		ts+37402,
 		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+36882,
+			ts+37452,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -148505,7 +149525,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+34554, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35124, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -148681,7 +149701,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36911,
+	zSql = Xsqlite3_mprintf(tls, ts+37481,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -148863,14 +149883,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+34057, bp+36)
+			rc = fts5StorageCount(tls, p, ts+34627, 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+34408, bp+44)
+			rc = fts5StorageCount(tls, p, ts+34978, bp+44)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 44)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -149065,9 +150085,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+36943) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37513) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36954) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37524) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -149281,7 +150301,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 + 36965
+			var zCat uintptr = ts + 37535
 			var i int32
 			libc.Xmemset(tls, p, 0, uint32(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -149293,7 +150313,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+36974) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37544) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
 				}
 			}
@@ -149304,18 +150324,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+36985) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37555) {
 					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+36943) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37513) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36954) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37524) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36974) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37544) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -149591,7 +150611,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 + 37003
+	var zBase uintptr = ts + 37573
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -149731,7 +150751,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+37013, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37583, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149739,11 +150759,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37586, 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+37021, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37591, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149751,7 +150771,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37026, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37596, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149759,7 +150779,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37029, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37599, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149767,11 +150787,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37602, 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+37037, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37607, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149779,19 +150799,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37042, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37612, 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+37046, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37616, 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+37052, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37622, 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+37057, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37627, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149799,11 +150819,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37631, 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+37065, aBuf+uintptr(nBuf-2), uint32(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37635, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149811,7 +150831,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37638, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149819,11 +150839,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37642, 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+37076, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37646, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149831,7 +150851,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37080, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37650, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149839,7 +150859,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37654, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149847,7 +150867,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37088, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37658, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149863,24 +150883,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+37092, aBuf+uintptr(nBuf-2), uint32(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37072, uint32(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37662, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37642, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37665, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37668, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37672, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37658, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -149895,137 +150915,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+37105, aBuf+uintptr(nBuf-7), uint32(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37675, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37072, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37642, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37113, aBuf+uintptr(nBuf-6), uint32(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37683, aBuf+uintptr(nBuf-6), uint32(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37120, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37690, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37125, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37695, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37021, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37591, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37130, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37700, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37016, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37586, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37705, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37088, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37658, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37140, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37710, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15480, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15499, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37145, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37715, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37098, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37668, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37149, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37719, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37013, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37583, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 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+37724, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37057, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37627, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37160, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37730, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37164, uint32(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37734, uint32(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37166, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37736, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37080, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37650, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37172, aBuf+uintptr(nBuf-7), uint32(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37742, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37088, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37658, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37180, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37750, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37072, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37642, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37186, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37756, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37072, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37642, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37191, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37761, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37197, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37767, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37084, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37654, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37205, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37775, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37213, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37783, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37217, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37787, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37080, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37650, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37225, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37795, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37231, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37801, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37084, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37654, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37237, aBuf+uintptr(nBuf-6), uint32(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37807, aBuf+uintptr(nBuf-6), uint32(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37098, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37668, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -150040,16 +151060,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+37244, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37814, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37029, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37599, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37249, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37819, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -150057,21 +151077,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37254, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37824, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37599, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37260, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37830, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37599, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37213, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37783, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150079,7 +151099,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37266, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37836, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -150087,9 +151107,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37272, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37842, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -150104,12 +151124,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+37278, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37848, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37282, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37852, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37285, aBuf+uintptr(nBuf-2), uint32(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37855, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -150118,7 +151138,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37288, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37858, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -150274,7 +151294,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+37292) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37862) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -150454,22 +151474,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(64)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 37003, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37573, 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 + 37307, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37877, 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 + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37883, 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 + 37320, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37890, 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
@@ -151608,14 +152628,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+37328) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37898) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37332) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37902) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37336) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37906) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37345, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37915, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -151641,19 +152661,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 + 37379,
-		ts + 37419,
-		ts + 37454,
+		ts + 37949,
+		ts + 37989,
+		ts + 38024,
 	}
 
 	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+23352, *(*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+23418, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uint32(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37497, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38067, 0)
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -151786,11 +152806,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+37530, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+38100, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37561,
+		ts+38131,
 		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))
@@ -151814,7 +152834,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+37612, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38182, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -152098,7 +153118,7 @@ func fts5VocabFilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, zUnused
 		if pLe != 0 {
 			var zCopy uintptr = Xsqlite3_value_text(tls, pLe)
 			if zCopy == uintptr(0) {
-				zCopy = ts + 1554
+				zCopy = ts + 1573
 			}
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm = Xsqlite3_value_bytes(tls, pLe)
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FzLeTerm = Xsqlite3_malloc(tls, (*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm+1)
@@ -152209,7 +153229,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+37638, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+38208, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -152231,7 +153251,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 + 37648
+	return ts + 38218
 }
 
 func init() {
@@ -152657,6 +153677,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 588)) = noopStepFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 592)) = uintptr(unsafe.Pointer(&lagName))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&attach_func)) + 16)) = attachFunc
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 4)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 8)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 12)) = statBestIndex
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 16)) = statDisconnect
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 20)) = statDisconnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 24)) = statOpen
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 28)) = statClose
+	*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 32)) = statFilter
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 36)) = statNext
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 40)) = statEof
+	*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 44)) = statColumn
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 48)) = statRowid
 	*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 0)) = sqlite3MemMalloc
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 4)) = sqlite3MemFree
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 8)) = sqlite3MemRealloc
@@ -153189,8 +154221,9 @@ func init() {
 	*(*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
-	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 12)) = Xsqlite3JsonTableFunctions
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = Xsqlite3DbstatRegister
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 12)) = sqlite3TestExtInit
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = Xsqlite3JsonTableFunctions
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statGetFuncdef)) + 16)) = statGet
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statInitFuncdef)) + 16)) = statInit
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statPushFuncdef)) + 16)) = statPush
@@ -153208,5 +154241,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 68)) = rbuVfsGetLastError
 }
 
-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 ts1 = "3.41.2\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_DBSTAT_VTAB\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\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\x00true\x00false\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 \x00rowid not at end-of-record for row \x00 of 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\x00CREATE TABLE x( name       TEXT, path       TEXT, pageno     INTEGER, pagetype   TEXT, ncell      INTEGER, payload    INTEGER, unused     INTEGER, mx_payload INTEGER, pgoffset   INTEGER, pgsize     INTEGER, schema     TEXT HIDDEN, aggregate  BOOLEAN HIDDEN)\x00/\x00overflow\x00%s%.3x+%.6x\x00%s%.3x/\x00internal\x00leaf\x00corrupted\x00SELECT * FROM (SELECT 'sqlite_schema' AS name,1 AS rootpage,'table' AS type UNION ALL SELECT name,rootpage,type FROM \"%w\".sqlite_schema WHERE rootpage!=0)\x00WHERE name=%Q\x00 ORDER BY name\x00dbstat\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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 9e987aac..69fbfee9 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -208,6 +208,7 @@ const (
 	DBFLAG_SchemaKnownOk                  = 0x0010
 	DBFLAG_Vacuum                         = 0x0004
 	DBFLAG_VacuumInto                     = 0x0008
+	DBSTAT_PAGE_PADDING_BYTES             = 256
 	DB_ResetWanted                        = 0x0008
 	DB_SchemaLoaded                       = 0x0001
 	DB_UnresetViews                       = 0x0002
@@ -920,11 +921,11 @@ const (
 	NC_OrderAgg                           = 0x8000000
 	NC_PartIdx                            = 0x000002
 	NC_SelfRef                            = 0x00002e
+	NC_Subquery                           = 0x000040
 	NC_UAggInfo                           = 0x000100
 	NC_UBaseReg                           = 0x000400
 	NC_UEList                             = 0x000080
 	NC_UUpsert                            = 0x000200
-	NC_VarSelect                          = 0x000040
 	NDEBUG                                = 1
 	NN                                    = 1
 	NOT_WITHIN                            = 0
@@ -1765,6 +1766,7 @@ const (
 	SQLITE_ECEL_REF                       = 0x04
 	SQLITE_EMPTY                          = 16
 	SQLITE_ENABLE_COLUMN_METADATA         = 1
+	SQLITE_ENABLE_DBSTAT_VTAB             = 1
 	SQLITE_ENABLE_FTS5                    = 1
 	SQLITE_ENABLE_GEOPOLY                 = 1
 	SQLITE_ENABLE_LOCKING_STYLE           = 0
@@ -2166,7 +2168,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
+	SQLITE_SOURCE_ID                      = "2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2274,8 +2276,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.41.0"
-	SQLITE_VERSION_NUMBER                 = 3041000
+	SQLITE_VERSION                        = "3.41.2"
+	SQLITE_VERSION_NUMBER                 = 3041002
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -6113,7 +6115,8 @@ type IndexedExpr1 = struct {
 	FiIdxCur       int32
 	FiIdxCol       int32
 	FbMaybeNullRow U8
-	F__ccgo_pad1   [3]byte
+	Faff           U8
+	F__ccgo_pad1   [2]byte
 	FpIENext       uintptr
 }
 
@@ -6755,17 +6758,18 @@ type Pager = Pager1
 
 // Handle type for pages.
 type PgHdr2 = struct {
-	FpPage      uintptr
-	FpData      uintptr
-	FpExtra     uintptr
-	FpCache     uintptr
-	FpDirty     uintptr
-	FpPager     uintptr
-	Fpgno       Pgno
-	Fflags      U16
-	FnRef       I16
-	FpDirtyNext uintptr
-	FpDirtyPrev uintptr
+	FpPage       uintptr
+	FpData       uintptr
+	FpExtra      uintptr
+	FpCache      uintptr
+	FpDirty      uintptr
+	FpPager      uintptr
+	Fpgno        Pgno
+	Fflags       U16
+	F__ccgo_pad1 [2]byte
+	FnRef        I64
+	FpDirtyNext  uintptr
+	FpDirtyPrev  uintptr
 }
 
 // Handle type for pages.
@@ -6986,14 +6990,14 @@ type PCache2 = struct {
 	FpDirty      uintptr
 	FpDirtyTail  uintptr
 	FpSynced     uintptr
-	FnRefSum     int32
+	FnRefSum     I64
 	FszCache     int32
 	FszSpill     int32
 	FszPage      int32
 	FszExtra     int32
 	FbPurgeable  U8
 	FeCreate     U8
-	F__ccgo_pad1 [2]byte
+	F__ccgo_pad1 [6]byte
 	FxStress     uintptr
 	FpStress     uintptr
 	FpCache      uintptr
@@ -7252,7 +7256,7 @@ type CoveringIndexCheck1 = struct {
 	F__ccgo_pad1 [2]byte
 }
 
-var sqlite3azCompileOpt = [52]uintptr{
+var sqlite3azCompileOpt = [53]uintptr{
 	ts + 7,
 	ts + 27,
 	ts + 56,
@@ -7271,40 +7275,41 @@ var sqlite3azCompileOpt = [52]uintptr{
 	ts + 372,
 	ts + 397,
 	ts + 420,
-	ts + 432,
-	ts + 447,
-	ts + 469,
-	ts + 494,
-	ts + 517,
-	ts + 539,
-	ts + 550,
-	ts + 563,
-	ts + 578,
-	ts + 594,
-	ts + 607,
-	ts + 628,
-	ts + 652,
-	ts + 675,
-	ts + 691,
-	ts + 707,
-	ts + 731,
-	ts + 758,
-	ts + 778,
-	ts + 799,
-	ts + 821,
-	ts + 851,
-	ts + 876,
-	ts + 902,
-	ts + 922,
-	ts + 948,
-	ts + 971,
-	ts + 997,
-	ts + 1019,
-	ts + 1040,
-	ts + 1051,
+	ts + 439,
+	ts + 451,
+	ts + 466,
+	ts + 488,
+	ts + 513,
+	ts + 536,
+	ts + 558,
+	ts + 569,
+	ts + 582,
+	ts + 597,
+	ts + 613,
+	ts + 626,
+	ts + 647,
+	ts + 671,
+	ts + 694,
+	ts + 710,
+	ts + 726,
+	ts + 750,
+	ts + 777,
+	ts + 797,
+	ts + 818,
+	ts + 840,
+	ts + 870,
+	ts + 895,
+	ts + 921,
+	ts + 941,
+	ts + 967,
+	ts + 990,
+	ts + 1016,
+	ts + 1038,
 	ts + 1059,
-	ts + 1073,
-	ts + 1086,
+	ts + 1070,
+	ts + 1078,
+	ts + 1092,
+	ts + 1105,
 }
 
 func Xsqlite3CompileOptions(tls *libc.TLS, pnOpt uintptr) uintptr {
@@ -7456,7 +7461,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 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))
+var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1118))
 
 // Standard typenames.  These names must match the COLTYPE_* definitions.
 // Adjust the SQLITE_N_STDTYPE value if adding or removing entries.
@@ -7478,12 +7483,12 @@ var Xsqlite3StdTypeAffinity = [6]int8{
 	int8(SQLITE_AFF_TEXT),
 }
 var Xsqlite3StdType = [6]uintptr{
-	ts + 1106,
-	ts + 1110,
-	ts + 1115,
-	ts + 1119,
-	ts + 1127,
-	ts + 1132,
+	ts + 1125,
+	ts + 1129,
+	ts + 1134,
+	ts + 1138,
+	ts + 1146,
+	ts + 1151,
 }
 
 // SQL is translated into a sequence of instructions to be
@@ -7800,7 +7805,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, 23229)
+		return Xsqlite3MisuseError(tls, 23233)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -8229,7 +8234,7 @@ __6:
 __4:
 	;
 	zDate++
-	if !(getDigits(tls, zDate, ts+1137, libc.VaList(bp, bp+16, bp+20)) != 2) {
+	if !(getDigits(tls, zDate, ts+1156, libc.VaList(bp, bp+16, bp+20)) != 2) {
 		goto __9
 	}
 	return 1
@@ -8255,13 +8260,13 @@ func parseHhMmSs(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	defer tls.Free(36)
 
 	var ms float64 = 0.0
-	if getDigits(tls, zDate, ts+1145, libc.VaList(bp, bp+24, bp+28)) != 2 {
+	if getDigits(tls, zDate, ts+1164, libc.VaList(bp, bp+24, bp+28)) != 2 {
 		return 1
 	}
 	zDate += uintptr(5)
 	if int32(*(*int8)(unsafe.Pointer(zDate))) == ':' {
 		zDate++
-		if getDigits(tls, zDate, ts+1153, libc.VaList(bp+16, bp+32)) != 1 {
+		if getDigits(tls, zDate, ts+1172, libc.VaList(bp+16, bp+32)) != 1 {
 			return 1
 		}
 		zDate += uintptr(2)
@@ -8359,7 +8364,7 @@ func parseYyyyMmDd(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	} else {
 		neg = 0
 	}
-	if getDigits(tls, zDate, ts+1157, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
+	if getDigits(tls, zDate, ts+1176, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
 		return 1
 	}
 	zDate += uintptr(10)
@@ -8416,7 +8421,7 @@ func parseDateOrTime(tls *libc.TLS, context uintptr, zDate uintptr, p uintptr) i
 		return 0
 	} else if parseHhMmSs(tls, zDate, p) == 0 {
 		return 0
-	} else if Xsqlite3StrICmp(tls, zDate, ts+1169) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
+	} else if Xsqlite3StrICmp(tls, zDate, ts+1188) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
 		return setDateTimeToCurrent(tls, context, p)
 	} else if Xsqlite3AtoF(tls, zDate, bp, Xsqlite3Strlen30(tls, zDate), uint8(SQLITE_UTF8)) > 0 {
 		setRawDateNumber(tls, p, *(*float64)(unsafe.Pointer(bp)))
@@ -8549,7 +8554,7 @@ func toLocaltime(tls *libc.TLS, p uintptr, pCtx uintptr) int32 {
 		*(*Time_t)(unsafe.Pointer(bp + 104)) = (*DateTime)(unsafe.Pointer(p)).FiJD/int64(1000) - int64(21086676)*int64(10000)
 	}
 	if osLocaltime(tls, bp+104, bp) != 0 {
-		Xsqlite3_result_error(tls, pCtx, ts+1173, -1)
+		Xsqlite3_result_error(tls, pCtx, ts+1192, -1)
 		return SQLITE_ERROR
 	}
 	(*DateTime)(unsafe.Pointer(p)).FY = (*tm)(unsafe.Pointer(bp)).Ftm_year + 1900 - iYearDiff
@@ -8573,12 +8578,12 @@ var aXformType = [6]struct {
 	FrLimit float32
 	FrXform float32
 }{
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1196)), FrLimit: 4.6427e+14, FrXform: 1.0},
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1203)), FrLimit: 7.7379e+12, FrXform: 60.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1210)), FrLimit: 1.2897e+11, FrXform: 3600.0},
-	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1217)), FrLimit: 5373485.0, FrXform: 86400.0},
-	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1224)), FrLimit: 176546.0, FrXform: 2592000.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1231)), FrLimit: 14713.0, FrXform: 31536000.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1215)), FrLimit: 4.6427e+14, FrXform: 1.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1222)), FrLimit: 7.7379e+12, FrXform: 60.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1229)), FrLimit: 1.2897e+11, FrXform: 3600.0},
+	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1236)), FrLimit: 5373485.0, FrXform: 86400.0},
+	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1243)), FrLimit: 176546.0, FrXform: 2592000.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1250)), FrLimit: 14713.0, FrXform: 31536000.0},
 }
 
 func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, idx int32) int32 {
@@ -8590,7 +8595,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 	switch int32(Xsqlite3UpperToLower[U8(*(*int8)(unsafe.Pointer(z)))]) {
 	case 'a':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1238) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1257) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8612,7 +8617,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'j':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1243) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1262) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8626,7 +8631,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'l':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1253) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1272) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				rc = toLocaltime(tls, p, pCtx)
 			}
 			break
@@ -8634,7 +8639,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'u':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1263) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1282) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8646,7 +8651,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 					rc = 0
 				}
-			} else if Xsqlite3_stricmp(tls, z, ts+1273) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1292) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				if int32((*DateTime)(unsafe.Pointer(p)).FtzSet) == 0 {
 					var iOrigJD I64
 					var iGuess I64
@@ -8680,7 +8685,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'w':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1277, 8) == 0 &&
+			if Xsqlite3_strnicmp(tls, z, ts+1296, 8) == 0 &&
 				Xsqlite3AtoF(tls, z+8, bp+48, Xsqlite3Strlen30(tls, z+8), uint8(SQLITE_UTF8)) > 0 &&
 				*(*float64)(unsafe.Pointer(bp + 48)) >= 0.0 && *(*float64)(unsafe.Pointer(bp + 48)) < 7.0 && float64(libc.AssignInt32(&n, int32(*(*float64)(unsafe.Pointer(bp + 48))))) == *(*float64)(unsafe.Pointer(bp + 48)) {
 				var Z Sqlite3_int64
@@ -8701,7 +8706,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 's':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1286, 9) != 0 {
+			if Xsqlite3_strnicmp(tls, z, ts+1305, 9) != 0 {
 				break
 			}
 			if !(int32((*DateTime)(unsafe.Pointer(p)).FvalidJD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidYMD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidHMS) != 0) {
@@ -8715,14 +8720,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 			(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidTZ = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidJD = int8(0)
-			if Xsqlite3_stricmp(tls, z, ts+1296) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1315) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1302) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1321) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FM = 1
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1307) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1326) == 0 {
 				rc = 0
 			}
 			break
@@ -9048,7 +9053,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		switch int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) {
 		case 'd':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
 				break
 
 			}
@@ -9058,13 +9063,13 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if s > 59.999 {
 					s = 59.999
 				}
-				Xsqlite3_str_appendf(tls, bp+136, ts+1316, libc.VaList(bp+8, s))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1335, libc.VaList(bp+8, s))
 				break
 
 			}
 		case 'H':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
 				break
 
 			}
@@ -9082,41 +9087,41 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) == 'W' {
 					var wd int32
 					wd = int32(((*DateTime)(unsafe.Pointer(bp+88)).FiJD + int64(43200000)) / int64(86400000) % int64(7))
-					Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+24, (nDay+7-wd)/7))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+24, (nDay+7-wd)/7))
 				} else {
-					Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+32, nDay+1))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1342, libc.VaList(bp+32, nDay+1))
 				}
 				break
 
 			}
 		case 'J':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1328, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1347, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
 				break
 
 			}
 		case 'm':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
 				break
 
 			}
 		case 'M':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
 				break
 
 			}
 		case 's':
 			{
 				var iS I64 = (*DateTime)(unsafe.Pointer(bp+88)).FiJD/int64(1000) - int64(21086676)*int64(10000)
-				Xsqlite3_str_appendf(tls, bp+136, ts+1334, libc.VaList(bp+64, iS))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1353, libc.VaList(bp+64, iS))
 				break
 
 			}
 		case 'S':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
 				break
 
 			}
@@ -9129,7 +9134,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			}
 		case 'Y':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1339, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1358, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
 				break
 
 			}
@@ -9179,15 +9184,15 @@ func Xsqlite3RegisterDateTimeFunctions(tls *libc.TLS) {
 }
 
 var aDateTimeFuncs = [9]FuncDef{
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1243},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1263},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1344},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1349},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1354},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1262},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1282},
 	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1363},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1372},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1385},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1403}}
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1368},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1373},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1382},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1391},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1404},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1422}}
 
 // The following routines are convenience wrappers around methods
 // of the sqlite3_file object.  This is mostly just syntactic sugar. All
@@ -9602,7 +9607,7 @@ func sqlite3MemMalloc(tls *libc.TLS, nByte int32) uintptr {
 		*(*Sqlite3_int64)(unsafe.Pointer(p)) = Sqlite3_int64(nByte)
 		p += 8
 	} else {
-		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1416, libc.VaList(bp, nByte))
+		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1435, libc.VaList(bp, nByte))
 	}
 	return p
 }
@@ -9635,7 +9640,7 @@ func sqlite3MemRealloc(tls *libc.TLS, pPrior uintptr, nByte int32) uintptr {
 		p += 8
 	} else {
 		Xsqlite3_log(tls, SQLITE_NOMEM,
-			ts+1454,
+			ts+1473,
 			libc.VaList(bp, sqlite3MemSize(tls, pPrior), nByte))
 	}
 	return p
@@ -10511,7 +10516,7 @@ func Xsqlite3OomFault(tls *libc.TLS, db uintptr) uintptr {
 		(*Sqlite3)(unsafe.Pointer(db)).Flookaside.Fsz = U16(0)
 		if (*Sqlite3)(unsafe.Pointer(db)).FpParse != 0 {
 			var pParse uintptr
-			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1490, 0)
+			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1509, 0)
 			(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 			for pParse = (*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).FpOuterParse; pParse != 0; pParse = (*Parse)(unsafe.Pointer(pParse)).FpOuterParse {
 				(*Parse)(unsafe.Pointer(pParse)).FnErr++
@@ -10584,8 +10589,8 @@ type et_info = struct {
 // by an instance of the following structure
 type Et_info = et_info
 
-var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1504))
-var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1537))
+var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1523))
+var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1556))
 var fmtinfo = [23]Et_info{
 	{Ffmttype: int8('d'), Fbase: EtByte(10), Fflags: EtByte(1), Ftype: EtByte(EtDECIMAL)},
 	{Ffmttype: int8('s'), Fflags: EtByte(4), Ftype: EtByte(EtSTRING)},
@@ -10799,7 +10804,7 @@ __6:
 	if !(libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(libc.PreIncUintptr(&fmt, 1))))) == 0) {
 		goto __11
 	}
-	Xsqlite3_str_append(tls, pAccum, ts+1544, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1563, 1)
 	goto __5
 __11:
 	;
@@ -11356,7 +11361,7 @@ __125:
 	if !(Xsqlite3IsNaN(tls, *(*float64)(unsafe.Pointer(bp + 104))) != 0) {
 		goto __127
 	}
-	bufpt = ts + 1546
+	bufpt = ts + 1565
 	length = 3
 	goto __58
 __127:
@@ -11416,7 +11421,7 @@ __138:
 	}
 	bufpt = bp + 16
 	*(*int8)(unsafe.Pointer(bp + 16)) = prefix
-	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1550, uint64(4))
+	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1569, uint64(4))
 	length = 3 + libc.Bool32(int32(prefix) != 0)
 	goto __58
 __139:
@@ -11782,7 +11787,7 @@ __200:
 	if !(bufpt == uintptr(0)) {
 		goto __201
 	}
-	bufpt = ts + 1554
+	bufpt = ts + 1573
 	goto __202
 __201:
 	if !(int32(xtype) == EtDYNSTRING) {
@@ -11906,9 +11911,9 @@ __222:
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
-			return ts + 1555
+			return ts + 1574
 		}
-		return ts + 1560
+		return ts + 1579
 	}()
 __223:
 	;
@@ -12056,7 +12061,7 @@ __246:
 		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
-	Xsqlite3_str_append(tls, pAccum, ts+1567, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1586, 1)
 __250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
@@ -12073,10 +12078,10 @@ __251:
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
 		goto __253
 	}
-	Xsqlite3_str_appendf(tls, pAccum, ts+1569, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1588, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 	goto __254
 __253:
-	Xsqlite3_str_appendf(tls, pAccum, ts+1579, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1598, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
 __254:
 	;
 __252:
@@ -12131,7 +12136,7 @@ __4:
 __5:
 }
 
-var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1593))
+var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1612))
 
 // The z string points to the first character of a token that is
 // associated with an error.  If db does not already have an error
@@ -12296,7 +12301,7 @@ func Xsqlite3ResultStrAccum(tls *libc.TLS, pCtx uintptr, p uintptr) {
 	} else if int32((*StrAccum)(unsafe.Pointer(p)).FprintfFlags)&SQLITE_PRINTF_MALLOCED != 0 {
 		Xsqlite3_result_text(tls, pCtx, (*StrAccum)(unsafe.Pointer(p)).FzText, int32((*StrAccum)(unsafe.Pointer(p)).FnChar), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 	} else {
-		Xsqlite3_result_text(tls, pCtx, ts+1554, 0, uintptr(0))
+		Xsqlite3_result_text(tls, pCtx, ts+1573, 0, uintptr(0))
 		Xsqlite3_str_reset(tls, p)
 	}
 }
@@ -14022,7 +14027,7 @@ func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
 	var c int32 = 0
 	var i int32
 
-	var pow63 uintptr = ts + 1602
+	var pow63 uintptr = ts + 1621
 	for i = 0; c == 0 && i < 18; i++ {
 		c = (int32(*(*int8)(unsafe.Pointer(zNum + uintptr(i*incr)))) - int32(*(*int8)(unsafe.Pointer(pow63 + uintptr(i))))) * 10
 	}
@@ -14573,7 +14578,7 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 	defer tls.Free(8)
 
 	Xsqlite3_log(tls, SQLITE_MISUSE,
-		ts+1621,
+		ts+1640,
 		libc.VaList(bp, zType))
 }
 
@@ -14592,13 +14597,13 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 func Xsqlite3SafetyCheckOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	if db == uintptr(0) {
-		logBadConnection(tls, ts+1555)
+		logBadConnection(tls, ts+1574)
 		return 0
 	}
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_OPEN {
 		if Xsqlite3SafetyCheckSickOrOk(tls, db) != 0 {
-			logBadConnection(tls, ts+1666)
+			logBadConnection(tls, ts+1685)
 		}
 		return 0
 	} else {
@@ -14611,7 +14616,7 @@ func Xsqlite3SafetyCheckSickOrOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_SICK && int32(eOpenState) != SQLITE_STATE_OPEN && int32(eOpenState) != SQLITE_STATE_BUSY {
-		logBadConnection(tls, ts+1675)
+		logBadConnection(tls, ts+1694)
 		return 0
 	} else {
 		return 1
@@ -15085,193 +15090,193 @@ func Xsqlite3OpcodeName(tls *libc.TLS, i int32) uintptr {
 }
 
 var azName = [187]uintptr{
-	ts + 1683,
-	ts + 1693,
-	ts + 1704,
-	ts + 1716,
-	ts + 1727,
-	ts + 1739,
+	ts + 1702,
+	ts + 1712,
+	ts + 1723,
+	ts + 1735,
 	ts + 1746,
-	ts + 1754,
-	ts + 1762,
-	ts + 1767,
-	ts + 1772,
-	ts + 1778,
-	ts + 1792,
-	ts + 1798,
-	ts + 1808,
-	ts + 1813,
-	ts + 1818,
-	ts + 1821,
+	ts + 1758,
+	ts + 1765,
+	ts + 1773,
+	ts + 1781,
+	ts + 1786,
+	ts + 1791,
+	ts + 1797,
+	ts + 1811,
+	ts + 1817,
 	ts + 1827,
-	ts + 1834,
-	ts + 1838,
-	ts + 1848,
-	ts + 1855,
-	ts + 1862,
-	ts + 1869,
-	ts + 1876,
-	ts + 1886,
+	ts + 1832,
+	ts + 1837,
+	ts + 1840,
+	ts + 1846,
+	ts + 1853,
+	ts + 1857,
+	ts + 1867,
+	ts + 1874,
+	ts + 1881,
+	ts + 1888,
 	ts + 1895,
-	ts + 1906,
-	ts + 1915,
-	ts + 1921,
-	ts + 1931,
-	ts + 1941,
-	ts + 1946,
-	ts + 1956,
-	ts + 1967,
-	ts + 1972,
-	ts + 1979,
-	ts + 1990,
-	ts + 1995,
-	ts + 2000,
-	ts + 2006,
-	ts + 2012,
-	ts + 2018,
-	ts + 2021,
+	ts + 1905,
+	ts + 1914,
+	ts + 1925,
+	ts + 1934,
+	ts + 1940,
+	ts + 1950,
+	ts + 1960,
+	ts + 1965,
+	ts + 1975,
+	ts + 1986,
+	ts + 1991,
+	ts + 1998,
+	ts + 2009,
+	ts + 2014,
+	ts + 2019,
 	ts + 2025,
 	ts + 2031,
-	ts + 2042,
-	ts + 2053,
+	ts + 2037,
+	ts + 2040,
+	ts + 2044,
+	ts + 2050,
 	ts + 2061,
-	ts + 2070,
-	ts + 2077,
-	ts + 2085,
-	ts + 2088,
-	ts + 2091,
-	ts + 2094,
-	ts + 2097,
-	ts + 2100,
-	ts + 2103,
+	ts + 2072,
+	ts + 2080,
+	ts + 2089,
+	ts + 2096,
+	ts + 2104,
+	ts + 2107,
 	ts + 2110,
+	ts + 2113,
 	ts + 2116,
-	ts + 2126,
-	ts + 2139,
-	ts + 2150,
-	ts + 2156,
-	ts + 2163,
-	ts + 2172,
-	ts + 2181,
-	ts + 2188,
-	ts + 2201,
-	ts + 2212,
-	ts + 2217,
-	ts + 2225,
+	ts + 2119,
+	ts + 2122,
+	ts + 2129,
+	ts + 2135,
+	ts + 2145,
+	ts + 2158,
+	ts + 2169,
+	ts + 2175,
+	ts + 2182,
+	ts + 2191,
+	ts + 2200,
+	ts + 2207,
+	ts + 2220,
 	ts + 2231,
-	ts + 2238,
+	ts + 2236,
+	ts + 2244,
 	ts + 2250,
-	ts + 2255,
-	ts + 2264,
+	ts + 2257,
 	ts + 2269,
-	ts + 2278,
+	ts + 2274,
 	ts + 2283,
 	ts + 2288,
-	ts + 2294,
+	ts + 2297,
 	ts + 2302,
-	ts + 2310,
-	ts + 2320,
-	ts + 2328,
-	ts + 2335,
-	ts + 2348,
-	ts + 2353,
-	ts + 2365,
-	ts + 2373,
-	ts + 2380,
-	ts + 2391,
-	ts + 2398,
-	ts + 2405,
-	ts + 2415,
+	ts + 2307,
+	ts + 2313,
+	ts + 2321,
+	ts + 2329,
+	ts + 2339,
+	ts + 2347,
+	ts + 2354,
+	ts + 2367,
+	ts + 2372,
+	ts + 2384,
+	ts + 2392,
+	ts + 2399,
+	ts + 2410,
+	ts + 2417,
 	ts + 2424,
-	ts + 2435,
-	ts + 2441,
-	ts + 2452,
-	ts + 2462,
-	ts + 2472,
-	ts + 2479,
-	ts + 2485,
-	ts + 2495,
-	ts + 2506,
-	ts + 2510,
-	ts + 2519,
-	ts + 2528,
-	ts + 2535,
-	ts + 2545,
-	ts + 2552,
-	ts + 2561,
+	ts + 2434,
+	ts + 2443,
+	ts + 2454,
+	ts + 2460,
+	ts + 2471,
+	ts + 2481,
+	ts + 2491,
+	ts + 2498,
+	ts + 2504,
+	ts + 2514,
+	ts + 2525,
+	ts + 2529,
+	ts + 2538,
+	ts + 2547,
+	ts + 2554,
+	ts + 2564,
 	ts + 2571,
-	ts + 2578,
-	ts + 2586,
-	ts + 2600,
-	ts + 2608,
-	ts + 2622,
-	ts + 2633,
-	ts + 2646,
-	ts + 2657,
-	ts + 2663,
-	ts + 2675,
-	ts + 2684,
-	ts + 2692,
-	ts + 2701,
-	ts + 2710,
-	ts + 2717,
-	ts + 2725,
-	ts + 2732,
-	ts + 2743,
-	ts + 2757,
-	ts + 2768,
+	ts + 2580,
+	ts + 2590,
+	ts + 2597,
+	ts + 2605,
+	ts + 2619,
+	ts + 2627,
+	ts + 2641,
+	ts + 2652,
+	ts + 2665,
+	ts + 2676,
+	ts + 2682,
+	ts + 2694,
+	ts + 2703,
+	ts + 2711,
+	ts + 2720,
+	ts + 2729,
+	ts + 2736,
+	ts + 2744,
+	ts + 2751,
+	ts + 2762,
 	ts + 2776,
-	ts + 2782,
-	ts + 2790,
-	ts + 2798,
-	ts + 2808,
-	ts + 2821,
-	ts + 2831,
-	ts + 2844,
-	ts + 2853,
-	ts + 2864,
+	ts + 2787,
+	ts + 2795,
+	ts + 2801,
+	ts + 2809,
+	ts + 2817,
+	ts + 2827,
+	ts + 2840,
+	ts + 2850,
+	ts + 2863,
 	ts + 2872,
-	ts + 2878,
-	ts + 2890,
-	ts + 2902,
-	ts + 2910,
-	ts + 2922,
-	ts + 2935,
-	ts + 2945,
-	ts + 2955,
-	ts + 2960,
-	ts + 2972,
-	ts + 2984,
-	ts + 2994,
-	ts + 3000,
-	ts + 3010,
-	ts + 3017,
+	ts + 2883,
+	ts + 2891,
+	ts + 2897,
+	ts + 2909,
+	ts + 2921,
+	ts + 2929,
+	ts + 2941,
+	ts + 2954,
+	ts + 2964,
+	ts + 2974,
+	ts + 2979,
+	ts + 2991,
+	ts + 3003,
+	ts + 3013,
+	ts + 3019,
 	ts + 3029,
-	ts + 3040,
+	ts + 3036,
 	ts + 3048,
-	ts + 3057,
-	ts + 3066,
-	ts + 3075,
-	ts + 3082,
-	ts + 3093,
-	ts + 3106,
-	ts + 3116,
-	ts + 3123,
-	ts + 3131,
-	ts + 3140,
-	ts + 3146,
-	ts + 3154,
-	ts + 3162,
-	ts + 3170,
-	ts + 3180,
+	ts + 3059,
+	ts + 3067,
+	ts + 3076,
+	ts + 3085,
+	ts + 3094,
+	ts + 3101,
+	ts + 3112,
+	ts + 3125,
+	ts + 3135,
+	ts + 3142,
+	ts + 3150,
+	ts + 3159,
+	ts + 3165,
+	ts + 3173,
+	ts + 3181,
 	ts + 3189,
-	ts + 3200,
-	ts + 3210,
-	ts + 3216,
-	ts + 3227,
-	ts + 3238,
-	ts + 3243,
-	ts + 3251,
+	ts + 3199,
+	ts + 3208,
+	ts + 3219,
+	ts + 3229,
+	ts + 3235,
+	ts + 3246,
+	ts + 3257,
+	ts + 3262,
+	ts + 3270,
 }
 
 type stat = struct {
@@ -15641,35 +15646,35 @@ type unix_syscall = struct {
 }
 
 var aSyscall = [29]unix_syscall{
-	{FzName: ts + 3261, FpCurrent: 0},
-	{FzName: ts + 3266, FpCurrent: 0},
-	{FzName: ts + 3272, FpCurrent: 0},
-	{FzName: ts + 3279, FpCurrent: 0},
-	{FzName: ts + 3286, FpCurrent: 0},
+	{FzName: ts + 3280, FpCurrent: 0},
+	{FzName: ts + 3285, FpCurrent: 0},
 	{FzName: ts + 3291, FpCurrent: 0},
-	{FzName: ts + 3297, FpCurrent: 0},
-	{FzName: ts + 3307, FpCurrent: 0},
-	{FzName: ts + 3313, FpCurrent: 0},
-	{FzName: ts + 3318},
-	{FzName: ts + 3324},
+	{FzName: ts + 3298, FpCurrent: 0},
+	{FzName: ts + 3305, FpCurrent: 0},
+	{FzName: ts + 3310, FpCurrent: 0},
+	{FzName: ts + 3316, FpCurrent: 0},
+	{FzName: ts + 3326, FpCurrent: 0},
 	{FzName: ts + 3332, FpCurrent: 0},
-	{FzName: ts + 3338},
-	{FzName: ts + 3345},
-	{FzName: ts + 3354, FpCurrent: 0},
-	{FzName: ts + 3361},
-	{FzName: ts + 3371, FpCurrent: 0},
-	{FzName: ts + 3378, FpCurrent: 0},
-	{FzName: ts + 3392, FpCurrent: 0},
-	{FzName: ts + 3398, FpCurrent: 0},
-	{FzName: ts + 3404, FpCurrent: 0},
+	{FzName: ts + 3337},
+	{FzName: ts + 3343},
+	{FzName: ts + 3351, FpCurrent: 0},
+	{FzName: ts + 3357},
+	{FzName: ts + 3364},
+	{FzName: ts + 3373, FpCurrent: 0},
+	{FzName: ts + 3380},
+	{FzName: ts + 3390, FpCurrent: 0},
+	{FzName: ts + 3397, FpCurrent: 0},
 	{FzName: ts + 3411, FpCurrent: 0},
-	{FzName: ts + 3419, FpCurrent: 0},
-	{FzName: ts + 3424, FpCurrent: 0},
-	{FzName: ts + 3431, FpCurrent: 0},
+	{FzName: ts + 3417, FpCurrent: 0},
+	{FzName: ts + 3423, FpCurrent: 0},
+	{FzName: ts + 3430, FpCurrent: 0},
 	{FzName: ts + 3438, FpCurrent: 0},
+	{FzName: ts + 3443, FpCurrent: 0},
 	{FzName: ts + 3450, FpCurrent: 0},
-	{FzName: ts + 3459, FpCurrent: 0},
-	{FzName: ts + 3465},
+	{FzName: ts + 3457, FpCurrent: 0},
+	{FzName: ts + 3469, FpCurrent: 0},
+	{FzName: ts + 3478, FpCurrent: 0},
+	{FzName: ts + 3484},
 }
 
 func robustFchown(tls *libc.TLS, fd int32, uid Uid_t, gid Gid_t) int32 {
@@ -15767,9 +15772,9 @@ func robust_open(tls *libc.TLS, z uintptr, f int32, m Mode_t) int32 {
 		}
 		(*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, fd)
 		Xsqlite3_log(tls, SQLITE_WARNING,
-			ts+3471, libc.VaList(bp, z, fd))
+			ts+3490, libc.VaList(bp, z, fd))
 		fd = -1
-		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3514, O_RDONLY, int32(m)) < 0 {
+		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3533, O_RDONLY, int32(m)) < 0 {
 			break
 		}
 	}
@@ -15848,13 +15853,13 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 	var zErr uintptr
 	var iErrno int32 = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 
-	zErr = ts + 1554
+	zErr = ts + 1573
 
 	if zPath == uintptr(0) {
-		zPath = ts + 1554
+		zPath = ts + 1573
 	}
 	Xsqlite3_log(tls, errcode,
-		ts+3524,
+		ts+3543,
 		libc.VaList(bp, iLine, iErrno, zFunc, zPath, zErr))
 
 	return errcode
@@ -15862,7 +15867,7 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 
 func robust_close(tls *libc.TLS, pFile uintptr, h int32, lineno int32) {
 	if (*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, h) != 0 {
-		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3266,
+		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3285,
 			func() uintptr {
 				if pFile != 0 {
 					return (*UnixFile)(unsafe.Pointer(pFile)).FzPath
@@ -15883,7 +15888,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, 38271)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38275)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -15985,19 +15990,19 @@ func verifyDbFile(tls *libc.TLS, pFile uintptr) {
 
 	rc = (*(*func(*libc.TLS, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 5*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, bp+32)
 	if rc != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3555, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3574, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink == uint64(0) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3579, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3598, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink > uint64(1) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3608, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3627, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if fileHasMoved(tls, pFile) != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3635, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3654, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 }
@@ -16360,7 +16365,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, 39055)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39059)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -16633,7 +16638,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	var ii int32
 	var fd int32 = -1
 
-	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3663, libc.VaList(bp, zFilename))
+	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3682, libc.VaList(bp, zFilename))
 	for ii = int32(libc.Xstrlen(tls, bp+8)); ii > 0 && int32(*(*int8)(unsafe.Pointer(bp + 8 + uintptr(ii)))) != '/'; ii-- {
 	}
 	if ii > 0 {
@@ -16651,7 +16656,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3378, bp+8, 40676)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40680), ts+3397, bp+8, 40680)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -16668,14 +16673,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, 40717)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3685, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40721)
 	}
 
 	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)), 40731)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40735)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -16695,7 +16700,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, 40762)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3316, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40766)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -16750,7 +16755,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 				if iWrite >= nSize {
 					iWrite = nSize - int64(1)
 				}
-				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1554, 1)
+				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1573, 1)
 				if nWrite != 1 {
 					return SQLITE_IOERR | int32(3)<<8
 				}
@@ -16763,7 +16768,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, 40883)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3316, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40887)
 			}
 		}
 
@@ -16831,7 +16836,7 @@ func unixFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 		}
 	case SQLITE_FCNTL_VFSNAME:
 		{
-			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
+			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
 			return SQLITE_OK
 
 		}
@@ -16990,7 +16995,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, 41442)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41446)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -17018,7 +17023,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, 41499)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3316, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41503)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -17081,7 +17086,7 @@ __4:
 	;
 	libc.Xmemset(tls, pShmNode, 0, uint64(unsafe.Sizeof(unixShmNode{}))+uint64(nShmFilename))
 	zShm = libc.AssignPtrUintptr(pShmNode+16, pShmNode+1*96)
-	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3677, libc.VaList(bp, zBasePath))
+	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3696, libc.VaList(bp, zBasePath))
 
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = -1
 	(*UnixInodeInfo)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pDbFd)).FpInode)).FpShmNode = pShmNode
@@ -17102,7 +17107,7 @@ __5:
 	if !(int32((*UnixInodeInfo)(unsafe.Pointer(pInode)).FbProcessLock) == 0) {
 		goto __7
 	}
-	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3684, 0)) {
+	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3703, 0)) {
 		goto __8
 	}
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = robust_open(tls, zShm, O_RDWR|O_CREAT|0400000,
@@ -17117,7 +17122,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3261, zShm, 41624)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41628), ts+3280, zShm, 41628)
 	goto shm_open_err
 __10:
 	;
@@ -17243,11 +17248,11 @@ __11:
 		goto __13
 	}
 	*(*int32)(unsafe.Pointer(bp + 144)) = 0
-	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1554, 1, bp+144) != 1) {
+	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1573, 1, bp+144) != 1) {
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41768)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3351, zFile, 41772)
 	goto shmpage_out
 __14:
 	;
@@ -17293,7 +17298,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3419, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3438, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41799)
 	goto shmpage_out
 __20:
 	;
@@ -17494,7 +17499,7 @@ func unixUnmapfile(tls *libc.TLS, pFd uintptr) {
 }
 
 func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
-	var zErr uintptr = ts + 3419
+	var zErr uintptr = ts + 3438
 	var h int32 = (*UnixFile)(unsafe.Pointer(pFd)).Fh
 	var pOrig uintptr = (*UnixFile)(unsafe.Pointer(pFd)).FpMapRegion
 	var nOrig I64 = (*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeActual
@@ -17510,7 +17515,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 		}
 
 		pNew = (*(*func(*libc.TLS, uintptr, Size_t, Size_t, int32, uintptr) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 24*24 + 8)))(tls, pOrig, uint64(nReuse), uint64(nNew), MREMAP_MAYMOVE, 0)
-		zErr = ts + 3431
+		zErr = ts + 3450
 
 		if pNew == libc.UintptrFromInt32(-1) || pNew == uintptr(0) {
 			(*(*func(*libc.TLS, uintptr, Size_t) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 23*24 + 8)))(tls, pOrig, uint64(nReuse))
@@ -17524,7 +17529,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, 42169)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42173)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -17639,10 +17644,10 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		}
 		return uintptr(0)
 	}(),
-		ts+3697, SQLITE_POWERSAFE_OVERWRITE) != 0 {
+		ts+3716, SQLITE_POWERSAFE_OVERWRITE) != 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_PSOW)
 	}
-	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3702) == 0 {
+	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3721) == 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_EXCL)
 	}
 
@@ -17658,7 +17663,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, 42672)
+			robust_close(tls, pNew, h, 42676)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -17671,7 +17676,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		if zLockFile == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
-			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3712, libc.VaList(bp, zFilename))
+			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3731, libc.VaList(bp, zFilename))
 		}
 		(*UnixFile)(unsafe.Pointer(pNew)).FlockingContext = zLockFile
 	}
@@ -17679,7 +17684,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, 42757)
+			robust_close(tls, pNew, h, 42761)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -17692,15 +17697,15 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 var azTempDirs = [6]uintptr{
 	uintptr(0),
 	uintptr(0),
-	ts + 3720,
-	ts + 3729,
-	ts + 3738,
-	ts + 1567,
+	ts + 3739,
+	ts + 3748,
+	ts + 3757,
+	ts + 1586,
 }
 
 func unixTempFileInit(tls *libc.TLS) {
-	azTempDirs[0] = libc.Xgetenv(tls, ts+3743)
-	azTempDirs[1] = libc.Xgetenv(tls, ts+3757)
+	azTempDirs[0] = libc.Xgetenv(tls, ts+3762)
+	azTempDirs[1] = libc.Xgetenv(tls, ts+3776)
 }
 
 func unixTempFileDir(tls *libc.TLS) uintptr {
@@ -17745,7 +17750,7 @@ func unixGetTempname(tls *libc.TLS, nBuf int32, zBuf uintptr) int32 {
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U64(0))), bp+24)
 
 			*(*int8)(unsafe.Pointer(zBuf + uintptr(nBuf-2))) = int8(0)
-			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3764,
+			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3783,
 				libc.VaList(bp, zDir, *(*U64)(unsafe.Pointer(bp + 24)), 0))
 			if int32(*(*int8)(unsafe.Pointer(zBuf + uintptr(nBuf-2)))) != 0 || libc.PostIncInt32(&iLimit, 1) > 10 {
 				rc = SQLITE_ERROR
@@ -17830,7 +17835,7 @@ func findCreateFileMode(tls *libc.TLS, zPath uintptr, flags int32, pMode uintptr
 	} else if flags&SQLITE_OPEN_DELETEONCLOSE != 0 {
 		*(*Mode_t)(unsafe.Pointer(pMode)) = Mode_t(0600)
 	} else if flags&SQLITE_OPEN_URI != 0 {
-		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3781)
+		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3800)
 		if z != 0 {
 			rc = getFileMode(tls, z, pMode, pUid, pGid)
 		}
@@ -17995,7 +18000,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3261, zName, 43198)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43202), ts+3280, zName, 43202)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -18086,7 +18091,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, 43337)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3390, zPath, 43341)
 		}
 		return rc
 	}
@@ -18094,9 +18099,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, 43347)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3807, zPath, 43351)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43353)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -18160,18 +18165,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, 43443), ts+3459, zIn, 43443)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43447), ts+3478, zIn, 43447)
 			}
 		} 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, 43449)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43453)
 				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, 43454), ts+3450, zIn, 43454)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43458), ts+3469, zIn, 43458)
 				return
 			}
 			*(*int8)(unsafe.Pointer(bp + 144 + uintptr(got))) = int8(0)
@@ -18211,14 +18216,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, 43512), ts+3279, zPath, 43512)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43516), ts+3298, zPath, 43516)
 		}
 		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, 43518)
+		return Xsqlite3CantopenError(tls, 43522)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+4104)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -18276,7 +18281,7 @@ func unixDlError(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBufOut uintptr) {
 	unixEnterMutex(tls)
 	zErr = libc.Xdlerror(tls)
 	if zErr != 0 {
-		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3663, libc.VaList(bp, zErr))
+		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3682, libc.VaList(bp, zErr))
 	}
 	unixLeaveMutex(tls)
 }
@@ -18308,7 +18313,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 	{
 		var fd int32
 		var got int32
-		fd = robust_open(tls, ts+3794, O_RDONLY, uint32(0))
+		fd = robust_open(tls, ts+3813, O_RDONLY, uint32(0))
 		if fd < 0 {
 			libc.Xtime(tls, bp)
 			libc.Xmemcpy(tls, zBuf, bp, uint64(unsafe.Sizeof(Time_t(0))))
@@ -18319,7 +18324,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, 43619)
+			robust_close(tls, uintptr(0), fd, 43623)
 		}
 
 	}
@@ -18396,10 +18401,10 @@ func Xsqlite3_os_init(tls *libc.TLS) int32 {
 }
 
 var aVfs = [4]Sqlite3_vfs{
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3807, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3812, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3822, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3702, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3826, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3831, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3841, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3721, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
 }
 
 // Shutdown the operating system interface.
@@ -18454,7 +18459,7 @@ var memdb_g MemFS
 var memdb_vfs = Sqlite3_vfs{
 	FiVersion:          2,
 	FmxPathname:        1024,
-	FzName:             ts + 3835,
+	FzName:             ts + 3854,
 	FxOpen:             0,
 	FxAccess:           0,
 	FxFullPathname:     0,
@@ -18710,7 +18715,7 @@ func memdbFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int3
 	var rc int32 = SQLITE_NOTFOUND
 	memdbEnter(tls, p)
 	if op == SQLITE_FCNTL_VFSNAME {
-		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3841, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
+		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3860, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
 		rc = SQLITE_OK
 	}
 	if op == SQLITE_FCNTL_SIZE_LIMIT {
@@ -18842,7 +18847,7 @@ func memdbFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, z
 	defer tls.Free(8)
 
 	_ = pVfs
-	Xsqlite3_snprintf(tls, nOut, zOut, ts+3663, libc.VaList(bp, zPath))
+	Xsqlite3_snprintf(tls, nOut, zOut, ts+3682, libc.VaList(bp, zPath))
 	return SQLITE_OK
 }
 
@@ -18963,7 +18968,7 @@ func Xsqlite3_serialize(tls *libc.TLS, db uintptr, zSchema uintptr, piSize uintp
 		return uintptr(0)
 	}
 	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
-	zSql = Xsqlite3_mprintf(tls, ts+3856, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3875, libc.VaList(bp, zSchema))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, db, zSql, -1, bp+8, uintptr(0))
 	} else {
@@ -19036,7 +19041,7 @@ __1:
 	goto end_deserialize
 __2:
 	;
-	zSql = Xsqlite3_mprintf(tls, ts+3879, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3898, libc.VaList(bp, zSchema))
 	if !(zSql == uintptr(0)) {
 		goto __3
 	}
@@ -19752,7 +19757,7 @@ func pcacheFetchFinishWithInit(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 	libc.Xmemset(tls, pPgHdr+32, 0, uint64(unsafe.Sizeof(PgHdr{}))-uint64(uintptr(0)+32))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpPage = pPage
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpData = (*Sqlite3_pcache_page)(unsafe.Pointer(pPage)).FpBuf
-	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*72
+	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*80
 	libc.Xmemset(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0, uint64(8))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpCache = pCache
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).Fpgno = pgno
@@ -19782,7 +19787,7 @@ func Xsqlite3PcacheFetchFinish(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 // reference count drops to 0, then it is made eligible for recycling.
 func Xsqlite3PcacheRelease(tls *libc.TLS, p uintptr) {
 	(*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FnRefSum--
-	if int32(libc.PreDecInt16(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1)) == 0 {
+	if libc.PreDecInt64(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1) == int64(0) {
 		if int32((*PgHdr)(unsafe.Pointer(p)).Fflags)&PGHDR_CLEAN != 0 {
 			pcacheUnpin(tls, p)
 		} else {
@@ -19833,7 +19838,7 @@ func Xsqlite3PcacheMakeClean(tls *libc.TLS, p uintptr) {
 	*(*U16)(unsafe.Pointer(p + 52)) &= libc.Uint16FromInt32(libc.CplInt32(PGHDR_DIRTY | PGHDR_NEED_SYNC | PGHDR_WRITEABLE))
 	*(*U16)(unsafe.Pointer(p + 52)) |= U16(PGHDR_CLEAN)
 
-	if int32((*PgHdr)(unsafe.Pointer(p)).FnRef) == 0 {
+	if (*PgHdr)(unsafe.Pointer(p)).FnRef == int64(0) {
 		pcacheUnpin(tls, p)
 	}
 }
@@ -19937,8 +19942,8 @@ func Xsqlite3PcacheClear(tls *libc.TLS, pCache uintptr) {
 }
 
 func pcacheMergeDirtyList(tls *libc.TLS, pA uintptr, pB uintptr) uintptr {
-	bp := tls.Alloc(72)
-	defer tls.Free(72)
+	bp := tls.Alloc(80)
+	defer tls.Free(80)
 
 	var pTail uintptr
 	pTail = bp
@@ -20016,13 +20021,13 @@ func Xsqlite3PcacheDirtyList(tls *libc.TLS, pCache uintptr) uintptr {
 //
 // This is not the total number of pages referenced, but the sum of the
 // reference count for all pages.
-func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) int32 {
+func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) I64 {
 	return (*PCache)(unsafe.Pointer(pCache)).FnRefSum
 }
 
 // Return the number of references to the page supplied as an argument.
-func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) int32 {
-	return int32((*PgHdr)(unsafe.Pointer(p)).FnRef)
+func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) I64 {
+	return (*PgHdr)(unsafe.Pointer(p)).FnRef
 }
 
 // Return the total number of pages in the cache.
@@ -22251,7 +22256,7 @@ __27:
 	if !(isHot != 0 && nPlayback != 0) {
 		goto __28
 	}
-	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3894,
+	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3913,
 		libc.VaList(bp, nPlayback, (*Pager)(unsafe.Pointer(pPager)).FzJournal))
 __28:
 	;
@@ -22316,7 +22321,7 @@ func pagerUndoCallback(tls *libc.TLS, pCtx uintptr, iPg Pgno) int32 {
 
 	pPg = Xsqlite3PagerLookup(tls, pPager, iPg)
 	if pPg != 0 {
-		if Xsqlite3PcachePageRefcount(tls, pPg) == 1 {
+		if Xsqlite3PcachePageRefcount(tls, pPg) == int64(1) {
 			Xsqlite3PcacheDrop(tls, pPg)
 		} else {
 			rc = readDbPage(tls, pPg)
@@ -22749,7 +22754,7 @@ func Xsqlite3PagerSetPagesize(tls *libc.TLS, pPager uintptr, pPageSize uintptr,
 	var pageSize U32 = *(*U32)(unsafe.Pointer(pPageSize))
 
 	if (int32((*Pager)(unsafe.Pointer(pPager)).FmemDb) == 0 || (*Pager)(unsafe.Pointer(pPager)).FdbSize == Pgno(0)) &&
-		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 &&
+		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) &&
 		pageSize != 0 && pageSize != U32((*Pager)(unsafe.Pointer(pPager)).FpageSize) {
 		var pNew uintptr = uintptr(0)
 		*(*I64)(unsafe.Pointer(bp)) = int64(0)
@@ -22901,9 +22906,9 @@ func pagerAcquireMapPage(tls *libc.TLS, pPager uintptr, pgno Pgno, pData uintptr
 			Xsqlite3OsUnfetch(tls, (*Pager)(unsafe.Pointer(pPager)).Ffd, I64(pgno-Pgno(1))*(*Pager)(unsafe.Pointer(pPager)).FpageSize, pData)
 			return SQLITE_NOMEM
 		}
-		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*72
+		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*80
 		(*PgHdr)(unsafe.Pointer(p)).Fflags = U16(PGHDR_MMAP)
-		(*PgHdr)(unsafe.Pointer(p)).FnRef = int16(1)
+		(*PgHdr)(unsafe.Pointer(p)).FnRef = int64(1)
 		(*PgHdr)(unsafe.Pointer(p)).FpPager = pPager
 	}
 
@@ -23235,7 +23240,7 @@ func Xsqlite3PagerFlush(tls *libc.TLS, pPager uintptr) int32 {
 
 		for rc == SQLITE_OK && pList != 0 {
 			var pNext uintptr = (*PgHdr)(unsafe.Pointer(pList)).FpDirty
-			if int32((*PgHdr)(unsafe.Pointer(pList)).FnRef) == 0 {
+			if (*PgHdr)(unsafe.Pointer(pList)).FnRef == int64(0) {
 				rc = pagerStress(tls, pPager, pList)
 			}
 			pList = pNext
@@ -23385,7 +23390,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 60235)
+	rc = Xsqlite3CantopenError(tls, 60239)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -23446,7 +23451,7 @@ __15:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzJournal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3921, uint64(8))
+	libc.Xmemcpy(tls, pPtr, ts+3940, uint64(8))
 	pPtr += uintptr(8 + 1)
 	goto __19
 __18:
@@ -23459,7 +23464,7 @@ __19:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzWal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3930, uint64(4))
+	libc.Xmemcpy(tls, pPtr, ts+3949, uint64(4))
 	pPtr += uintptr(4 + 1)
 	goto __21
 __20:
@@ -23511,9 +23516,9 @@ __27:
 	;
 __26:
 	;
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3935, 0))
+	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3954, 0))
 	if !(iDc&SQLITE_IOCAP_IMMUTABLE != 0 ||
-		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3942, 0) != 0) {
+		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3961, 0) != 0) {
 		goto __30
 	}
 	vfsFlags = vfsFlags | SQLITE_OPEN_READONLY
@@ -23766,7 +23771,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60754)
+	rc = Xsqlite3CantopenError(tls, 60758)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23872,7 +23877,7 @@ __24:
 }
 
 func pagerUnlockIfUnused(tls *libc.TLS, pPager uintptr) {
-	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 {
+	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) {
 		pagerUnlockAndRollback(tls, pPager)
 	}
 }
@@ -23890,7 +23895,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60967)
+	return Xsqlite3CorruptError(tls, 60971)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23929,7 +23934,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60999)
+	rc = Xsqlite3CorruptError(tls, 61003)
 	goto pager_acquire_err
 __7:
 	;
@@ -24006,7 +24011,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, 61078)
+		return Xsqlite3CorruptError(tls, 61082)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24764,7 +24769,7 @@ func Xsqlite3PagerMemUsed(tls *libc.TLS, pPager uintptr) int32 {
 
 // Return the number of references to the specified page.
 func Xsqlite3PagerPageRefcount(tls *libc.TLS, pPage uintptr) int32 {
-	return Xsqlite3PcachePageRefcount(tls, pPage)
+	return int32(Xsqlite3PcachePageRefcount(tls, pPage))
 }
 
 // Parameter eStat must be one of SQLITE_DBSTATUS_CACHE_HIT, _MISS, _WRITE,
@@ -25007,9 +25012,9 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	pPgOld = Xsqlite3PagerLookup(tls, pPager, pgno)
 
 	if pPgOld != 0 {
-		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
+		if (*PgHdr)(unsafe.Pointer(pPgOld)).FnRef > int64(1) {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62623)
+			return Xsqlite3CorruptError(tls, 62627)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -25194,7 +25199,7 @@ func Xsqlite3PagerClearCache(tls *libc.TLS, pPager uintptr) {
 func Xsqlite3PagerCheckpoint(tls *libc.TLS, pPager uintptr, db uintptr, eMode int32, pnLog uintptr, pnCkpt uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal == uintptr(0) && int32((*Pager)(unsafe.Pointer(pPager)).FjournalMode) == PAGER_JOURNALMODE_WAL {
-		Xsqlite3_exec(tls, db, ts+3952, uintptr(0), uintptr(0), uintptr(0))
+		Xsqlite3_exec(tls, db, ts+3971, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal != 0 {
 		rc = Xsqlite3WalCheckpoint(tls, (*Pager)(unsafe.Pointer(pPager)).FpWal, db, eMode,
@@ -25766,7 +25771,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, 64387)
+				return Xsqlite3CorruptError(tls, 64391)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25865,7 +25870,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64519)
+	rc = Xsqlite3CantopenError(tls, 64523)
 	goto finished
 __7:
 	;
@@ -26033,7 +26038,7 @@ __24:
 		goto __30
 	}
 	Xsqlite3_log(tls, SQLITE_NOTICE|int32(1)<<8,
-		ts+3970,
+		ts+3989,
 		libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 __30:
 	;
@@ -26451,7 +26456,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65333)
+	rc = Xsqlite3CorruptError(tls, 65337)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -26596,7 +26601,7 @@ func walLimitSize(tls *libc.TLS, pWal uintptr, nMax I64) {
 	}
 	Xsqlite3EndBenignMalloc(tls)
 	if rx != 0 {
-		Xsqlite3_log(tls, rx, ts+4007, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
+		Xsqlite3_log(tls, rx, ts+4026, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 	}
 }
 
@@ -26726,7 +26731,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, 65682)
+		rc = Xsqlite3CantopenError(tls, 65686)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -27199,7 +27204,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66419)
+				return Xsqlite3CorruptError(tls, 66423)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -27704,7 +27709,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, 67138)
+			rc = Xsqlite3CorruptError(tls, 67142)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -28097,7 +28102,7 @@ func Xsqlite3BtreeLeaveCursor(tls *libc.TLS, pCur uintptr) {
 	Xsqlite3BtreeLeave(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpBtree)
 }
 
-var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 4033))
+var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 4052))
 
 var sqlite3SharedCacheList uintptr = uintptr(0)
 
@@ -28362,7 +28367,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, 69249)
+			rc = Xsqlite3CorruptError(tls, 69253)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -28499,7 +28504,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69434)
 	return
 __2:
 	;
@@ -28516,7 +28521,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69447)
 	goto ptrmap_exit
 __4:
 	;
@@ -28524,7 +28529,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69452)
 	goto ptrmap_exit
 __5:
 	;
@@ -28567,7 +28572,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, 69493)
+		return Xsqlite3CorruptError(tls, 69497)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -28577,7 +28582,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, 69501)
+		return Xsqlite3CorruptError(tls, 69505)
 	}
 	return SQLITE_OK
 }
@@ -28827,7 +28832,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, 69893)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69897)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28874,7 +28879,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69951)
+	return Xsqlite3CorruptError(tls, 69955)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28884,7 +28889,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69954)
+	return Xsqlite3CorruptError(tls, 69958)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28897,7 +28902,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69962)
+	return Xsqlite3CorruptError(tls, 69966)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28906,14 +28911,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69965)
+	return Xsqlite3CorruptError(tls, 69969)
 __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, 69967)
+	return Xsqlite3CorruptError(tls, 69971)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -28923,7 +28928,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69971)
+	return Xsqlite3CorruptError(tls, 69975)
 __11:
 	;
 __8:
@@ -28987,7 +28992,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 70004)
+	return Xsqlite3CorruptError(tls, 70008)
 __22:
 	;
 	size = int32((*struct {
@@ -28997,7 +29002,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 70010)
+	return Xsqlite3CorruptError(tls, 70014)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -29019,7 +29024,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 70024)
+	return Xsqlite3CorruptError(tls, 70028)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -29054,7 +29059,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, 70081)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70085)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -29067,13 +29072,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, 70096)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70100)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70107)
 	}
 	return uintptr(0)
 }
@@ -29098,7 +29103,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, 70152)
+			return Xsqlite3CorruptError(tls, 70156)
 		}
 	}
 
@@ -29109,7 +29114,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, 70170)
+				return Xsqlite3CorruptError(tls, 70174)
 			} else {
 				return SQLITE_OK
 			}
@@ -29161,22 +29166,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 70249)
+				return Xsqlite3CorruptError(tls, 70253)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 70254)
+			return Xsqlite3CorruptError(tls, 70258)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 70266)
+				return Xsqlite3CorruptError(tls, 70270)
 			}
 			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, 70269)
+				return Xsqlite3CorruptError(tls, 70273)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -29186,7 +29191,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, 70282)
+					return Xsqlite3CorruptError(tls, 70286)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -29194,7 +29199,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, 70288)
+			return Xsqlite3CorruptError(tls, 70292)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -29202,10 +29207,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, 70297)
+			return Xsqlite3CorruptError(tls, 70301)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70298)
+			return Xsqlite3CorruptError(tls, 70302)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -29265,7 +29270,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70357)
+			return Xsqlite3CorruptError(tls, 70361)
 		}
 	} else {
 		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
@@ -29301,7 +29306,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70381)
+			return Xsqlite3CorruptError(tls, 70385)
 		}
 	}
 	return SQLITE_OK
@@ -29331,11 +29336,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70432)
+			return Xsqlite3CorruptError(tls, 70436)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70437)
+				return Xsqlite3CorruptError(tls, 70441)
 			}
 			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))))
@@ -29346,15 +29351,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70447)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70451)
+			return Xsqlite3CorruptError(tls, 70455)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70463)
+		return Xsqlite3CorruptError(tls, 70467)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -29382,14 +29387,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, 70494)
+			return Xsqlite3CorruptError(tls, 70498)
 		}
 		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, 70499)
+			return Xsqlite3CorruptError(tls, 70503)
 		}
 	}
 	return SQLITE_OK
@@ -29403,7 +29408,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, 70531)
+		return Xsqlite3CorruptError(tls, 70535)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -29415,7 +29420,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, 70545)
+		return Xsqlite3CorruptError(tls, 70549)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -29518,7 +29523,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70700)
+	rc = Xsqlite3CorruptError(tls, 70704)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -29546,7 +29551,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, 70721)
+	rc = Xsqlite3CorruptError(tls, 70725)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -29585,7 +29590,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, 70787)
+			return Xsqlite3CorruptError(tls, 70791)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -29658,7 +29663,7 @@ func Xsqlite3BtreeOpen(tls *libc.TLS, pVfs uintptr, zFilename uintptr, db uintpt
 	mutexOpen = uintptr(0)
 	rc = SQLITE_OK
 	isTempDb = libc.Bool32(zFilename == uintptr(0) || int32(*(*int8)(unsafe.Pointer(zFilename))) == 0)
-	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4049) == 0 ||
+	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4068) == 0 ||
 		isTempDb != 0 && Xsqlite3TempInMemory(tls, db) != 0 ||
 		vfsFlags&SQLITE_OPEN_MEMORY != 0)
 
@@ -30430,7 +30435,7 @@ __9:
 	;
 __10:
 	;
-	if !(libc.Xmemcmp(tls, page1+21, ts+4058, uint64(3)) != 0) {
+	if !(libc.Xmemcmp(tls, page1+21, ts+4077, uint64(3)) != 0) {
 		goto __14
 	}
 	goto page1_init_failed
@@ -30468,7 +30473,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71722)
+	rc = Xsqlite3CorruptError(tls, 71726)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30883,7 +30888,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, 72143)
+			return Xsqlite3CorruptError(tls, 72147)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30909,7 +30914,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, 72162)
+						return Xsqlite3CorruptError(tls, 72166)
 					}
 					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)
@@ -30918,7 +30923,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, 72171)
+					return Xsqlite3CorruptError(tls, 72175)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30929,7 +30934,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, 72183)
+				return Xsqlite3CorruptError(tls, 72187)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30945,7 +30950,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, 72218)
+		return Xsqlite3CorruptError(tls, 72222)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -31006,7 +31011,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, 72316)
+			return Xsqlite3CorruptError(tls, 72320)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -31041,7 +31046,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, 72368)
+					return Xsqlite3CorruptError(tls, 72372)
 				}
 			}
 
@@ -31101,7 +31106,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, 72436)
+			rc = Xsqlite3CorruptError(tls, 72440)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -31140,7 +31145,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, 72487)
+			return Xsqlite3CorruptError(tls, 72491)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -31171,7 +31176,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72514)
+			return Xsqlite3CorruptError(tls, 72518)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -31512,7 +31517,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, 72978)
+			return Xsqlite3CorruptError(tls, 72982)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -31756,14 +31761,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, 73385)
+		return Xsqlite3CorruptError(tls, 73389)
 	}
 
 	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, 73400)
+		return Xsqlite3CorruptError(tls, 73404)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -31808,7 +31813,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, 73462)
+				return Xsqlite3CorruptError(tls, 73466)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31857,7 +31862,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73547)
+		return Xsqlite3CorruptError(tls, 73551)
 	}
 	return rc
 }
@@ -31937,7 +31942,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, 73684)
+		return Xsqlite3CorruptError(tls, 73688)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -32028,7 +32033,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, 73823)
+	return Xsqlite3CorruptError(tls, 73827)
 __11:
 	;
 skip_init:
@@ -32048,7 +32053,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73835)
+	return Xsqlite3CorruptError(tls, 73839)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -32258,7 +32263,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 74077)
+	return Xsqlite3CorruptError(tls, 74081)
 __21:
 	;
 	goto __19
@@ -32462,7 +32467,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 74273)
+	return Xsqlite3CorruptError(tls, 74277)
 __4:
 	;
 	goto bypass_moveto_root
@@ -32527,7 +32532,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, 74360)
+	rc = Xsqlite3CorruptError(tls, 74364)
 	goto moveto_index_finish
 __17:
 	;
@@ -32575,7 +32580,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74392)
+	rc = Xsqlite3CorruptError(tls, 74396)
 __24:
 	;
 	goto moveto_index_finish
@@ -32694,7 +32699,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, 74508)
+		return Xsqlite3CorruptError(tls, 74512)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32854,7 +32859,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74688)
+	return Xsqlite3CorruptError(tls, 74692)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32919,7 +32924,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74744)
+	rc = Xsqlite3CorruptError(tls, 74748)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -32955,7 +32960,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74773)
+	rc = Xsqlite3CorruptError(tls, 74777)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -32999,7 +33004,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74807)
+	rc = Xsqlite3CorruptError(tls, 74811)
 	goto end_allocate_page
 __32:
 	;
@@ -33111,7 +33116,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74872)
+	rc = Xsqlite3CorruptError(tls, 74876)
 	goto end_allocate_page
 __51:
 	;
@@ -33269,7 +33274,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, 74999)
+	return Xsqlite3CorruptError(tls, 75003)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -33326,7 +33331,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75050)
 	goto freepage_out
 __10:
 	;
@@ -33342,7 +33347,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75061)
 	goto freepage_out
 __12:
 	;
@@ -33416,7 +33421,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, 75146)
+		return Xsqlite3CorruptError(tls, 75150)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -33428,7 +33433,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, 75163)
+			return Xsqlite3CorruptError(tls, 75167)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -33439,7 +33444,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, 75183)
+			rc = Xsqlite3CorruptError(tls, 75187)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -33604,7 +33609,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, 75436)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75440)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -33883,12 +33888,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, 75737)
+				return Xsqlite3CorruptError(tls, 75741)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75742)
+			return Xsqlite3CorruptError(tls, 75746)
 		}
 
 		pData -= uintptr(sz)
@@ -33896,7 +33901,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, 75748)
+			return Xsqlite3CorruptError(tls, 75752)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -33956,7 +33961,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, 75833)
+			Xsqlite3CorruptError(tls, 75837)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -34045,7 +34050,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75947)
+	return Xsqlite3CorruptError(tls, 75951)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -34161,7 +34166,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, 76060)
+		return Xsqlite3CorruptError(tls, 76064)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -34481,7 +34486,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, 76481)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76485)
 	goto balance_cleanup
 __25:
 	;
@@ -34492,7 +34497,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76509)
 	goto balance_cleanup
 __27:
 	;
@@ -34650,7 +34655,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76610)
 	goto balance_cleanup
 __55:
 	;
@@ -34724,7 +34729,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76643)
 	goto balance_cleanup
 __67:
 	;
@@ -34787,7 +34792,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76687)
 	goto balance_cleanup
 __75:
 	;
@@ -34815,7 +34820,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76720)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -35076,7 +35081,7 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76920)
 	goto balance_cleanup
 __121:
 	;
@@ -35268,7 +35273,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, 77146)
+			return Xsqlite3CorruptError(tls, 77150)
 		}
 	}
 	return SQLITE_OK
@@ -35306,7 +35311,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 77206)
+			rc = Xsqlite3CorruptError(tls, 77210)
 		} 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)))
@@ -35412,7 +35417,7 @@ func btreeOverwriteOverflowCell(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, 77370)
+			rc = Xsqlite3CorruptError(tls, 77374)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -35437,7 +35442,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 
 	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)
+		return Xsqlite3CorruptError(tls, 77402)
 	}
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
 		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
@@ -35507,7 +35512,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77479)
+	return Xsqlite3CorruptError(tls, 77483)
 __3:
 	;
 __1:
@@ -35620,7 +35625,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77606)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -35680,6 +35685,7 @@ __30:
 __25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
+	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
 		goto __31
 	}
@@ -35687,7 +35693,7 @@ __25:
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
 		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77640)
+	return Xsqlite3CorruptError(tls, 77645)
 __33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
@@ -35725,13 +35731,13 @@ __37:
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77667)
+	return Xsqlite3CorruptError(tls, 77672)
 __39:
 	;
 	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __40
 	}
-	return Xsqlite3CorruptError(tls, 77670)
+	return Xsqlite3CorruptError(tls, 77675)
 __40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
@@ -35762,7 +35768,6 @@ __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 __44
 	}
@@ -35837,7 +35842,7 @@ 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, 77773)
+		return Xsqlite3CorruptError(tls, 77777)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
@@ -35862,7 +35867,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, 77798)
+				return Xsqlite3CorruptError(tls, 77802)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35963,7 +35968,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77894)
+			return Xsqlite3CorruptError(tls, 77898)
 		}
 	}
 
@@ -35971,11 +35976,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, 77903)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 	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, 77907)
+		return Xsqlite3CorruptError(tls, 77911)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -36050,7 +36055,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, 77998)
+			return Xsqlite3CorruptError(tls, 78002)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -36119,7 +36124,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, 78114)
+			return Xsqlite3CorruptError(tls, 78118)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -36148,7 +36153,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, 78162)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78166)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -36224,7 +36229,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 78252)
+	return Xsqlite3CorruptError(tls, 78256)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -36238,7 +36243,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, 78259)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78263)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -36372,7 +36377,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, 78363)
+		return Xsqlite3CorruptError(tls, 78367)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -36589,7 +36594,7 @@ 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+64, ts+4062, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4081, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
 		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
@@ -36614,11 +36619,11 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 	defer tls.Free(16)
 
 	if iPage > (*IntegrityCk)(unsafe.Pointer(pCheck)).FnPage || iPage == Pgno(0) {
-		checkAppendMsg(tls, pCheck, ts+4064, libc.VaList(bp, iPage))
+		checkAppendMsg(tls, pCheck, ts+4083, libc.VaList(bp, iPage))
 		return 1
 	}
 	if getPageReferenced(tls, pCheck, iPage) != 0 {
-		checkAppendMsg(tls, pCheck, ts+4087, libc.VaList(bp+8, iPage))
+		checkAppendMsg(tls, pCheck, ts+4106, libc.VaList(bp+8, iPage))
 		return 1
 	}
 	setPageReferenced(tls, pCheck, iPage)
@@ -36636,13 +36641,13 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
 			checkOom(tls, pCheck)
 		}
-		checkAppendMsg(tls, pCheck, ts+4112, libc.VaList(bp, iChild))
+		checkAppendMsg(tls, pCheck, ts+4131, libc.VaList(bp, iChild))
 		return
 	}
 
 	if int32(*(*U8)(unsafe.Pointer(bp + 48))) != int32(eType) || *(*Pgno)(unsafe.Pointer(bp + 52)) != iParent {
 		checkAppendMsg(tls, pCheck,
-			ts+4141,
+			ts+4160,
 			libc.VaList(bp+8, iChild, int32(eType), iParent, int32(*(*U8)(unsafe.Pointer(bp + 48))), *(*Pgno)(unsafe.Pointer(bp + 52))))
 	}
 }
@@ -36661,7 +36666,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 		}
 		N--
 		if Xsqlite3PagerGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpPager, iPage, bp+40, 0) != 0 {
-			checkAppendMsg(tls, pCheck, ts+4195, libc.VaList(bp, iPage))
+			checkAppendMsg(tls, pCheck, ts+4214, libc.VaList(bp, iPage))
 			break
 		}
 		pOvflData = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
@@ -36672,7 +36677,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 			}
 			if n > (*BtShared)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt)).FusableSize/U32(4)-U32(2) {
 				checkAppendMsg(tls, pCheck,
-					ts+4217, libc.VaList(bp+8, iPage))
+					ts+4236, libc.VaList(bp+8, iPage))
 				N--
 			} else {
 				for i = 0; i < int32(n); i++ {
@@ -36695,12 +36700,12 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 	}
 	if N != 0 && nErrAtStart == (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr {
 		checkAppendMsg(tls, pCheck,
-			ts+4256,
+			ts+4275,
 			libc.VaList(bp+16, func() uintptr {
 				if isFreeList != 0 {
-					return ts + 4282
+					return ts + 4301
 				}
-				return ts + 4287
+				return ts + 4306
 			}(),
 				expected-N, expected))
 	}
@@ -36816,13 +36821,13 @@ __2:
 	return 0
 __3:
 	;
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4308
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4327
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
 		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4318, libc.VaList(bp, rc))
+		ts+4337, libc.VaList(bp, rc))
 	goto end_of_check
 __4:
 	;
@@ -36833,7 +36838,7 @@ __4:
 	}
 
 	checkAppendMsg(tls, pCheck,
-		ts+4356, libc.VaList(bp+8, rc))
+		ts+4375, libc.VaList(bp+8, rc))
 	goto end_of_check
 __5:
 	;
@@ -36841,14 +36846,14 @@ __5:
 		goto __6
 	}
 
-	checkAppendMsg(tls, pCheck, ts+4394, libc.VaList(bp+16, rc))
+	checkAppendMsg(tls, pCheck, ts+4413, libc.VaList(bp+16, rc))
 	goto end_of_check
 __6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
 
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4416
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4435
 	contentOffset = U32((int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5))))<<8|int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5) + 1)))-1)&0xffff + 1)
 
 	nCell = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3) + 1)))
@@ -36865,7 +36870,7 @@ __6:
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
 		goto __9
 	}
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4442
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4461
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
 __9:
 	;
@@ -36890,7 +36895,7 @@ __10:
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
 		goto __13
 	}
-	checkAppendMsg(tls, pCheck, ts+4470,
+	checkAppendMsg(tls, pCheck, ts+4489,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
 	goto __11
@@ -36903,7 +36908,7 @@ __13:
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
 		goto __14
 	}
-	checkAppendMsg(tls, pCheck, ts+4500, 0)
+	checkAppendMsg(tls, pCheck, ts+4519, 0)
 	doCoverageCheck = 0
 	goto __11
 __14:
@@ -36919,7 +36924,7 @@ __14:
 	}() != 0) {
 		goto __16
 	}
-	checkAppendMsg(tls, pCheck, ts+4524, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
+	checkAppendMsg(tls, pCheck, ts+4543, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
 __16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
@@ -36957,7 +36962,7 @@ __21:
 	if !(d2 != depth) {
 		goto __22
 	}
-	checkAppendMsg(tls, pCheck, ts+4548, 0)
+	checkAppendMsg(tls, pCheck, ts+4567, 0)
 	depth = d2
 __22:
 	;
@@ -37030,7 +37035,7 @@ __30:
 		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4573, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
+		ts+4592, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
 	goto __31
 	goto __33
 __32:
@@ -37047,7 +37052,7 @@ __31:
 		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4610,
+		ts+4629,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
 __34:
 	;
@@ -37161,7 +37166,7 @@ __6:
 	if !(bCkFreelist != 0) {
 		goto __7
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4662
+	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4681
 	checkList(tls, bp+32, 1, Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+32),
 		Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
@@ -37197,7 +37202,7 @@ __13:
 		goto __15
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4678,
+		ts+4697,
 		libc.VaList(bp, mx, mxInHdr))
 __15:
 	;
@@ -37207,7 +37212,7 @@ __9:
 		goto __16
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4723, 0)
+		ts+4742, 0)
 __16:
 	;
 __10:
@@ -37254,13 +37259,13 @@ __23:
 	if !(getPageReferenced(tls, bp+32, i) == 0 && (ptrmapPageno(tls, pBt, i) != i || !(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0))) {
 		goto __26
 	}
-	checkAppendMsg(tls, bp+32, ts+4778, libc.VaList(bp+16, i))
+	checkAppendMsg(tls, bp+32, ts+4797, libc.VaList(bp+16, i))
 __26:
 	;
 	if !(getPageReferenced(tls, bp+32, i) != 0 && (ptrmapPageno(tls, pBt, i) == i && (*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0)) {
 		goto __27
 	}
-	checkAppendMsg(tls, bp+32, ts+4800, libc.VaList(bp+24, i))
+	checkAppendMsg(tls, bp+32, ts+4819, libc.VaList(bp+24, i))
 __27:
 	;
 	goto __24
@@ -37523,7 +37528,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 		var rc int32 = 0
 		Xsqlite3ParseObjectInit(tls, bp+16, pDb)
 		if Xsqlite3OpenTempDatabase(tls, bp+16) != 0 {
-			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3663, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3682, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 			rc = SQLITE_ERROR
 		}
 		Xsqlite3DbFree(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
@@ -37534,7 +37539,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 	}
 
 	if i < 0 {
-		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4834, libc.VaList(bp+8, zDb))
+		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4853, libc.VaList(bp+8, zDb))
 		return uintptr(0)
 	}
 
@@ -37549,7 +37554,7 @@ func setDestPgsz(tls *libc.TLS, p uintptr) int32 {
 
 func checkReadTransaction(tls *libc.TLS, db uintptr, p uintptr) int32 {
 	if Xsqlite3BtreeTxnState(tls, p) != SQLITE_TXN_NONE {
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4854, 0)
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4873, 0)
 		return SQLITE_ERROR
 	}
 	return SQLITE_OK
@@ -37569,7 +37574,7 @@ func Xsqlite3_backup_init(tls *libc.TLS, pDestDb uintptr, zDestDb uintptr, pSrcD
 
 	if pSrcDb == pDestDb {
 		Xsqlite3ErrorWithMsg(tls,
-			pDestDb, SQLITE_ERROR, ts+4885, 0)
+			pDestDb, SQLITE_ERROR, ts+4904, 0)
 		p = uintptr(0)
 	} else {
 		p = Xsqlite3MallocZero(tls, uint64(unsafe.Sizeof(Sqlite3_backup{})))
@@ -38018,7 +38023,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 		(*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,
+		Xsqlite3_str_appendf(tls, bp+16, ts+4944,
 			libc.VaList(bp, func() float64 {
 				if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_IntReal != 0 {
 					return float64(*(*I64)(unsafe.Pointer(p)))
@@ -38610,7 +38615,7 @@ func Xsqlite3VdbeMemSetPointer(tls *libc.TLS, pMem uintptr, pPtr uintptr, zPType
 		if zPType != 0 {
 			return zPType
 		}
-		return ts + 1554
+		return ts + 1573
 	}()
 	(*Mem)(unsafe.Pointer(pMem)).Fz = pPtr
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null | MEM_Dyn | MEM_Subtype | MEM_Term)
@@ -38842,7 +38847,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, 81630)
+		return Xsqlite3CorruptError(tls, 81634)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -39074,7 +39079,7 @@ __9:
 		goto __10
 	}
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 8)).FisError
-	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3663, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
+	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3682, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
 	goto __11
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
@@ -39127,7 +39132,7 @@ func valueFromExpr(tls *libc.TLS, db uintptr, pExpr uintptr, enc U8, affinity U8
 	zVal = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	negInt = 1
-	zNeg = ts + 1554
+	zNeg = ts + 1573
 	rc = SQLITE_OK
 
 __1:
@@ -39168,7 +39173,7 @@ __4:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
 	negInt = -1
-	zNeg = ts + 4932
+	zNeg = ts + 4951
 __6:
 	;
 	if !(op == TK_STRING || op == TK_FLOAT || op == TK_INTEGER) {
@@ -39187,7 +39192,7 @@ __9:
 	Xsqlite3VdbeMemSetInt64(tls, *(*uintptr)(unsafe.Pointer(bp + 16)), I64(*(*int32)(unsafe.Pointer(pExpr + 8)))*I64(negInt))
 	goto __11
 __10:
-	zVal = Xsqlite3MPrintf(tls, db, ts+4934, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+	zVal = Xsqlite3MPrintf(tls, db, ts+4953, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	if !(zVal == uintptr(0)) {
 		goto __12
 	}
@@ -39491,7 +39496,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, 82270)
+		return Xsqlite3CorruptError(tls, 82274)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -39506,14 +39511,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 82276)
+			return Xsqlite3CorruptError(tls, 82280)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 82282)
+		return Xsqlite3CorruptError(tls, 82286)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -40521,34 +40526,34 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var j int32
 			var pKeyInfo uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4939, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4958, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
 			for j = 0; j < int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField); j++ {
 				var pColl uintptr = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(j)*8))
 				var zColl uintptr
 				if pColl != 0 {
 					zColl = (*CollSeq)(unsafe.Pointer(pColl)).FzName
 				} else {
-					zColl = ts + 1554
+					zColl = ts + 1573
 				}
-				if libc.Xstrcmp(tls, zColl, ts+1099) == 0 {
-					zColl = ts + 4944
+				if libc.Xstrcmp(tls, zColl, ts+1118) == 0 {
+					zColl = ts + 4963
 				}
-				Xsqlite3_str_appendf(tls, bp+144, ts+4946,
+				Xsqlite3_str_appendf(tls, bp+144, ts+4965,
 					libc.VaList(bp+8, func() uintptr {
 						if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_DESC != 0 {
-							return ts + 4932
+							return ts + 4951
 						}
-						return ts + 1554
+						return ts + 1573
 					}(),
 						func() uintptr {
 							if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_BIGNULL != 0 {
-								return ts + 4954
+								return ts + 4973
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						zColl))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4957, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+4976, 1)
 			break
 
 		}
@@ -40556,7 +40561,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 		{
 			var pColl uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4959, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
+			Xsqlite3_str_appendf(tls, bp+144, ts+4978, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
 				encnames[(*CollSeq)(unsafe.Pointer(pColl)).Fenc]))
 			break
 
@@ -40564,32 +40569,32 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -7:
 		{
 			var pDef uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
-			Xsqlite3_str_appendf(tls, bp+144, ts+4968, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4987, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -15:
 		{
 			var pDef uintptr = (*Sqlite3_context)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpFunc
-			Xsqlite3_str_appendf(tls, bp+144, ts+4968, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4987, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -13:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1334, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1353, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
 	case -3:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+4975, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4994, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
 			break
 
 		}
 	case -12:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1328, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1347, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
@@ -40599,13 +40604,13 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Str != 0 {
 				zP4 = (*Mem)(unsafe.Pointer(pMem)).Fz
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1334, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1353, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1328, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1347, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Null != 0 {
-				zP4 = ts + 1555
+				zP4 = ts + 1574
 			} else {
-				zP4 = ts + 4978
+				zP4 = ts + 4997
 			}
 			break
 
@@ -40613,7 +40618,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -11:
 		{
 			var pVtab uintptr = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-			Xsqlite3_str_appendf(tls, bp+144, ts+4985, libc.VaList(bp+120, pVtab))
+			Xsqlite3_str_appendf(tls, bp+144, ts+5004, libc.VaList(bp+120, pVtab))
 			break
 
 		}
@@ -40624,20 +40629,20 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var n U32 = *(*U32)(unsafe.Pointer(ai))
 
 			for i = U32(1); i <= n; i++ {
-				Xsqlite3_str_appendf(tls, bp+144, ts+4993, libc.VaList(bp+128, func() int32 {
+				Xsqlite3_str_appendf(tls, bp+144, ts+5012, libc.VaList(bp+128, func() int32 {
 					if i == U32(1) {
 						return '['
 					}
 					return ','
 				}(), *(*U32)(unsafe.Pointer(ai + uintptr(i)*4))))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4998, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+5017, 1)
 			break
 
 		}
 	case -4:
 		{
-			zP4 = ts + 5000
+			zP4 = ts + 5019
 			break
 
 		}
@@ -40662,7 +40667,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	return Xsqlite3StrAccumFinish(tls, bp+144)
 }
 
-var encnames = [4]uintptr{ts + 5008, ts + 5010, ts + 5012, ts + 5017}
+var encnames = [4]uintptr{ts + 5027, ts + 5029, ts + 5031, ts + 5036}
 
 // Declare to the Vdbe that the BTree object at db->aDb[i] is used.
 //
@@ -41112,8 +41117,8 @@ func Xsqlite3VdbeMakeReady(tls *libc.TLS, p uintptr, pParse uintptr) {
 }
 
 var azColName = [12]uintptr{
-	ts + 5022, ts + 5027, ts + 5034, ts + 5037, ts + 5040, ts + 5043, ts + 5046, ts + 5049,
-	ts + 5057, ts + 5060, ts + 5067, ts + 5075,
+	ts + 5041, ts + 5046, ts + 5053, ts + 5056, ts + 5059, ts + 5062, ts + 5065, ts + 5068,
+	ts + 5076, ts + 5079, ts + 5086, ts + 5094,
 }
 
 // Close a VDBE cursor and release all the resources that cursor
@@ -41322,7 +41327,7 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		var nMainFile int32
 
 		nMainFile = Xsqlite3Strlen30(tls, zMainFile)
-		zSuper = Xsqlite3MPrintf(tls, db, ts+5082, libc.VaList(bp, 0, zMainFile, 0))
+		zSuper = Xsqlite3MPrintf(tls, db, ts+5101, libc.VaList(bp, 0, zMainFile, 0))
 		if zSuper == uintptr(0) {
 			return SQLITE_NOMEM
 		}
@@ -41330,16 +41335,16 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		for __ccgo := true; __ccgo; __ccgo = rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 60)) != 0 {
 			if retryCount != 0 {
 				if retryCount > 100 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5094, libc.VaList(bp+24, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5113, libc.VaList(bp+24, zSuper))
 					Xsqlite3OsDelete(tls, pVfs, zSuper, 0)
 					break
 				} else if retryCount == 1 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5108, libc.VaList(bp+32, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5127, libc.VaList(bp+32, zSuper))
 				}
 			}
 			retryCount++
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
-			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5123,
+			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5142,
 				libc.VaList(bp+40, *(*U32)(unsafe.Pointer(bp + 56))>>8&U32(0xffffff), *(*U32)(unsafe.Pointer(bp + 56))&U32(0xff)))
 
 			rc = Xsqlite3OsAccess(tls, pVfs, zSuper, SQLITE_ACCESS_EXISTS, bp+60)
@@ -41485,7 +41490,7 @@ func Xsqlite3VdbeCheckFk(tls *libc.TLS, p uintptr, deferred int32) int32 {
 		!(deferred != 0) && (*Vdbe)(unsafe.Pointer(p)).FnFkConstraint > int64(0) {
 		(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_CONSTRAINT | int32(3)<<8
 		(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
-		Xsqlite3VdbeError(tls, p, ts+5136, 0)
+		Xsqlite3VdbeError(tls, p, ts+5155, 0)
 		if int32((*Vdbe)(unsafe.Pointer(p)).FprepFlags)&SQLITE_PREPARE_SAVESQL == 0 {
 			return SQLITE_ERROR
 		}
@@ -41817,7 +41822,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 86058)
+		return Xsqlite3CorruptError(tls, 86062)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -42368,7 +42373,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86989))
 		return 0
 	}
 
@@ -42433,7 +42438,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, 87062))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87066))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -42467,7 +42472,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, 87092))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87096))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -42517,7 +42522,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, 87136))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87140))
 			return 0
 		}
 	}
@@ -42663,7 +42668,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87303))
 	return 0
 __7:
 	;
@@ -42834,7 +42839,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87457)
+	return Xsqlite3CorruptError(tls, 87461)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42860,7 +42865,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, 87490)
+		return Xsqlite3CorruptError(tls, 87494)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -42971,13 +42976,13 @@ func Xsqlite3NotPureFunc(tls *libc.TLS, pCtx uintptr) int32 {
 		var zContext uintptr
 		var zMsg uintptr
 		if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_IsCheck != 0 {
-			zContext = ts + 5166
-		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5185
-		} else {
+		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5204
+		} else {
+			zContext = ts + 5223
 		}
-		zMsg = Xsqlite3_mprintf(tls, ts+5213,
+		zMsg = Xsqlite3_mprintf(tls, ts+5232,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx)).FpFunc)).FzName, zContext))
 		Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 		Xsqlite3_free(tls, zMsg)
@@ -43082,7 +43087,7 @@ func Xsqlite3_expired(tls *libc.TLS, pStmt uintptr) int32 {
 
 func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 	if (*Vdbe)(unsafe.Pointer(p)).Fdb == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5249, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5268, 0)
 		return 1
 	} else {
 		return 0
@@ -43092,7 +43097,7 @@ func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 
 func vdbeSafetyNotNull(tls *libc.TLS, p uintptr) int32 {
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5294, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5313, 0)
 		return 1
 	} else {
 		return vdbeSafety(tls, p)
@@ -43134,7 +43139,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, 87854)
+			return Xsqlite3MisuseError(tls, 87858)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -43557,7 +43562,7 @@ func Xsqlite3_result_error_code(tls *libc.TLS, pCtx uintptr, errCode int32) {
 // Force an SQLITE_TOOBIG error.
 func Xsqlite3_result_error_toobig(tls *libc.TLS, pCtx uintptr) {
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FisError = SQLITE_TOOBIG
-	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5334, int64(-1),
+	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5353, int64(-1),
 		uint8(SQLITE_UTF8), uintptr(0))
 }
 
@@ -43749,7 +43754,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88544)
+		return Xsqlite3MisuseError(tls, 88548)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -44269,15 +44274,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 89208)
+		return Xsqlite3MisuseError(tls, 89212)
 	}
 	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+5357, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 89216)
+			ts+5376, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89220)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -44682,7 +44687,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, 89707)
+	rc = Xsqlite3MisuseError(tls, 89711)
 	goto preupdate_old_out
 __1:
 	;
@@ -44826,7 +44831,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, 89809)
+	rc = Xsqlite3MisuseError(tls, 89813)
 	goto preupdate_new_out
 __1:
 	;
@@ -44998,7 +45003,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+5397, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5416, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -45034,11 +45039,11 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 
 			pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr(*(*int32)(unsafe.Pointer(bp + 84))-1)*56
 			if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Null != 0 {
-				Xsqlite3_str_append(tls, bp+48, ts+1555, 4)
+				Xsqlite3_str_append(tls, bp+48, ts+1574, 4)
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+1334, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+1353, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+4925, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+4944, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Str != 0 {
 				var nOut int32
 				var enc U8 = (*Sqlite3)(unsafe.Pointer(db)).Fenc
@@ -45053,21 +45058,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+5401, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5420, 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+5408, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5427, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5421, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5440, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					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_appendf(tls, bp+48, ts+5443, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5429, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5448, 1)
 			}
 		}
 	}
@@ -45270,10 +45275,6 @@ func filterHash(tls *libc.TLS, aMem uintptr, pOp uintptr) U64 {
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Real != 0 {
 			h = h + U64(Xsqlite3VdbeIntValue(tls, p))
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&(MEM_Str|MEM_Blob) != 0 {
-			h = h + U64((*Mem)(unsafe.Pointer(p)).Fn)
-			if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Zero != 0 {
-				h = h + U64(*(*int32)(unsafe.Pointer(p)))
-			}
 		}
 	}
 	return h
@@ -45284,11 +45285,11 @@ func vdbeMemTypeName(tls *libc.TLS, pMem uintptr) uintptr {
 }
 
 var azTypes = [5]uintptr{
-	ts + 1115,
-	ts + 1127,
-	ts + 1132,
-	ts + 1110,
-	ts + 1555,
+	ts + 1134,
+	ts + 1146,
+	ts + 1151,
+	ts + 1129,
+	ts + 1574,
 }
 
 // Execute as much of a VDBE program as we can.
@@ -46330,20 +46331,20 @@ __202:
 		goto __205
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5431, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	Xsqlite3VdbeError(tls, p, ts+5450, 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))))
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5471, 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))))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	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))
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5478, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 __204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
@@ -47921,7 +47922,7 @@ op_column_corrupt:
 	goto __9
 	goto __425
 __424:
-	rc = Xsqlite3CorruptError(tls, 93317)
+	rc = Xsqlite3CorruptError(tls, 93320)
 	goto abort_due_to_error
 __425:
 	;
@@ -48049,7 +48050,7 @@ __428:
 	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5483,
+	Xsqlite3VdbeError(tls, p, ts+5502,
 		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
@@ -48481,7 +48482,7 @@ __78:
 		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5524, 0)
+	Xsqlite3VdbeError(tls, p, ts+5543, 0)
 	rc = SQLITE_BUSY
 	goto __523
 __522:
@@ -48541,7 +48542,7 @@ __530:
 	if !!(pSavepoint != 0) {
 		goto __531
 	}
-	Xsqlite3VdbeError(tls, p, ts+5575, libc.VaList(bp+88, zName))
+	Xsqlite3VdbeError(tls, p, ts+5594, libc.VaList(bp+88, zName))
 	rc = SQLITE_ERROR
 	goto __532
 __531:
@@ -48550,7 +48551,7 @@ __531:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5597, 0)
+		ts+5616, 0)
 	rc = SQLITE_BUSY
 	goto __534
 __533:
@@ -48736,7 +48737,7 @@ __564:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5651, 0)
+		ts+5670, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
 	goto __567
@@ -48779,13 +48780,13 @@ __562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5706
+				return ts + 5725
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5754
+					return ts + 5773
 				}
-				return ts + 5797
+				return ts + 5816
 			}()
 		}(), 0)
 
@@ -48868,7 +48869,7 @@ __576:
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5838)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5857)
 
 	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 __583
@@ -49072,7 +49073,7 @@ __88:
 	}
 
 	(*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
+	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1573
 __602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -49681,7 +49682,7 @@ notExistsWithKey:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
 		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95560)
+	rc = Xsqlite3CorruptError(tls, 95563)
 	goto __683
 __682:
 	goto jump_to_p2
@@ -50459,7 +50460,7 @@ __767:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
 		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5866)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96638, ts+5885)
 	goto abort_due_to_error
 __770:
 	;
@@ -50569,7 +50570,7 @@ __780:
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
 		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96840)
+	rc = Xsqlite3CorruptError(tls, 96843)
 	goto abort_due_to_error
 __781:
 	;
@@ -50730,14 +50731,14 @@ __141:
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	goto __799
 __798:
-	zSchema = ts + 5883
+	zSchema = ts + 5902
 	(*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+5897,
+		ts+5916,
 		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 __800
@@ -50763,7 +50764,7 @@ __802:
 		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 97092)
+	rc = Xsqlite3CorruptError(tls, 97095)
 __803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
@@ -50953,7 +50954,7 @@ __820:
 		goto __825
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5940, 0)
+	Xsqlite3VdbeError(tls, p, ts+5959, 0)
 	goto abort_due_to_error
 __825:
 	;
@@ -51265,7 +51266,7 @@ __860:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
 		goto __862
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
 __862:
 	;
@@ -51315,7 +51316,7 @@ __867:
 	if !(rc != 0) {
 		goto __868
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
 __868:
 	;
@@ -51397,12 +51398,12 @@ __876:
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5977,
+		ts+5996,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6029
+				return ts + 6048
 			}
-			return ts + 6034
+			return ts + 6053
 		}()))
 	goto abort_due_to_error
 	goto __879
@@ -51544,7 +51545,7 @@ __171:
 		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6041, libc.VaList(bp+144, z1))
+	Xsqlite3VdbeError(tls, p, ts+6060, libc.VaList(bp+144, z1))
 __894:
 	;
 	goto abort_due_to_error
@@ -51662,7 +51663,7 @@ __904:
 	(*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+6070, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6089, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
 	goto __9
 
 __177:
@@ -51751,7 +51752,7 @@ __912:
 	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)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
 __913:
 	;
@@ -51981,7 +51982,7 @@ __935:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
 		goto __940
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
 __940:
 	;
@@ -52057,7 +52058,7 @@ __945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
 		goto __947
 	}
-	z3 = Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp+168, zTrace))
+	z3 = Xsqlite3MPrintf(tls, db, ts+6099, 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)
@@ -52130,7 +52131,7 @@ __955:
 	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __957
 	}
-	rc = Xsqlite3CorruptError(tls, 99031)
+	rc = Xsqlite3CorruptError(tls, 99034)
 __957:
 	;
 __956:
@@ -52138,13 +52139,13 @@ __956:
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
 		goto __958
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
 __958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
 
-	Xsqlite3_log(tls, rc, ts+6086,
+	Xsqlite3_log(tls, rc, ts+6105,
 		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 __959
@@ -52200,13 +52201,13 @@ __966:
 	return rc
 
 too_big:
-	Xsqlite3VdbeError(tls, p, ts+5334, 0)
+	Xsqlite3VdbeError(tls, p, ts+5353, 0)
 	rc = SQLITE_TOOBIG
 	goto abort_due_to_error
 
 no_mem:
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3VdbeError(tls, p, ts+1490, 0)
+	Xsqlite3VdbeError(tls, p, ts+1509, 0)
 	rc = SQLITE_NOMEM
 	goto abort_due_to_error
 
@@ -52217,8 +52218,8 @@ abort_due_to_interrupt:
 	return int32(0)
 }
 
-var azType = [4]uintptr{ts + 6118, ts + 6127, ts + 6134,
-	ts + 6140}
+var azType = [4]uintptr{ts + 6137, ts + 6146, ts + 6153,
+	ts + 6159}
 var and_logic = [9]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(1), uint8(2), uint8(0), uint8(2), uint8(2)}
 var or_logic = [9]uint8{uint8(0), uint8(1), uint8(2), uint8(1), uint8(1), uint8(1), uint8(2), uint8(1), uint8(2)}
 var aMask = [12]uint8{
@@ -52273,16 +52274,16 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		}
 
 		if type1 < U32(12) {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6152,
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6171,
 				libc.VaList(bp, func() uintptr {
 					if type1 == U32(0) {
-						return ts + 6181
+						return ts + 6200
 					}
 					return func() uintptr {
 						if type1 == U32(7) {
-							return ts + 6186
+							return ts + 6205
 						}
-						return ts + 6191
+						return ts + 6210
 					}()
 				}()))
 			rc = SQLITE_ERROR
@@ -52302,10 +52303,10 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		rc = Xsqlite3_finalize(tls, (*Incrblob)(unsafe.Pointer(p)).FpStmt)
 		(*Incrblob)(unsafe.Pointer(p)).FpStmt = uintptr(0)
 		if rc == SQLITE_OK {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6199, libc.VaList(bp+8, iRow))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6218, libc.VaList(bp+8, iRow))
 			rc = SQLITE_ERROR
 		} else {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3663, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3682, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
 		}
 	}
 
@@ -52365,21 +52366,21 @@ __3:
 		goto __4
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6219, libc.VaList(bp, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6238, libc.VaList(bp, zTable))
 __4:
 	;
 	if !(pTab != 0 && !((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0))) {
 		goto __5
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6249, libc.VaList(bp+8, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6268, libc.VaList(bp+8, zTable))
 __5:
 	;
 	if !(pTab != 0 && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __6
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6285, libc.VaList(bp+16, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6304, libc.VaList(bp+16, zTable))
 __6:
 	;
 	if !!(pTab != 0) {
@@ -52423,7 +52424,7 @@ __11:
 		goto __13
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6325, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52450,7 +52451,7 @@ __19:
 	if !((*sColMap)(unsafe.Pointer(pFKey+64+uintptr(j)*16)).FiFrom == iCol) {
 		goto __22
 	}
-	zFault = ts + 6327
+	zFault = ts + 6346
 __22:
 	;
 	goto __20
@@ -52483,7 +52484,7 @@ __26:
 	if !(int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == iCol || int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == -2) {
 		goto __29
 	}
-	zFault = ts + 6339
+	zFault = ts + 6358
 __29:
 	;
 	goto __27
@@ -52504,7 +52505,7 @@ __25:
 		goto __30
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6366, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52602,7 +52603,7 @@ __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
@@ -52650,7 +52651,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99516)
+		return Xsqlite3MisuseError(tls, 99519)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52733,7 +52734,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99616)
+		return Xsqlite3MisuseError(tls, 99619)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52746,7 +52747,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 				if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-					return ts + 3663
+					return ts + 3682
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
@@ -55275,25 +55276,25 @@ 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 {
+	if Xsqlite3_strnicmp(tls, zTab, ts+6400, 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 {
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6408+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
 			return 1
 		}
 		if pSchema == uintptr(0) {
 			return 0
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5883+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5902+7) == 0 {
 			return 1
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6446+7) == 0 {
 			return 1
 		}
 	} else {
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6446+7) == 0 {
 			return 1
 		}
 	}
@@ -55373,7 +55374,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6441, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6460, zDb) == 0) {
 		goto __8
 	}
 
@@ -55494,7 +55495,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6446) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6465) != 0) {
 		goto __33
 	}
 	goto __14
@@ -55668,14 +55669,14 @@ __60:
 	;
 	goto __59
 __58:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6448, zTab) == 0) {
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6467, zTab) == 0) {
 		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
 	goto __62
 __61:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6452, zTab) == 0) {
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6471, zTab) == 0) {
 		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
@@ -55692,7 +55693,7 @@ __57:
 		goto __64
 	}
 	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6456, zTab) == 0) {
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6475, zTab) == 0) {
 		goto __65
 	}
 	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
@@ -55851,7 +55852,7 @@ __86:
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
 		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6465, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6484, libc.VaList(bp, zAs))
 	return WRC_Abort
 __90:
 	;
@@ -55859,14 +55860,14 @@ __90:
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
 		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6496, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6515, libc.VaList(bp+8, zAs))
 	return WRC_Abort
 __91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
 		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	return WRC_Abort
 __92:
 	;
@@ -55918,7 +55919,7 @@ __11:
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6551, libc.VaList(bp+16, zCol))
+		ts+6570, 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
@@ -55955,7 +55956,7 @@ __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 + 6586
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6605
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
@@ -55968,23 +55969,23 @@ __101:
 __99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6595
+		zErr = ts + 6614
 	} else {
-		zErr = ts + 6610
+		zErr = ts + 6629
 	}
 	if !(zDb != 0) {
 		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6632, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6651, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
 	goto __105
 __104:
 	if !(zTab != 0) {
 		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp+56, zErr, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6664, libc.VaList(bp+56, zErr, zTab, zCol))
 	goto __107
 __106:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+80, zErr, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6674, libc.VaList(bp+80, zErr, zCol))
 __107:
 	;
 __105:
@@ -56087,15 +56088,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 + 6662
+	var zIn uintptr = ts + 6681
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6690
+		zIn = ts + 6709
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6708
+		zIn = ts + 6727
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6726
+		zIn = ts + 6745
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6744, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6763, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -56173,14 +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 + 6764
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
-				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
-				}
-				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
+				*(*int32)(unsafe.Pointer(pExpr + 8)) = libc.Bool32(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL)
+				*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IntValue)
+				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_INTEGER)
+
 				i = 0
 				p = pNC
 			__4:
@@ -56224,7 +56221,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+6775, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6783, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -56288,7 +56285,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+6792, libc.VaList(bp, pExpr))
+								ts+6800, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -56304,7 +56301,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+6856,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6864,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -56318,7 +56315,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+6892, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6900, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -56341,30 +56338,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+6920, libc.VaList(bp+16, pExpr))
+						ts+6928, 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 + 6963
+						zType = ts + 6971
 					} else {
-						zType = ts + 6970
+						zType = ts + 6978
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6980, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6988, 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+7008, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7016, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7030,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7038,
 						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+7074,
+						ts+7082,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -56436,15 +56433,15 @@ 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+7122, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7130, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
 
 				if nRef != (*NameContext)(unsafe.Pointer(pNC)).FnRef {
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_VarSelect)
-					*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_VarSelect
 				}
+				*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_Subquery
 			}
 			break
 
@@ -56452,7 +56449,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+7133, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7141, pExpr, pExpr)
 			}
 
 			break
@@ -56508,7 +56505,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+6533, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -56583,7 +56580,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7144, libc.VaList(bp, i, zType, mx))
+		ts+7152, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -56603,7 +56600,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+7200, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7208, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -56638,7 +56635,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+7234, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7242, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -56695,7 +56692,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+7240, libc.VaList(bp, i+1))
+				ts+7248, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -56723,7 +56720,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+7301, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7309, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -56937,7 +56934,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+7332, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7340, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -56977,7 +56974,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+7234) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7242) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -56988,7 +56985,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7371) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7379) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -57000,7 +56997,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+7377, 0)
+						ts+7385, 0)
 					return WRC_Abort
 				}
 
@@ -57789,7 +57786,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 		return
 	}
 
@@ -57864,7 +57861,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+7436, libc.VaList(bp, mxHeight))
+			ts+7444, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -58113,12 +58110,12 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7484,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7492,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7528
+						return ts + 7536
 					}
-					return ts + 1554
+					return ts + 1573
 				}(), nElem))
 			break
 		}
@@ -58157,7 +58154,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+7530)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -58183,7 +58180,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+7532, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7540, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -58211,7 +58208,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+7566, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7574, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -58258,7 +58255,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+7586,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7594,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -58283,7 +58280,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+7629, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7637, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -58858,7 +58855,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+7652,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7660,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -58981,7 +58978,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+7682, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7690, libc.VaList(bp, zObject))
 	}
 }
 
@@ -59037,10 +59034,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+6764) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7713) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6769) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7718) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -59470,13 +59467,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+7705) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7724) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7713) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7732) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7719) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7738) == 0 {
 		return 1
 	}
 	return 0
@@ -59680,7 +59677,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+7723, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7742, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -59758,7 +59755,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+7770, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7789, 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)
 
@@ -59852,7 +59849,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 + 7801
+		var zFmt uintptr = ts + 7820
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -59870,7 +59867,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+6533, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	}
 }
 
@@ -59911,7 +59908,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+7845, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7864, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -59941,11 +59938,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+7868, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7887, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
-				return ts + 1554
+				return ts + 1573
 			}
-			return ts + 7887
+			return ts + 7906
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -60072,7 +60069,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+7899, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7918, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -60087,11 +60084,11 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7917, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7936, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
-			return ts + 1554
+			return ts + 1573
 		}
-		return ts + 7887
+		return ts + 7906
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
@@ -60114,7 +60111,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+7530)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -60123,7 +60120,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+7938)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7957)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -60509,13 +60506,13 @@ 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+7940, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7943,
+			if Xsqlite3_strnicmp(tls, z, ts+7959, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7962,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
-							return ts + 4932
+							return ts + 4951
 						}
-						return ts + 1554
+						return ts + 1573
 					}(), pExpr))
 			} else {
 				codeReal(tls, v, z, negFlag, iMem)
@@ -60552,6 +60549,7 @@ func Xsqlite3ExprCodeLoadIndexColumn(tls *libc.TLS, pParse uintptr, pIdx uintptr
 func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr, pCol uintptr, regOut int32) {
 	var iAddr int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
+	var nErr int32 = (*Parse)(unsafe.Pointer(pParse)).FnErr
 
 	if (*Parse)(unsafe.Pointer(pParse)).FiSelfTab > 0 {
 		iAddr = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Parse)(unsafe.Pointer(pParse)).FiSelfTab-1, 0, regOut)
@@ -60565,6 +60563,9 @@ func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr
 	if iAddr != 0 {
 		Xsqlite3VdbeJumpHere(tls, v, iAddr)
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr > nErr {
+		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FerrByteOffset = -1
+	}
 }
 
 // Generate code to extract the value of the iCol-th column of a table.
@@ -60586,7 +60587,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+7970,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7989,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -60759,8 +60760,8 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8000, ts + 8005, ts + 8010, ts + 6191,
-				ts + 6186, ts + 8018}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8019, ts + 8024, ts + 8029, ts + 6210,
+				ts + 6205, ts + 8037}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
@@ -60768,7 +60769,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 8026
+						return ts + 8045
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -60783,6 +60784,7 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 	var p uintptr
 	var v uintptr
 	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+		var exprAff U8
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -60796,6 +60798,14 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 		if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr, iDataCur) != 0 {
 			continue
 		}
+
+		exprAff = U8(Xsqlite3ExprAffinity(tls, pExpr))
+		if int32(exprAff) <= SQLITE_AFF_BLOB && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_BLOB ||
+			int32(exprAff) == SQLITE_AFF_TEXT && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_TEXT ||
+			int32(exprAff) >= SQLITE_AFF_NUMERIC && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_NUMERIC {
+			continue
+		}
+
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 
 		if (*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow != 0 {
@@ -61135,7 +61145,7 @@ __73:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
 		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7970,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7989,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
 __76:
@@ -61368,7 +61378,7 @@ __43:
 		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+8031, libc.VaList(bp+8, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8050, libc.VaList(bp+8, pExpr))
 	goto __91
 __90:
 	return func() int32 {
@@ -61409,7 +61419,7 @@ __93:
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
 		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8058, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8077, libc.VaList(bp+16, pExpr))
 	goto __5
 __94:
 	;
@@ -61569,7 +61579,7 @@ __121:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
 		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7660,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
 __122:
 	;
@@ -61591,11 +61601,10 @@ __49:
 	return target
 
 __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) {
+	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) {
 		goto __123
 	}
+
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
 		goto __125
@@ -61635,7 +61644,7 @@ __126:
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	goto __5
 
 __55:
@@ -61666,13 +61675,19 @@ __129:
 	;
 __127:
 	;
-	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
+	addrINR = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable, 0, target)
 
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = U8(0)
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = okConstFactor
+	if !(inReg != target) {
+		goto __130
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
+	inReg = target
+__130:
+	;
 	Xsqlite3VdbeJumpHere(tls, v, addrINR)
-	Xsqlite3VdbeChangeP3(tls, v, addrINR, inReg)
 	goto __5
 
 __56:
@@ -61685,15 +61700,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __130
+		goto __131
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __131
+		goto __132
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__131:
+__132:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -61703,22 +61718,22 @@ __131:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__130:
+__131:
 	;
 	i1 = 0
-__132:
+__133:
 	if !(i1 < nExpr-1) {
-		goto __134
+		goto __135
 	}
 	if !(pX != 0) {
-		goto __135
+		goto __136
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __136
-__135:
-	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+	goto __137
 __136:
+	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+__137:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -61727,21 +61742,21 @@ __136:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __133
-__133:
-	i1 = i1 + 2
-	goto __132
 	goto __134
 __134:
+	i1 = i1 + 2
+	goto __133
+	goto __135
+__135:
 	;
 	if !(nExpr&1 != 0) {
-		goto __137
+		goto __138
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __138
-__137:
-	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+	goto __139
 __138:
+	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+__139:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -61751,27 +61766,27 @@ __138:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __139
-	}
-	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8082, 0)
-	return 0
-__139:
-	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __140
 	}
-	Xsqlite3MayAbort(tls, pParse)
+	Xsqlite3ErrorMsg(tls, pParse,
+		ts+8101, 0)
+	return 0
 __140:
 	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __141
 	}
+	Xsqlite3MayAbort(tls, pParse)
+__141:
+	;
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+		goto __142
+	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __142
-__141:
+	goto __143
+__142:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -61780,7 +61795,7 @@ __141:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__142:
+__143:
 	;
 	goto __5
 
@@ -61791,7 +61806,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8132))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8151))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -63580,11 +63595,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+6381, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 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+8142, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8161, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -63596,13 +63611,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8170,
+		ts+8189,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8345,
+			ts+8364,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -63612,10 +63627,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8519, libc.VaList(bp, zDb, zDb))
+		ts+8538, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8666, 0)
+			ts+8685, 0)
 	}
 }
 
@@ -63679,7 +63694,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8817, libc.VaList(bp, zName))
+		ts+8836, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -63689,7 +63704,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8876, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8895, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -63698,7 +63713,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8882, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8901, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -63739,19 +63754,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8909, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8928, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9093,
+		ts+9112,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9398, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9417, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9414,
+		ts+9433,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -63759,7 +63774,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9472, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9491, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -63771,7 +63786,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9737, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9756, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63783,7 +63798,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9750,
+		ts+9769,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -63829,12 +63844,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9788, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9807, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9820, 0)
+			ts+9839, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -63844,11 +63859,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+9847)
+				ts+9866)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9906)
+				ts+9925)
 		}
 
 		if pDflt != 0 {
@@ -63861,12 +63876,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9959)
+					ts+9978)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10005)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10024)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -63877,7 +63892,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10032,
+			ts+10051,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -63899,7 +63914,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+10178,
+				ts+10197,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -63947,14 +63962,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10408, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10427, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10442, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10461, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -63982,7 +63997,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+10472, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10491, 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
 	}
@@ -64022,18 +64037,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 + 10491
+		zType = ts + 10510
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10496
+		zType = ts + 10515
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10510,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10529,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10528
+					return ts + 10547
 				}
-				return ts + 10545
+				return ts + 10564
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -64117,11 +64132,11 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10582, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1554, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1573, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iSchema == 1))
 
 	Xsqlite3MayAbort(tls, pParse)
@@ -64134,17 +64149,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10584,
+		ts+10603,
 		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+10766,
+		ts+10785,
 		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+9737, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9756, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -64402,12 +64417,12 @@ 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+10897,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10916,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10920
+				return ts + 10939
 			}
-			return ts + 1554
+			return ts + 1573
 		}(), zWhen,
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg))
 	Xsqlite3_result_error(tls, pCtx, zErr, -1)
@@ -64447,8 +64462,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+10922, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 113494)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10941, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113516)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -64465,7 +64480,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, 113505)
+		rc = Xsqlite3CorruptError(tls, 113527)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -64487,7 +64502,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+10930, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10949, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -64527,12 +64542,12 @@ 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+10936, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10955, 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 + 10920
+							return ts + 10939
 						}
-						return ts + 1554
+						return ts + 1573
 					}()))
 				zReplace = zBuf2
 				nReplace = U32(Xsqlite3Strlen30(tls, zReplace))
@@ -65018,7 +65033,7 @@ __45:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FzErrMsg != 0) {
 		goto __47
 	}
-	renameColumnParseError(tls, context, ts+1554, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
+	renameColumnParseError(tls, context, ts+1573, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
 	goto __48
 __47:
 	Xsqlite3_result_error_code(tls, context, rc)
@@ -65183,7 +65198,7 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 			if rc == SQLITE_ERROR && Xsqlite3WritableSchema(tls, db) != 0 {
 				Xsqlite3_result_value(tls, context, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 			} else if (*Parse)(unsafe.Pointer(bp+80)).FzErrMsg != 0 {
-				renameColumnParseError(tls, context, ts+1554, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
+				renameColumnParseError(tls, context, ts+1573, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
 			} else {
 				Xsqlite3_result_error_code(tls, context, rc)
 			}
@@ -65386,7 +65401,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 114441)
+	rc = Xsqlite3CorruptError(tls, 114463)
 	goto drop_column_done
 __2:
 	;
@@ -65410,7 +65425,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10941, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10960, 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)
 
@@ -65491,19 +65506,19 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10582, 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+10948,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10967,
 		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 + 10976
+				return ts + 10995
 			}
-			return ts + 6127
+			return ts + 6146
 		}(),
 			zCol))
 	goto exit_drop_column
@@ -65512,7 +65527,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10988, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11007, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -65526,13 +65541,13 @@ __8:
 	goto exit_drop_column
 __9:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1554, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1573, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11036, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11055, 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+11157, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11176, 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
@@ -65650,11 +65665,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 + 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}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11194},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11215},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11235},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11254},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11273}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -65688,7 +65703,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+11277, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11296, 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)
 			}
@@ -65697,10 +65712,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+11300,
+					ts+11319,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11330, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11349, 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)
 			}
@@ -65718,9 +65733,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11348, FzCols: ts + 11361},
-	{FzName: ts + 11374, FzCols: ts + 11387},
-	{FzName: ts + 11415},
+	{FzName: ts + 11367, FzCols: ts + 11380},
+	{FzName: ts + 11393, FzCols: ts + 11406},
+	{FzName: ts + 11434},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65910,7 +65925,7 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11428}
+	FzName:     ts + 11447}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
@@ -66161,7 +66176,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11438}
+	FzName:     ts + 11457}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -66175,7 +66190,7 @@ 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+11448,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11467,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
 					return (*StatAccum)(unsafe.Pointer(p)).FnEst
@@ -66188,7 +66203,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11453, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11472, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -66230,7 +66245,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+11459, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11478, 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--
@@ -66244,7 +66259,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11465}
+	FzName:     ts + 11484}
 
 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)
@@ -66288,7 +66303,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+11474, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11493, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -66305,7 +66320,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+11348, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11367, 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)
@@ -66461,7 +66476,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+11484, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11503, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -66518,7 +66533,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+11484, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11503, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -66565,9 +66580,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+11488)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11507)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11492)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11511)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -66650,7 +66665,7 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 	var v TRowcnt
 
 	if z == uintptr(0) {
-		z = ts + 1554
+		z = ts + 1573
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
 		v = uint64(0)
@@ -66672,15 +66687,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+11496, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11515, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11507, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11526, 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+11517, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11536, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -66956,11 +66971,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+11374, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11393, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11529,
-			ts+11583,
+			ts+11548,
+			ts+11602,
 			zDb)
 	}
 	return rc
@@ -67007,10 +67022,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+11348, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11367, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11635, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11654, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -67068,7 +67083,7 @@ 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+6441, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6460, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -67101,13 +67116,13 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zFile == uintptr(0)) {
 		goto __1
 	}
-	zFile = ts + 1554
+	zFile = ts + 1573
 __1:
 	;
 	if !(zName == uintptr(0)) {
 		goto __2
 	}
-	zName = ts + 1554
+	zName = ts + 1573
 __2:
 	;
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2)) != 0) {
@@ -67115,14 +67130,14 @@ __2:
 	}
 
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3835)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3854)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11676, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11695, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
 	if !(rc == SQLITE_OK) {
 		goto __6
 	}
@@ -67159,7 +67174,7 @@ __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11679,
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11698,
 		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
@@ -67173,7 +67188,7 @@ __12:
 	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __15
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11716, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11735, libc.VaList(bp+8, zName))
 	goto attach_error
 __15:
 	;
@@ -67237,7 +67252,7 @@ __4:
 		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11746, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11765, 0)
 	goto __23
 __22:
 	if !(rc == SQLITE_OK) {
@@ -67254,7 +67269,7 @@ __25:
 		goto __27
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
-		ts+11775, 0)
+		ts+11794, 0)
 	rc = SQLITE_ERROR
 __27:
 	;
@@ -67320,13 +67335,13 @@ __33:
 	}
 	Xsqlite3OomFault(tls, db)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1509, 0)
 	goto __35
 __34:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
 		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11843, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11862, libc.VaList(bp+16, zFile))
 __36:
 	;
 __35:
@@ -67373,7 +67388,7 @@ func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zName == uintptr(0)) {
 		goto __1
 	}
-	zName = ts + 1554
+	zName = ts + 1573
 __1:
 	;
 	i = 0
@@ -67404,14 +67419,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11871, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11890, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11892, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11911, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -67419,7 +67434,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11918, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11937, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -67536,7 +67551,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11940}
+	FzName:     ts + 11959}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -67549,7 +67564,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11954}
+	FzName:     ts + 11973}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -67563,7 +67578,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+11968, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11987, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -67595,7 +67610,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+11992,
+						ts+12011,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -67770,7 +67785,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+12038, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12057, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -67796,11 +67811,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+12061, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12080, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12067, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12086, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12073, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12092, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -67847,7 +67862,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 + 7713
+		zCol = ts + 7732
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -67871,7 +67886,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+12100, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12119, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -68142,25 +68157,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6441) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6460) == 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+6381, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
 			if i == 1 {
-				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 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5902+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+6389)
+						ts+6408)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+5883)
+						ts+5902)
 				}
 			}
 		}
@@ -68181,12 +68196,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		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 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5902)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+6389)
+					ts+6408)
 			}
 		}
 	}
@@ -68217,7 +68232,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+12115, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12134, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -68235,14 +68250,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 + 12123
+			zMsg = ts + 12142
 		} else {
-			zMsg = ts + 12136
+			zMsg = ts + 12155
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6664, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6674, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -68272,12 +68287,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+6381, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
-			return ts + 6427
+	if Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5902+7) == 0 {
+			return ts + 6446
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6389+7) == 0 {
-			return ts + 6408
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 {
+			return ts + 6427
 		}
 	}
 	return zName
@@ -68635,7 +68650,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+5883)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5902)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -68661,7 +68676,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6441, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6460, zName) {
 				goto __3
 			}
 
@@ -68714,13 +68729,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+12150, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12169, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12167, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12186, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -68758,13 +68773,13 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 		if Xsqlite3_stricmp(tls, zType, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit))) != 0 ||
 			Xsqlite3_stricmp(tls, zName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 1*8))) != 0 ||
 			Xsqlite3_stricmp(tls, zTblName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 2*8))) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1554, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1573, 0)
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6381, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6400, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12187,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12206,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -68924,9 +68939,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -68942,7 +68957,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12229, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12248, 0)
 	return
 __4:
 	;
@@ -68970,9 +68985,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10491
+			return ts + 10510
 		}
-		return ts + 8876
+		return ts + 8895
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -68988,9 +69003,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -69021,12 +69036,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12270,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12289,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10491
+				return ts + 10510
 			}
-			return ts + 8876
+			return ts + 8895
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -69041,7 +69056,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12291, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12310, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -69128,7 +69143,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+12326, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12345, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -69152,7 +69167,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+12343, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12362, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -69172,7 +69187,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 + 12326
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12345
 	(*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)
@@ -69184,7 +69199,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+12326, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12345, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -69218,7 +69233,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+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12396, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -69226,13 +69241,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+12400, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12419, 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+12407, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12426, 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--
@@ -69269,7 +69284,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+12417, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12436, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -69433,10 +69448,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+12443,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12462,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12488, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12507, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -69467,7 +69482,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+12529, 0)
+			ts+12548, 0)
 	}
 }
 
@@ -69512,7 +69527,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12581, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12600, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -69601,7 +69616,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12622, 0)
+		ts+12641, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -69696,7 +69711,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12678, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12697, 0)
 	goto generated_done
 __2:
 	;
@@ -69709,13 +69724,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12721, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12740, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12729, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12748, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -69749,13 +69764,19 @@ __10:
 
 	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
 __11:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_RAISE) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = (*Column)(unsafe.Pointer(pCol)).Faffinity
+__12:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12736,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12755,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -69876,13 +69897,13 @@ __3:
 	;
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
-		zSep = ts + 1554
-		zSep2 = ts + 12767
-		zEnd = ts + 4957
+		zSep = ts + 1573
+		zSep2 = ts + 12786
+		zEnd = ts + 4976
 	} else {
-		zSep = ts + 12769
-		zSep2 = ts + 12773
-		zEnd = ts + 12778
+		zSep = ts + 12788
+		zSep2 = ts + 12792
+		zEnd = ts + 12797
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -69890,7 +69911,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12781, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12800, 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('(')
@@ -69924,17 +69945,17 @@ __5:
 	goto __6
 __6:
 	;
-	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3663, libc.VaList(bp, zEnd))
+	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3682, libc.VaList(bp, zEnd))
 	return zStmt
 }
 
 var azType1 = [6]uintptr{
-	ts + 1554,
-	ts + 12795,
-	ts + 12801,
-	ts + 12806,
-	ts + 12811,
-	ts + 12801,
+	ts + 1573,
+	ts + 12814,
+	ts + 12820,
+	ts + 12825,
+	ts + 12830,
+	ts + 12820,
 }
 
 func resizeIndexObject(tls *libc.TLS, db uintptr, pIdx uintptr, N int32) int32 {
@@ -70324,7 +70345,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
 		if pSelect != 0 || !(int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM) && (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1554, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1573, 0)
 			return
 		}
 		(*Table)(unsafe.Pointer(p)).Ftnum = (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum
@@ -70341,10 +70362,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+12817,
-						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1554)))
+						ts+12836,
+						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1573)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12850,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12869,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -70363,11 +70384,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+12877, 0)
+				ts+12896, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12927, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12946, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -70401,7 +70422,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12959, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12978, 0)
 			return
 		}
 	}
@@ -70426,11 +70447,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 + 8876
-			zType2 = ts + 13003
+			zType = ts + 8895
+			zType2 = ts + 13022
 		} else {
-			zType = ts + 10491
-			zType2 = ts + 13009
+			zType = ts + 10510
+			zType2 = ts + 13028
 		}
 
 		if pSelect != 0 {
@@ -70501,11 +70522,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+13014, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13033, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13029,
+			ts+13048,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -70521,13 +70542,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+13127,
+					ts+13146,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13169, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13188, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -70542,7 +70563,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+9398) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9417) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -70572,7 +70593,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+13203, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13222, 0)
 	goto create_view_fail
 __1:
 	;
@@ -70588,7 +70609,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10491, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10510, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -70670,7 +70691,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13239, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13258, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -70795,13 +70816,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+13269, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13288, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13284,
+		ts+13303,
 		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)
 }
@@ -70842,10 +70863,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+13351, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13370, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11300,
+				ts+11319,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -70877,12 +70898,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+13365,
+			ts+13384,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13410,
+		ts+13429,
 		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)
@@ -70910,11 +70931,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+6381, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3286, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3305, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7133, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7141, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -70992,9 +71013,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -71053,21 +71074,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13477, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13496, 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+13505, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13524, 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+13539, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13558, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -71079,7 +71100,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11492, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11511, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -71143,7 +71164,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13571,
+		ts+13590,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -71155,7 +71176,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13634, 0)
+		ts+13653, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -71240,7 +71261,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13728,
+		ts+13747,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -71467,12 +71488,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+13774,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13793,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13802
+							return ts + 13821
 						}
-						return ts + 13808
+						return ts + 13827
 					}()))
 				return 1
 			}
@@ -71593,7 +71614,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13813, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13832, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -71612,7 +71633,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13819,
+		ts+13838,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -71638,26 +71659,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13869, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13888, 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+13897, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13916, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13922, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13941, 0)
 	goto exit_create_index
 __17:
 	;
@@ -71671,7 +71692,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13813, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13832, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -71686,7 +71707,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13956, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13975, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -71698,7 +71719,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13990, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14009, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -71727,7 +71748,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14014, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14033, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -71748,9 +71769,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -71789,7 +71810,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13813)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13832)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -71890,7 +71911,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14037, 0)
+		ts+14056, 0)
 	goto exit_create_index
 __56:
 	;
@@ -72107,7 +72128,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14098, libc.VaList(bp+48, 0))
+		ts+14117, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -72159,8 +72180,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14140, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14159, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121859)
 	goto exit_create_index
 __101:
 	;
@@ -72206,12 +72227,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14157,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14176,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
-				return ts + 1554
+				return ts + 1573
 			}
-			return ts + 14177
+			return ts + 14196
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -72219,7 +72240,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14185,
+		ts+14204,
 		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,
@@ -72233,7 +72254,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14244, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14263, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -72394,7 +72415,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14271, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14290, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -72409,7 +72430,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14289, libc.VaList(bp+8, 0))
+		ts+14308, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -72420,9 +72441,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -72448,9 +72469,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14362,
+		ts+14381,
 		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+11488, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11507, (*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)
@@ -72585,7 +72606,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+14422,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14441,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -72793,12 +72814,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+14458,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14477,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14494
+				return ts + 14513
 			}
-			return ts + 14497
+			return ts + 14516
 		}()))
 	goto append_from_error
 __1:
@@ -72967,7 +72988,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14503, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14522, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -73003,9 +73024,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14509
+				return ts + 14528
 			}
-			return ts + 14518
+			return ts + 14537
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -73030,7 +73051,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14503, ts + 14525, ts + 14509}
+var az = [3]uintptr{ts + 14522, ts + 14544, ts + 14528}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -73045,7 +73066,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+14533, 0)
+				ts+14552, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -73182,17 +73203,17 @@ 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+14603, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14622, 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+14614, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14633, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
-			Xsqlite3_str_append(tls, bp+8, ts+1567, 1)
+			Xsqlite3_str_append(tls, bp+8, ts+1586, 1)
 			Xsqlite3_str_appendall(tls, bp+8, zCol)
 		}
 	}
@@ -73215,11 +73236,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+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12080, 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+14617, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14636, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -73349,7 +73370,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14626, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14645, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -73445,7 +73466,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+14672, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14691, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -73638,7 +73659,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14702, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14721, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -73918,7 +73939,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+14733,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14752,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -73950,11 +73971,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+14766, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14785, 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+14795, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14814, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -74205,7 +74226,7 @@ __20:
 	goto __16
 __15:
 	wcf = U16(WHERE_ONEPASS_DESIRED | WHERE_DUPLICATES_OK)
-	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_VarSelect != 0) {
+	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_Subquery != 0) {
 		goto __23
 	}
 	bComplex = 1
@@ -74458,7 +74479,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14833)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14852)
 __62:
 	;
 delete_from_cleanup:
@@ -74573,7 +74594,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+11348) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11367) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -74803,7 +74824,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 + 8005, ts + 8000, ts + 6181}
+var azType2 = [5]uintptr{ts + 6210, ts + 6205, ts + 8024, ts + 8019, ts + 6200}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -74862,7 +74883,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+14846, -1)
+					Xsqlite3_result_error(tls, context, ts+14865, -1)
 					return
 				}
 				iVal = -iVal
@@ -75166,7 +75187,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14863, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14882, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -75512,7 +75533,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+14868, -1)
+		Xsqlite3_result_error(tls, context, ts+14887, -1)
 		return
 	}
 	if argc == 3 {
@@ -75522,7 +75543,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+14901, -1)
+				ts+14920, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -75575,7 +75596,7 @@ func errlogFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	_ = argc
 	_ = context
-	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3663, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
+	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3682, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
 }
 
 func compileoptionusedFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
@@ -75615,13 +75636,13 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 
 			var zVal uintptr
 			r1 = Xsqlite3_value_double(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+4925, libc.VaList(bp, r1))
+			Xsqlite3_str_appendf(tls, pStr, ts+4944, libc.VaList(bp, r1))
 			zVal = Xsqlite3_str_value(tls, pStr)
 			if zVal != 0 {
 				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+14946, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14965, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -75629,7 +75650,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 		}
 	case SQLITE_INTEGER:
 		{
-			Xsqlite3_str_appendf(tls, pStr, ts+1334, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
+			Xsqlite3_str_appendf(tls, pStr, ts+1353, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
 			break
 
 		}
@@ -75658,13 +75679,13 @@ 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+14953, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14972, libc.VaList(bp+24, zArg))
 			break
 
 		}
 	default:
 		{
-			Xsqlite3_str_append(tls, pStr, ts+1555, 4)
+			Xsqlite3_str_append(tls, pStr, ts+1574, 4)
 			break
 
 		}
@@ -75805,7 +75826,7 @@ func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 	var ch U32
 	var c U8
 	var d U8
-	zPass = ts + 1554
+	zPass = ts + 1573
 	nPass = 0
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -76087,7 +76108,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10920}
+var azOne = [1]uintptr{ts + 10939}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -76099,7 +76120,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	zIn = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	if zIn == uintptr(0) {
-		zIn = ts + 1554
+		zIn = ts + 1573
 	}
 	for i = 0; *(*U8)(unsafe.Pointer(zIn + uintptr(i))) != 0 && !(int32(Xsqlite3CtypeMap[*(*U8)(unsafe.Pointer(zIn + uintptr(i)))])&0x02 != 0); i++ {
 	}
@@ -76123,7 +76144,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+14956, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14975, 4, uintptr(0))
 	}
 }
 
@@ -76148,7 +76169,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+12100, -1)
+		Xsqlite3_result_error(tls, context, ts+12119, -1)
 		return
 	}
 
@@ -76226,7 +76247,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+14846, -1)
+			Xsqlite3_result_error(tls, context, ts+14865, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -76488,7 +76509,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+14961, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14980, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -76508,14 +76529,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14967, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14986, 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+14967, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14986, 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+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)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14986, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14986, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -76756,109 +76777,109 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 }
 
 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 + 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(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(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 + 14991},
+	{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 + 15011},
+	{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 + 15024},
+	{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 + 15042},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15051},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15059},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15059},
+	{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_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15100},
+	{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 + 15125},
+	{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 + 15134},
+	{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 + 15145},
+	{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 + 15152},
+	{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 + 15166},
+	{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 + 15166},
+	{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 + 15172},
+	{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 + 15172},
+	{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 + 15178},
+	{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 + 15178},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15183},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15183},
+	{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 + 15183},
+	{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 + 15187},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15187},
+	{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 + 15187},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15191},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15198},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15206},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15213},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15219},
+	{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 + 15233},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15241},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15246},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15256},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15262},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15268},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15272},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15272},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15278},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15285},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15292},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15303},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15310},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15325},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15342},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15353},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15359},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15377},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15385},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15399},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15407},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15423},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15423},
+	{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 + 15433},
+	{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 + 15437},
+	{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 + 15443},
+	{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 + 15447},
+	{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 + 15447},
+	{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 + 15453},
+	{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 + 15453},
+	{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 + 15466},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14986},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14986},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6605},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6605},
 	{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 + 15523},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15476},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15484},
+	{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 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15496},
+	{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 + 15499},
+	{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 + 15503},
+	{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 + 15509},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15499},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15514},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15518},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15522},
 	{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 + 15532},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15537},
 	{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 + 15556},
+	{FnArg: int8(2), 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 + 15553},
+	{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 + 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 + 15565},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15570},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15575},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15580},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15586},
 	{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}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15598},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15603},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15611},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15619},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15622},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6605},
+	{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 + 15627}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -76979,7 +77000,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+15612,
+				ts+15631,
 				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)
@@ -77639,8 +77660,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 + 6452, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6448, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6471, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6467, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -77719,7 +77740,7 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 			(*Token)(unsafe.Pointer(bp + 80)).Fz = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 			(*Token)(unsafe.Pointer(bp + 80)).Fn = uint32(Xsqlite3Strlen30(tls, (*Token)(unsafe.Pointer(bp+80)).Fz))
 
-			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5136)
+			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5155)
 			if pRaise != 0 {
 				(*Expr)(unsafe.Pointer(pRaise)).FaffExpr = int8(OE_Abort)
 			}
@@ -78141,7 +78162,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7970, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7989, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -78609,7 +78630,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15657,
+		ts+15676,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -78634,7 +78655,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15698,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15717,
 		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
@@ -78783,7 +78804,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15730,
+		ts+15749,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -78793,7 +78814,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15782, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15801, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -78845,7 +78866,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15807,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15826,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -78853,7 +78874,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15853, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15872, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -79265,7 +79286,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15874)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15893)
 __125:
 	;
 insert_cleanup:
@@ -79581,7 +79602,7 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 						fallthrough
 					case OE_Fail:
 						{
-							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12080, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 								(*Column)(unsafe.Pointer(pCol)).FzCnName))
 
 							Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
@@ -80673,13 +80694,13 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131895)
+	return Xsqlite3MisuseError(tls, 131931)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
 		goto __2
 	}
-	zSql = ts + 1554
+	zSql = ts + 1573
 __2:
 	;
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -81158,7 +81179,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12100, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12119, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -81167,7 +81188,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15888
+		zEntry = ts + 15907
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -81182,7 +81203,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12080, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -81218,7 +81239,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15911, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15930, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -81232,7 +81253,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15920, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15939, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -81256,7 +81277,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15924, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15943, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -81274,7 +81295,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15930, libc.VaList(bp+16, zEntry, zFile))
+		ts+15949, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -81301,7 +81322,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15973, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15992, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -81339,7 +81360,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+16005, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16024, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -81349,7 +81370,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16042,
+	ts + 16061,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -81505,7 +81526,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+16045, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16064, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -81513,63 +81534,63 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 }
 
 var pragCName = [57]uintptr{
-	ts + 5057,
-	ts + 16084,
-	ts + 8876,
-	ts + 16088,
-	ts + 16093,
-	ts + 16096,
-	ts + 16106,
-	ts + 16116,
-	ts + 16122,
-	ts + 16126,
-	ts + 16131,
-	ts + 16136,
-	ts + 16144,
+	ts + 5076,
+	ts + 16103,
+	ts + 8895,
+	ts + 16107,
+	ts + 16112,
+	ts + 16115,
+	ts + 16125,
+	ts + 16135,
+	ts + 16141,
+	ts + 16145,
+	ts + 16150,
 	ts + 16155,
-	ts + 16158,
-	ts + 16165,
-	ts + 16126,
-	ts + 16131,
-	ts + 16172,
+	ts + 16163,
+	ts + 16174,
 	ts + 16177,
-	ts + 16180,
-	ts + 16187,
-	ts + 16122,
-	ts + 16126,
-	ts + 16193,
-	ts + 16198,
-	ts + 16203,
-	ts + 16126,
-	ts + 16207,
-	ts + 16131,
-	ts + 16215,
-	ts + 16219,
-	ts + 16224,
-	ts + 11492,
-	ts + 11488,
-	ts + 16230,
-	ts + 16235,
-	ts + 16240,
-	ts + 16084,
-	ts + 16126,
-	ts + 16245,
-	ts + 16252,
+	ts + 16184,
+	ts + 16145,
+	ts + 16150,
+	ts + 16191,
+	ts + 16196,
+	ts + 16199,
+	ts + 16206,
+	ts + 16141,
+	ts + 16145,
+	ts + 16212,
+	ts + 16217,
+	ts + 16222,
+	ts + 16145,
+	ts + 16226,
+	ts + 16150,
+	ts + 16234,
+	ts + 16238,
+	ts + 16243,
+	ts + 11511,
+	ts + 11507,
+	ts + 16249,
+	ts + 16254,
 	ts + 16259,
-	ts + 8876,
-	ts + 16267,
-	ts + 5060,
-	ts + 16273,
-	ts + 16084,
-	ts + 16126,
+	ts + 16103,
+	ts + 16145,
+	ts + 16264,
+	ts + 16271,
 	ts + 16278,
-	ts + 16283,
-	ts + 15480,
-	ts + 16288,
-	ts + 16301,
-	ts + 16310,
-	ts + 16317,
-	ts + 16328,
+	ts + 8895,
+	ts + 16286,
+	ts + 5079,
+	ts + 16292,
+	ts + 16103,
+	ts + 16145,
+	ts + 16297,
+	ts + 16302,
+	ts + 15499,
+	ts + 16307,
+	ts + 16320,
+	ts + 16329,
+	ts + 16336,
+	ts + 16347,
 }
 
 // Definitions of all built-in pragmas
@@ -81587,238 +81608,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16336,
+	{FzName: ts + 16355,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16351,
+	{FzName: ts + 16370,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16366,
+	{FzName: ts + 16385,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16378,
+	{FzName: ts + 16397,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16394,
+	{FzName: ts + 16413,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16317,
+	{FzName: ts + 16336,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16407,
+	{FzName: ts + 16426,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16419,
+	{FzName: ts + 16438,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16439,
+	{FzName: ts + 16458,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CellSizeCk)},
-	{FzName: ts + 16455,
+	{FzName: ts + 16474,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16476,
+	{FzName: ts + 16495,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16491,
+	{FzName: ts + 16510,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16507,
+	{FzName: ts + 16526,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16521,
+	{FzName: ts + 16540,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16534,
+	{FzName: ts + 16553,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16548,
+	{FzName: ts + 16567,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16567,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_DeferFKs)},
 	{FzName: ts + 16586,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_DeferFKs)},
+	{FzName: ts + 16605,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16609,
+	{FzName: ts + 16628,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16618,
+	{FzName: ts + 16637,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16636,
+	{FzName: ts + 16655,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16653,
+	{FzName: ts + 16672,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16666,
+	{FzName: ts + 16685,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16681,
+	{FzName: ts + 16700,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16699,
+	{FzName: ts + 16718,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16709,
+	{FzName: ts + 16728,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16723,
+	{FzName: ts + 16742,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16739,
+	{FzName: ts + 16758,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16764,
+	{FzName: ts + 16783,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16783,
+	{FzName: ts + 16802,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16794,
+	{FzName: ts + 16813,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16805,
+	{FzName: ts + 16824,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16817,
+	{FzName: ts + 16836,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16833,
+	{FzName: ts + 16852,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16846,
+	{FzName: ts + 16865,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16865,
+	{FzName: ts + 16884,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16884,
+	{FzName: ts + 16903,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16897,
+	{FzName: ts + 16916,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16912,
+	{FzName: ts + 16931,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16922,
+	{FzName: ts + 16941,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16934,
+	{FzName: ts + 16953,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16943,
+	{FzName: ts + 16962,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16954,
+	{FzName: ts + 16973,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16964,
+	{FzName: ts + 16983,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16976,
+	{FzName: ts + 16995,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16987,
+	{FzName: ts + 17006,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16999,
+	{FzName: ts + 17018,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17016,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_RecTriggers)},
 	{FzName: ts + 17035,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_RecTriggers)},
+	{FzName: ts + 17054,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17061,
+	{FzName: ts + 17080,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17076,
+	{FzName: ts + 17095,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17090,
+	{FzName: ts + 17109,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17109,
+	{FzName: ts + 17128,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17123,
+	{FzName: ts + 17142,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17139,
+	{FzName: ts + 17158,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17151,
+	{FzName: ts + 17170,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17162,
+	{FzName: ts + 17181,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17173,
+	{FzName: ts + 17192,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17185,
+	{FzName: ts + 17204,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17196,
+	{FzName: ts + 17215,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17217,
+	{FzName: ts + 17236,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17225,
+	{FzName: ts + 17244,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17240,
+	{FzName: ts + 17259,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17253,
-		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
 	{FzName: ts + 17272,
+		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
+	{FzName: ts + 17291,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17287,
+	{FzName: ts + 17306,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -81840,7 +81861,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 17303))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 17322))
 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)}
@@ -81852,10 +81873,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+17328) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17347) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17357) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -81864,13 +81885,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+8026) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8045) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17345) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17364) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17350) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17369) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -81885,9 +81906,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+16278) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16297) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17362) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17381) == 0 {
 		return 2
 	} else {
 		return 0
@@ -81901,7 +81922,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+17369, 0)
+				ts+17388, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -81992,19 +82013,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17431
+		zName = ts + 17450
 		break
 	case OE_SetDflt:
-		zName = ts + 17440
+		zName = ts + 17459
 		break
 	case OE_Cascade:
-		zName = ts + 17452
+		zName = ts + 17471
 		break
 	case OE_Restrict:
-		zName = ts + 17460
+		zName = ts + 17479
 		break
 	default:
-		zName = ts + 17469
+		zName = ts + 17488
 		break
 	}
 	return zName
@@ -82021,7 +82042,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17479, ts + 17486, ts + 17494, ts + 17498, ts + 17362, ts + 17507,
+	ts + 17498, ts + 17505, ts + 17513, ts + 17517, ts + 17381, ts + 17526,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -82068,13 +82089,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17511
+			zType = ts + 17530
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17513
+			zType = ts + 17532
 		} else {
-			zType = ts + 7528
+			zType = ts + 7536
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17515,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17534,
 			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),
@@ -82082,7 +82103,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17522, ts + 17527, ts + 17535}
+var azEnc = [4]uintptr{uintptr(0), ts + 17541, ts + 17546, ts + 17554}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -82233,6 +82254,7 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp7 int32
 	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
@@ -82329,7 +82351,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17543, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17562, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -82368,7 +82390,7 @@ __8:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 488)) != 0) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 488)))
 __10:
 	;
@@ -82590,7 +82612,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17547) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17566) == 0) {
 		goto __64
 	}
 	b = 2
@@ -82662,7 +82684,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17338
+	zRet = ts + 17357
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -82700,7 +82722,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17328
+	zRet = ts + 17347
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -82987,7 +83009,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 552)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17552, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17571, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -83006,7 +83028,7 @@ __127:
 	if !(*(*int8)(unsafe.Pointer(zRight)) != 0) {
 		goto __128
 	}
-	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+16, zRight))
+	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+16, zRight))
 	goto __129
 __128:
 	Xsqlite3_temp_directory = uintptr(0)
@@ -83028,7 +83050,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17577, 0)
+		ts+17596, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -83082,7 +83104,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17630) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17649) == 0) {
 		goto __142
 	}
 
@@ -83179,13 +83201,13 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17636
+			return ts + 17655
 		}
-		return ts + 17644
+		return ts + 17663
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
-			Xsqlite3ColumnType(tls, pCol, ts+1554),
+			Xsqlite3ColumnType(tls, pCol, ts+1573),
 			func() int32 {
 				if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 {
 					return 1
@@ -83250,7 +83272,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17651, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17670, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -83263,7 +83285,7 @@ __172:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __173
 	}
-	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1490, 0)
+	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1509, 0)
 	(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 __173:
 	;
@@ -83296,29 +83318,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10491
+	zType = ts + 10510
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12721
+	zType = ts + 12740
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17667
+	zType = ts + 17686
 	goto __183
 __182:
-	zType = ts + 8876
+	zType = ts + 8895
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17693,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -83384,7 +83406,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17681, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17700, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -83394,7 +83416,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17686,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17705,
 		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))))
@@ -83431,8 +83453,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17691, ts + 17693, ts + 16155}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17695,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17710, ts + 17712, ts + 16174}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17714,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -83465,7 +83487,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17720,
 		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)))
@@ -83487,7 +83509,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17705, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17724, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -83551,7 +83573,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7536, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -83567,7 +83589,7 @@ __218:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7536, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -83602,7 +83624,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17708,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17727,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -83610,7 +83632,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+17717))
+			ts+17736))
 	goto __227
 __227:
 	j2++
@@ -83799,7 +83821,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17722, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17741, 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)))
@@ -84016,7 +84038,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+17726, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17745, 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)
@@ -84127,7 +84149,7 @@ __307:
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17750,
+		ts+17769,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
@@ -84226,7 +84248,7 @@ __321:
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17786, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17805, 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) {
@@ -84248,7 +84270,7 @@ __326:
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17806,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17825,
 		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)
@@ -84261,7 +84283,7 @@ __329:
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17828,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17847,
 		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 __332
@@ -84279,11 +84301,11 @@ __331:
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
 __334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17851, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17870, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17853,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17872,
 		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)
 __333:
@@ -84329,7 +84351,7 @@ __339:
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17873,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17892,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
@@ -84363,89 +84385,103 @@ __344:
 
 	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+17903)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17922)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17908)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17927)
 	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)
 
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __345
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_IdxRowid, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
+	jmp7 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 3, 0, r1+int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn)-1)
+
+	Xsqlite3VdbeLoadString(tls, v, 3,
+		ts+17948)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17984)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp7)
+__345:
+	;
 	label6 = 0
 	kk = 0
-__345:
+__346:
 	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) {
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
 		goto __349
 	}
-	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+	goto __347
 __349:
+	;
+	if !(label6 == 0) {
+		goto __350
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__350:
 	;
 	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:
+	kk++
+	goto __346
+	goto __348
+__348:
 	;
 	if !(label6 != 0) {
-		goto __350
+		goto __351
 	}
 	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
 	Xsqlite3VdbeResolveLabel(tls, v, label6)
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17922)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17929)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17995)
 	Xsqlite3VdbeGoto(tls, v, jmp5-1)
 	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-__350:
+__351:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __351
+		goto __352
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__352:
+__353:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __354
+		goto __355
 	}
 	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 __355
+		goto __356
 	}
-	goto __353
-__355:
+	goto __354
+__356:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
-	goto __353
-__353:
-	kk++
-	goto __352
 	goto __354
 __354:
+	kk++
+	goto __353
+	goto __355
+__355:
 	;
 	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)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18022)
 	Xsqlite3VdbeGoto(tls, v, jmp5)
 	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
-__351:
+__352:
 	;
 	Xsqlite3VdbeJumpHere(tls, v, jmp4)
 	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
@@ -84462,20 +84498,20 @@ __340:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 612)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __356
+		goto __357
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17983)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+18049)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__357:
+__358:
 	if !(pIdx5 != 0) {
-		goto __359
-	}
-	if !(pPk1 == pIdx5) {
 		goto __360
 	}
-	goto __358
-__360:
+	if !(pPk1 == pIdx5) {
+		goto __361
+	}
+	goto __359
+__361:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -84484,21 +84520,21 @@ __360:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __358
-__358:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __357
 	goto __359
 __359:
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
+	goto __358
+	goto __360
+__360:
 	;
 	if !(pPk1 != 0) {
-		goto __361
+		goto __362
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__361:
+__362:
 	;
-__356:
+__357:
 	;
 	goto __291
 __291:
@@ -84516,14 +84552,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __362
+		goto __363
 	}
 	(*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 + 18012
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18078
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__362:
+__363:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -84531,27 +84567,27 @@ __362:
 
 __45:
 	if !!(zRight != 0) {
-		goto __363
+		goto __364
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __365
-	}
-	goto pragma_out
-__365:
-	;
-	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __364
-__363:
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
 		goto __366
 	}
+	goto pragma_out
+__366:
+	;
+	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
+	goto __365
+__364:
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
+		goto __367
+	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__367:
+__368:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __369
+		goto __370
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __370
+		goto __371
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -84560,25 +84596,25 @@ __367:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __369
-__370:
-	;
-	goto __368
-__368:
-	pEnc += 16
-	goto __367
-	goto __369
-__369:
-	;
-	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __371
-	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18015, libc.VaList(bp+456, zRight))
+	goto __370
 __371:
 	;
-__366:
+	goto __369
+__369:
+	pEnc += 16
+	goto __368
+	goto __370
+__370:
 	;
-__364:
+	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
+		goto __372
+	}
+	Xsqlite3ErrorMsg(tls, pParse, ts+18081, libc.VaList(bp+456, zRight))
+__372:
+	;
+__367:
+	;
+__365:
 	;
 	goto __15
 
@@ -84586,15 +84622,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 __372
+		goto __373
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __374
+		goto __375
 	}
 	goto __15
-__374:
+__375:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -84602,41 +84638,41 @@ __374:
 	(*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 __375
+		goto __376
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__375:
+__376:
 	;
-	goto __373
-__372:
+	goto __374
+__373:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __376
+		goto __377
 	}
 	goto __15
-__376:
+__377:
 	;
 	(*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)
-__373:
+__374:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__377:
+__378:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __378
+		goto __379
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __377
-__378:
+	goto __378
+__379:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -84651,31 +84687,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __379
-	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17345) == 0) {
 		goto __380
 	}
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17364) == 0) {
+		goto __381
+	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __381
-__380:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18040) == 0) {
-		goto __382
+	goto __382
+__381:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18106) == 0) {
+		goto __383
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __383
-__382:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17498) == 0) {
-		goto __384
+	goto __384
+__383:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17517) == 0) {
+		goto __385
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
+__385:
+	;
 __384:
 	;
-__383:
+__382:
 	;
-__381:
-	;
-__379:
+__380:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -84685,10 +84721,10 @@ __379:
 
 __49:
 	if !(zRight != 0) {
-		goto __385
+		goto __386
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__385:
+__386:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -84708,19 +84744,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __386
+		goto __387
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __388
+		goto __389
 	}
 	goto __15
-__388:
+__389:
 	;
-	goto __387
-__386:
-	opMask = U32(0xfffe)
+	goto __388
 __387:
+	opMask = U32(0xfffe)
+__388:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -84729,86 +84765,86 @@ __387:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__389:
+__390:
 	if !(iDb <= iDbLast) {
-		goto __391
-	}
-	if !(iDb == 1) {
 		goto __392
 	}
-	goto __390
-__392:
+	if !(iDb == 1) {
+		goto __393
+	}
+	goto __391
+__393:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__393:
+__394:
 	if !(k4 != 0) {
-		goto __395
+		goto __396
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __396
+		goto __397
 	}
-	goto __394
-__396:
+	goto __395
+__397:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__397:
+__398:
 	if !(pIdx6 != 0) {
-		goto __399
-	}
-	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
 		goto __400
 	}
+	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
+		goto __401
+	}
 	szThreshold = int16(0)
-	goto __399
-__400:
+	goto __400
+__401:
 	;
-	goto __398
-__398:
-	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __397
 	goto __399
 __399:
+	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
+	goto __398
+	goto __400
+__400:
 	;
 	if !(szThreshold != 0) {
-		goto __401
+		goto __402
 	}
 	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))
 
-__401:
+__402:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18048,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18114,
 		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 __402
+		goto __403
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __403
-__402:
-	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+	goto __404
 __403:
+	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+__404:
 	;
-	goto __394
-__394:
-	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __393
 	goto __395
 __395:
+	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
+	goto __394
+	goto __396
+__396:
 	;
-	goto __390
-__390:
-	iDb++
-	goto __389
 	goto __391
 __391:
+	iDb++
+	goto __390
+	goto __392
+__392:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -84816,36 +84852,36 @@ __391:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __404
+		goto __405
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__404:
+__405:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+640) == SQLITE_OK) {
-		goto __405
+		goto __406
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))
-__405:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __406
+		goto __407
 	}
 	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 __407
+		goto __408
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__407:
+__408:
 	;
-__406:
+__407:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -84854,10 +84890,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) >= int64(0)) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656))&int64(0x7fffffff)))
-__408:
+__409:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -84866,10 +84902,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __409
+		goto __410
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) & int64(0x7fffffff))
-__409:
+__410:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -84877,10 +84913,10 @@ __409:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __410
+		goto __411
 	}
 
-__410:
+__411:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -84932,14 +84968,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{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},
+	{FzName: ts + 18132, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18137, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18143, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18152, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18161, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18169, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18177},
+	{FzName: ts + 18184},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -84991,7 +85027,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+18124)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18190)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -84999,7 +85035,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18205, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -85012,19 +85048,19 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18146, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18212, 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+18152)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18218)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18164)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18230)
 		j++
 	}
-	Xsqlite3_str_append(tls, bp+32, ts+4957, 1)
+	Xsqlite3_str_append(tls, bp+32, ts+4976, 1)
 	Xsqlite3StrAccumFinish(tls, bp+32)
 
 	rc = Xsqlite3_declare_vtab(tls, db, bp+64)
@@ -85040,7 +85076,7 @@ __3:
 			(*PragmaVtab)(unsafe.Pointer(pTab)).FnHidden = U8(j)
 		}
 	} else {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	}
 
 	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
@@ -85188,7 +85224,7 @@ __1:
 		var zText uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 
 		if zText != 0 {
-			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, zText))
+			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, zText))
 			if *(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) == uintptr(0) {
 				return SQLITE_NOMEM
 			}
@@ -85204,13 +85240,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+18179)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18245)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18187, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18253, 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+18191, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18257, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -85219,7 +85255,7 @@ __3:
 	rc = Xsqlite3_prepare_v2(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
 	Xsqlite3_free(tls, zSql)
 	if rc != SQLITE_OK {
-		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
+		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
 		return rc
 	}
 	return pragmaVtabNext(tls, pVtabCursor)
@@ -85287,33 +85323,33 @@ 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+18195, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18261, 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, 137196)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137249)
 	} else {
 		var z uintptr
 		var zObj uintptr
 		if *(*uintptr)(unsafe.Pointer(azObj + 1*8)) != 0 {
 			zObj = *(*uintptr)(unsafe.Pointer(azObj + 1*8))
 		} else {
-			zObj = ts + 5008
+			zObj = ts + 5027
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18223, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18289, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18254, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18320, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137256)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18262,
-	ts + 18269,
-	ts + 18281,
+	ts + 18328,
+	ts + 18335,
+	ts + 18347,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -85373,7 +85409,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+14140)
+				corruptSchema(tls, pData, argv, ts+14159)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -85405,13 +85441,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+18292)
+			corruptSchema(tls, pData, argv, ts+18358)
 		} 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+14140)
+				corruptSchema(tls, pData, argv, ts+14159)
 			}
 		}
 	}
@@ -85444,16 +85480,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 + 8876
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8895
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7938
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18305
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7957
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18371
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -85547,7 +85583,7 @@ __10:
 		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11775)
+		ts+11794)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __15:
@@ -85582,7 +85618,7 @@ __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)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18443)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __19:
@@ -85596,7 +85632,7 @@ __20:
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18401,
+		ts+18467,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -85869,7 +85905,7 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
 	(*Parse)(unsafe.Pointer(pParse)).Fdb = db
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1490, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1509, 0)
 	}
 }
 
@@ -85897,7 +85933,7 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, bp+16, ts+1490, 0)
+	Xsqlite3ErrorMsg(tls, bp+16, ts+1509, 0)
 __1:
 	;
 	if !(prepFlags&U32(SQLITE_PREPARE_PERSISTENT) != 0) {
@@ -85928,7 +85964,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18435, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18501, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -85958,7 +85994,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18465, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18531, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -86018,7 +86054,7 @@ __21:
 	if !((*Parse)(unsafe.Pointer(bp+16)).FzErrMsg != 0) {
 		goto __22
 	}
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3663, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3682, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 	Xsqlite3DbFree(tls, db, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
 	goto __23
 __22:
@@ -86054,7 +86090,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, 137995)
+		return Xsqlite3MisuseError(tls, 138048)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -86153,7 +86189,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, 138143)
+		return Xsqlite3MisuseError(tls, 138196)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -86471,8 +86507,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 + 10920
-		var zSp2 uintptr = ts + 10920
+		var zSp1 uintptr = ts + 10939
+		var zSp2 uintptr = ts + 10939
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -86480,13 +86516,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18484, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18550, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18514))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18580))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -86661,7 +86697,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+18548, libc.VaList(bp, 0))
+					ts+18614, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -86706,7 +86742,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+18598, libc.VaList(bp+8, zName))
+						ts+18664, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -86717,7 +86753,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+18662,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18728,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -86761,7 +86797,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6586, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6605, 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.
@@ -87345,16 +87381,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18699
+		z = ts + 18765
 		break
 	case TK_INTERSECT:
-		z = ts + 18709
+		z = ts + 18775
 		break
 	case TK_EXCEPT:
-		z = ts + 18719
+		z = ts + 18785
 		break
 	default:
-		z = ts + 18726
+		z = ts + 18792
 		break
 	}
 	return z
@@ -87364,7 +87400,7 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18732, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18798, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
@@ -87390,11 +87426,11 @@ 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 {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18821, libc.VaList(bp, func() uintptr {
 		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
-			return ts + 18786
+			return ts + 18852
 		}
-		return ts + 1554
+		return ts + 1573
 	}()))
 
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
@@ -87582,8 +87618,8 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 				}
 
 				if iCol < 0 {
-					zType = ts + 1119
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16267
+					zType = ts + 1138
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16286
 				} 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))
@@ -87722,13 +87758,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16267
+				zCol = ts + 16286
 			} 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+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12080, 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))
@@ -87736,7 +87772,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+18801, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18867, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -87826,7 +87862,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16267
+					zName = ts + 16286
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -87836,7 +87872,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18867, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -87852,7 +87888,7 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18810, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18876, 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)
@@ -87935,8 +87971,6 @@ __1:
 		(*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
@@ -87951,12 +87985,15 @@ __1:
 			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
 				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
 			}
+			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)
+			}
 		}
 		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
+				zType = ts + 18884
 			} else {
 				zType = uintptr(0)
 				for j = 1; j < SQLITE_N_STDTYPE; j++ {
@@ -88172,7 +88209,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18822, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18888, 0)
 	return
 __1:
 	;
@@ -88263,7 +88300,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18871, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18937, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -88283,7 +88320,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18913, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18979, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -88320,7 +88357,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18919, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18985, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -88354,11 +88391,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+18934, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19000, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
-			return ts + 1554
+			return ts + 1573
 		}
-		return ts + 18957
+		return ts + 19023
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -88459,8 +88496,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18959, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18974, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19025, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19040, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -88507,7 +88544,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18699, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18765, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -88574,7 +88611,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+18993, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19059, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -88636,7 +88673,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+18993, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19059, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -88789,10 +88826,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+19014, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19080, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19060,
+			ts+19126,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -89046,8 +89083,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+7234)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7234)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7242)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7242)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -89074,13 +89111,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+19142, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19208, 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+19153, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19219, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -89092,7 +89129,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+19158, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19224, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -89280,7 +89317,8 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 				Xsqlite3VectorErrorMsg(tls, (*SubstContext)(unsafe.Pointer(pSubst)).FpParse, pCopy)
 			} else {
 				var db uintptr = (*Parse)(unsafe.Pointer((*SubstContext)(unsafe.Pointer(pSubst)).FpParse)).Fdb
-				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 && int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN {
+				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 &&
+					(int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN || (*Expr)(unsafe.Pointer(pCopy)).FiTable != (*SubstContext)(unsafe.Pointer(pSubst)).FiNewTable) {
 					libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
 					(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_IF_NULL_ROW)
 					(*Expr)(unsafe.Pointer(bp)).FpLeft = pCopy
@@ -89320,7 +89358,7 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 								if pColl != 0 {
 									return (*CollSeq)(unsafe.Pointer(pColl)).FzName
 								}
-								return ts + 1099
+								return ts + 1118
 							}())
 					}
 
@@ -90108,12 +90146,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15164) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15183) == 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+15168) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15187) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -90179,7 +90217,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+19164, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19230, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -90262,7 +90300,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+19182, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19248, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -90391,7 +90429,7 @@ 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+19205, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19271, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
@@ -90414,7 +90452,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+19225, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19291, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -90430,7 +90468,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19268
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19334
 		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 {
@@ -90456,7 +90494,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+19291,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19357,
 					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
@@ -90467,9 +90505,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 + 19329
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19395
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19363
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19429
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -90516,7 +90554,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+19401, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19467, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -90628,7 +90666,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19405,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19471,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -90647,7 +90685,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+19444,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19510,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -90655,7 +90693,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+14733,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14752,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -90756,7 +90794,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6446
+							zSchemaName = ts + 6465
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -90771,7 +90809,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+19475, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19541, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -90836,7 +90874,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+19480,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19546,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -90848,7 +90886,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+12061, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12080, 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)
@@ -90867,9 +90905,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19489, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19555, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19507, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19573, 0)
 					}
 				}
 			}
@@ -90879,7 +90917,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+19527, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19593, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -91017,7 +91055,7 @@ func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect ui
 	(*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)
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSelect)).FpGroupBy)).FnExpr)
 		} 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)
 		}
@@ -91101,13 +91139,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19558, 0)
+					ts+19624, 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+19609, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19675, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -91296,19 +91334,19 @@ 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+19642,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19708,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19654
+						return ts + 19720
 					}
-					return ts + 1554
+					return ts + 1573
 				}(),
 				func() uintptr {
 					if bCover != 0 {
 						return (*Index)(unsafe.Pointer(pIdx)).FzName
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
 	}
 }
@@ -91321,7 +91359,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+7938)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7957)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -91628,7 +91666,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19677,
+		ts+19743,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -91689,7 +91727,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19731,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19797,
 		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:
@@ -91793,7 +91831,7 @@ __27:
 	if !((*SrcItem)(unsafe.Pointer(pItem1)).FcolUsed == uint64(0) && (*SrcItem)(unsafe.Pointer(pItem1)).FzName != uintptr(0)) {
 		goto __30
 	}
-	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1554, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
+	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1573, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
 __30:
 	;
 	pSub1 = (*SrcItem)(unsafe.Pointer(pItem1)).FpSelect
@@ -91831,7 +91869,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+19771, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19837, 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)
@@ -91890,7 +91928,7 @@ __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19786, libc.VaList(bp+40, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19852, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
@@ -92361,9 +92399,9 @@ __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 + 19802
+				return ts + 19868
 			}
-			return ts + 19811
+			return ts + 19877
 		}())
 
 	groupBySort = 1
@@ -92714,7 +92752,7 @@ __65:
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
 		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19802)
+	explainTempTable(tls, pParse, ts+19868)
 __146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
@@ -92797,7 +92835,7 @@ __7:
 	if !(i < nCol) {
 		goto __9
 	}
-	z = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
+	z = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
 	if !(z == uintptr(0)) {
 		goto __10
 	}
@@ -92819,7 +92857,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19820, 0)
+		ts+19886, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -92915,7 +92953,7 @@ func Xsqlite3_get_table(tls *libc.TLS, db uintptr, zSql uintptr, pazResult uintp
 		if (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
 			if pzErrMsg != 0 {
 				Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(pzErrMsg)))
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
 			}
 			Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg)
 		}
@@ -93052,7 +93090,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+19885, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19951, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -93096,7 +93134,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19931, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19997, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -93114,7 +93152,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19939, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20005, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -93126,7 +93164,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19931, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19997, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -93141,11 +93179,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19980, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20046, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
+
 __17:
 	;
 	goto trigger_cleanup
@@ -93153,22 +93192,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20006, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20072, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20044,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20110,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20081
+				return ts + 20147
 			}
-			return ts + 20088
+			return ts + 20154
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -93177,7 +93216,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20094, libc.VaList(bp+24, pTableName+8))
+		ts+20160, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -93206,9 +93245,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -93326,7 +93365,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19931, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19997, 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
@@ -93359,7 +93398,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20140,
+		ts+20206,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -93384,13 +93423,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20188,
+		ts+20254,
 		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+20263, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20329, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -93646,7 +93685,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20292, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20358, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -93685,9 +93724,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 + 6389
+				return ts + 6408
 			}
-			return ts + 5883
+			return ts + 5902
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -93699,7 +93738,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20312,
+			ts+20378,
 			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)
@@ -93813,12 +93852,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20374,
+		ts+20440,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20422
+				return ts + 20488
 			}
-			return ts + 20429
+			return ts + 20495
 		}()))
 __15:
 	;
@@ -93932,7 +93971,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+20436, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20502, 0)
 	return 1
 }
 
@@ -93998,7 +94037,7 @@ func codeReturningTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab
 	}
 	Xsqlite3ExprListDelete(tls, db, (*Select)(unsafe.Pointer(bp)).FpEList)
 	pNew = sqlite3ExpandReturning(tls, pParse, (*Returning)(unsafe.Pointer(pReturning)).FpReturnEL, pTab)
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0) {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
 		libc.Xmemset(tls, bp+240, 0, uint64(unsafe.Sizeof(NameContext{})))
 		if (*Returning)(unsafe.Pointer(pReturning)).FnRetCol == 0 {
 			(*Returning)(unsafe.Pointer(pReturning)).FnRetCol = (*ExprList)(unsafe.Pointer(pNew)).FnExpr
@@ -94052,7 +94091,7 @@ func codeTriggerProgram(tls *libc.TLS, pParse uintptr, pStepList uintptr, orconf
 
 		if (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan != 0 {
 			Xsqlite3VdbeAddOp4(tls, v, OP_Trace, 0x7fffffff, 1, 0,
-				Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
+				Xsqlite3MPrintf(tls, db, ts+6099, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
 				-6)
 		}
 
@@ -94162,7 +94201,7 @@ 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+20478, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20544, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
@@ -94755,7 +94794,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20492,
+		ts+20558,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -94787,7 +94826,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20528, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20594, 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:
@@ -94797,7 +94836,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7713
+				return ts + 7732
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -95113,7 +95152,12 @@ __74:
 	goto __77
 __76:
 	flags = WHERE_ONEPASS_DESIRED
-	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) && !(pTrigger != 0) && !(hasFK != 0) && !(chngKey != 0) && !(*(*int32)(unsafe.Pointer(bp + 104)) != 0)) {
+	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) &&
+		!(pTrigger != 0) &&
+		!(hasFK != 0) &&
+		!(chngKey != 0) &&
+		!(*(*int32)(unsafe.Pointer(bp + 104)) != 0) &&
+		(*NameContext)(unsafe.Pointer(bp+40)).FncFlags&NC_Subquery == 0) {
 		goto __78
 	}
 	flags = flags | WHERE_ONEPASS_MULTIROW
@@ -95667,7 +95711,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20547)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20613)
 __169:
 	;
 update_cleanup:
@@ -95973,10 +96017,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+20560, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+20626, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20564, libc.VaList(bp+8, bp+216))
+				ts+20630, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -96067,7 +96111,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+12150, -1)
+				ts+12169, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -96099,7 +96143,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+20637, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20641, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20703, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20707, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -96247,14 +96291,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+20645)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20711)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20685)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20751)
 	return SQLITE_ERROR
 __2:
 	;
@@ -96265,7 +96309,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20728)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20794)
 	return SQLITE_ERROR
 __5:
 	;
@@ -96274,7 +96318,7 @@ __5:
 	*(*uint32)(unsafe.Pointer(db + 76)) |= uint32(SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE)
 	goto __4
 __3:
-	zOut = ts + 1554
+	zOut = ts + 1573
 __4:
 	;
 	saved_flags = (*Sqlite3)(unsafe.Pointer(db)).Fflags
@@ -96293,7 +96337,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20746, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20812, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -96313,7 +96357,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20769)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20835)
 	goto end_of_vacuum
 __8:
 	;
@@ -96328,7 +96372,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14503)
+	rc = execSql(tls, db, pzErrMsg, ts+14522)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -96373,7 +96417,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20796,
+		ts+20862,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -96382,7 +96426,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20904,
+		ts+20970,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -96393,7 +96437,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20958,
+		ts+21024,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -96404,7 +96448,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21109,
+		ts+21175,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -96749,7 +96793,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+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12396, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -96833,11 +96877,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+21239, libc.VaList(bp, pParse+272))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21305, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21263,
+			ts+21329,
 			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,
@@ -96847,7 +96891,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21428, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -96908,7 +96952,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+21381, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21447, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -96936,9 +96980,11 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FbDeclared = 0
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = bp + 32
+	(*Table)(unsafe.Pointer(pTab)).FnTabRef++
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{xConstruct})).f(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, pVTable+16, bp+64)
+	Xsqlite3DeleteTable(tls, db, pTab)
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = (*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -96946,9 +96992,9 @@ 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+21423, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21489, libc.VaList(bp+8, zModuleName))
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3682, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 		}
 		Xsqlite3DbFree(tls, db, pVTable)
@@ -96958,7 +97004,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 + 21453
+			var zFormat uintptr = ts + 21519
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -96970,12 +97016,12 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 			*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) = pVTable
 
 			for iCol = 0; iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol); iCol++ {
-				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1554)
+				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1573)
 				var nType int32
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16158, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16177, 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
@@ -97032,13 +97078,13 @@ 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+21499, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21565, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxConnect, bp+16)
 		if rc != SQLITE_OK {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 		}
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 16)))
@@ -97090,7 +97136,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+21499, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21565, 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)
@@ -97124,7 +97170,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, 151030)
+		return Xsqlite3MisuseError(tls, 151102)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -97166,7 +97212,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR,
 			func() uintptr {
 				if (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
-					return ts + 3663
+					return ts + 3682
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg))
@@ -97534,7 +97580,7 @@ func Xsqlite3VtabEponymousTableInit(tls *libc.TLS, pParse uintptr, pMod uintptr)
 	addModuleArgument(tls, pParse, pTab, Xsqlite3DbStrDup(tls, db, (*Table)(unsafe.Pointer(pTab)).FzName))
 	rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer(pModule)).FxConnect, bp+8)
 	if rc != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+		Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		Xsqlite3VtabEponymousTableClear(tls, db, pMod)
 	}
@@ -97577,7 +97623,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, 151521)
+		rc = Xsqlite3MisuseError(tls, 151593)
 	} else {
 		ap = va
 		switch op {
@@ -97604,7 +97650,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 151539)
+				rc = Xsqlite3MisuseError(tls, 151611)
 				break
 
 			}
@@ -97835,10 +97881,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 + 21518
+		return ts + 21584
 	}
 	if i == -1 {
-		return ts + 16267
+		return ts + 16286
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -97847,35 +97893,35 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21525, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21591, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21597, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12786, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 	}
 
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21597, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12786, 1)
 		}
-		Xsqlite3_str_append(tls, pStr, ts+5008, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5027, 1)
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 	}
 }
 
@@ -97892,29 +97938,29 @@ 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+21533, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21599, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21525, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21591, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21536
+				return ts + 21602
 			}
-			return ts + 21541
+			return ts + 21607
 		}(), 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+21549)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21615)
 		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+21551)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21617)
 	}
-	Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+	Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 }
 
 // This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
@@ -97955,11 +98001,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+21553, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21619, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21559
+				return ts + 21625
 			}
-			return ts + 21566
+			return ts + 21632
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -97969,43 +98015,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 + 10976
+					zFmt = ts + 10995
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21571
+				zFmt = ts + 21637
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21604
+				zFmt = ts + 21670
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21629
+				zFmt = ts + 21695
 			} else {
-				zFmt = ts + 21647
+				zFmt = ts + 21713
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21656, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21722, 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 + 16267
-			Xsqlite3_str_appendf(tls, bp+64, ts+21664, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16286
+			Xsqlite3_str_appendf(tls, bp+64, ts+21730, 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+21695, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21761, 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+21705, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21771, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21710,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21776,
 				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+21737, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21803, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -98037,25 +98083,25 @@ 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+21748, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21814, 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+21536, 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+21602, 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+21769, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21835, 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+21525, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21591, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21602, libc.VaList(bp+16, z))
 		}
 	}
-	Xsqlite3_str_append(tls, bp+24, ts+4957, 1)
+	Xsqlite3_str_append(tls, bp+24, ts+4976, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
@@ -99649,7 +99695,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21777, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21843, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -99677,7 +99723,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21792, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21858, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -100195,7 +100241,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+21801, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21867, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -100553,10 +100599,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{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)},
+	{FzOp: ts + 16135, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15466, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14986, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21881, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -101046,12 +101092,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21888, 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+21822, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21888, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -101130,7 +101176,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 + 6769
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7718
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -101224,7 +101270,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 21863
+				return ts + 21929
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -101600,7 +101646,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21870,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21936,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -101616,7 +101662,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 		pRhs = Xsqlite3PExpr(tls, pParse, TK_UPLUS,
 			Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*ExprList_item)(unsafe.Pointer(pArgs+8+uintptr(j)*32)).FpExpr, 0), uintptr(0))
 		pTerm = Xsqlite3PExpr(tls, pParse, TK_EQ, pColRef, pRhs)
-		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ|JT_RIGHT) != 0 {
 			joinType = U32(EP_OuterON)
 		} else {
 			joinType = U32(EP_InnerON)
@@ -102334,7 +102380,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21906, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21972, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -102405,7 +102451,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21932
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21998
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -102579,6 +102625,10 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	var iCur int32
+	var saved_pIdxEpr uintptr
+
+	saved_pIdxEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 
 	addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	for __ccgo := true; __ccgo; __ccgo = iLevel < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel) {
@@ -102622,9 +102672,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, n)
 			var jj int32
 			for jj = 0; jj < n; jj++ {
-				var iCol int32 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(jj)*2)))
-
-				Xsqlite3ExprCodeGetColumnOfTable(tls, v, (*Index)(unsafe.Pointer(pIdx)).FpTable, iCur, iCol, r1+jj)
+				Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pIdx, iCur, jj, r1+jj)
 			}
 			Xsqlite3VdbeAddOp4Int(tls, v, OP_FilterAdd, (*WhereLevel)(unsafe.Pointer(pLevel)).FregFilter, 0, r1, n)
 			Xsqlite3ReleaseTempRange(tls, pParse, r1, n)
@@ -102658,6 +102706,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 		}
 	}
 	Xsqlite3VdbeJumpHere(tls, v, addrOnce)
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = saved_pIdxEpr
 }
 
 func allocateIndexInfo(tls *libc.TLS, pWInfo uintptr, pWC uintptr, mUnusable Bitmask, pSrc uintptr, pmNoOmit uintptr) uintptr {
@@ -102771,7 +102820,7 @@ __3:
 		uint64(unsafe.Sizeof(sqlite3_index_orderby{}))*uint64(nOrderBy)+uint64(unsafe.Sizeof(HiddenIndexInfo1{}))+
 		uint64(unsafe.Sizeof(uintptr(0)))*uint64(nTerm))
 	if pIdxInfo == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1490, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1509, 0)
 		return uintptr(0)
 	}
 	pHidden = pIdxInfo + 1*96
@@ -102893,9 +102942,9 @@ func vtabBestIndex(tls *libc.TLS, pParse uintptr, pTab uintptr, p uintptr) int32
 		if rc == SQLITE_NOMEM {
 			Xsqlite3OomFault(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb)
 		} else if !(int32((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
 		}
 	}
 	Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg)
@@ -102916,11 +102965,16 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 
 	_ = pParse
 
+	if !((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol)
+	} else {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnColumn)
+	}
 	nField = func() int32 {
-		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < (*Index)(unsafe.Pointer(pIdx)).FnSample {
+		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < nField {
 			return int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField)
 		}
-		return (*Index)(unsafe.Pointer(pIdx)).FnSample
+		return nField
 	}()
 	iCol = 0
 	iSample = (*Index)(unsafe.Pointer(pIdx)).FnSample * nField
@@ -104501,7 +104555,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+21943, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+22009, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -104559,7 +104613,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+21943, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+22009, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -104957,7 +105011,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+21969, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+22035, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -105564,7 +105618,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22004, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22070, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -105599,6 +105653,10 @@ __3:
 			if int32((*WherePath)(unsafe.Pointer(pFrom)).FisOrdered) == (*ExprList)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpOrderBy)).FnExpr {
 				(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_ORDERED)
 			}
+			if (*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy != 0 &&
+				int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) > (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr {
+				(*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat = I8((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr)
+			}
 		} else {
 			(*WhereInfo)(unsafe.Pointer(pWInfo)).FrevMask = (*WherePath)(unsafe.Pointer(pFrom)).FrevLoop
 			if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) <= 0 {
@@ -105893,6 +105951,9 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
+		if Xsqlite3IndexAffinityStr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pIdx) != 0 {
+			(*IndexedExpr)(unsafe.Pointer(p)).Faff = U8(*(*int8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FzColAff + uintptr(i))))
+		}
 		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
@@ -106045,7 +106106,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22022, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22088, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -106109,7 +106170,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22050, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22116, 0)
 	goto __5
 __4:
 	ii = 0
@@ -106991,7 +107052,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22068, -1)
+		pCtx, ts+22134, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -107124,7 +107185,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+22124, -1)
+					pCtx, ts+22190, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -107214,17 +107275,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-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))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22235))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22246))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22257))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22262))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22275))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22285))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22291))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22302))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22312))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22324))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22329))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -107270,7 +107331,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22267, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22333, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -107314,12 +107375,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+22286, 0)
+			ts+22352, 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+22357, 0)
+				ts+22423, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -107342,7 +107403,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+7938)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7957)
 					}
 					break
 				}
@@ -107548,7 +107609,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+22420, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22486, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -107664,7 +107725,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+7530))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -107779,7 +107840,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22446, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22512, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -107844,15 +107905,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 + 22478
+				zErr = ts + 22544
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22495
+				zErr = ts + 22561
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22511
+				zErr = ts + 22577
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22531, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22597, 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 {
@@ -107873,7 +107934,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+22564, 0)
+				ts+22630, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -108011,7 +108072,7 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regZero)
 	if eCond >= WINDOW_STARTING_NUM {
 		var regString int32 = Xsqlite3GetTempReg(tls, pParse)
-		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1554, -1)
+		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1573, -1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, Xsqlite3VdbeCurrentAddr(tls, v)+2, reg)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL))
 
@@ -108029,11 +108090,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22611,
-	ts + 22664,
-	ts + 22068,
-	ts + 22715,
-	ts + 22767,
+	ts + 22677,
+	ts + 22730,
+	ts + 22134,
+	ts + 22781,
+	ts + 22833,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -108524,7 +108585,7 @@ func windowCodeRangeTest(tls *libc.TLS, p uintptr, op int32, csr1 int32, regVal
 
 	}
 
-	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1554, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1573, -1)
 	addrGe = Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, 0, reg1)
 
 	if op == OP_Ge && arith == OP_Add || op == OP_Le && arith == OP_Subtract {
@@ -109428,19 +109489,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+22817,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22883,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 22859
+							return ts + 22925
 						}
-						return ts + 22868
+						return ts + 22934
 					}(),
 						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+22874, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22940, 0)
 		}
 	}
 
@@ -109508,7 +109569,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+22908,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22974,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -110605,7 +110666,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22946, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23012, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -111580,21 +111641,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+16267, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16286, 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+22968, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23034, 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+16180, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16199, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23034, 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))
@@ -112337,7 +112398,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+22995)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+23061)
 				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 {
@@ -112501,7 +112562,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+23004, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23070, 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))
@@ -112718,9 +112779,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 + 6764
+							return ts + 7713
 						}
-						return ts + 6769
+						return ts + 7718
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -113004,19 +113065,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+23028, 0)
+					ts+23094, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23123, 0)
+					ts+23189, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23207, 0)
+					ts+23273, 0)
 			}
 			break
 		case uint32(273):
@@ -113395,9 +113456,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+23004, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23070, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23292, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23358, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -114165,7 +114226,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+23309, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23375, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -114186,9 +114247,9 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 	}
 	if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg != 0 || (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_OK && (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_DONE {
 		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)))
+			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3682, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23334, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23400, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -114361,7 +114422,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23411, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -114374,11 +114435,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19931, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19997, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23352, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23418, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23357, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23423, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -114391,9 +114452,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23367, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23433, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23371, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23437, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -114463,7 +114524,8 @@ func sqlite3TestExtInit(tls *libc.TLS, db uintptr) int32 {
 	return Xsqlite3FaultSim(tls, 500)
 }
 
-var sqlite3BuiltinExtensions = [4]uintptr{
+var sqlite3BuiltinExtensions = [5]uintptr{
+	0,
 	0,
 	0,
 	0,
@@ -114627,7 +114689,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 174337)
+		return Xsqlite3MisuseError(tls, 174426)
 	}
 
 	ap = va
@@ -115202,7 +115264,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175111)
+		return Xsqlite3MisuseError(tls, 175200)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -115217,7 +115279,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23379, 0)
+			ts+23445, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -115408,23 +115470,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 + 23447
+	var zErr uintptr = ts + 23513
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23461
+			zErr = ts + 23527
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23483
+			zErr = ts + 23549
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23505
+			zErr = ts + 23571
 			break
 
 		}
@@ -115442,35 +115504,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23528,
-	ts + 23541,
+	ts + 23594,
+	ts + 23607,
 	uintptr(0),
-	ts + 23557,
-	ts + 23582,
-	ts + 23596,
-	ts + 23615,
-	ts + 1490,
-	ts + 23640,
-	ts + 23677,
-	ts + 23689,
-	ts + 23704,
-	ts + 23737,
+	ts + 23623,
+	ts + 23648,
+	ts + 23662,
+	ts + 23681,
+	ts + 1509,
+	ts + 23706,
+	ts + 23743,
 	ts + 23755,
-	ts + 23780,
-	ts + 23809,
+	ts + 23770,
+	ts + 23803,
+	ts + 23821,
+	ts + 23846,
+	ts + 23875,
 	uintptr(0),
-	ts + 5838,
-	ts + 5334,
-	ts + 23826,
-	ts + 23844,
-	ts + 23862,
+	ts + 5857,
+	ts + 5353,
+	ts + 23892,
+	ts + 23910,
+	ts + 23928,
 	uintptr(0),
-	ts + 23896,
+	ts + 23962,
 	uintptr(0),
-	ts + 23917,
-	ts + 23943,
-	ts + 23966,
-	ts + 23987,
+	ts + 23983,
+	ts + 24009,
+	ts + 24032,
+	ts + 24053,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -115591,7 +115653,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, 175758)
+		return Xsqlite3MisuseError(tls, 175847)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -115636,7 +115698,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+24003, 0)
+				ts+24069, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -115753,7 +115815,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+24066, libc.VaList(bp, zName))
+		ts+24132, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -115781,7 +115843,7 @@ func Xsqlite3_overload_function(tls *libc.TLS, db uintptr, zName uintptr, nArg i
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, zName))
+	zCopy = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, zName))
 	if zCopy == uintptr(0) {
 		return SQLITE_NOMEM
 	}
@@ -115989,7 +116051,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+24117, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24183, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -116082,7 +116144,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, 176503))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176592))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -116152,7 +116214,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, 176582)
+		return Xsqlite3MisuseError(tls, 176671)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -116162,7 +116224,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, 176591)
+		return Xsqlite3MisuseError(tls, 176680)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -116194,14 +116256,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, 176639)
+		return Xsqlite3MisuseError(tls, 176728)
 	}
 
 	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+24138, 0)
+				ts+24204, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -116331,7 +116393,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+24206, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24272, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -116376,10 +116438,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24212, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24278, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24222,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24288,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -116484,7 +116546,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24250, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24316, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -116495,17 +116557,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24254, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24320, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24254
+	zModeType = ts + 24320
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24260, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24326, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -116513,7 +116575,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 3272
+	zModeType = ts + 3291
 __32:
 	;
 	if !(aMode != 0) {
@@ -116543,7 +116605,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24265, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24331, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -116551,7 +116613,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24285,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24351,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -116591,7 +116653,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24309, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24375, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -116615,15 +116677,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24325, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24332, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24391, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24398, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{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},
+	{Fz: ts + 24406, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24409, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24412, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17381, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -116769,10 +116831,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+21863, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21929, 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+24350, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24416, 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) {
@@ -116786,7 +116848,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 177308)
+	rc = Xsqlite3MisuseError(tls, 177397)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -116803,7 +116865,7 @@ __19:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -116837,9 +116899,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 + 6441
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6460
 	(*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 + 23352
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23418
 	(*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)
@@ -116944,7 +117006,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24356
+		zFilename = ts + 24422
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -117047,21 +117109,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+24359,
+	Xsqlite3_log(tls, iErr, ts+24425,
 		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+24384)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24450)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24404)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24470)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24411)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24477)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -117172,7 +117234,7 @@ __4:
 	autoinc = libc.Bool32(int32((*Table)(unsafe.Pointer(pTab)).FiPKey) == iCol && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != U32(0))
 	goto __13
 __12:
-	zDataType = ts + 1119
+	zDataType = ts + 1138
 	primarykey = 1
 __13:
 	;
@@ -117219,14 +117281,14 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24428, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24494, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -117875,7 +117937,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24456, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24522, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -117993,7 +118055,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 + 24464
+			return ts + 24530
 		}
 		return uintptr(0)
 	}(), 0)
@@ -118171,7 +118233,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6181, ts + 6764, ts + 6769, ts + 6191, ts + 6186, ts + 8005, ts + 24487, ts + 24493,
+	ts + 6200, ts + 7713, ts + 7718, ts + 6210, ts + 6205, ts + 8024, ts + 24553, ts + 24559,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -118324,7 +118386,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 + 24500 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 24566 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -118350,7 +118412,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	switch Xsqlite3_value_type(tls, pValue) {
 	case SQLITE_NULL:
 		{
-			jsonAppendRaw(tls, p, ts+6181, uint32(4))
+			jsonAppendRaw(tls, p, ts+6200, uint32(4))
 			break
 
 		}
@@ -118379,7 +118441,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+24517, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24583, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -118437,19 +118499,19 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 	switch int32((*JsonNode)(unsafe.Pointer(pNode)).FeType) {
 	default:
 		{
-			jsonAppendRaw(tls, pOut, ts+6181, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6200, uint32(4))
 			break
 
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6764, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+7713, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6769, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+7718, uint32(5))
 			break
 
 		}
@@ -118994,17 +119056,17 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		}
 		return int32(j + U32(1))
 	} else if int32(c) == 'n' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6181, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6200, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		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+6764, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7713, 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+6769, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7718, 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))
@@ -119105,7 +119167,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+24546, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24612, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -119411,7 +119473,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+24561, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24627, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -119426,7 +119488,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24565, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24631, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -119480,7 +119542,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+24591,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24657,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -119585,11 +119647,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+24634, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24700, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
-					jsonAppendRaw(tls, bp, ts+4998, uint32(2))
+					jsonAppendRaw(tls, bp, ts+5017, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24637, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24703, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -119630,7 +119692,7 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if pNode != 0 {
 				jsonRenderNode(tls, pNode, bp, uintptr(0))
 			} else {
-				jsonAppendRaw(tls, bp, ts+6181, uint32(4))
+				jsonAppendRaw(tls, bp, ts+6200, uint32(4))
 			}
 		}
 		if i == argc {
@@ -119746,14 +119808,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24640, -1)
+			ts+24706, -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+24691, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24757, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -119848,7 +119910,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15380)
+	jsonWrongNumArgs(tls, ctx, ts+15399)
 	return
 __2:
 	;
@@ -119923,9 +119985,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24725
+			return ts + 24791
 		}
-		return ts + 24729
+		return ts + 24795
 	}())
 	return
 __2:
@@ -120058,7 +120120,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24736, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24802, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -120155,7 +120217,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24739, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24805, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -120199,7 +120261,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24742)
+		ts+24808)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -120330,7 +120392,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24825, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24891, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -120349,7 +120411,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+24831, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24897, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -120445,7 +120507,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+24831, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24897, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -120469,7 +120531,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 + 24836
+				zRoot = ts + 24902
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -120591,7 +120653,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+24546, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24612, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -120686,25 +120748,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{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 + 24904},
+	{FnArg: int8(-1), 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(2), 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 + 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}}
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24951},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24954},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24958},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24970},
+	{FnArg: int8(2), 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_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24993},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25004},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25016},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 25029},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25038},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25038},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25048},
+	{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 + 25059},
+	{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 + 25076}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -120723,8 +120785,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 25028, FpModule: 0},
-	{FzName: ts + 25038, FpModule: 0},
+	{FzName: ts + 25094, FpModule: 0},
+	{FzName: ts + 25104, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -120984,11 +121046,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+25048, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25114, 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+25056, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25122, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -121199,7 +121261,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+25061,
+		ts+25127,
 		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))
@@ -121897,7 +121959,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25143)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25209)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -122109,7 +122171,7 @@ func rtreeBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 2
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FneedToFreeIdxStr = 1
-	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, bp+8))) {
+	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, bp+8))) {
 		return SQLITE_NOMEM
 	}
 
@@ -123238,7 +123300,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25157, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25223, 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 {
@@ -123250,12 +123312,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+25177, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25243, 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+25209, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25275, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -123481,7 +123543,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+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))
+		ts+25312, 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))
@@ -123504,14 +123566,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25391
+	var zFmt uintptr = ts + 25457
 	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+11348, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11367, 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 {
@@ -123552,7 +123614,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25447, ts + 5060, ts + 16267,
+	ts + 25513, ts + 5079, ts + 16286,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -123595,19 +123657,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+25452,
+			ts+25518,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25514, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25580, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25519,
+			ts+25585,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25583,
+			ts+25649,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25653,
+			ts+25719,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -123636,7 +123698,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 + 25702
+			zFormat = ts + 25768
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -123648,7 +123710,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+25810,
+			ts+25876,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -123656,18 +123718,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+25855, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25921, 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+12767, 1)
+					Xsqlite3_str_append(tls, p, ts+12786, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25882, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25948, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25904, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25970, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25912, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25978, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -123682,14 +123744,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25928,
-	ts + 25981,
-	ts + 26026,
-	ts + 26078,
-	ts + 26132,
-	ts + 26177,
-	ts + 26235,
-	ts + 26290,
+	ts + 25994,
+	ts + 26047,
+	ts + 26092,
+	ts + 26144,
+	ts + 26198,
+	ts + 26243,
+	ts + 26301,
+	ts + 26356,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -123718,7 +123780,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+26337, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26403, 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
@@ -123726,19 +123788,19 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 				(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = 4 + int32((*Rtree)(unsafe.Pointer(pRtree)).FnBytesPerCell)*RTREE_MAXCELLS
 			}
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26357,
+			ts+26423,
 			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 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26414,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26480,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -123780,16 +123842,16 @@ 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 + 26449,
-		ts + 26492,
-		ts + 26527,
-		ts + 26563,
+		ts + 26515,
+		ts + 26558,
+		ts + 26593,
+		ts + 26629,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
 		goto __1
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
 	return SQLITE_ERROR
 __1:
 	;
@@ -123814,7 +123876,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+26600,
+	Xsqlite3_str_appendf(tls, pSql, ts+26666,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -123826,7 +123888,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26624, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26690, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -123849,7 +123911,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26696, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -123860,14 +123922,14 @@ __10:
 	if !(ii < argc) {
 		goto __12
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
 	rc = SQLITE_ERROR
 	goto __13
 __12:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __14
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
 __14:
 	;
 __13:
@@ -123910,7 +123972,7 @@ __17:
 	if !(iErr != 0) {
 		goto __22
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
 	goto rtreeInit_fail
 __22:
 	;
@@ -123927,7 +123989,7 @@ __23:
 	if !(rc != 0) {
 		goto __24
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
 	goto rtreeInit_fail
 __24:
 	;
@@ -123945,7 +124007,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26633, ts + 26644}
+var azFormat = [2]uintptr{ts + 26699, ts + 26710}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -123983,13 +124045,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+10920, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10939, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26654, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26720, 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+26660, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26726, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26664, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26730, 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})))
@@ -124000,7 +124062,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+26666, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26732, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -124078,12 +124140,12 @@ 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+26699,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26765,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
-						return ts + 4062
+						return ts + 4081
 					}
-					return ts + 1554
+					return ts + 1573
 				}(), z))
 			if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport == uintptr(0) {
 				(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
@@ -124102,7 +124164,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+26706,
+			ts+26772,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -124121,7 +124183,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+26751, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26817, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -124135,8 +124197,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 + 26783,
-		ts + 26837,
+		ts + 26849,
+		ts + 26903,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -124151,23 +124213,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+26885,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26951,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26930
+					return ts + 26996
 				}
-				return ts + 26938
+				return ts + 27004
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26947,
+				ts+27013,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26930
+						return ts + 26996
 					}
-					return ts + 26938
+					return ts + 27004
 				}(), iKey, iVal))
 		}
 	}
@@ -124191,7 +124253,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+27005, libc.VaList(bp, i, iCell, iNode))
+				ts+27071, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -124211,7 +124273,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+27053, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27119, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -124228,14 +124290,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+27120, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27186, 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+27154, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27220, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -124243,7 +124305,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+27184,
+					ts+27250,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -124272,14 +124334,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+27239,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27305,
 			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+27270, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27336, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -124301,12 +124363,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+14503, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14522, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27337, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27403, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -124315,12 +124377,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25157, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25223, 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+27365, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27431, 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)
 		}
@@ -124334,8 +124396,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+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27403, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27462, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27469, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -124343,7 +124405,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+27411, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27477, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -124358,7 +124420,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27415, -1)
+			ts+27481, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -124366,7 +124428,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6441
+			zDb = ts + 6460
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -124376,7 +124438,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 + 18012
+				return ts + 18078
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -124747,11 +124809,11 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		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+27466, 1)
+		Xsqlite3_str_append(tls, x, ts+27532, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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+27534, 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+27479, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27545, 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)
 	}
@@ -124771,19 +124833,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+27490, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27556, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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)))))
+			Xsqlite3_str_appendf(tls, x, ts+27574, 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+27516, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27582, 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+27524, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27590, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27528, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27594, 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)
 	}
@@ -125703,7 +125765,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+27541, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27607, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -125712,7 +125774,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27563, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27629, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -125720,7 +125782,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26696, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -125731,7 +125793,7 @@ __5:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __7
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
 __7:
 	;
 __6:
@@ -125756,7 +125818,7 @@ __9:
 	if !(rc != 0) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	goto geopolyInit_fail
 __10:
 	;
@@ -125947,7 +126009,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 + 16267
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16286
 		(*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
@@ -125957,7 +126019,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 + 27567
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27633
 		(*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
@@ -125965,7 +126027,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 + 27573
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27639
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -126077,7 +126139,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27582, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27648, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -126209,14 +126271,14 @@ geopoly_update_end:
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
 	_ = pVtab
 	_ = nArg
-	if Xsqlite3_stricmp(tls, zName, ts+27622) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27688) == 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+27638) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27704) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -126281,7 +126343,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+27653, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27719, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -126293,25 +126355,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{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},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27727},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27740},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27753},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27766},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27704},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27778},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27688},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27801},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27815},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27828},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27842},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27858},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27804},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27870},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -126321,26 +126383,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27823, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27889, 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+27833, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27899, 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+27844, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27910, -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+27567, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27633, 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+27855, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27921, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -126394,7 +126456,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+25143, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25209, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -126721,7 +126783,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+27865, -1)
+		Xsqlite3_result_error(tls, context, ts+27931, -1)
 		return
 	}
 
@@ -126732,7 +126794,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+27865, -1)
+			Xsqlite3_result_error(tls, context, ts+27931, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -126745,7 +126807,7 @@ func prepareAndCollectError(tls *libc.TLS, db uintptr, ppStmt uintptr, pzErrmsg
 
 	var rc int32 = Xsqlite3_prepare_v2(tls, db, zSql, -1, ppStmt, uintptr(0))
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 		*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	}
 	return rc
@@ -126757,7 +126819,7 @@ func resetAndCollectError(tls *libc.TLS, pStmt uintptr, pzErrmsg uintptr) int32
 
 	var rc int32 = Xsqlite3_reset(tls, pStmt)
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
 	}
 	return rc
 }
@@ -126833,7 +126895,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+27886, uintptr(0), uintptr(0), p+64)
+				ts+27952, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -126897,7 +126959,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+25056, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25122, 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++ {
 				}
@@ -126918,16 +126980,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+28057, libc.VaList(bp, func() uintptr {
+			ts+28123, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28207
+					return ts + 28273
 				}
-				return ts + 1554
+				return ts + 1573
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28248)
+			ts+28314)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -127025,7 +127087,7 @@ func rbuFinalize(tls *libc.TLS, p uintptr, pStmt uintptr) {
 	var rc int32 = Xsqlite3_finalize(tls, pStmt)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && rc != SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 	}
 }
 
@@ -127043,7 +127105,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+28373, libc.VaList(bp, zTab)))
+			ts+28439, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -127061,7 +127123,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+28492, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28558, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -127079,7 +127141,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28513, libc.VaList(bp+16, zIdx)))
+			ts+28579, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -127102,7 +127164,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+28564, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28630, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -127148,7 +127210,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+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28651, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -127163,7 +127225,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+28613, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28679, 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 {
@@ -127203,7 +127265,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+19489, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19555, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -127213,18 +127275,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+28642, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28708, 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+28661, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28727, 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+28666, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28732, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -127236,18 +127298,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+28676, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28742, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28705
+							return ts + 28771
 						}
-						return ts + 28718
+						return ts + 28784
 					}()))
 		}
 
 		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+28727, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28793, 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)
@@ -127261,7 +127323,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+28749,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28815,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -127304,12 +127366,12 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	defer tls.Free(24)
 
 	var zList uintptr = uintptr(0)
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	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+28776, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14614
+		zList = rbuMPrintf(tls, p, ts+28842, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14633
 	}
 	return zList
 }
@@ -127320,13 +127382,13 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 
 	var iPk int32 = 1
 	var zRet uintptr = uintptr(0)
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	for 1 != 0 {
 		var i int32
 		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+28785, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28851, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -127348,25 +127410,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+28798, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28864, 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+28830, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28896, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		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)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+28919)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28925, ts+28932, ts+4976)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+1573)
 
 		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+28874,
+					ts+28940,
 					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+28916, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28982, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -127403,12 +127465,12 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	zVector = uintptr(0)
 	zRet = uintptr(0)
 	bFailed = 0
-	zSep = ts + 1554
+	zSep = ts + 1573
 	iCol = 0
 	*(*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+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28679, 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
@@ -127443,7 +127505,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 28936
+	zCol = ts + 29002
 __7:
 	;
 	goto __5
@@ -127451,13 +127513,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28944,
+	zLhs = rbuMPrintf(tls, p, ts+29010,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28965,
+	zOrder = rbuMPrintf(tls, p, ts+29031,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+29001,
+	zSelect = rbuMPrintf(tls, p, ts+29067,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14614
+	zSep = ts + 14633
 	iCol++
 	goto __1
 __2:
@@ -127475,12 +127537,12 @@ __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+29028,
+		Xsqlite3_mprintf(tls, ts+29094,
 			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
 	}
-	zSep = ts + 1554
+	zSep = ts + 1573
 	iCol = 0
 __14:
 	if !(iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnCol) {
@@ -127502,8 +127564,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14614
+	zVector = rbuMPrintf(tls, p, ts+29142, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14633
 	goto __15
 __15:
 	iCol++
@@ -127514,7 +127576,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29083, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29149, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -127541,13 +127603,13 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 	var zImpPK uintptr = uintptr(0)
 	var zWhere uintptr = uintptr(0)
 	var nBind int32 = 0
-	var zCom uintptr = ts + 1554
-	var zAnd uintptr = ts + 1554
+	var zCom uintptr = ts + 1573
+	var zAnd uintptr = ts + 1573
 	*(*uintptr)(unsafe.Pointer(bp + 200)) = uintptr(0)
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -127559,9 +127621,9 @@ 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+29095, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29161, 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
+			zType = ts + 1573
 		} else {
 			if iCid < 0 {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK {
@@ -127571,37 +127633,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 + 28936
+					zCol = ts + 29002
 				} else {
-					zCol = ts + 28666
+					zCol = ts + 28732
 				}
-				zType = ts + 1119
+				zType = ts + 1138
 			} 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+29117, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29183, 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 + 28853
+					return ts + 28919
 				}
-				return ts + 1554
+				return ts + 1573
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29137,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29203,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29158,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29224,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29191, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29257, 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 + 14614
-		zAnd = ts + 21525
+		zCom = ts + 14633
+		zAnd = ts + 21591
 		nBind++
 	}
 
@@ -127635,16 +127697,16 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 
 	var zList uintptr = uintptr(0)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
-		var zS uintptr = ts + 1554
+		var zS uintptr = ts + 1573
 		var i int32
 		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+29215, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29281, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29227, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29293, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14614
+			zS = ts + 14633
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -127652,7 +127714,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+29236, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29302, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -127664,27 +127726,27 @@ 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+29251, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29317, 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 zSep uintptr = ts + 1573
 		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+29265, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21525
+				zList = rbuMPrintf(tls, p, ts+29331, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21591
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29277, libc.VaList(bp+40, zList))
+			ts+29343, libc.VaList(bp+40, zList))
 
 	} else {
-		var zSep uintptr = ts + 1554
+		var zSep uintptr = ts + 1573
 		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 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29327, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21525
+				zList = rbuMPrintf(tls, p, ts+29393, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21591
 			}
 		}
 	}
@@ -127693,7 +127755,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+29340, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29406, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -127707,21 +127769,21 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 		if int32(libc.Xstrlen(tls, zMask)) != (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 			rbuBadControlError(tls, p)
 		} else {
-			var zSep uintptr = ts + 1554
+			var zSep uintptr = ts + 1573
 			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+29327,
+					zList = rbuMPrintf(tls, p, ts+29393,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14614
+					zSep = ts + 14633
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29366,
+					zList = rbuMPrintf(tls, p, ts+29432,
 						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 + 14614
+					zSep = ts + 14633
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29396,
+					zList = rbuMPrintf(tls, p, ts+29462,
 						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 + 14614
+					zSep = ts + 14633
 				}
 			}
 		}
@@ -127756,19 +127818,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 + 29433
+		var zSep uintptr = ts + 29499
 		*(*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+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28651, 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+16155) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16174) == 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+28613, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -127780,15 +127842,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 + 28853
+					zDesc = ts + 28919
 				} else {
-					zDesc = ts + 1554
+					zDesc = ts + 1573
 				}
-				z = rbuMPrintf(tls, p, ts+29446, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14614
+				z = rbuMPrintf(tls, p, ts+29512, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14633
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29457, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29523, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -127803,12 +127865,12 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		*(*uintptr)(unsafe.Pointer(bp + 168)) = uintptr(0)
 		var zIdx uintptr = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
-		var zComma uintptr = ts + 1554
+		var zComma uintptr = ts + 1573
 		var zCols uintptr = uintptr(0)
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29461)
+			ts+29527)
 		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))) {
@@ -127817,7 +127879,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+28613, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -127827,25 +127889,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+29511, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29577, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29533, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29599, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28853
+						return ts + 28919
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
-				zComma = ts + 14614
+				zComma = ts + 14633
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29543, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29609, 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+6441, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29558,
+			ts+29624,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 0))
 	}
 }
 
@@ -127855,50 +127917,50 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
 		var tnum int32 = (*RbuObjIter)(unsafe.Pointer(pIter)).FiTnum
-		var zComma uintptr = ts + 1554
+		var zComma uintptr = ts + 1573
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
-			var zPk uintptr = ts + 1554
+			var zPk uintptr = ts + 1573
 			var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCol)*8))
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, (*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 + 29620
+				zPk = ts + 29686
 			}
-			zSql = rbuMPrintf(tls, p, ts+29633,
+			zSql = rbuMPrintf(tls, p, ts+29699,
 				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 + 29660
+							return ts + 29726
 						}
-						return ts + 1554
+						return ts + 1573
 					}()))
-			zComma = ts + 14614
+			zComma = ts + 14633
 		}
 
 		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+29670, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29736, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		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,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29743,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29709
+						return ts + 29775
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 0))
 	}
 }
 
@@ -127911,7 +127973,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+29724,
+				ts+29790,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -127948,7 +128010,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+29781)
+			ts+29847)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -128053,7 +128115,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+29847, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29913, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -128073,24 +128135,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+6441, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29867,
+				ts+29933,
 				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+6441, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 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+29932, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29998, 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+29968, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+30034, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -128106,7 +128168,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30002,
+						ts+30068,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -128114,31 +128176,31 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 30063
+											return ts + 30129
 										}
-										return ts + 30067
+										return ts + 30133
 									}()
 								}
-								return ts + 1554
+								return ts + 1573
 							}(), zStart,
 							zCollist, zLimit))
 					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+30073,
+						ts+30139,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30134,
+						ts+30200,
 						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 + 30063
+									return ts + 30129
 								}
-								return ts + 30067
+								return ts + 30133
 							}(),
 							zCollist, zLimit))
 				}
@@ -128163,8 +128225,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+6452)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6448)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6471)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6467)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -128173,52 +128235,52 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			rbuCreateImposterTable2(tls, p, pIter)
 			zWrite = func() uintptr {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
-					return ts + 1554
+					return ts + 1573
 				}
-				return ts + 30293
+				return ts + 30359
 			}()
 
 			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+30302,
+						ts+30368,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30338
+								return ts + 30404
 							}
-							return ts + 1554
+							return ts + 1573
 						}(), zBindings)))
 			}
 
 			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+30348, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30414, 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
+				var zRbuRowid uintptr = ts + 1573
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30376
+					zRbuRowid = ts + 30442
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30388, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30454, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30464
+							return ts + 30530
 						}
-						return ts + 1554
+						return ts + 1573
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30481,
+					ts+30547,
 					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+30780,
+						ts+30846,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -128226,14 +128288,14 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-				var zRbuRowid uintptr = ts + 1554
+				var zRbuRowid uintptr = ts + 1573
 				var zStart uintptr = uintptr(0)
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30879
+						zRbuRowid = ts + 30945
 					} else {
-						zRbuRowid = ts + 30889
+						zRbuRowid = ts + 30955
 					}
 				}
 
@@ -128246,35 +128308,35 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28936, 0)
+						zOrder = rbuMPrintf(tls, p, ts+29002, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+1573)
 					}
 				}
 
 				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+30900,
+							ts+30966,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30948
+										return ts + 31014
 									}
-									return ts + 1554
+									return ts + 1573
 								}(),
 								zRbuRowid,
 								(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 									if zStart != 0 {
 										return zStart
 									}
-									return ts + 1554
+									return ts + 1573
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 22859
+										return ts + 22925
 									}
-									return ts + 1554
+									return ts + 1573
 								}(), zOrder,
 								zLimit)))
 				}
@@ -128337,12 +128399,12 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 		(*RbuObjIter)(unsafe.Pointer(pIter)).FpRbuUpdate = pUp
 
 		if zSet != 0 {
-			var zPrefix uintptr = ts + 1554
+			var zPrefix uintptr = ts + 1573
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30293
+				zPrefix = ts + 30359
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30954,
+			zUpdate = Xsqlite3_mprintf(tls, ts+31020,
 				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)
@@ -128369,7 +128431,7 @@ func rbuOpenDbhandle(tls *libc.TLS, p uintptr, zName uintptr, bUseVfs int32) uin
 			return uintptr(0)
 		}())
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
 			Xsqlite3_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 			*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 		}
@@ -128401,7 +128463,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+30984, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+31050, 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:
@@ -128471,28 +128533,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+6441, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460, 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+6441)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31014, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31080, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		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))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31108, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.Xmemcpy(tls, p+48, ts+3305, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+6441, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+6460, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31060, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31126, 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+6441, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -128525,11 +128587,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+31126, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31192, 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+24206, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24272, (*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)))) == '?' {
@@ -128541,16 +128603,16 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31158,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441),
+			zTarget = Xsqlite3_mprintf(tls, ts+31224,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460),
 					func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1554
+							return ts + 1573
 						}
-						return ts + 31190
+						return ts + 31256
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1554
+							return ts + 1573
 						}
 						return zExtra
 					}()))
@@ -128566,37 +128628,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+31192, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31258, -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+31207, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31273, 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+31224, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31290, -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+6441, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31306, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 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+31268, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31334, 0)
 	}
 }
 
@@ -128625,14 +128687,14 @@ 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+31240, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31306, 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+31286, uintptr(0), uintptr(0), uintptr(0))
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31352, uintptr(0), uintptr(0), uintptr(0))
 		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
@@ -128741,7 +128803,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+6441, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6460, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -128758,23 +128820,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+31321, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31387, 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+6441)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460)
 	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+6441)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31353, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31412, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31419, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -128891,7 +128953,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+23844, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23910, 0)
 			return
 		}
 
@@ -128984,7 +129046,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+31360)
+			ts+31426)
 		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)
@@ -128992,7 +129054,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+31382, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31448, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -129013,7 +129075,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+31409,
+				ts+31475,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -129043,9 +129105,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+31567, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31633, 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+31582,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31648,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -129059,10 +129121,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+31602, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31668, 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+31627)
+			ts+31693)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -129076,12 +129138,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+31735)
+			ts+31801)
 	}
 
 	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+31800)
+			ts+31866)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -129093,7 +129155,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+31844, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31910, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -129113,15 +129175,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+17240)
-					rbuCopyPragma(tls, p, ts+16351)
+					rbuCopyPragma(tls, p, ts+17259)
+					rbuCopyPragma(tls, p, ts+16370)
 				}
 
 				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+31869, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31935, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -129145,10 +129207,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+14518, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, 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+14518, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -129243,7 +129305,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+31897, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31963, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -129259,10 +129321,10 @@ func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31346, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31412, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 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)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
@@ -129276,7 +129338,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+31922, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31988, 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)
@@ -129310,7 +129372,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+31933, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31999, 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 {
@@ -129340,13 +129402,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+32005, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32071, 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+32019)
+				ts+32085)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -129357,7 +129419,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+32076)
+				ts+32142)
 			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)
@@ -129402,7 +129464,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			libc.Xmemcpy(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, zRbu, nRbu+uint64(1))
 			pCsr += uintptr(nRbu + uint64(1))
 			if zState != 0 {
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3663, libc.VaList(bp, zState))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3682, libc.VaList(bp, zState))
 			}
 
 			rbuOpenDatabase(tls, p, uintptr(0), bp+16)
@@ -129431,7 +129493,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+32150, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32216, 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
@@ -129449,12 +129511,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+32182,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32248,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32214
+							return ts + 32280
 						}
-						return ts + 32221
+						return ts + 32287
 					}()))
 			}
 		}
@@ -129462,7 +129524,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+14503, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14522, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -129473,19 +129535,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+16954)
-						rbuCopyPragma(tls, p, ts+16366)
+						rbuCopyPragma(tls, p, ts+16973)
+						rbuCopyPragma(tls, p, ts+16385)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32228, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32294, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6460, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32244, uintptr(0), uintptr(0), p+64)
+								db, ts+32310, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -129539,7 +129601,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+32268, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32334, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -129566,7 +129628,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+30293, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30359, 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++
@@ -129583,7 +129645,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+14518, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -129596,13 +129658,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+14518, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, 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+32276, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32342, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -129697,7 +129759,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+14518, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -129714,19 +129776,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+14518, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14503
+				zBegin = ts + 14522
 			} else {
-				zBegin = ts + 32228
+				zBegin = ts + 32294
 			}
 			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+32228, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32294, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -130072,7 +130134,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+32303, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32369, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -130097,7 +130159,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+32326, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32392, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -130242,7 +130304,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+6441)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6460)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -130257,7 +130319,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+32337, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32403, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -130502,6 +130564,970 @@ func Xsqlite3rbu_temp_size(tls *libc.TLS, pRbu uintptr) Sqlite3_int64 {
 	return (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FszTemp
 }
 
+var zDbstatSchema = *(*[258]int8)(unsafe.Pointer(ts + 32414))
+
+// Forward reference to data structured used in this module
+type StatTable1 = struct {
+	Fbase        Sqlite3_vtab
+	Fdb          uintptr
+	FiDb         int32
+	F__ccgo_pad1 [4]byte
+}
+
+// Forward reference to data structured used in this module
+type StatTable = StatTable1
+type StatCursor1 = struct {
+	Fbase        Sqlite3_vtab_cursor
+	FpStmt       uintptr
+	FisEof       U8
+	FisAgg       U8
+	F__ccgo_pad1 [2]byte
+	FiDb         int32
+	FaPage       [32]StatPage
+	FiPage       int32
+	FiPageno     U32
+	FzName       uintptr
+	FzPath       uintptr
+	FzPagetype   uintptr
+	FnPage       int32
+	FnCell       int32
+	FnMxPayload  int32
+	F__ccgo_pad2 [4]byte
+	FnUnused     I64
+	FnPayload    I64
+	FiOffset     I64
+	FszPage      I64
+}
+
+type StatCursor = StatCursor1
+type StatPage1 = struct {
+	FiPgno         U32
+	F__ccgo_pad1   [4]byte
+	FaPg           uintptr
+	FiCell         int32
+	F__ccgo_pad2   [4]byte
+	FzPath         uintptr
+	Fflags         U8
+	F__ccgo_pad3   [3]byte
+	FnCell         int32
+	FnUnused       int32
+	F__ccgo_pad4   [4]byte
+	FaCell         uintptr
+	FiRightChildPg U32
+	FnMxPayload    int32
+}
+
+type StatPage = StatPage1
+type StatCell1 = struct {
+	FnLocal      int32
+	FiChildPg    U32
+	FnOvfl       int32
+	F__ccgo_pad1 [4]byte
+	FaOvfl       uintptr
+	FnLastOvfl   int32
+	FiOvfl       int32
+}
+
+type StatCell = StatCell1
+
+func statConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var pTab uintptr = uintptr(0)
+	var rc int32 = SQLITE_OK
+	var iDb int32
+	_ = pAux
+
+	if argc >= 4 {
+		Xsqlite3TokenInit(tls, bp+8, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
+		iDb = Xsqlite3FindDb(tls, db, bp+8)
+		if iDb < 0 {
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+11890, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
+			return SQLITE_ERROR
+		}
+	} else {
+		iDb = 0
+	}
+	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_DIRECTONLY, 0)
+	rc = Xsqlite3_declare_vtab(tls, db, uintptr(unsafe.Pointer(&zDbstatSchema)))
+	if rc == SQLITE_OK {
+		pTab = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatTable{})))
+		if pTab == uintptr(0) {
+			rc = SQLITE_NOMEM
+		}
+	}
+
+	if rc == SQLITE_OK {
+		libc.Xmemset(tls, pTab, 0, uint64(unsafe.Sizeof(StatTable{})))
+		(*StatTable)(unsafe.Pointer(pTab)).Fdb = db
+		(*StatTable)(unsafe.Pointer(pTab)).FiDb = iDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
+	return rc
+}
+
+func statDisconnect(tls *libc.TLS, pVtab uintptr) int32 {
+	Xsqlite3_free(tls, pVtab)
+	return SQLITE_OK
+}
+
+func statBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
+	var i int32
+	var iSchema int32 = -1
+	var iName int32 = -1
+	var iAgg int32 = -1
+	_ = tab
+
+	for i = 0; i < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; i++ {
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fop) != SQLITE_INDEX_CONSTRAINT_EQ {
+			continue
+		}
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fusable) == 0 {
+			return SQLITE_CONSTRAINT
+		}
+		switch (*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(i)*12)).FiColumn {
+		case 0:
+			{
+				iName = i
+				break
+
+			}
+		case 10:
+			{
+				iSchema = i
+				break
+
+			}
+		case 11:
+			{
+				iAgg = i
+				break
+
+			}
+		}
+	}
+	i = 0
+	if iSchema >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).Fomit = uint8(1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x01
+	}
+	if iName >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iName)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x02
+	}
+	if iAgg >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iAgg)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x04
+	}
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 1.0
+
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy == 1 &&
+		(*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)).FnOrderBy == 2 &&
+		(*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_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).FiColumn == 1 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x08
+	}
+
+	return SQLITE_OK
+}
+
+func statOpen(tls *libc.TLS, pVTab uintptr, ppCursor uintptr) int32 {
+	var pTab uintptr = pVTab
+	var pCsr uintptr
+
+	pCsr = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatCursor{})))
+	if pCsr == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		libc.Xmemset(tls, pCsr, 0, uint64(unsafe.Sizeof(StatCursor{})))
+		(*StatCursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab = pVTab
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppCursor)) = pCsr
+	return SQLITE_OK
+}
+
+func statClearCells(tls *libc.TLS, p uintptr) {
+	var i int32
+	if (*StatPage)(unsafe.Pointer(p)).FaCell != 0 {
+		for i = 0; i < (*StatPage)(unsafe.Pointer(p)).FnCell; i++ {
+			Xsqlite3_free(tls, (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell+uintptr(i)*32)).FaOvfl)
+		}
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FaCell)
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnCell = 0
+	(*StatPage)(unsafe.Pointer(p)).FaCell = uintptr(0)
+}
+
+func statClearPage(tls *libc.TLS, p uintptr) {
+	var aPg uintptr = (*StatPage)(unsafe.Pointer(p)).FaPg
+	statClearCells(tls, p)
+	Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FzPath)
+	libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(StatPage{})))
+	(*StatPage)(unsafe.Pointer(p)).FaPg = aPg
+}
+
+func statResetCsr(tls *libc.TLS, pCsr uintptr) {
+	var i int32
+
+	for i = 0; i < int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{}))); i++ {
+		statClearPage(tls, pCsr+24+uintptr(i)*64)
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(pCsr+24+uintptr(i)*64)).FaPg)
+		(*StatPage)(unsafe.Pointer(pCsr + 24 + uintptr(i)*64)).FaPg = uintptr(0)
+	}
+	Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(0)
+}
+
+func statResetCounts(tls *libc.TLS, pCsr uintptr) {
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnCell = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnUnused = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPayload = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FszPage = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 0
+}
+
+func statClose(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	Xsqlite3_free(tls, pCsr)
+	return SQLITE_OK
+}
+
+func getLocalPayload(tls *libc.TLS, nUsable int32, flags U8, nTotal int32) int32 {
+	var nLocal int32
+	var nMinLocal int32
+	var nMaxLocal int32
+
+	if int32(flags) == 0x0D {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = nUsable - 35
+	} else {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = (nUsable-12)*64/255 - 23
+	}
+
+	nLocal = nMinLocal + (nTotal-nMinLocal)%(nUsable-4)
+	if nLocal > nMaxLocal {
+		nLocal = nMinLocal
+	}
+	return nLocal
+}
+
+func statDecodePage(tls *libc.TLS, pBt uintptr, p uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var nUnused int32
+	var iOff int32
+	var nHdr int32
+	var isLeaf int32
+	var szPage int32
+	var aData uintptr
+	var aHdr uintptr
+	var iNext int32
+
+	var rc int32
+	var iPrev U32
+
+	var j int32
+	var nOvfl int32
+
+	var nLocal int32
+	var pCell uintptr
+	var i int32
+	var nUsable int32
+	aData = (*StatPage)(unsafe.Pointer(p)).FaPg
+	aHdr = aData + uintptr(func() int32 {
+		if (*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1) {
+			return 100
+		}
+		return 0
+	}())
+
+	(*StatPage)(unsafe.Pointer(p)).Fflags = *(*U8)(unsafe.Pointer(aHdr))
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0A || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __1
+	}
+	isLeaf = 1
+	nHdr = 8
+	goto __2
+__1:
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05 || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x02) {
+		goto __3
+	}
+	isLeaf = 0
+	nHdr = 12
+	goto __4
+__3:
+	goto statPageIsCorrupt
+__4:
+	;
+__2:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1)) {
+		goto __5
+	}
+	nHdr = nHdr + 100
+__5:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnCell = int32(*(*U8)(unsafe.Pointer(aHdr + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 3 + 1)))
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = 0
+	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
+
+	nUnused = int32(*(*U8)(unsafe.Pointer(aHdr + 5)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 5 + 1))) - nHdr - 2*(*StatPage)(unsafe.Pointer(p)).FnCell
+	nUnused = nUnused + int32(*(*U8)(unsafe.Pointer(aHdr + 7)))
+	iOff = int32(*(*U8)(unsafe.Pointer(aHdr + 1)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 1 + 1)))
+__6:
+	if !(iOff != 0) {
+		goto __7
+	}
+	if !(iOff >= szPage) {
+		goto __8
+	}
+	goto statPageIsCorrupt
+__8:
+	;
+	nUnused = nUnused + (int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2) + 1))))
+	iNext = int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff) + 1)))
+	if !(iNext < iOff+4 && iNext > 0) {
+		goto __9
+	}
+	goto statPageIsCorrupt
+__9:
+	;
+	iOff = iNext
+	goto __6
+__7:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnUnused = nUnused
+	(*StatPage)(unsafe.Pointer(p)).FiRightChildPg = func() uint32 {
+		if isLeaf != 0 {
+			return uint32(0)
+		}
+		return Xsqlite3Get4byte(tls, aHdr+8)
+	}()
+
+	if !((*StatPage)(unsafe.Pointer(p)).FnCell != 0) {
+		goto __10
+	}
+
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = szPage - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatPage)(unsafe.Pointer(p)).FaCell = Xsqlite3_malloc64(tls, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+	if !((*StatPage)(unsafe.Pointer(p)).FaCell == uintptr(0)) {
+		goto __11
+	}
+	return SQLITE_NOMEM
+__11:
+	;
+	libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+
+	i = 0
+__12:
+	if !(i < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __14
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr(i)*32
+
+	iOff = int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2) + 1)))
+	if !(iOff < nHdr || iOff >= szPage) {
+		goto __15
+	}
+	goto statPageIsCorrupt
+__15:
+	;
+	if !!(isLeaf != 0) {
+		goto __16
+	}
+	(*StatCell)(unsafe.Pointer(pCell)).FiChildPg = Xsqlite3Get4byte(tls, aData+uintptr(iOff))
+	iOff = iOff + 4
+__16:
+	;
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05) {
+		goto __17
+	}
+
+	goto __18
+__17:
+	iOff = iOff + int32(func() uint8 {
+		if int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff)))) < int32(U8(0x80)) {
+			return uint8(func() int32 {
+				*(*U32)(unsafe.Pointer(bp)) = U32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))
+				return 1
+			}())
+		}
+		return Xsqlite3GetVarint32(tls, aData+uintptr(iOff), bp)
+	}())
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __19
+	}
+	iOff = iOff + int32(Xsqlite3GetVarint(tls, aData+uintptr(iOff), bp+8))
+__19:
+	;
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32((*StatPage)(unsafe.Pointer(p)).FnMxPayload)) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = int32(*(*U32)(unsafe.Pointer(bp)))
+__20:
+	;
+	nLocal = getLocalPayload(tls, nUsable, (*StatPage)(unsafe.Pointer(p)).Fflags, int32(*(*U32)(unsafe.Pointer(bp))))
+	if !(nLocal < 0) {
+		goto __21
+	}
+	goto statPageIsCorrupt
+__21:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLocal = nLocal
+
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32(nLocal)) {
+		goto __22
+	}
+	nOvfl = int32((*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) + U32(nUsable) - U32(4) - U32(1)) / U32(nUsable-4))
+	if !(iOff+nLocal+4 > nUsable || *(*U32)(unsafe.Pointer(bp)) > U32(0x7fffffff)) {
+		goto __23
+	}
+	goto statPageIsCorrupt
+__23:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl = int32(*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) - U32((nOvfl-1)*(nUsable-4)))
+	(*StatCell)(unsafe.Pointer(pCell)).FnOvfl = nOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FaOvfl = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(U32(0)))*uint64(nOvfl))
+	if !((*StatCell)(unsafe.Pointer(pCell)).FaOvfl == uintptr(0)) {
+		goto __24
+	}
+	return SQLITE_NOMEM
+__24:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl)) = Xsqlite3Get4byte(tls, aData+uintptr(iOff+nLocal))
+	j = 1
+__25:
+	if !(j < nOvfl) {
+		goto __27
+	}
+	iPrev = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j-1)*4))
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPrev, bp+16, 0)
+	if !(rc != SQLITE_OK) {
+		goto __28
+	}
+
+	return rc
+__28:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j)*4)) = Xsqlite3Get4byte(tls, Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 16))))
+	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
+	goto __26
+__26:
+	j++
+	goto __25
+	goto __27
+__27:
+	;
+__22:
+	;
+__18:
+	;
+	goto __13
+__13:
+	i++
+	goto __12
+	goto __14
+__14:
+	;
+__10:
+	;
+	return SQLITE_OK
+
+statPageIsCorrupt:
+	(*StatPage)(unsafe.Pointer(p)).Fflags = U8(0)
+	statClearCells(tls, p)
+	return SQLITE_OK
+}
+
+func statSizeAndOffset(tls *libc.TLS, pCsr uintptr) {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCsr)).FpVtab
+	var pBt uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatTable)(unsafe.Pointer(pTab)).FiDb)*32)).FpBt
+	var pPager uintptr = Xsqlite3BtreePager(tls, pBt)
+	var fd uintptr
+
+	fd = Xsqlite3PagerFile(tls, pPager)
+	*(*Sqlite3_int64)(unsafe.Pointer(bp)) = Sqlite3_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	if Xsqlite3OsFileControl(tls, fd, 230440, bp) == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = *(*Sqlite3_int64)(unsafe.Pointer(bp))
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += *(*Sqlite3_int64)(unsafe.Pointer(bp + 1*8))
+	} else {
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += I64(Xsqlite3BtreeGetPageSize(tls, pBt))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = (*StatCursor)(unsafe.Pointer(pCsr)).FszPage * I64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno-U32(1))
+	}
+}
+
+func statGetPage(tls *libc.TLS, pBt uintptr, iPg U32, pPg uintptr) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var pgsz int32 = Xsqlite3BtreeGetPageSize(tls, pBt)
+	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
+	var rc int32
+
+	if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+		(*StatPage)(unsafe.Pointer(pPg)).FaPg = Xsqlite3_malloc(tls, pgsz+DBSTAT_PAGE_PADDING_BYTES)
+		if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+			return SQLITE_NOMEM
+		}
+		libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0, uint64(DBSTAT_PAGE_PADDING_BYTES))
+	}
+
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPg, bp, 0)
+	if rc == SQLITE_OK {
+		var a uintptr = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		libc.Xmemcpy(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, a, uint64(pgsz))
+		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+	}
+
+	return rc
+}
+
+func statNext(tls *libc.TLS, pCursor uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
+	var rc int32
+	var nPayload int32
+	var z uintptr
+	var pCsr uintptr
+	var pTab uintptr
+	var pBt uintptr
+	var pPager uintptr
+
+	var iRoot U32
+	var nUsable int32
+	var iOvfl int32
+	var pCell uintptr
+
+	var p uintptr
+	var i int32
+	var p1 uintptr
+	pCsr = pCursor
+	pTab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	pBt = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FpBt
+	pPager = Xsqlite3BtreePager(tls, pBt)
+
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+
+statNextRestart:
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __1
+	}
+
+	statResetCounts(tls, pCsr)
+	rc = Xsqlite3_step(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	if !(rc == SQLITE_ROW) {
+		goto __3
+	}
+	iRoot = U32(Xsqlite3_column_int64(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 1))
+	Xsqlite3PagerPagecount(tls, pPager, bp+48)
+	if !(*(*int32)(unsafe.Pointer(bp + 48)) == 0) {
+		goto __5
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__5:
+	;
+	rc = statGetPage(tls, pBt, iRoot, pCsr+24)
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiPgno = iRoot
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __6
+	}
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32672, 0))
+	if !(z == uintptr(0)) {
+		goto __7
+	}
+	rc = SQLITE_NOMEM
+__7:
+	;
+__6:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 1
+	goto __4
+__3:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__4:
+	;
+	goto __2
+__1:
+	p = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __8
+	}
+	statResetCounts(tls, pCsr)
+__8:
+	;
+__9:
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __10
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32
+__11:
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl) {
+		goto __12
+	}
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = Xsqlite3BtreeGetPageSize(tls, pBt) - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	statSizeAndOffset(tls, pCsr)
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl-1) {
+		goto __13
+	}
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nUsable - 4)
+	goto __14
+__13:
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64((*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64(nUsable - 4 - (*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+__14:
+	;
+	iOvfl = (*StatCell)(unsafe.Pointer(pCell)).FiOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FiOvfl++
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __15
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(iOvfl)*4))
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32674
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls,
+		ts+32683, libc.VaList(bp, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell, iOvfl)))
+	if z == uintptr(0) {
+		return SQLITE_NOMEM
+	}
+	return SQLITE_OK
+__15:
+	;
+	goto __11
+__12:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiRightChildPg != 0) {
+		goto __16
+	}
+	goto __10
+__16:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+	goto __9
+__10:
+	;
+	if !(!(int32((*StatPage)(unsafe.Pointer(p)).FiRightChildPg) != 0) || (*StatPage)(unsafe.Pointer(p)).FiCell > (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __17
+	}
+	statClearPage(tls, p)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage--
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 && (*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __18
+	}
+
+	return SQLITE_OK
+__18:
+	;
+	goto statNextRestart
+__17:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage++
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage >= int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{})))) {
+		goto __19
+	}
+	statResetCsr(tls, pCsr)
+	return Xsqlite3CorruptError(tls, 215455)
+__19:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell == (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatPage)(unsafe.Pointer(p)).FiRightChildPg
+	goto __21
+__20:
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32)).FiChildPg
+__21:
+	;
+	rc = statGetPage(tls, pBt, (*StatPage)(unsafe.Pointer(p+1*64)).FiPgno, p+1*64)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __22
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32695, libc.VaList(bp+24, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell)))
+	if !(z == uintptr(0)) {
+		goto __23
+	}
+	rc = SQLITE_NOMEM
+__23:
+	;
+__22:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+__2:
+	;
+	if !(rc == SQLITE_OK) {
+		goto __24
+	}
+	p1 = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = (*StatPage)(unsafe.Pointer(p1)).FiPgno
+
+	rc = statDecodePage(tls, pBt, p1)
+	if !(rc == SQLITE_OK) {
+		goto __25
+	}
+	statSizeAndOffset(tls, pCsr)
+
+	switch int32((*StatPage)(unsafe.Pointer(p1)).Fflags) {
+	case 0x05:
+		goto __27
+	case 0x02:
+		goto __28
+	case 0x0D:
+		goto __29
+	case 0x0A:
+		goto __30
+	default:
+		goto __31
+	}
+	goto __26
+__27:
+__28:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32703
+	goto __26
+__29:
+__30:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32712
+	goto __26
+__31:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32717
+	goto __26
+__26:
+	;
+	*(*int32)(unsafe.Pointer(pCsr + 2108)) += (*StatPage)(unsafe.Pointer(p1)).FnCell
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64((*StatPage)(unsafe.Pointer(p1)).FnUnused)
+	if !((*StatPage)(unsafe.Pointer(p1)).FnMxPayload > (*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload) {
+		goto __32
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = (*StatPage)(unsafe.Pointer(p1)).FnMxPayload
+__32:
+	;
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __33
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+40, (*StatPage)(unsafe.Pointer(p1)).FzPath)))
+	if !(z == uintptr(0)) {
+		goto __34
+	}
+	rc = SQLITE_NOMEM
+__34:
+	;
+__33:
+	;
+	nPayload = 0
+	i = 0
+__35:
+	if !(i < (*StatPage)(unsafe.Pointer(p1)).FnCell) {
+		goto __37
+	}
+	nPayload = nPayload + (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p1)).FaCell+uintptr(i)*32)).FnLocal
+	goto __36
+__36:
+	i++
+	goto __35
+	goto __37
+__37:
+	;
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nPayload)
+
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0) {
+		goto __38
+	}
+	goto statNextRestart
+__38:
+	;
+__25:
+	;
+__24:
+	;
+	return rc
+}
+
+func statEof(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	return int32((*StatCursor)(unsafe.Pointer(pCsr)).FisEof)
+}
+
+func statFilter(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintptr, argc int32, argv uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pCsr uintptr = pCursor
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	var pSql uintptr
+	var zSql uintptr
+	var iArg int32 = 0
+	var rc int32 = SQLITE_OK
+	var zName uintptr = uintptr(0)
+	_ = argc
+	_ = idxStr
+
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FpStmt = uintptr(0)
+	if idxNum&0x01 != 0 {
+		var zDbase uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = Xsqlite3FindDbName(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zDbase)
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FiDb < 0 {
+			(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = 0
+			(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+			return SQLITE_OK
+		}
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+	if idxNum&0x02 != 0 {
+		zName = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+	}
+	if idxNum&0x04 != 0 {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(libc.Bool32(Xsqlite3_value_double(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8))) != 0.0))
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(0)
+	}
+	pSql = Xsqlite3_str_new(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb)
+	Xsqlite3_str_appendf(tls, pSql,
+		ts+32727,
+		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb+uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FzDbSName))
+	if zName != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32882, libc.VaList(bp+8, zName))
+	}
+	if idxNum&0x08 != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32896, 0)
+	}
+	zSql = Xsqlite3_str_finish(tls, pSql)
+	if zSql == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		rc = Xsqlite3_prepare_v2(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
+		Xsqlite3_free(tls, zSql)
+	}
+
+	if rc == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = -1
+		rc = statNext(tls, pCursor)
+	}
+	return rc
+}
+
+func statColumn(tls *libc.TLS, pCursor uintptr, ctx uintptr, i int32) int32 {
+	var pCsr uintptr = pCursor
+	switch i {
+	case 0:
+		Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzName, -1, libc.UintptrFromInt32(-1))
+		break
+	case 1:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath, -1, libc.UintptrFromInt32(-1))
+		}
+		break
+	case 2:
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnPage))
+		} else {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno))
+		}
+		break
+	case 3:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype, -1, uintptr(0))
+		}
+		break
+	case 4:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnCell))
+		break
+	case 5:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnPayload)
+		break
+	case 6:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnUnused)
+		break
+	case 7:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload))
+		break
+	case 8:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FiOffset)
+		}
+		break
+	case 9:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FszPage)
+		break
+	case 10:
+		{
+			var db uintptr = Xsqlite3_context_db_handle(tls, ctx)
+			var iDb int32 = (*StatCursor)(unsafe.Pointer(pCsr)).FiDb
+			Xsqlite3_result_text(tls, ctx, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, -1, uintptr(0))
+			break
+
+		}
+	default:
+		{
+			Xsqlite3_result_int(tls, ctx, int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg))
+			break
+
+		}
+	}
+	return SQLITE_OK
+}
+
+func statRowid(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32 {
+	var pCsr uintptr = pCursor
+	*(*Sqlite_int64)(unsafe.Pointer(pRowid)) = Sqlite_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	return SQLITE_OK
+}
+
+// Invoke this routine to register the "dbstat" virtual table module
+func Xsqlite3DbstatRegister(tls *libc.TLS, db uintptr) int32 {
+	return Xsqlite3_create_module(tls, db, ts+32911, uintptr(unsafe.Pointer(&dbstat_module)), uintptr(0))
+}
+
+var dbstat_module = Sqlite3_module{
+	FxCreate:     0,
+	FxConnect:    0,
+	FxBestIndex:  0,
+	FxDisconnect: 0,
+	FxDestroy:    0,
+	FxOpen:       0,
+	FxClose:      0,
+	FxFilter:     0,
+	FxNext:       0,
+	FxEof:        0,
+	FxColumn:     0,
+	FxRowid:      0,
+}
+
 type SessionTable1 = struct {
 	FpNext    uintptr
 	FzName    uintptr
@@ -131082,13 +132108,13 @@ 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+11348, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11367, 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+32348, 0)
+				ts+32918, 0)
 		} else if rc == SQLITE_ERROR {
-			zPragma = Xsqlite3_mprintf(tls, ts+1554, 0)
+			zPragma = Xsqlite3_mprintf(tls, ts+1573, 0)
 		} else {
 			*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
 			*(*uintptr)(unsafe.Pointer(pabPK)) = uintptr(0)
@@ -131099,7 +132125,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32469, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+33039, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -131197,7 +132223,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11348, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11367, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -131446,7 +132472,7 @@ __4:
 	goto error_out
 __7:
 	;
-	Xsqlite3ValueSetStr(tls, p, 0, ts+1554, uint8(0), uintptr(0))
+	Xsqlite3ValueSetStr(tls, p, 0, ts+1573, uint8(0), uintptr(0))
 	(*Sqlite3_session)(unsafe.Pointer(pSession)).FpZeroBlob = p
 __6:
 	;
@@ -131774,14 +132800,14 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	var zRet uintptr = uintptr(0)
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32498,
+			zRet = Xsqlite3_mprintf(tls, ts+33068,
 				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 + 21525
+			zSep = ts + 21591
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131796,7 +132822,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	var zRet uintptr = uintptr(0)
 	var bHave int32 = 0
 
@@ -131804,9 +132830,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+32532,
+				ts+33102,
 				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 + 32573
+			zSep = ts + 33143
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131814,7 +132840,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7530, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7538, 0)
 	}
 
 	return zRet
@@ -131825,7 +132851,7 @@ func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintpt
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32578,
+		ts+33148,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -131868,7 +132894,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32656,
+			ts+33226,
 			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
@@ -131995,7 +133021,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32709, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33279, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -132260,7 +133286,7 @@ func sessionAppendInteger(tls *libc.TLS, p uintptr, iVal int32, pRc uintptr) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
-	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]int8{}))-uint64(1)), bp+8, ts+4975, libc.VaList(bp, iVal))
+	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]int8{}))-uint64(1)), bp+8, ts+4994, libc.VaList(bp, iVal))
 	sessionAppendStr(tls, p, bp+8, pRc)
 }
 
@@ -132469,29 +133495,29 @@ 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+11348, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11367, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32736, libc.VaList(bp, zDb))
+			ts+33306, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
 	} else {
 		var i int32
-		var zSep uintptr = ts + 1554
+		var zSep uintptr = ts + 1573
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32846, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33416, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
-		sessionAppendStr(tls, bp+8, ts+1567, bp+24)
+		sessionAppendStr(tls, bp+8, ts+1586, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+32861, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33431, 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+32869, bp+24)
+				sessionAppendStr(tls, bp+8, ts+33439, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21525
+				zSep = ts + 21591
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -132600,7 +133626,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+32875, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33445, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -132692,7 +133718,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32895, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33465, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -132955,7 +133981,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, 219078)
+				rc = Xsqlite3CorruptError(tls, 219169)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -132978,7 +134004,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, 219098)
+						rc = Xsqlite3CorruptError(tls, 219189)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -133020,7 +134046,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, 219152)
+			rc = Xsqlite3CorruptError(tls, 219243)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -133081,7 +134107,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, 219240)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219331)
 		}
 	}
 
@@ -133155,13 +134181,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, 219326))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219417))
 	}
 
 	(*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, 219332))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219423))
 	}
 
 	if paRec != 0 {
@@ -133223,7 +134249,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, 219376))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219467))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -133596,7 +134622,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219832)
 	goto finished_invert
 __6:
 	;
@@ -133764,45 +134790,45 @@ 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+11348) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11367) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
 			} else {
-				var zSep uintptr = ts + 1554
+				var zSep uintptr = ts + 1573
 
 				libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(SessionBuffer{})))
 				(*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+32913, bp+16)
+				sessionAppendStr(tls, bp, ts+33483, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+32926, bp+16)
+				sessionAppendStr(tls, bp, ts+33496, 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+32932, bp+16)
+						sessionAppendStr(tls, bp, ts+33502, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 14614
+						zSep = ts + 14633
 					}
 				}
 
-				zSep = ts + 1554
-				sessionAppendStr(tls, bp, ts+32861, bp+16)
+				zSep = ts + 1573
+				sessionAppendStr(tls, bp, ts+33431, 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+32937, bp+16)
+								ts+33507, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+32869, bp+16)
+							sessionAppendStr(tls, bp, ts+33439, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21525
+						zSep = ts + 21591
 					}
 				}
 
@@ -133849,42 +134875,42 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	defer tls.Free(20)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+33012, bp+16)
+	sessionAppendStr(tls, bp, ts+33582, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+32861, bp+16)
+	sessionAppendStr(tls, bp, ts+33431, 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+32932, bp+16)
+			sessionAppendStr(tls, bp, ts+33502, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21525
+			zSep = ts + 21591
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+33030, bp+16)
+		sessionAppendStr(tls, bp, ts+33600, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32573, bp+16)
+		sessionAppendStr(tls, bp, ts+33143, bp+16)
 
-		zSep = ts + 1554
+		zSep = ts + 1573
 		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+32869, bp+16)
+				sessionAppendStr(tls, bp, ts+33439, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 33038
+				zSep = ts + 33608
 			}
 		}
-		sessionAppendStr(tls, bp, ts+4957, bp+16)
+		sessionAppendStr(tls, bp, ts+4976, bp+16)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
@@ -133897,7 +134923,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+6441, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6460, 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 {
@@ -133908,21 +134934,21 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+33043, bp+16)
+	sessionAppendStr(tls, bp, ts+33613, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21531, bp+16)
+	sessionAppendStr(tls, bp, ts+21597, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14614, bp+16)
+			sessionAppendStr(tls, bp, ts+14633, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+33061, bp+16)
+	sessionAppendStr(tls, bp, ts+33631, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33072, bp+16)
+		sessionAppendStr(tls, bp, ts+33642, bp+16)
 	}
-	sessionAppendStr(tls, bp, ts+4957, bp+16)
+	sessionAppendStr(tls, bp, ts+4976, bp+16)
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v2(tls, db, (*SessionBuffer)(unsafe.Pointer(bp)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp)).FnBuf, p+16, uintptr(0))
@@ -133936,14 +134962,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+11348, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11367, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+33076)
+			ts+33646)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33189)
+			ts+33759)
 	}
 	return rc
 }
@@ -133971,7 +134997,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, 220219)
+				rc = Xsqlite3CorruptError(tls, 220310)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -134224,7 +135250,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+33333, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33903, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -134240,7 +135266,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+33354, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33924, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -134313,10 +135339,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+33373, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33943, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33399, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33969, 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))
@@ -134349,7 +135375,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				f func(*libc.TLS, uintptr, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xFilter})).f(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 176))))
 			if schemaMismatch != 0 {
-				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
+				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
 				if *(*uintptr)(unsafe.Pointer(bp + 200)) == uintptr(0) {
 					rc = SQLITE_NOMEM
 					break
@@ -134362,7 +135388,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+6441, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6460, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -134375,19 +135401,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+33429, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33999, 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+33473,
+						ts+34043,
 						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+33544, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+34114, 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+11348) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11367) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -134438,14 +135464,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33604, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34174, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34204, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33658, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34228, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34204, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -135693,7 +136719,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33686, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+34256, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135981,7 +137007,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33714, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+34284, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -136168,7 +137194,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+33745, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34315, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -136236,7 +137262,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33752
+		var zErr uintptr = ts + 34322
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -136395,7 +137421,7 @@ func fts5ValueToText(tls *libc.TLS, pVal uintptr) uintptr {
 	if zRet != 0 {
 		return zRet
 	}
-	return ts + 1554
+	return ts + 1573
 }
 
 func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, nVal int32, apVal uintptr) {
@@ -136418,7 +137444,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33802
+		var zErr uintptr = ts + 34372
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -136742,13 +137768,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33850, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34420, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33858, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34428, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33868, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34438, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -137159,7 +138185,7 @@ func fts5ConfigSkipLiteral(tls *libc.TLS, pIn uintptr) uintptr {
 	case 'n':
 		fallthrough
 	case 'N':
-		if Xsqlite3_strnicmp(tls, ts+6181, p, 4) == 0 {
+		if Xsqlite3_strnicmp(tls, ts+6200, p, 4) == 0 {
 			p = p + 4
 		} else {
 			p = uintptr(0)
@@ -137299,7 +138325,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+33873, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34443, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -137326,14 +138352,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+33880, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34450, 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+33911, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+34481, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -137344,7 +138370,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33944, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34514, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -137357,7 +138383,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33981, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34551, 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)))
@@ -137366,7 +138392,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+33990, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34560, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -137385,7 +138411,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34023, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34593, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -137400,14 +138426,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34057, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34627, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34065, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34635, 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+34097, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34667, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -137415,9 +138441,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34103, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34673, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34117, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34687, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -137425,9 +138451,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34155, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34725, 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+34166, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34736, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -137435,21 +138461,21 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+5075, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+5094, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 8026, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17345},
-			{FzName: ts + 34201, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8045, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17364},
+			{FzName: ts + 34771, 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+34209, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34779, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34240, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34810, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -137496,15 +138522,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+22191) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16267) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34268, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22257) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16286) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34838, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34298) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34868) {
 			*(*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+34308, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34878, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -137521,13 +138547,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+34339, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34909, 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+34344, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34914, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34351, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34921, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -137565,8 +138591,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+22191) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34359, 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+22257) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34929, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -137598,7 +138624,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+34388, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34958, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -137607,13 +138633,13 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 							if *(*uintptr)(unsafe.Pointer(bp + 48)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 48))
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						func() uintptr {
 							if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 64))
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						pzErr)
 				} else {
@@ -137635,19 +138661,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 + 34057
+			zTail = ts + 34627
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34408
+			zTail = ts + 34978
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34416, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34986, 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+16267, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16286, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -137691,18 +138717,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+34427, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34997, 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 + 1573
 			}
-			return ts + 14614
+			return ts + 14633
 		}()
-		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+35013, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34450,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22191))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35020,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22257))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -137812,7 +138838,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34476) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35046) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -137822,7 +138848,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+34481) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35051) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -137832,7 +138858,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+34490) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35060) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -137845,7 +138871,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+34500) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35070) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -137855,7 +138881,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+34510) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35080) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -137871,7 +138897,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+22191) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22257) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -137894,7 +138920,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34522
+	var zSelect uintptr = ts + 35092
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -137916,7 +138942,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+34554) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35124) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -137930,7 +138956,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+34562,
+				ts+35132,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -138028,7 +139054,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34627, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+35197, 0)
 					return FTS5_EOF
 				}
 			}
@@ -138041,20 +139067,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+34647, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+35217, 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+34678, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35248, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34681, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35251, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30063, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30129, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -139832,9 +140858,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+34685, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35255, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33714, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+34284, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -139850,7 +140876,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+34690, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+35260, 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')
@@ -139937,7 +140963,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20528, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20594, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -140018,7 +141044,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+34719, 0)
+			ts+35289, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -140188,12 +141214,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+34772,
+								ts+35342,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34822
+										return ts + 35392
 									}
-									return ts + 34685
+									return ts + 35255
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -141136,7 +142162,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+34829, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35399, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -141215,7 +142241,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+34835,
+			ts+35405,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -141240,7 +142266,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+34886,
+			ts+35456,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -141263,7 +142289,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+34935,
+			ts+35505,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -141502,7 +142528,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+34975, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+35545, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -142701,7 +143727,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+34998,
+			ts+35568,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -143894,7 +144920,7 @@ func fts5WriteFlushBtree(tls *libc.TLS, p uintptr, pWriter uintptr) {
 			if (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn > 0 {
 				return (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fp
 			}
-			return ts + 1554
+			return ts + 1573
 		}()
 
 		Xsqlite3_bind_blob(tls, (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter, 2, z, (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn, uintptr(0))
@@ -144167,7 +145193,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+35082,
+			ts+35652,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -145233,7 +146259,7 @@ func sqlite3Fts5IndexReinit(tls *libc.TLS, p uintptr) int32 {
 	fts5StructureInvalidate(tls, p)
 	fts5IndexDiscardData(tls, p)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Fts5Structure{})))
-	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1554, 0)
+	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1573, 0)
 	fts5StructureWrite(tls, p, bp)
 	return fts5IndexReturn(tls, p)
 }
@@ -145249,13 +146275,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+35139, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35709, 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+25056, ts+35147, 0, pzErr)
+				pConfig, ts+25122, ts+35717, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11488,
-					ts+35182,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11507,
+					ts+35752,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -145508,7 +146534,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+34829, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+35399, 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)))
@@ -145622,7 +146648,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35226,
+		ts+35796,
 		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))) {
@@ -145792,7 +146818,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+35312)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35882)
 			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))
@@ -146063,7 +147089,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+35317, 0)
+			ts+35887, 0)
 		return SQLITE_ERROR
 	}
 
@@ -146094,7 +147120,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 				} else if iCol >= 0 {
 					bSeenMatch = 1
 					*(*int8)(unsafe.Pointer(idxStr + uintptr(libc.PostIncInt32(&iIdxStr, 1)))) = int8('M')
-					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4975, libc.VaList(bp, iCol))
+					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4994, libc.VaList(bp, iCol))
 					idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 
 				}
@@ -146109,7 +147135,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 					}
 					return int8('G')
 				}()
-				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4975, libc.VaList(bp+8, iCol))
+				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4994, libc.VaList(bp+8, iCol))
 				idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 				(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pInfo)).FaConstraintUsage + uintptr(i)*8)).FargvIndex = libc.PreIncInt32(&iCons, 1)
 
@@ -146423,7 +147449,7 @@ func fts5NextMethod(tls *libc.TLS, pCursor uintptr) int32 {
 					rc = Xsqlite3_reset(tls, (*Fts5Cursor)(unsafe.Pointer(pCsr)).FpStmt)
 					if rc != SQLITE_OK {
 						(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-							ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+							ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 					}
 				} else {
 					rc = SQLITE_OK
@@ -146455,7 +147481,7 @@ func fts5PrepareStatement(tls *libc.TLS, ppStmt uintptr, pConfig uintptr, zFmt u
 		rc = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
 			uint32(SQLITE_PREPARE_PERSISTENT), bp+8, uintptr(0))
 		if rc != SQLITE_OK {
-			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 		}
 		Xsqlite3_free(tls, zSql)
 	}
@@ -146487,25 +147513,25 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35356,
+		ts+35926,
 		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 + 14614
+					return ts + 14633
 				}
-				return ts + 1554
+				return ts + 1573
 			}(),
 			func() uintptr {
 				if zRankArgs != 0 {
 					return zRankArgs
 				}
-				return ts + 1554
+				return ts + 1573
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35411
+					return ts + 35981
 				}
-				return ts + 35416
+				return ts + 35986
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -146551,12 +147577,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+35420, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35990, 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) {
+	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5076, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35426, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35996, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -146587,7 +147613,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+35454, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36024, 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,
@@ -146618,7 +147644,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+35464, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36034, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -146650,14 +147676,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+35485, libc.VaList(bp, z))
+				ts+36055, 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 + 33868
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34438
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -146713,7 +147739,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+35317, 0)
+		ts+35887, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -146756,7 +147782,7 @@ __8:
 	if !(zText == uintptr(0)) {
 		goto __14
 	}
-	zText = ts + 1554
+	zText = ts + 1573
 __14:
 	;
 	iCol = 0
@@ -146930,7 +147956,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35518, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+36088, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -147051,7 +148077,7 @@ func fts5SeekCursor(tls *libc.TLS, pCsr uintptr, bErrormsg int32) int32 {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			} else if (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg != 0 {
 				*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-					ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
+					ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
 			}
 		}
 	}
@@ -147075,28 +148101,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+35554, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36124, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35565, 0)
+				ts+36135, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36215, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35653, 0)
+				ts+36223, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16934, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16953, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35709, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36279, 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+35715, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36285, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -147154,7 +148180,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+17479, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17498, 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)))
@@ -147167,12 +148193,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+35731,
+				ts+36301,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20429
+						return ts + 20495
 					}
-					return ts + 35768
+					return ts + 36338
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -147802,7 +148828,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+35780, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36350, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -148046,7 +149072,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+35801, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36371, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -148065,7 +149091,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+35823, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36393, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -148112,7 +149138,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+35854)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36424)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -148121,7 +149147,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+35867, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+36437, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -148135,7 +149161,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35958, ts + 34057, ts + 25056, ts + 34408, ts + 11488,
+	ts + 36528, ts + 34627, ts + 25122, ts + 34978, ts + 11507,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -148159,7 +149185,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+35965, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+36535, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -148177,13 +149203,13 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35965, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36535, 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+35970, 0,
+				db, ts+36540, 0,
 				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
 				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
@@ -148240,17 +149266,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 + 35985,
-			ts + 36053,
-			ts + 36122,
-			ts + 36155,
-			ts + 36194,
-			ts + 36234,
-			ts + 36273,
-			ts + 36314,
-			ts + 36353,
-			ts + 36395,
-			ts + 36435,
+			ts + 36555,
+			ts + 36623,
+			ts + 36692,
+			ts + 36725,
+			ts + 36764,
+			ts + 36804,
+			ts + 36843,
+			ts + 36884,
+			ts + 36923,
+			ts + 36965,
+			ts + 37005,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -148317,7 +149343,7 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 			(*Fts5Config)(unsafe.Pointer((*Fts5Storage)(unsafe.Pointer(p)).FpConfig)).FbLock--
 			Xsqlite3_free(tls, zSql)
 			if rc != SQLITE_OK && pzErrMsg != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
 			}
 		}
 	}
@@ -148352,18 +149378,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+36458,
+		ts+37028,
 		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+36562,
+			ts+37132,
 			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+36600,
+			ts+37170,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -148375,7 +149401,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+36638,
+			ts+37208,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -148387,14 +149413,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+25056, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11488, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35958, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25122, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11507, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+36528, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34408, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34978, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34057, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34627, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -148406,17 +149432,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+36680,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37250,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29709
+					return ts + 29775
 				}
-				return ts + 1554
+				return ts + 1573
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36710,
+			ts+37280,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -148453,27 +149479,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36754, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37324, 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+36777, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37347, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34057, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34627, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34408, ts+36783, 0, pzErr)
+				pConfig, ts+34978, ts+37353, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35958, ts+36815, 1, pzErr)
+				pConfig, ts+36528, ts+37385, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35124, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -148679,12 +149705,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+36832,
+		ts+37402,
 		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+36882,
+			ts+37452,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -148692,7 +149718,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+34554, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35124, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -148868,7 +149894,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36911,
+	zSql = Xsqlite3_mprintf(tls, ts+37481,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -149050,14 +150076,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+34057, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34627, 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+34408, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34978, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -149252,9 +150278,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+36943) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37513) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37524) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -149469,7 +150495,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 + 36965
+			var zCat uintptr = ts + 37535
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -149481,7 +150507,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+36974) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37544) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -149492,18 +150518,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+36985) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37555) {
 					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+36943) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37513) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37524) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36974) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37544) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -149779,7 +150805,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 + 37003
+	var zBase uintptr = ts + 37573
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -149921,7 +150947,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+37013, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37583, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149929,11 +150955,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37586, 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+37021, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37591, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149941,7 +150967,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37026, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37596, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149949,7 +150975,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37029, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37599, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149957,11 +150983,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37602, 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+37037, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37607, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149969,19 +150995,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37042, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37612, 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+37046, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37616, 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+37052, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37622, 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+37057, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37627, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149989,11 +151015,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37631, 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+37065, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37635, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -150001,7 +151027,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37638, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150009,11 +151035,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37642, 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+37076, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37646, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150021,7 +151047,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37080, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37650, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150029,7 +151055,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37654, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150037,7 +151063,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37088, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37658, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150053,24 +151079,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+37092, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37072, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37662, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37642, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37665, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37668, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37672, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37658, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -150085,137 +151111,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+37105, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37675, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37113, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37683, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37120, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37690, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37125, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37695, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37021, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37591, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37130, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37700, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37016, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37586, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37705, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37088, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37658, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37140, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37710, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15480, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15499, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37145, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37715, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37098, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37668, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37149, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37719, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 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+37724, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37057, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37627, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37160, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37730, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37164, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37734, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37166, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37736, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37080, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37650, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37172, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37742, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37088, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37658, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37180, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37750, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37186, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37756, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37191, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37761, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37197, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37767, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37084, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37654, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37205, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37775, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37213, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37783, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37217, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37787, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37080, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37650, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37225, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37795, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37231, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37801, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37084, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37654, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37237, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37807, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37098, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37668, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -150230,16 +151256,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+37244, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37814, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37029, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37599, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37249, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37819, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -150247,21 +151273,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37254, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37824, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37599, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37260, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37830, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37599, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37213, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37783, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150269,7 +151295,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37266, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37836, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -150277,9 +151303,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37272, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37842, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -150294,12 +151320,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+37278, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37848, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37282, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37852, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37285, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37855, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -150308,7 +151334,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37288, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37858, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -150464,7 +151490,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+37292) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37862) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -150644,22 +151670,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 37003, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37573, 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 + 37307, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37877, 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 + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37883, 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 + 37320, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37890, 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
@@ -151802,14 +152828,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+37328) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37898) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37332) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37902) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37336) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37906) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37345, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37915, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -151835,19 +152861,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 + 37379,
-		ts + 37419,
-		ts + 37454,
+		ts + 37949,
+		ts + 37989,
+		ts + 38024,
 	}
 
 	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+23352, *(*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+23418, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37497, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38067, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -151980,11 +153006,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+37530, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+38100, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37561,
+		ts+38131,
 		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))
@@ -152008,7 +153034,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+37612, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38182, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -152292,7 +153318,7 @@ func fts5VocabFilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, zUnused
 		if pLe != 0 {
 			var zCopy uintptr = Xsqlite3_value_text(tls, pLe)
 			if zCopy == uintptr(0) {
-				zCopy = ts + 1554
+				zCopy = ts + 1573
 			}
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm = Xsqlite3_value_bytes(tls, pLe)
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FzLeTerm = Xsqlite3_malloc(tls, (*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm+1)
@@ -152403,7 +153429,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+37638, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+38208, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -152425,7 +153451,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 + 37648
+	return ts + 38218
 }
 
 func init() {
@@ -152851,6 +153877,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1056)) = noopStepFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1064)) = uintptr(unsafe.Pointer(&lagName))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&attach_func)) + 24)) = attachFunc
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 8)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 16)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 24)) = statBestIndex
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 32)) = statDisconnect
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 40)) = statDisconnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 48)) = statOpen
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 56)) = statClose
+	*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 64)) = statFilter
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 72)) = statNext
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 80)) = statEof
+	*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 88)) = statColumn
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 96)) = statRowid
 	*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 0)) = sqlite3MemMalloc
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 8)) = sqlite3MemFree
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 16)) = sqlite3MemRealloc
@@ -153383,8 +154421,9 @@ func init() {
 	*(*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
-	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = Xsqlite3JsonTableFunctions
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = Xsqlite3DbstatRegister
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = sqlite3TestExtInit
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 32)) = Xsqlite3JsonTableFunctions
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statGetFuncdef)) + 24)) = statGet
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statInitFuncdef)) + 24)) = statInit
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statPushFuncdef)) + 24)) = statPush
@@ -153402,5 +154441,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-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 ts1 = "3.41.2\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_DBSTAT_VTAB\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\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\x00true\x00false\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 \x00rowid not at end-of-record for row \x00 of 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\x00CREATE TABLE x( name       TEXT, path       TEXT, pageno     INTEGER, pagetype   TEXT, ncell      INTEGER, payload    INTEGER, unused     INTEGER, mx_payload INTEGER, pgoffset   INTEGER, pgsize     INTEGER, schema     TEXT HIDDEN, aggregate  BOOLEAN HIDDEN)\x00/\x00overflow\x00%s%.3x+%.6x\x00%s%.3x/\x00internal\x00leaf\x00corrupted\x00SELECT * FROM (SELECT 'sqlite_schema' AS name,1 AS rootpage,'table' AS type UNION ALL SELECT name,rootpage,type FROM \"%w\".sqlite_schema WHERE rootpage!=0)\x00WHERE name=%Q\x00 ORDER BY name\x00dbstat\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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 fed30522..0fd5d94f 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -208,6 +208,7 @@ const (
 	DBFLAG_SchemaKnownOk                  = 0x0010
 	DBFLAG_Vacuum                         = 0x0004
 	DBFLAG_VacuumInto                     = 0x0008
+	DBSTAT_PAGE_PADDING_BYTES             = 256
 	DB_ResetWanted                        = 0x0008
 	DB_SchemaLoaded                       = 0x0001
 	DB_UnresetViews                       = 0x0002
@@ -893,11 +894,11 @@ const (
 	NC_OrderAgg                           = 0x8000000
 	NC_PartIdx                            = 0x000002
 	NC_SelfRef                            = 0x00002e
+	NC_Subquery                           = 0x000040
 	NC_UAggInfo                           = 0x000100
 	NC_UBaseReg                           = 0x000400
 	NC_UEList                             = 0x000080
 	NC_UUpsert                            = 0x000200
-	NC_VarSelect                          = 0x000040
 	NDEBUG                                = 1
 	NN                                    = 1
 	NOT_WITHIN                            = 0
@@ -1738,6 +1739,7 @@ const (
 	SQLITE_ECEL_REF                       = 0x04
 	SQLITE_EMPTY                          = 16
 	SQLITE_ENABLE_COLUMN_METADATA         = 1
+	SQLITE_ENABLE_DBSTAT_VTAB             = 1
 	SQLITE_ENABLE_FTS5                    = 1
 	SQLITE_ENABLE_GEOPOLY                 = 1
 	SQLITE_ENABLE_LOCKING_STYLE           = 0
@@ -2139,7 +2141,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
+	SQLITE_SOURCE_ID                      = "2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2247,8 +2249,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.41.0"
-	SQLITE_VERSION_NUMBER                 = 3041000
+	SQLITE_VERSION                        = "3.41.2"
+	SQLITE_VERSION_NUMBER                 = 3041002
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -6062,7 +6064,8 @@ type IndexedExpr1 = struct {
 	FiIdxCur       int32
 	FiIdxCol       int32
 	FbMaybeNullRow U8
-	F__ccgo_pad1   [3]byte
+	Faff           U8
+	F__ccgo_pad1   [2]byte
 	FpIENext       uintptr
 }
 
@@ -6691,17 +6694,18 @@ type Pager = Pager1
 
 // Handle type for pages.
 type PgHdr2 = struct {
-	FpPage      uintptr
-	FpData      uintptr
-	FpExtra     uintptr
-	FpCache     uintptr
-	FpDirty     uintptr
-	FpPager     uintptr
-	Fpgno       Pgno
-	Fflags      U16
-	FnRef       I16
-	FpDirtyNext uintptr
-	FpDirtyPrev uintptr
+	FpPage       uintptr
+	FpData       uintptr
+	FpExtra      uintptr
+	FpCache      uintptr
+	FpDirty      uintptr
+	FpPager      uintptr
+	Fpgno        Pgno
+	Fflags       U16
+	F__ccgo_pad1 [2]byte
+	FnRef        I64
+	FpDirtyNext  uintptr
+	FpDirtyPrev  uintptr
 }
 
 // Handle type for pages.
@@ -6914,14 +6918,15 @@ type PCache2 = struct {
 	FpDirty      uintptr
 	FpDirtyTail  uintptr
 	FpSynced     uintptr
-	FnRefSum     int32
+	F__ccgo_pad1 [4]byte
+	FnRefSum     I64
 	FszCache     int32
 	FszSpill     int32
 	FszPage      int32
 	FszExtra     int32
 	FbPurgeable  U8
 	FeCreate     U8
-	F__ccgo_pad1 [2]byte
+	F__ccgo_pad2 [2]byte
 	FxStress     uintptr
 	FpStress     uintptr
 	FpCache      uintptr
@@ -7170,7 +7175,7 @@ type CoveringIndexCheck1 = struct {
 	F__ccgo_pad1 [2]byte
 }
 
-var sqlite3azCompileOpt = [52]uintptr{
+var sqlite3azCompileOpt = [53]uintptr{
 	ts + 7,
 	ts + 27,
 	ts + 56,
@@ -7189,40 +7194,41 @@ var sqlite3azCompileOpt = [52]uintptr{
 	ts + 372,
 	ts + 397,
 	ts + 420,
-	ts + 432,
-	ts + 447,
-	ts + 469,
-	ts + 494,
-	ts + 517,
-	ts + 539,
-	ts + 550,
-	ts + 563,
-	ts + 578,
-	ts + 594,
-	ts + 607,
-	ts + 628,
-	ts + 652,
-	ts + 675,
-	ts + 691,
-	ts + 707,
-	ts + 731,
-	ts + 758,
-	ts + 778,
-	ts + 799,
-	ts + 821,
-	ts + 851,
-	ts + 876,
-	ts + 902,
-	ts + 922,
-	ts + 948,
-	ts + 971,
-	ts + 997,
-	ts + 1019,
-	ts + 1040,
-	ts + 1051,
+	ts + 439,
+	ts + 451,
+	ts + 466,
+	ts + 488,
+	ts + 513,
+	ts + 536,
+	ts + 558,
+	ts + 569,
+	ts + 582,
+	ts + 597,
+	ts + 613,
+	ts + 626,
+	ts + 647,
+	ts + 671,
+	ts + 694,
+	ts + 710,
+	ts + 726,
+	ts + 750,
+	ts + 777,
+	ts + 797,
+	ts + 818,
+	ts + 840,
+	ts + 870,
+	ts + 895,
+	ts + 921,
+	ts + 941,
+	ts + 967,
+	ts + 990,
+	ts + 1016,
+	ts + 1038,
 	ts + 1059,
-	ts + 1073,
-	ts + 1086,
+	ts + 1070,
+	ts + 1078,
+	ts + 1092,
+	ts + 1105,
 }
 
 func Xsqlite3CompileOptions(tls *libc.TLS, pnOpt uintptr) uintptr {
@@ -7374,7 +7380,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 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))
+var Xsqlite3StrBINARY = *(*[7]uint8)(unsafe.Pointer(ts + 1118))
 
 // Standard typenames.  These names must match the COLTYPE_* definitions.
 // Adjust the SQLITE_N_STDTYPE value if adding or removing entries.
@@ -7396,12 +7402,12 @@ var Xsqlite3StdTypeAffinity = [6]uint8{
 	uint8(SQLITE_AFF_TEXT),
 }
 var Xsqlite3StdType = [6]uintptr{
-	ts + 1106,
-	ts + 1110,
-	ts + 1115,
-	ts + 1119,
-	ts + 1127,
-	ts + 1132,
+	ts + 1125,
+	ts + 1129,
+	ts + 1134,
+	ts + 1138,
+	ts + 1146,
+	ts + 1151,
 }
 
 // SQL is translated into a sequence of instructions to be
@@ -7718,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, 23229)
+		return Xsqlite3MisuseError(tls, 23233)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -8143,7 +8149,7 @@ __6:
 __4:
 	;
 	zDate++
-	if !(getDigits(tls, zDate, ts+1137, libc.VaList(bp, bp+16, bp+20)) != 2) {
+	if !(getDigits(tls, zDate, ts+1156, libc.VaList(bp, bp+16, bp+20)) != 2) {
 		goto __9
 	}
 	return 1
@@ -8169,13 +8175,13 @@ func parseHhMmSs(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	defer tls.Free(36)
 
 	var ms float64 = 0.0
-	if getDigits(tls, zDate, ts+1145, libc.VaList(bp, bp+24, bp+28)) != 2 {
+	if getDigits(tls, zDate, ts+1164, libc.VaList(bp, bp+24, bp+28)) != 2 {
 		return 1
 	}
 	zDate += uintptr(5)
 	if int32(*(*uint8)(unsafe.Pointer(zDate))) == ':' {
 		zDate++
-		if getDigits(tls, zDate, ts+1153, libc.VaList(bp+16, bp+32)) != 1 {
+		if getDigits(tls, zDate, ts+1172, libc.VaList(bp+16, bp+32)) != 1 {
 			return 1
 		}
 		zDate += uintptr(2)
@@ -8273,7 +8279,7 @@ func parseYyyyMmDd(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	} else {
 		neg = 0
 	}
-	if getDigits(tls, zDate, ts+1157, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
+	if getDigits(tls, zDate, ts+1176, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
 		return 1
 	}
 	zDate += uintptr(10)
@@ -8330,7 +8336,7 @@ func parseDateOrTime(tls *libc.TLS, context uintptr, zDate uintptr, p uintptr) i
 		return 0
 	} else if parseHhMmSs(tls, zDate, p) == 0 {
 		return 0
-	} else if Xsqlite3StrICmp(tls, zDate, ts+1169) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
+	} else if Xsqlite3StrICmp(tls, zDate, ts+1188) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
 		return setDateTimeToCurrent(tls, context, p)
 	} else if Xsqlite3AtoF(tls, zDate, bp, Xsqlite3Strlen30(tls, zDate), uint8(SQLITE_UTF8)) > 0 {
 		setRawDateNumber(tls, p, *(*float64)(unsafe.Pointer(bp)))
@@ -8463,7 +8469,7 @@ func toLocaltime(tls *libc.TLS, p uintptr, pCtx uintptr) int32 {
 		*(*Time_t)(unsafe.Pointer(bp + 96)) = Time_t((*DateTime)(unsafe.Pointer(p)).FiJD/int64(1000) - int64(21086676)*int64(10000))
 	}
 	if osLocaltime(tls, bp+96, bp) != 0 {
-		Xsqlite3_result_error(tls, pCtx, ts+1173, -1)
+		Xsqlite3_result_error(tls, pCtx, ts+1192, -1)
 		return SQLITE_ERROR
 	}
 	(*DateTime)(unsafe.Pointer(p)).FY = (*tm)(unsafe.Pointer(bp)).Ftm_year + 1900 - iYearDiff
@@ -8487,12 +8493,12 @@ var aXformType = [6]struct {
 	FrLimit float32
 	FrXform float32
 }{
-	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1196)), FrLimit: 4.6427e+14, FrXform: 1.0},
-	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1203)), FrLimit: 7.7379e+12, FrXform: 60.0},
-	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1210)), FrLimit: 1.2897e+11, FrXform: 3600.0},
-	{FnName: U8(3), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1217)), FrLimit: 5373485.0, FrXform: 86400.0},
-	{FnName: U8(5), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1224)), FrLimit: 176546.0, FrXform: 2592000.0},
-	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1231)), FrLimit: 14713.0, FrXform: 31536000.0},
+	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1215)), FrLimit: 4.6427e+14, FrXform: 1.0},
+	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1222)), FrLimit: 7.7379e+12, FrXform: 60.0},
+	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1229)), FrLimit: 1.2897e+11, FrXform: 3600.0},
+	{FnName: U8(3), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1236)), FrLimit: 5373485.0, FrXform: 86400.0},
+	{FnName: U8(5), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1243)), FrLimit: 176546.0, FrXform: 2592000.0},
+	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1250)), FrLimit: 14713.0, FrXform: 31536000.0},
 }
 
 func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, idx int32) int32 {
@@ -8504,7 +8510,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 	switch int32(Xsqlite3UpperToLower[*(*uint8)(unsafe.Pointer(z))]) {
 	case 'a':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1238) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1257) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8526,7 +8532,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'j':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1243) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1262) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8540,7 +8546,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'l':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1253) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1272) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				rc = toLocaltime(tls, p, pCtx)
 			}
 			break
@@ -8548,7 +8554,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'u':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1263) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1282) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8560,7 +8566,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					(*DateTime)(unsafe.Pointer(p)).FrawS = uint8(0)
 					rc = 0
 				}
-			} else if Xsqlite3_stricmp(tls, z, ts+1273) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1292) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				if int32((*DateTime)(unsafe.Pointer(p)).FtzSet) == 0 {
 					var iOrigJD I64
 					var iGuess I64
@@ -8594,7 +8600,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'w':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1277, 8) == 0 &&
+			if Xsqlite3_strnicmp(tls, z, ts+1296, 8) == 0 &&
 				Xsqlite3AtoF(tls, z+8, bp+48, Xsqlite3Strlen30(tls, z+8), uint8(SQLITE_UTF8)) > 0 &&
 				*(*float64)(unsafe.Pointer(bp + 48)) >= 0.0 && *(*float64)(unsafe.Pointer(bp + 48)) < 7.0 && float64(libc.AssignInt32(&n, int32(*(*float64)(unsafe.Pointer(bp + 48))))) == *(*float64)(unsafe.Pointer(bp + 48)) {
 				var Z Sqlite3_int64
@@ -8615,7 +8621,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 's':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1286, 9) != 0 {
+			if Xsqlite3_strnicmp(tls, z, ts+1305, 9) != 0 {
 				break
 			}
 			if !(int32((*DateTime)(unsafe.Pointer(p)).FvalidJD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidYMD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidHMS) != 0) {
@@ -8629,14 +8635,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 			(*DateTime)(unsafe.Pointer(p)).FrawS = uint8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidTZ = uint8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidJD = uint8(0)
-			if Xsqlite3_stricmp(tls, z, ts+1296) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1315) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1302) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1321) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FM = 1
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1307) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1326) == 0 {
 				rc = 0
 			}
 			break
@@ -8962,7 +8968,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		switch int32(*(*uint8)(unsafe.Pointer(zFmt + uintptr(i)))) {
 		case 'd':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
 				break
 
 			}
@@ -8972,13 +8978,13 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if s > 59.999 {
 					s = 59.999
 				}
-				Xsqlite3_str_appendf(tls, bp+136, ts+1316, libc.VaList(bp+8, s))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1335, libc.VaList(bp+8, s))
 				break
 
 			}
 		case 'H':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
 				break
 
 			}
@@ -8996,41 +9002,41 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if int32(*(*uint8)(unsafe.Pointer(zFmt + uintptr(i)))) == 'W' {
 					var wd int32
 					wd = int32(((*DateTime)(unsafe.Pointer(bp+88)).FiJD + int64(43200000)) / int64(86400000) % int64(7))
-					Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+24, (nDay+7-wd)/7))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+24, (nDay+7-wd)/7))
 				} else {
-					Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+32, nDay+1))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1342, libc.VaList(bp+32, nDay+1))
 				}
 				break
 
 			}
 		case 'J':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1328, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1347, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
 				break
 
 			}
 		case 'm':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
 				break
 
 			}
 		case 'M':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
 				break
 
 			}
 		case 's':
 			{
 				var iS I64 = (*DateTime)(unsafe.Pointer(bp+88)).FiJD/int64(1000) - int64(21086676)*int64(10000)
-				Xsqlite3_str_appendf(tls, bp+136, ts+1334, libc.VaList(bp+64, iS))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1353, libc.VaList(bp+64, iS))
 				break
 
 			}
 		case 'S':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
 				break
 
 			}
@@ -9043,7 +9049,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			}
 		case 'Y':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1339, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1358, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
 				break
 
 			}
@@ -9093,15 +9099,15 @@ func Xsqlite3RegisterDateTimeFunctions(tls *libc.TLS) {
 }
 
 var aDateTimeFuncs = [9]FuncDef{
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1243},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1263},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1344},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1349},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1354},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1262},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1282},
 	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1363},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1372},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1385},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1403}}
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1368},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1373},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1382},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1391},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1404},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1422}}
 
 // The following routines are convenience wrappers around methods
 // of the sqlite3_file object.  This is mostly just syntactic sugar. All
@@ -9516,7 +9522,7 @@ func sqlite3MemMalloc(tls *libc.TLS, nByte int32) uintptr {
 		*(*Sqlite3_int64)(unsafe.Pointer(p)) = Sqlite3_int64(nByte)
 		p += 8
 	} else {
-		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1416, libc.VaList(bp, nByte))
+		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1435, libc.VaList(bp, nByte))
 	}
 	return p
 }
@@ -9549,7 +9555,7 @@ func sqlite3MemRealloc(tls *libc.TLS, pPrior uintptr, nByte int32) uintptr {
 		p += 8
 	} else {
 		Xsqlite3_log(tls, SQLITE_NOMEM,
-			ts+1454,
+			ts+1473,
 			libc.VaList(bp, sqlite3MemSize(tls, pPrior), nByte))
 	}
 	return p
@@ -10426,7 +10432,7 @@ func Xsqlite3OomFault(tls *libc.TLS, db uintptr) uintptr {
 		(*Sqlite3)(unsafe.Pointer(db)).Flookaside.Fsz = U16(0)
 		if (*Sqlite3)(unsafe.Pointer(db)).FpParse != 0 {
 			var pParse uintptr
-			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1490, 0)
+			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1509, 0)
 			(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 			for pParse = (*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).FpOuterParse; pParse != 0; pParse = (*Parse)(unsafe.Pointer(pParse)).FpOuterParse {
 				(*Parse)(unsafe.Pointer(pParse)).FnErr++
@@ -10499,8 +10505,8 @@ type et_info = struct {
 // by an instance of the following structure
 type Et_info = et_info
 
-var aDigits = *(*[33]uint8)(unsafe.Pointer(ts + 1504))
-var aPrefix = *(*[7]uint8)(unsafe.Pointer(ts + 1537))
+var aDigits = *(*[33]uint8)(unsafe.Pointer(ts + 1523))
+var aPrefix = *(*[7]uint8)(unsafe.Pointer(ts + 1556))
 var fmtinfo = [23]Et_info{
 	{Ffmttype: uint8('d'), Fbase: EtByte(10), Fflags: EtByte(1), Ftype: EtByte(EtDECIMAL)},
 	{Ffmttype: uint8('s'), Fflags: EtByte(4), Ftype: EtByte(EtSTRING)},
@@ -10714,7 +10720,7 @@ __6:
 	if !(libc.AssignInt32(&c, int32(*(*uint8)(unsafe.Pointer(libc.PreIncUintptr(&fmt, 1))))) == 0) {
 		goto __11
 	}
-	Xsqlite3_str_append(tls, pAccum, ts+1544, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1563, 1)
 	goto __5
 __11:
 	;
@@ -11271,7 +11277,7 @@ __125:
 	if !(Xsqlite3IsNaN(tls, *(*float64)(unsafe.Pointer(bp + 104))) != 0) {
 		goto __127
 	}
-	bufpt = ts + 1546
+	bufpt = ts + 1565
 	length = 3
 	goto __58
 __127:
@@ -11331,7 +11337,7 @@ __138:
 	}
 	bufpt = bp + 16
 	*(*uint8)(unsafe.Pointer(bp + 16)) = prefix
-	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1550, uint32(4))
+	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1569, uint32(4))
 	length = 3 + libc.Bool32(int32(prefix) != 0)
 	goto __58
 __139:
@@ -11697,7 +11703,7 @@ __200:
 	if !(bufpt == uintptr(0)) {
 		goto __201
 	}
-	bufpt = ts + 1554
+	bufpt = ts + 1573
 	goto __202
 __201:
 	if !(int32(xtype) == EtDYNSTRING) {
@@ -11821,9 +11827,9 @@ __222:
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
-			return ts + 1555
+			return ts + 1574
 		}
-		return ts + 1560
+		return ts + 1579
 	}()
 __223:
 	;
@@ -11971,7 +11977,7 @@ __246:
 		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
-	Xsqlite3_str_append(tls, pAccum, ts+1567, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1586, 1)
 __250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
@@ -11988,10 +11994,10 @@ __251:
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
 		goto __253
 	}
-	Xsqlite3_str_appendf(tls, pAccum, ts+1569, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1588, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 	goto __254
 __253:
-	Xsqlite3_str_appendf(tls, pAccum, ts+1579, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1598, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
 __254:
 	;
 __252:
@@ -12046,7 +12052,7 @@ __4:
 __5:
 }
 
-var zOrd = *(*[9]uint8)(unsafe.Pointer(ts + 1593))
+var zOrd = *(*[9]uint8)(unsafe.Pointer(ts + 1612))
 
 // The z string points to the first character of a token that is
 // associated with an error.  If db does not already have an error
@@ -12211,7 +12217,7 @@ func Xsqlite3ResultStrAccum(tls *libc.TLS, pCtx uintptr, p uintptr) {
 	} else if int32((*StrAccum)(unsafe.Pointer(p)).FprintfFlags)&SQLITE_PRINTF_MALLOCED != 0 {
 		Xsqlite3_result_text(tls, pCtx, (*StrAccum)(unsafe.Pointer(p)).FzText, int32((*StrAccum)(unsafe.Pointer(p)).FnChar), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 	} else {
-		Xsqlite3_result_text(tls, pCtx, ts+1554, 0, uintptr(0))
+		Xsqlite3_result_text(tls, pCtx, ts+1573, 0, uintptr(0))
 		Xsqlite3_str_reset(tls, p)
 	}
 }
@@ -13937,7 +13943,7 @@ func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
 	var c int32 = 0
 	var i int32
 
-	var pow63 uintptr = ts + 1602
+	var pow63 uintptr = ts + 1621
 	for i = 0; c == 0 && i < 18; i++ {
 		c = (int32(*(*uint8)(unsafe.Pointer(zNum + uintptr(i*incr)))) - int32(*(*uint8)(unsafe.Pointer(pow63 + uintptr(i))))) * 10
 	}
@@ -14488,7 +14494,7 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 	defer tls.Free(8)
 
 	Xsqlite3_log(tls, SQLITE_MISUSE,
-		ts+1621,
+		ts+1640,
 		libc.VaList(bp, zType))
 }
 
@@ -14507,13 +14513,13 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 func Xsqlite3SafetyCheckOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	if db == uintptr(0) {
-		logBadConnection(tls, ts+1555)
+		logBadConnection(tls, ts+1574)
 		return 0
 	}
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_OPEN {
 		if Xsqlite3SafetyCheckSickOrOk(tls, db) != 0 {
-			logBadConnection(tls, ts+1666)
+			logBadConnection(tls, ts+1685)
 		}
 		return 0
 	} else {
@@ -14526,7 +14532,7 @@ func Xsqlite3SafetyCheckSickOrOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_SICK && int32(eOpenState) != SQLITE_STATE_OPEN && int32(eOpenState) != SQLITE_STATE_BUSY {
-		logBadConnection(tls, ts+1675)
+		logBadConnection(tls, ts+1694)
 		return 0
 	} else {
 		return 1
@@ -15000,193 +15006,193 @@ func Xsqlite3OpcodeName(tls *libc.TLS, i int32) uintptr {
 }
 
 var azName = [187]uintptr{
-	ts + 1683,
-	ts + 1693,
-	ts + 1704,
-	ts + 1716,
-	ts + 1727,
-	ts + 1739,
+	ts + 1702,
+	ts + 1712,
+	ts + 1723,
+	ts + 1735,
 	ts + 1746,
-	ts + 1754,
-	ts + 1762,
-	ts + 1767,
-	ts + 1772,
-	ts + 1778,
-	ts + 1792,
-	ts + 1798,
-	ts + 1808,
-	ts + 1813,
-	ts + 1818,
-	ts + 1821,
+	ts + 1758,
+	ts + 1765,
+	ts + 1773,
+	ts + 1781,
+	ts + 1786,
+	ts + 1791,
+	ts + 1797,
+	ts + 1811,
+	ts + 1817,
 	ts + 1827,
-	ts + 1834,
-	ts + 1838,
-	ts + 1848,
-	ts + 1855,
-	ts + 1862,
-	ts + 1869,
-	ts + 1876,
-	ts + 1886,
+	ts + 1832,
+	ts + 1837,
+	ts + 1840,
+	ts + 1846,
+	ts + 1853,
+	ts + 1857,
+	ts + 1867,
+	ts + 1874,
+	ts + 1881,
+	ts + 1888,
 	ts + 1895,
-	ts + 1906,
-	ts + 1915,
-	ts + 1921,
-	ts + 1931,
-	ts + 1941,
-	ts + 1946,
-	ts + 1956,
-	ts + 1967,
-	ts + 1972,
-	ts + 1979,
-	ts + 1990,
-	ts + 1995,
-	ts + 2000,
-	ts + 2006,
-	ts + 2012,
-	ts + 2018,
-	ts + 2021,
+	ts + 1905,
+	ts + 1914,
+	ts + 1925,
+	ts + 1934,
+	ts + 1940,
+	ts + 1950,
+	ts + 1960,
+	ts + 1965,
+	ts + 1975,
+	ts + 1986,
+	ts + 1991,
+	ts + 1998,
+	ts + 2009,
+	ts + 2014,
+	ts + 2019,
 	ts + 2025,
 	ts + 2031,
-	ts + 2042,
-	ts + 2053,
+	ts + 2037,
+	ts + 2040,
+	ts + 2044,
+	ts + 2050,
 	ts + 2061,
-	ts + 2070,
-	ts + 2077,
-	ts + 2085,
-	ts + 2088,
-	ts + 2091,
-	ts + 2094,
-	ts + 2097,
-	ts + 2100,
-	ts + 2103,
+	ts + 2072,
+	ts + 2080,
+	ts + 2089,
+	ts + 2096,
+	ts + 2104,
+	ts + 2107,
 	ts + 2110,
+	ts + 2113,
 	ts + 2116,
-	ts + 2126,
-	ts + 2139,
-	ts + 2150,
-	ts + 2156,
-	ts + 2163,
-	ts + 2172,
-	ts + 2181,
-	ts + 2188,
-	ts + 2201,
-	ts + 2212,
-	ts + 2217,
-	ts + 2225,
+	ts + 2119,
+	ts + 2122,
+	ts + 2129,
+	ts + 2135,
+	ts + 2145,
+	ts + 2158,
+	ts + 2169,
+	ts + 2175,
+	ts + 2182,
+	ts + 2191,
+	ts + 2200,
+	ts + 2207,
+	ts + 2220,
 	ts + 2231,
-	ts + 2238,
+	ts + 2236,
+	ts + 2244,
 	ts + 2250,
-	ts + 2255,
-	ts + 2264,
+	ts + 2257,
 	ts + 2269,
-	ts + 2278,
+	ts + 2274,
 	ts + 2283,
 	ts + 2288,
-	ts + 2294,
+	ts + 2297,
 	ts + 2302,
-	ts + 2310,
-	ts + 2320,
-	ts + 2328,
-	ts + 2335,
-	ts + 2348,
-	ts + 2353,
-	ts + 2365,
-	ts + 2373,
-	ts + 2380,
-	ts + 2391,
-	ts + 2398,
-	ts + 2405,
-	ts + 2415,
+	ts + 2307,
+	ts + 2313,
+	ts + 2321,
+	ts + 2329,
+	ts + 2339,
+	ts + 2347,
+	ts + 2354,
+	ts + 2367,
+	ts + 2372,
+	ts + 2384,
+	ts + 2392,
+	ts + 2399,
+	ts + 2410,
+	ts + 2417,
 	ts + 2424,
-	ts + 2435,
-	ts + 2441,
-	ts + 2452,
-	ts + 2462,
-	ts + 2472,
-	ts + 2479,
-	ts + 2485,
-	ts + 2495,
-	ts + 2506,
-	ts + 2510,
-	ts + 2519,
-	ts + 2528,
-	ts + 2535,
-	ts + 2545,
-	ts + 2552,
-	ts + 2561,
+	ts + 2434,
+	ts + 2443,
+	ts + 2454,
+	ts + 2460,
+	ts + 2471,
+	ts + 2481,
+	ts + 2491,
+	ts + 2498,
+	ts + 2504,
+	ts + 2514,
+	ts + 2525,
+	ts + 2529,
+	ts + 2538,
+	ts + 2547,
+	ts + 2554,
+	ts + 2564,
 	ts + 2571,
-	ts + 2578,
-	ts + 2586,
-	ts + 2600,
-	ts + 2608,
-	ts + 2622,
-	ts + 2633,
-	ts + 2646,
-	ts + 2657,
-	ts + 2663,
-	ts + 2675,
-	ts + 2684,
-	ts + 2692,
-	ts + 2701,
-	ts + 2710,
-	ts + 2717,
-	ts + 2725,
-	ts + 2732,
-	ts + 2743,
-	ts + 2757,
-	ts + 2768,
+	ts + 2580,
+	ts + 2590,
+	ts + 2597,
+	ts + 2605,
+	ts + 2619,
+	ts + 2627,
+	ts + 2641,
+	ts + 2652,
+	ts + 2665,
+	ts + 2676,
+	ts + 2682,
+	ts + 2694,
+	ts + 2703,
+	ts + 2711,
+	ts + 2720,
+	ts + 2729,
+	ts + 2736,
+	ts + 2744,
+	ts + 2751,
+	ts + 2762,
 	ts + 2776,
-	ts + 2782,
-	ts + 2790,
-	ts + 2798,
-	ts + 2808,
-	ts + 2821,
-	ts + 2831,
-	ts + 2844,
-	ts + 2853,
-	ts + 2864,
+	ts + 2787,
+	ts + 2795,
+	ts + 2801,
+	ts + 2809,
+	ts + 2817,
+	ts + 2827,
+	ts + 2840,
+	ts + 2850,
+	ts + 2863,
 	ts + 2872,
-	ts + 2878,
-	ts + 2890,
-	ts + 2902,
-	ts + 2910,
-	ts + 2922,
-	ts + 2935,
-	ts + 2945,
-	ts + 2955,
-	ts + 2960,
-	ts + 2972,
-	ts + 2984,
-	ts + 2994,
-	ts + 3000,
-	ts + 3010,
-	ts + 3017,
+	ts + 2883,
+	ts + 2891,
+	ts + 2897,
+	ts + 2909,
+	ts + 2921,
+	ts + 2929,
+	ts + 2941,
+	ts + 2954,
+	ts + 2964,
+	ts + 2974,
+	ts + 2979,
+	ts + 2991,
+	ts + 3003,
+	ts + 3013,
+	ts + 3019,
 	ts + 3029,
-	ts + 3040,
+	ts + 3036,
 	ts + 3048,
-	ts + 3057,
-	ts + 3066,
-	ts + 3075,
-	ts + 3082,
-	ts + 3093,
-	ts + 3106,
-	ts + 3116,
-	ts + 3123,
-	ts + 3131,
-	ts + 3140,
-	ts + 3146,
-	ts + 3154,
-	ts + 3162,
-	ts + 3170,
-	ts + 3180,
+	ts + 3059,
+	ts + 3067,
+	ts + 3076,
+	ts + 3085,
+	ts + 3094,
+	ts + 3101,
+	ts + 3112,
+	ts + 3125,
+	ts + 3135,
+	ts + 3142,
+	ts + 3150,
+	ts + 3159,
+	ts + 3165,
+	ts + 3173,
+	ts + 3181,
 	ts + 3189,
-	ts + 3200,
-	ts + 3210,
-	ts + 3216,
-	ts + 3227,
-	ts + 3238,
-	ts + 3243,
-	ts + 3251,
+	ts + 3199,
+	ts + 3208,
+	ts + 3219,
+	ts + 3229,
+	ts + 3235,
+	ts + 3246,
+	ts + 3257,
+	ts + 3262,
+	ts + 3270,
 }
 
 type stat = struct {
@@ -15561,35 +15567,35 @@ type unix_syscall = struct {
 }
 
 var aSyscall = [29]unix_syscall{
-	{FzName: ts + 3261, FpCurrent: 0},
-	{FzName: ts + 3266, FpCurrent: 0},
-	{FzName: ts + 3272, FpCurrent: 0},
-	{FzName: ts + 3279, FpCurrent: 0},
-	{FzName: ts + 3286, FpCurrent: 0},
+	{FzName: ts + 3280, FpCurrent: 0},
+	{FzName: ts + 3285, FpCurrent: 0},
 	{FzName: ts + 3291, FpCurrent: 0},
-	{FzName: ts + 3297, FpCurrent: 0},
-	{FzName: ts + 3307, FpCurrent: 0},
-	{FzName: ts + 3313, FpCurrent: 0},
-	{FzName: ts + 3318},
-	{FzName: ts + 3324},
+	{FzName: ts + 3298, FpCurrent: 0},
+	{FzName: ts + 3305, FpCurrent: 0},
+	{FzName: ts + 3310, FpCurrent: 0},
+	{FzName: ts + 3316, FpCurrent: 0},
+	{FzName: ts + 3326, FpCurrent: 0},
 	{FzName: ts + 3332, FpCurrent: 0},
-	{FzName: ts + 3338},
-	{FzName: ts + 3345},
-	{FzName: ts + 3354, FpCurrent: 0},
-	{FzName: ts + 3361},
-	{FzName: ts + 3371, FpCurrent: 0},
-	{FzName: ts + 3378, FpCurrent: 0},
-	{FzName: ts + 3392, FpCurrent: 0},
-	{FzName: ts + 3398, FpCurrent: 0},
-	{FzName: ts + 3404, FpCurrent: 0},
+	{FzName: ts + 3337},
+	{FzName: ts + 3343},
+	{FzName: ts + 3351, FpCurrent: 0},
+	{FzName: ts + 3357},
+	{FzName: ts + 3364},
+	{FzName: ts + 3373, FpCurrent: 0},
+	{FzName: ts + 3380},
+	{FzName: ts + 3390, FpCurrent: 0},
+	{FzName: ts + 3397, FpCurrent: 0},
 	{FzName: ts + 3411, FpCurrent: 0},
-	{FzName: ts + 3419, FpCurrent: 0},
-	{FzName: ts + 3424, FpCurrent: 0},
-	{FzName: ts + 3431, FpCurrent: 0},
+	{FzName: ts + 3417, FpCurrent: 0},
+	{FzName: ts + 3423, FpCurrent: 0},
+	{FzName: ts + 3430, FpCurrent: 0},
 	{FzName: ts + 3438, FpCurrent: 0},
+	{FzName: ts + 3443, FpCurrent: 0},
 	{FzName: ts + 3450, FpCurrent: 0},
-	{FzName: ts + 3459, FpCurrent: 0},
-	{FzName: ts + 3465},
+	{FzName: ts + 3457, FpCurrent: 0},
+	{FzName: ts + 3469, FpCurrent: 0},
+	{FzName: ts + 3478, FpCurrent: 0},
+	{FzName: ts + 3484},
 }
 
 func robustFchown(tls *libc.TLS, fd int32, uid Uid_t, gid Gid_t) int32 {
@@ -15687,9 +15693,9 @@ func robust_open(tls *libc.TLS, z uintptr, f int32, m Mode_t) int32 {
 		}
 		(*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*12 + 4)))(tls, fd)
 		Xsqlite3_log(tls, SQLITE_WARNING,
-			ts+3471, libc.VaList(bp, z, fd))
+			ts+3490, libc.VaList(bp, z, fd))
 		fd = -1
-		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 4)))(tls, ts+3514, O_RDONLY, int32(m)) < 0 {
+		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 4)))(tls, ts+3533, O_RDONLY, int32(m)) < 0 {
 			break
 		}
 	}
@@ -15768,13 +15774,13 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 	var zErr uintptr
 	var iErrno int32 = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 
-	zErr = ts + 1554
+	zErr = ts + 1573
 
 	if zPath == uintptr(0) {
-		zPath = ts + 1554
+		zPath = ts + 1573
 	}
 	Xsqlite3_log(tls, errcode,
-		ts+3524,
+		ts+3543,
 		libc.VaList(bp, iLine, iErrno, zFunc, zPath, zErr))
 
 	return errcode
@@ -15782,7 +15788,7 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 
 func robust_close(tls *libc.TLS, pFile uintptr, h int32, lineno int32) {
 	if (*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*12 + 4)))(tls, h) != 0 {
-		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3266,
+		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3285,
 			func() uintptr {
 				if pFile != 0 {
 					return (*UnixFile)(unsafe.Pointer(pFile)).FzPath
@@ -15803,7 +15809,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, 38271)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38275)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -15905,19 +15911,19 @@ func verifyDbFile(tls *libc.TLS, pFile uintptr) {
 
 	rc = (*(*func(*libc.TLS, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 5*12 + 4)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, bp+32)
 	if rc != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3555, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3574, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink == X__nlink_t(0) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3579, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3598, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink > X__nlink_t(1) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3608, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3627, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if fileHasMoved(tls, pFile) != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3635, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3654, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 }
@@ -16280,7 +16286,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, 39055)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39059)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -16553,7 +16559,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	var ii int32
 	var fd int32 = -1
 
-	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3663, libc.VaList(bp, zFilename))
+	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3682, libc.VaList(bp, zFilename))
 	for ii = int32(libc.Xstrlen(tls, bp+8)); ii > 0 && int32(*(*uint8)(unsafe.Pointer(bp + 8 + uintptr(ii)))) != '/'; ii-- {
 	}
 	if ii > 0 {
@@ -16571,7 +16577,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3378, bp+8, 40676)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40680), ts+3397, bp+8, 40680)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -16588,14 +16594,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, 40717)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3685, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40721)
 	}
 
 	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)), 40731)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40735)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -16615,7 +16621,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, 40762)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3316, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40766)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -16670,7 +16676,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 				if iWrite >= nSize {
 					iWrite = nSize - int64(1)
 				}
-				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1554, 1)
+				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1573, 1)
 				if nWrite != 1 {
 					return SQLITE_IOERR | int32(3)<<8
 				}
@@ -16683,7 +16689,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, 40883)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3316, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40887)
 			}
 		}
 
@@ -16751,7 +16757,7 @@ func unixFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 		}
 	case SQLITE_FCNTL_VFSNAME:
 		{
-			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
+			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
 			return SQLITE_OK
 
 		}
@@ -16910,7 +16916,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, 41442)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41446)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -16938,7 +16944,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, 41499)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3316, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41503)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -17001,7 +17007,7 @@ __4:
 	;
 	libc.Xmemset(tls, pShmNode, 0, uint32(unsafe.Sizeof(unixShmNode{}))+uint32(nShmFilename))
 	zShm = libc.AssignPtrUintptr(pShmNode+8, pShmNode+1*68)
-	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3677, libc.VaList(bp, zBasePath))
+	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3696, libc.VaList(bp, zBasePath))
 
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = -1
 	(*UnixInodeInfo)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pDbFd)).FpInode)).FpShmNode = pShmNode
@@ -17022,7 +17028,7 @@ __5:
 	if !(int32((*UnixInodeInfo)(unsafe.Pointer(pInode)).FbProcessLock) == 0) {
 		goto __7
 	}
-	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3684, 0)) {
+	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3703, 0)) {
 		goto __8
 	}
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = robust_open(tls, zShm, O_RDWR|O_CREAT|0100000,
@@ -17037,7 +17043,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3261, zShm, 41624)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41628), ts+3280, zShm, 41628)
 	goto shm_open_err
 __10:
 	;
@@ -17163,11 +17169,11 @@ __11:
 		goto __13
 	}
 	*(*int32)(unsafe.Pointer(bp + 104)) = 0
-	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1554, 1, bp+104) != 1) {
+	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1573, 1, bp+104) != 1) {
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41768)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3351, zFile, 41772)
 	goto shmpage_out
 __14:
 	;
@@ -17213,7 +17219,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3419, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3438, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41799)
 	goto shmpage_out
 __20:
 	;
@@ -17414,7 +17420,7 @@ func unixUnmapfile(tls *libc.TLS, pFd uintptr) {
 }
 
 func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
-	var zErr uintptr = ts + 3419
+	var zErr uintptr = ts + 3438
 	var h int32 = (*UnixFile)(unsafe.Pointer(pFd)).Fh
 	var pOrig uintptr = (*UnixFile)(unsafe.Pointer(pFd)).FpMapRegion
 	var nOrig I64 = (*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeActual
@@ -17430,7 +17436,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 		}
 
 		pNew = (*(*func(*libc.TLS, uintptr, Size_t, Size_t, int32, uintptr) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 24*12 + 4)))(tls, pOrig, uint32(nReuse), uint32(nNew), MREMAP_MAYMOVE, 0)
-		zErr = ts + 3431
+		zErr = ts + 3450
 
 		if pNew == libc.UintptrFromInt32(-1) || pNew == uintptr(0) {
 			(*(*func(*libc.TLS, uintptr, Size_t) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 23*12 + 4)))(tls, pOrig, uint32(nReuse))
@@ -17444,7 +17450,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, 42169)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42173)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -17559,10 +17565,10 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		}
 		return uintptr(0)
 	}(),
-		ts+3697, SQLITE_POWERSAFE_OVERWRITE) != 0 {
+		ts+3716, SQLITE_POWERSAFE_OVERWRITE) != 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 18)) |= uint16(UNIXFILE_PSOW)
 	}
-	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3702) == 0 {
+	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3721) == 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 18)) |= uint16(UNIXFILE_EXCL)
 	}
 
@@ -17578,7 +17584,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, 42672)
+			robust_close(tls, pNew, h, 42676)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -17591,7 +17597,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		if zLockFile == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
-			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3712, libc.VaList(bp, zFilename))
+			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3731, libc.VaList(bp, zFilename))
 		}
 		(*UnixFile)(unsafe.Pointer(pNew)).FlockingContext = zLockFile
 	}
@@ -17599,7 +17605,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, 42757)
+			robust_close(tls, pNew, h, 42761)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -17612,15 +17618,15 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 var azTempDirs = [6]uintptr{
 	uintptr(0),
 	uintptr(0),
-	ts + 3720,
-	ts + 3729,
-	ts + 3738,
-	ts + 1567,
+	ts + 3739,
+	ts + 3748,
+	ts + 3757,
+	ts + 1586,
 }
 
 func unixTempFileInit(tls *libc.TLS) {
-	azTempDirs[0] = libc.Xgetenv(tls, ts+3743)
-	azTempDirs[1] = libc.Xgetenv(tls, ts+3757)
+	azTempDirs[0] = libc.Xgetenv(tls, ts+3762)
+	azTempDirs[1] = libc.Xgetenv(tls, ts+3776)
 }
 
 func unixTempFileDir(tls *libc.TLS) uintptr {
@@ -17665,7 +17671,7 @@ func unixGetTempname(tls *libc.TLS, nBuf int32, zBuf uintptr) int32 {
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U64(0))), bp+24)
 
 			*(*uint8)(unsafe.Pointer(zBuf + uintptr(nBuf-2))) = uint8(0)
-			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3764,
+			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3783,
 				libc.VaList(bp, zDir, *(*U64)(unsafe.Pointer(bp + 24)), 0))
 			if int32(*(*uint8)(unsafe.Pointer(zBuf + uintptr(nBuf-2)))) != 0 || libc.PostIncInt32(&iLimit, 1) > 10 {
 				rc = SQLITE_ERROR
@@ -17750,7 +17756,7 @@ func findCreateFileMode(tls *libc.TLS, zPath uintptr, flags int32, pMode uintptr
 	} else if flags&SQLITE_OPEN_DELETEONCLOSE != 0 {
 		*(*Mode_t)(unsafe.Pointer(pMode)) = Mode_t(0600)
 	} else if flags&SQLITE_OPEN_URI != 0 {
-		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3781)
+		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3800)
 		if z != 0 {
 			rc = getFileMode(tls, z, pMode, pUid, pGid)
 		}
@@ -17915,7 +17921,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3261, zName, 43198)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43202), ts+3280, zName, 43202)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -18006,7 +18012,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, 43337)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3390, zPath, 43341)
 		}
 		return rc
 	}
@@ -18014,9 +18020,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, 43347)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3807, zPath, 43351)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43353)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -18080,18 +18086,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, 43443), ts+3459, zIn, 43443)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43447), ts+3478, zIn, 43447)
 			}
 		} 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, 43449)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43453)
 				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, 43454), ts+3450, zIn, 43454)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43458), ts+3469, zIn, 43458)
 				return
 			}
 			*(*uint8)(unsafe.Pointer(bp + 104 + uintptr(got))) = uint8(0)
@@ -18131,14 +18137,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, 43512), ts+3279, zPath, 43512)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43516), ts+3298, zPath, 43516)
 		}
 		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, 43518)
+		return Xsqlite3CantopenError(tls, 43522)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+4100)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -18194,7 +18200,7 @@ func unixDlError(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBufOut uintptr) {
 	unixEnterMutex(tls)
 	zErr = libc.Xdlerror(tls)
 	if zErr != 0 {
-		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3663, libc.VaList(bp, zErr))
+		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3682, libc.VaList(bp, zErr))
 	}
 	unixLeaveMutex(tls)
 }
@@ -18226,7 +18232,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 	{
 		var fd int32
 		var got int32
-		fd = robust_open(tls, ts+3794, O_RDONLY, uint32(0))
+		fd = robust_open(tls, ts+3813, O_RDONLY, uint32(0))
 		if fd < 0 {
 			libc.Xtime(tls, bp)
 			libc.Xmemcpy(tls, zBuf, bp, uint32(unsafe.Sizeof(Time_t(0))))
@@ -18237,7 +18243,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, 43619)
+			robust_close(tls, uintptr(0), fd, 43623)
 		}
 
 	}
@@ -18314,10 +18320,10 @@ func Xsqlite3_os_init(tls *libc.TLS) int32 {
 }
 
 var aVfs = [4]Sqlite3_vfs{
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3807, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3812, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3822, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3702, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3826, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3831, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3841, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3721, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
 }
 
 // Shutdown the operating system interface.
@@ -18369,7 +18375,7 @@ var memdb_g MemFS
 var memdb_vfs = Sqlite3_vfs{
 	FiVersion:          2,
 	FmxPathname:        1024,
-	FzName:             ts + 3835,
+	FzName:             ts + 3854,
 	FxOpen:             0,
 	FxAccess:           0,
 	FxFullPathname:     0,
@@ -18625,7 +18631,7 @@ func memdbFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int3
 	var rc int32 = SQLITE_NOTFOUND
 	memdbEnter(tls, p)
 	if op == SQLITE_FCNTL_VFSNAME {
-		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3841, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
+		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3860, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
 		rc = SQLITE_OK
 	}
 	if op == SQLITE_FCNTL_SIZE_LIMIT {
@@ -18757,7 +18763,7 @@ func memdbFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, z
 	defer tls.Free(8)
 
 	_ = pVfs
-	Xsqlite3_snprintf(tls, nOut, zOut, ts+3663, libc.VaList(bp, zPath))
+	Xsqlite3_snprintf(tls, nOut, zOut, ts+3682, libc.VaList(bp, zPath))
 	return SQLITE_OK
 }
 
@@ -18878,7 +18884,7 @@ func Xsqlite3_serialize(tls *libc.TLS, db uintptr, zSchema uintptr, piSize uintp
 		return uintptr(0)
 	}
 	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
-	zSql = Xsqlite3_mprintf(tls, ts+3856, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3875, libc.VaList(bp, zSchema))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, db, zSql, -1, bp+8, uintptr(0))
 	} else {
@@ -18951,7 +18957,7 @@ __1:
 	goto end_deserialize
 __2:
 	;
-	zSql = Xsqlite3_mprintf(tls, ts+3879, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3898, libc.VaList(bp, zSchema))
 	if !(zSql == uintptr(0)) {
 		goto __3
 	}
@@ -19667,7 +19673,7 @@ func pcacheFetchFinishWithInit(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 	libc.Xmemset(tls, pPgHdr+16, 0, uint32(unsafe.Sizeof(PgHdr{}))-uint32(uintptr(0)+16))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpPage = pPage
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpData = (*Sqlite3_pcache_page)(unsafe.Pointer(pPage)).FpBuf
-	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*40
+	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*48
 	libc.Xmemset(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0, uint32(8))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpCache = pCache
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).Fpgno = pgno
@@ -19697,7 +19703,7 @@ func Xsqlite3PcacheFetchFinish(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 // reference count drops to 0, then it is made eligible for recycling.
 func Xsqlite3PcacheRelease(tls *libc.TLS, p uintptr) {
 	(*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FnRefSum--
-	if int32(libc.PreDecInt16(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1)) == 0 {
+	if libc.PreDecInt64(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1) == int64(0) {
 		if int32((*PgHdr)(unsafe.Pointer(p)).Fflags)&PGHDR_CLEAN != 0 {
 			pcacheUnpin(tls, p)
 		} else {
@@ -19748,7 +19754,7 @@ func Xsqlite3PcacheMakeClean(tls *libc.TLS, p uintptr) {
 	*(*U16)(unsafe.Pointer(p + 28)) &= libc.Uint16FromInt32(libc.CplInt32(PGHDR_DIRTY | PGHDR_NEED_SYNC | PGHDR_WRITEABLE))
 	*(*U16)(unsafe.Pointer(p + 28)) |= U16(PGHDR_CLEAN)
 
-	if int32((*PgHdr)(unsafe.Pointer(p)).FnRef) == 0 {
+	if (*PgHdr)(unsafe.Pointer(p)).FnRef == int64(0) {
 		pcacheUnpin(tls, p)
 	}
 }
@@ -19852,8 +19858,8 @@ func Xsqlite3PcacheClear(tls *libc.TLS, pCache uintptr) {
 }
 
 func pcacheMergeDirtyList(tls *libc.TLS, pA uintptr, pB uintptr) uintptr {
-	bp := tls.Alloc(40)
-	defer tls.Free(40)
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
 
 	var pTail uintptr
 	pTail = bp
@@ -19931,13 +19937,13 @@ func Xsqlite3PcacheDirtyList(tls *libc.TLS, pCache uintptr) uintptr {
 //
 // This is not the total number of pages referenced, but the sum of the
 // reference count for all pages.
-func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) int32 {
+func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) I64 {
 	return (*PCache)(unsafe.Pointer(pCache)).FnRefSum
 }
 
 // Return the number of references to the page supplied as an argument.
-func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) int32 {
-	return int32((*PgHdr)(unsafe.Pointer(p)).FnRef)
+func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) I64 {
+	return (*PgHdr)(unsafe.Pointer(p)).FnRef
 }
 
 // Return the total number of pages in the cache.
@@ -22164,7 +22170,7 @@ __27:
 	if !(isHot != 0 && nPlayback != 0) {
 		goto __28
 	}
-	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3894,
+	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3913,
 		libc.VaList(bp, nPlayback, (*Pager)(unsafe.Pointer(pPager)).FzJournal))
 __28:
 	;
@@ -22229,7 +22235,7 @@ func pagerUndoCallback(tls *libc.TLS, pCtx uintptr, iPg Pgno) int32 {
 
 	pPg = Xsqlite3PagerLookup(tls, pPager, iPg)
 	if pPg != 0 {
-		if Xsqlite3PcachePageRefcount(tls, pPg) == 1 {
+		if Xsqlite3PcachePageRefcount(tls, pPg) == int64(1) {
 			Xsqlite3PcacheDrop(tls, pPg)
 		} else {
 			rc = readDbPage(tls, pPg)
@@ -22662,7 +22668,7 @@ func Xsqlite3PagerSetPagesize(tls *libc.TLS, pPager uintptr, pPageSize uintptr,
 	var pageSize U32 = *(*U32)(unsafe.Pointer(pPageSize))
 
 	if (int32((*Pager)(unsafe.Pointer(pPager)).FmemDb) == 0 || (*Pager)(unsafe.Pointer(pPager)).FdbSize == Pgno(0)) &&
-		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 &&
+		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) &&
 		pageSize != 0 && pageSize != U32((*Pager)(unsafe.Pointer(pPager)).FpageSize) {
 		var pNew uintptr = uintptr(0)
 		*(*I64)(unsafe.Pointer(bp)) = int64(0)
@@ -22814,9 +22820,9 @@ func pagerAcquireMapPage(tls *libc.TLS, pPager uintptr, pgno Pgno, pData uintptr
 			Xsqlite3OsUnfetch(tls, (*Pager)(unsafe.Pointer(pPager)).Ffd, I64(pgno-Pgno(1))*(*Pager)(unsafe.Pointer(pPager)).FpageSize, pData)
 			return SQLITE_NOMEM
 		}
-		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*40
+		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*48
 		(*PgHdr)(unsafe.Pointer(p)).Fflags = U16(PGHDR_MMAP)
-		(*PgHdr)(unsafe.Pointer(p)).FnRef = int16(1)
+		(*PgHdr)(unsafe.Pointer(p)).FnRef = int64(1)
 		(*PgHdr)(unsafe.Pointer(p)).FpPager = pPager
 	}
 
@@ -23148,7 +23154,7 @@ func Xsqlite3PagerFlush(tls *libc.TLS, pPager uintptr) int32 {
 
 		for rc == SQLITE_OK && pList != 0 {
 			var pNext uintptr = (*PgHdr)(unsafe.Pointer(pList)).FpDirty
-			if int32((*PgHdr)(unsafe.Pointer(pList)).FnRef) == 0 {
+			if (*PgHdr)(unsafe.Pointer(pList)).FnRef == int64(0) {
 				rc = pagerStress(tls, pPager, pList)
 			}
 			pList = pNext
@@ -23298,7 +23304,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 60235)
+	rc = Xsqlite3CantopenError(tls, 60239)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -23359,7 +23365,7 @@ __15:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzJournal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint32(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3921, uint32(8))
+	libc.Xmemcpy(tls, pPtr, ts+3940, uint32(8))
 	pPtr += uintptr(8 + 1)
 	goto __19
 __18:
@@ -23372,7 +23378,7 @@ __19:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzWal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint32(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3930, uint32(4))
+	libc.Xmemcpy(tls, pPtr, ts+3949, uint32(4))
 	pPtr += uintptr(4 + 1)
 	goto __21
 __20:
@@ -23424,9 +23430,9 @@ __27:
 	;
 __26:
 	;
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3935, 0))
+	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3954, 0))
 	if !(iDc&SQLITE_IOCAP_IMMUTABLE != 0 ||
-		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3942, 0) != 0) {
+		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3961, 0) != 0) {
 		goto __30
 	}
 	vfsFlags = vfsFlags | SQLITE_OPEN_READONLY
@@ -23679,7 +23685,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60754)
+	rc = Xsqlite3CantopenError(tls, 60758)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23785,7 +23791,7 @@ __24:
 }
 
 func pagerUnlockIfUnused(tls *libc.TLS, pPager uintptr) {
-	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 {
+	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) {
 		pagerUnlockAndRollback(tls, pPager)
 	}
 }
@@ -23803,7 +23809,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60967)
+	return Xsqlite3CorruptError(tls, 60971)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23842,7 +23848,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60999)
+	rc = Xsqlite3CorruptError(tls, 61003)
 	goto pager_acquire_err
 __7:
 	;
@@ -23919,7 +23925,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, 61078)
+		return Xsqlite3CorruptError(tls, 61082)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24677,7 +24683,7 @@ func Xsqlite3PagerMemUsed(tls *libc.TLS, pPager uintptr) int32 {
 
 // Return the number of references to the specified page.
 func Xsqlite3PagerPageRefcount(tls *libc.TLS, pPage uintptr) int32 {
-	return Xsqlite3PcachePageRefcount(tls, pPage)
+	return int32(Xsqlite3PcachePageRefcount(tls, pPage))
 }
 
 // Parameter eStat must be one of SQLITE_DBSTATUS_CACHE_HIT, _MISS, _WRITE,
@@ -24920,9 +24926,9 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	pPgOld = Xsqlite3PagerLookup(tls, pPager, pgno)
 
 	if pPgOld != 0 {
-		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
+		if (*PgHdr)(unsafe.Pointer(pPgOld)).FnRef > int64(1) {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62623)
+			return Xsqlite3CorruptError(tls, 62627)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 28)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -25107,7 +25113,7 @@ func Xsqlite3PagerClearCache(tls *libc.TLS, pPager uintptr) {
 func Xsqlite3PagerCheckpoint(tls *libc.TLS, pPager uintptr, db uintptr, eMode int32, pnLog uintptr, pnCkpt uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal == uintptr(0) && int32((*Pager)(unsafe.Pointer(pPager)).FjournalMode) == PAGER_JOURNALMODE_WAL {
-		Xsqlite3_exec(tls, db, ts+3952, uintptr(0), uintptr(0), uintptr(0))
+		Xsqlite3_exec(tls, db, ts+3971, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal != 0 {
 		rc = Xsqlite3WalCheckpoint(tls, (*Pager)(unsafe.Pointer(pPager)).FpWal, db, eMode,
@@ -25676,7 +25682,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, 64387)
+				return Xsqlite3CorruptError(tls, 64391)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25775,7 +25781,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64519)
+	rc = Xsqlite3CantopenError(tls, 64523)
 	goto finished
 __7:
 	;
@@ -25943,7 +25949,7 @@ __24:
 		goto __30
 	}
 	Xsqlite3_log(tls, SQLITE_NOTICE|int32(1)<<8,
-		ts+3970,
+		ts+3989,
 		libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 __30:
 	;
@@ -26360,7 +26366,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65333)
+	rc = Xsqlite3CorruptError(tls, 65337)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -26505,7 +26511,7 @@ func walLimitSize(tls *libc.TLS, pWal uintptr, nMax I64) {
 	}
 	Xsqlite3EndBenignMalloc(tls)
 	if rx != 0 {
-		Xsqlite3_log(tls, rx, ts+4007, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
+		Xsqlite3_log(tls, rx, ts+4026, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 	}
 }
 
@@ -26635,7 +26641,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, 65682)
+		rc = Xsqlite3CantopenError(tls, 65686)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -27108,7 +27114,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66419)
+				return Xsqlite3CorruptError(tls, 66423)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -27613,7 +27619,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, 67138)
+			rc = Xsqlite3CorruptError(tls, 67142)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -28005,7 +28011,7 @@ func Xsqlite3BtreeLeaveCursor(tls *libc.TLS, pCur uintptr) {
 	Xsqlite3BtreeLeave(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpBtree)
 }
 
-var zMagicHeader = *(*[16]uint8)(unsafe.Pointer(ts + 4033))
+var zMagicHeader = *(*[16]uint8)(unsafe.Pointer(ts + 4052))
 
 var sqlite3SharedCacheList uintptr = uintptr(0)
 
@@ -28270,7 +28276,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, 69249)
+			rc = Xsqlite3CorruptError(tls, 69253)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -28407,7 +28413,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69434)
 	return
 __2:
 	;
@@ -28424,7 +28430,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69447)
 	goto ptrmap_exit
 __4:
 	;
@@ -28432,7 +28438,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69452)
 	goto ptrmap_exit
 __5:
 	;
@@ -28475,7 +28481,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, 69493)
+		return Xsqlite3CorruptError(tls, 69497)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -28485,7 +28491,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, 69501)
+		return Xsqlite3CorruptError(tls, 69505)
 	}
 	return SQLITE_OK
 }
@@ -28735,7 +28741,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, 69893)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69897)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28782,7 +28788,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69951)
+	return Xsqlite3CorruptError(tls, 69955)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28792,7 +28798,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69954)
+	return Xsqlite3CorruptError(tls, 69958)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28805,7 +28811,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69962)
+	return Xsqlite3CorruptError(tls, 69966)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28814,14 +28820,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69965)
+	return Xsqlite3CorruptError(tls, 69969)
 __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, 69967)
+	return Xsqlite3CorruptError(tls, 69971)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint32(iFree2-(iFree+sz)))
@@ -28831,7 +28837,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69971)
+	return Xsqlite3CorruptError(tls, 69975)
 __11:
 	;
 __8:
@@ -28895,7 +28901,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 70004)
+	return Xsqlite3CorruptError(tls, 70008)
 __22:
 	;
 	size = int32((*struct {
@@ -28905,7 +28911,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 70010)
+	return Xsqlite3CorruptError(tls, 70014)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -28927,7 +28933,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 70024)
+	return Xsqlite3CorruptError(tls, 70028)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -28962,7 +28968,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, 70081)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70085)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -28975,13 +28981,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, 70096)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70100)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70107)
 	}
 	return uintptr(0)
 }
@@ -29006,7 +29012,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, 70152)
+			return Xsqlite3CorruptError(tls, 70156)
 		}
 	}
 
@@ -29017,7 +29023,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, 70170)
+				return Xsqlite3CorruptError(tls, 70174)
 			} else {
 				return SQLITE_OK
 			}
@@ -29069,22 +29075,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 70249)
+				return Xsqlite3CorruptError(tls, 70253)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 70254)
+			return Xsqlite3CorruptError(tls, 70258)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 70266)
+				return Xsqlite3CorruptError(tls, 70270)
 			}
 			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, 70269)
+				return Xsqlite3CorruptError(tls, 70273)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -29094,7 +29100,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, 70282)
+					return Xsqlite3CorruptError(tls, 70286)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -29102,7 +29108,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, 70288)
+			return Xsqlite3CorruptError(tls, 70292)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -29110,10 +29116,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, 70297)
+			return Xsqlite3CorruptError(tls, 70301)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70298)
+			return Xsqlite3CorruptError(tls, 70302)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -29173,7 +29179,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70357)
+			return Xsqlite3CorruptError(tls, 70361)
 		}
 	} else {
 		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
@@ -29209,7 +29215,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70381)
+			return Xsqlite3CorruptError(tls, 70385)
 		}
 	}
 	return SQLITE_OK
@@ -29239,11 +29245,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70432)
+			return Xsqlite3CorruptError(tls, 70436)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70437)
+				return Xsqlite3CorruptError(tls, 70441)
 			}
 			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))))
@@ -29254,15 +29260,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70447)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70451)
+			return Xsqlite3CorruptError(tls, 70455)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70463)
+		return Xsqlite3CorruptError(tls, 70467)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -29290,14 +29296,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, 70494)
+			return Xsqlite3CorruptError(tls, 70498)
 		}
 		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, 70499)
+			return Xsqlite3CorruptError(tls, 70503)
 		}
 	}
 	return SQLITE_OK
@@ -29311,7 +29317,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, 70531)
+		return Xsqlite3CorruptError(tls, 70535)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -29323,7 +29329,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, 70545)
+		return Xsqlite3CorruptError(tls, 70549)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -29426,7 +29432,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70700)
+	rc = Xsqlite3CorruptError(tls, 70704)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -29454,7 +29460,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, 70721)
+	rc = Xsqlite3CorruptError(tls, 70725)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -29493,7 +29499,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, 70787)
+			return Xsqlite3CorruptError(tls, 70791)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -29566,7 +29572,7 @@ func Xsqlite3BtreeOpen(tls *libc.TLS, pVfs uintptr, zFilename uintptr, db uintpt
 	mutexOpen = uintptr(0)
 	rc = SQLITE_OK
 	isTempDb = libc.Bool32(zFilename == uintptr(0) || int32(*(*uint8)(unsafe.Pointer(zFilename))) == 0)
-	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4049) == 0 ||
+	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4068) == 0 ||
 		isTempDb != 0 && Xsqlite3TempInMemory(tls, db) != 0 ||
 		vfsFlags&SQLITE_OPEN_MEMORY != 0)
 
@@ -30338,7 +30344,7 @@ __9:
 	;
 __10:
 	;
-	if !(libc.Xmemcmp(tls, page1+21, ts+4058, uint32(3)) != 0) {
+	if !(libc.Xmemcmp(tls, page1+21, ts+4077, uint32(3)) != 0) {
 		goto __14
 	}
 	goto page1_init_failed
@@ -30376,7 +30382,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71722)
+	rc = Xsqlite3CorruptError(tls, 71726)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30791,7 +30797,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, 72143)
+			return Xsqlite3CorruptError(tls, 72147)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30817,7 +30823,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, 72162)
+						return Xsqlite3CorruptError(tls, 72166)
 					}
 					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)
@@ -30826,7 +30832,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, 72171)
+					return Xsqlite3CorruptError(tls, 72175)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30837,7 +30843,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, 72183)
+				return Xsqlite3CorruptError(tls, 72187)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30853,7 +30859,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, 72218)
+		return Xsqlite3CorruptError(tls, 72222)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -30914,7 +30920,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, 72316)
+			return Xsqlite3CorruptError(tls, 72320)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -30949,7 +30955,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, 72368)
+					return Xsqlite3CorruptError(tls, 72372)
 				}
 			}
 
@@ -31009,7 +31015,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, 72436)
+			rc = Xsqlite3CorruptError(tls, 72440)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -31048,7 +31054,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, 72487)
+			return Xsqlite3CorruptError(tls, 72491)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -31079,7 +31085,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72514)
+			return Xsqlite3CorruptError(tls, 72518)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -31420,7 +31426,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, 72978)
+			return Xsqlite3CorruptError(tls, 72982)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -31664,14 +31670,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, 73385)
+		return Xsqlite3CorruptError(tls, 73389)
 	}
 
 	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, 73400)
+		return Xsqlite3CorruptError(tls, 73404)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -31716,7 +31722,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, 73462)
+				return Xsqlite3CorruptError(tls, 73466)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31765,7 +31771,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73547)
+		return Xsqlite3CorruptError(tls, 73551)
 	}
 	return rc
 }
@@ -31845,7 +31851,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, 73684)
+		return Xsqlite3CorruptError(tls, 73688)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -31936,7 +31942,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, 73823)
+	return Xsqlite3CorruptError(tls, 73827)
 __11:
 	;
 skip_init:
@@ -31956,7 +31962,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73835)
+	return Xsqlite3CorruptError(tls, 73839)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -32166,7 +32172,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 74077)
+	return Xsqlite3CorruptError(tls, 74081)
 __21:
 	;
 	goto __19
@@ -32370,7 +32376,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 74273)
+	return Xsqlite3CorruptError(tls, 74277)
 __4:
 	;
 	goto bypass_moveto_root
@@ -32435,7 +32441,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, 74360)
+	rc = Xsqlite3CorruptError(tls, 74364)
 	goto moveto_index_finish
 __17:
 	;
@@ -32483,7 +32489,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74392)
+	rc = Xsqlite3CorruptError(tls, 74396)
 __24:
 	;
 	goto moveto_index_finish
@@ -32602,7 +32608,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, 74508)
+		return Xsqlite3CorruptError(tls, 74512)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32762,7 +32768,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74688)
+	return Xsqlite3CorruptError(tls, 74692)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32827,7 +32833,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74744)
+	rc = Xsqlite3CorruptError(tls, 74748)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+4, 0)
@@ -32863,7 +32869,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74773)
+	rc = Xsqlite3CorruptError(tls, 74777)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -32907,7 +32913,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74807)
+	rc = Xsqlite3CorruptError(tls, 74811)
 	goto end_allocate_page
 __32:
 	;
@@ -33019,7 +33025,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74872)
+	rc = Xsqlite3CorruptError(tls, 74876)
 	goto end_allocate_page
 __51:
 	;
@@ -33177,7 +33183,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, 74999)
+	return Xsqlite3CorruptError(tls, 75003)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -33234,7 +33240,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75046)
+	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75050)
 	goto freepage_out
 __10:
 	;
@@ -33250,7 +33256,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75057)
+	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75061)
 	goto freepage_out
 __12:
 	;
@@ -33324,7 +33330,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, 75146)
+		return Xsqlite3CorruptError(tls, 75150)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -33336,7 +33342,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, 75163)
+			return Xsqlite3CorruptError(tls, 75167)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+4)
@@ -33347,7 +33353,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, 75183)
+			rc = Xsqlite3CorruptError(tls, 75187)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -33512,7 +33518,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, 75436)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75440)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -33790,12 +33796,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, 75737)
+				return Xsqlite3CorruptError(tls, 75741)
 			}
 			pCell = pTmp + uintptr((int32(pCell)-int32(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75742)
+			return Xsqlite3CorruptError(tls, 75746)
 		}
 
 		pData -= uintptr(sz)
@@ -33803,7 +33809,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, 75748)
+			return Xsqlite3CorruptError(tls, 75752)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint32(sz))
 
@@ -33863,7 +33869,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, 75833)
+			Xsqlite3CorruptError(tls, 75837)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*4)), uint32(sz))
@@ -33952,7 +33958,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75947)
+	return Xsqlite3CorruptError(tls, 75951)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint32(nCell*2))
@@ -34068,7 +34074,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, 76060)
+		return Xsqlite3CorruptError(tls, 76064)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 80)) = allocateBtreePage(tls, pBt, bp, bp+4, uint32(0), uint8(0))
@@ -34388,7 +34394,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, 76481)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76485)
 	goto balance_cleanup
 __25:
 	;
@@ -34399,7 +34405,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76505)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76509)
 	goto balance_cleanup
 __27:
 	;
@@ -34557,7 +34563,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76606)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76610)
 	goto balance_cleanup
 __55:
 	;
@@ -34631,7 +34637,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76639)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76643)
 	goto balance_cleanup
 __67:
 	;
@@ -34694,7 +34700,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76683)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76687)
 	goto balance_cleanup
 __75:
 	;
@@ -34722,7 +34728,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 112)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76716)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76720)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 112)) != 0) {
@@ -34983,7 +34989,7 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76916)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76920)
 	goto balance_cleanup
 __121:
 	;
@@ -35175,7 +35181,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, 77146)
+			return Xsqlite3CorruptError(tls, 77150)
 		}
 	}
 	return SQLITE_OK
@@ -35213,7 +35219,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 77206)
+			rc = Xsqlite3CorruptError(tls, 77210)
 		} 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)))
@@ -35319,7 +35325,7 @@ func btreeOverwriteOverflowCell(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, 77370)
+			rc = Xsqlite3CorruptError(tls, 77374)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -35344,7 +35350,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 
 	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)
+		return Xsqlite3CorruptError(tls, 77402)
 	}
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
 		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
@@ -35414,7 +35420,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77479)
+	return Xsqlite3CorruptError(tls, 77483)
 __3:
 	;
 __1:
@@ -35527,7 +35533,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 104)) = Xsqlite3CorruptError(tls, 77602)
+	*(*int32)(unsafe.Pointer(bp + 104)) = Xsqlite3CorruptError(tls, 77606)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 104)) = btreeComputeFreeSpace(tls, pPage)
@@ -35587,6 +35593,7 @@ __30:
 __25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
+	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
 		goto __31
 	}
@@ -35594,7 +35601,7 @@ __25:
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
 		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77640)
+	return Xsqlite3CorruptError(tls, 77645)
 __33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 104)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
@@ -35632,13 +35639,13 @@ __37:
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77667)
+	return Xsqlite3CorruptError(tls, 77672)
 __39:
 	;
 	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 108))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __40
 	}
-	return Xsqlite3CorruptError(tls, 77670)
+	return Xsqlite3CorruptError(tls, 77675)
 __40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint32(*(*int32)(unsafe.Pointer(bp + 108))))
@@ -35669,7 +35676,6 @@ __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 __44
 	}
@@ -35744,7 +35750,7 @@ 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, 77773)
+		return Xsqlite3CorruptError(tls, 77777)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
@@ -35769,7 +35775,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, 77798)
+				return Xsqlite3CorruptError(tls, 77802)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35870,7 +35876,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77894)
+			return Xsqlite3CorruptError(tls, 77898)
 		}
 	}
 
@@ -35878,11 +35884,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, 77903)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 	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, 77907)
+		return Xsqlite3CorruptError(tls, 77911)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -35957,7 +35963,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, 77998)
+			return Xsqlite3CorruptError(tls, 78002)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -36026,7 +36032,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, 78114)
+			return Xsqlite3CorruptError(tls, 78118)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -36055,7 +36061,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, 78162)
+				*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3CorruptError(tls, 78166)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 24)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 12)))
@@ -36131,7 +36137,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 78252)
+	return Xsqlite3CorruptError(tls, 78256)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -36145,7 +36151,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, 78259)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78263)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -36279,7 +36285,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, 78363)
+		return Xsqlite3CorruptError(tls, 78367)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -36496,7 +36502,7 @@ 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+44, ts+4062, 1)
+		Xsqlite3_str_append(tls, pCheck+44, ts+4081, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
 		Xsqlite3_str_appendf(tls, pCheck+44, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
@@ -36521,11 +36527,11 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 	defer tls.Free(16)
 
 	if iPage > (*IntegrityCk)(unsafe.Pointer(pCheck)).FnPage || iPage == Pgno(0) {
-		checkAppendMsg(tls, pCheck, ts+4064, libc.VaList(bp, iPage))
+		checkAppendMsg(tls, pCheck, ts+4083, libc.VaList(bp, iPage))
 		return 1
 	}
 	if getPageReferenced(tls, pCheck, iPage) != 0 {
-		checkAppendMsg(tls, pCheck, ts+4087, libc.VaList(bp+8, iPage))
+		checkAppendMsg(tls, pCheck, ts+4106, libc.VaList(bp+8, iPage))
 		return 1
 	}
 	setPageReferenced(tls, pCheck, iPage)
@@ -36543,13 +36549,13 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
 			checkOom(tls, pCheck)
 		}
-		checkAppendMsg(tls, pCheck, ts+4112, libc.VaList(bp, iChild))
+		checkAppendMsg(tls, pCheck, ts+4131, libc.VaList(bp, iChild))
 		return
 	}
 
 	if int32(*(*U8)(unsafe.Pointer(bp + 48))) != int32(eType) || *(*Pgno)(unsafe.Pointer(bp + 52)) != iParent {
 		checkAppendMsg(tls, pCheck,
-			ts+4141,
+			ts+4160,
 			libc.VaList(bp+8, iChild, int32(eType), iParent, int32(*(*U8)(unsafe.Pointer(bp + 48))), *(*Pgno)(unsafe.Pointer(bp + 52))))
 	}
 }
@@ -36568,7 +36574,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 		}
 		N--
 		if Xsqlite3PagerGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpPager, iPage, bp+40, 0) != 0 {
-			checkAppendMsg(tls, pCheck, ts+4195, libc.VaList(bp, iPage))
+			checkAppendMsg(tls, pCheck, ts+4214, libc.VaList(bp, iPage))
 			break
 		}
 		pOvflData = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
@@ -36579,7 +36585,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 			}
 			if n > (*BtShared)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt)).FusableSize/U32(4)-U32(2) {
 				checkAppendMsg(tls, pCheck,
-					ts+4217, libc.VaList(bp+8, iPage))
+					ts+4236, libc.VaList(bp+8, iPage))
 				N--
 			} else {
 				for i = 0; i < int32(n); i++ {
@@ -36602,12 +36608,12 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 	}
 	if N != 0 && nErrAtStart == (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr {
 		checkAppendMsg(tls, pCheck,
-			ts+4256,
+			ts+4275,
 			libc.VaList(bp+16, func() uintptr {
 				if isFreeList != 0 {
-					return ts + 4282
+					return ts + 4301
 				}
-				return ts + 4287
+				return ts + 4306
 			}(),
 				expected-N, expected))
 	}
@@ -36723,13 +36729,13 @@ __2:
 	return 0
 __3:
 	;
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4308
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4327
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
 		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4318, libc.VaList(bp, rc))
+		ts+4337, libc.VaList(bp, rc))
 	goto end_of_check
 __4:
 	;
@@ -36740,7 +36746,7 @@ __4:
 	}
 
 	checkAppendMsg(tls, pCheck,
-		ts+4356, libc.VaList(bp+8, rc))
+		ts+4375, libc.VaList(bp+8, rc))
 	goto end_of_check
 __5:
 	;
@@ -36748,14 +36754,14 @@ __5:
 		goto __6
 	}
 
-	checkAppendMsg(tls, pCheck, ts+4394, libc.VaList(bp+16, rc))
+	checkAppendMsg(tls, pCheck, ts+4413, libc.VaList(bp+16, rc))
 	goto end_of_check
 __6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
 
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4416
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4435
 	contentOffset = U32((int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5))))<<8|int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5) + 1)))-1)&0xffff + 1)
 
 	nCell = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3) + 1)))
@@ -36772,7 +36778,7 @@ __6:
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
 		goto __9
 	}
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4442
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4461
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
 __9:
 	;
@@ -36797,7 +36803,7 @@ __10:
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
 		goto __13
 	}
-	checkAppendMsg(tls, pCheck, ts+4470,
+	checkAppendMsg(tls, pCheck, ts+4489,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
 	goto __11
@@ -36810,7 +36816,7 @@ __13:
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
 		goto __14
 	}
-	checkAppendMsg(tls, pCheck, ts+4500, 0)
+	checkAppendMsg(tls, pCheck, ts+4519, 0)
 	doCoverageCheck = 0
 	goto __11
 __14:
@@ -36826,7 +36832,7 @@ __14:
 	}() != 0) {
 		goto __16
 	}
-	checkAppendMsg(tls, pCheck, ts+4524, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
+	checkAppendMsg(tls, pCheck, ts+4543, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
 __16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
@@ -36864,7 +36870,7 @@ __21:
 	if !(d2 != depth) {
 		goto __22
 	}
-	checkAppendMsg(tls, pCheck, ts+4548, 0)
+	checkAppendMsg(tls, pCheck, ts+4567, 0)
 	depth = d2
 __22:
 	;
@@ -36937,7 +36943,7 @@ __30:
 		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4573, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
+		ts+4592, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
 	goto __31
 	goto __33
 __32:
@@ -36954,7 +36960,7 @@ __31:
 		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4610,
+		ts+4629,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
 __34:
 	;
@@ -37068,7 +37074,7 @@ __6:
 	if !(bCkFreelist != 0) {
 		goto __7
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4662
+	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4681
 	checkList(tls, bp+32, 1, Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+32),
 		Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
@@ -37104,7 +37110,7 @@ __13:
 		goto __15
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4678,
+		ts+4697,
 		libc.VaList(bp, mx, mxInHdr))
 __15:
 	;
@@ -37114,7 +37120,7 @@ __9:
 		goto __16
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4723, 0)
+		ts+4742, 0)
 __16:
 	;
 __10:
@@ -37161,13 +37167,13 @@ __23:
 	if !(getPageReferenced(tls, bp+32, i) == 0 && (ptrmapPageno(tls, pBt, i) != i || !(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0))) {
 		goto __26
 	}
-	checkAppendMsg(tls, bp+32, ts+4778, libc.VaList(bp+16, i))
+	checkAppendMsg(tls, bp+32, ts+4797, libc.VaList(bp+16, i))
 __26:
 	;
 	if !(getPageReferenced(tls, bp+32, i) != 0 && (ptrmapPageno(tls, pBt, i) == i && (*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0)) {
 		goto __27
 	}
-	checkAppendMsg(tls, bp+32, ts+4800, libc.VaList(bp+24, i))
+	checkAppendMsg(tls, bp+32, ts+4819, libc.VaList(bp+24, i))
 __27:
 	;
 	goto __24
@@ -37430,7 +37436,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 		var rc int32 = 0
 		Xsqlite3ParseObjectInit(tls, bp+16, pDb)
 		if Xsqlite3OpenTempDatabase(tls, bp+16) != 0 {
-			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3663, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3682, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 			rc = SQLITE_ERROR
 		}
 		Xsqlite3DbFree(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
@@ -37441,7 +37447,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 	}
 
 	if i < 0 {
-		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4834, libc.VaList(bp+8, zDb))
+		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4853, libc.VaList(bp+8, zDb))
 		return uintptr(0)
 	}
 
@@ -37456,7 +37462,7 @@ func setDestPgsz(tls *libc.TLS, p uintptr) int32 {
 
 func checkReadTransaction(tls *libc.TLS, db uintptr, p uintptr) int32 {
 	if Xsqlite3BtreeTxnState(tls, p) != SQLITE_TXN_NONE {
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4854, 0)
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4873, 0)
 		return SQLITE_ERROR
 	}
 	return SQLITE_OK
@@ -37476,7 +37482,7 @@ func Xsqlite3_backup_init(tls *libc.TLS, pDestDb uintptr, zDestDb uintptr, pSrcD
 
 	if pSrcDb == pDestDb {
 		Xsqlite3ErrorWithMsg(tls,
-			pDestDb, SQLITE_ERROR, ts+4885, 0)
+			pDestDb, SQLITE_ERROR, ts+4904, 0)
 		p = uintptr(0)
 	} else {
 		p = Xsqlite3MallocZero(tls, uint64(unsafe.Sizeof(Sqlite3_backup{})))
@@ -37925,7 +37931,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 		(*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,
+		Xsqlite3_str_appendf(tls, bp+16, ts+4944,
 			libc.VaList(bp, func() float64 {
 				if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_IntReal != 0 {
 					return float64(*(*I64)(unsafe.Pointer(p)))
@@ -38517,7 +38523,7 @@ func Xsqlite3VdbeMemSetPointer(tls *libc.TLS, pMem uintptr, pPtr uintptr, zPType
 		if zPType != 0 {
 			return zPType
 		}
-		return ts + 1554
+		return ts + 1573
 	}()
 	(*Mem)(unsafe.Pointer(pMem)).Fz = pPtr
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null | MEM_Dyn | MEM_Subtype | MEM_Term)
@@ -38749,7 +38755,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, 81630)
+		return Xsqlite3CorruptError(tls, 81634)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -38980,7 +38986,7 @@ __9:
 		goto __10
 	}
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 8)).FisError
-	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3663, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
+	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3682, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
 	goto __11
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
@@ -39033,7 +39039,7 @@ func valueFromExpr(tls *libc.TLS, db uintptr, pExpr uintptr, enc U8, affinity U8
 	zVal = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	negInt = 1
-	zNeg = ts + 1554
+	zNeg = ts + 1573
 	rc = SQLITE_OK
 
 __1:
@@ -39074,7 +39080,7 @@ __4:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
 	negInt = -1
-	zNeg = ts + 4932
+	zNeg = ts + 4951
 __6:
 	;
 	if !(op == TK_STRING || op == TK_FLOAT || op == TK_INTEGER) {
@@ -39093,7 +39099,7 @@ __9:
 	Xsqlite3VdbeMemSetInt64(tls, *(*uintptr)(unsafe.Pointer(bp + 16)), I64(*(*int32)(unsafe.Pointer(pExpr + 8)))*I64(negInt))
 	goto __11
 __10:
-	zVal = Xsqlite3MPrintf(tls, db, ts+4934, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+	zVal = Xsqlite3MPrintf(tls, db, ts+4953, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	if !(zVal == uintptr(0)) {
 		goto __12
 	}
@@ -39397,7 +39403,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, 82270)
+		return Xsqlite3CorruptError(tls, 82274)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -39412,14 +39418,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 82276)
+			return Xsqlite3CorruptError(tls, 82280)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 82282)
+		return Xsqlite3CorruptError(tls, 82286)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -40427,34 +40433,34 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var j int32
 			var pKeyInfo uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4939, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4958, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
 			for j = 0; j < int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField); j++ {
 				var pColl uintptr = *(*uintptr)(unsafe.Pointer(pKeyInfo + 20 + uintptr(j)*4))
 				var zColl uintptr
 				if pColl != 0 {
 					zColl = (*CollSeq)(unsafe.Pointer(pColl)).FzName
 				} else {
-					zColl = ts + 1554
+					zColl = ts + 1573
 				}
-				if libc.Xstrcmp(tls, zColl, ts+1099) == 0 {
-					zColl = ts + 4944
+				if libc.Xstrcmp(tls, zColl, ts+1118) == 0 {
+					zColl = ts + 4963
 				}
-				Xsqlite3_str_appendf(tls, bp+144, ts+4946,
+				Xsqlite3_str_appendf(tls, bp+144, ts+4965,
 					libc.VaList(bp+8, func() uintptr {
 						if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_DESC != 0 {
-							return ts + 4932
+							return ts + 4951
 						}
-						return ts + 1554
+						return ts + 1573
 					}(),
 						func() uintptr {
 							if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_BIGNULL != 0 {
-								return ts + 4954
+								return ts + 4973
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						zColl))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4957, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+4976, 1)
 			break
 
 		}
@@ -40462,7 +40468,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 		{
 			var pColl uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4959, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
+			Xsqlite3_str_appendf(tls, bp+144, ts+4978, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
 				encnames[(*CollSeq)(unsafe.Pointer(pColl)).Fenc]))
 			break
 
@@ -40470,32 +40476,32 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -7:
 		{
 			var pDef uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
-			Xsqlite3_str_appendf(tls, bp+144, ts+4968, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4987, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -15:
 		{
 			var pDef uintptr = (*Sqlite3_context)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpFunc
-			Xsqlite3_str_appendf(tls, bp+144, ts+4968, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4987, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -13:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1334, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1353, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
 	case -3:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+4975, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4994, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
 			break
 
 		}
 	case -12:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1328, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1347, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
@@ -40505,13 +40511,13 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Str != 0 {
 				zP4 = (*Mem)(unsafe.Pointer(pMem)).Fz
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1334, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1353, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1328, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1347, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Null != 0 {
-				zP4 = ts + 1555
+				zP4 = ts + 1574
 			} else {
-				zP4 = ts + 4978
+				zP4 = ts + 4997
 			}
 			break
 
@@ -40519,7 +40525,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -11:
 		{
 			var pVtab uintptr = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-			Xsqlite3_str_appendf(tls, bp+144, ts+4985, libc.VaList(bp+120, pVtab))
+			Xsqlite3_str_appendf(tls, bp+144, ts+5004, libc.VaList(bp+120, pVtab))
 			break
 
 		}
@@ -40530,20 +40536,20 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var n U32 = *(*U32)(unsafe.Pointer(ai))
 
 			for i = U32(1); i <= n; i++ {
-				Xsqlite3_str_appendf(tls, bp+144, ts+4993, libc.VaList(bp+128, func() int32 {
+				Xsqlite3_str_appendf(tls, bp+144, ts+5012, libc.VaList(bp+128, func() int32 {
 					if i == U32(1) {
 						return '['
 					}
 					return ','
 				}(), *(*U32)(unsafe.Pointer(ai + uintptr(i)*4))))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4998, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+5017, 1)
 			break
 
 		}
 	case -4:
 		{
-			zP4 = ts + 5000
+			zP4 = ts + 5019
 			break
 
 		}
@@ -40568,7 +40574,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	return Xsqlite3StrAccumFinish(tls, bp+144)
 }
 
-var encnames = [4]uintptr{ts + 5008, ts + 5010, ts + 5012, ts + 5017}
+var encnames = [4]uintptr{ts + 5027, ts + 5029, ts + 5031, ts + 5036}
 
 // Declare to the Vdbe that the BTree object at db->aDb[i] is used.
 //
@@ -41019,8 +41025,8 @@ func Xsqlite3VdbeMakeReady(tls *libc.TLS, p uintptr, pParse uintptr) {
 }
 
 var azColName = [12]uintptr{
-	ts + 5022, ts + 5027, ts + 5034, ts + 5037, ts + 5040, ts + 5043, ts + 5046, ts + 5049,
-	ts + 5057, ts + 5060, ts + 5067, ts + 5075,
+	ts + 5041, ts + 5046, ts + 5053, ts + 5056, ts + 5059, ts + 5062, ts + 5065, ts + 5068,
+	ts + 5076, ts + 5079, ts + 5086, ts + 5094,
 }
 
 // Close a VDBE cursor and release all the resources that cursor
@@ -41229,7 +41235,7 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		var nMainFile int32
 
 		nMainFile = Xsqlite3Strlen30(tls, zMainFile)
-		zSuper = Xsqlite3MPrintf(tls, db, ts+5082, libc.VaList(bp, 0, zMainFile, 0))
+		zSuper = Xsqlite3MPrintf(tls, db, ts+5101, libc.VaList(bp, 0, zMainFile, 0))
 		if zSuper == uintptr(0) {
 			return SQLITE_NOMEM
 		}
@@ -41237,16 +41243,16 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		for __ccgo := true; __ccgo; __ccgo = rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 60)) != 0 {
 			if retryCount != 0 {
 				if retryCount > 100 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5094, libc.VaList(bp+24, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5113, libc.VaList(bp+24, zSuper))
 					Xsqlite3OsDelete(tls, pVfs, zSuper, 0)
 					break
 				} else if retryCount == 1 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5108, libc.VaList(bp+32, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5127, libc.VaList(bp+32, zSuper))
 				}
 			}
 			retryCount++
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
-			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5123,
+			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5142,
 				libc.VaList(bp+40, *(*U32)(unsafe.Pointer(bp + 56))>>8&U32(0xffffff), *(*U32)(unsafe.Pointer(bp + 56))&U32(0xff)))
 
 			rc = Xsqlite3OsAccess(tls, pVfs, zSuper, SQLITE_ACCESS_EXISTS, bp+60)
@@ -41392,7 +41398,7 @@ func Xsqlite3VdbeCheckFk(tls *libc.TLS, p uintptr, deferred int32) int32 {
 		!(deferred != 0) && (*Vdbe)(unsafe.Pointer(p)).FnFkConstraint > int64(0) {
 		(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_CONSTRAINT | int32(3)<<8
 		(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
-		Xsqlite3VdbeError(tls, p, ts+5136, 0)
+		Xsqlite3VdbeError(tls, p, ts+5155, 0)
 		if int32((*Vdbe)(unsafe.Pointer(p)).FprepFlags)&SQLITE_PREPARE_SAVESQL == 0 {
 			return SQLITE_ERROR
 		}
@@ -41724,7 +41730,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 86058)
+		return Xsqlite3CorruptError(tls, 86062)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -42275,7 +42281,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86989))
 		return 0
 	}
 
@@ -42340,7 +42346,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, 87062))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87066))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 20 + uintptr(i)*4)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -42374,7 +42380,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, 87092))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87096))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -42424,7 +42430,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, 87136))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87140))
 			return 0
 		}
 	}
@@ -42570,7 +42576,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87303))
 	return 0
 __7:
 	;
@@ -42741,7 +42747,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87457)
+	return Xsqlite3CorruptError(tls, 87461)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42767,7 +42773,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, 87490)
+		return Xsqlite3CorruptError(tls, 87494)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -42878,13 +42884,13 @@ func Xsqlite3NotPureFunc(tls *libc.TLS, pCtx uintptr) int32 {
 		var zContext uintptr
 		var zMsg uintptr
 		if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_IsCheck != 0 {
-			zContext = ts + 5166
-		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5185
-		} else {
+		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5204
+		} else {
+			zContext = ts + 5223
 		}
-		zMsg = Xsqlite3_mprintf(tls, ts+5213,
+		zMsg = Xsqlite3_mprintf(tls, ts+5232,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx)).FpFunc)).FzName, zContext))
 		Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 		Xsqlite3_free(tls, zMsg)
@@ -42989,7 +42995,7 @@ func Xsqlite3_expired(tls *libc.TLS, pStmt uintptr) int32 {
 
 func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 	if (*Vdbe)(unsafe.Pointer(p)).Fdb == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5249, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5268, 0)
 		return 1
 	} else {
 		return 0
@@ -42999,7 +43005,7 @@ func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 
 func vdbeSafetyNotNull(tls *libc.TLS, p uintptr) int32 {
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5294, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5313, 0)
 		return 1
 	} else {
 		return vdbeSafety(tls, p)
@@ -43041,7 +43047,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, 87854)
+			return Xsqlite3MisuseError(tls, 87858)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -43464,7 +43470,7 @@ func Xsqlite3_result_error_code(tls *libc.TLS, pCtx uintptr, errCode int32) {
 // Force an SQLITE_TOOBIG error.
 func Xsqlite3_result_error_toobig(tls *libc.TLS, pCtx uintptr) {
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FisError = SQLITE_TOOBIG
-	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5334, int64(-1),
+	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5353, int64(-1),
 		uint8(SQLITE_UTF8), uintptr(0))
 }
 
@@ -43656,7 +43662,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88544)
+		return Xsqlite3MisuseError(tls, 88548)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -44176,15 +44182,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 89208)
+		return Xsqlite3MisuseError(tls, 89212)
 	}
 	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+5357, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 89216)
+			ts+5376, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89220)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -44589,7 +44595,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, 89707)
+	rc = Xsqlite3MisuseError(tls, 89711)
 	goto preupdate_old_out
 __1:
 	;
@@ -44733,7 +44739,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, 89809)
+	rc = Xsqlite3MisuseError(tls, 89813)
 	goto preupdate_new_out
 __1:
 	;
@@ -44905,7 +44911,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+5397, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5416, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, (int32(zRawSql)-int32(zStart))/1)
 		}
@@ -44941,11 +44947,11 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 
 			pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr(*(*int32)(unsafe.Pointer(bp + 76))-1)*40
 			if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Null != 0 {
-				Xsqlite3_str_append(tls, bp+48, ts+1555, 4)
+				Xsqlite3_str_append(tls, bp+48, ts+1574, 4)
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+1334, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+1353, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+4925, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+4944, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Str != 0 {
 				var nOut int32
 				var enc U8 = (*Sqlite3)(unsafe.Pointer(db)).Fenc
@@ -44960,21 +44966,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+5401, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5420, 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+5408, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5427, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5421, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5440, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					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_appendf(tls, bp+48, ts+5443, libc.VaList(bp+40, int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5429, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5448, 1)
 			}
 		}
 	}
@@ -45177,10 +45183,6 @@ func filterHash(tls *libc.TLS, aMem uintptr, pOp uintptr) U64 {
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Real != 0 {
 			h = h + U64(Xsqlite3VdbeIntValue(tls, p))
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&(MEM_Str|MEM_Blob) != 0 {
-			h = h + U64((*Mem)(unsafe.Pointer(p)).Fn)
-			if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Zero != 0 {
-				h = h + U64(*(*int32)(unsafe.Pointer(p)))
-			}
 		}
 	}
 	return h
@@ -45191,11 +45193,11 @@ func vdbeMemTypeName(tls *libc.TLS, pMem uintptr) uintptr {
 }
 
 var azTypes = [5]uintptr{
-	ts + 1115,
-	ts + 1127,
-	ts + 1132,
-	ts + 1110,
-	ts + 1555,
+	ts + 1134,
+	ts + 1146,
+	ts + 1151,
+	ts + 1129,
+	ts + 1574,
 }
 
 // Execute as much of a VDBE program as we can.
@@ -46237,20 +46239,20 @@ __202:
 		goto __205
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5431, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	Xsqlite3VdbeError(tls, p, ts+5450, 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))))
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5471, 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))))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
 	;
 	pcx = (int32(pOp) - int32(aOp)) / 20
-	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))
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5478, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 __204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
@@ -47828,7 +47830,7 @@ op_column_corrupt:
 	goto __9
 	goto __425
 __424:
-	rc = Xsqlite3CorruptError(tls, 93317)
+	rc = Xsqlite3CorruptError(tls, 93320)
 	goto abort_due_to_error
 __425:
 	;
@@ -47956,7 +47958,7 @@ __428:
 	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5483,
+	Xsqlite3VdbeError(tls, p, ts+5502,
 		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
@@ -48388,7 +48390,7 @@ __78:
 		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5524, 0)
+	Xsqlite3VdbeError(tls, p, ts+5543, 0)
 	rc = SQLITE_BUSY
 	goto __523
 __522:
@@ -48448,7 +48450,7 @@ __530:
 	if !!(pSavepoint != 0) {
 		goto __531
 	}
-	Xsqlite3VdbeError(tls, p, ts+5575, libc.VaList(bp+88, zName))
+	Xsqlite3VdbeError(tls, p, ts+5594, libc.VaList(bp+88, zName))
 	rc = SQLITE_ERROR
 	goto __532
 __531:
@@ -48457,7 +48459,7 @@ __531:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5597, 0)
+		ts+5616, 0)
 	rc = SQLITE_BUSY
 	goto __534
 __533:
@@ -48643,7 +48645,7 @@ __564:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5651, 0)
+		ts+5670, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
 	goto __567
@@ -48686,13 +48688,13 @@ __562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5706
+				return ts + 5725
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5754
+					return ts + 5773
 				}
-				return ts + 5797
+				return ts + 5816
 			}()
 		}(), 0)
 
@@ -48775,7 +48777,7 @@ __576:
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5838)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5857)
 
 	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 __583
@@ -48979,7 +48981,7 @@ __88:
 	}
 
 	(*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
+	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fz = ts + 1573
 __602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
@@ -49588,7 +49590,7 @@ notExistsWithKey:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
 		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95560)
+	rc = Xsqlite3CorruptError(tls, 95563)
 	goto __683
 __682:
 	goto jump_to_p2
@@ -50366,7 +50368,7 @@ __767:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
 		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5866)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96638, ts+5885)
 	goto abort_due_to_error
 __770:
 	;
@@ -50476,7 +50478,7 @@ __780:
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
 		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96840)
+	rc = Xsqlite3CorruptError(tls, 96843)
 	goto abort_due_to_error
 __781:
 	;
@@ -50637,14 +50639,14 @@ __141:
 	libc.SetBitFieldPtr8Uint32(p+152, Bft(0), 0, 0x3)
 	goto __799
 __798:
-	zSchema = ts + 5883
+	zSchema = ts + 5902
 	(*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+5897,
+		ts+5916,
 		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 __800
@@ -50670,7 +50672,7 @@ __802:
 		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 97092)
+	rc = Xsqlite3CorruptError(tls, 97095)
 __803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
@@ -50860,7 +50862,7 @@ __820:
 		goto __825
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5940, 0)
+	Xsqlite3VdbeError(tls, p, ts+5959, 0)
 	goto abort_due_to_error
 __825:
 	;
@@ -51172,7 +51174,7 @@ __860:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
 		goto __862
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
 __862:
 	;
@@ -51222,7 +51224,7 @@ __867:
 	if !(rc != 0) {
 		goto __868
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
 __868:
 	;
@@ -51304,12 +51306,12 @@ __876:
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5977,
+		ts+5996,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6029
+				return ts + 6048
 			}
-			return ts + 6034
+			return ts + 6053
 		}()))
 	goto abort_due_to_error
 	goto __879
@@ -51451,7 +51453,7 @@ __171:
 		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6041, libc.VaList(bp+144, z1))
+	Xsqlite3VdbeError(tls, p, ts+6060, libc.VaList(bp+144, z1))
 __894:
 	;
 	goto abort_due_to_error
@@ -51569,7 +51571,7 @@ __904:
 	(*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+6070, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6089, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
 	goto __9
 
 __177:
@@ -51658,7 +51660,7 @@ __912:
 	if !((*Sqlite3_context)(unsafe.Pointer(bp+836)).FisError > 0) {
 		goto __913
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 836)).FisError
 __913:
 	;
@@ -51888,7 +51890,7 @@ __935:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
 		goto __940
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
 __940:
 	;
@@ -51964,7 +51966,7 @@ __945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
 		goto __947
 	}
-	z3 = Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp+168, zTrace))
+	z3 = Xsqlite3MPrintf(tls, db, ts+6099, 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)
@@ -52037,7 +52039,7 @@ __955:
 	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __957
 	}
-	rc = Xsqlite3CorruptError(tls, 99031)
+	rc = Xsqlite3CorruptError(tls, 99034)
 __957:
 	;
 __956:
@@ -52045,13 +52047,13 @@ __956:
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
 		goto __958
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
 __958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
 
-	Xsqlite3_log(tls, rc, ts+6086,
+	Xsqlite3_log(tls, rc, ts+6105,
 		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 __959
@@ -52107,13 +52109,13 @@ __966:
 	return rc
 
 too_big:
-	Xsqlite3VdbeError(tls, p, ts+5334, 0)
+	Xsqlite3VdbeError(tls, p, ts+5353, 0)
 	rc = SQLITE_TOOBIG
 	goto abort_due_to_error
 
 no_mem:
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3VdbeError(tls, p, ts+1490, 0)
+	Xsqlite3VdbeError(tls, p, ts+1509, 0)
 	rc = SQLITE_NOMEM
 	goto abort_due_to_error
 
@@ -52124,8 +52126,8 @@ abort_due_to_interrupt:
 	return int32(0)
 }
 
-var azType = [4]uintptr{ts + 6118, ts + 6127, ts + 6134,
-	ts + 6140}
+var azType = [4]uintptr{ts + 6137, ts + 6146, ts + 6153,
+	ts + 6159}
 var and_logic = [9]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(1), uint8(2), uint8(0), uint8(2), uint8(2)}
 var or_logic = [9]uint8{uint8(0), uint8(1), uint8(2), uint8(1), uint8(1), uint8(1), uint8(2), uint8(1), uint8(2)}
 var aMask = [12]uint8{
@@ -52180,16 +52182,16 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		}
 
 		if type1 < U32(12) {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6152,
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6171,
 				libc.VaList(bp, func() uintptr {
 					if type1 == U32(0) {
-						return ts + 6181
+						return ts + 6200
 					}
 					return func() uintptr {
 						if type1 == U32(7) {
-							return ts + 6186
+							return ts + 6205
 						}
-						return ts + 6191
+						return ts + 6210
 					}()
 				}()))
 			rc = SQLITE_ERROR
@@ -52209,10 +52211,10 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		rc = Xsqlite3_finalize(tls, (*Incrblob)(unsafe.Pointer(p)).FpStmt)
 		(*Incrblob)(unsafe.Pointer(p)).FpStmt = uintptr(0)
 		if rc == SQLITE_OK {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6199, libc.VaList(bp+8, iRow))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6218, libc.VaList(bp+8, iRow))
 			rc = SQLITE_ERROR
 		} else {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3663, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3682, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
 		}
 	}
 
@@ -52272,21 +52274,21 @@ __3:
 		goto __4
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6219, libc.VaList(bp, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6238, libc.VaList(bp, zTable))
 __4:
 	;
 	if !(pTab != 0 && !((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0))) {
 		goto __5
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6249, libc.VaList(bp+8, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6268, libc.VaList(bp+8, zTable))
 __5:
 	;
 	if !(pTab != 0 && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __6
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6285, libc.VaList(bp+16, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6304, libc.VaList(bp+16, zTable))
 __6:
 	;
 	if !!(pTab != 0) {
@@ -52330,7 +52332,7 @@ __11:
 		goto __13
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
-	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6325, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52357,7 +52359,7 @@ __19:
 	if !((*sColMap)(unsafe.Pointer(pFKey+36+uintptr(j)*8)).FiFrom == iCol) {
 		goto __22
 	}
-	zFault = ts + 6327
+	zFault = ts + 6346
 __22:
 	;
 	goto __20
@@ -52390,7 +52392,7 @@ __26:
 	if !(int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == iCol || int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == -2) {
 		goto __29
 	}
-	zFault = ts + 6339
+	zFault = ts + 6358
 __29:
 	;
 	goto __27
@@ -52411,7 +52413,7 @@ __25:
 		goto __30
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
-	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6366, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52509,7 +52511,7 @@ __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 328)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 328))))
@@ -52557,7 +52559,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99516)
+		return Xsqlite3MisuseError(tls, 99519)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52640,7 +52642,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99616)
+		return Xsqlite3MisuseError(tls, 99619)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52653,7 +52655,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 				if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-					return ts + 3663
+					return ts + 3682
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
@@ -55180,25 +55182,25 @@ 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 {
+	if Xsqlite3_strnicmp(tls, zTab, ts+6400, 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 {
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6408+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
 			return 1
 		}
 		if pSchema == uintptr(0) {
 			return 0
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5883+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5902+7) == 0 {
 			return 1
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6446+7) == 0 {
 			return 1
 		}
 	} else {
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6446+7) == 0 {
 			return 1
 		}
 	}
@@ -55278,7 +55280,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6441, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6460, zDb) == 0) {
 		goto __8
 	}
 
@@ -55399,7 +55401,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6446) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6465) != 0) {
 		goto __33
 	}
 	goto __14
@@ -55573,14 +55575,14 @@ __60:
 	;
 	goto __59
 __58:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6448, zTab) == 0) {
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6467, zTab) == 0) {
 		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
 	goto __62
 __61:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6452, zTab) == 0) {
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6471, zTab) == 0) {
 		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
@@ -55597,7 +55599,7 @@ __57:
 		goto __64
 	}
 	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 8))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6456, zTab) == 0) {
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6475, zTab) == 0) {
 		goto __65
 	}
 	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
@@ -55756,7 +55758,7 @@ __86:
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
 		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6465, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6484, libc.VaList(bp, zAs))
 	return WRC_Abort
 __90:
 	;
@@ -55764,14 +55766,14 @@ __90:
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
 		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6496, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6515, libc.VaList(bp+8, zAs))
 	return WRC_Abort
 __91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
 		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	return WRC_Abort
 __92:
 	;
@@ -55823,7 +55825,7 @@ __11:
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6551, libc.VaList(bp+16, zCol))
+		ts+6570, 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
@@ -55863,7 +55865,7 @@ __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 + 6586
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6605
 	*(*uintptr)(unsafe.Pointer(pExpr + 20)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
@@ -55876,23 +55878,23 @@ __101:
 __99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6595
+		zErr = ts + 6614
 	} else {
-		zErr = ts + 6610
+		zErr = ts + 6629
 	}
 	if !(zDb != 0) {
 		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6632, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6651, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
 	goto __105
 __104:
 	if !(zTab != 0) {
 		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp+56, zErr, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6664, libc.VaList(bp+56, zErr, zTab, zCol))
 	goto __107
 __106:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+80, zErr, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6674, libc.VaList(bp+80, zErr, zCol))
 __107:
 	;
 __105:
@@ -55995,15 +55997,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 + 6662
+	var zIn uintptr = ts + 6681
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6690
+		zIn = ts + 6709
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6708
+		zIn = ts + 6727
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6726
+		zIn = ts + 6745
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6744, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6763, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -56081,14 +56083,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 + 6764
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
-				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
-				}
-				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
+				*(*int32)(unsafe.Pointer(pExpr + 8)) = libc.Bool32(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL)
+				*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IntValue)
+				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_INTEGER)
+
 				i = 0
 				p = pNC
 			__4:
@@ -56132,7 +56130,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+6775, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6783, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -56196,7 +56194,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+6792, libc.VaList(bp, pExpr))
+								ts+6800, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -56212,7 +56210,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+6856,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6864,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -56226,7 +56224,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+6892, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6900, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -56249,30 +56247,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+6920, libc.VaList(bp+16, pExpr))
+						ts+6928, 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 + 6963
+						zType = ts + 6971
 					} else {
-						zType = ts + 6970
+						zType = ts + 6978
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6980, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6988, 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+7008, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7016, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7030,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7038,
 						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+7074,
+						ts+7082,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -56344,15 +56342,15 @@ 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+7122, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7130, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 20)))
 				}
 
 				if nRef != (*NameContext)(unsafe.Pointer(pNC)).FnRef {
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_VarSelect)
-					*(*int32)(unsafe.Pointer(pNC + 24)) |= NC_VarSelect
 				}
+				*(*int32)(unsafe.Pointer(pNC + 24)) |= NC_Subquery
 			}
 			break
 
@@ -56360,7 +56358,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+7133, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7141, pExpr, pExpr)
 			}
 
 			break
@@ -56416,7 +56414,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+6533, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -56491,7 +56489,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7144, libc.VaList(bp, i, zType, mx))
+		ts+7152, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -56511,7 +56509,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+7200, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7208, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -56546,7 +56544,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+7234, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7242, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -56603,7 +56601,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+7240, libc.VaList(bp, i+1))
+				ts+7248, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -56631,7 +56629,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+7301, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7309, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -56845,7 +56843,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+7332, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7340, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -56885,7 +56883,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+7234) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7242) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -56896,7 +56894,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7371) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7379) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -56908,7 +56906,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+7377, 0)
+						ts+7385, 0)
 					return WRC_Abort
 				}
 
@@ -57697,7 +57695,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 		return
 	}
 
@@ -57772,7 +57770,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+7436, libc.VaList(bp, mxHeight))
+			ts+7444, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -58021,12 +58019,12 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7484,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7492,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7528
+						return ts + 7536
 					}
-					return ts + 1554
+					return ts + 1573
 				}(), nElem))
 			break
 		}
@@ -58065,7 +58063,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+7530)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -58091,7 +58089,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+7532, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7540, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 20)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -58119,7 +58117,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+7566, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7574, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -58166,7 +58164,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+7586,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7594,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 120 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -58191,7 +58189,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+7629, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7637, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -58766,7 +58764,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+7652,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7660,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -58889,7 +58887,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+7682, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7690, libc.VaList(bp, zObject))
 	}
 }
 
@@ -58945,10 +58943,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+6764) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7713) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6769) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7718) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -59378,13 +59376,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+7705) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7724) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7713) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7732) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7719) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7738) == 0 {
 		return 1
 	}
 	return 0
@@ -59588,7 +59586,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+7723, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7742, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -59666,7 +59664,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+7770, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7789, 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)
 
@@ -59760,7 +59758,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 + 7801
+		var zFmt uintptr = ts + 7820
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -59778,7 +59776,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+6533, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	}
 }
 
@@ -59819,7 +59817,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+7845, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7864, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 44 + 4)),
@@ -59849,11 +59847,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+7868, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7887, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
-				return ts + 1554
+				return ts + 1573
 			}
-			return ts + 7887
+			return ts + 7906
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -59980,7 +59978,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+7899, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7918, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 44 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 44)))
@@ -59995,11 +59993,11 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7917, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7936, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
-			return ts + 1554
+			return ts + 1573
 		}
-		return ts + 7887
+		return ts + 7906
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
@@ -60022,7 +60020,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+7530)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = uint8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -60031,7 +60029,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+7938)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7957)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -60417,13 +60415,13 @@ 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+7940, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7943,
+			if Xsqlite3_strnicmp(tls, z, ts+7959, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7962,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
-							return ts + 4932
+							return ts + 4951
 						}
-						return ts + 1554
+						return ts + 1573
 					}(), pExpr))
 			} else {
 				codeReal(tls, v, z, negFlag, iMem)
@@ -60460,6 +60458,7 @@ func Xsqlite3ExprCodeLoadIndexColumn(tls *libc.TLS, pParse uintptr, pIdx uintptr
 func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr, pCol uintptr, regOut int32) {
 	var iAddr int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
+	var nErr int32 = (*Parse)(unsafe.Pointer(pParse)).FnErr
 
 	if (*Parse)(unsafe.Pointer(pParse)).FiSelfTab > 0 {
 		iAddr = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Parse)(unsafe.Pointer(pParse)).FiSelfTab-1, 0, regOut)
@@ -60473,6 +60472,9 @@ func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr
 	if iAddr != 0 {
 		Xsqlite3VdbeJumpHere(tls, v, iAddr)
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr > nErr {
+		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FerrByteOffset = -1
+	}
 }
 
 // Generate code to extract the value of the iCol-th column of a table.
@@ -60494,7 +60496,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+7970,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7989,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -60667,8 +60669,8 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[6]uintptr)(unsafe.Pointer(bp + 52)) = [6]uintptr{ts + 8000, ts + 8005, ts + 8010, ts + 6191,
-				ts + 6186, ts + 8018}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 52)) = [6]uintptr{ts + 8019, ts + 8024, ts + 8029, ts + 6210,
+				ts + 6205, ts + 8037}
 			var aff uint8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
@@ -60676,7 +60678,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 8026
+						return ts + 8045
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 52 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*4))
 				}())
@@ -60691,6 +60693,7 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 	var p uintptr
 	var v uintptr
 	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+		var exprAff U8
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -60704,6 +60707,14 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 		if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr, iDataCur) != 0 {
 			continue
 		}
+
+		exprAff = Xsqlite3ExprAffinity(tls, pExpr)
+		if int32(exprAff) <= SQLITE_AFF_BLOB && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_BLOB ||
+			int32(exprAff) == SQLITE_AFF_TEXT && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_TEXT ||
+			int32(exprAff) >= SQLITE_AFF_NUMERIC && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_NUMERIC {
+			continue
+		}
+
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 
 		if (*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow != 0 {
@@ -61043,7 +61054,7 @@ __73:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
 		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7970,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7989,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
 __76:
@@ -61276,7 +61287,7 @@ __43:
 		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+8031, libc.VaList(bp+8, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8050, libc.VaList(bp+8, pExpr))
 	goto __91
 __90:
 	return func() int32 {
@@ -61317,7 +61328,7 @@ __93:
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
 		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8058, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8077, libc.VaList(bp+16, pExpr))
 	goto __5
 __94:
 	;
@@ -61477,7 +61488,7 @@ __121:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
 		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7660,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
 __122:
 	;
@@ -61499,11 +61510,10 @@ __49:
 	return target
 
 __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) {
+	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) {
 		goto __123
 	}
+
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
 		goto __125
@@ -61543,7 +61553,7 @@ __126:
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	goto __5
 
 __55:
@@ -61574,13 +61584,19 @@ __129:
 	;
 __127:
 	;
-	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
+	addrINR = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable, 0, target)
 
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = U8(0)
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = okConstFactor
+	if !(inReg != target) {
+		goto __130
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
+	inReg = target
+__130:
+	;
 	Xsqlite3VdbeJumpHere(tls, v, addrINR)
-	Xsqlite3VdbeChangeP3(tls, v, addrINR, inReg)
 	goto __5
 
 __56:
@@ -61593,15 +61609,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __130
+		goto __131
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __131
+		goto __132
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__131:
+__132:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -61611,22 +61627,22 @@ __131:
 	pTest = bp + 100
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__130:
+__131:
 	;
 	i1 = 0
-__132:
+__133:
 	if !(i1 < nExpr-1) {
-		goto __134
+		goto __135
 	}
 	if !(pX != 0) {
-		goto __135
+		goto __136
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 100)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
-	goto __136
-__135:
-	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
+	goto __137
 __136:
+	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
+__137:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -61635,21 +61651,21 @@ __136:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*20)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __133
-__133:
-	i1 = i1 + 2
-	goto __132
 	goto __134
 __134:
+	i1 = i1 + 2
+	goto __133
+	goto __135
+__135:
 	;
 	if !(nExpr&1 != 0) {
-		goto __137
+		goto __138
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*20)).FpExpr, target)
-	goto __138
-__137:
-	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+	goto __139
 __138:
+	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+__139:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -61659,27 +61675,27 @@ __138:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __139
-	}
-	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8082, 0)
-	return 0
-__139:
-	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __140
 	}
-	Xsqlite3MayAbort(tls, pParse)
+	Xsqlite3ErrorMsg(tls, pParse,
+		ts+8101, 0)
+	return 0
 __140:
 	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __141
 	}
+	Xsqlite3MayAbort(tls, pParse)
+__141:
+	;
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+		goto __142
+	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __142
-__141:
+	goto __143
+__142:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -61688,7 +61704,7 @@ __141:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__142:
+__143:
 	;
 	goto __5
 
@@ -61699,7 +61715,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[10]uint8)(unsafe.Pointer(ts + 8132))
+var zAff = *(*[10]uint8)(unsafe.Pointer(ts + 8151))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -63488,11 +63504,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+6381, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 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+8142, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8161, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -63504,13 +63520,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8170,
+		ts+8189,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8345,
+			ts+8364,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -63520,10 +63536,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8519, libc.VaList(bp, zDb, zDb))
+		ts+8538, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8666, 0)
+			ts+8685, 0)
 	}
 }
 
@@ -63587,7 +63603,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8817, libc.VaList(bp, zName))
+		ts+8836, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -63597,7 +63613,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8876, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8895, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -63606,7 +63622,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8882, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8901, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -63647,19 +63663,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8909, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8928, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9093,
+		ts+9112,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9398, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9417, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9414,
+		ts+9433,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -63667,7 +63683,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9472, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9491, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -63679,7 +63695,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9737, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9756, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63691,7 +63707,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9750,
+		ts+9769,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -63737,12 +63753,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9788, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9807, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9820, 0)
+			ts+9839, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -63752,11 +63768,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+9847)
+				ts+9866)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9906)
+				ts+9925)
 		}
 
 		if pDflt != 0 {
@@ -63769,12 +63785,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9959)
+					ts+9978)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10005)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10024)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -63785,7 +63801,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10032,
+			ts+10051,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 44)), zCol, *(*int32)(unsafe.Pointer(pNew + 44)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -63807,7 +63823,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+10178,
+				ts+10197,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -63855,14 +63871,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10408, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10427, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10442, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10461, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -63890,7 +63906,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+10472, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10491, 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
 	}
@@ -63930,18 +63946,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 + 10491
+		zType = ts + 10510
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10496
+		zType = ts + 10515
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10510,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10529,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10528
+					return ts + 10547
 				}
-				return ts + 10545
+				return ts + 10564
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -64025,11 +64041,11 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10582, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1554, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1573, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iSchema == 1))
 
 	Xsqlite3MayAbort(tls, pParse)
@@ -64042,17 +64058,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10584,
+		ts+10603,
 		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+10766,
+		ts+10785,
 		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+9737, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9756, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -64310,12 +64326,12 @@ 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+10897,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10916,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*uint8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10920
+				return ts + 10939
 			}
-			return ts + 1554
+			return ts + 1573
 		}(), zWhen,
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg))
 	Xsqlite3_result_error(tls, pCtx, zErr, -1)
@@ -64355,8 +64371,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+10922, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 113494)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10941, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113516)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -64373,7 +64389,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, 113505)
+		rc = Xsqlite3CorruptError(tls, 113527)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -64395,7 +64411,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+10930, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10949, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -64435,12 +64451,12 @@ 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+10936, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10955, 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 + 10920
+							return ts + 10939
 						}
-						return ts + 1554
+						return ts + 1573
 					}()))
 				zReplace = zBuf2
 				nReplace = U32(Xsqlite3Strlen30(tls, zReplace))
@@ -64926,7 +64942,7 @@ __45:
 	if !((*Parse)(unsafe.Pointer(bp+20)).FzErrMsg != 0) {
 		goto __47
 	}
-	renameColumnParseError(tls, context, ts+1554, *(*uintptr)(unsafe.Pointer(argv + 1*4)), *(*uintptr)(unsafe.Pointer(argv + 2*4)), bp+20)
+	renameColumnParseError(tls, context, ts+1573, *(*uintptr)(unsafe.Pointer(argv + 1*4)), *(*uintptr)(unsafe.Pointer(argv + 2*4)), bp+20)
 	goto __48
 __47:
 	Xsqlite3_result_error_code(tls, context, rc)
@@ -65091,7 +65107,7 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 			if rc == SQLITE_ERROR && Xsqlite3WritableSchema(tls, db) != 0 {
 				Xsqlite3_result_value(tls, context, *(*uintptr)(unsafe.Pointer(argv + 3*4)))
 			} else if (*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0 {
-				renameColumnParseError(tls, context, ts+1554, *(*uintptr)(unsafe.Pointer(argv + 1*4)), *(*uintptr)(unsafe.Pointer(argv + 2*4)), bp+48)
+				renameColumnParseError(tls, context, ts+1573, *(*uintptr)(unsafe.Pointer(argv + 1*4)), *(*uintptr)(unsafe.Pointer(argv + 2*4)), bp+48)
 			} else {
 				Xsqlite3_result_error_code(tls, context, rc)
 			}
@@ -65294,7 +65310,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 114441)
+	rc = Xsqlite3CorruptError(tls, 114463)
 	goto drop_column_done
 __2:
 	;
@@ -65318,7 +65334,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10941, libc.VaList(bp, (int32((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int32(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10960, 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)
 
@@ -65399,19 +65415,19 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10582, 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+10948,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10967,
 		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 + 10976
+				return ts + 10995
 			}
-			return ts + 6127
+			return ts + 6146
 		}(),
 			zCol))
 	goto exit_drop_column
@@ -65420,7 +65436,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10988, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11007, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -65434,13 +65450,13 @@ __8:
 	goto exit_drop_column
 __9:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1554, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1573, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11036, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11055, 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+11157, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11176, 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
@@ -65558,11 +65574,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 + 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}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11194},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11215},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11235},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11254},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11273}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -65596,7 +65612,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+11277, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11296, 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)
 			}
@@ -65605,10 +65621,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+11300,
+					ts+11319,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11330, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11349, 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)
 			}
@@ -65626,9 +65642,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11348, FzCols: ts + 11361},
-	{FzName: ts + 11374, FzCols: ts + 11387},
-	{FzName: ts + 11415},
+	{FzName: ts + 11367, FzCols: ts + 11380},
+	{FzName: ts + 11393, FzCols: ts + 11406},
+	{FzName: ts + 11434},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65820,7 +65836,7 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11428}
+	FzName:     ts + 11447}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
@@ -66071,7 +66087,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11438}
+	FzName:     ts + 11457}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(72)
@@ -66085,7 +66101,7 @@ 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+11448,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11467,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
 					return (*StatAccum)(unsafe.Pointer(p)).FnEst
@@ -66098,7 +66114,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11453, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11472, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -66140,7 +66156,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+11459, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
+			Xsqlite3_str_appendf(tls, bp+48, ts+11478, 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--
@@ -66154,7 +66170,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11465}
+	FzName:     ts + 11484}
 
 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)
@@ -66198,7 +66214,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+11474, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11493, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -66215,7 +66231,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+11348, uint32(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11367, 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)
@@ -66371,7 +66387,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+11484, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11503, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -66428,7 +66444,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+11484, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11503, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -66475,9 +66491,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+11488)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11507)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11492)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11511)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -66560,7 +66576,7 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 	var v TRowcnt
 
 	if z == uintptr(0) {
-		z = ts + 1554
+		z = ts + 1573
 	}
 	for i = 0; *(*uint8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
 		v = uint64(0)
@@ -66582,15 +66598,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+11496, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11515, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11507, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11526, 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+11517, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11536, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(1), 6, 0x40)
 			}
 			for int32(*(*uint8)(unsafe.Pointer(z))) != 0 && int32(*(*uint8)(unsafe.Pointer(z))) != ' ' {
@@ -66866,11 +66882,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+11374, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11393, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11529,
-			ts+11583,
+			ts+11548,
+			ts+11602,
 			zDb)
 	}
 	return rc
@@ -66917,10 +66933,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+11348, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11367, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11635, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11654, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -66978,7 +66994,7 @@ 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+6441, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6460, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -67011,13 +67027,13 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zFile == uintptr(0)) {
 		goto __1
 	}
-	zFile = ts + 1554
+	zFile = ts + 1573
 __1:
 	;
 	if !(zName == uintptr(0)) {
 		goto __2
 	}
-	zName = ts + 1554
+	zName = ts + 1573
 __2:
 	;
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(db + 172 + 8))&0x4>>2)) != 0) {
@@ -67025,14 +67041,14 @@ __2:
 	}
 
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3835)
+	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3854)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11676, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11695, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
 	if !(rc == SQLITE_OK) {
 		goto __6
 	}
@@ -67069,7 +67085,7 @@ __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 120 + 7*4))+2) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11679,
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11698,
 		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 120 + 7*4))))
 	goto attach_error
 __11:
@@ -67083,7 +67099,7 @@ __12:
 	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __15
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11716, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11735, libc.VaList(bp+8, zName))
 	goto attach_error
 __15:
 	;
@@ -67147,7 +67163,7 @@ __4:
 		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11746, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11765, 0)
 	goto __23
 __22:
 	if !(rc == SQLITE_OK) {
@@ -67164,7 +67180,7 @@ __25:
 		goto __27
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db,
-		ts+11775, 0)
+		ts+11794, 0)
 	rc = SQLITE_ERROR
 __27:
 	;
@@ -67230,13 +67246,13 @@ __33:
 	}
 	Xsqlite3OomFault(tls, db)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 44)))
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+1509, 0)
 	goto __35
 __34:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 44)) == uintptr(0)) {
 		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11843, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11862, libc.VaList(bp+16, zFile))
 __36:
 	;
 __35:
@@ -67283,7 +67299,7 @@ func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zName == uintptr(0)) {
 		goto __1
 	}
-	zName = ts + 1554
+	zName = ts + 1573
 __1:
 	;
 	i = 0
@@ -67314,14 +67330,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11871, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11890, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11892, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11911, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -67329,7 +67345,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11918, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11937, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -67446,7 +67462,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11940}
+	FzName:     ts + 11959}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -67459,7 +67475,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11954}
+	FzName:     ts + 11973}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -67473,7 +67489,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+11968, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11987, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -67505,7 +67521,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+11992,
+						ts+12011,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -67680,7 +67696,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+12038, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12057, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -67706,11 +67722,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+12061, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12080, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12067, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12086, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12073, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12092, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -67757,7 +67773,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 + 7713
+		zCol = ts + 7732
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -67781,7 +67797,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+12100, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12119, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -68052,25 +68068,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6441) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6460) == 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+6381, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
 			if i == 1 {
-				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 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5902+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema+8,
-						ts+6389)
+						ts+6408)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*16)).FpSchema+8,
-						ts+5883)
+						ts+5902)
 				}
 			}
 		}
@@ -68091,12 +68107,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		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 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5902)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema+8,
-					ts+6389)
+					ts+6408)
 			}
 		}
 	}
@@ -68127,7 +68143,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+12115, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12134, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -68145,14 +68161,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 + 12123
+			zMsg = ts + 12142
 		} else {
-			zMsg = ts + 12136
+			zMsg = ts + 12155
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6664, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6674, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -68182,12 +68198,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+6381, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
-			return ts + 6427
+	if Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5902+7) == 0 {
+			return ts + 6446
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6389+7) == 0 {
-			return ts + 6408
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 {
+			return ts + 6427
 		}
 	}
 	return zName
@@ -68545,7 +68561,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+5883)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5902)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -68571,7 +68587,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6441, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6460, zName) {
 				goto __3
 			}
 
@@ -68624,13 +68640,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+12150, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12169, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12167, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12186, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -68668,13 +68684,13 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 		if Xsqlite3_stricmp(tls, zType, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit))) != 0 ||
 			Xsqlite3_stricmp(tls, zName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 1*4))) != 0 ||
 			Xsqlite3_stricmp(tls, zTblName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 2*4))) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1554, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1573, 0)
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6381, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6400, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12187,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12206,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -68834,9 +68850,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -68852,7 +68868,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12229, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12248, 0)
 	return
 __4:
 	;
@@ -68880,9 +68896,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10491
+			return ts + 10510
 		}
-		return ts + 8876
+		return ts + 8895
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -68898,9 +68914,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -68931,12 +68947,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12270,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12289,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10491
+				return ts + 10510
 			}
-			return ts + 8876
+			return ts + 8895
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -68951,7 +68967,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12291, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12310, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -69038,7 +69054,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+12326, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12345, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -69062,7 +69078,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+12343, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12362, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -69082,7 +69098,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 + 12326
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12345
 	(*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)
@@ -69094,7 +69110,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+12326, pRet+8) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12345, pRet+8) ==
 		pRet+8 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -69128,7 +69144,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+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12396, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -69136,13 +69152,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+12400, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(6)), ts+12419, 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+12407, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(9)), ts+12426, 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--
@@ -69179,7 +69195,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+12417, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12436, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -69343,10 +69359,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+12443,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12462,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12488, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12507, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint32(unsafe.Sizeof(Expr{})))
@@ -69377,7 +69393,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+12529, 0)
+			ts+12548, 0)
 	}
 }
 
@@ -69422,7 +69438,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12581, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12600, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -69511,7 +69527,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12622, 0)
+		ts+12641, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -69606,7 +69622,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12678, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12697, 0)
 	goto generated_done
 __2:
 	;
@@ -69619,13 +69635,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12721, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12740, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12729, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12748, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -69659,13 +69675,19 @@ __10:
 
 	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
 __11:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_RAISE) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = (*Column)(unsafe.Pointer(pCol)).Faffinity
+__12:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12736,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12755,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -69786,13 +69808,13 @@ __3:
 	;
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
-		zSep = ts + 1554
-		zSep2 = ts + 12767
-		zEnd = ts + 4957
+		zSep = ts + 1573
+		zSep2 = ts + 12786
+		zEnd = ts + 4976
 	} else {
-		zSep = ts + 12769
-		zSep2 = ts + 12773
-		zEnd = ts + 12778
+		zSep = ts + 12788
+		zSep2 = ts + 12792
+		zEnd = ts + 12797
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -69800,7 +69822,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12781, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12800, 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('(')
@@ -69834,17 +69856,17 @@ __5:
 	goto __6
 __6:
 	;
-	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3663, libc.VaList(bp, zEnd))
+	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3682, libc.VaList(bp, zEnd))
 	return zStmt
 }
 
 var azType1 = [6]uintptr{
-	ts + 1554,
-	ts + 12795,
-	ts + 12801,
-	ts + 12806,
-	ts + 12811,
-	ts + 12801,
+	ts + 1573,
+	ts + 12814,
+	ts + 12820,
+	ts + 12825,
+	ts + 12830,
+	ts + 12820,
 }
 
 func resizeIndexObject(tls *libc.TLS, db uintptr, pIdx uintptr, N int32) int32 {
@@ -70234,7 +70256,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
 		if pSelect != 0 || !(int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM) && (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1554, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1573, 0)
 			return
 		}
 		(*Table)(unsafe.Pointer(p)).Ftnum = (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum
@@ -70251,10 +70273,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+12817,
-						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1554)))
+						ts+12836,
+						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1573)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12850,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12869,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -70273,11 +70295,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+12877, 0)
+				ts+12896, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12927, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12946, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 28)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -70311,7 +70333,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12959, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12978, 0)
 			return
 		}
 	}
@@ -70336,11 +70358,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 + 8876
-			zType2 = ts + 13003
+			zType = ts + 8895
+			zType2 = ts + 13022
 		} else {
-			zType = ts + 10491
-			zType2 = ts + 13009
+			zType = ts + 10510
+			zType2 = ts + 13028
 		}
 
 		if pSelect != 0 {
@@ -70411,11 +70433,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+13014, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13033, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13029,
+			ts+13048,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -70431,13 +70453,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+13127,
+					ts+13146,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13169, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13188, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -70452,7 +70474,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+9398) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9417) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -70482,7 +70504,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+13203, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13222, 0)
 	goto create_view_fail
 __1:
 	;
@@ -70498,7 +70520,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+4, pParse, iDb, ts+10491, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+4, pParse, iDb, ts+10510, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+4, pSelect) != 0) {
 		goto __3
 	}
@@ -70580,7 +70602,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13239, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13258, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -70705,13 +70727,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+13269, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13288, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13284,
+		ts+13303,
 		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)
 }
@@ -70752,10 +70774,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+13351, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]uint8{})), bp+40, ts+13370, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11300,
+				ts+11319,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -70787,12 +70809,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+13365,
+			ts+13384,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13410,
+		ts+13429,
 		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)
@@ -70820,11 +70842,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+6381, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3286, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3305, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7133, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7141, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -70902,9 +70924,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 	zArg2 = uintptr(0)
@@ -70963,21 +70985,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13477, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13496, 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+13505, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13524, 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+13539, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13558, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -70989,7 +71011,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11492, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11511, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -71053,7 +71075,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13571,
+		ts+13590,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*16)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -71065,7 +71087,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13634, 0)
+		ts+13653, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -71150,7 +71172,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13728,
+		ts+13747,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*20)).FzEName))
 	goto fk_end
 __23:
@@ -71377,12 +71399,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+13774,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13793,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13802
+							return ts + 13821
 						}
-						return ts + 13808
+						return ts + 13827
 					}()))
 				return 1
 			}
@@ -71503,7 +71525,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+132, pParse, iDb, ts+13813, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+132, pParse, iDb, ts+13832, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+132, pTblName) != 0) {
 		goto __10
 	}
@@ -71522,7 +71544,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13819,
+		ts+13838,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -71548,26 +71570,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13869, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13888, 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+13897, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13916, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13922, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13941, 0)
 	goto exit_create_index
 __17:
 	;
@@ -71581,7 +71603,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13813, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13832, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -71596,7 +71618,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13956, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13975, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -71608,7 +71630,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13990, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14009, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -71637,7 +71659,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14014, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14033, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -71658,9 +71680,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -71699,7 +71721,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13813)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13832)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -71800,7 +71822,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14037, 0)
+		ts+14056, 0)
 	goto exit_create_index
 __56:
 	;
@@ -72017,7 +72039,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14098, libc.VaList(bp+48, 0))
+		ts+14117, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -72069,8 +72091,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14140, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14159, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121859)
 	goto exit_create_index
 __101:
 	;
@@ -72116,12 +72138,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14157,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14176,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
-				return ts + 1554
+				return ts + 1573
 			}
-			return ts + 14177
+			return ts + 14196
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -72129,7 +72151,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14185,
+		ts+14204,
 		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,
@@ -72143,7 +72165,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14244, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14263, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -72304,7 +72326,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14271, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14290, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -72319,7 +72341,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14289, libc.VaList(bp+8, 0))
+		ts+14308, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -72330,9 +72352,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -72358,9 +72380,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14362,
+		ts+14381,
 		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+11488, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11507, (*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)
@@ -72495,7 +72517,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+14422,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14441,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -72703,12 +72725,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+14458,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14477,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14494
+				return ts + 14513
 			}
-			return ts + 14497
+			return ts + 14516
 		}()))
 	goto append_from_error
 __1:
@@ -72877,7 +72899,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14503, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14522, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -72913,9 +72935,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14509
+				return ts + 14528
 			}
-			return ts + 14518
+			return ts + 14537
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -72940,7 +72962,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14503, ts + 14525, ts + 14509}
+var az = [3]uintptr{ts + 14522, ts + 14544, ts + 14528}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -72955,7 +72977,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+14533, 0)
+				ts+14552, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -73092,17 +73114,17 @@ 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+14603, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14622, 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+14614, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14633, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
-			Xsqlite3_str_append(tls, bp+8, ts+1567, 1)
+			Xsqlite3_str_append(tls, bp+8, ts+1586, 1)
 			Xsqlite3_str_appendall(tls, bp+8, zCol)
 		}
 	}
@@ -73125,11 +73147,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+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12080, 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+14617, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14636, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -73259,7 +73281,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14626, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14645, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -73355,7 +73377,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+14672, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14691, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -73548,7 +73570,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14702, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14721, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -73828,7 +73850,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+14733,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14752,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -73860,11 +73882,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+14766, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14785, 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+14795, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14814, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -74115,7 +74137,7 @@ __20:
 	goto __16
 __15:
 	wcf = U16(WHERE_ONEPASS_DESIRED | WHERE_DUPLICATES_OK)
-	if !((*NameContext)(unsafe.Pointer(bp+8)).FncFlags&NC_VarSelect != 0) {
+	if !((*NameContext)(unsafe.Pointer(bp+8)).FncFlags&NC_Subquery != 0) {
 		goto __23
 	}
 	bComplex = 1
@@ -74368,7 +74390,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14833)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14852)
 __62:
 	;
 delete_from_cleanup:
@@ -74483,7 +74505,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+11348) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11367) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -74713,7 +74735,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 + 8005, ts + 8000, ts + 6181}
+var azType2 = [5]uintptr{ts + 6210, ts + 6205, ts + 8024, ts + 8019, ts + 6200}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -74772,7 +74794,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+14846, -1)
+					Xsqlite3_result_error(tls, context, ts+14865, -1)
 					return
 				}
 				iVal = -iVal
@@ -75076,7 +75098,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14863, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14882, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -75422,7 +75444,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+14868, -1)
+		Xsqlite3_result_error(tls, context, ts+14887, -1)
 		return
 	}
 	if argc == 3 {
@@ -75432,7 +75454,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+14901, -1)
+				ts+14920, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -75485,7 +75507,7 @@ func errlogFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	_ = argc
 	_ = context
-	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3663, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4)))))
+	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3682, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4)))))
 }
 
 func compileoptionusedFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
@@ -75525,13 +75547,13 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 
 			var zVal uintptr
 			r1 = Xsqlite3_value_double(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+4925, libc.VaList(bp, r1))
+			Xsqlite3_str_appendf(tls, pStr, ts+4944, libc.VaList(bp, r1))
 			zVal = Xsqlite3_str_value(tls, pStr)
 			if zVal != 0 {
 				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+14946, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14965, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -75539,7 +75561,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 		}
 	case SQLITE_INTEGER:
 		{
-			Xsqlite3_str_appendf(tls, pStr, ts+1334, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
+			Xsqlite3_str_appendf(tls, pStr, ts+1353, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
 			break
 
 		}
@@ -75568,13 +75590,13 @@ 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+14953, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14972, libc.VaList(bp+24, zArg))
 			break
 
 		}
 	default:
 		{
-			Xsqlite3_str_append(tls, pStr, ts+1555, 4)
+			Xsqlite3_str_append(tls, pStr, ts+1574, 4)
 			break
 
 		}
@@ -75715,7 +75737,7 @@ func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 	var ch U32
 	var c U8
 	var d U8
-	zPass = ts + 1554
+	zPass = ts + 1573
 	nPass = 0
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -75997,7 +76019,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10920}
+var azOne = [1]uintptr{ts + 10939}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -76009,7 +76031,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	zIn = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	if zIn == uintptr(0) {
-		zIn = ts + 1554
+		zIn = ts + 1573
 	}
 	for i = 0; *(*U8)(unsafe.Pointer(zIn + uintptr(i))) != 0 && !(int32(Xsqlite3CtypeMap[*(*U8)(unsafe.Pointer(zIn + uintptr(i)))])&0x02 != 0); i++ {
 	}
@@ -76033,7 +76055,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+14956, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14975, 4, uintptr(0))
 	}
 }
 
@@ -76058,7 +76080,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+12100, -1)
+		Xsqlite3_result_error(tls, context, ts+12119, -1)
 		return
 	}
 
@@ -76136,7 +76158,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+14846, -1)
+			Xsqlite3_result_error(tls, context, ts+14865, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -76398,7 +76420,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+14961, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14980, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -76418,14 +76440,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14967, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14986, 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+14967, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14986, 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+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)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14986, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14986, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -76666,109 +76688,109 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 }
 
 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 + 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(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(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 + 14991},
+	{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 + 15011},
+	{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 + 15024},
+	{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 + 15042},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15051},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15059},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15059},
+	{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_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15100},
+	{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 + 15125},
+	{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 + 15134},
+	{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 + 15145},
+	{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 + 15152},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15166},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15166},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15172},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15172},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15178},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15178},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15183},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15183},
+	{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 + 15183},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15187},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FzName: ts + 15187},
+	{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 + 15187},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15191},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15198},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15206},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15213},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15219},
+	{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 + 15233},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15241},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15246},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15256},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15262},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15268},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15272},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15272},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15278},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15285},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15292},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15303},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15310},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15325},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15342},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15353},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15359},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15377},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15385},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15399},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15407},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15423},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15423},
+	{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 + 15433},
+	{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 + 15437},
+	{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 + 15443},
+	{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 + 15447},
+	{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 + 15447},
+	{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 + 15453},
+	{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 + 15453},
+	{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 + 15466},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14986},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14986},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6605},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6605},
 	{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 + 15523},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15476},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15484},
+	{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 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15496},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15499},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15503},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15509},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15499},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15514},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15518},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15522},
 	{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 + 15532},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15537},
 	{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 + 15556},
+	{FnArg: int8(2), 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 + 15553},
+	{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 + 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 + 15565},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15570},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15575},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15580},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15586},
 	{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}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15598},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15603},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15611},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15619},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15622},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6605},
+	{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 + 15627}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -76889,7 +76911,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+15612,
+				ts+15631,
 				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)
@@ -77549,8 +77571,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 + 6452, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 32)) = Token{Fz: ts + 6448, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 24)) = Token{Fz: ts + 6471, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 32)) = Token{Fz: ts + 6467, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -77629,7 +77651,7 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 			(*Token)(unsafe.Pointer(bp + 40)).Fz = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 			(*Token)(unsafe.Pointer(bp + 40)).Fn = uint32(Xsqlite3Strlen30(tls, (*Token)(unsafe.Pointer(bp+40)).Fz))
 
-			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5136)
+			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5155)
 			if pRaise != 0 {
 				(*Expr)(unsafe.Pointer(pRaise)).FaffExpr = uint8(OE_Abort)
 			}
@@ -78051,7 +78073,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7970, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7989, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -78519,7 +78541,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15657,
+		ts+15676,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*16)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -78544,7 +78566,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15698,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15717,
 		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
@@ -78693,7 +78715,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15730,
+		ts+15749,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -78703,7 +78725,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15782, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15801, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -78755,7 +78777,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15807,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15826,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -78763,7 +78785,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15853, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15872, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -79175,7 +79197,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15874)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15893)
 __125:
 	;
 insert_cleanup:
@@ -79490,7 +79512,7 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 						fallthrough
 					case OE_Fail:
 						{
-							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12080, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 								(*Column)(unsafe.Pointer(pCol)).FzCnName))
 
 							Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
@@ -80582,13 +80604,13 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131895)
+	return Xsqlite3MisuseError(tls, 131931)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
 		goto __2
 	}
-	zSql = ts + 1554
+	zSql = ts + 1573
 __2:
 	;
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -81067,7 +81089,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12100, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12119, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -81076,7 +81098,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15888
+		zEntry = ts + 15907
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -81091,7 +81113,7 @@ __5:
 	if !(ii < int32(uint32(unsafe.Sizeof(azEndings))/uint32(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12080, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -81127,7 +81149,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15911, uint32(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15930, uint32(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*uint8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -81141,7 +81163,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15920, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15939, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -81165,7 +81187,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15924, uint32(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15943, uint32(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -81183,7 +81205,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15930, libc.VaList(bp+16, zEntry, zFile))
+		ts+15949, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -81210,7 +81232,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15973, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15992, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -81248,7 +81270,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+16005, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16024, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -81258,7 +81280,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16042,
+	ts + 16061,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -81413,7 +81435,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+16045, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16064, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -81421,63 +81443,63 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 }
 
 var pragCName = [57]uintptr{
-	ts + 5057,
-	ts + 16084,
-	ts + 8876,
-	ts + 16088,
-	ts + 16093,
-	ts + 16096,
-	ts + 16106,
-	ts + 16116,
-	ts + 16122,
-	ts + 16126,
-	ts + 16131,
-	ts + 16136,
-	ts + 16144,
+	ts + 5076,
+	ts + 16103,
+	ts + 8895,
+	ts + 16107,
+	ts + 16112,
+	ts + 16115,
+	ts + 16125,
+	ts + 16135,
+	ts + 16141,
+	ts + 16145,
+	ts + 16150,
 	ts + 16155,
-	ts + 16158,
-	ts + 16165,
-	ts + 16126,
-	ts + 16131,
-	ts + 16172,
+	ts + 16163,
+	ts + 16174,
 	ts + 16177,
-	ts + 16180,
-	ts + 16187,
-	ts + 16122,
-	ts + 16126,
-	ts + 16193,
-	ts + 16198,
-	ts + 16203,
-	ts + 16126,
-	ts + 16207,
-	ts + 16131,
-	ts + 16215,
-	ts + 16219,
-	ts + 16224,
-	ts + 11492,
-	ts + 11488,
-	ts + 16230,
-	ts + 16235,
-	ts + 16240,
-	ts + 16084,
-	ts + 16126,
-	ts + 16245,
-	ts + 16252,
+	ts + 16184,
+	ts + 16145,
+	ts + 16150,
+	ts + 16191,
+	ts + 16196,
+	ts + 16199,
+	ts + 16206,
+	ts + 16141,
+	ts + 16145,
+	ts + 16212,
+	ts + 16217,
+	ts + 16222,
+	ts + 16145,
+	ts + 16226,
+	ts + 16150,
+	ts + 16234,
+	ts + 16238,
+	ts + 16243,
+	ts + 11511,
+	ts + 11507,
+	ts + 16249,
+	ts + 16254,
 	ts + 16259,
-	ts + 8876,
-	ts + 16267,
-	ts + 5060,
-	ts + 16273,
-	ts + 16084,
-	ts + 16126,
+	ts + 16103,
+	ts + 16145,
+	ts + 16264,
+	ts + 16271,
 	ts + 16278,
-	ts + 16283,
-	ts + 15480,
-	ts + 16288,
-	ts + 16301,
-	ts + 16310,
-	ts + 16317,
-	ts + 16328,
+	ts + 8895,
+	ts + 16286,
+	ts + 5079,
+	ts + 16292,
+	ts + 16103,
+	ts + 16145,
+	ts + 16297,
+	ts + 16302,
+	ts + 15499,
+	ts + 16307,
+	ts + 16320,
+	ts + 16329,
+	ts + 16336,
+	ts + 16347,
 }
 
 // Definitions of all built-in pragmas
@@ -81494,238 +81516,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16336,
+	{FzName: ts + 16355,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16351,
+	{FzName: ts + 16370,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16366,
+	{FzName: ts + 16385,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16378,
+	{FzName: ts + 16397,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16394,
+	{FzName: ts + 16413,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16317,
+	{FzName: ts + 16336,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16407,
+	{FzName: ts + 16426,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16419,
+	{FzName: ts + 16438,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16439,
+	{FzName: ts + 16458,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CellSizeCk)},
-	{FzName: ts + 16455,
+	{FzName: ts + 16474,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16476,
+	{FzName: ts + 16495,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16491,
+	{FzName: ts + 16510,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16507,
+	{FzName: ts + 16526,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16521,
+	{FzName: ts + 16540,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16534,
+	{FzName: ts + 16553,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16548,
+	{FzName: ts + 16567,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16567,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_DeferFKs)},
 	{FzName: ts + 16586,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_DeferFKs)},
+	{FzName: ts + 16605,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16609,
+	{FzName: ts + 16628,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16618,
+	{FzName: ts + 16637,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16636,
+	{FzName: ts + 16655,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16653,
+	{FzName: ts + 16672,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16666,
+	{FzName: ts + 16685,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16681,
+	{FzName: ts + 16700,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16699,
+	{FzName: ts + 16718,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16709,
+	{FzName: ts + 16728,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16723,
+	{FzName: ts + 16742,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16739,
+	{FzName: ts + 16758,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16764,
+	{FzName: ts + 16783,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16783,
+	{FzName: ts + 16802,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16794,
+	{FzName: ts + 16813,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16805,
+	{FzName: ts + 16824,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16817,
+	{FzName: ts + 16836,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16833,
+	{FzName: ts + 16852,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16846,
+	{FzName: ts + 16865,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16865,
+	{FzName: ts + 16884,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16884,
+	{FzName: ts + 16903,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16897,
+	{FzName: ts + 16916,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16912,
+	{FzName: ts + 16931,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16922,
+	{FzName: ts + 16941,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16934,
+	{FzName: ts + 16953,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16943,
+	{FzName: ts + 16962,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16954,
+	{FzName: ts + 16973,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16964,
+	{FzName: ts + 16983,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16976,
+	{FzName: ts + 16995,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16987,
+	{FzName: ts + 17006,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16999,
+	{FzName: ts + 17018,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17016,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_RecTriggers)},
 	{FzName: ts + 17035,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_RecTriggers)},
+	{FzName: ts + 17054,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17061,
+	{FzName: ts + 17080,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17076,
+	{FzName: ts + 17095,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17090,
+	{FzName: ts + 17109,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17109,
+	{FzName: ts + 17128,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17123,
+	{FzName: ts + 17142,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17139,
+	{FzName: ts + 17158,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17151,
+	{FzName: ts + 17170,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17162,
+	{FzName: ts + 17181,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17173,
+	{FzName: ts + 17192,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17185,
+	{FzName: ts + 17204,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17196,
+	{FzName: ts + 17215,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17217,
+	{FzName: ts + 17236,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17225,
+	{FzName: ts + 17244,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17240,
+	{FzName: ts + 17259,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17253,
-		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
 	{FzName: ts + 17272,
+		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
+	{FzName: ts + 17291,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17287,
+	{FzName: ts + 17306,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -81747,7 +81769,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17303))
+var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17322))
 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)}
@@ -81759,10 +81781,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+17328) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17347) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17357) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -81771,13 +81793,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+8026) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8045) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17345) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17364) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17350) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17369) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -81792,9 +81814,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+16278) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16297) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17362) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17381) == 0 {
 		return 2
 	} else {
 		return 0
@@ -81808,7 +81830,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+17369, 0)
+				ts+17388, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpBt)
@@ -81899,19 +81921,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17431
+		zName = ts + 17450
 		break
 	case OE_SetDflt:
-		zName = ts + 17440
+		zName = ts + 17459
 		break
 	case OE_Cascade:
-		zName = ts + 17452
+		zName = ts + 17471
 		break
 	case OE_Restrict:
-		zName = ts + 17460
+		zName = ts + 17479
 		break
 	default:
-		zName = ts + 17469
+		zName = ts + 17488
 		break
 	}
 	return zName
@@ -81928,7 +81950,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17479, ts + 17486, ts + 17494, ts + 17498, ts + 17362, ts + 17507,
+	ts + 17498, ts + 17505, ts + 17513, ts + 17517, ts + 17381, ts + 17526,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -81975,13 +81997,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17511
+			zType = ts + 17530
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17513
+			zType = ts + 17532
 		} else {
-			zType = ts + 7528
+			zType = ts + 7536
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17515,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17534,
 			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),
@@ -81989,7 +82011,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17522, ts + 17527, ts + 17535}
+var azEnc = [4]uintptr{uintptr(0), ts + 17541, ts + 17546, ts + 17554}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -82140,6 +82162,7 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp7 int32
 	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
@@ -82236,7 +82259,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17543, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17562, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -82275,7 +82298,7 @@ __8:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 484)) != 0) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 484))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 484))))
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 484)))
 __10:
 	;
@@ -82497,7 +82520,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17547) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17566) == 0) {
 		goto __64
 	}
 	b = 2
@@ -82569,7 +82592,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17338
+	zRet = ts + 17357
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -82607,7 +82630,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17328
+	zRet = ts + 17347
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -82894,7 +82917,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 536)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17552, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17571, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -82913,7 +82936,7 @@ __127:
 	if !(*(*uint8)(unsafe.Pointer(zRight)) != 0) {
 		goto __128
 	}
-	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+16, zRight))
+	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+16, zRight))
 	goto __129
 __128:
 	Xsqlite3_temp_directory = uintptr(0)
@@ -82935,7 +82958,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17577, 0)
+		ts+17596, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -82989,7 +83012,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17630) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17649) == 0) {
 		goto __142
 	}
 
@@ -83086,13 +83109,13 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17636
+			return ts + 17655
 		}
-		return ts + 17644
+		return ts + 17663
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
-			Xsqlite3ColumnType(tls, pCol, ts+1554),
+			Xsqlite3ColumnType(tls, pCol, ts+1573),
 			func() int32 {
 				if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf>>0)) != 0 {
 					return 1
@@ -83157,7 +83180,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17651, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17670, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -83170,7 +83193,7 @@ __172:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __173
 	}
-	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1490, 0)
+	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1509, 0)
 	(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 __173:
 	;
@@ -83203,29 +83226,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10491
+	zType = ts + 10510
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12721
+	zType = ts + 12740
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17667
+	zType = ts + 17686
 	goto __183
 __182:
-	zType = ts + 8876
+	zType = ts + 8895
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17693,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*16)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -83291,7 +83314,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17681, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17700, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -83301,7 +83324,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17686,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17705,
 		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))))
@@ -83338,8 +83361,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 544)) = [3]uintptr{ts + 17691, ts + 17693, ts + 16155}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17695,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 544)) = [3]uintptr{ts + 17710, ts + 17712, ts + 16174}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17714,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -83372,7 +83395,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17720,
 		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)))
@@ -83394,7 +83417,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17705, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17724, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -83458,7 +83481,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7536, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -83474,7 +83497,7 @@ __218:
 	if !(i6 < int32(uint32(unsafe.Sizeof(aPragmaName))/uint32(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7536, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -83509,7 +83532,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17708,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17727,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -83517,7 +83540,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+17717))
+			ts+17736))
 	goto __227
 __227:
 	j2++
@@ -83706,7 +83729,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17722, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17741, 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)))
@@ -83923,7 +83946,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+17726, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*16)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17745, 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)
@@ -84034,7 +84057,7 @@ __307:
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17750,
+		ts+17769,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
@@ -84133,7 +84156,7 @@ __321:
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17786, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17805, 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) {
@@ -84155,7 +84178,7 @@ __326:
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17806,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17825,
 		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)
@@ -84168,7 +84191,7 @@ __329:
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17828,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17847,
 		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 __332
@@ -84186,11 +84209,11 @@ __331:
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 568)), j4, 3)
 __334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17851, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17870, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17853,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17872,
 		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)
 __333:
@@ -84236,7 +84259,7 @@ __339:
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17873,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17892,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
@@ -84270,89 +84293,103 @@ __344:
 
 	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+17903)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17922)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17908)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17927)
 	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)
 
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __345
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_IdxRowid, *(*int32)(unsafe.Pointer(bp + 572))+j4, 3)
+	jmp7 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 3, 0, r1+int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn)-1)
+
+	Xsqlite3VdbeLoadString(tls, v, 3,
+		ts+17948)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17984)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp7)
+__345:
+	;
 	label6 = 0
 	kk = 0
-__345:
+__346:
 	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) {
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*4)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
 		goto __349
 	}
-	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+	goto __347
 __349:
+	;
+	if !(label6 == 0) {
+		goto __350
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__350:
 	;
 	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:
+	kk++
+	goto __346
+	goto __348
+__348:
 	;
 	if !(label6 != 0) {
-		goto __350
+		goto __351
 	}
 	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
 	Xsqlite3VdbeResolveLabel(tls, v, label6)
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17922)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17929)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17995)
 	Xsqlite3VdbeGoto(tls, v, jmp5-1)
 	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-__350:
+__351:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __351
+		goto __352
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__352:
+__353:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __354
+		goto __355
 	}
 	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 __355
+		goto __356
 	}
-	goto __353
-__355:
+	goto __354
+__356:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
-	goto __353
-__353:
-	kk++
-	goto __352
 	goto __354
 __354:
+	kk++
+	goto __353
+	goto __355
+__355:
 	;
 	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)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18022)
 	Xsqlite3VdbeGoto(tls, v, jmp5)
 	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
-__351:
+__352:
 	;
 	Xsqlite3VdbeJumpHere(tls, v, jmp4)
 	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 580)))
@@ -84369,20 +84406,20 @@ __340:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 568)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __356
+		goto __357
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17983)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+18049)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__357:
+__358:
 	if !(pIdx5 != 0) {
-		goto __359
-	}
-	if !(pPk1 == pIdx5) {
 		goto __360
 	}
-	goto __358
-__360:
+	if !(pPk1 == pIdx5) {
+		goto __361
+	}
+	goto __359
+__361:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 572))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -84391,21 +84428,21 @@ __360:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __358
-__358:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __357
 	goto __359
 __359:
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
+	goto __358
+	goto __360
+__360:
 	;
 	if !(pPk1 != 0) {
-		goto __361
+		goto __362
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__361:
+__362:
 	;
-__356:
+__357:
 	;
 	goto __291
 __291:
@@ -84423,14 +84460,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(endCode))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __362
+		goto __363
 	}
 	(*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 + 18012
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*20 + 16)) = ts + 18078
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*20)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*20 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__362:
+__363:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -84438,27 +84475,27 @@ __362:
 
 __45:
 	if !!(zRight != 0) {
-		goto __363
+		goto __364
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __365
-	}
-	goto pragma_out
-__365:
-	;
-	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __364
-__363:
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
 		goto __366
 	}
+	goto pragma_out
+__366:
+	;
+	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
+	goto __365
+__364:
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
+		goto __367
+	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__367:
+__368:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __369
+		goto __370
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __370
+		goto __371
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -84467,25 +84504,25 @@ __367:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __369
-__370:
-	;
-	goto __368
-__368:
-	pEnc += 8
-	goto __367
-	goto __369
-__369:
-	;
-	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __371
-	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18015, libc.VaList(bp+456, zRight))
+	goto __370
 __371:
 	;
-__366:
+	goto __369
+__369:
+	pEnc += 8
+	goto __368
+	goto __370
+__370:
 	;
-__364:
+	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
+		goto __372
+	}
+	Xsqlite3ErrorMsg(tls, pParse, ts+18081, libc.VaList(bp+456, zRight))
+__372:
+	;
+__367:
+	;
+__365:
 	;
 	goto __15
 
@@ -84493,15 +84530,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 __372
+		goto __373
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(setCookie))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __374
+		goto __375
 	}
 	goto __15
-__374:
+__375:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fp1 = iDb
@@ -84509,41 +84546,41 @@ __374:
 	(*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 __375
+		goto __376
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fopcode = U8(OP_Noop)
-__375:
+__376:
 	;
-	goto __373
-__372:
+	goto __374
+__373:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(readCookie))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __376
+		goto __377
 	}
 	goto __15
-__376:
+__377:
 	;
 	(*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)
-__373:
+__374:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__377:
+__378:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __378
+		goto __379
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __377
-__378:
+	goto __378
+__379:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -84558,31 +84595,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __379
-	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17345) == 0) {
 		goto __380
 	}
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17364) == 0) {
+		goto __381
+	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __381
-__380:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18040) == 0) {
-		goto __382
+	goto __382
+__381:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18106) == 0) {
+		goto __383
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __383
-__382:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17498) == 0) {
-		goto __384
+	goto __384
+__383:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17517) == 0) {
+		goto __385
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
+__385:
+	;
 __384:
 	;
-__383:
+__382:
 	;
-__381:
-	;
-__379:
+__380:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -84592,10 +84629,10 @@ __379:
 
 __49:
 	if !(zRight != 0) {
-		goto __385
+		goto __386
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__385:
+__386:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -84615,19 +84652,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __386
+		goto __387
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __388
+		goto __389
 	}
 	goto __15
-__388:
+__389:
 	;
-	goto __387
-__386:
-	opMask = U32(0xfffe)
+	goto __388
 __387:
+	opMask = U32(0xfffe)
+__388:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -84636,86 +84673,86 @@ __387:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__389:
+__390:
 	if !(iDb <= iDbLast) {
-		goto __391
-	}
-	if !(iDb == 1) {
 		goto __392
 	}
-	goto __390
-__392:
+	if !(iDb == 1) {
+		goto __393
+	}
+	goto __391
+__393:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__393:
+__394:
 	if !(k4 != 0) {
-		goto __395
+		goto __396
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __396
+		goto __397
 	}
-	goto __394
-__396:
+	goto __395
+__397:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__397:
+__398:
 	if !(pIdx6 != 0) {
-		goto __399
-	}
-	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 56))&0x80>>7) != 0) {
 		goto __400
 	}
+	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 56))&0x80>>7) != 0) {
+		goto __401
+	}
 	szThreshold = int16(0)
-	goto __399
-__400:
+	goto __400
+__401:
 	;
-	goto __398
-__398:
-	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __397
 	goto __399
 __399:
+	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
+	goto __398
+	goto __400
+__400:
 	;
 	if !(szThreshold != 0) {
-		goto __401
+		goto __402
 	}
 	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))
 
-__401:
+__402:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18048,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18114,
 		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 __402
+		goto __403
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __403
-__402:
-	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+	goto __404
 __403:
+	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+__404:
 	;
-	goto __394
-__394:
-	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __393
 	goto __395
 __395:
+	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
+	goto __394
+	goto __396
+__396:
 	;
-	goto __390
-__390:
-	iDb++
-	goto __389
 	goto __391
 __391:
+	iDb++
+	goto __390
+	goto __392
+__392:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -84723,36 +84760,36 @@ __391:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __404
+		goto __405
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__404:
+__405:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+584) == SQLITE_OK) {
-		goto __405
+		goto __406
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 584)))
-__405:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+592) == SQLITE_OK) {
-		goto __406
+		goto __407
 	}
 	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 __407
+		goto __408
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 592)))
-__407:
+__408:
 	;
-__406:
+__407:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -84761,10 +84798,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+600) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 600)) >= int64(0)) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 600))&int64(0x7fffffff)))
-__408:
+__409:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -84773,10 +84810,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+608) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 608)) >= int64(0)) {
-		goto __409
+		goto __410
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 608)) & int64(0x7fffffff))
-__409:
+__410:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -84784,10 +84821,10 @@ __409:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __410
+		goto __411
 	}
 
-__410:
+__411:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -84839,14 +84876,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{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},
+	{FzName: ts + 18132, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18137, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18143, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18152, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18161, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18169, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18177},
+	{FzName: ts + 18184},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -84898,7 +84935,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+18124)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18190)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -84906,7 +84943,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18205, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = uint8(',')
 
 	}
@@ -84919,19 +84956,19 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18146, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18212, 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+18152)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18218)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18164)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18230)
 		j++
 	}
-	Xsqlite3_str_append(tls, bp+32, ts+4957, 1)
+	Xsqlite3_str_append(tls, bp+32, ts+4976, 1)
 	Xsqlite3StrAccumFinish(tls, bp+32)
 
 	rc = Xsqlite3_declare_vtab(tls, db, bp+56)
@@ -84947,7 +84984,7 @@ __3:
 			(*PragmaVtab)(unsafe.Pointer(pTab)).FnHidden = U8(j)
 		}
 	} else {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	}
 
 	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
@@ -85095,7 +85132,7 @@ __1:
 		var zText uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*4)))
 
 		if zText != 0 {
-			*(*uintptr)(unsafe.Pointer(pCsr + 16 + uintptr(j)*4)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, zText))
+			*(*uintptr)(unsafe.Pointer(pCsr + 16 + uintptr(j)*4)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, zText))
 			if *(*uintptr)(unsafe.Pointer(pCsr + 16 + uintptr(j)*4)) == uintptr(0) {
 				return SQLITE_NOMEM
 			}
@@ -85111,13 +85148,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+18179)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18245)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18187, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18253, 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+18191, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 16))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18257, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 16))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -85126,7 +85163,7 @@ __3:
 	rc = Xsqlite3_prepare_v2(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+4, uintptr(0))
 	Xsqlite3_free(tls, zSql)
 	if rc != SQLITE_OK {
-		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
+		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
 		return rc
 	}
 	return pragmaVtabNext(tls, pVtabCursor)
@@ -85194,33 +85231,33 @@ 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+18195, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*4)),
+			ts+18261, 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, 137196)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137249)
 	} else {
 		var z uintptr
 		var zObj uintptr
 		if *(*uintptr)(unsafe.Pointer(azObj + 1*4)) != 0 {
 			zObj = *(*uintptr)(unsafe.Pointer(azObj + 1*4))
 		} else {
-			zObj = ts + 5008
+			zObj = ts + 5027
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18223, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18289, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*uint8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18254, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18320, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137256)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18262,
-	ts + 18269,
-	ts + 18281,
+	ts + 18328,
+	ts + 18335,
+	ts + 18347,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -85280,7 +85317,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+14140)
+				corruptSchema(tls, pData, argv, ts+14159)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+172+8, uint32(0), 0, 0x1)
@@ -85312,13 +85349,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+18292)
+			corruptSchema(tls, pData, argv, ts+18358)
 		} 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+14140)
+				corruptSchema(tls, pData, argv, ts+14159)
 			}
 		}
 	}
@@ -85351,16 +85388,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 + 8876
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8895
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*4)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*4)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*4))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*4)) = ts + 7938
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*4)) = ts + 18305
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*4)) = ts + 7957
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*4)) = ts + 18371
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*4)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 40)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 40)).FiDb = iDb
@@ -85454,7 +85491,7 @@ __10:
 		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11775)
+		ts+11794)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __15:
@@ -85489,7 +85526,7 @@ __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)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18443)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __19:
@@ -85503,7 +85540,7 @@ __20:
 	(*InitData)(unsafe.Pointer(bp + 40)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18401,
+		ts+18467,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -85776,7 +85813,7 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
 	(*Parse)(unsafe.Pointer(pParse)).Fdb = db
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1490, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1509, 0)
 	}
 }
 
@@ -85804,7 +85841,7 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, bp+16, ts+1490, 0)
+	Xsqlite3ErrorMsg(tls, bp+16, ts+1509, 0)
 __1:
 	;
 	if !(prepFlags&U32(SQLITE_PREPARE_PERSISTENT) != 0) {
@@ -85835,7 +85872,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*16)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18435, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18501, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -85865,7 +85902,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18465, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18531, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -85925,7 +85962,7 @@ __21:
 	if !((*Parse)(unsafe.Pointer(bp+16)).FzErrMsg != 0) {
 		goto __22
 	}
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3663, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3682, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 	Xsqlite3DbFree(tls, db, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
 	goto __23
 __22:
@@ -85961,7 +85998,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, 137995)
+		return Xsqlite3MisuseError(tls, 138048)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -86060,7 +86097,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, 138143)
+		return Xsqlite3MisuseError(tls, 138196)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -86378,8 +86415,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 + 10920
-		var zSp2 uintptr = ts + 10920
+		var zSp1 uintptr = ts + 10939
+		var zSp2 uintptr = ts + 10939
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -86387,13 +86424,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18484, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18550, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18514))
+var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18580))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -86568,7 +86605,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+18548, libc.VaList(bp, 0))
+					ts+18614, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -86613,7 +86650,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+18598, libc.VaList(bp+8, zName))
+						ts+18664, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -86624,7 +86661,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+18662,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18728,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -86668,7 +86705,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6586, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6605, 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.
@@ -87252,16 +87289,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18699
+		z = ts + 18765
 		break
 	case TK_INTERSECT:
-		z = ts + 18709
+		z = ts + 18775
 		break
 	case TK_EXCEPT:
-		z = ts + 18719
+		z = ts + 18785
 		break
 	default:
-		z = ts + 18726
+		z = ts + 18792
 		break
 	}
 	return z
@@ -87271,7 +87308,7 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18732, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18798, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
@@ -87297,11 +87334,11 @@ 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 {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18821, libc.VaList(bp, func() uintptr {
 		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
-			return ts + 18786
+			return ts + 18852
 		}
-		return ts + 1554
+		return ts + 1573
 	}()))
 
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
@@ -87489,8 +87526,8 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 				}
 
 				if iCol < 0 {
-					zType = ts + 1119
-					*(*uintptr)(unsafe.Pointer(bp + 40)) = ts + 16267
+					zType = ts + 1138
+					*(*uintptr)(unsafe.Pointer(bp + 40)) = ts + 16286
 				} 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))
@@ -87629,13 +87666,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16267
+				zCol = ts + 16286
 			} 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+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12080, 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))
@@ -87643,7 +87680,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+18801, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18867, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -87733,7 +87770,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*16)).FzCnName
 				} else {
-					zName = ts + 16267
+					zName = ts + 16286
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -87743,7 +87780,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18867, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 48)) = U32(0)
@@ -87759,7 +87796,7 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18810, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 48)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18876, 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)
@@ -87842,8 +87879,6 @@ __1:
 		(*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
@@ -87858,12 +87893,15 @@ __1:
 			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
 				(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_BLOB)
 			}
+			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)
+			}
 		}
 		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
+				zType = ts + 18884
 			} else {
 				zType = uintptr(0)
 				for j = 1; j < SQLITE_N_STDTYPE; j++ {
@@ -88079,7 +88117,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18822, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18888, 0)
 	return
 __1:
 	;
@@ -88170,7 +88208,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18871, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18937, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -88190,7 +88228,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18913, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18979, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -88227,7 +88265,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18919, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18985, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -88261,11 +88299,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+18934, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19000, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
-			return ts + 1554
+			return ts + 1573
 		}
-		return ts + 18957
+		return ts + 19023
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -88366,8 +88404,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18959, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18974, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19025, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19040, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -88414,7 +88452,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18699, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18765, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -88481,7 +88519,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+18993, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19059, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+48)
 
@@ -88543,7 +88581,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+18993, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19059, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+76)
 
@@ -88696,10 +88734,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+19014, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19080, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19060,
+			ts+19126,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -88953,8 +88991,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+7234)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7234)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7242)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7242)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -88981,13 +89019,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+19142, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19208, 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+19153, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19219, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -88999,7 +89037,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+19158, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19224, 0)
 	Xsqlite3Select(tls, pParse, p, bp+36)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -89186,7 +89224,8 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 				Xsqlite3VectorErrorMsg(tls, (*SubstContext)(unsafe.Pointer(pSubst)).FpParse, pCopy)
 			} else {
 				var db uintptr = (*Parse)(unsafe.Pointer((*SubstContext)(unsafe.Pointer(pSubst)).FpParse)).Fdb
-				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 && int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN {
+				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 &&
+					(int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN || (*Expr)(unsafe.Pointer(pCopy)).FiTable != (*SubstContext)(unsafe.Pointer(pSubst)).FiNewTable) {
 					libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Expr{})))
 					(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_IF_NULL_ROW)
 					(*Expr)(unsafe.Pointer(bp)).FpLeft = pCopy
@@ -89226,7 +89265,7 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 								if pColl != 0 {
 									return (*CollSeq)(unsafe.Pointer(pColl)).FzName
 								}
-								return ts + 1099
+								return ts + 1118
 							}())
 					}
 
@@ -90014,12 +90053,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15164) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15183) == 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+15168) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15187) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -90085,7 +90124,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+19164, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19230, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -90168,7 +90207,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+19182, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19248, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -90297,7 +90336,7 @@ 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+19205, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 64))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19271, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 64))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+36+4, uint32(1), 8, 0x100)
@@ -90320,7 +90359,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+19225, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19291, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -90336,7 +90375,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19268
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19334
 		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 {
@@ -90362,7 +90401,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+19291,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19357,
 					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
@@ -90373,9 +90412,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 + 19329
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19395
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19363
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19429
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -90422,7 +90461,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+19401, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19467, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -90534,7 +90573,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19405,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19471,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -90553,7 +90592,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+19444,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19510,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 44)), 0)
@@ -90561,7 +90600,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+14733,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14752,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -90662,7 +90701,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 						} else {
-							zSchemaName = ts + 6446
+							zSchemaName = ts + 6465
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -90677,7 +90716,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+19475, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19541, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(1), 7, 0x80)
 							}
@@ -90742,7 +90781,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+19480,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19546,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -90754,7 +90793,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+12061, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12080, 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)
@@ -90773,9 +90812,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19489, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19555, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19507, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19573, 0)
 					}
 				}
 			}
@@ -90785,7 +90824,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+19527, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19593, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -90923,7 +90962,7 @@ func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect ui
 	(*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)
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSelect)).FpGroupBy)).FnExpr)
 		} 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)
 		}
@@ -91007,13 +91046,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 20)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 20)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19558, 0)
+					ts+19624, 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+19609, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19675, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -91202,19 +91241,19 @@ 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+19642,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19708,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19654
+						return ts + 19720
 					}
-					return ts + 1554
+					return ts + 1573
 				}(),
 				func() uintptr {
 					if bCover != 0 {
 						return (*Index)(unsafe.Pointer(pIdx)).FzName
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
 	}
 }
@@ -91227,7 +91266,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+7938)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7957)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -91534,7 +91573,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19677,
+		ts+19743,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -91595,7 +91634,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19731,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19797,
 		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:
@@ -91699,7 +91738,7 @@ __27:
 	if !((*SrcItem)(unsafe.Pointer(pItem1)).FcolUsed == uint64(0) && (*SrcItem)(unsafe.Pointer(pItem1)).FzName != uintptr(0)) {
 		goto __30
 	}
-	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1554, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
+	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1573, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
 __30:
 	;
 	pSub1 = (*SrcItem)(unsafe.Pointer(pItem1)).FpSelect
@@ -91737,7 +91776,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+19771, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19837, 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)
@@ -91796,7 +91835,7 @@ __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+88, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19786, libc.VaList(bp+40, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19852, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+88)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
@@ -92267,9 +92306,9 @@ __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 + 19802
+				return ts + 19868
 			}
-			return ts + 19811
+			return ts + 19877
 		}())
 
 	groupBySort = 1
@@ -92620,7 +92659,7 @@ __65:
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+116)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
 		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19802)
+	explainTempTable(tls, pParse, ts+19868)
 __146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
@@ -92702,7 +92741,7 @@ __7:
 	if !(i < nCol) {
 		goto __9
 	}
-	z = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*4))))
+	z = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*4))))
 	if !(z == uintptr(0)) {
 		goto __10
 	}
@@ -92724,7 +92763,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19820, 0)
+		ts+19886, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -92820,7 +92859,7 @@ func Xsqlite3_get_table(tls *libc.TLS, db uintptr, zSql uintptr, pazResult uintp
 		if (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
 			if pzErrMsg != 0 {
 				Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(pzErrMsg)))
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
 			}
 			Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg)
 		}
@@ -92957,7 +92996,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+19885, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19951, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -93001,7 +93040,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+36, pParse, iDb, ts+19931, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+36, pParse, iDb, ts+19997, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+36, pTableName) != 0) {
 		goto __9
 	}
@@ -93019,7 +93058,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19939, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20005, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -93031,7 +93070,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19931, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19997, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -93046,11 +93085,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19980, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20046, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
+
 __17:
 	;
 	goto trigger_cleanup
@@ -93058,22 +93098,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20006, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20072, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20044,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20110,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20081
+				return ts + 20147
 			}
-			return ts + 20088
+			return ts + 20154
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -93082,7 +93122,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20094, libc.VaList(bp+24, pTableName+8))
+		ts+20160, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -93111,9 +93151,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -93231,7 +93271,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+64, pParse, iDb, ts+19931, bp+56)
+	Xsqlite3FixInit(tls, bp+64, pParse, iDb, ts+19997, 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
@@ -93264,7 +93304,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20140,
+		ts+20206,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -93289,13 +93329,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20188,
+		ts+20254,
 		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+20263, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20329, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -93551,7 +93591,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20292, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20358, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -93590,9 +93630,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 + 6389
+				return ts + 6408
 			}
-			return ts + 5883
+			return ts + 5902
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -93604,7 +93644,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20312,
+			ts+20378,
 			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)
@@ -93718,12 +93758,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20374,
+		ts+20440,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20422
+				return ts + 20488
 			}
-			return ts + 20429
+			return ts + 20495
 		}()))
 __15:
 	;
@@ -93837,7 +93877,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+20436, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20502, 0)
 	return 1
 }
 
@@ -93903,7 +93943,7 @@ func codeReturningTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab
 	}
 	Xsqlite3ExprListDelete(tls, db, (*Select)(unsafe.Pointer(bp)).FpEList)
 	pNew = sqlite3ExpandReturning(tls, pParse, (*Returning)(unsafe.Pointer(pReturning)).FpReturnEL, pTab)
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0) {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
 		libc.Xmemset(tls, bp+160, 0, uint32(unsafe.Sizeof(NameContext{})))
 		if (*Returning)(unsafe.Pointer(pReturning)).FnRetCol == 0 {
 			(*Returning)(unsafe.Pointer(pReturning)).FnRetCol = (*ExprList)(unsafe.Pointer(pNew)).FnExpr
@@ -93957,7 +93997,7 @@ func codeTriggerProgram(tls *libc.TLS, pParse uintptr, pStepList uintptr, orconf
 
 		if (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan != 0 {
 			Xsqlite3VdbeAddOp4(tls, v, OP_Trace, 0x7fffffff, 1, 0,
-				Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
+				Xsqlite3MPrintf(tls, db, ts+6099, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
 				-6)
 		}
 
@@ -94067,7 +94107,7 @@ 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+20478, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20544, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
@@ -94660,7 +94700,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20492,
+		ts+20558,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*16)).FzCnName))
 	goto update_cleanup
 __27:
@@ -94692,7 +94732,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20528, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*20)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20594, 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:
@@ -94702,7 +94742,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7713
+				return ts + 7732
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*16)).FzCnName
 		}(),
@@ -95018,7 +95058,12 @@ __74:
 	goto __77
 __76:
 	flags = WHERE_ONEPASS_DESIRED
-	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) && !(pTrigger != 0) && !(hasFK != 0) && !(chngKey != 0) && !(*(*int32)(unsafe.Pointer(bp + 68)) != 0)) {
+	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) &&
+		!(pTrigger != 0) &&
+		!(hasFK != 0) &&
+		!(chngKey != 0) &&
+		!(*(*int32)(unsafe.Pointer(bp + 68)) != 0) &&
+		(*NameContext)(unsafe.Pointer(bp+28)).FncFlags&NC_Subquery == 0) {
 		goto __78
 	}
 	flags = flags | WHERE_ONEPASS_MULTIROW
@@ -95572,7 +95617,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20547)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20613)
 __169:
 	;
 update_cleanup:
@@ -95878,10 +95923,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+20560, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]uint8{})), bp+152, ts+20626, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20564, libc.VaList(bp+8, bp+152))
+				ts+20630, libc.VaList(bp+8, bp+152))
 			return SQLITE_ERROR
 		}
 
@@ -95972,7 +96017,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+12150, -1)
+				ts+12169, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -96004,7 +96049,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+20637, uint32(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20641, uint32(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20703, uint32(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20707, uint32(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -96152,14 +96197,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+20645)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20711)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20685)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20751)
 	return SQLITE_ERROR
 __2:
 	;
@@ -96170,7 +96215,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20728)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20794)
 	return SQLITE_ERROR
 __5:
 	;
@@ -96179,7 +96224,7 @@ __5:
 	*(*uint32)(unsafe.Pointer(db + 60)) |= uint32(SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE)
 	goto __4
 __3:
-	zOut = ts + 1554
+	zOut = ts + 1573
 __4:
 	;
 	saved_flags = (*Sqlite3)(unsafe.Pointer(db)).Fflags
@@ -96198,7 +96243,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20746, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20812, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -96218,7 +96263,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20769)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20835)
 	goto end_of_vacuum
 __8:
 	;
@@ -96233,7 +96278,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14503)
+	rc = execSql(tls, db, pzErrMsg, ts+14522)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -96278,7 +96323,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20796,
+		ts+20862,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -96287,7 +96332,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20904,
+		ts+20970,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -96298,7 +96343,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20958,
+		ts+21024,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 24)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -96309,7 +96354,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21109,
+		ts+21175,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -96654,7 +96699,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+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12396, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 44 + 4)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -96738,11 +96783,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+21239, libc.VaList(bp, pParse+196))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21305, libc.VaList(bp, pParse+196))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21263,
+			ts+21329,
 			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,
@@ -96752,7 +96797,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21428, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -96813,7 +96858,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+21381, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21447, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -96841,9 +96886,11 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FbDeclared = 0
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = bp + 32
+	(*Table)(unsafe.Pointer(pTab)).FnTabRef++
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{xConstruct})).f(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, pVTable+8, bp+48)
+	Xsqlite3DeleteTable(tls, db, pTab)
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = (*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -96851,9 +96898,9 @@ 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+21423, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21489, libc.VaList(bp+8, zModuleName))
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 48))))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3682, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 48))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
 		}
 		Xsqlite3DbFree(tls, db, pVTable)
@@ -96863,7 +96910,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 + 21453
+			var zFormat uintptr = ts + 21519
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -96875,12 +96922,12 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 			*(*uintptr)(unsafe.Pointer(pTab + 44 + 8)) = pVTable
 
 			for iCol = 0; iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol); iCol++ {
-				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16, ts+1554)
+				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16, ts+1573)
 				var nType int32
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16158, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16177, 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
@@ -96937,13 +96984,13 @@ 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+21499, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21565, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxConnect, bp+16)
 		if rc != SQLITE_OK {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 		}
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 16)))
@@ -96995,7 +97042,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+21499, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21565, 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)
@@ -97029,7 +97076,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, 151030)
+		return Xsqlite3MisuseError(tls, 151102)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -97071,7 +97118,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR,
 			func() uintptr {
 				if (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
-					return ts + 3663
+					return ts + 3682
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg))
@@ -97439,7 +97486,7 @@ func Xsqlite3VtabEponymousTableInit(tls *libc.TLS, pParse uintptr, pMod uintptr)
 	addModuleArgument(tls, pParse, pTab, Xsqlite3DbStrDup(tls, db, (*Table)(unsafe.Pointer(pTab)).FzName))
 	rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer(pModule)).FxConnect, bp+8)
 	if rc != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+		Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		Xsqlite3VtabEponymousTableClear(tls, db, pMod)
 	}
@@ -97482,7 +97529,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, 151521)
+		rc = Xsqlite3MisuseError(tls, 151593)
 	} else {
 		ap = va
 		switch op {
@@ -97509,7 +97556,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 151539)
+				rc = Xsqlite3MisuseError(tls, 151611)
 				break
 
 			}
@@ -97741,10 +97788,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 + 21518
+		return ts + 21584
 	}
 	if i == -1 {
-		return ts + 16267
+		return ts + 16286
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*16)).FzCnName
 }
@@ -97753,35 +97800,35 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21525, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21591, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21597, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12786, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 	}
 
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21597, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12786, 1)
 		}
-		Xsqlite3_str_append(tls, pStr, ts+5008, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5027, 1)
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 	}
 }
 
@@ -97798,29 +97845,29 @@ 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+21533, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21599, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21525, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21591, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21536
+				return ts + 21602
 			}
-			return ts + 21541
+			return ts + 21607
 		}(), 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+21549)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21615)
 		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+21551)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21617)
 	}
-	Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+	Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 }
 
 // This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
@@ -97861,11 +97908,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+21553, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21619, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21559
+				return ts + 21625
 			}
-			return ts + 21566
+			return ts + 21632
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -97875,43 +97922,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 + 10976
+					zFmt = ts + 10995
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21571
+				zFmt = ts + 21637
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21604
+				zFmt = ts + 21670
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21629
+				zFmt = ts + 21695
 			} else {
-				zFmt = ts + 21647
+				zFmt = ts + 21713
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21656, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21722, 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 + 16267
-			Xsqlite3_str_appendf(tls, bp+64, ts+21664, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16286
+			Xsqlite3_str_appendf(tls, bp+64, ts+21730, 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+21695, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21761, 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+21705, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21771, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21710,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21776,
 				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+21737, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21803, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -97943,25 +97990,25 @@ 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+21748, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21814, 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+21536, 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+21602, 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+21769, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21835, 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+21525, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21591, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21602, libc.VaList(bp+16, z))
 		}
 	}
-	Xsqlite3_str_append(tls, bp+24, ts+4957, 1)
+	Xsqlite3_str_append(tls, bp+24, ts+4976, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
@@ -99555,7 +99602,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21777, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21843, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -99583,7 +99630,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21792, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21858, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -100101,7 +100148,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+21801, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21867, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -100459,10 +100506,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{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)},
+	{FzOp: ts + 16135, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15466, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14986, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21881, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -100952,12 +100999,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21888, 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+21822, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21888, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -101036,7 +101083,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 + 6769
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7718
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -101130,7 +101177,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
-				return ts + 21863
+				return ts + 21929
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -101506,7 +101553,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21870,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21936,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -101522,7 +101569,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 		pRhs = Xsqlite3PExpr(tls, pParse, TK_UPLUS,
 			Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*ExprList_item)(unsafe.Pointer(pArgs+8+uintptr(j)*20)).FpExpr, 0), uintptr(0))
 		pTerm = Xsqlite3PExpr(tls, pParse, TK_EQ, pColRef, pRhs)
-		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ|JT_RIGHT) != 0 {
 			joinType = U32(EP_OuterON)
 		} else {
 			joinType = U32(EP_InnerON)
@@ -102239,7 +102286,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21906, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21972, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*16)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -102310,7 +102357,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21932
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21998
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -102484,6 +102531,10 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	var iCur int32
+	var saved_pIdxEpr uintptr
+
+	saved_pIdxEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 
 	addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	for __ccgo := true; __ccgo; __ccgo = iLevel < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel) {
@@ -102527,9 +102578,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, n)
 			var jj int32
 			for jj = 0; jj < n; jj++ {
-				var iCol int32 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(jj)*2)))
-
-				Xsqlite3ExprCodeGetColumnOfTable(tls, v, (*Index)(unsafe.Pointer(pIdx)).FpTable, iCur, iCol, r1+jj)
+				Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pIdx, iCur, jj, r1+jj)
 			}
 			Xsqlite3VdbeAddOp4Int(tls, v, OP_FilterAdd, (*WhereLevel)(unsafe.Pointer(pLevel)).FregFilter, 0, r1, n)
 			Xsqlite3ReleaseTempRange(tls, pParse, r1, n)
@@ -102563,6 +102612,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 		}
 	}
 	Xsqlite3VdbeJumpHere(tls, v, addrOnce)
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = saved_pIdxEpr
 }
 
 func allocateIndexInfo(tls *libc.TLS, pWInfo uintptr, pWC uintptr, mUnusable Bitmask, pSrc uintptr, pmNoOmit uintptr) uintptr {
@@ -102676,7 +102726,7 @@ __3:
 		uint32(unsafe.Sizeof(sqlite3_index_orderby{}))*uint32(nOrderBy)+uint32(unsafe.Sizeof(HiddenIndexInfo1{}))+
 		uint32(unsafe.Sizeof(uintptr(0)))*uint32(nTerm)))
 	if pIdxInfo == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1490, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1509, 0)
 		return uintptr(0)
 	}
 	pHidden = pIdxInfo + 1*72
@@ -102798,9 +102848,9 @@ func vtabBestIndex(tls *libc.TLS, pParse uintptr, pTab uintptr, p uintptr) int32
 		if rc == SQLITE_NOMEM {
 			Xsqlite3OomFault(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb)
 		} else if !(int32((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
 		}
 	}
 	Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg)
@@ -102821,11 +102871,16 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 
 	_ = pParse
 
+	if !((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol)
+	} else {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnColumn)
+	}
 	nField = func() int32 {
-		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < (*Index)(unsafe.Pointer(pIdx)).FnSample {
+		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < nField {
 			return int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField)
 		}
-		return (*Index)(unsafe.Pointer(pIdx)).FnSample
+		return nField
 	}()
 	iCol = 0
 	iSample = (*Index)(unsafe.Pointer(pIdx)).FnSample * nField
@@ -104405,7 +104460,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+21943, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+22009, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -104463,7 +104518,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+21943, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+22009, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -104861,7 +104916,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+21969, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+22035, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -105468,7 +105523,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22004, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22070, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -105503,6 +105558,10 @@ __3:
 			if int32((*WherePath)(unsafe.Pointer(pFrom)).FisOrdered) == (*ExprList)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpOrderBy)).FnExpr {
 				(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_ORDERED)
 			}
+			if (*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy != 0 &&
+				int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) > (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr {
+				(*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat = I8((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr)
+			}
 		} else {
 			(*WhereInfo)(unsafe.Pointer(pWInfo)).FrevMask = (*WherePath)(unsafe.Pointer(pFrom)).FrevLoop
 			if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) <= 0 {
@@ -105797,6 +105856,9 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
+		if Xsqlite3IndexAffinityStr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pIdx) != 0 {
+			(*IndexedExpr)(unsafe.Pointer(p)).Faff = *(*uint8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FzColAff + uintptr(i)))
+		}
 		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
@@ -105949,7 +106011,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22022, libc.VaList(bp, int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22088, libc.VaList(bp, int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))))
 	return uintptr(0)
 __2:
 	;
@@ -106013,7 +106075,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22050, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22116, 0)
 	goto __5
 __4:
 	ii = 0
@@ -106896,7 +106958,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22068, -1)
+		pCtx, ts+22134, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -107029,7 +107091,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+22124, -1)
+					pCtx, ts+22190, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -107118,17 +107180,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-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))
+var row_numberName = *(*[11]uint8)(unsafe.Pointer(ts + 22235))
+var dense_rankName = *(*[11]uint8)(unsafe.Pointer(ts + 22246))
+var rankName = *(*[5]uint8)(unsafe.Pointer(ts + 22257))
+var percent_rankName = *(*[13]uint8)(unsafe.Pointer(ts + 22262))
+var cume_distName = *(*[10]uint8)(unsafe.Pointer(ts + 22275))
+var ntileName = *(*[6]uint8)(unsafe.Pointer(ts + 22285))
+var last_valueName = *(*[11]uint8)(unsafe.Pointer(ts + 22291))
+var nth_valueName = *(*[10]uint8)(unsafe.Pointer(ts + 22302))
+var first_valueName = *(*[12]uint8)(unsafe.Pointer(ts + 22312))
+var leadName = *(*[5]uint8)(unsafe.Pointer(ts + 22324))
+var lagName = *(*[4]uint8)(unsafe.Pointer(ts + 22329))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -107174,7 +107236,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22267, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22333, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -107218,12 +107280,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+22286, 0)
+			ts+22352, 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+22357, 0)
+				ts+22423, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -107246,7 +107308,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+7938)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7957)
 					}
 					break
 				}
@@ -107451,7 +107513,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+22420, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22486, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -107567,7 +107629,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+7530))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -107682,7 +107744,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22446, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22512, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -107747,15 +107809,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 + 22478
+				zErr = ts + 22544
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22495
+				zErr = ts + 22561
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22511
+				zErr = ts + 22577
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22531, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22597, 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 {
@@ -107776,7 +107838,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+22564, 0)
+				ts+22630, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -107914,7 +107976,7 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regZero)
 	if eCond >= WINDOW_STARTING_NUM {
 		var regString int32 = Xsqlite3GetTempReg(tls, pParse)
-		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1554, -1)
+		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1573, -1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, Xsqlite3VdbeCurrentAddr(tls, v)+2, reg)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL))
 
@@ -107932,11 +107994,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22611,
-	ts + 22664,
-	ts + 22068,
-	ts + 22715,
-	ts + 22767,
+	ts + 22677,
+	ts + 22730,
+	ts + 22134,
+	ts + 22781,
+	ts + 22833,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -108426,7 +108488,7 @@ func windowCodeRangeTest(tls *libc.TLS, p uintptr, op int32, csr1 int32, regVal
 
 	}
 
-	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1554, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1573, -1)
 	addrGe = Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, 0, reg1)
 
 	if op == OP_Ge && arith == OP_Add || op == OP_Le && arith == OP_Subtract {
@@ -109328,19 +109390,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+22817,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22883,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 22859
+							return ts + 22925
 						}
-						return ts + 22868
+						return ts + 22934
 					}(),
 						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+22874, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22940, 0)
 		}
 	}
 
@@ -109411,7 +109473,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+22908,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22974,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -110506,7 +110568,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22946, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23012, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -111481,21 +111543,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+16267, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16286, 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+22968, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23034, 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+16180, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16199, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23034, 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))
@@ -112238,7 +112300,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+22995)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*12 + 4)), ts+23061)
 				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 {
@@ -112402,7 +112464,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+23004, libc.VaList(bp+32, bp+92))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23070, 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))
@@ -112619,9 +112681,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 + 6764
+							return ts + 7713
 						}
-						return ts + 6769
+						return ts + 7718
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)))
@@ -112905,19 +112967,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+23028, 0)
+					ts+23094, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23123, 0)
+					ts+23189, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23207, 0)
+					ts+23273, 0)
 			}
 			break
 		case uint32(273):
@@ -113296,9 +113358,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+23004, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23070, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23292, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23358, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -114066,7 +114128,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+23309, libc.VaList(bp, bp+1248))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23375, libc.VaList(bp, bp+1248))
 				break
 			}
 		}
@@ -114087,9 +114149,9 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 	}
 	if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg != 0 || (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_OK && (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_DONE {
 		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)))
+			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3682, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23334, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23400, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -114262,7 +114324,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23411, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -114275,11 +114337,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19931, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19997, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23352, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23418, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23357, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23423, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -114292,9 +114354,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23367, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23433, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23371, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23437, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -114364,7 +114426,8 @@ func sqlite3TestExtInit(tls *libc.TLS, db uintptr) int32 {
 	return Xsqlite3FaultSim(tls, 500)
 }
 
-var sqlite3BuiltinExtensions = [4]uintptr{
+var sqlite3BuiltinExtensions = [5]uintptr{
+	0,
 	0,
 	0,
 	0,
@@ -114528,7 +114591,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 174337)
+		return Xsqlite3MisuseError(tls, 174426)
 	}
 
 	ap = va
@@ -115103,7 +115166,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175111)
+		return Xsqlite3MisuseError(tls, 175200)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -115118,7 +115181,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23379, 0)
+			ts+23445, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -115309,23 +115372,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 + 23447
+	var zErr uintptr = ts + 23513
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23461
+			zErr = ts + 23527
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23483
+			zErr = ts + 23549
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23505
+			zErr = ts + 23571
 			break
 
 		}
@@ -115343,35 +115406,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23528,
-	ts + 23541,
+	ts + 23594,
+	ts + 23607,
 	uintptr(0),
-	ts + 23557,
-	ts + 23582,
-	ts + 23596,
-	ts + 23615,
-	ts + 1490,
-	ts + 23640,
-	ts + 23677,
-	ts + 23689,
-	ts + 23704,
-	ts + 23737,
+	ts + 23623,
+	ts + 23648,
+	ts + 23662,
+	ts + 23681,
+	ts + 1509,
+	ts + 23706,
+	ts + 23743,
 	ts + 23755,
-	ts + 23780,
-	ts + 23809,
+	ts + 23770,
+	ts + 23803,
+	ts + 23821,
+	ts + 23846,
+	ts + 23875,
 	uintptr(0),
-	ts + 5838,
-	ts + 5334,
-	ts + 23826,
-	ts + 23844,
-	ts + 23862,
+	ts + 5857,
+	ts + 5353,
+	ts + 23892,
+	ts + 23910,
+	ts + 23928,
 	uintptr(0),
-	ts + 23896,
+	ts + 23962,
 	uintptr(0),
-	ts + 23917,
-	ts + 23943,
-	ts + 23966,
-	ts + 23987,
+	ts + 23983,
+	ts + 24009,
+	ts + 24032,
+	ts + 24053,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -115492,7 +115555,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, 175758)
+		return Xsqlite3MisuseError(tls, 175847)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -115537,7 +115600,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+24003, 0)
+				ts+24069, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -115654,7 +115717,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+24066, libc.VaList(bp, zName))
+		ts+24132, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -115682,7 +115745,7 @@ func Xsqlite3_overload_function(tls *libc.TLS, db uintptr, zName uintptr, nArg i
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, zName))
+	zCopy = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, zName))
 	if zCopy == uintptr(0) {
 		return SQLITE_NOMEM
 	}
@@ -115890,7 +115953,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+24117, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24183, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -115983,7 +116046,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, 176503))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176592))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -116053,7 +116116,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, 176582)
+		return Xsqlite3MisuseError(tls, 176671)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -116063,7 +116126,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, 176591)
+		return Xsqlite3MisuseError(tls, 176680)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -116095,14 +116158,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, 176639)
+		return Xsqlite3MisuseError(tls, 176728)
 	}
 
 	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+24138, 0)
+				ts+24204, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -116232,7 +116295,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+24206, uint32(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24272, uint32(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -116277,10 +116340,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24212, zUri+7, uint32(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24278, zUri+7, uint32(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24222,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24288,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -116385,7 +116448,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24250, zOpt, uint32(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24316, zOpt, uint32(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -116396,17 +116459,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24254, zOpt, uint32(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24320, zOpt, uint32(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24254
+	zModeType = ts + 24320
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24260, zOpt, uint32(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24326, zOpt, uint32(4)) == 0) {
 		goto __32
 	}
 
@@ -116414,7 +116477,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 3272
+	zModeType = ts + 3291
 __32:
 	;
 	if !(aMode != 0) {
@@ -116444,7 +116507,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24265, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24331, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -116452,7 +116515,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24285,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24351,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -116492,7 +116555,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24309, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24375, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -116515,15 +116578,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24325, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24332, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24391, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24398, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{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},
+	{Fz: ts + 24406, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24409, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24412, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17381, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -116669,10 +116732,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+21863, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21929, 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+24350, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24416, 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) {
@@ -116686,7 +116749,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 177308)
+	rc = Xsqlite3MisuseError(tls, 177397)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+12, bp+16)
@@ -116703,7 +116766,7 @@ __19:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 16))))
@@ -116737,9 +116800,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 + 6441
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6460
 	(*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 + 23352
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).FzDbSName = ts + 23418
 	(*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)
@@ -116844,7 +116907,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24356
+		zFilename = ts + 24422
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -116947,21 +117010,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+24359,
+	Xsqlite3_log(tls, iErr, ts+24425,
 		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+24384)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24450)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24404)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24470)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24411)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24477)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -117072,7 +117135,7 @@ __4:
 	autoinc = libc.Bool32(int32((*Table)(unsafe.Pointer(pTab)).FiPKey) == iCol && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != U32(0))
 	goto __13
 __12:
-	zDataType = ts + 1119
+	zDataType = ts + 1138
 	primarykey = 1
 __13:
 	;
@@ -117119,14 +117182,14 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24428, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24494, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -117775,7 +117838,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24456, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24522, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -117893,7 +117956,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 + 24464
+			return ts + 24530
 		}
 		return uintptr(0)
 	}(), 0)
@@ -118070,7 +118133,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6181, ts + 6764, ts + 6769, ts + 6191, ts + 6186, ts + 8005, ts + 24487, ts + 24493,
+	ts + 6200, ts + 7713, ts + 7718, ts + 6210, ts + 6205, ts + 8024, ts + 24553, ts + 24559,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -118223,7 +118286,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 + 24500 + uintptr(int32(c)&0xf)))
+	c = *(*uint8)(unsafe.Pointer(ts + 24566 + uintptr(int32(c)&0xf)))
 __8:
 	;
 __6:
@@ -118249,7 +118312,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	switch Xsqlite3_value_type(tls, pValue) {
 	case SQLITE_NULL:
 		{
-			jsonAppendRaw(tls, p, ts+6181, uint32(4))
+			jsonAppendRaw(tls, p, ts+6200, uint32(4))
 			break
 
 		}
@@ -118278,7 +118341,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+24517, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24583, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -118336,19 +118399,19 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 	switch int32((*JsonNode)(unsafe.Pointer(pNode)).FeType) {
 	default:
 		{
-			jsonAppendRaw(tls, pOut, ts+6181, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6200, uint32(4))
 			break
 
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6764, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+7713, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6769, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+7718, uint32(5))
 			break
 
 		}
@@ -118893,17 +118956,17 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		}
 		return int32(j + U32(1))
 	} else if int32(c) == 'n' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6181, uint32(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6200, uint32(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(z + uintptr(i+U32(4))))])&0x06 != 0) {
 		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+6764, uint32(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7713, 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+6769, uint32(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7718, 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))
@@ -119004,7 +119067,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+24546, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24612, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -119310,7 +119373,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+24561, uint32(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24627, uint32(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -119325,7 +119388,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24565, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24631, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -119379,7 +119442,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+24591,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24657,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -119484,11 +119547,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+24634, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24700, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
-					jsonAppendRaw(tls, bp, ts+4998, uint32(2))
+					jsonAppendRaw(tls, bp, ts+5017, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24637, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24703, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, uint8(0))
 				}
@@ -119529,7 +119592,7 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if pNode != 0 {
 				jsonRenderNode(tls, pNode, bp, uintptr(0))
 			} else {
-				jsonAppendRaw(tls, bp, ts+6181, uint32(4))
+				jsonAppendRaw(tls, bp, ts+6200, uint32(4))
 			}
 		}
 		if i == argc {
@@ -119645,14 +119708,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24640, -1)
+			ts+24706, -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+24691, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24757, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -119747,7 +119810,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15380)
+	jsonWrongNumArgs(tls, ctx, ts+15399)
 	return
 __2:
 	;
@@ -119822,9 +119885,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24725
+			return ts + 24791
 		}
-		return ts + 24729
+		return ts + 24795
 	}())
 	return
 __2:
@@ -119957,7 +120020,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24736, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24802, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -120054,7 +120117,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24739, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24805, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -120098,7 +120161,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24742)
+		ts+24808)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -120229,7 +120292,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24825, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24891, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -120248,7 +120311,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+24831, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24897, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 12
@@ -120344,7 +120407,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+24831, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24897, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -120368,7 +120431,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 + 24836
+				zRoot = ts + 24902
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -120490,7 +120553,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+24546, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24612, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -120585,25 +120648,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{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 + 24904},
+	{FnArg: int8(-1), 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(2), 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 + 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}}
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_JSON), FxSFunc: 0, FzName: ts + 24951},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_SQL), FxSFunc: 0, FzName: ts + 24954},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24958},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24970},
+	{FnArg: int8(2), 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_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24993},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25004},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25016},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_ISSET), FxSFunc: 0, FzName: ts + 25029},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25038},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25038},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25048},
+	{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 + 25059},
+	{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 + 25076}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -120622,8 +120685,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 25028, FpModule: 0},
-	{FzName: ts + 25038, FpModule: 0},
+	{FzName: ts + 25094, FpModule: 0},
+	{FzName: ts + 25104, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -120880,11 +120943,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+25048, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25114, 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+25056, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25122, iNode, 0,
 			pRtree+76)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -121095,7 +121158,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+25061,
+		ts+25127,
 		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))
@@ -121793,7 +121856,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25143)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25209)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -122005,7 +122068,7 @@ func rtreeBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 2
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FneedToFreeIdxStr = 1
-	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+24, Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, bp+8))) {
+	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+24, Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, bp+8))) {
 		return SQLITE_NOMEM
 	}
 
@@ -123134,7 +123197,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25157, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25223, 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 {
@@ -123146,12 +123209,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+25177, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25243, 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+25209, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25275, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -123377,7 +123440,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+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))
+		ts+25312, 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))
@@ -123400,14 +123463,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(20)
 	defer tls.Free(20)
 
-	var zFmt uintptr = ts + 25391
+	var zFmt uintptr = ts + 25457
 	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+11348, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11367, 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 {
@@ -123448,7 +123511,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25447, ts + 5060, ts + 16267,
+	ts + 25513, ts + 5079, ts + 16286,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -123491,19 +123554,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+25452,
+			ts+25518,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25514, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25580, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25519,
+			ts+25585,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25583,
+			ts+25649,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25653,
+			ts+25719,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -123532,7 +123595,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 + 25702
+			zFormat = ts + 25768
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -123544,7 +123607,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+25810,
+			ts+25876,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -123552,18 +123615,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+25855, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25921, 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+12767, 1)
+					Xsqlite3_str_append(tls, p, ts+12786, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25882, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25948, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25904, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25970, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25912, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25978, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -123578,14 +123641,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25928,
-	ts + 25981,
-	ts + 26026,
-	ts + 26078,
-	ts + 26132,
-	ts + 26177,
-	ts + 26235,
-	ts + 26290,
+	ts + 25994,
+	ts + 26047,
+	ts + 26092,
+	ts + 26144,
+	ts + 26198,
+	ts + 26243,
+	ts + 26301,
+	ts + 26356,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -123614,7 +123677,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+26337, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26403, 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
@@ -123622,19 +123685,19 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 				(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = 4 + int32((*Rtree)(unsafe.Pointer(pRtree)).FnBytesPerCell)*RTREE_MAXCELLS
 			}
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26357,
+			ts+26423,
 			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 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26414,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26480,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -123676,16 +123739,16 @@ 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 + 26449,
-		ts + 26492,
-		ts + 26527,
-		ts + 26563,
+		ts + 26515,
+		ts + 26558,
+		ts + 26593,
+		ts + 26629,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
 		goto __1
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*4))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*4))))
 	return SQLITE_ERROR
 __1:
 	;
@@ -123710,7 +123773,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+26600,
+	Xsqlite3_str_appendf(tls, pSql, ts+26666,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4))), *(*uintptr)(unsafe.Pointer(argv + 3*4))))
 	ii = 4
 __3:
@@ -123722,7 +123785,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26624, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26690, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -123745,7 +123808,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26696, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -123756,14 +123819,14 @@ __10:
 	if !(ii < argc) {
 		goto __12
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*4))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*4))))
 	rc = SQLITE_ERROR
 	goto __13
 __12:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __14
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
 __14:
 	;
 __13:
@@ -123806,7 +123869,7 @@ __17:
 	if !(iErr != 0) {
 		goto __22
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*4))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*4))))
 	goto rtreeInit_fail
 __22:
 	;
@@ -123823,7 +123886,7 @@ __23:
 	if !(rc != 0) {
 		goto __24
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
 	goto rtreeInit_fail
 __24:
 	;
@@ -123841,7 +123904,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26633, ts + 26644}
+var azFormat = [2]uintptr{ts + 26699, ts + 26710}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(600)
@@ -123879,13 +123942,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+10920, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10939, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26654, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+552)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26720, 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+26660, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 552 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26726, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 552 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26664, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26730, 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})))
@@ -123896,7 +123959,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+26666, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26732, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -123972,12 +124035,12 @@ 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+26699,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26765,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
-						return ts + 4062
+						return ts + 4081
 					}
-					return ts + 1554
+					return ts + 1573
 				}(), z))
 			if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport == uintptr(0) {
 				(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
@@ -123996,7 +124059,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+26706,
+			ts+26772,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -124015,7 +124078,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+26751, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26817, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -124029,8 +124092,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 + 26783,
-		ts + 26837,
+		ts + 26849,
+		ts + 26903,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 24 + uintptr(bLeaf)*4)) == uintptr(0) {
@@ -124045,23 +124108,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+26885,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26951,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26930
+					return ts + 26996
 				}
-				return ts + 26938
+				return ts + 27004
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26947,
+				ts+27013,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26930
+						return ts + 26996
 					}
-					return ts + 26938
+					return ts + 27004
 				}(), iKey, iVal))
 		}
 	}
@@ -124085,7 +124148,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+27005, libc.VaList(bp, i, iCell, iNode))
+				ts+27071, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -124105,7 +124168,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+27053, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27119, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -124122,14 +124185,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+27120, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27186, 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+27154, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27220, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -124137,7 +124200,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+27184,
+					ts+27250,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -124166,14 +124229,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+27239,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27305,
 			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+27270, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27336, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -124195,12 +124258,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+14503, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14522, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27337, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27403, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -124209,12 +124272,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25157, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25223, 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+27365, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27431, 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)
 		}
@@ -124228,8 +124291,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+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27403, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27462, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27469, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -124237,7 +124300,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+27411, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27477, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -124252,7 +124315,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27415, -1)
+			ts+27481, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -124260,7 +124323,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6441
+			zDb = ts + 6460
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*4)))
 		}
@@ -124270,7 +124333,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 + 18012
+				return ts + 18078
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -124640,11 +124703,11 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		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+27466, 1)
+		Xsqlite3_str_append(tls, x, ts+27532, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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+27534, 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+27479, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27545, 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)
 	}
@@ -124664,19 +124727,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+27490, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27556, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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)))))
+			Xsqlite3_str_appendf(tls, x, ts+27574, 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+27516, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27582, 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+27524, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27590, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27528, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27594, 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)
 	}
@@ -125595,7 +125658,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+27541, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27607, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -125604,7 +125667,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27563, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*4))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27629, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*4))))
 	goto __3
 __3:
 	ii++
@@ -125612,7 +125675,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26696, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -125623,7 +125686,7 @@ __5:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __7
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
 __7:
 	;
 __6:
@@ -125648,7 +125711,7 @@ __9:
 	if !(rc != 0) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	goto geopolyInit_fail
 __10:
 	;
@@ -125839,7 +125902,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 + 16267
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16286
 		(*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
@@ -125849,7 +125912,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 + 27567
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27633
 		(*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
@@ -125857,7 +125920,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 + 27573
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27639
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -125969,7 +126032,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27582, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27648, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -126101,14 +126164,14 @@ geopoly_update_end:
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
 	_ = pVtab
 	_ = nArg
-	if Xsqlite3_stricmp(tls, zName, ts+27622) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27688) == 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+27638) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27704) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -126173,7 +126236,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+27653, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27719, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -126185,25 +126248,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [2]byte
 	FzName       uintptr
 }{
-	{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},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27727},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27740},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27753},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27766},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27704},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27778},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27688},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27801},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27815},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27828},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27842},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27858},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27804},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27870},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -126213,26 +126276,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27823, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27889, 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+27833, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27899, 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+27844, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27910, -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+27567, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27633, 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+27855, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27921, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -126286,7 +126349,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+25143, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25209, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -126604,7 +126667,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+27865, -1)
+		Xsqlite3_result_error(tls, context, ts+27931, -1)
 		return
 	}
 
@@ -126615,7 +126678,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+27865, -1)
+			Xsqlite3_result_error(tls, context, ts+27931, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -126628,7 +126691,7 @@ func prepareAndCollectError(tls *libc.TLS, db uintptr, ppStmt uintptr, pzErrmsg
 
 	var rc int32 = Xsqlite3_prepare_v2(tls, db, zSql, -1, ppStmt, uintptr(0))
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 		*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	}
 	return rc
@@ -126640,7 +126703,7 @@ func resetAndCollectError(tls *libc.TLS, pStmt uintptr, pzErrmsg uintptr) int32
 
 	var rc int32 = Xsqlite3_reset(tls, pStmt)
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
 	}
 	return rc
 }
@@ -126716,7 +126779,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+27886, uintptr(0), uintptr(0), p+36)
+				ts+27952, uintptr(0), uintptr(0), p+36)
 		}
 
 		if rc == SQLITE_OK {
@@ -126780,7 +126843,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+25056, zIn, uint32(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > Size_t(4) && libc.Xmemcmp(tls, ts+25122, 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++ {
 				}
@@ -126801,16 +126864,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+28057, libc.VaList(bp, func() uintptr {
+			ts+28123, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28207
+					return ts + 28273
 				}
-				return ts + 1554
+				return ts + 1573
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+4, p+36,
-			ts+28248)
+			ts+28314)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -126908,7 +126971,7 @@ func rbuFinalize(tls *libc.TLS, p uintptr, pStmt uintptr) {
 	var rc int32 = Xsqlite3_finalize(tls, pStmt)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && rc != SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 	}
 }
 
@@ -126926,7 +126989,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+28373, libc.VaList(bp, zTab)))
+			ts+28439, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -126944,7 +127007,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+28492, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28558, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -126962,7 +127025,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*4, p+36,
 		Xsqlite3_mprintf(tls,
-			ts+28513, libc.VaList(bp+16, zIdx)))
+			ts+28579, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -126985,7 +127048,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+28564, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28630, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -127031,7 +127094,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+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28651, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -127046,7 +127109,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+28613, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28679, 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 {
@@ -127086,7 +127149,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+19489, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19555, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -127096,18 +127159,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+28642, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28708, 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+28661, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28727, 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+28666, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28732, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -127119,18 +127182,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+28676, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28742, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28705
+							return ts + 28771
 						}
-						return ts + 28718
+						return ts + 28784
 					}()))
 		}
 
 		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+28727, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28793, 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)
@@ -127144,7 +127207,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+28749,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28815,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 5)
@@ -127187,12 +127250,12 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	defer tls.Free(24)
 
 	var zList uintptr = uintptr(0)
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	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+28776, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14614
+		zList = rbuMPrintf(tls, p, ts+28842, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14633
 	}
 	return zList
 }
@@ -127203,13 +127266,13 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 
 	var iPk int32 = 1
 	var zRet uintptr = uintptr(0)
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	for 1 != 0 {
 		var i int32
 		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+28785, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28851, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -127231,25 +127294,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+28798, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28864, 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+28830, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28896, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		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)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+28919)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28925, ts+28932, ts+4976)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+1573)
 
 		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+28874,
+					ts+28940,
 					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+28916, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28982, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -127286,12 +127349,12 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	zVector = uintptr(0)
 	zRet = uintptr(0)
 	bFailed = 0
-	zSep = ts + 1554
+	zSep = ts + 1573
 	iCol = 0
 	*(*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+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28679, 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
@@ -127326,7 +127389,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
 	goto __7
 __6:
-	zCol = ts + 28936
+	zCol = ts + 29002
 __7:
 	;
 	goto __5
@@ -127334,13 +127397,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*4))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28944,
+	zLhs = rbuMPrintf(tls, p, ts+29010,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28965,
+	zOrder = rbuMPrintf(tls, p, ts+29031,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+29001,
+	zSelect = rbuMPrintf(tls, p, ts+29067,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14614
+	zSep = ts + 14633
 	iCol++
 	goto __1
 __2:
@@ -127358,12 +127421,12 @@ __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+29028,
+		Xsqlite3_mprintf(tls, ts+29094,
 			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
 	}
-	zSep = ts + 1554
+	zSep = ts + 1573
 	iCol = 0
 __14:
 	if !(iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnCol) {
@@ -127385,8 +127448,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14614
+	zVector = rbuMPrintf(tls, p, ts+29142, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14633
 	goto __15
 __15:
 	iCol++
@@ -127397,7 +127460,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29083, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29149, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -127424,13 +127487,13 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 	var zImpPK uintptr = uintptr(0)
 	var zWhere uintptr = uintptr(0)
 	var nBind int32 = 0
-	var zCom uintptr = ts + 1554
-	var zAnd uintptr = ts + 1554
+	var zCom uintptr = ts + 1573
+	var zAnd uintptr = ts + 1573
 	*(*uintptr)(unsafe.Pointer(bp + 200)) = uintptr(0)
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+36,
-			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -127442,9 +127505,9 @@ 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+29095, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29161, 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
+			zType = ts + 1573
 		} else {
 			if iCid < 0 {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK {
@@ -127454,37 +127517,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 + 28936
+					zCol = ts + 29002
 				} else {
-					zCol = ts + 28666
+					zCol = ts + 28732
 				}
-				zType = ts + 1119
+				zType = ts + 1138
 			} 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+29117, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29183, 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 + 28853
+					return ts + 28919
 				}
-				return ts + 1554
+				return ts + 1573
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29137,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29203,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29158,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29224,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29191, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29257, 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 + 14614
-		zAnd = ts + 21525
+		zCom = ts + 14633
+		zAnd = ts + 21591
 		nBind++
 	}
 
@@ -127518,16 +127581,16 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 
 	var zList uintptr = uintptr(0)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
-		var zS uintptr = ts + 1554
+		var zS uintptr = ts + 1573
 		var i int32
 		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+29215, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29281, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29227, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29293, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14614
+			zS = ts + 14633
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -127535,7 +127598,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+29236, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29302, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -127547,27 +127610,27 @@ 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+29251, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29317, 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 zSep uintptr = ts + 1573
 		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+29265, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21525
+				zList = rbuMPrintf(tls, p, ts+29331, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21591
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29277, libc.VaList(bp+40, zList))
+			ts+29343, libc.VaList(bp+40, zList))
 
 	} else {
-		var zSep uintptr = ts + 1554
+		var zSep uintptr = ts + 1573
 		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 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-				zList = rbuMPrintf(tls, p, ts+29327, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21525
+				zList = rbuMPrintf(tls, p, ts+29393, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21591
 			}
 		}
 	}
@@ -127576,7 +127639,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+29340, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29406, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -127590,21 +127653,21 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 		if int32(libc.Xstrlen(tls, zMask)) != (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 			rbuBadControlError(tls, p)
 		} else {
-			var zSep uintptr = ts + 1554
+			var zSep uintptr = ts + 1573
 			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+29327,
+					zList = rbuMPrintf(tls, p, ts+29393,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), i+1))
-					zSep = ts + 14614
+					zSep = ts + 14633
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29366,
+					zList = rbuMPrintf(tls, p, ts+29432,
 						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 + 14614
+					zSep = ts + 14633
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29396,
+					zList = rbuMPrintf(tls, p, ts+29462,
 						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 + 14614
+					zSep = ts + 14633
 				}
 			}
 		}
@@ -127639,19 +127702,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 + 29433
+		var zSep uintptr = ts + 29499
 		*(*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+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28651, 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+16155) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16174) == 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+28613, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -127663,15 +127726,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 + 28853
+					zDesc = ts + 28919
 				} else {
-					zDesc = ts + 1554
+					zDesc = ts + 1573
 				}
-				z = rbuMPrintf(tls, p, ts+29446, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14614
+				z = rbuMPrintf(tls, p, ts+29512, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14633
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29457, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29523, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 60)))
 	}
 	return z
@@ -127686,12 +127749,12 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		*(*uintptr)(unsafe.Pointer(bp + 168)) = uintptr(0)
 		var zIdx uintptr = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 172)) = uintptr(0)
-		var zComma uintptr = ts + 1554
+		var zComma uintptr = ts + 1573
 		var zCols uintptr = uintptr(0)
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+36,
-			ts+29461)
+			ts+29527)
 		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))) {
@@ -127700,7 +127763,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+28613, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -127710,25 +127773,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+29511, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29577, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*4)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29533, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29599, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28853
+						return ts + 28919
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
-				zComma = ts + 14614
+				zComma = ts + 14633
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29543, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29609, 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+6441, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29558,
+			ts+29624,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 0))
 	}
 }
 
@@ -127738,50 +127801,50 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
 		var tnum int32 = (*RbuObjIter)(unsafe.Pointer(pIter)).FiTnum
-		var zComma uintptr = ts + 1554
+		var zComma uintptr = ts + 1573
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
-			var zPk uintptr = ts + 1554
+			var zPk uintptr = ts + 1573
 			var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCol)*4))
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, (*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 + 29620
+				zPk = ts + 29686
 			}
-			zSql = rbuMPrintf(tls, p, ts+29633,
+			zSql = rbuMPrintf(tls, p, ts+29699,
 				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 + 29660
+							return ts + 29726
 						}
-						return ts + 1554
+						return ts + 1573
 					}()))
-			zComma = ts + 14614
+			zComma = ts + 14633
 		}
 
 		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+29670, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29736, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		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,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29743,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29709
+						return ts + 29775
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 0))
 	}
 }
 
@@ -127794,7 +127857,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+29724,
+				ts+29790,
 				libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -127831,7 +127894,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+29781)
+			ts+29847)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 4)) == SQLITE_OK {
 		var rc2 int32
@@ -127936,7 +127999,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+29847, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29913, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -127956,24 +128019,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+6441, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29867,
+				ts+29933,
 				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+6441, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 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+29932, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29998, 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+29968, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 608)))))
+					Xsqlite3_mprintf(tls, ts+30034, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 608)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -127989,7 +128052,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30002,
+						ts+30068,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -127997,31 +128060,31 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 30063
+											return ts + 30129
 										}
-										return ts + 30067
+										return ts + 30133
 									}()
 								}
-								return ts + 1554
+								return ts + 1573
 							}(), zStart,
 							zCollist, zLimit))
 					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+30073,
+						ts+30139,
 						libc.VaList(bp+216, zCollist, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30134,
+						ts+30200,
 						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 + 30063
+									return ts + 30129
 								}
-								return ts + 30067
+								return ts + 30133
 							}(),
 							zCollist, zLimit))
 				}
@@ -128046,8 +128109,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+6452)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6448)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6471)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6467)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -128056,52 +128119,52 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			rbuCreateImposterTable2(tls, p, pIter)
 			zWrite = func() uintptr {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
-					return ts + 1554
+					return ts + 1573
 				}
-				return ts + 30293
+				return ts + 30359
 			}()
 
 			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+30302,
+						ts+30368,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30338
+								return ts + 30404
 							}
-							return ts + 1554
+							return ts + 1573
 						}(), zBindings)))
 			}
 
 			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+30348, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30414, 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
+				var zRbuRowid uintptr = ts + 1573
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30376
+					zRbuRowid = ts + 30442
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30388, libc.VaList(bp+408, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30454, libc.VaList(bp+408, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30464
+							return ts + 30530
 						}
-						return ts + 1554
+						return ts + 1573
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30481,
+					ts+30547,
 					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+30780,
+						ts+30846,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -128109,14 +128172,14 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-				var zRbuRowid uintptr = ts + 1554
+				var zRbuRowid uintptr = ts + 1573
 				var zStart uintptr = uintptr(0)
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30879
+						zRbuRowid = ts + 30945
 					} else {
-						zRbuRowid = ts + 30889
+						zRbuRowid = ts + 30955
 					}
 				}
 
@@ -128129,35 +128192,35 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28936, 0)
+						zOrder = rbuMPrintf(tls, p, ts+29002, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+1573)
 					}
 				}
 
 				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+30900,
+							ts+30966,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30948
+										return ts + 31014
 									}
-									return ts + 1554
+									return ts + 1573
 								}(),
 								zRbuRowid,
 								(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 									if zStart != 0 {
 										return zStart
 									}
-									return ts + 1554
+									return ts + 1573
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 22859
+										return ts + 22925
 									}
-									return ts + 1554
+									return ts + 1573
 								}(), zOrder,
 								zLimit)))
 				}
@@ -128220,12 +128283,12 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 		(*RbuObjIter)(unsafe.Pointer(pIter)).FpRbuUpdate = pUp
 
 		if zSet != 0 {
-			var zPrefix uintptr = ts + 1554
+			var zPrefix uintptr = ts + 1573
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30293
+				zPrefix = ts + 30359
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30954,
+			zUpdate = Xsqlite3_mprintf(tls, ts+31020,
 				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)
@@ -128252,7 +128315,7 @@ func rbuOpenDbhandle(tls *libc.TLS, p uintptr, zName uintptr, bUseVfs int32) uin
 			return uintptr(0)
 		}())
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
 			Xsqlite3_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 			*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 		}
@@ -128284,7 +128347,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+30984, libc.VaList(bp, p+24)))
+		Xsqlite3_mprintf(tls, ts+31050, 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:
@@ -128354,28 +128417,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+6441, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460, 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+6441)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31014, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31080, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		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))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31108, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.Xmemcpy(tls, p+24, ts+3305, uint32(4))
 	} else {
-		libc.Xmemcpy(tls, p+24, ts+6441, uint32(4))
+		libc.Xmemcpy(tls, p+24, ts+6460, uint32(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31060, libc.VaList(bp+24, p+24))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31126, 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+6441, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -128408,11 +128471,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+31126, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31192, 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+24206, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint32(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= Size_t(5) && 0 == libc.Xmemcmp(tls, ts+24272, (*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)))) == '?' {
@@ -128424,16 +128487,16 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31158,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441),
+			zTarget = Xsqlite3_mprintf(tls, ts+31224,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460),
 					func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1554
+							return ts + 1573
 						}
-						return ts + 31190
+						return ts + 31256
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1554
+							return ts + 1573
 						}
 						return zExtra
 					}()))
@@ -128449,37 +128512,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+31192, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31258, -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+31207, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31273, 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+31224, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31290, -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+6441, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31306, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 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+31268, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31334, 0)
 	}
 }
 
@@ -128508,14 +128571,14 @@ 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+31240, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31306, 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+31286, uintptr(0), uintptr(0), uintptr(0))
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31352, uintptr(0), uintptr(0), uintptr(0))
 		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
@@ -128624,7 +128687,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+6441, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6460, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -128641,23 +128704,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+31321, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31387, 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+6441)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460)
 	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+6441)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31353, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31412, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31419, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -128774,7 +128837,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+23844, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23910, 0)
 			return
 		}
 
@@ -128867,7 +128930,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+31360)
+			ts+31426)
 		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)
@@ -128875,7 +128938,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+31382, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31448, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -128896,7 +128959,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+31409,
+				ts+31475,
 				libc.VaList(bp, p+24,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -128926,9 +128989,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+31567, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31633, 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+31582,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31648,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -128942,10 +129005,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+31602, uintptr(0), uintptr(0), p+36)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31668, 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+31627)
+			ts+31693)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128959,12 +129022,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+31735)
+			ts+31801)
 	}
 
 	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+31800)
+			ts+31866)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128976,7 +129039,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+31844, uintptr(0), uintptr(0), p+36)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31910, uintptr(0), uintptr(0), p+36)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -128996,15 +129059,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+17240)
-					rbuCopyPragma(tls, p, ts+16351)
+					rbuCopyPragma(tls, p, ts+17259)
+					rbuCopyPragma(tls, p, ts+16370)
 				}
 
 				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+31869, libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31935, libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -129028,10 +129091,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+14518, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, 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+14518, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, uintptr(0), uintptr(0), p+36)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -129126,7 +129189,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+31897, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31963, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -129142,10 +129205,10 @@ func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(12)
 	defer tls.Free(12)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31346, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31412, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 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)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
@@ -129159,7 +129222,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+31922, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]uint8{})), bp+12, ts+31988, 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)
@@ -129193,7 +129256,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+12,
 		Xsqlite3_mprintf(tls,
-			ts+31933, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31999, 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 {
@@ -129223,13 +129286,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+32005, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32071, 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+32019)
+				ts+32085)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -129240,7 +129303,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+32076)
+				ts+32142)
 			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)
@@ -129285,7 +129348,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			libc.Xmemcpy(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, zRbu, nRbu+Size_t(1))
 			pCsr += uintptr(nRbu + Size_t(1))
 			if zState != 0 {
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3663, libc.VaList(bp, zState))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3682, libc.VaList(bp, zState))
 			}
 
 			rbuOpenDatabase(tls, p, uintptr(0), bp+16)
@@ -129314,7 +129377,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+32150, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32216, 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
@@ -129332,12 +129395,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+32182,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32248,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32214
+							return ts + 32280
 						}
-						return ts + 32221
+						return ts + 32287
 					}()))
 			}
 		}
@@ -129345,7 +129408,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+14503, uintptr(0), uintptr(0), p+36)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14522, uintptr(0), uintptr(0), p+36)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+48)
@@ -129356,19 +129419,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+16954)
-						rbuCopyPragma(tls, p, ts+16366)
+						rbuCopyPragma(tls, p, ts+16973)
+						rbuCopyPragma(tls, p, ts+16385)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32228, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32294, uintptr(0), uintptr(0), p+36)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6460, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32244, uintptr(0), uintptr(0), p+36)
+								db, ts+32310, uintptr(0), uintptr(0), p+36)
 						}
 					}
 
@@ -129422,7 +129485,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+32268, zState+uintptr(n-7), uint32(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32334, zState+uintptr(n-7), uint32(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -129449,7 +129512,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+30293, uint32(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30359, 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++
@@ -129466,7 +129529,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+14518, uintptr(0), uintptr(0), p+36)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, uintptr(0), uintptr(0), p+36)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -129479,13 +129542,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+14518, uintptr(0), uintptr(0), p+36)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, 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+32276, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32342, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -129580,7 +129643,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+14518, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -129597,19 +129660,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+14518, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14503
+				zBegin = ts + 14522
 			} else {
-				zBegin = ts + 32228
+				zBegin = ts + 32294
 			}
 			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+32228, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32294, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -129955,7 +130018,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+32303, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32369, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -129980,7 +130043,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+32326, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32392, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -130125,7 +130188,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+6441)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6460)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -130140,7 +130203,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+32337, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32403, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -130385,6 +130448,964 @@ func Xsqlite3rbu_temp_size(tls *libc.TLS, pRbu uintptr) Sqlite3_int64 {
 	return (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FszTemp
 }
 
+var zDbstatSchema = *(*[258]uint8)(unsafe.Pointer(ts + 32414))
+
+// Forward reference to data structured used in this module
+type StatTable1 = struct {
+	Fbase Sqlite3_vtab
+	Fdb   uintptr
+	FiDb  int32
+}
+
+// Forward reference to data structured used in this module
+type StatTable = StatTable1
+type StatCursor1 = struct {
+	Fbase        Sqlite3_vtab_cursor
+	FpStmt       uintptr
+	FisEof       U8
+	FisAgg       U8
+	F__ccgo_pad1 [2]byte
+	FiDb         int32
+	FaPage       [32]StatPage
+	FiPage       int32
+	FiPageno     U32
+	FzName       uintptr
+	FzPath       uintptr
+	FzPagetype   uintptr
+	FnPage       int32
+	FnCell       int32
+	FnMxPayload  int32
+	FnUnused     I64
+	FnPayload    I64
+	FiOffset     I64
+	FszPage      I64
+}
+
+type StatCursor = StatCursor1
+type StatPage1 = struct {
+	FiPgno         U32
+	FaPg           uintptr
+	FiCell         int32
+	FzPath         uintptr
+	Fflags         U8
+	F__ccgo_pad1   [3]byte
+	FnCell         int32
+	FnUnused       int32
+	FaCell         uintptr
+	FiRightChildPg U32
+	FnMxPayload    int32
+}
+
+type StatPage = StatPage1
+type StatCell1 = struct {
+	FnLocal    int32
+	FiChildPg  U32
+	FnOvfl     int32
+	FaOvfl     uintptr
+	FnLastOvfl int32
+	FiOvfl     int32
+}
+
+type StatCell = StatCell1
+
+func statConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = uintptr(0)
+	var rc int32 = SQLITE_OK
+	var iDb int32
+	_ = pAux
+
+	if argc >= 4 {
+		Xsqlite3TokenInit(tls, bp+8, *(*uintptr)(unsafe.Pointer(argv + 3*4)))
+		iDb = Xsqlite3FindDb(tls, db, bp+8)
+		if iDb < 0 {
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+11890, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(argv + 3*4))))
+			return SQLITE_ERROR
+		}
+	} else {
+		iDb = 0
+	}
+	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_DIRECTONLY, 0)
+	rc = Xsqlite3_declare_vtab(tls, db, uintptr(unsafe.Pointer(&zDbstatSchema)))
+	if rc == SQLITE_OK {
+		pTab = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatTable{})))
+		if pTab == uintptr(0) {
+			rc = SQLITE_NOMEM
+		}
+	}
+
+	if rc == SQLITE_OK {
+		libc.Xmemset(tls, pTab, 0, uint32(unsafe.Sizeof(StatTable{})))
+		(*StatTable)(unsafe.Pointer(pTab)).Fdb = db
+		(*StatTable)(unsafe.Pointer(pTab)).FiDb = iDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
+	return rc
+}
+
+func statDisconnect(tls *libc.TLS, pVtab uintptr) int32 {
+	Xsqlite3_free(tls, pVtab)
+	return SQLITE_OK
+}
+
+func statBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
+	var i int32
+	var iSchema int32 = -1
+	var iName int32 = -1
+	var iAgg int32 = -1
+	_ = tab
+
+	for i = 0; i < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; i++ {
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fop) != SQLITE_INDEX_CONSTRAINT_EQ {
+			continue
+		}
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fusable) == 0 {
+			return SQLITE_CONSTRAINT
+		}
+		switch (*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(i)*12)).FiColumn {
+		case 0:
+			{
+				iName = i
+				break
+
+			}
+		case 10:
+			{
+				iSchema = i
+				break
+
+			}
+		case 11:
+			{
+				iAgg = i
+				break
+
+			}
+		}
+	}
+	i = 0
+	if iSchema >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).Fomit = uint8(1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 20)) |= 0x01
+	}
+	if iName >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iName)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 20)) |= 0x02
+	}
+	if iAgg >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iAgg)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 20)) |= 0x04
+	}
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 1.0
+
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy == 1 &&
+		(*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)).FnOrderBy == 2 &&
+		(*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_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).FiColumn == 1 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+		*(*int32)(unsafe.Pointer(pIdxInfo + 20)) |= 0x08
+	}
+
+	return SQLITE_OK
+}
+
+func statOpen(tls *libc.TLS, pVTab uintptr, ppCursor uintptr) int32 {
+	var pTab uintptr = pVTab
+	var pCsr uintptr
+
+	pCsr = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatCursor{})))
+	if pCsr == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		libc.Xmemset(tls, pCsr, 0, uint32(unsafe.Sizeof(StatCursor{})))
+		(*StatCursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab = pVTab
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppCursor)) = pCsr
+	return SQLITE_OK
+}
+
+func statClearCells(tls *libc.TLS, p uintptr) {
+	var i int32
+	if (*StatPage)(unsafe.Pointer(p)).FaCell != 0 {
+		for i = 0; i < (*StatPage)(unsafe.Pointer(p)).FnCell; i++ {
+			Xsqlite3_free(tls, (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell+uintptr(i)*24)).FaOvfl)
+		}
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FaCell)
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnCell = 0
+	(*StatPage)(unsafe.Pointer(p)).FaCell = uintptr(0)
+}
+
+func statClearPage(tls *libc.TLS, p uintptr) {
+	var aPg uintptr = (*StatPage)(unsafe.Pointer(p)).FaPg
+	statClearCells(tls, p)
+	Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FzPath)
+	libc.Xmemset(tls, p, 0, uint32(unsafe.Sizeof(StatPage{})))
+	(*StatPage)(unsafe.Pointer(p)).FaPg = aPg
+}
+
+func statResetCsr(tls *libc.TLS, pCsr uintptr) {
+	var i int32
+
+	for i = 0; i < int32(uint32(unsafe.Sizeof([32]StatPage{}))/uint32(unsafe.Sizeof(StatPage{}))); i++ {
+		statClearPage(tls, pCsr+16+uintptr(i)*40)
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(pCsr+16+uintptr(i)*40)).FaPg)
+		(*StatPage)(unsafe.Pointer(pCsr + 16 + uintptr(i)*40)).FaPg = uintptr(0)
+	}
+	Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(0)
+}
+
+func statResetCounts(tls *libc.TLS, pCsr uintptr) {
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnCell = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnUnused = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPayload = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FszPage = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 0
+}
+
+func statClose(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	Xsqlite3_free(tls, pCsr)
+	return SQLITE_OK
+}
+
+func getLocalPayload(tls *libc.TLS, nUsable int32, flags U8, nTotal int32) int32 {
+	var nLocal int32
+	var nMinLocal int32
+	var nMaxLocal int32
+
+	if int32(flags) == 0x0D {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = nUsable - 35
+	} else {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = (nUsable-12)*64/255 - 23
+	}
+
+	nLocal = nMinLocal + (nTotal-nMinLocal)%(nUsable-4)
+	if nLocal > nMaxLocal {
+		nLocal = nMinLocal
+	}
+	return nLocal
+}
+
+func statDecodePage(tls *libc.TLS, pBt uintptr, p uintptr) int32 {
+	bp := tls.Alloc(20)
+	defer tls.Free(20)
+
+	var nUnused int32
+	var iOff int32
+	var nHdr int32
+	var isLeaf int32
+	var szPage int32
+	var aData uintptr
+	var aHdr uintptr
+	var iNext int32
+
+	var rc int32
+	var iPrev U32
+
+	var j int32
+	var nOvfl int32
+
+	var nLocal int32
+	var pCell uintptr
+	var i int32
+	var nUsable int32
+	aData = (*StatPage)(unsafe.Pointer(p)).FaPg
+	aHdr = aData + uintptr(func() int32 {
+		if (*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1) {
+			return 100
+		}
+		return 0
+	}())
+
+	(*StatPage)(unsafe.Pointer(p)).Fflags = *(*U8)(unsafe.Pointer(aHdr))
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0A || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __1
+	}
+	isLeaf = 1
+	nHdr = 8
+	goto __2
+__1:
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05 || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x02) {
+		goto __3
+	}
+	isLeaf = 0
+	nHdr = 12
+	goto __4
+__3:
+	goto statPageIsCorrupt
+__4:
+	;
+__2:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1)) {
+		goto __5
+	}
+	nHdr = nHdr + 100
+__5:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnCell = int32(*(*U8)(unsafe.Pointer(aHdr + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 3 + 1)))
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = 0
+	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
+
+	nUnused = int32(*(*U8)(unsafe.Pointer(aHdr + 5)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 5 + 1))) - nHdr - 2*(*StatPage)(unsafe.Pointer(p)).FnCell
+	nUnused = nUnused + int32(*(*U8)(unsafe.Pointer(aHdr + 7)))
+	iOff = int32(*(*U8)(unsafe.Pointer(aHdr + 1)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 1 + 1)))
+__6:
+	if !(iOff != 0) {
+		goto __7
+	}
+	if !(iOff >= szPage) {
+		goto __8
+	}
+	goto statPageIsCorrupt
+__8:
+	;
+	nUnused = nUnused + (int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2) + 1))))
+	iNext = int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff) + 1)))
+	if !(iNext < iOff+4 && iNext > 0) {
+		goto __9
+	}
+	goto statPageIsCorrupt
+__9:
+	;
+	iOff = iNext
+	goto __6
+__7:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnUnused = nUnused
+	(*StatPage)(unsafe.Pointer(p)).FiRightChildPg = func() uint32 {
+		if isLeaf != 0 {
+			return uint32(0)
+		}
+		return Xsqlite3Get4byte(tls, aHdr+8)
+	}()
+
+	if !((*StatPage)(unsafe.Pointer(p)).FnCell != 0) {
+		goto __10
+	}
+
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = szPage - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatPage)(unsafe.Pointer(p)).FaCell = Xsqlite3_malloc64(tls, uint64(uint32((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint32(unsafe.Sizeof(StatCell{}))))
+	if !((*StatPage)(unsafe.Pointer(p)).FaCell == uintptr(0)) {
+		goto __11
+	}
+	return SQLITE_NOMEM
+__11:
+	;
+	libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0, uint32((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint32(unsafe.Sizeof(StatCell{})))
+
+	i = 0
+__12:
+	if !(i < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __14
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr(i)*24
+
+	iOff = int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2) + 1)))
+	if !(iOff < nHdr || iOff >= szPage) {
+		goto __15
+	}
+	goto statPageIsCorrupt
+__15:
+	;
+	if !!(isLeaf != 0) {
+		goto __16
+	}
+	(*StatCell)(unsafe.Pointer(pCell)).FiChildPg = Xsqlite3Get4byte(tls, aData+uintptr(iOff))
+	iOff = iOff + 4
+__16:
+	;
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05) {
+		goto __17
+	}
+
+	goto __18
+__17:
+	iOff = iOff + int32(func() uint8 {
+		if int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff)))) < int32(U8(0x80)) {
+			return uint8(func() int32 {
+				*(*U32)(unsafe.Pointer(bp)) = U32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))
+				return 1
+			}())
+		}
+		return Xsqlite3GetVarint32(tls, aData+uintptr(iOff), bp)
+	}())
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __19
+	}
+	iOff = iOff + int32(Xsqlite3GetVarint(tls, aData+uintptr(iOff), bp+8))
+__19:
+	;
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32((*StatPage)(unsafe.Pointer(p)).FnMxPayload)) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = int32(*(*U32)(unsafe.Pointer(bp)))
+__20:
+	;
+	nLocal = getLocalPayload(tls, nUsable, (*StatPage)(unsafe.Pointer(p)).Fflags, int32(*(*U32)(unsafe.Pointer(bp))))
+	if !(nLocal < 0) {
+		goto __21
+	}
+	goto statPageIsCorrupt
+__21:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLocal = nLocal
+
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32(nLocal)) {
+		goto __22
+	}
+	nOvfl = int32((*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) + U32(nUsable) - U32(4) - U32(1)) / U32(nUsable-4))
+	if !(iOff+nLocal+4 > nUsable || *(*U32)(unsafe.Pointer(bp)) > U32(0x7fffffff)) {
+		goto __23
+	}
+	goto statPageIsCorrupt
+__23:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl = int32(*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) - U32((nOvfl-1)*(nUsable-4)))
+	(*StatCell)(unsafe.Pointer(pCell)).FnOvfl = nOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FaOvfl = Xsqlite3_malloc64(tls, uint64(uint32(unsafe.Sizeof(U32(0)))*uint32(nOvfl)))
+	if !((*StatCell)(unsafe.Pointer(pCell)).FaOvfl == uintptr(0)) {
+		goto __24
+	}
+	return SQLITE_NOMEM
+__24:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl)) = Xsqlite3Get4byte(tls, aData+uintptr(iOff+nLocal))
+	j = 1
+__25:
+	if !(j < nOvfl) {
+		goto __27
+	}
+	iPrev = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j-1)*4))
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPrev, bp+16, 0)
+	if !(rc != SQLITE_OK) {
+		goto __28
+	}
+
+	return rc
+__28:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j)*4)) = Xsqlite3Get4byte(tls, Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 16))))
+	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
+	goto __26
+__26:
+	j++
+	goto __25
+	goto __27
+__27:
+	;
+__22:
+	;
+__18:
+	;
+	goto __13
+__13:
+	i++
+	goto __12
+	goto __14
+__14:
+	;
+__10:
+	;
+	return SQLITE_OK
+
+statPageIsCorrupt:
+	(*StatPage)(unsafe.Pointer(p)).Fflags = U8(0)
+	statClearCells(tls, p)
+	return SQLITE_OK
+}
+
+func statSizeAndOffset(tls *libc.TLS, pCsr uintptr) {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCsr)).FpVtab
+	var pBt uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatTable)(unsafe.Pointer(pTab)).FiDb)*16)).FpBt
+	var pPager uintptr = Xsqlite3BtreePager(tls, pBt)
+	var fd uintptr
+
+	fd = Xsqlite3PagerFile(tls, pPager)
+	*(*Sqlite3_int64)(unsafe.Pointer(bp)) = Sqlite3_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	if Xsqlite3OsFileControl(tls, fd, 230440, bp) == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = *(*Sqlite3_int64)(unsafe.Pointer(bp))
+		*(*I64)(unsafe.Pointer(pCsr + 1352)) += *(*Sqlite3_int64)(unsafe.Pointer(bp + 1*8))
+	} else {
+		*(*I64)(unsafe.Pointer(pCsr + 1352)) += I64(Xsqlite3BtreeGetPageSize(tls, pBt))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = (*StatCursor)(unsafe.Pointer(pCsr)).FszPage * I64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno-U32(1))
+	}
+}
+
+func statGetPage(tls *libc.TLS, pBt uintptr, iPg U32, pPg uintptr) int32 {
+	bp := tls.Alloc(4)
+	defer tls.Free(4)
+
+	var pgsz int32 = Xsqlite3BtreeGetPageSize(tls, pBt)
+	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
+	var rc int32
+
+	if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+		(*StatPage)(unsafe.Pointer(pPg)).FaPg = Xsqlite3_malloc(tls, pgsz+DBSTAT_PAGE_PADDING_BYTES)
+		if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+			return SQLITE_NOMEM
+		}
+		libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0, uint32(DBSTAT_PAGE_PADDING_BYTES))
+	}
+
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPg, bp, 0)
+	if rc == SQLITE_OK {
+		var a uintptr = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		libc.Xmemcpy(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, a, uint32(pgsz))
+		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+	}
+
+	return rc
+}
+
+func statNext(tls *libc.TLS, pCursor uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
+	var rc int32
+	var nPayload int32
+	var z uintptr
+	var pCsr uintptr
+	var pTab uintptr
+	var pBt uintptr
+	var pPager uintptr
+
+	var iRoot U32
+	var nUsable int32
+	var iOvfl int32
+	var pCell uintptr
+
+	var p uintptr
+	var i int32
+	var p1 uintptr
+	pCsr = pCursor
+	pTab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	pBt = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*16)).FpBt
+	pPager = Xsqlite3BtreePager(tls, pBt)
+
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+
+statNextRestart:
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __1
+	}
+
+	statResetCounts(tls, pCsr)
+	rc = Xsqlite3_step(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	if !(rc == SQLITE_ROW) {
+		goto __3
+	}
+	iRoot = U32(Xsqlite3_column_int64(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 1))
+	Xsqlite3PagerPagecount(tls, pPager, bp+48)
+	if !(*(*int32)(unsafe.Pointer(bp + 48)) == 0) {
+		goto __5
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__5:
+	;
+	rc = statGetPage(tls, pBt, iRoot, pCsr+16)
+	(*StatPage)(unsafe.Pointer(pCsr + 16)).FiPgno = iRoot
+	(*StatPage)(unsafe.Pointer(pCsr + 16)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __6
+	}
+	(*StatPage)(unsafe.Pointer(pCsr + 16)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32672, 0))
+	if !(z == uintptr(0)) {
+		goto __7
+	}
+	rc = SQLITE_NOMEM
+__7:
+	;
+__6:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 1
+	goto __4
+__3:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__4:
+	;
+	goto __2
+__1:
+	p = pCsr + 16 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*40
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __8
+	}
+	statResetCounts(tls, pCsr)
+__8:
+	;
+__9:
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __10
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*24
+__11:
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl) {
+		goto __12
+	}
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = Xsqlite3BtreeGetPageSize(tls, pBt) - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	statSizeAndOffset(tls, pCsr)
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl-1) {
+		goto __13
+	}
+	*(*I64)(unsafe.Pointer(pCsr + 1336)) += I64(nUsable - 4)
+	goto __14
+__13:
+	*(*I64)(unsafe.Pointer(pCsr + 1336)) += I64((*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+	*(*I64)(unsafe.Pointer(pCsr + 1328)) += I64(nUsable - 4 - (*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+__14:
+	;
+	iOvfl = (*StatCell)(unsafe.Pointer(pCell)).FiOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FiOvfl++
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __15
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(iOvfl)*4))
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32674
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls,
+		ts+32683, libc.VaList(bp, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell, iOvfl)))
+	if z == uintptr(0) {
+		return SQLITE_NOMEM
+	}
+	return SQLITE_OK
+__15:
+	;
+	goto __11
+__12:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiRightChildPg != 0) {
+		goto __16
+	}
+	goto __10
+__16:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+	goto __9
+__10:
+	;
+	if !(!(int32((*StatPage)(unsafe.Pointer(p)).FiRightChildPg) != 0) || (*StatPage)(unsafe.Pointer(p)).FiCell > (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __17
+	}
+	statClearPage(tls, p)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage--
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 && (*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __18
+	}
+
+	return SQLITE_OK
+__18:
+	;
+	goto statNextRestart
+__17:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage++
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage >= int32(uint32(unsafe.Sizeof([32]StatPage{}))/uint32(unsafe.Sizeof(StatPage{})))) {
+		goto __19
+	}
+	statResetCsr(tls, pCsr)
+	return Xsqlite3CorruptError(tls, 215455)
+__19:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell == (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*40)).FiPgno = (*StatPage)(unsafe.Pointer(p)).FiRightChildPg
+	goto __21
+__20:
+	(*StatPage)(unsafe.Pointer(p + 1*40)).FiPgno = (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*24)).FiChildPg
+__21:
+	;
+	rc = statGetPage(tls, pBt, (*StatPage)(unsafe.Pointer(p+1*40)).FiPgno, p+1*40)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	(*StatPage)(unsafe.Pointer(p + 1*40)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __22
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*40)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32695, libc.VaList(bp+24, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell)))
+	if !(z == uintptr(0)) {
+		goto __23
+	}
+	rc = SQLITE_NOMEM
+__23:
+	;
+__22:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+__2:
+	;
+	if !(rc == SQLITE_OK) {
+		goto __24
+	}
+	p1 = pCsr + 16 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*40
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = (*StatPage)(unsafe.Pointer(p1)).FiPgno
+
+	rc = statDecodePage(tls, pBt, p1)
+	if !(rc == SQLITE_OK) {
+		goto __25
+	}
+	statSizeAndOffset(tls, pCsr)
+
+	switch int32((*StatPage)(unsafe.Pointer(p1)).Fflags) {
+	case 0x05:
+		goto __27
+	case 0x02:
+		goto __28
+	case 0x0D:
+		goto __29
+	case 0x0A:
+		goto __30
+	default:
+		goto __31
+	}
+	goto __26
+__27:
+__28:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32703
+	goto __26
+__29:
+__30:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32712
+	goto __26
+__31:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32717
+	goto __26
+__26:
+	;
+	*(*int32)(unsafe.Pointer(pCsr + 1320)) += (*StatPage)(unsafe.Pointer(p1)).FnCell
+	*(*I64)(unsafe.Pointer(pCsr + 1328)) += I64((*StatPage)(unsafe.Pointer(p1)).FnUnused)
+	if !((*StatPage)(unsafe.Pointer(p1)).FnMxPayload > (*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload) {
+		goto __32
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = (*StatPage)(unsafe.Pointer(p1)).FnMxPayload
+__32:
+	;
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __33
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+40, (*StatPage)(unsafe.Pointer(p1)).FzPath)))
+	if !(z == uintptr(0)) {
+		goto __34
+	}
+	rc = SQLITE_NOMEM
+__34:
+	;
+__33:
+	;
+	nPayload = 0
+	i = 0
+__35:
+	if !(i < (*StatPage)(unsafe.Pointer(p1)).FnCell) {
+		goto __37
+	}
+	nPayload = nPayload + (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p1)).FaCell+uintptr(i)*24)).FnLocal
+	goto __36
+__36:
+	i++
+	goto __35
+	goto __37
+__37:
+	;
+	*(*I64)(unsafe.Pointer(pCsr + 1336)) += I64(nPayload)
+
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0) {
+		goto __38
+	}
+	goto statNextRestart
+__38:
+	;
+__25:
+	;
+__24:
+	;
+	return rc
+}
+
+func statEof(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	return int32((*StatCursor)(unsafe.Pointer(pCsr)).FisEof)
+}
+
+func statFilter(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintptr, argc int32, argv uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pCsr uintptr = pCursor
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	var pSql uintptr
+	var zSql uintptr
+	var iArg int32 = 0
+	var rc int32 = SQLITE_OK
+	var zName uintptr = uintptr(0)
+	_ = argc
+	_ = idxStr
+
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FpStmt = uintptr(0)
+	if idxNum&0x01 != 0 {
+		var zDbase uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*4)))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = Xsqlite3FindDbName(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zDbase)
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FiDb < 0 {
+			(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = 0
+			(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+			return SQLITE_OK
+		}
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+	if idxNum&0x02 != 0 {
+		zName = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*4)))
+	}
+	if idxNum&0x04 != 0 {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(libc.Bool32(Xsqlite3_value_double(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*4))) != 0.0))
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(0)
+	}
+	pSql = Xsqlite3_str_new(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb)
+	Xsqlite3_str_appendf(tls, pSql,
+		ts+32727,
+		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb+uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*16)).FzDbSName))
+	if zName != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32882, libc.VaList(bp+8, zName))
+	}
+	if idxNum&0x08 != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32896, 0)
+	}
+	zSql = Xsqlite3_str_finish(tls, pSql)
+	if zSql == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		rc = Xsqlite3_prepare_v2(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+4, uintptr(0))
+		Xsqlite3_free(tls, zSql)
+	}
+
+	if rc == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = -1
+		rc = statNext(tls, pCursor)
+	}
+	return rc
+}
+
+func statColumn(tls *libc.TLS, pCursor uintptr, ctx uintptr, i int32) int32 {
+	var pCsr uintptr = pCursor
+	switch i {
+	case 0:
+		Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzName, -1, libc.UintptrFromInt32(-1))
+		break
+	case 1:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath, -1, libc.UintptrFromInt32(-1))
+		}
+		break
+	case 2:
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnPage))
+		} else {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno))
+		}
+		break
+	case 3:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype, -1, uintptr(0))
+		}
+		break
+	case 4:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnCell))
+		break
+	case 5:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnPayload)
+		break
+	case 6:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnUnused)
+		break
+	case 7:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload))
+		break
+	case 8:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FiOffset)
+		}
+		break
+	case 9:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FszPage)
+		break
+	case 10:
+		{
+			var db uintptr = Xsqlite3_context_db_handle(tls, ctx)
+			var iDb int32 = (*StatCursor)(unsafe.Pointer(pCsr)).FiDb
+			Xsqlite3_result_text(tls, ctx, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, -1, uintptr(0))
+			break
+
+		}
+	default:
+		{
+			Xsqlite3_result_int(tls, ctx, int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg))
+			break
+
+		}
+	}
+	return SQLITE_OK
+}
+
+func statRowid(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32 {
+	var pCsr uintptr = pCursor
+	*(*Sqlite_int64)(unsafe.Pointer(pRowid)) = Sqlite_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	return SQLITE_OK
+}
+
+// Invoke this routine to register the "dbstat" virtual table module
+func Xsqlite3DbstatRegister(tls *libc.TLS, db uintptr) int32 {
+	return Xsqlite3_create_module(tls, db, ts+32911, uintptr(unsafe.Pointer(&dbstat_module)), uintptr(0))
+}
+
+var dbstat_module = Sqlite3_module{
+	FxCreate:     0,
+	FxConnect:    0,
+	FxBestIndex:  0,
+	FxDisconnect: 0,
+	FxDestroy:    0,
+	FxOpen:       0,
+	FxClose:      0,
+	FxFilter:     0,
+	FxNext:       0,
+	FxEof:        0,
+	FxColumn:     0,
+	FxRowid:      0,
+}
+
 type SessionTable1 = struct {
 	FpNext    uintptr
 	FzName    uintptr
@@ -130961,13 +131982,13 @@ 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+11348, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11367, 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+32348, 0)
+				ts+32918, 0)
 		} else if rc == SQLITE_ERROR {
-			zPragma = Xsqlite3_mprintf(tls, ts+1554, 0)
+			zPragma = Xsqlite3_mprintf(tls, ts+1573, 0)
 		} else {
 			*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
 			*(*uintptr)(unsafe.Pointer(pabPK)) = uintptr(0)
@@ -130978,7 +131999,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32469, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+33039, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -131076,7 +132097,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11348, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11367, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -131325,7 +132346,7 @@ __4:
 	goto error_out
 __7:
 	;
-	Xsqlite3ValueSetStr(tls, p, 0, ts+1554, uint8(0), uintptr(0))
+	Xsqlite3ValueSetStr(tls, p, 0, ts+1573, uint8(0), uintptr(0))
 	(*Sqlite3_session)(unsafe.Pointer(pSession)).FpZeroBlob = p
 __6:
 	;
@@ -131652,14 +132673,14 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	var zRet uintptr = uintptr(0)
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32498,
+			zRet = Xsqlite3_mprintf(tls, ts+33068,
 				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 + 21525
+			zSep = ts + 21591
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131674,7 +132695,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	var zRet uintptr = uintptr(0)
 	var bHave int32 = 0
 
@@ -131682,9 +132703,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+32532,
+				ts+33102,
 				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 + 32573
+			zSep = ts + 33143
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131692,7 +132713,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7530, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7538, 0)
 	}
 
 	return zRet
@@ -131703,7 +132724,7 @@ func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintpt
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32578,
+		ts+33148,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -131746,7 +132767,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32656,
+			ts+33226,
 			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
@@ -131873,7 +132894,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32709, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33279, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -132138,7 +133159,7 @@ func sessionAppendInteger(tls *libc.TLS, p uintptr, iVal int32, pRc uintptr) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
-	Xsqlite3_snprintf(tls, int32(uint32(unsafe.Sizeof([24]uint8{}))-uint32(1)), bp+8, ts+4975, libc.VaList(bp, iVal))
+	Xsqlite3_snprintf(tls, int32(uint32(unsafe.Sizeof([24]uint8{}))-uint32(1)), bp+8, ts+4994, libc.VaList(bp, iVal))
 	sessionAppendStr(tls, p, bp+8, pRc)
 }
 
@@ -132347,29 +133368,29 @@ 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+11348, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11367, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32736, libc.VaList(bp, zDb))
+			ts+33306, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_NOMEM
 		}
 	} else {
 		var i int32
-		var zSep uintptr = ts + 1554
+		var zSep uintptr = ts + 1573
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32846, bp+20)
+		sessionAppendStr(tls, bp+8, ts+33416, bp+20)
 		sessionAppendIdent(tls, bp+8, zDb, bp+20)
-		sessionAppendStr(tls, bp+8, ts+1567, bp+20)
+		sessionAppendStr(tls, bp+8, ts+1586, bp+20)
 		sessionAppendIdent(tls, bp+8, zTab, bp+20)
-		sessionAppendStr(tls, bp+8, ts+32861, bp+20)
+		sessionAppendStr(tls, bp+8, ts+33431, 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+32869, bp+20)
+				sessionAppendStr(tls, bp+8, ts+33439, bp+20)
 				sessionAppendInteger(tls, bp+8, i+1, bp+20)
-				zSep = ts + 21525
+				zSep = ts + 21591
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -132478,7 +133499,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+32875, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33445, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 24)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 24))
 	}
@@ -132570,7 +133591,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+12)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32895, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33465, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 24))
 }
@@ -132833,7 +133854,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, 219078)
+				rc = Xsqlite3CorruptError(tls, 219169)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -132856,7 +133877,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, 219098)
+						rc = Xsqlite3CorruptError(tls, 219189)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -132898,7 +133919,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, 219152)
+			rc = Xsqlite3CorruptError(tls, 219243)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -132959,7 +133980,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, 219240)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219331)
 		}
 	}
 
@@ -133033,13 +134054,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, 219326))
+		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219417))
 	}
 
 	(*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, 219332))
+		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219423))
 	}
 
 	if paRec != 0 {
@@ -133101,7 +134122,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, 219376))
+						return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219467))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*4)) = uintptr(0)
 				}
@@ -133474,7 +134495,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 219741)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 219832)
 	goto finished_invert
 __6:
 	;
@@ -133640,45 +134661,45 @@ 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+11348) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11367) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_NOMEM
 			} else {
-				var zSep uintptr = ts + 1554
+				var zSep uintptr = ts + 1573
 
 				libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(SessionBuffer{})))
 				(*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+32913, bp+12)
+				sessionAppendStr(tls, bp, ts+33483, bp+12)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+12)
-				sessionAppendStr(tls, bp, ts+32926, bp+12)
+				sessionAppendStr(tls, bp, ts+33496, 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+32932, bp+12)
+						sessionAppendStr(tls, bp, ts+33502, bp+12)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+12)
-						zSep = ts + 14614
+						zSep = ts + 14633
 					}
 				}
 
-				zSep = ts + 1554
-				sessionAppendStr(tls, bp, ts+32861, bp+12)
+				zSep = ts + 1573
+				sessionAppendStr(tls, bp, ts+33431, 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+32937, bp+12)
+								ts+33507, bp+12)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*4)), bp+12)
-							sessionAppendStr(tls, bp, ts+32869, bp+12)
+							sessionAppendStr(tls, bp, ts+33439, bp+12)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+12)
 						}
-						zSep = ts + 21525
+						zSep = ts + 21591
 					}
 				}
 
@@ -133725,42 +134746,42 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	defer tls.Free(16)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_OK
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+33012, bp+12)
+	sessionAppendStr(tls, bp, ts+33582, bp+12)
 	sessionAppendIdent(tls, bp, zTab, bp+12)
-	sessionAppendStr(tls, bp, ts+32861, bp+12)
+	sessionAppendStr(tls, bp, ts+33431, 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+32932, bp+12)
+			sessionAppendStr(tls, bp, ts+33502, bp+12)
 			sessionAppendInteger(tls, bp, i+1, bp+12)
-			zSep = ts + 21525
+			zSep = ts + 21591
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+33030, bp+12)
+		sessionAppendStr(tls, bp, ts+33600, bp+12)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+12)
-		sessionAppendStr(tls, bp, ts+32573, bp+12)
+		sessionAppendStr(tls, bp, ts+33143, bp+12)
 
-		zSep = ts + 1554
+		zSep = ts + 1573
 		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+32869, bp+12)
+				sessionAppendStr(tls, bp, ts+33439, bp+12)
 				sessionAppendInteger(tls, bp, i+1, bp+12)
-				zSep = ts + 33038
+				zSep = ts + 33608
 			}
 		}
-		sessionAppendStr(tls, bp, ts+4957, bp+12)
+		sessionAppendStr(tls, bp, ts+4976, bp+12)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 12)) == SQLITE_OK {
@@ -133773,7 +134794,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+6441, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+12)
+		db, ts+6460, 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 {
@@ -133784,21 +134805,21 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+33043, bp+12)
+	sessionAppendStr(tls, bp, ts+33613, bp+12)
 	sessionAppendIdent(tls, bp, zTab, bp+12)
-	sessionAppendStr(tls, bp, ts+21531, bp+12)
+	sessionAppendStr(tls, bp, ts+21597, bp+12)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14614, bp+12)
+			sessionAppendStr(tls, bp, ts+14633, bp+12)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*4)), bp+12)
 	}
 
-	sessionAppendStr(tls, bp, ts+33061, bp+12)
+	sessionAppendStr(tls, bp, ts+33631, bp+12)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33072, bp+12)
+		sessionAppendStr(tls, bp, ts+33642, bp+12)
 	}
-	sessionAppendStr(tls, bp, ts+4957, bp+12)
+	sessionAppendStr(tls, bp, ts+4976, bp+12)
 
 	if *(*int32)(unsafe.Pointer(bp + 12)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3_prepare_v2(tls, db, (*SessionBuffer)(unsafe.Pointer(bp)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp)).FnBuf, p+8, uintptr(0))
@@ -133812,14 +134833,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+11348, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11367, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33076)
+			ts+33646)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+4,
-			ts+33189)
+			ts+33759)
 	}
 	return rc
 }
@@ -133847,7 +134868,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, 220219)
+				rc = Xsqlite3CorruptError(tls, 220310)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -134100,7 +135121,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+33333, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33903, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -134116,7 +135137,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+33354, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33924, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -134189,10 +135210,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+33373, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33943, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33399, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33969, 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))
@@ -134225,7 +135246,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				f func(*libc.TLS, uintptr, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xFilter})).f(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 124))))
 			if schemaMismatch != 0 {
-				*(*uintptr)(unsafe.Pointer(bp + 140)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 124))))
+				*(*uintptr)(unsafe.Pointer(bp + 140)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 124))))
 				if *(*uintptr)(unsafe.Pointer(bp + 140)) == uintptr(0) {
 					rc = SQLITE_NOMEM
 					break
@@ -134238,7 +135259,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+6441, *(*uintptr)(unsafe.Pointer(bp + 124)), bp+48+16, bp+140, bp+48+20, bp+48+24)
+					db, ts+6460, *(*uintptr)(unsafe.Pointer(bp + 124)), bp+48+16, bp+140, bp+48+20, bp+48+24)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -134251,19 +135272,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+33429, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 140))))
+						ts+33999, 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+33473,
+						ts+34043,
 						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+33544, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 140))))
+						ts+34114, 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+11348) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 140)), ts+11367) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -134314,14 +135335,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33604, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34174, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34204, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33658, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34228, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34204, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -135558,7 +136579,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33686, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+34256, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135846,7 +136867,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33714, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+34284, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -136031,7 +137052,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+33745, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34315, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -136099,7 +137120,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33752
+		var zErr uintptr = ts + 34322
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -136257,7 +137278,7 @@ func fts5ValueToText(tls *libc.TLS, pVal uintptr) uintptr {
 	if zRet != 0 {
 		return zRet
 	}
-	return ts + 1554
+	return ts + 1573
 }
 
 func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, nVal int32, apVal uintptr) {
@@ -136280,7 +137301,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33802
+		var zErr uintptr = ts + 34372
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -136604,13 +137625,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(48)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33850, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34420, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33858, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34428, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33868, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34438, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -137021,7 +138042,7 @@ func fts5ConfigSkipLiteral(tls *libc.TLS, pIn uintptr) uintptr {
 	case 'n':
 		fallthrough
 	case 'N':
-		if Xsqlite3_strnicmp(tls, ts+6181, p, 4) == 0 {
+		if Xsqlite3_strnicmp(tls, ts+6200, p, 4) == 0 {
 			p = p + 4
 		} else {
 			p = uintptr(0)
@@ -137160,7 +138181,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+33873, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34443, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint32(unsafe.Sizeof(int32(0))) * uint32(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -137187,14 +138208,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+33880, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34450, 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+33911, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+34481, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -137205,7 +138226,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33944, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34514, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -137218,7 +138239,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33981, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34551, 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)
@@ -137227,7 +138248,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+33990, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34560, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*uint8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -137246,7 +138267,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34023, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34593, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -137261,14 +138282,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34057, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34627, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34065, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34635, 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+34097, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34667, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -137276,9 +138297,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34103, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34673, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34117, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34687, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -137286,9 +138307,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34155, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34725, 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+34166, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34736, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zArg))) == '1')
@@ -137296,21 +138317,21 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+5075, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+5094, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 44)) = [4]Fts5Enum{
-			{FzName: ts + 8026, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17345},
-			{FzName: ts + 34201, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8045, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17364},
+			{FzName: ts + 34771, 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+34209, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34779, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34240, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34810, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -137357,15 +138378,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+22191) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16267) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34268, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22257) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16286) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34838, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34298) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34868) {
 			*(*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+34308, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34878, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -137382,13 +138403,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+34339, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34909, 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+34344, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*4))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34914, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*4))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34351, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34921, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -137426,8 +138447,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+22191) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34359, 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+22257) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34929, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -137459,7 +138480,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+34388, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34958, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -137468,13 +138489,13 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 							if *(*uintptr)(unsafe.Pointer(bp + 44)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 44))
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						func() uintptr {
 							if *(*uintptr)(unsafe.Pointer(bp + 52)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 52))
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						pzErr)
 				} else {
@@ -137496,19 +138517,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 + 34057
+			zTail = ts + 34627
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34408
+			zTail = ts + 34978
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34416, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34986, 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+16267, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16286, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -137552,18 +138573,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+34427, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34997, 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 + 1573
 			}
-			return ts + 14614
+			return ts + 14633
 		}()
-		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+35013, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*4))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34450,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22191))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35020,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22257))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -137673,7 +138694,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34476) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35046) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -137683,7 +138704,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+34481) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35051) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -137693,7 +138714,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+34490) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35060) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -137706,7 +138727,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+34500) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35070) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -137716,7 +138737,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+34510) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35080) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -137732,7 +138753,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+22191) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22257) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+4)
@@ -137755,7 +138776,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(44)
 	defer tls.Free(44)
 
-	var zSelect uintptr = ts + 34522
+	var zSelect uintptr = ts + 35092
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 36)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -137777,7 +138798,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+34554) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35124) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 40)) = 0
@@ -137791,7 +138812,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+34562,
+				ts+35132,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -137889,7 +138910,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*uint8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34627, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+35197, 0)
 					return FTS5_EOF
 				}
 			}
@@ -137902,20 +138923,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+34647, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+35217, 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+34678, uint32(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35248, uint32(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34681, uint32(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35251, uint32(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30063, uint32(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30129, uint32(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -139694,9 +140715,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+34685, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint32(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35255, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint32(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33714, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+34284, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -139712,7 +140733,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+34690, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+35260, 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')
@@ -139799,7 +140820,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20528, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20594, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -139880,7 +140901,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+34719, 0)
+			ts+35289, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -140050,12 +141071,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+34772,
+								ts+35342,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34822
+										return ts + 35392
 									}
-									return ts + 34685
+									return ts + 35255
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -141004,7 +142025,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+34829, iRowid, 0, p+40)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35399, iRowid, 0, p+40)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -141083,7 +142104,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+34835,
+			ts+35405,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -141108,7 +142129,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+34886,
+			ts+35456,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+48, zSql) != 0 {
 			return
@@ -141131,7 +142152,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+34935,
+			ts+35505,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -141370,7 +142391,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+34975, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+35545, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -142569,7 +143590,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+34998,
+			ts+35568,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -143761,7 +144782,7 @@ func fts5WriteFlushBtree(tls *libc.TLS, p uintptr, pWriter uintptr) {
 			if (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn > 0 {
 				return (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fp
 			}
-			return ts + 1554
+			return ts + 1573
 		}()
 
 		Xsqlite3_bind_blob(tls, (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter, 2, z, (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn, uintptr(0))
@@ -144034,7 +145055,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+35082,
+			ts+35652,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -145101,7 +146122,7 @@ func sqlite3Fts5IndexReinit(tls *libc.TLS, p uintptr) int32 {
 	fts5StructureInvalidate(tls, p)
 	fts5IndexDiscardData(tls, p)
 	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Fts5Structure{})))
-	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1554, 0)
+	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1573, 0)
 	fts5StructureWrite(tls, p, bp)
 	return fts5IndexReturn(tls, p)
 }
@@ -145117,13 +146138,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+35139, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35709, 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+25056, ts+35147, 0, pzErr)
+				pConfig, ts+25122, ts+35717, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11488,
-					ts+35182,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11507,
+					ts+35752,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -145376,7 +146397,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+34829, int64(FTS5_STRUCTURE_ROWID), 1, bp+4)
+		ts+35399, 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)))
@@ -145490,7 +146511,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35226,
+		ts+35796,
 		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))) {
@@ -145660,7 +146681,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+35312)
+			sqlite3Fts5BufferAppendBlob(tls, p+36, bp+8, uint32(4), ts+35882)
 			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))
@@ -145931,7 +146952,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+35317, 0)
+			ts+35887, 0)
 		return SQLITE_ERROR
 	}
 
@@ -145962,7 +146983,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 				} else if iCol >= 0 {
 					bSeenMatch = 1
 					*(*uint8)(unsafe.Pointer(idxStr + uintptr(libc.PostIncInt32(&iIdxStr, 1)))) = uint8('M')
-					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4975, libc.VaList(bp, iCol))
+					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4994, libc.VaList(bp, iCol))
 					idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 
 				}
@@ -145977,7 +146998,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 					}
 					return uint8('G')
 				}()
-				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4975, libc.VaList(bp+8, iCol))
+				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4994, libc.VaList(bp+8, iCol))
 				idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 				(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pInfo)).FaConstraintUsage + uintptr(i)*8)).FargvIndex = libc.PreIncInt32(&iCons, 1)
 
@@ -146291,7 +147312,7 @@ func fts5NextMethod(tls *libc.TLS, pCursor uintptr) int32 {
 					rc = Xsqlite3_reset(tls, (*Fts5Cursor)(unsafe.Pointer(pCsr)).FpStmt)
 					if rc != SQLITE_OK {
 						(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-							ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+							ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 					}
 				} else {
 					rc = SQLITE_OK
@@ -146323,7 +147344,7 @@ func fts5PrepareStatement(tls *libc.TLS, ppStmt uintptr, pConfig uintptr, zFmt u
 		rc = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
 			uint32(SQLITE_PREPARE_PERSISTENT), bp+8, uintptr(0))
 		if rc != SQLITE_OK {
-			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 		}
 		Xsqlite3_free(tls, zSql)
 	}
@@ -146355,25 +147376,25 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35356,
+		ts+35926,
 		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 + 14614
+					return ts + 14633
 				}
-				return ts + 1554
+				return ts + 1573
 			}(),
 			func() uintptr {
 				if zRankArgs != 0 {
 					return zRankArgs
 				}
-				return ts + 1554
+				return ts + 1573
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35411
+					return ts + 35981
 				}
-				return ts + 35416
+				return ts + 35986
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -146419,12 +147440,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+35420, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35990, 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) {
+	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5076, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35426, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35996, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -146455,7 +147476,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+35454, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36024, 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,
@@ -146486,7 +147507,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+35464, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36034, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -146518,14 +147539,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+35485, libc.VaList(bp, z))
+				ts+36055, 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 + 33868
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34438
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -146581,7 +147602,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+35317, 0)
+		ts+35887, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -146624,7 +147645,7 @@ __8:
 	if !(zText == uintptr(0)) {
 		goto __14
 	}
-	zText = ts + 1554
+	zText = ts + 1573
 __14:
 	;
 	iCol = 0
@@ -146798,7 +147819,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35518, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+36088, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -146919,7 +147940,7 @@ func fts5SeekCursor(tls *libc.TLS, pCsr uintptr, bErrormsg int32) int32 {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			} else if (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg != 0 {
 				*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-					ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
+					ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
 			}
 		}
 	}
@@ -146943,28 +147964,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+35554, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36124, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35565, 0)
+				ts+36135, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36215, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35653, 0)
+				ts+36223, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16934, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16953, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35709, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36279, 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+35715, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36285, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -147022,7 +148043,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+17479, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17498, 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)))
@@ -147035,12 +148056,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+35731,
+				ts+36301,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20429
+						return ts + 20495
 					}
-					return ts + 35768
+					return ts + 36338
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -147670,7 +148691,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+35780, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36350, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -147914,7 +148935,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+35801, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36371, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -147933,7 +148954,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+35823, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36393, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -147980,7 +149001,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+35854)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36424)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -147989,7 +149010,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+35867, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+36437, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -148003,7 +149024,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35958, ts + 34057, ts + 25056, ts + 34408, ts + 11488,
+	ts + 36528, ts + 34627, ts + 25122, ts + 34978, ts + 11507,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -148027,7 +149048,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+35965, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+36535, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -148045,13 +149066,13 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35965, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36535, 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+35970, 0,
+				db, ts+36540, 0,
 				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
 				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
@@ -148108,17 +149129,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 + 35985,
-			ts + 36053,
-			ts + 36122,
-			ts + 36155,
-			ts + 36194,
-			ts + 36234,
-			ts + 36273,
-			ts + 36314,
-			ts + 36353,
-			ts + 36395,
-			ts + 36435,
+			ts + 36555,
+			ts + 36623,
+			ts + 36692,
+			ts + 36725,
+			ts + 36764,
+			ts + 36804,
+			ts + 36843,
+			ts + 36884,
+			ts + 36923,
+			ts + 36965,
+			ts + 37005,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -148185,7 +149206,7 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 			(*Fts5Config)(unsafe.Pointer((*Fts5Storage)(unsafe.Pointer(p)).FpConfig)).FbLock--
 			Xsqlite3_free(tls, zSql)
 			if rc != SQLITE_OK && pzErrMsg != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
 			}
 		}
 	}
@@ -148220,18 +149241,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+36458,
+		ts+37028,
 		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+36562,
+			ts+37132,
 			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+36600,
+			ts+37170,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -148243,7 +149264,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+36638,
+			ts+37208,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -148255,14 +149276,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+25056, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11488, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35958, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25122, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11507, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+36528, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34408, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34978, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34057, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34627, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -148274,17 +149295,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+36680,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37250,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29709
+					return ts + 29775
 				}
-				return ts + 1554
+				return ts + 1573
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36710,
+			ts+37280,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -148321,27 +149342,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36754, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37324, 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+36777, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37347, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34057, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34627, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34408, ts+36783, 0, pzErr)
+				pConfig, ts+34978, ts+37353, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35958, ts+36815, 1, pzErr)
+				pConfig, ts+36528, ts+37385, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35124, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -148547,12 +149568,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+36832,
+		ts+37402,
 		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+36882,
+			ts+37452,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -148560,7 +149581,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+34554, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35124, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -148736,7 +149757,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36911,
+	zSql = Xsqlite3_mprintf(tls, ts+37481,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -148918,14 +149939,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+34057, bp+40)
+			rc = fts5StorageCount(tls, p, ts+34627, 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+34408, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34978, bp+48)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 48)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -149120,9 +150141,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+36943) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37513) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36954) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37524) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -149336,7 +150357,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 + 36965
+			var zCat uintptr = ts + 37535
 			var i int32
 			libc.Xmemset(tls, p, 0, uint32(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -149348,7 +150369,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+36974) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37544) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
 				}
 			}
@@ -149359,18 +150380,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+36985) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37555) {
 					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+36943) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37513) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36954) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37524) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36974) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37544) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -149646,7 +150667,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 + 37003
+	var zBase uintptr = ts + 37573
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -149786,7 +150807,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+37013, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37583, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149794,11 +150815,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37586, 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+37021, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37591, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149806,7 +150827,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37026, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37596, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149814,7 +150835,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37029, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37599, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149822,11 +150843,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37602, 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+37037, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37607, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149834,19 +150855,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37042, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37612, 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+37046, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37616, 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+37052, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37622, 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+37057, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37627, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149854,11 +150875,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37631, 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+37065, aBuf+uintptr(nBuf-2), uint32(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37635, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149866,7 +150887,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37638, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149874,11 +150895,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37642, 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+37076, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37646, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149886,7 +150907,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37080, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37650, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149894,7 +150915,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37654, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149902,7 +150923,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37088, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37658, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149918,24 +150939,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+37092, aBuf+uintptr(nBuf-2), uint32(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37072, uint32(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37662, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37642, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37665, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37668, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37672, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37658, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -149950,137 +150971,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+37105, aBuf+uintptr(nBuf-7), uint32(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37675, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37072, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37642, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37113, aBuf+uintptr(nBuf-6), uint32(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37683, aBuf+uintptr(nBuf-6), uint32(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37120, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37690, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37125, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37695, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37021, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37591, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37130, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37700, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37016, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37586, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37705, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37088, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37658, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37140, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37710, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15480, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15499, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37145, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37715, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37098, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37668, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37149, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37719, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37013, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37583, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 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+37724, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37057, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37627, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37160, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37730, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37164, uint32(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37734, uint32(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37166, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37736, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37080, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37650, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37172, aBuf+uintptr(nBuf-7), uint32(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37742, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37088, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37658, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37180, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37750, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37072, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37642, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37186, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37756, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37072, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37642, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37191, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37761, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37197, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37767, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37084, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37654, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37205, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37775, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37213, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37783, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37217, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37787, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37080, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37650, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37225, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37795, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37231, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37801, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37084, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37654, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37237, aBuf+uintptr(nBuf-6), uint32(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37807, aBuf+uintptr(nBuf-6), uint32(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37098, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37668, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -150095,16 +151116,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+37244, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37814, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37029, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37599, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37249, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37819, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -150112,21 +151133,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37254, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37824, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37599, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37260, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37830, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37599, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37213, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37783, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150134,7 +151155,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37266, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37836, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -150142,9 +151163,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37272, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37842, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -150159,12 +151180,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+37278, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37848, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37282, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37852, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37285, aBuf+uintptr(nBuf-2), uint32(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37855, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -150173,7 +151194,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37288, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37858, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -150329,7 +151350,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+37292) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37862) {
 				if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' || *(*uint8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -150509,22 +151530,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(64)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 37003, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37573, 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 + 37307, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37877, 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 + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37883, 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 + 37320, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37890, 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
@@ -151666,14 +152687,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+37328) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37898) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37332) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37902) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37336) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37906) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37345, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37915, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -151699,19 +152720,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 + 37379,
-		ts + 37419,
-		ts + 37454,
+		ts + 37949,
+		ts + 37989,
+		ts + 38024,
 	}
 
 	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+23352, *(*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+23418, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uint32(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37497, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38067, 0)
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -151844,11 +152865,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+37530, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+38100, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37561,
+		ts+38131,
 		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))
@@ -151872,7 +152893,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+37612, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38182, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -152156,7 +153177,7 @@ func fts5VocabFilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, zUnused
 		if pLe != 0 {
 			var zCopy uintptr = Xsqlite3_value_text(tls, pLe)
 			if zCopy == uintptr(0) {
-				zCopy = ts + 1554
+				zCopy = ts + 1573
 			}
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm = Xsqlite3_value_bytes(tls, pLe)
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FzLeTerm = Xsqlite3_malloc(tls, (*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm+1)
@@ -152267,7 +153288,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+37638, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+38208, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -152289,7 +153310,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 + 37648
+	return ts + 38218
 }
 
 func init() {
@@ -152715,6 +153736,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 588)) = noopStepFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 592)) = uintptr(unsafe.Pointer(&lagName))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&attach_func)) + 16)) = attachFunc
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 4)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 8)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 12)) = statBestIndex
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 16)) = statDisconnect
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 20)) = statDisconnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 24)) = statOpen
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 28)) = statClose
+	*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 32)) = statFilter
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 36)) = statNext
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 40)) = statEof
+	*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 44)) = statColumn
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 48)) = statRowid
 	*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 0)) = sqlite3MemMalloc
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 4)) = sqlite3MemFree
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 8)) = sqlite3MemRealloc
@@ -153247,8 +154280,9 @@ func init() {
 	*(*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
-	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 12)) = Xsqlite3JsonTableFunctions
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = Xsqlite3DbstatRegister
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 12)) = sqlite3TestExtInit
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = Xsqlite3JsonTableFunctions
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statGetFuncdef)) + 16)) = statGet
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statInitFuncdef)) + 16)) = statInit
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statPushFuncdef)) + 16)) = statPush
@@ -153266,5 +154300,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 68)) = rbuVfsGetLastError
 }
 
-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 ts1 = "3.41.2\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_DBSTAT_VTAB\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\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\x00true\x00false\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 \x00rowid not at end-of-record for row \x00 of 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\x00CREATE TABLE x( name       TEXT, path       TEXT, pageno     INTEGER, pagetype   TEXT, ncell      INTEGER, payload    INTEGER, unused     INTEGER, mx_payload INTEGER, pgoffset   INTEGER, pgsize     INTEGER, schema     TEXT HIDDEN, aggregate  BOOLEAN HIDDEN)\x00/\x00overflow\x00%s%.3x+%.6x\x00%s%.3x/\x00internal\x00leaf\x00corrupted\x00SELECT * FROM (SELECT 'sqlite_schema' AS name,1 AS rootpage,'table' AS type UNION ALL SELECT name,rootpage,type FROM \"%w\".sqlite_schema WHERE rootpage!=0)\x00WHERE name=%Q\x00 ORDER BY name\x00dbstat\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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 9d5370ad..19e5f3e4 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -208,6 +208,7 @@ const (
 	DBFLAG_SchemaKnownOk                  = 0x0010
 	DBFLAG_Vacuum                         = 0x0004
 	DBFLAG_VacuumInto                     = 0x0008
+	DBSTAT_PAGE_PADDING_BYTES             = 256
 	DB_ResetWanted                        = 0x0008
 	DB_SchemaLoaded                       = 0x0001
 	DB_UnresetViews                       = 0x0002
@@ -921,11 +922,11 @@ const (
 	NC_OrderAgg                           = 0x8000000
 	NC_PartIdx                            = 0x000002
 	NC_SelfRef                            = 0x00002e
+	NC_Subquery                           = 0x000040
 	NC_UAggInfo                           = 0x000100
 	NC_UBaseReg                           = 0x000400
 	NC_UEList                             = 0x000080
 	NC_UUpsert                            = 0x000200
-	NC_VarSelect                          = 0x000040
 	NDEBUG                                = 1
 	NN                                    = 1
 	NOT_WITHIN                            = 0
@@ -1766,6 +1767,7 @@ const (
 	SQLITE_ECEL_REF                       = 0x04
 	SQLITE_EMPTY                          = 16
 	SQLITE_ENABLE_COLUMN_METADATA         = 1
+	SQLITE_ENABLE_DBSTAT_VTAB             = 1
 	SQLITE_ENABLE_FTS5                    = 1
 	SQLITE_ENABLE_GEOPOLY                 = 1
 	SQLITE_ENABLE_LOCKING_STYLE           = 0
@@ -2167,7 +2169,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
+	SQLITE_SOURCE_ID                      = "2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2275,8 +2277,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.41.0"
-	SQLITE_VERSION_NUMBER                 = 3041000
+	SQLITE_VERSION                        = "3.41.2"
+	SQLITE_VERSION_NUMBER                 = 3041002
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -6119,7 +6121,8 @@ type IndexedExpr1 = struct {
 	FiIdxCur       int32
 	FiIdxCol       int32
 	FbMaybeNullRow U8
-	F__ccgo_pad1   [3]byte
+	Faff           U8
+	F__ccgo_pad1   [2]byte
 	FpIENext       uintptr
 }
 
@@ -6761,17 +6764,18 @@ type Pager = Pager1
 
 // Handle type for pages.
 type PgHdr2 = struct {
-	FpPage      uintptr
-	FpData      uintptr
-	FpExtra     uintptr
-	FpCache     uintptr
-	FpDirty     uintptr
-	FpPager     uintptr
-	Fpgno       Pgno
-	Fflags      U16
-	FnRef       I16
-	FpDirtyNext uintptr
-	FpDirtyPrev uintptr
+	FpPage       uintptr
+	FpData       uintptr
+	FpExtra      uintptr
+	FpCache      uintptr
+	FpDirty      uintptr
+	FpPager      uintptr
+	Fpgno        Pgno
+	Fflags       U16
+	F__ccgo_pad1 [2]byte
+	FnRef        I64
+	FpDirtyNext  uintptr
+	FpDirtyPrev  uintptr
 }
 
 // Handle type for pages.
@@ -6992,14 +6996,14 @@ type PCache2 = struct {
 	FpDirty      uintptr
 	FpDirtyTail  uintptr
 	FpSynced     uintptr
-	FnRefSum     int32
+	FnRefSum     I64
 	FszCache     int32
 	FszSpill     int32
 	FszPage      int32
 	FszExtra     int32
 	FbPurgeable  U8
 	FeCreate     U8
-	F__ccgo_pad1 [2]byte
+	F__ccgo_pad1 [6]byte
 	FxStress     uintptr
 	FpStress     uintptr
 	FpCache      uintptr
@@ -7258,7 +7262,7 @@ type CoveringIndexCheck1 = struct {
 	F__ccgo_pad1 [2]byte
 }
 
-var sqlite3azCompileOpt = [52]uintptr{
+var sqlite3azCompileOpt = [53]uintptr{
 	ts + 7,
 	ts + 27,
 	ts + 56,
@@ -7277,40 +7281,41 @@ var sqlite3azCompileOpt = [52]uintptr{
 	ts + 372,
 	ts + 397,
 	ts + 420,
-	ts + 432,
-	ts + 447,
-	ts + 469,
-	ts + 494,
-	ts + 517,
-	ts + 539,
-	ts + 550,
-	ts + 563,
-	ts + 578,
-	ts + 594,
-	ts + 607,
-	ts + 628,
-	ts + 652,
-	ts + 675,
-	ts + 691,
-	ts + 707,
-	ts + 731,
-	ts + 758,
-	ts + 778,
-	ts + 799,
-	ts + 821,
-	ts + 851,
-	ts + 876,
-	ts + 902,
-	ts + 922,
-	ts + 948,
-	ts + 971,
-	ts + 997,
-	ts + 1019,
-	ts + 1040,
-	ts + 1051,
+	ts + 439,
+	ts + 451,
+	ts + 466,
+	ts + 488,
+	ts + 513,
+	ts + 536,
+	ts + 558,
+	ts + 569,
+	ts + 582,
+	ts + 597,
+	ts + 613,
+	ts + 626,
+	ts + 647,
+	ts + 671,
+	ts + 694,
+	ts + 710,
+	ts + 726,
+	ts + 750,
+	ts + 777,
+	ts + 797,
+	ts + 818,
+	ts + 840,
+	ts + 870,
+	ts + 895,
+	ts + 921,
+	ts + 941,
+	ts + 967,
+	ts + 990,
+	ts + 1016,
+	ts + 1038,
 	ts + 1059,
-	ts + 1073,
-	ts + 1086,
+	ts + 1070,
+	ts + 1078,
+	ts + 1092,
+	ts + 1105,
 }
 
 func Xsqlite3CompileOptions(tls *libc.TLS, pnOpt uintptr) uintptr {
@@ -7462,7 +7467,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 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))
+var Xsqlite3StrBINARY = *(*[7]uint8)(unsafe.Pointer(ts + 1118))
 
 // Standard typenames.  These names must match the COLTYPE_* definitions.
 // Adjust the SQLITE_N_STDTYPE value if adding or removing entries.
@@ -7484,12 +7489,12 @@ var Xsqlite3StdTypeAffinity = [6]uint8{
 	uint8(SQLITE_AFF_TEXT),
 }
 var Xsqlite3StdType = [6]uintptr{
-	ts + 1106,
-	ts + 1110,
-	ts + 1115,
-	ts + 1119,
-	ts + 1127,
-	ts + 1132,
+	ts + 1125,
+	ts + 1129,
+	ts + 1134,
+	ts + 1138,
+	ts + 1146,
+	ts + 1151,
 }
 
 // SQL is translated into a sequence of instructions to be
@@ -7806,7 +7811,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, 23229)
+		return Xsqlite3MisuseError(tls, 23233)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -8235,7 +8240,7 @@ __6:
 __4:
 	;
 	zDate++
-	if !(getDigits(tls, zDate, ts+1137, libc.VaList(bp, bp+16, bp+20)) != 2) {
+	if !(getDigits(tls, zDate, ts+1156, libc.VaList(bp, bp+16, bp+20)) != 2) {
 		goto __9
 	}
 	return 1
@@ -8261,13 +8266,13 @@ func parseHhMmSs(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	defer tls.Free(36)
 
 	var ms float64 = 0.0
-	if getDigits(tls, zDate, ts+1145, libc.VaList(bp, bp+24, bp+28)) != 2 {
+	if getDigits(tls, zDate, ts+1164, libc.VaList(bp, bp+24, bp+28)) != 2 {
 		return 1
 	}
 	zDate += uintptr(5)
 	if int32(*(*uint8)(unsafe.Pointer(zDate))) == ':' {
 		zDate++
-		if getDigits(tls, zDate, ts+1153, libc.VaList(bp+16, bp+32)) != 1 {
+		if getDigits(tls, zDate, ts+1172, libc.VaList(bp+16, bp+32)) != 1 {
 			return 1
 		}
 		zDate += uintptr(2)
@@ -8365,7 +8370,7 @@ func parseYyyyMmDd(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	} else {
 		neg = 0
 	}
-	if getDigits(tls, zDate, ts+1157, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
+	if getDigits(tls, zDate, ts+1176, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
 		return 1
 	}
 	zDate += uintptr(10)
@@ -8422,7 +8427,7 @@ func parseDateOrTime(tls *libc.TLS, context uintptr, zDate uintptr, p uintptr) i
 		return 0
 	} else if parseHhMmSs(tls, zDate, p) == 0 {
 		return 0
-	} else if Xsqlite3StrICmp(tls, zDate, ts+1169) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
+	} else if Xsqlite3StrICmp(tls, zDate, ts+1188) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
 		return setDateTimeToCurrent(tls, context, p)
 	} else if Xsqlite3AtoF(tls, zDate, bp, Xsqlite3Strlen30(tls, zDate), uint8(SQLITE_UTF8)) > 0 {
 		setRawDateNumber(tls, p, *(*float64)(unsafe.Pointer(bp)))
@@ -8555,7 +8560,7 @@ func toLocaltime(tls *libc.TLS, p uintptr, pCtx uintptr) int32 {
 		*(*Time_t)(unsafe.Pointer(bp + 104)) = (*DateTime)(unsafe.Pointer(p)).FiJD/int64(1000) - int64(21086676)*int64(10000)
 	}
 	if osLocaltime(tls, bp+104, bp) != 0 {
-		Xsqlite3_result_error(tls, pCtx, ts+1173, -1)
+		Xsqlite3_result_error(tls, pCtx, ts+1192, -1)
 		return SQLITE_ERROR
 	}
 	(*DateTime)(unsafe.Pointer(p)).FY = (*tm)(unsafe.Pointer(bp)).Ftm_year + 1900 - iYearDiff
@@ -8579,12 +8584,12 @@ var aXformType = [6]struct {
 	FrLimit float32
 	FrXform float32
 }{
-	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1196)), FrLimit: 4.6427e+14, FrXform: 1.0},
-	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1203)), FrLimit: 7.7379e+12, FrXform: 60.0},
-	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1210)), FrLimit: 1.2897e+11, FrXform: 3600.0},
-	{FnName: U8(3), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1217)), FrLimit: 5373485.0, FrXform: 86400.0},
-	{FnName: U8(5), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1224)), FrLimit: 176546.0, FrXform: 2592000.0},
-	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1231)), FrLimit: 14713.0, FrXform: 31536000.0},
+	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1215)), FrLimit: 4.6427e+14, FrXform: 1.0},
+	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1222)), FrLimit: 7.7379e+12, FrXform: 60.0},
+	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1229)), FrLimit: 1.2897e+11, FrXform: 3600.0},
+	{FnName: U8(3), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1236)), FrLimit: 5373485.0, FrXform: 86400.0},
+	{FnName: U8(5), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1243)), FrLimit: 176546.0, FrXform: 2592000.0},
+	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1250)), FrLimit: 14713.0, FrXform: 31536000.0},
 }
 
 func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, idx int32) int32 {
@@ -8596,7 +8601,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 	switch int32(Xsqlite3UpperToLower[*(*uint8)(unsafe.Pointer(z))]) {
 	case 'a':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1238) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1257) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8618,7 +8623,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'j':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1243) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1262) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8632,7 +8637,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'l':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1253) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1272) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				rc = toLocaltime(tls, p, pCtx)
 			}
 			break
@@ -8640,7 +8645,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'u':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1263) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1282) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8652,7 +8657,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					(*DateTime)(unsafe.Pointer(p)).FrawS = uint8(0)
 					rc = 0
 				}
-			} else if Xsqlite3_stricmp(tls, z, ts+1273) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1292) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				if int32((*DateTime)(unsafe.Pointer(p)).FtzSet) == 0 {
 					var iOrigJD I64
 					var iGuess I64
@@ -8686,7 +8691,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'w':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1277, 8) == 0 &&
+			if Xsqlite3_strnicmp(tls, z, ts+1296, 8) == 0 &&
 				Xsqlite3AtoF(tls, z+8, bp+48, Xsqlite3Strlen30(tls, z+8), uint8(SQLITE_UTF8)) > 0 &&
 				*(*float64)(unsafe.Pointer(bp + 48)) >= 0.0 && *(*float64)(unsafe.Pointer(bp + 48)) < 7.0 && float64(libc.AssignInt32(&n, int32(*(*float64)(unsafe.Pointer(bp + 48))))) == *(*float64)(unsafe.Pointer(bp + 48)) {
 				var Z Sqlite3_int64
@@ -8707,7 +8712,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 's':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1286, 9) != 0 {
+			if Xsqlite3_strnicmp(tls, z, ts+1305, 9) != 0 {
 				break
 			}
 			if !(int32((*DateTime)(unsafe.Pointer(p)).FvalidJD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidYMD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidHMS) != 0) {
@@ -8721,14 +8726,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 			(*DateTime)(unsafe.Pointer(p)).FrawS = uint8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidTZ = uint8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidJD = uint8(0)
-			if Xsqlite3_stricmp(tls, z, ts+1296) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1315) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1302) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1321) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FM = 1
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1307) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1326) == 0 {
 				rc = 0
 			}
 			break
@@ -9054,7 +9059,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		switch int32(*(*uint8)(unsafe.Pointer(zFmt + uintptr(i)))) {
 		case 'd':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
 				break
 
 			}
@@ -9064,13 +9069,13 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if s > 59.999 {
 					s = 59.999
 				}
-				Xsqlite3_str_appendf(tls, bp+136, ts+1316, libc.VaList(bp+8, s))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1335, libc.VaList(bp+8, s))
 				break
 
 			}
 		case 'H':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
 				break
 
 			}
@@ -9088,41 +9093,41 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if int32(*(*uint8)(unsafe.Pointer(zFmt + uintptr(i)))) == 'W' {
 					var wd int32
 					wd = int32(((*DateTime)(unsafe.Pointer(bp+88)).FiJD + int64(43200000)) / int64(86400000) % int64(7))
-					Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+24, (nDay+7-wd)/7))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+24, (nDay+7-wd)/7))
 				} else {
-					Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+32, nDay+1))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1342, libc.VaList(bp+32, nDay+1))
 				}
 				break
 
 			}
 		case 'J':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1328, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1347, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
 				break
 
 			}
 		case 'm':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
 				break
 
 			}
 		case 'M':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
 				break
 
 			}
 		case 's':
 			{
 				var iS I64 = (*DateTime)(unsafe.Pointer(bp+88)).FiJD/int64(1000) - int64(21086676)*int64(10000)
-				Xsqlite3_str_appendf(tls, bp+136, ts+1334, libc.VaList(bp+64, iS))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1353, libc.VaList(bp+64, iS))
 				break
 
 			}
 		case 'S':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
 				break
 
 			}
@@ -9135,7 +9140,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			}
 		case 'Y':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1339, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1358, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
 				break
 
 			}
@@ -9185,15 +9190,15 @@ func Xsqlite3RegisterDateTimeFunctions(tls *libc.TLS) {
 }
 
 var aDateTimeFuncs = [9]FuncDef{
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1243},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1263},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1344},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1349},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1354},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1262},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1282},
 	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1363},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1372},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1385},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1403}}
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1368},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1373},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1382},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1391},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1404},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1422}}
 
 // The following routines are convenience wrappers around methods
 // of the sqlite3_file object.  This is mostly just syntactic sugar. All
@@ -9608,7 +9613,7 @@ func sqlite3MemMalloc(tls *libc.TLS, nByte int32) uintptr {
 		*(*Sqlite3_int64)(unsafe.Pointer(p)) = Sqlite3_int64(nByte)
 		p += 8
 	} else {
-		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1416, libc.VaList(bp, nByte))
+		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1435, libc.VaList(bp, nByte))
 	}
 	return p
 }
@@ -9641,7 +9646,7 @@ func sqlite3MemRealloc(tls *libc.TLS, pPrior uintptr, nByte int32) uintptr {
 		p += 8
 	} else {
 		Xsqlite3_log(tls, SQLITE_NOMEM,
-			ts+1454,
+			ts+1473,
 			libc.VaList(bp, sqlite3MemSize(tls, pPrior), nByte))
 	}
 	return p
@@ -10517,7 +10522,7 @@ func Xsqlite3OomFault(tls *libc.TLS, db uintptr) uintptr {
 		(*Sqlite3)(unsafe.Pointer(db)).Flookaside.Fsz = U16(0)
 		if (*Sqlite3)(unsafe.Pointer(db)).FpParse != 0 {
 			var pParse uintptr
-			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1490, 0)
+			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1509, 0)
 			(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 			for pParse = (*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).FpOuterParse; pParse != 0; pParse = (*Parse)(unsafe.Pointer(pParse)).FpOuterParse {
 				(*Parse)(unsafe.Pointer(pParse)).FnErr++
@@ -10590,8 +10595,8 @@ type et_info = struct {
 // by an instance of the following structure
 type Et_info = et_info
 
-var aDigits = *(*[33]uint8)(unsafe.Pointer(ts + 1504))
-var aPrefix = *(*[7]uint8)(unsafe.Pointer(ts + 1537))
+var aDigits = *(*[33]uint8)(unsafe.Pointer(ts + 1523))
+var aPrefix = *(*[7]uint8)(unsafe.Pointer(ts + 1556))
 var fmtinfo = [23]Et_info{
 	{Ffmttype: uint8('d'), Fbase: EtByte(10), Fflags: EtByte(1), Ftype: EtByte(EtDECIMAL)},
 	{Ffmttype: uint8('s'), Fflags: EtByte(4), Ftype: EtByte(EtSTRING)},
@@ -10805,7 +10810,7 @@ __6:
 	if !(libc.AssignInt32(&c, int32(*(*uint8)(unsafe.Pointer(libc.PreIncUintptr(&fmt, 1))))) == 0) {
 		goto __11
 	}
-	Xsqlite3_str_append(tls, pAccum, ts+1544, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1563, 1)
 	goto __5
 __11:
 	;
@@ -11362,7 +11367,7 @@ __125:
 	if !(Xsqlite3IsNaN(tls, *(*float64)(unsafe.Pointer(bp + 104))) != 0) {
 		goto __127
 	}
-	bufpt = ts + 1546
+	bufpt = ts + 1565
 	length = 3
 	goto __58
 __127:
@@ -11422,7 +11427,7 @@ __138:
 	}
 	bufpt = bp + 16
 	*(*uint8)(unsafe.Pointer(bp + 16)) = prefix
-	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1550, uint64(4))
+	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1569, uint64(4))
 	length = 3 + libc.Bool32(int32(prefix) != 0)
 	goto __58
 __139:
@@ -11788,7 +11793,7 @@ __200:
 	if !(bufpt == uintptr(0)) {
 		goto __201
 	}
-	bufpt = ts + 1554
+	bufpt = ts + 1573
 	goto __202
 __201:
 	if !(int32(xtype) == EtDYNSTRING) {
@@ -11912,9 +11917,9 @@ __222:
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
-			return ts + 1555
+			return ts + 1574
 		}
-		return ts + 1560
+		return ts + 1579
 	}()
 __223:
 	;
@@ -12062,7 +12067,7 @@ __246:
 		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
-	Xsqlite3_str_append(tls, pAccum, ts+1567, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1586, 1)
 __250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
@@ -12079,10 +12084,10 @@ __251:
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
 		goto __253
 	}
-	Xsqlite3_str_appendf(tls, pAccum, ts+1569, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1588, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 	goto __254
 __253:
-	Xsqlite3_str_appendf(tls, pAccum, ts+1579, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1598, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
 __254:
 	;
 __252:
@@ -12137,7 +12142,7 @@ __4:
 __5:
 }
 
-var zOrd = *(*[9]uint8)(unsafe.Pointer(ts + 1593))
+var zOrd = *(*[9]uint8)(unsafe.Pointer(ts + 1612))
 
 // The z string points to the first character of a token that is
 // associated with an error.  If db does not already have an error
@@ -12302,7 +12307,7 @@ func Xsqlite3ResultStrAccum(tls *libc.TLS, pCtx uintptr, p uintptr) {
 	} else if int32((*StrAccum)(unsafe.Pointer(p)).FprintfFlags)&SQLITE_PRINTF_MALLOCED != 0 {
 		Xsqlite3_result_text(tls, pCtx, (*StrAccum)(unsafe.Pointer(p)).FzText, int32((*StrAccum)(unsafe.Pointer(p)).FnChar), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 	} else {
-		Xsqlite3_result_text(tls, pCtx, ts+1554, 0, uintptr(0))
+		Xsqlite3_result_text(tls, pCtx, ts+1573, 0, uintptr(0))
 		Xsqlite3_str_reset(tls, p)
 	}
 }
@@ -14028,7 +14033,7 @@ func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
 	var c int32 = 0
 	var i int32
 
-	var pow63 uintptr = ts + 1602
+	var pow63 uintptr = ts + 1621
 	for i = 0; c == 0 && i < 18; i++ {
 		c = (int32(*(*uint8)(unsafe.Pointer(zNum + uintptr(i*incr)))) - int32(*(*uint8)(unsafe.Pointer(pow63 + uintptr(i))))) * 10
 	}
@@ -14579,7 +14584,7 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 	defer tls.Free(8)
 
 	Xsqlite3_log(tls, SQLITE_MISUSE,
-		ts+1621,
+		ts+1640,
 		libc.VaList(bp, zType))
 }
 
@@ -14598,13 +14603,13 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 func Xsqlite3SafetyCheckOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	if db == uintptr(0) {
-		logBadConnection(tls, ts+1555)
+		logBadConnection(tls, ts+1574)
 		return 0
 	}
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_OPEN {
 		if Xsqlite3SafetyCheckSickOrOk(tls, db) != 0 {
-			logBadConnection(tls, ts+1666)
+			logBadConnection(tls, ts+1685)
 		}
 		return 0
 	} else {
@@ -14617,7 +14622,7 @@ func Xsqlite3SafetyCheckSickOrOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_SICK && int32(eOpenState) != SQLITE_STATE_OPEN && int32(eOpenState) != SQLITE_STATE_BUSY {
-		logBadConnection(tls, ts+1675)
+		logBadConnection(tls, ts+1694)
 		return 0
 	} else {
 		return 1
@@ -15091,193 +15096,193 @@ func Xsqlite3OpcodeName(tls *libc.TLS, i int32) uintptr {
 }
 
 var azName = [187]uintptr{
-	ts + 1683,
-	ts + 1693,
-	ts + 1704,
-	ts + 1716,
-	ts + 1727,
-	ts + 1739,
+	ts + 1702,
+	ts + 1712,
+	ts + 1723,
+	ts + 1735,
 	ts + 1746,
-	ts + 1754,
-	ts + 1762,
-	ts + 1767,
-	ts + 1772,
-	ts + 1778,
-	ts + 1792,
-	ts + 1798,
-	ts + 1808,
-	ts + 1813,
-	ts + 1818,
-	ts + 1821,
+	ts + 1758,
+	ts + 1765,
+	ts + 1773,
+	ts + 1781,
+	ts + 1786,
+	ts + 1791,
+	ts + 1797,
+	ts + 1811,
+	ts + 1817,
 	ts + 1827,
-	ts + 1834,
-	ts + 1838,
-	ts + 1848,
-	ts + 1855,
-	ts + 1862,
-	ts + 1869,
-	ts + 1876,
-	ts + 1886,
+	ts + 1832,
+	ts + 1837,
+	ts + 1840,
+	ts + 1846,
+	ts + 1853,
+	ts + 1857,
+	ts + 1867,
+	ts + 1874,
+	ts + 1881,
+	ts + 1888,
 	ts + 1895,
-	ts + 1906,
-	ts + 1915,
-	ts + 1921,
-	ts + 1931,
-	ts + 1941,
-	ts + 1946,
-	ts + 1956,
-	ts + 1967,
-	ts + 1972,
-	ts + 1979,
-	ts + 1990,
-	ts + 1995,
-	ts + 2000,
-	ts + 2006,
-	ts + 2012,
-	ts + 2018,
-	ts + 2021,
+	ts + 1905,
+	ts + 1914,
+	ts + 1925,
+	ts + 1934,
+	ts + 1940,
+	ts + 1950,
+	ts + 1960,
+	ts + 1965,
+	ts + 1975,
+	ts + 1986,
+	ts + 1991,
+	ts + 1998,
+	ts + 2009,
+	ts + 2014,
+	ts + 2019,
 	ts + 2025,
 	ts + 2031,
-	ts + 2042,
-	ts + 2053,
+	ts + 2037,
+	ts + 2040,
+	ts + 2044,
+	ts + 2050,
 	ts + 2061,
-	ts + 2070,
-	ts + 2077,
-	ts + 2085,
-	ts + 2088,
-	ts + 2091,
-	ts + 2094,
-	ts + 2097,
-	ts + 2100,
-	ts + 2103,
+	ts + 2072,
+	ts + 2080,
+	ts + 2089,
+	ts + 2096,
+	ts + 2104,
+	ts + 2107,
 	ts + 2110,
+	ts + 2113,
 	ts + 2116,
-	ts + 2126,
-	ts + 2139,
-	ts + 2150,
-	ts + 2156,
-	ts + 2163,
-	ts + 2172,
-	ts + 2181,
-	ts + 2188,
-	ts + 2201,
-	ts + 2212,
-	ts + 2217,
-	ts + 2225,
+	ts + 2119,
+	ts + 2122,
+	ts + 2129,
+	ts + 2135,
+	ts + 2145,
+	ts + 2158,
+	ts + 2169,
+	ts + 2175,
+	ts + 2182,
+	ts + 2191,
+	ts + 2200,
+	ts + 2207,
+	ts + 2220,
 	ts + 2231,
-	ts + 2238,
+	ts + 2236,
+	ts + 2244,
 	ts + 2250,
-	ts + 2255,
-	ts + 2264,
+	ts + 2257,
 	ts + 2269,
-	ts + 2278,
+	ts + 2274,
 	ts + 2283,
 	ts + 2288,
-	ts + 2294,
+	ts + 2297,
 	ts + 2302,
-	ts + 2310,
-	ts + 2320,
-	ts + 2328,
-	ts + 2335,
-	ts + 2348,
-	ts + 2353,
-	ts + 2365,
-	ts + 2373,
-	ts + 2380,
-	ts + 2391,
-	ts + 2398,
-	ts + 2405,
-	ts + 2415,
+	ts + 2307,
+	ts + 2313,
+	ts + 2321,
+	ts + 2329,
+	ts + 2339,
+	ts + 2347,
+	ts + 2354,
+	ts + 2367,
+	ts + 2372,
+	ts + 2384,
+	ts + 2392,
+	ts + 2399,
+	ts + 2410,
+	ts + 2417,
 	ts + 2424,
-	ts + 2435,
-	ts + 2441,
-	ts + 2452,
-	ts + 2462,
-	ts + 2472,
-	ts + 2479,
-	ts + 2485,
-	ts + 2495,
-	ts + 2506,
-	ts + 2510,
-	ts + 2519,
-	ts + 2528,
-	ts + 2535,
-	ts + 2545,
-	ts + 2552,
-	ts + 2561,
+	ts + 2434,
+	ts + 2443,
+	ts + 2454,
+	ts + 2460,
+	ts + 2471,
+	ts + 2481,
+	ts + 2491,
+	ts + 2498,
+	ts + 2504,
+	ts + 2514,
+	ts + 2525,
+	ts + 2529,
+	ts + 2538,
+	ts + 2547,
+	ts + 2554,
+	ts + 2564,
 	ts + 2571,
-	ts + 2578,
-	ts + 2586,
-	ts + 2600,
-	ts + 2608,
-	ts + 2622,
-	ts + 2633,
-	ts + 2646,
-	ts + 2657,
-	ts + 2663,
-	ts + 2675,
-	ts + 2684,
-	ts + 2692,
-	ts + 2701,
-	ts + 2710,
-	ts + 2717,
-	ts + 2725,
-	ts + 2732,
-	ts + 2743,
-	ts + 2757,
-	ts + 2768,
+	ts + 2580,
+	ts + 2590,
+	ts + 2597,
+	ts + 2605,
+	ts + 2619,
+	ts + 2627,
+	ts + 2641,
+	ts + 2652,
+	ts + 2665,
+	ts + 2676,
+	ts + 2682,
+	ts + 2694,
+	ts + 2703,
+	ts + 2711,
+	ts + 2720,
+	ts + 2729,
+	ts + 2736,
+	ts + 2744,
+	ts + 2751,
+	ts + 2762,
 	ts + 2776,
-	ts + 2782,
-	ts + 2790,
-	ts + 2798,
-	ts + 2808,
-	ts + 2821,
-	ts + 2831,
-	ts + 2844,
-	ts + 2853,
-	ts + 2864,
+	ts + 2787,
+	ts + 2795,
+	ts + 2801,
+	ts + 2809,
+	ts + 2817,
+	ts + 2827,
+	ts + 2840,
+	ts + 2850,
+	ts + 2863,
 	ts + 2872,
-	ts + 2878,
-	ts + 2890,
-	ts + 2902,
-	ts + 2910,
-	ts + 2922,
-	ts + 2935,
-	ts + 2945,
-	ts + 2955,
-	ts + 2960,
-	ts + 2972,
-	ts + 2984,
-	ts + 2994,
-	ts + 3000,
-	ts + 3010,
-	ts + 3017,
+	ts + 2883,
+	ts + 2891,
+	ts + 2897,
+	ts + 2909,
+	ts + 2921,
+	ts + 2929,
+	ts + 2941,
+	ts + 2954,
+	ts + 2964,
+	ts + 2974,
+	ts + 2979,
+	ts + 2991,
+	ts + 3003,
+	ts + 3013,
+	ts + 3019,
 	ts + 3029,
-	ts + 3040,
+	ts + 3036,
 	ts + 3048,
-	ts + 3057,
-	ts + 3066,
-	ts + 3075,
-	ts + 3082,
-	ts + 3093,
-	ts + 3106,
-	ts + 3116,
-	ts + 3123,
-	ts + 3131,
-	ts + 3140,
-	ts + 3146,
-	ts + 3154,
-	ts + 3162,
-	ts + 3170,
-	ts + 3180,
+	ts + 3059,
+	ts + 3067,
+	ts + 3076,
+	ts + 3085,
+	ts + 3094,
+	ts + 3101,
+	ts + 3112,
+	ts + 3125,
+	ts + 3135,
+	ts + 3142,
+	ts + 3150,
+	ts + 3159,
+	ts + 3165,
+	ts + 3173,
+	ts + 3181,
 	ts + 3189,
-	ts + 3200,
-	ts + 3210,
-	ts + 3216,
-	ts + 3227,
-	ts + 3238,
-	ts + 3243,
-	ts + 3251,
+	ts + 3199,
+	ts + 3208,
+	ts + 3219,
+	ts + 3229,
+	ts + 3235,
+	ts + 3246,
+	ts + 3257,
+	ts + 3262,
+	ts + 3270,
 }
 
 type stat = struct {
@@ -15649,35 +15654,35 @@ type unix_syscall = struct {
 }
 
 var aSyscall = [29]unix_syscall{
-	{FzName: ts + 3261, FpCurrent: 0},
-	{FzName: ts + 3266, FpCurrent: 0},
-	{FzName: ts + 3272, FpCurrent: 0},
-	{FzName: ts + 3279, FpCurrent: 0},
-	{FzName: ts + 3286, FpCurrent: 0},
+	{FzName: ts + 3280, FpCurrent: 0},
+	{FzName: ts + 3285, FpCurrent: 0},
 	{FzName: ts + 3291, FpCurrent: 0},
-	{FzName: ts + 3297, FpCurrent: 0},
-	{FzName: ts + 3307, FpCurrent: 0},
-	{FzName: ts + 3313, FpCurrent: 0},
-	{FzName: ts + 3318},
-	{FzName: ts + 3324},
+	{FzName: ts + 3298, FpCurrent: 0},
+	{FzName: ts + 3305, FpCurrent: 0},
+	{FzName: ts + 3310, FpCurrent: 0},
+	{FzName: ts + 3316, FpCurrent: 0},
+	{FzName: ts + 3326, FpCurrent: 0},
 	{FzName: ts + 3332, FpCurrent: 0},
-	{FzName: ts + 3338},
-	{FzName: ts + 3345},
-	{FzName: ts + 3354, FpCurrent: 0},
-	{FzName: ts + 3361},
-	{FzName: ts + 3371, FpCurrent: 0},
-	{FzName: ts + 3378, FpCurrent: 0},
-	{FzName: ts + 3392, FpCurrent: 0},
-	{FzName: ts + 3398, FpCurrent: 0},
-	{FzName: ts + 3404, FpCurrent: 0},
+	{FzName: ts + 3337},
+	{FzName: ts + 3343},
+	{FzName: ts + 3351, FpCurrent: 0},
+	{FzName: ts + 3357},
+	{FzName: ts + 3364},
+	{FzName: ts + 3373, FpCurrent: 0},
+	{FzName: ts + 3380},
+	{FzName: ts + 3390, FpCurrent: 0},
+	{FzName: ts + 3397, FpCurrent: 0},
 	{FzName: ts + 3411, FpCurrent: 0},
-	{FzName: ts + 3419, FpCurrent: 0},
-	{FzName: ts + 3424, FpCurrent: 0},
-	{FzName: ts + 3431, FpCurrent: 0},
+	{FzName: ts + 3417, FpCurrent: 0},
+	{FzName: ts + 3423, FpCurrent: 0},
+	{FzName: ts + 3430, FpCurrent: 0},
 	{FzName: ts + 3438, FpCurrent: 0},
+	{FzName: ts + 3443, FpCurrent: 0},
 	{FzName: ts + 3450, FpCurrent: 0},
-	{FzName: ts + 3459, FpCurrent: 0},
-	{FzName: ts + 3465},
+	{FzName: ts + 3457, FpCurrent: 0},
+	{FzName: ts + 3469, FpCurrent: 0},
+	{FzName: ts + 3478, FpCurrent: 0},
+	{FzName: ts + 3484},
 }
 
 func robustFchown(tls *libc.TLS, fd int32, uid Uid_t, gid Gid_t) int32 {
@@ -15775,9 +15780,9 @@ func robust_open(tls *libc.TLS, z uintptr, f int32, m Mode_t) int32 {
 		}
 		(*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, fd)
 		Xsqlite3_log(tls, SQLITE_WARNING,
-			ts+3471, libc.VaList(bp, z, fd))
+			ts+3490, libc.VaList(bp, z, fd))
 		fd = -1
-		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3514, O_RDONLY, int32(m)) < 0 {
+		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3533, O_RDONLY, int32(m)) < 0 {
 			break
 		}
 	}
@@ -15856,13 +15861,13 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 	var zErr uintptr
 	var iErrno int32 = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 
-	zErr = ts + 1554
+	zErr = ts + 1573
 
 	if zPath == uintptr(0) {
-		zPath = ts + 1554
+		zPath = ts + 1573
 	}
 	Xsqlite3_log(tls, errcode,
-		ts+3524,
+		ts+3543,
 		libc.VaList(bp, iLine, iErrno, zFunc, zPath, zErr))
 
 	return errcode
@@ -15870,7 +15875,7 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 
 func robust_close(tls *libc.TLS, pFile uintptr, h int32, lineno int32) {
 	if (*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, h) != 0 {
-		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3266,
+		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3285,
 			func() uintptr {
 				if pFile != 0 {
 					return (*UnixFile)(unsafe.Pointer(pFile)).FzPath
@@ -15891,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, 38271)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38275)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -15993,19 +15998,19 @@ func verifyDbFile(tls *libc.TLS, pFile uintptr) {
 
 	rc = (*(*func(*libc.TLS, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 5*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, bp+32)
 	if rc != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3555, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3574, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink == X__nlink_t(0) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3579, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3598, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink > X__nlink_t(1) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3608, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3627, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if fileHasMoved(tls, pFile) != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3635, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3654, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 }
@@ -16368,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, 39055)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39059)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -16641,7 +16646,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	var ii int32
 	var fd int32 = -1
 
-	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3663, libc.VaList(bp, zFilename))
+	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3682, libc.VaList(bp, zFilename))
 	for ii = int32(libc.Xstrlen(tls, bp+8)); ii > 0 && int32(*(*uint8)(unsafe.Pointer(bp + 8 + uintptr(ii)))) != '/'; ii-- {
 	}
 	if ii > 0 {
@@ -16659,7 +16664,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3378, bp+8, 40676)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40680), ts+3397, bp+8, 40680)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -16676,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, 40717)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3685, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40721)
 	}
 
 	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)), 40731)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40735)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -16703,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, 40762)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3316, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40766)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -16758,7 +16763,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 				if iWrite >= nSize {
 					iWrite = nSize - int64(1)
 				}
-				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1554, 1)
+				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1573, 1)
 				if nWrite != 1 {
 					return SQLITE_IOERR | int32(3)<<8
 				}
@@ -16771,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, 40883)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3316, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40887)
 			}
 		}
 
@@ -16839,7 +16844,7 @@ func unixFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 		}
 	case SQLITE_FCNTL_VFSNAME:
 		{
-			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
+			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
 			return SQLITE_OK
 
 		}
@@ -16998,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, 41442)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41446)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -17026,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, 41499)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3316, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41503)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -17089,7 +17094,7 @@ __4:
 	;
 	libc.Xmemset(tls, pShmNode, 0, uint64(unsafe.Sizeof(unixShmNode{}))+uint64(nShmFilename))
 	zShm = libc.AssignPtrUintptr(pShmNode+16, pShmNode+1*96)
-	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3677, libc.VaList(bp, zBasePath))
+	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3696, libc.VaList(bp, zBasePath))
 
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = -1
 	(*UnixInodeInfo)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pDbFd)).FpInode)).FpShmNode = pShmNode
@@ -17110,7 +17115,7 @@ __5:
 	if !(int32((*UnixInodeInfo)(unsafe.Pointer(pInode)).FbProcessLock) == 0) {
 		goto __7
 	}
-	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3684, 0)) {
+	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3703, 0)) {
 		goto __8
 	}
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = robust_open(tls, zShm, O_RDWR|O_CREAT|0100000,
@@ -17125,7 +17130,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3261, zShm, 41624)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41628), ts+3280, zShm, 41628)
 	goto shm_open_err
 __10:
 	;
@@ -17251,11 +17256,11 @@ __11:
 		goto __13
 	}
 	*(*int32)(unsafe.Pointer(bp + 128)) = 0
-	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1554, 1, bp+128) != 1) {
+	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1573, 1, bp+128) != 1) {
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41768)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3351, zFile, 41772)
 	goto shmpage_out
 __14:
 	;
@@ -17301,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, 41795)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3438, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41799)
 	goto shmpage_out
 __20:
 	;
@@ -17502,7 +17507,7 @@ func unixUnmapfile(tls *libc.TLS, pFd uintptr) {
 }
 
 func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
-	var zErr uintptr = ts + 3419
+	var zErr uintptr = ts + 3438
 	var h int32 = (*UnixFile)(unsafe.Pointer(pFd)).Fh
 	var pOrig uintptr = (*UnixFile)(unsafe.Pointer(pFd)).FpMapRegion
 	var nOrig I64 = (*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeActual
@@ -17518,7 +17523,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 		}
 
 		pNew = (*(*func(*libc.TLS, uintptr, Size_t, Size_t, int32, uintptr) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 24*24 + 8)))(tls, pOrig, uint64(nReuse), uint64(nNew), MREMAP_MAYMOVE, 0)
-		zErr = ts + 3431
+		zErr = ts + 3450
 
 		if pNew == libc.UintptrFromInt32(-1) || pNew == uintptr(0) {
 			(*(*func(*libc.TLS, uintptr, Size_t) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 23*24 + 8)))(tls, pOrig, uint64(nReuse))
@@ -17532,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, 42169)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42173)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -17647,10 +17652,10 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		}
 		return uintptr(0)
 	}(),
-		ts+3697, SQLITE_POWERSAFE_OVERWRITE) != 0 {
+		ts+3716, SQLITE_POWERSAFE_OVERWRITE) != 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_PSOW)
 	}
-	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3702) == 0 {
+	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3721) == 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_EXCL)
 	}
 
@@ -17666,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, 42672)
+			robust_close(tls, pNew, h, 42676)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -17679,7 +17684,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		if zLockFile == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
-			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3712, libc.VaList(bp, zFilename))
+			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3731, libc.VaList(bp, zFilename))
 		}
 		(*UnixFile)(unsafe.Pointer(pNew)).FlockingContext = zLockFile
 	}
@@ -17687,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, 42757)
+			robust_close(tls, pNew, h, 42761)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -17700,15 +17705,15 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 var azTempDirs = [6]uintptr{
 	uintptr(0),
 	uintptr(0),
-	ts + 3720,
-	ts + 3729,
-	ts + 3738,
-	ts + 1567,
+	ts + 3739,
+	ts + 3748,
+	ts + 3757,
+	ts + 1586,
 }
 
 func unixTempFileInit(tls *libc.TLS) {
-	azTempDirs[0] = libc.Xgetenv(tls, ts+3743)
-	azTempDirs[1] = libc.Xgetenv(tls, ts+3757)
+	azTempDirs[0] = libc.Xgetenv(tls, ts+3762)
+	azTempDirs[1] = libc.Xgetenv(tls, ts+3776)
 }
 
 func unixTempFileDir(tls *libc.TLS) uintptr {
@@ -17753,7 +17758,7 @@ func unixGetTempname(tls *libc.TLS, nBuf int32, zBuf uintptr) int32 {
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U64(0))), bp+24)
 
 			*(*uint8)(unsafe.Pointer(zBuf + uintptr(nBuf-2))) = uint8(0)
-			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3764,
+			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3783,
 				libc.VaList(bp, zDir, *(*U64)(unsafe.Pointer(bp + 24)), 0))
 			if int32(*(*uint8)(unsafe.Pointer(zBuf + uintptr(nBuf-2)))) != 0 || libc.PostIncInt32(&iLimit, 1) > 10 {
 				rc = SQLITE_ERROR
@@ -17838,7 +17843,7 @@ func findCreateFileMode(tls *libc.TLS, zPath uintptr, flags int32, pMode uintptr
 	} else if flags&SQLITE_OPEN_DELETEONCLOSE != 0 {
 		*(*Mode_t)(unsafe.Pointer(pMode)) = Mode_t(0600)
 	} else if flags&SQLITE_OPEN_URI != 0 {
-		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3781)
+		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3800)
 		if z != 0 {
 			rc = getFileMode(tls, z, pMode, pUid, pGid)
 		}
@@ -18003,7 +18008,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3261, zName, 43198)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43202), ts+3280, zName, 43202)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -18094,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, 43337)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3390, zPath, 43341)
 		}
 		return rc
 	}
@@ -18102,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, 43347)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3807, zPath, 43351)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43353)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -18168,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, 43443), ts+3459, zIn, 43443)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43447), ts+3478, zIn, 43447)
 			}
 		} 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, 43449)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43453)
 				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, 43454), ts+3450, zIn, 43454)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43458), ts+3469, zIn, 43458)
 				return
 			}
 			*(*uint8)(unsafe.Pointer(bp + 128 + uintptr(got))) = uint8(0)
@@ -18219,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, 43512), ts+3279, zPath, 43512)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43516), ts+3298, zPath, 43516)
 		}
 		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, 43518)
+		return Xsqlite3CantopenError(tls, 43522)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+4104)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -18284,7 +18289,7 @@ func unixDlError(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBufOut uintptr) {
 	unixEnterMutex(tls)
 	zErr = libc.Xdlerror(tls)
 	if zErr != 0 {
-		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3663, libc.VaList(bp, zErr))
+		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3682, libc.VaList(bp, zErr))
 	}
 	unixLeaveMutex(tls)
 }
@@ -18316,7 +18321,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 	{
 		var fd int32
 		var got int32
-		fd = robust_open(tls, ts+3794, O_RDONLY, uint32(0))
+		fd = robust_open(tls, ts+3813, O_RDONLY, uint32(0))
 		if fd < 0 {
 			libc.Xtime(tls, bp)
 			libc.Xmemcpy(tls, zBuf, bp, uint64(unsafe.Sizeof(Time_t(0))))
@@ -18327,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, 43619)
+			robust_close(tls, uintptr(0), fd, 43623)
 		}
 
 	}
@@ -18404,10 +18409,10 @@ func Xsqlite3_os_init(tls *libc.TLS) int32 {
 }
 
 var aVfs = [4]Sqlite3_vfs{
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3807, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3812, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3822, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3702, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3826, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3831, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3841, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3721, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
 }
 
 // Shutdown the operating system interface.
@@ -18462,7 +18467,7 @@ var memdb_g MemFS
 var memdb_vfs = Sqlite3_vfs{
 	FiVersion:          2,
 	FmxPathname:        1024,
-	FzName:             ts + 3835,
+	FzName:             ts + 3854,
 	FxOpen:             0,
 	FxAccess:           0,
 	FxFullPathname:     0,
@@ -18718,7 +18723,7 @@ func memdbFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int3
 	var rc int32 = SQLITE_NOTFOUND
 	memdbEnter(tls, p)
 	if op == SQLITE_FCNTL_VFSNAME {
-		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3841, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
+		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3860, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
 		rc = SQLITE_OK
 	}
 	if op == SQLITE_FCNTL_SIZE_LIMIT {
@@ -18850,7 +18855,7 @@ func memdbFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, z
 	defer tls.Free(8)
 
 	_ = pVfs
-	Xsqlite3_snprintf(tls, nOut, zOut, ts+3663, libc.VaList(bp, zPath))
+	Xsqlite3_snprintf(tls, nOut, zOut, ts+3682, libc.VaList(bp, zPath))
 	return SQLITE_OK
 }
 
@@ -18971,7 +18976,7 @@ func Xsqlite3_serialize(tls *libc.TLS, db uintptr, zSchema uintptr, piSize uintp
 		return uintptr(0)
 	}
 	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
-	zSql = Xsqlite3_mprintf(tls, ts+3856, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3875, libc.VaList(bp, zSchema))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, db, zSql, -1, bp+8, uintptr(0))
 	} else {
@@ -19044,7 +19049,7 @@ __1:
 	goto end_deserialize
 __2:
 	;
-	zSql = Xsqlite3_mprintf(tls, ts+3879, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3898, libc.VaList(bp, zSchema))
 	if !(zSql == uintptr(0)) {
 		goto __3
 	}
@@ -19760,7 +19765,7 @@ func pcacheFetchFinishWithInit(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 	libc.Xmemset(tls, pPgHdr+32, 0, uint64(unsafe.Sizeof(PgHdr{}))-uint64(uintptr(0)+32))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpPage = pPage
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpData = (*Sqlite3_pcache_page)(unsafe.Pointer(pPage)).FpBuf
-	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*72
+	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*80
 	libc.Xmemset(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0, uint64(8))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpCache = pCache
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).Fpgno = pgno
@@ -19790,7 +19795,7 @@ func Xsqlite3PcacheFetchFinish(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 // reference count drops to 0, then it is made eligible for recycling.
 func Xsqlite3PcacheRelease(tls *libc.TLS, p uintptr) {
 	(*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FnRefSum--
-	if int32(libc.PreDecInt16(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1)) == 0 {
+	if libc.PreDecInt64(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1) == int64(0) {
 		if int32((*PgHdr)(unsafe.Pointer(p)).Fflags)&PGHDR_CLEAN != 0 {
 			pcacheUnpin(tls, p)
 		} else {
@@ -19841,7 +19846,7 @@ func Xsqlite3PcacheMakeClean(tls *libc.TLS, p uintptr) {
 	*(*U16)(unsafe.Pointer(p + 52)) &= libc.Uint16FromInt32(libc.CplInt32(PGHDR_DIRTY | PGHDR_NEED_SYNC | PGHDR_WRITEABLE))
 	*(*U16)(unsafe.Pointer(p + 52)) |= U16(PGHDR_CLEAN)
 
-	if int32((*PgHdr)(unsafe.Pointer(p)).FnRef) == 0 {
+	if (*PgHdr)(unsafe.Pointer(p)).FnRef == int64(0) {
 		pcacheUnpin(tls, p)
 	}
 }
@@ -19945,8 +19950,8 @@ func Xsqlite3PcacheClear(tls *libc.TLS, pCache uintptr) {
 }
 
 func pcacheMergeDirtyList(tls *libc.TLS, pA uintptr, pB uintptr) uintptr {
-	bp := tls.Alloc(72)
-	defer tls.Free(72)
+	bp := tls.Alloc(80)
+	defer tls.Free(80)
 
 	var pTail uintptr
 	pTail = bp
@@ -20024,13 +20029,13 @@ func Xsqlite3PcacheDirtyList(tls *libc.TLS, pCache uintptr) uintptr {
 //
 // This is not the total number of pages referenced, but the sum of the
 // reference count for all pages.
-func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) int32 {
+func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) I64 {
 	return (*PCache)(unsafe.Pointer(pCache)).FnRefSum
 }
 
 // Return the number of references to the page supplied as an argument.
-func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) int32 {
-	return int32((*PgHdr)(unsafe.Pointer(p)).FnRef)
+func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) I64 {
+	return (*PgHdr)(unsafe.Pointer(p)).FnRef
 }
 
 // Return the total number of pages in the cache.
@@ -22259,7 +22264,7 @@ __27:
 	if !(isHot != 0 && nPlayback != 0) {
 		goto __28
 	}
-	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3894,
+	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3913,
 		libc.VaList(bp, nPlayback, (*Pager)(unsafe.Pointer(pPager)).FzJournal))
 __28:
 	;
@@ -22324,7 +22329,7 @@ func pagerUndoCallback(tls *libc.TLS, pCtx uintptr, iPg Pgno) int32 {
 
 	pPg = Xsqlite3PagerLookup(tls, pPager, iPg)
 	if pPg != 0 {
-		if Xsqlite3PcachePageRefcount(tls, pPg) == 1 {
+		if Xsqlite3PcachePageRefcount(tls, pPg) == int64(1) {
 			Xsqlite3PcacheDrop(tls, pPg)
 		} else {
 			rc = readDbPage(tls, pPg)
@@ -22757,7 +22762,7 @@ func Xsqlite3PagerSetPagesize(tls *libc.TLS, pPager uintptr, pPageSize uintptr,
 	var pageSize U32 = *(*U32)(unsafe.Pointer(pPageSize))
 
 	if (int32((*Pager)(unsafe.Pointer(pPager)).FmemDb) == 0 || (*Pager)(unsafe.Pointer(pPager)).FdbSize == Pgno(0)) &&
-		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 &&
+		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) &&
 		pageSize != 0 && pageSize != U32((*Pager)(unsafe.Pointer(pPager)).FpageSize) {
 		var pNew uintptr = uintptr(0)
 		*(*I64)(unsafe.Pointer(bp)) = int64(0)
@@ -22909,9 +22914,9 @@ func pagerAcquireMapPage(tls *libc.TLS, pPager uintptr, pgno Pgno, pData uintptr
 			Xsqlite3OsUnfetch(tls, (*Pager)(unsafe.Pointer(pPager)).Ffd, I64(pgno-Pgno(1))*(*Pager)(unsafe.Pointer(pPager)).FpageSize, pData)
 			return SQLITE_NOMEM
 		}
-		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*72
+		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*80
 		(*PgHdr)(unsafe.Pointer(p)).Fflags = U16(PGHDR_MMAP)
-		(*PgHdr)(unsafe.Pointer(p)).FnRef = int16(1)
+		(*PgHdr)(unsafe.Pointer(p)).FnRef = int64(1)
 		(*PgHdr)(unsafe.Pointer(p)).FpPager = pPager
 	}
 
@@ -23243,7 +23248,7 @@ func Xsqlite3PagerFlush(tls *libc.TLS, pPager uintptr) int32 {
 
 		for rc == SQLITE_OK && pList != 0 {
 			var pNext uintptr = (*PgHdr)(unsafe.Pointer(pList)).FpDirty
-			if int32((*PgHdr)(unsafe.Pointer(pList)).FnRef) == 0 {
+			if (*PgHdr)(unsafe.Pointer(pList)).FnRef == int64(0) {
 				rc = pagerStress(tls, pPager, pList)
 			}
 			pList = pNext
@@ -23393,7 +23398,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 60235)
+	rc = Xsqlite3CantopenError(tls, 60239)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -23454,7 +23459,7 @@ __15:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzJournal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3921, uint64(8))
+	libc.Xmemcpy(tls, pPtr, ts+3940, uint64(8))
 	pPtr += uintptr(8 + 1)
 	goto __19
 __18:
@@ -23467,7 +23472,7 @@ __19:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzWal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3930, uint64(4))
+	libc.Xmemcpy(tls, pPtr, ts+3949, uint64(4))
 	pPtr += uintptr(4 + 1)
 	goto __21
 __20:
@@ -23519,9 +23524,9 @@ __27:
 	;
 __26:
 	;
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3935, 0))
+	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3954, 0))
 	if !(iDc&SQLITE_IOCAP_IMMUTABLE != 0 ||
-		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3942, 0) != 0) {
+		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3961, 0) != 0) {
 		goto __30
 	}
 	vfsFlags = vfsFlags | SQLITE_OPEN_READONLY
@@ -23774,7 +23779,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60754)
+	rc = Xsqlite3CantopenError(tls, 60758)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23880,7 +23885,7 @@ __24:
 }
 
 func pagerUnlockIfUnused(tls *libc.TLS, pPager uintptr) {
-	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 {
+	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) {
 		pagerUnlockAndRollback(tls, pPager)
 	}
 }
@@ -23898,7 +23903,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60967)
+	return Xsqlite3CorruptError(tls, 60971)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23937,7 +23942,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60999)
+	rc = Xsqlite3CorruptError(tls, 61003)
 	goto pager_acquire_err
 __7:
 	;
@@ -24014,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, 61078)
+		return Xsqlite3CorruptError(tls, 61082)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24772,7 +24777,7 @@ func Xsqlite3PagerMemUsed(tls *libc.TLS, pPager uintptr) int32 {
 
 // Return the number of references to the specified page.
 func Xsqlite3PagerPageRefcount(tls *libc.TLS, pPage uintptr) int32 {
-	return Xsqlite3PcachePageRefcount(tls, pPage)
+	return int32(Xsqlite3PcachePageRefcount(tls, pPage))
 }
 
 // Parameter eStat must be one of SQLITE_DBSTATUS_CACHE_HIT, _MISS, _WRITE,
@@ -25015,9 +25020,9 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	pPgOld = Xsqlite3PagerLookup(tls, pPager, pgno)
 
 	if pPgOld != 0 {
-		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
+		if (*PgHdr)(unsafe.Pointer(pPgOld)).FnRef > int64(1) {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62623)
+			return Xsqlite3CorruptError(tls, 62627)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -25202,7 +25207,7 @@ func Xsqlite3PagerClearCache(tls *libc.TLS, pPager uintptr) {
 func Xsqlite3PagerCheckpoint(tls *libc.TLS, pPager uintptr, db uintptr, eMode int32, pnLog uintptr, pnCkpt uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal == uintptr(0) && int32((*Pager)(unsafe.Pointer(pPager)).FjournalMode) == PAGER_JOURNALMODE_WAL {
-		Xsqlite3_exec(tls, db, ts+3952, uintptr(0), uintptr(0), uintptr(0))
+		Xsqlite3_exec(tls, db, ts+3971, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal != 0 {
 		rc = Xsqlite3WalCheckpoint(tls, (*Pager)(unsafe.Pointer(pPager)).FpWal, db, eMode,
@@ -25774,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, 64387)
+				return Xsqlite3CorruptError(tls, 64391)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25873,7 +25878,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64519)
+	rc = Xsqlite3CantopenError(tls, 64523)
 	goto finished
 __7:
 	;
@@ -26041,7 +26046,7 @@ __24:
 		goto __30
 	}
 	Xsqlite3_log(tls, SQLITE_NOTICE|int32(1)<<8,
-		ts+3970,
+		ts+3989,
 		libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 __30:
 	;
@@ -26459,7 +26464,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65333)
+	rc = Xsqlite3CorruptError(tls, 65337)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -26604,7 +26609,7 @@ func walLimitSize(tls *libc.TLS, pWal uintptr, nMax I64) {
 	}
 	Xsqlite3EndBenignMalloc(tls)
 	if rx != 0 {
-		Xsqlite3_log(tls, rx, ts+4007, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
+		Xsqlite3_log(tls, rx, ts+4026, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 	}
 }
 
@@ -26734,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, 65682)
+		rc = Xsqlite3CantopenError(tls, 65686)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -27207,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, 66419)
+				return Xsqlite3CorruptError(tls, 66423)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -27712,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, 67138)
+			rc = Xsqlite3CorruptError(tls, 67142)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -28105,7 +28110,7 @@ func Xsqlite3BtreeLeaveCursor(tls *libc.TLS, pCur uintptr) {
 	Xsqlite3BtreeLeave(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpBtree)
 }
 
-var zMagicHeader = *(*[16]uint8)(unsafe.Pointer(ts + 4033))
+var zMagicHeader = *(*[16]uint8)(unsafe.Pointer(ts + 4052))
 
 var sqlite3SharedCacheList uintptr = uintptr(0)
 
@@ -28370,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, 69249)
+			rc = Xsqlite3CorruptError(tls, 69253)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -28507,7 +28512,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69434)
 	return
 __2:
 	;
@@ -28524,7 +28529,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69447)
 	goto ptrmap_exit
 __4:
 	;
@@ -28532,7 +28537,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69452)
 	goto ptrmap_exit
 __5:
 	;
@@ -28575,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, 69493)
+		return Xsqlite3CorruptError(tls, 69497)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -28585,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, 69501)
+		return Xsqlite3CorruptError(tls, 69505)
 	}
 	return SQLITE_OK
 }
@@ -28835,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, 69893)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69897)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28882,7 +28887,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69951)
+	return Xsqlite3CorruptError(tls, 69955)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28892,7 +28897,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69954)
+	return Xsqlite3CorruptError(tls, 69958)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28905,7 +28910,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69962)
+	return Xsqlite3CorruptError(tls, 69966)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28914,14 +28919,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69965)
+	return Xsqlite3CorruptError(tls, 69969)
 __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, 69967)
+	return Xsqlite3CorruptError(tls, 69971)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -28931,7 +28936,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69971)
+	return Xsqlite3CorruptError(tls, 69975)
 __11:
 	;
 __8:
@@ -28995,7 +29000,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 70004)
+	return Xsqlite3CorruptError(tls, 70008)
 __22:
 	;
 	size = int32((*struct {
@@ -29005,7 +29010,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 70010)
+	return Xsqlite3CorruptError(tls, 70014)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -29027,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, 70024)
+	return Xsqlite3CorruptError(tls, 70028)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -29062,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, 70081)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70085)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -29075,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, 70096)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70100)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70107)
 	}
 	return uintptr(0)
 }
@@ -29106,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, 70152)
+			return Xsqlite3CorruptError(tls, 70156)
 		}
 	}
 
@@ -29117,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, 70170)
+				return Xsqlite3CorruptError(tls, 70174)
 			} else {
 				return SQLITE_OK
 			}
@@ -29169,22 +29174,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 70249)
+				return Xsqlite3CorruptError(tls, 70253)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 70254)
+			return Xsqlite3CorruptError(tls, 70258)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 70266)
+				return Xsqlite3CorruptError(tls, 70270)
 			}
 			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, 70269)
+				return Xsqlite3CorruptError(tls, 70273)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -29194,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, 70282)
+					return Xsqlite3CorruptError(tls, 70286)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -29202,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, 70288)
+			return Xsqlite3CorruptError(tls, 70292)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -29210,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, 70297)
+			return Xsqlite3CorruptError(tls, 70301)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70298)
+			return Xsqlite3CorruptError(tls, 70302)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -29273,7 +29278,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70357)
+			return Xsqlite3CorruptError(tls, 70361)
 		}
 	} else {
 		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
@@ -29309,7 +29314,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70381)
+			return Xsqlite3CorruptError(tls, 70385)
 		}
 	}
 	return SQLITE_OK
@@ -29339,11 +29344,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70432)
+			return Xsqlite3CorruptError(tls, 70436)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70437)
+				return Xsqlite3CorruptError(tls, 70441)
 			}
 			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))))
@@ -29354,15 +29359,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70447)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70451)
+			return Xsqlite3CorruptError(tls, 70455)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70463)
+		return Xsqlite3CorruptError(tls, 70467)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -29390,14 +29395,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, 70494)
+			return Xsqlite3CorruptError(tls, 70498)
 		}
 		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, 70499)
+			return Xsqlite3CorruptError(tls, 70503)
 		}
 	}
 	return SQLITE_OK
@@ -29411,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, 70531)
+		return Xsqlite3CorruptError(tls, 70535)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -29423,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, 70545)
+		return Xsqlite3CorruptError(tls, 70549)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -29526,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, 70700)
+	rc = Xsqlite3CorruptError(tls, 70704)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -29554,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, 70721)
+	rc = Xsqlite3CorruptError(tls, 70725)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -29593,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, 70787)
+			return Xsqlite3CorruptError(tls, 70791)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -29666,7 +29671,7 @@ func Xsqlite3BtreeOpen(tls *libc.TLS, pVfs uintptr, zFilename uintptr, db uintpt
 	mutexOpen = uintptr(0)
 	rc = SQLITE_OK
 	isTempDb = libc.Bool32(zFilename == uintptr(0) || int32(*(*uint8)(unsafe.Pointer(zFilename))) == 0)
-	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4049) == 0 ||
+	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4068) == 0 ||
 		isTempDb != 0 && Xsqlite3TempInMemory(tls, db) != 0 ||
 		vfsFlags&SQLITE_OPEN_MEMORY != 0)
 
@@ -30438,7 +30443,7 @@ __9:
 	;
 __10:
 	;
-	if !(libc.Xmemcmp(tls, page1+21, ts+4058, uint64(3)) != 0) {
+	if !(libc.Xmemcmp(tls, page1+21, ts+4077, uint64(3)) != 0) {
 		goto __14
 	}
 	goto page1_init_failed
@@ -30476,7 +30481,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71722)
+	rc = Xsqlite3CorruptError(tls, 71726)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30891,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, 72143)
+			return Xsqlite3CorruptError(tls, 72147)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30917,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, 72162)
+						return Xsqlite3CorruptError(tls, 72166)
 					}
 					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)
@@ -30926,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, 72171)
+					return Xsqlite3CorruptError(tls, 72175)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30937,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, 72183)
+				return Xsqlite3CorruptError(tls, 72187)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30953,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, 72218)
+		return Xsqlite3CorruptError(tls, 72222)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -31014,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, 72316)
+			return Xsqlite3CorruptError(tls, 72320)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -31049,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, 72368)
+					return Xsqlite3CorruptError(tls, 72372)
 				}
 			}
 
@@ -31109,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, 72436)
+			rc = Xsqlite3CorruptError(tls, 72440)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -31148,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, 72487)
+			return Xsqlite3CorruptError(tls, 72491)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -31179,7 +31184,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72514)
+			return Xsqlite3CorruptError(tls, 72518)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -31520,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, 72978)
+			return Xsqlite3CorruptError(tls, 72982)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -31764,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, 73385)
+		return Xsqlite3CorruptError(tls, 73389)
 	}
 
 	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, 73400)
+		return Xsqlite3CorruptError(tls, 73404)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -31816,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, 73462)
+				return Xsqlite3CorruptError(tls, 73466)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31865,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, 73547)
+		return Xsqlite3CorruptError(tls, 73551)
 	}
 	return rc
 }
@@ -31945,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, 73684)
+		return Xsqlite3CorruptError(tls, 73688)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -32036,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, 73823)
+	return Xsqlite3CorruptError(tls, 73827)
 __11:
 	;
 skip_init:
@@ -32056,7 +32061,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73835)
+	return Xsqlite3CorruptError(tls, 73839)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -32266,7 +32271,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 74077)
+	return Xsqlite3CorruptError(tls, 74081)
 __21:
 	;
 	goto __19
@@ -32470,7 +32475,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 74273)
+	return Xsqlite3CorruptError(tls, 74277)
 __4:
 	;
 	goto bypass_moveto_root
@@ -32535,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, 74360)
+	rc = Xsqlite3CorruptError(tls, 74364)
 	goto moveto_index_finish
 __17:
 	;
@@ -32583,7 +32588,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74392)
+	rc = Xsqlite3CorruptError(tls, 74396)
 __24:
 	;
 	goto moveto_index_finish
@@ -32702,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, 74508)
+		return Xsqlite3CorruptError(tls, 74512)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32862,7 +32867,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74688)
+	return Xsqlite3CorruptError(tls, 74692)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32927,7 +32932,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74744)
+	rc = Xsqlite3CorruptError(tls, 74748)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -32963,7 +32968,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74773)
+	rc = Xsqlite3CorruptError(tls, 74777)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -33007,7 +33012,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74807)
+	rc = Xsqlite3CorruptError(tls, 74811)
 	goto end_allocate_page
 __32:
 	;
@@ -33119,7 +33124,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74872)
+	rc = Xsqlite3CorruptError(tls, 74876)
 	goto end_allocate_page
 __51:
 	;
@@ -33277,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, 74999)
+	return Xsqlite3CorruptError(tls, 75003)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -33334,7 +33339,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75050)
 	goto freepage_out
 __10:
 	;
@@ -33350,7 +33355,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75061)
 	goto freepage_out
 __12:
 	;
@@ -33424,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, 75146)
+		return Xsqlite3CorruptError(tls, 75150)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -33436,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, 75163)
+			return Xsqlite3CorruptError(tls, 75167)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -33447,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, 75183)
+			rc = Xsqlite3CorruptError(tls, 75187)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -33612,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, 75436)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75440)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -33891,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, 75737)
+				return Xsqlite3CorruptError(tls, 75741)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75742)
+			return Xsqlite3CorruptError(tls, 75746)
 		}
 
 		pData -= uintptr(sz)
@@ -33904,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, 75748)
+			return Xsqlite3CorruptError(tls, 75752)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -33964,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, 75833)
+			Xsqlite3CorruptError(tls, 75837)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -34053,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, 75947)
+	return Xsqlite3CorruptError(tls, 75951)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -34169,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, 76060)
+		return Xsqlite3CorruptError(tls, 76064)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -34489,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, 76481)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76485)
 	goto balance_cleanup
 __25:
 	;
@@ -34500,7 +34505,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76509)
 	goto balance_cleanup
 __27:
 	;
@@ -34658,7 +34663,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76610)
 	goto balance_cleanup
 __55:
 	;
@@ -34732,7 +34737,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76643)
 	goto balance_cleanup
 __67:
 	;
@@ -34795,7 +34800,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76687)
 	goto balance_cleanup
 __75:
 	;
@@ -34823,7 +34828,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76720)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -35084,7 +35089,7 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76920)
 	goto balance_cleanup
 __121:
 	;
@@ -35276,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, 77146)
+			return Xsqlite3CorruptError(tls, 77150)
 		}
 	}
 	return SQLITE_OK
@@ -35314,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, 77206)
+			rc = Xsqlite3CorruptError(tls, 77210)
 		} 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)))
@@ -35420,7 +35425,7 @@ func btreeOverwriteOverflowCell(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, 77370)
+			rc = Xsqlite3CorruptError(tls, 77374)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -35445,7 +35450,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 
 	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)
+		return Xsqlite3CorruptError(tls, 77402)
 	}
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
 		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
@@ -35515,7 +35520,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77479)
+	return Xsqlite3CorruptError(tls, 77483)
 __3:
 	;
 __1:
@@ -35628,7 +35633,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77606)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -35688,6 +35693,7 @@ __30:
 __25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
+	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
 		goto __31
 	}
@@ -35695,7 +35701,7 @@ __25:
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
 		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77640)
+	return Xsqlite3CorruptError(tls, 77645)
 __33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
@@ -35733,13 +35739,13 @@ __37:
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77667)
+	return Xsqlite3CorruptError(tls, 77672)
 __39:
 	;
 	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __40
 	}
-	return Xsqlite3CorruptError(tls, 77670)
+	return Xsqlite3CorruptError(tls, 77675)
 __40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
@@ -35770,7 +35776,6 @@ __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 __44
 	}
@@ -35845,7 +35850,7 @@ 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, 77773)
+		return Xsqlite3CorruptError(tls, 77777)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
@@ -35870,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, 77798)
+				return Xsqlite3CorruptError(tls, 77802)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35971,7 +35976,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77894)
+			return Xsqlite3CorruptError(tls, 77898)
 		}
 	}
 
@@ -35979,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, 77903)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 	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, 77907)
+		return Xsqlite3CorruptError(tls, 77911)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -36058,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(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, 77998)
+			return Xsqlite3CorruptError(tls, 78002)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -36127,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, 78114)
+			return Xsqlite3CorruptError(tls, 78118)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -36156,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, 78162)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78166)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -36232,7 +36237,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 78252)
+	return Xsqlite3CorruptError(tls, 78256)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -36246,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, 78259)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78263)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -36380,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, 78363)
+		return Xsqlite3CorruptError(tls, 78367)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -36597,7 +36602,7 @@ 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+64, ts+4062, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4081, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
 		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
@@ -36622,11 +36627,11 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 	defer tls.Free(16)
 
 	if iPage > (*IntegrityCk)(unsafe.Pointer(pCheck)).FnPage || iPage == Pgno(0) {
-		checkAppendMsg(tls, pCheck, ts+4064, libc.VaList(bp, iPage))
+		checkAppendMsg(tls, pCheck, ts+4083, libc.VaList(bp, iPage))
 		return 1
 	}
 	if getPageReferenced(tls, pCheck, iPage) != 0 {
-		checkAppendMsg(tls, pCheck, ts+4087, libc.VaList(bp+8, iPage))
+		checkAppendMsg(tls, pCheck, ts+4106, libc.VaList(bp+8, iPage))
 		return 1
 	}
 	setPageReferenced(tls, pCheck, iPage)
@@ -36644,13 +36649,13 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
 			checkOom(tls, pCheck)
 		}
-		checkAppendMsg(tls, pCheck, ts+4112, libc.VaList(bp, iChild))
+		checkAppendMsg(tls, pCheck, ts+4131, libc.VaList(bp, iChild))
 		return
 	}
 
 	if int32(*(*U8)(unsafe.Pointer(bp + 48))) != int32(eType) || *(*Pgno)(unsafe.Pointer(bp + 52)) != iParent {
 		checkAppendMsg(tls, pCheck,
-			ts+4141,
+			ts+4160,
 			libc.VaList(bp+8, iChild, int32(eType), iParent, int32(*(*U8)(unsafe.Pointer(bp + 48))), *(*Pgno)(unsafe.Pointer(bp + 52))))
 	}
 }
@@ -36669,7 +36674,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 		}
 		N--
 		if Xsqlite3PagerGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpPager, iPage, bp+40, 0) != 0 {
-			checkAppendMsg(tls, pCheck, ts+4195, libc.VaList(bp, iPage))
+			checkAppendMsg(tls, pCheck, ts+4214, libc.VaList(bp, iPage))
 			break
 		}
 		pOvflData = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
@@ -36680,7 +36685,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 			}
 			if n > (*BtShared)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt)).FusableSize/U32(4)-U32(2) {
 				checkAppendMsg(tls, pCheck,
-					ts+4217, libc.VaList(bp+8, iPage))
+					ts+4236, libc.VaList(bp+8, iPage))
 				N--
 			} else {
 				for i = 0; i < int32(n); i++ {
@@ -36703,12 +36708,12 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 	}
 	if N != 0 && nErrAtStart == (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr {
 		checkAppendMsg(tls, pCheck,
-			ts+4256,
+			ts+4275,
 			libc.VaList(bp+16, func() uintptr {
 				if isFreeList != 0 {
-					return ts + 4282
+					return ts + 4301
 				}
-				return ts + 4287
+				return ts + 4306
 			}(),
 				expected-N, expected))
 	}
@@ -36824,13 +36829,13 @@ __2:
 	return 0
 __3:
 	;
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4308
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4327
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
 		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4318, libc.VaList(bp, rc))
+		ts+4337, libc.VaList(bp, rc))
 	goto end_of_check
 __4:
 	;
@@ -36841,7 +36846,7 @@ __4:
 	}
 
 	checkAppendMsg(tls, pCheck,
-		ts+4356, libc.VaList(bp+8, rc))
+		ts+4375, libc.VaList(bp+8, rc))
 	goto end_of_check
 __5:
 	;
@@ -36849,14 +36854,14 @@ __5:
 		goto __6
 	}
 
-	checkAppendMsg(tls, pCheck, ts+4394, libc.VaList(bp+16, rc))
+	checkAppendMsg(tls, pCheck, ts+4413, libc.VaList(bp+16, rc))
 	goto end_of_check
 __6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
 
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4416
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4435
 	contentOffset = U32((int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5))))<<8|int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5) + 1)))-1)&0xffff + 1)
 
 	nCell = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3) + 1)))
@@ -36873,7 +36878,7 @@ __6:
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
 		goto __9
 	}
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4442
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4461
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
 __9:
 	;
@@ -36898,7 +36903,7 @@ __10:
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
 		goto __13
 	}
-	checkAppendMsg(tls, pCheck, ts+4470,
+	checkAppendMsg(tls, pCheck, ts+4489,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
 	goto __11
@@ -36911,7 +36916,7 @@ __13:
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
 		goto __14
 	}
-	checkAppendMsg(tls, pCheck, ts+4500, 0)
+	checkAppendMsg(tls, pCheck, ts+4519, 0)
 	doCoverageCheck = 0
 	goto __11
 __14:
@@ -36927,7 +36932,7 @@ __14:
 	}() != 0) {
 		goto __16
 	}
-	checkAppendMsg(tls, pCheck, ts+4524, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
+	checkAppendMsg(tls, pCheck, ts+4543, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
 __16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
@@ -36965,7 +36970,7 @@ __21:
 	if !(d2 != depth) {
 		goto __22
 	}
-	checkAppendMsg(tls, pCheck, ts+4548, 0)
+	checkAppendMsg(tls, pCheck, ts+4567, 0)
 	depth = d2
 __22:
 	;
@@ -37038,7 +37043,7 @@ __30:
 		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4573, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
+		ts+4592, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
 	goto __31
 	goto __33
 __32:
@@ -37055,7 +37060,7 @@ __31:
 		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4610,
+		ts+4629,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
 __34:
 	;
@@ -37169,7 +37174,7 @@ __6:
 	if !(bCkFreelist != 0) {
 		goto __7
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4662
+	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4681
 	checkList(tls, bp+32, 1, Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+32),
 		Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
@@ -37205,7 +37210,7 @@ __13:
 		goto __15
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4678,
+		ts+4697,
 		libc.VaList(bp, mx, mxInHdr))
 __15:
 	;
@@ -37215,7 +37220,7 @@ __9:
 		goto __16
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4723, 0)
+		ts+4742, 0)
 __16:
 	;
 __10:
@@ -37262,13 +37267,13 @@ __23:
 	if !(getPageReferenced(tls, bp+32, i) == 0 && (ptrmapPageno(tls, pBt, i) != i || !(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0))) {
 		goto __26
 	}
-	checkAppendMsg(tls, bp+32, ts+4778, libc.VaList(bp+16, i))
+	checkAppendMsg(tls, bp+32, ts+4797, libc.VaList(bp+16, i))
 __26:
 	;
 	if !(getPageReferenced(tls, bp+32, i) != 0 && (ptrmapPageno(tls, pBt, i) == i && (*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0)) {
 		goto __27
 	}
-	checkAppendMsg(tls, bp+32, ts+4800, libc.VaList(bp+24, i))
+	checkAppendMsg(tls, bp+32, ts+4819, libc.VaList(bp+24, i))
 __27:
 	;
 	goto __24
@@ -37531,7 +37536,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 		var rc int32 = 0
 		Xsqlite3ParseObjectInit(tls, bp+16, pDb)
 		if Xsqlite3OpenTempDatabase(tls, bp+16) != 0 {
-			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3663, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3682, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 			rc = SQLITE_ERROR
 		}
 		Xsqlite3DbFree(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
@@ -37542,7 +37547,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 	}
 
 	if i < 0 {
-		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4834, libc.VaList(bp+8, zDb))
+		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4853, libc.VaList(bp+8, zDb))
 		return uintptr(0)
 	}
 
@@ -37557,7 +37562,7 @@ func setDestPgsz(tls *libc.TLS, p uintptr) int32 {
 
 func checkReadTransaction(tls *libc.TLS, db uintptr, p uintptr) int32 {
 	if Xsqlite3BtreeTxnState(tls, p) != SQLITE_TXN_NONE {
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4854, 0)
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4873, 0)
 		return SQLITE_ERROR
 	}
 	return SQLITE_OK
@@ -37577,7 +37582,7 @@ func Xsqlite3_backup_init(tls *libc.TLS, pDestDb uintptr, zDestDb uintptr, pSrcD
 
 	if pSrcDb == pDestDb {
 		Xsqlite3ErrorWithMsg(tls,
-			pDestDb, SQLITE_ERROR, ts+4885, 0)
+			pDestDb, SQLITE_ERROR, ts+4904, 0)
 		p = uintptr(0)
 	} else {
 		p = Xsqlite3MallocZero(tls, uint64(unsafe.Sizeof(Sqlite3_backup{})))
@@ -38026,7 +38031,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 		(*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,
+		Xsqlite3_str_appendf(tls, bp+16, ts+4944,
 			libc.VaList(bp, func() float64 {
 				if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_IntReal != 0 {
 					return float64(*(*I64)(unsafe.Pointer(p)))
@@ -38618,7 +38623,7 @@ func Xsqlite3VdbeMemSetPointer(tls *libc.TLS, pMem uintptr, pPtr uintptr, zPType
 		if zPType != 0 {
 			return zPType
 		}
-		return ts + 1554
+		return ts + 1573
 	}()
 	(*Mem)(unsafe.Pointer(pMem)).Fz = pPtr
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null | MEM_Dyn | MEM_Subtype | MEM_Term)
@@ -38850,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, 81630)
+		return Xsqlite3CorruptError(tls, 81634)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -39082,7 +39087,7 @@ __9:
 		goto __10
 	}
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 8)).FisError
-	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3663, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
+	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3682, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
 	goto __11
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
@@ -39135,7 +39140,7 @@ func valueFromExpr(tls *libc.TLS, db uintptr, pExpr uintptr, enc U8, affinity U8
 	zVal = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	negInt = 1
-	zNeg = ts + 1554
+	zNeg = ts + 1573
 	rc = SQLITE_OK
 
 __1:
@@ -39176,7 +39181,7 @@ __4:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
 	negInt = -1
-	zNeg = ts + 4932
+	zNeg = ts + 4951
 __6:
 	;
 	if !(op == TK_STRING || op == TK_FLOAT || op == TK_INTEGER) {
@@ -39195,7 +39200,7 @@ __9:
 	Xsqlite3VdbeMemSetInt64(tls, *(*uintptr)(unsafe.Pointer(bp + 16)), I64(*(*int32)(unsafe.Pointer(pExpr + 8)))*I64(negInt))
 	goto __11
 __10:
-	zVal = Xsqlite3MPrintf(tls, db, ts+4934, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+	zVal = Xsqlite3MPrintf(tls, db, ts+4953, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	if !(zVal == uintptr(0)) {
 		goto __12
 	}
@@ -39499,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, 82270)
+		return Xsqlite3CorruptError(tls, 82274)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -39514,14 +39519,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 82276)
+			return Xsqlite3CorruptError(tls, 82280)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 82282)
+		return Xsqlite3CorruptError(tls, 82286)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -40529,34 +40534,34 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var j int32
 			var pKeyInfo uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4939, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4958, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
 			for j = 0; j < int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField); j++ {
 				var pColl uintptr = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(j)*8))
 				var zColl uintptr
 				if pColl != 0 {
 					zColl = (*CollSeq)(unsafe.Pointer(pColl)).FzName
 				} else {
-					zColl = ts + 1554
+					zColl = ts + 1573
 				}
-				if libc.Xstrcmp(tls, zColl, ts+1099) == 0 {
-					zColl = ts + 4944
+				if libc.Xstrcmp(tls, zColl, ts+1118) == 0 {
+					zColl = ts + 4963
 				}
-				Xsqlite3_str_appendf(tls, bp+144, ts+4946,
+				Xsqlite3_str_appendf(tls, bp+144, ts+4965,
 					libc.VaList(bp+8, func() uintptr {
 						if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_DESC != 0 {
-							return ts + 4932
+							return ts + 4951
 						}
-						return ts + 1554
+						return ts + 1573
 					}(),
 						func() uintptr {
 							if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_BIGNULL != 0 {
-								return ts + 4954
+								return ts + 4973
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						zColl))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4957, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+4976, 1)
 			break
 
 		}
@@ -40564,7 +40569,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 		{
 			var pColl uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4959, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
+			Xsqlite3_str_appendf(tls, bp+144, ts+4978, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
 				encnames[(*CollSeq)(unsafe.Pointer(pColl)).Fenc]))
 			break
 
@@ -40572,32 +40577,32 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -7:
 		{
 			var pDef uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
-			Xsqlite3_str_appendf(tls, bp+144, ts+4968, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4987, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -15:
 		{
 			var pDef uintptr = (*Sqlite3_context)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpFunc
-			Xsqlite3_str_appendf(tls, bp+144, ts+4968, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4987, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -13:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1334, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1353, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
 	case -3:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+4975, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4994, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
 			break
 
 		}
 	case -12:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1328, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1347, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
@@ -40607,13 +40612,13 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Str != 0 {
 				zP4 = (*Mem)(unsafe.Pointer(pMem)).Fz
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1334, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1353, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1328, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1347, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Null != 0 {
-				zP4 = ts + 1555
+				zP4 = ts + 1574
 			} else {
-				zP4 = ts + 4978
+				zP4 = ts + 4997
 			}
 			break
 
@@ -40621,7 +40626,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -11:
 		{
 			var pVtab uintptr = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-			Xsqlite3_str_appendf(tls, bp+144, ts+4985, libc.VaList(bp+120, pVtab))
+			Xsqlite3_str_appendf(tls, bp+144, ts+5004, libc.VaList(bp+120, pVtab))
 			break
 
 		}
@@ -40632,20 +40637,20 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var n U32 = *(*U32)(unsafe.Pointer(ai))
 
 			for i = U32(1); i <= n; i++ {
-				Xsqlite3_str_appendf(tls, bp+144, ts+4993, libc.VaList(bp+128, func() int32 {
+				Xsqlite3_str_appendf(tls, bp+144, ts+5012, libc.VaList(bp+128, func() int32 {
 					if i == U32(1) {
 						return '['
 					}
 					return ','
 				}(), *(*U32)(unsafe.Pointer(ai + uintptr(i)*4))))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4998, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+5017, 1)
 			break
 
 		}
 	case -4:
 		{
-			zP4 = ts + 5000
+			zP4 = ts + 5019
 			break
 
 		}
@@ -40670,7 +40675,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	return Xsqlite3StrAccumFinish(tls, bp+144)
 }
 
-var encnames = [4]uintptr{ts + 5008, ts + 5010, ts + 5012, ts + 5017}
+var encnames = [4]uintptr{ts + 5027, ts + 5029, ts + 5031, ts + 5036}
 
 // Declare to the Vdbe that the BTree object at db->aDb[i] is used.
 //
@@ -41120,8 +41125,8 @@ func Xsqlite3VdbeMakeReady(tls *libc.TLS, p uintptr, pParse uintptr) {
 }
 
 var azColName = [12]uintptr{
-	ts + 5022, ts + 5027, ts + 5034, ts + 5037, ts + 5040, ts + 5043, ts + 5046, ts + 5049,
-	ts + 5057, ts + 5060, ts + 5067, ts + 5075,
+	ts + 5041, ts + 5046, ts + 5053, ts + 5056, ts + 5059, ts + 5062, ts + 5065, ts + 5068,
+	ts + 5076, ts + 5079, ts + 5086, ts + 5094,
 }
 
 // Close a VDBE cursor and release all the resources that cursor
@@ -41330,7 +41335,7 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		var nMainFile int32
 
 		nMainFile = Xsqlite3Strlen30(tls, zMainFile)
-		zSuper = Xsqlite3MPrintf(tls, db, ts+5082, libc.VaList(bp, 0, zMainFile, 0))
+		zSuper = Xsqlite3MPrintf(tls, db, ts+5101, libc.VaList(bp, 0, zMainFile, 0))
 		if zSuper == uintptr(0) {
 			return SQLITE_NOMEM
 		}
@@ -41338,16 +41343,16 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		for __ccgo := true; __ccgo; __ccgo = rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 60)) != 0 {
 			if retryCount != 0 {
 				if retryCount > 100 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5094, libc.VaList(bp+24, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5113, libc.VaList(bp+24, zSuper))
 					Xsqlite3OsDelete(tls, pVfs, zSuper, 0)
 					break
 				} else if retryCount == 1 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5108, libc.VaList(bp+32, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5127, libc.VaList(bp+32, zSuper))
 				}
 			}
 			retryCount++
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
-			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5123,
+			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5142,
 				libc.VaList(bp+40, *(*U32)(unsafe.Pointer(bp + 56))>>8&U32(0xffffff), *(*U32)(unsafe.Pointer(bp + 56))&U32(0xff)))
 
 			rc = Xsqlite3OsAccess(tls, pVfs, zSuper, SQLITE_ACCESS_EXISTS, bp+60)
@@ -41493,7 +41498,7 @@ func Xsqlite3VdbeCheckFk(tls *libc.TLS, p uintptr, deferred int32) int32 {
 		!(deferred != 0) && (*Vdbe)(unsafe.Pointer(p)).FnFkConstraint > int64(0) {
 		(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_CONSTRAINT | int32(3)<<8
 		(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
-		Xsqlite3VdbeError(tls, p, ts+5136, 0)
+		Xsqlite3VdbeError(tls, p, ts+5155, 0)
 		if int32((*Vdbe)(unsafe.Pointer(p)).FprepFlags)&SQLITE_PREPARE_SAVESQL == 0 {
 			return SQLITE_ERROR
 		}
@@ -41825,7 +41830,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 86058)
+		return Xsqlite3CorruptError(tls, 86062)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -42376,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, 86985))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86989))
 		return 0
 	}
 
@@ -42441,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, 87062))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87066))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -42475,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, 87092))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87096))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -42525,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, 87136))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87140))
 			return 0
 		}
 	}
@@ -42671,7 +42676,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87303))
 	return 0
 __7:
 	;
@@ -42842,7 +42847,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87457)
+	return Xsqlite3CorruptError(tls, 87461)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42868,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, 87490)
+		return Xsqlite3CorruptError(tls, 87494)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -42979,13 +42984,13 @@ func Xsqlite3NotPureFunc(tls *libc.TLS, pCtx uintptr) int32 {
 		var zContext uintptr
 		var zMsg uintptr
 		if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_IsCheck != 0 {
-			zContext = ts + 5166
-		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5185
-		} else {
+		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5204
+		} else {
+			zContext = ts + 5223
 		}
-		zMsg = Xsqlite3_mprintf(tls, ts+5213,
+		zMsg = Xsqlite3_mprintf(tls, ts+5232,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx)).FpFunc)).FzName, zContext))
 		Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 		Xsqlite3_free(tls, zMsg)
@@ -43090,7 +43095,7 @@ func Xsqlite3_expired(tls *libc.TLS, pStmt uintptr) int32 {
 
 func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 	if (*Vdbe)(unsafe.Pointer(p)).Fdb == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5249, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5268, 0)
 		return 1
 	} else {
 		return 0
@@ -43100,7 +43105,7 @@ func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 
 func vdbeSafetyNotNull(tls *libc.TLS, p uintptr) int32 {
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5294, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5313, 0)
 		return 1
 	} else {
 		return vdbeSafety(tls, p)
@@ -43142,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, 87854)
+			return Xsqlite3MisuseError(tls, 87858)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -43565,7 +43570,7 @@ func Xsqlite3_result_error_code(tls *libc.TLS, pCtx uintptr, errCode int32) {
 // Force an SQLITE_TOOBIG error.
 func Xsqlite3_result_error_toobig(tls *libc.TLS, pCtx uintptr) {
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FisError = SQLITE_TOOBIG
-	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5334, int64(-1),
+	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5353, int64(-1),
 		uint8(SQLITE_UTF8), uintptr(0))
 }
 
@@ -43757,7 +43762,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88544)
+		return Xsqlite3MisuseError(tls, 88548)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -44277,15 +44282,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 89208)
+		return Xsqlite3MisuseError(tls, 89212)
 	}
 	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+5357, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 89216)
+			ts+5376, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89220)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -44690,7 +44695,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, 89707)
+	rc = Xsqlite3MisuseError(tls, 89711)
 	goto preupdate_old_out
 __1:
 	;
@@ -44834,7 +44839,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, 89809)
+	rc = Xsqlite3MisuseError(tls, 89813)
 	goto preupdate_new_out
 __1:
 	;
@@ -45006,7 +45011,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+5397, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5416, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -45042,11 +45047,11 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 
 			pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr(*(*int32)(unsafe.Pointer(bp + 84))-1)*56
 			if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Null != 0 {
-				Xsqlite3_str_append(tls, bp+48, ts+1555, 4)
+				Xsqlite3_str_append(tls, bp+48, ts+1574, 4)
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+1334, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+1353, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+4925, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+4944, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Str != 0 {
 				var nOut int32
 				var enc U8 = (*Sqlite3)(unsafe.Pointer(db)).Fenc
@@ -45061,21 +45066,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+5401, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5420, 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+5408, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5427, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5421, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5440, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					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_appendf(tls, bp+48, ts+5443, libc.VaList(bp+40, int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5429, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5448, 1)
 			}
 		}
 	}
@@ -45278,10 +45283,6 @@ func filterHash(tls *libc.TLS, aMem uintptr, pOp uintptr) U64 {
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Real != 0 {
 			h = h + U64(Xsqlite3VdbeIntValue(tls, p))
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&(MEM_Str|MEM_Blob) != 0 {
-			h = h + U64((*Mem)(unsafe.Pointer(p)).Fn)
-			if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Zero != 0 {
-				h = h + U64(*(*int32)(unsafe.Pointer(p)))
-			}
 		}
 	}
 	return h
@@ -45292,11 +45293,11 @@ func vdbeMemTypeName(tls *libc.TLS, pMem uintptr) uintptr {
 }
 
 var azTypes = [5]uintptr{
-	ts + 1115,
-	ts + 1127,
-	ts + 1132,
-	ts + 1110,
-	ts + 1555,
+	ts + 1134,
+	ts + 1146,
+	ts + 1151,
+	ts + 1129,
+	ts + 1574,
 }
 
 // Execute as much of a VDBE program as we can.
@@ -46338,20 +46339,20 @@ __202:
 		goto __205
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5431, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	Xsqlite3VdbeError(tls, p, ts+5450, 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))))
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5471, 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))))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	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))
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5478, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 __204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
@@ -47929,7 +47930,7 @@ op_column_corrupt:
 	goto __9
 	goto __425
 __424:
-	rc = Xsqlite3CorruptError(tls, 93317)
+	rc = Xsqlite3CorruptError(tls, 93320)
 	goto abort_due_to_error
 __425:
 	;
@@ -48057,7 +48058,7 @@ __428:
 	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5483,
+	Xsqlite3VdbeError(tls, p, ts+5502,
 		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
@@ -48489,7 +48490,7 @@ __78:
 		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5524, 0)
+	Xsqlite3VdbeError(tls, p, ts+5543, 0)
 	rc = SQLITE_BUSY
 	goto __523
 __522:
@@ -48549,7 +48550,7 @@ __530:
 	if !!(pSavepoint != 0) {
 		goto __531
 	}
-	Xsqlite3VdbeError(tls, p, ts+5575, libc.VaList(bp+88, zName))
+	Xsqlite3VdbeError(tls, p, ts+5594, libc.VaList(bp+88, zName))
 	rc = SQLITE_ERROR
 	goto __532
 __531:
@@ -48558,7 +48559,7 @@ __531:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5597, 0)
+		ts+5616, 0)
 	rc = SQLITE_BUSY
 	goto __534
 __533:
@@ -48744,7 +48745,7 @@ __564:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5651, 0)
+		ts+5670, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
 	goto __567
@@ -48787,13 +48788,13 @@ __562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5706
+				return ts + 5725
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5754
+					return ts + 5773
 				}
-				return ts + 5797
+				return ts + 5816
 			}()
 		}(), 0)
 
@@ -48876,7 +48877,7 @@ __576:
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5838)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5857)
 
 	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 __583
@@ -49080,7 +49081,7 @@ __88:
 	}
 
 	(*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
+	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1573
 __602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -49689,7 +49690,7 @@ notExistsWithKey:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
 		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95560)
+	rc = Xsqlite3CorruptError(tls, 95563)
 	goto __683
 __682:
 	goto jump_to_p2
@@ -50467,7 +50468,7 @@ __767:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
 		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5866)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96638, ts+5885)
 	goto abort_due_to_error
 __770:
 	;
@@ -50577,7 +50578,7 @@ __780:
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
 		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96840)
+	rc = Xsqlite3CorruptError(tls, 96843)
 	goto abort_due_to_error
 __781:
 	;
@@ -50738,14 +50739,14 @@ __141:
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	goto __799
 __798:
-	zSchema = ts + 5883
+	zSchema = ts + 5902
 	(*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+5897,
+		ts+5916,
 		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 __800
@@ -50771,7 +50772,7 @@ __802:
 		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 97092)
+	rc = Xsqlite3CorruptError(tls, 97095)
 __803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
@@ -50961,7 +50962,7 @@ __820:
 		goto __825
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5940, 0)
+	Xsqlite3VdbeError(tls, p, ts+5959, 0)
 	goto abort_due_to_error
 __825:
 	;
@@ -51273,7 +51274,7 @@ __860:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
 		goto __862
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
 __862:
 	;
@@ -51323,7 +51324,7 @@ __867:
 	if !(rc != 0) {
 		goto __868
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
 __868:
 	;
@@ -51405,12 +51406,12 @@ __876:
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5977,
+		ts+5996,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6029
+				return ts + 6048
 			}
-			return ts + 6034
+			return ts + 6053
 		}()))
 	goto abort_due_to_error
 	goto __879
@@ -51552,7 +51553,7 @@ __171:
 		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6041, libc.VaList(bp+144, z1))
+	Xsqlite3VdbeError(tls, p, ts+6060, libc.VaList(bp+144, z1))
 __894:
 	;
 	goto abort_due_to_error
@@ -51670,7 +51671,7 @@ __904:
 	(*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+6070, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6089, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
 	goto __9
 
 __177:
@@ -51759,7 +51760,7 @@ __912:
 	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)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
 __913:
 	;
@@ -51989,7 +51990,7 @@ __935:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
 		goto __940
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
 __940:
 	;
@@ -52065,7 +52066,7 @@ __945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
 		goto __947
 	}
-	z3 = Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp+168, zTrace))
+	z3 = Xsqlite3MPrintf(tls, db, ts+6099, 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)
@@ -52138,7 +52139,7 @@ __955:
 	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __957
 	}
-	rc = Xsqlite3CorruptError(tls, 99031)
+	rc = Xsqlite3CorruptError(tls, 99034)
 __957:
 	;
 __956:
@@ -52146,13 +52147,13 @@ __956:
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
 		goto __958
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
 __958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
 
-	Xsqlite3_log(tls, rc, ts+6086,
+	Xsqlite3_log(tls, rc, ts+6105,
 		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 __959
@@ -52208,13 +52209,13 @@ __966:
 	return rc
 
 too_big:
-	Xsqlite3VdbeError(tls, p, ts+5334, 0)
+	Xsqlite3VdbeError(tls, p, ts+5353, 0)
 	rc = SQLITE_TOOBIG
 	goto abort_due_to_error
 
 no_mem:
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3VdbeError(tls, p, ts+1490, 0)
+	Xsqlite3VdbeError(tls, p, ts+1509, 0)
 	rc = SQLITE_NOMEM
 	goto abort_due_to_error
 
@@ -52225,8 +52226,8 @@ abort_due_to_interrupt:
 	return int32(0)
 }
 
-var azType = [4]uintptr{ts + 6118, ts + 6127, ts + 6134,
-	ts + 6140}
+var azType = [4]uintptr{ts + 6137, ts + 6146, ts + 6153,
+	ts + 6159}
 var and_logic = [9]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(1), uint8(2), uint8(0), uint8(2), uint8(2)}
 var or_logic = [9]uint8{uint8(0), uint8(1), uint8(2), uint8(1), uint8(1), uint8(1), uint8(2), uint8(1), uint8(2)}
 var aMask = [12]uint8{
@@ -52281,16 +52282,16 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		}
 
 		if type1 < U32(12) {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6152,
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6171,
 				libc.VaList(bp, func() uintptr {
 					if type1 == U32(0) {
-						return ts + 6181
+						return ts + 6200
 					}
 					return func() uintptr {
 						if type1 == U32(7) {
-							return ts + 6186
+							return ts + 6205
 						}
-						return ts + 6191
+						return ts + 6210
 					}()
 				}()))
 			rc = SQLITE_ERROR
@@ -52310,10 +52311,10 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		rc = Xsqlite3_finalize(tls, (*Incrblob)(unsafe.Pointer(p)).FpStmt)
 		(*Incrblob)(unsafe.Pointer(p)).FpStmt = uintptr(0)
 		if rc == SQLITE_OK {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6199, libc.VaList(bp+8, iRow))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6218, libc.VaList(bp+8, iRow))
 			rc = SQLITE_ERROR
 		} else {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3663, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3682, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
 		}
 	}
 
@@ -52373,21 +52374,21 @@ __3:
 		goto __4
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6219, libc.VaList(bp, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6238, libc.VaList(bp, zTable))
 __4:
 	;
 	if !(pTab != 0 && !((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0))) {
 		goto __5
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6249, libc.VaList(bp+8, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6268, libc.VaList(bp+8, zTable))
 __5:
 	;
 	if !(pTab != 0 && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __6
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6285, libc.VaList(bp+16, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6304, libc.VaList(bp+16, zTable))
 __6:
 	;
 	if !!(pTab != 0) {
@@ -52431,7 +52432,7 @@ __11:
 		goto __13
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6325, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52458,7 +52459,7 @@ __19:
 	if !((*sColMap)(unsafe.Pointer(pFKey+64+uintptr(j)*16)).FiFrom == iCol) {
 		goto __22
 	}
-	zFault = ts + 6327
+	zFault = ts + 6346
 __22:
 	;
 	goto __20
@@ -52491,7 +52492,7 @@ __26:
 	if !(int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == iCol || int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == -2) {
 		goto __29
 	}
-	zFault = ts + 6339
+	zFault = ts + 6358
 __29:
 	;
 	goto __27
@@ -52512,7 +52513,7 @@ __25:
 		goto __30
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6366, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52610,7 +52611,7 @@ __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
@@ -52658,7 +52659,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99516)
+		return Xsqlite3MisuseError(tls, 99519)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52741,7 +52742,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99616)
+		return Xsqlite3MisuseError(tls, 99619)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52754,7 +52755,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 				if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-					return ts + 3663
+					return ts + 3682
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
@@ -55283,25 +55284,25 @@ 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 {
+	if Xsqlite3_strnicmp(tls, zTab, ts+6400, 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 {
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6408+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
 			return 1
 		}
 		if pSchema == uintptr(0) {
 			return 0
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5883+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5902+7) == 0 {
 			return 1
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6446+7) == 0 {
 			return 1
 		}
 	} else {
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6446+7) == 0 {
 			return 1
 		}
 	}
@@ -55381,7 +55382,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6441, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6460, zDb) == 0) {
 		goto __8
 	}
 
@@ -55502,7 +55503,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6446) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6465) != 0) {
 		goto __33
 	}
 	goto __14
@@ -55676,14 +55677,14 @@ __60:
 	;
 	goto __59
 __58:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6448, zTab) == 0) {
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6467, zTab) == 0) {
 		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
 	goto __62
 __61:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6452, zTab) == 0) {
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6471, zTab) == 0) {
 		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
@@ -55700,7 +55701,7 @@ __57:
 		goto __64
 	}
 	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6456, zTab) == 0) {
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6475, zTab) == 0) {
 		goto __65
 	}
 	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
@@ -55859,7 +55860,7 @@ __86:
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
 		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6465, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6484, libc.VaList(bp, zAs))
 	return WRC_Abort
 __90:
 	;
@@ -55867,14 +55868,14 @@ __90:
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
 		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6496, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6515, libc.VaList(bp+8, zAs))
 	return WRC_Abort
 __91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
 		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	return WRC_Abort
 __92:
 	;
@@ -55926,7 +55927,7 @@ __11:
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6551, libc.VaList(bp+16, zCol))
+		ts+6570, 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
@@ -55963,7 +55964,7 @@ __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 + 6586
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6605
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
@@ -55976,23 +55977,23 @@ __101:
 __99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6595
+		zErr = ts + 6614
 	} else {
-		zErr = ts + 6610
+		zErr = ts + 6629
 	}
 	if !(zDb != 0) {
 		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6632, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6651, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
 	goto __105
 __104:
 	if !(zTab != 0) {
 		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp+56, zErr, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6664, libc.VaList(bp+56, zErr, zTab, zCol))
 	goto __107
 __106:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+80, zErr, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6674, libc.VaList(bp+80, zErr, zCol))
 __107:
 	;
 __105:
@@ -56095,15 +56096,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 + 6662
+	var zIn uintptr = ts + 6681
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6690
+		zIn = ts + 6709
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6708
+		zIn = ts + 6727
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6726
+		zIn = ts + 6745
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6744, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6763, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -56181,14 +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 + 6764
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
-				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
-				}
-				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
+				*(*int32)(unsafe.Pointer(pExpr + 8)) = libc.Bool32(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL)
+				*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IntValue)
+				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_INTEGER)
+
 				i = 0
 				p = pNC
 			__4:
@@ -56232,7 +56229,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+6775, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6783, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -56296,7 +56293,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+6792, libc.VaList(bp, pExpr))
+								ts+6800, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -56312,7 +56309,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+6856,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6864,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -56326,7 +56323,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+6892, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6900, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -56349,30 +56346,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+6920, libc.VaList(bp+16, pExpr))
+						ts+6928, 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 + 6963
+						zType = ts + 6971
 					} else {
-						zType = ts + 6970
+						zType = ts + 6978
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6980, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6988, 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+7008, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7016, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7030,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7038,
 						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+7074,
+						ts+7082,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -56444,15 +56441,15 @@ 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+7122, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7130, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
 
 				if nRef != (*NameContext)(unsafe.Pointer(pNC)).FnRef {
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_VarSelect)
-					*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_VarSelect
 				}
+				*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_Subquery
 			}
 			break
 
@@ -56460,7 +56457,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+7133, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7141, pExpr, pExpr)
 			}
 
 			break
@@ -56516,7 +56513,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+6533, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -56591,7 +56588,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7144, libc.VaList(bp, i, zType, mx))
+		ts+7152, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -56611,7 +56608,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+7200, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7208, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -56646,7 +56643,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+7234, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7242, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -56703,7 +56700,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+7240, libc.VaList(bp, i+1))
+				ts+7248, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -56731,7 +56728,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+7301, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7309, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -56945,7 +56942,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+7332, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7340, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -56985,7 +56982,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+7234) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7242) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -56996,7 +56993,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7371) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7379) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -57008,7 +57005,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+7377, 0)
+						ts+7385, 0)
 					return WRC_Abort
 				}
 
@@ -57797,7 +57794,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 		return
 	}
 
@@ -57872,7 +57869,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+7436, libc.VaList(bp, mxHeight))
+			ts+7444, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -58121,12 +58118,12 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7484,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7492,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7528
+						return ts + 7536
 					}
-					return ts + 1554
+					return ts + 1573
 				}(), nElem))
 			break
 		}
@@ -58165,7 +58162,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+7530)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -58191,7 +58188,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+7532, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7540, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -58219,7 +58216,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+7566, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7574, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -58266,7 +58263,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+7586,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7594,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -58291,7 +58288,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+7629, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7637, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -58866,7 +58863,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+7652,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7660,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -58989,7 +58986,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+7682, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7690, libc.VaList(bp, zObject))
 	}
 }
 
@@ -59045,10 +59042,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+6764) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7713) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6769) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7718) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -59478,13 +59475,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+7705) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7724) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7713) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7732) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7719) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7738) == 0 {
 		return 1
 	}
 	return 0
@@ -59688,7 +59685,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+7723, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7742, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -59766,7 +59763,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+7770, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7789, 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)
 
@@ -59860,7 +59857,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 + 7801
+		var zFmt uintptr = ts + 7820
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -59878,7 +59875,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+6533, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	}
 }
 
@@ -59919,7 +59916,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+7845, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7864, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -59949,11 +59946,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+7868, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7887, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
-				return ts + 1554
+				return ts + 1573
 			}
-			return ts + 7887
+			return ts + 7906
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -60080,7 +60077,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+7899, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7918, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -60095,11 +60092,11 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7917, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7936, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
-			return ts + 1554
+			return ts + 1573
 		}
-		return ts + 7887
+		return ts + 7906
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
@@ -60122,7 +60119,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+7530)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = uint8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -60131,7 +60128,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+7938)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7957)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -60517,13 +60514,13 @@ 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+7940, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7943,
+			if Xsqlite3_strnicmp(tls, z, ts+7959, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7962,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
-							return ts + 4932
+							return ts + 4951
 						}
-						return ts + 1554
+						return ts + 1573
 					}(), pExpr))
 			} else {
 				codeReal(tls, v, z, negFlag, iMem)
@@ -60560,6 +60557,7 @@ func Xsqlite3ExprCodeLoadIndexColumn(tls *libc.TLS, pParse uintptr, pIdx uintptr
 func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr, pCol uintptr, regOut int32) {
 	var iAddr int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
+	var nErr int32 = (*Parse)(unsafe.Pointer(pParse)).FnErr
 
 	if (*Parse)(unsafe.Pointer(pParse)).FiSelfTab > 0 {
 		iAddr = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Parse)(unsafe.Pointer(pParse)).FiSelfTab-1, 0, regOut)
@@ -60573,6 +60571,9 @@ func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr
 	if iAddr != 0 {
 		Xsqlite3VdbeJumpHere(tls, v, iAddr)
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr > nErr {
+		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FerrByteOffset = -1
+	}
 }
 
 // Generate code to extract the value of the iCol-th column of a table.
@@ -60594,7 +60595,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+7970,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7989,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -60767,8 +60768,8 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8000, ts + 8005, ts + 8010, ts + 6191,
-				ts + 6186, ts + 8018}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8019, ts + 8024, ts + 8029, ts + 6210,
+				ts + 6205, ts + 8037}
 			var aff uint8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
@@ -60776,7 +60777,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 8026
+						return ts + 8045
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -60791,6 +60792,7 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 	var p uintptr
 	var v uintptr
 	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+		var exprAff U8
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -60804,6 +60806,14 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 		if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr, iDataCur) != 0 {
 			continue
 		}
+
+		exprAff = Xsqlite3ExprAffinity(tls, pExpr)
+		if int32(exprAff) <= SQLITE_AFF_BLOB && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_BLOB ||
+			int32(exprAff) == SQLITE_AFF_TEXT && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_TEXT ||
+			int32(exprAff) >= SQLITE_AFF_NUMERIC && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_NUMERIC {
+			continue
+		}
+
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 
 		if (*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow != 0 {
@@ -61143,7 +61153,7 @@ __73:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
 		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7970,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7989,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
 __76:
@@ -61376,7 +61386,7 @@ __43:
 		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+8031, libc.VaList(bp+8, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8050, libc.VaList(bp+8, pExpr))
 	goto __91
 __90:
 	return func() int32 {
@@ -61417,7 +61427,7 @@ __93:
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
 		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8058, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8077, libc.VaList(bp+16, pExpr))
 	goto __5
 __94:
 	;
@@ -61577,7 +61587,7 @@ __121:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
 		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7660,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
 __122:
 	;
@@ -61599,11 +61609,10 @@ __49:
 	return target
 
 __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) {
+	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) {
 		goto __123
 	}
+
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
 		goto __125
@@ -61643,7 +61652,7 @@ __126:
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	goto __5
 
 __55:
@@ -61674,13 +61683,19 @@ __129:
 	;
 __127:
 	;
-	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
+	addrINR = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable, 0, target)
 
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = U8(0)
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = okConstFactor
+	if !(inReg != target) {
+		goto __130
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
+	inReg = target
+__130:
+	;
 	Xsqlite3VdbeJumpHere(tls, v, addrINR)
-	Xsqlite3VdbeChangeP3(tls, v, addrINR, inReg)
 	goto __5
 
 __56:
@@ -61693,15 +61708,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __130
+		goto __131
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __131
+		goto __132
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__131:
+__132:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -61711,22 +61726,22 @@ __131:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__130:
+__131:
 	;
 	i1 = 0
-__132:
+__133:
 	if !(i1 < nExpr-1) {
-		goto __134
+		goto __135
 	}
 	if !(pX != 0) {
-		goto __135
+		goto __136
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __136
-__135:
-	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+	goto __137
 __136:
+	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+__137:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -61735,21 +61750,21 @@ __136:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __133
-__133:
-	i1 = i1 + 2
-	goto __132
 	goto __134
 __134:
+	i1 = i1 + 2
+	goto __133
+	goto __135
+__135:
 	;
 	if !(nExpr&1 != 0) {
-		goto __137
+		goto __138
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __138
-__137:
-	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+	goto __139
 __138:
+	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+__139:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -61759,27 +61774,27 @@ __138:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __139
-	}
-	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8082, 0)
-	return 0
-__139:
-	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __140
 	}
-	Xsqlite3MayAbort(tls, pParse)
+	Xsqlite3ErrorMsg(tls, pParse,
+		ts+8101, 0)
+	return 0
 __140:
 	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __141
 	}
+	Xsqlite3MayAbort(tls, pParse)
+__141:
+	;
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+		goto __142
+	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __142
-__141:
+	goto __143
+__142:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -61788,7 +61803,7 @@ __141:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__142:
+__143:
 	;
 	goto __5
 
@@ -61799,7 +61814,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[10]uint8)(unsafe.Pointer(ts + 8132))
+var zAff = *(*[10]uint8)(unsafe.Pointer(ts + 8151))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -63588,11 +63603,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+6381, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 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+8142, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8161, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -63604,13 +63619,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8170,
+		ts+8189,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8345,
+			ts+8364,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -63620,10 +63635,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8519, libc.VaList(bp, zDb, zDb))
+		ts+8538, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8666, 0)
+			ts+8685, 0)
 	}
 }
 
@@ -63687,7 +63702,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8817, libc.VaList(bp, zName))
+		ts+8836, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -63697,7 +63712,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8876, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8895, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -63706,7 +63721,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8882, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8901, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -63747,19 +63762,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8909, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8928, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9093,
+		ts+9112,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9398, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9417, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9414,
+		ts+9433,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -63767,7 +63782,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9472, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9491, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -63779,7 +63794,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9737, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9756, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63791,7 +63806,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9750,
+		ts+9769,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -63837,12 +63852,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9788, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9807, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9820, 0)
+			ts+9839, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -63852,11 +63867,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+9847)
+				ts+9866)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9906)
+				ts+9925)
 		}
 
 		if pDflt != 0 {
@@ -63869,12 +63884,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9959)
+					ts+9978)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10005)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10024)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -63885,7 +63900,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10032,
+			ts+10051,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -63907,7 +63922,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+10178,
+				ts+10197,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -63955,14 +63970,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10408, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10427, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10442, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10461, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -63990,7 +64005,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+10472, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10491, 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
 	}
@@ -64030,18 +64045,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 + 10491
+		zType = ts + 10510
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10496
+		zType = ts + 10515
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10510,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10529,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10528
+					return ts + 10547
 				}
-				return ts + 10545
+				return ts + 10564
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -64125,11 +64140,11 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10582, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1554, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1573, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iSchema == 1))
 
 	Xsqlite3MayAbort(tls, pParse)
@@ -64142,17 +64157,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10584,
+		ts+10603,
 		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+10766,
+		ts+10785,
 		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+9737, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9756, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -64410,12 +64425,12 @@ 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+10897,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10916,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*uint8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10920
+				return ts + 10939
 			}
-			return ts + 1554
+			return ts + 1573
 		}(), zWhen,
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg))
 	Xsqlite3_result_error(tls, pCtx, zErr, -1)
@@ -64455,8 +64470,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+10922, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 113494)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10941, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113516)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -64473,7 +64488,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, 113505)
+		rc = Xsqlite3CorruptError(tls, 113527)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -64495,7 +64510,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+10930, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10949, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -64535,12 +64550,12 @@ 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+10936, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10955, 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 + 10920
+							return ts + 10939
 						}
-						return ts + 1554
+						return ts + 1573
 					}()))
 				zReplace = zBuf2
 				nReplace = U32(Xsqlite3Strlen30(tls, zReplace))
@@ -65026,7 +65041,7 @@ __45:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FzErrMsg != 0) {
 		goto __47
 	}
-	renameColumnParseError(tls, context, ts+1554, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
+	renameColumnParseError(tls, context, ts+1573, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
 	goto __48
 __47:
 	Xsqlite3_result_error_code(tls, context, rc)
@@ -65191,7 +65206,7 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 			if rc == SQLITE_ERROR && Xsqlite3WritableSchema(tls, db) != 0 {
 				Xsqlite3_result_value(tls, context, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 			} else if (*Parse)(unsafe.Pointer(bp+80)).FzErrMsg != 0 {
-				renameColumnParseError(tls, context, ts+1554, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
+				renameColumnParseError(tls, context, ts+1573, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
 			} else {
 				Xsqlite3_result_error_code(tls, context, rc)
 			}
@@ -65394,7 +65409,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 114441)
+	rc = Xsqlite3CorruptError(tls, 114463)
 	goto drop_column_done
 __2:
 	;
@@ -65418,7 +65433,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10941, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10960, 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)
 
@@ -65499,19 +65514,19 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10582, 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+10948,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10967,
 		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 + 10976
+				return ts + 10995
 			}
-			return ts + 6127
+			return ts + 6146
 		}(),
 			zCol))
 	goto exit_drop_column
@@ -65520,7 +65535,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10988, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11007, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -65534,13 +65549,13 @@ __8:
 	goto exit_drop_column
 __9:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1554, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1573, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11036, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11055, 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+11157, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11176, 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
@@ -65658,11 +65673,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 + 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}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11194},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11215},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11235},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11254},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11273}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -65696,7 +65711,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+11277, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11296, 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)
 			}
@@ -65705,10 +65720,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+11300,
+					ts+11319,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11330, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11349, 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)
 			}
@@ -65726,9 +65741,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11348, FzCols: ts + 11361},
-	{FzName: ts + 11374, FzCols: ts + 11387},
-	{FzName: ts + 11415},
+	{FzName: ts + 11367, FzCols: ts + 11380},
+	{FzName: ts + 11393, FzCols: ts + 11406},
+	{FzName: ts + 11434},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65918,7 +65933,7 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11428}
+	FzName:     ts + 11447}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
@@ -66169,7 +66184,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11438}
+	FzName:     ts + 11457}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -66183,7 +66198,7 @@ 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+11448,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11467,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
 					return (*StatAccum)(unsafe.Pointer(p)).FnEst
@@ -66196,7 +66211,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11453, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11472, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -66238,7 +66253,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+11459, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11478, 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--
@@ -66252,7 +66267,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11465}
+	FzName:     ts + 11484}
 
 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)
@@ -66296,7 +66311,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+11474, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11493, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -66313,7 +66328,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+11348, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11367, 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)
@@ -66469,7 +66484,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+11484, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11503, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -66526,7 +66541,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+11484, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11503, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -66573,9 +66588,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+11488)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11507)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11492)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11511)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -66658,7 +66673,7 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 	var v TRowcnt
 
 	if z == uintptr(0) {
-		z = ts + 1554
+		z = ts + 1573
 	}
 	for i = 0; *(*uint8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
 		v = uint64(0)
@@ -66680,15 +66695,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+11496, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11515, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11507, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11526, 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+11517, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11536, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*uint8)(unsafe.Pointer(z))) != 0 && int32(*(*uint8)(unsafe.Pointer(z))) != ' ' {
@@ -66964,11 +66979,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+11374, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11393, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11529,
-			ts+11583,
+			ts+11548,
+			ts+11602,
 			zDb)
 	}
 	return rc
@@ -67015,10 +67030,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+11348, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11367, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11635, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11654, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -67076,7 +67091,7 @@ 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+6441, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6460, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -67109,13 +67124,13 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zFile == uintptr(0)) {
 		goto __1
 	}
-	zFile = ts + 1554
+	zFile = ts + 1573
 __1:
 	;
 	if !(zName == uintptr(0)) {
 		goto __2
 	}
-	zName = ts + 1554
+	zName = ts + 1573
 __2:
 	;
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2)) != 0) {
@@ -67123,14 +67138,14 @@ __2:
 	}
 
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3835)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3854)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11676, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11695, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
 	if !(rc == SQLITE_OK) {
 		goto __6
 	}
@@ -67167,7 +67182,7 @@ __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11679,
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11698,
 		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
@@ -67181,7 +67196,7 @@ __12:
 	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __15
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11716, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11735, libc.VaList(bp+8, zName))
 	goto attach_error
 __15:
 	;
@@ -67245,7 +67260,7 @@ __4:
 		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11746, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11765, 0)
 	goto __23
 __22:
 	if !(rc == SQLITE_OK) {
@@ -67262,7 +67277,7 @@ __25:
 		goto __27
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
-		ts+11775, 0)
+		ts+11794, 0)
 	rc = SQLITE_ERROR
 __27:
 	;
@@ -67328,13 +67343,13 @@ __33:
 	}
 	Xsqlite3OomFault(tls, db)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1509, 0)
 	goto __35
 __34:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
 		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11843, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11862, libc.VaList(bp+16, zFile))
 __36:
 	;
 __35:
@@ -67381,7 +67396,7 @@ func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zName == uintptr(0)) {
 		goto __1
 	}
-	zName = ts + 1554
+	zName = ts + 1573
 __1:
 	;
 	i = 0
@@ -67412,14 +67427,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11871, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11890, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11892, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11911, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -67427,7 +67442,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11918, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11937, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -67544,7 +67559,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11940}
+	FzName:     ts + 11959}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -67557,7 +67572,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11954}
+	FzName:     ts + 11973}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -67571,7 +67586,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+11968, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11987, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -67603,7 +67618,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+11992,
+						ts+12011,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -67778,7 +67793,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+12038, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12057, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -67804,11 +67819,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+12061, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12080, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12067, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12086, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12073, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12092, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -67855,7 +67870,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 + 7713
+		zCol = ts + 7732
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -67879,7 +67894,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+12100, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12119, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -68150,25 +68165,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6441) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6460) == 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+6381, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
 			if i == 1 {
-				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 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5902+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+6389)
+						ts+6408)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+5883)
+						ts+5902)
 				}
 			}
 		}
@@ -68189,12 +68204,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		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 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5902)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+6389)
+					ts+6408)
 			}
 		}
 	}
@@ -68225,7 +68240,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+12115, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12134, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -68243,14 +68258,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 + 12123
+			zMsg = ts + 12142
 		} else {
-			zMsg = ts + 12136
+			zMsg = ts + 12155
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6664, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6674, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -68280,12 +68295,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+6381, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
-			return ts + 6427
+	if Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5902+7) == 0 {
+			return ts + 6446
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6389+7) == 0 {
-			return ts + 6408
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 {
+			return ts + 6427
 		}
 	}
 	return zName
@@ -68643,7 +68658,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+5883)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5902)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -68669,7 +68684,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6441, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6460, zName) {
 				goto __3
 			}
 
@@ -68722,13 +68737,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+12150, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12169, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12167, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12186, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -68766,13 +68781,13 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 		if Xsqlite3_stricmp(tls, zType, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit))) != 0 ||
 			Xsqlite3_stricmp(tls, zName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 1*8))) != 0 ||
 			Xsqlite3_stricmp(tls, zTblName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 2*8))) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1554, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1573, 0)
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6381, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6400, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12187,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12206,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -68932,9 +68947,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -68950,7 +68965,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12229, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12248, 0)
 	return
 __4:
 	;
@@ -68978,9 +68993,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10491
+			return ts + 10510
 		}
-		return ts + 8876
+		return ts + 8895
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -68996,9 +69011,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -69029,12 +69044,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12270,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12289,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10491
+				return ts + 10510
 			}
-			return ts + 8876
+			return ts + 8895
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -69049,7 +69064,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12291, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12310, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -69136,7 +69151,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+12326, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12345, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -69160,7 +69175,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+12343, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12362, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -69180,7 +69195,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 + 12326
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12345
 	(*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)
@@ -69192,7 +69207,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+12326, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12345, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -69226,7 +69241,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+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12396, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -69234,13 +69249,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+12400, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12419, 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+12407, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12426, 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--
@@ -69277,7 +69292,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+12417, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12436, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -69441,10 +69456,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+12443,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12462,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12488, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12507, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -69475,7 +69490,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+12529, 0)
+			ts+12548, 0)
 	}
 }
 
@@ -69520,7 +69535,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12581, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12600, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -69609,7 +69624,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12622, 0)
+		ts+12641, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -69704,7 +69719,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12678, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12697, 0)
 	goto generated_done
 __2:
 	;
@@ -69717,13 +69732,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12721, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12740, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12729, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12748, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -69757,13 +69772,19 @@ __10:
 
 	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
 __11:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_RAISE) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = (*Column)(unsafe.Pointer(pCol)).Faffinity
+__12:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12736,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12755,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -69884,13 +69905,13 @@ __3:
 	;
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
-		zSep = ts + 1554
-		zSep2 = ts + 12767
-		zEnd = ts + 4957
+		zSep = ts + 1573
+		zSep2 = ts + 12786
+		zEnd = ts + 4976
 	} else {
-		zSep = ts + 12769
-		zSep2 = ts + 12773
-		zEnd = ts + 12778
+		zSep = ts + 12788
+		zSep2 = ts + 12792
+		zEnd = ts + 12797
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -69898,7 +69919,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12781, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12800, 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('(')
@@ -69932,17 +69953,17 @@ __5:
 	goto __6
 __6:
 	;
-	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3663, libc.VaList(bp, zEnd))
+	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3682, libc.VaList(bp, zEnd))
 	return zStmt
 }
 
 var azType1 = [6]uintptr{
-	ts + 1554,
-	ts + 12795,
-	ts + 12801,
-	ts + 12806,
-	ts + 12811,
-	ts + 12801,
+	ts + 1573,
+	ts + 12814,
+	ts + 12820,
+	ts + 12825,
+	ts + 12830,
+	ts + 12820,
 }
 
 func resizeIndexObject(tls *libc.TLS, db uintptr, pIdx uintptr, N int32) int32 {
@@ -70332,7 +70353,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
 		if pSelect != 0 || !(int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM) && (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1554, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1573, 0)
 			return
 		}
 		(*Table)(unsafe.Pointer(p)).Ftnum = (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum
@@ -70349,10 +70370,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+12817,
-						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1554)))
+						ts+12836,
+						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1573)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12850,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12869,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -70371,11 +70392,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+12877, 0)
+				ts+12896, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12927, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12946, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -70409,7 +70430,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12959, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12978, 0)
 			return
 		}
 	}
@@ -70434,11 +70455,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 + 8876
-			zType2 = ts + 13003
+			zType = ts + 8895
+			zType2 = ts + 13022
 		} else {
-			zType = ts + 10491
-			zType2 = ts + 13009
+			zType = ts + 10510
+			zType2 = ts + 13028
 		}
 
 		if pSelect != 0 {
@@ -70509,11 +70530,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+13014, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13033, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13029,
+			ts+13048,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -70529,13 +70550,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+13127,
+					ts+13146,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13169, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13188, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -70550,7 +70571,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+9398) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9417) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -70580,7 +70601,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+13203, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13222, 0)
 	goto create_view_fail
 __1:
 	;
@@ -70596,7 +70617,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10491, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10510, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -70678,7 +70699,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13239, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13258, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -70803,13 +70824,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+13269, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13288, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13284,
+		ts+13303,
 		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)
 }
@@ -70850,10 +70871,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+13351, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]uint8{})), bp+40, ts+13370, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11300,
+				ts+11319,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -70885,12 +70906,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+13365,
+			ts+13384,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13410,
+		ts+13429,
 		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)
@@ -70918,11 +70939,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+6381, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3286, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3305, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7133, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7141, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -71000,9 +71021,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -71061,21 +71082,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13477, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13496, 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+13505, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13524, 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+13539, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13558, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -71087,7 +71108,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11492, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11511, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -71151,7 +71172,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13571,
+		ts+13590,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -71163,7 +71184,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13634, 0)
+		ts+13653, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -71248,7 +71269,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13728,
+		ts+13747,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -71475,12 +71496,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+13774,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13793,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13802
+							return ts + 13821
 						}
-						return ts + 13808
+						return ts + 13827
 					}()))
 				return 1
 			}
@@ -71601,7 +71622,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13813, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13832, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -71620,7 +71641,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13819,
+		ts+13838,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -71646,26 +71667,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13869, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13888, 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+13897, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13916, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13922, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13941, 0)
 	goto exit_create_index
 __17:
 	;
@@ -71679,7 +71700,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13813, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13832, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -71694,7 +71715,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13956, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13975, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -71706,7 +71727,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13990, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14009, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -71735,7 +71756,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14014, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14033, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -71756,9 +71777,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -71797,7 +71818,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13813)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13832)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -71898,7 +71919,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14037, 0)
+		ts+14056, 0)
 	goto exit_create_index
 __56:
 	;
@@ -72115,7 +72136,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14098, libc.VaList(bp+48, 0))
+		ts+14117, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -72167,8 +72188,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14140, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14159, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121859)
 	goto exit_create_index
 __101:
 	;
@@ -72214,12 +72235,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14157,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14176,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
-				return ts + 1554
+				return ts + 1573
 			}
-			return ts + 14177
+			return ts + 14196
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -72227,7 +72248,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14185,
+		ts+14204,
 		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,
@@ -72241,7 +72262,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14244, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14263, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -72402,7 +72423,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14271, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14290, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -72417,7 +72438,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14289, libc.VaList(bp+8, 0))
+		ts+14308, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -72428,9 +72449,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -72456,9 +72477,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14362,
+		ts+14381,
 		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+11488, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11507, (*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)
@@ -72593,7 +72614,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+14422,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14441,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -72801,12 +72822,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+14458,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14477,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14494
+				return ts + 14513
 			}
-			return ts + 14497
+			return ts + 14516
 		}()))
 	goto append_from_error
 __1:
@@ -72975,7 +72996,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14503, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14522, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -73011,9 +73032,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14509
+				return ts + 14528
 			}
-			return ts + 14518
+			return ts + 14537
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -73038,7 +73059,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14503, ts + 14525, ts + 14509}
+var az = [3]uintptr{ts + 14522, ts + 14544, ts + 14528}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -73053,7 +73074,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+14533, 0)
+				ts+14552, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -73190,17 +73211,17 @@ 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+14603, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14622, 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+14614, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14633, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
-			Xsqlite3_str_append(tls, bp+8, ts+1567, 1)
+			Xsqlite3_str_append(tls, bp+8, ts+1586, 1)
 			Xsqlite3_str_appendall(tls, bp+8, zCol)
 		}
 	}
@@ -73223,11 +73244,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+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12080, 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+14617, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14636, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -73357,7 +73378,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14626, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14645, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -73453,7 +73474,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+14672, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14691, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -73646,7 +73667,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14702, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14721, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -73926,7 +73947,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+14733,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14752,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -73958,11 +73979,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+14766, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14785, 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+14795, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14814, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -74213,7 +74234,7 @@ __20:
 	goto __16
 __15:
 	wcf = U16(WHERE_ONEPASS_DESIRED | WHERE_DUPLICATES_OK)
-	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_VarSelect != 0) {
+	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_Subquery != 0) {
 		goto __23
 	}
 	bComplex = 1
@@ -74466,7 +74487,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14833)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14852)
 __62:
 	;
 delete_from_cleanup:
@@ -74581,7 +74602,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+11348) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11367) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -74811,7 +74832,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 + 8005, ts + 8000, ts + 6181}
+var azType2 = [5]uintptr{ts + 6210, ts + 6205, ts + 8024, ts + 8019, ts + 6200}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -74870,7 +74891,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+14846, -1)
+					Xsqlite3_result_error(tls, context, ts+14865, -1)
 					return
 				}
 				iVal = -iVal
@@ -75174,7 +75195,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14863, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14882, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -75520,7 +75541,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+14868, -1)
+		Xsqlite3_result_error(tls, context, ts+14887, -1)
 		return
 	}
 	if argc == 3 {
@@ -75530,7 +75551,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+14901, -1)
+				ts+14920, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -75583,7 +75604,7 @@ func errlogFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	_ = argc
 	_ = context
-	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3663, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
+	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3682, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
 }
 
 func compileoptionusedFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
@@ -75623,13 +75644,13 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 
 			var zVal uintptr
 			r1 = Xsqlite3_value_double(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+4925, libc.VaList(bp, r1))
+			Xsqlite3_str_appendf(tls, pStr, ts+4944, libc.VaList(bp, r1))
 			zVal = Xsqlite3_str_value(tls, pStr)
 			if zVal != 0 {
 				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+14946, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14965, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -75637,7 +75658,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 		}
 	case SQLITE_INTEGER:
 		{
-			Xsqlite3_str_appendf(tls, pStr, ts+1334, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
+			Xsqlite3_str_appendf(tls, pStr, ts+1353, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
 			break
 
 		}
@@ -75666,13 +75687,13 @@ 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+14953, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14972, libc.VaList(bp+24, zArg))
 			break
 
 		}
 	default:
 		{
-			Xsqlite3_str_append(tls, pStr, ts+1555, 4)
+			Xsqlite3_str_append(tls, pStr, ts+1574, 4)
 			break
 
 		}
@@ -75813,7 +75834,7 @@ func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 	var ch U32
 	var c U8
 	var d U8
-	zPass = ts + 1554
+	zPass = ts + 1573
 	nPass = 0
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -76095,7 +76116,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10920}
+var azOne = [1]uintptr{ts + 10939}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -76107,7 +76128,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	zIn = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	if zIn == uintptr(0) {
-		zIn = ts + 1554
+		zIn = ts + 1573
 	}
 	for i = 0; *(*U8)(unsafe.Pointer(zIn + uintptr(i))) != 0 && !(int32(Xsqlite3CtypeMap[*(*U8)(unsafe.Pointer(zIn + uintptr(i)))])&0x02 != 0); i++ {
 	}
@@ -76131,7 +76152,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+14956, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14975, 4, uintptr(0))
 	}
 }
 
@@ -76156,7 +76177,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+12100, -1)
+		Xsqlite3_result_error(tls, context, ts+12119, -1)
 		return
 	}
 
@@ -76234,7 +76255,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+14846, -1)
+			Xsqlite3_result_error(tls, context, ts+14865, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -76496,7 +76517,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+14961, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14980, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -76516,14 +76537,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14967, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14986, 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+14967, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14986, 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+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)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14986, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14986, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -76764,109 +76785,109 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 }
 
 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 + 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(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(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 + 14991},
+	{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 + 15011},
+	{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 + 15024},
+	{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 + 15042},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15051},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15059},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15059},
+	{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_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15100},
+	{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 + 15125},
+	{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 + 15134},
+	{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 + 15145},
+	{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 + 15152},
+	{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 + 15166},
+	{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 + 15166},
+	{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 + 15172},
+	{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 + 15172},
+	{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 + 15178},
+	{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 + 15178},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15183},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15183},
+	{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 + 15183},
+	{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 + 15187},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15187},
+	{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 + 15187},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15191},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15198},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15206},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15213},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15219},
+	{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 + 15233},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15241},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15246},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15256},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15262},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15268},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15272},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15272},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15278},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15285},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15292},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15303},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15310},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15325},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15342},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15353},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15359},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15377},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15385},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15399},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15407},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15423},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15423},
+	{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 + 15433},
+	{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 + 15437},
+	{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 + 15443},
+	{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 + 15447},
+	{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 + 15447},
+	{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 + 15453},
+	{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 + 15453},
+	{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 + 15466},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14986},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14986},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6605},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6605},
 	{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 + 15523},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15476},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15484},
+	{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 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15496},
+	{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 + 15499},
+	{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 + 15503},
+	{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 + 15509},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15499},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15514},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15518},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15522},
 	{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 + 15532},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15537},
 	{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 + 15556},
+	{FnArg: int8(2), 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 + 15553},
+	{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 + 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 + 15565},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15570},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15575},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15580},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15586},
 	{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}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15598},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15603},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15611},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15619},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15622},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6605},
+	{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 + 15627}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -76987,7 +77008,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+15612,
+				ts+15631,
 				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)
@@ -77647,8 +77668,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 + 6452, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6448, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6471, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6467, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -77727,7 +77748,7 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 			(*Token)(unsafe.Pointer(bp + 80)).Fz = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 			(*Token)(unsafe.Pointer(bp + 80)).Fn = uint32(Xsqlite3Strlen30(tls, (*Token)(unsafe.Pointer(bp+80)).Fz))
 
-			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5136)
+			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5155)
 			if pRaise != 0 {
 				(*Expr)(unsafe.Pointer(pRaise)).FaffExpr = uint8(OE_Abort)
 			}
@@ -78149,7 +78170,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7970, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7989, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -78617,7 +78638,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15657,
+		ts+15676,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -78642,7 +78663,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15698,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15717,
 		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
@@ -78791,7 +78812,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15730,
+		ts+15749,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -78801,7 +78822,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15782, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15801, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -78853,7 +78874,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15807,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15826,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -78861,7 +78882,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15853, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15872, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -79273,7 +79294,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15874)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15893)
 __125:
 	;
 insert_cleanup:
@@ -79589,7 +79610,7 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 						fallthrough
 					case OE_Fail:
 						{
-							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12080, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 								(*Column)(unsafe.Pointer(pCol)).FzCnName))
 
 							Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
@@ -80681,13 +80702,13 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131895)
+	return Xsqlite3MisuseError(tls, 131931)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
 		goto __2
 	}
-	zSql = ts + 1554
+	zSql = ts + 1573
 __2:
 	;
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -81166,7 +81187,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12100, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12119, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -81175,7 +81196,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15888
+		zEntry = ts + 15907
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -81190,7 +81211,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12080, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -81226,7 +81247,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15911, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15930, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*uint8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -81240,7 +81261,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15920, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15939, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -81264,7 +81285,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15924, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15943, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -81282,7 +81303,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15930, libc.VaList(bp+16, zEntry, zFile))
+		ts+15949, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -81309,7 +81330,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15973, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15992, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -81347,7 +81368,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+16005, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16024, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -81357,7 +81378,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16042,
+	ts + 16061,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -81513,7 +81534,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+16045, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16064, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -81521,63 +81542,63 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 }
 
 var pragCName = [57]uintptr{
-	ts + 5057,
-	ts + 16084,
-	ts + 8876,
-	ts + 16088,
-	ts + 16093,
-	ts + 16096,
-	ts + 16106,
-	ts + 16116,
-	ts + 16122,
-	ts + 16126,
-	ts + 16131,
-	ts + 16136,
-	ts + 16144,
+	ts + 5076,
+	ts + 16103,
+	ts + 8895,
+	ts + 16107,
+	ts + 16112,
+	ts + 16115,
+	ts + 16125,
+	ts + 16135,
+	ts + 16141,
+	ts + 16145,
+	ts + 16150,
 	ts + 16155,
-	ts + 16158,
-	ts + 16165,
-	ts + 16126,
-	ts + 16131,
-	ts + 16172,
+	ts + 16163,
+	ts + 16174,
 	ts + 16177,
-	ts + 16180,
-	ts + 16187,
-	ts + 16122,
-	ts + 16126,
-	ts + 16193,
-	ts + 16198,
-	ts + 16203,
-	ts + 16126,
-	ts + 16207,
-	ts + 16131,
-	ts + 16215,
-	ts + 16219,
-	ts + 16224,
-	ts + 11492,
-	ts + 11488,
-	ts + 16230,
-	ts + 16235,
-	ts + 16240,
-	ts + 16084,
-	ts + 16126,
-	ts + 16245,
-	ts + 16252,
+	ts + 16184,
+	ts + 16145,
+	ts + 16150,
+	ts + 16191,
+	ts + 16196,
+	ts + 16199,
+	ts + 16206,
+	ts + 16141,
+	ts + 16145,
+	ts + 16212,
+	ts + 16217,
+	ts + 16222,
+	ts + 16145,
+	ts + 16226,
+	ts + 16150,
+	ts + 16234,
+	ts + 16238,
+	ts + 16243,
+	ts + 11511,
+	ts + 11507,
+	ts + 16249,
+	ts + 16254,
 	ts + 16259,
-	ts + 8876,
-	ts + 16267,
-	ts + 5060,
-	ts + 16273,
-	ts + 16084,
-	ts + 16126,
+	ts + 16103,
+	ts + 16145,
+	ts + 16264,
+	ts + 16271,
 	ts + 16278,
-	ts + 16283,
-	ts + 15480,
-	ts + 16288,
-	ts + 16301,
-	ts + 16310,
-	ts + 16317,
-	ts + 16328,
+	ts + 8895,
+	ts + 16286,
+	ts + 5079,
+	ts + 16292,
+	ts + 16103,
+	ts + 16145,
+	ts + 16297,
+	ts + 16302,
+	ts + 15499,
+	ts + 16307,
+	ts + 16320,
+	ts + 16329,
+	ts + 16336,
+	ts + 16347,
 }
 
 // Definitions of all built-in pragmas
@@ -81595,238 +81616,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16336,
+	{FzName: ts + 16355,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16351,
+	{FzName: ts + 16370,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16366,
+	{FzName: ts + 16385,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16378,
+	{FzName: ts + 16397,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16394,
+	{FzName: ts + 16413,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16317,
+	{FzName: ts + 16336,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16407,
+	{FzName: ts + 16426,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16419,
+	{FzName: ts + 16438,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16439,
+	{FzName: ts + 16458,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CellSizeCk)},
-	{FzName: ts + 16455,
+	{FzName: ts + 16474,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16476,
+	{FzName: ts + 16495,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16491,
+	{FzName: ts + 16510,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16507,
+	{FzName: ts + 16526,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16521,
+	{FzName: ts + 16540,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16534,
+	{FzName: ts + 16553,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16548,
+	{FzName: ts + 16567,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16567,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_DeferFKs)},
 	{FzName: ts + 16586,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_DeferFKs)},
+	{FzName: ts + 16605,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16609,
+	{FzName: ts + 16628,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16618,
+	{FzName: ts + 16637,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16636,
+	{FzName: ts + 16655,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16653,
+	{FzName: ts + 16672,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16666,
+	{FzName: ts + 16685,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16681,
+	{FzName: ts + 16700,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16699,
+	{FzName: ts + 16718,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16709,
+	{FzName: ts + 16728,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16723,
+	{FzName: ts + 16742,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16739,
+	{FzName: ts + 16758,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16764,
+	{FzName: ts + 16783,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16783,
+	{FzName: ts + 16802,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16794,
+	{FzName: ts + 16813,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16805,
+	{FzName: ts + 16824,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16817,
+	{FzName: ts + 16836,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16833,
+	{FzName: ts + 16852,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16846,
+	{FzName: ts + 16865,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16865,
+	{FzName: ts + 16884,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16884,
+	{FzName: ts + 16903,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16897,
+	{FzName: ts + 16916,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16912,
+	{FzName: ts + 16931,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16922,
+	{FzName: ts + 16941,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16934,
+	{FzName: ts + 16953,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16943,
+	{FzName: ts + 16962,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16954,
+	{FzName: ts + 16973,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16964,
+	{FzName: ts + 16983,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16976,
+	{FzName: ts + 16995,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16987,
+	{FzName: ts + 17006,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16999,
+	{FzName: ts + 17018,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17016,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_RecTriggers)},
 	{FzName: ts + 17035,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_RecTriggers)},
+	{FzName: ts + 17054,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17061,
+	{FzName: ts + 17080,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17076,
+	{FzName: ts + 17095,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17090,
+	{FzName: ts + 17109,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17109,
+	{FzName: ts + 17128,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17123,
+	{FzName: ts + 17142,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17139,
+	{FzName: ts + 17158,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17151,
+	{FzName: ts + 17170,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17162,
+	{FzName: ts + 17181,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17173,
+	{FzName: ts + 17192,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17185,
+	{FzName: ts + 17204,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17196,
+	{FzName: ts + 17215,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17217,
+	{FzName: ts + 17236,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17225,
+	{FzName: ts + 17244,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17240,
+	{FzName: ts + 17259,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17253,
-		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
 	{FzName: ts + 17272,
+		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
+	{FzName: ts + 17291,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17287,
+	{FzName: ts + 17306,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -81848,7 +81869,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17303))
+var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17322))
 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)}
@@ -81860,10 +81881,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+17328) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17347) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17357) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -81872,13 +81893,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+8026) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8045) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17345) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17364) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17350) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17369) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -81893,9 +81914,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+16278) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16297) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17362) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17381) == 0 {
 		return 2
 	} else {
 		return 0
@@ -81909,7 +81930,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+17369, 0)
+				ts+17388, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -82000,19 +82021,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17431
+		zName = ts + 17450
 		break
 	case OE_SetDflt:
-		zName = ts + 17440
+		zName = ts + 17459
 		break
 	case OE_Cascade:
-		zName = ts + 17452
+		zName = ts + 17471
 		break
 	case OE_Restrict:
-		zName = ts + 17460
+		zName = ts + 17479
 		break
 	default:
-		zName = ts + 17469
+		zName = ts + 17488
 		break
 	}
 	return zName
@@ -82029,7 +82050,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17479, ts + 17486, ts + 17494, ts + 17498, ts + 17362, ts + 17507,
+	ts + 17498, ts + 17505, ts + 17513, ts + 17517, ts + 17381, ts + 17526,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -82076,13 +82097,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17511
+			zType = ts + 17530
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17513
+			zType = ts + 17532
 		} else {
-			zType = ts + 7528
+			zType = ts + 7536
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17515,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17534,
 			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),
@@ -82090,7 +82111,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17522, ts + 17527, ts + 17535}
+var azEnc = [4]uintptr{uintptr(0), ts + 17541, ts + 17546, ts + 17554}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -82241,6 +82262,7 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp7 int32
 	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
@@ -82337,7 +82359,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17543, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17562, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -82376,7 +82398,7 @@ __8:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 488)) != 0) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 488)))
 __10:
 	;
@@ -82598,7 +82620,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17547) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17566) == 0) {
 		goto __64
 	}
 	b = 2
@@ -82670,7 +82692,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17338
+	zRet = ts + 17357
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -82708,7 +82730,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17328
+	zRet = ts + 17347
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -82995,7 +83017,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 552)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17552, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17571, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -83014,7 +83036,7 @@ __127:
 	if !(*(*uint8)(unsafe.Pointer(zRight)) != 0) {
 		goto __128
 	}
-	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+16, zRight))
+	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+16, zRight))
 	goto __129
 __128:
 	Xsqlite3_temp_directory = uintptr(0)
@@ -83036,7 +83058,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17577, 0)
+		ts+17596, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -83090,7 +83112,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17630) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17649) == 0) {
 		goto __142
 	}
 
@@ -83187,13 +83209,13 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17636
+			return ts + 17655
 		}
-		return ts + 17644
+		return ts + 17663
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
-			Xsqlite3ColumnType(tls, pCol, ts+1554),
+			Xsqlite3ColumnType(tls, pCol, ts+1573),
 			func() int32 {
 				if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 {
 					return 1
@@ -83258,7 +83280,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17651, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17670, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -83271,7 +83293,7 @@ __172:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __173
 	}
-	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1490, 0)
+	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1509, 0)
 	(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 __173:
 	;
@@ -83304,29 +83326,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10491
+	zType = ts + 10510
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12721
+	zType = ts + 12740
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17667
+	zType = ts + 17686
 	goto __183
 __182:
-	zType = ts + 8876
+	zType = ts + 8895
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17693,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -83392,7 +83414,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17681, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17700, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -83402,7 +83424,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17686,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17705,
 		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))))
@@ -83439,8 +83461,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17691, ts + 17693, ts + 16155}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17695,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17710, ts + 17712, ts + 16174}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17714,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -83473,7 +83495,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17720,
 		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)))
@@ -83495,7 +83517,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17705, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17724, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -83559,7 +83581,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7536, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -83575,7 +83597,7 @@ __218:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7536, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -83610,7 +83632,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17708,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17727,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -83618,7 +83640,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+17717))
+			ts+17736))
 	goto __227
 __227:
 	j2++
@@ -83807,7 +83829,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17722, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17741, 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)))
@@ -84024,7 +84046,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+17726, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17745, 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)
@@ -84135,7 +84157,7 @@ __307:
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17750,
+		ts+17769,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
@@ -84234,7 +84256,7 @@ __321:
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17786, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17805, 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) {
@@ -84256,7 +84278,7 @@ __326:
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17806,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17825,
 		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)
@@ -84269,7 +84291,7 @@ __329:
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17828,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17847,
 		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 __332
@@ -84287,11 +84309,11 @@ __331:
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
 __334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17851, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17870, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17853,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17872,
 		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)
 __333:
@@ -84337,7 +84359,7 @@ __339:
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17873,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17892,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
@@ -84371,89 +84393,103 @@ __344:
 
 	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+17903)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17922)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17908)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17927)
 	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)
 
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __345
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_IdxRowid, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
+	jmp7 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 3, 0, r1+int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn)-1)
+
+	Xsqlite3VdbeLoadString(tls, v, 3,
+		ts+17948)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17984)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp7)
+__345:
+	;
 	label6 = 0
 	kk = 0
-__345:
+__346:
 	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) {
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
 		goto __349
 	}
-	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+	goto __347
 __349:
+	;
+	if !(label6 == 0) {
+		goto __350
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__350:
 	;
 	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:
+	kk++
+	goto __346
+	goto __348
+__348:
 	;
 	if !(label6 != 0) {
-		goto __350
+		goto __351
 	}
 	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
 	Xsqlite3VdbeResolveLabel(tls, v, label6)
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17922)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17929)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17995)
 	Xsqlite3VdbeGoto(tls, v, jmp5-1)
 	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-__350:
+__351:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __351
+		goto __352
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__352:
+__353:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __354
+		goto __355
 	}
 	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 __355
+		goto __356
 	}
-	goto __353
-__355:
+	goto __354
+__356:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
-	goto __353
-__353:
-	kk++
-	goto __352
 	goto __354
 __354:
+	kk++
+	goto __353
+	goto __355
+__355:
 	;
 	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)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18022)
 	Xsqlite3VdbeGoto(tls, v, jmp5)
 	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
-__351:
+__352:
 	;
 	Xsqlite3VdbeJumpHere(tls, v, jmp4)
 	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
@@ -84470,20 +84506,20 @@ __340:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 612)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __356
+		goto __357
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17983)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+18049)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__357:
+__358:
 	if !(pIdx5 != 0) {
-		goto __359
-	}
-	if !(pPk1 == pIdx5) {
 		goto __360
 	}
-	goto __358
-__360:
+	if !(pPk1 == pIdx5) {
+		goto __361
+	}
+	goto __359
+__361:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -84492,21 +84528,21 @@ __360:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __358
-__358:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __357
 	goto __359
 __359:
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
+	goto __358
+	goto __360
+__360:
 	;
 	if !(pPk1 != 0) {
-		goto __361
+		goto __362
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__361:
+__362:
 	;
-__356:
+__357:
 	;
 	goto __291
 __291:
@@ -84524,14 +84560,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __362
+		goto __363
 	}
 	(*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 + 18012
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18078
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__362:
+__363:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -84539,27 +84575,27 @@ __362:
 
 __45:
 	if !!(zRight != 0) {
-		goto __363
+		goto __364
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __365
-	}
-	goto pragma_out
-__365:
-	;
-	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __364
-__363:
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
 		goto __366
 	}
+	goto pragma_out
+__366:
+	;
+	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
+	goto __365
+__364:
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
+		goto __367
+	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__367:
+__368:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __369
+		goto __370
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __370
+		goto __371
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -84568,25 +84604,25 @@ __367:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __369
-__370:
-	;
-	goto __368
-__368:
-	pEnc += 16
-	goto __367
-	goto __369
-__369:
-	;
-	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __371
-	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18015, libc.VaList(bp+456, zRight))
+	goto __370
 __371:
 	;
-__366:
+	goto __369
+__369:
+	pEnc += 16
+	goto __368
+	goto __370
+__370:
 	;
-__364:
+	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
+		goto __372
+	}
+	Xsqlite3ErrorMsg(tls, pParse, ts+18081, libc.VaList(bp+456, zRight))
+__372:
+	;
+__367:
+	;
+__365:
 	;
 	goto __15
 
@@ -84594,15 +84630,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 __372
+		goto __373
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __374
+		goto __375
 	}
 	goto __15
-__374:
+__375:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -84610,41 +84646,41 @@ __374:
 	(*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 __375
+		goto __376
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__375:
+__376:
 	;
-	goto __373
-__372:
+	goto __374
+__373:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __376
+		goto __377
 	}
 	goto __15
-__376:
+__377:
 	;
 	(*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)
-__373:
+__374:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__377:
+__378:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __378
+		goto __379
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __377
-__378:
+	goto __378
+__379:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -84659,31 +84695,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __379
-	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17345) == 0) {
 		goto __380
 	}
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17364) == 0) {
+		goto __381
+	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __381
-__380:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18040) == 0) {
-		goto __382
+	goto __382
+__381:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18106) == 0) {
+		goto __383
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __383
-__382:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17498) == 0) {
-		goto __384
+	goto __384
+__383:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17517) == 0) {
+		goto __385
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
+__385:
+	;
 __384:
 	;
-__383:
+__382:
 	;
-__381:
-	;
-__379:
+__380:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -84693,10 +84729,10 @@ __379:
 
 __49:
 	if !(zRight != 0) {
-		goto __385
+		goto __386
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__385:
+__386:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -84716,19 +84752,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __386
+		goto __387
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __388
+		goto __389
 	}
 	goto __15
-__388:
+__389:
 	;
-	goto __387
-__386:
-	opMask = U32(0xfffe)
+	goto __388
 __387:
+	opMask = U32(0xfffe)
+__388:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -84737,86 +84773,86 @@ __387:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__389:
+__390:
 	if !(iDb <= iDbLast) {
-		goto __391
-	}
-	if !(iDb == 1) {
 		goto __392
 	}
-	goto __390
-__392:
+	if !(iDb == 1) {
+		goto __393
+	}
+	goto __391
+__393:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__393:
+__394:
 	if !(k4 != 0) {
-		goto __395
+		goto __396
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __396
+		goto __397
 	}
-	goto __394
-__396:
+	goto __395
+__397:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__397:
+__398:
 	if !(pIdx6 != 0) {
-		goto __399
-	}
-	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
 		goto __400
 	}
+	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
+		goto __401
+	}
 	szThreshold = int16(0)
-	goto __399
-__400:
+	goto __400
+__401:
 	;
-	goto __398
-__398:
-	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __397
 	goto __399
 __399:
+	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
+	goto __398
+	goto __400
+__400:
 	;
 	if !(szThreshold != 0) {
-		goto __401
+		goto __402
 	}
 	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))
 
-__401:
+__402:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18048,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18114,
 		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 __402
+		goto __403
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __403
-__402:
-	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+	goto __404
 __403:
+	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+__404:
 	;
-	goto __394
-__394:
-	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __393
 	goto __395
 __395:
+	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
+	goto __394
+	goto __396
+__396:
 	;
-	goto __390
-__390:
-	iDb++
-	goto __389
 	goto __391
 __391:
+	iDb++
+	goto __390
+	goto __392
+__392:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -84824,36 +84860,36 @@ __391:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __404
+		goto __405
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__404:
+__405:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+640) == SQLITE_OK) {
-		goto __405
+		goto __406
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))
-__405:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __406
+		goto __407
 	}
 	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 __407
+		goto __408
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__407:
+__408:
 	;
-__406:
+__407:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -84862,10 +84898,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) >= int64(0)) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656))&int64(0x7fffffff)))
-__408:
+__409:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -84874,10 +84910,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __409
+		goto __410
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) & int64(0x7fffffff))
-__409:
+__410:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -84885,10 +84921,10 @@ __409:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __410
+		goto __411
 	}
 
-__410:
+__411:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -84940,14 +84976,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{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},
+	{FzName: ts + 18132, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18137, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18143, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18152, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18161, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18169, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18177},
+	{FzName: ts + 18184},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -84999,7 +85035,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+18124)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18190)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -85007,7 +85043,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18205, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = uint8(',')
 
 	}
@@ -85020,19 +85056,19 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18146, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18212, 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+18152)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18218)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18164)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18230)
 		j++
 	}
-	Xsqlite3_str_append(tls, bp+32, ts+4957, 1)
+	Xsqlite3_str_append(tls, bp+32, ts+4976, 1)
 	Xsqlite3StrAccumFinish(tls, bp+32)
 
 	rc = Xsqlite3_declare_vtab(tls, db, bp+64)
@@ -85048,7 +85084,7 @@ __3:
 			(*PragmaVtab)(unsafe.Pointer(pTab)).FnHidden = U8(j)
 		}
 	} else {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	}
 
 	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
@@ -85196,7 +85232,7 @@ __1:
 		var zText uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 
 		if zText != 0 {
-			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, zText))
+			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, zText))
 			if *(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) == uintptr(0) {
 				return SQLITE_NOMEM
 			}
@@ -85212,13 +85248,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+18179)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18245)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18187, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18253, 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+18191, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18257, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -85227,7 +85263,7 @@ __3:
 	rc = Xsqlite3_prepare_v2(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
 	Xsqlite3_free(tls, zSql)
 	if rc != SQLITE_OK {
-		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
+		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
 		return rc
 	}
 	return pragmaVtabNext(tls, pVtabCursor)
@@ -85295,33 +85331,33 @@ 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+18195, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18261, 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, 137196)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137249)
 	} else {
 		var z uintptr
 		var zObj uintptr
 		if *(*uintptr)(unsafe.Pointer(azObj + 1*8)) != 0 {
 			zObj = *(*uintptr)(unsafe.Pointer(azObj + 1*8))
 		} else {
-			zObj = ts + 5008
+			zObj = ts + 5027
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18223, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18289, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*uint8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18254, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18320, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137256)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18262,
-	ts + 18269,
-	ts + 18281,
+	ts + 18328,
+	ts + 18335,
+	ts + 18347,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -85381,7 +85417,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+14140)
+				corruptSchema(tls, pData, argv, ts+14159)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -85413,13 +85449,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+18292)
+			corruptSchema(tls, pData, argv, ts+18358)
 		} 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+14140)
+				corruptSchema(tls, pData, argv, ts+14159)
 			}
 		}
 	}
@@ -85452,16 +85488,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 + 8876
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8895
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7938
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18305
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7957
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18371
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -85555,7 +85591,7 @@ __10:
 		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11775)
+		ts+11794)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __15:
@@ -85590,7 +85626,7 @@ __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)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18443)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __19:
@@ -85604,7 +85640,7 @@ __20:
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18401,
+		ts+18467,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -85877,7 +85913,7 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
 	(*Parse)(unsafe.Pointer(pParse)).Fdb = db
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1490, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1509, 0)
 	}
 }
 
@@ -85905,7 +85941,7 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, bp+16, ts+1490, 0)
+	Xsqlite3ErrorMsg(tls, bp+16, ts+1509, 0)
 __1:
 	;
 	if !(prepFlags&U32(SQLITE_PREPARE_PERSISTENT) != 0) {
@@ -85936,7 +85972,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18435, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18501, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -85966,7 +86002,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18465, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18531, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -86026,7 +86062,7 @@ __21:
 	if !((*Parse)(unsafe.Pointer(bp+16)).FzErrMsg != 0) {
 		goto __22
 	}
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3663, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3682, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 	Xsqlite3DbFree(tls, db, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
 	goto __23
 __22:
@@ -86062,7 +86098,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, 137995)
+		return Xsqlite3MisuseError(tls, 138048)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -86161,7 +86197,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, 138143)
+		return Xsqlite3MisuseError(tls, 138196)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -86479,8 +86515,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 + 10920
-		var zSp2 uintptr = ts + 10920
+		var zSp1 uintptr = ts + 10939
+		var zSp2 uintptr = ts + 10939
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -86488,13 +86524,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18484, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18550, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18514))
+var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18580))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -86669,7 +86705,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+18548, libc.VaList(bp, 0))
+					ts+18614, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -86714,7 +86750,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+18598, libc.VaList(bp+8, zName))
+						ts+18664, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -86725,7 +86761,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+18662,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18728,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -86769,7 +86805,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6586, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6605, 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.
@@ -87353,16 +87389,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18699
+		z = ts + 18765
 		break
 	case TK_INTERSECT:
-		z = ts + 18709
+		z = ts + 18775
 		break
 	case TK_EXCEPT:
-		z = ts + 18719
+		z = ts + 18785
 		break
 	default:
-		z = ts + 18726
+		z = ts + 18792
 		break
 	}
 	return z
@@ -87372,7 +87408,7 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18732, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18798, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
@@ -87398,11 +87434,11 @@ 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 {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18821, libc.VaList(bp, func() uintptr {
 		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
-			return ts + 18786
+			return ts + 18852
 		}
-		return ts + 1554
+		return ts + 1573
 	}()))
 
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
@@ -87590,8 +87626,8 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 				}
 
 				if iCol < 0 {
-					zType = ts + 1119
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16267
+					zType = ts + 1138
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16286
 				} 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))
@@ -87730,13 +87766,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16267
+				zCol = ts + 16286
 			} 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+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12080, 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))
@@ -87744,7 +87780,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+18801, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18867, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -87834,7 +87870,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16267
+					zName = ts + 16286
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -87844,7 +87880,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18867, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -87860,7 +87896,7 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18810, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18876, 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)
@@ -87943,8 +87979,6 @@ __1:
 		(*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
@@ -87959,12 +87993,15 @@ __1:
 			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
 				(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_BLOB)
 			}
+			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)
+			}
 		}
 		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
+				zType = ts + 18884
 			} else {
 				zType = uintptr(0)
 				for j = 1; j < SQLITE_N_STDTYPE; j++ {
@@ -88180,7 +88217,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18822, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18888, 0)
 	return
 __1:
 	;
@@ -88271,7 +88308,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18871, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18937, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -88291,7 +88328,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18913, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18979, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -88328,7 +88365,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18919, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18985, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -88362,11 +88399,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+18934, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19000, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
-			return ts + 1554
+			return ts + 1573
 		}
-		return ts + 18957
+		return ts + 19023
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -88467,8 +88504,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18959, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18974, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19025, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19040, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -88515,7 +88552,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18699, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18765, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -88582,7 +88619,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+18993, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19059, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -88644,7 +88681,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+18993, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19059, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -88797,10 +88834,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+19014, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19080, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19060,
+			ts+19126,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -89054,8 +89091,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+7234)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7234)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7242)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7242)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -89082,13 +89119,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+19142, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19208, 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+19153, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19219, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -89100,7 +89137,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+19158, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19224, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -89288,7 +89325,8 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 				Xsqlite3VectorErrorMsg(tls, (*SubstContext)(unsafe.Pointer(pSubst)).FpParse, pCopy)
 			} else {
 				var db uintptr = (*Parse)(unsafe.Pointer((*SubstContext)(unsafe.Pointer(pSubst)).FpParse)).Fdb
-				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 && int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN {
+				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 &&
+					(int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN || (*Expr)(unsafe.Pointer(pCopy)).FiTable != (*SubstContext)(unsafe.Pointer(pSubst)).FiNewTable) {
 					libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
 					(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_IF_NULL_ROW)
 					(*Expr)(unsafe.Pointer(bp)).FpLeft = pCopy
@@ -89328,7 +89366,7 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 								if pColl != 0 {
 									return (*CollSeq)(unsafe.Pointer(pColl)).FzName
 								}
-								return ts + 1099
+								return ts + 1118
 							}())
 					}
 
@@ -90116,12 +90154,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15164) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15183) == 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+15168) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15187) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -90187,7 +90225,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+19164, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19230, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -90270,7 +90308,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+19182, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19248, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -90399,7 +90437,7 @@ 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+19205, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19271, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
@@ -90422,7 +90460,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+19225, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19291, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -90438,7 +90476,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19268
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19334
 		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 {
@@ -90464,7 +90502,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+19291,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19357,
 					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
@@ -90475,9 +90513,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 + 19329
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19395
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19363
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19429
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -90524,7 +90562,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+19401, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19467, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -90636,7 +90674,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19405,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19471,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -90655,7 +90693,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+19444,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19510,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -90663,7 +90701,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+14733,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14752,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -90764,7 +90802,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6446
+							zSchemaName = ts + 6465
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -90779,7 +90817,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+19475, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19541, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -90844,7 +90882,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+19480,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19546,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -90856,7 +90894,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+12061, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12080, 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)
@@ -90875,9 +90913,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19489, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19555, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19507, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19573, 0)
 					}
 				}
 			}
@@ -90887,7 +90925,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+19527, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19593, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -91025,7 +91063,7 @@ func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect ui
 	(*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)
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSelect)).FpGroupBy)).FnExpr)
 		} 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)
 		}
@@ -91109,13 +91147,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19558, 0)
+					ts+19624, 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+19609, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19675, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -91304,19 +91342,19 @@ 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+19642,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19708,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19654
+						return ts + 19720
 					}
-					return ts + 1554
+					return ts + 1573
 				}(),
 				func() uintptr {
 					if bCover != 0 {
 						return (*Index)(unsafe.Pointer(pIdx)).FzName
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
 	}
 }
@@ -91329,7 +91367,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+7938)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7957)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -91636,7 +91674,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19677,
+		ts+19743,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -91697,7 +91735,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19731,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19797,
 		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:
@@ -91801,7 +91839,7 @@ __27:
 	if !((*SrcItem)(unsafe.Pointer(pItem1)).FcolUsed == uint64(0) && (*SrcItem)(unsafe.Pointer(pItem1)).FzName != uintptr(0)) {
 		goto __30
 	}
-	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1554, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
+	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1573, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
 __30:
 	;
 	pSub1 = (*SrcItem)(unsafe.Pointer(pItem1)).FpSelect
@@ -91839,7 +91877,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+19771, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19837, 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)
@@ -91898,7 +91936,7 @@ __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19786, libc.VaList(bp+40, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19852, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
@@ -92369,9 +92407,9 @@ __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 + 19802
+				return ts + 19868
 			}
-			return ts + 19811
+			return ts + 19877
 		}())
 
 	groupBySort = 1
@@ -92722,7 +92760,7 @@ __65:
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
 		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19802)
+	explainTempTable(tls, pParse, ts+19868)
 __146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
@@ -92805,7 +92843,7 @@ __7:
 	if !(i < nCol) {
 		goto __9
 	}
-	z = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
+	z = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
 	if !(z == uintptr(0)) {
 		goto __10
 	}
@@ -92827,7 +92865,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19820, 0)
+		ts+19886, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -92923,7 +92961,7 @@ func Xsqlite3_get_table(tls *libc.TLS, db uintptr, zSql uintptr, pazResult uintp
 		if (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
 			if pzErrMsg != 0 {
 				Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(pzErrMsg)))
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
 			}
 			Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg)
 		}
@@ -93060,7 +93098,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+19885, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19951, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -93104,7 +93142,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19931, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19997, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -93122,7 +93160,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19939, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20005, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -93134,7 +93172,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19931, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19997, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -93149,11 +93187,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19980, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20046, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
+
 __17:
 	;
 	goto trigger_cleanup
@@ -93161,22 +93200,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20006, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20072, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20044,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20110,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20081
+				return ts + 20147
 			}
-			return ts + 20088
+			return ts + 20154
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -93185,7 +93224,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20094, libc.VaList(bp+24, pTableName+8))
+		ts+20160, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -93214,9 +93253,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -93334,7 +93373,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19931, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19997, 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
@@ -93367,7 +93406,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20140,
+		ts+20206,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -93392,13 +93431,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20188,
+		ts+20254,
 		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+20263, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20329, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -93654,7 +93693,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20292, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20358, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -93693,9 +93732,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 + 6389
+				return ts + 6408
 			}
-			return ts + 5883
+			return ts + 5902
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -93707,7 +93746,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20312,
+			ts+20378,
 			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)
@@ -93821,12 +93860,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20374,
+		ts+20440,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20422
+				return ts + 20488
 			}
-			return ts + 20429
+			return ts + 20495
 		}()))
 __15:
 	;
@@ -93940,7 +93979,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+20436, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20502, 0)
 	return 1
 }
 
@@ -94006,7 +94045,7 @@ func codeReturningTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab
 	}
 	Xsqlite3ExprListDelete(tls, db, (*Select)(unsafe.Pointer(bp)).FpEList)
 	pNew = sqlite3ExpandReturning(tls, pParse, (*Returning)(unsafe.Pointer(pReturning)).FpReturnEL, pTab)
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0) {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
 		libc.Xmemset(tls, bp+240, 0, uint64(unsafe.Sizeof(NameContext{})))
 		if (*Returning)(unsafe.Pointer(pReturning)).FnRetCol == 0 {
 			(*Returning)(unsafe.Pointer(pReturning)).FnRetCol = (*ExprList)(unsafe.Pointer(pNew)).FnExpr
@@ -94060,7 +94099,7 @@ func codeTriggerProgram(tls *libc.TLS, pParse uintptr, pStepList uintptr, orconf
 
 		if (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan != 0 {
 			Xsqlite3VdbeAddOp4(tls, v, OP_Trace, 0x7fffffff, 1, 0,
-				Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
+				Xsqlite3MPrintf(tls, db, ts+6099, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
 				-6)
 		}
 
@@ -94170,7 +94209,7 @@ 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+20478, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20544, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
@@ -94763,7 +94802,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20492,
+		ts+20558,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -94795,7 +94834,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20528, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20594, 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:
@@ -94805,7 +94844,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7713
+				return ts + 7732
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -95121,7 +95160,12 @@ __74:
 	goto __77
 __76:
 	flags = WHERE_ONEPASS_DESIRED
-	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) && !(pTrigger != 0) && !(hasFK != 0) && !(chngKey != 0) && !(*(*int32)(unsafe.Pointer(bp + 104)) != 0)) {
+	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) &&
+		!(pTrigger != 0) &&
+		!(hasFK != 0) &&
+		!(chngKey != 0) &&
+		!(*(*int32)(unsafe.Pointer(bp + 104)) != 0) &&
+		(*NameContext)(unsafe.Pointer(bp+40)).FncFlags&NC_Subquery == 0) {
 		goto __78
 	}
 	flags = flags | WHERE_ONEPASS_MULTIROW
@@ -95675,7 +95719,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20547)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20613)
 __169:
 	;
 update_cleanup:
@@ -95981,10 +96025,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+20560, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]uint8{})), bp+216, ts+20626, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20564, libc.VaList(bp+8, bp+216))
+				ts+20630, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -96075,7 +96119,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+12150, -1)
+				ts+12169, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -96107,7 +96151,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+20637, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20641, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20703, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20707, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -96255,14 +96299,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+20645)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20711)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20685)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20751)
 	return SQLITE_ERROR
 __2:
 	;
@@ -96273,7 +96317,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20728)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20794)
 	return SQLITE_ERROR
 __5:
 	;
@@ -96282,7 +96326,7 @@ __5:
 	*(*uint32)(unsafe.Pointer(db + 76)) |= uint32(SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE)
 	goto __4
 __3:
-	zOut = ts + 1554
+	zOut = ts + 1573
 __4:
 	;
 	saved_flags = (*Sqlite3)(unsafe.Pointer(db)).Fflags
@@ -96301,7 +96345,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20746, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20812, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -96321,7 +96365,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20769)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20835)
 	goto end_of_vacuum
 __8:
 	;
@@ -96336,7 +96380,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14503)
+	rc = execSql(tls, db, pzErrMsg, ts+14522)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -96381,7 +96425,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20796,
+		ts+20862,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -96390,7 +96434,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20904,
+		ts+20970,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -96401,7 +96445,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20958,
+		ts+21024,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -96412,7 +96456,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21109,
+		ts+21175,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -96757,7 +96801,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+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12396, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -96841,11 +96885,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+21239, libc.VaList(bp, pParse+272))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21305, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21263,
+			ts+21329,
 			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,
@@ -96855,7 +96899,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21428, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -96916,7 +96960,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+21381, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21447, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -96944,9 +96988,11 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FbDeclared = 0
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = bp + 32
+	(*Table)(unsafe.Pointer(pTab)).FnTabRef++
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{xConstruct})).f(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, pVTable+16, bp+64)
+	Xsqlite3DeleteTable(tls, db, pTab)
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = (*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -96954,9 +97000,9 @@ 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+21423, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21489, libc.VaList(bp+8, zModuleName))
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3682, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 		}
 		Xsqlite3DbFree(tls, db, pVTable)
@@ -96966,7 +97012,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 + 21453
+			var zFormat uintptr = ts + 21519
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -96978,12 +97024,12 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 			*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) = pVTable
 
 			for iCol = 0; iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol); iCol++ {
-				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1554)
+				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1573)
 				var nType int32
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16158, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16177, 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
@@ -97040,13 +97086,13 @@ 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+21499, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21565, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxConnect, bp+16)
 		if rc != SQLITE_OK {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 		}
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 16)))
@@ -97098,7 +97144,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+21499, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21565, 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)
@@ -97132,7 +97178,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, 151030)
+		return Xsqlite3MisuseError(tls, 151102)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -97174,7 +97220,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR,
 			func() uintptr {
 				if (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
-					return ts + 3663
+					return ts + 3682
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg))
@@ -97542,7 +97588,7 @@ func Xsqlite3VtabEponymousTableInit(tls *libc.TLS, pParse uintptr, pMod uintptr)
 	addModuleArgument(tls, pParse, pTab, Xsqlite3DbStrDup(tls, db, (*Table)(unsafe.Pointer(pTab)).FzName))
 	rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer(pModule)).FxConnect, bp+8)
 	if rc != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+		Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		Xsqlite3VtabEponymousTableClear(tls, db, pMod)
 	}
@@ -97585,7 +97631,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, 151521)
+		rc = Xsqlite3MisuseError(tls, 151593)
 	} else {
 		ap = va
 		switch op {
@@ -97612,7 +97658,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 151539)
+				rc = Xsqlite3MisuseError(tls, 151611)
 				break
 
 			}
@@ -97843,10 +97889,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 + 21518
+		return ts + 21584
 	}
 	if i == -1 {
-		return ts + 16267
+		return ts + 16286
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -97855,35 +97901,35 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21525, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21591, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21597, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12786, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 	}
 
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21597, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12786, 1)
 		}
-		Xsqlite3_str_append(tls, pStr, ts+5008, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5027, 1)
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 	}
 }
 
@@ -97900,29 +97946,29 @@ 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+21533, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21599, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21525, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21591, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21536
+				return ts + 21602
 			}
-			return ts + 21541
+			return ts + 21607
 		}(), 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+21549)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21615)
 		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+21551)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21617)
 	}
-	Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+	Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 }
 
 // This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
@@ -97963,11 +98009,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+21553, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21619, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21559
+				return ts + 21625
 			}
-			return ts + 21566
+			return ts + 21632
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -97977,43 +98023,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 + 10976
+					zFmt = ts + 10995
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21571
+				zFmt = ts + 21637
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21604
+				zFmt = ts + 21670
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21629
+				zFmt = ts + 21695
 			} else {
-				zFmt = ts + 21647
+				zFmt = ts + 21713
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21656, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21722, 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 + 16267
-			Xsqlite3_str_appendf(tls, bp+64, ts+21664, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16286
+			Xsqlite3_str_appendf(tls, bp+64, ts+21730, 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+21695, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21761, 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+21705, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21771, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21710,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21776,
 				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+21737, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21803, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -98045,25 +98091,25 @@ 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+21748, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21814, 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+21536, 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+21602, 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+21769, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21835, 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+21525, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21591, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21602, libc.VaList(bp+16, z))
 		}
 	}
-	Xsqlite3_str_append(tls, bp+24, ts+4957, 1)
+	Xsqlite3_str_append(tls, bp+24, ts+4976, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
@@ -99657,7 +99703,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21777, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21843, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -99685,7 +99731,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21792, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21858, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -100203,7 +100249,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+21801, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21867, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -100561,10 +100607,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{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)},
+	{FzOp: ts + 16135, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15466, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14986, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21881, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -101054,12 +101100,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21888, 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+21822, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21888, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -101138,7 +101184,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 + 6769
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7718
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -101232,7 +101278,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 21863
+				return ts + 21929
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -101608,7 +101654,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21870,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21936,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -101624,7 +101670,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 		pRhs = Xsqlite3PExpr(tls, pParse, TK_UPLUS,
 			Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*ExprList_item)(unsafe.Pointer(pArgs+8+uintptr(j)*32)).FpExpr, 0), uintptr(0))
 		pTerm = Xsqlite3PExpr(tls, pParse, TK_EQ, pColRef, pRhs)
-		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ|JT_RIGHT) != 0 {
 			joinType = U32(EP_OuterON)
 		} else {
 			joinType = U32(EP_InnerON)
@@ -102342,7 +102388,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21906, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21972, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -102413,7 +102459,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21932
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21998
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -102587,6 +102633,10 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	var iCur int32
+	var saved_pIdxEpr uintptr
+
+	saved_pIdxEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 
 	addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	for __ccgo := true; __ccgo; __ccgo = iLevel < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel) {
@@ -102630,9 +102680,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, n)
 			var jj int32
 			for jj = 0; jj < n; jj++ {
-				var iCol int32 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(jj)*2)))
-
-				Xsqlite3ExprCodeGetColumnOfTable(tls, v, (*Index)(unsafe.Pointer(pIdx)).FpTable, iCur, iCol, r1+jj)
+				Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pIdx, iCur, jj, r1+jj)
 			}
 			Xsqlite3VdbeAddOp4Int(tls, v, OP_FilterAdd, (*WhereLevel)(unsafe.Pointer(pLevel)).FregFilter, 0, r1, n)
 			Xsqlite3ReleaseTempRange(tls, pParse, r1, n)
@@ -102666,6 +102714,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 		}
 	}
 	Xsqlite3VdbeJumpHere(tls, v, addrOnce)
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = saved_pIdxEpr
 }
 
 func allocateIndexInfo(tls *libc.TLS, pWInfo uintptr, pWC uintptr, mUnusable Bitmask, pSrc uintptr, pmNoOmit uintptr) uintptr {
@@ -102779,7 +102828,7 @@ __3:
 		uint64(unsafe.Sizeof(sqlite3_index_orderby{}))*uint64(nOrderBy)+uint64(unsafe.Sizeof(HiddenIndexInfo1{}))+
 		uint64(unsafe.Sizeof(uintptr(0)))*uint64(nTerm))
 	if pIdxInfo == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1490, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1509, 0)
 		return uintptr(0)
 	}
 	pHidden = pIdxInfo + 1*96
@@ -102901,9 +102950,9 @@ func vtabBestIndex(tls *libc.TLS, pParse uintptr, pTab uintptr, p uintptr) int32
 		if rc == SQLITE_NOMEM {
 			Xsqlite3OomFault(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb)
 		} else if !(int32((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
 		}
 	}
 	Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg)
@@ -102924,11 +102973,16 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 
 	_ = pParse
 
+	if !((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol)
+	} else {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnColumn)
+	}
 	nField = func() int32 {
-		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < (*Index)(unsafe.Pointer(pIdx)).FnSample {
+		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < nField {
 			return int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField)
 		}
-		return (*Index)(unsafe.Pointer(pIdx)).FnSample
+		return nField
 	}()
 	iCol = 0
 	iSample = (*Index)(unsafe.Pointer(pIdx)).FnSample * nField
@@ -104509,7 +104563,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+21943, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+22009, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -104567,7 +104621,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+21943, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+22009, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -104965,7 +105019,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+21969, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+22035, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -105572,7 +105626,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22004, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22070, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -105607,6 +105661,10 @@ __3:
 			if int32((*WherePath)(unsafe.Pointer(pFrom)).FisOrdered) == (*ExprList)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpOrderBy)).FnExpr {
 				(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_ORDERED)
 			}
+			if (*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy != 0 &&
+				int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) > (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr {
+				(*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat = I8((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr)
+			}
 		} else {
 			(*WhereInfo)(unsafe.Pointer(pWInfo)).FrevMask = (*WherePath)(unsafe.Pointer(pFrom)).FrevLoop
 			if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) <= 0 {
@@ -105901,6 +105959,9 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
+		if Xsqlite3IndexAffinityStr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pIdx) != 0 {
+			(*IndexedExpr)(unsafe.Pointer(p)).Faff = *(*uint8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FzColAff + uintptr(i)))
+		}
 		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
@@ -106053,7 +106114,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22022, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22088, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -106117,7 +106178,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22050, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22116, 0)
 	goto __5
 __4:
 	ii = 0
@@ -106999,7 +107060,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22068, -1)
+		pCtx, ts+22134, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -107132,7 +107193,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+22124, -1)
+					pCtx, ts+22190, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -107222,17 +107283,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-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))
+var row_numberName = *(*[11]uint8)(unsafe.Pointer(ts + 22235))
+var dense_rankName = *(*[11]uint8)(unsafe.Pointer(ts + 22246))
+var rankName = *(*[5]uint8)(unsafe.Pointer(ts + 22257))
+var percent_rankName = *(*[13]uint8)(unsafe.Pointer(ts + 22262))
+var cume_distName = *(*[10]uint8)(unsafe.Pointer(ts + 22275))
+var ntileName = *(*[6]uint8)(unsafe.Pointer(ts + 22285))
+var last_valueName = *(*[11]uint8)(unsafe.Pointer(ts + 22291))
+var nth_valueName = *(*[10]uint8)(unsafe.Pointer(ts + 22302))
+var first_valueName = *(*[12]uint8)(unsafe.Pointer(ts + 22312))
+var leadName = *(*[5]uint8)(unsafe.Pointer(ts + 22324))
+var lagName = *(*[4]uint8)(unsafe.Pointer(ts + 22329))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -107278,7 +107339,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22267, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22333, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -107322,12 +107383,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+22286, 0)
+			ts+22352, 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+22357, 0)
+				ts+22423, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -107350,7 +107411,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+7938)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7957)
 					}
 					break
 				}
@@ -107556,7 +107617,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+22420, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22486, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -107672,7 +107733,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+7530))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -107787,7 +107848,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22446, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22512, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -107852,15 +107913,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 + 22478
+				zErr = ts + 22544
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22495
+				zErr = ts + 22561
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22511
+				zErr = ts + 22577
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22531, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22597, 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 {
@@ -107881,7 +107942,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+22564, 0)
+				ts+22630, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -108019,7 +108080,7 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regZero)
 	if eCond >= WINDOW_STARTING_NUM {
 		var regString int32 = Xsqlite3GetTempReg(tls, pParse)
-		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1554, -1)
+		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1573, -1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, Xsqlite3VdbeCurrentAddr(tls, v)+2, reg)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL))
 
@@ -108037,11 +108098,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22611,
-	ts + 22664,
-	ts + 22068,
-	ts + 22715,
-	ts + 22767,
+	ts + 22677,
+	ts + 22730,
+	ts + 22134,
+	ts + 22781,
+	ts + 22833,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -108532,7 +108593,7 @@ func windowCodeRangeTest(tls *libc.TLS, p uintptr, op int32, csr1 int32, regVal
 
 	}
 
-	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1554, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1573, -1)
 	addrGe = Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, 0, reg1)
 
 	if op == OP_Ge && arith == OP_Add || op == OP_Le && arith == OP_Subtract {
@@ -109436,19 +109497,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+22817,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22883,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 22859
+							return ts + 22925
 						}
-						return ts + 22868
+						return ts + 22934
 					}(),
 						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+22874, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22940, 0)
 		}
 	}
 
@@ -109516,7 +109577,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+22908,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22974,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -110613,7 +110674,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22946, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23012, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -111588,21 +111649,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+16267, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16286, 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+22968, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23034, 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+16180, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16199, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23034, 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))
@@ -112345,7 +112406,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+22995)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+23061)
 				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 {
@@ -112509,7 +112570,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+23004, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23070, 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))
@@ -112726,9 +112787,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 + 6764
+							return ts + 7713
 						}
-						return ts + 6769
+						return ts + 7718
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -113012,19 +113073,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+23028, 0)
+					ts+23094, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23123, 0)
+					ts+23189, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23207, 0)
+					ts+23273, 0)
 			}
 			break
 		case uint32(273):
@@ -113403,9 +113464,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+23004, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23070, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23292, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23358, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -114173,7 +114234,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+23309, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23375, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -114194,9 +114255,9 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 	}
 	if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg != 0 || (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_OK && (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_DONE {
 		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)))
+			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3682, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23334, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23400, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -114369,7 +114430,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23411, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -114382,11 +114443,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19931, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19997, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23352, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23418, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23357, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23423, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -114399,9 +114460,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23367, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23433, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23371, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23437, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -114471,7 +114532,8 @@ func sqlite3TestExtInit(tls *libc.TLS, db uintptr) int32 {
 	return Xsqlite3FaultSim(tls, 500)
 }
 
-var sqlite3BuiltinExtensions = [4]uintptr{
+var sqlite3BuiltinExtensions = [5]uintptr{
+	0,
 	0,
 	0,
 	0,
@@ -114635,7 +114697,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 174337)
+		return Xsqlite3MisuseError(tls, 174426)
 	}
 
 	ap = va
@@ -115210,7 +115272,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175111)
+		return Xsqlite3MisuseError(tls, 175200)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -115225,7 +115287,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23379, 0)
+			ts+23445, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -115416,23 +115478,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 + 23447
+	var zErr uintptr = ts + 23513
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23461
+			zErr = ts + 23527
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23483
+			zErr = ts + 23549
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23505
+			zErr = ts + 23571
 			break
 
 		}
@@ -115450,35 +115512,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23528,
-	ts + 23541,
+	ts + 23594,
+	ts + 23607,
 	uintptr(0),
-	ts + 23557,
-	ts + 23582,
-	ts + 23596,
-	ts + 23615,
-	ts + 1490,
-	ts + 23640,
-	ts + 23677,
-	ts + 23689,
-	ts + 23704,
-	ts + 23737,
+	ts + 23623,
+	ts + 23648,
+	ts + 23662,
+	ts + 23681,
+	ts + 1509,
+	ts + 23706,
+	ts + 23743,
 	ts + 23755,
-	ts + 23780,
-	ts + 23809,
+	ts + 23770,
+	ts + 23803,
+	ts + 23821,
+	ts + 23846,
+	ts + 23875,
 	uintptr(0),
-	ts + 5838,
-	ts + 5334,
-	ts + 23826,
-	ts + 23844,
-	ts + 23862,
+	ts + 5857,
+	ts + 5353,
+	ts + 23892,
+	ts + 23910,
+	ts + 23928,
 	uintptr(0),
-	ts + 23896,
+	ts + 23962,
 	uintptr(0),
-	ts + 23917,
-	ts + 23943,
-	ts + 23966,
-	ts + 23987,
+	ts + 23983,
+	ts + 24009,
+	ts + 24032,
+	ts + 24053,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -115599,7 +115661,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, 175758)
+		return Xsqlite3MisuseError(tls, 175847)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -115644,7 +115706,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+24003, 0)
+				ts+24069, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -115761,7 +115823,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+24066, libc.VaList(bp, zName))
+		ts+24132, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -115789,7 +115851,7 @@ func Xsqlite3_overload_function(tls *libc.TLS, db uintptr, zName uintptr, nArg i
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, zName))
+	zCopy = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, zName))
 	if zCopy == uintptr(0) {
 		return SQLITE_NOMEM
 	}
@@ -115997,7 +116059,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+24117, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24183, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -116090,7 +116152,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, 176503))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176592))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -116160,7 +116222,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, 176582)
+		return Xsqlite3MisuseError(tls, 176671)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -116170,7 +116232,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, 176591)
+		return Xsqlite3MisuseError(tls, 176680)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -116202,14 +116264,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, 176639)
+		return Xsqlite3MisuseError(tls, 176728)
 	}
 
 	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+24138, 0)
+				ts+24204, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -116339,7 +116401,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+24206, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24272, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -116384,10 +116446,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24212, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24278, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24222,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24288,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -116492,7 +116554,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24250, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24316, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -116503,17 +116565,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24254, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24320, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24254
+	zModeType = ts + 24320
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24260, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24326, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -116521,7 +116583,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 3272
+	zModeType = ts + 3291
 __32:
 	;
 	if !(aMode != 0) {
@@ -116551,7 +116613,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24265, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24331, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -116559,7 +116621,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24285,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24351,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -116599,7 +116661,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24309, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24375, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -116623,15 +116685,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24325, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24332, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24391, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24398, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{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},
+	{Fz: ts + 24406, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24409, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24412, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17381, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -116777,10 +116839,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+21863, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21929, 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+24350, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24416, 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) {
@@ -116794,7 +116856,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 177308)
+	rc = Xsqlite3MisuseError(tls, 177397)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -116811,7 +116873,7 @@ __19:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -116845,9 +116907,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 + 6441
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6460
 	(*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 + 23352
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23418
 	(*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)
@@ -116952,7 +117014,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24356
+		zFilename = ts + 24422
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -117055,21 +117117,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+24359,
+	Xsqlite3_log(tls, iErr, ts+24425,
 		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+24384)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24450)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24404)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24470)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24411)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24477)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -117180,7 +117242,7 @@ __4:
 	autoinc = libc.Bool32(int32((*Table)(unsafe.Pointer(pTab)).FiPKey) == iCol && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != U32(0))
 	goto __13
 __12:
-	zDataType = ts + 1119
+	zDataType = ts + 1138
 	primarykey = 1
 __13:
 	;
@@ -117227,14 +117289,14 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24428, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24494, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -117883,7 +117945,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24456, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24522, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -118001,7 +118063,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 + 24464
+			return ts + 24530
 		}
 		return uintptr(0)
 	}(), 0)
@@ -118179,7 +118241,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6181, ts + 6764, ts + 6769, ts + 6191, ts + 6186, ts + 8005, ts + 24487, ts + 24493,
+	ts + 6200, ts + 7713, ts + 7718, ts + 6210, ts + 6205, ts + 8024, ts + 24553, ts + 24559,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -118332,7 +118394,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 + 24500 + uintptr(int32(c)&0xf)))
+	c = *(*uint8)(unsafe.Pointer(ts + 24566 + uintptr(int32(c)&0xf)))
 __8:
 	;
 __6:
@@ -118358,7 +118420,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	switch Xsqlite3_value_type(tls, pValue) {
 	case SQLITE_NULL:
 		{
-			jsonAppendRaw(tls, p, ts+6181, uint32(4))
+			jsonAppendRaw(tls, p, ts+6200, uint32(4))
 			break
 
 		}
@@ -118387,7 +118449,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+24517, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24583, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -118445,19 +118507,19 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 	switch int32((*JsonNode)(unsafe.Pointer(pNode)).FeType) {
 	default:
 		{
-			jsonAppendRaw(tls, pOut, ts+6181, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6200, uint32(4))
 			break
 
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6764, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+7713, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6769, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+7718, uint32(5))
 			break
 
 		}
@@ -119002,17 +119064,17 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		}
 		return int32(j + U32(1))
 	} else if int32(c) == 'n' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6181, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6200, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(z + uintptr(i+U32(4))))])&0x06 != 0) {
 		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+6764, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7713, 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+6769, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7718, 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))
@@ -119113,7 +119175,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+24546, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24612, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -119419,7 +119481,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+24561, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24627, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -119434,7 +119496,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24565, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24631, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -119488,7 +119550,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+24591,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24657,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -119593,11 +119655,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+24634, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24700, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
-					jsonAppendRaw(tls, bp, ts+4998, uint32(2))
+					jsonAppendRaw(tls, bp, ts+5017, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24637, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24703, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, uint8(0))
 				}
@@ -119638,7 +119700,7 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if pNode != 0 {
 				jsonRenderNode(tls, pNode, bp, uintptr(0))
 			} else {
-				jsonAppendRaw(tls, bp, ts+6181, uint32(4))
+				jsonAppendRaw(tls, bp, ts+6200, uint32(4))
 			}
 		}
 		if i == argc {
@@ -119754,14 +119816,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24640, -1)
+			ts+24706, -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+24691, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24757, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -119856,7 +119918,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15380)
+	jsonWrongNumArgs(tls, ctx, ts+15399)
 	return
 __2:
 	;
@@ -119931,9 +119993,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24725
+			return ts + 24791
 		}
-		return ts + 24729
+		return ts + 24795
 	}())
 	return
 __2:
@@ -120066,7 +120128,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24736, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24802, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -120163,7 +120225,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24739, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24805, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -120207,7 +120269,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24742)
+		ts+24808)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -120338,7 +120400,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24825, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24891, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -120357,7 +120419,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+24831, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24897, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -120453,7 +120515,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+24831, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24897, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -120477,7 +120539,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 + 24836
+				zRoot = ts + 24902
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -120599,7 +120661,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+24546, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24612, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -120694,25 +120756,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{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 + 24904},
+	{FnArg: int8(-1), 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(2), 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 + 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}}
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24951},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24954},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24958},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24970},
+	{FnArg: int8(2), 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_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24993},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25004},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25016},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 25029},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25038},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25038},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25048},
+	{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 + 25059},
+	{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 + 25076}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -120731,8 +120793,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 25028, FpModule: 0},
-	{FzName: ts + 25038, FpModule: 0},
+	{FzName: ts + 25094, FpModule: 0},
+	{FzName: ts + 25104, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -120992,11 +121054,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+25048, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25114, 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+25056, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25122, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -121207,7 +121269,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+25061,
+		ts+25127,
 		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))
@@ -121905,7 +121967,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25143)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25209)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -122117,7 +122179,7 @@ func rtreeBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 2
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FneedToFreeIdxStr = 1
-	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, bp+8))) {
+	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, bp+8))) {
 		return SQLITE_NOMEM
 	}
 
@@ -123246,7 +123308,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25157, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25223, 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 {
@@ -123258,12 +123320,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+25177, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25243, 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+25209, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25275, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -123489,7 +123551,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+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))
+		ts+25312, 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))
@@ -123512,14 +123574,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25391
+	var zFmt uintptr = ts + 25457
 	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+11348, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11367, 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 {
@@ -123560,7 +123622,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25447, ts + 5060, ts + 16267,
+	ts + 25513, ts + 5079, ts + 16286,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -123603,19 +123665,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+25452,
+			ts+25518,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25514, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25580, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25519,
+			ts+25585,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25583,
+			ts+25649,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25653,
+			ts+25719,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -123644,7 +123706,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 + 25702
+			zFormat = ts + 25768
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -123656,7 +123718,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+25810,
+			ts+25876,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -123664,18 +123726,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+25855, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25921, 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+12767, 1)
+					Xsqlite3_str_append(tls, p, ts+12786, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25882, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25948, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25904, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25970, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25912, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25978, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -123690,14 +123752,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25928,
-	ts + 25981,
-	ts + 26026,
-	ts + 26078,
-	ts + 26132,
-	ts + 26177,
-	ts + 26235,
-	ts + 26290,
+	ts + 25994,
+	ts + 26047,
+	ts + 26092,
+	ts + 26144,
+	ts + 26198,
+	ts + 26243,
+	ts + 26301,
+	ts + 26356,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -123726,7 +123788,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+26337, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26403, 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
@@ -123734,19 +123796,19 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 				(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = 4 + int32((*Rtree)(unsafe.Pointer(pRtree)).FnBytesPerCell)*RTREE_MAXCELLS
 			}
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26357,
+			ts+26423,
 			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 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26414,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26480,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -123788,16 +123850,16 @@ 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 + 26449,
-		ts + 26492,
-		ts + 26527,
-		ts + 26563,
+		ts + 26515,
+		ts + 26558,
+		ts + 26593,
+		ts + 26629,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
 		goto __1
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
 	return SQLITE_ERROR
 __1:
 	;
@@ -123822,7 +123884,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+26600,
+	Xsqlite3_str_appendf(tls, pSql, ts+26666,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -123834,7 +123896,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26624, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26690, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -123857,7 +123919,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26696, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -123868,14 +123930,14 @@ __10:
 	if !(ii < argc) {
 		goto __12
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
 	rc = SQLITE_ERROR
 	goto __13
 __12:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __14
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
 __14:
 	;
 __13:
@@ -123918,7 +123980,7 @@ __17:
 	if !(iErr != 0) {
 		goto __22
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
 	goto rtreeInit_fail
 __22:
 	;
@@ -123935,7 +123997,7 @@ __23:
 	if !(rc != 0) {
 		goto __24
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
 	goto rtreeInit_fail
 __24:
 	;
@@ -123953,7 +124015,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26633, ts + 26644}
+var azFormat = [2]uintptr{ts + 26699, ts + 26710}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -123991,13 +124053,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+10920, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10939, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26654, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26720, 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+26660, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26726, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26664, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26730, 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})))
@@ -124008,7 +124070,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+26666, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26732, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -124086,12 +124148,12 @@ 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+26699,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26765,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
-						return ts + 4062
+						return ts + 4081
 					}
-					return ts + 1554
+					return ts + 1573
 				}(), z))
 			if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport == uintptr(0) {
 				(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
@@ -124110,7 +124172,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+26706,
+			ts+26772,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -124129,7 +124191,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+26751, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26817, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -124143,8 +124205,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 + 26783,
-		ts + 26837,
+		ts + 26849,
+		ts + 26903,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -124159,23 +124221,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+26885,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26951,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26930
+					return ts + 26996
 				}
-				return ts + 26938
+				return ts + 27004
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26947,
+				ts+27013,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26930
+						return ts + 26996
 					}
-					return ts + 26938
+					return ts + 27004
 				}(), iKey, iVal))
 		}
 	}
@@ -124199,7 +124261,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+27005, libc.VaList(bp, i, iCell, iNode))
+				ts+27071, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -124219,7 +124281,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+27053, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27119, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -124236,14 +124298,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+27120, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27186, 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+27154, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27220, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -124251,7 +124313,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+27184,
+					ts+27250,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -124280,14 +124342,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+27239,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27305,
 			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+27270, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27336, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -124309,12 +124371,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+14503, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14522, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27337, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27403, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -124323,12 +124385,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25157, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25223, 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+27365, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27431, 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)
 		}
@@ -124342,8 +124404,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+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27403, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27462, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27469, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -124351,7 +124413,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+27411, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27477, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -124366,7 +124428,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27415, -1)
+			ts+27481, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -124374,7 +124436,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6441
+			zDb = ts + 6460
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -124384,7 +124446,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 + 18012
+				return ts + 18078
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -124755,11 +124817,11 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		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+27466, 1)
+		Xsqlite3_str_append(tls, x, ts+27532, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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+27534, 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+27479, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27545, 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)
 	}
@@ -124779,19 +124841,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+27490, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27556, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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)))))
+			Xsqlite3_str_appendf(tls, x, ts+27574, 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+27516, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27582, 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+27524, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27590, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27528, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27594, 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)
 	}
@@ -125711,7 +125773,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+27541, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27607, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -125720,7 +125782,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27563, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27629, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -125728,7 +125790,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26696, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -125739,7 +125801,7 @@ __5:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __7
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
 __7:
 	;
 __6:
@@ -125764,7 +125826,7 @@ __9:
 	if !(rc != 0) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	goto geopolyInit_fail
 __10:
 	;
@@ -125955,7 +126017,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 + 16267
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16286
 		(*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
@@ -125965,7 +126027,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 + 27567
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27633
 		(*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
@@ -125973,7 +126035,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 + 27573
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27639
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -126085,7 +126147,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27582, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27648, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -126217,14 +126279,14 @@ geopoly_update_end:
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
 	_ = pVtab
 	_ = nArg
-	if Xsqlite3_stricmp(tls, zName, ts+27622) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27688) == 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+27638) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27704) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -126289,7 +126351,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+27653, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27719, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -126301,25 +126363,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{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},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27727},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27740},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27753},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27766},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27704},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27778},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27688},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27801},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27815},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27828},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27842},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27858},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27804},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27870},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -126329,26 +126391,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27823, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27889, 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+27833, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27899, 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+27844, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27910, -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+27567, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27633, 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+27855, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27921, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -126402,7 +126464,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+25143, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25209, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -126729,7 +126791,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+27865, -1)
+		Xsqlite3_result_error(tls, context, ts+27931, -1)
 		return
 	}
 
@@ -126740,7 +126802,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+27865, -1)
+			Xsqlite3_result_error(tls, context, ts+27931, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -126753,7 +126815,7 @@ func prepareAndCollectError(tls *libc.TLS, db uintptr, ppStmt uintptr, pzErrmsg
 
 	var rc int32 = Xsqlite3_prepare_v2(tls, db, zSql, -1, ppStmt, uintptr(0))
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 		*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	}
 	return rc
@@ -126765,7 +126827,7 @@ func resetAndCollectError(tls *libc.TLS, pStmt uintptr, pzErrmsg uintptr) int32
 
 	var rc int32 = Xsqlite3_reset(tls, pStmt)
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
 	}
 	return rc
 }
@@ -126841,7 +126903,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+27886, uintptr(0), uintptr(0), p+64)
+				ts+27952, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -126905,7 +126967,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+25056, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25122, 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++ {
 				}
@@ -126926,16 +126988,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+28057, libc.VaList(bp, func() uintptr {
+			ts+28123, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28207
+					return ts + 28273
 				}
-				return ts + 1554
+				return ts + 1573
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28248)
+			ts+28314)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -127033,7 +127095,7 @@ func rbuFinalize(tls *libc.TLS, p uintptr, pStmt uintptr) {
 	var rc int32 = Xsqlite3_finalize(tls, pStmt)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && rc != SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 	}
 }
 
@@ -127051,7 +127113,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+28373, libc.VaList(bp, zTab)))
+			ts+28439, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -127069,7 +127131,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+28492, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28558, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -127087,7 +127149,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28513, libc.VaList(bp+16, zIdx)))
+			ts+28579, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -127110,7 +127172,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+28564, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28630, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -127156,7 +127218,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+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28651, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -127171,7 +127233,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+28613, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28679, 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 {
@@ -127211,7 +127273,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+19489, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19555, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -127221,18 +127283,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+28642, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28708, 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+28661, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28727, 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+28666, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28732, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -127244,18 +127306,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+28676, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28742, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28705
+							return ts + 28771
 						}
-						return ts + 28718
+						return ts + 28784
 					}()))
 		}
 
 		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+28727, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28793, 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)
@@ -127269,7 +127331,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+28749,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28815,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -127312,12 +127374,12 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	defer tls.Free(24)
 
 	var zList uintptr = uintptr(0)
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	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+28776, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14614
+		zList = rbuMPrintf(tls, p, ts+28842, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14633
 	}
 	return zList
 }
@@ -127328,13 +127390,13 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 
 	var iPk int32 = 1
 	var zRet uintptr = uintptr(0)
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	for 1 != 0 {
 		var i int32
 		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+28785, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28851, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -127356,25 +127418,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+28798, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28864, 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+28830, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28896, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		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)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+28919)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28925, ts+28932, ts+4976)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+1573)
 
 		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+28874,
+					ts+28940,
 					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+28916, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28982, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -127411,12 +127473,12 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	zVector = uintptr(0)
 	zRet = uintptr(0)
 	bFailed = 0
-	zSep = ts + 1554
+	zSep = ts + 1573
 	iCol = 0
 	*(*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+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28679, 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
@@ -127451,7 +127513,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 28936
+	zCol = ts + 29002
 __7:
 	;
 	goto __5
@@ -127459,13 +127521,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28944,
+	zLhs = rbuMPrintf(tls, p, ts+29010,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28965,
+	zOrder = rbuMPrintf(tls, p, ts+29031,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+29001,
+	zSelect = rbuMPrintf(tls, p, ts+29067,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14614
+	zSep = ts + 14633
 	iCol++
 	goto __1
 __2:
@@ -127483,12 +127545,12 @@ __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+29028,
+		Xsqlite3_mprintf(tls, ts+29094,
 			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
 	}
-	zSep = ts + 1554
+	zSep = ts + 1573
 	iCol = 0
 __14:
 	if !(iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnCol) {
@@ -127510,8 +127572,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14614
+	zVector = rbuMPrintf(tls, p, ts+29142, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14633
 	goto __15
 __15:
 	iCol++
@@ -127522,7 +127584,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29083, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29149, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -127549,13 +127611,13 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 	var zImpPK uintptr = uintptr(0)
 	var zWhere uintptr = uintptr(0)
 	var nBind int32 = 0
-	var zCom uintptr = ts + 1554
-	var zAnd uintptr = ts + 1554
+	var zCom uintptr = ts + 1573
+	var zAnd uintptr = ts + 1573
 	*(*uintptr)(unsafe.Pointer(bp + 200)) = uintptr(0)
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -127567,9 +127629,9 @@ 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+29095, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29161, 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
+			zType = ts + 1573
 		} else {
 			if iCid < 0 {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK {
@@ -127579,37 +127641,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 + 28936
+					zCol = ts + 29002
 				} else {
-					zCol = ts + 28666
+					zCol = ts + 28732
 				}
-				zType = ts + 1119
+				zType = ts + 1138
 			} 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+29117, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29183, 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 + 28853
+					return ts + 28919
 				}
-				return ts + 1554
+				return ts + 1573
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29137,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29203,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29158,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29224,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29191, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29257, 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 + 14614
-		zAnd = ts + 21525
+		zCom = ts + 14633
+		zAnd = ts + 21591
 		nBind++
 	}
 
@@ -127643,16 +127705,16 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 
 	var zList uintptr = uintptr(0)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
-		var zS uintptr = ts + 1554
+		var zS uintptr = ts + 1573
 		var i int32
 		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+29215, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29281, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29227, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29293, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14614
+			zS = ts + 14633
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -127660,7 +127722,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+29236, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29302, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -127672,27 +127734,27 @@ 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+29251, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29317, 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 zSep uintptr = ts + 1573
 		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+29265, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21525
+				zList = rbuMPrintf(tls, p, ts+29331, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21591
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29277, libc.VaList(bp+40, zList))
+			ts+29343, libc.VaList(bp+40, zList))
 
 	} else {
-		var zSep uintptr = ts + 1554
+		var zSep uintptr = ts + 1573
 		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 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29327, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21525
+				zList = rbuMPrintf(tls, p, ts+29393, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21591
 			}
 		}
 	}
@@ -127701,7 +127763,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+29340, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29406, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -127715,21 +127777,21 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 		if int32(libc.Xstrlen(tls, zMask)) != (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 			rbuBadControlError(tls, p)
 		} else {
-			var zSep uintptr = ts + 1554
+			var zSep uintptr = ts + 1573
 			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+29327,
+					zList = rbuMPrintf(tls, p, ts+29393,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14614
+					zSep = ts + 14633
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29366,
+					zList = rbuMPrintf(tls, p, ts+29432,
 						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 + 14614
+					zSep = ts + 14633
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29396,
+					zList = rbuMPrintf(tls, p, ts+29462,
 						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 + 14614
+					zSep = ts + 14633
 				}
 			}
 		}
@@ -127764,19 +127826,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 + 29433
+		var zSep uintptr = ts + 29499
 		*(*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+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28651, 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+16155) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16174) == 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+28613, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -127788,15 +127850,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 + 28853
+					zDesc = ts + 28919
 				} else {
-					zDesc = ts + 1554
+					zDesc = ts + 1573
 				}
-				z = rbuMPrintf(tls, p, ts+29446, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14614
+				z = rbuMPrintf(tls, p, ts+29512, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14633
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29457, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29523, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -127811,12 +127873,12 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		*(*uintptr)(unsafe.Pointer(bp + 168)) = uintptr(0)
 		var zIdx uintptr = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
-		var zComma uintptr = ts + 1554
+		var zComma uintptr = ts + 1573
 		var zCols uintptr = uintptr(0)
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29461)
+			ts+29527)
 		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))) {
@@ -127825,7 +127887,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+28613, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -127835,25 +127897,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+29511, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29577, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29533, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29599, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28853
+						return ts + 28919
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
-				zComma = ts + 14614
+				zComma = ts + 14633
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29543, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29609, 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+6441, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29558,
+			ts+29624,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 0))
 	}
 }
 
@@ -127863,50 +127925,50 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
 		var tnum int32 = (*RbuObjIter)(unsafe.Pointer(pIter)).FiTnum
-		var zComma uintptr = ts + 1554
+		var zComma uintptr = ts + 1573
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
-			var zPk uintptr = ts + 1554
+			var zPk uintptr = ts + 1573
 			var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCol)*8))
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, (*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 + 29620
+				zPk = ts + 29686
 			}
-			zSql = rbuMPrintf(tls, p, ts+29633,
+			zSql = rbuMPrintf(tls, p, ts+29699,
 				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 + 29660
+							return ts + 29726
 						}
-						return ts + 1554
+						return ts + 1573
 					}()))
-			zComma = ts + 14614
+			zComma = ts + 14633
 		}
 
 		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+29670, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29736, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		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,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29743,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29709
+						return ts + 29775
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 0))
 	}
 }
 
@@ -127919,7 +127981,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+29724,
+				ts+29790,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -127956,7 +128018,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+29781)
+			ts+29847)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -128061,7 +128123,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+29847, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29913, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -128081,24 +128143,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+6441, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29867,
+				ts+29933,
 				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+6441, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 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+29932, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29998, 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+29968, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+30034, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -128114,7 +128176,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30002,
+						ts+30068,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -128122,31 +128184,31 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 30063
+											return ts + 30129
 										}
-										return ts + 30067
+										return ts + 30133
 									}()
 								}
-								return ts + 1554
+								return ts + 1573
 							}(), zStart,
 							zCollist, zLimit))
 					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+30073,
+						ts+30139,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30134,
+						ts+30200,
 						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 + 30063
+									return ts + 30129
 								}
-								return ts + 30067
+								return ts + 30133
 							}(),
 							zCollist, zLimit))
 				}
@@ -128171,8 +128233,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+6452)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6448)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6471)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6467)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -128181,52 +128243,52 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			rbuCreateImposterTable2(tls, p, pIter)
 			zWrite = func() uintptr {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
-					return ts + 1554
+					return ts + 1573
 				}
-				return ts + 30293
+				return ts + 30359
 			}()
 
 			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+30302,
+						ts+30368,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30338
+								return ts + 30404
 							}
-							return ts + 1554
+							return ts + 1573
 						}(), zBindings)))
 			}
 
 			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+30348, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30414, 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
+				var zRbuRowid uintptr = ts + 1573
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30376
+					zRbuRowid = ts + 30442
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30388, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30454, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30464
+							return ts + 30530
 						}
-						return ts + 1554
+						return ts + 1573
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30481,
+					ts+30547,
 					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+30780,
+						ts+30846,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -128234,14 +128296,14 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-				var zRbuRowid uintptr = ts + 1554
+				var zRbuRowid uintptr = ts + 1573
 				var zStart uintptr = uintptr(0)
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30879
+						zRbuRowid = ts + 30945
 					} else {
-						zRbuRowid = ts + 30889
+						zRbuRowid = ts + 30955
 					}
 				}
 
@@ -128254,35 +128316,35 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28936, 0)
+						zOrder = rbuMPrintf(tls, p, ts+29002, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+1573)
 					}
 				}
 
 				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+30900,
+							ts+30966,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30948
+										return ts + 31014
 									}
-									return ts + 1554
+									return ts + 1573
 								}(),
 								zRbuRowid,
 								(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 									if zStart != 0 {
 										return zStart
 									}
-									return ts + 1554
+									return ts + 1573
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 22859
+										return ts + 22925
 									}
-									return ts + 1554
+									return ts + 1573
 								}(), zOrder,
 								zLimit)))
 				}
@@ -128345,12 +128407,12 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 		(*RbuObjIter)(unsafe.Pointer(pIter)).FpRbuUpdate = pUp
 
 		if zSet != 0 {
-			var zPrefix uintptr = ts + 1554
+			var zPrefix uintptr = ts + 1573
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30293
+				zPrefix = ts + 30359
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30954,
+			zUpdate = Xsqlite3_mprintf(tls, ts+31020,
 				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)
@@ -128377,7 +128439,7 @@ func rbuOpenDbhandle(tls *libc.TLS, p uintptr, zName uintptr, bUseVfs int32) uin
 			return uintptr(0)
 		}())
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
 			Xsqlite3_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 			*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 		}
@@ -128409,7 +128471,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+30984, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+31050, 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:
@@ -128479,28 +128541,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+6441, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460, 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+6441)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31014, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31080, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		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))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31108, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.Xmemcpy(tls, p+48, ts+3305, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+6441, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+6460, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31060, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31126, 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+6441, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -128533,11 +128595,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+31126, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31192, 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+24206, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24272, (*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)))) == '?' {
@@ -128549,16 +128611,16 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31158,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441),
+			zTarget = Xsqlite3_mprintf(tls, ts+31224,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460),
 					func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1554
+							return ts + 1573
 						}
-						return ts + 31190
+						return ts + 31256
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1554
+							return ts + 1573
 						}
 						return zExtra
 					}()))
@@ -128574,37 +128636,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+31192, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31258, -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+31207, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31273, 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+31224, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31290, -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+6441, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31306, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 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+31268, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31334, 0)
 	}
 }
 
@@ -128633,14 +128695,14 @@ 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+31240, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31306, 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+31286, uintptr(0), uintptr(0), uintptr(0))
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31352, uintptr(0), uintptr(0), uintptr(0))
 		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
@@ -128749,7 +128811,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+6441, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6460, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -128766,23 +128828,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+31321, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31387, 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+6441)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460)
 	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+6441)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31353, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31412, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31419, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -128899,7 +128961,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+23844, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23910, 0)
 			return
 		}
 
@@ -128992,7 +129054,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+31360)
+			ts+31426)
 		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)
@@ -129000,7 +129062,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+31382, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31448, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -129021,7 +129083,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+31409,
+				ts+31475,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -129051,9 +129113,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+31567, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31633, 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+31582,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31648,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -129067,10 +129129,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+31602, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31668, 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+31627)
+			ts+31693)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -129084,12 +129146,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+31735)
+			ts+31801)
 	}
 
 	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+31800)
+			ts+31866)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -129101,7 +129163,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+31844, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31910, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -129121,15 +129183,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+17240)
-					rbuCopyPragma(tls, p, ts+16351)
+					rbuCopyPragma(tls, p, ts+17259)
+					rbuCopyPragma(tls, p, ts+16370)
 				}
 
 				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+31869, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31935, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -129153,10 +129215,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+14518, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, 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+14518, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -129251,7 +129313,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+31897, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31963, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -129267,10 +129329,10 @@ func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31346, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31412, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 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)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
@@ -129284,7 +129346,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+31922, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]uint8{})), bp+12, ts+31988, 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)
@@ -129318,7 +129380,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+31933, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31999, 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 {
@@ -129348,13 +129410,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+32005, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32071, 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+32019)
+				ts+32085)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -129365,7 +129427,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+32076)
+				ts+32142)
 			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)
@@ -129410,7 +129472,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			libc.Xmemcpy(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, zRbu, nRbu+uint64(1))
 			pCsr += uintptr(nRbu + uint64(1))
 			if zState != 0 {
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3663, libc.VaList(bp, zState))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3682, libc.VaList(bp, zState))
 			}
 
 			rbuOpenDatabase(tls, p, uintptr(0), bp+16)
@@ -129439,7 +129501,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+32150, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32216, 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
@@ -129457,12 +129519,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+32182,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32248,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32214
+							return ts + 32280
 						}
-						return ts + 32221
+						return ts + 32287
 					}()))
 			}
 		}
@@ -129470,7 +129532,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+14503, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14522, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -129481,19 +129543,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+16954)
-						rbuCopyPragma(tls, p, ts+16366)
+						rbuCopyPragma(tls, p, ts+16973)
+						rbuCopyPragma(tls, p, ts+16385)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32228, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32294, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6460, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32244, uintptr(0), uintptr(0), p+64)
+								db, ts+32310, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -129547,7 +129609,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+32268, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32334, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -129574,7 +129636,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+30293, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30359, 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++
@@ -129591,7 +129653,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+14518, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -129604,13 +129666,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+14518, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, 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+32276, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32342, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -129705,7 +129767,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+14518, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -129722,19 +129784,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+14518, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14503
+				zBegin = ts + 14522
 			} else {
-				zBegin = ts + 32228
+				zBegin = ts + 32294
 			}
 			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+32228, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32294, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -130080,7 +130142,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+32303, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32369, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -130105,7 +130167,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+32326, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32392, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -130250,7 +130312,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+6441)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6460)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -130265,7 +130327,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+32337, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32403, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -130510,6 +130572,970 @@ func Xsqlite3rbu_temp_size(tls *libc.TLS, pRbu uintptr) Sqlite3_int64 {
 	return (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FszTemp
 }
 
+var zDbstatSchema = *(*[258]uint8)(unsafe.Pointer(ts + 32414))
+
+// Forward reference to data structured used in this module
+type StatTable1 = struct {
+	Fbase        Sqlite3_vtab
+	Fdb          uintptr
+	FiDb         int32
+	F__ccgo_pad1 [4]byte
+}
+
+// Forward reference to data structured used in this module
+type StatTable = StatTable1
+type StatCursor1 = struct {
+	Fbase        Sqlite3_vtab_cursor
+	FpStmt       uintptr
+	FisEof       U8
+	FisAgg       U8
+	F__ccgo_pad1 [2]byte
+	FiDb         int32
+	FaPage       [32]StatPage
+	FiPage       int32
+	FiPageno     U32
+	FzName       uintptr
+	FzPath       uintptr
+	FzPagetype   uintptr
+	FnPage       int32
+	FnCell       int32
+	FnMxPayload  int32
+	F__ccgo_pad2 [4]byte
+	FnUnused     I64
+	FnPayload    I64
+	FiOffset     I64
+	FszPage      I64
+}
+
+type StatCursor = StatCursor1
+type StatPage1 = struct {
+	FiPgno         U32
+	F__ccgo_pad1   [4]byte
+	FaPg           uintptr
+	FiCell         int32
+	F__ccgo_pad2   [4]byte
+	FzPath         uintptr
+	Fflags         U8
+	F__ccgo_pad3   [3]byte
+	FnCell         int32
+	FnUnused       int32
+	F__ccgo_pad4   [4]byte
+	FaCell         uintptr
+	FiRightChildPg U32
+	FnMxPayload    int32
+}
+
+type StatPage = StatPage1
+type StatCell1 = struct {
+	FnLocal      int32
+	FiChildPg    U32
+	FnOvfl       int32
+	F__ccgo_pad1 [4]byte
+	FaOvfl       uintptr
+	FnLastOvfl   int32
+	FiOvfl       int32
+}
+
+type StatCell = StatCell1
+
+func statConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var pTab uintptr = uintptr(0)
+	var rc int32 = SQLITE_OK
+	var iDb int32
+	_ = pAux
+
+	if argc >= 4 {
+		Xsqlite3TokenInit(tls, bp+8, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
+		iDb = Xsqlite3FindDb(tls, db, bp+8)
+		if iDb < 0 {
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+11890, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
+			return SQLITE_ERROR
+		}
+	} else {
+		iDb = 0
+	}
+	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_DIRECTONLY, 0)
+	rc = Xsqlite3_declare_vtab(tls, db, uintptr(unsafe.Pointer(&zDbstatSchema)))
+	if rc == SQLITE_OK {
+		pTab = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatTable{})))
+		if pTab == uintptr(0) {
+			rc = SQLITE_NOMEM
+		}
+	}
+
+	if rc == SQLITE_OK {
+		libc.Xmemset(tls, pTab, 0, uint64(unsafe.Sizeof(StatTable{})))
+		(*StatTable)(unsafe.Pointer(pTab)).Fdb = db
+		(*StatTable)(unsafe.Pointer(pTab)).FiDb = iDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
+	return rc
+}
+
+func statDisconnect(tls *libc.TLS, pVtab uintptr) int32 {
+	Xsqlite3_free(tls, pVtab)
+	return SQLITE_OK
+}
+
+func statBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
+	var i int32
+	var iSchema int32 = -1
+	var iName int32 = -1
+	var iAgg int32 = -1
+	_ = tab
+
+	for i = 0; i < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; i++ {
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fop) != SQLITE_INDEX_CONSTRAINT_EQ {
+			continue
+		}
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fusable) == 0 {
+			return SQLITE_CONSTRAINT
+		}
+		switch (*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(i)*12)).FiColumn {
+		case 0:
+			{
+				iName = i
+				break
+
+			}
+		case 10:
+			{
+				iSchema = i
+				break
+
+			}
+		case 11:
+			{
+				iAgg = i
+				break
+
+			}
+		}
+	}
+	i = 0
+	if iSchema >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).Fomit = uint8(1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x01
+	}
+	if iName >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iName)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x02
+	}
+	if iAgg >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iAgg)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x04
+	}
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 1.0
+
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy == 1 &&
+		(*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)).FnOrderBy == 2 &&
+		(*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_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).FiColumn == 1 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x08
+	}
+
+	return SQLITE_OK
+}
+
+func statOpen(tls *libc.TLS, pVTab uintptr, ppCursor uintptr) int32 {
+	var pTab uintptr = pVTab
+	var pCsr uintptr
+
+	pCsr = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatCursor{})))
+	if pCsr == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		libc.Xmemset(tls, pCsr, 0, uint64(unsafe.Sizeof(StatCursor{})))
+		(*StatCursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab = pVTab
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppCursor)) = pCsr
+	return SQLITE_OK
+}
+
+func statClearCells(tls *libc.TLS, p uintptr) {
+	var i int32
+	if (*StatPage)(unsafe.Pointer(p)).FaCell != 0 {
+		for i = 0; i < (*StatPage)(unsafe.Pointer(p)).FnCell; i++ {
+			Xsqlite3_free(tls, (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell+uintptr(i)*32)).FaOvfl)
+		}
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FaCell)
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnCell = 0
+	(*StatPage)(unsafe.Pointer(p)).FaCell = uintptr(0)
+}
+
+func statClearPage(tls *libc.TLS, p uintptr) {
+	var aPg uintptr = (*StatPage)(unsafe.Pointer(p)).FaPg
+	statClearCells(tls, p)
+	Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FzPath)
+	libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(StatPage{})))
+	(*StatPage)(unsafe.Pointer(p)).FaPg = aPg
+}
+
+func statResetCsr(tls *libc.TLS, pCsr uintptr) {
+	var i int32
+
+	for i = 0; i < int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{}))); i++ {
+		statClearPage(tls, pCsr+24+uintptr(i)*64)
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(pCsr+24+uintptr(i)*64)).FaPg)
+		(*StatPage)(unsafe.Pointer(pCsr + 24 + uintptr(i)*64)).FaPg = uintptr(0)
+	}
+	Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(0)
+}
+
+func statResetCounts(tls *libc.TLS, pCsr uintptr) {
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnCell = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnUnused = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPayload = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FszPage = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 0
+}
+
+func statClose(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	Xsqlite3_free(tls, pCsr)
+	return SQLITE_OK
+}
+
+func getLocalPayload(tls *libc.TLS, nUsable int32, flags U8, nTotal int32) int32 {
+	var nLocal int32
+	var nMinLocal int32
+	var nMaxLocal int32
+
+	if int32(flags) == 0x0D {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = nUsable - 35
+	} else {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = (nUsable-12)*64/255 - 23
+	}
+
+	nLocal = nMinLocal + (nTotal-nMinLocal)%(nUsable-4)
+	if nLocal > nMaxLocal {
+		nLocal = nMinLocal
+	}
+	return nLocal
+}
+
+func statDecodePage(tls *libc.TLS, pBt uintptr, p uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var nUnused int32
+	var iOff int32
+	var nHdr int32
+	var isLeaf int32
+	var szPage int32
+	var aData uintptr
+	var aHdr uintptr
+	var iNext int32
+
+	var rc int32
+	var iPrev U32
+
+	var j int32
+	var nOvfl int32
+
+	var nLocal int32
+	var pCell uintptr
+	var i int32
+	var nUsable int32
+	aData = (*StatPage)(unsafe.Pointer(p)).FaPg
+	aHdr = aData + uintptr(func() int32 {
+		if (*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1) {
+			return 100
+		}
+		return 0
+	}())
+
+	(*StatPage)(unsafe.Pointer(p)).Fflags = *(*U8)(unsafe.Pointer(aHdr))
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0A || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __1
+	}
+	isLeaf = 1
+	nHdr = 8
+	goto __2
+__1:
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05 || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x02) {
+		goto __3
+	}
+	isLeaf = 0
+	nHdr = 12
+	goto __4
+__3:
+	goto statPageIsCorrupt
+__4:
+	;
+__2:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1)) {
+		goto __5
+	}
+	nHdr = nHdr + 100
+__5:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnCell = int32(*(*U8)(unsafe.Pointer(aHdr + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 3 + 1)))
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = 0
+	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
+
+	nUnused = int32(*(*U8)(unsafe.Pointer(aHdr + 5)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 5 + 1))) - nHdr - 2*(*StatPage)(unsafe.Pointer(p)).FnCell
+	nUnused = nUnused + int32(*(*U8)(unsafe.Pointer(aHdr + 7)))
+	iOff = int32(*(*U8)(unsafe.Pointer(aHdr + 1)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 1 + 1)))
+__6:
+	if !(iOff != 0) {
+		goto __7
+	}
+	if !(iOff >= szPage) {
+		goto __8
+	}
+	goto statPageIsCorrupt
+__8:
+	;
+	nUnused = nUnused + (int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2) + 1))))
+	iNext = int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff) + 1)))
+	if !(iNext < iOff+4 && iNext > 0) {
+		goto __9
+	}
+	goto statPageIsCorrupt
+__9:
+	;
+	iOff = iNext
+	goto __6
+__7:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnUnused = nUnused
+	(*StatPage)(unsafe.Pointer(p)).FiRightChildPg = func() uint32 {
+		if isLeaf != 0 {
+			return uint32(0)
+		}
+		return Xsqlite3Get4byte(tls, aHdr+8)
+	}()
+
+	if !((*StatPage)(unsafe.Pointer(p)).FnCell != 0) {
+		goto __10
+	}
+
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = szPage - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatPage)(unsafe.Pointer(p)).FaCell = Xsqlite3_malloc64(tls, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+	if !((*StatPage)(unsafe.Pointer(p)).FaCell == uintptr(0)) {
+		goto __11
+	}
+	return SQLITE_NOMEM
+__11:
+	;
+	libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+
+	i = 0
+__12:
+	if !(i < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __14
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr(i)*32
+
+	iOff = int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2) + 1)))
+	if !(iOff < nHdr || iOff >= szPage) {
+		goto __15
+	}
+	goto statPageIsCorrupt
+__15:
+	;
+	if !!(isLeaf != 0) {
+		goto __16
+	}
+	(*StatCell)(unsafe.Pointer(pCell)).FiChildPg = Xsqlite3Get4byte(tls, aData+uintptr(iOff))
+	iOff = iOff + 4
+__16:
+	;
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05) {
+		goto __17
+	}
+
+	goto __18
+__17:
+	iOff = iOff + int32(func() uint8 {
+		if int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff)))) < int32(U8(0x80)) {
+			return uint8(func() int32 {
+				*(*U32)(unsafe.Pointer(bp)) = U32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))
+				return 1
+			}())
+		}
+		return Xsqlite3GetVarint32(tls, aData+uintptr(iOff), bp)
+	}())
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __19
+	}
+	iOff = iOff + int32(Xsqlite3GetVarint(tls, aData+uintptr(iOff), bp+8))
+__19:
+	;
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32((*StatPage)(unsafe.Pointer(p)).FnMxPayload)) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = int32(*(*U32)(unsafe.Pointer(bp)))
+__20:
+	;
+	nLocal = getLocalPayload(tls, nUsable, (*StatPage)(unsafe.Pointer(p)).Fflags, int32(*(*U32)(unsafe.Pointer(bp))))
+	if !(nLocal < 0) {
+		goto __21
+	}
+	goto statPageIsCorrupt
+__21:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLocal = nLocal
+
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32(nLocal)) {
+		goto __22
+	}
+	nOvfl = int32((*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) + U32(nUsable) - U32(4) - U32(1)) / U32(nUsable-4))
+	if !(iOff+nLocal+4 > nUsable || *(*U32)(unsafe.Pointer(bp)) > U32(0x7fffffff)) {
+		goto __23
+	}
+	goto statPageIsCorrupt
+__23:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl = int32(*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) - U32((nOvfl-1)*(nUsable-4)))
+	(*StatCell)(unsafe.Pointer(pCell)).FnOvfl = nOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FaOvfl = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(U32(0)))*uint64(nOvfl))
+	if !((*StatCell)(unsafe.Pointer(pCell)).FaOvfl == uintptr(0)) {
+		goto __24
+	}
+	return SQLITE_NOMEM
+__24:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl)) = Xsqlite3Get4byte(tls, aData+uintptr(iOff+nLocal))
+	j = 1
+__25:
+	if !(j < nOvfl) {
+		goto __27
+	}
+	iPrev = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j-1)*4))
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPrev, bp+16, 0)
+	if !(rc != SQLITE_OK) {
+		goto __28
+	}
+
+	return rc
+__28:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j)*4)) = Xsqlite3Get4byte(tls, Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 16))))
+	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
+	goto __26
+__26:
+	j++
+	goto __25
+	goto __27
+__27:
+	;
+__22:
+	;
+__18:
+	;
+	goto __13
+__13:
+	i++
+	goto __12
+	goto __14
+__14:
+	;
+__10:
+	;
+	return SQLITE_OK
+
+statPageIsCorrupt:
+	(*StatPage)(unsafe.Pointer(p)).Fflags = U8(0)
+	statClearCells(tls, p)
+	return SQLITE_OK
+}
+
+func statSizeAndOffset(tls *libc.TLS, pCsr uintptr) {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCsr)).FpVtab
+	var pBt uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatTable)(unsafe.Pointer(pTab)).FiDb)*32)).FpBt
+	var pPager uintptr = Xsqlite3BtreePager(tls, pBt)
+	var fd uintptr
+
+	fd = Xsqlite3PagerFile(tls, pPager)
+	*(*Sqlite3_int64)(unsafe.Pointer(bp)) = Sqlite3_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	if Xsqlite3OsFileControl(tls, fd, 230440, bp) == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = *(*Sqlite3_int64)(unsafe.Pointer(bp))
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += *(*Sqlite3_int64)(unsafe.Pointer(bp + 1*8))
+	} else {
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += I64(Xsqlite3BtreeGetPageSize(tls, pBt))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = (*StatCursor)(unsafe.Pointer(pCsr)).FszPage * I64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno-U32(1))
+	}
+}
+
+func statGetPage(tls *libc.TLS, pBt uintptr, iPg U32, pPg uintptr) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var pgsz int32 = Xsqlite3BtreeGetPageSize(tls, pBt)
+	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
+	var rc int32
+
+	if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+		(*StatPage)(unsafe.Pointer(pPg)).FaPg = Xsqlite3_malloc(tls, pgsz+DBSTAT_PAGE_PADDING_BYTES)
+		if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+			return SQLITE_NOMEM
+		}
+		libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0, uint64(DBSTAT_PAGE_PADDING_BYTES))
+	}
+
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPg, bp, 0)
+	if rc == SQLITE_OK {
+		var a uintptr = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		libc.Xmemcpy(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, a, uint64(pgsz))
+		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+	}
+
+	return rc
+}
+
+func statNext(tls *libc.TLS, pCursor uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
+	var rc int32
+	var nPayload int32
+	var z uintptr
+	var pCsr uintptr
+	var pTab uintptr
+	var pBt uintptr
+	var pPager uintptr
+
+	var iRoot U32
+	var nUsable int32
+	var iOvfl int32
+	var pCell uintptr
+
+	var p uintptr
+	var i int32
+	var p1 uintptr
+	pCsr = pCursor
+	pTab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	pBt = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FpBt
+	pPager = Xsqlite3BtreePager(tls, pBt)
+
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+
+statNextRestart:
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __1
+	}
+
+	statResetCounts(tls, pCsr)
+	rc = Xsqlite3_step(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	if !(rc == SQLITE_ROW) {
+		goto __3
+	}
+	iRoot = U32(Xsqlite3_column_int64(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 1))
+	Xsqlite3PagerPagecount(tls, pPager, bp+48)
+	if !(*(*int32)(unsafe.Pointer(bp + 48)) == 0) {
+		goto __5
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__5:
+	;
+	rc = statGetPage(tls, pBt, iRoot, pCsr+24)
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiPgno = iRoot
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __6
+	}
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32672, 0))
+	if !(z == uintptr(0)) {
+		goto __7
+	}
+	rc = SQLITE_NOMEM
+__7:
+	;
+__6:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 1
+	goto __4
+__3:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__4:
+	;
+	goto __2
+__1:
+	p = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __8
+	}
+	statResetCounts(tls, pCsr)
+__8:
+	;
+__9:
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __10
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32
+__11:
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl) {
+		goto __12
+	}
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = Xsqlite3BtreeGetPageSize(tls, pBt) - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	statSizeAndOffset(tls, pCsr)
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl-1) {
+		goto __13
+	}
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nUsable - 4)
+	goto __14
+__13:
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64((*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64(nUsable - 4 - (*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+__14:
+	;
+	iOvfl = (*StatCell)(unsafe.Pointer(pCell)).FiOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FiOvfl++
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __15
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(iOvfl)*4))
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32674
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls,
+		ts+32683, libc.VaList(bp, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell, iOvfl)))
+	if z == uintptr(0) {
+		return SQLITE_NOMEM
+	}
+	return SQLITE_OK
+__15:
+	;
+	goto __11
+__12:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiRightChildPg != 0) {
+		goto __16
+	}
+	goto __10
+__16:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+	goto __9
+__10:
+	;
+	if !(!(int32((*StatPage)(unsafe.Pointer(p)).FiRightChildPg) != 0) || (*StatPage)(unsafe.Pointer(p)).FiCell > (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __17
+	}
+	statClearPage(tls, p)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage--
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 && (*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __18
+	}
+
+	return SQLITE_OK
+__18:
+	;
+	goto statNextRestart
+__17:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage++
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage >= int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{})))) {
+		goto __19
+	}
+	statResetCsr(tls, pCsr)
+	return Xsqlite3CorruptError(tls, 215455)
+__19:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell == (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatPage)(unsafe.Pointer(p)).FiRightChildPg
+	goto __21
+__20:
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32)).FiChildPg
+__21:
+	;
+	rc = statGetPage(tls, pBt, (*StatPage)(unsafe.Pointer(p+1*64)).FiPgno, p+1*64)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __22
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32695, libc.VaList(bp+24, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell)))
+	if !(z == uintptr(0)) {
+		goto __23
+	}
+	rc = SQLITE_NOMEM
+__23:
+	;
+__22:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+__2:
+	;
+	if !(rc == SQLITE_OK) {
+		goto __24
+	}
+	p1 = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = (*StatPage)(unsafe.Pointer(p1)).FiPgno
+
+	rc = statDecodePage(tls, pBt, p1)
+	if !(rc == SQLITE_OK) {
+		goto __25
+	}
+	statSizeAndOffset(tls, pCsr)
+
+	switch int32((*StatPage)(unsafe.Pointer(p1)).Fflags) {
+	case 0x05:
+		goto __27
+	case 0x02:
+		goto __28
+	case 0x0D:
+		goto __29
+	case 0x0A:
+		goto __30
+	default:
+		goto __31
+	}
+	goto __26
+__27:
+__28:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32703
+	goto __26
+__29:
+__30:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32712
+	goto __26
+__31:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32717
+	goto __26
+__26:
+	;
+	*(*int32)(unsafe.Pointer(pCsr + 2108)) += (*StatPage)(unsafe.Pointer(p1)).FnCell
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64((*StatPage)(unsafe.Pointer(p1)).FnUnused)
+	if !((*StatPage)(unsafe.Pointer(p1)).FnMxPayload > (*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload) {
+		goto __32
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = (*StatPage)(unsafe.Pointer(p1)).FnMxPayload
+__32:
+	;
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __33
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+40, (*StatPage)(unsafe.Pointer(p1)).FzPath)))
+	if !(z == uintptr(0)) {
+		goto __34
+	}
+	rc = SQLITE_NOMEM
+__34:
+	;
+__33:
+	;
+	nPayload = 0
+	i = 0
+__35:
+	if !(i < (*StatPage)(unsafe.Pointer(p1)).FnCell) {
+		goto __37
+	}
+	nPayload = nPayload + (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p1)).FaCell+uintptr(i)*32)).FnLocal
+	goto __36
+__36:
+	i++
+	goto __35
+	goto __37
+__37:
+	;
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nPayload)
+
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0) {
+		goto __38
+	}
+	goto statNextRestart
+__38:
+	;
+__25:
+	;
+__24:
+	;
+	return rc
+}
+
+func statEof(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	return int32((*StatCursor)(unsafe.Pointer(pCsr)).FisEof)
+}
+
+func statFilter(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintptr, argc int32, argv uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pCsr uintptr = pCursor
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	var pSql uintptr
+	var zSql uintptr
+	var iArg int32 = 0
+	var rc int32 = SQLITE_OK
+	var zName uintptr = uintptr(0)
+	_ = argc
+	_ = idxStr
+
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FpStmt = uintptr(0)
+	if idxNum&0x01 != 0 {
+		var zDbase uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = Xsqlite3FindDbName(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zDbase)
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FiDb < 0 {
+			(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = 0
+			(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+			return SQLITE_OK
+		}
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+	if idxNum&0x02 != 0 {
+		zName = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+	}
+	if idxNum&0x04 != 0 {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(libc.Bool32(Xsqlite3_value_double(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8))) != 0.0))
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(0)
+	}
+	pSql = Xsqlite3_str_new(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb)
+	Xsqlite3_str_appendf(tls, pSql,
+		ts+32727,
+		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb+uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FzDbSName))
+	if zName != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32882, libc.VaList(bp+8, zName))
+	}
+	if idxNum&0x08 != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32896, 0)
+	}
+	zSql = Xsqlite3_str_finish(tls, pSql)
+	if zSql == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		rc = Xsqlite3_prepare_v2(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
+		Xsqlite3_free(tls, zSql)
+	}
+
+	if rc == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = -1
+		rc = statNext(tls, pCursor)
+	}
+	return rc
+}
+
+func statColumn(tls *libc.TLS, pCursor uintptr, ctx uintptr, i int32) int32 {
+	var pCsr uintptr = pCursor
+	switch i {
+	case 0:
+		Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzName, -1, libc.UintptrFromInt32(-1))
+		break
+	case 1:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath, -1, libc.UintptrFromInt32(-1))
+		}
+		break
+	case 2:
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnPage))
+		} else {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno))
+		}
+		break
+	case 3:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype, -1, uintptr(0))
+		}
+		break
+	case 4:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnCell))
+		break
+	case 5:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnPayload)
+		break
+	case 6:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnUnused)
+		break
+	case 7:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload))
+		break
+	case 8:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FiOffset)
+		}
+		break
+	case 9:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FszPage)
+		break
+	case 10:
+		{
+			var db uintptr = Xsqlite3_context_db_handle(tls, ctx)
+			var iDb int32 = (*StatCursor)(unsafe.Pointer(pCsr)).FiDb
+			Xsqlite3_result_text(tls, ctx, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, -1, uintptr(0))
+			break
+
+		}
+	default:
+		{
+			Xsqlite3_result_int(tls, ctx, int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg))
+			break
+
+		}
+	}
+	return SQLITE_OK
+}
+
+func statRowid(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32 {
+	var pCsr uintptr = pCursor
+	*(*Sqlite_int64)(unsafe.Pointer(pRowid)) = Sqlite_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	return SQLITE_OK
+}
+
+// Invoke this routine to register the "dbstat" virtual table module
+func Xsqlite3DbstatRegister(tls *libc.TLS, db uintptr) int32 {
+	return Xsqlite3_create_module(tls, db, ts+32911, uintptr(unsafe.Pointer(&dbstat_module)), uintptr(0))
+}
+
+var dbstat_module = Sqlite3_module{
+	FxCreate:     0,
+	FxConnect:    0,
+	FxBestIndex:  0,
+	FxDisconnect: 0,
+	FxDestroy:    0,
+	FxOpen:       0,
+	FxClose:      0,
+	FxFilter:     0,
+	FxNext:       0,
+	FxEof:        0,
+	FxColumn:     0,
+	FxRowid:      0,
+}
+
 type SessionTable1 = struct {
 	FpNext    uintptr
 	FzName    uintptr
@@ -131090,13 +132116,13 @@ 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+11348, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11367, 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+32348, 0)
+				ts+32918, 0)
 		} else if rc == SQLITE_ERROR {
-			zPragma = Xsqlite3_mprintf(tls, ts+1554, 0)
+			zPragma = Xsqlite3_mprintf(tls, ts+1573, 0)
 		} else {
 			*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
 			*(*uintptr)(unsafe.Pointer(pabPK)) = uintptr(0)
@@ -131107,7 +132133,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32469, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+33039, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -131205,7 +132231,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11348, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11367, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -131454,7 +132480,7 @@ __4:
 	goto error_out
 __7:
 	;
-	Xsqlite3ValueSetStr(tls, p, 0, ts+1554, uint8(0), uintptr(0))
+	Xsqlite3ValueSetStr(tls, p, 0, ts+1573, uint8(0), uintptr(0))
 	(*Sqlite3_session)(unsafe.Pointer(pSession)).FpZeroBlob = p
 __6:
 	;
@@ -131782,14 +132808,14 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	var zRet uintptr = uintptr(0)
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32498,
+			zRet = Xsqlite3_mprintf(tls, ts+33068,
 				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 + 21525
+			zSep = ts + 21591
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131804,7 +132830,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	var zRet uintptr = uintptr(0)
 	var bHave int32 = 0
 
@@ -131812,9 +132838,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+32532,
+				ts+33102,
 				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 + 32573
+			zSep = ts + 33143
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131822,7 +132848,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7530, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7538, 0)
 	}
 
 	return zRet
@@ -131833,7 +132859,7 @@ func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintpt
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32578,
+		ts+33148,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -131876,7 +132902,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32656,
+			ts+33226,
 			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
@@ -132003,7 +133029,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32709, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33279, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -132268,7 +133294,7 @@ func sessionAppendInteger(tls *libc.TLS, p uintptr, iVal int32, pRc uintptr) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
-	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]uint8{}))-uint64(1)), bp+8, ts+4975, libc.VaList(bp, iVal))
+	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]uint8{}))-uint64(1)), bp+8, ts+4994, libc.VaList(bp, iVal))
 	sessionAppendStr(tls, p, bp+8, pRc)
 }
 
@@ -132477,29 +133503,29 @@ 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+11348, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11367, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32736, libc.VaList(bp, zDb))
+			ts+33306, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
 	} else {
 		var i int32
-		var zSep uintptr = ts + 1554
+		var zSep uintptr = ts + 1573
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32846, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33416, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
-		sessionAppendStr(tls, bp+8, ts+1567, bp+24)
+		sessionAppendStr(tls, bp+8, ts+1586, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+32861, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33431, 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+32869, bp+24)
+				sessionAppendStr(tls, bp+8, ts+33439, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21525
+				zSep = ts + 21591
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -132608,7 +133634,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+32875, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33445, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -132700,7 +133726,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32895, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33465, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -132963,7 +133989,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, 219078)
+				rc = Xsqlite3CorruptError(tls, 219169)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -132986,7 +134012,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, 219098)
+						rc = Xsqlite3CorruptError(tls, 219189)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -133028,7 +134054,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, 219152)
+			rc = Xsqlite3CorruptError(tls, 219243)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -133089,7 +134115,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, 219240)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219331)
 		}
 	}
 
@@ -133163,13 +134189,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, 219326))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219417))
 	}
 
 	(*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, 219332))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219423))
 	}
 
 	if paRec != 0 {
@@ -133231,7 +134257,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, 219376))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219467))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -133604,7 +134630,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219832)
 	goto finished_invert
 __6:
 	;
@@ -133772,45 +134798,45 @@ 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+11348) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11367) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
 			} else {
-				var zSep uintptr = ts + 1554
+				var zSep uintptr = ts + 1573
 
 				libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(SessionBuffer{})))
 				(*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+32913, bp+16)
+				sessionAppendStr(tls, bp, ts+33483, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+32926, bp+16)
+				sessionAppendStr(tls, bp, ts+33496, 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+32932, bp+16)
+						sessionAppendStr(tls, bp, ts+33502, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 14614
+						zSep = ts + 14633
 					}
 				}
 
-				zSep = ts + 1554
-				sessionAppendStr(tls, bp, ts+32861, bp+16)
+				zSep = ts + 1573
+				sessionAppendStr(tls, bp, ts+33431, 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+32937, bp+16)
+								ts+33507, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+32869, bp+16)
+							sessionAppendStr(tls, bp, ts+33439, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21525
+						zSep = ts + 21591
 					}
 				}
 
@@ -133857,42 +134883,42 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	defer tls.Free(20)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+33012, bp+16)
+	sessionAppendStr(tls, bp, ts+33582, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+32861, bp+16)
+	sessionAppendStr(tls, bp, ts+33431, 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+32932, bp+16)
+			sessionAppendStr(tls, bp, ts+33502, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21525
+			zSep = ts + 21591
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+33030, bp+16)
+		sessionAppendStr(tls, bp, ts+33600, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32573, bp+16)
+		sessionAppendStr(tls, bp, ts+33143, bp+16)
 
-		zSep = ts + 1554
+		zSep = ts + 1573
 		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+32869, bp+16)
+				sessionAppendStr(tls, bp, ts+33439, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 33038
+				zSep = ts + 33608
 			}
 		}
-		sessionAppendStr(tls, bp, ts+4957, bp+16)
+		sessionAppendStr(tls, bp, ts+4976, bp+16)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
@@ -133905,7 +134931,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+6441, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6460, 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 {
@@ -133916,21 +134942,21 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+33043, bp+16)
+	sessionAppendStr(tls, bp, ts+33613, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21531, bp+16)
+	sessionAppendStr(tls, bp, ts+21597, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14614, bp+16)
+			sessionAppendStr(tls, bp, ts+14633, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+33061, bp+16)
+	sessionAppendStr(tls, bp, ts+33631, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33072, bp+16)
+		sessionAppendStr(tls, bp, ts+33642, bp+16)
 	}
-	sessionAppendStr(tls, bp, ts+4957, bp+16)
+	sessionAppendStr(tls, bp, ts+4976, bp+16)
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v2(tls, db, (*SessionBuffer)(unsafe.Pointer(bp)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp)).FnBuf, p+16, uintptr(0))
@@ -133944,14 +134970,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+11348, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11367, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+33076)
+			ts+33646)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33189)
+			ts+33759)
 	}
 	return rc
 }
@@ -133979,7 +135005,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, 220219)
+				rc = Xsqlite3CorruptError(tls, 220310)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -134232,7 +135258,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+33333, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33903, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -134248,7 +135274,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+33354, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33924, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -134321,10 +135347,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+33373, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33943, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33399, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33969, 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))
@@ -134357,7 +135383,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				f func(*libc.TLS, uintptr, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xFilter})).f(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 176))))
 			if schemaMismatch != 0 {
-				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
+				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
 				if *(*uintptr)(unsafe.Pointer(bp + 200)) == uintptr(0) {
 					rc = SQLITE_NOMEM
 					break
@@ -134370,7 +135396,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+6441, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6460, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -134383,19 +135409,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+33429, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33999, 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+33473,
+						ts+34043,
 						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+33544, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+34114, 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+11348) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11367) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -134446,14 +135472,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33604, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34174, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34204, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33658, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34228, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34204, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -135701,7 +136727,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33686, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+34256, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135989,7 +137015,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33714, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+34284, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -136176,7 +137202,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+33745, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34315, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -136244,7 +137270,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33752
+		var zErr uintptr = ts + 34322
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -136403,7 +137429,7 @@ func fts5ValueToText(tls *libc.TLS, pVal uintptr) uintptr {
 	if zRet != 0 {
 		return zRet
 	}
-	return ts + 1554
+	return ts + 1573
 }
 
 func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, nVal int32, apVal uintptr) {
@@ -136426,7 +137452,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33802
+		var zErr uintptr = ts + 34372
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -136750,13 +137776,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33850, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34420, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33858, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34428, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33868, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34438, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -137167,7 +138193,7 @@ func fts5ConfigSkipLiteral(tls *libc.TLS, pIn uintptr) uintptr {
 	case 'n':
 		fallthrough
 	case 'N':
-		if Xsqlite3_strnicmp(tls, ts+6181, p, 4) == 0 {
+		if Xsqlite3_strnicmp(tls, ts+6200, p, 4) == 0 {
 			p = p + 4
 		} else {
 			p = uintptr(0)
@@ -137307,7 +138333,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+33873, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34443, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -137334,14 +138360,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+33880, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34450, 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+33911, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+34481, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -137352,7 +138378,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33944, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34514, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -137365,7 +138391,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33981, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34551, 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)))
@@ -137374,7 +138400,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+33990, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34560, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*uint8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -137393,7 +138419,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34023, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34593, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -137408,14 +138434,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34057, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34627, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34065, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34635, 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+34097, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34667, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -137423,9 +138449,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34103, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34673, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34117, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34687, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -137433,9 +138459,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34155, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34725, 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+34166, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34736, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zArg))) == '1')
@@ -137443,21 +138469,21 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+5075, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+5094, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 8026, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17345},
-			{FzName: ts + 34201, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8045, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17364},
+			{FzName: ts + 34771, 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+34209, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34779, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34240, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34810, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -137504,15 +138530,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+22191) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16267) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34268, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22257) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16286) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34838, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34298) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34868) {
 			*(*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+34308, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34878, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -137529,13 +138555,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+34339, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34909, 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+34344, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34914, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34351, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34921, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -137573,8 +138599,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+22191) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34359, 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+22257) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34929, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -137606,7 +138632,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+34388, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34958, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -137615,13 +138641,13 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 							if *(*uintptr)(unsafe.Pointer(bp + 48)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 48))
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						func() uintptr {
 							if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 64))
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						pzErr)
 				} else {
@@ -137643,19 +138669,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 + 34057
+			zTail = ts + 34627
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34408
+			zTail = ts + 34978
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34416, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34986, 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+16267, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16286, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -137699,18 +138725,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+34427, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34997, 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 + 1573
 			}
-			return ts + 14614
+			return ts + 14633
 		}()
-		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+35013, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34450,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22191))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35020,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22257))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -137820,7 +138846,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34476) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35046) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -137830,7 +138856,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+34481) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35051) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -137840,7 +138866,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+34490) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35060) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -137853,7 +138879,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+34500) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35070) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -137863,7 +138889,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+34510) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35080) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -137879,7 +138905,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+22191) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22257) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -137902,7 +138928,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34522
+	var zSelect uintptr = ts + 35092
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -137924,7 +138950,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+34554) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35124) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -137938,7 +138964,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+34562,
+				ts+35132,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -138036,7 +139062,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*uint8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34627, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+35197, 0)
 					return FTS5_EOF
 				}
 			}
@@ -138049,20 +139075,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+34647, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+35217, 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+34678, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35248, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34681, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35251, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30063, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30129, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -139840,9 +140866,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+34685, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35255, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33714, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+34284, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -139858,7 +140884,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+34690, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+35260, 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')
@@ -139945,7 +140971,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20528, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20594, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -140026,7 +141052,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+34719, 0)
+			ts+35289, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -140196,12 +141222,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+34772,
+								ts+35342,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34822
+										return ts + 35392
 									}
-									return ts + 34685
+									return ts + 35255
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -141144,7 +142170,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+34829, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35399, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -141223,7 +142249,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+34835,
+			ts+35405,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -141248,7 +142274,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+34886,
+			ts+35456,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -141271,7 +142297,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+34935,
+			ts+35505,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -141510,7 +142536,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+34975, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+35545, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -142709,7 +143735,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+34998,
+			ts+35568,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -143902,7 +144928,7 @@ func fts5WriteFlushBtree(tls *libc.TLS, p uintptr, pWriter uintptr) {
 			if (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn > 0 {
 				return (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fp
 			}
-			return ts + 1554
+			return ts + 1573
 		}()
 
 		Xsqlite3_bind_blob(tls, (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter, 2, z, (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn, uintptr(0))
@@ -144175,7 +145201,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+35082,
+			ts+35652,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -145241,7 +146267,7 @@ func sqlite3Fts5IndexReinit(tls *libc.TLS, p uintptr) int32 {
 	fts5StructureInvalidate(tls, p)
 	fts5IndexDiscardData(tls, p)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Fts5Structure{})))
-	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1554, 0)
+	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1573, 0)
 	fts5StructureWrite(tls, p, bp)
 	return fts5IndexReturn(tls, p)
 }
@@ -145257,13 +146283,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+35139, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35709, 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+25056, ts+35147, 0, pzErr)
+				pConfig, ts+25122, ts+35717, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11488,
-					ts+35182,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11507,
+					ts+35752,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -145516,7 +146542,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+34829, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+35399, 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)))
@@ -145630,7 +146656,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35226,
+		ts+35796,
 		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))) {
@@ -145800,7 +146826,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+35312)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35882)
 			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))
@@ -146071,7 +147097,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+35317, 0)
+			ts+35887, 0)
 		return SQLITE_ERROR
 	}
 
@@ -146102,7 +147128,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 				} else if iCol >= 0 {
 					bSeenMatch = 1
 					*(*uint8)(unsafe.Pointer(idxStr + uintptr(libc.PostIncInt32(&iIdxStr, 1)))) = uint8('M')
-					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4975, libc.VaList(bp, iCol))
+					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4994, libc.VaList(bp, iCol))
 					idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 
 				}
@@ -146117,7 +147143,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 					}
 					return uint8('G')
 				}()
-				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4975, libc.VaList(bp+8, iCol))
+				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4994, libc.VaList(bp+8, iCol))
 				idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 				(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pInfo)).FaConstraintUsage + uintptr(i)*8)).FargvIndex = libc.PreIncInt32(&iCons, 1)
 
@@ -146431,7 +147457,7 @@ func fts5NextMethod(tls *libc.TLS, pCursor uintptr) int32 {
 					rc = Xsqlite3_reset(tls, (*Fts5Cursor)(unsafe.Pointer(pCsr)).FpStmt)
 					if rc != SQLITE_OK {
 						(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-							ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+							ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 					}
 				} else {
 					rc = SQLITE_OK
@@ -146463,7 +147489,7 @@ func fts5PrepareStatement(tls *libc.TLS, ppStmt uintptr, pConfig uintptr, zFmt u
 		rc = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
 			uint32(SQLITE_PREPARE_PERSISTENT), bp+8, uintptr(0))
 		if rc != SQLITE_OK {
-			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 		}
 		Xsqlite3_free(tls, zSql)
 	}
@@ -146495,25 +147521,25 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35356,
+		ts+35926,
 		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 + 14614
+					return ts + 14633
 				}
-				return ts + 1554
+				return ts + 1573
 			}(),
 			func() uintptr {
 				if zRankArgs != 0 {
 					return zRankArgs
 				}
-				return ts + 1554
+				return ts + 1573
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35411
+					return ts + 35981
 				}
-				return ts + 35416
+				return ts + 35986
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -146559,12 +147585,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+35420, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35990, 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) {
+	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5076, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35426, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35996, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -146595,7 +147621,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+35454, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36024, 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,
@@ -146626,7 +147652,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+35464, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36034, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -146658,14 +147684,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+35485, libc.VaList(bp, z))
+				ts+36055, 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 + 33868
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34438
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -146721,7 +147747,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+35317, 0)
+		ts+35887, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -146764,7 +147790,7 @@ __8:
 	if !(zText == uintptr(0)) {
 		goto __14
 	}
-	zText = ts + 1554
+	zText = ts + 1573
 __14:
 	;
 	iCol = 0
@@ -146938,7 +147964,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35518, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+36088, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -147059,7 +148085,7 @@ func fts5SeekCursor(tls *libc.TLS, pCsr uintptr, bErrormsg int32) int32 {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			} else if (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg != 0 {
 				*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-					ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
+					ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
 			}
 		}
 	}
@@ -147083,28 +148109,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+35554, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36124, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35565, 0)
+				ts+36135, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36215, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35653, 0)
+				ts+36223, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16934, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16953, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35709, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36279, 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+35715, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36285, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -147162,7 +148188,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+17479, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17498, 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)))
@@ -147175,12 +148201,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+35731,
+				ts+36301,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20429
+						return ts + 20495
 					}
-					return ts + 35768
+					return ts + 36338
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -147810,7 +148836,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+35780, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36350, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -148054,7 +149080,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+35801, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36371, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -148073,7 +149099,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+35823, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36393, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -148120,7 +149146,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+35854)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36424)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -148129,7 +149155,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+35867, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+36437, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -148143,7 +149169,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35958, ts + 34057, ts + 25056, ts + 34408, ts + 11488,
+	ts + 36528, ts + 34627, ts + 25122, ts + 34978, ts + 11507,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -148167,7 +149193,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+35965, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+36535, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -148185,13 +149211,13 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35965, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36535, 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+35970, 0,
+				db, ts+36540, 0,
 				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
 				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
@@ -148248,17 +149274,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 + 35985,
-			ts + 36053,
-			ts + 36122,
-			ts + 36155,
-			ts + 36194,
-			ts + 36234,
-			ts + 36273,
-			ts + 36314,
-			ts + 36353,
-			ts + 36395,
-			ts + 36435,
+			ts + 36555,
+			ts + 36623,
+			ts + 36692,
+			ts + 36725,
+			ts + 36764,
+			ts + 36804,
+			ts + 36843,
+			ts + 36884,
+			ts + 36923,
+			ts + 36965,
+			ts + 37005,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -148325,7 +149351,7 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 			(*Fts5Config)(unsafe.Pointer((*Fts5Storage)(unsafe.Pointer(p)).FpConfig)).FbLock--
 			Xsqlite3_free(tls, zSql)
 			if rc != SQLITE_OK && pzErrMsg != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
 			}
 		}
 	}
@@ -148360,18 +149386,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+36458,
+		ts+37028,
 		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+36562,
+			ts+37132,
 			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+36600,
+			ts+37170,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -148383,7 +149409,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+36638,
+			ts+37208,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -148395,14 +149421,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+25056, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11488, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35958, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25122, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11507, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+36528, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34408, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34978, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34057, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34627, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -148414,17 +149440,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+36680,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37250,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29709
+					return ts + 29775
 				}
-				return ts + 1554
+				return ts + 1573
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36710,
+			ts+37280,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -148461,27 +149487,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36754, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37324, 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+36777, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37347, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34057, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34627, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34408, ts+36783, 0, pzErr)
+				pConfig, ts+34978, ts+37353, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35958, ts+36815, 1, pzErr)
+				pConfig, ts+36528, ts+37385, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35124, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -148687,12 +149713,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+36832,
+		ts+37402,
 		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+36882,
+			ts+37452,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -148700,7 +149726,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+34554, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35124, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -148876,7 +149902,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36911,
+	zSql = Xsqlite3_mprintf(tls, ts+37481,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -149058,14 +150084,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+34057, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34627, 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+34408, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34978, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -149260,9 +150286,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+36943) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37513) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37524) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -149477,7 +150503,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 + 36965
+			var zCat uintptr = ts + 37535
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -149489,7 +150515,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+36974) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37544) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -149500,18 +150526,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+36985) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37555) {
 					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+36943) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37513) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37524) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36974) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37544) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -149787,7 +150813,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 + 37003
+	var zBase uintptr = ts + 37573
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -149929,7 +150955,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+37013, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37583, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149937,11 +150963,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37586, 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+37021, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37591, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149949,7 +150975,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37026, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37596, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149957,7 +150983,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37029, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37599, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149965,11 +150991,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37602, 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+37037, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37607, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149977,19 +151003,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37042, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37612, 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+37046, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37616, 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+37052, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37622, 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+37057, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37627, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149997,11 +151023,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37631, 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+37065, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37635, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -150009,7 +151035,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37638, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150017,11 +151043,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37642, 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+37076, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37646, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150029,7 +151055,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37080, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37650, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150037,7 +151063,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37654, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150045,7 +151071,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37088, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37658, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150061,24 +151087,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+37092, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37072, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37662, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37642, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37665, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37668, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37672, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37658, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -150093,137 +151119,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+37105, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37675, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37113, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37683, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37120, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37690, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37125, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37695, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37021, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37591, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37130, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37700, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37016, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37586, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37705, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37088, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37658, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37140, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37710, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15480, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15499, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37145, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37715, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37098, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37668, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37149, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37719, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 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+37724, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37057, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37627, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37160, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37730, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37164, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37734, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37166, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37736, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37080, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37650, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37172, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37742, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37088, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37658, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37180, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37750, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37186, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37756, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37191, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37761, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37197, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37767, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37084, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37654, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37205, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37775, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37213, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37783, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37217, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37787, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37080, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37650, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37225, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37795, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37231, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37801, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37084, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37654, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37237, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37807, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37098, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37668, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -150238,16 +151264,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+37244, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37814, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37029, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37599, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37249, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37819, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -150255,21 +151281,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37254, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37824, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37599, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37260, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37830, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37599, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37213, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37783, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150277,7 +151303,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37266, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37836, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -150285,9 +151311,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37272, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37842, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -150302,12 +151328,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+37278, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37848, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37282, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37852, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37285, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37855, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -150316,7 +151342,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37288, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37858, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -150472,7 +151498,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+37292) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37862) {
 				if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' || *(*uint8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -150652,22 +151678,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 37003, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37573, 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 + 37307, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37877, 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 + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37883, 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 + 37320, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37890, 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
@@ -151810,14 +152836,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+37328) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37898) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37332) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37902) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37336) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37906) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37345, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37915, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -151843,19 +152869,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 + 37379,
-		ts + 37419,
-		ts + 37454,
+		ts + 37949,
+		ts + 37989,
+		ts + 38024,
 	}
 
 	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+23352, *(*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+23418, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37497, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38067, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -151988,11 +153014,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+37530, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+38100, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37561,
+		ts+38131,
 		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))
@@ -152016,7 +153042,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+37612, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38182, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -152300,7 +153326,7 @@ func fts5VocabFilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, zUnused
 		if pLe != 0 {
 			var zCopy uintptr = Xsqlite3_value_text(tls, pLe)
 			if zCopy == uintptr(0) {
-				zCopy = ts + 1554
+				zCopy = ts + 1573
 			}
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm = Xsqlite3_value_bytes(tls, pLe)
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FzLeTerm = Xsqlite3_malloc(tls, (*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm+1)
@@ -152411,7 +153437,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+37638, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+38208, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -152433,7 +153459,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 + 37648
+	return ts + 38218
 }
 
 func init() {
@@ -152859,6 +153885,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1056)) = noopStepFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1064)) = uintptr(unsafe.Pointer(&lagName))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&attach_func)) + 24)) = attachFunc
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 8)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 16)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 24)) = statBestIndex
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 32)) = statDisconnect
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 40)) = statDisconnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 48)) = statOpen
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 56)) = statClose
+	*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 64)) = statFilter
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 72)) = statNext
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 80)) = statEof
+	*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 88)) = statColumn
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 96)) = statRowid
 	*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 0)) = sqlite3MemMalloc
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 8)) = sqlite3MemFree
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 16)) = sqlite3MemRealloc
@@ -153391,8 +154429,9 @@ func init() {
 	*(*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
-	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = Xsqlite3JsonTableFunctions
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = Xsqlite3DbstatRegister
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = sqlite3TestExtInit
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 32)) = Xsqlite3JsonTableFunctions
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statGetFuncdef)) + 24)) = statGet
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statInitFuncdef)) + 24)) = statInit
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statPushFuncdef)) + 24)) = statPush
@@ -153410,5 +154449,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-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 ts1 = "3.41.2\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_DBSTAT_VTAB\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\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\x00true\x00false\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 \x00rowid not at end-of-record for row \x00 of 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\x00CREATE TABLE x( name       TEXT, path       TEXT, pageno     INTEGER, pagetype   TEXT, ncell      INTEGER, payload    INTEGER, unused     INTEGER, mx_payload INTEGER, pgoffset   INTEGER, pgsize     INTEGER, schema     TEXT HIDDEN, aggregate  BOOLEAN HIDDEN)\x00/\x00overflow\x00%s%.3x+%.6x\x00%s%.3x/\x00internal\x00leaf\x00corrupted\x00SELECT * FROM (SELECT 'sqlite_schema' AS name,1 AS rootpage,'table' AS type UNION ALL SELECT name,rootpage,type FROM \"%w\".sqlite_schema WHERE rootpage!=0)\x00WHERE name=%Q\x00 ORDER BY name\x00dbstat\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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 9cb7ea8c..c1429a66 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -208,6 +208,7 @@ const (
 	DBFLAG_SchemaKnownOk                  = 0x0010
 	DBFLAG_Vacuum                         = 0x0004
 	DBFLAG_VacuumInto                     = 0x0008
+	DBSTAT_PAGE_PADDING_BYTES             = 256
 	DB_ResetWanted                        = 0x0008
 	DB_SchemaLoaded                       = 0x0001
 	DB_UnresetViews                       = 0x0002
@@ -917,11 +918,11 @@ const (
 	NC_OrderAgg                           = 0x8000000
 	NC_PartIdx                            = 0x000002
 	NC_SelfRef                            = 0x00002e
+	NC_Subquery                           = 0x000040
 	NC_UAggInfo                           = 0x000100
 	NC_UBaseReg                           = 0x000400
 	NC_UEList                             = 0x000080
 	NC_UUpsert                            = 0x000200
-	NC_VarSelect                          = 0x000040
 	NDEBUG                                = 1
 	NN                                    = 1
 	NOT_WITHIN                            = 0
@@ -1762,6 +1763,7 @@ const (
 	SQLITE_ECEL_REF                       = 0x04
 	SQLITE_EMPTY                          = 16
 	SQLITE_ENABLE_COLUMN_METADATA         = 1
+	SQLITE_ENABLE_DBSTAT_VTAB             = 1
 	SQLITE_ENABLE_FTS5                    = 1
 	SQLITE_ENABLE_GEOPOLY                 = 1
 	SQLITE_ENABLE_LOCKING_STYLE           = 0
@@ -2162,7 +2164,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
+	SQLITE_SOURCE_ID                      = "2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2269,8 +2271,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.41.0"
-	SQLITE_VERSION_NUMBER                 = 3041000
+	SQLITE_VERSION                        = "3.41.2"
+	SQLITE_VERSION_NUMBER                 = 3041002
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -6121,7 +6123,8 @@ type IndexedExpr1 = struct {
 	FiIdxCur       int32
 	FiIdxCol       int32
 	FbMaybeNullRow U8
-	F__ccgo_pad1   [3]byte
+	Faff           U8
+	F__ccgo_pad1   [2]byte
 	FpIENext       uintptr
 }
 
@@ -6763,17 +6766,18 @@ type Pager = Pager1
 
 // Handle type for pages.
 type PgHdr2 = struct {
-	FpPage      uintptr
-	FpData      uintptr
-	FpExtra     uintptr
-	FpCache     uintptr
-	FpDirty     uintptr
-	FpPager     uintptr
-	Fpgno       Pgno
-	Fflags      U16
-	FnRef       I16
-	FpDirtyNext uintptr
-	FpDirtyPrev uintptr
+	FpPage       uintptr
+	FpData       uintptr
+	FpExtra      uintptr
+	FpCache      uintptr
+	FpDirty      uintptr
+	FpPager      uintptr
+	Fpgno        Pgno
+	Fflags       U16
+	F__ccgo_pad1 [2]byte
+	FnRef        I64
+	FpDirtyNext  uintptr
+	FpDirtyPrev  uintptr
 }
 
 // Handle type for pages.
@@ -6994,14 +6998,14 @@ type PCache2 = struct {
 	FpDirty      uintptr
 	FpDirtyTail  uintptr
 	FpSynced     uintptr
-	FnRefSum     int32
+	FnRefSum     I64
 	FszCache     int32
 	FszSpill     int32
 	FszPage      int32
 	FszExtra     int32
 	FbPurgeable  U8
 	FeCreate     U8
-	F__ccgo_pad1 [2]byte
+	F__ccgo_pad1 [6]byte
 	FxStress     uintptr
 	FpStress     uintptr
 	FpCache      uintptr
@@ -7260,7 +7264,7 @@ type CoveringIndexCheck1 = struct {
 	F__ccgo_pad1 [2]byte
 }
 
-var sqlite3azCompileOpt = [52]uintptr{
+var sqlite3azCompileOpt = [53]uintptr{
 	ts + 7,
 	ts + 27,
 	ts + 56,
@@ -7279,40 +7283,41 @@ var sqlite3azCompileOpt = [52]uintptr{
 	ts + 372,
 	ts + 397,
 	ts + 420,
-	ts + 432,
-	ts + 447,
-	ts + 469,
-	ts + 494,
-	ts + 517,
-	ts + 539,
-	ts + 550,
-	ts + 563,
-	ts + 578,
-	ts + 594,
-	ts + 607,
-	ts + 628,
-	ts + 652,
-	ts + 675,
-	ts + 691,
-	ts + 707,
-	ts + 731,
-	ts + 758,
-	ts + 778,
-	ts + 799,
-	ts + 821,
-	ts + 851,
-	ts + 876,
-	ts + 902,
-	ts + 922,
-	ts + 948,
-	ts + 971,
-	ts + 997,
-	ts + 1019,
-	ts + 1040,
-	ts + 1051,
+	ts + 439,
+	ts + 451,
+	ts + 466,
+	ts + 488,
+	ts + 513,
+	ts + 536,
+	ts + 558,
+	ts + 569,
+	ts + 582,
+	ts + 597,
+	ts + 613,
+	ts + 626,
+	ts + 647,
+	ts + 671,
+	ts + 694,
+	ts + 710,
+	ts + 726,
+	ts + 750,
+	ts + 777,
+	ts + 797,
+	ts + 818,
+	ts + 840,
+	ts + 870,
+	ts + 895,
+	ts + 921,
+	ts + 941,
+	ts + 967,
+	ts + 990,
+	ts + 1016,
+	ts + 1038,
 	ts + 1059,
-	ts + 1073,
-	ts + 1086,
+	ts + 1070,
+	ts + 1078,
+	ts + 1092,
+	ts + 1105,
 }
 
 func Xsqlite3CompileOptions(tls *libc.TLS, pnOpt uintptr) uintptr {
@@ -7464,7 +7469,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 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))
+var Xsqlite3StrBINARY = *(*[7]uint8)(unsafe.Pointer(ts + 1118))
 
 // Standard typenames.  These names must match the COLTYPE_* definitions.
 // Adjust the SQLITE_N_STDTYPE value if adding or removing entries.
@@ -7486,12 +7491,12 @@ var Xsqlite3StdTypeAffinity = [6]uint8{
 	uint8(SQLITE_AFF_TEXT),
 }
 var Xsqlite3StdType = [6]uintptr{
-	ts + 1106,
-	ts + 1110,
-	ts + 1115,
-	ts + 1119,
-	ts + 1127,
-	ts + 1132,
+	ts + 1125,
+	ts + 1129,
+	ts + 1134,
+	ts + 1138,
+	ts + 1146,
+	ts + 1151,
 }
 
 // SQL is translated into a sequence of instructions to be
@@ -7808,7 +7813,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, 23229)
+		return Xsqlite3MisuseError(tls, 23233)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -8237,7 +8242,7 @@ __6:
 __4:
 	;
 	zDate++
-	if !(getDigits(tls, zDate, ts+1137, libc.VaList(bp, bp+16, bp+20)) != 2) {
+	if !(getDigits(tls, zDate, ts+1156, libc.VaList(bp, bp+16, bp+20)) != 2) {
 		goto __9
 	}
 	return 1
@@ -8263,13 +8268,13 @@ func parseHhMmSs(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	defer tls.Free(36)
 
 	var ms float64 = 0.0
-	if getDigits(tls, zDate, ts+1145, libc.VaList(bp, bp+24, bp+28)) != 2 {
+	if getDigits(tls, zDate, ts+1164, libc.VaList(bp, bp+24, bp+28)) != 2 {
 		return 1
 	}
 	zDate += uintptr(5)
 	if int32(*(*uint8)(unsafe.Pointer(zDate))) == ':' {
 		zDate++
-		if getDigits(tls, zDate, ts+1153, libc.VaList(bp+16, bp+32)) != 1 {
+		if getDigits(tls, zDate, ts+1172, libc.VaList(bp+16, bp+32)) != 1 {
 			return 1
 		}
 		zDate += uintptr(2)
@@ -8367,7 +8372,7 @@ func parseYyyyMmDd(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	} else {
 		neg = 0
 	}
-	if getDigits(tls, zDate, ts+1157, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
+	if getDigits(tls, zDate, ts+1176, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
 		return 1
 	}
 	zDate += uintptr(10)
@@ -8424,7 +8429,7 @@ func parseDateOrTime(tls *libc.TLS, context uintptr, zDate uintptr, p uintptr) i
 		return 0
 	} else if parseHhMmSs(tls, zDate, p) == 0 {
 		return 0
-	} else if Xsqlite3StrICmp(tls, zDate, ts+1169) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
+	} else if Xsqlite3StrICmp(tls, zDate, ts+1188) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
 		return setDateTimeToCurrent(tls, context, p)
 	} else if Xsqlite3AtoF(tls, zDate, bp, Xsqlite3Strlen30(tls, zDate), uint8(SQLITE_UTF8)) > 0 {
 		setRawDateNumber(tls, p, *(*float64)(unsafe.Pointer(bp)))
@@ -8557,7 +8562,7 @@ func toLocaltime(tls *libc.TLS, p uintptr, pCtx uintptr) int32 {
 		*(*Time_t)(unsafe.Pointer(bp + 104)) = (*DateTime)(unsafe.Pointer(p)).FiJD/int64(1000) - int64(21086676)*int64(10000)
 	}
 	if osLocaltime(tls, bp+104, bp) != 0 {
-		Xsqlite3_result_error(tls, pCtx, ts+1173, -1)
+		Xsqlite3_result_error(tls, pCtx, ts+1192, -1)
 		return SQLITE_ERROR
 	}
 	(*DateTime)(unsafe.Pointer(p)).FY = (*tm)(unsafe.Pointer(bp)).Ftm_year + 1900 - iYearDiff
@@ -8581,12 +8586,12 @@ var aXformType = [6]struct {
 	FrLimit float32
 	FrXform float32
 }{
-	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1196)), FrLimit: 4.6427e+14, FrXform: 1.0},
-	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1203)), FrLimit: 7.7379e+12, FrXform: 60.0},
-	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1210)), FrLimit: 1.2897e+11, FrXform: 3600.0},
-	{FnName: U8(3), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1217)), FrLimit: 5373485.0, FrXform: 86400.0},
-	{FnName: U8(5), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1224)), FrLimit: 176546.0, FrXform: 2592000.0},
-	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1231)), FrLimit: 14713.0, FrXform: 31536000.0},
+	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1215)), FrLimit: 4.6427e+14, FrXform: 1.0},
+	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1222)), FrLimit: 7.7379e+12, FrXform: 60.0},
+	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1229)), FrLimit: 1.2897e+11, FrXform: 3600.0},
+	{FnName: U8(3), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1236)), FrLimit: 5373485.0, FrXform: 86400.0},
+	{FnName: U8(5), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1243)), FrLimit: 176546.0, FrXform: 2592000.0},
+	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1250)), FrLimit: 14713.0, FrXform: 31536000.0},
 }
 
 func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, idx int32) int32 {
@@ -8598,7 +8603,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 	switch int32(Xsqlite3UpperToLower[*(*uint8)(unsafe.Pointer(z))]) {
 	case 'a':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1238) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1257) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8620,7 +8625,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'j':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1243) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1262) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8634,7 +8639,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'l':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1253) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1272) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				rc = toLocaltime(tls, p, pCtx)
 			}
 			break
@@ -8642,7 +8647,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'u':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1263) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1282) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8654,7 +8659,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					(*DateTime)(unsafe.Pointer(p)).FrawS = uint8(0)
 					rc = 0
 				}
-			} else if Xsqlite3_stricmp(tls, z, ts+1273) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1292) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				if int32((*DateTime)(unsafe.Pointer(p)).FtzSet) == 0 {
 					var iOrigJD I64
 					var iGuess I64
@@ -8688,7 +8693,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'w':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1277, 8) == 0 &&
+			if Xsqlite3_strnicmp(tls, z, ts+1296, 8) == 0 &&
 				Xsqlite3AtoF(tls, z+8, bp+48, Xsqlite3Strlen30(tls, z+8), uint8(SQLITE_UTF8)) > 0 &&
 				*(*float64)(unsafe.Pointer(bp + 48)) >= 0.0 && *(*float64)(unsafe.Pointer(bp + 48)) < 7.0 && float64(libc.AssignInt32(&n, int32(*(*float64)(unsafe.Pointer(bp + 48))))) == *(*float64)(unsafe.Pointer(bp + 48)) {
 				var Z Sqlite3_int64
@@ -8709,7 +8714,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 's':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1286, 9) != 0 {
+			if Xsqlite3_strnicmp(tls, z, ts+1305, 9) != 0 {
 				break
 			}
 			if !(int32((*DateTime)(unsafe.Pointer(p)).FvalidJD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidYMD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidHMS) != 0) {
@@ -8723,14 +8728,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 			(*DateTime)(unsafe.Pointer(p)).FrawS = uint8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidTZ = uint8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidJD = uint8(0)
-			if Xsqlite3_stricmp(tls, z, ts+1296) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1315) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1302) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1321) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FM = 1
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1307) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1326) == 0 {
 				rc = 0
 			}
 			break
@@ -9056,7 +9061,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		switch int32(*(*uint8)(unsafe.Pointer(zFmt + uintptr(i)))) {
 		case 'd':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
 				break
 
 			}
@@ -9066,13 +9071,13 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if s > 59.999 {
 					s = 59.999
 				}
-				Xsqlite3_str_appendf(tls, bp+136, ts+1316, libc.VaList(bp+8, s))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1335, libc.VaList(bp+8, s))
 				break
 
 			}
 		case 'H':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
 				break
 
 			}
@@ -9090,41 +9095,41 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if int32(*(*uint8)(unsafe.Pointer(zFmt + uintptr(i)))) == 'W' {
 					var wd int32
 					wd = int32(((*DateTime)(unsafe.Pointer(bp+88)).FiJD + int64(43200000)) / int64(86400000) % int64(7))
-					Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+24, (nDay+7-wd)/7))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+24, (nDay+7-wd)/7))
 				} else {
-					Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+32, nDay+1))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1342, libc.VaList(bp+32, nDay+1))
 				}
 				break
 
 			}
 		case 'J':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1328, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1347, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
 				break
 
 			}
 		case 'm':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
 				break
 
 			}
 		case 'M':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
 				break
 
 			}
 		case 's':
 			{
 				var iS I64 = (*DateTime)(unsafe.Pointer(bp+88)).FiJD/int64(1000) - int64(21086676)*int64(10000)
-				Xsqlite3_str_appendf(tls, bp+136, ts+1334, libc.VaList(bp+64, iS))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1353, libc.VaList(bp+64, iS))
 				break
 
 			}
 		case 'S':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
 				break
 
 			}
@@ -9137,7 +9142,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			}
 		case 'Y':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1339, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1358, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
 				break
 
 			}
@@ -9187,15 +9192,15 @@ func Xsqlite3RegisterDateTimeFunctions(tls *libc.TLS) {
 }
 
 var aDateTimeFuncs = [9]FuncDef{
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1243},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1263},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1344},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1349},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1354},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1262},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1282},
 	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1363},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1372},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1385},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1403}}
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1368},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1373},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1382},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1391},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1404},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1422}}
 
 // The following routines are convenience wrappers around methods
 // of the sqlite3_file object.  This is mostly just syntactic sugar. All
@@ -9610,7 +9615,7 @@ func sqlite3MemMalloc(tls *libc.TLS, nByte int32) uintptr {
 		*(*Sqlite3_int64)(unsafe.Pointer(p)) = Sqlite3_int64(nByte)
 		p += 8
 	} else {
-		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1416, libc.VaList(bp, nByte))
+		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1435, libc.VaList(bp, nByte))
 	}
 	return p
 }
@@ -9643,7 +9648,7 @@ func sqlite3MemRealloc(tls *libc.TLS, pPrior uintptr, nByte int32) uintptr {
 		p += 8
 	} else {
 		Xsqlite3_log(tls, SQLITE_NOMEM,
-			ts+1454,
+			ts+1473,
 			libc.VaList(bp, sqlite3MemSize(tls, pPrior), nByte))
 	}
 	return p
@@ -10519,7 +10524,7 @@ func Xsqlite3OomFault(tls *libc.TLS, db uintptr) uintptr {
 		(*Sqlite3)(unsafe.Pointer(db)).Flookaside.Fsz = U16(0)
 		if (*Sqlite3)(unsafe.Pointer(db)).FpParse != 0 {
 			var pParse uintptr
-			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1490, 0)
+			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1509, 0)
 			(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 			for pParse = (*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).FpOuterParse; pParse != 0; pParse = (*Parse)(unsafe.Pointer(pParse)).FpOuterParse {
 				(*Parse)(unsafe.Pointer(pParse)).FnErr++
@@ -10592,8 +10597,8 @@ type et_info = struct {
 // by an instance of the following structure
 type Et_info = et_info
 
-var aDigits = *(*[33]uint8)(unsafe.Pointer(ts + 1504))
-var aPrefix = *(*[7]uint8)(unsafe.Pointer(ts + 1537))
+var aDigits = *(*[33]uint8)(unsafe.Pointer(ts + 1523))
+var aPrefix = *(*[7]uint8)(unsafe.Pointer(ts + 1556))
 var fmtinfo = [23]Et_info{
 	{Ffmttype: uint8('d'), Fbase: EtByte(10), Fflags: EtByte(1), Ftype: EtByte(EtDECIMAL)},
 	{Ffmttype: uint8('s'), Fflags: EtByte(4), Ftype: EtByte(EtSTRING)},
@@ -10807,7 +10812,7 @@ __6:
 	if !(libc.AssignInt32(&c, int32(*(*uint8)(unsafe.Pointer(libc.PreIncUintptr(&fmt, 1))))) == 0) {
 		goto __11
 	}
-	Xsqlite3_str_append(tls, pAccum, ts+1544, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1563, 1)
 	goto __5
 __11:
 	;
@@ -11364,7 +11369,7 @@ __125:
 	if !(Xsqlite3IsNaN(tls, *(*float64)(unsafe.Pointer(bp + 104))) != 0) {
 		goto __127
 	}
-	bufpt = ts + 1546
+	bufpt = ts + 1565
 	length = 3
 	goto __58
 __127:
@@ -11424,7 +11429,7 @@ __138:
 	}
 	bufpt = bp + 16
 	*(*uint8)(unsafe.Pointer(bp + 16)) = prefix
-	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1550, uint64(4))
+	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1569, uint64(4))
 	length = 3 + libc.Bool32(int32(prefix) != 0)
 	goto __58
 __139:
@@ -11790,7 +11795,7 @@ __200:
 	if !(bufpt == uintptr(0)) {
 		goto __201
 	}
-	bufpt = ts + 1554
+	bufpt = ts + 1573
 	goto __202
 __201:
 	if !(int32(xtype) == EtDYNSTRING) {
@@ -11914,9 +11919,9 @@ __222:
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
-			return ts + 1555
+			return ts + 1574
 		}
-		return ts + 1560
+		return ts + 1579
 	}()
 __223:
 	;
@@ -12064,7 +12069,7 @@ __246:
 		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
-	Xsqlite3_str_append(tls, pAccum, ts+1567, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1586, 1)
 __250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
@@ -12081,10 +12086,10 @@ __251:
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
 		goto __253
 	}
-	Xsqlite3_str_appendf(tls, pAccum, ts+1569, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1588, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 	goto __254
 __253:
-	Xsqlite3_str_appendf(tls, pAccum, ts+1579, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1598, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
 __254:
 	;
 __252:
@@ -12139,7 +12144,7 @@ __4:
 __5:
 }
 
-var zOrd = *(*[9]uint8)(unsafe.Pointer(ts + 1593))
+var zOrd = *(*[9]uint8)(unsafe.Pointer(ts + 1612))
 
 // The z string points to the first character of a token that is
 // associated with an error.  If db does not already have an error
@@ -12304,7 +12309,7 @@ func Xsqlite3ResultStrAccum(tls *libc.TLS, pCtx uintptr, p uintptr) {
 	} else if int32((*StrAccum)(unsafe.Pointer(p)).FprintfFlags)&SQLITE_PRINTF_MALLOCED != 0 {
 		Xsqlite3_result_text(tls, pCtx, (*StrAccum)(unsafe.Pointer(p)).FzText, int32((*StrAccum)(unsafe.Pointer(p)).FnChar), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 	} else {
-		Xsqlite3_result_text(tls, pCtx, ts+1554, 0, uintptr(0))
+		Xsqlite3_result_text(tls, pCtx, ts+1573, 0, uintptr(0))
 		Xsqlite3_str_reset(tls, p)
 	}
 }
@@ -14040,7 +14045,7 @@ func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
 	var c int32 = 0
 	var i int32
 
-	var pow63 uintptr = ts + 1602
+	var pow63 uintptr = ts + 1621
 	for i = 0; c == 0 && i < 18; i++ {
 		c = (int32(*(*uint8)(unsafe.Pointer(zNum + uintptr(i*incr)))) - int32(*(*uint8)(unsafe.Pointer(pow63 + uintptr(i))))) * 10
 	}
@@ -14586,7 +14591,7 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 	defer tls.Free(8)
 
 	Xsqlite3_log(tls, SQLITE_MISUSE,
-		ts+1621,
+		ts+1640,
 		libc.VaList(bp, zType))
 }
 
@@ -14605,13 +14610,13 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 func Xsqlite3SafetyCheckOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	if db == uintptr(0) {
-		logBadConnection(tls, ts+1555)
+		logBadConnection(tls, ts+1574)
 		return 0
 	}
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_OPEN {
 		if Xsqlite3SafetyCheckSickOrOk(tls, db) != 0 {
-			logBadConnection(tls, ts+1666)
+			logBadConnection(tls, ts+1685)
 		}
 		return 0
 	} else {
@@ -14624,7 +14629,7 @@ func Xsqlite3SafetyCheckSickOrOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_SICK && int32(eOpenState) != SQLITE_STATE_OPEN && int32(eOpenState) != SQLITE_STATE_BUSY {
-		logBadConnection(tls, ts+1675)
+		logBadConnection(tls, ts+1694)
 		return 0
 	} else {
 		return 1
@@ -15098,193 +15103,193 @@ func Xsqlite3OpcodeName(tls *libc.TLS, i int32) uintptr {
 }
 
 var azName = [187]uintptr{
-	ts + 1683,
-	ts + 1693,
-	ts + 1704,
-	ts + 1716,
-	ts + 1727,
-	ts + 1739,
+	ts + 1702,
+	ts + 1712,
+	ts + 1723,
+	ts + 1735,
 	ts + 1746,
-	ts + 1754,
-	ts + 1762,
-	ts + 1767,
-	ts + 1772,
-	ts + 1778,
-	ts + 1792,
-	ts + 1798,
-	ts + 1808,
-	ts + 1813,
-	ts + 1818,
-	ts + 1821,
+	ts + 1758,
+	ts + 1765,
+	ts + 1773,
+	ts + 1781,
+	ts + 1786,
+	ts + 1791,
+	ts + 1797,
+	ts + 1811,
+	ts + 1817,
 	ts + 1827,
-	ts + 1834,
-	ts + 1838,
-	ts + 1848,
-	ts + 1855,
-	ts + 1862,
-	ts + 1869,
-	ts + 1876,
-	ts + 1886,
+	ts + 1832,
+	ts + 1837,
+	ts + 1840,
+	ts + 1846,
+	ts + 1853,
+	ts + 1857,
+	ts + 1867,
+	ts + 1874,
+	ts + 1881,
+	ts + 1888,
 	ts + 1895,
-	ts + 1906,
-	ts + 1915,
-	ts + 1921,
-	ts + 1931,
-	ts + 1941,
-	ts + 1946,
-	ts + 1956,
-	ts + 1967,
-	ts + 1972,
-	ts + 1979,
-	ts + 1990,
-	ts + 1995,
-	ts + 2000,
-	ts + 2006,
-	ts + 2012,
-	ts + 2018,
-	ts + 2021,
+	ts + 1905,
+	ts + 1914,
+	ts + 1925,
+	ts + 1934,
+	ts + 1940,
+	ts + 1950,
+	ts + 1960,
+	ts + 1965,
+	ts + 1975,
+	ts + 1986,
+	ts + 1991,
+	ts + 1998,
+	ts + 2009,
+	ts + 2014,
+	ts + 2019,
 	ts + 2025,
 	ts + 2031,
-	ts + 2042,
-	ts + 2053,
+	ts + 2037,
+	ts + 2040,
+	ts + 2044,
+	ts + 2050,
 	ts + 2061,
-	ts + 2070,
-	ts + 2077,
-	ts + 2085,
-	ts + 2088,
-	ts + 2091,
-	ts + 2094,
-	ts + 2097,
-	ts + 2100,
-	ts + 2103,
+	ts + 2072,
+	ts + 2080,
+	ts + 2089,
+	ts + 2096,
+	ts + 2104,
+	ts + 2107,
 	ts + 2110,
+	ts + 2113,
 	ts + 2116,
-	ts + 2126,
-	ts + 2139,
-	ts + 2150,
-	ts + 2156,
-	ts + 2163,
-	ts + 2172,
-	ts + 2181,
-	ts + 2188,
-	ts + 2201,
-	ts + 2212,
-	ts + 2217,
-	ts + 2225,
+	ts + 2119,
+	ts + 2122,
+	ts + 2129,
+	ts + 2135,
+	ts + 2145,
+	ts + 2158,
+	ts + 2169,
+	ts + 2175,
+	ts + 2182,
+	ts + 2191,
+	ts + 2200,
+	ts + 2207,
+	ts + 2220,
 	ts + 2231,
-	ts + 2238,
+	ts + 2236,
+	ts + 2244,
 	ts + 2250,
-	ts + 2255,
-	ts + 2264,
+	ts + 2257,
 	ts + 2269,
-	ts + 2278,
+	ts + 2274,
 	ts + 2283,
 	ts + 2288,
-	ts + 2294,
+	ts + 2297,
 	ts + 2302,
-	ts + 2310,
-	ts + 2320,
-	ts + 2328,
-	ts + 2335,
-	ts + 2348,
-	ts + 2353,
-	ts + 2365,
-	ts + 2373,
-	ts + 2380,
-	ts + 2391,
-	ts + 2398,
-	ts + 2405,
-	ts + 2415,
+	ts + 2307,
+	ts + 2313,
+	ts + 2321,
+	ts + 2329,
+	ts + 2339,
+	ts + 2347,
+	ts + 2354,
+	ts + 2367,
+	ts + 2372,
+	ts + 2384,
+	ts + 2392,
+	ts + 2399,
+	ts + 2410,
+	ts + 2417,
 	ts + 2424,
-	ts + 2435,
-	ts + 2441,
-	ts + 2452,
-	ts + 2462,
-	ts + 2472,
-	ts + 2479,
-	ts + 2485,
-	ts + 2495,
-	ts + 2506,
-	ts + 2510,
-	ts + 2519,
-	ts + 2528,
-	ts + 2535,
-	ts + 2545,
-	ts + 2552,
-	ts + 2561,
+	ts + 2434,
+	ts + 2443,
+	ts + 2454,
+	ts + 2460,
+	ts + 2471,
+	ts + 2481,
+	ts + 2491,
+	ts + 2498,
+	ts + 2504,
+	ts + 2514,
+	ts + 2525,
+	ts + 2529,
+	ts + 2538,
+	ts + 2547,
+	ts + 2554,
+	ts + 2564,
 	ts + 2571,
-	ts + 2578,
-	ts + 2586,
-	ts + 2600,
-	ts + 2608,
-	ts + 2622,
-	ts + 2633,
-	ts + 2646,
-	ts + 2657,
-	ts + 2663,
-	ts + 2675,
-	ts + 2684,
-	ts + 2692,
-	ts + 2701,
-	ts + 2710,
-	ts + 2717,
-	ts + 2725,
-	ts + 2732,
-	ts + 2743,
-	ts + 2757,
-	ts + 2768,
+	ts + 2580,
+	ts + 2590,
+	ts + 2597,
+	ts + 2605,
+	ts + 2619,
+	ts + 2627,
+	ts + 2641,
+	ts + 2652,
+	ts + 2665,
+	ts + 2676,
+	ts + 2682,
+	ts + 2694,
+	ts + 2703,
+	ts + 2711,
+	ts + 2720,
+	ts + 2729,
+	ts + 2736,
+	ts + 2744,
+	ts + 2751,
+	ts + 2762,
 	ts + 2776,
-	ts + 2782,
-	ts + 2790,
-	ts + 2798,
-	ts + 2808,
-	ts + 2821,
-	ts + 2831,
-	ts + 2844,
-	ts + 2853,
-	ts + 2864,
+	ts + 2787,
+	ts + 2795,
+	ts + 2801,
+	ts + 2809,
+	ts + 2817,
+	ts + 2827,
+	ts + 2840,
+	ts + 2850,
+	ts + 2863,
 	ts + 2872,
-	ts + 2878,
-	ts + 2890,
-	ts + 2902,
-	ts + 2910,
-	ts + 2922,
-	ts + 2935,
-	ts + 2945,
-	ts + 2955,
-	ts + 2960,
-	ts + 2972,
-	ts + 2984,
-	ts + 2994,
-	ts + 3000,
-	ts + 3010,
-	ts + 3017,
+	ts + 2883,
+	ts + 2891,
+	ts + 2897,
+	ts + 2909,
+	ts + 2921,
+	ts + 2929,
+	ts + 2941,
+	ts + 2954,
+	ts + 2964,
+	ts + 2974,
+	ts + 2979,
+	ts + 2991,
+	ts + 3003,
+	ts + 3013,
+	ts + 3019,
 	ts + 3029,
-	ts + 3040,
+	ts + 3036,
 	ts + 3048,
-	ts + 3057,
-	ts + 3066,
-	ts + 3075,
-	ts + 3082,
-	ts + 3093,
-	ts + 3106,
-	ts + 3116,
-	ts + 3123,
-	ts + 3131,
-	ts + 3140,
-	ts + 3146,
-	ts + 3154,
-	ts + 3162,
-	ts + 3170,
-	ts + 3180,
+	ts + 3059,
+	ts + 3067,
+	ts + 3076,
+	ts + 3085,
+	ts + 3094,
+	ts + 3101,
+	ts + 3112,
+	ts + 3125,
+	ts + 3135,
+	ts + 3142,
+	ts + 3150,
+	ts + 3159,
+	ts + 3165,
+	ts + 3173,
+	ts + 3181,
 	ts + 3189,
-	ts + 3200,
-	ts + 3210,
-	ts + 3216,
-	ts + 3227,
-	ts + 3238,
-	ts + 3243,
-	ts + 3251,
+	ts + 3199,
+	ts + 3208,
+	ts + 3219,
+	ts + 3229,
+	ts + 3235,
+	ts + 3246,
+	ts + 3257,
+	ts + 3262,
+	ts + 3270,
 }
 
 type stat = struct {
@@ -15663,35 +15668,35 @@ type unix_syscall = struct {
 }
 
 var aSyscall = [29]unix_syscall{
-	{FzName: ts + 3261, FpCurrent: 0},
-	{FzName: ts + 3266, FpCurrent: 0},
-	{FzName: ts + 3272, FpCurrent: 0},
-	{FzName: ts + 3279, FpCurrent: 0},
-	{FzName: ts + 3286, FpCurrent: 0},
+	{FzName: ts + 3280, FpCurrent: 0},
+	{FzName: ts + 3285, FpCurrent: 0},
 	{FzName: ts + 3291, FpCurrent: 0},
-	{FzName: ts + 3297, FpCurrent: 0},
-	{FzName: ts + 3307, FpCurrent: 0},
-	{FzName: ts + 3313, FpCurrent: 0},
-	{FzName: ts + 3318},
-	{FzName: ts + 3324},
+	{FzName: ts + 3298, FpCurrent: 0},
+	{FzName: ts + 3305, FpCurrent: 0},
+	{FzName: ts + 3310, FpCurrent: 0},
+	{FzName: ts + 3316, FpCurrent: 0},
+	{FzName: ts + 3326, FpCurrent: 0},
 	{FzName: ts + 3332, FpCurrent: 0},
-	{FzName: ts + 3338},
-	{FzName: ts + 3345},
-	{FzName: ts + 3354, FpCurrent: 0},
-	{FzName: ts + 3361},
-	{FzName: ts + 3371, FpCurrent: 0},
-	{FzName: ts + 3378, FpCurrent: 0},
-	{FzName: ts + 3392, FpCurrent: 0},
-	{FzName: ts + 3398, FpCurrent: 0},
-	{FzName: ts + 3404, FpCurrent: 0},
+	{FzName: ts + 3337},
+	{FzName: ts + 3343},
+	{FzName: ts + 3351, FpCurrent: 0},
+	{FzName: ts + 3357},
+	{FzName: ts + 3364},
+	{FzName: ts + 3373, FpCurrent: 0},
+	{FzName: ts + 3380},
+	{FzName: ts + 3390, FpCurrent: 0},
+	{FzName: ts + 3397, FpCurrent: 0},
 	{FzName: ts + 3411, FpCurrent: 0},
-	{FzName: ts + 3419, FpCurrent: 0},
-	{FzName: ts + 3424, FpCurrent: 0},
-	{FzName: ts + 3431, FpCurrent: 0},
+	{FzName: ts + 3417, FpCurrent: 0},
+	{FzName: ts + 3423, FpCurrent: 0},
+	{FzName: ts + 3430, FpCurrent: 0},
 	{FzName: ts + 3438, FpCurrent: 0},
+	{FzName: ts + 3443, FpCurrent: 0},
 	{FzName: ts + 3450, FpCurrent: 0},
-	{FzName: ts + 3459, FpCurrent: 0},
-	{FzName: ts + 3465},
+	{FzName: ts + 3457, FpCurrent: 0},
+	{FzName: ts + 3469, FpCurrent: 0},
+	{FzName: ts + 3478, FpCurrent: 0},
+	{FzName: ts + 3484},
 }
 
 func robustFchown(tls *libc.TLS, fd int32, uid Uid_t, gid Gid_t) int32 {
@@ -15789,9 +15794,9 @@ func robust_open(tls *libc.TLS, z uintptr, f int32, m Mode_t) int32 {
 		}
 		(*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, fd)
 		Xsqlite3_log(tls, SQLITE_WARNING,
-			ts+3471, libc.VaList(bp, z, fd))
+			ts+3490, libc.VaList(bp, z, fd))
 		fd = -1
-		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3514, O_RDONLY, int32(m)) < 0 {
+		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3533, O_RDONLY, int32(m)) < 0 {
 			break
 		}
 	}
@@ -15870,13 +15875,13 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 	var zErr uintptr
 	var iErrno int32 = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 
-	zErr = ts + 1554
+	zErr = ts + 1573
 
 	if zPath == uintptr(0) {
-		zPath = ts + 1554
+		zPath = ts + 1573
 	}
 	Xsqlite3_log(tls, errcode,
-		ts+3524,
+		ts+3543,
 		libc.VaList(bp, iLine, iErrno, zFunc, zPath, zErr))
 
 	return errcode
@@ -15884,7 +15889,7 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 
 func robust_close(tls *libc.TLS, pFile uintptr, h int32, lineno int32) {
 	if (*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, h) != 0 {
-		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3266,
+		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3285,
 			func() uintptr {
 				if pFile != 0 {
 					return (*UnixFile)(unsafe.Pointer(pFile)).FzPath
@@ -15905,7 +15910,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, 38271)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38275)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -16007,19 +16012,19 @@ func verifyDbFile(tls *libc.TLS, pFile uintptr) {
 
 	rc = (*(*func(*libc.TLS, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 5*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, bp+32)
 	if rc != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3555, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3574, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink == uint64(0) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3579, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3598, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink > uint64(1) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3608, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3627, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if fileHasMoved(tls, pFile) != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3635, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3654, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 }
@@ -16382,7 +16387,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, 39055)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39059)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -16655,7 +16660,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	var ii int32
 	var fd int32 = -1
 
-	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3663, libc.VaList(bp, zFilename))
+	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3682, libc.VaList(bp, zFilename))
 	for ii = int32(libc.Xstrlen(tls, bp+8)); ii > 0 && int32(*(*uint8)(unsafe.Pointer(bp + 8 + uintptr(ii)))) != '/'; ii-- {
 	}
 	if ii > 0 {
@@ -16673,7 +16678,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3378, bp+8, 40676)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40680), ts+3397, bp+8, 40680)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -16690,14 +16695,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, 40717)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3685, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40721)
 	}
 
 	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)), 40731)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40735)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -16717,7 +16722,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, 40762)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3316, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40766)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -16772,7 +16777,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 				if iWrite >= nSize {
 					iWrite = nSize - int64(1)
 				}
-				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1554, 1)
+				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1573, 1)
 				if nWrite != 1 {
 					return SQLITE_IOERR | int32(3)<<8
 				}
@@ -16785,7 +16790,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, 40883)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3316, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40887)
 			}
 		}
 
@@ -16853,7 +16858,7 @@ func unixFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 		}
 	case SQLITE_FCNTL_VFSNAME:
 		{
-			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
+			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
 			return SQLITE_OK
 
 		}
@@ -17012,7 +17017,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, 41442)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41446)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -17040,7 +17045,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, 41499)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3316, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41503)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -17103,7 +17108,7 @@ __4:
 	;
 	libc.Xmemset(tls, pShmNode, 0, uint64(unsafe.Sizeof(unixShmNode{}))+uint64(nShmFilename))
 	zShm = libc.AssignPtrUintptr(pShmNode+16, pShmNode+1*96)
-	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3677, libc.VaList(bp, zBasePath))
+	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3696, libc.VaList(bp, zBasePath))
 
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = -1
 	(*UnixInodeInfo)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pDbFd)).FpInode)).FpShmNode = pShmNode
@@ -17124,7 +17129,7 @@ __5:
 	if !(int32((*UnixInodeInfo)(unsafe.Pointer(pInode)).FbProcessLock) == 0) {
 		goto __7
 	}
-	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3684, 0)) {
+	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3703, 0)) {
 		goto __8
 	}
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = robust_open(tls, zShm, O_RDWR|O_CREAT|0100000,
@@ -17139,7 +17144,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3261, zShm, 41624)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41628), ts+3280, zShm, 41628)
 	goto shm_open_err
 __10:
 	;
@@ -17265,11 +17270,11 @@ __11:
 		goto __13
 	}
 	*(*int32)(unsafe.Pointer(bp + 144)) = 0
-	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1554, 1, bp+144) != 1) {
+	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1573, 1, bp+144) != 1) {
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41768)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3351, zFile, 41772)
 	goto shmpage_out
 __14:
 	;
@@ -17315,7 +17320,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3419, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3438, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41799)
 	goto shmpage_out
 __20:
 	;
@@ -17516,7 +17521,7 @@ func unixUnmapfile(tls *libc.TLS, pFd uintptr) {
 }
 
 func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
-	var zErr uintptr = ts + 3419
+	var zErr uintptr = ts + 3438
 	var h int32 = (*UnixFile)(unsafe.Pointer(pFd)).Fh
 	var pOrig uintptr = (*UnixFile)(unsafe.Pointer(pFd)).FpMapRegion
 	var nOrig I64 = (*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeActual
@@ -17532,7 +17537,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 		}
 
 		pNew = (*(*func(*libc.TLS, uintptr, Size_t, Size_t, int32, uintptr) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 24*24 + 8)))(tls, pOrig, uint64(nReuse), uint64(nNew), MREMAP_MAYMOVE, 0)
-		zErr = ts + 3431
+		zErr = ts + 3450
 
 		if pNew == libc.UintptrFromInt32(-1) || pNew == uintptr(0) {
 			(*(*func(*libc.TLS, uintptr, Size_t) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 23*24 + 8)))(tls, pOrig, uint64(nReuse))
@@ -17546,7 +17551,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, 42169)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42173)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -17661,10 +17666,10 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		}
 		return uintptr(0)
 	}(),
-		ts+3697, SQLITE_POWERSAFE_OVERWRITE) != 0 {
+		ts+3716, SQLITE_POWERSAFE_OVERWRITE) != 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_PSOW)
 	}
-	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3702) == 0 {
+	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3721) == 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_EXCL)
 	}
 
@@ -17680,7 +17685,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, 42672)
+			robust_close(tls, pNew, h, 42676)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -17693,7 +17698,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		if zLockFile == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
-			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3712, libc.VaList(bp, zFilename))
+			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3731, libc.VaList(bp, zFilename))
 		}
 		(*UnixFile)(unsafe.Pointer(pNew)).FlockingContext = zLockFile
 	}
@@ -17701,7 +17706,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, 42757)
+			robust_close(tls, pNew, h, 42761)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -17714,15 +17719,15 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 var azTempDirs = [6]uintptr{
 	uintptr(0),
 	uintptr(0),
-	ts + 3720,
-	ts + 3729,
-	ts + 3738,
-	ts + 1567,
+	ts + 3739,
+	ts + 3748,
+	ts + 3757,
+	ts + 1586,
 }
 
 func unixTempFileInit(tls *libc.TLS) {
-	azTempDirs[0] = libc.Xgetenv(tls, ts+3743)
-	azTempDirs[1] = libc.Xgetenv(tls, ts+3757)
+	azTempDirs[0] = libc.Xgetenv(tls, ts+3762)
+	azTempDirs[1] = libc.Xgetenv(tls, ts+3776)
 }
 
 func unixTempFileDir(tls *libc.TLS) uintptr {
@@ -17767,7 +17772,7 @@ func unixGetTempname(tls *libc.TLS, nBuf int32, zBuf uintptr) int32 {
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U64(0))), bp+24)
 
 			*(*uint8)(unsafe.Pointer(zBuf + uintptr(nBuf-2))) = uint8(0)
-			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3764,
+			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3783,
 				libc.VaList(bp, zDir, *(*U64)(unsafe.Pointer(bp + 24)), 0))
 			if int32(*(*uint8)(unsafe.Pointer(zBuf + uintptr(nBuf-2)))) != 0 || libc.PostIncInt32(&iLimit, 1) > 10 {
 				rc = SQLITE_ERROR
@@ -17852,7 +17857,7 @@ func findCreateFileMode(tls *libc.TLS, zPath uintptr, flags int32, pMode uintptr
 	} else if flags&SQLITE_OPEN_DELETEONCLOSE != 0 {
 		*(*Mode_t)(unsafe.Pointer(pMode)) = Mode_t(0600)
 	} else if flags&SQLITE_OPEN_URI != 0 {
-		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3781)
+		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3800)
 		if z != 0 {
 			rc = getFileMode(tls, z, pMode, pUid, pGid)
 		}
@@ -18017,7 +18022,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3261, zName, 43198)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43202), ts+3280, zName, 43202)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -18108,7 +18113,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, 43337)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3390, zPath, 43341)
 		}
 		return rc
 	}
@@ -18116,9 +18121,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, 43347)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3807, zPath, 43351)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43353)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -18182,18 +18187,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, 43443), ts+3459, zIn, 43443)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43447), ts+3478, zIn, 43447)
 			}
 		} 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, 43449)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43453)
 				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, 43454), ts+3450, zIn, 43454)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43458), ts+3469, zIn, 43458)
 				return
 			}
 			*(*uint8)(unsafe.Pointer(bp + 144 + uintptr(got))) = uint8(0)
@@ -18233,14 +18238,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, 43512), ts+3279, zPath, 43512)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43516), ts+3298, zPath, 43516)
 		}
 		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, 43518)
+		return Xsqlite3CantopenError(tls, 43522)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+4104)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -18298,7 +18303,7 @@ func unixDlError(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBufOut uintptr) {
 	unixEnterMutex(tls)
 	zErr = libc.Xdlerror(tls)
 	if zErr != 0 {
-		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3663, libc.VaList(bp, zErr))
+		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3682, libc.VaList(bp, zErr))
 	}
 	unixLeaveMutex(tls)
 }
@@ -18330,7 +18335,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 	{
 		var fd int32
 		var got int32
-		fd = robust_open(tls, ts+3794, O_RDONLY, uint32(0))
+		fd = robust_open(tls, ts+3813, O_RDONLY, uint32(0))
 		if fd < 0 {
 			libc.Xtime(tls, bp)
 			libc.Xmemcpy(tls, zBuf, bp, uint64(unsafe.Sizeof(Time_t(0))))
@@ -18341,7 +18346,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, 43619)
+			robust_close(tls, uintptr(0), fd, 43623)
 		}
 
 	}
@@ -18418,10 +18423,10 @@ func Xsqlite3_os_init(tls *libc.TLS) int32 {
 }
 
 var aVfs = [4]Sqlite3_vfs{
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3807, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3812, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3822, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3702, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3826, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3831, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3841, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3721, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
 }
 
 // Shutdown the operating system interface.
@@ -18476,7 +18481,7 @@ var memdb_g MemFS
 var memdb_vfs = Sqlite3_vfs{
 	FiVersion:          2,
 	FmxPathname:        1024,
-	FzName:             ts + 3835,
+	FzName:             ts + 3854,
 	FxOpen:             0,
 	FxAccess:           0,
 	FxFullPathname:     0,
@@ -18732,7 +18737,7 @@ func memdbFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int3
 	var rc int32 = SQLITE_NOTFOUND
 	memdbEnter(tls, p)
 	if op == SQLITE_FCNTL_VFSNAME {
-		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3841, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
+		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3860, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
 		rc = SQLITE_OK
 	}
 	if op == SQLITE_FCNTL_SIZE_LIMIT {
@@ -18864,7 +18869,7 @@ func memdbFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, z
 	defer tls.Free(8)
 
 	_ = pVfs
-	Xsqlite3_snprintf(tls, nOut, zOut, ts+3663, libc.VaList(bp, zPath))
+	Xsqlite3_snprintf(tls, nOut, zOut, ts+3682, libc.VaList(bp, zPath))
 	return SQLITE_OK
 }
 
@@ -18985,7 +18990,7 @@ func Xsqlite3_serialize(tls *libc.TLS, db uintptr, zSchema uintptr, piSize uintp
 		return uintptr(0)
 	}
 	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
-	zSql = Xsqlite3_mprintf(tls, ts+3856, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3875, libc.VaList(bp, zSchema))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, db, zSql, -1, bp+8, uintptr(0))
 	} else {
@@ -19058,7 +19063,7 @@ __1:
 	goto end_deserialize
 __2:
 	;
-	zSql = Xsqlite3_mprintf(tls, ts+3879, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3898, libc.VaList(bp, zSchema))
 	if !(zSql == uintptr(0)) {
 		goto __3
 	}
@@ -19774,7 +19779,7 @@ func pcacheFetchFinishWithInit(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 	libc.Xmemset(tls, pPgHdr+32, 0, uint64(unsafe.Sizeof(PgHdr{}))-uint64(uintptr(0)+32))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpPage = pPage
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpData = (*Sqlite3_pcache_page)(unsafe.Pointer(pPage)).FpBuf
-	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*72
+	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*80
 	libc.Xmemset(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0, uint64(8))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpCache = pCache
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).Fpgno = pgno
@@ -19804,7 +19809,7 @@ func Xsqlite3PcacheFetchFinish(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 // reference count drops to 0, then it is made eligible for recycling.
 func Xsqlite3PcacheRelease(tls *libc.TLS, p uintptr) {
 	(*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FnRefSum--
-	if int32(libc.PreDecInt16(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1)) == 0 {
+	if libc.PreDecInt64(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1) == int64(0) {
 		if int32((*PgHdr)(unsafe.Pointer(p)).Fflags)&PGHDR_CLEAN != 0 {
 			pcacheUnpin(tls, p)
 		} else {
@@ -19855,7 +19860,7 @@ func Xsqlite3PcacheMakeClean(tls *libc.TLS, p uintptr) {
 	*(*U16)(unsafe.Pointer(p + 52)) &= libc.Uint16FromInt32(libc.CplInt32(PGHDR_DIRTY | PGHDR_NEED_SYNC | PGHDR_WRITEABLE))
 	*(*U16)(unsafe.Pointer(p + 52)) |= U16(PGHDR_CLEAN)
 
-	if int32((*PgHdr)(unsafe.Pointer(p)).FnRef) == 0 {
+	if (*PgHdr)(unsafe.Pointer(p)).FnRef == int64(0) {
 		pcacheUnpin(tls, p)
 	}
 }
@@ -19959,8 +19964,8 @@ func Xsqlite3PcacheClear(tls *libc.TLS, pCache uintptr) {
 }
 
 func pcacheMergeDirtyList(tls *libc.TLS, pA uintptr, pB uintptr) uintptr {
-	bp := tls.Alloc(72)
-	defer tls.Free(72)
+	bp := tls.Alloc(80)
+	defer tls.Free(80)
 
 	var pTail uintptr
 	pTail = bp
@@ -20038,13 +20043,13 @@ func Xsqlite3PcacheDirtyList(tls *libc.TLS, pCache uintptr) uintptr {
 //
 // This is not the total number of pages referenced, but the sum of the
 // reference count for all pages.
-func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) int32 {
+func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) I64 {
 	return (*PCache)(unsafe.Pointer(pCache)).FnRefSum
 }
 
 // Return the number of references to the page supplied as an argument.
-func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) int32 {
-	return int32((*PgHdr)(unsafe.Pointer(p)).FnRef)
+func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) I64 {
+	return (*PgHdr)(unsafe.Pointer(p)).FnRef
 }
 
 // Return the total number of pages in the cache.
@@ -22273,7 +22278,7 @@ __27:
 	if !(isHot != 0 && nPlayback != 0) {
 		goto __28
 	}
-	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3894,
+	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3913,
 		libc.VaList(bp, nPlayback, (*Pager)(unsafe.Pointer(pPager)).FzJournal))
 __28:
 	;
@@ -22338,7 +22343,7 @@ func pagerUndoCallback(tls *libc.TLS, pCtx uintptr, iPg Pgno) int32 {
 
 	pPg = Xsqlite3PagerLookup(tls, pPager, iPg)
 	if pPg != 0 {
-		if Xsqlite3PcachePageRefcount(tls, pPg) == 1 {
+		if Xsqlite3PcachePageRefcount(tls, pPg) == int64(1) {
 			Xsqlite3PcacheDrop(tls, pPg)
 		} else {
 			rc = readDbPage(tls, pPg)
@@ -22771,7 +22776,7 @@ func Xsqlite3PagerSetPagesize(tls *libc.TLS, pPager uintptr, pPageSize uintptr,
 	var pageSize U32 = *(*U32)(unsafe.Pointer(pPageSize))
 
 	if (int32((*Pager)(unsafe.Pointer(pPager)).FmemDb) == 0 || (*Pager)(unsafe.Pointer(pPager)).FdbSize == Pgno(0)) &&
-		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 &&
+		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) &&
 		pageSize != 0 && pageSize != U32((*Pager)(unsafe.Pointer(pPager)).FpageSize) {
 		var pNew uintptr = uintptr(0)
 		*(*I64)(unsafe.Pointer(bp)) = int64(0)
@@ -22923,9 +22928,9 @@ func pagerAcquireMapPage(tls *libc.TLS, pPager uintptr, pgno Pgno, pData uintptr
 			Xsqlite3OsUnfetch(tls, (*Pager)(unsafe.Pointer(pPager)).Ffd, I64(pgno-Pgno(1))*(*Pager)(unsafe.Pointer(pPager)).FpageSize, pData)
 			return SQLITE_NOMEM
 		}
-		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*72
+		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*80
 		(*PgHdr)(unsafe.Pointer(p)).Fflags = U16(PGHDR_MMAP)
-		(*PgHdr)(unsafe.Pointer(p)).FnRef = int16(1)
+		(*PgHdr)(unsafe.Pointer(p)).FnRef = int64(1)
 		(*PgHdr)(unsafe.Pointer(p)).FpPager = pPager
 	}
 
@@ -23257,7 +23262,7 @@ func Xsqlite3PagerFlush(tls *libc.TLS, pPager uintptr) int32 {
 
 		for rc == SQLITE_OK && pList != 0 {
 			var pNext uintptr = (*PgHdr)(unsafe.Pointer(pList)).FpDirty
-			if int32((*PgHdr)(unsafe.Pointer(pList)).FnRef) == 0 {
+			if (*PgHdr)(unsafe.Pointer(pList)).FnRef == int64(0) {
 				rc = pagerStress(tls, pPager, pList)
 			}
 			pList = pNext
@@ -23407,7 +23412,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 60235)
+	rc = Xsqlite3CantopenError(tls, 60239)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -23468,7 +23473,7 @@ __15:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzJournal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3921, uint64(8))
+	libc.Xmemcpy(tls, pPtr, ts+3940, uint64(8))
 	pPtr += uintptr(8 + 1)
 	goto __19
 __18:
@@ -23481,7 +23486,7 @@ __19:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzWal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3930, uint64(4))
+	libc.Xmemcpy(tls, pPtr, ts+3949, uint64(4))
 	pPtr += uintptr(4 + 1)
 	goto __21
 __20:
@@ -23533,9 +23538,9 @@ __27:
 	;
 __26:
 	;
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3935, 0))
+	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3954, 0))
 	if !(iDc&SQLITE_IOCAP_IMMUTABLE != 0 ||
-		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3942, 0) != 0) {
+		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3961, 0) != 0) {
 		goto __30
 	}
 	vfsFlags = vfsFlags | SQLITE_OPEN_READONLY
@@ -23788,7 +23793,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60754)
+	rc = Xsqlite3CantopenError(tls, 60758)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23894,7 +23899,7 @@ __24:
 }
 
 func pagerUnlockIfUnused(tls *libc.TLS, pPager uintptr) {
-	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 {
+	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) {
 		pagerUnlockAndRollback(tls, pPager)
 	}
 }
@@ -23912,7 +23917,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60967)
+	return Xsqlite3CorruptError(tls, 60971)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23951,7 +23956,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60999)
+	rc = Xsqlite3CorruptError(tls, 61003)
 	goto pager_acquire_err
 __7:
 	;
@@ -24028,7 +24033,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, 61078)
+		return Xsqlite3CorruptError(tls, 61082)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24786,7 +24791,7 @@ func Xsqlite3PagerMemUsed(tls *libc.TLS, pPager uintptr) int32 {
 
 // Return the number of references to the specified page.
 func Xsqlite3PagerPageRefcount(tls *libc.TLS, pPage uintptr) int32 {
-	return Xsqlite3PcachePageRefcount(tls, pPage)
+	return int32(Xsqlite3PcachePageRefcount(tls, pPage))
 }
 
 // Parameter eStat must be one of SQLITE_DBSTATUS_CACHE_HIT, _MISS, _WRITE,
@@ -25029,9 +25034,9 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	pPgOld = Xsqlite3PagerLookup(tls, pPager, pgno)
 
 	if pPgOld != 0 {
-		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
+		if (*PgHdr)(unsafe.Pointer(pPgOld)).FnRef > int64(1) {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62623)
+			return Xsqlite3CorruptError(tls, 62627)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -25216,7 +25221,7 @@ func Xsqlite3PagerClearCache(tls *libc.TLS, pPager uintptr) {
 func Xsqlite3PagerCheckpoint(tls *libc.TLS, pPager uintptr, db uintptr, eMode int32, pnLog uintptr, pnCkpt uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal == uintptr(0) && int32((*Pager)(unsafe.Pointer(pPager)).FjournalMode) == PAGER_JOURNALMODE_WAL {
-		Xsqlite3_exec(tls, db, ts+3952, uintptr(0), uintptr(0), uintptr(0))
+		Xsqlite3_exec(tls, db, ts+3971, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal != 0 {
 		rc = Xsqlite3WalCheckpoint(tls, (*Pager)(unsafe.Pointer(pPager)).FpWal, db, eMode,
@@ -25788,7 +25793,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, 64387)
+				return Xsqlite3CorruptError(tls, 64391)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25887,7 +25892,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64519)
+	rc = Xsqlite3CantopenError(tls, 64523)
 	goto finished
 __7:
 	;
@@ -26055,7 +26060,7 @@ __24:
 		goto __30
 	}
 	Xsqlite3_log(tls, SQLITE_NOTICE|int32(1)<<8,
-		ts+3970,
+		ts+3989,
 		libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 __30:
 	;
@@ -26473,7 +26478,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65333)
+	rc = Xsqlite3CorruptError(tls, 65337)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -26618,7 +26623,7 @@ func walLimitSize(tls *libc.TLS, pWal uintptr, nMax I64) {
 	}
 	Xsqlite3EndBenignMalloc(tls)
 	if rx != 0 {
-		Xsqlite3_log(tls, rx, ts+4007, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
+		Xsqlite3_log(tls, rx, ts+4026, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 	}
 }
 
@@ -26748,7 +26753,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, 65682)
+		rc = Xsqlite3CantopenError(tls, 65686)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -27221,7 +27226,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66419)
+				return Xsqlite3CorruptError(tls, 66423)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -27726,7 +27731,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, 67138)
+			rc = Xsqlite3CorruptError(tls, 67142)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -28119,7 +28124,7 @@ func Xsqlite3BtreeLeaveCursor(tls *libc.TLS, pCur uintptr) {
 	Xsqlite3BtreeLeave(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpBtree)
 }
 
-var zMagicHeader = *(*[16]uint8)(unsafe.Pointer(ts + 4033))
+var zMagicHeader = *(*[16]uint8)(unsafe.Pointer(ts + 4052))
 
 var sqlite3SharedCacheList uintptr = uintptr(0)
 
@@ -28384,7 +28389,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, 69249)
+			rc = Xsqlite3CorruptError(tls, 69253)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -28521,7 +28526,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69434)
 	return
 __2:
 	;
@@ -28538,7 +28543,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69447)
 	goto ptrmap_exit
 __4:
 	;
@@ -28546,7 +28551,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69452)
 	goto ptrmap_exit
 __5:
 	;
@@ -28589,7 +28594,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, 69493)
+		return Xsqlite3CorruptError(tls, 69497)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -28599,7 +28604,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, 69501)
+		return Xsqlite3CorruptError(tls, 69505)
 	}
 	return SQLITE_OK
 }
@@ -28849,7 +28854,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, 69893)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69897)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28896,7 +28901,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69951)
+	return Xsqlite3CorruptError(tls, 69955)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28906,7 +28911,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69954)
+	return Xsqlite3CorruptError(tls, 69958)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28919,7 +28924,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69962)
+	return Xsqlite3CorruptError(tls, 69966)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28928,14 +28933,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69965)
+	return Xsqlite3CorruptError(tls, 69969)
 __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, 69967)
+	return Xsqlite3CorruptError(tls, 69971)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -28945,7 +28950,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69971)
+	return Xsqlite3CorruptError(tls, 69975)
 __11:
 	;
 __8:
@@ -29009,7 +29014,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 70004)
+	return Xsqlite3CorruptError(tls, 70008)
 __22:
 	;
 	size = int32((*struct {
@@ -29019,7 +29024,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 70010)
+	return Xsqlite3CorruptError(tls, 70014)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -29041,7 +29046,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 70024)
+	return Xsqlite3CorruptError(tls, 70028)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -29076,7 +29081,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, 70081)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70085)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -29089,13 +29094,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, 70096)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70100)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70107)
 	}
 	return uintptr(0)
 }
@@ -29120,7 +29125,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, 70152)
+			return Xsqlite3CorruptError(tls, 70156)
 		}
 	}
 
@@ -29131,7 +29136,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, 70170)
+				return Xsqlite3CorruptError(tls, 70174)
 			} else {
 				return SQLITE_OK
 			}
@@ -29183,22 +29188,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 70249)
+				return Xsqlite3CorruptError(tls, 70253)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 70254)
+			return Xsqlite3CorruptError(tls, 70258)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 70266)
+				return Xsqlite3CorruptError(tls, 70270)
 			}
 			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, 70269)
+				return Xsqlite3CorruptError(tls, 70273)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -29208,7 +29213,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, 70282)
+					return Xsqlite3CorruptError(tls, 70286)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -29216,7 +29221,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, 70288)
+			return Xsqlite3CorruptError(tls, 70292)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -29224,10 +29229,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, 70297)
+			return Xsqlite3CorruptError(tls, 70301)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70298)
+			return Xsqlite3CorruptError(tls, 70302)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -29287,7 +29292,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70357)
+			return Xsqlite3CorruptError(tls, 70361)
 		}
 	} else {
 		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
@@ -29323,7 +29328,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70381)
+			return Xsqlite3CorruptError(tls, 70385)
 		}
 	}
 	return SQLITE_OK
@@ -29353,11 +29358,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70432)
+			return Xsqlite3CorruptError(tls, 70436)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70437)
+				return Xsqlite3CorruptError(tls, 70441)
 			}
 			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))))
@@ -29368,15 +29373,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70447)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70451)
+			return Xsqlite3CorruptError(tls, 70455)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70463)
+		return Xsqlite3CorruptError(tls, 70467)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -29404,14 +29409,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, 70494)
+			return Xsqlite3CorruptError(tls, 70498)
 		}
 		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, 70499)
+			return Xsqlite3CorruptError(tls, 70503)
 		}
 	}
 	return SQLITE_OK
@@ -29425,7 +29430,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, 70531)
+		return Xsqlite3CorruptError(tls, 70535)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -29437,7 +29442,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, 70545)
+		return Xsqlite3CorruptError(tls, 70549)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -29540,7 +29545,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70700)
+	rc = Xsqlite3CorruptError(tls, 70704)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -29568,7 +29573,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, 70721)
+	rc = Xsqlite3CorruptError(tls, 70725)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -29607,7 +29612,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, 70787)
+			return Xsqlite3CorruptError(tls, 70791)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -29680,7 +29685,7 @@ func Xsqlite3BtreeOpen(tls *libc.TLS, pVfs uintptr, zFilename uintptr, db uintpt
 	mutexOpen = uintptr(0)
 	rc = SQLITE_OK
 	isTempDb = libc.Bool32(zFilename == uintptr(0) || int32(*(*uint8)(unsafe.Pointer(zFilename))) == 0)
-	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4049) == 0 ||
+	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4068) == 0 ||
 		isTempDb != 0 && Xsqlite3TempInMemory(tls, db) != 0 ||
 		vfsFlags&SQLITE_OPEN_MEMORY != 0)
 
@@ -30452,7 +30457,7 @@ __9:
 	;
 __10:
 	;
-	if !(libc.Xmemcmp(tls, page1+21, ts+4058, uint64(3)) != 0) {
+	if !(libc.Xmemcmp(tls, page1+21, ts+4077, uint64(3)) != 0) {
 		goto __14
 	}
 	goto page1_init_failed
@@ -30490,7 +30495,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71722)
+	rc = Xsqlite3CorruptError(tls, 71726)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30905,7 +30910,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, 72143)
+			return Xsqlite3CorruptError(tls, 72147)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30931,7 +30936,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, 72162)
+						return Xsqlite3CorruptError(tls, 72166)
 					}
 					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)
@@ -30940,7 +30945,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, 72171)
+					return Xsqlite3CorruptError(tls, 72175)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30951,7 +30956,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, 72183)
+				return Xsqlite3CorruptError(tls, 72187)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30967,7 +30972,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, 72218)
+		return Xsqlite3CorruptError(tls, 72222)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -31028,7 +31033,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, 72316)
+			return Xsqlite3CorruptError(tls, 72320)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -31063,7 +31068,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, 72368)
+					return Xsqlite3CorruptError(tls, 72372)
 				}
 			}
 
@@ -31123,7 +31128,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, 72436)
+			rc = Xsqlite3CorruptError(tls, 72440)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -31162,7 +31167,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, 72487)
+			return Xsqlite3CorruptError(tls, 72491)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -31193,7 +31198,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72514)
+			return Xsqlite3CorruptError(tls, 72518)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -31534,7 +31539,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, 72978)
+			return Xsqlite3CorruptError(tls, 72982)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -31778,14 +31783,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, 73385)
+		return Xsqlite3CorruptError(tls, 73389)
 	}
 
 	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, 73400)
+		return Xsqlite3CorruptError(tls, 73404)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -31830,7 +31835,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, 73462)
+				return Xsqlite3CorruptError(tls, 73466)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31879,7 +31884,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73547)
+		return Xsqlite3CorruptError(tls, 73551)
 	}
 	return rc
 }
@@ -31959,7 +31964,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, 73684)
+		return Xsqlite3CorruptError(tls, 73688)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -32050,7 +32055,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, 73823)
+	return Xsqlite3CorruptError(tls, 73827)
 __11:
 	;
 skip_init:
@@ -32070,7 +32075,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73835)
+	return Xsqlite3CorruptError(tls, 73839)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -32280,7 +32285,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 74077)
+	return Xsqlite3CorruptError(tls, 74081)
 __21:
 	;
 	goto __19
@@ -32484,7 +32489,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 74273)
+	return Xsqlite3CorruptError(tls, 74277)
 __4:
 	;
 	goto bypass_moveto_root
@@ -32549,7 +32554,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, 74360)
+	rc = Xsqlite3CorruptError(tls, 74364)
 	goto moveto_index_finish
 __17:
 	;
@@ -32597,7 +32602,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74392)
+	rc = Xsqlite3CorruptError(tls, 74396)
 __24:
 	;
 	goto moveto_index_finish
@@ -32716,7 +32721,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, 74508)
+		return Xsqlite3CorruptError(tls, 74512)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32876,7 +32881,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74688)
+	return Xsqlite3CorruptError(tls, 74692)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32941,7 +32946,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74744)
+	rc = Xsqlite3CorruptError(tls, 74748)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -32977,7 +32982,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74773)
+	rc = Xsqlite3CorruptError(tls, 74777)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -33021,7 +33026,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74807)
+	rc = Xsqlite3CorruptError(tls, 74811)
 	goto end_allocate_page
 __32:
 	;
@@ -33133,7 +33138,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74872)
+	rc = Xsqlite3CorruptError(tls, 74876)
 	goto end_allocate_page
 __51:
 	;
@@ -33291,7 +33296,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, 74999)
+	return Xsqlite3CorruptError(tls, 75003)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -33348,7 +33353,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75050)
 	goto freepage_out
 __10:
 	;
@@ -33364,7 +33369,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75061)
 	goto freepage_out
 __12:
 	;
@@ -33438,7 +33443,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, 75146)
+		return Xsqlite3CorruptError(tls, 75150)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -33450,7 +33455,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, 75163)
+			return Xsqlite3CorruptError(tls, 75167)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -33461,7 +33466,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, 75183)
+			rc = Xsqlite3CorruptError(tls, 75187)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -33626,7 +33631,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, 75436)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75440)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -33905,12 +33910,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, 75737)
+				return Xsqlite3CorruptError(tls, 75741)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75742)
+			return Xsqlite3CorruptError(tls, 75746)
 		}
 
 		pData -= uintptr(sz)
@@ -33918,7 +33923,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, 75748)
+			return Xsqlite3CorruptError(tls, 75752)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -33978,7 +33983,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, 75833)
+			Xsqlite3CorruptError(tls, 75837)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -34067,7 +34072,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75947)
+	return Xsqlite3CorruptError(tls, 75951)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -34183,7 +34188,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, 76060)
+		return Xsqlite3CorruptError(tls, 76064)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -34503,7 +34508,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, 76481)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76485)
 	goto balance_cleanup
 __25:
 	;
@@ -34514,7 +34519,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76509)
 	goto balance_cleanup
 __27:
 	;
@@ -34672,7 +34677,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76610)
 	goto balance_cleanup
 __55:
 	;
@@ -34746,7 +34751,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76643)
 	goto balance_cleanup
 __67:
 	;
@@ -34809,7 +34814,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76687)
 	goto balance_cleanup
 __75:
 	;
@@ -34837,7 +34842,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76720)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -35098,7 +35103,7 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76920)
 	goto balance_cleanup
 __121:
 	;
@@ -35290,7 +35295,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, 77146)
+			return Xsqlite3CorruptError(tls, 77150)
 		}
 	}
 	return SQLITE_OK
@@ -35328,7 +35333,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 77206)
+			rc = Xsqlite3CorruptError(tls, 77210)
 		} 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)))
@@ -35434,7 +35439,7 @@ func btreeOverwriteOverflowCell(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, 77370)
+			rc = Xsqlite3CorruptError(tls, 77374)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -35459,7 +35464,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 
 	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)
+		return Xsqlite3CorruptError(tls, 77402)
 	}
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
 		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
@@ -35529,7 +35534,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77479)
+	return Xsqlite3CorruptError(tls, 77483)
 __3:
 	;
 __1:
@@ -35642,7 +35647,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77606)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -35702,6 +35707,7 @@ __30:
 __25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
+	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
 		goto __31
 	}
@@ -35709,7 +35715,7 @@ __25:
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
 		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77640)
+	return Xsqlite3CorruptError(tls, 77645)
 __33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
@@ -35747,13 +35753,13 @@ __37:
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77667)
+	return Xsqlite3CorruptError(tls, 77672)
 __39:
 	;
 	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __40
 	}
-	return Xsqlite3CorruptError(tls, 77670)
+	return Xsqlite3CorruptError(tls, 77675)
 __40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
@@ -35784,7 +35790,6 @@ __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 __44
 	}
@@ -35859,7 +35864,7 @@ 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, 77773)
+		return Xsqlite3CorruptError(tls, 77777)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
@@ -35884,7 +35889,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, 77798)
+				return Xsqlite3CorruptError(tls, 77802)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35985,7 +35990,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77894)
+			return Xsqlite3CorruptError(tls, 77898)
 		}
 	}
 
@@ -35993,11 +35998,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, 77903)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 	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, 77907)
+		return Xsqlite3CorruptError(tls, 77911)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -36072,7 +36077,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, 77998)
+			return Xsqlite3CorruptError(tls, 78002)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -36141,7 +36146,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, 78114)
+			return Xsqlite3CorruptError(tls, 78118)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -36170,7 +36175,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, 78162)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78166)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -36246,7 +36251,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 78252)
+	return Xsqlite3CorruptError(tls, 78256)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -36260,7 +36265,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, 78259)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78263)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -36394,7 +36399,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, 78363)
+		return Xsqlite3CorruptError(tls, 78367)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -36611,7 +36616,7 @@ 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+64, ts+4062, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4081, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
 		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
@@ -36636,11 +36641,11 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 	defer tls.Free(16)
 
 	if iPage > (*IntegrityCk)(unsafe.Pointer(pCheck)).FnPage || iPage == Pgno(0) {
-		checkAppendMsg(tls, pCheck, ts+4064, libc.VaList(bp, iPage))
+		checkAppendMsg(tls, pCheck, ts+4083, libc.VaList(bp, iPage))
 		return 1
 	}
 	if getPageReferenced(tls, pCheck, iPage) != 0 {
-		checkAppendMsg(tls, pCheck, ts+4087, libc.VaList(bp+8, iPage))
+		checkAppendMsg(tls, pCheck, ts+4106, libc.VaList(bp+8, iPage))
 		return 1
 	}
 	setPageReferenced(tls, pCheck, iPage)
@@ -36658,13 +36663,13 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
 			checkOom(tls, pCheck)
 		}
-		checkAppendMsg(tls, pCheck, ts+4112, libc.VaList(bp, iChild))
+		checkAppendMsg(tls, pCheck, ts+4131, libc.VaList(bp, iChild))
 		return
 	}
 
 	if int32(*(*U8)(unsafe.Pointer(bp + 48))) != int32(eType) || *(*Pgno)(unsafe.Pointer(bp + 52)) != iParent {
 		checkAppendMsg(tls, pCheck,
-			ts+4141,
+			ts+4160,
 			libc.VaList(bp+8, iChild, int32(eType), iParent, int32(*(*U8)(unsafe.Pointer(bp + 48))), *(*Pgno)(unsafe.Pointer(bp + 52))))
 	}
 }
@@ -36683,7 +36688,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 		}
 		N--
 		if Xsqlite3PagerGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpPager, iPage, bp+40, 0) != 0 {
-			checkAppendMsg(tls, pCheck, ts+4195, libc.VaList(bp, iPage))
+			checkAppendMsg(tls, pCheck, ts+4214, libc.VaList(bp, iPage))
 			break
 		}
 		pOvflData = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
@@ -36694,7 +36699,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 			}
 			if n > (*BtShared)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt)).FusableSize/U32(4)-U32(2) {
 				checkAppendMsg(tls, pCheck,
-					ts+4217, libc.VaList(bp+8, iPage))
+					ts+4236, libc.VaList(bp+8, iPage))
 				N--
 			} else {
 				for i = 0; i < int32(n); i++ {
@@ -36717,12 +36722,12 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 	}
 	if N != 0 && nErrAtStart == (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr {
 		checkAppendMsg(tls, pCheck,
-			ts+4256,
+			ts+4275,
 			libc.VaList(bp+16, func() uintptr {
 				if isFreeList != 0 {
-					return ts + 4282
+					return ts + 4301
 				}
-				return ts + 4287
+				return ts + 4306
 			}(),
 				expected-N, expected))
 	}
@@ -36838,13 +36843,13 @@ __2:
 	return 0
 __3:
 	;
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4308
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4327
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
 		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4318, libc.VaList(bp, rc))
+		ts+4337, libc.VaList(bp, rc))
 	goto end_of_check
 __4:
 	;
@@ -36855,7 +36860,7 @@ __4:
 	}
 
 	checkAppendMsg(tls, pCheck,
-		ts+4356, libc.VaList(bp+8, rc))
+		ts+4375, libc.VaList(bp+8, rc))
 	goto end_of_check
 __5:
 	;
@@ -36863,14 +36868,14 @@ __5:
 		goto __6
 	}
 
-	checkAppendMsg(tls, pCheck, ts+4394, libc.VaList(bp+16, rc))
+	checkAppendMsg(tls, pCheck, ts+4413, libc.VaList(bp+16, rc))
 	goto end_of_check
 __6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
 
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4416
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4435
 	contentOffset = U32((int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5))))<<8|int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5) + 1)))-1)&0xffff + 1)
 
 	nCell = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3) + 1)))
@@ -36887,7 +36892,7 @@ __6:
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
 		goto __9
 	}
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4442
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4461
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
 __9:
 	;
@@ -36912,7 +36917,7 @@ __10:
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
 		goto __13
 	}
-	checkAppendMsg(tls, pCheck, ts+4470,
+	checkAppendMsg(tls, pCheck, ts+4489,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
 	goto __11
@@ -36925,7 +36930,7 @@ __13:
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
 		goto __14
 	}
-	checkAppendMsg(tls, pCheck, ts+4500, 0)
+	checkAppendMsg(tls, pCheck, ts+4519, 0)
 	doCoverageCheck = 0
 	goto __11
 __14:
@@ -36941,7 +36946,7 @@ __14:
 	}() != 0) {
 		goto __16
 	}
-	checkAppendMsg(tls, pCheck, ts+4524, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
+	checkAppendMsg(tls, pCheck, ts+4543, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
 __16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
@@ -36979,7 +36984,7 @@ __21:
 	if !(d2 != depth) {
 		goto __22
 	}
-	checkAppendMsg(tls, pCheck, ts+4548, 0)
+	checkAppendMsg(tls, pCheck, ts+4567, 0)
 	depth = d2
 __22:
 	;
@@ -37052,7 +37057,7 @@ __30:
 		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4573, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
+		ts+4592, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
 	goto __31
 	goto __33
 __32:
@@ -37069,7 +37074,7 @@ __31:
 		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4610,
+		ts+4629,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
 __34:
 	;
@@ -37183,7 +37188,7 @@ __6:
 	if !(bCkFreelist != 0) {
 		goto __7
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4662
+	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4681
 	checkList(tls, bp+32, 1, Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+32),
 		Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
@@ -37219,7 +37224,7 @@ __13:
 		goto __15
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4678,
+		ts+4697,
 		libc.VaList(bp, mx, mxInHdr))
 __15:
 	;
@@ -37229,7 +37234,7 @@ __9:
 		goto __16
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4723, 0)
+		ts+4742, 0)
 __16:
 	;
 __10:
@@ -37276,13 +37281,13 @@ __23:
 	if !(getPageReferenced(tls, bp+32, i) == 0 && (ptrmapPageno(tls, pBt, i) != i || !(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0))) {
 		goto __26
 	}
-	checkAppendMsg(tls, bp+32, ts+4778, libc.VaList(bp+16, i))
+	checkAppendMsg(tls, bp+32, ts+4797, libc.VaList(bp+16, i))
 __26:
 	;
 	if !(getPageReferenced(tls, bp+32, i) != 0 && (ptrmapPageno(tls, pBt, i) == i && (*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0)) {
 		goto __27
 	}
-	checkAppendMsg(tls, bp+32, ts+4800, libc.VaList(bp+24, i))
+	checkAppendMsg(tls, bp+32, ts+4819, libc.VaList(bp+24, i))
 __27:
 	;
 	goto __24
@@ -37545,7 +37550,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 		var rc int32 = 0
 		Xsqlite3ParseObjectInit(tls, bp+16, pDb)
 		if Xsqlite3OpenTempDatabase(tls, bp+16) != 0 {
-			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3663, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3682, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 			rc = SQLITE_ERROR
 		}
 		Xsqlite3DbFree(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
@@ -37556,7 +37561,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 	}
 
 	if i < 0 {
-		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4834, libc.VaList(bp+8, zDb))
+		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4853, libc.VaList(bp+8, zDb))
 		return uintptr(0)
 	}
 
@@ -37571,7 +37576,7 @@ func setDestPgsz(tls *libc.TLS, p uintptr) int32 {
 
 func checkReadTransaction(tls *libc.TLS, db uintptr, p uintptr) int32 {
 	if Xsqlite3BtreeTxnState(tls, p) != SQLITE_TXN_NONE {
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4854, 0)
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4873, 0)
 		return SQLITE_ERROR
 	}
 	return SQLITE_OK
@@ -37591,7 +37596,7 @@ func Xsqlite3_backup_init(tls *libc.TLS, pDestDb uintptr, zDestDb uintptr, pSrcD
 
 	if pSrcDb == pDestDb {
 		Xsqlite3ErrorWithMsg(tls,
-			pDestDb, SQLITE_ERROR, ts+4885, 0)
+			pDestDb, SQLITE_ERROR, ts+4904, 0)
 		p = uintptr(0)
 	} else {
 		p = Xsqlite3MallocZero(tls, uint64(unsafe.Sizeof(Sqlite3_backup{})))
@@ -38040,7 +38045,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 		(*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,
+		Xsqlite3_str_appendf(tls, bp+16, ts+4944,
 			libc.VaList(bp, func() float64 {
 				if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_IntReal != 0 {
 					return float64(*(*I64)(unsafe.Pointer(p)))
@@ -38632,7 +38637,7 @@ func Xsqlite3VdbeMemSetPointer(tls *libc.TLS, pMem uintptr, pPtr uintptr, zPType
 		if zPType != 0 {
 			return zPType
 		}
-		return ts + 1554
+		return ts + 1573
 	}()
 	(*Mem)(unsafe.Pointer(pMem)).Fz = pPtr
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null | MEM_Dyn | MEM_Subtype | MEM_Term)
@@ -38864,7 +38869,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, 81630)
+		return Xsqlite3CorruptError(tls, 81634)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -39096,7 +39101,7 @@ __9:
 		goto __10
 	}
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 8)).FisError
-	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3663, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
+	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3682, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
 	goto __11
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
@@ -39149,7 +39154,7 @@ func valueFromExpr(tls *libc.TLS, db uintptr, pExpr uintptr, enc U8, affinity U8
 	zVal = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	negInt = 1
-	zNeg = ts + 1554
+	zNeg = ts + 1573
 	rc = SQLITE_OK
 
 __1:
@@ -39190,7 +39195,7 @@ __4:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
 	negInt = -1
-	zNeg = ts + 4932
+	zNeg = ts + 4951
 __6:
 	;
 	if !(op == TK_STRING || op == TK_FLOAT || op == TK_INTEGER) {
@@ -39209,7 +39214,7 @@ __9:
 	Xsqlite3VdbeMemSetInt64(tls, *(*uintptr)(unsafe.Pointer(bp + 16)), I64(*(*int32)(unsafe.Pointer(pExpr + 8)))*I64(negInt))
 	goto __11
 __10:
-	zVal = Xsqlite3MPrintf(tls, db, ts+4934, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+	zVal = Xsqlite3MPrintf(tls, db, ts+4953, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	if !(zVal == uintptr(0)) {
 		goto __12
 	}
@@ -39513,7 +39518,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, 82270)
+		return Xsqlite3CorruptError(tls, 82274)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -39528,14 +39533,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 82276)
+			return Xsqlite3CorruptError(tls, 82280)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 82282)
+		return Xsqlite3CorruptError(tls, 82286)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -40543,34 +40548,34 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var j int32
 			var pKeyInfo uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4939, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4958, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
 			for j = 0; j < int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField); j++ {
 				var pColl uintptr = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(j)*8))
 				var zColl uintptr
 				if pColl != 0 {
 					zColl = (*CollSeq)(unsafe.Pointer(pColl)).FzName
 				} else {
-					zColl = ts + 1554
+					zColl = ts + 1573
 				}
-				if libc.Xstrcmp(tls, zColl, ts+1099) == 0 {
-					zColl = ts + 4944
+				if libc.Xstrcmp(tls, zColl, ts+1118) == 0 {
+					zColl = ts + 4963
 				}
-				Xsqlite3_str_appendf(tls, bp+144, ts+4946,
+				Xsqlite3_str_appendf(tls, bp+144, ts+4965,
 					libc.VaList(bp+8, func() uintptr {
 						if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_DESC != 0 {
-							return ts + 4932
+							return ts + 4951
 						}
-						return ts + 1554
+						return ts + 1573
 					}(),
 						func() uintptr {
 							if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_BIGNULL != 0 {
-								return ts + 4954
+								return ts + 4973
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						zColl))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4957, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+4976, 1)
 			break
 
 		}
@@ -40578,7 +40583,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 		{
 			var pColl uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4959, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
+			Xsqlite3_str_appendf(tls, bp+144, ts+4978, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
 				encnames[(*CollSeq)(unsafe.Pointer(pColl)).Fenc]))
 			break
 
@@ -40586,32 +40591,32 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -7:
 		{
 			var pDef uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
-			Xsqlite3_str_appendf(tls, bp+144, ts+4968, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4987, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -15:
 		{
 			var pDef uintptr = (*Sqlite3_context)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpFunc
-			Xsqlite3_str_appendf(tls, bp+144, ts+4968, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4987, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -13:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1334, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1353, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
 	case -3:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+4975, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4994, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
 			break
 
 		}
 	case -12:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1328, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1347, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
@@ -40621,13 +40626,13 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Str != 0 {
 				zP4 = (*Mem)(unsafe.Pointer(pMem)).Fz
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1334, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1353, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1328, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1347, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Null != 0 {
-				zP4 = ts + 1555
+				zP4 = ts + 1574
 			} else {
-				zP4 = ts + 4978
+				zP4 = ts + 4997
 			}
 			break
 
@@ -40635,7 +40640,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -11:
 		{
 			var pVtab uintptr = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-			Xsqlite3_str_appendf(tls, bp+144, ts+4985, libc.VaList(bp+120, pVtab))
+			Xsqlite3_str_appendf(tls, bp+144, ts+5004, libc.VaList(bp+120, pVtab))
 			break
 
 		}
@@ -40646,20 +40651,20 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var n U32 = *(*U32)(unsafe.Pointer(ai))
 
 			for i = U32(1); i <= n; i++ {
-				Xsqlite3_str_appendf(tls, bp+144, ts+4993, libc.VaList(bp+128, func() int32 {
+				Xsqlite3_str_appendf(tls, bp+144, ts+5012, libc.VaList(bp+128, func() int32 {
 					if i == U32(1) {
 						return '['
 					}
 					return ','
 				}(), *(*U32)(unsafe.Pointer(ai + uintptr(i)*4))))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4998, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+5017, 1)
 			break
 
 		}
 	case -4:
 		{
-			zP4 = ts + 5000
+			zP4 = ts + 5019
 			break
 
 		}
@@ -40684,7 +40689,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	return Xsqlite3StrAccumFinish(tls, bp+144)
 }
 
-var encnames = [4]uintptr{ts + 5008, ts + 5010, ts + 5012, ts + 5017}
+var encnames = [4]uintptr{ts + 5027, ts + 5029, ts + 5031, ts + 5036}
 
 // Declare to the Vdbe that the BTree object at db->aDb[i] is used.
 //
@@ -41134,8 +41139,8 @@ func Xsqlite3VdbeMakeReady(tls *libc.TLS, p uintptr, pParse uintptr) {
 }
 
 var azColName = [12]uintptr{
-	ts + 5022, ts + 5027, ts + 5034, ts + 5037, ts + 5040, ts + 5043, ts + 5046, ts + 5049,
-	ts + 5057, ts + 5060, ts + 5067, ts + 5075,
+	ts + 5041, ts + 5046, ts + 5053, ts + 5056, ts + 5059, ts + 5062, ts + 5065, ts + 5068,
+	ts + 5076, ts + 5079, ts + 5086, ts + 5094,
 }
 
 // Close a VDBE cursor and release all the resources that cursor
@@ -41344,7 +41349,7 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		var nMainFile int32
 
 		nMainFile = Xsqlite3Strlen30(tls, zMainFile)
-		zSuper = Xsqlite3MPrintf(tls, db, ts+5082, libc.VaList(bp, 0, zMainFile, 0))
+		zSuper = Xsqlite3MPrintf(tls, db, ts+5101, libc.VaList(bp, 0, zMainFile, 0))
 		if zSuper == uintptr(0) {
 			return SQLITE_NOMEM
 		}
@@ -41352,16 +41357,16 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		for __ccgo := true; __ccgo; __ccgo = rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 60)) != 0 {
 			if retryCount != 0 {
 				if retryCount > 100 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5094, libc.VaList(bp+24, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5113, libc.VaList(bp+24, zSuper))
 					Xsqlite3OsDelete(tls, pVfs, zSuper, 0)
 					break
 				} else if retryCount == 1 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5108, libc.VaList(bp+32, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5127, libc.VaList(bp+32, zSuper))
 				}
 			}
 			retryCount++
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
-			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5123,
+			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5142,
 				libc.VaList(bp+40, *(*U32)(unsafe.Pointer(bp + 56))>>8&U32(0xffffff), *(*U32)(unsafe.Pointer(bp + 56))&U32(0xff)))
 
 			rc = Xsqlite3OsAccess(tls, pVfs, zSuper, SQLITE_ACCESS_EXISTS, bp+60)
@@ -41507,7 +41512,7 @@ func Xsqlite3VdbeCheckFk(tls *libc.TLS, p uintptr, deferred int32) int32 {
 		!(deferred != 0) && (*Vdbe)(unsafe.Pointer(p)).FnFkConstraint > int64(0) {
 		(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_CONSTRAINT | int32(3)<<8
 		(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
-		Xsqlite3VdbeError(tls, p, ts+5136, 0)
+		Xsqlite3VdbeError(tls, p, ts+5155, 0)
 		if int32((*Vdbe)(unsafe.Pointer(p)).FprepFlags)&SQLITE_PREPARE_SAVESQL == 0 {
 			return SQLITE_ERROR
 		}
@@ -41839,7 +41844,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 86058)
+		return Xsqlite3CorruptError(tls, 86062)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -42390,7 +42395,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86989))
 		return 0
 	}
 
@@ -42455,7 +42460,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, 87062))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87066))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -42489,7 +42494,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, 87092))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87096))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -42539,7 +42544,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, 87136))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87140))
 			return 0
 		}
 	}
@@ -42685,7 +42690,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87303))
 	return 0
 __7:
 	;
@@ -42856,7 +42861,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87457)
+	return Xsqlite3CorruptError(tls, 87461)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42882,7 +42887,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, 87490)
+		return Xsqlite3CorruptError(tls, 87494)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -42993,13 +42998,13 @@ func Xsqlite3NotPureFunc(tls *libc.TLS, pCtx uintptr) int32 {
 		var zContext uintptr
 		var zMsg uintptr
 		if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_IsCheck != 0 {
-			zContext = ts + 5166
-		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5185
-		} else {
+		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5204
+		} else {
+			zContext = ts + 5223
 		}
-		zMsg = Xsqlite3_mprintf(tls, ts+5213,
+		zMsg = Xsqlite3_mprintf(tls, ts+5232,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx)).FpFunc)).FzName, zContext))
 		Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 		Xsqlite3_free(tls, zMsg)
@@ -43104,7 +43109,7 @@ func Xsqlite3_expired(tls *libc.TLS, pStmt uintptr) int32 {
 
 func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 	if (*Vdbe)(unsafe.Pointer(p)).Fdb == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5249, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5268, 0)
 		return 1
 	} else {
 		return 0
@@ -43114,7 +43119,7 @@ func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 
 func vdbeSafetyNotNull(tls *libc.TLS, p uintptr) int32 {
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5294, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5313, 0)
 		return 1
 	} else {
 		return vdbeSafety(tls, p)
@@ -43156,7 +43161,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, 87854)
+			return Xsqlite3MisuseError(tls, 87858)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -43604,7 +43609,7 @@ func Xsqlite3_result_error_code(tls *libc.TLS, pCtx uintptr, errCode int32) {
 // Force an SQLITE_TOOBIG error.
 func Xsqlite3_result_error_toobig(tls *libc.TLS, pCtx uintptr) {
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FisError = SQLITE_TOOBIG
-	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5334, int64(-1),
+	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5353, int64(-1),
 		uint8(SQLITE_UTF8), uintptr(0))
 }
 
@@ -43796,7 +43801,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88544)
+		return Xsqlite3MisuseError(tls, 88548)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -44316,15 +44321,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 89208)
+		return Xsqlite3MisuseError(tls, 89212)
 	}
 	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+5357, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 89216)
+			ts+5376, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89220)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -44739,7 +44744,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, 89707)
+	rc = Xsqlite3MisuseError(tls, 89711)
 	goto preupdate_old_out
 __1:
 	;
@@ -44883,7 +44888,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, 89809)
+	rc = Xsqlite3MisuseError(tls, 89813)
 	goto preupdate_new_out
 __1:
 	;
@@ -45055,7 +45060,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+5397, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5416, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -45091,11 +45096,11 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 
 			pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr(*(*int32)(unsafe.Pointer(bp + 84))-1)*56
 			if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Null != 0 {
-				Xsqlite3_str_append(tls, bp+48, ts+1555, 4)
+				Xsqlite3_str_append(tls, bp+48, ts+1574, 4)
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+1334, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+1353, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+4925, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+4944, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Str != 0 {
 				var nOut int32
 				var enc U8 = (*Sqlite3)(unsafe.Pointer(db)).Fenc
@@ -45110,21 +45115,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+5401, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5420, 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+5408, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5427, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5421, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5440, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					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_appendf(tls, bp+48, ts+5443, libc.VaList(bp+40, int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5429, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5448, 1)
 			}
 		}
 	}
@@ -45327,10 +45332,6 @@ func filterHash(tls *libc.TLS, aMem uintptr, pOp uintptr) U64 {
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Real != 0 {
 			h = h + U64(Xsqlite3VdbeIntValue(tls, p))
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&(MEM_Str|MEM_Blob) != 0 {
-			h = h + U64((*Mem)(unsafe.Pointer(p)).Fn)
-			if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Zero != 0 {
-				h = h + U64(*(*int32)(unsafe.Pointer(p)))
-			}
 		}
 	}
 	return h
@@ -45341,11 +45342,11 @@ func vdbeMemTypeName(tls *libc.TLS, pMem uintptr) uintptr {
 }
 
 var azTypes = [5]uintptr{
-	ts + 1115,
-	ts + 1127,
-	ts + 1132,
-	ts + 1110,
-	ts + 1555,
+	ts + 1134,
+	ts + 1146,
+	ts + 1151,
+	ts + 1129,
+	ts + 1574,
 }
 
 // Execute as much of a VDBE program as we can.
@@ -46387,20 +46388,20 @@ __202:
 		goto __205
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5431, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	Xsqlite3VdbeError(tls, p, ts+5450, 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))))
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5471, 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))))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	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))
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5478, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 __204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
@@ -47978,7 +47979,7 @@ op_column_corrupt:
 	goto __9
 	goto __425
 __424:
-	rc = Xsqlite3CorruptError(tls, 93317)
+	rc = Xsqlite3CorruptError(tls, 93320)
 	goto abort_due_to_error
 __425:
 	;
@@ -48106,7 +48107,7 @@ __428:
 	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5483,
+	Xsqlite3VdbeError(tls, p, ts+5502,
 		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
@@ -48538,7 +48539,7 @@ __78:
 		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5524, 0)
+	Xsqlite3VdbeError(tls, p, ts+5543, 0)
 	rc = SQLITE_BUSY
 	goto __523
 __522:
@@ -48598,7 +48599,7 @@ __530:
 	if !!(pSavepoint != 0) {
 		goto __531
 	}
-	Xsqlite3VdbeError(tls, p, ts+5575, libc.VaList(bp+88, zName))
+	Xsqlite3VdbeError(tls, p, ts+5594, libc.VaList(bp+88, zName))
 	rc = SQLITE_ERROR
 	goto __532
 __531:
@@ -48607,7 +48608,7 @@ __531:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5597, 0)
+		ts+5616, 0)
 	rc = SQLITE_BUSY
 	goto __534
 __533:
@@ -48793,7 +48794,7 @@ __564:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5651, 0)
+		ts+5670, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
 	goto __567
@@ -48836,13 +48837,13 @@ __562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5706
+				return ts + 5725
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5754
+					return ts + 5773
 				}
-				return ts + 5797
+				return ts + 5816
 			}()
 		}(), 0)
 
@@ -48925,7 +48926,7 @@ __576:
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5838)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5857)
 
 	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 __583
@@ -49129,7 +49130,7 @@ __88:
 	}
 
 	(*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
+	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1573
 __602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -49738,7 +49739,7 @@ notExistsWithKey:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
 		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95560)
+	rc = Xsqlite3CorruptError(tls, 95563)
 	goto __683
 __682:
 	goto jump_to_p2
@@ -50516,7 +50517,7 @@ __767:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
 		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5866)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96638, ts+5885)
 	goto abort_due_to_error
 __770:
 	;
@@ -50626,7 +50627,7 @@ __780:
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
 		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96840)
+	rc = Xsqlite3CorruptError(tls, 96843)
 	goto abort_due_to_error
 __781:
 	;
@@ -50787,14 +50788,14 @@ __141:
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	goto __799
 __798:
-	zSchema = ts + 5883
+	zSchema = ts + 5902
 	(*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+5897,
+		ts+5916,
 		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 __800
@@ -50820,7 +50821,7 @@ __802:
 		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 97092)
+	rc = Xsqlite3CorruptError(tls, 97095)
 __803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
@@ -51010,7 +51011,7 @@ __820:
 		goto __825
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5940, 0)
+	Xsqlite3VdbeError(tls, p, ts+5959, 0)
 	goto abort_due_to_error
 __825:
 	;
@@ -51322,7 +51323,7 @@ __860:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
 		goto __862
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
 __862:
 	;
@@ -51372,7 +51373,7 @@ __867:
 	if !(rc != 0) {
 		goto __868
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
 __868:
 	;
@@ -51454,12 +51455,12 @@ __876:
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5977,
+		ts+5996,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6029
+				return ts + 6048
 			}
-			return ts + 6034
+			return ts + 6053
 		}()))
 	goto abort_due_to_error
 	goto __879
@@ -51601,7 +51602,7 @@ __171:
 		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6041, libc.VaList(bp+144, z1))
+	Xsqlite3VdbeError(tls, p, ts+6060, libc.VaList(bp+144, z1))
 __894:
 	;
 	goto abort_due_to_error
@@ -51719,7 +51720,7 @@ __904:
 	(*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+6070, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6089, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
 	goto __9
 
 __177:
@@ -51808,7 +51809,7 @@ __912:
 	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)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
 __913:
 	;
@@ -52038,7 +52039,7 @@ __935:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
 		goto __940
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
 __940:
 	;
@@ -52114,7 +52115,7 @@ __945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
 		goto __947
 	}
-	z3 = Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp+168, zTrace))
+	z3 = Xsqlite3MPrintf(tls, db, ts+6099, 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)
@@ -52187,7 +52188,7 @@ __955:
 	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __957
 	}
-	rc = Xsqlite3CorruptError(tls, 99031)
+	rc = Xsqlite3CorruptError(tls, 99034)
 __957:
 	;
 __956:
@@ -52195,13 +52196,13 @@ __956:
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
 		goto __958
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
 __958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
 
-	Xsqlite3_log(tls, rc, ts+6086,
+	Xsqlite3_log(tls, rc, ts+6105,
 		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 __959
@@ -52257,13 +52258,13 @@ __966:
 	return rc
 
 too_big:
-	Xsqlite3VdbeError(tls, p, ts+5334, 0)
+	Xsqlite3VdbeError(tls, p, ts+5353, 0)
 	rc = SQLITE_TOOBIG
 	goto abort_due_to_error
 
 no_mem:
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3VdbeError(tls, p, ts+1490, 0)
+	Xsqlite3VdbeError(tls, p, ts+1509, 0)
 	rc = SQLITE_NOMEM
 	goto abort_due_to_error
 
@@ -52274,8 +52275,8 @@ abort_due_to_interrupt:
 	return int32(0)
 }
 
-var azType = [4]uintptr{ts + 6118, ts + 6127, ts + 6134,
-	ts + 6140}
+var azType = [4]uintptr{ts + 6137, ts + 6146, ts + 6153,
+	ts + 6159}
 var and_logic = [9]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(1), uint8(2), uint8(0), uint8(2), uint8(2)}
 var or_logic = [9]uint8{uint8(0), uint8(1), uint8(2), uint8(1), uint8(1), uint8(1), uint8(2), uint8(1), uint8(2)}
 var aMask = [12]uint8{
@@ -52330,16 +52331,16 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		}
 
 		if type1 < U32(12) {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6152,
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6171,
 				libc.VaList(bp, func() uintptr {
 					if type1 == U32(0) {
-						return ts + 6181
+						return ts + 6200
 					}
 					return func() uintptr {
 						if type1 == U32(7) {
-							return ts + 6186
+							return ts + 6205
 						}
-						return ts + 6191
+						return ts + 6210
 					}()
 				}()))
 			rc = SQLITE_ERROR
@@ -52359,10 +52360,10 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		rc = Xsqlite3_finalize(tls, (*Incrblob)(unsafe.Pointer(p)).FpStmt)
 		(*Incrblob)(unsafe.Pointer(p)).FpStmt = uintptr(0)
 		if rc == SQLITE_OK {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6199, libc.VaList(bp+8, iRow))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6218, libc.VaList(bp+8, iRow))
 			rc = SQLITE_ERROR
 		} else {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3663, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3682, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
 		}
 	}
 
@@ -52422,21 +52423,21 @@ __3:
 		goto __4
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6219, libc.VaList(bp, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6238, libc.VaList(bp, zTable))
 __4:
 	;
 	if !(pTab != 0 && !((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0))) {
 		goto __5
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6249, libc.VaList(bp+8, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6268, libc.VaList(bp+8, zTable))
 __5:
 	;
 	if !(pTab != 0 && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __6
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6285, libc.VaList(bp+16, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6304, libc.VaList(bp+16, zTable))
 __6:
 	;
 	if !!(pTab != 0) {
@@ -52480,7 +52481,7 @@ __11:
 		goto __13
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6325, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52507,7 +52508,7 @@ __19:
 	if !((*sColMap)(unsafe.Pointer(pFKey+64+uintptr(j)*16)).FiFrom == iCol) {
 		goto __22
 	}
-	zFault = ts + 6327
+	zFault = ts + 6346
 __22:
 	;
 	goto __20
@@ -52540,7 +52541,7 @@ __26:
 	if !(int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == iCol || int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == -2) {
 		goto __29
 	}
-	zFault = ts + 6339
+	zFault = ts + 6358
 __29:
 	;
 	goto __27
@@ -52561,7 +52562,7 @@ __25:
 		goto __30
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6366, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52659,7 +52660,7 @@ __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
@@ -52707,7 +52708,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99516)
+		return Xsqlite3MisuseError(tls, 99519)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52790,7 +52791,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99616)
+		return Xsqlite3MisuseError(tls, 99619)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52803,7 +52804,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 				if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-					return ts + 3663
+					return ts + 3682
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
@@ -55332,25 +55333,25 @@ 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 {
+	if Xsqlite3_strnicmp(tls, zTab, ts+6400, 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 {
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6408+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
 			return 1
 		}
 		if pSchema == uintptr(0) {
 			return 0
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5883+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5902+7) == 0 {
 			return 1
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6446+7) == 0 {
 			return 1
 		}
 	} else {
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6446+7) == 0 {
 			return 1
 		}
 	}
@@ -55430,7 +55431,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6441, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6460, zDb) == 0) {
 		goto __8
 	}
 
@@ -55551,7 +55552,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6446) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6465) != 0) {
 		goto __33
 	}
 	goto __14
@@ -55725,14 +55726,14 @@ __60:
 	;
 	goto __59
 __58:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6448, zTab) == 0) {
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6467, zTab) == 0) {
 		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
 	goto __62
 __61:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6452, zTab) == 0) {
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6471, zTab) == 0) {
 		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
@@ -55749,7 +55750,7 @@ __57:
 		goto __64
 	}
 	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6456, zTab) == 0) {
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6475, zTab) == 0) {
 		goto __65
 	}
 	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
@@ -55908,7 +55909,7 @@ __86:
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
 		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6465, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6484, libc.VaList(bp, zAs))
 	return WRC_Abort
 __90:
 	;
@@ -55916,14 +55917,14 @@ __90:
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
 		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6496, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6515, libc.VaList(bp+8, zAs))
 	return WRC_Abort
 __91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
 		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	return WRC_Abort
 __92:
 	;
@@ -55975,7 +55976,7 @@ __11:
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6551, libc.VaList(bp+16, zCol))
+		ts+6570, 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
@@ -56012,7 +56013,7 @@ __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 + 6586
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6605
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
@@ -56025,23 +56026,23 @@ __101:
 __99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6595
+		zErr = ts + 6614
 	} else {
-		zErr = ts + 6610
+		zErr = ts + 6629
 	}
 	if !(zDb != 0) {
 		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6632, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6651, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
 	goto __105
 __104:
 	if !(zTab != 0) {
 		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp+56, zErr, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6664, libc.VaList(bp+56, zErr, zTab, zCol))
 	goto __107
 __106:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+80, zErr, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6674, libc.VaList(bp+80, zErr, zCol))
 __107:
 	;
 __105:
@@ -56144,15 +56145,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 + 6662
+	var zIn uintptr = ts + 6681
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6690
+		zIn = ts + 6709
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6708
+		zIn = ts + 6727
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6726
+		zIn = ts + 6745
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6744, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6763, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -56230,14 +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 + 6764
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
-				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
-				}
-				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
+				*(*int32)(unsafe.Pointer(pExpr + 8)) = libc.Bool32(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL)
+				*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IntValue)
+				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_INTEGER)
+
 				i = 0
 				p = pNC
 			__4:
@@ -56281,7 +56278,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+6775, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6783, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -56345,7 +56342,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+6792, libc.VaList(bp, pExpr))
+								ts+6800, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -56361,7 +56358,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+6856,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6864,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -56375,7 +56372,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+6892, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6900, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -56398,30 +56395,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+6920, libc.VaList(bp+16, pExpr))
+						ts+6928, 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 + 6963
+						zType = ts + 6971
 					} else {
-						zType = ts + 6970
+						zType = ts + 6978
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6980, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6988, 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+7008, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7016, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7030,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7038,
 						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+7074,
+						ts+7082,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -56493,15 +56490,15 @@ 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+7122, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7130, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
 
 				if nRef != (*NameContext)(unsafe.Pointer(pNC)).FnRef {
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_VarSelect)
-					*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_VarSelect
 				}
+				*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_Subquery
 			}
 			break
 
@@ -56509,7 +56506,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+7133, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7141, pExpr, pExpr)
 			}
 
 			break
@@ -56565,7 +56562,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+6533, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -56640,7 +56637,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7144, libc.VaList(bp, i, zType, mx))
+		ts+7152, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -56660,7 +56657,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+7200, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7208, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -56695,7 +56692,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+7234, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7242, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -56752,7 +56749,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+7240, libc.VaList(bp, i+1))
+				ts+7248, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -56780,7 +56777,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+7301, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7309, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -56994,7 +56991,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+7332, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7340, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -57034,7 +57031,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+7234) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7242) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -57045,7 +57042,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7371) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7379) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -57057,7 +57054,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+7377, 0)
+						ts+7385, 0)
 					return WRC_Abort
 				}
 
@@ -57846,7 +57843,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 		return
 	}
 
@@ -57921,7 +57918,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+7436, libc.VaList(bp, mxHeight))
+			ts+7444, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -58170,12 +58167,12 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7484,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7492,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7528
+						return ts + 7536
 					}
-					return ts + 1554
+					return ts + 1573
 				}(), nElem))
 			break
 		}
@@ -58214,7 +58211,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+7530)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -58240,7 +58237,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+7532, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7540, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -58268,7 +58265,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+7566, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7574, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -58315,7 +58312,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+7586,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7594,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -58340,7 +58337,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+7629, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7637, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -58915,7 +58912,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+7652,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7660,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -59038,7 +59035,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+7682, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7690, libc.VaList(bp, zObject))
 	}
 }
 
@@ -59094,10 +59091,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+6764) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7713) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6769) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7718) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -59527,13 +59524,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+7705) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7724) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7713) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7732) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7719) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7738) == 0 {
 		return 1
 	}
 	return 0
@@ -59737,7 +59734,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+7723, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7742, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -59815,7 +59812,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+7770, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7789, 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)
 
@@ -59909,7 +59906,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 + 7801
+		var zFmt uintptr = ts + 7820
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -59927,7 +59924,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+6533, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	}
 }
 
@@ -59968,7 +59965,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+7845, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7864, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -59998,11 +59995,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+7868, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7887, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
-				return ts + 1554
+				return ts + 1573
 			}
-			return ts + 7887
+			return ts + 7906
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -60129,7 +60126,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+7899, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7918, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -60144,11 +60141,11 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7917, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7936, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
-			return ts + 1554
+			return ts + 1573
 		}
-		return ts + 7887
+		return ts + 7906
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
@@ -60171,7 +60168,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+7530)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = uint8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -60180,7 +60177,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+7938)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7957)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -60566,13 +60563,13 @@ 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+7940, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7943,
+			if Xsqlite3_strnicmp(tls, z, ts+7959, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7962,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
-							return ts + 4932
+							return ts + 4951
 						}
-						return ts + 1554
+						return ts + 1573
 					}(), pExpr))
 			} else {
 				codeReal(tls, v, z, negFlag, iMem)
@@ -60609,6 +60606,7 @@ func Xsqlite3ExprCodeLoadIndexColumn(tls *libc.TLS, pParse uintptr, pIdx uintptr
 func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr, pCol uintptr, regOut int32) {
 	var iAddr int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
+	var nErr int32 = (*Parse)(unsafe.Pointer(pParse)).FnErr
 
 	if (*Parse)(unsafe.Pointer(pParse)).FiSelfTab > 0 {
 		iAddr = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Parse)(unsafe.Pointer(pParse)).FiSelfTab-1, 0, regOut)
@@ -60622,6 +60620,9 @@ func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr
 	if iAddr != 0 {
 		Xsqlite3VdbeJumpHere(tls, v, iAddr)
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr > nErr {
+		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FerrByteOffset = -1
+	}
 }
 
 // Generate code to extract the value of the iCol-th column of a table.
@@ -60643,7 +60644,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+7970,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7989,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -60816,8 +60817,8 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8000, ts + 8005, ts + 8010, ts + 6191,
-				ts + 6186, ts + 8018}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8019, ts + 8024, ts + 8029, ts + 6210,
+				ts + 6205, ts + 8037}
 			var aff uint8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
@@ -60825,7 +60826,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 8026
+						return ts + 8045
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -60840,6 +60841,7 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 	var p uintptr
 	var v uintptr
 	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+		var exprAff U8
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -60853,6 +60855,14 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 		if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr, iDataCur) != 0 {
 			continue
 		}
+
+		exprAff = Xsqlite3ExprAffinity(tls, pExpr)
+		if int32(exprAff) <= SQLITE_AFF_BLOB && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_BLOB ||
+			int32(exprAff) == SQLITE_AFF_TEXT && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_TEXT ||
+			int32(exprAff) >= SQLITE_AFF_NUMERIC && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_NUMERIC {
+			continue
+		}
+
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 
 		if (*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow != 0 {
@@ -61192,7 +61202,7 @@ __73:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
 		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7970,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7989,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
 __76:
@@ -61425,7 +61435,7 @@ __43:
 		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+8031, libc.VaList(bp+8, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8050, libc.VaList(bp+8, pExpr))
 	goto __91
 __90:
 	return func() int32 {
@@ -61466,7 +61476,7 @@ __93:
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
 		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8058, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8077, libc.VaList(bp+16, pExpr))
 	goto __5
 __94:
 	;
@@ -61626,7 +61636,7 @@ __121:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
 		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7660,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
 __122:
 	;
@@ -61648,11 +61658,10 @@ __49:
 	return target
 
 __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) {
+	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) {
 		goto __123
 	}
+
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
 		goto __125
@@ -61692,7 +61701,7 @@ __126:
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	goto __5
 
 __55:
@@ -61723,13 +61732,19 @@ __129:
 	;
 __127:
 	;
-	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
+	addrINR = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable, 0, target)
 
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = U8(0)
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = okConstFactor
+	if !(inReg != target) {
+		goto __130
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
+	inReg = target
+__130:
+	;
 	Xsqlite3VdbeJumpHere(tls, v, addrINR)
-	Xsqlite3VdbeChangeP3(tls, v, addrINR, inReg)
 	goto __5
 
 __56:
@@ -61742,15 +61757,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __130
+		goto __131
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __131
+		goto __132
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__131:
+__132:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -61760,22 +61775,22 @@ __131:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__130:
+__131:
 	;
 	i1 = 0
-__132:
+__133:
 	if !(i1 < nExpr-1) {
-		goto __134
+		goto __135
 	}
 	if !(pX != 0) {
-		goto __135
+		goto __136
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __136
-__135:
-	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+	goto __137
 __136:
+	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+__137:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -61784,21 +61799,21 @@ __136:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __133
-__133:
-	i1 = i1 + 2
-	goto __132
 	goto __134
 __134:
+	i1 = i1 + 2
+	goto __133
+	goto __135
+__135:
 	;
 	if !(nExpr&1 != 0) {
-		goto __137
+		goto __138
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __138
-__137:
-	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+	goto __139
 __138:
+	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+__139:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -61808,27 +61823,27 @@ __138:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __139
-	}
-	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8082, 0)
-	return 0
-__139:
-	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __140
 	}
-	Xsqlite3MayAbort(tls, pParse)
+	Xsqlite3ErrorMsg(tls, pParse,
+		ts+8101, 0)
+	return 0
 __140:
 	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __141
 	}
+	Xsqlite3MayAbort(tls, pParse)
+__141:
+	;
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+		goto __142
+	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __142
-__141:
+	goto __143
+__142:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -61837,7 +61852,7 @@ __141:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__142:
+__143:
 	;
 	goto __5
 
@@ -61848,7 +61863,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[10]uint8)(unsafe.Pointer(ts + 8132))
+var zAff = *(*[10]uint8)(unsafe.Pointer(ts + 8151))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -63637,11 +63652,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+6381, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 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+8142, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8161, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -63653,13 +63668,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8170,
+		ts+8189,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8345,
+			ts+8364,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -63669,10 +63684,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8519, libc.VaList(bp, zDb, zDb))
+		ts+8538, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8666, 0)
+			ts+8685, 0)
 	}
 }
 
@@ -63736,7 +63751,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8817, libc.VaList(bp, zName))
+		ts+8836, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -63746,7 +63761,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8876, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8895, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -63755,7 +63770,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8882, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8901, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -63796,19 +63811,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8909, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8928, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9093,
+		ts+9112,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9398, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9417, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9414,
+		ts+9433,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -63816,7 +63831,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9472, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9491, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -63828,7 +63843,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9737, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9756, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63840,7 +63855,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9750,
+		ts+9769,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -63886,12 +63901,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9788, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9807, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9820, 0)
+			ts+9839, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -63901,11 +63916,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+9847)
+				ts+9866)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9906)
+				ts+9925)
 		}
 
 		if pDflt != 0 {
@@ -63918,12 +63933,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9959)
+					ts+9978)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10005)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10024)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -63934,7 +63949,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10032,
+			ts+10051,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -63956,7 +63971,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+10178,
+				ts+10197,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -64004,14 +64019,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10408, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10427, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10442, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10461, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -64039,7 +64054,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+10472, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10491, 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
 	}
@@ -64079,18 +64094,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 + 10491
+		zType = ts + 10510
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10496
+		zType = ts + 10515
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10510,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10529,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10528
+					return ts + 10547
 				}
-				return ts + 10545
+				return ts + 10564
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -64174,11 +64189,11 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10582, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1554, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1573, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iSchema == 1))
 
 	Xsqlite3MayAbort(tls, pParse)
@@ -64191,17 +64206,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10584,
+		ts+10603,
 		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+10766,
+		ts+10785,
 		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+9737, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9756, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -64459,12 +64474,12 @@ 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+10897,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10916,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*uint8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10920
+				return ts + 10939
 			}
-			return ts + 1554
+			return ts + 1573
 		}(), zWhen,
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg))
 	Xsqlite3_result_error(tls, pCtx, zErr, -1)
@@ -64504,8 +64519,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+10922, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 113494)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10941, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113516)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -64522,7 +64537,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, 113505)
+		rc = Xsqlite3CorruptError(tls, 113527)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -64544,7 +64559,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+10930, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10949, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -64584,12 +64599,12 @@ 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+10936, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10955, 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 + 10920
+							return ts + 10939
 						}
-						return ts + 1554
+						return ts + 1573
 					}()))
 				zReplace = zBuf2
 				nReplace = U32(Xsqlite3Strlen30(tls, zReplace))
@@ -65075,7 +65090,7 @@ __45:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FzErrMsg != 0) {
 		goto __47
 	}
-	renameColumnParseError(tls, context, ts+1554, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
+	renameColumnParseError(tls, context, ts+1573, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
 	goto __48
 __47:
 	Xsqlite3_result_error_code(tls, context, rc)
@@ -65240,7 +65255,7 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 			if rc == SQLITE_ERROR && Xsqlite3WritableSchema(tls, db) != 0 {
 				Xsqlite3_result_value(tls, context, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 			} else if (*Parse)(unsafe.Pointer(bp+80)).FzErrMsg != 0 {
-				renameColumnParseError(tls, context, ts+1554, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
+				renameColumnParseError(tls, context, ts+1573, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
 			} else {
 				Xsqlite3_result_error_code(tls, context, rc)
 			}
@@ -65443,7 +65458,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 114441)
+	rc = Xsqlite3CorruptError(tls, 114463)
 	goto drop_column_done
 __2:
 	;
@@ -65467,7 +65482,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10941, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10960, 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)
 
@@ -65548,19 +65563,19 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10582, 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+10948,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10967,
 		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 + 10976
+				return ts + 10995
 			}
-			return ts + 6127
+			return ts + 6146
 		}(),
 			zCol))
 	goto exit_drop_column
@@ -65569,7 +65584,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10988, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11007, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -65583,13 +65598,13 @@ __8:
 	goto exit_drop_column
 __9:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1554, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1573, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11036, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11055, 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+11157, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11176, 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
@@ -65707,11 +65722,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 + 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}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11194},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11215},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11235},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11254},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11273}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -65745,7 +65760,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+11277, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11296, 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)
 			}
@@ -65754,10 +65769,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+11300,
+					ts+11319,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11330, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11349, 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)
 			}
@@ -65775,9 +65790,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11348, FzCols: ts + 11361},
-	{FzName: ts + 11374, FzCols: ts + 11387},
-	{FzName: ts + 11415},
+	{FzName: ts + 11367, FzCols: ts + 11380},
+	{FzName: ts + 11393, FzCols: ts + 11406},
+	{FzName: ts + 11434},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65967,7 +65982,7 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11428}
+	FzName:     ts + 11447}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
@@ -66218,7 +66233,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11438}
+	FzName:     ts + 11457}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -66232,7 +66247,7 @@ 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+11448,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11467,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
 					return (*StatAccum)(unsafe.Pointer(p)).FnEst
@@ -66245,7 +66260,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11453, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11472, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -66287,7 +66302,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+11459, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11478, 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--
@@ -66301,7 +66316,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11465}
+	FzName:     ts + 11484}
 
 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)
@@ -66345,7 +66360,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+11474, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11493, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -66362,7 +66377,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+11348, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11367, 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)
@@ -66518,7 +66533,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+11484, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11503, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -66575,7 +66590,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+11484, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11503, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -66622,9 +66637,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+11488)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11507)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11492)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11511)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -66707,7 +66722,7 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 	var v TRowcnt
 
 	if z == uintptr(0) {
-		z = ts + 1554
+		z = ts + 1573
 	}
 	for i = 0; *(*uint8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
 		v = uint64(0)
@@ -66729,15 +66744,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+11496, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11515, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11507, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11526, 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+11517, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11536, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*uint8)(unsafe.Pointer(z))) != 0 && int32(*(*uint8)(unsafe.Pointer(z))) != ' ' {
@@ -67013,11 +67028,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+11374, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11393, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11529,
-			ts+11583,
+			ts+11548,
+			ts+11602,
 			zDb)
 	}
 	return rc
@@ -67064,10 +67079,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+11348, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11367, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11635, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11654, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -67125,7 +67140,7 @@ 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+6441, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6460, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -67158,13 +67173,13 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zFile == uintptr(0)) {
 		goto __1
 	}
-	zFile = ts + 1554
+	zFile = ts + 1573
 __1:
 	;
 	if !(zName == uintptr(0)) {
 		goto __2
 	}
-	zName = ts + 1554
+	zName = ts + 1573
 __2:
 	;
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2)) != 0) {
@@ -67172,14 +67187,14 @@ __2:
 	}
 
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3835)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3854)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11676, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11695, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
 	if !(rc == SQLITE_OK) {
 		goto __6
 	}
@@ -67216,7 +67231,7 @@ __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11679,
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11698,
 		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
@@ -67230,7 +67245,7 @@ __12:
 	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __15
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11716, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11735, libc.VaList(bp+8, zName))
 	goto attach_error
 __15:
 	;
@@ -67294,7 +67309,7 @@ __4:
 		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11746, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11765, 0)
 	goto __23
 __22:
 	if !(rc == SQLITE_OK) {
@@ -67311,7 +67326,7 @@ __25:
 		goto __27
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
-		ts+11775, 0)
+		ts+11794, 0)
 	rc = SQLITE_ERROR
 __27:
 	;
@@ -67377,13 +67392,13 @@ __33:
 	}
 	Xsqlite3OomFault(tls, db)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1509, 0)
 	goto __35
 __34:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
 		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11843, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11862, libc.VaList(bp+16, zFile))
 __36:
 	;
 __35:
@@ -67430,7 +67445,7 @@ func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zName == uintptr(0)) {
 		goto __1
 	}
-	zName = ts + 1554
+	zName = ts + 1573
 __1:
 	;
 	i = 0
@@ -67461,14 +67476,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11871, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11890, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11892, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11911, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -67476,7 +67491,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11918, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11937, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -67593,7 +67608,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11940}
+	FzName:     ts + 11959}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -67606,7 +67621,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11954}
+	FzName:     ts + 11973}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -67620,7 +67635,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+11968, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11987, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -67652,7 +67667,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+11992,
+						ts+12011,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -67827,7 +67842,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+12038, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12057, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -67853,11 +67868,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+12061, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12080, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12067, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12086, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12073, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12092, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -67904,7 +67919,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 + 7713
+		zCol = ts + 7732
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -67928,7 +67943,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+12100, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12119, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -68199,25 +68214,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6441) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6460) == 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+6381, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
 			if i == 1 {
-				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 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5902+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+6389)
+						ts+6408)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+5883)
+						ts+5902)
 				}
 			}
 		}
@@ -68238,12 +68253,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		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 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5902)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+6389)
+					ts+6408)
 			}
 		}
 	}
@@ -68274,7 +68289,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+12115, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12134, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -68292,14 +68307,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 + 12123
+			zMsg = ts + 12142
 		} else {
-			zMsg = ts + 12136
+			zMsg = ts + 12155
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6664, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6674, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -68329,12 +68344,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+6381, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
-			return ts + 6427
+	if Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5902+7) == 0 {
+			return ts + 6446
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6389+7) == 0 {
-			return ts + 6408
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 {
+			return ts + 6427
 		}
 	}
 	return zName
@@ -68692,7 +68707,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+5883)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5902)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -68718,7 +68733,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6441, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6460, zName) {
 				goto __3
 			}
 
@@ -68771,13 +68786,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+12150, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12169, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12167, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12186, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -68815,13 +68830,13 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 		if Xsqlite3_stricmp(tls, zType, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit))) != 0 ||
 			Xsqlite3_stricmp(tls, zName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 1*8))) != 0 ||
 			Xsqlite3_stricmp(tls, zTblName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 2*8))) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1554, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1573, 0)
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6381, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6400, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12187,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12206,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -68981,9 +68996,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -68999,7 +69014,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12229, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12248, 0)
 	return
 __4:
 	;
@@ -69027,9 +69042,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10491
+			return ts + 10510
 		}
-		return ts + 8876
+		return ts + 8895
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -69045,9 +69060,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -69078,12 +69093,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12270,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12289,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10491
+				return ts + 10510
 			}
-			return ts + 8876
+			return ts + 8895
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -69098,7 +69113,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12291, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12310, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -69185,7 +69200,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+12326, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12345, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -69209,7 +69224,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+12343, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12362, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -69229,7 +69244,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 + 12326
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12345
 	(*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)
@@ -69241,7 +69256,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+12326, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12345, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -69275,7 +69290,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+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12396, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -69283,13 +69298,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+12400, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12419, 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+12407, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12426, 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--
@@ -69326,7 +69341,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+12417, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12436, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -69490,10 +69505,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+12443,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12462,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12488, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12507, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -69524,7 +69539,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+12529, 0)
+			ts+12548, 0)
 	}
 }
 
@@ -69569,7 +69584,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12581, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12600, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -69658,7 +69673,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12622, 0)
+		ts+12641, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -69753,7 +69768,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12678, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12697, 0)
 	goto generated_done
 __2:
 	;
@@ -69766,13 +69781,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12721, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12740, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12729, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12748, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -69806,13 +69821,19 @@ __10:
 
 	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
 __11:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_RAISE) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = (*Column)(unsafe.Pointer(pCol)).Faffinity
+__12:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12736,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12755,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -69933,13 +69954,13 @@ __3:
 	;
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
-		zSep = ts + 1554
-		zSep2 = ts + 12767
-		zEnd = ts + 4957
+		zSep = ts + 1573
+		zSep2 = ts + 12786
+		zEnd = ts + 4976
 	} else {
-		zSep = ts + 12769
-		zSep2 = ts + 12773
-		zEnd = ts + 12778
+		zSep = ts + 12788
+		zSep2 = ts + 12792
+		zEnd = ts + 12797
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -69947,7 +69968,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12781, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12800, 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('(')
@@ -69981,17 +70002,17 @@ __5:
 	goto __6
 __6:
 	;
-	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3663, libc.VaList(bp, zEnd))
+	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3682, libc.VaList(bp, zEnd))
 	return zStmt
 }
 
 var azType1 = [6]uintptr{
-	ts + 1554,
-	ts + 12795,
-	ts + 12801,
-	ts + 12806,
-	ts + 12811,
-	ts + 12801,
+	ts + 1573,
+	ts + 12814,
+	ts + 12820,
+	ts + 12825,
+	ts + 12830,
+	ts + 12820,
 }
 
 func resizeIndexObject(tls *libc.TLS, db uintptr, pIdx uintptr, N int32) int32 {
@@ -70381,7 +70402,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
 		if pSelect != 0 || !(int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM) && (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1554, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1573, 0)
 			return
 		}
 		(*Table)(unsafe.Pointer(p)).Ftnum = (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum
@@ -70398,10 +70419,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+12817,
-						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1554)))
+						ts+12836,
+						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1573)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12850,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12869,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -70420,11 +70441,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+12877, 0)
+				ts+12896, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12927, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12946, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -70458,7 +70479,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12959, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12978, 0)
 			return
 		}
 	}
@@ -70483,11 +70504,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 + 8876
-			zType2 = ts + 13003
+			zType = ts + 8895
+			zType2 = ts + 13022
 		} else {
-			zType = ts + 10491
-			zType2 = ts + 13009
+			zType = ts + 10510
+			zType2 = ts + 13028
 		}
 
 		if pSelect != 0 {
@@ -70558,11 +70579,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+13014, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13033, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13029,
+			ts+13048,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -70578,13 +70599,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+13127,
+					ts+13146,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13169, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13188, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -70599,7 +70620,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+9398) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9417) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -70629,7 +70650,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+13203, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13222, 0)
 	goto create_view_fail
 __1:
 	;
@@ -70645,7 +70666,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10491, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10510, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -70727,7 +70748,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13239, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13258, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -70852,13 +70873,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+13269, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13288, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13284,
+		ts+13303,
 		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)
 }
@@ -70899,10 +70920,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+13351, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]uint8{})), bp+40, ts+13370, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11300,
+				ts+11319,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -70934,12 +70955,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+13365,
+			ts+13384,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13410,
+		ts+13429,
 		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)
@@ -70967,11 +70988,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+6381, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3286, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3305, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7133, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7141, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -71049,9 +71070,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -71110,21 +71131,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13477, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13496, 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+13505, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13524, 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+13539, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13558, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -71136,7 +71157,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11492, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11511, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -71200,7 +71221,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13571,
+		ts+13590,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -71212,7 +71233,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13634, 0)
+		ts+13653, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -71297,7 +71318,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13728,
+		ts+13747,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -71524,12 +71545,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+13774,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13793,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13802
+							return ts + 13821
 						}
-						return ts + 13808
+						return ts + 13827
 					}()))
 				return 1
 			}
@@ -71650,7 +71671,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13813, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13832, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -71669,7 +71690,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13819,
+		ts+13838,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -71695,26 +71716,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13869, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13888, 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+13897, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13916, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13922, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13941, 0)
 	goto exit_create_index
 __17:
 	;
@@ -71728,7 +71749,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13813, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13832, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -71743,7 +71764,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13956, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13975, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -71755,7 +71776,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13990, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14009, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -71784,7 +71805,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14014, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14033, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -71805,9 +71826,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -71846,7 +71867,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13813)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13832)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -71947,7 +71968,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14037, 0)
+		ts+14056, 0)
 	goto exit_create_index
 __56:
 	;
@@ -72164,7 +72185,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14098, libc.VaList(bp+48, 0))
+		ts+14117, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -72216,8 +72237,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14140, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14159, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121859)
 	goto exit_create_index
 __101:
 	;
@@ -72263,12 +72284,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14157,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14176,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
-				return ts + 1554
+				return ts + 1573
 			}
-			return ts + 14177
+			return ts + 14196
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -72276,7 +72297,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14185,
+		ts+14204,
 		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,
@@ -72290,7 +72311,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14244, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14263, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -72451,7 +72472,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14271, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14290, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -72466,7 +72487,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14289, libc.VaList(bp+8, 0))
+		ts+14308, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -72477,9 +72498,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -72505,9 +72526,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14362,
+		ts+14381,
 		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+11488, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11507, (*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)
@@ -72642,7 +72663,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+14422,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14441,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -72850,12 +72871,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+14458,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14477,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14494
+				return ts + 14513
 			}
-			return ts + 14497
+			return ts + 14516
 		}()))
 	goto append_from_error
 __1:
@@ -73024,7 +73045,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14503, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14522, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -73060,9 +73081,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14509
+				return ts + 14528
 			}
-			return ts + 14518
+			return ts + 14537
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -73087,7 +73108,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14503, ts + 14525, ts + 14509}
+var az = [3]uintptr{ts + 14522, ts + 14544, ts + 14528}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -73102,7 +73123,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+14533, 0)
+				ts+14552, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -73239,17 +73260,17 @@ 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+14603, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14622, 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+14614, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14633, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
-			Xsqlite3_str_append(tls, bp+8, ts+1567, 1)
+			Xsqlite3_str_append(tls, bp+8, ts+1586, 1)
 			Xsqlite3_str_appendall(tls, bp+8, zCol)
 		}
 	}
@@ -73272,11 +73293,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+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12080, 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+14617, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14636, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -73406,7 +73427,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14626, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14645, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -73502,7 +73523,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+14672, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14691, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -73700,7 +73721,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14702, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14721, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -73980,7 +74001,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+14733,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14752,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -74012,11 +74033,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+14766, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14785, 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+14795, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14814, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -74267,7 +74288,7 @@ __20:
 	goto __16
 __15:
 	wcf = U16(WHERE_ONEPASS_DESIRED | WHERE_DUPLICATES_OK)
-	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_VarSelect != 0) {
+	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_Subquery != 0) {
 		goto __23
 	}
 	bComplex = 1
@@ -74520,7 +74541,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14833)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14852)
 __62:
 	;
 delete_from_cleanup:
@@ -74635,7 +74656,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+11348) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11367) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -74865,7 +74886,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 + 8005, ts + 8000, ts + 6181}
+var azType2 = [5]uintptr{ts + 6210, ts + 6205, ts + 8024, ts + 8019, ts + 6200}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -74924,7 +74945,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+14846, -1)
+					Xsqlite3_result_error(tls, context, ts+14865, -1)
 					return
 				}
 				iVal = -iVal
@@ -75228,7 +75249,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14863, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14882, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -75574,7 +75595,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+14868, -1)
+		Xsqlite3_result_error(tls, context, ts+14887, -1)
 		return
 	}
 	if argc == 3 {
@@ -75584,7 +75605,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+14901, -1)
+				ts+14920, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -75637,7 +75658,7 @@ func errlogFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	_ = argc
 	_ = context
-	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3663, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
+	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3682, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
 }
 
 func compileoptionusedFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
@@ -75677,13 +75698,13 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 
 			var zVal uintptr
 			r1 = Xsqlite3_value_double(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+4925, libc.VaList(bp, r1))
+			Xsqlite3_str_appendf(tls, pStr, ts+4944, libc.VaList(bp, r1))
 			zVal = Xsqlite3_str_value(tls, pStr)
 			if zVal != 0 {
 				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+14946, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14965, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -75691,7 +75712,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 		}
 	case SQLITE_INTEGER:
 		{
-			Xsqlite3_str_appendf(tls, pStr, ts+1334, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
+			Xsqlite3_str_appendf(tls, pStr, ts+1353, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
 			break
 
 		}
@@ -75720,13 +75741,13 @@ 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+14953, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14972, libc.VaList(bp+24, zArg))
 			break
 
 		}
 	default:
 		{
-			Xsqlite3_str_append(tls, pStr, ts+1555, 4)
+			Xsqlite3_str_append(tls, pStr, ts+1574, 4)
 			break
 
 		}
@@ -75867,7 +75888,7 @@ func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 	var ch U32
 	var c U8
 	var d U8
-	zPass = ts + 1554
+	zPass = ts + 1573
 	nPass = 0
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -76149,7 +76170,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10920}
+var azOne = [1]uintptr{ts + 10939}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -76161,7 +76182,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	zIn = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	if zIn == uintptr(0) {
-		zIn = ts + 1554
+		zIn = ts + 1573
 	}
 	for i = 0; *(*U8)(unsafe.Pointer(zIn + uintptr(i))) != 0 && !(int32(Xsqlite3CtypeMap[*(*U8)(unsafe.Pointer(zIn + uintptr(i)))])&0x02 != 0); i++ {
 	}
@@ -76185,7 +76206,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+14956, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14975, 4, uintptr(0))
 	}
 }
 
@@ -76210,7 +76231,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+12100, -1)
+		Xsqlite3_result_error(tls, context, ts+12119, -1)
 		return
 	}
 
@@ -76288,7 +76309,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+14846, -1)
+			Xsqlite3_result_error(tls, context, ts+14865, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -76550,7 +76571,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+14961, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14980, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -76570,14 +76591,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14967, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14986, 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+14967, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14986, 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+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)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14986, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14986, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -76818,109 +76839,109 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 }
 
 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 + 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(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(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 + 14991},
+	{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 + 15011},
+	{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 + 15024},
+	{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 + 15042},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15051},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15059},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15059},
+	{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_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15100},
+	{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 + 15125},
+	{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 + 15134},
+	{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 + 15145},
+	{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 + 15152},
+	{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 + 15166},
+	{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 + 15166},
+	{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 + 15172},
+	{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 + 15172},
+	{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 + 15178},
+	{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 + 15178},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15183},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15183},
+	{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 + 15183},
+	{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 + 15187},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15187},
+	{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 + 15187},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15191},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15198},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15206},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15213},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15219},
+	{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 + 15233},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15241},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15246},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15256},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15262},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15268},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15272},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15272},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15278},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15285},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15292},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15303},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15310},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15325},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15342},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15353},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15359},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15377},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15385},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15399},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15407},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15423},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15423},
+	{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 + 15433},
+	{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 + 15437},
+	{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 + 15443},
+	{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 + 15447},
+	{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 + 15447},
+	{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 + 15453},
+	{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 + 15453},
+	{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 + 15466},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14986},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14986},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6605},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6605},
 	{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 + 15523},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15476},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15484},
+	{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 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15496},
+	{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 + 15499},
+	{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 + 15503},
+	{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 + 15509},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15499},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15514},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15518},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15522},
 	{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 + 15532},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15537},
 	{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 + 15556},
+	{FnArg: int8(2), 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 + 15553},
+	{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 + 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 + 15565},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15570},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15575},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15580},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15586},
 	{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}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15598},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15603},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15611},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15619},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15622},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6605},
+	{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 + 15627}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -77041,7 +77062,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+15612,
+				ts+15631,
 				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)
@@ -77701,8 +77722,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 + 6452, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6448, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6471, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6467, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -77781,7 +77802,7 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 			(*Token)(unsafe.Pointer(bp + 80)).Fz = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 			(*Token)(unsafe.Pointer(bp + 80)).Fn = uint32(Xsqlite3Strlen30(tls, (*Token)(unsafe.Pointer(bp+80)).Fz))
 
-			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5136)
+			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5155)
 			if pRaise != 0 {
 				(*Expr)(unsafe.Pointer(pRaise)).FaffExpr = uint8(OE_Abort)
 			}
@@ -78203,7 +78224,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7970, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7989, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -78671,7 +78692,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15657,
+		ts+15676,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -78696,7 +78717,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15698,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15717,
 		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
@@ -78845,7 +78866,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15730,
+		ts+15749,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -78855,7 +78876,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15782, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15801, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -78907,7 +78928,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15807,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15826,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -78915,7 +78936,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15853, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15872, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -79327,7 +79348,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15874)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15893)
 __125:
 	;
 insert_cleanup:
@@ -79643,7 +79664,7 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 						fallthrough
 					case OE_Fail:
 						{
-							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12080, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 								(*Column)(unsafe.Pointer(pCol)).FzCnName))
 
 							Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
@@ -80735,13 +80756,13 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131895)
+	return Xsqlite3MisuseError(tls, 131931)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
 		goto __2
 	}
-	zSql = ts + 1554
+	zSql = ts + 1573
 __2:
 	;
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -81220,7 +81241,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12100, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12119, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -81229,7 +81250,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15888
+		zEntry = ts + 15907
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -81244,7 +81265,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12080, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -81280,7 +81301,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15911, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15930, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*uint8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -81294,7 +81315,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15920, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15939, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -81318,7 +81339,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15924, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15943, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -81336,7 +81357,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15930, libc.VaList(bp+16, zEntry, zFile))
+		ts+15949, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -81363,7 +81384,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15973, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15992, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -81401,7 +81422,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+16005, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16024, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -81411,7 +81432,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16042,
+	ts + 16061,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -81567,7 +81588,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+16045, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16064, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -81575,63 +81596,63 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 }
 
 var pragCName = [57]uintptr{
-	ts + 5057,
-	ts + 16084,
-	ts + 8876,
-	ts + 16088,
-	ts + 16093,
-	ts + 16096,
-	ts + 16106,
-	ts + 16116,
-	ts + 16122,
-	ts + 16126,
-	ts + 16131,
-	ts + 16136,
-	ts + 16144,
+	ts + 5076,
+	ts + 16103,
+	ts + 8895,
+	ts + 16107,
+	ts + 16112,
+	ts + 16115,
+	ts + 16125,
+	ts + 16135,
+	ts + 16141,
+	ts + 16145,
+	ts + 16150,
 	ts + 16155,
-	ts + 16158,
-	ts + 16165,
-	ts + 16126,
-	ts + 16131,
-	ts + 16172,
+	ts + 16163,
+	ts + 16174,
 	ts + 16177,
-	ts + 16180,
-	ts + 16187,
-	ts + 16122,
-	ts + 16126,
-	ts + 16193,
-	ts + 16198,
-	ts + 16203,
-	ts + 16126,
-	ts + 16207,
-	ts + 16131,
-	ts + 16215,
-	ts + 16219,
-	ts + 16224,
-	ts + 11492,
-	ts + 11488,
-	ts + 16230,
-	ts + 16235,
-	ts + 16240,
-	ts + 16084,
-	ts + 16126,
-	ts + 16245,
-	ts + 16252,
+	ts + 16184,
+	ts + 16145,
+	ts + 16150,
+	ts + 16191,
+	ts + 16196,
+	ts + 16199,
+	ts + 16206,
+	ts + 16141,
+	ts + 16145,
+	ts + 16212,
+	ts + 16217,
+	ts + 16222,
+	ts + 16145,
+	ts + 16226,
+	ts + 16150,
+	ts + 16234,
+	ts + 16238,
+	ts + 16243,
+	ts + 11511,
+	ts + 11507,
+	ts + 16249,
+	ts + 16254,
 	ts + 16259,
-	ts + 8876,
-	ts + 16267,
-	ts + 5060,
-	ts + 16273,
-	ts + 16084,
-	ts + 16126,
+	ts + 16103,
+	ts + 16145,
+	ts + 16264,
+	ts + 16271,
 	ts + 16278,
-	ts + 16283,
-	ts + 15480,
-	ts + 16288,
-	ts + 16301,
-	ts + 16310,
-	ts + 16317,
-	ts + 16328,
+	ts + 8895,
+	ts + 16286,
+	ts + 5079,
+	ts + 16292,
+	ts + 16103,
+	ts + 16145,
+	ts + 16297,
+	ts + 16302,
+	ts + 15499,
+	ts + 16307,
+	ts + 16320,
+	ts + 16329,
+	ts + 16336,
+	ts + 16347,
 }
 
 // Definitions of all built-in pragmas
@@ -81649,238 +81670,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16336,
+	{FzName: ts + 16355,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16351,
+	{FzName: ts + 16370,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16366,
+	{FzName: ts + 16385,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16378,
+	{FzName: ts + 16397,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16394,
+	{FzName: ts + 16413,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16317,
+	{FzName: ts + 16336,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16407,
+	{FzName: ts + 16426,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16419,
+	{FzName: ts + 16438,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16439,
+	{FzName: ts + 16458,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CellSizeCk)},
-	{FzName: ts + 16455,
+	{FzName: ts + 16474,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16476,
+	{FzName: ts + 16495,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16491,
+	{FzName: ts + 16510,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16507,
+	{FzName: ts + 16526,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16521,
+	{FzName: ts + 16540,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16534,
+	{FzName: ts + 16553,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16548,
+	{FzName: ts + 16567,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16567,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_DeferFKs)},
 	{FzName: ts + 16586,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_DeferFKs)},
+	{FzName: ts + 16605,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16609,
+	{FzName: ts + 16628,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16618,
+	{FzName: ts + 16637,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16636,
+	{FzName: ts + 16655,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16653,
+	{FzName: ts + 16672,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16666,
+	{FzName: ts + 16685,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16681,
+	{FzName: ts + 16700,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16699,
+	{FzName: ts + 16718,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16709,
+	{FzName: ts + 16728,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16723,
+	{FzName: ts + 16742,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16739,
+	{FzName: ts + 16758,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16764,
+	{FzName: ts + 16783,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16783,
+	{FzName: ts + 16802,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16794,
+	{FzName: ts + 16813,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16805,
+	{FzName: ts + 16824,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16817,
+	{FzName: ts + 16836,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16833,
+	{FzName: ts + 16852,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16846,
+	{FzName: ts + 16865,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16865,
+	{FzName: ts + 16884,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16884,
+	{FzName: ts + 16903,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16897,
+	{FzName: ts + 16916,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16912,
+	{FzName: ts + 16931,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16922,
+	{FzName: ts + 16941,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16934,
+	{FzName: ts + 16953,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16943,
+	{FzName: ts + 16962,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16954,
+	{FzName: ts + 16973,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16964,
+	{FzName: ts + 16983,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16976,
+	{FzName: ts + 16995,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16987,
+	{FzName: ts + 17006,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16999,
+	{FzName: ts + 17018,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17016,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_RecTriggers)},
 	{FzName: ts + 17035,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_RecTriggers)},
+	{FzName: ts + 17054,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17061,
+	{FzName: ts + 17080,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17076,
+	{FzName: ts + 17095,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17090,
+	{FzName: ts + 17109,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17109,
+	{FzName: ts + 17128,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17123,
+	{FzName: ts + 17142,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17139,
+	{FzName: ts + 17158,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17151,
+	{FzName: ts + 17170,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17162,
+	{FzName: ts + 17181,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17173,
+	{FzName: ts + 17192,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17185,
+	{FzName: ts + 17204,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17196,
+	{FzName: ts + 17215,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17217,
+	{FzName: ts + 17236,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17225,
+	{FzName: ts + 17244,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17240,
+	{FzName: ts + 17259,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17253,
-		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
 	{FzName: ts + 17272,
+		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
+	{FzName: ts + 17291,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17287,
+	{FzName: ts + 17306,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -81902,7 +81923,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17303))
+var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17322))
 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)}
@@ -81914,10 +81935,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+17328) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17347) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17357) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -81926,13 +81947,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+8026) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8045) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17345) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17364) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17350) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17369) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -81947,9 +81968,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+16278) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16297) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17362) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17381) == 0 {
 		return 2
 	} else {
 		return 0
@@ -81963,7 +81984,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+17369, 0)
+				ts+17388, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -82054,19 +82075,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17431
+		zName = ts + 17450
 		break
 	case OE_SetDflt:
-		zName = ts + 17440
+		zName = ts + 17459
 		break
 	case OE_Cascade:
-		zName = ts + 17452
+		zName = ts + 17471
 		break
 	case OE_Restrict:
-		zName = ts + 17460
+		zName = ts + 17479
 		break
 	default:
-		zName = ts + 17469
+		zName = ts + 17488
 		break
 	}
 	return zName
@@ -82083,7 +82104,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17479, ts + 17486, ts + 17494, ts + 17498, ts + 17362, ts + 17507,
+	ts + 17498, ts + 17505, ts + 17513, ts + 17517, ts + 17381, ts + 17526,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -82130,13 +82151,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17511
+			zType = ts + 17530
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17513
+			zType = ts + 17532
 		} else {
-			zType = ts + 7528
+			zType = ts + 7536
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17515,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17534,
 			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),
@@ -82144,7 +82165,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17522, ts + 17527, ts + 17535}
+var azEnc = [4]uintptr{uintptr(0), ts + 17541, ts + 17546, ts + 17554}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -82295,6 +82316,7 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp7 int32
 	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
@@ -82391,7 +82413,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17543, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17562, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -82430,7 +82452,7 @@ __8:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 488)) != 0) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 488)))
 __10:
 	;
@@ -82652,7 +82674,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17547) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17566) == 0) {
 		goto __64
 	}
 	b = 2
@@ -82724,7 +82746,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17338
+	zRet = ts + 17357
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -82762,7 +82784,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17328
+	zRet = ts + 17347
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -83049,7 +83071,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 552)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17552, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17571, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -83068,7 +83090,7 @@ __127:
 	if !(*(*uint8)(unsafe.Pointer(zRight)) != 0) {
 		goto __128
 	}
-	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+16, zRight))
+	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+16, zRight))
 	goto __129
 __128:
 	Xsqlite3_temp_directory = uintptr(0)
@@ -83090,7 +83112,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17577, 0)
+		ts+17596, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -83144,7 +83166,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17630) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17649) == 0) {
 		goto __142
 	}
 
@@ -83241,13 +83263,13 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17636
+			return ts + 17655
 		}
-		return ts + 17644
+		return ts + 17663
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
-			Xsqlite3ColumnType(tls, pCol, ts+1554),
+			Xsqlite3ColumnType(tls, pCol, ts+1573),
 			func() int32 {
 				if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 {
 					return 1
@@ -83312,7 +83334,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17651, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17670, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -83325,7 +83347,7 @@ __172:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __173
 	}
-	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1490, 0)
+	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1509, 0)
 	(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 __173:
 	;
@@ -83358,29 +83380,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10491
+	zType = ts + 10510
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12721
+	zType = ts + 12740
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17667
+	zType = ts + 17686
 	goto __183
 __182:
-	zType = ts + 8876
+	zType = ts + 8895
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17693,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -83446,7 +83468,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17681, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17700, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -83456,7 +83478,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17686,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17705,
 		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))))
@@ -83493,8 +83515,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17691, ts + 17693, ts + 16155}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17695,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17710, ts + 17712, ts + 16174}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17714,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -83527,7 +83549,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17720,
 		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)))
@@ -83549,7 +83571,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17705, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17724, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -83613,7 +83635,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7536, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -83629,7 +83651,7 @@ __218:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7536, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -83664,7 +83686,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17708,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17727,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -83672,7 +83694,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+17717))
+			ts+17736))
 	goto __227
 __227:
 	j2++
@@ -83861,7 +83883,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17722, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17741, 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)))
@@ -84078,7 +84100,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+17726, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17745, 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)
@@ -84189,7 +84211,7 @@ __307:
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17750,
+		ts+17769,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
@@ -84288,7 +84310,7 @@ __321:
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17786, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17805, 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) {
@@ -84310,7 +84332,7 @@ __326:
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17806,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17825,
 		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)
@@ -84323,7 +84345,7 @@ __329:
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17828,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17847,
 		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 __332
@@ -84341,11 +84363,11 @@ __331:
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
 __334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17851, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17870, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17853,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17872,
 		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)
 __333:
@@ -84391,7 +84413,7 @@ __339:
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17873,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17892,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
@@ -84425,89 +84447,103 @@ __344:
 
 	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+17903)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17922)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17908)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17927)
 	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)
 
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __345
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_IdxRowid, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
+	jmp7 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 3, 0, r1+int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn)-1)
+
+	Xsqlite3VdbeLoadString(tls, v, 3,
+		ts+17948)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17984)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp7)
+__345:
+	;
 	label6 = 0
 	kk = 0
-__345:
+__346:
 	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) {
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
 		goto __349
 	}
-	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+	goto __347
 __349:
+	;
+	if !(label6 == 0) {
+		goto __350
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__350:
 	;
 	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:
+	kk++
+	goto __346
+	goto __348
+__348:
 	;
 	if !(label6 != 0) {
-		goto __350
+		goto __351
 	}
 	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
 	Xsqlite3VdbeResolveLabel(tls, v, label6)
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17922)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17929)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17995)
 	Xsqlite3VdbeGoto(tls, v, jmp5-1)
 	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-__350:
+__351:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __351
+		goto __352
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__352:
+__353:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __354
+		goto __355
 	}
 	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 __355
+		goto __356
 	}
-	goto __353
-__355:
+	goto __354
+__356:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
-	goto __353
-__353:
-	kk++
-	goto __352
 	goto __354
 __354:
+	kk++
+	goto __353
+	goto __355
+__355:
 	;
 	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)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18022)
 	Xsqlite3VdbeGoto(tls, v, jmp5)
 	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
-__351:
+__352:
 	;
 	Xsqlite3VdbeJumpHere(tls, v, jmp4)
 	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
@@ -84524,20 +84560,20 @@ __340:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 612)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __356
+		goto __357
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17983)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+18049)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__357:
+__358:
 	if !(pIdx5 != 0) {
-		goto __359
-	}
-	if !(pPk1 == pIdx5) {
 		goto __360
 	}
-	goto __358
-__360:
+	if !(pPk1 == pIdx5) {
+		goto __361
+	}
+	goto __359
+__361:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -84546,21 +84582,21 @@ __360:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __358
-__358:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __357
 	goto __359
 __359:
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
+	goto __358
+	goto __360
+__360:
 	;
 	if !(pPk1 != 0) {
-		goto __361
+		goto __362
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__361:
+__362:
 	;
-__356:
+__357:
 	;
 	goto __291
 __291:
@@ -84578,14 +84614,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __362
+		goto __363
 	}
 	(*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 + 18012
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18078
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__362:
+__363:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -84593,27 +84629,27 @@ __362:
 
 __45:
 	if !!(zRight != 0) {
-		goto __363
+		goto __364
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __365
-	}
-	goto pragma_out
-__365:
-	;
-	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __364
-__363:
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
 		goto __366
 	}
+	goto pragma_out
+__366:
+	;
+	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
+	goto __365
+__364:
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
+		goto __367
+	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__367:
+__368:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __369
+		goto __370
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __370
+		goto __371
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -84627,25 +84663,25 @@ __367:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __369
-__370:
-	;
-	goto __368
-__368:
-	pEnc += 16
-	goto __367
-	goto __369
-__369:
-	;
-	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __371
-	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18015, libc.VaList(bp+456, zRight))
+	goto __370
 __371:
 	;
-__366:
+	goto __369
+__369:
+	pEnc += 16
+	goto __368
+	goto __370
+__370:
 	;
-__364:
+	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
+		goto __372
+	}
+	Xsqlite3ErrorMsg(tls, pParse, ts+18081, libc.VaList(bp+456, zRight))
+__372:
+	;
+__367:
+	;
+__365:
 	;
 	goto __15
 
@@ -84653,15 +84689,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 __372
+		goto __373
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __374
+		goto __375
 	}
 	goto __15
-__374:
+__375:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -84669,41 +84705,41 @@ __374:
 	(*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 __375
+		goto __376
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__375:
+__376:
 	;
-	goto __373
-__372:
+	goto __374
+__373:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __376
+		goto __377
 	}
 	goto __15
-__376:
+__377:
 	;
 	(*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)
-__373:
+__374:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__377:
+__378:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __378
+		goto __379
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __377
-__378:
+	goto __378
+__379:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -84718,31 +84754,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __379
-	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17345) == 0) {
 		goto __380
 	}
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17364) == 0) {
+		goto __381
+	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __381
-__380:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18040) == 0) {
-		goto __382
+	goto __382
+__381:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18106) == 0) {
+		goto __383
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __383
-__382:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17498) == 0) {
-		goto __384
+	goto __384
+__383:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17517) == 0) {
+		goto __385
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
+__385:
+	;
 __384:
 	;
-__383:
+__382:
 	;
-__381:
-	;
-__379:
+__380:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -84752,10 +84788,10 @@ __379:
 
 __49:
 	if !(zRight != 0) {
-		goto __385
+		goto __386
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__385:
+__386:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -84775,19 +84811,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __386
+		goto __387
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __388
+		goto __389
 	}
 	goto __15
-__388:
+__389:
 	;
-	goto __387
-__386:
-	opMask = U32(0xfffe)
+	goto __388
 __387:
+	opMask = U32(0xfffe)
+__388:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -84796,86 +84832,86 @@ __387:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__389:
+__390:
 	if !(iDb <= iDbLast) {
-		goto __391
-	}
-	if !(iDb == 1) {
 		goto __392
 	}
-	goto __390
-__392:
+	if !(iDb == 1) {
+		goto __393
+	}
+	goto __391
+__393:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__393:
+__394:
 	if !(k4 != 0) {
-		goto __395
+		goto __396
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __396
+		goto __397
 	}
-	goto __394
-__396:
+	goto __395
+__397:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__397:
+__398:
 	if !(pIdx6 != 0) {
-		goto __399
-	}
-	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
 		goto __400
 	}
+	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
+		goto __401
+	}
 	szThreshold = int16(0)
-	goto __399
-__400:
+	goto __400
+__401:
 	;
-	goto __398
-__398:
-	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __397
 	goto __399
 __399:
+	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
+	goto __398
+	goto __400
+__400:
 	;
 	if !(szThreshold != 0) {
-		goto __401
+		goto __402
 	}
 	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))
 
-__401:
+__402:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18048,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18114,
 		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 __402
+		goto __403
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __403
-__402:
-	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+	goto __404
 __403:
+	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+__404:
 	;
-	goto __394
-__394:
-	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __393
 	goto __395
 __395:
+	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
+	goto __394
+	goto __396
+__396:
 	;
-	goto __390
-__390:
-	iDb++
-	goto __389
 	goto __391
 __391:
+	iDb++
+	goto __390
+	goto __392
+__392:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -84883,36 +84919,36 @@ __391:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __404
+		goto __405
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__404:
+__405:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+640) == SQLITE_OK) {
-		goto __405
+		goto __406
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))
-__405:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __406
+		goto __407
 	}
 	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 __407
+		goto __408
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__407:
+__408:
 	;
-__406:
+__407:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -84921,10 +84957,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) >= int64(0)) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656))&int64(0x7fffffff)))
-__408:
+__409:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -84933,10 +84969,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __409
+		goto __410
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) & int64(0x7fffffff))
-__409:
+__410:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -84944,10 +84980,10 @@ __409:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __410
+		goto __411
 	}
 
-__410:
+__411:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -84999,14 +85035,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{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},
+	{FzName: ts + 18132, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18137, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18143, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18152, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18161, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18169, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18177},
+	{FzName: ts + 18184},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -85058,7 +85094,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+18124)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18190)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -85066,7 +85102,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18205, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = uint8(',')
 
 	}
@@ -85079,19 +85115,19 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18146, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18212, 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+18152)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18218)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18164)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18230)
 		j++
 	}
-	Xsqlite3_str_append(tls, bp+32, ts+4957, 1)
+	Xsqlite3_str_append(tls, bp+32, ts+4976, 1)
 	Xsqlite3StrAccumFinish(tls, bp+32)
 
 	rc = Xsqlite3_declare_vtab(tls, db, bp+64)
@@ -85107,7 +85143,7 @@ __3:
 			(*PragmaVtab)(unsafe.Pointer(pTab)).FnHidden = U8(j)
 		}
 	} else {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	}
 
 	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
@@ -85255,7 +85291,7 @@ __1:
 		var zText uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 
 		if zText != 0 {
-			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, zText))
+			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, zText))
 			if *(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) == uintptr(0) {
 				return SQLITE_NOMEM
 			}
@@ -85271,13 +85307,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+18179)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18245)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18187, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18253, 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+18191, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18257, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -85286,7 +85322,7 @@ __3:
 	rc = Xsqlite3_prepare_v2(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
 	Xsqlite3_free(tls, zSql)
 	if rc != SQLITE_OK {
-		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
+		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
 		return rc
 	}
 	return pragmaVtabNext(tls, pVtabCursor)
@@ -85354,33 +85390,33 @@ 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+18195, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18261, 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, 137196)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137249)
 	} else {
 		var z uintptr
 		var zObj uintptr
 		if *(*uintptr)(unsafe.Pointer(azObj + 1*8)) != 0 {
 			zObj = *(*uintptr)(unsafe.Pointer(azObj + 1*8))
 		} else {
-			zObj = ts + 5008
+			zObj = ts + 5027
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18223, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18289, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*uint8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18254, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18320, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137256)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18262,
-	ts + 18269,
-	ts + 18281,
+	ts + 18328,
+	ts + 18335,
+	ts + 18347,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -85440,7 +85476,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+14140)
+				corruptSchema(tls, pData, argv, ts+14159)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -85472,13 +85508,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+18292)
+			corruptSchema(tls, pData, argv, ts+18358)
 		} 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+14140)
+				corruptSchema(tls, pData, argv, ts+14159)
 			}
 		}
 	}
@@ -85511,16 +85547,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 + 8876
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8895
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7938
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18305
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7957
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18371
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -85614,7 +85650,7 @@ __10:
 		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11775)
+		ts+11794)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __15:
@@ -85649,7 +85685,7 @@ __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)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18443)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __19:
@@ -85663,7 +85699,7 @@ __20:
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18401,
+		ts+18467,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -85936,7 +85972,7 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
 	(*Parse)(unsafe.Pointer(pParse)).Fdb = db
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1490, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1509, 0)
 	}
 }
 
@@ -85964,7 +86000,7 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, bp+16, ts+1490, 0)
+	Xsqlite3ErrorMsg(tls, bp+16, ts+1509, 0)
 __1:
 	;
 	if !(prepFlags&U32(SQLITE_PREPARE_PERSISTENT) != 0) {
@@ -85995,7 +86031,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18435, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18501, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -86025,7 +86061,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18465, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18531, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -86085,7 +86121,7 @@ __21:
 	if !((*Parse)(unsafe.Pointer(bp+16)).FzErrMsg != 0) {
 		goto __22
 	}
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3663, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3682, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 	Xsqlite3DbFree(tls, db, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
 	goto __23
 __22:
@@ -86121,7 +86157,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, 137995)
+		return Xsqlite3MisuseError(tls, 138048)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -86220,7 +86256,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, 138143)
+		return Xsqlite3MisuseError(tls, 138196)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -86543,8 +86579,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 + 10920
-		var zSp2 uintptr = ts + 10920
+		var zSp1 uintptr = ts + 10939
+		var zSp2 uintptr = ts + 10939
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -86552,13 +86588,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18484, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18550, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18514))
+var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18580))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -86733,7 +86769,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+18548, libc.VaList(bp, 0))
+					ts+18614, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -86778,7 +86814,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+18598, libc.VaList(bp+8, zName))
+						ts+18664, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -86789,7 +86825,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+18662,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18728,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -86833,7 +86869,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6586, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6605, 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.
@@ -87417,16 +87453,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18699
+		z = ts + 18765
 		break
 	case TK_INTERSECT:
-		z = ts + 18709
+		z = ts + 18775
 		break
 	case TK_EXCEPT:
-		z = ts + 18719
+		z = ts + 18785
 		break
 	default:
-		z = ts + 18726
+		z = ts + 18792
 		break
 	}
 	return z
@@ -87436,7 +87472,7 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18732, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18798, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
@@ -87462,11 +87498,11 @@ 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 {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18821, libc.VaList(bp, func() uintptr {
 		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
-			return ts + 18786
+			return ts + 18852
 		}
-		return ts + 1554
+		return ts + 1573
 	}()))
 
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
@@ -87654,8 +87690,8 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 				}
 
 				if iCol < 0 {
-					zType = ts + 1119
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16267
+					zType = ts + 1138
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16286
 				} 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))
@@ -87794,13 +87830,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16267
+				zCol = ts + 16286
 			} 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+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12080, 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))
@@ -87808,7 +87844,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+18801, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18867, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -87898,7 +87934,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16267
+					zName = ts + 16286
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -87908,7 +87944,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18867, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -87924,7 +87960,7 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18810, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18876, 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)
@@ -88007,8 +88043,6 @@ __1:
 		(*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
@@ -88023,12 +88057,15 @@ __1:
 			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
 				(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_BLOB)
 			}
+			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)
+			}
 		}
 		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
+				zType = ts + 18884
 			} else {
 				zType = uintptr(0)
 				for j = 1; j < SQLITE_N_STDTYPE; j++ {
@@ -88244,7 +88281,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18822, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18888, 0)
 	return
 __1:
 	;
@@ -88335,7 +88372,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18871, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18937, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -88355,7 +88392,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18913, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18979, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -88392,7 +88429,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18919, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18985, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -88426,11 +88463,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+18934, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19000, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
-			return ts + 1554
+			return ts + 1573
 		}
-		return ts + 18957
+		return ts + 19023
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -88531,8 +88568,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18959, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18974, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19025, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19040, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -88579,7 +88616,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18699, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18765, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -88646,7 +88683,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+18993, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19059, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -88708,7 +88745,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+18993, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19059, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -88861,10 +88898,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+19014, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19080, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19060,
+			ts+19126,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -89118,8 +89155,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+7234)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7234)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7242)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7242)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -89146,13 +89183,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+19142, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19208, 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+19153, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19219, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -89164,7 +89201,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+19158, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19224, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -89352,7 +89389,8 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 				Xsqlite3VectorErrorMsg(tls, (*SubstContext)(unsafe.Pointer(pSubst)).FpParse, pCopy)
 			} else {
 				var db uintptr = (*Parse)(unsafe.Pointer((*SubstContext)(unsafe.Pointer(pSubst)).FpParse)).Fdb
-				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 && int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN {
+				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 &&
+					(int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN || (*Expr)(unsafe.Pointer(pCopy)).FiTable != (*SubstContext)(unsafe.Pointer(pSubst)).FiNewTable) {
 					libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
 					(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_IF_NULL_ROW)
 					(*Expr)(unsafe.Pointer(bp)).FpLeft = pCopy
@@ -89392,7 +89430,7 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 								if pColl != 0 {
 									return (*CollSeq)(unsafe.Pointer(pColl)).FzName
 								}
-								return ts + 1099
+								return ts + 1118
 							}())
 					}
 
@@ -90180,12 +90218,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15164) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15183) == 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+15168) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15187) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -90251,7 +90289,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+19164, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19230, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -90334,7 +90372,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+19182, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19248, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -90463,7 +90501,7 @@ 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+19205, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19271, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
@@ -90486,7 +90524,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+19225, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19291, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -90502,7 +90540,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19268
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19334
 		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 {
@@ -90528,7 +90566,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+19291,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19357,
 					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
@@ -90539,9 +90577,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 + 19329
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19395
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19363
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19429
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -90588,7 +90626,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+19401, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19467, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -90700,7 +90738,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19405,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19471,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -90719,7 +90757,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+19444,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19510,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -90727,7 +90765,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+14733,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14752,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -90828,7 +90866,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6446
+							zSchemaName = ts + 6465
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -90843,7 +90881,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+19475, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19541, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -90908,7 +90946,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+19480,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19546,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -90920,7 +90958,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+12061, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12080, 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)
@@ -90939,9 +90977,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19489, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19555, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19507, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19573, 0)
 					}
 				}
 			}
@@ -90951,7 +90989,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+19527, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19593, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -91089,7 +91127,7 @@ func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect ui
 	(*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)
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSelect)).FpGroupBy)).FnExpr)
 		} 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)
 		}
@@ -91173,13 +91211,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19558, 0)
+					ts+19624, 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+19609, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19675, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -91368,19 +91406,19 @@ 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+19642,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19708,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19654
+						return ts + 19720
 					}
-					return ts + 1554
+					return ts + 1573
 				}(),
 				func() uintptr {
 					if bCover != 0 {
 						return (*Index)(unsafe.Pointer(pIdx)).FzName
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
 	}
 }
@@ -91393,7 +91431,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+7938)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7957)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -91700,7 +91738,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19677,
+		ts+19743,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -91761,7 +91799,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19731,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19797,
 		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:
@@ -91865,7 +91903,7 @@ __27:
 	if !((*SrcItem)(unsafe.Pointer(pItem1)).FcolUsed == uint64(0) && (*SrcItem)(unsafe.Pointer(pItem1)).FzName != uintptr(0)) {
 		goto __30
 	}
-	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1554, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
+	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1573, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
 __30:
 	;
 	pSub1 = (*SrcItem)(unsafe.Pointer(pItem1)).FpSelect
@@ -91903,7 +91941,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+19771, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19837, 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)
@@ -91962,7 +92000,7 @@ __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19786, libc.VaList(bp+40, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19852, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
@@ -92433,9 +92471,9 @@ __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 + 19802
+				return ts + 19868
 			}
-			return ts + 19811
+			return ts + 19877
 		}())
 
 	groupBySort = 1
@@ -92786,7 +92824,7 @@ __65:
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
 		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19802)
+	explainTempTable(tls, pParse, ts+19868)
 __146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
@@ -92869,7 +92907,7 @@ __7:
 	if !(i < nCol) {
 		goto __9
 	}
-	z = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
+	z = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
 	if !(z == uintptr(0)) {
 		goto __10
 	}
@@ -92891,7 +92929,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19820, 0)
+		ts+19886, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -92987,7 +93025,7 @@ func Xsqlite3_get_table(tls *libc.TLS, db uintptr, zSql uintptr, pazResult uintp
 		if (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
 			if pzErrMsg != 0 {
 				Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(pzErrMsg)))
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
 			}
 			Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg)
 		}
@@ -93124,7 +93162,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+19885, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19951, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -93168,7 +93206,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19931, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19997, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -93186,7 +93224,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19939, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20005, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -93198,7 +93236,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19931, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19997, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -93213,11 +93251,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19980, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20046, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
+
 __17:
 	;
 	goto trigger_cleanup
@@ -93225,22 +93264,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20006, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20072, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20044,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20110,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20081
+				return ts + 20147
 			}
-			return ts + 20088
+			return ts + 20154
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -93249,7 +93288,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20094, libc.VaList(bp+24, pTableName+8))
+		ts+20160, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -93278,9 +93317,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -93398,7 +93437,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19931, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19997, 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
@@ -93431,7 +93470,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20140,
+		ts+20206,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -93456,13 +93495,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20188,
+		ts+20254,
 		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+20263, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20329, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -93718,7 +93757,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20292, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20358, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -93757,9 +93796,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 + 6389
+				return ts + 6408
 			}
-			return ts + 5883
+			return ts + 5902
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -93771,7 +93810,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20312,
+			ts+20378,
 			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)
@@ -93885,12 +93924,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20374,
+		ts+20440,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20422
+				return ts + 20488
 			}
-			return ts + 20429
+			return ts + 20495
 		}()))
 __15:
 	;
@@ -94004,7 +94043,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+20436, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20502, 0)
 	return 1
 }
 
@@ -94070,7 +94109,7 @@ func codeReturningTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab
 	}
 	Xsqlite3ExprListDelete(tls, db, (*Select)(unsafe.Pointer(bp)).FpEList)
 	pNew = sqlite3ExpandReturning(tls, pParse, (*Returning)(unsafe.Pointer(pReturning)).FpReturnEL, pTab)
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0) {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
 		libc.Xmemset(tls, bp+240, 0, uint64(unsafe.Sizeof(NameContext{})))
 		if (*Returning)(unsafe.Pointer(pReturning)).FnRetCol == 0 {
 			(*Returning)(unsafe.Pointer(pReturning)).FnRetCol = (*ExprList)(unsafe.Pointer(pNew)).FnExpr
@@ -94124,7 +94163,7 @@ func codeTriggerProgram(tls *libc.TLS, pParse uintptr, pStepList uintptr, orconf
 
 		if (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan != 0 {
 			Xsqlite3VdbeAddOp4(tls, v, OP_Trace, 0x7fffffff, 1, 0,
-				Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
+				Xsqlite3MPrintf(tls, db, ts+6099, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
 				-6)
 		}
 
@@ -94234,7 +94273,7 @@ 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+20478, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20544, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
@@ -94827,7 +94866,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20492,
+		ts+20558,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -94859,7 +94898,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20528, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20594, 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:
@@ -94869,7 +94908,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7713
+				return ts + 7732
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -95185,7 +95224,12 @@ __74:
 	goto __77
 __76:
 	flags = WHERE_ONEPASS_DESIRED
-	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) && !(pTrigger != 0) && !(hasFK != 0) && !(chngKey != 0) && !(*(*int32)(unsafe.Pointer(bp + 104)) != 0)) {
+	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) &&
+		!(pTrigger != 0) &&
+		!(hasFK != 0) &&
+		!(chngKey != 0) &&
+		!(*(*int32)(unsafe.Pointer(bp + 104)) != 0) &&
+		(*NameContext)(unsafe.Pointer(bp+40)).FncFlags&NC_Subquery == 0) {
 		goto __78
 	}
 	flags = flags | WHERE_ONEPASS_MULTIROW
@@ -95739,7 +95783,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20547)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20613)
 __169:
 	;
 update_cleanup:
@@ -96045,10 +96089,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+20560, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]uint8{})), bp+216, ts+20626, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20564, libc.VaList(bp+8, bp+216))
+				ts+20630, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -96139,7 +96183,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+12150, -1)
+				ts+12169, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -96171,7 +96215,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+20637, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20641, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20703, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20707, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -96319,14 +96363,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+20645)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20711)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20685)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20751)
 	return SQLITE_ERROR
 __2:
 	;
@@ -96337,7 +96381,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20728)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20794)
 	return SQLITE_ERROR
 __5:
 	;
@@ -96346,7 +96390,7 @@ __5:
 	*(*uint32)(unsafe.Pointer(db + 76)) |= uint32(SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE)
 	goto __4
 __3:
-	zOut = ts + 1554
+	zOut = ts + 1573
 __4:
 	;
 	saved_flags = (*Sqlite3)(unsafe.Pointer(db)).Fflags
@@ -96365,7 +96409,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20746, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20812, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -96385,7 +96429,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20769)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20835)
 	goto end_of_vacuum
 __8:
 	;
@@ -96400,7 +96444,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14503)
+	rc = execSql(tls, db, pzErrMsg, ts+14522)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -96445,7 +96489,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20796,
+		ts+20862,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -96454,7 +96498,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20904,
+		ts+20970,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -96465,7 +96509,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20958,
+		ts+21024,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -96476,7 +96520,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21109,
+		ts+21175,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -96821,7 +96865,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+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12396, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -96905,11 +96949,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+21239, libc.VaList(bp, pParse+272))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21305, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21263,
+			ts+21329,
 			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,
@@ -96919,7 +96963,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21428, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -96980,7 +97024,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+21381, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21447, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -97008,9 +97052,11 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FbDeclared = 0
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = bp + 32
+	(*Table)(unsafe.Pointer(pTab)).FnTabRef++
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{xConstruct})).f(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, pVTable+16, bp+64)
+	Xsqlite3DeleteTable(tls, db, pTab)
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = (*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -97018,9 +97064,9 @@ 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+21423, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21489, libc.VaList(bp+8, zModuleName))
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3682, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 		}
 		Xsqlite3DbFree(tls, db, pVTable)
@@ -97030,7 +97076,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 + 21453
+			var zFormat uintptr = ts + 21519
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -97042,12 +97088,12 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 			*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) = pVTable
 
 			for iCol = 0; iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol); iCol++ {
-				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1554)
+				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1573)
 				var nType int32
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16158, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16177, 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
@@ -97104,13 +97150,13 @@ 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+21499, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21565, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxConnect, bp+16)
 		if rc != SQLITE_OK {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 		}
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 16)))
@@ -97162,7 +97208,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+21499, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21565, 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)
@@ -97196,7 +97242,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, 151030)
+		return Xsqlite3MisuseError(tls, 151102)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -97238,7 +97284,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR,
 			func() uintptr {
 				if (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
-					return ts + 3663
+					return ts + 3682
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg))
@@ -97606,7 +97652,7 @@ func Xsqlite3VtabEponymousTableInit(tls *libc.TLS, pParse uintptr, pMod uintptr)
 	addModuleArgument(tls, pParse, pTab, Xsqlite3DbStrDup(tls, db, (*Table)(unsafe.Pointer(pTab)).FzName))
 	rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer(pModule)).FxConnect, bp+8)
 	if rc != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+		Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		Xsqlite3VtabEponymousTableClear(tls, db, pMod)
 	}
@@ -97649,7 +97695,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, 151521)
+		rc = Xsqlite3MisuseError(tls, 151593)
 	} else {
 		ap = va
 		switch op {
@@ -97676,7 +97722,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 151539)
+				rc = Xsqlite3MisuseError(tls, 151611)
 				break
 
 			}
@@ -97907,10 +97953,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 + 21518
+		return ts + 21584
 	}
 	if i == -1 {
-		return ts + 16267
+		return ts + 16286
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -97919,35 +97965,35 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21525, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21591, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21597, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12786, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 	}
 
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21597, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12786, 1)
 		}
-		Xsqlite3_str_append(tls, pStr, ts+5008, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5027, 1)
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 	}
 }
 
@@ -97964,29 +98010,29 @@ 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+21533, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21599, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21525, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21591, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21536
+				return ts + 21602
 			}
-			return ts + 21541
+			return ts + 21607
 		}(), 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+21549)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21615)
 		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+21551)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21617)
 	}
-	Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+	Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 }
 
 // This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
@@ -98027,11 +98073,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+21553, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21619, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21559
+				return ts + 21625
 			}
-			return ts + 21566
+			return ts + 21632
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -98041,43 +98087,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 + 10976
+					zFmt = ts + 10995
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21571
+				zFmt = ts + 21637
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21604
+				zFmt = ts + 21670
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21629
+				zFmt = ts + 21695
 			} else {
-				zFmt = ts + 21647
+				zFmt = ts + 21713
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21656, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21722, 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 + 16267
-			Xsqlite3_str_appendf(tls, bp+64, ts+21664, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16286
+			Xsqlite3_str_appendf(tls, bp+64, ts+21730, 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+21695, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21761, 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+21705, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21771, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21710,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21776,
 				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+21737, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21803, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -98109,25 +98155,25 @@ 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+21748, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21814, 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+21536, 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+21602, 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+21769, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21835, 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+21525, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21591, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21602, libc.VaList(bp+16, z))
 		}
 	}
-	Xsqlite3_str_append(tls, bp+24, ts+4957, 1)
+	Xsqlite3_str_append(tls, bp+24, ts+4976, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
@@ -99721,7 +99767,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21777, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21843, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -99749,7 +99795,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21792, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21858, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -100267,7 +100313,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+21801, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21867, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -100625,10 +100671,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{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)},
+	{FzOp: ts + 16135, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15466, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14986, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21881, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -101118,12 +101164,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21888, 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+21822, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21888, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -101202,7 +101248,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 + 6769
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7718
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -101296,7 +101342,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 21863
+				return ts + 21929
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -101672,7 +101718,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21870,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21936,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -101688,7 +101734,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 		pRhs = Xsqlite3PExpr(tls, pParse, TK_UPLUS,
 			Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*ExprList_item)(unsafe.Pointer(pArgs+8+uintptr(j)*32)).FpExpr, 0), uintptr(0))
 		pTerm = Xsqlite3PExpr(tls, pParse, TK_EQ, pColRef, pRhs)
-		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ|JT_RIGHT) != 0 {
 			joinType = U32(EP_OuterON)
 		} else {
 			joinType = U32(EP_InnerON)
@@ -102406,7 +102452,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21906, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21972, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -102477,7 +102523,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21932
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21998
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -102651,6 +102697,10 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	var iCur int32
+	var saved_pIdxEpr uintptr
+
+	saved_pIdxEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 
 	addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	for __ccgo := true; __ccgo; __ccgo = iLevel < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel) {
@@ -102694,9 +102744,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, n)
 			var jj int32
 			for jj = 0; jj < n; jj++ {
-				var iCol int32 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(jj)*2)))
-
-				Xsqlite3ExprCodeGetColumnOfTable(tls, v, (*Index)(unsafe.Pointer(pIdx)).FpTable, iCur, iCol, r1+jj)
+				Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pIdx, iCur, jj, r1+jj)
 			}
 			Xsqlite3VdbeAddOp4Int(tls, v, OP_FilterAdd, (*WhereLevel)(unsafe.Pointer(pLevel)).FregFilter, 0, r1, n)
 			Xsqlite3ReleaseTempRange(tls, pParse, r1, n)
@@ -102730,6 +102778,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 		}
 	}
 	Xsqlite3VdbeJumpHere(tls, v, addrOnce)
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = saved_pIdxEpr
 }
 
 func allocateIndexInfo(tls *libc.TLS, pWInfo uintptr, pWC uintptr, mUnusable Bitmask, pSrc uintptr, pmNoOmit uintptr) uintptr {
@@ -102843,7 +102892,7 @@ __3:
 		uint64(unsafe.Sizeof(sqlite3_index_orderby{}))*uint64(nOrderBy)+uint64(unsafe.Sizeof(HiddenIndexInfo1{}))+
 		uint64(unsafe.Sizeof(uintptr(0)))*uint64(nTerm))
 	if pIdxInfo == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1490, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1509, 0)
 		return uintptr(0)
 	}
 	pHidden = pIdxInfo + 1*96
@@ -102965,9 +103014,9 @@ func vtabBestIndex(tls *libc.TLS, pParse uintptr, pTab uintptr, p uintptr) int32
 		if rc == SQLITE_NOMEM {
 			Xsqlite3OomFault(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb)
 		} else if !(int32((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
 		}
 	}
 	Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg)
@@ -102988,11 +103037,16 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 
 	_ = pParse
 
+	if !((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol)
+	} else {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnColumn)
+	}
 	nField = func() int32 {
-		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < (*Index)(unsafe.Pointer(pIdx)).FnSample {
+		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < nField {
 			return int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField)
 		}
-		return (*Index)(unsafe.Pointer(pIdx)).FnSample
+		return nField
 	}()
 	iCol = 0
 	iSample = (*Index)(unsafe.Pointer(pIdx)).FnSample * nField
@@ -104573,7 +104627,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+21943, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+22009, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -104631,7 +104685,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+21943, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+22009, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -105029,7 +105083,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+21969, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+22035, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -105636,7 +105690,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22004, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22070, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -105671,6 +105725,10 @@ __3:
 			if int32((*WherePath)(unsafe.Pointer(pFrom)).FisOrdered) == (*ExprList)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpOrderBy)).FnExpr {
 				(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_ORDERED)
 			}
+			if (*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy != 0 &&
+				int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) > (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr {
+				(*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat = I8((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr)
+			}
 		} else {
 			(*WhereInfo)(unsafe.Pointer(pWInfo)).FrevMask = (*WherePath)(unsafe.Pointer(pFrom)).FrevLoop
 			if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) <= 0 {
@@ -105965,6 +106023,9 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
+		if Xsqlite3IndexAffinityStr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pIdx) != 0 {
+			(*IndexedExpr)(unsafe.Pointer(p)).Faff = *(*uint8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FzColAff + uintptr(i)))
+		}
 		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
@@ -106117,7 +106178,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22022, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22088, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -106181,7 +106242,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22050, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22116, 0)
 	goto __5
 __4:
 	ii = 0
@@ -107063,7 +107124,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22068, -1)
+		pCtx, ts+22134, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -107196,7 +107257,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+22124, -1)
+					pCtx, ts+22190, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -107286,17 +107347,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-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))
+var row_numberName = *(*[11]uint8)(unsafe.Pointer(ts + 22235))
+var dense_rankName = *(*[11]uint8)(unsafe.Pointer(ts + 22246))
+var rankName = *(*[5]uint8)(unsafe.Pointer(ts + 22257))
+var percent_rankName = *(*[13]uint8)(unsafe.Pointer(ts + 22262))
+var cume_distName = *(*[10]uint8)(unsafe.Pointer(ts + 22275))
+var ntileName = *(*[6]uint8)(unsafe.Pointer(ts + 22285))
+var last_valueName = *(*[11]uint8)(unsafe.Pointer(ts + 22291))
+var nth_valueName = *(*[10]uint8)(unsafe.Pointer(ts + 22302))
+var first_valueName = *(*[12]uint8)(unsafe.Pointer(ts + 22312))
+var leadName = *(*[5]uint8)(unsafe.Pointer(ts + 22324))
+var lagName = *(*[4]uint8)(unsafe.Pointer(ts + 22329))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -107342,7 +107403,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22267, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22333, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -107386,12 +107447,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+22286, 0)
+			ts+22352, 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+22357, 0)
+				ts+22423, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -107414,7 +107475,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+7938)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7957)
 					}
 					break
 				}
@@ -107620,7 +107681,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+22420, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22486, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -107736,7 +107797,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+7530))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -107851,7 +107912,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22446, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22512, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -107916,15 +107977,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 + 22478
+				zErr = ts + 22544
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22495
+				zErr = ts + 22561
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22511
+				zErr = ts + 22577
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22531, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22597, 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 {
@@ -107945,7 +108006,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+22564, 0)
+				ts+22630, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -108083,7 +108144,7 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regZero)
 	if eCond >= WINDOW_STARTING_NUM {
 		var regString int32 = Xsqlite3GetTempReg(tls, pParse)
-		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1554, -1)
+		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1573, -1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, Xsqlite3VdbeCurrentAddr(tls, v)+2, reg)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL))
 
@@ -108101,11 +108162,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22611,
-	ts + 22664,
-	ts + 22068,
-	ts + 22715,
-	ts + 22767,
+	ts + 22677,
+	ts + 22730,
+	ts + 22134,
+	ts + 22781,
+	ts + 22833,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -108596,7 +108657,7 @@ func windowCodeRangeTest(tls *libc.TLS, p uintptr, op int32, csr1 int32, regVal
 
 	}
 
-	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1554, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1573, -1)
 	addrGe = Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, 0, reg1)
 
 	if op == OP_Ge && arith == OP_Add || op == OP_Le && arith == OP_Subtract {
@@ -109500,19 +109561,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+22817,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22883,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 22859
+							return ts + 22925
 						}
-						return ts + 22868
+						return ts + 22934
 					}(),
 						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+22874, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22940, 0)
 		}
 	}
 
@@ -109580,7 +109641,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+22908,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22974,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -110677,7 +110738,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22946, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23012, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -111652,21 +111713,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+16267, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16286, 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+22968, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23034, 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+16180, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16199, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23034, 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))
@@ -112409,7 +112470,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+22995)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+23061)
 				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 {
@@ -112573,7 +112634,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+23004, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23070, 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))
@@ -112790,9 +112851,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 + 6764
+							return ts + 7713
 						}
-						return ts + 6769
+						return ts + 7718
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -113076,19 +113137,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+23028, 0)
+					ts+23094, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23123, 0)
+					ts+23189, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23207, 0)
+					ts+23273, 0)
 			}
 			break
 		case uint32(273):
@@ -113467,9 +113528,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+23004, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23070, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23292, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23358, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -114237,7 +114298,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+23309, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23375, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -114258,9 +114319,9 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 	}
 	if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg != 0 || (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_OK && (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_DONE {
 		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)))
+			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3682, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23334, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23400, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -114433,7 +114494,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23411, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -114446,11 +114507,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19931, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19997, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23352, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23418, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23357, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23423, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -114463,9 +114524,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23367, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23433, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23371, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23437, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -114540,7 +114601,8 @@ func sqlite3TestExtInit(tls *libc.TLS, db uintptr) int32 {
 	return Xsqlite3FaultSim(tls, 500)
 }
 
-var sqlite3BuiltinExtensions = [4]uintptr{
+var sqlite3BuiltinExtensions = [5]uintptr{
+	0,
 	0,
 	0,
 	0,
@@ -114704,7 +114766,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 174337)
+		return Xsqlite3MisuseError(tls, 174426)
 	}
 
 	ap = va
@@ -115279,7 +115341,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175111)
+		return Xsqlite3MisuseError(tls, 175200)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -115294,7 +115356,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23379, 0)
+			ts+23445, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -115485,23 +115547,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 + 23447
+	var zErr uintptr = ts + 23513
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23461
+			zErr = ts + 23527
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23483
+			zErr = ts + 23549
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23505
+			zErr = ts + 23571
 			break
 
 		}
@@ -115519,35 +115581,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23528,
-	ts + 23541,
+	ts + 23594,
+	ts + 23607,
 	uintptr(0),
-	ts + 23557,
-	ts + 23582,
-	ts + 23596,
-	ts + 23615,
-	ts + 1490,
-	ts + 23640,
-	ts + 23677,
-	ts + 23689,
-	ts + 23704,
-	ts + 23737,
+	ts + 23623,
+	ts + 23648,
+	ts + 23662,
+	ts + 23681,
+	ts + 1509,
+	ts + 23706,
+	ts + 23743,
 	ts + 23755,
-	ts + 23780,
-	ts + 23809,
+	ts + 23770,
+	ts + 23803,
+	ts + 23821,
+	ts + 23846,
+	ts + 23875,
 	uintptr(0),
-	ts + 5838,
-	ts + 5334,
-	ts + 23826,
-	ts + 23844,
-	ts + 23862,
+	ts + 5857,
+	ts + 5353,
+	ts + 23892,
+	ts + 23910,
+	ts + 23928,
 	uintptr(0),
-	ts + 23896,
+	ts + 23962,
 	uintptr(0),
-	ts + 23917,
-	ts + 23943,
-	ts + 23966,
-	ts + 23987,
+	ts + 23983,
+	ts + 24009,
+	ts + 24032,
+	ts + 24053,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -115668,7 +115730,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, 175758)
+		return Xsqlite3MisuseError(tls, 175847)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -115718,7 +115780,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+24003, 0)
+				ts+24069, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -115840,7 +115902,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+24066, libc.VaList(bp, zName))
+		ts+24132, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -115868,7 +115930,7 @@ func Xsqlite3_overload_function(tls *libc.TLS, db uintptr, zName uintptr, nArg i
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, zName))
+	zCopy = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, zName))
 	if zCopy == uintptr(0) {
 		return SQLITE_NOMEM
 	}
@@ -116076,7 +116138,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+24117, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24183, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -116169,7 +116231,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, 176503))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176592))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -116239,7 +116301,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, 176582)
+		return Xsqlite3MisuseError(tls, 176671)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -116249,7 +116311,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, 176591)
+		return Xsqlite3MisuseError(tls, 176680)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -116286,14 +116348,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		}()
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 176639)
+		return Xsqlite3MisuseError(tls, 176728)
 	}
 
 	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+24138, 0)
+				ts+24204, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -116423,7 +116485,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+24206, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24272, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -116468,10 +116530,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24212, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24278, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24222,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24288,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -116576,7 +116638,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24250, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24316, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -116587,17 +116649,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24254, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24320, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24254
+	zModeType = ts + 24320
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24260, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24326, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -116605,7 +116667,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 3272
+	zModeType = ts + 3291
 __32:
 	;
 	if !(aMode != 0) {
@@ -116635,7 +116697,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24265, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24331, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -116643,7 +116705,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24285,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24351,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -116683,7 +116745,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24309, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24375, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -116707,15 +116769,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24325, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24332, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24391, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24398, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{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},
+	{Fz: ts + 24406, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24409, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24412, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17381, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -116861,10 +116923,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+21863, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21929, 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+24350, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24416, 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) {
@@ -116878,7 +116940,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 177308)
+	rc = Xsqlite3MisuseError(tls, 177397)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -116895,7 +116957,7 @@ __19:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -116929,9 +116991,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 + 6441
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6460
 	(*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 + 23352
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23418
 	(*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)
@@ -117036,7 +117098,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24356
+		zFilename = ts + 24422
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, func() uint8 {
@@ -117154,21 +117216,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+24359,
+	Xsqlite3_log(tls, iErr, ts+24425,
 		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+24384)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24450)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24404)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24470)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24411)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24477)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -117279,7 +117341,7 @@ __4:
 	autoinc = libc.Bool32(int32((*Table)(unsafe.Pointer(pTab)).FiPKey) == iCol && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != U32(0))
 	goto __13
 __12:
-	zDataType = ts + 1119
+	zDataType = ts + 1138
 	primarykey = 1
 __13:
 	;
@@ -117326,14 +117388,14 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24428, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24494, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -117982,7 +118044,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24456, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24522, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -118100,7 +118162,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 + 24464
+			return ts + 24530
 		}
 		return uintptr(0)
 	}(), 0)
@@ -118278,7 +118340,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6181, ts + 6764, ts + 6769, ts + 6191, ts + 6186, ts + 8005, ts + 24487, ts + 24493,
+	ts + 6200, ts + 7713, ts + 7718, ts + 6210, ts + 6205, ts + 8024, ts + 24553, ts + 24559,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -118431,7 +118493,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 + 24500 + uintptr(int32(c)&0xf)))
+	c = *(*uint8)(unsafe.Pointer(ts + 24566 + uintptr(int32(c)&0xf)))
 __8:
 	;
 __6:
@@ -118457,7 +118519,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	switch Xsqlite3_value_type(tls, pValue) {
 	case SQLITE_NULL:
 		{
-			jsonAppendRaw(tls, p, ts+6181, uint32(4))
+			jsonAppendRaw(tls, p, ts+6200, uint32(4))
 			break
 
 		}
@@ -118486,7 +118548,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+24517, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24583, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -118544,19 +118606,19 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 	switch int32((*JsonNode)(unsafe.Pointer(pNode)).FeType) {
 	default:
 		{
-			jsonAppendRaw(tls, pOut, ts+6181, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6200, uint32(4))
 			break
 
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6764, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+7713, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6769, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+7718, uint32(5))
 			break
 
 		}
@@ -119101,17 +119163,17 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		}
 		return int32(j + U32(1))
 	} else if int32(c) == 'n' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6181, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6200, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(z + uintptr(i+U32(4))))])&0x06 != 0) {
 		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+6764, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7713, 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+6769, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7718, 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))
@@ -119212,7 +119274,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+24546, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24612, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -119518,7 +119580,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+24561, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24627, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -119533,7 +119595,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24565, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24631, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -119587,7 +119649,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+24591,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24657,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -119692,11 +119754,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+24634, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24700, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
-					jsonAppendRaw(tls, bp, ts+4998, uint32(2))
+					jsonAppendRaw(tls, bp, ts+5017, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24637, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24703, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, uint8(0))
 				}
@@ -119737,7 +119799,7 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if pNode != 0 {
 				jsonRenderNode(tls, pNode, bp, uintptr(0))
 			} else {
-				jsonAppendRaw(tls, bp, ts+6181, uint32(4))
+				jsonAppendRaw(tls, bp, ts+6200, uint32(4))
 			}
 		}
 		if i == argc {
@@ -119853,14 +119915,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24640, -1)
+			ts+24706, -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+24691, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24757, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -119955,7 +120017,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15380)
+	jsonWrongNumArgs(tls, ctx, ts+15399)
 	return
 __2:
 	;
@@ -120030,9 +120092,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24725
+			return ts + 24791
 		}
-		return ts + 24729
+		return ts + 24795
 	}())
 	return
 __2:
@@ -120165,7 +120227,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24736, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24802, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -120262,7 +120324,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24739, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24805, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -120306,7 +120368,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24742)
+		ts+24808)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -120437,7 +120499,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24825, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24891, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -120456,7 +120518,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+24831, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24897, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -120552,7 +120614,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+24831, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24897, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -120576,7 +120638,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 + 24836
+				zRoot = ts + 24902
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -120698,7 +120760,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+24546, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24612, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -120793,25 +120855,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{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 + 24904},
+	{FnArg: int8(-1), 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(2), 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 + 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}}
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24951},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24954},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24958},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24970},
+	{FnArg: int8(2), 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_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24993},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25004},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25016},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 25029},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25038},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25038},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25048},
+	{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 + 25059},
+	{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 + 25076}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -120830,8 +120892,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 25028, FpModule: 0},
-	{FzName: ts + 25038, FpModule: 0},
+	{FzName: ts + 25094, FpModule: 0},
+	{FzName: ts + 25104, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -121091,11 +121153,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+25048, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25114, 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+25056, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25122, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -121306,7 +121368,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+25061,
+		ts+25127,
 		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))
@@ -122004,7 +122066,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25143)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25209)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -122216,7 +122278,7 @@ func rtreeBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 2
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FneedToFreeIdxStr = 1
-	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, bp+8))) {
+	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, bp+8))) {
 		return SQLITE_NOMEM
 	}
 
@@ -123345,7 +123407,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25157, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25223, 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 {
@@ -123357,12 +123419,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+25177, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25243, 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+25209, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25275, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -123588,7 +123650,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+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))
+		ts+25312, 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))
@@ -123611,14 +123673,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25391
+	var zFmt uintptr = ts + 25457
 	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+11348, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11367, 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 {
@@ -123659,7 +123721,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25447, ts + 5060, ts + 16267,
+	ts + 25513, ts + 5079, ts + 16286,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -123702,19 +123764,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+25452,
+			ts+25518,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25514, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25580, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25519,
+			ts+25585,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25583,
+			ts+25649,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25653,
+			ts+25719,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -123743,7 +123805,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 + 25702
+			zFormat = ts + 25768
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -123755,7 +123817,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+25810,
+			ts+25876,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -123763,18 +123825,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+25855, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25921, 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+12767, 1)
+					Xsqlite3_str_append(tls, p, ts+12786, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25882, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25948, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25904, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25970, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25912, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25978, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -123789,14 +123851,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25928,
-	ts + 25981,
-	ts + 26026,
-	ts + 26078,
-	ts + 26132,
-	ts + 26177,
-	ts + 26235,
-	ts + 26290,
+	ts + 25994,
+	ts + 26047,
+	ts + 26092,
+	ts + 26144,
+	ts + 26198,
+	ts + 26243,
+	ts + 26301,
+	ts + 26356,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -123825,7 +123887,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+26337, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26403, 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
@@ -123833,19 +123895,19 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 				(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = 4 + int32((*Rtree)(unsafe.Pointer(pRtree)).FnBytesPerCell)*RTREE_MAXCELLS
 			}
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26357,
+			ts+26423,
 			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 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26414,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26480,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -123887,16 +123949,16 @@ 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 + 26449,
-		ts + 26492,
-		ts + 26527,
-		ts + 26563,
+		ts + 26515,
+		ts + 26558,
+		ts + 26593,
+		ts + 26629,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
 		goto __1
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
 	return SQLITE_ERROR
 __1:
 	;
@@ -123921,7 +123983,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+26600,
+	Xsqlite3_str_appendf(tls, pSql, ts+26666,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -123933,7 +123995,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26624, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26690, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -123956,7 +124018,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26696, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -123967,14 +124029,14 @@ __10:
 	if !(ii < argc) {
 		goto __12
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
 	rc = SQLITE_ERROR
 	goto __13
 __12:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __14
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
 __14:
 	;
 __13:
@@ -124017,7 +124079,7 @@ __17:
 	if !(iErr != 0) {
 		goto __22
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
 	goto rtreeInit_fail
 __22:
 	;
@@ -124034,7 +124096,7 @@ __23:
 	if !(rc != 0) {
 		goto __24
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
 	goto rtreeInit_fail
 __24:
 	;
@@ -124052,7 +124114,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26633, ts + 26644}
+var azFormat = [2]uintptr{ts + 26699, ts + 26710}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -124090,13 +124152,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+10920, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10939, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26654, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26720, 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+26660, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26726, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26664, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26730, 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})))
@@ -124107,7 +124169,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+26666, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26732, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -124185,12 +124247,12 @@ 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+26699,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26765,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
-						return ts + 4062
+						return ts + 4081
 					}
-					return ts + 1554
+					return ts + 1573
 				}(), z))
 			if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport == uintptr(0) {
 				(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
@@ -124209,7 +124271,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+26706,
+			ts+26772,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -124228,7 +124290,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+26751, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26817, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -124242,8 +124304,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 + 26783,
-		ts + 26837,
+		ts + 26849,
+		ts + 26903,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -124258,23 +124320,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+26885,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26951,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26930
+					return ts + 26996
 				}
-				return ts + 26938
+				return ts + 27004
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26947,
+				ts+27013,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26930
+						return ts + 26996
 					}
-					return ts + 26938
+					return ts + 27004
 				}(), iKey, iVal))
 		}
 	}
@@ -124298,7 +124360,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+27005, libc.VaList(bp, i, iCell, iNode))
+				ts+27071, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -124318,7 +124380,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+27053, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27119, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -124335,14 +124397,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+27120, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27186, 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+27154, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27220, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -124350,7 +124412,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+27184,
+					ts+27250,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -124379,14 +124441,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+27239,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27305,
 			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+27270, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27336, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -124408,12 +124470,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+14503, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14522, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27337, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27403, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -124422,12 +124484,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25157, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25223, 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+27365, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27431, 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)
 		}
@@ -124441,8 +124503,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+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27403, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27462, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27469, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -124450,7 +124512,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+27411, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27477, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -124465,7 +124527,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27415, -1)
+			ts+27481, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -124473,7 +124535,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6441
+			zDb = ts + 6460
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -124483,7 +124545,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 + 18012
+				return ts + 18078
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -124854,11 +124916,11 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		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+27466, 1)
+		Xsqlite3_str_append(tls, x, ts+27532, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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+27534, 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+27479, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27545, 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)
 	}
@@ -124878,19 +124940,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+27490, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27556, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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)))))
+			Xsqlite3_str_appendf(tls, x, ts+27574, 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+27516, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27582, 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+27524, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27590, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27528, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27594, 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)
 	}
@@ -125810,7 +125872,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+27541, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27607, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -125819,7 +125881,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27563, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27629, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -125827,7 +125889,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26696, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -125838,7 +125900,7 @@ __5:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __7
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
 __7:
 	;
 __6:
@@ -125863,7 +125925,7 @@ __9:
 	if !(rc != 0) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	goto geopolyInit_fail
 __10:
 	;
@@ -126054,7 +126116,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 + 16267
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16286
 		(*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
@@ -126064,7 +126126,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 + 27567
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27633
 		(*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
@@ -126072,7 +126134,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 + 27573
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27639
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -126184,7 +126246,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27582, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27648, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -126316,14 +126378,14 @@ geopoly_update_end:
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
 	_ = pVtab
 	_ = nArg
-	if Xsqlite3_stricmp(tls, zName, ts+27622) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27688) == 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+27638) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27704) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -126388,7 +126450,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+27653, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27719, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -126400,25 +126462,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{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},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27727},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27740},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27753},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27766},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27704},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27778},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27688},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27801},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27815},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27828},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27842},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27858},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27804},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27870},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -126428,26 +126490,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27823, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27889, 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+27833, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27899, 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+27844, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27910, -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+27567, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27633, 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+27855, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27921, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -126501,7 +126563,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+25143, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25209, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -126828,7 +126890,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+27865, -1)
+		Xsqlite3_result_error(tls, context, ts+27931, -1)
 		return
 	}
 
@@ -126839,7 +126901,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+27865, -1)
+			Xsqlite3_result_error(tls, context, ts+27931, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -126852,7 +126914,7 @@ func prepareAndCollectError(tls *libc.TLS, db uintptr, ppStmt uintptr, pzErrmsg
 
 	var rc int32 = Xsqlite3_prepare_v2(tls, db, zSql, -1, ppStmt, uintptr(0))
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 		*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	}
 	return rc
@@ -126864,7 +126926,7 @@ func resetAndCollectError(tls *libc.TLS, pStmt uintptr, pzErrmsg uintptr) int32
 
 	var rc int32 = Xsqlite3_reset(tls, pStmt)
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
 	}
 	return rc
 }
@@ -126940,7 +127002,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+27886, uintptr(0), uintptr(0), p+64)
+				ts+27952, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -127004,7 +127066,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+25056, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25122, 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++ {
 				}
@@ -127025,16 +127087,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+28057, libc.VaList(bp, func() uintptr {
+			ts+28123, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28207
+					return ts + 28273
 				}
-				return ts + 1554
+				return ts + 1573
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28248)
+			ts+28314)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -127132,7 +127194,7 @@ func rbuFinalize(tls *libc.TLS, p uintptr, pStmt uintptr) {
 	var rc int32 = Xsqlite3_finalize(tls, pStmt)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && rc != SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 	}
 }
 
@@ -127150,7 +127212,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+28373, libc.VaList(bp, zTab)))
+			ts+28439, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -127168,7 +127230,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+28492, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28558, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -127186,7 +127248,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28513, libc.VaList(bp+16, zIdx)))
+			ts+28579, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -127209,7 +127271,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+28564, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28630, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -127255,7 +127317,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+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28651, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -127270,7 +127332,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+28613, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28679, 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 {
@@ -127310,7 +127372,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+19489, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19555, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -127320,18 +127382,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+28642, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28708, 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+28661, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28727, 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+28666, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28732, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -127343,18 +127405,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+28676, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28742, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28705
+							return ts + 28771
 						}
-						return ts + 28718
+						return ts + 28784
 					}()))
 		}
 
 		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+28727, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28793, 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)
@@ -127368,7 +127430,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+28749,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28815,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -127411,12 +127473,12 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	defer tls.Free(24)
 
 	var zList uintptr = uintptr(0)
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	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+28776, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14614
+		zList = rbuMPrintf(tls, p, ts+28842, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14633
 	}
 	return zList
 }
@@ -127427,13 +127489,13 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 
 	var iPk int32 = 1
 	var zRet uintptr = uintptr(0)
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	for 1 != 0 {
 		var i int32
 		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+28785, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28851, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -127455,25 +127517,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+28798, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28864, 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+28830, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28896, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		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)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+28919)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28925, ts+28932, ts+4976)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+1573)
 
 		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+28874,
+					ts+28940,
 					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+28916, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28982, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -127510,12 +127572,12 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	zVector = uintptr(0)
 	zRet = uintptr(0)
 	bFailed = 0
-	zSep = ts + 1554
+	zSep = ts + 1573
 	iCol = 0
 	*(*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+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28679, 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
@@ -127550,7 +127612,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 28936
+	zCol = ts + 29002
 __7:
 	;
 	goto __5
@@ -127558,13 +127620,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28944,
+	zLhs = rbuMPrintf(tls, p, ts+29010,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28965,
+	zOrder = rbuMPrintf(tls, p, ts+29031,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+29001,
+	zSelect = rbuMPrintf(tls, p, ts+29067,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14614
+	zSep = ts + 14633
 	iCol++
 	goto __1
 __2:
@@ -127582,12 +127644,12 @@ __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+29028,
+		Xsqlite3_mprintf(tls, ts+29094,
 			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
 	}
-	zSep = ts + 1554
+	zSep = ts + 1573
 	iCol = 0
 __14:
 	if !(iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnCol) {
@@ -127609,8 +127671,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14614
+	zVector = rbuMPrintf(tls, p, ts+29142, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14633
 	goto __15
 __15:
 	iCol++
@@ -127621,7 +127683,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29083, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29149, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -127648,13 +127710,13 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 	var zImpPK uintptr = uintptr(0)
 	var zWhere uintptr = uintptr(0)
 	var nBind int32 = 0
-	var zCom uintptr = ts + 1554
-	var zAnd uintptr = ts + 1554
+	var zCom uintptr = ts + 1573
+	var zAnd uintptr = ts + 1573
 	*(*uintptr)(unsafe.Pointer(bp + 200)) = uintptr(0)
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -127666,9 +127728,9 @@ 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+29095, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29161, 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
+			zType = ts + 1573
 		} else {
 			if iCid < 0 {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK {
@@ -127678,37 +127740,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 + 28936
+					zCol = ts + 29002
 				} else {
-					zCol = ts + 28666
+					zCol = ts + 28732
 				}
-				zType = ts + 1119
+				zType = ts + 1138
 			} 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+29117, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29183, 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 + 28853
+					return ts + 28919
 				}
-				return ts + 1554
+				return ts + 1573
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29137,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29203,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29158,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29224,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29191, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29257, 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 + 14614
-		zAnd = ts + 21525
+		zCom = ts + 14633
+		zAnd = ts + 21591
 		nBind++
 	}
 
@@ -127742,16 +127804,16 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 
 	var zList uintptr = uintptr(0)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
-		var zS uintptr = ts + 1554
+		var zS uintptr = ts + 1573
 		var i int32
 		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+29215, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29281, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29227, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29293, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14614
+			zS = ts + 14633
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -127759,7 +127821,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+29236, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29302, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -127771,27 +127833,27 @@ 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+29251, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29317, 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 zSep uintptr = ts + 1573
 		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+29265, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21525
+				zList = rbuMPrintf(tls, p, ts+29331, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21591
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29277, libc.VaList(bp+40, zList))
+			ts+29343, libc.VaList(bp+40, zList))
 
 	} else {
-		var zSep uintptr = ts + 1554
+		var zSep uintptr = ts + 1573
 		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 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29327, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21525
+				zList = rbuMPrintf(tls, p, ts+29393, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21591
 			}
 		}
 	}
@@ -127800,7 +127862,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+29340, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29406, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -127814,21 +127876,21 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 		if int32(libc.Xstrlen(tls, zMask)) != (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 			rbuBadControlError(tls, p)
 		} else {
-			var zSep uintptr = ts + 1554
+			var zSep uintptr = ts + 1573
 			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+29327,
+					zList = rbuMPrintf(tls, p, ts+29393,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14614
+					zSep = ts + 14633
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29366,
+					zList = rbuMPrintf(tls, p, ts+29432,
 						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 + 14614
+					zSep = ts + 14633
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29396,
+					zList = rbuMPrintf(tls, p, ts+29462,
 						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 + 14614
+					zSep = ts + 14633
 				}
 			}
 		}
@@ -127863,19 +127925,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 + 29433
+		var zSep uintptr = ts + 29499
 		*(*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+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28651, 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+16155) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16174) == 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+28613, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -127887,15 +127949,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 + 28853
+					zDesc = ts + 28919
 				} else {
-					zDesc = ts + 1554
+					zDesc = ts + 1573
 				}
-				z = rbuMPrintf(tls, p, ts+29446, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14614
+				z = rbuMPrintf(tls, p, ts+29512, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14633
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29457, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29523, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -127910,12 +127972,12 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		*(*uintptr)(unsafe.Pointer(bp + 168)) = uintptr(0)
 		var zIdx uintptr = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
-		var zComma uintptr = ts + 1554
+		var zComma uintptr = ts + 1573
 		var zCols uintptr = uintptr(0)
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29461)
+			ts+29527)
 		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))) {
@@ -127924,7 +127986,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+28613, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -127934,25 +127996,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+29511, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29577, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29533, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29599, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28853
+						return ts + 28919
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
-				zComma = ts + 14614
+				zComma = ts + 14633
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29543, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29609, 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+6441, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29558,
+			ts+29624,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 0))
 	}
 }
 
@@ -127962,50 +128024,50 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
 		var tnum int32 = (*RbuObjIter)(unsafe.Pointer(pIter)).FiTnum
-		var zComma uintptr = ts + 1554
+		var zComma uintptr = ts + 1573
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
-			var zPk uintptr = ts + 1554
+			var zPk uintptr = ts + 1573
 			var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCol)*8))
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, (*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 + 29620
+				zPk = ts + 29686
 			}
-			zSql = rbuMPrintf(tls, p, ts+29633,
+			zSql = rbuMPrintf(tls, p, ts+29699,
 				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 + 29660
+							return ts + 29726
 						}
-						return ts + 1554
+						return ts + 1573
 					}()))
-			zComma = ts + 14614
+			zComma = ts + 14633
 		}
 
 		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+29670, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29736, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		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,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29743,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29709
+						return ts + 29775
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 0))
 	}
 }
 
@@ -128018,7 +128080,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+29724,
+				ts+29790,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -128055,7 +128117,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+29781)
+			ts+29847)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -128160,7 +128222,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+29847, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29913, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -128180,24 +128242,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+6441, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29867,
+				ts+29933,
 				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+6441, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 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+29932, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29998, 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+29968, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+30034, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -128213,7 +128275,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30002,
+						ts+30068,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -128221,31 +128283,31 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 30063
+											return ts + 30129
 										}
-										return ts + 30067
+										return ts + 30133
 									}()
 								}
-								return ts + 1554
+								return ts + 1573
 							}(), zStart,
 							zCollist, zLimit))
 					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+30073,
+						ts+30139,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30134,
+						ts+30200,
 						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 + 30063
+									return ts + 30129
 								}
-								return ts + 30067
+								return ts + 30133
 							}(),
 							zCollist, zLimit))
 				}
@@ -128270,8 +128332,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+6452)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6448)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6471)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6467)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -128280,52 +128342,52 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			rbuCreateImposterTable2(tls, p, pIter)
 			zWrite = func() uintptr {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
-					return ts + 1554
+					return ts + 1573
 				}
-				return ts + 30293
+				return ts + 30359
 			}()
 
 			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+30302,
+						ts+30368,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30338
+								return ts + 30404
 							}
-							return ts + 1554
+							return ts + 1573
 						}(), zBindings)))
 			}
 
 			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+30348, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30414, 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
+				var zRbuRowid uintptr = ts + 1573
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30376
+					zRbuRowid = ts + 30442
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30388, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30454, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30464
+							return ts + 30530
 						}
-						return ts + 1554
+						return ts + 1573
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30481,
+					ts+30547,
 					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+30780,
+						ts+30846,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -128333,14 +128395,14 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-				var zRbuRowid uintptr = ts + 1554
+				var zRbuRowid uintptr = ts + 1573
 				var zStart uintptr = uintptr(0)
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30879
+						zRbuRowid = ts + 30945
 					} else {
-						zRbuRowid = ts + 30889
+						zRbuRowid = ts + 30955
 					}
 				}
 
@@ -128353,35 +128415,35 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28936, 0)
+						zOrder = rbuMPrintf(tls, p, ts+29002, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+1573)
 					}
 				}
 
 				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+30900,
+							ts+30966,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30948
+										return ts + 31014
 									}
-									return ts + 1554
+									return ts + 1573
 								}(),
 								zRbuRowid,
 								(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 									if zStart != 0 {
 										return zStart
 									}
-									return ts + 1554
+									return ts + 1573
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 22859
+										return ts + 22925
 									}
-									return ts + 1554
+									return ts + 1573
 								}(), zOrder,
 								zLimit)))
 				}
@@ -128444,12 +128506,12 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 		(*RbuObjIter)(unsafe.Pointer(pIter)).FpRbuUpdate = pUp
 
 		if zSet != 0 {
-			var zPrefix uintptr = ts + 1554
+			var zPrefix uintptr = ts + 1573
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30293
+				zPrefix = ts + 30359
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30954,
+			zUpdate = Xsqlite3_mprintf(tls, ts+31020,
 				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)
@@ -128476,7 +128538,7 @@ func rbuOpenDbhandle(tls *libc.TLS, p uintptr, zName uintptr, bUseVfs int32) uin
 			return uintptr(0)
 		}())
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
 			Xsqlite3_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 			*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 		}
@@ -128508,7 +128570,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+30984, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+31050, 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:
@@ -128578,28 +128640,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+6441, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460, 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+6441)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31014, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31080, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		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))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31108, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.Xmemcpy(tls, p+48, ts+3305, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+6441, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+6460, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31060, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31126, 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+6441, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -128632,11 +128694,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+31126, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31192, 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+24206, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24272, (*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)))) == '?' {
@@ -128648,16 +128710,16 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31158,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441),
+			zTarget = Xsqlite3_mprintf(tls, ts+31224,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460),
 					func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1554
+							return ts + 1573
 						}
-						return ts + 31190
+						return ts + 31256
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1554
+							return ts + 1573
 						}
 						return zExtra
 					}()))
@@ -128673,37 +128735,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+31192, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31258, -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+31207, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31273, 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+31224, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31290, -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+6441, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31306, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 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+31268, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31334, 0)
 	}
 }
 
@@ -128732,14 +128794,14 @@ 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+31240, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31306, 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+31286, uintptr(0), uintptr(0), uintptr(0))
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31352, uintptr(0), uintptr(0), uintptr(0))
 		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
@@ -128848,7 +128910,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+6441, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6460, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -128865,23 +128927,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+31321, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31387, 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+6441)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460)
 	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+6441)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31353, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31412, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31419, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -128998,7 +129060,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+23844, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23910, 0)
 			return
 		}
 
@@ -129091,7 +129153,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+31360)
+			ts+31426)
 		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)
@@ -129099,7 +129161,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+31382, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31448, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -129120,7 +129182,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+31409,
+				ts+31475,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -129150,9 +129212,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+31567, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31633, 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+31582,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31648,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -129166,10 +129228,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+31602, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31668, 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+31627)
+			ts+31693)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -129183,12 +129245,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+31735)
+			ts+31801)
 	}
 
 	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+31800)
+			ts+31866)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -129200,7 +129262,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+31844, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31910, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -129220,15 +129282,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+17240)
-					rbuCopyPragma(tls, p, ts+16351)
+					rbuCopyPragma(tls, p, ts+17259)
+					rbuCopyPragma(tls, p, ts+16370)
 				}
 
 				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+31869, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31935, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -129252,10 +129314,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+14518, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, 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+14518, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -129350,7 +129412,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+31897, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31963, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -129366,10 +129428,10 @@ func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31346, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31412, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 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)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
@@ -129383,7 +129445,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+31922, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]uint8{})), bp+12, ts+31988, 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)
@@ -129417,7 +129479,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+31933, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31999, 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 {
@@ -129447,13 +129509,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+32005, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32071, 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+32019)
+				ts+32085)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -129464,7 +129526,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+32076)
+				ts+32142)
 			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)
@@ -129509,7 +129571,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			libc.Xmemcpy(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, zRbu, nRbu+uint64(1))
 			pCsr += uintptr(nRbu + uint64(1))
 			if zState != 0 {
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3663, libc.VaList(bp, zState))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3682, libc.VaList(bp, zState))
 			}
 
 			rbuOpenDatabase(tls, p, uintptr(0), bp+16)
@@ -129538,7 +129600,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+32150, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32216, 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
@@ -129556,12 +129618,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+32182,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32248,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32214
+							return ts + 32280
 						}
-						return ts + 32221
+						return ts + 32287
 					}()))
 			}
 		}
@@ -129569,7 +129631,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+14503, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14522, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -129580,19 +129642,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+16954)
-						rbuCopyPragma(tls, p, ts+16366)
+						rbuCopyPragma(tls, p, ts+16973)
+						rbuCopyPragma(tls, p, ts+16385)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32228, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32294, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6460, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32244, uintptr(0), uintptr(0), p+64)
+								db, ts+32310, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -129646,7 +129708,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+32268, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32334, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -129673,7 +129735,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+30293, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30359, 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++
@@ -129690,7 +129752,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+14518, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -129703,13 +129765,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+14518, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, 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+32276, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32342, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -129804,7 +129866,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+14518, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -129821,19 +129883,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+14518, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14503
+				zBegin = ts + 14522
 			} else {
-				zBegin = ts + 32228
+				zBegin = ts + 32294
 			}
 			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+32228, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32294, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -130179,7 +130241,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+32303, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32369, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -130204,7 +130266,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+32326, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32392, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -130349,7 +130411,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+6441)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6460)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -130364,7 +130426,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+32337, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32403, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -130609,6 +130671,970 @@ func Xsqlite3rbu_temp_size(tls *libc.TLS, pRbu uintptr) Sqlite3_int64 {
 	return (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FszTemp
 }
 
+var zDbstatSchema = *(*[258]uint8)(unsafe.Pointer(ts + 32414))
+
+// Forward reference to data structured used in this module
+type StatTable1 = struct {
+	Fbase        Sqlite3_vtab
+	Fdb          uintptr
+	FiDb         int32
+	F__ccgo_pad1 [4]byte
+}
+
+// Forward reference to data structured used in this module
+type StatTable = StatTable1
+type StatCursor1 = struct {
+	Fbase        Sqlite3_vtab_cursor
+	FpStmt       uintptr
+	FisEof       U8
+	FisAgg       U8
+	F__ccgo_pad1 [2]byte
+	FiDb         int32
+	FaPage       [32]StatPage
+	FiPage       int32
+	FiPageno     U32
+	FzName       uintptr
+	FzPath       uintptr
+	FzPagetype   uintptr
+	FnPage       int32
+	FnCell       int32
+	FnMxPayload  int32
+	F__ccgo_pad2 [4]byte
+	FnUnused     I64
+	FnPayload    I64
+	FiOffset     I64
+	FszPage      I64
+}
+
+type StatCursor = StatCursor1
+type StatPage1 = struct {
+	FiPgno         U32
+	F__ccgo_pad1   [4]byte
+	FaPg           uintptr
+	FiCell         int32
+	F__ccgo_pad2   [4]byte
+	FzPath         uintptr
+	Fflags         U8
+	F__ccgo_pad3   [3]byte
+	FnCell         int32
+	FnUnused       int32
+	F__ccgo_pad4   [4]byte
+	FaCell         uintptr
+	FiRightChildPg U32
+	FnMxPayload    int32
+}
+
+type StatPage = StatPage1
+type StatCell1 = struct {
+	FnLocal      int32
+	FiChildPg    U32
+	FnOvfl       int32
+	F__ccgo_pad1 [4]byte
+	FaOvfl       uintptr
+	FnLastOvfl   int32
+	FiOvfl       int32
+}
+
+type StatCell = StatCell1
+
+func statConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var pTab uintptr = uintptr(0)
+	var rc int32 = SQLITE_OK
+	var iDb int32
+	_ = pAux
+
+	if argc >= 4 {
+		Xsqlite3TokenInit(tls, bp+8, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
+		iDb = Xsqlite3FindDb(tls, db, bp+8)
+		if iDb < 0 {
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+11890, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
+			return SQLITE_ERROR
+		}
+	} else {
+		iDb = 0
+	}
+	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_DIRECTONLY, 0)
+	rc = Xsqlite3_declare_vtab(tls, db, uintptr(unsafe.Pointer(&zDbstatSchema)))
+	if rc == SQLITE_OK {
+		pTab = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatTable{})))
+		if pTab == uintptr(0) {
+			rc = SQLITE_NOMEM
+		}
+	}
+
+	if rc == SQLITE_OK {
+		libc.Xmemset(tls, pTab, 0, uint64(unsafe.Sizeof(StatTable{})))
+		(*StatTable)(unsafe.Pointer(pTab)).Fdb = db
+		(*StatTable)(unsafe.Pointer(pTab)).FiDb = iDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
+	return rc
+}
+
+func statDisconnect(tls *libc.TLS, pVtab uintptr) int32 {
+	Xsqlite3_free(tls, pVtab)
+	return SQLITE_OK
+}
+
+func statBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
+	var i int32
+	var iSchema int32 = -1
+	var iName int32 = -1
+	var iAgg int32 = -1
+	_ = tab
+
+	for i = 0; i < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; i++ {
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fop) != SQLITE_INDEX_CONSTRAINT_EQ {
+			continue
+		}
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fusable) == 0 {
+			return SQLITE_CONSTRAINT
+		}
+		switch (*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(i)*12)).FiColumn {
+		case 0:
+			{
+				iName = i
+				break
+
+			}
+		case 10:
+			{
+				iSchema = i
+				break
+
+			}
+		case 11:
+			{
+				iAgg = i
+				break
+
+			}
+		}
+	}
+	i = 0
+	if iSchema >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).Fomit = uint8(1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x01
+	}
+	if iName >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iName)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x02
+	}
+	if iAgg >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iAgg)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x04
+	}
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 1.0
+
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy == 1 &&
+		(*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)).FnOrderBy == 2 &&
+		(*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_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).FiColumn == 1 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x08
+	}
+
+	return SQLITE_OK
+}
+
+func statOpen(tls *libc.TLS, pVTab uintptr, ppCursor uintptr) int32 {
+	var pTab uintptr = pVTab
+	var pCsr uintptr
+
+	pCsr = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatCursor{})))
+	if pCsr == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		libc.Xmemset(tls, pCsr, 0, uint64(unsafe.Sizeof(StatCursor{})))
+		(*StatCursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab = pVTab
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppCursor)) = pCsr
+	return SQLITE_OK
+}
+
+func statClearCells(tls *libc.TLS, p uintptr) {
+	var i int32
+	if (*StatPage)(unsafe.Pointer(p)).FaCell != 0 {
+		for i = 0; i < (*StatPage)(unsafe.Pointer(p)).FnCell; i++ {
+			Xsqlite3_free(tls, (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell+uintptr(i)*32)).FaOvfl)
+		}
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FaCell)
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnCell = 0
+	(*StatPage)(unsafe.Pointer(p)).FaCell = uintptr(0)
+}
+
+func statClearPage(tls *libc.TLS, p uintptr) {
+	var aPg uintptr = (*StatPage)(unsafe.Pointer(p)).FaPg
+	statClearCells(tls, p)
+	Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FzPath)
+	libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(StatPage{})))
+	(*StatPage)(unsafe.Pointer(p)).FaPg = aPg
+}
+
+func statResetCsr(tls *libc.TLS, pCsr uintptr) {
+	var i int32
+
+	for i = 0; i < int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{}))); i++ {
+		statClearPage(tls, pCsr+24+uintptr(i)*64)
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(pCsr+24+uintptr(i)*64)).FaPg)
+		(*StatPage)(unsafe.Pointer(pCsr + 24 + uintptr(i)*64)).FaPg = uintptr(0)
+	}
+	Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(0)
+}
+
+func statResetCounts(tls *libc.TLS, pCsr uintptr) {
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnCell = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnUnused = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPayload = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FszPage = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 0
+}
+
+func statClose(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	Xsqlite3_free(tls, pCsr)
+	return SQLITE_OK
+}
+
+func getLocalPayload(tls *libc.TLS, nUsable int32, flags U8, nTotal int32) int32 {
+	var nLocal int32
+	var nMinLocal int32
+	var nMaxLocal int32
+
+	if int32(flags) == 0x0D {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = nUsable - 35
+	} else {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = (nUsable-12)*64/255 - 23
+	}
+
+	nLocal = nMinLocal + (nTotal-nMinLocal)%(nUsable-4)
+	if nLocal > nMaxLocal {
+		nLocal = nMinLocal
+	}
+	return nLocal
+}
+
+func statDecodePage(tls *libc.TLS, pBt uintptr, p uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var nUnused int32
+	var iOff int32
+	var nHdr int32
+	var isLeaf int32
+	var szPage int32
+	var aData uintptr
+	var aHdr uintptr
+	var iNext int32
+
+	var rc int32
+	var iPrev U32
+
+	var j int32
+	var nOvfl int32
+
+	var nLocal int32
+	var pCell uintptr
+	var i int32
+	var nUsable int32
+	aData = (*StatPage)(unsafe.Pointer(p)).FaPg
+	aHdr = aData + uintptr(func() int32 {
+		if (*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1) {
+			return 100
+		}
+		return 0
+	}())
+
+	(*StatPage)(unsafe.Pointer(p)).Fflags = *(*U8)(unsafe.Pointer(aHdr))
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0A || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __1
+	}
+	isLeaf = 1
+	nHdr = 8
+	goto __2
+__1:
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05 || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x02) {
+		goto __3
+	}
+	isLeaf = 0
+	nHdr = 12
+	goto __4
+__3:
+	goto statPageIsCorrupt
+__4:
+	;
+__2:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1)) {
+		goto __5
+	}
+	nHdr = nHdr + 100
+__5:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnCell = int32(*(*U8)(unsafe.Pointer(aHdr + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 3 + 1)))
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = 0
+	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
+
+	nUnused = int32(*(*U8)(unsafe.Pointer(aHdr + 5)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 5 + 1))) - nHdr - 2*(*StatPage)(unsafe.Pointer(p)).FnCell
+	nUnused = nUnused + int32(*(*U8)(unsafe.Pointer(aHdr + 7)))
+	iOff = int32(*(*U8)(unsafe.Pointer(aHdr + 1)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 1 + 1)))
+__6:
+	if !(iOff != 0) {
+		goto __7
+	}
+	if !(iOff >= szPage) {
+		goto __8
+	}
+	goto statPageIsCorrupt
+__8:
+	;
+	nUnused = nUnused + (int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2) + 1))))
+	iNext = int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff) + 1)))
+	if !(iNext < iOff+4 && iNext > 0) {
+		goto __9
+	}
+	goto statPageIsCorrupt
+__9:
+	;
+	iOff = iNext
+	goto __6
+__7:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnUnused = nUnused
+	(*StatPage)(unsafe.Pointer(p)).FiRightChildPg = func() uint32 {
+		if isLeaf != 0 {
+			return uint32(0)
+		}
+		return Xsqlite3Get4byte(tls, aHdr+8)
+	}()
+
+	if !((*StatPage)(unsafe.Pointer(p)).FnCell != 0) {
+		goto __10
+	}
+
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = szPage - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatPage)(unsafe.Pointer(p)).FaCell = Xsqlite3_malloc64(tls, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+	if !((*StatPage)(unsafe.Pointer(p)).FaCell == uintptr(0)) {
+		goto __11
+	}
+	return SQLITE_NOMEM
+__11:
+	;
+	libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+
+	i = 0
+__12:
+	if !(i < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __14
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr(i)*32
+
+	iOff = int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2) + 1)))
+	if !(iOff < nHdr || iOff >= szPage) {
+		goto __15
+	}
+	goto statPageIsCorrupt
+__15:
+	;
+	if !!(isLeaf != 0) {
+		goto __16
+	}
+	(*StatCell)(unsafe.Pointer(pCell)).FiChildPg = Xsqlite3Get4byte(tls, aData+uintptr(iOff))
+	iOff = iOff + 4
+__16:
+	;
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05) {
+		goto __17
+	}
+
+	goto __18
+__17:
+	iOff = iOff + int32(func() uint8 {
+		if int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff)))) < int32(U8(0x80)) {
+			return uint8(func() int32 {
+				*(*U32)(unsafe.Pointer(bp)) = U32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))
+				return 1
+			}())
+		}
+		return Xsqlite3GetVarint32(tls, aData+uintptr(iOff), bp)
+	}())
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __19
+	}
+	iOff = iOff + int32(Xsqlite3GetVarint(tls, aData+uintptr(iOff), bp+8))
+__19:
+	;
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32((*StatPage)(unsafe.Pointer(p)).FnMxPayload)) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = int32(*(*U32)(unsafe.Pointer(bp)))
+__20:
+	;
+	nLocal = getLocalPayload(tls, nUsable, (*StatPage)(unsafe.Pointer(p)).Fflags, int32(*(*U32)(unsafe.Pointer(bp))))
+	if !(nLocal < 0) {
+		goto __21
+	}
+	goto statPageIsCorrupt
+__21:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLocal = nLocal
+
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32(nLocal)) {
+		goto __22
+	}
+	nOvfl = int32((*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) + U32(nUsable) - U32(4) - U32(1)) / U32(nUsable-4))
+	if !(iOff+nLocal+4 > nUsable || *(*U32)(unsafe.Pointer(bp)) > U32(0x7fffffff)) {
+		goto __23
+	}
+	goto statPageIsCorrupt
+__23:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl = int32(*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) - U32((nOvfl-1)*(nUsable-4)))
+	(*StatCell)(unsafe.Pointer(pCell)).FnOvfl = nOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FaOvfl = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(U32(0)))*uint64(nOvfl))
+	if !((*StatCell)(unsafe.Pointer(pCell)).FaOvfl == uintptr(0)) {
+		goto __24
+	}
+	return SQLITE_NOMEM
+__24:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl)) = Xsqlite3Get4byte(tls, aData+uintptr(iOff+nLocal))
+	j = 1
+__25:
+	if !(j < nOvfl) {
+		goto __27
+	}
+	iPrev = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j-1)*4))
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPrev, bp+16, 0)
+	if !(rc != SQLITE_OK) {
+		goto __28
+	}
+
+	return rc
+__28:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j)*4)) = Xsqlite3Get4byte(tls, Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 16))))
+	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
+	goto __26
+__26:
+	j++
+	goto __25
+	goto __27
+__27:
+	;
+__22:
+	;
+__18:
+	;
+	goto __13
+__13:
+	i++
+	goto __12
+	goto __14
+__14:
+	;
+__10:
+	;
+	return SQLITE_OK
+
+statPageIsCorrupt:
+	(*StatPage)(unsafe.Pointer(p)).Fflags = U8(0)
+	statClearCells(tls, p)
+	return SQLITE_OK
+}
+
+func statSizeAndOffset(tls *libc.TLS, pCsr uintptr) {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCsr)).FpVtab
+	var pBt uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatTable)(unsafe.Pointer(pTab)).FiDb)*32)).FpBt
+	var pPager uintptr = Xsqlite3BtreePager(tls, pBt)
+	var fd uintptr
+
+	fd = Xsqlite3PagerFile(tls, pPager)
+	*(*Sqlite3_int64)(unsafe.Pointer(bp)) = Sqlite3_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	if Xsqlite3OsFileControl(tls, fd, 230440, bp) == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = *(*Sqlite3_int64)(unsafe.Pointer(bp))
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += *(*Sqlite3_int64)(unsafe.Pointer(bp + 1*8))
+	} else {
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += I64(Xsqlite3BtreeGetPageSize(tls, pBt))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = (*StatCursor)(unsafe.Pointer(pCsr)).FszPage * I64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno-U32(1))
+	}
+}
+
+func statGetPage(tls *libc.TLS, pBt uintptr, iPg U32, pPg uintptr) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var pgsz int32 = Xsqlite3BtreeGetPageSize(tls, pBt)
+	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
+	var rc int32
+
+	if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+		(*StatPage)(unsafe.Pointer(pPg)).FaPg = Xsqlite3_malloc(tls, pgsz+DBSTAT_PAGE_PADDING_BYTES)
+		if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+			return SQLITE_NOMEM
+		}
+		libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0, uint64(DBSTAT_PAGE_PADDING_BYTES))
+	}
+
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPg, bp, 0)
+	if rc == SQLITE_OK {
+		var a uintptr = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		libc.Xmemcpy(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, a, uint64(pgsz))
+		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+	}
+
+	return rc
+}
+
+func statNext(tls *libc.TLS, pCursor uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
+	var rc int32
+	var nPayload int32
+	var z uintptr
+	var pCsr uintptr
+	var pTab uintptr
+	var pBt uintptr
+	var pPager uintptr
+
+	var iRoot U32
+	var nUsable int32
+	var iOvfl int32
+	var pCell uintptr
+
+	var p uintptr
+	var i int32
+	var p1 uintptr
+	pCsr = pCursor
+	pTab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	pBt = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FpBt
+	pPager = Xsqlite3BtreePager(tls, pBt)
+
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+
+statNextRestart:
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __1
+	}
+
+	statResetCounts(tls, pCsr)
+	rc = Xsqlite3_step(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	if !(rc == SQLITE_ROW) {
+		goto __3
+	}
+	iRoot = U32(Xsqlite3_column_int64(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 1))
+	Xsqlite3PagerPagecount(tls, pPager, bp+48)
+	if !(*(*int32)(unsafe.Pointer(bp + 48)) == 0) {
+		goto __5
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__5:
+	;
+	rc = statGetPage(tls, pBt, iRoot, pCsr+24)
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiPgno = iRoot
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __6
+	}
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32672, 0))
+	if !(z == uintptr(0)) {
+		goto __7
+	}
+	rc = SQLITE_NOMEM
+__7:
+	;
+__6:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 1
+	goto __4
+__3:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__4:
+	;
+	goto __2
+__1:
+	p = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __8
+	}
+	statResetCounts(tls, pCsr)
+__8:
+	;
+__9:
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __10
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32
+__11:
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl) {
+		goto __12
+	}
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = Xsqlite3BtreeGetPageSize(tls, pBt) - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	statSizeAndOffset(tls, pCsr)
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl-1) {
+		goto __13
+	}
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nUsable - 4)
+	goto __14
+__13:
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64((*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64(nUsable - 4 - (*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+__14:
+	;
+	iOvfl = (*StatCell)(unsafe.Pointer(pCell)).FiOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FiOvfl++
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __15
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(iOvfl)*4))
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32674
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls,
+		ts+32683, libc.VaList(bp, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell, iOvfl)))
+	if z == uintptr(0) {
+		return SQLITE_NOMEM
+	}
+	return SQLITE_OK
+__15:
+	;
+	goto __11
+__12:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiRightChildPg != 0) {
+		goto __16
+	}
+	goto __10
+__16:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+	goto __9
+__10:
+	;
+	if !(!(int32((*StatPage)(unsafe.Pointer(p)).FiRightChildPg) != 0) || (*StatPage)(unsafe.Pointer(p)).FiCell > (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __17
+	}
+	statClearPage(tls, p)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage--
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 && (*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __18
+	}
+
+	return SQLITE_OK
+__18:
+	;
+	goto statNextRestart
+__17:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage++
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage >= int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{})))) {
+		goto __19
+	}
+	statResetCsr(tls, pCsr)
+	return Xsqlite3CorruptError(tls, 215455)
+__19:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell == (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatPage)(unsafe.Pointer(p)).FiRightChildPg
+	goto __21
+__20:
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32)).FiChildPg
+__21:
+	;
+	rc = statGetPage(tls, pBt, (*StatPage)(unsafe.Pointer(p+1*64)).FiPgno, p+1*64)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __22
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32695, libc.VaList(bp+24, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell)))
+	if !(z == uintptr(0)) {
+		goto __23
+	}
+	rc = SQLITE_NOMEM
+__23:
+	;
+__22:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+__2:
+	;
+	if !(rc == SQLITE_OK) {
+		goto __24
+	}
+	p1 = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = (*StatPage)(unsafe.Pointer(p1)).FiPgno
+
+	rc = statDecodePage(tls, pBt, p1)
+	if !(rc == SQLITE_OK) {
+		goto __25
+	}
+	statSizeAndOffset(tls, pCsr)
+
+	switch int32((*StatPage)(unsafe.Pointer(p1)).Fflags) {
+	case 0x05:
+		goto __27
+	case 0x02:
+		goto __28
+	case 0x0D:
+		goto __29
+	case 0x0A:
+		goto __30
+	default:
+		goto __31
+	}
+	goto __26
+__27:
+__28:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32703
+	goto __26
+__29:
+__30:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32712
+	goto __26
+__31:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32717
+	goto __26
+__26:
+	;
+	*(*int32)(unsafe.Pointer(pCsr + 2108)) += (*StatPage)(unsafe.Pointer(p1)).FnCell
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64((*StatPage)(unsafe.Pointer(p1)).FnUnused)
+	if !((*StatPage)(unsafe.Pointer(p1)).FnMxPayload > (*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload) {
+		goto __32
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = (*StatPage)(unsafe.Pointer(p1)).FnMxPayload
+__32:
+	;
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __33
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+40, (*StatPage)(unsafe.Pointer(p1)).FzPath)))
+	if !(z == uintptr(0)) {
+		goto __34
+	}
+	rc = SQLITE_NOMEM
+__34:
+	;
+__33:
+	;
+	nPayload = 0
+	i = 0
+__35:
+	if !(i < (*StatPage)(unsafe.Pointer(p1)).FnCell) {
+		goto __37
+	}
+	nPayload = nPayload + (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p1)).FaCell+uintptr(i)*32)).FnLocal
+	goto __36
+__36:
+	i++
+	goto __35
+	goto __37
+__37:
+	;
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nPayload)
+
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0) {
+		goto __38
+	}
+	goto statNextRestart
+__38:
+	;
+__25:
+	;
+__24:
+	;
+	return rc
+}
+
+func statEof(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	return int32((*StatCursor)(unsafe.Pointer(pCsr)).FisEof)
+}
+
+func statFilter(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintptr, argc int32, argv uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pCsr uintptr = pCursor
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	var pSql uintptr
+	var zSql uintptr
+	var iArg int32 = 0
+	var rc int32 = SQLITE_OK
+	var zName uintptr = uintptr(0)
+	_ = argc
+	_ = idxStr
+
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FpStmt = uintptr(0)
+	if idxNum&0x01 != 0 {
+		var zDbase uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = Xsqlite3FindDbName(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zDbase)
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FiDb < 0 {
+			(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = 0
+			(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+			return SQLITE_OK
+		}
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+	if idxNum&0x02 != 0 {
+		zName = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+	}
+	if idxNum&0x04 != 0 {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(libc.Bool32(Xsqlite3_value_double(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8))) != 0.0))
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(0)
+	}
+	pSql = Xsqlite3_str_new(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb)
+	Xsqlite3_str_appendf(tls, pSql,
+		ts+32727,
+		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb+uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FzDbSName))
+	if zName != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32882, libc.VaList(bp+8, zName))
+	}
+	if idxNum&0x08 != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32896, 0)
+	}
+	zSql = Xsqlite3_str_finish(tls, pSql)
+	if zSql == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		rc = Xsqlite3_prepare_v2(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
+		Xsqlite3_free(tls, zSql)
+	}
+
+	if rc == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = -1
+		rc = statNext(tls, pCursor)
+	}
+	return rc
+}
+
+func statColumn(tls *libc.TLS, pCursor uintptr, ctx uintptr, i int32) int32 {
+	var pCsr uintptr = pCursor
+	switch i {
+	case 0:
+		Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzName, -1, libc.UintptrFromInt32(-1))
+		break
+	case 1:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath, -1, libc.UintptrFromInt32(-1))
+		}
+		break
+	case 2:
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnPage))
+		} else {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno))
+		}
+		break
+	case 3:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype, -1, uintptr(0))
+		}
+		break
+	case 4:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnCell))
+		break
+	case 5:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnPayload)
+		break
+	case 6:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnUnused)
+		break
+	case 7:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload))
+		break
+	case 8:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FiOffset)
+		}
+		break
+	case 9:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FszPage)
+		break
+	case 10:
+		{
+			var db uintptr = Xsqlite3_context_db_handle(tls, ctx)
+			var iDb int32 = (*StatCursor)(unsafe.Pointer(pCsr)).FiDb
+			Xsqlite3_result_text(tls, ctx, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, -1, uintptr(0))
+			break
+
+		}
+	default:
+		{
+			Xsqlite3_result_int(tls, ctx, int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg))
+			break
+
+		}
+	}
+	return SQLITE_OK
+}
+
+func statRowid(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32 {
+	var pCsr uintptr = pCursor
+	*(*Sqlite_int64)(unsafe.Pointer(pRowid)) = Sqlite_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	return SQLITE_OK
+}
+
+// Invoke this routine to register the "dbstat" virtual table module
+func Xsqlite3DbstatRegister(tls *libc.TLS, db uintptr) int32 {
+	return Xsqlite3_create_module(tls, db, ts+32911, uintptr(unsafe.Pointer(&dbstat_module)), uintptr(0))
+}
+
+var dbstat_module = Sqlite3_module{
+	FxCreate:     0,
+	FxConnect:    0,
+	FxBestIndex:  0,
+	FxDisconnect: 0,
+	FxDestroy:    0,
+	FxOpen:       0,
+	FxClose:      0,
+	FxFilter:     0,
+	FxNext:       0,
+	FxEof:        0,
+	FxColumn:     0,
+	FxRowid:      0,
+}
+
 type SessionTable1 = struct {
 	FpNext    uintptr
 	FzName    uintptr
@@ -131189,13 +132215,13 @@ 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+11348, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11367, 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+32348, 0)
+				ts+32918, 0)
 		} else if rc == SQLITE_ERROR {
-			zPragma = Xsqlite3_mprintf(tls, ts+1554, 0)
+			zPragma = Xsqlite3_mprintf(tls, ts+1573, 0)
 		} else {
 			*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
 			*(*uintptr)(unsafe.Pointer(pabPK)) = uintptr(0)
@@ -131206,7 +132232,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32469, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+33039, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -131304,7 +132330,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11348, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11367, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -131553,7 +132579,7 @@ __4:
 	goto error_out
 __7:
 	;
-	Xsqlite3ValueSetStr(tls, p, 0, ts+1554, uint8(0), uintptr(0))
+	Xsqlite3ValueSetStr(tls, p, 0, ts+1573, uint8(0), uintptr(0))
 	(*Sqlite3_session)(unsafe.Pointer(pSession)).FpZeroBlob = p
 __6:
 	;
@@ -131881,14 +132907,14 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	var zRet uintptr = uintptr(0)
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32498,
+			zRet = Xsqlite3_mprintf(tls, ts+33068,
 				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 + 21525
+			zSep = ts + 21591
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131903,7 +132929,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	var zRet uintptr = uintptr(0)
 	var bHave int32 = 0
 
@@ -131911,9 +132937,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+32532,
+				ts+33102,
 				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 + 32573
+			zSep = ts + 33143
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131921,7 +132947,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7530, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7538, 0)
 	}
 
 	return zRet
@@ -131932,7 +132958,7 @@ func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintpt
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32578,
+		ts+33148,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -131975,7 +133001,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32656,
+			ts+33226,
 			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
@@ -132102,7 +133128,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32709, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33279, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -132367,7 +133393,7 @@ func sessionAppendInteger(tls *libc.TLS, p uintptr, iVal int32, pRc uintptr) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
-	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]uint8{}))-uint64(1)), bp+8, ts+4975, libc.VaList(bp, iVal))
+	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]uint8{}))-uint64(1)), bp+8, ts+4994, libc.VaList(bp, iVal))
 	sessionAppendStr(tls, p, bp+8, pRc)
 }
 
@@ -132576,29 +133602,29 @@ 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+11348, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11367, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32736, libc.VaList(bp, zDb))
+			ts+33306, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
 	} else {
 		var i int32
-		var zSep uintptr = ts + 1554
+		var zSep uintptr = ts + 1573
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32846, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33416, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
-		sessionAppendStr(tls, bp+8, ts+1567, bp+24)
+		sessionAppendStr(tls, bp+8, ts+1586, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+32861, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33431, 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+32869, bp+24)
+				sessionAppendStr(tls, bp+8, ts+33439, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21525
+				zSep = ts + 21591
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -132707,7 +133733,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+32875, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33445, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -132799,7 +133825,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32895, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33465, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -133062,7 +134088,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, 219078)
+				rc = Xsqlite3CorruptError(tls, 219169)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -133085,7 +134111,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, 219098)
+						rc = Xsqlite3CorruptError(tls, 219189)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -133127,7 +134153,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, 219152)
+			rc = Xsqlite3CorruptError(tls, 219243)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -133188,7 +134214,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, 219240)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219331)
 		}
 	}
 
@@ -133262,13 +134288,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, 219326))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219417))
 	}
 
 	(*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, 219332))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219423))
 	}
 
 	if paRec != 0 {
@@ -133330,7 +134356,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, 219376))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219467))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -133703,7 +134729,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219832)
 	goto finished_invert
 __6:
 	;
@@ -133871,45 +134897,45 @@ 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+11348) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11367) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
 			} else {
-				var zSep uintptr = ts + 1554
+				var zSep uintptr = ts + 1573
 
 				libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(SessionBuffer{})))
 				(*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+32913, bp+16)
+				sessionAppendStr(tls, bp, ts+33483, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+32926, bp+16)
+				sessionAppendStr(tls, bp, ts+33496, 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+32932, bp+16)
+						sessionAppendStr(tls, bp, ts+33502, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 14614
+						zSep = ts + 14633
 					}
 				}
 
-				zSep = ts + 1554
-				sessionAppendStr(tls, bp, ts+32861, bp+16)
+				zSep = ts + 1573
+				sessionAppendStr(tls, bp, ts+33431, 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+32937, bp+16)
+								ts+33507, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+32869, bp+16)
+							sessionAppendStr(tls, bp, ts+33439, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21525
+						zSep = ts + 21591
 					}
 				}
 
@@ -133956,42 +134982,42 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	defer tls.Free(20)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+33012, bp+16)
+	sessionAppendStr(tls, bp, ts+33582, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+32861, bp+16)
+	sessionAppendStr(tls, bp, ts+33431, 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+32932, bp+16)
+			sessionAppendStr(tls, bp, ts+33502, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21525
+			zSep = ts + 21591
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+33030, bp+16)
+		sessionAppendStr(tls, bp, ts+33600, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32573, bp+16)
+		sessionAppendStr(tls, bp, ts+33143, bp+16)
 
-		zSep = ts + 1554
+		zSep = ts + 1573
 		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+32869, bp+16)
+				sessionAppendStr(tls, bp, ts+33439, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 33038
+				zSep = ts + 33608
 			}
 		}
-		sessionAppendStr(tls, bp, ts+4957, bp+16)
+		sessionAppendStr(tls, bp, ts+4976, bp+16)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
@@ -134004,7 +135030,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+6441, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6460, 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 {
@@ -134015,21 +135041,21 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+33043, bp+16)
+	sessionAppendStr(tls, bp, ts+33613, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21531, bp+16)
+	sessionAppendStr(tls, bp, ts+21597, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14614, bp+16)
+			sessionAppendStr(tls, bp, ts+14633, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+33061, bp+16)
+	sessionAppendStr(tls, bp, ts+33631, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33072, bp+16)
+		sessionAppendStr(tls, bp, ts+33642, bp+16)
 	}
-	sessionAppendStr(tls, bp, ts+4957, bp+16)
+	sessionAppendStr(tls, bp, ts+4976, bp+16)
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v2(tls, db, (*SessionBuffer)(unsafe.Pointer(bp)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp)).FnBuf, p+16, uintptr(0))
@@ -134043,14 +135069,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+11348, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11367, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+33076)
+			ts+33646)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33189)
+			ts+33759)
 	}
 	return rc
 }
@@ -134078,7 +135104,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, 220219)
+				rc = Xsqlite3CorruptError(tls, 220310)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -134331,7 +135357,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+33333, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33903, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -134347,7 +135373,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+33354, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33924, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -134420,10 +135446,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+33373, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33943, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33399, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33969, 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))
@@ -134456,7 +135482,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				f func(*libc.TLS, uintptr, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xFilter})).f(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 176))))
 			if schemaMismatch != 0 {
-				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
+				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
 				if *(*uintptr)(unsafe.Pointer(bp + 200)) == uintptr(0) {
 					rc = SQLITE_NOMEM
 					break
@@ -134469,7 +135495,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+6441, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6460, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -134482,19 +135508,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+33429, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33999, 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+33473,
+						ts+34043,
 						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+33544, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+34114, 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+11348) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11367) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -134545,14 +135571,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33604, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34174, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34204, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33658, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34228, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34204, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -135800,7 +136826,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33686, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+34256, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -136088,7 +137114,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33714, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+34284, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -136275,7 +137301,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+33745, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34315, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -136343,7 +137369,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33752
+		var zErr uintptr = ts + 34322
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -136502,7 +137528,7 @@ func fts5ValueToText(tls *libc.TLS, pVal uintptr) uintptr {
 	if zRet != 0 {
 		return zRet
 	}
-	return ts + 1554
+	return ts + 1573
 }
 
 func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, nVal int32, apVal uintptr) {
@@ -136525,7 +137551,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33802
+		var zErr uintptr = ts + 34372
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -136849,13 +137875,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33850, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34420, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33858, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34428, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33868, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34438, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -137266,7 +138292,7 @@ func fts5ConfigSkipLiteral(tls *libc.TLS, pIn uintptr) uintptr {
 	case 'n':
 		fallthrough
 	case 'N':
-		if Xsqlite3_strnicmp(tls, ts+6181, p, 4) == 0 {
+		if Xsqlite3_strnicmp(tls, ts+6200, p, 4) == 0 {
 			p = p + 4
 		} else {
 			p = uintptr(0)
@@ -137406,7 +138432,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+33873, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34443, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -137433,14 +138459,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+33880, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34450, 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+33911, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+34481, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -137451,7 +138477,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33944, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34514, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -137464,7 +138490,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33981, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34551, 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)))
@@ -137473,7 +138499,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+33990, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34560, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*uint8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -137492,7 +138518,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34023, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34593, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -137507,14 +138533,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34057, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34627, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34065, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34635, 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+34097, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34667, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -137522,9 +138548,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34103, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34673, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34117, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34687, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -137532,9 +138558,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34155, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34725, 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+34166, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34736, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zArg))) == '1')
@@ -137542,21 +138568,21 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+5075, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+5094, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 8026, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17345},
-			{FzName: ts + 34201, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8045, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17364},
+			{FzName: ts + 34771, 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+34209, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34779, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34240, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34810, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -137603,15 +138629,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+22191) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16267) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34268, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22257) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16286) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34838, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34298) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34868) {
 			*(*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+34308, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34878, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -137628,13 +138654,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+34339, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34909, 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+34344, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34914, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34351, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34921, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -137672,8 +138698,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+22191) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34359, 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+22257) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34929, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -137705,7 +138731,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+34388, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34958, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -137714,13 +138740,13 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 							if *(*uintptr)(unsafe.Pointer(bp + 48)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 48))
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						func() uintptr {
 							if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 64))
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						pzErr)
 				} else {
@@ -137742,19 +138768,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 + 34057
+			zTail = ts + 34627
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34408
+			zTail = ts + 34978
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34416, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34986, 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+16267, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16286, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -137798,18 +138824,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+34427, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34997, 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 + 1573
 			}
-			return ts + 14614
+			return ts + 14633
 		}()
-		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+35013, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34450,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22191))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35020,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22257))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -137919,7 +138945,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34476) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35046) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -137929,7 +138955,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+34481) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35051) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -137939,7 +138965,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+34490) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35060) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -137952,7 +138978,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+34500) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35070) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -137962,7 +138988,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+34510) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35080) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -137978,7 +139004,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+22191) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22257) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -138001,7 +139027,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34522
+	var zSelect uintptr = ts + 35092
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -138023,7 +139049,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+34554) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35124) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -138037,7 +139063,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+34562,
+				ts+35132,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -138135,7 +139161,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*uint8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34627, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+35197, 0)
 					return FTS5_EOF
 				}
 			}
@@ -138148,20 +139174,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+34647, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+35217, 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+34678, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35248, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34681, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35251, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30063, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30129, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -139939,9 +140965,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+34685, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35255, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33714, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+34284, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -139957,7 +140983,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+34690, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+35260, 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')
@@ -140044,7 +141070,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20528, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20594, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -140125,7 +141151,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+34719, 0)
+			ts+35289, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -140295,12 +141321,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+34772,
+								ts+35342,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34822
+										return ts + 35392
 									}
-									return ts + 34685
+									return ts + 35255
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -141243,7 +142269,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+34829, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35399, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -141322,7 +142348,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+34835,
+			ts+35405,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -141347,7 +142373,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+34886,
+			ts+35456,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -141370,7 +142396,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+34935,
+			ts+35505,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -141609,7 +142635,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+34975, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+35545, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -142808,7 +143834,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+34998,
+			ts+35568,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -144001,7 +145027,7 @@ func fts5WriteFlushBtree(tls *libc.TLS, p uintptr, pWriter uintptr) {
 			if (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn > 0 {
 				return (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fp
 			}
-			return ts + 1554
+			return ts + 1573
 		}()
 
 		Xsqlite3_bind_blob(tls, (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter, 2, z, (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn, uintptr(0))
@@ -144274,7 +145300,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+35082,
+			ts+35652,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -145340,7 +146366,7 @@ func sqlite3Fts5IndexReinit(tls *libc.TLS, p uintptr) int32 {
 	fts5StructureInvalidate(tls, p)
 	fts5IndexDiscardData(tls, p)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Fts5Structure{})))
-	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1554, 0)
+	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1573, 0)
 	fts5StructureWrite(tls, p, bp)
 	return fts5IndexReturn(tls, p)
 }
@@ -145356,13 +146382,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+35139, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35709, 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+25056, ts+35147, 0, pzErr)
+				pConfig, ts+25122, ts+35717, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11488,
-					ts+35182,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11507,
+					ts+35752,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -145615,7 +146641,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+34829, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+35399, 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)))
@@ -145729,7 +146755,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35226,
+		ts+35796,
 		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))) {
@@ -145899,7 +146925,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+35312)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35882)
 			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))
@@ -146170,7 +147196,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+35317, 0)
+			ts+35887, 0)
 		return SQLITE_ERROR
 	}
 
@@ -146201,7 +147227,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 				} else if iCol >= 0 {
 					bSeenMatch = 1
 					*(*uint8)(unsafe.Pointer(idxStr + uintptr(libc.PostIncInt32(&iIdxStr, 1)))) = uint8('M')
-					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4975, libc.VaList(bp, iCol))
+					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4994, libc.VaList(bp, iCol))
 					idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 
 				}
@@ -146216,7 +147242,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 					}
 					return uint8('G')
 				}()
-				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4975, libc.VaList(bp+8, iCol))
+				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4994, libc.VaList(bp+8, iCol))
 				idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 				(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pInfo)).FaConstraintUsage + uintptr(i)*8)).FargvIndex = libc.PreIncInt32(&iCons, 1)
 
@@ -146530,7 +147556,7 @@ func fts5NextMethod(tls *libc.TLS, pCursor uintptr) int32 {
 					rc = Xsqlite3_reset(tls, (*Fts5Cursor)(unsafe.Pointer(pCsr)).FpStmt)
 					if rc != SQLITE_OK {
 						(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-							ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+							ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 					}
 				} else {
 					rc = SQLITE_OK
@@ -146562,7 +147588,7 @@ func fts5PrepareStatement(tls *libc.TLS, ppStmt uintptr, pConfig uintptr, zFmt u
 		rc = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
 			uint32(SQLITE_PREPARE_PERSISTENT), bp+8, uintptr(0))
 		if rc != SQLITE_OK {
-			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 		}
 		Xsqlite3_free(tls, zSql)
 	}
@@ -146594,25 +147620,25 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35356,
+		ts+35926,
 		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 + 14614
+					return ts + 14633
 				}
-				return ts + 1554
+				return ts + 1573
 			}(),
 			func() uintptr {
 				if zRankArgs != 0 {
 					return zRankArgs
 				}
-				return ts + 1554
+				return ts + 1573
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35411
+					return ts + 35981
 				}
-				return ts + 35416
+				return ts + 35986
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -146658,12 +147684,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+35420, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35990, 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) {
+	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5076, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35426, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35996, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -146694,7 +147720,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+35454, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36024, 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,
@@ -146725,7 +147751,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+35464, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36034, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -146757,14 +147783,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+35485, libc.VaList(bp, z))
+				ts+36055, 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 + 33868
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34438
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -146820,7 +147846,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+35317, 0)
+		ts+35887, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -146863,7 +147889,7 @@ __8:
 	if !(zText == uintptr(0)) {
 		goto __14
 	}
-	zText = ts + 1554
+	zText = ts + 1573
 __14:
 	;
 	iCol = 0
@@ -147037,7 +148063,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35518, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+36088, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -147158,7 +148184,7 @@ func fts5SeekCursor(tls *libc.TLS, pCsr uintptr, bErrormsg int32) int32 {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			} else if (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg != 0 {
 				*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-					ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
+					ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
 			}
 		}
 	}
@@ -147182,28 +148208,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+35554, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36124, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35565, 0)
+				ts+36135, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36215, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35653, 0)
+				ts+36223, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16934, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16953, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35709, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36279, 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+35715, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36285, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -147261,7 +148287,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+17479, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17498, 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)))
@@ -147274,12 +148300,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+35731,
+				ts+36301,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20429
+						return ts + 20495
 					}
-					return ts + 35768
+					return ts + 36338
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -147909,7 +148935,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+35780, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36350, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -148153,7 +149179,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+35801, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36371, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -148172,7 +149198,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+35823, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36393, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -148219,7 +149245,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+35854)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36424)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -148228,7 +149254,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+35867, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+36437, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -148242,7 +149268,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35958, ts + 34057, ts + 25056, ts + 34408, ts + 11488,
+	ts + 36528, ts + 34627, ts + 25122, ts + 34978, ts + 11507,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -148266,7 +149292,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+35965, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+36535, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -148284,13 +149310,13 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35965, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36535, 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+35970, 0,
+				db, ts+36540, 0,
 				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
 				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
@@ -148347,17 +149373,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 + 35985,
-			ts + 36053,
-			ts + 36122,
-			ts + 36155,
-			ts + 36194,
-			ts + 36234,
-			ts + 36273,
-			ts + 36314,
-			ts + 36353,
-			ts + 36395,
-			ts + 36435,
+			ts + 36555,
+			ts + 36623,
+			ts + 36692,
+			ts + 36725,
+			ts + 36764,
+			ts + 36804,
+			ts + 36843,
+			ts + 36884,
+			ts + 36923,
+			ts + 36965,
+			ts + 37005,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -148424,7 +149450,7 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 			(*Fts5Config)(unsafe.Pointer((*Fts5Storage)(unsafe.Pointer(p)).FpConfig)).FbLock--
 			Xsqlite3_free(tls, zSql)
 			if rc != SQLITE_OK && pzErrMsg != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
 			}
 		}
 	}
@@ -148459,18 +149485,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+36458,
+		ts+37028,
 		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+36562,
+			ts+37132,
 			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+36600,
+			ts+37170,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -148482,7 +149508,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+36638,
+			ts+37208,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -148494,14 +149520,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+25056, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11488, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35958, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25122, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11507, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+36528, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34408, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34978, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34057, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34627, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -148513,17 +149539,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+36680,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37250,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29709
+					return ts + 29775
 				}
-				return ts + 1554
+				return ts + 1573
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36710,
+			ts+37280,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -148560,27 +149586,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36754, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37324, 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+36777, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37347, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34057, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34627, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34408, ts+36783, 0, pzErr)
+				pConfig, ts+34978, ts+37353, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35958, ts+36815, 1, pzErr)
+				pConfig, ts+36528, ts+37385, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35124, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -148786,12 +149812,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+36832,
+		ts+37402,
 		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+36882,
+			ts+37452,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -148799,7 +149825,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+34554, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35124, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -148975,7 +150001,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36911,
+	zSql = Xsqlite3_mprintf(tls, ts+37481,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -149157,14 +150183,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+34057, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34627, 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+34408, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34978, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -149359,9 +150385,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+36943) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37513) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37524) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -149576,7 +150602,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 + 36965
+			var zCat uintptr = ts + 37535
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -149588,7 +150614,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+36974) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37544) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -149599,18 +150625,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+36985) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37555) {
 					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+36943) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37513) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37524) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36974) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37544) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -149886,7 +150912,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 + 37003
+	var zBase uintptr = ts + 37573
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -150028,7 +151054,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+37013, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37583, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -150036,11 +151062,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37586, 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+37021, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37591, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -150048,7 +151074,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37026, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37596, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -150056,7 +151082,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37029, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37599, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -150064,11 +151090,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37602, 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+37037, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37607, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -150076,19 +151102,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37042, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37612, 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+37046, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37616, 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+37052, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37622, 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+37057, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37627, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150096,11 +151122,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37631, 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+37065, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37635, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -150108,7 +151134,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37638, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150116,11 +151142,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37642, 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+37076, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37646, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150128,7 +151154,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37080, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37650, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150136,7 +151162,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37654, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150144,7 +151170,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37088, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37658, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150160,24 +151186,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+37092, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37072, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37662, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37642, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37665, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37668, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37672, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37658, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -150192,137 +151218,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+37105, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37675, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37113, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37683, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37120, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37690, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37125, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37695, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37021, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37591, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37130, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37700, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37016, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37586, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37705, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37088, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37658, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37140, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37710, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15480, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15499, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37145, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37715, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37098, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37668, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37149, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37719, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 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+37724, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37057, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37627, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37160, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37730, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37164, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37734, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37166, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37736, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37080, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37650, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37172, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37742, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37088, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37658, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37180, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37750, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37186, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37756, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37191, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37761, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37197, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37767, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37084, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37654, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37205, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37775, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37213, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37783, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37217, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37787, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37080, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37650, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37225, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37795, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37231, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37801, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37084, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37654, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37237, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37807, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37098, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37668, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -150337,16 +151363,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+37244, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37814, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37029, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37599, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37249, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37819, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -150354,21 +151380,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37254, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37824, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37599, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37260, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37830, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37599, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37213, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37783, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150376,7 +151402,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37266, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37836, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -150384,9 +151410,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37272, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37842, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -150401,12 +151427,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+37278, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37848, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37282, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37852, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37285, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37855, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -150415,7 +151441,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37288, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37858, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -150571,7 +151597,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+37292) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37862) {
 				if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' || *(*uint8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -150751,22 +151777,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 37003, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37573, 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 + 37307, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37877, 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 + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37883, 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 + 37320, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37890, 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
@@ -151909,14 +152935,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+37328) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37898) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37332) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37902) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37336) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37906) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37345, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37915, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -151942,19 +152968,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 + 37379,
-		ts + 37419,
-		ts + 37454,
+		ts + 37949,
+		ts + 37989,
+		ts + 38024,
 	}
 
 	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+23352, *(*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+23418, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37497, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38067, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -152087,11 +153113,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+37530, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+38100, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37561,
+		ts+38131,
 		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))
@@ -152115,7 +153141,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+37612, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38182, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -152399,7 +153425,7 @@ func fts5VocabFilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, zUnused
 		if pLe != 0 {
 			var zCopy uintptr = Xsqlite3_value_text(tls, pLe)
 			if zCopy == uintptr(0) {
-				zCopy = ts + 1554
+				zCopy = ts + 1573
 			}
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm = Xsqlite3_value_bytes(tls, pLe)
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FzLeTerm = Xsqlite3_malloc(tls, (*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm+1)
@@ -152510,7 +153536,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+37638, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+38208, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -152532,7 +153558,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 + 37648
+	return ts + 38218
 }
 
 func init() {
@@ -152958,6 +153984,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1056)) = noopStepFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1064)) = uintptr(unsafe.Pointer(&lagName))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&attach_func)) + 24)) = attachFunc
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 8)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 16)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 24)) = statBestIndex
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 32)) = statDisconnect
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 40)) = statDisconnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 48)) = statOpen
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 56)) = statClose
+	*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 64)) = statFilter
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 72)) = statNext
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 80)) = statEof
+	*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 88)) = statColumn
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 96)) = statRowid
 	*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 0)) = sqlite3MemMalloc
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 8)) = sqlite3MemFree
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 16)) = sqlite3MemRealloc
@@ -153490,8 +154528,9 @@ func init() {
 	*(*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
-	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = Xsqlite3JsonTableFunctions
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = Xsqlite3DbstatRegister
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = sqlite3TestExtInit
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 32)) = Xsqlite3JsonTableFunctions
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statGetFuncdef)) + 24)) = statGet
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statInitFuncdef)) + 24)) = statInit
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statPushFuncdef)) + 24)) = statPush
@@ -153509,5 +154548,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-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 ts1 = "3.41.2\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_DBSTAT_VTAB\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\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\x00true\x00false\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 \x00rowid not at end-of-record for row \x00 of 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\x00CREATE TABLE x( name       TEXT, path       TEXT, pageno     INTEGER, pagetype   TEXT, ncell      INTEGER, payload    INTEGER, unused     INTEGER, mx_payload INTEGER, pgoffset   INTEGER, pgsize     INTEGER, schema     TEXT HIDDEN, aggregate  BOOLEAN HIDDEN)\x00/\x00overflow\x00%s%.3x+%.6x\x00%s%.3x/\x00internal\x00leaf\x00corrupted\x00SELECT * FROM (SELECT 'sqlite_schema' AS name,1 AS rootpage,'table' AS type UNION ALL SELECT name,rootpage,type FROM \"%w\".sqlite_schema WHERE rootpage!=0)\x00WHERE name=%Q\x00 ORDER BY name\x00dbstat\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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 3f33db0b..304ab56b 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -208,6 +208,7 @@ const (
 	DBFLAG_SchemaKnownOk                  = 0x0010
 	DBFLAG_Vacuum                         = 0x0004
 	DBFLAG_VacuumInto                     = 0x0008
+	DBSTAT_PAGE_PADDING_BYTES             = 256
 	DB_ResetWanted                        = 0x0008
 	DB_SchemaLoaded                       = 0x0001
 	DB_UnresetViews                       = 0x0002
@@ -921,11 +922,11 @@ const (
 	NC_OrderAgg                           = 0x8000000
 	NC_PartIdx                            = 0x000002
 	NC_SelfRef                            = 0x00002e
+	NC_Subquery                           = 0x000040
 	NC_UAggInfo                           = 0x000100
 	NC_UBaseReg                           = 0x000400
 	NC_UEList                             = 0x000080
 	NC_UUpsert                            = 0x000200
-	NC_VarSelect                          = 0x000040
 	NDEBUG                                = 1
 	NN                                    = 1
 	NOT_WITHIN                            = 0
@@ -1765,6 +1766,7 @@ const (
 	SQLITE_ECEL_REF                       = 0x04
 	SQLITE_EMPTY                          = 16
 	SQLITE_ENABLE_COLUMN_METADATA         = 1
+	SQLITE_ENABLE_DBSTAT_VTAB             = 1
 	SQLITE_ENABLE_FTS5                    = 1
 	SQLITE_ENABLE_GEOPOLY                 = 1
 	SQLITE_ENABLE_LOCKING_STYLE           = 0
@@ -2165,7 +2167,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
+	SQLITE_SOURCE_ID                      = "2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2272,8 +2274,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.41.0"
-	SQLITE_VERSION_NUMBER                 = 3041000
+	SQLITE_VERSION                        = "3.41.2"
+	SQLITE_VERSION_NUMBER                 = 3041002
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -6123,7 +6125,8 @@ type IndexedExpr1 = struct {
 	FiIdxCur       int32
 	FiIdxCol       int32
 	FbMaybeNullRow U8
-	F__ccgo_pad1   [3]byte
+	Faff           U8
+	F__ccgo_pad1   [2]byte
 	FpIENext       uintptr
 }
 
@@ -6765,17 +6768,18 @@ type Pager = Pager1
 
 // Handle type for pages.
 type PgHdr2 = struct {
-	FpPage      uintptr
-	FpData      uintptr
-	FpExtra     uintptr
-	FpCache     uintptr
-	FpDirty     uintptr
-	FpPager     uintptr
-	Fpgno       Pgno
-	Fflags      U16
-	FnRef       I16
-	FpDirtyNext uintptr
-	FpDirtyPrev uintptr
+	FpPage       uintptr
+	FpData       uintptr
+	FpExtra      uintptr
+	FpCache      uintptr
+	FpDirty      uintptr
+	FpPager      uintptr
+	Fpgno        Pgno
+	Fflags       U16
+	F__ccgo_pad1 [2]byte
+	FnRef        I64
+	FpDirtyNext  uintptr
+	FpDirtyPrev  uintptr
 }
 
 // Handle type for pages.
@@ -6996,14 +7000,14 @@ type PCache2 = struct {
 	FpDirty      uintptr
 	FpDirtyTail  uintptr
 	FpSynced     uintptr
-	FnRefSum     int32
+	FnRefSum     I64
 	FszCache     int32
 	FszSpill     int32
 	FszPage      int32
 	FszExtra     int32
 	FbPurgeable  U8
 	FeCreate     U8
-	F__ccgo_pad1 [2]byte
+	F__ccgo_pad1 [6]byte
 	FxStress     uintptr
 	FpStress     uintptr
 	FpCache      uintptr
@@ -7262,7 +7266,7 @@ type CoveringIndexCheck1 = struct {
 	F__ccgo_pad1 [2]byte
 }
 
-var sqlite3azCompileOpt = [52]uintptr{
+var sqlite3azCompileOpt = [53]uintptr{
 	ts + 7,
 	ts + 27,
 	ts + 56,
@@ -7281,40 +7285,41 @@ var sqlite3azCompileOpt = [52]uintptr{
 	ts + 372,
 	ts + 397,
 	ts + 420,
-	ts + 432,
-	ts + 447,
-	ts + 469,
-	ts + 494,
-	ts + 517,
-	ts + 539,
-	ts + 550,
-	ts + 563,
-	ts + 578,
-	ts + 594,
-	ts + 607,
-	ts + 628,
-	ts + 652,
-	ts + 675,
-	ts + 691,
-	ts + 707,
-	ts + 731,
-	ts + 758,
-	ts + 778,
-	ts + 799,
-	ts + 821,
-	ts + 851,
-	ts + 876,
-	ts + 902,
-	ts + 922,
-	ts + 948,
-	ts + 971,
-	ts + 997,
-	ts + 1019,
-	ts + 1040,
-	ts + 1051,
+	ts + 439,
+	ts + 451,
+	ts + 466,
+	ts + 488,
+	ts + 513,
+	ts + 536,
+	ts + 558,
+	ts + 569,
+	ts + 582,
+	ts + 597,
+	ts + 613,
+	ts + 626,
+	ts + 647,
+	ts + 671,
+	ts + 694,
+	ts + 710,
+	ts + 726,
+	ts + 750,
+	ts + 777,
+	ts + 797,
+	ts + 818,
+	ts + 840,
+	ts + 870,
+	ts + 895,
+	ts + 921,
+	ts + 941,
+	ts + 967,
+	ts + 990,
+	ts + 1016,
+	ts + 1038,
 	ts + 1059,
-	ts + 1073,
-	ts + 1086,
+	ts + 1070,
+	ts + 1078,
+	ts + 1092,
+	ts + 1105,
 }
 
 func Xsqlite3CompileOptions(tls *libc.TLS, pnOpt uintptr) uintptr {
@@ -7466,7 +7471,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 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))
+var Xsqlite3StrBINARY = *(*[7]uint8)(unsafe.Pointer(ts + 1118))
 
 // Standard typenames.  These names must match the COLTYPE_* definitions.
 // Adjust the SQLITE_N_STDTYPE value if adding or removing entries.
@@ -7488,12 +7493,12 @@ var Xsqlite3StdTypeAffinity = [6]uint8{
 	uint8(SQLITE_AFF_TEXT),
 }
 var Xsqlite3StdType = [6]uintptr{
-	ts + 1106,
-	ts + 1110,
-	ts + 1115,
-	ts + 1119,
-	ts + 1127,
-	ts + 1132,
+	ts + 1125,
+	ts + 1129,
+	ts + 1134,
+	ts + 1138,
+	ts + 1146,
+	ts + 1151,
 }
 
 // SQL is translated into a sequence of instructions to be
@@ -7810,7 +7815,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, 23229)
+		return Xsqlite3MisuseError(tls, 23233)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -8239,7 +8244,7 @@ __6:
 __4:
 	;
 	zDate++
-	if !(getDigits(tls, zDate, ts+1137, libc.VaList(bp, bp+16, bp+20)) != 2) {
+	if !(getDigits(tls, zDate, ts+1156, libc.VaList(bp, bp+16, bp+20)) != 2) {
 		goto __9
 	}
 	return 1
@@ -8265,13 +8270,13 @@ func parseHhMmSs(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	defer tls.Free(36)
 
 	var ms float64 = 0.0
-	if getDigits(tls, zDate, ts+1145, libc.VaList(bp, bp+24, bp+28)) != 2 {
+	if getDigits(tls, zDate, ts+1164, libc.VaList(bp, bp+24, bp+28)) != 2 {
 		return 1
 	}
 	zDate += uintptr(5)
 	if int32(*(*uint8)(unsafe.Pointer(zDate))) == ':' {
 		zDate++
-		if getDigits(tls, zDate, ts+1153, libc.VaList(bp+16, bp+32)) != 1 {
+		if getDigits(tls, zDate, ts+1172, libc.VaList(bp+16, bp+32)) != 1 {
 			return 1
 		}
 		zDate += uintptr(2)
@@ -8369,7 +8374,7 @@ func parseYyyyMmDd(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	} else {
 		neg = 0
 	}
-	if getDigits(tls, zDate, ts+1157, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
+	if getDigits(tls, zDate, ts+1176, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
 		return 1
 	}
 	zDate += uintptr(10)
@@ -8426,7 +8431,7 @@ func parseDateOrTime(tls *libc.TLS, context uintptr, zDate uintptr, p uintptr) i
 		return 0
 	} else if parseHhMmSs(tls, zDate, p) == 0 {
 		return 0
-	} else if Xsqlite3StrICmp(tls, zDate, ts+1169) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
+	} else if Xsqlite3StrICmp(tls, zDate, ts+1188) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
 		return setDateTimeToCurrent(tls, context, p)
 	} else if Xsqlite3AtoF(tls, zDate, bp, Xsqlite3Strlen30(tls, zDate), uint8(SQLITE_UTF8)) > 0 {
 		setRawDateNumber(tls, p, *(*float64)(unsafe.Pointer(bp)))
@@ -8559,7 +8564,7 @@ func toLocaltime(tls *libc.TLS, p uintptr, pCtx uintptr) int32 {
 		*(*Time_t)(unsafe.Pointer(bp + 104)) = (*DateTime)(unsafe.Pointer(p)).FiJD/int64(1000) - int64(21086676)*int64(10000)
 	}
 	if osLocaltime(tls, bp+104, bp) != 0 {
-		Xsqlite3_result_error(tls, pCtx, ts+1173, -1)
+		Xsqlite3_result_error(tls, pCtx, ts+1192, -1)
 		return SQLITE_ERROR
 	}
 	(*DateTime)(unsafe.Pointer(p)).FY = (*tm)(unsafe.Pointer(bp)).Ftm_year + 1900 - iYearDiff
@@ -8583,12 +8588,12 @@ var aXformType = [6]struct {
 	FrLimit float32
 	FrXform float32
 }{
-	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1196)), FrLimit: 4.6427e+14, FrXform: 1.0},
-	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1203)), FrLimit: 7.7379e+12, FrXform: 60.0},
-	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1210)), FrLimit: 1.2897e+11, FrXform: 3600.0},
-	{FnName: U8(3), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1217)), FrLimit: 5373485.0, FrXform: 86400.0},
-	{FnName: U8(5), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1224)), FrLimit: 176546.0, FrXform: 2592000.0},
-	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1231)), FrLimit: 14713.0, FrXform: 31536000.0},
+	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1215)), FrLimit: 4.6427e+14, FrXform: 1.0},
+	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1222)), FrLimit: 7.7379e+12, FrXform: 60.0},
+	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1229)), FrLimit: 1.2897e+11, FrXform: 3600.0},
+	{FnName: U8(3), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1236)), FrLimit: 5373485.0, FrXform: 86400.0},
+	{FnName: U8(5), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1243)), FrLimit: 176546.0, FrXform: 2592000.0},
+	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1250)), FrLimit: 14713.0, FrXform: 31536000.0},
 }
 
 func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, idx int32) int32 {
@@ -8600,7 +8605,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 	switch int32(Xsqlite3UpperToLower[*(*uint8)(unsafe.Pointer(z))]) {
 	case 'a':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1238) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1257) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8622,7 +8627,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'j':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1243) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1262) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8636,7 +8641,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'l':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1253) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1272) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				rc = toLocaltime(tls, p, pCtx)
 			}
 			break
@@ -8644,7 +8649,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'u':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1263) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1282) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8656,7 +8661,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					(*DateTime)(unsafe.Pointer(p)).FrawS = uint8(0)
 					rc = 0
 				}
-			} else if Xsqlite3_stricmp(tls, z, ts+1273) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1292) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				if int32((*DateTime)(unsafe.Pointer(p)).FtzSet) == 0 {
 					var iOrigJD I64
 					var iGuess I64
@@ -8690,7 +8695,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'w':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1277, 8) == 0 &&
+			if Xsqlite3_strnicmp(tls, z, ts+1296, 8) == 0 &&
 				Xsqlite3AtoF(tls, z+8, bp+48, Xsqlite3Strlen30(tls, z+8), uint8(SQLITE_UTF8)) > 0 &&
 				*(*float64)(unsafe.Pointer(bp + 48)) >= 0.0 && *(*float64)(unsafe.Pointer(bp + 48)) < 7.0 && float64(libc.AssignInt32(&n, int32(*(*float64)(unsafe.Pointer(bp + 48))))) == *(*float64)(unsafe.Pointer(bp + 48)) {
 				var Z Sqlite3_int64
@@ -8711,7 +8716,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 's':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1286, 9) != 0 {
+			if Xsqlite3_strnicmp(tls, z, ts+1305, 9) != 0 {
 				break
 			}
 			if !(int32((*DateTime)(unsafe.Pointer(p)).FvalidJD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidYMD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidHMS) != 0) {
@@ -8725,14 +8730,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 			(*DateTime)(unsafe.Pointer(p)).FrawS = uint8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidTZ = uint8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidJD = uint8(0)
-			if Xsqlite3_stricmp(tls, z, ts+1296) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1315) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1302) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1321) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FM = 1
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1307) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1326) == 0 {
 				rc = 0
 			}
 			break
@@ -9058,7 +9063,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		switch int32(*(*uint8)(unsafe.Pointer(zFmt + uintptr(i)))) {
 		case 'd':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
 				break
 
 			}
@@ -9068,13 +9073,13 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if s > 59.999 {
 					s = 59.999
 				}
-				Xsqlite3_str_appendf(tls, bp+136, ts+1316, libc.VaList(bp+8, s))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1335, libc.VaList(bp+8, s))
 				break
 
 			}
 		case 'H':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
 				break
 
 			}
@@ -9092,41 +9097,41 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if int32(*(*uint8)(unsafe.Pointer(zFmt + uintptr(i)))) == 'W' {
 					var wd int32
 					wd = int32(((*DateTime)(unsafe.Pointer(bp+88)).FiJD + int64(43200000)) / int64(86400000) % int64(7))
-					Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+24, (nDay+7-wd)/7))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+24, (nDay+7-wd)/7))
 				} else {
-					Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+32, nDay+1))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1342, libc.VaList(bp+32, nDay+1))
 				}
 				break
 
 			}
 		case 'J':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1328, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1347, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
 				break
 
 			}
 		case 'm':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
 				break
 
 			}
 		case 'M':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
 				break
 
 			}
 		case 's':
 			{
 				var iS I64 = (*DateTime)(unsafe.Pointer(bp+88)).FiJD/int64(1000) - int64(21086676)*int64(10000)
-				Xsqlite3_str_appendf(tls, bp+136, ts+1334, libc.VaList(bp+64, iS))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1353, libc.VaList(bp+64, iS))
 				break
 
 			}
 		case 'S':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
 				break
 
 			}
@@ -9139,7 +9144,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			}
 		case 'Y':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1339, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1358, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
 				break
 
 			}
@@ -9189,15 +9194,15 @@ func Xsqlite3RegisterDateTimeFunctions(tls *libc.TLS) {
 }
 
 var aDateTimeFuncs = [9]FuncDef{
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1243},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1263},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1344},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1349},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1354},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1262},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1282},
 	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1363},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1372},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1385},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1403}}
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1368},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1373},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1382},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1391},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1404},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1422}}
 
 // The following routines are convenience wrappers around methods
 // of the sqlite3_file object.  This is mostly just syntactic sugar. All
@@ -9612,7 +9617,7 @@ func sqlite3MemMalloc(tls *libc.TLS, nByte int32) uintptr {
 		*(*Sqlite3_int64)(unsafe.Pointer(p)) = Sqlite3_int64(nByte)
 		p += 8
 	} else {
-		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1416, libc.VaList(bp, nByte))
+		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1435, libc.VaList(bp, nByte))
 	}
 	return p
 }
@@ -9645,7 +9650,7 @@ func sqlite3MemRealloc(tls *libc.TLS, pPrior uintptr, nByte int32) uintptr {
 		p += 8
 	} else {
 		Xsqlite3_log(tls, SQLITE_NOMEM,
-			ts+1454,
+			ts+1473,
 			libc.VaList(bp, sqlite3MemSize(tls, pPrior), nByte))
 	}
 	return p
@@ -10521,7 +10526,7 @@ func Xsqlite3OomFault(tls *libc.TLS, db uintptr) uintptr {
 		(*Sqlite3)(unsafe.Pointer(db)).Flookaside.Fsz = U16(0)
 		if (*Sqlite3)(unsafe.Pointer(db)).FpParse != 0 {
 			var pParse uintptr
-			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1490, 0)
+			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1509, 0)
 			(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 			for pParse = (*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).FpOuterParse; pParse != 0; pParse = (*Parse)(unsafe.Pointer(pParse)).FpOuterParse {
 				(*Parse)(unsafe.Pointer(pParse)).FnErr++
@@ -10594,8 +10599,8 @@ type et_info = struct {
 // by an instance of the following structure
 type Et_info = et_info
 
-var aDigits = *(*[33]uint8)(unsafe.Pointer(ts + 1504))
-var aPrefix = *(*[7]uint8)(unsafe.Pointer(ts + 1537))
+var aDigits = *(*[33]uint8)(unsafe.Pointer(ts + 1523))
+var aPrefix = *(*[7]uint8)(unsafe.Pointer(ts + 1556))
 var fmtinfo = [23]Et_info{
 	{Ffmttype: uint8('d'), Fbase: EtByte(10), Fflags: EtByte(1), Ftype: EtByte(EtDECIMAL)},
 	{Ffmttype: uint8('s'), Fflags: EtByte(4), Ftype: EtByte(EtSTRING)},
@@ -10809,7 +10814,7 @@ __6:
 	if !(libc.AssignInt32(&c, int32(*(*uint8)(unsafe.Pointer(libc.PreIncUintptr(&fmt, 1))))) == 0) {
 		goto __11
 	}
-	Xsqlite3_str_append(tls, pAccum, ts+1544, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1563, 1)
 	goto __5
 __11:
 	;
@@ -11366,7 +11371,7 @@ __125:
 	if !(Xsqlite3IsNaN(tls, *(*float64)(unsafe.Pointer(bp + 104))) != 0) {
 		goto __127
 	}
-	bufpt = ts + 1546
+	bufpt = ts + 1565
 	length = 3
 	goto __58
 __127:
@@ -11426,7 +11431,7 @@ __138:
 	}
 	bufpt = bp + 16
 	*(*uint8)(unsafe.Pointer(bp + 16)) = prefix
-	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1550, uint64(4))
+	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1569, uint64(4))
 	length = 3 + libc.Bool32(int32(prefix) != 0)
 	goto __58
 __139:
@@ -11792,7 +11797,7 @@ __200:
 	if !(bufpt == uintptr(0)) {
 		goto __201
 	}
-	bufpt = ts + 1554
+	bufpt = ts + 1573
 	goto __202
 __201:
 	if !(int32(xtype) == EtDYNSTRING) {
@@ -11916,9 +11921,9 @@ __222:
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
-			return ts + 1555
+			return ts + 1574
 		}
-		return ts + 1560
+		return ts + 1579
 	}()
 __223:
 	;
@@ -12066,7 +12071,7 @@ __246:
 		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
-	Xsqlite3_str_append(tls, pAccum, ts+1567, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1586, 1)
 __250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
@@ -12083,10 +12088,10 @@ __251:
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
 		goto __253
 	}
-	Xsqlite3_str_appendf(tls, pAccum, ts+1569, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1588, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 	goto __254
 __253:
-	Xsqlite3_str_appendf(tls, pAccum, ts+1579, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1598, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
 __254:
 	;
 __252:
@@ -12141,7 +12146,7 @@ __4:
 __5:
 }
 
-var zOrd = *(*[9]uint8)(unsafe.Pointer(ts + 1593))
+var zOrd = *(*[9]uint8)(unsafe.Pointer(ts + 1612))
 
 // The z string points to the first character of a token that is
 // associated with an error.  If db does not already have an error
@@ -12306,7 +12311,7 @@ func Xsqlite3ResultStrAccum(tls *libc.TLS, pCtx uintptr, p uintptr) {
 	} else if int32((*StrAccum)(unsafe.Pointer(p)).FprintfFlags)&SQLITE_PRINTF_MALLOCED != 0 {
 		Xsqlite3_result_text(tls, pCtx, (*StrAccum)(unsafe.Pointer(p)).FzText, int32((*StrAccum)(unsafe.Pointer(p)).FnChar), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 	} else {
-		Xsqlite3_result_text(tls, pCtx, ts+1554, 0, uintptr(0))
+		Xsqlite3_result_text(tls, pCtx, ts+1573, 0, uintptr(0))
 		Xsqlite3_str_reset(tls, p)
 	}
 }
@@ -14042,7 +14047,7 @@ func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
 	var c int32 = 0
 	var i int32
 
-	var pow63 uintptr = ts + 1602
+	var pow63 uintptr = ts + 1621
 	for i = 0; c == 0 && i < 18; i++ {
 		c = (int32(*(*uint8)(unsafe.Pointer(zNum + uintptr(i*incr)))) - int32(*(*uint8)(unsafe.Pointer(pow63 + uintptr(i))))) * 10
 	}
@@ -14588,7 +14593,7 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 	defer tls.Free(8)
 
 	Xsqlite3_log(tls, SQLITE_MISUSE,
-		ts+1621,
+		ts+1640,
 		libc.VaList(bp, zType))
 }
 
@@ -14607,13 +14612,13 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 func Xsqlite3SafetyCheckOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	if db == uintptr(0) {
-		logBadConnection(tls, ts+1555)
+		logBadConnection(tls, ts+1574)
 		return 0
 	}
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_OPEN {
 		if Xsqlite3SafetyCheckSickOrOk(tls, db) != 0 {
-			logBadConnection(tls, ts+1666)
+			logBadConnection(tls, ts+1685)
 		}
 		return 0
 	} else {
@@ -14626,7 +14631,7 @@ func Xsqlite3SafetyCheckSickOrOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_SICK && int32(eOpenState) != SQLITE_STATE_OPEN && int32(eOpenState) != SQLITE_STATE_BUSY {
-		logBadConnection(tls, ts+1675)
+		logBadConnection(tls, ts+1694)
 		return 0
 	} else {
 		return 1
@@ -15100,193 +15105,193 @@ func Xsqlite3OpcodeName(tls *libc.TLS, i int32) uintptr {
 }
 
 var azName = [187]uintptr{
-	ts + 1683,
-	ts + 1693,
-	ts + 1704,
-	ts + 1716,
-	ts + 1727,
-	ts + 1739,
+	ts + 1702,
+	ts + 1712,
+	ts + 1723,
+	ts + 1735,
 	ts + 1746,
-	ts + 1754,
-	ts + 1762,
-	ts + 1767,
-	ts + 1772,
-	ts + 1778,
-	ts + 1792,
-	ts + 1798,
-	ts + 1808,
-	ts + 1813,
-	ts + 1818,
-	ts + 1821,
+	ts + 1758,
+	ts + 1765,
+	ts + 1773,
+	ts + 1781,
+	ts + 1786,
+	ts + 1791,
+	ts + 1797,
+	ts + 1811,
+	ts + 1817,
 	ts + 1827,
-	ts + 1834,
-	ts + 1838,
-	ts + 1848,
-	ts + 1855,
-	ts + 1862,
-	ts + 1869,
-	ts + 1876,
-	ts + 1886,
+	ts + 1832,
+	ts + 1837,
+	ts + 1840,
+	ts + 1846,
+	ts + 1853,
+	ts + 1857,
+	ts + 1867,
+	ts + 1874,
+	ts + 1881,
+	ts + 1888,
 	ts + 1895,
-	ts + 1906,
-	ts + 1915,
-	ts + 1921,
-	ts + 1931,
-	ts + 1941,
-	ts + 1946,
-	ts + 1956,
-	ts + 1967,
-	ts + 1972,
-	ts + 1979,
-	ts + 1990,
-	ts + 1995,
-	ts + 2000,
-	ts + 2006,
-	ts + 2012,
-	ts + 2018,
-	ts + 2021,
+	ts + 1905,
+	ts + 1914,
+	ts + 1925,
+	ts + 1934,
+	ts + 1940,
+	ts + 1950,
+	ts + 1960,
+	ts + 1965,
+	ts + 1975,
+	ts + 1986,
+	ts + 1991,
+	ts + 1998,
+	ts + 2009,
+	ts + 2014,
+	ts + 2019,
 	ts + 2025,
 	ts + 2031,
-	ts + 2042,
-	ts + 2053,
+	ts + 2037,
+	ts + 2040,
+	ts + 2044,
+	ts + 2050,
 	ts + 2061,
-	ts + 2070,
-	ts + 2077,
-	ts + 2085,
-	ts + 2088,
-	ts + 2091,
-	ts + 2094,
-	ts + 2097,
-	ts + 2100,
-	ts + 2103,
+	ts + 2072,
+	ts + 2080,
+	ts + 2089,
+	ts + 2096,
+	ts + 2104,
+	ts + 2107,
 	ts + 2110,
+	ts + 2113,
 	ts + 2116,
-	ts + 2126,
-	ts + 2139,
-	ts + 2150,
-	ts + 2156,
-	ts + 2163,
-	ts + 2172,
-	ts + 2181,
-	ts + 2188,
-	ts + 2201,
-	ts + 2212,
-	ts + 2217,
-	ts + 2225,
+	ts + 2119,
+	ts + 2122,
+	ts + 2129,
+	ts + 2135,
+	ts + 2145,
+	ts + 2158,
+	ts + 2169,
+	ts + 2175,
+	ts + 2182,
+	ts + 2191,
+	ts + 2200,
+	ts + 2207,
+	ts + 2220,
 	ts + 2231,
-	ts + 2238,
+	ts + 2236,
+	ts + 2244,
 	ts + 2250,
-	ts + 2255,
-	ts + 2264,
+	ts + 2257,
 	ts + 2269,
-	ts + 2278,
+	ts + 2274,
 	ts + 2283,
 	ts + 2288,
-	ts + 2294,
+	ts + 2297,
 	ts + 2302,
-	ts + 2310,
-	ts + 2320,
-	ts + 2328,
-	ts + 2335,
-	ts + 2348,
-	ts + 2353,
-	ts + 2365,
-	ts + 2373,
-	ts + 2380,
-	ts + 2391,
-	ts + 2398,
-	ts + 2405,
-	ts + 2415,
+	ts + 2307,
+	ts + 2313,
+	ts + 2321,
+	ts + 2329,
+	ts + 2339,
+	ts + 2347,
+	ts + 2354,
+	ts + 2367,
+	ts + 2372,
+	ts + 2384,
+	ts + 2392,
+	ts + 2399,
+	ts + 2410,
+	ts + 2417,
 	ts + 2424,
-	ts + 2435,
-	ts + 2441,
-	ts + 2452,
-	ts + 2462,
-	ts + 2472,
-	ts + 2479,
-	ts + 2485,
-	ts + 2495,
-	ts + 2506,
-	ts + 2510,
-	ts + 2519,
-	ts + 2528,
-	ts + 2535,
-	ts + 2545,
-	ts + 2552,
-	ts + 2561,
+	ts + 2434,
+	ts + 2443,
+	ts + 2454,
+	ts + 2460,
+	ts + 2471,
+	ts + 2481,
+	ts + 2491,
+	ts + 2498,
+	ts + 2504,
+	ts + 2514,
+	ts + 2525,
+	ts + 2529,
+	ts + 2538,
+	ts + 2547,
+	ts + 2554,
+	ts + 2564,
 	ts + 2571,
-	ts + 2578,
-	ts + 2586,
-	ts + 2600,
-	ts + 2608,
-	ts + 2622,
-	ts + 2633,
-	ts + 2646,
-	ts + 2657,
-	ts + 2663,
-	ts + 2675,
-	ts + 2684,
-	ts + 2692,
-	ts + 2701,
-	ts + 2710,
-	ts + 2717,
-	ts + 2725,
-	ts + 2732,
-	ts + 2743,
-	ts + 2757,
-	ts + 2768,
+	ts + 2580,
+	ts + 2590,
+	ts + 2597,
+	ts + 2605,
+	ts + 2619,
+	ts + 2627,
+	ts + 2641,
+	ts + 2652,
+	ts + 2665,
+	ts + 2676,
+	ts + 2682,
+	ts + 2694,
+	ts + 2703,
+	ts + 2711,
+	ts + 2720,
+	ts + 2729,
+	ts + 2736,
+	ts + 2744,
+	ts + 2751,
+	ts + 2762,
 	ts + 2776,
-	ts + 2782,
-	ts + 2790,
-	ts + 2798,
-	ts + 2808,
-	ts + 2821,
-	ts + 2831,
-	ts + 2844,
-	ts + 2853,
-	ts + 2864,
+	ts + 2787,
+	ts + 2795,
+	ts + 2801,
+	ts + 2809,
+	ts + 2817,
+	ts + 2827,
+	ts + 2840,
+	ts + 2850,
+	ts + 2863,
 	ts + 2872,
-	ts + 2878,
-	ts + 2890,
-	ts + 2902,
-	ts + 2910,
-	ts + 2922,
-	ts + 2935,
-	ts + 2945,
-	ts + 2955,
-	ts + 2960,
-	ts + 2972,
-	ts + 2984,
-	ts + 2994,
-	ts + 3000,
-	ts + 3010,
-	ts + 3017,
+	ts + 2883,
+	ts + 2891,
+	ts + 2897,
+	ts + 2909,
+	ts + 2921,
+	ts + 2929,
+	ts + 2941,
+	ts + 2954,
+	ts + 2964,
+	ts + 2974,
+	ts + 2979,
+	ts + 2991,
+	ts + 3003,
+	ts + 3013,
+	ts + 3019,
 	ts + 3029,
-	ts + 3040,
+	ts + 3036,
 	ts + 3048,
-	ts + 3057,
-	ts + 3066,
-	ts + 3075,
-	ts + 3082,
-	ts + 3093,
-	ts + 3106,
-	ts + 3116,
-	ts + 3123,
-	ts + 3131,
-	ts + 3140,
-	ts + 3146,
-	ts + 3154,
-	ts + 3162,
-	ts + 3170,
-	ts + 3180,
+	ts + 3059,
+	ts + 3067,
+	ts + 3076,
+	ts + 3085,
+	ts + 3094,
+	ts + 3101,
+	ts + 3112,
+	ts + 3125,
+	ts + 3135,
+	ts + 3142,
+	ts + 3150,
+	ts + 3159,
+	ts + 3165,
+	ts + 3173,
+	ts + 3181,
 	ts + 3189,
-	ts + 3200,
-	ts + 3210,
-	ts + 3216,
-	ts + 3227,
-	ts + 3238,
-	ts + 3243,
-	ts + 3251,
+	ts + 3199,
+	ts + 3208,
+	ts + 3219,
+	ts + 3229,
+	ts + 3235,
+	ts + 3246,
+	ts + 3257,
+	ts + 3262,
+	ts + 3270,
 }
 
 type stat = struct {
@@ -15658,35 +15663,35 @@ type unix_syscall = struct {
 }
 
 var aSyscall = [29]unix_syscall{
-	{FzName: ts + 3261, FpCurrent: 0},
-	{FzName: ts + 3266, FpCurrent: 0},
-	{FzName: ts + 3272, FpCurrent: 0},
-	{FzName: ts + 3279, FpCurrent: 0},
-	{FzName: ts + 3286, FpCurrent: 0},
+	{FzName: ts + 3280, FpCurrent: 0},
+	{FzName: ts + 3285, FpCurrent: 0},
 	{FzName: ts + 3291, FpCurrent: 0},
-	{FzName: ts + 3297, FpCurrent: 0},
-	{FzName: ts + 3307, FpCurrent: 0},
-	{FzName: ts + 3313, FpCurrent: 0},
-	{FzName: ts + 3318},
-	{FzName: ts + 3324},
+	{FzName: ts + 3298, FpCurrent: 0},
+	{FzName: ts + 3305, FpCurrent: 0},
+	{FzName: ts + 3310, FpCurrent: 0},
+	{FzName: ts + 3316, FpCurrent: 0},
+	{FzName: ts + 3326, FpCurrent: 0},
 	{FzName: ts + 3332, FpCurrent: 0},
-	{FzName: ts + 3338},
-	{FzName: ts + 3345},
-	{FzName: ts + 3354, FpCurrent: 0},
-	{FzName: ts + 3361},
-	{FzName: ts + 3371, FpCurrent: 0},
-	{FzName: ts + 3378, FpCurrent: 0},
-	{FzName: ts + 3392, FpCurrent: 0},
-	{FzName: ts + 3398, FpCurrent: 0},
-	{FzName: ts + 3404, FpCurrent: 0},
+	{FzName: ts + 3337},
+	{FzName: ts + 3343},
+	{FzName: ts + 3351, FpCurrent: 0},
+	{FzName: ts + 3357},
+	{FzName: ts + 3364},
+	{FzName: ts + 3373, FpCurrent: 0},
+	{FzName: ts + 3380},
+	{FzName: ts + 3390, FpCurrent: 0},
+	{FzName: ts + 3397, FpCurrent: 0},
 	{FzName: ts + 3411, FpCurrent: 0},
-	{FzName: ts + 3419, FpCurrent: 0},
-	{FzName: ts + 3424, FpCurrent: 0},
-	{FzName: ts + 3431, FpCurrent: 0},
+	{FzName: ts + 3417, FpCurrent: 0},
+	{FzName: ts + 3423, FpCurrent: 0},
+	{FzName: ts + 3430, FpCurrent: 0},
 	{FzName: ts + 3438, FpCurrent: 0},
+	{FzName: ts + 3443, FpCurrent: 0},
 	{FzName: ts + 3450, FpCurrent: 0},
-	{FzName: ts + 3459, FpCurrent: 0},
-	{FzName: ts + 3465},
+	{FzName: ts + 3457, FpCurrent: 0},
+	{FzName: ts + 3469, FpCurrent: 0},
+	{FzName: ts + 3478, FpCurrent: 0},
+	{FzName: ts + 3484},
 }
 
 func robustFchown(tls *libc.TLS, fd int32, uid Uid_t, gid Gid_t) int32 {
@@ -15784,9 +15789,9 @@ func robust_open(tls *libc.TLS, z uintptr, f int32, m Mode_t) int32 {
 		}
 		(*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, fd)
 		Xsqlite3_log(tls, SQLITE_WARNING,
-			ts+3471, libc.VaList(bp, z, fd))
+			ts+3490, libc.VaList(bp, z, fd))
 		fd = -1
-		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3514, O_RDONLY, int32(m)) < 0 {
+		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3533, O_RDONLY, int32(m)) < 0 {
 			break
 		}
 	}
@@ -15865,13 +15870,13 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 	var zErr uintptr
 	var iErrno int32 = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 
-	zErr = ts + 1554
+	zErr = ts + 1573
 
 	if zPath == uintptr(0) {
-		zPath = ts + 1554
+		zPath = ts + 1573
 	}
 	Xsqlite3_log(tls, errcode,
-		ts+3524,
+		ts+3543,
 		libc.VaList(bp, iLine, iErrno, zFunc, zPath, zErr))
 
 	return errcode
@@ -15879,7 +15884,7 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 
 func robust_close(tls *libc.TLS, pFile uintptr, h int32, lineno int32) {
 	if (*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, h) != 0 {
-		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3266,
+		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3285,
 			func() uintptr {
 				if pFile != 0 {
 					return (*UnixFile)(unsafe.Pointer(pFile)).FzPath
@@ -15900,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, 38271)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38275)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -16002,19 +16007,19 @@ func verifyDbFile(tls *libc.TLS, pFile uintptr) {
 
 	rc = (*(*func(*libc.TLS, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 5*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, bp+32)
 	if rc != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3555, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3574, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink == X__nlink_t(0) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3579, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3598, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink > X__nlink_t(1) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3608, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3627, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if fileHasMoved(tls, pFile) != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3635, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3654, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 }
@@ -16377,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, 39055)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39059)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -16650,7 +16655,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	var ii int32
 	var fd int32 = -1
 
-	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3663, libc.VaList(bp, zFilename))
+	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3682, libc.VaList(bp, zFilename))
 	for ii = int32(libc.Xstrlen(tls, bp+8)); ii > 0 && int32(*(*uint8)(unsafe.Pointer(bp + 8 + uintptr(ii)))) != '/'; ii-- {
 	}
 	if ii > 0 {
@@ -16668,7 +16673,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3378, bp+8, 40676)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40680), ts+3397, bp+8, 40680)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -16685,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, 40717)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3685, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40721)
 	}
 
 	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)), 40731)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40735)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -16712,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, 40762)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3316, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40766)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -16767,7 +16772,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 				if iWrite >= nSize {
 					iWrite = nSize - int64(1)
 				}
-				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1554, 1)
+				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1573, 1)
 				if nWrite != 1 {
 					return SQLITE_IOERR | int32(3)<<8
 				}
@@ -16780,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, 40883)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3316, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40887)
 			}
 		}
 
@@ -16848,7 +16853,7 @@ func unixFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 		}
 	case SQLITE_FCNTL_VFSNAME:
 		{
-			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
+			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
 			return SQLITE_OK
 
 		}
@@ -17007,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, 41442)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41446)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -17035,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, 41499)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3316, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41503)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -17098,7 +17103,7 @@ __4:
 	;
 	libc.Xmemset(tls, pShmNode, 0, uint64(unsafe.Sizeof(unixShmNode{}))+uint64(nShmFilename))
 	zShm = libc.AssignPtrUintptr(pShmNode+16, pShmNode+1*96)
-	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3677, libc.VaList(bp, zBasePath))
+	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3696, libc.VaList(bp, zBasePath))
 
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = -1
 	(*UnixInodeInfo)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pDbFd)).FpInode)).FpShmNode = pShmNode
@@ -17119,7 +17124,7 @@ __5:
 	if !(int32((*UnixInodeInfo)(unsafe.Pointer(pInode)).FbProcessLock) == 0) {
 		goto __7
 	}
-	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3684, 0)) {
+	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3703, 0)) {
 		goto __8
 	}
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = robust_open(tls, zShm, O_RDWR|O_CREAT|0400000,
@@ -17134,7 +17139,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3261, zShm, 41624)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41628), ts+3280, zShm, 41628)
 	goto shm_open_err
 __10:
 	;
@@ -17260,11 +17265,11 @@ __11:
 		goto __13
 	}
 	*(*int32)(unsafe.Pointer(bp + 128)) = 0
-	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1554, 1, bp+128) != 1) {
+	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1573, 1, bp+128) != 1) {
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41768)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3351, zFile, 41772)
 	goto shmpage_out
 __14:
 	;
@@ -17310,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, 41795)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3438, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41799)
 	goto shmpage_out
 __20:
 	;
@@ -17511,7 +17516,7 @@ func unixUnmapfile(tls *libc.TLS, pFd uintptr) {
 }
 
 func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
-	var zErr uintptr = ts + 3419
+	var zErr uintptr = ts + 3438
 	var h int32 = (*UnixFile)(unsafe.Pointer(pFd)).Fh
 	var pOrig uintptr = (*UnixFile)(unsafe.Pointer(pFd)).FpMapRegion
 	var nOrig I64 = (*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeActual
@@ -17527,7 +17532,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 		}
 
 		pNew = (*(*func(*libc.TLS, uintptr, Size_t, Size_t, int32, uintptr) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 24*24 + 8)))(tls, pOrig, uint64(nReuse), uint64(nNew), MREMAP_MAYMOVE, 0)
-		zErr = ts + 3431
+		zErr = ts + 3450
 
 		if pNew == libc.UintptrFromInt32(-1) || pNew == uintptr(0) {
 			(*(*func(*libc.TLS, uintptr, Size_t) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 23*24 + 8)))(tls, pOrig, uint64(nReuse))
@@ -17541,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, 42169)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42173)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -17656,10 +17661,10 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		}
 		return uintptr(0)
 	}(),
-		ts+3697, SQLITE_POWERSAFE_OVERWRITE) != 0 {
+		ts+3716, SQLITE_POWERSAFE_OVERWRITE) != 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_PSOW)
 	}
-	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3702) == 0 {
+	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3721) == 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_EXCL)
 	}
 
@@ -17675,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, 42672)
+			robust_close(tls, pNew, h, 42676)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -17688,7 +17693,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		if zLockFile == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
-			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3712, libc.VaList(bp, zFilename))
+			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3731, libc.VaList(bp, zFilename))
 		}
 		(*UnixFile)(unsafe.Pointer(pNew)).FlockingContext = zLockFile
 	}
@@ -17696,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, 42757)
+			robust_close(tls, pNew, h, 42761)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -17709,15 +17714,15 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 var azTempDirs = [6]uintptr{
 	uintptr(0),
 	uintptr(0),
-	ts + 3720,
-	ts + 3729,
-	ts + 3738,
-	ts + 1567,
+	ts + 3739,
+	ts + 3748,
+	ts + 3757,
+	ts + 1586,
 }
 
 func unixTempFileInit(tls *libc.TLS) {
-	azTempDirs[0] = libc.Xgetenv(tls, ts+3743)
-	azTempDirs[1] = libc.Xgetenv(tls, ts+3757)
+	azTempDirs[0] = libc.Xgetenv(tls, ts+3762)
+	azTempDirs[1] = libc.Xgetenv(tls, ts+3776)
 }
 
 func unixTempFileDir(tls *libc.TLS) uintptr {
@@ -17762,7 +17767,7 @@ func unixGetTempname(tls *libc.TLS, nBuf int32, zBuf uintptr) int32 {
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U64(0))), bp+24)
 
 			*(*uint8)(unsafe.Pointer(zBuf + uintptr(nBuf-2))) = uint8(0)
-			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3764,
+			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3783,
 				libc.VaList(bp, zDir, *(*U64)(unsafe.Pointer(bp + 24)), 0))
 			if int32(*(*uint8)(unsafe.Pointer(zBuf + uintptr(nBuf-2)))) != 0 || libc.PostIncInt32(&iLimit, 1) > 10 {
 				rc = SQLITE_ERROR
@@ -17847,7 +17852,7 @@ func findCreateFileMode(tls *libc.TLS, zPath uintptr, flags int32, pMode uintptr
 	} else if flags&SQLITE_OPEN_DELETEONCLOSE != 0 {
 		*(*Mode_t)(unsafe.Pointer(pMode)) = Mode_t(0600)
 	} else if flags&SQLITE_OPEN_URI != 0 {
-		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3781)
+		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3800)
 		if z != 0 {
 			rc = getFileMode(tls, z, pMode, pUid, pGid)
 		}
@@ -18012,7 +18017,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3261, zName, 43198)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43202), ts+3280, zName, 43202)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -18103,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, 43337)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3390, zPath, 43341)
 		}
 		return rc
 	}
@@ -18111,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, 43347)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3807, zPath, 43351)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43353)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -18177,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, 43443), ts+3459, zIn, 43443)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43447), ts+3478, zIn, 43447)
 			}
 		} 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, 43449)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43453)
 				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, 43454), ts+3450, zIn, 43454)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43458), ts+3469, zIn, 43458)
 				return
 			}
 			*(*uint8)(unsafe.Pointer(bp + 128 + uintptr(got))) = uint8(0)
@@ -18228,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, 43512), ts+3279, zPath, 43512)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43516), ts+3298, zPath, 43516)
 		}
 		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, 43518)
+		return Xsqlite3CantopenError(tls, 43522)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+4104)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -18293,7 +18298,7 @@ func unixDlError(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBufOut uintptr) {
 	unixEnterMutex(tls)
 	zErr = libc.Xdlerror(tls)
 	if zErr != 0 {
-		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3663, libc.VaList(bp, zErr))
+		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3682, libc.VaList(bp, zErr))
 	}
 	unixLeaveMutex(tls)
 }
@@ -18325,7 +18330,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 	{
 		var fd int32
 		var got int32
-		fd = robust_open(tls, ts+3794, O_RDONLY, uint32(0))
+		fd = robust_open(tls, ts+3813, O_RDONLY, uint32(0))
 		if fd < 0 {
 			libc.Xtime(tls, bp)
 			libc.Xmemcpy(tls, zBuf, bp, uint64(unsafe.Sizeof(Time_t(0))))
@@ -18336,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, 43619)
+			robust_close(tls, uintptr(0), fd, 43623)
 		}
 
 	}
@@ -18413,10 +18418,10 @@ func Xsqlite3_os_init(tls *libc.TLS) int32 {
 }
 
 var aVfs = [4]Sqlite3_vfs{
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3807, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3812, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3822, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3702, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3826, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3831, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3841, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3721, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
 }
 
 // Shutdown the operating system interface.
@@ -18471,7 +18476,7 @@ var memdb_g MemFS
 var memdb_vfs = Sqlite3_vfs{
 	FiVersion:          2,
 	FmxPathname:        1024,
-	FzName:             ts + 3835,
+	FzName:             ts + 3854,
 	FxOpen:             0,
 	FxAccess:           0,
 	FxFullPathname:     0,
@@ -18727,7 +18732,7 @@ func memdbFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int3
 	var rc int32 = SQLITE_NOTFOUND
 	memdbEnter(tls, p)
 	if op == SQLITE_FCNTL_VFSNAME {
-		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3841, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
+		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3860, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
 		rc = SQLITE_OK
 	}
 	if op == SQLITE_FCNTL_SIZE_LIMIT {
@@ -18859,7 +18864,7 @@ func memdbFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, z
 	defer tls.Free(8)
 
 	_ = pVfs
-	Xsqlite3_snprintf(tls, nOut, zOut, ts+3663, libc.VaList(bp, zPath))
+	Xsqlite3_snprintf(tls, nOut, zOut, ts+3682, libc.VaList(bp, zPath))
 	return SQLITE_OK
 }
 
@@ -18980,7 +18985,7 @@ func Xsqlite3_serialize(tls *libc.TLS, db uintptr, zSchema uintptr, piSize uintp
 		return uintptr(0)
 	}
 	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
-	zSql = Xsqlite3_mprintf(tls, ts+3856, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3875, libc.VaList(bp, zSchema))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, db, zSql, -1, bp+8, uintptr(0))
 	} else {
@@ -19053,7 +19058,7 @@ __1:
 	goto end_deserialize
 __2:
 	;
-	zSql = Xsqlite3_mprintf(tls, ts+3879, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3898, libc.VaList(bp, zSchema))
 	if !(zSql == uintptr(0)) {
 		goto __3
 	}
@@ -19769,7 +19774,7 @@ func pcacheFetchFinishWithInit(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 	libc.Xmemset(tls, pPgHdr+32, 0, uint64(unsafe.Sizeof(PgHdr{}))-uint64(uintptr(0)+32))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpPage = pPage
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpData = (*Sqlite3_pcache_page)(unsafe.Pointer(pPage)).FpBuf
-	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*72
+	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*80
 	libc.Xmemset(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0, uint64(8))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpCache = pCache
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).Fpgno = pgno
@@ -19799,7 +19804,7 @@ func Xsqlite3PcacheFetchFinish(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 // reference count drops to 0, then it is made eligible for recycling.
 func Xsqlite3PcacheRelease(tls *libc.TLS, p uintptr) {
 	(*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FnRefSum--
-	if int32(libc.PreDecInt16(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1)) == 0 {
+	if libc.PreDecInt64(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1) == int64(0) {
 		if int32((*PgHdr)(unsafe.Pointer(p)).Fflags)&PGHDR_CLEAN != 0 {
 			pcacheUnpin(tls, p)
 		} else {
@@ -19850,7 +19855,7 @@ func Xsqlite3PcacheMakeClean(tls *libc.TLS, p uintptr) {
 	*(*U16)(unsafe.Pointer(p + 52)) &= libc.Uint16FromInt32(libc.CplInt32(PGHDR_DIRTY | PGHDR_NEED_SYNC | PGHDR_WRITEABLE))
 	*(*U16)(unsafe.Pointer(p + 52)) |= U16(PGHDR_CLEAN)
 
-	if int32((*PgHdr)(unsafe.Pointer(p)).FnRef) == 0 {
+	if (*PgHdr)(unsafe.Pointer(p)).FnRef == int64(0) {
 		pcacheUnpin(tls, p)
 	}
 }
@@ -19954,8 +19959,8 @@ func Xsqlite3PcacheClear(tls *libc.TLS, pCache uintptr) {
 }
 
 func pcacheMergeDirtyList(tls *libc.TLS, pA uintptr, pB uintptr) uintptr {
-	bp := tls.Alloc(72)
-	defer tls.Free(72)
+	bp := tls.Alloc(80)
+	defer tls.Free(80)
 
 	var pTail uintptr
 	pTail = bp
@@ -20033,13 +20038,13 @@ func Xsqlite3PcacheDirtyList(tls *libc.TLS, pCache uintptr) uintptr {
 //
 // This is not the total number of pages referenced, but the sum of the
 // reference count for all pages.
-func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) int32 {
+func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) I64 {
 	return (*PCache)(unsafe.Pointer(pCache)).FnRefSum
 }
 
 // Return the number of references to the page supplied as an argument.
-func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) int32 {
-	return int32((*PgHdr)(unsafe.Pointer(p)).FnRef)
+func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) I64 {
+	return (*PgHdr)(unsafe.Pointer(p)).FnRef
 }
 
 // Return the total number of pages in the cache.
@@ -22268,7 +22273,7 @@ __27:
 	if !(isHot != 0 && nPlayback != 0) {
 		goto __28
 	}
-	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3894,
+	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3913,
 		libc.VaList(bp, nPlayback, (*Pager)(unsafe.Pointer(pPager)).FzJournal))
 __28:
 	;
@@ -22333,7 +22338,7 @@ func pagerUndoCallback(tls *libc.TLS, pCtx uintptr, iPg Pgno) int32 {
 
 	pPg = Xsqlite3PagerLookup(tls, pPager, iPg)
 	if pPg != 0 {
-		if Xsqlite3PcachePageRefcount(tls, pPg) == 1 {
+		if Xsqlite3PcachePageRefcount(tls, pPg) == int64(1) {
 			Xsqlite3PcacheDrop(tls, pPg)
 		} else {
 			rc = readDbPage(tls, pPg)
@@ -22766,7 +22771,7 @@ func Xsqlite3PagerSetPagesize(tls *libc.TLS, pPager uintptr, pPageSize uintptr,
 	var pageSize U32 = *(*U32)(unsafe.Pointer(pPageSize))
 
 	if (int32((*Pager)(unsafe.Pointer(pPager)).FmemDb) == 0 || (*Pager)(unsafe.Pointer(pPager)).FdbSize == Pgno(0)) &&
-		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 &&
+		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) &&
 		pageSize != 0 && pageSize != U32((*Pager)(unsafe.Pointer(pPager)).FpageSize) {
 		var pNew uintptr = uintptr(0)
 		*(*I64)(unsafe.Pointer(bp)) = int64(0)
@@ -22918,9 +22923,9 @@ func pagerAcquireMapPage(tls *libc.TLS, pPager uintptr, pgno Pgno, pData uintptr
 			Xsqlite3OsUnfetch(tls, (*Pager)(unsafe.Pointer(pPager)).Ffd, I64(pgno-Pgno(1))*(*Pager)(unsafe.Pointer(pPager)).FpageSize, pData)
 			return SQLITE_NOMEM
 		}
-		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*72
+		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*80
 		(*PgHdr)(unsafe.Pointer(p)).Fflags = U16(PGHDR_MMAP)
-		(*PgHdr)(unsafe.Pointer(p)).FnRef = int16(1)
+		(*PgHdr)(unsafe.Pointer(p)).FnRef = int64(1)
 		(*PgHdr)(unsafe.Pointer(p)).FpPager = pPager
 	}
 
@@ -23252,7 +23257,7 @@ func Xsqlite3PagerFlush(tls *libc.TLS, pPager uintptr) int32 {
 
 		for rc == SQLITE_OK && pList != 0 {
 			var pNext uintptr = (*PgHdr)(unsafe.Pointer(pList)).FpDirty
-			if int32((*PgHdr)(unsafe.Pointer(pList)).FnRef) == 0 {
+			if (*PgHdr)(unsafe.Pointer(pList)).FnRef == int64(0) {
 				rc = pagerStress(tls, pPager, pList)
 			}
 			pList = pNext
@@ -23402,7 +23407,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 60235)
+	rc = Xsqlite3CantopenError(tls, 60239)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -23463,7 +23468,7 @@ __15:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzJournal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3921, uint64(8))
+	libc.Xmemcpy(tls, pPtr, ts+3940, uint64(8))
 	pPtr += uintptr(8 + 1)
 	goto __19
 __18:
@@ -23476,7 +23481,7 @@ __19:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzWal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3930, uint64(4))
+	libc.Xmemcpy(tls, pPtr, ts+3949, uint64(4))
 	pPtr += uintptr(4 + 1)
 	goto __21
 __20:
@@ -23528,9 +23533,9 @@ __27:
 	;
 __26:
 	;
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3935, 0))
+	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3954, 0))
 	if !(iDc&SQLITE_IOCAP_IMMUTABLE != 0 ||
-		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3942, 0) != 0) {
+		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3961, 0) != 0) {
 		goto __30
 	}
 	vfsFlags = vfsFlags | SQLITE_OPEN_READONLY
@@ -23783,7 +23788,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60754)
+	rc = Xsqlite3CantopenError(tls, 60758)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23889,7 +23894,7 @@ __24:
 }
 
 func pagerUnlockIfUnused(tls *libc.TLS, pPager uintptr) {
-	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 {
+	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) {
 		pagerUnlockAndRollback(tls, pPager)
 	}
 }
@@ -23907,7 +23912,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60967)
+	return Xsqlite3CorruptError(tls, 60971)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23946,7 +23951,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60999)
+	rc = Xsqlite3CorruptError(tls, 61003)
 	goto pager_acquire_err
 __7:
 	;
@@ -24023,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, 61078)
+		return Xsqlite3CorruptError(tls, 61082)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24781,7 +24786,7 @@ func Xsqlite3PagerMemUsed(tls *libc.TLS, pPager uintptr) int32 {
 
 // Return the number of references to the specified page.
 func Xsqlite3PagerPageRefcount(tls *libc.TLS, pPage uintptr) int32 {
-	return Xsqlite3PcachePageRefcount(tls, pPage)
+	return int32(Xsqlite3PcachePageRefcount(tls, pPage))
 }
 
 // Parameter eStat must be one of SQLITE_DBSTATUS_CACHE_HIT, _MISS, _WRITE,
@@ -25024,9 +25029,9 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	pPgOld = Xsqlite3PagerLookup(tls, pPager, pgno)
 
 	if pPgOld != 0 {
-		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
+		if (*PgHdr)(unsafe.Pointer(pPgOld)).FnRef > int64(1) {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62623)
+			return Xsqlite3CorruptError(tls, 62627)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -25211,7 +25216,7 @@ func Xsqlite3PagerClearCache(tls *libc.TLS, pPager uintptr) {
 func Xsqlite3PagerCheckpoint(tls *libc.TLS, pPager uintptr, db uintptr, eMode int32, pnLog uintptr, pnCkpt uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal == uintptr(0) && int32((*Pager)(unsafe.Pointer(pPager)).FjournalMode) == PAGER_JOURNALMODE_WAL {
-		Xsqlite3_exec(tls, db, ts+3952, uintptr(0), uintptr(0), uintptr(0))
+		Xsqlite3_exec(tls, db, ts+3971, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal != 0 {
 		rc = Xsqlite3WalCheckpoint(tls, (*Pager)(unsafe.Pointer(pPager)).FpWal, db, eMode,
@@ -25783,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, 64387)
+				return Xsqlite3CorruptError(tls, 64391)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25882,7 +25887,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64519)
+	rc = Xsqlite3CantopenError(tls, 64523)
 	goto finished
 __7:
 	;
@@ -26050,7 +26055,7 @@ __24:
 		goto __30
 	}
 	Xsqlite3_log(tls, SQLITE_NOTICE|int32(1)<<8,
-		ts+3970,
+		ts+3989,
 		libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 __30:
 	;
@@ -26468,7 +26473,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65333)
+	rc = Xsqlite3CorruptError(tls, 65337)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -26613,7 +26618,7 @@ func walLimitSize(tls *libc.TLS, pWal uintptr, nMax I64) {
 	}
 	Xsqlite3EndBenignMalloc(tls)
 	if rx != 0 {
-		Xsqlite3_log(tls, rx, ts+4007, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
+		Xsqlite3_log(tls, rx, ts+4026, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 	}
 }
 
@@ -26743,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, 65682)
+		rc = Xsqlite3CantopenError(tls, 65686)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -27216,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, 66419)
+				return Xsqlite3CorruptError(tls, 66423)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -27721,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, 67138)
+			rc = Xsqlite3CorruptError(tls, 67142)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -28114,7 +28119,7 @@ func Xsqlite3BtreeLeaveCursor(tls *libc.TLS, pCur uintptr) {
 	Xsqlite3BtreeLeave(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpBtree)
 }
 
-var zMagicHeader = *(*[16]uint8)(unsafe.Pointer(ts + 4033))
+var zMagicHeader = *(*[16]uint8)(unsafe.Pointer(ts + 4052))
 
 var sqlite3SharedCacheList uintptr = uintptr(0)
 
@@ -28379,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, 69249)
+			rc = Xsqlite3CorruptError(tls, 69253)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -28516,7 +28521,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69434)
 	return
 __2:
 	;
@@ -28533,7 +28538,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69447)
 	goto ptrmap_exit
 __4:
 	;
@@ -28541,7 +28546,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69452)
 	goto ptrmap_exit
 __5:
 	;
@@ -28584,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, 69493)
+		return Xsqlite3CorruptError(tls, 69497)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -28594,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, 69501)
+		return Xsqlite3CorruptError(tls, 69505)
 	}
 	return SQLITE_OK
 }
@@ -28844,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, 69893)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69897)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28891,7 +28896,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69951)
+	return Xsqlite3CorruptError(tls, 69955)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28901,7 +28906,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69954)
+	return Xsqlite3CorruptError(tls, 69958)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28914,7 +28919,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69962)
+	return Xsqlite3CorruptError(tls, 69966)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28923,14 +28928,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69965)
+	return Xsqlite3CorruptError(tls, 69969)
 __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, 69967)
+	return Xsqlite3CorruptError(tls, 69971)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -28940,7 +28945,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69971)
+	return Xsqlite3CorruptError(tls, 69975)
 __11:
 	;
 __8:
@@ -29004,7 +29009,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 70004)
+	return Xsqlite3CorruptError(tls, 70008)
 __22:
 	;
 	size = int32((*struct {
@@ -29014,7 +29019,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 70010)
+	return Xsqlite3CorruptError(tls, 70014)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -29036,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, 70024)
+	return Xsqlite3CorruptError(tls, 70028)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -29071,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, 70081)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70085)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -29084,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, 70096)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70100)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70107)
 	}
 	return uintptr(0)
 }
@@ -29115,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, 70152)
+			return Xsqlite3CorruptError(tls, 70156)
 		}
 	}
 
@@ -29126,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, 70170)
+				return Xsqlite3CorruptError(tls, 70174)
 			} else {
 				return SQLITE_OK
 			}
@@ -29178,22 +29183,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 70249)
+				return Xsqlite3CorruptError(tls, 70253)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 70254)
+			return Xsqlite3CorruptError(tls, 70258)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 70266)
+				return Xsqlite3CorruptError(tls, 70270)
 			}
 			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, 70269)
+				return Xsqlite3CorruptError(tls, 70273)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -29203,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, 70282)
+					return Xsqlite3CorruptError(tls, 70286)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -29211,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, 70288)
+			return Xsqlite3CorruptError(tls, 70292)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -29219,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, 70297)
+			return Xsqlite3CorruptError(tls, 70301)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70298)
+			return Xsqlite3CorruptError(tls, 70302)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -29282,7 +29287,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70357)
+			return Xsqlite3CorruptError(tls, 70361)
 		}
 	} else {
 		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
@@ -29318,7 +29323,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70381)
+			return Xsqlite3CorruptError(tls, 70385)
 		}
 	}
 	return SQLITE_OK
@@ -29348,11 +29353,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70432)
+			return Xsqlite3CorruptError(tls, 70436)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70437)
+				return Xsqlite3CorruptError(tls, 70441)
 			}
 			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))))
@@ -29363,15 +29368,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70447)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70451)
+			return Xsqlite3CorruptError(tls, 70455)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70463)
+		return Xsqlite3CorruptError(tls, 70467)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -29399,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, 70494)
+			return Xsqlite3CorruptError(tls, 70498)
 		}
 		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, 70499)
+			return Xsqlite3CorruptError(tls, 70503)
 		}
 	}
 	return SQLITE_OK
@@ -29420,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, 70531)
+		return Xsqlite3CorruptError(tls, 70535)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -29432,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, 70545)
+		return Xsqlite3CorruptError(tls, 70549)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -29535,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, 70700)
+	rc = Xsqlite3CorruptError(tls, 70704)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -29563,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, 70721)
+	rc = Xsqlite3CorruptError(tls, 70725)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -29602,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, 70787)
+			return Xsqlite3CorruptError(tls, 70791)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -29675,7 +29680,7 @@ func Xsqlite3BtreeOpen(tls *libc.TLS, pVfs uintptr, zFilename uintptr, db uintpt
 	mutexOpen = uintptr(0)
 	rc = SQLITE_OK
 	isTempDb = libc.Bool32(zFilename == uintptr(0) || int32(*(*uint8)(unsafe.Pointer(zFilename))) == 0)
-	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4049) == 0 ||
+	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4068) == 0 ||
 		isTempDb != 0 && Xsqlite3TempInMemory(tls, db) != 0 ||
 		vfsFlags&SQLITE_OPEN_MEMORY != 0)
 
@@ -30447,7 +30452,7 @@ __9:
 	;
 __10:
 	;
-	if !(libc.Xmemcmp(tls, page1+21, ts+4058, uint64(3)) != 0) {
+	if !(libc.Xmemcmp(tls, page1+21, ts+4077, uint64(3)) != 0) {
 		goto __14
 	}
 	goto page1_init_failed
@@ -30485,7 +30490,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71722)
+	rc = Xsqlite3CorruptError(tls, 71726)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30900,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, 72143)
+			return Xsqlite3CorruptError(tls, 72147)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30926,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, 72162)
+						return Xsqlite3CorruptError(tls, 72166)
 					}
 					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)
@@ -30935,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, 72171)
+					return Xsqlite3CorruptError(tls, 72175)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30946,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, 72183)
+				return Xsqlite3CorruptError(tls, 72187)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30962,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, 72218)
+		return Xsqlite3CorruptError(tls, 72222)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -31023,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, 72316)
+			return Xsqlite3CorruptError(tls, 72320)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -31058,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, 72368)
+					return Xsqlite3CorruptError(tls, 72372)
 				}
 			}
 
@@ -31118,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, 72436)
+			rc = Xsqlite3CorruptError(tls, 72440)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -31157,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, 72487)
+			return Xsqlite3CorruptError(tls, 72491)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -31188,7 +31193,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72514)
+			return Xsqlite3CorruptError(tls, 72518)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -31529,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, 72978)
+			return Xsqlite3CorruptError(tls, 72982)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -31773,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, 73385)
+		return Xsqlite3CorruptError(tls, 73389)
 	}
 
 	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, 73400)
+		return Xsqlite3CorruptError(tls, 73404)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -31825,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, 73462)
+				return Xsqlite3CorruptError(tls, 73466)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31874,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, 73547)
+		return Xsqlite3CorruptError(tls, 73551)
 	}
 	return rc
 }
@@ -31954,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, 73684)
+		return Xsqlite3CorruptError(tls, 73688)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -32045,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, 73823)
+	return Xsqlite3CorruptError(tls, 73827)
 __11:
 	;
 skip_init:
@@ -32065,7 +32070,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73835)
+	return Xsqlite3CorruptError(tls, 73839)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -32275,7 +32280,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 74077)
+	return Xsqlite3CorruptError(tls, 74081)
 __21:
 	;
 	goto __19
@@ -32479,7 +32484,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 74273)
+	return Xsqlite3CorruptError(tls, 74277)
 __4:
 	;
 	goto bypass_moveto_root
@@ -32544,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, 74360)
+	rc = Xsqlite3CorruptError(tls, 74364)
 	goto moveto_index_finish
 __17:
 	;
@@ -32592,7 +32597,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74392)
+	rc = Xsqlite3CorruptError(tls, 74396)
 __24:
 	;
 	goto moveto_index_finish
@@ -32711,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, 74508)
+		return Xsqlite3CorruptError(tls, 74512)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32871,7 +32876,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74688)
+	return Xsqlite3CorruptError(tls, 74692)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32936,7 +32941,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74744)
+	rc = Xsqlite3CorruptError(tls, 74748)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -32972,7 +32977,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74773)
+	rc = Xsqlite3CorruptError(tls, 74777)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -33016,7 +33021,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74807)
+	rc = Xsqlite3CorruptError(tls, 74811)
 	goto end_allocate_page
 __32:
 	;
@@ -33128,7 +33133,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74872)
+	rc = Xsqlite3CorruptError(tls, 74876)
 	goto end_allocate_page
 __51:
 	;
@@ -33286,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, 74999)
+	return Xsqlite3CorruptError(tls, 75003)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -33343,7 +33348,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75050)
 	goto freepage_out
 __10:
 	;
@@ -33359,7 +33364,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75061)
 	goto freepage_out
 __12:
 	;
@@ -33433,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, 75146)
+		return Xsqlite3CorruptError(tls, 75150)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -33445,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, 75163)
+			return Xsqlite3CorruptError(tls, 75167)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -33456,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, 75183)
+			rc = Xsqlite3CorruptError(tls, 75187)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -33621,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, 75436)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75440)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -33900,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, 75737)
+				return Xsqlite3CorruptError(tls, 75741)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75742)
+			return Xsqlite3CorruptError(tls, 75746)
 		}
 
 		pData -= uintptr(sz)
@@ -33913,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, 75748)
+			return Xsqlite3CorruptError(tls, 75752)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -33973,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, 75833)
+			Xsqlite3CorruptError(tls, 75837)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -34062,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, 75947)
+	return Xsqlite3CorruptError(tls, 75951)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -34178,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, 76060)
+		return Xsqlite3CorruptError(tls, 76064)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -34498,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, 76481)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76485)
 	goto balance_cleanup
 __25:
 	;
@@ -34509,7 +34514,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76509)
 	goto balance_cleanup
 __27:
 	;
@@ -34667,7 +34672,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76610)
 	goto balance_cleanup
 __55:
 	;
@@ -34741,7 +34746,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76643)
 	goto balance_cleanup
 __67:
 	;
@@ -34804,7 +34809,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76687)
 	goto balance_cleanup
 __75:
 	;
@@ -34832,7 +34837,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76720)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -35093,7 +35098,7 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76920)
 	goto balance_cleanup
 __121:
 	;
@@ -35285,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, 77146)
+			return Xsqlite3CorruptError(tls, 77150)
 		}
 	}
 	return SQLITE_OK
@@ -35323,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, 77206)
+			rc = Xsqlite3CorruptError(tls, 77210)
 		} 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)))
@@ -35429,7 +35434,7 @@ func btreeOverwriteOverflowCell(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, 77370)
+			rc = Xsqlite3CorruptError(tls, 77374)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -35454,7 +35459,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 
 	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)
+		return Xsqlite3CorruptError(tls, 77402)
 	}
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
 		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
@@ -35524,7 +35529,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77479)
+	return Xsqlite3CorruptError(tls, 77483)
 __3:
 	;
 __1:
@@ -35637,7 +35642,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77606)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -35697,6 +35702,7 @@ __30:
 __25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
+	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
 		goto __31
 	}
@@ -35704,7 +35710,7 @@ __25:
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
 		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77640)
+	return Xsqlite3CorruptError(tls, 77645)
 __33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
@@ -35742,13 +35748,13 @@ __37:
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77667)
+	return Xsqlite3CorruptError(tls, 77672)
 __39:
 	;
 	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __40
 	}
-	return Xsqlite3CorruptError(tls, 77670)
+	return Xsqlite3CorruptError(tls, 77675)
 __40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
@@ -35779,7 +35785,6 @@ __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 __44
 	}
@@ -35854,7 +35859,7 @@ 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, 77773)
+		return Xsqlite3CorruptError(tls, 77777)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
@@ -35879,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, 77798)
+				return Xsqlite3CorruptError(tls, 77802)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35980,7 +35985,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77894)
+			return Xsqlite3CorruptError(tls, 77898)
 		}
 	}
 
@@ -35988,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, 77903)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 	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, 77907)
+		return Xsqlite3CorruptError(tls, 77911)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -36067,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, 77998)
+			return Xsqlite3CorruptError(tls, 78002)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -36136,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, 78114)
+			return Xsqlite3CorruptError(tls, 78118)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -36165,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, 78162)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78166)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -36241,7 +36246,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 78252)
+	return Xsqlite3CorruptError(tls, 78256)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -36255,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, 78259)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78263)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -36389,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, 78363)
+		return Xsqlite3CorruptError(tls, 78367)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -36606,7 +36611,7 @@ 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+64, ts+4062, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4081, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
 		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
@@ -36631,11 +36636,11 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 	defer tls.Free(16)
 
 	if iPage > (*IntegrityCk)(unsafe.Pointer(pCheck)).FnPage || iPage == Pgno(0) {
-		checkAppendMsg(tls, pCheck, ts+4064, libc.VaList(bp, iPage))
+		checkAppendMsg(tls, pCheck, ts+4083, libc.VaList(bp, iPage))
 		return 1
 	}
 	if getPageReferenced(tls, pCheck, iPage) != 0 {
-		checkAppendMsg(tls, pCheck, ts+4087, libc.VaList(bp+8, iPage))
+		checkAppendMsg(tls, pCheck, ts+4106, libc.VaList(bp+8, iPage))
 		return 1
 	}
 	setPageReferenced(tls, pCheck, iPage)
@@ -36653,13 +36658,13 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
 			checkOom(tls, pCheck)
 		}
-		checkAppendMsg(tls, pCheck, ts+4112, libc.VaList(bp, iChild))
+		checkAppendMsg(tls, pCheck, ts+4131, libc.VaList(bp, iChild))
 		return
 	}
 
 	if int32(*(*U8)(unsafe.Pointer(bp + 48))) != int32(eType) || *(*Pgno)(unsafe.Pointer(bp + 52)) != iParent {
 		checkAppendMsg(tls, pCheck,
-			ts+4141,
+			ts+4160,
 			libc.VaList(bp+8, iChild, int32(eType), iParent, int32(*(*U8)(unsafe.Pointer(bp + 48))), *(*Pgno)(unsafe.Pointer(bp + 52))))
 	}
 }
@@ -36678,7 +36683,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 		}
 		N--
 		if Xsqlite3PagerGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpPager, iPage, bp+40, 0) != 0 {
-			checkAppendMsg(tls, pCheck, ts+4195, libc.VaList(bp, iPage))
+			checkAppendMsg(tls, pCheck, ts+4214, libc.VaList(bp, iPage))
 			break
 		}
 		pOvflData = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
@@ -36689,7 +36694,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 			}
 			if n > (*BtShared)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt)).FusableSize/U32(4)-U32(2) {
 				checkAppendMsg(tls, pCheck,
-					ts+4217, libc.VaList(bp+8, iPage))
+					ts+4236, libc.VaList(bp+8, iPage))
 				N--
 			} else {
 				for i = 0; i < int32(n); i++ {
@@ -36712,12 +36717,12 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 	}
 	if N != 0 && nErrAtStart == (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr {
 		checkAppendMsg(tls, pCheck,
-			ts+4256,
+			ts+4275,
 			libc.VaList(bp+16, func() uintptr {
 				if isFreeList != 0 {
-					return ts + 4282
+					return ts + 4301
 				}
-				return ts + 4287
+				return ts + 4306
 			}(),
 				expected-N, expected))
 	}
@@ -36833,13 +36838,13 @@ __2:
 	return 0
 __3:
 	;
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4308
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4327
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
 		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4318, libc.VaList(bp, rc))
+		ts+4337, libc.VaList(bp, rc))
 	goto end_of_check
 __4:
 	;
@@ -36850,7 +36855,7 @@ __4:
 	}
 
 	checkAppendMsg(tls, pCheck,
-		ts+4356, libc.VaList(bp+8, rc))
+		ts+4375, libc.VaList(bp+8, rc))
 	goto end_of_check
 __5:
 	;
@@ -36858,14 +36863,14 @@ __5:
 		goto __6
 	}
 
-	checkAppendMsg(tls, pCheck, ts+4394, libc.VaList(bp+16, rc))
+	checkAppendMsg(tls, pCheck, ts+4413, libc.VaList(bp+16, rc))
 	goto end_of_check
 __6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
 
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4416
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4435
 	contentOffset = U32((int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5))))<<8|int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5) + 1)))-1)&0xffff + 1)
 
 	nCell = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3) + 1)))
@@ -36882,7 +36887,7 @@ __6:
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
 		goto __9
 	}
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4442
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4461
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
 __9:
 	;
@@ -36907,7 +36912,7 @@ __10:
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
 		goto __13
 	}
-	checkAppendMsg(tls, pCheck, ts+4470,
+	checkAppendMsg(tls, pCheck, ts+4489,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
 	goto __11
@@ -36920,7 +36925,7 @@ __13:
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
 		goto __14
 	}
-	checkAppendMsg(tls, pCheck, ts+4500, 0)
+	checkAppendMsg(tls, pCheck, ts+4519, 0)
 	doCoverageCheck = 0
 	goto __11
 __14:
@@ -36936,7 +36941,7 @@ __14:
 	}() != 0) {
 		goto __16
 	}
-	checkAppendMsg(tls, pCheck, ts+4524, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
+	checkAppendMsg(tls, pCheck, ts+4543, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
 __16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
@@ -36974,7 +36979,7 @@ __21:
 	if !(d2 != depth) {
 		goto __22
 	}
-	checkAppendMsg(tls, pCheck, ts+4548, 0)
+	checkAppendMsg(tls, pCheck, ts+4567, 0)
 	depth = d2
 __22:
 	;
@@ -37047,7 +37052,7 @@ __30:
 		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4573, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
+		ts+4592, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
 	goto __31
 	goto __33
 __32:
@@ -37064,7 +37069,7 @@ __31:
 		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4610,
+		ts+4629,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
 __34:
 	;
@@ -37178,7 +37183,7 @@ __6:
 	if !(bCkFreelist != 0) {
 		goto __7
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4662
+	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4681
 	checkList(tls, bp+32, 1, Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+32),
 		Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
@@ -37214,7 +37219,7 @@ __13:
 		goto __15
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4678,
+		ts+4697,
 		libc.VaList(bp, mx, mxInHdr))
 __15:
 	;
@@ -37224,7 +37229,7 @@ __9:
 		goto __16
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4723, 0)
+		ts+4742, 0)
 __16:
 	;
 __10:
@@ -37271,13 +37276,13 @@ __23:
 	if !(getPageReferenced(tls, bp+32, i) == 0 && (ptrmapPageno(tls, pBt, i) != i || !(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0))) {
 		goto __26
 	}
-	checkAppendMsg(tls, bp+32, ts+4778, libc.VaList(bp+16, i))
+	checkAppendMsg(tls, bp+32, ts+4797, libc.VaList(bp+16, i))
 __26:
 	;
 	if !(getPageReferenced(tls, bp+32, i) != 0 && (ptrmapPageno(tls, pBt, i) == i && (*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0)) {
 		goto __27
 	}
-	checkAppendMsg(tls, bp+32, ts+4800, libc.VaList(bp+24, i))
+	checkAppendMsg(tls, bp+32, ts+4819, libc.VaList(bp+24, i))
 __27:
 	;
 	goto __24
@@ -37540,7 +37545,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 		var rc int32 = 0
 		Xsqlite3ParseObjectInit(tls, bp+16, pDb)
 		if Xsqlite3OpenTempDatabase(tls, bp+16) != 0 {
-			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3663, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3682, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 			rc = SQLITE_ERROR
 		}
 		Xsqlite3DbFree(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
@@ -37551,7 +37556,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 	}
 
 	if i < 0 {
-		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4834, libc.VaList(bp+8, zDb))
+		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4853, libc.VaList(bp+8, zDb))
 		return uintptr(0)
 	}
 
@@ -37566,7 +37571,7 @@ func setDestPgsz(tls *libc.TLS, p uintptr) int32 {
 
 func checkReadTransaction(tls *libc.TLS, db uintptr, p uintptr) int32 {
 	if Xsqlite3BtreeTxnState(tls, p) != SQLITE_TXN_NONE {
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4854, 0)
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4873, 0)
 		return SQLITE_ERROR
 	}
 	return SQLITE_OK
@@ -37586,7 +37591,7 @@ func Xsqlite3_backup_init(tls *libc.TLS, pDestDb uintptr, zDestDb uintptr, pSrcD
 
 	if pSrcDb == pDestDb {
 		Xsqlite3ErrorWithMsg(tls,
-			pDestDb, SQLITE_ERROR, ts+4885, 0)
+			pDestDb, SQLITE_ERROR, ts+4904, 0)
 		p = uintptr(0)
 	} else {
 		p = Xsqlite3MallocZero(tls, uint64(unsafe.Sizeof(Sqlite3_backup{})))
@@ -38035,7 +38040,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 		(*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,
+		Xsqlite3_str_appendf(tls, bp+16, ts+4944,
 			libc.VaList(bp, func() float64 {
 				if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_IntReal != 0 {
 					return float64(*(*I64)(unsafe.Pointer(p)))
@@ -38627,7 +38632,7 @@ func Xsqlite3VdbeMemSetPointer(tls *libc.TLS, pMem uintptr, pPtr uintptr, zPType
 		if zPType != 0 {
 			return zPType
 		}
-		return ts + 1554
+		return ts + 1573
 	}()
 	(*Mem)(unsafe.Pointer(pMem)).Fz = pPtr
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null | MEM_Dyn | MEM_Subtype | MEM_Term)
@@ -38859,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, 81630)
+		return Xsqlite3CorruptError(tls, 81634)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -39091,7 +39096,7 @@ __9:
 		goto __10
 	}
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 8)).FisError
-	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3663, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
+	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3682, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
 	goto __11
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
@@ -39144,7 +39149,7 @@ func valueFromExpr(tls *libc.TLS, db uintptr, pExpr uintptr, enc U8, affinity U8
 	zVal = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	negInt = 1
-	zNeg = ts + 1554
+	zNeg = ts + 1573
 	rc = SQLITE_OK
 
 __1:
@@ -39185,7 +39190,7 @@ __4:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
 	negInt = -1
-	zNeg = ts + 4932
+	zNeg = ts + 4951
 __6:
 	;
 	if !(op == TK_STRING || op == TK_FLOAT || op == TK_INTEGER) {
@@ -39204,7 +39209,7 @@ __9:
 	Xsqlite3VdbeMemSetInt64(tls, *(*uintptr)(unsafe.Pointer(bp + 16)), I64(*(*int32)(unsafe.Pointer(pExpr + 8)))*I64(negInt))
 	goto __11
 __10:
-	zVal = Xsqlite3MPrintf(tls, db, ts+4934, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+	zVal = Xsqlite3MPrintf(tls, db, ts+4953, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	if !(zVal == uintptr(0)) {
 		goto __12
 	}
@@ -39508,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, 82270)
+		return Xsqlite3CorruptError(tls, 82274)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -39523,14 +39528,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 82276)
+			return Xsqlite3CorruptError(tls, 82280)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 82282)
+		return Xsqlite3CorruptError(tls, 82286)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -40538,34 +40543,34 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var j int32
 			var pKeyInfo uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4939, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4958, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
 			for j = 0; j < int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField); j++ {
 				var pColl uintptr = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(j)*8))
 				var zColl uintptr
 				if pColl != 0 {
 					zColl = (*CollSeq)(unsafe.Pointer(pColl)).FzName
 				} else {
-					zColl = ts + 1554
+					zColl = ts + 1573
 				}
-				if libc.Xstrcmp(tls, zColl, ts+1099) == 0 {
-					zColl = ts + 4944
+				if libc.Xstrcmp(tls, zColl, ts+1118) == 0 {
+					zColl = ts + 4963
 				}
-				Xsqlite3_str_appendf(tls, bp+144, ts+4946,
+				Xsqlite3_str_appendf(tls, bp+144, ts+4965,
 					libc.VaList(bp+8, func() uintptr {
 						if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_DESC != 0 {
-							return ts + 4932
+							return ts + 4951
 						}
-						return ts + 1554
+						return ts + 1573
 					}(),
 						func() uintptr {
 							if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_BIGNULL != 0 {
-								return ts + 4954
+								return ts + 4973
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						zColl))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4957, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+4976, 1)
 			break
 
 		}
@@ -40573,7 +40578,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 		{
 			var pColl uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4959, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
+			Xsqlite3_str_appendf(tls, bp+144, ts+4978, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
 				encnames[(*CollSeq)(unsafe.Pointer(pColl)).Fenc]))
 			break
 
@@ -40581,32 +40586,32 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -7:
 		{
 			var pDef uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
-			Xsqlite3_str_appendf(tls, bp+144, ts+4968, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4987, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -15:
 		{
 			var pDef uintptr = (*Sqlite3_context)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpFunc
-			Xsqlite3_str_appendf(tls, bp+144, ts+4968, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4987, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -13:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1334, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1353, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
 	case -3:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+4975, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4994, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
 			break
 
 		}
 	case -12:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1328, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1347, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
@@ -40616,13 +40621,13 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Str != 0 {
 				zP4 = (*Mem)(unsafe.Pointer(pMem)).Fz
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1334, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1353, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1328, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1347, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Null != 0 {
-				zP4 = ts + 1555
+				zP4 = ts + 1574
 			} else {
-				zP4 = ts + 4978
+				zP4 = ts + 4997
 			}
 			break
 
@@ -40630,7 +40635,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -11:
 		{
 			var pVtab uintptr = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-			Xsqlite3_str_appendf(tls, bp+144, ts+4985, libc.VaList(bp+120, pVtab))
+			Xsqlite3_str_appendf(tls, bp+144, ts+5004, libc.VaList(bp+120, pVtab))
 			break
 
 		}
@@ -40641,20 +40646,20 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var n U32 = *(*U32)(unsafe.Pointer(ai))
 
 			for i = U32(1); i <= n; i++ {
-				Xsqlite3_str_appendf(tls, bp+144, ts+4993, libc.VaList(bp+128, func() int32 {
+				Xsqlite3_str_appendf(tls, bp+144, ts+5012, libc.VaList(bp+128, func() int32 {
 					if i == U32(1) {
 						return '['
 					}
 					return ','
 				}(), *(*U32)(unsafe.Pointer(ai + uintptr(i)*4))))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4998, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+5017, 1)
 			break
 
 		}
 	case -4:
 		{
-			zP4 = ts + 5000
+			zP4 = ts + 5019
 			break
 
 		}
@@ -40679,7 +40684,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	return Xsqlite3StrAccumFinish(tls, bp+144)
 }
 
-var encnames = [4]uintptr{ts + 5008, ts + 5010, ts + 5012, ts + 5017}
+var encnames = [4]uintptr{ts + 5027, ts + 5029, ts + 5031, ts + 5036}
 
 // Declare to the Vdbe that the BTree object at db->aDb[i] is used.
 //
@@ -41129,8 +41134,8 @@ func Xsqlite3VdbeMakeReady(tls *libc.TLS, p uintptr, pParse uintptr) {
 }
 
 var azColName = [12]uintptr{
-	ts + 5022, ts + 5027, ts + 5034, ts + 5037, ts + 5040, ts + 5043, ts + 5046, ts + 5049,
-	ts + 5057, ts + 5060, ts + 5067, ts + 5075,
+	ts + 5041, ts + 5046, ts + 5053, ts + 5056, ts + 5059, ts + 5062, ts + 5065, ts + 5068,
+	ts + 5076, ts + 5079, ts + 5086, ts + 5094,
 }
 
 // Close a VDBE cursor and release all the resources that cursor
@@ -41339,7 +41344,7 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		var nMainFile int32
 
 		nMainFile = Xsqlite3Strlen30(tls, zMainFile)
-		zSuper = Xsqlite3MPrintf(tls, db, ts+5082, libc.VaList(bp, 0, zMainFile, 0))
+		zSuper = Xsqlite3MPrintf(tls, db, ts+5101, libc.VaList(bp, 0, zMainFile, 0))
 		if zSuper == uintptr(0) {
 			return SQLITE_NOMEM
 		}
@@ -41347,16 +41352,16 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		for __ccgo := true; __ccgo; __ccgo = rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 60)) != 0 {
 			if retryCount != 0 {
 				if retryCount > 100 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5094, libc.VaList(bp+24, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5113, libc.VaList(bp+24, zSuper))
 					Xsqlite3OsDelete(tls, pVfs, zSuper, 0)
 					break
 				} else if retryCount == 1 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5108, libc.VaList(bp+32, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5127, libc.VaList(bp+32, zSuper))
 				}
 			}
 			retryCount++
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
-			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5123,
+			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5142,
 				libc.VaList(bp+40, *(*U32)(unsafe.Pointer(bp + 56))>>8&U32(0xffffff), *(*U32)(unsafe.Pointer(bp + 56))&U32(0xff)))
 
 			rc = Xsqlite3OsAccess(tls, pVfs, zSuper, SQLITE_ACCESS_EXISTS, bp+60)
@@ -41502,7 +41507,7 @@ func Xsqlite3VdbeCheckFk(tls *libc.TLS, p uintptr, deferred int32) int32 {
 		!(deferred != 0) && (*Vdbe)(unsafe.Pointer(p)).FnFkConstraint > int64(0) {
 		(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_CONSTRAINT | int32(3)<<8
 		(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
-		Xsqlite3VdbeError(tls, p, ts+5136, 0)
+		Xsqlite3VdbeError(tls, p, ts+5155, 0)
 		if int32((*Vdbe)(unsafe.Pointer(p)).FprepFlags)&SQLITE_PREPARE_SAVESQL == 0 {
 			return SQLITE_ERROR
 		}
@@ -41834,7 +41839,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 86058)
+		return Xsqlite3CorruptError(tls, 86062)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -42385,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, 86985))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86989))
 		return 0
 	}
 
@@ -42450,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, 87062))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87066))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -42484,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, 87092))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87096))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -42534,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, 87136))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87140))
 			return 0
 		}
 	}
@@ -42680,7 +42685,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87303))
 	return 0
 __7:
 	;
@@ -42851,7 +42856,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87457)
+	return Xsqlite3CorruptError(tls, 87461)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42877,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, 87490)
+		return Xsqlite3CorruptError(tls, 87494)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -42988,13 +42993,13 @@ func Xsqlite3NotPureFunc(tls *libc.TLS, pCtx uintptr) int32 {
 		var zContext uintptr
 		var zMsg uintptr
 		if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_IsCheck != 0 {
-			zContext = ts + 5166
-		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5185
-		} else {
+		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5204
+		} else {
+			zContext = ts + 5223
 		}
-		zMsg = Xsqlite3_mprintf(tls, ts+5213,
+		zMsg = Xsqlite3_mprintf(tls, ts+5232,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx)).FpFunc)).FzName, zContext))
 		Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 		Xsqlite3_free(tls, zMsg)
@@ -43099,7 +43104,7 @@ func Xsqlite3_expired(tls *libc.TLS, pStmt uintptr) int32 {
 
 func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 	if (*Vdbe)(unsafe.Pointer(p)).Fdb == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5249, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5268, 0)
 		return 1
 	} else {
 		return 0
@@ -43109,7 +43114,7 @@ func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 
 func vdbeSafetyNotNull(tls *libc.TLS, p uintptr) int32 {
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5294, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5313, 0)
 		return 1
 	} else {
 		return vdbeSafety(tls, p)
@@ -43151,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, 87854)
+			return Xsqlite3MisuseError(tls, 87858)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -43599,7 +43604,7 @@ func Xsqlite3_result_error_code(tls *libc.TLS, pCtx uintptr, errCode int32) {
 // Force an SQLITE_TOOBIG error.
 func Xsqlite3_result_error_toobig(tls *libc.TLS, pCtx uintptr) {
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FisError = SQLITE_TOOBIG
-	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5334, int64(-1),
+	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5353, int64(-1),
 		uint8(SQLITE_UTF8), uintptr(0))
 }
 
@@ -43791,7 +43796,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88544)
+		return Xsqlite3MisuseError(tls, 88548)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -44311,15 +44316,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 89208)
+		return Xsqlite3MisuseError(tls, 89212)
 	}
 	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+5357, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 89216)
+			ts+5376, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89220)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -44734,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, 89707)
+	rc = Xsqlite3MisuseError(tls, 89711)
 	goto preupdate_old_out
 __1:
 	;
@@ -44878,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, 89809)
+	rc = Xsqlite3MisuseError(tls, 89813)
 	goto preupdate_new_out
 __1:
 	;
@@ -45050,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+5397, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5416, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -45086,11 +45091,11 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 
 			pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr(*(*int32)(unsafe.Pointer(bp + 84))-1)*56
 			if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Null != 0 {
-				Xsqlite3_str_append(tls, bp+48, ts+1555, 4)
+				Xsqlite3_str_append(tls, bp+48, ts+1574, 4)
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+1334, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+1353, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+4925, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+4944, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Str != 0 {
 				var nOut int32
 				var enc U8 = (*Sqlite3)(unsafe.Pointer(db)).Fenc
@@ -45105,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+5401, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5420, 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+5408, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5427, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5421, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5440, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					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_appendf(tls, bp+48, ts+5443, libc.VaList(bp+40, int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5429, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5448, 1)
 			}
 		}
 	}
@@ -45322,10 +45327,6 @@ func filterHash(tls *libc.TLS, aMem uintptr, pOp uintptr) U64 {
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Real != 0 {
 			h = h + U64(Xsqlite3VdbeIntValue(tls, p))
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&(MEM_Str|MEM_Blob) != 0 {
-			h = h + U64((*Mem)(unsafe.Pointer(p)).Fn)
-			if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Zero != 0 {
-				h = h + U64(*(*int32)(unsafe.Pointer(p)))
-			}
 		}
 	}
 	return h
@@ -45336,11 +45337,11 @@ func vdbeMemTypeName(tls *libc.TLS, pMem uintptr) uintptr {
 }
 
 var azTypes = [5]uintptr{
-	ts + 1115,
-	ts + 1127,
-	ts + 1132,
-	ts + 1110,
-	ts + 1555,
+	ts + 1134,
+	ts + 1146,
+	ts + 1151,
+	ts + 1129,
+	ts + 1574,
 }
 
 // Execute as much of a VDBE program as we can.
@@ -46382,20 +46383,20 @@ __202:
 		goto __205
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5431, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	Xsqlite3VdbeError(tls, p, ts+5450, 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))))
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5471, 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))))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	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))
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5478, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 __204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
@@ -47973,7 +47974,7 @@ op_column_corrupt:
 	goto __9
 	goto __425
 __424:
-	rc = Xsqlite3CorruptError(tls, 93317)
+	rc = Xsqlite3CorruptError(tls, 93320)
 	goto abort_due_to_error
 __425:
 	;
@@ -48101,7 +48102,7 @@ __428:
 	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5483,
+	Xsqlite3VdbeError(tls, p, ts+5502,
 		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
@@ -48533,7 +48534,7 @@ __78:
 		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5524, 0)
+	Xsqlite3VdbeError(tls, p, ts+5543, 0)
 	rc = SQLITE_BUSY
 	goto __523
 __522:
@@ -48593,7 +48594,7 @@ __530:
 	if !!(pSavepoint != 0) {
 		goto __531
 	}
-	Xsqlite3VdbeError(tls, p, ts+5575, libc.VaList(bp+88, zName))
+	Xsqlite3VdbeError(tls, p, ts+5594, libc.VaList(bp+88, zName))
 	rc = SQLITE_ERROR
 	goto __532
 __531:
@@ -48602,7 +48603,7 @@ __531:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5597, 0)
+		ts+5616, 0)
 	rc = SQLITE_BUSY
 	goto __534
 __533:
@@ -48788,7 +48789,7 @@ __564:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5651, 0)
+		ts+5670, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
 	goto __567
@@ -48831,13 +48832,13 @@ __562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5706
+				return ts + 5725
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5754
+					return ts + 5773
 				}
-				return ts + 5797
+				return ts + 5816
 			}()
 		}(), 0)
 
@@ -48920,7 +48921,7 @@ __576:
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5838)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5857)
 
 	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 __583
@@ -49124,7 +49125,7 @@ __88:
 	}
 
 	(*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
+	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1573
 __602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -49733,7 +49734,7 @@ notExistsWithKey:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
 		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95560)
+	rc = Xsqlite3CorruptError(tls, 95563)
 	goto __683
 __682:
 	goto jump_to_p2
@@ -50511,7 +50512,7 @@ __767:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
 		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5866)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96638, ts+5885)
 	goto abort_due_to_error
 __770:
 	;
@@ -50621,7 +50622,7 @@ __780:
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
 		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96840)
+	rc = Xsqlite3CorruptError(tls, 96843)
 	goto abort_due_to_error
 __781:
 	;
@@ -50782,14 +50783,14 @@ __141:
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	goto __799
 __798:
-	zSchema = ts + 5883
+	zSchema = ts + 5902
 	(*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+5897,
+		ts+5916,
 		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 __800
@@ -50815,7 +50816,7 @@ __802:
 		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 97092)
+	rc = Xsqlite3CorruptError(tls, 97095)
 __803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
@@ -51005,7 +51006,7 @@ __820:
 		goto __825
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5940, 0)
+	Xsqlite3VdbeError(tls, p, ts+5959, 0)
 	goto abort_due_to_error
 __825:
 	;
@@ -51317,7 +51318,7 @@ __860:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
 		goto __862
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
 __862:
 	;
@@ -51367,7 +51368,7 @@ __867:
 	if !(rc != 0) {
 		goto __868
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
 __868:
 	;
@@ -51449,12 +51450,12 @@ __876:
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5977,
+		ts+5996,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6029
+				return ts + 6048
 			}
-			return ts + 6034
+			return ts + 6053
 		}()))
 	goto abort_due_to_error
 	goto __879
@@ -51596,7 +51597,7 @@ __171:
 		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6041, libc.VaList(bp+144, z1))
+	Xsqlite3VdbeError(tls, p, ts+6060, libc.VaList(bp+144, z1))
 __894:
 	;
 	goto abort_due_to_error
@@ -51714,7 +51715,7 @@ __904:
 	(*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+6070, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6089, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
 	goto __9
 
 __177:
@@ -51803,7 +51804,7 @@ __912:
 	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)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
 __913:
 	;
@@ -52033,7 +52034,7 @@ __935:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
 		goto __940
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
 __940:
 	;
@@ -52109,7 +52110,7 @@ __945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
 		goto __947
 	}
-	z3 = Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp+168, zTrace))
+	z3 = Xsqlite3MPrintf(tls, db, ts+6099, 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)
@@ -52182,7 +52183,7 @@ __955:
 	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __957
 	}
-	rc = Xsqlite3CorruptError(tls, 99031)
+	rc = Xsqlite3CorruptError(tls, 99034)
 __957:
 	;
 __956:
@@ -52190,13 +52191,13 @@ __956:
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
 		goto __958
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
 __958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
 
-	Xsqlite3_log(tls, rc, ts+6086,
+	Xsqlite3_log(tls, rc, ts+6105,
 		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 __959
@@ -52252,13 +52253,13 @@ __966:
 	return rc
 
 too_big:
-	Xsqlite3VdbeError(tls, p, ts+5334, 0)
+	Xsqlite3VdbeError(tls, p, ts+5353, 0)
 	rc = SQLITE_TOOBIG
 	goto abort_due_to_error
 
 no_mem:
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3VdbeError(tls, p, ts+1490, 0)
+	Xsqlite3VdbeError(tls, p, ts+1509, 0)
 	rc = SQLITE_NOMEM
 	goto abort_due_to_error
 
@@ -52269,8 +52270,8 @@ abort_due_to_interrupt:
 	return int32(0)
 }
 
-var azType = [4]uintptr{ts + 6118, ts + 6127, ts + 6134,
-	ts + 6140}
+var azType = [4]uintptr{ts + 6137, ts + 6146, ts + 6153,
+	ts + 6159}
 var and_logic = [9]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(1), uint8(2), uint8(0), uint8(2), uint8(2)}
 var or_logic = [9]uint8{uint8(0), uint8(1), uint8(2), uint8(1), uint8(1), uint8(1), uint8(2), uint8(1), uint8(2)}
 var aMask = [12]uint8{
@@ -52325,16 +52326,16 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		}
 
 		if type1 < U32(12) {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6152,
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6171,
 				libc.VaList(bp, func() uintptr {
 					if type1 == U32(0) {
-						return ts + 6181
+						return ts + 6200
 					}
 					return func() uintptr {
 						if type1 == U32(7) {
-							return ts + 6186
+							return ts + 6205
 						}
-						return ts + 6191
+						return ts + 6210
 					}()
 				}()))
 			rc = SQLITE_ERROR
@@ -52354,10 +52355,10 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		rc = Xsqlite3_finalize(tls, (*Incrblob)(unsafe.Pointer(p)).FpStmt)
 		(*Incrblob)(unsafe.Pointer(p)).FpStmt = uintptr(0)
 		if rc == SQLITE_OK {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6199, libc.VaList(bp+8, iRow))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6218, libc.VaList(bp+8, iRow))
 			rc = SQLITE_ERROR
 		} else {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3663, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3682, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
 		}
 	}
 
@@ -52417,21 +52418,21 @@ __3:
 		goto __4
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6219, libc.VaList(bp, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6238, libc.VaList(bp, zTable))
 __4:
 	;
 	if !(pTab != 0 && !((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0))) {
 		goto __5
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6249, libc.VaList(bp+8, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6268, libc.VaList(bp+8, zTable))
 __5:
 	;
 	if !(pTab != 0 && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __6
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6285, libc.VaList(bp+16, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6304, libc.VaList(bp+16, zTable))
 __6:
 	;
 	if !!(pTab != 0) {
@@ -52475,7 +52476,7 @@ __11:
 		goto __13
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6325, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52502,7 +52503,7 @@ __19:
 	if !((*sColMap)(unsafe.Pointer(pFKey+64+uintptr(j)*16)).FiFrom == iCol) {
 		goto __22
 	}
-	zFault = ts + 6327
+	zFault = ts + 6346
 __22:
 	;
 	goto __20
@@ -52535,7 +52536,7 @@ __26:
 	if !(int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == iCol || int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == -2) {
 		goto __29
 	}
-	zFault = ts + 6339
+	zFault = ts + 6358
 __29:
 	;
 	goto __27
@@ -52556,7 +52557,7 @@ __25:
 		goto __30
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6366, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52654,7 +52655,7 @@ __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
@@ -52702,7 +52703,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99516)
+		return Xsqlite3MisuseError(tls, 99519)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52785,7 +52786,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99616)
+		return Xsqlite3MisuseError(tls, 99619)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52798,7 +52799,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 				if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-					return ts + 3663
+					return ts + 3682
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
@@ -55327,25 +55328,25 @@ 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 {
+	if Xsqlite3_strnicmp(tls, zTab, ts+6400, 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 {
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6408+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
 			return 1
 		}
 		if pSchema == uintptr(0) {
 			return 0
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5883+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5902+7) == 0 {
 			return 1
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6446+7) == 0 {
 			return 1
 		}
 	} else {
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6446+7) == 0 {
 			return 1
 		}
 	}
@@ -55425,7 +55426,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6441, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6460, zDb) == 0) {
 		goto __8
 	}
 
@@ -55546,7 +55547,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6446) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6465) != 0) {
 		goto __33
 	}
 	goto __14
@@ -55720,14 +55721,14 @@ __60:
 	;
 	goto __59
 __58:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6448, zTab) == 0) {
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6467, zTab) == 0) {
 		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
 	goto __62
 __61:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6452, zTab) == 0) {
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6471, zTab) == 0) {
 		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
@@ -55744,7 +55745,7 @@ __57:
 		goto __64
 	}
 	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6456, zTab) == 0) {
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6475, zTab) == 0) {
 		goto __65
 	}
 	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
@@ -55903,7 +55904,7 @@ __86:
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
 		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6465, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6484, libc.VaList(bp, zAs))
 	return WRC_Abort
 __90:
 	;
@@ -55911,14 +55912,14 @@ __90:
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
 		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6496, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6515, libc.VaList(bp+8, zAs))
 	return WRC_Abort
 __91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
 		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	return WRC_Abort
 __92:
 	;
@@ -55970,7 +55971,7 @@ __11:
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6551, libc.VaList(bp+16, zCol))
+		ts+6570, 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
@@ -56007,7 +56008,7 @@ __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 + 6586
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6605
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
@@ -56020,23 +56021,23 @@ __101:
 __99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6595
+		zErr = ts + 6614
 	} else {
-		zErr = ts + 6610
+		zErr = ts + 6629
 	}
 	if !(zDb != 0) {
 		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6632, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6651, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
 	goto __105
 __104:
 	if !(zTab != 0) {
 		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp+56, zErr, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6664, libc.VaList(bp+56, zErr, zTab, zCol))
 	goto __107
 __106:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+80, zErr, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6674, libc.VaList(bp+80, zErr, zCol))
 __107:
 	;
 __105:
@@ -56139,15 +56140,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 + 6662
+	var zIn uintptr = ts + 6681
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6690
+		zIn = ts + 6709
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6708
+		zIn = ts + 6727
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6726
+		zIn = ts + 6745
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6744, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6763, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -56225,14 +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 + 6764
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
-				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
-				}
-				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
+				*(*int32)(unsafe.Pointer(pExpr + 8)) = libc.Bool32(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL)
+				*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IntValue)
+				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_INTEGER)
+
 				i = 0
 				p = pNC
 			__4:
@@ -56276,7 +56273,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+6775, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6783, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -56340,7 +56337,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+6792, libc.VaList(bp, pExpr))
+								ts+6800, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -56356,7 +56353,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+6856,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6864,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -56370,7 +56367,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+6892, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6900, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -56393,30 +56390,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+6920, libc.VaList(bp+16, pExpr))
+						ts+6928, 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 + 6963
+						zType = ts + 6971
 					} else {
-						zType = ts + 6970
+						zType = ts + 6978
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6980, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6988, 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+7008, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7016, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7030,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7038,
 						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+7074,
+						ts+7082,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -56488,15 +56485,15 @@ 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+7122, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7130, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
 
 				if nRef != (*NameContext)(unsafe.Pointer(pNC)).FnRef {
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_VarSelect)
-					*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_VarSelect
 				}
+				*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_Subquery
 			}
 			break
 
@@ -56504,7 +56501,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+7133, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7141, pExpr, pExpr)
 			}
 
 			break
@@ -56560,7 +56557,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+6533, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -56635,7 +56632,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7144, libc.VaList(bp, i, zType, mx))
+		ts+7152, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -56655,7 +56652,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+7200, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7208, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -56690,7 +56687,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+7234, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7242, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -56747,7 +56744,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+7240, libc.VaList(bp, i+1))
+				ts+7248, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -56775,7 +56772,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+7301, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7309, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -56989,7 +56986,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+7332, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7340, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -57029,7 +57026,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+7234) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7242) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -57040,7 +57037,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7371) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7379) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -57052,7 +57049,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+7377, 0)
+						ts+7385, 0)
 					return WRC_Abort
 				}
 
@@ -57841,7 +57838,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 		return
 	}
 
@@ -57916,7 +57913,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+7436, libc.VaList(bp, mxHeight))
+			ts+7444, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -58165,12 +58162,12 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7484,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7492,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7528
+						return ts + 7536
 					}
-					return ts + 1554
+					return ts + 1573
 				}(), nElem))
 			break
 		}
@@ -58209,7 +58206,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+7530)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -58235,7 +58232,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+7532, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7540, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -58263,7 +58260,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+7566, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7574, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -58310,7 +58307,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+7586,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7594,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -58335,7 +58332,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+7629, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7637, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -58910,7 +58907,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+7652,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7660,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -59033,7 +59030,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+7682, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7690, libc.VaList(bp, zObject))
 	}
 }
 
@@ -59089,10 +59086,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+6764) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7713) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6769) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7718) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -59522,13 +59519,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+7705) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7724) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7713) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7732) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7719) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7738) == 0 {
 		return 1
 	}
 	return 0
@@ -59732,7 +59729,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+7723, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7742, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -59810,7 +59807,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+7770, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7789, 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)
 
@@ -59904,7 +59901,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 + 7801
+		var zFmt uintptr = ts + 7820
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -59922,7 +59919,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+6533, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	}
 }
 
@@ -59963,7 +59960,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+7845, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7864, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -59993,11 +59990,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+7868, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7887, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
-				return ts + 1554
+				return ts + 1573
 			}
-			return ts + 7887
+			return ts + 7906
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -60124,7 +60121,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+7899, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7918, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -60139,11 +60136,11 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7917, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7936, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
-			return ts + 1554
+			return ts + 1573
 		}
-		return ts + 7887
+		return ts + 7906
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
@@ -60166,7 +60163,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+7530)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = uint8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -60175,7 +60172,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+7938)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7957)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -60561,13 +60558,13 @@ 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+7940, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7943,
+			if Xsqlite3_strnicmp(tls, z, ts+7959, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7962,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
-							return ts + 4932
+							return ts + 4951
 						}
-						return ts + 1554
+						return ts + 1573
 					}(), pExpr))
 			} else {
 				codeReal(tls, v, z, negFlag, iMem)
@@ -60604,6 +60601,7 @@ func Xsqlite3ExprCodeLoadIndexColumn(tls *libc.TLS, pParse uintptr, pIdx uintptr
 func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr, pCol uintptr, regOut int32) {
 	var iAddr int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
+	var nErr int32 = (*Parse)(unsafe.Pointer(pParse)).FnErr
 
 	if (*Parse)(unsafe.Pointer(pParse)).FiSelfTab > 0 {
 		iAddr = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Parse)(unsafe.Pointer(pParse)).FiSelfTab-1, 0, regOut)
@@ -60617,6 +60615,9 @@ func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr
 	if iAddr != 0 {
 		Xsqlite3VdbeJumpHere(tls, v, iAddr)
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr > nErr {
+		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FerrByteOffset = -1
+	}
 }
 
 // Generate code to extract the value of the iCol-th column of a table.
@@ -60638,7 +60639,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+7970,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7989,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -60811,8 +60812,8 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8000, ts + 8005, ts + 8010, ts + 6191,
-				ts + 6186, ts + 8018}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8019, ts + 8024, ts + 8029, ts + 6210,
+				ts + 6205, ts + 8037}
 			var aff uint8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
@@ -60820,7 +60821,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 8026
+						return ts + 8045
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -60835,6 +60836,7 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 	var p uintptr
 	var v uintptr
 	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+		var exprAff U8
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -60848,6 +60850,14 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 		if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr, iDataCur) != 0 {
 			continue
 		}
+
+		exprAff = Xsqlite3ExprAffinity(tls, pExpr)
+		if int32(exprAff) <= SQLITE_AFF_BLOB && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_BLOB ||
+			int32(exprAff) == SQLITE_AFF_TEXT && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_TEXT ||
+			int32(exprAff) >= SQLITE_AFF_NUMERIC && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_NUMERIC {
+			continue
+		}
+
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 
 		if (*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow != 0 {
@@ -61187,7 +61197,7 @@ __73:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
 		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7970,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7989,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
 __76:
@@ -61420,7 +61430,7 @@ __43:
 		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+8031, libc.VaList(bp+8, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8050, libc.VaList(bp+8, pExpr))
 	goto __91
 __90:
 	return func() int32 {
@@ -61461,7 +61471,7 @@ __93:
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
 		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8058, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8077, libc.VaList(bp+16, pExpr))
 	goto __5
 __94:
 	;
@@ -61621,7 +61631,7 @@ __121:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
 		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7660,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
 __122:
 	;
@@ -61643,11 +61653,10 @@ __49:
 	return target
 
 __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) {
+	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) {
 		goto __123
 	}
+
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
 		goto __125
@@ -61687,7 +61696,7 @@ __126:
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	goto __5
 
 __55:
@@ -61718,13 +61727,19 @@ __129:
 	;
 __127:
 	;
-	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
+	addrINR = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable, 0, target)
 
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = U8(0)
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = okConstFactor
+	if !(inReg != target) {
+		goto __130
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
+	inReg = target
+__130:
+	;
 	Xsqlite3VdbeJumpHere(tls, v, addrINR)
-	Xsqlite3VdbeChangeP3(tls, v, addrINR, inReg)
 	goto __5
 
 __56:
@@ -61737,15 +61752,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __130
+		goto __131
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __131
+		goto __132
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__131:
+__132:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -61755,22 +61770,22 @@ __131:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__130:
+__131:
 	;
 	i1 = 0
-__132:
+__133:
 	if !(i1 < nExpr-1) {
-		goto __134
+		goto __135
 	}
 	if !(pX != 0) {
-		goto __135
+		goto __136
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __136
-__135:
-	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+	goto __137
 __136:
+	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+__137:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -61779,21 +61794,21 @@ __136:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __133
-__133:
-	i1 = i1 + 2
-	goto __132
 	goto __134
 __134:
+	i1 = i1 + 2
+	goto __133
+	goto __135
+__135:
 	;
 	if !(nExpr&1 != 0) {
-		goto __137
+		goto __138
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __138
-__137:
-	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+	goto __139
 __138:
+	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+__139:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -61803,27 +61818,27 @@ __138:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __139
-	}
-	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8082, 0)
-	return 0
-__139:
-	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __140
 	}
-	Xsqlite3MayAbort(tls, pParse)
+	Xsqlite3ErrorMsg(tls, pParse,
+		ts+8101, 0)
+	return 0
 __140:
 	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __141
 	}
+	Xsqlite3MayAbort(tls, pParse)
+__141:
+	;
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+		goto __142
+	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __142
-__141:
+	goto __143
+__142:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -61832,7 +61847,7 @@ __141:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__142:
+__143:
 	;
 	goto __5
 
@@ -61843,7 +61858,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[10]uint8)(unsafe.Pointer(ts + 8132))
+var zAff = *(*[10]uint8)(unsafe.Pointer(ts + 8151))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -63632,11 +63647,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+6381, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 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+8142, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8161, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -63648,13 +63663,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8170,
+		ts+8189,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8345,
+			ts+8364,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -63664,10 +63679,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8519, libc.VaList(bp, zDb, zDb))
+		ts+8538, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8666, 0)
+			ts+8685, 0)
 	}
 }
 
@@ -63731,7 +63746,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8817, libc.VaList(bp, zName))
+		ts+8836, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -63741,7 +63756,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8876, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8895, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -63750,7 +63765,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8882, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8901, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -63791,19 +63806,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8909, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8928, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9093,
+		ts+9112,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9398, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9417, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9414,
+		ts+9433,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -63811,7 +63826,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9472, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9491, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -63823,7 +63838,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9737, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9756, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63835,7 +63850,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9750,
+		ts+9769,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -63881,12 +63896,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9788, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9807, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9820, 0)
+			ts+9839, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -63896,11 +63911,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+9847)
+				ts+9866)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9906)
+				ts+9925)
 		}
 
 		if pDflt != 0 {
@@ -63913,12 +63928,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9959)
+					ts+9978)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10005)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10024)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -63929,7 +63944,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10032,
+			ts+10051,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -63951,7 +63966,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+10178,
+				ts+10197,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -63999,14 +64014,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10408, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10427, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10442, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10461, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -64034,7 +64049,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+10472, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10491, 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
 	}
@@ -64074,18 +64089,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 + 10491
+		zType = ts + 10510
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10496
+		zType = ts + 10515
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10510,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10529,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10528
+					return ts + 10547
 				}
-				return ts + 10545
+				return ts + 10564
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -64169,11 +64184,11 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10582, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1554, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1573, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iSchema == 1))
 
 	Xsqlite3MayAbort(tls, pParse)
@@ -64186,17 +64201,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10584,
+		ts+10603,
 		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+10766,
+		ts+10785,
 		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+9737, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9756, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -64454,12 +64469,12 @@ 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+10897,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10916,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*uint8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10920
+				return ts + 10939
 			}
-			return ts + 1554
+			return ts + 1573
 		}(), zWhen,
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg))
 	Xsqlite3_result_error(tls, pCtx, zErr, -1)
@@ -64499,8 +64514,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+10922, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 113494)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10941, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113516)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -64517,7 +64532,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, 113505)
+		rc = Xsqlite3CorruptError(tls, 113527)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -64539,7 +64554,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+10930, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10949, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -64579,12 +64594,12 @@ 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+10936, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10955, 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 + 10920
+							return ts + 10939
 						}
-						return ts + 1554
+						return ts + 1573
 					}()))
 				zReplace = zBuf2
 				nReplace = U32(Xsqlite3Strlen30(tls, zReplace))
@@ -65070,7 +65085,7 @@ __45:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FzErrMsg != 0) {
 		goto __47
 	}
-	renameColumnParseError(tls, context, ts+1554, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
+	renameColumnParseError(tls, context, ts+1573, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
 	goto __48
 __47:
 	Xsqlite3_result_error_code(tls, context, rc)
@@ -65235,7 +65250,7 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 			if rc == SQLITE_ERROR && Xsqlite3WritableSchema(tls, db) != 0 {
 				Xsqlite3_result_value(tls, context, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 			} else if (*Parse)(unsafe.Pointer(bp+80)).FzErrMsg != 0 {
-				renameColumnParseError(tls, context, ts+1554, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
+				renameColumnParseError(tls, context, ts+1573, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
 			} else {
 				Xsqlite3_result_error_code(tls, context, rc)
 			}
@@ -65438,7 +65453,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 114441)
+	rc = Xsqlite3CorruptError(tls, 114463)
 	goto drop_column_done
 __2:
 	;
@@ -65462,7 +65477,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10941, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10960, 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)
 
@@ -65543,19 +65558,19 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10582, 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+10948,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10967,
 		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 + 10976
+				return ts + 10995
 			}
-			return ts + 6127
+			return ts + 6146
 		}(),
 			zCol))
 	goto exit_drop_column
@@ -65564,7 +65579,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10988, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11007, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -65578,13 +65593,13 @@ __8:
 	goto exit_drop_column
 __9:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1554, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1573, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11036, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11055, 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+11157, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11176, 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
@@ -65702,11 +65717,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 + 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}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11194},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11215},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11235},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11254},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11273}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -65740,7 +65755,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+11277, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11296, 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)
 			}
@@ -65749,10 +65764,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+11300,
+					ts+11319,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11330, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11349, 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)
 			}
@@ -65770,9 +65785,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11348, FzCols: ts + 11361},
-	{FzName: ts + 11374, FzCols: ts + 11387},
-	{FzName: ts + 11415},
+	{FzName: ts + 11367, FzCols: ts + 11380},
+	{FzName: ts + 11393, FzCols: ts + 11406},
+	{FzName: ts + 11434},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65962,7 +65977,7 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11428}
+	FzName:     ts + 11447}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
@@ -66213,7 +66228,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11438}
+	FzName:     ts + 11457}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -66227,7 +66242,7 @@ 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+11448,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11467,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
 					return (*StatAccum)(unsafe.Pointer(p)).FnEst
@@ -66240,7 +66255,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11453, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11472, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -66282,7 +66297,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+11459, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11478, 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--
@@ -66296,7 +66311,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11465}
+	FzName:     ts + 11484}
 
 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)
@@ -66340,7 +66355,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+11474, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11493, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -66357,7 +66372,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+11348, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11367, 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)
@@ -66513,7 +66528,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+11484, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11503, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -66570,7 +66585,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+11484, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11503, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -66617,9 +66632,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+11488)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11507)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11492)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11511)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -66702,7 +66717,7 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 	var v TRowcnt
 
 	if z == uintptr(0) {
-		z = ts + 1554
+		z = ts + 1573
 	}
 	for i = 0; *(*uint8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
 		v = uint64(0)
@@ -66724,15 +66739,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+11496, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11515, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11507, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11526, 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+11517, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11536, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*uint8)(unsafe.Pointer(z))) != 0 && int32(*(*uint8)(unsafe.Pointer(z))) != ' ' {
@@ -67008,11 +67023,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+11374, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11393, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11529,
-			ts+11583,
+			ts+11548,
+			ts+11602,
 			zDb)
 	}
 	return rc
@@ -67059,10 +67074,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+11348, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11367, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11635, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11654, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -67120,7 +67135,7 @@ 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+6441, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6460, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -67153,13 +67168,13 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zFile == uintptr(0)) {
 		goto __1
 	}
-	zFile = ts + 1554
+	zFile = ts + 1573
 __1:
 	;
 	if !(zName == uintptr(0)) {
 		goto __2
 	}
-	zName = ts + 1554
+	zName = ts + 1573
 __2:
 	;
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2)) != 0) {
@@ -67167,14 +67182,14 @@ __2:
 	}
 
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3835)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3854)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11676, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11695, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
 	if !(rc == SQLITE_OK) {
 		goto __6
 	}
@@ -67211,7 +67226,7 @@ __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11679,
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11698,
 		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
@@ -67225,7 +67240,7 @@ __12:
 	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __15
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11716, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11735, libc.VaList(bp+8, zName))
 	goto attach_error
 __15:
 	;
@@ -67289,7 +67304,7 @@ __4:
 		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11746, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11765, 0)
 	goto __23
 __22:
 	if !(rc == SQLITE_OK) {
@@ -67306,7 +67321,7 @@ __25:
 		goto __27
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
-		ts+11775, 0)
+		ts+11794, 0)
 	rc = SQLITE_ERROR
 __27:
 	;
@@ -67372,13 +67387,13 @@ __33:
 	}
 	Xsqlite3OomFault(tls, db)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1509, 0)
 	goto __35
 __34:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
 		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11843, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11862, libc.VaList(bp+16, zFile))
 __36:
 	;
 __35:
@@ -67425,7 +67440,7 @@ func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zName == uintptr(0)) {
 		goto __1
 	}
-	zName = ts + 1554
+	zName = ts + 1573
 __1:
 	;
 	i = 0
@@ -67456,14 +67471,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11871, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11890, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11892, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11911, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -67471,7 +67486,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11918, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11937, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -67588,7 +67603,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11940}
+	FzName:     ts + 11959}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -67601,7 +67616,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11954}
+	FzName:     ts + 11973}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -67615,7 +67630,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+11968, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11987, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -67647,7 +67662,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+11992,
+						ts+12011,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -67822,7 +67837,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+12038, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12057, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -67848,11 +67863,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+12061, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12080, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12067, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12086, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12073, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12092, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -67899,7 +67914,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 + 7713
+		zCol = ts + 7732
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -67923,7 +67938,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+12100, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12119, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -68194,25 +68209,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6441) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6460) == 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+6381, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
 			if i == 1 {
-				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 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5902+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+6389)
+						ts+6408)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+5883)
+						ts+5902)
 				}
 			}
 		}
@@ -68233,12 +68248,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		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 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5902)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+6389)
+					ts+6408)
 			}
 		}
 	}
@@ -68269,7 +68284,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+12115, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12134, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -68287,14 +68302,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 + 12123
+			zMsg = ts + 12142
 		} else {
-			zMsg = ts + 12136
+			zMsg = ts + 12155
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6664, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6674, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -68324,12 +68339,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+6381, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
-			return ts + 6427
+	if Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5902+7) == 0 {
+			return ts + 6446
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6389+7) == 0 {
-			return ts + 6408
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 {
+			return ts + 6427
 		}
 	}
 	return zName
@@ -68687,7 +68702,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+5883)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5902)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -68713,7 +68728,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6441, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6460, zName) {
 				goto __3
 			}
 
@@ -68766,13 +68781,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+12150, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12169, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12167, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12186, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -68810,13 +68825,13 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 		if Xsqlite3_stricmp(tls, zType, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit))) != 0 ||
 			Xsqlite3_stricmp(tls, zName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 1*8))) != 0 ||
 			Xsqlite3_stricmp(tls, zTblName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 2*8))) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1554, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1573, 0)
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6381, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6400, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12187,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12206,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -68976,9 +68991,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -68994,7 +69009,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12229, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12248, 0)
 	return
 __4:
 	;
@@ -69022,9 +69037,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10491
+			return ts + 10510
 		}
-		return ts + 8876
+		return ts + 8895
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -69040,9 +69055,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -69073,12 +69088,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12270,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12289,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10491
+				return ts + 10510
 			}
-			return ts + 8876
+			return ts + 8895
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -69093,7 +69108,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12291, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12310, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -69180,7 +69195,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+12326, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12345, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -69204,7 +69219,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+12343, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12362, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -69224,7 +69239,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 + 12326
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12345
 	(*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)
@@ -69236,7 +69251,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+12326, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12345, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -69270,7 +69285,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+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12396, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -69278,13 +69293,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+12400, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12419, 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+12407, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12426, 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--
@@ -69321,7 +69336,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+12417, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12436, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -69485,10 +69500,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+12443,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12462,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12488, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12507, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -69519,7 +69534,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+12529, 0)
+			ts+12548, 0)
 	}
 }
 
@@ -69564,7 +69579,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12581, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12600, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -69653,7 +69668,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12622, 0)
+		ts+12641, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -69748,7 +69763,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12678, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12697, 0)
 	goto generated_done
 __2:
 	;
@@ -69761,13 +69776,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12721, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12740, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12729, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12748, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -69801,13 +69816,19 @@ __10:
 
 	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
 __11:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_RAISE) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = (*Column)(unsafe.Pointer(pCol)).Faffinity
+__12:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12736,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12755,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -69928,13 +69949,13 @@ __3:
 	;
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
-		zSep = ts + 1554
-		zSep2 = ts + 12767
-		zEnd = ts + 4957
+		zSep = ts + 1573
+		zSep2 = ts + 12786
+		zEnd = ts + 4976
 	} else {
-		zSep = ts + 12769
-		zSep2 = ts + 12773
-		zEnd = ts + 12778
+		zSep = ts + 12788
+		zSep2 = ts + 12792
+		zEnd = ts + 12797
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -69942,7 +69963,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12781, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12800, 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('(')
@@ -69976,17 +69997,17 @@ __5:
 	goto __6
 __6:
 	;
-	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3663, libc.VaList(bp, zEnd))
+	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3682, libc.VaList(bp, zEnd))
 	return zStmt
 }
 
 var azType1 = [6]uintptr{
-	ts + 1554,
-	ts + 12795,
-	ts + 12801,
-	ts + 12806,
-	ts + 12811,
-	ts + 12801,
+	ts + 1573,
+	ts + 12814,
+	ts + 12820,
+	ts + 12825,
+	ts + 12830,
+	ts + 12820,
 }
 
 func resizeIndexObject(tls *libc.TLS, db uintptr, pIdx uintptr, N int32) int32 {
@@ -70376,7 +70397,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
 		if pSelect != 0 || !(int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM) && (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1554, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1573, 0)
 			return
 		}
 		(*Table)(unsafe.Pointer(p)).Ftnum = (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum
@@ -70393,10 +70414,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+12817,
-						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1554)))
+						ts+12836,
+						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1573)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12850,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12869,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -70415,11 +70436,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+12877, 0)
+				ts+12896, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12927, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12946, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -70453,7 +70474,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12959, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12978, 0)
 			return
 		}
 	}
@@ -70478,11 +70499,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 + 8876
-			zType2 = ts + 13003
+			zType = ts + 8895
+			zType2 = ts + 13022
 		} else {
-			zType = ts + 10491
-			zType2 = ts + 13009
+			zType = ts + 10510
+			zType2 = ts + 13028
 		}
 
 		if pSelect != 0 {
@@ -70553,11 +70574,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+13014, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13033, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13029,
+			ts+13048,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -70573,13 +70594,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+13127,
+					ts+13146,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13169, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13188, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -70594,7 +70615,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+9398) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9417) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -70624,7 +70645,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+13203, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13222, 0)
 	goto create_view_fail
 __1:
 	;
@@ -70640,7 +70661,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10491, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10510, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -70722,7 +70743,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13239, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13258, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -70847,13 +70868,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+13269, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13288, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13284,
+		ts+13303,
 		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)
 }
@@ -70894,10 +70915,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+13351, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]uint8{})), bp+40, ts+13370, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11300,
+				ts+11319,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -70929,12 +70950,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+13365,
+			ts+13384,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13410,
+		ts+13429,
 		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)
@@ -70962,11 +70983,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+6381, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3286, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3305, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7133, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7141, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -71044,9 +71065,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -71105,21 +71126,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13477, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13496, 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+13505, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13524, 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+13539, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13558, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -71131,7 +71152,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11492, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11511, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -71195,7 +71216,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13571,
+		ts+13590,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -71207,7 +71228,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13634, 0)
+		ts+13653, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -71292,7 +71313,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13728,
+		ts+13747,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -71519,12 +71540,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+13774,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13793,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13802
+							return ts + 13821
 						}
-						return ts + 13808
+						return ts + 13827
 					}()))
 				return 1
 			}
@@ -71645,7 +71666,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13813, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13832, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -71664,7 +71685,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13819,
+		ts+13838,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -71690,26 +71711,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13869, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13888, 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+13897, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13916, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13922, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13941, 0)
 	goto exit_create_index
 __17:
 	;
@@ -71723,7 +71744,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13813, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13832, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -71738,7 +71759,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13956, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13975, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -71750,7 +71771,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13990, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14009, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -71779,7 +71800,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14014, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14033, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -71800,9 +71821,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -71841,7 +71862,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13813)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13832)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -71942,7 +71963,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14037, 0)
+		ts+14056, 0)
 	goto exit_create_index
 __56:
 	;
@@ -72159,7 +72180,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14098, libc.VaList(bp+48, 0))
+		ts+14117, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -72211,8 +72232,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14140, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14159, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121859)
 	goto exit_create_index
 __101:
 	;
@@ -72258,12 +72279,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14157,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14176,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
-				return ts + 1554
+				return ts + 1573
 			}
-			return ts + 14177
+			return ts + 14196
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -72271,7 +72292,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14185,
+		ts+14204,
 		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,
@@ -72285,7 +72306,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14244, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14263, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -72446,7 +72467,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14271, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14290, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -72461,7 +72482,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14289, libc.VaList(bp+8, 0))
+		ts+14308, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -72472,9 +72493,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -72500,9 +72521,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14362,
+		ts+14381,
 		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+11488, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11507, (*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)
@@ -72637,7 +72658,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+14422,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14441,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -72845,12 +72866,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+14458,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14477,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14494
+				return ts + 14513
 			}
-			return ts + 14497
+			return ts + 14516
 		}()))
 	goto append_from_error
 __1:
@@ -73019,7 +73040,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14503, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14522, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -73055,9 +73076,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14509
+				return ts + 14528
 			}
-			return ts + 14518
+			return ts + 14537
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -73082,7 +73103,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14503, ts + 14525, ts + 14509}
+var az = [3]uintptr{ts + 14522, ts + 14544, ts + 14528}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -73097,7 +73118,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+14533, 0)
+				ts+14552, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -73234,17 +73255,17 @@ 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+14603, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14622, 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+14614, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14633, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
-			Xsqlite3_str_append(tls, bp+8, ts+1567, 1)
+			Xsqlite3_str_append(tls, bp+8, ts+1586, 1)
 			Xsqlite3_str_appendall(tls, bp+8, zCol)
 		}
 	}
@@ -73267,11 +73288,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+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12080, 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+14617, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14636, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -73401,7 +73422,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14626, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14645, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -73497,7 +73518,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+14672, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14691, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -73695,7 +73716,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14702, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14721, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -73975,7 +73996,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+14733,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14752,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -74007,11 +74028,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+14766, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14785, 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+14795, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14814, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -74262,7 +74283,7 @@ __20:
 	goto __16
 __15:
 	wcf = U16(WHERE_ONEPASS_DESIRED | WHERE_DUPLICATES_OK)
-	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_VarSelect != 0) {
+	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_Subquery != 0) {
 		goto __23
 	}
 	bComplex = 1
@@ -74515,7 +74536,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14833)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14852)
 __62:
 	;
 delete_from_cleanup:
@@ -74630,7 +74651,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+11348) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11367) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -74860,7 +74881,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 + 8005, ts + 8000, ts + 6181}
+var azType2 = [5]uintptr{ts + 6210, ts + 6205, ts + 8024, ts + 8019, ts + 6200}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -74919,7 +74940,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+14846, -1)
+					Xsqlite3_result_error(tls, context, ts+14865, -1)
 					return
 				}
 				iVal = -iVal
@@ -75223,7 +75244,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14863, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14882, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -75569,7 +75590,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+14868, -1)
+		Xsqlite3_result_error(tls, context, ts+14887, -1)
 		return
 	}
 	if argc == 3 {
@@ -75579,7 +75600,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+14901, -1)
+				ts+14920, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -75632,7 +75653,7 @@ func errlogFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	_ = argc
 	_ = context
-	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3663, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
+	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3682, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
 }
 
 func compileoptionusedFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
@@ -75672,13 +75693,13 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 
 			var zVal uintptr
 			r1 = Xsqlite3_value_double(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+4925, libc.VaList(bp, r1))
+			Xsqlite3_str_appendf(tls, pStr, ts+4944, libc.VaList(bp, r1))
 			zVal = Xsqlite3_str_value(tls, pStr)
 			if zVal != 0 {
 				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+14946, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14965, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -75686,7 +75707,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 		}
 	case SQLITE_INTEGER:
 		{
-			Xsqlite3_str_appendf(tls, pStr, ts+1334, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
+			Xsqlite3_str_appendf(tls, pStr, ts+1353, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
 			break
 
 		}
@@ -75715,13 +75736,13 @@ 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+14953, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14972, libc.VaList(bp+24, zArg))
 			break
 
 		}
 	default:
 		{
-			Xsqlite3_str_append(tls, pStr, ts+1555, 4)
+			Xsqlite3_str_append(tls, pStr, ts+1574, 4)
 			break
 
 		}
@@ -75862,7 +75883,7 @@ func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 	var ch U32
 	var c U8
 	var d U8
-	zPass = ts + 1554
+	zPass = ts + 1573
 	nPass = 0
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -76144,7 +76165,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10920}
+var azOne = [1]uintptr{ts + 10939}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -76156,7 +76177,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	zIn = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	if zIn == uintptr(0) {
-		zIn = ts + 1554
+		zIn = ts + 1573
 	}
 	for i = 0; *(*U8)(unsafe.Pointer(zIn + uintptr(i))) != 0 && !(int32(Xsqlite3CtypeMap[*(*U8)(unsafe.Pointer(zIn + uintptr(i)))])&0x02 != 0); i++ {
 	}
@@ -76180,7 +76201,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+14956, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14975, 4, uintptr(0))
 	}
 }
 
@@ -76205,7 +76226,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+12100, -1)
+		Xsqlite3_result_error(tls, context, ts+12119, -1)
 		return
 	}
 
@@ -76283,7 +76304,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+14846, -1)
+			Xsqlite3_result_error(tls, context, ts+14865, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -76545,7 +76566,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+14961, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14980, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -76565,14 +76586,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14967, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14986, 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+14967, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14986, 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+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)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14986, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14986, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -76813,109 +76834,109 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 }
 
 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 + 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(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(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 + 14991},
+	{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 + 15011},
+	{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 + 15024},
+	{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 + 15042},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15051},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15059},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15059},
+	{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_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15100},
+	{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 + 15125},
+	{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 + 15134},
+	{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 + 15145},
+	{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 + 15152},
+	{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 + 15166},
+	{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 + 15166},
+	{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 + 15172},
+	{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 + 15172},
+	{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 + 15178},
+	{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 + 15178},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15183},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15183},
+	{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 + 15183},
+	{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 + 15187},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15187},
+	{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 + 15187},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15191},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15198},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15206},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15213},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15219},
+	{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 + 15233},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15241},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15246},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15256},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15262},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15268},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15272},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15272},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15278},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15285},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15292},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15303},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15310},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15325},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15342},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15353},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15359},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15377},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15385},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15399},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15407},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15423},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15423},
+	{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 + 15433},
+	{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 + 15437},
+	{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 + 15443},
+	{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 + 15447},
+	{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 + 15447},
+	{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 + 15453},
+	{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 + 15453},
+	{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 + 15466},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14986},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14986},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6605},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6605},
 	{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 + 15523},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15476},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15484},
+	{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 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15496},
+	{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 + 15499},
+	{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 + 15503},
+	{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 + 15509},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15499},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15514},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15518},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15522},
 	{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 + 15532},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15537},
 	{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 + 15556},
+	{FnArg: int8(2), 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 + 15553},
+	{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 + 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 + 15565},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15570},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15575},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15580},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15586},
 	{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}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15598},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15603},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15611},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15619},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15622},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6605},
+	{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 + 15627}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -77036,7 +77057,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+15612,
+				ts+15631,
 				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)
@@ -77696,8 +77717,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 + 6452, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6448, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6471, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6467, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -77776,7 +77797,7 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 			(*Token)(unsafe.Pointer(bp + 80)).Fz = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 			(*Token)(unsafe.Pointer(bp + 80)).Fn = uint32(Xsqlite3Strlen30(tls, (*Token)(unsafe.Pointer(bp+80)).Fz))
 
-			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5136)
+			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5155)
 			if pRaise != 0 {
 				(*Expr)(unsafe.Pointer(pRaise)).FaffExpr = uint8(OE_Abort)
 			}
@@ -78198,7 +78219,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7970, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7989, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -78666,7 +78687,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15657,
+		ts+15676,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -78691,7 +78712,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15698,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15717,
 		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
@@ -78840,7 +78861,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15730,
+		ts+15749,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -78850,7 +78871,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15782, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15801, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -78902,7 +78923,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15807,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15826,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -78910,7 +78931,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15853, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15872, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -79322,7 +79343,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15874)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15893)
 __125:
 	;
 insert_cleanup:
@@ -79638,7 +79659,7 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 						fallthrough
 					case OE_Fail:
 						{
-							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12080, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 								(*Column)(unsafe.Pointer(pCol)).FzCnName))
 
 							Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
@@ -80730,13 +80751,13 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131895)
+	return Xsqlite3MisuseError(tls, 131931)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
 		goto __2
 	}
-	zSql = ts + 1554
+	zSql = ts + 1573
 __2:
 	;
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -81215,7 +81236,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12100, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12119, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -81224,7 +81245,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15888
+		zEntry = ts + 15907
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -81239,7 +81260,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12080, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -81275,7 +81296,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15911, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15930, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*uint8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -81289,7 +81310,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15920, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15939, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -81313,7 +81334,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15924, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15943, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -81331,7 +81352,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15930, libc.VaList(bp+16, zEntry, zFile))
+		ts+15949, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -81358,7 +81379,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15973, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15992, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -81396,7 +81417,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+16005, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16024, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -81406,7 +81427,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16042,
+	ts + 16061,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -81562,7 +81583,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+16045, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16064, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -81570,63 +81591,63 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 }
 
 var pragCName = [57]uintptr{
-	ts + 5057,
-	ts + 16084,
-	ts + 8876,
-	ts + 16088,
-	ts + 16093,
-	ts + 16096,
-	ts + 16106,
-	ts + 16116,
-	ts + 16122,
-	ts + 16126,
-	ts + 16131,
-	ts + 16136,
-	ts + 16144,
+	ts + 5076,
+	ts + 16103,
+	ts + 8895,
+	ts + 16107,
+	ts + 16112,
+	ts + 16115,
+	ts + 16125,
+	ts + 16135,
+	ts + 16141,
+	ts + 16145,
+	ts + 16150,
 	ts + 16155,
-	ts + 16158,
-	ts + 16165,
-	ts + 16126,
-	ts + 16131,
-	ts + 16172,
+	ts + 16163,
+	ts + 16174,
 	ts + 16177,
-	ts + 16180,
-	ts + 16187,
-	ts + 16122,
-	ts + 16126,
-	ts + 16193,
-	ts + 16198,
-	ts + 16203,
-	ts + 16126,
-	ts + 16207,
-	ts + 16131,
-	ts + 16215,
-	ts + 16219,
-	ts + 16224,
-	ts + 11492,
-	ts + 11488,
-	ts + 16230,
-	ts + 16235,
-	ts + 16240,
-	ts + 16084,
-	ts + 16126,
-	ts + 16245,
-	ts + 16252,
+	ts + 16184,
+	ts + 16145,
+	ts + 16150,
+	ts + 16191,
+	ts + 16196,
+	ts + 16199,
+	ts + 16206,
+	ts + 16141,
+	ts + 16145,
+	ts + 16212,
+	ts + 16217,
+	ts + 16222,
+	ts + 16145,
+	ts + 16226,
+	ts + 16150,
+	ts + 16234,
+	ts + 16238,
+	ts + 16243,
+	ts + 11511,
+	ts + 11507,
+	ts + 16249,
+	ts + 16254,
 	ts + 16259,
-	ts + 8876,
-	ts + 16267,
-	ts + 5060,
-	ts + 16273,
-	ts + 16084,
-	ts + 16126,
+	ts + 16103,
+	ts + 16145,
+	ts + 16264,
+	ts + 16271,
 	ts + 16278,
-	ts + 16283,
-	ts + 15480,
-	ts + 16288,
-	ts + 16301,
-	ts + 16310,
-	ts + 16317,
-	ts + 16328,
+	ts + 8895,
+	ts + 16286,
+	ts + 5079,
+	ts + 16292,
+	ts + 16103,
+	ts + 16145,
+	ts + 16297,
+	ts + 16302,
+	ts + 15499,
+	ts + 16307,
+	ts + 16320,
+	ts + 16329,
+	ts + 16336,
+	ts + 16347,
 }
 
 // Definitions of all built-in pragmas
@@ -81644,238 +81665,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16336,
+	{FzName: ts + 16355,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16351,
+	{FzName: ts + 16370,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16366,
+	{FzName: ts + 16385,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16378,
+	{FzName: ts + 16397,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16394,
+	{FzName: ts + 16413,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16317,
+	{FzName: ts + 16336,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16407,
+	{FzName: ts + 16426,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16419,
+	{FzName: ts + 16438,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16439,
+	{FzName: ts + 16458,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CellSizeCk)},
-	{FzName: ts + 16455,
+	{FzName: ts + 16474,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16476,
+	{FzName: ts + 16495,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16491,
+	{FzName: ts + 16510,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16507,
+	{FzName: ts + 16526,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16521,
+	{FzName: ts + 16540,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16534,
+	{FzName: ts + 16553,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16548,
+	{FzName: ts + 16567,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16567,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_DeferFKs)},
 	{FzName: ts + 16586,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_DeferFKs)},
+	{FzName: ts + 16605,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16609,
+	{FzName: ts + 16628,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16618,
+	{FzName: ts + 16637,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16636,
+	{FzName: ts + 16655,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16653,
+	{FzName: ts + 16672,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16666,
+	{FzName: ts + 16685,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16681,
+	{FzName: ts + 16700,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16699,
+	{FzName: ts + 16718,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16709,
+	{FzName: ts + 16728,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16723,
+	{FzName: ts + 16742,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16739,
+	{FzName: ts + 16758,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16764,
+	{FzName: ts + 16783,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16783,
+	{FzName: ts + 16802,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16794,
+	{FzName: ts + 16813,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16805,
+	{FzName: ts + 16824,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16817,
+	{FzName: ts + 16836,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16833,
+	{FzName: ts + 16852,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16846,
+	{FzName: ts + 16865,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16865,
+	{FzName: ts + 16884,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16884,
+	{FzName: ts + 16903,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16897,
+	{FzName: ts + 16916,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16912,
+	{FzName: ts + 16931,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16922,
+	{FzName: ts + 16941,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16934,
+	{FzName: ts + 16953,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16943,
+	{FzName: ts + 16962,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16954,
+	{FzName: ts + 16973,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16964,
+	{FzName: ts + 16983,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16976,
+	{FzName: ts + 16995,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16987,
+	{FzName: ts + 17006,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16999,
+	{FzName: ts + 17018,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17016,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_RecTriggers)},
 	{FzName: ts + 17035,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_RecTriggers)},
+	{FzName: ts + 17054,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17061,
+	{FzName: ts + 17080,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17076,
+	{FzName: ts + 17095,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17090,
+	{FzName: ts + 17109,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17109,
+	{FzName: ts + 17128,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17123,
+	{FzName: ts + 17142,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17139,
+	{FzName: ts + 17158,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17151,
+	{FzName: ts + 17170,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17162,
+	{FzName: ts + 17181,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17173,
+	{FzName: ts + 17192,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17185,
+	{FzName: ts + 17204,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17196,
+	{FzName: ts + 17215,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17217,
+	{FzName: ts + 17236,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17225,
+	{FzName: ts + 17244,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17240,
+	{FzName: ts + 17259,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17253,
-		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
 	{FzName: ts + 17272,
+		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
+	{FzName: ts + 17291,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17287,
+	{FzName: ts + 17306,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -81897,7 +81918,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17303))
+var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17322))
 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)}
@@ -81909,10 +81930,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+17328) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17347) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17357) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -81921,13 +81942,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+8026) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8045) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17345) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17364) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17350) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17369) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -81942,9 +81963,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+16278) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16297) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17362) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17381) == 0 {
 		return 2
 	} else {
 		return 0
@@ -81958,7 +81979,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+17369, 0)
+				ts+17388, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -82049,19 +82070,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17431
+		zName = ts + 17450
 		break
 	case OE_SetDflt:
-		zName = ts + 17440
+		zName = ts + 17459
 		break
 	case OE_Cascade:
-		zName = ts + 17452
+		zName = ts + 17471
 		break
 	case OE_Restrict:
-		zName = ts + 17460
+		zName = ts + 17479
 		break
 	default:
-		zName = ts + 17469
+		zName = ts + 17488
 		break
 	}
 	return zName
@@ -82078,7 +82099,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17479, ts + 17486, ts + 17494, ts + 17498, ts + 17362, ts + 17507,
+	ts + 17498, ts + 17505, ts + 17513, ts + 17517, ts + 17381, ts + 17526,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -82125,13 +82146,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17511
+			zType = ts + 17530
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17513
+			zType = ts + 17532
 		} else {
-			zType = ts + 7528
+			zType = ts + 7536
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17515,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17534,
 			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),
@@ -82139,7 +82160,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17522, ts + 17527, ts + 17535}
+var azEnc = [4]uintptr{uintptr(0), ts + 17541, ts + 17546, ts + 17554}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -82290,6 +82311,7 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp7 int32
 	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
@@ -82386,7 +82408,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17543, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17562, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -82425,7 +82447,7 @@ __8:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 488)) != 0) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 488)))
 __10:
 	;
@@ -82647,7 +82669,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17547) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17566) == 0) {
 		goto __64
 	}
 	b = 2
@@ -82719,7 +82741,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17338
+	zRet = ts + 17357
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -82757,7 +82779,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17328
+	zRet = ts + 17347
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -83044,7 +83066,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 552)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17552, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17571, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -83063,7 +83085,7 @@ __127:
 	if !(*(*uint8)(unsafe.Pointer(zRight)) != 0) {
 		goto __128
 	}
-	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+16, zRight))
+	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+16, zRight))
 	goto __129
 __128:
 	Xsqlite3_temp_directory = uintptr(0)
@@ -83085,7 +83107,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17577, 0)
+		ts+17596, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -83139,7 +83161,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17630) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17649) == 0) {
 		goto __142
 	}
 
@@ -83236,13 +83258,13 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17636
+			return ts + 17655
 		}
-		return ts + 17644
+		return ts + 17663
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
-			Xsqlite3ColumnType(tls, pCol, ts+1554),
+			Xsqlite3ColumnType(tls, pCol, ts+1573),
 			func() int32 {
 				if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 {
 					return 1
@@ -83307,7 +83329,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17651, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17670, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -83320,7 +83342,7 @@ __172:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __173
 	}
-	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1490, 0)
+	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1509, 0)
 	(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 __173:
 	;
@@ -83353,29 +83375,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10491
+	zType = ts + 10510
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12721
+	zType = ts + 12740
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17667
+	zType = ts + 17686
 	goto __183
 __182:
-	zType = ts + 8876
+	zType = ts + 8895
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17693,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -83441,7 +83463,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17681, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17700, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -83451,7 +83473,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17686,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17705,
 		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))))
@@ -83488,8 +83510,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17691, ts + 17693, ts + 16155}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17695,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17710, ts + 17712, ts + 16174}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17714,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -83522,7 +83544,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17720,
 		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)))
@@ -83544,7 +83566,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17705, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17724, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -83608,7 +83630,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7536, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -83624,7 +83646,7 @@ __218:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7536, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -83659,7 +83681,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17708,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17727,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -83667,7 +83689,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+17717))
+			ts+17736))
 	goto __227
 __227:
 	j2++
@@ -83856,7 +83878,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17722, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17741, 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)))
@@ -84073,7 +84095,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+17726, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17745, 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)
@@ -84184,7 +84206,7 @@ __307:
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17750,
+		ts+17769,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
@@ -84283,7 +84305,7 @@ __321:
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17786, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17805, 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) {
@@ -84305,7 +84327,7 @@ __326:
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17806,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17825,
 		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)
@@ -84318,7 +84340,7 @@ __329:
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17828,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17847,
 		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 __332
@@ -84336,11 +84358,11 @@ __331:
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
 __334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17851, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17870, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17853,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17872,
 		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)
 __333:
@@ -84386,7 +84408,7 @@ __339:
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17873,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17892,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
@@ -84420,89 +84442,103 @@ __344:
 
 	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+17903)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17922)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17908)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17927)
 	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)
 
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __345
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_IdxRowid, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
+	jmp7 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 3, 0, r1+int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn)-1)
+
+	Xsqlite3VdbeLoadString(tls, v, 3,
+		ts+17948)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17984)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp7)
+__345:
+	;
 	label6 = 0
 	kk = 0
-__345:
+__346:
 	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) {
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
 		goto __349
 	}
-	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+	goto __347
 __349:
+	;
+	if !(label6 == 0) {
+		goto __350
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__350:
 	;
 	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:
+	kk++
+	goto __346
+	goto __348
+__348:
 	;
 	if !(label6 != 0) {
-		goto __350
+		goto __351
 	}
 	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
 	Xsqlite3VdbeResolveLabel(tls, v, label6)
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17922)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17929)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17995)
 	Xsqlite3VdbeGoto(tls, v, jmp5-1)
 	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-__350:
+__351:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __351
+		goto __352
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__352:
+__353:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __354
+		goto __355
 	}
 	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 __355
+		goto __356
 	}
-	goto __353
-__355:
+	goto __354
+__356:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
-	goto __353
-__353:
-	kk++
-	goto __352
 	goto __354
 __354:
+	kk++
+	goto __353
+	goto __355
+__355:
 	;
 	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)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18022)
 	Xsqlite3VdbeGoto(tls, v, jmp5)
 	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
-__351:
+__352:
 	;
 	Xsqlite3VdbeJumpHere(tls, v, jmp4)
 	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
@@ -84519,20 +84555,20 @@ __340:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 612)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __356
+		goto __357
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17983)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+18049)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__357:
+__358:
 	if !(pIdx5 != 0) {
-		goto __359
-	}
-	if !(pPk1 == pIdx5) {
 		goto __360
 	}
-	goto __358
-__360:
+	if !(pPk1 == pIdx5) {
+		goto __361
+	}
+	goto __359
+__361:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -84541,21 +84577,21 @@ __360:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __358
-__358:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __357
 	goto __359
 __359:
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
+	goto __358
+	goto __360
+__360:
 	;
 	if !(pPk1 != 0) {
-		goto __361
+		goto __362
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__361:
+__362:
 	;
-__356:
+__357:
 	;
 	goto __291
 __291:
@@ -84573,14 +84609,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __362
+		goto __363
 	}
 	(*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 + 18012
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18078
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__362:
+__363:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -84588,27 +84624,27 @@ __362:
 
 __45:
 	if !!(zRight != 0) {
-		goto __363
+		goto __364
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __365
-	}
-	goto pragma_out
-__365:
-	;
-	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __364
-__363:
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
 		goto __366
 	}
+	goto pragma_out
+__366:
+	;
+	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
+	goto __365
+__364:
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
+		goto __367
+	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__367:
+__368:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __369
+		goto __370
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __370
+		goto __371
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -84622,25 +84658,25 @@ __367:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __369
-__370:
-	;
-	goto __368
-__368:
-	pEnc += 16
-	goto __367
-	goto __369
-__369:
-	;
-	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __371
-	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18015, libc.VaList(bp+456, zRight))
+	goto __370
 __371:
 	;
-__366:
+	goto __369
+__369:
+	pEnc += 16
+	goto __368
+	goto __370
+__370:
 	;
-__364:
+	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
+		goto __372
+	}
+	Xsqlite3ErrorMsg(tls, pParse, ts+18081, libc.VaList(bp+456, zRight))
+__372:
+	;
+__367:
+	;
+__365:
 	;
 	goto __15
 
@@ -84648,15 +84684,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 __372
+		goto __373
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __374
+		goto __375
 	}
 	goto __15
-__374:
+__375:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -84664,41 +84700,41 @@ __374:
 	(*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 __375
+		goto __376
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__375:
+__376:
 	;
-	goto __373
-__372:
+	goto __374
+__373:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __376
+		goto __377
 	}
 	goto __15
-__376:
+__377:
 	;
 	(*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)
-__373:
+__374:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__377:
+__378:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __378
+		goto __379
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __377
-__378:
+	goto __378
+__379:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -84713,31 +84749,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __379
-	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17345) == 0) {
 		goto __380
 	}
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17364) == 0) {
+		goto __381
+	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __381
-__380:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18040) == 0) {
-		goto __382
+	goto __382
+__381:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18106) == 0) {
+		goto __383
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __383
-__382:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17498) == 0) {
-		goto __384
+	goto __384
+__383:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17517) == 0) {
+		goto __385
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
+__385:
+	;
 __384:
 	;
-__383:
+__382:
 	;
-__381:
-	;
-__379:
+__380:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -84747,10 +84783,10 @@ __379:
 
 __49:
 	if !(zRight != 0) {
-		goto __385
+		goto __386
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__385:
+__386:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -84770,19 +84806,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __386
+		goto __387
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __388
+		goto __389
 	}
 	goto __15
-__388:
+__389:
 	;
-	goto __387
-__386:
-	opMask = U32(0xfffe)
+	goto __388
 __387:
+	opMask = U32(0xfffe)
+__388:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -84791,86 +84827,86 @@ __387:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__389:
+__390:
 	if !(iDb <= iDbLast) {
-		goto __391
-	}
-	if !(iDb == 1) {
 		goto __392
 	}
-	goto __390
-__392:
+	if !(iDb == 1) {
+		goto __393
+	}
+	goto __391
+__393:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__393:
+__394:
 	if !(k4 != 0) {
-		goto __395
+		goto __396
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __396
+		goto __397
 	}
-	goto __394
-__396:
+	goto __395
+__397:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__397:
+__398:
 	if !(pIdx6 != 0) {
-		goto __399
-	}
-	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
 		goto __400
 	}
+	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
+		goto __401
+	}
 	szThreshold = int16(0)
-	goto __399
-__400:
+	goto __400
+__401:
 	;
-	goto __398
-__398:
-	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __397
 	goto __399
 __399:
+	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
+	goto __398
+	goto __400
+__400:
 	;
 	if !(szThreshold != 0) {
-		goto __401
+		goto __402
 	}
 	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))
 
-__401:
+__402:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18048,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18114,
 		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 __402
+		goto __403
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __403
-__402:
-	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+	goto __404
 __403:
+	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+__404:
 	;
-	goto __394
-__394:
-	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __393
 	goto __395
 __395:
+	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
+	goto __394
+	goto __396
+__396:
 	;
-	goto __390
-__390:
-	iDb++
-	goto __389
 	goto __391
 __391:
+	iDb++
+	goto __390
+	goto __392
+__392:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -84878,36 +84914,36 @@ __391:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __404
+		goto __405
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__404:
+__405:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+640) == SQLITE_OK) {
-		goto __405
+		goto __406
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))
-__405:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __406
+		goto __407
 	}
 	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 __407
+		goto __408
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__407:
+__408:
 	;
-__406:
+__407:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -84916,10 +84952,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) >= int64(0)) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656))&int64(0x7fffffff)))
-__408:
+__409:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -84928,10 +84964,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __409
+		goto __410
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) & int64(0x7fffffff))
-__409:
+__410:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -84939,10 +84975,10 @@ __409:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __410
+		goto __411
 	}
 
-__410:
+__411:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -84994,14 +85030,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{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},
+	{FzName: ts + 18132, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18137, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18143, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18152, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18161, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18169, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18177},
+	{FzName: ts + 18184},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -85053,7 +85089,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+18124)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18190)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -85061,7 +85097,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18205, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = uint8(',')
 
 	}
@@ -85074,19 +85110,19 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18146, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18212, 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+18152)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18218)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18164)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18230)
 		j++
 	}
-	Xsqlite3_str_append(tls, bp+32, ts+4957, 1)
+	Xsqlite3_str_append(tls, bp+32, ts+4976, 1)
 	Xsqlite3StrAccumFinish(tls, bp+32)
 
 	rc = Xsqlite3_declare_vtab(tls, db, bp+64)
@@ -85102,7 +85138,7 @@ __3:
 			(*PragmaVtab)(unsafe.Pointer(pTab)).FnHidden = U8(j)
 		}
 	} else {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	}
 
 	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
@@ -85250,7 +85286,7 @@ __1:
 		var zText uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 
 		if zText != 0 {
-			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, zText))
+			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, zText))
 			if *(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) == uintptr(0) {
 				return SQLITE_NOMEM
 			}
@@ -85266,13 +85302,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+18179)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18245)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18187, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18253, 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+18191, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18257, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -85281,7 +85317,7 @@ __3:
 	rc = Xsqlite3_prepare_v2(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
 	Xsqlite3_free(tls, zSql)
 	if rc != SQLITE_OK {
-		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
+		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
 		return rc
 	}
 	return pragmaVtabNext(tls, pVtabCursor)
@@ -85349,33 +85385,33 @@ 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+18195, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18261, 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, 137196)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137249)
 	} else {
 		var z uintptr
 		var zObj uintptr
 		if *(*uintptr)(unsafe.Pointer(azObj + 1*8)) != 0 {
 			zObj = *(*uintptr)(unsafe.Pointer(azObj + 1*8))
 		} else {
-			zObj = ts + 5008
+			zObj = ts + 5027
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18223, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18289, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*uint8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18254, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18320, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137256)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18262,
-	ts + 18269,
-	ts + 18281,
+	ts + 18328,
+	ts + 18335,
+	ts + 18347,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -85435,7 +85471,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+14140)
+				corruptSchema(tls, pData, argv, ts+14159)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -85467,13 +85503,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+18292)
+			corruptSchema(tls, pData, argv, ts+18358)
 		} 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+14140)
+				corruptSchema(tls, pData, argv, ts+14159)
 			}
 		}
 	}
@@ -85506,16 +85542,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 + 8876
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8895
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7938
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18305
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7957
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18371
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -85609,7 +85645,7 @@ __10:
 		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11775)
+		ts+11794)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __15:
@@ -85644,7 +85680,7 @@ __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)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18443)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __19:
@@ -85658,7 +85694,7 @@ __20:
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18401,
+		ts+18467,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -85931,7 +85967,7 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
 	(*Parse)(unsafe.Pointer(pParse)).Fdb = db
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1490, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1509, 0)
 	}
 }
 
@@ -85959,7 +85995,7 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, bp+16, ts+1490, 0)
+	Xsqlite3ErrorMsg(tls, bp+16, ts+1509, 0)
 __1:
 	;
 	if !(prepFlags&U32(SQLITE_PREPARE_PERSISTENT) != 0) {
@@ -85990,7 +86026,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18435, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18501, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -86020,7 +86056,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18465, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18531, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -86080,7 +86116,7 @@ __21:
 	if !((*Parse)(unsafe.Pointer(bp+16)).FzErrMsg != 0) {
 		goto __22
 	}
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3663, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3682, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 	Xsqlite3DbFree(tls, db, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
 	goto __23
 __22:
@@ -86116,7 +86152,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, 137995)
+		return Xsqlite3MisuseError(tls, 138048)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -86215,7 +86251,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, 138143)
+		return Xsqlite3MisuseError(tls, 138196)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -86538,8 +86574,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 + 10920
-		var zSp2 uintptr = ts + 10920
+		var zSp1 uintptr = ts + 10939
+		var zSp2 uintptr = ts + 10939
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -86547,13 +86583,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18484, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18550, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18514))
+var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18580))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -86728,7 +86764,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+18548, libc.VaList(bp, 0))
+					ts+18614, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -86773,7 +86809,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+18598, libc.VaList(bp+8, zName))
+						ts+18664, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -86784,7 +86820,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+18662,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18728,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -86828,7 +86864,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6586, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6605, 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.
@@ -87412,16 +87448,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18699
+		z = ts + 18765
 		break
 	case TK_INTERSECT:
-		z = ts + 18709
+		z = ts + 18775
 		break
 	case TK_EXCEPT:
-		z = ts + 18719
+		z = ts + 18785
 		break
 	default:
-		z = ts + 18726
+		z = ts + 18792
 		break
 	}
 	return z
@@ -87431,7 +87467,7 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18732, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18798, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
@@ -87457,11 +87493,11 @@ 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 {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18821, libc.VaList(bp, func() uintptr {
 		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
-			return ts + 18786
+			return ts + 18852
 		}
-		return ts + 1554
+		return ts + 1573
 	}()))
 
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
@@ -87649,8 +87685,8 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 				}
 
 				if iCol < 0 {
-					zType = ts + 1119
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16267
+					zType = ts + 1138
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16286
 				} 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))
@@ -87789,13 +87825,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16267
+				zCol = ts + 16286
 			} 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+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12080, 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))
@@ -87803,7 +87839,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+18801, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18867, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -87893,7 +87929,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16267
+					zName = ts + 16286
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -87903,7 +87939,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18867, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -87919,7 +87955,7 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18810, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18876, 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)
@@ -88002,8 +88038,6 @@ __1:
 		(*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
@@ -88018,12 +88052,15 @@ __1:
 			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
 				(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_BLOB)
 			}
+			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)
+			}
 		}
 		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
+				zType = ts + 18884
 			} else {
 				zType = uintptr(0)
 				for j = 1; j < SQLITE_N_STDTYPE; j++ {
@@ -88239,7 +88276,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18822, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18888, 0)
 	return
 __1:
 	;
@@ -88330,7 +88367,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18871, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18937, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -88350,7 +88387,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18913, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18979, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -88387,7 +88424,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18919, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18985, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -88421,11 +88458,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+18934, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19000, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
-			return ts + 1554
+			return ts + 1573
 		}
-		return ts + 18957
+		return ts + 19023
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -88526,8 +88563,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18959, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18974, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19025, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19040, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -88574,7 +88611,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18699, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18765, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -88641,7 +88678,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+18993, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19059, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -88703,7 +88740,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+18993, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19059, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -88856,10 +88893,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+19014, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19080, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19060,
+			ts+19126,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -89113,8 +89150,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+7234)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7234)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7242)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7242)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -89141,13 +89178,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+19142, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19208, 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+19153, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19219, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -89159,7 +89196,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+19158, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19224, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -89347,7 +89384,8 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 				Xsqlite3VectorErrorMsg(tls, (*SubstContext)(unsafe.Pointer(pSubst)).FpParse, pCopy)
 			} else {
 				var db uintptr = (*Parse)(unsafe.Pointer((*SubstContext)(unsafe.Pointer(pSubst)).FpParse)).Fdb
-				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 && int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN {
+				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 &&
+					(int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN || (*Expr)(unsafe.Pointer(pCopy)).FiTable != (*SubstContext)(unsafe.Pointer(pSubst)).FiNewTable) {
 					libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
 					(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_IF_NULL_ROW)
 					(*Expr)(unsafe.Pointer(bp)).FpLeft = pCopy
@@ -89387,7 +89425,7 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 								if pColl != 0 {
 									return (*CollSeq)(unsafe.Pointer(pColl)).FzName
 								}
-								return ts + 1099
+								return ts + 1118
 							}())
 					}
 
@@ -90175,12 +90213,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15164) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15183) == 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+15168) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15187) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -90246,7 +90284,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+19164, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19230, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -90329,7 +90367,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+19182, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19248, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -90458,7 +90496,7 @@ 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+19205, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19271, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
@@ -90481,7 +90519,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+19225, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19291, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -90497,7 +90535,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19268
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19334
 		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 {
@@ -90523,7 +90561,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+19291,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19357,
 					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
@@ -90534,9 +90572,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 + 19329
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19395
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19363
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19429
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -90583,7 +90621,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+19401, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19467, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -90695,7 +90733,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19405,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19471,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -90714,7 +90752,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+19444,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19510,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -90722,7 +90760,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+14733,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14752,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -90823,7 +90861,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6446
+							zSchemaName = ts + 6465
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -90838,7 +90876,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+19475, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19541, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -90903,7 +90941,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+19480,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19546,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -90915,7 +90953,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+12061, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12080, 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)
@@ -90934,9 +90972,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19489, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19555, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19507, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19573, 0)
 					}
 				}
 			}
@@ -90946,7 +90984,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+19527, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19593, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -91084,7 +91122,7 @@ func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect ui
 	(*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)
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSelect)).FpGroupBy)).FnExpr)
 		} 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)
 		}
@@ -91168,13 +91206,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19558, 0)
+					ts+19624, 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+19609, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19675, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -91363,19 +91401,19 @@ 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+19642,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19708,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19654
+						return ts + 19720
 					}
-					return ts + 1554
+					return ts + 1573
 				}(),
 				func() uintptr {
 					if bCover != 0 {
 						return (*Index)(unsafe.Pointer(pIdx)).FzName
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
 	}
 }
@@ -91388,7 +91426,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+7938)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7957)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -91695,7 +91733,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19677,
+		ts+19743,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -91756,7 +91794,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19731,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19797,
 		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:
@@ -91860,7 +91898,7 @@ __27:
 	if !((*SrcItem)(unsafe.Pointer(pItem1)).FcolUsed == uint64(0) && (*SrcItem)(unsafe.Pointer(pItem1)).FzName != uintptr(0)) {
 		goto __30
 	}
-	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1554, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
+	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1573, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
 __30:
 	;
 	pSub1 = (*SrcItem)(unsafe.Pointer(pItem1)).FpSelect
@@ -91898,7 +91936,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+19771, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19837, 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)
@@ -91957,7 +91995,7 @@ __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19786, libc.VaList(bp+40, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19852, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
@@ -92428,9 +92466,9 @@ __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 + 19802
+				return ts + 19868
 			}
-			return ts + 19811
+			return ts + 19877
 		}())
 
 	groupBySort = 1
@@ -92781,7 +92819,7 @@ __65:
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
 		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19802)
+	explainTempTable(tls, pParse, ts+19868)
 __146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
@@ -92864,7 +92902,7 @@ __7:
 	if !(i < nCol) {
 		goto __9
 	}
-	z = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
+	z = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
 	if !(z == uintptr(0)) {
 		goto __10
 	}
@@ -92886,7 +92924,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19820, 0)
+		ts+19886, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -92982,7 +93020,7 @@ func Xsqlite3_get_table(tls *libc.TLS, db uintptr, zSql uintptr, pazResult uintp
 		if (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
 			if pzErrMsg != 0 {
 				Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(pzErrMsg)))
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
 			}
 			Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg)
 		}
@@ -93119,7 +93157,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+19885, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19951, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -93163,7 +93201,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19931, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19997, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -93181,7 +93219,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19939, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20005, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -93193,7 +93231,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19931, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19997, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -93208,11 +93246,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19980, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20046, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
+
 __17:
 	;
 	goto trigger_cleanup
@@ -93220,22 +93259,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20006, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20072, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20044,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20110,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20081
+				return ts + 20147
 			}
-			return ts + 20088
+			return ts + 20154
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -93244,7 +93283,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20094, libc.VaList(bp+24, pTableName+8))
+		ts+20160, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -93273,9 +93312,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -93393,7 +93432,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19931, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19997, 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
@@ -93426,7 +93465,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20140,
+		ts+20206,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -93451,13 +93490,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20188,
+		ts+20254,
 		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+20263, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20329, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -93713,7 +93752,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20292, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20358, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -93752,9 +93791,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 + 6389
+				return ts + 6408
 			}
-			return ts + 5883
+			return ts + 5902
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -93766,7 +93805,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20312,
+			ts+20378,
 			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)
@@ -93880,12 +93919,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20374,
+		ts+20440,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20422
+				return ts + 20488
 			}
-			return ts + 20429
+			return ts + 20495
 		}()))
 __15:
 	;
@@ -93999,7 +94038,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+20436, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20502, 0)
 	return 1
 }
 
@@ -94065,7 +94104,7 @@ func codeReturningTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab
 	}
 	Xsqlite3ExprListDelete(tls, db, (*Select)(unsafe.Pointer(bp)).FpEList)
 	pNew = sqlite3ExpandReturning(tls, pParse, (*Returning)(unsafe.Pointer(pReturning)).FpReturnEL, pTab)
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0) {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
 		libc.Xmemset(tls, bp+240, 0, uint64(unsafe.Sizeof(NameContext{})))
 		if (*Returning)(unsafe.Pointer(pReturning)).FnRetCol == 0 {
 			(*Returning)(unsafe.Pointer(pReturning)).FnRetCol = (*ExprList)(unsafe.Pointer(pNew)).FnExpr
@@ -94119,7 +94158,7 @@ func codeTriggerProgram(tls *libc.TLS, pParse uintptr, pStepList uintptr, orconf
 
 		if (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan != 0 {
 			Xsqlite3VdbeAddOp4(tls, v, OP_Trace, 0x7fffffff, 1, 0,
-				Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
+				Xsqlite3MPrintf(tls, db, ts+6099, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
 				-6)
 		}
 
@@ -94229,7 +94268,7 @@ 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+20478, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20544, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
@@ -94822,7 +94861,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20492,
+		ts+20558,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -94854,7 +94893,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20528, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20594, 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:
@@ -94864,7 +94903,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7713
+				return ts + 7732
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -95180,7 +95219,12 @@ __74:
 	goto __77
 __76:
 	flags = WHERE_ONEPASS_DESIRED
-	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) && !(pTrigger != 0) && !(hasFK != 0) && !(chngKey != 0) && !(*(*int32)(unsafe.Pointer(bp + 104)) != 0)) {
+	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) &&
+		!(pTrigger != 0) &&
+		!(hasFK != 0) &&
+		!(chngKey != 0) &&
+		!(*(*int32)(unsafe.Pointer(bp + 104)) != 0) &&
+		(*NameContext)(unsafe.Pointer(bp+40)).FncFlags&NC_Subquery == 0) {
 		goto __78
 	}
 	flags = flags | WHERE_ONEPASS_MULTIROW
@@ -95734,7 +95778,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20547)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20613)
 __169:
 	;
 update_cleanup:
@@ -96040,10 +96084,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+20560, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]uint8{})), bp+216, ts+20626, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20564, libc.VaList(bp+8, bp+216))
+				ts+20630, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -96134,7 +96178,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+12150, -1)
+				ts+12169, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -96166,7 +96210,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+20637, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20641, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20703, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20707, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -96314,14 +96358,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+20645)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20711)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20685)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20751)
 	return SQLITE_ERROR
 __2:
 	;
@@ -96332,7 +96376,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20728)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20794)
 	return SQLITE_ERROR
 __5:
 	;
@@ -96341,7 +96385,7 @@ __5:
 	*(*uint32)(unsafe.Pointer(db + 76)) |= uint32(SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE)
 	goto __4
 __3:
-	zOut = ts + 1554
+	zOut = ts + 1573
 __4:
 	;
 	saved_flags = (*Sqlite3)(unsafe.Pointer(db)).Fflags
@@ -96360,7 +96404,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20746, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20812, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -96380,7 +96424,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20769)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20835)
 	goto end_of_vacuum
 __8:
 	;
@@ -96395,7 +96439,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14503)
+	rc = execSql(tls, db, pzErrMsg, ts+14522)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -96440,7 +96484,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20796,
+		ts+20862,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -96449,7 +96493,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20904,
+		ts+20970,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -96460,7 +96504,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20958,
+		ts+21024,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -96471,7 +96515,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21109,
+		ts+21175,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -96816,7 +96860,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+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12396, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -96900,11 +96944,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+21239, libc.VaList(bp, pParse+272))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21305, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21263,
+			ts+21329,
 			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,
@@ -96914,7 +96958,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21428, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -96975,7 +97019,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+21381, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21447, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -97003,9 +97047,11 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FbDeclared = 0
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = bp + 32
+	(*Table)(unsafe.Pointer(pTab)).FnTabRef++
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{xConstruct})).f(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, pVTable+16, bp+64)
+	Xsqlite3DeleteTable(tls, db, pTab)
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = (*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -97013,9 +97059,9 @@ 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+21423, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21489, libc.VaList(bp+8, zModuleName))
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3682, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 		}
 		Xsqlite3DbFree(tls, db, pVTable)
@@ -97025,7 +97071,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 + 21453
+			var zFormat uintptr = ts + 21519
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -97037,12 +97083,12 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 			*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) = pVTable
 
 			for iCol = 0; iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol); iCol++ {
-				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1554)
+				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1573)
 				var nType int32
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16158, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16177, 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
@@ -97099,13 +97145,13 @@ 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+21499, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21565, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxConnect, bp+16)
 		if rc != SQLITE_OK {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 		}
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 16)))
@@ -97157,7 +97203,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+21499, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21565, 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)
@@ -97191,7 +97237,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, 151030)
+		return Xsqlite3MisuseError(tls, 151102)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -97233,7 +97279,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR,
 			func() uintptr {
 				if (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
-					return ts + 3663
+					return ts + 3682
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg))
@@ -97601,7 +97647,7 @@ func Xsqlite3VtabEponymousTableInit(tls *libc.TLS, pParse uintptr, pMod uintptr)
 	addModuleArgument(tls, pParse, pTab, Xsqlite3DbStrDup(tls, db, (*Table)(unsafe.Pointer(pTab)).FzName))
 	rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer(pModule)).FxConnect, bp+8)
 	if rc != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+		Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		Xsqlite3VtabEponymousTableClear(tls, db, pMod)
 	}
@@ -97644,7 +97690,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, 151521)
+		rc = Xsqlite3MisuseError(tls, 151593)
 	} else {
 		ap = va
 		switch op {
@@ -97671,7 +97717,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 151539)
+				rc = Xsqlite3MisuseError(tls, 151611)
 				break
 
 			}
@@ -97902,10 +97948,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 + 21518
+		return ts + 21584
 	}
 	if i == -1 {
-		return ts + 16267
+		return ts + 16286
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -97914,35 +97960,35 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21525, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21591, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21597, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12786, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 	}
 
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21597, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12786, 1)
 		}
-		Xsqlite3_str_append(tls, pStr, ts+5008, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5027, 1)
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 	}
 }
 
@@ -97959,29 +98005,29 @@ 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+21533, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21599, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21525, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21591, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21536
+				return ts + 21602
 			}
-			return ts + 21541
+			return ts + 21607
 		}(), 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+21549)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21615)
 		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+21551)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21617)
 	}
-	Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+	Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 }
 
 // This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
@@ -98022,11 +98068,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+21553, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21619, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21559
+				return ts + 21625
 			}
-			return ts + 21566
+			return ts + 21632
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -98036,43 +98082,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 + 10976
+					zFmt = ts + 10995
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21571
+				zFmt = ts + 21637
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21604
+				zFmt = ts + 21670
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21629
+				zFmt = ts + 21695
 			} else {
-				zFmt = ts + 21647
+				zFmt = ts + 21713
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21656, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21722, 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 + 16267
-			Xsqlite3_str_appendf(tls, bp+64, ts+21664, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16286
+			Xsqlite3_str_appendf(tls, bp+64, ts+21730, 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+21695, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21761, 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+21705, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21771, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21710,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21776,
 				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+21737, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21803, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -98104,25 +98150,25 @@ 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+21748, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21814, 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+21536, 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+21602, 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+21769, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21835, 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+21525, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21591, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21602, libc.VaList(bp+16, z))
 		}
 	}
-	Xsqlite3_str_append(tls, bp+24, ts+4957, 1)
+	Xsqlite3_str_append(tls, bp+24, ts+4976, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
@@ -99716,7 +99762,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21777, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21843, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -99744,7 +99790,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21792, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21858, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -100262,7 +100308,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+21801, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21867, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -100620,10 +100666,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{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)},
+	{FzOp: ts + 16135, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15466, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14986, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21881, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -101113,12 +101159,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21888, 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+21822, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21888, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -101197,7 +101243,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 + 6769
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7718
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -101291,7 +101337,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 21863
+				return ts + 21929
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -101667,7 +101713,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21870,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21936,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -101683,7 +101729,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 		pRhs = Xsqlite3PExpr(tls, pParse, TK_UPLUS,
 			Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*ExprList_item)(unsafe.Pointer(pArgs+8+uintptr(j)*32)).FpExpr, 0), uintptr(0))
 		pTerm = Xsqlite3PExpr(tls, pParse, TK_EQ, pColRef, pRhs)
-		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ|JT_RIGHT) != 0 {
 			joinType = U32(EP_OuterON)
 		} else {
 			joinType = U32(EP_InnerON)
@@ -102401,7 +102447,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21906, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21972, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -102472,7 +102518,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21932
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21998
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -102646,6 +102692,10 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	var iCur int32
+	var saved_pIdxEpr uintptr
+
+	saved_pIdxEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 
 	addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	for __ccgo := true; __ccgo; __ccgo = iLevel < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel) {
@@ -102689,9 +102739,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, n)
 			var jj int32
 			for jj = 0; jj < n; jj++ {
-				var iCol int32 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(jj)*2)))
-
-				Xsqlite3ExprCodeGetColumnOfTable(tls, v, (*Index)(unsafe.Pointer(pIdx)).FpTable, iCur, iCol, r1+jj)
+				Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pIdx, iCur, jj, r1+jj)
 			}
 			Xsqlite3VdbeAddOp4Int(tls, v, OP_FilterAdd, (*WhereLevel)(unsafe.Pointer(pLevel)).FregFilter, 0, r1, n)
 			Xsqlite3ReleaseTempRange(tls, pParse, r1, n)
@@ -102725,6 +102773,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 		}
 	}
 	Xsqlite3VdbeJumpHere(tls, v, addrOnce)
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = saved_pIdxEpr
 }
 
 func allocateIndexInfo(tls *libc.TLS, pWInfo uintptr, pWC uintptr, mUnusable Bitmask, pSrc uintptr, pmNoOmit uintptr) uintptr {
@@ -102838,7 +102887,7 @@ __3:
 		uint64(unsafe.Sizeof(sqlite3_index_orderby{}))*uint64(nOrderBy)+uint64(unsafe.Sizeof(HiddenIndexInfo1{}))+
 		uint64(unsafe.Sizeof(uintptr(0)))*uint64(nTerm))
 	if pIdxInfo == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1490, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1509, 0)
 		return uintptr(0)
 	}
 	pHidden = pIdxInfo + 1*96
@@ -102960,9 +103009,9 @@ func vtabBestIndex(tls *libc.TLS, pParse uintptr, pTab uintptr, p uintptr) int32
 		if rc == SQLITE_NOMEM {
 			Xsqlite3OomFault(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb)
 		} else if !(int32((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
 		}
 	}
 	Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg)
@@ -102983,11 +103032,16 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 
 	_ = pParse
 
+	if !((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol)
+	} else {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnColumn)
+	}
 	nField = func() int32 {
-		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < (*Index)(unsafe.Pointer(pIdx)).FnSample {
+		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < nField {
 			return int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField)
 		}
-		return (*Index)(unsafe.Pointer(pIdx)).FnSample
+		return nField
 	}()
 	iCol = 0
 	iSample = (*Index)(unsafe.Pointer(pIdx)).FnSample * nField
@@ -104568,7 +104622,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+21943, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+22009, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -104626,7 +104680,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+21943, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+22009, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -105024,7 +105078,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+21969, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+22035, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -105631,7 +105685,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22004, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22070, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -105666,6 +105720,10 @@ __3:
 			if int32((*WherePath)(unsafe.Pointer(pFrom)).FisOrdered) == (*ExprList)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpOrderBy)).FnExpr {
 				(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_ORDERED)
 			}
+			if (*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy != 0 &&
+				int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) > (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr {
+				(*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat = I8((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr)
+			}
 		} else {
 			(*WhereInfo)(unsafe.Pointer(pWInfo)).FrevMask = (*WherePath)(unsafe.Pointer(pFrom)).FrevLoop
 			if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) <= 0 {
@@ -105960,6 +106018,9 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
+		if Xsqlite3IndexAffinityStr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pIdx) != 0 {
+			(*IndexedExpr)(unsafe.Pointer(p)).Faff = *(*uint8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FzColAff + uintptr(i)))
+		}
 		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
@@ -106112,7 +106173,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22022, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22088, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -106176,7 +106237,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22050, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22116, 0)
 	goto __5
 __4:
 	ii = 0
@@ -107058,7 +107119,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22068, -1)
+		pCtx, ts+22134, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -107191,7 +107252,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+22124, -1)
+					pCtx, ts+22190, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -107281,17 +107342,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-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))
+var row_numberName = *(*[11]uint8)(unsafe.Pointer(ts + 22235))
+var dense_rankName = *(*[11]uint8)(unsafe.Pointer(ts + 22246))
+var rankName = *(*[5]uint8)(unsafe.Pointer(ts + 22257))
+var percent_rankName = *(*[13]uint8)(unsafe.Pointer(ts + 22262))
+var cume_distName = *(*[10]uint8)(unsafe.Pointer(ts + 22275))
+var ntileName = *(*[6]uint8)(unsafe.Pointer(ts + 22285))
+var last_valueName = *(*[11]uint8)(unsafe.Pointer(ts + 22291))
+var nth_valueName = *(*[10]uint8)(unsafe.Pointer(ts + 22302))
+var first_valueName = *(*[12]uint8)(unsafe.Pointer(ts + 22312))
+var leadName = *(*[5]uint8)(unsafe.Pointer(ts + 22324))
+var lagName = *(*[4]uint8)(unsafe.Pointer(ts + 22329))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -107337,7 +107398,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22267, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22333, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -107381,12 +107442,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+22286, 0)
+			ts+22352, 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+22357, 0)
+				ts+22423, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -107409,7 +107470,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+7938)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7957)
 					}
 					break
 				}
@@ -107615,7 +107676,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+22420, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22486, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -107731,7 +107792,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+7530))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -107846,7 +107907,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22446, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22512, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -107911,15 +107972,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 + 22478
+				zErr = ts + 22544
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22495
+				zErr = ts + 22561
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22511
+				zErr = ts + 22577
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22531, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22597, 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 {
@@ -107940,7 +108001,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+22564, 0)
+				ts+22630, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -108078,7 +108139,7 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regZero)
 	if eCond >= WINDOW_STARTING_NUM {
 		var regString int32 = Xsqlite3GetTempReg(tls, pParse)
-		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1554, -1)
+		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1573, -1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, Xsqlite3VdbeCurrentAddr(tls, v)+2, reg)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL))
 
@@ -108096,11 +108157,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22611,
-	ts + 22664,
-	ts + 22068,
-	ts + 22715,
-	ts + 22767,
+	ts + 22677,
+	ts + 22730,
+	ts + 22134,
+	ts + 22781,
+	ts + 22833,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -108591,7 +108652,7 @@ func windowCodeRangeTest(tls *libc.TLS, p uintptr, op int32, csr1 int32, regVal
 
 	}
 
-	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1554, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1573, -1)
 	addrGe = Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, 0, reg1)
 
 	if op == OP_Ge && arith == OP_Add || op == OP_Le && arith == OP_Subtract {
@@ -109495,19 +109556,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+22817,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22883,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 22859
+							return ts + 22925
 						}
-						return ts + 22868
+						return ts + 22934
 					}(),
 						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+22874, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22940, 0)
 		}
 	}
 
@@ -109575,7 +109636,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+22908,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22974,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -110672,7 +110733,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22946, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23012, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -111647,21 +111708,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+16267, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16286, 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+22968, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23034, 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+16180, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16199, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23034, 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))
@@ -112404,7 +112465,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+22995)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+23061)
 				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 {
@@ -112568,7 +112629,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+23004, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23070, 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))
@@ -112785,9 +112846,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 + 6764
+							return ts + 7713
 						}
-						return ts + 6769
+						return ts + 7718
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -113071,19 +113132,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+23028, 0)
+					ts+23094, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23123, 0)
+					ts+23189, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23207, 0)
+					ts+23273, 0)
 			}
 			break
 		case uint32(273):
@@ -113462,9 +113523,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+23004, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23070, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23292, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23358, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -114232,7 +114293,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+23309, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23375, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -114253,9 +114314,9 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 	}
 	if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg != 0 || (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_OK && (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_DONE {
 		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)))
+			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3682, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23334, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23400, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -114428,7 +114489,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23411, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -114441,11 +114502,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19931, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19997, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23352, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23418, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23357, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23423, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -114458,9 +114519,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23367, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23433, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23371, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23437, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -114535,7 +114596,8 @@ func sqlite3TestExtInit(tls *libc.TLS, db uintptr) int32 {
 	return Xsqlite3FaultSim(tls, 500)
 }
 
-var sqlite3BuiltinExtensions = [4]uintptr{
+var sqlite3BuiltinExtensions = [5]uintptr{
+	0,
 	0,
 	0,
 	0,
@@ -114699,7 +114761,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 174337)
+		return Xsqlite3MisuseError(tls, 174426)
 	}
 
 	ap = va
@@ -115274,7 +115336,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175111)
+		return Xsqlite3MisuseError(tls, 175200)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -115289,7 +115351,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23379, 0)
+			ts+23445, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -115480,23 +115542,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 + 23447
+	var zErr uintptr = ts + 23513
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23461
+			zErr = ts + 23527
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23483
+			zErr = ts + 23549
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23505
+			zErr = ts + 23571
 			break
 
 		}
@@ -115514,35 +115576,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23528,
-	ts + 23541,
+	ts + 23594,
+	ts + 23607,
 	uintptr(0),
-	ts + 23557,
-	ts + 23582,
-	ts + 23596,
-	ts + 23615,
-	ts + 1490,
-	ts + 23640,
-	ts + 23677,
-	ts + 23689,
-	ts + 23704,
-	ts + 23737,
+	ts + 23623,
+	ts + 23648,
+	ts + 23662,
+	ts + 23681,
+	ts + 1509,
+	ts + 23706,
+	ts + 23743,
 	ts + 23755,
-	ts + 23780,
-	ts + 23809,
+	ts + 23770,
+	ts + 23803,
+	ts + 23821,
+	ts + 23846,
+	ts + 23875,
 	uintptr(0),
-	ts + 5838,
-	ts + 5334,
-	ts + 23826,
-	ts + 23844,
-	ts + 23862,
+	ts + 5857,
+	ts + 5353,
+	ts + 23892,
+	ts + 23910,
+	ts + 23928,
 	uintptr(0),
-	ts + 23896,
+	ts + 23962,
 	uintptr(0),
-	ts + 23917,
-	ts + 23943,
-	ts + 23966,
-	ts + 23987,
+	ts + 23983,
+	ts + 24009,
+	ts + 24032,
+	ts + 24053,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -115663,7 +115725,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, 175758)
+		return Xsqlite3MisuseError(tls, 175847)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -115713,7 +115775,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+24003, 0)
+				ts+24069, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -115835,7 +115897,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+24066, libc.VaList(bp, zName))
+		ts+24132, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -115863,7 +115925,7 @@ func Xsqlite3_overload_function(tls *libc.TLS, db uintptr, zName uintptr, nArg i
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, zName))
+	zCopy = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, zName))
 	if zCopy == uintptr(0) {
 		return SQLITE_NOMEM
 	}
@@ -116071,7 +116133,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+24117, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24183, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -116164,7 +116226,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, 176503))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176592))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -116234,7 +116296,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, 176582)
+		return Xsqlite3MisuseError(tls, 176671)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -116244,7 +116306,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, 176591)
+		return Xsqlite3MisuseError(tls, 176680)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -116281,14 +116343,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		}()
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 176639)
+		return Xsqlite3MisuseError(tls, 176728)
 	}
 
 	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+24138, 0)
+				ts+24204, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -116418,7 +116480,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+24206, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24272, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -116463,10 +116525,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24212, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24278, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24222,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24288,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -116571,7 +116633,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24250, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24316, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -116582,17 +116644,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24254, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24320, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24254
+	zModeType = ts + 24320
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24260, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24326, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -116600,7 +116662,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 3272
+	zModeType = ts + 3291
 __32:
 	;
 	if !(aMode != 0) {
@@ -116630,7 +116692,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24265, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24331, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -116638,7 +116700,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24285,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24351,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -116678,7 +116740,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24309, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24375, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -116702,15 +116764,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24325, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24332, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24391, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24398, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{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},
+	{Fz: ts + 24406, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24409, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24412, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17381, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -116856,10 +116918,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+21863, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21929, 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+24350, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24416, 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) {
@@ -116873,7 +116935,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 177308)
+	rc = Xsqlite3MisuseError(tls, 177397)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -116890,7 +116952,7 @@ __19:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -116924,9 +116986,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 + 6441
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6460
 	(*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 + 23352
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23418
 	(*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)
@@ -117031,7 +117093,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24356
+		zFilename = ts + 24422
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, func() uint8 {
@@ -117149,21 +117211,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+24359,
+	Xsqlite3_log(tls, iErr, ts+24425,
 		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+24384)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24450)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24404)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24470)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24411)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24477)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -117274,7 +117336,7 @@ __4:
 	autoinc = libc.Bool32(int32((*Table)(unsafe.Pointer(pTab)).FiPKey) == iCol && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != U32(0))
 	goto __13
 __12:
-	zDataType = ts + 1119
+	zDataType = ts + 1138
 	primarykey = 1
 __13:
 	;
@@ -117321,14 +117383,14 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24428, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24494, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -117977,7 +118039,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24456, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24522, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -118095,7 +118157,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 + 24464
+			return ts + 24530
 		}
 		return uintptr(0)
 	}(), 0)
@@ -118273,7 +118335,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6181, ts + 6764, ts + 6769, ts + 6191, ts + 6186, ts + 8005, ts + 24487, ts + 24493,
+	ts + 6200, ts + 7713, ts + 7718, ts + 6210, ts + 6205, ts + 8024, ts + 24553, ts + 24559,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -118426,7 +118488,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 + 24500 + uintptr(int32(c)&0xf)))
+	c = *(*uint8)(unsafe.Pointer(ts + 24566 + uintptr(int32(c)&0xf)))
 __8:
 	;
 __6:
@@ -118452,7 +118514,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	switch Xsqlite3_value_type(tls, pValue) {
 	case SQLITE_NULL:
 		{
-			jsonAppendRaw(tls, p, ts+6181, uint32(4))
+			jsonAppendRaw(tls, p, ts+6200, uint32(4))
 			break
 
 		}
@@ -118481,7 +118543,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+24517, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24583, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -118539,19 +118601,19 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 	switch int32((*JsonNode)(unsafe.Pointer(pNode)).FeType) {
 	default:
 		{
-			jsonAppendRaw(tls, pOut, ts+6181, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6200, uint32(4))
 			break
 
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6764, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+7713, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6769, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+7718, uint32(5))
 			break
 
 		}
@@ -119096,17 +119158,17 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		}
 		return int32(j + U32(1))
 	} else if int32(c) == 'n' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6181, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6200, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(z + uintptr(i+U32(4))))])&0x06 != 0) {
 		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+6764, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7713, 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+6769, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7718, 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))
@@ -119207,7 +119269,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+24546, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24612, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -119513,7 +119575,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+24561, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24627, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -119528,7 +119590,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24565, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24631, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -119582,7 +119644,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+24591,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24657,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -119687,11 +119749,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+24634, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24700, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
-					jsonAppendRaw(tls, bp, ts+4998, uint32(2))
+					jsonAppendRaw(tls, bp, ts+5017, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24637, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24703, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, uint8(0))
 				}
@@ -119732,7 +119794,7 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if pNode != 0 {
 				jsonRenderNode(tls, pNode, bp, uintptr(0))
 			} else {
-				jsonAppendRaw(tls, bp, ts+6181, uint32(4))
+				jsonAppendRaw(tls, bp, ts+6200, uint32(4))
 			}
 		}
 		if i == argc {
@@ -119848,14 +119910,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24640, -1)
+			ts+24706, -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+24691, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24757, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -119950,7 +120012,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15380)
+	jsonWrongNumArgs(tls, ctx, ts+15399)
 	return
 __2:
 	;
@@ -120025,9 +120087,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24725
+			return ts + 24791
 		}
-		return ts + 24729
+		return ts + 24795
 	}())
 	return
 __2:
@@ -120160,7 +120222,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24736, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24802, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -120257,7 +120319,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24739, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24805, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -120301,7 +120363,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24742)
+		ts+24808)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -120432,7 +120494,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24825, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24891, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -120451,7 +120513,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+24831, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24897, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -120547,7 +120609,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+24831, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24897, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -120571,7 +120633,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 + 24836
+				zRoot = ts + 24902
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -120693,7 +120755,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+24546, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24612, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -120788,25 +120850,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{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 + 24904},
+	{FnArg: int8(-1), 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(2), 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 + 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}}
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24951},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24954},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24958},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24970},
+	{FnArg: int8(2), 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_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24993},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25004},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25016},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 25029},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25038},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25038},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25048},
+	{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 + 25059},
+	{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 + 25076}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -120825,8 +120887,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 25028, FpModule: 0},
-	{FzName: ts + 25038, FpModule: 0},
+	{FzName: ts + 25094, FpModule: 0},
+	{FzName: ts + 25104, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -121086,11 +121148,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+25048, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25114, 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+25056, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25122, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -121301,7 +121363,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+25061,
+		ts+25127,
 		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))
@@ -121999,7 +122061,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25143)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25209)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -122211,7 +122273,7 @@ func rtreeBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 2
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FneedToFreeIdxStr = 1
-	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, bp+8))) {
+	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, bp+8))) {
 		return SQLITE_NOMEM
 	}
 
@@ -123340,7 +123402,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25157, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25223, 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 {
@@ -123352,12 +123414,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+25177, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25243, 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+25209, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25275, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -123583,7 +123645,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+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))
+		ts+25312, 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))
@@ -123606,14 +123668,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25391
+	var zFmt uintptr = ts + 25457
 	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+11348, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11367, 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 {
@@ -123654,7 +123716,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25447, ts + 5060, ts + 16267,
+	ts + 25513, ts + 5079, ts + 16286,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -123697,19 +123759,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+25452,
+			ts+25518,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25514, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25580, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25519,
+			ts+25585,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25583,
+			ts+25649,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25653,
+			ts+25719,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -123738,7 +123800,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 + 25702
+			zFormat = ts + 25768
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -123750,7 +123812,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+25810,
+			ts+25876,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -123758,18 +123820,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+25855, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25921, 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+12767, 1)
+					Xsqlite3_str_append(tls, p, ts+12786, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25882, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25948, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25904, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25970, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25912, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25978, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -123784,14 +123846,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25928,
-	ts + 25981,
-	ts + 26026,
-	ts + 26078,
-	ts + 26132,
-	ts + 26177,
-	ts + 26235,
-	ts + 26290,
+	ts + 25994,
+	ts + 26047,
+	ts + 26092,
+	ts + 26144,
+	ts + 26198,
+	ts + 26243,
+	ts + 26301,
+	ts + 26356,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -123820,7 +123882,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+26337, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26403, 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
@@ -123828,19 +123890,19 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 				(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = 4 + int32((*Rtree)(unsafe.Pointer(pRtree)).FnBytesPerCell)*RTREE_MAXCELLS
 			}
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26357,
+			ts+26423,
 			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 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26414,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26480,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -123882,16 +123944,16 @@ 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 + 26449,
-		ts + 26492,
-		ts + 26527,
-		ts + 26563,
+		ts + 26515,
+		ts + 26558,
+		ts + 26593,
+		ts + 26629,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
 		goto __1
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
 	return SQLITE_ERROR
 __1:
 	;
@@ -123916,7 +123978,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+26600,
+	Xsqlite3_str_appendf(tls, pSql, ts+26666,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -123928,7 +123990,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26624, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26690, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -123951,7 +124013,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26696, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -123962,14 +124024,14 @@ __10:
 	if !(ii < argc) {
 		goto __12
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
 	rc = SQLITE_ERROR
 	goto __13
 __12:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __14
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
 __14:
 	;
 __13:
@@ -124012,7 +124074,7 @@ __17:
 	if !(iErr != 0) {
 		goto __22
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
 	goto rtreeInit_fail
 __22:
 	;
@@ -124029,7 +124091,7 @@ __23:
 	if !(rc != 0) {
 		goto __24
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
 	goto rtreeInit_fail
 __24:
 	;
@@ -124047,7 +124109,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26633, ts + 26644}
+var azFormat = [2]uintptr{ts + 26699, ts + 26710}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -124085,13 +124147,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+10920, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10939, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26654, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26720, 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+26660, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26726, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26664, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26730, 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})))
@@ -124102,7 +124164,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+26666, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26732, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -124180,12 +124242,12 @@ 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+26699,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26765,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
-						return ts + 4062
+						return ts + 4081
 					}
-					return ts + 1554
+					return ts + 1573
 				}(), z))
 			if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport == uintptr(0) {
 				(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
@@ -124204,7 +124266,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+26706,
+			ts+26772,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -124223,7 +124285,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+26751, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26817, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -124237,8 +124299,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 + 26783,
-		ts + 26837,
+		ts + 26849,
+		ts + 26903,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -124253,23 +124315,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+26885,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26951,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26930
+					return ts + 26996
 				}
-				return ts + 26938
+				return ts + 27004
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26947,
+				ts+27013,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26930
+						return ts + 26996
 					}
-					return ts + 26938
+					return ts + 27004
 				}(), iKey, iVal))
 		}
 	}
@@ -124293,7 +124355,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+27005, libc.VaList(bp, i, iCell, iNode))
+				ts+27071, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -124313,7 +124375,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+27053, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27119, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -124330,14 +124392,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+27120, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27186, 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+27154, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27220, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -124345,7 +124407,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+27184,
+					ts+27250,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -124374,14 +124436,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+27239,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27305,
 			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+27270, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27336, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -124403,12 +124465,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+14503, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14522, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27337, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27403, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -124417,12 +124479,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25157, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25223, 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+27365, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27431, 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)
 		}
@@ -124436,8 +124498,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+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27403, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27462, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27469, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -124445,7 +124507,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+27411, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27477, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -124460,7 +124522,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27415, -1)
+			ts+27481, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -124468,7 +124530,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6441
+			zDb = ts + 6460
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -124478,7 +124540,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 + 18012
+				return ts + 18078
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -124849,11 +124911,11 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		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+27466, 1)
+		Xsqlite3_str_append(tls, x, ts+27532, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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+27534, 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+27479, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27545, 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)
 	}
@@ -124873,19 +124935,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+27490, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27556, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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)))))
+			Xsqlite3_str_appendf(tls, x, ts+27574, 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+27516, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27582, 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+27524, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27590, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27528, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27594, 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)
 	}
@@ -125805,7 +125867,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+27541, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27607, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -125814,7 +125876,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27563, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27629, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -125822,7 +125884,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26696, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -125833,7 +125895,7 @@ __5:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __7
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
 __7:
 	;
 __6:
@@ -125858,7 +125920,7 @@ __9:
 	if !(rc != 0) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	goto geopolyInit_fail
 __10:
 	;
@@ -126049,7 +126111,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 + 16267
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16286
 		(*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
@@ -126059,7 +126121,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 + 27567
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27633
 		(*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
@@ -126067,7 +126129,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 + 27573
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27639
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -126179,7 +126241,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27582, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27648, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -126311,14 +126373,14 @@ geopoly_update_end:
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
 	_ = pVtab
 	_ = nArg
-	if Xsqlite3_stricmp(tls, zName, ts+27622) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27688) == 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+27638) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27704) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -126383,7 +126445,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+27653, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27719, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -126395,25 +126457,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{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},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27727},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27740},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27753},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27766},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27704},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27778},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27688},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27801},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27815},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27828},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27842},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27858},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27804},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27870},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -126423,26 +126485,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27823, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27889, 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+27833, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27899, 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+27844, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27910, -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+27567, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27633, 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+27855, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27921, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -126496,7 +126558,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+25143, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25209, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -126823,7 +126885,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+27865, -1)
+		Xsqlite3_result_error(tls, context, ts+27931, -1)
 		return
 	}
 
@@ -126834,7 +126896,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+27865, -1)
+			Xsqlite3_result_error(tls, context, ts+27931, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -126847,7 +126909,7 @@ func prepareAndCollectError(tls *libc.TLS, db uintptr, ppStmt uintptr, pzErrmsg
 
 	var rc int32 = Xsqlite3_prepare_v2(tls, db, zSql, -1, ppStmt, uintptr(0))
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 		*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	}
 	return rc
@@ -126859,7 +126921,7 @@ func resetAndCollectError(tls *libc.TLS, pStmt uintptr, pzErrmsg uintptr) int32
 
 	var rc int32 = Xsqlite3_reset(tls, pStmt)
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
 	}
 	return rc
 }
@@ -126935,7 +126997,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+27886, uintptr(0), uintptr(0), p+64)
+				ts+27952, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -126999,7 +127061,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+25056, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25122, 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++ {
 				}
@@ -127020,16 +127082,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+28057, libc.VaList(bp, func() uintptr {
+			ts+28123, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28207
+					return ts + 28273
 				}
-				return ts + 1554
+				return ts + 1573
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28248)
+			ts+28314)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -127127,7 +127189,7 @@ func rbuFinalize(tls *libc.TLS, p uintptr, pStmt uintptr) {
 	var rc int32 = Xsqlite3_finalize(tls, pStmt)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && rc != SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 	}
 }
 
@@ -127145,7 +127207,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+28373, libc.VaList(bp, zTab)))
+			ts+28439, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -127163,7 +127225,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+28492, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28558, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -127181,7 +127243,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28513, libc.VaList(bp+16, zIdx)))
+			ts+28579, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -127204,7 +127266,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+28564, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28630, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -127250,7 +127312,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+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28651, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -127265,7 +127327,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+28613, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28679, 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 {
@@ -127305,7 +127367,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+19489, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19555, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -127315,18 +127377,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+28642, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28708, 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+28661, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28727, 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+28666, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28732, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -127338,18 +127400,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+28676, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28742, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28705
+							return ts + 28771
 						}
-						return ts + 28718
+						return ts + 28784
 					}()))
 		}
 
 		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+28727, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28793, 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)
@@ -127363,7 +127425,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+28749,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28815,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -127406,12 +127468,12 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	defer tls.Free(24)
 
 	var zList uintptr = uintptr(0)
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	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+28776, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14614
+		zList = rbuMPrintf(tls, p, ts+28842, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14633
 	}
 	return zList
 }
@@ -127422,13 +127484,13 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 
 	var iPk int32 = 1
 	var zRet uintptr = uintptr(0)
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	for 1 != 0 {
 		var i int32
 		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+28785, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28851, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -127450,25 +127512,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+28798, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28864, 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+28830, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28896, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		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)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+28919)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28925, ts+28932, ts+4976)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+1573)
 
 		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+28874,
+					ts+28940,
 					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+28916, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28982, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -127505,12 +127567,12 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	zVector = uintptr(0)
 	zRet = uintptr(0)
 	bFailed = 0
-	zSep = ts + 1554
+	zSep = ts + 1573
 	iCol = 0
 	*(*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+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28679, 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
@@ -127545,7 +127607,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 28936
+	zCol = ts + 29002
 __7:
 	;
 	goto __5
@@ -127553,13 +127615,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28944,
+	zLhs = rbuMPrintf(tls, p, ts+29010,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28965,
+	zOrder = rbuMPrintf(tls, p, ts+29031,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+29001,
+	zSelect = rbuMPrintf(tls, p, ts+29067,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14614
+	zSep = ts + 14633
 	iCol++
 	goto __1
 __2:
@@ -127577,12 +127639,12 @@ __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+29028,
+		Xsqlite3_mprintf(tls, ts+29094,
 			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
 	}
-	zSep = ts + 1554
+	zSep = ts + 1573
 	iCol = 0
 __14:
 	if !(iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnCol) {
@@ -127604,8 +127666,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14614
+	zVector = rbuMPrintf(tls, p, ts+29142, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14633
 	goto __15
 __15:
 	iCol++
@@ -127616,7 +127678,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29083, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29149, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -127643,13 +127705,13 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 	var zImpPK uintptr = uintptr(0)
 	var zWhere uintptr = uintptr(0)
 	var nBind int32 = 0
-	var zCom uintptr = ts + 1554
-	var zAnd uintptr = ts + 1554
+	var zCom uintptr = ts + 1573
+	var zAnd uintptr = ts + 1573
 	*(*uintptr)(unsafe.Pointer(bp + 200)) = uintptr(0)
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -127661,9 +127723,9 @@ 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+29095, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29161, 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
+			zType = ts + 1573
 		} else {
 			if iCid < 0 {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK {
@@ -127673,37 +127735,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 + 28936
+					zCol = ts + 29002
 				} else {
-					zCol = ts + 28666
+					zCol = ts + 28732
 				}
-				zType = ts + 1119
+				zType = ts + 1138
 			} 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+29117, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29183, 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 + 28853
+					return ts + 28919
 				}
-				return ts + 1554
+				return ts + 1573
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29137,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29203,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29158,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29224,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29191, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29257, 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 + 14614
-		zAnd = ts + 21525
+		zCom = ts + 14633
+		zAnd = ts + 21591
 		nBind++
 	}
 
@@ -127737,16 +127799,16 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 
 	var zList uintptr = uintptr(0)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
-		var zS uintptr = ts + 1554
+		var zS uintptr = ts + 1573
 		var i int32
 		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+29215, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29281, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29227, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29293, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14614
+			zS = ts + 14633
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -127754,7 +127816,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+29236, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29302, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -127766,27 +127828,27 @@ 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+29251, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29317, 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 zSep uintptr = ts + 1573
 		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+29265, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21525
+				zList = rbuMPrintf(tls, p, ts+29331, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21591
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29277, libc.VaList(bp+40, zList))
+			ts+29343, libc.VaList(bp+40, zList))
 
 	} else {
-		var zSep uintptr = ts + 1554
+		var zSep uintptr = ts + 1573
 		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 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29327, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21525
+				zList = rbuMPrintf(tls, p, ts+29393, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21591
 			}
 		}
 	}
@@ -127795,7 +127857,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+29340, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29406, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -127809,21 +127871,21 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 		if int32(libc.Xstrlen(tls, zMask)) != (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 			rbuBadControlError(tls, p)
 		} else {
-			var zSep uintptr = ts + 1554
+			var zSep uintptr = ts + 1573
 			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+29327,
+					zList = rbuMPrintf(tls, p, ts+29393,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14614
+					zSep = ts + 14633
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29366,
+					zList = rbuMPrintf(tls, p, ts+29432,
 						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 + 14614
+					zSep = ts + 14633
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29396,
+					zList = rbuMPrintf(tls, p, ts+29462,
 						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 + 14614
+					zSep = ts + 14633
 				}
 			}
 		}
@@ -127858,19 +127920,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 + 29433
+		var zSep uintptr = ts + 29499
 		*(*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+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28651, 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+16155) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16174) == 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+28613, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -127882,15 +127944,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 + 28853
+					zDesc = ts + 28919
 				} else {
-					zDesc = ts + 1554
+					zDesc = ts + 1573
 				}
-				z = rbuMPrintf(tls, p, ts+29446, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14614
+				z = rbuMPrintf(tls, p, ts+29512, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14633
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29457, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29523, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -127905,12 +127967,12 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		*(*uintptr)(unsafe.Pointer(bp + 168)) = uintptr(0)
 		var zIdx uintptr = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
-		var zComma uintptr = ts + 1554
+		var zComma uintptr = ts + 1573
 		var zCols uintptr = uintptr(0)
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29461)
+			ts+29527)
 		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))) {
@@ -127919,7 +127981,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+28613, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -127929,25 +127991,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+29511, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29577, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29533, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29599, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28853
+						return ts + 28919
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
-				zComma = ts + 14614
+				zComma = ts + 14633
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29543, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29609, 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+6441, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29558,
+			ts+29624,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 0))
 	}
 }
 
@@ -127957,50 +128019,50 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
 		var tnum int32 = (*RbuObjIter)(unsafe.Pointer(pIter)).FiTnum
-		var zComma uintptr = ts + 1554
+		var zComma uintptr = ts + 1573
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
-			var zPk uintptr = ts + 1554
+			var zPk uintptr = ts + 1573
 			var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCol)*8))
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, (*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 + 29620
+				zPk = ts + 29686
 			}
-			zSql = rbuMPrintf(tls, p, ts+29633,
+			zSql = rbuMPrintf(tls, p, ts+29699,
 				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 + 29660
+							return ts + 29726
 						}
-						return ts + 1554
+						return ts + 1573
 					}()))
-			zComma = ts + 14614
+			zComma = ts + 14633
 		}
 
 		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+29670, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29736, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		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,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29743,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29709
+						return ts + 29775
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 0))
 	}
 }
 
@@ -128013,7 +128075,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+29724,
+				ts+29790,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -128050,7 +128112,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+29781)
+			ts+29847)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -128155,7 +128217,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+29847, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29913, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -128175,24 +128237,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+6441, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29867,
+				ts+29933,
 				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+6441, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 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+29932, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29998, 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+29968, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+30034, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -128208,7 +128270,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30002,
+						ts+30068,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -128216,31 +128278,31 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 30063
+											return ts + 30129
 										}
-										return ts + 30067
+										return ts + 30133
 									}()
 								}
-								return ts + 1554
+								return ts + 1573
 							}(), zStart,
 							zCollist, zLimit))
 					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+30073,
+						ts+30139,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30134,
+						ts+30200,
 						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 + 30063
+									return ts + 30129
 								}
-								return ts + 30067
+								return ts + 30133
 							}(),
 							zCollist, zLimit))
 				}
@@ -128265,8 +128327,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+6452)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6448)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6471)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6467)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -128275,52 +128337,52 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			rbuCreateImposterTable2(tls, p, pIter)
 			zWrite = func() uintptr {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
-					return ts + 1554
+					return ts + 1573
 				}
-				return ts + 30293
+				return ts + 30359
 			}()
 
 			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+30302,
+						ts+30368,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30338
+								return ts + 30404
 							}
-							return ts + 1554
+							return ts + 1573
 						}(), zBindings)))
 			}
 
 			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+30348, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30414, 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
+				var zRbuRowid uintptr = ts + 1573
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30376
+					zRbuRowid = ts + 30442
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30388, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30454, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30464
+							return ts + 30530
 						}
-						return ts + 1554
+						return ts + 1573
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30481,
+					ts+30547,
 					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+30780,
+						ts+30846,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -128328,14 +128390,14 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-				var zRbuRowid uintptr = ts + 1554
+				var zRbuRowid uintptr = ts + 1573
 				var zStart uintptr = uintptr(0)
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30879
+						zRbuRowid = ts + 30945
 					} else {
-						zRbuRowid = ts + 30889
+						zRbuRowid = ts + 30955
 					}
 				}
 
@@ -128348,35 +128410,35 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28936, 0)
+						zOrder = rbuMPrintf(tls, p, ts+29002, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+1573)
 					}
 				}
 
 				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+30900,
+							ts+30966,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30948
+										return ts + 31014
 									}
-									return ts + 1554
+									return ts + 1573
 								}(),
 								zRbuRowid,
 								(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 									if zStart != 0 {
 										return zStart
 									}
-									return ts + 1554
+									return ts + 1573
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 22859
+										return ts + 22925
 									}
-									return ts + 1554
+									return ts + 1573
 								}(), zOrder,
 								zLimit)))
 				}
@@ -128439,12 +128501,12 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 		(*RbuObjIter)(unsafe.Pointer(pIter)).FpRbuUpdate = pUp
 
 		if zSet != 0 {
-			var zPrefix uintptr = ts + 1554
+			var zPrefix uintptr = ts + 1573
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30293
+				zPrefix = ts + 30359
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30954,
+			zUpdate = Xsqlite3_mprintf(tls, ts+31020,
 				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)
@@ -128471,7 +128533,7 @@ func rbuOpenDbhandle(tls *libc.TLS, p uintptr, zName uintptr, bUseVfs int32) uin
 			return uintptr(0)
 		}())
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
 			Xsqlite3_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 			*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 		}
@@ -128503,7 +128565,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+30984, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+31050, 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:
@@ -128573,28 +128635,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+6441, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460, 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+6441)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31014, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31080, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		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))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31108, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.Xmemcpy(tls, p+48, ts+3305, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+6441, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+6460, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31060, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31126, 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+6441, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -128627,11 +128689,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+31126, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31192, 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+24206, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24272, (*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)))) == '?' {
@@ -128643,16 +128705,16 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31158,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441),
+			zTarget = Xsqlite3_mprintf(tls, ts+31224,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460),
 					func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1554
+							return ts + 1573
 						}
-						return ts + 31190
+						return ts + 31256
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1554
+							return ts + 1573
 						}
 						return zExtra
 					}()))
@@ -128668,37 +128730,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+31192, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31258, -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+31207, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31273, 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+31224, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31290, -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+6441, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31306, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 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+31268, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31334, 0)
 	}
 }
 
@@ -128727,14 +128789,14 @@ 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+31240, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31306, 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+31286, uintptr(0), uintptr(0), uintptr(0))
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31352, uintptr(0), uintptr(0), uintptr(0))
 		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
@@ -128843,7 +128905,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+6441, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6460, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -128860,23 +128922,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+31321, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31387, 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+6441)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460)
 	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+6441)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31353, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31412, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31419, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -128993,7 +129055,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+23844, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23910, 0)
 			return
 		}
 
@@ -129086,7 +129148,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+31360)
+			ts+31426)
 		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)
@@ -129094,7 +129156,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+31382, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31448, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -129115,7 +129177,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+31409,
+				ts+31475,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -129145,9 +129207,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+31567, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31633, 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+31582,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31648,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -129161,10 +129223,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+31602, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31668, 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+31627)
+			ts+31693)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -129178,12 +129240,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+31735)
+			ts+31801)
 	}
 
 	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+31800)
+			ts+31866)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -129195,7 +129257,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+31844, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31910, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -129215,15 +129277,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+17240)
-					rbuCopyPragma(tls, p, ts+16351)
+					rbuCopyPragma(tls, p, ts+17259)
+					rbuCopyPragma(tls, p, ts+16370)
 				}
 
 				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+31869, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31935, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -129247,10 +129309,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+14518, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, 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+14518, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -129345,7 +129407,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+31897, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31963, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -129361,10 +129423,10 @@ func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31346, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31412, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 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)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
@@ -129378,7 +129440,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+31922, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]uint8{})), bp+12, ts+31988, 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)
@@ -129412,7 +129474,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+31933, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31999, 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 {
@@ -129442,13 +129504,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+32005, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32071, 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+32019)
+				ts+32085)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -129459,7 +129521,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+32076)
+				ts+32142)
 			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)
@@ -129504,7 +129566,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			libc.Xmemcpy(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, zRbu, nRbu+uint64(1))
 			pCsr += uintptr(nRbu + uint64(1))
 			if zState != 0 {
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3663, libc.VaList(bp, zState))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3682, libc.VaList(bp, zState))
 			}
 
 			rbuOpenDatabase(tls, p, uintptr(0), bp+16)
@@ -129533,7 +129595,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+32150, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32216, 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
@@ -129551,12 +129613,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+32182,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32248,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32214
+							return ts + 32280
 						}
-						return ts + 32221
+						return ts + 32287
 					}()))
 			}
 		}
@@ -129564,7 +129626,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+14503, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14522, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -129575,19 +129637,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+16954)
-						rbuCopyPragma(tls, p, ts+16366)
+						rbuCopyPragma(tls, p, ts+16973)
+						rbuCopyPragma(tls, p, ts+16385)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32228, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32294, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6460, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32244, uintptr(0), uintptr(0), p+64)
+								db, ts+32310, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -129641,7 +129703,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+32268, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32334, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -129668,7 +129730,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+30293, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30359, 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++
@@ -129685,7 +129747,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+14518, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -129698,13 +129760,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+14518, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, 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+32276, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32342, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -129799,7 +129861,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+14518, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -129816,19 +129878,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+14518, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14503
+				zBegin = ts + 14522
 			} else {
-				zBegin = ts + 32228
+				zBegin = ts + 32294
 			}
 			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+32228, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32294, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -130174,7 +130236,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+32303, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32369, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -130199,7 +130261,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+32326, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32392, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -130344,7 +130406,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+6441)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6460)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -130359,7 +130421,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+32337, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32403, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -130604,6 +130666,970 @@ func Xsqlite3rbu_temp_size(tls *libc.TLS, pRbu uintptr) Sqlite3_int64 {
 	return (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FszTemp
 }
 
+var zDbstatSchema = *(*[258]uint8)(unsafe.Pointer(ts + 32414))
+
+// Forward reference to data structured used in this module
+type StatTable1 = struct {
+	Fbase        Sqlite3_vtab
+	Fdb          uintptr
+	FiDb         int32
+	F__ccgo_pad1 [4]byte
+}
+
+// Forward reference to data structured used in this module
+type StatTable = StatTable1
+type StatCursor1 = struct {
+	Fbase        Sqlite3_vtab_cursor
+	FpStmt       uintptr
+	FisEof       U8
+	FisAgg       U8
+	F__ccgo_pad1 [2]byte
+	FiDb         int32
+	FaPage       [32]StatPage
+	FiPage       int32
+	FiPageno     U32
+	FzName       uintptr
+	FzPath       uintptr
+	FzPagetype   uintptr
+	FnPage       int32
+	FnCell       int32
+	FnMxPayload  int32
+	F__ccgo_pad2 [4]byte
+	FnUnused     I64
+	FnPayload    I64
+	FiOffset     I64
+	FszPage      I64
+}
+
+type StatCursor = StatCursor1
+type StatPage1 = struct {
+	FiPgno         U32
+	F__ccgo_pad1   [4]byte
+	FaPg           uintptr
+	FiCell         int32
+	F__ccgo_pad2   [4]byte
+	FzPath         uintptr
+	Fflags         U8
+	F__ccgo_pad3   [3]byte
+	FnCell         int32
+	FnUnused       int32
+	F__ccgo_pad4   [4]byte
+	FaCell         uintptr
+	FiRightChildPg U32
+	FnMxPayload    int32
+}
+
+type StatPage = StatPage1
+type StatCell1 = struct {
+	FnLocal      int32
+	FiChildPg    U32
+	FnOvfl       int32
+	F__ccgo_pad1 [4]byte
+	FaOvfl       uintptr
+	FnLastOvfl   int32
+	FiOvfl       int32
+}
+
+type StatCell = StatCell1
+
+func statConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var pTab uintptr = uintptr(0)
+	var rc int32 = SQLITE_OK
+	var iDb int32
+	_ = pAux
+
+	if argc >= 4 {
+		Xsqlite3TokenInit(tls, bp+8, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
+		iDb = Xsqlite3FindDb(tls, db, bp+8)
+		if iDb < 0 {
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+11890, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
+			return SQLITE_ERROR
+		}
+	} else {
+		iDb = 0
+	}
+	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_DIRECTONLY, 0)
+	rc = Xsqlite3_declare_vtab(tls, db, uintptr(unsafe.Pointer(&zDbstatSchema)))
+	if rc == SQLITE_OK {
+		pTab = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatTable{})))
+		if pTab == uintptr(0) {
+			rc = SQLITE_NOMEM
+		}
+	}
+
+	if rc == SQLITE_OK {
+		libc.Xmemset(tls, pTab, 0, uint64(unsafe.Sizeof(StatTable{})))
+		(*StatTable)(unsafe.Pointer(pTab)).Fdb = db
+		(*StatTable)(unsafe.Pointer(pTab)).FiDb = iDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
+	return rc
+}
+
+func statDisconnect(tls *libc.TLS, pVtab uintptr) int32 {
+	Xsqlite3_free(tls, pVtab)
+	return SQLITE_OK
+}
+
+func statBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
+	var i int32
+	var iSchema int32 = -1
+	var iName int32 = -1
+	var iAgg int32 = -1
+	_ = tab
+
+	for i = 0; i < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; i++ {
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fop) != SQLITE_INDEX_CONSTRAINT_EQ {
+			continue
+		}
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fusable) == 0 {
+			return SQLITE_CONSTRAINT
+		}
+		switch (*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(i)*12)).FiColumn {
+		case 0:
+			{
+				iName = i
+				break
+
+			}
+		case 10:
+			{
+				iSchema = i
+				break
+
+			}
+		case 11:
+			{
+				iAgg = i
+				break
+
+			}
+		}
+	}
+	i = 0
+	if iSchema >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).Fomit = uint8(1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x01
+	}
+	if iName >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iName)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x02
+	}
+	if iAgg >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iAgg)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x04
+	}
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 1.0
+
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy == 1 &&
+		(*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)).FnOrderBy == 2 &&
+		(*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_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).FiColumn == 1 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x08
+	}
+
+	return SQLITE_OK
+}
+
+func statOpen(tls *libc.TLS, pVTab uintptr, ppCursor uintptr) int32 {
+	var pTab uintptr = pVTab
+	var pCsr uintptr
+
+	pCsr = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatCursor{})))
+	if pCsr == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		libc.Xmemset(tls, pCsr, 0, uint64(unsafe.Sizeof(StatCursor{})))
+		(*StatCursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab = pVTab
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppCursor)) = pCsr
+	return SQLITE_OK
+}
+
+func statClearCells(tls *libc.TLS, p uintptr) {
+	var i int32
+	if (*StatPage)(unsafe.Pointer(p)).FaCell != 0 {
+		for i = 0; i < (*StatPage)(unsafe.Pointer(p)).FnCell; i++ {
+			Xsqlite3_free(tls, (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell+uintptr(i)*32)).FaOvfl)
+		}
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FaCell)
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnCell = 0
+	(*StatPage)(unsafe.Pointer(p)).FaCell = uintptr(0)
+}
+
+func statClearPage(tls *libc.TLS, p uintptr) {
+	var aPg uintptr = (*StatPage)(unsafe.Pointer(p)).FaPg
+	statClearCells(tls, p)
+	Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FzPath)
+	libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(StatPage{})))
+	(*StatPage)(unsafe.Pointer(p)).FaPg = aPg
+}
+
+func statResetCsr(tls *libc.TLS, pCsr uintptr) {
+	var i int32
+
+	for i = 0; i < int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{}))); i++ {
+		statClearPage(tls, pCsr+24+uintptr(i)*64)
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(pCsr+24+uintptr(i)*64)).FaPg)
+		(*StatPage)(unsafe.Pointer(pCsr + 24 + uintptr(i)*64)).FaPg = uintptr(0)
+	}
+	Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(0)
+}
+
+func statResetCounts(tls *libc.TLS, pCsr uintptr) {
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnCell = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnUnused = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPayload = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FszPage = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 0
+}
+
+func statClose(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	Xsqlite3_free(tls, pCsr)
+	return SQLITE_OK
+}
+
+func getLocalPayload(tls *libc.TLS, nUsable int32, flags U8, nTotal int32) int32 {
+	var nLocal int32
+	var nMinLocal int32
+	var nMaxLocal int32
+
+	if int32(flags) == 0x0D {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = nUsable - 35
+	} else {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = (nUsable-12)*64/255 - 23
+	}
+
+	nLocal = nMinLocal + (nTotal-nMinLocal)%(nUsable-4)
+	if nLocal > nMaxLocal {
+		nLocal = nMinLocal
+	}
+	return nLocal
+}
+
+func statDecodePage(tls *libc.TLS, pBt uintptr, p uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var nUnused int32
+	var iOff int32
+	var nHdr int32
+	var isLeaf int32
+	var szPage int32
+	var aData uintptr
+	var aHdr uintptr
+	var iNext int32
+
+	var rc int32
+	var iPrev U32
+
+	var j int32
+	var nOvfl int32
+
+	var nLocal int32
+	var pCell uintptr
+	var i int32
+	var nUsable int32
+	aData = (*StatPage)(unsafe.Pointer(p)).FaPg
+	aHdr = aData + uintptr(func() int32 {
+		if (*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1) {
+			return 100
+		}
+		return 0
+	}())
+
+	(*StatPage)(unsafe.Pointer(p)).Fflags = *(*U8)(unsafe.Pointer(aHdr))
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0A || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __1
+	}
+	isLeaf = 1
+	nHdr = 8
+	goto __2
+__1:
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05 || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x02) {
+		goto __3
+	}
+	isLeaf = 0
+	nHdr = 12
+	goto __4
+__3:
+	goto statPageIsCorrupt
+__4:
+	;
+__2:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1)) {
+		goto __5
+	}
+	nHdr = nHdr + 100
+__5:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnCell = int32(*(*U8)(unsafe.Pointer(aHdr + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 3 + 1)))
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = 0
+	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
+
+	nUnused = int32(*(*U8)(unsafe.Pointer(aHdr + 5)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 5 + 1))) - nHdr - 2*(*StatPage)(unsafe.Pointer(p)).FnCell
+	nUnused = nUnused + int32(*(*U8)(unsafe.Pointer(aHdr + 7)))
+	iOff = int32(*(*U8)(unsafe.Pointer(aHdr + 1)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 1 + 1)))
+__6:
+	if !(iOff != 0) {
+		goto __7
+	}
+	if !(iOff >= szPage) {
+		goto __8
+	}
+	goto statPageIsCorrupt
+__8:
+	;
+	nUnused = nUnused + (int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2) + 1))))
+	iNext = int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff) + 1)))
+	if !(iNext < iOff+4 && iNext > 0) {
+		goto __9
+	}
+	goto statPageIsCorrupt
+__9:
+	;
+	iOff = iNext
+	goto __6
+__7:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnUnused = nUnused
+	(*StatPage)(unsafe.Pointer(p)).FiRightChildPg = func() uint32 {
+		if isLeaf != 0 {
+			return uint32(0)
+		}
+		return Xsqlite3Get4byte(tls, aHdr+8)
+	}()
+
+	if !((*StatPage)(unsafe.Pointer(p)).FnCell != 0) {
+		goto __10
+	}
+
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = szPage - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatPage)(unsafe.Pointer(p)).FaCell = Xsqlite3_malloc64(tls, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+	if !((*StatPage)(unsafe.Pointer(p)).FaCell == uintptr(0)) {
+		goto __11
+	}
+	return SQLITE_NOMEM
+__11:
+	;
+	libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+
+	i = 0
+__12:
+	if !(i < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __14
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr(i)*32
+
+	iOff = int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2) + 1)))
+	if !(iOff < nHdr || iOff >= szPage) {
+		goto __15
+	}
+	goto statPageIsCorrupt
+__15:
+	;
+	if !!(isLeaf != 0) {
+		goto __16
+	}
+	(*StatCell)(unsafe.Pointer(pCell)).FiChildPg = Xsqlite3Get4byte(tls, aData+uintptr(iOff))
+	iOff = iOff + 4
+__16:
+	;
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05) {
+		goto __17
+	}
+
+	goto __18
+__17:
+	iOff = iOff + int32(func() uint8 {
+		if int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff)))) < int32(U8(0x80)) {
+			return uint8(func() int32 {
+				*(*U32)(unsafe.Pointer(bp)) = U32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))
+				return 1
+			}())
+		}
+		return Xsqlite3GetVarint32(tls, aData+uintptr(iOff), bp)
+	}())
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __19
+	}
+	iOff = iOff + int32(Xsqlite3GetVarint(tls, aData+uintptr(iOff), bp+8))
+__19:
+	;
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32((*StatPage)(unsafe.Pointer(p)).FnMxPayload)) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = int32(*(*U32)(unsafe.Pointer(bp)))
+__20:
+	;
+	nLocal = getLocalPayload(tls, nUsable, (*StatPage)(unsafe.Pointer(p)).Fflags, int32(*(*U32)(unsafe.Pointer(bp))))
+	if !(nLocal < 0) {
+		goto __21
+	}
+	goto statPageIsCorrupt
+__21:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLocal = nLocal
+
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32(nLocal)) {
+		goto __22
+	}
+	nOvfl = int32((*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) + U32(nUsable) - U32(4) - U32(1)) / U32(nUsable-4))
+	if !(iOff+nLocal+4 > nUsable || *(*U32)(unsafe.Pointer(bp)) > U32(0x7fffffff)) {
+		goto __23
+	}
+	goto statPageIsCorrupt
+__23:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl = int32(*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) - U32((nOvfl-1)*(nUsable-4)))
+	(*StatCell)(unsafe.Pointer(pCell)).FnOvfl = nOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FaOvfl = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(U32(0)))*uint64(nOvfl))
+	if !((*StatCell)(unsafe.Pointer(pCell)).FaOvfl == uintptr(0)) {
+		goto __24
+	}
+	return SQLITE_NOMEM
+__24:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl)) = Xsqlite3Get4byte(tls, aData+uintptr(iOff+nLocal))
+	j = 1
+__25:
+	if !(j < nOvfl) {
+		goto __27
+	}
+	iPrev = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j-1)*4))
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPrev, bp+16, 0)
+	if !(rc != SQLITE_OK) {
+		goto __28
+	}
+
+	return rc
+__28:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j)*4)) = Xsqlite3Get4byte(tls, Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 16))))
+	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
+	goto __26
+__26:
+	j++
+	goto __25
+	goto __27
+__27:
+	;
+__22:
+	;
+__18:
+	;
+	goto __13
+__13:
+	i++
+	goto __12
+	goto __14
+__14:
+	;
+__10:
+	;
+	return SQLITE_OK
+
+statPageIsCorrupt:
+	(*StatPage)(unsafe.Pointer(p)).Fflags = U8(0)
+	statClearCells(tls, p)
+	return SQLITE_OK
+}
+
+func statSizeAndOffset(tls *libc.TLS, pCsr uintptr) {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCsr)).FpVtab
+	var pBt uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatTable)(unsafe.Pointer(pTab)).FiDb)*32)).FpBt
+	var pPager uintptr = Xsqlite3BtreePager(tls, pBt)
+	var fd uintptr
+
+	fd = Xsqlite3PagerFile(tls, pPager)
+	*(*Sqlite3_int64)(unsafe.Pointer(bp)) = Sqlite3_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	if Xsqlite3OsFileControl(tls, fd, 230440, bp) == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = *(*Sqlite3_int64)(unsafe.Pointer(bp))
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += *(*Sqlite3_int64)(unsafe.Pointer(bp + 1*8))
+	} else {
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += I64(Xsqlite3BtreeGetPageSize(tls, pBt))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = (*StatCursor)(unsafe.Pointer(pCsr)).FszPage * I64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno-U32(1))
+	}
+}
+
+func statGetPage(tls *libc.TLS, pBt uintptr, iPg U32, pPg uintptr) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var pgsz int32 = Xsqlite3BtreeGetPageSize(tls, pBt)
+	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
+	var rc int32
+
+	if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+		(*StatPage)(unsafe.Pointer(pPg)).FaPg = Xsqlite3_malloc(tls, pgsz+DBSTAT_PAGE_PADDING_BYTES)
+		if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+			return SQLITE_NOMEM
+		}
+		libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0, uint64(DBSTAT_PAGE_PADDING_BYTES))
+	}
+
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPg, bp, 0)
+	if rc == SQLITE_OK {
+		var a uintptr = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		libc.Xmemcpy(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, a, uint64(pgsz))
+		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+	}
+
+	return rc
+}
+
+func statNext(tls *libc.TLS, pCursor uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
+	var rc int32
+	var nPayload int32
+	var z uintptr
+	var pCsr uintptr
+	var pTab uintptr
+	var pBt uintptr
+	var pPager uintptr
+
+	var iRoot U32
+	var nUsable int32
+	var iOvfl int32
+	var pCell uintptr
+
+	var p uintptr
+	var i int32
+	var p1 uintptr
+	pCsr = pCursor
+	pTab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	pBt = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FpBt
+	pPager = Xsqlite3BtreePager(tls, pBt)
+
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+
+statNextRestart:
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __1
+	}
+
+	statResetCounts(tls, pCsr)
+	rc = Xsqlite3_step(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	if !(rc == SQLITE_ROW) {
+		goto __3
+	}
+	iRoot = U32(Xsqlite3_column_int64(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 1))
+	Xsqlite3PagerPagecount(tls, pPager, bp+48)
+	if !(*(*int32)(unsafe.Pointer(bp + 48)) == 0) {
+		goto __5
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__5:
+	;
+	rc = statGetPage(tls, pBt, iRoot, pCsr+24)
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiPgno = iRoot
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __6
+	}
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32672, 0))
+	if !(z == uintptr(0)) {
+		goto __7
+	}
+	rc = SQLITE_NOMEM
+__7:
+	;
+__6:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 1
+	goto __4
+__3:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__4:
+	;
+	goto __2
+__1:
+	p = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __8
+	}
+	statResetCounts(tls, pCsr)
+__8:
+	;
+__9:
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __10
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32
+__11:
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl) {
+		goto __12
+	}
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = Xsqlite3BtreeGetPageSize(tls, pBt) - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	statSizeAndOffset(tls, pCsr)
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl-1) {
+		goto __13
+	}
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nUsable - 4)
+	goto __14
+__13:
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64((*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64(nUsable - 4 - (*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+__14:
+	;
+	iOvfl = (*StatCell)(unsafe.Pointer(pCell)).FiOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FiOvfl++
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __15
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(iOvfl)*4))
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32674
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls,
+		ts+32683, libc.VaList(bp, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell, iOvfl)))
+	if z == uintptr(0) {
+		return SQLITE_NOMEM
+	}
+	return SQLITE_OK
+__15:
+	;
+	goto __11
+__12:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiRightChildPg != 0) {
+		goto __16
+	}
+	goto __10
+__16:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+	goto __9
+__10:
+	;
+	if !(!(int32((*StatPage)(unsafe.Pointer(p)).FiRightChildPg) != 0) || (*StatPage)(unsafe.Pointer(p)).FiCell > (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __17
+	}
+	statClearPage(tls, p)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage--
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 && (*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __18
+	}
+
+	return SQLITE_OK
+__18:
+	;
+	goto statNextRestart
+__17:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage++
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage >= int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{})))) {
+		goto __19
+	}
+	statResetCsr(tls, pCsr)
+	return Xsqlite3CorruptError(tls, 215455)
+__19:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell == (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatPage)(unsafe.Pointer(p)).FiRightChildPg
+	goto __21
+__20:
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32)).FiChildPg
+__21:
+	;
+	rc = statGetPage(tls, pBt, (*StatPage)(unsafe.Pointer(p+1*64)).FiPgno, p+1*64)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __22
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32695, libc.VaList(bp+24, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell)))
+	if !(z == uintptr(0)) {
+		goto __23
+	}
+	rc = SQLITE_NOMEM
+__23:
+	;
+__22:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+__2:
+	;
+	if !(rc == SQLITE_OK) {
+		goto __24
+	}
+	p1 = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = (*StatPage)(unsafe.Pointer(p1)).FiPgno
+
+	rc = statDecodePage(tls, pBt, p1)
+	if !(rc == SQLITE_OK) {
+		goto __25
+	}
+	statSizeAndOffset(tls, pCsr)
+
+	switch int32((*StatPage)(unsafe.Pointer(p1)).Fflags) {
+	case 0x05:
+		goto __27
+	case 0x02:
+		goto __28
+	case 0x0D:
+		goto __29
+	case 0x0A:
+		goto __30
+	default:
+		goto __31
+	}
+	goto __26
+__27:
+__28:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32703
+	goto __26
+__29:
+__30:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32712
+	goto __26
+__31:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32717
+	goto __26
+__26:
+	;
+	*(*int32)(unsafe.Pointer(pCsr + 2108)) += (*StatPage)(unsafe.Pointer(p1)).FnCell
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64((*StatPage)(unsafe.Pointer(p1)).FnUnused)
+	if !((*StatPage)(unsafe.Pointer(p1)).FnMxPayload > (*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload) {
+		goto __32
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = (*StatPage)(unsafe.Pointer(p1)).FnMxPayload
+__32:
+	;
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __33
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+40, (*StatPage)(unsafe.Pointer(p1)).FzPath)))
+	if !(z == uintptr(0)) {
+		goto __34
+	}
+	rc = SQLITE_NOMEM
+__34:
+	;
+__33:
+	;
+	nPayload = 0
+	i = 0
+__35:
+	if !(i < (*StatPage)(unsafe.Pointer(p1)).FnCell) {
+		goto __37
+	}
+	nPayload = nPayload + (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p1)).FaCell+uintptr(i)*32)).FnLocal
+	goto __36
+__36:
+	i++
+	goto __35
+	goto __37
+__37:
+	;
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nPayload)
+
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0) {
+		goto __38
+	}
+	goto statNextRestart
+__38:
+	;
+__25:
+	;
+__24:
+	;
+	return rc
+}
+
+func statEof(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	return int32((*StatCursor)(unsafe.Pointer(pCsr)).FisEof)
+}
+
+func statFilter(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintptr, argc int32, argv uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pCsr uintptr = pCursor
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	var pSql uintptr
+	var zSql uintptr
+	var iArg int32 = 0
+	var rc int32 = SQLITE_OK
+	var zName uintptr = uintptr(0)
+	_ = argc
+	_ = idxStr
+
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FpStmt = uintptr(0)
+	if idxNum&0x01 != 0 {
+		var zDbase uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = Xsqlite3FindDbName(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zDbase)
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FiDb < 0 {
+			(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = 0
+			(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+			return SQLITE_OK
+		}
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+	if idxNum&0x02 != 0 {
+		zName = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+	}
+	if idxNum&0x04 != 0 {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(libc.Bool32(Xsqlite3_value_double(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8))) != 0.0))
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(0)
+	}
+	pSql = Xsqlite3_str_new(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb)
+	Xsqlite3_str_appendf(tls, pSql,
+		ts+32727,
+		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb+uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FzDbSName))
+	if zName != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32882, libc.VaList(bp+8, zName))
+	}
+	if idxNum&0x08 != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32896, 0)
+	}
+	zSql = Xsqlite3_str_finish(tls, pSql)
+	if zSql == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		rc = Xsqlite3_prepare_v2(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
+		Xsqlite3_free(tls, zSql)
+	}
+
+	if rc == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = -1
+		rc = statNext(tls, pCursor)
+	}
+	return rc
+}
+
+func statColumn(tls *libc.TLS, pCursor uintptr, ctx uintptr, i int32) int32 {
+	var pCsr uintptr = pCursor
+	switch i {
+	case 0:
+		Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzName, -1, libc.UintptrFromInt32(-1))
+		break
+	case 1:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath, -1, libc.UintptrFromInt32(-1))
+		}
+		break
+	case 2:
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnPage))
+		} else {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno))
+		}
+		break
+	case 3:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype, -1, uintptr(0))
+		}
+		break
+	case 4:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnCell))
+		break
+	case 5:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnPayload)
+		break
+	case 6:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnUnused)
+		break
+	case 7:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload))
+		break
+	case 8:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FiOffset)
+		}
+		break
+	case 9:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FszPage)
+		break
+	case 10:
+		{
+			var db uintptr = Xsqlite3_context_db_handle(tls, ctx)
+			var iDb int32 = (*StatCursor)(unsafe.Pointer(pCsr)).FiDb
+			Xsqlite3_result_text(tls, ctx, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, -1, uintptr(0))
+			break
+
+		}
+	default:
+		{
+			Xsqlite3_result_int(tls, ctx, int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg))
+			break
+
+		}
+	}
+	return SQLITE_OK
+}
+
+func statRowid(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32 {
+	var pCsr uintptr = pCursor
+	*(*Sqlite_int64)(unsafe.Pointer(pRowid)) = Sqlite_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	return SQLITE_OK
+}
+
+// Invoke this routine to register the "dbstat" virtual table module
+func Xsqlite3DbstatRegister(tls *libc.TLS, db uintptr) int32 {
+	return Xsqlite3_create_module(tls, db, ts+32911, uintptr(unsafe.Pointer(&dbstat_module)), uintptr(0))
+}
+
+var dbstat_module = Sqlite3_module{
+	FxCreate:     0,
+	FxConnect:    0,
+	FxBestIndex:  0,
+	FxDisconnect: 0,
+	FxDestroy:    0,
+	FxOpen:       0,
+	FxClose:      0,
+	FxFilter:     0,
+	FxNext:       0,
+	FxEof:        0,
+	FxColumn:     0,
+	FxRowid:      0,
+}
+
 type SessionTable1 = struct {
 	FpNext    uintptr
 	FzName    uintptr
@@ -131184,13 +132210,13 @@ 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+11348, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11367, 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+32348, 0)
+				ts+32918, 0)
 		} else if rc == SQLITE_ERROR {
-			zPragma = Xsqlite3_mprintf(tls, ts+1554, 0)
+			zPragma = Xsqlite3_mprintf(tls, ts+1573, 0)
 		} else {
 			*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
 			*(*uintptr)(unsafe.Pointer(pabPK)) = uintptr(0)
@@ -131201,7 +132227,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32469, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+33039, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -131299,7 +132325,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11348, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11367, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -131548,7 +132574,7 @@ __4:
 	goto error_out
 __7:
 	;
-	Xsqlite3ValueSetStr(tls, p, 0, ts+1554, uint8(0), uintptr(0))
+	Xsqlite3ValueSetStr(tls, p, 0, ts+1573, uint8(0), uintptr(0))
 	(*Sqlite3_session)(unsafe.Pointer(pSession)).FpZeroBlob = p
 __6:
 	;
@@ -131876,14 +132902,14 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	var zRet uintptr = uintptr(0)
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32498,
+			zRet = Xsqlite3_mprintf(tls, ts+33068,
 				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 + 21525
+			zSep = ts + 21591
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131898,7 +132924,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	var zRet uintptr = uintptr(0)
 	var bHave int32 = 0
 
@@ -131906,9 +132932,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+32532,
+				ts+33102,
 				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 + 32573
+			zSep = ts + 33143
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131916,7 +132942,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7530, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7538, 0)
 	}
 
 	return zRet
@@ -131927,7 +132953,7 @@ func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintpt
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32578,
+		ts+33148,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -131970,7 +132996,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32656,
+			ts+33226,
 			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
@@ -132097,7 +133123,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32709, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33279, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -132362,7 +133388,7 @@ func sessionAppendInteger(tls *libc.TLS, p uintptr, iVal int32, pRc uintptr) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
-	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]uint8{}))-uint64(1)), bp+8, ts+4975, libc.VaList(bp, iVal))
+	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]uint8{}))-uint64(1)), bp+8, ts+4994, libc.VaList(bp, iVal))
 	sessionAppendStr(tls, p, bp+8, pRc)
 }
 
@@ -132571,29 +133597,29 @@ 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+11348, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11367, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32736, libc.VaList(bp, zDb))
+			ts+33306, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
 	} else {
 		var i int32
-		var zSep uintptr = ts + 1554
+		var zSep uintptr = ts + 1573
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32846, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33416, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
-		sessionAppendStr(tls, bp+8, ts+1567, bp+24)
+		sessionAppendStr(tls, bp+8, ts+1586, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+32861, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33431, 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+32869, bp+24)
+				sessionAppendStr(tls, bp+8, ts+33439, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21525
+				zSep = ts + 21591
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -132702,7 +133728,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+32875, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33445, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -132794,7 +133820,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32895, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33465, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -133057,7 +134083,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, 219078)
+				rc = Xsqlite3CorruptError(tls, 219169)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -133080,7 +134106,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, 219098)
+						rc = Xsqlite3CorruptError(tls, 219189)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -133122,7 +134148,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, 219152)
+			rc = Xsqlite3CorruptError(tls, 219243)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -133183,7 +134209,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, 219240)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219331)
 		}
 	}
 
@@ -133257,13 +134283,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, 219326))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219417))
 	}
 
 	(*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, 219332))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219423))
 	}
 
 	if paRec != 0 {
@@ -133325,7 +134351,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, 219376))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219467))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -133698,7 +134724,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219832)
 	goto finished_invert
 __6:
 	;
@@ -133866,45 +134892,45 @@ 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+11348) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11367) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
 			} else {
-				var zSep uintptr = ts + 1554
+				var zSep uintptr = ts + 1573
 
 				libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(SessionBuffer{})))
 				(*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+32913, bp+16)
+				sessionAppendStr(tls, bp, ts+33483, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+32926, bp+16)
+				sessionAppendStr(tls, bp, ts+33496, 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+32932, bp+16)
+						sessionAppendStr(tls, bp, ts+33502, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 14614
+						zSep = ts + 14633
 					}
 				}
 
-				zSep = ts + 1554
-				sessionAppendStr(tls, bp, ts+32861, bp+16)
+				zSep = ts + 1573
+				sessionAppendStr(tls, bp, ts+33431, 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+32937, bp+16)
+								ts+33507, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+32869, bp+16)
+							sessionAppendStr(tls, bp, ts+33439, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21525
+						zSep = ts + 21591
 					}
 				}
 
@@ -133951,42 +134977,42 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	defer tls.Free(20)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+33012, bp+16)
+	sessionAppendStr(tls, bp, ts+33582, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+32861, bp+16)
+	sessionAppendStr(tls, bp, ts+33431, 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+32932, bp+16)
+			sessionAppendStr(tls, bp, ts+33502, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21525
+			zSep = ts + 21591
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+33030, bp+16)
+		sessionAppendStr(tls, bp, ts+33600, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32573, bp+16)
+		sessionAppendStr(tls, bp, ts+33143, bp+16)
 
-		zSep = ts + 1554
+		zSep = ts + 1573
 		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+32869, bp+16)
+				sessionAppendStr(tls, bp, ts+33439, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 33038
+				zSep = ts + 33608
 			}
 		}
-		sessionAppendStr(tls, bp, ts+4957, bp+16)
+		sessionAppendStr(tls, bp, ts+4976, bp+16)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
@@ -133999,7 +135025,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+6441, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6460, 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 {
@@ -134010,21 +135036,21 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+33043, bp+16)
+	sessionAppendStr(tls, bp, ts+33613, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21531, bp+16)
+	sessionAppendStr(tls, bp, ts+21597, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14614, bp+16)
+			sessionAppendStr(tls, bp, ts+14633, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+33061, bp+16)
+	sessionAppendStr(tls, bp, ts+33631, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33072, bp+16)
+		sessionAppendStr(tls, bp, ts+33642, bp+16)
 	}
-	sessionAppendStr(tls, bp, ts+4957, bp+16)
+	sessionAppendStr(tls, bp, ts+4976, bp+16)
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v2(tls, db, (*SessionBuffer)(unsafe.Pointer(bp)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp)).FnBuf, p+16, uintptr(0))
@@ -134038,14 +135064,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+11348, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11367, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+33076)
+			ts+33646)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33189)
+			ts+33759)
 	}
 	return rc
 }
@@ -134073,7 +135099,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, 220219)
+				rc = Xsqlite3CorruptError(tls, 220310)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -134326,7 +135352,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+33333, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33903, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -134342,7 +135368,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+33354, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33924, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -134415,10 +135441,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+33373, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33943, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33399, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33969, 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))
@@ -134451,7 +135477,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				f func(*libc.TLS, uintptr, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xFilter})).f(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 176))))
 			if schemaMismatch != 0 {
-				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
+				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
 				if *(*uintptr)(unsafe.Pointer(bp + 200)) == uintptr(0) {
 					rc = SQLITE_NOMEM
 					break
@@ -134464,7 +135490,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+6441, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6460, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -134477,19 +135503,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+33429, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33999, 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+33473,
+						ts+34043,
 						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+33544, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+34114, 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+11348) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11367) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -134540,14 +135566,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33604, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34174, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34204, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33658, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34228, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34204, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -135795,7 +136821,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33686, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+34256, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -136083,7 +137109,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33714, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+34284, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -136270,7 +137296,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+33745, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34315, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -136338,7 +137364,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33752
+		var zErr uintptr = ts + 34322
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -136497,7 +137523,7 @@ func fts5ValueToText(tls *libc.TLS, pVal uintptr) uintptr {
 	if zRet != 0 {
 		return zRet
 	}
-	return ts + 1554
+	return ts + 1573
 }
 
 func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, nVal int32, apVal uintptr) {
@@ -136520,7 +137546,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33802
+		var zErr uintptr = ts + 34372
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -136844,13 +137870,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33850, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34420, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33858, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34428, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33868, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34438, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -137261,7 +138287,7 @@ func fts5ConfigSkipLiteral(tls *libc.TLS, pIn uintptr) uintptr {
 	case 'n':
 		fallthrough
 	case 'N':
-		if Xsqlite3_strnicmp(tls, ts+6181, p, 4) == 0 {
+		if Xsqlite3_strnicmp(tls, ts+6200, p, 4) == 0 {
 			p = p + 4
 		} else {
 			p = uintptr(0)
@@ -137401,7 +138427,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+33873, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34443, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -137428,14 +138454,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+33880, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34450, 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+33911, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+34481, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -137446,7 +138472,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33944, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34514, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -137459,7 +138485,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33981, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34551, 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)))
@@ -137468,7 +138494,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+33990, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34560, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*uint8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -137487,7 +138513,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34023, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34593, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -137502,14 +138528,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34057, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34627, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34065, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34635, 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+34097, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34667, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -137517,9 +138543,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34103, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34673, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34117, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34687, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -137527,9 +138553,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34155, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34725, 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+34166, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34736, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zArg))) == '1')
@@ -137537,21 +138563,21 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+5075, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+5094, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 8026, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17345},
-			{FzName: ts + 34201, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8045, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17364},
+			{FzName: ts + 34771, 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+34209, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34779, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34240, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34810, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -137598,15 +138624,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+22191) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16267) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34268, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22257) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16286) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34838, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34298) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34868) {
 			*(*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+34308, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34878, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -137623,13 +138649,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+34339, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34909, 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+34344, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34914, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34351, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34921, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -137667,8 +138693,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+22191) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34359, 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+22257) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34929, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -137700,7 +138726,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+34388, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34958, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -137709,13 +138735,13 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 							if *(*uintptr)(unsafe.Pointer(bp + 48)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 48))
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						func() uintptr {
 							if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 64))
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						pzErr)
 				} else {
@@ -137737,19 +138763,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 + 34057
+			zTail = ts + 34627
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34408
+			zTail = ts + 34978
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34416, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34986, 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+16267, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16286, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -137793,18 +138819,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+34427, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34997, 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 + 1573
 			}
-			return ts + 14614
+			return ts + 14633
 		}()
-		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+35013, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34450,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22191))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35020,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22257))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -137914,7 +138940,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34476) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35046) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -137924,7 +138950,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+34481) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35051) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -137934,7 +138960,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+34490) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35060) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -137947,7 +138973,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+34500) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35070) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -137957,7 +138983,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+34510) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35080) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -137973,7 +138999,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+22191) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22257) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -137996,7 +139022,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34522
+	var zSelect uintptr = ts + 35092
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -138018,7 +139044,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+34554) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35124) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -138032,7 +139058,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+34562,
+				ts+35132,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -138130,7 +139156,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*uint8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34627, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+35197, 0)
 					return FTS5_EOF
 				}
 			}
@@ -138143,20 +139169,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+34647, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+35217, 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+34678, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35248, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34681, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35251, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30063, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30129, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -139934,9 +140960,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+34685, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35255, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33714, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+34284, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -139952,7 +140978,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+34690, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+35260, 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')
@@ -140039,7 +141065,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20528, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20594, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -140120,7 +141146,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+34719, 0)
+			ts+35289, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -140290,12 +141316,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+34772,
+								ts+35342,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34822
+										return ts + 35392
 									}
-									return ts + 34685
+									return ts + 35255
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -141238,7 +142264,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+34829, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35399, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -141317,7 +142343,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+34835,
+			ts+35405,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -141342,7 +142368,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+34886,
+			ts+35456,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -141365,7 +142391,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+34935,
+			ts+35505,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -141604,7 +142630,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+34975, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+35545, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -142803,7 +143829,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+34998,
+			ts+35568,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -143996,7 +145022,7 @@ func fts5WriteFlushBtree(tls *libc.TLS, p uintptr, pWriter uintptr) {
 			if (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn > 0 {
 				return (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fp
 			}
-			return ts + 1554
+			return ts + 1573
 		}()
 
 		Xsqlite3_bind_blob(tls, (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter, 2, z, (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn, uintptr(0))
@@ -144269,7 +145295,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+35082,
+			ts+35652,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -145335,7 +146361,7 @@ func sqlite3Fts5IndexReinit(tls *libc.TLS, p uintptr) int32 {
 	fts5StructureInvalidate(tls, p)
 	fts5IndexDiscardData(tls, p)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Fts5Structure{})))
-	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1554, 0)
+	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1573, 0)
 	fts5StructureWrite(tls, p, bp)
 	return fts5IndexReturn(tls, p)
 }
@@ -145351,13 +146377,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+35139, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35709, 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+25056, ts+35147, 0, pzErr)
+				pConfig, ts+25122, ts+35717, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11488,
-					ts+35182,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11507,
+					ts+35752,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -145610,7 +146636,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+34829, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+35399, 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)))
@@ -145724,7 +146750,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35226,
+		ts+35796,
 		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))) {
@@ -145894,7 +146920,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+35312)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35882)
 			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))
@@ -146165,7 +147191,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+35317, 0)
+			ts+35887, 0)
 		return SQLITE_ERROR
 	}
 
@@ -146196,7 +147222,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 				} else if iCol >= 0 {
 					bSeenMatch = 1
 					*(*uint8)(unsafe.Pointer(idxStr + uintptr(libc.PostIncInt32(&iIdxStr, 1)))) = uint8('M')
-					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4975, libc.VaList(bp, iCol))
+					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4994, libc.VaList(bp, iCol))
 					idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 
 				}
@@ -146211,7 +147237,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 					}
 					return uint8('G')
 				}()
-				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4975, libc.VaList(bp+8, iCol))
+				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4994, libc.VaList(bp+8, iCol))
 				idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 				(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pInfo)).FaConstraintUsage + uintptr(i)*8)).FargvIndex = libc.PreIncInt32(&iCons, 1)
 
@@ -146525,7 +147551,7 @@ func fts5NextMethod(tls *libc.TLS, pCursor uintptr) int32 {
 					rc = Xsqlite3_reset(tls, (*Fts5Cursor)(unsafe.Pointer(pCsr)).FpStmt)
 					if rc != SQLITE_OK {
 						(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-							ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+							ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 					}
 				} else {
 					rc = SQLITE_OK
@@ -146557,7 +147583,7 @@ func fts5PrepareStatement(tls *libc.TLS, ppStmt uintptr, pConfig uintptr, zFmt u
 		rc = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
 			uint32(SQLITE_PREPARE_PERSISTENT), bp+8, uintptr(0))
 		if rc != SQLITE_OK {
-			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 		}
 		Xsqlite3_free(tls, zSql)
 	}
@@ -146589,25 +147615,25 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35356,
+		ts+35926,
 		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 + 14614
+					return ts + 14633
 				}
-				return ts + 1554
+				return ts + 1573
 			}(),
 			func() uintptr {
 				if zRankArgs != 0 {
 					return zRankArgs
 				}
-				return ts + 1554
+				return ts + 1573
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35411
+					return ts + 35981
 				}
-				return ts + 35416
+				return ts + 35986
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -146653,12 +147679,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+35420, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35990, 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) {
+	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5076, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35426, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35996, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -146689,7 +147715,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+35454, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36024, 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,
@@ -146720,7 +147746,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+35464, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36034, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -146752,14 +147778,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+35485, libc.VaList(bp, z))
+				ts+36055, 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 + 33868
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34438
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -146815,7 +147841,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+35317, 0)
+		ts+35887, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -146858,7 +147884,7 @@ __8:
 	if !(zText == uintptr(0)) {
 		goto __14
 	}
-	zText = ts + 1554
+	zText = ts + 1573
 __14:
 	;
 	iCol = 0
@@ -147032,7 +148058,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35518, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+36088, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -147153,7 +148179,7 @@ func fts5SeekCursor(tls *libc.TLS, pCsr uintptr, bErrormsg int32) int32 {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			} else if (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg != 0 {
 				*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-					ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
+					ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
 			}
 		}
 	}
@@ -147177,28 +148203,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+35554, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36124, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35565, 0)
+				ts+36135, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36215, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35653, 0)
+				ts+36223, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16934, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16953, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35709, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36279, 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+35715, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36285, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -147256,7 +148282,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+17479, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17498, 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)))
@@ -147269,12 +148295,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+35731,
+				ts+36301,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20429
+						return ts + 20495
 					}
-					return ts + 35768
+					return ts + 36338
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -147904,7 +148930,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+35780, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36350, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -148148,7 +149174,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+35801, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36371, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -148167,7 +149193,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+35823, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36393, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -148214,7 +149240,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+35854)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36424)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -148223,7 +149249,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+35867, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+36437, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -148237,7 +149263,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35958, ts + 34057, ts + 25056, ts + 34408, ts + 11488,
+	ts + 36528, ts + 34627, ts + 25122, ts + 34978, ts + 11507,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -148261,7 +149287,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+35965, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+36535, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -148279,13 +149305,13 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35965, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36535, 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+35970, 0,
+				db, ts+36540, 0,
 				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
 				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
@@ -148342,17 +149368,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 + 35985,
-			ts + 36053,
-			ts + 36122,
-			ts + 36155,
-			ts + 36194,
-			ts + 36234,
-			ts + 36273,
-			ts + 36314,
-			ts + 36353,
-			ts + 36395,
-			ts + 36435,
+			ts + 36555,
+			ts + 36623,
+			ts + 36692,
+			ts + 36725,
+			ts + 36764,
+			ts + 36804,
+			ts + 36843,
+			ts + 36884,
+			ts + 36923,
+			ts + 36965,
+			ts + 37005,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -148419,7 +149445,7 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 			(*Fts5Config)(unsafe.Pointer((*Fts5Storage)(unsafe.Pointer(p)).FpConfig)).FbLock--
 			Xsqlite3_free(tls, zSql)
 			if rc != SQLITE_OK && pzErrMsg != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
 			}
 		}
 	}
@@ -148454,18 +149480,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+36458,
+		ts+37028,
 		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+36562,
+			ts+37132,
 			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+36600,
+			ts+37170,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -148477,7 +149503,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+36638,
+			ts+37208,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -148489,14 +149515,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+25056, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11488, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35958, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25122, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11507, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+36528, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34408, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34978, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34057, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34627, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -148508,17 +149534,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+36680,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37250,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29709
+					return ts + 29775
 				}
-				return ts + 1554
+				return ts + 1573
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36710,
+			ts+37280,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -148555,27 +149581,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36754, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37324, 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+36777, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37347, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34057, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34627, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34408, ts+36783, 0, pzErr)
+				pConfig, ts+34978, ts+37353, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35958, ts+36815, 1, pzErr)
+				pConfig, ts+36528, ts+37385, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35124, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -148781,12 +149807,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+36832,
+		ts+37402,
 		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+36882,
+			ts+37452,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -148794,7 +149820,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+34554, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35124, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -148970,7 +149996,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36911,
+	zSql = Xsqlite3_mprintf(tls, ts+37481,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -149152,14 +150178,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+34057, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34627, 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+34408, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34978, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -149354,9 +150380,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+36943) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37513) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37524) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -149571,7 +150597,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 + 36965
+			var zCat uintptr = ts + 37535
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -149583,7 +150609,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+36974) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37544) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -149594,18 +150620,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+36985) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37555) {
 					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+36943) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37513) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37524) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36974) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37544) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -149881,7 +150907,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 + 37003
+	var zBase uintptr = ts + 37573
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -150023,7 +151049,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+37013, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37583, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -150031,11 +151057,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37586, 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+37021, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37591, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -150043,7 +151069,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37026, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37596, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -150051,7 +151077,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37029, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37599, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -150059,11 +151085,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37602, 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+37037, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37607, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -150071,19 +151097,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37042, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37612, 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+37046, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37616, 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+37052, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37622, 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+37057, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37627, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150091,11 +151117,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37631, 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+37065, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37635, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -150103,7 +151129,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37638, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150111,11 +151137,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37642, 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+37076, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37646, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150123,7 +151149,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37080, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37650, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150131,7 +151157,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37654, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150139,7 +151165,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37088, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37658, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150155,24 +151181,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+37092, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37072, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37662, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37642, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37665, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37668, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37672, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37658, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -150187,137 +151213,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+37105, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37675, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37113, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37683, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37120, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37690, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37125, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37695, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37021, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37591, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37130, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37700, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37016, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37586, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37705, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37088, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37658, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37140, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37710, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15480, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15499, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37145, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37715, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37098, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37668, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37149, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37719, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 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+37724, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37057, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37627, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37160, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37730, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37164, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37734, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37166, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37736, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37080, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37650, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37172, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37742, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37088, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37658, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37180, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37750, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37186, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37756, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37191, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37761, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37197, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37767, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37084, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37654, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37205, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37775, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37213, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37783, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37217, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37787, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37080, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37650, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37225, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37795, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37231, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37801, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37084, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37654, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37237, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37807, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37098, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37668, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -150332,16 +151358,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+37244, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37814, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37029, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37599, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37249, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37819, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -150349,21 +151375,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37254, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37824, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37599, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37260, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37830, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37599, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37213, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37783, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150371,7 +151397,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37266, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37836, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -150379,9 +151405,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37272, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37842, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -150396,12 +151422,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+37278, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37848, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37282, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37852, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37285, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37855, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -150410,7 +151436,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37288, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37858, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -150566,7 +151592,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+37292) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37862) {
 				if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' || *(*uint8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -150746,22 +151772,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 37003, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37573, 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 + 37307, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37877, 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 + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37883, 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 + 37320, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37890, 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
@@ -151904,14 +152930,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+37328) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37898) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37332) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37902) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37336) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37906) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37345, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37915, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -151937,19 +152963,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 + 37379,
-		ts + 37419,
-		ts + 37454,
+		ts + 37949,
+		ts + 37989,
+		ts + 38024,
 	}
 
 	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+23352, *(*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+23418, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37497, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38067, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -152082,11 +153108,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+37530, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+38100, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37561,
+		ts+38131,
 		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))
@@ -152110,7 +153136,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+37612, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38182, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -152394,7 +153420,7 @@ func fts5VocabFilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, zUnused
 		if pLe != 0 {
 			var zCopy uintptr = Xsqlite3_value_text(tls, pLe)
 			if zCopy == uintptr(0) {
-				zCopy = ts + 1554
+				zCopy = ts + 1573
 			}
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm = Xsqlite3_value_bytes(tls, pLe)
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FzLeTerm = Xsqlite3_malloc(tls, (*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm+1)
@@ -152505,7 +153531,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+37638, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+38208, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -152527,7 +153553,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 + 37648
+	return ts + 38218
 }
 
 func init() {
@@ -152953,6 +153979,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1056)) = noopStepFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1064)) = uintptr(unsafe.Pointer(&lagName))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&attach_func)) + 24)) = attachFunc
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 8)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 16)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 24)) = statBestIndex
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 32)) = statDisconnect
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 40)) = statDisconnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 48)) = statOpen
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 56)) = statClose
+	*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 64)) = statFilter
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 72)) = statNext
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 80)) = statEof
+	*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 88)) = statColumn
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 96)) = statRowid
 	*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 0)) = sqlite3MemMalloc
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 8)) = sqlite3MemFree
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 16)) = sqlite3MemRealloc
@@ -153485,8 +154523,9 @@ func init() {
 	*(*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
-	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = Xsqlite3JsonTableFunctions
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = Xsqlite3DbstatRegister
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = sqlite3TestExtInit
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 32)) = Xsqlite3JsonTableFunctions
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statGetFuncdef)) + 24)) = statGet
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statInitFuncdef)) + 24)) = statInit
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statPushFuncdef)) + 24)) = statPush
@@ -153504,5 +154543,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-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 ts1 = "3.41.2\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_DBSTAT_VTAB\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\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\x00true\x00false\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 \x00rowid not at end-of-record for row \x00 of 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\x00CREATE TABLE x( name       TEXT, path       TEXT, pageno     INTEGER, pagetype   TEXT, ncell      INTEGER, payload    INTEGER, unused     INTEGER, mx_payload INTEGER, pgoffset   INTEGER, pgsize     INTEGER, schema     TEXT HIDDEN, aggregate  BOOLEAN HIDDEN)\x00/\x00overflow\x00%s%.3x+%.6x\x00%s%.3x/\x00internal\x00leaf\x00corrupted\x00SELECT * FROM (SELECT 'sqlite_schema' AS name,1 AS rootpage,'table' AS type UNION ALL SELECT name,rootpage,type FROM \"%w\".sqlite_schema WHERE rootpage!=0)\x00WHERE name=%Q\x00 ORDER BY name\x00dbstat\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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 45e6cb62..f0477db5 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -208,6 +208,7 @@ const (
 	DBFLAG_SchemaKnownOk                  = 0x0010
 	DBFLAG_Vacuum                         = 0x0004
 	DBFLAG_VacuumInto                     = 0x0008
+	DBSTAT_PAGE_PADDING_BYTES             = 256
 	DB_ResetWanted                        = 0x0008
 	DB_SchemaLoaded                       = 0x0001
 	DB_UnresetViews                       = 0x0002
@@ -921,11 +922,11 @@ const (
 	NC_OrderAgg                           = 0x8000000
 	NC_PartIdx                            = 0x000002
 	NC_SelfRef                            = 0x00002e
+	NC_Subquery                           = 0x000040
 	NC_UAggInfo                           = 0x000100
 	NC_UBaseReg                           = 0x000400
 	NC_UEList                             = 0x000080
 	NC_UUpsert                            = 0x000200
-	NC_VarSelect                          = 0x000040
 	NDEBUG                                = 1
 	NN                                    = 1
 	NOT_WITHIN                            = 0
@@ -1765,6 +1766,7 @@ const (
 	SQLITE_ECEL_REF                       = 0x04
 	SQLITE_EMPTY                          = 16
 	SQLITE_ENABLE_COLUMN_METADATA         = 1
+	SQLITE_ENABLE_DBSTAT_VTAB             = 1
 	SQLITE_ENABLE_FTS5                    = 1
 	SQLITE_ENABLE_GEOPOLY                 = 1
 	SQLITE_ENABLE_LOCKING_STYLE           = 0
@@ -2165,7 +2167,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
+	SQLITE_SOURCE_ID                      = "2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2272,8 +2274,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.41.0"
-	SQLITE_VERSION_NUMBER                 = 3041000
+	SQLITE_VERSION                        = "3.41.2"
+	SQLITE_VERSION_NUMBER                 = 3041002
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -6117,7 +6119,8 @@ type IndexedExpr1 = struct {
 	FiIdxCur       int32
 	FiIdxCol       int32
 	FbMaybeNullRow U8
-	F__ccgo_pad1   [3]byte
+	Faff           U8
+	F__ccgo_pad1   [2]byte
 	FpIENext       uintptr
 }
 
@@ -6759,17 +6762,18 @@ type Pager = Pager1
 
 // Handle type for pages.
 type PgHdr2 = struct {
-	FpPage      uintptr
-	FpData      uintptr
-	FpExtra     uintptr
-	FpCache     uintptr
-	FpDirty     uintptr
-	FpPager     uintptr
-	Fpgno       Pgno
-	Fflags      U16
-	FnRef       I16
-	FpDirtyNext uintptr
-	FpDirtyPrev uintptr
+	FpPage       uintptr
+	FpData       uintptr
+	FpExtra      uintptr
+	FpCache      uintptr
+	FpDirty      uintptr
+	FpPager      uintptr
+	Fpgno        Pgno
+	Fflags       U16
+	F__ccgo_pad1 [2]byte
+	FnRef        I64
+	FpDirtyNext  uintptr
+	FpDirtyPrev  uintptr
 }
 
 // Handle type for pages.
@@ -6990,14 +6994,14 @@ type PCache2 = struct {
 	FpDirty      uintptr
 	FpDirtyTail  uintptr
 	FpSynced     uintptr
-	FnRefSum     int32
+	FnRefSum     I64
 	FszCache     int32
 	FszSpill     int32
 	FszPage      int32
 	FszExtra     int32
 	FbPurgeable  U8
 	FeCreate     U8
-	F__ccgo_pad1 [2]byte
+	F__ccgo_pad1 [6]byte
 	FxStress     uintptr
 	FpStress     uintptr
 	FpCache      uintptr
@@ -7256,7 +7260,7 @@ type CoveringIndexCheck1 = struct {
 	F__ccgo_pad1 [2]byte
 }
 
-var sqlite3azCompileOpt = [52]uintptr{
+var sqlite3azCompileOpt = [53]uintptr{
 	ts + 7,
 	ts + 27,
 	ts + 56,
@@ -7275,40 +7279,41 @@ var sqlite3azCompileOpt = [52]uintptr{
 	ts + 372,
 	ts + 397,
 	ts + 420,
-	ts + 432,
-	ts + 447,
-	ts + 469,
-	ts + 494,
-	ts + 517,
-	ts + 539,
-	ts + 550,
-	ts + 563,
-	ts + 578,
-	ts + 594,
-	ts + 607,
-	ts + 628,
-	ts + 652,
-	ts + 675,
-	ts + 691,
-	ts + 707,
-	ts + 731,
-	ts + 758,
-	ts + 778,
-	ts + 799,
-	ts + 821,
-	ts + 851,
-	ts + 876,
-	ts + 902,
-	ts + 922,
-	ts + 948,
-	ts + 971,
-	ts + 997,
-	ts + 1019,
-	ts + 1040,
-	ts + 1051,
+	ts + 439,
+	ts + 451,
+	ts + 466,
+	ts + 488,
+	ts + 513,
+	ts + 536,
+	ts + 558,
+	ts + 569,
+	ts + 582,
+	ts + 597,
+	ts + 613,
+	ts + 626,
+	ts + 647,
+	ts + 671,
+	ts + 694,
+	ts + 710,
+	ts + 726,
+	ts + 750,
+	ts + 777,
+	ts + 797,
+	ts + 818,
+	ts + 840,
+	ts + 870,
+	ts + 895,
+	ts + 921,
+	ts + 941,
+	ts + 967,
+	ts + 990,
+	ts + 1016,
+	ts + 1038,
 	ts + 1059,
-	ts + 1073,
-	ts + 1086,
+	ts + 1070,
+	ts + 1078,
+	ts + 1092,
+	ts + 1105,
 }
 
 func Xsqlite3CompileOptions(tls *libc.TLS, pnOpt uintptr) uintptr {
@@ -7460,7 +7465,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 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))
+var Xsqlite3StrBINARY = *(*[7]uint8)(unsafe.Pointer(ts + 1118))
 
 // Standard typenames.  These names must match the COLTYPE_* definitions.
 // Adjust the SQLITE_N_STDTYPE value if adding or removing entries.
@@ -7482,12 +7487,12 @@ var Xsqlite3StdTypeAffinity = [6]uint8{
 	uint8(SQLITE_AFF_TEXT),
 }
 var Xsqlite3StdType = [6]uintptr{
-	ts + 1106,
-	ts + 1110,
-	ts + 1115,
-	ts + 1119,
-	ts + 1127,
-	ts + 1132,
+	ts + 1125,
+	ts + 1129,
+	ts + 1134,
+	ts + 1138,
+	ts + 1146,
+	ts + 1151,
 }
 
 // SQL is translated into a sequence of instructions to be
@@ -7804,7 +7809,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, 23229)
+		return Xsqlite3MisuseError(tls, 23233)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -8233,7 +8238,7 @@ __6:
 __4:
 	;
 	zDate++
-	if !(getDigits(tls, zDate, ts+1137, libc.VaList(bp, bp+16, bp+20)) != 2) {
+	if !(getDigits(tls, zDate, ts+1156, libc.VaList(bp, bp+16, bp+20)) != 2) {
 		goto __9
 	}
 	return 1
@@ -8259,13 +8264,13 @@ func parseHhMmSs(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	defer tls.Free(36)
 
 	var ms float64 = 0.0
-	if getDigits(tls, zDate, ts+1145, libc.VaList(bp, bp+24, bp+28)) != 2 {
+	if getDigits(tls, zDate, ts+1164, libc.VaList(bp, bp+24, bp+28)) != 2 {
 		return 1
 	}
 	zDate += uintptr(5)
 	if int32(*(*uint8)(unsafe.Pointer(zDate))) == ':' {
 		zDate++
-		if getDigits(tls, zDate, ts+1153, libc.VaList(bp+16, bp+32)) != 1 {
+		if getDigits(tls, zDate, ts+1172, libc.VaList(bp+16, bp+32)) != 1 {
 			return 1
 		}
 		zDate += uintptr(2)
@@ -8363,7 +8368,7 @@ func parseYyyyMmDd(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	} else {
 		neg = 0
 	}
-	if getDigits(tls, zDate, ts+1157, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
+	if getDigits(tls, zDate, ts+1176, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
 		return 1
 	}
 	zDate += uintptr(10)
@@ -8420,7 +8425,7 @@ func parseDateOrTime(tls *libc.TLS, context uintptr, zDate uintptr, p uintptr) i
 		return 0
 	} else if parseHhMmSs(tls, zDate, p) == 0 {
 		return 0
-	} else if Xsqlite3StrICmp(tls, zDate, ts+1169) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
+	} else if Xsqlite3StrICmp(tls, zDate, ts+1188) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
 		return setDateTimeToCurrent(tls, context, p)
 	} else if Xsqlite3AtoF(tls, zDate, bp, Xsqlite3Strlen30(tls, zDate), uint8(SQLITE_UTF8)) > 0 {
 		setRawDateNumber(tls, p, *(*float64)(unsafe.Pointer(bp)))
@@ -8553,7 +8558,7 @@ func toLocaltime(tls *libc.TLS, p uintptr, pCtx uintptr) int32 {
 		*(*Time_t)(unsafe.Pointer(bp + 104)) = (*DateTime)(unsafe.Pointer(p)).FiJD/int64(1000) - int64(21086676)*int64(10000)
 	}
 	if osLocaltime(tls, bp+104, bp) != 0 {
-		Xsqlite3_result_error(tls, pCtx, ts+1173, -1)
+		Xsqlite3_result_error(tls, pCtx, ts+1192, -1)
 		return SQLITE_ERROR
 	}
 	(*DateTime)(unsafe.Pointer(p)).FY = (*tm)(unsafe.Pointer(bp)).Ftm_year + 1900 - iYearDiff
@@ -8577,12 +8582,12 @@ var aXformType = [6]struct {
 	FrLimit float32
 	FrXform float32
 }{
-	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1196)), FrLimit: 4.6427e+14, FrXform: 1.0},
-	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1203)), FrLimit: 7.7379e+12, FrXform: 60.0},
-	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1210)), FrLimit: 1.2897e+11, FrXform: 3600.0},
-	{FnName: U8(3), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1217)), FrLimit: 5373485.0, FrXform: 86400.0},
-	{FnName: U8(5), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1224)), FrLimit: 176546.0, FrXform: 2592000.0},
-	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1231)), FrLimit: 14713.0, FrXform: 31536000.0},
+	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1215)), FrLimit: 4.6427e+14, FrXform: 1.0},
+	{FnName: U8(6), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1222)), FrLimit: 7.7379e+12, FrXform: 60.0},
+	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1229)), FrLimit: 1.2897e+11, FrXform: 3600.0},
+	{FnName: U8(3), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1236)), FrLimit: 5373485.0, FrXform: 86400.0},
+	{FnName: U8(5), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1243)), FrLimit: 176546.0, FrXform: 2592000.0},
+	{FnName: U8(4), FzName: *(*[7]uint8)(unsafe.Pointer(ts + 1250)), FrLimit: 14713.0, FrXform: 31536000.0},
 }
 
 func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, idx int32) int32 {
@@ -8594,7 +8599,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 	switch int32(Xsqlite3UpperToLower[*(*uint8)(unsafe.Pointer(z))]) {
 	case 'a':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1238) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1257) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8616,7 +8621,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'j':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1243) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1262) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8630,7 +8635,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'l':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1253) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1272) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				rc = toLocaltime(tls, p, pCtx)
 			}
 			break
@@ -8638,7 +8643,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'u':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1263) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1282) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -8650,7 +8655,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					(*DateTime)(unsafe.Pointer(p)).FrawS = uint8(0)
 					rc = 0
 				}
-			} else if Xsqlite3_stricmp(tls, z, ts+1273) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1292) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				if int32((*DateTime)(unsafe.Pointer(p)).FtzSet) == 0 {
 					var iOrigJD I64
 					var iGuess I64
@@ -8684,7 +8689,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'w':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1277, 8) == 0 &&
+			if Xsqlite3_strnicmp(tls, z, ts+1296, 8) == 0 &&
 				Xsqlite3AtoF(tls, z+8, bp+48, Xsqlite3Strlen30(tls, z+8), uint8(SQLITE_UTF8)) > 0 &&
 				*(*float64)(unsafe.Pointer(bp + 48)) >= 0.0 && *(*float64)(unsafe.Pointer(bp + 48)) < 7.0 && float64(libc.AssignInt32(&n, int32(*(*float64)(unsafe.Pointer(bp + 48))))) == *(*float64)(unsafe.Pointer(bp + 48)) {
 				var Z Sqlite3_int64
@@ -8705,7 +8710,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 's':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1286, 9) != 0 {
+			if Xsqlite3_strnicmp(tls, z, ts+1305, 9) != 0 {
 				break
 			}
 			if !(int32((*DateTime)(unsafe.Pointer(p)).FvalidJD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidYMD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidHMS) != 0) {
@@ -8719,14 +8724,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 			(*DateTime)(unsafe.Pointer(p)).FrawS = uint8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidTZ = uint8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidJD = uint8(0)
-			if Xsqlite3_stricmp(tls, z, ts+1296) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1315) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1302) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1321) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FM = 1
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1307) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1326) == 0 {
 				rc = 0
 			}
 			break
@@ -9052,7 +9057,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		switch int32(*(*uint8)(unsafe.Pointer(zFmt + uintptr(i)))) {
 		case 'd':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
 				break
 
 			}
@@ -9062,13 +9067,13 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if s > 59.999 {
 					s = 59.999
 				}
-				Xsqlite3_str_appendf(tls, bp+136, ts+1316, libc.VaList(bp+8, s))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1335, libc.VaList(bp+8, s))
 				break
 
 			}
 		case 'H':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
 				break
 
 			}
@@ -9086,41 +9091,41 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if int32(*(*uint8)(unsafe.Pointer(zFmt + uintptr(i)))) == 'W' {
 					var wd int32
 					wd = int32(((*DateTime)(unsafe.Pointer(bp+88)).FiJD + int64(43200000)) / int64(86400000) % int64(7))
-					Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+24, (nDay+7-wd)/7))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+24, (nDay+7-wd)/7))
 				} else {
-					Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+32, nDay+1))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1342, libc.VaList(bp+32, nDay+1))
 				}
 				break
 
 			}
 		case 'J':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1328, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1347, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
 				break
 
 			}
 		case 'm':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
 				break
 
 			}
 		case 'M':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
 				break
 
 			}
 		case 's':
 			{
 				var iS I64 = (*DateTime)(unsafe.Pointer(bp+88)).FiJD/int64(1000) - int64(21086676)*int64(10000)
-				Xsqlite3_str_appendf(tls, bp+136, ts+1334, libc.VaList(bp+64, iS))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1353, libc.VaList(bp+64, iS))
 				break
 
 			}
 		case 'S':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1311, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1330, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
 				break
 
 			}
@@ -9133,7 +9138,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			}
 		case 'Y':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1339, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1358, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
 				break
 
 			}
@@ -9183,15 +9188,15 @@ func Xsqlite3RegisterDateTimeFunctions(tls *libc.TLS) {
 }
 
 var aDateTimeFuncs = [9]FuncDef{
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1243},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1263},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1344},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1349},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1354},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1262},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1282},
 	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1363},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1372},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1385},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1403}}
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1368},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1373},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1382},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1391},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1404},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1422}}
 
 // The following routines are convenience wrappers around methods
 // of the sqlite3_file object.  This is mostly just syntactic sugar. All
@@ -9606,7 +9611,7 @@ func sqlite3MemMalloc(tls *libc.TLS, nByte int32) uintptr {
 		*(*Sqlite3_int64)(unsafe.Pointer(p)) = Sqlite3_int64(nByte)
 		p += 8
 	} else {
-		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1416, libc.VaList(bp, nByte))
+		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1435, libc.VaList(bp, nByte))
 	}
 	return p
 }
@@ -9639,7 +9644,7 @@ func sqlite3MemRealloc(tls *libc.TLS, pPrior uintptr, nByte int32) uintptr {
 		p += 8
 	} else {
 		Xsqlite3_log(tls, SQLITE_NOMEM,
-			ts+1454,
+			ts+1473,
 			libc.VaList(bp, sqlite3MemSize(tls, pPrior), nByte))
 	}
 	return p
@@ -10515,7 +10520,7 @@ func Xsqlite3OomFault(tls *libc.TLS, db uintptr) uintptr {
 		(*Sqlite3)(unsafe.Pointer(db)).Flookaside.Fsz = U16(0)
 		if (*Sqlite3)(unsafe.Pointer(db)).FpParse != 0 {
 			var pParse uintptr
-			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1490, 0)
+			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1509, 0)
 			(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 			for pParse = (*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).FpOuterParse; pParse != 0; pParse = (*Parse)(unsafe.Pointer(pParse)).FpOuterParse {
 				(*Parse)(unsafe.Pointer(pParse)).FnErr++
@@ -10588,8 +10593,8 @@ type et_info = struct {
 // by an instance of the following structure
 type Et_info = et_info
 
-var aDigits = *(*[33]uint8)(unsafe.Pointer(ts + 1504))
-var aPrefix = *(*[7]uint8)(unsafe.Pointer(ts + 1537))
+var aDigits = *(*[33]uint8)(unsafe.Pointer(ts + 1523))
+var aPrefix = *(*[7]uint8)(unsafe.Pointer(ts + 1556))
 var fmtinfo = [23]Et_info{
 	{Ffmttype: uint8('d'), Fbase: EtByte(10), Fflags: EtByte(1), Ftype: EtByte(EtDECIMAL)},
 	{Ffmttype: uint8('s'), Fflags: EtByte(4), Ftype: EtByte(EtSTRING)},
@@ -10803,7 +10808,7 @@ __6:
 	if !(libc.AssignInt32(&c, int32(*(*uint8)(unsafe.Pointer(libc.PreIncUintptr(&fmt, 1))))) == 0) {
 		goto __11
 	}
-	Xsqlite3_str_append(tls, pAccum, ts+1544, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1563, 1)
 	goto __5
 __11:
 	;
@@ -11360,7 +11365,7 @@ __125:
 	if !(Xsqlite3IsNaN(tls, *(*float64)(unsafe.Pointer(bp + 104))) != 0) {
 		goto __127
 	}
-	bufpt = ts + 1546
+	bufpt = ts + 1565
 	length = 3
 	goto __58
 __127:
@@ -11420,7 +11425,7 @@ __138:
 	}
 	bufpt = bp + 16
 	*(*uint8)(unsafe.Pointer(bp + 16)) = prefix
-	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1550, uint64(4))
+	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1569, uint64(4))
 	length = 3 + libc.Bool32(int32(prefix) != 0)
 	goto __58
 __139:
@@ -11786,7 +11791,7 @@ __200:
 	if !(bufpt == uintptr(0)) {
 		goto __201
 	}
-	bufpt = ts + 1554
+	bufpt = ts + 1573
 	goto __202
 __201:
 	if !(int32(xtype) == EtDYNSTRING) {
@@ -11910,9 +11915,9 @@ __222:
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
-			return ts + 1555
+			return ts + 1574
 		}
-		return ts + 1560
+		return ts + 1579
 	}()
 __223:
 	;
@@ -12060,7 +12065,7 @@ __246:
 		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
-	Xsqlite3_str_append(tls, pAccum, ts+1567, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1586, 1)
 __250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
@@ -12077,10 +12082,10 @@ __251:
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
 		goto __253
 	}
-	Xsqlite3_str_appendf(tls, pAccum, ts+1569, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1588, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 	goto __254
 __253:
-	Xsqlite3_str_appendf(tls, pAccum, ts+1579, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1598, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
 __254:
 	;
 __252:
@@ -12135,7 +12140,7 @@ __4:
 __5:
 }
 
-var zOrd = *(*[9]uint8)(unsafe.Pointer(ts + 1593))
+var zOrd = *(*[9]uint8)(unsafe.Pointer(ts + 1612))
 
 // The z string points to the first character of a token that is
 // associated with an error.  If db does not already have an error
@@ -12300,7 +12305,7 @@ func Xsqlite3ResultStrAccum(tls *libc.TLS, pCtx uintptr, p uintptr) {
 	} else if int32((*StrAccum)(unsafe.Pointer(p)).FprintfFlags)&SQLITE_PRINTF_MALLOCED != 0 {
 		Xsqlite3_result_text(tls, pCtx, (*StrAccum)(unsafe.Pointer(p)).FzText, int32((*StrAccum)(unsafe.Pointer(p)).FnChar), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 	} else {
-		Xsqlite3_result_text(tls, pCtx, ts+1554, 0, uintptr(0))
+		Xsqlite3_result_text(tls, pCtx, ts+1573, 0, uintptr(0))
 		Xsqlite3_str_reset(tls, p)
 	}
 }
@@ -14036,7 +14041,7 @@ func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
 	var c int32 = 0
 	var i int32
 
-	var pow63 uintptr = ts + 1602
+	var pow63 uintptr = ts + 1621
 	for i = 0; c == 0 && i < 18; i++ {
 		c = (int32(*(*uint8)(unsafe.Pointer(zNum + uintptr(i*incr)))) - int32(*(*uint8)(unsafe.Pointer(pow63 + uintptr(i))))) * 10
 	}
@@ -14582,7 +14587,7 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 	defer tls.Free(8)
 
 	Xsqlite3_log(tls, SQLITE_MISUSE,
-		ts+1621,
+		ts+1640,
 		libc.VaList(bp, zType))
 }
 
@@ -14601,13 +14606,13 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 func Xsqlite3SafetyCheckOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	if db == uintptr(0) {
-		logBadConnection(tls, ts+1555)
+		logBadConnection(tls, ts+1574)
 		return 0
 	}
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_OPEN {
 		if Xsqlite3SafetyCheckSickOrOk(tls, db) != 0 {
-			logBadConnection(tls, ts+1666)
+			logBadConnection(tls, ts+1685)
 		}
 		return 0
 	} else {
@@ -14620,7 +14625,7 @@ func Xsqlite3SafetyCheckSickOrOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_SICK && int32(eOpenState) != SQLITE_STATE_OPEN && int32(eOpenState) != SQLITE_STATE_BUSY {
-		logBadConnection(tls, ts+1675)
+		logBadConnection(tls, ts+1694)
 		return 0
 	} else {
 		return 1
@@ -15094,193 +15099,193 @@ func Xsqlite3OpcodeName(tls *libc.TLS, i int32) uintptr {
 }
 
 var azName = [187]uintptr{
-	ts + 1683,
-	ts + 1693,
-	ts + 1704,
-	ts + 1716,
-	ts + 1727,
-	ts + 1739,
+	ts + 1702,
+	ts + 1712,
+	ts + 1723,
+	ts + 1735,
 	ts + 1746,
-	ts + 1754,
-	ts + 1762,
-	ts + 1767,
-	ts + 1772,
-	ts + 1778,
-	ts + 1792,
-	ts + 1798,
-	ts + 1808,
-	ts + 1813,
-	ts + 1818,
-	ts + 1821,
+	ts + 1758,
+	ts + 1765,
+	ts + 1773,
+	ts + 1781,
+	ts + 1786,
+	ts + 1791,
+	ts + 1797,
+	ts + 1811,
+	ts + 1817,
 	ts + 1827,
-	ts + 1834,
-	ts + 1838,
-	ts + 1848,
-	ts + 1855,
-	ts + 1862,
-	ts + 1869,
-	ts + 1876,
-	ts + 1886,
+	ts + 1832,
+	ts + 1837,
+	ts + 1840,
+	ts + 1846,
+	ts + 1853,
+	ts + 1857,
+	ts + 1867,
+	ts + 1874,
+	ts + 1881,
+	ts + 1888,
 	ts + 1895,
-	ts + 1906,
-	ts + 1915,
-	ts + 1921,
-	ts + 1931,
-	ts + 1941,
-	ts + 1946,
-	ts + 1956,
-	ts + 1967,
-	ts + 1972,
-	ts + 1979,
-	ts + 1990,
-	ts + 1995,
-	ts + 2000,
-	ts + 2006,
-	ts + 2012,
-	ts + 2018,
-	ts + 2021,
+	ts + 1905,
+	ts + 1914,
+	ts + 1925,
+	ts + 1934,
+	ts + 1940,
+	ts + 1950,
+	ts + 1960,
+	ts + 1965,
+	ts + 1975,
+	ts + 1986,
+	ts + 1991,
+	ts + 1998,
+	ts + 2009,
+	ts + 2014,
+	ts + 2019,
 	ts + 2025,
 	ts + 2031,
-	ts + 2042,
-	ts + 2053,
+	ts + 2037,
+	ts + 2040,
+	ts + 2044,
+	ts + 2050,
 	ts + 2061,
-	ts + 2070,
-	ts + 2077,
-	ts + 2085,
-	ts + 2088,
-	ts + 2091,
-	ts + 2094,
-	ts + 2097,
-	ts + 2100,
-	ts + 2103,
+	ts + 2072,
+	ts + 2080,
+	ts + 2089,
+	ts + 2096,
+	ts + 2104,
+	ts + 2107,
 	ts + 2110,
+	ts + 2113,
 	ts + 2116,
-	ts + 2126,
-	ts + 2139,
-	ts + 2150,
-	ts + 2156,
-	ts + 2163,
-	ts + 2172,
-	ts + 2181,
-	ts + 2188,
-	ts + 2201,
-	ts + 2212,
-	ts + 2217,
-	ts + 2225,
+	ts + 2119,
+	ts + 2122,
+	ts + 2129,
+	ts + 2135,
+	ts + 2145,
+	ts + 2158,
+	ts + 2169,
+	ts + 2175,
+	ts + 2182,
+	ts + 2191,
+	ts + 2200,
+	ts + 2207,
+	ts + 2220,
 	ts + 2231,
-	ts + 2238,
+	ts + 2236,
+	ts + 2244,
 	ts + 2250,
-	ts + 2255,
-	ts + 2264,
+	ts + 2257,
 	ts + 2269,
-	ts + 2278,
+	ts + 2274,
 	ts + 2283,
 	ts + 2288,
-	ts + 2294,
+	ts + 2297,
 	ts + 2302,
-	ts + 2310,
-	ts + 2320,
-	ts + 2328,
-	ts + 2335,
-	ts + 2348,
-	ts + 2353,
-	ts + 2365,
-	ts + 2373,
-	ts + 2380,
-	ts + 2391,
-	ts + 2398,
-	ts + 2405,
-	ts + 2415,
+	ts + 2307,
+	ts + 2313,
+	ts + 2321,
+	ts + 2329,
+	ts + 2339,
+	ts + 2347,
+	ts + 2354,
+	ts + 2367,
+	ts + 2372,
+	ts + 2384,
+	ts + 2392,
+	ts + 2399,
+	ts + 2410,
+	ts + 2417,
 	ts + 2424,
-	ts + 2435,
-	ts + 2441,
-	ts + 2452,
-	ts + 2462,
-	ts + 2472,
-	ts + 2479,
-	ts + 2485,
-	ts + 2495,
-	ts + 2506,
-	ts + 2510,
-	ts + 2519,
-	ts + 2528,
-	ts + 2535,
-	ts + 2545,
-	ts + 2552,
-	ts + 2561,
+	ts + 2434,
+	ts + 2443,
+	ts + 2454,
+	ts + 2460,
+	ts + 2471,
+	ts + 2481,
+	ts + 2491,
+	ts + 2498,
+	ts + 2504,
+	ts + 2514,
+	ts + 2525,
+	ts + 2529,
+	ts + 2538,
+	ts + 2547,
+	ts + 2554,
+	ts + 2564,
 	ts + 2571,
-	ts + 2578,
-	ts + 2586,
-	ts + 2600,
-	ts + 2608,
-	ts + 2622,
-	ts + 2633,
-	ts + 2646,
-	ts + 2657,
-	ts + 2663,
-	ts + 2675,
-	ts + 2684,
-	ts + 2692,
-	ts + 2701,
-	ts + 2710,
-	ts + 2717,
-	ts + 2725,
-	ts + 2732,
-	ts + 2743,
-	ts + 2757,
-	ts + 2768,
+	ts + 2580,
+	ts + 2590,
+	ts + 2597,
+	ts + 2605,
+	ts + 2619,
+	ts + 2627,
+	ts + 2641,
+	ts + 2652,
+	ts + 2665,
+	ts + 2676,
+	ts + 2682,
+	ts + 2694,
+	ts + 2703,
+	ts + 2711,
+	ts + 2720,
+	ts + 2729,
+	ts + 2736,
+	ts + 2744,
+	ts + 2751,
+	ts + 2762,
 	ts + 2776,
-	ts + 2782,
-	ts + 2790,
-	ts + 2798,
-	ts + 2808,
-	ts + 2821,
-	ts + 2831,
-	ts + 2844,
-	ts + 2853,
-	ts + 2864,
+	ts + 2787,
+	ts + 2795,
+	ts + 2801,
+	ts + 2809,
+	ts + 2817,
+	ts + 2827,
+	ts + 2840,
+	ts + 2850,
+	ts + 2863,
 	ts + 2872,
-	ts + 2878,
-	ts + 2890,
-	ts + 2902,
-	ts + 2910,
-	ts + 2922,
-	ts + 2935,
-	ts + 2945,
-	ts + 2955,
-	ts + 2960,
-	ts + 2972,
-	ts + 2984,
-	ts + 2994,
-	ts + 3000,
-	ts + 3010,
-	ts + 3017,
+	ts + 2883,
+	ts + 2891,
+	ts + 2897,
+	ts + 2909,
+	ts + 2921,
+	ts + 2929,
+	ts + 2941,
+	ts + 2954,
+	ts + 2964,
+	ts + 2974,
+	ts + 2979,
+	ts + 2991,
+	ts + 3003,
+	ts + 3013,
+	ts + 3019,
 	ts + 3029,
-	ts + 3040,
+	ts + 3036,
 	ts + 3048,
-	ts + 3057,
-	ts + 3066,
-	ts + 3075,
-	ts + 3082,
-	ts + 3093,
-	ts + 3106,
-	ts + 3116,
-	ts + 3123,
-	ts + 3131,
-	ts + 3140,
-	ts + 3146,
-	ts + 3154,
-	ts + 3162,
-	ts + 3170,
-	ts + 3180,
+	ts + 3059,
+	ts + 3067,
+	ts + 3076,
+	ts + 3085,
+	ts + 3094,
+	ts + 3101,
+	ts + 3112,
+	ts + 3125,
+	ts + 3135,
+	ts + 3142,
+	ts + 3150,
+	ts + 3159,
+	ts + 3165,
+	ts + 3173,
+	ts + 3181,
 	ts + 3189,
-	ts + 3200,
-	ts + 3210,
-	ts + 3216,
-	ts + 3227,
-	ts + 3238,
-	ts + 3243,
-	ts + 3251,
+	ts + 3199,
+	ts + 3208,
+	ts + 3219,
+	ts + 3229,
+	ts + 3235,
+	ts + 3246,
+	ts + 3257,
+	ts + 3262,
+	ts + 3270,
 }
 
 type stat = struct {
@@ -15654,35 +15659,35 @@ type unix_syscall = struct {
 }
 
 var aSyscall = [29]unix_syscall{
-	{FzName: ts + 3261, FpCurrent: 0},
-	{FzName: ts + 3266, FpCurrent: 0},
-	{FzName: ts + 3272, FpCurrent: 0},
-	{FzName: ts + 3279, FpCurrent: 0},
-	{FzName: ts + 3286, FpCurrent: 0},
+	{FzName: ts + 3280, FpCurrent: 0},
+	{FzName: ts + 3285, FpCurrent: 0},
 	{FzName: ts + 3291, FpCurrent: 0},
-	{FzName: ts + 3297, FpCurrent: 0},
-	{FzName: ts + 3307, FpCurrent: 0},
-	{FzName: ts + 3313, FpCurrent: 0},
-	{FzName: ts + 3318},
-	{FzName: ts + 3324},
+	{FzName: ts + 3298, FpCurrent: 0},
+	{FzName: ts + 3305, FpCurrent: 0},
+	{FzName: ts + 3310, FpCurrent: 0},
+	{FzName: ts + 3316, FpCurrent: 0},
+	{FzName: ts + 3326, FpCurrent: 0},
 	{FzName: ts + 3332, FpCurrent: 0},
-	{FzName: ts + 3338},
-	{FzName: ts + 3345},
-	{FzName: ts + 3354, FpCurrent: 0},
-	{FzName: ts + 3361},
-	{FzName: ts + 3371, FpCurrent: 0},
-	{FzName: ts + 3378, FpCurrent: 0},
-	{FzName: ts + 3392, FpCurrent: 0},
-	{FzName: ts + 3398, FpCurrent: 0},
-	{FzName: ts + 3404, FpCurrent: 0},
+	{FzName: ts + 3337},
+	{FzName: ts + 3343},
+	{FzName: ts + 3351, FpCurrent: 0},
+	{FzName: ts + 3357},
+	{FzName: ts + 3364},
+	{FzName: ts + 3373, FpCurrent: 0},
+	{FzName: ts + 3380},
+	{FzName: ts + 3390, FpCurrent: 0},
+	{FzName: ts + 3397, FpCurrent: 0},
 	{FzName: ts + 3411, FpCurrent: 0},
-	{FzName: ts + 3419, FpCurrent: 0},
-	{FzName: ts + 3424, FpCurrent: 0},
-	{FzName: ts + 3431, FpCurrent: 0},
+	{FzName: ts + 3417, FpCurrent: 0},
+	{FzName: ts + 3423, FpCurrent: 0},
+	{FzName: ts + 3430, FpCurrent: 0},
 	{FzName: ts + 3438, FpCurrent: 0},
+	{FzName: ts + 3443, FpCurrent: 0},
 	{FzName: ts + 3450, FpCurrent: 0},
-	{FzName: ts + 3459, FpCurrent: 0},
-	{FzName: ts + 3465},
+	{FzName: ts + 3457, FpCurrent: 0},
+	{FzName: ts + 3469, FpCurrent: 0},
+	{FzName: ts + 3478, FpCurrent: 0},
+	{FzName: ts + 3484},
 }
 
 func robustFchown(tls *libc.TLS, fd int32, uid Uid_t, gid Gid_t) int32 {
@@ -15780,9 +15785,9 @@ func robust_open(tls *libc.TLS, z uintptr, f int32, m Mode_t) int32 {
 		}
 		(*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, fd)
 		Xsqlite3_log(tls, SQLITE_WARNING,
-			ts+3471, libc.VaList(bp, z, fd))
+			ts+3490, libc.VaList(bp, z, fd))
 		fd = -1
-		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3514, O_RDONLY, int32(m)) < 0 {
+		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3533, O_RDONLY, int32(m)) < 0 {
 			break
 		}
 	}
@@ -15861,13 +15866,13 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 	var zErr uintptr
 	var iErrno int32 = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 
-	zErr = ts + 1554
+	zErr = ts + 1573
 
 	if zPath == uintptr(0) {
-		zPath = ts + 1554
+		zPath = ts + 1573
 	}
 	Xsqlite3_log(tls, errcode,
-		ts+3524,
+		ts+3543,
 		libc.VaList(bp, iLine, iErrno, zFunc, zPath, zErr))
 
 	return errcode
@@ -15875,7 +15880,7 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 
 func robust_close(tls *libc.TLS, pFile uintptr, h int32, lineno int32) {
 	if (*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, h) != 0 {
-		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3266,
+		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3285,
 			func() uintptr {
 				if pFile != 0 {
 					return (*UnixFile)(unsafe.Pointer(pFile)).FzPath
@@ -15896,7 +15901,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, 38271)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38275)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -15998,19 +16003,19 @@ func verifyDbFile(tls *libc.TLS, pFile uintptr) {
 
 	rc = (*(*func(*libc.TLS, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 5*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, bp+32)
 	if rc != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3555, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3574, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink == uint64(0) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3579, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3598, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink > uint64(1) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3608, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3627, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if fileHasMoved(tls, pFile) != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3635, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3654, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 }
@@ -16373,7 +16378,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, 39055)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39059)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -16646,7 +16651,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	var ii int32
 	var fd int32 = -1
 
-	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3663, libc.VaList(bp, zFilename))
+	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3682, libc.VaList(bp, zFilename))
 	for ii = int32(libc.Xstrlen(tls, bp+8)); ii > 0 && int32(*(*uint8)(unsafe.Pointer(bp + 8 + uintptr(ii)))) != '/'; ii-- {
 	}
 	if ii > 0 {
@@ -16664,7 +16669,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3378, bp+8, 40676)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40680), ts+3397, bp+8, 40680)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -16681,14 +16686,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, 40717)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3685, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40721)
 	}
 
 	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)), 40731)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40735)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -16708,7 +16713,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, 40762)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3316, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40766)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -16763,7 +16768,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 				if iWrite >= nSize {
 					iWrite = nSize - int64(1)
 				}
-				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1554, 1)
+				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1573, 1)
 				if nWrite != 1 {
 					return SQLITE_IOERR | int32(3)<<8
 				}
@@ -16776,7 +16781,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, 40883)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3316, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40887)
 			}
 		}
 
@@ -16844,7 +16849,7 @@ func unixFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 		}
 	case SQLITE_FCNTL_VFSNAME:
 		{
-			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
+			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
 			return SQLITE_OK
 
 		}
@@ -17003,7 +17008,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, 41442)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41446)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -17031,7 +17036,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, 41499)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3316, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41503)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -17094,7 +17099,7 @@ __4:
 	;
 	libc.Xmemset(tls, pShmNode, 0, uint64(unsafe.Sizeof(unixShmNode{}))+uint64(nShmFilename))
 	zShm = libc.AssignPtrUintptr(pShmNode+16, pShmNode+1*96)
-	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3677, libc.VaList(bp, zBasePath))
+	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3696, libc.VaList(bp, zBasePath))
 
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = -1
 	(*UnixInodeInfo)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pDbFd)).FpInode)).FpShmNode = pShmNode
@@ -17115,7 +17120,7 @@ __5:
 	if !(int32((*UnixInodeInfo)(unsafe.Pointer(pInode)).FbProcessLock) == 0) {
 		goto __7
 	}
-	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3684, 0)) {
+	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3703, 0)) {
 		goto __8
 	}
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = robust_open(tls, zShm, O_RDWR|O_CREAT|0400000,
@@ -17130,7 +17135,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3261, zShm, 41624)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41628), ts+3280, zShm, 41628)
 	goto shm_open_err
 __10:
 	;
@@ -17256,11 +17261,11 @@ __11:
 		goto __13
 	}
 	*(*int32)(unsafe.Pointer(bp + 144)) = 0
-	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1554, 1, bp+144) != 1) {
+	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1573, 1, bp+144) != 1) {
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41768)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3351, zFile, 41772)
 	goto shmpage_out
 __14:
 	;
@@ -17306,7 +17311,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3419, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3438, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41799)
 	goto shmpage_out
 __20:
 	;
@@ -17507,7 +17512,7 @@ func unixUnmapfile(tls *libc.TLS, pFd uintptr) {
 }
 
 func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
-	var zErr uintptr = ts + 3419
+	var zErr uintptr = ts + 3438
 	var h int32 = (*UnixFile)(unsafe.Pointer(pFd)).Fh
 	var pOrig uintptr = (*UnixFile)(unsafe.Pointer(pFd)).FpMapRegion
 	var nOrig I64 = (*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeActual
@@ -17523,7 +17528,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 		}
 
 		pNew = (*(*func(*libc.TLS, uintptr, Size_t, Size_t, int32, uintptr) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 24*24 + 8)))(tls, pOrig, uint64(nReuse), uint64(nNew), MREMAP_MAYMOVE, 0)
-		zErr = ts + 3431
+		zErr = ts + 3450
 
 		if pNew == libc.UintptrFromInt32(-1) || pNew == uintptr(0) {
 			(*(*func(*libc.TLS, uintptr, Size_t) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 23*24 + 8)))(tls, pOrig, uint64(nReuse))
@@ -17537,7 +17542,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, 42169)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42173)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -17652,10 +17657,10 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		}
 		return uintptr(0)
 	}(),
-		ts+3697, SQLITE_POWERSAFE_OVERWRITE) != 0 {
+		ts+3716, SQLITE_POWERSAFE_OVERWRITE) != 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_PSOW)
 	}
-	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3702) == 0 {
+	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3721) == 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_EXCL)
 	}
 
@@ -17671,7 +17676,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, 42672)
+			robust_close(tls, pNew, h, 42676)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -17684,7 +17689,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		if zLockFile == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
-			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3712, libc.VaList(bp, zFilename))
+			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3731, libc.VaList(bp, zFilename))
 		}
 		(*UnixFile)(unsafe.Pointer(pNew)).FlockingContext = zLockFile
 	}
@@ -17692,7 +17697,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, 42757)
+			robust_close(tls, pNew, h, 42761)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -17705,15 +17710,15 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 var azTempDirs = [6]uintptr{
 	uintptr(0),
 	uintptr(0),
-	ts + 3720,
-	ts + 3729,
-	ts + 3738,
-	ts + 1567,
+	ts + 3739,
+	ts + 3748,
+	ts + 3757,
+	ts + 1586,
 }
 
 func unixTempFileInit(tls *libc.TLS) {
-	azTempDirs[0] = libc.Xgetenv(tls, ts+3743)
-	azTempDirs[1] = libc.Xgetenv(tls, ts+3757)
+	azTempDirs[0] = libc.Xgetenv(tls, ts+3762)
+	azTempDirs[1] = libc.Xgetenv(tls, ts+3776)
 }
 
 func unixTempFileDir(tls *libc.TLS) uintptr {
@@ -17758,7 +17763,7 @@ func unixGetTempname(tls *libc.TLS, nBuf int32, zBuf uintptr) int32 {
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U64(0))), bp+24)
 
 			*(*uint8)(unsafe.Pointer(zBuf + uintptr(nBuf-2))) = uint8(0)
-			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3764,
+			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3783,
 				libc.VaList(bp, zDir, *(*U64)(unsafe.Pointer(bp + 24)), 0))
 			if int32(*(*uint8)(unsafe.Pointer(zBuf + uintptr(nBuf-2)))) != 0 || libc.PostIncInt32(&iLimit, 1) > 10 {
 				rc = SQLITE_ERROR
@@ -17843,7 +17848,7 @@ func findCreateFileMode(tls *libc.TLS, zPath uintptr, flags int32, pMode uintptr
 	} else if flags&SQLITE_OPEN_DELETEONCLOSE != 0 {
 		*(*Mode_t)(unsafe.Pointer(pMode)) = Mode_t(0600)
 	} else if flags&SQLITE_OPEN_URI != 0 {
-		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3781)
+		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3800)
 		if z != 0 {
 			rc = getFileMode(tls, z, pMode, pUid, pGid)
 		}
@@ -18008,7 +18013,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3261, zName, 43198)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43202), ts+3280, zName, 43202)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -18099,7 +18104,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, 43337)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3390, zPath, 43341)
 		}
 		return rc
 	}
@@ -18107,9 +18112,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, 43347)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3807, zPath, 43351)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43353)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -18173,18 +18178,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, 43443), ts+3459, zIn, 43443)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43447), ts+3478, zIn, 43447)
 			}
 		} 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, 43449)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43453)
 				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, 43454), ts+3450, zIn, 43454)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43458), ts+3469, zIn, 43458)
 				return
 			}
 			*(*uint8)(unsafe.Pointer(bp + 144 + uintptr(got))) = uint8(0)
@@ -18224,14 +18229,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, 43512), ts+3279, zPath, 43512)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43516), ts+3298, zPath, 43516)
 		}
 		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, 43518)
+		return Xsqlite3CantopenError(tls, 43522)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+4104)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -18289,7 +18294,7 @@ func unixDlError(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBufOut uintptr) {
 	unixEnterMutex(tls)
 	zErr = libc.Xdlerror(tls)
 	if zErr != 0 {
-		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3663, libc.VaList(bp, zErr))
+		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3682, libc.VaList(bp, zErr))
 	}
 	unixLeaveMutex(tls)
 }
@@ -18321,7 +18326,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 	{
 		var fd int32
 		var got int32
-		fd = robust_open(tls, ts+3794, O_RDONLY, uint32(0))
+		fd = robust_open(tls, ts+3813, O_RDONLY, uint32(0))
 		if fd < 0 {
 			libc.Xtime(tls, bp)
 			libc.Xmemcpy(tls, zBuf, bp, uint64(unsafe.Sizeof(Time_t(0))))
@@ -18332,7 +18337,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, 43619)
+			robust_close(tls, uintptr(0), fd, 43623)
 		}
 
 	}
@@ -18409,10 +18414,10 @@ func Xsqlite3_os_init(tls *libc.TLS) int32 {
 }
 
 var aVfs = [4]Sqlite3_vfs{
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3807, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3812, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3822, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3702, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3826, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3831, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3841, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3721, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
 }
 
 // Shutdown the operating system interface.
@@ -18467,7 +18472,7 @@ var memdb_g MemFS
 var memdb_vfs = Sqlite3_vfs{
 	FiVersion:          2,
 	FmxPathname:        1024,
-	FzName:             ts + 3835,
+	FzName:             ts + 3854,
 	FxOpen:             0,
 	FxAccess:           0,
 	FxFullPathname:     0,
@@ -18723,7 +18728,7 @@ func memdbFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int3
 	var rc int32 = SQLITE_NOTFOUND
 	memdbEnter(tls, p)
 	if op == SQLITE_FCNTL_VFSNAME {
-		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3841, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
+		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3860, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
 		rc = SQLITE_OK
 	}
 	if op == SQLITE_FCNTL_SIZE_LIMIT {
@@ -18855,7 +18860,7 @@ func memdbFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, z
 	defer tls.Free(8)
 
 	_ = pVfs
-	Xsqlite3_snprintf(tls, nOut, zOut, ts+3663, libc.VaList(bp, zPath))
+	Xsqlite3_snprintf(tls, nOut, zOut, ts+3682, libc.VaList(bp, zPath))
 	return SQLITE_OK
 }
 
@@ -18976,7 +18981,7 @@ func Xsqlite3_serialize(tls *libc.TLS, db uintptr, zSchema uintptr, piSize uintp
 		return uintptr(0)
 	}
 	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
-	zSql = Xsqlite3_mprintf(tls, ts+3856, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3875, libc.VaList(bp, zSchema))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, db, zSql, -1, bp+8, uintptr(0))
 	} else {
@@ -19049,7 +19054,7 @@ __1:
 	goto end_deserialize
 __2:
 	;
-	zSql = Xsqlite3_mprintf(tls, ts+3879, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3898, libc.VaList(bp, zSchema))
 	if !(zSql == uintptr(0)) {
 		goto __3
 	}
@@ -19765,7 +19770,7 @@ func pcacheFetchFinishWithInit(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 	libc.Xmemset(tls, pPgHdr+32, 0, uint64(unsafe.Sizeof(PgHdr{}))-uint64(uintptr(0)+32))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpPage = pPage
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpData = (*Sqlite3_pcache_page)(unsafe.Pointer(pPage)).FpBuf
-	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*72
+	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*80
 	libc.Xmemset(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0, uint64(8))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpCache = pCache
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).Fpgno = pgno
@@ -19795,7 +19800,7 @@ func Xsqlite3PcacheFetchFinish(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 // reference count drops to 0, then it is made eligible for recycling.
 func Xsqlite3PcacheRelease(tls *libc.TLS, p uintptr) {
 	(*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FnRefSum--
-	if int32(libc.PreDecInt16(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1)) == 0 {
+	if libc.PreDecInt64(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1) == int64(0) {
 		if int32((*PgHdr)(unsafe.Pointer(p)).Fflags)&PGHDR_CLEAN != 0 {
 			pcacheUnpin(tls, p)
 		} else {
@@ -19846,7 +19851,7 @@ func Xsqlite3PcacheMakeClean(tls *libc.TLS, p uintptr) {
 	*(*U16)(unsafe.Pointer(p + 52)) &= libc.Uint16FromInt32(libc.CplInt32(PGHDR_DIRTY | PGHDR_NEED_SYNC | PGHDR_WRITEABLE))
 	*(*U16)(unsafe.Pointer(p + 52)) |= U16(PGHDR_CLEAN)
 
-	if int32((*PgHdr)(unsafe.Pointer(p)).FnRef) == 0 {
+	if (*PgHdr)(unsafe.Pointer(p)).FnRef == int64(0) {
 		pcacheUnpin(tls, p)
 	}
 }
@@ -19950,8 +19955,8 @@ func Xsqlite3PcacheClear(tls *libc.TLS, pCache uintptr) {
 }
 
 func pcacheMergeDirtyList(tls *libc.TLS, pA uintptr, pB uintptr) uintptr {
-	bp := tls.Alloc(72)
-	defer tls.Free(72)
+	bp := tls.Alloc(80)
+	defer tls.Free(80)
 
 	var pTail uintptr
 	pTail = bp
@@ -20029,13 +20034,13 @@ func Xsqlite3PcacheDirtyList(tls *libc.TLS, pCache uintptr) uintptr {
 //
 // This is not the total number of pages referenced, but the sum of the
 // reference count for all pages.
-func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) int32 {
+func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) I64 {
 	return (*PCache)(unsafe.Pointer(pCache)).FnRefSum
 }
 
 // Return the number of references to the page supplied as an argument.
-func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) int32 {
-	return int32((*PgHdr)(unsafe.Pointer(p)).FnRef)
+func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) I64 {
+	return (*PgHdr)(unsafe.Pointer(p)).FnRef
 }
 
 // Return the total number of pages in the cache.
@@ -22264,7 +22269,7 @@ __27:
 	if !(isHot != 0 && nPlayback != 0) {
 		goto __28
 	}
-	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3894,
+	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3913,
 		libc.VaList(bp, nPlayback, (*Pager)(unsafe.Pointer(pPager)).FzJournal))
 __28:
 	;
@@ -22329,7 +22334,7 @@ func pagerUndoCallback(tls *libc.TLS, pCtx uintptr, iPg Pgno) int32 {
 
 	pPg = Xsqlite3PagerLookup(tls, pPager, iPg)
 	if pPg != 0 {
-		if Xsqlite3PcachePageRefcount(tls, pPg) == 1 {
+		if Xsqlite3PcachePageRefcount(tls, pPg) == int64(1) {
 			Xsqlite3PcacheDrop(tls, pPg)
 		} else {
 			rc = readDbPage(tls, pPg)
@@ -22762,7 +22767,7 @@ func Xsqlite3PagerSetPagesize(tls *libc.TLS, pPager uintptr, pPageSize uintptr,
 	var pageSize U32 = *(*U32)(unsafe.Pointer(pPageSize))
 
 	if (int32((*Pager)(unsafe.Pointer(pPager)).FmemDb) == 0 || (*Pager)(unsafe.Pointer(pPager)).FdbSize == Pgno(0)) &&
-		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 &&
+		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) &&
 		pageSize != 0 && pageSize != U32((*Pager)(unsafe.Pointer(pPager)).FpageSize) {
 		var pNew uintptr = uintptr(0)
 		*(*I64)(unsafe.Pointer(bp)) = int64(0)
@@ -22914,9 +22919,9 @@ func pagerAcquireMapPage(tls *libc.TLS, pPager uintptr, pgno Pgno, pData uintptr
 			Xsqlite3OsUnfetch(tls, (*Pager)(unsafe.Pointer(pPager)).Ffd, I64(pgno-Pgno(1))*(*Pager)(unsafe.Pointer(pPager)).FpageSize, pData)
 			return SQLITE_NOMEM
 		}
-		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*72
+		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*80
 		(*PgHdr)(unsafe.Pointer(p)).Fflags = U16(PGHDR_MMAP)
-		(*PgHdr)(unsafe.Pointer(p)).FnRef = int16(1)
+		(*PgHdr)(unsafe.Pointer(p)).FnRef = int64(1)
 		(*PgHdr)(unsafe.Pointer(p)).FpPager = pPager
 	}
 
@@ -23248,7 +23253,7 @@ func Xsqlite3PagerFlush(tls *libc.TLS, pPager uintptr) int32 {
 
 		for rc == SQLITE_OK && pList != 0 {
 			var pNext uintptr = (*PgHdr)(unsafe.Pointer(pList)).FpDirty
-			if int32((*PgHdr)(unsafe.Pointer(pList)).FnRef) == 0 {
+			if (*PgHdr)(unsafe.Pointer(pList)).FnRef == int64(0) {
 				rc = pagerStress(tls, pPager, pList)
 			}
 			pList = pNext
@@ -23398,7 +23403,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 60235)
+	rc = Xsqlite3CantopenError(tls, 60239)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -23459,7 +23464,7 @@ __15:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzJournal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3921, uint64(8))
+	libc.Xmemcpy(tls, pPtr, ts+3940, uint64(8))
 	pPtr += uintptr(8 + 1)
 	goto __19
 __18:
@@ -23472,7 +23477,7 @@ __19:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzWal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3930, uint64(4))
+	libc.Xmemcpy(tls, pPtr, ts+3949, uint64(4))
 	pPtr += uintptr(4 + 1)
 	goto __21
 __20:
@@ -23524,9 +23529,9 @@ __27:
 	;
 __26:
 	;
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3935, 0))
+	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3954, 0))
 	if !(iDc&SQLITE_IOCAP_IMMUTABLE != 0 ||
-		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3942, 0) != 0) {
+		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3961, 0) != 0) {
 		goto __30
 	}
 	vfsFlags = vfsFlags | SQLITE_OPEN_READONLY
@@ -23779,7 +23784,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60754)
+	rc = Xsqlite3CantopenError(tls, 60758)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23885,7 +23890,7 @@ __24:
 }
 
 func pagerUnlockIfUnused(tls *libc.TLS, pPager uintptr) {
-	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 {
+	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) {
 		pagerUnlockAndRollback(tls, pPager)
 	}
 }
@@ -23903,7 +23908,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60967)
+	return Xsqlite3CorruptError(tls, 60971)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23942,7 +23947,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60999)
+	rc = Xsqlite3CorruptError(tls, 61003)
 	goto pager_acquire_err
 __7:
 	;
@@ -24019,7 +24024,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, 61078)
+		return Xsqlite3CorruptError(tls, 61082)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24777,7 +24782,7 @@ func Xsqlite3PagerMemUsed(tls *libc.TLS, pPager uintptr) int32 {
 
 // Return the number of references to the specified page.
 func Xsqlite3PagerPageRefcount(tls *libc.TLS, pPage uintptr) int32 {
-	return Xsqlite3PcachePageRefcount(tls, pPage)
+	return int32(Xsqlite3PcachePageRefcount(tls, pPage))
 }
 
 // Parameter eStat must be one of SQLITE_DBSTATUS_CACHE_HIT, _MISS, _WRITE,
@@ -25020,9 +25025,9 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	pPgOld = Xsqlite3PagerLookup(tls, pPager, pgno)
 
 	if pPgOld != 0 {
-		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
+		if (*PgHdr)(unsafe.Pointer(pPgOld)).FnRef > int64(1) {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62623)
+			return Xsqlite3CorruptError(tls, 62627)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -25207,7 +25212,7 @@ func Xsqlite3PagerClearCache(tls *libc.TLS, pPager uintptr) {
 func Xsqlite3PagerCheckpoint(tls *libc.TLS, pPager uintptr, db uintptr, eMode int32, pnLog uintptr, pnCkpt uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal == uintptr(0) && int32((*Pager)(unsafe.Pointer(pPager)).FjournalMode) == PAGER_JOURNALMODE_WAL {
-		Xsqlite3_exec(tls, db, ts+3952, uintptr(0), uintptr(0), uintptr(0))
+		Xsqlite3_exec(tls, db, ts+3971, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal != 0 {
 		rc = Xsqlite3WalCheckpoint(tls, (*Pager)(unsafe.Pointer(pPager)).FpWal, db, eMode,
@@ -25779,7 +25784,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, 64387)
+				return Xsqlite3CorruptError(tls, 64391)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25878,7 +25883,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64519)
+	rc = Xsqlite3CantopenError(tls, 64523)
 	goto finished
 __7:
 	;
@@ -26046,7 +26051,7 @@ __24:
 		goto __30
 	}
 	Xsqlite3_log(tls, SQLITE_NOTICE|int32(1)<<8,
-		ts+3970,
+		ts+3989,
 		libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 __30:
 	;
@@ -26464,7 +26469,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65333)
+	rc = Xsqlite3CorruptError(tls, 65337)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -26609,7 +26614,7 @@ func walLimitSize(tls *libc.TLS, pWal uintptr, nMax I64) {
 	}
 	Xsqlite3EndBenignMalloc(tls)
 	if rx != 0 {
-		Xsqlite3_log(tls, rx, ts+4007, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
+		Xsqlite3_log(tls, rx, ts+4026, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 	}
 }
 
@@ -26739,7 +26744,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, 65682)
+		rc = Xsqlite3CantopenError(tls, 65686)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -27212,7 +27217,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66419)
+				return Xsqlite3CorruptError(tls, 66423)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -27717,7 +27722,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, 67138)
+			rc = Xsqlite3CorruptError(tls, 67142)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -28110,7 +28115,7 @@ func Xsqlite3BtreeLeaveCursor(tls *libc.TLS, pCur uintptr) {
 	Xsqlite3BtreeLeave(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpBtree)
 }
 
-var zMagicHeader = *(*[16]uint8)(unsafe.Pointer(ts + 4033))
+var zMagicHeader = *(*[16]uint8)(unsafe.Pointer(ts + 4052))
 
 var sqlite3SharedCacheList uintptr = uintptr(0)
 
@@ -28375,7 +28380,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, 69249)
+			rc = Xsqlite3CorruptError(tls, 69253)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -28512,7 +28517,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69434)
 	return
 __2:
 	;
@@ -28529,7 +28534,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69447)
 	goto ptrmap_exit
 __4:
 	;
@@ -28537,7 +28542,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69452)
 	goto ptrmap_exit
 __5:
 	;
@@ -28580,7 +28585,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, 69493)
+		return Xsqlite3CorruptError(tls, 69497)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -28590,7 +28595,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, 69501)
+		return Xsqlite3CorruptError(tls, 69505)
 	}
 	return SQLITE_OK
 }
@@ -28840,7 +28845,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, 69893)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69897)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28887,7 +28892,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69951)
+	return Xsqlite3CorruptError(tls, 69955)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28897,7 +28902,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69954)
+	return Xsqlite3CorruptError(tls, 69958)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28910,7 +28915,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69962)
+	return Xsqlite3CorruptError(tls, 69966)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28919,14 +28924,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69965)
+	return Xsqlite3CorruptError(tls, 69969)
 __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, 69967)
+	return Xsqlite3CorruptError(tls, 69971)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -28936,7 +28941,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69971)
+	return Xsqlite3CorruptError(tls, 69975)
 __11:
 	;
 __8:
@@ -29000,7 +29005,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 70004)
+	return Xsqlite3CorruptError(tls, 70008)
 __22:
 	;
 	size = int32((*struct {
@@ -29010,7 +29015,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 70010)
+	return Xsqlite3CorruptError(tls, 70014)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -29032,7 +29037,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 70024)
+	return Xsqlite3CorruptError(tls, 70028)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -29067,7 +29072,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, 70081)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70085)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -29080,13 +29085,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, 70096)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70100)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70107)
 	}
 	return uintptr(0)
 }
@@ -29111,7 +29116,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, 70152)
+			return Xsqlite3CorruptError(tls, 70156)
 		}
 	}
 
@@ -29122,7 +29127,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, 70170)
+				return Xsqlite3CorruptError(tls, 70174)
 			} else {
 				return SQLITE_OK
 			}
@@ -29174,22 +29179,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 70249)
+				return Xsqlite3CorruptError(tls, 70253)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 70254)
+			return Xsqlite3CorruptError(tls, 70258)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 70266)
+				return Xsqlite3CorruptError(tls, 70270)
 			}
 			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, 70269)
+				return Xsqlite3CorruptError(tls, 70273)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -29199,7 +29204,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, 70282)
+					return Xsqlite3CorruptError(tls, 70286)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -29207,7 +29212,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, 70288)
+			return Xsqlite3CorruptError(tls, 70292)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -29215,10 +29220,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, 70297)
+			return Xsqlite3CorruptError(tls, 70301)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70298)
+			return Xsqlite3CorruptError(tls, 70302)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -29278,7 +29283,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70357)
+			return Xsqlite3CorruptError(tls, 70361)
 		}
 	} else {
 		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
@@ -29314,7 +29319,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70381)
+			return Xsqlite3CorruptError(tls, 70385)
 		}
 	}
 	return SQLITE_OK
@@ -29344,11 +29349,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70432)
+			return Xsqlite3CorruptError(tls, 70436)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70437)
+				return Xsqlite3CorruptError(tls, 70441)
 			}
 			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))))
@@ -29359,15 +29364,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70447)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70451)
+			return Xsqlite3CorruptError(tls, 70455)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70463)
+		return Xsqlite3CorruptError(tls, 70467)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -29395,14 +29400,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, 70494)
+			return Xsqlite3CorruptError(tls, 70498)
 		}
 		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, 70499)
+			return Xsqlite3CorruptError(tls, 70503)
 		}
 	}
 	return SQLITE_OK
@@ -29416,7 +29421,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, 70531)
+		return Xsqlite3CorruptError(tls, 70535)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -29428,7 +29433,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, 70545)
+		return Xsqlite3CorruptError(tls, 70549)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -29531,7 +29536,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70700)
+	rc = Xsqlite3CorruptError(tls, 70704)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -29559,7 +29564,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, 70721)
+	rc = Xsqlite3CorruptError(tls, 70725)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -29598,7 +29603,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, 70787)
+			return Xsqlite3CorruptError(tls, 70791)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -29671,7 +29676,7 @@ func Xsqlite3BtreeOpen(tls *libc.TLS, pVfs uintptr, zFilename uintptr, db uintpt
 	mutexOpen = uintptr(0)
 	rc = SQLITE_OK
 	isTempDb = libc.Bool32(zFilename == uintptr(0) || int32(*(*uint8)(unsafe.Pointer(zFilename))) == 0)
-	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4049) == 0 ||
+	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4068) == 0 ||
 		isTempDb != 0 && Xsqlite3TempInMemory(tls, db) != 0 ||
 		vfsFlags&SQLITE_OPEN_MEMORY != 0)
 
@@ -30443,7 +30448,7 @@ __9:
 	;
 __10:
 	;
-	if !(libc.Xmemcmp(tls, page1+21, ts+4058, uint64(3)) != 0) {
+	if !(libc.Xmemcmp(tls, page1+21, ts+4077, uint64(3)) != 0) {
 		goto __14
 	}
 	goto page1_init_failed
@@ -30481,7 +30486,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71722)
+	rc = Xsqlite3CorruptError(tls, 71726)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30896,7 +30901,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, 72143)
+			return Xsqlite3CorruptError(tls, 72147)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30922,7 +30927,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, 72162)
+						return Xsqlite3CorruptError(tls, 72166)
 					}
 					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)
@@ -30931,7 +30936,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, 72171)
+					return Xsqlite3CorruptError(tls, 72175)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30942,7 +30947,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, 72183)
+				return Xsqlite3CorruptError(tls, 72187)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30958,7 +30963,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, 72218)
+		return Xsqlite3CorruptError(tls, 72222)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -31019,7 +31024,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, 72316)
+			return Xsqlite3CorruptError(tls, 72320)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -31054,7 +31059,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, 72368)
+					return Xsqlite3CorruptError(tls, 72372)
 				}
 			}
 
@@ -31114,7 +31119,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, 72436)
+			rc = Xsqlite3CorruptError(tls, 72440)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -31153,7 +31158,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, 72487)
+			return Xsqlite3CorruptError(tls, 72491)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -31184,7 +31189,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72514)
+			return Xsqlite3CorruptError(tls, 72518)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -31525,7 +31530,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, 72978)
+			return Xsqlite3CorruptError(tls, 72982)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -31769,14 +31774,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, 73385)
+		return Xsqlite3CorruptError(tls, 73389)
 	}
 
 	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, 73400)
+		return Xsqlite3CorruptError(tls, 73404)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -31821,7 +31826,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, 73462)
+				return Xsqlite3CorruptError(tls, 73466)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31870,7 +31875,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73547)
+		return Xsqlite3CorruptError(tls, 73551)
 	}
 	return rc
 }
@@ -31950,7 +31955,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, 73684)
+		return Xsqlite3CorruptError(tls, 73688)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -32041,7 +32046,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, 73823)
+	return Xsqlite3CorruptError(tls, 73827)
 __11:
 	;
 skip_init:
@@ -32061,7 +32066,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73835)
+	return Xsqlite3CorruptError(tls, 73839)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -32271,7 +32276,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 74077)
+	return Xsqlite3CorruptError(tls, 74081)
 __21:
 	;
 	goto __19
@@ -32475,7 +32480,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 74273)
+	return Xsqlite3CorruptError(tls, 74277)
 __4:
 	;
 	goto bypass_moveto_root
@@ -32540,7 +32545,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, 74360)
+	rc = Xsqlite3CorruptError(tls, 74364)
 	goto moveto_index_finish
 __17:
 	;
@@ -32588,7 +32593,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74392)
+	rc = Xsqlite3CorruptError(tls, 74396)
 __24:
 	;
 	goto moveto_index_finish
@@ -32707,7 +32712,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, 74508)
+		return Xsqlite3CorruptError(tls, 74512)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32867,7 +32872,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74688)
+	return Xsqlite3CorruptError(tls, 74692)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32932,7 +32937,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74744)
+	rc = Xsqlite3CorruptError(tls, 74748)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -32968,7 +32973,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74773)
+	rc = Xsqlite3CorruptError(tls, 74777)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -33012,7 +33017,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74807)
+	rc = Xsqlite3CorruptError(tls, 74811)
 	goto end_allocate_page
 __32:
 	;
@@ -33124,7 +33129,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74872)
+	rc = Xsqlite3CorruptError(tls, 74876)
 	goto end_allocate_page
 __51:
 	;
@@ -33282,7 +33287,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, 74999)
+	return Xsqlite3CorruptError(tls, 75003)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -33339,7 +33344,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75050)
 	goto freepage_out
 __10:
 	;
@@ -33355,7 +33360,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75061)
 	goto freepage_out
 __12:
 	;
@@ -33429,7 +33434,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, 75146)
+		return Xsqlite3CorruptError(tls, 75150)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -33441,7 +33446,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, 75163)
+			return Xsqlite3CorruptError(tls, 75167)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -33452,7 +33457,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, 75183)
+			rc = Xsqlite3CorruptError(tls, 75187)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -33617,7 +33622,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, 75436)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75440)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -33896,12 +33901,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, 75737)
+				return Xsqlite3CorruptError(tls, 75741)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75742)
+			return Xsqlite3CorruptError(tls, 75746)
 		}
 
 		pData -= uintptr(sz)
@@ -33909,7 +33914,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, 75748)
+			return Xsqlite3CorruptError(tls, 75752)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -33969,7 +33974,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, 75833)
+			Xsqlite3CorruptError(tls, 75837)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -34058,7 +34063,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75947)
+	return Xsqlite3CorruptError(tls, 75951)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -34174,7 +34179,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, 76060)
+		return Xsqlite3CorruptError(tls, 76064)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -34494,7 +34499,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, 76481)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76485)
 	goto balance_cleanup
 __25:
 	;
@@ -34505,7 +34510,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76509)
 	goto balance_cleanup
 __27:
 	;
@@ -34663,7 +34668,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76610)
 	goto balance_cleanup
 __55:
 	;
@@ -34737,7 +34742,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76643)
 	goto balance_cleanup
 __67:
 	;
@@ -34800,7 +34805,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76687)
 	goto balance_cleanup
 __75:
 	;
@@ -34828,7 +34833,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76720)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -35089,7 +35094,7 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76920)
 	goto balance_cleanup
 __121:
 	;
@@ -35281,7 +35286,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, 77146)
+			return Xsqlite3CorruptError(tls, 77150)
 		}
 	}
 	return SQLITE_OK
@@ -35319,7 +35324,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 77206)
+			rc = Xsqlite3CorruptError(tls, 77210)
 		} 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)))
@@ -35425,7 +35430,7 @@ func btreeOverwriteOverflowCell(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, 77370)
+			rc = Xsqlite3CorruptError(tls, 77374)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -35450,7 +35455,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 
 	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)
+		return Xsqlite3CorruptError(tls, 77402)
 	}
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
 		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
@@ -35520,7 +35525,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77479)
+	return Xsqlite3CorruptError(tls, 77483)
 __3:
 	;
 __1:
@@ -35633,7 +35638,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77606)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -35693,6 +35698,7 @@ __30:
 __25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
+	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
 		goto __31
 	}
@@ -35700,7 +35706,7 @@ __25:
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
 		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77640)
+	return Xsqlite3CorruptError(tls, 77645)
 __33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
@@ -35738,13 +35744,13 @@ __37:
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77667)
+	return Xsqlite3CorruptError(tls, 77672)
 __39:
 	;
 	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __40
 	}
-	return Xsqlite3CorruptError(tls, 77670)
+	return Xsqlite3CorruptError(tls, 77675)
 __40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
@@ -35775,7 +35781,6 @@ __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 __44
 	}
@@ -35850,7 +35855,7 @@ 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, 77773)
+		return Xsqlite3CorruptError(tls, 77777)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
@@ -35875,7 +35880,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, 77798)
+				return Xsqlite3CorruptError(tls, 77802)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35976,7 +35981,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77894)
+			return Xsqlite3CorruptError(tls, 77898)
 		}
 	}
 
@@ -35984,11 +35989,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, 77903)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 	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, 77907)
+		return Xsqlite3CorruptError(tls, 77911)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -36063,7 +36068,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, 77998)
+			return Xsqlite3CorruptError(tls, 78002)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -36132,7 +36137,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, 78114)
+			return Xsqlite3CorruptError(tls, 78118)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -36161,7 +36166,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, 78162)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78166)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -36237,7 +36242,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 78252)
+	return Xsqlite3CorruptError(tls, 78256)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -36251,7 +36256,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, 78259)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78263)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -36385,7 +36390,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, 78363)
+		return Xsqlite3CorruptError(tls, 78367)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -36602,7 +36607,7 @@ 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+64, ts+4062, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4081, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
 		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
@@ -36627,11 +36632,11 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 	defer tls.Free(16)
 
 	if iPage > (*IntegrityCk)(unsafe.Pointer(pCheck)).FnPage || iPage == Pgno(0) {
-		checkAppendMsg(tls, pCheck, ts+4064, libc.VaList(bp, iPage))
+		checkAppendMsg(tls, pCheck, ts+4083, libc.VaList(bp, iPage))
 		return 1
 	}
 	if getPageReferenced(tls, pCheck, iPage) != 0 {
-		checkAppendMsg(tls, pCheck, ts+4087, libc.VaList(bp+8, iPage))
+		checkAppendMsg(tls, pCheck, ts+4106, libc.VaList(bp+8, iPage))
 		return 1
 	}
 	setPageReferenced(tls, pCheck, iPage)
@@ -36649,13 +36654,13 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
 			checkOom(tls, pCheck)
 		}
-		checkAppendMsg(tls, pCheck, ts+4112, libc.VaList(bp, iChild))
+		checkAppendMsg(tls, pCheck, ts+4131, libc.VaList(bp, iChild))
 		return
 	}
 
 	if int32(*(*U8)(unsafe.Pointer(bp + 48))) != int32(eType) || *(*Pgno)(unsafe.Pointer(bp + 52)) != iParent {
 		checkAppendMsg(tls, pCheck,
-			ts+4141,
+			ts+4160,
 			libc.VaList(bp+8, iChild, int32(eType), iParent, int32(*(*U8)(unsafe.Pointer(bp + 48))), *(*Pgno)(unsafe.Pointer(bp + 52))))
 	}
 }
@@ -36674,7 +36679,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 		}
 		N--
 		if Xsqlite3PagerGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpPager, iPage, bp+40, 0) != 0 {
-			checkAppendMsg(tls, pCheck, ts+4195, libc.VaList(bp, iPage))
+			checkAppendMsg(tls, pCheck, ts+4214, libc.VaList(bp, iPage))
 			break
 		}
 		pOvflData = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
@@ -36685,7 +36690,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 			}
 			if n > (*BtShared)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt)).FusableSize/U32(4)-U32(2) {
 				checkAppendMsg(tls, pCheck,
-					ts+4217, libc.VaList(bp+8, iPage))
+					ts+4236, libc.VaList(bp+8, iPage))
 				N--
 			} else {
 				for i = 0; i < int32(n); i++ {
@@ -36708,12 +36713,12 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 	}
 	if N != 0 && nErrAtStart == (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr {
 		checkAppendMsg(tls, pCheck,
-			ts+4256,
+			ts+4275,
 			libc.VaList(bp+16, func() uintptr {
 				if isFreeList != 0 {
-					return ts + 4282
+					return ts + 4301
 				}
-				return ts + 4287
+				return ts + 4306
 			}(),
 				expected-N, expected))
 	}
@@ -36829,13 +36834,13 @@ __2:
 	return 0
 __3:
 	;
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4308
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4327
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
 		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4318, libc.VaList(bp, rc))
+		ts+4337, libc.VaList(bp, rc))
 	goto end_of_check
 __4:
 	;
@@ -36846,7 +36851,7 @@ __4:
 	}
 
 	checkAppendMsg(tls, pCheck,
-		ts+4356, libc.VaList(bp+8, rc))
+		ts+4375, libc.VaList(bp+8, rc))
 	goto end_of_check
 __5:
 	;
@@ -36854,14 +36859,14 @@ __5:
 		goto __6
 	}
 
-	checkAppendMsg(tls, pCheck, ts+4394, libc.VaList(bp+16, rc))
+	checkAppendMsg(tls, pCheck, ts+4413, libc.VaList(bp+16, rc))
 	goto end_of_check
 __6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
 
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4416
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4435
 	contentOffset = U32((int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5))))<<8|int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5) + 1)))-1)&0xffff + 1)
 
 	nCell = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3) + 1)))
@@ -36878,7 +36883,7 @@ __6:
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
 		goto __9
 	}
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4442
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4461
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
 __9:
 	;
@@ -36903,7 +36908,7 @@ __10:
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
 		goto __13
 	}
-	checkAppendMsg(tls, pCheck, ts+4470,
+	checkAppendMsg(tls, pCheck, ts+4489,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
 	goto __11
@@ -36916,7 +36921,7 @@ __13:
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
 		goto __14
 	}
-	checkAppendMsg(tls, pCheck, ts+4500, 0)
+	checkAppendMsg(tls, pCheck, ts+4519, 0)
 	doCoverageCheck = 0
 	goto __11
 __14:
@@ -36932,7 +36937,7 @@ __14:
 	}() != 0) {
 		goto __16
 	}
-	checkAppendMsg(tls, pCheck, ts+4524, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
+	checkAppendMsg(tls, pCheck, ts+4543, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
 __16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
@@ -36970,7 +36975,7 @@ __21:
 	if !(d2 != depth) {
 		goto __22
 	}
-	checkAppendMsg(tls, pCheck, ts+4548, 0)
+	checkAppendMsg(tls, pCheck, ts+4567, 0)
 	depth = d2
 __22:
 	;
@@ -37043,7 +37048,7 @@ __30:
 		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4573, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
+		ts+4592, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
 	goto __31
 	goto __33
 __32:
@@ -37060,7 +37065,7 @@ __31:
 		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4610,
+		ts+4629,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
 __34:
 	;
@@ -37174,7 +37179,7 @@ __6:
 	if !(bCkFreelist != 0) {
 		goto __7
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4662
+	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4681
 	checkList(tls, bp+32, 1, Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+32),
 		Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
@@ -37210,7 +37215,7 @@ __13:
 		goto __15
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4678,
+		ts+4697,
 		libc.VaList(bp, mx, mxInHdr))
 __15:
 	;
@@ -37220,7 +37225,7 @@ __9:
 		goto __16
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4723, 0)
+		ts+4742, 0)
 __16:
 	;
 __10:
@@ -37267,13 +37272,13 @@ __23:
 	if !(getPageReferenced(tls, bp+32, i) == 0 && (ptrmapPageno(tls, pBt, i) != i || !(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0))) {
 		goto __26
 	}
-	checkAppendMsg(tls, bp+32, ts+4778, libc.VaList(bp+16, i))
+	checkAppendMsg(tls, bp+32, ts+4797, libc.VaList(bp+16, i))
 __26:
 	;
 	if !(getPageReferenced(tls, bp+32, i) != 0 && (ptrmapPageno(tls, pBt, i) == i && (*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0)) {
 		goto __27
 	}
-	checkAppendMsg(tls, bp+32, ts+4800, libc.VaList(bp+24, i))
+	checkAppendMsg(tls, bp+32, ts+4819, libc.VaList(bp+24, i))
 __27:
 	;
 	goto __24
@@ -37536,7 +37541,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 		var rc int32 = 0
 		Xsqlite3ParseObjectInit(tls, bp+16, pDb)
 		if Xsqlite3OpenTempDatabase(tls, bp+16) != 0 {
-			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3663, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3682, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 			rc = SQLITE_ERROR
 		}
 		Xsqlite3DbFree(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
@@ -37547,7 +37552,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 	}
 
 	if i < 0 {
-		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4834, libc.VaList(bp+8, zDb))
+		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4853, libc.VaList(bp+8, zDb))
 		return uintptr(0)
 	}
 
@@ -37562,7 +37567,7 @@ func setDestPgsz(tls *libc.TLS, p uintptr) int32 {
 
 func checkReadTransaction(tls *libc.TLS, db uintptr, p uintptr) int32 {
 	if Xsqlite3BtreeTxnState(tls, p) != SQLITE_TXN_NONE {
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4854, 0)
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4873, 0)
 		return SQLITE_ERROR
 	}
 	return SQLITE_OK
@@ -37582,7 +37587,7 @@ func Xsqlite3_backup_init(tls *libc.TLS, pDestDb uintptr, zDestDb uintptr, pSrcD
 
 	if pSrcDb == pDestDb {
 		Xsqlite3ErrorWithMsg(tls,
-			pDestDb, SQLITE_ERROR, ts+4885, 0)
+			pDestDb, SQLITE_ERROR, ts+4904, 0)
 		p = uintptr(0)
 	} else {
 		p = Xsqlite3MallocZero(tls, uint64(unsafe.Sizeof(Sqlite3_backup{})))
@@ -38031,7 +38036,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 		(*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,
+		Xsqlite3_str_appendf(tls, bp+16, ts+4944,
 			libc.VaList(bp, func() float64 {
 				if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_IntReal != 0 {
 					return float64(*(*I64)(unsafe.Pointer(p)))
@@ -38623,7 +38628,7 @@ func Xsqlite3VdbeMemSetPointer(tls *libc.TLS, pMem uintptr, pPtr uintptr, zPType
 		if zPType != 0 {
 			return zPType
 		}
-		return ts + 1554
+		return ts + 1573
 	}()
 	(*Mem)(unsafe.Pointer(pMem)).Fz = pPtr
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null | MEM_Dyn | MEM_Subtype | MEM_Term)
@@ -38855,7 +38860,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, 81630)
+		return Xsqlite3CorruptError(tls, 81634)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -39087,7 +39092,7 @@ __9:
 		goto __10
 	}
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 8)).FisError
-	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3663, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
+	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3682, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
 	goto __11
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
@@ -39140,7 +39145,7 @@ func valueFromExpr(tls *libc.TLS, db uintptr, pExpr uintptr, enc U8, affinity U8
 	zVal = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	negInt = 1
-	zNeg = ts + 1554
+	zNeg = ts + 1573
 	rc = SQLITE_OK
 
 __1:
@@ -39181,7 +39186,7 @@ __4:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
 	negInt = -1
-	zNeg = ts + 4932
+	zNeg = ts + 4951
 __6:
 	;
 	if !(op == TK_STRING || op == TK_FLOAT || op == TK_INTEGER) {
@@ -39200,7 +39205,7 @@ __9:
 	Xsqlite3VdbeMemSetInt64(tls, *(*uintptr)(unsafe.Pointer(bp + 16)), I64(*(*int32)(unsafe.Pointer(pExpr + 8)))*I64(negInt))
 	goto __11
 __10:
-	zVal = Xsqlite3MPrintf(tls, db, ts+4934, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+	zVal = Xsqlite3MPrintf(tls, db, ts+4953, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	if !(zVal == uintptr(0)) {
 		goto __12
 	}
@@ -39504,7 +39509,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, 82270)
+		return Xsqlite3CorruptError(tls, 82274)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -39519,14 +39524,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 82276)
+			return Xsqlite3CorruptError(tls, 82280)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 82282)
+		return Xsqlite3CorruptError(tls, 82286)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -40534,34 +40539,34 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var j int32
 			var pKeyInfo uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4939, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4958, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
 			for j = 0; j < int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField); j++ {
 				var pColl uintptr = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(j)*8))
 				var zColl uintptr
 				if pColl != 0 {
 					zColl = (*CollSeq)(unsafe.Pointer(pColl)).FzName
 				} else {
-					zColl = ts + 1554
+					zColl = ts + 1573
 				}
-				if libc.Xstrcmp(tls, zColl, ts+1099) == 0 {
-					zColl = ts + 4944
+				if libc.Xstrcmp(tls, zColl, ts+1118) == 0 {
+					zColl = ts + 4963
 				}
-				Xsqlite3_str_appendf(tls, bp+144, ts+4946,
+				Xsqlite3_str_appendf(tls, bp+144, ts+4965,
 					libc.VaList(bp+8, func() uintptr {
 						if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_DESC != 0 {
-							return ts + 4932
+							return ts + 4951
 						}
-						return ts + 1554
+						return ts + 1573
 					}(),
 						func() uintptr {
 							if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_BIGNULL != 0 {
-								return ts + 4954
+								return ts + 4973
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						zColl))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4957, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+4976, 1)
 			break
 
 		}
@@ -40569,7 +40574,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 		{
 			var pColl uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4959, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
+			Xsqlite3_str_appendf(tls, bp+144, ts+4978, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
 				encnames[(*CollSeq)(unsafe.Pointer(pColl)).Fenc]))
 			break
 
@@ -40577,32 +40582,32 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -7:
 		{
 			var pDef uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
-			Xsqlite3_str_appendf(tls, bp+144, ts+4968, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4987, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -15:
 		{
 			var pDef uintptr = (*Sqlite3_context)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpFunc
-			Xsqlite3_str_appendf(tls, bp+144, ts+4968, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4987, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -13:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1334, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1353, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
 	case -3:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+4975, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4994, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
 			break
 
 		}
 	case -12:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1328, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1347, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
@@ -40612,13 +40617,13 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Str != 0 {
 				zP4 = (*Mem)(unsafe.Pointer(pMem)).Fz
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1334, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1353, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1328, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1347, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Null != 0 {
-				zP4 = ts + 1555
+				zP4 = ts + 1574
 			} else {
-				zP4 = ts + 4978
+				zP4 = ts + 4997
 			}
 			break
 
@@ -40626,7 +40631,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -11:
 		{
 			var pVtab uintptr = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-			Xsqlite3_str_appendf(tls, bp+144, ts+4985, libc.VaList(bp+120, pVtab))
+			Xsqlite3_str_appendf(tls, bp+144, ts+5004, libc.VaList(bp+120, pVtab))
 			break
 
 		}
@@ -40637,20 +40642,20 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var n U32 = *(*U32)(unsafe.Pointer(ai))
 
 			for i = U32(1); i <= n; i++ {
-				Xsqlite3_str_appendf(tls, bp+144, ts+4993, libc.VaList(bp+128, func() int32 {
+				Xsqlite3_str_appendf(tls, bp+144, ts+5012, libc.VaList(bp+128, func() int32 {
 					if i == U32(1) {
 						return '['
 					}
 					return ','
 				}(), *(*U32)(unsafe.Pointer(ai + uintptr(i)*4))))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4998, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+5017, 1)
 			break
 
 		}
 	case -4:
 		{
-			zP4 = ts + 5000
+			zP4 = ts + 5019
 			break
 
 		}
@@ -40675,7 +40680,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	return Xsqlite3StrAccumFinish(tls, bp+144)
 }
 
-var encnames = [4]uintptr{ts + 5008, ts + 5010, ts + 5012, ts + 5017}
+var encnames = [4]uintptr{ts + 5027, ts + 5029, ts + 5031, ts + 5036}
 
 // Declare to the Vdbe that the BTree object at db->aDb[i] is used.
 //
@@ -41125,8 +41130,8 @@ func Xsqlite3VdbeMakeReady(tls *libc.TLS, p uintptr, pParse uintptr) {
 }
 
 var azColName = [12]uintptr{
-	ts + 5022, ts + 5027, ts + 5034, ts + 5037, ts + 5040, ts + 5043, ts + 5046, ts + 5049,
-	ts + 5057, ts + 5060, ts + 5067, ts + 5075,
+	ts + 5041, ts + 5046, ts + 5053, ts + 5056, ts + 5059, ts + 5062, ts + 5065, ts + 5068,
+	ts + 5076, ts + 5079, ts + 5086, ts + 5094,
 }
 
 // Close a VDBE cursor and release all the resources that cursor
@@ -41335,7 +41340,7 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		var nMainFile int32
 
 		nMainFile = Xsqlite3Strlen30(tls, zMainFile)
-		zSuper = Xsqlite3MPrintf(tls, db, ts+5082, libc.VaList(bp, 0, zMainFile, 0))
+		zSuper = Xsqlite3MPrintf(tls, db, ts+5101, libc.VaList(bp, 0, zMainFile, 0))
 		if zSuper == uintptr(0) {
 			return SQLITE_NOMEM
 		}
@@ -41343,16 +41348,16 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		for __ccgo := true; __ccgo; __ccgo = rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 60)) != 0 {
 			if retryCount != 0 {
 				if retryCount > 100 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5094, libc.VaList(bp+24, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5113, libc.VaList(bp+24, zSuper))
 					Xsqlite3OsDelete(tls, pVfs, zSuper, 0)
 					break
 				} else if retryCount == 1 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5108, libc.VaList(bp+32, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5127, libc.VaList(bp+32, zSuper))
 				}
 			}
 			retryCount++
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
-			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5123,
+			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5142,
 				libc.VaList(bp+40, *(*U32)(unsafe.Pointer(bp + 56))>>8&U32(0xffffff), *(*U32)(unsafe.Pointer(bp + 56))&U32(0xff)))
 
 			rc = Xsqlite3OsAccess(tls, pVfs, zSuper, SQLITE_ACCESS_EXISTS, bp+60)
@@ -41498,7 +41503,7 @@ func Xsqlite3VdbeCheckFk(tls *libc.TLS, p uintptr, deferred int32) int32 {
 		!(deferred != 0) && (*Vdbe)(unsafe.Pointer(p)).FnFkConstraint > int64(0) {
 		(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_CONSTRAINT | int32(3)<<8
 		(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
-		Xsqlite3VdbeError(tls, p, ts+5136, 0)
+		Xsqlite3VdbeError(tls, p, ts+5155, 0)
 		if int32((*Vdbe)(unsafe.Pointer(p)).FprepFlags)&SQLITE_PREPARE_SAVESQL == 0 {
 			return SQLITE_ERROR
 		}
@@ -41830,7 +41835,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 86058)
+		return Xsqlite3CorruptError(tls, 86062)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -42381,7 +42386,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86989))
 		return 0
 	}
 
@@ -42446,7 +42451,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, 87062))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87066))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -42480,7 +42485,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, 87092))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87096))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -42530,7 +42535,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, 87136))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87140))
 			return 0
 		}
 	}
@@ -42676,7 +42681,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87303))
 	return 0
 __7:
 	;
@@ -42847,7 +42852,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87457)
+	return Xsqlite3CorruptError(tls, 87461)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42873,7 +42878,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, 87490)
+		return Xsqlite3CorruptError(tls, 87494)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -42984,13 +42989,13 @@ func Xsqlite3NotPureFunc(tls *libc.TLS, pCtx uintptr) int32 {
 		var zContext uintptr
 		var zMsg uintptr
 		if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_IsCheck != 0 {
-			zContext = ts + 5166
-		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5185
-		} else {
+		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5204
+		} else {
+			zContext = ts + 5223
 		}
-		zMsg = Xsqlite3_mprintf(tls, ts+5213,
+		zMsg = Xsqlite3_mprintf(tls, ts+5232,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx)).FpFunc)).FzName, zContext))
 		Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 		Xsqlite3_free(tls, zMsg)
@@ -43095,7 +43100,7 @@ func Xsqlite3_expired(tls *libc.TLS, pStmt uintptr) int32 {
 
 func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 	if (*Vdbe)(unsafe.Pointer(p)).Fdb == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5249, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5268, 0)
 		return 1
 	} else {
 		return 0
@@ -43105,7 +43110,7 @@ func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 
 func vdbeSafetyNotNull(tls *libc.TLS, p uintptr) int32 {
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5294, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5313, 0)
 		return 1
 	} else {
 		return vdbeSafety(tls, p)
@@ -43147,7 +43152,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, 87854)
+			return Xsqlite3MisuseError(tls, 87858)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -43595,7 +43600,7 @@ func Xsqlite3_result_error_code(tls *libc.TLS, pCtx uintptr, errCode int32) {
 // Force an SQLITE_TOOBIG error.
 func Xsqlite3_result_error_toobig(tls *libc.TLS, pCtx uintptr) {
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FisError = SQLITE_TOOBIG
-	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5334, int64(-1),
+	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5353, int64(-1),
 		uint8(SQLITE_UTF8), uintptr(0))
 }
 
@@ -43787,7 +43792,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88544)
+		return Xsqlite3MisuseError(tls, 88548)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -44307,15 +44312,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 89208)
+		return Xsqlite3MisuseError(tls, 89212)
 	}
 	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+5357, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 89216)
+			ts+5376, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89220)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -44730,7 +44735,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, 89707)
+	rc = Xsqlite3MisuseError(tls, 89711)
 	goto preupdate_old_out
 __1:
 	;
@@ -44874,7 +44879,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, 89809)
+	rc = Xsqlite3MisuseError(tls, 89813)
 	goto preupdate_new_out
 __1:
 	;
@@ -45046,7 +45051,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+5397, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5416, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -45082,11 +45087,11 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 
 			pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr(*(*int32)(unsafe.Pointer(bp + 84))-1)*56
 			if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Null != 0 {
-				Xsqlite3_str_append(tls, bp+48, ts+1555, 4)
+				Xsqlite3_str_append(tls, bp+48, ts+1574, 4)
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+1334, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+1353, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+4925, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+4944, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Str != 0 {
 				var nOut int32
 				var enc U8 = (*Sqlite3)(unsafe.Pointer(db)).Fenc
@@ -45101,21 +45106,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+5401, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5420, 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+5408, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5427, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5421, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5440, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					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_appendf(tls, bp+48, ts+5443, libc.VaList(bp+40, int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5429, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5448, 1)
 			}
 		}
 	}
@@ -45318,10 +45323,6 @@ func filterHash(tls *libc.TLS, aMem uintptr, pOp uintptr) U64 {
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Real != 0 {
 			h = h + U64(Xsqlite3VdbeIntValue(tls, p))
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&(MEM_Str|MEM_Blob) != 0 {
-			h = h + U64((*Mem)(unsafe.Pointer(p)).Fn)
-			if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Zero != 0 {
-				h = h + U64(*(*int32)(unsafe.Pointer(p)))
-			}
 		}
 	}
 	return h
@@ -45332,11 +45333,11 @@ func vdbeMemTypeName(tls *libc.TLS, pMem uintptr) uintptr {
 }
 
 var azTypes = [5]uintptr{
-	ts + 1115,
-	ts + 1127,
-	ts + 1132,
-	ts + 1110,
-	ts + 1555,
+	ts + 1134,
+	ts + 1146,
+	ts + 1151,
+	ts + 1129,
+	ts + 1574,
 }
 
 // Execute as much of a VDBE program as we can.
@@ -46378,20 +46379,20 @@ __202:
 		goto __205
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5431, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	Xsqlite3VdbeError(tls, p, ts+5450, 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))))
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5471, 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))))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	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))
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5478, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 __204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
@@ -47969,7 +47970,7 @@ op_column_corrupt:
 	goto __9
 	goto __425
 __424:
-	rc = Xsqlite3CorruptError(tls, 93317)
+	rc = Xsqlite3CorruptError(tls, 93320)
 	goto abort_due_to_error
 __425:
 	;
@@ -48097,7 +48098,7 @@ __428:
 	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5483,
+	Xsqlite3VdbeError(tls, p, ts+5502,
 		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
@@ -48529,7 +48530,7 @@ __78:
 		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5524, 0)
+	Xsqlite3VdbeError(tls, p, ts+5543, 0)
 	rc = SQLITE_BUSY
 	goto __523
 __522:
@@ -48589,7 +48590,7 @@ __530:
 	if !!(pSavepoint != 0) {
 		goto __531
 	}
-	Xsqlite3VdbeError(tls, p, ts+5575, libc.VaList(bp+88, zName))
+	Xsqlite3VdbeError(tls, p, ts+5594, libc.VaList(bp+88, zName))
 	rc = SQLITE_ERROR
 	goto __532
 __531:
@@ -48598,7 +48599,7 @@ __531:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5597, 0)
+		ts+5616, 0)
 	rc = SQLITE_BUSY
 	goto __534
 __533:
@@ -48784,7 +48785,7 @@ __564:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5651, 0)
+		ts+5670, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
 	goto __567
@@ -48827,13 +48828,13 @@ __562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5706
+				return ts + 5725
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5754
+					return ts + 5773
 				}
-				return ts + 5797
+				return ts + 5816
 			}()
 		}(), 0)
 
@@ -48916,7 +48917,7 @@ __576:
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5838)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5857)
 
 	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 __583
@@ -49120,7 +49121,7 @@ __88:
 	}
 
 	(*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
+	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1573
 __602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -49729,7 +49730,7 @@ notExistsWithKey:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
 		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95560)
+	rc = Xsqlite3CorruptError(tls, 95563)
 	goto __683
 __682:
 	goto jump_to_p2
@@ -50507,7 +50508,7 @@ __767:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
 		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5866)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96638, ts+5885)
 	goto abort_due_to_error
 __770:
 	;
@@ -50617,7 +50618,7 @@ __780:
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
 		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96840)
+	rc = Xsqlite3CorruptError(tls, 96843)
 	goto abort_due_to_error
 __781:
 	;
@@ -50778,14 +50779,14 @@ __141:
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 6, 0xc0)
 	goto __799
 __798:
-	zSchema = ts + 5883
+	zSchema = ts + 5902
 	(*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+5897,
+		ts+5916,
 		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 __800
@@ -50811,7 +50812,7 @@ __802:
 		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 97092)
+	rc = Xsqlite3CorruptError(tls, 97095)
 __803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
@@ -51001,7 +51002,7 @@ __820:
 		goto __825
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5940, 0)
+	Xsqlite3VdbeError(tls, p, ts+5959, 0)
 	goto abort_due_to_error
 __825:
 	;
@@ -51313,7 +51314,7 @@ __860:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
 		goto __862
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
 __862:
 	;
@@ -51363,7 +51364,7 @@ __867:
 	if !(rc != 0) {
 		goto __868
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
 __868:
 	;
@@ -51445,12 +51446,12 @@ __876:
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5977,
+		ts+5996,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6029
+				return ts + 6048
 			}
-			return ts + 6034
+			return ts + 6053
 		}()))
 	goto abort_due_to_error
 	goto __879
@@ -51592,7 +51593,7 @@ __171:
 		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6041, libc.VaList(bp+144, z1))
+	Xsqlite3VdbeError(tls, p, ts+6060, libc.VaList(bp+144, z1))
 __894:
 	;
 	goto abort_due_to_error
@@ -51710,7 +51711,7 @@ __904:
 	(*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+6070, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6089, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
 	goto __9
 
 __177:
@@ -51799,7 +51800,7 @@ __912:
 	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)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
 __913:
 	;
@@ -52029,7 +52030,7 @@ __935:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
 		goto __940
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
 __940:
 	;
@@ -52105,7 +52106,7 @@ __945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
 		goto __947
 	}
-	z3 = Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp+168, zTrace))
+	z3 = Xsqlite3MPrintf(tls, db, ts+6099, 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)
@@ -52178,7 +52179,7 @@ __955:
 	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __957
 	}
-	rc = Xsqlite3CorruptError(tls, 99031)
+	rc = Xsqlite3CorruptError(tls, 99034)
 __957:
 	;
 __956:
@@ -52186,13 +52187,13 @@ __956:
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
 		goto __958
 	}
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
+	Xsqlite3VdbeError(tls, p, ts+3682, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
 __958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
 
-	Xsqlite3_log(tls, rc, ts+6086,
+	Xsqlite3_log(tls, rc, ts+6105,
 		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 __959
@@ -52248,13 +52249,13 @@ __966:
 	return rc
 
 too_big:
-	Xsqlite3VdbeError(tls, p, ts+5334, 0)
+	Xsqlite3VdbeError(tls, p, ts+5353, 0)
 	rc = SQLITE_TOOBIG
 	goto abort_due_to_error
 
 no_mem:
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3VdbeError(tls, p, ts+1490, 0)
+	Xsqlite3VdbeError(tls, p, ts+1509, 0)
 	rc = SQLITE_NOMEM
 	goto abort_due_to_error
 
@@ -52265,8 +52266,8 @@ abort_due_to_interrupt:
 	return int32(0)
 }
 
-var azType = [4]uintptr{ts + 6118, ts + 6127, ts + 6134,
-	ts + 6140}
+var azType = [4]uintptr{ts + 6137, ts + 6146, ts + 6153,
+	ts + 6159}
 var and_logic = [9]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(1), uint8(2), uint8(0), uint8(2), uint8(2)}
 var or_logic = [9]uint8{uint8(0), uint8(1), uint8(2), uint8(1), uint8(1), uint8(1), uint8(2), uint8(1), uint8(2)}
 var aMask = [12]uint8{
@@ -52321,16 +52322,16 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		}
 
 		if type1 < U32(12) {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6152,
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6171,
 				libc.VaList(bp, func() uintptr {
 					if type1 == U32(0) {
-						return ts + 6181
+						return ts + 6200
 					}
 					return func() uintptr {
 						if type1 == U32(7) {
-							return ts + 6186
+							return ts + 6205
 						}
-						return ts + 6191
+						return ts + 6210
 					}()
 				}()))
 			rc = SQLITE_ERROR
@@ -52350,10 +52351,10 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		rc = Xsqlite3_finalize(tls, (*Incrblob)(unsafe.Pointer(p)).FpStmt)
 		(*Incrblob)(unsafe.Pointer(p)).FpStmt = uintptr(0)
 		if rc == SQLITE_OK {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6199, libc.VaList(bp+8, iRow))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6218, libc.VaList(bp+8, iRow))
 			rc = SQLITE_ERROR
 		} else {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3663, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3682, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
 		}
 	}
 
@@ -52413,21 +52414,21 @@ __3:
 		goto __4
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6219, libc.VaList(bp, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6238, libc.VaList(bp, zTable))
 __4:
 	;
 	if !(pTab != 0 && !((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0))) {
 		goto __5
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6249, libc.VaList(bp+8, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6268, libc.VaList(bp+8, zTable))
 __5:
 	;
 	if !(pTab != 0 && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __6
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6285, libc.VaList(bp+16, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6304, libc.VaList(bp+16, zTable))
 __6:
 	;
 	if !!(pTab != 0) {
@@ -52471,7 +52472,7 @@ __11:
 		goto __13
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6325, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52498,7 +52499,7 @@ __19:
 	if !((*sColMap)(unsafe.Pointer(pFKey+64+uintptr(j)*16)).FiFrom == iCol) {
 		goto __22
 	}
-	zFault = ts + 6327
+	zFault = ts + 6346
 __22:
 	;
 	goto __20
@@ -52531,7 +52532,7 @@ __26:
 	if !(int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == iCol || int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == -2) {
 		goto __29
 	}
-	zFault = ts + 6339
+	zFault = ts + 6358
 __29:
 	;
 	goto __27
@@ -52552,7 +52553,7 @@ __25:
 		goto __30
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6366, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52650,7 +52651,7 @@ __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
@@ -52698,7 +52699,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99516)
+		return Xsqlite3MisuseError(tls, 99519)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52781,7 +52782,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99616)
+		return Xsqlite3MisuseError(tls, 99619)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52794,7 +52795,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 				if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-					return ts + 3663
+					return ts + 3682
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
@@ -55323,25 +55324,25 @@ 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 {
+	if Xsqlite3_strnicmp(tls, zTab, ts+6400, 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 {
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6408+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
 			return 1
 		}
 		if pSchema == uintptr(0) {
 			return 0
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5883+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5902+7) == 0 {
 			return 1
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6446+7) == 0 {
 			return 1
 		}
 	} else {
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6446+7) == 0 {
 			return 1
 		}
 	}
@@ -55421,7 +55422,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6441, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6460, zDb) == 0) {
 		goto __8
 	}
 
@@ -55542,7 +55543,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6446) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6465) != 0) {
 		goto __33
 	}
 	goto __14
@@ -55716,14 +55717,14 @@ __60:
 	;
 	goto __59
 __58:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6448, zTab) == 0) {
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6467, zTab) == 0) {
 		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
 	goto __62
 __61:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6452, zTab) == 0) {
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6471, zTab) == 0) {
 		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
@@ -55740,7 +55741,7 @@ __57:
 		goto __64
 	}
 	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6456, zTab) == 0) {
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6475, zTab) == 0) {
 		goto __65
 	}
 	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
@@ -55899,7 +55900,7 @@ __86:
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
 		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6465, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6484, libc.VaList(bp, zAs))
 	return WRC_Abort
 __90:
 	;
@@ -55907,14 +55908,14 @@ __90:
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
 		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6496, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6515, libc.VaList(bp+8, zAs))
 	return WRC_Abort
 __91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
 		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	return WRC_Abort
 __92:
 	;
@@ -55966,7 +55967,7 @@ __11:
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6551, libc.VaList(bp+16, zCol))
+		ts+6570, 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
@@ -56003,7 +56004,7 @@ __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 + 6586
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6605
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
@@ -56016,23 +56017,23 @@ __101:
 __99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6595
+		zErr = ts + 6614
 	} else {
-		zErr = ts + 6610
+		zErr = ts + 6629
 	}
 	if !(zDb != 0) {
 		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6632, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6651, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
 	goto __105
 __104:
 	if !(zTab != 0) {
 		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp+56, zErr, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6664, libc.VaList(bp+56, zErr, zTab, zCol))
 	goto __107
 __106:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+80, zErr, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6674, libc.VaList(bp+80, zErr, zCol))
 __107:
 	;
 __105:
@@ -56135,15 +56136,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 + 6662
+	var zIn uintptr = ts + 6681
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6690
+		zIn = ts + 6709
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6708
+		zIn = ts + 6727
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6726
+		zIn = ts + 6745
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6744, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6763, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -56221,14 +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 + 6764
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
-				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
-				}
-				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
+				*(*int32)(unsafe.Pointer(pExpr + 8)) = libc.Bool32(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL)
+				*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IntValue)
+				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_INTEGER)
+
 				i = 0
 				p = pNC
 			__4:
@@ -56272,7 +56269,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+6775, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6783, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -56336,7 +56333,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+6792, libc.VaList(bp, pExpr))
+								ts+6800, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -56352,7 +56349,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+6856,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6864,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -56366,7 +56363,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+6892, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6900, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -56389,30 +56386,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+6920, libc.VaList(bp+16, pExpr))
+						ts+6928, 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 + 6963
+						zType = ts + 6971
 					} else {
-						zType = ts + 6970
+						zType = ts + 6978
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6980, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6988, 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+7008, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7016, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7030,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7038,
 						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+7074,
+						ts+7082,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -56484,15 +56481,15 @@ 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+7122, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7130, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
 
 				if nRef != (*NameContext)(unsafe.Pointer(pNC)).FnRef {
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_VarSelect)
-					*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_VarSelect
 				}
+				*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_Subquery
 			}
 			break
 
@@ -56500,7 +56497,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+7133, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7141, pExpr, pExpr)
 			}
 
 			break
@@ -56556,7 +56553,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+6533, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -56631,7 +56628,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7144, libc.VaList(bp, i, zType, mx))
+		ts+7152, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -56651,7 +56648,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+7200, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7208, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -56686,7 +56683,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+7234, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7242, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -56743,7 +56740,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+7240, libc.VaList(bp, i+1))
+				ts+7248, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -56771,7 +56768,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+7301, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7309, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -56985,7 +56982,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+7332, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7340, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -57025,7 +57022,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+7234) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7242) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -57036,7 +57033,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7371) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7379) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -57048,7 +57045,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+7377, 0)
+						ts+7385, 0)
 					return WRC_Abort
 				}
 
@@ -57837,7 +57834,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 		return
 	}
 
@@ -57912,7 +57909,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+7436, libc.VaList(bp, mxHeight))
+			ts+7444, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -58161,12 +58158,12 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7484,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7492,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7528
+						return ts + 7536
 					}
-					return ts + 1554
+					return ts + 1573
 				}(), nElem))
 			break
 		}
@@ -58205,7 +58202,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+7530)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -58231,7 +58228,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+7532, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7540, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -58259,7 +58256,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+7566, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7574, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -58306,7 +58303,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+7586,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7594,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -58331,7 +58328,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+7629, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7637, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -58906,7 +58903,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+7652,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7660,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -59029,7 +59026,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+7682, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7690, libc.VaList(bp, zObject))
 	}
 }
 
@@ -59085,10 +59082,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+6764) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7713) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6769) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7718) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -59518,13 +59515,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+7705) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7724) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7713) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7732) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7719) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7738) == 0 {
 		return 1
 	}
 	return 0
@@ -59728,7 +59725,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+7723, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7742, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -59806,7 +59803,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+7770, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7789, 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)
 
@@ -59900,7 +59897,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 + 7801
+		var zFmt uintptr = ts + 7820
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -59918,7 +59915,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+6533, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	}
 }
 
@@ -59959,7 +59956,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+7845, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7864, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -59989,11 +59986,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+7868, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7887, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
-				return ts + 1554
+				return ts + 1573
 			}
-			return ts + 7887
+			return ts + 7906
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -60120,7 +60117,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+7899, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7918, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -60135,11 +60132,11 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7917, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7936, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
-			return ts + 1554
+			return ts + 1573
 		}
-		return ts + 7887
+		return ts + 7906
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
@@ -60162,7 +60159,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+7530)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = uint8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -60171,7 +60168,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+7938)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7957)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -60557,13 +60554,13 @@ 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+7940, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7943,
+			if Xsqlite3_strnicmp(tls, z, ts+7959, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7962,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
-							return ts + 4932
+							return ts + 4951
 						}
-						return ts + 1554
+						return ts + 1573
 					}(), pExpr))
 			} else {
 				codeReal(tls, v, z, negFlag, iMem)
@@ -60600,6 +60597,7 @@ func Xsqlite3ExprCodeLoadIndexColumn(tls *libc.TLS, pParse uintptr, pIdx uintptr
 func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr, pCol uintptr, regOut int32) {
 	var iAddr int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
+	var nErr int32 = (*Parse)(unsafe.Pointer(pParse)).FnErr
 
 	if (*Parse)(unsafe.Pointer(pParse)).FiSelfTab > 0 {
 		iAddr = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Parse)(unsafe.Pointer(pParse)).FiSelfTab-1, 0, regOut)
@@ -60613,6 +60611,9 @@ func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr
 	if iAddr != 0 {
 		Xsqlite3VdbeJumpHere(tls, v, iAddr)
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr > nErr {
+		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FerrByteOffset = -1
+	}
 }
 
 // Generate code to extract the value of the iCol-th column of a table.
@@ -60634,7 +60635,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+7970,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7989,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -60807,8 +60808,8 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8000, ts + 8005, ts + 8010, ts + 6191,
-				ts + 6186, ts + 8018}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8019, ts + 8024, ts + 8029, ts + 6210,
+				ts + 6205, ts + 8037}
 			var aff uint8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
@@ -60816,7 +60817,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 8026
+						return ts + 8045
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -60831,6 +60832,7 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 	var p uintptr
 	var v uintptr
 	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+		var exprAff U8
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -60844,6 +60846,14 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 		if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr, iDataCur) != 0 {
 			continue
 		}
+
+		exprAff = Xsqlite3ExprAffinity(tls, pExpr)
+		if int32(exprAff) <= SQLITE_AFF_BLOB && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_BLOB ||
+			int32(exprAff) == SQLITE_AFF_TEXT && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_TEXT ||
+			int32(exprAff) >= SQLITE_AFF_NUMERIC && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_NUMERIC {
+			continue
+		}
+
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 
 		if (*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow != 0 {
@@ -61183,7 +61193,7 @@ __73:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
 		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7970,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7989,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
 __76:
@@ -61416,7 +61426,7 @@ __43:
 		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+8031, libc.VaList(bp+8, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8050, libc.VaList(bp+8, pExpr))
 	goto __91
 __90:
 	return func() int32 {
@@ -61457,7 +61467,7 @@ __93:
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
 		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8058, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8077, libc.VaList(bp+16, pExpr))
 	goto __5
 __94:
 	;
@@ -61617,7 +61627,7 @@ __121:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
 		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7660,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
 __122:
 	;
@@ -61639,11 +61649,10 @@ __49:
 	return target
 
 __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) {
+	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) {
 		goto __123
 	}
+
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
 		goto __125
@@ -61683,7 +61692,7 @@ __126:
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6552, 0)
 	goto __5
 
 __55:
@@ -61714,13 +61723,19 @@ __129:
 	;
 __127:
 	;
-	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
+	addrINR = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable, 0, target)
 
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = U8(0)
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = okConstFactor
+	if !(inReg != target) {
+		goto __130
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
+	inReg = target
+__130:
+	;
 	Xsqlite3VdbeJumpHere(tls, v, addrINR)
-	Xsqlite3VdbeChangeP3(tls, v, addrINR, inReg)
 	goto __5
 
 __56:
@@ -61733,15 +61748,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __130
+		goto __131
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __131
+		goto __132
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__131:
+__132:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -61751,22 +61766,22 @@ __131:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__130:
+__131:
 	;
 	i1 = 0
-__132:
+__133:
 	if !(i1 < nExpr-1) {
-		goto __134
+		goto __135
 	}
 	if !(pX != 0) {
-		goto __135
+		goto __136
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __136
-__135:
-	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+	goto __137
 __136:
+	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+__137:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -61775,21 +61790,21 @@ __136:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __133
-__133:
-	i1 = i1 + 2
-	goto __132
 	goto __134
 __134:
+	i1 = i1 + 2
+	goto __133
+	goto __135
+__135:
 	;
 	if !(nExpr&1 != 0) {
-		goto __137
+		goto __138
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __138
-__137:
-	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+	goto __139
 __138:
+	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+__139:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -61799,27 +61814,27 @@ __138:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __139
-	}
-	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8082, 0)
-	return 0
-__139:
-	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __140
 	}
-	Xsqlite3MayAbort(tls, pParse)
+	Xsqlite3ErrorMsg(tls, pParse,
+		ts+8101, 0)
+	return 0
 __140:
 	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __141
 	}
+	Xsqlite3MayAbort(tls, pParse)
+__141:
+	;
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+		goto __142
+	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __142
-__141:
+	goto __143
+__142:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -61828,7 +61843,7 @@ __141:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__142:
+__143:
 	;
 	goto __5
 
@@ -61839,7 +61854,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[10]uint8)(unsafe.Pointer(ts + 8132))
+var zAff = *(*[10]uint8)(unsafe.Pointer(ts + 8151))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -63628,11 +63643,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+6381, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 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+8142, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8161, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -63644,13 +63659,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8170,
+		ts+8189,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8345,
+			ts+8364,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -63660,10 +63675,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8519, libc.VaList(bp, zDb, zDb))
+		ts+8538, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8666, 0)
+			ts+8685, 0)
 	}
 }
 
@@ -63727,7 +63742,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8817, libc.VaList(bp, zName))
+		ts+8836, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -63737,7 +63752,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8876, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8895, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -63746,7 +63761,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8882, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8901, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -63787,19 +63802,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8909, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8928, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9093,
+		ts+9112,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9398, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9417, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9414,
+		ts+9433,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -63807,7 +63822,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9472, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9491, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -63819,7 +63834,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9737, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9756, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63831,7 +63846,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9750,
+		ts+9769,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -63877,12 +63892,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9788, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9807, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9820, 0)
+			ts+9839, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -63892,11 +63907,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+9847)
+				ts+9866)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf0>>4)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9906)
+				ts+9925)
 		}
 
 		if pDflt != 0 {
@@ -63909,12 +63924,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9959)
+					ts+9978)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10005)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10024)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -63925,7 +63940,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10032,
+			ts+10051,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -63947,7 +63962,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+10178,
+				ts+10197,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -63995,14 +64010,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10408, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10427, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10442, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10461, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -64030,7 +64045,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+10472, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10491, 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
 	}
@@ -64070,18 +64085,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 + 10491
+		zType = ts + 10510
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10496
+		zType = ts + 10515
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10510,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10529,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10528
+					return ts + 10547
 				}
-				return ts + 10545
+				return ts + 10564
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -64165,11 +64180,11 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10582, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1554, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1573, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iSchema == 1))
 
 	Xsqlite3MayAbort(tls, pParse)
@@ -64182,17 +64197,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10584,
+		ts+10603,
 		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+10766,
+		ts+10785,
 		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+9737, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9756, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -64450,12 +64465,12 @@ 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+10897,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10916,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*uint8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10920
+				return ts + 10939
 			}
-			return ts + 1554
+			return ts + 1573
 		}(), zWhen,
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg))
 	Xsqlite3_result_error(tls, pCtx, zErr, -1)
@@ -64495,8 +64510,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+10922, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 113494)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10941, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113516)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -64513,7 +64528,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, 113505)
+		rc = Xsqlite3CorruptError(tls, 113527)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -64535,7 +64550,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+10930, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10949, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -64575,12 +64590,12 @@ 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+10936, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10955, 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 + 10920
+							return ts + 10939
 						}
-						return ts + 1554
+						return ts + 1573
 					}()))
 				zReplace = zBuf2
 				nReplace = U32(Xsqlite3Strlen30(tls, zReplace))
@@ -65066,7 +65081,7 @@ __45:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FzErrMsg != 0) {
 		goto __47
 	}
-	renameColumnParseError(tls, context, ts+1554, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
+	renameColumnParseError(tls, context, ts+1573, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
 	goto __48
 __47:
 	Xsqlite3_result_error_code(tls, context, rc)
@@ -65231,7 +65246,7 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 			if rc == SQLITE_ERROR && Xsqlite3WritableSchema(tls, db) != 0 {
 				Xsqlite3_result_value(tls, context, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 			} else if (*Parse)(unsafe.Pointer(bp+80)).FzErrMsg != 0 {
-				renameColumnParseError(tls, context, ts+1554, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
+				renameColumnParseError(tls, context, ts+1573, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
 			} else {
 				Xsqlite3_result_error_code(tls, context, rc)
 			}
@@ -65434,7 +65449,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 114441)
+	rc = Xsqlite3CorruptError(tls, 114463)
 	goto drop_column_done
 __2:
 	;
@@ -65458,7 +65473,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10941, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10960, 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)
 
@@ -65539,19 +65554,19 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10582, 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+10948,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10967,
 		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 + 10976
+				return ts + 10995
 			}
-			return ts + 6127
+			return ts + 6146
 		}(),
 			zCol))
 	goto exit_drop_column
@@ -65560,7 +65575,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10988, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11007, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -65574,13 +65589,13 @@ __8:
 	goto exit_drop_column
 __9:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1554, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1573, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11036, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11055, 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+11157, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11176, 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
@@ -65698,11 +65713,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 + 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}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11194},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11215},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11235},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11254},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11273}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -65736,7 +65751,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+11277, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11296, 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)
 			}
@@ -65745,10 +65760,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+11300,
+					ts+11319,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11330, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11349, 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)
 			}
@@ -65766,9 +65781,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11348, FzCols: ts + 11361},
-	{FzName: ts + 11374, FzCols: ts + 11387},
-	{FzName: ts + 11415},
+	{FzName: ts + 11367, FzCols: ts + 11380},
+	{FzName: ts + 11393, FzCols: ts + 11406},
+	{FzName: ts + 11434},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65958,7 +65973,7 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11428}
+	FzName:     ts + 11447}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
@@ -66209,7 +66224,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11438}
+	FzName:     ts + 11457}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -66223,7 +66238,7 @@ 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+11448,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11467,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
 					return (*StatAccum)(unsafe.Pointer(p)).FnEst
@@ -66236,7 +66251,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11453, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11472, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -66278,7 +66293,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+11459, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11478, 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--
@@ -66292,7 +66307,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11465}
+	FzName:     ts + 11484}
 
 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)
@@ -66336,7 +66351,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+11474, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11493, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -66353,7 +66368,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+11348, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11367, 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)
@@ -66509,7 +66524,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+11484, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11503, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -66566,7 +66581,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+11484, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11503, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -66613,9 +66628,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+11488)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11507)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11492)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11511)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -66698,7 +66713,7 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 	var v TRowcnt
 
 	if z == uintptr(0) {
-		z = ts + 1554
+		z = ts + 1573
 	}
 	for i = 0; *(*uint8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
 		v = uint64(0)
@@ -66720,15 +66735,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+11496, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11515, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 13, 0x2000)
-			} else if Xsqlite3_strglob(tls, ts+11507, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11526, 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+11517, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11536, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 9, 0x200)
 			}
 			for int32(*(*uint8)(unsafe.Pointer(z))) != 0 && int32(*(*uint8)(unsafe.Pointer(z))) != ' ' {
@@ -67004,11 +67019,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+11374, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11393, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11529,
-			ts+11583,
+			ts+11548,
+			ts+11602,
 			zDb)
 	}
 	return rc
@@ -67055,10 +67070,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+11348, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11367, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11635, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11654, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -67116,7 +67131,7 @@ 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+6441, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6460, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -67149,13 +67164,13 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zFile == uintptr(0)) {
 		goto __1
 	}
-	zFile = ts + 1554
+	zFile = ts + 1573
 __1:
 	;
 	if !(zName == uintptr(0)) {
 		goto __2
 	}
-	zName = ts + 1554
+	zName = ts + 1573
 __2:
 	;
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x20>>5)) != 0) {
@@ -67163,14 +67178,14 @@ __2:
 	}
 
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3835)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3854)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11676, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11695, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
 	if !(rc == SQLITE_OK) {
 		goto __6
 	}
@@ -67207,7 +67222,7 @@ __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11679,
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11698,
 		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
@@ -67221,7 +67236,7 @@ __12:
 	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __15
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11716, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11735, libc.VaList(bp+8, zName))
 	goto attach_error
 __15:
 	;
@@ -67285,7 +67300,7 @@ __4:
 		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11746, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11765, 0)
 	goto __23
 __22:
 	if !(rc == SQLITE_OK) {
@@ -67302,7 +67317,7 @@ __25:
 		goto __27
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
-		ts+11775, 0)
+		ts+11794, 0)
 	rc = SQLITE_ERROR
 __27:
 	;
@@ -67368,13 +67383,13 @@ __33:
 	}
 	Xsqlite3OomFault(tls, db)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1509, 0)
 	goto __35
 __34:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
 		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11843, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11862, libc.VaList(bp+16, zFile))
 __36:
 	;
 __35:
@@ -67421,7 +67436,7 @@ func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zName == uintptr(0)) {
 		goto __1
 	}
-	zName = ts + 1554
+	zName = ts + 1573
 __1:
 	;
 	i = 0
@@ -67452,14 +67467,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11871, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11890, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11892, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11911, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -67467,7 +67482,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11918, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11937, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -67584,7 +67599,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11940}
+	FzName:     ts + 11959}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -67597,7 +67612,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11954}
+	FzName:     ts + 11973}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -67611,7 +67626,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+11968, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11987, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -67643,7 +67658,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+11992,
+						ts+12011,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -67818,7 +67833,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+12038, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12057, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -67844,11 +67859,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+12061, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12080, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12067, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12086, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12073, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12092, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -67895,7 +67910,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 + 7713
+		zCol = ts + 7732
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -67919,7 +67934,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+12100, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12119, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -68190,25 +68205,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6441) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6460) == 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+6381, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
 			if i == 1 {
-				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 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5902+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+6389)
+						ts+6408)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+5883)
+						ts+5902)
 				}
 			}
 		}
@@ -68229,12 +68244,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		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 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6446+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5902)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+6389)
+					ts+6408)
 			}
 		}
 	}
@@ -68265,7 +68280,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+12115, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12134, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -68283,14 +68298,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 + 12123
+			zMsg = ts + 12142
 		} else {
-			zMsg = ts + 12136
+			zMsg = ts + 12155
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6664, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6674, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -68320,12 +68335,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+6381, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
-			return ts + 6427
+	if Xsqlite3_strnicmp(tls, zName, ts+6400, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5902+7) == 0 {
+			return ts + 6446
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6389+7) == 0 {
-			return ts + 6408
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 {
+			return ts + 6427
 		}
 	}
 	return zName
@@ -68683,7 +68698,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+5883)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5902)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -68709,7 +68724,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6441, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6460, zName) {
 				goto __3
 			}
 
@@ -68762,13 +68777,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+12150, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12169, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12167, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12186, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -68806,13 +68821,13 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 		if Xsqlite3_stricmp(tls, zType, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit))) != 0 ||
 			Xsqlite3_stricmp(tls, zName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 1*8))) != 0 ||
 			Xsqlite3_stricmp(tls, zTblName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 2*8))) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1554, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1573, 0)
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6381, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6400, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12187,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12206,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -68972,9 +68987,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -68990,7 +69005,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12229, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12248, 0)
 	return
 __4:
 	;
@@ -69018,9 +69033,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10491
+			return ts + 10510
 		}
-		return ts + 8876
+		return ts + 8895
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -69036,9 +69051,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -69069,12 +69084,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12270,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12289,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10491
+				return ts + 10510
 			}
-			return ts + 8876
+			return ts + 8895
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -69089,7 +69104,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12291, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12310, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -69176,7 +69191,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+12326, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12345, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -69200,7 +69215,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+12343, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12362, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -69220,7 +69235,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 + 12326
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12345
 	(*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)
@@ -69232,7 +69247,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+12326, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12345, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -69266,7 +69281,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+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12396, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -69274,13 +69289,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+12400, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12419, 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+12407, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12426, 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--
@@ -69317,7 +69332,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+12417, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12436, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -69481,10 +69496,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+12443,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12462,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12488, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12507, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -69515,7 +69530,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+12529, 0)
+			ts+12548, 0)
 	}
 }
 
@@ -69560,7 +69575,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12581, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12600, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -69649,7 +69664,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12622, 0)
+		ts+12641, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -69744,7 +69759,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12678, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12697, 0)
 	goto generated_done
 __2:
 	;
@@ -69757,13 +69772,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12721, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12740, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12729, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12748, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -69797,13 +69812,19 @@ __10:
 
 	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
 __11:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_RAISE) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = (*Column)(unsafe.Pointer(pCol)).Faffinity
+__12:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12736,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12755,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -69924,13 +69945,13 @@ __3:
 	;
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
-		zSep = ts + 1554
-		zSep2 = ts + 12767
-		zEnd = ts + 4957
+		zSep = ts + 1573
+		zSep2 = ts + 12786
+		zEnd = ts + 4976
 	} else {
-		zSep = ts + 12769
-		zSep2 = ts + 12773
-		zEnd = ts + 12778
+		zSep = ts + 12788
+		zSep2 = ts + 12792
+		zEnd = ts + 12797
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -69938,7 +69959,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12781, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12800, 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('(')
@@ -69972,17 +69993,17 @@ __5:
 	goto __6
 __6:
 	;
-	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3663, libc.VaList(bp, zEnd))
+	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3682, libc.VaList(bp, zEnd))
 	return zStmt
 }
 
 var azType1 = [6]uintptr{
-	ts + 1554,
-	ts + 12795,
-	ts + 12801,
-	ts + 12806,
-	ts + 12811,
-	ts + 12801,
+	ts + 1573,
+	ts + 12814,
+	ts + 12820,
+	ts + 12825,
+	ts + 12830,
+	ts + 12820,
 }
 
 func resizeIndexObject(tls *libc.TLS, db uintptr, pIdx uintptr, N int32) int32 {
@@ -70372,7 +70393,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
 		if pSelect != 0 || !(int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM) && (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1554, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1573, 0)
 			return
 		}
 		(*Table)(unsafe.Pointer(p)).Ftnum = (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum
@@ -70389,10 +70410,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+12817,
-						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1554)))
+						ts+12836,
+						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1573)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12850,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12869,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -70411,11 +70432,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+12877, 0)
+				ts+12896, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12927, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12946, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -70449,7 +70470,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12959, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12978, 0)
 			return
 		}
 	}
@@ -70474,11 +70495,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 + 8876
-			zType2 = ts + 13003
+			zType = ts + 8895
+			zType2 = ts + 13022
 		} else {
-			zType = ts + 10491
-			zType2 = ts + 13009
+			zType = ts + 10510
+			zType2 = ts + 13028
 		}
 
 		if pSelect != 0 {
@@ -70549,11 +70570,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+13014, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13033, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13029,
+			ts+13048,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -70569,13 +70590,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+13127,
+					ts+13146,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13169, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13188, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -70590,7 +70611,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+9398) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9417) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -70620,7 +70641,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+13203, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13222, 0)
 	goto create_view_fail
 __1:
 	;
@@ -70636,7 +70657,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10491, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10510, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -70718,7 +70739,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13239, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13258, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -70843,13 +70864,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+13269, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13288, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13284,
+		ts+13303,
 		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)
 }
@@ -70890,10 +70911,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+13351, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]uint8{})), bp+40, ts+13370, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11300,
+				ts+11319,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -70925,12 +70946,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+13365,
+			ts+13384,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13410,
+		ts+13429,
 		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)
@@ -70958,11 +70979,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+6381, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3286, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3305, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7133, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7141, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -71040,9 +71061,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -71101,21 +71122,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13477, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13496, 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+13505, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13524, 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+13539, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13558, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -71127,7 +71148,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11492, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11511, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -71191,7 +71212,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13571,
+		ts+13590,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -71203,7 +71224,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13634, 0)
+		ts+13653, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -71288,7 +71309,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13728,
+		ts+13747,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -71515,12 +71536,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+13774,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13793,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13802
+							return ts + 13821
 						}
-						return ts + 13808
+						return ts + 13827
 					}()))
 				return 1
 			}
@@ -71641,7 +71662,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13813, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13832, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -71660,7 +71681,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13819,
+		ts+13838,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -71686,26 +71707,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13869, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13888, 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+13897, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13916, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13922, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13941, 0)
 	goto exit_create_index
 __17:
 	;
@@ -71719,7 +71740,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13813, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13832, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -71734,7 +71755,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13956, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13975, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -71746,7 +71767,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13990, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14009, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -71775,7 +71796,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14014, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14033, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -71796,9 +71817,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -71837,7 +71858,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13813)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13832)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -71938,7 +71959,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14037, 0)
+		ts+14056, 0)
 	goto exit_create_index
 __56:
 	;
@@ -72155,7 +72176,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14098, libc.VaList(bp+48, 0))
+		ts+14117, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -72207,8 +72228,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14140, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14159, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121859)
 	goto exit_create_index
 __101:
 	;
@@ -72254,12 +72275,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14157,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14176,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
-				return ts + 1554
+				return ts + 1573
 			}
-			return ts + 14177
+			return ts + 14196
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -72267,7 +72288,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14185,
+		ts+14204,
 		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,
@@ -72281,7 +72302,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14244, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14263, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -72442,7 +72463,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14271, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14290, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -72457,7 +72478,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14289, libc.VaList(bp+8, 0))
+		ts+14308, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -72468,9 +72489,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 + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -72496,9 +72517,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14362,
+		ts+14381,
 		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+11488, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11507, (*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)
@@ -72633,7 +72654,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+14422,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14441,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -72841,12 +72862,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+14458,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14477,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14494
+				return ts + 14513
 			}
-			return ts + 14497
+			return ts + 14516
 		}()))
 	goto append_from_error
 __1:
@@ -73015,7 +73036,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14503, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14522, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -73051,9 +73072,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14509
+				return ts + 14528
 			}
-			return ts + 14518
+			return ts + 14537
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -73078,7 +73099,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14503, ts + 14525, ts + 14509}
+var az = [3]uintptr{ts + 14522, ts + 14544, ts + 14528}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -73093,7 +73114,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+14533, 0)
+				ts+14552, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -73230,17 +73251,17 @@ 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+14603, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14622, 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+14614, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14633, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
-			Xsqlite3_str_append(tls, bp+8, ts+1567, 1)
+			Xsqlite3_str_append(tls, bp+8, ts+1586, 1)
 			Xsqlite3_str_appendall(tls, bp+8, zCol)
 		}
 	}
@@ -73263,11 +73284,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+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12080, 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+14617, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14636, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -73397,7 +73418,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14626, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14645, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -73493,7 +73514,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+14672, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14691, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -73691,7 +73712,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14702, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14721, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -73971,7 +73992,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+14733,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14752,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -74003,11 +74024,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+14766, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14785, 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+14795, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14814, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -74258,7 +74279,7 @@ __20:
 	goto __16
 __15:
 	wcf = U16(WHERE_ONEPASS_DESIRED | WHERE_DUPLICATES_OK)
-	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_VarSelect != 0) {
+	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_Subquery != 0) {
 		goto __23
 	}
 	bComplex = 1
@@ -74511,7 +74532,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14833)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14852)
 __62:
 	;
 delete_from_cleanup:
@@ -74626,7 +74647,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+11348) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11367) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -74856,7 +74877,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 + 8005, ts + 8000, ts + 6181}
+var azType2 = [5]uintptr{ts + 6210, ts + 6205, ts + 8024, ts + 8019, ts + 6200}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -74915,7 +74936,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+14846, -1)
+					Xsqlite3_result_error(tls, context, ts+14865, -1)
 					return
 				}
 				iVal = -iVal
@@ -75219,7 +75240,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14863, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14882, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -75565,7 +75586,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+14868, -1)
+		Xsqlite3_result_error(tls, context, ts+14887, -1)
 		return
 	}
 	if argc == 3 {
@@ -75575,7 +75596,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+14901, -1)
+				ts+14920, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -75628,7 +75649,7 @@ func errlogFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	_ = argc
 	_ = context
-	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3663, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
+	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3682, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
 }
 
 func compileoptionusedFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
@@ -75668,13 +75689,13 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 
 			var zVal uintptr
 			r1 = Xsqlite3_value_double(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+4925, libc.VaList(bp, r1))
+			Xsqlite3_str_appendf(tls, pStr, ts+4944, libc.VaList(bp, r1))
 			zVal = Xsqlite3_str_value(tls, pStr)
 			if zVal != 0 {
 				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+14946, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14965, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -75682,7 +75703,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 		}
 	case SQLITE_INTEGER:
 		{
-			Xsqlite3_str_appendf(tls, pStr, ts+1334, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
+			Xsqlite3_str_appendf(tls, pStr, ts+1353, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
 			break
 
 		}
@@ -75711,13 +75732,13 @@ 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+14953, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14972, libc.VaList(bp+24, zArg))
 			break
 
 		}
 	default:
 		{
-			Xsqlite3_str_append(tls, pStr, ts+1555, 4)
+			Xsqlite3_str_append(tls, pStr, ts+1574, 4)
 			break
 
 		}
@@ -75858,7 +75879,7 @@ func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 	var ch U32
 	var c U8
 	var d U8
-	zPass = ts + 1554
+	zPass = ts + 1573
 	nPass = 0
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -76140,7 +76161,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10920}
+var azOne = [1]uintptr{ts + 10939}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -76152,7 +76173,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	zIn = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	if zIn == uintptr(0) {
-		zIn = ts + 1554
+		zIn = ts + 1573
 	}
 	for i = 0; *(*U8)(unsafe.Pointer(zIn + uintptr(i))) != 0 && !(int32(Xsqlite3CtypeMap[*(*U8)(unsafe.Pointer(zIn + uintptr(i)))])&0x02 != 0); i++ {
 	}
@@ -76176,7 +76197,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+14956, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14975, 4, uintptr(0))
 	}
 }
 
@@ -76201,7 +76222,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+12100, -1)
+		Xsqlite3_result_error(tls, context, ts+12119, -1)
 		return
 	}
 
@@ -76279,7 +76300,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+14846, -1)
+			Xsqlite3_result_error(tls, context, ts+14865, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -76541,7 +76562,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+14961, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14980, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -76561,14 +76582,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14967, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14986, 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+14967, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14986, 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+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)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14986, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14986, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -76809,109 +76830,109 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 }
 
 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 + 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(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(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 + 14991},
+	{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 + 15011},
+	{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 + 15024},
+	{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 + 15042},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15051},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15059},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15059},
+	{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_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15100},
+	{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 + 15125},
+	{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 + 15134},
+	{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 + 15145},
+	{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 + 15152},
+	{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 + 15166},
+	{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 + 15166},
+	{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 + 15172},
+	{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 + 15172},
+	{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 + 15178},
+	{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 + 15178},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15183},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15183},
+	{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 + 15183},
+	{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 + 15187},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15187},
+	{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 + 15187},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15191},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15198},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15206},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15213},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15219},
+	{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 + 15233},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15241},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15246},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15256},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15262},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15268},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15272},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15272},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15278},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15285},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15292},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15303},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15310},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15325},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15342},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15353},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15359},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15377},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15385},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15399},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15407},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15416},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15423},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15423},
+	{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 + 15433},
+	{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 + 15437},
+	{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 + 15443},
+	{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 + 15447},
+	{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 + 15447},
+	{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 + 15453},
+	{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 + 15453},
+	{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 + 15466},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14986},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14986},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6605},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6605},
 	{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 + 15523},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15476},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15484},
+	{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 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15496},
+	{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 + 15499},
+	{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 + 15503},
+	{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 + 15509},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15499},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15514},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15518},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15522},
 	{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 + 15532},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15537},
 	{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 + 15556},
+	{FnArg: int8(2), 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 + 15553},
+	{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 + 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 + 15565},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15570},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15575},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15580},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15586},
 	{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}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15598},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15603},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15611},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15619},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15622},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6605},
+	{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 + 15627}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -77032,7 +77053,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+15612,
+				ts+15631,
 				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)
@@ -77692,8 +77713,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 + 6452, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6448, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6471, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6467, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -77772,7 +77793,7 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 			(*Token)(unsafe.Pointer(bp + 80)).Fz = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 			(*Token)(unsafe.Pointer(bp + 80)).Fn = uint32(Xsqlite3Strlen30(tls, (*Token)(unsafe.Pointer(bp+80)).Fz))
 
-			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5136)
+			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5155)
 			if pRaise != 0 {
 				(*Expr)(unsafe.Pointer(pRaise)).FaffExpr = uint8(OE_Abort)
 			}
@@ -78194,7 +78215,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7970, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7989, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -78662,7 +78683,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15657,
+		ts+15676,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -78687,7 +78708,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15698,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15717,
 		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
@@ -78836,7 +78857,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15730,
+		ts+15749,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -78846,7 +78867,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15782, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15801, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -78898,7 +78919,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15807,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15826,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -78906,7 +78927,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15853, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15872, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -79318,7 +79339,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15874)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15893)
 __125:
 	;
 insert_cleanup:
@@ -79634,7 +79655,7 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 						fallthrough
 					case OE_Fail:
 						{
-							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12080, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 								(*Column)(unsafe.Pointer(pCol)).FzCnName))
 
 							Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
@@ -80726,13 +80747,13 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131895)
+	return Xsqlite3MisuseError(tls, 131931)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
 		goto __2
 	}
-	zSql = ts + 1554
+	zSql = ts + 1573
 __2:
 	;
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -81211,7 +81232,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12100, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12119, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -81220,7 +81241,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15888
+		zEntry = ts + 15907
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -81235,7 +81256,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12080, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -81271,7 +81292,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15911, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15930, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*uint8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -81285,7 +81306,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15920, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15939, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -81309,7 +81330,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15924, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15943, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -81327,7 +81348,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15930, libc.VaList(bp+16, zEntry, zFile))
+		ts+15949, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -81354,7 +81375,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15973, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15992, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -81392,7 +81413,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+16005, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16024, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -81402,7 +81423,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16042,
+	ts + 16061,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -81558,7 +81579,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+16045, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16064, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -81566,63 +81587,63 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 }
 
 var pragCName = [57]uintptr{
-	ts + 5057,
-	ts + 16084,
-	ts + 8876,
-	ts + 16088,
-	ts + 16093,
-	ts + 16096,
-	ts + 16106,
-	ts + 16116,
-	ts + 16122,
-	ts + 16126,
-	ts + 16131,
-	ts + 16136,
-	ts + 16144,
+	ts + 5076,
+	ts + 16103,
+	ts + 8895,
+	ts + 16107,
+	ts + 16112,
+	ts + 16115,
+	ts + 16125,
+	ts + 16135,
+	ts + 16141,
+	ts + 16145,
+	ts + 16150,
 	ts + 16155,
-	ts + 16158,
-	ts + 16165,
-	ts + 16126,
-	ts + 16131,
-	ts + 16172,
+	ts + 16163,
+	ts + 16174,
 	ts + 16177,
-	ts + 16180,
-	ts + 16187,
-	ts + 16122,
-	ts + 16126,
-	ts + 16193,
-	ts + 16198,
-	ts + 16203,
-	ts + 16126,
-	ts + 16207,
-	ts + 16131,
-	ts + 16215,
-	ts + 16219,
-	ts + 16224,
-	ts + 11492,
-	ts + 11488,
-	ts + 16230,
-	ts + 16235,
-	ts + 16240,
-	ts + 16084,
-	ts + 16126,
-	ts + 16245,
-	ts + 16252,
+	ts + 16184,
+	ts + 16145,
+	ts + 16150,
+	ts + 16191,
+	ts + 16196,
+	ts + 16199,
+	ts + 16206,
+	ts + 16141,
+	ts + 16145,
+	ts + 16212,
+	ts + 16217,
+	ts + 16222,
+	ts + 16145,
+	ts + 16226,
+	ts + 16150,
+	ts + 16234,
+	ts + 16238,
+	ts + 16243,
+	ts + 11511,
+	ts + 11507,
+	ts + 16249,
+	ts + 16254,
 	ts + 16259,
-	ts + 8876,
-	ts + 16267,
-	ts + 5060,
-	ts + 16273,
-	ts + 16084,
-	ts + 16126,
+	ts + 16103,
+	ts + 16145,
+	ts + 16264,
+	ts + 16271,
 	ts + 16278,
-	ts + 16283,
-	ts + 15480,
-	ts + 16288,
-	ts + 16301,
-	ts + 16310,
-	ts + 16317,
-	ts + 16328,
+	ts + 8895,
+	ts + 16286,
+	ts + 5079,
+	ts + 16292,
+	ts + 16103,
+	ts + 16145,
+	ts + 16297,
+	ts + 16302,
+	ts + 15499,
+	ts + 16307,
+	ts + 16320,
+	ts + 16329,
+	ts + 16336,
+	ts + 16347,
 }
 
 // Definitions of all built-in pragmas
@@ -81640,238 +81661,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16336,
+	{FzName: ts + 16355,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16351,
+	{FzName: ts + 16370,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16366,
+	{FzName: ts + 16385,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16378,
+	{FzName: ts + 16397,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16394,
+	{FzName: ts + 16413,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16317,
+	{FzName: ts + 16336,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16407,
+	{FzName: ts + 16426,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16419,
+	{FzName: ts + 16438,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16439,
+	{FzName: ts + 16458,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CellSizeCk)},
-	{FzName: ts + 16455,
+	{FzName: ts + 16474,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16476,
+	{FzName: ts + 16495,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16491,
+	{FzName: ts + 16510,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16507,
+	{FzName: ts + 16526,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16521,
+	{FzName: ts + 16540,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16534,
+	{FzName: ts + 16553,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16548,
+	{FzName: ts + 16567,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16567,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_DeferFKs)},
 	{FzName: ts + 16586,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_DeferFKs)},
+	{FzName: ts + 16605,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16609,
+	{FzName: ts + 16628,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16618,
+	{FzName: ts + 16637,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16636,
+	{FzName: ts + 16655,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16653,
+	{FzName: ts + 16672,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16666,
+	{FzName: ts + 16685,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16681,
+	{FzName: ts + 16700,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16699,
+	{FzName: ts + 16718,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16709,
+	{FzName: ts + 16728,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16723,
+	{FzName: ts + 16742,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16739,
+	{FzName: ts + 16758,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16764,
+	{FzName: ts + 16783,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16783,
+	{FzName: ts + 16802,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16794,
+	{FzName: ts + 16813,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16805,
+	{FzName: ts + 16824,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16817,
+	{FzName: ts + 16836,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16833,
+	{FzName: ts + 16852,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16846,
+	{FzName: ts + 16865,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16865,
+	{FzName: ts + 16884,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16884,
+	{FzName: ts + 16903,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16897,
+	{FzName: ts + 16916,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16912,
+	{FzName: ts + 16931,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16922,
+	{FzName: ts + 16941,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16934,
+	{FzName: ts + 16953,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16943,
+	{FzName: ts + 16962,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16954,
+	{FzName: ts + 16973,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16964,
+	{FzName: ts + 16983,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16976,
+	{FzName: ts + 16995,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16987,
+	{FzName: ts + 17006,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16999,
+	{FzName: ts + 17018,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17016,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_RecTriggers)},
 	{FzName: ts + 17035,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_RecTriggers)},
+	{FzName: ts + 17054,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17061,
+	{FzName: ts + 17080,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17076,
+	{FzName: ts + 17095,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17090,
+	{FzName: ts + 17109,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17109,
+	{FzName: ts + 17128,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17123,
+	{FzName: ts + 17142,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17139,
+	{FzName: ts + 17158,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17151,
+	{FzName: ts + 17170,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17162,
+	{FzName: ts + 17181,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17173,
+	{FzName: ts + 17192,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17185,
+	{FzName: ts + 17204,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17196,
+	{FzName: ts + 17215,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17217,
+	{FzName: ts + 17236,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17225,
+	{FzName: ts + 17244,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17240,
+	{FzName: ts + 17259,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17253,
-		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
 	{FzName: ts + 17272,
+		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
+	{FzName: ts + 17291,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17287,
+	{FzName: ts + 17306,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -81893,7 +81914,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17303))
+var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17322))
 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)}
@@ -81905,10 +81926,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+17328) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17347) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17357) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -81917,13 +81938,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+8026) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8045) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17345) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17364) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17350) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17369) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -81938,9 +81959,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+16278) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16297) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17362) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17381) == 0 {
 		return 2
 	} else {
 		return 0
@@ -81954,7 +81975,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+17369, 0)
+				ts+17388, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -82045,19 +82066,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17431
+		zName = ts + 17450
 		break
 	case OE_SetDflt:
-		zName = ts + 17440
+		zName = ts + 17459
 		break
 	case OE_Cascade:
-		zName = ts + 17452
+		zName = ts + 17471
 		break
 	case OE_Restrict:
-		zName = ts + 17460
+		zName = ts + 17479
 		break
 	default:
-		zName = ts + 17469
+		zName = ts + 17488
 		break
 	}
 	return zName
@@ -82074,7 +82095,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17479, ts + 17486, ts + 17494, ts + 17498, ts + 17362, ts + 17507,
+	ts + 17498, ts + 17505, ts + 17513, ts + 17517, ts + 17381, ts + 17526,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -82121,13 +82142,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17511
+			zType = ts + 17530
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17513
+			zType = ts + 17532
 		} else {
-			zType = ts + 7528
+			zType = ts + 7536
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17515,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17534,
 			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),
@@ -82135,7 +82156,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17522, ts + 17527, ts + 17535}
+var azEnc = [4]uintptr{uintptr(0), ts + 17541, ts + 17546, ts + 17554}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -82286,6 +82307,7 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp7 int32
 	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
@@ -82382,7 +82404,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17543, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17562, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -82421,7 +82443,7 @@ __8:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 488)) != 0) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 488)))
 __10:
 	;
@@ -82643,7 +82665,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17547) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17566) == 0) {
 		goto __64
 	}
 	b = 2
@@ -82715,7 +82737,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17338
+	zRet = ts + 17357
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -82753,7 +82775,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17328
+	zRet = ts + 17347
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -83040,7 +83062,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 552)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17552, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17571, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -83059,7 +83081,7 @@ __127:
 	if !(*(*uint8)(unsafe.Pointer(zRight)) != 0) {
 		goto __128
 	}
-	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+16, zRight))
+	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+16, zRight))
 	goto __129
 __128:
 	Xsqlite3_temp_directory = uintptr(0)
@@ -83081,7 +83103,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17577, 0)
+		ts+17596, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -83135,7 +83157,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17630) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17649) == 0) {
 		goto __142
 	}
 
@@ -83232,13 +83254,13 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17636
+			return ts + 17655
 		}
-		return ts + 17644
+		return ts + 17663
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
-			Xsqlite3ColumnType(tls, pCol, ts+1554),
+			Xsqlite3ColumnType(tls, pCol, ts+1573),
 			func() int32 {
 				if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf0>>4)) != 0 {
 					return 1
@@ -83303,7 +83325,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17651, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17670, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -83316,7 +83338,7 @@ __172:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __173
 	}
-	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1490, 0)
+	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1509, 0)
 	(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 __173:
 	;
@@ -83349,29 +83371,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10491
+	zType = ts + 10510
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12721
+	zType = ts + 12740
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17667
+	zType = ts + 17686
 	goto __183
 __182:
-	zType = ts + 8876
+	zType = ts + 8895
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17693,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -83437,7 +83459,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17681, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17700, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -83447,7 +83469,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17686,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17705,
 		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))))
@@ -83484,8 +83506,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17691, ts + 17693, ts + 16155}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17695,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17710, ts + 17712, ts + 16174}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17714,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -83518,7 +83540,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17720,
 		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)))
@@ -83540,7 +83562,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17705, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17724, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -83604,7 +83626,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7536, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -83620,7 +83642,7 @@ __218:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7536, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -83655,7 +83677,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17708,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17727,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -83663,7 +83685,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+17717))
+			ts+17736))
 	goto __227
 __227:
 	j2++
@@ -83852,7 +83874,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17722, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17741, 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)))
@@ -84069,7 +84091,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+17726, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17745, 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)
@@ -84180,7 +84202,7 @@ __307:
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17750,
+		ts+17769,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
@@ -84279,7 +84301,7 @@ __321:
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17786, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17805, 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) {
@@ -84301,7 +84323,7 @@ __326:
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17806,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17825,
 		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)
@@ -84314,7 +84336,7 @@ __329:
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17828,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17847,
 		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 __332
@@ -84332,11 +84354,11 @@ __331:
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
 __334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17851, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17870, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17853,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17872,
 		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)
 __333:
@@ -84382,7 +84404,7 @@ __339:
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17873,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17892,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
@@ -84416,89 +84438,103 @@ __344:
 
 	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+17903)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17922)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17908)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17927)
 	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)
 
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __345
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_IdxRowid, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
+	jmp7 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 3, 0, r1+int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn)-1)
+
+	Xsqlite3VdbeLoadString(tls, v, 3,
+		ts+17948)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17984)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp7)
+__345:
+	;
 	label6 = 0
 	kk = 0
-__345:
+__346:
 	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) {
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
 		goto __349
 	}
-	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+	goto __347
 __349:
+	;
+	if !(label6 == 0) {
+		goto __350
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__350:
 	;
 	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:
+	kk++
+	goto __346
+	goto __348
+__348:
 	;
 	if !(label6 != 0) {
-		goto __350
+		goto __351
 	}
 	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
 	Xsqlite3VdbeResolveLabel(tls, v, label6)
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17922)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17929)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17995)
 	Xsqlite3VdbeGoto(tls, v, jmp5-1)
 	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-__350:
+__351:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __351
+		goto __352
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__352:
+__353:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __354
+		goto __355
 	}
 	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 __355
+		goto __356
 	}
-	goto __353
-__355:
+	goto __354
+__356:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
-	goto __353
-__353:
-	kk++
-	goto __352
 	goto __354
 __354:
+	kk++
+	goto __353
+	goto __355
+__355:
 	;
 	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)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18022)
 	Xsqlite3VdbeGoto(tls, v, jmp5)
 	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
-__351:
+__352:
 	;
 	Xsqlite3VdbeJumpHere(tls, v, jmp4)
 	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
@@ -84515,20 +84551,20 @@ __340:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 612)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __356
+		goto __357
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17983)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+18049)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__357:
+__358:
 	if !(pIdx5 != 0) {
-		goto __359
-	}
-	if !(pPk1 == pIdx5) {
 		goto __360
 	}
-	goto __358
-__360:
+	if !(pPk1 == pIdx5) {
+		goto __361
+	}
+	goto __359
+__361:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -84537,21 +84573,21 @@ __360:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __358
-__358:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __357
 	goto __359
 __359:
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
+	goto __358
+	goto __360
+__360:
 	;
 	if !(pPk1 != 0) {
-		goto __361
+		goto __362
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__361:
+__362:
 	;
-__356:
+__357:
 	;
 	goto __291
 __291:
@@ -84569,14 +84605,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __362
+		goto __363
 	}
 	(*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 + 18012
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18078
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__362:
+__363:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -84584,27 +84620,27 @@ __362:
 
 __45:
 	if !!(zRight != 0) {
-		goto __363
+		goto __364
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __365
-	}
-	goto pragma_out
-__365:
-	;
-	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __364
-__363:
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
 		goto __366
 	}
+	goto pragma_out
+__366:
+	;
+	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
+	goto __365
+__364:
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
+		goto __367
+	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__367:
+__368:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __369
+		goto __370
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __370
+		goto __371
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -84618,25 +84654,25 @@ __367:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __369
-__370:
-	;
-	goto __368
-__368:
-	pEnc += 16
-	goto __367
-	goto __369
-__369:
-	;
-	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __371
-	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18015, libc.VaList(bp+456, zRight))
+	goto __370
 __371:
 	;
-__366:
+	goto __369
+__369:
+	pEnc += 16
+	goto __368
+	goto __370
+__370:
 	;
-__364:
+	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
+		goto __372
+	}
+	Xsqlite3ErrorMsg(tls, pParse, ts+18081, libc.VaList(bp+456, zRight))
+__372:
+	;
+__367:
+	;
+__365:
 	;
 	goto __15
 
@@ -84644,15 +84680,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 __372
+		goto __373
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __374
+		goto __375
 	}
 	goto __15
-__374:
+__375:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -84660,41 +84696,41 @@ __374:
 	(*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 __375
+		goto __376
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__375:
+__376:
 	;
-	goto __373
-__372:
+	goto __374
+__373:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __376
+		goto __377
 	}
 	goto __15
-__376:
+__377:
 	;
 	(*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)
-__373:
+__374:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__377:
+__378:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __378
+		goto __379
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __377
-__378:
+	goto __378
+__379:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -84709,31 +84745,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __379
-	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17345) == 0) {
 		goto __380
 	}
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17364) == 0) {
+		goto __381
+	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __381
-__380:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18040) == 0) {
-		goto __382
+	goto __382
+__381:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18106) == 0) {
+		goto __383
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __383
-__382:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17498) == 0) {
-		goto __384
+	goto __384
+__383:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17517) == 0) {
+		goto __385
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
+__385:
+	;
 __384:
 	;
-__383:
+__382:
 	;
-__381:
-	;
-__379:
+__380:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -84743,10 +84779,10 @@ __379:
 
 __49:
 	if !(zRight != 0) {
-		goto __385
+		goto __386
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__385:
+__386:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -84766,19 +84802,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __386
+		goto __387
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __388
+		goto __389
 	}
 	goto __15
-__388:
+__389:
 	;
-	goto __387
-__386:
-	opMask = U32(0xfffe)
+	goto __388
 __387:
+	opMask = U32(0xfffe)
+__388:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -84787,86 +84823,86 @@ __387:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__389:
+__390:
 	if !(iDb <= iDbLast) {
-		goto __391
-	}
-	if !(iDb == 1) {
 		goto __392
 	}
-	goto __390
-__392:
+	if !(iDb == 1) {
+		goto __393
+	}
+	goto __391
+__393:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__393:
+__394:
 	if !(k4 != 0) {
-		goto __395
+		goto __396
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __396
+		goto __397
 	}
-	goto __394
-__396:
+	goto __395
+__397:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__397:
+__398:
 	if !(pIdx6 != 0) {
-		goto __399
-	}
-	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x100>>8) != 0) {
 		goto __400
 	}
+	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x100>>8) != 0) {
+		goto __401
+	}
 	szThreshold = int16(0)
-	goto __399
-__400:
+	goto __400
+__401:
 	;
-	goto __398
-__398:
-	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __397
 	goto __399
 __399:
+	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
+	goto __398
+	goto __400
+__400:
 	;
 	if !(szThreshold != 0) {
-		goto __401
+		goto __402
 	}
 	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))
 
-__401:
+__402:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18048,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18114,
 		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 __402
+		goto __403
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __403
-__402:
-	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+	goto __404
 __403:
+	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+__404:
 	;
-	goto __394
-__394:
-	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __393
 	goto __395
 __395:
+	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
+	goto __394
+	goto __396
+__396:
 	;
-	goto __390
-__390:
-	iDb++
-	goto __389
 	goto __391
 __391:
+	iDb++
+	goto __390
+	goto __392
+__392:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -84874,36 +84910,36 @@ __391:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __404
+		goto __405
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__404:
+__405:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+640) == SQLITE_OK) {
-		goto __405
+		goto __406
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))
-__405:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __406
+		goto __407
 	}
 	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 __407
+		goto __408
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__407:
+__408:
 	;
-__406:
+__407:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -84912,10 +84948,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) >= int64(0)) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656))&int64(0x7fffffff)))
-__408:
+__409:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -84924,10 +84960,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __409
+		goto __410
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) & int64(0x7fffffff))
-__409:
+__410:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -84935,10 +84971,10 @@ __409:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __410
+		goto __411
 	}
 
-__410:
+__411:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -84990,14 +85026,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{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},
+	{FzName: ts + 18132, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18137, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18143, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18152, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18161, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18169, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18177},
+	{FzName: ts + 18184},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -85049,7 +85085,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+18124)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18190)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -85057,7 +85093,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18205, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = uint8(',')
 
 	}
@@ -85070,19 +85106,19 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18146, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18212, 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+18152)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18218)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18164)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18230)
 		j++
 	}
-	Xsqlite3_str_append(tls, bp+32, ts+4957, 1)
+	Xsqlite3_str_append(tls, bp+32, ts+4976, 1)
 	Xsqlite3StrAccumFinish(tls, bp+32)
 
 	rc = Xsqlite3_declare_vtab(tls, db, bp+64)
@@ -85098,7 +85134,7 @@ __3:
 			(*PragmaVtab)(unsafe.Pointer(pTab)).FnHidden = U8(j)
 		}
 	} else {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	}
 
 	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
@@ -85246,7 +85282,7 @@ __1:
 		var zText uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 
 		if zText != 0 {
-			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, zText))
+			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, zText))
 			if *(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) == uintptr(0) {
 				return SQLITE_NOMEM
 			}
@@ -85262,13 +85298,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+18179)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18245)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18187, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18253, 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+18191, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18257, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -85277,7 +85313,7 @@ __3:
 	rc = Xsqlite3_prepare_v2(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
 	Xsqlite3_free(tls, zSql)
 	if rc != SQLITE_OK {
-		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
+		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
 		return rc
 	}
 	return pragmaVtabNext(tls, pVtabCursor)
@@ -85345,33 +85381,33 @@ 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+18195, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18261, 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, 137196)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137249)
 	} else {
 		var z uintptr
 		var zObj uintptr
 		if *(*uintptr)(unsafe.Pointer(azObj + 1*8)) != 0 {
 			zObj = *(*uintptr)(unsafe.Pointer(azObj + 1*8))
 		} else {
-			zObj = ts + 5008
+			zObj = ts + 5027
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18223, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18289, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*uint8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18254, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18320, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137256)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18262,
-	ts + 18269,
-	ts + 18281,
+	ts + 18328,
+	ts + 18335,
+	ts + 18347,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -85431,7 +85467,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+14140)
+				corruptSchema(tls, pData, argv, ts+14159)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 7, 0x80)
@@ -85463,13 +85499,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+18292)
+			corruptSchema(tls, pData, argv, ts+18358)
 		} 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+14140)
+				corruptSchema(tls, pData, argv, ts+14159)
 			}
 		}
 	}
@@ -85502,16 +85538,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 + 8876
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8895
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7938
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18305
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7957
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18371
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -85605,7 +85641,7 @@ __10:
 		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11775)
+		ts+11794)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __15:
@@ -85640,7 +85676,7 @@ __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)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18443)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __19:
@@ -85654,7 +85690,7 @@ __20:
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18401,
+		ts+18467,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -85927,7 +85963,7 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
 	(*Parse)(unsafe.Pointer(pParse)).Fdb = db
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1490, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1509, 0)
 	}
 }
 
@@ -85955,7 +85991,7 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, bp+16, ts+1490, 0)
+	Xsqlite3ErrorMsg(tls, bp+16, ts+1509, 0)
 __1:
 	;
 	if !(prepFlags&U32(SQLITE_PREPARE_PERSISTENT) != 0) {
@@ -85986,7 +86022,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18435, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18501, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -86016,7 +86052,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18465, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18531, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -86076,7 +86112,7 @@ __21:
 	if !((*Parse)(unsafe.Pointer(bp+16)).FzErrMsg != 0) {
 		goto __22
 	}
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3663, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3682, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 	Xsqlite3DbFree(tls, db, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
 	goto __23
 __22:
@@ -86112,7 +86148,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, 137995)
+		return Xsqlite3MisuseError(tls, 138048)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -86211,7 +86247,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, 138143)
+		return Xsqlite3MisuseError(tls, 138196)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -86534,8 +86570,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 + 10920
-		var zSp2 uintptr = ts + 10920
+		var zSp1 uintptr = ts + 10939
+		var zSp2 uintptr = ts + 10939
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -86543,13 +86579,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18484, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18550, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18514))
+var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18580))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -86724,7 +86760,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+18548, libc.VaList(bp, 0))
+					ts+18614, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -86769,7 +86805,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+18598, libc.VaList(bp+8, zName))
+						ts+18664, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -86780,7 +86816,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+18662,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18728,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -86824,7 +86860,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6586, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6605, 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.
@@ -87408,16 +87444,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18699
+		z = ts + 18765
 		break
 	case TK_INTERSECT:
-		z = ts + 18709
+		z = ts + 18775
 		break
 	case TK_EXCEPT:
-		z = ts + 18719
+		z = ts + 18785
 		break
 	default:
-		z = ts + 18726
+		z = ts + 18792
 		break
 	}
 	return z
@@ -87427,7 +87463,7 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18732, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18798, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
@@ -87453,11 +87489,11 @@ 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 {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18821, libc.VaList(bp, func() uintptr {
 		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
-			return ts + 18786
+			return ts + 18852
 		}
-		return ts + 1554
+		return ts + 1573
 	}()))
 
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
@@ -87645,8 +87681,8 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 				}
 
 				if iCol < 0 {
-					zType = ts + 1119
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16267
+					zType = ts + 1138
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16286
 				} 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))
@@ -87785,13 +87821,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16267
+				zCol = ts + 16286
 			} 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+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12080, 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))
@@ -87799,7 +87835,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+18801, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18867, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -87889,7 +87925,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16267
+					zName = ts + 16286
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -87899,7 +87935,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18867, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -87915,7 +87951,7 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18810, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18876, 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)
@@ -87998,8 +88034,6 @@ __1:
 		(*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
@@ -88014,12 +88048,15 @@ __1:
 			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
 				(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_BLOB)
 			}
+			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)
+			}
 		}
 		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
+				zType = ts + 18884
 			} else {
 				zType = uintptr(0)
 				for j = 1; j < SQLITE_N_STDTYPE; j++ {
@@ -88235,7 +88272,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18822, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18888, 0)
 	return
 __1:
 	;
@@ -88326,7 +88363,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18871, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18937, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -88346,7 +88383,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18913, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18979, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -88383,7 +88420,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18919, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18985, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -88417,11 +88454,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+18934, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19000, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
-			return ts + 1554
+			return ts + 1573
 		}
-		return ts + 18957
+		return ts + 19023
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -88522,8 +88559,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18959, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18974, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19025, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19040, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -88570,7 +88607,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18699, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18765, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -88637,7 +88674,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+18993, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19059, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -88699,7 +88736,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+18993, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19059, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -88852,10 +88889,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+19014, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19080, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19060,
+			ts+19126,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -89109,8 +89146,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+7234)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7234)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7242)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7242)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -89137,13 +89174,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+19142, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19208, 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+19153, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19219, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -89155,7 +89192,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+19158, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19224, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -89343,7 +89380,8 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 				Xsqlite3VectorErrorMsg(tls, (*SubstContext)(unsafe.Pointer(pSubst)).FpParse, pCopy)
 			} else {
 				var db uintptr = (*Parse)(unsafe.Pointer((*SubstContext)(unsafe.Pointer(pSubst)).FpParse)).Fdb
-				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 && int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN {
+				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 &&
+					(int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN || (*Expr)(unsafe.Pointer(pCopy)).FiTable != (*SubstContext)(unsafe.Pointer(pSubst)).FiNewTable) {
 					libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
 					(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_IF_NULL_ROW)
 					(*Expr)(unsafe.Pointer(bp)).FpLeft = pCopy
@@ -89383,7 +89421,7 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 								if pColl != 0 {
 									return (*CollSeq)(unsafe.Pointer(pColl)).FzName
 								}
-								return ts + 1099
+								return ts + 1118
 							}())
 					}
 
@@ -90171,12 +90209,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15164) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15183) == 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+15168) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15187) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -90242,7 +90280,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+19164, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19230, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -90325,7 +90363,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+19182, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19248, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -90454,7 +90492,7 @@ 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+19205, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19271, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 7, 0x80)
@@ -90477,7 +90515,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+19225, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19291, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -90493,7 +90531,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19268
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19334
 		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 {
@@ -90519,7 +90557,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+19291,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19357,
 					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
@@ -90530,9 +90568,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 + 19329
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19395
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19363
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19429
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -90579,7 +90617,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+19401, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19467, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -90691,7 +90729,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19405,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19471,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -90710,7 +90748,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+19444,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19510,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -90718,7 +90756,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+14733,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14752,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -90819,7 +90857,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6446
+							zSchemaName = ts + 6465
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -90834,7 +90872,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+19475, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19541, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 14, 0xc000)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 8, 0x100)
 							}
@@ -90899,7 +90937,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+19480,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19546,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -90911,7 +90949,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+12061, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12080, 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)
@@ -90930,9 +90968,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19489, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19555, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19507, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19573, 0)
 					}
 				}
 			}
@@ -90942,7 +90980,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+19527, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19593, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -91080,7 +91118,7 @@ func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect ui
 	(*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)
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSelect)).FpGroupBy)).FnExpr)
 		} 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)
 		}
@@ -91164,13 +91202,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19558, 0)
+					ts+19624, 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+19609, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19675, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -91359,19 +91397,19 @@ 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+19642,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19708,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19654
+						return ts + 19720
 					}
-					return ts + 1554
+					return ts + 1573
 				}(),
 				func() uintptr {
 					if bCover != 0 {
 						return (*Index)(unsafe.Pointer(pIdx)).FzName
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
 	}
 }
@@ -91384,7 +91422,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+7938)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7957)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -91691,7 +91729,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19677,
+		ts+19743,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -91752,7 +91790,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19731,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19797,
 		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:
@@ -91856,7 +91894,7 @@ __27:
 	if !((*SrcItem)(unsafe.Pointer(pItem1)).FcolUsed == uint64(0) && (*SrcItem)(unsafe.Pointer(pItem1)).FzName != uintptr(0)) {
 		goto __30
 	}
-	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1554, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
+	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1573, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
 __30:
 	;
 	pSub1 = (*SrcItem)(unsafe.Pointer(pItem1)).FpSelect
@@ -91894,7 +91932,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+19771, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19837, 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)
@@ -91953,7 +91991,7 @@ __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19786, libc.VaList(bp+40, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19852, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
@@ -92424,9 +92462,9 @@ __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 + 19802
+				return ts + 19868
 			}
-			return ts + 19811
+			return ts + 19877
 		}())
 
 	groupBySort = 1
@@ -92777,7 +92815,7 @@ __65:
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
 		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19802)
+	explainTempTable(tls, pParse, ts+19868)
 __146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
@@ -92860,7 +92898,7 @@ __7:
 	if !(i < nCol) {
 		goto __9
 	}
-	z = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
+	z = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
 	if !(z == uintptr(0)) {
 		goto __10
 	}
@@ -92882,7 +92920,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19820, 0)
+		ts+19886, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -92978,7 +93016,7 @@ func Xsqlite3_get_table(tls *libc.TLS, db uintptr, zSql uintptr, pazResult uintp
 		if (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
 			if pzErrMsg != 0 {
 				Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(pzErrMsg)))
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
 			}
 			Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg)
 		}
@@ -93115,7 +93153,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+19885, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19951, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -93159,7 +93197,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19931, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19997, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -93177,7 +93215,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19939, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20005, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -93189,7 +93227,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19931, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19997, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -93204,11 +93242,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19980, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20046, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
+
 __17:
 	;
 	goto trigger_cleanup
@@ -93216,22 +93255,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6400, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20006, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20072, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20044,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20110,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20081
+				return ts + 20147
 			}
-			return ts + 20088
+			return ts + 20154
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -93240,7 +93279,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20094, libc.VaList(bp+24, pTableName+8))
+		ts+20160, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -93269,9 +93308,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 6389
+			return ts + 6408
 		}
-		return ts + 5883
+		return ts + 5902
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -93389,7 +93428,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19931, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19997, 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
@@ -93422,7 +93461,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20140,
+		ts+20206,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -93447,13 +93486,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20188,
+		ts+20254,
 		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+20263, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20329, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -93709,7 +93748,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20292, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20358, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -93748,9 +93787,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 + 6389
+				return ts + 6408
 			}
-			return ts + 5883
+			return ts + 5902
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -93762,7 +93801,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20312,
+			ts+20378,
 			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)
@@ -93876,12 +93915,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20374,
+		ts+20440,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20422
+				return ts + 20488
 			}
-			return ts + 20429
+			return ts + 20495
 		}()))
 __15:
 	;
@@ -93995,7 +94034,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+20436, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20502, 0)
 	return 1
 }
 
@@ -94061,7 +94100,7 @@ func codeReturningTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab
 	}
 	Xsqlite3ExprListDelete(tls, db, (*Select)(unsafe.Pointer(bp)).FpEList)
 	pNew = sqlite3ExpandReturning(tls, pParse, (*Returning)(unsafe.Pointer(pReturning)).FpReturnEL, pTab)
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0) {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
 		libc.Xmemset(tls, bp+240, 0, uint64(unsafe.Sizeof(NameContext{})))
 		if (*Returning)(unsafe.Pointer(pReturning)).FnRetCol == 0 {
 			(*Returning)(unsafe.Pointer(pReturning)).FnRetCol = (*ExprList)(unsafe.Pointer(pNew)).FnExpr
@@ -94115,7 +94154,7 @@ func codeTriggerProgram(tls *libc.TLS, pParse uintptr, pStepList uintptr, orconf
 
 		if (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan != 0 {
 			Xsqlite3VdbeAddOp4(tls, v, OP_Trace, 0x7fffffff, 1, 0,
-				Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
+				Xsqlite3MPrintf(tls, db, ts+6099, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
 				-6)
 		}
 
@@ -94225,7 +94264,7 @@ 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+20478, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20544, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
@@ -94818,7 +94857,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20492,
+		ts+20558,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -94850,7 +94889,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20528, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20594, 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:
@@ -94860,7 +94899,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7713
+				return ts + 7732
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -95176,7 +95215,12 @@ __74:
 	goto __77
 __76:
 	flags = WHERE_ONEPASS_DESIRED
-	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) && !(pTrigger != 0) && !(hasFK != 0) && !(chngKey != 0) && !(*(*int32)(unsafe.Pointer(bp + 104)) != 0)) {
+	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) &&
+		!(pTrigger != 0) &&
+		!(hasFK != 0) &&
+		!(chngKey != 0) &&
+		!(*(*int32)(unsafe.Pointer(bp + 104)) != 0) &&
+		(*NameContext)(unsafe.Pointer(bp+40)).FncFlags&NC_Subquery == 0) {
 		goto __78
 	}
 	flags = flags | WHERE_ONEPASS_MULTIROW
@@ -95730,7 +95774,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20547)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20613)
 __169:
 	;
 update_cleanup:
@@ -96036,10 +96080,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+20560, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]uint8{})), bp+216, ts+20626, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20564, libc.VaList(bp+8, bp+216))
+				ts+20630, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -96130,7 +96174,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+12150, -1)
+				ts+12169, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -96162,7 +96206,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+20637, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20641, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20703, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20707, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -96310,14 +96354,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+20645)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20711)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20685)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20751)
 	return SQLITE_ERROR
 __2:
 	;
@@ -96328,7 +96372,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20728)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20794)
 	return SQLITE_ERROR
 __5:
 	;
@@ -96337,7 +96381,7 @@ __5:
 	*(*uint32)(unsafe.Pointer(db + 76)) |= uint32(SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE)
 	goto __4
 __3:
-	zOut = ts + 1554
+	zOut = ts + 1573
 __4:
 	;
 	saved_flags = (*Sqlite3)(unsafe.Pointer(db)).Fflags
@@ -96356,7 +96400,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20746, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20812, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -96376,7 +96420,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20769)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20835)
 	goto end_of_vacuum
 __8:
 	;
@@ -96391,7 +96435,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14503)
+	rc = execSql(tls, db, pzErrMsg, ts+14522)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -96436,7 +96480,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20796,
+		ts+20862,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -96445,7 +96489,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20904,
+		ts+20970,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -96456,7 +96500,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20958,
+		ts+21024,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -96467,7 +96511,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21109,
+		ts+21175,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -96812,7 +96856,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+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12396, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -96896,11 +96940,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+21239, libc.VaList(bp, pParse+272))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21305, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21263,
+			ts+21329,
 			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,
@@ -96910,7 +96954,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21428, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -96971,7 +97015,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+21381, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21447, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -96999,9 +97043,11 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FbDeclared = 0
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = bp + 32
+	(*Table)(unsafe.Pointer(pTab)).FnTabRef++
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{xConstruct})).f(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, pVTable+16, bp+64)
+	Xsqlite3DeleteTable(tls, db, pTab)
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = (*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -97009,9 +97055,9 @@ 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+21423, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21489, libc.VaList(bp+8, zModuleName))
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3682, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 		}
 		Xsqlite3DbFree(tls, db, pVTable)
@@ -97021,7 +97067,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 + 21453
+			var zFormat uintptr = ts + 21519
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -97033,12 +97079,12 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 			*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) = pVTable
 
 			for iCol = 0; iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol); iCol++ {
-				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1554)
+				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1573)
 				var nType int32
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16158, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16177, 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
@@ -97095,13 +97141,13 @@ 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+21499, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21565, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxConnect, bp+16)
 		if rc != SQLITE_OK {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 		}
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 16)))
@@ -97153,7 +97199,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+21499, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21565, 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)
@@ -97187,7 +97233,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, 151030)
+		return Xsqlite3MisuseError(tls, 151102)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -97229,7 +97275,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR,
 			func() uintptr {
 				if (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
-					return ts + 3663
+					return ts + 3682
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg))
@@ -97597,7 +97643,7 @@ func Xsqlite3VtabEponymousTableInit(tls *libc.TLS, pParse uintptr, pMod uintptr)
 	addModuleArgument(tls, pParse, pTab, Xsqlite3DbStrDup(tls, db, (*Table)(unsafe.Pointer(pTab)).FzName))
 	rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer(pModule)).FxConnect, bp+8)
 	if rc != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+		Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		Xsqlite3VtabEponymousTableClear(tls, db, pMod)
 	}
@@ -97640,7 +97686,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, 151521)
+		rc = Xsqlite3MisuseError(tls, 151593)
 	} else {
 		ap = va
 		switch op {
@@ -97667,7 +97713,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 151539)
+				rc = Xsqlite3MisuseError(tls, 151611)
 				break
 
 			}
@@ -97898,10 +97944,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 + 21518
+		return ts + 21584
 	}
 	if i == -1 {
-		return ts + 16267
+		return ts + 16286
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -97910,35 +97956,35 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21525, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21591, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21597, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12786, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 	}
 
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21597, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12786, 1)
 		}
-		Xsqlite3_str_append(tls, pStr, ts+5008, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5027, 1)
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 	}
 }
 
@@ -97955,29 +98001,29 @@ 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+21533, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21599, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21525, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21591, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21536
+				return ts + 21602
 			}
-			return ts + 21541
+			return ts + 21607
 		}(), 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+21549)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21615)
 		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+21551)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21617)
 	}
-	Xsqlite3_str_append(tls, pStr, ts+4957, 1)
+	Xsqlite3_str_append(tls, pStr, ts+4976, 1)
 }
 
 // This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
@@ -98018,11 +98064,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+21553, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21619, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21559
+				return ts + 21625
 			}
-			return ts + 21566
+			return ts + 21632
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -98032,43 +98078,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 + 10976
+					zFmt = ts + 10995
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21571
+				zFmt = ts + 21637
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21604
+				zFmt = ts + 21670
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21629
+				zFmt = ts + 21695
 			} else {
-				zFmt = ts + 21647
+				zFmt = ts + 21713
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21656, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21722, 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 + 16267
-			Xsqlite3_str_appendf(tls, bp+64, ts+21664, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16286
+			Xsqlite3_str_appendf(tls, bp+64, ts+21730, 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+21695, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21761, 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+21705, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21771, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21710,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21776,
 				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+21737, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21803, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -98100,25 +98146,25 @@ 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+21748, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21814, 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+21536, 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+21602, 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+21769, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21835, 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+21525, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21591, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21602, libc.VaList(bp+16, z))
 		}
 	}
-	Xsqlite3_str_append(tls, bp+24, ts+4957, 1)
+	Xsqlite3_str_append(tls, bp+24, ts+4976, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
@@ -99712,7 +99758,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21777, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21843, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -99740,7 +99786,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21792, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21858, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -100258,7 +100304,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+21801, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21867, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -100616,10 +100662,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{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)},
+	{FzOp: ts + 16135, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15466, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14986, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21881, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -101109,12 +101155,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21888, 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+21822, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21888, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -101193,7 +101239,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 + 6769
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7718
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -101287,7 +101333,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 21863
+				return ts + 21929
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -101663,7 +101709,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21870,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21936,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -101679,7 +101725,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 		pRhs = Xsqlite3PExpr(tls, pParse, TK_UPLUS,
 			Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*ExprList_item)(unsafe.Pointer(pArgs+8+uintptr(j)*32)).FpExpr, 0), uintptr(0))
 		pTerm = Xsqlite3PExpr(tls, pParse, TK_EQ, pColRef, pRhs)
-		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ|JT_RIGHT) != 0 {
 			joinType = U32(EP_OuterON)
 		} else {
 			joinType = U32(EP_InnerON)
@@ -102397,7 +102443,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21906, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21972, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -102468,7 +102514,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21932
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21998
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -102642,6 +102688,10 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	var iCur int32
+	var saved_pIdxEpr uintptr
+
+	saved_pIdxEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 
 	addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	for __ccgo := true; __ccgo; __ccgo = iLevel < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel) {
@@ -102685,9 +102735,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, n)
 			var jj int32
 			for jj = 0; jj < n; jj++ {
-				var iCol int32 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(jj)*2)))
-
-				Xsqlite3ExprCodeGetColumnOfTable(tls, v, (*Index)(unsafe.Pointer(pIdx)).FpTable, iCur, iCol, r1+jj)
+				Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pIdx, iCur, jj, r1+jj)
 			}
 			Xsqlite3VdbeAddOp4Int(tls, v, OP_FilterAdd, (*WhereLevel)(unsafe.Pointer(pLevel)).FregFilter, 0, r1, n)
 			Xsqlite3ReleaseTempRange(tls, pParse, r1, n)
@@ -102721,6 +102769,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 		}
 	}
 	Xsqlite3VdbeJumpHere(tls, v, addrOnce)
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = saved_pIdxEpr
 }
 
 func allocateIndexInfo(tls *libc.TLS, pWInfo uintptr, pWC uintptr, mUnusable Bitmask, pSrc uintptr, pmNoOmit uintptr) uintptr {
@@ -102834,7 +102883,7 @@ __3:
 		uint64(unsafe.Sizeof(sqlite3_index_orderby{}))*uint64(nOrderBy)+uint64(unsafe.Sizeof(HiddenIndexInfo1{}))+
 		uint64(unsafe.Sizeof(uintptr(0)))*uint64(nTerm))
 	if pIdxInfo == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1490, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1509, 0)
 		return uintptr(0)
 	}
 	pHidden = pIdxInfo + 1*96
@@ -102956,9 +103005,9 @@ func vtabBestIndex(tls *libc.TLS, pParse uintptr, pTab uintptr, p uintptr) int32
 		if rc == SQLITE_NOMEM {
 			Xsqlite3OomFault(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb)
 		} else if !(int32((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3663, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3682, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
 		}
 	}
 	Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg)
@@ -102979,11 +103028,16 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 
 	_ = pParse
 
+	if !((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0xc000>>14) == SQLITE_IDXTYPE_PRIMARYKEY {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol)
+	} else {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnColumn)
+	}
 	nField = func() int32 {
-		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < (*Index)(unsafe.Pointer(pIdx)).FnSample {
+		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < nField {
 			return int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField)
 		}
-		return (*Index)(unsafe.Pointer(pIdx)).FnSample
+		return nField
 	}()
 	iCol = 0
 	iSample = (*Index)(unsafe.Pointer(pIdx)).FnSample * nField
@@ -104564,7 +104618,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+21943, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+22009, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -104622,7 +104676,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+21943, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+22009, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -105020,7 +105074,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+21969, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+22035, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -105627,7 +105681,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22004, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22070, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -105662,6 +105716,10 @@ __3:
 			if int32((*WherePath)(unsafe.Pointer(pFrom)).FisOrdered) == (*ExprList)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpOrderBy)).FnExpr {
 				(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_ORDERED)
 			}
+			if (*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy != 0 &&
+				int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) > (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr {
+				(*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat = I8((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr)
+			}
 		} else {
 			(*WhereInfo)(unsafe.Pointer(pWInfo)).FrevMask = (*WherePath)(unsafe.Pointer(pFrom)).FrevLoop
 			if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) <= 0 {
@@ -105956,6 +106014,9 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
+		if Xsqlite3IndexAffinityStr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pIdx) != 0 {
+			(*IndexedExpr)(unsafe.Pointer(p)).Faff = *(*uint8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FzColAff + uintptr(i)))
+		}
 		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
@@ -106108,7 +106169,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22022, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22088, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -106172,7 +106233,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22050, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22116, 0)
 	goto __5
 __4:
 	ii = 0
@@ -107054,7 +107115,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22068, -1)
+		pCtx, ts+22134, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -107187,7 +107248,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+22124, -1)
+					pCtx, ts+22190, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -107277,17 +107338,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-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))
+var row_numberName = *(*[11]uint8)(unsafe.Pointer(ts + 22235))
+var dense_rankName = *(*[11]uint8)(unsafe.Pointer(ts + 22246))
+var rankName = *(*[5]uint8)(unsafe.Pointer(ts + 22257))
+var percent_rankName = *(*[13]uint8)(unsafe.Pointer(ts + 22262))
+var cume_distName = *(*[10]uint8)(unsafe.Pointer(ts + 22275))
+var ntileName = *(*[6]uint8)(unsafe.Pointer(ts + 22285))
+var last_valueName = *(*[11]uint8)(unsafe.Pointer(ts + 22291))
+var nth_valueName = *(*[10]uint8)(unsafe.Pointer(ts + 22302))
+var first_valueName = *(*[12]uint8)(unsafe.Pointer(ts + 22312))
+var leadName = *(*[5]uint8)(unsafe.Pointer(ts + 22324))
+var lagName = *(*[4]uint8)(unsafe.Pointer(ts + 22329))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -107333,7 +107394,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22267, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22333, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -107377,12 +107438,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+22286, 0)
+			ts+22352, 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+22357, 0)
+				ts+22423, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -107405,7 +107466,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+7938)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7957)
 					}
 					break
 				}
@@ -107611,7 +107672,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+22420, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22486, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -107727,7 +107788,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+7530))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7538))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -107842,7 +107903,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22446, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22512, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -107907,15 +107968,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 + 22478
+				zErr = ts + 22544
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22495
+				zErr = ts + 22561
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22511
+				zErr = ts + 22577
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22531, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22597, 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 {
@@ -107936,7 +107997,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+22564, 0)
+				ts+22630, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -108074,7 +108135,7 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regZero)
 	if eCond >= WINDOW_STARTING_NUM {
 		var regString int32 = Xsqlite3GetTempReg(tls, pParse)
-		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1554, -1)
+		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1573, -1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, Xsqlite3VdbeCurrentAddr(tls, v)+2, reg)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL))
 
@@ -108092,11 +108153,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22611,
-	ts + 22664,
-	ts + 22068,
-	ts + 22715,
-	ts + 22767,
+	ts + 22677,
+	ts + 22730,
+	ts + 22134,
+	ts + 22781,
+	ts + 22833,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -108587,7 +108648,7 @@ func windowCodeRangeTest(tls *libc.TLS, p uintptr, op int32, csr1 int32, regVal
 
 	}
 
-	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1554, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1573, -1)
 	addrGe = Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, 0, reg1)
 
 	if op == OP_Ge && arith == OP_Add || op == OP_Le && arith == OP_Subtract {
@@ -109491,19 +109552,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+22817,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22883,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 22859
+							return ts + 22925
 						}
-						return ts + 22868
+						return ts + 22934
 					}(),
 						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+22874, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22940, 0)
 		}
 	}
 
@@ -109571,7 +109632,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+22908,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22974,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -110668,7 +110729,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22946, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23012, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -111643,21 +111704,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+16267, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16286, 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+22968, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23034, 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+16180, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16199, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23034, 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))
@@ -112400,7 +112461,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+22995)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+23061)
 				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 {
@@ -112564,7 +112625,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+23004, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23070, 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))
@@ -112781,9 +112842,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 + 6764
+							return ts + 7713
 						}
-						return ts + 6769
+						return ts + 7718
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -113067,19 +113128,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+23028, 0)
+					ts+23094, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23123, 0)
+					ts+23189, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23207, 0)
+					ts+23273, 0)
 			}
 			break
 		case uint32(273):
@@ -113458,9 +113519,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+23004, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23070, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23292, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23358, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -114228,7 +114289,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+23309, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23375, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -114249,9 +114310,9 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 	}
 	if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg != 0 || (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_OK && (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_DONE {
 		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)))
+			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3682, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23334, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23400, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -114424,7 +114485,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23411, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -114437,11 +114498,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19931, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19997, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23352, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23418, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23357, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23423, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -114454,9 +114515,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23367, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23433, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23371, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23437, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -114531,7 +114592,8 @@ func sqlite3TestExtInit(tls *libc.TLS, db uintptr) int32 {
 	return Xsqlite3FaultSim(tls, 500)
 }
 
-var sqlite3BuiltinExtensions = [4]uintptr{
+var sqlite3BuiltinExtensions = [5]uintptr{
+	0,
 	0,
 	0,
 	0,
@@ -114695,7 +114757,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 174337)
+		return Xsqlite3MisuseError(tls, 174426)
 	}
 
 	ap = va
@@ -115270,7 +115332,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175111)
+		return Xsqlite3MisuseError(tls, 175200)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -115285,7 +115347,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23379, 0)
+			ts+23445, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -115476,23 +115538,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 + 23447
+	var zErr uintptr = ts + 23513
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23461
+			zErr = ts + 23527
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23483
+			zErr = ts + 23549
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23505
+			zErr = ts + 23571
 			break
 
 		}
@@ -115510,35 +115572,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23528,
-	ts + 23541,
+	ts + 23594,
+	ts + 23607,
 	uintptr(0),
-	ts + 23557,
-	ts + 23582,
-	ts + 23596,
-	ts + 23615,
-	ts + 1490,
-	ts + 23640,
-	ts + 23677,
-	ts + 23689,
-	ts + 23704,
-	ts + 23737,
+	ts + 23623,
+	ts + 23648,
+	ts + 23662,
+	ts + 23681,
+	ts + 1509,
+	ts + 23706,
+	ts + 23743,
 	ts + 23755,
-	ts + 23780,
-	ts + 23809,
+	ts + 23770,
+	ts + 23803,
+	ts + 23821,
+	ts + 23846,
+	ts + 23875,
 	uintptr(0),
-	ts + 5838,
-	ts + 5334,
-	ts + 23826,
-	ts + 23844,
-	ts + 23862,
+	ts + 5857,
+	ts + 5353,
+	ts + 23892,
+	ts + 23910,
+	ts + 23928,
 	uintptr(0),
-	ts + 23896,
+	ts + 23962,
 	uintptr(0),
-	ts + 23917,
-	ts + 23943,
-	ts + 23966,
-	ts + 23987,
+	ts + 23983,
+	ts + 24009,
+	ts + 24032,
+	ts + 24053,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -115659,7 +115721,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, 175758)
+		return Xsqlite3MisuseError(tls, 175847)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -115709,7 +115771,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+24003, 0)
+				ts+24069, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -115831,7 +115893,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+24066, libc.VaList(bp, zName))
+		ts+24132, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -115859,7 +115921,7 @@ func Xsqlite3_overload_function(tls *libc.TLS, db uintptr, zName uintptr, nArg i
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, zName))
+	zCopy = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, zName))
 	if zCopy == uintptr(0) {
 		return SQLITE_NOMEM
 	}
@@ -116067,7 +116129,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+24117, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24183, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -116160,7 +116222,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, 176503))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176592))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -116230,7 +116292,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, 176582)
+		return Xsqlite3MisuseError(tls, 176671)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -116240,7 +116302,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, 176591)
+		return Xsqlite3MisuseError(tls, 176680)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -116277,14 +116339,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		}()
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 176639)
+		return Xsqlite3MisuseError(tls, 176728)
 	}
 
 	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+24138, 0)
+				ts+24204, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -116414,7 +116476,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+24206, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24272, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -116459,10 +116521,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24212, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24278, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24222,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24288,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -116567,7 +116629,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24250, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24316, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -116578,17 +116640,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24254, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24320, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24254
+	zModeType = ts + 24320
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24260, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24326, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -116596,7 +116658,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 3272
+	zModeType = ts + 3291
 __32:
 	;
 	if !(aMode != 0) {
@@ -116626,7 +116688,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24265, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24331, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -116634,7 +116696,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24285,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24351,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -116674,7 +116736,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24309, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24375, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -116698,15 +116760,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24325, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24332, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24391, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24398, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{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},
+	{Fz: ts + 24406, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24409, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24412, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17381, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -116852,10 +116914,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+21863, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21929, 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+24350, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24416, 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) {
@@ -116869,7 +116931,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 177308)
+	rc = Xsqlite3MisuseError(tls, 177397)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -116886,7 +116948,7 @@ __19:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -116920,9 +116982,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 + 6441
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6460
 	(*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 + 23352
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23418
 	(*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)
@@ -117027,7 +117089,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24356
+		zFilename = ts + 24422
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, func() uint8 {
@@ -117145,21 +117207,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+24359,
+	Xsqlite3_log(tls, iErr, ts+24425,
 		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+24384)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24450)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24404)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24470)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24411)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24477)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -117270,7 +117332,7 @@ __4:
 	autoinc = libc.Bool32(int32((*Table)(unsafe.Pointer(pTab)).FiPKey) == iCol && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != U32(0))
 	goto __13
 __12:
-	zDataType = ts + 1119
+	zDataType = ts + 1138
 	primarykey = 1
 __13:
 	;
@@ -117317,14 +117379,14 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24428, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24494, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3663
+			return ts + 3682
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -117973,7 +118035,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24456, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24522, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -118091,7 +118153,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 + 24464
+			return ts + 24530
 		}
 		return uintptr(0)
 	}(), 0)
@@ -118269,7 +118331,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6181, ts + 6764, ts + 6769, ts + 6191, ts + 6186, ts + 8005, ts + 24487, ts + 24493,
+	ts + 6200, ts + 7713, ts + 7718, ts + 6210, ts + 6205, ts + 8024, ts + 24553, ts + 24559,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -118422,7 +118484,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 + 24500 + uintptr(int32(c)&0xf)))
+	c = *(*uint8)(unsafe.Pointer(ts + 24566 + uintptr(int32(c)&0xf)))
 __8:
 	;
 __6:
@@ -118448,7 +118510,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	switch Xsqlite3_value_type(tls, pValue) {
 	case SQLITE_NULL:
 		{
-			jsonAppendRaw(tls, p, ts+6181, uint32(4))
+			jsonAppendRaw(tls, p, ts+6200, uint32(4))
 			break
 
 		}
@@ -118477,7 +118539,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+24517, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24583, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -118535,19 +118597,19 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 	switch int32((*JsonNode)(unsafe.Pointer(pNode)).FeType) {
 	default:
 		{
-			jsonAppendRaw(tls, pOut, ts+6181, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6200, uint32(4))
 			break
 
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6764, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+7713, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6769, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+7718, uint32(5))
 			break
 
 		}
@@ -119092,17 +119154,17 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		}
 		return int32(j + U32(1))
 	} else if int32(c) == 'n' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6181, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6200, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(z + uintptr(i+U32(4))))])&0x06 != 0) {
 		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+6764, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7713, 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+6769, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7718, 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))
@@ -119203,7 +119265,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+24546, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24612, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -119509,7 +119571,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+24561, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24627, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -119524,7 +119586,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24565, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24631, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -119578,7 +119640,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+24591,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24657,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -119683,11 +119745,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+24634, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24700, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
-					jsonAppendRaw(tls, bp, ts+4998, uint32(2))
+					jsonAppendRaw(tls, bp, ts+5017, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24637, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24703, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, uint8(0))
 				}
@@ -119728,7 +119790,7 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if pNode != 0 {
 				jsonRenderNode(tls, pNode, bp, uintptr(0))
 			} else {
-				jsonAppendRaw(tls, bp, ts+6181, uint32(4))
+				jsonAppendRaw(tls, bp, ts+6200, uint32(4))
 			}
 		}
 		if i == argc {
@@ -119844,14 +119906,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24640, -1)
+			ts+24706, -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+24691, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24757, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -119946,7 +120008,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15380)
+	jsonWrongNumArgs(tls, ctx, ts+15399)
 	return
 __2:
 	;
@@ -120021,9 +120083,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24725
+			return ts + 24791
 		}
-		return ts + 24729
+		return ts + 24795
 	}())
 	return
 __2:
@@ -120156,7 +120218,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24736, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24802, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -120253,7 +120315,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24739, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24805, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -120297,7 +120359,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24742)
+		ts+24808)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -120428,7 +120490,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24825, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24891, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -120447,7 +120509,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+24831, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24897, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -120543,7 +120605,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+24831, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24897, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -120567,7 +120629,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 + 24836
+				zRoot = ts + 24902
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -120689,7 +120751,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+24546, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24612, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -120784,25 +120846,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{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 + 24904},
+	{FnArg: int8(-1), 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(2), 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 + 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}}
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24951},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24954},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24958},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24970},
+	{FnArg: int8(2), 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_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24993},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25004},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25016},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 25029},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25038},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25038},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25048},
+	{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 + 25059},
+	{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 + 25076}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -120821,8 +120883,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 25028, FpModule: 0},
-	{FzName: ts + 25038, FpModule: 0},
+	{FzName: ts + 25094, FpModule: 0},
+	{FzName: ts + 25104, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -121082,11 +121144,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+25048, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25114, 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+25056, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25122, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -121297,7 +121359,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+25061,
+		ts+25127,
 		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))
@@ -121995,7 +122057,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25143)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25209)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -122207,7 +122269,7 @@ func rtreeBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 2
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FneedToFreeIdxStr = 1
-	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, bp+8))) {
+	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, bp+8))) {
 		return SQLITE_NOMEM
 	}
 
@@ -123336,7 +123398,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25157, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25223, 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 {
@@ -123348,12 +123410,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+25177, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25243, 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+25209, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25275, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -123579,7 +123641,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+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))
+		ts+25312, 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))
@@ -123602,14 +123664,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25391
+	var zFmt uintptr = ts + 25457
 	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+11348, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11367, 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 {
@@ -123650,7 +123712,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25447, ts + 5060, ts + 16267,
+	ts + 25513, ts + 5079, ts + 16286,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -123693,19 +123755,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+25452,
+			ts+25518,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25514, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25580, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25519,
+			ts+25585,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25583,
+			ts+25649,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25653,
+			ts+25719,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -123734,7 +123796,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 + 25702
+			zFormat = ts + 25768
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -123746,7 +123808,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+25810,
+			ts+25876,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -123754,18 +123816,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+25855, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25921, 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+12767, 1)
+					Xsqlite3_str_append(tls, p, ts+12786, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25882, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25948, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25904, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25970, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25912, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25978, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -123780,14 +123842,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25928,
-	ts + 25981,
-	ts + 26026,
-	ts + 26078,
-	ts + 26132,
-	ts + 26177,
-	ts + 26235,
-	ts + 26290,
+	ts + 25994,
+	ts + 26047,
+	ts + 26092,
+	ts + 26144,
+	ts + 26198,
+	ts + 26243,
+	ts + 26301,
+	ts + 26356,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -123816,7 +123878,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+26337, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26403, 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
@@ -123824,19 +123886,19 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 				(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = 4 + int32((*Rtree)(unsafe.Pointer(pRtree)).FnBytesPerCell)*RTREE_MAXCELLS
 			}
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26357,
+			ts+26423,
 			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 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26414,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26480,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -123878,16 +123940,16 @@ 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 + 26449,
-		ts + 26492,
-		ts + 26527,
-		ts + 26563,
+		ts + 26515,
+		ts + 26558,
+		ts + 26593,
+		ts + 26629,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
 		goto __1
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
 	return SQLITE_ERROR
 __1:
 	;
@@ -123912,7 +123974,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+26600,
+	Xsqlite3_str_appendf(tls, pSql, ts+26666,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -123924,7 +123986,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26624, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26690, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -123947,7 +124009,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26696, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -123958,14 +124020,14 @@ __10:
 	if !(ii < argc) {
 		goto __12
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
 	rc = SQLITE_ERROR
 	goto __13
 __12:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __14
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
 __14:
 	;
 __13:
@@ -124008,7 +124070,7 @@ __17:
 	if !(iErr != 0) {
 		goto __22
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
 	goto rtreeInit_fail
 __22:
 	;
@@ -124025,7 +124087,7 @@ __23:
 	if !(rc != 0) {
 		goto __24
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
 	goto rtreeInit_fail
 __24:
 	;
@@ -124043,7 +124105,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26633, ts + 26644}
+var azFormat = [2]uintptr{ts + 26699, ts + 26710}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -124081,13 +124143,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+10920, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10939, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26654, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26720, 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+26660, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26726, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26664, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26730, 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})))
@@ -124098,7 +124160,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+26666, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26732, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -124176,12 +124238,12 @@ 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+26699,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26765,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
-						return ts + 4062
+						return ts + 4081
 					}
-					return ts + 1554
+					return ts + 1573
 				}(), z))
 			if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport == uintptr(0) {
 				(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
@@ -124200,7 +124262,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+26706,
+			ts+26772,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -124219,7 +124281,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+26751, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26817, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -124233,8 +124295,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 + 26783,
-		ts + 26837,
+		ts + 26849,
+		ts + 26903,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -124249,23 +124311,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+26885,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26951,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26930
+					return ts + 26996
 				}
-				return ts + 26938
+				return ts + 27004
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26947,
+				ts+27013,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26930
+						return ts + 26996
 					}
-					return ts + 26938
+					return ts + 27004
 				}(), iKey, iVal))
 		}
 	}
@@ -124289,7 +124351,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+27005, libc.VaList(bp, i, iCell, iNode))
+				ts+27071, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -124309,7 +124371,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+27053, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27119, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -124326,14 +124388,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+27120, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27186, 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+27154, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27220, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -124341,7 +124403,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+27184,
+					ts+27250,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -124370,14 +124432,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+27239,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27305,
 			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+27270, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27336, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -124399,12 +124461,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+14503, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14522, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27337, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27403, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -124413,12 +124475,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25157, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25223, 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+27365, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27431, 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)
 		}
@@ -124432,8 +124494,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+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27403, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27462, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27469, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -124441,7 +124503,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+27411, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27477, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -124456,7 +124518,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27415, -1)
+			ts+27481, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -124464,7 +124526,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6441
+			zDb = ts + 6460
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -124474,7 +124536,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 + 18012
+				return ts + 18078
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -124845,11 +124907,11 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		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+27466, 1)
+		Xsqlite3_str_append(tls, x, ts+27532, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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+27534, 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+27479, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27545, 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)
 	}
@@ -124869,19 +124931,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+27490, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27556, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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)))))
+			Xsqlite3_str_appendf(tls, x, ts+27574, 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+27516, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27582, 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+27524, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27590, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27528, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27594, 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)
 	}
@@ -125801,7 +125863,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+27541, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27607, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -125810,7 +125872,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27563, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27629, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -125818,7 +125880,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26696, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -125829,7 +125891,7 @@ __5:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __7
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
 __7:
 	;
 __6:
@@ -125854,7 +125916,7 @@ __9:
 	if !(rc != 0) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	goto geopolyInit_fail
 __10:
 	;
@@ -126045,7 +126107,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 + 16267
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16286
 		(*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
@@ -126055,7 +126117,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 + 27567
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27633
 		(*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
@@ -126063,7 +126125,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 + 27573
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27639
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -126175,7 +126237,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27582, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27648, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -126307,14 +126369,14 @@ geopoly_update_end:
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
 	_ = pVtab
 	_ = nArg
-	if Xsqlite3_stricmp(tls, zName, ts+27622) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27688) == 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+27638) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27704) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -126379,7 +126441,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+27653, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27719, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -126391,25 +126453,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{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},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27727},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27740},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27753},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27766},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27704},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27778},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27688},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27801},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27815},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27828},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27842},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27858},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27804},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27870},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -126419,26 +126481,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27823, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27889, 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+27833, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27899, 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+27844, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27910, -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+27567, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27633, 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+27855, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27921, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -126492,7 +126554,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+25143, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25209, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -126819,7 +126881,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+27865, -1)
+		Xsqlite3_result_error(tls, context, ts+27931, -1)
 		return
 	}
 
@@ -126830,7 +126892,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+27865, -1)
+			Xsqlite3_result_error(tls, context, ts+27931, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -126843,7 +126905,7 @@ func prepareAndCollectError(tls *libc.TLS, db uintptr, ppStmt uintptr, pzErrmsg
 
 	var rc int32 = Xsqlite3_prepare_v2(tls, db, zSql, -1, ppStmt, uintptr(0))
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 		*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	}
 	return rc
@@ -126855,7 +126917,7 @@ func resetAndCollectError(tls *libc.TLS, pStmt uintptr, pzErrmsg uintptr) int32
 
 	var rc int32 = Xsqlite3_reset(tls, pStmt)
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
 	}
 	return rc
 }
@@ -126931,7 +126993,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+27886, uintptr(0), uintptr(0), p+64)
+				ts+27952, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -126995,7 +127057,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+25056, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25122, 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++ {
 				}
@@ -127016,16 +127078,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+28057, libc.VaList(bp, func() uintptr {
+			ts+28123, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28207
+					return ts + 28273
 				}
-				return ts + 1554
+				return ts + 1573
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28248)
+			ts+28314)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -127123,7 +127185,7 @@ func rbuFinalize(tls *libc.TLS, p uintptr, pStmt uintptr) {
 	var rc int32 = Xsqlite3_finalize(tls, pStmt)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && rc != SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 	}
 }
 
@@ -127141,7 +127203,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+28373, libc.VaList(bp, zTab)))
+			ts+28439, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -127159,7 +127221,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+28492, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28558, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -127177,7 +127239,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28513, libc.VaList(bp+16, zIdx)))
+			ts+28579, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -127200,7 +127262,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+28564, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28630, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -127246,7 +127308,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+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28651, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -127261,7 +127323,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+28613, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28679, 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 {
@@ -127301,7 +127363,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+19489, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19555, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -127311,18 +127373,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+28642, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28708, 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+28661, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28727, 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+28666, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28732, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -127334,18 +127396,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+28676, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28742, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28705
+							return ts + 28771
 						}
-						return ts + 28718
+						return ts + 28784
 					}()))
 		}
 
 		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+28727, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28793, 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)
@@ -127359,7 +127421,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+28749,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28815,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -127402,12 +127464,12 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	defer tls.Free(24)
 
 	var zList uintptr = uintptr(0)
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	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+28776, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14614
+		zList = rbuMPrintf(tls, p, ts+28842, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14633
 	}
 	return zList
 }
@@ -127418,13 +127480,13 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 
 	var iPk int32 = 1
 	var zRet uintptr = uintptr(0)
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	for 1 != 0 {
 		var i int32
 		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+28785, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28851, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -127446,25 +127508,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+28798, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28864, 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+28830, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28896, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		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)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+28919)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28925, ts+28932, ts+4976)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+1573)
 
 		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+28874,
+					ts+28940,
 					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+28916, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28982, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -127501,12 +127563,12 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	zVector = uintptr(0)
 	zRet = uintptr(0)
 	bFailed = 0
-	zSep = ts + 1554
+	zSep = ts + 1573
 	iCol = 0
 	*(*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+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28679, 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
@@ -127541,7 +127603,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 28936
+	zCol = ts + 29002
 __7:
 	;
 	goto __5
@@ -127549,13 +127611,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28944,
+	zLhs = rbuMPrintf(tls, p, ts+29010,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28965,
+	zOrder = rbuMPrintf(tls, p, ts+29031,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+29001,
+	zSelect = rbuMPrintf(tls, p, ts+29067,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14614
+	zSep = ts + 14633
 	iCol++
 	goto __1
 __2:
@@ -127573,12 +127635,12 @@ __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+29028,
+		Xsqlite3_mprintf(tls, ts+29094,
 			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
 	}
-	zSep = ts + 1554
+	zSep = ts + 1573
 	iCol = 0
 __14:
 	if !(iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnCol) {
@@ -127600,8 +127662,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14614
+	zVector = rbuMPrintf(tls, p, ts+29142, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14633
 	goto __15
 __15:
 	iCol++
@@ -127612,7 +127674,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29083, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29149, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -127639,13 +127701,13 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 	var zImpPK uintptr = uintptr(0)
 	var zWhere uintptr = uintptr(0)
 	var nBind int32 = 0
-	var zCom uintptr = ts + 1554
-	var zAnd uintptr = ts + 1554
+	var zCom uintptr = ts + 1573
+	var zAnd uintptr = ts + 1573
 	*(*uintptr)(unsafe.Pointer(bp + 200)) = uintptr(0)
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -127657,9 +127719,9 @@ 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+29095, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29161, 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
+			zType = ts + 1573
 		} else {
 			if iCid < 0 {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK {
@@ -127669,37 +127731,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 + 28936
+					zCol = ts + 29002
 				} else {
-					zCol = ts + 28666
+					zCol = ts + 28732
 				}
-				zType = ts + 1119
+				zType = ts + 1138
 			} 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+29117, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29183, 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 + 28853
+					return ts + 28919
 				}
-				return ts + 1554
+				return ts + 1573
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29137,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29203,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29158,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29224,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29191, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29257, 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 + 14614
-		zAnd = ts + 21525
+		zCom = ts + 14633
+		zAnd = ts + 21591
 		nBind++
 	}
 
@@ -127733,16 +127795,16 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 
 	var zList uintptr = uintptr(0)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
-		var zS uintptr = ts + 1554
+		var zS uintptr = ts + 1573
 		var i int32
 		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+29215, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29281, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29227, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29293, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14614
+			zS = ts + 14633
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -127750,7 +127812,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+29236, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29302, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -127762,27 +127824,27 @@ 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+29251, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29317, 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 zSep uintptr = ts + 1573
 		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+29265, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21525
+				zList = rbuMPrintf(tls, p, ts+29331, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21591
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29277, libc.VaList(bp+40, zList))
+			ts+29343, libc.VaList(bp+40, zList))
 
 	} else {
-		var zSep uintptr = ts + 1554
+		var zSep uintptr = ts + 1573
 		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 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29327, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21525
+				zList = rbuMPrintf(tls, p, ts+29393, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21591
 			}
 		}
 	}
@@ -127791,7 +127853,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+29340, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29406, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -127805,21 +127867,21 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 		if int32(libc.Xstrlen(tls, zMask)) != (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 			rbuBadControlError(tls, p)
 		} else {
-			var zSep uintptr = ts + 1554
+			var zSep uintptr = ts + 1573
 			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+29327,
+					zList = rbuMPrintf(tls, p, ts+29393,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14614
+					zSep = ts + 14633
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29366,
+					zList = rbuMPrintf(tls, p, ts+29432,
 						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 + 14614
+					zSep = ts + 14633
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29396,
+					zList = rbuMPrintf(tls, p, ts+29462,
 						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 + 14614
+					zSep = ts + 14633
 				}
 			}
 		}
@@ -127854,19 +127916,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 + 29433
+		var zSep uintptr = ts + 29499
 		*(*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+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28651, 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+16155) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16174) == 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+28613, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -127878,15 +127940,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 + 28853
+					zDesc = ts + 28919
 				} else {
-					zDesc = ts + 1554
+					zDesc = ts + 1573
 				}
-				z = rbuMPrintf(tls, p, ts+29446, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14614
+				z = rbuMPrintf(tls, p, ts+29512, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14633
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29457, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29523, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -127901,12 +127963,12 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		*(*uintptr)(unsafe.Pointer(bp + 168)) = uintptr(0)
 		var zIdx uintptr = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
-		var zComma uintptr = ts + 1554
+		var zComma uintptr = ts + 1573
 		var zCols uintptr = uintptr(0)
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29461)
+			ts+29527)
 		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))) {
@@ -127915,7 +127977,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+28613, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28679, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -127925,25 +127987,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+29511, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29577, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29533, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29599, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28853
+						return ts + 28919
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
-				zComma = ts + 14614
+				zComma = ts + 14633
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29543, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29609, 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+6441, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29558,
+			ts+29624,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 0))
 	}
 }
 
@@ -127953,50 +128015,50 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
 		var tnum int32 = (*RbuObjIter)(unsafe.Pointer(pIter)).FiTnum
-		var zComma uintptr = ts + 1554
+		var zComma uintptr = ts + 1573
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
-			var zPk uintptr = ts + 1554
+			var zPk uintptr = ts + 1573
 			var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCol)*8))
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, (*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 + 29620
+				zPk = ts + 29686
 			}
-			zSql = rbuMPrintf(tls, p, ts+29633,
+			zSql = rbuMPrintf(tls, p, ts+29699,
 				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 + 29660
+							return ts + 29726
 						}
-						return ts + 1554
+						return ts + 1573
 					}()))
-			zComma = ts + 14614
+			zComma = ts + 14633
 		}
 
 		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+29670, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29736, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		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,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29743,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29709
+						return ts + 29775
 					}
-					return ts + 1554
+					return ts + 1573
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 0))
 	}
 }
 
@@ -128009,7 +128071,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+29724,
+				ts+29790,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -128046,7 +128108,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+29781)
+			ts+29847)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -128151,7 +128213,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+29847, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29913, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -128171,24 +128233,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+6441, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29867,
+				ts+29933,
 				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+6441, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 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+29932, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29998, 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+29968, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+30034, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -128204,7 +128266,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30002,
+						ts+30068,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -128212,31 +128274,31 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 30063
+											return ts + 30129
 										}
-										return ts + 30067
+										return ts + 30133
 									}()
 								}
-								return ts + 1554
+								return ts + 1573
 							}(), zStart,
 							zCollist, zLimit))
 					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+30073,
+						ts+30139,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30134,
+						ts+30200,
 						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 + 30063
+									return ts + 30129
 								}
-								return ts + 30067
+								return ts + 30133
 							}(),
 							zCollist, zLimit))
 				}
@@ -128261,8 +128323,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+6452)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6448)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6471)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6467)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -128271,52 +128333,52 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			rbuCreateImposterTable2(tls, p, pIter)
 			zWrite = func() uintptr {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
-					return ts + 1554
+					return ts + 1573
 				}
-				return ts + 30293
+				return ts + 30359
 			}()
 
 			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+30302,
+						ts+30368,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30338
+								return ts + 30404
 							}
-							return ts + 1554
+							return ts + 1573
 						}(), zBindings)))
 			}
 
 			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+30348, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30414, 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
+				var zRbuRowid uintptr = ts + 1573
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30376
+					zRbuRowid = ts + 30442
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30388, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30454, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30464
+							return ts + 30530
 						}
-						return ts + 1554
+						return ts + 1573
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30481,
+					ts+30547,
 					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+30780,
+						ts+30846,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -128324,14 +128386,14 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-				var zRbuRowid uintptr = ts + 1554
+				var zRbuRowid uintptr = ts + 1573
 				var zStart uintptr = uintptr(0)
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30879
+						zRbuRowid = ts + 30945
 					} else {
-						zRbuRowid = ts + 30889
+						zRbuRowid = ts + 30955
 					}
 				}
 
@@ -128344,35 +128406,35 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28936, 0)
+						zOrder = rbuMPrintf(tls, p, ts+29002, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1573, ts+14633, ts+1573)
 					}
 				}
 
 				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+30900,
+							ts+30966,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30948
+										return ts + 31014
 									}
-									return ts + 1554
+									return ts + 1573
 								}(),
 								zRbuRowid,
 								(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 									if zStart != 0 {
 										return zStart
 									}
-									return ts + 1554
+									return ts + 1573
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 22859
+										return ts + 22925
 									}
-									return ts + 1554
+									return ts + 1573
 								}(), zOrder,
 								zLimit)))
 				}
@@ -128435,12 +128497,12 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 		(*RbuObjIter)(unsafe.Pointer(pIter)).FpRbuUpdate = pUp
 
 		if zSet != 0 {
-			var zPrefix uintptr = ts + 1554
+			var zPrefix uintptr = ts + 1573
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30293
+				zPrefix = ts + 30359
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30954,
+			zUpdate = Xsqlite3_mprintf(tls, ts+31020,
 				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)
@@ -128467,7 +128529,7 @@ func rbuOpenDbhandle(tls *libc.TLS, p uintptr, zName uintptr, bUseVfs int32) uin
 			return uintptr(0)
 		}())
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
 			Xsqlite3_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 			*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 		}
@@ -128499,7 +128561,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+30984, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+31050, 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:
@@ -128569,28 +128631,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+6441, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460, 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+6441)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31014, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31080, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		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))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31108, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.Xmemcpy(tls, p+48, ts+3305, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+6441, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+6460, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31060, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31126, 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+6441, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -128623,11 +128685,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+31126, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31192, 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+24206, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24272, (*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)))) == '?' {
@@ -128639,16 +128701,16 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31158,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441),
+			zTarget = Xsqlite3_mprintf(tls, ts+31224,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460),
 					func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1554
+							return ts + 1573
 						}
-						return ts + 31190
+						return ts + 31256
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1554
+							return ts + 1573
 						}
 						return zExtra
 					}()))
@@ -128664,37 +128726,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+31192, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31258, -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+31207, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31273, 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+31224, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31290, -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+6441, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31306, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, 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+31268, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31334, 0)
 	}
 }
 
@@ -128723,14 +128785,14 @@ 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+31240, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31306, 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+31286, uintptr(0), uintptr(0), uintptr(0))
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31352, uintptr(0), uintptr(0), uintptr(0))
 		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
@@ -128839,7 +128901,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+6441, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6460, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -128856,23 +128918,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+31321, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31387, 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+6441)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460)
 	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+6441)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6460)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31353, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31412, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31419, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -128989,7 +129051,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+23844, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23910, 0)
 			return
 		}
 
@@ -129082,7 +129144,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+31360)
+			ts+31426)
 		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)
@@ -129090,7 +129152,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+31382, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31448, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -129111,7 +129173,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+31409,
+				ts+31475,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -129141,9 +129203,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+31567, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31633, 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+31582,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31648,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -129157,10 +129219,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+31602, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31668, 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+31627)
+			ts+31693)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -129174,12 +129236,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+31735)
+			ts+31801)
 	}
 
 	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+31800)
+			ts+31866)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -129191,7 +129253,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+31844, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31910, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -129211,15 +129273,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+17240)
-					rbuCopyPragma(tls, p, ts+16351)
+					rbuCopyPragma(tls, p, ts+17259)
+					rbuCopyPragma(tls, p, ts+16370)
 				}
 
 				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+31869, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31935, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -129243,10 +129305,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+14518, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, 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+14518, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -129341,7 +129403,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+31897, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31963, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -129357,10 +129419,10 @@ func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31346, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31412, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 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)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6460, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
@@ -129374,7 +129436,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+31922, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]uint8{})), bp+12, ts+31988, 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)
@@ -129408,7 +129470,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+31933, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31999, 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 {
@@ -129438,13 +129500,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+32005, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32071, 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+32019)
+				ts+32085)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -129455,7 +129517,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+32076)
+				ts+32142)
 			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)
@@ -129500,7 +129562,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			libc.Xmemcpy(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, zRbu, nRbu+uint64(1))
 			pCsr += uintptr(nRbu + uint64(1))
 			if zState != 0 {
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3663, libc.VaList(bp, zState))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3682, libc.VaList(bp, zState))
 			}
 
 			rbuOpenDatabase(tls, p, uintptr(0), bp+16)
@@ -129529,7 +129591,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+32150, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32216, 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
@@ -129547,12 +129609,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+32182,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32248,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32214
+							return ts + 32280
 						}
-						return ts + 32221
+						return ts + 32287
 					}()))
 			}
 		}
@@ -129560,7 +129622,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+14503, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14522, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -129571,19 +129633,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+16954)
-						rbuCopyPragma(tls, p, ts+16366)
+						rbuCopyPragma(tls, p, ts+16973)
+						rbuCopyPragma(tls, p, ts+16385)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32228, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32294, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6460, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32244, uintptr(0), uintptr(0), p+64)
+								db, ts+32310, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -129637,7 +129699,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+32268, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32334, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -129664,7 +129726,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+30293, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30359, 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++
@@ -129681,7 +129743,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+14518, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -129694,13 +129756,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+14518, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, 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+32276, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32342, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -129795,7 +129857,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+14518, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14537, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -129812,19 +129874,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+14518, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14537, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14503
+				zBegin = ts + 14522
 			} else {
-				zBegin = ts + 32228
+				zBegin = ts + 32294
 			}
 			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+32228, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32294, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -130170,7 +130232,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+32303, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32369, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -130195,7 +130257,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+32326, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32392, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -130340,7 +130402,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+6441)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6460)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -130355,7 +130417,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+32337, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32403, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -130600,6 +130662,970 @@ func Xsqlite3rbu_temp_size(tls *libc.TLS, pRbu uintptr) Sqlite3_int64 {
 	return (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FszTemp
 }
 
+var zDbstatSchema = *(*[258]uint8)(unsafe.Pointer(ts + 32414))
+
+// Forward reference to data structured used in this module
+type StatTable1 = struct {
+	Fbase        Sqlite3_vtab
+	Fdb          uintptr
+	FiDb         int32
+	F__ccgo_pad1 [4]byte
+}
+
+// Forward reference to data structured used in this module
+type StatTable = StatTable1
+type StatCursor1 = struct {
+	Fbase        Sqlite3_vtab_cursor
+	FpStmt       uintptr
+	FisEof       U8
+	FisAgg       U8
+	F__ccgo_pad1 [2]byte
+	FiDb         int32
+	FaPage       [32]StatPage
+	FiPage       int32
+	FiPageno     U32
+	FzName       uintptr
+	FzPath       uintptr
+	FzPagetype   uintptr
+	FnPage       int32
+	FnCell       int32
+	FnMxPayload  int32
+	F__ccgo_pad2 [4]byte
+	FnUnused     I64
+	FnPayload    I64
+	FiOffset     I64
+	FszPage      I64
+}
+
+type StatCursor = StatCursor1
+type StatPage1 = struct {
+	FiPgno         U32
+	F__ccgo_pad1   [4]byte
+	FaPg           uintptr
+	FiCell         int32
+	F__ccgo_pad2   [4]byte
+	FzPath         uintptr
+	Fflags         U8
+	F__ccgo_pad3   [3]byte
+	FnCell         int32
+	FnUnused       int32
+	F__ccgo_pad4   [4]byte
+	FaCell         uintptr
+	FiRightChildPg U32
+	FnMxPayload    int32
+}
+
+type StatPage = StatPage1
+type StatCell1 = struct {
+	FnLocal      int32
+	FiChildPg    U32
+	FnOvfl       int32
+	F__ccgo_pad1 [4]byte
+	FaOvfl       uintptr
+	FnLastOvfl   int32
+	FiOvfl       int32
+}
+
+type StatCell = StatCell1
+
+func statConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var pTab uintptr = uintptr(0)
+	var rc int32 = SQLITE_OK
+	var iDb int32
+	_ = pAux
+
+	if argc >= 4 {
+		Xsqlite3TokenInit(tls, bp+8, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
+		iDb = Xsqlite3FindDb(tls, db, bp+8)
+		if iDb < 0 {
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+11890, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
+			return SQLITE_ERROR
+		}
+	} else {
+		iDb = 0
+	}
+	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_DIRECTONLY, 0)
+	rc = Xsqlite3_declare_vtab(tls, db, uintptr(unsafe.Pointer(&zDbstatSchema)))
+	if rc == SQLITE_OK {
+		pTab = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatTable{})))
+		if pTab == uintptr(0) {
+			rc = SQLITE_NOMEM
+		}
+	}
+
+	if rc == SQLITE_OK {
+		libc.Xmemset(tls, pTab, 0, uint64(unsafe.Sizeof(StatTable{})))
+		(*StatTable)(unsafe.Pointer(pTab)).Fdb = db
+		(*StatTable)(unsafe.Pointer(pTab)).FiDb = iDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
+	return rc
+}
+
+func statDisconnect(tls *libc.TLS, pVtab uintptr) int32 {
+	Xsqlite3_free(tls, pVtab)
+	return SQLITE_OK
+}
+
+func statBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
+	var i int32
+	var iSchema int32 = -1
+	var iName int32 = -1
+	var iAgg int32 = -1
+	_ = tab
+
+	for i = 0; i < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; i++ {
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fop) != SQLITE_INDEX_CONSTRAINT_EQ {
+			continue
+		}
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fusable) == 0 {
+			return SQLITE_CONSTRAINT
+		}
+		switch (*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(i)*12)).FiColumn {
+		case 0:
+			{
+				iName = i
+				break
+
+			}
+		case 10:
+			{
+				iSchema = i
+				break
+
+			}
+		case 11:
+			{
+				iAgg = i
+				break
+
+			}
+		}
+	}
+	i = 0
+	if iSchema >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).Fomit = uint8(1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x01
+	}
+	if iName >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iName)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x02
+	}
+	if iAgg >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iAgg)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x04
+	}
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 1.0
+
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy == 1 &&
+		(*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)).FnOrderBy == 2 &&
+		(*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_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).FiColumn == 1 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x08
+	}
+
+	return SQLITE_OK
+}
+
+func statOpen(tls *libc.TLS, pVTab uintptr, ppCursor uintptr) int32 {
+	var pTab uintptr = pVTab
+	var pCsr uintptr
+
+	pCsr = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatCursor{})))
+	if pCsr == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		libc.Xmemset(tls, pCsr, 0, uint64(unsafe.Sizeof(StatCursor{})))
+		(*StatCursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab = pVTab
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppCursor)) = pCsr
+	return SQLITE_OK
+}
+
+func statClearCells(tls *libc.TLS, p uintptr) {
+	var i int32
+	if (*StatPage)(unsafe.Pointer(p)).FaCell != 0 {
+		for i = 0; i < (*StatPage)(unsafe.Pointer(p)).FnCell; i++ {
+			Xsqlite3_free(tls, (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell+uintptr(i)*32)).FaOvfl)
+		}
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FaCell)
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnCell = 0
+	(*StatPage)(unsafe.Pointer(p)).FaCell = uintptr(0)
+}
+
+func statClearPage(tls *libc.TLS, p uintptr) {
+	var aPg uintptr = (*StatPage)(unsafe.Pointer(p)).FaPg
+	statClearCells(tls, p)
+	Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FzPath)
+	libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(StatPage{})))
+	(*StatPage)(unsafe.Pointer(p)).FaPg = aPg
+}
+
+func statResetCsr(tls *libc.TLS, pCsr uintptr) {
+	var i int32
+
+	for i = 0; i < int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{}))); i++ {
+		statClearPage(tls, pCsr+24+uintptr(i)*64)
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(pCsr+24+uintptr(i)*64)).FaPg)
+		(*StatPage)(unsafe.Pointer(pCsr + 24 + uintptr(i)*64)).FaPg = uintptr(0)
+	}
+	Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(0)
+}
+
+func statResetCounts(tls *libc.TLS, pCsr uintptr) {
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnCell = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnUnused = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPayload = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FszPage = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 0
+}
+
+func statClose(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	Xsqlite3_free(tls, pCsr)
+	return SQLITE_OK
+}
+
+func getLocalPayload(tls *libc.TLS, nUsable int32, flags U8, nTotal int32) int32 {
+	var nLocal int32
+	var nMinLocal int32
+	var nMaxLocal int32
+
+	if int32(flags) == 0x0D {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = nUsable - 35
+	} else {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = (nUsable-12)*64/255 - 23
+	}
+
+	nLocal = nMinLocal + (nTotal-nMinLocal)%(nUsable-4)
+	if nLocal > nMaxLocal {
+		nLocal = nMinLocal
+	}
+	return nLocal
+}
+
+func statDecodePage(tls *libc.TLS, pBt uintptr, p uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var nUnused int32
+	var iOff int32
+	var nHdr int32
+	var isLeaf int32
+	var szPage int32
+	var aData uintptr
+	var aHdr uintptr
+	var iNext int32
+
+	var rc int32
+	var iPrev U32
+
+	var j int32
+	var nOvfl int32
+
+	var nLocal int32
+	var pCell uintptr
+	var i int32
+	var nUsable int32
+	aData = (*StatPage)(unsafe.Pointer(p)).FaPg
+	aHdr = aData + uintptr(func() int32 {
+		if (*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1) {
+			return 100
+		}
+		return 0
+	}())
+
+	(*StatPage)(unsafe.Pointer(p)).Fflags = *(*U8)(unsafe.Pointer(aHdr))
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0A || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __1
+	}
+	isLeaf = 1
+	nHdr = 8
+	goto __2
+__1:
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05 || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x02) {
+		goto __3
+	}
+	isLeaf = 0
+	nHdr = 12
+	goto __4
+__3:
+	goto statPageIsCorrupt
+__4:
+	;
+__2:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1)) {
+		goto __5
+	}
+	nHdr = nHdr + 100
+__5:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnCell = int32(*(*U8)(unsafe.Pointer(aHdr + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 3 + 1)))
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = 0
+	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
+
+	nUnused = int32(*(*U8)(unsafe.Pointer(aHdr + 5)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 5 + 1))) - nHdr - 2*(*StatPage)(unsafe.Pointer(p)).FnCell
+	nUnused = nUnused + int32(*(*U8)(unsafe.Pointer(aHdr + 7)))
+	iOff = int32(*(*U8)(unsafe.Pointer(aHdr + 1)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 1 + 1)))
+__6:
+	if !(iOff != 0) {
+		goto __7
+	}
+	if !(iOff >= szPage) {
+		goto __8
+	}
+	goto statPageIsCorrupt
+__8:
+	;
+	nUnused = nUnused + (int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2) + 1))))
+	iNext = int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff) + 1)))
+	if !(iNext < iOff+4 && iNext > 0) {
+		goto __9
+	}
+	goto statPageIsCorrupt
+__9:
+	;
+	iOff = iNext
+	goto __6
+__7:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnUnused = nUnused
+	(*StatPage)(unsafe.Pointer(p)).FiRightChildPg = func() uint32 {
+		if isLeaf != 0 {
+			return uint32(0)
+		}
+		return Xsqlite3Get4byte(tls, aHdr+8)
+	}()
+
+	if !((*StatPage)(unsafe.Pointer(p)).FnCell != 0) {
+		goto __10
+	}
+
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = szPage - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatPage)(unsafe.Pointer(p)).FaCell = Xsqlite3_malloc64(tls, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+	if !((*StatPage)(unsafe.Pointer(p)).FaCell == uintptr(0)) {
+		goto __11
+	}
+	return SQLITE_NOMEM
+__11:
+	;
+	libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+
+	i = 0
+__12:
+	if !(i < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __14
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr(i)*32
+
+	iOff = int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2) + 1)))
+	if !(iOff < nHdr || iOff >= szPage) {
+		goto __15
+	}
+	goto statPageIsCorrupt
+__15:
+	;
+	if !!(isLeaf != 0) {
+		goto __16
+	}
+	(*StatCell)(unsafe.Pointer(pCell)).FiChildPg = Xsqlite3Get4byte(tls, aData+uintptr(iOff))
+	iOff = iOff + 4
+__16:
+	;
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05) {
+		goto __17
+	}
+
+	goto __18
+__17:
+	iOff = iOff + int32(func() uint8 {
+		if int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff)))) < int32(U8(0x80)) {
+			return uint8(func() int32 {
+				*(*U32)(unsafe.Pointer(bp)) = U32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))
+				return 1
+			}())
+		}
+		return Xsqlite3GetVarint32(tls, aData+uintptr(iOff), bp)
+	}())
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __19
+	}
+	iOff = iOff + int32(Xsqlite3GetVarint(tls, aData+uintptr(iOff), bp+8))
+__19:
+	;
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32((*StatPage)(unsafe.Pointer(p)).FnMxPayload)) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = int32(*(*U32)(unsafe.Pointer(bp)))
+__20:
+	;
+	nLocal = getLocalPayload(tls, nUsable, (*StatPage)(unsafe.Pointer(p)).Fflags, int32(*(*U32)(unsafe.Pointer(bp))))
+	if !(nLocal < 0) {
+		goto __21
+	}
+	goto statPageIsCorrupt
+__21:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLocal = nLocal
+
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32(nLocal)) {
+		goto __22
+	}
+	nOvfl = int32((*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) + U32(nUsable) - U32(4) - U32(1)) / U32(nUsable-4))
+	if !(iOff+nLocal+4 > nUsable || *(*U32)(unsafe.Pointer(bp)) > U32(0x7fffffff)) {
+		goto __23
+	}
+	goto statPageIsCorrupt
+__23:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl = int32(*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) - U32((nOvfl-1)*(nUsable-4)))
+	(*StatCell)(unsafe.Pointer(pCell)).FnOvfl = nOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FaOvfl = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(U32(0)))*uint64(nOvfl))
+	if !((*StatCell)(unsafe.Pointer(pCell)).FaOvfl == uintptr(0)) {
+		goto __24
+	}
+	return SQLITE_NOMEM
+__24:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl)) = Xsqlite3Get4byte(tls, aData+uintptr(iOff+nLocal))
+	j = 1
+__25:
+	if !(j < nOvfl) {
+		goto __27
+	}
+	iPrev = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j-1)*4))
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPrev, bp+16, 0)
+	if !(rc != SQLITE_OK) {
+		goto __28
+	}
+
+	return rc
+__28:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j)*4)) = Xsqlite3Get4byte(tls, Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 16))))
+	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
+	goto __26
+__26:
+	j++
+	goto __25
+	goto __27
+__27:
+	;
+__22:
+	;
+__18:
+	;
+	goto __13
+__13:
+	i++
+	goto __12
+	goto __14
+__14:
+	;
+__10:
+	;
+	return SQLITE_OK
+
+statPageIsCorrupt:
+	(*StatPage)(unsafe.Pointer(p)).Fflags = U8(0)
+	statClearCells(tls, p)
+	return SQLITE_OK
+}
+
+func statSizeAndOffset(tls *libc.TLS, pCsr uintptr) {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCsr)).FpVtab
+	var pBt uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatTable)(unsafe.Pointer(pTab)).FiDb)*32)).FpBt
+	var pPager uintptr = Xsqlite3BtreePager(tls, pBt)
+	var fd uintptr
+
+	fd = Xsqlite3PagerFile(tls, pPager)
+	*(*Sqlite3_int64)(unsafe.Pointer(bp)) = Sqlite3_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	if Xsqlite3OsFileControl(tls, fd, 230440, bp) == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = *(*Sqlite3_int64)(unsafe.Pointer(bp))
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += *(*Sqlite3_int64)(unsafe.Pointer(bp + 1*8))
+	} else {
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += I64(Xsqlite3BtreeGetPageSize(tls, pBt))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = (*StatCursor)(unsafe.Pointer(pCsr)).FszPage * I64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno-U32(1))
+	}
+}
+
+func statGetPage(tls *libc.TLS, pBt uintptr, iPg U32, pPg uintptr) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var pgsz int32 = Xsqlite3BtreeGetPageSize(tls, pBt)
+	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
+	var rc int32
+
+	if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+		(*StatPage)(unsafe.Pointer(pPg)).FaPg = Xsqlite3_malloc(tls, pgsz+DBSTAT_PAGE_PADDING_BYTES)
+		if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+			return SQLITE_NOMEM
+		}
+		libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0, uint64(DBSTAT_PAGE_PADDING_BYTES))
+	}
+
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPg, bp, 0)
+	if rc == SQLITE_OK {
+		var a uintptr = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		libc.Xmemcpy(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, a, uint64(pgsz))
+		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+	}
+
+	return rc
+}
+
+func statNext(tls *libc.TLS, pCursor uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
+	var rc int32
+	var nPayload int32
+	var z uintptr
+	var pCsr uintptr
+	var pTab uintptr
+	var pBt uintptr
+	var pPager uintptr
+
+	var iRoot U32
+	var nUsable int32
+	var iOvfl int32
+	var pCell uintptr
+
+	var p uintptr
+	var i int32
+	var p1 uintptr
+	pCsr = pCursor
+	pTab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	pBt = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FpBt
+	pPager = Xsqlite3BtreePager(tls, pBt)
+
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+
+statNextRestart:
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __1
+	}
+
+	statResetCounts(tls, pCsr)
+	rc = Xsqlite3_step(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	if !(rc == SQLITE_ROW) {
+		goto __3
+	}
+	iRoot = U32(Xsqlite3_column_int64(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 1))
+	Xsqlite3PagerPagecount(tls, pPager, bp+48)
+	if !(*(*int32)(unsafe.Pointer(bp + 48)) == 0) {
+		goto __5
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__5:
+	;
+	rc = statGetPage(tls, pBt, iRoot, pCsr+24)
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiPgno = iRoot
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __6
+	}
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32672, 0))
+	if !(z == uintptr(0)) {
+		goto __7
+	}
+	rc = SQLITE_NOMEM
+__7:
+	;
+__6:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 1
+	goto __4
+__3:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__4:
+	;
+	goto __2
+__1:
+	p = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __8
+	}
+	statResetCounts(tls, pCsr)
+__8:
+	;
+__9:
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __10
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32
+__11:
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl) {
+		goto __12
+	}
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = Xsqlite3BtreeGetPageSize(tls, pBt) - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	statSizeAndOffset(tls, pCsr)
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl-1) {
+		goto __13
+	}
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nUsable - 4)
+	goto __14
+__13:
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64((*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64(nUsable - 4 - (*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+__14:
+	;
+	iOvfl = (*StatCell)(unsafe.Pointer(pCell)).FiOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FiOvfl++
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __15
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(iOvfl)*4))
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32674
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls,
+		ts+32683, libc.VaList(bp, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell, iOvfl)))
+	if z == uintptr(0) {
+		return SQLITE_NOMEM
+	}
+	return SQLITE_OK
+__15:
+	;
+	goto __11
+__12:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiRightChildPg != 0) {
+		goto __16
+	}
+	goto __10
+__16:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+	goto __9
+__10:
+	;
+	if !(!(int32((*StatPage)(unsafe.Pointer(p)).FiRightChildPg) != 0) || (*StatPage)(unsafe.Pointer(p)).FiCell > (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __17
+	}
+	statClearPage(tls, p)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage--
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 && (*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __18
+	}
+
+	return SQLITE_OK
+__18:
+	;
+	goto statNextRestart
+__17:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage++
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage >= int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{})))) {
+		goto __19
+	}
+	statResetCsr(tls, pCsr)
+	return Xsqlite3CorruptError(tls, 215455)
+__19:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell == (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatPage)(unsafe.Pointer(p)).FiRightChildPg
+	goto __21
+__20:
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32)).FiChildPg
+__21:
+	;
+	rc = statGetPage(tls, pBt, (*StatPage)(unsafe.Pointer(p+1*64)).FiPgno, p+1*64)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __22
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32695, libc.VaList(bp+24, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell)))
+	if !(z == uintptr(0)) {
+		goto __23
+	}
+	rc = SQLITE_NOMEM
+__23:
+	;
+__22:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+__2:
+	;
+	if !(rc == SQLITE_OK) {
+		goto __24
+	}
+	p1 = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = (*StatPage)(unsafe.Pointer(p1)).FiPgno
+
+	rc = statDecodePage(tls, pBt, p1)
+	if !(rc == SQLITE_OK) {
+		goto __25
+	}
+	statSizeAndOffset(tls, pCsr)
+
+	switch int32((*StatPage)(unsafe.Pointer(p1)).Fflags) {
+	case 0x05:
+		goto __27
+	case 0x02:
+		goto __28
+	case 0x0D:
+		goto __29
+	case 0x0A:
+		goto __30
+	default:
+		goto __31
+	}
+	goto __26
+__27:
+__28:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32703
+	goto __26
+__29:
+__30:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32712
+	goto __26
+__31:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32717
+	goto __26
+__26:
+	;
+	*(*int32)(unsafe.Pointer(pCsr + 2108)) += (*StatPage)(unsafe.Pointer(p1)).FnCell
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64((*StatPage)(unsafe.Pointer(p1)).FnUnused)
+	if !((*StatPage)(unsafe.Pointer(p1)).FnMxPayload > (*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload) {
+		goto __32
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = (*StatPage)(unsafe.Pointer(p1)).FnMxPayload
+__32:
+	;
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __33
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+40, (*StatPage)(unsafe.Pointer(p1)).FzPath)))
+	if !(z == uintptr(0)) {
+		goto __34
+	}
+	rc = SQLITE_NOMEM
+__34:
+	;
+__33:
+	;
+	nPayload = 0
+	i = 0
+__35:
+	if !(i < (*StatPage)(unsafe.Pointer(p1)).FnCell) {
+		goto __37
+	}
+	nPayload = nPayload + (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p1)).FaCell+uintptr(i)*32)).FnLocal
+	goto __36
+__36:
+	i++
+	goto __35
+	goto __37
+__37:
+	;
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nPayload)
+
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0) {
+		goto __38
+	}
+	goto statNextRestart
+__38:
+	;
+__25:
+	;
+__24:
+	;
+	return rc
+}
+
+func statEof(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	return int32((*StatCursor)(unsafe.Pointer(pCsr)).FisEof)
+}
+
+func statFilter(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintptr, argc int32, argv uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pCsr uintptr = pCursor
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	var pSql uintptr
+	var zSql uintptr
+	var iArg int32 = 0
+	var rc int32 = SQLITE_OK
+	var zName uintptr = uintptr(0)
+	_ = argc
+	_ = idxStr
+
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FpStmt = uintptr(0)
+	if idxNum&0x01 != 0 {
+		var zDbase uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = Xsqlite3FindDbName(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zDbase)
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FiDb < 0 {
+			(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = 0
+			(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+			return SQLITE_OK
+		}
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+	if idxNum&0x02 != 0 {
+		zName = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+	}
+	if idxNum&0x04 != 0 {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(libc.Bool32(Xsqlite3_value_double(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8))) != 0.0))
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(0)
+	}
+	pSql = Xsqlite3_str_new(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb)
+	Xsqlite3_str_appendf(tls, pSql,
+		ts+32727,
+		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb+uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FzDbSName))
+	if zName != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32882, libc.VaList(bp+8, zName))
+	}
+	if idxNum&0x08 != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32896, 0)
+	}
+	zSql = Xsqlite3_str_finish(tls, pSql)
+	if zSql == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		rc = Xsqlite3_prepare_v2(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
+		Xsqlite3_free(tls, zSql)
+	}
+
+	if rc == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = -1
+		rc = statNext(tls, pCursor)
+	}
+	return rc
+}
+
+func statColumn(tls *libc.TLS, pCursor uintptr, ctx uintptr, i int32) int32 {
+	var pCsr uintptr = pCursor
+	switch i {
+	case 0:
+		Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzName, -1, libc.UintptrFromInt32(-1))
+		break
+	case 1:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath, -1, libc.UintptrFromInt32(-1))
+		}
+		break
+	case 2:
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnPage))
+		} else {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno))
+		}
+		break
+	case 3:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype, -1, uintptr(0))
+		}
+		break
+	case 4:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnCell))
+		break
+	case 5:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnPayload)
+		break
+	case 6:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnUnused)
+		break
+	case 7:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload))
+		break
+	case 8:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FiOffset)
+		}
+		break
+	case 9:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FszPage)
+		break
+	case 10:
+		{
+			var db uintptr = Xsqlite3_context_db_handle(tls, ctx)
+			var iDb int32 = (*StatCursor)(unsafe.Pointer(pCsr)).FiDb
+			Xsqlite3_result_text(tls, ctx, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, -1, uintptr(0))
+			break
+
+		}
+	default:
+		{
+			Xsqlite3_result_int(tls, ctx, int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg))
+			break
+
+		}
+	}
+	return SQLITE_OK
+}
+
+func statRowid(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32 {
+	var pCsr uintptr = pCursor
+	*(*Sqlite_int64)(unsafe.Pointer(pRowid)) = Sqlite_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	return SQLITE_OK
+}
+
+// Invoke this routine to register the "dbstat" virtual table module
+func Xsqlite3DbstatRegister(tls *libc.TLS, db uintptr) int32 {
+	return Xsqlite3_create_module(tls, db, ts+32911, uintptr(unsafe.Pointer(&dbstat_module)), uintptr(0))
+}
+
+var dbstat_module = Sqlite3_module{
+	FxCreate:     0,
+	FxConnect:    0,
+	FxBestIndex:  0,
+	FxDisconnect: 0,
+	FxDestroy:    0,
+	FxOpen:       0,
+	FxClose:      0,
+	FxFilter:     0,
+	FxNext:       0,
+	FxEof:        0,
+	FxColumn:     0,
+	FxRowid:      0,
+}
+
 type SessionTable1 = struct {
 	FpNext    uintptr
 	FzName    uintptr
@@ -131180,13 +132206,13 @@ 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+11348, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11367, 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+32348, 0)
+				ts+32918, 0)
 		} else if rc == SQLITE_ERROR {
-			zPragma = Xsqlite3_mprintf(tls, ts+1554, 0)
+			zPragma = Xsqlite3_mprintf(tls, ts+1573, 0)
 		} else {
 			*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
 			*(*uintptr)(unsafe.Pointer(pabPK)) = uintptr(0)
@@ -131197,7 +132223,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32469, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+33039, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -131295,7 +132321,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11348, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11367, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -131544,7 +132570,7 @@ __4:
 	goto error_out
 __7:
 	;
-	Xsqlite3ValueSetStr(tls, p, 0, ts+1554, uint8(0), uintptr(0))
+	Xsqlite3ValueSetStr(tls, p, 0, ts+1573, uint8(0), uintptr(0))
 	(*Sqlite3_session)(unsafe.Pointer(pSession)).FpZeroBlob = p
 __6:
 	;
@@ -131872,14 +132898,14 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	var zRet uintptr = uintptr(0)
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32498,
+			zRet = Xsqlite3_mprintf(tls, ts+33068,
 				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 + 21525
+			zSep = ts + 21591
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131894,7 +132920,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	var zRet uintptr = uintptr(0)
 	var bHave int32 = 0
 
@@ -131902,9 +132928,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+32532,
+				ts+33102,
 				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 + 32573
+			zSep = ts + 33143
 			if zRet == uintptr(0) {
 				break
 			}
@@ -131912,7 +132938,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7530, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7538, 0)
 	}
 
 	return zRet
@@ -131923,7 +132949,7 @@ func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintpt
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32578,
+		ts+33148,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -131966,7 +132992,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32656,
+			ts+33226,
 			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
@@ -132093,7 +133119,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32709, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33279, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -132358,7 +133384,7 @@ func sessionAppendInteger(tls *libc.TLS, p uintptr, iVal int32, pRc uintptr) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
-	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]uint8{}))-uint64(1)), bp+8, ts+4975, libc.VaList(bp, iVal))
+	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]uint8{}))-uint64(1)), bp+8, ts+4994, libc.VaList(bp, iVal))
 	sessionAppendStr(tls, p, bp+8, pRc)
 }
 
@@ -132567,29 +133593,29 @@ 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+11348, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11367, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32736, libc.VaList(bp, zDb))
+			ts+33306, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
 	} else {
 		var i int32
-		var zSep uintptr = ts + 1554
+		var zSep uintptr = ts + 1573
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32846, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33416, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
-		sessionAppendStr(tls, bp+8, ts+1567, bp+24)
+		sessionAppendStr(tls, bp+8, ts+1586, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+32861, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33431, 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+32869, bp+24)
+				sessionAppendStr(tls, bp+8, ts+33439, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21525
+				zSep = ts + 21591
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -132698,7 +133724,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+32875, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33445, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -132790,7 +133816,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32895, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33465, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -133053,7 +134079,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, 219078)
+				rc = Xsqlite3CorruptError(tls, 219169)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -133076,7 +134102,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, 219098)
+						rc = Xsqlite3CorruptError(tls, 219189)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -133118,7 +134144,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, 219152)
+			rc = Xsqlite3CorruptError(tls, 219243)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -133179,7 +134205,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, 219240)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219331)
 		}
 	}
 
@@ -133253,13 +134279,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, 219326))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219417))
 	}
 
 	(*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, 219332))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219423))
 	}
 
 	if paRec != 0 {
@@ -133321,7 +134347,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, 219376))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219467))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -133694,7 +134720,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219832)
 	goto finished_invert
 __6:
 	;
@@ -133862,45 +134888,45 @@ 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+11348) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11367) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
 			} else {
-				var zSep uintptr = ts + 1554
+				var zSep uintptr = ts + 1573
 
 				libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(SessionBuffer{})))
 				(*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+32913, bp+16)
+				sessionAppendStr(tls, bp, ts+33483, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+32926, bp+16)
+				sessionAppendStr(tls, bp, ts+33496, 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+32932, bp+16)
+						sessionAppendStr(tls, bp, ts+33502, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 14614
+						zSep = ts + 14633
 					}
 				}
 
-				zSep = ts + 1554
-				sessionAppendStr(tls, bp, ts+32861, bp+16)
+				zSep = ts + 1573
+				sessionAppendStr(tls, bp, ts+33431, 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+32937, bp+16)
+								ts+33507, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+32869, bp+16)
+							sessionAppendStr(tls, bp, ts+33439, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21525
+						zSep = ts + 21591
 					}
 				}
 
@@ -133947,42 +134973,42 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	defer tls.Free(20)
 
 	var i int32
-	var zSep uintptr = ts + 1554
+	var zSep uintptr = ts + 1573
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+33012, bp+16)
+	sessionAppendStr(tls, bp, ts+33582, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+32861, bp+16)
+	sessionAppendStr(tls, bp, ts+33431, 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+32932, bp+16)
+			sessionAppendStr(tls, bp, ts+33502, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21525
+			zSep = ts + 21591
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+33030, bp+16)
+		sessionAppendStr(tls, bp, ts+33600, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32573, bp+16)
+		sessionAppendStr(tls, bp, ts+33143, bp+16)
 
-		zSep = ts + 1554
+		zSep = ts + 1573
 		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+32869, bp+16)
+				sessionAppendStr(tls, bp, ts+33439, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 33038
+				zSep = ts + 33608
 			}
 		}
-		sessionAppendStr(tls, bp, ts+4957, bp+16)
+		sessionAppendStr(tls, bp, ts+4976, bp+16)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
@@ -133995,7 +135021,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+6441, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6460, 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 {
@@ -134006,21 +135032,21 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+33043, bp+16)
+	sessionAppendStr(tls, bp, ts+33613, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21531, bp+16)
+	sessionAppendStr(tls, bp, ts+21597, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14614, bp+16)
+			sessionAppendStr(tls, bp, ts+14633, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+33061, bp+16)
+	sessionAppendStr(tls, bp, ts+33631, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33072, bp+16)
+		sessionAppendStr(tls, bp, ts+33642, bp+16)
 	}
-	sessionAppendStr(tls, bp, ts+4957, bp+16)
+	sessionAppendStr(tls, bp, ts+4976, bp+16)
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v2(tls, db, (*SessionBuffer)(unsafe.Pointer(bp)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp)).FnBuf, p+16, uintptr(0))
@@ -134034,14 +135060,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+11348, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11367, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+33076)
+			ts+33646)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33189)
+			ts+33759)
 	}
 	return rc
 }
@@ -134069,7 +135095,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, 220219)
+				rc = Xsqlite3CorruptError(tls, 220310)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -134322,7 +135348,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+33333, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33903, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -134338,7 +135364,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+33354, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33924, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -134411,10 +135437,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+33373, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33943, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33399, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33969, 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))
@@ -134447,7 +135473,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				f func(*libc.TLS, uintptr, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xFilter})).f(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 176))))
 			if schemaMismatch != 0 {
-				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
+				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
 				if *(*uintptr)(unsafe.Pointer(bp + 200)) == uintptr(0) {
 					rc = SQLITE_NOMEM
 					break
@@ -134460,7 +135486,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+6441, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6460, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -134473,19 +135499,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+33429, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33999, 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+33473,
+						ts+34043,
 						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+33544, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+34114, 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+11348) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11367) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -134536,14 +135562,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33604, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34174, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34204, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33658, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34228, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34204, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -135791,7 +136817,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33686, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+34256, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -136079,7 +137105,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33714, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+34284, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -136266,7 +137292,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+33745, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34315, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -136334,7 +137360,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33752
+		var zErr uintptr = ts + 34322
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -136493,7 +137519,7 @@ func fts5ValueToText(tls *libc.TLS, pVal uintptr) uintptr {
 	if zRet != 0 {
 		return zRet
 	}
-	return ts + 1554
+	return ts + 1573
 }
 
 func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, nVal int32, apVal uintptr) {
@@ -136516,7 +137542,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33802
+		var zErr uintptr = ts + 34372
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -136840,13 +137866,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33850, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34420, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33858, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34428, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33868, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34438, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -137257,7 +138283,7 @@ func fts5ConfigSkipLiteral(tls *libc.TLS, pIn uintptr) uintptr {
 	case 'n':
 		fallthrough
 	case 'N':
-		if Xsqlite3_strnicmp(tls, ts+6181, p, 4) == 0 {
+		if Xsqlite3_strnicmp(tls, ts+6200, p, 4) == 0 {
 			p = p + 4
 		} else {
 			p = uintptr(0)
@@ -137397,7 +138423,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+33873, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34443, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -137424,14 +138450,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+33880, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34450, 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+33911, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+34481, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -137442,7 +138468,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33944, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34514, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -137455,7 +138481,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33981, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34551, 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)))
@@ -137464,7 +138490,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+33990, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34560, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*uint8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -137483,7 +138509,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34023, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34593, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -137498,14 +138524,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34057, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34627, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34065, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34635, 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+34097, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34667, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -137513,9 +138539,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34103, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34673, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34117, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34687, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -137523,9 +138549,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34155, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34725, 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+34166, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34736, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zArg))) == '1')
@@ -137533,21 +138559,21 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+5075, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+5094, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 8026, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17345},
-			{FzName: ts + 34201, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8045, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17364},
+			{FzName: ts + 34771, 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+34209, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34779, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34240, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34810, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -137594,15 +138620,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+22191) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16267) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34268, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22257) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16286) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34838, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34298) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34868) {
 			*(*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+34308, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34878, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -137619,13 +138645,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+34339, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34909, 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+34344, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34914, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34351, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34921, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -137663,8 +138689,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+22191) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34359, 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+22257) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34929, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -137696,7 +138722,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+34388, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34958, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -137705,13 +138731,13 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 							if *(*uintptr)(unsafe.Pointer(bp + 48)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 48))
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						func() uintptr {
 							if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 64))
 							}
-							return ts + 1554
+							return ts + 1573
 						}(),
 						pzErr)
 				} else {
@@ -137733,19 +138759,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 + 34057
+			zTail = ts + 34627
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34408
+			zTail = ts + 34978
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34416, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34986, 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+16267, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16286, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -137789,18 +138815,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+34427, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34997, 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 + 1573
 			}
-			return ts + 14614
+			return ts + 14633
 		}()
-		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+35013, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34450,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22191))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35020,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22257))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -137910,7 +138936,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34476) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35046) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -137920,7 +138946,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+34481) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35051) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -137930,7 +138956,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+34490) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35060) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -137943,7 +138969,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+34500) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35070) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -137953,7 +138979,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+34510) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35080) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -137969,7 +138995,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+22191) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22257) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -137992,7 +139018,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34522
+	var zSelect uintptr = ts + 35092
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -138014,7 +139040,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+34554) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35124) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -138028,7 +139054,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+34562,
+				ts+35132,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -138126,7 +139152,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*uint8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34627, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+35197, 0)
 					return FTS5_EOF
 				}
 			}
@@ -138139,20 +139165,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+34647, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+35217, 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+34678, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35248, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34681, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35251, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30063, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30129, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -139930,9 +140956,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+34685, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35255, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33714, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+34284, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -139948,7 +140974,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+34690, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+35260, 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')
@@ -140035,7 +141061,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20528, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20594, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -140116,7 +141142,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+34719, 0)
+			ts+35289, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -140286,12 +141312,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+34772,
+								ts+35342,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34822
+										return ts + 35392
 									}
-									return ts + 34685
+									return ts + 35255
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -141234,7 +142260,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+34829, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35399, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -141313,7 +142339,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+34835,
+			ts+35405,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -141338,7 +142364,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+34886,
+			ts+35456,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -141361,7 +142387,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+34935,
+			ts+35505,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -141600,7 +142626,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+34975, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+35545, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -142799,7 +143825,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+34998,
+			ts+35568,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -143992,7 +145018,7 @@ func fts5WriteFlushBtree(tls *libc.TLS, p uintptr, pWriter uintptr) {
 			if (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn > 0 {
 				return (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fp
 			}
-			return ts + 1554
+			return ts + 1573
 		}()
 
 		Xsqlite3_bind_blob(tls, (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter, 2, z, (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn, uintptr(0))
@@ -144265,7 +145291,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+35082,
+			ts+35652,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -145331,7 +146357,7 @@ func sqlite3Fts5IndexReinit(tls *libc.TLS, p uintptr) int32 {
 	fts5StructureInvalidate(tls, p)
 	fts5IndexDiscardData(tls, p)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Fts5Structure{})))
-	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1554, 0)
+	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1573, 0)
 	fts5StructureWrite(tls, p, bp)
 	return fts5IndexReturn(tls, p)
 }
@@ -145347,13 +146373,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+35139, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35709, 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+25056, ts+35147, 0, pzErr)
+				pConfig, ts+25122, ts+35717, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11488,
-					ts+35182,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11507,
+					ts+35752,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -145606,7 +146632,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+34829, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+35399, 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)))
@@ -145720,7 +146746,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35226,
+		ts+35796,
 		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))) {
@@ -145890,7 +146916,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+35312)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35882)
 			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))
@@ -146161,7 +147187,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+35317, 0)
+			ts+35887, 0)
 		return SQLITE_ERROR
 	}
 
@@ -146192,7 +147218,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 				} else if iCol >= 0 {
 					bSeenMatch = 1
 					*(*uint8)(unsafe.Pointer(idxStr + uintptr(libc.PostIncInt32(&iIdxStr, 1)))) = uint8('M')
-					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4975, libc.VaList(bp, iCol))
+					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4994, libc.VaList(bp, iCol))
 					idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 
 				}
@@ -146207,7 +147233,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 					}
 					return uint8('G')
 				}()
-				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4975, libc.VaList(bp+8, iCol))
+				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4994, libc.VaList(bp+8, iCol))
 				idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 				(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pInfo)).FaConstraintUsage + uintptr(i)*8)).FargvIndex = libc.PreIncInt32(&iCons, 1)
 
@@ -146521,7 +147547,7 @@ func fts5NextMethod(tls *libc.TLS, pCursor uintptr) int32 {
 					rc = Xsqlite3_reset(tls, (*Fts5Cursor)(unsafe.Pointer(pCsr)).FpStmt)
 					if rc != SQLITE_OK {
 						(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-							ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+							ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 					}
 				} else {
 					rc = SQLITE_OK
@@ -146553,7 +147579,7 @@ func fts5PrepareStatement(tls *libc.TLS, ppStmt uintptr, pConfig uintptr, zFmt u
 		rc = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
 			uint32(SQLITE_PREPARE_PERSISTENT), bp+8, uintptr(0))
 		if rc != SQLITE_OK {
-			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 		}
 		Xsqlite3_free(tls, zSql)
 	}
@@ -146585,25 +147611,25 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35356,
+		ts+35926,
 		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 + 14614
+					return ts + 14633
 				}
-				return ts + 1554
+				return ts + 1573
 			}(),
 			func() uintptr {
 				if zRankArgs != 0 {
 					return zRankArgs
 				}
-				return ts + 1554
+				return ts + 1573
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35411
+					return ts + 35981
 				}
-				return ts + 35416
+				return ts + 35986
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -146649,12 +147675,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+35420, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35990, 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) {
+	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5076, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35426, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35996, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -146685,7 +147711,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+35454, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36024, 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,
@@ -146716,7 +147742,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+35464, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36034, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -146748,14 +147774,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+35485, libc.VaList(bp, z))
+				ts+36055, 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 + 33868
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34438
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -146811,7 +147837,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+35317, 0)
+		ts+35887, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -146854,7 +147880,7 @@ __8:
 	if !(zText == uintptr(0)) {
 		goto __14
 	}
-	zText = ts + 1554
+	zText = ts + 1573
 __14:
 	;
 	iCol = 0
@@ -147028,7 +148054,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35518, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+36088, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -147149,7 +148175,7 @@ func fts5SeekCursor(tls *libc.TLS, pCsr uintptr, bErrormsg int32) int32 {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			} else if (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg != 0 {
 				*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-					ts+3663, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
+					ts+3682, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
 			}
 		}
 	}
@@ -147173,28 +148199,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+35554, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36124, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35565, 0)
+				ts+36135, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36215, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35653, 0)
+				ts+36223, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16934, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16953, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35709, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36279, 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+35715, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36285, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -147252,7 +148278,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+17479, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17498, 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)))
@@ -147265,12 +148291,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+35731,
+				ts+36301,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20429
+						return ts + 20495
 					}
-					return ts + 35768
+					return ts + 36338
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -147900,7 +148926,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+35780, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36350, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -148144,7 +149170,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+35801, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36371, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -148163,7 +149189,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+35823, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36393, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -148210,7 +149236,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+35854)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36424)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -148219,7 +149245,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+35867, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+36437, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -148233,7 +149259,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35958, ts + 34057, ts + 25056, ts + 34408, ts + 11488,
+	ts + 36528, ts + 34627, ts + 25122, ts + 34978, ts + 11507,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -148257,7 +149283,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+35965, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+36535, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -148275,13 +149301,13 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35965, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36535, 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+35970, 0,
+				db, ts+36540, 0,
 				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
 				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
@@ -148338,17 +149364,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 + 35985,
-			ts + 36053,
-			ts + 36122,
-			ts + 36155,
-			ts + 36194,
-			ts + 36234,
-			ts + 36273,
-			ts + 36314,
-			ts + 36353,
-			ts + 36395,
-			ts + 36435,
+			ts + 36555,
+			ts + 36623,
+			ts + 36692,
+			ts + 36725,
+			ts + 36764,
+			ts + 36804,
+			ts + 36843,
+			ts + 36884,
+			ts + 36923,
+			ts + 36965,
+			ts + 37005,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -148415,7 +149441,7 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 			(*Fts5Config)(unsafe.Pointer((*Fts5Storage)(unsafe.Pointer(p)).FpConfig)).FbLock--
 			Xsqlite3_free(tls, zSql)
 			if rc != SQLITE_OK && pzErrMsg != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3663, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3682, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
 			}
 		}
 	}
@@ -148450,18 +149476,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+36458,
+		ts+37028,
 		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+36562,
+			ts+37132,
 			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+36600,
+			ts+37170,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -148473,7 +149499,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+36638,
+			ts+37208,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -148485,14 +149511,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+25056, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11488, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35958, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25122, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11507, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+36528, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34408, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34978, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34057, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34627, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -148504,17 +149530,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+36680,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37250,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29709
+					return ts + 29775
 				}
-				return ts + 1554
+				return ts + 1573
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36710,
+			ts+37280,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -148551,27 +149577,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36754, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37324, 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+36777, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37347, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34057, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34627, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34408, ts+36783, 0, pzErr)
+				pConfig, ts+34978, ts+37353, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35958, ts+36815, 1, pzErr)
+				pConfig, ts+36528, ts+37385, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35124, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -148777,12 +149803,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+36832,
+		ts+37402,
 		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+36882,
+			ts+37452,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -148790,7 +149816,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+34554, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35124, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -148966,7 +149992,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36911,
+	zSql = Xsqlite3_mprintf(tls, ts+37481,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -149148,14 +150174,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+34057, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34627, 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+34408, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34978, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -149350,9 +150376,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+36943) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37513) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37524) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -149567,7 +150593,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 + 36965
+			var zCat uintptr = ts + 37535
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -149579,7 +150605,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+36974) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37544) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -149590,18 +150616,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+36985) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37555) {
 					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+36943) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37513) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37524) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36974) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37544) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -149877,7 +150903,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 + 37003
+	var zBase uintptr = ts + 37573
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -150019,7 +151045,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+37013, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37583, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -150027,11 +151053,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37586, 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+37021, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37591, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -150039,7 +151065,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37026, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37596, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -150047,7 +151073,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37029, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37599, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -150055,11 +151081,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37602, 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+37037, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37607, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -150067,19 +151093,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37042, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37612, 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+37046, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37616, 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+37052, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37622, 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+37057, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37627, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150087,11 +151113,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37631, 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+37065, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37635, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -150099,7 +151125,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37638, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150107,11 +151133,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37642, 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+37076, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37646, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150119,7 +151145,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37080, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37650, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150127,7 +151153,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37654, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150135,7 +151161,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37088, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37658, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150151,24 +151177,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+37092, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37072, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37662, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37642, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37665, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37668, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37672, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37658, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -150183,137 +151209,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+37105, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37675, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37113, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37683, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37120, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37690, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37125, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37695, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37021, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37591, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37130, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37700, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37016, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37586, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37705, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37088, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37658, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37140, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37710, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15480, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15499, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37145, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37715, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37098, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37668, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37149, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37719, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 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+37724, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37057, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37627, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37160, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37730, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37164, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37734, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37166, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37736, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37080, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37650, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37172, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37742, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37088, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37658, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37180, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37750, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37186, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37756, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37191, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37761, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37197, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37767, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37084, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37654, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37205, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37775, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37213, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37783, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37217, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37787, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37080, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37650, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37225, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37795, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37231, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37801, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37084, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37654, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37237, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37807, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37098, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37668, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -150328,16 +151354,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+37244, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37814, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37029, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37599, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37249, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37819, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -150345,21 +151371,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37254, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37824, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37599, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37260, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37830, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37599, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37213, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37783, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -150367,7 +151393,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37266, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37836, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -150375,9 +151401,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37272, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37842, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -150392,12 +151418,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+37278, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37848, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37282, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37852, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37285, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37855, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -150406,7 +151432,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37288, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37858, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -150562,7 +151588,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+37292) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37862) {
 				if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' || *(*uint8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -150742,22 +151768,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 37003, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37573, 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 + 37307, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37877, 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 + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37883, 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 + 37320, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37890, 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
@@ -151900,14 +152926,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+37328) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37898) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37332) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37902) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37336) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37906) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37345, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37915, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -151933,19 +152959,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 + 37379,
-		ts + 37419,
-		ts + 37454,
+		ts + 37949,
+		ts + 37989,
+		ts + 38024,
 	}
 
 	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+23352, *(*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+23418, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37497, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38067, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -152078,11 +153104,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+37530, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+38100, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37561,
+		ts+38131,
 		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))
@@ -152106,7 +153132,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+37612, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38182, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -152390,7 +153416,7 @@ func fts5VocabFilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, zUnused
 		if pLe != 0 {
 			var zCopy uintptr = Xsqlite3_value_text(tls, pLe)
 			if zCopy == uintptr(0) {
-				zCopy = ts + 1554
+				zCopy = ts + 1573
 			}
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm = Xsqlite3_value_bytes(tls, pLe)
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FzLeTerm = Xsqlite3_malloc(tls, (*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm+1)
@@ -152501,7 +153527,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+37638, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+38208, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -152523,7 +153549,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 + 37648
+	return ts + 38218
 }
 
 func init() {
@@ -152949,6 +153975,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1056)) = noopStepFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1064)) = uintptr(unsafe.Pointer(&lagName))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&attach_func)) + 24)) = attachFunc
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 8)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 16)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 24)) = statBestIndex
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 32)) = statDisconnect
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 40)) = statDisconnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 48)) = statOpen
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 56)) = statClose
+	*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 64)) = statFilter
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 72)) = statNext
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 80)) = statEof
+	*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 88)) = statColumn
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 96)) = statRowid
 	*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 0)) = sqlite3MemMalloc
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 8)) = sqlite3MemFree
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 16)) = sqlite3MemRealloc
@@ -153481,8 +154519,9 @@ func init() {
 	*(*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
-	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = Xsqlite3JsonTableFunctions
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = Xsqlite3DbstatRegister
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = sqlite3TestExtInit
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 32)) = Xsqlite3JsonTableFunctions
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statGetFuncdef)) + 24)) = statGet
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statInitFuncdef)) + 24)) = statInit
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statPushFuncdef)) + 24)) = statPush
@@ -153500,5 +154539,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-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 ts1 = "3.41.2\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_DBSTAT_VTAB\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\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\x00true\x00false\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 \x00rowid not at end-of-record for row \x00 of 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\x00CREATE TABLE x( name       TEXT, path       TEXT, pageno     INTEGER, pagetype   TEXT, ncell      INTEGER, payload    INTEGER, unused     INTEGER, mx_payload INTEGER, pgoffset   INTEGER, pgsize     INTEGER, schema     TEXT HIDDEN, aggregate  BOOLEAN HIDDEN)\x00/\x00overflow\x00%s%.3x+%.6x\x00%s%.3x/\x00internal\x00leaf\x00corrupted\x00SELECT * FROM (SELECT 'sqlite_schema' AS name,1 AS rootpage,'table' AS type UNION ALL SELECT name,rootpage,type FROM \"%w\".sqlite_schema WHERE rootpage!=0)\x00WHERE name=%Q\x00 ORDER BY name\x00dbstat\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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 9f8fb208..184d08cc 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -167,6 +167,7 @@ const (
 	DBFLAG_SchemaKnownOk                  = 0x0010
 	DBFLAG_Vacuum                         = 0x0004
 	DBFLAG_VacuumInto                     = 0x0008
+	DBSTAT_PAGE_PADDING_BYTES             = 256
 	DB_ResetWanted                        = 0x0008
 	DB_SchemaLoaded                       = 0x0001
 	DB_UnresetViews                       = 0x0002
@@ -675,11 +676,11 @@ const (
 	NC_OrderAgg                           = 0x8000000
 	NC_PartIdx                            = 0x000002
 	NC_SelfRef                            = 0x00002e
+	NC_Subquery                           = 0x000040
 	NC_UAggInfo                           = 0x000100
 	NC_UBaseReg                           = 0x000400
 	NC_UEList                             = 0x000080
 	NC_UUpsert                            = 0x000200
-	NC_VarSelect                          = 0x000040
 	NDEBUG                                = 1
 	NMEADISC                              = 7
 	NN                                    = 1
@@ -1436,6 +1437,7 @@ const (
 	SQLITE_ECEL_REF                       = 0x04
 	SQLITE_EMPTY                          = 16
 	SQLITE_ENABLE_COLUMN_METADATA         = 1
+	SQLITE_ENABLE_DBSTAT_VTAB             = 1
 	SQLITE_ENABLE_FTS5                    = 1
 	SQLITE_ENABLE_GEOPOLY                 = 1
 	SQLITE_ENABLE_LOCKING_STYLE           = 0
@@ -1836,7 +1838,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
+	SQLITE_SOURCE_ID                      = "2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -1944,8 +1946,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.41.0"
-	SQLITE_VERSION_NUMBER                 = 3041000
+	SQLITE_VERSION                        = "3.41.2"
+	SQLITE_VERSION_NUMBER                 = 3041002
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -5209,7 +5211,8 @@ type IndexedExpr1 = struct {
 	FiIdxCur       int32
 	FiIdxCol       int32
 	FbMaybeNullRow U8
-	F__ccgo_pad1   [3]byte
+	Faff           U8
+	F__ccgo_pad1   [2]byte
 	FpIENext       uintptr
 }
 
@@ -5851,17 +5854,18 @@ type Pager = Pager1
 
 // Handle type for pages.
 type PgHdr2 = struct {
-	FpPage      uintptr
-	FpData      uintptr
-	FpExtra     uintptr
-	FpCache     uintptr
-	FpDirty     uintptr
-	FpPager     uintptr
-	Fpgno       Pgno
-	Fflags      U16
-	FnRef       I16
-	FpDirtyNext uintptr
-	FpDirtyPrev uintptr
+	FpPage       uintptr
+	FpData       uintptr
+	FpExtra      uintptr
+	FpCache      uintptr
+	FpDirty      uintptr
+	FpPager      uintptr
+	Fpgno        Pgno
+	Fflags       U16
+	F__ccgo_pad1 [2]byte
+	FnRef        I64
+	FpDirtyNext  uintptr
+	FpDirtyPrev  uintptr
 }
 
 // Handle type for pages.
@@ -6082,14 +6086,14 @@ type PCache2 = struct {
 	FpDirty      uintptr
 	FpDirtyTail  uintptr
 	FpSynced     uintptr
-	FnRefSum     int32
+	FnRefSum     I64
 	FszCache     int32
 	FszSpill     int32
 	FszPage      int32
 	FszExtra     int32
 	FbPurgeable  U8
 	FeCreate     U8
-	F__ccgo_pad1 [2]byte
+	F__ccgo_pad1 [6]byte
 	FxStress     uintptr
 	FpStress     uintptr
 	FpCache      uintptr
@@ -6348,7 +6352,7 @@ type CoveringIndexCheck1 = struct {
 	F__ccgo_pad1 [2]byte
 }
 
-var sqlite3azCompileOpt = [52]uintptr{
+var sqlite3azCompileOpt = [53]uintptr{
 	ts + 7,
 	ts + 27,
 	ts + 49,
@@ -6367,40 +6371,41 @@ var sqlite3azCompileOpt = [52]uintptr{
 	ts + 365,
 	ts + 390,
 	ts + 413,
-	ts + 425,
-	ts + 440,
-	ts + 462,
-	ts + 487,
-	ts + 510,
-	ts + 532,
-	ts + 543,
-	ts + 556,
-	ts + 571,
-	ts + 587,
-	ts + 600,
-	ts + 621,
-	ts + 645,
-	ts + 668,
-	ts + 684,
-	ts + 700,
-	ts + 724,
-	ts + 751,
-	ts + 771,
-	ts + 792,
-	ts + 814,
-	ts + 844,
-	ts + 860,
-	ts + 886,
-	ts + 906,
-	ts + 932,
-	ts + 955,
-	ts + 981,
-	ts + 1003,
-	ts + 1024,
-	ts + 1035,
+	ts + 432,
+	ts + 444,
+	ts + 459,
+	ts + 481,
+	ts + 506,
+	ts + 529,
+	ts + 551,
+	ts + 562,
+	ts + 575,
+	ts + 590,
+	ts + 606,
+	ts + 619,
+	ts + 640,
+	ts + 664,
+	ts + 687,
+	ts + 703,
+	ts + 719,
+	ts + 743,
+	ts + 770,
+	ts + 790,
+	ts + 811,
+	ts + 833,
+	ts + 863,
+	ts + 879,
+	ts + 905,
+	ts + 925,
+	ts + 951,
+	ts + 974,
+	ts + 1000,
+	ts + 1022,
 	ts + 1043,
-	ts + 1057,
-	ts + 1070,
+	ts + 1054,
+	ts + 1062,
+	ts + 1076,
+	ts + 1089,
 }
 
 func Xsqlite3CompileOptions(tls *libc.TLS, pnOpt uintptr) uintptr {
@@ -6551,7 +6556,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 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))
+var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1102))
 
 // Standard typenames.  These names must match the COLTYPE_* definitions.
 // Adjust the SQLITE_N_STDTYPE value if adding or removing entries.
@@ -6573,12 +6578,12 @@ var Xsqlite3StdTypeAffinity = [6]int8{
 	int8(SQLITE_AFF_TEXT),
 }
 var Xsqlite3StdType = [6]uintptr{
-	ts + 1090,
-	ts + 1094,
-	ts + 1099,
-	ts + 1103,
-	ts + 1111,
-	ts + 1116,
+	ts + 1109,
+	ts + 1113,
+	ts + 1118,
+	ts + 1122,
+	ts + 1130,
+	ts + 1135,
 }
 
 // SQL is translated into a sequence of instructions to be
@@ -6895,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, 23229)
+		return Xsqlite3MisuseError(tls, 23233)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -7288,7 +7293,7 @@ __6:
 __4:
 	;
 	zDate++
-	if !(getDigits(tls, zDate, ts+1121, libc.VaList(bp, bp+16, bp+20)) != 2) {
+	if !(getDigits(tls, zDate, ts+1140, libc.VaList(bp, bp+16, bp+20)) != 2) {
 		goto __9
 	}
 	return 1
@@ -7314,13 +7319,13 @@ func parseHhMmSs(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	defer tls.Free(36)
 
 	var ms float64 = 0.0
-	if getDigits(tls, zDate, ts+1129, libc.VaList(bp, bp+24, bp+28)) != 2 {
+	if getDigits(tls, zDate, ts+1148, libc.VaList(bp, bp+24, bp+28)) != 2 {
 		return 1
 	}
 	zDate += uintptr(5)
 	if int32(*(*int8)(unsafe.Pointer(zDate))) == ':' {
 		zDate++
-		if getDigits(tls, zDate, ts+1137, libc.VaList(bp+16, bp+32)) != 1 {
+		if getDigits(tls, zDate, ts+1156, libc.VaList(bp+16, bp+32)) != 1 {
 			return 1
 		}
 		zDate += uintptr(2)
@@ -7418,7 +7423,7 @@ func parseYyyyMmDd(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	} else {
 		neg = 0
 	}
-	if getDigits(tls, zDate, ts+1141, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
+	if getDigits(tls, zDate, ts+1160, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
 		return 1
 	}
 	zDate += uintptr(10)
@@ -7475,7 +7480,7 @@ func parseDateOrTime(tls *libc.TLS, context uintptr, zDate uintptr, p uintptr) i
 		return 0
 	} else if parseHhMmSs(tls, zDate, p) == 0 {
 		return 0
-	} else if Xsqlite3StrICmp(tls, zDate, ts+1153) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
+	} else if Xsqlite3StrICmp(tls, zDate, ts+1172) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
 		return setDateTimeToCurrent(tls, context, p)
 	} else if Xsqlite3AtoF(tls, zDate, bp, Xsqlite3Strlen30(tls, zDate), uint8(SQLITE_UTF8)) > 0 {
 		setRawDateNumber(tls, p, *(*float64)(unsafe.Pointer(bp)))
@@ -7608,7 +7613,7 @@ func toLocaltime(tls *libc.TLS, p uintptr, pCtx uintptr) int32 {
 		*(*Time_t)(unsafe.Pointer(bp + 104)) = (*DateTime)(unsafe.Pointer(p)).FiJD/int64(1000) - int64(21086676)*int64(10000)
 	}
 	if osLocaltime(tls, bp+104, bp) != 0 {
-		Xsqlite3_result_error(tls, pCtx, ts+1157, -1)
+		Xsqlite3_result_error(tls, pCtx, ts+1176, -1)
 		return SQLITE_ERROR
 	}
 	(*DateTime)(unsafe.Pointer(p)).FY = (*tm)(unsafe.Pointer(bp)).Ftm_year + 1900 - iYearDiff
@@ -7632,12 +7637,12 @@ var aXformType = [6]struct {
 	FrLimit float32
 	FrXform float32
 }{
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1180)), FrLimit: 4.6427e+14, FrXform: 1.0},
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1187)), FrLimit: 7.7379e+12, FrXform: 60.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1194)), FrLimit: 1.2897e+11, FrXform: 3600.0},
-	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1201)), FrLimit: 5373485.0, FrXform: 86400.0},
-	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1208)), FrLimit: 176546.0, FrXform: 2592000.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1215)), FrLimit: 14713.0, FrXform: 31536000.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1199)), FrLimit: 4.6427e+14, FrXform: 1.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1206)), FrLimit: 7.7379e+12, FrXform: 60.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1213)), FrLimit: 1.2897e+11, FrXform: 3600.0},
+	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1220)), FrLimit: 5373485.0, FrXform: 86400.0},
+	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1227)), FrLimit: 176546.0, FrXform: 2592000.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1234)), FrLimit: 14713.0, FrXform: 31536000.0},
 }
 
 func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, idx int32) int32 {
@@ -7649,7 +7654,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 	switch int32(Xsqlite3UpperToLower[U8(*(*int8)(unsafe.Pointer(z)))]) {
 	case 'a':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1222) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1241) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -7671,7 +7676,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'j':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1227) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1246) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -7685,7 +7690,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'l':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1237) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1256) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				rc = toLocaltime(tls, p, pCtx)
 			}
 			break
@@ -7693,7 +7698,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'u':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1247) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1266) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -7705,7 +7710,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 					rc = 0
 				}
-			} else if Xsqlite3_stricmp(tls, z, ts+1257) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1276) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				if int32((*DateTime)(unsafe.Pointer(p)).FtzSet) == 0 {
 					var iOrigJD I64
 					var iGuess I64
@@ -7739,7 +7744,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'w':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1261, 8) == 0 &&
+			if Xsqlite3_strnicmp(tls, z, ts+1280, 8) == 0 &&
 				Xsqlite3AtoF(tls, z+8, bp+48, Xsqlite3Strlen30(tls, z+8), uint8(SQLITE_UTF8)) > 0 &&
 				*(*float64)(unsafe.Pointer(bp + 48)) >= 0.0 && *(*float64)(unsafe.Pointer(bp + 48)) < 7.0 && float64(libc.AssignInt32(&n, int32(*(*float64)(unsafe.Pointer(bp + 48))))) == *(*float64)(unsafe.Pointer(bp + 48)) {
 				var Z Sqlite3_int64
@@ -7760,7 +7765,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 's':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1270, 9) != 0 {
+			if Xsqlite3_strnicmp(tls, z, ts+1289, 9) != 0 {
 				break
 			}
 			if !(int32((*DateTime)(unsafe.Pointer(p)).FvalidJD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidYMD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidHMS) != 0) {
@@ -7774,14 +7779,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 			(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidTZ = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidJD = int8(0)
-			if Xsqlite3_stricmp(tls, z, ts+1280) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1299) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1286) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1305) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FM = 1
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1291) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1310) == 0 {
 				rc = 0
 			}
 			break
@@ -8107,7 +8112,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		switch int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) {
 		case 'd':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1295, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1314, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
 				break
 
 			}
@@ -8117,13 +8122,13 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if s > 59.999 {
 					s = 59.999
 				}
-				Xsqlite3_str_appendf(tls, bp+136, ts+1300, libc.VaList(bp+8, s))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1319, libc.VaList(bp+8, s))
 				break
 
 			}
 		case 'H':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1295, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1314, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
 				break
 
 			}
@@ -8141,41 +8146,41 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) == 'W' {
 					var wd int32
 					wd = int32(((*DateTime)(unsafe.Pointer(bp+88)).FiJD + int64(43200000)) / int64(86400000) % int64(7))
-					Xsqlite3_str_appendf(tls, bp+136, ts+1295, libc.VaList(bp+24, (nDay+7-wd)/7))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1314, libc.VaList(bp+24, (nDay+7-wd)/7))
 				} else {
-					Xsqlite3_str_appendf(tls, bp+136, ts+1307, libc.VaList(bp+32, nDay+1))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1326, libc.VaList(bp+32, nDay+1))
 				}
 				break
 
 			}
 		case 'J':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1312, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1331, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
 				break
 
 			}
 		case 'm':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1295, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1314, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
 				break
 
 			}
 		case 'M':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1295, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1314, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
 				break
 
 			}
 		case 's':
 			{
 				var iS I64 = (*DateTime)(unsafe.Pointer(bp+88)).FiJD/int64(1000) - int64(21086676)*int64(10000)
-				Xsqlite3_str_appendf(tls, bp+136, ts+1318, libc.VaList(bp+64, iS))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1337, libc.VaList(bp+64, iS))
 				break
 
 			}
 		case 'S':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1295, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1314, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
 				break
 
 			}
@@ -8188,7 +8193,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			}
 		case 'Y':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1342, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
 				break
 
 			}
@@ -8238,15 +8243,15 @@ func Xsqlite3RegisterDateTimeFunctions(tls *libc.TLS) {
 }
 
 var aDateTimeFuncs = [9]FuncDef{
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1227},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1247},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1328},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1333},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1338},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1246},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1266},
 	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1347},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1356},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1369},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1387}}
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1352},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1357},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1366},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1375},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1388},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1406}}
 
 // The following routines are convenience wrappers around methods
 // of the sqlite3_file object.  This is mostly just syntactic sugar. All
@@ -8658,7 +8663,7 @@ func sqlite3MemMalloc(tls *libc.TLS, nByte int32) uintptr {
 		*(*Sqlite3_int64)(unsafe.Pointer(p)) = Sqlite3_int64(nByte)
 		p += 8
 	} else {
-		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1400, libc.VaList(bp, nByte))
+		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1419, libc.VaList(bp, nByte))
 	}
 	return p
 }
@@ -8691,7 +8696,7 @@ func sqlite3MemRealloc(tls *libc.TLS, pPrior uintptr, nByte int32) uintptr {
 		p += 8
 	} else {
 		Xsqlite3_log(tls, SQLITE_NOMEM,
-			ts+1438,
+			ts+1457,
 			libc.VaList(bp, sqlite3MemSize(tls, pPrior), nByte))
 	}
 	return p
@@ -9567,7 +9572,7 @@ func Xsqlite3OomFault(tls *libc.TLS, db uintptr) uintptr {
 		(*Sqlite3)(unsafe.Pointer(db)).Flookaside.Fsz = U16(0)
 		if (*Sqlite3)(unsafe.Pointer(db)).FpParse != 0 {
 			var pParse uintptr
-			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1474, 0)
+			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1493, 0)
 			(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 			for pParse = (*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).FpOuterParse; pParse != 0; pParse = (*Parse)(unsafe.Pointer(pParse)).FpOuterParse {
 				(*Parse)(unsafe.Pointer(pParse)).FnErr++
@@ -9640,8 +9645,8 @@ type et_info = struct {
 // by an instance of the following structure
 type Et_info = et_info
 
-var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1488))
-var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1521))
+var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1507))
+var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1540))
 var fmtinfo = [23]Et_info{
 	{Ffmttype: int8('d'), Fbase: EtByte(10), Fflags: EtByte(1), Ftype: EtByte(EtDECIMAL)},
 	{Ffmttype: int8('s'), Fflags: EtByte(4), Ftype: EtByte(EtSTRING)},
@@ -9855,7 +9860,7 @@ __6:
 	if !(libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(libc.PreIncUintptr(&fmt, 1))))) == 0) {
 		goto __11
 	}
-	Xsqlite3_str_append(tls, pAccum, ts+1528, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1547, 1)
 	goto __5
 __11:
 	;
@@ -10416,7 +10421,7 @@ __125:
 	if !(Xsqlite3IsNaN(tls, *(*float64)(unsafe.Pointer(bp + 104))) != 0) {
 		goto __127
 	}
-	bufpt = ts + 1530
+	bufpt = ts + 1549
 	length = 3
 	goto __58
 __127:
@@ -10476,7 +10481,7 @@ __138:
 	}
 	bufpt = bp + 16
 	*(*int8)(unsafe.Pointer(bp + 16)) = prefix
-	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1534, uint64(4))
+	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1553, uint64(4))
 	length = 3 + libc.Bool32(int32(prefix) != 0)
 	goto __58
 __139:
@@ -10842,7 +10847,7 @@ __200:
 	if !(bufpt == uintptr(0)) {
 		goto __201
 	}
-	bufpt = ts + 1538
+	bufpt = ts + 1557
 	goto __202
 __201:
 	if !(int32(xtype) == EtDYNSTRING) {
@@ -10966,9 +10971,9 @@ __222:
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
-			return ts + 1539
+			return ts + 1558
 		}
-		return ts + 1544
+		return ts + 1563
 	}()
 __223:
 	;
@@ -11116,7 +11121,7 @@ __246:
 		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
-	Xsqlite3_str_append(tls, pAccum, ts+1551, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1570, 1)
 __250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
@@ -11133,10 +11138,10 @@ __251:
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
 		goto __253
 	}
-	Xsqlite3_str_appendf(tls, pAccum, ts+1553, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1572, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 	goto __254
 __253:
-	Xsqlite3_str_appendf(tls, pAccum, ts+1563, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1582, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
 __254:
 	;
 __252:
@@ -11191,7 +11196,7 @@ __4:
 __5:
 }
 
-var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1577))
+var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1596))
 
 // The z string points to the first character of a token that is
 // associated with an error.  If db does not already have an error
@@ -11356,7 +11361,7 @@ func Xsqlite3ResultStrAccum(tls *libc.TLS, pCtx uintptr, p uintptr) {
 	} else if int32((*StrAccum)(unsafe.Pointer(p)).FprintfFlags)&SQLITE_PRINTF_MALLOCED != 0 {
 		Xsqlite3_result_text(tls, pCtx, (*StrAccum)(unsafe.Pointer(p)).FzText, int32((*StrAccum)(unsafe.Pointer(p)).FnChar), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 	} else {
-		Xsqlite3_result_text(tls, pCtx, ts+1538, 0, uintptr(0))
+		Xsqlite3_result_text(tls, pCtx, ts+1557, 0, uintptr(0))
 		Xsqlite3_str_reset(tls, p)
 	}
 }
@@ -13077,7 +13082,7 @@ func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
 	var c int32 = 0
 	var i int32
 
-	var pow63 uintptr = ts + 1586
+	var pow63 uintptr = ts + 1605
 	for i = 0; c == 0 && i < 18; i++ {
 		c = (int32(*(*int8)(unsafe.Pointer(zNum + uintptr(i*incr)))) - int32(*(*int8)(unsafe.Pointer(pow63 + uintptr(i))))) * 10
 	}
@@ -13623,7 +13628,7 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 	defer tls.Free(8)
 
 	Xsqlite3_log(tls, SQLITE_MISUSE,
-		ts+1605,
+		ts+1624,
 		libc.VaList(bp, zType))
 }
 
@@ -13642,13 +13647,13 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 func Xsqlite3SafetyCheckOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	if db == uintptr(0) {
-		logBadConnection(tls, ts+1539)
+		logBadConnection(tls, ts+1558)
 		return 0
 	}
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_OPEN {
 		if Xsqlite3SafetyCheckSickOrOk(tls, db) != 0 {
-			logBadConnection(tls, ts+1650)
+			logBadConnection(tls, ts+1669)
 		}
 		return 0
 	} else {
@@ -13661,7 +13666,7 @@ func Xsqlite3SafetyCheckSickOrOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_SICK && int32(eOpenState) != SQLITE_STATE_OPEN && int32(eOpenState) != SQLITE_STATE_BUSY {
-		logBadConnection(tls, ts+1659)
+		logBadConnection(tls, ts+1678)
 		return 0
 	} else {
 		return 1
@@ -14187,193 +14192,193 @@ func Xsqlite3OpcodeName(tls *libc.TLS, i int32) uintptr {
 }
 
 var azName = [187]uintptr{
-	ts + 1667,
-	ts + 1677,
-	ts + 1688,
-	ts + 1700,
-	ts + 1711,
-	ts + 1723,
+	ts + 1686,
+	ts + 1696,
+	ts + 1707,
+	ts + 1719,
 	ts + 1730,
-	ts + 1738,
-	ts + 1746,
-	ts + 1751,
-	ts + 1756,
-	ts + 1762,
-	ts + 1776,
-	ts + 1782,
-	ts + 1792,
-	ts + 1797,
-	ts + 1802,
-	ts + 1805,
+	ts + 1742,
+	ts + 1749,
+	ts + 1757,
+	ts + 1765,
+	ts + 1770,
+	ts + 1775,
+	ts + 1781,
+	ts + 1795,
+	ts + 1801,
 	ts + 1811,
-	ts + 1818,
-	ts + 1822,
-	ts + 1832,
-	ts + 1839,
-	ts + 1846,
-	ts + 1853,
-	ts + 1860,
-	ts + 1870,
+	ts + 1816,
+	ts + 1821,
+	ts + 1824,
+	ts + 1830,
+	ts + 1837,
+	ts + 1841,
+	ts + 1851,
+	ts + 1858,
+	ts + 1865,
+	ts + 1872,
 	ts + 1879,
-	ts + 1890,
-	ts + 1899,
-	ts + 1905,
-	ts + 1915,
-	ts + 1925,
-	ts + 1930,
-	ts + 1940,
-	ts + 1951,
-	ts + 1956,
-	ts + 1963,
-	ts + 1974,
-	ts + 1979,
-	ts + 1984,
-	ts + 1990,
-	ts + 1996,
-	ts + 2002,
-	ts + 2005,
+	ts + 1889,
+	ts + 1898,
+	ts + 1909,
+	ts + 1918,
+	ts + 1924,
+	ts + 1934,
+	ts + 1944,
+	ts + 1949,
+	ts + 1959,
+	ts + 1970,
+	ts + 1975,
+	ts + 1982,
+	ts + 1993,
+	ts + 1998,
+	ts + 2003,
 	ts + 2009,
 	ts + 2015,
-	ts + 2026,
-	ts + 2037,
+	ts + 2021,
+	ts + 2024,
+	ts + 2028,
+	ts + 2034,
 	ts + 2045,
-	ts + 2054,
-	ts + 2061,
-	ts + 2069,
-	ts + 2072,
-	ts + 2075,
-	ts + 2078,
-	ts + 2081,
-	ts + 2084,
-	ts + 2087,
+	ts + 2056,
+	ts + 2064,
+	ts + 2073,
+	ts + 2080,
+	ts + 2088,
+	ts + 2091,
 	ts + 2094,
+	ts + 2097,
 	ts + 2100,
-	ts + 2110,
-	ts + 2123,
-	ts + 2134,
-	ts + 2140,
-	ts + 2147,
-	ts + 2156,
-	ts + 2165,
-	ts + 2172,
-	ts + 2185,
-	ts + 2196,
-	ts + 2201,
-	ts + 2209,
+	ts + 2103,
+	ts + 2106,
+	ts + 2113,
+	ts + 2119,
+	ts + 2129,
+	ts + 2142,
+	ts + 2153,
+	ts + 2159,
+	ts + 2166,
+	ts + 2175,
+	ts + 2184,
+	ts + 2191,
+	ts + 2204,
 	ts + 2215,
-	ts + 2222,
+	ts + 2220,
+	ts + 2228,
 	ts + 2234,
-	ts + 2239,
-	ts + 2248,
+	ts + 2241,
 	ts + 2253,
-	ts + 2262,
+	ts + 2258,
 	ts + 2267,
 	ts + 2272,
-	ts + 2278,
+	ts + 2281,
 	ts + 2286,
-	ts + 2294,
-	ts + 2304,
-	ts + 2312,
-	ts + 2319,
-	ts + 2332,
-	ts + 2337,
-	ts + 2349,
-	ts + 2357,
-	ts + 2364,
-	ts + 2375,
-	ts + 2382,
-	ts + 2389,
-	ts + 2399,
+	ts + 2291,
+	ts + 2297,
+	ts + 2305,
+	ts + 2313,
+	ts + 2323,
+	ts + 2331,
+	ts + 2338,
+	ts + 2351,
+	ts + 2356,
+	ts + 2368,
+	ts + 2376,
+	ts + 2383,
+	ts + 2394,
+	ts + 2401,
 	ts + 2408,
-	ts + 2419,
-	ts + 2425,
-	ts + 2436,
-	ts + 2446,
-	ts + 2456,
-	ts + 2463,
-	ts + 2469,
-	ts + 2479,
-	ts + 2490,
-	ts + 2494,
-	ts + 2503,
-	ts + 2512,
-	ts + 2519,
-	ts + 2529,
-	ts + 2536,
-	ts + 2545,
+	ts + 2418,
+	ts + 2427,
+	ts + 2438,
+	ts + 2444,
+	ts + 2455,
+	ts + 2465,
+	ts + 2475,
+	ts + 2482,
+	ts + 2488,
+	ts + 2498,
+	ts + 2509,
+	ts + 2513,
+	ts + 2522,
+	ts + 2531,
+	ts + 2538,
+	ts + 2548,
 	ts + 2555,
-	ts + 2562,
-	ts + 2570,
-	ts + 2584,
-	ts + 2592,
-	ts + 2606,
-	ts + 2617,
-	ts + 2630,
-	ts + 2641,
-	ts + 2647,
-	ts + 2659,
-	ts + 2668,
-	ts + 2676,
-	ts + 2685,
-	ts + 2694,
-	ts + 2701,
-	ts + 2709,
-	ts + 2716,
-	ts + 2727,
-	ts + 2741,
-	ts + 2752,
+	ts + 2564,
+	ts + 2574,
+	ts + 2581,
+	ts + 2589,
+	ts + 2603,
+	ts + 2611,
+	ts + 2625,
+	ts + 2636,
+	ts + 2649,
+	ts + 2660,
+	ts + 2666,
+	ts + 2678,
+	ts + 2687,
+	ts + 2695,
+	ts + 2704,
+	ts + 2713,
+	ts + 2720,
+	ts + 2728,
+	ts + 2735,
+	ts + 2746,
 	ts + 2760,
-	ts + 2766,
-	ts + 2774,
-	ts + 2782,
-	ts + 2792,
-	ts + 2805,
-	ts + 2815,
-	ts + 2828,
-	ts + 2837,
-	ts + 2848,
+	ts + 2771,
+	ts + 2779,
+	ts + 2785,
+	ts + 2793,
+	ts + 2801,
+	ts + 2811,
+	ts + 2824,
+	ts + 2834,
+	ts + 2847,
 	ts + 2856,
-	ts + 2862,
-	ts + 2874,
-	ts + 2886,
-	ts + 2894,
-	ts + 2906,
-	ts + 2919,
-	ts + 2929,
-	ts + 2939,
-	ts + 2944,
-	ts + 2956,
-	ts + 2968,
-	ts + 2978,
-	ts + 2984,
-	ts + 2994,
-	ts + 3001,
+	ts + 2867,
+	ts + 2875,
+	ts + 2881,
+	ts + 2893,
+	ts + 2905,
+	ts + 2913,
+	ts + 2925,
+	ts + 2938,
+	ts + 2948,
+	ts + 2958,
+	ts + 2963,
+	ts + 2975,
+	ts + 2987,
+	ts + 2997,
+	ts + 3003,
 	ts + 3013,
-	ts + 3024,
+	ts + 3020,
 	ts + 3032,
-	ts + 3041,
-	ts + 3050,
-	ts + 3059,
-	ts + 3066,
-	ts + 3077,
-	ts + 3090,
-	ts + 3100,
-	ts + 3107,
-	ts + 3115,
-	ts + 3124,
-	ts + 3130,
-	ts + 3138,
-	ts + 3146,
-	ts + 3154,
-	ts + 3164,
+	ts + 3043,
+	ts + 3051,
+	ts + 3060,
+	ts + 3069,
+	ts + 3078,
+	ts + 3085,
+	ts + 3096,
+	ts + 3109,
+	ts + 3119,
+	ts + 3126,
+	ts + 3134,
+	ts + 3143,
+	ts + 3149,
+	ts + 3157,
+	ts + 3165,
 	ts + 3173,
-	ts + 3184,
-	ts + 3194,
-	ts + 3200,
-	ts + 3211,
-	ts + 3222,
-	ts + 3227,
-	ts + 3235,
+	ts + 3183,
+	ts + 3192,
+	ts + 3203,
+	ts + 3213,
+	ts + 3219,
+	ts + 3230,
+	ts + 3241,
+	ts + 3246,
+	ts + 3254,
 }
 
 type timeval = struct {
@@ -14581,35 +14586,35 @@ type unix_syscall = struct {
 }
 
 var aSyscall = [29]unix_syscall{
-	{FzName: ts + 3245, FpCurrent: 0},
-	{FzName: ts + 3250, FpCurrent: 0},
-	{FzName: ts + 3256, FpCurrent: 0},
-	{FzName: ts + 3263, FpCurrent: 0},
-	{FzName: ts + 3270, FpCurrent: 0},
+	{FzName: ts + 3264, FpCurrent: 0},
+	{FzName: ts + 3269, FpCurrent: 0},
 	{FzName: ts + 3275, FpCurrent: 0},
-	{FzName: ts + 3281, FpCurrent: 0},
-	{FzName: ts + 3291, FpCurrent: 0},
-	{FzName: ts + 3297, FpCurrent: 0},
-	{FzName: ts + 3302},
-	{FzName: ts + 3308},
+	{FzName: ts + 3282, FpCurrent: 0},
+	{FzName: ts + 3289, FpCurrent: 0},
+	{FzName: ts + 3294, FpCurrent: 0},
+	{FzName: ts + 3300, FpCurrent: 0},
+	{FzName: ts + 3310, FpCurrent: 0},
 	{FzName: ts + 3316, FpCurrent: 0},
-	{FzName: ts + 3322},
-	{FzName: ts + 3329},
-	{FzName: ts + 3338, FpCurrent: 0},
-	{FzName: ts + 3345},
-	{FzName: ts + 3355, FpCurrent: 0},
-	{FzName: ts + 3362, FpCurrent: 0},
-	{FzName: ts + 3376, FpCurrent: 0},
-	{FzName: ts + 3382, FpCurrent: 0},
-	{FzName: ts + 3388, FpCurrent: 0},
+	{FzName: ts + 3321},
+	{FzName: ts + 3327},
+	{FzName: ts + 3335, FpCurrent: 0},
+	{FzName: ts + 3341},
+	{FzName: ts + 3348},
+	{FzName: ts + 3357, FpCurrent: 0},
+	{FzName: ts + 3364},
+	{FzName: ts + 3374, FpCurrent: 0},
+	{FzName: ts + 3381, FpCurrent: 0},
 	{FzName: ts + 3395, FpCurrent: 0},
-	{FzName: ts + 3403, FpCurrent: 0},
-	{FzName: ts + 3408, FpCurrent: 0},
-	{FzName: ts + 3415},
+	{FzName: ts + 3401, FpCurrent: 0},
+	{FzName: ts + 3407, FpCurrent: 0},
+	{FzName: ts + 3414, FpCurrent: 0},
 	{FzName: ts + 3422, FpCurrent: 0},
-	{FzName: ts + 3434, FpCurrent: 0},
-	{FzName: ts + 3443, FpCurrent: 0},
-	{FzName: ts + 3449},
+	{FzName: ts + 3427, FpCurrent: 0},
+	{FzName: ts + 3434},
+	{FzName: ts + 3441, FpCurrent: 0},
+	{FzName: ts + 3453, FpCurrent: 0},
+	{FzName: ts + 3462, FpCurrent: 0},
+	{FzName: ts + 3468},
 }
 
 func robustFchown(tls *libc.TLS, fd int32, uid Uid_t, gid Gid_t) int32 {
@@ -14707,9 +14712,9 @@ func robust_open(tls *libc.TLS, z uintptr, f int32, m Mode_t) int32 {
 		}
 		(*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, fd)
 		Xsqlite3_log(tls, SQLITE_WARNING,
-			ts+3455, libc.VaList(bp, z, fd))
+			ts+3474, libc.VaList(bp, z, fd))
 		fd = -1
-		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3498, O_RDONLY, int32(m)) < 0 {
+		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3517, O_RDONLY, int32(m)) < 0 {
 			break
 		}
 	}
@@ -14789,13 +14794,13 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 	var zErr uintptr
 	var iErrno int32 = *(*int32)(unsafe.Pointer(libc.X__errno(tls)))
 
-	zErr = ts + 1538
+	zErr = ts + 1557
 
 	if zPath == uintptr(0) {
-		zPath = ts + 1538
+		zPath = ts + 1557
 	}
 	Xsqlite3_log(tls, errcode,
-		ts+3508,
+		ts+3527,
 		libc.VaList(bp, iLine, iErrno, zFunc, zPath, zErr))
 
 	return errcode
@@ -14803,7 +14808,7 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 
 func robust_close(tls *libc.TLS, pFile uintptr, h int32, lineno int32) {
 	if (*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, h) != 0 {
-		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3250,
+		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3269,
 			func() uintptr {
 				if pFile != 0 {
 					return (*UnixFile)(unsafe.Pointer(pFile)).FzPath
@@ -14824,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, 38271)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38275)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -14926,19 +14931,19 @@ func verifyDbFile(tls *libc.TLS, pFile uintptr) {
 
 	rc = (*(*func(*libc.TLS, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 5*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, bp+32)
 	if rc != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3539, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3558, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink == Nlink_t(0) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3563, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3582, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink > Nlink_t(1) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3592, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3611, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if fileHasMoved(tls, pFile) != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3619, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3638, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 }
@@ -15300,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, 39055)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39059)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -15560,7 +15565,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	var ii int32
 	var fd int32 = -1
 
-	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3647, libc.VaList(bp, zFilename))
+	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3666, libc.VaList(bp, zFilename))
 	for ii = int32(libc.Xstrlen(tls, bp+8)); ii > 0 && int32(*(*int8)(unsafe.Pointer(bp + 8 + uintptr(ii)))) != '/'; ii-- {
 	}
 	if ii > 0 {
@@ -15578,7 +15583,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3362, bp+8, 40676)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40680), ts+3381, bp+8, 40680)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -15595,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, 40717)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3669, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40721)
 	}
 
 	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)), 40731)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40735)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -15622,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, 40762)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3300, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40766)
 	} else {
 		return SQLITE_OK
 	}
@@ -15673,7 +15678,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 				if iWrite >= nSize {
 					iWrite = nSize - int64(1)
 				}
-				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1538, 1)
+				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1557, 1)
 				if nWrite != 1 {
 					return SQLITE_IOERR | int32(3)<<8
 				}
@@ -15741,7 +15746,7 @@ func unixFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 		}
 	case SQLITE_FCNTL_VFSNAME:
 		{
-			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
+			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
 			return SQLITE_OK
 
 		}
@@ -15877,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, 41442)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41446)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -15905,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, 41499)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3300, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41503)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -15968,7 +15973,7 @@ __4:
 	;
 	libc.Xmemset(tls, pShmNode, 0, uint64(unsafe.Sizeof(unixShmNode{}))+uint64(nShmFilename))
 	zShm = libc.AssignPtrUintptr(pShmNode+16, pShmNode+1*96)
-	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3661, libc.VaList(bp, zBasePath))
+	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3680, libc.VaList(bp, zBasePath))
 
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = -1
 	(*UnixInodeInfo)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pDbFd)).FpInode)).FpShmNode = pShmNode
@@ -15989,7 +15994,7 @@ __5:
 	if !(int32((*UnixInodeInfo)(unsafe.Pointer(pInode)).FbProcessLock) == 0) {
 		goto __7
 	}
-	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3668, 0)) {
+	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3687, 0)) {
 		goto __8
 	}
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = robust_open(tls, zShm, O_RDWR|O_CREAT|O_NOFOLLOW,
@@ -16004,7 +16009,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3245, zShm, 41624)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41628), ts+3264, zShm, 41628)
 	goto shm_open_err
 __10:
 	;
@@ -16130,11 +16135,11 @@ __11:
 		goto __13
 	}
 	*(*int32)(unsafe.Pointer(bp + 128)) = 0
-	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1538, 1, bp+128) != 1) {
+	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1557, 1, bp+128) != 1) {
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3316, zFile, 41768)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3335, zFile, 41772)
 	goto shmpage_out
 __14:
 	;
@@ -16180,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, 41795)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3422, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41799)
 	goto shmpage_out
 __20:
 	;
@@ -16433,10 +16438,10 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		}
 		return uintptr(0)
 	}(),
-		ts+3681, SQLITE_POWERSAFE_OVERWRITE) != 0 {
+		ts+3700, SQLITE_POWERSAFE_OVERWRITE) != 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_PSOW)
 	}
-	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3686) == 0 {
+	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3705) == 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_EXCL)
 	}
 
@@ -16452,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, 42672)
+			robust_close(tls, pNew, h, 42676)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -16465,7 +16470,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		if zLockFile == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
-			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3696, libc.VaList(bp, zFilename))
+			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3715, libc.VaList(bp, zFilename))
 		}
 		(*UnixFile)(unsafe.Pointer(pNew)).FlockingContext = zLockFile
 	}
@@ -16473,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, 42757)
+			robust_close(tls, pNew, h, 42761)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -16486,15 +16491,15 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 var azTempDirs = [6]uintptr{
 	uintptr(0),
 	uintptr(0),
-	ts + 3704,
-	ts + 3713,
-	ts + 3722,
-	ts + 1551,
+	ts + 3723,
+	ts + 3732,
+	ts + 3741,
+	ts + 1570,
 }
 
 func unixTempFileInit(tls *libc.TLS) {
-	azTempDirs[0] = libc.Xgetenv(tls, ts+3727)
-	azTempDirs[1] = libc.Xgetenv(tls, ts+3741)
+	azTempDirs[0] = libc.Xgetenv(tls, ts+3746)
+	azTempDirs[1] = libc.Xgetenv(tls, ts+3760)
 }
 
 func unixTempFileDir(tls *libc.TLS) uintptr {
@@ -16539,7 +16544,7 @@ func unixGetTempname(tls *libc.TLS, nBuf int32, zBuf uintptr) int32 {
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U64(0))), bp+24)
 
 			*(*int8)(unsafe.Pointer(zBuf + uintptr(nBuf-2))) = int8(0)
-			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3748,
+			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3767,
 				libc.VaList(bp, zDir, *(*U64)(unsafe.Pointer(bp + 24)), 0))
 			if int32(*(*int8)(unsafe.Pointer(zBuf + uintptr(nBuf-2)))) != 0 || libc.PostIncInt32(&iLimit, 1) > 10 {
 				rc = SQLITE_ERROR
@@ -16624,7 +16629,7 @@ func findCreateFileMode(tls *libc.TLS, zPath uintptr, flags int32, pMode uintptr
 	} else if flags&SQLITE_OPEN_DELETEONCLOSE != 0 {
 		*(*Mode_t)(unsafe.Pointer(pMode)) = Mode_t(0600)
 	} else if flags&SQLITE_OPEN_URI != 0 {
-		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3765)
+		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3784)
 		if z != 0 {
 			rc = getFileMode(tls, z, pMode, pUid, pGid)
 		}
@@ -16789,7 +16794,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3245, zName, 43198)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43202), ts+3264, zName, 43202)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -16880,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, 43337)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3374, zPath, 43341)
 		}
 		return rc
 	}
@@ -16888,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, 43347)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3791, zPath, 43351)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43353)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -16954,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, 43443), ts+3443, zIn, 43443)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43447), ts+3462, zIn, 43447)
 			}
 		} 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, 43449)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43453)
 				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, 43454), ts+3434, zIn, 43454)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43458), ts+3453, zIn, 43458)
 				return
 			}
 			*(*int8)(unsafe.Pointer(bp + 128 + uintptr(got))) = int8(0)
@@ -17005,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, 43512), ts+3263, zPath, 43512)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43516), ts+3282, zPath, 43516)
 		}
 		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, 43518)
+		return Xsqlite3CantopenError(tls, 43522)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+1032)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -17044,7 +17049,7 @@ func unixDlError(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBufOut uintptr) {
 	unixEnterMutex(tls)
 	zErr = libc.Xdlerror(tls)
 	if zErr != 0 {
-		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3647, libc.VaList(bp, zErr))
+		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3666, libc.VaList(bp, zErr))
 	}
 	unixLeaveMutex(tls)
 }
@@ -17076,7 +17081,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 	{
 		var fd int32
 		var got int32
-		fd = robust_open(tls, ts+3778, O_RDONLY, uint32(0))
+		fd = robust_open(tls, ts+3797, O_RDONLY, uint32(0))
 		if fd < 0 {
 			libc.Xtime(tls, bp)
 			libc.Xmemcpy(tls, zBuf, bp, uint64(unsafe.Sizeof(Time_t(0))))
@@ -17087,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, 43619)
+			robust_close(tls, uintptr(0), fd, 43623)
 		}
 
 	}
@@ -17164,10 +17169,10 @@ func Xsqlite3_os_init(tls *libc.TLS) int32 {
 }
 
 var aVfs = [4]Sqlite3_vfs{
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3791, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3796, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3806, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3686, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3810, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3815, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3825, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3705, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
 }
 
 // Shutdown the operating system interface.
@@ -17222,7 +17227,7 @@ var memdb_g MemFS
 var memdb_vfs = Sqlite3_vfs{
 	FiVersion:          2,
 	FmxPathname:        1024,
-	FzName:             ts + 3819,
+	FzName:             ts + 3838,
 	FxOpen:             0,
 	FxAccess:           0,
 	FxFullPathname:     0,
@@ -17478,7 +17483,7 @@ func memdbFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int3
 	var rc int32 = SQLITE_NOTFOUND
 	memdbEnter(tls, p)
 	if op == SQLITE_FCNTL_VFSNAME {
-		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3825, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
+		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3844, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
 		rc = SQLITE_OK
 	}
 	if op == SQLITE_FCNTL_SIZE_LIMIT {
@@ -17610,7 +17615,7 @@ func memdbFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, z
 	defer tls.Free(8)
 
 	_ = pVfs
-	Xsqlite3_snprintf(tls, nOut, zOut, ts+3647, libc.VaList(bp, zPath))
+	Xsqlite3_snprintf(tls, nOut, zOut, ts+3666, libc.VaList(bp, zPath))
 	return SQLITE_OK
 }
 
@@ -17731,7 +17736,7 @@ func Xsqlite3_serialize(tls *libc.TLS, db uintptr, zSchema uintptr, piSize uintp
 		return uintptr(0)
 	}
 	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
-	zSql = Xsqlite3_mprintf(tls, ts+3840, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3859, libc.VaList(bp, zSchema))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, db, zSql, -1, bp+8, uintptr(0))
 	} else {
@@ -17804,7 +17809,7 @@ __1:
 	goto end_deserialize
 __2:
 	;
-	zSql = Xsqlite3_mprintf(tls, ts+3863, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3882, libc.VaList(bp, zSchema))
 	if !(zSql == uintptr(0)) {
 		goto __3
 	}
@@ -18520,7 +18525,7 @@ func pcacheFetchFinishWithInit(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 	libc.Xmemset(tls, pPgHdr+32, 0, uint64(unsafe.Sizeof(PgHdr{}))-uint64(uintptr(0)+32))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpPage = pPage
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpData = (*Sqlite3_pcache_page)(unsafe.Pointer(pPage)).FpBuf
-	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*72
+	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*80
 	libc.Xmemset(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0, uint64(8))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpCache = pCache
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).Fpgno = pgno
@@ -18550,7 +18555,7 @@ func Xsqlite3PcacheFetchFinish(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 // reference count drops to 0, then it is made eligible for recycling.
 func Xsqlite3PcacheRelease(tls *libc.TLS, p uintptr) {
 	(*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FnRefSum--
-	if int32(libc.PreDecInt16(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1)) == 0 {
+	if libc.PreDecInt64(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1) == int64(0) {
 		if int32((*PgHdr)(unsafe.Pointer(p)).Fflags)&PGHDR_CLEAN != 0 {
 			pcacheUnpin(tls, p)
 		} else {
@@ -18601,7 +18606,7 @@ func Xsqlite3PcacheMakeClean(tls *libc.TLS, p uintptr) {
 	*(*U16)(unsafe.Pointer(p + 52)) &= libc.Uint16FromInt32(libc.CplInt32(PGHDR_DIRTY | PGHDR_NEED_SYNC | PGHDR_WRITEABLE))
 	*(*U16)(unsafe.Pointer(p + 52)) |= U16(PGHDR_CLEAN)
 
-	if int32((*PgHdr)(unsafe.Pointer(p)).FnRef) == 0 {
+	if (*PgHdr)(unsafe.Pointer(p)).FnRef == int64(0) {
 		pcacheUnpin(tls, p)
 	}
 }
@@ -18705,8 +18710,8 @@ func Xsqlite3PcacheClear(tls *libc.TLS, pCache uintptr) {
 }
 
 func pcacheMergeDirtyList(tls *libc.TLS, pA uintptr, pB uintptr) uintptr {
-	bp := tls.Alloc(72)
-	defer tls.Free(72)
+	bp := tls.Alloc(80)
+	defer tls.Free(80)
 
 	var pTail uintptr
 	pTail = bp
@@ -18784,13 +18789,13 @@ func Xsqlite3PcacheDirtyList(tls *libc.TLS, pCache uintptr) uintptr {
 //
 // This is not the total number of pages referenced, but the sum of the
 // reference count for all pages.
-func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) int32 {
+func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) I64 {
 	return (*PCache)(unsafe.Pointer(pCache)).FnRefSum
 }
 
 // Return the number of references to the page supplied as an argument.
-func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) int32 {
-	return int32((*PgHdr)(unsafe.Pointer(p)).FnRef)
+func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) I64 {
+	return (*PgHdr)(unsafe.Pointer(p)).FnRef
 }
 
 // Return the total number of pages in the cache.
@@ -21015,7 +21020,7 @@ __27:
 	if !(isHot != 0 && nPlayback != 0) {
 		goto __28
 	}
-	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3878,
+	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3897,
 		libc.VaList(bp, nPlayback, (*Pager)(unsafe.Pointer(pPager)).FzJournal))
 __28:
 	;
@@ -21080,7 +21085,7 @@ func pagerUndoCallback(tls *libc.TLS, pCtx uintptr, iPg Pgno) int32 {
 
 	pPg = Xsqlite3PagerLookup(tls, pPager, iPg)
 	if pPg != 0 {
-		if Xsqlite3PcachePageRefcount(tls, pPg) == 1 {
+		if Xsqlite3PcachePageRefcount(tls, pPg) == int64(1) {
 			Xsqlite3PcacheDrop(tls, pPg)
 		} else {
 			rc = readDbPage(tls, pPg)
@@ -21503,7 +21508,7 @@ func Xsqlite3PagerSetPagesize(tls *libc.TLS, pPager uintptr, pPageSize uintptr,
 	var pageSize U32 = *(*U32)(unsafe.Pointer(pPageSize))
 
 	if (int32((*Pager)(unsafe.Pointer(pPager)).FmemDb) == 0 || (*Pager)(unsafe.Pointer(pPager)).FdbSize == Pgno(0)) &&
-		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 &&
+		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) &&
 		pageSize != 0 && pageSize != U32((*Pager)(unsafe.Pointer(pPager)).FpageSize) {
 		var pNew uintptr = uintptr(0)
 		*(*I64)(unsafe.Pointer(bp)) = int64(0)
@@ -21961,7 +21966,7 @@ func Xsqlite3PagerFlush(tls *libc.TLS, pPager uintptr) int32 {
 
 		for rc == SQLITE_OK && pList != 0 {
 			var pNext uintptr = (*PgHdr)(unsafe.Pointer(pList)).FpDirty
-			if int32((*PgHdr)(unsafe.Pointer(pList)).FnRef) == 0 {
+			if (*PgHdr)(unsafe.Pointer(pList)).FnRef == int64(0) {
 				rc = pagerStress(tls, pPager, pList)
 			}
 			pList = pNext
@@ -22111,7 +22116,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 60235)
+	rc = Xsqlite3CantopenError(tls, 60239)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -22172,7 +22177,7 @@ __15:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzJournal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3905, uint64(8))
+	libc.Xmemcpy(tls, pPtr, ts+3924, uint64(8))
 	pPtr += uintptr(8 + 1)
 	goto __19
 __18:
@@ -22185,7 +22190,7 @@ __19:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzWal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3914, uint64(4))
+	libc.Xmemcpy(tls, pPtr, ts+3933, uint64(4))
 	pPtr += uintptr(4 + 1)
 	goto __21
 __20:
@@ -22237,9 +22242,9 @@ __27:
 	;
 __26:
 	;
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3919, 0))
+	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3938, 0))
 	if !(iDc&SQLITE_IOCAP_IMMUTABLE != 0 ||
-		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3926, 0) != 0) {
+		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3945, 0) != 0) {
 		goto __30
 	}
 	vfsFlags = vfsFlags | SQLITE_OPEN_READONLY
@@ -22492,7 +22497,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60754)
+	rc = Xsqlite3CantopenError(tls, 60758)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -22598,7 +22603,7 @@ __24:
 }
 
 func pagerUnlockIfUnused(tls *libc.TLS, pPager uintptr) {
-	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 {
+	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) {
 		pagerUnlockAndRollback(tls, pPager)
 	}
 }
@@ -22616,7 +22621,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60967)
+	return Xsqlite3CorruptError(tls, 60971)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -22655,7 +22660,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60999)
+	rc = Xsqlite3CorruptError(tls, 61003)
 	goto pager_acquire_err
 __7:
 	;
@@ -23442,7 +23447,7 @@ func Xsqlite3PagerMemUsed(tls *libc.TLS, pPager uintptr) int32 {
 
 // Return the number of references to the specified page.
 func Xsqlite3PagerPageRefcount(tls *libc.TLS, pPage uintptr) int32 {
-	return Xsqlite3PcachePageRefcount(tls, pPage)
+	return int32(Xsqlite3PcachePageRefcount(tls, pPage))
 }
 
 // Parameter eStat must be one of SQLITE_DBSTATUS_CACHE_HIT, _MISS, _WRITE,
@@ -23685,9 +23690,9 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	pPgOld = Xsqlite3PagerLookup(tls, pPager, pgno)
 
 	if pPgOld != 0 {
-		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
+		if (*PgHdr)(unsafe.Pointer(pPgOld)).FnRef > int64(1) {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62623)
+			return Xsqlite3CorruptError(tls, 62627)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -23872,7 +23877,7 @@ func Xsqlite3PagerClearCache(tls *libc.TLS, pPager uintptr) {
 func Xsqlite3PagerCheckpoint(tls *libc.TLS, pPager uintptr, db uintptr, eMode int32, pnLog uintptr, pnCkpt uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal == uintptr(0) && int32((*Pager)(unsafe.Pointer(pPager)).FjournalMode) == PAGER_JOURNALMODE_WAL {
-		Xsqlite3_exec(tls, db, ts+3936, uintptr(0), uintptr(0), uintptr(0))
+		Xsqlite3_exec(tls, db, ts+3955, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal != 0 {
 		rc = Xsqlite3WalCheckpoint(tls, (*Pager)(unsafe.Pointer(pPager)).FpWal, db, eMode,
@@ -24444,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, 64387)
+				return Xsqlite3CorruptError(tls, 64391)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -24543,7 +24548,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64519)
+	rc = Xsqlite3CantopenError(tls, 64523)
 	goto finished
 __7:
 	;
@@ -24711,7 +24716,7 @@ __24:
 		goto __30
 	}
 	Xsqlite3_log(tls, SQLITE_NOTICE|int32(1)<<8,
-		ts+3954,
+		ts+3973,
 		libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 __30:
 	;
@@ -25129,7 +25134,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65333)
+	rc = Xsqlite3CorruptError(tls, 65337)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -25274,7 +25279,7 @@ func walLimitSize(tls *libc.TLS, pWal uintptr, nMax I64) {
 	}
 	Xsqlite3EndBenignMalloc(tls)
 	if rx != 0 {
-		Xsqlite3_log(tls, rx, ts+3991, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
+		Xsqlite3_log(tls, rx, ts+4010, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 	}
 }
 
@@ -25404,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, 65682)
+		rc = Xsqlite3CantopenError(tls, 65686)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -25877,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, 66419)
+				return Xsqlite3CorruptError(tls, 66423)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -26382,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, 67138)
+			rc = Xsqlite3CorruptError(tls, 67142)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -26775,7 +26780,7 @@ func Xsqlite3BtreeLeaveCursor(tls *libc.TLS, pCur uintptr) {
 	Xsqlite3BtreeLeave(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpBtree)
 }
 
-var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 4017))
+var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 4036))
 
 var sqlite3SharedCacheList uintptr = uintptr(0)
 
@@ -27040,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, 69249)
+			rc = Xsqlite3CorruptError(tls, 69253)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -27177,7 +27182,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69434)
 	return
 __2:
 	;
@@ -27194,7 +27199,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69447)
 	goto ptrmap_exit
 __4:
 	;
@@ -27202,7 +27207,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69452)
 	goto ptrmap_exit
 __5:
 	;
@@ -27245,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, 69493)
+		return Xsqlite3CorruptError(tls, 69497)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -27255,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, 69501)
+		return Xsqlite3CorruptError(tls, 69505)
 	}
 	return SQLITE_OK
 }
@@ -27505,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, 69893)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69897)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -27552,7 +27557,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69951)
+	return Xsqlite3CorruptError(tls, 69955)
 __2:
 	;
 	if !(iFree != 0) {
@@ -27562,7 +27567,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69954)
+	return Xsqlite3CorruptError(tls, 69958)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -27575,7 +27580,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69962)
+	return Xsqlite3CorruptError(tls, 69966)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -27584,14 +27589,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69965)
+	return Xsqlite3CorruptError(tls, 69969)
 __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, 69967)
+	return Xsqlite3CorruptError(tls, 69971)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -27601,7 +27606,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69971)
+	return Xsqlite3CorruptError(tls, 69975)
 __11:
 	;
 __8:
@@ -27665,7 +27670,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 70004)
+	return Xsqlite3CorruptError(tls, 70008)
 __22:
 	;
 	size = int32((*struct {
@@ -27675,7 +27680,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 70010)
+	return Xsqlite3CorruptError(tls, 70014)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -27697,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, 70024)
+	return Xsqlite3CorruptError(tls, 70028)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -27732,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, 70081)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70085)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -27745,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, 70096)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70100)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70107)
 	}
 	return uintptr(0)
 }
@@ -27776,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, 70152)
+			return Xsqlite3CorruptError(tls, 70156)
 		}
 	}
 
@@ -27787,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, 70170)
+				return Xsqlite3CorruptError(tls, 70174)
 			} else {
 				return SQLITE_OK
 			}
@@ -27839,22 +27844,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 70249)
+				return Xsqlite3CorruptError(tls, 70253)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 70254)
+			return Xsqlite3CorruptError(tls, 70258)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 70266)
+				return Xsqlite3CorruptError(tls, 70270)
 			}
 			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, 70269)
+				return Xsqlite3CorruptError(tls, 70273)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -27864,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, 70282)
+					return Xsqlite3CorruptError(tls, 70286)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -27872,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, 70288)
+			return Xsqlite3CorruptError(tls, 70292)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -27880,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, 70297)
+			return Xsqlite3CorruptError(tls, 70301)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70298)
+			return Xsqlite3CorruptError(tls, 70302)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -27943,7 +27948,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70357)
+			return Xsqlite3CorruptError(tls, 70361)
 		}
 	} else {
 		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
@@ -27979,7 +27984,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70381)
+			return Xsqlite3CorruptError(tls, 70385)
 		}
 	}
 	return SQLITE_OK
@@ -28009,11 +28014,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70432)
+			return Xsqlite3CorruptError(tls, 70436)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70437)
+				return Xsqlite3CorruptError(tls, 70441)
 			}
 			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))))
@@ -28024,15 +28029,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70447)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70451)
+			return Xsqlite3CorruptError(tls, 70455)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70463)
+		return Xsqlite3CorruptError(tls, 70467)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -28060,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, 70494)
+			return Xsqlite3CorruptError(tls, 70498)
 		}
 		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, 70499)
+			return Xsqlite3CorruptError(tls, 70503)
 		}
 	}
 	return SQLITE_OK
@@ -28081,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, 70531)
+		return Xsqlite3CorruptError(tls, 70535)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -28093,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, 70545)
+		return Xsqlite3CorruptError(tls, 70549)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -28196,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, 70700)
+	rc = Xsqlite3CorruptError(tls, 70704)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -28224,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, 70721)
+	rc = Xsqlite3CorruptError(tls, 70725)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -28263,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, 70787)
+			return Xsqlite3CorruptError(tls, 70791)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -28336,7 +28341,7 @@ func Xsqlite3BtreeOpen(tls *libc.TLS, pVfs uintptr, zFilename uintptr, db uintpt
 	mutexOpen = uintptr(0)
 	rc = SQLITE_OK
 	isTempDb = libc.Bool32(zFilename == uintptr(0) || int32(*(*int8)(unsafe.Pointer(zFilename))) == 0)
-	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4033) == 0 ||
+	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4052) == 0 ||
 		isTempDb != 0 && Xsqlite3TempInMemory(tls, db) != 0 ||
 		vfsFlags&SQLITE_OPEN_MEMORY != 0)
 
@@ -29097,7 +29102,7 @@ __9:
 	;
 __10:
 	;
-	if !(libc.Xmemcmp(tls, page1+21, ts+4042, uint64(3)) != 0) {
+	if !(libc.Xmemcmp(tls, page1+21, ts+4061, uint64(3)) != 0) {
 		goto __14
 	}
 	goto page1_init_failed
@@ -29135,7 +29140,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71722)
+	rc = Xsqlite3CorruptError(tls, 71726)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -29550,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, 72143)
+			return Xsqlite3CorruptError(tls, 72147)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -29576,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, 72162)
+						return Xsqlite3CorruptError(tls, 72166)
 					}
 					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)
@@ -29585,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, 72171)
+					return Xsqlite3CorruptError(tls, 72175)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -29596,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, 72183)
+				return Xsqlite3CorruptError(tls, 72187)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -29612,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, 72218)
+		return Xsqlite3CorruptError(tls, 72222)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -29673,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, 72316)
+			return Xsqlite3CorruptError(tls, 72320)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -29708,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, 72368)
+					return Xsqlite3CorruptError(tls, 72372)
 				}
 			}
 
@@ -29768,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, 72436)
+			rc = Xsqlite3CorruptError(tls, 72440)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -29807,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, 72487)
+			return Xsqlite3CorruptError(tls, 72491)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -29838,7 +29843,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72514)
+			return Xsqlite3CorruptError(tls, 72518)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -30179,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, 72978)
+			return Xsqlite3CorruptError(tls, 72982)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -30423,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, 73385)
+		return Xsqlite3CorruptError(tls, 73389)
 	}
 
 	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, 73400)
+		return Xsqlite3CorruptError(tls, 73404)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -30475,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, 73462)
+				return Xsqlite3CorruptError(tls, 73466)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -30524,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, 73547)
+		return Xsqlite3CorruptError(tls, 73551)
 	}
 	return rc
 }
@@ -30604,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, 73684)
+		return Xsqlite3CorruptError(tls, 73688)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -30695,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, 73823)
+	return Xsqlite3CorruptError(tls, 73827)
 __11:
 	;
 skip_init:
@@ -30715,7 +30720,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73835)
+	return Xsqlite3CorruptError(tls, 73839)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -30925,7 +30930,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 74077)
+	return Xsqlite3CorruptError(tls, 74081)
 __21:
 	;
 	goto __19
@@ -31129,7 +31134,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 74273)
+	return Xsqlite3CorruptError(tls, 74277)
 __4:
 	;
 	goto bypass_moveto_root
@@ -31194,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, 74360)
+	rc = Xsqlite3CorruptError(tls, 74364)
 	goto moveto_index_finish
 __17:
 	;
@@ -31242,7 +31247,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74392)
+	rc = Xsqlite3CorruptError(tls, 74396)
 __24:
 	;
 	goto moveto_index_finish
@@ -31361,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, 74508)
+		return Xsqlite3CorruptError(tls, 74512)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -31521,7 +31526,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74688)
+	return Xsqlite3CorruptError(tls, 74692)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -31586,7 +31591,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74744)
+	rc = Xsqlite3CorruptError(tls, 74748)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -31622,7 +31627,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74773)
+	rc = Xsqlite3CorruptError(tls, 74777)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -31666,7 +31671,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74807)
+	rc = Xsqlite3CorruptError(tls, 74811)
 	goto end_allocate_page
 __32:
 	;
@@ -31778,7 +31783,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74872)
+	rc = Xsqlite3CorruptError(tls, 74876)
 	goto end_allocate_page
 __51:
 	;
@@ -31936,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, 74999)
+	return Xsqlite3CorruptError(tls, 75003)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -31993,7 +31998,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75050)
 	goto freepage_out
 __10:
 	;
@@ -32009,7 +32014,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75061)
 	goto freepage_out
 __12:
 	;
@@ -32083,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, 75146)
+		return Xsqlite3CorruptError(tls, 75150)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -32095,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, 75163)
+			return Xsqlite3CorruptError(tls, 75167)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -32106,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, 75183)
+			rc = Xsqlite3CorruptError(tls, 75187)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -32271,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, 75436)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75440)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -32550,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, 75737)
+				return Xsqlite3CorruptError(tls, 75741)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75742)
+			return Xsqlite3CorruptError(tls, 75746)
 		}
 
 		pData -= uintptr(sz)
@@ -32563,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, 75748)
+			return Xsqlite3CorruptError(tls, 75752)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -32623,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, 75833)
+			Xsqlite3CorruptError(tls, 75837)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -32712,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, 75947)
+	return Xsqlite3CorruptError(tls, 75951)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -32828,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, 76060)
+		return Xsqlite3CorruptError(tls, 76064)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -33148,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, 76481)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76485)
 	goto balance_cleanup
 __25:
 	;
@@ -33159,7 +33164,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76509)
 	goto balance_cleanup
 __27:
 	;
@@ -33317,7 +33322,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76610)
 	goto balance_cleanup
 __55:
 	;
@@ -33391,7 +33396,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76643)
 	goto balance_cleanup
 __67:
 	;
@@ -33454,7 +33459,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76687)
 	goto balance_cleanup
 __75:
 	;
@@ -33482,7 +33487,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76720)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -33743,7 +33748,7 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76920)
 	goto balance_cleanup
 __121:
 	;
@@ -33935,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, 77146)
+			return Xsqlite3CorruptError(tls, 77150)
 		}
 	}
 	return SQLITE_OK
@@ -33973,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, 77206)
+			rc = Xsqlite3CorruptError(tls, 77210)
 		} 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)))
@@ -34079,7 +34084,7 @@ func btreeOverwriteOverflowCell(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, 77370)
+			rc = Xsqlite3CorruptError(tls, 77374)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -34104,7 +34109,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 
 	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)
+		return Xsqlite3CorruptError(tls, 77402)
 	}
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
 		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
@@ -34174,7 +34179,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77479)
+	return Xsqlite3CorruptError(tls, 77483)
 __3:
 	;
 __1:
@@ -34287,7 +34292,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77606)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -34347,6 +34352,7 @@ __30:
 __25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
+	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
 		goto __31
 	}
@@ -34354,7 +34360,7 @@ __25:
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
 		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77640)
+	return Xsqlite3CorruptError(tls, 77645)
 __33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
@@ -34392,13 +34398,13 @@ __37:
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77667)
+	return Xsqlite3CorruptError(tls, 77672)
 __39:
 	;
 	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __40
 	}
-	return Xsqlite3CorruptError(tls, 77670)
+	return Xsqlite3CorruptError(tls, 77675)
 __40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
@@ -34429,7 +34435,6 @@ __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 __44
 	}
@@ -34504,7 +34509,7 @@ 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, 77773)
+		return Xsqlite3CorruptError(tls, 77777)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
@@ -34529,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, 77798)
+				return Xsqlite3CorruptError(tls, 77802)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -34630,7 +34635,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77894)
+			return Xsqlite3CorruptError(tls, 77898)
 		}
 	}
 
@@ -34638,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, 77903)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 	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, 77907)
+		return Xsqlite3CorruptError(tls, 77911)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -34717,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, 77998)
+			return Xsqlite3CorruptError(tls, 78002)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -34786,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, 78114)
+			return Xsqlite3CorruptError(tls, 78118)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -34815,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, 78162)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78166)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -34891,7 +34896,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 78252)
+	return Xsqlite3CorruptError(tls, 78256)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -34905,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, 78259)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78263)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -35039,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, 78363)
+		return Xsqlite3CorruptError(tls, 78367)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -35256,7 +35261,7 @@ 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+64, ts+4046, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4065, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
 		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
@@ -35281,11 +35286,11 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 	defer tls.Free(16)
 
 	if iPage > (*IntegrityCk)(unsafe.Pointer(pCheck)).FnPage || iPage == Pgno(0) {
-		checkAppendMsg(tls, pCheck, ts+4048, libc.VaList(bp, iPage))
+		checkAppendMsg(tls, pCheck, ts+4067, libc.VaList(bp, iPage))
 		return 1
 	}
 	if getPageReferenced(tls, pCheck, iPage) != 0 {
-		checkAppendMsg(tls, pCheck, ts+4071, libc.VaList(bp+8, iPage))
+		checkAppendMsg(tls, pCheck, ts+4090, libc.VaList(bp+8, iPage))
 		return 1
 	}
 	setPageReferenced(tls, pCheck, iPage)
@@ -35303,13 +35308,13 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
 			checkOom(tls, pCheck)
 		}
-		checkAppendMsg(tls, pCheck, ts+4096, libc.VaList(bp, iChild))
+		checkAppendMsg(tls, pCheck, ts+4115, libc.VaList(bp, iChild))
 		return
 	}
 
 	if int32(*(*U8)(unsafe.Pointer(bp + 48))) != int32(eType) || *(*Pgno)(unsafe.Pointer(bp + 52)) != iParent {
 		checkAppendMsg(tls, pCheck,
-			ts+4125,
+			ts+4144,
 			libc.VaList(bp+8, iChild, int32(eType), iParent, int32(*(*U8)(unsafe.Pointer(bp + 48))), *(*Pgno)(unsafe.Pointer(bp + 52))))
 	}
 }
@@ -35328,7 +35333,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 		}
 		N--
 		if Xsqlite3PagerGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpPager, iPage, bp+40, 0) != 0 {
-			checkAppendMsg(tls, pCheck, ts+4179, libc.VaList(bp, iPage))
+			checkAppendMsg(tls, pCheck, ts+4198, libc.VaList(bp, iPage))
 			break
 		}
 		pOvflData = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
@@ -35339,7 +35344,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 			}
 			if n > (*BtShared)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt)).FusableSize/U32(4)-U32(2) {
 				checkAppendMsg(tls, pCheck,
-					ts+4201, libc.VaList(bp+8, iPage))
+					ts+4220, libc.VaList(bp+8, iPage))
 				N--
 			} else {
 				for i = 0; i < int32(n); i++ {
@@ -35362,12 +35367,12 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 	}
 	if N != 0 && nErrAtStart == (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr {
 		checkAppendMsg(tls, pCheck,
-			ts+4240,
+			ts+4259,
 			libc.VaList(bp+16, func() uintptr {
 				if isFreeList != 0 {
-					return ts + 4266
+					return ts + 4285
 				}
-				return ts + 4271
+				return ts + 4290
 			}(),
 				expected-N, expected))
 	}
@@ -35483,13 +35488,13 @@ __2:
 	return 0
 __3:
 	;
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4292
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4311
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
 		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4302, libc.VaList(bp, rc))
+		ts+4321, libc.VaList(bp, rc))
 	goto end_of_check
 __4:
 	;
@@ -35500,7 +35505,7 @@ __4:
 	}
 
 	checkAppendMsg(tls, pCheck,
-		ts+4340, libc.VaList(bp+8, rc))
+		ts+4359, libc.VaList(bp+8, rc))
 	goto end_of_check
 __5:
 	;
@@ -35508,14 +35513,14 @@ __5:
 		goto __6
 	}
 
-	checkAppendMsg(tls, pCheck, ts+4378, libc.VaList(bp+16, rc))
+	checkAppendMsg(tls, pCheck, ts+4397, libc.VaList(bp+16, rc))
 	goto end_of_check
 __6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
 
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4400
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4419
 	contentOffset = U32((int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5))))<<8|int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5) + 1)))-1)&0xffff + 1)
 
 	nCell = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3) + 1)))
@@ -35532,7 +35537,7 @@ __6:
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
 		goto __9
 	}
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4426
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4445
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
 __9:
 	;
@@ -35557,7 +35562,7 @@ __10:
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
 		goto __13
 	}
-	checkAppendMsg(tls, pCheck, ts+4454,
+	checkAppendMsg(tls, pCheck, ts+4473,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
 	goto __11
@@ -35570,7 +35575,7 @@ __13:
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
 		goto __14
 	}
-	checkAppendMsg(tls, pCheck, ts+4484, 0)
+	checkAppendMsg(tls, pCheck, ts+4503, 0)
 	doCoverageCheck = 0
 	goto __11
 __14:
@@ -35586,7 +35591,7 @@ __14:
 	}() != 0) {
 		goto __16
 	}
-	checkAppendMsg(tls, pCheck, ts+4508, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
+	checkAppendMsg(tls, pCheck, ts+4527, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
 __16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
@@ -35624,7 +35629,7 @@ __21:
 	if !(d2 != depth) {
 		goto __22
 	}
-	checkAppendMsg(tls, pCheck, ts+4532, 0)
+	checkAppendMsg(tls, pCheck, ts+4551, 0)
 	depth = d2
 __22:
 	;
@@ -35697,7 +35702,7 @@ __30:
 		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4557, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
+		ts+4576, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
 	goto __31
 	goto __33
 __32:
@@ -35714,7 +35719,7 @@ __31:
 		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4594,
+		ts+4613,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
 __34:
 	;
@@ -35828,7 +35833,7 @@ __6:
 	if !(bCkFreelist != 0) {
 		goto __7
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4646
+	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4665
 	checkList(tls, bp+32, 1, Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+32),
 		Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
@@ -35864,7 +35869,7 @@ __13:
 		goto __15
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4662,
+		ts+4681,
 		libc.VaList(bp, mx, mxInHdr))
 __15:
 	;
@@ -35874,7 +35879,7 @@ __9:
 		goto __16
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4707, 0)
+		ts+4726, 0)
 __16:
 	;
 __10:
@@ -35921,13 +35926,13 @@ __23:
 	if !(getPageReferenced(tls, bp+32, i) == 0 && (ptrmapPageno(tls, pBt, i) != i || !(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0))) {
 		goto __26
 	}
-	checkAppendMsg(tls, bp+32, ts+4762, libc.VaList(bp+16, i))
+	checkAppendMsg(tls, bp+32, ts+4781, libc.VaList(bp+16, i))
 __26:
 	;
 	if !(getPageReferenced(tls, bp+32, i) != 0 && (ptrmapPageno(tls, pBt, i) == i && (*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0)) {
 		goto __27
 	}
-	checkAppendMsg(tls, bp+32, ts+4784, libc.VaList(bp+24, i))
+	checkAppendMsg(tls, bp+32, ts+4803, libc.VaList(bp+24, i))
 __27:
 	;
 	goto __24
@@ -36190,7 +36195,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 		var rc int32 = 0
 		Xsqlite3ParseObjectInit(tls, bp+16, pDb)
 		if Xsqlite3OpenTempDatabase(tls, bp+16) != 0 {
-			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3647, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3666, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 			rc = SQLITE_ERROR
 		}
 		Xsqlite3DbFree(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
@@ -36201,7 +36206,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 	}
 
 	if i < 0 {
-		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4818, libc.VaList(bp+8, zDb))
+		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4837, libc.VaList(bp+8, zDb))
 		return uintptr(0)
 	}
 
@@ -36216,7 +36221,7 @@ func setDestPgsz(tls *libc.TLS, p uintptr) int32 {
 
 func checkReadTransaction(tls *libc.TLS, db uintptr, p uintptr) int32 {
 	if Xsqlite3BtreeTxnState(tls, p) != SQLITE_TXN_NONE {
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4838, 0)
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4857, 0)
 		return SQLITE_ERROR
 	}
 	return SQLITE_OK
@@ -36236,7 +36241,7 @@ func Xsqlite3_backup_init(tls *libc.TLS, pDestDb uintptr, zDestDb uintptr, pSrcD
 
 	if pSrcDb == pDestDb {
 		Xsqlite3ErrorWithMsg(tls,
-			pDestDb, SQLITE_ERROR, ts+4869, 0)
+			pDestDb, SQLITE_ERROR, ts+4888, 0)
 		p = uintptr(0)
 	} else {
 		p = Xsqlite3MallocZero(tls, uint64(unsafe.Sizeof(Sqlite3_backup{})))
@@ -36684,7 +36689,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 		(*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,
+		Xsqlite3_str_appendf(tls, bp+8, ts+4928,
 			libc.VaList(bp, func() float64 {
 				if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_IntReal != 0 {
 					return float64(*(*I64)(unsafe.Pointer(p)))
@@ -37276,7 +37281,7 @@ func Xsqlite3VdbeMemSetPointer(tls *libc.TLS, pMem uintptr, pPtr uintptr, zPType
 		if zPType != 0 {
 			return zPType
 		}
-		return ts + 1538
+		return ts + 1557
 	}()
 	(*Mem)(unsafe.Pointer(pMem)).Fz = pPtr
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null | MEM_Dyn | MEM_Subtype | MEM_Term)
@@ -37508,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, 81630)
+		return Xsqlite3CorruptError(tls, 81634)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -37740,7 +37745,7 @@ __9:
 		goto __10
 	}
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 8)).FisError
-	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3647, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
+	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3666, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
 	goto __11
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
@@ -37793,7 +37798,7 @@ func valueFromExpr(tls *libc.TLS, db uintptr, pExpr uintptr, enc U8, affinity U8
 	zVal = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	negInt = 1
-	zNeg = ts + 1538
+	zNeg = ts + 1557
 	rc = SQLITE_OK
 
 __1:
@@ -37834,7 +37839,7 @@ __4:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
 	negInt = -1
-	zNeg = ts + 4916
+	zNeg = ts + 4935
 __6:
 	;
 	if !(op == TK_STRING || op == TK_FLOAT || op == TK_INTEGER) {
@@ -37853,7 +37858,7 @@ __9:
 	Xsqlite3VdbeMemSetInt64(tls, *(*uintptr)(unsafe.Pointer(bp + 16)), I64(*(*int32)(unsafe.Pointer(pExpr + 8)))*I64(negInt))
 	goto __11
 __10:
-	zVal = Xsqlite3MPrintf(tls, db, ts+4918, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+	zVal = Xsqlite3MPrintf(tls, db, ts+4937, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	if !(zVal == uintptr(0)) {
 		goto __12
 	}
@@ -38157,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, 82270)
+		return Xsqlite3CorruptError(tls, 82274)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -38172,14 +38177,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 82276)
+			return Xsqlite3CorruptError(tls, 82280)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 82282)
+		return Xsqlite3CorruptError(tls, 82286)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -39187,34 +39192,34 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var j int32
 			var pKeyInfo uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4923, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4942, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
 			for j = 0; j < int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField); j++ {
 				var pColl uintptr = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(j)*8))
 				var zColl uintptr
 				if pColl != 0 {
 					zColl = (*CollSeq)(unsafe.Pointer(pColl)).FzName
 				} else {
-					zColl = ts + 1538
+					zColl = ts + 1557
 				}
-				if libc.Xstrcmp(tls, zColl, ts+1083) == 0 {
-					zColl = ts + 4928
+				if libc.Xstrcmp(tls, zColl, ts+1102) == 0 {
+					zColl = ts + 4947
 				}
-				Xsqlite3_str_appendf(tls, bp+144, ts+4930,
+				Xsqlite3_str_appendf(tls, bp+144, ts+4949,
 					libc.VaList(bp+8, func() uintptr {
 						if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_DESC != 0 {
-							return ts + 4916
+							return ts + 4935
 						}
-						return ts + 1538
+						return ts + 1557
 					}(),
 						func() uintptr {
 							if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_BIGNULL != 0 {
-								return ts + 4938
+								return ts + 4957
 							}
-							return ts + 1538
+							return ts + 1557
 						}(),
 						zColl))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4941, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+4960, 1)
 			break
 
 		}
@@ -39222,7 +39227,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 		{
 			var pColl uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4943, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
+			Xsqlite3_str_appendf(tls, bp+144, ts+4962, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
 				encnames[(*CollSeq)(unsafe.Pointer(pColl)).Fenc]))
 			break
 
@@ -39230,32 +39235,32 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -7:
 		{
 			var pDef uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
-			Xsqlite3_str_appendf(tls, bp+144, ts+4952, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4971, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -15:
 		{
 			var pDef uintptr = (*Sqlite3_context)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpFunc
-			Xsqlite3_str_appendf(tls, bp+144, ts+4952, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4971, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -13:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1318, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1337, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
 	case -3:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+4959, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4978, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
 			break
 
 		}
 	case -12:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1312, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1331, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
@@ -39265,13 +39270,13 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Str != 0 {
 				zP4 = (*Mem)(unsafe.Pointer(pMem)).Fz
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1318, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1337, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1312, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1331, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Null != 0 {
-				zP4 = ts + 1539
+				zP4 = ts + 1558
 			} else {
-				zP4 = ts + 4962
+				zP4 = ts + 4981
 			}
 			break
 
@@ -39279,7 +39284,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -11:
 		{
 			var pVtab uintptr = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-			Xsqlite3_str_appendf(tls, bp+144, ts+4969, libc.VaList(bp+120, pVtab))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4988, libc.VaList(bp+120, pVtab))
 			break
 
 		}
@@ -39290,20 +39295,20 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var n U32 = *(*U32)(unsafe.Pointer(ai))
 
 			for i = U32(1); i <= n; i++ {
-				Xsqlite3_str_appendf(tls, bp+144, ts+4977, libc.VaList(bp+128, func() int32 {
+				Xsqlite3_str_appendf(tls, bp+144, ts+4996, libc.VaList(bp+128, func() int32 {
 					if i == U32(1) {
 						return '['
 					}
 					return ','
 				}(), *(*U32)(unsafe.Pointer(ai + uintptr(i)*4))))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4982, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+5001, 1)
 			break
 
 		}
 	case -4:
 		{
-			zP4 = ts + 4984
+			zP4 = ts + 5003
 			break
 
 		}
@@ -39328,7 +39333,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	return Xsqlite3StrAccumFinish(tls, bp+144)
 }
 
-var encnames = [4]uintptr{ts + 4992, ts + 4994, ts + 4996, ts + 5001}
+var encnames = [4]uintptr{ts + 5011, ts + 5013, ts + 5015, ts + 5020}
 
 // Declare to the Vdbe that the BTree object at db->aDb[i] is used.
 //
@@ -39778,8 +39783,8 @@ func Xsqlite3VdbeMakeReady(tls *libc.TLS, p uintptr, pParse uintptr) {
 }
 
 var azColName = [12]uintptr{
-	ts + 5006, ts + 5011, ts + 5018, ts + 5021, ts + 5024, ts + 5027, ts + 5030, ts + 5033,
-	ts + 5041, ts + 5044, ts + 5051, ts + 5059,
+	ts + 5025, ts + 5030, ts + 5037, ts + 5040, ts + 5043, ts + 5046, ts + 5049, ts + 5052,
+	ts + 5060, ts + 5063, ts + 5070, ts + 5078,
 }
 
 // Close a VDBE cursor and release all the resources that cursor
@@ -39988,7 +39993,7 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		var nMainFile int32
 
 		nMainFile = Xsqlite3Strlen30(tls, zMainFile)
-		zSuper = Xsqlite3MPrintf(tls, db, ts+5066, libc.VaList(bp, 0, zMainFile, 0))
+		zSuper = Xsqlite3MPrintf(tls, db, ts+5085, libc.VaList(bp, 0, zMainFile, 0))
 		if zSuper == uintptr(0) {
 			return SQLITE_NOMEM
 		}
@@ -39996,16 +40001,16 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		for __ccgo := true; __ccgo; __ccgo = rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 60)) != 0 {
 			if retryCount != 0 {
 				if retryCount > 100 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5078, libc.VaList(bp+24, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5097, libc.VaList(bp+24, zSuper))
 					Xsqlite3OsDelete(tls, pVfs, zSuper, 0)
 					break
 				} else if retryCount == 1 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5092, libc.VaList(bp+32, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5111, libc.VaList(bp+32, zSuper))
 				}
 			}
 			retryCount++
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
-			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5107,
+			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5126,
 				libc.VaList(bp+40, *(*U32)(unsafe.Pointer(bp + 56))>>8&U32(0xffffff), *(*U32)(unsafe.Pointer(bp + 56))&U32(0xff)))
 
 			rc = Xsqlite3OsAccess(tls, pVfs, zSuper, SQLITE_ACCESS_EXISTS, bp+60)
@@ -40151,7 +40156,7 @@ func Xsqlite3VdbeCheckFk(tls *libc.TLS, p uintptr, deferred int32) int32 {
 		!(deferred != 0) && (*Vdbe)(unsafe.Pointer(p)).FnFkConstraint > int64(0) {
 		(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_CONSTRAINT | int32(3)<<8
 		(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
-		Xsqlite3VdbeError(tls, p, ts+5120, 0)
+		Xsqlite3VdbeError(tls, p, ts+5139, 0)
 		if int32((*Vdbe)(unsafe.Pointer(p)).FprepFlags)&SQLITE_PREPARE_SAVESQL == 0 {
 			return SQLITE_ERROR
 		}
@@ -40483,7 +40488,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 86058)
+		return Xsqlite3CorruptError(tls, 86062)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -41034,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, 86985))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86989))
 		return 0
 	}
 
@@ -41099,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, 87062))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87066))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -41133,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, 87092))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87096))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -41183,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, 87136))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87140))
 			return 0
 		}
 	}
@@ -41329,7 +41334,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87303))
 	return 0
 __7:
 	;
@@ -41500,7 +41505,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87457)
+	return Xsqlite3CorruptError(tls, 87461)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -41526,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, 87490)
+		return Xsqlite3CorruptError(tls, 87494)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -41637,13 +41642,13 @@ func Xsqlite3NotPureFunc(tls *libc.TLS, pCtx uintptr) int32 {
 		var zContext uintptr
 		var zMsg uintptr
 		if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_IsCheck != 0 {
-			zContext = ts + 5150
-		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5169
-		} else {
+		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5188
+		} else {
+			zContext = ts + 5207
 		}
-		zMsg = Xsqlite3_mprintf(tls, ts+5197,
+		zMsg = Xsqlite3_mprintf(tls, ts+5216,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx)).FpFunc)).FzName, zContext))
 		Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 		Xsqlite3_free(tls, zMsg)
@@ -41748,7 +41753,7 @@ func Xsqlite3_expired(tls *libc.TLS, pStmt uintptr) int32 {
 
 func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 	if (*Vdbe)(unsafe.Pointer(p)).Fdb == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5233, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5252, 0)
 		return 1
 	} else {
 		return 0
@@ -41758,7 +41763,7 @@ func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 
 func vdbeSafetyNotNull(tls *libc.TLS, p uintptr) int32 {
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5278, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5297, 0)
 		return 1
 	} else {
 		return vdbeSafety(tls, p)
@@ -41800,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, 87854)
+			return Xsqlite3MisuseError(tls, 87858)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -42223,7 +42228,7 @@ func Xsqlite3_result_error_code(tls *libc.TLS, pCtx uintptr, errCode int32) {
 // Force an SQLITE_TOOBIG error.
 func Xsqlite3_result_error_toobig(tls *libc.TLS, pCtx uintptr) {
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FisError = SQLITE_TOOBIG
-	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5318, int64(-1),
+	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5337, int64(-1),
 		uint8(SQLITE_UTF8), uintptr(0))
 }
 
@@ -42415,7 +42420,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88544)
+		return Xsqlite3MisuseError(tls, 88548)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -42935,15 +42940,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 89208)
+		return Xsqlite3MisuseError(tls, 89212)
 	}
 	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+5341, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 89216)
+			ts+5360, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89220)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -43348,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, 89707)
+	rc = Xsqlite3MisuseError(tls, 89711)
 	goto preupdate_old_out
 __1:
 	;
@@ -43492,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, 89809)
+	rc = Xsqlite3MisuseError(tls, 89813)
 	goto preupdate_new_out
 __1:
 	;
@@ -43664,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+5381, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5400, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -43700,11 +43705,11 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 
 			pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr(*(*int32)(unsafe.Pointer(bp + 84))-1)*56
 			if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Null != 0 {
-				Xsqlite3_str_append(tls, bp+48, ts+1539, 4)
+				Xsqlite3_str_append(tls, bp+48, ts+1558, 4)
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+1318, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+1337, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+4909, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+4928, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Str != 0 {
 				var nOut int32
 				var enc U8 = (*Sqlite3)(unsafe.Pointer(db)).Fenc
@@ -43719,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+5385, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5404, 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+5392, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5411, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5405, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5424, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					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_appendf(tls, bp+48, ts+5427, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5413, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5432, 1)
 			}
 		}
 	}
@@ -43936,10 +43941,6 @@ func filterHash(tls *libc.TLS, aMem uintptr, pOp uintptr) U64 {
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Real != 0 {
 			h = h + U64(Xsqlite3VdbeIntValue(tls, p))
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&(MEM_Str|MEM_Blob) != 0 {
-			h = h + U64((*Mem)(unsafe.Pointer(p)).Fn)
-			if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Zero != 0 {
-				h = h + U64(*(*int32)(unsafe.Pointer(p)))
-			}
 		}
 	}
 	return h
@@ -43950,11 +43951,11 @@ func vdbeMemTypeName(tls *libc.TLS, pMem uintptr) uintptr {
 }
 
 var azTypes = [5]uintptr{
-	ts + 1099,
-	ts + 1111,
-	ts + 1116,
-	ts + 1094,
-	ts + 1539,
+	ts + 1118,
+	ts + 1130,
+	ts + 1135,
+	ts + 1113,
+	ts + 1558,
 }
 
 // Execute as much of a VDBE program as we can.
@@ -44997,20 +44998,20 @@ __202:
 		goto __205
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5415, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	Xsqlite3VdbeError(tls, p, ts+5434, 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))))
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5455, 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))))
+	Xsqlite3VdbeError(tls, p, ts+3666, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	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))
+	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))
 __204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
@@ -46588,7 +46589,7 @@ op_column_corrupt:
 	goto __9
 	goto __425
 __424:
-	rc = Xsqlite3CorruptError(tls, 93317)
+	rc = Xsqlite3CorruptError(tls, 93320)
 	goto abort_due_to_error
 __425:
 	;
@@ -46716,7 +46717,7 @@ __428:
 	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5467,
+	Xsqlite3VdbeError(tls, p, ts+5486,
 		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
@@ -47148,7 +47149,7 @@ __78:
 		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5508, 0)
+	Xsqlite3VdbeError(tls, p, ts+5527, 0)
 	rc = SQLITE_BUSY
 	goto __523
 __522:
@@ -47208,7 +47209,7 @@ __530:
 	if !!(pSavepoint != 0) {
 		goto __531
 	}
-	Xsqlite3VdbeError(tls, p, ts+5559, libc.VaList(bp+88, zName))
+	Xsqlite3VdbeError(tls, p, ts+5578, libc.VaList(bp+88, zName))
 	rc = SQLITE_ERROR
 	goto __532
 __531:
@@ -47217,7 +47218,7 @@ __531:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5581, 0)
+		ts+5600, 0)
 	rc = SQLITE_BUSY
 	goto __534
 __533:
@@ -47403,7 +47404,7 @@ __564:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5635, 0)
+		ts+5654, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
 	goto __567
@@ -47446,13 +47447,13 @@ __562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5690
+				return ts + 5709
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5738
+					return ts + 5757
 				}
-				return ts + 5781
+				return ts + 5800
 			}()
 		}(), 0)
 
@@ -47535,7 +47536,7 @@ __576:
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5822)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5841)
 
 	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 __583
@@ -47739,7 +47740,7 @@ __88:
 	}
 
 	(*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
+	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1557
 __602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -48348,7 +48349,7 @@ notExistsWithKey:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
 		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95560)
+	rc = Xsqlite3CorruptError(tls, 95563)
 	goto __683
 __682:
 	goto jump_to_p2
@@ -49126,7 +49127,7 @@ __767:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
 		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5850)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96638, ts+5869)
 	goto abort_due_to_error
 __770:
 	;
@@ -49236,7 +49237,7 @@ __780:
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
 		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96840)
+	rc = Xsqlite3CorruptError(tls, 96843)
 	goto abort_due_to_error
 __781:
 	;
@@ -49397,14 +49398,14 @@ __141:
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	goto __799
 __798:
-	zSchema = ts + 5867
+	zSchema = ts + 5886
 	(*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+5881,
+		ts+5900,
 		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 __800
@@ -49430,7 +49431,7 @@ __802:
 		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 97092)
+	rc = Xsqlite3CorruptError(tls, 97095)
 __803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
@@ -49620,7 +49621,7 @@ __820:
 		goto __825
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5924, 0)
+	Xsqlite3VdbeError(tls, p, ts+5943, 0)
 	goto abort_due_to_error
 __825:
 	;
@@ -49932,7 +49933,7 @@ __860:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
 		goto __862
 	}
-	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
+	Xsqlite3VdbeError(tls, p, ts+3666, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
 __862:
 	;
@@ -49982,7 +49983,7 @@ __867:
 	if !(rc != 0) {
 		goto __868
 	}
-	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
+	Xsqlite3VdbeError(tls, p, ts+3666, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
 __868:
 	;
@@ -50064,12 +50065,12 @@ __876:
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5961,
+		ts+5980,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6013
+				return ts + 6032
 			}
-			return ts + 6018
+			return ts + 6037
 		}()))
 	goto abort_due_to_error
 	goto __879
@@ -50211,7 +50212,7 @@ __171:
 		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6025, libc.VaList(bp+144, z1))
+	Xsqlite3VdbeError(tls, p, ts+6044, libc.VaList(bp+144, z1))
 __894:
 	;
 	goto abort_due_to_error
@@ -50329,7 +50330,7 @@ __904:
 	(*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+6054, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6073, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
 	goto __9
 
 __177:
@@ -50418,7 +50419,7 @@ __912:
 	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)))
+	Xsqlite3VdbeError(tls, p, ts+3666, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
 __913:
 	;
@@ -50648,7 +50649,7 @@ __935:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
 		goto __940
 	}
-	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
+	Xsqlite3VdbeError(tls, p, ts+3666, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
 __940:
 	;
@@ -50724,7 +50725,7 @@ __945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
 		goto __947
 	}
-	z3 = Xsqlite3MPrintf(tls, db, ts+6064, libc.VaList(bp+168, zTrace))
+	z3 = Xsqlite3MPrintf(tls, db, ts+6083, 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)
@@ -50797,7 +50798,7 @@ __955:
 	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __957
 	}
-	rc = Xsqlite3CorruptError(tls, 99031)
+	rc = Xsqlite3CorruptError(tls, 99034)
 __957:
 	;
 __956:
@@ -50805,13 +50806,13 @@ __956:
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
 		goto __958
 	}
-	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
+	Xsqlite3VdbeError(tls, p, ts+3666, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
 __958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
 
-	Xsqlite3_log(tls, rc, ts+6070,
+	Xsqlite3_log(tls, rc, ts+6089,
 		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 __959
@@ -50867,13 +50868,13 @@ __966:
 	return rc
 
 too_big:
-	Xsqlite3VdbeError(tls, p, ts+5318, 0)
+	Xsqlite3VdbeError(tls, p, ts+5337, 0)
 	rc = SQLITE_TOOBIG
 	goto abort_due_to_error
 
 no_mem:
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3VdbeError(tls, p, ts+1474, 0)
+	Xsqlite3VdbeError(tls, p, ts+1493, 0)
 	rc = SQLITE_NOMEM
 	goto abort_due_to_error
 
@@ -50884,8 +50885,8 @@ abort_due_to_interrupt:
 	return int32(0)
 }
 
-var azType = [4]uintptr{ts + 6102, ts + 6111, ts + 6118,
-	ts + 6124}
+var azType = [4]uintptr{ts + 6121, ts + 6130, ts + 6137,
+	ts + 6143}
 var and_logic = [9]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(1), uint8(2), uint8(0), uint8(2), uint8(2)}
 var or_logic = [9]uint8{uint8(0), uint8(1), uint8(2), uint8(1), uint8(1), uint8(1), uint8(2), uint8(1), uint8(2)}
 var aMask = [12]uint8{
@@ -50940,16 +50941,16 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		}
 
 		if type1 < U32(12) {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6136,
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6155,
 				libc.VaList(bp, func() uintptr {
 					if type1 == U32(0) {
-						return ts + 6165
+						return ts + 6184
 					}
 					return func() uintptr {
 						if type1 == U32(7) {
-							return ts + 6170
+							return ts + 6189
 						}
-						return ts + 6175
+						return ts + 6194
 					}()
 				}()))
 			rc = SQLITE_ERROR
@@ -50969,10 +50970,10 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		rc = Xsqlite3_finalize(tls, (*Incrblob)(unsafe.Pointer(p)).FpStmt)
 		(*Incrblob)(unsafe.Pointer(p)).FpStmt = uintptr(0)
 		if rc == SQLITE_OK {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6183, libc.VaList(bp+8, iRow))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6202, libc.VaList(bp+8, iRow))
 			rc = SQLITE_ERROR
 		} else {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3647, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3666, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
 		}
 	}
 
@@ -51032,21 +51033,21 @@ __3:
 		goto __4
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6203, libc.VaList(bp, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6222, libc.VaList(bp, zTable))
 __4:
 	;
 	if !(pTab != 0 && !((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0))) {
 		goto __5
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6233, libc.VaList(bp+8, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6252, libc.VaList(bp+8, zTable))
 __5:
 	;
 	if !(pTab != 0 && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __6
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6269, libc.VaList(bp+16, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6288, libc.VaList(bp+16, zTable))
 __6:
 	;
 	if !!(pTab != 0) {
@@ -51090,7 +51091,7 @@ __11:
 		goto __13
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6290, libc.VaList(bp+24, zColumn))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6309, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51117,7 +51118,7 @@ __19:
 	if !((*sColMap)(unsafe.Pointer(pFKey+64+uintptr(j)*16)).FiFrom == iCol) {
 		goto __22
 	}
-	zFault = ts + 6311
+	zFault = ts + 6330
 __22:
 	;
 	goto __20
@@ -51150,7 +51151,7 @@ __26:
 	if !(int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == iCol || int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == -2) {
 		goto __29
 	}
-	zFault = ts + 6323
+	zFault = ts + 6342
 __29:
 	;
 	goto __27
@@ -51171,7 +51172,7 @@ __25:
 		goto __30
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6331, libc.VaList(bp+32, zFault))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6350, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51269,7 +51270,7 @@ __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
-			return ts + 3647
+			return ts + 3666
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
@@ -51317,7 +51318,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99516)
+		return Xsqlite3MisuseError(tls, 99519)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51400,7 +51401,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99616)
+		return Xsqlite3MisuseError(tls, 99619)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51413,7 +51414,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 				if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-					return ts + 3647
+					return ts + 3666
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
@@ -53923,25 +53924,25 @@ 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 {
+	if Xsqlite3_strnicmp(tls, zTab, ts+6384, 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 {
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6392+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6411+7) == 0 {
 			return 1
 		}
 		if pSchema == uintptr(0) {
 			return 0
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5867+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5886+7) == 0 {
 			return 1
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6411+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6430+7) == 0 {
 			return 1
 		}
 	} else {
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6411+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6430+7) == 0 {
 			return 1
 		}
 	}
@@ -54021,7 +54022,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6425, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6444, zDb) == 0) {
 		goto __8
 	}
 
@@ -54142,7 +54143,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6430) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6449) != 0) {
 		goto __33
 	}
 	goto __14
@@ -54316,14 +54317,14 @@ __60:
 	;
 	goto __59
 __58:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6432, zTab) == 0) {
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6451, zTab) == 0) {
 		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
 	goto __62
 __61:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6436, zTab) == 0) {
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6455, zTab) == 0) {
 		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
@@ -54340,7 +54341,7 @@ __57:
 		goto __64
 	}
 	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6440, zTab) == 0) {
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6459, zTab) == 0) {
 		goto __65
 	}
 	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
@@ -54499,7 +54500,7 @@ __86:
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
 		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6449, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6468, libc.VaList(bp, zAs))
 	return WRC_Abort
 __90:
 	;
@@ -54507,14 +54508,14 @@ __90:
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
 		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6480, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6499, libc.VaList(bp+8, zAs))
 	return WRC_Abort
 __91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
 		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6517, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6536, 0)
 	return WRC_Abort
 __92:
 	;
@@ -54566,7 +54567,7 @@ __11:
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6535, libc.VaList(bp+16, zCol))
+		ts+6554, 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
@@ -54603,7 +54604,7 @@ __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 + 6570
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6589
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
@@ -54616,23 +54617,23 @@ __101:
 __99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6579
+		zErr = ts + 6598
 	} else {
-		zErr = ts + 6594
+		zErr = ts + 6613
 	}
 	if !(zDb != 0) {
 		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6616, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6635, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
 	goto __105
 __104:
 	if !(zTab != 0) {
 		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6629, libc.VaList(bp+56, zErr, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp+56, zErr, zTab, zCol))
 	goto __107
 __106:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6639, libc.VaList(bp+80, zErr, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6658, libc.VaList(bp+80, zErr, zCol))
 __107:
 	;
 __105:
@@ -54735,15 +54736,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 + 6646
+	var zIn uintptr = ts + 6665
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6674
+		zIn = ts + 6693
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6692
+		zIn = ts + 6711
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6710
+		zIn = ts + 6729
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6728, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6747, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -54821,14 +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 + 6748
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
-				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6753
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
-				}
-				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
+				*(*int32)(unsafe.Pointer(pExpr + 8)) = libc.Bool32(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL)
+				*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IntValue)
+				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_INTEGER)
+
 				i = 0
 				p = pNC
 			__4:
@@ -54872,7 +54869,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+6759, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6767, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -54936,7 +54933,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+6776, libc.VaList(bp, pExpr))
+								ts+6784, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -54952,7 +54949,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+6840,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6848,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -54966,7 +54963,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+6876, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6884, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -54989,30 +54986,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+6904, libc.VaList(bp+16, pExpr))
+						ts+6912, 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 + 6947
+						zType = ts + 6955
 					} else {
-						zType = ts + 6954
+						zType = ts + 6962
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6964, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6972, 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+6992, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7000, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7014,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7022,
 						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+7058,
+						ts+7066,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -55084,15 +55081,15 @@ 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+7106, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7114, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
 
 				if nRef != (*NameContext)(unsafe.Pointer(pNC)).FnRef {
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_VarSelect)
-					*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_VarSelect
 				}
+				*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_Subquery
 			}
 			break
 
@@ -55100,7 +55097,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+7117, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7125, pExpr, pExpr)
 			}
 
 			break
@@ -55156,7 +55153,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+6517, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6536, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -55231,7 +55228,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7128, libc.VaList(bp, i, zType, mx))
+		ts+7136, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -55251,7 +55248,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+7184, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7192, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -55286,7 +55283,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+7218, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7226, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -55343,7 +55340,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+7224, libc.VaList(bp, i+1))
+				ts+7232, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -55371,7 +55368,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+7285, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7293, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -55585,7 +55582,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+7316, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7324, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -55625,7 +55622,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+7218) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7226) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -55636,7 +55633,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7355) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7363) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -55648,7 +55645,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+7361, 0)
+						ts+7369, 0)
 					return WRC_Abort
 				}
 
@@ -56437,7 +56434,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6517, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6536, 0)
 		return
 	}
 
@@ -56512,7 +56509,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+7420, libc.VaList(bp, mxHeight))
+			ts+7428, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -56761,12 +56758,12 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7468,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7476,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7512
+						return ts + 7520
 					}
-					return ts + 1538
+					return ts + 1557
 				}(), nElem))
 			break
 		}
@@ -56805,7 +56802,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+7514)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7522)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -56831,7 +56828,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+7516, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7524, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -56859,7 +56856,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+7550, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7558, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -56906,7 +56903,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+7570,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7578,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -56931,7 +56928,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+7613, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7621, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -57506,7 +57503,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+7636,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7644,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -57629,7 +57626,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+7666, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7674, libc.VaList(bp, zObject))
 	}
 }
 
@@ -57685,10 +57682,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+6748) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7697) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6753) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7702) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -58119,13 +58116,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+7689) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7708) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7697) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7716) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7703) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7722) == 0 {
 		return 1
 	}
 	return 0
@@ -58329,7 +58326,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+7707, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7726, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -58407,7 +58404,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+7754, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7773, 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)
 
@@ -58501,7 +58498,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 + 7785
+		var zFmt uintptr = ts + 7804
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -58519,7 +58516,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+6517, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6536, 0)
 	}
 }
 
@@ -58560,7 +58557,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+7829, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7848, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -58590,11 +58587,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+7852, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7871, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
-				return ts + 1538
+				return ts + 1557
 			}
-			return ts + 7871
+			return ts + 7890
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -58721,7 +58718,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+7883, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7902, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -58736,11 +58733,11 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7901, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7920, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
-			return ts + 1538
+			return ts + 1557
 		}
-		return ts + 7871
+		return ts + 7890
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
@@ -58763,7 +58760,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+7514)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7522)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -58772,7 +58769,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+7922)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7941)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -59158,13 +59155,13 @@ 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+7924, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7927,
+			if Xsqlite3_strnicmp(tls, z, ts+7943, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7946,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
-							return ts + 4916
+							return ts + 4935
 						}
-						return ts + 1538
+						return ts + 1557
 					}(), pExpr))
 			} else {
 				codeReal(tls, v, z, negFlag, iMem)
@@ -59201,6 +59198,7 @@ func Xsqlite3ExprCodeLoadIndexColumn(tls *libc.TLS, pParse uintptr, pIdx uintptr
 func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr, pCol uintptr, regOut int32) {
 	var iAddr int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
+	var nErr int32 = (*Parse)(unsafe.Pointer(pParse)).FnErr
 
 	if (*Parse)(unsafe.Pointer(pParse)).FiSelfTab > 0 {
 		iAddr = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Parse)(unsafe.Pointer(pParse)).FiSelfTab-1, 0, regOut)
@@ -59214,6 +59212,9 @@ func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr
 	if iAddr != 0 {
 		Xsqlite3VdbeJumpHere(tls, v, iAddr)
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr > nErr {
+		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FerrByteOffset = -1
+	}
 }
 
 // Generate code to extract the value of the iCol-th column of a table.
@@ -59235,7 +59236,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+7954,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7973,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -59408,8 +59409,8 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 7984, ts + 7989, ts + 7994, ts + 6175,
-				ts + 6170, ts + 8002}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8003, ts + 8008, ts + 8013, ts + 6194,
+				ts + 6189, ts + 8021}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
@@ -59417,7 +59418,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 8010
+						return ts + 8029
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -59432,6 +59433,7 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 	var p uintptr
 	var v uintptr
 	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+		var exprAff U8
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -59445,6 +59447,14 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 		if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr, iDataCur) != 0 {
 			continue
 		}
+
+		exprAff = U8(Xsqlite3ExprAffinity(tls, pExpr))
+		if int32(exprAff) <= SQLITE_AFF_BLOB && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_BLOB ||
+			int32(exprAff) == SQLITE_AFF_TEXT && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_TEXT ||
+			int32(exprAff) >= SQLITE_AFF_NUMERIC && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_NUMERIC {
+			continue
+		}
+
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 
 		if (*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow != 0 {
@@ -59784,7 +59794,7 @@ __73:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
 		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7954,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7973,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
 __76:
@@ -60017,7 +60027,7 @@ __43:
 		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+8015, libc.VaList(bp+8, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8034, libc.VaList(bp+8, pExpr))
 	goto __91
 __90:
 	return func() int32 {
@@ -60058,7 +60068,7 @@ __93:
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
 		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8042, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8061, libc.VaList(bp+16, pExpr))
 	goto __5
 __94:
 	;
@@ -60218,7 +60228,7 @@ __121:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
 		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7636,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7644,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
 __122:
 	;
@@ -60240,11 +60250,10 @@ __49:
 	return target
 
 __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) {
+	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) {
 		goto __123
 	}
+
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
 		goto __125
@@ -60284,7 +60293,7 @@ __126:
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6517, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6536, 0)
 	goto __5
 
 __55:
@@ -60315,13 +60324,19 @@ __129:
 	;
 __127:
 	;
-	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
+	addrINR = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable, 0, target)
 
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = U8(0)
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = okConstFactor
+	if !(inReg != target) {
+		goto __130
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
+	inReg = target
+__130:
+	;
 	Xsqlite3VdbeJumpHere(tls, v, addrINR)
-	Xsqlite3VdbeChangeP3(tls, v, addrINR, inReg)
 	goto __5
 
 __56:
@@ -60334,15 +60349,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __130
+		goto __131
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __131
+		goto __132
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__131:
+__132:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -60352,22 +60367,22 @@ __131:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__130:
+__131:
 	;
 	i1 = 0
-__132:
+__133:
 	if !(i1 < nExpr-1) {
-		goto __134
+		goto __135
 	}
 	if !(pX != 0) {
-		goto __135
+		goto __136
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __136
-__135:
-	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+	goto __137
 __136:
+	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+__137:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -60376,21 +60391,21 @@ __136:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __133
-__133:
-	i1 = i1 + 2
-	goto __132
 	goto __134
 __134:
+	i1 = i1 + 2
+	goto __133
+	goto __135
+__135:
 	;
 	if !(nExpr&1 != 0) {
-		goto __137
+		goto __138
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __138
-__137:
-	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+	goto __139
 __138:
+	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+__139:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -60400,27 +60415,27 @@ __138:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __139
-	}
-	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8066, 0)
-	return 0
-__139:
-	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __140
 	}
-	Xsqlite3MayAbort(tls, pParse)
+	Xsqlite3ErrorMsg(tls, pParse,
+		ts+8085, 0)
+	return 0
 __140:
 	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __141
 	}
+	Xsqlite3MayAbort(tls, pParse)
+__141:
+	;
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+		goto __142
+	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __142
-__141:
+	goto __143
+__142:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -60429,7 +60444,7 @@ __141:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__142:
+__143:
 	;
 	goto __5
 
@@ -60440,7 +60455,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8116))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8135))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -62232,11 +62247,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+6365, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6384, 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+8126, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8145, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -62248,13 +62263,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8154,
+		ts+8173,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8329,
+			ts+8348,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -62264,10 +62279,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8503, libc.VaList(bp, zDb, zDb))
+		ts+8522, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8650, 0)
+			ts+8669, 0)
 	}
 }
 
@@ -62331,7 +62346,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8801, libc.VaList(bp, zName))
+		ts+8820, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -62341,7 +62356,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8860, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8879, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -62350,7 +62365,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8866, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8885, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -62391,19 +62406,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8893, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8912, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9077,
+		ts+9096,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9382, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9401, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9398,
+		ts+9417,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -62411,7 +62426,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9456, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9475, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -62423,7 +62438,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9721, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9740, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -62435,7 +62450,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9734,
+		ts+9753,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -62481,12 +62496,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9772, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9791, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9804, 0)
+			ts+9823, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -62496,11 +62511,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+9831)
+				ts+9850)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9890)
+				ts+9909)
 		}
 
 		if pDflt != 0 {
@@ -62513,12 +62528,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9943)
+					ts+9962)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9989)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10008)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -62529,7 +62544,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10016,
+			ts+10035,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -62551,7 +62566,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+10162,
+				ts+10181,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -62599,14 +62614,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10392, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10411, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10426, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10445, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -62634,7 +62649,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+10456, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10475, 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
 	}
@@ -62674,18 +62689,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 + 10475
+		zType = ts + 10494
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10480
+		zType = ts + 10499
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10494,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10513,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10512
+					return ts + 10531
 				}
-				return ts + 10529
+				return ts + 10548
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -62769,11 +62784,11 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10547, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10566, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1538, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1557, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iSchema == 1))
 
 	Xsqlite3MayAbort(tls, pParse)
@@ -62786,17 +62801,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10568,
+		ts+10587,
 		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+10750,
+		ts+10769,
 		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+9721, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9740, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63054,12 +63069,12 @@ 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+10881,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10900,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10904
+				return ts + 10923
 			}
-			return ts + 1538
+			return ts + 1557
 		}(), zWhen,
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg))
 	Xsqlite3_result_error(tls, pCtx, zErr, -1)
@@ -63099,8 +63114,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+10906, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 113494)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10925, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113516)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -63117,7 +63132,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, 113505)
+		rc = Xsqlite3CorruptError(tls, 113527)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -63139,7 +63154,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+10914, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10933, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -63179,12 +63194,12 @@ 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+10920, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10939, 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 + 10904
+							return ts + 10923
 						}
-						return ts + 1538
+						return ts + 1557
 					}()))
 				zReplace = zBuf2
 				nReplace = U32(Xsqlite3Strlen30(tls, zReplace))
@@ -63670,7 +63685,7 @@ __45:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FzErrMsg != 0) {
 		goto __47
 	}
-	renameColumnParseError(tls, context, ts+1538, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
+	renameColumnParseError(tls, context, ts+1557, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
 	goto __48
 __47:
 	Xsqlite3_result_error_code(tls, context, rc)
@@ -63835,7 +63850,7 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 			if rc == SQLITE_ERROR && Xsqlite3WritableSchema(tls, db) != 0 {
 				Xsqlite3_result_value(tls, context, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 			} else if (*Parse)(unsafe.Pointer(bp+80)).FzErrMsg != 0 {
-				renameColumnParseError(tls, context, ts+1538, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
+				renameColumnParseError(tls, context, ts+1557, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
 			} else {
 				Xsqlite3_result_error_code(tls, context, rc)
 			}
@@ -64038,7 +64053,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 114441)
+	rc = Xsqlite3CorruptError(tls, 114463)
 	goto drop_column_done
 __2:
 	;
@@ -64062,7 +64077,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10925, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10944, 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)
 
@@ -64143,19 +64158,19 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10547, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10566, 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+10932,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10951,
 		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 + 10960
+				return ts + 10979
 			}
-			return ts + 6111
+			return ts + 6130
 		}(),
 			zCol))
 	goto exit_drop_column
@@ -64164,7 +64179,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10972, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10991, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -64178,13 +64193,13 @@ __8:
 	goto exit_drop_column
 __9:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1538, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1557, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11020, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11039, 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+11141, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11160, 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
@@ -64302,11 +64317,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 + 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}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11178},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11199},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11219},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11238},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11257}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -64340,7 +64355,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+11261, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11280, 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)
 			}
@@ -64349,10 +64364,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+11284,
+					ts+11303,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11314, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11333, 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)
 			}
@@ -64370,9 +64385,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11332, FzCols: ts + 11345},
-	{FzName: ts + 11358, FzCols: ts + 11371},
-	{FzName: ts + 11399},
+	{FzName: ts + 11351, FzCols: ts + 11364},
+	{FzName: ts + 11377, FzCols: ts + 11390},
+	{FzName: ts + 11418},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -64562,7 +64577,7 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11412}
+	FzName:     ts + 11431}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
@@ -64813,7 +64828,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11422}
+	FzName:     ts + 11441}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -64827,7 +64842,7 @@ 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+11432,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11451,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
 					return (*StatAccum)(unsafe.Pointer(p)).FnEst
@@ -64840,7 +64855,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11437, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11456, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -64882,7 +64897,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+11443, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11462, 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--
@@ -64896,7 +64911,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11449}
+	FzName:     ts + 11468}
 
 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)
@@ -64940,7 +64955,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+11458, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11477, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -64957,7 +64972,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+11332, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11351, 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)
@@ -65113,7 +65128,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+11468, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11487, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -65170,7 +65185,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+11468, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11487, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -65217,9 +65232,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+11472)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11491)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11476)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11495)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -65302,7 +65317,7 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 	var v TRowcnt
 
 	if z == uintptr(0) {
-		z = ts + 1538
+		z = ts + 1557
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
 		v = uint64(0)
@@ -65324,15 +65339,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+11480, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11499, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11491, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11510, 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+11501, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11520, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -65608,11 +65623,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+11358, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11377, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11513,
-			ts+11567,
+			ts+11532,
+			ts+11586,
 			zDb)
 	}
 	return rc
@@ -65659,10 +65674,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+11332, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11351, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11619, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11638, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -65720,7 +65735,7 @@ 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+6425, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6444, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -65753,13 +65768,13 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zFile == uintptr(0)) {
 		goto __1
 	}
-	zFile = ts + 1538
+	zFile = ts + 1557
 __1:
 	;
 	if !(zName == uintptr(0)) {
 		goto __2
 	}
-	zName = ts + 1538
+	zName = ts + 1557
 __2:
 	;
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2)) != 0) {
@@ -65767,14 +65782,14 @@ __2:
 	}
 
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3819)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3838)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11660, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11679, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
 	if !(rc == SQLITE_OK) {
 		goto __6
 	}
@@ -65811,7 +65826,7 @@ __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11663,
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11682,
 		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
@@ -65825,7 +65840,7 @@ __12:
 	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __15
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11700, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11719, libc.VaList(bp+8, zName))
 	goto attach_error
 __15:
 	;
@@ -65889,7 +65904,7 @@ __4:
 		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11730, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11749, 0)
 	goto __23
 __22:
 	if !(rc == SQLITE_OK) {
@@ -65906,7 +65921,7 @@ __25:
 		goto __27
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
-		ts+11759, 0)
+		ts+11778, 0)
 	rc = SQLITE_ERROR
 __27:
 	;
@@ -65972,13 +65987,13 @@ __33:
 	}
 	Xsqlite3OomFault(tls, db)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1474, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1493, 0)
 	goto __35
 __34:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
 		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11827, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11846, libc.VaList(bp+16, zFile))
 __36:
 	;
 __35:
@@ -66025,7 +66040,7 @@ func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zName == uintptr(0)) {
 		goto __1
 	}
-	zName = ts + 1538
+	zName = ts + 1557
 __1:
 	;
 	i = 0
@@ -66056,14 +66071,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11855, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11874, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11876, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11895, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -66071,7 +66086,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11902, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11921, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -66188,7 +66203,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11924}
+	FzName:     ts + 11943}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -66201,7 +66216,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11938}
+	FzName:     ts + 11957}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -66215,7 +66230,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+11952, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11971, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -66247,7 +66262,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+11976,
+						ts+11995,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -66422,7 +66437,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+12022, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12041, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -66448,11 +66463,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+12045, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12064, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12051, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12070, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12057, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12076, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -66499,7 +66514,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 + 7697
+		zCol = ts + 7716
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -66523,7 +66538,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+12084, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12103, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -66794,25 +66809,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6425) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6444) == 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+6365, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6384, 7) == 0 {
 			if i == 1 {
-				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 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6411+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6430+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5886+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+6373)
+						ts+6392)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6411+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6430+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+5867)
+						ts+5886)
 				}
 			}
 		}
@@ -66833,12 +66848,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		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 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6384, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6430+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+6411+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+6373)
+					ts+6392)
 			}
 		}
 	}
@@ -66869,7 +66884,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+12099, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12118, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -66887,14 +66902,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 + 12107
+			zMsg = ts + 12126
 		} else {
-			zMsg = ts + 12120
+			zMsg = ts + 12139
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6629, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6639, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6658, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -66924,12 +66939,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+6365, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5867+7) == 0 {
-			return ts + 6411
+	if Xsqlite3_strnicmp(tls, zName, ts+6384, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5886+7) == 0 {
+			return ts + 6430
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6373+7) == 0 {
-			return ts + 6392
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6392+7) == 0 {
+			return ts + 6411
 		}
 	}
 	return zName
@@ -67287,7 +67302,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+5867)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5886)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -67313,7 +67328,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6425, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6444, zName) {
 				goto __3
 			}
 
@@ -67366,13 +67381,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+12134, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12153, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12151, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12170, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -67410,13 +67425,13 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 		if Xsqlite3_stricmp(tls, zType, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit))) != 0 ||
 			Xsqlite3_stricmp(tls, zName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 1*8))) != 0 ||
 			Xsqlite3_stricmp(tls, zTblName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 2*8))) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1538, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1557, 0)
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6365, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6384, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12171,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12190,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -67576,9 +67591,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 + 6373
+			return ts + 6392
 		}
-		return ts + 5867
+		return ts + 5886
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -67594,7 +67609,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12213, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12232, 0)
 	return
 __4:
 	;
@@ -67622,9 +67637,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10475
+			return ts + 10494
 		}
-		return ts + 8860
+		return ts + 8879
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -67640,9 +67655,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 + 6373
+			return ts + 6392
 		}
-		return ts + 5867
+		return ts + 5886
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -67673,12 +67688,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12254,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12273,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10475
+				return ts + 10494
 			}
-			return ts + 8860
+			return ts + 8879
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -67693,7 +67708,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12275, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12294, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -67780,7 +67795,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+12310, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12329, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -67804,7 +67819,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+12327, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12346, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -67824,7 +67839,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 + 12310
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12329
 	(*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)
@@ -67836,7 +67851,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+12310, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12329, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -67870,7 +67885,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+12361, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12380, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -67878,13 +67893,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+12384, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12403, 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+12391, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12410, 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--
@@ -67921,7 +67936,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+12401, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12420, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -68085,10 +68100,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+12427,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12446,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12472, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12491, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -68119,7 +68134,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+12513, 0)
+			ts+12532, 0)
 	}
 }
 
@@ -68164,7 +68179,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12565, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12584, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -68253,7 +68268,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12606, 0)
+		ts+12625, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -68348,7 +68363,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12662, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12681, 0)
 	goto generated_done
 __2:
 	;
@@ -68361,13 +68376,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12705, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12724, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12713, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12732, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -68401,13 +68416,19 @@ __10:
 
 	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
 __11:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_RAISE) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = (*Column)(unsafe.Pointer(pCol)).Faffinity
+__12:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12720,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12739,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -68528,13 +68549,13 @@ __3:
 	;
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
-		zSep = ts + 1538
-		zSep2 = ts + 12751
-		zEnd = ts + 4941
+		zSep = ts + 1557
+		zSep2 = ts + 12770
+		zEnd = ts + 4960
 	} else {
-		zSep = ts + 12753
-		zSep2 = ts + 12757
-		zEnd = ts + 12762
+		zSep = ts + 12772
+		zSep2 = ts + 12776
+		zEnd = ts + 12781
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -68542,7 +68563,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12765, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12784, 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('(')
@@ -68576,17 +68597,17 @@ __5:
 	goto __6
 __6:
 	;
-	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3647, libc.VaList(bp, zEnd))
+	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3666, libc.VaList(bp, zEnd))
 	return zStmt
 }
 
 var azType1 = [6]uintptr{
-	ts + 1538,
-	ts + 12779,
-	ts + 12785,
-	ts + 12790,
-	ts + 12795,
-	ts + 12785,
+	ts + 1557,
+	ts + 12798,
+	ts + 12804,
+	ts + 12809,
+	ts + 12814,
+	ts + 12804,
 }
 
 func resizeIndexObject(tls *libc.TLS, db uintptr, pIdx uintptr, N int32) int32 {
@@ -68976,7 +68997,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
 		if pSelect != 0 || !(int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM) && (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1538, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1557, 0)
 			return
 		}
 		(*Table)(unsafe.Pointer(p)).Ftnum = (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum
@@ -68993,10 +69014,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+12801,
-						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1538)))
+						ts+12820,
+						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1557)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12834,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12853,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -69015,11 +69036,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+12861, 0)
+				ts+12880, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12911, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12930, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -69053,7 +69074,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12943, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12962, 0)
 			return
 		}
 	}
@@ -69078,11 +69099,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 + 8860
-			zType2 = ts + 12987
+			zType = ts + 8879
+			zType2 = ts + 13006
 		} else {
-			zType = ts + 10475
-			zType2 = ts + 12993
+			zType = ts + 10494
+			zType2 = ts + 13012
 		}
 
 		if pSelect != 0 {
@@ -69153,11 +69174,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+12998, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13017, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13013,
+			ts+13032,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -69173,13 +69194,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+13111,
+					ts+13130,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13153, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13172, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -69194,7 +69215,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+9382) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9401) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -69224,7 +69245,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+13187, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13206, 0)
 	goto create_view_fail
 __1:
 	;
@@ -69240,7 +69261,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10475, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10494, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -69322,7 +69343,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13223, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13242, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -69447,13 +69468,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+13253, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13272, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13268,
+		ts+13287,
 		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)
 }
@@ -69494,10 +69515,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+13335, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13354, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11284,
+				ts+11303,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -69529,12 +69550,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+13349,
+			ts+13368,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13394,
+		ts+13413,
 		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)
@@ -69562,11 +69583,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+6365, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3270, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6384, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3289, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7117, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7125, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -69644,9 +69665,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6373
+			return ts + 6392
 		}
-		return ts + 5867
+		return ts + 5886
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -69705,21 +69726,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13461, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13480, 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+13489, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13508, 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+13523, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13542, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -69731,7 +69752,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11476, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11495, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -69795,7 +69816,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13555,
+		ts+13574,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -69807,7 +69828,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13618, 0)
+		ts+13637, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -69892,7 +69913,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13712,
+		ts+13731,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -70119,12 +70140,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+13758,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13777,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13786
+							return ts + 13805
 						}
-						return ts + 13792
+						return ts + 13811
 					}()))
 				return 1
 			}
@@ -70245,7 +70266,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13797, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13816, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -70264,7 +70285,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13803,
+		ts+13822,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -70290,26 +70311,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6365, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6384, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13853, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13872, 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+13881, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13900, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13906, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13925, 0)
 	goto exit_create_index
 __17:
 	;
@@ -70323,7 +70344,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13797, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13816, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -70338,7 +70359,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13940, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13959, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -70350,7 +70371,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13974, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13993, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -70379,7 +70400,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+13998, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14017, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -70400,9 +70421,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6373
+			return ts + 6392
 		}
-		return ts + 5867
+		return ts + 5886
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -70441,7 +70462,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13797)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13816)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -70542,7 +70563,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14021, 0)
+		ts+14040, 0)
 	goto exit_create_index
 __56:
 	;
@@ -70759,7 +70780,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14082, libc.VaList(bp+48, 0))
+		ts+14101, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -70811,8 +70832,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14124, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14143, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121859)
 	goto exit_create_index
 __101:
 	;
@@ -70858,12 +70879,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14141,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14160,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
-				return ts + 1538
+				return ts + 1557
 			}
-			return ts + 14161
+			return ts + 14180
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -70871,7 +70892,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14169,
+		ts+14188,
 		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,
@@ -70885,7 +70906,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14228, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14247, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -71046,7 +71067,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14255, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14274, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -71061,7 +71082,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14273, libc.VaList(bp+8, 0))
+		ts+14292, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -71072,9 +71093,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 + 6373
+			return ts + 6392
 		}
-		return ts + 5867
+		return ts + 5886
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -71100,9 +71121,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14346,
+		ts+14365,
 		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+11472, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11491, (*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)
@@ -71237,7 +71258,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+14406,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14425,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -71445,12 +71466,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+14442,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14461,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14478
+				return ts + 14497
 			}
-			return ts + 14481
+			return ts + 14500
 		}()))
 	goto append_from_error
 __1:
@@ -71619,7 +71640,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14487, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14506, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -71655,9 +71676,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14493
+				return ts + 14512
 			}
-			return ts + 14502
+			return ts + 14521
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -71682,7 +71703,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14487, ts + 14509, ts + 14493}
+var az = [3]uintptr{ts + 14506, ts + 14528, ts + 14512}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -71697,7 +71718,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+14517, 0)
+				ts+14536, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -71834,17 +71855,17 @@ 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+14587, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14606, 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+14598, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14617, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
-			Xsqlite3_str_append(tls, bp+8, ts+1551, 1)
+			Xsqlite3_str_append(tls, bp+8, ts+1570, 1)
 			Xsqlite3_str_appendall(tls, bp+8, zCol)
 		}
 	}
@@ -71867,11 +71888,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+12045, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12064, 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+14601, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14620, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -72001,7 +72022,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14610, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14629, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -72097,7 +72118,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+14656, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14675, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -72290,7 +72311,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14686, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14705, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -72570,7 +72591,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+14717,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14736,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -72602,11 +72623,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+14750, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14769, 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+14779, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14798, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -72857,7 +72878,7 @@ __20:
 	goto __16
 __15:
 	wcf = U16(WHERE_ONEPASS_DESIRED | WHERE_DUPLICATES_OK)
-	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_VarSelect != 0) {
+	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_Subquery != 0) {
 		goto __23
 	}
 	bComplex = 1
@@ -73110,7 +73131,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14817)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14836)
 __62:
 	;
 delete_from_cleanup:
@@ -73225,7 +73246,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+11332) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11351) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -73455,7 +73476,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 + 7989, ts + 7984, ts + 6165}
+var azType2 = [5]uintptr{ts + 6194, ts + 6189, ts + 8008, ts + 8003, ts + 6184}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -73514,7 +73535,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+14830, -1)
+					Xsqlite3_result_error(tls, context, ts+14849, -1)
 					return
 				}
 				iVal = -iVal
@@ -73818,7 +73839,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14847, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14866, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -74164,7 +74185,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+14852, -1)
+		Xsqlite3_result_error(tls, context, ts+14871, -1)
 		return
 	}
 	if argc == 3 {
@@ -74174,7 +74195,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+14885, -1)
+				ts+14904, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -74227,7 +74248,7 @@ func errlogFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	_ = argc
 	_ = context
-	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3647, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
+	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3666, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
 }
 
 func compileoptionusedFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
@@ -74267,13 +74288,13 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 
 			var zVal uintptr
 			r1 = Xsqlite3_value_double(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+4909, libc.VaList(bp, r1))
+			Xsqlite3_str_appendf(tls, pStr, ts+4928, libc.VaList(bp, r1))
 			zVal = Xsqlite3_str_value(tls, pStr)
 			if zVal != 0 {
 				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+14930, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14949, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -74281,7 +74302,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 		}
 	case SQLITE_INTEGER:
 		{
-			Xsqlite3_str_appendf(tls, pStr, ts+1318, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
+			Xsqlite3_str_appendf(tls, pStr, ts+1337, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
 			break
 
 		}
@@ -74310,13 +74331,13 @@ 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+14937, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14956, libc.VaList(bp+24, zArg))
 			break
 
 		}
 	default:
 		{
-			Xsqlite3_str_append(tls, pStr, ts+1539, 4)
+			Xsqlite3_str_append(tls, pStr, ts+1558, 4)
 			break
 
 		}
@@ -74457,7 +74478,7 @@ func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 	var ch U32
 	var c U8
 	var d U8
-	zPass = ts + 1538
+	zPass = ts + 1557
 	nPass = 0
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -74739,7 +74760,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10904}
+var azOne = [1]uintptr{ts + 10923}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -74751,7 +74772,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	zIn = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	if zIn == uintptr(0) {
-		zIn = ts + 1538
+		zIn = ts + 1557
 	}
 	for i = 0; *(*U8)(unsafe.Pointer(zIn + uintptr(i))) != 0 && !(int32(Xsqlite3CtypeMap[*(*U8)(unsafe.Pointer(zIn + uintptr(i)))])&0x02 != 0); i++ {
 	}
@@ -74775,7 +74796,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+14940, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14959, 4, uintptr(0))
 	}
 }
 
@@ -74800,7 +74821,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+12084, -1)
+		Xsqlite3_result_error(tls, context, ts+12103, -1)
 		return
 	}
 
@@ -74878,7 +74899,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+14830, -1)
+			Xsqlite3_result_error(tls, context, ts+14849, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -75140,7 +75161,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+14945, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14964, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -75160,14 +75181,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14951, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14970, 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+14951, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14970, 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+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)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14970, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14970, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -75408,109 +75429,109 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 }
 
 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 + 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(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(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 + 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_compare)), FxSFunc: 0, FzName: ts + 14995},
+	{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 + 15008},
+	{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 + 15026},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15035},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15043},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15043},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15058},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15084},
+	{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(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 + 15118},
+	{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 + 15129},
+	{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 + 15136},
+	{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 + 15150},
+	{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 + 15150},
+	{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 + 15156},
+	{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 + 15156},
+	{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 + 15162},
+	{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 + 15162},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15167},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15167},
+	{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 + 15167},
+	{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 + 15171},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15171},
+	{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 + 15171},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15175},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15182},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15190},
+	{FnArg: int8(2), 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 + 15203},
+	{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 + 15217},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15225},
+	{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 + 15234},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15234},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15240},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15246},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15252},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15256},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15256},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15262},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15269},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15276},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15287},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15294},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15309},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15326},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15337},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15343},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15361},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15369},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15383},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15391},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15400},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15400},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15407},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 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 + 15417},
+	{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 + 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},
+	{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 + 15431},
+	{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 + 15431},
+	{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 + 15437},
+	{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 + 15437},
+	{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 + 15450},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14970},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14970},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6589},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6589},
 	{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(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15460},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15468},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15474},
+	{FnArg: int8(1), 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 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15483},
+	{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 + 15487},
+	{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 + 15493},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15483},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15498},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15502},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15506},
 	{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 + 15516},
+	{FnArg: int8(1), 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 + 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(2), 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 + 15537},
+	{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 + 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 + 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 + 15559},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15564},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15570},
 	{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}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15582},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15587},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15595},
+	{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 + 15606},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6589},
+	{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 + 15611}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -75631,7 +75652,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+15615,
 				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)
@@ -76291,8 +76312,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 + 6436, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6432, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6455, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6451, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -76371,7 +76392,7 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 			(*Token)(unsafe.Pointer(bp + 80)).Fz = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 			(*Token)(unsafe.Pointer(bp + 80)).Fn = uint32(Xsqlite3Strlen30(tls, (*Token)(unsafe.Pointer(bp+80)).Fz))
 
-			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5120)
+			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5139)
 			if pRaise != 0 {
 				(*Expr)(unsafe.Pointer(pRaise)).FaffExpr = int8(OE_Abort)
 			}
@@ -76792,7 +76813,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7954, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7973, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -77260,7 +77281,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15641,
+		ts+15660,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -77285,7 +77306,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15682,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15701,
 		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
@@ -77434,7 +77455,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15714,
+		ts+15733,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -77444,7 +77465,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+15785, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -77496,7 +77517,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15791,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15810,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -77504,7 +77525,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15837, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15856, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -77916,7 +77937,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15858)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15877)
 __125:
 	;
 insert_cleanup:
@@ -78232,7 +78253,7 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 					fallthrough
 				case OE_Fail:
 					{
-						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12045, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12064, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 							(*Column)(unsafe.Pointer(pCol)).FzCnName))
 
 						Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
@@ -79323,13 +79344,13 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131895)
+	return Xsqlite3MisuseError(tls, 131931)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
 		goto __2
 	}
-	zSql = ts + 1538
+	zSql = ts + 1557
 __2:
 	;
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -79808,7 +79829,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12084, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12103, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -79817,7 +79838,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15872
+		zEntry = ts + 15891
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -79832,7 +79853,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+12045, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12064, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -79868,7 +79889,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15895, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15914, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -79882,7 +79903,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15904, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15923, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -79906,7 +79927,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15908, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15927, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -79924,7 +79945,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15914, libc.VaList(bp+16, zEntry, zFile))
+		ts+15933, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -79951,7 +79972,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+15976, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -79989,7 +80010,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15989, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16008, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -79999,7 +80020,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16026,
+	ts + 16045,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80155,7 +80176,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+16048, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -80163,63 +80184,63 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 }
 
 var pragCName = [57]uintptr{
-	ts + 5041,
-	ts + 16068,
-	ts + 8860,
-	ts + 16072,
-	ts + 16077,
-	ts + 16080,
-	ts + 16090,
-	ts + 16100,
-	ts + 16106,
-	ts + 16110,
-	ts + 16115,
-	ts + 16120,
-	ts + 16128,
+	ts + 5060,
+	ts + 16087,
+	ts + 8879,
+	ts + 16091,
+	ts + 16096,
+	ts + 16099,
+	ts + 16109,
+	ts + 16119,
+	ts + 16125,
+	ts + 16129,
+	ts + 16134,
 	ts + 16139,
-	ts + 16142,
-	ts + 16149,
-	ts + 16110,
-	ts + 16115,
-	ts + 16156,
+	ts + 16147,
+	ts + 16158,
 	ts + 16161,
-	ts + 16164,
-	ts + 16171,
-	ts + 16106,
-	ts + 16110,
-	ts + 16177,
-	ts + 16182,
-	ts + 16187,
-	ts + 16110,
-	ts + 16191,
-	ts + 16115,
-	ts + 16199,
-	ts + 16203,
-	ts + 16208,
-	ts + 11476,
-	ts + 11472,
-	ts + 16214,
-	ts + 16219,
-	ts + 16224,
-	ts + 16068,
-	ts + 16110,
-	ts + 16229,
-	ts + 16236,
+	ts + 16168,
+	ts + 16129,
+	ts + 16134,
+	ts + 16175,
+	ts + 16180,
+	ts + 16183,
+	ts + 16190,
+	ts + 16125,
+	ts + 16129,
+	ts + 16196,
+	ts + 16201,
+	ts + 16206,
+	ts + 16129,
+	ts + 16210,
+	ts + 16134,
+	ts + 16218,
+	ts + 16222,
+	ts + 16227,
+	ts + 11495,
+	ts + 11491,
+	ts + 16233,
+	ts + 16238,
 	ts + 16243,
-	ts + 8860,
-	ts + 16251,
-	ts + 5044,
-	ts + 16257,
-	ts + 16068,
-	ts + 16110,
+	ts + 16087,
+	ts + 16129,
+	ts + 16248,
+	ts + 16255,
 	ts + 16262,
-	ts + 16267,
-	ts + 15464,
-	ts + 16272,
-	ts + 16285,
-	ts + 16294,
-	ts + 16301,
-	ts + 16312,
+	ts + 8879,
+	ts + 16270,
+	ts + 5063,
+	ts + 16276,
+	ts + 16087,
+	ts + 16129,
+	ts + 16281,
+	ts + 16286,
+	ts + 15483,
+	ts + 16291,
+	ts + 16304,
+	ts + 16313,
+	ts + 16320,
+	ts + 16331,
 }
 
 // Definitions of all built-in pragmas
@@ -80237,238 +80258,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16320,
+	{FzName: ts + 16339,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16335,
+	{FzName: ts + 16354,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16350,
+	{FzName: ts + 16369,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16362,
+	{FzName: ts + 16381,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16378,
+	{FzName: ts + 16397,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16301,
+	{FzName: ts + 16320,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16391,
+	{FzName: ts + 16410,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16403,
+	{FzName: ts + 16422,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16423,
+	{FzName: ts + 16442,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CellSizeCk)},
-	{FzName: ts + 16439,
+	{FzName: ts + 16458,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16460,
+	{FzName: ts + 16479,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16475,
+	{FzName: ts + 16494,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16491,
+	{FzName: ts + 16510,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16505,
+	{FzName: ts + 16524,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16518,
+	{FzName: ts + 16537,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16532,
+	{FzName: ts + 16551,
 		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,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_DeferFKs)},
 	{FzName: ts + 16570,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_DeferFKs)},
+	{FzName: ts + 16589,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16593,
+	{FzName: ts + 16612,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16602,
+	{FzName: ts + 16621,
 		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 + 16639,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16637,
+	{FzName: ts + 16656,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16650,
+	{FzName: ts + 16669,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16665,
+	{FzName: ts + 16684,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16683,
+	{FzName: ts + 16702,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16693,
+	{FzName: ts + 16712,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16707,
+	{FzName: ts + 16726,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16723,
+	{FzName: ts + 16742,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16748,
+	{FzName: ts + 16767,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16767,
+	{FzName: ts + 16786,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16778,
+	{FzName: ts + 16797,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16789,
+	{FzName: ts + 16808,
 		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 + 16820,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16817,
+	{FzName: ts + 16836,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16830,
+	{FzName: ts + 16849,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16849,
+	{FzName: ts + 16868,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16868,
+	{FzName: ts + 16887,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16881,
+	{FzName: ts + 16900,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16896,
+	{FzName: ts + 16915,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16906,
+	{FzName: ts + 16925,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16918,
+	{FzName: ts + 16937,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16927,
+	{FzName: ts + 16946,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16938,
+	{FzName: ts + 16957,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16948,
+	{FzName: ts + 16967,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16960,
+	{FzName: ts + 16979,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16971,
+	{FzName: ts + 16990,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16983,
+	{FzName: ts + 17002,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17000,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_RecTriggers)},
 	{FzName: ts + 17019,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_RecTriggers)},
+	{FzName: ts + 17038,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17045,
+	{FzName: ts + 17064,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17060,
+	{FzName: ts + 17079,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17074,
+	{FzName: ts + 17093,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17093,
+	{FzName: ts + 17112,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17107,
+	{FzName: ts + 17126,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17123,
+	{FzName: ts + 17142,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17135,
+	{FzName: ts + 17154,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17146,
+	{FzName: ts + 17165,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17157,
+	{FzName: ts + 17176,
 		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 + 17188,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17180,
+	{FzName: ts + 17199,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17201,
+	{FzName: ts + 17220,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17209,
+	{FzName: ts + 17228,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17224,
+	{FzName: ts + 17243,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17237,
-		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
 	{FzName: ts + 17256,
+		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
+	{FzName: ts + 17275,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17271,
+	{FzName: ts + 17290,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -80490,7 +80511,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 + 17306))
 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)}
@@ -80502,10 +80523,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+17331) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17322) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17341) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -80514,13 +80535,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+8010) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8029) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17329) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17348) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17334) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17353) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -80535,9 +80556,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+16281) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17346) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17365) == 0 {
 		return 2
 	} else {
 		return 0
@@ -80551,7 +80572,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+17372, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -80642,19 +80663,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17415
+		zName = ts + 17434
 		break
 	case OE_SetDflt:
-		zName = ts + 17424
+		zName = ts + 17443
 		break
 	case OE_Cascade:
-		zName = ts + 17436
+		zName = ts + 17455
 		break
 	case OE_Restrict:
-		zName = ts + 17444
+		zName = ts + 17463
 		break
 	default:
-		zName = ts + 17453
+		zName = ts + 17472
 		break
 	}
 	return zName
@@ -80671,7 +80692,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 + 17482, ts + 17489, ts + 17497, ts + 17501, ts + 17365, ts + 17510,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -80718,13 +80739,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 + 17514
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17497
+			zType = ts + 17516
 		} else {
-			zType = ts + 7512
+			zType = ts + 7520
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17499,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17518,
 			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),
@@ -80732,7 +80753,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 + 17525, ts + 17530, ts + 17538}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -80883,6 +80904,7 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp7 int32
 	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
@@ -80979,7 +81001,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17527, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17546, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -81018,7 +81040,7 @@ __8:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 488)) != 0) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+3647, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+3666, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 488)))
 __10:
 	;
@@ -81240,7 +81262,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17531) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17550) == 0) {
 		goto __64
 	}
 	b = 2
@@ -81312,7 +81334,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17322
+	zRet = ts + 17341
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -81350,7 +81372,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17312
+	zRet = ts + 17331
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -81600,7 +81622,7 @@ __116:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 544)) == 0) {
 		goto __119
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17536, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17555, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __119:
@@ -81619,7 +81641,7 @@ __120:
 	if !(*(*int8)(unsafe.Pointer(zRight)) != 0) {
 		goto __121
 	}
-	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+16, zRight))
+	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+16, zRight))
 	goto __122
 __121:
 	Xsqlite3_temp_directory = uintptr(0)
@@ -81641,7 +81663,7 @@ __123:
 		goto __125
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17561, 0)
+		ts+17580, 0)
 	goto __126
 __125:
 	if !(iDb != 1) {
@@ -81695,7 +81717,7 @@ __132:
 __134:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17614) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17633) == 0) {
 		goto __135
 	}
 
@@ -81792,13 +81814,13 @@ __148:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17620
+			return ts + 17639
 		}
-		return ts + 17628
+		return ts + 17647
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
-			Xsqlite3ColumnType(tls, pCol, ts+1538),
+			Xsqlite3ColumnType(tls, pCol, ts+1557),
 			func() int32 {
 				if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 {
 					return 1
@@ -81863,7 +81885,7 @@ __163:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __164
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17635, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17654, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __165
 	}
@@ -81876,7 +81898,7 @@ __165:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __166
 	}
-	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1474, 0)
+	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1493, 0)
 	(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 __166:
 	;
@@ -81909,29 +81931,29 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __171
 	}
-	zType = ts + 10475
+	zType = ts + 10494
 	goto __172
 __171:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __173
 	}
-	zType = ts + 12705
+	zType = ts + 12724
 	goto __174
 __173:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __175
 	}
-	zType = ts + 17651
+	zType = ts + 17670
 	goto __176
 __175:
-	zType = ts + 8860
+	zType = ts + 8879
 __176:
 	;
 __174:
 	;
 __172:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17658,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17677,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii3)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -81997,7 +82019,7 @@ __183:
 		goto __185
 	}
 	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+17684, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -82007,7 +82029,7 @@ __183:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __186
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17670,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17689,
 		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))))
@@ -82044,8 +82066,8 @@ __189:
 	if !(pIdx1 != 0) {
 		goto __191
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 560)) = [3]uintptr{ts + 17675, ts + 17677, ts + 16139}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17679,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 560)) = [3]uintptr{ts + 17694, ts + 17696, ts + 16158}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17698,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -82078,7 +82100,7 @@ __192:
 	goto __193
 __195:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17685,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17704,
 		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)))
@@ -82100,7 +82122,7 @@ __196:
 		goto __198
 	}
 	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+17708, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __197
 __197:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -82164,7 +82186,7 @@ __208:
 		goto __210
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7512, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7520, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __209
 __209:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -82180,7 +82202,7 @@ __211:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __213
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7512, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7520, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __212
 __212:
 	i6++
@@ -82215,7 +82237,7 @@ __219:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __221
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17692,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17711,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -82223,7 +82245,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+17701))
+			ts+17720))
 	goto __220
 __220:
 	j2++
@@ -82412,7 +82434,7 @@ __249:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __250:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17706, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17725, 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)))
@@ -82629,7 +82651,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+17710, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17729, 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)
@@ -82740,7 +82762,7 @@ __300:
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17734,
+		ts+17753,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
@@ -82839,7 +82861,7 @@ __314:
 	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+17789, 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) {
@@ -82861,7 +82883,7 @@ __319:
 
 	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+17809,
 		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)
@@ -82874,7 +82896,7 @@ __322:
 	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+17831,
 		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 __325
@@ -82892,11 +82914,11 @@ __324:
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 604)), j4, 3)
 __327:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17835, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17854, -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+17856,
 		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)
 __326:
@@ -82942,7 +82964,7 @@ __332:
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17857,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17876,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
@@ -82976,89 +82998,103 @@ __337:
 
 	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+17887)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17906)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17892)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17911)
 	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)
 
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __338
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_IdxRowid, *(*int32)(unsafe.Pointer(bp + 608))+j4, 3)
+	jmp7 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 3, 0, r1+int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn)-1)
+
+	Xsqlite3VdbeLoadString(tls, v, 3,
+		ts+17932)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17968)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp7)
+__338:
+	;
 	label6 = 0
 	kk = 0
-__338:
+__339:
 	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) {
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
 		goto __342
 	}
-	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+	goto __340
 __342:
+	;
+	if !(label6 == 0) {
+		goto __343
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__343:
 	;
 	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:
+	kk++
+	goto __339
+	goto __341
+__341:
 	;
 	if !(label6 != 0) {
-		goto __343
+		goto __344
 	}
 	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
 	Xsqlite3VdbeResolveLabel(tls, v, label6)
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17887)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17906)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17913)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17979)
 	Xsqlite3VdbeGoto(tls, v, jmp5-1)
 	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-__343:
+__344:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __344
+		goto __345
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__345:
+__346:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __347
+		goto __348
 	}
 	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 __348
+		goto __349
 	}
-	goto __346
-__348:
+	goto __347
+__349:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
-	goto __346
-__346:
-	kk++
-	goto __345
 	goto __347
 __347:
+	kk++
+	goto __346
+	goto __348
+__348:
 	;
 	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)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18006)
 	Xsqlite3VdbeGoto(tls, v, jmp5)
 	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
-__344:
+__345:
 	;
 	Xsqlite3VdbeJumpHere(tls, v, jmp4)
 	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 624)))
@@ -83075,20 +83111,20 @@ __333:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 604)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __349
+		goto __350
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17967)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+18033)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__350:
+__351:
 	if !(pIdx5 != 0) {
-		goto __352
-	}
-	if !(pPk1 == pIdx5) {
 		goto __353
 	}
-	goto __351
-__353:
+	if !(pPk1 == pIdx5) {
+		goto __354
+	}
+	goto __352
+__354:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 608))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -83097,21 +83133,21 @@ __353:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __351
-__351:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __350
 	goto __352
 __352:
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
+	goto __351
+	goto __353
+__353:
 	;
 	if !(pPk1 != 0) {
-		goto __354
+		goto __355
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__354:
+__355:
 	;
-__349:
+__350:
 	;
 	goto __284
 __284:
@@ -83129,14 +83165,14 @@ __259:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __355
+		goto __356
 	}
 	(*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 + 17996
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18062
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__355:
+__356:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -83144,27 +83180,27 @@ __355:
 
 __45:
 	if !!(zRight != 0) {
-		goto __356
+		goto __357
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __358
-	}
-	goto pragma_out
-__358:
-	;
-	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __357
-__356:
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
 		goto __359
 	}
+	goto pragma_out
+__359:
+	;
+	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
+	goto __358
+__357:
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
+		goto __360
+	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__360:
+__361:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __362
+		goto __363
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __363
+		goto __364
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -83173,25 +83209,25 @@ __360:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __362
-__363:
-	;
-	goto __361
-__361:
-	pEnc += 16
-	goto __360
-	goto __362
-__362:
-	;
-	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __364
-	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17999, libc.VaList(bp+456, zRight))
+	goto __363
 __364:
 	;
-__359:
+	goto __362
+__362:
+	pEnc += 16
+	goto __361
+	goto __363
+__363:
 	;
-__357:
+	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
+		goto __365
+	}
+	Xsqlite3ErrorMsg(tls, pParse, ts+18065, libc.VaList(bp+456, zRight))
+__365:
+	;
+__360:
+	;
+__358:
 	;
 	goto __15
 
@@ -83199,15 +83235,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 __365
+		goto __366
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __367
+		goto __368
 	}
 	goto __15
-__367:
+__368:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -83215,41 +83251,41 @@ __367:
 	(*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 __368
+		goto __369
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__368:
+__369:
 	;
-	goto __366
-__365:
+	goto __367
+__366:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __369
+		goto __370
 	}
 	goto __15
-__369:
+__370:
 	;
 	(*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)
-__366:
+__367:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__370:
+__371:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __371
+		goto __372
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __370
-__371:
+	goto __371
+__372:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -83264,31 +83300,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __372
-	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17329) == 0) {
 		goto __373
 	}
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17348) == 0) {
+		goto __374
+	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __374
-__373:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18024) == 0) {
-		goto __375
+	goto __375
+__374:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18090) == 0) {
+		goto __376
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __376
-__375:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17482) == 0) {
-		goto __377
+	goto __377
+__376:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17501) == 0) {
+		goto __378
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
+__378:
+	;
 __377:
 	;
-__376:
+__375:
 	;
-__374:
-	;
-__372:
+__373:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -83298,10 +83334,10 @@ __372:
 
 __49:
 	if !(zRight != 0) {
-		goto __378
+		goto __379
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__378:
+__379:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -83321,19 +83357,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __379
+		goto __380
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __381
+		goto __382
 	}
 	goto __15
-__381:
+__382:
 	;
-	goto __380
-__379:
-	opMask = U32(0xfffe)
+	goto __381
 __380:
+	opMask = U32(0xfffe)
+__381:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -83342,86 +83378,86 @@ __380:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__382:
+__383:
 	if !(iDb <= iDbLast) {
-		goto __384
-	}
-	if !(iDb == 1) {
 		goto __385
 	}
-	goto __383
-__385:
+	if !(iDb == 1) {
+		goto __386
+	}
+	goto __384
+__386:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__386:
+__387:
 	if !(k4 != 0) {
-		goto __388
+		goto __389
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __389
+		goto __390
 	}
-	goto __387
-__389:
+	goto __388
+__390:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__390:
+__391:
 	if !(pIdx6 != 0) {
-		goto __392
-	}
-	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
 		goto __393
 	}
+	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
+		goto __394
+	}
 	szThreshold = int16(0)
-	goto __392
-__393:
+	goto __393
+__394:
 	;
-	goto __391
-__391:
-	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __390
 	goto __392
 __392:
+	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
+	goto __391
+	goto __393
+__393:
 	;
 	if !(szThreshold != 0) {
-		goto __394
+		goto __395
 	}
 	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))
 
-__394:
+__395:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18032,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18098,
 		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 __395
+		goto __396
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __396
-__395:
-	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+	goto __397
 __396:
+	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+__397:
 	;
-	goto __387
-__387:
-	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __386
 	goto __388
 __388:
+	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
+	goto __387
+	goto __389
+__389:
 	;
-	goto __383
-__383:
-	iDb++
-	goto __382
 	goto __384
 __384:
+	iDb++
+	goto __383
+	goto __385
+__385:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -83429,36 +83465,36 @@ __384:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __397
+		goto __398
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__397:
+__398:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+632) == SQLITE_OK) {
-		goto __398
+		goto __399
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 632)))
-__398:
+__399:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+640) == SQLITE_OK) {
-		goto __399
+		goto __400
 	}
 	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 __400
+		goto __401
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))
-__400:
+__401:
 	;
-__399:
+__400:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -83467,10 +83503,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 648)) >= int64(0)) {
-		goto __401
+		goto __402
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 648))&int64(0x7fffffff)))
-__401:
+__402:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -83479,10 +83515,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) >= int64(0)) {
-		goto __402
+		goto __403
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) & int64(0x7fffffff))
-__402:
+__403:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -83490,10 +83526,10 @@ __402:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __403
+		goto __404
 	}
 
-__403:
+__404:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -83545,14 +83581,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{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},
+	{FzName: ts + 18116, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18121, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18127, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18136, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18145, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18153, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18161},
+	{FzName: ts + 18168},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -83604,7 +83640,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+18108)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18174)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -83612,7 +83648,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18123, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18189, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -83625,19 +83661,19 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18130, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18196, 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+18136)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18202)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18148)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18214)
 		j++
 	}
-	Xsqlite3_str_append(tls, bp+32, ts+4941, 1)
+	Xsqlite3_str_append(tls, bp+32, ts+4960, 1)
 	Xsqlite3StrAccumFinish(tls, bp+32)
 
 	rc = Xsqlite3_declare_vtab(tls, db, bp+64)
@@ -83653,7 +83689,7 @@ __3:
 			(*PragmaVtab)(unsafe.Pointer(pTab)).FnHidden = U8(j)
 		}
 	} else {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	}
 
 	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
@@ -83801,7 +83837,7 @@ __1:
 		var zText uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 
 		if zText != 0 {
-			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, zText))
+			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, zText))
 			if *(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) == uintptr(0) {
 				return SQLITE_NOMEM
 			}
@@ -83817,13 +83853,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+18163)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18229)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18171, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18237, 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+18175, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18241, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -83832,7 +83868,7 @@ __3:
 	rc = Xsqlite3_prepare_v2(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
 	Xsqlite3_free(tls, zSql)
 	if rc != SQLITE_OK {
-		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
+		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
 		return rc
 	}
 	return pragmaVtabNext(tls, pVtabCursor)
@@ -83900,33 +83936,33 @@ 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+18179, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18245, 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, 137196)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137249)
 	} else {
 		var z uintptr
 		var zObj uintptr
 		if *(*uintptr)(unsafe.Pointer(azObj + 1*8)) != 0 {
 			zObj = *(*uintptr)(unsafe.Pointer(azObj + 1*8))
 		} else {
-			zObj = ts + 4992
+			zObj = ts + 5011
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18207, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18273, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18238, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18304, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137256)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18246,
-	ts + 18253,
-	ts + 18265,
+	ts + 18312,
+	ts + 18319,
+	ts + 18331,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -83986,7 +84022,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+14124)
+				corruptSchema(tls, pData, argv, ts+14143)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -84018,13 +84054,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+18276)
+			corruptSchema(tls, pData, argv, ts+18342)
 		} 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+14124)
+				corruptSchema(tls, pData, argv, ts+14143)
 			}
 		}
 	}
@@ -84057,16 +84093,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 + 8860
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8879
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6373
+			return ts + 6392
 		}
-		return ts + 5867
+		return ts + 5886
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7922
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18289
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7941
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18355
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -84160,7 +84196,7 @@ __10:
 		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11759)
+		ts+11778)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __15:
@@ -84195,7 +84231,7 @@ __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)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18427)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __19:
@@ -84209,7 +84245,7 @@ __20:
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18385,
+		ts+18451,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -84482,7 +84518,7 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
 	(*Parse)(unsafe.Pointer(pParse)).Fdb = db
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1474, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1493, 0)
 	}
 }
 
@@ -84510,7 +84546,7 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, bp+16, ts+1474, 0)
+	Xsqlite3ErrorMsg(tls, bp+16, ts+1493, 0)
 __1:
 	;
 	if !(prepFlags&U32(SQLITE_PREPARE_PERSISTENT) != 0) {
@@ -84541,7 +84577,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18419, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18485, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -84571,7 +84607,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18449, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18515, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -84631,7 +84667,7 @@ __21:
 	if !((*Parse)(unsafe.Pointer(bp+16)).FzErrMsg != 0) {
 		goto __22
 	}
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3647, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3666, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 	Xsqlite3DbFree(tls, db, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
 	goto __23
 __22:
@@ -84667,7 +84703,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, 137995)
+		return Xsqlite3MisuseError(tls, 138048)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -84766,7 +84802,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, 138143)
+		return Xsqlite3MisuseError(tls, 138196)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -85084,8 +85120,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 + 10904
-		var zSp2 uintptr = ts + 10904
+		var zSp1 uintptr = ts + 10923
+		var zSp2 uintptr = ts + 10923
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -85093,13 +85129,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18468, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18534, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18498))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18564))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -85274,7 +85310,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+18532, libc.VaList(bp, 0))
+					ts+18598, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -85319,7 +85355,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+18582, libc.VaList(bp+8, zName))
+						ts+18648, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -85330,7 +85366,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+18646,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18712,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -85374,7 +85410,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6570, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6589, 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.
@@ -85958,16 +85994,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18683
+		z = ts + 18749
 		break
 	case TK_INTERSECT:
-		z = ts + 18693
+		z = ts + 18759
 		break
 	case TK_EXCEPT:
-		z = ts + 18703
+		z = ts + 18769
 		break
 	default:
-		z = ts + 18710
+		z = ts + 18776
 		break
 	}
 	return z
@@ -85977,7 +86013,7 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18716, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18782, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
@@ -86003,11 +86039,11 @@ 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 {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18805, libc.VaList(bp, func() uintptr {
 		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
-			return ts + 18770
+			return ts + 18836
 		}
-		return ts + 1538
+		return ts + 1557
 	}()))
 
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
@@ -86195,8 +86231,8 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 				}
 
 				if iCol < 0 {
-					zType = ts + 1103
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16251
+					zType = ts + 1122
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16270
 				} 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))
@@ -86335,13 +86371,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16251
+				zCol = ts + 16270
 			} 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+12045, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12064, 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))
@@ -86349,7 +86385,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+18785, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18851, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -86439,7 +86475,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16251
+					zName = ts + 16270
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -86449,7 +86485,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18785, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18851, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -86465,7 +86501,7 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18794, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18860, 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)
@@ -86548,8 +86584,6 @@ __1:
 		(*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
@@ -86564,12 +86598,15 @@ __1:
 			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
 				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
 			}
+			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)
+			}
 		}
 		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
+				zType = ts + 18868
 			} else {
 				zType = uintptr(0)
 				for j = 1; j < SQLITE_N_STDTYPE; j++ {
@@ -86785,7 +86822,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18806, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18872, 0)
 	return
 __1:
 	;
@@ -86876,7 +86913,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18855, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18921, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -86896,7 +86933,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18897, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18963, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -86933,7 +86970,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18903, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18969, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -86967,11 +87004,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+18918, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18984, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
-			return ts + 1538
+			return ts + 1557
 		}
-		return ts + 18941
+		return ts + 19007
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -87072,8 +87109,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18943, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18958, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19009, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19024, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -87120,7 +87157,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18683, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18749, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -87187,7 +87224,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+18977, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19043, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -87249,7 +87286,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+18977, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19043, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -87402,10 +87439,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+18998, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19064, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19044,
+			ts+19110,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -87659,8 +87696,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+7218)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7218)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7226)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7226)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -87687,13 +87724,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+19126, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19192, 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+19137, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19203, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -87705,7 +87742,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+19142, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19208, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -87893,7 +87930,8 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 				Xsqlite3VectorErrorMsg(tls, (*SubstContext)(unsafe.Pointer(pSubst)).FpParse, pCopy)
 			} else {
 				var db uintptr = (*Parse)(unsafe.Pointer((*SubstContext)(unsafe.Pointer(pSubst)).FpParse)).Fdb
-				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 && int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN {
+				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 &&
+					(int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN || (*Expr)(unsafe.Pointer(pCopy)).FiTable != (*SubstContext)(unsafe.Pointer(pSubst)).FiNewTable) {
 					libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
 					(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_IF_NULL_ROW)
 					(*Expr)(unsafe.Pointer(bp)).FpLeft = pCopy
@@ -87933,7 +87971,7 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 								if pColl != 0 {
 									return (*CollSeq)(unsafe.Pointer(pColl)).FzName
 								}
-								return ts + 1083
+								return ts + 1102
 							}())
 					}
 
@@ -88721,12 +88759,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15148) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15167) == 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+15152) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15171) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -88792,7 +88830,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+19148, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19214, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -88875,7 +88913,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+19166, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19232, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -89004,7 +89042,7 @@ 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+19189, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19255, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
@@ -89027,7 +89065,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+19209, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19275, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -89043,7 +89081,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19252
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19318
 		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 {
@@ -89069,7 +89107,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+19275,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19341,
 					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
@@ -89080,9 +89118,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 + 19313
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19379
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19347
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19413
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -89129,7 +89167,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+19385, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19451, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -89241,7 +89279,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19389,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19455,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -89260,7 +89298,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+19428,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19494,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -89268,7 +89306,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+14717,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14736,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -89369,7 +89407,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6430
+							zSchemaName = ts + 6449
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -89384,7 +89422,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+19459, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19525, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -89449,7 +89487,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+19464,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19530,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -89461,7 +89499,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+12045, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12064, 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)
@@ -89480,9 +89518,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19473, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19539, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19491, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19557, 0)
 					}
 				}
 			}
@@ -89492,7 +89530,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+19511, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19577, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -89630,7 +89668,7 @@ func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect ui
 	(*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)
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSelect)).FpGroupBy)).FnExpr)
 		} 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)
 		}
@@ -89714,13 +89752,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19542, 0)
+					ts+19608, 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+19593, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19659, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -89909,19 +89947,19 @@ 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+19626,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19692,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19638
+						return ts + 19704
 					}
-					return ts + 1538
+					return ts + 1557
 				}(),
 				func() uintptr {
 					if bCover != 0 {
 						return (*Index)(unsafe.Pointer(pIdx)).FzName
 					}
-					return ts + 1538
+					return ts + 1557
 				}()))
 	}
 }
@@ -89934,7 +89972,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+7922)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7941)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -90241,7 +90279,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19661,
+		ts+19727,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -90302,7 +90340,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19715,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19781,
 		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:
@@ -90406,7 +90444,7 @@ __27:
 	if !((*SrcItem)(unsafe.Pointer(pItem1)).FcolUsed == uint64(0) && (*SrcItem)(unsafe.Pointer(pItem1)).FzName != uintptr(0)) {
 		goto __30
 	}
-	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1538, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
+	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1557, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
 __30:
 	;
 	pSub1 = (*SrcItem)(unsafe.Pointer(pItem1)).FpSelect
@@ -90444,7 +90482,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+19755, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19821, 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)
@@ -90503,7 +90541,7 @@ __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19770, libc.VaList(bp+40, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19836, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
@@ -90974,9 +91012,9 @@ __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 + 19786
+				return ts + 19852
 			}
-			return ts + 19795
+			return ts + 19861
 		}())
 
 	groupBySort = 1
@@ -91327,7 +91365,7 @@ __65:
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
 		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19786)
+	explainTempTable(tls, pParse, ts+19852)
 __146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
@@ -91410,7 +91448,7 @@ __7:
 	if !(i < nCol) {
 		goto __9
 	}
-	z = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
+	z = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
 	if !(z == uintptr(0)) {
 		goto __10
 	}
@@ -91432,7 +91470,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19804, 0)
+		ts+19870, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -91528,7 +91566,7 @@ func Xsqlite3_get_table(tls *libc.TLS, db uintptr, zSql uintptr, pazResult uintp
 		if (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
 			if pzErrMsg != 0 {
 				Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(pzErrMsg)))
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
 			}
 			Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg)
 		}
@@ -91665,7 +91703,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+19869, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19935, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -91709,7 +91747,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19915, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19981, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -91727,7 +91765,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19923, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19989, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -91739,7 +91777,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19915, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19981, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -91754,11 +91792,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19964, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20030, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
+
 __17:
 	;
 	goto trigger_cleanup
@@ -91766,22 +91805,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6365, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6384, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19990, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20056, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20028,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20094,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20065
+				return ts + 20131
 			}
-			return ts + 20072
+			return ts + 20138
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -91790,7 +91829,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20078, libc.VaList(bp+24, pTableName+8))
+		ts+20144, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -91819,9 +91858,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 6373
+			return ts + 6392
 		}
-		return ts + 5867
+		return ts + 5886
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -91939,7 +91978,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19915, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19981, 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
@@ -91972,7 +92011,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20124,
+		ts+20190,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -91997,13 +92036,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20172,
+		ts+20238,
 		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+20247, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20313, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -92259,7 +92298,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20276, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20342, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -92298,9 +92337,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 + 6373
+				return ts + 6392
 			}
-			return ts + 5867
+			return ts + 5886
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -92312,7 +92351,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20296,
+			ts+20362,
 			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)
@@ -92426,12 +92465,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20358,
+		ts+20424,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20406
+				return ts + 20472
 			}
-			return ts + 20413
+			return ts + 20479
 		}()))
 __15:
 	;
@@ -92545,7 +92584,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+20420, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20486, 0)
 	return 1
 }
 
@@ -92611,7 +92650,7 @@ func codeReturningTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab
 	}
 	Xsqlite3ExprListDelete(tls, db, (*Select)(unsafe.Pointer(bp)).FpEList)
 	pNew = sqlite3ExpandReturning(tls, pParse, (*Returning)(unsafe.Pointer(pReturning)).FpReturnEL, pTab)
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0) {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
 		libc.Xmemset(tls, bp+240, 0, uint64(unsafe.Sizeof(NameContext{})))
 		if (*Returning)(unsafe.Pointer(pReturning)).FnRetCol == 0 {
 			(*Returning)(unsafe.Pointer(pReturning)).FnRetCol = (*ExprList)(unsafe.Pointer(pNew)).FnExpr
@@ -92665,7 +92704,7 @@ func codeTriggerProgram(tls *libc.TLS, pParse uintptr, pStepList uintptr, orconf
 
 		if (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan != 0 {
 			Xsqlite3VdbeAddOp4(tls, v, OP_Trace, 0x7fffffff, 1, 0,
-				Xsqlite3MPrintf(tls, db, ts+6064, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
+				Xsqlite3MPrintf(tls, db, ts+6083, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
 				-6)
 		}
 
@@ -92775,7 +92814,7 @@ 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+20462, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20528, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
@@ -93368,7 +93407,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20476,
+		ts+20542,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -93400,7 +93439,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20512, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20578, 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:
@@ -93410,7 +93449,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7697
+				return ts + 7716
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -93726,7 +93765,12 @@ __74:
 	goto __77
 __76:
 	flags = WHERE_ONEPASS_DESIRED
-	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) && !(pTrigger != 0) && !(hasFK != 0) && !(chngKey != 0) && !(*(*int32)(unsafe.Pointer(bp + 104)) != 0)) {
+	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) &&
+		!(pTrigger != 0) &&
+		!(hasFK != 0) &&
+		!(chngKey != 0) &&
+		!(*(*int32)(unsafe.Pointer(bp + 104)) != 0) &&
+		(*NameContext)(unsafe.Pointer(bp+40)).FncFlags&NC_Subquery == 0) {
 		goto __78
 	}
 	flags = flags | WHERE_ONEPASS_MULTIROW
@@ -94280,7 +94324,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20531)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20597)
 __169:
 	;
 update_cleanup:
@@ -94586,10 +94630,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+20544, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+20610, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20548, libc.VaList(bp+8, bp+216))
+				ts+20614, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -94680,7 +94724,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+12134, -1)
+				ts+12153, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -94712,7 +94756,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+20621, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20625, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20687, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20691, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -94860,14 +94904,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+20629)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20695)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20669)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20735)
 	return SQLITE_ERROR
 __2:
 	;
@@ -94878,7 +94922,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20712)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20778)
 	return SQLITE_ERROR
 __5:
 	;
@@ -94887,7 +94931,7 @@ __5:
 	*(*uint32)(unsafe.Pointer(db + 76)) |= uint32(SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE)
 	goto __4
 __3:
-	zOut = ts + 1538
+	zOut = ts + 1557
 __4:
 	;
 	saved_flags = (*Sqlite3)(unsafe.Pointer(db)).Fflags
@@ -94906,7 +94950,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20730, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20796, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -94926,7 +94970,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20753)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20819)
 	goto end_of_vacuum
 __8:
 	;
@@ -94941,7 +94985,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14487)
+	rc = execSql(tls, db, pzErrMsg, ts+14506)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -94986,7 +95030,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20780,
+		ts+20846,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -94995,7 +95039,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20888,
+		ts+20954,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -95006,7 +95050,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20942,
+		ts+21008,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -95017,7 +95061,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21093,
+		ts+21159,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -95362,7 +95406,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+12361, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12380, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -95446,11 +95490,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+21223, libc.VaList(bp, pParse+272))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21289, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21247,
+			ts+21313,
 			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,
@@ -95460,7 +95504,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21346, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21412, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -95521,7 +95565,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+21365, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21431, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -95549,9 +95593,11 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FbDeclared = 0
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = bp + 32
+	(*Table)(unsafe.Pointer(pTab)).FnTabRef++
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{xConstruct})).f(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, pVTable+16, bp+64)
+	Xsqlite3DeleteTable(tls, db, pTab)
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = (*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -95559,9 +95605,9 @@ 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+21407, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21473, libc.VaList(bp+8, zModuleName))
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3647, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3666, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 		}
 		Xsqlite3DbFree(tls, db, pVTable)
@@ -95571,7 +95617,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 + 21437
+			var zFormat uintptr = ts + 21503
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -95583,12 +95629,12 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 			*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) = pVTable
 
 			for iCol = 0; iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol); iCol++ {
-				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1538)
+				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1557)
 				var nType int32
 				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+16161, 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
@@ -95645,13 +95691,13 @@ 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+21483, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21549, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxConnect, bp+16)
 		if rc != SQLITE_OK {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3647, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3666, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 		}
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 16)))
@@ -95703,7 +95749,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+21483, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21549, 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)
@@ -95737,7 +95783,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, 151030)
+		return Xsqlite3MisuseError(tls, 151102)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -95779,7 +95825,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR,
 			func() uintptr {
 				if (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
-					return ts + 3647
+					return ts + 3666
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg))
@@ -96147,7 +96193,7 @@ func Xsqlite3VtabEponymousTableInit(tls *libc.TLS, pParse uintptr, pMod uintptr)
 	addModuleArgument(tls, pParse, pTab, Xsqlite3DbStrDup(tls, db, (*Table)(unsafe.Pointer(pTab)).FzName))
 	rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer(pModule)).FxConnect, bp+8)
 	if rc != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+3647, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+		Xsqlite3ErrorMsg(tls, pParse, ts+3666, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		Xsqlite3VtabEponymousTableClear(tls, db, pMod)
 	}
@@ -96190,7 +96236,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, 151521)
+		rc = Xsqlite3MisuseError(tls, 151593)
 	} else {
 		ap = va
 		switch op {
@@ -96217,7 +96263,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 151539)
+				rc = Xsqlite3MisuseError(tls, 151611)
 				break
 
 			}
@@ -96448,10 +96494,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 + 21502
+		return ts + 21568
 	}
 	if i == -1 {
-		return ts + 16251
+		return ts + 16270
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -96460,35 +96506,35 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21509, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21575, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21515, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21581, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12751, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12770, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4941, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4960, 1)
 	}
 
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21515, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21581, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12751, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12770, 1)
 		}
-		Xsqlite3_str_append(tls, pStr, ts+4992, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5011, 1)
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4941, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4960, 1)
 	}
 }
 
@@ -96505,29 +96551,29 @@ 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+21517, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21583, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21509, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21575, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21520
+				return ts + 21586
 			}
-			return ts + 21525
+			return ts + 21591
 		}(), 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+21533)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21599)
 		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+21535)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21601)
 	}
-	Xsqlite3_str_append(tls, pStr, ts+4941, 1)
+	Xsqlite3_str_append(tls, pStr, ts+4960, 1)
 }
 
 // This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
@@ -96568,11 +96614,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+21537, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21603, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21543
+				return ts + 21609
 			}
-			return ts + 21550
+			return ts + 21616
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -96582,43 +96628,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 + 10960
+					zFmt = ts + 10979
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21555
+				zFmt = ts + 21621
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21588
+				zFmt = ts + 21654
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21613
+				zFmt = ts + 21679
 			} else {
-				zFmt = ts + 21631
+				zFmt = ts + 21697
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21640, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21706, 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+21648, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16270
+			Xsqlite3_str_appendf(tls, bp+64, ts+21714, 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+21679, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21745, 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+21689, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21755, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21694,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21760,
 				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+21721, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21787, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -96650,25 +96696,25 @@ 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+21732, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21798, 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+21520, 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+21586, 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+21753, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21819, 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+21509, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21575, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21520, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21586, libc.VaList(bp+16, z))
 		}
 	}
-	Xsqlite3_str_append(tls, bp+24, ts+4941, 1)
+	Xsqlite3_str_append(tls, bp+24, ts+4960, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
@@ -98262,7 +98308,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21761, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21827, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -98290,7 +98336,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21776, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21842, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -98808,7 +98854,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+21785, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21851, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -99166,10 +99212,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 + 14951, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 21799, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 16119, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15450, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14970, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21865, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -99659,12 +99705,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21806, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21872, 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+21806, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21872, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -99743,7 +99789,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 + 6753
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7702
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -99837,7 +99883,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 21847
+				return ts + 21913
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -100213,7 +100259,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21854,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21920,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -100229,7 +100275,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 		pRhs = Xsqlite3PExpr(tls, pParse, TK_UPLUS,
 			Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*ExprList_item)(unsafe.Pointer(pArgs+8+uintptr(j)*32)).FpExpr, 0), uintptr(0))
 		pTerm = Xsqlite3PExpr(tls, pParse, TK_EQ, pColRef, pRhs)
-		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ|JT_RIGHT) != 0 {
 			joinType = U32(EP_OuterON)
 		} else {
 			joinType = U32(EP_InnerON)
@@ -100947,7 +100993,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21890, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21956, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -101018,7 +101064,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21916
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21982
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -101192,6 +101238,10 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	var iCur int32
+	var saved_pIdxEpr uintptr
+
+	saved_pIdxEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 
 	addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	for __ccgo := true; __ccgo; __ccgo = iLevel < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel) {
@@ -101235,9 +101285,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, n)
 			var jj int32
 			for jj = 0; jj < n; jj++ {
-				var iCol int32 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(jj)*2)))
-
-				Xsqlite3ExprCodeGetColumnOfTable(tls, v, (*Index)(unsafe.Pointer(pIdx)).FpTable, iCur, iCol, r1+jj)
+				Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pIdx, iCur, jj, r1+jj)
 			}
 			Xsqlite3VdbeAddOp4Int(tls, v, OP_FilterAdd, (*WhereLevel)(unsafe.Pointer(pLevel)).FregFilter, 0, r1, n)
 			Xsqlite3ReleaseTempRange(tls, pParse, r1, n)
@@ -101271,6 +101319,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 		}
 	}
 	Xsqlite3VdbeJumpHere(tls, v, addrOnce)
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = saved_pIdxEpr
 }
 
 func allocateIndexInfo(tls *libc.TLS, pWInfo uintptr, pWC uintptr, mUnusable Bitmask, pSrc uintptr, pmNoOmit uintptr) uintptr {
@@ -101384,7 +101433,7 @@ __3:
 		uint64(unsafe.Sizeof(sqlite3_index_orderby{}))*uint64(nOrderBy)+uint64(unsafe.Sizeof(HiddenIndexInfo1{}))+
 		uint64(unsafe.Sizeof(uintptr(0)))*uint64(nTerm))
 	if pIdxInfo == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1474, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1493, 0)
 		return uintptr(0)
 	}
 	pHidden = pIdxInfo + 1*96
@@ -101506,9 +101555,9 @@ func vtabBestIndex(tls *libc.TLS, pParse uintptr, pTab uintptr, p uintptr) int32
 		if rc == SQLITE_NOMEM {
 			Xsqlite3OomFault(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb)
 		} else if !(int32((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3647, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3666, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3647, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3666, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
 		}
 	}
 	Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg)
@@ -101529,11 +101578,16 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 
 	_ = pParse
 
+	if !((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol)
+	} else {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnColumn)
+	}
 	nField = func() int32 {
-		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < (*Index)(unsafe.Pointer(pIdx)).FnSample {
+		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < nField {
 			return int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField)
 		}
-		return (*Index)(unsafe.Pointer(pIdx)).FnSample
+		return nField
 	}()
 	iCol = 0
 	iSample = (*Index)(unsafe.Pointer(pIdx)).FnSample * nField
@@ -103114,7 +103168,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+21927, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+21993, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -103172,7 +103226,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+21927, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+21993, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -103570,7 +103624,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+21953, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+22019, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -104177,7 +104231,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21988, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22054, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -104212,6 +104266,10 @@ __3:
 			if int32((*WherePath)(unsafe.Pointer(pFrom)).FisOrdered) == (*ExprList)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpOrderBy)).FnExpr {
 				(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_ORDERED)
 			}
+			if (*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy != 0 &&
+				int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) > (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr {
+				(*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat = I8((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr)
+			}
 		} else {
 			(*WhereInfo)(unsafe.Pointer(pWInfo)).FrevMask = (*WherePath)(unsafe.Pointer(pFrom)).FrevLoop
 			if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) <= 0 {
@@ -104506,6 +104564,9 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
+		if Xsqlite3IndexAffinityStr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pIdx) != 0 {
+			(*IndexedExpr)(unsafe.Pointer(p)).Faff = U8(*(*int8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FzColAff + uintptr(i))))
+		}
 		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
@@ -104658,7 +104719,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22006, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22072, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -104722,7 +104783,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22034, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22100, 0)
 	goto __5
 __4:
 	ii = 0
@@ -105604,7 +105665,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22052, -1)
+		pCtx, ts+22118, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -105737,7 +105798,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+22108, -1)
+					pCtx, ts+22174, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -105827,17 +105888,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-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))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22219))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22230))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22241))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22246))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22259))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22269))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22275))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22286))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22296))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22308))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22313))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -105883,7 +105944,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22251, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22317, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -105927,12 +105988,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+22270, 0)
+			ts+22336, 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+22341, 0)
+				ts+22407, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -105955,7 +106016,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+7922)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7941)
 					}
 					break
 				}
@@ -106159,7 +106220,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+22404, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22470, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -106275,7 +106336,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+7514))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7522))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -106390,7 +106451,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22430, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22496, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -106455,15 +106516,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 + 22462
+				zErr = ts + 22528
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22479
+				zErr = ts + 22545
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22495
+				zErr = ts + 22561
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22515, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22581, 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 {
@@ -106484,7 +106545,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+22548, 0)
+				ts+22614, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -106622,7 +106683,7 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regZero)
 	if eCond >= WINDOW_STARTING_NUM {
 		var regString int32 = Xsqlite3GetTempReg(tls, pParse)
-		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1538, -1)
+		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1557, -1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, Xsqlite3VdbeCurrentAddr(tls, v)+2, reg)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL))
 
@@ -106640,11 +106701,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22595,
-	ts + 22648,
-	ts + 22052,
-	ts + 22699,
-	ts + 22751,
+	ts + 22661,
+	ts + 22714,
+	ts + 22118,
+	ts + 22765,
+	ts + 22817,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -107135,7 +107196,7 @@ func windowCodeRangeTest(tls *libc.TLS, p uintptr, op int32, csr1 int32, regVal
 
 	}
 
-	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1538, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1557, -1)
 	addrGe = Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, 0, reg1)
 
 	if op == OP_Ge && arith == OP_Add || op == OP_Le && arith == OP_Subtract {
@@ -108039,19 +108100,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+22801,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22867,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 22843
+							return ts + 22909
 						}
-						return ts + 22852
+						return ts + 22918
 					}(),
 						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+22858, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22924, 0)
 		}
 	}
 
@@ -108119,7 +108180,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+22892,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22958,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -109216,7 +109277,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22930, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22996, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -110191,21 +110252,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+16270, 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+22952, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23018, 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+16183, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22952, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23018, 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))
@@ -110948,7 +111009,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+22979)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+23045)
 				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 {
@@ -111112,7 +111173,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+22988, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23054, 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))
@@ -111329,9 +111390,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 + 6748
+							return ts + 7697
 						}
-						return ts + 6753
+						return ts + 7702
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -111615,19 +111676,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+23012, 0)
+					ts+23078, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23107, 0)
+					ts+23173, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23191, 0)
+					ts+23257, 0)
 			}
 			break
 		case uint32(273):
@@ -112006,9 +112067,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+22988, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23054, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23276, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23342, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -112776,7 +112837,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+23293, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23359, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -112797,9 +112858,9 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 	}
 	if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg != 0 || (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_OK && (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_DONE {
 		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)))
+			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3666, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23318, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23384, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -112972,7 +113033,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23329, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23395, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -112985,11 +113046,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19915, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19981, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23336, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23402, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23341, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23407, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -113002,9 +113063,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23351, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23417, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23355, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23421, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -113074,7 +113135,8 @@ func sqlite3TestExtInit(tls *libc.TLS, db uintptr) int32 {
 	return Xsqlite3FaultSim(tls, 500)
 }
 
-var sqlite3BuiltinExtensions = [4]uintptr{
+var sqlite3BuiltinExtensions = [5]uintptr{
+	0,
 	0,
 	0,
 	0,
@@ -113238,7 +113300,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 174337)
+		return Xsqlite3MisuseError(tls, 174426)
 	}
 
 	ap = va
@@ -113813,7 +113875,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175111)
+		return Xsqlite3MisuseError(tls, 175200)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -113828,7 +113890,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23363, 0)
+			ts+23429, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -114019,23 +114081,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 + 23431
+	var zErr uintptr = ts + 23497
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23445
+			zErr = ts + 23511
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23467
+			zErr = ts + 23533
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23489
+			zErr = ts + 23555
 			break
 
 		}
@@ -114053,35 +114115,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23512,
-	ts + 23525,
+	ts + 23578,
+	ts + 23591,
 	uintptr(0),
-	ts + 23541,
-	ts + 23566,
-	ts + 23580,
-	ts + 23599,
-	ts + 1474,
-	ts + 23624,
-	ts + 23661,
-	ts + 23673,
-	ts + 23688,
-	ts + 23721,
+	ts + 23607,
+	ts + 23632,
+	ts + 23646,
+	ts + 23665,
+	ts + 1493,
+	ts + 23690,
+	ts + 23727,
 	ts + 23739,
-	ts + 23764,
-	ts + 23793,
+	ts + 23754,
+	ts + 23787,
+	ts + 23805,
+	ts + 23830,
+	ts + 23859,
 	uintptr(0),
-	ts + 5822,
-	ts + 5318,
-	ts + 23810,
-	ts + 23828,
-	ts + 23846,
+	ts + 5841,
+	ts + 5337,
+	ts + 23876,
+	ts + 23894,
+	ts + 23912,
 	uintptr(0),
-	ts + 23880,
+	ts + 23946,
 	uintptr(0),
-	ts + 23901,
-	ts + 23927,
-	ts + 23950,
-	ts + 23971,
+	ts + 23967,
+	ts + 23993,
+	ts + 24016,
+	ts + 24037,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -114202,7 +114264,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, 175758)
+		return Xsqlite3MisuseError(tls, 175847)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -114247,7 +114309,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+23987, 0)
+				ts+24053, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -114364,7 +114426,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+24050, libc.VaList(bp, zName))
+		ts+24116, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -114392,7 +114454,7 @@ func Xsqlite3_overload_function(tls *libc.TLS, db uintptr, zName uintptr, nArg i
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, zName))
+	zCopy = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, zName))
 	if zCopy == uintptr(0) {
 		return SQLITE_NOMEM
 	}
@@ -114600,7 +114662,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+24101, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24167, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -114693,7 +114755,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, 176503))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176592))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -114763,7 +114825,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, 176582)
+		return Xsqlite3MisuseError(tls, 176671)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -114773,7 +114835,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, 176591)
+		return Xsqlite3MisuseError(tls, 176680)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -114805,14 +114867,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, 176639)
+		return Xsqlite3MisuseError(tls, 176728)
 	}
 
 	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+24122, 0)
+				ts+24188, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -114942,7 +115004,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+24190, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24256, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -114987,10 +115049,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24196, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24262, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24206,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24272,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -115095,7 +115157,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24234, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24300, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -115106,17 +115168,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24238, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24304, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24238
+	zModeType = ts + 24304
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24244, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24310, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -115124,7 +115186,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 3256
+	zModeType = ts + 3275
 __32:
 	;
 	if !(aMode != 0) {
@@ -115154,7 +115216,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24249, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24315, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -115162,7 +115224,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24269,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24335,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -115202,7 +115264,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24293, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24359, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -115226,15 +115288,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24309, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24316, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24375, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24382, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{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},
+	{Fz: ts + 24390, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24393, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24396, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17365, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -115380,10 +115442,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+21847, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21913, 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+24334, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24400, 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) {
@@ -115397,7 +115459,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 177308)
+	rc = Xsqlite3MisuseError(tls, 177397)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -115414,7 +115476,7 @@ __19:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3647
+			return ts + 3666
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -115448,9 +115510,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 + 6425
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6444
 	(*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 + 23336
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23402
 	(*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)
@@ -115555,7 +115617,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24340
+		zFilename = ts + 24406
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -115658,21 +115720,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+24343,
+	Xsqlite3_log(tls, iErr, ts+24409,
 		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+24368)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24434)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24388)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24454)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24395)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24461)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -115783,7 +115845,7 @@ __4:
 	autoinc = libc.Bool32(int32((*Table)(unsafe.Pointer(pTab)).FiPKey) == iCol && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != U32(0))
 	goto __13
 __12:
-	zDataType = ts + 1103
+	zDataType = ts + 1122
 	primarykey = 1
 __13:
 	;
@@ -115830,14 +115892,14 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24412, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24478, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3647
+			return ts + 3666
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -116486,7 +116548,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24440, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24506, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -116604,7 +116666,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 + 24448
+			return ts + 24514
 		}
 		return uintptr(0)
 	}(), 0)
@@ -116782,7 +116844,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6165, ts + 6748, ts + 6753, ts + 6175, ts + 6170, ts + 7989, ts + 24471, ts + 24477,
+	ts + 6184, ts + 7697, ts + 7702, ts + 6194, ts + 6189, ts + 8008, ts + 24537, ts + 24543,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -116935,7 +116997,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 + 24484 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 24550 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -116961,7 +117023,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	switch Xsqlite3_value_type(tls, pValue) {
 	case SQLITE_NULL:
 		{
-			jsonAppendRaw(tls, p, ts+6165, uint32(4))
+			jsonAppendRaw(tls, p, ts+6184, uint32(4))
 			break
 
 		}
@@ -116990,7 +117052,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+24501, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24567, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -117048,19 +117110,19 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 	switch int32((*JsonNode)(unsafe.Pointer(pNode)).FeType) {
 	default:
 		{
-			jsonAppendRaw(tls, pOut, ts+6165, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6184, uint32(4))
 			break
 
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6748, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+7697, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6753, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+7702, uint32(5))
 			break
 
 		}
@@ -117605,17 +117667,17 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		}
 		return int32(j + U32(1))
 	} else if int32(c) == 'n' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6165, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6184, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		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+6748, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7697, 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+6753, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7702, 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))
@@ -117716,7 +117778,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+24530, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24596, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -118022,7 +118084,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+24545, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24611, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -118037,7 +118099,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24549, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24615, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -118091,7 +118153,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+24575,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24641,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -118196,11 +118258,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+24618, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24684, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
-					jsonAppendRaw(tls, bp, ts+4982, uint32(2))
+					jsonAppendRaw(tls, bp, ts+5001, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24621, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24687, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -118241,7 +118303,7 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if pNode != 0 {
 				jsonRenderNode(tls, pNode, bp, uintptr(0))
 			} else {
-				jsonAppendRaw(tls, bp, ts+6165, uint32(4))
+				jsonAppendRaw(tls, bp, ts+6184, uint32(4))
 			}
 		}
 		if i == argc {
@@ -118357,14 +118419,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24624, -1)
+			ts+24690, -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+24675, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24741, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -118459,7 +118521,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15364)
+	jsonWrongNumArgs(tls, ctx, ts+15383)
 	return
 __2:
 	;
@@ -118534,9 +118596,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24709
+			return ts + 24775
 		}
-		return ts + 24713
+		return ts + 24779
 	}())
 	return
 __2:
@@ -118669,7 +118731,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24720, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24786, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -118766,7 +118828,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24723, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24789, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -118810,7 +118872,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24726)
+		ts+24792)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -118941,7 +119003,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24809, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24875, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -118960,7 +119022,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+24815, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24881, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -119056,7 +119118,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+24815, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24881, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -119080,7 +119142,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 + 24820
+				zRoot = ts + 24886
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -119202,7 +119264,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+24530, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24596, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -119297,25 +119359,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{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 + 24888},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24893},
+	{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 + 24904},
 	{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}}
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24935},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24938},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24942},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24954},
+	{FnArg: int8(2), 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_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24977},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24988},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25000},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 25013},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25022},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25022},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25032},
+	{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 + 25043},
+	{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 + 25060}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -119334,8 +119396,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 25012, FpModule: 0},
-	{FzName: ts + 25022, FpModule: 0},
+	{FzName: ts + 25078, FpModule: 0},
+	{FzName: ts + 25088, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -119595,11 +119657,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+25032, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25098, 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+25040, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25106, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -119810,7 +119872,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+25045,
+		ts+25111,
 		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))
@@ -120513,7 +120575,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25127)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25193)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -120725,7 +120787,7 @@ func rtreeBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 2
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FneedToFreeIdxStr = 1
-	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, bp+8))) {
+	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, bp+8))) {
 		return SQLITE_NOMEM
 	}
 
@@ -121854,7 +121916,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25141, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25207, 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 {
@@ -121866,12 +121928,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+25161, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25227, 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+25193, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25259, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -122097,7 +122159,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+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))
+		ts+25296, 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))
@@ -122120,14 +122182,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25375
+	var zFmt uintptr = ts + 25441
 	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+11332, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11351, 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 {
@@ -122168,7 +122230,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25431, ts + 5044, ts + 16251,
+	ts + 25497, ts + 5063, ts + 16270,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -122211,19 +122273,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+25436,
+			ts+25502,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25498, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25564, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25503,
+			ts+25569,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25567,
+			ts+25633,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25637,
+			ts+25703,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -122252,7 +122314,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 + 25686
+			zFormat = ts + 25752
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -122264,7 +122326,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+25794,
+			ts+25860,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -122272,18 +122334,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+25839, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25905, 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+12751, 1)
+					Xsqlite3_str_append(tls, p, ts+12770, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25866, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25932, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25888, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25954, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25896, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25962, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -122298,14 +122360,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25912,
-	ts + 25965,
-	ts + 26010,
-	ts + 26062,
-	ts + 26116,
-	ts + 26161,
-	ts + 26219,
-	ts + 26274,
+	ts + 25978,
+	ts + 26031,
+	ts + 26076,
+	ts + 26128,
+	ts + 26182,
+	ts + 26227,
+	ts + 26285,
+	ts + 26340,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -122334,7 +122396,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+26321, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26387, 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
@@ -122342,19 +122404,19 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 				(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = 4 + int32((*Rtree)(unsafe.Pointer(pRtree)).FnBytesPerCell)*RTREE_MAXCELLS
 			}
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26341,
+			ts+26407,
 			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 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26398,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26464,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -122396,16 +122458,16 @@ 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 + 26433,
-		ts + 26476,
-		ts + 26511,
-		ts + 26547,
+		ts + 26499,
+		ts + 26542,
+		ts + 26577,
+		ts + 26613,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
 		goto __1
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
 	return SQLITE_ERROR
 __1:
 	;
@@ -122430,7 +122492,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+26584,
+	Xsqlite3_str_appendf(tls, pSql, ts+26650,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -122442,7 +122504,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26608, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26674, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -122465,7 +122527,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26614, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26680, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -122476,14 +122538,14 @@ __10:
 	if !(ii < argc) {
 		goto __12
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
 	rc = SQLITE_ERROR
 	goto __13
 __12:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __14
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
 __14:
 	;
 __13:
@@ -122526,7 +122588,7 @@ __17:
 	if !(iErr != 0) {
 		goto __22
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
 	goto rtreeInit_fail
 __22:
 	;
@@ -122543,7 +122605,7 @@ __23:
 	if !(rc != 0) {
 		goto __24
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
 	goto rtreeInit_fail
 __24:
 	;
@@ -122561,7 +122623,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26617, ts + 26628}
+var azFormat = [2]uintptr{ts + 26683, ts + 26694}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -122599,13 +122661,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+10904, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10923, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26638, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26704, 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+26644, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26710, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26648, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26714, 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})))
@@ -122616,7 +122678,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+26650, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26716, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -122694,12 +122756,12 @@ 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+26683,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26749,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
-						return ts + 4046
+						return ts + 4065
 					}
-					return ts + 1538
+					return ts + 1557
 				}(), z))
 			if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport == uintptr(0) {
 				(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
@@ -122718,7 +122780,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+26690,
+			ts+26756,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -122737,7 +122799,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+26735, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26801, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -122751,8 +122813,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 + 26767,
-		ts + 26821,
+		ts + 26833,
+		ts + 26887,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -122767,23 +122829,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+26869,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26935,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26914
+					return ts + 26980
 				}
-				return ts + 26922
+				return ts + 26988
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26931,
+				ts+26997,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26914
+						return ts + 26980
 					}
-					return ts + 26922
+					return ts + 26988
 				}(), iKey, iVal))
 		}
 	}
@@ -122807,7 +122869,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+26989, libc.VaList(bp, i, iCell, iNode))
+				ts+27055, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -122827,7 +122889,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+27037, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27103, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -122844,14 +122906,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+27104, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27170, 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+27138, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27204, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -122859,7 +122921,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+27168,
+					ts+27234,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -122888,14 +122950,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+27223,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27289,
 			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+27254, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27320, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -122917,12 +122979,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+14487, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14506, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27321, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27387, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -122931,12 +122993,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25141, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25207, 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+27349, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27415, 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)
 		}
@@ -122950,8 +123012,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+27380, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27387, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27446, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27453, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -122959,7 +123021,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+27395, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27461, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -122974,7 +123036,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27399, -1)
+			ts+27465, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -122982,7 +123044,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6425
+			zDb = ts + 6444
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -122992,7 +123054,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 + 17996
+				return ts + 18062
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -123363,11 +123425,11 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		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+27450, 1)
+		Xsqlite3_str_append(tls, x, ts+27516, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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+27518, 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+27463, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27529, 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)
 	}
@@ -123387,19 +123449,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+27474, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27540, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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)))))
+			Xsqlite3_str_appendf(tls, x, ts+27558, 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+27500, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27566, 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+27508, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27574, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27512, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27578, 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)
 	}
@@ -124319,7 +124381,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+27525, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27591, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -124328,7 +124390,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27547, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27613, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -124336,7 +124398,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26614, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26680, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -124347,7 +124409,7 @@ __5:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __7
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
 __7:
 	;
 __6:
@@ -124372,7 +124434,7 @@ __9:
 	if !(rc != 0) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	goto geopolyInit_fail
 __10:
 	;
@@ -124563,7 +124625,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 + 16270
 		(*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
@@ -124573,7 +124635,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 + 27551
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27617
 		(*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
@@ -124581,7 +124643,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 + 27557
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27623
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -124693,7 +124755,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27566, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27632, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -124825,14 +124887,14 @@ geopoly_update_end:
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
 	_ = pVtab
 	_ = nArg
-	if Xsqlite3_stricmp(tls, zName, ts+27606) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27672) == 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+27622) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27688) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -124897,7 +124959,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+27637, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27703, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -124909,25 +124971,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{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},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27711},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27724},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27737},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27750},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27688},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27762},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27672},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27785},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27799},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27812},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27826},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27842},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27788},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27854},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -124937,26 +124999,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27807, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27873, 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+27817, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27883, 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+27828, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27894, -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+27551, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27617, 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+27839, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27905, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -125010,7 +125072,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+25127, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25193, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -125337,7 +125399,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+27849, -1)
+		Xsqlite3_result_error(tls, context, ts+27915, -1)
 		return
 	}
 
@@ -125348,7 +125410,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+27849, -1)
+			Xsqlite3_result_error(tls, context, ts+27915, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -125361,7 +125423,7 @@ func prepareAndCollectError(tls *libc.TLS, db uintptr, ppStmt uintptr, pzErrmsg
 
 	var rc int32 = Xsqlite3_prepare_v2(tls, db, zSql, -1, ppStmt, uintptr(0))
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 		*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	}
 	return rc
@@ -125373,7 +125435,7 @@ func resetAndCollectError(tls *libc.TLS, pStmt uintptr, pzErrmsg uintptr) int32
 
 	var rc int32 = Xsqlite3_reset(tls, pStmt)
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
 	}
 	return rc
 }
@@ -125449,7 +125511,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+27870, uintptr(0), uintptr(0), p+64)
+				ts+27936, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -125513,7 +125575,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+25040, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25106, 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++ {
 				}
@@ -125534,16 +125596,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+28041, libc.VaList(bp, func() uintptr {
+			ts+28107, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28191
+					return ts + 28257
 				}
-				return ts + 1538
+				return ts + 1557
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28232)
+			ts+28298)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -125641,7 +125703,7 @@ func rbuFinalize(tls *libc.TLS, p uintptr, pStmt uintptr) {
 	var rc int32 = Xsqlite3_finalize(tls, pStmt)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && rc != SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 	}
 }
 
@@ -125659,7 +125721,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+28357, libc.VaList(bp, zTab)))
+			ts+28423, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -125677,7 +125739,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+28476, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28542, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -125695,7 +125757,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28497, libc.VaList(bp+16, zIdx)))
+			ts+28563, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -125718,7 +125780,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+28548, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28614, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -125764,7 +125826,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+28569, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28635, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -125779,7 +125841,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+28597, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28663, 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 {
@@ -125819,7 +125881,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+19473, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19539, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -125829,18 +125891,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+28626, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28692, 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+28645, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28711, 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+28650, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28716, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -125852,18 +125914,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+28660, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28726, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28689
+							return ts + 28755
 						}
-						return ts + 28702
+						return ts + 28768
 					}()))
 		}
 
 		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+28711, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28777, 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)
@@ -125877,7 +125939,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+28733,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28799,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -125920,12 +125982,12 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	defer tls.Free(24)
 
 	var zList uintptr = uintptr(0)
-	var zSep uintptr = ts + 1538
+	var zSep uintptr = ts + 1557
 	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+28760, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14598
+		zList = rbuMPrintf(tls, p, ts+28826, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14617
 	}
 	return zList
 }
@@ -125936,13 +125998,13 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 
 	var iPk int32 = 1
 	var zRet uintptr = uintptr(0)
-	var zSep uintptr = ts + 1538
+	var zSep uintptr = ts + 1557
 	for 1 != 0 {
 		var i int32
 		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+28769, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28835, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -125964,25 +126026,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+28782, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28848, 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+28814, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28880, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		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)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1557, ts+14617, ts+28903)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28909, ts+28916, ts+4960)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1557, ts+14617, ts+1557)
 
 		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+28858,
+					ts+28924,
 					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+28900, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28966, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -126019,12 +126081,12 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	zVector = uintptr(0)
 	zRet = uintptr(0)
 	bFailed = 0
-	zSep = ts + 1538
+	zSep = ts + 1557
 	iCol = 0
 	*(*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+28597, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28663, 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
@@ -126059,7 +126121,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 28920
+	zCol = ts + 28986
 __7:
 	;
 	goto __5
@@ -126067,13 +126129,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28928,
+	zLhs = rbuMPrintf(tls, p, ts+28994,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28949,
+	zOrder = rbuMPrintf(tls, p, ts+29015,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28985,
+	zSelect = rbuMPrintf(tls, p, ts+29051,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14598
+	zSep = ts + 14617
 	iCol++
 	goto __1
 __2:
@@ -126091,12 +126153,12 @@ __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+29012,
+		Xsqlite3_mprintf(tls, ts+29078,
 			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
 	}
-	zSep = ts + 1538
+	zSep = ts + 1557
 	iCol = 0
 __14:
 	if !(iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnCol) {
@@ -126118,8 +126180,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29060, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14598
+	zVector = rbuMPrintf(tls, p, ts+29126, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14617
 	goto __15
 __15:
 	iCol++
@@ -126130,7 +126192,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29067, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29133, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -126157,13 +126219,13 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 	var zImpPK uintptr = uintptr(0)
 	var zWhere uintptr = uintptr(0)
 	var nBind int32 = 0
-	var zCom uintptr = ts + 1538
-	var zAnd uintptr = ts + 1538
+	var zCom uintptr = ts + 1557
+	var zAnd uintptr = ts + 1557
 	*(*uintptr)(unsafe.Pointer(bp + 200)) = uintptr(0)
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28597, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28663, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -126175,9 +126237,9 @@ 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+29079, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29145, 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
+			zType = ts + 1557
 		} else {
 			if iCid < 0 {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK {
@@ -126187,37 +126249,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 + 28920
+					zCol = ts + 28986
 				} else {
-					zCol = ts + 28650
+					zCol = ts + 28716
 				}
-				zType = ts + 1103
+				zType = ts + 1122
 			} 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+29101, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29167, 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 + 28837
+					return ts + 28903
 				}
-				return ts + 1538
+				return ts + 1557
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29121,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29187,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29142,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29208,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29175, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29241, 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 + 14598
-		zAnd = ts + 21509
+		zCom = ts + 14617
+		zAnd = ts + 21575
 		nBind++
 	}
 
@@ -126251,16 +126313,16 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 
 	var zList uintptr = uintptr(0)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
-		var zS uintptr = ts + 1538
+		var zS uintptr = ts + 1557
 		var i int32
 		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+29199, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29265, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29211, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29277, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14598
+			zS = ts + 14617
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -126268,7 +126330,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+29220, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29286, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -126280,27 +126342,27 @@ 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+29235, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29301, 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 zSep uintptr = ts + 1557
 		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+29249, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21509
+				zList = rbuMPrintf(tls, p, ts+29315, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21575
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29261, libc.VaList(bp+40, zList))
+			ts+29327, libc.VaList(bp+40, zList))
 
 	} else {
-		var zSep uintptr = ts + 1538
+		var zSep uintptr = ts + 1557
 		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 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29311, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21509
+				zList = rbuMPrintf(tls, p, ts+29377, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21575
 			}
 		}
 	}
@@ -126309,7 +126371,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+29324, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29390, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -126323,21 +126385,21 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 		if int32(libc.Xstrlen(tls, zMask)) != (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 			rbuBadControlError(tls, p)
 		} else {
-			var zSep uintptr = ts + 1538
+			var zSep uintptr = ts + 1557
 			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+29311,
+					zList = rbuMPrintf(tls, p, ts+29377,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14598
+					zSep = ts + 14617
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29350,
+					zList = rbuMPrintf(tls, p, ts+29416,
 						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 + 14598
+					zSep = ts + 14617
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29380,
+					zList = rbuMPrintf(tls, p, ts+29446,
 						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 + 14598
+					zSep = ts + 14617
 				}
 			}
 		}
@@ -126372,19 +126434,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 + 29417
+		var zSep uintptr = ts + 29483
 		*(*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+28569, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28635, 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+16158) == 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+28597, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28663, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -126396,15 +126458,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 + 28837
+					zDesc = ts + 28903
 				} else {
-					zDesc = ts + 1538
+					zDesc = ts + 1557
 				}
-				z = rbuMPrintf(tls, p, ts+29430, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14598
+				z = rbuMPrintf(tls, p, ts+29496, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14617
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29441, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29507, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -126419,12 +126481,12 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		*(*uintptr)(unsafe.Pointer(bp + 168)) = uintptr(0)
 		var zIdx uintptr = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
-		var zComma uintptr = ts + 1538
+		var zComma uintptr = ts + 1557
 		var zCols uintptr = uintptr(0)
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29445)
+			ts+29511)
 		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))) {
@@ -126433,7 +126495,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+28597, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28663, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -126443,25 +126505,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+29495, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29561, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29517, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29583, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28837
+						return ts + 28903
 					}
-					return ts + 1538
+					return ts + 1557
 				}()))
-				zComma = ts + 14598
+				zComma = ts + 14617
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29527, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29593, 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+6425, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29542,
+			ts+29608,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, 0, 0))
 	}
 }
 
@@ -126471,50 +126533,50 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
 		var tnum int32 = (*RbuObjIter)(unsafe.Pointer(pIter)).FiTnum
-		var zComma uintptr = ts + 1538
+		var zComma uintptr = ts + 1557
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
-			var zPk uintptr = ts + 1538
+			var zPk uintptr = ts + 1557
 			var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCol)*8))
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, (*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 + 29604
+				zPk = ts + 29670
 			}
-			zSql = rbuMPrintf(tls, p, ts+29617,
+			zSql = rbuMPrintf(tls, p, ts+29683,
 				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 + 29644
+							return ts + 29710
 						}
-						return ts + 1538
+						return ts + 1557
 					}()))
-			zComma = ts + 14598
+			zComma = ts + 14617
 		}
 
 		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+29654, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29720, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		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,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29727,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29693
+						return ts + 29759
 					}
-					return ts + 1538
+					return ts + 1557
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, 0, 0))
 	}
 }
 
@@ -126527,7 +126589,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+29708,
+				ts+29774,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -126564,7 +126626,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+29765)
+			ts+29831)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -126669,7 +126731,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+29831, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29897, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -126689,24 +126751,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+6425, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29851,
+				ts+29917,
 				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+6425, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, 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+29916, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29982, 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+29952, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+30018, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -126722,7 +126784,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29986,
+						ts+30052,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -126730,31 +126792,31 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 30047
+											return ts + 30113
 										}
-										return ts + 30051
+										return ts + 30117
 									}()
 								}
-								return ts + 1538
+								return ts + 1557
 							}(), zStart,
 							zCollist, zLimit))
 					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+30057,
+						ts+30123,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30118,
+						ts+30184,
 						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 + 30047
+									return ts + 30113
 								}
-								return ts + 30051
+								return ts + 30117
 							}(),
 							zCollist, zLimit))
 				}
@@ -126779,8 +126841,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+6436)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6432)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6455)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6451)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -126789,52 +126851,52 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			rbuCreateImposterTable2(tls, p, pIter)
 			zWrite = func() uintptr {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
-					return ts + 1538
+					return ts + 1557
 				}
-				return ts + 30277
+				return ts + 30343
 			}()
 
 			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+30286,
+						ts+30352,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30322
+								return ts + 30388
 							}
-							return ts + 1538
+							return ts + 1557
 						}(), zBindings)))
 			}
 
 			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+30332, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30398, 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
+				var zRbuRowid uintptr = ts + 1557
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30360
+					zRbuRowid = ts + 30426
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30372, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30438, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30448
+							return ts + 30514
 						}
-						return ts + 1538
+						return ts + 1557
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30465,
+					ts+30531,
 					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+30764,
+						ts+30830,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -126842,14 +126904,14 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-				var zRbuRowid uintptr = ts + 1538
+				var zRbuRowid uintptr = ts + 1557
 				var zStart uintptr = uintptr(0)
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30863
+						zRbuRowid = ts + 30929
 					} else {
-						zRbuRowid = ts + 30873
+						zRbuRowid = ts + 30939
 					}
 				}
 
@@ -126862,35 +126924,35 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28920, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28986, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1538, ts+14598, ts+1538)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1557, ts+14617, ts+1557)
 					}
 				}
 
 				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+30884,
+							ts+30950,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30932
+										return ts + 30998
 									}
-									return ts + 1538
+									return ts + 1557
 								}(),
 								zRbuRowid,
 								(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 									if zStart != 0 {
 										return zStart
 									}
-									return ts + 1538
+									return ts + 1557
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 22843
+										return ts + 22909
 									}
-									return ts + 1538
+									return ts + 1557
 								}(), zOrder,
 								zLimit)))
 				}
@@ -126953,12 +127015,12 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 		(*RbuObjIter)(unsafe.Pointer(pIter)).FpRbuUpdate = pUp
 
 		if zSet != 0 {
-			var zPrefix uintptr = ts + 1538
+			var zPrefix uintptr = ts + 1557
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30277
+				zPrefix = ts + 30343
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30938,
+			zUpdate = Xsqlite3_mprintf(tls, ts+31004,
 				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)
@@ -126985,7 +127047,7 @@ func rbuOpenDbhandle(tls *libc.TLS, p uintptr, zName uintptr, bUseVfs int32) uin
 			return uintptr(0)
 		}())
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
 			Xsqlite3_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 			*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 		}
@@ -127017,7 +127079,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+30968, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+31034, 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:
@@ -127087,28 +127149,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+6425, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6444, 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+6425)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+30998, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6444)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31064, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		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))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31092, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.Xmemcpy(tls, p+48, ts+3289, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+6425, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+6444, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31044, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31110, 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+6425, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6444, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -127141,11 +127203,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+31110, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31176, 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+24190, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24256, (*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)))) == '?' {
@@ -127157,16 +127219,16 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31142,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6425),
+			zTarget = Xsqlite3_mprintf(tls, ts+31208,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6444),
 					func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1538
+							return ts + 1557
 						}
-						return ts + 31174
+						return ts + 31240
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1538
+							return ts + 1557
 						}
 						return zExtra
 					}()))
@@ -127182,37 +127244,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+31176, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31242, -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+31191, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31257, 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+31208, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31274, -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+6425, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31224, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31290, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, 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+31252, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31318, 0)
 	}
 }
 
@@ -127241,14 +127303,14 @@ 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+31224, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31290, 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+31270, uintptr(0), uintptr(0), uintptr(0))
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31336, uintptr(0), uintptr(0), uintptr(0))
 		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
@@ -127357,7 +127419,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+6425, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6444, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -127374,23 +127436,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+31305, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31371, 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+6425)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444)
 	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+6425)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6444)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31330, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31337, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31396, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31403, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -127507,7 +127569,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+23828, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23894, 0)
 			return
 		}
 
@@ -127600,7 +127662,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+31344)
+			ts+31410)
 		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)
@@ -127608,7 +127670,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+31366, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31432, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -127629,7 +127691,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+31393,
+				ts+31459,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -127659,9 +127721,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+31551, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31617, 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+31566,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31632,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -127675,10 +127737,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+31586, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31652, 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+31611)
+			ts+31677)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -127692,12 +127754,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+31719)
+			ts+31785)
 	}
 
 	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+31784)
+			ts+31850)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -127709,7 +127771,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+31828, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31894, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -127729,15 +127791,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+17243)
+					rbuCopyPragma(tls, p, ts+16354)
 				}
 
 				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+31853, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31919, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -127761,10 +127823,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+14502, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14521, 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+14502, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14521, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -127859,7 +127921,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+31881, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31947, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -127875,10 +127937,10 @@ func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31330, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31396, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 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)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
@@ -127892,7 +127954,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+31906, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31972, 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)
@@ -127926,7 +127988,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+31917, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31983, 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 {
@@ -127956,13 +128018,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+31989, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32055, 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+32003)
+				ts+32069)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -127973,7 +128035,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+32060)
+				ts+32126)
 			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)
@@ -128018,7 +128080,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			libc.Xmemcpy(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, zRbu, nRbu+uint64(1))
 			pCsr += uintptr(nRbu + uint64(1))
 			if zState != 0 {
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3647, libc.VaList(bp, zState))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3666, libc.VaList(bp, zState))
 			}
 
 			rbuOpenDatabase(tls, p, uintptr(0), bp+16)
@@ -128047,7 +128109,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+32134, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32200, 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
@@ -128065,12 +128127,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+32166,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32232,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32198
+							return ts + 32264
 						}
-						return ts + 32205
+						return ts + 32271
 					}()))
 			}
 		}
@@ -128078,7 +128140,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+14487, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14506, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -128089,19 +128151,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+16957)
+						rbuCopyPragma(tls, p, ts+16369)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32212, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32278, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6425, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6444, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32228, uintptr(0), uintptr(0), p+64)
+								db, ts+32294, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -128155,7 +128217,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+32252, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32318, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -128182,7 +128244,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+30277, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30343, 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++
@@ -128199,7 +128261,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+14502, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14521, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -128212,13 +128274,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+14502, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14521, 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+32260, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32326, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -128313,7 +128375,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+14502, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14521, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128330,19 +128392,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+14502, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14521, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14487
+				zBegin = ts + 14506
 			} else {
-				zBegin = ts + 32212
+				zBegin = ts + 32278
 			}
 			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+32212, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32278, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128688,7 +128750,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+32287, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32353, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -128713,7 +128775,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+32310, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32376, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -128858,7 +128920,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+6425)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6444)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -128873,7 +128935,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+32321, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32387, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -129118,6 +129180,970 @@ func Xsqlite3rbu_temp_size(tls *libc.TLS, pRbu uintptr) Sqlite3_int64 {
 	return (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FszTemp
 }
 
+var zDbstatSchema = *(*[258]int8)(unsafe.Pointer(ts + 32398))
+
+// Forward reference to data structured used in this module
+type StatTable1 = struct {
+	Fbase        Sqlite3_vtab
+	Fdb          uintptr
+	FiDb         int32
+	F__ccgo_pad1 [4]byte
+}
+
+// Forward reference to data structured used in this module
+type StatTable = StatTable1
+type StatCursor1 = struct {
+	Fbase        Sqlite3_vtab_cursor
+	FpStmt       uintptr
+	FisEof       U8
+	FisAgg       U8
+	F__ccgo_pad1 [2]byte
+	FiDb         int32
+	FaPage       [32]StatPage
+	FiPage       int32
+	FiPageno     U32
+	FzName       uintptr
+	FzPath       uintptr
+	FzPagetype   uintptr
+	FnPage       int32
+	FnCell       int32
+	FnMxPayload  int32
+	F__ccgo_pad2 [4]byte
+	FnUnused     I64
+	FnPayload    I64
+	FiOffset     I64
+	FszPage      I64
+}
+
+type StatCursor = StatCursor1
+type StatPage1 = struct {
+	FiPgno         U32
+	F__ccgo_pad1   [4]byte
+	FaPg           uintptr
+	FiCell         int32
+	F__ccgo_pad2   [4]byte
+	FzPath         uintptr
+	Fflags         U8
+	F__ccgo_pad3   [3]byte
+	FnCell         int32
+	FnUnused       int32
+	F__ccgo_pad4   [4]byte
+	FaCell         uintptr
+	FiRightChildPg U32
+	FnMxPayload    int32
+}
+
+type StatPage = StatPage1
+type StatCell1 = struct {
+	FnLocal      int32
+	FiChildPg    U32
+	FnOvfl       int32
+	F__ccgo_pad1 [4]byte
+	FaOvfl       uintptr
+	FnLastOvfl   int32
+	FiOvfl       int32
+}
+
+type StatCell = StatCell1
+
+func statConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var pTab uintptr = uintptr(0)
+	var rc int32 = SQLITE_OK
+	var iDb int32
+	_ = pAux
+
+	if argc >= 4 {
+		Xsqlite3TokenInit(tls, bp+8, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
+		iDb = Xsqlite3FindDb(tls, db, bp+8)
+		if iDb < 0 {
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+11874, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
+			return SQLITE_ERROR
+		}
+	} else {
+		iDb = 0
+	}
+	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_DIRECTONLY, 0)
+	rc = Xsqlite3_declare_vtab(tls, db, uintptr(unsafe.Pointer(&zDbstatSchema)))
+	if rc == SQLITE_OK {
+		pTab = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatTable{})))
+		if pTab == uintptr(0) {
+			rc = SQLITE_NOMEM
+		}
+	}
+
+	if rc == SQLITE_OK {
+		libc.Xmemset(tls, pTab, 0, uint64(unsafe.Sizeof(StatTable{})))
+		(*StatTable)(unsafe.Pointer(pTab)).Fdb = db
+		(*StatTable)(unsafe.Pointer(pTab)).FiDb = iDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
+	return rc
+}
+
+func statDisconnect(tls *libc.TLS, pVtab uintptr) int32 {
+	Xsqlite3_free(tls, pVtab)
+	return SQLITE_OK
+}
+
+func statBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
+	var i int32
+	var iSchema int32 = -1
+	var iName int32 = -1
+	var iAgg int32 = -1
+	_ = tab
+
+	for i = 0; i < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; i++ {
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fop) != SQLITE_INDEX_CONSTRAINT_EQ {
+			continue
+		}
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fusable) == 0 {
+			return SQLITE_CONSTRAINT
+		}
+		switch (*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(i)*12)).FiColumn {
+		case 0:
+			{
+				iName = i
+				break
+
+			}
+		case 10:
+			{
+				iSchema = i
+				break
+
+			}
+		case 11:
+			{
+				iAgg = i
+				break
+
+			}
+		}
+	}
+	i = 0
+	if iSchema >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).Fomit = uint8(1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x01
+	}
+	if iName >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iName)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x02
+	}
+	if iAgg >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iAgg)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x04
+	}
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 1.0
+
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy == 1 &&
+		(*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)).FnOrderBy == 2 &&
+		(*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_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).FiColumn == 1 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x08
+	}
+
+	return SQLITE_OK
+}
+
+func statOpen(tls *libc.TLS, pVTab uintptr, ppCursor uintptr) int32 {
+	var pTab uintptr = pVTab
+	var pCsr uintptr
+
+	pCsr = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatCursor{})))
+	if pCsr == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		libc.Xmemset(tls, pCsr, 0, uint64(unsafe.Sizeof(StatCursor{})))
+		(*StatCursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab = pVTab
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppCursor)) = pCsr
+	return SQLITE_OK
+}
+
+func statClearCells(tls *libc.TLS, p uintptr) {
+	var i int32
+	if (*StatPage)(unsafe.Pointer(p)).FaCell != 0 {
+		for i = 0; i < (*StatPage)(unsafe.Pointer(p)).FnCell; i++ {
+			Xsqlite3_free(tls, (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell+uintptr(i)*32)).FaOvfl)
+		}
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FaCell)
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnCell = 0
+	(*StatPage)(unsafe.Pointer(p)).FaCell = uintptr(0)
+}
+
+func statClearPage(tls *libc.TLS, p uintptr) {
+	var aPg uintptr = (*StatPage)(unsafe.Pointer(p)).FaPg
+	statClearCells(tls, p)
+	Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FzPath)
+	libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(StatPage{})))
+	(*StatPage)(unsafe.Pointer(p)).FaPg = aPg
+}
+
+func statResetCsr(tls *libc.TLS, pCsr uintptr) {
+	var i int32
+
+	for i = 0; i < int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{}))); i++ {
+		statClearPage(tls, pCsr+24+uintptr(i)*64)
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(pCsr+24+uintptr(i)*64)).FaPg)
+		(*StatPage)(unsafe.Pointer(pCsr + 24 + uintptr(i)*64)).FaPg = uintptr(0)
+	}
+	Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(0)
+}
+
+func statResetCounts(tls *libc.TLS, pCsr uintptr) {
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnCell = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnUnused = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPayload = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FszPage = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 0
+}
+
+func statClose(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	Xsqlite3_free(tls, pCsr)
+	return SQLITE_OK
+}
+
+func getLocalPayload(tls *libc.TLS, nUsable int32, flags U8, nTotal int32) int32 {
+	var nLocal int32
+	var nMinLocal int32
+	var nMaxLocal int32
+
+	if int32(flags) == 0x0D {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = nUsable - 35
+	} else {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = (nUsable-12)*64/255 - 23
+	}
+
+	nLocal = nMinLocal + (nTotal-nMinLocal)%(nUsable-4)
+	if nLocal > nMaxLocal {
+		nLocal = nMinLocal
+	}
+	return nLocal
+}
+
+func statDecodePage(tls *libc.TLS, pBt uintptr, p uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var nUnused int32
+	var iOff int32
+	var nHdr int32
+	var isLeaf int32
+	var szPage int32
+	var aData uintptr
+	var aHdr uintptr
+	var iNext int32
+
+	var rc int32
+	var iPrev U32
+
+	var j int32
+	var nOvfl int32
+
+	var nLocal int32
+	var pCell uintptr
+	var i int32
+	var nUsable int32
+	aData = (*StatPage)(unsafe.Pointer(p)).FaPg
+	aHdr = aData + uintptr(func() int32 {
+		if (*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1) {
+			return 100
+		}
+		return 0
+	}())
+
+	(*StatPage)(unsafe.Pointer(p)).Fflags = *(*U8)(unsafe.Pointer(aHdr))
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0A || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __1
+	}
+	isLeaf = 1
+	nHdr = 8
+	goto __2
+__1:
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05 || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x02) {
+		goto __3
+	}
+	isLeaf = 0
+	nHdr = 12
+	goto __4
+__3:
+	goto statPageIsCorrupt
+__4:
+	;
+__2:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1)) {
+		goto __5
+	}
+	nHdr = nHdr + 100
+__5:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnCell = int32(*(*U8)(unsafe.Pointer(aHdr + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 3 + 1)))
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = 0
+	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
+
+	nUnused = int32(*(*U8)(unsafe.Pointer(aHdr + 5)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 5 + 1))) - nHdr - 2*(*StatPage)(unsafe.Pointer(p)).FnCell
+	nUnused = nUnused + int32(*(*U8)(unsafe.Pointer(aHdr + 7)))
+	iOff = int32(*(*U8)(unsafe.Pointer(aHdr + 1)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 1 + 1)))
+__6:
+	if !(iOff != 0) {
+		goto __7
+	}
+	if !(iOff >= szPage) {
+		goto __8
+	}
+	goto statPageIsCorrupt
+__8:
+	;
+	nUnused = nUnused + (int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2) + 1))))
+	iNext = int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff) + 1)))
+	if !(iNext < iOff+4 && iNext > 0) {
+		goto __9
+	}
+	goto statPageIsCorrupt
+__9:
+	;
+	iOff = iNext
+	goto __6
+__7:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnUnused = nUnused
+	(*StatPage)(unsafe.Pointer(p)).FiRightChildPg = func() uint32 {
+		if isLeaf != 0 {
+			return uint32(0)
+		}
+		return Xsqlite3Get4byte(tls, aHdr+8)
+	}()
+
+	if !((*StatPage)(unsafe.Pointer(p)).FnCell != 0) {
+		goto __10
+	}
+
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = szPage - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatPage)(unsafe.Pointer(p)).FaCell = Xsqlite3_malloc64(tls, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+	if !((*StatPage)(unsafe.Pointer(p)).FaCell == uintptr(0)) {
+		goto __11
+	}
+	return SQLITE_NOMEM
+__11:
+	;
+	libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+
+	i = 0
+__12:
+	if !(i < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __14
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr(i)*32
+
+	iOff = int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2) + 1)))
+	if !(iOff < nHdr || iOff >= szPage) {
+		goto __15
+	}
+	goto statPageIsCorrupt
+__15:
+	;
+	if !!(isLeaf != 0) {
+		goto __16
+	}
+	(*StatCell)(unsafe.Pointer(pCell)).FiChildPg = Xsqlite3Get4byte(tls, aData+uintptr(iOff))
+	iOff = iOff + 4
+__16:
+	;
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05) {
+		goto __17
+	}
+
+	goto __18
+__17:
+	iOff = iOff + int32(func() uint8 {
+		if int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff)))) < int32(U8(0x80)) {
+			return uint8(func() int32 {
+				*(*U32)(unsafe.Pointer(bp)) = U32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))
+				return 1
+			}())
+		}
+		return Xsqlite3GetVarint32(tls, aData+uintptr(iOff), bp)
+	}())
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __19
+	}
+	iOff = iOff + int32(Xsqlite3GetVarint(tls, aData+uintptr(iOff), bp+8))
+__19:
+	;
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32((*StatPage)(unsafe.Pointer(p)).FnMxPayload)) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = int32(*(*U32)(unsafe.Pointer(bp)))
+__20:
+	;
+	nLocal = getLocalPayload(tls, nUsable, (*StatPage)(unsafe.Pointer(p)).Fflags, int32(*(*U32)(unsafe.Pointer(bp))))
+	if !(nLocal < 0) {
+		goto __21
+	}
+	goto statPageIsCorrupt
+__21:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLocal = nLocal
+
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32(nLocal)) {
+		goto __22
+	}
+	nOvfl = int32((*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) + U32(nUsable) - U32(4) - U32(1)) / U32(nUsable-4))
+	if !(iOff+nLocal+4 > nUsable || *(*U32)(unsafe.Pointer(bp)) > U32(0x7fffffff)) {
+		goto __23
+	}
+	goto statPageIsCorrupt
+__23:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl = int32(*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) - U32((nOvfl-1)*(nUsable-4)))
+	(*StatCell)(unsafe.Pointer(pCell)).FnOvfl = nOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FaOvfl = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(U32(0)))*uint64(nOvfl))
+	if !((*StatCell)(unsafe.Pointer(pCell)).FaOvfl == uintptr(0)) {
+		goto __24
+	}
+	return SQLITE_NOMEM
+__24:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl)) = Xsqlite3Get4byte(tls, aData+uintptr(iOff+nLocal))
+	j = 1
+__25:
+	if !(j < nOvfl) {
+		goto __27
+	}
+	iPrev = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j-1)*4))
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPrev, bp+16, 0)
+	if !(rc != SQLITE_OK) {
+		goto __28
+	}
+
+	return rc
+__28:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j)*4)) = Xsqlite3Get4byte(tls, Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 16))))
+	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
+	goto __26
+__26:
+	j++
+	goto __25
+	goto __27
+__27:
+	;
+__22:
+	;
+__18:
+	;
+	goto __13
+__13:
+	i++
+	goto __12
+	goto __14
+__14:
+	;
+__10:
+	;
+	return SQLITE_OK
+
+statPageIsCorrupt:
+	(*StatPage)(unsafe.Pointer(p)).Fflags = U8(0)
+	statClearCells(tls, p)
+	return SQLITE_OK
+}
+
+func statSizeAndOffset(tls *libc.TLS, pCsr uintptr) {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCsr)).FpVtab
+	var pBt uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatTable)(unsafe.Pointer(pTab)).FiDb)*32)).FpBt
+	var pPager uintptr = Xsqlite3BtreePager(tls, pBt)
+	var fd uintptr
+
+	fd = Xsqlite3PagerFile(tls, pPager)
+	*(*Sqlite3_int64)(unsafe.Pointer(bp)) = Sqlite3_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	if Xsqlite3OsFileControl(tls, fd, 230440, bp) == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = *(*Sqlite3_int64)(unsafe.Pointer(bp))
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += *(*Sqlite3_int64)(unsafe.Pointer(bp + 1*8))
+	} else {
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += I64(Xsqlite3BtreeGetPageSize(tls, pBt))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = (*StatCursor)(unsafe.Pointer(pCsr)).FszPage * I64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno-U32(1))
+	}
+}
+
+func statGetPage(tls *libc.TLS, pBt uintptr, iPg U32, pPg uintptr) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var pgsz int32 = Xsqlite3BtreeGetPageSize(tls, pBt)
+	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
+	var rc int32
+
+	if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+		(*StatPage)(unsafe.Pointer(pPg)).FaPg = Xsqlite3_malloc(tls, pgsz+DBSTAT_PAGE_PADDING_BYTES)
+		if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+			return SQLITE_NOMEM
+		}
+		libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0, uint64(DBSTAT_PAGE_PADDING_BYTES))
+	}
+
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPg, bp, 0)
+	if rc == SQLITE_OK {
+		var a uintptr = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		libc.Xmemcpy(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, a, uint64(pgsz))
+		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+	}
+
+	return rc
+}
+
+func statNext(tls *libc.TLS, pCursor uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
+	var rc int32
+	var nPayload int32
+	var z uintptr
+	var pCsr uintptr
+	var pTab uintptr
+	var pBt uintptr
+	var pPager uintptr
+
+	var iRoot U32
+	var nUsable int32
+	var iOvfl int32
+	var pCell uintptr
+
+	var p uintptr
+	var i int32
+	var p1 uintptr
+	pCsr = pCursor
+	pTab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	pBt = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FpBt
+	pPager = Xsqlite3BtreePager(tls, pBt)
+
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+
+statNextRestart:
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __1
+	}
+
+	statResetCounts(tls, pCsr)
+	rc = Xsqlite3_step(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	if !(rc == SQLITE_ROW) {
+		goto __3
+	}
+	iRoot = U32(Xsqlite3_column_int64(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 1))
+	Xsqlite3PagerPagecount(tls, pPager, bp+48)
+	if !(*(*int32)(unsafe.Pointer(bp + 48)) == 0) {
+		goto __5
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__5:
+	;
+	rc = statGetPage(tls, pBt, iRoot, pCsr+24)
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiPgno = iRoot
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __6
+	}
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32656, 0))
+	if !(z == uintptr(0)) {
+		goto __7
+	}
+	rc = SQLITE_NOMEM
+__7:
+	;
+__6:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 1
+	goto __4
+__3:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__4:
+	;
+	goto __2
+__1:
+	p = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __8
+	}
+	statResetCounts(tls, pCsr)
+__8:
+	;
+__9:
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __10
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32
+__11:
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl) {
+		goto __12
+	}
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = Xsqlite3BtreeGetPageSize(tls, pBt) - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	statSizeAndOffset(tls, pCsr)
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl-1) {
+		goto __13
+	}
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nUsable - 4)
+	goto __14
+__13:
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64((*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64(nUsable - 4 - (*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+__14:
+	;
+	iOvfl = (*StatCell)(unsafe.Pointer(pCell)).FiOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FiOvfl++
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __15
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(iOvfl)*4))
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32658
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls,
+		ts+32667, libc.VaList(bp, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell, iOvfl)))
+	if z == uintptr(0) {
+		return SQLITE_NOMEM
+	}
+	return SQLITE_OK
+__15:
+	;
+	goto __11
+__12:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiRightChildPg != 0) {
+		goto __16
+	}
+	goto __10
+__16:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+	goto __9
+__10:
+	;
+	if !(!(int32((*StatPage)(unsafe.Pointer(p)).FiRightChildPg) != 0) || (*StatPage)(unsafe.Pointer(p)).FiCell > (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __17
+	}
+	statClearPage(tls, p)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage--
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 && (*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __18
+	}
+
+	return SQLITE_OK
+__18:
+	;
+	goto statNextRestart
+__17:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage++
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage >= int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{})))) {
+		goto __19
+	}
+	statResetCsr(tls, pCsr)
+	return Xsqlite3CorruptError(tls, 215455)
+__19:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell == (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatPage)(unsafe.Pointer(p)).FiRightChildPg
+	goto __21
+__20:
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32)).FiChildPg
+__21:
+	;
+	rc = statGetPage(tls, pBt, (*StatPage)(unsafe.Pointer(p+1*64)).FiPgno, p+1*64)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __22
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32679, libc.VaList(bp+24, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell)))
+	if !(z == uintptr(0)) {
+		goto __23
+	}
+	rc = SQLITE_NOMEM
+__23:
+	;
+__22:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+__2:
+	;
+	if !(rc == SQLITE_OK) {
+		goto __24
+	}
+	p1 = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = (*StatPage)(unsafe.Pointer(p1)).FiPgno
+
+	rc = statDecodePage(tls, pBt, p1)
+	if !(rc == SQLITE_OK) {
+		goto __25
+	}
+	statSizeAndOffset(tls, pCsr)
+
+	switch int32((*StatPage)(unsafe.Pointer(p1)).Fflags) {
+	case 0x05:
+		goto __27
+	case 0x02:
+		goto __28
+	case 0x0D:
+		goto __29
+	case 0x0A:
+		goto __30
+	default:
+		goto __31
+	}
+	goto __26
+__27:
+__28:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32687
+	goto __26
+__29:
+__30:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32696
+	goto __26
+__31:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32701
+	goto __26
+__26:
+	;
+	*(*int32)(unsafe.Pointer(pCsr + 2108)) += (*StatPage)(unsafe.Pointer(p1)).FnCell
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64((*StatPage)(unsafe.Pointer(p1)).FnUnused)
+	if !((*StatPage)(unsafe.Pointer(p1)).FnMxPayload > (*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload) {
+		goto __32
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = (*StatPage)(unsafe.Pointer(p1)).FnMxPayload
+__32:
+	;
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __33
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+40, (*StatPage)(unsafe.Pointer(p1)).FzPath)))
+	if !(z == uintptr(0)) {
+		goto __34
+	}
+	rc = SQLITE_NOMEM
+__34:
+	;
+__33:
+	;
+	nPayload = 0
+	i = 0
+__35:
+	if !(i < (*StatPage)(unsafe.Pointer(p1)).FnCell) {
+		goto __37
+	}
+	nPayload = nPayload + (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p1)).FaCell+uintptr(i)*32)).FnLocal
+	goto __36
+__36:
+	i++
+	goto __35
+	goto __37
+__37:
+	;
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nPayload)
+
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0) {
+		goto __38
+	}
+	goto statNextRestart
+__38:
+	;
+__25:
+	;
+__24:
+	;
+	return rc
+}
+
+func statEof(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	return int32((*StatCursor)(unsafe.Pointer(pCsr)).FisEof)
+}
+
+func statFilter(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintptr, argc int32, argv uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pCsr uintptr = pCursor
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	var pSql uintptr
+	var zSql uintptr
+	var iArg int32 = 0
+	var rc int32 = SQLITE_OK
+	var zName uintptr = uintptr(0)
+	_ = argc
+	_ = idxStr
+
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FpStmt = uintptr(0)
+	if idxNum&0x01 != 0 {
+		var zDbase uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = Xsqlite3FindDbName(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zDbase)
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FiDb < 0 {
+			(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = 0
+			(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+			return SQLITE_OK
+		}
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+	if idxNum&0x02 != 0 {
+		zName = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+	}
+	if idxNum&0x04 != 0 {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(libc.Bool32(Xsqlite3_value_double(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8))) != 0.0))
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(0)
+	}
+	pSql = Xsqlite3_str_new(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb)
+	Xsqlite3_str_appendf(tls, pSql,
+		ts+32711,
+		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb+uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FzDbSName))
+	if zName != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32866, libc.VaList(bp+8, zName))
+	}
+	if idxNum&0x08 != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32880, 0)
+	}
+	zSql = Xsqlite3_str_finish(tls, pSql)
+	if zSql == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		rc = Xsqlite3_prepare_v2(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
+		Xsqlite3_free(tls, zSql)
+	}
+
+	if rc == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = -1
+		rc = statNext(tls, pCursor)
+	}
+	return rc
+}
+
+func statColumn(tls *libc.TLS, pCursor uintptr, ctx uintptr, i int32) int32 {
+	var pCsr uintptr = pCursor
+	switch i {
+	case 0:
+		Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzName, -1, libc.UintptrFromInt32(-1))
+		break
+	case 1:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath, -1, libc.UintptrFromInt32(-1))
+		}
+		break
+	case 2:
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnPage))
+		} else {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno))
+		}
+		break
+	case 3:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype, -1, uintptr(0))
+		}
+		break
+	case 4:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnCell))
+		break
+	case 5:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnPayload)
+		break
+	case 6:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnUnused)
+		break
+	case 7:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload))
+		break
+	case 8:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FiOffset)
+		}
+		break
+	case 9:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FszPage)
+		break
+	case 10:
+		{
+			var db uintptr = Xsqlite3_context_db_handle(tls, ctx)
+			var iDb int32 = (*StatCursor)(unsafe.Pointer(pCsr)).FiDb
+			Xsqlite3_result_text(tls, ctx, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, -1, uintptr(0))
+			break
+
+		}
+	default:
+		{
+			Xsqlite3_result_int(tls, ctx, int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg))
+			break
+
+		}
+	}
+	return SQLITE_OK
+}
+
+func statRowid(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32 {
+	var pCsr uintptr = pCursor
+	*(*Sqlite_int64)(unsafe.Pointer(pRowid)) = Sqlite_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	return SQLITE_OK
+}
+
+// Invoke this routine to register the "dbstat" virtual table module
+func Xsqlite3DbstatRegister(tls *libc.TLS, db uintptr) int32 {
+	return Xsqlite3_create_module(tls, db, ts+32895, uintptr(unsafe.Pointer(&dbstat_module)), uintptr(0))
+}
+
+var dbstat_module = Sqlite3_module{
+	FxCreate:     0,
+	FxConnect:    0,
+	FxBestIndex:  0,
+	FxDisconnect: 0,
+	FxDestroy:    0,
+	FxOpen:       0,
+	FxClose:      0,
+	FxFilter:     0,
+	FxNext:       0,
+	FxEof:        0,
+	FxColumn:     0,
+	FxRowid:      0,
+}
+
 type SessionTable1 = struct {
 	FpNext    uintptr
 	FzName    uintptr
@@ -129698,13 +130724,13 @@ 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+11332, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11351, 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+32332, 0)
+				ts+32902, 0)
 		} else if rc == SQLITE_ERROR {
-			zPragma = Xsqlite3_mprintf(tls, ts+1538, 0)
+			zPragma = Xsqlite3_mprintf(tls, ts+1557, 0)
 		} else {
 			*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
 			*(*uintptr)(unsafe.Pointer(pabPK)) = uintptr(0)
@@ -129715,7 +130741,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32453, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+33023, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -129813,7 +130839,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11332, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11351, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -130062,7 +131088,7 @@ __4:
 	goto error_out
 __7:
 	;
-	Xsqlite3ValueSetStr(tls, p, 0, ts+1538, uint8(0), uintptr(0))
+	Xsqlite3ValueSetStr(tls, p, 0, ts+1557, uint8(0), uintptr(0))
 	(*Sqlite3_session)(unsafe.Pointer(pSession)).FpZeroBlob = p
 __6:
 	;
@@ -130390,14 +131416,14 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1538
+	var zSep uintptr = ts + 1557
 	var zRet uintptr = uintptr(0)
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32482,
+			zRet = Xsqlite3_mprintf(tls, ts+33052,
 				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 + 21509
+			zSep = ts + 21575
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130412,7 +131438,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1538
+	var zSep uintptr = ts + 1557
 	var zRet uintptr = uintptr(0)
 	var bHave int32 = 0
 
@@ -130420,9 +131446,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+32516,
+				ts+33086,
 				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 + 32557
+			zSep = ts + 33127
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130430,7 +131456,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7514, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7522, 0)
 	}
 
 	return zRet
@@ -130441,7 +131467,7 @@ func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintpt
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32562,
+		ts+33132,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -130484,7 +131510,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32640,
+			ts+33210,
 			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
@@ -130611,7 +131637,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32693, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33263, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -130876,7 +131902,7 @@ func sessionAppendInteger(tls *libc.TLS, p uintptr, iVal int32, pRc uintptr) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
-	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]int8{}))-uint64(1)), bp+8, ts+4959, libc.VaList(bp, iVal))
+	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]int8{}))-uint64(1)), bp+8, ts+4978, libc.VaList(bp, iVal))
 	sessionAppendStr(tls, p, bp+8, pRc)
 }
 
@@ -131085,29 +132111,29 @@ 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+11332, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11351, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32720, libc.VaList(bp, zDb))
+			ts+33290, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
 	} else {
 		var i int32
-		var zSep uintptr = ts + 1538
+		var zSep uintptr = ts + 1557
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32830, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33400, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
-		sessionAppendStr(tls, bp+8, ts+1551, bp+24)
+		sessionAppendStr(tls, bp+8, ts+1570, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+32845, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33415, 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+32853, bp+24)
+				sessionAppendStr(tls, bp+8, ts+33423, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21509
+				zSep = ts + 21575
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -131216,7 +132242,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+32859, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33429, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -131308,7 +132334,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32879, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33449, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -131571,7 +132597,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, 219078)
+				rc = Xsqlite3CorruptError(tls, 219169)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -131594,7 +132620,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, 219098)
+						rc = Xsqlite3CorruptError(tls, 219189)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -131636,7 +132662,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, 219152)
+			rc = Xsqlite3CorruptError(tls, 219243)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -131697,7 +132723,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, 219240)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219331)
 		}
 	}
 
@@ -131771,13 +132797,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, 219326))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219417))
 	}
 
 	(*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, 219332))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219423))
 	}
 
 	if paRec != 0 {
@@ -131839,7 +132865,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, 219376))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219467))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -132212,7 +133238,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219832)
 	goto finished_invert
 __6:
 	;
@@ -132380,45 +133406,45 @@ 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+11332) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11351) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
 			} else {
-				var zSep uintptr = ts + 1538
+				var zSep uintptr = ts + 1557
 
 				libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(SessionBuffer{})))
 				(*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+32897, bp+16)
+				sessionAppendStr(tls, bp, ts+33467, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+32910, bp+16)
+				sessionAppendStr(tls, bp, ts+33480, 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+32916, bp+16)
+						sessionAppendStr(tls, bp, ts+33486, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 14598
+						zSep = ts + 14617
 					}
 				}
 
-				zSep = ts + 1538
-				sessionAppendStr(tls, bp, ts+32845, bp+16)
+				zSep = ts + 1557
+				sessionAppendStr(tls, bp, ts+33415, 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+32921, bp+16)
+								ts+33491, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+32853, bp+16)
+							sessionAppendStr(tls, bp, ts+33423, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21509
+						zSep = ts + 21575
 					}
 				}
 
@@ -132465,42 +133491,42 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	defer tls.Free(20)
 
 	var i int32
-	var zSep uintptr = ts + 1538
+	var zSep uintptr = ts + 1557
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+32996, bp+16)
+	sessionAppendStr(tls, bp, ts+33566, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+32845, bp+16)
+	sessionAppendStr(tls, bp, ts+33415, 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+32916, bp+16)
+			sessionAppendStr(tls, bp, ts+33486, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21509
+			zSep = ts + 21575
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+33014, bp+16)
+		sessionAppendStr(tls, bp, ts+33584, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32557, bp+16)
+		sessionAppendStr(tls, bp, ts+33127, bp+16)
 
-		zSep = ts + 1538
+		zSep = ts + 1557
 		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+32853, bp+16)
+				sessionAppendStr(tls, bp, ts+33423, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 33022
+				zSep = ts + 33592
 			}
 		}
-		sessionAppendStr(tls, bp, ts+4941, bp+16)
+		sessionAppendStr(tls, bp, ts+4960, bp+16)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
@@ -132513,7 +133539,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+6425, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6444, 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 {
@@ -132524,21 +133550,21 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+33027, bp+16)
+	sessionAppendStr(tls, bp, ts+33597, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21515, bp+16)
+	sessionAppendStr(tls, bp, ts+21581, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14598, bp+16)
+			sessionAppendStr(tls, bp, ts+14617, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+33045, bp+16)
+	sessionAppendStr(tls, bp, ts+33615, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33056, bp+16)
+		sessionAppendStr(tls, bp, ts+33626, bp+16)
 	}
-	sessionAppendStr(tls, bp, ts+4941, bp+16)
+	sessionAppendStr(tls, bp, ts+4960, bp+16)
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v2(tls, db, (*SessionBuffer)(unsafe.Pointer(bp)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp)).FnBuf, p+16, uintptr(0))
@@ -132552,14 +133578,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+11332, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11351, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+33060)
+			ts+33630)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33173)
+			ts+33743)
 	}
 	return rc
 }
@@ -132587,7 +133613,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, 220219)
+				rc = Xsqlite3CorruptError(tls, 220310)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -132840,7 +133866,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+33317, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33887, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -132856,7 +133882,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+33338, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33908, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -132929,10 +133955,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+33357, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33927, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33383, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33953, 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))
@@ -132965,7 +133991,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				f func(*libc.TLS, uintptr, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xFilter})).f(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 176))))
 			if schemaMismatch != 0 {
-				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
+				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
 				if *(*uintptr)(unsafe.Pointer(bp + 200)) == uintptr(0) {
 					rc = SQLITE_NOMEM
 					break
@@ -132978,7 +134004,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+6425, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6444, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -132991,19 +134017,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+33413, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33983, 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+33457,
+						ts+34027,
 						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+33528, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+34098, 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+11332) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11351) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -133054,14 +134080,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33588, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34158, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33618, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34188, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33642, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33618, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34212, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34188, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -134309,7 +135335,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33670, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+34240, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -134597,7 +135623,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33698, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+34268, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -134784,7 +135810,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+33729, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34299, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -134852,7 +135878,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33736
+		var zErr uintptr = ts + 34306
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135011,7 +136037,7 @@ func fts5ValueToText(tls *libc.TLS, pVal uintptr) uintptr {
 	if zRet != 0 {
 		return zRet
 	}
-	return ts + 1538
+	return ts + 1557
 }
 
 func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, nVal int32, apVal uintptr) {
@@ -135034,7 +136060,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33786
+		var zErr uintptr = ts + 34356
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135358,13 +136384,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33834, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34404, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33842, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34412, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33852, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34422, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -135775,7 +136801,7 @@ func fts5ConfigSkipLiteral(tls *libc.TLS, pIn uintptr) uintptr {
 	case 'n':
 		fallthrough
 	case 'N':
-		if Xsqlite3_strnicmp(tls, ts+6165, p, 4) == 0 {
+		if Xsqlite3_strnicmp(tls, ts+6184, p, 4) == 0 {
 			p = p + 4
 		} else {
 			p = uintptr(0)
@@ -135915,7 +136941,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+33857, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34427, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -135942,14 +136968,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+33864, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34434, 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+33895, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+34465, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -135960,7 +136986,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33928, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34498, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -135973,7 +136999,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33965, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34535, 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)))
@@ -135982,7 +137008,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+33974, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34544, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -136001,7 +137027,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34007, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34577, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -136016,14 +137042,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34041, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34611, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34049, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34619, 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+34081, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34651, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -136031,9 +137057,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34087, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34657, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34101, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34671, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -136041,9 +137067,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34139, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34709, 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+34150, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34720, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -136051,21 +137077,21 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+5059, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+5078, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 8010, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17329},
-			{FzName: ts + 34185, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8029, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17348},
+			{FzName: ts + 34755, 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+34193, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34763, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34224, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34794, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -136112,15 +137138,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+22175) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16251) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34252, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22241) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16270) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34822, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34282) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34852) {
 			*(*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+34292, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34862, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -136137,13 +137163,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+34323, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34893, 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+34328, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34898, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34335, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34905, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -136181,8 +137207,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+22175) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34343, 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+22241) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34913, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -136214,7 +137240,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+34372, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34942, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -136223,13 +137249,13 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 							if *(*uintptr)(unsafe.Pointer(bp + 48)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 48))
 							}
-							return ts + 1538
+							return ts + 1557
 						}(),
 						func() uintptr {
 							if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 64))
 							}
-							return ts + 1538
+							return ts + 1557
 						}(),
 						pzErr)
 				} else {
@@ -136251,19 +137277,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 + 34041
+			zTail = ts + 34611
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34392
+			zTail = ts + 34962
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34400, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34970, 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+16270, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -136307,18 +137333,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+34411, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34981, 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 + 1557
 			}
-			return ts + 14598
+			return ts + 14617
 		}()
-		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+34997, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34434,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22175))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35004,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22241))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -136428,7 +137454,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34460) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35030) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -136438,7 +137464,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+34465) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35035) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -136448,7 +137474,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+34474) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35044) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -136461,7 +137487,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+34484) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35054) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -136471,7 +137497,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+34494) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35064) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -136487,7 +137513,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+22175) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22241) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -136510,7 +137536,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34506
+	var zSelect uintptr = ts + 35076
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -136532,7 +137558,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+34538) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35108) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -136546,7 +137572,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+34546,
+				ts+35116,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -136644,7 +137670,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34611, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+35181, 0)
 					return FTS5_EOF
 				}
 			}
@@ -136657,20 +137683,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+34631, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+35201, 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+34662, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35232, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34665, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35235, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30047, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30113, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -138448,9 +139474,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+34669, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35239, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33698, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+34268, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -138466,7 +139492,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+34674, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+35244, 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')
@@ -138553,7 +139579,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20512, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20578, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -138634,7 +139660,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+34703, 0)
+			ts+35273, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -138804,12 +139830,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+34756,
+								ts+35326,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34806
+										return ts + 35376
 									}
-									return ts + 34669
+									return ts + 35239
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -139752,7 +140778,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+34813, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35383, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -139831,7 +140857,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+34819,
+			ts+35389,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -139856,7 +140882,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+34870,
+			ts+35440,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -139879,7 +140905,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+34919,
+			ts+35489,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -140118,7 +141144,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+34959, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+35529, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -141317,7 +142343,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+34982,
+			ts+35552,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -142510,7 +143536,7 @@ func fts5WriteFlushBtree(tls *libc.TLS, p uintptr, pWriter uintptr) {
 			if (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn > 0 {
 				return (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fp
 			}
-			return ts + 1538
+			return ts + 1557
 		}()
 
 		Xsqlite3_bind_blob(tls, (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter, 2, z, (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn, uintptr(0))
@@ -142783,7 +143809,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+35066,
+			ts+35636,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -143849,7 +144875,7 @@ func sqlite3Fts5IndexReinit(tls *libc.TLS, p uintptr) int32 {
 	fts5StructureInvalidate(tls, p)
 	fts5IndexDiscardData(tls, p)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Fts5Structure{})))
-	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1538, 0)
+	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1557, 0)
 	fts5StructureWrite(tls, p, bp)
 	return fts5IndexReturn(tls, p)
 }
@@ -143865,13 +144891,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+35123, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35693, 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+25040, ts+35131, 0, pzErr)
+				pConfig, ts+25106, ts+35701, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11472,
-					ts+35166,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11491,
+					ts+35736,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -144124,7 +145150,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+34813, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+35383, 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)))
@@ -144238,7 +145264,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35210,
+		ts+35780,
 		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))) {
@@ -144408,7 +145434,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+35296)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35866)
 			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))
@@ -144679,7 +145705,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+35301, 0)
+			ts+35871, 0)
 		return SQLITE_ERROR
 	}
 
@@ -144710,7 +145736,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 				} else if iCol >= 0 {
 					bSeenMatch = 1
 					*(*int8)(unsafe.Pointer(idxStr + uintptr(libc.PostIncInt32(&iIdxStr, 1)))) = int8('M')
-					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4959, libc.VaList(bp, iCol))
+					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4978, libc.VaList(bp, iCol))
 					idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 
 				}
@@ -144725,7 +145751,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 					}
 					return int8('G')
 				}()
-				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4959, libc.VaList(bp+8, iCol))
+				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4978, libc.VaList(bp+8, iCol))
 				idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 				(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pInfo)).FaConstraintUsage + uintptr(i)*8)).FargvIndex = libc.PreIncInt32(&iCons, 1)
 
@@ -145039,7 +146065,7 @@ func fts5NextMethod(tls *libc.TLS, pCursor uintptr) int32 {
 					rc = Xsqlite3_reset(tls, (*Fts5Cursor)(unsafe.Pointer(pCsr)).FpStmt)
 					if rc != SQLITE_OK {
 						(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-							ts+3647, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+							ts+3666, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 					}
 				} else {
 					rc = SQLITE_OK
@@ -145071,7 +146097,7 @@ func fts5PrepareStatement(tls *libc.TLS, ppStmt uintptr, pConfig uintptr, zFmt u
 		rc = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
 			uint32(SQLITE_PREPARE_PERSISTENT), bp+8, uintptr(0))
 		if rc != SQLITE_OK {
-			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 		}
 		Xsqlite3_free(tls, zSql)
 	}
@@ -145103,25 +146129,25 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35340,
+		ts+35910,
 		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 + 14598
+					return ts + 14617
 				}
-				return ts + 1538
+				return ts + 1557
 			}(),
 			func() uintptr {
 				if zRankArgs != 0 {
 					return zRankArgs
 				}
-				return ts + 1538
+				return ts + 1557
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35395
+					return ts + 35965
 				}
-				return ts + 35400
+				return ts + 35970
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -145167,12 +146193,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+35404, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35974, 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) {
+	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5060, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35410, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35980, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -145203,7 +146229,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+35438, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36008, 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,
@@ -145234,7 +146260,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+35448, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36018, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -145266,14 +146292,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+35469, libc.VaList(bp, z))
+				ts+36039, 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 + 33852
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34422
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -145329,7 +146355,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+35301, 0)
+		ts+35871, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -145372,7 +146398,7 @@ __8:
 	if !(zText == uintptr(0)) {
 		goto __14
 	}
-	zText = ts + 1538
+	zText = ts + 1557
 __14:
 	;
 	iCol = 0
@@ -145546,7 +146572,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35502, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+36072, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -145667,7 +146693,7 @@ func fts5SeekCursor(tls *libc.TLS, pCsr uintptr, bErrormsg int32) int32 {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			} else if (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg != 0 {
 				*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-					ts+3647, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
+					ts+3666, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
 			}
 		}
 	}
@@ -145691,28 +146717,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+35538, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36108, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35549, 0)
+				ts+36119, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35629, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36199, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35637, 0)
+				ts+36207, 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+16937, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35693, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36263, 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+35699, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36269, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -145770,7 +146796,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+17482, 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)))
@@ -145783,12 +146809,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+35715,
+				ts+36285,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20413
+						return ts + 20479
 					}
-					return ts + 35752
+					return ts + 36322
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -146418,7 +147444,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+35764, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36334, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -146662,7 +147688,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+35785, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36355, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -146681,7 +147707,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+35807, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36377, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -146728,7 +147754,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+35838)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36408)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -146737,7 +147763,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+35851, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+36421, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -146751,7 +147777,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35942, ts + 34041, ts + 25040, ts + 34392, ts + 11472,
+	ts + 36512, ts + 34611, ts + 25106, ts + 34962, ts + 11491,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -146775,7 +147801,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+35949, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+36519, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -146793,13 +147819,13 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35949, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36519, 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+35954, 0,
+				db, ts+36524, 0,
 				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
 				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
@@ -146856,17 +147882,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 + 35969,
-			ts + 36037,
-			ts + 36106,
-			ts + 36139,
-			ts + 36178,
-			ts + 36218,
-			ts + 36257,
-			ts + 36298,
-			ts + 36337,
-			ts + 36379,
-			ts + 36419,
+			ts + 36539,
+			ts + 36607,
+			ts + 36676,
+			ts + 36709,
+			ts + 36748,
+			ts + 36788,
+			ts + 36827,
+			ts + 36868,
+			ts + 36907,
+			ts + 36949,
+			ts + 36989,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -146933,7 +147959,7 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 			(*Fts5Config)(unsafe.Pointer((*Fts5Storage)(unsafe.Pointer(p)).FpConfig)).FbLock--
 			Xsqlite3_free(tls, zSql)
 			if rc != SQLITE_OK && pzErrMsg != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
 			}
 		}
 	}
@@ -146968,18 +147994,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+36442,
+		ts+37012,
 		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+36546,
+			ts+37116,
 			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+36584,
+			ts+37154,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -146991,7 +148017,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+36622,
+			ts+37192,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -147003,14 +148029,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+25040, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11472, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35942, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25106, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11491, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+36512, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34392, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34962, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34041, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34611, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -147022,17 +148048,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+36664,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37234,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29693
+					return ts + 29759
 				}
-				return ts + 1538
+				return ts + 1557
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36694,
+			ts+37264,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -147069,27 +148095,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36738, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37308, 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+36761, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37331, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34041, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34611, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34392, ts+36767, 0, pzErr)
+				pConfig, ts+34962, ts+37337, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35942, ts+36799, 1, pzErr)
+				pConfig, ts+36512, ts+37369, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34538, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35108, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -147295,12 +148321,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+36816,
+		ts+37386,
 		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+36866,
+			ts+37436,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -147308,7 +148334,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+34538, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35108, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -147484,7 +148510,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36895,
+	zSql = Xsqlite3_mprintf(tls, ts+37465,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -147666,14 +148692,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+34041, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34611, 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+34392, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34962, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -147868,9 +148894,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+36927) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37497) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36938) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37508) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -148085,7 +149111,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 + 36949
+			var zCat uintptr = ts + 37519
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -148097,7 +149123,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+36958) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37528) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -148108,18 +149134,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+36969) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37539) {
 					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+36927) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37497) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36938) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37508) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36958) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37528) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -148395,7 +149421,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 + 36987
+	var zBase uintptr = ts + 37557
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -148537,7 +149563,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+36997, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37567, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148545,11 +149571,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37000, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37570, 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+37005, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37575, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148557,7 +149583,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37010, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37580, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148565,7 +149591,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37013, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37583, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148573,11 +149599,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37586, 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+37021, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37591, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148585,19 +149611,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37026, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37596, 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+37030, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37600, 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+37036, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37606, 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+37041, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37611, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148605,11 +149631,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37045, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37615, 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+37049, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37619, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148617,7 +149643,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37052, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37622, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148625,11 +149651,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37056, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37626, 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+37060, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37630, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148637,7 +149663,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37064, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37634, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148645,7 +149671,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37638, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148653,7 +149679,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37642, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148669,24 +149695,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+37076, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37056, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37646, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37626, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37649, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37652, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37656, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37642, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -148701,137 +149727,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+37089, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37659, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37056, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37626, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37097, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37667, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37104, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37674, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37109, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37679, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37005, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37575, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37114, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37684, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37000, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37570, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37119, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37689, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37124, 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.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15464, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15483, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37129, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37699, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37082, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37652, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37133, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37703, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36997, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37567, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37138, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37708, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37041, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37611, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37144, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37714, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37148, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37718, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37150, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37720, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37064, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37634, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37156, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37726, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37164, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37734, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37056, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37626, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37170, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37740, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37056, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37626, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37175, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37745, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36997, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37567, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37181, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37751, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37068, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37638, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37189, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37759, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37197, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37767, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37201, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37771, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37064, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37634, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37209, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37779, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36997, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37567, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37215, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37785, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37068, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37638, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37221, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37791, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37082, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37652, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -148846,16 +149872,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+37228, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37798, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37233, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37803, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148863,21 +149889,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37238, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37808, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37244, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37814, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37197, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37767, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148885,7 +149911,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37250, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37820, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -148893,9 +149919,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37256, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37826, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36997, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37567, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -148910,12 +149936,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+37262, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37832, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37266, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37836, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37269, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37839, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -148924,7 +149950,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37272, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37842, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -149080,7 +150106,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+37276) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37846) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -149260,22 +150286,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36987, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37557, 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 + 37291, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37861, 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 + 37297, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37867, 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 + 37304, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37874, 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
@@ -150418,14 +151444,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+37312) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37882) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37316) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37886) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37320) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37890) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37329, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37899, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -150451,19 +151477,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 + 37363,
-		ts + 37403,
-		ts + 37438,
+		ts + 37933,
+		ts + 37973,
+		ts + 38008,
 	}
 
 	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+23336, *(*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+23402, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37481, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38051, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -150596,11 +151622,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+37514, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+38084, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37545,
+		ts+38115,
 		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))
@@ -150624,7 +151650,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+37596, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38166, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -150908,7 +151934,7 @@ func fts5VocabFilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, zUnused
 		if pLe != 0 {
 			var zCopy uintptr = Xsqlite3_value_text(tls, pLe)
 			if zCopy == uintptr(0) {
-				zCopy = ts + 1538
+				zCopy = ts + 1557
 			}
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm = Xsqlite3_value_bytes(tls, pLe)
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FzLeTerm = Xsqlite3_malloc(tls, (*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm+1)
@@ -151019,7 +152045,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+37622, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+38192, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -151041,7 +152067,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 + 37632
+	return ts + 38202
 }
 
 func init() {
@@ -151464,6 +152490,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1056)) = noopStepFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1064)) = uintptr(unsafe.Pointer(&lagName))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&attach_func)) + 24)) = attachFunc
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 8)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 16)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 24)) = statBestIndex
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 32)) = statDisconnect
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 40)) = statDisconnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 48)) = statOpen
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 56)) = statClose
+	*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 64)) = statFilter
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 72)) = statNext
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 80)) = statEof
+	*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 88)) = statColumn
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 96)) = statRowid
 	*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 0)) = sqlite3MemMalloc
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 8)) = sqlite3MemFree
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 16)) = sqlite3MemRealloc
@@ -151996,8 +153034,9 @@ func init() {
 	*(*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
-	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = Xsqlite3JsonTableFunctions
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = Xsqlite3DbstatRegister
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = sqlite3TestExtInit
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 32)) = Xsqlite3JsonTableFunctions
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statGetFuncdef)) + 24)) = statGet
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statInitFuncdef)) + 24)) = statInit
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statPushFuncdef)) + 24)) = statPush
@@ -152015,5 +153054,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-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 ts1 = "3.41.2\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_DBSTAT_VTAB\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\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\x00true\x00false\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 \x00rowid not at end-of-record for row \x00 of 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\x00CREATE TABLE x( name       TEXT, path       TEXT, pageno     INTEGER, pagetype   TEXT, ncell      INTEGER, payload    INTEGER, unused     INTEGER, mx_payload INTEGER, pgoffset   INTEGER, pgsize     INTEGER, schema     TEXT HIDDEN, aggregate  BOOLEAN HIDDEN)\x00/\x00overflow\x00%s%.3x+%.6x\x00%s%.3x/\x00internal\x00leaf\x00corrupted\x00SELECT * FROM (SELECT 'sqlite_schema' AS name,1 AS rootpage,'table' AS type UNION ALL SELECT name,rootpage,type FROM \"%w\".sqlite_schema WHERE rootpage!=0)\x00WHERE name=%Q\x00 ORDER BY name\x00dbstat\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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 f29d76ae..349839ce 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -167,6 +167,7 @@ const (
 	DBFLAG_SchemaKnownOk                  = 0x0010
 	DBFLAG_Vacuum                         = 0x0004
 	DBFLAG_VacuumInto                     = 0x0008
+	DBSTAT_PAGE_PADDING_BYTES             = 256
 	DB_ResetWanted                        = 0x0008
 	DB_SchemaLoaded                       = 0x0001
 	DB_UnresetViews                       = 0x0002
@@ -675,11 +676,11 @@ const (
 	NC_OrderAgg                           = 0x8000000
 	NC_PartIdx                            = 0x000002
 	NC_SelfRef                            = 0x00002e
+	NC_Subquery                           = 0x000040
 	NC_UAggInfo                           = 0x000100
 	NC_UBaseReg                           = 0x000400
 	NC_UEList                             = 0x000080
 	NC_UUpsert                            = 0x000200
-	NC_VarSelect                          = 0x000040
 	NDEBUG                                = 1
 	NMEADISC                              = 7
 	NN                                    = 1
@@ -1437,6 +1438,7 @@ const (
 	SQLITE_ECEL_REF                       = 0x04
 	SQLITE_EMPTY                          = 16
 	SQLITE_ENABLE_COLUMN_METADATA         = 1
+	SQLITE_ENABLE_DBSTAT_VTAB             = 1
 	SQLITE_ENABLE_FTS5                    = 1
 	SQLITE_ENABLE_GEOPOLY                 = 1
 	SQLITE_ENABLE_LOCKING_STYLE           = 0
@@ -1837,7 +1839,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
+	SQLITE_SOURCE_ID                      = "2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -1945,8 +1947,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.41.0"
-	SQLITE_VERSION_NUMBER                 = 3041000
+	SQLITE_VERSION                        = "3.41.2"
+	SQLITE_VERSION_NUMBER                 = 3041002
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -5214,7 +5216,8 @@ type IndexedExpr1 = struct {
 	FiIdxCur       int32
 	FiIdxCol       int32
 	FbMaybeNullRow U8
-	F__ccgo_pad1   [3]byte
+	Faff           U8
+	F__ccgo_pad1   [2]byte
 	FpIENext       uintptr
 }
 
@@ -5856,17 +5859,18 @@ type Pager = Pager1
 
 // Handle type for pages.
 type PgHdr2 = struct {
-	FpPage      uintptr
-	FpData      uintptr
-	FpExtra     uintptr
-	FpCache     uintptr
-	FpDirty     uintptr
-	FpPager     uintptr
-	Fpgno       Pgno
-	Fflags      U16
-	FnRef       I16
-	FpDirtyNext uintptr
-	FpDirtyPrev uintptr
+	FpPage       uintptr
+	FpData       uintptr
+	FpExtra      uintptr
+	FpCache      uintptr
+	FpDirty      uintptr
+	FpPager      uintptr
+	Fpgno        Pgno
+	Fflags       U16
+	F__ccgo_pad1 [2]byte
+	FnRef        I64
+	FpDirtyNext  uintptr
+	FpDirtyPrev  uintptr
 }
 
 // Handle type for pages.
@@ -6087,14 +6091,14 @@ type PCache2 = struct {
 	FpDirty      uintptr
 	FpDirtyTail  uintptr
 	FpSynced     uintptr
-	FnRefSum     int32
+	FnRefSum     I64
 	FszCache     int32
 	FszSpill     int32
 	FszPage      int32
 	FszExtra     int32
 	FbPurgeable  U8
 	FeCreate     U8
-	F__ccgo_pad1 [2]byte
+	F__ccgo_pad1 [6]byte
 	FxStress     uintptr
 	FpStress     uintptr
 	FpCache      uintptr
@@ -6353,7 +6357,7 @@ type CoveringIndexCheck1 = struct {
 	F__ccgo_pad1 [2]byte
 }
 
-var sqlite3azCompileOpt = [52]uintptr{
+var sqlite3azCompileOpt = [53]uintptr{
 	ts + 7,
 	ts + 27,
 	ts + 49,
@@ -6372,40 +6376,41 @@ var sqlite3azCompileOpt = [52]uintptr{
 	ts + 365,
 	ts + 390,
 	ts + 413,
-	ts + 425,
-	ts + 440,
-	ts + 462,
-	ts + 487,
-	ts + 510,
-	ts + 532,
-	ts + 543,
-	ts + 556,
-	ts + 571,
-	ts + 587,
-	ts + 600,
-	ts + 621,
-	ts + 645,
-	ts + 668,
-	ts + 684,
-	ts + 700,
-	ts + 724,
-	ts + 751,
-	ts + 771,
-	ts + 792,
-	ts + 814,
-	ts + 844,
-	ts + 860,
-	ts + 886,
-	ts + 906,
-	ts + 932,
-	ts + 955,
-	ts + 981,
-	ts + 1003,
-	ts + 1024,
-	ts + 1035,
+	ts + 432,
+	ts + 444,
+	ts + 459,
+	ts + 481,
+	ts + 506,
+	ts + 529,
+	ts + 551,
+	ts + 562,
+	ts + 575,
+	ts + 590,
+	ts + 606,
+	ts + 619,
+	ts + 640,
+	ts + 664,
+	ts + 687,
+	ts + 703,
+	ts + 719,
+	ts + 743,
+	ts + 770,
+	ts + 790,
+	ts + 811,
+	ts + 833,
+	ts + 863,
+	ts + 879,
+	ts + 905,
+	ts + 925,
+	ts + 951,
+	ts + 974,
+	ts + 1000,
+	ts + 1022,
 	ts + 1043,
-	ts + 1057,
-	ts + 1070,
+	ts + 1054,
+	ts + 1062,
+	ts + 1076,
+	ts + 1089,
 }
 
 func Xsqlite3CompileOptions(tls *libc.TLS, pnOpt uintptr) uintptr {
@@ -6556,7 +6561,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 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))
+var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1102))
 
 // Standard typenames.  These names must match the COLTYPE_* definitions.
 // Adjust the SQLITE_N_STDTYPE value if adding or removing entries.
@@ -6578,12 +6583,12 @@ var Xsqlite3StdTypeAffinity = [6]int8{
 	int8(SQLITE_AFF_TEXT),
 }
 var Xsqlite3StdType = [6]uintptr{
-	ts + 1090,
-	ts + 1094,
-	ts + 1099,
-	ts + 1103,
-	ts + 1111,
-	ts + 1116,
+	ts + 1109,
+	ts + 1113,
+	ts + 1118,
+	ts + 1122,
+	ts + 1130,
+	ts + 1135,
 }
 
 // SQL is translated into a sequence of instructions to be
@@ -6900,7 +6905,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, 23229)
+		return Xsqlite3MisuseError(tls, 23233)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -7293,7 +7298,7 @@ __6:
 __4:
 	;
 	zDate++
-	if !(getDigits(tls, zDate, ts+1121, libc.VaList(bp, bp+16, bp+20)) != 2) {
+	if !(getDigits(tls, zDate, ts+1140, libc.VaList(bp, bp+16, bp+20)) != 2) {
 		goto __9
 	}
 	return 1
@@ -7319,13 +7324,13 @@ func parseHhMmSs(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	defer tls.Free(36)
 
 	var ms float64 = 0.0
-	if getDigits(tls, zDate, ts+1129, libc.VaList(bp, bp+24, bp+28)) != 2 {
+	if getDigits(tls, zDate, ts+1148, libc.VaList(bp, bp+24, bp+28)) != 2 {
 		return 1
 	}
 	zDate += uintptr(5)
 	if int32(*(*int8)(unsafe.Pointer(zDate))) == ':' {
 		zDate++
-		if getDigits(tls, zDate, ts+1137, libc.VaList(bp+16, bp+32)) != 1 {
+		if getDigits(tls, zDate, ts+1156, libc.VaList(bp+16, bp+32)) != 1 {
 			return 1
 		}
 		zDate += uintptr(2)
@@ -7423,7 +7428,7 @@ func parseYyyyMmDd(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	} else {
 		neg = 0
 	}
-	if getDigits(tls, zDate, ts+1141, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
+	if getDigits(tls, zDate, ts+1160, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
 		return 1
 	}
 	zDate += uintptr(10)
@@ -7480,7 +7485,7 @@ func parseDateOrTime(tls *libc.TLS, context uintptr, zDate uintptr, p uintptr) i
 		return 0
 	} else if parseHhMmSs(tls, zDate, p) == 0 {
 		return 0
-	} else if Xsqlite3StrICmp(tls, zDate, ts+1153) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
+	} else if Xsqlite3StrICmp(tls, zDate, ts+1172) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
 		return setDateTimeToCurrent(tls, context, p)
 	} else if Xsqlite3AtoF(tls, zDate, bp, Xsqlite3Strlen30(tls, zDate), uint8(SQLITE_UTF8)) > 0 {
 		setRawDateNumber(tls, p, *(*float64)(unsafe.Pointer(bp)))
@@ -7613,7 +7618,7 @@ func toLocaltime(tls *libc.TLS, p uintptr, pCtx uintptr) int32 {
 		*(*Time_t)(unsafe.Pointer(bp + 104)) = (*DateTime)(unsafe.Pointer(p)).FiJD/int64(1000) - int64(21086676)*int64(10000)
 	}
 	if osLocaltime(tls, bp+104, bp) != 0 {
-		Xsqlite3_result_error(tls, pCtx, ts+1157, -1)
+		Xsqlite3_result_error(tls, pCtx, ts+1176, -1)
 		return SQLITE_ERROR
 	}
 	(*DateTime)(unsafe.Pointer(p)).FY = (*tm)(unsafe.Pointer(bp)).Ftm_year + 1900 - iYearDiff
@@ -7637,12 +7642,12 @@ var aXformType = [6]struct {
 	FrLimit float32
 	FrXform float32
 }{
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1180)), FrLimit: 4.6427e+14, FrXform: 1.0},
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1187)), FrLimit: 7.7379e+12, FrXform: 60.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1194)), FrLimit: 1.2897e+11, FrXform: 3600.0},
-	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1201)), FrLimit: 5373485.0, FrXform: 86400.0},
-	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1208)), FrLimit: 176546.0, FrXform: 2592000.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1215)), FrLimit: 14713.0, FrXform: 31536000.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1199)), FrLimit: 4.6427e+14, FrXform: 1.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1206)), FrLimit: 7.7379e+12, FrXform: 60.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1213)), FrLimit: 1.2897e+11, FrXform: 3600.0},
+	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1220)), FrLimit: 5373485.0, FrXform: 86400.0},
+	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1227)), FrLimit: 176546.0, FrXform: 2592000.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1234)), FrLimit: 14713.0, FrXform: 31536000.0},
 }
 
 func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, idx int32) int32 {
@@ -7654,7 +7659,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 	switch int32(Xsqlite3UpperToLower[U8(*(*int8)(unsafe.Pointer(z)))]) {
 	case 'a':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1222) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1241) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -7676,7 +7681,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'j':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1227) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1246) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -7690,7 +7695,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'l':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1237) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1256) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				rc = toLocaltime(tls, p, pCtx)
 			}
 			break
@@ -7698,7 +7703,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'u':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1247) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1266) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -7710,7 +7715,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 					rc = 0
 				}
-			} else if Xsqlite3_stricmp(tls, z, ts+1257) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1276) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				if int32((*DateTime)(unsafe.Pointer(p)).FtzSet) == 0 {
 					var iOrigJD I64
 					var iGuess I64
@@ -7744,7 +7749,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'w':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1261, 8) == 0 &&
+			if Xsqlite3_strnicmp(tls, z, ts+1280, 8) == 0 &&
 				Xsqlite3AtoF(tls, z+8, bp+48, Xsqlite3Strlen30(tls, z+8), uint8(SQLITE_UTF8)) > 0 &&
 				*(*float64)(unsafe.Pointer(bp + 48)) >= 0.0 && *(*float64)(unsafe.Pointer(bp + 48)) < 7.0 && float64(libc.AssignInt32(&n, int32(*(*float64)(unsafe.Pointer(bp + 48))))) == *(*float64)(unsafe.Pointer(bp + 48)) {
 				var Z Sqlite3_int64
@@ -7765,7 +7770,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 's':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1270, 9) != 0 {
+			if Xsqlite3_strnicmp(tls, z, ts+1289, 9) != 0 {
 				break
 			}
 			if !(int32((*DateTime)(unsafe.Pointer(p)).FvalidJD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidYMD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidHMS) != 0) {
@@ -7779,14 +7784,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 			(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidTZ = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidJD = int8(0)
-			if Xsqlite3_stricmp(tls, z, ts+1280) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1299) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1286) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1305) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FM = 1
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1291) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1310) == 0 {
 				rc = 0
 			}
 			break
@@ -8112,7 +8117,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		switch int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) {
 		case 'd':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1295, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1314, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
 				break
 
 			}
@@ -8122,13 +8127,13 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if s > 59.999 {
 					s = 59.999
 				}
-				Xsqlite3_str_appendf(tls, bp+136, ts+1300, libc.VaList(bp+8, s))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1319, libc.VaList(bp+8, s))
 				break
 
 			}
 		case 'H':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1295, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1314, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
 				break
 
 			}
@@ -8146,41 +8151,41 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) == 'W' {
 					var wd int32
 					wd = int32(((*DateTime)(unsafe.Pointer(bp+88)).FiJD + int64(43200000)) / int64(86400000) % int64(7))
-					Xsqlite3_str_appendf(tls, bp+136, ts+1295, libc.VaList(bp+24, (nDay+7-wd)/7))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1314, libc.VaList(bp+24, (nDay+7-wd)/7))
 				} else {
-					Xsqlite3_str_appendf(tls, bp+136, ts+1307, libc.VaList(bp+32, nDay+1))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1326, libc.VaList(bp+32, nDay+1))
 				}
 				break
 
 			}
 		case 'J':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1312, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1331, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
 				break
 
 			}
 		case 'm':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1295, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1314, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
 				break
 
 			}
 		case 'M':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1295, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1314, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
 				break
 
 			}
 		case 's':
 			{
 				var iS I64 = (*DateTime)(unsafe.Pointer(bp+88)).FiJD/int64(1000) - int64(21086676)*int64(10000)
-				Xsqlite3_str_appendf(tls, bp+136, ts+1318, libc.VaList(bp+64, iS))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1337, libc.VaList(bp+64, iS))
 				break
 
 			}
 		case 'S':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1295, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1314, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
 				break
 
 			}
@@ -8193,7 +8198,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			}
 		case 'Y':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1323, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1342, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
 				break
 
 			}
@@ -8243,15 +8248,15 @@ func Xsqlite3RegisterDateTimeFunctions(tls *libc.TLS) {
 }
 
 var aDateTimeFuncs = [9]FuncDef{
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1227},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1247},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1328},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1333},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1338},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1246},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1266},
 	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1347},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1356},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1369},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1387}}
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1352},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1357},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1366},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1375},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1388},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1406}}
 
 // The following routines are convenience wrappers around methods
 // of the sqlite3_file object.  This is mostly just syntactic sugar. All
@@ -8663,7 +8668,7 @@ func sqlite3MemMalloc(tls *libc.TLS, nByte int32) uintptr {
 		*(*Sqlite3_int64)(unsafe.Pointer(p)) = Sqlite3_int64(nByte)
 		p += 8
 	} else {
-		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1400, libc.VaList(bp, nByte))
+		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1419, libc.VaList(bp, nByte))
 	}
 	return p
 }
@@ -8696,7 +8701,7 @@ func sqlite3MemRealloc(tls *libc.TLS, pPrior uintptr, nByte int32) uintptr {
 		p += 8
 	} else {
 		Xsqlite3_log(tls, SQLITE_NOMEM,
-			ts+1438,
+			ts+1457,
 			libc.VaList(bp, sqlite3MemSize(tls, pPrior), nByte))
 	}
 	return p
@@ -9572,7 +9577,7 @@ func Xsqlite3OomFault(tls *libc.TLS, db uintptr) uintptr {
 		(*Sqlite3)(unsafe.Pointer(db)).Flookaside.Fsz = U16(0)
 		if (*Sqlite3)(unsafe.Pointer(db)).FpParse != 0 {
 			var pParse uintptr
-			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1474, 0)
+			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1493, 0)
 			(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 			for pParse = (*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).FpOuterParse; pParse != 0; pParse = (*Parse)(unsafe.Pointer(pParse)).FpOuterParse {
 				(*Parse)(unsafe.Pointer(pParse)).FnErr++
@@ -9645,8 +9650,8 @@ type et_info = struct {
 // by an instance of the following structure
 type Et_info = et_info
 
-var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1488))
-var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1521))
+var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1507))
+var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1540))
 var fmtinfo = [23]Et_info{
 	{Ffmttype: int8('d'), Fbase: EtByte(10), Fflags: EtByte(1), Ftype: EtByte(EtDECIMAL)},
 	{Ffmttype: int8('s'), Fflags: EtByte(4), Ftype: EtByte(EtSTRING)},
@@ -9860,7 +9865,7 @@ __6:
 	if !(libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(libc.PreIncUintptr(&fmt, 1))))) == 0) {
 		goto __11
 	}
-	Xsqlite3_str_append(tls, pAccum, ts+1528, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1547, 1)
 	goto __5
 __11:
 	;
@@ -10421,7 +10426,7 @@ __125:
 	if !(Xsqlite3IsNaN(tls, *(*float64)(unsafe.Pointer(bp + 104))) != 0) {
 		goto __127
 	}
-	bufpt = ts + 1530
+	bufpt = ts + 1549
 	length = 3
 	goto __58
 __127:
@@ -10481,7 +10486,7 @@ __138:
 	}
 	bufpt = bp + 16
 	*(*int8)(unsafe.Pointer(bp + 16)) = prefix
-	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1534, uint64(4))
+	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1553, uint64(4))
 	length = 3 + libc.Bool32(int32(prefix) != 0)
 	goto __58
 __139:
@@ -10847,7 +10852,7 @@ __200:
 	if !(bufpt == uintptr(0)) {
 		goto __201
 	}
-	bufpt = ts + 1538
+	bufpt = ts + 1557
 	goto __202
 __201:
 	if !(int32(xtype) == EtDYNSTRING) {
@@ -10971,9 +10976,9 @@ __222:
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
-			return ts + 1539
+			return ts + 1558
 		}
-		return ts + 1544
+		return ts + 1563
 	}()
 __223:
 	;
@@ -11121,7 +11126,7 @@ __246:
 		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
-	Xsqlite3_str_append(tls, pAccum, ts+1551, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1570, 1)
 __250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
@@ -11138,10 +11143,10 @@ __251:
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
 		goto __253
 	}
-	Xsqlite3_str_appendf(tls, pAccum, ts+1553, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1572, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 	goto __254
 __253:
-	Xsqlite3_str_appendf(tls, pAccum, ts+1563, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1582, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
 __254:
 	;
 __252:
@@ -11196,7 +11201,7 @@ __4:
 __5:
 }
 
-var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1577))
+var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1596))
 
 // The z string points to the first character of a token that is
 // associated with an error.  If db does not already have an error
@@ -11361,7 +11366,7 @@ func Xsqlite3ResultStrAccum(tls *libc.TLS, pCtx uintptr, p uintptr) {
 	} else if int32((*StrAccum)(unsafe.Pointer(p)).FprintfFlags)&SQLITE_PRINTF_MALLOCED != 0 {
 		Xsqlite3_result_text(tls, pCtx, (*StrAccum)(unsafe.Pointer(p)).FzText, int32((*StrAccum)(unsafe.Pointer(p)).FnChar), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 	} else {
-		Xsqlite3_result_text(tls, pCtx, ts+1538, 0, uintptr(0))
+		Xsqlite3_result_text(tls, pCtx, ts+1557, 0, uintptr(0))
 		Xsqlite3_str_reset(tls, p)
 	}
 }
@@ -13082,7 +13087,7 @@ func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
 	var c int32 = 0
 	var i int32
 
-	var pow63 uintptr = ts + 1586
+	var pow63 uintptr = ts + 1605
 	for i = 0; c == 0 && i < 18; i++ {
 		c = (int32(*(*int8)(unsafe.Pointer(zNum + uintptr(i*incr)))) - int32(*(*int8)(unsafe.Pointer(pow63 + uintptr(i))))) * 10
 	}
@@ -13628,7 +13633,7 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 	defer tls.Free(8)
 
 	Xsqlite3_log(tls, SQLITE_MISUSE,
-		ts+1605,
+		ts+1624,
 		libc.VaList(bp, zType))
 }
 
@@ -13647,13 +13652,13 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 func Xsqlite3SafetyCheckOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	if db == uintptr(0) {
-		logBadConnection(tls, ts+1539)
+		logBadConnection(tls, ts+1558)
 		return 0
 	}
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_OPEN {
 		if Xsqlite3SafetyCheckSickOrOk(tls, db) != 0 {
-			logBadConnection(tls, ts+1650)
+			logBadConnection(tls, ts+1669)
 		}
 		return 0
 	} else {
@@ -13666,7 +13671,7 @@ func Xsqlite3SafetyCheckSickOrOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_SICK && int32(eOpenState) != SQLITE_STATE_OPEN && int32(eOpenState) != SQLITE_STATE_BUSY {
-		logBadConnection(tls, ts+1659)
+		logBadConnection(tls, ts+1678)
 		return 0
 	} else {
 		return 1
@@ -14192,193 +14197,193 @@ func Xsqlite3OpcodeName(tls *libc.TLS, i int32) uintptr {
 }
 
 var azName = [187]uintptr{
-	ts + 1667,
-	ts + 1677,
-	ts + 1688,
-	ts + 1700,
-	ts + 1711,
-	ts + 1723,
+	ts + 1686,
+	ts + 1696,
+	ts + 1707,
+	ts + 1719,
 	ts + 1730,
-	ts + 1738,
-	ts + 1746,
-	ts + 1751,
-	ts + 1756,
-	ts + 1762,
-	ts + 1776,
-	ts + 1782,
-	ts + 1792,
-	ts + 1797,
-	ts + 1802,
-	ts + 1805,
+	ts + 1742,
+	ts + 1749,
+	ts + 1757,
+	ts + 1765,
+	ts + 1770,
+	ts + 1775,
+	ts + 1781,
+	ts + 1795,
+	ts + 1801,
 	ts + 1811,
-	ts + 1818,
-	ts + 1822,
-	ts + 1832,
-	ts + 1839,
-	ts + 1846,
-	ts + 1853,
-	ts + 1860,
-	ts + 1870,
+	ts + 1816,
+	ts + 1821,
+	ts + 1824,
+	ts + 1830,
+	ts + 1837,
+	ts + 1841,
+	ts + 1851,
+	ts + 1858,
+	ts + 1865,
+	ts + 1872,
 	ts + 1879,
-	ts + 1890,
-	ts + 1899,
-	ts + 1905,
-	ts + 1915,
-	ts + 1925,
-	ts + 1930,
-	ts + 1940,
-	ts + 1951,
-	ts + 1956,
-	ts + 1963,
-	ts + 1974,
-	ts + 1979,
-	ts + 1984,
-	ts + 1990,
-	ts + 1996,
-	ts + 2002,
-	ts + 2005,
+	ts + 1889,
+	ts + 1898,
+	ts + 1909,
+	ts + 1918,
+	ts + 1924,
+	ts + 1934,
+	ts + 1944,
+	ts + 1949,
+	ts + 1959,
+	ts + 1970,
+	ts + 1975,
+	ts + 1982,
+	ts + 1993,
+	ts + 1998,
+	ts + 2003,
 	ts + 2009,
 	ts + 2015,
-	ts + 2026,
-	ts + 2037,
+	ts + 2021,
+	ts + 2024,
+	ts + 2028,
+	ts + 2034,
 	ts + 2045,
-	ts + 2054,
-	ts + 2061,
-	ts + 2069,
-	ts + 2072,
-	ts + 2075,
-	ts + 2078,
-	ts + 2081,
-	ts + 2084,
-	ts + 2087,
+	ts + 2056,
+	ts + 2064,
+	ts + 2073,
+	ts + 2080,
+	ts + 2088,
+	ts + 2091,
 	ts + 2094,
+	ts + 2097,
 	ts + 2100,
-	ts + 2110,
-	ts + 2123,
-	ts + 2134,
-	ts + 2140,
-	ts + 2147,
-	ts + 2156,
-	ts + 2165,
-	ts + 2172,
-	ts + 2185,
-	ts + 2196,
-	ts + 2201,
-	ts + 2209,
+	ts + 2103,
+	ts + 2106,
+	ts + 2113,
+	ts + 2119,
+	ts + 2129,
+	ts + 2142,
+	ts + 2153,
+	ts + 2159,
+	ts + 2166,
+	ts + 2175,
+	ts + 2184,
+	ts + 2191,
+	ts + 2204,
 	ts + 2215,
-	ts + 2222,
+	ts + 2220,
+	ts + 2228,
 	ts + 2234,
-	ts + 2239,
-	ts + 2248,
+	ts + 2241,
 	ts + 2253,
-	ts + 2262,
+	ts + 2258,
 	ts + 2267,
 	ts + 2272,
-	ts + 2278,
+	ts + 2281,
 	ts + 2286,
-	ts + 2294,
-	ts + 2304,
-	ts + 2312,
-	ts + 2319,
-	ts + 2332,
-	ts + 2337,
-	ts + 2349,
-	ts + 2357,
-	ts + 2364,
-	ts + 2375,
-	ts + 2382,
-	ts + 2389,
-	ts + 2399,
+	ts + 2291,
+	ts + 2297,
+	ts + 2305,
+	ts + 2313,
+	ts + 2323,
+	ts + 2331,
+	ts + 2338,
+	ts + 2351,
+	ts + 2356,
+	ts + 2368,
+	ts + 2376,
+	ts + 2383,
+	ts + 2394,
+	ts + 2401,
 	ts + 2408,
-	ts + 2419,
-	ts + 2425,
-	ts + 2436,
-	ts + 2446,
-	ts + 2456,
-	ts + 2463,
-	ts + 2469,
-	ts + 2479,
-	ts + 2490,
-	ts + 2494,
-	ts + 2503,
-	ts + 2512,
-	ts + 2519,
-	ts + 2529,
-	ts + 2536,
-	ts + 2545,
+	ts + 2418,
+	ts + 2427,
+	ts + 2438,
+	ts + 2444,
+	ts + 2455,
+	ts + 2465,
+	ts + 2475,
+	ts + 2482,
+	ts + 2488,
+	ts + 2498,
+	ts + 2509,
+	ts + 2513,
+	ts + 2522,
+	ts + 2531,
+	ts + 2538,
+	ts + 2548,
 	ts + 2555,
-	ts + 2562,
-	ts + 2570,
-	ts + 2584,
-	ts + 2592,
-	ts + 2606,
-	ts + 2617,
-	ts + 2630,
-	ts + 2641,
-	ts + 2647,
-	ts + 2659,
-	ts + 2668,
-	ts + 2676,
-	ts + 2685,
-	ts + 2694,
-	ts + 2701,
-	ts + 2709,
-	ts + 2716,
-	ts + 2727,
-	ts + 2741,
-	ts + 2752,
+	ts + 2564,
+	ts + 2574,
+	ts + 2581,
+	ts + 2589,
+	ts + 2603,
+	ts + 2611,
+	ts + 2625,
+	ts + 2636,
+	ts + 2649,
+	ts + 2660,
+	ts + 2666,
+	ts + 2678,
+	ts + 2687,
+	ts + 2695,
+	ts + 2704,
+	ts + 2713,
+	ts + 2720,
+	ts + 2728,
+	ts + 2735,
+	ts + 2746,
 	ts + 2760,
-	ts + 2766,
-	ts + 2774,
-	ts + 2782,
-	ts + 2792,
-	ts + 2805,
-	ts + 2815,
-	ts + 2828,
-	ts + 2837,
-	ts + 2848,
+	ts + 2771,
+	ts + 2779,
+	ts + 2785,
+	ts + 2793,
+	ts + 2801,
+	ts + 2811,
+	ts + 2824,
+	ts + 2834,
+	ts + 2847,
 	ts + 2856,
-	ts + 2862,
-	ts + 2874,
-	ts + 2886,
-	ts + 2894,
-	ts + 2906,
-	ts + 2919,
-	ts + 2929,
-	ts + 2939,
-	ts + 2944,
-	ts + 2956,
-	ts + 2968,
-	ts + 2978,
-	ts + 2984,
-	ts + 2994,
-	ts + 3001,
+	ts + 2867,
+	ts + 2875,
+	ts + 2881,
+	ts + 2893,
+	ts + 2905,
+	ts + 2913,
+	ts + 2925,
+	ts + 2938,
+	ts + 2948,
+	ts + 2958,
+	ts + 2963,
+	ts + 2975,
+	ts + 2987,
+	ts + 2997,
+	ts + 3003,
 	ts + 3013,
-	ts + 3024,
+	ts + 3020,
 	ts + 3032,
-	ts + 3041,
-	ts + 3050,
-	ts + 3059,
-	ts + 3066,
-	ts + 3077,
-	ts + 3090,
-	ts + 3100,
-	ts + 3107,
-	ts + 3115,
-	ts + 3124,
-	ts + 3130,
-	ts + 3138,
-	ts + 3146,
-	ts + 3154,
-	ts + 3164,
+	ts + 3043,
+	ts + 3051,
+	ts + 3060,
+	ts + 3069,
+	ts + 3078,
+	ts + 3085,
+	ts + 3096,
+	ts + 3109,
+	ts + 3119,
+	ts + 3126,
+	ts + 3134,
+	ts + 3143,
+	ts + 3149,
+	ts + 3157,
+	ts + 3165,
 	ts + 3173,
-	ts + 3184,
-	ts + 3194,
-	ts + 3200,
-	ts + 3211,
-	ts + 3222,
-	ts + 3227,
-	ts + 3235,
+	ts + 3183,
+	ts + 3192,
+	ts + 3203,
+	ts + 3213,
+	ts + 3219,
+	ts + 3230,
+	ts + 3241,
+	ts + 3246,
+	ts + 3254,
 }
 
 type timeval = struct {
@@ -14586,35 +14591,35 @@ type unix_syscall = struct {
 }
 
 var aSyscall = [29]unix_syscall{
-	{FzName: ts + 3245, FpCurrent: 0},
-	{FzName: ts + 3250, FpCurrent: 0},
-	{FzName: ts + 3256, FpCurrent: 0},
-	{FzName: ts + 3263, FpCurrent: 0},
-	{FzName: ts + 3270, FpCurrent: 0},
+	{FzName: ts + 3264, FpCurrent: 0},
+	{FzName: ts + 3269, FpCurrent: 0},
 	{FzName: ts + 3275, FpCurrent: 0},
-	{FzName: ts + 3281, FpCurrent: 0},
-	{FzName: ts + 3291, FpCurrent: 0},
-	{FzName: ts + 3297, FpCurrent: 0},
-	{FzName: ts + 3302},
-	{FzName: ts + 3308},
+	{FzName: ts + 3282, FpCurrent: 0},
+	{FzName: ts + 3289, FpCurrent: 0},
+	{FzName: ts + 3294, FpCurrent: 0},
+	{FzName: ts + 3300, FpCurrent: 0},
+	{FzName: ts + 3310, FpCurrent: 0},
 	{FzName: ts + 3316, FpCurrent: 0},
-	{FzName: ts + 3322},
-	{FzName: ts + 3329},
-	{FzName: ts + 3338, FpCurrent: 0},
-	{FzName: ts + 3345},
-	{FzName: ts + 3355, FpCurrent: 0},
-	{FzName: ts + 3362, FpCurrent: 0},
-	{FzName: ts + 3376, FpCurrent: 0},
-	{FzName: ts + 3382, FpCurrent: 0},
-	{FzName: ts + 3388, FpCurrent: 0},
+	{FzName: ts + 3321},
+	{FzName: ts + 3327},
+	{FzName: ts + 3335, FpCurrent: 0},
+	{FzName: ts + 3341},
+	{FzName: ts + 3348},
+	{FzName: ts + 3357, FpCurrent: 0},
+	{FzName: ts + 3364},
+	{FzName: ts + 3374, FpCurrent: 0},
+	{FzName: ts + 3381, FpCurrent: 0},
 	{FzName: ts + 3395, FpCurrent: 0},
-	{FzName: ts + 3403, FpCurrent: 0},
-	{FzName: ts + 3408, FpCurrent: 0},
-	{FzName: ts + 3415},
+	{FzName: ts + 3401, FpCurrent: 0},
+	{FzName: ts + 3407, FpCurrent: 0},
+	{FzName: ts + 3414, FpCurrent: 0},
 	{FzName: ts + 3422, FpCurrent: 0},
-	{FzName: ts + 3434, FpCurrent: 0},
-	{FzName: ts + 3443, FpCurrent: 0},
-	{FzName: ts + 3449},
+	{FzName: ts + 3427, FpCurrent: 0},
+	{FzName: ts + 3434},
+	{FzName: ts + 3441, FpCurrent: 0},
+	{FzName: ts + 3453, FpCurrent: 0},
+	{FzName: ts + 3462, FpCurrent: 0},
+	{FzName: ts + 3468},
 }
 
 func robustFchown(tls *libc.TLS, fd int32, uid Uid_t, gid Gid_t) int32 {
@@ -14712,9 +14717,9 @@ func robust_open(tls *libc.TLS, z uintptr, f int32, m Mode_t) int32 {
 		}
 		(*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, fd)
 		Xsqlite3_log(tls, SQLITE_WARNING,
-			ts+3455, libc.VaList(bp, z, fd))
+			ts+3474, libc.VaList(bp, z, fd))
 		fd = -1
-		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3498, O_RDONLY, int32(m)) < 0 {
+		if (*(*func(*libc.TLS, uintptr, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls, ts+3517, O_RDONLY, int32(m)) < 0 {
 			break
 		}
 	}
@@ -14794,13 +14799,13 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 	var zErr uintptr
 	var iErrno int32 = *(*int32)(unsafe.Pointer(libc.X__errno(tls)))
 
-	zErr = ts + 1538
+	zErr = ts + 1557
 
 	if zPath == uintptr(0) {
-		zPath = ts + 1538
+		zPath = ts + 1557
 	}
 	Xsqlite3_log(tls, errcode,
-		ts+3508,
+		ts+3527,
 		libc.VaList(bp, iLine, iErrno, zFunc, zPath, zErr))
 
 	return errcode
@@ -14808,7 +14813,7 @@ func unixLogErrorAtLine(tls *libc.TLS, errcode int32, zFunc uintptr, zPath uintp
 
 func robust_close(tls *libc.TLS, pFile uintptr, h int32, lineno int32) {
 	if (*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 1*24 + 8)))(tls, h) != 0 {
-		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3250,
+		unixLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, ts+3269,
 			func() uintptr {
 				if pFile != 0 {
 					return (*UnixFile)(unsafe.Pointer(pFile)).FzPath
@@ -14829,7 +14834,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, 38271)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38275)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -14931,19 +14936,19 @@ func verifyDbFile(tls *libc.TLS, pFile uintptr) {
 
 	rc = (*(*func(*libc.TLS, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 5*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, bp+32)
 	if rc != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3539, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3558, libc.VaList(bp, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink == Nlink_t(0) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3563, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3582, libc.VaList(bp+8, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if (*stat)(unsafe.Pointer(bp+32)).Fst_nlink > Nlink_t(1) {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3592, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3611, libc.VaList(bp+16, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 	if fileHasMoved(tls, pFile) != 0 {
-		Xsqlite3_log(tls, SQLITE_WARNING, ts+3619, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
+		Xsqlite3_log(tls, SQLITE_WARNING, ts+3638, libc.VaList(bp+24, (*UnixFile)(unsafe.Pointer(pFile)).FzPath))
 		return
 	}
 }
@@ -15305,7 +15310,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, 39055)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39059)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -15565,7 +15570,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	var ii int32
 	var fd int32 = -1
 
-	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3647, libc.VaList(bp, zFilename))
+	Xsqlite3_snprintf(tls, MAX_PATHNAME, bp+8, ts+3666, libc.VaList(bp, zFilename))
 	for ii = int32(libc.Xstrlen(tls, bp+8)); ii > 0 && int32(*(*int8)(unsafe.Pointer(bp + 8 + uintptr(ii)))) != '/'; ii-- {
 	}
 	if ii > 0 {
@@ -15583,7 +15588,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3362, bp+8, 40676)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40680), ts+3381, bp+8, 40680)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -15600,14 +15605,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, 40717)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3669, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40721)
 	}
 
 	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)), 40731)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40735)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -15627,7 +15632,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, 40762)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3300, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40766)
 	} else {
 		return SQLITE_OK
 	}
@@ -15678,7 +15683,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 				if iWrite >= nSize {
 					iWrite = nSize - int64(1)
 				}
-				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1538, 1)
+				nWrite = seekAndWrite(tls, pFile, iWrite, ts+1557, 1)
 				if nWrite != 1 {
 					return SQLITE_IOERR | int32(3)<<8
 				}
@@ -15746,7 +15751,7 @@ func unixFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 		}
 	case SQLITE_FCNTL_VFSNAME:
 		{
-			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
+			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
 			return SQLITE_OK
 
 		}
@@ -15882,7 +15887,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, 41442)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41446)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -15910,7 +15915,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, 41499)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3300, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41503)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -15973,7 +15978,7 @@ __4:
 	;
 	libc.Xmemset(tls, pShmNode, 0, uint64(unsafe.Sizeof(unixShmNode{}))+uint64(nShmFilename))
 	zShm = libc.AssignPtrUintptr(pShmNode+16, pShmNode+1*96)
-	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3661, libc.VaList(bp, zBasePath))
+	Xsqlite3_snprintf(tls, nShmFilename, zShm, ts+3680, libc.VaList(bp, zBasePath))
 
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = -1
 	(*UnixInodeInfo)(unsafe.Pointer((*UnixFile)(unsafe.Pointer(pDbFd)).FpInode)).FpShmNode = pShmNode
@@ -15994,7 +15999,7 @@ __5:
 	if !(int32((*UnixInodeInfo)(unsafe.Pointer(pInode)).FbProcessLock) == 0) {
 		goto __7
 	}
-	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3668, 0)) {
+	if !(0 == Xsqlite3_uri_boolean(tls, (*UnixFile)(unsafe.Pointer(pDbFd)).FzPath, ts+3687, 0)) {
 		goto __8
 	}
 	(*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm = robust_open(tls, zShm, O_RDWR|O_CREAT|O_NOFOLLOW,
@@ -16009,7 +16014,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3245, zShm, 41624)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41628), ts+3264, zShm, 41628)
 	goto shm_open_err
 __10:
 	;
@@ -16135,11 +16140,11 @@ __11:
 		goto __13
 	}
 	*(*int32)(unsafe.Pointer(bp + 128)) = 0
-	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1538, 1, bp+128) != 1) {
+	if !(seekAndWriteFd(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(iPg*pgsz+pgsz-1), ts+1557, 1, bp+128) != 1) {
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3316, zFile, 41768)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3335, zFile, 41772)
 	goto shmpage_out
 __14:
 	;
@@ -16185,7 +16190,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3403, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3422, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41799)
 	goto shmpage_out
 __20:
 	;
@@ -16438,10 +16443,10 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		}
 		return uintptr(0)
 	}(),
-		ts+3681, SQLITE_POWERSAFE_OVERWRITE) != 0 {
+		ts+3700, SQLITE_POWERSAFE_OVERWRITE) != 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_PSOW)
 	}
-	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3686) == 0 {
+	if libc.Xstrcmp(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FzName, ts+3705) == 0 {
 		*(*uint16)(unsafe.Pointer(pNew + 30)) |= uint16(UNIXFILE_EXCL)
 	}
 
@@ -16457,7 +16462,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, 42672)
+			robust_close(tls, pNew, h, 42676)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -16470,7 +16475,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		if zLockFile == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
-			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3696, libc.VaList(bp, zFilename))
+			Xsqlite3_snprintf(tls, nFilename, zLockFile, ts+3715, libc.VaList(bp, zFilename))
 		}
 		(*UnixFile)(unsafe.Pointer(pNew)).FlockingContext = zLockFile
 	}
@@ -16478,7 +16483,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, 42757)
+			robust_close(tls, pNew, h, 42761)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -16491,15 +16496,15 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 var azTempDirs = [6]uintptr{
 	uintptr(0),
 	uintptr(0),
-	ts + 3704,
-	ts + 3713,
-	ts + 3722,
-	ts + 1551,
+	ts + 3723,
+	ts + 3732,
+	ts + 3741,
+	ts + 1570,
 }
 
 func unixTempFileInit(tls *libc.TLS) {
-	azTempDirs[0] = libc.Xgetenv(tls, ts+3727)
-	azTempDirs[1] = libc.Xgetenv(tls, ts+3741)
+	azTempDirs[0] = libc.Xgetenv(tls, ts+3746)
+	azTempDirs[1] = libc.Xgetenv(tls, ts+3760)
 }
 
 func unixTempFileDir(tls *libc.TLS) uintptr {
@@ -16544,7 +16549,7 @@ func unixGetTempname(tls *libc.TLS, nBuf int32, zBuf uintptr) int32 {
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U64(0))), bp+24)
 
 			*(*int8)(unsafe.Pointer(zBuf + uintptr(nBuf-2))) = int8(0)
-			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3748,
+			Xsqlite3_snprintf(tls, nBuf, zBuf, ts+3767,
 				libc.VaList(bp, zDir, *(*U64)(unsafe.Pointer(bp + 24)), 0))
 			if int32(*(*int8)(unsafe.Pointer(zBuf + uintptr(nBuf-2)))) != 0 || libc.PostIncInt32(&iLimit, 1) > 10 {
 				rc = SQLITE_ERROR
@@ -16629,7 +16634,7 @@ func findCreateFileMode(tls *libc.TLS, zPath uintptr, flags int32, pMode uintptr
 	} else if flags&SQLITE_OPEN_DELETEONCLOSE != 0 {
 		*(*Mode_t)(unsafe.Pointer(pMode)) = Mode_t(0600)
 	} else if flags&SQLITE_OPEN_URI != 0 {
-		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3765)
+		var z uintptr = Xsqlite3_uri_parameter(tls, zPath, ts+3784)
 		if z != 0 {
 			rc = getFileMode(tls, z, pMode, pUid, pGid)
 		}
@@ -16794,7 +16799,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3245, zName, 43198)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43202), ts+3264, zName, 43202)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -16885,7 +16890,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, 43337)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3374, zPath, 43341)
 		}
 		return rc
 	}
@@ -16893,9 +16898,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, 43347)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3791, zPath, 43351)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43353)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -16959,18 +16964,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, 43443), ts+3443, zIn, 43443)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43447), ts+3462, zIn, 43447)
 			}
 		} 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, 43449)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43453)
 				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, 43454), ts+3434, zIn, 43454)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43458), ts+3453, zIn, 43458)
 				return
 			}
 			*(*int8)(unsafe.Pointer(bp + 128 + uintptr(got))) = int8(0)
@@ -17010,14 +17015,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, 43512), ts+3263, zPath, 43512)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43516), ts+3282, zPath, 43516)
 		}
 		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, 43518)
+		return Xsqlite3CantopenError(tls, 43522)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+1032)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -17049,7 +17054,7 @@ func unixDlError(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBufOut uintptr) {
 	unixEnterMutex(tls)
 	zErr = libc.Xdlerror(tls)
 	if zErr != 0 {
-		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3647, libc.VaList(bp, zErr))
+		Xsqlite3_snprintf(tls, nBuf, zBufOut, ts+3666, libc.VaList(bp, zErr))
 	}
 	unixLeaveMutex(tls)
 }
@@ -17081,7 +17086,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 	{
 		var fd int32
 		var got int32
-		fd = robust_open(tls, ts+3778, O_RDONLY, uint32(0))
+		fd = robust_open(tls, ts+3797, O_RDONLY, uint32(0))
 		if fd < 0 {
 			libc.Xtime(tls, bp)
 			libc.Xmemcpy(tls, zBuf, bp, uint64(unsafe.Sizeof(Time_t(0))))
@@ -17092,7 +17097,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, 43619)
+			robust_close(tls, uintptr(0), fd, 43623)
 		}
 
 	}
@@ -17169,10 +17174,10 @@ func Xsqlite3_os_init(tls *libc.TLS) int32 {
 }
 
 var aVfs = [4]Sqlite3_vfs{
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3791, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3796, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3806, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
-	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3686, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3810, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3815, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3825, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
+	{FiVersion: 3, FszOsFile: int32(unsafe.Sizeof(UnixFile{})), FmxPathname: MAX_PATHNAME, FzName: ts + 3705, FpAppData: 0, FxOpen: 0, FxDelete: 0, FxAccess: 0, FxFullPathname: 0, FxDlOpen: 0, FxDlError: 0, FxDlSym: 0, FxDlClose: 0, FxRandomness: 0, FxSleep: 0, FxCurrentTime: 0, FxGetLastError: 0, FxCurrentTimeInt64: 0, FxSetSystemCall: 0, FxGetSystemCall: 0, FxNextSystemCall: 0},
 }
 
 // Shutdown the operating system interface.
@@ -17227,7 +17232,7 @@ var memdb_g MemFS
 var memdb_vfs = Sqlite3_vfs{
 	FiVersion:          2,
 	FmxPathname:        1024,
-	FzName:             ts + 3819,
+	FzName:             ts + 3838,
 	FxOpen:             0,
 	FxAccess:           0,
 	FxFullPathname:     0,
@@ -17483,7 +17488,7 @@ func memdbFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int3
 	var rc int32 = SQLITE_NOTFOUND
 	memdbEnter(tls, p)
 	if op == SQLITE_FCNTL_VFSNAME {
-		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3825, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
+		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+3844, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
 		rc = SQLITE_OK
 	}
 	if op == SQLITE_FCNTL_SIZE_LIMIT {
@@ -17615,7 +17620,7 @@ func memdbFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, z
 	defer tls.Free(8)
 
 	_ = pVfs
-	Xsqlite3_snprintf(tls, nOut, zOut, ts+3647, libc.VaList(bp, zPath))
+	Xsqlite3_snprintf(tls, nOut, zOut, ts+3666, libc.VaList(bp, zPath))
 	return SQLITE_OK
 }
 
@@ -17736,7 +17741,7 @@ func Xsqlite3_serialize(tls *libc.TLS, db uintptr, zSchema uintptr, piSize uintp
 		return uintptr(0)
 	}
 	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
-	zSql = Xsqlite3_mprintf(tls, ts+3840, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3859, libc.VaList(bp, zSchema))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, db, zSql, -1, bp+8, uintptr(0))
 	} else {
@@ -17809,7 +17814,7 @@ __1:
 	goto end_deserialize
 __2:
 	;
-	zSql = Xsqlite3_mprintf(tls, ts+3863, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+3882, libc.VaList(bp, zSchema))
 	if !(zSql == uintptr(0)) {
 		goto __3
 	}
@@ -18525,7 +18530,7 @@ func pcacheFetchFinishWithInit(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 	libc.Xmemset(tls, pPgHdr+32, 0, uint64(unsafe.Sizeof(PgHdr{}))-uint64(uintptr(0)+32))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpPage = pPage
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpData = (*Sqlite3_pcache_page)(unsafe.Pointer(pPage)).FpBuf
-	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*72
+	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*80
 	libc.Xmemset(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0, uint64(8))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpCache = pCache
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).Fpgno = pgno
@@ -18555,7 +18560,7 @@ func Xsqlite3PcacheFetchFinish(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 // reference count drops to 0, then it is made eligible for recycling.
 func Xsqlite3PcacheRelease(tls *libc.TLS, p uintptr) {
 	(*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FnRefSum--
-	if int32(libc.PreDecInt16(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1)) == 0 {
+	if libc.PreDecInt64(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1) == int64(0) {
 		if int32((*PgHdr)(unsafe.Pointer(p)).Fflags)&PGHDR_CLEAN != 0 {
 			pcacheUnpin(tls, p)
 		} else {
@@ -18606,7 +18611,7 @@ func Xsqlite3PcacheMakeClean(tls *libc.TLS, p uintptr) {
 	*(*U16)(unsafe.Pointer(p + 52)) &= libc.Uint16FromInt32(libc.CplInt32(PGHDR_DIRTY | PGHDR_NEED_SYNC | PGHDR_WRITEABLE))
 	*(*U16)(unsafe.Pointer(p + 52)) |= U16(PGHDR_CLEAN)
 
-	if int32((*PgHdr)(unsafe.Pointer(p)).FnRef) == 0 {
+	if (*PgHdr)(unsafe.Pointer(p)).FnRef == int64(0) {
 		pcacheUnpin(tls, p)
 	}
 }
@@ -18710,8 +18715,8 @@ func Xsqlite3PcacheClear(tls *libc.TLS, pCache uintptr) {
 }
 
 func pcacheMergeDirtyList(tls *libc.TLS, pA uintptr, pB uintptr) uintptr {
-	bp := tls.Alloc(72)
-	defer tls.Free(72)
+	bp := tls.Alloc(80)
+	defer tls.Free(80)
 
 	var pTail uintptr
 	pTail = bp
@@ -18789,13 +18794,13 @@ func Xsqlite3PcacheDirtyList(tls *libc.TLS, pCache uintptr) uintptr {
 //
 // This is not the total number of pages referenced, but the sum of the
 // reference count for all pages.
-func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) int32 {
+func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) I64 {
 	return (*PCache)(unsafe.Pointer(pCache)).FnRefSum
 }
 
 // Return the number of references to the page supplied as an argument.
-func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) int32 {
-	return int32((*PgHdr)(unsafe.Pointer(p)).FnRef)
+func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) I64 {
+	return (*PgHdr)(unsafe.Pointer(p)).FnRef
 }
 
 // Return the total number of pages in the cache.
@@ -21020,7 +21025,7 @@ __27:
 	if !(isHot != 0 && nPlayback != 0) {
 		goto __28
 	}
-	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3878,
+	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+3897,
 		libc.VaList(bp, nPlayback, (*Pager)(unsafe.Pointer(pPager)).FzJournal))
 __28:
 	;
@@ -21085,7 +21090,7 @@ func pagerUndoCallback(tls *libc.TLS, pCtx uintptr, iPg Pgno) int32 {
 
 	pPg = Xsqlite3PagerLookup(tls, pPager, iPg)
 	if pPg != 0 {
-		if Xsqlite3PcachePageRefcount(tls, pPg) == 1 {
+		if Xsqlite3PcachePageRefcount(tls, pPg) == int64(1) {
 			Xsqlite3PcacheDrop(tls, pPg)
 		} else {
 			rc = readDbPage(tls, pPg)
@@ -21508,7 +21513,7 @@ func Xsqlite3PagerSetPagesize(tls *libc.TLS, pPager uintptr, pPageSize uintptr,
 	var pageSize U32 = *(*U32)(unsafe.Pointer(pPageSize))
 
 	if (int32((*Pager)(unsafe.Pointer(pPager)).FmemDb) == 0 || (*Pager)(unsafe.Pointer(pPager)).FdbSize == Pgno(0)) &&
-		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 &&
+		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) &&
 		pageSize != 0 && pageSize != U32((*Pager)(unsafe.Pointer(pPager)).FpageSize) {
 		var pNew uintptr = uintptr(0)
 		*(*I64)(unsafe.Pointer(bp)) = int64(0)
@@ -21966,7 +21971,7 @@ func Xsqlite3PagerFlush(tls *libc.TLS, pPager uintptr) int32 {
 
 		for rc == SQLITE_OK && pList != 0 {
 			var pNext uintptr = (*PgHdr)(unsafe.Pointer(pList)).FpDirty
-			if int32((*PgHdr)(unsafe.Pointer(pList)).FnRef) == 0 {
+			if (*PgHdr)(unsafe.Pointer(pList)).FnRef == int64(0) {
 				rc = pagerStress(tls, pPager, pList)
 			}
 			pList = pNext
@@ -22116,7 +22121,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 60235)
+	rc = Xsqlite3CantopenError(tls, 60239)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -22177,7 +22182,7 @@ __15:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzJournal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3905, uint64(8))
+	libc.Xmemcpy(tls, pPtr, ts+3924, uint64(8))
 	pPtr += uintptr(8 + 1)
 	goto __19
 __18:
@@ -22190,7 +22195,7 @@ __19:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzWal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+3914, uint64(4))
+	libc.Xmemcpy(tls, pPtr, ts+3933, uint64(4))
 	pPtr += uintptr(4 + 1)
 	goto __21
 __20:
@@ -22242,9 +22247,9 @@ __27:
 	;
 __26:
 	;
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3919, 0))
+	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3938, 0))
 	if !(iDc&SQLITE_IOCAP_IMMUTABLE != 0 ||
-		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3926, 0) != 0) {
+		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+3945, 0) != 0) {
 		goto __30
 	}
 	vfsFlags = vfsFlags | SQLITE_OPEN_READONLY
@@ -22497,7 +22502,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60754)
+	rc = Xsqlite3CantopenError(tls, 60758)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -22603,7 +22608,7 @@ __24:
 }
 
 func pagerUnlockIfUnused(tls *libc.TLS, pPager uintptr) {
-	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 {
+	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) {
 		pagerUnlockAndRollback(tls, pPager)
 	}
 }
@@ -22621,7 +22626,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60967)
+	return Xsqlite3CorruptError(tls, 60971)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -22660,7 +22665,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60999)
+	rc = Xsqlite3CorruptError(tls, 61003)
 	goto pager_acquire_err
 __7:
 	;
@@ -23447,7 +23452,7 @@ func Xsqlite3PagerMemUsed(tls *libc.TLS, pPager uintptr) int32 {
 
 // Return the number of references to the specified page.
 func Xsqlite3PagerPageRefcount(tls *libc.TLS, pPage uintptr) int32 {
-	return Xsqlite3PcachePageRefcount(tls, pPage)
+	return int32(Xsqlite3PcachePageRefcount(tls, pPage))
 }
 
 // Parameter eStat must be one of SQLITE_DBSTATUS_CACHE_HIT, _MISS, _WRITE,
@@ -23690,9 +23695,9 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	pPgOld = Xsqlite3PagerLookup(tls, pPager, pgno)
 
 	if pPgOld != 0 {
-		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
+		if (*PgHdr)(unsafe.Pointer(pPgOld)).FnRef > int64(1) {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62623)
+			return Xsqlite3CorruptError(tls, 62627)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -23877,7 +23882,7 @@ func Xsqlite3PagerClearCache(tls *libc.TLS, pPager uintptr) {
 func Xsqlite3PagerCheckpoint(tls *libc.TLS, pPager uintptr, db uintptr, eMode int32, pnLog uintptr, pnCkpt uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal == uintptr(0) && int32((*Pager)(unsafe.Pointer(pPager)).FjournalMode) == PAGER_JOURNALMODE_WAL {
-		Xsqlite3_exec(tls, db, ts+3936, uintptr(0), uintptr(0), uintptr(0))
+		Xsqlite3_exec(tls, db, ts+3955, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal != 0 {
 		rc = Xsqlite3WalCheckpoint(tls, (*Pager)(unsafe.Pointer(pPager)).FpWal, db, eMode,
@@ -24449,7 +24454,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, 64387)
+				return Xsqlite3CorruptError(tls, 64391)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -24548,7 +24553,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64519)
+	rc = Xsqlite3CantopenError(tls, 64523)
 	goto finished
 __7:
 	;
@@ -24716,7 +24721,7 @@ __24:
 		goto __30
 	}
 	Xsqlite3_log(tls, SQLITE_NOTICE|int32(1)<<8,
-		ts+3954,
+		ts+3973,
 		libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 __30:
 	;
@@ -25134,7 +25139,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65333)
+	rc = Xsqlite3CorruptError(tls, 65337)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -25279,7 +25284,7 @@ func walLimitSize(tls *libc.TLS, pWal uintptr, nMax I64) {
 	}
 	Xsqlite3EndBenignMalloc(tls)
 	if rx != 0 {
-		Xsqlite3_log(tls, rx, ts+3991, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
+		Xsqlite3_log(tls, rx, ts+4010, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 	}
 }
 
@@ -25409,7 +25414,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, 65682)
+		rc = Xsqlite3CantopenError(tls, 65686)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -25882,7 +25887,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66419)
+				return Xsqlite3CorruptError(tls, 66423)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -26387,7 +26392,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, 67138)
+			rc = Xsqlite3CorruptError(tls, 67142)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -26780,7 +26785,7 @@ func Xsqlite3BtreeLeaveCursor(tls *libc.TLS, pCur uintptr) {
 	Xsqlite3BtreeLeave(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpBtree)
 }
 
-var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 4017))
+var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 4036))
 
 var sqlite3SharedCacheList uintptr = uintptr(0)
 
@@ -27045,7 +27050,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, 69249)
+			rc = Xsqlite3CorruptError(tls, 69253)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -27182,7 +27187,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69434)
 	return
 __2:
 	;
@@ -27199,7 +27204,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69447)
 	goto ptrmap_exit
 __4:
 	;
@@ -27207,7 +27212,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69452)
 	goto ptrmap_exit
 __5:
 	;
@@ -27250,7 +27255,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, 69493)
+		return Xsqlite3CorruptError(tls, 69497)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -27260,7 +27265,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, 69501)
+		return Xsqlite3CorruptError(tls, 69505)
 	}
 	return SQLITE_OK
 }
@@ -27510,7 +27515,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, 69893)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69897)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -27557,7 +27562,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69951)
+	return Xsqlite3CorruptError(tls, 69955)
 __2:
 	;
 	if !(iFree != 0) {
@@ -27567,7 +27572,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69954)
+	return Xsqlite3CorruptError(tls, 69958)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -27580,7 +27585,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69962)
+	return Xsqlite3CorruptError(tls, 69966)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -27589,14 +27594,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69965)
+	return Xsqlite3CorruptError(tls, 69969)
 __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, 69967)
+	return Xsqlite3CorruptError(tls, 69971)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -27606,7 +27611,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69971)
+	return Xsqlite3CorruptError(tls, 69975)
 __11:
 	;
 __8:
@@ -27670,7 +27675,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 70004)
+	return Xsqlite3CorruptError(tls, 70008)
 __22:
 	;
 	size = int32((*struct {
@@ -27680,7 +27685,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 70010)
+	return Xsqlite3CorruptError(tls, 70014)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -27702,7 +27707,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 70024)
+	return Xsqlite3CorruptError(tls, 70028)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -27737,7 +27742,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, 70081)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70085)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -27750,13 +27755,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, 70096)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70100)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70107)
 	}
 	return uintptr(0)
 }
@@ -27781,7 +27786,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, 70152)
+			return Xsqlite3CorruptError(tls, 70156)
 		}
 	}
 
@@ -27792,7 +27797,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, 70170)
+				return Xsqlite3CorruptError(tls, 70174)
 			} else {
 				return SQLITE_OK
 			}
@@ -27844,22 +27849,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 70249)
+				return Xsqlite3CorruptError(tls, 70253)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 70254)
+			return Xsqlite3CorruptError(tls, 70258)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 70266)
+				return Xsqlite3CorruptError(tls, 70270)
 			}
 			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, 70269)
+				return Xsqlite3CorruptError(tls, 70273)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -27869,7 +27874,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, 70282)
+					return Xsqlite3CorruptError(tls, 70286)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -27877,7 +27882,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, 70288)
+			return Xsqlite3CorruptError(tls, 70292)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -27885,10 +27890,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, 70297)
+			return Xsqlite3CorruptError(tls, 70301)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70298)
+			return Xsqlite3CorruptError(tls, 70302)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -27948,7 +27953,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70357)
+			return Xsqlite3CorruptError(tls, 70361)
 		}
 	} else {
 		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
@@ -27984,7 +27989,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70381)
+			return Xsqlite3CorruptError(tls, 70385)
 		}
 	}
 	return SQLITE_OK
@@ -28014,11 +28019,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70432)
+			return Xsqlite3CorruptError(tls, 70436)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70437)
+				return Xsqlite3CorruptError(tls, 70441)
 			}
 			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))))
@@ -28029,15 +28034,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70447)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70451)
+			return Xsqlite3CorruptError(tls, 70455)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70463)
+		return Xsqlite3CorruptError(tls, 70467)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -28065,14 +28070,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, 70494)
+			return Xsqlite3CorruptError(tls, 70498)
 		}
 		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, 70499)
+			return Xsqlite3CorruptError(tls, 70503)
 		}
 	}
 	return SQLITE_OK
@@ -28086,7 +28091,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, 70531)
+		return Xsqlite3CorruptError(tls, 70535)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -28098,7 +28103,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, 70545)
+		return Xsqlite3CorruptError(tls, 70549)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -28201,7 +28206,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70700)
+	rc = Xsqlite3CorruptError(tls, 70704)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -28229,7 +28234,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, 70721)
+	rc = Xsqlite3CorruptError(tls, 70725)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -28268,7 +28273,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, 70787)
+			return Xsqlite3CorruptError(tls, 70791)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -28341,7 +28346,7 @@ func Xsqlite3BtreeOpen(tls *libc.TLS, pVfs uintptr, zFilename uintptr, db uintpt
 	mutexOpen = uintptr(0)
 	rc = SQLITE_OK
 	isTempDb = libc.Bool32(zFilename == uintptr(0) || int32(*(*int8)(unsafe.Pointer(zFilename))) == 0)
-	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4033) == 0 ||
+	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+4052) == 0 ||
 		isTempDb != 0 && Xsqlite3TempInMemory(tls, db) != 0 ||
 		vfsFlags&SQLITE_OPEN_MEMORY != 0)
 
@@ -29102,7 +29107,7 @@ __9:
 	;
 __10:
 	;
-	if !(libc.Xmemcmp(tls, page1+21, ts+4042, uint64(3)) != 0) {
+	if !(libc.Xmemcmp(tls, page1+21, ts+4061, uint64(3)) != 0) {
 		goto __14
 	}
 	goto page1_init_failed
@@ -29140,7 +29145,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71722)
+	rc = Xsqlite3CorruptError(tls, 71726)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -29555,7 +29560,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, 72143)
+			return Xsqlite3CorruptError(tls, 72147)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -29581,7 +29586,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, 72162)
+						return Xsqlite3CorruptError(tls, 72166)
 					}
 					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)
@@ -29590,7 +29595,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, 72171)
+					return Xsqlite3CorruptError(tls, 72175)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -29601,7 +29606,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, 72183)
+				return Xsqlite3CorruptError(tls, 72187)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -29617,7 +29622,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, 72218)
+		return Xsqlite3CorruptError(tls, 72222)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -29678,7 +29683,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, 72316)
+			return Xsqlite3CorruptError(tls, 72320)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -29713,7 +29718,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, 72368)
+					return Xsqlite3CorruptError(tls, 72372)
 				}
 			}
 
@@ -29773,7 +29778,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, 72436)
+			rc = Xsqlite3CorruptError(tls, 72440)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -29812,7 +29817,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, 72487)
+			return Xsqlite3CorruptError(tls, 72491)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -29843,7 +29848,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72514)
+			return Xsqlite3CorruptError(tls, 72518)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -30184,7 +30189,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, 72978)
+			return Xsqlite3CorruptError(tls, 72982)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -30428,14 +30433,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, 73385)
+		return Xsqlite3CorruptError(tls, 73389)
 	}
 
 	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, 73400)
+		return Xsqlite3CorruptError(tls, 73404)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -30480,7 +30485,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, 73462)
+				return Xsqlite3CorruptError(tls, 73466)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -30529,7 +30534,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73547)
+		return Xsqlite3CorruptError(tls, 73551)
 	}
 	return rc
 }
@@ -30609,7 +30614,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, 73684)
+		return Xsqlite3CorruptError(tls, 73688)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -30700,7 +30705,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, 73823)
+	return Xsqlite3CorruptError(tls, 73827)
 __11:
 	;
 skip_init:
@@ -30720,7 +30725,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73835)
+	return Xsqlite3CorruptError(tls, 73839)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -30930,7 +30935,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 74077)
+	return Xsqlite3CorruptError(tls, 74081)
 __21:
 	;
 	goto __19
@@ -31134,7 +31139,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 74273)
+	return Xsqlite3CorruptError(tls, 74277)
 __4:
 	;
 	goto bypass_moveto_root
@@ -31199,7 +31204,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, 74360)
+	rc = Xsqlite3CorruptError(tls, 74364)
 	goto moveto_index_finish
 __17:
 	;
@@ -31247,7 +31252,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74392)
+	rc = Xsqlite3CorruptError(tls, 74396)
 __24:
 	;
 	goto moveto_index_finish
@@ -31366,7 +31371,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, 74508)
+		return Xsqlite3CorruptError(tls, 74512)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -31526,7 +31531,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74688)
+	return Xsqlite3CorruptError(tls, 74692)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -31591,7 +31596,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74744)
+	rc = Xsqlite3CorruptError(tls, 74748)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -31627,7 +31632,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74773)
+	rc = Xsqlite3CorruptError(tls, 74777)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -31671,7 +31676,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74807)
+	rc = Xsqlite3CorruptError(tls, 74811)
 	goto end_allocate_page
 __32:
 	;
@@ -31783,7 +31788,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74872)
+	rc = Xsqlite3CorruptError(tls, 74876)
 	goto end_allocate_page
 __51:
 	;
@@ -31941,7 +31946,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, 74999)
+	return Xsqlite3CorruptError(tls, 75003)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -31998,7 +32003,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75050)
 	goto freepage_out
 __10:
 	;
@@ -32014,7 +32019,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75061)
 	goto freepage_out
 __12:
 	;
@@ -32088,7 +32093,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, 75146)
+		return Xsqlite3CorruptError(tls, 75150)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -32100,7 +32105,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, 75163)
+			return Xsqlite3CorruptError(tls, 75167)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -32111,7 +32116,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, 75183)
+			rc = Xsqlite3CorruptError(tls, 75187)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -32276,7 +32281,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, 75436)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75440)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -32555,12 +32560,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, 75737)
+				return Xsqlite3CorruptError(tls, 75741)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75742)
+			return Xsqlite3CorruptError(tls, 75746)
 		}
 
 		pData -= uintptr(sz)
@@ -32568,7 +32573,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, 75748)
+			return Xsqlite3CorruptError(tls, 75752)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -32628,7 +32633,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, 75833)
+			Xsqlite3CorruptError(tls, 75837)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -32717,7 +32722,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75947)
+	return Xsqlite3CorruptError(tls, 75951)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -32833,7 +32838,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, 76060)
+		return Xsqlite3CorruptError(tls, 76064)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -33153,7 +33158,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, 76481)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76485)
 	goto balance_cleanup
 __25:
 	;
@@ -33164,7 +33169,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76509)
 	goto balance_cleanup
 __27:
 	;
@@ -33322,7 +33327,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76610)
 	goto balance_cleanup
 __55:
 	;
@@ -33396,7 +33401,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76643)
 	goto balance_cleanup
 __67:
 	;
@@ -33459,7 +33464,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76687)
 	goto balance_cleanup
 __75:
 	;
@@ -33487,7 +33492,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76720)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -33748,7 +33753,7 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76920)
 	goto balance_cleanup
 __121:
 	;
@@ -33940,7 +33945,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, 77146)
+			return Xsqlite3CorruptError(tls, 77150)
 		}
 	}
 	return SQLITE_OK
@@ -33978,7 +33983,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 77206)
+			rc = Xsqlite3CorruptError(tls, 77210)
 		} 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)))
@@ -34084,7 +34089,7 @@ func btreeOverwriteOverflowCell(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, 77370)
+			rc = Xsqlite3CorruptError(tls, 77374)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -34109,7 +34114,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 
 	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)
+		return Xsqlite3CorruptError(tls, 77402)
 	}
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
 		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
@@ -34179,7 +34184,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77479)
+	return Xsqlite3CorruptError(tls, 77483)
 __3:
 	;
 __1:
@@ -34292,7 +34297,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77606)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -34352,6 +34357,7 @@ __30:
 __25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
+	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
 		goto __31
 	}
@@ -34359,7 +34365,7 @@ __25:
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
 		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77640)
+	return Xsqlite3CorruptError(tls, 77645)
 __33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
@@ -34397,13 +34403,13 @@ __37:
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77667)
+	return Xsqlite3CorruptError(tls, 77672)
 __39:
 	;
 	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __40
 	}
-	return Xsqlite3CorruptError(tls, 77670)
+	return Xsqlite3CorruptError(tls, 77675)
 __40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
@@ -34434,7 +34440,6 @@ __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 __44
 	}
@@ -34509,7 +34514,7 @@ 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, 77773)
+		return Xsqlite3CorruptError(tls, 77777)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
@@ -34534,7 +34539,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, 77798)
+				return Xsqlite3CorruptError(tls, 77802)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -34635,7 +34640,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77894)
+			return Xsqlite3CorruptError(tls, 77898)
 		}
 	}
 
@@ -34643,11 +34648,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, 77903)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 	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, 77907)
+		return Xsqlite3CorruptError(tls, 77911)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -34722,7 +34727,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, 77998)
+			return Xsqlite3CorruptError(tls, 78002)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -34791,7 +34796,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, 78114)
+			return Xsqlite3CorruptError(tls, 78118)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -34820,7 +34825,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, 78162)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78166)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -34896,7 +34901,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 78252)
+	return Xsqlite3CorruptError(tls, 78256)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -34910,7 +34915,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, 78259)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78263)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -35044,7 +35049,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, 78363)
+		return Xsqlite3CorruptError(tls, 78367)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -35261,7 +35266,7 @@ 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+64, ts+4046, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4065, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
 		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
@@ -35286,11 +35291,11 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 	defer tls.Free(16)
 
 	if iPage > (*IntegrityCk)(unsafe.Pointer(pCheck)).FnPage || iPage == Pgno(0) {
-		checkAppendMsg(tls, pCheck, ts+4048, libc.VaList(bp, iPage))
+		checkAppendMsg(tls, pCheck, ts+4067, libc.VaList(bp, iPage))
 		return 1
 	}
 	if getPageReferenced(tls, pCheck, iPage) != 0 {
-		checkAppendMsg(tls, pCheck, ts+4071, libc.VaList(bp+8, iPage))
+		checkAppendMsg(tls, pCheck, ts+4090, libc.VaList(bp+8, iPage))
 		return 1
 	}
 	setPageReferenced(tls, pCheck, iPage)
@@ -35308,13 +35313,13 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
 			checkOom(tls, pCheck)
 		}
-		checkAppendMsg(tls, pCheck, ts+4096, libc.VaList(bp, iChild))
+		checkAppendMsg(tls, pCheck, ts+4115, libc.VaList(bp, iChild))
 		return
 	}
 
 	if int32(*(*U8)(unsafe.Pointer(bp + 48))) != int32(eType) || *(*Pgno)(unsafe.Pointer(bp + 52)) != iParent {
 		checkAppendMsg(tls, pCheck,
-			ts+4125,
+			ts+4144,
 			libc.VaList(bp+8, iChild, int32(eType), iParent, int32(*(*U8)(unsafe.Pointer(bp + 48))), *(*Pgno)(unsafe.Pointer(bp + 52))))
 	}
 }
@@ -35333,7 +35338,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 		}
 		N--
 		if Xsqlite3PagerGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpPager, iPage, bp+40, 0) != 0 {
-			checkAppendMsg(tls, pCheck, ts+4179, libc.VaList(bp, iPage))
+			checkAppendMsg(tls, pCheck, ts+4198, libc.VaList(bp, iPage))
 			break
 		}
 		pOvflData = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
@@ -35344,7 +35349,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 			}
 			if n > (*BtShared)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt)).FusableSize/U32(4)-U32(2) {
 				checkAppendMsg(tls, pCheck,
-					ts+4201, libc.VaList(bp+8, iPage))
+					ts+4220, libc.VaList(bp+8, iPage))
 				N--
 			} else {
 				for i = 0; i < int32(n); i++ {
@@ -35367,12 +35372,12 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 	}
 	if N != 0 && nErrAtStart == (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr {
 		checkAppendMsg(tls, pCheck,
-			ts+4240,
+			ts+4259,
 			libc.VaList(bp+16, func() uintptr {
 				if isFreeList != 0 {
-					return ts + 4266
+					return ts + 4285
 				}
-				return ts + 4271
+				return ts + 4290
 			}(),
 				expected-N, expected))
 	}
@@ -35488,13 +35493,13 @@ __2:
 	return 0
 __3:
 	;
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4292
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4311
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
 		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4302, libc.VaList(bp, rc))
+		ts+4321, libc.VaList(bp, rc))
 	goto end_of_check
 __4:
 	;
@@ -35505,7 +35510,7 @@ __4:
 	}
 
 	checkAppendMsg(tls, pCheck,
-		ts+4340, libc.VaList(bp+8, rc))
+		ts+4359, libc.VaList(bp+8, rc))
 	goto end_of_check
 __5:
 	;
@@ -35513,14 +35518,14 @@ __5:
 		goto __6
 	}
 
-	checkAppendMsg(tls, pCheck, ts+4378, libc.VaList(bp+16, rc))
+	checkAppendMsg(tls, pCheck, ts+4397, libc.VaList(bp+16, rc))
 	goto end_of_check
 __6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
 
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4400
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4419
 	contentOffset = U32((int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5))))<<8|int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5) + 1)))-1)&0xffff + 1)
 
 	nCell = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3) + 1)))
@@ -35537,7 +35542,7 @@ __6:
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
 		goto __9
 	}
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4426
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4445
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
 __9:
 	;
@@ -35562,7 +35567,7 @@ __10:
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
 		goto __13
 	}
-	checkAppendMsg(tls, pCheck, ts+4454,
+	checkAppendMsg(tls, pCheck, ts+4473,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
 	goto __11
@@ -35575,7 +35580,7 @@ __13:
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
 		goto __14
 	}
-	checkAppendMsg(tls, pCheck, ts+4484, 0)
+	checkAppendMsg(tls, pCheck, ts+4503, 0)
 	doCoverageCheck = 0
 	goto __11
 __14:
@@ -35591,7 +35596,7 @@ __14:
 	}() != 0) {
 		goto __16
 	}
-	checkAppendMsg(tls, pCheck, ts+4508, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
+	checkAppendMsg(tls, pCheck, ts+4527, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
 __16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
@@ -35629,7 +35634,7 @@ __21:
 	if !(d2 != depth) {
 		goto __22
 	}
-	checkAppendMsg(tls, pCheck, ts+4532, 0)
+	checkAppendMsg(tls, pCheck, ts+4551, 0)
 	depth = d2
 __22:
 	;
@@ -35702,7 +35707,7 @@ __30:
 		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4557, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
+		ts+4576, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
 	goto __31
 	goto __33
 __32:
@@ -35719,7 +35724,7 @@ __31:
 		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+4594,
+		ts+4613,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
 __34:
 	;
@@ -35833,7 +35838,7 @@ __6:
 	if !(bCkFreelist != 0) {
 		goto __7
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4646
+	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 4665
 	checkList(tls, bp+32, 1, Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+32),
 		Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
@@ -35869,7 +35874,7 @@ __13:
 		goto __15
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4662,
+		ts+4681,
 		libc.VaList(bp, mx, mxInHdr))
 __15:
 	;
@@ -35879,7 +35884,7 @@ __9:
 		goto __16
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+4707, 0)
+		ts+4726, 0)
 __16:
 	;
 __10:
@@ -35926,13 +35931,13 @@ __23:
 	if !(getPageReferenced(tls, bp+32, i) == 0 && (ptrmapPageno(tls, pBt, i) != i || !(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0))) {
 		goto __26
 	}
-	checkAppendMsg(tls, bp+32, ts+4762, libc.VaList(bp+16, i))
+	checkAppendMsg(tls, bp+32, ts+4781, libc.VaList(bp+16, i))
 __26:
 	;
 	if !(getPageReferenced(tls, bp+32, i) != 0 && (ptrmapPageno(tls, pBt, i) == i && (*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0)) {
 		goto __27
 	}
-	checkAppendMsg(tls, bp+32, ts+4784, libc.VaList(bp+24, i))
+	checkAppendMsg(tls, bp+32, ts+4803, libc.VaList(bp+24, i))
 __27:
 	;
 	goto __24
@@ -36195,7 +36200,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 		var rc int32 = 0
 		Xsqlite3ParseObjectInit(tls, bp+16, pDb)
 		if Xsqlite3OpenTempDatabase(tls, bp+16) != 0 {
-			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3647, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+3666, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 			rc = SQLITE_ERROR
 		}
 		Xsqlite3DbFree(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
@@ -36206,7 +36211,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 	}
 
 	if i < 0 {
-		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4818, libc.VaList(bp+8, zDb))
+		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+4837, libc.VaList(bp+8, zDb))
 		return uintptr(0)
 	}
 
@@ -36221,7 +36226,7 @@ func setDestPgsz(tls *libc.TLS, p uintptr) int32 {
 
 func checkReadTransaction(tls *libc.TLS, db uintptr, p uintptr) int32 {
 	if Xsqlite3BtreeTxnState(tls, p) != SQLITE_TXN_NONE {
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4838, 0)
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+4857, 0)
 		return SQLITE_ERROR
 	}
 	return SQLITE_OK
@@ -36241,7 +36246,7 @@ func Xsqlite3_backup_init(tls *libc.TLS, pDestDb uintptr, zDestDb uintptr, pSrcD
 
 	if pSrcDb == pDestDb {
 		Xsqlite3ErrorWithMsg(tls,
-			pDestDb, SQLITE_ERROR, ts+4869, 0)
+			pDestDb, SQLITE_ERROR, ts+4888, 0)
 		p = uintptr(0)
 	} else {
 		p = Xsqlite3MallocZero(tls, uint64(unsafe.Sizeof(Sqlite3_backup{})))
@@ -36689,7 +36694,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 		(*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,
+		Xsqlite3_str_appendf(tls, bp+8, ts+4928,
 			libc.VaList(bp, func() float64 {
 				if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_IntReal != 0 {
 					return float64(*(*I64)(unsafe.Pointer(p)))
@@ -37281,7 +37286,7 @@ func Xsqlite3VdbeMemSetPointer(tls *libc.TLS, pMem uintptr, pPtr uintptr, zPType
 		if zPType != 0 {
 			return zPType
 		}
-		return ts + 1538
+		return ts + 1557
 	}()
 	(*Mem)(unsafe.Pointer(pMem)).Fz = pPtr
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null | MEM_Dyn | MEM_Subtype | MEM_Term)
@@ -37513,7 +37518,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, 81630)
+		return Xsqlite3CorruptError(tls, 81634)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -37745,7 +37750,7 @@ __9:
 		goto __10
 	}
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 8)).FisError
-	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3647, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
+	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+3666, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
 	goto __11
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
@@ -37798,7 +37803,7 @@ func valueFromExpr(tls *libc.TLS, db uintptr, pExpr uintptr, enc U8, affinity U8
 	zVal = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	negInt = 1
-	zNeg = ts + 1538
+	zNeg = ts + 1557
 	rc = SQLITE_OK
 
 __1:
@@ -37839,7 +37844,7 @@ __4:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
 	negInt = -1
-	zNeg = ts + 4916
+	zNeg = ts + 4935
 __6:
 	;
 	if !(op == TK_STRING || op == TK_FLOAT || op == TK_INTEGER) {
@@ -37858,7 +37863,7 @@ __9:
 	Xsqlite3VdbeMemSetInt64(tls, *(*uintptr)(unsafe.Pointer(bp + 16)), I64(*(*int32)(unsafe.Pointer(pExpr + 8)))*I64(negInt))
 	goto __11
 __10:
-	zVal = Xsqlite3MPrintf(tls, db, ts+4918, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+	zVal = Xsqlite3MPrintf(tls, db, ts+4937, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	if !(zVal == uintptr(0)) {
 		goto __12
 	}
@@ -38162,7 +38167,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, 82270)
+		return Xsqlite3CorruptError(tls, 82274)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -38177,14 +38182,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 82276)
+			return Xsqlite3CorruptError(tls, 82280)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 82282)
+		return Xsqlite3CorruptError(tls, 82286)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -39192,34 +39197,34 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var j int32
 			var pKeyInfo uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4923, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4942, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
 			for j = 0; j < int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField); j++ {
 				var pColl uintptr = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(j)*8))
 				var zColl uintptr
 				if pColl != 0 {
 					zColl = (*CollSeq)(unsafe.Pointer(pColl)).FzName
 				} else {
-					zColl = ts + 1538
+					zColl = ts + 1557
 				}
-				if libc.Xstrcmp(tls, zColl, ts+1083) == 0 {
-					zColl = ts + 4928
+				if libc.Xstrcmp(tls, zColl, ts+1102) == 0 {
+					zColl = ts + 4947
 				}
-				Xsqlite3_str_appendf(tls, bp+144, ts+4930,
+				Xsqlite3_str_appendf(tls, bp+144, ts+4949,
 					libc.VaList(bp+8, func() uintptr {
 						if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_DESC != 0 {
-							return ts + 4916
+							return ts + 4935
 						}
-						return ts + 1538
+						return ts + 1557
 					}(),
 						func() uintptr {
 							if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_BIGNULL != 0 {
-								return ts + 4938
+								return ts + 4957
 							}
-							return ts + 1538
+							return ts + 1557
 						}(),
 						zColl))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4941, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+4960, 1)
 			break
 
 		}
@@ -39227,7 +39232,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 		{
 			var pColl uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+4943, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
+			Xsqlite3_str_appendf(tls, bp+144, ts+4962, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
 				encnames[(*CollSeq)(unsafe.Pointer(pColl)).Fenc]))
 			break
 
@@ -39235,32 +39240,32 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -7:
 		{
 			var pDef uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
-			Xsqlite3_str_appendf(tls, bp+144, ts+4952, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4971, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -15:
 		{
 			var pDef uintptr = (*Sqlite3_context)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpFunc
-			Xsqlite3_str_appendf(tls, bp+144, ts+4952, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4971, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -13:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1318, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1337, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
 	case -3:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+4959, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4978, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
 			break
 
 		}
 	case -12:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1312, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1331, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
@@ -39270,13 +39275,13 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Str != 0 {
 				zP4 = (*Mem)(unsafe.Pointer(pMem)).Fz
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1318, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1337, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1312, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1331, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Null != 0 {
-				zP4 = ts + 1539
+				zP4 = ts + 1558
 			} else {
-				zP4 = ts + 4962
+				zP4 = ts + 4981
 			}
 			break
 
@@ -39284,7 +39289,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -11:
 		{
 			var pVtab uintptr = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-			Xsqlite3_str_appendf(tls, bp+144, ts+4969, libc.VaList(bp+120, pVtab))
+			Xsqlite3_str_appendf(tls, bp+144, ts+4988, libc.VaList(bp+120, pVtab))
 			break
 
 		}
@@ -39295,20 +39300,20 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var n U32 = *(*U32)(unsafe.Pointer(ai))
 
 			for i = U32(1); i <= n; i++ {
-				Xsqlite3_str_appendf(tls, bp+144, ts+4977, libc.VaList(bp+128, func() int32 {
+				Xsqlite3_str_appendf(tls, bp+144, ts+4996, libc.VaList(bp+128, func() int32 {
 					if i == U32(1) {
 						return '['
 					}
 					return ','
 				}(), *(*U32)(unsafe.Pointer(ai + uintptr(i)*4))))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+4982, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+5001, 1)
 			break
 
 		}
 	case -4:
 		{
-			zP4 = ts + 4984
+			zP4 = ts + 5003
 			break
 
 		}
@@ -39333,7 +39338,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	return Xsqlite3StrAccumFinish(tls, bp+144)
 }
 
-var encnames = [4]uintptr{ts + 4992, ts + 4994, ts + 4996, ts + 5001}
+var encnames = [4]uintptr{ts + 5011, ts + 5013, ts + 5015, ts + 5020}
 
 // Declare to the Vdbe that the BTree object at db->aDb[i] is used.
 //
@@ -39783,8 +39788,8 @@ func Xsqlite3VdbeMakeReady(tls *libc.TLS, p uintptr, pParse uintptr) {
 }
 
 var azColName = [12]uintptr{
-	ts + 5006, ts + 5011, ts + 5018, ts + 5021, ts + 5024, ts + 5027, ts + 5030, ts + 5033,
-	ts + 5041, ts + 5044, ts + 5051, ts + 5059,
+	ts + 5025, ts + 5030, ts + 5037, ts + 5040, ts + 5043, ts + 5046, ts + 5049, ts + 5052,
+	ts + 5060, ts + 5063, ts + 5070, ts + 5078,
 }
 
 // Close a VDBE cursor and release all the resources that cursor
@@ -39993,7 +39998,7 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		var nMainFile int32
 
 		nMainFile = Xsqlite3Strlen30(tls, zMainFile)
-		zSuper = Xsqlite3MPrintf(tls, db, ts+5066, libc.VaList(bp, 0, zMainFile, 0))
+		zSuper = Xsqlite3MPrintf(tls, db, ts+5085, libc.VaList(bp, 0, zMainFile, 0))
 		if zSuper == uintptr(0) {
 			return SQLITE_NOMEM
 		}
@@ -40001,16 +40006,16 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		for __ccgo := true; __ccgo; __ccgo = rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 60)) != 0 {
 			if retryCount != 0 {
 				if retryCount > 100 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5078, libc.VaList(bp+24, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5097, libc.VaList(bp+24, zSuper))
 					Xsqlite3OsDelete(tls, pVfs, zSuper, 0)
 					break
 				} else if retryCount == 1 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+5092, libc.VaList(bp+32, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+5111, libc.VaList(bp+32, zSuper))
 				}
 			}
 			retryCount++
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
-			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5107,
+			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+5126,
 				libc.VaList(bp+40, *(*U32)(unsafe.Pointer(bp + 56))>>8&U32(0xffffff), *(*U32)(unsafe.Pointer(bp + 56))&U32(0xff)))
 
 			rc = Xsqlite3OsAccess(tls, pVfs, zSuper, SQLITE_ACCESS_EXISTS, bp+60)
@@ -40156,7 +40161,7 @@ func Xsqlite3VdbeCheckFk(tls *libc.TLS, p uintptr, deferred int32) int32 {
 		!(deferred != 0) && (*Vdbe)(unsafe.Pointer(p)).FnFkConstraint > int64(0) {
 		(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_CONSTRAINT | int32(3)<<8
 		(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
-		Xsqlite3VdbeError(tls, p, ts+5120, 0)
+		Xsqlite3VdbeError(tls, p, ts+5139, 0)
 		if int32((*Vdbe)(unsafe.Pointer(p)).FprepFlags)&SQLITE_PREPARE_SAVESQL == 0 {
 			return SQLITE_ERROR
 		}
@@ -40488,7 +40493,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 86058)
+		return Xsqlite3CorruptError(tls, 86062)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -41039,7 +41044,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86989))
 		return 0
 	}
 
@@ -41104,7 +41109,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, 87062))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87066))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -41138,7 +41143,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, 87092))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87096))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -41188,7 +41193,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, 87136))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87140))
 			return 0
 		}
 	}
@@ -41334,7 +41339,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87303))
 	return 0
 __7:
 	;
@@ -41505,7 +41510,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87457)
+	return Xsqlite3CorruptError(tls, 87461)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -41531,7 +41536,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, 87490)
+		return Xsqlite3CorruptError(tls, 87494)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -41642,13 +41647,13 @@ func Xsqlite3NotPureFunc(tls *libc.TLS, pCtx uintptr) int32 {
 		var zContext uintptr
 		var zMsg uintptr
 		if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_IsCheck != 0 {
-			zContext = ts + 5150
-		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5169
-		} else {
+		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 5188
+		} else {
+			zContext = ts + 5207
 		}
-		zMsg = Xsqlite3_mprintf(tls, ts+5197,
+		zMsg = Xsqlite3_mprintf(tls, ts+5216,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx)).FpFunc)).FzName, zContext))
 		Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 		Xsqlite3_free(tls, zMsg)
@@ -41753,7 +41758,7 @@ func Xsqlite3_expired(tls *libc.TLS, pStmt uintptr) int32 {
 
 func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 	if (*Vdbe)(unsafe.Pointer(p)).Fdb == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5233, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5252, 0)
 		return 1
 	} else {
 		return 0
@@ -41763,7 +41768,7 @@ func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 
 func vdbeSafetyNotNull(tls *libc.TLS, p uintptr) int32 {
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5278, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+5297, 0)
 		return 1
 	} else {
 		return vdbeSafety(tls, p)
@@ -41805,7 +41810,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, 87854)
+			return Xsqlite3MisuseError(tls, 87858)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -42228,7 +42233,7 @@ func Xsqlite3_result_error_code(tls *libc.TLS, pCtx uintptr, errCode int32) {
 // Force an SQLITE_TOOBIG error.
 func Xsqlite3_result_error_toobig(tls *libc.TLS, pCtx uintptr) {
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FisError = SQLITE_TOOBIG
-	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5318, int64(-1),
+	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+5337, int64(-1),
 		uint8(SQLITE_UTF8), uintptr(0))
 }
 
@@ -42420,7 +42425,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88544)
+		return Xsqlite3MisuseError(tls, 88548)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -42940,15 +42945,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 89208)
+		return Xsqlite3MisuseError(tls, 89212)
 	}
 	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+5341, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 89216)
+			ts+5360, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89220)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -43353,7 +43358,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, 89707)
+	rc = Xsqlite3MisuseError(tls, 89711)
 	goto preupdate_old_out
 __1:
 	;
@@ -43497,7 +43502,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, 89809)
+	rc = Xsqlite3MisuseError(tls, 89813)
 	goto preupdate_new_out
 __1:
 	;
@@ -43669,7 +43674,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+5381, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5400, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -43705,11 +43710,11 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 
 			pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr(*(*int32)(unsafe.Pointer(bp + 84))-1)*56
 			if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Null != 0 {
-				Xsqlite3_str_append(tls, bp+48, ts+1539, 4)
+				Xsqlite3_str_append(tls, bp+48, ts+1558, 4)
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+1318, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+1337, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+4909, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+4928, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Str != 0 {
 				var nOut int32
 				var enc U8 = (*Sqlite3)(unsafe.Pointer(db)).Fenc
@@ -43724,21 +43729,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+5385, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5404, 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+5392, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5411, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5405, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5424, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					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_appendf(tls, bp+48, ts+5427, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5413, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5432, 1)
 			}
 		}
 	}
@@ -43941,10 +43946,6 @@ func filterHash(tls *libc.TLS, aMem uintptr, pOp uintptr) U64 {
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Real != 0 {
 			h = h + U64(Xsqlite3VdbeIntValue(tls, p))
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&(MEM_Str|MEM_Blob) != 0 {
-			h = h + U64((*Mem)(unsafe.Pointer(p)).Fn)
-			if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Zero != 0 {
-				h = h + U64(*(*int32)(unsafe.Pointer(p)))
-			}
 		}
 	}
 	return h
@@ -43955,11 +43956,11 @@ func vdbeMemTypeName(tls *libc.TLS, pMem uintptr) uintptr {
 }
 
 var azTypes = [5]uintptr{
-	ts + 1099,
-	ts + 1111,
-	ts + 1116,
-	ts + 1094,
-	ts + 1539,
+	ts + 1118,
+	ts + 1130,
+	ts + 1135,
+	ts + 1113,
+	ts + 1558,
 }
 
 // Execute as much of a VDBE program as we can.
@@ -45002,20 +45003,20 @@ __202:
 		goto __205
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5415, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	Xsqlite3VdbeError(tls, p, ts+5434, 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))))
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5455, 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))))
+	Xsqlite3VdbeError(tls, p, ts+3666, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	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))
+	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))
 __204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
@@ -46593,7 +46594,7 @@ op_column_corrupt:
 	goto __9
 	goto __425
 __424:
-	rc = Xsqlite3CorruptError(tls, 93317)
+	rc = Xsqlite3CorruptError(tls, 93320)
 	goto abort_due_to_error
 __425:
 	;
@@ -46721,7 +46722,7 @@ __428:
 	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5467,
+	Xsqlite3VdbeError(tls, p, ts+5486,
 		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
@@ -47153,7 +47154,7 @@ __78:
 		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5508, 0)
+	Xsqlite3VdbeError(tls, p, ts+5527, 0)
 	rc = SQLITE_BUSY
 	goto __523
 __522:
@@ -47213,7 +47214,7 @@ __530:
 	if !!(pSavepoint != 0) {
 		goto __531
 	}
-	Xsqlite3VdbeError(tls, p, ts+5559, libc.VaList(bp+88, zName))
+	Xsqlite3VdbeError(tls, p, ts+5578, libc.VaList(bp+88, zName))
 	rc = SQLITE_ERROR
 	goto __532
 __531:
@@ -47222,7 +47223,7 @@ __531:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5581, 0)
+		ts+5600, 0)
 	rc = SQLITE_BUSY
 	goto __534
 __533:
@@ -47408,7 +47409,7 @@ __564:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5635, 0)
+		ts+5654, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
 	goto __567
@@ -47451,13 +47452,13 @@ __562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5690
+				return ts + 5709
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5738
+					return ts + 5757
 				}
-				return ts + 5781
+				return ts + 5800
 			}()
 		}(), 0)
 
@@ -47540,7 +47541,7 @@ __576:
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5822)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5841)
 
 	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 __583
@@ -47744,7 +47745,7 @@ __88:
 	}
 
 	(*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
+	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1557
 __602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -48353,7 +48354,7 @@ notExistsWithKey:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
 		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95560)
+	rc = Xsqlite3CorruptError(tls, 95563)
 	goto __683
 __682:
 	goto jump_to_p2
@@ -49131,7 +49132,7 @@ __767:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
 		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5850)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96638, ts+5869)
 	goto abort_due_to_error
 __770:
 	;
@@ -49241,7 +49242,7 @@ __780:
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
 		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96840)
+	rc = Xsqlite3CorruptError(tls, 96843)
 	goto abort_due_to_error
 __781:
 	;
@@ -49402,14 +49403,14 @@ __141:
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	goto __799
 __798:
-	zSchema = ts + 5867
+	zSchema = ts + 5886
 	(*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+5881,
+		ts+5900,
 		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 __800
@@ -49435,7 +49436,7 @@ __802:
 		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 97092)
+	rc = Xsqlite3CorruptError(tls, 97095)
 __803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
@@ -49625,7 +49626,7 @@ __820:
 		goto __825
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5924, 0)
+	Xsqlite3VdbeError(tls, p, ts+5943, 0)
 	goto abort_due_to_error
 __825:
 	;
@@ -49937,7 +49938,7 @@ __860:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
 		goto __862
 	}
-	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
+	Xsqlite3VdbeError(tls, p, ts+3666, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
 __862:
 	;
@@ -49987,7 +49988,7 @@ __867:
 	if !(rc != 0) {
 		goto __868
 	}
-	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
+	Xsqlite3VdbeError(tls, p, ts+3666, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
 __868:
 	;
@@ -50069,12 +50070,12 @@ __876:
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5961,
+		ts+5980,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6013
+				return ts + 6032
 			}
-			return ts + 6018
+			return ts + 6037
 		}()))
 	goto abort_due_to_error
 	goto __879
@@ -50216,7 +50217,7 @@ __171:
 		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6025, libc.VaList(bp+144, z1))
+	Xsqlite3VdbeError(tls, p, ts+6044, libc.VaList(bp+144, z1))
 __894:
 	;
 	goto abort_due_to_error
@@ -50334,7 +50335,7 @@ __904:
 	(*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+6054, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6073, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
 	goto __9
 
 __177:
@@ -50423,7 +50424,7 @@ __912:
 	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)))
+	Xsqlite3VdbeError(tls, p, ts+3666, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
 __913:
 	;
@@ -50653,7 +50654,7 @@ __935:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
 		goto __940
 	}
-	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
+	Xsqlite3VdbeError(tls, p, ts+3666, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
 __940:
 	;
@@ -50729,7 +50730,7 @@ __945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
 		goto __947
 	}
-	z3 = Xsqlite3MPrintf(tls, db, ts+6064, libc.VaList(bp+168, zTrace))
+	z3 = Xsqlite3MPrintf(tls, db, ts+6083, 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)
@@ -50802,7 +50803,7 @@ __955:
 	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __957
 	}
-	rc = Xsqlite3CorruptError(tls, 99031)
+	rc = Xsqlite3CorruptError(tls, 99034)
 __957:
 	;
 __956:
@@ -50810,13 +50811,13 @@ __956:
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
 		goto __958
 	}
-	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
+	Xsqlite3VdbeError(tls, p, ts+3666, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
 __958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
 
-	Xsqlite3_log(tls, rc, ts+6070,
+	Xsqlite3_log(tls, rc, ts+6089,
 		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 __959
@@ -50872,13 +50873,13 @@ __966:
 	return rc
 
 too_big:
-	Xsqlite3VdbeError(tls, p, ts+5318, 0)
+	Xsqlite3VdbeError(tls, p, ts+5337, 0)
 	rc = SQLITE_TOOBIG
 	goto abort_due_to_error
 
 no_mem:
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3VdbeError(tls, p, ts+1474, 0)
+	Xsqlite3VdbeError(tls, p, ts+1493, 0)
 	rc = SQLITE_NOMEM
 	goto abort_due_to_error
 
@@ -50889,8 +50890,8 @@ abort_due_to_interrupt:
 	return int32(0)
 }
 
-var azType = [4]uintptr{ts + 6102, ts + 6111, ts + 6118,
-	ts + 6124}
+var azType = [4]uintptr{ts + 6121, ts + 6130, ts + 6137,
+	ts + 6143}
 var and_logic = [9]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(1), uint8(2), uint8(0), uint8(2), uint8(2)}
 var or_logic = [9]uint8{uint8(0), uint8(1), uint8(2), uint8(1), uint8(1), uint8(1), uint8(2), uint8(1), uint8(2)}
 var aMask = [12]uint8{
@@ -50945,16 +50946,16 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		}
 
 		if type1 < U32(12) {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6136,
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6155,
 				libc.VaList(bp, func() uintptr {
 					if type1 == U32(0) {
-						return ts + 6165
+						return ts + 6184
 					}
 					return func() uintptr {
 						if type1 == U32(7) {
-							return ts + 6170
+							return ts + 6189
 						}
-						return ts + 6175
+						return ts + 6194
 					}()
 				}()))
 			rc = SQLITE_ERROR
@@ -50974,10 +50975,10 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		rc = Xsqlite3_finalize(tls, (*Incrblob)(unsafe.Pointer(p)).FpStmt)
 		(*Incrblob)(unsafe.Pointer(p)).FpStmt = uintptr(0)
 		if rc == SQLITE_OK {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6183, libc.VaList(bp+8, iRow))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+6202, libc.VaList(bp+8, iRow))
 			rc = SQLITE_ERROR
 		} else {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3647, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+3666, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
 		}
 	}
 
@@ -51037,21 +51038,21 @@ __3:
 		goto __4
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6203, libc.VaList(bp, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6222, libc.VaList(bp, zTable))
 __4:
 	;
 	if !(pTab != 0 && !((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0))) {
 		goto __5
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6233, libc.VaList(bp+8, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6252, libc.VaList(bp+8, zTable))
 __5:
 	;
 	if !(pTab != 0 && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __6
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+6269, libc.VaList(bp+16, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+6288, libc.VaList(bp+16, zTable))
 __6:
 	;
 	if !!(pTab != 0) {
@@ -51095,7 +51096,7 @@ __11:
 		goto __13
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6290, libc.VaList(bp+24, zColumn))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6309, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51122,7 +51123,7 @@ __19:
 	if !((*sColMap)(unsafe.Pointer(pFKey+64+uintptr(j)*16)).FiFrom == iCol) {
 		goto __22
 	}
-	zFault = ts + 6311
+	zFault = ts + 6330
 __22:
 	;
 	goto __20
@@ -51155,7 +51156,7 @@ __26:
 	if !(int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == iCol || int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == -2) {
 		goto __29
 	}
-	zFault = ts + 6323
+	zFault = ts + 6342
 __29:
 	;
 	goto __27
@@ -51176,7 +51177,7 @@ __25:
 		goto __30
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6331, libc.VaList(bp+32, zFault))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6350, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51274,7 +51275,7 @@ __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
-			return ts + 3647
+			return ts + 3666
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
@@ -51322,7 +51323,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99516)
+		return Xsqlite3MisuseError(tls, 99519)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51405,7 +51406,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99616)
+		return Xsqlite3MisuseError(tls, 99619)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51418,7 +51419,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 				if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-					return ts + 3647
+					return ts + 3666
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
@@ -53928,25 +53929,25 @@ 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 {
+	if Xsqlite3_strnicmp(tls, zTab, ts+6384, 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 {
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6392+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6411+7) == 0 {
 			return 1
 		}
 		if pSchema == uintptr(0) {
 			return 0
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5867+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5886+7) == 0 {
 			return 1
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6411+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6430+7) == 0 {
 			return 1
 		}
 	} else {
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6411+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6430+7) == 0 {
 			return 1
 		}
 	}
@@ -54026,7 +54027,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6425, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6444, zDb) == 0) {
 		goto __8
 	}
 
@@ -54147,7 +54148,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6430) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6449) != 0) {
 		goto __33
 	}
 	goto __14
@@ -54321,14 +54322,14 @@ __60:
 	;
 	goto __59
 __58:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6432, zTab) == 0) {
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6451, zTab) == 0) {
 		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
 	goto __62
 __61:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6436, zTab) == 0) {
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6455, zTab) == 0) {
 		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
@@ -54345,7 +54346,7 @@ __57:
 		goto __64
 	}
 	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6440, zTab) == 0) {
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6459, zTab) == 0) {
 		goto __65
 	}
 	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
@@ -54504,7 +54505,7 @@ __86:
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
 		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6449, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6468, libc.VaList(bp, zAs))
 	return WRC_Abort
 __90:
 	;
@@ -54512,14 +54513,14 @@ __90:
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
 		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6480, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6499, libc.VaList(bp+8, zAs))
 	return WRC_Abort
 __91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
 		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6517, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6536, 0)
 	return WRC_Abort
 __92:
 	;
@@ -54571,7 +54572,7 @@ __11:
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6535, libc.VaList(bp+16, zCol))
+		ts+6554, 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
@@ -54608,7 +54609,7 @@ __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 + 6570
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6589
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
@@ -54621,23 +54622,23 @@ __101:
 __99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6579
+		zErr = ts + 6598
 	} else {
-		zErr = ts + 6594
+		zErr = ts + 6613
 	}
 	if !(zDb != 0) {
 		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6616, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6635, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
 	goto __105
 __104:
 	if !(zTab != 0) {
 		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6629, libc.VaList(bp+56, zErr, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp+56, zErr, zTab, zCol))
 	goto __107
 __106:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6639, libc.VaList(bp+80, zErr, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6658, libc.VaList(bp+80, zErr, zCol))
 __107:
 	;
 __105:
@@ -54740,15 +54741,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 + 6646
+	var zIn uintptr = ts + 6665
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6674
+		zIn = ts + 6693
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6692
+		zIn = ts + 6711
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6710
+		zIn = ts + 6729
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6728, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6747, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -54826,14 +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 + 6748
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
-				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6753
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
-				}
-				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
+				*(*int32)(unsafe.Pointer(pExpr + 8)) = libc.Bool32(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL)
+				*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IntValue)
+				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_INTEGER)
+
 				i = 0
 				p = pNC
 			__4:
@@ -54877,7 +54874,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+6759, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6767, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -54941,7 +54938,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+6776, libc.VaList(bp, pExpr))
+								ts+6784, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -54957,7 +54954,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+6840,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6848,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -54971,7 +54968,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+6876, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6884, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -54994,30 +54991,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+6904, libc.VaList(bp+16, pExpr))
+						ts+6912, 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 + 6947
+						zType = ts + 6955
 					} else {
-						zType = ts + 6954
+						zType = ts + 6962
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6964, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6972, 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+6992, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7000, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7014,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7022,
 						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+7058,
+						ts+7066,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -55089,15 +55086,15 @@ 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+7106, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7114, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
 
 				if nRef != (*NameContext)(unsafe.Pointer(pNC)).FnRef {
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_VarSelect)
-					*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_VarSelect
 				}
+				*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_Subquery
 			}
 			break
 
@@ -55105,7 +55102,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+7117, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7125, pExpr, pExpr)
 			}
 
 			break
@@ -55161,7 +55158,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+6517, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6536, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -55236,7 +55233,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7128, libc.VaList(bp, i, zType, mx))
+		ts+7136, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -55256,7 +55253,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+7184, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7192, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -55291,7 +55288,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+7218, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7226, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -55348,7 +55345,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+7224, libc.VaList(bp, i+1))
+				ts+7232, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -55376,7 +55373,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+7285, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7293, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -55590,7 +55587,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+7316, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7324, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -55630,7 +55627,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+7218) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7226) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -55641,7 +55638,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7355) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7363) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -55653,7 +55650,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+7361, 0)
+						ts+7369, 0)
 					return WRC_Abort
 				}
 
@@ -56442,7 +56439,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6517, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6536, 0)
 		return
 	}
 
@@ -56517,7 +56514,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+7420, libc.VaList(bp, mxHeight))
+			ts+7428, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -56766,12 +56763,12 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7468,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7476,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7512
+						return ts + 7520
 					}
-					return ts + 1538
+					return ts + 1557
 				}(), nElem))
 			break
 		}
@@ -56810,7 +56807,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+7514)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7522)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -56836,7 +56833,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+7516, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7524, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -56864,7 +56861,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+7550, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7558, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -56911,7 +56908,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+7570,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7578,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -56936,7 +56933,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+7613, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7621, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -57511,7 +57508,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+7636,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7644,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -57634,7 +57631,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+7666, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7674, libc.VaList(bp, zObject))
 	}
 }
 
@@ -57690,10 +57687,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+6748) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7697) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6753) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7702) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -58124,13 +58121,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+7689) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7708) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7697) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7716) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7703) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7722) == 0 {
 		return 1
 	}
 	return 0
@@ -58334,7 +58331,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+7707, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7726, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -58412,7 +58409,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+7754, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7773, 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)
 
@@ -58506,7 +58503,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 + 7785
+		var zFmt uintptr = ts + 7804
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -58524,7 +58521,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+6517, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6536, 0)
 	}
 }
 
@@ -58565,7 +58562,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+7829, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7848, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -58595,11 +58592,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+7852, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7871, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
-				return ts + 1538
+				return ts + 1557
 			}
-			return ts + 7871
+			return ts + 7890
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -58726,7 +58723,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+7883, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7902, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -58741,11 +58738,11 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7901, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7920, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
-			return ts + 1538
+			return ts + 1557
 		}
-		return ts + 7871
+		return ts + 7890
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
@@ -58768,7 +58765,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+7514)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7522)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -58777,7 +58774,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+7922)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7941)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -59163,13 +59160,13 @@ 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+7924, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7927,
+			if Xsqlite3_strnicmp(tls, z, ts+7943, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7946,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
-							return ts + 4916
+							return ts + 4935
 						}
-						return ts + 1538
+						return ts + 1557
 					}(), pExpr))
 			} else {
 				codeReal(tls, v, z, negFlag, iMem)
@@ -59206,6 +59203,7 @@ func Xsqlite3ExprCodeLoadIndexColumn(tls *libc.TLS, pParse uintptr, pIdx uintptr
 func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr, pCol uintptr, regOut int32) {
 	var iAddr int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
+	var nErr int32 = (*Parse)(unsafe.Pointer(pParse)).FnErr
 
 	if (*Parse)(unsafe.Pointer(pParse)).FiSelfTab > 0 {
 		iAddr = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Parse)(unsafe.Pointer(pParse)).FiSelfTab-1, 0, regOut)
@@ -59219,6 +59217,9 @@ func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr
 	if iAddr != 0 {
 		Xsqlite3VdbeJumpHere(tls, v, iAddr)
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr > nErr {
+		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FerrByteOffset = -1
+	}
 }
 
 // Generate code to extract the value of the iCol-th column of a table.
@@ -59240,7 +59241,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+7954,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7973,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -59413,8 +59414,8 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 7984, ts + 7989, ts + 7994, ts + 6175,
-				ts + 6170, ts + 8002}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8003, ts + 8008, ts + 8013, ts + 6194,
+				ts + 6189, ts + 8021}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
@@ -59422,7 +59423,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 8010
+						return ts + 8029
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -59437,6 +59438,7 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 	var p uintptr
 	var v uintptr
 	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+		var exprAff U8
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -59450,6 +59452,14 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 		if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr, iDataCur) != 0 {
 			continue
 		}
+
+		exprAff = U8(Xsqlite3ExprAffinity(tls, pExpr))
+		if int32(exprAff) <= SQLITE_AFF_BLOB && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_BLOB ||
+			int32(exprAff) == SQLITE_AFF_TEXT && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_TEXT ||
+			int32(exprAff) >= SQLITE_AFF_NUMERIC && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_NUMERIC {
+			continue
+		}
+
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 
 		if (*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow != 0 {
@@ -59789,7 +59799,7 @@ __73:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
 		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7954,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7973,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
 __76:
@@ -60022,7 +60032,7 @@ __43:
 		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+8015, libc.VaList(bp+8, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8034, libc.VaList(bp+8, pExpr))
 	goto __91
 __90:
 	return func() int32 {
@@ -60063,7 +60073,7 @@ __93:
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
 		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8042, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8061, libc.VaList(bp+16, pExpr))
 	goto __5
 __94:
 	;
@@ -60223,7 +60233,7 @@ __121:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
 		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7636,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7644,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
 __122:
 	;
@@ -60245,11 +60255,10 @@ __49:
 	return target
 
 __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) {
+	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) {
 		goto __123
 	}
+
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
 		goto __125
@@ -60289,7 +60298,7 @@ __126:
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6517, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6536, 0)
 	goto __5
 
 __55:
@@ -60320,13 +60329,19 @@ __129:
 	;
 __127:
 	;
-	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
+	addrINR = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable, 0, target)
 
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = U8(0)
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = okConstFactor
+	if !(inReg != target) {
+		goto __130
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
+	inReg = target
+__130:
+	;
 	Xsqlite3VdbeJumpHere(tls, v, addrINR)
-	Xsqlite3VdbeChangeP3(tls, v, addrINR, inReg)
 	goto __5
 
 __56:
@@ -60339,15 +60354,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __130
+		goto __131
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __131
+		goto __132
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__131:
+__132:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -60357,22 +60372,22 @@ __131:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__130:
+__131:
 	;
 	i1 = 0
-__132:
+__133:
 	if !(i1 < nExpr-1) {
-		goto __134
+		goto __135
 	}
 	if !(pX != 0) {
-		goto __135
+		goto __136
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __136
-__135:
-	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+	goto __137
 __136:
+	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+__137:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -60381,21 +60396,21 @@ __136:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __133
-__133:
-	i1 = i1 + 2
-	goto __132
 	goto __134
 __134:
+	i1 = i1 + 2
+	goto __133
+	goto __135
+__135:
 	;
 	if !(nExpr&1 != 0) {
-		goto __137
+		goto __138
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __138
-__137:
-	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+	goto __139
 __138:
+	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+__139:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -60405,27 +60420,27 @@ __138:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __139
-	}
-	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8066, 0)
-	return 0
-__139:
-	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __140
 	}
-	Xsqlite3MayAbort(tls, pParse)
+	Xsqlite3ErrorMsg(tls, pParse,
+		ts+8085, 0)
+	return 0
 __140:
 	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __141
 	}
+	Xsqlite3MayAbort(tls, pParse)
+__141:
+	;
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+		goto __142
+	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __142
-__141:
+	goto __143
+__142:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -60434,7 +60449,7 @@ __141:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__142:
+__143:
 	;
 	goto __5
 
@@ -60445,7 +60460,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8116))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8135))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -62237,11 +62252,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+6365, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6384, 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+8126, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8145, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -62253,13 +62268,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8154,
+		ts+8173,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8329,
+			ts+8348,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -62269,10 +62284,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8503, libc.VaList(bp, zDb, zDb))
+		ts+8522, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8650, 0)
+			ts+8669, 0)
 	}
 }
 
@@ -62336,7 +62351,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8801, libc.VaList(bp, zName))
+		ts+8820, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -62346,7 +62361,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8860, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8879, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -62355,7 +62370,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8866, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8885, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -62396,19 +62411,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8893, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8912, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9077,
+		ts+9096,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9382, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9401, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9398,
+		ts+9417,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -62416,7 +62431,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9456, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9475, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -62428,7 +62443,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9721, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9740, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -62440,7 +62455,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9734,
+		ts+9753,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -62486,12 +62501,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9772, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9791, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9804, 0)
+			ts+9823, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -62501,11 +62516,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+9831)
+				ts+9850)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9890)
+				ts+9909)
 		}
 
 		if pDflt != 0 {
@@ -62518,12 +62533,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9943)
+					ts+9962)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9989)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10008)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -62534,7 +62549,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10016,
+			ts+10035,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -62556,7 +62571,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+10162,
+				ts+10181,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -62604,14 +62619,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10392, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10411, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10426, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10445, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -62639,7 +62654,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+10456, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10475, 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
 	}
@@ -62679,18 +62694,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 + 10475
+		zType = ts + 10494
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10480
+		zType = ts + 10499
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10494,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10513,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10512
+					return ts + 10531
 				}
-				return ts + 10529
+				return ts + 10548
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -62774,11 +62789,11 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10547, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10566, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1538, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1557, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iSchema == 1))
 
 	Xsqlite3MayAbort(tls, pParse)
@@ -62791,17 +62806,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10568,
+		ts+10587,
 		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+10750,
+		ts+10769,
 		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+9721, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9740, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63059,12 +63074,12 @@ 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+10881,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10900,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10904
+				return ts + 10923
 			}
-			return ts + 1538
+			return ts + 1557
 		}(), zWhen,
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg))
 	Xsqlite3_result_error(tls, pCtx, zErr, -1)
@@ -63104,8 +63119,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+10906, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 113494)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10925, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113516)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -63122,7 +63137,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, 113505)
+		rc = Xsqlite3CorruptError(tls, 113527)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -63144,7 +63159,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+10914, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10933, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -63184,12 +63199,12 @@ 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+10920, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10939, 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 + 10904
+							return ts + 10923
 						}
-						return ts + 1538
+						return ts + 1557
 					}()))
 				zReplace = zBuf2
 				nReplace = U32(Xsqlite3Strlen30(tls, zReplace))
@@ -63675,7 +63690,7 @@ __45:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FzErrMsg != 0) {
 		goto __47
 	}
-	renameColumnParseError(tls, context, ts+1538, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
+	renameColumnParseError(tls, context, ts+1557, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
 	goto __48
 __47:
 	Xsqlite3_result_error_code(tls, context, rc)
@@ -63840,7 +63855,7 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 			if rc == SQLITE_ERROR && Xsqlite3WritableSchema(tls, db) != 0 {
 				Xsqlite3_result_value(tls, context, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 			} else if (*Parse)(unsafe.Pointer(bp+80)).FzErrMsg != 0 {
-				renameColumnParseError(tls, context, ts+1538, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
+				renameColumnParseError(tls, context, ts+1557, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
 			} else {
 				Xsqlite3_result_error_code(tls, context, rc)
 			}
@@ -64043,7 +64058,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 114441)
+	rc = Xsqlite3CorruptError(tls, 114463)
 	goto drop_column_done
 __2:
 	;
@@ -64067,7 +64082,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10925, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10944, 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)
 
@@ -64148,19 +64163,19 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10547, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10566, 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+10932,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10951,
 		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 + 10960
+				return ts + 10979
 			}
-			return ts + 6111
+			return ts + 6130
 		}(),
 			zCol))
 	goto exit_drop_column
@@ -64169,7 +64184,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10972, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10991, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -64183,13 +64198,13 @@ __8:
 	goto exit_drop_column
 __9:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1538, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1557, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11020, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11039, 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+11141, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11160, 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
@@ -64307,11 +64322,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 + 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}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11178},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11199},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11219},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11238},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11257}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -64345,7 +64360,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+11261, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11280, 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)
 			}
@@ -64354,10 +64369,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+11284,
+					ts+11303,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11314, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11333, 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)
 			}
@@ -64375,9 +64390,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11332, FzCols: ts + 11345},
-	{FzName: ts + 11358, FzCols: ts + 11371},
-	{FzName: ts + 11399},
+	{FzName: ts + 11351, FzCols: ts + 11364},
+	{FzName: ts + 11377, FzCols: ts + 11390},
+	{FzName: ts + 11418},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -64567,7 +64582,7 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11412}
+	FzName:     ts + 11431}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
@@ -64818,7 +64833,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11422}
+	FzName:     ts + 11441}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -64832,7 +64847,7 @@ 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+11432,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11451,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
 					return (*StatAccum)(unsafe.Pointer(p)).FnEst
@@ -64845,7 +64860,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11437, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11456, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -64887,7 +64902,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+11443, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11462, 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--
@@ -64901,7 +64916,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11449}
+	FzName:     ts + 11468}
 
 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)
@@ -64945,7 +64960,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+11458, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11477, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -64962,7 +64977,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+11332, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11351, 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)
@@ -65118,7 +65133,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+11468, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11487, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -65175,7 +65190,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+11468, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11487, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -65222,9 +65237,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+11472)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11491)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11476)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11495)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -65307,7 +65322,7 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 	var v TRowcnt
 
 	if z == uintptr(0) {
-		z = ts + 1538
+		z = ts + 1557
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
 		v = uint64(0)
@@ -65329,15 +65344,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+11480, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11499, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11491, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11510, 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+11501, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11520, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -65613,11 +65628,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+11358, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11377, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11513,
-			ts+11567,
+			ts+11532,
+			ts+11586,
 			zDb)
 	}
 	return rc
@@ -65664,10 +65679,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+11332, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11351, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11619, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11638, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -65725,7 +65740,7 @@ 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+6425, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6444, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -65758,13 +65773,13 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zFile == uintptr(0)) {
 		goto __1
 	}
-	zFile = ts + 1538
+	zFile = ts + 1557
 __1:
 	;
 	if !(zName == uintptr(0)) {
 		goto __2
 	}
-	zName = ts + 1538
+	zName = ts + 1557
 __2:
 	;
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2)) != 0) {
@@ -65772,14 +65787,14 @@ __2:
 	}
 
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3819)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3838)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11660, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11679, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
 	if !(rc == SQLITE_OK) {
 		goto __6
 	}
@@ -65816,7 +65831,7 @@ __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11663,
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11682,
 		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
@@ -65830,7 +65845,7 @@ __12:
 	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __15
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11700, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11719, libc.VaList(bp+8, zName))
 	goto attach_error
 __15:
 	;
@@ -65894,7 +65909,7 @@ __4:
 		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11730, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11749, 0)
 	goto __23
 __22:
 	if !(rc == SQLITE_OK) {
@@ -65911,7 +65926,7 @@ __25:
 		goto __27
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
-		ts+11759, 0)
+		ts+11778, 0)
 	rc = SQLITE_ERROR
 __27:
 	;
@@ -65977,13 +65992,13 @@ __33:
 	}
 	Xsqlite3OomFault(tls, db)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1474, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1493, 0)
 	goto __35
 __34:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
 		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11827, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11846, libc.VaList(bp+16, zFile))
 __36:
 	;
 __35:
@@ -66030,7 +66045,7 @@ func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zName == uintptr(0)) {
 		goto __1
 	}
-	zName = ts + 1538
+	zName = ts + 1557
 __1:
 	;
 	i = 0
@@ -66061,14 +66076,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11855, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11874, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11876, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11895, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -66076,7 +66091,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11902, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11921, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -66193,7 +66208,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11924}
+	FzName:     ts + 11943}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -66206,7 +66221,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11938}
+	FzName:     ts + 11957}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -66220,7 +66235,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+11952, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11971, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -66252,7 +66267,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+11976,
+						ts+11995,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -66427,7 +66442,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+12022, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12041, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -66453,11 +66468,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+12045, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12064, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12051, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12070, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12057, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12076, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -66504,7 +66519,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 + 7697
+		zCol = ts + 7716
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -66528,7 +66543,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+12084, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12103, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -66799,25 +66814,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6425) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6444) == 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+6365, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6384, 7) == 0 {
 			if i == 1 {
-				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 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6411+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6430+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5886+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+6373)
+						ts+6392)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6411+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6430+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+5867)
+						ts+5886)
 				}
 			}
 		}
@@ -66838,12 +66853,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		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 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6384, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6430+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+6411+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+6373)
+					ts+6392)
 			}
 		}
 	}
@@ -66874,7 +66889,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+12099, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12118, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -66892,14 +66907,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 + 12107
+			zMsg = ts + 12126
 		} else {
-			zMsg = ts + 12120
+			zMsg = ts + 12139
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6629, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6639, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6658, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -66929,12 +66944,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+6365, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5867+7) == 0 {
-			return ts + 6411
+	if Xsqlite3_strnicmp(tls, zName, ts+6384, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5886+7) == 0 {
+			return ts + 6430
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6373+7) == 0 {
-			return ts + 6392
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6392+7) == 0 {
+			return ts + 6411
 		}
 	}
 	return zName
@@ -67292,7 +67307,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+5867)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5886)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -67318,7 +67333,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6425, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6444, zName) {
 				goto __3
 			}
 
@@ -67371,13 +67386,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+12134, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12153, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12151, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12170, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -67415,13 +67430,13 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 		if Xsqlite3_stricmp(tls, zType, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit))) != 0 ||
 			Xsqlite3_stricmp(tls, zName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 1*8))) != 0 ||
 			Xsqlite3_stricmp(tls, zTblName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 2*8))) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1538, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1557, 0)
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6365, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6384, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12171,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12190,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -67581,9 +67596,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 + 6373
+			return ts + 6392
 		}
-		return ts + 5867
+		return ts + 5886
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -67599,7 +67614,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12213, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12232, 0)
 	return
 __4:
 	;
@@ -67627,9 +67642,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10475
+			return ts + 10494
 		}
-		return ts + 8860
+		return ts + 8879
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -67645,9 +67660,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 + 6373
+			return ts + 6392
 		}
-		return ts + 5867
+		return ts + 5886
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -67678,12 +67693,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12254,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12273,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10475
+				return ts + 10494
 			}
-			return ts + 8860
+			return ts + 8879
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -67698,7 +67713,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12275, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12294, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -67785,7 +67800,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+12310, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12329, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -67809,7 +67824,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+12327, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12346, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -67829,7 +67844,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 + 12310
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12329
 	(*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)
@@ -67841,7 +67856,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+12310, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12329, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -67875,7 +67890,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+12361, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12380, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -67883,13 +67898,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+12384, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12403, 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+12391, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12410, 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--
@@ -67926,7 +67941,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+12401, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12420, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -68090,10 +68105,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+12427,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12446,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12472, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12491, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -68124,7 +68139,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+12513, 0)
+			ts+12532, 0)
 	}
 }
 
@@ -68169,7 +68184,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12565, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12584, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -68258,7 +68273,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12606, 0)
+		ts+12625, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -68353,7 +68368,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12662, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12681, 0)
 	goto generated_done
 __2:
 	;
@@ -68366,13 +68381,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12705, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12724, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12713, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12732, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -68406,13 +68421,19 @@ __10:
 
 	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
 __11:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_RAISE) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = (*Column)(unsafe.Pointer(pCol)).Faffinity
+__12:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12720,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12739,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -68533,13 +68554,13 @@ __3:
 	;
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
-		zSep = ts + 1538
-		zSep2 = ts + 12751
-		zEnd = ts + 4941
+		zSep = ts + 1557
+		zSep2 = ts + 12770
+		zEnd = ts + 4960
 	} else {
-		zSep = ts + 12753
-		zSep2 = ts + 12757
-		zEnd = ts + 12762
+		zSep = ts + 12772
+		zSep2 = ts + 12776
+		zEnd = ts + 12781
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -68547,7 +68568,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12765, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12784, 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('(')
@@ -68581,17 +68602,17 @@ __5:
 	goto __6
 __6:
 	;
-	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3647, libc.VaList(bp, zEnd))
+	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+3666, libc.VaList(bp, zEnd))
 	return zStmt
 }
 
 var azType1 = [6]uintptr{
-	ts + 1538,
-	ts + 12779,
-	ts + 12785,
-	ts + 12790,
-	ts + 12795,
-	ts + 12785,
+	ts + 1557,
+	ts + 12798,
+	ts + 12804,
+	ts + 12809,
+	ts + 12814,
+	ts + 12804,
 }
 
 func resizeIndexObject(tls *libc.TLS, db uintptr, pIdx uintptr, N int32) int32 {
@@ -68981,7 +69002,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
 		if pSelect != 0 || !(int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM) && (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1538, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1557, 0)
 			return
 		}
 		(*Table)(unsafe.Pointer(p)).Ftnum = (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum
@@ -68998,10 +69019,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+12801,
-						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1538)))
+						ts+12820,
+						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1557)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12834,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12853,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -69020,11 +69041,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+12861, 0)
+				ts+12880, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12911, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12930, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -69058,7 +69079,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12943, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12962, 0)
 			return
 		}
 	}
@@ -69083,11 +69104,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 + 8860
-			zType2 = ts + 12987
+			zType = ts + 8879
+			zType2 = ts + 13006
 		} else {
-			zType = ts + 10475
-			zType2 = ts + 12993
+			zType = ts + 10494
+			zType2 = ts + 13012
 		}
 
 		if pSelect != 0 {
@@ -69158,11 +69179,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+12998, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13017, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13013,
+			ts+13032,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -69178,13 +69199,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+13111,
+					ts+13130,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13153, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13172, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -69199,7 +69220,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+9382) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9401) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -69229,7 +69250,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+13187, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13206, 0)
 	goto create_view_fail
 __1:
 	;
@@ -69245,7 +69266,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10475, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10494, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -69327,7 +69348,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13223, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13242, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -69452,13 +69473,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+13253, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13272, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13268,
+		ts+13287,
 		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)
 }
@@ -69499,10 +69520,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+13335, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13354, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11284,
+				ts+11303,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -69534,12 +69555,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+13349,
+			ts+13368,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13394,
+		ts+13413,
 		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)
@@ -69567,11 +69588,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+6365, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3270, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6384, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3289, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7117, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7125, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -69649,9 +69670,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6373
+			return ts + 6392
 		}
-		return ts + 5867
+		return ts + 5886
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -69710,21 +69731,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13461, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13480, 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+13489, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13508, 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+13523, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13542, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -69736,7 +69757,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11476, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11495, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -69800,7 +69821,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13555,
+		ts+13574,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -69812,7 +69833,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13618, 0)
+		ts+13637, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -69897,7 +69918,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13712,
+		ts+13731,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -70124,12 +70145,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+13758,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13777,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13786
+							return ts + 13805
 						}
-						return ts + 13792
+						return ts + 13811
 					}()))
 				return 1
 			}
@@ -70250,7 +70271,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13797, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13816, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -70269,7 +70290,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13803,
+		ts+13822,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -70295,26 +70316,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6365, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6384, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13853, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13872, 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+13881, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13900, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13906, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13925, 0)
 	goto exit_create_index
 __17:
 	;
@@ -70328,7 +70349,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13797, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13816, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -70343,7 +70364,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13940, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13959, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -70355,7 +70376,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13974, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13993, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -70384,7 +70405,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+13998, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14017, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -70405,9 +70426,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6373
+			return ts + 6392
 		}
-		return ts + 5867
+		return ts + 5886
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -70446,7 +70467,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13797)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13816)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -70547,7 +70568,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14021, 0)
+		ts+14040, 0)
 	goto exit_create_index
 __56:
 	;
@@ -70764,7 +70785,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14082, libc.VaList(bp+48, 0))
+		ts+14101, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -70816,8 +70837,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14124, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14143, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121859)
 	goto exit_create_index
 __101:
 	;
@@ -70863,12 +70884,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14141,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14160,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
-				return ts + 1538
+				return ts + 1557
 			}
-			return ts + 14161
+			return ts + 14180
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -70876,7 +70897,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14169,
+		ts+14188,
 		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,
@@ -70890,7 +70911,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14228, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14247, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -71051,7 +71072,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14255, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14274, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -71066,7 +71087,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14273, libc.VaList(bp+8, 0))
+		ts+14292, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -71077,9 +71098,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 + 6373
+			return ts + 6392
 		}
-		return ts + 5867
+		return ts + 5886
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -71105,9 +71126,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14346,
+		ts+14365,
 		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+11472, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11491, (*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)
@@ -71242,7 +71263,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+14406,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14425,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -71450,12 +71471,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+14442,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14461,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14478
+				return ts + 14497
 			}
-			return ts + 14481
+			return ts + 14500
 		}()))
 	goto append_from_error
 __1:
@@ -71624,7 +71645,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14487, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14506, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -71660,9 +71681,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14493
+				return ts + 14512
 			}
-			return ts + 14502
+			return ts + 14521
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -71687,7 +71708,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14487, ts + 14509, ts + 14493}
+var az = [3]uintptr{ts + 14506, ts + 14528, ts + 14512}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -71702,7 +71723,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+14517, 0)
+				ts+14536, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -71839,17 +71860,17 @@ 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+14587, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14606, 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+14598, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14617, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
-			Xsqlite3_str_append(tls, bp+8, ts+1551, 1)
+			Xsqlite3_str_append(tls, bp+8, ts+1570, 1)
 			Xsqlite3_str_appendall(tls, bp+8, zCol)
 		}
 	}
@@ -71872,11 +71893,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+12045, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12064, 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+14601, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14620, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -72006,7 +72027,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14610, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14629, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -72102,7 +72123,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+14656, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14675, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -72295,7 +72316,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14686, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14705, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -72575,7 +72596,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+14717,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14736,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -72607,11 +72628,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+14750, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14769, 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+14779, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14798, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -72862,7 +72883,7 @@ __20:
 	goto __16
 __15:
 	wcf = U16(WHERE_ONEPASS_DESIRED | WHERE_DUPLICATES_OK)
-	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_VarSelect != 0) {
+	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_Subquery != 0) {
 		goto __23
 	}
 	bComplex = 1
@@ -73115,7 +73136,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14817)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14836)
 __62:
 	;
 delete_from_cleanup:
@@ -73230,7 +73251,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+11332) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11351) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -73460,7 +73481,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 + 7989, ts + 7984, ts + 6165}
+var azType2 = [5]uintptr{ts + 6194, ts + 6189, ts + 8008, ts + 8003, ts + 6184}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -73519,7 +73540,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+14830, -1)
+					Xsqlite3_result_error(tls, context, ts+14849, -1)
 					return
 				}
 				iVal = -iVal
@@ -73823,7 +73844,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14847, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14866, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -74169,7 +74190,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+14852, -1)
+		Xsqlite3_result_error(tls, context, ts+14871, -1)
 		return
 	}
 	if argc == 3 {
@@ -74179,7 +74200,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+14885, -1)
+				ts+14904, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -74232,7 +74253,7 @@ func errlogFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	_ = argc
 	_ = context
-	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3647, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
+	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+3666, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
 }
 
 func compileoptionusedFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
@@ -74272,13 +74293,13 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 
 			var zVal uintptr
 			r1 = Xsqlite3_value_double(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+4909, libc.VaList(bp, r1))
+			Xsqlite3_str_appendf(tls, pStr, ts+4928, libc.VaList(bp, r1))
 			zVal = Xsqlite3_str_value(tls, pStr)
 			if zVal != 0 {
 				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+14930, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14949, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -74286,7 +74307,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 		}
 	case SQLITE_INTEGER:
 		{
-			Xsqlite3_str_appendf(tls, pStr, ts+1318, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
+			Xsqlite3_str_appendf(tls, pStr, ts+1337, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
 			break
 
 		}
@@ -74315,13 +74336,13 @@ 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+14937, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14956, libc.VaList(bp+24, zArg))
 			break
 
 		}
 	default:
 		{
-			Xsqlite3_str_append(tls, pStr, ts+1539, 4)
+			Xsqlite3_str_append(tls, pStr, ts+1558, 4)
 			break
 
 		}
@@ -74462,7 +74483,7 @@ func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 	var ch U32
 	var c U8
 	var d U8
-	zPass = ts + 1538
+	zPass = ts + 1557
 	nPass = 0
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -74744,7 +74765,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10904}
+var azOne = [1]uintptr{ts + 10923}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -74756,7 +74777,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	zIn = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	if zIn == uintptr(0) {
-		zIn = ts + 1538
+		zIn = ts + 1557
 	}
 	for i = 0; *(*U8)(unsafe.Pointer(zIn + uintptr(i))) != 0 && !(int32(Xsqlite3CtypeMap[*(*U8)(unsafe.Pointer(zIn + uintptr(i)))])&0x02 != 0); i++ {
 	}
@@ -74780,7 +74801,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+14940, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14959, 4, uintptr(0))
 	}
 }
 
@@ -74805,7 +74826,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+12084, -1)
+		Xsqlite3_result_error(tls, context, ts+12103, -1)
 		return
 	}
 
@@ -74883,7 +74904,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+14830, -1)
+			Xsqlite3_result_error(tls, context, ts+14849, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -75145,7 +75166,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+14945, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14964, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -75165,14 +75186,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14951, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14970, 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+14951, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14970, 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+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)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14970, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14970, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -75413,109 +75434,109 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 }
 
 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 + 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(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(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 + 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_compare)), FxSFunc: 0, FzName: ts + 14995},
+	{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 + 15008},
+	{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 + 15026},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15035},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15043},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15043},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15058},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15084},
+	{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(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 + 15118},
+	{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 + 15129},
+	{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 + 15136},
+	{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 + 15150},
+	{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 + 15150},
+	{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 + 15156},
+	{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 + 15156},
+	{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 + 15162},
+	{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 + 15162},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15167},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15167},
+	{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 + 15167},
+	{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 + 15171},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15171},
+	{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 + 15171},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15175},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15182},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15190},
+	{FnArg: int8(2), 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 + 15203},
+	{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 + 15217},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15225},
+	{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 + 15234},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15234},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15240},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15246},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15252},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15256},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15256},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15262},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15269},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15276},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15287},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15294},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15309},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15326},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15337},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15343},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15361},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15369},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15383},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15391},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15400},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15400},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15407},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 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 + 15417},
+	{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 + 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},
+	{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 + 15431},
+	{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 + 15431},
+	{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 + 15437},
+	{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 + 15437},
+	{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 + 15450},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14970},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14970},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6589},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6589},
 	{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(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15460},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15468},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15474},
+	{FnArg: int8(1), 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 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15483},
+	{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 + 15487},
+	{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 + 15493},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15483},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15498},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15502},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15506},
 	{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 + 15516},
+	{FnArg: int8(1), 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 + 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(2), 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 + 15537},
+	{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 + 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 + 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 + 15559},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15564},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15570},
 	{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}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15582},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15587},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15595},
+	{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 + 15606},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6589},
+	{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 + 15611}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -75636,7 +75657,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+15615,
 				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)
@@ -76296,8 +76317,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 + 6436, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6432, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6455, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6451, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -76376,7 +76397,7 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 			(*Token)(unsafe.Pointer(bp + 80)).Fz = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 			(*Token)(unsafe.Pointer(bp + 80)).Fn = uint32(Xsqlite3Strlen30(tls, (*Token)(unsafe.Pointer(bp+80)).Fz))
 
-			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5120)
+			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+5139)
 			if pRaise != 0 {
 				(*Expr)(unsafe.Pointer(pRaise)).FaffExpr = int8(OE_Abort)
 			}
@@ -76797,7 +76818,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7954, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7973, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -77265,7 +77286,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15641,
+		ts+15660,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -77290,7 +77311,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15682,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15701,
 		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
@@ -77439,7 +77460,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15714,
+		ts+15733,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -77449,7 +77470,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+15785, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -77501,7 +77522,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15791,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15810,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -77509,7 +77530,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15837, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15856, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -77921,7 +77942,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15858)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15877)
 __125:
 	;
 insert_cleanup:
@@ -78237,7 +78258,7 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 					fallthrough
 				case OE_Fail:
 					{
-						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12045, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12064, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 							(*Column)(unsafe.Pointer(pCol)).FzCnName))
 
 						Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
@@ -79328,13 +79349,13 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131895)
+	return Xsqlite3MisuseError(tls, 131931)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
 		goto __2
 	}
-	zSql = ts + 1538
+	zSql = ts + 1557
 __2:
 	;
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -79813,7 +79834,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12084, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12103, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -79822,7 +79843,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15872
+		zEntry = ts + 15891
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -79837,7 +79858,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+12045, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12064, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -79873,7 +79894,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15895, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15914, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -79887,7 +79908,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15904, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15923, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -79911,7 +79932,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15908, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15927, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -79929,7 +79950,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15914, libc.VaList(bp+16, zEntry, zFile))
+		ts+15933, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -79956,7 +79977,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+15976, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -79994,7 +80015,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15989, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16008, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -80004,7 +80025,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16026,
+	ts + 16045,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80160,7 +80181,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+16048, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -80168,63 +80189,63 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 }
 
 var pragCName = [57]uintptr{
-	ts + 5041,
-	ts + 16068,
-	ts + 8860,
-	ts + 16072,
-	ts + 16077,
-	ts + 16080,
-	ts + 16090,
-	ts + 16100,
-	ts + 16106,
-	ts + 16110,
-	ts + 16115,
-	ts + 16120,
-	ts + 16128,
+	ts + 5060,
+	ts + 16087,
+	ts + 8879,
+	ts + 16091,
+	ts + 16096,
+	ts + 16099,
+	ts + 16109,
+	ts + 16119,
+	ts + 16125,
+	ts + 16129,
+	ts + 16134,
 	ts + 16139,
-	ts + 16142,
-	ts + 16149,
-	ts + 16110,
-	ts + 16115,
-	ts + 16156,
+	ts + 16147,
+	ts + 16158,
 	ts + 16161,
-	ts + 16164,
-	ts + 16171,
-	ts + 16106,
-	ts + 16110,
-	ts + 16177,
-	ts + 16182,
-	ts + 16187,
-	ts + 16110,
-	ts + 16191,
-	ts + 16115,
-	ts + 16199,
-	ts + 16203,
-	ts + 16208,
-	ts + 11476,
-	ts + 11472,
-	ts + 16214,
-	ts + 16219,
-	ts + 16224,
-	ts + 16068,
-	ts + 16110,
-	ts + 16229,
-	ts + 16236,
+	ts + 16168,
+	ts + 16129,
+	ts + 16134,
+	ts + 16175,
+	ts + 16180,
+	ts + 16183,
+	ts + 16190,
+	ts + 16125,
+	ts + 16129,
+	ts + 16196,
+	ts + 16201,
+	ts + 16206,
+	ts + 16129,
+	ts + 16210,
+	ts + 16134,
+	ts + 16218,
+	ts + 16222,
+	ts + 16227,
+	ts + 11495,
+	ts + 11491,
+	ts + 16233,
+	ts + 16238,
 	ts + 16243,
-	ts + 8860,
-	ts + 16251,
-	ts + 5044,
-	ts + 16257,
-	ts + 16068,
-	ts + 16110,
+	ts + 16087,
+	ts + 16129,
+	ts + 16248,
+	ts + 16255,
 	ts + 16262,
-	ts + 16267,
-	ts + 15464,
-	ts + 16272,
-	ts + 16285,
-	ts + 16294,
-	ts + 16301,
-	ts + 16312,
+	ts + 8879,
+	ts + 16270,
+	ts + 5063,
+	ts + 16276,
+	ts + 16087,
+	ts + 16129,
+	ts + 16281,
+	ts + 16286,
+	ts + 15483,
+	ts + 16291,
+	ts + 16304,
+	ts + 16313,
+	ts + 16320,
+	ts + 16331,
 }
 
 // Definitions of all built-in pragmas
@@ -80242,238 +80263,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16320,
+	{FzName: ts + 16339,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16335,
+	{FzName: ts + 16354,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16350,
+	{FzName: ts + 16369,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16362,
+	{FzName: ts + 16381,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16378,
+	{FzName: ts + 16397,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16301,
+	{FzName: ts + 16320,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16391,
+	{FzName: ts + 16410,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16403,
+	{FzName: ts + 16422,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16423,
+	{FzName: ts + 16442,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CellSizeCk)},
-	{FzName: ts + 16439,
+	{FzName: ts + 16458,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16460,
+	{FzName: ts + 16479,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16475,
+	{FzName: ts + 16494,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16491,
+	{FzName: ts + 16510,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16505,
+	{FzName: ts + 16524,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16518,
+	{FzName: ts + 16537,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16532,
+	{FzName: ts + 16551,
 		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,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_DeferFKs)},
 	{FzName: ts + 16570,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_DeferFKs)},
+	{FzName: ts + 16589,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16593,
+	{FzName: ts + 16612,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16602,
+	{FzName: ts + 16621,
 		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 + 16639,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16637,
+	{FzName: ts + 16656,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16650,
+	{FzName: ts + 16669,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16665,
+	{FzName: ts + 16684,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16683,
+	{FzName: ts + 16702,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16693,
+	{FzName: ts + 16712,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16707,
+	{FzName: ts + 16726,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16723,
+	{FzName: ts + 16742,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16748,
+	{FzName: ts + 16767,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16767,
+	{FzName: ts + 16786,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16778,
+	{FzName: ts + 16797,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16789,
+	{FzName: ts + 16808,
 		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 + 16820,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16817,
+	{FzName: ts + 16836,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16830,
+	{FzName: ts + 16849,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16849,
+	{FzName: ts + 16868,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16868,
+	{FzName: ts + 16887,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16881,
+	{FzName: ts + 16900,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16896,
+	{FzName: ts + 16915,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16906,
+	{FzName: ts + 16925,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16918,
+	{FzName: ts + 16937,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16927,
+	{FzName: ts + 16946,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16938,
+	{FzName: ts + 16957,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16948,
+	{FzName: ts + 16967,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16960,
+	{FzName: ts + 16979,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16971,
+	{FzName: ts + 16990,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16983,
+	{FzName: ts + 17002,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17000,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_RecTriggers)},
 	{FzName: ts + 17019,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_RecTriggers)},
+	{FzName: ts + 17038,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17045,
+	{FzName: ts + 17064,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17060,
+	{FzName: ts + 17079,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17074,
+	{FzName: ts + 17093,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17093,
+	{FzName: ts + 17112,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17107,
+	{FzName: ts + 17126,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17123,
+	{FzName: ts + 17142,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17135,
+	{FzName: ts + 17154,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17146,
+	{FzName: ts + 17165,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17157,
+	{FzName: ts + 17176,
 		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 + 17188,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17180,
+	{FzName: ts + 17199,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17201,
+	{FzName: ts + 17220,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17209,
+	{FzName: ts + 17228,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17224,
+	{FzName: ts + 17243,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17237,
-		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
 	{FzName: ts + 17256,
+		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
+	{FzName: ts + 17275,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17271,
+	{FzName: ts + 17290,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -80495,7 +80516,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 + 17306))
 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)}
@@ -80507,10 +80528,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+17331) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17322) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17341) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -80519,13 +80540,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+8010) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8029) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17329) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17348) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17334) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17353) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -80540,9 +80561,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+16281) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17346) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17365) == 0 {
 		return 2
 	} else {
 		return 0
@@ -80556,7 +80577,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+17372, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -80647,19 +80668,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17415
+		zName = ts + 17434
 		break
 	case OE_SetDflt:
-		zName = ts + 17424
+		zName = ts + 17443
 		break
 	case OE_Cascade:
-		zName = ts + 17436
+		zName = ts + 17455
 		break
 	case OE_Restrict:
-		zName = ts + 17444
+		zName = ts + 17463
 		break
 	default:
-		zName = ts + 17453
+		zName = ts + 17472
 		break
 	}
 	return zName
@@ -80676,7 +80697,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 + 17482, ts + 17489, ts + 17497, ts + 17501, ts + 17365, ts + 17510,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -80723,13 +80744,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 + 17514
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17497
+			zType = ts + 17516
 		} else {
-			zType = ts + 7512
+			zType = ts + 7520
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17499,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17518,
 			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),
@@ -80737,7 +80758,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 + 17525, ts + 17530, ts + 17538}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -80888,6 +80909,7 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp7 int32
 	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
@@ -80984,7 +81006,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17527, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17546, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -81023,7 +81045,7 @@ __8:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 488)) != 0) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+3647, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+3666, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 488))))
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 488)))
 __10:
 	;
@@ -81245,7 +81267,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17531) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17550) == 0) {
 		goto __64
 	}
 	b = 2
@@ -81317,7 +81339,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17322
+	zRet = ts + 17341
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -81355,7 +81377,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17312
+	zRet = ts + 17331
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -81605,7 +81627,7 @@ __116:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 544)) == 0) {
 		goto __119
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17536, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17555, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __119:
@@ -81624,7 +81646,7 @@ __120:
 	if !(*(*int8)(unsafe.Pointer(zRight)) != 0) {
 		goto __121
 	}
-	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+16, zRight))
+	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+16, zRight))
 	goto __122
 __121:
 	Xsqlite3_temp_directory = uintptr(0)
@@ -81646,7 +81668,7 @@ __123:
 		goto __125
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17561, 0)
+		ts+17580, 0)
 	goto __126
 __125:
 	if !(iDb != 1) {
@@ -81700,7 +81722,7 @@ __132:
 __134:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17614) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17633) == 0) {
 		goto __135
 	}
 
@@ -81797,13 +81819,13 @@ __148:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17620
+			return ts + 17639
 		}
-		return ts + 17628
+		return ts + 17647
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
-			Xsqlite3ColumnType(tls, pCol, ts+1538),
+			Xsqlite3ColumnType(tls, pCol, ts+1557),
 			func() int32 {
 				if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 {
 					return 1
@@ -81868,7 +81890,7 @@ __163:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __164
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17635, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17654, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __165
 	}
@@ -81881,7 +81903,7 @@ __165:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __166
 	}
-	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1474, 0)
+	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1493, 0)
 	(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 __166:
 	;
@@ -81914,29 +81936,29 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __171
 	}
-	zType = ts + 10475
+	zType = ts + 10494
 	goto __172
 __171:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __173
 	}
-	zType = ts + 12705
+	zType = ts + 12724
 	goto __174
 __173:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __175
 	}
-	zType = ts + 17651
+	zType = ts + 17670
 	goto __176
 __175:
-	zType = ts + 8860
+	zType = ts + 8879
 __176:
 	;
 __174:
 	;
 __172:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17658,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17677,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii3)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -82002,7 +82024,7 @@ __183:
 		goto __185
 	}
 	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+17684, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -82012,7 +82034,7 @@ __183:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __186
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17670,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17689,
 		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))))
@@ -82049,8 +82071,8 @@ __189:
 	if !(pIdx1 != 0) {
 		goto __191
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 560)) = [3]uintptr{ts + 17675, ts + 17677, ts + 16139}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17679,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 560)) = [3]uintptr{ts + 17694, ts + 17696, ts + 16158}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17698,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -82083,7 +82105,7 @@ __192:
 	goto __193
 __195:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17685,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17704,
 		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)))
@@ -82105,7 +82127,7 @@ __196:
 		goto __198
 	}
 	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+17708, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __197
 __197:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -82169,7 +82191,7 @@ __208:
 		goto __210
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7512, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7520, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __209
 __209:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -82185,7 +82207,7 @@ __211:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __213
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7512, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7520, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __212
 __212:
 	i6++
@@ -82220,7 +82242,7 @@ __219:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __221
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17692,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17711,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -82228,7 +82250,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+17701))
+			ts+17720))
 	goto __220
 __220:
 	j2++
@@ -82417,7 +82439,7 @@ __249:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __250:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17706, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17725, 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)))
@@ -82634,7 +82656,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+17710, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17729, 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)
@@ -82745,7 +82767,7 @@ __300:
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17734,
+		ts+17753,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
@@ -82844,7 +82866,7 @@ __314:
 	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+17789, 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) {
@@ -82866,7 +82888,7 @@ __319:
 
 	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+17809,
 		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)
@@ -82879,7 +82901,7 @@ __322:
 	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+17831,
 		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 __325
@@ -82897,11 +82919,11 @@ __324:
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 604)), j4, 3)
 __327:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17835, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17854, -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+17856,
 		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)
 __326:
@@ -82947,7 +82969,7 @@ __332:
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17857,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17876,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
@@ -82981,89 +83003,103 @@ __337:
 
 	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+17887)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17906)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17892)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17911)
 	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)
 
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __338
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_IdxRowid, *(*int32)(unsafe.Pointer(bp + 608))+j4, 3)
+	jmp7 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 3, 0, r1+int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn)-1)
+
+	Xsqlite3VdbeLoadString(tls, v, 3,
+		ts+17932)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17968)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp7)
+__338:
+	;
 	label6 = 0
 	kk = 0
-__338:
+__339:
 	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) {
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
 		goto __342
 	}
-	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+	goto __340
 __342:
+	;
+	if !(label6 == 0) {
+		goto __343
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__343:
 	;
 	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:
+	kk++
+	goto __339
+	goto __341
+__341:
 	;
 	if !(label6 != 0) {
-		goto __343
+		goto __344
 	}
 	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
 	Xsqlite3VdbeResolveLabel(tls, v, label6)
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17887)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17906)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17913)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17979)
 	Xsqlite3VdbeGoto(tls, v, jmp5-1)
 	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-__343:
+__344:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __344
+		goto __345
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__345:
+__346:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __347
+		goto __348
 	}
 	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 __348
+		goto __349
 	}
-	goto __346
-__348:
+	goto __347
+__349:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
-	goto __346
-__346:
-	kk++
-	goto __345
 	goto __347
 __347:
+	kk++
+	goto __346
+	goto __348
+__348:
 	;
 	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)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18006)
 	Xsqlite3VdbeGoto(tls, v, jmp5)
 	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
-__344:
+__345:
 	;
 	Xsqlite3VdbeJumpHere(tls, v, jmp4)
 	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 624)))
@@ -83080,20 +83116,20 @@ __333:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 604)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __349
+		goto __350
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17967)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+18033)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__350:
+__351:
 	if !(pIdx5 != 0) {
-		goto __352
-	}
-	if !(pPk1 == pIdx5) {
 		goto __353
 	}
-	goto __351
-__353:
+	if !(pPk1 == pIdx5) {
+		goto __354
+	}
+	goto __352
+__354:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 608))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -83102,21 +83138,21 @@ __353:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __351
-__351:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __350
 	goto __352
 __352:
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
+	goto __351
+	goto __353
+__353:
 	;
 	if !(pPk1 != 0) {
-		goto __354
+		goto __355
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__354:
+__355:
 	;
-__349:
+__350:
 	;
 	goto __284
 __284:
@@ -83134,14 +83170,14 @@ __259:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __355
+		goto __356
 	}
 	(*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 + 17996
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18062
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__355:
+__356:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -83149,27 +83185,27 @@ __355:
 
 __45:
 	if !!(zRight != 0) {
-		goto __356
+		goto __357
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __358
-	}
-	goto pragma_out
-__358:
-	;
-	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __357
-__356:
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
 		goto __359
 	}
+	goto pragma_out
+__359:
+	;
+	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
+	goto __358
+__357:
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
+		goto __360
+	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__360:
+__361:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __362
+		goto __363
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __363
+		goto __364
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -83178,25 +83214,25 @@ __360:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __362
-__363:
-	;
-	goto __361
-__361:
-	pEnc += 16
-	goto __360
-	goto __362
-__362:
-	;
-	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __364
-	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17999, libc.VaList(bp+456, zRight))
+	goto __363
 __364:
 	;
-__359:
+	goto __362
+__362:
+	pEnc += 16
+	goto __361
+	goto __363
+__363:
 	;
-__357:
+	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
+		goto __365
+	}
+	Xsqlite3ErrorMsg(tls, pParse, ts+18065, libc.VaList(bp+456, zRight))
+__365:
+	;
+__360:
+	;
+__358:
 	;
 	goto __15
 
@@ -83204,15 +83240,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 __365
+		goto __366
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __367
+		goto __368
 	}
 	goto __15
-__367:
+__368:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -83220,41 +83256,41 @@ __367:
 	(*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 __368
+		goto __369
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__368:
+__369:
 	;
-	goto __366
-__365:
+	goto __367
+__366:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __369
+		goto __370
 	}
 	goto __15
-__369:
+__370:
 	;
 	(*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)
-__366:
+__367:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__370:
+__371:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __371
+		goto __372
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __370
-__371:
+	goto __371
+__372:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -83269,31 +83305,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __372
-	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17329) == 0) {
 		goto __373
 	}
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17348) == 0) {
+		goto __374
+	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __374
-__373:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18024) == 0) {
-		goto __375
+	goto __375
+__374:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18090) == 0) {
+		goto __376
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __376
-__375:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17482) == 0) {
-		goto __377
+	goto __377
+__376:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17501) == 0) {
+		goto __378
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
+__378:
+	;
 __377:
 	;
-__376:
+__375:
 	;
-__374:
-	;
-__372:
+__373:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -83303,10 +83339,10 @@ __372:
 
 __49:
 	if !(zRight != 0) {
-		goto __378
+		goto __379
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__378:
+__379:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -83326,19 +83362,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __379
+		goto __380
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __381
+		goto __382
 	}
 	goto __15
-__381:
+__382:
 	;
-	goto __380
-__379:
-	opMask = U32(0xfffe)
+	goto __381
 __380:
+	opMask = U32(0xfffe)
+__381:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -83347,86 +83383,86 @@ __380:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__382:
+__383:
 	if !(iDb <= iDbLast) {
-		goto __384
-	}
-	if !(iDb == 1) {
 		goto __385
 	}
-	goto __383
-__385:
+	if !(iDb == 1) {
+		goto __386
+	}
+	goto __384
+__386:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__386:
+__387:
 	if !(k4 != 0) {
-		goto __388
+		goto __389
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __389
+		goto __390
 	}
-	goto __387
-__389:
+	goto __388
+__390:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__390:
+__391:
 	if !(pIdx6 != 0) {
-		goto __392
-	}
-	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
 		goto __393
 	}
+	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
+		goto __394
+	}
 	szThreshold = int16(0)
-	goto __392
-__393:
+	goto __393
+__394:
 	;
-	goto __391
-__391:
-	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __390
 	goto __392
 __392:
+	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
+	goto __391
+	goto __393
+__393:
 	;
 	if !(szThreshold != 0) {
-		goto __394
+		goto __395
 	}
 	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))
 
-__394:
+__395:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18032,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18098,
 		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 __395
+		goto __396
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __396
-__395:
-	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+	goto __397
 __396:
+	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+__397:
 	;
-	goto __387
-__387:
-	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __386
 	goto __388
 __388:
+	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
+	goto __387
+	goto __389
+__389:
 	;
-	goto __383
-__383:
-	iDb++
-	goto __382
 	goto __384
 __384:
+	iDb++
+	goto __383
+	goto __385
+__385:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -83434,36 +83470,36 @@ __384:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __397
+		goto __398
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__397:
+__398:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+632) == SQLITE_OK) {
-		goto __398
+		goto __399
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 632)))
-__398:
+__399:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+640) == SQLITE_OK) {
-		goto __399
+		goto __400
 	}
 	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 __400
+		goto __401
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))
-__400:
+__401:
 	;
-__399:
+__400:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -83472,10 +83508,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 648)) >= int64(0)) {
-		goto __401
+		goto __402
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 648))&int64(0x7fffffff)))
-__401:
+__402:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -83484,10 +83520,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) >= int64(0)) {
-		goto __402
+		goto __403
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) & int64(0x7fffffff))
-__402:
+__403:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -83495,10 +83531,10 @@ __402:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __403
+		goto __404
 	}
 
-__403:
+__404:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -83550,14 +83586,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{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},
+	{FzName: ts + 18116, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18121, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18127, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18136, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18145, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18153, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18161},
+	{FzName: ts + 18168},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -83609,7 +83645,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+18108)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18174)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -83617,7 +83653,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18123, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18189, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -83630,19 +83666,19 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18130, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18196, 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+18136)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18202)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18148)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18214)
 		j++
 	}
-	Xsqlite3_str_append(tls, bp+32, ts+4941, 1)
+	Xsqlite3_str_append(tls, bp+32, ts+4960, 1)
 	Xsqlite3StrAccumFinish(tls, bp+32)
 
 	rc = Xsqlite3_declare_vtab(tls, db, bp+64)
@@ -83658,7 +83694,7 @@ __3:
 			(*PragmaVtab)(unsafe.Pointer(pTab)).FnHidden = U8(j)
 		}
 	} else {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	}
 
 	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
@@ -83806,7 +83842,7 @@ __1:
 		var zText uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 
 		if zText != 0 {
-			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, zText))
+			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, zText))
 			if *(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) == uintptr(0) {
 				return SQLITE_NOMEM
 			}
@@ -83822,13 +83858,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+18163)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18229)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18171, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18237, 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+18175, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18241, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -83837,7 +83873,7 @@ __3:
 	rc = Xsqlite3_prepare_v2(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
 	Xsqlite3_free(tls, zSql)
 	if rc != SQLITE_OK {
-		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
+		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
 		return rc
 	}
 	return pragmaVtabNext(tls, pVtabCursor)
@@ -83905,33 +83941,33 @@ 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+18179, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18245, 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, 137196)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137249)
 	} else {
 		var z uintptr
 		var zObj uintptr
 		if *(*uintptr)(unsafe.Pointer(azObj + 1*8)) != 0 {
 			zObj = *(*uintptr)(unsafe.Pointer(azObj + 1*8))
 		} else {
-			zObj = ts + 4992
+			zObj = ts + 5011
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18207, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18273, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18238, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18304, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137256)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18246,
-	ts + 18253,
-	ts + 18265,
+	ts + 18312,
+	ts + 18319,
+	ts + 18331,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -83991,7 +84027,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+14124)
+				corruptSchema(tls, pData, argv, ts+14143)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -84023,13 +84059,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+18276)
+			corruptSchema(tls, pData, argv, ts+18342)
 		} 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+14124)
+				corruptSchema(tls, pData, argv, ts+14143)
 			}
 		}
 	}
@@ -84062,16 +84098,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 + 8860
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8879
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 6373
+			return ts + 6392
 		}
-		return ts + 5867
+		return ts + 5886
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7922
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18289
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7941
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18355
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -84165,7 +84201,7 @@ __10:
 		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11759)
+		ts+11778)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __15:
@@ -84200,7 +84236,7 @@ __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)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18427)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __19:
@@ -84214,7 +84250,7 @@ __20:
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18385,
+		ts+18451,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -84487,7 +84523,7 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
 	(*Parse)(unsafe.Pointer(pParse)).Fdb = db
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1474, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1493, 0)
 	}
 }
 
@@ -84515,7 +84551,7 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, bp+16, ts+1474, 0)
+	Xsqlite3ErrorMsg(tls, bp+16, ts+1493, 0)
 __1:
 	;
 	if !(prepFlags&U32(SQLITE_PREPARE_PERSISTENT) != 0) {
@@ -84546,7 +84582,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18419, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18485, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -84576,7 +84612,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18449, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18515, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -84636,7 +84672,7 @@ __21:
 	if !((*Parse)(unsafe.Pointer(bp+16)).FzErrMsg != 0) {
 		goto __22
 	}
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3647, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+3666, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 	Xsqlite3DbFree(tls, db, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
 	goto __23
 __22:
@@ -84672,7 +84708,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, 137995)
+		return Xsqlite3MisuseError(tls, 138048)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -84771,7 +84807,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, 138143)
+		return Xsqlite3MisuseError(tls, 138196)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -85089,8 +85125,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 + 10904
-		var zSp2 uintptr = ts + 10904
+		var zSp1 uintptr = ts + 10923
+		var zSp2 uintptr = ts + 10923
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -85098,13 +85134,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18468, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18534, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18498))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18564))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -85279,7 +85315,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+18532, libc.VaList(bp, 0))
+					ts+18598, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -85324,7 +85360,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+18582, libc.VaList(bp+8, zName))
+						ts+18648, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -85335,7 +85371,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+18646,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18712,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -85379,7 +85415,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6570, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6589, 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.
@@ -85963,16 +85999,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18683
+		z = ts + 18749
 		break
 	case TK_INTERSECT:
-		z = ts + 18693
+		z = ts + 18759
 		break
 	case TK_EXCEPT:
-		z = ts + 18703
+		z = ts + 18769
 		break
 	default:
-		z = ts + 18710
+		z = ts + 18776
 		break
 	}
 	return z
@@ -85982,7 +86018,7 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18716, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18782, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
@@ -86008,11 +86044,11 @@ 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 {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18805, libc.VaList(bp, func() uintptr {
 		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
-			return ts + 18770
+			return ts + 18836
 		}
-		return ts + 1538
+		return ts + 1557
 	}()))
 
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
@@ -86200,8 +86236,8 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 				}
 
 				if iCol < 0 {
-					zType = ts + 1103
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16251
+					zType = ts + 1122
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16270
 				} 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))
@@ -86340,13 +86376,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16251
+				zCol = ts + 16270
 			} 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+12045, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12064, 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))
@@ -86354,7 +86390,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+18785, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18851, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -86444,7 +86480,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16251
+					zName = ts + 16270
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -86454,7 +86490,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18785, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18851, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -86470,7 +86506,7 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18794, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18860, 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)
@@ -86553,8 +86589,6 @@ __1:
 		(*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
@@ -86569,12 +86603,15 @@ __1:
 			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
 				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
 			}
+			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)
+			}
 		}
 		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
+				zType = ts + 18868
 			} else {
 				zType = uintptr(0)
 				for j = 1; j < SQLITE_N_STDTYPE; j++ {
@@ -86790,7 +86827,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18806, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18872, 0)
 	return
 __1:
 	;
@@ -86881,7 +86918,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18855, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18921, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -86901,7 +86938,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18897, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18963, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -86938,7 +86975,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18903, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18969, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -86972,11 +87009,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+18918, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18984, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
-			return ts + 1538
+			return ts + 1557
 		}
-		return ts + 18941
+		return ts + 19007
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -87077,8 +87114,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18943, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18958, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19009, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19024, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -87125,7 +87162,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18683, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18749, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -87192,7 +87229,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+18977, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19043, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -87254,7 +87291,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+18977, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19043, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -87407,10 +87444,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+18998, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19064, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19044,
+			ts+19110,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -87664,8 +87701,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+7218)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7218)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7226)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7226)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -87692,13 +87729,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+19126, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19192, 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+19137, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19203, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -87710,7 +87747,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+19142, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19208, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -87898,7 +87935,8 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 				Xsqlite3VectorErrorMsg(tls, (*SubstContext)(unsafe.Pointer(pSubst)).FpParse, pCopy)
 			} else {
 				var db uintptr = (*Parse)(unsafe.Pointer((*SubstContext)(unsafe.Pointer(pSubst)).FpParse)).Fdb
-				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 && int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN {
+				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 &&
+					(int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN || (*Expr)(unsafe.Pointer(pCopy)).FiTable != (*SubstContext)(unsafe.Pointer(pSubst)).FiNewTable) {
 					libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
 					(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_IF_NULL_ROW)
 					(*Expr)(unsafe.Pointer(bp)).FpLeft = pCopy
@@ -87938,7 +87976,7 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 								if pColl != 0 {
 									return (*CollSeq)(unsafe.Pointer(pColl)).FzName
 								}
-								return ts + 1083
+								return ts + 1102
 							}())
 					}
 
@@ -88726,12 +88764,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15148) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15167) == 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+15152) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15171) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -88797,7 +88835,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+19148, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19214, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -88880,7 +88918,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+19166, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19232, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -89009,7 +89047,7 @@ 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+19189, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19255, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
@@ -89032,7 +89070,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+19209, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19275, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -89048,7 +89086,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19252
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19318
 		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 {
@@ -89074,7 +89112,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+19275,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19341,
 					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
@@ -89085,9 +89123,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 + 19313
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19379
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19347
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19413
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -89134,7 +89172,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+19385, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19451, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -89246,7 +89284,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19389,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19455,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -89265,7 +89303,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+19428,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19494,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -89273,7 +89311,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+14717,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14736,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -89374,7 +89412,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6430
+							zSchemaName = ts + 6449
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -89389,7 +89427,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+19459, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19525, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -89454,7 +89492,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+19464,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19530,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -89466,7 +89504,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+12045, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12064, 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)
@@ -89485,9 +89523,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19473, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19539, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19491, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19557, 0)
 					}
 				}
 			}
@@ -89497,7 +89535,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+19511, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19577, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -89635,7 +89673,7 @@ func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect ui
 	(*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)
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSelect)).FpGroupBy)).FnExpr)
 		} 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)
 		}
@@ -89719,13 +89757,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19542, 0)
+					ts+19608, 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+19593, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19659, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -89914,19 +89952,19 @@ 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+19626,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19692,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19638
+						return ts + 19704
 					}
-					return ts + 1538
+					return ts + 1557
 				}(),
 				func() uintptr {
 					if bCover != 0 {
 						return (*Index)(unsafe.Pointer(pIdx)).FzName
 					}
-					return ts + 1538
+					return ts + 1557
 				}()))
 	}
 }
@@ -89939,7 +89977,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+7922)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7941)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -90246,7 +90284,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19661,
+		ts+19727,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -90307,7 +90345,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19715,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19781,
 		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:
@@ -90411,7 +90449,7 @@ __27:
 	if !((*SrcItem)(unsafe.Pointer(pItem1)).FcolUsed == uint64(0) && (*SrcItem)(unsafe.Pointer(pItem1)).FzName != uintptr(0)) {
 		goto __30
 	}
-	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1538, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
+	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1557, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
 __30:
 	;
 	pSub1 = (*SrcItem)(unsafe.Pointer(pItem1)).FpSelect
@@ -90449,7 +90487,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+19755, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19821, 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)
@@ -90508,7 +90546,7 @@ __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19770, libc.VaList(bp+40, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19836, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
@@ -90979,9 +91017,9 @@ __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 + 19786
+				return ts + 19852
 			}
-			return ts + 19795
+			return ts + 19861
 		}())
 
 	groupBySort = 1
@@ -91332,7 +91370,7 @@ __65:
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
 		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19786)
+	explainTempTable(tls, pParse, ts+19852)
 __146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
@@ -91415,7 +91453,7 @@ __7:
 	if !(i < nCol) {
 		goto __9
 	}
-	z = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
+	z = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
 	if !(z == uintptr(0)) {
 		goto __10
 	}
@@ -91437,7 +91475,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19804, 0)
+		ts+19870, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -91533,7 +91571,7 @@ func Xsqlite3_get_table(tls *libc.TLS, db uintptr, zSql uintptr, pazResult uintp
 		if (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
 			if pzErrMsg != 0 {
 				Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(pzErrMsg)))
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
 			}
 			Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg)
 		}
@@ -91670,7 +91708,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+19869, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19935, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -91714,7 +91752,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19915, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19981, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -91732,7 +91770,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19923, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19989, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -91744,7 +91782,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19915, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19981, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -91759,11 +91797,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19964, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20030, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
+
 __17:
 	;
 	goto trigger_cleanup
@@ -91771,22 +91810,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6365, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6384, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19990, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20056, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20028,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20094,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20065
+				return ts + 20131
 			}
-			return ts + 20072
+			return ts + 20138
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -91795,7 +91834,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20078, libc.VaList(bp+24, pTableName+8))
+		ts+20144, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -91824,9 +91863,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 6373
+			return ts + 6392
 		}
-		return ts + 5867
+		return ts + 5886
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -91944,7 +91983,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19915, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19981, 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
@@ -91977,7 +92016,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20124,
+		ts+20190,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -92002,13 +92041,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20172,
+		ts+20238,
 		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+20247, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20313, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -92264,7 +92303,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20276, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20342, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -92303,9 +92342,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 + 6373
+				return ts + 6392
 			}
-			return ts + 5867
+			return ts + 5886
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -92317,7 +92356,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20296,
+			ts+20362,
 			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)
@@ -92431,12 +92470,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20358,
+		ts+20424,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20406
+				return ts + 20472
 			}
-			return ts + 20413
+			return ts + 20479
 		}()))
 __15:
 	;
@@ -92550,7 +92589,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+20420, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20486, 0)
 	return 1
 }
 
@@ -92616,7 +92655,7 @@ func codeReturningTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab
 	}
 	Xsqlite3ExprListDelete(tls, db, (*Select)(unsafe.Pointer(bp)).FpEList)
 	pNew = sqlite3ExpandReturning(tls, pParse, (*Returning)(unsafe.Pointer(pReturning)).FpReturnEL, pTab)
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0) {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
 		libc.Xmemset(tls, bp+240, 0, uint64(unsafe.Sizeof(NameContext{})))
 		if (*Returning)(unsafe.Pointer(pReturning)).FnRetCol == 0 {
 			(*Returning)(unsafe.Pointer(pReturning)).FnRetCol = (*ExprList)(unsafe.Pointer(pNew)).FnExpr
@@ -92670,7 +92709,7 @@ func codeTriggerProgram(tls *libc.TLS, pParse uintptr, pStepList uintptr, orconf
 
 		if (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan != 0 {
 			Xsqlite3VdbeAddOp4(tls, v, OP_Trace, 0x7fffffff, 1, 0,
-				Xsqlite3MPrintf(tls, db, ts+6064, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
+				Xsqlite3MPrintf(tls, db, ts+6083, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
 				-6)
 		}
 
@@ -92780,7 +92819,7 @@ 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+20462, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20528, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
@@ -93373,7 +93412,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20476,
+		ts+20542,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -93405,7 +93444,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20512, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20578, 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:
@@ -93415,7 +93454,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7697
+				return ts + 7716
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -93731,7 +93770,12 @@ __74:
 	goto __77
 __76:
 	flags = WHERE_ONEPASS_DESIRED
-	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) && !(pTrigger != 0) && !(hasFK != 0) && !(chngKey != 0) && !(*(*int32)(unsafe.Pointer(bp + 104)) != 0)) {
+	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) &&
+		!(pTrigger != 0) &&
+		!(hasFK != 0) &&
+		!(chngKey != 0) &&
+		!(*(*int32)(unsafe.Pointer(bp + 104)) != 0) &&
+		(*NameContext)(unsafe.Pointer(bp+40)).FncFlags&NC_Subquery == 0) {
 		goto __78
 	}
 	flags = flags | WHERE_ONEPASS_MULTIROW
@@ -94285,7 +94329,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20531)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20597)
 __169:
 	;
 update_cleanup:
@@ -94591,10 +94635,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+20544, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+20610, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20548, libc.VaList(bp+8, bp+216))
+				ts+20614, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -94685,7 +94729,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+12134, -1)
+				ts+12153, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -94717,7 +94761,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+20621, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20625, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20687, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20691, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -94865,14 +94909,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+20629)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20695)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20669)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20735)
 	return SQLITE_ERROR
 __2:
 	;
@@ -94883,7 +94927,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20712)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20778)
 	return SQLITE_ERROR
 __5:
 	;
@@ -94892,7 +94936,7 @@ __5:
 	*(*uint32)(unsafe.Pointer(db + 76)) |= uint32(SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE)
 	goto __4
 __3:
-	zOut = ts + 1538
+	zOut = ts + 1557
 __4:
 	;
 	saved_flags = (*Sqlite3)(unsafe.Pointer(db)).Fflags
@@ -94911,7 +94955,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20730, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20796, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -94931,7 +94975,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20753)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20819)
 	goto end_of_vacuum
 __8:
 	;
@@ -94946,7 +94990,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14487)
+	rc = execSql(tls, db, pzErrMsg, ts+14506)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -94991,7 +95035,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20780,
+		ts+20846,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -95000,7 +95044,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20888,
+		ts+20954,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -95011,7 +95055,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20942,
+		ts+21008,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -95022,7 +95066,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21093,
+		ts+21159,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -95367,7 +95411,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+12361, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12380, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -95451,11 +95495,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+21223, libc.VaList(bp, pParse+272))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21289, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21247,
+			ts+21313,
 			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,
@@ -95465,7 +95509,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21346, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21412, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -95526,7 +95570,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+21365, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21431, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -95554,9 +95598,11 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FbDeclared = 0
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = bp + 32
+	(*Table)(unsafe.Pointer(pTab)).FnTabRef++
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{xConstruct})).f(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, pVTable+16, bp+64)
+	Xsqlite3DeleteTable(tls, db, pTab)
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = (*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -95564,9 +95610,9 @@ 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+21407, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21473, libc.VaList(bp+8, zModuleName))
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3647, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3666, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 		}
 		Xsqlite3DbFree(tls, db, pVTable)
@@ -95576,7 +95622,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 + 21437
+			var zFormat uintptr = ts + 21503
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -95588,12 +95634,12 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 			*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) = pVTable
 
 			for iCol = 0; iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol); iCol++ {
-				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1538)
+				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1557)
 				var nType int32
 				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+16161, 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
@@ -95650,13 +95696,13 @@ 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+21483, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21549, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxConnect, bp+16)
 		if rc != SQLITE_OK {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3647, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3666, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 		}
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 16)))
@@ -95708,7 +95754,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+21483, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21549, 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)
@@ -95742,7 +95788,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, 151030)
+		return Xsqlite3MisuseError(tls, 151102)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -95784,7 +95830,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR,
 			func() uintptr {
 				if (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
-					return ts + 3647
+					return ts + 3666
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg))
@@ -96152,7 +96198,7 @@ func Xsqlite3VtabEponymousTableInit(tls *libc.TLS, pParse uintptr, pMod uintptr)
 	addModuleArgument(tls, pParse, pTab, Xsqlite3DbStrDup(tls, db, (*Table)(unsafe.Pointer(pTab)).FzName))
 	rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer(pModule)).FxConnect, bp+8)
 	if rc != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+3647, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+		Xsqlite3ErrorMsg(tls, pParse, ts+3666, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		Xsqlite3VtabEponymousTableClear(tls, db, pMod)
 	}
@@ -96195,7 +96241,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, 151521)
+		rc = Xsqlite3MisuseError(tls, 151593)
 	} else {
 		ap = va
 		switch op {
@@ -96222,7 +96268,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 151539)
+				rc = Xsqlite3MisuseError(tls, 151611)
 				break
 
 			}
@@ -96453,10 +96499,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 + 21502
+		return ts + 21568
 	}
 	if i == -1 {
-		return ts + 16251
+		return ts + 16270
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -96465,35 +96511,35 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21509, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21575, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21515, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21581, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12751, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12770, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4941, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4960, 1)
 	}
 
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21515, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21581, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12751, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12770, 1)
 		}
-		Xsqlite3_str_append(tls, pStr, ts+4992, 1)
+		Xsqlite3_str_append(tls, pStr, ts+5011, 1)
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+4941, 1)
+		Xsqlite3_str_append(tls, pStr, ts+4960, 1)
 	}
 }
 
@@ -96510,29 +96556,29 @@ 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+21517, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21583, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21509, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21575, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21520
+				return ts + 21586
 			}
-			return ts + 21525
+			return ts + 21591
 		}(), 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+21533)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21599)
 		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+21535)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21601)
 	}
-	Xsqlite3_str_append(tls, pStr, ts+4941, 1)
+	Xsqlite3_str_append(tls, pStr, ts+4960, 1)
 }
 
 // This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
@@ -96573,11 +96619,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+21537, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21603, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21543
+				return ts + 21609
 			}
-			return ts + 21550
+			return ts + 21616
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -96587,43 +96633,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 + 10960
+					zFmt = ts + 10979
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21555
+				zFmt = ts + 21621
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21588
+				zFmt = ts + 21654
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21613
+				zFmt = ts + 21679
 			} else {
-				zFmt = ts + 21631
+				zFmt = ts + 21697
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21640, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21706, 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+21648, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16270
+			Xsqlite3_str_appendf(tls, bp+64, ts+21714, 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+21679, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21745, 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+21689, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21755, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21694,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21760,
 				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+21721, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21787, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -96655,25 +96701,25 @@ 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+21732, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21798, 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+21520, 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+21586, 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+21753, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21819, 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+21509, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21575, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21520, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21586, libc.VaList(bp+16, z))
 		}
 	}
-	Xsqlite3_str_append(tls, bp+24, ts+4941, 1)
+	Xsqlite3_str_append(tls, bp+24, ts+4960, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
@@ -98267,7 +98313,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21761, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21827, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -98295,7 +98341,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21776, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21842, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -98813,7 +98859,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+21785, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21851, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -99171,10 +99217,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 + 14951, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 21799, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 16119, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15450, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14970, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21865, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -99664,12 +99710,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21806, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21872, 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+21806, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21872, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -99748,7 +99794,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 + 6753
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7702
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -99842,7 +99888,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 21847
+				return ts + 21913
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -100218,7 +100264,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21854,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21920,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -100234,7 +100280,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 		pRhs = Xsqlite3PExpr(tls, pParse, TK_UPLUS,
 			Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*ExprList_item)(unsafe.Pointer(pArgs+8+uintptr(j)*32)).FpExpr, 0), uintptr(0))
 		pTerm = Xsqlite3PExpr(tls, pParse, TK_EQ, pColRef, pRhs)
-		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ|JT_RIGHT) != 0 {
 			joinType = U32(EP_OuterON)
 		} else {
 			joinType = U32(EP_InnerON)
@@ -100952,7 +100998,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21890, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21956, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -101023,7 +101069,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21916
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21982
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -101197,6 +101243,10 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	var iCur int32
+	var saved_pIdxEpr uintptr
+
+	saved_pIdxEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 
 	addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	for __ccgo := true; __ccgo; __ccgo = iLevel < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel) {
@@ -101240,9 +101290,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, n)
 			var jj int32
 			for jj = 0; jj < n; jj++ {
-				var iCol int32 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(jj)*2)))
-
-				Xsqlite3ExprCodeGetColumnOfTable(tls, v, (*Index)(unsafe.Pointer(pIdx)).FpTable, iCur, iCol, r1+jj)
+				Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pIdx, iCur, jj, r1+jj)
 			}
 			Xsqlite3VdbeAddOp4Int(tls, v, OP_FilterAdd, (*WhereLevel)(unsafe.Pointer(pLevel)).FregFilter, 0, r1, n)
 			Xsqlite3ReleaseTempRange(tls, pParse, r1, n)
@@ -101276,6 +101324,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 		}
 	}
 	Xsqlite3VdbeJumpHere(tls, v, addrOnce)
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = saved_pIdxEpr
 }
 
 func allocateIndexInfo(tls *libc.TLS, pWInfo uintptr, pWC uintptr, mUnusable Bitmask, pSrc uintptr, pmNoOmit uintptr) uintptr {
@@ -101389,7 +101438,7 @@ __3:
 		uint64(unsafe.Sizeof(sqlite3_index_orderby{}))*uint64(nOrderBy)+uint64(unsafe.Sizeof(HiddenIndexInfo1{}))+
 		uint64(unsafe.Sizeof(uintptr(0)))*uint64(nTerm))
 	if pIdxInfo == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1474, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1493, 0)
 		return uintptr(0)
 	}
 	pHidden = pIdxInfo + 1*96
@@ -101511,9 +101560,9 @@ func vtabBestIndex(tls *libc.TLS, pParse uintptr, pTab uintptr, p uintptr) int32
 		if rc == SQLITE_NOMEM {
 			Xsqlite3OomFault(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb)
 		} else if !(int32((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3647, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3666, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+3647, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
+			Xsqlite3ErrorMsg(tls, pParse, ts+3666, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
 		}
 	}
 	Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg)
@@ -101534,11 +101583,16 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 
 	_ = pParse
 
+	if !((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol)
+	} else {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnColumn)
+	}
 	nField = func() int32 {
-		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < (*Index)(unsafe.Pointer(pIdx)).FnSample {
+		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < nField {
 			return int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField)
 		}
-		return (*Index)(unsafe.Pointer(pIdx)).FnSample
+		return nField
 	}()
 	iCol = 0
 	iSample = (*Index)(unsafe.Pointer(pIdx)).FnSample * nField
@@ -103119,7 +103173,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+21927, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+21993, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -103177,7 +103231,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+21927, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+21993, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -103575,7 +103629,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+21953, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+22019, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -104182,7 +104236,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21988, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22054, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -104217,6 +104271,10 @@ __3:
 			if int32((*WherePath)(unsafe.Pointer(pFrom)).FisOrdered) == (*ExprList)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpOrderBy)).FnExpr {
 				(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_ORDERED)
 			}
+			if (*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy != 0 &&
+				int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) > (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr {
+				(*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat = I8((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr)
+			}
 		} else {
 			(*WhereInfo)(unsafe.Pointer(pWInfo)).FrevMask = (*WherePath)(unsafe.Pointer(pFrom)).FrevLoop
 			if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) <= 0 {
@@ -104511,6 +104569,9 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
+		if Xsqlite3IndexAffinityStr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pIdx) != 0 {
+			(*IndexedExpr)(unsafe.Pointer(p)).Faff = U8(*(*int8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FzColAff + uintptr(i))))
+		}
 		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
@@ -104663,7 +104724,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22006, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22072, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -104727,7 +104788,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22034, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22100, 0)
 	goto __5
 __4:
 	ii = 0
@@ -105609,7 +105670,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22052, -1)
+		pCtx, ts+22118, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -105742,7 +105803,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+22108, -1)
+					pCtx, ts+22174, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -105832,17 +105893,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-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))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22219))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22230))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22241))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22246))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22259))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22269))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22275))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22286))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22296))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22308))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22313))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -105888,7 +105949,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22251, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22317, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -105932,12 +105993,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+22270, 0)
+			ts+22336, 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+22341, 0)
+				ts+22407, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -105960,7 +106021,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+7922)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7941)
 					}
 					break
 				}
@@ -106164,7 +106225,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+22404, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22470, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -106280,7 +106341,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+7514))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7522))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -106395,7 +106456,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22430, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22496, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -106460,15 +106521,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 + 22462
+				zErr = ts + 22528
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22479
+				zErr = ts + 22545
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22495
+				zErr = ts + 22561
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22515, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22581, 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 {
@@ -106489,7 +106550,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+22548, 0)
+				ts+22614, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -106627,7 +106688,7 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regZero)
 	if eCond >= WINDOW_STARTING_NUM {
 		var regString int32 = Xsqlite3GetTempReg(tls, pParse)
-		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1538, -1)
+		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1557, -1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, Xsqlite3VdbeCurrentAddr(tls, v)+2, reg)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL))
 
@@ -106645,11 +106706,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22595,
-	ts + 22648,
-	ts + 22052,
-	ts + 22699,
-	ts + 22751,
+	ts + 22661,
+	ts + 22714,
+	ts + 22118,
+	ts + 22765,
+	ts + 22817,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -107140,7 +107201,7 @@ func windowCodeRangeTest(tls *libc.TLS, p uintptr, op int32, csr1 int32, regVal
 
 	}
 
-	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1538, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1557, -1)
 	addrGe = Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, 0, reg1)
 
 	if op == OP_Ge && arith == OP_Add || op == OP_Le && arith == OP_Subtract {
@@ -108044,19 +108105,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+22801,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22867,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 22843
+							return ts + 22909
 						}
-						return ts + 22852
+						return ts + 22918
 					}(),
 						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+22858, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22924, 0)
 		}
 	}
 
@@ -108124,7 +108185,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+22892,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22958,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -109221,7 +109282,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22930, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22996, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -110196,21 +110257,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+16270, 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+22952, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23018, 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+16183, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22952, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23018, 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))
@@ -110953,7 +111014,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+22979)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+23045)
 				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 {
@@ -111117,7 +111178,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+22988, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23054, 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))
@@ -111334,9 +111395,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 + 6748
+							return ts + 7697
 						}
-						return ts + 6753
+						return ts + 7702
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -111620,19 +111681,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+23012, 0)
+					ts+23078, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23107, 0)
+					ts+23173, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23191, 0)
+					ts+23257, 0)
 			}
 			break
 		case uint32(273):
@@ -112011,9 +112072,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+22988, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23054, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23276, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23342, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -112781,7 +112842,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+23293, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23359, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -112802,9 +112863,9 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 	}
 	if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg != 0 || (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_OK && (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_DONE {
 		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)))
+			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3666, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23318, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23384, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -112977,7 +113038,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23329, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23395, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -112990,11 +113051,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19915, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19981, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23336, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23402, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23341, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23407, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -113007,9 +113068,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23351, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23417, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23355, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23421, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -113079,7 +113140,8 @@ func sqlite3TestExtInit(tls *libc.TLS, db uintptr) int32 {
 	return Xsqlite3FaultSim(tls, 500)
 }
 
-var sqlite3BuiltinExtensions = [4]uintptr{
+var sqlite3BuiltinExtensions = [5]uintptr{
+	0,
 	0,
 	0,
 	0,
@@ -113243,7 +113305,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 174337)
+		return Xsqlite3MisuseError(tls, 174426)
 	}
 
 	ap = va
@@ -113818,7 +113880,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175111)
+		return Xsqlite3MisuseError(tls, 175200)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -113833,7 +113895,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23363, 0)
+			ts+23429, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -114024,23 +114086,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 + 23431
+	var zErr uintptr = ts + 23497
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23445
+			zErr = ts + 23511
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23467
+			zErr = ts + 23533
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23489
+			zErr = ts + 23555
 			break
 
 		}
@@ -114058,35 +114120,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23512,
-	ts + 23525,
+	ts + 23578,
+	ts + 23591,
 	uintptr(0),
-	ts + 23541,
-	ts + 23566,
-	ts + 23580,
-	ts + 23599,
-	ts + 1474,
-	ts + 23624,
-	ts + 23661,
-	ts + 23673,
-	ts + 23688,
-	ts + 23721,
+	ts + 23607,
+	ts + 23632,
+	ts + 23646,
+	ts + 23665,
+	ts + 1493,
+	ts + 23690,
+	ts + 23727,
 	ts + 23739,
-	ts + 23764,
-	ts + 23793,
+	ts + 23754,
+	ts + 23787,
+	ts + 23805,
+	ts + 23830,
+	ts + 23859,
 	uintptr(0),
-	ts + 5822,
-	ts + 5318,
-	ts + 23810,
-	ts + 23828,
-	ts + 23846,
+	ts + 5841,
+	ts + 5337,
+	ts + 23876,
+	ts + 23894,
+	ts + 23912,
 	uintptr(0),
-	ts + 23880,
+	ts + 23946,
 	uintptr(0),
-	ts + 23901,
-	ts + 23927,
-	ts + 23950,
-	ts + 23971,
+	ts + 23967,
+	ts + 23993,
+	ts + 24016,
+	ts + 24037,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -114207,7 +114269,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, 175758)
+		return Xsqlite3MisuseError(tls, 175847)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -114252,7 +114314,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+23987, 0)
+				ts+24053, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -114369,7 +114431,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+24050, libc.VaList(bp, zName))
+		ts+24116, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -114397,7 +114459,7 @@ func Xsqlite3_overload_function(tls *libc.TLS, db uintptr, zName uintptr, nArg i
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, zName))
+	zCopy = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, zName))
 	if zCopy == uintptr(0) {
 		return SQLITE_NOMEM
 	}
@@ -114605,7 +114667,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+24101, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24167, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -114698,7 +114760,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, 176503))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176592))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -114768,7 +114830,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, 176582)
+		return Xsqlite3MisuseError(tls, 176671)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -114778,7 +114840,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, 176591)
+		return Xsqlite3MisuseError(tls, 176680)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -114810,14 +114872,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, 176639)
+		return Xsqlite3MisuseError(tls, 176728)
 	}
 
 	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+24122, 0)
+				ts+24188, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -114947,7 +115009,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+24190, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24256, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -114992,10 +115054,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24196, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24262, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24206,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24272,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -115100,7 +115162,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24234, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24300, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -115111,17 +115173,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24238, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24304, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24238
+	zModeType = ts + 24304
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24244, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24310, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -115129,7 +115191,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 3256
+	zModeType = ts + 3275
 __32:
 	;
 	if !(aMode != 0) {
@@ -115159,7 +115221,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24249, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24315, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -115167,7 +115229,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24269,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24335,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -115207,7 +115269,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24293, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24359, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -115231,15 +115293,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24309, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24316, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24375, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24382, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{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},
+	{Fz: ts + 24390, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24393, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24396, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17365, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -115385,10 +115447,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+21847, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21913, 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+24334, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24400, 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) {
@@ -115402,7 +115464,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 177308)
+	rc = Xsqlite3MisuseError(tls, 177397)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -115419,7 +115481,7 @@ __19:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3647
+			return ts + 3666
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -115453,9 +115515,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 + 6425
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6444
 	(*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 + 23336
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23402
 	(*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)
@@ -115560,7 +115622,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24340
+		zFilename = ts + 24406
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -115663,21 +115725,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+24343,
+	Xsqlite3_log(tls, iErr, ts+24409,
 		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+24368)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24434)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24388)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24454)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24395)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24461)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -115788,7 +115850,7 @@ __4:
 	autoinc = libc.Bool32(int32((*Table)(unsafe.Pointer(pTab)).FiPKey) == iCol && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != U32(0))
 	goto __13
 __12:
-	zDataType = ts + 1103
+	zDataType = ts + 1122
 	primarykey = 1
 __13:
 	;
@@ -115835,14 +115897,14 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24412, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24478, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 3647
+			return ts + 3666
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -116491,7 +116553,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24440, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24506, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -116609,7 +116671,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 + 24448
+			return ts + 24514
 		}
 		return uintptr(0)
 	}(), 0)
@@ -116787,7 +116849,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6165, ts + 6748, ts + 6753, ts + 6175, ts + 6170, ts + 7989, ts + 24471, ts + 24477,
+	ts + 6184, ts + 7697, ts + 7702, ts + 6194, ts + 6189, ts + 8008, ts + 24537, ts + 24543,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -116940,7 +117002,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 + 24484 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 24550 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -116966,7 +117028,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	switch Xsqlite3_value_type(tls, pValue) {
 	case SQLITE_NULL:
 		{
-			jsonAppendRaw(tls, p, ts+6165, uint32(4))
+			jsonAppendRaw(tls, p, ts+6184, uint32(4))
 			break
 
 		}
@@ -116995,7 +117057,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+24501, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24567, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -117053,19 +117115,19 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 	switch int32((*JsonNode)(unsafe.Pointer(pNode)).FeType) {
 	default:
 		{
-			jsonAppendRaw(tls, pOut, ts+6165, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6184, uint32(4))
 			break
 
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6748, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+7697, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6753, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+7702, uint32(5))
 			break
 
 		}
@@ -117610,17 +117672,17 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		}
 		return int32(j + U32(1))
 	} else if int32(c) == 'n' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6165, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6184, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		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+6748, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7697, 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+6753, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7702, 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))
@@ -117721,7 +117783,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+24530, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24596, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -118027,7 +118089,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+24545, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24611, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -118042,7 +118104,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24549, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24615, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -118096,7 +118158,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+24575,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24641,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -118201,11 +118263,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+24618, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24684, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
-					jsonAppendRaw(tls, bp, ts+4982, uint32(2))
+					jsonAppendRaw(tls, bp, ts+5001, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24621, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24687, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -118246,7 +118308,7 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if pNode != 0 {
 				jsonRenderNode(tls, pNode, bp, uintptr(0))
 			} else {
-				jsonAppendRaw(tls, bp, ts+6165, uint32(4))
+				jsonAppendRaw(tls, bp, ts+6184, uint32(4))
 			}
 		}
 		if i == argc {
@@ -118362,14 +118424,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24624, -1)
+			ts+24690, -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+24675, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24741, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -118464,7 +118526,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15364)
+	jsonWrongNumArgs(tls, ctx, ts+15383)
 	return
 __2:
 	;
@@ -118539,9 +118601,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24709
+			return ts + 24775
 		}
-		return ts + 24713
+		return ts + 24779
 	}())
 	return
 __2:
@@ -118674,7 +118736,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24720, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24786, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -118771,7 +118833,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24723, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24789, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -118815,7 +118877,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24726)
+		ts+24792)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -118946,7 +119008,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24809, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24875, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -118965,7 +119027,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+24815, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24881, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -119061,7 +119123,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+24815, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24881, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -119085,7 +119147,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 + 24820
+				zRoot = ts + 24886
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -119207,7 +119269,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+24530, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24596, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -119302,25 +119364,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{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 + 24888},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24893},
+	{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 + 24904},
 	{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}}
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24935},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24938},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24942},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24954},
+	{FnArg: int8(2), 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_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24977},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24988},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25000},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 25013},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25022},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25022},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25032},
+	{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 + 25043},
+	{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 + 25060}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -119339,8 +119401,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 25012, FpModule: 0},
-	{FzName: ts + 25022, FpModule: 0},
+	{FzName: ts + 25078, FpModule: 0},
+	{FzName: ts + 25088, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -119600,11 +119662,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+25032, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25098, 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+25040, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25106, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -119815,7 +119877,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+25045,
+		ts+25111,
 		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))
@@ -120518,7 +120580,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25127)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25193)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -120730,7 +120792,7 @@ func rtreeBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 2
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FneedToFreeIdxStr = 1
-	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, bp+8))) {
+	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, bp+8))) {
 		return SQLITE_NOMEM
 	}
 
@@ -121859,7 +121921,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25141, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25207, 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 {
@@ -121871,12 +121933,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+25161, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25227, 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+25193, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25259, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -122102,7 +122164,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+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))
+		ts+25296, 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))
@@ -122125,14 +122187,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25375
+	var zFmt uintptr = ts + 25441
 	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+11332, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11351, 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 {
@@ -122173,7 +122235,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25431, ts + 5044, ts + 16251,
+	ts + 25497, ts + 5063, ts + 16270,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -122216,19 +122278,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+25436,
+			ts+25502,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25498, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25564, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25503,
+			ts+25569,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25567,
+			ts+25633,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25637,
+			ts+25703,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -122257,7 +122319,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 + 25686
+			zFormat = ts + 25752
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -122269,7 +122331,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+25794,
+			ts+25860,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -122277,18 +122339,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+25839, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25905, 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+12751, 1)
+					Xsqlite3_str_append(tls, p, ts+12770, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25866, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25932, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25888, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25954, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25896, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25962, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -122303,14 +122365,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25912,
-	ts + 25965,
-	ts + 26010,
-	ts + 26062,
-	ts + 26116,
-	ts + 26161,
-	ts + 26219,
-	ts + 26274,
+	ts + 25978,
+	ts + 26031,
+	ts + 26076,
+	ts + 26128,
+	ts + 26182,
+	ts + 26227,
+	ts + 26285,
+	ts + 26340,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -122339,7 +122401,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+26321, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26387, 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
@@ -122347,19 +122409,19 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 				(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = 4 + int32((*Rtree)(unsafe.Pointer(pRtree)).FnBytesPerCell)*RTREE_MAXCELLS
 			}
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26341,
+			ts+26407,
 			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 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26398,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26464,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -122401,16 +122463,16 @@ 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 + 26433,
-		ts + 26476,
-		ts + 26511,
-		ts + 26547,
+		ts + 26499,
+		ts + 26542,
+		ts + 26577,
+		ts + 26613,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
 		goto __1
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
 	return SQLITE_ERROR
 __1:
 	;
@@ -122435,7 +122497,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+26584,
+	Xsqlite3_str_appendf(tls, pSql, ts+26650,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -122447,7 +122509,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26608, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26674, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -122470,7 +122532,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26614, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26680, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -122481,14 +122543,14 @@ __10:
 	if !(ii < argc) {
 		goto __12
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
 	rc = SQLITE_ERROR
 	goto __13
 __12:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __14
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
 __14:
 	;
 __13:
@@ -122531,7 +122593,7 @@ __17:
 	if !(iErr != 0) {
 		goto __22
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
 	goto rtreeInit_fail
 __22:
 	;
@@ -122548,7 +122610,7 @@ __23:
 	if !(rc != 0) {
 		goto __24
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
 	goto rtreeInit_fail
 __24:
 	;
@@ -122566,7 +122628,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26617, ts + 26628}
+var azFormat = [2]uintptr{ts + 26683, ts + 26694}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -122604,13 +122666,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+10904, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10923, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26638, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26704, 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+26644, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26710, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26648, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26714, 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})))
@@ -122621,7 +122683,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+26650, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26716, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -122699,12 +122761,12 @@ 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+26683,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26749,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
-						return ts + 4046
+						return ts + 4065
 					}
-					return ts + 1538
+					return ts + 1557
 				}(), z))
 			if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport == uintptr(0) {
 				(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
@@ -122723,7 +122785,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+26690,
+			ts+26756,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -122742,7 +122804,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+26735, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26801, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -122756,8 +122818,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 + 26767,
-		ts + 26821,
+		ts + 26833,
+		ts + 26887,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -122772,23 +122834,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+26869,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26935,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26914
+					return ts + 26980
 				}
-				return ts + 26922
+				return ts + 26988
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26931,
+				ts+26997,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26914
+						return ts + 26980
 					}
-					return ts + 26922
+					return ts + 26988
 				}(), iKey, iVal))
 		}
 	}
@@ -122812,7 +122874,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+26989, libc.VaList(bp, i, iCell, iNode))
+				ts+27055, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -122832,7 +122894,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+27037, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27103, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -122849,14 +122911,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+27104, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27170, 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+27138, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27204, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -122864,7 +122926,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+27168,
+					ts+27234,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -122893,14 +122955,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+27223,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27289,
 			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+27254, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27320, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -122922,12 +122984,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+14487, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14506, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27321, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27387, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -122936,12 +122998,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25141, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25207, 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+27349, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27415, 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)
 		}
@@ -122955,8 +123017,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+27380, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27387, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27446, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27453, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -122964,7 +123026,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+27395, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27461, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -122979,7 +123041,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27399, -1)
+			ts+27465, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -122987,7 +123049,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6425
+			zDb = ts + 6444
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -122997,7 +123059,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 + 17996
+				return ts + 18062
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -123368,11 +123430,11 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		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+27450, 1)
+		Xsqlite3_str_append(tls, x, ts+27516, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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+27518, 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+27463, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27529, 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)
 	}
@@ -123392,19 +123454,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+27474, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27540, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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)))))
+			Xsqlite3_str_appendf(tls, x, ts+27558, 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+27500, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27566, 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+27508, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27574, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27512, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27578, 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)
 	}
@@ -124324,7 +124386,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+27525, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27591, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -124333,7 +124395,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27547, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27613, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -124341,7 +124403,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26614, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26680, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -124352,7 +124414,7 @@ __5:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __7
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
 __7:
 	;
 __6:
@@ -124377,7 +124439,7 @@ __9:
 	if !(rc != 0) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	goto geopolyInit_fail
 __10:
 	;
@@ -124568,7 +124630,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 + 16270
 		(*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
@@ -124578,7 +124640,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 + 27551
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27617
 		(*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
@@ -124586,7 +124648,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 + 27557
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27623
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -124698,7 +124760,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27566, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27632, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -124830,14 +124892,14 @@ geopoly_update_end:
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
 	_ = pVtab
 	_ = nArg
-	if Xsqlite3_stricmp(tls, zName, ts+27606) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27672) == 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+27622) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27688) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -124902,7 +124964,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+27637, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27703, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -124914,25 +124976,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{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},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27711},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27724},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27737},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27750},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27688},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27762},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27672},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27785},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27799},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27812},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27826},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27842},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27788},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27854},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -124942,26 +125004,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27807, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27873, 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+27817, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27883, 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+27828, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27894, -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+27551, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27617, 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+27839, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27905, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -125015,7 +125077,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+25127, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25193, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -125342,7 +125404,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+27849, -1)
+		Xsqlite3_result_error(tls, context, ts+27915, -1)
 		return
 	}
 
@@ -125353,7 +125415,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+27849, -1)
+			Xsqlite3_result_error(tls, context, ts+27915, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -125366,7 +125428,7 @@ func prepareAndCollectError(tls *libc.TLS, db uintptr, ppStmt uintptr, pzErrmsg
 
 	var rc int32 = Xsqlite3_prepare_v2(tls, db, zSql, -1, ppStmt, uintptr(0))
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 		*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	}
 	return rc
@@ -125378,7 +125440,7 @@ func resetAndCollectError(tls *libc.TLS, pStmt uintptr, pzErrmsg uintptr) int32
 
 	var rc int32 = Xsqlite3_reset(tls, pStmt)
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
 	}
 	return rc
 }
@@ -125454,7 +125516,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+27870, uintptr(0), uintptr(0), p+64)
+				ts+27936, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -125518,7 +125580,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+25040, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25106, 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++ {
 				}
@@ -125539,16 +125601,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+28041, libc.VaList(bp, func() uintptr {
+			ts+28107, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28191
+					return ts + 28257
 				}
-				return ts + 1538
+				return ts + 1557
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28232)
+			ts+28298)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -125646,7 +125708,7 @@ func rbuFinalize(tls *libc.TLS, p uintptr, pStmt uintptr) {
 	var rc int32 = Xsqlite3_finalize(tls, pStmt)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && rc != SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 	}
 }
 
@@ -125664,7 +125726,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+28357, libc.VaList(bp, zTab)))
+			ts+28423, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -125682,7 +125744,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+28476, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28542, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -125700,7 +125762,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28497, libc.VaList(bp+16, zIdx)))
+			ts+28563, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -125723,7 +125785,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+28548, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28614, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -125769,7 +125831,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+28569, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28635, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -125784,7 +125846,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+28597, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28663, 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 {
@@ -125824,7 +125886,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+19473, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19539, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -125834,18 +125896,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+28626, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28692, 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+28645, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28711, 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+28650, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28716, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -125857,18 +125919,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+28660, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28726, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28689
+							return ts + 28755
 						}
-						return ts + 28702
+						return ts + 28768
 					}()))
 		}
 
 		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+28711, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28777, 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)
@@ -125882,7 +125944,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+28733,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28799,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -125925,12 +125987,12 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	defer tls.Free(24)
 
 	var zList uintptr = uintptr(0)
-	var zSep uintptr = ts + 1538
+	var zSep uintptr = ts + 1557
 	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+28760, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14598
+		zList = rbuMPrintf(tls, p, ts+28826, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14617
 	}
 	return zList
 }
@@ -125941,13 +126003,13 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 
 	var iPk int32 = 1
 	var zRet uintptr = uintptr(0)
-	var zSep uintptr = ts + 1538
+	var zSep uintptr = ts + 1557
 	for 1 != 0 {
 		var i int32
 		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+28769, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28835, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -125969,25 +126031,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+28782, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28848, 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+28814, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28880, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		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)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1557, ts+14617, ts+28903)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28909, ts+28916, ts+4960)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1557, ts+14617, ts+1557)
 
 		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+28858,
+					ts+28924,
 					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+28900, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28966, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -126024,12 +126086,12 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	zVector = uintptr(0)
 	zRet = uintptr(0)
 	bFailed = 0
-	zSep = ts + 1538
+	zSep = ts + 1557
 	iCol = 0
 	*(*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+28597, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28663, 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
@@ -126064,7 +126126,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 28920
+	zCol = ts + 28986
 __7:
 	;
 	goto __5
@@ -126072,13 +126134,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28928,
+	zLhs = rbuMPrintf(tls, p, ts+28994,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28949,
+	zOrder = rbuMPrintf(tls, p, ts+29015,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28985,
+	zSelect = rbuMPrintf(tls, p, ts+29051,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14598
+	zSep = ts + 14617
 	iCol++
 	goto __1
 __2:
@@ -126096,12 +126158,12 @@ __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+29012,
+		Xsqlite3_mprintf(tls, ts+29078,
 			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
 	}
-	zSep = ts + 1538
+	zSep = ts + 1557
 	iCol = 0
 __14:
 	if !(iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnCol) {
@@ -126123,8 +126185,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29060, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14598
+	zVector = rbuMPrintf(tls, p, ts+29126, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14617
 	goto __15
 __15:
 	iCol++
@@ -126135,7 +126197,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29067, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29133, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -126162,13 +126224,13 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 	var zImpPK uintptr = uintptr(0)
 	var zWhere uintptr = uintptr(0)
 	var nBind int32 = 0
-	var zCom uintptr = ts + 1538
-	var zAnd uintptr = ts + 1538
+	var zCom uintptr = ts + 1557
+	var zAnd uintptr = ts + 1557
 	*(*uintptr)(unsafe.Pointer(bp + 200)) = uintptr(0)
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28597, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28663, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -126180,9 +126242,9 @@ 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+29079, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29145, 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
+			zType = ts + 1557
 		} else {
 			if iCid < 0 {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK {
@@ -126192,37 +126254,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 + 28920
+					zCol = ts + 28986
 				} else {
-					zCol = ts + 28650
+					zCol = ts + 28716
 				}
-				zType = ts + 1103
+				zType = ts + 1122
 			} 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+29101, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29167, 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 + 28837
+					return ts + 28903
 				}
-				return ts + 1538
+				return ts + 1557
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29121,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29187,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29142,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29208,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29175, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29241, 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 + 14598
-		zAnd = ts + 21509
+		zCom = ts + 14617
+		zAnd = ts + 21575
 		nBind++
 	}
 
@@ -126256,16 +126318,16 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 
 	var zList uintptr = uintptr(0)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
-		var zS uintptr = ts + 1538
+		var zS uintptr = ts + 1557
 		var i int32
 		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+29199, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29265, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29211, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29277, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14598
+			zS = ts + 14617
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -126273,7 +126335,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+29220, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29286, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -126285,27 +126347,27 @@ 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+29235, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29301, 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 zSep uintptr = ts + 1557
 		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+29249, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21509
+				zList = rbuMPrintf(tls, p, ts+29315, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21575
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29261, libc.VaList(bp+40, zList))
+			ts+29327, libc.VaList(bp+40, zList))
 
 	} else {
-		var zSep uintptr = ts + 1538
+		var zSep uintptr = ts + 1557
 		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 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29311, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21509
+				zList = rbuMPrintf(tls, p, ts+29377, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21575
 			}
 		}
 	}
@@ -126314,7 +126376,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+29324, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29390, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -126328,21 +126390,21 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 		if int32(libc.Xstrlen(tls, zMask)) != (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 			rbuBadControlError(tls, p)
 		} else {
-			var zSep uintptr = ts + 1538
+			var zSep uintptr = ts + 1557
 			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+29311,
+					zList = rbuMPrintf(tls, p, ts+29377,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14598
+					zSep = ts + 14617
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29350,
+					zList = rbuMPrintf(tls, p, ts+29416,
 						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 + 14598
+					zSep = ts + 14617
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29380,
+					zList = rbuMPrintf(tls, p, ts+29446,
 						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 + 14598
+					zSep = ts + 14617
 				}
 			}
 		}
@@ -126377,19 +126439,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 + 29417
+		var zSep uintptr = ts + 29483
 		*(*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+28569, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28635, 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+16158) == 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+28597, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28663, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -126401,15 +126463,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 + 28837
+					zDesc = ts + 28903
 				} else {
-					zDesc = ts + 1538
+					zDesc = ts + 1557
 				}
-				z = rbuMPrintf(tls, p, ts+29430, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14598
+				z = rbuMPrintf(tls, p, ts+29496, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14617
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29441, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29507, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -126424,12 +126486,12 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		*(*uintptr)(unsafe.Pointer(bp + 168)) = uintptr(0)
 		var zIdx uintptr = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
-		var zComma uintptr = ts + 1538
+		var zComma uintptr = ts + 1557
 		var zCols uintptr = uintptr(0)
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29445)
+			ts+29511)
 		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))) {
@@ -126438,7 +126500,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+28597, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28663, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -126448,25 +126510,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+29495, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29561, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29517, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29583, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28837
+						return ts + 28903
 					}
-					return ts + 1538
+					return ts + 1557
 				}()))
-				zComma = ts + 14598
+				zComma = ts + 14617
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29527, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29593, 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+6425, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29542,
+			ts+29608,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, 0, 0))
 	}
 }
 
@@ -126476,50 +126538,50 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
 		var tnum int32 = (*RbuObjIter)(unsafe.Pointer(pIter)).FiTnum
-		var zComma uintptr = ts + 1538
+		var zComma uintptr = ts + 1557
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
-			var zPk uintptr = ts + 1538
+			var zPk uintptr = ts + 1557
 			var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCol)*8))
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, (*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 + 29604
+				zPk = ts + 29670
 			}
-			zSql = rbuMPrintf(tls, p, ts+29617,
+			zSql = rbuMPrintf(tls, p, ts+29683,
 				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 + 29644
+							return ts + 29710
 						}
-						return ts + 1538
+						return ts + 1557
 					}()))
-			zComma = ts + 14598
+			zComma = ts + 14617
 		}
 
 		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+29654, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29720, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		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,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29727,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29693
+						return ts + 29759
 					}
-					return ts + 1538
+					return ts + 1557
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, 0, 0))
 	}
 }
 
@@ -126532,7 +126594,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+29708,
+				ts+29774,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -126569,7 +126631,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+29765)
+			ts+29831)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -126674,7 +126736,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+29831, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29897, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -126694,24 +126756,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+6425, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29851,
+				ts+29917,
 				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+6425, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, 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+29916, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29982, 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+29952, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+30018, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -126727,7 +126789,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29986,
+						ts+30052,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -126735,31 +126797,31 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 30047
+											return ts + 30113
 										}
-										return ts + 30051
+										return ts + 30117
 									}()
 								}
-								return ts + 1538
+								return ts + 1557
 							}(), zStart,
 							zCollist, zLimit))
 					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+30057,
+						ts+30123,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30118,
+						ts+30184,
 						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 + 30047
+									return ts + 30113
 								}
-								return ts + 30051
+								return ts + 30117
 							}(),
 							zCollist, zLimit))
 				}
@@ -126784,8 +126846,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+6436)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6432)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6455)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6451)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -126794,52 +126856,52 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			rbuCreateImposterTable2(tls, p, pIter)
 			zWrite = func() uintptr {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
-					return ts + 1538
+					return ts + 1557
 				}
-				return ts + 30277
+				return ts + 30343
 			}()
 
 			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+30286,
+						ts+30352,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30322
+								return ts + 30388
 							}
-							return ts + 1538
+							return ts + 1557
 						}(), zBindings)))
 			}
 
 			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+30332, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30398, 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
+				var zRbuRowid uintptr = ts + 1557
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30360
+					zRbuRowid = ts + 30426
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30372, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30438, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30448
+							return ts + 30514
 						}
-						return ts + 1538
+						return ts + 1557
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30465,
+					ts+30531,
 					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+30764,
+						ts+30830,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -126847,14 +126909,14 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-				var zRbuRowid uintptr = ts + 1538
+				var zRbuRowid uintptr = ts + 1557
 				var zStart uintptr = uintptr(0)
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30863
+						zRbuRowid = ts + 30929
 					} else {
-						zRbuRowid = ts + 30873
+						zRbuRowid = ts + 30939
 					}
 				}
 
@@ -126867,35 +126929,35 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28920, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28986, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1538, ts+14598, ts+1538)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1557, ts+14617, ts+1557)
 					}
 				}
 
 				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+30884,
+							ts+30950,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30932
+										return ts + 30998
 									}
-									return ts + 1538
+									return ts + 1557
 								}(),
 								zRbuRowid,
 								(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 									if zStart != 0 {
 										return zStart
 									}
-									return ts + 1538
+									return ts + 1557
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 22843
+										return ts + 22909
 									}
-									return ts + 1538
+									return ts + 1557
 								}(), zOrder,
 								zLimit)))
 				}
@@ -126958,12 +127020,12 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 		(*RbuObjIter)(unsafe.Pointer(pIter)).FpRbuUpdate = pUp
 
 		if zSet != 0 {
-			var zPrefix uintptr = ts + 1538
+			var zPrefix uintptr = ts + 1557
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30277
+				zPrefix = ts + 30343
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30938,
+			zUpdate = Xsqlite3_mprintf(tls, ts+31004,
 				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)
@@ -126990,7 +127052,7 @@ func rbuOpenDbhandle(tls *libc.TLS, p uintptr, zName uintptr, bUseVfs int32) uin
 			return uintptr(0)
 		}())
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
 			Xsqlite3_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 			*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 		}
@@ -127022,7 +127084,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+30968, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+31034, 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:
@@ -127092,28 +127154,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+6425, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6444, 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+6425)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+30998, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6444)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31064, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		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))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31092, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.Xmemcpy(tls, p+48, ts+3289, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+6425, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+6444, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31044, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31110, 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+6425, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6444, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -127146,11 +127208,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+31110, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31176, 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+24190, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24256, (*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)))) == '?' {
@@ -127162,16 +127224,16 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31142,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6425),
+			zTarget = Xsqlite3_mprintf(tls, ts+31208,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6444),
 					func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1538
+							return ts + 1557
 						}
-						return ts + 31174
+						return ts + 31240
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1538
+							return ts + 1557
 						}
 						return zExtra
 					}()))
@@ -127187,37 +127249,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+31176, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31242, -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+31191, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31257, 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+31208, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31274, -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+6425, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31224, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31290, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, 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+31252, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31318, 0)
 	}
 }
 
@@ -127246,14 +127308,14 @@ 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+31224, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31290, 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+31270, uintptr(0), uintptr(0), uintptr(0))
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31336, uintptr(0), uintptr(0), uintptr(0))
 		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
@@ -127362,7 +127424,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+6425, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6444, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -127379,23 +127441,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+31305, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31371, 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+6425)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444)
 	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+6425)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6444)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31330, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31337, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31396, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31403, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -127512,7 +127574,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+23828, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23894, 0)
 			return
 		}
 
@@ -127605,7 +127667,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+31344)
+			ts+31410)
 		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)
@@ -127613,7 +127675,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+31366, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31432, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -127634,7 +127696,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+31393,
+				ts+31459,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -127664,9 +127726,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+31551, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31617, 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+31566,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31632,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -127680,10 +127742,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+31586, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31652, 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+31611)
+			ts+31677)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -127697,12 +127759,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+31719)
+			ts+31785)
 	}
 
 	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+31784)
+			ts+31850)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -127714,7 +127776,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+31828, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31894, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -127734,15 +127796,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+17243)
+					rbuCopyPragma(tls, p, ts+16354)
 				}
 
 				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+31853, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31919, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -127766,10 +127828,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+14502, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14521, 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+14502, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14521, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -127864,7 +127926,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+31881, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31947, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -127880,10 +127942,10 @@ func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31330, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31396, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 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)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6444, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
@@ -127897,7 +127959,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+31906, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31972, 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)
@@ -127931,7 +127993,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+31917, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31983, 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 {
@@ -127961,13 +128023,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+31989, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32055, 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+32003)
+				ts+32069)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -127978,7 +128040,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+32060)
+				ts+32126)
 			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)
@@ -128023,7 +128085,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			libc.Xmemcpy(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, zRbu, nRbu+uint64(1))
 			pCsr += uintptr(nRbu + uint64(1))
 			if zState != 0 {
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3647, libc.VaList(bp, zState))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+3666, libc.VaList(bp, zState))
 			}
 
 			rbuOpenDatabase(tls, p, uintptr(0), bp+16)
@@ -128052,7 +128114,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+32134, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32200, 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
@@ -128070,12 +128132,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+32166,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32232,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32198
+							return ts + 32264
 						}
-						return ts + 32205
+						return ts + 32271
 					}()))
 			}
 		}
@@ -128083,7 +128145,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+14487, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14506, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -128094,19 +128156,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+16957)
+						rbuCopyPragma(tls, p, ts+16369)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32212, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32278, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6425, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6444, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32228, uintptr(0), uintptr(0), p+64)
+								db, ts+32294, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -128160,7 +128222,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+32252, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32318, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -128187,7 +128249,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+30277, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30343, 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++
@@ -128204,7 +128266,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+14502, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14521, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -128217,13 +128279,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+14502, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14521, 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+32260, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32326, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -128318,7 +128380,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+14502, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14521, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128335,19 +128397,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+14502, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14521, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14487
+				zBegin = ts + 14506
 			} else {
-				zBegin = ts + 32212
+				zBegin = ts + 32278
 			}
 			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+32212, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32278, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128693,7 +128755,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+32287, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32353, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -128718,7 +128780,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+32310, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32376, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -128863,7 +128925,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+6425)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6444)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -128878,7 +128940,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+32321, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32387, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -129123,6 +129185,970 @@ func Xsqlite3rbu_temp_size(tls *libc.TLS, pRbu uintptr) Sqlite3_int64 {
 	return (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FszTemp
 }
 
+var zDbstatSchema = *(*[258]int8)(unsafe.Pointer(ts + 32398))
+
+// Forward reference to data structured used in this module
+type StatTable1 = struct {
+	Fbase        Sqlite3_vtab
+	Fdb          uintptr
+	FiDb         int32
+	F__ccgo_pad1 [4]byte
+}
+
+// Forward reference to data structured used in this module
+type StatTable = StatTable1
+type StatCursor1 = struct {
+	Fbase        Sqlite3_vtab_cursor
+	FpStmt       uintptr
+	FisEof       U8
+	FisAgg       U8
+	F__ccgo_pad1 [2]byte
+	FiDb         int32
+	FaPage       [32]StatPage
+	FiPage       int32
+	FiPageno     U32
+	FzName       uintptr
+	FzPath       uintptr
+	FzPagetype   uintptr
+	FnPage       int32
+	FnCell       int32
+	FnMxPayload  int32
+	F__ccgo_pad2 [4]byte
+	FnUnused     I64
+	FnPayload    I64
+	FiOffset     I64
+	FszPage      I64
+}
+
+type StatCursor = StatCursor1
+type StatPage1 = struct {
+	FiPgno         U32
+	F__ccgo_pad1   [4]byte
+	FaPg           uintptr
+	FiCell         int32
+	F__ccgo_pad2   [4]byte
+	FzPath         uintptr
+	Fflags         U8
+	F__ccgo_pad3   [3]byte
+	FnCell         int32
+	FnUnused       int32
+	F__ccgo_pad4   [4]byte
+	FaCell         uintptr
+	FiRightChildPg U32
+	FnMxPayload    int32
+}
+
+type StatPage = StatPage1
+type StatCell1 = struct {
+	FnLocal      int32
+	FiChildPg    U32
+	FnOvfl       int32
+	F__ccgo_pad1 [4]byte
+	FaOvfl       uintptr
+	FnLastOvfl   int32
+	FiOvfl       int32
+}
+
+type StatCell = StatCell1
+
+func statConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var pTab uintptr = uintptr(0)
+	var rc int32 = SQLITE_OK
+	var iDb int32
+	_ = pAux
+
+	if argc >= 4 {
+		Xsqlite3TokenInit(tls, bp+8, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
+		iDb = Xsqlite3FindDb(tls, db, bp+8)
+		if iDb < 0 {
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+11874, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
+			return SQLITE_ERROR
+		}
+	} else {
+		iDb = 0
+	}
+	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_DIRECTONLY, 0)
+	rc = Xsqlite3_declare_vtab(tls, db, uintptr(unsafe.Pointer(&zDbstatSchema)))
+	if rc == SQLITE_OK {
+		pTab = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatTable{})))
+		if pTab == uintptr(0) {
+			rc = SQLITE_NOMEM
+		}
+	}
+
+	if rc == SQLITE_OK {
+		libc.Xmemset(tls, pTab, 0, uint64(unsafe.Sizeof(StatTable{})))
+		(*StatTable)(unsafe.Pointer(pTab)).Fdb = db
+		(*StatTable)(unsafe.Pointer(pTab)).FiDb = iDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
+	return rc
+}
+
+func statDisconnect(tls *libc.TLS, pVtab uintptr) int32 {
+	Xsqlite3_free(tls, pVtab)
+	return SQLITE_OK
+}
+
+func statBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
+	var i int32
+	var iSchema int32 = -1
+	var iName int32 = -1
+	var iAgg int32 = -1
+	_ = tab
+
+	for i = 0; i < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; i++ {
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fop) != SQLITE_INDEX_CONSTRAINT_EQ {
+			continue
+		}
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fusable) == 0 {
+			return SQLITE_CONSTRAINT
+		}
+		switch (*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(i)*12)).FiColumn {
+		case 0:
+			{
+				iName = i
+				break
+
+			}
+		case 10:
+			{
+				iSchema = i
+				break
+
+			}
+		case 11:
+			{
+				iAgg = i
+				break
+
+			}
+		}
+	}
+	i = 0
+	if iSchema >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).Fomit = uint8(1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x01
+	}
+	if iName >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iName)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x02
+	}
+	if iAgg >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iAgg)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x04
+	}
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 1.0
+
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy == 1 &&
+		(*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)).FnOrderBy == 2 &&
+		(*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_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).FiColumn == 1 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x08
+	}
+
+	return SQLITE_OK
+}
+
+func statOpen(tls *libc.TLS, pVTab uintptr, ppCursor uintptr) int32 {
+	var pTab uintptr = pVTab
+	var pCsr uintptr
+
+	pCsr = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatCursor{})))
+	if pCsr == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		libc.Xmemset(tls, pCsr, 0, uint64(unsafe.Sizeof(StatCursor{})))
+		(*StatCursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab = pVTab
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppCursor)) = pCsr
+	return SQLITE_OK
+}
+
+func statClearCells(tls *libc.TLS, p uintptr) {
+	var i int32
+	if (*StatPage)(unsafe.Pointer(p)).FaCell != 0 {
+		for i = 0; i < (*StatPage)(unsafe.Pointer(p)).FnCell; i++ {
+			Xsqlite3_free(tls, (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell+uintptr(i)*32)).FaOvfl)
+		}
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FaCell)
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnCell = 0
+	(*StatPage)(unsafe.Pointer(p)).FaCell = uintptr(0)
+}
+
+func statClearPage(tls *libc.TLS, p uintptr) {
+	var aPg uintptr = (*StatPage)(unsafe.Pointer(p)).FaPg
+	statClearCells(tls, p)
+	Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FzPath)
+	libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(StatPage{})))
+	(*StatPage)(unsafe.Pointer(p)).FaPg = aPg
+}
+
+func statResetCsr(tls *libc.TLS, pCsr uintptr) {
+	var i int32
+
+	for i = 0; i < int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{}))); i++ {
+		statClearPage(tls, pCsr+24+uintptr(i)*64)
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(pCsr+24+uintptr(i)*64)).FaPg)
+		(*StatPage)(unsafe.Pointer(pCsr + 24 + uintptr(i)*64)).FaPg = uintptr(0)
+	}
+	Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(0)
+}
+
+func statResetCounts(tls *libc.TLS, pCsr uintptr) {
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnCell = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnUnused = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPayload = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FszPage = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 0
+}
+
+func statClose(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	Xsqlite3_free(tls, pCsr)
+	return SQLITE_OK
+}
+
+func getLocalPayload(tls *libc.TLS, nUsable int32, flags U8, nTotal int32) int32 {
+	var nLocal int32
+	var nMinLocal int32
+	var nMaxLocal int32
+
+	if int32(flags) == 0x0D {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = nUsable - 35
+	} else {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = (nUsable-12)*64/255 - 23
+	}
+
+	nLocal = nMinLocal + (nTotal-nMinLocal)%(nUsable-4)
+	if nLocal > nMaxLocal {
+		nLocal = nMinLocal
+	}
+	return nLocal
+}
+
+func statDecodePage(tls *libc.TLS, pBt uintptr, p uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var nUnused int32
+	var iOff int32
+	var nHdr int32
+	var isLeaf int32
+	var szPage int32
+	var aData uintptr
+	var aHdr uintptr
+	var iNext int32
+
+	var rc int32
+	var iPrev U32
+
+	var j int32
+	var nOvfl int32
+
+	var nLocal int32
+	var pCell uintptr
+	var i int32
+	var nUsable int32
+	aData = (*StatPage)(unsafe.Pointer(p)).FaPg
+	aHdr = aData + uintptr(func() int32 {
+		if (*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1) {
+			return 100
+		}
+		return 0
+	}())
+
+	(*StatPage)(unsafe.Pointer(p)).Fflags = *(*U8)(unsafe.Pointer(aHdr))
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0A || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __1
+	}
+	isLeaf = 1
+	nHdr = 8
+	goto __2
+__1:
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05 || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x02) {
+		goto __3
+	}
+	isLeaf = 0
+	nHdr = 12
+	goto __4
+__3:
+	goto statPageIsCorrupt
+__4:
+	;
+__2:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1)) {
+		goto __5
+	}
+	nHdr = nHdr + 100
+__5:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnCell = int32(*(*U8)(unsafe.Pointer(aHdr + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 3 + 1)))
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = 0
+	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
+
+	nUnused = int32(*(*U8)(unsafe.Pointer(aHdr + 5)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 5 + 1))) - nHdr - 2*(*StatPage)(unsafe.Pointer(p)).FnCell
+	nUnused = nUnused + int32(*(*U8)(unsafe.Pointer(aHdr + 7)))
+	iOff = int32(*(*U8)(unsafe.Pointer(aHdr + 1)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 1 + 1)))
+__6:
+	if !(iOff != 0) {
+		goto __7
+	}
+	if !(iOff >= szPage) {
+		goto __8
+	}
+	goto statPageIsCorrupt
+__8:
+	;
+	nUnused = nUnused + (int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2) + 1))))
+	iNext = int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff) + 1)))
+	if !(iNext < iOff+4 && iNext > 0) {
+		goto __9
+	}
+	goto statPageIsCorrupt
+__9:
+	;
+	iOff = iNext
+	goto __6
+__7:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnUnused = nUnused
+	(*StatPage)(unsafe.Pointer(p)).FiRightChildPg = func() uint32 {
+		if isLeaf != 0 {
+			return uint32(0)
+		}
+		return Xsqlite3Get4byte(tls, aHdr+8)
+	}()
+
+	if !((*StatPage)(unsafe.Pointer(p)).FnCell != 0) {
+		goto __10
+	}
+
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = szPage - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatPage)(unsafe.Pointer(p)).FaCell = Xsqlite3_malloc64(tls, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+	if !((*StatPage)(unsafe.Pointer(p)).FaCell == uintptr(0)) {
+		goto __11
+	}
+	return SQLITE_NOMEM
+__11:
+	;
+	libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+
+	i = 0
+__12:
+	if !(i < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __14
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr(i)*32
+
+	iOff = int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2) + 1)))
+	if !(iOff < nHdr || iOff >= szPage) {
+		goto __15
+	}
+	goto statPageIsCorrupt
+__15:
+	;
+	if !!(isLeaf != 0) {
+		goto __16
+	}
+	(*StatCell)(unsafe.Pointer(pCell)).FiChildPg = Xsqlite3Get4byte(tls, aData+uintptr(iOff))
+	iOff = iOff + 4
+__16:
+	;
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05) {
+		goto __17
+	}
+
+	goto __18
+__17:
+	iOff = iOff + int32(func() uint8 {
+		if int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff)))) < int32(U8(0x80)) {
+			return uint8(func() int32 {
+				*(*U32)(unsafe.Pointer(bp)) = U32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))
+				return 1
+			}())
+		}
+		return Xsqlite3GetVarint32(tls, aData+uintptr(iOff), bp)
+	}())
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __19
+	}
+	iOff = iOff + int32(Xsqlite3GetVarint(tls, aData+uintptr(iOff), bp+8))
+__19:
+	;
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32((*StatPage)(unsafe.Pointer(p)).FnMxPayload)) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = int32(*(*U32)(unsafe.Pointer(bp)))
+__20:
+	;
+	nLocal = getLocalPayload(tls, nUsable, (*StatPage)(unsafe.Pointer(p)).Fflags, int32(*(*U32)(unsafe.Pointer(bp))))
+	if !(nLocal < 0) {
+		goto __21
+	}
+	goto statPageIsCorrupt
+__21:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLocal = nLocal
+
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32(nLocal)) {
+		goto __22
+	}
+	nOvfl = int32((*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) + U32(nUsable) - U32(4) - U32(1)) / U32(nUsable-4))
+	if !(iOff+nLocal+4 > nUsable || *(*U32)(unsafe.Pointer(bp)) > U32(0x7fffffff)) {
+		goto __23
+	}
+	goto statPageIsCorrupt
+__23:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl = int32(*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) - U32((nOvfl-1)*(nUsable-4)))
+	(*StatCell)(unsafe.Pointer(pCell)).FnOvfl = nOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FaOvfl = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(U32(0)))*uint64(nOvfl))
+	if !((*StatCell)(unsafe.Pointer(pCell)).FaOvfl == uintptr(0)) {
+		goto __24
+	}
+	return SQLITE_NOMEM
+__24:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl)) = Xsqlite3Get4byte(tls, aData+uintptr(iOff+nLocal))
+	j = 1
+__25:
+	if !(j < nOvfl) {
+		goto __27
+	}
+	iPrev = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j-1)*4))
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPrev, bp+16, 0)
+	if !(rc != SQLITE_OK) {
+		goto __28
+	}
+
+	return rc
+__28:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j)*4)) = Xsqlite3Get4byte(tls, Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 16))))
+	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
+	goto __26
+__26:
+	j++
+	goto __25
+	goto __27
+__27:
+	;
+__22:
+	;
+__18:
+	;
+	goto __13
+__13:
+	i++
+	goto __12
+	goto __14
+__14:
+	;
+__10:
+	;
+	return SQLITE_OK
+
+statPageIsCorrupt:
+	(*StatPage)(unsafe.Pointer(p)).Fflags = U8(0)
+	statClearCells(tls, p)
+	return SQLITE_OK
+}
+
+func statSizeAndOffset(tls *libc.TLS, pCsr uintptr) {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCsr)).FpVtab
+	var pBt uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatTable)(unsafe.Pointer(pTab)).FiDb)*32)).FpBt
+	var pPager uintptr = Xsqlite3BtreePager(tls, pBt)
+	var fd uintptr
+
+	fd = Xsqlite3PagerFile(tls, pPager)
+	*(*Sqlite3_int64)(unsafe.Pointer(bp)) = Sqlite3_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	if Xsqlite3OsFileControl(tls, fd, 230440, bp) == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = *(*Sqlite3_int64)(unsafe.Pointer(bp))
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += *(*Sqlite3_int64)(unsafe.Pointer(bp + 1*8))
+	} else {
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += I64(Xsqlite3BtreeGetPageSize(tls, pBt))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = (*StatCursor)(unsafe.Pointer(pCsr)).FszPage * I64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno-U32(1))
+	}
+}
+
+func statGetPage(tls *libc.TLS, pBt uintptr, iPg U32, pPg uintptr) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var pgsz int32 = Xsqlite3BtreeGetPageSize(tls, pBt)
+	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
+	var rc int32
+
+	if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+		(*StatPage)(unsafe.Pointer(pPg)).FaPg = Xsqlite3_malloc(tls, pgsz+DBSTAT_PAGE_PADDING_BYTES)
+		if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+			return SQLITE_NOMEM
+		}
+		libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0, uint64(DBSTAT_PAGE_PADDING_BYTES))
+	}
+
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPg, bp, 0)
+	if rc == SQLITE_OK {
+		var a uintptr = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		libc.Xmemcpy(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, a, uint64(pgsz))
+		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+	}
+
+	return rc
+}
+
+func statNext(tls *libc.TLS, pCursor uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
+	var rc int32
+	var nPayload int32
+	var z uintptr
+	var pCsr uintptr
+	var pTab uintptr
+	var pBt uintptr
+	var pPager uintptr
+
+	var iRoot U32
+	var nUsable int32
+	var iOvfl int32
+	var pCell uintptr
+
+	var p uintptr
+	var i int32
+	var p1 uintptr
+	pCsr = pCursor
+	pTab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	pBt = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FpBt
+	pPager = Xsqlite3BtreePager(tls, pBt)
+
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+
+statNextRestart:
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __1
+	}
+
+	statResetCounts(tls, pCsr)
+	rc = Xsqlite3_step(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	if !(rc == SQLITE_ROW) {
+		goto __3
+	}
+	iRoot = U32(Xsqlite3_column_int64(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 1))
+	Xsqlite3PagerPagecount(tls, pPager, bp+48)
+	if !(*(*int32)(unsafe.Pointer(bp + 48)) == 0) {
+		goto __5
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__5:
+	;
+	rc = statGetPage(tls, pBt, iRoot, pCsr+24)
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiPgno = iRoot
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __6
+	}
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32656, 0))
+	if !(z == uintptr(0)) {
+		goto __7
+	}
+	rc = SQLITE_NOMEM
+__7:
+	;
+__6:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 1
+	goto __4
+__3:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__4:
+	;
+	goto __2
+__1:
+	p = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __8
+	}
+	statResetCounts(tls, pCsr)
+__8:
+	;
+__9:
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __10
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32
+__11:
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl) {
+		goto __12
+	}
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = Xsqlite3BtreeGetPageSize(tls, pBt) - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	statSizeAndOffset(tls, pCsr)
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl-1) {
+		goto __13
+	}
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nUsable - 4)
+	goto __14
+__13:
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64((*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64(nUsable - 4 - (*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+__14:
+	;
+	iOvfl = (*StatCell)(unsafe.Pointer(pCell)).FiOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FiOvfl++
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __15
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(iOvfl)*4))
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32658
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls,
+		ts+32667, libc.VaList(bp, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell, iOvfl)))
+	if z == uintptr(0) {
+		return SQLITE_NOMEM
+	}
+	return SQLITE_OK
+__15:
+	;
+	goto __11
+__12:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiRightChildPg != 0) {
+		goto __16
+	}
+	goto __10
+__16:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+	goto __9
+__10:
+	;
+	if !(!(int32((*StatPage)(unsafe.Pointer(p)).FiRightChildPg) != 0) || (*StatPage)(unsafe.Pointer(p)).FiCell > (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __17
+	}
+	statClearPage(tls, p)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage--
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 && (*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __18
+	}
+
+	return SQLITE_OK
+__18:
+	;
+	goto statNextRestart
+__17:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage++
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage >= int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{})))) {
+		goto __19
+	}
+	statResetCsr(tls, pCsr)
+	return Xsqlite3CorruptError(tls, 215455)
+__19:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell == (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatPage)(unsafe.Pointer(p)).FiRightChildPg
+	goto __21
+__20:
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32)).FiChildPg
+__21:
+	;
+	rc = statGetPage(tls, pBt, (*StatPage)(unsafe.Pointer(p+1*64)).FiPgno, p+1*64)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __22
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+32679, libc.VaList(bp+24, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell)))
+	if !(z == uintptr(0)) {
+		goto __23
+	}
+	rc = SQLITE_NOMEM
+__23:
+	;
+__22:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+__2:
+	;
+	if !(rc == SQLITE_OK) {
+		goto __24
+	}
+	p1 = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = (*StatPage)(unsafe.Pointer(p1)).FiPgno
+
+	rc = statDecodePage(tls, pBt, p1)
+	if !(rc == SQLITE_OK) {
+		goto __25
+	}
+	statSizeAndOffset(tls, pCsr)
+
+	switch int32((*StatPage)(unsafe.Pointer(p1)).Fflags) {
+	case 0x05:
+		goto __27
+	case 0x02:
+		goto __28
+	case 0x0D:
+		goto __29
+	case 0x0A:
+		goto __30
+	default:
+		goto __31
+	}
+	goto __26
+__27:
+__28:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32687
+	goto __26
+__29:
+__30:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32696
+	goto __26
+__31:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 32701
+	goto __26
+__26:
+	;
+	*(*int32)(unsafe.Pointer(pCsr + 2108)) += (*StatPage)(unsafe.Pointer(p1)).FnCell
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64((*StatPage)(unsafe.Pointer(p1)).FnUnused)
+	if !((*StatPage)(unsafe.Pointer(p1)).FnMxPayload > (*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload) {
+		goto __32
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = (*StatPage)(unsafe.Pointer(p1)).FnMxPayload
+__32:
+	;
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __33
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+40, (*StatPage)(unsafe.Pointer(p1)).FzPath)))
+	if !(z == uintptr(0)) {
+		goto __34
+	}
+	rc = SQLITE_NOMEM
+__34:
+	;
+__33:
+	;
+	nPayload = 0
+	i = 0
+__35:
+	if !(i < (*StatPage)(unsafe.Pointer(p1)).FnCell) {
+		goto __37
+	}
+	nPayload = nPayload + (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p1)).FaCell+uintptr(i)*32)).FnLocal
+	goto __36
+__36:
+	i++
+	goto __35
+	goto __37
+__37:
+	;
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nPayload)
+
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0) {
+		goto __38
+	}
+	goto statNextRestart
+__38:
+	;
+__25:
+	;
+__24:
+	;
+	return rc
+}
+
+func statEof(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	return int32((*StatCursor)(unsafe.Pointer(pCsr)).FisEof)
+}
+
+func statFilter(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintptr, argc int32, argv uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pCsr uintptr = pCursor
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	var pSql uintptr
+	var zSql uintptr
+	var iArg int32 = 0
+	var rc int32 = SQLITE_OK
+	var zName uintptr = uintptr(0)
+	_ = argc
+	_ = idxStr
+
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FpStmt = uintptr(0)
+	if idxNum&0x01 != 0 {
+		var zDbase uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = Xsqlite3FindDbName(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zDbase)
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FiDb < 0 {
+			(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = 0
+			(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+			return SQLITE_OK
+		}
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+	if idxNum&0x02 != 0 {
+		zName = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+	}
+	if idxNum&0x04 != 0 {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(libc.Bool32(Xsqlite3_value_double(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8))) != 0.0))
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(0)
+	}
+	pSql = Xsqlite3_str_new(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb)
+	Xsqlite3_str_appendf(tls, pSql,
+		ts+32711,
+		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb+uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FzDbSName))
+	if zName != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32866, libc.VaList(bp+8, zName))
+	}
+	if idxNum&0x08 != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+32880, 0)
+	}
+	zSql = Xsqlite3_str_finish(tls, pSql)
+	if zSql == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		rc = Xsqlite3_prepare_v2(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
+		Xsqlite3_free(tls, zSql)
+	}
+
+	if rc == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = -1
+		rc = statNext(tls, pCursor)
+	}
+	return rc
+}
+
+func statColumn(tls *libc.TLS, pCursor uintptr, ctx uintptr, i int32) int32 {
+	var pCsr uintptr = pCursor
+	switch i {
+	case 0:
+		Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzName, -1, libc.UintptrFromInt32(-1))
+		break
+	case 1:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath, -1, libc.UintptrFromInt32(-1))
+		}
+		break
+	case 2:
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnPage))
+		} else {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno))
+		}
+		break
+	case 3:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype, -1, uintptr(0))
+		}
+		break
+	case 4:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnCell))
+		break
+	case 5:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnPayload)
+		break
+	case 6:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnUnused)
+		break
+	case 7:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload))
+		break
+	case 8:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FiOffset)
+		}
+		break
+	case 9:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FszPage)
+		break
+	case 10:
+		{
+			var db uintptr = Xsqlite3_context_db_handle(tls, ctx)
+			var iDb int32 = (*StatCursor)(unsafe.Pointer(pCsr)).FiDb
+			Xsqlite3_result_text(tls, ctx, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, -1, uintptr(0))
+			break
+
+		}
+	default:
+		{
+			Xsqlite3_result_int(tls, ctx, int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg))
+			break
+
+		}
+	}
+	return SQLITE_OK
+}
+
+func statRowid(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32 {
+	var pCsr uintptr = pCursor
+	*(*Sqlite_int64)(unsafe.Pointer(pRowid)) = Sqlite_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	return SQLITE_OK
+}
+
+// Invoke this routine to register the "dbstat" virtual table module
+func Xsqlite3DbstatRegister(tls *libc.TLS, db uintptr) int32 {
+	return Xsqlite3_create_module(tls, db, ts+32895, uintptr(unsafe.Pointer(&dbstat_module)), uintptr(0))
+}
+
+var dbstat_module = Sqlite3_module{
+	FxCreate:     0,
+	FxConnect:    0,
+	FxBestIndex:  0,
+	FxDisconnect: 0,
+	FxDestroy:    0,
+	FxOpen:       0,
+	FxClose:      0,
+	FxFilter:     0,
+	FxNext:       0,
+	FxEof:        0,
+	FxColumn:     0,
+	FxRowid:      0,
+}
+
 type SessionTable1 = struct {
 	FpNext    uintptr
 	FzName    uintptr
@@ -129703,13 +130729,13 @@ 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+11332, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11351, 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+32332, 0)
+				ts+32902, 0)
 		} else if rc == SQLITE_ERROR {
-			zPragma = Xsqlite3_mprintf(tls, ts+1538, 0)
+			zPragma = Xsqlite3_mprintf(tls, ts+1557, 0)
 		} else {
 			*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
 			*(*uintptr)(unsafe.Pointer(pabPK)) = uintptr(0)
@@ -129720,7 +130746,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32453, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+33023, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -129818,7 +130844,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11332, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11351, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -130067,7 +131093,7 @@ __4:
 	goto error_out
 __7:
 	;
-	Xsqlite3ValueSetStr(tls, p, 0, ts+1538, uint8(0), uintptr(0))
+	Xsqlite3ValueSetStr(tls, p, 0, ts+1557, uint8(0), uintptr(0))
 	(*Sqlite3_session)(unsafe.Pointer(pSession)).FpZeroBlob = p
 __6:
 	;
@@ -130395,14 +131421,14 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1538
+	var zSep uintptr = ts + 1557
 	var zRet uintptr = uintptr(0)
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32482,
+			zRet = Xsqlite3_mprintf(tls, ts+33052,
 				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 + 21509
+			zSep = ts + 21575
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130417,7 +131443,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1538
+	var zSep uintptr = ts + 1557
 	var zRet uintptr = uintptr(0)
 	var bHave int32 = 0
 
@@ -130425,9 +131451,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+32516,
+				ts+33086,
 				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 + 32557
+			zSep = ts + 33127
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130435,7 +131461,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7514, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7522, 0)
 	}
 
 	return zRet
@@ -130446,7 +131472,7 @@ func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintpt
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32562,
+		ts+33132,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -130489,7 +131515,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32640,
+			ts+33210,
 			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
@@ -130616,7 +131642,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32693, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33263, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -130881,7 +131907,7 @@ func sessionAppendInteger(tls *libc.TLS, p uintptr, iVal int32, pRc uintptr) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
-	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]int8{}))-uint64(1)), bp+8, ts+4959, libc.VaList(bp, iVal))
+	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]int8{}))-uint64(1)), bp+8, ts+4978, libc.VaList(bp, iVal))
 	sessionAppendStr(tls, p, bp+8, pRc)
 }
 
@@ -131090,29 +132116,29 @@ 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+11332, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11351, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32720, libc.VaList(bp, zDb))
+			ts+33290, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
 	} else {
 		var i int32
-		var zSep uintptr = ts + 1538
+		var zSep uintptr = ts + 1557
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32830, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33400, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
-		sessionAppendStr(tls, bp+8, ts+1551, bp+24)
+		sessionAppendStr(tls, bp+8, ts+1570, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+32845, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33415, 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+32853, bp+24)
+				sessionAppendStr(tls, bp+8, ts+33423, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21509
+				zSep = ts + 21575
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -131221,7 +132247,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+32859, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33429, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -131313,7 +132339,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32879, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33449, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -131576,7 +132602,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, 219078)
+				rc = Xsqlite3CorruptError(tls, 219169)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -131599,7 +132625,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, 219098)
+						rc = Xsqlite3CorruptError(tls, 219189)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -131641,7 +132667,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, 219152)
+			rc = Xsqlite3CorruptError(tls, 219243)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -131702,7 +132728,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, 219240)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219331)
 		}
 	}
 
@@ -131776,13 +132802,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, 219326))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219417))
 	}
 
 	(*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, 219332))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219423))
 	}
 
 	if paRec != 0 {
@@ -131844,7 +132870,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, 219376))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219467))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -132217,7 +133243,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219832)
 	goto finished_invert
 __6:
 	;
@@ -132385,45 +133411,45 @@ 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+11332) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11351) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
 			} else {
-				var zSep uintptr = ts + 1538
+				var zSep uintptr = ts + 1557
 
 				libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(SessionBuffer{})))
 				(*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+32897, bp+16)
+				sessionAppendStr(tls, bp, ts+33467, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+32910, bp+16)
+				sessionAppendStr(tls, bp, ts+33480, 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+32916, bp+16)
+						sessionAppendStr(tls, bp, ts+33486, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 14598
+						zSep = ts + 14617
 					}
 				}
 
-				zSep = ts + 1538
-				sessionAppendStr(tls, bp, ts+32845, bp+16)
+				zSep = ts + 1557
+				sessionAppendStr(tls, bp, ts+33415, 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+32921, bp+16)
+								ts+33491, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+32853, bp+16)
+							sessionAppendStr(tls, bp, ts+33423, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21509
+						zSep = ts + 21575
 					}
 				}
 
@@ -132470,42 +133496,42 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	defer tls.Free(20)
 
 	var i int32
-	var zSep uintptr = ts + 1538
+	var zSep uintptr = ts + 1557
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+32996, bp+16)
+	sessionAppendStr(tls, bp, ts+33566, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+32845, bp+16)
+	sessionAppendStr(tls, bp, ts+33415, 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+32916, bp+16)
+			sessionAppendStr(tls, bp, ts+33486, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21509
+			zSep = ts + 21575
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+33014, bp+16)
+		sessionAppendStr(tls, bp, ts+33584, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32557, bp+16)
+		sessionAppendStr(tls, bp, ts+33127, bp+16)
 
-		zSep = ts + 1538
+		zSep = ts + 1557
 		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+32853, bp+16)
+				sessionAppendStr(tls, bp, ts+33423, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 33022
+				zSep = ts + 33592
 			}
 		}
-		sessionAppendStr(tls, bp, ts+4941, bp+16)
+		sessionAppendStr(tls, bp, ts+4960, bp+16)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
@@ -132518,7 +133544,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+6425, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6444, 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 {
@@ -132529,21 +133555,21 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+33027, bp+16)
+	sessionAppendStr(tls, bp, ts+33597, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21515, bp+16)
+	sessionAppendStr(tls, bp, ts+21581, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14598, bp+16)
+			sessionAppendStr(tls, bp, ts+14617, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+33045, bp+16)
+	sessionAppendStr(tls, bp, ts+33615, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33056, bp+16)
+		sessionAppendStr(tls, bp, ts+33626, bp+16)
 	}
-	sessionAppendStr(tls, bp, ts+4941, bp+16)
+	sessionAppendStr(tls, bp, ts+4960, bp+16)
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v2(tls, db, (*SessionBuffer)(unsafe.Pointer(bp)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp)).FnBuf, p+16, uintptr(0))
@@ -132557,14 +133583,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+11332, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11351, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+33060)
+			ts+33630)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33173)
+			ts+33743)
 	}
 	return rc
 }
@@ -132592,7 +133618,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, 220219)
+				rc = Xsqlite3CorruptError(tls, 220310)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -132845,7 +133871,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+33317, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33887, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -132861,7 +133887,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+33338, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33908, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -132934,10 +133960,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+33357, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33927, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33383, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33953, 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))
@@ -132970,7 +133996,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				f func(*libc.TLS, uintptr, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xFilter})).f(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 176))))
 			if schemaMismatch != 0 {
-				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
+				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
 				if *(*uintptr)(unsafe.Pointer(bp + 200)) == uintptr(0) {
 					rc = SQLITE_NOMEM
 					break
@@ -132983,7 +134009,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+6425, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6444, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -132996,19 +134022,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+33413, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33983, 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+33457,
+						ts+34027,
 						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+33528, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+34098, 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+11332) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11351) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -133059,14 +134085,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33588, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34158, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33618, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34188, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33642, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33618, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34212, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34188, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -134314,7 +135340,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33670, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+34240, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -134602,7 +135628,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33698, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+34268, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -134789,7 +135815,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+33729, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34299, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -134857,7 +135883,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33736
+		var zErr uintptr = ts + 34306
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135016,7 +136042,7 @@ func fts5ValueToText(tls *libc.TLS, pVal uintptr) uintptr {
 	if zRet != 0 {
 		return zRet
 	}
-	return ts + 1538
+	return ts + 1557
 }
 
 func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, nVal int32, apVal uintptr) {
@@ -135039,7 +136065,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33786
+		var zErr uintptr = ts + 34356
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135363,13 +136389,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33834, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34404, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33842, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34412, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33852, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34422, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -135780,7 +136806,7 @@ func fts5ConfigSkipLiteral(tls *libc.TLS, pIn uintptr) uintptr {
 	case 'n':
 		fallthrough
 	case 'N':
-		if Xsqlite3_strnicmp(tls, ts+6165, p, 4) == 0 {
+		if Xsqlite3_strnicmp(tls, ts+6184, p, 4) == 0 {
 			p = p + 4
 		} else {
 			p = uintptr(0)
@@ -135920,7 +136946,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+33857, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34427, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -135947,14 +136973,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+33864, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34434, 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+33895, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+34465, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -135965,7 +136991,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33928, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34498, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -135978,7 +137004,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33965, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34535, 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)))
@@ -135987,7 +137013,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+33974, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34544, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -136006,7 +137032,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34007, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34577, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -136021,14 +137047,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34041, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34611, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34049, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34619, 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+34081, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34651, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -136036,9 +137062,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34087, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34657, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34101, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34671, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -136046,9 +137072,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34139, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34709, 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+34150, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34720, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -136056,21 +137082,21 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+5059, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+5078, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 8010, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17329},
-			{FzName: ts + 34185, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8029, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17348},
+			{FzName: ts + 34755, 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+34193, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34763, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34224, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34794, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -136117,15 +137143,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+22175) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16251) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34252, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22241) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16270) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34822, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34282) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34852) {
 			*(*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+34292, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34862, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -136142,13 +137168,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+34323, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34893, 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+34328, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34898, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34335, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34905, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -136186,8 +137212,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+22175) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34343, 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+22241) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34913, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -136219,7 +137245,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+34372, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34942, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -136228,13 +137254,13 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 							if *(*uintptr)(unsafe.Pointer(bp + 48)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 48))
 							}
-							return ts + 1538
+							return ts + 1557
 						}(),
 						func() uintptr {
 							if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 64))
 							}
-							return ts + 1538
+							return ts + 1557
 						}(),
 						pzErr)
 				} else {
@@ -136256,19 +137282,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 + 34041
+			zTail = ts + 34611
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34392
+			zTail = ts + 34962
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34400, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34970, 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+16270, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -136312,18 +137338,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+34411, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34981, 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 + 1557
 			}
-			return ts + 14598
+			return ts + 14617
 		}()
-		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+34997, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34434,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22175))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35004,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22241))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -136433,7 +137459,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34460) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35030) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -136443,7 +137469,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+34465) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35035) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -136453,7 +137479,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+34474) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35044) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -136466,7 +137492,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+34484) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35054) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -136476,7 +137502,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+34494) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35064) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -136492,7 +137518,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+22175) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22241) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -136515,7 +137541,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34506
+	var zSelect uintptr = ts + 35076
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -136537,7 +137563,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+34538) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35108) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -136551,7 +137577,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+34546,
+				ts+35116,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -136649,7 +137675,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34611, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+35181, 0)
 					return FTS5_EOF
 				}
 			}
@@ -136662,20 +137688,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+34631, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+35201, 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+34662, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35232, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34665, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35235, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30047, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30113, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -138453,9 +139479,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+34669, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35239, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33698, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+34268, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -138471,7 +139497,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+34674, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+35244, 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')
@@ -138558,7 +139584,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20512, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20578, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -138639,7 +139665,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+34703, 0)
+			ts+35273, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -138809,12 +139835,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+34756,
+								ts+35326,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34806
+										return ts + 35376
 									}
-									return ts + 34669
+									return ts + 35239
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -139757,7 +140783,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+34813, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35383, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -139836,7 +140862,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+34819,
+			ts+35389,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -139861,7 +140887,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+34870,
+			ts+35440,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -139884,7 +140910,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+34919,
+			ts+35489,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -140123,7 +141149,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+34959, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+35529, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -141322,7 +142348,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+34982,
+			ts+35552,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -142515,7 +143541,7 @@ func fts5WriteFlushBtree(tls *libc.TLS, p uintptr, pWriter uintptr) {
 			if (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn > 0 {
 				return (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fp
 			}
-			return ts + 1538
+			return ts + 1557
 		}()
 
 		Xsqlite3_bind_blob(tls, (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter, 2, z, (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn, uintptr(0))
@@ -142788,7 +143814,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+35066,
+			ts+35636,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -143854,7 +144880,7 @@ func sqlite3Fts5IndexReinit(tls *libc.TLS, p uintptr) int32 {
 	fts5StructureInvalidate(tls, p)
 	fts5IndexDiscardData(tls, p)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Fts5Structure{})))
-	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1538, 0)
+	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1557, 0)
 	fts5StructureWrite(tls, p, bp)
 	return fts5IndexReturn(tls, p)
 }
@@ -143870,13 +144896,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+35123, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35693, 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+25040, ts+35131, 0, pzErr)
+				pConfig, ts+25106, ts+35701, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11472,
-					ts+35166,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11491,
+					ts+35736,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -144129,7 +145155,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+34813, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+35383, 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)))
@@ -144243,7 +145269,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35210,
+		ts+35780,
 		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))) {
@@ -144413,7 +145439,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+35296)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35866)
 			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))
@@ -144684,7 +145710,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+35301, 0)
+			ts+35871, 0)
 		return SQLITE_ERROR
 	}
 
@@ -144715,7 +145741,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 				} else if iCol >= 0 {
 					bSeenMatch = 1
 					*(*int8)(unsafe.Pointer(idxStr + uintptr(libc.PostIncInt32(&iIdxStr, 1)))) = int8('M')
-					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4959, libc.VaList(bp, iCol))
+					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4978, libc.VaList(bp, iCol))
 					idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 
 				}
@@ -144730,7 +145756,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 					}
 					return int8('G')
 				}()
-				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4959, libc.VaList(bp+8, iCol))
+				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+4978, libc.VaList(bp+8, iCol))
 				idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 				(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pInfo)).FaConstraintUsage + uintptr(i)*8)).FargvIndex = libc.PreIncInt32(&iCons, 1)
 
@@ -145044,7 +146070,7 @@ func fts5NextMethod(tls *libc.TLS, pCursor uintptr) int32 {
 					rc = Xsqlite3_reset(tls, (*Fts5Cursor)(unsafe.Pointer(pCsr)).FpStmt)
 					if rc != SQLITE_OK {
 						(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-							ts+3647, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+							ts+3666, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 					}
 				} else {
 					rc = SQLITE_OK
@@ -145076,7 +146102,7 @@ func fts5PrepareStatement(tls *libc.TLS, ppStmt uintptr, pConfig uintptr, zFmt u
 		rc = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
 			uint32(SQLITE_PREPARE_PERSISTENT), bp+8, uintptr(0))
 		if rc != SQLITE_OK {
-			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 		}
 		Xsqlite3_free(tls, zSql)
 	}
@@ -145108,25 +146134,25 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35340,
+		ts+35910,
 		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 + 14598
+					return ts + 14617
 				}
-				return ts + 1538
+				return ts + 1557
 			}(),
 			func() uintptr {
 				if zRankArgs != 0 {
 					return zRankArgs
 				}
-				return ts + 1538
+				return ts + 1557
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35395
+					return ts + 35965
 				}
-				return ts + 35400
+				return ts + 35970
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -145172,12 +146198,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+35404, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35974, 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) {
+	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5060, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35410, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35980, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -145208,7 +146234,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+35438, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36008, 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,
@@ -145239,7 +146265,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+35448, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36018, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -145271,14 +146297,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+35469, libc.VaList(bp, z))
+				ts+36039, 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 + 33852
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34422
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -145334,7 +146360,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+35301, 0)
+		ts+35871, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -145377,7 +146403,7 @@ __8:
 	if !(zText == uintptr(0)) {
 		goto __14
 	}
-	zText = ts + 1538
+	zText = ts + 1557
 __14:
 	;
 	iCol = 0
@@ -145551,7 +146577,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35502, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+36072, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -145672,7 +146698,7 @@ func fts5SeekCursor(tls *libc.TLS, pCsr uintptr, bErrormsg int32) int32 {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			} else if (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg != 0 {
 				*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-					ts+3647, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
+					ts+3666, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
 			}
 		}
 	}
@@ -145696,28 +146722,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+35538, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36108, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35549, 0)
+				ts+36119, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35629, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36199, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35637, 0)
+				ts+36207, 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+16937, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35693, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36263, 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+35699, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36269, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -145775,7 +146801,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+17482, 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)))
@@ -145788,12 +146814,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+35715,
+				ts+36285,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20413
+						return ts + 20479
 					}
-					return ts + 35752
+					return ts + 36322
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -146423,7 +147449,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+35764, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36334, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -146667,7 +147693,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+35785, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36355, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -146686,7 +147712,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+35807, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36377, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -146733,7 +147759,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+35838)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36408)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -146742,7 +147768,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+35851, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+36421, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -146756,7 +147782,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35942, ts + 34041, ts + 25040, ts + 34392, ts + 11472,
+	ts + 36512, ts + 34611, ts + 25106, ts + 34962, ts + 11491,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -146780,7 +147806,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+35949, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+36519, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -146798,13 +147824,13 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35949, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36519, 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+35954, 0,
+				db, ts+36524, 0,
 				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
 				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
@@ -146861,17 +147887,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 + 35969,
-			ts + 36037,
-			ts + 36106,
-			ts + 36139,
-			ts + 36178,
-			ts + 36218,
-			ts + 36257,
-			ts + 36298,
-			ts + 36337,
-			ts + 36379,
-			ts + 36419,
+			ts + 36539,
+			ts + 36607,
+			ts + 36676,
+			ts + 36709,
+			ts + 36748,
+			ts + 36788,
+			ts + 36827,
+			ts + 36868,
+			ts + 36907,
+			ts + 36949,
+			ts + 36989,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -146938,7 +147964,7 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 			(*Fts5Config)(unsafe.Pointer((*Fts5Storage)(unsafe.Pointer(p)).FpConfig)).FbLock--
 			Xsqlite3_free(tls, zSql)
 			if rc != SQLITE_OK && pzErrMsg != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3647, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+3666, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
 			}
 		}
 	}
@@ -146973,18 +147999,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+36442,
+		ts+37012,
 		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+36546,
+			ts+37116,
 			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+36584,
+			ts+37154,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -146996,7 +148022,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+36622,
+			ts+37192,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -147008,14 +148034,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+25040, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11472, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35942, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25106, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11491, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+36512, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34392, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34962, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34041, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34611, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -147027,17 +148053,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+36664,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37234,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29693
+					return ts + 29759
 				}
-				return ts + 1538
+				return ts + 1557
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36694,
+			ts+37264,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -147074,27 +148100,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36738, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37308, 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+36761, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37331, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34041, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34611, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34392, ts+36767, 0, pzErr)
+				pConfig, ts+34962, ts+37337, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35942, ts+36799, 1, pzErr)
+				pConfig, ts+36512, ts+37369, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34538, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35108, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -147300,12 +148326,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+36816,
+		ts+37386,
 		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+36866,
+			ts+37436,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -147313,7 +148339,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+34538, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35108, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -147489,7 +148515,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36895,
+	zSql = Xsqlite3_mprintf(tls, ts+37465,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -147671,14 +148697,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+34041, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34611, 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+34392, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34962, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -147873,9 +148899,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+36927) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37497) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36938) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37508) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -148090,7 +149116,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 + 36949
+			var zCat uintptr = ts + 37519
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -148102,7 +149128,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+36958) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37528) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -148113,18 +149139,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+36969) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37539) {
 					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+36927) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37497) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36938) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37508) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36958) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37528) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -148400,7 +149426,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 + 36987
+	var zBase uintptr = ts + 37557
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -148542,7 +149568,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+36997, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37567, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148550,11 +149576,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37000, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37570, 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+37005, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37575, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148562,7 +149588,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37010, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37580, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148570,7 +149596,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37013, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37583, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148578,11 +149604,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37586, 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+37021, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37591, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148590,19 +149616,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37026, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37596, 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+37030, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37600, 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+37036, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37606, 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+37041, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37611, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148610,11 +149636,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37045, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37615, 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+37049, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37619, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148622,7 +149648,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37052, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37622, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148630,11 +149656,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37056, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37626, 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+37060, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37630, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148642,7 +149668,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37064, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37634, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148650,7 +149676,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37638, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148658,7 +149684,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37642, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148674,24 +149700,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+37076, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37056, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37646, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37626, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37649, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37652, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37656, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37642, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -148706,137 +149732,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+37089, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37659, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37056, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37626, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37097, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37667, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37104, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37674, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37109, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37679, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37005, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37575, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37114, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37684, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37000, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37570, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37119, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37689, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37124, 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.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15464, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15483, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37129, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37699, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37082, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37652, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37133, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37703, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36997, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37567, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37138, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37708, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37041, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37611, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37144, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37714, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37148, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37718, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37150, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37720, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37064, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37634, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37156, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37726, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37072, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37642, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37164, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37734, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37056, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37626, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37170, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37740, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37056, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37626, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37175, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37745, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36997, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37567, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37181, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37751, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37068, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37638, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37189, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37759, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37197, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37767, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37201, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37771, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37064, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37634, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37209, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37779, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36997, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37567, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37215, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37785, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37068, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37638, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37221, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37791, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37082, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37652, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -148851,16 +149877,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+37228, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37798, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37233, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37803, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148868,21 +149894,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37238, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37808, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37244, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37814, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37583, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37197, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37767, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148890,7 +149916,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37250, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37820, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -148898,9 +149924,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37256, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37826, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36997, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37567, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -148915,12 +149941,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+37262, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37832, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37266, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37836, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37269, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37839, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -148929,7 +149955,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37272, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37842, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -149085,7 +150111,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+37276) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37846) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -149265,22 +150291,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36987, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37557, 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 + 37291, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37861, 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 + 37297, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37867, 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 + 37304, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37874, 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
@@ -150423,14 +151449,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+37312) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37882) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37316) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37886) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37320) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37890) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37329, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37899, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -150456,19 +151482,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 + 37363,
-		ts + 37403,
-		ts + 37438,
+		ts + 37933,
+		ts + 37973,
+		ts + 38008,
 	}
 
 	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+23336, *(*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+23402, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37481, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38051, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -150601,11 +151627,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+37514, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+38084, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37545,
+		ts+38115,
 		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))
@@ -150629,7 +151655,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+37596, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38166, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -150913,7 +151939,7 @@ func fts5VocabFilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, zUnused
 		if pLe != 0 {
 			var zCopy uintptr = Xsqlite3_value_text(tls, pLe)
 			if zCopy == uintptr(0) {
-				zCopy = ts + 1538
+				zCopy = ts + 1557
 			}
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm = Xsqlite3_value_bytes(tls, pLe)
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FzLeTerm = Xsqlite3_malloc(tls, (*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm+1)
@@ -151024,7 +152050,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+37622, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+38192, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -151046,7 +152072,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 + 37632
+	return ts + 38202
 }
 
 func init() {
@@ -151469,6 +152495,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1056)) = noopStepFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1064)) = uintptr(unsafe.Pointer(&lagName))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&attach_func)) + 24)) = attachFunc
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 8)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 16)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 24)) = statBestIndex
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 32)) = statDisconnect
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 40)) = statDisconnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 48)) = statOpen
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 56)) = statClose
+	*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 64)) = statFilter
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 72)) = statNext
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 80)) = statEof
+	*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 88)) = statColumn
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 96)) = statRowid
 	*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 0)) = sqlite3MemMalloc
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 8)) = sqlite3MemFree
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 16)) = sqlite3MemRealloc
@@ -152001,8 +153039,9 @@ func init() {
 	*(*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
-	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = Xsqlite3JsonTableFunctions
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = Xsqlite3DbstatRegister
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = sqlite3TestExtInit
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 32)) = Xsqlite3JsonTableFunctions
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statGetFuncdef)) + 24)) = statGet
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statInitFuncdef)) + 24)) = statInit
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statPushFuncdef)) + 24)) = statPush
@@ -152020,5 +153059,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-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 ts1 = "3.41.2\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_DBSTAT_VTAB\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\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\x00true\x00false\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 \x00rowid not at end-of-record for row \x00 of 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\x00CREATE TABLE x( name       TEXT, path       TEXT, pageno     INTEGER, pagetype   TEXT, ncell      INTEGER, payload    INTEGER, unused     INTEGER, mx_payload INTEGER, pgoffset   INTEGER, pgsize     INTEGER, schema     TEXT HIDDEN, aggregate  BOOLEAN HIDDEN)\x00/\x00overflow\x00%s%.3x+%.6x\x00%s%.3x/\x00internal\x00leaf\x00corrupted\x00SELECT * FROM (SELECT 'sqlite_schema' AS name,1 AS rootpage,'table' AS type UNION ALL SELECT name,rootpage,type FROM \"%w\".sqlite_schema WHERE rootpage!=0)\x00WHERE name=%Q\x00 ORDER BY name\x00dbstat\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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 57c8fcdb..dd74406c 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -2963,6 +2963,7 @@ const (
 	DBFLAG_SchemaKnownOk                                                           = 0x0010
 	DBFLAG_Vacuum                                                                  = 0x0004
 	DBFLAG_VacuumInto                                                              = 0x0008
+	DBSTAT_PAGE_PADDING_BYTES                                                      = 256
 	DB_ResetWanted                                                                 = 0x0008
 	DB_SchemaLoaded                                                                = 0x0001
 	DB_UnresetViews                                                                = 0x0002
@@ -10492,11 +10493,11 @@ const (
 	NC_OrderAgg                                                                    = 0x8000000
 	NC_PartIdx                                                                     = 0x000002
 	NC_SelfRef                                                                     = 0x00002e
+	NC_Subquery                                                                    = 0x000040
 	NC_UAggInfo                                                                    = 0x000100
 	NC_UBaseReg                                                                    = 0x000400
 	NC_UEList                                                                      = 0x000080
 	NC_UUpsert                                                                     = 0x000200
-	NC_VarSelect                                                                   = 0x000040
 	NDEBUG                                                                         = 1
 	NDR_ASCII_CHAR                                                                 = 0
 	NDR_BIG_ENDIAN                                                                 = 0
@@ -14684,6 +14685,7 @@ const (
 	SQLITE_ECEL_REF                                                                = 0x04
 	SQLITE_EMPTY                                                                   = 16
 	SQLITE_ENABLE_COLUMN_METADATA                                                  = 1
+	SQLITE_ENABLE_DBSTAT_VTAB                                                      = 1
 	SQLITE_ENABLE_FTS5                                                             = 1
 	SQLITE_ENABLE_GEOPOLY                                                          = 1
 	SQLITE_ENABLE_LOCKING_STYLE                                                    = 0
@@ -15089,7 +15091,7 @@ const (
 	SQLITE_SHM_UNLOCK                                                              = 1
 	SQLITE_SORTER_PMASZ                                                            = 250
 	SQLITE_SOUNDEX                                                                 = 1
-	SQLITE_SOURCE_ID                                                               = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
+	SQLITE_SOURCE_ID                                                               = "2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da"
 	SQLITE_SO_ASC                                                                  = 0
 	SQLITE_SO_DESC                                                                 = 1
 	SQLITE_SO_UNDEFINED                                                            = -1
@@ -15200,8 +15202,8 @@ const (
 	SQLITE_UTF8                                                                    = 1
 	SQLITE_VDBEINT_H                                                               = 0
 	SQLITE_VDBE_H                                                                  = 0
-	SQLITE_VERSION                                                                 = "3.41.0"
-	SQLITE_VERSION_NUMBER                                                          = 3041000
+	SQLITE_VERSION                                                                 = "3.41.2"
+	SQLITE_VERSION_NUMBER                                                          = 3041002
 	SQLITE_VTABRISK_High                                                           = 2
 	SQLITE_VTABRISK_Low                                                            = 0
 	SQLITE_VTABRISK_Normal                                                         = 1
@@ -24337,7 +24339,8 @@ type IndexedExpr1 = struct {
 	FiIdxCur       int32
 	FiIdxCol       int32
 	FbMaybeNullRow U8
-	F__ccgo_pad1   [3]byte
+	Faff           U8
+	F__ccgo_pad1   [2]byte
 	FpIENext       uintptr
 }
 
@@ -24982,17 +24985,18 @@ type Pager = Pager1
 
 // Handle type for pages.
 type PgHdr2 = struct {
-	FpPage      uintptr
-	FpData      uintptr
-	FpExtra     uintptr
-	FpCache     uintptr
-	FpDirty     uintptr
-	FpPager     uintptr
-	Fpgno       Pgno
-	Fflags      U16
-	FnRef       I16
-	FpDirtyNext uintptr
-	FpDirtyPrev uintptr
+	FpPage       uintptr
+	FpData       uintptr
+	FpExtra      uintptr
+	FpCache      uintptr
+	FpDirty      uintptr
+	FpPager      uintptr
+	Fpgno        Pgno
+	Fflags       U16
+	F__ccgo_pad1 [2]byte
+	FnRef        I64
+	FpDirtyNext  uintptr
+	FpDirtyPrev  uintptr
 }
 
 // Handle type for pages.
@@ -25213,14 +25217,14 @@ type PCache2 = struct {
 	FpDirty      uintptr
 	FpDirtyTail  uintptr
 	FpSynced     uintptr
-	FnRefSum     int32
+	FnRefSum     I64
 	FszCache     int32
 	FszSpill     int32
 	FszPage      int32
 	FszExtra     int32
 	FbPurgeable  U8
 	FeCreate     U8
-	F__ccgo_pad1 [2]byte
+	F__ccgo_pad1 [6]byte
 	FxStress     uintptr
 	FpStress     uintptr
 	FpCache      uintptr
@@ -25479,7 +25483,7 @@ type CoveringIndexCheck1 = struct {
 	F__ccgo_pad1 [2]byte
 }
 
-var sqlite3azCompileOpt = [52]uintptr{
+var sqlite3azCompileOpt = [53]uintptr{
 	ts + 7,
 	ts + 27,
 	ts + 46,
@@ -25498,40 +25502,41 @@ var sqlite3azCompileOpt = [52]uintptr{
 	ts + 362,
 	ts + 387,
 	ts + 410,
-	ts + 422,
-	ts + 437,
-	ts + 459,
-	ts + 484,
-	ts + 507,
-	ts + 529,
-	ts + 540,
-	ts + 553,
-	ts + 568,
-	ts + 584,
-	ts + 597,
-	ts + 618,
-	ts + 642,
-	ts + 665,
-	ts + 681,
-	ts + 697,
-	ts + 721,
-	ts + 748,
-	ts + 768,
-	ts + 789,
-	ts + 811,
-	ts + 841,
-	ts + 866,
-	ts + 892,
-	ts + 912,
-	ts + 938,
-	ts + 961,
-	ts + 987,
-	ts + 1009,
-	ts + 1030,
-	ts + 1041,
+	ts + 429,
+	ts + 441,
+	ts + 456,
+	ts + 478,
+	ts + 503,
+	ts + 526,
+	ts + 548,
+	ts + 559,
+	ts + 572,
+	ts + 587,
+	ts + 603,
+	ts + 616,
+	ts + 637,
+	ts + 661,
+	ts + 684,
+	ts + 700,
+	ts + 716,
+	ts + 740,
+	ts + 767,
+	ts + 787,
+	ts + 808,
+	ts + 830,
+	ts + 860,
+	ts + 885,
+	ts + 911,
+	ts + 931,
+	ts + 957,
+	ts + 980,
+	ts + 1006,
+	ts + 1028,
 	ts + 1049,
-	ts + 1063,
-	ts + 1076,
+	ts + 1060,
+	ts + 1068,
+	ts + 1082,
+	ts + 1095,
 }
 
 func Xsqlite3CompileOptions(tls *libc.TLS, pnOpt uintptr) uintptr {
@@ -25683,7 +25688,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 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))
+var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1108))
 
 // Standard typenames.  These names must match the COLTYPE_* definitions.
 // Adjust the SQLITE_N_STDTYPE value if adding or removing entries.
@@ -25705,12 +25710,12 @@ var Xsqlite3StdTypeAffinity = [6]int8{
 	int8(SQLITE_AFF_TEXT),
 }
 var Xsqlite3StdType = [6]uintptr{
-	ts + 1096,
-	ts + 1100,
-	ts + 1105,
-	ts + 1109,
-	ts + 1117,
-	ts + 1122,
+	ts + 1115,
+	ts + 1119,
+	ts + 1124,
+	ts + 1128,
+	ts + 1136,
+	ts + 1141,
 }
 
 // SQL is translated into a sequence of instructions to be
@@ -26027,7 +26032,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, 23229)
+		return Xsqlite3MisuseError(tls, 23233)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -26467,7 +26472,7 @@ __6:
 __4:
 	;
 	zDate++
-	if !(getDigits(tls, zDate, ts+1127, libc.VaList(bp, bp+16, bp+20)) != 2) {
+	if !(getDigits(tls, zDate, ts+1146, libc.VaList(bp, bp+16, bp+20)) != 2) {
 		goto __9
 	}
 	return 1
@@ -26493,13 +26498,13 @@ func parseHhMmSs(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	defer tls.Free(36)
 
 	var ms float64 = 0.0
-	if getDigits(tls, zDate, ts+1135, libc.VaList(bp, bp+24, bp+28)) != 2 {
+	if getDigits(tls, zDate, ts+1154, libc.VaList(bp, bp+24, bp+28)) != 2 {
 		return 1
 	}
 	zDate += uintptr(5)
 	if int32(*(*int8)(unsafe.Pointer(zDate))) == ':' {
 		zDate++
-		if getDigits(tls, zDate, ts+1143, libc.VaList(bp+16, bp+32)) != 1 {
+		if getDigits(tls, zDate, ts+1162, libc.VaList(bp+16, bp+32)) != 1 {
 			return 1
 		}
 		zDate += uintptr(2)
@@ -26597,7 +26602,7 @@ func parseYyyyMmDd(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	} else {
 		neg = 0
 	}
-	if getDigits(tls, zDate, ts+1147, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
+	if getDigits(tls, zDate, ts+1166, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
 		return 1
 	}
 	zDate += uintptr(10)
@@ -26654,7 +26659,7 @@ func parseDateOrTime(tls *libc.TLS, context uintptr, zDate uintptr, p uintptr) i
 		return 0
 	} else if parseHhMmSs(tls, zDate, p) == 0 {
 		return 0
-	} else if Xsqlite3StrICmp(tls, zDate, ts+1159) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
+	} else if Xsqlite3StrICmp(tls, zDate, ts+1178) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
 		return setDateTimeToCurrent(tls, context, p)
 	} else if Xsqlite3AtoF(tls, zDate, bp, Xsqlite3Strlen30(tls, zDate), uint8(SQLITE_UTF8)) > 0 {
 		setRawDateNumber(tls, p, *(*float64)(unsafe.Pointer(bp)))
@@ -26787,7 +26792,7 @@ func toLocaltime(tls *libc.TLS, p uintptr, pCtx uintptr) int32 {
 		*(*Time_t)(unsafe.Pointer(bp + 88)) = (*DateTime)(unsafe.Pointer(p)).FiJD/int64(1000) - int64(21086676)*int64(10000)
 	}
 	if osLocaltime(tls, bp+88, bp) != 0 {
-		Xsqlite3_result_error(tls, pCtx, ts+1163, -1)
+		Xsqlite3_result_error(tls, pCtx, ts+1182, -1)
 		return SQLITE_ERROR
 	}
 	(*DateTime)(unsafe.Pointer(p)).FY = (*tm)(unsafe.Pointer(bp)).Ftm_year + 1900 - iYearDiff
@@ -26811,12 +26816,12 @@ var aXformType = [6]struct {
 	FrLimit float32
 	FrXform float32
 }{
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1186)), FrLimit: 4.6427e+14, FrXform: 1.0},
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1193)), FrLimit: 7.7379e+12, FrXform: 60.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1200)), FrLimit: 1.2897e+11, FrXform: 3600.0},
-	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1207)), FrLimit: 5373485.0, FrXform: 86400.0},
-	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1214)), FrLimit: 176546.0, FrXform: 2592000.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1221)), FrLimit: 14713.0, FrXform: 31536000.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1205)), FrLimit: 4.6427e+14, FrXform: 1.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1212)), FrLimit: 7.7379e+12, FrXform: 60.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1219)), FrLimit: 1.2897e+11, FrXform: 3600.0},
+	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1226)), FrLimit: 5373485.0, FrXform: 86400.0},
+	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1233)), FrLimit: 176546.0, FrXform: 2592000.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1240)), FrLimit: 14713.0, FrXform: 31536000.0},
 }
 
 func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, idx int32) int32 {
@@ -26828,7 +26833,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 	switch int32(Xsqlite3UpperToLower[U8(*(*int8)(unsafe.Pointer(z)))]) {
 	case 'a':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1228) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1247) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -26850,7 +26855,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'j':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1233) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1252) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -26864,7 +26869,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'l':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1243) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1262) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				rc = toLocaltime(tls, p, pCtx)
 			}
 			break
@@ -26872,7 +26877,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'u':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1253) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1272) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -26884,7 +26889,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 					rc = 0
 				}
-			} else if Xsqlite3_stricmp(tls, z, ts+1263) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1282) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				if int32((*DateTime)(unsafe.Pointer(p)).FtzSet) == 0 {
 					var iOrigJD I64
 					var iGuess I64
@@ -26918,7 +26923,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'w':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1267, 8) == 0 &&
+			if Xsqlite3_strnicmp(tls, z, ts+1286, 8) == 0 &&
 				Xsqlite3AtoF(tls, z+8, bp+48, Xsqlite3Strlen30(tls, z+8), uint8(SQLITE_UTF8)) > 0 &&
 				*(*float64)(unsafe.Pointer(bp + 48)) >= 0.0 && *(*float64)(unsafe.Pointer(bp + 48)) < 7.0 && float64(libc.AssignInt32(&n, int32(*(*float64)(unsafe.Pointer(bp + 48))))) == *(*float64)(unsafe.Pointer(bp + 48)) {
 				var Z Sqlite3_int64
@@ -26939,7 +26944,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 's':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1276, 9) != 0 {
+			if Xsqlite3_strnicmp(tls, z, ts+1295, 9) != 0 {
 				break
 			}
 			if !(int32((*DateTime)(unsafe.Pointer(p)).FvalidJD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidYMD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidHMS) != 0) {
@@ -26953,14 +26958,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 			(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidTZ = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidJD = int8(0)
-			if Xsqlite3_stricmp(tls, z, ts+1286) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1305) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1292) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1311) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FM = 1
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1297) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1316) == 0 {
 				rc = 0
 			}
 			break
@@ -27286,7 +27291,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		switch int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) {
 		case 'd':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1301, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1320, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
 				break
 
 			}
@@ -27296,13 +27301,13 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if s > 59.999 {
 					s = 59.999
 				}
-				Xsqlite3_str_appendf(tls, bp+136, ts+1306, libc.VaList(bp+8, s))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1325, libc.VaList(bp+8, s))
 				break
 
 			}
 		case 'H':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1301, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1320, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
 				break
 
 			}
@@ -27320,41 +27325,41 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) == 'W' {
 					var wd int32
 					wd = int32(((*DateTime)(unsafe.Pointer(bp+88)).FiJD + int64(43200000)) / int64(86400000) % int64(7))
-					Xsqlite3_str_appendf(tls, bp+136, ts+1301, libc.VaList(bp+24, (nDay+7-wd)/7))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1320, libc.VaList(bp+24, (nDay+7-wd)/7))
 				} else {
-					Xsqlite3_str_appendf(tls, bp+136, ts+1313, libc.VaList(bp+32, nDay+1))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1332, libc.VaList(bp+32, nDay+1))
 				}
 				break
 
 			}
 		case 'J':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1318, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1337, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
 				break
 
 			}
 		case 'm':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1301, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1320, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
 				break
 
 			}
 		case 'M':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1301, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1320, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
 				break
 
 			}
 		case 's':
 			{
 				var iS I64 = (*DateTime)(unsafe.Pointer(bp+88)).FiJD/int64(1000) - int64(21086676)*int64(10000)
-				Xsqlite3_str_appendf(tls, bp+136, ts+1324, libc.VaList(bp+64, iS))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1343, libc.VaList(bp+64, iS))
 				break
 
 			}
 		case 'S':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1301, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1320, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
 				break
 
 			}
@@ -27367,7 +27372,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			}
 		case 'Y':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1329, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1348, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
 				break
 
 			}
@@ -27417,15 +27422,15 @@ func Xsqlite3RegisterDateTimeFunctions(tls *libc.TLS) {
 }
 
 var aDateTimeFuncs = [9]FuncDef{
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1233},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1253},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1334},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1339},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1344},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1252},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1272},
 	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1353},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1362},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1375},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1393}}
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1358},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1363},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1372},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1381},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1394},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1412}}
 
 // The following routines are convenience wrappers around methods
 // of the sqlite3_file object.  This is mostly just syntactic sugar. All
@@ -27837,7 +27842,7 @@ func sqlite3MemMalloc(tls *libc.TLS, nByte int32) uintptr {
 
 	p = libc.Xmalloc(tls, uint64(nByte))
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1406, libc.VaList(bp, nByte))
+		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1425, libc.VaList(bp, nByte))
 	}
 	return p
 }
@@ -27857,7 +27862,7 @@ func sqlite3MemRealloc(tls *libc.TLS, pPrior uintptr, nByte int32) uintptr {
 	var p uintptr = libc.Xrealloc(tls, pPrior, uint64(nByte))
 	if p == uintptr(0) {
 		Xsqlite3_log(tls, SQLITE_NOMEM,
-			ts+1444,
+			ts+1463,
 			libc.VaList(bp, libc.X_msize(tls, pPrior), nByte))
 	}
 	return p
@@ -55346,7 +55351,7 @@ func Xsqlite3OomFault(tls *libc.TLS, db uintptr) uintptr {
 		(*Sqlite3)(unsafe.Pointer(db)).Flookaside.Fsz = U16(0)
 		if (*Sqlite3)(unsafe.Pointer(db)).FpParse != 0 {
 			var pParse uintptr
-			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1480, 0)
+			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1499, 0)
 			(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 			for pParse = (*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).FpOuterParse; pParse != 0; pParse = (*Parse)(unsafe.Pointer(pParse)).FpOuterParse {
 				(*Parse)(unsafe.Pointer(pParse)).FnErr++
@@ -55419,8 +55424,8 @@ type et_info = struct {
 // by an instance of the following structure
 type Et_info = et_info
 
-var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1494))
-var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1527))
+var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1513))
+var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1546))
 var fmtinfo = [23]Et_info{
 	{Ffmttype: int8('d'), Fbase: EtByte(10), Fflags: EtByte(1), Ftype: EtByte(EtDECIMAL)},
 	{Ffmttype: int8('s'), Fflags: EtByte(4), Ftype: EtByte(EtSTRING)},
@@ -55634,7 +55639,7 @@ __6:
 	if !(libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(libc.PreIncUintptr(&fmt, 1))))) == 0) {
 		goto __11
 	}
-	Xsqlite3_str_append(tls, pAccum, ts+1534, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1553, 1)
 	goto __5
 __11:
 	;
@@ -56191,7 +56196,7 @@ __125:
 	if !(Xsqlite3IsNaN(tls, *(*float64)(unsafe.Pointer(bp + 104))) != 0) {
 		goto __127
 	}
-	bufpt = ts + 1536
+	bufpt = ts + 1555
 	length = 3
 	goto __58
 __127:
@@ -56251,7 +56256,7 @@ __138:
 	}
 	bufpt = bp + 16
 	*(*int8)(unsafe.Pointer(bp + 16)) = prefix
-	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1540, uint64(4))
+	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1559, uint64(4))
 	length = 3 + libc.Bool32(int32(prefix) != 0)
 	goto __58
 __139:
@@ -56617,7 +56622,7 @@ __200:
 	if !(bufpt == uintptr(0)) {
 		goto __201
 	}
-	bufpt = ts + 1544
+	bufpt = ts + 1563
 	goto __202
 __201:
 	if !(int32(xtype) == EtDYNSTRING) {
@@ -56741,9 +56746,9 @@ __222:
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
-			return ts + 1545
+			return ts + 1564
 		}
-		return ts + 1550
+		return ts + 1569
 	}()
 __223:
 	;
@@ -56891,7 +56896,7 @@ __246:
 		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
-	Xsqlite3_str_append(tls, pAccum, ts+1557, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1576, 1)
 __250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
@@ -56908,10 +56913,10 @@ __251:
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
 		goto __253
 	}
-	Xsqlite3_str_appendf(tls, pAccum, ts+1559, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1578, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 	goto __254
 __253:
-	Xsqlite3_str_appendf(tls, pAccum, ts+1569, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1588, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
 __254:
 	;
 __252:
@@ -56966,7 +56971,7 @@ __4:
 __5:
 }
 
-var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1583))
+var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1602))
 
 // The z string points to the first character of a token that is
 // associated with an error.  If db does not already have an error
@@ -57131,7 +57136,7 @@ func Xsqlite3ResultStrAccum(tls *libc.TLS, pCtx uintptr, p uintptr) {
 	} else if int32((*StrAccum)(unsafe.Pointer(p)).FprintfFlags)&SQLITE_PRINTF_MALLOCED != 0 {
 		Xsqlite3_result_text(tls, pCtx, (*StrAccum)(unsafe.Pointer(p)).FzText, int32((*StrAccum)(unsafe.Pointer(p)).FnChar), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 	} else {
-		Xsqlite3_result_text(tls, pCtx, ts+1544, 0, uintptr(0))
+		Xsqlite3_result_text(tls, pCtx, ts+1563, 0, uintptr(0))
 		Xsqlite3_str_reset(tls, p)
 	}
 }
@@ -58972,7 +58977,7 @@ func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
 	var c int32 = 0
 	var i int32
 
-	var pow63 uintptr = ts + 1592
+	var pow63 uintptr = ts + 1611
 	for i = 0; c == 0 && i < 18; i++ {
 		c = (int32(*(*int8)(unsafe.Pointer(zNum + uintptr(i*incr)))) - int32(*(*int8)(unsafe.Pointer(pow63 + uintptr(i))))) * 10
 	}
@@ -59523,7 +59528,7 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 	defer tls.Free(8)
 
 	Xsqlite3_log(tls, SQLITE_MISUSE,
-		ts+1611,
+		ts+1630,
 		libc.VaList(bp, zType))
 }
 
@@ -59542,13 +59547,13 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 func Xsqlite3SafetyCheckOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	if db == uintptr(0) {
-		logBadConnection(tls, ts+1545)
+		logBadConnection(tls, ts+1564)
 		return 0
 	}
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_OPEN {
 		if Xsqlite3SafetyCheckSickOrOk(tls, db) != 0 {
-			logBadConnection(tls, ts+1656)
+			logBadConnection(tls, ts+1675)
 		}
 		return 0
 	} else {
@@ -59561,7 +59566,7 @@ func Xsqlite3SafetyCheckSickOrOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_SICK && int32(eOpenState) != SQLITE_STATE_OPEN && int32(eOpenState) != SQLITE_STATE_BUSY {
-		logBadConnection(tls, ts+1665)
+		logBadConnection(tls, ts+1684)
 		return 0
 	} else {
 		return 1
@@ -60035,193 +60040,193 @@ func Xsqlite3OpcodeName(tls *libc.TLS, i int32) uintptr {
 }
 
 var azName = [187]uintptr{
-	ts + 1673,
-	ts + 1683,
-	ts + 1694,
-	ts + 1706,
-	ts + 1717,
-	ts + 1729,
+	ts + 1692,
+	ts + 1702,
+	ts + 1713,
+	ts + 1725,
 	ts + 1736,
-	ts + 1744,
-	ts + 1752,
-	ts + 1757,
-	ts + 1762,
-	ts + 1768,
-	ts + 1782,
-	ts + 1788,
-	ts + 1798,
-	ts + 1803,
-	ts + 1808,
-	ts + 1811,
+	ts + 1748,
+	ts + 1755,
+	ts + 1763,
+	ts + 1771,
+	ts + 1776,
+	ts + 1781,
+	ts + 1787,
+	ts + 1801,
+	ts + 1807,
 	ts + 1817,
-	ts + 1824,
-	ts + 1828,
-	ts + 1838,
-	ts + 1845,
-	ts + 1852,
-	ts + 1859,
-	ts + 1866,
-	ts + 1876,
+	ts + 1822,
+	ts + 1827,
+	ts + 1830,
+	ts + 1836,
+	ts + 1843,
+	ts + 1847,
+	ts + 1857,
+	ts + 1864,
+	ts + 1871,
+	ts + 1878,
 	ts + 1885,
-	ts + 1896,
-	ts + 1905,
-	ts + 1911,
-	ts + 1921,
-	ts + 1931,
-	ts + 1936,
-	ts + 1946,
-	ts + 1957,
-	ts + 1962,
-	ts + 1969,
-	ts + 1980,
-	ts + 1985,
-	ts + 1990,
-	ts + 1996,
-	ts + 2002,
-	ts + 2008,
-	ts + 2011,
+	ts + 1895,
+	ts + 1904,
+	ts + 1915,
+	ts + 1924,
+	ts + 1930,
+	ts + 1940,
+	ts + 1950,
+	ts + 1955,
+	ts + 1965,
+	ts + 1976,
+	ts + 1981,
+	ts + 1988,
+	ts + 1999,
+	ts + 2004,
+	ts + 2009,
 	ts + 2015,
 	ts + 2021,
-	ts + 2032,
-	ts + 2043,
+	ts + 2027,
+	ts + 2030,
+	ts + 2034,
+	ts + 2040,
 	ts + 2051,
-	ts + 2060,
-	ts + 2067,
-	ts + 2075,
-	ts + 2078,
-	ts + 2081,
-	ts + 2084,
-	ts + 2087,
-	ts + 2090,
-	ts + 2093,
+	ts + 2062,
+	ts + 2070,
+	ts + 2079,
+	ts + 2086,
+	ts + 2094,
+	ts + 2097,
 	ts + 2100,
+	ts + 2103,
 	ts + 2106,
-	ts + 2116,
-	ts + 2129,
-	ts + 2140,
-	ts + 2146,
-	ts + 2153,
-	ts + 2162,
-	ts + 2171,
-	ts + 2178,
-	ts + 2191,
-	ts + 2202,
-	ts + 2207,
-	ts + 2215,
+	ts + 2109,
+	ts + 2112,
+	ts + 2119,
+	ts + 2125,
+	ts + 2135,
+	ts + 2148,
+	ts + 2159,
+	ts + 2165,
+	ts + 2172,
+	ts + 2181,
+	ts + 2190,
+	ts + 2197,
+	ts + 2210,
 	ts + 2221,
-	ts + 2228,
+	ts + 2226,
+	ts + 2234,
 	ts + 2240,
-	ts + 2245,
-	ts + 2254,
+	ts + 2247,
 	ts + 2259,
-	ts + 2268,
+	ts + 2264,
 	ts + 2273,
 	ts + 2278,
-	ts + 2284,
+	ts + 2287,
 	ts + 2292,
-	ts + 2300,
-	ts + 2310,
-	ts + 2318,
-	ts + 2325,
-	ts + 2338,
-	ts + 2343,
-	ts + 2355,
-	ts + 2363,
-	ts + 2370,
-	ts + 2381,
-	ts + 2388,
-	ts + 2395,
-	ts + 2405,
+	ts + 2297,
+	ts + 2303,
+	ts + 2311,
+	ts + 2319,
+	ts + 2329,
+	ts + 2337,
+	ts + 2344,
+	ts + 2357,
+	ts + 2362,
+	ts + 2374,
+	ts + 2382,
+	ts + 2389,
+	ts + 2400,
+	ts + 2407,
 	ts + 2414,
-	ts + 2425,
-	ts + 2431,
-	ts + 2442,
-	ts + 2452,
-	ts + 2462,
-	ts + 2469,
-	ts + 2475,
-	ts + 2485,
-	ts + 2496,
-	ts + 2500,
-	ts + 2509,
-	ts + 2518,
-	ts + 2525,
-	ts + 2535,
-	ts + 2542,
-	ts + 2551,
+	ts + 2424,
+	ts + 2433,
+	ts + 2444,
+	ts + 2450,
+	ts + 2461,
+	ts + 2471,
+	ts + 2481,
+	ts + 2488,
+	ts + 2494,
+	ts + 2504,
+	ts + 2515,
+	ts + 2519,
+	ts + 2528,
+	ts + 2537,
+	ts + 2544,
+	ts + 2554,
 	ts + 2561,
-	ts + 2568,
-	ts + 2576,
-	ts + 2590,
-	ts + 2598,
-	ts + 2612,
-	ts + 2623,
-	ts + 2636,
-	ts + 2647,
-	ts + 2653,
-	ts + 2665,
-	ts + 2674,
-	ts + 2682,
-	ts + 2691,
-	ts + 2700,
-	ts + 2707,
-	ts + 2715,
-	ts + 2722,
-	ts + 2733,
-	ts + 2747,
-	ts + 2758,
+	ts + 2570,
+	ts + 2580,
+	ts + 2587,
+	ts + 2595,
+	ts + 2609,
+	ts + 2617,
+	ts + 2631,
+	ts + 2642,
+	ts + 2655,
+	ts + 2666,
+	ts + 2672,
+	ts + 2684,
+	ts + 2693,
+	ts + 2701,
+	ts + 2710,
+	ts + 2719,
+	ts + 2726,
+	ts + 2734,
+	ts + 2741,
+	ts + 2752,
 	ts + 2766,
-	ts + 2772,
-	ts + 2780,
-	ts + 2788,
-	ts + 2798,
-	ts + 2811,
-	ts + 2821,
-	ts + 2834,
-	ts + 2843,
-	ts + 2854,
+	ts + 2777,
+	ts + 2785,
+	ts + 2791,
+	ts + 2799,
+	ts + 2807,
+	ts + 2817,
+	ts + 2830,
+	ts + 2840,
+	ts + 2853,
 	ts + 2862,
-	ts + 2868,
-	ts + 2880,
-	ts + 2892,
-	ts + 2900,
-	ts + 2912,
-	ts + 2925,
-	ts + 2935,
-	ts + 2945,
-	ts + 2950,
-	ts + 2962,
-	ts + 2974,
-	ts + 2984,
-	ts + 2990,
-	ts + 3000,
-	ts + 3007,
+	ts + 2873,
+	ts + 2881,
+	ts + 2887,
+	ts + 2899,
+	ts + 2911,
+	ts + 2919,
+	ts + 2931,
+	ts + 2944,
+	ts + 2954,
+	ts + 2964,
+	ts + 2969,
+	ts + 2981,
+	ts + 2993,
+	ts + 3003,
+	ts + 3009,
 	ts + 3019,
-	ts + 3030,
+	ts + 3026,
 	ts + 3038,
-	ts + 3047,
-	ts + 3056,
-	ts + 3065,
-	ts + 3072,
-	ts + 3083,
-	ts + 3096,
-	ts + 3106,
-	ts + 3113,
-	ts + 3121,
-	ts + 3130,
-	ts + 3136,
-	ts + 3144,
-	ts + 3152,
-	ts + 3160,
-	ts + 3170,
+	ts + 3049,
+	ts + 3057,
+	ts + 3066,
+	ts + 3075,
+	ts + 3084,
+	ts + 3091,
+	ts + 3102,
+	ts + 3115,
+	ts + 3125,
+	ts + 3132,
+	ts + 3140,
+	ts + 3149,
+	ts + 3155,
+	ts + 3163,
+	ts + 3171,
 	ts + 3179,
-	ts + 3190,
-	ts + 3200,
-	ts + 3206,
-	ts + 3217,
-	ts + 3228,
-	ts + 3233,
-	ts + 3241,
+	ts + 3189,
+	ts + 3198,
+	ts + 3209,
+	ts + 3219,
+	ts + 3225,
+	ts + 3236,
+	ts + 3247,
+	ts + 3252,
+	ts + 3260,
 }
 
 type winShm = struct {
@@ -60300,86 +60305,86 @@ type win_syscall = struct {
 }
 
 var aSyscall = [80]win_syscall{
-	{FzName: ts + 3251, FpCurrent: 0},
-	{FzName: ts + 3267},
-	{FzName: ts + 3278},
-	{FzName: ts + 3289, FpCurrent: 0},
-	{FzName: ts + 3301, FpCurrent: 0},
-	{FzName: ts + 3313, FpCurrent: 0},
-	{FzName: ts + 3325, FpCurrent: 0},
+	{FzName: ts + 3270, FpCurrent: 0},
+	{FzName: ts + 3286},
+	{FzName: ts + 3297},
+	{FzName: ts + 3308, FpCurrent: 0},
+	{FzName: ts + 3320, FpCurrent: 0},
+	{FzName: ts + 3332, FpCurrent: 0},
 	{FzName: ts + 3344, FpCurrent: 0},
 	{FzName: ts + 3363, FpCurrent: 0},
-	{FzName: ts + 3376, FpCurrent: 0},
-	{FzName: ts + 3388, FpCurrent: 0},
-	{FzName: ts + 3400},
-	{FzName: ts + 3424},
-	{FzName: ts + 3445, FpCurrent: 0},
-	{FzName: ts + 3462, FpCurrent: 0},
-	{FzName: ts + 3477, FpCurrent: 0},
-	{FzName: ts + 3492, FpCurrent: 0},
-	{FzName: ts + 3504, FpCurrent: 0},
-	{FzName: ts + 3524, FpCurrent: 0},
-	{FzName: ts + 3542, FpCurrent: 0},
-	{FzName: ts + 3560, FpCurrent: 0},
+	{FzName: ts + 3382, FpCurrent: 0},
+	{FzName: ts + 3395, FpCurrent: 0},
+	{FzName: ts + 3407, FpCurrent: 0},
+	{FzName: ts + 3419},
+	{FzName: ts + 3443},
+	{FzName: ts + 3464, FpCurrent: 0},
+	{FzName: ts + 3481, FpCurrent: 0},
+	{FzName: ts + 3496, FpCurrent: 0},
+	{FzName: ts + 3511, FpCurrent: 0},
+	{FzName: ts + 3523, FpCurrent: 0},
+	{FzName: ts + 3543, FpCurrent: 0},
+	{FzName: ts + 3561, FpCurrent: 0},
 	{FzName: ts + 3579, FpCurrent: 0},
 	{FzName: ts + 3598, FpCurrent: 0},
-	{FzName: ts + 3619, FpCurrent: 0},
-	{FzName: ts + 3631, FpCurrent: 0},
-	{FzName: ts + 3648, FpCurrent: 0},
-	{FzName: ts + 3665, FpCurrent: 0},
-	{FzName: ts + 3678, FpCurrent: 0},
-	{FzName: ts + 3694, FpCurrent: 0},
-	{FzName: ts + 3708, FpCurrent: 0},
-	{FzName: ts + 3722, FpCurrent: 0},
-	{FzName: ts + 3746, FpCurrent: 0},
-	{FzName: ts + 3759, FpCurrent: 0},
-	{FzName: ts + 3772, FpCurrent: 0},
-	{FzName: ts + 3785, FpCurrent: 0},
-	{FzName: ts + 3799, FpCurrent: 0},
-	{FzName: ts + 3813, FpCurrent: 0},
-	{FzName: ts + 3823, FpCurrent: 0},
-	{FzName: ts + 3834, FpCurrent: 0},
-	{FzName: ts + 3846, FpCurrent: 0},
-	{FzName: ts + 3855, FpCurrent: 0},
-	{FzName: ts + 3867, FpCurrent: 0},
-	{FzName: ts + 3876, FpCurrent: 0},
-	{FzName: ts + 3889, FpCurrent: 0},
-	{FzName: ts + 3901, FpCurrent: 0},
-	{FzName: ts + 3914, FpCurrent: 0},
-	{FzName: ts + 3927, FpCurrent: 0},
-	{FzName: ts + 3937, FpCurrent: 0},
+	{FzName: ts + 3617, FpCurrent: 0},
+	{FzName: ts + 3638, FpCurrent: 0},
+	{FzName: ts + 3650, FpCurrent: 0},
+	{FzName: ts + 3667, FpCurrent: 0},
+	{FzName: ts + 3684, FpCurrent: 0},
+	{FzName: ts + 3697, FpCurrent: 0},
+	{FzName: ts + 3713, FpCurrent: 0},
+	{FzName: ts + 3727, FpCurrent: 0},
+	{FzName: ts + 3741, FpCurrent: 0},
+	{FzName: ts + 3765, FpCurrent: 0},
+	{FzName: ts + 3778, FpCurrent: 0},
+	{FzName: ts + 3791, FpCurrent: 0},
+	{FzName: ts + 3804, FpCurrent: 0},
+	{FzName: ts + 3818, FpCurrent: 0},
+	{FzName: ts + 3832, FpCurrent: 0},
+	{FzName: ts + 3842, FpCurrent: 0},
+	{FzName: ts + 3853, FpCurrent: 0},
+	{FzName: ts + 3865, FpCurrent: 0},
+	{FzName: ts + 3874, FpCurrent: 0},
+	{FzName: ts + 3886, FpCurrent: 0},
+	{FzName: ts + 3895, FpCurrent: 0},
+	{FzName: ts + 3908, FpCurrent: 0},
+	{FzName: ts + 3920, FpCurrent: 0},
+	{FzName: ts + 3933, FpCurrent: 0},
 	{FzName: ts + 3946, FpCurrent: 0},
-	{FzName: ts + 3957, FpCurrent: 0},
-	{FzName: ts + 3971, FpCurrent: 0},
-	{FzName: ts + 3991, FpCurrent: 0},
-	{FzName: ts + 4015, FpCurrent: 0},
-	{FzName: ts + 4024, FpCurrent: 0},
-	{FzName: ts + 4037, FpCurrent: 0},
-	{FzName: ts + 4052, FpCurrent: 0},
-	{FzName: ts + 4058, FpCurrent: 0},
-	{FzName: ts + 4079, FpCurrent: 0},
-	{FzName: ts + 4090, FpCurrent: 0},
-	{FzName: ts + 4103, FpCurrent: 0},
-	{FzName: ts + 4119, FpCurrent: 0},
-	{FzName: ts + 4139, FpCurrent: 0},
-	{FzName: ts + 4149},
-	{FzName: ts + 4164, FpCurrent: 0},
-	{FzName: ts + 4184, FpCurrent: 0},
-	{FzName: ts + 4206},
-	{FzName: ts + 4223},
-	{FzName: ts + 4252},
-	{FzName: ts + 4273},
-	{FzName: ts + 4285},
-	{FzName: ts + 4305},
-	{FzName: ts + 4320},
-	{FzName: ts + 4340, FpCurrent: 0},
+	{FzName: ts + 3956, FpCurrent: 0},
+	{FzName: ts + 3965, FpCurrent: 0},
+	{FzName: ts + 3976, FpCurrent: 0},
+	{FzName: ts + 3990, FpCurrent: 0},
+	{FzName: ts + 4010, FpCurrent: 0},
+	{FzName: ts + 4034, FpCurrent: 0},
+	{FzName: ts + 4043, FpCurrent: 0},
+	{FzName: ts + 4056, FpCurrent: 0},
+	{FzName: ts + 4071, FpCurrent: 0},
+	{FzName: ts + 4077, FpCurrent: 0},
+	{FzName: ts + 4098, FpCurrent: 0},
+	{FzName: ts + 4109, FpCurrent: 0},
+	{FzName: ts + 4122, FpCurrent: 0},
+	{FzName: ts + 4138, FpCurrent: 0},
+	{FzName: ts + 4158, FpCurrent: 0},
+	{FzName: ts + 4168},
+	{FzName: ts + 4183, FpCurrent: 0},
+	{FzName: ts + 4203, FpCurrent: 0},
+	{FzName: ts + 4225},
+	{FzName: ts + 4242},
+	{FzName: ts + 4271},
+	{FzName: ts + 4292},
+	{FzName: ts + 4304},
+	{FzName: ts + 4324},
+	{FzName: ts + 4339},
 	{FzName: ts + 4359, FpCurrent: 0},
 	{FzName: ts + 4378, FpCurrent: 0},
-	{FzName: ts + 4393},
-	{FzName: ts + 4418},
-	{FzName: ts + 4445},
-	{FzName: ts + 4456},
-	{FzName: ts + 4477, FpCurrent: 0},
+	{FzName: ts + 4397, FpCurrent: 0},
+	{FzName: ts + 4412},
+	{FzName: ts + 4437},
+	{FzName: ts + 4464},
+	{FzName: ts + 4475},
+	{FzName: ts + 4496, FpCurrent: 0},
 }
 
 func winSetSystemCall(tls *libc.TLS, pNotUsed uintptr, zName uintptr, pNewFunc Sqlite3_syscall_ptr) int32 {
@@ -60708,7 +60713,7 @@ __3:
 	if !(zValue != 0 && *(*int8)(unsafe.Pointer(zValue)) != 0) {
 		goto __7
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, zValue))
+	zCopy = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, zValue))
 	if !(zCopy == uintptr(0)) {
 		goto __8
 	}
@@ -60799,9 +60804,9 @@ func winGetLastErrorMsg(tls *libc.TLS, lastErrno DWORD, nBuf int32, zBuf uintptr
 		}
 	}
 	if DWORD(0) == dwLen {
-		Xsqlite3_snprintf(tls, nBuf, zBuf, ts+4496, libc.VaList(bp, lastErrno, lastErrno))
+		Xsqlite3_snprintf(tls, nBuf, zBuf, ts+4515, libc.VaList(bp, lastErrno, lastErrno))
 	} else {
-		Xsqlite3_snprintf(tls, nBuf, zBuf, ts+4493, libc.VaList(bp+16, zOut))
+		Xsqlite3_snprintf(tls, nBuf, zBuf, ts+4512, libc.VaList(bp+16, zOut))
 
 		Xsqlite3_free(tls, zOut)
 	}
@@ -60818,13 +60823,13 @@ func winLogErrorAtLine(tls *libc.TLS, errcode int32, lastErrno DWORD, zFunc uint
 	winGetLastErrorMsg(tls, lastErrno, int32(unsafe.Sizeof([500]int8{})), bp+40)
 
 	if zPath == uintptr(0) {
-		zPath = ts + 1544
+		zPath = ts + 1563
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(bp + 40 + uintptr(i))) != 0 && int32(*(*int8)(unsafe.Pointer(bp + 40 + uintptr(i)))) != '\r' && int32(*(*int8)(unsafe.Pointer(bp + 40 + uintptr(i)))) != '\n'; i++ {
 	}
 	*(*int8)(unsafe.Pointer(bp + 40 + uintptr(i))) = int8(0)
 	Xsqlite3_log(tls, errcode,
-		ts+4516,
+		ts+4535,
 		libc.VaList(bp, iLine, lastErrno, zFunc, zPath, bp+40))
 
 	return errcode
@@ -60858,7 +60863,7 @@ func winLogIoerr(tls *libc.TLS, nRetry int32, lineno int32) {
 
 	if nRetry != 0 {
 		Xsqlite3_log(tls, SQLITE_NOTICE,
-			ts+4547,
+			ts+4566,
 			libc.VaList(bp, winIoerrRetryDelay*nRetry*(nRetry+1)/2, lineno))
 	}
 }
@@ -60911,7 +60916,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, 47684)
+		winLogErrorAtLine(tls, SQLITE_IOERR|int32(22)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4616, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47688)
 
 		return 1
 	}
@@ -60937,7 +60942,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, 47780)
+	return winLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4628, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47784)
 }
 
 func winRead(tls *libc.TLS, id uintptr, pBuf uintptr, amt int32, offset Sqlite3_int64) int32 {
@@ -60971,9 +60976,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, 47848)
+		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(1)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4637, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47852)
 	}
-	winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 47851)
+	winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 47855)
 	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))))
 
@@ -61029,12 +61034,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, 47960)
+			return winLogErrorAtLine(tls, SQLITE_FULL, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4645, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47964)
 		}
 
-		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(3)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4636, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47965)
+		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(3)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4655, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47969)
 	} else {
-		winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 47968)
+		winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 47972)
 	}
 
 	return SQLITE_OK
@@ -61061,10 +61066,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, 48031)
+		rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4665, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48035)
 	} 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, 48036)
+		rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4678, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48040)
 	}
 
 	if rc == SQLITE_OK && oldMmapSize > int64(0) {
@@ -61090,7 +61095,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, 48128)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4691, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48132)
 		}
 	}
 	rc = (*(*func(*libc.TLS, HANDLE) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 13*24 + 8)))(tls, (*WinFile)(unsafe.Pointer(pFile)).Fh)
@@ -61100,7 +61105,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, 48143)
+		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4700, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48147)
 	}
 	return int32(0)
 }
@@ -61121,7 +61126,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, 48184)
+			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(7)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4709, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48188)
 		}
 
 	}
@@ -61163,7 +61168,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, 48279)
+		winLogErrorAtLine(tls, SQLITE_IOERR|int32(8)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4721, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48283)
 	}
 
 	return res
@@ -61289,7 +61294,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, 48505)
+			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(8)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4739, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48509)
 		}
 	}
 	if type1 >= RESERVED_LOCK {
@@ -61396,7 +61401,7 @@ func winFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 		}
 	case SQLITE_FCNTL_VFSNAME:
 		{
-			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*WinFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
+			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*WinFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
 
 			return SQLITE_OK
 
@@ -61592,7 +61597,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, 48971)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4749, (*WinShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 48975)
 		}
 	}
 
@@ -61634,7 +61639,7 @@ __1:
 __2:
 	;
 	(*WinShmNode)(unsafe.Pointer(pNew)).FzFilename = pNew + 1*160
-	Xsqlite3_snprintf(tls, nName+15, (*WinShmNode)(unsafe.Pointer(pNew)).FzFilename, ts+4750, libc.VaList(bp, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath))
+	Xsqlite3_snprintf(tls, nName+15, (*WinShmNode)(unsafe.Pointer(pNew)).FzFilename, ts+4769, libc.VaList(bp, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath))
 
 	winShmEnterMutex(tls)
 	pShmNode = winShmNodeList
@@ -61684,7 +61689,7 @@ __10:
 	;
 __9:
 	;
-	if !(0 == Xsqlite3_uri_boolean(tls, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, ts+4757, 0)) {
+	if !(0 == Xsqlite3_uri_boolean(tls, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, ts+4776, 0)) {
 		goto __11
 	}
 	inFlags = inFlags | (SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE)
@@ -61699,7 +61704,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, 49053)
+	rc = winLogErrorAtLine(tls, rc, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4789, (*WinShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 49057)
 	goto shm_open_err
 __13:
 	;
@@ -61927,7 +61932,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, 49324)
+	rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4800, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, 49328)
 	goto shmpage_out
 __6:
 	;
@@ -61945,7 +61950,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, 49339)
+	rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4811, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, 49343)
 	goto shmpage_out
 __9:
 	;
@@ -61993,7 +61998,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, 49398)
+	rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, (*WinShmNode)(unsafe.Pointer(pShmNode)).FlastErrno, ts+4822, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, 49402)
 	if !(hMap != 0) {
 		goto __16
 	}
@@ -62039,7 +62044,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, 49447)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4833, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 49451)
 		}
 		(*WinFile)(unsafe.Pointer(pFile)).FpMapRegion = uintptr(0)
 		(*WinFile)(unsafe.Pointer(pFile)).FmmapSize = int64(0)
@@ -62048,7 +62053,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, 49458)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4847, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 49462)
 		}
 		(*WinFile)(unsafe.Pointer(pFile)).FhMap = uintptr(0)
 	}
@@ -62092,7 +62097,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, 49535)
+			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFd)).FlastErrno, ts+4861, (*WinFile)(unsafe.Pointer(pFd)).FzPath, 49539)
 
 			return SQLITE_OK
 		}
@@ -62102,7 +62107,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, 49553)
+			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFd)).FlastErrno, ts+4873, (*WinFile)(unsafe.Pointer(pFd)).FzPath, 49557)
 
 			return SQLITE_OK
 		}
@@ -62240,7 +62245,7 @@ func winGetTempname(tls *libc.TLS, pVfs uintptr, pzBuf uintptr) int32 {
 
 	var i Size_t
 	var j Size_t
-	var nPre int32 = Xsqlite3Strlen30(tls, ts+4866)
+	var nPre int32 = Xsqlite3Strlen30(tls, ts+4885)
 	var nMax int32
 	var nBuf int32
 	var nDir int32
@@ -62266,9 +62271,9 @@ 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), 49855)
+				return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4893, uintptr(0), 49859)
 			}
-			Xsqlite3_snprintf(tls, nMax, zBuf, ts+4493, libc.VaList(bp, Xsqlite3_temp_directory))
+			Xsqlite3_snprintf(tls, nMax, zBuf, ts+4512, libc.VaList(bp, Xsqlite3_temp_directory))
 		}
 		Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	} else if sqlite3_os_type == 2 || Xsqlite3_win32_is_nt(tls) != 0 {
@@ -62283,11 +62288,11 @@ 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), 49955)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(25)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4909, uintptr(0), 49959)
 		}
 		zMulti = winUnicodeToUtf8(tls, zWidePath)
 		if zMulti != 0 {
-			Xsqlite3_snprintf(tls, nMax, zBuf, ts+4493, libc.VaList(bp+8, zMulti))
+			Xsqlite3_snprintf(tls, nMax, zBuf, ts+4512, libc.VaList(bp+8, zMulti))
 			Xsqlite3_free(tls, zMulti)
 			Xsqlite3_free(tls, zWidePath)
 		} else {
@@ -62307,11 +62312,11 @@ 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), 49982)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(25)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4925, uintptr(0), 49986)
 		}
 		zUtf8 = winMbcsToUtf8(tls, zMbcsPath, (*(*func(*libc.TLS) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls))
 		if zUtf8 != 0 {
-			Xsqlite3_snprintf(tls, nMax, zBuf, ts+4493, libc.VaList(bp+16, zUtf8))
+			Xsqlite3_snprintf(tls, nMax, zBuf, ts+4512, libc.VaList(bp+16, zUtf8))
 			Xsqlite3_free(tls, zUtf8)
 		} else {
 			Xsqlite3_free(tls, zBuf)
@@ -62323,17 +62328,17 @@ 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), 50006)
+		return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4941, uintptr(0), 50010)
 	}
 
 	nLen = Xsqlite3Strlen30(tls, zBuf)
 	if nLen+nPre+17 > nBuf {
 		Xsqlite3_free(tls, zBuf)
 
-		return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4938, uintptr(0), 50024)
+		return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4957, uintptr(0), 50028)
 	}
 
-	Xsqlite3_snprintf(tls, nBuf-16-nLen, zBuf+uintptr(nLen), ts+4866, 0)
+	Xsqlite3_snprintf(tls, nBuf-16-nLen, zBuf+uintptr(nLen), ts+4885, 0)
 
 	j = Size_t(Xsqlite3Strlen30(tls, zBuf))
 	Xsqlite3_randomness(tls, 15, zBuf+uintptr(j))
@@ -62361,7 +62366,7 @@ __3:
 	return SQLITE_OK
 }
 
-var zChars = *(*[63]int8)(unsafe.Pointer(ts + 4954))
+var zChars = *(*[63]int8)(unsafe.Pointer(ts + 4973))
 
 func winIsDir(tls *libc.TLS, zConverted uintptr) int32 {
 	bp := tls.Alloc(44)
@@ -62453,7 +62458,7 @@ func winOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, id uintptr, flags int32
 		dwCreationDisposition = DWORD(OPEN_EXISTING)
 	}
 
-	if 0 == Xsqlite3_uri_boolean(tls, zName, ts+5017, 0) {
+	if 0 == Xsqlite3_uri_boolean(tls, zName, ts+5036, 0) {
 		dwShareMode = DWORD(FILE_SHARE_READ | FILE_SHARE_WRITE)
 	} else {
 		dwShareMode = DWORD(0)
@@ -62512,7 +62517,7 @@ func winOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, id uintptr, flags int32
 			}
 		}
 	}
-	winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 8)), 50313)
+	winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 8)), 50317)
 
 	if h == libc.UintptrFromInt64(int64(-1)) {
 		Xsqlite3_free(tls, zConverted)
@@ -62523,8 +62528,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, 50328)
-			return Xsqlite3CantopenError(tls, 50329)
+			winLogErrorAtLine(tls, SQLITE_CANTOPEN, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+5046, zUtf8Name, 50332)
+			return Xsqlite3CantopenError(tls, 50333)
 		}
 	}
 
@@ -62556,7 +62561,7 @@ func winOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, id uintptr, flags int32
 		*(*U8)(unsafe.Pointer(pFile + 28)) |= U8(WINFILE_RDONLY)
 	}
 	if flags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+5035, SQLITE_POWERSAFE_OVERWRITE) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+5054, SQLITE_POWERSAFE_OVERWRITE) != 0 {
 		*(*U8)(unsafe.Pointer(pFile + 28)) |= U8(WINFILE_PSOW)
 	}
 	(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = DWORD(0)
@@ -62639,9 +62644,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, 50501)
+		rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, *(*DWORD)(unsafe.Pointer(bp + 4)), ts+5059, zFilename, 50505)
 	} else {
-		winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp)), 50503)
+		winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp)), 50507)
 	}
 	Xsqlite3_free(tls, zConverted)
 
@@ -62679,10 +62684,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)), 50553)
+			winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 50557)
 			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, 50556)
+				return winLogErrorAtLine(tls, SQLITE_IOERR|int32(13)<<8, *(*DWORD)(unsafe.Pointer(bp + 40)), ts+5069, zFilename, 50560)
 			} else {
 				attr = libc.Uint32(libc.Uint32FromInt32(-1))
 			}
@@ -62747,7 +62752,7 @@ func winFullPathnameNoMutex(tls *libc.TLS, pVfs uintptr, zRelative uintptr, nFul
 				return nFull
 			}
 			return (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FmxPathname
-		}(), zFull, ts+5060,
+		}(), zFull, ts+5079,
 			libc.VaList(bp, Xsqlite3_data_directory, '\\', zRelative))
 		return SQLITE_OK
 	}
@@ -62760,7 +62765,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, 50773)
+			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5086, zRelative, 50777)
 		}
 		nByte = nByte + DWORD(3)
 		zTemp = Xsqlite3MallocZero(tls, uint64(nByte)*uint64(unsafe.Sizeof(WCHAR(0))))
@@ -62772,7 +62777,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, 50786)
+			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5103, zRelative, 50790)
 		}
 		Xsqlite3_free(tls, zConverted)
 		zOut = winUnicodeToUtf8(tls, zTemp)
@@ -62782,7 +62787,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, 50799)
+			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5120, zRelative, 50803)
 		}
 		nByte = nByte + DWORD(3)
 		zTemp = Xsqlite3MallocZero(tls, uint64(nByte)*uint64(unsafe.Sizeof(int8(0))))
@@ -62794,7 +62799,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, 50812)
+			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5137, zRelative, 50816)
 		}
 		Xsqlite3_free(tls, zConverted)
 		zOut = winMbcsToUtf8(tls, zTemp, (*(*func(*libc.TLS) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls))
@@ -62806,7 +62811,7 @@ func winFullPathnameNoMutex(tls *libc.TLS, pVfs uintptr, zRelative uintptr, nFul
 				return nFull
 			}
 			return (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FmxPathname
-		}(), zFull, ts+4493, libc.VaList(bp+24, zOut))
+		}(), zFull, ts+4512, libc.VaList(bp+24, zOut))
 		Xsqlite3_free(tls, zOut)
 		return SQLITE_OK
 	} else {
@@ -62989,7 +62994,7 @@ var winVfs = Sqlite3_vfs{
 	FiVersion:          3,
 	FszOsFile:          int32(unsafe.Sizeof(WinFile{})),
 	FmxPathname:        MAX_PATH * 4,
-	FzName:             ts + 5135,
+	FzName:             ts + 5154,
 	FpAppData:          0,
 	FxOpen:             0,
 	FxDelete:           0,
@@ -63012,7 +63017,7 @@ var winLongPathVfs = Sqlite3_vfs{
 	FiVersion:          3,
 	FszOsFile:          int32(unsafe.Sizeof(WinFile{})),
 	FmxPathname:        int32(uint64(unsafe.Sizeof(WCHAR(0))) * uint64(32767)),
-	FzName:             ts + 5141,
+	FzName:             ts + 5160,
 	FpAppData:          0,
 	FxOpen:             0,
 	FxDelete:           0,
@@ -63035,7 +63040,7 @@ var winNolockVfs = Sqlite3_vfs{
 	FiVersion:          3,
 	FszOsFile:          int32(unsafe.Sizeof(WinFile{})),
 	FmxPathname:        MAX_PATH * 4,
-	FzName:             ts + 5156,
+	FzName:             ts + 5175,
 	FpAppData:          0,
 	FxOpen:             0,
 	FxDelete:           0,
@@ -63058,7 +63063,7 @@ var winLongPathNolockVfs = Sqlite3_vfs{
 	FiVersion:          3,
 	FszOsFile:          int32(unsafe.Sizeof(WinFile{})),
 	FmxPathname:        int32(uint64(unsafe.Sizeof(WCHAR(0))) * uint64(32767)),
-	FzName:             ts + 5167,
+	FzName:             ts + 5186,
 	FpAppData:          0,
 	FxOpen:             0,
 	FxDelete:           0,
@@ -63126,7 +63131,7 @@ var memdb_g MemFS
 var memdb_vfs = Sqlite3_vfs{
 	FiVersion:          2,
 	FmxPathname:        1024,
-	FzName:             ts + 5187,
+	FzName:             ts + 5206,
 	FxOpen:             0,
 	FxAccess:           0,
 	FxFullPathname:     0,
@@ -63382,7 +63387,7 @@ func memdbFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int3
 	var rc int32 = SQLITE_NOTFOUND
 	memdbEnter(tls, p)
 	if op == SQLITE_FCNTL_VFSNAME {
-		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+5193, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
+		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+5212, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
 		rc = SQLITE_OK
 	}
 	if op == SQLITE_FCNTL_SIZE_LIMIT {
@@ -63514,7 +63519,7 @@ func memdbFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, z
 	defer tls.Free(8)
 
 	_ = pVfs
-	Xsqlite3_snprintf(tls, nOut, zOut, ts+4493, libc.VaList(bp, zPath))
+	Xsqlite3_snprintf(tls, nOut, zOut, ts+4512, libc.VaList(bp, zPath))
 	return SQLITE_OK
 }
 
@@ -63635,7 +63640,7 @@ func Xsqlite3_serialize(tls *libc.TLS, db uintptr, zSchema uintptr, piSize uintp
 		return uintptr(0)
 	}
 	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
-	zSql = Xsqlite3_mprintf(tls, ts+5208, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+5227, libc.VaList(bp, zSchema))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, db, zSql, -1, bp+8, uintptr(0))
 	} else {
@@ -63708,7 +63713,7 @@ __1:
 	goto end_deserialize
 __2:
 	;
-	zSql = Xsqlite3_mprintf(tls, ts+5231, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+5250, libc.VaList(bp, zSchema))
 	if !(zSql == uintptr(0)) {
 		goto __3
 	}
@@ -64424,7 +64429,7 @@ func pcacheFetchFinishWithInit(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 	libc.Xmemset(tls, pPgHdr+32, 0, uint64(unsafe.Sizeof(PgHdr{}))-uint64(uintptr(0)+32))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpPage = pPage
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpData = (*Sqlite3_pcache_page)(unsafe.Pointer(pPage)).FpBuf
-	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*72
+	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*80
 	libc.Xmemset(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0, uint64(8))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpCache = pCache
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).Fpgno = pgno
@@ -64454,7 +64459,7 @@ func Xsqlite3PcacheFetchFinish(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 // reference count drops to 0, then it is made eligible for recycling.
 func Xsqlite3PcacheRelease(tls *libc.TLS, p uintptr) {
 	(*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FnRefSum--
-	if int32(libc.PreDecInt16(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1)) == 0 {
+	if libc.PreDecInt64(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1) == int64(0) {
 		if int32((*PgHdr)(unsafe.Pointer(p)).Fflags)&PGHDR_CLEAN != 0 {
 			pcacheUnpin(tls, p)
 		} else {
@@ -64505,7 +64510,7 @@ func Xsqlite3PcacheMakeClean(tls *libc.TLS, p uintptr) {
 	*(*U16)(unsafe.Pointer(p + 52)) &= libc.Uint16FromInt32(libc.CplInt32(PGHDR_DIRTY | PGHDR_NEED_SYNC | PGHDR_WRITEABLE))
 	*(*U16)(unsafe.Pointer(p + 52)) |= U16(PGHDR_CLEAN)
 
-	if int32((*PgHdr)(unsafe.Pointer(p)).FnRef) == 0 {
+	if (*PgHdr)(unsafe.Pointer(p)).FnRef == int64(0) {
 		pcacheUnpin(tls, p)
 	}
 }
@@ -64609,8 +64614,8 @@ func Xsqlite3PcacheClear(tls *libc.TLS, pCache uintptr) {
 }
 
 func pcacheMergeDirtyList(tls *libc.TLS, pA uintptr, pB uintptr) uintptr {
-	bp := tls.Alloc(72)
-	defer tls.Free(72)
+	bp := tls.Alloc(80)
+	defer tls.Free(80)
 
 	var pTail uintptr
 	pTail = bp
@@ -64688,13 +64693,13 @@ func Xsqlite3PcacheDirtyList(tls *libc.TLS, pCache uintptr) uintptr {
 //
 // This is not the total number of pages referenced, but the sum of the
 // reference count for all pages.
-func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) int32 {
+func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) I64 {
 	return (*PCache)(unsafe.Pointer(pCache)).FnRefSum
 }
 
 // Return the number of references to the page supplied as an argument.
-func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) int32 {
-	return int32((*PgHdr)(unsafe.Pointer(p)).FnRef)
+func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) I64 {
+	return (*PgHdr)(unsafe.Pointer(p)).FnRef
 }
 
 // Return the total number of pages in the cache.
@@ -66923,7 +66928,7 @@ __27:
 	if !(isHot != 0 && nPlayback != 0) {
 		goto __28
 	}
-	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+5246,
+	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+5265,
 		libc.VaList(bp, nPlayback, (*Pager)(unsafe.Pointer(pPager)).FzJournal))
 __28:
 	;
@@ -66988,7 +66993,7 @@ func pagerUndoCallback(tls *libc.TLS, pCtx uintptr, iPg Pgno) int32 {
 
 	pPg = Xsqlite3PagerLookup(tls, pPager, iPg)
 	if pPg != 0 {
-		if Xsqlite3PcachePageRefcount(tls, pPg) == 1 {
+		if Xsqlite3PcachePageRefcount(tls, pPg) == int64(1) {
 			Xsqlite3PcacheDrop(tls, pPg)
 		} else {
 			rc = readDbPage(tls, pPg)
@@ -67421,7 +67426,7 @@ func Xsqlite3PagerSetPagesize(tls *libc.TLS, pPager uintptr, pPageSize uintptr,
 	var pageSize U32 = *(*U32)(unsafe.Pointer(pPageSize))
 
 	if (int32((*Pager)(unsafe.Pointer(pPager)).FmemDb) == 0 || (*Pager)(unsafe.Pointer(pPager)).FdbSize == Pgno(0)) &&
-		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 &&
+		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) &&
 		pageSize != 0 && pageSize != U32((*Pager)(unsafe.Pointer(pPager)).FpageSize) {
 		var pNew uintptr = uintptr(0)
 		*(*I64)(unsafe.Pointer(bp)) = int64(0)
@@ -67573,9 +67578,9 @@ func pagerAcquireMapPage(tls *libc.TLS, pPager uintptr, pgno Pgno, pData uintptr
 			Xsqlite3OsUnfetch(tls, (*Pager)(unsafe.Pointer(pPager)).Ffd, I64(pgno-Pgno(1))*(*Pager)(unsafe.Pointer(pPager)).FpageSize, pData)
 			return SQLITE_NOMEM
 		}
-		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*72
+		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*80
 		(*PgHdr)(unsafe.Pointer(p)).Fflags = U16(PGHDR_MMAP)
-		(*PgHdr)(unsafe.Pointer(p)).FnRef = int16(1)
+		(*PgHdr)(unsafe.Pointer(p)).FnRef = int64(1)
 		(*PgHdr)(unsafe.Pointer(p)).FpPager = pPager
 	}
 
@@ -67907,7 +67912,7 @@ func Xsqlite3PagerFlush(tls *libc.TLS, pPager uintptr) int32 {
 
 		for rc == SQLITE_OK && pList != 0 {
 			var pNext uintptr = (*PgHdr)(unsafe.Pointer(pList)).FpDirty
-			if int32((*PgHdr)(unsafe.Pointer(pList)).FnRef) == 0 {
+			if (*PgHdr)(unsafe.Pointer(pList)).FnRef == int64(0) {
 				rc = pagerStress(tls, pPager, pList)
 			}
 			pList = pNext
@@ -68057,7 +68062,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 60235)
+	rc = Xsqlite3CantopenError(tls, 60239)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -68118,7 +68123,7 @@ __15:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzJournal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+5273, uint64(8))
+	libc.Xmemcpy(tls, pPtr, ts+5292, uint64(8))
 	pPtr += uintptr(8 + 1)
 	goto __19
 __18:
@@ -68131,7 +68136,7 @@ __19:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzWal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+5282, uint64(4))
+	libc.Xmemcpy(tls, pPtr, ts+5301, uint64(4))
 	pPtr += uintptr(4 + 1)
 	goto __21
 __20:
@@ -68183,9 +68188,9 @@ __27:
 	;
 __26:
 	;
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+5287, 0))
+	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+5306, 0))
 	if !(iDc&SQLITE_IOCAP_IMMUTABLE != 0 ||
-		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+5294, 0) != 0) {
+		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+5313, 0) != 0) {
 		goto __30
 	}
 	vfsFlags = vfsFlags | SQLITE_OPEN_READONLY
@@ -68438,7 +68443,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60754)
+	rc = Xsqlite3CantopenError(tls, 60758)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -68544,7 +68549,7 @@ __24:
 }
 
 func pagerUnlockIfUnused(tls *libc.TLS, pPager uintptr) {
-	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 {
+	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) {
 		pagerUnlockAndRollback(tls, pPager)
 	}
 }
@@ -68562,7 +68567,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60967)
+	return Xsqlite3CorruptError(tls, 60971)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -68601,7 +68606,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60999)
+	rc = Xsqlite3CorruptError(tls, 61003)
 	goto pager_acquire_err
 __7:
 	;
@@ -68678,7 +68683,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, 61078)
+		return Xsqlite3CorruptError(tls, 61082)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -69436,7 +69441,7 @@ func Xsqlite3PagerMemUsed(tls *libc.TLS, pPager uintptr) int32 {
 
 // Return the number of references to the specified page.
 func Xsqlite3PagerPageRefcount(tls *libc.TLS, pPage uintptr) int32 {
-	return Xsqlite3PcachePageRefcount(tls, pPage)
+	return int32(Xsqlite3PcachePageRefcount(tls, pPage))
 }
 
 // Parameter eStat must be one of SQLITE_DBSTATUS_CACHE_HIT, _MISS, _WRITE,
@@ -69679,9 +69684,9 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	pPgOld = Xsqlite3PagerLookup(tls, pPager, pgno)
 
 	if pPgOld != 0 {
-		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
+		if (*PgHdr)(unsafe.Pointer(pPgOld)).FnRef > int64(1) {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62623)
+			return Xsqlite3CorruptError(tls, 62627)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -69866,7 +69871,7 @@ func Xsqlite3PagerClearCache(tls *libc.TLS, pPager uintptr) {
 func Xsqlite3PagerCheckpoint(tls *libc.TLS, pPager uintptr, db uintptr, eMode int32, pnLog uintptr, pnCkpt uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal == uintptr(0) && int32((*Pager)(unsafe.Pointer(pPager)).FjournalMode) == PAGER_JOURNALMODE_WAL {
-		Xsqlite3_exec(tls, db, ts+5304, uintptr(0), uintptr(0), uintptr(0))
+		Xsqlite3_exec(tls, db, ts+5323, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal != 0 {
 		rc = Xsqlite3WalCheckpoint(tls, (*Pager)(unsafe.Pointer(pPager)).FpWal, db, eMode,
@@ -70438,7 +70443,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, 64387)
+				return Xsqlite3CorruptError(tls, 64391)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -70537,7 +70542,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64519)
+	rc = Xsqlite3CantopenError(tls, 64523)
 	goto finished
 __7:
 	;
@@ -70705,7 +70710,7 @@ __24:
 		goto __30
 	}
 	Xsqlite3_log(tls, SQLITE_NOTICE|int32(1)<<8,
-		ts+5322,
+		ts+5341,
 		libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 __30:
 	;
@@ -71123,7 +71128,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65333)
+	rc = Xsqlite3CorruptError(tls, 65337)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -71268,7 +71273,7 @@ func walLimitSize(tls *libc.TLS, pWal uintptr, nMax I64) {
 	}
 	Xsqlite3EndBenignMalloc(tls)
 	if rx != 0 {
-		Xsqlite3_log(tls, rx, ts+5359, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
+		Xsqlite3_log(tls, rx, ts+5378, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 	}
 }
 
@@ -71398,7 +71403,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, 65682)
+		rc = Xsqlite3CantopenError(tls, 65686)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -71871,7 +71876,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66419)
+				return Xsqlite3CorruptError(tls, 66423)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -72376,7 +72381,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, 67138)
+			rc = Xsqlite3CorruptError(tls, 67142)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -72769,7 +72774,7 @@ func Xsqlite3BtreeLeaveCursor(tls *libc.TLS, pCur uintptr) {
 	Xsqlite3BtreeLeave(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpBtree)
 }
 
-var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 5385))
+var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 5404))
 
 var sqlite3SharedCacheList uintptr = uintptr(0)
 
@@ -73034,7 +73039,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, 69249)
+			rc = Xsqlite3CorruptError(tls, 69253)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -73171,7 +73176,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69434)
 	return
 __2:
 	;
@@ -73188,7 +73193,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69447)
 	goto ptrmap_exit
 __4:
 	;
@@ -73196,7 +73201,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69452)
 	goto ptrmap_exit
 __5:
 	;
@@ -73239,7 +73244,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, 69493)
+		return Xsqlite3CorruptError(tls, 69497)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -73249,7 +73254,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, 69501)
+		return Xsqlite3CorruptError(tls, 69505)
 	}
 	return SQLITE_OK
 }
@@ -73499,7 +73504,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, 69893)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69897)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -73546,7 +73551,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69951)
+	return Xsqlite3CorruptError(tls, 69955)
 __2:
 	;
 	if !(iFree != 0) {
@@ -73556,7 +73561,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69954)
+	return Xsqlite3CorruptError(tls, 69958)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -73569,7 +73574,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69962)
+	return Xsqlite3CorruptError(tls, 69966)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -73578,14 +73583,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69965)
+	return Xsqlite3CorruptError(tls, 69969)
 __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, 69967)
+	return Xsqlite3CorruptError(tls, 69971)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -73595,7 +73600,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69971)
+	return Xsqlite3CorruptError(tls, 69975)
 __11:
 	;
 __8:
@@ -73659,7 +73664,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 70004)
+	return Xsqlite3CorruptError(tls, 70008)
 __22:
 	;
 	size = int32((*struct {
@@ -73669,7 +73674,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 70010)
+	return Xsqlite3CorruptError(tls, 70014)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -73691,7 +73696,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 70024)
+	return Xsqlite3CorruptError(tls, 70028)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -73726,7 +73731,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, 70081)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70085)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -73739,13 +73744,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, 70096)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70100)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70107)
 	}
 	return uintptr(0)
 }
@@ -73770,7 +73775,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, 70152)
+			return Xsqlite3CorruptError(tls, 70156)
 		}
 	}
 
@@ -73781,7 +73786,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, 70170)
+				return Xsqlite3CorruptError(tls, 70174)
 			} else {
 				return SQLITE_OK
 			}
@@ -73833,22 +73838,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 70249)
+				return Xsqlite3CorruptError(tls, 70253)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 70254)
+			return Xsqlite3CorruptError(tls, 70258)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 70266)
+				return Xsqlite3CorruptError(tls, 70270)
 			}
 			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, 70269)
+				return Xsqlite3CorruptError(tls, 70273)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -73858,7 +73863,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, 70282)
+					return Xsqlite3CorruptError(tls, 70286)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -73866,7 +73871,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, 70288)
+			return Xsqlite3CorruptError(tls, 70292)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -73874,10 +73879,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, 70297)
+			return Xsqlite3CorruptError(tls, 70301)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70298)
+			return Xsqlite3CorruptError(tls, 70302)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -73937,7 +73942,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70357)
+			return Xsqlite3CorruptError(tls, 70361)
 		}
 	} else {
 		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
@@ -73973,7 +73978,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70381)
+			return Xsqlite3CorruptError(tls, 70385)
 		}
 	}
 	return SQLITE_OK
@@ -74003,11 +74008,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70432)
+			return Xsqlite3CorruptError(tls, 70436)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70437)
+				return Xsqlite3CorruptError(tls, 70441)
 			}
 			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))))
@@ -74018,15 +74023,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70447)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70451)
+			return Xsqlite3CorruptError(tls, 70455)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70463)
+		return Xsqlite3CorruptError(tls, 70467)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -74054,14 +74059,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, 70494)
+			return Xsqlite3CorruptError(tls, 70498)
 		}
 		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, 70499)
+			return Xsqlite3CorruptError(tls, 70503)
 		}
 	}
 	return SQLITE_OK
@@ -74075,7 +74080,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, 70531)
+		return Xsqlite3CorruptError(tls, 70535)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -74087,7 +74092,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, 70545)
+		return Xsqlite3CorruptError(tls, 70549)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -74190,7 +74195,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70700)
+	rc = Xsqlite3CorruptError(tls, 70704)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -74218,7 +74223,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, 70721)
+	rc = Xsqlite3CorruptError(tls, 70725)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -74257,7 +74262,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, 70787)
+			return Xsqlite3CorruptError(tls, 70791)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -74330,7 +74335,7 @@ func Xsqlite3BtreeOpen(tls *libc.TLS, pVfs uintptr, zFilename uintptr, db uintpt
 	mutexOpen = uintptr(0)
 	rc = SQLITE_OK
 	isTempDb = libc.Bool32(zFilename == uintptr(0) || int32(*(*int8)(unsafe.Pointer(zFilename))) == 0)
-	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+5401) == 0 ||
+	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+5420) == 0 ||
 		isTempDb != 0 && Xsqlite3TempInMemory(tls, db) != 0 ||
 		vfsFlags&SQLITE_OPEN_MEMORY != 0)
 
@@ -75102,7 +75107,7 @@ __9:
 	;
 __10:
 	;
-	if !(libc.Xmemcmp(tls, page1+21, ts+5410, uint64(3)) != 0) {
+	if !(libc.Xmemcmp(tls, page1+21, ts+5429, uint64(3)) != 0) {
 		goto __14
 	}
 	goto page1_init_failed
@@ -75140,7 +75145,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71722)
+	rc = Xsqlite3CorruptError(tls, 71726)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -75555,7 +75560,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, 72143)
+			return Xsqlite3CorruptError(tls, 72147)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -75581,7 +75586,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, 72162)
+						return Xsqlite3CorruptError(tls, 72166)
 					}
 					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)
@@ -75590,7 +75595,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, 72171)
+					return Xsqlite3CorruptError(tls, 72175)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -75601,7 +75606,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, 72183)
+				return Xsqlite3CorruptError(tls, 72187)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -75617,7 +75622,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, 72218)
+		return Xsqlite3CorruptError(tls, 72222)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -75678,7 +75683,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, 72316)
+			return Xsqlite3CorruptError(tls, 72320)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -75713,7 +75718,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, 72368)
+					return Xsqlite3CorruptError(tls, 72372)
 				}
 			}
 
@@ -75773,7 +75778,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, 72436)
+			rc = Xsqlite3CorruptError(tls, 72440)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -75812,7 +75817,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, 72487)
+			return Xsqlite3CorruptError(tls, 72491)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -75843,7 +75848,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72514)
+			return Xsqlite3CorruptError(tls, 72518)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -76184,7 +76189,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, 72978)
+			return Xsqlite3CorruptError(tls, 72982)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -76428,14 +76433,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, 73385)
+		return Xsqlite3CorruptError(tls, 73389)
 	}
 
 	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, 73400)
+		return Xsqlite3CorruptError(tls, 73404)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -76480,7 +76485,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, 73462)
+				return Xsqlite3CorruptError(tls, 73466)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -76529,7 +76534,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73547)
+		return Xsqlite3CorruptError(tls, 73551)
 	}
 	return rc
 }
@@ -76609,7 +76614,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, 73684)
+		return Xsqlite3CorruptError(tls, 73688)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -76700,7 +76705,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, 73823)
+	return Xsqlite3CorruptError(tls, 73827)
 __11:
 	;
 skip_init:
@@ -76720,7 +76725,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73835)
+	return Xsqlite3CorruptError(tls, 73839)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -76930,7 +76935,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 74077)
+	return Xsqlite3CorruptError(tls, 74081)
 __21:
 	;
 	goto __19
@@ -77134,7 +77139,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 74273)
+	return Xsqlite3CorruptError(tls, 74277)
 __4:
 	;
 	goto bypass_moveto_root
@@ -77199,7 +77204,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, 74360)
+	rc = Xsqlite3CorruptError(tls, 74364)
 	goto moveto_index_finish
 __17:
 	;
@@ -77247,7 +77252,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74392)
+	rc = Xsqlite3CorruptError(tls, 74396)
 __24:
 	;
 	goto moveto_index_finish
@@ -77366,7 +77371,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, 74508)
+		return Xsqlite3CorruptError(tls, 74512)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -77526,7 +77531,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74688)
+	return Xsqlite3CorruptError(tls, 74692)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -77591,7 +77596,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74744)
+	rc = Xsqlite3CorruptError(tls, 74748)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -77627,7 +77632,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74773)
+	rc = Xsqlite3CorruptError(tls, 74777)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -77671,7 +77676,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74807)
+	rc = Xsqlite3CorruptError(tls, 74811)
 	goto end_allocate_page
 __32:
 	;
@@ -77783,7 +77788,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74872)
+	rc = Xsqlite3CorruptError(tls, 74876)
 	goto end_allocate_page
 __51:
 	;
@@ -77941,7 +77946,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, 74999)
+	return Xsqlite3CorruptError(tls, 75003)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -77998,7 +78003,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75050)
 	goto freepage_out
 __10:
 	;
@@ -78014,7 +78019,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75061)
 	goto freepage_out
 __12:
 	;
@@ -78088,7 +78093,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, 75146)
+		return Xsqlite3CorruptError(tls, 75150)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -78100,7 +78105,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, 75163)
+			return Xsqlite3CorruptError(tls, 75167)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -78111,7 +78116,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, 75183)
+			rc = Xsqlite3CorruptError(tls, 75187)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -78276,7 +78281,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, 75436)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75440)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -78555,12 +78560,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, 75737)
+				return Xsqlite3CorruptError(tls, 75741)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75742)
+			return Xsqlite3CorruptError(tls, 75746)
 		}
 
 		pData -= uintptr(sz)
@@ -78568,7 +78573,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, 75748)
+			return Xsqlite3CorruptError(tls, 75752)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -78628,7 +78633,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, 75833)
+			Xsqlite3CorruptError(tls, 75837)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -78717,7 +78722,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75947)
+	return Xsqlite3CorruptError(tls, 75951)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -78833,7 +78838,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, 76060)
+		return Xsqlite3CorruptError(tls, 76064)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -79153,7 +79158,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, 76481)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76485)
 	goto balance_cleanup
 __25:
 	;
@@ -79164,7 +79169,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76509)
 	goto balance_cleanup
 __27:
 	;
@@ -79322,7 +79327,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76610)
 	goto balance_cleanup
 __55:
 	;
@@ -79396,7 +79401,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76643)
 	goto balance_cleanup
 __67:
 	;
@@ -79459,7 +79464,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76687)
 	goto balance_cleanup
 __75:
 	;
@@ -79487,7 +79492,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76720)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -79748,7 +79753,7 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76920)
 	goto balance_cleanup
 __121:
 	;
@@ -79940,7 +79945,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, 77146)
+			return Xsqlite3CorruptError(tls, 77150)
 		}
 	}
 	return SQLITE_OK
@@ -79978,7 +79983,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 77206)
+			rc = Xsqlite3CorruptError(tls, 77210)
 		} 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)))
@@ -80084,7 +80089,7 @@ func btreeOverwriteOverflowCell(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, 77370)
+			rc = Xsqlite3CorruptError(tls, 77374)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -80109,7 +80114,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 
 	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)
+		return Xsqlite3CorruptError(tls, 77402)
 	}
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
 		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
@@ -80179,7 +80184,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77479)
+	return Xsqlite3CorruptError(tls, 77483)
 __3:
 	;
 __1:
@@ -80292,7 +80297,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77606)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -80352,6 +80357,7 @@ __30:
 __25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
+	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
 		goto __31
 	}
@@ -80359,7 +80365,7 @@ __25:
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
 		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77640)
+	return Xsqlite3CorruptError(tls, 77645)
 __33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
@@ -80397,13 +80403,13 @@ __37:
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77667)
+	return Xsqlite3CorruptError(tls, 77672)
 __39:
 	;
 	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __40
 	}
-	return Xsqlite3CorruptError(tls, 77670)
+	return Xsqlite3CorruptError(tls, 77675)
 __40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
@@ -80434,7 +80440,6 @@ __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 __44
 	}
@@ -80509,7 +80514,7 @@ 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, 77773)
+		return Xsqlite3CorruptError(tls, 77777)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
@@ -80534,7 +80539,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, 77798)
+				return Xsqlite3CorruptError(tls, 77802)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -80635,7 +80640,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77894)
+			return Xsqlite3CorruptError(tls, 77898)
 		}
 	}
 
@@ -80643,11 +80648,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, 77903)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 	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, 77907)
+		return Xsqlite3CorruptError(tls, 77911)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -80722,7 +80727,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, 77998)
+			return Xsqlite3CorruptError(tls, 78002)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -80791,7 +80796,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, 78114)
+			return Xsqlite3CorruptError(tls, 78118)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -80820,7 +80825,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, 78162)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78166)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -80896,7 +80901,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 78252)
+	return Xsqlite3CorruptError(tls, 78256)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -80910,7 +80915,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, 78259)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78263)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -81044,7 +81049,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, 78363)
+		return Xsqlite3CorruptError(tls, 78367)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -81261,7 +81266,7 @@ 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+64, ts+5414, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+5433, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
 		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
@@ -81286,11 +81291,11 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 	defer tls.Free(16)
 
 	if iPage > (*IntegrityCk)(unsafe.Pointer(pCheck)).FnPage || iPage == Pgno(0) {
-		checkAppendMsg(tls, pCheck, ts+5416, libc.VaList(bp, iPage))
+		checkAppendMsg(tls, pCheck, ts+5435, libc.VaList(bp, iPage))
 		return 1
 	}
 	if getPageReferenced(tls, pCheck, iPage) != 0 {
-		checkAppendMsg(tls, pCheck, ts+5439, libc.VaList(bp+8, iPage))
+		checkAppendMsg(tls, pCheck, ts+5458, libc.VaList(bp+8, iPage))
 		return 1
 	}
 	setPageReferenced(tls, pCheck, iPage)
@@ -81308,13 +81313,13 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
 			checkOom(tls, pCheck)
 		}
-		checkAppendMsg(tls, pCheck, ts+5464, libc.VaList(bp, iChild))
+		checkAppendMsg(tls, pCheck, ts+5483, libc.VaList(bp, iChild))
 		return
 	}
 
 	if int32(*(*U8)(unsafe.Pointer(bp + 48))) != int32(eType) || *(*Pgno)(unsafe.Pointer(bp + 52)) != iParent {
 		checkAppendMsg(tls, pCheck,
-			ts+5493,
+			ts+5512,
 			libc.VaList(bp+8, iChild, int32(eType), iParent, int32(*(*U8)(unsafe.Pointer(bp + 48))), *(*Pgno)(unsafe.Pointer(bp + 52))))
 	}
 }
@@ -81333,7 +81338,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 		}
 		N--
 		if Xsqlite3PagerGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpPager, iPage, bp+40, 0) != 0 {
-			checkAppendMsg(tls, pCheck, ts+5547, libc.VaList(bp, iPage))
+			checkAppendMsg(tls, pCheck, ts+5566, libc.VaList(bp, iPage))
 			break
 		}
 		pOvflData = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
@@ -81344,7 +81349,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 			}
 			if n > (*BtShared)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt)).FusableSize/U32(4)-U32(2) {
 				checkAppendMsg(tls, pCheck,
-					ts+5569, libc.VaList(bp+8, iPage))
+					ts+5588, libc.VaList(bp+8, iPage))
 				N--
 			} else {
 				for i = 0; i < int32(n); i++ {
@@ -81367,12 +81372,12 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 	}
 	if N != 0 && nErrAtStart == (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr {
 		checkAppendMsg(tls, pCheck,
-			ts+5608,
+			ts+5627,
 			libc.VaList(bp+16, func() uintptr {
 				if isFreeList != 0 {
-					return ts + 5634
+					return ts + 5653
 				}
-				return ts + 5639
+				return ts + 5658
 			}(),
 				expected-N, expected))
 	}
@@ -81488,13 +81493,13 @@ __2:
 	return 0
 __3:
 	;
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 5660
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 5679
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
 		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+5670, libc.VaList(bp, rc))
+		ts+5689, libc.VaList(bp, rc))
 	goto end_of_check
 __4:
 	;
@@ -81505,7 +81510,7 @@ __4:
 	}
 
 	checkAppendMsg(tls, pCheck,
-		ts+5708, libc.VaList(bp+8, rc))
+		ts+5727, libc.VaList(bp+8, rc))
 	goto end_of_check
 __5:
 	;
@@ -81513,14 +81518,14 @@ __5:
 		goto __6
 	}
 
-	checkAppendMsg(tls, pCheck, ts+5746, libc.VaList(bp+16, rc))
+	checkAppendMsg(tls, pCheck, ts+5765, libc.VaList(bp+16, rc))
 	goto end_of_check
 __6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
 
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 5768
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 5787
 	contentOffset = U32((int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5))))<<8|int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5) + 1)))-1)&0xffff + 1)
 
 	nCell = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3) + 1)))
@@ -81537,7 +81542,7 @@ __6:
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
 		goto __9
 	}
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 5794
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 5813
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
 __9:
 	;
@@ -81562,7 +81567,7 @@ __10:
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
 		goto __13
 	}
-	checkAppendMsg(tls, pCheck, ts+5822,
+	checkAppendMsg(tls, pCheck, ts+5841,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
 	goto __11
@@ -81575,7 +81580,7 @@ __13:
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
 		goto __14
 	}
-	checkAppendMsg(tls, pCheck, ts+5852, 0)
+	checkAppendMsg(tls, pCheck, ts+5871, 0)
 	doCoverageCheck = 0
 	goto __11
 __14:
@@ -81591,7 +81596,7 @@ __14:
 	}() != 0) {
 		goto __16
 	}
-	checkAppendMsg(tls, pCheck, ts+5876, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
+	checkAppendMsg(tls, pCheck, ts+5895, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
 __16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
@@ -81629,7 +81634,7 @@ __21:
 	if !(d2 != depth) {
 		goto __22
 	}
-	checkAppendMsg(tls, pCheck, ts+5900, 0)
+	checkAppendMsg(tls, pCheck, ts+5919, 0)
 	depth = d2
 __22:
 	;
@@ -81702,7 +81707,7 @@ __30:
 		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+5925, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
+		ts+5944, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
 	goto __31
 	goto __33
 __32:
@@ -81719,7 +81724,7 @@ __31:
 		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+5962,
+		ts+5981,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
 __34:
 	;
@@ -81833,7 +81838,7 @@ __6:
 	if !(bCkFreelist != 0) {
 		goto __7
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 6014
+	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 6033
 	checkList(tls, bp+32, 1, Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+32),
 		Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
@@ -81869,7 +81874,7 @@ __13:
 		goto __15
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+6030,
+		ts+6049,
 		libc.VaList(bp, mx, mxInHdr))
 __15:
 	;
@@ -81879,7 +81884,7 @@ __9:
 		goto __16
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+6075, 0)
+		ts+6094, 0)
 __16:
 	;
 __10:
@@ -81926,13 +81931,13 @@ __23:
 	if !(getPageReferenced(tls, bp+32, i) == 0 && (ptrmapPageno(tls, pBt, i) != i || !(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0))) {
 		goto __26
 	}
-	checkAppendMsg(tls, bp+32, ts+6130, libc.VaList(bp+16, i))
+	checkAppendMsg(tls, bp+32, ts+6149, libc.VaList(bp+16, i))
 __26:
 	;
 	if !(getPageReferenced(tls, bp+32, i) != 0 && (ptrmapPageno(tls, pBt, i) == i && (*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0)) {
 		goto __27
 	}
-	checkAppendMsg(tls, bp+32, ts+6152, libc.VaList(bp+24, i))
+	checkAppendMsg(tls, bp+32, ts+6171, libc.VaList(bp+24, i))
 __27:
 	;
 	goto __24
@@ -82195,7 +82200,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 		var rc int32 = 0
 		Xsqlite3ParseObjectInit(tls, bp+16, pDb)
 		if Xsqlite3OpenTempDatabase(tls, bp+16) != 0 {
-			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+4493, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+4512, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 			rc = SQLITE_ERROR
 		}
 		Xsqlite3DbFree(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
@@ -82206,7 +82211,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 	}
 
 	if i < 0 {
-		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+6186, libc.VaList(bp+8, zDb))
+		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+6205, libc.VaList(bp+8, zDb))
 		return uintptr(0)
 	}
 
@@ -82221,7 +82226,7 @@ func setDestPgsz(tls *libc.TLS, p uintptr) int32 {
 
 func checkReadTransaction(tls *libc.TLS, db uintptr, p uintptr) int32 {
 	if Xsqlite3BtreeTxnState(tls, p) != SQLITE_TXN_NONE {
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+6206, 0)
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+6225, 0)
 		return SQLITE_ERROR
 	}
 	return SQLITE_OK
@@ -82241,7 +82246,7 @@ func Xsqlite3_backup_init(tls *libc.TLS, pDestDb uintptr, zDestDb uintptr, pSrcD
 
 	if pSrcDb == pDestDb {
 		Xsqlite3ErrorWithMsg(tls,
-			pDestDb, SQLITE_ERROR, ts+6237, 0)
+			pDestDb, SQLITE_ERROR, ts+6256, 0)
 		p = uintptr(0)
 	} else {
 		p = Xsqlite3MallocZero(tls, uint64(unsafe.Sizeof(Sqlite3_backup{})))
@@ -82690,7 +82695,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 		(*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,
+		Xsqlite3_str_appendf(tls, bp+16, ts+6296,
 			libc.VaList(bp, func() float64 {
 				if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_IntReal != 0 {
 					return float64(*(*I64)(unsafe.Pointer(p)))
@@ -83282,7 +83287,7 @@ func Xsqlite3VdbeMemSetPointer(tls *libc.TLS, pMem uintptr, pPtr uintptr, zPType
 		if zPType != 0 {
 			return zPType
 		}
-		return ts + 1544
+		return ts + 1563
 	}()
 	(*Mem)(unsafe.Pointer(pMem)).Fz = pPtr
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null | MEM_Dyn | MEM_Subtype | MEM_Term)
@@ -83514,7 +83519,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, 81630)
+		return Xsqlite3CorruptError(tls, 81634)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -83746,7 +83751,7 @@ __9:
 		goto __10
 	}
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 8)).FisError
-	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+4493, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
+	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+4512, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
 	goto __11
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
@@ -83799,7 +83804,7 @@ func valueFromExpr(tls *libc.TLS, db uintptr, pExpr uintptr, enc U8, affinity U8
 	zVal = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	negInt = 1
-	zNeg = ts + 1544
+	zNeg = ts + 1563
 	rc = SQLITE_OK
 
 __1:
@@ -83840,7 +83845,7 @@ __4:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
 	negInt = -1
-	zNeg = ts + 6284
+	zNeg = ts + 6303
 __6:
 	;
 	if !(op == TK_STRING || op == TK_FLOAT || op == TK_INTEGER) {
@@ -83859,7 +83864,7 @@ __9:
 	Xsqlite3VdbeMemSetInt64(tls, *(*uintptr)(unsafe.Pointer(bp + 16)), I64(*(*int32)(unsafe.Pointer(pExpr + 8)))*I64(negInt))
 	goto __11
 __10:
-	zVal = Xsqlite3MPrintf(tls, db, ts+6286, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+	zVal = Xsqlite3MPrintf(tls, db, ts+6305, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	if !(zVal == uintptr(0)) {
 		goto __12
 	}
@@ -84163,7 +84168,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, 82270)
+		return Xsqlite3CorruptError(tls, 82274)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -84178,14 +84183,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 82276)
+			return Xsqlite3CorruptError(tls, 82280)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 82282)
+		return Xsqlite3CorruptError(tls, 82286)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -85193,34 +85198,34 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var j int32
 			var pKeyInfo uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+6291, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+6310, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
 			for j = 0; j < int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField); j++ {
 				var pColl uintptr = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(j)*8))
 				var zColl uintptr
 				if pColl != 0 {
 					zColl = (*CollSeq)(unsafe.Pointer(pColl)).FzName
 				} else {
-					zColl = ts + 1544
+					zColl = ts + 1563
 				}
-				if libc.Xstrcmp(tls, zColl, ts+1089) == 0 {
-					zColl = ts + 6296
+				if libc.Xstrcmp(tls, zColl, ts+1108) == 0 {
+					zColl = ts + 6315
 				}
-				Xsqlite3_str_appendf(tls, bp+144, ts+6298,
+				Xsqlite3_str_appendf(tls, bp+144, ts+6317,
 					libc.VaList(bp+8, func() uintptr {
 						if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_DESC != 0 {
-							return ts + 6284
+							return ts + 6303
 						}
-						return ts + 1544
+						return ts + 1563
 					}(),
 						func() uintptr {
 							if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_BIGNULL != 0 {
-								return ts + 6306
+								return ts + 6325
 							}
-							return ts + 1544
+							return ts + 1563
 						}(),
 						zColl))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+6309, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+6328, 1)
 			break
 
 		}
@@ -85228,7 +85233,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 		{
 			var pColl uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+6311, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
+			Xsqlite3_str_appendf(tls, bp+144, ts+6330, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
 				encnames[(*CollSeq)(unsafe.Pointer(pColl)).Fenc]))
 			break
 
@@ -85236,32 +85241,32 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -7:
 		{
 			var pDef uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
-			Xsqlite3_str_appendf(tls, bp+144, ts+6320, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+6339, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -15:
 		{
 			var pDef uintptr = (*Sqlite3_context)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpFunc
-			Xsqlite3_str_appendf(tls, bp+144, ts+6320, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+6339, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -13:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1324, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1343, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
 	case -3:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+6327, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+6346, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
 			break
 
 		}
 	case -12:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1318, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1337, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
@@ -85271,13 +85276,13 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Str != 0 {
 				zP4 = (*Mem)(unsafe.Pointer(pMem)).Fz
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1324, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1343, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1318, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1337, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Null != 0 {
-				zP4 = ts + 1545
+				zP4 = ts + 1564
 			} else {
-				zP4 = ts + 6330
+				zP4 = ts + 6349
 			}
 			break
 
@@ -85285,7 +85290,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -11:
 		{
 			var pVtab uintptr = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-			Xsqlite3_str_appendf(tls, bp+144, ts+6337, libc.VaList(bp+120, pVtab))
+			Xsqlite3_str_appendf(tls, bp+144, ts+6356, libc.VaList(bp+120, pVtab))
 			break
 
 		}
@@ -85296,20 +85301,20 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var n U32 = *(*U32)(unsafe.Pointer(ai))
 
 			for i = U32(1); i <= n; i++ {
-				Xsqlite3_str_appendf(tls, bp+144, ts+6345, libc.VaList(bp+128, func() int32 {
+				Xsqlite3_str_appendf(tls, bp+144, ts+6364, libc.VaList(bp+128, func() int32 {
 					if i == U32(1) {
 						return '['
 					}
 					return ','
 				}(), *(*U32)(unsafe.Pointer(ai + uintptr(i)*4))))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+6350, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+6369, 1)
 			break
 
 		}
 	case -4:
 		{
-			zP4 = ts + 6352
+			zP4 = ts + 6371
 			break
 
 		}
@@ -85334,7 +85339,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	return Xsqlite3StrAccumFinish(tls, bp+144)
 }
 
-var encnames = [4]uintptr{ts + 6360, ts + 6362, ts + 6364, ts + 6369}
+var encnames = [4]uintptr{ts + 6379, ts + 6381, ts + 6383, ts + 6388}
 
 // Declare to the Vdbe that the BTree object at db->aDb[i] is used.
 //
@@ -85784,8 +85789,8 @@ func Xsqlite3VdbeMakeReady(tls *libc.TLS, p uintptr, pParse uintptr) {
 }
 
 var azColName = [12]uintptr{
-	ts + 6374, ts + 6379, ts + 6386, ts + 6389, ts + 6392, ts + 6395, ts + 6398, ts + 6401,
-	ts + 6409, ts + 6412, ts + 6419, ts + 6427,
+	ts + 6393, ts + 6398, ts + 6405, ts + 6408, ts + 6411, ts + 6414, ts + 6417, ts + 6420,
+	ts + 6428, ts + 6431, ts + 6438, ts + 6446,
 }
 
 // Close a VDBE cursor and release all the resources that cursor
@@ -85994,7 +85999,7 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		var nMainFile int32
 
 		nMainFile = Xsqlite3Strlen30(tls, zMainFile)
-		zSuper = Xsqlite3MPrintf(tls, db, ts+6434, libc.VaList(bp, 0, zMainFile, 0))
+		zSuper = Xsqlite3MPrintf(tls, db, ts+6453, libc.VaList(bp, 0, zMainFile, 0))
 		if zSuper == uintptr(0) {
 			return SQLITE_NOMEM
 		}
@@ -86002,16 +86007,16 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		for __ccgo := true; __ccgo; __ccgo = rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 60)) != 0 {
 			if retryCount != 0 {
 				if retryCount > 100 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+6446, libc.VaList(bp+24, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+6465, libc.VaList(bp+24, zSuper))
 					Xsqlite3OsDelete(tls, pVfs, zSuper, 0)
 					break
 				} else if retryCount == 1 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+6460, libc.VaList(bp+32, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+6479, libc.VaList(bp+32, zSuper))
 				}
 			}
 			retryCount++
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
-			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+6475,
+			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+6494,
 				libc.VaList(bp+40, *(*U32)(unsafe.Pointer(bp + 56))>>8&U32(0xffffff), *(*U32)(unsafe.Pointer(bp + 56))&U32(0xff)))
 
 			rc = Xsqlite3OsAccess(tls, pVfs, zSuper, SQLITE_ACCESS_EXISTS, bp+60)
@@ -86157,7 +86162,7 @@ func Xsqlite3VdbeCheckFk(tls *libc.TLS, p uintptr, deferred int32) int32 {
 		!(deferred != 0) && (*Vdbe)(unsafe.Pointer(p)).FnFkConstraint > int64(0) {
 		(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_CONSTRAINT | int32(3)<<8
 		(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
-		Xsqlite3VdbeError(tls, p, ts+6488, 0)
+		Xsqlite3VdbeError(tls, p, ts+6507, 0)
 		if int32((*Vdbe)(unsafe.Pointer(p)).FprepFlags)&SQLITE_PREPARE_SAVESQL == 0 {
 			return SQLITE_ERROR
 		}
@@ -86489,7 +86494,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 86058)
+		return Xsqlite3CorruptError(tls, 86062)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -87040,7 +87045,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86989))
 		return 0
 	}
 
@@ -87105,7 +87110,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, 87062))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87066))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -87139,7 +87144,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, 87092))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87096))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -87189,7 +87194,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, 87136))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87140))
 			return 0
 		}
 	}
@@ -87335,7 +87340,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87303))
 	return 0
 __7:
 	;
@@ -87506,7 +87511,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87457)
+	return Xsqlite3CorruptError(tls, 87461)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -87532,7 +87537,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, 87490)
+		return Xsqlite3CorruptError(tls, 87494)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -87643,13 +87648,13 @@ func Xsqlite3NotPureFunc(tls *libc.TLS, pCtx uintptr) int32 {
 		var zContext uintptr
 		var zMsg uintptr
 		if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_IsCheck != 0 {
-			zContext = ts + 6518
-		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 6537
-		} else {
+		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 6556
+		} else {
+			zContext = ts + 6575
 		}
-		zMsg = Xsqlite3_mprintf(tls, ts+6565,
+		zMsg = Xsqlite3_mprintf(tls, ts+6584,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx)).FpFunc)).FzName, zContext))
 		Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 		Xsqlite3_free(tls, zMsg)
@@ -87754,7 +87759,7 @@ func Xsqlite3_expired(tls *libc.TLS, pStmt uintptr) int32 {
 
 func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 	if (*Vdbe)(unsafe.Pointer(p)).Fdb == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+6601, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+6620, 0)
 		return 1
 	} else {
 		return 0
@@ -87764,7 +87769,7 @@ func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 
 func vdbeSafetyNotNull(tls *libc.TLS, p uintptr) int32 {
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+6646, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+6665, 0)
 		return 1
 	} else {
 		return vdbeSafety(tls, p)
@@ -87806,7 +87811,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, 87854)
+			return Xsqlite3MisuseError(tls, 87858)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -88229,7 +88234,7 @@ func Xsqlite3_result_error_code(tls *libc.TLS, pCtx uintptr, errCode int32) {
 // Force an SQLITE_TOOBIG error.
 func Xsqlite3_result_error_toobig(tls *libc.TLS, pCtx uintptr) {
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FisError = SQLITE_TOOBIG
-	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+6686, int64(-1),
+	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+6705, int64(-1),
 		uint8(SQLITE_UTF8), uintptr(0))
 }
 
@@ -88421,7 +88426,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88544)
+		return Xsqlite3MisuseError(tls, 88548)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -88941,15 +88946,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 89208)
+		return Xsqlite3MisuseError(tls, 89212)
 	}
 	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+6709, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 89216)
+			ts+6728, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89220)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -89354,7 +89359,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, 89707)
+	rc = Xsqlite3MisuseError(tls, 89711)
 	goto preupdate_old_out
 __1:
 	;
@@ -89498,7 +89503,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, 89809)
+	rc = Xsqlite3MisuseError(tls, 89813)
 	goto preupdate_new_out
 __1:
 	;
@@ -89670,7 +89675,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+6749, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+6768, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -89706,11 +89711,11 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 
 			pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr(*(*int32)(unsafe.Pointer(bp + 84))-1)*56
 			if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Null != 0 {
-				Xsqlite3_str_append(tls, bp+48, ts+1545, 4)
+				Xsqlite3_str_append(tls, bp+48, ts+1564, 4)
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+1324, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+1343, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+6277, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+6296, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Str != 0 {
 				var nOut int32
 				var enc U8 = (*Sqlite3)(unsafe.Pointer(db)).Fenc
@@ -89725,21 +89730,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+6753, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+6772, 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+6760, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+6779, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+6773, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+6792, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					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_appendf(tls, bp+48, ts+6795, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+6781, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+6800, 1)
 			}
 		}
 	}
@@ -89942,10 +89947,6 @@ func filterHash(tls *libc.TLS, aMem uintptr, pOp uintptr) U64 {
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Real != 0 {
 			h = h + U64(Xsqlite3VdbeIntValue(tls, p))
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&(MEM_Str|MEM_Blob) != 0 {
-			h = h + U64((*Mem)(unsafe.Pointer(p)).Fn)
-			if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Zero != 0 {
-				h = h + U64(*(*int32)(unsafe.Pointer(p)))
-			}
 		}
 	}
 	return h
@@ -89956,11 +89957,11 @@ func vdbeMemTypeName(tls *libc.TLS, pMem uintptr) uintptr {
 }
 
 var azTypes = [5]uintptr{
-	ts + 1105,
-	ts + 1117,
-	ts + 1122,
-	ts + 1100,
-	ts + 1545,
+	ts + 1124,
+	ts + 1136,
+	ts + 1141,
+	ts + 1119,
+	ts + 1564,
 }
 
 // Execute as much of a VDBE program as we can.
@@ -91002,20 +91003,20 @@ __202:
 		goto __205
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+6783, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	Xsqlite3VdbeError(tls, p, ts+6802, 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))))
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+6823, 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))))
+	Xsqlite3VdbeError(tls, p, ts+4512, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	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))
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+6830, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 __204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
@@ -92593,7 +92594,7 @@ op_column_corrupt:
 	goto __9
 	goto __425
 __424:
-	rc = Xsqlite3CorruptError(tls, 93317)
+	rc = Xsqlite3CorruptError(tls, 93320)
 	goto abort_due_to_error
 __425:
 	;
@@ -92721,7 +92722,7 @@ __428:
 	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+6835,
+	Xsqlite3VdbeError(tls, p, ts+6854,
 		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
@@ -93153,7 +93154,7 @@ __78:
 		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+6876, 0)
+	Xsqlite3VdbeError(tls, p, ts+6895, 0)
 	rc = SQLITE_BUSY
 	goto __523
 __522:
@@ -93213,7 +93214,7 @@ __530:
 	if !!(pSavepoint != 0) {
 		goto __531
 	}
-	Xsqlite3VdbeError(tls, p, ts+6927, libc.VaList(bp+88, zName))
+	Xsqlite3VdbeError(tls, p, ts+6946, libc.VaList(bp+88, zName))
 	rc = SQLITE_ERROR
 	goto __532
 __531:
@@ -93222,7 +93223,7 @@ __531:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+6949, 0)
+		ts+6968, 0)
 	rc = SQLITE_BUSY
 	goto __534
 __533:
@@ -93408,7 +93409,7 @@ __564:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+7003, 0)
+		ts+7022, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
 	goto __567
@@ -93451,13 +93452,13 @@ __562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 7058
+				return ts + 7077
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 7106
+					return ts + 7125
 				}
-				return ts + 7149
+				return ts + 7168
 			}()
 		}(), 0)
 
@@ -93540,7 +93541,7 @@ __576:
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+7190)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+7209)
 
 	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 __583
@@ -93744,7 +93745,7 @@ __88:
 	}
 
 	(*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
+	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1563
 __602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -94353,7 +94354,7 @@ notExistsWithKey:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
 		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95560)
+	rc = Xsqlite3CorruptError(tls, 95563)
 	goto __683
 __682:
 	goto jump_to_p2
@@ -95131,7 +95132,7 @@ __767:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
 		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+7218)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96638, ts+7237)
 	goto abort_due_to_error
 __770:
 	;
@@ -95241,7 +95242,7 @@ __780:
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
 		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96840)
+	rc = Xsqlite3CorruptError(tls, 96843)
 	goto abort_due_to_error
 __781:
 	;
@@ -95402,14 +95403,14 @@ __141:
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	goto __799
 __798:
-	zSchema = ts + 7235
+	zSchema = ts + 7254
 	(*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+7249,
+		ts+7268,
 		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 __800
@@ -95435,7 +95436,7 @@ __802:
 		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 97092)
+	rc = Xsqlite3CorruptError(tls, 97095)
 __803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
@@ -95625,7 +95626,7 @@ __820:
 		goto __825
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+7292, 0)
+	Xsqlite3VdbeError(tls, p, ts+7311, 0)
 	goto abort_due_to_error
 __825:
 	;
@@ -95937,7 +95938,7 @@ __860:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
 		goto __862
 	}
-	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
+	Xsqlite3VdbeError(tls, p, ts+4512, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
 __862:
 	;
@@ -95987,7 +95988,7 @@ __867:
 	if !(rc != 0) {
 		goto __868
 	}
-	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
+	Xsqlite3VdbeError(tls, p, ts+4512, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
 __868:
 	;
@@ -96069,12 +96070,12 @@ __876:
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+7329,
+		ts+7348,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 7381
+				return ts + 7400
 			}
-			return ts + 7386
+			return ts + 7405
 		}()))
 	goto abort_due_to_error
 	goto __879
@@ -96216,7 +96217,7 @@ __171:
 		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+7393, libc.VaList(bp+144, z1))
+	Xsqlite3VdbeError(tls, p, ts+7412, libc.VaList(bp+144, z1))
 __894:
 	;
 	goto abort_due_to_error
@@ -96334,7 +96335,7 @@ __904:
 	(*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+7422, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+7441, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
 	goto __9
 
 __177:
@@ -96423,7 +96424,7 @@ __912:
 	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)))
+	Xsqlite3VdbeError(tls, p, ts+4512, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
 __913:
 	;
@@ -96653,7 +96654,7 @@ __935:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
 		goto __940
 	}
-	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
+	Xsqlite3VdbeError(tls, p, ts+4512, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
 __940:
 	;
@@ -96729,7 +96730,7 @@ __945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
 		goto __947
 	}
-	z3 = Xsqlite3MPrintf(tls, db, ts+7432, libc.VaList(bp+168, zTrace))
+	z3 = Xsqlite3MPrintf(tls, db, ts+7451, 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)
@@ -96802,7 +96803,7 @@ __955:
 	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __957
 	}
-	rc = Xsqlite3CorruptError(tls, 99031)
+	rc = Xsqlite3CorruptError(tls, 99034)
 __957:
 	;
 __956:
@@ -96810,13 +96811,13 @@ __956:
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
 		goto __958
 	}
-	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
+	Xsqlite3VdbeError(tls, p, ts+4512, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
 __958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
 
-	Xsqlite3_log(tls, rc, ts+7438,
+	Xsqlite3_log(tls, rc, ts+7457,
 		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 __959
@@ -96872,13 +96873,13 @@ __966:
 	return rc
 
 too_big:
-	Xsqlite3VdbeError(tls, p, ts+6686, 0)
+	Xsqlite3VdbeError(tls, p, ts+6705, 0)
 	rc = SQLITE_TOOBIG
 	goto abort_due_to_error
 
 no_mem:
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3VdbeError(tls, p, ts+1480, 0)
+	Xsqlite3VdbeError(tls, p, ts+1499, 0)
 	rc = SQLITE_NOMEM
 	goto abort_due_to_error
 
@@ -96889,8 +96890,8 @@ abort_due_to_interrupt:
 	return int32(0)
 }
 
-var azType = [4]uintptr{ts + 7470, ts + 7479, ts + 7486,
-	ts + 7492}
+var azType = [4]uintptr{ts + 7489, ts + 7498, ts + 7505,
+	ts + 7511}
 var and_logic = [9]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(1), uint8(2), uint8(0), uint8(2), uint8(2)}
 var or_logic = [9]uint8{uint8(0), uint8(1), uint8(2), uint8(1), uint8(1), uint8(1), uint8(2), uint8(1), uint8(2)}
 var aMask = [12]uint8{
@@ -96945,16 +96946,16 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		}
 
 		if type1 < U32(12) {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+7504,
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+7523,
 				libc.VaList(bp, func() uintptr {
 					if type1 == U32(0) {
-						return ts + 7533
+						return ts + 7552
 					}
 					return func() uintptr {
 						if type1 == U32(7) {
-							return ts + 7538
+							return ts + 7557
 						}
-						return ts + 7543
+						return ts + 7562
 					}()
 				}()))
 			rc = SQLITE_ERROR
@@ -96974,10 +96975,10 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		rc = Xsqlite3_finalize(tls, (*Incrblob)(unsafe.Pointer(p)).FpStmt)
 		(*Incrblob)(unsafe.Pointer(p)).FpStmt = uintptr(0)
 		if rc == SQLITE_OK {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+7551, libc.VaList(bp+8, iRow))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+7570, libc.VaList(bp+8, iRow))
 			rc = SQLITE_ERROR
 		} else {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+4493, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+4512, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
 		}
 	}
 
@@ -97037,21 +97038,21 @@ __3:
 		goto __4
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+7571, libc.VaList(bp, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+7590, libc.VaList(bp, zTable))
 __4:
 	;
 	if !(pTab != 0 && !((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0))) {
 		goto __5
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+7601, libc.VaList(bp+8, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+7620, libc.VaList(bp+8, zTable))
 __5:
 	;
 	if !(pTab != 0 && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __6
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+7637, libc.VaList(bp+16, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+7656, libc.VaList(bp+16, zTable))
 __6:
 	;
 	if !!(pTab != 0) {
@@ -97095,7 +97096,7 @@ __11:
 		goto __13
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+7658, libc.VaList(bp+24, zColumn))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+7677, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -97122,7 +97123,7 @@ __19:
 	if !((*sColMap)(unsafe.Pointer(pFKey+64+uintptr(j)*16)).FiFrom == iCol) {
 		goto __22
 	}
-	zFault = ts + 7679
+	zFault = ts + 7698
 __22:
 	;
 	goto __20
@@ -97155,7 +97156,7 @@ __26:
 	if !(int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == iCol || int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == -2) {
 		goto __29
 	}
-	zFault = ts + 7691
+	zFault = ts + 7710
 __29:
 	;
 	goto __27
@@ -97176,7 +97177,7 @@ __25:
 		goto __30
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+7699, libc.VaList(bp+32, zFault))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+7718, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -97274,7 +97275,7 @@ __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
-			return ts + 4493
+			return ts + 4512
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
@@ -97322,7 +97323,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99516)
+		return Xsqlite3MisuseError(tls, 99519)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -97405,7 +97406,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99616)
+		return Xsqlite3MisuseError(tls, 99619)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -97418,7 +97419,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 				if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-					return ts + 4493
+					return ts + 4512
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
@@ -99947,25 +99948,25 @@ 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 {
+	if Xsqlite3_strnicmp(tls, zTab, ts+7752, 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 {
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+7760+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7779+7) == 0 {
 			return 1
 		}
 		if pSchema == uintptr(0) {
 			return 0
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7235+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7254+7) == 0 {
 			return 1
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7779+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7798+7) == 0 {
 			return 1
 		}
 	} else {
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7779+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7798+7) == 0 {
 			return 1
 		}
 	}
@@ -100045,7 +100046,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+7793, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+7812, zDb) == 0) {
 		goto __8
 	}
 
@@ -100166,7 +100167,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+7798) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+7817) != 0) {
 		goto __33
 	}
 	goto __14
@@ -100340,14 +100341,14 @@ __60:
 	;
 	goto __59
 __58:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+7800, zTab) == 0) {
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+7819, zTab) == 0) {
 		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
 	goto __62
 __61:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+7804, zTab) == 0) {
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+7823, zTab) == 0) {
 		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
@@ -100364,7 +100365,7 @@ __57:
 		goto __64
 	}
 	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+7808, zTab) == 0) {
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+7827, zTab) == 0) {
 		goto __65
 	}
 	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
@@ -100523,7 +100524,7 @@ __86:
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
 		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7817, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+7836, libc.VaList(bp, zAs))
 	return WRC_Abort
 __90:
 	;
@@ -100531,14 +100532,14 @@ __90:
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
 		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7848, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+7867, libc.VaList(bp+8, zAs))
 	return WRC_Abort
 __91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
 		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7885, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+7904, 0)
 	return WRC_Abort
 __92:
 	;
@@ -100590,7 +100591,7 @@ __11:
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+7903, libc.VaList(bp+16, zCol))
+		ts+7922, 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
@@ -100627,7 +100628,7 @@ __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 + 7938
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7957
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
@@ -100640,23 +100641,23 @@ __101:
 __99:
 	;
 	if cnt == 0 {
-		zErr = ts + 7947
+		zErr = ts + 7966
 	} else {
-		zErr = ts + 7962
+		zErr = ts + 7981
 	}
 	if !(zDb != 0) {
 		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7984, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8003, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
 	goto __105
 __104:
 	if !(zTab != 0) {
 		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7997, libc.VaList(bp+56, zErr, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8016, libc.VaList(bp+56, zErr, zTab, zCol))
 	goto __107
 __106:
-	Xsqlite3ErrorMsg(tls, pParse, ts+8007, libc.VaList(bp+80, zErr, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8026, libc.VaList(bp+80, zErr, zCol))
 __107:
 	;
 __105:
@@ -100759,15 +100760,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 + 8014
+	var zIn uintptr = ts + 8033
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 8042
+		zIn = ts + 8061
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 8060
+		zIn = ts + 8079
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 8078
+		zIn = ts + 8097
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8096, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8115, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -100845,14 +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 + 8116
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
-				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 8121
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
-				}
-				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
+				*(*int32)(unsafe.Pointer(pExpr + 8)) = libc.Bool32(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL)
+				*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IntValue)
+				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_INTEGER)
+
 				i = 0
 				p = pNC
 			__4:
@@ -100896,7 +100893,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+8127, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+8135, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -100960,7 +100957,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+8144, libc.VaList(bp, pExpr))
+								ts+8152, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -100976,7 +100973,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+8208,
+							Xsqlite3ErrorMsg(tls, pParse, ts+8216,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -100990,7 +100987,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+8244, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+8252, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -101013,30 +101010,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+8272, libc.VaList(bp+16, pExpr))
+						ts+8280, 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 + 8315
+						zType = ts + 8323
 					} else {
-						zType = ts + 8322
+						zType = ts + 8330
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+8332, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+8340, 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+8360, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+8368, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+8382,
+					Xsqlite3ErrorMsg(tls, pParse, ts+8390,
 						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+8426,
+						ts+8434,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -101108,15 +101105,15 @@ 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+8474, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+8482, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
 
 				if nRef != (*NameContext)(unsafe.Pointer(pNC)).FnRef {
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_VarSelect)
-					*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_VarSelect
 				}
+				*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_Subquery
 			}
 			break
 
@@ -101124,7 +101121,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+8485, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+8493, pExpr, pExpr)
 			}
 
 			break
@@ -101180,7 +101177,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+7885, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7904, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -101255,7 +101252,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8496, libc.VaList(bp, i, zType, mx))
+		ts+8504, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -101275,7 +101272,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+8552, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+8560, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -101310,7 +101307,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+8586, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+8594, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -101367,7 +101364,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+8592, libc.VaList(bp, i+1))
+				ts+8600, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -101395,7 +101392,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+8653, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8661, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -101609,7 +101606,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+8684, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+8692, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -101649,7 +101646,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+8586) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+8594) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -101660,7 +101657,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+8723) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+8731) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -101672,7 +101669,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+8729, 0)
+						ts+8737, 0)
 					return WRC_Abort
 				}
 
@@ -102461,7 +102458,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7885, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7904, 0)
 		return
 	}
 
@@ -102536,7 +102533,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+8788, libc.VaList(bp, mxHeight))
+			ts+8796, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -102785,12 +102782,12 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+8836,
+			Xsqlite3ErrorMsg(tls, pParse, ts+8844,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 8880
+						return ts + 8888
 					}
-					return ts + 1544
+					return ts + 1563
 				}(), nElem))
 			break
 		}
@@ -102829,7 +102826,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+8882)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+8890)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -102855,7 +102852,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+8884, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8892, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -102883,7 +102880,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+8918, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+8926, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -102930,7 +102927,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+8938,
+				Xsqlite3ErrorMsg(tls, pParse, ts+8946,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -102955,7 +102952,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+8981, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+8989, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -103530,7 +103527,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+9004,
+	Xsqlite3ErrorMsg(tls, pParse, ts+9012,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -103653,7 +103650,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+9034, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+9042, libc.VaList(bp, zObject))
 	}
 }
 
@@ -103709,10 +103706,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+8116) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+9065) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+8121) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+9070) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -104142,13 +104139,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+9057) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+9076) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+9065) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+9084) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+9071) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+9090) == 0 {
 		return 1
 	}
 	return 0
@@ -104352,7 +104349,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+9075, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9094, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -104430,7 +104427,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+9122, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9141, 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)
 
@@ -104524,7 +104521,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 + 9153
+		var zFmt uintptr = ts + 9172
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -104542,7 +104539,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+7885, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7904, 0)
 	}
 }
 
@@ -104583,7 +104580,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+9197, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9216, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -104613,11 +104610,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+9220, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+9239, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
-				return ts + 1544
+				return ts + 1563
 			}
-			return ts + 9239
+			return ts + 9258
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -104744,7 +104741,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+9251, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9270, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -104759,11 +104756,11 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+9269, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+9288, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
-			return ts + 1544
+			return ts + 1563
 		}
-		return ts + 9239
+		return ts + 9258
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
@@ -104786,7 +104783,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+8882)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+8890)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -104795,7 +104792,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+9290)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+9309)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -105181,13 +105178,13 @@ 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+9292, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+9295,
+			if Xsqlite3_strnicmp(tls, z, ts+9311, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+9314,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
-							return ts + 6284
+							return ts + 6303
 						}
-						return ts + 1544
+						return ts + 1563
 					}(), pExpr))
 			} else {
 				codeReal(tls, v, z, negFlag, iMem)
@@ -105224,6 +105221,7 @@ func Xsqlite3ExprCodeLoadIndexColumn(tls *libc.TLS, pParse uintptr, pIdx uintptr
 func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr, pCol uintptr, regOut int32) {
 	var iAddr int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
+	var nErr int32 = (*Parse)(unsafe.Pointer(pParse)).FnErr
 
 	if (*Parse)(unsafe.Pointer(pParse)).FiSelfTab > 0 {
 		iAddr = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Parse)(unsafe.Pointer(pParse)).FiSelfTab-1, 0, regOut)
@@ -105237,6 +105235,9 @@ func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr
 	if iAddr != 0 {
 		Xsqlite3VdbeJumpHere(tls, v, iAddr)
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr > nErr {
+		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FerrByteOffset = -1
+	}
 }
 
 // Generate code to extract the value of the iCol-th column of a table.
@@ -105258,7 +105259,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+9322,
+				Xsqlite3ErrorMsg(tls, pParse, ts+9341,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -105431,8 +105432,8 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 9352, ts + 9357, ts + 9362, ts + 7543,
-				ts + 7538, ts + 9370}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 9371, ts + 9376, ts + 9381, ts + 7562,
+				ts + 7557, ts + 9389}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
@@ -105440,7 +105441,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 9378
+						return ts + 9397
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -105455,6 +105456,7 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 	var p uintptr
 	var v uintptr
 	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+		var exprAff U8
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -105468,6 +105470,14 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 		if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr, iDataCur) != 0 {
 			continue
 		}
+
+		exprAff = U8(Xsqlite3ExprAffinity(tls, pExpr))
+		if int32(exprAff) <= SQLITE_AFF_BLOB && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_BLOB ||
+			int32(exprAff) == SQLITE_AFF_TEXT && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_TEXT ||
+			int32(exprAff) >= SQLITE_AFF_NUMERIC && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_NUMERIC {
+			continue
+		}
+
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 
 		if (*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow != 0 {
@@ -105807,7 +105817,7 @@ __73:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
 		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+9322,
+	Xsqlite3ErrorMsg(tls, pParse, ts+9341,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
 __76:
@@ -106040,7 +106050,7 @@ __43:
 		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+9383, libc.VaList(bp+8, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+9402, libc.VaList(bp+8, pExpr))
 	goto __91
 __90:
 	return func() int32 {
@@ -106081,7 +106091,7 @@ __93:
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
 		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+9410, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+9429, libc.VaList(bp+16, pExpr))
 	goto __5
 __94:
 	;
@@ -106241,7 +106251,7 @@ __121:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
 		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+9004,
+	Xsqlite3ErrorMsg(tls, pParse, ts+9012,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
 __122:
 	;
@@ -106263,11 +106273,10 @@ __49:
 	return target
 
 __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) {
+	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) {
 		goto __123
 	}
+
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
 		goto __125
@@ -106307,7 +106316,7 @@ __126:
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+7885, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+7904, 0)
 	goto __5
 
 __55:
@@ -106338,13 +106347,19 @@ __129:
 	;
 __127:
 	;
-	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
+	addrINR = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable, 0, target)
 
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = U8(0)
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = okConstFactor
+	if !(inReg != target) {
+		goto __130
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
+	inReg = target
+__130:
+	;
 	Xsqlite3VdbeJumpHere(tls, v, addrINR)
-	Xsqlite3VdbeChangeP3(tls, v, addrINR, inReg)
 	goto __5
 
 __56:
@@ -106357,15 +106372,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __130
+		goto __131
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __131
+		goto __132
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__131:
+__132:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -106375,22 +106390,22 @@ __131:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__130:
+__131:
 	;
 	i1 = 0
-__132:
+__133:
 	if !(i1 < nExpr-1) {
-		goto __134
+		goto __135
 	}
 	if !(pX != 0) {
-		goto __135
+		goto __136
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __136
-__135:
-	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+	goto __137
 __136:
+	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+__137:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -106399,21 +106414,21 @@ __136:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __133
-__133:
-	i1 = i1 + 2
-	goto __132
 	goto __134
 __134:
+	i1 = i1 + 2
+	goto __133
+	goto __135
+__135:
 	;
 	if !(nExpr&1 != 0) {
-		goto __137
+		goto __138
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __138
-__137:
-	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+	goto __139
 __138:
+	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+__139:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -106423,27 +106438,27 @@ __138:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __139
-	}
-	Xsqlite3ErrorMsg(tls, pParse,
-		ts+9434, 0)
-	return 0
-__139:
-	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __140
 	}
-	Xsqlite3MayAbort(tls, pParse)
+	Xsqlite3ErrorMsg(tls, pParse,
+		ts+9453, 0)
+	return 0
 __140:
 	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __141
 	}
+	Xsqlite3MayAbort(tls, pParse)
+__141:
+	;
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+		goto __142
+	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __142
-__141:
+	goto __143
+__142:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -106452,7 +106467,7 @@ __141:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__142:
+__143:
 	;
 	goto __5
 
@@ -106463,7 +106478,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[10]int8)(unsafe.Pointer(ts + 9484))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 9503))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -108252,11 +108267,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+7733, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7752, 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+9494, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+9513, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -108268,13 +108283,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9522,
+		ts+9541,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9697,
+			ts+9716,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -108284,10 +108299,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9871, libc.VaList(bp, zDb, zDb))
+		ts+9890, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10018, 0)
+			ts+10037, 0)
 	}
 }
 
@@ -108351,7 +108366,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+10169, libc.VaList(bp, zName))
+		ts+10188, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -108361,7 +108376,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+10228, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+10247, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -108370,7 +108385,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10234, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10253, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -108411,19 +108426,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10261, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+10280, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10445,
+		ts+10464,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+10750, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+10769, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10766,
+		ts+10785,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -108431,7 +108446,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10824, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+10843, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -108443,7 +108458,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11089, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11108, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -108455,7 +108470,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11102,
+		ts+11121,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -108501,12 +108516,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+11140, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+11159, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+11172, 0)
+			ts+11191, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -108516,11 +108531,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+11199)
+				ts+11218)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+11258)
+				ts+11277)
 		}
 
 		if pDflt != 0 {
@@ -108533,12 +108548,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+11311)
+					ts+11330)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+11357)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+11376)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -108549,7 +108564,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+11384,
+			ts+11403,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -108571,7 +108586,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+11530,
+				ts+11549,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -108619,14 +108634,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11760, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+11779, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11794, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+11813, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -108654,7 +108669,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+11824, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+11843, 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
 	}
@@ -108694,18 +108709,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 + 11843
+		zType = ts + 11862
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 11848
+		zType = ts + 11867
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+11862,
+		Xsqlite3ErrorMsg(tls, pParse, ts+11881,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 11880
+					return ts + 11899
 				}
-				return ts + 11897
+				return ts + 11916
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -108789,11 +108804,11 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11915, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11934, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1544, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1563, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iSchema == 1))
 
 	Xsqlite3MayAbort(tls, pParse)
@@ -108806,17 +108821,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11936,
+		ts+11955,
 		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+12118,
+		ts+12137,
 		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+11089, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+11108, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -109074,12 +109089,12 @@ 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+12249,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12268,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 12272
+				return ts + 12291
 			}
-			return ts + 1544
+			return ts + 1563
 		}(), zWhen,
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg))
 	Xsqlite3_result_error(tls, pCtx, zErr, -1)
@@ -109119,8 +109134,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+12274, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 113494)
+	if Xsqlite3_strnicmp(tls, zSql, ts+12293, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113516)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -109137,7 +109152,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, 113505)
+		rc = Xsqlite3CorruptError(tls, 113527)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -109159,7 +109174,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+12282, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+12301, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -109199,12 +109214,12 @@ 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+12288, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+12307, 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 + 12272
+							return ts + 12291
 						}
-						return ts + 1544
+						return ts + 1563
 					}()))
 				zReplace = zBuf2
 				nReplace = U32(Xsqlite3Strlen30(tls, zReplace))
@@ -109690,7 +109705,7 @@ __45:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FzErrMsg != 0) {
 		goto __47
 	}
-	renameColumnParseError(tls, context, ts+1544, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
+	renameColumnParseError(tls, context, ts+1563, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
 	goto __48
 __47:
 	Xsqlite3_result_error_code(tls, context, rc)
@@ -109855,7 +109870,7 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 			if rc == SQLITE_ERROR && Xsqlite3WritableSchema(tls, db) != 0 {
 				Xsqlite3_result_value(tls, context, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 			} else if (*Parse)(unsafe.Pointer(bp+80)).FzErrMsg != 0 {
-				renameColumnParseError(tls, context, ts+1544, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
+				renameColumnParseError(tls, context, ts+1563, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
 			} else {
 				Xsqlite3_result_error_code(tls, context, rc)
 			}
@@ -110058,7 +110073,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 114441)
+	rc = Xsqlite3CorruptError(tls, 114463)
 	goto drop_column_done
 __2:
 	;
@@ -110082,7 +110097,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+12293, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+12312, 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)
 
@@ -110163,19 +110178,19 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11915, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11934, 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+12300,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12319,
 		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 + 12328
+				return ts + 12347
 			}
-			return ts + 7479
+			return ts + 7498
 		}(),
 			zCol))
 	goto exit_drop_column
@@ -110184,7 +110199,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12340, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12359, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -110198,13 +110213,13 @@ __8:
 	goto exit_drop_column
 __9:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1544, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1563, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+12388, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12407, 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+12509, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+12528, 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
@@ -110322,11 +110337,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 + 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}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12546},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12567},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12587},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12606},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12625}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -110360,7 +110375,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+12629, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+12648, 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)
 			}
@@ -110369,10 +110384,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+12652,
+					ts+12671,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+12682, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+12701, 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)
 			}
@@ -110390,9 +110405,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 12700, FzCols: ts + 12713},
-	{FzName: ts + 12726, FzCols: ts + 12739},
-	{FzName: ts + 12767},
+	{FzName: ts + 12719, FzCols: ts + 12732},
+	{FzName: ts + 12745, FzCols: ts + 12758},
+	{FzName: ts + 12786},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -110582,7 +110597,7 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12780}
+	FzName:     ts + 12799}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
@@ -110833,7 +110848,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12790}
+	FzName:     ts + 12809}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -110847,7 +110862,7 @@ 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+12800,
+		Xsqlite3_str_appendf(tls, bp+24, ts+12819,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
 					return (*StatAccum)(unsafe.Pointer(p)).FnEst
@@ -110860,7 +110875,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+12805, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+12824, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -110902,7 +110917,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+12811, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+12830, 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--
@@ -110916,7 +110931,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12817}
+	FzName:     ts + 12836}
 
 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)
@@ -110960,7 +110975,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+12826, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+12845, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -110977,7 +110992,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+12700, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+12719, 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)
@@ -111133,7 +111148,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+12836, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+12855, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -111190,7 +111205,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+12836, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+12855, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -111237,9 +111252,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+12840)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+12859)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+12844)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+12863)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -111322,7 +111337,7 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 	var v TRowcnt
 
 	if z == uintptr(0) {
-		z = ts + 1544
+		z = ts + 1563
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
 		v = uint64(0)
@@ -111344,15 +111359,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+12848, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+12867, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+12859, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+12878, 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+12869, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+12888, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -111628,11 +111643,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+12726, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+12745, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+12881,
-			ts+12935,
+			ts+12900,
+			ts+12954,
 			zDb)
 	}
 	return rc
@@ -111679,10 +111694,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+12700, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+12719, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+12987, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+13006, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -111740,7 +111755,7 @@ 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+7793, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+7812, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -111773,13 +111788,13 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zFile == uintptr(0)) {
 		goto __1
 	}
-	zFile = ts + 1544
+	zFile = ts + 1563
 __1:
 	;
 	if !(zName == uintptr(0)) {
 		goto __2
 	}
-	zName = ts + 1544
+	zName = ts + 1563
 __2:
 	;
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2)) != 0) {
@@ -111787,14 +111802,14 @@ __2:
 	}
 
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+5187)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+5206)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+13028, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+13047, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
 	if !(rc == SQLITE_OK) {
 		goto __6
 	}
@@ -111831,7 +111846,7 @@ __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13031,
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13050,
 		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
@@ -111845,7 +111860,7 @@ __12:
 	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __15
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13068, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13087, libc.VaList(bp+8, zName))
 	goto attach_error
 __15:
 	;
@@ -111909,7 +111924,7 @@ __4:
 		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13098, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13117, 0)
 	goto __23
 __22:
 	if !(rc == SQLITE_OK) {
@@ -111926,7 +111941,7 @@ __25:
 		goto __27
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
-		ts+13127, 0)
+		ts+13146, 0)
 	rc = SQLITE_ERROR
 __27:
 	;
@@ -111992,13 +112007,13 @@ __33:
 	}
 	Xsqlite3OomFault(tls, db)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1480, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1499, 0)
 	goto __35
 __34:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
 		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13195, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13214, libc.VaList(bp+16, zFile))
 __36:
 	;
 __35:
@@ -112045,7 +112060,7 @@ func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zName == uintptr(0)) {
 		goto __1
 	}
-	zName = ts + 1544
+	zName = ts + 1563
 __1:
 	;
 	i = 0
@@ -112076,14 +112091,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13223, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13242, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13244, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13263, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -112091,7 +112106,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13270, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13289, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -112208,7 +112223,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 13292}
+	FzName:     ts + 13311}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -112221,7 +112236,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 13306}
+	FzName:     ts + 13325}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -112235,7 +112250,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+13320, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+13339, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -112267,7 +112282,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+13344,
+						ts+13363,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -112442,7 +112457,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+13390, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13409, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -112468,11 +112483,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+13413, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+13432, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+13419, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+13438, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+13425, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13444, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -112519,7 +112534,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 + 9065
+		zCol = ts + 9084
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -112543,7 +112558,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+13452, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13471, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -112814,25 +112829,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+7793) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+7812) == 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+7733, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+7752, 7) == 0 {
 			if i == 1 {
-				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 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7779+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7798+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7254+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+7741)
+						ts+7760)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7779+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7798+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+7235)
+						ts+7254)
 				}
 			}
 		}
@@ -112853,12 +112868,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		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 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+7752, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7798+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+7254)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7779+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+7741)
+					ts+7760)
 			}
 		}
 	}
@@ -112889,7 +112904,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+13467, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+13486, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -112907,14 +112922,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 + 13475
+			zMsg = ts + 13494
 		} else {
-			zMsg = ts + 13488
+			zMsg = ts + 13507
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7997, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+8016, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+8007, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+8026, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -112944,12 +112959,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+7733, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7235+7) == 0 {
-			return ts + 7779
+	if Xsqlite3_strnicmp(tls, zName, ts+7752, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7254+7) == 0 {
+			return ts + 7798
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7741+7) == 0 {
-			return ts + 7760
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7760+7) == 0 {
+			return ts + 7779
 		}
 	}
 	return zName
@@ -113307,7 +113322,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+7235)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+7254)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -113333,7 +113348,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+7793, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+7812, zName) {
 				goto __3
 			}
 
@@ -113386,13 +113401,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+13502, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+13521, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13519, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+13538, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -113430,13 +113445,13 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 		if Xsqlite3_stricmp(tls, zType, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit))) != 0 ||
 			Xsqlite3_stricmp(tls, zName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 1*8))) != 0 ||
 			Xsqlite3_stricmp(tls, zTblName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 2*8))) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1544, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1563, 0)
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+7733, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+7752, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13539,
+			Xsqlite3ErrorMsg(tls, pParse, ts+13558,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -113596,9 +113611,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 + 7741
+			return ts + 7760
 		}
-		return ts + 7235
+		return ts + 7254
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -113614,7 +113629,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+13581, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13600, 0)
 	return
 __4:
 	;
@@ -113642,9 +113657,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 11843
+			return ts + 11862
 		}
-		return ts + 10228
+		return ts + 10247
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -113660,9 +113675,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 + 7741
+			return ts + 7760
 		}
-		return ts + 7235
+		return ts + 7254
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -113693,12 +113708,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13622,
+	Xsqlite3ErrorMsg(tls, pParse, ts+13641,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 11843
+				return ts + 11862
 			}
-			return ts + 10228
+			return ts + 10247
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -113713,7 +113728,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13643, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13662, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -113800,7 +113815,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+13678, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+13697, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -113824,7 +113839,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+13695, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13714, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -113844,7 +113859,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 + 13678
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 13697
 	(*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)
@@ -113856,7 +113871,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+13678, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+13697, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -113890,7 +113905,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+13729, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13748, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -113898,13 +113913,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+13752, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+13771, 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+13759, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+13778, 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--
@@ -113941,7 +113956,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+13769, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+13788, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -114105,10 +114120,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+13795,
+			Xsqlite3ErrorMsg(tls, pParse, ts+13814,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13840, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+13859, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -114139,7 +114154,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+13881, 0)
+			ts+13900, 0)
 	}
 }
 
@@ -114184,7 +114199,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13933, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+13952, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -114273,7 +114288,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13974, 0)
+		ts+13993, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -114368,7 +114383,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14030, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14049, 0)
 	goto generated_done
 __2:
 	;
@@ -114381,13 +114396,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+14073, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+14092, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+14081, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+14100, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -114421,13 +114436,19 @@ __10:
 
 	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
 __11:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_RAISE) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = (*Column)(unsafe.Pointer(pCol)).Faffinity
+__12:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+14088,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14107,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -114548,13 +114569,13 @@ __3:
 	;
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
-		zSep = ts + 1544
-		zSep2 = ts + 14119
-		zEnd = ts + 6309
+		zSep = ts + 1563
+		zSep2 = ts + 14138
+		zEnd = ts + 6328
 	} else {
-		zSep = ts + 14121
-		zSep2 = ts + 14125
-		zEnd = ts + 14130
+		zSep = ts + 14140
+		zSep2 = ts + 14144
+		zEnd = ts + 14149
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -114562,7 +114583,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+14133, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+14152, 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('(')
@@ -114596,17 +114617,17 @@ __5:
 	goto __6
 __6:
 	;
-	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+4493, libc.VaList(bp, zEnd))
+	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+4512, libc.VaList(bp, zEnd))
 	return zStmt
 }
 
 var azType1 = [6]uintptr{
-	ts + 1544,
-	ts + 14147,
-	ts + 14153,
-	ts + 14158,
-	ts + 14163,
-	ts + 14153,
+	ts + 1563,
+	ts + 14166,
+	ts + 14172,
+	ts + 14177,
+	ts + 14182,
+	ts + 14172,
 }
 
 func resizeIndexObject(tls *libc.TLS, db uintptr, pIdx uintptr, N int32) int32 {
@@ -114996,7 +115017,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
 		if pSelect != 0 || !(int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM) && (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1544, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1563, 0)
 			return
 		}
 		(*Table)(unsafe.Pointer(p)).Ftnum = (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum
@@ -115013,10 +115034,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+14169,
-						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1544)))
+						ts+14188,
+						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1563)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+14202,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14221,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -115035,11 +115056,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+14229, 0)
+				ts+14248, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14279, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+14298, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -115073,7 +115094,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14311, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+14330, 0)
 			return
 		}
 	}
@@ -115098,11 +115119,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 + 10228
-			zType2 = ts + 14355
+			zType = ts + 10247
+			zType2 = ts + 14374
 		} else {
-			zType = ts + 11843
-			zType2 = ts + 14361
+			zType = ts + 11862
+			zType2 = ts + 14380
 		}
 
 		if pSelect != 0 {
@@ -115173,11 +115194,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+14366, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+14385, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+14381,
+			ts+14400,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -115193,13 +115214,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+14479,
+					ts+14498,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+14521, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+14540, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -115214,7 +115235,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+10750) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+10769) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -115244,7 +115265,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+14555, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14574, 0)
 	goto create_view_fail
 __1:
 	;
@@ -115260,7 +115281,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+11843, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+11862, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -115342,7 +115363,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14591, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14610, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -115467,13 +115488,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+14621, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+14640, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14636,
+		ts+14655,
 		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)
 }
@@ -115514,10 +115535,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+14703, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+14722, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+12652,
+				ts+12671,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -115549,12 +115570,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+14717,
+			ts+14736,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14762,
+		ts+14781,
 		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)
@@ -115582,11 +115603,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+7733, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+14829, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7752, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+14848, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+8485, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+8493, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -115664,9 +115685,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 7741
+			return ts + 7760
 		}
-		return ts + 7235
+		return ts + 7254
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -115725,21 +115746,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14834, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14853, 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+14862, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14881, 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+14896, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14915, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -115751,7 +115772,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+12844, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+12863, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -115815,7 +115836,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14928,
+		ts+14947,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -115827,7 +115848,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14991, 0)
+		ts+15010, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -115912,7 +115933,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15085,
+		ts+15104,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -116139,12 +116160,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+15131,
+				Xsqlite3ErrorMsg(tls, pParse, ts+15150,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 15159
+							return ts + 15178
 						}
-						return ts + 15165
+						return ts + 15184
 					}()))
 				return 1
 			}
@@ -116265,7 +116286,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+15170, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+15189, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -116284,7 +116305,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15176,
+		ts+15195,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -116310,26 +116331,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7733, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7752, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15226, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15245, 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+15254, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15273, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15279, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15298, 0)
 	goto exit_create_index
 __17:
 	;
@@ -116343,7 +116364,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+15170, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+15189, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -116358,7 +116379,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15313, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15332, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -116370,7 +116391,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15347, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15366, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -116399,7 +116420,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+15371, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+15390, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -116420,9 +116441,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 7741
+			return ts + 7760
 		}
-		return ts + 7235
+		return ts + 7254
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -116461,7 +116482,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+15170)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+15189)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -116562,7 +116583,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15394, 0)
+		ts+15413, 0)
 	goto exit_create_index
 __56:
 	;
@@ -116779,7 +116800,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15455, libc.VaList(bp+48, 0))
+		ts+15474, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -116831,8 +116852,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15497, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15516, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121859)
 	goto exit_create_index
 __101:
 	;
@@ -116878,12 +116899,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+15514,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+15533,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
-				return ts + 1544
+				return ts + 1563
 			}
-			return ts + 15534
+			return ts + 15553
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -116891,7 +116912,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+15542,
+		ts+15561,
 		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,
@@ -116905,7 +116926,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+15601, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+15620, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -117066,7 +117087,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15628, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15647, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -117081,7 +117102,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15646, libc.VaList(bp+8, 0))
+		ts+15665, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -117092,9 +117113,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 + 7741
+			return ts + 7760
 		}
-		return ts + 7235
+		return ts + 7254
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -117120,9 +117141,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+15719,
+		ts+15738,
 		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+12840, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+12859, (*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)
@@ -117257,7 +117278,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+15779,
+			Xsqlite3ErrorMsg(tls, pParse, ts+15798,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -117465,12 +117486,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+15815,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15834,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 15851
+				return ts + 15870
 			}
-			return ts + 15854
+			return ts + 15873
 		}()))
 	goto append_from_error
 __1:
@@ -117639,7 +117660,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+15860, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+15879, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -117675,9 +117696,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 15866
+				return ts + 15885
 			}
-			return ts + 15875
+			return ts + 15894
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -117702,7 +117723,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 15860, ts + 15882, ts + 15866}
+var az = [3]uintptr{ts + 15879, ts + 15901, ts + 15885}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -117717,7 +117738,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+15890, 0)
+				ts+15909, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -117854,17 +117875,17 @@ 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+15960, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+15979, 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+15971, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+15990, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
-			Xsqlite3_str_append(tls, bp+8, ts+1557, 1)
+			Xsqlite3_str_append(tls, bp+8, ts+1576, 1)
 			Xsqlite3_str_appendall(tls, bp+8, zCol)
 		}
 	}
@@ -117887,11 +117908,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+13413, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+13432, 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+15974, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+15993, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -118021,7 +118042,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15983, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+16002, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -118117,7 +118138,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+16029, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+16048, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -118310,7 +118331,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+16059, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+16078, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -118590,7 +118611,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+16090,
+		Xsqlite3ErrorMsg(tls, pParse, ts+16109,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -118622,11 +118643,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+16123, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+16142, 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+16152, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+16171, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -118877,7 +118898,7 @@ __20:
 	goto __16
 __15:
 	wcf = U16(WHERE_ONEPASS_DESIRED | WHERE_DUPLICATES_OK)
-	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_VarSelect != 0) {
+	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_Subquery != 0) {
 		goto __23
 	}
 	bComplex = 1
@@ -119130,7 +119151,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+16190)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+16209)
 __62:
 	;
 delete_from_cleanup:
@@ -119245,7 +119266,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+12700) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+12719) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -119475,7 +119496,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 + 9357, ts + 9352, ts + 7533}
+var azType2 = [5]uintptr{ts + 7562, ts + 7557, ts + 9376, ts + 9371, ts + 7552}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -119534,7 +119555,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+16203, -1)
+					Xsqlite3_result_error(tls, context, ts+16222, -1)
 					return
 				}
 				iVal = -iVal
@@ -119838,7 +119859,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+16220, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+16239, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -120184,7 +120205,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+16225, -1)
+		Xsqlite3_result_error(tls, context, ts+16244, -1)
 		return
 	}
 	if argc == 3 {
@@ -120194,7 +120215,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+16258, -1)
+				ts+16277, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -120247,7 +120268,7 @@ func errlogFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	_ = argc
 	_ = context
-	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+4493, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
+	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+4512, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
 }
 
 func compileoptionusedFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
@@ -120287,13 +120308,13 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 
 			var zVal uintptr
 			r1 = Xsqlite3_value_double(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+6277, libc.VaList(bp, r1))
+			Xsqlite3_str_appendf(tls, pStr, ts+6296, libc.VaList(bp, r1))
 			zVal = Xsqlite3_str_value(tls, pStr)
 			if zVal != 0 {
 				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+16303, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+16322, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -120301,7 +120322,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 		}
 	case SQLITE_INTEGER:
 		{
-			Xsqlite3_str_appendf(tls, pStr, ts+1324, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
+			Xsqlite3_str_appendf(tls, pStr, ts+1343, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
 			break
 
 		}
@@ -120330,13 +120351,13 @@ 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+16310, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+16329, libc.VaList(bp+24, zArg))
 			break
 
 		}
 	default:
 		{
-			Xsqlite3_str_append(tls, pStr, ts+1545, 4)
+			Xsqlite3_str_append(tls, pStr, ts+1564, 4)
 			break
 
 		}
@@ -120477,7 +120498,7 @@ func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 	var ch U32
 	var c U8
 	var d U8
-	zPass = ts + 1544
+	zPass = ts + 1563
 	nPass = 0
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -120759,7 +120780,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 12272}
+var azOne = [1]uintptr{ts + 12291}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -120771,7 +120792,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	zIn = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	if zIn == uintptr(0) {
-		zIn = ts + 1544
+		zIn = ts + 1563
 	}
 	for i = 0; *(*U8)(unsafe.Pointer(zIn + uintptr(i))) != 0 && !(int32(Xsqlite3CtypeMap[*(*U8)(unsafe.Pointer(zIn + uintptr(i)))])&0x02 != 0); i++ {
 	}
@@ -120795,7 +120816,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+16313, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+16332, 4, uintptr(0))
 	}
 }
 
@@ -120820,7 +120841,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+13452, -1)
+		Xsqlite3_result_error(tls, context, ts+13471, -1)
 		return
 	}
 
@@ -120898,7 +120919,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+16203, -1)
+			Xsqlite3_result_error(tls, context, ts+16222, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -121160,7 +121181,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+16318, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+16337, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -121180,14 +121201,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+16324, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+16343, 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+16324, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+16343, 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+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)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+16343, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+16343, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -121428,109 +121449,109 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 }
 
 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 + 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(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(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 + 16348},
+	{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 + 16368},
+	{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 + 16381},
+	{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 + 16399},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16408},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 16416},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 16416},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16431},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16457},
+	{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 + 16482},
+	{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 + 16491},
+	{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 + 16502},
+	{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 + 16509},
+	{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 + 16523},
+	{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 + 16523},
+	{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 + 16529},
+	{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 + 16529},
+	{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 + 16535},
+	{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 + 16535},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16540},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 16540},
+	{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 + 16540},
+	{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 + 16544},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 16544},
+	{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 + 16544},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 16548},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 16555},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 16563},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16570},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16576},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16583},
+	{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 + 16598},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16603},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16607},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16607},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16613},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16619},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16625},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16629},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16629},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 16635},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16642},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16649},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16660},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16667},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16682},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16699},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16710},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16716},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16734},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16742},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16756},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16764},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16773},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16773},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16780},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16780},
+	{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 + 16790},
+	{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 + 16794},
+	{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 + 16800},
+	{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 + 16804},
+	{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 + 16804},
+	{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 + 16810},
+	{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 + 16810},
+	{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 + 16823},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 16343},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 16343},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 7957},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 7957},
 	{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 + 16880},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16833},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16841},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16847},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16853},
+	{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 + 16856},
+	{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 + 16860},
+	{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 + 16866},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16856},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16871},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16875},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16879},
 	{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 + 16889},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16894},
 	{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 + 16913},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16904},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16910},
+	{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 + 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 + 16922},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16927},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16932},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16937},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16943},
 	{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}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16955},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16960},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16968},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16976},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16979},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 7957},
+	{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 + 16984}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -121651,7 +121672,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+16969,
+				ts+16988,
 				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)
@@ -122311,8 +122332,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 + 7804, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 7800, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 7823, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 7819, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -122391,7 +122412,7 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 			(*Token)(unsafe.Pointer(bp + 80)).Fz = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 			(*Token)(unsafe.Pointer(bp + 80)).Fn = uint32(Xsqlite3Strlen30(tls, (*Token)(unsafe.Pointer(bp+80)).Fz))
 
-			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+6488)
+			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+6507)
 			if pRaise != 0 {
 				(*Expr)(unsafe.Pointer(pRaise)).FaffExpr = int8(OE_Abort)
 			}
@@ -122813,7 +122834,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9322, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+9341, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -123281,7 +123302,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17014,
+		ts+17033,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -123306,7 +123327,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+17055,
+	Xsqlite3ErrorMsg(tls, pParse, ts+17074,
 		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
@@ -123455,7 +123476,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17087,
+		ts+17106,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -123465,7 +123486,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17139, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+17158, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -123517,7 +123538,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17164,
+	Xsqlite3ErrorMsg(tls, pParse, ts+17183,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -123525,7 +123546,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17210, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17229, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -123937,7 +123958,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+17231)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+17250)
 __125:
 	;
 insert_cleanup:
@@ -124253,7 +124274,7 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 						fallthrough
 					case OE_Fail:
 						{
-							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+13413, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+13432, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 								(*Column)(unsafe.Pointer(pCol)).FzCnName))
 
 							Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
@@ -125345,13 +125366,13 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131895)
+	return Xsqlite3MisuseError(tls, 131931)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
 		goto __2
 	}
-	zSql = ts + 1544
+	zSql = ts + 1563
 __2:
 	;
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -125830,7 +125851,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+13452, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+13471, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -125839,7 +125860,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 17245
+		zEntry = ts + 17264
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -125854,7 +125875,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+13413, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+13432, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -125890,7 +125911,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+17268, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+17287, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/' || int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '\\')) {
@@ -125904,7 +125925,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+17277, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+17296, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -125928,7 +125949,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+17281, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+17300, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -125946,7 +125967,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+17287, libc.VaList(bp+16, zEntry, zFile))
+		ts+17306, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -125973,7 +125994,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+17330, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+17349, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -126011,7 +126032,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+17362, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+17381, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -126021,7 +126042,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 17399,
+	ts + 17418,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -126177,7 +126198,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+17403, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+17422, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -126185,63 +126206,63 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 }
 
 var pragCName = [57]uintptr{
-	ts + 6409,
-	ts + 17442,
-	ts + 10228,
-	ts + 17446,
-	ts + 17451,
-	ts + 17454,
-	ts + 17464,
-	ts + 17474,
-	ts + 17480,
-	ts + 17484,
-	ts + 17489,
-	ts + 17494,
-	ts + 17502,
+	ts + 6428,
+	ts + 17461,
+	ts + 10247,
+	ts + 17465,
+	ts + 17470,
+	ts + 17473,
+	ts + 17483,
+	ts + 17493,
+	ts + 17499,
+	ts + 17503,
+	ts + 17508,
 	ts + 17513,
-	ts + 17516,
-	ts + 17523,
-	ts + 17484,
-	ts + 17489,
-	ts + 17530,
+	ts + 17521,
+	ts + 17532,
 	ts + 17535,
-	ts + 17538,
-	ts + 17545,
-	ts + 17480,
-	ts + 17484,
-	ts + 17551,
-	ts + 17556,
-	ts + 17561,
-	ts + 17484,
-	ts + 17565,
-	ts + 17489,
-	ts + 17573,
-	ts + 17577,
-	ts + 17582,
-	ts + 12844,
-	ts + 12840,
-	ts + 17588,
-	ts + 17593,
-	ts + 17598,
-	ts + 17442,
-	ts + 17484,
-	ts + 17603,
-	ts + 17610,
+	ts + 17542,
+	ts + 17503,
+	ts + 17508,
+	ts + 17549,
+	ts + 17554,
+	ts + 17557,
+	ts + 17564,
+	ts + 17499,
+	ts + 17503,
+	ts + 17570,
+	ts + 17575,
+	ts + 17580,
+	ts + 17503,
+	ts + 17584,
+	ts + 17508,
+	ts + 17592,
+	ts + 17596,
+	ts + 17601,
+	ts + 12863,
+	ts + 12859,
+	ts + 17607,
+	ts + 17612,
 	ts + 17617,
-	ts + 10228,
-	ts + 17625,
-	ts + 6412,
-	ts + 17631,
-	ts + 17442,
-	ts + 17484,
+	ts + 17461,
+	ts + 17503,
+	ts + 17622,
+	ts + 17629,
 	ts + 17636,
-	ts + 17641,
-	ts + 16837,
-	ts + 17646,
-	ts + 17659,
-	ts + 17668,
-	ts + 17675,
-	ts + 17686,
+	ts + 10247,
+	ts + 17644,
+	ts + 6431,
+	ts + 17650,
+	ts + 17461,
+	ts + 17503,
+	ts + 17655,
+	ts + 17660,
+	ts + 16856,
+	ts + 17665,
+	ts + 17678,
+	ts + 17687,
+	ts + 17694,
+	ts + 17705,
 }
 
 // Definitions of all built-in pragmas
@@ -126259,241 +126280,241 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [67]PragmaName{
-	{FzName: ts + 17694,
+	{FzName: ts + 17713,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17709,
+	{FzName: ts + 17728,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 17724,
+	{FzName: ts + 17743,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17736,
+	{FzName: ts + 17755,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 17752,
+	{FzName: ts + 17771,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 17675,
+	{FzName: ts + 17694,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17765,
+	{FzName: ts + 17784,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17777,
+	{FzName: ts + 17796,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17797,
+	{FzName: ts + 17816,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CellSizeCk)},
-	{FzName: ts + 17813,
+	{FzName: ts + 17832,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 17834,
+	{FzName: ts + 17853,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 17849,
+	{FzName: ts + 17868,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17865,
+	{FzName: ts + 17884,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 17879,
+	{FzName: ts + 17898,
 		FePragTyp: U8(PragTyp_DATA_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17900,
+	{FzName: ts + 17919,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 17913,
+	{FzName: ts + 17932,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 17927,
+	{FzName: ts + 17946,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 17946,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_DeferFKs)},
 	{FzName: ts + 17965,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_DeferFKs)},
+	{FzName: ts + 17984,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 17988,
+	{FzName: ts + 18007,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17997,
+	{FzName: ts + 18016,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 18015,
+	{FzName: ts + 18034,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 18032,
+	{FzName: ts + 18051,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 18045,
+	{FzName: ts + 18064,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 18060,
+	{FzName: ts + 18079,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 18078,
+	{FzName: ts + 18097,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 18088,
+	{FzName: ts + 18107,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 18102,
+	{FzName: ts + 18121,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 18118,
+	{FzName: ts + 18137,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 18143,
+	{FzName: ts + 18162,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 18162,
+	{FzName: ts + 18181,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 18173,
+	{FzName: ts + 18192,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 18184,
+	{FzName: ts + 18203,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 18196,
+	{FzName: ts + 18215,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 18212,
+	{FzName: ts + 18231,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18225,
+	{FzName: ts + 18244,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18244,
+	{FzName: ts + 18263,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 18263,
+	{FzName: ts + 18282,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18276,
+	{FzName: ts + 18295,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18291,
+	{FzName: ts + 18310,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 18301,
+	{FzName: ts + 18320,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 18313,
+	{FzName: ts + 18332,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 18322,
+	{FzName: ts + 18341,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18333,
+	{FzName: ts + 18352,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 18343,
+	{FzName: ts + 18362,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 18355,
+	{FzName: ts + 18374,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 18366,
+	{FzName: ts + 18385,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 18378,
+	{FzName: ts + 18397,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 18395,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_RecTriggers)},
 	{FzName: ts + 18414,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_RecTriggers)},
+	{FzName: ts + 18433,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 18440,
+	{FzName: ts + 18459,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 18455,
+	{FzName: ts + 18474,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 18469,
+	{FzName: ts + 18488,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 18488,
+	{FzName: ts + 18507,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 18502,
+	{FzName: ts + 18521,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 18518,
+	{FzName: ts + 18537,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 18530,
+	{FzName: ts + 18549,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 18541,
+	{FzName: ts + 18560,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 18552,
+	{FzName: ts + 18571,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 18564,
+	{FzName: ts + 18583,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 18575,
+	{FzName: ts + 18594,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 18596,
+	{FzName: ts + 18615,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 18604,
+	{FzName: ts + 18623,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 18619,
+	{FzName: ts + 18638,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 18632,
-		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
 	{FzName: ts + 18651,
+		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
+	{FzName: ts + 18670,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 18666,
+	{FzName: ts + 18685,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -126515,7 +126536,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 18682))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 18701))
 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)}
@@ -126527,10 +126548,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+5017) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+5036) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+18707) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+18726) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -126539,13 +126560,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+9378) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+9397) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+18714) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+18733) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+18719) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+18738) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -126560,9 +126581,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+17636) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17655) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+18731) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+18750) == 0 {
 		return 2
 	} else {
 		return 0
@@ -126576,7 +126597,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+18738, 0)
+				ts+18757, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -126667,19 +126688,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 18800
+		zName = ts + 18819
 		break
 	case OE_SetDflt:
-		zName = ts + 18809
+		zName = ts + 18828
 		break
 	case OE_Cascade:
-		zName = ts + 18821
+		zName = ts + 18840
 		break
 	case OE_Restrict:
-		zName = ts + 18829
+		zName = ts + 18848
 		break
 	default:
-		zName = ts + 18838
+		zName = ts + 18857
 		break
 	}
 	return zName
@@ -126696,7 +126717,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 18848, ts + 18855, ts + 18863, ts + 18867, ts + 18731, ts + 18876,
+	ts + 18867, ts + 18874, ts + 18882, ts + 18886, ts + 18750, ts + 18895,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -126743,13 +126764,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 18880
+			zType = ts + 18899
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 18882
+			zType = ts + 18901
 		} else {
-			zType = ts + 8880
+			zType = ts + 8888
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18884,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18903,
 			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),
@@ -126757,7 +126778,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 18891, ts + 18896, ts + 18904}
+var azEnc = [4]uintptr{uintptr(0), ts + 18910, ts + 18915, ts + 18923}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -126908,6 +126929,7 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp7 int32
 	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
@@ -127004,7 +127026,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+18912, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+18931, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -127043,7 +127065,7 @@ __8:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 496)) != 0) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+4493, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 496))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+4512, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 496))))
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 496)))
 __10:
 	;
@@ -127268,7 +127290,7 @@ __18:
 	if !(zRight != 0) {
 		goto __64
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+18916) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+18935) == 0) {
 		goto __65
 	}
 	b = 2
@@ -127340,7 +127362,7 @@ __72:
 	goto __15
 
 __20:
-	zRet = ts + 18707
+	zRet = ts + 18726
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -127378,7 +127400,7 @@ __79:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __84
 	}
-	zRet = ts + 5017
+	zRet = ts + 5036
 __84:
 	;
 	returnSingleText(tls, v, zRet)
@@ -127665,7 +127687,7 @@ __124:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 560)) == 0) {
 		goto __127
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18921, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18940, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __127:
@@ -127684,7 +127706,7 @@ __128:
 	if !(*(*int8)(unsafe.Pointer(zRight)) != 0) {
 		goto __129
 	}
-	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+16, zRight))
+	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+16, zRight))
 	goto __130
 __129:
 	Xsqlite3_temp_directory = uintptr(0)
@@ -127710,7 +127732,7 @@ __131:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 564)) == 0) {
 		goto __134
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18921, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18940, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __134:
@@ -127721,7 +127743,7 @@ __133:
 	if !(*(*int8)(unsafe.Pointer(zRight)) != 0) {
 		goto __135
 	}
-	Xsqlite3_data_directory = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+24, zRight))
+	Xsqlite3_data_directory = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+24, zRight))
 	goto __136
 __135:
 	Xsqlite3_data_directory = uintptr(0)
@@ -127743,7 +127765,7 @@ __137:
 		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+18946, 0)
+		ts+18965, 0)
 	goto __140
 __139:
 	if !(iDb != 1) {
@@ -127797,7 +127819,7 @@ __146:
 __148:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+18999) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+19018) == 0) {
 		goto __149
 	}
 
@@ -127894,13 +127916,13 @@ __162:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 19005
+			return ts + 19024
 		}
-		return ts + 19013
+		return ts + 19032
 	}(),
 		libc.VaList(bp+32, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
-			Xsqlite3ColumnType(tls, pCol, ts+1544),
+			Xsqlite3ColumnType(tls, pCol, ts+1563),
 			func() int32 {
 				if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 {
 					return 1
@@ -127965,7 +127987,7 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __178
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+19020, libc.VaList(bp+88, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+19039, libc.VaList(bp+88, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __179
 	}
@@ -127978,7 +128000,7 @@ __179:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __180
 	}
-	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1480, 0)
+	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1499, 0)
 	(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 __180:
 	;
@@ -128011,29 +128033,29 @@ __184:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __185
 	}
-	zType = ts + 11843
+	zType = ts + 11862
 	goto __186
 __185:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __187
 	}
-	zType = ts + 14073
+	zType = ts + 14092
 	goto __188
 __187:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __189
 	}
-	zType = ts + 19036
+	zType = ts + 19055
 	goto __190
 __189:
-	zType = ts + 10228
+	zType = ts + 10247
 __190:
 	;
 __188:
 	;
 __186:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19043,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19062,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -128099,7 +128121,7 @@ __197:
 		goto __199
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19050, libc.VaList(bp+144, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19069, libc.VaList(bp+144, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -128109,7 +128131,7 @@ __197:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __200
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+19055,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+19074,
 		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))))
@@ -128146,8 +128168,8 @@ __203:
 	if !(pIdx1 != 0) {
 		goto __205
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 576)) = [3]uintptr{ts + 19060, ts + 19062, ts + 17513}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19064,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 576)) = [3]uintptr{ts + 19079, ts + 19081, ts + 17532}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19083,
 		libc.VaList(bp+192, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -128180,7 +128202,7 @@ __206:
 	goto __207
 __209:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19070,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19089,
 		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)))
@@ -128202,7 +128224,7 @@ __210:
 		goto __212
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19074, libc.VaList(bp+256, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19093, libc.VaList(bp+256, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __211
 __211:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -128266,7 +128288,7 @@ __222:
 		goto __224
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+8880, libc.VaList(bp+272, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+8888, libc.VaList(bp+272, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __223
 __223:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -128282,7 +128304,7 @@ __225:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __227
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+8880, libc.VaList(bp+280, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+8888, libc.VaList(bp+280, aPragmaName[i6].FzName))
 	goto __226
 __226:
 	i6++
@@ -128317,7 +128339,7 @@ __233:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __235
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19077,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19096,
 		libc.VaList(bp+288, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -128325,7 +128347,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+19086))
+			ts+19105))
 	goto __234
 __234:
 	j2++
@@ -128514,7 +128536,7 @@ __263:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __264:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+19091, libc.VaList(bp+352, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+19110, 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)))
@@ -128731,7 +128753,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+19095, libc.VaList(bp+368, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+19114, 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)
@@ -128842,7 +128864,7 @@ __314:
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+19119,
+		ts+19138,
 		libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
@@ -128941,7 +128963,7 @@ __328:
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+19155, libc.VaList(bp+384, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+19174, 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) {
@@ -128963,7 +128985,7 @@ __333:
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+19175,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+19194,
 		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)
@@ -128976,7 +128998,7 @@ __336:
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+19197,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+19216,
 		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 __339
@@ -128994,11 +129016,11 @@ __338:
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 620)), j4, 3)
 __341:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+19220, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+19239, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+19222,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+19241,
 		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)
 __340:
@@ -129044,7 +129066,7 @@ __346:
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+19242,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+19261,
 		libc.VaList(bp+456, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
@@ -129078,89 +129100,103 @@ __351:
 
 	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+19272)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+19291)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+19277)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+19296)
 	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)
 
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __352
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_IdxRowid, *(*int32)(unsafe.Pointer(bp + 624))+j4, 3)
+	jmp7 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 3, 0, r1+int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn)-1)
+
+	Xsqlite3VdbeLoadString(tls, v, 3,
+		ts+19317)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+19353)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp7)
+__352:
+	;
 	label6 = 0
 	kk = 0
-__352:
+__353:
 	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) {
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
 		goto __356
 	}
-	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+	goto __354
 __356:
+	;
+	if !(label6 == 0) {
+		goto __357
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__357:
 	;
 	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:
+	kk++
+	goto __353
+	goto __355
+__355:
 	;
 	if !(label6 != 0) {
-		goto __357
+		goto __358
 	}
 	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
 	Xsqlite3VdbeResolveLabel(tls, v, label6)
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+19272)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+19291)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+19298)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+19364)
 	Xsqlite3VdbeGoto(tls, v, jmp5-1)
 	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-__357:
+__358:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __358
+		goto __359
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__359:
+__360:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __361
+		goto __362
 	}
 	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 __362
+		goto __363
 	}
-	goto __360
-__362:
+	goto __361
+__363:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
-	goto __360
-__360:
-	kk++
-	goto __359
 	goto __361
 __361:
+	kk++
+	goto __360
+	goto __362
+__362:
 	;
 	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)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+19391)
 	Xsqlite3VdbeGoto(tls, v, jmp5)
 	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
-__358:
+__359:
 	;
 	Xsqlite3VdbeJumpHere(tls, v, jmp4)
 	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 640)))
@@ -129177,20 +129213,20 @@ __347:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 620)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __363
+		goto __364
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+19352)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+19418)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__364:
+__365:
 	if !(pIdx5 != 0) {
-		goto __366
-	}
-	if !(pPk1 == pIdx5) {
 		goto __367
 	}
-	goto __365
-__367:
+	if !(pPk1 == pIdx5) {
+		goto __368
+	}
+	goto __366
+__368:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 624))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -129199,21 +129235,21 @@ __367:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __365
-__365:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __364
 	goto __366
 __366:
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
+	goto __365
+	goto __367
+__367:
 	;
 	if !(pPk1 != 0) {
-		goto __368
+		goto __369
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__368:
+__369:
 	;
-__363:
+__364:
 	;
 	goto __298
 __298:
@@ -129231,14 +129267,14 @@ __273:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __369
+		goto __370
 	}
 	(*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 + 19381
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 19447
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__369:
+__370:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -129246,27 +129282,27 @@ __369:
 
 __46:
 	if !!(zRight != 0) {
-		goto __370
+		goto __371
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __372
-	}
-	goto pragma_out
-__372:
-	;
-	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __371
-__370:
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
 		goto __373
 	}
+	goto pragma_out
+__373:
+	;
+	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
+	goto __372
+__371:
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
+		goto __374
+	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__374:
+__375:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __376
+		goto __377
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __377
+		goto __378
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -129275,25 +129311,25 @@ __374:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __376
-__377:
-	;
-	goto __375
-__375:
-	pEnc += 16
-	goto __374
-	goto __376
-__376:
-	;
-	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __378
-	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19384, libc.VaList(bp+464, zRight))
+	goto __377
 __378:
 	;
-__373:
+	goto __376
+__376:
+	pEnc += 16
+	goto __375
+	goto __377
+__377:
 	;
-__371:
+	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
+		goto __379
+	}
+	Xsqlite3ErrorMsg(tls, pParse, ts+19450, libc.VaList(bp+464, zRight))
+__379:
+	;
+__374:
+	;
+__372:
 	;
 	goto __15
 
@@ -129301,15 +129337,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 __379
+		goto __380
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __381
+		goto __382
 	}
 	goto __15
-__381:
+__382:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -129317,41 +129353,41 @@ __381:
 	(*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 __382
+		goto __383
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__382:
+__383:
 	;
-	goto __380
-__379:
+	goto __381
+__380:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __383
+		goto __384
 	}
 	goto __15
-__383:
+__384:
 	;
 	(*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)
-__380:
+__381:
 	;
 	goto __15
 
 __48:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__384:
+__385:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __385
+		goto __386
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __384
-__385:
+	goto __385
+__386:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -129366,31 +129402,31 @@ __49:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __386
-	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18714) == 0) {
 		goto __387
 	}
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18733) == 0) {
+		goto __388
+	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __388
-__387:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+19409) == 0) {
-		goto __389
+	goto __389
+__388:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+19475) == 0) {
+		goto __390
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __390
-__389:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18867) == 0) {
-		goto __391
+	goto __391
+__390:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18886) == 0) {
+		goto __392
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
+__392:
+	;
 __391:
 	;
-__390:
+__389:
 	;
-__388:
-	;
-__386:
+__387:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -129400,10 +129436,10 @@ __386:
 
 __50:
 	if !(zRight != 0) {
-		goto __392
+		goto __393
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__392:
+__393:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -129423,19 +129459,19 @@ __51:
 
 __52:
 	if !(zRight != 0) {
-		goto __393
+		goto __394
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __395
+		goto __396
 	}
 	goto __15
-__395:
+__396:
 	;
-	goto __394
-__393:
-	opMask = U32(0xfffe)
+	goto __395
 __394:
+	opMask = U32(0xfffe)
+__395:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -129444,86 +129480,86 @@ __394:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__396:
+__397:
 	if !(iDb <= iDbLast) {
-		goto __398
-	}
-	if !(iDb == 1) {
 		goto __399
 	}
-	goto __397
-__399:
+	if !(iDb == 1) {
+		goto __400
+	}
+	goto __398
+__400:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__400:
+__401:
 	if !(k4 != 0) {
-		goto __402
+		goto __403
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __403
+		goto __404
 	}
-	goto __401
-__403:
+	goto __402
+__404:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__404:
+__405:
 	if !(pIdx6 != 0) {
-		goto __406
-	}
-	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
 		goto __407
 	}
+	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
+		goto __408
+	}
 	szThreshold = int16(0)
-	goto __406
-__407:
+	goto __407
+__408:
 	;
-	goto __405
-__405:
-	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __404
 	goto __406
 __406:
+	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
+	goto __405
+	goto __407
+__407:
 	;
 	if !(szThreshold != 0) {
-		goto __408
+		goto __409
 	}
 	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))
 
-__408:
+__409:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+19417,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+19483,
 		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 __409
+		goto __410
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __410
-__409:
-	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+	goto __411
 __410:
+	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+__411:
 	;
-	goto __401
-__401:
-	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __400
 	goto __402
 __402:
+	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
+	goto __401
+	goto __403
+__403:
 	;
-	goto __397
-__397:
-	iDb++
-	goto __396
 	goto __398
 __398:
+	iDb++
+	goto __397
+	goto __399
+__399:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -129531,36 +129567,36 @@ __398:
 __53:
 	;
 	if !(zRight != 0) {
-		goto __411
+		goto __412
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__411:
+__412:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __412
+		goto __413
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__412:
+__413:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __55:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK) {
-		goto __413
+		goto __414
 	}
 	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 __414
+		goto __415
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 656)))
-__414:
+__415:
 	;
-__413:
+__414:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -129569,10 +129605,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __415
+		goto __416
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664))&int64(0x7fffffff)))
-__415:
+__416:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -129581,10 +129617,10 @@ __57:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+672) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 672)) >= int64(0)) {
-		goto __416
+		goto __417
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 672)) & int64(0x7fffffff))
-__416:
+__417:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -129592,10 +129628,10 @@ __416:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __417
+		goto __418
 	}
 
-__417:
+__418:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -129647,14 +129683,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{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},
+	{FzName: ts + 19501, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 19506, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 19512, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 19521, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 19530, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 19538, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 19546},
+	{FzName: ts + 19553},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -129706,7 +129742,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+19493)
+	Xsqlite3_str_appendall(tls, bp+32, ts+19559)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -129714,7 +129750,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+19508, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+19574, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -129727,19 +129763,19 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+19515, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+19581, 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+19521)
+		Xsqlite3_str_appendall(tls, bp+32, ts+19587)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+19533)
+		Xsqlite3_str_appendall(tls, bp+32, ts+19599)
 		j++
 	}
-	Xsqlite3_str_append(tls, bp+32, ts+6309, 1)
+	Xsqlite3_str_append(tls, bp+32, ts+6328, 1)
 	Xsqlite3StrAccumFinish(tls, bp+32)
 
 	rc = Xsqlite3_declare_vtab(tls, db, bp+64)
@@ -129755,7 +129791,7 @@ __3:
 			(*PragmaVtab)(unsafe.Pointer(pTab)).FnHidden = U8(j)
 		}
 	} else {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	}
 
 	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
@@ -129903,7 +129939,7 @@ __1:
 		var zText uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 
 		if zText != 0 {
-			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, zText))
+			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, zText))
 			if *(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) == uintptr(0) {
 				return SQLITE_NOMEM
 			}
@@ -129919,13 +129955,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+19548)
+	Xsqlite3_str_appendall(tls, bp+32, ts+19614)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+19556, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+19622, 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+19560, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+19626, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -129934,7 +129970,7 @@ __3:
 	rc = Xsqlite3_prepare_v2(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
 	Xsqlite3_free(tls, zSql)
 	if rc != SQLITE_OK {
-		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
+		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
 		return rc
 	}
 	return pragmaVtabNext(tls, pVtabCursor)
@@ -130002,33 +130038,33 @@ 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+19564, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+19630, 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, 137196)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137249)
 	} else {
 		var z uintptr
 		var zObj uintptr
 		if *(*uintptr)(unsafe.Pointer(azObj + 1*8)) != 0 {
 			zObj = *(*uintptr)(unsafe.Pointer(azObj + 1*8))
 		} else {
-			zObj = ts + 6360
+			zObj = ts + 6379
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+19592, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+19658, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+19623, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+19689, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137256)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 19631,
-	ts + 19638,
-	ts + 19650,
+	ts + 19697,
+	ts + 19704,
+	ts + 19716,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -130088,7 +130124,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+15497)
+				corruptSchema(tls, pData, argv, ts+15516)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -130120,13 +130156,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+19661)
+			corruptSchema(tls, pData, argv, ts+19727)
 		} 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+15497)
+				corruptSchema(tls, pData, argv, ts+15516)
 			}
 		}
 	}
@@ -130159,16 +130195,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 + 10228
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 10247
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 7741
+			return ts + 7760
 		}
-		return ts + 7235
+		return ts + 7254
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 9290
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 19674
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 9309
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 19740
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -130262,7 +130298,7 @@ __10:
 		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+13127)
+		ts+13146)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __15:
@@ -130297,7 +130333,7 @@ __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)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+19812)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __19:
@@ -130311,7 +130347,7 @@ __20:
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+19770,
+		ts+19836,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -130584,7 +130620,7 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
 	(*Parse)(unsafe.Pointer(pParse)).Fdb = db
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1480, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1499, 0)
 	}
 }
 
@@ -130612,7 +130648,7 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, bp+16, ts+1480, 0)
+	Xsqlite3ErrorMsg(tls, bp+16, ts+1499, 0)
 __1:
 	;
 	if !(prepFlags&U32(SQLITE_PREPARE_PERSISTENT) != 0) {
@@ -130643,7 +130679,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+19804, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+19870, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -130673,7 +130709,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+19834, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+19900, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -130733,7 +130769,7 @@ __21:
 	if !((*Parse)(unsafe.Pointer(bp+16)).FzErrMsg != 0) {
 		goto __22
 	}
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+4493, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+4512, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 	Xsqlite3DbFree(tls, db, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
 	goto __23
 __22:
@@ -130769,7 +130805,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, 137995)
+		return Xsqlite3MisuseError(tls, 138048)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -130868,7 +130904,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, 138143)
+		return Xsqlite3MisuseError(tls, 138196)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -131186,8 +131222,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 + 12272
-		var zSp2 uintptr = ts + 12272
+		var zSp1 uintptr = ts + 12291
+		var zSp2 uintptr = ts + 12291
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -131195,13 +131231,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19853, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+19919, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 19883))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 19949))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -131376,7 +131412,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+19917, libc.VaList(bp, 0))
+					ts+19983, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -131421,7 +131457,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+19967, libc.VaList(bp+8, zName))
+						ts+20033, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -131432,7 +131468,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+20031,
+							Xsqlite3ErrorMsg(tls, pParse, ts+20097,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -131476,7 +131512,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 7938, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 7957, 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.
@@ -132060,16 +132096,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 20068
+		z = ts + 20134
 		break
 	case TK_INTERSECT:
-		z = ts + 20078
+		z = ts + 20144
 		break
 	case TK_EXCEPT:
-		z = ts + 20088
+		z = ts + 20154
 		break
 	default:
-		z = ts + 20095
+		z = ts + 20161
 		break
 	}
 	return z
@@ -132079,7 +132115,7 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20101, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20167, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
@@ -132105,11 +132141,11 @@ 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 {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20190, libc.VaList(bp, func() uintptr {
 		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
-			return ts + 20155
+			return ts + 20221
 		}
-		return ts + 1544
+		return ts + 1563
 	}()))
 
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
@@ -132297,8 +132333,8 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 				}
 
 				if iCol < 0 {
-					zType = ts + 1109
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 17625
+					zType = ts + 1128
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 17644
 				} 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))
@@ -132437,13 +132473,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 17625
+				zCol = ts + 17644
 			} 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+13413, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+13432, 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))
@@ -132451,7 +132487,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+20170, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+20236, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -132541,7 +132577,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 17625
+					zName = ts + 17644
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -132551,7 +132587,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+20170, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+20236, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -132567,7 +132603,7 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+20179, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+20245, 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)
@@ -132650,8 +132686,6 @@ __1:
 		(*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
@@ -132666,12 +132700,15 @@ __1:
 			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
 				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
 			}
+			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)
+			}
 		}
 		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
+				zType = ts + 20253
 			} else {
 				zType = uintptr(0)
 				for j = 1; j < SQLITE_N_STDTYPE; j++ {
@@ -132887,7 +132924,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20191, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20257, 0)
 	return
 __1:
 	;
@@ -132978,7 +133015,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20240, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20306, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -132998,7 +133035,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20282, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20348, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -133035,7 +133072,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20288, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20354, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -133069,11 +133106,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+20303, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20369, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
-			return ts + 1544
+			return ts + 1563
 		}
-		return ts + 20326
+		return ts + 20392
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -133174,8 +133211,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20328, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20343, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20394, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20409, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -133222,7 +133259,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20068, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20134, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -133289,7 +133326,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+20362, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20428, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -133351,7 +133388,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+20362, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20428, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -133504,10 +133541,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+20383, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+20449, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+20429,
+			ts+20495,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -133761,8 +133798,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+8586)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+8586)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+8594)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+8594)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -133789,13 +133826,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+20511, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20577, 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+20522, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20588, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -133807,7 +133844,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+20527, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20593, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -133995,7 +134032,8 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 				Xsqlite3VectorErrorMsg(tls, (*SubstContext)(unsafe.Pointer(pSubst)).FpParse, pCopy)
 			} else {
 				var db uintptr = (*Parse)(unsafe.Pointer((*SubstContext)(unsafe.Pointer(pSubst)).FpParse)).Fdb
-				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 && int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN {
+				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 &&
+					(int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN || (*Expr)(unsafe.Pointer(pCopy)).FiTable != (*SubstContext)(unsafe.Pointer(pSubst)).FiNewTable) {
 					libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
 					(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_IF_NULL_ROW)
 					(*Expr)(unsafe.Pointer(bp)).FpLeft = pCopy
@@ -134035,7 +134073,7 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 								if pColl != 0 {
 									return (*CollSeq)(unsafe.Pointer(pColl)).FzName
 								}
-								return ts + 1089
+								return ts + 1108
 							}())
 					}
 
@@ -134823,12 +134861,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+16521) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+16540) == 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+16525) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+16544) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -134894,7 +134932,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+20533, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+20599, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -134977,7 +135015,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+20551, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+20617, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -135106,7 +135144,7 @@ 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+20574, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+20640, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
@@ -135129,7 +135167,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+20594, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+20660, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -135145,7 +135183,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20637
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20703
 		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 {
@@ -135171,7 +135209,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+20660,
+				Xsqlite3ErrorMsg(tls, pParse, ts+20726,
 					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
@@ -135182,9 +135220,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 + 20698
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20764
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20732
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20798
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -135231,7 +135269,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+20770, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+20836, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -135343,7 +135381,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+20774,
+				Xsqlite3ErrorMsg(tls, pParse, ts+20840,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -135362,7 +135400,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+20813,
+						Xsqlite3ErrorMsg(tls, pParse, ts+20879,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -135370,7 +135408,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+16090,
+					Xsqlite3ErrorMsg(tls, pParse, ts+16109,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -135471,7 +135509,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 7798
+							zSchemaName = ts + 7817
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -135486,7 +135524,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+20844, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+20910, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -135551,7 +135589,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+20849,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+20915,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -135563,7 +135601,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+13413, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+13432, 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)
@@ -135582,9 +135620,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+20858, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+20924, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+20876, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+20942, 0)
 					}
 				}
 			}
@@ -135594,7 +135632,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+20896, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+20962, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -135732,7 +135770,7 @@ func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect ui
 	(*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)
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSelect)).FpGroupBy)).FnExpr)
 		} 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)
 		}
@@ -135816,13 +135854,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+20927, 0)
+					ts+20993, 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+20978, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21044, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -136011,19 +136049,19 @@ 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+21011,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21077,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 21023
+						return ts + 21089
 					}
-					return ts + 1544
+					return ts + 1563
 				}(),
 				func() uintptr {
 					if bCover != 0 {
 						return (*Index)(unsafe.Pointer(pIdx)).FzName
 					}
-					return ts + 1544
+					return ts + 1563
 				}()))
 	}
 }
@@ -136036,7 +136074,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+9290)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+9309)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -136343,7 +136381,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+21046,
+		ts+21112,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -136404,7 +136442,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21100,
+	Xsqlite3ErrorMsg(tls, pParse, ts+21166,
 		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:
@@ -136508,7 +136546,7 @@ __27:
 	if !((*SrcItem)(unsafe.Pointer(pItem1)).FcolUsed == uint64(0) && (*SrcItem)(unsafe.Pointer(pItem1)).FzName != uintptr(0)) {
 		goto __30
 	}
-	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1544, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
+	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1563, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
 __30:
 	;
 	pSub1 = (*SrcItem)(unsafe.Pointer(pItem1)).FpSelect
@@ -136546,7 +136584,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+21140, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21206, 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)
@@ -136605,7 +136643,7 @@ __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21155, libc.VaList(bp+40, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21221, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
@@ -137076,9 +137114,9 @@ __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 + 21171
+				return ts + 21237
 			}
-			return ts + 21180
+			return ts + 21246
 		}())
 
 	groupBySort = 1
@@ -137429,7 +137467,7 @@ __65:
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
 		goto __146
 	}
-	explainTempTable(tls, pParse, ts+21171)
+	explainTempTable(tls, pParse, ts+21237)
 __146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
@@ -137512,7 +137550,7 @@ __7:
 	if !(i < nCol) {
 		goto __9
 	}
-	z = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
+	z = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
 	if !(z == uintptr(0)) {
 		goto __10
 	}
@@ -137534,7 +137572,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+21189, 0)
+		ts+21255, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -137630,7 +137668,7 @@ func Xsqlite3_get_table(tls *libc.TLS, db uintptr, zSql uintptr, pazResult uintp
 		if (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
 			if pzErrMsg != 0 {
 				Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(pzErrMsg)))
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
 			}
 			Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg)
 		}
@@ -137767,7 +137805,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+21254, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+21320, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -137811,7 +137849,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+21300, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+21366, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -137829,7 +137867,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21308, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+21374, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -137841,7 +137879,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+21300, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+21366, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -137856,11 +137894,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21349, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+21415, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
+
 __17:
 	;
 	goto trigger_cleanup
@@ -137868,22 +137907,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7733, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7752, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21375, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+21441, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21413,
+	Xsqlite3ErrorMsg(tls, pParse, ts+21479,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 21450
+				return ts + 21516
 			}
-			return ts + 21457
+			return ts + 21523
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -137892,7 +137931,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+21463, libc.VaList(bp+24, pTableName+8))
+		ts+21529, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -137921,9 +137960,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 7741
+			return ts + 7760
 		}
-		return ts + 7235
+		return ts + 7254
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -138041,7 +138080,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+21300, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+21366, 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
@@ -138074,7 +138113,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+21509,
+		ts+21575,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -138099,13 +138138,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+21557,
+		ts+21623,
 		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+21632, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+21698, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -138361,7 +138400,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21661, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+21727, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -138400,9 +138439,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 + 7741
+				return ts + 7760
 			}
-			return ts + 7235
+			return ts + 7254
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -138414,7 +138453,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21681,
+			ts+21747,
 			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)
@@ -138528,12 +138567,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+21743,
+		ts+21809,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 21791
+				return ts + 21857
 			}
-			return ts + 21798
+			return ts + 21864
 		}()))
 __15:
 	;
@@ -138647,7 +138686,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+21805, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+21871, 0)
 	return 1
 }
 
@@ -138713,7 +138752,7 @@ func codeReturningTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab
 	}
 	Xsqlite3ExprListDelete(tls, db, (*Select)(unsafe.Pointer(bp)).FpEList)
 	pNew = sqlite3ExpandReturning(tls, pParse, (*Returning)(unsafe.Pointer(pReturning)).FpReturnEL, pTab)
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0) {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
 		libc.Xmemset(tls, bp+240, 0, uint64(unsafe.Sizeof(NameContext{})))
 		if (*Returning)(unsafe.Pointer(pReturning)).FnRetCol == 0 {
 			(*Returning)(unsafe.Pointer(pReturning)).FnRetCol = (*ExprList)(unsafe.Pointer(pNew)).FnExpr
@@ -138767,7 +138806,7 @@ func codeTriggerProgram(tls *libc.TLS, pParse uintptr, pStepList uintptr, orconf
 
 		if (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan != 0 {
 			Xsqlite3VdbeAddOp4(tls, v, OP_Trace, 0x7fffffff, 1, 0,
-				Xsqlite3MPrintf(tls, db, ts+7432, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
+				Xsqlite3MPrintf(tls, db, ts+7451, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
 				-6)
 		}
 
@@ -138877,7 +138916,7 @@ 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+21847, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+21913, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
@@ -139470,7 +139509,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+21861,
+		ts+21927,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -139502,7 +139541,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+21897, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+21963, 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:
@@ -139512,7 +139551,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 9065
+				return ts + 9084
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -139828,7 +139867,12 @@ __74:
 	goto __77
 __76:
 	flags = WHERE_ONEPASS_DESIRED
-	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) && !(pTrigger != 0) && !(hasFK != 0) && !(chngKey != 0) && !(*(*int32)(unsafe.Pointer(bp + 104)) != 0)) {
+	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) &&
+		!(pTrigger != 0) &&
+		!(hasFK != 0) &&
+		!(chngKey != 0) &&
+		!(*(*int32)(unsafe.Pointer(bp + 104)) != 0) &&
+		(*NameContext)(unsafe.Pointer(bp+40)).FncFlags&NC_Subquery == 0) {
 		goto __78
 	}
 	flags = flags | WHERE_ONEPASS_MULTIROW
@@ -140382,7 +140426,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+21916)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+21982)
 __169:
 	;
 update_cleanup:
@@ -140688,10 +140732,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+21929, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+21995, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+21933, libc.VaList(bp+8, bp+216))
+				ts+21999, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -140782,7 +140826,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+13502, -1)
+				ts+13521, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -140814,7 +140858,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+22006, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+22010, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+22072, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+22076, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -140962,14 +141006,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+22014)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+22080)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+22054)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+22120)
 	return SQLITE_ERROR
 __2:
 	;
@@ -140980,7 +141024,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+22097)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+22163)
 	return SQLITE_ERROR
 __5:
 	;
@@ -140989,7 +141033,7 @@ __5:
 	*(*uint32)(unsafe.Pointer(db + 76)) |= uint32(SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE)
 	goto __4
 __3:
-	zOut = ts + 1544
+	zOut = ts + 1563
 __4:
 	;
 	saved_flags = (*Sqlite3)(unsafe.Pointer(db)).Fflags
@@ -141008,7 +141052,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+22115, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+22181, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -141028,7 +141072,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+22138)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+22204)
 	goto end_of_vacuum
 __8:
 	;
@@ -141043,7 +141087,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+15860)
+	rc = execSql(tls, db, pzErrMsg, ts+15879)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -141088,7 +141132,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+22165,
+		ts+22231,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -141097,7 +141141,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+22273,
+		ts+22339,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -141108,7 +141152,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+22327,
+		ts+22393,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -141119,7 +141163,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+22478,
+		ts+22544,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -141464,7 +141508,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+13729, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13748, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -141548,11 +141592,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+22608, libc.VaList(bp, pParse+272))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+22674, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+22632,
+			ts+22698,
 			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,
@@ -141562,7 +141606,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+22731, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+22797, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -141623,7 +141667,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+22750, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+22816, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -141651,9 +141695,11 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FbDeclared = 0
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = bp + 32
+	(*Table)(unsafe.Pointer(pTab)).FnTabRef++
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{xConstruct})).f(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, pVTable+16, bp+64)
+	Xsqlite3DeleteTable(tls, db, pTab)
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = (*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -141661,9 +141707,9 @@ 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+22792, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+22858, libc.VaList(bp+8, zModuleName))
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+4493, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+4512, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 		}
 		Xsqlite3DbFree(tls, db, pVTable)
@@ -141673,7 +141719,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 + 22822
+			var zFormat uintptr = ts + 22888
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -141685,12 +141731,12 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 			*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) = pVTable
 
 			for iCol = 0; iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol); iCol++ {
-				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1544)
+				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1563)
 				var nType int32
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+17516, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+17535, 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
@@ -141747,13 +141793,13 @@ 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+22868, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22934, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxConnect, bp+16)
 		if rc != SQLITE_OK {
-			Xsqlite3ErrorMsg(tls, pParse, ts+4493, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+4512, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 		}
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 16)))
@@ -141805,7 +141851,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+22868, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+22934, 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)
@@ -141839,7 +141885,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, 151030)
+		return Xsqlite3MisuseError(tls, 151102)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -141881,7 +141927,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR,
 			func() uintptr {
 				if (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
-					return ts + 4493
+					return ts + 4512
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg))
@@ -142249,7 +142295,7 @@ func Xsqlite3VtabEponymousTableInit(tls *libc.TLS, pParse uintptr, pMod uintptr)
 	addModuleArgument(tls, pParse, pTab, Xsqlite3DbStrDup(tls, db, (*Table)(unsafe.Pointer(pTab)).FzName))
 	rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer(pModule)).FxConnect, bp+8)
 	if rc != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+4493, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+		Xsqlite3ErrorMsg(tls, pParse, ts+4512, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		Xsqlite3VtabEponymousTableClear(tls, db, pMod)
 	}
@@ -142292,7 +142338,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, 151521)
+		rc = Xsqlite3MisuseError(tls, 151593)
 	} else {
 		ap = va
 		switch op {
@@ -142319,7 +142365,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 151539)
+				rc = Xsqlite3MisuseError(tls, 151611)
 				break
 
 			}
@@ -142550,10 +142596,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 + 22887
+		return ts + 22953
 	}
 	if i == -1 {
-		return ts + 17625
+		return ts + 17644
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -142562,35 +142608,35 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+22894, 5)
+		Xsqlite3_str_append(tls, pStr, ts+22960, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+22900, 1)
+		Xsqlite3_str_append(tls, pStr, ts+22966, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+14119, 1)
+			Xsqlite3_str_append(tls, pStr, ts+14138, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+6309, 1)
+		Xsqlite3_str_append(tls, pStr, ts+6328, 1)
 	}
 
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+22900, 1)
+		Xsqlite3_str_append(tls, pStr, ts+22966, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+14119, 1)
+			Xsqlite3_str_append(tls, pStr, ts+14138, 1)
 		}
-		Xsqlite3_str_append(tls, pStr, ts+6360, 1)
+		Xsqlite3_str_append(tls, pStr, ts+6379, 1)
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+6309, 1)
+		Xsqlite3_str_append(tls, pStr, ts+6328, 1)
 	}
 }
 
@@ -142607,29 +142653,29 @@ 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+22902, 2)
+	Xsqlite3_str_append(tls, pStr, ts+22968, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+22894, 5)
+			Xsqlite3_str_append(tls, pStr, ts+22960, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 22905
+				return ts + 22971
 			}
-			return ts + 22910
+			return ts + 22976
 		}(), 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+22918)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+22984)
 		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+22920)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+22986)
 	}
-	Xsqlite3_str_append(tls, pStr, ts+6309, 1)
+	Xsqlite3_str_append(tls, pStr, ts+6328, 1)
 }
 
 // This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
@@ -142670,11 +142716,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+22922, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+22988, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 22928
+				return ts + 22994
 			}
-			return ts + 22935
+			return ts + 23001
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -142684,43 +142730,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 + 12328
+					zFmt = ts + 12347
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 22940
+				zFmt = ts + 23006
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 22973
+				zFmt = ts + 23039
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 22998
+				zFmt = ts + 23064
 			} else {
-				zFmt = ts + 23016
+				zFmt = ts + 23082
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+23025, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+23091, 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 + 17625
-			Xsqlite3_str_appendf(tls, bp+64, ts+23033, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 17644
+			Xsqlite3_str_appendf(tls, bp+64, ts+23099, 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+23064, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+23130, 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+23074, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+23140, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+23079,
+			Xsqlite3_str_appendf(tls, bp+64, ts+23145,
 				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+23106, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+23172, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -142752,25 +142798,25 @@ 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+23117, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+23183, 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+22905, 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+22971, 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+23138, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+23204, 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+22894, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+22960, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+22905, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+22971, libc.VaList(bp+16, z))
 		}
 	}
-	Xsqlite3_str_append(tls, bp+24, ts+6309, 1)
+	Xsqlite3_str_append(tls, bp+24, ts+6328, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
@@ -144364,7 +144410,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23146, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23212, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -144392,7 +144438,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23161, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23227, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -144910,7 +144956,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+23170, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23236, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -145268,10 +145314,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{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)},
+	{FzOp: ts + 17493, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 16823, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 16343, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 23250, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -145761,12 +145807,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+23191, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+23257, 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+23191, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+23257, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -145845,7 +145891,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 + 8121
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 9070
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -145939,7 +145985,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 23232
+				return ts + 23298
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -146315,7 +146361,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+23239,
+			Xsqlite3ErrorMsg(tls, pParse, ts+23305,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -146331,7 +146377,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 		pRhs = Xsqlite3PExpr(tls, pParse, TK_UPLUS,
 			Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*ExprList_item)(unsafe.Pointer(pArgs+8+uintptr(j)*32)).FpExpr, 0), uintptr(0))
 		pTerm = Xsqlite3PExpr(tls, pParse, TK_EQ, pColRef, pRhs)
-		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ|JT_RIGHT) != 0 {
 			joinType = U32(EP_OuterON)
 		} else {
 			joinType = U32(EP_InnerON)
@@ -147049,7 +147095,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+23275, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+23341, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -147120,7 +147166,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 23301
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 23367
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -147294,6 +147340,10 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	var iCur int32
+	var saved_pIdxEpr uintptr
+
+	saved_pIdxEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 
 	addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	for __ccgo := true; __ccgo; __ccgo = iLevel < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel) {
@@ -147337,9 +147387,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, n)
 			var jj int32
 			for jj = 0; jj < n; jj++ {
-				var iCol int32 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(jj)*2)))
-
-				Xsqlite3ExprCodeGetColumnOfTable(tls, v, (*Index)(unsafe.Pointer(pIdx)).FpTable, iCur, iCol, r1+jj)
+				Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pIdx, iCur, jj, r1+jj)
 			}
 			Xsqlite3VdbeAddOp4Int(tls, v, OP_FilterAdd, (*WhereLevel)(unsafe.Pointer(pLevel)).FregFilter, 0, r1, n)
 			Xsqlite3ReleaseTempRange(tls, pParse, r1, n)
@@ -147373,6 +147421,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 		}
 	}
 	Xsqlite3VdbeJumpHere(tls, v, addrOnce)
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = saved_pIdxEpr
 }
 
 func allocateIndexInfo(tls *libc.TLS, pWInfo uintptr, pWC uintptr, mUnusable Bitmask, pSrc uintptr, pmNoOmit uintptr) uintptr {
@@ -147486,7 +147535,7 @@ __3:
 		uint64(unsafe.Sizeof(sqlite3_index_orderby{}))*uint64(nOrderBy)+uint64(unsafe.Sizeof(HiddenIndexInfo1{}))+
 		uint64(unsafe.Sizeof(uintptr(0)))*uint64(nTerm))
 	if pIdxInfo == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1480, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1499, 0)
 		return uintptr(0)
 	}
 	pHidden = pIdxInfo + 1*96
@@ -147608,9 +147657,9 @@ func vtabBestIndex(tls *libc.TLS, pParse uintptr, pTab uintptr, p uintptr) int32
 		if rc == SQLITE_NOMEM {
 			Xsqlite3OomFault(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb)
 		} else if !(int32((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+4493, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
+			Xsqlite3ErrorMsg(tls, pParse, ts+4512, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+4493, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
+			Xsqlite3ErrorMsg(tls, pParse, ts+4512, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
 		}
 	}
 	Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg)
@@ -147631,11 +147680,16 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 
 	_ = pParse
 
+	if !((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol)
+	} else {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnColumn)
+	}
 	nField = func() int32 {
-		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < (*Index)(unsafe.Pointer(pIdx)).FnSample {
+		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < nField {
 			return int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField)
 		}
-		return (*Index)(unsafe.Pointer(pIdx)).FnSample
+		return nField
 	}()
 	iCol = 0
 	iSample = (*Index)(unsafe.Pointer(pIdx)).FnSample * nField
@@ -149216,7 +149270,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+23312, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23378, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -149274,7 +149328,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+23312, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+23378, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -149672,7 +149726,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+23338, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+23404, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -150279,7 +150333,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23373, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23439, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -150314,6 +150368,10 @@ __3:
 			if int32((*WherePath)(unsafe.Pointer(pFrom)).FisOrdered) == (*ExprList)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpOrderBy)).FnExpr {
 				(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_ORDERED)
 			}
+			if (*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy != 0 &&
+				int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) > (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr {
+				(*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat = I8((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr)
+			}
 		} else {
 			(*WhereInfo)(unsafe.Pointer(pWInfo)).FrevMask = (*WherePath)(unsafe.Pointer(pFrom)).FrevLoop
 			if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) <= 0 {
@@ -150608,6 +150666,9 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
+		if Xsqlite3IndexAffinityStr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pIdx) != 0 {
+			(*IndexedExpr)(unsafe.Pointer(p)).Faff = U8(*(*int8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FzColAff + uintptr(i))))
+		}
 		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
@@ -150760,7 +150821,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+23391, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+23457, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -150824,7 +150885,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+23419, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+23485, 0)
 	goto __5
 __4:
 	ii = 0
@@ -151706,7 +151767,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+23437, -1)
+		pCtx, ts+23503, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -151839,7 +151900,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+23493, -1)
+					pCtx, ts+23559, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -151929,17 +151990,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-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))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 23604))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 23615))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 23626))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 23631))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 23644))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 23654))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 23660))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 23671))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 23681))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 23693))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 23698))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -151985,7 +152046,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23636, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23702, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -152029,12 +152090,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+23655, 0)
+			ts+23721, 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+23726, 0)
+				ts+23792, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -152057,7 +152118,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+9290)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+9309)
 					}
 					break
 				}
@@ -152263,7 +152324,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+23789, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+23855, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -152379,7 +152440,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+8882))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+8890))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -152494,7 +152555,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+23815, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23881, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -152559,15 +152620,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 + 23847
+				zErr = ts + 23913
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 23864
+				zErr = ts + 23930
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 23880
+				zErr = ts + 23946
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23900, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+23966, 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 {
@@ -152588,7 +152649,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+23933, 0)
+				ts+23999, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -152726,7 +152787,7 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regZero)
 	if eCond >= WINDOW_STARTING_NUM {
 		var regString int32 = Xsqlite3GetTempReg(tls, pParse)
-		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1544, -1)
+		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1563, -1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, Xsqlite3VdbeCurrentAddr(tls, v)+2, reg)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL))
 
@@ -152744,11 +152805,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 23980,
-	ts + 24033,
-	ts + 23437,
-	ts + 24084,
-	ts + 24136,
+	ts + 24046,
+	ts + 24099,
+	ts + 23503,
+	ts + 24150,
+	ts + 24202,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -153239,7 +153300,7 @@ func windowCodeRangeTest(tls *libc.TLS, p uintptr, op int32, csr1 int32, regVal
 
 	}
 
-	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1544, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1563, -1)
 	addrGe = Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, 0, reg1)
 
 	if op == OP_Ge && arith == OP_Add || op == OP_Le && arith == OP_Subtract {
@@ -154143,19 +154204,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+24186,
+				Xsqlite3ErrorMsg(tls, pParse, ts+24252,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 24228
+							return ts + 24294
 						}
-						return ts + 24237
+						return ts + 24303
 					}(),
 						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+24243, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+24309, 0)
 		}
 	}
 
@@ -154223,7 +154284,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+24277,
+		Xsqlite3ErrorMsg(tls, pParse, ts+24343,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -155320,7 +155381,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+24315, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+24381, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -156295,21 +156356,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+17625, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+17644, 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+24337, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+24403, 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+17538, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+17557, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+24337, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+24403, 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))
@@ -157052,7 +157113,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+24364)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+24430)
 				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 {
@@ -157216,7 +157277,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+24373, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+24439, 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))
@@ -157433,9 +157494,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 + 8116
+							return ts + 9065
 						}
-						return ts + 8121
+						return ts + 9070
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -157719,19 +157780,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+24397, 0)
+					ts+24463, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+24492, 0)
+					ts+24558, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+24576, 0)
+					ts+24642, 0)
 			}
 			break
 		case uint32(273):
@@ -158110,9 +158171,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+24373, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+24439, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+24661, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+24727, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -158880,7 +158941,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+24678, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+24744, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -158901,9 +158962,9 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 	}
 	if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg != 0 || (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_OK && (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_DONE {
 		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)))
+			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+4512, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+24703, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+24769, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -159076,7 +159137,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+24714, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+24780, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -159089,11 +159150,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+21300, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+21366, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+24721, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+24787, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+24726, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+24792, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -159106,9 +159167,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+24736, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+24802, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+24740, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+24806, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -159178,7 +159239,8 @@ func sqlite3TestExtInit(tls *libc.TLS, db uintptr) int32 {
 	return Xsqlite3FaultSim(tls, 500)
 }
 
-var sqlite3BuiltinExtensions = [4]uintptr{
+var sqlite3BuiltinExtensions = [5]uintptr{
+	0,
 	0,
 	0,
 	0,
@@ -159342,7 +159404,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 174337)
+		return Xsqlite3MisuseError(tls, 174426)
 	}
 
 	ap = va
@@ -159917,7 +159979,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175111)
+		return Xsqlite3MisuseError(tls, 175200)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -159932,7 +159994,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+24748, 0)
+			ts+24814, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -160123,23 +160185,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 + 24816
+	var zErr uintptr = ts + 24882
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 24830
+			zErr = ts + 24896
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 24852
+			zErr = ts + 24918
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 24874
+			zErr = ts + 24940
 			break
 
 		}
@@ -160157,35 +160219,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 24897,
-	ts + 24910,
+	ts + 24963,
+	ts + 24976,
 	uintptr(0),
-	ts + 24926,
-	ts + 24951,
-	ts + 24965,
-	ts + 24984,
-	ts + 1480,
-	ts + 25009,
-	ts + 25046,
-	ts + 25058,
-	ts + 25073,
-	ts + 25106,
+	ts + 24992,
+	ts + 25017,
+	ts + 25031,
+	ts + 25050,
+	ts + 1499,
+	ts + 25075,
+	ts + 25112,
 	ts + 25124,
-	ts + 25149,
-	ts + 25178,
+	ts + 25139,
+	ts + 25172,
+	ts + 25190,
+	ts + 25215,
+	ts + 25244,
 	uintptr(0),
-	ts + 7190,
-	ts + 6686,
-	ts + 25195,
-	ts + 25213,
-	ts + 25231,
+	ts + 7209,
+	ts + 6705,
+	ts + 25261,
+	ts + 25279,
+	ts + 25297,
 	uintptr(0),
-	ts + 25265,
+	ts + 25331,
 	uintptr(0),
-	ts + 25286,
-	ts + 25312,
-	ts + 25335,
-	ts + 25356,
+	ts + 25352,
+	ts + 25378,
+	ts + 25401,
+	ts + 25422,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -160306,7 +160368,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, 175758)
+		return Xsqlite3MisuseError(tls, 175847)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -160351,7 +160413,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+25372, 0)
+				ts+25438, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -160468,7 +160530,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+25435, libc.VaList(bp, zName))
+		ts+25501, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -160496,7 +160558,7 @@ func Xsqlite3_overload_function(tls *libc.TLS, db uintptr, zName uintptr, nArg i
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, zName))
+	zCopy = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, zName))
 	if zCopy == uintptr(0) {
 		return SQLITE_NOMEM
 	}
@@ -160704,7 +160766,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+25486, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+25552, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -160797,7 +160859,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, 176503))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176592))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -160867,7 +160929,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, 176582)
+		return Xsqlite3MisuseError(tls, 176671)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -160877,7 +160939,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, 176591)
+		return Xsqlite3MisuseError(tls, 176680)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -160909,14 +160971,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, 176639)
+		return Xsqlite3MisuseError(tls, 176728)
 	}
 
 	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+25507, 0)
+				ts+25573, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -161046,7 +161108,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+25575, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+25641, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -161091,10 +161153,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+25581, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+25647, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25591,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25657,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -161199,7 +161261,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+25619, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+25685, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -161210,17 +161272,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+25623, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+25689, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 25623
+	zModeType = ts + 25689
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+25629, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+25695, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -161228,7 +161290,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 25634
+	zModeType = ts + 25700
 __32:
 	;
 	if !(aMode != 0) {
@@ -161258,7 +161320,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25641, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25707, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -161266,7 +161328,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25661,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25727,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -161306,7 +161368,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25685, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25751, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -161330,15 +161392,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 25701, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 25708, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 25767, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 25774, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{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},
+	{Fz: ts + 25782, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 25785, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 25788, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 18750, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -161484,10 +161546,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+23232, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+23298, 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+25726, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+25792, 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) {
@@ -161501,7 +161563,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 177308)
+	rc = Xsqlite3MisuseError(tls, 177397)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -161518,7 +161580,7 @@ __19:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 4493
+			return ts + 4512
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -161552,9 +161614,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 + 7793
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 7812
 	(*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 + 24721
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 24787
 	(*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)
@@ -161659,7 +161721,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 25732
+		zFilename = ts + 25798
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -161762,21 +161824,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+25735,
+	Xsqlite3_log(tls, iErr, ts+25801,
 		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+25760)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+25826)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+25780)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+25846)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+25787)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+25853)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -161887,7 +161949,7 @@ __4:
 	autoinc = libc.Bool32(int32((*Table)(unsafe.Pointer(pTab)).FiPKey) == iCol && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != U32(0))
 	goto __13
 __12:
-	zDataType = ts + 1109
+	zDataType = ts + 1128
 	primarykey = 1
 __13:
 	;
@@ -161934,14 +161996,14 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+25804, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+25870, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 4493
+			return ts + 4512
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -162590,7 +162652,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+25832, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+25898, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -162708,7 +162770,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 + 25840
+			return ts + 25906
 		}
 		return uintptr(0)
 	}(), 0)
@@ -162886,7 +162948,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 7533, ts + 8116, ts + 8121, ts + 7543, ts + 7538, ts + 9357, ts + 25863, ts + 25869,
+	ts + 7552, ts + 9065, ts + 9070, ts + 7562, ts + 7557, ts + 9376, ts + 25929, ts + 25935,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -163039,7 +163101,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 + 25876 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 25942 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -163065,7 +163127,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	switch Xsqlite3_value_type(tls, pValue) {
 	case SQLITE_NULL:
 		{
-			jsonAppendRaw(tls, p, ts+7533, uint32(4))
+			jsonAppendRaw(tls, p, ts+7552, uint32(4))
 			break
 
 		}
@@ -163094,7 +163156,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+25893, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+25959, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -163152,19 +163214,19 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 	switch int32((*JsonNode)(unsafe.Pointer(pNode)).FeType) {
 	default:
 		{
-			jsonAppendRaw(tls, pOut, ts+7533, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+7552, uint32(4))
 			break
 
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+8116, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+9065, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+8121, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+9070, uint32(5))
 			break
 
 		}
@@ -163709,17 +163771,17 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		}
 		return int32(j + U32(1))
 	} else if int32(c) == 'n' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+7533, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7552, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		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+8116, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+9065, 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+8121, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+9070, 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))
@@ -163820,7 +163882,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+25922, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+25988, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -164126,7 +164188,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+25937, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+26003, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -164141,7 +164203,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+25941, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+26007, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -164195,7 +164257,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+25967,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+26033,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -164300,11 +164362,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+26010, uint32(2))
+					jsonAppendRaw(tls, bp, ts+26076, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
-					jsonAppendRaw(tls, bp, ts+6350, uint32(2))
+					jsonAppendRaw(tls, bp, ts+6369, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+26013, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+26079, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -164345,7 +164407,7 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if pNode != 0 {
 				jsonRenderNode(tls, pNode, bp, uintptr(0))
 			} else {
-				jsonAppendRaw(tls, bp, ts+7533, uint32(4))
+				jsonAppendRaw(tls, bp, ts+7552, uint32(4))
 			}
 		}
 		if i == argc {
@@ -164461,14 +164523,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+26016, -1)
+			ts+26082, -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+26067, -1)
+			Xsqlite3_result_error(tls, ctx, ts+26133, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -164563,7 +164625,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+16737)
+	jsonWrongNumArgs(tls, ctx, ts+16756)
 	return
 __2:
 	;
@@ -164638,9 +164700,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 26101
+			return ts + 26167
 		}
-		return ts + 26105
+		return ts + 26171
 	}())
 	return
 __2:
@@ -164773,7 +164835,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+26112, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+26178, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -164870,7 +164932,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+26115, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+26181, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -164914,7 +164976,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+26118)
+		ts+26184)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -165045,7 +165107,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+26201, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+26267, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -165064,7 +165126,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+26207, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+26273, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -165160,7 +165222,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+26207, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+26273, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -165184,7 +165246,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 + 26212
+				zRoot = ts + 26278
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -165306,7 +165368,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+25922, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+25988, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -165401,25 +165463,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{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 + 26280},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26285},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26296},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26296},
 	{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}}
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 26327},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 26330},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26334},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26346},
+	{FnArg: int8(2), 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_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26369},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26380},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26392},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 26405},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26414},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26414},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26424},
+	{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 + 26435},
+	{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 + 26452}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -165438,8 +165500,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 26404, FpModule: 0},
-	{FzName: ts + 26414, FpModule: 0},
+	{FzName: ts + 26470, FpModule: 0},
+	{FzName: ts + 26480, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -165699,11 +165761,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+26424, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+26490, 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+26432, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+26498, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -165914,7 +165976,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+26437,
+		ts+26503,
 		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))
@@ -166612,7 +166674,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+26519)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+26585)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -166824,7 +166886,7 @@ func rtreeBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 2
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FneedToFreeIdxStr = 1
-	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, bp+8))) {
+	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, bp+8))) {
 		return SQLITE_NOMEM
 	}
 
@@ -167953,7 +168015,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+26533, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+26599, 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 {
@@ -167965,12 +168027,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+26553, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+26619, 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+26585, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+26651, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -168196,7 +168258,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+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))
+		ts+26688, 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))
@@ -168219,14 +168281,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 26767
+	var zFmt uintptr = ts + 26833
 	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+12700, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+12719, 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 {
@@ -168267,7 +168329,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 26823, ts + 6412, ts + 17625,
+	ts + 26889, ts + 6431, ts + 17644,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -168310,19 +168372,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+26828,
+			ts+26894,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+26890, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+26956, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+26895,
+			ts+26961,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+26959,
+			ts+27025,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+27029,
+			ts+27095,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -168351,7 +168413,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 + 27078
+			zFormat = ts + 27144
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -168363,7 +168425,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+27186,
+			ts+27252,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -168371,18 +168433,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+27231, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+27297, 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+14119, 1)
+					Xsqlite3_str_append(tls, p, ts+14138, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+27258, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+27324, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+27280, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+27346, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+27288, 0)
+			Xsqlite3_str_appendf(tls, p, ts+27354, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -168397,14 +168459,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 27304,
-	ts + 27357,
-	ts + 27402,
-	ts + 27454,
-	ts + 27508,
-	ts + 27553,
-	ts + 27611,
-	ts + 27666,
+	ts + 27370,
+	ts + 27423,
+	ts + 27468,
+	ts + 27520,
+	ts + 27574,
+	ts + 27619,
+	ts + 27677,
+	ts + 27732,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -168433,7 +168495,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+27713, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+27779, 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
@@ -168441,19 +168503,19 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 				(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = 4 + int32((*Rtree)(unsafe.Pointer(pRtree)).FnBytesPerCell)*RTREE_MAXCELLS
 			}
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+27733,
+			ts+27799,
 			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 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+27790,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+27856,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -168495,16 +168557,16 @@ 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 + 27825,
-		ts + 27868,
-		ts + 27903,
-		ts + 27939,
+		ts + 27891,
+		ts + 27934,
+		ts + 27969,
+		ts + 28005,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
 		goto __1
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
 	return SQLITE_ERROR
 __1:
 	;
@@ -168529,7 +168591,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+27976,
+	Xsqlite3_str_appendf(tls, pSql, ts+28042,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -168541,7 +168603,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+28000, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+28066, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -168564,7 +168626,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+28006, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+28072, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -168575,14 +168637,14 @@ __10:
 	if !(ii < argc) {
 		goto __12
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
 	rc = SQLITE_ERROR
 	goto __13
 __12:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __14
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
 __14:
 	;
 __13:
@@ -168625,7 +168687,7 @@ __17:
 	if !(iErr != 0) {
 		goto __22
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
 	goto rtreeInit_fail
 __22:
 	;
@@ -168642,7 +168704,7 @@ __23:
 	if !(rc != 0) {
 		goto __24
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
 	goto rtreeInit_fail
 __24:
 	;
@@ -168660,7 +168722,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 28009, ts + 28020}
+var azFormat = [2]uintptr{ts + 28075, ts + 28086}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -168698,13 +168760,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+12272, 1)
+			Xsqlite3_str_append(tls, pOut, ts+12291, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+28030, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+28096, 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+28036, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+28102, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+28040, 1)
+		Xsqlite3_str_append(tls, pOut, ts+28106, 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})))
@@ -168715,7 +168777,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+28042, -1)
+		Xsqlite3_result_error(tls, ctx, ts+28108, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -168793,12 +168855,12 @@ 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+28075,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+28141,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
-						return ts + 5414
+						return ts + 5433
 					}
-					return ts + 1544
+					return ts + 1563
 				}(), z))
 			if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport == uintptr(0) {
 				(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
@@ -168817,7 +168879,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+28082,
+			ts+28148,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -168836,7 +168898,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+28127, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+28193, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -168850,8 +168912,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 + 28159,
-		ts + 28213,
+		ts + 28225,
+		ts + 28279,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -168866,23 +168928,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+28261,
+		rtreeCheckAppendMsg(tls, pCheck, ts+28327,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 28306
+					return ts + 28372
 				}
-				return ts + 28314
+				return ts + 28380
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+28323,
+				ts+28389,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 28306
+						return ts + 28372
 					}
-					return ts + 28314
+					return ts + 28380
 				}(), iKey, iVal))
 		}
 	}
@@ -168906,7 +168968,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+28381, libc.VaList(bp, i, iCell, iNode))
+				ts+28447, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -168926,7 +168988,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+28429, libc.VaList(bp+24, i, iCell, iNode))
+					ts+28495, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -168943,14 +169005,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+28496, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+28562, 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+28530, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+28596, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -168958,7 +169020,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+28560,
+					ts+28626,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -168987,14 +169049,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+28615,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+28681,
 			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+28646, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+28712, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -169016,12 +169078,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+15860, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+15879, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+28713, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+28779, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -169030,12 +169092,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+26533, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+26599, 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+28741, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+28807, 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)
 		}
@@ -169049,8 +169111,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+28772, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+28779, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+28838, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+28845, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -169058,7 +169120,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+28787, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+28853, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -169073,7 +169135,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+28791, -1)
+			ts+28857, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -169081,7 +169143,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 7793
+			zDb = ts + 7812
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -169091,7 +169153,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 + 19381
+				return ts + 19447
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -169462,11 +169524,11 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		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+28842, 1)
+		Xsqlite3_str_append(tls, x, ts+28908, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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+28910, 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+28855, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+28921, 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)
 	}
@@ -169486,19 +169548,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+28866, 0)
+		Xsqlite3_str_appendf(tls, x, ts+28932, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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)))))
+			Xsqlite3_str_appendf(tls, x, ts+28950, 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+28892, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+28958, 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+28900, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+28966, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+28904, 0)
+		Xsqlite3_str_appendf(tls, x, ts+28970, 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)
 	}
@@ -170418,7 +170480,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+28917, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+28983, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -170427,7 +170489,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+28939, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+29005, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -170435,7 +170497,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+28006, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+28072, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -170446,7 +170508,7 @@ __5:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __7
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
 __7:
 	;
 __6:
@@ -170471,7 +170533,7 @@ __9:
 	if !(rc != 0) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	goto geopolyInit_fail
 __10:
 	;
@@ -170662,7 +170724,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 + 17625
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 17644
 		(*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
@@ -170672,7 +170734,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 + 28943
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 29009
 		(*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
@@ -170680,7 +170742,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 + 28949
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 29015
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -170792,7 +170854,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+28958, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+29024, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -170924,14 +170986,14 @@ geopoly_update_end:
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
 	_ = pVtab
 	_ = nArg
-	if Xsqlite3_stricmp(tls, zName, ts+28998) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+29064) == 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+29014) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+29080) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -170996,7 +171058,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+29029, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+29095, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -171008,25 +171070,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{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},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29103},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29116},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29129},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 29142},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 29080},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 29154},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 29064},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 29177},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29191},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 29204},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 29218},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29234},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 29180},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 29246},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -171036,26 +171098,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+29199, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+29265, 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+29209, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+29275, 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+29220, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+29286, -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+28943, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+29009, 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+29231, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+29297, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -171109,7 +171171,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+26519, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+26585, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -171436,7 +171498,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+29241, -1)
+		Xsqlite3_result_error(tls, context, ts+29307, -1)
 		return
 	}
 
@@ -171447,7 +171509,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+29241, -1)
+			Xsqlite3_result_error(tls, context, ts+29307, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -171460,7 +171522,7 @@ func prepareAndCollectError(tls *libc.TLS, db uintptr, ppStmt uintptr, pzErrmsg
 
 	var rc int32 = Xsqlite3_prepare_v2(tls, db, zSql, -1, ppStmt, uintptr(0))
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 		*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	}
 	return rc
@@ -171472,7 +171534,7 @@ func resetAndCollectError(tls *libc.TLS, pStmt uintptr, pzErrmsg uintptr) int32
 
 	var rc int32 = Xsqlite3_reset(tls, pStmt)
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
 	}
 	return rc
 }
@@ -171548,7 +171610,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+29262, uintptr(0), uintptr(0), p+64)
+				ts+29328, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -171612,7 +171674,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+26432, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+26498, 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++ {
 				}
@@ -171633,16 +171695,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+29433, libc.VaList(bp, func() uintptr {
+			ts+29499, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 29583
+					return ts + 29649
 				}
-				return ts + 1544
+				return ts + 1563
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+29624)
+			ts+29690)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -171740,7 +171802,7 @@ func rbuFinalize(tls *libc.TLS, p uintptr, pStmt uintptr) {
 	var rc int32 = Xsqlite3_finalize(tls, pStmt)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && rc != SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 	}
 }
 
@@ -171758,7 +171820,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+29749, libc.VaList(bp, zTab)))
+			ts+29815, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -171776,7 +171838,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+29868, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+29934, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -171794,7 +171856,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+29889, libc.VaList(bp+16, zIdx)))
+			ts+29955, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -171817,7 +171879,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+29940, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+30006, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -171863,7 +171925,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+29961, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+30027, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -171878,7 +171940,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+29989, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+30055, 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 {
@@ -171918,7 +171980,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+20858, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+20924, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -171928,18 +171990,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+30018, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+30084, 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+30037, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+30103, 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+30042, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+30108, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -171951,18 +172013,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+30052, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+30118, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 30081
+							return ts + 30147
 						}
-						return ts + 30094
+						return ts + 30160
 					}()))
 		}
 
 		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+30103, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+30169, 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)
@@ -171976,7 +172038,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+30125,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+30191,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -172019,12 +172081,12 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	defer tls.Free(24)
 
 	var zList uintptr = uintptr(0)
-	var zSep uintptr = ts + 1544
+	var zSep uintptr = ts + 1563
 	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+30152, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 15971
+		zList = rbuMPrintf(tls, p, ts+30218, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 15990
 	}
 	return zList
 }
@@ -172035,13 +172097,13 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 
 	var iPk int32 = 1
 	var zRet uintptr = uintptr(0)
-	var zSep uintptr = ts + 1544
+	var zSep uintptr = ts + 1563
 	for 1 != 0 {
 		var i int32
 		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+30161, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+30227, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -172063,25 +172125,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+30174, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+30240, 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+30206, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+30272, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		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)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1563, ts+15990, ts+30295)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+30301, ts+30308, ts+6328)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1563, ts+15990, ts+1563)
 
 		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+30250,
+					ts+30316,
 					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+30292, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+30358, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -172118,12 +172180,12 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	zVector = uintptr(0)
 	zRet = uintptr(0)
 	bFailed = 0
-	zSep = ts + 1544
+	zSep = ts + 1563
 	iCol = 0
 	*(*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+29989, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+30055, 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
@@ -172158,7 +172220,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 30312
+	zCol = ts + 30378
 __7:
 	;
 	goto __5
@@ -172166,13 +172228,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+30320,
+	zLhs = rbuMPrintf(tls, p, ts+30386,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+30341,
+	zOrder = rbuMPrintf(tls, p, ts+30407,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+30377,
+	zSelect = rbuMPrintf(tls, p, ts+30443,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 15971
+	zSep = ts + 15990
 	iCol++
 	goto __1
 __2:
@@ -172190,12 +172252,12 @@ __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+30404,
+		Xsqlite3_mprintf(tls, ts+30470,
 			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
 	}
-	zSep = ts + 1544
+	zSep = ts + 1563
 	iCol = 0
 __14:
 	if !(iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnCol) {
@@ -172217,8 +172279,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+30452, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 15971
+	zVector = rbuMPrintf(tls, p, ts+30518, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 15990
 	goto __15
 __15:
 	iCol++
@@ -172229,7 +172291,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+30459, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+30525, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -172256,13 +172318,13 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 	var zImpPK uintptr = uintptr(0)
 	var zWhere uintptr = uintptr(0)
 	var nBind int32 = 0
-	var zCom uintptr = ts + 1544
-	var zAnd uintptr = ts + 1544
+	var zCom uintptr = ts + 1563
+	var zAnd uintptr = ts + 1563
 	*(*uintptr)(unsafe.Pointer(bp + 200)) = uintptr(0)
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+29989, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+30055, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -172274,9 +172336,9 @@ 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+30471, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+30537, 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
+			zType = ts + 1563
 		} else {
 			if iCid < 0 {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK {
@@ -172286,37 +172348,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 + 30312
+					zCol = ts + 30378
 				} else {
-					zCol = ts + 30042
+					zCol = ts + 30108
 				}
-				zType = ts + 1109
+				zType = ts + 1128
 			} 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+30493, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+30559, 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 + 30229
+					return ts + 30295
 				}
-				return ts + 1544
+				return ts + 1563
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+30513,
+			zImpPK = Xsqlite3_mprintf(tls, ts+30579,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+30534,
+		zImpCols = Xsqlite3_mprintf(tls, ts+30600,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+30567, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+30633, 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 + 15971
-		zAnd = ts + 22894
+		zCom = ts + 15990
+		zAnd = ts + 22960
 		nBind++
 	}
 
@@ -172350,16 +172412,16 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 
 	var zList uintptr = uintptr(0)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
-		var zS uintptr = ts + 1544
+		var zS uintptr = ts + 1563
 		var i int32
 		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+30591, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+30657, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+30603, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+30669, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 15971
+			zS = ts + 15990
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -172367,7 +172429,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+30612, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+30678, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -172379,27 +172441,27 @@ 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+30627, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+30693, 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 zSep uintptr = ts + 1563
 		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+30641, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 22894
+				zList = rbuMPrintf(tls, p, ts+30707, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 22960
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+30653, libc.VaList(bp+40, zList))
+			ts+30719, libc.VaList(bp+40, zList))
 
 	} else {
-		var zSep uintptr = ts + 1544
+		var zSep uintptr = ts + 1563
 		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 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+30703, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 22894
+				zList = rbuMPrintf(tls, p, ts+30769, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 22960
 			}
 		}
 	}
@@ -172408,7 +172470,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+30716, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+30782, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -172422,21 +172484,21 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 		if int32(libc.Xstrlen(tls, zMask)) != (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 			rbuBadControlError(tls, p)
 		} else {
-			var zSep uintptr = ts + 1544
+			var zSep uintptr = ts + 1563
 			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+30703,
+					zList = rbuMPrintf(tls, p, ts+30769,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 15971
+					zSep = ts + 15990
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+30742,
+					zList = rbuMPrintf(tls, p, ts+30808,
 						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 + 15971
+					zSep = ts + 15990
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+30772,
+					zList = rbuMPrintf(tls, p, ts+30838,
 						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 + 15971
+					zSep = ts + 15990
 				}
 			}
 		}
@@ -172471,19 +172533,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 + 30809
+		var zSep uintptr = ts + 30875
 		*(*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+29961, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+30027, 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+17513) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+17532) == 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+29989, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+30055, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -172495,15 +172557,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 + 30229
+					zDesc = ts + 30295
 				} else {
-					zDesc = ts + 1544
+					zDesc = ts + 1563
 				}
-				z = rbuMPrintf(tls, p, ts+30822, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 15971
+				z = rbuMPrintf(tls, p, ts+30888, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 15990
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+30833, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+30899, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -172518,12 +172580,12 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		*(*uintptr)(unsafe.Pointer(bp + 168)) = uintptr(0)
 		var zIdx uintptr = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
-		var zComma uintptr = ts + 1544
+		var zComma uintptr = ts + 1563
 		var zCols uintptr = uintptr(0)
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+30837)
+			ts+30903)
 		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))) {
@@ -172532,7 +172594,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+29989, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+30055, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -172542,25 +172604,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+30887, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+30953, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+30909, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+30975, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 30229
+						return ts + 30295
 					}
-					return ts + 1544
+					return ts + 1563
 				}()))
-				zComma = ts + 15971
+				zComma = ts + 15990
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+30919, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+30985, 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+7793, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+30934,
+			ts+31000,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, 0, 0))
 	}
 }
 
@@ -172570,50 +172632,50 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
 		var tnum int32 = (*RbuObjIter)(unsafe.Pointer(pIter)).FiTnum
-		var zComma uintptr = ts + 1544
+		var zComma uintptr = ts + 1563
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
-			var zPk uintptr = ts + 1544
+			var zPk uintptr = ts + 1563
 			var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCol)*8))
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, (*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 + 30996
+				zPk = ts + 31062
 			}
-			zSql = rbuMPrintf(tls, p, ts+31009,
+			zSql = rbuMPrintf(tls, p, ts+31075,
 				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 + 31036
+							return ts + 31102
 						}
-						return ts + 1544
+						return ts + 1563
 					}()))
-			zComma = ts + 15971
+			zComma = ts + 15990
 		}
 
 		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+31046, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+31112, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		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,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31119,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 31085
+						return ts + 31151
 					}
-					return ts + 1544
+					return ts + 1563
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, 0, 0))
 	}
 }
 
@@ -172626,7 +172688,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+31100,
+				ts+31166,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -172663,7 +172725,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+31157)
+			ts+31223)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -172768,7 +172830,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+31223, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+31289, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -172788,24 +172850,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+7793, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+31243,
+				ts+31309,
 				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+7793, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, 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+31308, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+31374, 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+31344, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+31410, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -172821,7 +172883,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+31378,
+						ts+31444,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -172829,31 +172891,31 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 31439
+											return ts + 31505
 										}
-										return ts + 31443
+										return ts + 31509
 									}()
 								}
-								return ts + 1544
+								return ts + 1563
 							}(), zStart,
 							zCollist, zLimit))
 					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+31449,
+						ts+31515,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+31510,
+						ts+31576,
 						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 + 31439
+									return ts + 31505
 								}
-								return ts + 31443
+								return ts + 31509
 							}(),
 							zCollist, zLimit))
 				}
@@ -172878,8 +172940,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+7804)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+7800)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+7823)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+7819)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -172888,52 +172950,52 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			rbuCreateImposterTable2(tls, p, pIter)
 			zWrite = func() uintptr {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
-					return ts + 1544
+					return ts + 1563
 				}
-				return ts + 31669
+				return ts + 31735
 			}()
 
 			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+31678,
+						ts+31744,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 31714
+								return ts + 31780
 							}
-							return ts + 1544
+							return ts + 1563
 						}(), zBindings)))
 			}
 
 			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+31724, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+31790, 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
+				var zRbuRowid uintptr = ts + 1563
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 31752
+					zRbuRowid = ts + 31818
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+31764, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+31830, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 31840
+							return ts + 31906
 						}
-						return ts + 1544
+						return ts + 1563
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+31857,
+					ts+31923,
 					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+32156,
+						ts+32222,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -172941,14 +173003,14 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-				var zRbuRowid uintptr = ts + 1544
+				var zRbuRowid uintptr = ts + 1563
 				var zStart uintptr = uintptr(0)
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 32255
+						zRbuRowid = ts + 32321
 					} else {
-						zRbuRowid = ts + 32265
+						zRbuRowid = ts + 32331
 					}
 				}
 
@@ -172961,35 +173023,35 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+30312, 0)
+						zOrder = rbuMPrintf(tls, p, ts+30378, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1544, ts+15971, ts+1544)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1563, ts+15990, ts+1563)
 					}
 				}
 
 				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+32276,
+							ts+32342,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 32324
+										return ts + 32390
 									}
-									return ts + 1544
+									return ts + 1563
 								}(),
 								zRbuRowid,
 								(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 									if zStart != 0 {
 										return zStart
 									}
-									return ts + 1544
+									return ts + 1563
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 24228
+										return ts + 24294
 									}
-									return ts + 1544
+									return ts + 1563
 								}(), zOrder,
 								zLimit)))
 				}
@@ -173052,12 +173114,12 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 		(*RbuObjIter)(unsafe.Pointer(pIter)).FpRbuUpdate = pUp
 
 		if zSet != 0 {
-			var zPrefix uintptr = ts + 1544
+			var zPrefix uintptr = ts + 1563
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 31669
+				zPrefix = ts + 31735
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+32330,
+			zUpdate = Xsqlite3_mprintf(tls, ts+32396,
 				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)
@@ -173084,7 +173146,7 @@ func rbuOpenDbhandle(tls *libc.TLS, p uintptr, zName uintptr, bUseVfs int32) uin
 			return uintptr(0)
 		}())
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
 			Xsqlite3_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 			*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 		}
@@ -173116,7 +173178,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+32360, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+32426, 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:
@@ -173186,28 +173248,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+7793, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7812, 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+7793)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+32390, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7812)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+32456, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		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))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32484, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.Xmemcpy(tls, p+48, ts+14848, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+7793, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+7812, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32436, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32502, 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+7793, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7812, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -173240,11 +173302,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+32502, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32568, 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+25575, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+25641, (*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)))) == '?' {
@@ -173256,16 +173318,16 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+32534,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7793),
+			zTarget = Xsqlite3_mprintf(tls, ts+32600,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7812),
 					func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1544
+							return ts + 1563
 						}
-						return ts + 32566
+						return ts + 32632
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1544
+							return ts + 1563
 						}
 						return zExtra
 					}()))
@@ -173281,37 +173343,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+32568, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32634, -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+32583, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32649, 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+32600, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32666, -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+7793, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32616, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32682, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, 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+32644, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32710, 0)
 	}
 }
 
@@ -173340,14 +173402,14 @@ 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+32616, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32682, 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+32662, uintptr(0), uintptr(0), uintptr(0))
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32728, uintptr(0), uintptr(0), uintptr(0))
 		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
@@ -173456,7 +173518,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+7793, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+7812, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -173473,23 +173535,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+32697, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+32763, 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+7793)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812)
 	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+7793)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7812)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+32722, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+32729, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+32788, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+32795, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -173606,7 +173668,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+25213, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+25279, 0)
 			return
 		}
 
@@ -173699,7 +173761,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+32736)
+			ts+32802)
 		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)
@@ -173707,7 +173769,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+32758, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32824, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -173728,7 +173790,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+32785,
+				ts+32851,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -173758,9 +173820,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+32943, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+33009, 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+32958,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+33024,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -173774,10 +173836,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+32978, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+33044, 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+33003)
+			ts+33069)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -173791,12 +173853,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+33111)
+			ts+33177)
 	}
 
 	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+33176)
+			ts+33242)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -173808,7 +173870,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+33220, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+33286, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -173828,15 +173890,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+18619)
-					rbuCopyPragma(tls, p, ts+17709)
+					rbuCopyPragma(tls, p, ts+18638)
+					rbuCopyPragma(tls, p, ts+17728)
 				}
 
 				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+33245, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+33311, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -173860,10 +173922,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+15875, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+15894, 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+15875, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15894, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -173958,7 +174020,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+33273, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33339, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -173974,10 +174036,10 @@ func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+32722, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+32788, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 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)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
@@ -173991,7 +174053,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+33298, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+33364, 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)
@@ -174025,7 +174087,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+33309, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+33375, 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 {
@@ -174055,13 +174117,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+33381, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+33447, 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+33395)
+				ts+33461)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -174072,7 +174134,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+33452)
+				ts+33518)
 			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)
@@ -174117,7 +174179,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			libc.Xmemcpy(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, zRbu, nRbu+uint64(1))
 			pCsr += uintptr(nRbu + uint64(1))
 			if zState != 0 {
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+4493, libc.VaList(bp, zState))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+4512, libc.VaList(bp, zState))
 			}
 
 			rbuOpenDatabase(tls, p, uintptr(0), bp+16)
@@ -174146,7 +174208,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+33526, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33592, 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
@@ -174164,12 +174226,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+33558,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33624,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 33590
+							return ts + 33656
 						}
-						return ts + 33597
+						return ts + 33663
 					}()))
 			}
 		}
@@ -174177,7 +174239,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+15860, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15879, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -174188,19 +174250,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+18333)
-						rbuCopyPragma(tls, p, ts+17724)
+						rbuCopyPragma(tls, p, ts+18352)
+						rbuCopyPragma(tls, p, ts+17743)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+33604, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+33670, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+7793, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+7812, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+33620, uintptr(0), uintptr(0), p+64)
+								db, ts+33686, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -174254,7 +174316,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+33644, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+33710, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -174281,7 +174343,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+31669, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+31735, 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++
@@ -174298,7 +174360,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+15875, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+15894, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -174311,13 +174373,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+15875, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15894, 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+33652, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+33718, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -174412,7 +174474,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+15875, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+15894, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -174429,19 +174491,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+15875, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15894, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 15860
+				zBegin = ts + 15879
 			} else {
-				zBegin = ts + 33604
+				zBegin = ts + 33670
 			}
 			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+33604, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+33670, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -174787,7 +174849,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+33679, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33745, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -174812,7 +174874,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+33702, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+33768, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -174957,7 +175019,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+7793)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+7812)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -174972,7 +175034,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+33713, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+33779, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -175217,6 +175279,970 @@ func Xsqlite3rbu_temp_size(tls *libc.TLS, pRbu uintptr) Sqlite3_int64 {
 	return (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FszTemp
 }
 
+var zDbstatSchema = *(*[258]int8)(unsafe.Pointer(ts + 33790))
+
+// Forward reference to data structured used in this module
+type StatTable1 = struct {
+	Fbase        Sqlite3_vtab
+	Fdb          uintptr
+	FiDb         int32
+	F__ccgo_pad1 [4]byte
+}
+
+// Forward reference to data structured used in this module
+type StatTable = StatTable1
+type StatCursor1 = struct {
+	Fbase        Sqlite3_vtab_cursor
+	FpStmt       uintptr
+	FisEof       U8
+	FisAgg       U8
+	F__ccgo_pad1 [2]byte
+	FiDb         int32
+	FaPage       [32]StatPage
+	FiPage       int32
+	FiPageno     U32
+	FzName       uintptr
+	FzPath       uintptr
+	FzPagetype   uintptr
+	FnPage       int32
+	FnCell       int32
+	FnMxPayload  int32
+	F__ccgo_pad2 [4]byte
+	FnUnused     I64
+	FnPayload    I64
+	FiOffset     I64
+	FszPage      I64
+}
+
+type StatCursor = StatCursor1
+type StatPage1 = struct {
+	FiPgno         U32
+	F__ccgo_pad1   [4]byte
+	FaPg           uintptr
+	FiCell         int32
+	F__ccgo_pad2   [4]byte
+	FzPath         uintptr
+	Fflags         U8
+	F__ccgo_pad3   [3]byte
+	FnCell         int32
+	FnUnused       int32
+	F__ccgo_pad4   [4]byte
+	FaCell         uintptr
+	FiRightChildPg U32
+	FnMxPayload    int32
+}
+
+type StatPage = StatPage1
+type StatCell1 = struct {
+	FnLocal      int32
+	FiChildPg    U32
+	FnOvfl       int32
+	F__ccgo_pad1 [4]byte
+	FaOvfl       uintptr
+	FnLastOvfl   int32
+	FiOvfl       int32
+}
+
+type StatCell = StatCell1
+
+func statConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var pTab uintptr = uintptr(0)
+	var rc int32 = SQLITE_OK
+	var iDb int32
+	_ = pAux
+
+	if argc >= 4 {
+		Xsqlite3TokenInit(tls, bp+8, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
+		iDb = Xsqlite3FindDb(tls, db, bp+8)
+		if iDb < 0 {
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+13242, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
+			return SQLITE_ERROR
+		}
+	} else {
+		iDb = 0
+	}
+	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_DIRECTONLY, 0)
+	rc = Xsqlite3_declare_vtab(tls, db, uintptr(unsafe.Pointer(&zDbstatSchema)))
+	if rc == SQLITE_OK {
+		pTab = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatTable{})))
+		if pTab == uintptr(0) {
+			rc = SQLITE_NOMEM
+		}
+	}
+
+	if rc == SQLITE_OK {
+		libc.Xmemset(tls, pTab, 0, uint64(unsafe.Sizeof(StatTable{})))
+		(*StatTable)(unsafe.Pointer(pTab)).Fdb = db
+		(*StatTable)(unsafe.Pointer(pTab)).FiDb = iDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
+	return rc
+}
+
+func statDisconnect(tls *libc.TLS, pVtab uintptr) int32 {
+	Xsqlite3_free(tls, pVtab)
+	return SQLITE_OK
+}
+
+func statBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
+	var i int32
+	var iSchema int32 = -1
+	var iName int32 = -1
+	var iAgg int32 = -1
+	_ = tab
+
+	for i = 0; i < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; i++ {
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fop) != SQLITE_INDEX_CONSTRAINT_EQ {
+			continue
+		}
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fusable) == 0 {
+			return SQLITE_CONSTRAINT
+		}
+		switch (*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(i)*12)).FiColumn {
+		case 0:
+			{
+				iName = i
+				break
+
+			}
+		case 10:
+			{
+				iSchema = i
+				break
+
+			}
+		case 11:
+			{
+				iAgg = i
+				break
+
+			}
+		}
+	}
+	i = 0
+	if iSchema >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).Fomit = uint8(1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x01
+	}
+	if iName >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iName)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x02
+	}
+	if iAgg >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iAgg)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x04
+	}
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 1.0
+
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy == 1 &&
+		(*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)).FnOrderBy == 2 &&
+		(*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_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).FiColumn == 1 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x08
+	}
+
+	return SQLITE_OK
+}
+
+func statOpen(tls *libc.TLS, pVTab uintptr, ppCursor uintptr) int32 {
+	var pTab uintptr = pVTab
+	var pCsr uintptr
+
+	pCsr = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatCursor{})))
+	if pCsr == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		libc.Xmemset(tls, pCsr, 0, uint64(unsafe.Sizeof(StatCursor{})))
+		(*StatCursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab = pVTab
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppCursor)) = pCsr
+	return SQLITE_OK
+}
+
+func statClearCells(tls *libc.TLS, p uintptr) {
+	var i int32
+	if (*StatPage)(unsafe.Pointer(p)).FaCell != 0 {
+		for i = 0; i < (*StatPage)(unsafe.Pointer(p)).FnCell; i++ {
+			Xsqlite3_free(tls, (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell+uintptr(i)*32)).FaOvfl)
+		}
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FaCell)
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnCell = 0
+	(*StatPage)(unsafe.Pointer(p)).FaCell = uintptr(0)
+}
+
+func statClearPage(tls *libc.TLS, p uintptr) {
+	var aPg uintptr = (*StatPage)(unsafe.Pointer(p)).FaPg
+	statClearCells(tls, p)
+	Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FzPath)
+	libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(StatPage{})))
+	(*StatPage)(unsafe.Pointer(p)).FaPg = aPg
+}
+
+func statResetCsr(tls *libc.TLS, pCsr uintptr) {
+	var i int32
+
+	for i = 0; i < int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{}))); i++ {
+		statClearPage(tls, pCsr+24+uintptr(i)*64)
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(pCsr+24+uintptr(i)*64)).FaPg)
+		(*StatPage)(unsafe.Pointer(pCsr + 24 + uintptr(i)*64)).FaPg = uintptr(0)
+	}
+	Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(0)
+}
+
+func statResetCounts(tls *libc.TLS, pCsr uintptr) {
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnCell = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnUnused = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPayload = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FszPage = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 0
+}
+
+func statClose(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	Xsqlite3_free(tls, pCsr)
+	return SQLITE_OK
+}
+
+func getLocalPayload(tls *libc.TLS, nUsable int32, flags U8, nTotal int32) int32 {
+	var nLocal int32
+	var nMinLocal int32
+	var nMaxLocal int32
+
+	if int32(flags) == 0x0D {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = nUsable - 35
+	} else {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = (nUsable-12)*64/255 - 23
+	}
+
+	nLocal = nMinLocal + (nTotal-nMinLocal)%(nUsable-4)
+	if nLocal > nMaxLocal {
+		nLocal = nMinLocal
+	}
+	return nLocal
+}
+
+func statDecodePage(tls *libc.TLS, pBt uintptr, p uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var nUnused int32
+	var iOff int32
+	var nHdr int32
+	var isLeaf int32
+	var szPage int32
+	var aData uintptr
+	var aHdr uintptr
+	var iNext int32
+
+	var rc int32
+	var iPrev U32
+
+	var j int32
+	var nOvfl int32
+
+	var nLocal int32
+	var pCell uintptr
+	var i int32
+	var nUsable int32
+	aData = (*StatPage)(unsafe.Pointer(p)).FaPg
+	aHdr = aData + uintptr(func() int32 {
+		if (*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1) {
+			return 100
+		}
+		return 0
+	}())
+
+	(*StatPage)(unsafe.Pointer(p)).Fflags = *(*U8)(unsafe.Pointer(aHdr))
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0A || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __1
+	}
+	isLeaf = 1
+	nHdr = 8
+	goto __2
+__1:
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05 || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x02) {
+		goto __3
+	}
+	isLeaf = 0
+	nHdr = 12
+	goto __4
+__3:
+	goto statPageIsCorrupt
+__4:
+	;
+__2:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1)) {
+		goto __5
+	}
+	nHdr = nHdr + 100
+__5:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnCell = int32(*(*U8)(unsafe.Pointer(aHdr + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 3 + 1)))
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = 0
+	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
+
+	nUnused = int32(*(*U8)(unsafe.Pointer(aHdr + 5)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 5 + 1))) - nHdr - 2*(*StatPage)(unsafe.Pointer(p)).FnCell
+	nUnused = nUnused + int32(*(*U8)(unsafe.Pointer(aHdr + 7)))
+	iOff = int32(*(*U8)(unsafe.Pointer(aHdr + 1)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 1 + 1)))
+__6:
+	if !(iOff != 0) {
+		goto __7
+	}
+	if !(iOff >= szPage) {
+		goto __8
+	}
+	goto statPageIsCorrupt
+__8:
+	;
+	nUnused = nUnused + (int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2) + 1))))
+	iNext = int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff) + 1)))
+	if !(iNext < iOff+4 && iNext > 0) {
+		goto __9
+	}
+	goto statPageIsCorrupt
+__9:
+	;
+	iOff = iNext
+	goto __6
+__7:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnUnused = nUnused
+	(*StatPage)(unsafe.Pointer(p)).FiRightChildPg = func() uint32 {
+		if isLeaf != 0 {
+			return uint32(0)
+		}
+		return Xsqlite3Get4byte(tls, aHdr+8)
+	}()
+
+	if !((*StatPage)(unsafe.Pointer(p)).FnCell != 0) {
+		goto __10
+	}
+
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = szPage - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatPage)(unsafe.Pointer(p)).FaCell = Xsqlite3_malloc64(tls, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+	if !((*StatPage)(unsafe.Pointer(p)).FaCell == uintptr(0)) {
+		goto __11
+	}
+	return SQLITE_NOMEM
+__11:
+	;
+	libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+
+	i = 0
+__12:
+	if !(i < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __14
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr(i)*32
+
+	iOff = int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2) + 1)))
+	if !(iOff < nHdr || iOff >= szPage) {
+		goto __15
+	}
+	goto statPageIsCorrupt
+__15:
+	;
+	if !!(isLeaf != 0) {
+		goto __16
+	}
+	(*StatCell)(unsafe.Pointer(pCell)).FiChildPg = Xsqlite3Get4byte(tls, aData+uintptr(iOff))
+	iOff = iOff + 4
+__16:
+	;
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05) {
+		goto __17
+	}
+
+	goto __18
+__17:
+	iOff = iOff + int32(func() uint8 {
+		if int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff)))) < int32(U8(0x80)) {
+			return uint8(func() int32 {
+				*(*U32)(unsafe.Pointer(bp)) = U32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))
+				return 1
+			}())
+		}
+		return Xsqlite3GetVarint32(tls, aData+uintptr(iOff), bp)
+	}())
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __19
+	}
+	iOff = iOff + int32(Xsqlite3GetVarint(tls, aData+uintptr(iOff), bp+8))
+__19:
+	;
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32((*StatPage)(unsafe.Pointer(p)).FnMxPayload)) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = int32(*(*U32)(unsafe.Pointer(bp)))
+__20:
+	;
+	nLocal = getLocalPayload(tls, nUsable, (*StatPage)(unsafe.Pointer(p)).Fflags, int32(*(*U32)(unsafe.Pointer(bp))))
+	if !(nLocal < 0) {
+		goto __21
+	}
+	goto statPageIsCorrupt
+__21:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLocal = nLocal
+
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32(nLocal)) {
+		goto __22
+	}
+	nOvfl = int32((*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) + U32(nUsable) - U32(4) - U32(1)) / U32(nUsable-4))
+	if !(iOff+nLocal+4 > nUsable || *(*U32)(unsafe.Pointer(bp)) > U32(0x7fffffff)) {
+		goto __23
+	}
+	goto statPageIsCorrupt
+__23:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl = int32(*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) - U32((nOvfl-1)*(nUsable-4)))
+	(*StatCell)(unsafe.Pointer(pCell)).FnOvfl = nOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FaOvfl = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(U32(0)))*uint64(nOvfl))
+	if !((*StatCell)(unsafe.Pointer(pCell)).FaOvfl == uintptr(0)) {
+		goto __24
+	}
+	return SQLITE_NOMEM
+__24:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl)) = Xsqlite3Get4byte(tls, aData+uintptr(iOff+nLocal))
+	j = 1
+__25:
+	if !(j < nOvfl) {
+		goto __27
+	}
+	iPrev = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j-1)*4))
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPrev, bp+16, 0)
+	if !(rc != SQLITE_OK) {
+		goto __28
+	}
+
+	return rc
+__28:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j)*4)) = Xsqlite3Get4byte(tls, Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 16))))
+	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
+	goto __26
+__26:
+	j++
+	goto __25
+	goto __27
+__27:
+	;
+__22:
+	;
+__18:
+	;
+	goto __13
+__13:
+	i++
+	goto __12
+	goto __14
+__14:
+	;
+__10:
+	;
+	return SQLITE_OK
+
+statPageIsCorrupt:
+	(*StatPage)(unsafe.Pointer(p)).Fflags = U8(0)
+	statClearCells(tls, p)
+	return SQLITE_OK
+}
+
+func statSizeAndOffset(tls *libc.TLS, pCsr uintptr) {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCsr)).FpVtab
+	var pBt uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatTable)(unsafe.Pointer(pTab)).FiDb)*32)).FpBt
+	var pPager uintptr = Xsqlite3BtreePager(tls, pBt)
+	var fd uintptr
+
+	fd = Xsqlite3PagerFile(tls, pPager)
+	*(*Sqlite3_int64)(unsafe.Pointer(bp)) = Sqlite3_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	if Xsqlite3OsFileControl(tls, fd, 230440, bp) == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = *(*Sqlite3_int64)(unsafe.Pointer(bp))
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += *(*Sqlite3_int64)(unsafe.Pointer(bp + 1*8))
+	} else {
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += I64(Xsqlite3BtreeGetPageSize(tls, pBt))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = (*StatCursor)(unsafe.Pointer(pCsr)).FszPage * I64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno-U32(1))
+	}
+}
+
+func statGetPage(tls *libc.TLS, pBt uintptr, iPg U32, pPg uintptr) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var pgsz int32 = Xsqlite3BtreeGetPageSize(tls, pBt)
+	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
+	var rc int32
+
+	if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+		(*StatPage)(unsafe.Pointer(pPg)).FaPg = Xsqlite3_malloc(tls, pgsz+DBSTAT_PAGE_PADDING_BYTES)
+		if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+			return SQLITE_NOMEM
+		}
+		libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0, uint64(DBSTAT_PAGE_PADDING_BYTES))
+	}
+
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPg, bp, 0)
+	if rc == SQLITE_OK {
+		var a uintptr = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		libc.Xmemcpy(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, a, uint64(pgsz))
+		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+	}
+
+	return rc
+}
+
+func statNext(tls *libc.TLS, pCursor uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
+	var rc int32
+	var nPayload int32
+	var z uintptr
+	var pCsr uintptr
+	var pTab uintptr
+	var pBt uintptr
+	var pPager uintptr
+
+	var iRoot U32
+	var nUsable int32
+	var iOvfl int32
+	var pCell uintptr
+
+	var p uintptr
+	var i int32
+	var p1 uintptr
+	pCsr = pCursor
+	pTab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	pBt = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FpBt
+	pPager = Xsqlite3BtreePager(tls, pBt)
+
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+
+statNextRestart:
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __1
+	}
+
+	statResetCounts(tls, pCsr)
+	rc = Xsqlite3_step(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	if !(rc == SQLITE_ROW) {
+		goto __3
+	}
+	iRoot = U32(Xsqlite3_column_int64(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 1))
+	Xsqlite3PagerPagecount(tls, pPager, bp+48)
+	if !(*(*int32)(unsafe.Pointer(bp + 48)) == 0) {
+		goto __5
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__5:
+	;
+	rc = statGetPage(tls, pBt, iRoot, pCsr+24)
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiPgno = iRoot
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __6
+	}
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+34048, 0))
+	if !(z == uintptr(0)) {
+		goto __7
+	}
+	rc = SQLITE_NOMEM
+__7:
+	;
+__6:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 1
+	goto __4
+__3:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__4:
+	;
+	goto __2
+__1:
+	p = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __8
+	}
+	statResetCounts(tls, pCsr)
+__8:
+	;
+__9:
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __10
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32
+__11:
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl) {
+		goto __12
+	}
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = Xsqlite3BtreeGetPageSize(tls, pBt) - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	statSizeAndOffset(tls, pCsr)
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl-1) {
+		goto __13
+	}
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nUsable - 4)
+	goto __14
+__13:
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64((*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64(nUsable - 4 - (*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+__14:
+	;
+	iOvfl = (*StatCell)(unsafe.Pointer(pCell)).FiOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FiOvfl++
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __15
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(iOvfl)*4))
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 34050
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls,
+		ts+34059, libc.VaList(bp, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell, iOvfl)))
+	if z == uintptr(0) {
+		return SQLITE_NOMEM
+	}
+	return SQLITE_OK
+__15:
+	;
+	goto __11
+__12:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiRightChildPg != 0) {
+		goto __16
+	}
+	goto __10
+__16:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+	goto __9
+__10:
+	;
+	if !(!(int32((*StatPage)(unsafe.Pointer(p)).FiRightChildPg) != 0) || (*StatPage)(unsafe.Pointer(p)).FiCell > (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __17
+	}
+	statClearPage(tls, p)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage--
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 && (*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __18
+	}
+
+	return SQLITE_OK
+__18:
+	;
+	goto statNextRestart
+__17:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage++
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage >= int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{})))) {
+		goto __19
+	}
+	statResetCsr(tls, pCsr)
+	return Xsqlite3CorruptError(tls, 215455)
+__19:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell == (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatPage)(unsafe.Pointer(p)).FiRightChildPg
+	goto __21
+__20:
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32)).FiChildPg
+__21:
+	;
+	rc = statGetPage(tls, pBt, (*StatPage)(unsafe.Pointer(p+1*64)).FiPgno, p+1*64)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __22
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+34071, libc.VaList(bp+24, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell)))
+	if !(z == uintptr(0)) {
+		goto __23
+	}
+	rc = SQLITE_NOMEM
+__23:
+	;
+__22:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+__2:
+	;
+	if !(rc == SQLITE_OK) {
+		goto __24
+	}
+	p1 = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = (*StatPage)(unsafe.Pointer(p1)).FiPgno
+
+	rc = statDecodePage(tls, pBt, p1)
+	if !(rc == SQLITE_OK) {
+		goto __25
+	}
+	statSizeAndOffset(tls, pCsr)
+
+	switch int32((*StatPage)(unsafe.Pointer(p1)).Fflags) {
+	case 0x05:
+		goto __27
+	case 0x02:
+		goto __28
+	case 0x0D:
+		goto __29
+	case 0x0A:
+		goto __30
+	default:
+		goto __31
+	}
+	goto __26
+__27:
+__28:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 34079
+	goto __26
+__29:
+__30:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 34088
+	goto __26
+__31:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 34093
+	goto __26
+__26:
+	;
+	*(*int32)(unsafe.Pointer(pCsr + 2108)) += (*StatPage)(unsafe.Pointer(p1)).FnCell
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64((*StatPage)(unsafe.Pointer(p1)).FnUnused)
+	if !((*StatPage)(unsafe.Pointer(p1)).FnMxPayload > (*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload) {
+		goto __32
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = (*StatPage)(unsafe.Pointer(p1)).FnMxPayload
+__32:
+	;
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __33
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+40, (*StatPage)(unsafe.Pointer(p1)).FzPath)))
+	if !(z == uintptr(0)) {
+		goto __34
+	}
+	rc = SQLITE_NOMEM
+__34:
+	;
+__33:
+	;
+	nPayload = 0
+	i = 0
+__35:
+	if !(i < (*StatPage)(unsafe.Pointer(p1)).FnCell) {
+		goto __37
+	}
+	nPayload = nPayload + (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p1)).FaCell+uintptr(i)*32)).FnLocal
+	goto __36
+__36:
+	i++
+	goto __35
+	goto __37
+__37:
+	;
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nPayload)
+
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0) {
+		goto __38
+	}
+	goto statNextRestart
+__38:
+	;
+__25:
+	;
+__24:
+	;
+	return rc
+}
+
+func statEof(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	return int32((*StatCursor)(unsafe.Pointer(pCsr)).FisEof)
+}
+
+func statFilter(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintptr, argc int32, argv uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pCsr uintptr = pCursor
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	var pSql uintptr
+	var zSql uintptr
+	var iArg int32 = 0
+	var rc int32 = SQLITE_OK
+	var zName uintptr = uintptr(0)
+	_ = argc
+	_ = idxStr
+
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FpStmt = uintptr(0)
+	if idxNum&0x01 != 0 {
+		var zDbase uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = Xsqlite3FindDbName(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zDbase)
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FiDb < 0 {
+			(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = 0
+			(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+			return SQLITE_OK
+		}
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+	if idxNum&0x02 != 0 {
+		zName = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+	}
+	if idxNum&0x04 != 0 {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(libc.Bool32(Xsqlite3_value_double(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8))) != 0.0))
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(0)
+	}
+	pSql = Xsqlite3_str_new(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb)
+	Xsqlite3_str_appendf(tls, pSql,
+		ts+34103,
+		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb+uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FzDbSName))
+	if zName != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+34258, libc.VaList(bp+8, zName))
+	}
+	if idxNum&0x08 != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+34272, 0)
+	}
+	zSql = Xsqlite3_str_finish(tls, pSql)
+	if zSql == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		rc = Xsqlite3_prepare_v2(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
+		Xsqlite3_free(tls, zSql)
+	}
+
+	if rc == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = -1
+		rc = statNext(tls, pCursor)
+	}
+	return rc
+}
+
+func statColumn(tls *libc.TLS, pCursor uintptr, ctx uintptr, i int32) int32 {
+	var pCsr uintptr = pCursor
+	switch i {
+	case 0:
+		Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzName, -1, libc.UintptrFromInt32(-1))
+		break
+	case 1:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath, -1, libc.UintptrFromInt32(-1))
+		}
+		break
+	case 2:
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnPage))
+		} else {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno))
+		}
+		break
+	case 3:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype, -1, uintptr(0))
+		}
+		break
+	case 4:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnCell))
+		break
+	case 5:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnPayload)
+		break
+	case 6:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnUnused)
+		break
+	case 7:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload))
+		break
+	case 8:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FiOffset)
+		}
+		break
+	case 9:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FszPage)
+		break
+	case 10:
+		{
+			var db uintptr = Xsqlite3_context_db_handle(tls, ctx)
+			var iDb int32 = (*StatCursor)(unsafe.Pointer(pCsr)).FiDb
+			Xsqlite3_result_text(tls, ctx, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, -1, uintptr(0))
+			break
+
+		}
+	default:
+		{
+			Xsqlite3_result_int(tls, ctx, int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg))
+			break
+
+		}
+	}
+	return SQLITE_OK
+}
+
+func statRowid(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32 {
+	var pCsr uintptr = pCursor
+	*(*Sqlite_int64)(unsafe.Pointer(pRowid)) = Sqlite_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	return SQLITE_OK
+}
+
+// Invoke this routine to register the "dbstat" virtual table module
+func Xsqlite3DbstatRegister(tls *libc.TLS, db uintptr) int32 {
+	return Xsqlite3_create_module(tls, db, ts+34287, uintptr(unsafe.Pointer(&dbstat_module)), uintptr(0))
+}
+
+var dbstat_module = Sqlite3_module{
+	FxCreate:     0,
+	FxConnect:    0,
+	FxBestIndex:  0,
+	FxDisconnect: 0,
+	FxDestroy:    0,
+	FxOpen:       0,
+	FxClose:      0,
+	FxFilter:     0,
+	FxNext:       0,
+	FxEof:        0,
+	FxColumn:     0,
+	FxRowid:      0,
+}
+
 type SessionTable1 = struct {
 	FpNext    uintptr
 	FzName    uintptr
@@ -175797,13 +176823,13 @@ 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+12700, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+12719, 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+33724, 0)
+				ts+34294, 0)
 		} else if rc == SQLITE_ERROR {
-			zPragma = Xsqlite3_mprintf(tls, ts+1544, 0)
+			zPragma = Xsqlite3_mprintf(tls, ts+1563, 0)
 		} else {
 			*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
 			*(*uintptr)(unsafe.Pointer(pabPK)) = uintptr(0)
@@ -175814,7 +176840,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+33845, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+34415, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -175912,7 +176938,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+12700, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+12719, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -176161,7 +177187,7 @@ __4:
 	goto error_out
 __7:
 	;
-	Xsqlite3ValueSetStr(tls, p, 0, ts+1544, uint8(0), uintptr(0))
+	Xsqlite3ValueSetStr(tls, p, 0, ts+1563, uint8(0), uintptr(0))
 	(*Sqlite3_session)(unsafe.Pointer(pSession)).FpZeroBlob = p
 __6:
 	;
@@ -176489,14 +177515,14 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1544
+	var zSep uintptr = ts + 1563
 	var zRet uintptr = uintptr(0)
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+33874,
+			zRet = Xsqlite3_mprintf(tls, ts+34444,
 				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 + 22894
+			zSep = ts + 22960
 			if zRet == uintptr(0) {
 				break
 			}
@@ -176511,7 +177537,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1544
+	var zSep uintptr = ts + 1563
 	var zRet uintptr = uintptr(0)
 	var bHave int32 = 0
 
@@ -176519,9 +177545,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+33908,
+				ts+34478,
 				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 + 33949
+			zSep = ts + 34519
 			if zRet == uintptr(0) {
 				break
 			}
@@ -176529,7 +177555,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+8882, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+8890, 0)
 	}
 
 	return zRet
@@ -176540,7 +177566,7 @@ func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintpt
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+33954,
+		ts+34524,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -176583,7 +177609,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+34032,
+			ts+34602,
 			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
@@ -176710,7 +177736,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+34085, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+34655, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -176975,7 +178001,7 @@ func sessionAppendInteger(tls *libc.TLS, p uintptr, iVal int32, pRc uintptr) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
-	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]int8{}))-uint64(1)), bp+8, ts+6327, libc.VaList(bp, iVal))
+	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]int8{}))-uint64(1)), bp+8, ts+6346, libc.VaList(bp, iVal))
 	sessionAppendStr(tls, p, bp+8, pRc)
 }
 
@@ -177184,29 +178210,29 @@ 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+12700, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+12719, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+34112, libc.VaList(bp, zDb))
+			ts+34682, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
 	} else {
 		var i int32
-		var zSep uintptr = ts + 1544
+		var zSep uintptr = ts + 1563
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+34222, bp+24)
+		sessionAppendStr(tls, bp+8, ts+34792, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
-		sessionAppendStr(tls, bp+8, ts+1557, bp+24)
+		sessionAppendStr(tls, bp+8, ts+1576, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+34237, bp+24)
+		sessionAppendStr(tls, bp+8, ts+34807, 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+34245, bp+24)
+				sessionAppendStr(tls, bp+8, ts+34815, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 22894
+				zSep = ts + 22960
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -177315,7 +178341,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+34251, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+34821, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -177407,7 +178433,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+34271, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34841, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -177670,7 +178696,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, 219078)
+				rc = Xsqlite3CorruptError(tls, 219169)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -177693,7 +178719,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, 219098)
+						rc = Xsqlite3CorruptError(tls, 219189)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -177735,7 +178761,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, 219152)
+			rc = Xsqlite3CorruptError(tls, 219243)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -177796,7 +178822,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, 219240)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219331)
 		}
 	}
 
@@ -177870,13 +178896,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, 219326))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219417))
 	}
 
 	(*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, 219332))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219423))
 	}
 
 	if paRec != 0 {
@@ -177938,7 +178964,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, 219376))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219467))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -178311,7 +179337,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219832)
 	goto finished_invert
 __6:
 	;
@@ -178479,45 +179505,45 @@ 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+12700) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+12719) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
 			} else {
-				var zSep uintptr = ts + 1544
+				var zSep uintptr = ts + 1563
 
 				libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(SessionBuffer{})))
 				(*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+34289, bp+16)
+				sessionAppendStr(tls, bp, ts+34859, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+34302, bp+16)
+				sessionAppendStr(tls, bp, ts+34872, 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+34308, bp+16)
+						sessionAppendStr(tls, bp, ts+34878, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 15971
+						zSep = ts + 15990
 					}
 				}
 
-				zSep = ts + 1544
-				sessionAppendStr(tls, bp, ts+34237, bp+16)
+				zSep = ts + 1563
+				sessionAppendStr(tls, bp, ts+34807, 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+34313, bp+16)
+								ts+34883, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+34245, bp+16)
+							sessionAppendStr(tls, bp, ts+34815, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 22894
+						zSep = ts + 22960
 					}
 				}
 
@@ -178564,42 +179590,42 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	defer tls.Free(20)
 
 	var i int32
-	var zSep uintptr = ts + 1544
+	var zSep uintptr = ts + 1563
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+34388, bp+16)
+	sessionAppendStr(tls, bp, ts+34958, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+34237, bp+16)
+	sessionAppendStr(tls, bp, ts+34807, 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+34308, bp+16)
+			sessionAppendStr(tls, bp, ts+34878, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 22894
+			zSep = ts + 22960
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+34406, bp+16)
+		sessionAppendStr(tls, bp, ts+34976, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+33949, bp+16)
+		sessionAppendStr(tls, bp, ts+34519, bp+16)
 
-		zSep = ts + 1544
+		zSep = ts + 1563
 		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+34245, bp+16)
+				sessionAppendStr(tls, bp, ts+34815, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 34414
+				zSep = ts + 34984
 			}
 		}
-		sessionAppendStr(tls, bp, ts+6309, bp+16)
+		sessionAppendStr(tls, bp, ts+6328, bp+16)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
@@ -178612,7 +179638,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+7793, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+7812, 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 {
@@ -178623,21 +179649,21 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+34419, bp+16)
+	sessionAppendStr(tls, bp, ts+34989, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+22900, bp+16)
+	sessionAppendStr(tls, bp, ts+22966, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+15971, bp+16)
+			sessionAppendStr(tls, bp, ts+15990, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+34437, bp+16)
+	sessionAppendStr(tls, bp, ts+35007, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+34448, bp+16)
+		sessionAppendStr(tls, bp, ts+35018, bp+16)
 	}
-	sessionAppendStr(tls, bp, ts+6309, bp+16)
+	sessionAppendStr(tls, bp, ts+6328, bp+16)
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v2(tls, db, (*SessionBuffer)(unsafe.Pointer(bp)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp)).FnBuf, p+16, uintptr(0))
@@ -178651,14 +179677,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+12700, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+12719, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+34452)
+			ts+35022)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+34565)
+			ts+35135)
 	}
 	return rc
 }
@@ -178686,7 +179712,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, 220219)
+				rc = Xsqlite3CorruptError(tls, 220310)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -178939,7 +179965,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+34709, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+35279, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -178955,7 +179981,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+34730, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+35300, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -179028,10 +180054,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+34749, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+35319, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+34775, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+35345, 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))
@@ -179064,7 +180090,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				f func(*libc.TLS, uintptr, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xFilter})).f(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 176))))
 			if schemaMismatch != 0 {
-				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
+				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
 				if *(*uintptr)(unsafe.Pointer(bp + 200)) == uintptr(0) {
 					rc = SQLITE_NOMEM
 					break
@@ -179077,7 +180103,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+7793, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+7812, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -179090,19 +180116,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+34805, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+35375, 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+34849,
+						ts+35419,
 						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+34920, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+35490, 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+12700) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+12719) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -179153,14 +180179,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+34980, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+35550, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+35010, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+35580, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+35034, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+35010, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+35604, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+35580, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -180408,7 +181434,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+35062, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+35632, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -180696,7 +181722,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+35090, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+35660, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -180883,7 +181909,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+35121, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+35691, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -180951,7 +181977,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 35128
+		var zErr uintptr = ts + 35698
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -181110,7 +182136,7 @@ func fts5ValueToText(tls *libc.TLS, pVal uintptr) uintptr {
 	if zRet != 0 {
 		return zRet
 	}
-	return ts + 1544
+	return ts + 1563
 }
 
 func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, nVal int32, apVal uintptr) {
@@ -181133,7 +182159,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 35178
+		var zErr uintptr = ts + 35748
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -181457,13 +182483,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 35226, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 35796, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 35234, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 35804, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 35244, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 35814, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -181874,7 +182900,7 @@ func fts5ConfigSkipLiteral(tls *libc.TLS, pIn uintptr) uintptr {
 	case 'n':
 		fallthrough
 	case 'N':
-		if Xsqlite3_strnicmp(tls, ts+7533, p, 4) == 0 {
+		if Xsqlite3_strnicmp(tls, ts+7552, p, 4) == 0 {
 			p = p + 4
 		} else {
 			p = uintptr(0)
@@ -182014,7 +183040,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+35249, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35819, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -182041,14 +183067,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+35256, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35826, 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+35287, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+35857, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -182059,7 +183085,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35320, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35890, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -182072,7 +183098,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+35357, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35927, 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)))
@@ -182081,7 +183107,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+35366, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35936, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -182100,7 +183126,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35399, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35969, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -182115,14 +183141,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+35433, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+36003, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35441, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36011, 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+35473, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+36043, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -182130,9 +183156,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+35479, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+36049, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35493, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36063, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -182140,9 +183166,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+35531, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+36101, 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+35542, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36112, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -182150,21 +183176,21 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+6427, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+6446, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 9378, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 18714},
-			{FzName: ts + 35577, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 9397, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 18733},
+			{FzName: ts + 36147, 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+35585, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36155, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35616, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36186, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -182211,15 +183237,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+23560) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+17625) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35644, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+23626) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+17644) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36214, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+35674) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+36244) {
 			*(*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+35684, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36254, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -182236,13 +183262,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+35715, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+36285, 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+35720, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+36290, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35727, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+36297, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -182280,8 +183306,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+23560) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35735, 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+23626) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36305, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -182313,7 +183339,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+35764, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36334, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -182322,13 +183348,13 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 							if *(*uintptr)(unsafe.Pointer(bp + 48)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 48))
 							}
-							return ts + 1544
+							return ts + 1563
 						}(),
 						func() uintptr {
 							if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 64))
 							}
-							return ts + 1544
+							return ts + 1563
 						}(),
 						pzErr)
 				} else {
@@ -182350,19 +183376,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 + 35433
+			zTail = ts + 36003
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 35784
+			zTail = ts + 36354
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+35792, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+36362, 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+17625, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+17644, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -182406,18 +183432,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+35803, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+36373, 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 + 1563
 			}
-			return ts + 15971
+			return ts + 15990
 		}()
-		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+36389, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35826,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+23560))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+36396,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+23626))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -182527,7 +183553,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35852) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+36422) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -182537,7 +183563,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+35857) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+36427) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -182547,7 +183573,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+35866) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+36436) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -182560,7 +183586,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+35876) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+36446) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -182570,7 +183596,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+35886) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+36456) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -182586,7 +183612,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+23560) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+23626) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -182609,7 +183635,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 35898
+	var zSelect uintptr = ts + 36468
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -182631,7 +183657,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+35930) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+36500) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -182645,7 +183671,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+35938,
+				ts+36508,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -182743,7 +183769,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+36003, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+36573, 0)
 					return FTS5_EOF
 				}
 			}
@@ -182756,20 +183782,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+36023, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+36593, 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+36054, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+36624, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+36057, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+36627, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+31439, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+31505, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -184547,9 +185573,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+36061, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+36631, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+35090, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+35660, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -184565,7 +185591,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+36066, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+36636, 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')
@@ -184652,7 +185678,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+21897, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+21963, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -184733,7 +185759,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+36095, 0)
+			ts+36665, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -184903,12 +185929,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+36148,
+								ts+36718,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 36198
+										return ts + 36768
 									}
-									return ts + 36061
+									return ts + 36631
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -185851,7 +186877,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+36205, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+36775, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -185930,7 +186956,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+36211,
+			ts+36781,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -185955,7 +186981,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+36262,
+			ts+36832,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -185978,7 +187004,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+36311,
+			ts+36881,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -186217,7 +187243,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+36351, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+36921, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -187416,7 +188442,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+36374,
+			ts+36944,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -188609,7 +189635,7 @@ func fts5WriteFlushBtree(tls *libc.TLS, p uintptr, pWriter uintptr) {
 			if (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn > 0 {
 				return (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fp
 			}
-			return ts + 1544
+			return ts + 1563
 		}()
 
 		Xsqlite3_bind_blob(tls, (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter, 2, z, (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn, uintptr(0))
@@ -188882,7 +189908,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+36458,
+			ts+37028,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -189948,7 +190974,7 @@ func sqlite3Fts5IndexReinit(tls *libc.TLS, p uintptr) int32 {
 	fts5StructureInvalidate(tls, p)
 	fts5IndexDiscardData(tls, p)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Fts5Structure{})))
-	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1544, 0)
+	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1563, 0)
 	fts5StructureWrite(tls, p, bp)
 	return fts5IndexReturn(tls, p)
 }
@@ -189964,13 +190990,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+36515, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+37085, 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+26432, ts+36523, 0, pzErr)
+				pConfig, ts+26498, ts+37093, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+12840,
-					ts+36558,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+12859,
+					ts+37128,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -190223,7 +191249,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+36205, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+36775, 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)))
@@ -190337,7 +191363,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+36602,
+		ts+37172,
 		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))) {
@@ -190507,7 +191533,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+36688)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+37258)
 			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))
@@ -190778,7 +191804,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+36693, 0)
+			ts+37263, 0)
 		return SQLITE_ERROR
 	}
 
@@ -190809,7 +191835,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 				} else if iCol >= 0 {
 					bSeenMatch = 1
 					*(*int8)(unsafe.Pointer(idxStr + uintptr(libc.PostIncInt32(&iIdxStr, 1)))) = int8('M')
-					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+6327, libc.VaList(bp, iCol))
+					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+6346, libc.VaList(bp, iCol))
 					idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 
 				}
@@ -190824,7 +191850,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 					}
 					return int8('G')
 				}()
-				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+6327, libc.VaList(bp+8, iCol))
+				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+6346, libc.VaList(bp+8, iCol))
 				idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 				(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pInfo)).FaConstraintUsage + uintptr(i)*8)).FargvIndex = libc.PreIncInt32(&iCons, 1)
 
@@ -191138,7 +192164,7 @@ func fts5NextMethod(tls *libc.TLS, pCursor uintptr) int32 {
 					rc = Xsqlite3_reset(tls, (*Fts5Cursor)(unsafe.Pointer(pCsr)).FpStmt)
 					if rc != SQLITE_OK {
 						(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-							ts+4493, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+							ts+4512, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 					}
 				} else {
 					rc = SQLITE_OK
@@ -191170,7 +192196,7 @@ func fts5PrepareStatement(tls *libc.TLS, ppStmt uintptr, pConfig uintptr, zFmt u
 		rc = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
 			uint32(SQLITE_PREPARE_PERSISTENT), bp+8, uintptr(0))
 		if rc != SQLITE_OK {
-			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 		}
 		Xsqlite3_free(tls, zSql)
 	}
@@ -191202,25 +192228,25 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+36732,
+		ts+37302,
 		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 + 15971
+					return ts + 15990
 				}
-				return ts + 1544
+				return ts + 1563
 			}(),
 			func() uintptr {
 				if zRankArgs != 0 {
 					return zRankArgs
 				}
-				return ts + 1544
+				return ts + 1563
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 36787
+					return ts + 37357
 				}
-				return ts + 36792
+				return ts + 37362
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -191266,12 +192292,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+36796, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+37366, 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) {
+	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+6428, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36802, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+37372, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -191302,7 +192328,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+36830, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+37400, 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,
@@ -191333,7 +192359,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+36840, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+37410, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -191365,14 +192391,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+36861, libc.VaList(bp, z))
+				ts+37431, 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 + 35244
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 35814
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -191428,7 +192454,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+36693, 0)
+		ts+37263, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -191471,7 +192497,7 @@ __8:
 	if !(zText == uintptr(0)) {
 		goto __14
 	}
-	zText = ts + 1544
+	zText = ts + 1563
 __14:
 	;
 	iCol = 0
@@ -191645,7 +192671,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+36894, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+37464, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -191766,7 +192792,7 @@ func fts5SeekCursor(tls *libc.TLS, pCsr uintptr, bErrormsg int32) int32 {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			} else if (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg != 0 {
 				*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-					ts+4493, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
+					ts+4512, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
 			}
 		}
 	}
@@ -191790,28 +192816,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+36930, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+37500, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+36941, 0)
+				ts+37511, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+37021, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+37591, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+37029, 0)
+				ts+37599, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+18313, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+18332, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+37085, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+37655, 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+37091, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+37661, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -191869,7 +192895,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+18848, z) {
+			0 == Xsqlite3_stricmp(tls, ts+18867, 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)))
@@ -191882,12 +192908,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+37107,
+				ts+37677,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 21798
+						return ts + 21864
 					}
-					return ts + 37144
+					return ts + 37714
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -192517,7 +193543,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+37156, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+37726, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -192761,7 +193787,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+37177, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37747, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -192780,7 +193806,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+37199, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37769, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -192827,7 +193853,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+37230)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+37800)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -192836,7 +193862,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+37243, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+37813, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -192850,7 +193876,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 37334, ts + 35433, ts + 26432, ts + 35784, ts + 12840,
+	ts + 37904, ts + 36003, ts + 26498, ts + 36354, ts + 12859,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -192874,7 +193900,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+37341, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+37911, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -192892,13 +193918,13 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+37341, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+37911, 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+37346, 0,
+				db, ts+37916, 0,
 				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
 				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
@@ -192955,17 +193981,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 + 37361,
-			ts + 37429,
-			ts + 37498,
-			ts + 37531,
-			ts + 37570,
-			ts + 37610,
-			ts + 37649,
-			ts + 37690,
-			ts + 37729,
-			ts + 37771,
-			ts + 37811,
+			ts + 37931,
+			ts + 37999,
+			ts + 38068,
+			ts + 38101,
+			ts + 38140,
+			ts + 38180,
+			ts + 38219,
+			ts + 38260,
+			ts + 38299,
+			ts + 38341,
+			ts + 38381,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -193032,7 +194058,7 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 			(*Fts5Config)(unsafe.Pointer((*Fts5Storage)(unsafe.Pointer(p)).FpConfig)).FbLock--
 			Xsqlite3_free(tls, zSql)
 			if rc != SQLITE_OK && pzErrMsg != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
 			}
 		}
 	}
@@ -193067,18 +194093,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+37834,
+		ts+38404,
 		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+37938,
+			ts+38508,
 			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+37976,
+			ts+38546,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -193090,7 +194116,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+38014,
+			ts+38584,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -193102,14 +194128,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+26432, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+12840, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+37334, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+26498, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+12859, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+37904, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+35784, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+36354, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+35433, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+36003, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -193121,17 +194147,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+38056,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+38626,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 31085
+					return ts + 31151
 				}
-				return ts + 1544
+				return ts + 1563
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+38086,
+			ts+38656,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -193168,27 +194194,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+38130, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+38700, 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+38153, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+38723, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+35433, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+36003, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35784, ts+38159, 0, pzErr)
+				pConfig, ts+36354, ts+38729, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+37334, ts+38191, 1, pzErr)
+				pConfig, ts+37904, ts+38761, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35930, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+36500, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -193394,12 +194420,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+38208,
+		ts+38778,
 		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+38258,
+			ts+38828,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -193407,7 +194433,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+35930, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+36500, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -193583,7 +194609,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+38287,
+	zSql = Xsqlite3_mprintf(tls, ts+38857,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -193765,14 +194791,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+35433, bp+48)
+			rc = fts5StorageCount(tls, p, ts+36003, 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+35784, bp+56)
+			rc = fts5StorageCount(tls, p, ts+36354, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -193967,9 +194993,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+38319) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38889) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38330) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38900) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -194184,7 +195210,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 + 38341
+			var zCat uintptr = ts + 38911
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -194196,7 +195222,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+38350) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38920) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -194207,18 +195233,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+38361) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38931) {
 					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+38319) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38889) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38330) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38900) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38350) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38920) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -194494,7 +195520,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 + 38379
+	var zBase uintptr = ts + 38949
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -194636,7 +195662,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+38389, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38959, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -194644,11 +195670,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38392, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38962, 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+38397, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38967, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -194656,7 +195682,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38402, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38972, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -194664,7 +195690,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38405, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38975, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -194672,11 +195698,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38408, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38978, 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+38413, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38983, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -194684,19 +195710,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38418, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38988, 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+38422, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38992, 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+38428, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38998, 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+38433, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39003, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -194704,11 +195730,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38437, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39007, 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+38441, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+39011, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -194716,7 +195742,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38444, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39014, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -194724,11 +195750,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38448, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39018, 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+38452, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39022, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -194736,7 +195762,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38456, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39026, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -194744,7 +195770,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38460, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39030, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -194752,7 +195778,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38464, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39034, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -194768,24 +195794,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+38468, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+38448, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+39038, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+39018, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+39041, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+39044, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+39048, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+39034, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -194800,137 +195826,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+38481, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+39051, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38448, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+39018, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+38489, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+39059, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+38496, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+39066, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38501, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+39071, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38397, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38967, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38506, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+39076, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38392, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38962, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38511, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+39081, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38464, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+39034, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38516, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+39086, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+16837, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+16856, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38521, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39091, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+38474, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+39044, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38525, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+39095, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38389, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38959, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38530, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39100, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38433, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+39003, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38536, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39106, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+38540, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+39110, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38542, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39112, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38456, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+39026, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38548, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+39118, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38464, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+39034, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38556, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39126, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38448, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+39018, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38562, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+39132, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38448, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+39018, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38567, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39137, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38389, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38959, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38573, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+39143, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38460, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+39030, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38581, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+39151, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38589, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+39159, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38593, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+39163, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38456, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+39026, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38601, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39171, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38389, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38959, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38607, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39177, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38460, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+39030, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+38613, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+39183, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+38474, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+39044, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -194945,16 +195971,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+38620, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+39190, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38405, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38975, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38625, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+39195, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -194962,21 +195988,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38630, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39200, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38405, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38975, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38636, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39206, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38405, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38975, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38589, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39159, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -194984,7 +196010,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38642, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39212, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -194992,9 +196018,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38648, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39218, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38389, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38959, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -195009,12 +196035,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+38654, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39224, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+38658, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+39228, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38661, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+39231, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -195023,7 +196049,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38664, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39234, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -195179,7 +196205,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+38668) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+39238) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -195359,22 +196385,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 38379, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 38949, 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 + 38683, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 39253, 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 + 38689, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 39259, 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 + 38696, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 39266, 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
@@ -196517,14 +197543,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+38704) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+39274) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+38708) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+39278) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+38712) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+39282) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38721, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+39291, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -196550,19 +197576,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 + 38755,
-		ts + 38795,
-		ts + 38830,
+		ts + 39325,
+		ts + 39365,
+		ts + 39400,
 	}
 
 	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+24721, *(*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+24787, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38873, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+39443, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -196695,11 +197721,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+38906, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+39476, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+38937,
+		ts+39507,
 		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))
@@ -196723,7 +197749,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+38988, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+39558, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -197007,7 +198033,7 @@ func fts5VocabFilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, zUnused
 		if pLe != 0 {
 			var zCopy uintptr = Xsqlite3_value_text(tls, pLe)
 			if zCopy == uintptr(0) {
-				zCopy = ts + 1544
+				zCopy = ts + 1563
 			}
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm = Xsqlite3_value_bytes(tls, pLe)
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FzLeTerm = Xsqlite3_malloc(tls, (*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm+1)
@@ -197118,7 +198144,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+39014, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+39584, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -197140,7 +198166,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 + 39024
+	return ts + 39594
 }
 
 func init() {
@@ -197605,6 +198631,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1056)) = noopStepFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1064)) = uintptr(unsafe.Pointer(&lagName))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&attach_func)) + 24)) = attachFunc
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 8)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 16)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 24)) = statBestIndex
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 32)) = statDisconnect
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 40)) = statDisconnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 48)) = statOpen
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 56)) = statClose
+	*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 64)) = statFilter
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 72)) = statNext
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 80)) = statEof
+	*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 88)) = statColumn
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 96)) = statRowid
 	*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 0)) = sqlite3MemMalloc
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 8)) = sqlite3MemFree
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 16)) = sqlite3MemRealloc
@@ -198082,8 +199120,9 @@ func init() {
 	*(*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
-	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = Xsqlite3JsonTableFunctions
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = Xsqlite3DbstatRegister
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = sqlite3TestExtInit
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 32)) = Xsqlite3JsonTableFunctions
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statGetFuncdef)) + 24)) = statGet
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statInitFuncdef)) + 24)) = statInit
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statPushFuncdef)) + 24)) = statPush
@@ -198207,5 +199246,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&winVfs)) + 160)) = winNextSystemCall
 }
 
-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 ts1 = "3.41.2\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_DBSTAT_VTAB\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\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\x00true\x00false\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 \x00rowid not at end-of-record for row \x00 of 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\x00CREATE TABLE x( name       TEXT, path       TEXT, pageno     INTEGER, pagetype   TEXT, ncell      INTEGER, payload    INTEGER, unused     INTEGER, mx_payload INTEGER, pgoffset   INTEGER, pgsize     INTEGER, schema     TEXT HIDDEN, aggregate  BOOLEAN HIDDEN)\x00/\x00overflow\x00%s%.3x+%.6x\x00%s%.3x/\x00internal\x00leaf\x00corrupted\x00SELECT * FROM (SELECT 'sqlite_schema' AS name,1 AS rootpage,'table' AS type UNION ALL SELECT name,rootpage,type FROM \"%w\".sqlite_schema WHERE rootpage!=0)\x00WHERE name=%Q\x00 ORDER BY name\x00dbstat\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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 57c8fcdb..dd74406c 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-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.
+// 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-3410200/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -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
 
@@ -2963,6 +2963,7 @@ const (
 	DBFLAG_SchemaKnownOk                                                           = 0x0010
 	DBFLAG_Vacuum                                                                  = 0x0004
 	DBFLAG_VacuumInto                                                              = 0x0008
+	DBSTAT_PAGE_PADDING_BYTES                                                      = 256
 	DB_ResetWanted                                                                 = 0x0008
 	DB_SchemaLoaded                                                                = 0x0001
 	DB_UnresetViews                                                                = 0x0002
@@ -10492,11 +10493,11 @@ const (
 	NC_OrderAgg                                                                    = 0x8000000
 	NC_PartIdx                                                                     = 0x000002
 	NC_SelfRef                                                                     = 0x00002e
+	NC_Subquery                                                                    = 0x000040
 	NC_UAggInfo                                                                    = 0x000100
 	NC_UBaseReg                                                                    = 0x000400
 	NC_UEList                                                                      = 0x000080
 	NC_UUpsert                                                                     = 0x000200
-	NC_VarSelect                                                                   = 0x000040
 	NDEBUG                                                                         = 1
 	NDR_ASCII_CHAR                                                                 = 0
 	NDR_BIG_ENDIAN                                                                 = 0
@@ -14684,6 +14685,7 @@ const (
 	SQLITE_ECEL_REF                                                                = 0x04
 	SQLITE_EMPTY                                                                   = 16
 	SQLITE_ENABLE_COLUMN_METADATA                                                  = 1
+	SQLITE_ENABLE_DBSTAT_VTAB                                                      = 1
 	SQLITE_ENABLE_FTS5                                                             = 1
 	SQLITE_ENABLE_GEOPOLY                                                          = 1
 	SQLITE_ENABLE_LOCKING_STYLE                                                    = 0
@@ -15089,7 +15091,7 @@ const (
 	SQLITE_SHM_UNLOCK                                                              = 1
 	SQLITE_SORTER_PMASZ                                                            = 250
 	SQLITE_SOUNDEX                                                                 = 1
-	SQLITE_SOURCE_ID                                                               = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
+	SQLITE_SOURCE_ID                                                               = "2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da"
 	SQLITE_SO_ASC                                                                  = 0
 	SQLITE_SO_DESC                                                                 = 1
 	SQLITE_SO_UNDEFINED                                                            = -1
@@ -15200,8 +15202,8 @@ const (
 	SQLITE_UTF8                                                                    = 1
 	SQLITE_VDBEINT_H                                                               = 0
 	SQLITE_VDBE_H                                                                  = 0
-	SQLITE_VERSION                                                                 = "3.41.0"
-	SQLITE_VERSION_NUMBER                                                          = 3041000
+	SQLITE_VERSION                                                                 = "3.41.2"
+	SQLITE_VERSION_NUMBER                                                          = 3041002
 	SQLITE_VTABRISK_High                                                           = 2
 	SQLITE_VTABRISK_Low                                                            = 0
 	SQLITE_VTABRISK_Normal                                                         = 1
@@ -24337,7 +24339,8 @@ type IndexedExpr1 = struct {
 	FiIdxCur       int32
 	FiIdxCol       int32
 	FbMaybeNullRow U8
-	F__ccgo_pad1   [3]byte
+	Faff           U8
+	F__ccgo_pad1   [2]byte
 	FpIENext       uintptr
 }
 
@@ -24982,17 +24985,18 @@ type Pager = Pager1
 
 // Handle type for pages.
 type PgHdr2 = struct {
-	FpPage      uintptr
-	FpData      uintptr
-	FpExtra     uintptr
-	FpCache     uintptr
-	FpDirty     uintptr
-	FpPager     uintptr
-	Fpgno       Pgno
-	Fflags      U16
-	FnRef       I16
-	FpDirtyNext uintptr
-	FpDirtyPrev uintptr
+	FpPage       uintptr
+	FpData       uintptr
+	FpExtra      uintptr
+	FpCache      uintptr
+	FpDirty      uintptr
+	FpPager      uintptr
+	Fpgno        Pgno
+	Fflags       U16
+	F__ccgo_pad1 [2]byte
+	FnRef        I64
+	FpDirtyNext  uintptr
+	FpDirtyPrev  uintptr
 }
 
 // Handle type for pages.
@@ -25213,14 +25217,14 @@ type PCache2 = struct {
 	FpDirty      uintptr
 	FpDirtyTail  uintptr
 	FpSynced     uintptr
-	FnRefSum     int32
+	FnRefSum     I64
 	FszCache     int32
 	FszSpill     int32
 	FszPage      int32
 	FszExtra     int32
 	FbPurgeable  U8
 	FeCreate     U8
-	F__ccgo_pad1 [2]byte
+	F__ccgo_pad1 [6]byte
 	FxStress     uintptr
 	FpStress     uintptr
 	FpCache      uintptr
@@ -25479,7 +25483,7 @@ type CoveringIndexCheck1 = struct {
 	F__ccgo_pad1 [2]byte
 }
 
-var sqlite3azCompileOpt = [52]uintptr{
+var sqlite3azCompileOpt = [53]uintptr{
 	ts + 7,
 	ts + 27,
 	ts + 46,
@@ -25498,40 +25502,41 @@ var sqlite3azCompileOpt = [52]uintptr{
 	ts + 362,
 	ts + 387,
 	ts + 410,
-	ts + 422,
-	ts + 437,
-	ts + 459,
-	ts + 484,
-	ts + 507,
-	ts + 529,
-	ts + 540,
-	ts + 553,
-	ts + 568,
-	ts + 584,
-	ts + 597,
-	ts + 618,
-	ts + 642,
-	ts + 665,
-	ts + 681,
-	ts + 697,
-	ts + 721,
-	ts + 748,
-	ts + 768,
-	ts + 789,
-	ts + 811,
-	ts + 841,
-	ts + 866,
-	ts + 892,
-	ts + 912,
-	ts + 938,
-	ts + 961,
-	ts + 987,
-	ts + 1009,
-	ts + 1030,
-	ts + 1041,
+	ts + 429,
+	ts + 441,
+	ts + 456,
+	ts + 478,
+	ts + 503,
+	ts + 526,
+	ts + 548,
+	ts + 559,
+	ts + 572,
+	ts + 587,
+	ts + 603,
+	ts + 616,
+	ts + 637,
+	ts + 661,
+	ts + 684,
+	ts + 700,
+	ts + 716,
+	ts + 740,
+	ts + 767,
+	ts + 787,
+	ts + 808,
+	ts + 830,
+	ts + 860,
+	ts + 885,
+	ts + 911,
+	ts + 931,
+	ts + 957,
+	ts + 980,
+	ts + 1006,
+	ts + 1028,
 	ts + 1049,
-	ts + 1063,
-	ts + 1076,
+	ts + 1060,
+	ts + 1068,
+	ts + 1082,
+	ts + 1095,
 }
 
 func Xsqlite3CompileOptions(tls *libc.TLS, pnOpt uintptr) uintptr {
@@ -25683,7 +25688,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 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))
+var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1108))
 
 // Standard typenames.  These names must match the COLTYPE_* definitions.
 // Adjust the SQLITE_N_STDTYPE value if adding or removing entries.
@@ -25705,12 +25710,12 @@ var Xsqlite3StdTypeAffinity = [6]int8{
 	int8(SQLITE_AFF_TEXT),
 }
 var Xsqlite3StdType = [6]uintptr{
-	ts + 1096,
-	ts + 1100,
-	ts + 1105,
-	ts + 1109,
-	ts + 1117,
-	ts + 1122,
+	ts + 1115,
+	ts + 1119,
+	ts + 1124,
+	ts + 1128,
+	ts + 1136,
+	ts + 1141,
 }
 
 // SQL is translated into a sequence of instructions to be
@@ -26027,7 +26032,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, 23229)
+		return Xsqlite3MisuseError(tls, 23233)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -26467,7 +26472,7 @@ __6:
 __4:
 	;
 	zDate++
-	if !(getDigits(tls, zDate, ts+1127, libc.VaList(bp, bp+16, bp+20)) != 2) {
+	if !(getDigits(tls, zDate, ts+1146, libc.VaList(bp, bp+16, bp+20)) != 2) {
 		goto __9
 	}
 	return 1
@@ -26493,13 +26498,13 @@ func parseHhMmSs(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	defer tls.Free(36)
 
 	var ms float64 = 0.0
-	if getDigits(tls, zDate, ts+1135, libc.VaList(bp, bp+24, bp+28)) != 2 {
+	if getDigits(tls, zDate, ts+1154, libc.VaList(bp, bp+24, bp+28)) != 2 {
 		return 1
 	}
 	zDate += uintptr(5)
 	if int32(*(*int8)(unsafe.Pointer(zDate))) == ':' {
 		zDate++
-		if getDigits(tls, zDate, ts+1143, libc.VaList(bp+16, bp+32)) != 1 {
+		if getDigits(tls, zDate, ts+1162, libc.VaList(bp+16, bp+32)) != 1 {
 			return 1
 		}
 		zDate += uintptr(2)
@@ -26597,7 +26602,7 @@ func parseYyyyMmDd(tls *libc.TLS, zDate uintptr, p uintptr) int32 {
 	} else {
 		neg = 0
 	}
-	if getDigits(tls, zDate, ts+1147, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
+	if getDigits(tls, zDate, ts+1166, libc.VaList(bp, bp+24, bp+28, bp+32)) != 3 {
 		return 1
 	}
 	zDate += uintptr(10)
@@ -26654,7 +26659,7 @@ func parseDateOrTime(tls *libc.TLS, context uintptr, zDate uintptr, p uintptr) i
 		return 0
 	} else if parseHhMmSs(tls, zDate, p) == 0 {
 		return 0
-	} else if Xsqlite3StrICmp(tls, zDate, ts+1159) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
+	} else if Xsqlite3StrICmp(tls, zDate, ts+1178) == 0 && Xsqlite3NotPureFunc(tls, context) != 0 {
 		return setDateTimeToCurrent(tls, context, p)
 	} else if Xsqlite3AtoF(tls, zDate, bp, Xsqlite3Strlen30(tls, zDate), uint8(SQLITE_UTF8)) > 0 {
 		setRawDateNumber(tls, p, *(*float64)(unsafe.Pointer(bp)))
@@ -26787,7 +26792,7 @@ func toLocaltime(tls *libc.TLS, p uintptr, pCtx uintptr) int32 {
 		*(*Time_t)(unsafe.Pointer(bp + 88)) = (*DateTime)(unsafe.Pointer(p)).FiJD/int64(1000) - int64(21086676)*int64(10000)
 	}
 	if osLocaltime(tls, bp+88, bp) != 0 {
-		Xsqlite3_result_error(tls, pCtx, ts+1163, -1)
+		Xsqlite3_result_error(tls, pCtx, ts+1182, -1)
 		return SQLITE_ERROR
 	}
 	(*DateTime)(unsafe.Pointer(p)).FY = (*tm)(unsafe.Pointer(bp)).Ftm_year + 1900 - iYearDiff
@@ -26811,12 +26816,12 @@ var aXformType = [6]struct {
 	FrLimit float32
 	FrXform float32
 }{
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1186)), FrLimit: 4.6427e+14, FrXform: 1.0},
-	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1193)), FrLimit: 7.7379e+12, FrXform: 60.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1200)), FrLimit: 1.2897e+11, FrXform: 3600.0},
-	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1207)), FrLimit: 5373485.0, FrXform: 86400.0},
-	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1214)), FrLimit: 176546.0, FrXform: 2592000.0},
-	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1221)), FrLimit: 14713.0, FrXform: 31536000.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1205)), FrLimit: 4.6427e+14, FrXform: 1.0},
+	{FnName: U8(6), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1212)), FrLimit: 7.7379e+12, FrXform: 60.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1219)), FrLimit: 1.2897e+11, FrXform: 3600.0},
+	{FnName: U8(3), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1226)), FrLimit: 5373485.0, FrXform: 86400.0},
+	{FnName: U8(5), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1233)), FrLimit: 176546.0, FrXform: 2592000.0},
+	{FnName: U8(4), FzName: *(*[7]int8)(unsafe.Pointer(ts + 1240)), FrLimit: 14713.0, FrXform: 31536000.0},
 }
 
 func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, idx int32) int32 {
@@ -26828,7 +26833,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 	switch int32(Xsqlite3UpperToLower[U8(*(*int8)(unsafe.Pointer(z)))]) {
 	case 'a':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1228) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1247) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -26850,7 +26855,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'j':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1233) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1252) == 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -26864,7 +26869,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'l':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1243) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1262) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				rc = toLocaltime(tls, p, pCtx)
 			}
 			break
@@ -26872,7 +26877,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'u':
 		{
-			if Xsqlite3_stricmp(tls, z, ts+1253) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1272) == 0 && (*DateTime)(unsafe.Pointer(p)).FrawS != 0 {
 				if idx > 1 {
 					return 1
 				}
@@ -26884,7 +26889,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 					rc = 0
 				}
-			} else if Xsqlite3_stricmp(tls, z, ts+1263) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1282) == 0 && Xsqlite3NotPureFunc(tls, pCtx) != 0 {
 				if int32((*DateTime)(unsafe.Pointer(p)).FtzSet) == 0 {
 					var iOrigJD I64
 					var iGuess I64
@@ -26918,7 +26923,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 'w':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1267, 8) == 0 &&
+			if Xsqlite3_strnicmp(tls, z, ts+1286, 8) == 0 &&
 				Xsqlite3AtoF(tls, z+8, bp+48, Xsqlite3Strlen30(tls, z+8), uint8(SQLITE_UTF8)) > 0 &&
 				*(*float64)(unsafe.Pointer(bp + 48)) >= 0.0 && *(*float64)(unsafe.Pointer(bp + 48)) < 7.0 && float64(libc.AssignInt32(&n, int32(*(*float64)(unsafe.Pointer(bp + 48))))) == *(*float64)(unsafe.Pointer(bp + 48)) {
 				var Z Sqlite3_int64
@@ -26939,7 +26944,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 		}
 	case 's':
 		{
-			if Xsqlite3_strnicmp(tls, z, ts+1276, 9) != 0 {
+			if Xsqlite3_strnicmp(tls, z, ts+1295, 9) != 0 {
 				break
 			}
 			if !(int32((*DateTime)(unsafe.Pointer(p)).FvalidJD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidYMD) != 0) && !(int32((*DateTime)(unsafe.Pointer(p)).FvalidHMS) != 0) {
@@ -26953,14 +26958,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 			(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidTZ = int8(0)
 			(*DateTime)(unsafe.Pointer(p)).FvalidJD = int8(0)
-			if Xsqlite3_stricmp(tls, z, ts+1286) == 0 {
+			if Xsqlite3_stricmp(tls, z, ts+1305) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1292) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1311) == 0 {
 				(*DateTime)(unsafe.Pointer(p)).FM = 1
 				(*DateTime)(unsafe.Pointer(p)).FD = 1
 				rc = 0
-			} else if Xsqlite3_stricmp(tls, z, ts+1297) == 0 {
+			} else if Xsqlite3_stricmp(tls, z, ts+1316) == 0 {
 				rc = 0
 			}
 			break
@@ -27286,7 +27291,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		switch int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) {
 		case 'd':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1301, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1320, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+88)).FD))
 				break
 
 			}
@@ -27296,13 +27301,13 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if s > 59.999 {
 					s = 59.999
 				}
-				Xsqlite3_str_appendf(tls, bp+136, ts+1306, libc.VaList(bp+8, s))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1325, libc.VaList(bp+8, s))
 				break
 
 			}
 		case 'H':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1301, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1320, libc.VaList(bp+16, (*DateTime)(unsafe.Pointer(bp+88)).Fh))
 				break
 
 			}
@@ -27320,41 +27325,41 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 				if int32(*(*int8)(unsafe.Pointer(zFmt + uintptr(i)))) == 'W' {
 					var wd int32
 					wd = int32(((*DateTime)(unsafe.Pointer(bp+88)).FiJD + int64(43200000)) / int64(86400000) % int64(7))
-					Xsqlite3_str_appendf(tls, bp+136, ts+1301, libc.VaList(bp+24, (nDay+7-wd)/7))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1320, libc.VaList(bp+24, (nDay+7-wd)/7))
 				} else {
-					Xsqlite3_str_appendf(tls, bp+136, ts+1313, libc.VaList(bp+32, nDay+1))
+					Xsqlite3_str_appendf(tls, bp+136, ts+1332, libc.VaList(bp+32, nDay+1))
 				}
 				break
 
 			}
 		case 'J':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1318, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1337, libc.VaList(bp+40, float64((*DateTime)(unsafe.Pointer(bp+88)).FiJD)/86400000.0))
 				break
 
 			}
 		case 'm':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1301, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1320, libc.VaList(bp+48, (*DateTime)(unsafe.Pointer(bp+88)).FM))
 				break
 
 			}
 		case 'M':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1301, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1320, libc.VaList(bp+56, (*DateTime)(unsafe.Pointer(bp+88)).Fm))
 				break
 
 			}
 		case 's':
 			{
 				var iS I64 = (*DateTime)(unsafe.Pointer(bp+88)).FiJD/int64(1000) - int64(21086676)*int64(10000)
-				Xsqlite3_str_appendf(tls, bp+136, ts+1324, libc.VaList(bp+64, iS))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1343, libc.VaList(bp+64, iS))
 				break
 
 			}
 		case 'S':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1301, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1320, libc.VaList(bp+72, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+88)).Fs)))
 				break
 
 			}
@@ -27367,7 +27372,7 @@ func strftimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			}
 		case 'Y':
 			{
-				Xsqlite3_str_appendf(tls, bp+136, ts+1329, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
+				Xsqlite3_str_appendf(tls, bp+136, ts+1348, libc.VaList(bp+80, (*DateTime)(unsafe.Pointer(bp+88)).FY))
 				break
 
 			}
@@ -27417,15 +27422,15 @@ func Xsqlite3RegisterDateTimeFunctions(tls *libc.TLS) {
 }
 
 var aDateTimeFuncs = [9]FuncDef{
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1233},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1253},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1334},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1339},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1344},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1252},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1272},
 	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1353},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1362},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1375},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1393}}
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1358},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1363},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FpUserData: 0, FxSFunc: 0, FzName: ts + 1372},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1381},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1394},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 1412}}
 
 // The following routines are convenience wrappers around methods
 // of the sqlite3_file object.  This is mostly just syntactic sugar. All
@@ -27837,7 +27842,7 @@ func sqlite3MemMalloc(tls *libc.TLS, nByte int32) uintptr {
 
 	p = libc.Xmalloc(tls, uint64(nByte))
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1406, libc.VaList(bp, nByte))
+		Xsqlite3_log(tls, SQLITE_NOMEM, ts+1425, libc.VaList(bp, nByte))
 	}
 	return p
 }
@@ -27857,7 +27862,7 @@ func sqlite3MemRealloc(tls *libc.TLS, pPrior uintptr, nByte int32) uintptr {
 	var p uintptr = libc.Xrealloc(tls, pPrior, uint64(nByte))
 	if p == uintptr(0) {
 		Xsqlite3_log(tls, SQLITE_NOMEM,
-			ts+1444,
+			ts+1463,
 			libc.VaList(bp, libc.X_msize(tls, pPrior), nByte))
 	}
 	return p
@@ -55346,7 +55351,7 @@ func Xsqlite3OomFault(tls *libc.TLS, db uintptr) uintptr {
 		(*Sqlite3)(unsafe.Pointer(db)).Flookaside.Fsz = U16(0)
 		if (*Sqlite3)(unsafe.Pointer(db)).FpParse != 0 {
 			var pParse uintptr
-			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1480, 0)
+			Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1499, 0)
 			(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 			for pParse = (*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).FpOuterParse; pParse != 0; pParse = (*Parse)(unsafe.Pointer(pParse)).FpOuterParse {
 				(*Parse)(unsafe.Pointer(pParse)).FnErr++
@@ -55419,8 +55424,8 @@ type et_info = struct {
 // by an instance of the following structure
 type Et_info = et_info
 
-var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1494))
-var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1527))
+var aDigits = *(*[33]int8)(unsafe.Pointer(ts + 1513))
+var aPrefix = *(*[7]int8)(unsafe.Pointer(ts + 1546))
 var fmtinfo = [23]Et_info{
 	{Ffmttype: int8('d'), Fbase: EtByte(10), Fflags: EtByte(1), Ftype: EtByte(EtDECIMAL)},
 	{Ffmttype: int8('s'), Fflags: EtByte(4), Ftype: EtByte(EtSTRING)},
@@ -55634,7 +55639,7 @@ __6:
 	if !(libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(libc.PreIncUintptr(&fmt, 1))))) == 0) {
 		goto __11
 	}
-	Xsqlite3_str_append(tls, pAccum, ts+1534, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1553, 1)
 	goto __5
 __11:
 	;
@@ -56191,7 +56196,7 @@ __125:
 	if !(Xsqlite3IsNaN(tls, *(*float64)(unsafe.Pointer(bp + 104))) != 0) {
 		goto __127
 	}
-	bufpt = ts + 1536
+	bufpt = ts + 1555
 	length = 3
 	goto __58
 __127:
@@ -56251,7 +56256,7 @@ __138:
 	}
 	bufpt = bp + 16
 	*(*int8)(unsafe.Pointer(bp + 16)) = prefix
-	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1540, uint64(4))
+	libc.Xmemcpy(tls, bp+16+uintptr(libc.Bool32(int32(prefix) != 0)), ts+1559, uint64(4))
 	length = 3 + libc.Bool32(int32(prefix) != 0)
 	goto __58
 __139:
@@ -56617,7 +56622,7 @@ __200:
 	if !(bufpt == uintptr(0)) {
 		goto __201
 	}
-	bufpt = ts + 1544
+	bufpt = ts + 1563
 	goto __202
 __201:
 	if !(int32(xtype) == EtDYNSTRING) {
@@ -56741,9 +56746,9 @@ __222:
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
-			return ts + 1545
+			return ts + 1564
 		}
-		return ts + 1550
+		return ts + 1569
 	}()
 __223:
 	;
@@ -56891,7 +56896,7 @@ __246:
 		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
-	Xsqlite3_str_append(tls, pAccum, ts+1557, 1)
+	Xsqlite3_str_append(tls, pAccum, ts+1576, 1)
 __250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
@@ -56908,10 +56913,10 @@ __251:
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
 		goto __253
 	}
-	Xsqlite3_str_appendf(tls, pAccum, ts+1559, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1578, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 	goto __254
 __253:
-	Xsqlite3_str_appendf(tls, pAccum, ts+1569, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
+	Xsqlite3_str_appendf(tls, pAccum, ts+1588, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
 __254:
 	;
 __252:
@@ -56966,7 +56971,7 @@ __4:
 __5:
 }
 
-var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1583))
+var zOrd = *(*[9]int8)(unsafe.Pointer(ts + 1602))
 
 // The z string points to the first character of a token that is
 // associated with an error.  If db does not already have an error
@@ -57131,7 +57136,7 @@ func Xsqlite3ResultStrAccum(tls *libc.TLS, pCtx uintptr, p uintptr) {
 	} else if int32((*StrAccum)(unsafe.Pointer(p)).FprintfFlags)&SQLITE_PRINTF_MALLOCED != 0 {
 		Xsqlite3_result_text(tls, pCtx, (*StrAccum)(unsafe.Pointer(p)).FzText, int32((*StrAccum)(unsafe.Pointer(p)).FnChar), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 	} else {
-		Xsqlite3_result_text(tls, pCtx, ts+1544, 0, uintptr(0))
+		Xsqlite3_result_text(tls, pCtx, ts+1563, 0, uintptr(0))
 		Xsqlite3_str_reset(tls, p)
 	}
 }
@@ -58972,7 +58977,7 @@ func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
 	var c int32 = 0
 	var i int32
 
-	var pow63 uintptr = ts + 1592
+	var pow63 uintptr = ts + 1611
 	for i = 0; c == 0 && i < 18; i++ {
 		c = (int32(*(*int8)(unsafe.Pointer(zNum + uintptr(i*incr)))) - int32(*(*int8)(unsafe.Pointer(pow63 + uintptr(i))))) * 10
 	}
@@ -59523,7 +59528,7 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 	defer tls.Free(8)
 
 	Xsqlite3_log(tls, SQLITE_MISUSE,
-		ts+1611,
+		ts+1630,
 		libc.VaList(bp, zType))
 }
 
@@ -59542,13 +59547,13 @@ func logBadConnection(tls *libc.TLS, zType uintptr) {
 func Xsqlite3SafetyCheckOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	if db == uintptr(0) {
-		logBadConnection(tls, ts+1545)
+		logBadConnection(tls, ts+1564)
 		return 0
 	}
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_OPEN {
 		if Xsqlite3SafetyCheckSickOrOk(tls, db) != 0 {
-			logBadConnection(tls, ts+1656)
+			logBadConnection(tls, ts+1675)
 		}
 		return 0
 	} else {
@@ -59561,7 +59566,7 @@ func Xsqlite3SafetyCheckSickOrOk(tls *libc.TLS, db uintptr) int32 {
 	var eOpenState U8
 	eOpenState = (*Sqlite3)(unsafe.Pointer(db)).FeOpenState
 	if int32(eOpenState) != SQLITE_STATE_SICK && int32(eOpenState) != SQLITE_STATE_OPEN && int32(eOpenState) != SQLITE_STATE_BUSY {
-		logBadConnection(tls, ts+1665)
+		logBadConnection(tls, ts+1684)
 		return 0
 	} else {
 		return 1
@@ -60035,193 +60040,193 @@ func Xsqlite3OpcodeName(tls *libc.TLS, i int32) uintptr {
 }
 
 var azName = [187]uintptr{
-	ts + 1673,
-	ts + 1683,
-	ts + 1694,
-	ts + 1706,
-	ts + 1717,
-	ts + 1729,
+	ts + 1692,
+	ts + 1702,
+	ts + 1713,
+	ts + 1725,
 	ts + 1736,
-	ts + 1744,
-	ts + 1752,
-	ts + 1757,
-	ts + 1762,
-	ts + 1768,
-	ts + 1782,
-	ts + 1788,
-	ts + 1798,
-	ts + 1803,
-	ts + 1808,
-	ts + 1811,
+	ts + 1748,
+	ts + 1755,
+	ts + 1763,
+	ts + 1771,
+	ts + 1776,
+	ts + 1781,
+	ts + 1787,
+	ts + 1801,
+	ts + 1807,
 	ts + 1817,
-	ts + 1824,
-	ts + 1828,
-	ts + 1838,
-	ts + 1845,
-	ts + 1852,
-	ts + 1859,
-	ts + 1866,
-	ts + 1876,
+	ts + 1822,
+	ts + 1827,
+	ts + 1830,
+	ts + 1836,
+	ts + 1843,
+	ts + 1847,
+	ts + 1857,
+	ts + 1864,
+	ts + 1871,
+	ts + 1878,
 	ts + 1885,
-	ts + 1896,
-	ts + 1905,
-	ts + 1911,
-	ts + 1921,
-	ts + 1931,
-	ts + 1936,
-	ts + 1946,
-	ts + 1957,
-	ts + 1962,
-	ts + 1969,
-	ts + 1980,
-	ts + 1985,
-	ts + 1990,
-	ts + 1996,
-	ts + 2002,
-	ts + 2008,
-	ts + 2011,
+	ts + 1895,
+	ts + 1904,
+	ts + 1915,
+	ts + 1924,
+	ts + 1930,
+	ts + 1940,
+	ts + 1950,
+	ts + 1955,
+	ts + 1965,
+	ts + 1976,
+	ts + 1981,
+	ts + 1988,
+	ts + 1999,
+	ts + 2004,
+	ts + 2009,
 	ts + 2015,
 	ts + 2021,
-	ts + 2032,
-	ts + 2043,
+	ts + 2027,
+	ts + 2030,
+	ts + 2034,
+	ts + 2040,
 	ts + 2051,
-	ts + 2060,
-	ts + 2067,
-	ts + 2075,
-	ts + 2078,
-	ts + 2081,
-	ts + 2084,
-	ts + 2087,
-	ts + 2090,
-	ts + 2093,
+	ts + 2062,
+	ts + 2070,
+	ts + 2079,
+	ts + 2086,
+	ts + 2094,
+	ts + 2097,
 	ts + 2100,
+	ts + 2103,
 	ts + 2106,
-	ts + 2116,
-	ts + 2129,
-	ts + 2140,
-	ts + 2146,
-	ts + 2153,
-	ts + 2162,
-	ts + 2171,
-	ts + 2178,
-	ts + 2191,
-	ts + 2202,
-	ts + 2207,
-	ts + 2215,
+	ts + 2109,
+	ts + 2112,
+	ts + 2119,
+	ts + 2125,
+	ts + 2135,
+	ts + 2148,
+	ts + 2159,
+	ts + 2165,
+	ts + 2172,
+	ts + 2181,
+	ts + 2190,
+	ts + 2197,
+	ts + 2210,
 	ts + 2221,
-	ts + 2228,
+	ts + 2226,
+	ts + 2234,
 	ts + 2240,
-	ts + 2245,
-	ts + 2254,
+	ts + 2247,
 	ts + 2259,
-	ts + 2268,
+	ts + 2264,
 	ts + 2273,
 	ts + 2278,
-	ts + 2284,
+	ts + 2287,
 	ts + 2292,
-	ts + 2300,
-	ts + 2310,
-	ts + 2318,
-	ts + 2325,
-	ts + 2338,
-	ts + 2343,
-	ts + 2355,
-	ts + 2363,
-	ts + 2370,
-	ts + 2381,
-	ts + 2388,
-	ts + 2395,
-	ts + 2405,
+	ts + 2297,
+	ts + 2303,
+	ts + 2311,
+	ts + 2319,
+	ts + 2329,
+	ts + 2337,
+	ts + 2344,
+	ts + 2357,
+	ts + 2362,
+	ts + 2374,
+	ts + 2382,
+	ts + 2389,
+	ts + 2400,
+	ts + 2407,
 	ts + 2414,
-	ts + 2425,
-	ts + 2431,
-	ts + 2442,
-	ts + 2452,
-	ts + 2462,
-	ts + 2469,
-	ts + 2475,
-	ts + 2485,
-	ts + 2496,
-	ts + 2500,
-	ts + 2509,
-	ts + 2518,
-	ts + 2525,
-	ts + 2535,
-	ts + 2542,
-	ts + 2551,
+	ts + 2424,
+	ts + 2433,
+	ts + 2444,
+	ts + 2450,
+	ts + 2461,
+	ts + 2471,
+	ts + 2481,
+	ts + 2488,
+	ts + 2494,
+	ts + 2504,
+	ts + 2515,
+	ts + 2519,
+	ts + 2528,
+	ts + 2537,
+	ts + 2544,
+	ts + 2554,
 	ts + 2561,
-	ts + 2568,
-	ts + 2576,
-	ts + 2590,
-	ts + 2598,
-	ts + 2612,
-	ts + 2623,
-	ts + 2636,
-	ts + 2647,
-	ts + 2653,
-	ts + 2665,
-	ts + 2674,
-	ts + 2682,
-	ts + 2691,
-	ts + 2700,
-	ts + 2707,
-	ts + 2715,
-	ts + 2722,
-	ts + 2733,
-	ts + 2747,
-	ts + 2758,
+	ts + 2570,
+	ts + 2580,
+	ts + 2587,
+	ts + 2595,
+	ts + 2609,
+	ts + 2617,
+	ts + 2631,
+	ts + 2642,
+	ts + 2655,
+	ts + 2666,
+	ts + 2672,
+	ts + 2684,
+	ts + 2693,
+	ts + 2701,
+	ts + 2710,
+	ts + 2719,
+	ts + 2726,
+	ts + 2734,
+	ts + 2741,
+	ts + 2752,
 	ts + 2766,
-	ts + 2772,
-	ts + 2780,
-	ts + 2788,
-	ts + 2798,
-	ts + 2811,
-	ts + 2821,
-	ts + 2834,
-	ts + 2843,
-	ts + 2854,
+	ts + 2777,
+	ts + 2785,
+	ts + 2791,
+	ts + 2799,
+	ts + 2807,
+	ts + 2817,
+	ts + 2830,
+	ts + 2840,
+	ts + 2853,
 	ts + 2862,
-	ts + 2868,
-	ts + 2880,
-	ts + 2892,
-	ts + 2900,
-	ts + 2912,
-	ts + 2925,
-	ts + 2935,
-	ts + 2945,
-	ts + 2950,
-	ts + 2962,
-	ts + 2974,
-	ts + 2984,
-	ts + 2990,
-	ts + 3000,
-	ts + 3007,
+	ts + 2873,
+	ts + 2881,
+	ts + 2887,
+	ts + 2899,
+	ts + 2911,
+	ts + 2919,
+	ts + 2931,
+	ts + 2944,
+	ts + 2954,
+	ts + 2964,
+	ts + 2969,
+	ts + 2981,
+	ts + 2993,
+	ts + 3003,
+	ts + 3009,
 	ts + 3019,
-	ts + 3030,
+	ts + 3026,
 	ts + 3038,
-	ts + 3047,
-	ts + 3056,
-	ts + 3065,
-	ts + 3072,
-	ts + 3083,
-	ts + 3096,
-	ts + 3106,
-	ts + 3113,
-	ts + 3121,
-	ts + 3130,
-	ts + 3136,
-	ts + 3144,
-	ts + 3152,
-	ts + 3160,
-	ts + 3170,
+	ts + 3049,
+	ts + 3057,
+	ts + 3066,
+	ts + 3075,
+	ts + 3084,
+	ts + 3091,
+	ts + 3102,
+	ts + 3115,
+	ts + 3125,
+	ts + 3132,
+	ts + 3140,
+	ts + 3149,
+	ts + 3155,
+	ts + 3163,
+	ts + 3171,
 	ts + 3179,
-	ts + 3190,
-	ts + 3200,
-	ts + 3206,
-	ts + 3217,
-	ts + 3228,
-	ts + 3233,
-	ts + 3241,
+	ts + 3189,
+	ts + 3198,
+	ts + 3209,
+	ts + 3219,
+	ts + 3225,
+	ts + 3236,
+	ts + 3247,
+	ts + 3252,
+	ts + 3260,
 }
 
 type winShm = struct {
@@ -60300,86 +60305,86 @@ type win_syscall = struct {
 }
 
 var aSyscall = [80]win_syscall{
-	{FzName: ts + 3251, FpCurrent: 0},
-	{FzName: ts + 3267},
-	{FzName: ts + 3278},
-	{FzName: ts + 3289, FpCurrent: 0},
-	{FzName: ts + 3301, FpCurrent: 0},
-	{FzName: ts + 3313, FpCurrent: 0},
-	{FzName: ts + 3325, FpCurrent: 0},
+	{FzName: ts + 3270, FpCurrent: 0},
+	{FzName: ts + 3286},
+	{FzName: ts + 3297},
+	{FzName: ts + 3308, FpCurrent: 0},
+	{FzName: ts + 3320, FpCurrent: 0},
+	{FzName: ts + 3332, FpCurrent: 0},
 	{FzName: ts + 3344, FpCurrent: 0},
 	{FzName: ts + 3363, FpCurrent: 0},
-	{FzName: ts + 3376, FpCurrent: 0},
-	{FzName: ts + 3388, FpCurrent: 0},
-	{FzName: ts + 3400},
-	{FzName: ts + 3424},
-	{FzName: ts + 3445, FpCurrent: 0},
-	{FzName: ts + 3462, FpCurrent: 0},
-	{FzName: ts + 3477, FpCurrent: 0},
-	{FzName: ts + 3492, FpCurrent: 0},
-	{FzName: ts + 3504, FpCurrent: 0},
-	{FzName: ts + 3524, FpCurrent: 0},
-	{FzName: ts + 3542, FpCurrent: 0},
-	{FzName: ts + 3560, FpCurrent: 0},
+	{FzName: ts + 3382, FpCurrent: 0},
+	{FzName: ts + 3395, FpCurrent: 0},
+	{FzName: ts + 3407, FpCurrent: 0},
+	{FzName: ts + 3419},
+	{FzName: ts + 3443},
+	{FzName: ts + 3464, FpCurrent: 0},
+	{FzName: ts + 3481, FpCurrent: 0},
+	{FzName: ts + 3496, FpCurrent: 0},
+	{FzName: ts + 3511, FpCurrent: 0},
+	{FzName: ts + 3523, FpCurrent: 0},
+	{FzName: ts + 3543, FpCurrent: 0},
+	{FzName: ts + 3561, FpCurrent: 0},
 	{FzName: ts + 3579, FpCurrent: 0},
 	{FzName: ts + 3598, FpCurrent: 0},
-	{FzName: ts + 3619, FpCurrent: 0},
-	{FzName: ts + 3631, FpCurrent: 0},
-	{FzName: ts + 3648, FpCurrent: 0},
-	{FzName: ts + 3665, FpCurrent: 0},
-	{FzName: ts + 3678, FpCurrent: 0},
-	{FzName: ts + 3694, FpCurrent: 0},
-	{FzName: ts + 3708, FpCurrent: 0},
-	{FzName: ts + 3722, FpCurrent: 0},
-	{FzName: ts + 3746, FpCurrent: 0},
-	{FzName: ts + 3759, FpCurrent: 0},
-	{FzName: ts + 3772, FpCurrent: 0},
-	{FzName: ts + 3785, FpCurrent: 0},
-	{FzName: ts + 3799, FpCurrent: 0},
-	{FzName: ts + 3813, FpCurrent: 0},
-	{FzName: ts + 3823, FpCurrent: 0},
-	{FzName: ts + 3834, FpCurrent: 0},
-	{FzName: ts + 3846, FpCurrent: 0},
-	{FzName: ts + 3855, FpCurrent: 0},
-	{FzName: ts + 3867, FpCurrent: 0},
-	{FzName: ts + 3876, FpCurrent: 0},
-	{FzName: ts + 3889, FpCurrent: 0},
-	{FzName: ts + 3901, FpCurrent: 0},
-	{FzName: ts + 3914, FpCurrent: 0},
-	{FzName: ts + 3927, FpCurrent: 0},
-	{FzName: ts + 3937, FpCurrent: 0},
+	{FzName: ts + 3617, FpCurrent: 0},
+	{FzName: ts + 3638, FpCurrent: 0},
+	{FzName: ts + 3650, FpCurrent: 0},
+	{FzName: ts + 3667, FpCurrent: 0},
+	{FzName: ts + 3684, FpCurrent: 0},
+	{FzName: ts + 3697, FpCurrent: 0},
+	{FzName: ts + 3713, FpCurrent: 0},
+	{FzName: ts + 3727, FpCurrent: 0},
+	{FzName: ts + 3741, FpCurrent: 0},
+	{FzName: ts + 3765, FpCurrent: 0},
+	{FzName: ts + 3778, FpCurrent: 0},
+	{FzName: ts + 3791, FpCurrent: 0},
+	{FzName: ts + 3804, FpCurrent: 0},
+	{FzName: ts + 3818, FpCurrent: 0},
+	{FzName: ts + 3832, FpCurrent: 0},
+	{FzName: ts + 3842, FpCurrent: 0},
+	{FzName: ts + 3853, FpCurrent: 0},
+	{FzName: ts + 3865, FpCurrent: 0},
+	{FzName: ts + 3874, FpCurrent: 0},
+	{FzName: ts + 3886, FpCurrent: 0},
+	{FzName: ts + 3895, FpCurrent: 0},
+	{FzName: ts + 3908, FpCurrent: 0},
+	{FzName: ts + 3920, FpCurrent: 0},
+	{FzName: ts + 3933, FpCurrent: 0},
 	{FzName: ts + 3946, FpCurrent: 0},
-	{FzName: ts + 3957, FpCurrent: 0},
-	{FzName: ts + 3971, FpCurrent: 0},
-	{FzName: ts + 3991, FpCurrent: 0},
-	{FzName: ts + 4015, FpCurrent: 0},
-	{FzName: ts + 4024, FpCurrent: 0},
-	{FzName: ts + 4037, FpCurrent: 0},
-	{FzName: ts + 4052, FpCurrent: 0},
-	{FzName: ts + 4058, FpCurrent: 0},
-	{FzName: ts + 4079, FpCurrent: 0},
-	{FzName: ts + 4090, FpCurrent: 0},
-	{FzName: ts + 4103, FpCurrent: 0},
-	{FzName: ts + 4119, FpCurrent: 0},
-	{FzName: ts + 4139, FpCurrent: 0},
-	{FzName: ts + 4149},
-	{FzName: ts + 4164, FpCurrent: 0},
-	{FzName: ts + 4184, FpCurrent: 0},
-	{FzName: ts + 4206},
-	{FzName: ts + 4223},
-	{FzName: ts + 4252},
-	{FzName: ts + 4273},
-	{FzName: ts + 4285},
-	{FzName: ts + 4305},
-	{FzName: ts + 4320},
-	{FzName: ts + 4340, FpCurrent: 0},
+	{FzName: ts + 3956, FpCurrent: 0},
+	{FzName: ts + 3965, FpCurrent: 0},
+	{FzName: ts + 3976, FpCurrent: 0},
+	{FzName: ts + 3990, FpCurrent: 0},
+	{FzName: ts + 4010, FpCurrent: 0},
+	{FzName: ts + 4034, FpCurrent: 0},
+	{FzName: ts + 4043, FpCurrent: 0},
+	{FzName: ts + 4056, FpCurrent: 0},
+	{FzName: ts + 4071, FpCurrent: 0},
+	{FzName: ts + 4077, FpCurrent: 0},
+	{FzName: ts + 4098, FpCurrent: 0},
+	{FzName: ts + 4109, FpCurrent: 0},
+	{FzName: ts + 4122, FpCurrent: 0},
+	{FzName: ts + 4138, FpCurrent: 0},
+	{FzName: ts + 4158, FpCurrent: 0},
+	{FzName: ts + 4168},
+	{FzName: ts + 4183, FpCurrent: 0},
+	{FzName: ts + 4203, FpCurrent: 0},
+	{FzName: ts + 4225},
+	{FzName: ts + 4242},
+	{FzName: ts + 4271},
+	{FzName: ts + 4292},
+	{FzName: ts + 4304},
+	{FzName: ts + 4324},
+	{FzName: ts + 4339},
 	{FzName: ts + 4359, FpCurrent: 0},
 	{FzName: ts + 4378, FpCurrent: 0},
-	{FzName: ts + 4393},
-	{FzName: ts + 4418},
-	{FzName: ts + 4445},
-	{FzName: ts + 4456},
-	{FzName: ts + 4477, FpCurrent: 0},
+	{FzName: ts + 4397, FpCurrent: 0},
+	{FzName: ts + 4412},
+	{FzName: ts + 4437},
+	{FzName: ts + 4464},
+	{FzName: ts + 4475},
+	{FzName: ts + 4496, FpCurrent: 0},
 }
 
 func winSetSystemCall(tls *libc.TLS, pNotUsed uintptr, zName uintptr, pNewFunc Sqlite3_syscall_ptr) int32 {
@@ -60708,7 +60713,7 @@ __3:
 	if !(zValue != 0 && *(*int8)(unsafe.Pointer(zValue)) != 0) {
 		goto __7
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, zValue))
+	zCopy = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, zValue))
 	if !(zCopy == uintptr(0)) {
 		goto __8
 	}
@@ -60799,9 +60804,9 @@ func winGetLastErrorMsg(tls *libc.TLS, lastErrno DWORD, nBuf int32, zBuf uintptr
 		}
 	}
 	if DWORD(0) == dwLen {
-		Xsqlite3_snprintf(tls, nBuf, zBuf, ts+4496, libc.VaList(bp, lastErrno, lastErrno))
+		Xsqlite3_snprintf(tls, nBuf, zBuf, ts+4515, libc.VaList(bp, lastErrno, lastErrno))
 	} else {
-		Xsqlite3_snprintf(tls, nBuf, zBuf, ts+4493, libc.VaList(bp+16, zOut))
+		Xsqlite3_snprintf(tls, nBuf, zBuf, ts+4512, libc.VaList(bp+16, zOut))
 
 		Xsqlite3_free(tls, zOut)
 	}
@@ -60818,13 +60823,13 @@ func winLogErrorAtLine(tls *libc.TLS, errcode int32, lastErrno DWORD, zFunc uint
 	winGetLastErrorMsg(tls, lastErrno, int32(unsafe.Sizeof([500]int8{})), bp+40)
 
 	if zPath == uintptr(0) {
-		zPath = ts + 1544
+		zPath = ts + 1563
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(bp + 40 + uintptr(i))) != 0 && int32(*(*int8)(unsafe.Pointer(bp + 40 + uintptr(i)))) != '\r' && int32(*(*int8)(unsafe.Pointer(bp + 40 + uintptr(i)))) != '\n'; i++ {
 	}
 	*(*int8)(unsafe.Pointer(bp + 40 + uintptr(i))) = int8(0)
 	Xsqlite3_log(tls, errcode,
-		ts+4516,
+		ts+4535,
 		libc.VaList(bp, iLine, lastErrno, zFunc, zPath, bp+40))
 
 	return errcode
@@ -60858,7 +60863,7 @@ func winLogIoerr(tls *libc.TLS, nRetry int32, lineno int32) {
 
 	if nRetry != 0 {
 		Xsqlite3_log(tls, SQLITE_NOTICE,
-			ts+4547,
+			ts+4566,
 			libc.VaList(bp, winIoerrRetryDelay*nRetry*(nRetry+1)/2, lineno))
 	}
 }
@@ -60911,7 +60916,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, 47684)
+		winLogErrorAtLine(tls, SQLITE_IOERR|int32(22)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4616, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47688)
 
 		return 1
 	}
@@ -60937,7 +60942,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, 47780)
+	return winLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4628, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47784)
 }
 
 func winRead(tls *libc.TLS, id uintptr, pBuf uintptr, amt int32, offset Sqlite3_int64) int32 {
@@ -60971,9 +60976,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, 47848)
+		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(1)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4637, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47852)
 	}
-	winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 47851)
+	winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 47855)
 	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))))
 
@@ -61029,12 +61034,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, 47960)
+			return winLogErrorAtLine(tls, SQLITE_FULL, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4645, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47964)
 		}
 
-		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(3)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4636, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47965)
+		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(3)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4655, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47969)
 	} else {
-		winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 47968)
+		winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 47972)
 	}
 
 	return SQLITE_OK
@@ -61061,10 +61066,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, 48031)
+		rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4665, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48035)
 	} 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, 48036)
+		rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4678, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48040)
 	}
 
 	if rc == SQLITE_OK && oldMmapSize > int64(0) {
@@ -61090,7 +61095,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, 48128)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4691, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48132)
 		}
 	}
 	rc = (*(*func(*libc.TLS, HANDLE) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 13*24 + 8)))(tls, (*WinFile)(unsafe.Pointer(pFile)).Fh)
@@ -61100,7 +61105,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, 48143)
+		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4700, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48147)
 	}
 	return int32(0)
 }
@@ -61121,7 +61126,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, 48184)
+			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(7)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4709, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48188)
 		}
 
 	}
@@ -61163,7 +61168,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, 48279)
+		winLogErrorAtLine(tls, SQLITE_IOERR|int32(8)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4721, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48283)
 	}
 
 	return res
@@ -61289,7 +61294,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, 48505)
+			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(8)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4739, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48509)
 		}
 	}
 	if type1 >= RESERVED_LOCK {
@@ -61396,7 +61401,7 @@ func winFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) int32 {
 		}
 	case SQLITE_FCNTL_VFSNAME:
 		{
-			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*WinFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
+			*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, (*Sqlite3_vfs)(unsafe.Pointer((*WinFile)(unsafe.Pointer(pFile)).FpVfs)).FzName))
 
 			return SQLITE_OK
 
@@ -61592,7 +61597,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, 48971)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4749, (*WinShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 48975)
 		}
 	}
 
@@ -61634,7 +61639,7 @@ __1:
 __2:
 	;
 	(*WinShmNode)(unsafe.Pointer(pNew)).FzFilename = pNew + 1*160
-	Xsqlite3_snprintf(tls, nName+15, (*WinShmNode)(unsafe.Pointer(pNew)).FzFilename, ts+4750, libc.VaList(bp, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath))
+	Xsqlite3_snprintf(tls, nName+15, (*WinShmNode)(unsafe.Pointer(pNew)).FzFilename, ts+4769, libc.VaList(bp, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath))
 
 	winShmEnterMutex(tls)
 	pShmNode = winShmNodeList
@@ -61684,7 +61689,7 @@ __10:
 	;
 __9:
 	;
-	if !(0 == Xsqlite3_uri_boolean(tls, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, ts+4757, 0)) {
+	if !(0 == Xsqlite3_uri_boolean(tls, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, ts+4776, 0)) {
 		goto __11
 	}
 	inFlags = inFlags | (SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE)
@@ -61699,7 +61704,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, 49053)
+	rc = winLogErrorAtLine(tls, rc, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4789, (*WinShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 49057)
 	goto shm_open_err
 __13:
 	;
@@ -61927,7 +61932,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, 49324)
+	rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4800, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, 49328)
 	goto shmpage_out
 __6:
 	;
@@ -61945,7 +61950,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, 49339)
+	rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4811, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, 49343)
 	goto shmpage_out
 __9:
 	;
@@ -61993,7 +61998,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, 49398)
+	rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, (*WinShmNode)(unsafe.Pointer(pShmNode)).FlastErrno, ts+4822, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, 49402)
 	if !(hMap != 0) {
 		goto __16
 	}
@@ -62039,7 +62044,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, 49447)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4833, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 49451)
 		}
 		(*WinFile)(unsafe.Pointer(pFile)).FpMapRegion = uintptr(0)
 		(*WinFile)(unsafe.Pointer(pFile)).FmmapSize = int64(0)
@@ -62048,7 +62053,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, 49458)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4847, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 49462)
 		}
 		(*WinFile)(unsafe.Pointer(pFile)).FhMap = uintptr(0)
 	}
@@ -62092,7 +62097,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, 49535)
+			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFd)).FlastErrno, ts+4861, (*WinFile)(unsafe.Pointer(pFd)).FzPath, 49539)
 
 			return SQLITE_OK
 		}
@@ -62102,7 +62107,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, 49553)
+			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFd)).FlastErrno, ts+4873, (*WinFile)(unsafe.Pointer(pFd)).FzPath, 49557)
 
 			return SQLITE_OK
 		}
@@ -62240,7 +62245,7 @@ func winGetTempname(tls *libc.TLS, pVfs uintptr, pzBuf uintptr) int32 {
 
 	var i Size_t
 	var j Size_t
-	var nPre int32 = Xsqlite3Strlen30(tls, ts+4866)
+	var nPre int32 = Xsqlite3Strlen30(tls, ts+4885)
 	var nMax int32
 	var nBuf int32
 	var nDir int32
@@ -62266,9 +62271,9 @@ 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), 49855)
+				return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4893, uintptr(0), 49859)
 			}
-			Xsqlite3_snprintf(tls, nMax, zBuf, ts+4493, libc.VaList(bp, Xsqlite3_temp_directory))
+			Xsqlite3_snprintf(tls, nMax, zBuf, ts+4512, libc.VaList(bp, Xsqlite3_temp_directory))
 		}
 		Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	} else if sqlite3_os_type == 2 || Xsqlite3_win32_is_nt(tls) != 0 {
@@ -62283,11 +62288,11 @@ 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), 49955)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(25)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4909, uintptr(0), 49959)
 		}
 		zMulti = winUnicodeToUtf8(tls, zWidePath)
 		if zMulti != 0 {
-			Xsqlite3_snprintf(tls, nMax, zBuf, ts+4493, libc.VaList(bp+8, zMulti))
+			Xsqlite3_snprintf(tls, nMax, zBuf, ts+4512, libc.VaList(bp+8, zMulti))
 			Xsqlite3_free(tls, zMulti)
 			Xsqlite3_free(tls, zWidePath)
 		} else {
@@ -62307,11 +62312,11 @@ 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), 49982)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(25)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4925, uintptr(0), 49986)
 		}
 		zUtf8 = winMbcsToUtf8(tls, zMbcsPath, (*(*func(*libc.TLS) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls))
 		if zUtf8 != 0 {
-			Xsqlite3_snprintf(tls, nMax, zBuf, ts+4493, libc.VaList(bp+16, zUtf8))
+			Xsqlite3_snprintf(tls, nMax, zBuf, ts+4512, libc.VaList(bp+16, zUtf8))
 			Xsqlite3_free(tls, zUtf8)
 		} else {
 			Xsqlite3_free(tls, zBuf)
@@ -62323,17 +62328,17 @@ 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), 50006)
+		return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4941, uintptr(0), 50010)
 	}
 
 	nLen = Xsqlite3Strlen30(tls, zBuf)
 	if nLen+nPre+17 > nBuf {
 		Xsqlite3_free(tls, zBuf)
 
-		return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4938, uintptr(0), 50024)
+		return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4957, uintptr(0), 50028)
 	}
 
-	Xsqlite3_snprintf(tls, nBuf-16-nLen, zBuf+uintptr(nLen), ts+4866, 0)
+	Xsqlite3_snprintf(tls, nBuf-16-nLen, zBuf+uintptr(nLen), ts+4885, 0)
 
 	j = Size_t(Xsqlite3Strlen30(tls, zBuf))
 	Xsqlite3_randomness(tls, 15, zBuf+uintptr(j))
@@ -62361,7 +62366,7 @@ __3:
 	return SQLITE_OK
 }
 
-var zChars = *(*[63]int8)(unsafe.Pointer(ts + 4954))
+var zChars = *(*[63]int8)(unsafe.Pointer(ts + 4973))
 
 func winIsDir(tls *libc.TLS, zConverted uintptr) int32 {
 	bp := tls.Alloc(44)
@@ -62453,7 +62458,7 @@ func winOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, id uintptr, flags int32
 		dwCreationDisposition = DWORD(OPEN_EXISTING)
 	}
 
-	if 0 == Xsqlite3_uri_boolean(tls, zName, ts+5017, 0) {
+	if 0 == Xsqlite3_uri_boolean(tls, zName, ts+5036, 0) {
 		dwShareMode = DWORD(FILE_SHARE_READ | FILE_SHARE_WRITE)
 	} else {
 		dwShareMode = DWORD(0)
@@ -62512,7 +62517,7 @@ func winOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, id uintptr, flags int32
 			}
 		}
 	}
-	winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 8)), 50313)
+	winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 8)), 50317)
 
 	if h == libc.UintptrFromInt64(int64(-1)) {
 		Xsqlite3_free(tls, zConverted)
@@ -62523,8 +62528,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, 50328)
-			return Xsqlite3CantopenError(tls, 50329)
+			winLogErrorAtLine(tls, SQLITE_CANTOPEN, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+5046, zUtf8Name, 50332)
+			return Xsqlite3CantopenError(tls, 50333)
 		}
 	}
 
@@ -62556,7 +62561,7 @@ func winOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, id uintptr, flags int32
 		*(*U8)(unsafe.Pointer(pFile + 28)) |= U8(WINFILE_RDONLY)
 	}
 	if flags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+5035, SQLITE_POWERSAFE_OVERWRITE) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+5054, SQLITE_POWERSAFE_OVERWRITE) != 0 {
 		*(*U8)(unsafe.Pointer(pFile + 28)) |= U8(WINFILE_PSOW)
 	}
 	(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = DWORD(0)
@@ -62639,9 +62644,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, 50501)
+		rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, *(*DWORD)(unsafe.Pointer(bp + 4)), ts+5059, zFilename, 50505)
 	} else {
-		winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp)), 50503)
+		winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp)), 50507)
 	}
 	Xsqlite3_free(tls, zConverted)
 
@@ -62679,10 +62684,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)), 50553)
+			winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 50557)
 			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, 50556)
+				return winLogErrorAtLine(tls, SQLITE_IOERR|int32(13)<<8, *(*DWORD)(unsafe.Pointer(bp + 40)), ts+5069, zFilename, 50560)
 			} else {
 				attr = libc.Uint32(libc.Uint32FromInt32(-1))
 			}
@@ -62747,7 +62752,7 @@ func winFullPathnameNoMutex(tls *libc.TLS, pVfs uintptr, zRelative uintptr, nFul
 				return nFull
 			}
 			return (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FmxPathname
-		}(), zFull, ts+5060,
+		}(), zFull, ts+5079,
 			libc.VaList(bp, Xsqlite3_data_directory, '\\', zRelative))
 		return SQLITE_OK
 	}
@@ -62760,7 +62765,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, 50773)
+			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5086, zRelative, 50777)
 		}
 		nByte = nByte + DWORD(3)
 		zTemp = Xsqlite3MallocZero(tls, uint64(nByte)*uint64(unsafe.Sizeof(WCHAR(0))))
@@ -62772,7 +62777,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, 50786)
+			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5103, zRelative, 50790)
 		}
 		Xsqlite3_free(tls, zConverted)
 		zOut = winUnicodeToUtf8(tls, zTemp)
@@ -62782,7 +62787,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, 50799)
+			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5120, zRelative, 50803)
 		}
 		nByte = nByte + DWORD(3)
 		zTemp = Xsqlite3MallocZero(tls, uint64(nByte)*uint64(unsafe.Sizeof(int8(0))))
@@ -62794,7 +62799,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, 50812)
+			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5137, zRelative, 50816)
 		}
 		Xsqlite3_free(tls, zConverted)
 		zOut = winMbcsToUtf8(tls, zTemp, (*(*func(*libc.TLS) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls))
@@ -62806,7 +62811,7 @@ func winFullPathnameNoMutex(tls *libc.TLS, pVfs uintptr, zRelative uintptr, nFul
 				return nFull
 			}
 			return (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FmxPathname
-		}(), zFull, ts+4493, libc.VaList(bp+24, zOut))
+		}(), zFull, ts+4512, libc.VaList(bp+24, zOut))
 		Xsqlite3_free(tls, zOut)
 		return SQLITE_OK
 	} else {
@@ -62989,7 +62994,7 @@ var winVfs = Sqlite3_vfs{
 	FiVersion:          3,
 	FszOsFile:          int32(unsafe.Sizeof(WinFile{})),
 	FmxPathname:        MAX_PATH * 4,
-	FzName:             ts + 5135,
+	FzName:             ts + 5154,
 	FpAppData:          0,
 	FxOpen:             0,
 	FxDelete:           0,
@@ -63012,7 +63017,7 @@ var winLongPathVfs = Sqlite3_vfs{
 	FiVersion:          3,
 	FszOsFile:          int32(unsafe.Sizeof(WinFile{})),
 	FmxPathname:        int32(uint64(unsafe.Sizeof(WCHAR(0))) * uint64(32767)),
-	FzName:             ts + 5141,
+	FzName:             ts + 5160,
 	FpAppData:          0,
 	FxOpen:             0,
 	FxDelete:           0,
@@ -63035,7 +63040,7 @@ var winNolockVfs = Sqlite3_vfs{
 	FiVersion:          3,
 	FszOsFile:          int32(unsafe.Sizeof(WinFile{})),
 	FmxPathname:        MAX_PATH * 4,
-	FzName:             ts + 5156,
+	FzName:             ts + 5175,
 	FpAppData:          0,
 	FxOpen:             0,
 	FxDelete:           0,
@@ -63058,7 +63063,7 @@ var winLongPathNolockVfs = Sqlite3_vfs{
 	FiVersion:          3,
 	FszOsFile:          int32(unsafe.Sizeof(WinFile{})),
 	FmxPathname:        int32(uint64(unsafe.Sizeof(WCHAR(0))) * uint64(32767)),
-	FzName:             ts + 5167,
+	FzName:             ts + 5186,
 	FpAppData:          0,
 	FxOpen:             0,
 	FxDelete:           0,
@@ -63126,7 +63131,7 @@ var memdb_g MemFS
 var memdb_vfs = Sqlite3_vfs{
 	FiVersion:          2,
 	FmxPathname:        1024,
-	FzName:             ts + 5187,
+	FzName:             ts + 5206,
 	FxOpen:             0,
 	FxAccess:           0,
 	FxFullPathname:     0,
@@ -63382,7 +63387,7 @@ func memdbFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int3
 	var rc int32 = SQLITE_NOTFOUND
 	memdbEnter(tls, p)
 	if op == SQLITE_FCNTL_VFSNAME {
-		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+5193, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
+		*(*uintptr)(unsafe.Pointer(pArg)) = Xsqlite3_mprintf(tls, ts+5212, libc.VaList(bp, (*MemStore)(unsafe.Pointer(p)).FaData, (*MemStore)(unsafe.Pointer(p)).Fsz))
 		rc = SQLITE_OK
 	}
 	if op == SQLITE_FCNTL_SIZE_LIMIT {
@@ -63514,7 +63519,7 @@ func memdbFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, z
 	defer tls.Free(8)
 
 	_ = pVfs
-	Xsqlite3_snprintf(tls, nOut, zOut, ts+4493, libc.VaList(bp, zPath))
+	Xsqlite3_snprintf(tls, nOut, zOut, ts+4512, libc.VaList(bp, zPath))
 	return SQLITE_OK
 }
 
@@ -63635,7 +63640,7 @@ func Xsqlite3_serialize(tls *libc.TLS, db uintptr, zSchema uintptr, piSize uintp
 		return uintptr(0)
 	}
 	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
-	zSql = Xsqlite3_mprintf(tls, ts+5208, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+5227, libc.VaList(bp, zSchema))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, db, zSql, -1, bp+8, uintptr(0))
 	} else {
@@ -63708,7 +63713,7 @@ __1:
 	goto end_deserialize
 __2:
 	;
-	zSql = Xsqlite3_mprintf(tls, ts+5231, libc.VaList(bp, zSchema))
+	zSql = Xsqlite3_mprintf(tls, ts+5250, libc.VaList(bp, zSchema))
 	if !(zSql == uintptr(0)) {
 		goto __3
 	}
@@ -64424,7 +64429,7 @@ func pcacheFetchFinishWithInit(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 	libc.Xmemset(tls, pPgHdr+32, 0, uint64(unsafe.Sizeof(PgHdr{}))-uint64(uintptr(0)+32))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpPage = pPage
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpData = (*Sqlite3_pcache_page)(unsafe.Pointer(pPage)).FpBuf
-	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*72
+	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra = pPgHdr + 1*80
 	libc.Xmemset(tls, (*PgHdr)(unsafe.Pointer(pPgHdr)).FpExtra, 0, uint64(8))
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).FpCache = pCache
 	(*PgHdr)(unsafe.Pointer(pPgHdr)).Fpgno = pgno
@@ -64454,7 +64459,7 @@ func Xsqlite3PcacheFetchFinish(tls *libc.TLS, pCache uintptr, pgno Pgno, pPage u
 // reference count drops to 0, then it is made eligible for recycling.
 func Xsqlite3PcacheRelease(tls *libc.TLS, p uintptr) {
 	(*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FnRefSum--
-	if int32(libc.PreDecInt16(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1)) == 0 {
+	if libc.PreDecInt64(&(*PgHdr)(unsafe.Pointer(p)).FnRef, 1) == int64(0) {
 		if int32((*PgHdr)(unsafe.Pointer(p)).Fflags)&PGHDR_CLEAN != 0 {
 			pcacheUnpin(tls, p)
 		} else {
@@ -64505,7 +64510,7 @@ func Xsqlite3PcacheMakeClean(tls *libc.TLS, p uintptr) {
 	*(*U16)(unsafe.Pointer(p + 52)) &= libc.Uint16FromInt32(libc.CplInt32(PGHDR_DIRTY | PGHDR_NEED_SYNC | PGHDR_WRITEABLE))
 	*(*U16)(unsafe.Pointer(p + 52)) |= U16(PGHDR_CLEAN)
 
-	if int32((*PgHdr)(unsafe.Pointer(p)).FnRef) == 0 {
+	if (*PgHdr)(unsafe.Pointer(p)).FnRef == int64(0) {
 		pcacheUnpin(tls, p)
 	}
 }
@@ -64609,8 +64614,8 @@ func Xsqlite3PcacheClear(tls *libc.TLS, pCache uintptr) {
 }
 
 func pcacheMergeDirtyList(tls *libc.TLS, pA uintptr, pB uintptr) uintptr {
-	bp := tls.Alloc(72)
-	defer tls.Free(72)
+	bp := tls.Alloc(80)
+	defer tls.Free(80)
 
 	var pTail uintptr
 	pTail = bp
@@ -64688,13 +64693,13 @@ func Xsqlite3PcacheDirtyList(tls *libc.TLS, pCache uintptr) uintptr {
 //
 // This is not the total number of pages referenced, but the sum of the
 // reference count for all pages.
-func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) int32 {
+func Xsqlite3PcacheRefCount(tls *libc.TLS, pCache uintptr) I64 {
 	return (*PCache)(unsafe.Pointer(pCache)).FnRefSum
 }
 
 // Return the number of references to the page supplied as an argument.
-func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) int32 {
-	return int32((*PgHdr)(unsafe.Pointer(p)).FnRef)
+func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) I64 {
+	return (*PgHdr)(unsafe.Pointer(p)).FnRef
 }
 
 // Return the total number of pages in the cache.
@@ -66923,7 +66928,7 @@ __27:
 	if !(isHot != 0 && nPlayback != 0) {
 		goto __28
 	}
-	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+5246,
+	Xsqlite3_log(tls, SQLITE_NOTICE|int32(2)<<8, ts+5265,
 		libc.VaList(bp, nPlayback, (*Pager)(unsafe.Pointer(pPager)).FzJournal))
 __28:
 	;
@@ -66988,7 +66993,7 @@ func pagerUndoCallback(tls *libc.TLS, pCtx uintptr, iPg Pgno) int32 {
 
 	pPg = Xsqlite3PagerLookup(tls, pPager, iPg)
 	if pPg != 0 {
-		if Xsqlite3PcachePageRefcount(tls, pPg) == 1 {
+		if Xsqlite3PcachePageRefcount(tls, pPg) == int64(1) {
 			Xsqlite3PcacheDrop(tls, pPg)
 		} else {
 			rc = readDbPage(tls, pPg)
@@ -67421,7 +67426,7 @@ func Xsqlite3PagerSetPagesize(tls *libc.TLS, pPager uintptr, pPageSize uintptr,
 	var pageSize U32 = *(*U32)(unsafe.Pointer(pPageSize))
 
 	if (int32((*Pager)(unsafe.Pointer(pPager)).FmemDb) == 0 || (*Pager)(unsafe.Pointer(pPager)).FdbSize == Pgno(0)) &&
-		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 &&
+		Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) &&
 		pageSize != 0 && pageSize != U32((*Pager)(unsafe.Pointer(pPager)).FpageSize) {
 		var pNew uintptr = uintptr(0)
 		*(*I64)(unsafe.Pointer(bp)) = int64(0)
@@ -67573,9 +67578,9 @@ func pagerAcquireMapPage(tls *libc.TLS, pPager uintptr, pgno Pgno, pData uintptr
 			Xsqlite3OsUnfetch(tls, (*Pager)(unsafe.Pointer(pPager)).Ffd, I64(pgno-Pgno(1))*(*Pager)(unsafe.Pointer(pPager)).FpageSize, pData)
 			return SQLITE_NOMEM
 		}
-		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*72
+		(*PgHdr)(unsafe.Pointer(p)).FpExtra = p + 1*80
 		(*PgHdr)(unsafe.Pointer(p)).Fflags = U16(PGHDR_MMAP)
-		(*PgHdr)(unsafe.Pointer(p)).FnRef = int16(1)
+		(*PgHdr)(unsafe.Pointer(p)).FnRef = int64(1)
 		(*PgHdr)(unsafe.Pointer(p)).FpPager = pPager
 	}
 
@@ -67907,7 +67912,7 @@ func Xsqlite3PagerFlush(tls *libc.TLS, pPager uintptr) int32 {
 
 		for rc == SQLITE_OK && pList != 0 {
 			var pNext uintptr = (*PgHdr)(unsafe.Pointer(pList)).FpDirty
-			if int32((*PgHdr)(unsafe.Pointer(pList)).FnRef) == 0 {
+			if (*PgHdr)(unsafe.Pointer(pList)).FnRef == int64(0) {
 				rc = pagerStress(tls, pPager, pList)
 			}
 			pList = pNext
@@ -68057,7 +68062,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 60235)
+	rc = Xsqlite3CantopenError(tls, 60239)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -68118,7 +68123,7 @@ __15:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzJournal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+5273, uint64(8))
+	libc.Xmemcpy(tls, pPtr, ts+5292, uint64(8))
 	pPtr += uintptr(8 + 1)
 	goto __19
 __18:
@@ -68131,7 +68136,7 @@ __19:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzWal = pPtr
 	libc.Xmemcpy(tls, pPtr, zPathname, uint64(nPathname))
 	pPtr += uintptr(nPathname)
-	libc.Xmemcpy(tls, pPtr, ts+5282, uint64(4))
+	libc.Xmemcpy(tls, pPtr, ts+5301, uint64(4))
 	pPtr += uintptr(4 + 1)
 	goto __21
 __20:
@@ -68183,9 +68188,9 @@ __27:
 	;
 __26:
 	;
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+5287, 0))
+	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoLock = U8(Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+5306, 0))
 	if !(iDc&SQLITE_IOCAP_IMMUTABLE != 0 ||
-		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+5294, 0) != 0) {
+		Xsqlite3_uri_boolean(tls, (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FzFilename, ts+5313, 0) != 0) {
 		goto __30
 	}
 	vfsFlags = vfsFlags | SQLITE_OPEN_READONLY
@@ -68438,7 +68443,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60754)
+	rc = Xsqlite3CantopenError(tls, 60758)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -68544,7 +68549,7 @@ __24:
 }
 
 func pagerUnlockIfUnused(tls *libc.TLS, pPager uintptr) {
-	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == 0 {
+	if Xsqlite3PcacheRefCount(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache) == int64(0) {
 		pagerUnlockAndRollback(tls, pPager)
 	}
 }
@@ -68562,7 +68567,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60967)
+	return Xsqlite3CorruptError(tls, 60971)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -68601,7 +68606,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60999)
+	rc = Xsqlite3CorruptError(tls, 61003)
 	goto pager_acquire_err
 __7:
 	;
@@ -68678,7 +68683,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, 61078)
+		return Xsqlite3CorruptError(tls, 61082)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -69436,7 +69441,7 @@ func Xsqlite3PagerMemUsed(tls *libc.TLS, pPager uintptr) int32 {
 
 // Return the number of references to the specified page.
 func Xsqlite3PagerPageRefcount(tls *libc.TLS, pPage uintptr) int32 {
-	return Xsqlite3PcachePageRefcount(tls, pPage)
+	return int32(Xsqlite3PcachePageRefcount(tls, pPage))
 }
 
 // Parameter eStat must be one of SQLITE_DBSTATUS_CACHE_HIT, _MISS, _WRITE,
@@ -69679,9 +69684,9 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	pPgOld = Xsqlite3PagerLookup(tls, pPager, pgno)
 
 	if pPgOld != 0 {
-		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
+		if (*PgHdr)(unsafe.Pointer(pPgOld)).FnRef > int64(1) {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62623)
+			return Xsqlite3CorruptError(tls, 62627)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -69866,7 +69871,7 @@ func Xsqlite3PagerClearCache(tls *libc.TLS, pPager uintptr) {
 func Xsqlite3PagerCheckpoint(tls *libc.TLS, pPager uintptr, db uintptr, eMode int32, pnLog uintptr, pnCkpt uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal == uintptr(0) && int32((*Pager)(unsafe.Pointer(pPager)).FjournalMode) == PAGER_JOURNALMODE_WAL {
-		Xsqlite3_exec(tls, db, ts+5304, uintptr(0), uintptr(0), uintptr(0))
+		Xsqlite3_exec(tls, db, ts+5323, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if (*Pager)(unsafe.Pointer(pPager)).FpWal != 0 {
 		rc = Xsqlite3WalCheckpoint(tls, (*Pager)(unsafe.Pointer(pPager)).FpWal, db, eMode,
@@ -70438,7 +70443,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, 64387)
+				return Xsqlite3CorruptError(tls, 64391)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -70537,7 +70542,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64519)
+	rc = Xsqlite3CantopenError(tls, 64523)
 	goto finished
 __7:
 	;
@@ -70705,7 +70710,7 @@ __24:
 		goto __30
 	}
 	Xsqlite3_log(tls, SQLITE_NOTICE|int32(1)<<8,
-		ts+5322,
+		ts+5341,
 		libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 __30:
 	;
@@ -71123,7 +71128,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65333)
+	rc = Xsqlite3CorruptError(tls, 65337)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -71268,7 +71273,7 @@ func walLimitSize(tls *libc.TLS, pWal uintptr, nMax I64) {
 	}
 	Xsqlite3EndBenignMalloc(tls)
 	if rx != 0 {
-		Xsqlite3_log(tls, rx, ts+5359, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
+		Xsqlite3_log(tls, rx, ts+5378, libc.VaList(bp, (*Wal)(unsafe.Pointer(pWal)).FzWalName))
 	}
 }
 
@@ -71398,7 +71403,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, 65682)
+		rc = Xsqlite3CantopenError(tls, 65686)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -71871,7 +71876,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66419)
+				return Xsqlite3CorruptError(tls, 66423)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -72376,7 +72381,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, 67138)
+			rc = Xsqlite3CorruptError(tls, 67142)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -72769,7 +72774,7 @@ func Xsqlite3BtreeLeaveCursor(tls *libc.TLS, pCur uintptr) {
 	Xsqlite3BtreeLeave(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpBtree)
 }
 
-var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 5385))
+var zMagicHeader = *(*[16]int8)(unsafe.Pointer(ts + 5404))
 
 var sqlite3SharedCacheList uintptr = uintptr(0)
 
@@ -73034,7 +73039,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, 69249)
+			rc = Xsqlite3CorruptError(tls, 69253)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -73171,7 +73176,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69434)
 	return
 __2:
 	;
@@ -73188,7 +73193,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69447)
 	goto ptrmap_exit
 __4:
 	;
@@ -73196,7 +73201,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69452)
 	goto ptrmap_exit
 __5:
 	;
@@ -73239,7 +73244,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, 69493)
+		return Xsqlite3CorruptError(tls, 69497)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -73249,7 +73254,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, 69501)
+		return Xsqlite3CorruptError(tls, 69505)
 	}
 	return SQLITE_OK
 }
@@ -73499,7 +73504,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, 69893)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69897)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -73546,7 +73551,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69951)
+	return Xsqlite3CorruptError(tls, 69955)
 __2:
 	;
 	if !(iFree != 0) {
@@ -73556,7 +73561,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69954)
+	return Xsqlite3CorruptError(tls, 69958)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -73569,7 +73574,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69962)
+	return Xsqlite3CorruptError(tls, 69966)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -73578,14 +73583,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69965)
+	return Xsqlite3CorruptError(tls, 69969)
 __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, 69967)
+	return Xsqlite3CorruptError(tls, 69971)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -73595,7 +73600,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69971)
+	return Xsqlite3CorruptError(tls, 69975)
 __11:
 	;
 __8:
@@ -73659,7 +73664,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 70004)
+	return Xsqlite3CorruptError(tls, 70008)
 __22:
 	;
 	size = int32((*struct {
@@ -73669,7 +73674,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 70010)
+	return Xsqlite3CorruptError(tls, 70014)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -73691,7 +73696,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 70024)
+	return Xsqlite3CorruptError(tls, 70028)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -73726,7 +73731,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, 70081)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70085)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -73739,13 +73744,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, 70096)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70100)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70107)
 	}
 	return uintptr(0)
 }
@@ -73770,7 +73775,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, 70152)
+			return Xsqlite3CorruptError(tls, 70156)
 		}
 	}
 
@@ -73781,7 +73786,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, 70170)
+				return Xsqlite3CorruptError(tls, 70174)
 			} else {
 				return SQLITE_OK
 			}
@@ -73833,22 +73838,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 70249)
+				return Xsqlite3CorruptError(tls, 70253)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 70254)
+			return Xsqlite3CorruptError(tls, 70258)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 70266)
+				return Xsqlite3CorruptError(tls, 70270)
 			}
 			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, 70269)
+				return Xsqlite3CorruptError(tls, 70273)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -73858,7 +73863,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, 70282)
+					return Xsqlite3CorruptError(tls, 70286)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -73866,7 +73871,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, 70288)
+			return Xsqlite3CorruptError(tls, 70292)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -73874,10 +73879,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, 70297)
+			return Xsqlite3CorruptError(tls, 70301)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70298)
+			return Xsqlite3CorruptError(tls, 70302)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -73937,7 +73942,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70357)
+			return Xsqlite3CorruptError(tls, 70361)
 		}
 	} else {
 		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
@@ -73973,7 +73978,7 @@ 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)
 			}{btreeParseCellPtrIndex}))
-			return Xsqlite3CorruptError(tls, 70381)
+			return Xsqlite3CorruptError(tls, 70385)
 		}
 	}
 	return SQLITE_OK
@@ -74003,11 +74008,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70432)
+			return Xsqlite3CorruptError(tls, 70436)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70437)
+				return Xsqlite3CorruptError(tls, 70441)
 			}
 			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))))
@@ -74018,15 +74023,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70447)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70451)
+			return Xsqlite3CorruptError(tls, 70455)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70463)
+		return Xsqlite3CorruptError(tls, 70467)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -74054,14 +74059,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, 70494)
+			return Xsqlite3CorruptError(tls, 70498)
 		}
 		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, 70499)
+			return Xsqlite3CorruptError(tls, 70503)
 		}
 	}
 	return SQLITE_OK
@@ -74075,7 +74080,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, 70531)
+		return Xsqlite3CorruptError(tls, 70535)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -74087,7 +74092,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, 70545)
+		return Xsqlite3CorruptError(tls, 70549)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -74190,7 +74195,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70700)
+	rc = Xsqlite3CorruptError(tls, 70704)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -74218,7 +74223,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, 70721)
+	rc = Xsqlite3CorruptError(tls, 70725)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -74257,7 +74262,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, 70787)
+			return Xsqlite3CorruptError(tls, 70791)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -74330,7 +74335,7 @@ func Xsqlite3BtreeOpen(tls *libc.TLS, pVfs uintptr, zFilename uintptr, db uintpt
 	mutexOpen = uintptr(0)
 	rc = SQLITE_OK
 	isTempDb = libc.Bool32(zFilename == uintptr(0) || int32(*(*int8)(unsafe.Pointer(zFilename))) == 0)
-	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+5401) == 0 ||
+	isMemdb = libc.Bool32(zFilename != 0 && libc.Xstrcmp(tls, zFilename, ts+5420) == 0 ||
 		isTempDb != 0 && Xsqlite3TempInMemory(tls, db) != 0 ||
 		vfsFlags&SQLITE_OPEN_MEMORY != 0)
 
@@ -75102,7 +75107,7 @@ __9:
 	;
 __10:
 	;
-	if !(libc.Xmemcmp(tls, page1+21, ts+5410, uint64(3)) != 0) {
+	if !(libc.Xmemcmp(tls, page1+21, ts+5429, uint64(3)) != 0) {
 		goto __14
 	}
 	goto page1_init_failed
@@ -75140,7 +75145,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71722)
+	rc = Xsqlite3CorruptError(tls, 71726)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -75555,7 +75560,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, 72143)
+			return Xsqlite3CorruptError(tls, 72147)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -75581,7 +75586,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, 72162)
+						return Xsqlite3CorruptError(tls, 72166)
 					}
 					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)
@@ -75590,7 +75595,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, 72171)
+					return Xsqlite3CorruptError(tls, 72175)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -75601,7 +75606,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, 72183)
+				return Xsqlite3CorruptError(tls, 72187)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -75617,7 +75622,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, 72218)
+		return Xsqlite3CorruptError(tls, 72222)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -75678,7 +75683,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, 72316)
+			return Xsqlite3CorruptError(tls, 72320)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -75713,7 +75718,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, 72368)
+					return Xsqlite3CorruptError(tls, 72372)
 				}
 			}
 
@@ -75773,7 +75778,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, 72436)
+			rc = Xsqlite3CorruptError(tls, 72440)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -75812,7 +75817,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, 72487)
+			return Xsqlite3CorruptError(tls, 72491)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -75843,7 +75848,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72514)
+			return Xsqlite3CorruptError(tls, 72518)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -76184,7 +76189,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, 72978)
+			return Xsqlite3CorruptError(tls, 72982)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -76428,14 +76433,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, 73385)
+		return Xsqlite3CorruptError(tls, 73389)
 	}
 
 	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, 73400)
+		return Xsqlite3CorruptError(tls, 73404)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -76480,7 +76485,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, 73462)
+				return Xsqlite3CorruptError(tls, 73466)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -76529,7 +76534,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73547)
+		return Xsqlite3CorruptError(tls, 73551)
 	}
 	return rc
 }
@@ -76609,7 +76614,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, 73684)
+		return Xsqlite3CorruptError(tls, 73688)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -76700,7 +76705,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, 73823)
+	return Xsqlite3CorruptError(tls, 73827)
 __11:
 	;
 skip_init:
@@ -76720,7 +76725,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73835)
+	return Xsqlite3CorruptError(tls, 73839)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -76930,7 +76935,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 74077)
+	return Xsqlite3CorruptError(tls, 74081)
 __21:
 	;
 	goto __19
@@ -77134,7 +77139,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 74273)
+	return Xsqlite3CorruptError(tls, 74277)
 __4:
 	;
 	goto bypass_moveto_root
@@ -77199,7 +77204,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, 74360)
+	rc = Xsqlite3CorruptError(tls, 74364)
 	goto moveto_index_finish
 __17:
 	;
@@ -77247,7 +77252,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74392)
+	rc = Xsqlite3CorruptError(tls, 74396)
 __24:
 	;
 	goto moveto_index_finish
@@ -77366,7 +77371,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, 74508)
+		return Xsqlite3CorruptError(tls, 74512)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -77526,7 +77531,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74688)
+	return Xsqlite3CorruptError(tls, 74692)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -77591,7 +77596,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74744)
+	rc = Xsqlite3CorruptError(tls, 74748)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -77627,7 +77632,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74773)
+	rc = Xsqlite3CorruptError(tls, 74777)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -77671,7 +77676,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74807)
+	rc = Xsqlite3CorruptError(tls, 74811)
 	goto end_allocate_page
 __32:
 	;
@@ -77783,7 +77788,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74872)
+	rc = Xsqlite3CorruptError(tls, 74876)
 	goto end_allocate_page
 __51:
 	;
@@ -77941,7 +77946,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, 74999)
+	return Xsqlite3CorruptError(tls, 75003)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -77998,7 +78003,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75050)
 	goto freepage_out
 __10:
 	;
@@ -78014,7 +78019,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75061)
 	goto freepage_out
 __12:
 	;
@@ -78088,7 +78093,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, 75146)
+		return Xsqlite3CorruptError(tls, 75150)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -78100,7 +78105,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, 75163)
+			return Xsqlite3CorruptError(tls, 75167)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -78111,7 +78116,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, 75183)
+			rc = Xsqlite3CorruptError(tls, 75187)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -78276,7 +78281,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, 75436)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75440)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -78555,12 +78560,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, 75737)
+				return Xsqlite3CorruptError(tls, 75741)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75742)
+			return Xsqlite3CorruptError(tls, 75746)
 		}
 
 		pData -= uintptr(sz)
@@ -78568,7 +78573,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, 75748)
+			return Xsqlite3CorruptError(tls, 75752)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -78628,7 +78633,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, 75833)
+			Xsqlite3CorruptError(tls, 75837)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -78717,7 +78722,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75947)
+	return Xsqlite3CorruptError(tls, 75951)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -78833,7 +78838,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, 76060)
+		return Xsqlite3CorruptError(tls, 76064)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -79153,7 +79158,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, 76481)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76485)
 	goto balance_cleanup
 __25:
 	;
@@ -79164,7 +79169,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76509)
 	goto balance_cleanup
 __27:
 	;
@@ -79322,7 +79327,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76610)
 	goto balance_cleanup
 __55:
 	;
@@ -79396,7 +79401,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76643)
 	goto balance_cleanup
 __67:
 	;
@@ -79459,7 +79464,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76687)
 	goto balance_cleanup
 __75:
 	;
@@ -79487,7 +79492,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76720)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -79748,7 +79753,7 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76920)
 	goto balance_cleanup
 __121:
 	;
@@ -79940,7 +79945,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, 77146)
+			return Xsqlite3CorruptError(tls, 77150)
 		}
 	}
 	return SQLITE_OK
@@ -79978,7 +79983,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 77206)
+			rc = Xsqlite3CorruptError(tls, 77210)
 		} 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)))
@@ -80084,7 +80089,7 @@ func btreeOverwriteOverflowCell(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, 77370)
+			rc = Xsqlite3CorruptError(tls, 77374)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -80109,7 +80114,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 
 	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)
+		return Xsqlite3CorruptError(tls, 77402)
 	}
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
 		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
@@ -80179,7 +80184,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77479)
+	return Xsqlite3CorruptError(tls, 77483)
 __3:
 	;
 __1:
@@ -80292,7 +80297,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77606)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -80352,6 +80357,7 @@ __30:
 __25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
+	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
 		goto __31
 	}
@@ -80359,7 +80365,7 @@ __25:
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
 		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77640)
+	return Xsqlite3CorruptError(tls, 77645)
 __33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
@@ -80397,13 +80403,13 @@ __37:
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77667)
+	return Xsqlite3CorruptError(tls, 77672)
 __39:
 	;
 	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __40
 	}
-	return Xsqlite3CorruptError(tls, 77670)
+	return Xsqlite3CorruptError(tls, 77675)
 __40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
@@ -80434,7 +80440,6 @@ __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 __44
 	}
@@ -80509,7 +80514,7 @@ 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, 77773)
+		return Xsqlite3CorruptError(tls, 77777)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
@@ -80534,7 +80539,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, 77798)
+				return Xsqlite3CorruptError(tls, 77802)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -80635,7 +80640,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77894)
+			return Xsqlite3CorruptError(tls, 77898)
 		}
 	}
 
@@ -80643,11 +80648,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, 77903)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 	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, 77907)
+		return Xsqlite3CorruptError(tls, 77911)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -80722,7 +80727,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, 77998)
+			return Xsqlite3CorruptError(tls, 78002)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -80791,7 +80796,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, 78114)
+			return Xsqlite3CorruptError(tls, 78118)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -80820,7 +80825,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, 78162)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78166)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -80896,7 +80901,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 78252)
+	return Xsqlite3CorruptError(tls, 78256)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -80910,7 +80915,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, 78259)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78263)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -81044,7 +81049,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, 78363)
+		return Xsqlite3CorruptError(tls, 78367)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -81261,7 +81266,7 @@ 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+64, ts+5414, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+5433, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
 		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
@@ -81286,11 +81291,11 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 	defer tls.Free(16)
 
 	if iPage > (*IntegrityCk)(unsafe.Pointer(pCheck)).FnPage || iPage == Pgno(0) {
-		checkAppendMsg(tls, pCheck, ts+5416, libc.VaList(bp, iPage))
+		checkAppendMsg(tls, pCheck, ts+5435, libc.VaList(bp, iPage))
 		return 1
 	}
 	if getPageReferenced(tls, pCheck, iPage) != 0 {
-		checkAppendMsg(tls, pCheck, ts+5439, libc.VaList(bp+8, iPage))
+		checkAppendMsg(tls, pCheck, ts+5458, libc.VaList(bp+8, iPage))
 		return 1
 	}
 	setPageReferenced(tls, pCheck, iPage)
@@ -81308,13 +81313,13 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
 			checkOom(tls, pCheck)
 		}
-		checkAppendMsg(tls, pCheck, ts+5464, libc.VaList(bp, iChild))
+		checkAppendMsg(tls, pCheck, ts+5483, libc.VaList(bp, iChild))
 		return
 	}
 
 	if int32(*(*U8)(unsafe.Pointer(bp + 48))) != int32(eType) || *(*Pgno)(unsafe.Pointer(bp + 52)) != iParent {
 		checkAppendMsg(tls, pCheck,
-			ts+5493,
+			ts+5512,
 			libc.VaList(bp+8, iChild, int32(eType), iParent, int32(*(*U8)(unsafe.Pointer(bp + 48))), *(*Pgno)(unsafe.Pointer(bp + 52))))
 	}
 }
@@ -81333,7 +81338,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 		}
 		N--
 		if Xsqlite3PagerGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpPager, iPage, bp+40, 0) != 0 {
-			checkAppendMsg(tls, pCheck, ts+5547, libc.VaList(bp, iPage))
+			checkAppendMsg(tls, pCheck, ts+5566, libc.VaList(bp, iPage))
 			break
 		}
 		pOvflData = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
@@ -81344,7 +81349,7 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 			}
 			if n > (*BtShared)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt)).FusableSize/U32(4)-U32(2) {
 				checkAppendMsg(tls, pCheck,
-					ts+5569, libc.VaList(bp+8, iPage))
+					ts+5588, libc.VaList(bp+8, iPage))
 				N--
 			} else {
 				for i = 0; i < int32(n); i++ {
@@ -81367,12 +81372,12 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 	}
 	if N != 0 && nErrAtStart == (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr {
 		checkAppendMsg(tls, pCheck,
-			ts+5608,
+			ts+5627,
 			libc.VaList(bp+16, func() uintptr {
 				if isFreeList != 0 {
-					return ts + 5634
+					return ts + 5653
 				}
-				return ts + 5639
+				return ts + 5658
 			}(),
 				expected-N, expected))
 	}
@@ -81488,13 +81493,13 @@ __2:
 	return 0
 __3:
 	;
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 5660
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 5679
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
 		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+5670, libc.VaList(bp, rc))
+		ts+5689, libc.VaList(bp, rc))
 	goto end_of_check
 __4:
 	;
@@ -81505,7 +81510,7 @@ __4:
 	}
 
 	checkAppendMsg(tls, pCheck,
-		ts+5708, libc.VaList(bp+8, rc))
+		ts+5727, libc.VaList(bp+8, rc))
 	goto end_of_check
 __5:
 	;
@@ -81513,14 +81518,14 @@ __5:
 		goto __6
 	}
 
-	checkAppendMsg(tls, pCheck, ts+5746, libc.VaList(bp+16, rc))
+	checkAppendMsg(tls, pCheck, ts+5765, libc.VaList(bp+16, rc))
 	goto end_of_check
 __6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
 
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 5768
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 5787
 	contentOffset = U32((int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5))))<<8|int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+5) + 1)))-1)&0xffff + 1)
 
 	nCell = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+3) + 1)))
@@ -81537,7 +81542,7 @@ __6:
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
 		goto __9
 	}
-	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 5794
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 5813
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
 __9:
 	;
@@ -81562,7 +81567,7 @@ __10:
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
 		goto __13
 	}
-	checkAppendMsg(tls, pCheck, ts+5822,
+	checkAppendMsg(tls, pCheck, ts+5841,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
 	goto __11
@@ -81575,7 +81580,7 @@ __13:
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
 		goto __14
 	}
-	checkAppendMsg(tls, pCheck, ts+5852, 0)
+	checkAppendMsg(tls, pCheck, ts+5871, 0)
 	doCoverageCheck = 0
 	goto __11
 __14:
@@ -81591,7 +81596,7 @@ __14:
 	}() != 0) {
 		goto __16
 	}
-	checkAppendMsg(tls, pCheck, ts+5876, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
+	checkAppendMsg(tls, pCheck, ts+5895, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
 __16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
@@ -81629,7 +81634,7 @@ __21:
 	if !(d2 != depth) {
 		goto __22
 	}
-	checkAppendMsg(tls, pCheck, ts+5900, 0)
+	checkAppendMsg(tls, pCheck, ts+5919, 0)
 	depth = d2
 __22:
 	;
@@ -81702,7 +81707,7 @@ __30:
 		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+5925, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
+		ts+5944, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
 	goto __31
 	goto __33
 __32:
@@ -81719,7 +81724,7 @@ __31:
 		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
-		ts+5962,
+		ts+5981,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
 __34:
 	;
@@ -81833,7 +81838,7 @@ __6:
 	if !(bCkFreelist != 0) {
 		goto __7
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 6014
+	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = ts + 6033
 	checkList(tls, bp+32, 1, Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+32),
 		Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
@@ -81869,7 +81874,7 @@ __13:
 		goto __15
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+6030,
+		ts+6049,
 		libc.VaList(bp, mx, mxInHdr))
 __15:
 	;
@@ -81879,7 +81884,7 @@ __9:
 		goto __16
 	}
 	checkAppendMsg(tls, bp+32,
-		ts+6075, 0)
+		ts+6094, 0)
 __16:
 	;
 __10:
@@ -81926,13 +81931,13 @@ __23:
 	if !(getPageReferenced(tls, bp+32, i) == 0 && (ptrmapPageno(tls, pBt, i) != i || !(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0))) {
 		goto __26
 	}
-	checkAppendMsg(tls, bp+32, ts+6130, libc.VaList(bp+16, i))
+	checkAppendMsg(tls, bp+32, ts+6149, libc.VaList(bp+16, i))
 __26:
 	;
 	if !(getPageReferenced(tls, bp+32, i) != 0 && (ptrmapPageno(tls, pBt, i) == i && (*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0)) {
 		goto __27
 	}
-	checkAppendMsg(tls, bp+32, ts+6152, libc.VaList(bp+24, i))
+	checkAppendMsg(tls, bp+32, ts+6171, libc.VaList(bp+24, i))
 __27:
 	;
 	goto __24
@@ -82195,7 +82200,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 		var rc int32 = 0
 		Xsqlite3ParseObjectInit(tls, bp+16, pDb)
 		if Xsqlite3OpenTempDatabase(tls, bp+16) != 0 {
-			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+4493, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+			Xsqlite3ErrorWithMsg(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).Frc, ts+4512, libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 			rc = SQLITE_ERROR
 		}
 		Xsqlite3DbFree(tls, pErrorDb, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
@@ -82206,7 +82211,7 @@ func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintpt
 	}
 
 	if i < 0 {
-		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+6186, libc.VaList(bp+8, zDb))
+		Xsqlite3ErrorWithMsg(tls, pErrorDb, SQLITE_ERROR, ts+6205, libc.VaList(bp+8, zDb))
 		return uintptr(0)
 	}
 
@@ -82221,7 +82226,7 @@ func setDestPgsz(tls *libc.TLS, p uintptr) int32 {
 
 func checkReadTransaction(tls *libc.TLS, db uintptr, p uintptr) int32 {
 	if Xsqlite3BtreeTxnState(tls, p) != SQLITE_TXN_NONE {
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+6206, 0)
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+6225, 0)
 		return SQLITE_ERROR
 	}
 	return SQLITE_OK
@@ -82241,7 +82246,7 @@ func Xsqlite3_backup_init(tls *libc.TLS, pDestDb uintptr, zDestDb uintptr, pSrcD
 
 	if pSrcDb == pDestDb {
 		Xsqlite3ErrorWithMsg(tls,
-			pDestDb, SQLITE_ERROR, ts+6237, 0)
+			pDestDb, SQLITE_ERROR, ts+6256, 0)
 		p = uintptr(0)
 	} else {
 		p = Xsqlite3MallocZero(tls, uint64(unsafe.Sizeof(Sqlite3_backup{})))
@@ -82690,7 +82695,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 		(*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,
+		Xsqlite3_str_appendf(tls, bp+16, ts+6296,
 			libc.VaList(bp, func() float64 {
 				if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_IntReal != 0 {
 					return float64(*(*I64)(unsafe.Pointer(p)))
@@ -83282,7 +83287,7 @@ func Xsqlite3VdbeMemSetPointer(tls *libc.TLS, pMem uintptr, pPtr uintptr, zPType
 		if zPType != 0 {
 			return zPType
 		}
-		return ts + 1544
+		return ts + 1563
 	}()
 	(*Mem)(unsafe.Pointer(pMem)).Fz = pPtr
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null | MEM_Dyn | MEM_Subtype | MEM_Term)
@@ -83514,7 +83519,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, 81630)
+		return Xsqlite3CorruptError(tls, 81634)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -83746,7 +83751,7 @@ __9:
 		goto __10
 	}
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 8)).FisError
-	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+4493, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
+	Xsqlite3ErrorMsg(tls, (*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse, ts+4512, libc.VaList(bp, Xsqlite3_value_text(tls, pVal)))
 	goto __11
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
@@ -83799,7 +83804,7 @@ func valueFromExpr(tls *libc.TLS, db uintptr, pExpr uintptr, enc U8, affinity U8
 	zVal = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	negInt = 1
-	zNeg = ts + 1544
+	zNeg = ts + 1563
 	rc = SQLITE_OK
 
 __1:
@@ -83840,7 +83845,7 @@ __4:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
 	negInt = -1
-	zNeg = ts + 6284
+	zNeg = ts + 6303
 __6:
 	;
 	if !(op == TK_STRING || op == TK_FLOAT || op == TK_INTEGER) {
@@ -83859,7 +83864,7 @@ __9:
 	Xsqlite3VdbeMemSetInt64(tls, *(*uintptr)(unsafe.Pointer(bp + 16)), I64(*(*int32)(unsafe.Pointer(pExpr + 8)))*I64(negInt))
 	goto __11
 __10:
-	zVal = Xsqlite3MPrintf(tls, db, ts+6286, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+	zVal = Xsqlite3MPrintf(tls, db, ts+6305, libc.VaList(bp, zNeg, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	if !(zVal == uintptr(0)) {
 		goto __12
 	}
@@ -84163,7 +84168,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, 82270)
+		return Xsqlite3CorruptError(tls, 82274)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -84178,14 +84183,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 82276)
+			return Xsqlite3CorruptError(tls, 82280)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 82282)
+		return Xsqlite3CorruptError(tls, 82286)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -85193,34 +85198,34 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var j int32
 			var pKeyInfo uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+6291, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+6310, libc.VaList(bp, int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField)))
 			for j = 0; j < int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnKeyField); j++ {
 				var pColl uintptr = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(j)*8))
 				var zColl uintptr
 				if pColl != 0 {
 					zColl = (*CollSeq)(unsafe.Pointer(pColl)).FzName
 				} else {
-					zColl = ts + 1544
+					zColl = ts + 1563
 				}
-				if libc.Xstrcmp(tls, zColl, ts+1089) == 0 {
-					zColl = ts + 6296
+				if libc.Xstrcmp(tls, zColl, ts+1108) == 0 {
+					zColl = ts + 6315
 				}
-				Xsqlite3_str_appendf(tls, bp+144, ts+6298,
+				Xsqlite3_str_appendf(tls, bp+144, ts+6317,
 					libc.VaList(bp+8, func() uintptr {
 						if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_DESC != 0 {
-							return ts + 6284
+							return ts + 6303
 						}
-						return ts + 1544
+						return ts + 1563
 					}(),
 						func() uintptr {
 							if int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(j))))&KEYINFO_ORDER_BIGNULL != 0 {
-								return ts + 6306
+								return ts + 6325
 							}
-							return ts + 1544
+							return ts + 1563
 						}(),
 						zColl))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+6309, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+6328, 1)
 			break
 
 		}
@@ -85228,7 +85233,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 		{
 			var pColl uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-			Xsqlite3_str_appendf(tls, bp+144, ts+6311, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
+			Xsqlite3_str_appendf(tls, bp+144, ts+6330, libc.VaList(bp+32, (*CollSeq)(unsafe.Pointer(pColl)).FzName,
 				encnames[(*CollSeq)(unsafe.Pointer(pColl)).Fenc]))
 			break
 
@@ -85236,32 +85241,32 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -7:
 		{
 			var pDef uintptr = *(*uintptr)(unsafe.Pointer(pOp + 16))
-			Xsqlite3_str_appendf(tls, bp+144, ts+6320, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+6339, libc.VaList(bp+48, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -15:
 		{
 			var pDef uintptr = (*Sqlite3_context)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpFunc
-			Xsqlite3_str_appendf(tls, bp+144, ts+6320, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
+			Xsqlite3_str_appendf(tls, bp+144, ts+6339, libc.VaList(bp+64, (*FuncDef)(unsafe.Pointer(pDef)).FzName, int32((*FuncDef)(unsafe.Pointer(pDef)).FnArg)))
 			break
 
 		}
 	case -13:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1324, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1343, libc.VaList(bp+80, *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
 	case -3:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+6327, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+6346, libc.VaList(bp+88, *(*int32)(unsafe.Pointer(pOp + 16))))
 			break
 
 		}
 	case -12:
 		{
-			Xsqlite3_str_appendf(tls, bp+144, ts+1318, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
+			Xsqlite3_str_appendf(tls, bp+144, ts+1337, libc.VaList(bp+96, *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))))
 			break
 
 		}
@@ -85271,13 +85276,13 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Str != 0 {
 				zP4 = (*Mem)(unsafe.Pointer(pMem)).Fz
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1324, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1343, libc.VaList(bp+104, *(*I64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+144, ts+1318, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
+				Xsqlite3_str_appendf(tls, bp+144, ts+1337, libc.VaList(bp+112, *(*float64)(unsafe.Pointer(pMem))))
 			} else if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_Null != 0 {
-				zP4 = ts + 1545
+				zP4 = ts + 1564
 			} else {
-				zP4 = ts + 6330
+				zP4 = ts + 6349
 			}
 			break
 
@@ -85285,7 +85290,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	case -11:
 		{
 			var pVtab uintptr = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-			Xsqlite3_str_appendf(tls, bp+144, ts+6337, libc.VaList(bp+120, pVtab))
+			Xsqlite3_str_appendf(tls, bp+144, ts+6356, libc.VaList(bp+120, pVtab))
 			break
 
 		}
@@ -85296,20 +85301,20 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 			var n U32 = *(*U32)(unsafe.Pointer(ai))
 
 			for i = U32(1); i <= n; i++ {
-				Xsqlite3_str_appendf(tls, bp+144, ts+6345, libc.VaList(bp+128, func() int32 {
+				Xsqlite3_str_appendf(tls, bp+144, ts+6364, libc.VaList(bp+128, func() int32 {
 					if i == U32(1) {
 						return '['
 					}
 					return ','
 				}(), *(*U32)(unsafe.Pointer(ai + uintptr(i)*4))))
 			}
-			Xsqlite3_str_append(tls, bp+144, ts+6350, 1)
+			Xsqlite3_str_append(tls, bp+144, ts+6369, 1)
 			break
 
 		}
 	case -4:
 		{
-			zP4 = ts + 6352
+			zP4 = ts + 6371
 			break
 
 		}
@@ -85334,7 +85339,7 @@ func Xsqlite3VdbeDisplayP4(tls *libc.TLS, db uintptr, pOp uintptr) uintptr {
 	return Xsqlite3StrAccumFinish(tls, bp+144)
 }
 
-var encnames = [4]uintptr{ts + 6360, ts + 6362, ts + 6364, ts + 6369}
+var encnames = [4]uintptr{ts + 6379, ts + 6381, ts + 6383, ts + 6388}
 
 // Declare to the Vdbe that the BTree object at db->aDb[i] is used.
 //
@@ -85784,8 +85789,8 @@ func Xsqlite3VdbeMakeReady(tls *libc.TLS, p uintptr, pParse uintptr) {
 }
 
 var azColName = [12]uintptr{
-	ts + 6374, ts + 6379, ts + 6386, ts + 6389, ts + 6392, ts + 6395, ts + 6398, ts + 6401,
-	ts + 6409, ts + 6412, ts + 6419, ts + 6427,
+	ts + 6393, ts + 6398, ts + 6405, ts + 6408, ts + 6411, ts + 6414, ts + 6417, ts + 6420,
+	ts + 6428, ts + 6431, ts + 6438, ts + 6446,
 }
 
 // Close a VDBE cursor and release all the resources that cursor
@@ -85994,7 +85999,7 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		var nMainFile int32
 
 		nMainFile = Xsqlite3Strlen30(tls, zMainFile)
-		zSuper = Xsqlite3MPrintf(tls, db, ts+6434, libc.VaList(bp, 0, zMainFile, 0))
+		zSuper = Xsqlite3MPrintf(tls, db, ts+6453, libc.VaList(bp, 0, zMainFile, 0))
 		if zSuper == uintptr(0) {
 			return SQLITE_NOMEM
 		}
@@ -86002,16 +86007,16 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 {
 		for __ccgo := true; __ccgo; __ccgo = rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 60)) != 0 {
 			if retryCount != 0 {
 				if retryCount > 100 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+6446, libc.VaList(bp+24, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+6465, libc.VaList(bp+24, zSuper))
 					Xsqlite3OsDelete(tls, pVfs, zSuper, 0)
 					break
 				} else if retryCount == 1 {
-					Xsqlite3_log(tls, SQLITE_FULL, ts+6460, libc.VaList(bp+32, zSuper))
+					Xsqlite3_log(tls, SQLITE_FULL, ts+6479, libc.VaList(bp+32, zSuper))
 				}
 			}
 			retryCount++
 			Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
-			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+6475,
+			Xsqlite3_snprintf(tls, 13, zSuper+uintptr(nMainFile), ts+6494,
 				libc.VaList(bp+40, *(*U32)(unsafe.Pointer(bp + 56))>>8&U32(0xffffff), *(*U32)(unsafe.Pointer(bp + 56))&U32(0xff)))
 
 			rc = Xsqlite3OsAccess(tls, pVfs, zSuper, SQLITE_ACCESS_EXISTS, bp+60)
@@ -86157,7 +86162,7 @@ func Xsqlite3VdbeCheckFk(tls *libc.TLS, p uintptr, deferred int32) int32 {
 		!(deferred != 0) && (*Vdbe)(unsafe.Pointer(p)).FnFkConstraint > int64(0) {
 		(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_CONSTRAINT | int32(3)<<8
 		(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
-		Xsqlite3VdbeError(tls, p, ts+6488, 0)
+		Xsqlite3VdbeError(tls, p, ts+6507, 0)
 		if int32((*Vdbe)(unsafe.Pointer(p)).FprepFlags)&SQLITE_PREPARE_SAVESQL == 0 {
 			return SQLITE_ERROR
 		}
@@ -86489,7 +86494,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 86058)
+		return Xsqlite3CorruptError(tls, 86062)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -87040,7 +87045,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86989))
 		return 0
 	}
 
@@ -87105,7 +87110,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, 87062))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87066))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -87139,7 +87144,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, 87092))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87096))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -87189,7 +87194,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, 87136))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87140))
 			return 0
 		}
 	}
@@ -87335,7 +87340,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87303))
 	return 0
 __7:
 	;
@@ -87506,7 +87511,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87457)
+	return Xsqlite3CorruptError(tls, 87461)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -87532,7 +87537,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, 87490)
+		return Xsqlite3CorruptError(tls, 87494)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -87643,13 +87648,13 @@ func Xsqlite3NotPureFunc(tls *libc.TLS, pCtx uintptr) int32 {
 		var zContext uintptr
 		var zMsg uintptr
 		if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_IsCheck != 0 {
-			zContext = ts + 6518
-		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 6537
-		} else {
+		} else if int32((*VdbeOp)(unsafe.Pointer(pOp)).Fp5)&NC_GenCol != 0 {
 			zContext = ts + 6556
+		} else {
+			zContext = ts + 6575
 		}
-		zMsg = Xsqlite3_mprintf(tls, ts+6565,
+		zMsg = Xsqlite3_mprintf(tls, ts+6584,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx)).FpFunc)).FzName, zContext))
 		Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 		Xsqlite3_free(tls, zMsg)
@@ -87754,7 +87759,7 @@ func Xsqlite3_expired(tls *libc.TLS, pStmt uintptr) int32 {
 
 func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 	if (*Vdbe)(unsafe.Pointer(p)).Fdb == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+6601, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+6620, 0)
 		return 1
 	} else {
 		return 0
@@ -87764,7 +87769,7 @@ func vdbeSafety(tls *libc.TLS, p uintptr) int32 {
 
 func vdbeSafetyNotNull(tls *libc.TLS, p uintptr) int32 {
 	if p == uintptr(0) {
-		Xsqlite3_log(tls, SQLITE_MISUSE, ts+6646, 0)
+		Xsqlite3_log(tls, SQLITE_MISUSE, ts+6665, 0)
 		return 1
 	} else {
 		return vdbeSafety(tls, p)
@@ -87806,7 +87811,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, 87854)
+			return Xsqlite3MisuseError(tls, 87858)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -88229,7 +88234,7 @@ func Xsqlite3_result_error_code(tls *libc.TLS, pCtx uintptr, errCode int32) {
 // Force an SQLITE_TOOBIG error.
 func Xsqlite3_result_error_toobig(tls *libc.TLS, pCtx uintptr) {
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FisError = SQLITE_TOOBIG
-	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+6686, int64(-1),
+	Xsqlite3VdbeMemSetStr(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut, ts+6705, int64(-1),
 		uint8(SQLITE_UTF8), uintptr(0))
 }
 
@@ -88421,7 +88426,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88544)
+		return Xsqlite3MisuseError(tls, 88548)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -88941,15 +88946,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 89208)
+		return Xsqlite3MisuseError(tls, 89212)
 	}
 	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+6709, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 89216)
+			ts+6728, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89220)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -89354,7 +89359,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, 89707)
+	rc = Xsqlite3MisuseError(tls, 89711)
 	goto preupdate_old_out
 __1:
 	;
@@ -89498,7 +89503,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, 89809)
+	rc = Xsqlite3MisuseError(tls, 89813)
 	goto preupdate_new_out
 __1:
 	;
@@ -89670,7 +89675,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+6749, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+6768, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -89706,11 +89711,11 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 
 			pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr(*(*int32)(unsafe.Pointer(bp + 84))-1)*56
 			if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Null != 0 {
-				Xsqlite3_str_append(tls, bp+48, ts+1545, 4)
+				Xsqlite3_str_append(tls, bp+48, ts+1564, 4)
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&(MEM_Int|MEM_IntReal) != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+1324, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+1343, libc.VaList(bp, *(*I64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Real != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+6277, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+6296, libc.VaList(bp+8, *(*float64)(unsafe.Pointer(pVar))))
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Str != 0 {
 				var nOut int32
 				var enc U8 = (*Sqlite3)(unsafe.Pointer(db)).Fenc
@@ -89725,21 +89730,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+6753, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+6772, 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+6760, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+6779, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+6773, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+6792, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					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_appendf(tls, bp+48, ts+6795, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+6781, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+6800, 1)
 			}
 		}
 	}
@@ -89942,10 +89947,6 @@ func filterHash(tls *libc.TLS, aMem uintptr, pOp uintptr) U64 {
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Real != 0 {
 			h = h + U64(Xsqlite3VdbeIntValue(tls, p))
 		} else if int32((*Mem)(unsafe.Pointer(p)).Fflags)&(MEM_Str|MEM_Blob) != 0 {
-			h = h + U64((*Mem)(unsafe.Pointer(p)).Fn)
-			if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Zero != 0 {
-				h = h + U64(*(*int32)(unsafe.Pointer(p)))
-			}
 		}
 	}
 	return h
@@ -89956,11 +89957,11 @@ func vdbeMemTypeName(tls *libc.TLS, pMem uintptr) uintptr {
 }
 
 var azTypes = [5]uintptr{
-	ts + 1105,
-	ts + 1117,
-	ts + 1122,
-	ts + 1100,
-	ts + 1545,
+	ts + 1124,
+	ts + 1136,
+	ts + 1141,
+	ts + 1119,
+	ts + 1564,
 }
 
 // Execute as much of a VDBE program as we can.
@@ -91002,20 +91003,20 @@ __202:
 		goto __205
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+6783, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	Xsqlite3VdbeError(tls, p, ts+6802, 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))))
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+6823, 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))))
+	Xsqlite3VdbeError(tls, p, ts+4512, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	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))
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+6830, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 __204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
@@ -92593,7 +92594,7 @@ op_column_corrupt:
 	goto __9
 	goto __425
 __424:
-	rc = Xsqlite3CorruptError(tls, 93317)
+	rc = Xsqlite3CorruptError(tls, 93320)
 	goto abort_due_to_error
 __425:
 	;
@@ -92721,7 +92722,7 @@ __428:
 	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+6835,
+	Xsqlite3VdbeError(tls, p, ts+6854,
 		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
@@ -93153,7 +93154,7 @@ __78:
 		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+6876, 0)
+	Xsqlite3VdbeError(tls, p, ts+6895, 0)
 	rc = SQLITE_BUSY
 	goto __523
 __522:
@@ -93213,7 +93214,7 @@ __530:
 	if !!(pSavepoint != 0) {
 		goto __531
 	}
-	Xsqlite3VdbeError(tls, p, ts+6927, libc.VaList(bp+88, zName))
+	Xsqlite3VdbeError(tls, p, ts+6946, libc.VaList(bp+88, zName))
 	rc = SQLITE_ERROR
 	goto __532
 __531:
@@ -93222,7 +93223,7 @@ __531:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+6949, 0)
+		ts+6968, 0)
 	rc = SQLITE_BUSY
 	goto __534
 __533:
@@ -93408,7 +93409,7 @@ __564:
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+7003, 0)
+		ts+7022, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
 	goto __567
@@ -93451,13 +93452,13 @@ __562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 7058
+				return ts + 7077
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 7106
+					return ts + 7125
 				}
-				return ts + 7149
+				return ts + 7168
 			}()
 		}(), 0)
 
@@ -93540,7 +93541,7 @@ __576:
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+7190)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+7209)
 
 	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 __583
@@ -93744,7 +93745,7 @@ __88:
 	}
 
 	(*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
+	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1563
 __602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -94353,7 +94354,7 @@ notExistsWithKey:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
 		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95560)
+	rc = Xsqlite3CorruptError(tls, 95563)
 	goto __683
 __682:
 	goto jump_to_p2
@@ -95131,7 +95132,7 @@ __767:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
 		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+7218)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96638, ts+7237)
 	goto abort_due_to_error
 __770:
 	;
@@ -95241,7 +95242,7 @@ __780:
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
 		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96840)
+	rc = Xsqlite3CorruptError(tls, 96843)
 	goto abort_due_to_error
 __781:
 	;
@@ -95402,14 +95403,14 @@ __141:
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	goto __799
 __798:
-	zSchema = ts + 7235
+	zSchema = ts + 7254
 	(*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+7249,
+		ts+7268,
 		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 __800
@@ -95435,7 +95436,7 @@ __802:
 		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 97092)
+	rc = Xsqlite3CorruptError(tls, 97095)
 __803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
@@ -95625,7 +95626,7 @@ __820:
 		goto __825
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+7292, 0)
+	Xsqlite3VdbeError(tls, p, ts+7311, 0)
 	goto abort_due_to_error
 __825:
 	;
@@ -95937,7 +95938,7 @@ __860:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
 		goto __862
 	}
-	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
+	Xsqlite3VdbeError(tls, p, ts+4512, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
 __862:
 	;
@@ -95987,7 +95988,7 @@ __867:
 	if !(rc != 0) {
 		goto __868
 	}
-	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
+	Xsqlite3VdbeError(tls, p, ts+4512, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
 __868:
 	;
@@ -96069,12 +96070,12 @@ __876:
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+7329,
+		ts+7348,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 7381
+				return ts + 7400
 			}
-			return ts + 7386
+			return ts + 7405
 		}()))
 	goto abort_due_to_error
 	goto __879
@@ -96216,7 +96217,7 @@ __171:
 		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+7393, libc.VaList(bp+144, z1))
+	Xsqlite3VdbeError(tls, p, ts+7412, libc.VaList(bp+144, z1))
 __894:
 	;
 	goto abort_due_to_error
@@ -96334,7 +96335,7 @@ __904:
 	(*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+7422, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+7441, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
 	goto __9
 
 __177:
@@ -96423,7 +96424,7 @@ __912:
 	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)))
+	Xsqlite3VdbeError(tls, p, ts+4512, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
 __913:
 	;
@@ -96653,7 +96654,7 @@ __935:
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
 		goto __940
 	}
-	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
+	Xsqlite3VdbeError(tls, p, ts+4512, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
 __940:
 	;
@@ -96729,7 +96730,7 @@ __945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
 		goto __947
 	}
-	z3 = Xsqlite3MPrintf(tls, db, ts+7432, libc.VaList(bp+168, zTrace))
+	z3 = Xsqlite3MPrintf(tls, db, ts+7451, 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)
@@ -96802,7 +96803,7 @@ __955:
 	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __957
 	}
-	rc = Xsqlite3CorruptError(tls, 99031)
+	rc = Xsqlite3CorruptError(tls, 99034)
 __957:
 	;
 __956:
@@ -96810,13 +96811,13 @@ __956:
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
 		goto __958
 	}
-	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
+	Xsqlite3VdbeError(tls, p, ts+4512, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
 __958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
 
-	Xsqlite3_log(tls, rc, ts+7438,
+	Xsqlite3_log(tls, rc, ts+7457,
 		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 __959
@@ -96872,13 +96873,13 @@ __966:
 	return rc
 
 too_big:
-	Xsqlite3VdbeError(tls, p, ts+6686, 0)
+	Xsqlite3VdbeError(tls, p, ts+6705, 0)
 	rc = SQLITE_TOOBIG
 	goto abort_due_to_error
 
 no_mem:
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3VdbeError(tls, p, ts+1480, 0)
+	Xsqlite3VdbeError(tls, p, ts+1499, 0)
 	rc = SQLITE_NOMEM
 	goto abort_due_to_error
 
@@ -96889,8 +96890,8 @@ abort_due_to_interrupt:
 	return int32(0)
 }
 
-var azType = [4]uintptr{ts + 7470, ts + 7479, ts + 7486,
-	ts + 7492}
+var azType = [4]uintptr{ts + 7489, ts + 7498, ts + 7505,
+	ts + 7511}
 var and_logic = [9]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(1), uint8(2), uint8(0), uint8(2), uint8(2)}
 var or_logic = [9]uint8{uint8(0), uint8(1), uint8(2), uint8(1), uint8(1), uint8(1), uint8(2), uint8(1), uint8(2)}
 var aMask = [12]uint8{
@@ -96945,16 +96946,16 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		}
 
 		if type1 < U32(12) {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+7504,
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+7523,
 				libc.VaList(bp, func() uintptr {
 					if type1 == U32(0) {
-						return ts + 7533
+						return ts + 7552
 					}
 					return func() uintptr {
 						if type1 == U32(7) {
-							return ts + 7538
+							return ts + 7557
 						}
-						return ts + 7543
+						return ts + 7562
 					}()
 				}()))
 			rc = SQLITE_ERROR
@@ -96974,10 +96975,10 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 		rc = Xsqlite3_finalize(tls, (*Incrblob)(unsafe.Pointer(p)).FpStmt)
 		(*Incrblob)(unsafe.Pointer(p)).FpStmt = uintptr(0)
 		if rc == SQLITE_OK {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+7551, libc.VaList(bp+8, iRow))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+7570, libc.VaList(bp+8, iRow))
 			rc = SQLITE_ERROR
 		} else {
-			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+4493, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
+			zErr = Xsqlite3MPrintf(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb, ts+4512, libc.VaList(bp+16, Xsqlite3_errmsg(tls, (*Incrblob)(unsafe.Pointer(p)).Fdb)))
 		}
 	}
 
@@ -97037,21 +97038,21 @@ __3:
 		goto __4
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+7571, libc.VaList(bp, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+7590, libc.VaList(bp, zTable))
 __4:
 	;
 	if !(pTab != 0 && !((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0))) {
 		goto __5
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+7601, libc.VaList(bp+8, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+7620, libc.VaList(bp+8, zTable))
 __5:
 	;
 	if !(pTab != 0 && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __6
 	}
 	pTab = uintptr(0)
-	Xsqlite3ErrorMsg(tls, bp+48, ts+7637, libc.VaList(bp+16, zTable))
+	Xsqlite3ErrorMsg(tls, bp+48, ts+7656, libc.VaList(bp+16, zTable))
 __6:
 	;
 	if !!(pTab != 0) {
@@ -97095,7 +97096,7 @@ __11:
 		goto __13
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+7658, libc.VaList(bp+24, zColumn))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+7677, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -97122,7 +97123,7 @@ __19:
 	if !((*sColMap)(unsafe.Pointer(pFKey+64+uintptr(j)*16)).FiFrom == iCol) {
 		goto __22
 	}
-	zFault = ts + 7679
+	zFault = ts + 7698
 __22:
 	;
 	goto __20
@@ -97155,7 +97156,7 @@ __26:
 	if !(int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == iCol || int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j1)*2))) == -2) {
 		goto __29
 	}
-	zFault = ts + 7691
+	zFault = ts + 7710
 __29:
 	;
 	goto __27
@@ -97176,7 +97177,7 @@ __25:
 		goto __30
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
-	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+7699, libc.VaList(bp+32, zFault))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+7718, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -97274,7 +97275,7 @@ __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
-			return ts + 4493
+			return ts + 4512
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
@@ -97322,7 +97323,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99516)
+		return Xsqlite3MisuseError(tls, 99519)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -97405,7 +97406,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99616)
+		return Xsqlite3MisuseError(tls, 99619)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -97418,7 +97419,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 				if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-					return ts + 4493
+					return ts + 4512
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
@@ -99947,25 +99948,25 @@ 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 {
+	if Xsqlite3_strnicmp(tls, zTab, ts+7752, 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 {
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+7760+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7779+7) == 0 {
 			return 1
 		}
 		if pSchema == uintptr(0) {
 			return 0
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7235+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7254+7) == 0 {
 			return 1
 		}
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7779+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7798+7) == 0 {
 			return 1
 		}
 	} else {
-		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7779+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7798+7) == 0 {
 			return 1
 		}
 	}
@@ -100045,7 +100046,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+7793, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+7812, zDb) == 0) {
 		goto __8
 	}
 
@@ -100166,7 +100167,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+7798) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+7817) != 0) {
 		goto __33
 	}
 	goto __14
@@ -100340,14 +100341,14 @@ __60:
 	;
 	goto __59
 __58:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+7800, zTab) == 0) {
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+7819, zTab) == 0) {
 		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
 	goto __62
 __61:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+7804, zTab) == 0) {
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+7823, zTab) == 0) {
 		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
@@ -100364,7 +100365,7 @@ __57:
 		goto __64
 	}
 	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+7808, zTab) == 0) {
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+7827, zTab) == 0) {
 		goto __65
 	}
 	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
@@ -100523,7 +100524,7 @@ __86:
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
 		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7817, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+7836, libc.VaList(bp, zAs))
 	return WRC_Abort
 __90:
 	;
@@ -100531,14 +100532,14 @@ __90:
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
 		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7848, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+7867, libc.VaList(bp+8, zAs))
 	return WRC_Abort
 __91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
 		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7885, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+7904, 0)
 	return WRC_Abort
 __92:
 	;
@@ -100590,7 +100591,7 @@ __11:
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+7903, libc.VaList(bp+16, zCol))
+		ts+7922, 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
@@ -100627,7 +100628,7 @@ __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 + 7938
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7957
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
@@ -100640,23 +100641,23 @@ __101:
 __99:
 	;
 	if cnt == 0 {
-		zErr = ts + 7947
+		zErr = ts + 7966
 	} else {
-		zErr = ts + 7962
+		zErr = ts + 7981
 	}
 	if !(zDb != 0) {
 		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7984, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8003, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
 	goto __105
 __104:
 	if !(zTab != 0) {
 		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7997, libc.VaList(bp+56, zErr, zTab, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8016, libc.VaList(bp+56, zErr, zTab, zCol))
 	goto __107
 __106:
-	Xsqlite3ErrorMsg(tls, pParse, ts+8007, libc.VaList(bp+80, zErr, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8026, libc.VaList(bp+80, zErr, zCol))
 __107:
 	;
 __105:
@@ -100759,15 +100760,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 + 8014
+	var zIn uintptr = ts + 8033
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 8042
+		zIn = ts + 8061
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 8060
+		zIn = ts + 8079
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 8078
+		zIn = ts + 8097
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8096, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8115, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -100845,14 +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 + 8116
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
-				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 8121
-					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
-				}
-				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
+				*(*int32)(unsafe.Pointer(pExpr + 8)) = libc.Bool32(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL)
+				*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IntValue)
+				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_INTEGER)
+
 				i = 0
 				p = pNC
 			__4:
@@ -100896,7 +100893,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+8127, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+8135, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -100960,7 +100957,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+8144, libc.VaList(bp, pExpr))
+								ts+8152, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -100976,7 +100973,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+8208,
+							Xsqlite3ErrorMsg(tls, pParse, ts+8216,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -100990,7 +100987,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+8244, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+8252, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -101013,30 +101010,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+8272, libc.VaList(bp+16, pExpr))
+						ts+8280, 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 + 8315
+						zType = ts + 8323
 					} else {
-						zType = ts + 8322
+						zType = ts + 8330
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+8332, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+8340, 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+8360, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+8368, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+8382,
+					Xsqlite3ErrorMsg(tls, pParse, ts+8390,
 						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+8426,
+						ts+8434,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -101108,15 +101105,15 @@ 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+8474, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+8482, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
 
 				if nRef != (*NameContext)(unsafe.Pointer(pNC)).FnRef {
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_VarSelect)
-					*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_VarSelect
 				}
+				*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_Subquery
 			}
 			break
 
@@ -101124,7 +101121,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+8485, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+8493, pExpr, pExpr)
 			}
 
 			break
@@ -101180,7 +101177,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+7885, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7904, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -101255,7 +101252,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8496, libc.VaList(bp, i, zType, mx))
+		ts+8504, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -101275,7 +101272,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+8552, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+8560, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -101310,7 +101307,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+8586, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+8594, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -101367,7 +101364,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+8592, libc.VaList(bp, i+1))
+				ts+8600, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -101395,7 +101392,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+8653, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8661, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -101609,7 +101606,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+8684, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+8692, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -101649,7 +101646,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+8586) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+8594) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -101660,7 +101657,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+8723) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+8731) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -101672,7 +101669,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+8729, 0)
+						ts+8737, 0)
 					return WRC_Abort
 				}
 
@@ -102461,7 +102458,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7885, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7904, 0)
 		return
 	}
 
@@ -102536,7 +102533,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+8788, libc.VaList(bp, mxHeight))
+			ts+8796, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -102785,12 +102782,12 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+8836,
+			Xsqlite3ErrorMsg(tls, pParse, ts+8844,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 8880
+						return ts + 8888
 					}
-					return ts + 1544
+					return ts + 1563
 				}(), nElem))
 			break
 		}
@@ -102829,7 +102826,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+8882)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+8890)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -102855,7 +102852,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+8884, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8892, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -102883,7 +102880,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+8918, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+8926, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -102930,7 +102927,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+8938,
+				Xsqlite3ErrorMsg(tls, pParse, ts+8946,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -102955,7 +102952,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+8981, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+8989, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -103530,7 +103527,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+9004,
+	Xsqlite3ErrorMsg(tls, pParse, ts+9012,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -103653,7 +103650,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+9034, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+9042, libc.VaList(bp, zObject))
 	}
 }
 
@@ -103709,10 +103706,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+8116) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+9065) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+8121) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+9070) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -104142,13 +104139,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+9057) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+9076) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+9065) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+9084) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+9071) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+9090) == 0 {
 		return 1
 	}
 	return 0
@@ -104352,7 +104349,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+9075, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9094, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -104430,7 +104427,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+9122, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9141, 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)
 
@@ -104524,7 +104521,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 + 9153
+		var zFmt uintptr = ts + 9172
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -104542,7 +104539,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+7885, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7904, 0)
 	}
 }
 
@@ -104583,7 +104580,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+9197, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9216, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -104613,11 +104610,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+9220, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+9239, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
-				return ts + 1544
+				return ts + 1563
 			}
-			return ts + 9239
+			return ts + 9258
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -104744,7 +104741,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+9251, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9270, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -104759,11 +104756,11 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+9269, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+9288, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
-			return ts + 1544
+			return ts + 1563
 		}
-		return ts + 9239
+		return ts + 9258
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
@@ -104786,7 +104783,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+8882)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+8890)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -104795,7 +104792,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+9290)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+9309)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -105181,13 +105178,13 @@ 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+9292, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+9295,
+			if Xsqlite3_strnicmp(tls, z, ts+9311, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+9314,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
-							return ts + 6284
+							return ts + 6303
 						}
-						return ts + 1544
+						return ts + 1563
 					}(), pExpr))
 			} else {
 				codeReal(tls, v, z, negFlag, iMem)
@@ -105224,6 +105221,7 @@ func Xsqlite3ExprCodeLoadIndexColumn(tls *libc.TLS, pParse uintptr, pIdx uintptr
 func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr, pCol uintptr, regOut int32) {
 	var iAddr int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
+	var nErr int32 = (*Parse)(unsafe.Pointer(pParse)).FnErr
 
 	if (*Parse)(unsafe.Pointer(pParse)).FiSelfTab > 0 {
 		iAddr = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Parse)(unsafe.Pointer(pParse)).FiSelfTab-1, 0, regOut)
@@ -105237,6 +105235,9 @@ func Xsqlite3ExprCodeGeneratedColumn(tls *libc.TLS, pParse uintptr, pTab uintptr
 	if iAddr != 0 {
 		Xsqlite3VdbeJumpHere(tls, v, iAddr)
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr > nErr {
+		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FerrByteOffset = -1
+	}
 }
 
 // Generate code to extract the value of the iCol-th column of a table.
@@ -105258,7 +105259,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+9322,
+				Xsqlite3ErrorMsg(tls, pParse, ts+9341,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -105431,8 +105432,8 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 9352, ts + 9357, ts + 9362, ts + 7543,
-				ts + 7538, ts + 9370}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 9371, ts + 9376, ts + 9381, ts + 7562,
+				ts + 7557, ts + 9389}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
@@ -105440,7 +105441,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 9378
+						return ts + 9397
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -105455,6 +105456,7 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 	var p uintptr
 	var v uintptr
 	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+		var exprAff U8
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -105468,6 +105470,14 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 		if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr, iDataCur) != 0 {
 			continue
 		}
+
+		exprAff = U8(Xsqlite3ExprAffinity(tls, pExpr))
+		if int32(exprAff) <= SQLITE_AFF_BLOB && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_BLOB ||
+			int32(exprAff) == SQLITE_AFF_TEXT && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_TEXT ||
+			int32(exprAff) >= SQLITE_AFF_NUMERIC && int32((*IndexedExpr)(unsafe.Pointer(p)).Faff) != SQLITE_AFF_NUMERIC {
+			continue
+		}
+
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 
 		if (*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow != 0 {
@@ -105807,7 +105817,7 @@ __73:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
 		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+9322,
+	Xsqlite3ErrorMsg(tls, pParse, ts+9341,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
 __76:
@@ -106040,7 +106050,7 @@ __43:
 		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+9383, libc.VaList(bp+8, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+9402, libc.VaList(bp+8, pExpr))
 	goto __91
 __90:
 	return func() int32 {
@@ -106081,7 +106091,7 @@ __93:
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
 		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+9410, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+9429, libc.VaList(bp+16, pExpr))
 	goto __5
 __94:
 	;
@@ -106241,7 +106251,7 @@ __121:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
 		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+9004,
+	Xsqlite3ErrorMsg(tls, pParse, ts+9012,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
 __122:
 	;
@@ -106263,11 +106273,10 @@ __49:
 	return target
 
 __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) {
+	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) {
 		goto __123
 	}
+
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
 		goto __125
@@ -106307,7 +106316,7 @@ __126:
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+7885, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+7904, 0)
 	goto __5
 
 __55:
@@ -106338,13 +106347,19 @@ __129:
 	;
 __127:
 	;
-	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
+	addrINR = Xsqlite3VdbeAddOp3(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable, 0, target)
 
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = U8(0)
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	(*Parse)(unsafe.Pointer(pParse)).FokConstFactor = okConstFactor
+	if !(inReg != target) {
+		goto __130
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
+	inReg = target
+__130:
+	;
 	Xsqlite3VdbeJumpHere(tls, v, addrINR)
-	Xsqlite3VdbeChangeP3(tls, v, addrINR, inReg)
 	goto __5
 
 __56:
@@ -106357,15 +106372,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __130
+		goto __131
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __131
+		goto __132
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__131:
+__132:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -106375,22 +106390,22 @@ __131:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__130:
+__131:
 	;
 	i1 = 0
-__132:
+__133:
 	if !(i1 < nExpr-1) {
-		goto __134
+		goto __135
 	}
 	if !(pX != 0) {
-		goto __135
+		goto __136
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __136
-__135:
-	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+	goto __137
 __136:
+	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
+__137:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -106399,21 +106414,21 @@ __136:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __133
-__133:
-	i1 = i1 + 2
-	goto __132
 	goto __134
 __134:
+	i1 = i1 + 2
+	goto __133
+	goto __135
+__135:
 	;
 	if !(nExpr&1 != 0) {
-		goto __137
+		goto __138
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __138
-__137:
-	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+	goto __139
 __138:
+	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
+__139:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -106423,27 +106438,27 @@ __138:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __139
-	}
-	Xsqlite3ErrorMsg(tls, pParse,
-		ts+9434, 0)
-	return 0
-__139:
-	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __140
 	}
-	Xsqlite3MayAbort(tls, pParse)
+	Xsqlite3ErrorMsg(tls, pParse,
+		ts+9453, 0)
+	return 0
 __140:
 	;
-	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
 		goto __141
 	}
+	Xsqlite3MayAbort(tls, pParse)
+__141:
+	;
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
+		goto __142
+	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __142
-__141:
+	goto __143
+__142:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -106452,7 +106467,7 @@ __141:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__142:
+__143:
 	;
 	goto __5
 
@@ -106463,7 +106478,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[10]int8)(unsafe.Pointer(ts + 9484))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 9503))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -108252,11 +108267,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+7733, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7752, 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+9494, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+9513, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -108268,13 +108283,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9522,
+		ts+9541,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9697,
+			ts+9716,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -108284,10 +108299,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9871, libc.VaList(bp, zDb, zDb))
+		ts+9890, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10018, 0)
+			ts+10037, 0)
 	}
 }
 
@@ -108351,7 +108366,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+10169, libc.VaList(bp, zName))
+		ts+10188, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -108361,7 +108376,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+10228, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+10247, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -108370,7 +108385,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10234, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10253, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -108411,19 +108426,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10261, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+10280, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10445,
+		ts+10464,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+10750, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+10769, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10766,
+		ts+10785,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -108431,7 +108446,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10824, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+10843, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -108443,7 +108458,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11089, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11108, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -108455,7 +108470,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11102,
+		ts+11121,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -108501,12 +108516,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+11140, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+11159, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+11172, 0)
+			ts+11191, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -108516,11 +108531,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+11199)
+				ts+11218)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+11258)
+				ts+11277)
 		}
 
 		if pDflt != 0 {
@@ -108533,12 +108548,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+11311)
+					ts+11330)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+11357)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+11376)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -108549,7 +108564,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+11384,
+			ts+11403,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -108571,7 +108586,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+11530,
+				ts+11549,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -108619,14 +108634,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11760, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+11779, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11794, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+11813, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -108654,7 +108669,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+11824, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+11843, 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
 	}
@@ -108694,18 +108709,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 + 11843
+		zType = ts + 11862
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 11848
+		zType = ts + 11867
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+11862,
+		Xsqlite3ErrorMsg(tls, pParse, ts+11881,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 11880
+					return ts + 11899
 				}
-				return ts + 11897
+				return ts + 11916
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -108789,11 +108804,11 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11915, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11934, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1544, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+1563, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iSchema == 1))
 
 	Xsqlite3MayAbort(tls, pParse)
@@ -108806,17 +108821,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11936,
+		ts+11955,
 		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+12118,
+		ts+12137,
 		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+11089, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+11108, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -109074,12 +109089,12 @@ 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+12249,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12268,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 12272
+				return ts + 12291
 			}
-			return ts + 1544
+			return ts + 1563
 		}(), zWhen,
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg))
 	Xsqlite3_result_error(tls, pCtx, zErr, -1)
@@ -109119,8 +109134,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+12274, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 113494)
+	if Xsqlite3_strnicmp(tls, zSql, ts+12293, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113516)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -109137,7 +109152,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, 113505)
+		rc = Xsqlite3CorruptError(tls, 113527)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -109159,7 +109174,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+12282, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+12301, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -109199,12 +109214,12 @@ 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+12288, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+12307, 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 + 12272
+							return ts + 12291
 						}
-						return ts + 1544
+						return ts + 1563
 					}()))
 				zReplace = zBuf2
 				nReplace = U32(Xsqlite3Strlen30(tls, zReplace))
@@ -109690,7 +109705,7 @@ __45:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FzErrMsg != 0) {
 		goto __47
 	}
-	renameColumnParseError(tls, context, ts+1544, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
+	renameColumnParseError(tls, context, ts+1563, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+32)
 	goto __48
 __47:
 	Xsqlite3_result_error_code(tls, context, rc)
@@ -109855,7 +109870,7 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 			if rc == SQLITE_ERROR && Xsqlite3WritableSchema(tls, db) != 0 {
 				Xsqlite3_result_value(tls, context, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 			} else if (*Parse)(unsafe.Pointer(bp+80)).FzErrMsg != 0 {
-				renameColumnParseError(tls, context, ts+1544, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
+				renameColumnParseError(tls, context, ts+1563, *(*uintptr)(unsafe.Pointer(argv + 1*8)), *(*uintptr)(unsafe.Pointer(argv + 2*8)), bp+80)
 			} else {
 				Xsqlite3_result_error_code(tls, context, rc)
 			}
@@ -110058,7 +110073,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 114441)
+	rc = Xsqlite3CorruptError(tls, 114463)
 	goto drop_column_done
 __2:
 	;
@@ -110082,7 +110097,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+12293, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+12312, 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)
 
@@ -110163,19 +110178,19 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11915, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11934, 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+12300,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12319,
 		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 + 12328
+				return ts + 12347
 			}
-			return ts + 7479
+			return ts + 7498
 		}(),
 			zCol))
 	goto exit_drop_column
@@ -110184,7 +110199,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12340, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12359, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -110198,13 +110213,13 @@ __8:
 	goto exit_drop_column
 __9:
 	;
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1544, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1563, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+12388, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12407, 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+12509, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+12528, 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
@@ -110322,11 +110337,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 + 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}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12546},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12567},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12587},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12606},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12625}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -110360,7 +110375,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+12629, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+12648, 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)
 			}
@@ -110369,10 +110384,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+12652,
+					ts+12671,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+12682, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+12701, 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)
 			}
@@ -110390,9 +110405,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 12700, FzCols: ts + 12713},
-	{FzName: ts + 12726, FzCols: ts + 12739},
-	{FzName: ts + 12767},
+	{FzName: ts + 12719, FzCols: ts + 12732},
+	{FzName: ts + 12745, FzCols: ts + 12758},
+	{FzName: ts + 12786},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -110582,7 +110597,7 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12780}
+	FzName:     ts + 12799}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
@@ -110833,7 +110848,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12790}
+	FzName:     ts + 12809}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -110847,7 +110862,7 @@ 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+12800,
+		Xsqlite3_str_appendf(tls, bp+24, ts+12819,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
 					return (*StatAccum)(unsafe.Pointer(p)).FnEst
@@ -110860,7 +110875,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+12805, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+12824, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -110902,7 +110917,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+12811, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+12830, 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--
@@ -110916,7 +110931,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12817}
+	FzName:     ts + 12836}
 
 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)
@@ -110960,7 +110975,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+12826, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+12845, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -110977,7 +110992,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+12700, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+12719, 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)
@@ -111133,7 +111148,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+12836, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+12855, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -111190,7 +111205,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+12836, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+12855, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -111237,9 +111252,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+12840)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+12859)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+12844)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+12863)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -111322,7 +111337,7 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 	var v TRowcnt
 
 	if z == uintptr(0) {
-		z = ts + 1544
+		z = ts + 1563
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
 		v = uint64(0)
@@ -111344,15 +111359,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+12848, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+12867, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+12859, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+12878, 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+12869, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+12888, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -111628,11 +111643,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+12726, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+12745, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+12881,
-			ts+12935,
+			ts+12900,
+			ts+12954,
 			zDb)
 	}
 	return rc
@@ -111679,10 +111694,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+12700, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+12719, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+12987, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+13006, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -111740,7 +111755,7 @@ 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+7793, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+7812, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -111773,13 +111788,13 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zFile == uintptr(0)) {
 		goto __1
 	}
-	zFile = ts + 1544
+	zFile = ts + 1563
 __1:
 	;
 	if !(zName == uintptr(0)) {
 		goto __2
 	}
-	zName = ts + 1544
+	zName = ts + 1563
 __2:
 	;
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2)) != 0) {
@@ -111787,14 +111802,14 @@ __2:
 	}
 
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+5187)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+5206)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+13028, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+13047, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
 	if !(rc == SQLITE_OK) {
 		goto __6
 	}
@@ -111831,7 +111846,7 @@ __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13031,
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13050,
 		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
@@ -111845,7 +111860,7 @@ __12:
 	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __15
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13068, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13087, libc.VaList(bp+8, zName))
 	goto attach_error
 __15:
 	;
@@ -111909,7 +111924,7 @@ __4:
 		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13098, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13117, 0)
 	goto __23
 __22:
 	if !(rc == SQLITE_OK) {
@@ -111926,7 +111941,7 @@ __25:
 		goto __27
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
-		ts+13127, 0)
+		ts+13146, 0)
 	rc = SQLITE_ERROR
 __27:
 	;
@@ -111992,13 +112007,13 @@ __33:
 	}
 	Xsqlite3OomFault(tls, db)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1480, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1499, 0)
 	goto __35
 __34:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
 		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13195, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13214, libc.VaList(bp+16, zFile))
 __36:
 	;
 __35:
@@ -112045,7 +112060,7 @@ func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	if !(zName == uintptr(0)) {
 		goto __1
 	}
-	zName = ts + 1544
+	zName = ts + 1563
 __1:
 	;
 	i = 0
@@ -112076,14 +112091,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13223, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13242, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13244, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13263, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -112091,7 +112106,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13270, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13289, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -112208,7 +112223,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 13292}
+	FzName:     ts + 13311}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -112221,7 +112236,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 13306}
+	FzName:     ts + 13325}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -112235,7 +112250,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+13320, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+13339, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -112267,7 +112282,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+13344,
+						ts+13363,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -112442,7 +112457,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+13390, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13409, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -112468,11 +112483,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+13413, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+13432, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+13419, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+13438, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+13425, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13444, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -112519,7 +112534,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 + 9065
+		zCol = ts + 9084
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -112543,7 +112558,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+13452, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13471, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -112814,25 +112829,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+7793) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+7812) == 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+7733, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+7752, 7) == 0 {
 			if i == 1 {
-				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 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7779+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7798+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7254+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+7741)
+						ts+7760)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7779+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7798+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+7235)
+						ts+7254)
 				}
 			}
 		}
@@ -112853,12 +112868,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		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 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+7752, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7798+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+7254)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7779+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+7741)
+					ts+7760)
 			}
 		}
 	}
@@ -112889,7 +112904,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+13467, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+13486, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -112907,14 +112922,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 + 13475
+			zMsg = ts + 13494
 		} else {
-			zMsg = ts + 13488
+			zMsg = ts + 13507
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7997, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+8016, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+8007, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+8026, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -112944,12 +112959,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+7733, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7235+7) == 0 {
-			return ts + 7779
+	if Xsqlite3_strnicmp(tls, zName, ts+7752, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7254+7) == 0 {
+			return ts + 7798
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7741+7) == 0 {
-			return ts + 7760
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7760+7) == 0 {
+			return ts + 7779
 		}
 	}
 	return zName
@@ -113307,7 +113322,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+7235)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+7254)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -113333,7 +113348,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+7793, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+7812, zName) {
 				goto __3
 			}
 
@@ -113386,13 +113401,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+13502, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+13521, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13519, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+13538, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -113430,13 +113445,13 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 		if Xsqlite3_stricmp(tls, zType, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit))) != 0 ||
 			Xsqlite3_stricmp(tls, zName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 1*8))) != 0 ||
 			Xsqlite3_stricmp(tls, zTblName, *(*uintptr)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).Finit.FazInit + 2*8))) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1544, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1563, 0)
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+7733, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+7752, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13539,
+			Xsqlite3ErrorMsg(tls, pParse, ts+13558,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -113596,9 +113611,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 + 7741
+			return ts + 7760
 		}
-		return ts + 7235
+		return ts + 7254
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -113614,7 +113629,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+13581, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13600, 0)
 	return
 __4:
 	;
@@ -113642,9 +113657,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 11843
+			return ts + 11862
 		}
-		return ts + 10228
+		return ts + 10247
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -113660,9 +113675,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 + 7741
+			return ts + 7760
 		}
-		return ts + 7235
+		return ts + 7254
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -113693,12 +113708,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13622,
+	Xsqlite3ErrorMsg(tls, pParse, ts+13641,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 11843
+				return ts + 11862
 			}
-			return ts + 10228
+			return ts + 10247
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -113713,7 +113728,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13643, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13662, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -113800,7 +113815,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+13678, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+13697, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -113824,7 +113839,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+13695, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13714, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -113844,7 +113859,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 + 13678
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 13697
 	(*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)
@@ -113856,7 +113871,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+13678, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+13697, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -113890,7 +113905,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+13729, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13748, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -113898,13 +113913,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+13752, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+13771, 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+13759, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+13778, 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--
@@ -113941,7 +113956,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+13769, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+13788, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -114105,10 +114120,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+13795,
+			Xsqlite3ErrorMsg(tls, pParse, ts+13814,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13840, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+13859, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -114139,7 +114154,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+13881, 0)
+			ts+13900, 0)
 	}
 }
 
@@ -114184,7 +114199,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13933, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+13952, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -114273,7 +114288,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13974, 0)
+		ts+13993, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -114368,7 +114383,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14030, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14049, 0)
 	goto generated_done
 __2:
 	;
@@ -114381,13 +114396,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+14073, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+14092, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+14081, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+14100, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -114421,13 +114436,19 @@ __10:
 
 	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
 __11:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_RAISE) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = (*Column)(unsafe.Pointer(pCol)).Faffinity
+__12:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+14088,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14107,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -114548,13 +114569,13 @@ __3:
 	;
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
-		zSep = ts + 1544
-		zSep2 = ts + 14119
-		zEnd = ts + 6309
+		zSep = ts + 1563
+		zSep2 = ts + 14138
+		zEnd = ts + 6328
 	} else {
-		zSep = ts + 14121
-		zSep2 = ts + 14125
-		zEnd = ts + 14130
+		zSep = ts + 14140
+		zSep2 = ts + 14144
+		zEnd = ts + 14149
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -114562,7 +114583,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+14133, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+14152, 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('(')
@@ -114596,17 +114617,17 @@ __5:
 	goto __6
 __6:
 	;
-	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+4493, libc.VaList(bp, zEnd))
+	Xsqlite3_snprintf(tls, n-*(*int32)(unsafe.Pointer(bp + 8)), zStmt+uintptr(*(*int32)(unsafe.Pointer(bp + 8))), ts+4512, libc.VaList(bp, zEnd))
 	return zStmt
 }
 
 var azType1 = [6]uintptr{
-	ts + 1544,
-	ts + 14147,
-	ts + 14153,
-	ts + 14158,
-	ts + 14163,
-	ts + 14153,
+	ts + 1563,
+	ts + 14166,
+	ts + 14172,
+	ts + 14177,
+	ts + 14182,
+	ts + 14172,
 }
 
 func resizeIndexObject(tls *libc.TLS, db uintptr, pIdx uintptr, N int32) int32 {
@@ -114996,7 +115017,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
 		if pSelect != 0 || !(int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM) && (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+1544, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+1563, 0)
 			return
 		}
 		(*Table)(unsafe.Pointer(p)).Ftnum = (*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum
@@ -115013,10 +115034,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+14169,
-						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1544)))
+						ts+14188,
+						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1563)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+14202,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14221,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -115035,11 +115056,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+14229, 0)
+				ts+14248, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14279, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+14298, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -115073,7 +115094,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14311, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+14330, 0)
 			return
 		}
 	}
@@ -115098,11 +115119,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 + 10228
-			zType2 = ts + 14355
+			zType = ts + 10247
+			zType2 = ts + 14374
 		} else {
-			zType = ts + 11843
-			zType2 = ts + 14361
+			zType = ts + 11862
+			zType2 = ts + 14380
 		}
 
 		if pSelect != 0 {
@@ -115173,11 +115194,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+14366, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+14385, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+14381,
+			ts+14400,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -115193,13 +115214,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+14479,
+					ts+14498,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+14521, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+14540, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -115214,7 +115235,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+10750) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+10769) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -115244,7 +115265,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+14555, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14574, 0)
 	goto create_view_fail
 __1:
 	;
@@ -115260,7 +115281,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+11843, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+11862, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -115342,7 +115363,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14591, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14610, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -115467,13 +115488,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+14621, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+14640, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14636,
+		ts+14655,
 		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)
 }
@@ -115514,10 +115535,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+14703, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+14722, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+12652,
+				ts+12671,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -115549,12 +115570,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+14717,
+			ts+14736,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14762,
+		ts+14781,
 		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)
@@ -115582,11 +115603,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+7733, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+14829, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7752, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+14848, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+8485, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+8493, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -115664,9 +115685,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 7741
+			return ts + 7760
 		}
-		return ts + 7235
+		return ts + 7254
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -115725,21 +115746,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14834, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14853, 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+14862, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14881, 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+14896, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14915, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -115751,7 +115772,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+12844, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+12863, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -115815,7 +115836,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14928,
+		ts+14947,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -115827,7 +115848,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14991, 0)
+		ts+15010, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -115912,7 +115933,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15085,
+		ts+15104,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -116139,12 +116160,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+15131,
+				Xsqlite3ErrorMsg(tls, pParse, ts+15150,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 15159
+							return ts + 15178
 						}
-						return ts + 15165
+						return ts + 15184
 					}()))
 				return 1
 			}
@@ -116265,7 +116286,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+15170, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+15189, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -116284,7 +116305,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15176,
+		ts+15195,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -116310,26 +116331,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7733, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7752, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15226, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15245, 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+15254, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15273, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15279, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15298, 0)
 	goto exit_create_index
 __17:
 	;
@@ -116343,7 +116364,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+15170, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+15189, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -116358,7 +116379,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15313, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15332, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -116370,7 +116391,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15347, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15366, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -116399,7 +116420,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+15371, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+15390, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -116420,9 +116441,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 7741
+			return ts + 7760
 		}
-		return ts + 7235
+		return ts + 7254
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -116461,7 +116482,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+15170)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+15189)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -116562,7 +116583,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15394, 0)
+		ts+15413, 0)
 	goto exit_create_index
 __56:
 	;
@@ -116779,7 +116800,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15455, libc.VaList(bp+48, 0))
+		ts+15474, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -116831,8 +116852,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15497, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15516, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121859)
 	goto exit_create_index
 __101:
 	;
@@ -116878,12 +116899,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+15514,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+15533,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
-				return ts + 1544
+				return ts + 1563
 			}
-			return ts + 15534
+			return ts + 15553
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -116891,7 +116912,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+15542,
+		ts+15561,
 		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,
@@ -116905,7 +116926,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+15601, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+15620, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -117066,7 +117087,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15628, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15647, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -117081,7 +117102,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15646, libc.VaList(bp+8, 0))
+		ts+15665, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -117092,9 +117113,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 + 7741
+			return ts + 7760
 		}
-		return ts + 7235
+		return ts + 7254
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -117120,9 +117141,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+15719,
+		ts+15738,
 		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+12840, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+12859, (*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)
@@ -117257,7 +117278,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+15779,
+			Xsqlite3ErrorMsg(tls, pParse, ts+15798,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -117465,12 +117486,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+15815,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15834,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 15851
+				return ts + 15870
 			}
-			return ts + 15854
+			return ts + 15873
 		}()))
 	goto append_from_error
 __1:
@@ -117639,7 +117660,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+15860, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+15879, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -117675,9 +117696,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 15866
+				return ts + 15885
 			}
-			return ts + 15875
+			return ts + 15894
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -117702,7 +117723,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 15860, ts + 15882, ts + 15866}
+var az = [3]uintptr{ts + 15879, ts + 15901, ts + 15885}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -117717,7 +117738,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+15890, 0)
+				ts+15909, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -117854,17 +117875,17 @@ 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+15960, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+15979, 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+15971, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+15990, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
-			Xsqlite3_str_append(tls, bp+8, ts+1557, 1)
+			Xsqlite3_str_append(tls, bp+8, ts+1576, 1)
 			Xsqlite3_str_appendall(tls, bp+8, zCol)
 		}
 	}
@@ -117887,11 +117908,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+13413, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+13432, 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+15974, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+15993, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -118021,7 +118042,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15983, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+16002, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -118117,7 +118138,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+16029, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+16048, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -118310,7 +118331,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+16059, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+16078, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -118590,7 +118611,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+16090,
+		Xsqlite3ErrorMsg(tls, pParse, ts+16109,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -118622,11 +118643,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+16123, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+16142, 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+16152, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+16171, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -118877,7 +118898,7 @@ __20:
 	goto __16
 __15:
 	wcf = U16(WHERE_ONEPASS_DESIRED | WHERE_DUPLICATES_OK)
-	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_VarSelect != 0) {
+	if !((*NameContext)(unsafe.Pointer(bp+16)).FncFlags&NC_Subquery != 0) {
 		goto __23
 	}
 	bComplex = 1
@@ -119130,7 +119151,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+16190)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+16209)
 __62:
 	;
 delete_from_cleanup:
@@ -119245,7 +119266,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+12700) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+12719) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -119475,7 +119496,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 + 9357, ts + 9352, ts + 7533}
+var azType2 = [5]uintptr{ts + 7562, ts + 7557, ts + 9376, ts + 9371, ts + 7552}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -119534,7 +119555,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+16203, -1)
+					Xsqlite3_result_error(tls, context, ts+16222, -1)
 					return
 				}
 				iVal = -iVal
@@ -119838,7 +119859,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+16220, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+16239, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -120184,7 +120205,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+16225, -1)
+		Xsqlite3_result_error(tls, context, ts+16244, -1)
 		return
 	}
 	if argc == 3 {
@@ -120194,7 +120215,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+16258, -1)
+				ts+16277, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -120247,7 +120268,7 @@ func errlogFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	_ = argc
 	_ = context
-	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+4493, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
+	Xsqlite3_log(tls, Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv))), ts+4512, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))))
 }
 
 func compileoptionusedFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
@@ -120287,13 +120308,13 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 
 			var zVal uintptr
 			r1 = Xsqlite3_value_double(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+6277, libc.VaList(bp, r1))
+			Xsqlite3_str_appendf(tls, pStr, ts+6296, libc.VaList(bp, r1))
 			zVal = Xsqlite3_str_value(tls, pStr)
 			if zVal != 0 {
 				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+16303, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+16322, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -120301,7 +120322,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 		}
 	case SQLITE_INTEGER:
 		{
-			Xsqlite3_str_appendf(tls, pStr, ts+1324, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
+			Xsqlite3_str_appendf(tls, pStr, ts+1343, libc.VaList(bp+16, Xsqlite3_value_int64(tls, pValue)))
 			break
 
 		}
@@ -120330,13 +120351,13 @@ 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+16310, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+16329, libc.VaList(bp+24, zArg))
 			break
 
 		}
 	default:
 		{
-			Xsqlite3_str_append(tls, pStr, ts+1545, 4)
+			Xsqlite3_str_append(tls, pStr, ts+1564, 4)
 			break
 
 		}
@@ -120477,7 +120498,7 @@ func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 	var ch U32
 	var c U8
 	var d U8
-	zPass = ts + 1544
+	zPass = ts + 1563
 	nPass = 0
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -120759,7 +120780,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 12272}
+var azOne = [1]uintptr{ts + 12291}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -120771,7 +120792,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	zIn = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
 	if zIn == uintptr(0) {
-		zIn = ts + 1544
+		zIn = ts + 1563
 	}
 	for i = 0; *(*U8)(unsafe.Pointer(zIn + uintptr(i))) != 0 && !(int32(Xsqlite3CtypeMap[*(*U8)(unsafe.Pointer(zIn + uintptr(i)))])&0x02 != 0); i++ {
 	}
@@ -120795,7 +120816,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+16313, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+16332, 4, uintptr(0))
 	}
 }
 
@@ -120820,7 +120841,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+13452, -1)
+		Xsqlite3_result_error(tls, context, ts+13471, -1)
 		return
 	}
 
@@ -120898,7 +120919,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+16203, -1)
+			Xsqlite3_result_error(tls, context, ts+16222, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -121160,7 +121181,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+16318, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+16337, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -121180,14 +121201,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+16324, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+16343, 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+16324, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+16343, 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+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)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+16343, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+16343, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -121428,109 +121449,109 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 }
 
 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 + 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(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(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 + 16348},
+	{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 + 16368},
+	{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 + 16381},
+	{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 + 16399},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16408},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 16416},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 16416},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16431},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16457},
+	{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 + 16482},
+	{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 + 16491},
+	{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 + 16502},
+	{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 + 16509},
+	{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 + 16523},
+	{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 + 16523},
+	{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 + 16529},
+	{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 + 16529},
+	{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 + 16535},
+	{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 + 16535},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16540},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 16540},
+	{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 + 16540},
+	{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 + 16544},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 16544},
+	{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 + 16544},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 16548},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 16555},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 16563},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16570},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16576},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16583},
+	{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 + 16598},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16603},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16607},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16607},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16613},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16619},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16625},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16629},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16629},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 16635},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16642},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16649},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16660},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16667},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16682},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16699},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16710},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16716},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16734},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16742},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16756},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16764},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16773},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16773},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16780},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16780},
+	{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 + 16790},
+	{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 + 16794},
+	{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 + 16800},
+	{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 + 16804},
+	{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 + 16804},
+	{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 + 16810},
+	{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 + 16810},
+	{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 + 16823},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 16343},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 16343},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 7957},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 7957},
 	{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 + 16880},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16833},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16841},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16847},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16853},
+	{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 + 16856},
+	{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 + 16860},
+	{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 + 16866},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16856},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16871},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16875},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16879},
 	{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 + 16889},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16894},
 	{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 + 16913},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16904},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16910},
+	{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 + 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 + 16922},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16927},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16932},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16937},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16943},
 	{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}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16955},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16960},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16968},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16976},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16979},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 7957},
+	{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 + 16984}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -121651,7 +121672,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+16969,
+				ts+16988,
 				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)
@@ -122311,8 +122332,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 + 7804, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 7800, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 7823, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 7819, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -122391,7 +122412,7 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 			(*Token)(unsafe.Pointer(bp + 80)).Fz = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 			(*Token)(unsafe.Pointer(bp + 80)).Fn = uint32(Xsqlite3Strlen30(tls, (*Token)(unsafe.Pointer(bp+80)).Fz))
 
-			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+6488)
+			pRaise = Xsqlite3Expr(tls, db, TK_RAISE, ts+6507)
 			if pRaise != 0 {
 				(*Expr)(unsafe.Pointer(pRaise)).FaffExpr = int8(OE_Abort)
 			}
@@ -122813,7 +122834,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9322, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+9341, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -123281,7 +123302,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17014,
+		ts+17033,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -123306,7 +123327,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+17055,
+	Xsqlite3ErrorMsg(tls, pParse, ts+17074,
 		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
@@ -123455,7 +123476,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17087,
+		ts+17106,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -123465,7 +123486,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17139, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+17158, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -123517,7 +123538,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17164,
+	Xsqlite3ErrorMsg(tls, pParse, ts+17183,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -123525,7 +123546,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17210, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17229, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -123937,7 +123958,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+17231)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+17250)
 __125:
 	;
 insert_cleanup:
@@ -124253,7 +124274,7 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 						fallthrough
 					case OE_Fail:
 						{
-							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+13413, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+13432, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 								(*Column)(unsafe.Pointer(pCol)).FzCnName))
 
 							Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
@@ -125345,13 +125366,13 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131895)
+	return Xsqlite3MisuseError(tls, 131931)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
 		goto __2
 	}
-	zSql = ts + 1544
+	zSql = ts + 1563
 __2:
 	;
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -125830,7 +125851,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+13452, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+13471, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -125839,7 +125860,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 17245
+		zEntry = ts + 17264
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -125854,7 +125875,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+13413, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+13432, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -125890,7 +125911,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+17268, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+17287, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/' || int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '\\')) {
@@ -125904,7 +125925,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+17277, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+17296, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -125928,7 +125949,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+17281, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+17300, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -125946,7 +125967,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+17287, libc.VaList(bp+16, zEntry, zFile))
+		ts+17306, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -125973,7 +125994,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+17330, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+17349, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -126011,7 +126032,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+17362, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+17381, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -126021,7 +126042,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 17399,
+	ts + 17418,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -126177,7 +126198,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+17403, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+17422, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -126185,63 +126206,63 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 }
 
 var pragCName = [57]uintptr{
-	ts + 6409,
-	ts + 17442,
-	ts + 10228,
-	ts + 17446,
-	ts + 17451,
-	ts + 17454,
-	ts + 17464,
-	ts + 17474,
-	ts + 17480,
-	ts + 17484,
-	ts + 17489,
-	ts + 17494,
-	ts + 17502,
+	ts + 6428,
+	ts + 17461,
+	ts + 10247,
+	ts + 17465,
+	ts + 17470,
+	ts + 17473,
+	ts + 17483,
+	ts + 17493,
+	ts + 17499,
+	ts + 17503,
+	ts + 17508,
 	ts + 17513,
-	ts + 17516,
-	ts + 17523,
-	ts + 17484,
-	ts + 17489,
-	ts + 17530,
+	ts + 17521,
+	ts + 17532,
 	ts + 17535,
-	ts + 17538,
-	ts + 17545,
-	ts + 17480,
-	ts + 17484,
-	ts + 17551,
-	ts + 17556,
-	ts + 17561,
-	ts + 17484,
-	ts + 17565,
-	ts + 17489,
-	ts + 17573,
-	ts + 17577,
-	ts + 17582,
-	ts + 12844,
-	ts + 12840,
-	ts + 17588,
-	ts + 17593,
-	ts + 17598,
-	ts + 17442,
-	ts + 17484,
-	ts + 17603,
-	ts + 17610,
+	ts + 17542,
+	ts + 17503,
+	ts + 17508,
+	ts + 17549,
+	ts + 17554,
+	ts + 17557,
+	ts + 17564,
+	ts + 17499,
+	ts + 17503,
+	ts + 17570,
+	ts + 17575,
+	ts + 17580,
+	ts + 17503,
+	ts + 17584,
+	ts + 17508,
+	ts + 17592,
+	ts + 17596,
+	ts + 17601,
+	ts + 12863,
+	ts + 12859,
+	ts + 17607,
+	ts + 17612,
 	ts + 17617,
-	ts + 10228,
-	ts + 17625,
-	ts + 6412,
-	ts + 17631,
-	ts + 17442,
-	ts + 17484,
+	ts + 17461,
+	ts + 17503,
+	ts + 17622,
+	ts + 17629,
 	ts + 17636,
-	ts + 17641,
-	ts + 16837,
-	ts + 17646,
-	ts + 17659,
-	ts + 17668,
-	ts + 17675,
-	ts + 17686,
+	ts + 10247,
+	ts + 17644,
+	ts + 6431,
+	ts + 17650,
+	ts + 17461,
+	ts + 17503,
+	ts + 17655,
+	ts + 17660,
+	ts + 16856,
+	ts + 17665,
+	ts + 17678,
+	ts + 17687,
+	ts + 17694,
+	ts + 17705,
 }
 
 // Definitions of all built-in pragmas
@@ -126259,241 +126280,241 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [67]PragmaName{
-	{FzName: ts + 17694,
+	{FzName: ts + 17713,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17709,
+	{FzName: ts + 17728,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 17724,
+	{FzName: ts + 17743,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17736,
+	{FzName: ts + 17755,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 17752,
+	{FzName: ts + 17771,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 17675,
+	{FzName: ts + 17694,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17765,
+	{FzName: ts + 17784,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17777,
+	{FzName: ts + 17796,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17797,
+	{FzName: ts + 17816,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CellSizeCk)},
-	{FzName: ts + 17813,
+	{FzName: ts + 17832,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 17834,
+	{FzName: ts + 17853,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 17849,
+	{FzName: ts + 17868,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17865,
+	{FzName: ts + 17884,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 17879,
+	{FzName: ts + 17898,
 		FePragTyp: U8(PragTyp_DATA_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17900,
+	{FzName: ts + 17919,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 17913,
+	{FzName: ts + 17932,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 17927,
+	{FzName: ts + 17946,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 17946,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_DeferFKs)},
 	{FzName: ts + 17965,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_DeferFKs)},
+	{FzName: ts + 17984,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 17988,
+	{FzName: ts + 18007,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17997,
+	{FzName: ts + 18016,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 18015,
+	{FzName: ts + 18034,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 18032,
+	{FzName: ts + 18051,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 18045,
+	{FzName: ts + 18064,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 18060,
+	{FzName: ts + 18079,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 18078,
+	{FzName: ts + 18097,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 18088,
+	{FzName: ts + 18107,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 18102,
+	{FzName: ts + 18121,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 18118,
+	{FzName: ts + 18137,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 18143,
+	{FzName: ts + 18162,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 18162,
+	{FzName: ts + 18181,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 18173,
+	{FzName: ts + 18192,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 18184,
+	{FzName: ts + 18203,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 18196,
+	{FzName: ts + 18215,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 18212,
+	{FzName: ts + 18231,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18225,
+	{FzName: ts + 18244,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18244,
+	{FzName: ts + 18263,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 18263,
+	{FzName: ts + 18282,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18276,
+	{FzName: ts + 18295,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18291,
+	{FzName: ts + 18310,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 18301,
+	{FzName: ts + 18320,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 18313,
+	{FzName: ts + 18332,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 18322,
+	{FzName: ts + 18341,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18333,
+	{FzName: ts + 18352,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 18343,
+	{FzName: ts + 18362,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 18355,
+	{FzName: ts + 18374,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 18366,
+	{FzName: ts + 18385,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 18378,
+	{FzName: ts + 18397,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 18395,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_RecTriggers)},
 	{FzName: ts + 18414,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_RecTriggers)},
+	{FzName: ts + 18433,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 18440,
+	{FzName: ts + 18459,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 18455,
+	{FzName: ts + 18474,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 18469,
+	{FzName: ts + 18488,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 18488,
+	{FzName: ts + 18507,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 18502,
+	{FzName: ts + 18521,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 18518,
+	{FzName: ts + 18537,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 18530,
+	{FzName: ts + 18549,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 18541,
+	{FzName: ts + 18560,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 18552,
+	{FzName: ts + 18571,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 18564,
+	{FzName: ts + 18583,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 18575,
+	{FzName: ts + 18594,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 18596,
+	{FzName: ts + 18615,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 18604,
+	{FzName: ts + 18623,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 18619,
+	{FzName: ts + 18638,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 18632,
-		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
 	{FzName: ts + 18651,
+		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
+	{FzName: ts + 18670,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 18666,
+	{FzName: ts + 18685,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -126515,7 +126536,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 18682))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 18701))
 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)}
@@ -126527,10 +126548,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+5017) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+5036) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+18707) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+18726) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -126539,13 +126560,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+9378) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+9397) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+18714) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+18733) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+18719) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+18738) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -126560,9 +126581,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+17636) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17655) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+18731) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+18750) == 0 {
 		return 2
 	} else {
 		return 0
@@ -126576,7 +126597,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+18738, 0)
+				ts+18757, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -126667,19 +126688,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 18800
+		zName = ts + 18819
 		break
 	case OE_SetDflt:
-		zName = ts + 18809
+		zName = ts + 18828
 		break
 	case OE_Cascade:
-		zName = ts + 18821
+		zName = ts + 18840
 		break
 	case OE_Restrict:
-		zName = ts + 18829
+		zName = ts + 18848
 		break
 	default:
-		zName = ts + 18838
+		zName = ts + 18857
 		break
 	}
 	return zName
@@ -126696,7 +126717,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 18848, ts + 18855, ts + 18863, ts + 18867, ts + 18731, ts + 18876,
+	ts + 18867, ts + 18874, ts + 18882, ts + 18886, ts + 18750, ts + 18895,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -126743,13 +126764,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 18880
+			zType = ts + 18899
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 18882
+			zType = ts + 18901
 		} else {
-			zType = ts + 8880
+			zType = ts + 8888
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18884,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18903,
 			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),
@@ -126757,7 +126778,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 18891, ts + 18896, ts + 18904}
+var azEnc = [4]uintptr{uintptr(0), ts + 18910, ts + 18915, ts + 18923}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -126908,6 +126929,7 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp7 int32
 	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
@@ -127004,7 +127026,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+18912, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+18931, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -127043,7 +127065,7 @@ __8:
 	if !(*(*uintptr)(unsafe.Pointer(bp + 496)) != 0) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+4493, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 496))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+4512, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 496))))
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 496)))
 __10:
 	;
@@ -127268,7 +127290,7 @@ __18:
 	if !(zRight != 0) {
 		goto __64
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+18916) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+18935) == 0) {
 		goto __65
 	}
 	b = 2
@@ -127340,7 +127362,7 @@ __72:
 	goto __15
 
 __20:
-	zRet = ts + 18707
+	zRet = ts + 18726
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -127378,7 +127400,7 @@ __79:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __84
 	}
-	zRet = ts + 5017
+	zRet = ts + 5036
 __84:
 	;
 	returnSingleText(tls, v, zRet)
@@ -127665,7 +127687,7 @@ __124:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 560)) == 0) {
 		goto __127
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18921, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18940, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __127:
@@ -127684,7 +127706,7 @@ __128:
 	if !(*(*int8)(unsafe.Pointer(zRight)) != 0) {
 		goto __129
 	}
-	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+16, zRight))
+	Xsqlite3_temp_directory = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+16, zRight))
 	goto __130
 __129:
 	Xsqlite3_temp_directory = uintptr(0)
@@ -127710,7 +127732,7 @@ __131:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 564)) == 0) {
 		goto __134
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18921, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18940, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __134:
@@ -127721,7 +127743,7 @@ __133:
 	if !(*(*int8)(unsafe.Pointer(zRight)) != 0) {
 		goto __135
 	}
-	Xsqlite3_data_directory = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+24, zRight))
+	Xsqlite3_data_directory = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+24, zRight))
 	goto __136
 __135:
 	Xsqlite3_data_directory = uintptr(0)
@@ -127743,7 +127765,7 @@ __137:
 		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+18946, 0)
+		ts+18965, 0)
 	goto __140
 __139:
 	if !(iDb != 1) {
@@ -127797,7 +127819,7 @@ __146:
 __148:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+18999) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+19018) == 0) {
 		goto __149
 	}
 
@@ -127894,13 +127916,13 @@ __162:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 19005
+			return ts + 19024
 		}
-		return ts + 19013
+		return ts + 19032
 	}(),
 		libc.VaList(bp+32, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
-			Xsqlite3ColumnType(tls, pCol, ts+1544),
+			Xsqlite3ColumnType(tls, pCol, ts+1563),
 			func() int32 {
 				if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 {
 					return 1
@@ -127965,7 +127987,7 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __178
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+19020, libc.VaList(bp+88, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+19039, libc.VaList(bp+88, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __179
 	}
@@ -127978,7 +128000,7 @@ __179:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __180
 	}
-	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1480, 0)
+	Xsqlite3ErrorMsg(tls, (*Sqlite3)(unsafe.Pointer(db)).FpParse, ts+1499, 0)
 	(*Parse)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpParse)).Frc = SQLITE_NOMEM
 __180:
 	;
@@ -128011,29 +128033,29 @@ __184:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __185
 	}
-	zType = ts + 11843
+	zType = ts + 11862
 	goto __186
 __185:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __187
 	}
-	zType = ts + 14073
+	zType = ts + 14092
 	goto __188
 __187:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __189
 	}
-	zType = ts + 19036
+	zType = ts + 19055
 	goto __190
 __189:
-	zType = ts + 10228
+	zType = ts + 10247
 __190:
 	;
 __188:
 	;
 __186:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19043,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19062,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -128099,7 +128121,7 @@ __197:
 		goto __199
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19050, libc.VaList(bp+144, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19069, libc.VaList(bp+144, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -128109,7 +128131,7 @@ __197:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __200
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+19055,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+19074,
 		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))))
@@ -128146,8 +128168,8 @@ __203:
 	if !(pIdx1 != 0) {
 		goto __205
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 576)) = [3]uintptr{ts + 19060, ts + 19062, ts + 17513}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19064,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 576)) = [3]uintptr{ts + 19079, ts + 19081, ts + 17532}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19083,
 		libc.VaList(bp+192, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -128180,7 +128202,7 @@ __206:
 	goto __207
 __209:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19070,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19089,
 		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)))
@@ -128202,7 +128224,7 @@ __210:
 		goto __212
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19074, libc.VaList(bp+256, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19093, libc.VaList(bp+256, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __211
 __211:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -128266,7 +128288,7 @@ __222:
 		goto __224
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+8880, libc.VaList(bp+272, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+8888, libc.VaList(bp+272, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __223
 __223:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -128282,7 +128304,7 @@ __225:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __227
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+8880, libc.VaList(bp+280, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+8888, libc.VaList(bp+280, aPragmaName[i6].FzName))
 	goto __226
 __226:
 	i6++
@@ -128317,7 +128339,7 @@ __233:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __235
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19077,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19096,
 		libc.VaList(bp+288, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -128325,7 +128347,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+19086))
+			ts+19105))
 	goto __234
 __234:
 	j2++
@@ -128514,7 +128536,7 @@ __263:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __264:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+19091, libc.VaList(bp+352, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+19110, 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)))
@@ -128731,7 +128753,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+19095, libc.VaList(bp+368, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+19114, 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)
@@ -128842,7 +128864,7 @@ __314:
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+19119,
+		ts+19138,
 		libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
@@ -128941,7 +128963,7 @@ __328:
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+19155, libc.VaList(bp+384, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+19174, 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) {
@@ -128963,7 +128985,7 @@ __333:
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+19175,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+19194,
 		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)
@@ -128976,7 +128998,7 @@ __336:
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+19197,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+19216,
 		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 __339
@@ -128994,11 +129016,11 @@ __338:
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 620)), j4, 3)
 __341:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+19220, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+19239, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+19222,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+19241,
 		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)
 __340:
@@ -129044,7 +129066,7 @@ __346:
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+19242,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+19261,
 		libc.VaList(bp+456, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
@@ -129078,89 +129100,103 @@ __351:
 
 	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+19272)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+19291)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+19277)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+19296)
 	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)
 
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __352
+	}
+	Xsqlite3VdbeAddOp2(tls, v, OP_IdxRowid, *(*int32)(unsafe.Pointer(bp + 624))+j4, 3)
+	jmp7 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 3, 0, r1+int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn)-1)
+
+	Xsqlite3VdbeLoadString(tls, v, 3,
+		ts+19317)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+19353)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp7)
+__352:
+	;
 	label6 = 0
 	kk = 0
-__352:
+__353:
 	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) {
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
 		goto __356
 	}
-	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+	goto __354
 __356:
+	;
+	if !(label6 == 0) {
+		goto __357
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__357:
 	;
 	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:
+	kk++
+	goto __353
+	goto __355
+__355:
 	;
 	if !(label6 != 0) {
-		goto __357
+		goto __358
 	}
 	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
 	Xsqlite3VdbeResolveLabel(tls, v, label6)
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+19272)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+19291)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+19298)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+19364)
 	Xsqlite3VdbeGoto(tls, v, jmp5-1)
 	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-__357:
+__358:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __358
+		goto __359
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__359:
+__360:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __361
+		goto __362
 	}
 	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 __362
+		goto __363
 	}
-	goto __360
-__362:
+	goto __361
+__363:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
-	goto __360
-__360:
-	kk++
-	goto __359
 	goto __361
 __361:
+	kk++
+	goto __360
+	goto __362
+__362:
 	;
 	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)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+19391)
 	Xsqlite3VdbeGoto(tls, v, jmp5)
 	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
-__358:
+__359:
 	;
 	Xsqlite3VdbeJumpHere(tls, v, jmp4)
 	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 640)))
@@ -129177,20 +129213,20 @@ __347:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 620)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __363
+		goto __364
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+19352)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+19418)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__364:
+__365:
 	if !(pIdx5 != 0) {
-		goto __366
-	}
-	if !(pPk1 == pIdx5) {
 		goto __367
 	}
-	goto __365
-__367:
+	if !(pPk1 == pIdx5) {
+		goto __368
+	}
+	goto __366
+__368:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 624))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -129199,21 +129235,21 @@ __367:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __365
-__365:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __364
 	goto __366
 __366:
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
+	goto __365
+	goto __367
+__367:
 	;
 	if !(pPk1 != 0) {
-		goto __368
+		goto __369
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__368:
+__369:
 	;
-__363:
+__364:
 	;
 	goto __298
 __298:
@@ -129231,14 +129267,14 @@ __273:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __369
+		goto __370
 	}
 	(*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 + 19381
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 19447
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__369:
+__370:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -129246,27 +129282,27 @@ __369:
 
 __46:
 	if !!(zRight != 0) {
-		goto __370
+		goto __371
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __372
-	}
-	goto pragma_out
-__372:
-	;
-	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __371
-__370:
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
 		goto __373
 	}
+	goto pragma_out
+__373:
+	;
+	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
+	goto __372
+__371:
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
+		goto __374
+	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__374:
+__375:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __376
+		goto __377
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __377
+		goto __378
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -129275,25 +129311,25 @@ __374:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __376
-__377:
-	;
-	goto __375
-__375:
-	pEnc += 16
-	goto __374
-	goto __376
-__376:
-	;
-	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __378
-	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19384, libc.VaList(bp+464, zRight))
+	goto __377
 __378:
 	;
-__373:
+	goto __376
+__376:
+	pEnc += 16
+	goto __375
+	goto __377
+__377:
 	;
-__371:
+	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
+		goto __379
+	}
+	Xsqlite3ErrorMsg(tls, pParse, ts+19450, libc.VaList(bp+464, zRight))
+__379:
+	;
+__374:
+	;
+__372:
 	;
 	goto __15
 
@@ -129301,15 +129337,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 __379
+		goto __380
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __381
+		goto __382
 	}
 	goto __15
-__381:
+__382:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -129317,41 +129353,41 @@ __381:
 	(*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 __382
+		goto __383
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__382:
+__383:
 	;
-	goto __380
-__379:
+	goto __381
+__380:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __383
+		goto __384
 	}
 	goto __15
-__383:
+__384:
 	;
 	(*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)
-__380:
+__381:
 	;
 	goto __15
 
 __48:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__384:
+__385:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __385
+		goto __386
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __384
-__385:
+	goto __385
+__386:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -129366,31 +129402,31 @@ __49:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __386
-	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18714) == 0) {
 		goto __387
 	}
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18733) == 0) {
+		goto __388
+	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __388
-__387:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+19409) == 0) {
-		goto __389
+	goto __389
+__388:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+19475) == 0) {
+		goto __390
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __390
-__389:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18867) == 0) {
-		goto __391
+	goto __391
+__390:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18886) == 0) {
+		goto __392
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
+__392:
+	;
 __391:
 	;
-__390:
+__389:
 	;
-__388:
-	;
-__386:
+__387:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -129400,10 +129436,10 @@ __386:
 
 __50:
 	if !(zRight != 0) {
-		goto __392
+		goto __393
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__392:
+__393:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -129423,19 +129459,19 @@ __51:
 
 __52:
 	if !(zRight != 0) {
-		goto __393
+		goto __394
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __395
+		goto __396
 	}
 	goto __15
-__395:
+__396:
 	;
-	goto __394
-__393:
-	opMask = U32(0xfffe)
+	goto __395
 __394:
+	opMask = U32(0xfffe)
+__395:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -129444,86 +129480,86 @@ __394:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__396:
+__397:
 	if !(iDb <= iDbLast) {
-		goto __398
-	}
-	if !(iDb == 1) {
 		goto __399
 	}
-	goto __397
-__399:
+	if !(iDb == 1) {
+		goto __400
+	}
+	goto __398
+__400:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__400:
+__401:
 	if !(k4 != 0) {
-		goto __402
+		goto __403
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __403
+		goto __404
 	}
-	goto __401
-__403:
+	goto __402
+__404:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__404:
+__405:
 	if !(pIdx6 != 0) {
-		goto __406
-	}
-	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
 		goto __407
 	}
+	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
+		goto __408
+	}
 	szThreshold = int16(0)
-	goto __406
-__407:
+	goto __407
+__408:
 	;
-	goto __405
-__405:
-	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __404
 	goto __406
 __406:
+	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
+	goto __405
+	goto __407
+__407:
 	;
 	if !(szThreshold != 0) {
-		goto __408
+		goto __409
 	}
 	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))
 
-__408:
+__409:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+19417,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+19483,
 		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 __409
+		goto __410
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __410
-__409:
-	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+	goto __411
 __410:
+	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
+__411:
 	;
-	goto __401
-__401:
-	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __400
 	goto __402
 __402:
+	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
+	goto __401
+	goto __403
+__403:
 	;
-	goto __397
-__397:
-	iDb++
-	goto __396
 	goto __398
 __398:
+	iDb++
+	goto __397
+	goto __399
+__399:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -129531,36 +129567,36 @@ __398:
 __53:
 	;
 	if !(zRight != 0) {
-		goto __411
+		goto __412
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__411:
+__412:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __412
+		goto __413
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__412:
+__413:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __55:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK) {
-		goto __413
+		goto __414
 	}
 	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 __414
+		goto __415
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 656)))
-__414:
+__415:
 	;
-__413:
+__414:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -129569,10 +129605,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __415
+		goto __416
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664))&int64(0x7fffffff)))
-__415:
+__416:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -129581,10 +129617,10 @@ __57:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+672) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 672)) >= int64(0)) {
-		goto __416
+		goto __417
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 672)) & int64(0x7fffffff))
-__416:
+__417:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -129592,10 +129628,10 @@ __416:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __417
+		goto __418
 	}
 
-__417:
+__418:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -129647,14 +129683,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{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},
+	{FzName: ts + 19501, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 19506, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 19512, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 19521, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 19530, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 19538, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 19546},
+	{FzName: ts + 19553},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -129706,7 +129742,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+19493)
+	Xsqlite3_str_appendall(tls, bp+32, ts+19559)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -129714,7 +129750,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+19508, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+19574, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -129727,19 +129763,19 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+19515, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+19581, 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+19521)
+		Xsqlite3_str_appendall(tls, bp+32, ts+19587)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+19533)
+		Xsqlite3_str_appendall(tls, bp+32, ts+19599)
 		j++
 	}
-	Xsqlite3_str_append(tls, bp+32, ts+6309, 1)
+	Xsqlite3_str_append(tls, bp+32, ts+6328, 1)
 	Xsqlite3StrAccumFinish(tls, bp+32)
 
 	rc = Xsqlite3_declare_vtab(tls, db, bp+64)
@@ -129755,7 +129791,7 @@ __3:
 			(*PragmaVtab)(unsafe.Pointer(pTab)).FnHidden = U8(j)
 		}
 	} else {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	}
 
 	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
@@ -129903,7 +129939,7 @@ __1:
 		var zText uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 
 		if zText != 0 {
-			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, zText))
+			*(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, zText))
 			if *(*uintptr)(unsafe.Pointer(pCsr + 24 + uintptr(j)*8)) == uintptr(0) {
 				return SQLITE_NOMEM
 			}
@@ -129919,13 +129955,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+19548)
+	Xsqlite3_str_appendall(tls, bp+32, ts+19614)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+19556, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+19622, 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+19560, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+19626, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -129934,7 +129970,7 @@ __3:
 	rc = Xsqlite3_prepare_v2(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
 	Xsqlite3_free(tls, zSql)
 	if rc != SQLITE_OK {
-		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
+		(*PragmaVtab)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+24, Xsqlite3_errmsg(tls, (*PragmaVtab)(unsafe.Pointer(pTab)).Fdb)))
 		return rc
 	}
 	return pragmaVtabNext(tls, pVtabCursor)
@@ -130002,33 +130038,33 @@ 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+19564, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+19630, 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, 137196)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137249)
 	} else {
 		var z uintptr
 		var zObj uintptr
 		if *(*uintptr)(unsafe.Pointer(azObj + 1*8)) != 0 {
 			zObj = *(*uintptr)(unsafe.Pointer(azObj + 1*8))
 		} else {
-			zObj = ts + 6360
+			zObj = ts + 6379
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+19592, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+19658, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+19623, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+19689, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137256)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 19631,
-	ts + 19638,
-	ts + 19650,
+	ts + 19697,
+	ts + 19704,
+	ts + 19716,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -130088,7 +130124,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+15497)
+				corruptSchema(tls, pData, argv, ts+15516)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -130120,13 +130156,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+19661)
+			corruptSchema(tls, pData, argv, ts+19727)
 		} 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+15497)
+				corruptSchema(tls, pData, argv, ts+15516)
 			}
 		}
 	}
@@ -130159,16 +130195,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 + 10228
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 10247
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 7741
+			return ts + 7760
 		}
-		return ts + 7235
+		return ts + 7254
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 9290
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 19674
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 9309
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 19740
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -130262,7 +130298,7 @@ __10:
 		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+13127)
+		ts+13146)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __15:
@@ -130297,7 +130333,7 @@ __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)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+19812)
 	rc = SQLITE_ERROR
 	goto initone_error_out
 __19:
@@ -130311,7 +130347,7 @@ __20:
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+19770,
+		ts+19836,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -130584,7 +130620,7 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
 	(*Parse)(unsafe.Pointer(pParse)).Fdb = db
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1480, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1499, 0)
 	}
 }
 
@@ -130612,7 +130648,7 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, bp+16, ts+1480, 0)
+	Xsqlite3ErrorMsg(tls, bp+16, ts+1499, 0)
 __1:
 	;
 	if !(prepFlags&U32(SQLITE_PREPARE_PERSISTENT) != 0) {
@@ -130643,7 +130679,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+19804, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+19870, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -130673,7 +130709,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+19834, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+19900, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -130733,7 +130769,7 @@ __21:
 	if !((*Parse)(unsafe.Pointer(bp+16)).FzErrMsg != 0) {
 		goto __22
 	}
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+4493, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+4512, libc.VaList(bp+8, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg))
 	Xsqlite3DbFree(tls, db, (*Parse)(unsafe.Pointer(bp+16)).FzErrMsg)
 	goto __23
 __22:
@@ -130769,7 +130805,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, 137995)
+		return Xsqlite3MisuseError(tls, 138048)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -130868,7 +130904,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, 138143)
+		return Xsqlite3MisuseError(tls, 138196)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -131186,8 +131222,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 + 12272
-		var zSp2 uintptr = ts + 12272
+		var zSp1 uintptr = ts + 12291
+		var zSp2 uintptr = ts + 12291
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -131195,13 +131231,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19853, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+19919, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 19883))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 19949))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -131376,7 +131412,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+19917, libc.VaList(bp, 0))
+					ts+19983, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -131421,7 +131457,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+19967, libc.VaList(bp+8, zName))
+						ts+20033, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -131432,7 +131468,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+20031,
+							Xsqlite3ErrorMsg(tls, pParse, ts+20097,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -131476,7 +131512,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 7938, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 7957, 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.
@@ -132060,16 +132096,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 20068
+		z = ts + 20134
 		break
 	case TK_INTERSECT:
-		z = ts + 20078
+		z = ts + 20144
 		break
 	case TK_EXCEPT:
-		z = ts + 20088
+		z = ts + 20154
 		break
 	default:
-		z = ts + 20095
+		z = ts + 20161
 		break
 	}
 	return z
@@ -132079,7 +132115,7 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20101, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20167, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
@@ -132105,11 +132141,11 @@ 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 {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20190, libc.VaList(bp, func() uintptr {
 		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
-			return ts + 20155
+			return ts + 20221
 		}
-		return ts + 1544
+		return ts + 1563
 	}()))
 
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
@@ -132297,8 +132333,8 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 				}
 
 				if iCol < 0 {
-					zType = ts + 1109
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 17625
+					zType = ts + 1128
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 17644
 				} 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))
@@ -132437,13 +132473,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 17625
+				zCol = ts + 17644
 			} 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+13413, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+13432, 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))
@@ -132451,7 +132487,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+20170, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+20236, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -132541,7 +132577,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 17625
+					zName = ts + 17644
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -132551,7 +132587,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+20170, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+20236, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -132567,7 +132603,7 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+20179, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+20245, 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)
@@ -132650,8 +132686,6 @@ __1:
 		(*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
@@ -132666,12 +132700,15 @@ __1:
 			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
 				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
 			}
+			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)
+			}
 		}
 		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
+				zType = ts + 20253
 			} else {
 				zType = uintptr(0)
 				for j = 1; j < SQLITE_N_STDTYPE; j++ {
@@ -132887,7 +132924,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20191, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20257, 0)
 	return
 __1:
 	;
@@ -132978,7 +133015,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20240, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20306, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -132998,7 +133035,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20282, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20348, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -133035,7 +133072,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20288, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20354, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -133069,11 +133106,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+20303, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20369, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
-			return ts + 1544
+			return ts + 1563
 		}
-		return ts + 20326
+		return ts + 20392
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -133174,8 +133211,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20328, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20343, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20394, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20409, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -133222,7 +133259,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20068, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20134, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -133289,7 +133326,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+20362, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20428, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -133351,7 +133388,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+20362, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20428, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -133504,10 +133541,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+20383, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+20449, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+20429,
+			ts+20495,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -133761,8 +133798,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+8586)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+8586)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+8594)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+8594)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -133789,13 +133826,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+20511, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20577, 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+20522, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20588, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -133807,7 +133844,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+20527, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20593, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -133995,7 +134032,8 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 				Xsqlite3VectorErrorMsg(tls, (*SubstContext)(unsafe.Pointer(pSubst)).FpParse, pCopy)
 			} else {
 				var db uintptr = (*Parse)(unsafe.Pointer((*SubstContext)(unsafe.Pointer(pSubst)).FpParse)).Fdb
-				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 && int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN {
+				if (*SubstContext)(unsafe.Pointer(pSubst)).FisOuterJoin != 0 &&
+					(int32((*Expr)(unsafe.Pointer(pCopy)).Fop) != TK_COLUMN || (*Expr)(unsafe.Pointer(pCopy)).FiTable != (*SubstContext)(unsafe.Pointer(pSubst)).FiNewTable) {
 					libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
 					(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_IF_NULL_ROW)
 					(*Expr)(unsafe.Pointer(bp)).FpLeft = pCopy
@@ -134035,7 +134073,7 @@ func substExpr(tls *libc.TLS, pSubst uintptr, pExpr uintptr) uintptr {
 								if pColl != 0 {
 									return (*CollSeq)(unsafe.Pointer(pColl)).FzName
 								}
-								return ts + 1089
+								return ts + 1108
 							}())
 					}
 
@@ -134823,12 +134861,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+16521) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+16540) == 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+16525) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+16544) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -134894,7 +134932,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+20533, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+20599, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -134977,7 +135015,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+20551, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+20617, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -135106,7 +135144,7 @@ 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+20574, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+20640, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
@@ -135129,7 +135167,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+20594, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+20660, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -135145,7 +135183,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20637
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20703
 		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 {
@@ -135171,7 +135209,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+20660,
+				Xsqlite3ErrorMsg(tls, pParse, ts+20726,
 					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
@@ -135182,9 +135220,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 + 20698
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20764
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20732
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20798
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -135231,7 +135269,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+20770, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+20836, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -135343,7 +135381,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+20774,
+				Xsqlite3ErrorMsg(tls, pParse, ts+20840,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -135362,7 +135400,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+20813,
+						Xsqlite3ErrorMsg(tls, pParse, ts+20879,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -135370,7 +135408,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+16090,
+					Xsqlite3ErrorMsg(tls, pParse, ts+16109,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -135471,7 +135509,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 7798
+							zSchemaName = ts + 7817
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -135486,7 +135524,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+20844, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+20910, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -135551,7 +135589,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+20849,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+20915,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -135563,7 +135601,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+13413, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+13432, 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)
@@ -135582,9 +135620,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+20858, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+20924, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+20876, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+20942, 0)
 					}
 				}
 			}
@@ -135594,7 +135632,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+20896, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+20962, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -135732,7 +135770,7 @@ func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect ui
 	(*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)
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSelect)).FpGroupBy)).FnExpr)
 		} 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)
 		}
@@ -135816,13 +135854,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+20927, 0)
+					ts+20993, 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+20978, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21044, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -136011,19 +136049,19 @@ 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+21011,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21077,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 21023
+						return ts + 21089
 					}
-					return ts + 1544
+					return ts + 1563
 				}(),
 				func() uintptr {
 					if bCover != 0 {
 						return (*Index)(unsafe.Pointer(pIdx)).FzName
 					}
-					return ts + 1544
+					return ts + 1563
 				}()))
 	}
 }
@@ -136036,7 +136074,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+9290)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+9309)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -136343,7 +136381,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+21046,
+		ts+21112,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -136404,7 +136442,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21100,
+	Xsqlite3ErrorMsg(tls, pParse, ts+21166,
 		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:
@@ -136508,7 +136546,7 @@ __27:
 	if !((*SrcItem)(unsafe.Pointer(pItem1)).FcolUsed == uint64(0) && (*SrcItem)(unsafe.Pointer(pItem1)).FzName != uintptr(0)) {
 		goto __30
 	}
-	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1544, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
+	Xsqlite3AuthCheck(tls, pParse, SQLITE_READ, (*SrcItem)(unsafe.Pointer(pItem1)).FzName, ts+1563, (*SrcItem)(unsafe.Pointer(pItem1)).FzDatabase)
 __30:
 	;
 	pSub1 = (*SrcItem)(unsafe.Pointer(pItem1)).FpSelect
@@ -136546,7 +136584,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+21140, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21206, 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)
@@ -136605,7 +136643,7 @@ __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21155, libc.VaList(bp+40, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21221, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
@@ -137076,9 +137114,9 @@ __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 + 21171
+				return ts + 21237
 			}
-			return ts + 21180
+			return ts + 21246
 		}())
 
 	groupBySort = 1
@@ -137429,7 +137467,7 @@ __65:
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
 		goto __146
 	}
-	explainTempTable(tls, pParse, ts+21171)
+	explainTempTable(tls, pParse, ts+21237)
 __146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
@@ -137512,7 +137550,7 @@ __7:
 	if !(i < nCol) {
 		goto __9
 	}
-	z = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
+	z = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(colv + uintptr(i)*8))))
 	if !(z == uintptr(0)) {
 		goto __10
 	}
@@ -137534,7 +137572,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+21189, 0)
+		ts+21255, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -137630,7 +137668,7 @@ func Xsqlite3_get_table(tls *libc.TLS, db uintptr, zSql uintptr, pazResult uintp
 		if (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
 			if pzErrMsg != 0 {
 				Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(pzErrMsg)))
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg))
 			}
 			Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(bp+8)).FzErrMsg)
 		}
@@ -137767,7 +137805,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+21254, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+21320, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -137811,7 +137849,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+21300, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+21366, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -137829,7 +137867,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21308, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+21374, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -137841,7 +137879,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+21300, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+21366, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -137856,11 +137894,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21349, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+21415, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
+
 __17:
 	;
 	goto trigger_cleanup
@@ -137868,22 +137907,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7733, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7752, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21375, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+21441, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21413,
+	Xsqlite3ErrorMsg(tls, pParse, ts+21479,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 21450
+				return ts + 21516
 			}
-			return ts + 21457
+			return ts + 21523
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -137892,7 +137931,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+21463, libc.VaList(bp+24, pTableName+8))
+		ts+21529, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -137921,9 +137960,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 7741
+			return ts + 7760
 		}
-		return ts + 7235
+		return ts + 7254
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -138041,7 +138080,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+21300, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+21366, 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
@@ -138074,7 +138113,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+21509,
+		ts+21575,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -138099,13 +138138,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+21557,
+		ts+21623,
 		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+21632, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+21698, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -138361,7 +138400,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21661, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+21727, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -138400,9 +138439,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 + 7741
+				return ts + 7760
 			}
-			return ts + 7235
+			return ts + 7254
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -138414,7 +138453,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21681,
+			ts+21747,
 			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)
@@ -138528,12 +138567,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+21743,
+		ts+21809,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 21791
+				return ts + 21857
 			}
-			return ts + 21798
+			return ts + 21864
 		}()))
 __15:
 	;
@@ -138647,7 +138686,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+21805, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+21871, 0)
 	return 1
 }
 
@@ -138713,7 +138752,7 @@ func codeReturningTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab
 	}
 	Xsqlite3ExprListDelete(tls, db, (*Select)(unsafe.Pointer(bp)).FpEList)
 	pNew = sqlite3ExpandReturning(tls, pParse, (*Returning)(unsafe.Pointer(pReturning)).FpReturnEL, pTab)
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0) {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
 		libc.Xmemset(tls, bp+240, 0, uint64(unsafe.Sizeof(NameContext{})))
 		if (*Returning)(unsafe.Pointer(pReturning)).FnRetCol == 0 {
 			(*Returning)(unsafe.Pointer(pReturning)).FnRetCol = (*ExprList)(unsafe.Pointer(pNew)).FnExpr
@@ -138767,7 +138806,7 @@ func codeTriggerProgram(tls *libc.TLS, pParse uintptr, pStepList uintptr, orconf
 
 		if (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan != 0 {
 			Xsqlite3VdbeAddOp4(tls, v, OP_Trace, 0x7fffffff, 1, 0,
-				Xsqlite3MPrintf(tls, db, ts+7432, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
+				Xsqlite3MPrintf(tls, db, ts+7451, libc.VaList(bp, (*TriggerStep)(unsafe.Pointer(pStep)).FzSpan)),
 				-6)
 		}
 
@@ -138877,7 +138916,7 @@ 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+21847, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+21913, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
@@ -139470,7 +139509,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+21861,
+		ts+21927,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -139502,7 +139541,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+21897, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+21963, 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:
@@ -139512,7 +139551,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 9065
+				return ts + 9084
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -139828,7 +139867,12 @@ __74:
 	goto __77
 __76:
 	flags = WHERE_ONEPASS_DESIRED
-	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) && !(pTrigger != 0) && !(hasFK != 0) && !(chngKey != 0) && !(*(*int32)(unsafe.Pointer(bp + 104)) != 0)) {
+	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) &&
+		!(pTrigger != 0) &&
+		!(hasFK != 0) &&
+		!(chngKey != 0) &&
+		!(*(*int32)(unsafe.Pointer(bp + 104)) != 0) &&
+		(*NameContext)(unsafe.Pointer(bp+40)).FncFlags&NC_Subquery == 0) {
 		goto __78
 	}
 	flags = flags | WHERE_ONEPASS_MULTIROW
@@ -140382,7 +140426,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+21916)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+21982)
 __169:
 	;
 update_cleanup:
@@ -140688,10 +140732,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+21929, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+21995, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+21933, libc.VaList(bp+8, bp+216))
+				ts+21999, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -140782,7 +140826,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+13502, -1)
+				ts+13521, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -140814,7 +140858,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+22006, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+22010, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+22072, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+22076, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -140962,14 +141006,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+22014)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+22080)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+22054)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+22120)
 	return SQLITE_ERROR
 __2:
 	;
@@ -140980,7 +141024,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+22097)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+22163)
 	return SQLITE_ERROR
 __5:
 	;
@@ -140989,7 +141033,7 @@ __5:
 	*(*uint32)(unsafe.Pointer(db + 76)) |= uint32(SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE)
 	goto __4
 __3:
-	zOut = ts + 1544
+	zOut = ts + 1563
 __4:
 	;
 	saved_flags = (*Sqlite3)(unsafe.Pointer(db)).Fflags
@@ -141008,7 +141052,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+22115, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+22181, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -141028,7 +141072,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+22138)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+22204)
 	goto end_of_vacuum
 __8:
 	;
@@ -141043,7 +141087,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+15860)
+	rc = execSql(tls, db, pzErrMsg, ts+15879)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -141088,7 +141132,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+22165,
+		ts+22231,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -141097,7 +141141,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+22273,
+		ts+22339,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -141108,7 +141152,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+22327,
+		ts+22393,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -141119,7 +141163,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+22478,
+		ts+22544,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -141464,7 +141508,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+13729, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13748, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -141548,11 +141592,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+22608, libc.VaList(bp, pParse+272))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+22674, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+22632,
+			ts+22698,
 			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,
@@ -141562,7 +141606,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+22731, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+22797, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -141623,7 +141667,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+22750, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+22816, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -141651,9 +141695,11 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	(*VtabCtx)(unsafe.Pointer(bp + 32)).FbDeclared = 0
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = bp + 32
+	(*Table)(unsafe.Pointer(pTab)).FnTabRef++
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{xConstruct})).f(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, pVTable+16, bp+64)
+	Xsqlite3DeleteTable(tls, db, pTab)
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = (*VtabCtx)(unsafe.Pointer(bp + 32)).FpPrior
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -141661,9 +141707,9 @@ 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+22792, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+22858, libc.VaList(bp+8, zModuleName))
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+4493, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+4512, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 		}
 		Xsqlite3DbFree(tls, db, pVTable)
@@ -141673,7 +141719,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 + 22822
+			var zFormat uintptr = ts + 22888
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -141685,12 +141731,12 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 			*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) = pVTable
 
 			for iCol = 0; iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol); iCol++ {
-				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1544)
+				var zType uintptr = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, ts+1563)
 				var nType int32
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+17516, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+17535, 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
@@ -141747,13 +141793,13 @@ 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+22868, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22934, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxConnect, bp+16)
 		if rc != SQLITE_OK {
-			Xsqlite3ErrorMsg(tls, pParse, ts+4493, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+4512, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 16))))
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 		}
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 16)))
@@ -141805,7 +141851,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+22868, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+22934, 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)
@@ -141839,7 +141885,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, 151030)
+		return Xsqlite3MisuseError(tls, 151102)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -141881,7 +141927,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR,
 			func() uintptr {
 				if (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg != 0 {
-					return ts + 4493
+					return ts + 4512
 				}
 				return uintptr(0)
 			}(), libc.VaList(bp, (*Parse)(unsafe.Pointer(bp+8)).FzErrMsg))
@@ -142249,7 +142295,7 @@ func Xsqlite3VtabEponymousTableInit(tls *libc.TLS, pParse uintptr, pMod uintptr)
 	addModuleArgument(tls, pParse, pTab, Xsqlite3DbStrDup(tls, db, (*Table)(unsafe.Pointer(pTab)).FzName))
 	rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer(pModule)).FxConnect, bp+8)
 	if rc != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+4493, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+		Xsqlite3ErrorMsg(tls, pParse, ts+4512, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 		Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		Xsqlite3VtabEponymousTableClear(tls, db, pMod)
 	}
@@ -142292,7 +142338,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, 151521)
+		rc = Xsqlite3MisuseError(tls, 151593)
 	} else {
 		ap = va
 		switch op {
@@ -142319,7 +142365,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 151539)
+				rc = Xsqlite3MisuseError(tls, 151611)
 				break
 
 			}
@@ -142550,10 +142596,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 + 22887
+		return ts + 22953
 	}
 	if i == -1 {
-		return ts + 17625
+		return ts + 17644
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -142562,35 +142608,35 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+22894, 5)
+		Xsqlite3_str_append(tls, pStr, ts+22960, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+22900, 1)
+		Xsqlite3_str_append(tls, pStr, ts+22966, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+14119, 1)
+			Xsqlite3_str_append(tls, pStr, ts+14138, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+6309, 1)
+		Xsqlite3_str_append(tls, pStr, ts+6328, 1)
 	}
 
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+22900, 1)
+		Xsqlite3_str_append(tls, pStr, ts+22966, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+14119, 1)
+			Xsqlite3_str_append(tls, pStr, ts+14138, 1)
 		}
-		Xsqlite3_str_append(tls, pStr, ts+6360, 1)
+		Xsqlite3_str_append(tls, pStr, ts+6379, 1)
 	}
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+6309, 1)
+		Xsqlite3_str_append(tls, pStr, ts+6328, 1)
 	}
 }
 
@@ -142607,29 +142653,29 @@ 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+22902, 2)
+	Xsqlite3_str_append(tls, pStr, ts+22968, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+22894, 5)
+			Xsqlite3_str_append(tls, pStr, ts+22960, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 22905
+				return ts + 22971
 			}
-			return ts + 22910
+			return ts + 22976
 		}(), 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+22918)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+22984)
 		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+22920)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+22986)
 	}
-	Xsqlite3_str_append(tls, pStr, ts+6309, 1)
+	Xsqlite3_str_append(tls, pStr, ts+6328, 1)
 }
 
 // This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
@@ -142670,11 +142716,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+22922, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+22988, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 22928
+				return ts + 22994
 			}
-			return ts + 22935
+			return ts + 23001
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -142684,43 +142730,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 + 12328
+					zFmt = ts + 12347
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 22940
+				zFmt = ts + 23006
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 22973
+				zFmt = ts + 23039
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 22998
+				zFmt = ts + 23064
 			} else {
-				zFmt = ts + 23016
+				zFmt = ts + 23082
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+23025, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+23091, 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 + 17625
-			Xsqlite3_str_appendf(tls, bp+64, ts+23033, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 17644
+			Xsqlite3_str_appendf(tls, bp+64, ts+23099, 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+23064, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+23130, 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+23074, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+23140, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+23079,
+			Xsqlite3_str_appendf(tls, bp+64, ts+23145,
 				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+23106, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+23172, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -142752,25 +142798,25 @@ 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+23117, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+23183, 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+22905, 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+22971, 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+23138, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+23204, 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+22894, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+22960, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+22905, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+22971, libc.VaList(bp+16, z))
 		}
 	}
-	Xsqlite3_str_append(tls, bp+24, ts+6309, 1)
+	Xsqlite3_str_append(tls, bp+24, ts+6328, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
@@ -144364,7 +144410,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23146, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23212, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -144392,7 +144438,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23161, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23227, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -144910,7 +144956,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+23170, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23236, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -145268,10 +145314,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{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)},
+	{FzOp: ts + 17493, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 16823, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 16343, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 23250, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -145761,12 +145807,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+23191, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+23257, 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+23191, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+23257, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -145845,7 +145891,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 + 8121
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 9070
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -145939,7 +145985,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 23232
+				return ts + 23298
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -146315,7 +146361,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+23239,
+			Xsqlite3ErrorMsg(tls, pParse, ts+23305,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -146331,7 +146377,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 		pRhs = Xsqlite3PExpr(tls, pParse, TK_UPLUS,
 			Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*ExprList_item)(unsafe.Pointer(pArgs+8+uintptr(j)*32)).FpExpr, 0), uintptr(0))
 		pTerm = Xsqlite3PExpr(tls, pParse, TK_EQ, pColRef, pRhs)
-		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ|JT_RIGHT) != 0 {
 			joinType = U32(EP_OuterON)
 		} else {
 			joinType = U32(EP_InnerON)
@@ -147049,7 +147095,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+23275, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+23341, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -147120,7 +147166,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 23301
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 23367
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -147294,6 +147340,10 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	var iCur int32
+	var saved_pIdxEpr uintptr
+
+	saved_pIdxEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 
 	addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	for __ccgo := true; __ccgo; __ccgo = iLevel < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel) {
@@ -147337,9 +147387,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, n)
 			var jj int32
 			for jj = 0; jj < n; jj++ {
-				var iCol int32 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(jj)*2)))
-
-				Xsqlite3ExprCodeGetColumnOfTable(tls, v, (*Index)(unsafe.Pointer(pIdx)).FpTable, iCur, iCol, r1+jj)
+				Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pIdx, iCur, jj, r1+jj)
 			}
 			Xsqlite3VdbeAddOp4Int(tls, v, OP_FilterAdd, (*WhereLevel)(unsafe.Pointer(pLevel)).FregFilter, 0, r1, n)
 			Xsqlite3ReleaseTempRange(tls, pParse, r1, n)
@@ -147373,6 +147421,7 @@ func sqlite3ConstructBloomFilter(tls *libc.TLS, pWInfo uintptr, iLevel int32, pL
 		}
 	}
 	Xsqlite3VdbeJumpHere(tls, v, addrOnce)
+	(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = saved_pIdxEpr
 }
 
 func allocateIndexInfo(tls *libc.TLS, pWInfo uintptr, pWC uintptr, mUnusable Bitmask, pSrc uintptr, pmNoOmit uintptr) uintptr {
@@ -147486,7 +147535,7 @@ __3:
 		uint64(unsafe.Sizeof(sqlite3_index_orderby{}))*uint64(nOrderBy)+uint64(unsafe.Sizeof(HiddenIndexInfo1{}))+
 		uint64(unsafe.Sizeof(uintptr(0)))*uint64(nTerm))
 	if pIdxInfo == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+1480, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+1499, 0)
 		return uintptr(0)
 	}
 	pHidden = pIdxInfo + 1*96
@@ -147608,9 +147657,9 @@ func vtabBestIndex(tls *libc.TLS, pParse uintptr, pTab uintptr, p uintptr) int32
 		if rc == SQLITE_NOMEM {
 			Xsqlite3OomFault(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb)
 		} else if !(int32((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+4493, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
+			Xsqlite3ErrorMsg(tls, pParse, ts+4512, libc.VaList(bp, Xsqlite3ErrStr(tls, rc)))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+4493, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
+			Xsqlite3ErrorMsg(tls, pParse, ts+4512, libc.VaList(bp+8, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg))
 		}
 	}
 	Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg)
@@ -147631,11 +147680,16 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 
 	_ = pParse
 
+	if !((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol)
+	} else {
+		nField = int32((*Index)(unsafe.Pointer(pIdx)).FnColumn)
+	}
 	nField = func() int32 {
-		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < (*Index)(unsafe.Pointer(pIdx)).FnSample {
+		if int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField) < nField {
 			return int32((*UnpackedRecord)(unsafe.Pointer(pRec)).FnField)
 		}
-		return (*Index)(unsafe.Pointer(pIdx)).FnSample
+		return nField
 	}()
 	iCol = 0
 	iSample = (*Index)(unsafe.Pointer(pIdx)).FnSample * nField
@@ -149216,7 +149270,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+23312, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23378, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -149274,7 +149328,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+23312, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+23378, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -149672,7 +149726,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+23338, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+23404, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -150279,7 +150333,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23373, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23439, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -150314,6 +150368,10 @@ __3:
 			if int32((*WherePath)(unsafe.Pointer(pFrom)).FisOrdered) == (*ExprList)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpOrderBy)).FnExpr {
 				(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_ORDERED)
 			}
+			if (*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy != 0 &&
+				int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) > (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr {
+				(*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat = I8((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpOrderBy)).FnExpr)
+			}
 		} else {
 			(*WhereInfo)(unsafe.Pointer(pWInfo)).FrevMask = (*WherePath)(unsafe.Pointer(pFrom)).FrevLoop
 			if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnOBSat) <= 0 {
@@ -150608,6 +150666,9 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
+		if Xsqlite3IndexAffinityStr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pIdx) != 0 {
+			(*IndexedExpr)(unsafe.Pointer(p)).Faff = U8(*(*int8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FzColAff + uintptr(i))))
+		}
 		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
@@ -150760,7 +150821,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+23391, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+23457, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -150824,7 +150885,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+23419, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+23485, 0)
 	goto __5
 __4:
 	ii = 0
@@ -151706,7 +151767,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+23437, -1)
+		pCtx, ts+23503, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -151839,7 +151900,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+23493, -1)
+					pCtx, ts+23559, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -151929,17 +151990,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-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))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 23604))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 23615))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 23626))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 23631))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 23644))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 23654))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 23660))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 23671))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 23681))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 23693))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 23698))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -151985,7 +152046,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23636, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23702, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -152029,12 +152090,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+23655, 0)
+			ts+23721, 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+23726, 0)
+				ts+23792, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -152057,7 +152118,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+9290)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+9309)
 					}
 					break
 				}
@@ -152263,7 +152324,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+23789, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+23855, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -152379,7 +152440,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+8882))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+8890))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -152494,7 +152555,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+23815, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23881, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -152559,15 +152620,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 + 23847
+				zErr = ts + 23913
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 23864
+				zErr = ts + 23930
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 23880
+				zErr = ts + 23946
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23900, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+23966, 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 {
@@ -152588,7 +152649,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+23933, 0)
+				ts+23999, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -152726,7 +152787,7 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regZero)
 	if eCond >= WINDOW_STARTING_NUM {
 		var regString int32 = Xsqlite3GetTempReg(tls, pParse)
-		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1544, -1)
+		Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1563, -1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, Xsqlite3VdbeCurrentAddr(tls, v)+2, reg)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL))
 
@@ -152744,11 +152805,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 23980,
-	ts + 24033,
-	ts + 23437,
-	ts + 24084,
-	ts + 24136,
+	ts + 24046,
+	ts + 24099,
+	ts + 23503,
+	ts + 24150,
+	ts + 24202,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -153239,7 +153300,7 @@ func windowCodeRangeTest(tls *libc.TLS, p uintptr, op int32, csr1 int32, regVal
 
 	}
 
-	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1544, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, regString, 0, ts+1563, -1)
 	addrGe = Xsqlite3VdbeAddOp3(tls, v, OP_Ge, regString, 0, reg1)
 
 	if op == OP_Ge && arith == OP_Add || op == OP_Le && arith == OP_Subtract {
@@ -154143,19 +154204,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+24186,
+				Xsqlite3ErrorMsg(tls, pParse, ts+24252,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 24228
+							return ts + 24294
 						}
-						return ts + 24237
+						return ts + 24303
 					}(),
 						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+24243, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+24309, 0)
 		}
 	}
 
@@ -154223,7 +154284,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+24277,
+		Xsqlite3ErrorMsg(tls, pParse, ts+24343,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -155320,7 +155381,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+24315, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+24381, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -156295,21 +156356,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+17625, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+17644, 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+24337, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+24403, 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+17538, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+17557, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+24337, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+24403, 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))
@@ -157052,7 +157113,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+24364)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+24430)
 				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 {
@@ -157216,7 +157277,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+24373, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+24439, 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))
@@ -157433,9 +157494,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 + 8116
+							return ts + 9065
 						}
-						return ts + 8121
+						return ts + 9070
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -157719,19 +157780,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+24397, 0)
+					ts+24463, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+24492, 0)
+					ts+24558, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+24576, 0)
+					ts+24642, 0)
 			}
 			break
 		case uint32(273):
@@ -158110,9 +158171,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+24373, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+24439, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+24661, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+24727, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -158880,7 +158941,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+24678, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+24744, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -158901,9 +158962,9 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 	}
 	if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg != 0 || (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_OK && (*Parse)(unsafe.Pointer(pParse)).Frc != SQLITE_DONE {
 		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)))
+			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+4512, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+24703, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+24769, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -159076,7 +159137,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+24714, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+24780, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -159089,11 +159150,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+21300, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+21366, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+24721, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+24787, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+24726, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+24792, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -159106,9 +159167,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+24736, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+24802, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+24740, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+24806, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -159178,7 +159239,8 @@ func sqlite3TestExtInit(tls *libc.TLS, db uintptr) int32 {
 	return Xsqlite3FaultSim(tls, 500)
 }
 
-var sqlite3BuiltinExtensions = [4]uintptr{
+var sqlite3BuiltinExtensions = [5]uintptr{
+	0,
 	0,
 	0,
 	0,
@@ -159342,7 +159404,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 174337)
+		return Xsqlite3MisuseError(tls, 174426)
 	}
 
 	ap = va
@@ -159917,7 +159979,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175111)
+		return Xsqlite3MisuseError(tls, 175200)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -159932,7 +159994,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+24748, 0)
+			ts+24814, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -160123,23 +160185,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 + 24816
+	var zErr uintptr = ts + 24882
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 24830
+			zErr = ts + 24896
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 24852
+			zErr = ts + 24918
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 24874
+			zErr = ts + 24940
 			break
 
 		}
@@ -160157,35 +160219,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 24897,
-	ts + 24910,
+	ts + 24963,
+	ts + 24976,
 	uintptr(0),
-	ts + 24926,
-	ts + 24951,
-	ts + 24965,
-	ts + 24984,
-	ts + 1480,
-	ts + 25009,
-	ts + 25046,
-	ts + 25058,
-	ts + 25073,
-	ts + 25106,
+	ts + 24992,
+	ts + 25017,
+	ts + 25031,
+	ts + 25050,
+	ts + 1499,
+	ts + 25075,
+	ts + 25112,
 	ts + 25124,
-	ts + 25149,
-	ts + 25178,
+	ts + 25139,
+	ts + 25172,
+	ts + 25190,
+	ts + 25215,
+	ts + 25244,
 	uintptr(0),
-	ts + 7190,
-	ts + 6686,
-	ts + 25195,
-	ts + 25213,
-	ts + 25231,
+	ts + 7209,
+	ts + 6705,
+	ts + 25261,
+	ts + 25279,
+	ts + 25297,
 	uintptr(0),
-	ts + 25265,
+	ts + 25331,
 	uintptr(0),
-	ts + 25286,
-	ts + 25312,
-	ts + 25335,
-	ts + 25356,
+	ts + 25352,
+	ts + 25378,
+	ts + 25401,
+	ts + 25422,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -160306,7 +160368,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, 175758)
+		return Xsqlite3MisuseError(tls, 175847)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -160351,7 +160413,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+25372, 0)
+				ts+25438, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -160468,7 +160530,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+25435, libc.VaList(bp, zName))
+		ts+25501, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -160496,7 +160558,7 @@ func Xsqlite3_overload_function(tls *libc.TLS, db uintptr, zName uintptr, nArg i
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	zCopy = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, zName))
+	zCopy = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, zName))
 	if zCopy == uintptr(0) {
 		return SQLITE_NOMEM
 	}
@@ -160704,7 +160766,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+25486, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+25552, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -160797,7 +160859,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, 176503))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176592))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -160867,7 +160929,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, 176582)
+		return Xsqlite3MisuseError(tls, 176671)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -160877,7 +160939,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, 176591)
+		return Xsqlite3MisuseError(tls, 176680)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -160909,14 +160971,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, 176639)
+		return Xsqlite3MisuseError(tls, 176728)
 	}
 
 	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+25507, 0)
+				ts+25573, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -161046,7 +161108,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+25575, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+25641, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -161091,10 +161153,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+25581, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+25647, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25591,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25657,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -161199,7 +161261,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+25619, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+25685, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -161210,17 +161272,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+25623, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+25689, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 25623
+	zModeType = ts + 25689
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+25629, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+25695, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -161228,7 +161290,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 25634
+	zModeType = ts + 25700
 __32:
 	;
 	if !(aMode != 0) {
@@ -161258,7 +161320,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25641, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25707, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -161266,7 +161328,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25661,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25727,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -161306,7 +161368,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25685, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25751, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -161330,15 +161392,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 25701, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 25708, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 25767, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 25774, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{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},
+	{Fz: ts + 25782, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 25785, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 25788, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 18750, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -161484,10 +161546,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+23232, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+23298, 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+25726, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+25792, 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) {
@@ -161501,7 +161563,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 177308)
+	rc = Xsqlite3MisuseError(tls, 177397)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -161518,7 +161580,7 @@ __19:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 4493
+			return ts + 4512
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -161552,9 +161614,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 + 7793
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 7812
 	(*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 + 24721
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 24787
 	(*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)
@@ -161659,7 +161721,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 25732
+		zFilename = ts + 25798
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -161762,21 +161824,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+25735,
+	Xsqlite3_log(tls, iErr, ts+25801,
 		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+25760)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+25826)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+25780)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+25846)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+25787)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+25853)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -161887,7 +161949,7 @@ __4:
 	autoinc = libc.Bool32(int32((*Table)(unsafe.Pointer(pTab)).FiPKey) == iCol && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != U32(0))
 	goto __13
 __12:
-	zDataType = ts + 1109
+	zDataType = ts + 1128
 	primarykey = 1
 __13:
 	;
@@ -161934,14 +161996,14 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+25804, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+25870, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if *(*uintptr)(unsafe.Pointer(bp + 24)) != 0 {
-			return ts + 4493
+			return ts + 4512
 		}
 		return uintptr(0)
 	}(), libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 24))))
@@ -162590,7 +162652,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+25832, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+25898, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -162708,7 +162770,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 + 25840
+			return ts + 25906
 		}
 		return uintptr(0)
 	}(), 0)
@@ -162886,7 +162948,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 7533, ts + 8116, ts + 8121, ts + 7543, ts + 7538, ts + 9357, ts + 25863, ts + 25869,
+	ts + 7552, ts + 9065, ts + 9070, ts + 7562, ts + 7557, ts + 9376, ts + 25929, ts + 25935,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -163039,7 +163101,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 + 25876 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 25942 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -163065,7 +163127,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	switch Xsqlite3_value_type(tls, pValue) {
 	case SQLITE_NULL:
 		{
-			jsonAppendRaw(tls, p, ts+7533, uint32(4))
+			jsonAppendRaw(tls, p, ts+7552, uint32(4))
 			break
 
 		}
@@ -163094,7 +163156,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+25893, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+25959, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -163152,19 +163214,19 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 	switch int32((*JsonNode)(unsafe.Pointer(pNode)).FeType) {
 	default:
 		{
-			jsonAppendRaw(tls, pOut, ts+7533, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+7552, uint32(4))
 			break
 
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+8116, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+9065, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+8121, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+9070, uint32(5))
 			break
 
 		}
@@ -163709,17 +163771,17 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		}
 		return int32(j + U32(1))
 	} else if int32(c) == 'n' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+7533, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7552, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		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+8116, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+9065, 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+8121, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+9070, 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))
@@ -163820,7 +163882,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+25922, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+25988, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -164126,7 +164188,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+25937, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+26003, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -164141,7 +164203,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+25941, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+26007, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -164195,7 +164257,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+25967,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+26033,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -164300,11 +164362,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+26010, uint32(2))
+					jsonAppendRaw(tls, bp, ts+26076, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
-					jsonAppendRaw(tls, bp, ts+6350, uint32(2))
+					jsonAppendRaw(tls, bp, ts+6369, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+26013, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+26079, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -164345,7 +164407,7 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if pNode != 0 {
 				jsonRenderNode(tls, pNode, bp, uintptr(0))
 			} else {
-				jsonAppendRaw(tls, bp, ts+7533, uint32(4))
+				jsonAppendRaw(tls, bp, ts+7552, uint32(4))
 			}
 		}
 		if i == argc {
@@ -164461,14 +164523,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+26016, -1)
+			ts+26082, -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+26067, -1)
+			Xsqlite3_result_error(tls, ctx, ts+26133, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -164563,7 +164625,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+16737)
+	jsonWrongNumArgs(tls, ctx, ts+16756)
 	return
 __2:
 	;
@@ -164638,9 +164700,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 26101
+			return ts + 26167
 		}
-		return ts + 26105
+		return ts + 26171
 	}())
 	return
 __2:
@@ -164773,7 +164835,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+26112, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+26178, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -164870,7 +164932,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+26115, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+26181, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -164914,7 +164976,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+26118)
+		ts+26184)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -165045,7 +165107,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+26201, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+26267, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -165064,7 +165126,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+26207, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+26273, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -165160,7 +165222,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+26207, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+26273, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -165184,7 +165246,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 + 26212
+				zRoot = ts + 26278
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -165306,7 +165368,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+25922, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+25988, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -165401,25 +165463,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{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 + 26280},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26285},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26296},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26296},
 	{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}}
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 26327},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 26330},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26334},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26346},
+	{FnArg: int8(2), 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_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26369},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26380},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26392},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 26405},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26414},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26414},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26424},
+	{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 + 26435},
+	{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 + 26452}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -165438,8 +165500,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 26404, FpModule: 0},
-	{FzName: ts + 26414, FpModule: 0},
+	{FzName: ts + 26470, FpModule: 0},
+	{FzName: ts + 26480, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -165699,11 +165761,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+26424, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+26490, 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+26432, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+26498, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -165914,7 +165976,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+26437,
+		ts+26503,
 		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))
@@ -166612,7 +166674,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+26519)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+26585)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -166824,7 +166886,7 @@ func rtreeBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 2
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FneedToFreeIdxStr = 1
-	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, bp+8))) {
+	if iIdx > 0 && uintptr(0) == libc.AssignPtrUintptr(pIdxInfo+48, Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, bp+8))) {
 		return SQLITE_NOMEM
 	}
 
@@ -167953,7 +168015,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+26533, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+26599, 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 {
@@ -167965,12 +168027,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+26553, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+26619, 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+26585, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+26651, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -168196,7 +168258,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+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))
+		ts+26688, 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))
@@ -168219,14 +168281,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 26767
+	var zFmt uintptr = ts + 26833
 	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+12700, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+12719, 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 {
@@ -168267,7 +168329,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 26823, ts + 6412, ts + 17625,
+	ts + 26889, ts + 6431, ts + 17644,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -168310,19 +168372,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+26828,
+			ts+26894,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+26890, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+26956, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+26895,
+			ts+26961,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+26959,
+			ts+27025,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+27029,
+			ts+27095,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -168351,7 +168413,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 + 27078
+			zFormat = ts + 27144
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -168363,7 +168425,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+27186,
+			ts+27252,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -168371,18 +168433,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+27231, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+27297, 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+14119, 1)
+					Xsqlite3_str_append(tls, p, ts+14138, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+27258, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+27324, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+27280, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+27346, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+27288, 0)
+			Xsqlite3_str_appendf(tls, p, ts+27354, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -168397,14 +168459,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 27304,
-	ts + 27357,
-	ts + 27402,
-	ts + 27454,
-	ts + 27508,
-	ts + 27553,
-	ts + 27611,
-	ts + 27666,
+	ts + 27370,
+	ts + 27423,
+	ts + 27468,
+	ts + 27520,
+	ts + 27574,
+	ts + 27619,
+	ts + 27677,
+	ts + 27732,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -168433,7 +168495,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+27713, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+27779, 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
@@ -168441,19 +168503,19 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 				(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = 4 + int32((*Rtree)(unsafe.Pointer(pRtree)).FnBytesPerCell)*RTREE_MAXCELLS
 			}
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+8, Xsqlite3_errmsg(tls, db)))
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+27733,
+			ts+27799,
 			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 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+32, Xsqlite3_errmsg(tls, db)))
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+27790,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+27856,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -168495,16 +168557,16 @@ 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 + 27825,
-		ts + 27868,
-		ts + 27903,
-		ts + 27939,
+		ts + 27891,
+		ts + 27934,
+		ts + 27969,
+		ts + 28005,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
 		goto __1
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(2+libc.Bool32(argc >= 6))*8))))
 	return SQLITE_ERROR
 __1:
 	;
@@ -168529,7 +168591,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+27976,
+	Xsqlite3_str_appendf(tls, pSql, ts+28042,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -168541,7 +168603,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+28000, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+28066, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -168564,7 +168626,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+28006, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+28072, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -168575,14 +168637,14 @@ __10:
 	if !(ii < argc) {
 		goto __12
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+64, *(*uintptr)(unsafe.Pointer(bp + 96 + 4*8))))
 	rc = SQLITE_ERROR
 	goto __13
 __12:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __14
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+72, Xsqlite3_errmsg(tls, db)))
 __14:
 	;
 __13:
@@ -168625,7 +168687,7 @@ __17:
 	if !(iErr != 0) {
 		goto __22
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+80, *(*uintptr)(unsafe.Pointer(bp + 96 + uintptr(iErr)*8))))
 	goto rtreeInit_fail
 __22:
 	;
@@ -168642,7 +168704,7 @@ __23:
 	if !(rc != 0) {
 		goto __24
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+88, Xsqlite3_errmsg(tls, db)))
 	goto rtreeInit_fail
 __24:
 	;
@@ -168660,7 +168722,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 28009, ts + 28020}
+var azFormat = [2]uintptr{ts + 28075, ts + 28086}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -168698,13 +168760,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+12272, 1)
+			Xsqlite3_str_append(tls, pOut, ts+12291, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+28030, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+28096, 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+28036, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+28102, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+28040, 1)
+		Xsqlite3_str_append(tls, pOut, ts+28106, 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})))
@@ -168715,7 +168777,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+28042, -1)
+		Xsqlite3_result_error(tls, ctx, ts+28108, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -168793,12 +168855,12 @@ 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+28075,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+28141,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
-						return ts + 5414
+						return ts + 5433
 					}
-					return ts + 1544
+					return ts + 1563
 				}(), z))
 			if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport == uintptr(0) {
 				(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
@@ -168817,7 +168879,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+28082,
+			ts+28148,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -168836,7 +168898,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+28127, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+28193, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -168850,8 +168912,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 + 28159,
-		ts + 28213,
+		ts + 28225,
+		ts + 28279,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -168866,23 +168928,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+28261,
+		rtreeCheckAppendMsg(tls, pCheck, ts+28327,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 28306
+					return ts + 28372
 				}
-				return ts + 28314
+				return ts + 28380
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+28323,
+				ts+28389,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 28306
+						return ts + 28372
 					}
-					return ts + 28314
+					return ts + 28380
 				}(), iKey, iVal))
 		}
 	}
@@ -168906,7 +168968,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+28381, libc.VaList(bp, i, iCell, iNode))
+				ts+28447, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -168926,7 +168988,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+28429, libc.VaList(bp+24, i, iCell, iNode))
+					ts+28495, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -168943,14 +169005,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+28496, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+28562, 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+28530, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+28596, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -168958,7 +169020,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+28560,
+					ts+28626,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -168987,14 +169049,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+28615,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+28681,
 			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+28646, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+28712, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -169016,12 +169078,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+15860, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+15879, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+28713, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+28779, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -169030,12 +169092,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+26533, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+26599, 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+28741, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+28807, 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)
 		}
@@ -169049,8 +169111,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+28772, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+28779, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+28838, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+28845, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -169058,7 +169120,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+28787, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+28853, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -169073,7 +169135,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+28791, -1)
+			ts+28857, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -169081,7 +169143,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 7793
+			zDb = ts + 7812
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -169091,7 +169153,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 + 19381
+				return ts + 19447
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -169462,11 +169524,11 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		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+28842, 1)
+		Xsqlite3_str_append(tls, x, ts+28908, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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+28910, 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+28855, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+28921, 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)
 	}
@@ -169486,19 +169548,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+28866, 0)
+		Xsqlite3_str_appendf(tls, x, ts+28932, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			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)))))
+			Xsqlite3_str_appendf(tls, x, ts+28950, 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+28892, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+28958, 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+28900, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+28966, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+28904, 0)
+		Xsqlite3_str_appendf(tls, x, ts+28970, 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)
 	}
@@ -170418,7 +170480,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+28917, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+28983, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -170427,7 +170489,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+28939, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+29005, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -170435,7 +170497,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+28006, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+28072, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -170446,7 +170508,7 @@ __5:
 	if !(SQLITE_OK != libc.AssignInt32(&rc, Xsqlite3_declare_vtab(tls, db, zSql))) {
 		goto __7
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+16, Xsqlite3_errmsg(tls, db)))
 __7:
 	;
 __6:
@@ -170471,7 +170533,7 @@ __9:
 	if !(rc != 0) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+24, Xsqlite3_errmsg(tls, db)))
 	goto geopolyInit_fail
 __10:
 	;
@@ -170662,7 +170724,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 + 17625
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 17644
 		(*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
@@ -170672,7 +170734,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 + 28943
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 29009
 		(*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
@@ -170680,7 +170742,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 + 28949
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 29015
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -170792,7 +170854,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+28958, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+29024, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -170924,14 +170986,14 @@ geopoly_update_end:
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
 	_ = pVtab
 	_ = nArg
-	if Xsqlite3_stricmp(tls, zName, ts+28998) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+29064) == 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+29014) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+29080) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -170996,7 +171058,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+29029, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+29095, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -171008,25 +171070,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{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},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29103},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29116},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29129},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 29142},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 29080},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 29154},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 29064},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 29177},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29191},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 29204},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 29218},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29234},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 29180},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 29246},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -171036,26 +171098,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+29199, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+29265, 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+29209, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+29275, 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+29220, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+29286, -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+28943, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+29009, 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+29231, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+29297, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -171109,7 +171171,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+26519, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+26585, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -171436,7 +171498,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+29241, -1)
+		Xsqlite3_result_error(tls, context, ts+29307, -1)
 		return
 	}
 
@@ -171447,7 +171509,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+29241, -1)
+			Xsqlite3_result_error(tls, context, ts+29307, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -171460,7 +171522,7 @@ func prepareAndCollectError(tls *libc.TLS, db uintptr, ppStmt uintptr, pzErrmsg
 
 	var rc int32 = Xsqlite3_prepare_v2(tls, db, zSql, -1, ppStmt, uintptr(0))
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 		*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	}
 	return rc
@@ -171472,7 +171534,7 @@ func resetAndCollectError(tls *libc.TLS, pStmt uintptr, pzErrmsg uintptr) int32
 
 	var rc int32 = Xsqlite3_reset(tls, pStmt)
 	if rc != SQLITE_OK {
-		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
+		*(*uintptr)(unsafe.Pointer(pzErrmsg)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, Xsqlite3_errmsg(tls, Xsqlite3_db_handle(tls, pStmt))))
 	}
 	return rc
 }
@@ -171548,7 +171610,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+29262, uintptr(0), uintptr(0), p+64)
+				ts+29328, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -171612,7 +171674,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+26432, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+26498, 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++ {
 				}
@@ -171633,16 +171695,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+29433, libc.VaList(bp, func() uintptr {
+			ts+29499, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 29583
+					return ts + 29649
 				}
-				return ts + 1544
+				return ts + 1563
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+29624)
+			ts+29690)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -171740,7 +171802,7 @@ func rbuFinalize(tls *libc.TLS, p uintptr, pStmt uintptr) {
 	var rc int32 = Xsqlite3_finalize(tls, pStmt)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && rc != SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, Xsqlite3_errmsg(tls, db)))
 	}
 }
 
@@ -171758,7 +171820,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+29749, libc.VaList(bp, zTab)))
+			ts+29815, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -171776,7 +171838,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+29868, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+29934, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -171794,7 +171856,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+29889, libc.VaList(bp+16, zIdx)))
+			ts+29955, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -171817,7 +171879,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+29940, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+30006, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -171863,7 +171925,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+29961, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+30027, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -171878,7 +171940,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+29989, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+30055, 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 {
@@ -171918,7 +171980,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+20858, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+20924, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -171928,18 +171990,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+30018, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+30084, 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+30037, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+30103, 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+30042, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+30108, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -171951,18 +172013,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+30052, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+30118, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 30081
+							return ts + 30147
 						}
-						return ts + 30094
+						return ts + 30160
 					}()))
 		}
 
 		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+30103, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+30169, 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)
@@ -171976,7 +172038,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+30125,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+30191,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -172019,12 +172081,12 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	defer tls.Free(24)
 
 	var zList uintptr = uintptr(0)
-	var zSep uintptr = ts + 1544
+	var zSep uintptr = ts + 1563
 	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+30152, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 15971
+		zList = rbuMPrintf(tls, p, ts+30218, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 15990
 	}
 	return zList
 }
@@ -172035,13 +172097,13 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 
 	var iPk int32 = 1
 	var zRet uintptr = uintptr(0)
-	var zSep uintptr = ts + 1544
+	var zSep uintptr = ts + 1563
 	for 1 != 0 {
 		var i int32
 		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+30161, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+30227, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -172063,25 +172125,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+30174, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+30240, 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+30206, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+30272, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		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)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1563, ts+15990, ts+30295)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+30301, ts+30308, ts+6328)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1563, ts+15990, ts+1563)
 
 		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+30250,
+					ts+30316,
 					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+30292, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+30358, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -172118,12 +172180,12 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	zVector = uintptr(0)
 	zRet = uintptr(0)
 	bFailed = 0
-	zSep = ts + 1544
+	zSep = ts + 1563
 	iCol = 0
 	*(*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+29989, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+30055, 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
@@ -172158,7 +172220,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 30312
+	zCol = ts + 30378
 __7:
 	;
 	goto __5
@@ -172166,13 +172228,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+30320,
+	zLhs = rbuMPrintf(tls, p, ts+30386,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+30341,
+	zOrder = rbuMPrintf(tls, p, ts+30407,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+30377,
+	zSelect = rbuMPrintf(tls, p, ts+30443,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 15971
+	zSep = ts + 15990
 	iCol++
 	goto __1
 __2:
@@ -172190,12 +172252,12 @@ __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+30404,
+		Xsqlite3_mprintf(tls, ts+30470,
 			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
 	}
-	zSep = ts + 1544
+	zSep = ts + 1563
 	iCol = 0
 __14:
 	if !(iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnCol) {
@@ -172217,8 +172279,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+30452, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 15971
+	zVector = rbuMPrintf(tls, p, ts+30518, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 15990
 	goto __15
 __15:
 	iCol++
@@ -172229,7 +172291,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+30459, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+30525, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -172256,13 +172318,13 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 	var zImpPK uintptr = uintptr(0)
 	var zWhere uintptr = uintptr(0)
 	var nBind int32 = 0
-	var zCom uintptr = ts + 1544
-	var zAnd uintptr = ts + 1544
+	var zCom uintptr = ts + 1563
+	var zAnd uintptr = ts + 1563
 	*(*uintptr)(unsafe.Pointer(bp + 200)) = uintptr(0)
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+29989, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+30055, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -172274,9 +172336,9 @@ 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+30471, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+30537, 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
+			zType = ts + 1563
 		} else {
 			if iCid < 0 {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK {
@@ -172286,37 +172348,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 + 30312
+					zCol = ts + 30378
 				} else {
-					zCol = ts + 30042
+					zCol = ts + 30108
 				}
-				zType = ts + 1109
+				zType = ts + 1128
 			} 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+30493, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+30559, 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 + 30229
+					return ts + 30295
 				}
-				return ts + 1544
+				return ts + 1563
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+30513,
+			zImpPK = Xsqlite3_mprintf(tls, ts+30579,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+30534,
+		zImpCols = Xsqlite3_mprintf(tls, ts+30600,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+30567, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+30633, 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 + 15971
-		zAnd = ts + 22894
+		zCom = ts + 15990
+		zAnd = ts + 22960
 		nBind++
 	}
 
@@ -172350,16 +172412,16 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 
 	var zList uintptr = uintptr(0)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
-		var zS uintptr = ts + 1544
+		var zS uintptr = ts + 1563
 		var i int32
 		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+30591, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+30657, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+30603, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+30669, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 15971
+			zS = ts + 15990
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -172367,7 +172429,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+30612, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+30678, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -172379,27 +172441,27 @@ 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+30627, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+30693, 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 zSep uintptr = ts + 1563
 		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+30641, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 22894
+				zList = rbuMPrintf(tls, p, ts+30707, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 22960
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+30653, libc.VaList(bp+40, zList))
+			ts+30719, libc.VaList(bp+40, zList))
 
 	} else {
-		var zSep uintptr = ts + 1544
+		var zSep uintptr = ts + 1563
 		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 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+30703, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 22894
+				zList = rbuMPrintf(tls, p, ts+30769, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 22960
 			}
 		}
 	}
@@ -172408,7 +172470,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+30716, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+30782, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -172422,21 +172484,21 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 		if int32(libc.Xstrlen(tls, zMask)) != (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 			rbuBadControlError(tls, p)
 		} else {
-			var zSep uintptr = ts + 1544
+			var zSep uintptr = ts + 1563
 			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+30703,
+					zList = rbuMPrintf(tls, p, ts+30769,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 15971
+					zSep = ts + 15990
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+30742,
+					zList = rbuMPrintf(tls, p, ts+30808,
 						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 + 15971
+					zSep = ts + 15990
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+30772,
+					zList = rbuMPrintf(tls, p, ts+30838,
 						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 + 15971
+					zSep = ts + 15990
 				}
 			}
 		}
@@ -172471,19 +172533,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 + 30809
+		var zSep uintptr = ts + 30875
 		*(*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+29961, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+30027, 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+17513) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+17532) == 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+29989, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+30055, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -172495,15 +172557,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 + 30229
+					zDesc = ts + 30295
 				} else {
-					zDesc = ts + 1544
+					zDesc = ts + 1563
 				}
-				z = rbuMPrintf(tls, p, ts+30822, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 15971
+				z = rbuMPrintf(tls, p, ts+30888, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 15990
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+30833, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+30899, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -172518,12 +172580,12 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		*(*uintptr)(unsafe.Pointer(bp + 168)) = uintptr(0)
 		var zIdx uintptr = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
-		var zComma uintptr = ts + 1544
+		var zComma uintptr = ts + 1563
 		var zCols uintptr = uintptr(0)
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+30837)
+			ts+30903)
 		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))) {
@@ -172532,7 +172594,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+29989, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+30055, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -172542,25 +172604,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+30887, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+30953, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+30909, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+30975, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 30229
+						return ts + 30295
 					}
-					return ts + 1544
+					return ts + 1563
 				}()))
-				zComma = ts + 15971
+				zComma = ts + 15990
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+30919, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+30985, 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+7793, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+30934,
+			ts+31000,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, 0, 0))
 	}
 }
 
@@ -172570,50 +172632,50 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
 		var tnum int32 = (*RbuObjIter)(unsafe.Pointer(pIter)).FiTnum
-		var zComma uintptr = ts + 1544
+		var zComma uintptr = ts + 1563
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
-			var zPk uintptr = ts + 1544
+			var zPk uintptr = ts + 1563
 			var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCol)*8))
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, (*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 + 30996
+				zPk = ts + 31062
 			}
-			zSql = rbuMPrintf(tls, p, ts+31009,
+			zSql = rbuMPrintf(tls, p, ts+31075,
 				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 + 31036
+							return ts + 31102
 						}
-						return ts + 1544
+						return ts + 1563
 					}()))
-			zComma = ts + 15971
+			zComma = ts + 15990
 		}
 
 		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+31046, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+31112, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		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,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31119,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 31085
+						return ts + 31151
 					}
-					return ts + 1544
+					return ts + 1563
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, 0, 0))
 	}
 }
 
@@ -172626,7 +172688,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+31100,
+				ts+31166,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -172663,7 +172725,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+31157)
+			ts+31223)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -172768,7 +172830,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+31223, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+31289, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -172788,24 +172850,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+7793, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+31243,
+				ts+31309,
 				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+7793, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, 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+31308, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+31374, 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+31344, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+31410, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -172821,7 +172883,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+31378,
+						ts+31444,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -172829,31 +172891,31 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 31439
+											return ts + 31505
 										}
-										return ts + 31443
+										return ts + 31509
 									}()
 								}
-								return ts + 1544
+								return ts + 1563
 							}(), zStart,
 							zCollist, zLimit))
 					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+31449,
+						ts+31515,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+31510,
+						ts+31576,
 						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 + 31439
+									return ts + 31505
 								}
-								return ts + 31443
+								return ts + 31509
 							}(),
 							zCollist, zLimit))
 				}
@@ -172878,8 +172940,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+7804)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+7800)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+7823)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+7819)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -172888,52 +172950,52 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			rbuCreateImposterTable2(tls, p, pIter)
 			zWrite = func() uintptr {
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
-					return ts + 1544
+					return ts + 1563
 				}
-				return ts + 31669
+				return ts + 31735
 			}()
 
 			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+31678,
+						ts+31744,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 31714
+								return ts + 31780
 							}
-							return ts + 1544
+							return ts + 1563
 						}(), zBindings)))
 			}
 
 			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+31724, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+31790, 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
+				var zRbuRowid uintptr = ts + 1563
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 31752
+					zRbuRowid = ts + 31818
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+31764, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+31830, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 31840
+							return ts + 31906
 						}
-						return ts + 1544
+						return ts + 1563
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+31857,
+					ts+31923,
 					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+32156,
+						ts+32222,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -172941,14 +173003,14 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-				var zRbuRowid uintptr = ts + 1544
+				var zRbuRowid uintptr = ts + 1563
 				var zStart uintptr = uintptr(0)
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 32255
+						zRbuRowid = ts + 32321
 					} else {
-						zRbuRowid = ts + 32265
+						zRbuRowid = ts + 32331
 					}
 				}
 
@@ -172961,35 +173023,35 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+30312, 0)
+						zOrder = rbuMPrintf(tls, p, ts+30378, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1544, ts+15971, ts+1544)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1563, ts+15990, ts+1563)
 					}
 				}
 
 				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+32276,
+							ts+32342,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 32324
+										return ts + 32390
 									}
-									return ts + 1544
+									return ts + 1563
 								}(),
 								zRbuRowid,
 								(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 									if zStart != 0 {
 										return zStart
 									}
-									return ts + 1544
+									return ts + 1563
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 24228
+										return ts + 24294
 									}
-									return ts + 1544
+									return ts + 1563
 								}(), zOrder,
 								zLimit)))
 				}
@@ -173052,12 +173114,12 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 		(*RbuObjIter)(unsafe.Pointer(pIter)).FpRbuUpdate = pUp
 
 		if zSet != 0 {
-			var zPrefix uintptr = ts + 1544
+			var zPrefix uintptr = ts + 1563
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 31669
+				zPrefix = ts + 31735
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+32330,
+			zUpdate = Xsqlite3_mprintf(tls, ts+32396,
 				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)
@@ -173084,7 +173146,7 @@ func rbuOpenDbhandle(tls *libc.TLS, p uintptr, zName uintptr, bUseVfs int32) uin
 			return uintptr(0)
 		}())
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, Xsqlite3_errmsg(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))))
 			Xsqlite3_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 			*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 		}
@@ -173116,7 +173178,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+32360, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+32426, 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:
@@ -173186,28 +173248,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+7793, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7812, 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+7793)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+32390, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7812)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+32456, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		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))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32484, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.Xmemcpy(tls, p+48, ts+14848, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+7793, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+7812, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32436, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32502, 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+7793, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7812, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -173240,11 +173302,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+32502, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32568, 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+25575, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+25641, (*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)))) == '?' {
@@ -173256,16 +173318,16 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+32534,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7793),
+			zTarget = Xsqlite3_mprintf(tls, ts+32600,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7812),
 					func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1544
+							return ts + 1563
 						}
-						return ts + 32566
+						return ts + 32632
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
-							return ts + 1544
+							return ts + 1563
 						}
 						return zExtra
 					}()))
@@ -173281,37 +173343,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+32568, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32634, -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+32583, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32649, 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+32600, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32666, -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+7793, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32616, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32682, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, 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+32644, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32710, 0)
 	}
 }
 
@@ -173340,14 +173402,14 @@ 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+32616, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32682, 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+32662, uintptr(0), uintptr(0), uintptr(0))
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32728, uintptr(0), uintptr(0), uintptr(0))
 		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
@@ -173456,7 +173518,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+7793, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+7812, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -173473,23 +173535,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+32697, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+32763, 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+7793)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812)
 	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+7793)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7812)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+32722, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+32729, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+32788, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+32795, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -173606,7 +173668,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+25213, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+25279, 0)
 			return
 		}
 
@@ -173699,7 +173761,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+32736)
+			ts+32802)
 		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)
@@ -173707,7 +173769,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+32758, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32824, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -173728,7 +173790,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+32785,
+				ts+32851,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -173758,9 +173820,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+32943, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+33009, 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+32958,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+33024,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -173774,10 +173836,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+32978, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+33044, 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+33003)
+			ts+33069)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -173791,12 +173853,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+33111)
+			ts+33177)
 	}
 
 	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+33176)
+			ts+33242)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -173808,7 +173870,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+33220, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+33286, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -173828,15 +173890,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+18619)
-					rbuCopyPragma(tls, p, ts+17709)
+					rbuCopyPragma(tls, p, ts+18638)
+					rbuCopyPragma(tls, p, ts+17728)
 				}
 
 				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+33245, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+33311, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -173860,10 +173922,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+15875, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+15894, 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+15875, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15894, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -173958,7 +174020,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+33273, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33339, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -173974,10 +174036,10 @@ func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+32722, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+32788, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 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)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7812, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
@@ -173991,7 +174053,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+33298, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+33364, 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)
@@ -174025,7 +174087,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+33309, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+33375, 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 {
@@ -174055,13 +174117,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+33381, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+33447, 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+33395)
+				ts+33461)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -174072,7 +174134,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+33452)
+				ts+33518)
 			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)
@@ -174117,7 +174179,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			libc.Xmemcpy(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, zRbu, nRbu+uint64(1))
 			pCsr += uintptr(nRbu + uint64(1))
 			if zState != 0 {
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+4493, libc.VaList(bp, zState))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+4512, libc.VaList(bp, zState))
 			}
 
 			rbuOpenDatabase(tls, p, uintptr(0), bp+16)
@@ -174146,7 +174208,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+33526, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33592, 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
@@ -174164,12 +174226,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+33558,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33624,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 33590
+							return ts + 33656
 						}
-						return ts + 33597
+						return ts + 33663
 					}()))
 			}
 		}
@@ -174177,7 +174239,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+15860, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15879, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -174188,19 +174250,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+18333)
-						rbuCopyPragma(tls, p, ts+17724)
+						rbuCopyPragma(tls, p, ts+18352)
+						rbuCopyPragma(tls, p, ts+17743)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+33604, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+33670, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+7793, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+7812, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+33620, uintptr(0), uintptr(0), p+64)
+								db, ts+33686, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -174254,7 +174316,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+33644, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+33710, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -174281,7 +174343,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+31669, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+31735, 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++
@@ -174298,7 +174360,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+15875, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+15894, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -174311,13 +174373,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+15875, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15894, 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+33652, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+33718, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -174412,7 +174474,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+15875, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+15894, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -174429,19 +174491,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+15875, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15894, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 15860
+				zBegin = ts + 15879
 			} else {
-				zBegin = ts + 33604
+				zBegin = ts + 33670
 			}
 			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+33604, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+33670, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -174787,7 +174849,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+33679, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33745, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -174812,7 +174874,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+33702, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+33768, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -174957,7 +175019,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+7793)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+7812)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -174972,7 +175034,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+33713, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+33779, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -175217,6 +175279,970 @@ func Xsqlite3rbu_temp_size(tls *libc.TLS, pRbu uintptr) Sqlite3_int64 {
 	return (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FszTemp
 }
 
+var zDbstatSchema = *(*[258]int8)(unsafe.Pointer(ts + 33790))
+
+// Forward reference to data structured used in this module
+type StatTable1 = struct {
+	Fbase        Sqlite3_vtab
+	Fdb          uintptr
+	FiDb         int32
+	F__ccgo_pad1 [4]byte
+}
+
+// Forward reference to data structured used in this module
+type StatTable = StatTable1
+type StatCursor1 = struct {
+	Fbase        Sqlite3_vtab_cursor
+	FpStmt       uintptr
+	FisEof       U8
+	FisAgg       U8
+	F__ccgo_pad1 [2]byte
+	FiDb         int32
+	FaPage       [32]StatPage
+	FiPage       int32
+	FiPageno     U32
+	FzName       uintptr
+	FzPath       uintptr
+	FzPagetype   uintptr
+	FnPage       int32
+	FnCell       int32
+	FnMxPayload  int32
+	F__ccgo_pad2 [4]byte
+	FnUnused     I64
+	FnPayload    I64
+	FiOffset     I64
+	FszPage      I64
+}
+
+type StatCursor = StatCursor1
+type StatPage1 = struct {
+	FiPgno         U32
+	F__ccgo_pad1   [4]byte
+	FaPg           uintptr
+	FiCell         int32
+	F__ccgo_pad2   [4]byte
+	FzPath         uintptr
+	Fflags         U8
+	F__ccgo_pad3   [3]byte
+	FnCell         int32
+	FnUnused       int32
+	F__ccgo_pad4   [4]byte
+	FaCell         uintptr
+	FiRightChildPg U32
+	FnMxPayload    int32
+}
+
+type StatPage = StatPage1
+type StatCell1 = struct {
+	FnLocal      int32
+	FiChildPg    U32
+	FnOvfl       int32
+	F__ccgo_pad1 [4]byte
+	FaOvfl       uintptr
+	FnLastOvfl   int32
+	FiOvfl       int32
+}
+
+type StatCell = StatCell1
+
+func statConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var pTab uintptr = uintptr(0)
+	var rc int32 = SQLITE_OK
+	var iDb int32
+	_ = pAux
+
+	if argc >= 4 {
+		Xsqlite3TokenInit(tls, bp+8, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
+		iDb = Xsqlite3FindDb(tls, db, bp+8)
+		if iDb < 0 {
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+13242, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
+			return SQLITE_ERROR
+		}
+	} else {
+		iDb = 0
+	}
+	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_DIRECTONLY, 0)
+	rc = Xsqlite3_declare_vtab(tls, db, uintptr(unsafe.Pointer(&zDbstatSchema)))
+	if rc == SQLITE_OK {
+		pTab = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatTable{})))
+		if pTab == uintptr(0) {
+			rc = SQLITE_NOMEM
+		}
+	}
+
+	if rc == SQLITE_OK {
+		libc.Xmemset(tls, pTab, 0, uint64(unsafe.Sizeof(StatTable{})))
+		(*StatTable)(unsafe.Pointer(pTab)).Fdb = db
+		(*StatTable)(unsafe.Pointer(pTab)).FiDb = iDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppVtab)) = pTab
+	return rc
+}
+
+func statDisconnect(tls *libc.TLS, pVtab uintptr) int32 {
+	Xsqlite3_free(tls, pVtab)
+	return SQLITE_OK
+}
+
+func statBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
+	var i int32
+	var iSchema int32 = -1
+	var iName int32 = -1
+	var iAgg int32 = -1
+	_ = tab
+
+	for i = 0; i < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; i++ {
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fop) != SQLITE_INDEX_CONSTRAINT_EQ {
+			continue
+		}
+		if int32((*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint+uintptr(i)*12)).Fusable) == 0 {
+			return SQLITE_CONSTRAINT
+		}
+		switch (*sqlite3_index_constraint)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(i)*12)).FiColumn {
+		case 0:
+			{
+				iName = i
+				break
+
+			}
+		case 10:
+			{
+				iSchema = i
+				break
+
+			}
+		case 11:
+			{
+				iAgg = i
+				break
+
+			}
+		}
+	}
+	i = 0
+	if iSchema >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iSchema)*8)).Fomit = uint8(1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x01
+	}
+	if iName >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iName)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x02
+	}
+	if iAgg >= 0 {
+		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iAgg)*8)).FargvIndex = libc.PreIncInt32(&i, 1)
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x04
+	}
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 1.0
+
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy == 1 &&
+		(*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)).FnOrderBy == 2 &&
+		(*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_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).FiColumn == 1 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy+1*8)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+		*(*int32)(unsafe.Pointer(pIdxInfo + 40)) |= 0x08
+	}
+
+	return SQLITE_OK
+}
+
+func statOpen(tls *libc.TLS, pVTab uintptr, ppCursor uintptr) int32 {
+	var pTab uintptr = pVTab
+	var pCsr uintptr
+
+	pCsr = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(StatCursor{})))
+	if pCsr == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		libc.Xmemset(tls, pCsr, 0, uint64(unsafe.Sizeof(StatCursor{})))
+		(*StatCursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab = pVTab
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+
+	*(*uintptr)(unsafe.Pointer(ppCursor)) = pCsr
+	return SQLITE_OK
+}
+
+func statClearCells(tls *libc.TLS, p uintptr) {
+	var i int32
+	if (*StatPage)(unsafe.Pointer(p)).FaCell != 0 {
+		for i = 0; i < (*StatPage)(unsafe.Pointer(p)).FnCell; i++ {
+			Xsqlite3_free(tls, (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell+uintptr(i)*32)).FaOvfl)
+		}
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FaCell)
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnCell = 0
+	(*StatPage)(unsafe.Pointer(p)).FaCell = uintptr(0)
+}
+
+func statClearPage(tls *libc.TLS, p uintptr) {
+	var aPg uintptr = (*StatPage)(unsafe.Pointer(p)).FaPg
+	statClearCells(tls, p)
+	Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(p)).FzPath)
+	libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(StatPage{})))
+	(*StatPage)(unsafe.Pointer(p)).FaPg = aPg
+}
+
+func statResetCsr(tls *libc.TLS, pCsr uintptr) {
+	var i int32
+
+	for i = 0; i < int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{}))); i++ {
+		statClearPage(tls, pCsr+24+uintptr(i)*64)
+		Xsqlite3_free(tls, (*StatPage)(unsafe.Pointer(pCsr+24+uintptr(i)*64)).FaPg)
+		(*StatPage)(unsafe.Pointer(pCsr + 24 + uintptr(i)*64)).FaPg = uintptr(0)
+	}
+	Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(0)
+}
+
+func statResetCounts(tls *libc.TLS, pCsr uintptr) {
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnCell = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnUnused = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPayload = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FszPage = int64(0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 0
+}
+
+func statClose(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	Xsqlite3_free(tls, pCsr)
+	return SQLITE_OK
+}
+
+func getLocalPayload(tls *libc.TLS, nUsable int32, flags U8, nTotal int32) int32 {
+	var nLocal int32
+	var nMinLocal int32
+	var nMaxLocal int32
+
+	if int32(flags) == 0x0D {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = nUsable - 35
+	} else {
+		nMinLocal = (nUsable-12)*32/255 - 23
+		nMaxLocal = (nUsable-12)*64/255 - 23
+	}
+
+	nLocal = nMinLocal + (nTotal-nMinLocal)%(nUsable-4)
+	if nLocal > nMaxLocal {
+		nLocal = nMinLocal
+	}
+	return nLocal
+}
+
+func statDecodePage(tls *libc.TLS, pBt uintptr, p uintptr) int32 {
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
+
+	var nUnused int32
+	var iOff int32
+	var nHdr int32
+	var isLeaf int32
+	var szPage int32
+	var aData uintptr
+	var aHdr uintptr
+	var iNext int32
+
+	var rc int32
+	var iPrev U32
+
+	var j int32
+	var nOvfl int32
+
+	var nLocal int32
+	var pCell uintptr
+	var i int32
+	var nUsable int32
+	aData = (*StatPage)(unsafe.Pointer(p)).FaPg
+	aHdr = aData + uintptr(func() int32 {
+		if (*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1) {
+			return 100
+		}
+		return 0
+	}())
+
+	(*StatPage)(unsafe.Pointer(p)).Fflags = *(*U8)(unsafe.Pointer(aHdr))
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0A || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __1
+	}
+	isLeaf = 1
+	nHdr = 8
+	goto __2
+__1:
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05 || int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x02) {
+		goto __3
+	}
+	isLeaf = 0
+	nHdr = 12
+	goto __4
+__3:
+	goto statPageIsCorrupt
+__4:
+	;
+__2:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiPgno == U32(1)) {
+		goto __5
+	}
+	nHdr = nHdr + 100
+__5:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnCell = int32(*(*U8)(unsafe.Pointer(aHdr + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 3 + 1)))
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = 0
+	szPage = Xsqlite3BtreeGetPageSize(tls, pBt)
+
+	nUnused = int32(*(*U8)(unsafe.Pointer(aHdr + 5)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 5 + 1))) - nHdr - 2*(*StatPage)(unsafe.Pointer(p)).FnCell
+	nUnused = nUnused + int32(*(*U8)(unsafe.Pointer(aHdr + 7)))
+	iOff = int32(*(*U8)(unsafe.Pointer(aHdr + 1)))<<8 | int32(*(*U8)(unsafe.Pointer(aHdr + 1 + 1)))
+__6:
+	if !(iOff != 0) {
+		goto __7
+	}
+	if !(iOff >= szPage) {
+		goto __8
+	}
+	goto statPageIsCorrupt
+__8:
+	;
+	nUnused = nUnused + (int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff+2) + 1))))
+	iNext = int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff) + 1)))
+	if !(iNext < iOff+4 && iNext > 0) {
+		goto __9
+	}
+	goto statPageIsCorrupt
+__9:
+	;
+	iOff = iNext
+	goto __6
+__7:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FnUnused = nUnused
+	(*StatPage)(unsafe.Pointer(p)).FiRightChildPg = func() uint32 {
+		if isLeaf != 0 {
+			return uint32(0)
+		}
+		return Xsqlite3Get4byte(tls, aHdr+8)
+	}()
+
+	if !((*StatPage)(unsafe.Pointer(p)).FnCell != 0) {
+		goto __10
+	}
+
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = szPage - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatPage)(unsafe.Pointer(p)).FaCell = Xsqlite3_malloc64(tls, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+	if !((*StatPage)(unsafe.Pointer(p)).FaCell == uintptr(0)) {
+		goto __11
+	}
+	return SQLITE_NOMEM
+__11:
+	;
+	libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(p)).FaCell, 0, uint64((*StatPage)(unsafe.Pointer(p)).FnCell+1)*uint64(unsafe.Sizeof(StatCell{})))
+
+	i = 0
+__12:
+	if !(i < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __14
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr(i)*32
+
+	iOff = int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(aData + uintptr(nHdr+i*2) + 1)))
+	if !(iOff < nHdr || iOff >= szPage) {
+		goto __15
+	}
+	goto statPageIsCorrupt
+__15:
+	;
+	if !!(isLeaf != 0) {
+		goto __16
+	}
+	(*StatCell)(unsafe.Pointer(pCell)).FiChildPg = Xsqlite3Get4byte(tls, aData+uintptr(iOff))
+	iOff = iOff + 4
+__16:
+	;
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x05) {
+		goto __17
+	}
+
+	goto __18
+__17:
+	iOff = iOff + int32(func() uint8 {
+		if int32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff)))) < int32(U8(0x80)) {
+			return uint8(func() int32 {
+				*(*U32)(unsafe.Pointer(bp)) = U32(*(*U8)(unsafe.Pointer(aData + uintptr(iOff))))
+				return 1
+			}())
+		}
+		return Xsqlite3GetVarint32(tls, aData+uintptr(iOff), bp)
+	}())
+	if !(int32((*StatPage)(unsafe.Pointer(p)).Fflags) == 0x0D) {
+		goto __19
+	}
+	iOff = iOff + int32(Xsqlite3GetVarint(tls, aData+uintptr(iOff), bp+8))
+__19:
+	;
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32((*StatPage)(unsafe.Pointer(p)).FnMxPayload)) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p)).FnMxPayload = int32(*(*U32)(unsafe.Pointer(bp)))
+__20:
+	;
+	nLocal = getLocalPayload(tls, nUsable, (*StatPage)(unsafe.Pointer(p)).Fflags, int32(*(*U32)(unsafe.Pointer(bp))))
+	if !(nLocal < 0) {
+		goto __21
+	}
+	goto statPageIsCorrupt
+__21:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLocal = nLocal
+
+	if !(*(*U32)(unsafe.Pointer(bp)) > U32(nLocal)) {
+		goto __22
+	}
+	nOvfl = int32((*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) + U32(nUsable) - U32(4) - U32(1)) / U32(nUsable-4))
+	if !(iOff+nLocal+4 > nUsable || *(*U32)(unsafe.Pointer(bp)) > U32(0x7fffffff)) {
+		goto __23
+	}
+	goto statPageIsCorrupt
+__23:
+	;
+	(*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl = int32(*(*U32)(unsafe.Pointer(bp)) - U32(nLocal) - U32((nOvfl-1)*(nUsable-4)))
+	(*StatCell)(unsafe.Pointer(pCell)).FnOvfl = nOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FaOvfl = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(U32(0)))*uint64(nOvfl))
+	if !((*StatCell)(unsafe.Pointer(pCell)).FaOvfl == uintptr(0)) {
+		goto __24
+	}
+	return SQLITE_NOMEM
+__24:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl)) = Xsqlite3Get4byte(tls, aData+uintptr(iOff+nLocal))
+	j = 1
+__25:
+	if !(j < nOvfl) {
+		goto __27
+	}
+	iPrev = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j-1)*4))
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPrev, bp+16, 0)
+	if !(rc != SQLITE_OK) {
+		goto __28
+	}
+
+	return rc
+__28:
+	;
+	*(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(j)*4)) = Xsqlite3Get4byte(tls, Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp + 16))))
+	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
+	goto __26
+__26:
+	j++
+	goto __25
+	goto __27
+__27:
+	;
+__22:
+	;
+__18:
+	;
+	goto __13
+__13:
+	i++
+	goto __12
+	goto __14
+__14:
+	;
+__10:
+	;
+	return SQLITE_OK
+
+statPageIsCorrupt:
+	(*StatPage)(unsafe.Pointer(p)).Fflags = U8(0)
+	statClearCells(tls, p)
+	return SQLITE_OK
+}
+
+func statSizeAndOffset(tls *libc.TLS, pCsr uintptr) {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCsr)).FpVtab
+	var pBt uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatTable)(unsafe.Pointer(pTab)).FiDb)*32)).FpBt
+	var pPager uintptr = Xsqlite3BtreePager(tls, pBt)
+	var fd uintptr
+
+	fd = Xsqlite3PagerFile(tls, pPager)
+	*(*Sqlite3_int64)(unsafe.Pointer(bp)) = Sqlite3_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	if Xsqlite3OsFileControl(tls, fd, 230440, bp) == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = *(*Sqlite3_int64)(unsafe.Pointer(bp))
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += *(*Sqlite3_int64)(unsafe.Pointer(bp + 1*8))
+	} else {
+		*(*I64)(unsafe.Pointer(pCsr + 2144)) += I64(Xsqlite3BtreeGetPageSize(tls, pBt))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiOffset = (*StatCursor)(unsafe.Pointer(pCsr)).FszPage * I64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno-U32(1))
+	}
+}
+
+func statGetPage(tls *libc.TLS, pBt uintptr, iPg U32, pPg uintptr) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var pgsz int32 = Xsqlite3BtreeGetPageSize(tls, pBt)
+	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
+	var rc int32
+
+	if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+		(*StatPage)(unsafe.Pointer(pPg)).FaPg = Xsqlite3_malloc(tls, pgsz+DBSTAT_PAGE_PADDING_BYTES)
+		if (*StatPage)(unsafe.Pointer(pPg)).FaPg == uintptr(0) {
+			return SQLITE_NOMEM
+		}
+		libc.Xmemset(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg+uintptr(pgsz), 0, uint64(DBSTAT_PAGE_PADDING_BYTES))
+	}
+
+	rc = Xsqlite3PagerGet(tls, Xsqlite3BtreePager(tls, pBt), iPg, bp, 0)
+	if rc == SQLITE_OK {
+		var a uintptr = Xsqlite3PagerGetData(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		libc.Xmemcpy(tls, (*StatPage)(unsafe.Pointer(pPg)).FaPg, a, uint64(pgsz))
+		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+	}
+
+	return rc
+}
+
+func statNext(tls *libc.TLS, pCursor uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
+	var rc int32
+	var nPayload int32
+	var z uintptr
+	var pCsr uintptr
+	var pTab uintptr
+	var pBt uintptr
+	var pPager uintptr
+
+	var iRoot U32
+	var nUsable int32
+	var iOvfl int32
+	var pCell uintptr
+
+	var p uintptr
+	var i int32
+	var p1 uintptr
+	pCsr = pCursor
+	pTab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	pBt = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FpBt
+	pPager = Xsqlite3BtreePager(tls, pBt)
+
+	Xsqlite3_free(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = uintptr(0)
+
+statNextRestart:
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __1
+	}
+
+	statResetCounts(tls, pCsr)
+	rc = Xsqlite3_step(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	if !(rc == SQLITE_ROW) {
+		goto __3
+	}
+	iRoot = U32(Xsqlite3_column_int64(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 1))
+	Xsqlite3PagerPagecount(tls, pPager, bp+48)
+	if !(*(*int32)(unsafe.Pointer(bp + 48)) == 0) {
+		goto __5
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__5:
+	;
+	rc = statGetPage(tls, pBt, iRoot, pCsr+24)
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiPgno = iRoot
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __6
+	}
+	(*StatPage)(unsafe.Pointer(pCsr + 24)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+34048, 0))
+	if !(z == uintptr(0)) {
+		goto __7
+	}
+	rc = SQLITE_NOMEM
+__7:
+	;
+__6:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = 0
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage = 1
+	goto __4
+__3:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+	return Xsqlite3_reset(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+__4:
+	;
+	goto __2
+__1:
+	p = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __8
+	}
+	statResetCounts(tls, pCsr)
+__8:
+	;
+__9:
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell < (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __10
+	}
+	pCell = (*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32
+__11:
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl) {
+		goto __12
+	}
+	Xsqlite3BtreeEnter(tls, pBt)
+	nUsable = Xsqlite3BtreeGetPageSize(tls, pBt) - Xsqlite3BtreeGetReserveNoMutex(tls, pBt)
+	Xsqlite3BtreeLeave(tls, pBt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	statSizeAndOffset(tls, pCsr)
+	if !((*StatCell)(unsafe.Pointer(pCell)).FiOvfl < (*StatCell)(unsafe.Pointer(pCell)).FnOvfl-1) {
+		goto __13
+	}
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nUsable - 4)
+	goto __14
+__13:
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64((*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64(nUsable - 4 - (*StatCell)(unsafe.Pointer(pCell)).FnLastOvfl)
+__14:
+	;
+	iOvfl = (*StatCell)(unsafe.Pointer(pCell)).FiOvfl
+	(*StatCell)(unsafe.Pointer(pCell)).FiOvfl++
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __15
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = *(*U32)(unsafe.Pointer((*StatCell)(unsafe.Pointer(pCell)).FaOvfl + uintptr(iOvfl)*4))
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 34050
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls,
+		ts+34059, libc.VaList(bp, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell, iOvfl)))
+	if z == uintptr(0) {
+		return SQLITE_NOMEM
+	}
+	return SQLITE_OK
+__15:
+	;
+	goto __11
+__12:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiRightChildPg != 0) {
+		goto __16
+	}
+	goto __10
+__16:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+	goto __9
+__10:
+	;
+	if !(!(int32((*StatPage)(unsafe.Pointer(p)).FiRightChildPg) != 0) || (*StatPage)(unsafe.Pointer(p)).FiCell > (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __17
+	}
+	statClearPage(tls, p)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage--
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 && (*StatCursor)(unsafe.Pointer(pCsr)).FiPage < 0) {
+		goto __18
+	}
+
+	return SQLITE_OK
+__18:
+	;
+	goto statNextRestart
+__17:
+	;
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPage++
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FiPage >= int32(uint64(unsafe.Sizeof([32]StatPage{}))/uint64(unsafe.Sizeof(StatPage{})))) {
+		goto __19
+	}
+	statResetCsr(tls, pCsr)
+	return Xsqlite3CorruptError(tls, 215455)
+__19:
+	;
+	if !((*StatPage)(unsafe.Pointer(p)).FiCell == (*StatPage)(unsafe.Pointer(p)).FnCell) {
+		goto __20
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatPage)(unsafe.Pointer(p)).FiRightChildPg
+	goto __21
+__20:
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiPgno = (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p)).FaCell + uintptr((*StatPage)(unsafe.Pointer(p)).FiCell)*32)).FiChildPg
+__21:
+	;
+	rc = statGetPage(tls, pBt, (*StatPage)(unsafe.Pointer(p+1*64)).FiPgno, p+1*64)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnPage++
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FiCell = 0
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __22
+	}
+	(*StatPage)(unsafe.Pointer(p + 1*64)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+34071, libc.VaList(bp+24, (*StatPage)(unsafe.Pointer(p)).FzPath, (*StatPage)(unsafe.Pointer(p)).FiCell)))
+	if !(z == uintptr(0)) {
+		goto __23
+	}
+	rc = SQLITE_NOMEM
+__23:
+	;
+__22:
+	;
+	(*StatPage)(unsafe.Pointer(p)).FiCell++
+__2:
+	;
+	if !(rc == SQLITE_OK) {
+		goto __24
+	}
+	p1 = pCsr + 24 + uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiPage)*64
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzName = Xsqlite3_column_text(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt, 0)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FiPageno = (*StatPage)(unsafe.Pointer(p1)).FiPgno
+
+	rc = statDecodePage(tls, pBt, p1)
+	if !(rc == SQLITE_OK) {
+		goto __25
+	}
+	statSizeAndOffset(tls, pCsr)
+
+	switch int32((*StatPage)(unsafe.Pointer(p1)).Fflags) {
+	case 0x05:
+		goto __27
+	case 0x02:
+		goto __28
+	case 0x0D:
+		goto __29
+	case 0x0A:
+		goto __30
+	default:
+		goto __31
+	}
+	goto __26
+__27:
+__28:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 34079
+	goto __26
+__29:
+__30:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 34088
+	goto __26
+__31:
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype = ts + 34093
+	goto __26
+__26:
+	;
+	*(*int32)(unsafe.Pointer(pCsr + 2108)) += (*StatPage)(unsafe.Pointer(p1)).FnCell
+	*(*I64)(unsafe.Pointer(pCsr + 2120)) += I64((*StatPage)(unsafe.Pointer(p1)).FnUnused)
+	if !((*StatPage)(unsafe.Pointer(p1)).FnMxPayload > (*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload) {
+		goto __32
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload = (*StatPage)(unsafe.Pointer(p1)).FnMxPayload
+__32:
+	;
+	if !!(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+		goto __33
+	}
+	(*StatCursor)(unsafe.Pointer(pCsr)).FzPath = libc.AssignUintptr(&z, Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+40, (*StatPage)(unsafe.Pointer(p1)).FzPath)))
+	if !(z == uintptr(0)) {
+		goto __34
+	}
+	rc = SQLITE_NOMEM
+__34:
+	;
+__33:
+	;
+	nPayload = 0
+	i = 0
+__35:
+	if !(i < (*StatPage)(unsafe.Pointer(p1)).FnCell) {
+		goto __37
+	}
+	nPayload = nPayload + (*StatCell)(unsafe.Pointer((*StatPage)(unsafe.Pointer(p1)).FaCell+uintptr(i)*32)).FnLocal
+	goto __36
+__36:
+	i++
+	goto __35
+	goto __37
+__37:
+	;
+	*(*I64)(unsafe.Pointer(pCsr + 2128)) += I64(nPayload)
+
+	if !((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0) {
+		goto __38
+	}
+	goto statNextRestart
+__38:
+	;
+__25:
+	;
+__24:
+	;
+	return rc
+}
+
+func statEof(tls *libc.TLS, pCursor uintptr) int32 {
+	var pCsr uintptr = pCursor
+	return int32((*StatCursor)(unsafe.Pointer(pCsr)).FisEof)
+}
+
+func statFilter(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintptr, argc int32, argv uintptr) int32 {
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	var pCsr uintptr = pCursor
+	var pTab uintptr = (*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab
+	var pSql uintptr
+	var zSql uintptr
+	var iArg int32 = 0
+	var rc int32 = SQLITE_OK
+	var zName uintptr = uintptr(0)
+	_ = argc
+	_ = idxStr
+
+	statResetCsr(tls, pCsr)
+	Xsqlite3_finalize(tls, (*StatCursor)(unsafe.Pointer(pCsr)).FpStmt)
+	(*StatCursor)(unsafe.Pointer(pCsr)).FpStmt = uintptr(0)
+	if idxNum&0x01 != 0 {
+		var zDbase uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = Xsqlite3FindDbName(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zDbase)
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FiDb < 0 {
+			(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = 0
+			(*StatCursor)(unsafe.Pointer(pCsr)).FisEof = U8(1)
+			return SQLITE_OK
+		}
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiDb = (*StatTable)(unsafe.Pointer(pTab)).FiDb
+	}
+	if idxNum&0x02 != 0 {
+		zName = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8)))
+	}
+	if idxNum&0x04 != 0 {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(libc.Bool32(Xsqlite3_value_double(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(libc.PostIncInt32(&iArg, 1))*8))) != 0.0))
+	} else {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FisAgg = U8(0)
+	}
+	pSql = Xsqlite3_str_new(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb)
+	Xsqlite3_str_appendf(tls, pSql,
+		ts+34103,
+		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*StatTable)(unsafe.Pointer(pTab)).Fdb)).FaDb+uintptr((*StatCursor)(unsafe.Pointer(pCsr)).FiDb)*32)).FzDbSName))
+	if zName != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+34258, libc.VaList(bp+8, zName))
+	}
+	if idxNum&0x08 != 0 {
+		Xsqlite3_str_appendf(tls, pSql, ts+34272, 0)
+	}
+	zSql = Xsqlite3_str_finish(tls, pSql)
+	if zSql == uintptr(0) {
+		return SQLITE_NOMEM
+	} else {
+		rc = Xsqlite3_prepare_v2(tls, (*StatTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, pCsr+8, uintptr(0))
+		Xsqlite3_free(tls, zSql)
+	}
+
+	if rc == SQLITE_OK {
+		(*StatCursor)(unsafe.Pointer(pCsr)).FiPage = -1
+		rc = statNext(tls, pCursor)
+	}
+	return rc
+}
+
+func statColumn(tls *libc.TLS, pCursor uintptr, ctx uintptr, i int32) int32 {
+	var pCsr uintptr = pCursor
+	switch i {
+	case 0:
+		Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzName, -1, libc.UintptrFromInt32(-1))
+		break
+	case 1:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPath, -1, libc.UintptrFromInt32(-1))
+		}
+		break
+	case 2:
+		if (*StatCursor)(unsafe.Pointer(pCsr)).FisAgg != 0 {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnPage))
+		} else {
+			Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno))
+		}
+		break
+	case 3:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_text(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FzPagetype, -1, uintptr(0))
+		}
+		break
+	case 4:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnCell))
+		break
+	case 5:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnPayload)
+		break
+	case 6:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FnUnused)
+		break
+	case 7:
+		Xsqlite3_result_int64(tls, ctx, int64((*StatCursor)(unsafe.Pointer(pCsr)).FnMxPayload))
+		break
+	case 8:
+		if !(int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg) != 0) {
+			Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FiOffset)
+		}
+		break
+	case 9:
+		Xsqlite3_result_int64(tls, ctx, (*StatCursor)(unsafe.Pointer(pCsr)).FszPage)
+		break
+	case 10:
+		{
+			var db uintptr = Xsqlite3_context_db_handle(tls, ctx)
+			var iDb int32 = (*StatCursor)(unsafe.Pointer(pCsr)).FiDb
+			Xsqlite3_result_text(tls, ctx, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, -1, uintptr(0))
+			break
+
+		}
+	default:
+		{
+			Xsqlite3_result_int(tls, ctx, int32((*StatCursor)(unsafe.Pointer(pCsr)).FisAgg))
+			break
+
+		}
+	}
+	return SQLITE_OK
+}
+
+func statRowid(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32 {
+	var pCsr uintptr = pCursor
+	*(*Sqlite_int64)(unsafe.Pointer(pRowid)) = Sqlite_int64((*StatCursor)(unsafe.Pointer(pCsr)).FiPageno)
+	return SQLITE_OK
+}
+
+// Invoke this routine to register the "dbstat" virtual table module
+func Xsqlite3DbstatRegister(tls *libc.TLS, db uintptr) int32 {
+	return Xsqlite3_create_module(tls, db, ts+34287, uintptr(unsafe.Pointer(&dbstat_module)), uintptr(0))
+}
+
+var dbstat_module = Sqlite3_module{
+	FxCreate:     0,
+	FxConnect:    0,
+	FxBestIndex:  0,
+	FxDisconnect: 0,
+	FxDestroy:    0,
+	FxOpen:       0,
+	FxClose:      0,
+	FxFilter:     0,
+	FxNext:       0,
+	FxEof:        0,
+	FxColumn:     0,
+	FxRowid:      0,
+}
+
 type SessionTable1 = struct {
 	FpNext    uintptr
 	FzName    uintptr
@@ -175797,13 +176823,13 @@ 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+12700, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+12719, 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+33724, 0)
+				ts+34294, 0)
 		} else if rc == SQLITE_ERROR {
-			zPragma = Xsqlite3_mprintf(tls, ts+1544, 0)
+			zPragma = Xsqlite3_mprintf(tls, ts+1563, 0)
 		} else {
 			*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
 			*(*uintptr)(unsafe.Pointer(pabPK)) = uintptr(0)
@@ -175814,7 +176840,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+33845, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+34415, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -175912,7 +176938,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+12700, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+12719, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -176161,7 +177187,7 @@ __4:
 	goto error_out
 __7:
 	;
-	Xsqlite3ValueSetStr(tls, p, 0, ts+1544, uint8(0), uintptr(0))
+	Xsqlite3ValueSetStr(tls, p, 0, ts+1563, uint8(0), uintptr(0))
 	(*Sqlite3_session)(unsafe.Pointer(pSession)).FpZeroBlob = p
 __6:
 	;
@@ -176489,14 +177515,14 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1544
+	var zSep uintptr = ts + 1563
 	var zRet uintptr = uintptr(0)
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+33874,
+			zRet = Xsqlite3_mprintf(tls, ts+34444,
 				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 + 22894
+			zSep = ts + 22960
 			if zRet == uintptr(0) {
 				break
 			}
@@ -176511,7 +177537,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	defer tls.Free(64)
 
 	var i int32
-	var zSep uintptr = ts + 1544
+	var zSep uintptr = ts + 1563
 	var zRet uintptr = uintptr(0)
 	var bHave int32 = 0
 
@@ -176519,9 +177545,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+33908,
+				ts+34478,
 				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 + 33949
+			zSep = ts + 34519
 			if zRet == uintptr(0) {
 				break
 			}
@@ -176529,7 +177555,7 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+8882, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+8890, 0)
 	}
 
 	return zRet
@@ -176540,7 +177566,7 @@ func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintpt
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+33954,
+		ts+34524,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -176583,7 +177609,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+34032,
+			ts+34602,
 			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
@@ -176710,7 +177736,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+34085, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+34655, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -176975,7 +178001,7 @@ func sessionAppendInteger(tls *libc.TLS, p uintptr, iVal int32, pRc uintptr) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
-	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]int8{}))-uint64(1)), bp+8, ts+6327, libc.VaList(bp, iVal))
+	Xsqlite3_snprintf(tls, int32(uint64(unsafe.Sizeof([24]int8{}))-uint64(1)), bp+8, ts+6346, libc.VaList(bp, iVal))
 	sessionAppendStr(tls, p, bp+8, pRc)
 }
 
@@ -177184,29 +178210,29 @@ 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+12700, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+12719, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+34112, libc.VaList(bp, zDb))
+			ts+34682, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
 	} else {
 		var i int32
-		var zSep uintptr = ts + 1544
+		var zSep uintptr = ts + 1563
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+34222, bp+24)
+		sessionAppendStr(tls, bp+8, ts+34792, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
-		sessionAppendStr(tls, bp+8, ts+1557, bp+24)
+		sessionAppendStr(tls, bp+8, ts+1576, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+34237, bp+24)
+		sessionAppendStr(tls, bp+8, ts+34807, 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+34245, bp+24)
+				sessionAppendStr(tls, bp+8, ts+34815, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 22894
+				zSep = ts + 22960
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -177315,7 +178341,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+34251, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+34821, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -177407,7 +178433,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+34271, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34841, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -177670,7 +178696,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, 219078)
+				rc = Xsqlite3CorruptError(tls, 219169)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -177693,7 +178719,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, 219098)
+						rc = Xsqlite3CorruptError(tls, 219189)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -177735,7 +178761,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, 219152)
+			rc = Xsqlite3CorruptError(tls, 219243)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -177796,7 +178822,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, 219240)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219331)
 		}
 	}
 
@@ -177870,13 +178896,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, 219326))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219417))
 	}
 
 	(*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, 219332))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219423))
 	}
 
 	if paRec != 0 {
@@ -177938,7 +178964,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, 219376))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219467))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -178311,7 +179337,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219832)
 	goto finished_invert
 __6:
 	;
@@ -178479,45 +179505,45 @@ 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+12700) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+12719) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
 			} else {
-				var zSep uintptr = ts + 1544
+				var zSep uintptr = ts + 1563
 
 				libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(SessionBuffer{})))
 				(*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+34289, bp+16)
+				sessionAppendStr(tls, bp, ts+34859, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+34302, bp+16)
+				sessionAppendStr(tls, bp, ts+34872, 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+34308, bp+16)
+						sessionAppendStr(tls, bp, ts+34878, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 15971
+						zSep = ts + 15990
 					}
 				}
 
-				zSep = ts + 1544
-				sessionAppendStr(tls, bp, ts+34237, bp+16)
+				zSep = ts + 1563
+				sessionAppendStr(tls, bp, ts+34807, 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+34313, bp+16)
+								ts+34883, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+34245, bp+16)
+							sessionAppendStr(tls, bp, ts+34815, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 22894
+						zSep = ts + 22960
 					}
 				}
 
@@ -178564,42 +179590,42 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	defer tls.Free(20)
 
 	var i int32
-	var zSep uintptr = ts + 1544
+	var zSep uintptr = ts + 1563
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+34388, bp+16)
+	sessionAppendStr(tls, bp, ts+34958, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+34237, bp+16)
+	sessionAppendStr(tls, bp, ts+34807, 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+34308, bp+16)
+			sessionAppendStr(tls, bp, ts+34878, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 22894
+			zSep = ts + 22960
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+34406, bp+16)
+		sessionAppendStr(tls, bp, ts+34976, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+33949, bp+16)
+		sessionAppendStr(tls, bp, ts+34519, bp+16)
 
-		zSep = ts + 1544
+		zSep = ts + 1563
 		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+34245, bp+16)
+				sessionAppendStr(tls, bp, ts+34815, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 34414
+				zSep = ts + 34984
 			}
 		}
-		sessionAppendStr(tls, bp, ts+6309, bp+16)
+		sessionAppendStr(tls, bp, ts+6328, bp+16)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
@@ -178612,7 +179638,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+7793, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+7812, 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 {
@@ -178623,21 +179649,21 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+34419, bp+16)
+	sessionAppendStr(tls, bp, ts+34989, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+22900, bp+16)
+	sessionAppendStr(tls, bp, ts+22966, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+15971, bp+16)
+			sessionAppendStr(tls, bp, ts+15990, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+34437, bp+16)
+	sessionAppendStr(tls, bp, ts+35007, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+34448, bp+16)
+		sessionAppendStr(tls, bp, ts+35018, bp+16)
 	}
-	sessionAppendStr(tls, bp, ts+6309, bp+16)
+	sessionAppendStr(tls, bp, ts+6328, bp+16)
 
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v2(tls, db, (*SessionBuffer)(unsafe.Pointer(bp)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp)).FnBuf, p+16, uintptr(0))
@@ -178651,14 +179677,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+12700, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+12719, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+34452)
+			ts+35022)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+34565)
+			ts+35135)
 	}
 	return rc
 }
@@ -178686,7 +179712,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, 220219)
+				rc = Xsqlite3CorruptError(tls, 220310)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -178939,7 +179965,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+34709, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+35279, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -178955,7 +179981,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+34730, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+35300, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -179028,10 +180054,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+34749, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+35319, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+34775, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+35345, 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))
@@ -179064,7 +180090,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				f func(*libc.TLS, uintptr, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xFilter})).f(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 176))))
 			if schemaMismatch != 0 {
-				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
+				*(*uintptr)(unsafe.Pointer(bp + 200)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176))))
 				if *(*uintptr)(unsafe.Pointer(bp + 200)) == uintptr(0) {
 					rc = SQLITE_NOMEM
 					break
@@ -179077,7 +180103,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+7793, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+7812, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -179090,19 +180116,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+34805, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+35375, 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+34849,
+						ts+35419,
 						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+34920, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+35490, 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+12700) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+12719) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -179153,14 +180179,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+34980, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+35550, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+35010, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+35580, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+35034, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+35010, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+35604, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+35580, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -180408,7 +181434,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+35062, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+35632, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -180696,7 +181722,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+35090, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+35660, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -180883,7 +181909,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+35121, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+35691, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -180951,7 +181977,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 35128
+		var zErr uintptr = ts + 35698
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -181110,7 +182136,7 @@ func fts5ValueToText(tls *libc.TLS, pVal uintptr) uintptr {
 	if zRet != 0 {
 		return zRet
 	}
-	return ts + 1544
+	return ts + 1563
 }
 
 func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, nVal int32, apVal uintptr) {
@@ -181133,7 +182159,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 35178
+		var zErr uintptr = ts + 35748
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -181457,13 +182483,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 35226, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 35796, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 35234, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 35804, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 35244, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 35814, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -181874,7 +182900,7 @@ func fts5ConfigSkipLiteral(tls *libc.TLS, pIn uintptr) uintptr {
 	case 'n':
 		fallthrough
 	case 'N':
-		if Xsqlite3_strnicmp(tls, ts+7533, p, 4) == 0 {
+		if Xsqlite3_strnicmp(tls, ts+7552, p, 4) == 0 {
 			p = p + 4
 		} else {
 			p = uintptr(0)
@@ -182014,7 +183040,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+35249, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35819, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -182041,14 +183067,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+35256, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35826, 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+35287, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+35857, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -182059,7 +183085,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35320, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35890, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -182072,7 +183098,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+35357, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35927, 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)))
@@ -182081,7 +183107,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+35366, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35936, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -182100,7 +183126,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35399, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35969, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -182115,14 +183141,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+35433, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+36003, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35441, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36011, 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+35473, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+36043, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -182130,9 +183156,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+35479, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+36049, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35493, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36063, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -182140,9 +183166,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+35531, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+36101, 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+35542, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36112, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -182150,21 +183176,21 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+6427, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+6446, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 9378, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 18714},
-			{FzName: ts + 35577, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 9397, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 18733},
+			{FzName: ts + 36147, 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+35585, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36155, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35616, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36186, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -182211,15 +183237,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+23560) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+17625) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35644, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+23626) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+17644) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36214, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+35674) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+36244) {
 			*(*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+35684, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36254, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -182236,13 +183262,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+35715, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+36285, 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+35720, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+36290, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35727, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+36297, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -182280,8 +183306,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+23560) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35735, 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+23626) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36305, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -182313,7 +183339,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+35764, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36334, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -182322,13 +183348,13 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 							if *(*uintptr)(unsafe.Pointer(bp + 48)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 48))
 							}
-							return ts + 1544
+							return ts + 1563
 						}(),
 						func() uintptr {
 							if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 								return *(*uintptr)(unsafe.Pointer(bp + 64))
 							}
-							return ts + 1544
+							return ts + 1563
 						}(),
 						pzErr)
 				} else {
@@ -182350,19 +183376,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 + 35433
+			zTail = ts + 36003
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 35784
+			zTail = ts + 36354
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+35792, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+36362, 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+17625, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+17644, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -182406,18 +183432,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+35803, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+36373, 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 + 1563
 			}
-			return ts + 15971
+			return ts + 15990
 		}()
-		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+36389, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35826,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+23560))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+36396,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+23626))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -182527,7 +183553,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35852) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+36422) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -182537,7 +183563,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+35857) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+36427) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -182547,7 +183573,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+35866) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+36436) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -182560,7 +183586,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+35876) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+36446) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -182570,7 +183596,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+35886) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+36456) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -182586,7 +183612,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+23560) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+23626) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -182609,7 +183635,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 35898
+	var zSelect uintptr = ts + 36468
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -182631,7 +183657,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+35930) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+36500) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -182645,7 +183671,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+35938,
+				ts+36508,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -182743,7 +183769,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+36003, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+36573, 0)
 					return FTS5_EOF
 				}
 			}
@@ -182756,20 +183782,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+36023, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+36593, 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+36054, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+36624, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+36057, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+36627, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+31439, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+31505, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -184547,9 +185573,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+36061, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+36631, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+35090, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+35660, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -184565,7 +185591,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+36066, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+36636, 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')
@@ -184652,7 +185678,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+21897, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+21963, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -184733,7 +185759,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+36095, 0)
+			ts+36665, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -184903,12 +185929,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+36148,
+								ts+36718,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 36198
+										return ts + 36768
 									}
-									return ts + 36061
+									return ts + 36631
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -185851,7 +186877,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+36205, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+36775, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -185930,7 +186956,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+36211,
+			ts+36781,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -185955,7 +186981,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+36262,
+			ts+36832,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -185978,7 +187004,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+36311,
+			ts+36881,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -186217,7 +187243,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+36351, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+36921, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -187416,7 +188442,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+36374,
+			ts+36944,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -188609,7 +189635,7 @@ func fts5WriteFlushBtree(tls *libc.TLS, p uintptr, pWriter uintptr) {
 			if (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn > 0 {
 				return (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fp
 			}
-			return ts + 1544
+			return ts + 1563
 		}()
 
 		Xsqlite3_bind_blob(tls, (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter, 2, z, (*Fts5SegWriter)(unsafe.Pointer(pWriter)).Fbtterm.Fn, uintptr(0))
@@ -188882,7 +189908,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+36458,
+			ts+37028,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -189948,7 +190974,7 @@ func sqlite3Fts5IndexReinit(tls *libc.TLS, p uintptr) int32 {
 	fts5StructureInvalidate(tls, p)
 	fts5IndexDiscardData(tls, p)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Fts5Structure{})))
-	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1544, 0)
+	fts5DataWrite(tls, p, int64(FTS5_AVERAGES_ROWID), ts+1563, 0)
 	fts5StructureWrite(tls, p, bp)
 	return fts5IndexReturn(tls, p)
 }
@@ -189964,13 +190990,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+36515, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+37085, 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+26432, ts+36523, 0, pzErr)
+				pConfig, ts+26498, ts+37093, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+12840,
-					ts+36558,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+12859,
+					ts+37128,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -190223,7 +191249,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+36205, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+36775, 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)))
@@ -190337,7 +191363,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+36602,
+		ts+37172,
 		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))) {
@@ -190507,7 +191533,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+36688)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+37258)
 			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))
@@ -190778,7 +191804,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+36693, 0)
+			ts+37263, 0)
 		return SQLITE_ERROR
 	}
 
@@ -190809,7 +191835,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 				} else if iCol >= 0 {
 					bSeenMatch = 1
 					*(*int8)(unsafe.Pointer(idxStr + uintptr(libc.PostIncInt32(&iIdxStr, 1)))) = int8('M')
-					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+6327, libc.VaList(bp, iCol))
+					Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+6346, libc.VaList(bp, iCol))
 					idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 
 				}
@@ -190824,7 +191850,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 					}
 					return int8('G')
 				}()
-				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+6327, libc.VaList(bp+8, iCol))
+				Xsqlite3_snprintf(tls, 6, idxStr+uintptr(iIdxStr), ts+6346, libc.VaList(bp+8, iCol))
 				idxStr += uintptr(libc.Xstrlen(tls, idxStr+uintptr(iIdxStr)))
 				(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pInfo)).FaConstraintUsage + uintptr(i)*8)).FargvIndex = libc.PreIncInt32(&iCons, 1)
 
@@ -191138,7 +192164,7 @@ func fts5NextMethod(tls *libc.TLS, pCursor uintptr) int32 {
 					rc = Xsqlite3_reset(tls, (*Fts5Cursor)(unsafe.Pointer(pCsr)).FpStmt)
 					if rc != SQLITE_OK {
 						(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pCursor)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-							ts+4493, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+							ts+4512, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 					}
 				} else {
 					rc = SQLITE_OK
@@ -191170,7 +192196,7 @@ func fts5PrepareStatement(tls *libc.TLS, ppStmt uintptr, pConfig uintptr, zFmt u
 		rc = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
 			uint32(SQLITE_PREPARE_PERSISTENT), bp+8, uintptr(0))
 		if rc != SQLITE_OK {
-			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
+			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb)))
 		}
 		Xsqlite3_free(tls, zSql)
 	}
@@ -191202,25 +192228,25 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+36732,
+		ts+37302,
 		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 + 15971
+					return ts + 15990
 				}
-				return ts + 1544
+				return ts + 1563
 			}(),
 			func() uintptr {
 				if zRankArgs != 0 {
 					return zRankArgs
 				}
-				return ts + 1544
+				return ts + 1563
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 36787
+					return ts + 37357
 				}
-				return ts + 36792
+				return ts + 37362
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -191266,12 +192292,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+36796, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+37366, 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) {
+	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+6428, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36802, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+37372, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -191302,7 +192328,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+36830, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+37400, 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,
@@ -191333,7 +192359,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+36840, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+37410, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -191365,14 +192391,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+36861, libc.VaList(bp, z))
+				ts+37431, 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 + 35244
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 35814
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -191428,7 +192454,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+36693, 0)
+		ts+37263, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -191471,7 +192497,7 @@ __8:
 	if !(zText == uintptr(0)) {
 		goto __14
 	}
-	zText = ts + 1544
+	zText = ts + 1563
 __14:
 	;
 	iCol = 0
@@ -191645,7 +192671,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+36894, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+37464, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -191766,7 +192792,7 @@ func fts5SeekCursor(tls *libc.TLS, pCsr uintptr, bErrormsg int32) int32 {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			} else if (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg != 0 {
 				*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-					ts+4493, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
+					ts+4512, libc.VaList(bp, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer((*Fts5Table)(unsafe.Pointer(pTab)).FpConfig)).Fdb)))
 			}
 		}
 	}
@@ -191790,28 +192816,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+36930, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+37500, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+36941, 0)
+				ts+37511, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+37021, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+37591, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+37029, 0)
+				ts+37599, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+18313, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+18332, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+37085, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+37655, 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+37091, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+37661, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -191869,7 +192895,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+18848, z) {
+			0 == Xsqlite3_stricmp(tls, ts+18867, 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)))
@@ -191882,12 +192908,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+37107,
+				ts+37677,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 21798
+						return ts + 21864
 					}
-					return ts + 37144
+					return ts + 37714
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -192517,7 +193543,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+37156, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+37726, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -192761,7 +193787,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+37177, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37747, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -192780,7 +193806,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+37199, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37769, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -192827,7 +193853,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+37230)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+37800)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -192836,7 +193862,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+37243, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+37813, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -192850,7 +193876,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 37334, ts + 35433, ts + 26432, ts + 35784, ts + 12840,
+	ts + 37904, ts + 36003, ts + 26498, ts + 36354, ts + 12859,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -192874,7 +193900,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+37341, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+37911, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -192892,13 +193918,13 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+37341, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+37911, 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+37346, 0,
+				db, ts+37916, 0,
 				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
 				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
@@ -192955,17 +193981,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 + 37361,
-			ts + 37429,
-			ts + 37498,
-			ts + 37531,
-			ts + 37570,
-			ts + 37610,
-			ts + 37649,
-			ts + 37690,
-			ts + 37729,
-			ts + 37771,
-			ts + 37811,
+			ts + 37931,
+			ts + 37999,
+			ts + 38068,
+			ts + 38101,
+			ts + 38140,
+			ts + 38180,
+			ts + 38219,
+			ts + 38260,
+			ts + 38299,
+			ts + 38341,
+			ts + 38381,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -193032,7 +194058,7 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 			(*Fts5Config)(unsafe.Pointer((*Fts5Storage)(unsafe.Pointer(p)).FpConfig)).FbLock--
 			Xsqlite3_free(tls, zSql)
 			if rc != SQLITE_OK && pzErrMsg != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+4493, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
+				*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+4512, libc.VaList(bp+120, Xsqlite3_errmsg(tls, (*Fts5Config)(unsafe.Pointer(pC)).Fdb)))
 			}
 		}
 	}
@@ -193067,18 +194093,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+37834,
+		ts+38404,
 		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+37938,
+			ts+38508,
 			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+37976,
+			ts+38546,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -193090,7 +194116,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+38014,
+			ts+38584,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -193102,14 +194128,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+26432, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+12840, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+37334, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+26498, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+12859, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+37904, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+35784, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+36354, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+35433, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+36003, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -193121,17 +194147,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+38056,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+38626,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 31085
+					return ts + 31151
 				}
-				return ts + 1544
+				return ts + 1563
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+38086,
+			ts+38656,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -193168,27 +194194,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+38130, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+38700, 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+38153, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+38723, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+35433, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+36003, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35784, ts+38159, 0, pzErr)
+				pConfig, ts+36354, ts+38729, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+37334, ts+38191, 1, pzErr)
+				pConfig, ts+37904, ts+38761, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35930, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+36500, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -193394,12 +194420,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+38208,
+		ts+38778,
 		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+38258,
+			ts+38828,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -193407,7 +194433,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+35930, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+36500, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -193583,7 +194609,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+38287,
+	zSql = Xsqlite3_mprintf(tls, ts+38857,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -193765,14 +194791,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+35433, bp+48)
+			rc = fts5StorageCount(tls, p, ts+36003, 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+35784, bp+56)
+			rc = fts5StorageCount(tls, p, ts+36354, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -193967,9 +194993,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+38319) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38889) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38330) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38900) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -194184,7 +195210,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 + 38341
+			var zCat uintptr = ts + 38911
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -194196,7 +195222,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+38350) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38920) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -194207,18 +195233,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+38361) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38931) {
 					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+38319) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38889) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38330) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38900) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38350) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38920) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -194494,7 +195520,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 + 38379
+	var zBase uintptr = ts + 38949
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -194636,7 +195662,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+38389, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38959, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -194644,11 +195670,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38392, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38962, 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+38397, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38967, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -194656,7 +195682,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38402, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38972, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -194664,7 +195690,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38405, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38975, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -194672,11 +195698,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38408, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38978, 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+38413, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38983, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -194684,19 +195710,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38418, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38988, 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+38422, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38992, 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+38428, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38998, 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+38433, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39003, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -194704,11 +195730,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38437, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39007, 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+38441, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+39011, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -194716,7 +195742,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38444, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39014, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -194724,11 +195750,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38448, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39018, 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+38452, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39022, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -194736,7 +195762,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38456, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39026, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -194744,7 +195770,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38460, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39030, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -194752,7 +195778,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38464, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39034, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -194768,24 +195794,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+38468, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+38448, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+39038, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+39018, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+39041, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+39044, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		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))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+39048, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+39034, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -194800,137 +195826,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+38481, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+39051, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38448, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+39018, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+38489, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+39059, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+38496, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+39066, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38501, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+39071, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38397, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38967, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38506, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+39076, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38392, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38962, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38511, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+39081, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38464, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+39034, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38516, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+39086, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+16837, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+16856, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38521, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39091, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+38474, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+39044, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38525, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+39095, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38389, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38959, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38530, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39100, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38433, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+39003, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38536, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39106, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+38540, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+39110, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38542, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39112, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38456, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+39026, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38548, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+39118, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38464, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+39034, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38556, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39126, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38448, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+39018, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38562, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+39132, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38448, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+39018, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38567, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39137, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38389, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38959, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38573, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+39143, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38460, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+39030, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38581, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+39151, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38589, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+39159, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38593, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+39163, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38456, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+39026, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38601, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39171, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38389, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38959, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38607, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39177, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38460, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+39030, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+38613, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+39183, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+38474, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+39044, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -194945,16 +195971,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+38620, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+39190, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38405, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38975, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38625, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+39195, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -194962,21 +195988,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38630, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39200, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38405, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38975, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38636, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39206, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38405, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38975, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38589, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39159, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -194984,7 +196010,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38642, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39212, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -194992,9 +196018,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38648, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+39218, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38389, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38959, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -195009,12 +196035,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+38654, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39224, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+38658, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+39228, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38661, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+39231, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -195023,7 +196049,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38664, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+39234, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -195179,7 +196205,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+38668) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+39238) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -195359,22 +196385,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 38379, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 38949, 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 + 38683, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 39253, 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 + 38689, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 39259, 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 + 38696, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 39266, 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
@@ -196517,14 +197543,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+38704) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+39274) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+38708) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+39278) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+38712) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+39282) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38721, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+39291, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -196550,19 +197576,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 + 38755,
-		ts + 38795,
-		ts + 38830,
+		ts + 39325,
+		ts + 39365,
+		ts + 39400,
 	}
 
 	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+24721, *(*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+24787, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38873, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+39443, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -196695,11 +197721,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+38906, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+39476, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+38937,
+		ts+39507,
 		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))
@@ -196723,7 +197749,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+38988, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+39558, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -197007,7 +198033,7 @@ func fts5VocabFilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, zUnused
 		if pLe != 0 {
 			var zCopy uintptr = Xsqlite3_value_text(tls, pLe)
 			if zCopy == uintptr(0) {
-				zCopy = ts + 1544
+				zCopy = ts + 1563
 			}
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm = Xsqlite3_value_bytes(tls, pLe)
 			(*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FzLeTerm = Xsqlite3_malloc(tls, (*Fts5VocabCursor)(unsafe.Pointer(pCsr)).FnLeTerm+1)
@@ -197118,7 +198144,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+39014, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+39584, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -197140,7 +198166,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 + 39024
+	return ts + 39594
 }
 
 func init() {
@@ -197605,6 +198631,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1056)) = noopStepFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aWindowFuncs)) + 1064)) = uintptr(unsafe.Pointer(&lagName))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&attach_func)) + 24)) = attachFunc
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 8)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 16)) = statConnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 24)) = statBestIndex
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 32)) = statDisconnect
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 40)) = statDisconnect
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 48)) = statOpen
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 56)) = statClose
+	*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 64)) = statFilter
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 72)) = statNext
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 80)) = statEof
+	*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 88)) = statColumn
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&dbstat_module)) + 96)) = statRowid
 	*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 0)) = sqlite3MemMalloc
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 8)) = sqlite3MemFree
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&defaultMethods)) + 16)) = sqlite3MemRealloc
@@ -198082,8 +199120,9 @@ func init() {
 	*(*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
-	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = Xsqlite3JsonTableFunctions
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = Xsqlite3DbstatRegister
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 24)) = sqlite3TestExtInit
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 32)) = Xsqlite3JsonTableFunctions
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statGetFuncdef)) + 24)) = statGet
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statInitFuncdef)) + 24)) = statInit
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&statPushFuncdef)) + 24)) = statPush
@@ -198207,5 +199246,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&winVfs)) + 160)) = winNextSystemCall
 }
 
-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 ts1 = "3.41.2\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_DBSTAT_VTAB\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\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\x00true\x00false\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 \x00rowid not at end-of-record for row \x00 of 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\x00CREATE TABLE x( name       TEXT, path       TEXT, pageno     INTEGER, pagetype   TEXT, ncell      INTEGER, payload    INTEGER, unused     INTEGER, mx_payload INTEGER, pgoffset   INTEGER, pgsize     INTEGER, schema     TEXT HIDDEN, aggregate  BOOLEAN HIDDEN)\x00/\x00overflow\x00%s%.3x+%.6x\x00%s%.3x/\x00internal\x00leaf\x00corrupted\x00SELECT * FROM (SELECT 'sqlite_schema' AS name,1 AS rootpage,'table' AS type UNION ALL SELECT name,rootpage,type FROM \"%w\".sqlite_schema WHERE rootpage!=0)\x00WHERE name=%Q\x00 ORDER BY name\x00dbstat\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\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-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da\x00"
 var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/sqlite/nodmesg.go b/vendor/modernc.org/sqlite/nodmesg.go
new file mode 100644
index 00000000..f7831346
--- /dev/null
+++ b/vendor/modernc.org/sqlite/nodmesg.go
@@ -0,0 +1,12 @@
+// Copyright 2023 The Sqlite 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 !sqlite.dmesg
+// +build !sqlite.dmesg
+
+package sqlite // import "modernc.org/sqlite"
+
+const dmesgs = false
+
+func dmesg(s string, args ...interface{}) {}
diff --git a/vendor/modernc.org/sqlite/sqlite.go b/vendor/modernc.org/sqlite/sqlite.go
index 61826cd0..c2439078 100644
--- a/vendor/modernc.org/sqlite/sqlite.go
+++ b/vendor/modernc.org/sqlite/sqlite.go
@@ -10,11 +10,14 @@ import (
 	"context"
 	"database/sql"
 	"database/sql/driver"
+	"errors"
 	"fmt"
 	"io"
 	"math"
+	"math/bits"
 	"net/url"
 	"reflect"
+	"runtime"
 	"strconv"
 	"strings"
 	"sync"
@@ -437,7 +440,7 @@ func (r *rows) ColumnTypeScanType(index int) reflect.Type {
 	case sqlite3.SQLITE_TEXT:
 		return reflect.TypeOf("")
 	case sqlite3.SQLITE_BLOB:
-		return reflect.SliceOf(reflect.TypeOf([]byte{}))
+		return reflect.TypeOf([]byte(nil))
 	case sqlite3.SQLITE_NULL:
 		return reflect.TypeOf(nil)
 	default:
@@ -471,7 +474,6 @@ func (s *stmt) Close() (err error) {
 
 // Exec executes a query that doesn't return rows, such as an INSERT or UPDATE.
 //
-//
 // Deprecated: Drivers should implement StmtExecContext instead (or
 // additionally).
 func (s *stmt) Exec(args []driver.Value) (driver.Result, error) { //TODO StmtExecContext
@@ -579,6 +581,13 @@ func (s *stmt) query(ctx context.Context, args []driver.NamedValue) (r driver.Ro
 	}
 
 	var allocs []uintptr
+
+	defer func() {
+		if r == nil && err == nil {
+			r, err = newRows(s.c, pstmt, allocs, true)
+		}
+	}()
+
 	for psql := s.psql; *(*byte)(unsafe.Pointer(psql)) != 0 && atomic.LoadInt32(&done) == 0; {
 		if pstmt, err = s.c.prepareV2(&psql); err != nil {
 			return nil, err
@@ -847,7 +856,9 @@ func applyQueryParams(c *conn, query string) error {
 	return nil
 }
 
-// const void *sqlite3_column_blob(sqlite3_stmt*, int iCol);
+// C documentation
+//
+//	const void *sqlite3_column_blob(sqlite3_stmt*, int iCol);
 func (c *conn) columnBlob(pstmt uintptr, iCol int) (v []byte, err error) {
 	p := sqlite3.Xsqlite3_column_blob(c.tls, pstmt, int32(iCol))
 	len, err := c.columnBytes(pstmt, iCol)
@@ -864,13 +875,17 @@ func (c *conn) columnBlob(pstmt uintptr, iCol int) (v []byte, err error) {
 	return v, nil
 }
 
-// int sqlite3_column_bytes(sqlite3_stmt*, int iCol);
+// C documentation
+//
+//	int sqlite3_column_bytes(sqlite3_stmt*, int iCol);
 func (c *conn) columnBytes(pstmt uintptr, iCol int) (_ int, err error) {
 	v := sqlite3.Xsqlite3_column_bytes(c.tls, pstmt, int32(iCol))
 	return int(v), nil
 }
 
-// const unsigned char *sqlite3_column_text(sqlite3_stmt*, int iCol);
+// C documentation
+//
+//	const unsigned char *sqlite3_column_text(sqlite3_stmt*, int iCol);
 func (c *conn) columnText(pstmt uintptr, iCol int) (v string, err error) {
 	p := sqlite3.Xsqlite3_column_text(c.tls, pstmt, int32(iCol))
 	len, err := c.columnBytes(pstmt, iCol)
@@ -887,53 +902,71 @@ func (c *conn) columnText(pstmt uintptr, iCol int) (v string, err error) {
 	return string(b), nil
 }
 
-// double sqlite3_column_double(sqlite3_stmt*, int iCol);
+// C documentation
+//
+//	double sqlite3_column_double(sqlite3_stmt*, int iCol);
 func (c *conn) columnDouble(pstmt uintptr, iCol int) (v float64, err error) {
 	v = sqlite3.Xsqlite3_column_double(c.tls, pstmt, int32(iCol))
 	return v, nil
 }
 
-// sqlite3_int64 sqlite3_column_int64(sqlite3_stmt*, int iCol);
+// C documentation
+//
+//	sqlite3_int64 sqlite3_column_int64(sqlite3_stmt*, int iCol);
 func (c *conn) columnInt64(pstmt uintptr, iCol int) (v int64, err error) {
 	v = sqlite3.Xsqlite3_column_int64(c.tls, pstmt, int32(iCol))
 	return v, nil
 }
 
-// int sqlite3_column_type(sqlite3_stmt*, int iCol);
+// C documentation
+//
+//	int sqlite3_column_type(sqlite3_stmt*, int iCol);
 func (c *conn) columnType(pstmt uintptr, iCol int) (_ int, err error) {
 	v := sqlite3.Xsqlite3_column_type(c.tls, pstmt, int32(iCol))
 	return int(v), nil
 }
 
-// const char *sqlite3_column_decltype(sqlite3_stmt*,int);
+// C documentation
+//
+//	const char *sqlite3_column_decltype(sqlite3_stmt*,int);
 func (c *conn) columnDeclType(pstmt uintptr, iCol int) string {
 	return libc.GoString(sqlite3.Xsqlite3_column_decltype(c.tls, pstmt, int32(iCol)))
 }
 
-// const char *sqlite3_column_name(sqlite3_stmt*, int N);
+// C documentation
+//
+//	const char *sqlite3_column_name(sqlite3_stmt*, int N);
 func (c *conn) columnName(pstmt uintptr, n int) (string, error) {
 	p := sqlite3.Xsqlite3_column_name(c.tls, pstmt, int32(n))
 	return libc.GoString(p), nil
 }
 
-// int sqlite3_column_count(sqlite3_stmt *pStmt);
+// C documentation
+//
+//	int sqlite3_column_count(sqlite3_stmt *pStmt);
 func (c *conn) columnCount(pstmt uintptr) (_ int, err error) {
 	v := sqlite3.Xsqlite3_column_count(c.tls, pstmt)
 	return int(v), nil
 }
 
-// sqlite3_int64 sqlite3_last_insert_rowid(sqlite3*);
+// C documentation
+//
+//	sqlite3_int64 sqlite3_last_insert_rowid(sqlite3*);
 func (c *conn) lastInsertRowID() (v int64, _ error) {
 	return sqlite3.Xsqlite3_last_insert_rowid(c.tls, c.db), nil
 }
 
-// int sqlite3_changes(sqlite3*);
+// C documentation
+//
+//	int sqlite3_changes(sqlite3*);
 func (c *conn) changes() (int, error) {
 	v := sqlite3.Xsqlite3_changes(c.tls, c.db)
 	return int(v), nil
 }
 
-// int sqlite3_step(sqlite3_stmt*);
+// C documentation
+//
+//	int sqlite3_step(sqlite3_stmt*);
 func (c *conn) step(pstmt uintptr) (int, error) {
 	for {
 		switch rc := sqlite3.Xsqlite3_step(c.tls, pstmt); rc {
@@ -1087,7 +1120,9 @@ func (c *conn) bind(pstmt uintptr, n int, args []driver.NamedValue) (allocs []ui
 	return allocs, nil
 }
 
-// int sqlite3_bind_null(sqlite3_stmt*, int);
+// C documentation
+//
+//	int sqlite3_bind_null(sqlite3_stmt*, int);
 func (c *conn) bindNull(pstmt uintptr, idx1 int) (uintptr, error) {
 	if rc := sqlite3.Xsqlite3_bind_null(c.tls, pstmt, int32(idx1)); rc != sqlite3.SQLITE_OK {
 		return 0, c.errstr(rc)
@@ -1096,7 +1131,9 @@ func (c *conn) bindNull(pstmt uintptr, idx1 int) (uintptr, error) {
 	return 0, nil
 }
 
-// int sqlite3_bind_text(sqlite3_stmt*,int,const char*,int,void(*)(void*));
+// C documentation
+//
+//	int sqlite3_bind_text(sqlite3_stmt*,int,const char*,int,void(*)(void*));
 func (c *conn) bindText(pstmt uintptr, idx1 int, value string) (uintptr, error) {
 	p, err := libc.CString(value)
 	if err != nil {
@@ -1111,7 +1148,9 @@ func (c *conn) bindText(pstmt uintptr, idx1 int, value string) (uintptr, error)
 	return p, nil
 }
 
-// int sqlite3_bind_blob(sqlite3_stmt*, int, const void*, int n, void(*)(void*));
+// C documentation
+//
+//	int sqlite3_bind_blob(sqlite3_stmt*, int, const void*, int n, void(*)(void*));
 func (c *conn) bindBlob(pstmt uintptr, idx1 int, value []byte) (uintptr, error) {
 	if value != nil && len(value) == 0 {
 		if rc := sqlite3.Xsqlite3_bind_zeroblob(c.tls, pstmt, int32(idx1), 0); rc != sqlite3.SQLITE_OK {
@@ -1135,7 +1174,9 @@ func (c *conn) bindBlob(pstmt uintptr, idx1 int, value []byte) (uintptr, error)
 	return p, nil
 }
 
-// int sqlite3_bind_int(sqlite3_stmt*, int, int);
+// C documentation
+//
+//	int sqlite3_bind_int(sqlite3_stmt*, int, int);
 func (c *conn) bindInt(pstmt uintptr, idx1, value int) (err error) {
 	if rc := sqlite3.Xsqlite3_bind_int(c.tls, pstmt, int32(idx1), int32(value)); rc != sqlite3.SQLITE_OK {
 		return c.errstr(rc)
@@ -1144,7 +1185,9 @@ func (c *conn) bindInt(pstmt uintptr, idx1, value int) (err error) {
 	return nil
 }
 
-// int sqlite3_bind_double(sqlite3_stmt*, int, double);
+// C documentation
+//
+//	int sqlite3_bind_double(sqlite3_stmt*, int, double);
 func (c *conn) bindDouble(pstmt uintptr, idx1 int, value float64) (err error) {
 	if rc := sqlite3.Xsqlite3_bind_double(c.tls, pstmt, int32(idx1), value); rc != 0 {
 		return c.errstr(rc)
@@ -1153,7 +1196,9 @@ func (c *conn) bindDouble(pstmt uintptr, idx1 int, value float64) (err error) {
 	return nil
 }
 
-// int sqlite3_bind_int64(sqlite3_stmt*, int, sqlite3_int64);
+// C documentation
+//
+//	int sqlite3_bind_int64(sqlite3_stmt*, int, sqlite3_int64);
 func (c *conn) bindInt64(pstmt uintptr, idx1 int, value int64) (err error) {
 	if rc := sqlite3.Xsqlite3_bind_int64(c.tls, pstmt, int32(idx1), value); rc != sqlite3.SQLITE_OK {
 		return c.errstr(rc)
@@ -1162,19 +1207,25 @@ func (c *conn) bindInt64(pstmt uintptr, idx1 int, value int64) (err error) {
 	return nil
 }
 
-// const char *sqlite3_bind_parameter_name(sqlite3_stmt*, int);
+// C documentation
+//
+//	const char *sqlite3_bind_parameter_name(sqlite3_stmt*, int);
 func (c *conn) bindParameterName(pstmt uintptr, i int) (string, error) {
 	p := sqlite3.Xsqlite3_bind_parameter_name(c.tls, pstmt, int32(i))
 	return libc.GoString(p), nil
 }
 
-// int sqlite3_bind_parameter_count(sqlite3_stmt*);
+// C documentation
+//
+//	int sqlite3_bind_parameter_count(sqlite3_stmt*);
 func (c *conn) bindParameterCount(pstmt uintptr) (_ int, err error) {
 	r := sqlite3.Xsqlite3_bind_parameter_count(c.tls, pstmt)
 	return int(r), nil
 }
 
-// int sqlite3_finalize(sqlite3_stmt *pStmt);
+// C documentation
+//
+//	int sqlite3_finalize(sqlite3_stmt *pStmt);
 func (c *conn) finalize(pstmt uintptr) error {
 	if rc := sqlite3.Xsqlite3_finalize(c.tls, pstmt); rc != sqlite3.SQLITE_OK {
 		return c.errstr(rc)
@@ -1183,13 +1234,15 @@ func (c *conn) finalize(pstmt uintptr) error {
 	return nil
 }
 
-// int sqlite3_prepare_v2(
-//   sqlite3 *db,            /* Database handle */
-//   const char *zSql,       /* SQL statement, UTF-8 encoded */
-//   int nByte,              /* Maximum length of zSql in bytes. */
-//   sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
-//   const char **pzTail     /* OUT: Pointer to unused portion of zSql */
-// );
+// C documentation
+//
+//	int sqlite3_prepare_v2(
+//	sqlite3 *db,            /* Database handle */
+//	const char *zSql,       /* SQL statement, UTF-8 encoded */
+//	int nByte,              /* Maximum length of zSql in bytes. */
+//	sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
+//	const char **pzTail     /* OUT: Pointer to unused portion of zSql */
+//	);
 func (c *conn) prepareV2(zSQL *uintptr) (pstmt uintptr, err error) {
 	var ppstmt, pptail uintptr
 
@@ -1221,7 +1274,9 @@ func (c *conn) prepareV2(zSQL *uintptr) (pstmt uintptr, err error) {
 	}
 }
 
-// void sqlite3_interrupt(sqlite3*);
+// C documentation
+//
+//	void sqlite3_interrupt(sqlite3*);
 func (c *conn) interrupt(pdb uintptr) (err error) {
 	c.Lock() // Defend against race with .Close invoked by context handling.
 
@@ -1233,7 +1288,9 @@ func (c *conn) interrupt(pdb uintptr) (err error) {
 	return nil
 }
 
-// int sqlite3_extended_result_codes(sqlite3*, int onoff);
+// C documentation
+//
+//	int sqlite3_extended_result_codes(sqlite3*, int onoff);
 func (c *conn) extendedResultCodes(on bool) error {
 	if rc := sqlite3.Xsqlite3_extended_result_codes(c.tls, c.db, libc.Bool32(on)); rc != sqlite3.SQLITE_OK {
 		return c.errstr(rc)
@@ -1242,12 +1299,14 @@ func (c *conn) extendedResultCodes(on bool) error {
 	return nil
 }
 
-// int sqlite3_open_v2(
-//   const char *filename,   /* Database filename (UTF-8) */
-//   sqlite3 **ppDb,         /* OUT: SQLite db handle */
-//   int flags,              /* Flags */
-//   const char *zVfs        /* Name of VFS module to use */
-// );
+// C documentation
+//
+//	int sqlite3_open_v2(
+//	const char *filename,   /* Database filename (UTF-8) */
+//	sqlite3 **ppDb,         /* OUT: SQLite db handle */
+//	int flags,              /* Flags */
+//	const char *zVfs        /* Name of VFS module to use */
+//	);
 func (c *conn) openV2(name, vfsName string, flags int32) (uintptr, error) {
 	var p, s, vfs uintptr
 
@@ -1299,7 +1358,9 @@ func (c *conn) free(p uintptr) {
 	}
 }
 
-// const char *sqlite3_errstr(int);
+// C documentation
+//
+//	const char *sqlite3_errstr(int);
 func (c *conn) errstr(rc int32) error {
 	p := sqlite3.Xsqlite3_errstr(c.tls, rc)
 	str := libc.GoString(p)
@@ -1319,7 +1380,12 @@ func (c *conn) errstr(rc int32) error {
 // Begin starts a transaction.
 //
 // Deprecated: Drivers should implement ConnBeginTx instead (or additionally).
-func (c *conn) Begin() (driver.Tx, error) {
+func (c *conn) Begin() (dt driver.Tx, err error) {
+	if dmesgs {
+		defer func() {
+			dmesg("conn %p: (driver.Tx %p, err %v)", c, dt, err)
+		}()
+	}
 	return c.begin(context.Background(), driver.TxOptions{})
 }
 
@@ -1333,7 +1399,12 @@ func (c *conn) begin(ctx context.Context, opts driver.TxOptions) (t driver.Tx, e
 // Because the sql package maintains a free pool of connections and only calls
 // Close when there's a surplus of idle connections, it shouldn't be necessary
 // for drivers to do their own connection caching.
-func (c *conn) Close() error {
+func (c *conn) Close() (err error) {
+	if dmesgs {
+		defer func() {
+			dmesg("conn %p: err %v", c, err)
+		}()
+	}
 	c.Lock() // Defend against race with .interrupt invoked by context handling.
 
 	defer c.Unlock()
@@ -1353,7 +1424,9 @@ func (c *conn) Close() error {
 	return nil
 }
 
-// int sqlite3_close_v2(sqlite3*);
+// C documentation
+//
+//	int sqlite3_close_v2(sqlite3*);
 func (c *conn) closeV2(db uintptr) error {
 	if rc := sqlite3.Xsqlite3_close_v2(c.tls, db); rc != sqlite3.SQLITE_OK {
 		return c.errstr(rc)
@@ -1362,27 +1435,106 @@ func (c *conn) closeV2(db uintptr) error {
 	return nil
 }
 
+// FunctionImpl describes an [application-defined SQL function]. If Scalar is
+// set, it is treated as a scalar function; otherwise, it is treated as an
+// aggregate function using MakeAggregate.
+//
+// [application-defined SQL function]: https://sqlite.org/appfunc.html
+type FunctionImpl struct {
+	// NArgs is the required number of arguments that the function accepts.
+	// If NArgs is negative, then the function is variadic.
+	NArgs int32
+
+	// If Deterministic is true, the function must always give the same
+	// output when the input parameters are the same. This enables functions
+	// to be used in additional contexts like the WHERE clause of partial
+	// indexes and enables additional optimizations.
+	//
+	// See https://sqlite.org/c3ref/c_deterministic.html#sqlitedeterministic
+	// for more details.
+	Deterministic bool
+
+	// Scalar is called when a scalar function is invoked in SQL. The
+	// argument Values are not valid past the return of the function.
+	Scalar func(ctx *FunctionContext, args []driver.Value) (driver.Value, error)
+
+	// MakeAggregate is called at the beginning of each evaluation of an
+	// aggregate function.
+	MakeAggregate func(ctx FunctionContext) (AggregateFunction, error)
+}
+
+// An AggregateFunction is an invocation of an aggregate or window function. See
+// the documentation for [aggregate function callbacks] and [application-defined
+// window functions] for an overview.
+//
+// [aggregate function callbacks]: https://www.sqlite.org/appfunc.html#the_aggregate_function_callbacks
+// [application-defined window functions]: https://www.sqlite.org/windowfunctions.html#user_defined_aggregate_window_functions
+type AggregateFunction interface {
+	// Step is called for each row of an aggregate function's SQL
+	// invocation. The argument Values are not valid past the return of the
+	// function.
+	Step(ctx *FunctionContext, rowArgs []driver.Value) error
+
+	// WindowInverse is called to remove the oldest presently aggregated
+	// result of Step from the current window. The arguments are those
+	// passed to Step for the row being removed. The argument Values are not
+	// valid past the return of the function.
+	WindowInverse(ctx *FunctionContext, rowArgs []driver.Value) error
+
+	// WindowValue is called to get the current value of an aggregate
+	// function. This is used to return the final value of the function,
+	// whether it is used as a window function or not.
+	WindowValue(ctx *FunctionContext) (driver.Value, error)
+
+	// Final is called after all of the aggregate function's input rows have
+	// been stepped through. No other methods will be called on the
+	// AggregateFunction after calling Final. WindowValue returns the value
+	// from the function.
+	Final(ctx *FunctionContext)
+}
+
 type userDefinedFunction struct {
 	zFuncName uintptr
 	nArg      int32
 	eTextRep  int32
-	xFunc     func(*libc.TLS, uintptr, int32, uintptr)
+	pApp      uintptr
 
+	scalar   bool
 	freeOnce sync.Once
 }
 
 func (c *conn) createFunctionInternal(fun *userDefinedFunction) error {
-	if rc := sqlite3.Xsqlite3_create_function(
-		c.tls,
-		c.db,
-		fun.zFuncName,
-		fun.nArg,
-		fun.eTextRep,
-		0,
-		*(*uintptr)(unsafe.Pointer(&fun.xFunc)),
-		0,
-		0,
-	); rc != sqlite3.SQLITE_OK {
+	var rc int32
+
+	if fun.scalar {
+		rc = sqlite3.Xsqlite3_create_function(
+			c.tls,
+			c.db,
+			fun.zFuncName,
+			fun.nArg,
+			fun.eTextRep,
+			fun.pApp,
+			cFuncPointer(funcTrampoline),
+			0,
+			0,
+		)
+	} else {
+		rc = sqlite3.Xsqlite3_create_window_function(
+			c.tls,
+			c.db,
+			fun.zFuncName,
+			fun.nArg,
+			fun.eTextRep,
+			fun.pApp,
+			cFuncPointer(stepTrampoline),
+			cFuncPointer(finalTrampoline),
+			cFuncPointer(valueTrampoline),
+			cFuncPointer(inverseTrampoline),
+			0,
+		)
+	}
+
+	if rc != sqlite3.SQLITE_OK {
 		return c.errstr(rc)
 	}
 	return nil
@@ -1396,7 +1548,12 @@ func (c *conn) createFunctionInternal(fun *userDefinedFunction) error {
 // Exec may return ErrSkip.
 //
 // Deprecated: Drivers should implement ExecerContext instead.
-func (c *conn) Exec(query string, args []driver.Value) (driver.Result, error) {
+func (c *conn) Exec(query string, args []driver.Value) (dr driver.Result, err error) {
+	if dmesgs {
+		defer func() {
+			dmesg("conn %p, query %q, args %v: (driver.Result %p, err %v)", c, query, args, dr, err)
+		}()
+	}
 	return c.exec(context.Background(), query, toNamedValues(args))
 }
 
@@ -1416,7 +1573,12 @@ func (c *conn) exec(ctx context.Context, query string, args []driver.NamedValue)
 }
 
 // Prepare returns a prepared statement, bound to this connection.
-func (c *conn) Prepare(query string) (driver.Stmt, error) {
+func (c *conn) Prepare(query string) (ds driver.Stmt, err error) {
+	if dmesgs {
+		defer func() {
+			dmesg("conn %p, query %q: (driver.Stmt %p, err %v)", c, query, ds, err)
+		}()
+	}
 	return c.prepare(context.Background(), query)
 }
 
@@ -1433,7 +1595,12 @@ func (c *conn) prepare(ctx context.Context, query string) (s driver.Stmt, err er
 // Query may return ErrSkip.
 //
 // Deprecated: Drivers should implement QueryerContext instead.
-func (c *conn) Query(query string, args []driver.Value) (driver.Rows, error) {
+func (c *conn) Query(query string, args []driver.Value) (dr driver.Rows, err error) {
+	if dmesgs {
+		defer func() {
+			dmesg("conn %p, query %q, args %v: (driver.Rows %p, err %v)", c, query, args, dr, err)
+		}()
+	}
 	return c.query(context.Background(), query, toNamedValues(args))
 }
 
@@ -1452,6 +1619,146 @@ func (c *conn) query(ctx context.Context, query string, args []driver.NamedValue
 	return s.(*stmt).query(ctx, args)
 }
 
+// Serialize returns a serialization of the main database. For an ordinary on-disk
+// database file, the serialization is just a copy of the disk file. For an in-memory
+// database or a "TEMP" database, the serialization is the same sequence of bytes
+// which would be written to disk if that database where backed up to disk.
+func (c *conn) Serialize() (v []byte, err error) {
+	pLen := c.tls.Alloc(8)
+	defer c.tls.Free(8)
+
+	zSchema := sqlite3.Xsqlite3_db_name(c.tls, c.db, 0)
+	if zSchema == 0 {
+		return nil, fmt.Errorf("failed to get main db name")
+	}
+
+	pBuf := sqlite3.Xsqlite3_serialize(c.tls, c.db, zSchema, pLen, 0)
+	bufLen := *(*sqlite3.Sqlite3_int64)(unsafe.Pointer(pLen))
+	if pBuf != 0 {
+		defer sqlite3.Xsqlite3_free(c.tls, pBuf)
+	}
+	if bufLen <= 0 {
+		return nil, fmt.Errorf("invalid length returned: %d", bufLen)
+	} else if pBuf == 0 || bufLen == 0 {
+		return nil, nil
+	}
+
+	v = make([]byte, bufLen)
+	copy(v, (*libc.RawMem)(unsafe.Pointer(pBuf))[:bufLen:bufLen])
+	return v, nil
+}
+
+// Deserialize restore a database from the content returned by Serialize.
+func (c *conn) Deserialize(buf []byte) (err error) {
+	bufLen := len(buf)
+	pBuf := c.tls.Alloc(bufLen) // free will be done if it fails or on close, must not be freed here
+
+	copy((*libc.RawMem)(unsafe.Pointer(pBuf))[:bufLen:bufLen], buf)
+
+	zSchema := sqlite3.Xsqlite3_db_name(c.tls, c.db, 0)
+	if zSchema == 0 {
+		return fmt.Errorf("failed to get main db name")
+	}
+
+	rc := sqlite3.Xsqlite3_deserialize(c.tls, c.db, zSchema, pBuf, int64(bufLen), int64(bufLen), sqlite3.SQLITE_DESERIALIZE_RESIZEABLE|sqlite3.SQLITE_DESERIALIZE_FREEONCLOSE)
+	if rc != sqlite3.SQLITE_OK {
+		return c.errstr(rc)
+	}
+	return nil
+}
+
+// Backup object is used to manage progress and cleanup an online backup. It
+// is returned by NewBackup or NewRestore.
+type Backup struct {
+	srcConn *conn   // source database connection
+	dstConn *conn   // destination database connection
+	pBackup uintptr // sqlite3_backup object pointer
+}
+
+// NewBackup returns a Backup object that will create an online backup of
+// current database to the databased pointed by the passed URI.
+func (c *conn) NewBackup(dstUri string) (*Backup, error) {
+	dstConn, err := newConn(dstUri)
+	if err != nil {
+		return nil, err
+	}
+	backup, err := c.backup(dstConn, false)
+	if err != nil {
+		dstConn.Close()
+	}
+	return backup, err
+}
+
+// NewRestore returns a Backup object that will restore a backup to current
+// database from the databased pointed by the passed URI.
+func (c *conn) NewRestore(srcUri string) (*Backup, error) {
+	srcConn, err := newConn(srcUri)
+	if err != nil {
+		return nil, err
+	}
+	backup, err := c.backup(srcConn, true)
+	if err != nil {
+		srcConn.Close()
+	}
+	return backup, err
+}
+
+func (c *conn) backup(remoteConn *conn, restore bool) (_ *Backup, finalErr error) {
+	srcSchema := sqlite3.Xsqlite3_db_name(c.tls, c.db, 0)
+	if srcSchema == 0 {
+		return nil, fmt.Errorf("failed to get main source db name")
+	}
+
+	dstSchema := sqlite3.Xsqlite3_db_name(remoteConn.tls, remoteConn.db, 0)
+	if dstSchema == 0 {
+		return nil, fmt.Errorf("failed to get main destination db name")
+	}
+
+	var pBackup uintptr
+	if restore {
+		pBackup = sqlite3.Xsqlite3_backup_init(c.tls, c.db, srcSchema, remoteConn.db, dstSchema)
+	} else {
+		pBackup = sqlite3.Xsqlite3_backup_init(c.tls, remoteConn.db, dstSchema, c.db, srcSchema)
+	}
+	if pBackup <= 0 {
+		rc := sqlite3.Xsqlite3_errcode(c.tls, remoteConn.db)
+		return nil, c.errstr(rc)
+	}
+
+	return &Backup{srcConn: c, dstConn: remoteConn, pBackup: pBackup}, nil
+}
+
+// Step will copy up to n pages between the source and destination databases
+// specified by the backup object. If n is negative, all remaining source
+// pages are copied.
+// If it successfully copies n pages and there are still more pages to be
+// copied, then the function returns true with no error. If it successfully
+// finishes copying all pages from source to destination, then it returns
+// false with no error. If an error occurs while running, then an error is
+// returned.
+func (b *Backup) Step(n int32) (bool, error) {
+	rc := sqlite3.Xsqlite3_backup_step(b.srcConn.tls, b.pBackup, n)
+	if rc == sqlite3.SQLITE_OK {
+		return true, nil
+	} else if rc == sqlite3.SQLITE_DONE {
+		return false, nil
+	} else {
+		return false, b.srcConn.errstr(rc)
+	}
+}
+
+// Finish releases all resources associated with the Backup object. The Backup
+// object is invalid and may not be used following a call to Finish.
+func (b *Backup) Finish() error {
+	rc := sqlite3.Xsqlite3_backup_finish(b.srcConn.tls, b.pBackup)
+	b.dstConn.Close()
+	if rc == sqlite3.SQLITE_OK {
+		return nil
+	} else {
+		return b.srcConn.errstr(rc)
+	}
+}
+
 // Driver implements database/sql/driver.Driver.
 type Driver struct {
 	// user defined functions that are added to every new connection on Open
@@ -1491,7 +1798,12 @@ func newDriver() *Driver { return d }
 // not specify one, which SQLite maps to "deferred". More information is
 // available at
 // https://www.sqlite.org/lang_transaction.html#deferred_immediate_and_exclusive_transactions
-func (d *Driver) Open(name string) (driver.Conn, error) {
+func (d *Driver) Open(name string) (conn driver.Conn, err error) {
+	if dmesgs {
+		defer func() {
+			dmesg("name %q: (driver.Conn %p, err %v)", name, conn, err)
+		}()
+	}
 	c, err := newConn(name)
 	if err != nil {
 		return nil, err
@@ -1508,10 +1820,38 @@ func (d *Driver) Open(name string) (driver.Conn, error) {
 
 // FunctionContext represents the context user defined functions execute in.
 // Fields and/or methods of this type may get addedd in the future.
-type FunctionContext struct{}
+type FunctionContext struct {
+	tls *libc.TLS
+	ctx uintptr
+}
 
 const sqliteValPtrSize = unsafe.Sizeof(&sqlite3.Sqlite3_value{})
 
+// RegisterFunction registers a function named zFuncName with nArg arguments.
+// Passing -1 for nArg indicates the function is variadic. The FunctionImpl
+// determines whether the function is deterministic or not, and whether it is a
+// scalar function (when Scalar is defined) or an aggregate function (when
+// Scalar is not defined and MakeAggregate is defined).
+//
+// The new function will be available to all new connections opened after
+// executing RegisterFunction.
+func RegisterFunction(
+	zFuncName string,
+	impl *FunctionImpl,
+) error {
+	return registerFunction(zFuncName, impl)
+}
+
+// MustRegisterFunction is like RegisterFunction but panics on error.
+func MustRegisterFunction(
+	zFuncName string,
+	impl *FunctionImpl,
+) {
+	if err := RegisterFunction(zFuncName, impl); err != nil {
+		panic(err)
+	}
+}
+
 // RegisterScalarFunction registers a scalar function named zFuncName with nArg
 // arguments. Passing -1 for nArg indicates the function is variadic.
 //
@@ -1521,8 +1861,13 @@ func RegisterScalarFunction(
 	zFuncName string,
 	nArg int32,
 	xFunc func(ctx *FunctionContext, args []driver.Value) (driver.Value, error),
-) error {
-	return registerScalarFunction(zFuncName, nArg, sqlite3.SQLITE_UTF8, xFunc)
+) (err error) {
+	if dmesgs {
+		defer func() {
+			dmesg("zFuncName %q, nArg %v, xFunc %p: err %v", zFuncName, nArg, xFunc, err)
+		}()
+	}
+	return registerFunction(zFuncName, &FunctionImpl{NArgs: nArg, Scalar: xFunc, Deterministic: false})
 }
 
 // MustRegisterScalarFunction is like RegisterScalarFunction but panics on
@@ -1532,6 +1877,9 @@ func MustRegisterScalarFunction(
 	nArg int32,
 	xFunc func(ctx *FunctionContext, args []driver.Value) (driver.Value, error),
 ) {
+	if dmesgs {
+		dmesg("zFuncName %q, nArg %v, xFunc %p", zFuncName, nArg, xFunc)
+	}
 	if err := RegisterScalarFunction(zFuncName, nArg, xFunc); err != nil {
 		panic(err)
 	}
@@ -1544,6 +1892,9 @@ func MustRegisterDeterministicScalarFunction(
 	nArg int32,
 	xFunc func(ctx *FunctionContext, args []driver.Value) (driver.Value, error),
 ) {
+	if dmesgs {
+		dmesg("zFuncName %q, nArg %v, xFunc %p", zFuncName, nArg, xFunc)
+	}
 	if err := RegisterDeterministicScalarFunction(zFuncName, nArg, xFunc); err != nil {
 		panic(err)
 	}
@@ -1560,15 +1911,18 @@ func RegisterDeterministicScalarFunction(
 	zFuncName string,
 	nArg int32,
 	xFunc func(ctx *FunctionContext, args []driver.Value) (driver.Value, error),
-) error {
-	return registerScalarFunction(zFuncName, nArg, sqlite3.SQLITE_UTF8|sqlite3.SQLITE_DETERMINISTIC, xFunc)
+) (err error) {
+	if dmesgs {
+		defer func() {
+			dmesg("zFuncName %q, nArg %v, xFunc %p: err %v", zFuncName, nArg, xFunc, err)
+		}()
+	}
+	return registerFunction(zFuncName, &FunctionImpl{NArgs: nArg, Scalar: xFunc, Deterministic: true})
 }
 
-func registerScalarFunction(
+func registerFunction(
 	zFuncName string,
-	nArg int32,
-	eTextRep int32,
-	xFunc func(ctx *FunctionContext, args []driver.Value) (driver.Value, error),
+	impl *FunctionImpl,
 ) error {
 
 	if _, ok := d.udfs[zFuncName]; ok {
@@ -1581,91 +1935,362 @@ func registerScalarFunction(
 		return err
 	}
 
+	var textrep int32 = sqlite3.SQLITE_UTF8
+
+	if impl.Deterministic {
+		textrep |= sqlite3.SQLITE_DETERMINISTIC
+	}
+
 	udf := &userDefinedFunction{
 		zFuncName: name,
-		nArg:      nArg,
-		eTextRep:  eTextRep,
-		xFunc: func(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
-			setErrorResult := func(res error) {
-				errmsg, cerr := libc.CString(res.Error())
-				if cerr != nil {
-					panic(cerr)
-				}
-				defer libc.Xfree(tls, errmsg)
-				sqlite3.Xsqlite3_result_error(tls, ctx, errmsg, -1)
-				sqlite3.Xsqlite3_result_error_code(tls, ctx, sqlite3.SQLITE_ERROR)
-			}
-
-			args := make([]driver.Value, argc)
-			for i := int32(0); i < argc; i++ {
-				valPtr := *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*sqliteValPtrSize))
-
-				switch valType := sqlite3.Xsqlite3_value_type(tls, valPtr); valType {
-				case sqlite3.SQLITE_TEXT:
-					args[i] = libc.GoString(sqlite3.Xsqlite3_value_text(tls, valPtr))
-				case sqlite3.SQLITE_INTEGER:
-					args[i] = sqlite3.Xsqlite3_value_int64(tls, valPtr)
-				case sqlite3.SQLITE_FLOAT:
-					args[i] = sqlite3.Xsqlite3_value_double(tls, valPtr)
-				case sqlite3.SQLITE_NULL:
-					args[i] = nil
-				case sqlite3.SQLITE_BLOB:
-					size := sqlite3.Xsqlite3_value_bytes(tls, valPtr)
-					blobPtr := sqlite3.Xsqlite3_value_blob(tls, valPtr)
-					v := make([]byte, size)
-					copy(v, (*libc.RawMem)(unsafe.Pointer(blobPtr))[:size:size])
-					args[i] = v
-				default:
-					panic(fmt.Sprintf("unexpected argument type %q passed by sqlite", valType))
-				}
-			}
-
-			res, err := xFunc(&FunctionContext{}, args)
-			if err != nil {
-				setErrorResult(err)
-				return
-			}
-
-			switch resTyped := res.(type) {
-			case nil:
-				sqlite3.Xsqlite3_result_null(tls, ctx)
-			case int64:
-				sqlite3.Xsqlite3_result_int64(tls, ctx, resTyped)
-			case float64:
-				sqlite3.Xsqlite3_result_double(tls, ctx, resTyped)
-			case bool:
-				sqlite3.Xsqlite3_result_int(tls, ctx, libc.Bool32(resTyped))
-			case time.Time:
-				sqlite3.Xsqlite3_result_int64(tls, ctx, resTyped.Unix())
-			case string:
-				size := int32(len(resTyped))
-				cstr, err := libc.CString(resTyped)
-				if err != nil {
-					panic(err)
-				}
-				defer libc.Xfree(tls, cstr)
-				sqlite3.Xsqlite3_result_text(tls, ctx, cstr, size, sqlite3.SQLITE_TRANSIENT)
-			case []byte:
-				size := int32(len(resTyped))
-				if size == 0 {
-					sqlite3.Xsqlite3_result_zeroblob(tls, ctx, 0)
-					return
-				}
-				p := libc.Xmalloc(tls, types.Size_t(size))
-				if p == 0 {
-					panic(fmt.Sprintf("unable to allocate space for blob: %d", size))
-				}
-				defer libc.Xfree(tls, p)
-				copy((*libc.RawMem)(unsafe.Pointer(p))[:size:size], resTyped)
-
-				sqlite3.Xsqlite3_result_blob(tls, ctx, p, size, sqlite3.SQLITE_TRANSIENT)
-			default:
-				setErrorResult(fmt.Errorf("function did not return a valid driver.Value: %T", resTyped))
-				return
-			}
-		},
+		nArg:      impl.NArgs,
+		eTextRep:  textrep,
 	}
+
+	if impl.Scalar != nil {
+		xFuncs.mu.Lock()
+		id := xFuncs.ids.next()
+		xFuncs.m[id] = impl.Scalar
+		xFuncs.mu.Unlock()
+
+		udf.scalar = true
+		udf.pApp = id
+	} else {
+		xAggregateFactories.mu.Lock()
+		id := xAggregateFactories.ids.next()
+		xAggregateFactories.m[id] = impl.MakeAggregate
+		xAggregateFactories.mu.Unlock()
+
+		udf.pApp = id
+	}
+
 	d.udfs[zFuncName] = udf
 
 	return nil
 }
+
+func origin(skip int) string {
+	pc, fn, fl, _ := runtime.Caller(skip)
+	f := runtime.FuncForPC(pc)
+	var fns string
+	if f != nil {
+		fns = f.Name()
+		if x := strings.LastIndex(fns, "."); x > 0 {
+			fns = fns[x+1:]
+		}
+	}
+	return fmt.Sprintf("%s:%d:%s", fn, fl, fns)
+}
+
+func errorResultFunction(tls *libc.TLS, ctx uintptr) func(error) {
+	return func(res error) {
+		errmsg, cerr := libc.CString(res.Error())
+		if cerr != nil {
+			panic(cerr)
+		}
+		defer libc.Xfree(tls, errmsg)
+		sqlite3.Xsqlite3_result_error(tls, ctx, errmsg, -1)
+		sqlite3.Xsqlite3_result_error_code(tls, ctx, sqlite3.SQLITE_ERROR)
+	}
+}
+
+func functionArgs(tls *libc.TLS, argc int32, argv uintptr) []driver.Value {
+	args := make([]driver.Value, argc)
+	for i := int32(0); i < argc; i++ {
+		valPtr := *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*sqliteValPtrSize))
+
+		switch valType := sqlite3.Xsqlite3_value_type(tls, valPtr); valType {
+		case sqlite3.SQLITE_TEXT:
+			args[i] = libc.GoString(sqlite3.Xsqlite3_value_text(tls, valPtr))
+		case sqlite3.SQLITE_INTEGER:
+			args[i] = sqlite3.Xsqlite3_value_int64(tls, valPtr)
+		case sqlite3.SQLITE_FLOAT:
+			args[i] = sqlite3.Xsqlite3_value_double(tls, valPtr)
+		case sqlite3.SQLITE_NULL:
+			args[i] = nil
+		case sqlite3.SQLITE_BLOB:
+			size := sqlite3.Xsqlite3_value_bytes(tls, valPtr)
+			blobPtr := sqlite3.Xsqlite3_value_blob(tls, valPtr)
+			v := make([]byte, size)
+			copy(v, (*libc.RawMem)(unsafe.Pointer(blobPtr))[:size:size])
+			args[i] = v
+		default:
+			panic(fmt.Sprintf("unexpected argument type %q passed by sqlite", valType))
+		}
+	}
+
+	return args
+}
+
+func functionReturnValue(tls *libc.TLS, ctx uintptr, res driver.Value) error {
+	switch resTyped := res.(type) {
+	case nil:
+		sqlite3.Xsqlite3_result_null(tls, ctx)
+	case int64:
+		sqlite3.Xsqlite3_result_int64(tls, ctx, resTyped)
+	case float64:
+		sqlite3.Xsqlite3_result_double(tls, ctx, resTyped)
+	case bool:
+		sqlite3.Xsqlite3_result_int(tls, ctx, libc.Bool32(resTyped))
+	case time.Time:
+		sqlite3.Xsqlite3_result_int64(tls, ctx, resTyped.Unix())
+	case string:
+		size := int32(len(resTyped))
+		cstr, err := libc.CString(resTyped)
+		if err != nil {
+			panic(err)
+		}
+		defer libc.Xfree(tls, cstr)
+		sqlite3.Xsqlite3_result_text(tls, ctx, cstr, size, sqlite3.SQLITE_TRANSIENT)
+	case []byte:
+		size := int32(len(resTyped))
+		if size == 0 {
+			sqlite3.Xsqlite3_result_zeroblob(tls, ctx, 0)
+			return nil
+		}
+		p := libc.Xmalloc(tls, types.Size_t(size))
+		if p == 0 {
+			panic(fmt.Sprintf("unable to allocate space for blob: %d", size))
+		}
+		defer libc.Xfree(tls, p)
+		copy((*libc.RawMem)(unsafe.Pointer(p))[:size:size], resTyped)
+
+		sqlite3.Xsqlite3_result_blob(tls, ctx, p, size, sqlite3.SQLITE_TRANSIENT)
+	default:
+		return fmt.Errorf("function did not return a valid driver.Value: %T", resTyped)
+	}
+
+	return nil
+}
+
+// The below is all taken from zombiezen.com/go/sqlite. Aggregate functions need
+// to maintain state (for instance, the count of values seen so far). We give
+// each aggregate function an ID, generated by idGen, and put that in the pApp
+// argument to sqlite3_create_function. We track this on the Go side in
+// xAggregateFactories.
+//
+// When (if) the function is called is called by a query, we call the
+// MakeAggregate factory function to set it up, and track that in
+// xAggregateContext, retrieving it via sqlite3_aggregate_context.
+//
+// We also need to ensure that, for both aggregate and scalar functions, the
+// function pointer we pass to SQLite meets certain rules on the Go side, so
+// that the pointer remains valid.
+var (
+	xFuncs = struct {
+		mu  sync.RWMutex
+		m   map[uintptr]func(*FunctionContext, []driver.Value) (driver.Value, error)
+		ids idGen
+	}{
+		m: make(map[uintptr]func(*FunctionContext, []driver.Value) (driver.Value, error)),
+	}
+
+	xAggregateFactories = struct {
+		mu  sync.RWMutex
+		m   map[uintptr]func(FunctionContext) (AggregateFunction, error)
+		ids idGen
+	}{
+		m: make(map[uintptr]func(FunctionContext) (AggregateFunction, error)),
+	}
+
+	xAggregateContext = struct {
+		mu  sync.RWMutex
+		m   map[uintptr]AggregateFunction
+		ids idGen
+	}{
+		m: make(map[uintptr]AggregateFunction),
+	}
+)
+
+type idGen struct {
+	bitset []uint64
+}
+
+func (gen *idGen) next() uintptr {
+	base := uintptr(1)
+	for i := 0; i < len(gen.bitset); i, base = i+1, base+64 {
+		b := gen.bitset[i]
+		if b != 1<<64-1 {
+			n := uintptr(bits.TrailingZeros64(^b))
+			gen.bitset[i] |= 1 << n
+			return base + n
+		}
+	}
+	gen.bitset = append(gen.bitset, 1)
+	return base
+}
+
+func (gen *idGen) reclaim(id uintptr) {
+	bit := id - 1
+	gen.bitset[bit/64] &^= 1 << (bit % 64)
+}
+
+func makeAggregate(tls *libc.TLS, ctx uintptr) (AggregateFunction, uintptr) {
+	goCtx := FunctionContext{tls: tls, ctx: ctx}
+	aggCtx := (*uintptr)(unsafe.Pointer(sqlite3.Xsqlite3_aggregate_context(tls, ctx, int32(ptrSize))))
+	setErrorResult := errorResultFunction(tls, ctx)
+	if aggCtx == nil {
+		setErrorResult(errors.New("insufficient memory for aggregate"))
+		return nil, 0
+	}
+	if *aggCtx != 0 {
+		// Already created.
+		xAggregateContext.mu.RLock()
+		f := xAggregateContext.m[*aggCtx]
+		xAggregateContext.mu.RUnlock()
+		return f, *aggCtx
+	}
+
+	factoryID := sqlite3.Xsqlite3_user_data(tls, ctx)
+	xAggregateFactories.mu.RLock()
+	factory := xAggregateFactories.m[factoryID]
+	xAggregateFactories.mu.RUnlock()
+
+	f, err := factory(goCtx)
+	if err != nil {
+		setErrorResult(err)
+		return nil, 0
+	}
+	if f == nil {
+		setErrorResult(errors.New("MakeAggregate function returned nil"))
+		return nil, 0
+	}
+
+	xAggregateContext.mu.Lock()
+	*aggCtx = xAggregateContext.ids.next()
+	xAggregateContext.m[*aggCtx] = f
+	xAggregateContext.mu.Unlock()
+	return f, *aggCtx
+}
+
+// cFuncPointer converts a function defined by a function declaration to a C pointer.
+// The result of using cFuncPointer on closures is undefined.
+func cFuncPointer[T any](f T) uintptr {
+	// This assumes the memory representation described in https://golang.org/s/go11func.
+	//
+	// cFuncPointer does its conversion by doing the following in order:
+	// 1) Create a Go struct containing a pointer to a pointer to
+	//    the function. It is assumed that the pointer to the function will be
+	//    stored in the read-only data section and thus will not move.
+	// 2) Convert the pointer to the Go struct to a pointer to uintptr through
+	//    unsafe.Pointer. This is permitted via Rule #1 of unsafe.Pointer.
+	// 3) Dereference the pointer to uintptr to obtain the function value as a
+	//    uintptr. This is safe as long as function values are passed as pointers.
+	return *(*uintptr)(unsafe.Pointer(&struct{ f T }{f}))
+}
+
+func funcTrampoline(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
+	id := sqlite3.Xsqlite3_user_data(tls, ctx)
+	xFuncs.mu.RLock()
+	xFunc := xFuncs.m[id]
+	xFuncs.mu.RUnlock()
+
+	setErrorResult := errorResultFunction(tls, ctx)
+	res, err := xFunc(&FunctionContext{}, functionArgs(tls, argc, argv))
+
+	if err != nil {
+		setErrorResult(err)
+		return
+	}
+
+	err = functionReturnValue(tls, ctx, res)
+	if err != nil {
+		setErrorResult(err)
+	}
+}
+
+func stepTrampoline(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
+	impl, _ := makeAggregate(tls, ctx)
+	if impl == nil {
+		return
+	}
+
+	setErrorResult := errorResultFunction(tls, ctx)
+	err := impl.Step(&FunctionContext{}, functionArgs(tls, argc, argv))
+	if err != nil {
+		setErrorResult(err)
+	}
+}
+
+func inverseTrampoline(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
+	impl, _ := makeAggregate(tls, ctx)
+	if impl == nil {
+		return
+	}
+
+	setErrorResult := errorResultFunction(tls, ctx)
+	err := impl.WindowInverse(&FunctionContext{}, functionArgs(tls, argc, argv))
+	if err != nil {
+		setErrorResult(err)
+	}
+}
+
+func valueTrampoline(tls *libc.TLS, ctx uintptr) {
+	impl, _ := makeAggregate(tls, ctx)
+	if impl == nil {
+		return
+	}
+
+	setErrorResult := errorResultFunction(tls, ctx)
+	res, err := impl.WindowValue(&FunctionContext{})
+	if err != nil {
+		setErrorResult(err)
+	} else {
+		err = functionReturnValue(tls, ctx, res)
+		if err != nil {
+			setErrorResult(err)
+		}
+	}
+}
+
+func finalTrampoline(tls *libc.TLS, ctx uintptr) {
+	impl, id := makeAggregate(tls, ctx)
+	if impl == nil {
+		return
+	}
+
+	setErrorResult := errorResultFunction(tls, ctx)
+	res, err := impl.WindowValue(&FunctionContext{})
+	if err != nil {
+		setErrorResult(err)
+	} else {
+		err = functionReturnValue(tls, ctx, res)
+		if err != nil {
+			setErrorResult(err)
+		}
+	}
+	impl.Final(&FunctionContext{})
+
+	xAggregateContext.mu.Lock()
+	defer xAggregateContext.mu.Unlock()
+	delete(xAggregateContext.m, id)
+	xAggregateContext.ids.reclaim(id)
+}
+
+// C documentation
+//
+//	int sqlite3_limit(sqlite3*, int id, int newVal);
+func (c *conn) limit(id int, newVal int) int {
+	return int(sqlite3.Xsqlite3_limit(c.tls, c.db, int32(id), int32(newVal)))
+}
+
+// Limit calls sqlite3_limit, see the docs at
+// https://www.sqlite.org/c3ref/limit.html for details.
+//
+// To get a sql.Conn from a *sql.DB, use (*sql.DB).Conn().  Limits are bound to
+// the particular instance of 'c', so getting a new connection only to pass it
+// to Limit is possibly not useful above querying what are the various
+// configured default values.
+func Limit(c *sql.Conn, id int, newVal int) (r int, err error) {
+	err = c.Raw(func(driverConn any) error {
+		switch dc := driverConn.(type) {
+		case *conn:
+			r = dc.limit(id, newVal)
+			return nil
+		default:
+			return fmt.Errorf("unexpected driverConn type: %T", driverConn)
+		}
+	})
+	return r, err
+
+}
diff --git a/vendor/modernc.org/sqlite/sqlite_go18.go b/vendor/modernc.org/sqlite/sqlite_go18.go
index 474d0027..6e720e8a 100644
--- a/vendor/modernc.org/sqlite/sqlite_go18.go
+++ b/vendor/modernc.org/sqlite/sqlite_go18.go
@@ -13,37 +13,72 @@ import (
 )
 
 // Ping implements driver.Pinger
-func (c *conn) Ping(ctx context.Context) error {
-	_, err := c.ExecContext(ctx, "select 1", nil)
+func (c *conn) Ping(ctx context.Context) (err error) {
+	if dmesgs {
+		defer func() {
+			dmesg("conn %p, ctx %p: err %v", c, ctx, err)
+		}()
+	}
+	_, err = c.ExecContext(ctx, "select 1", nil)
 	return err
 }
 
 // BeginTx implements driver.ConnBeginTx
-func (c *conn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver.Tx, error) {
+func (c *conn) BeginTx(ctx context.Context, opts driver.TxOptions) (dt driver.Tx, err error) {
+	if dmesgs {
+		defer func() {
+			dmesg("conn %p, ctx %p, opts %+v: (driver.Tx %v, err %v)", c, ctx, opts, dt, err)
+		}()
+	}
 	return c.begin(ctx, opts)
 }
 
 // PrepareContext implements driver.ConnPrepareContext
-func (c *conn) PrepareContext(ctx context.Context, query string) (driver.Stmt, error) {
+func (c *conn) PrepareContext(ctx context.Context, query string) (ds driver.Stmt, err error) {
+	if dmesgs {
+		defer func() {
+			dmesg("conn %p, ctx %p, query %q: (driver.Stmt %v, err %v)", c, ctx, query, ds, err)
+		}()
+	}
 	return c.prepare(ctx, query)
 }
 
 // ExecContext implements driver.ExecerContext
-func (c *conn) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) {
+func (c *conn) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (dr driver.Result, err error) {
+	if dmesgs {
+		defer func() {
+			dmesg("conn %p, ctx %p, query %q, args %v: (driver.Result %p, err %v)", c, ctx, query, args, dr, err)
+		}()
+	}
 	return c.exec(ctx, query, args)
 }
 
 // QueryContext implements driver.QueryerContext
-func (c *conn) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) {
+func (c *conn) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (dr driver.Rows, err error) {
+	if dmesgs {
+		defer func() {
+			dmesg("conn %p, ctx %p, query %q, args %v: (driver.Rows %p, err %v)", c, ctx, query, args, dr, err)
+		}()
+	}
 	return c.query(ctx, query, args)
 }
 
 // ExecContext implements driver.StmtExecContext
-func (s *stmt) ExecContext(ctx context.Context, args []driver.NamedValue) (driver.Result, error) {
+func (s *stmt) ExecContext(ctx context.Context, args []driver.NamedValue) (dr driver.Result, err error) {
+	if dmesgs {
+		defer func() {
+			dmesg("stmt %p, ctx %p, args %v: (driver.Result %p, err %v)", s, ctx, args, dr, err)
+		}()
+	}
 	return s.exec(ctx, args)
 }
 
 // QueryContext implements driver.StmtQueryContext
-func (s *stmt) QueryContext(ctx context.Context, args []driver.NamedValue) (driver.Rows, error) {
+func (s *stmt) QueryContext(ctx context.Context, args []driver.NamedValue) (dr driver.Rows, err error) {
+	if dmesgs {
+		defer func() {
+			dmesg("stmt %p, ctx %p, args %v: (driver.Rows %p, err %v)", s, ctx, args, dr, err)
+		}()
+	}
 	return s.query(ctx, args)
 }
diff --git a/vendor/modernc.org/sqlite/unconvert.sh b/vendor/modernc.org/sqlite/unconvert.sh
index ccfc8da1..79ce92ff 100644
--- a/vendor/modernc.org/sqlite/unconvert.sh
+++ b/vendor/modernc.org/sqlite/unconvert.sh
@@ -1,5 +1,5 @@
 set -evx
 until unconvert -fastmath -all ./...
 do
-	unconvert -fastmath -apply -all ./...
+	unconvert2 -fastmath -apply -all ./...
 done
diff --git a/vendor/modules.txt b/vendor/modules.txt
index c20044ed..ce2bdc1c 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -52,10 +52,10 @@ github.com/av-elier/go-decimal-to-rational
 # github.com/blang/semver v3.5.1+incompatible
 ## explicit
 github.com/blang/semver
-# github.com/bwmarrin/discordgo v0.27.0
+# github.com/bwmarrin/discordgo v0.27.1
 ## explicit; go 1.13
 github.com/bwmarrin/discordgo
-# github.com/d5/tengo/v2 v2.13.0
+# github.com/d5/tengo/v2 v2.16.1
 ## explicit; go 1.13
 github.com/d5/tengo/v2
 github.com/d5/tengo/v2/parser
@@ -65,8 +65,8 @@ github.com/d5/tengo/v2/token
 # github.com/davecgh/go-spew v1.1.1
 ## explicit
 github.com/davecgh/go-spew/spew
-# github.com/dustin/go-humanize v1.0.0
-## explicit
+# github.com/dustin/go-humanize v1.0.1
+## explicit; go 1.16
 github.com/dustin/go-humanize
 # github.com/dyatlov/go-opengraph v0.0.0-20210112100619-dae8665a5b09
 ## explicit
@@ -83,11 +83,11 @@ github.com/go-asn1-ber/asn1-ber
 # github.com/golang-jwt/jwt v3.2.2+incompatible
 ## explicit
 github.com/golang-jwt/jwt
-# github.com/golang/protobuf v1.5.2
+# github.com/golang/protobuf v1.5.3
 ## explicit; go 1.9
 github.com/golang/protobuf/proto
 github.com/golang/protobuf/protoc-gen-go/descriptor
-# github.com/gomarkdown/markdown v0.0.0-20221013030248-663e2500819c
+# github.com/gomarkdown/markdown v0.0.0-20230716120725-531d2d74bc12
 ## explicit; go 1.12
 github.com/gomarkdown/markdown
 github.com/gomarkdown/markdown/ast
@@ -135,12 +135,6 @@ github.com/harmony-development/shibshib/gen/chat/v1
 github.com/harmony-development/shibshib/gen/emote/v1
 github.com/harmony-development/shibshib/gen/harmonytypes/v1
 github.com/harmony-development/shibshib/gen/profile/v1
-# github.com/hashicorp/errwrap v1.1.0
-## explicit
-github.com/hashicorp/errwrap
-# github.com/hashicorp/go-multierror v1.1.1
-## explicit; go 1.13
-github.com/hashicorp/go-multierror
 # github.com/hashicorp/golang-lru v0.6.0
 ## explicit; go 1.12
 github.com/hashicorp/golang-lru
@@ -192,7 +186,7 @@ github.com/klauspost/cpuid/v2
 # github.com/kyokomi/emoji/v2 v2.2.12
 ## explicit; go 1.14
 github.com/kyokomi/emoji/v2
-# github.com/labstack/echo/v4 v4.10.2
+# github.com/labstack/echo/v4 v4.11.1
 ## explicit; go 1.17
 github.com/labstack/echo/v4
 github.com/labstack/echo/v4/middleware
@@ -202,9 +196,10 @@ github.com/labstack/gommon/bytes
 github.com/labstack/gommon/color
 github.com/labstack/gommon/log
 github.com/labstack/gommon/random
-# github.com/lrstanley/girc v0.0.0-20221222153823-a92667a5c9b4
+# github.com/lrstanley/girc v0.0.0-20230729130341-dd5853a5f1a6
 ## explicit; go 1.18
 github.com/lrstanley/girc
+github.com/lrstanley/girc/internal/ctxgroup
 # github.com/magiconair/properties v1.8.7
 ## explicit; go 1.19
 github.com/magiconair/properties
@@ -225,7 +220,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-20221106190440-8bcf49695e0d
+# github.com/matterbridge/matterclient v0.0.0-20230329213635-bc6e42a4a84a
 ## explicit; go 1.17
 github.com/matterbridge/matterclient
 # github.com/matterbridge/telegram-bot-api/v6 v6.5.0
@@ -240,26 +235,12 @@ github.com/mattermost/go-i18n/i18n/translation
 # github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d
 ## explicit; go 1.13
 github.com/mattermost/ldap
-# github.com/mattermost/logr v1.0.13
-## explicit; go 1.12
-github.com/mattermost/logr
-github.com/mattermost/logr/format
-github.com/mattermost/logr/target
 # github.com/mattermost/logr/v2 v2.0.15
 ## explicit; go 1.12
 github.com/mattermost/logr/v2
 github.com/mattermost/logr/v2/config
 github.com/mattermost/logr/v2/formatters
 github.com/mattermost/logr/v2/targets
-# github.com/mattermost/mattermost-server/v5 v5.39.3
-## explicit; go 1.15
-github.com/mattermost/mattermost-server/v5/model
-github.com/mattermost/mattermost-server/v5/services/timezones
-github.com/mattermost/mattermost-server/v5/shared/filestore
-github.com/mattermost/mattermost-server/v5/shared/i18n
-github.com/mattermost/mattermost-server/v5/shared/markdown
-github.com/mattermost/mattermost-server/v5/shared/mlog
-github.com/mattermost/mattermost-server/v5/utils/jsonutils
 # github.com/mattermost/mattermost-server/v6 v6.7.2
 ## explicit; go 1.16
 github.com/mattermost/mattermost-server/v6/model
@@ -272,7 +253,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.17
+# github.com/mattn/go-isatty v0.0.19
 ## explicit; go 1.15
 github.com/mattn/go-isatty
 # github.com/mattn/go-runewidth v0.0.13
@@ -324,7 +305,7 @@ github.com/monaco-io/request
 # github.com/nelsonken/gomf v0.0.0-20190423072027-c65cc0469e94
 ## explicit; go 1.12
 github.com/nelsonken/gomf
-# github.com/olahol/melody v1.1.2
+# github.com/olahol/melody v1.1.4
 ## explicit; go 1.19
 github.com/olahol/melody
 # github.com/opentracing/opentracing-go v1.2.0
@@ -342,7 +323,7 @@ github.com/pborman/uuid
 # github.com/pelletier/go-toml v1.9.5
 ## explicit; go 1.12
 github.com/pelletier/go-toml
-# github.com/pelletier/go-toml/v2 v2.0.6
+# github.com/pelletier/go-toml/v2 v2.0.8
 ## explicit; go 1.16
 github.com/pelletier/go-toml/v2
 github.com/pelletier/go-toml/v2/internal/characters
@@ -370,7 +351,7 @@ github.com/rickb777/plural
 # github.com/rivo/uniseg v0.2.0
 ## explicit; go 1.12
 github.com/rivo/uniseg
-# github.com/rs/xid v1.4.0
+# github.com/rs/xid v1.5.0
 ## explicit; go 1.12
 github.com/rs/xid
 # github.com/russross/blackfriday v1.6.0
@@ -387,7 +368,7 @@ github.com/shazow/rateio
 github.com/shazow/ssh-chat/internal/sanitize
 github.com/shazow/ssh-chat/sshd
 github.com/shazow/ssh-chat/sshd/terminal
-# github.com/sirupsen/logrus v1.9.0
+# github.com/sirupsen/logrus v1.9.3
 ## explicit; go 1.13
 github.com/sirupsen/logrus
 # github.com/sizeofint/webpanimation v0.0.0-20210809145948-1d2b32119882
@@ -398,19 +379,19 @@ github.com/sizeofint/webpanimation
 github.com/skip2/go-qrcode
 github.com/skip2/go-qrcode/bitset
 github.com/skip2/go-qrcode/reedsolomon
-# github.com/slack-go/slack v0.12.1
+# github.com/slack-go/slack v0.12.2
 ## explicit; go 1.16
 github.com/slack-go/slack
 github.com/slack-go/slack/internal/backoff
 github.com/slack-go/slack/internal/errorsx
 github.com/slack-go/slack/internal/timex
 github.com/slack-go/slack/slackutilsx
-# github.com/spf13/afero v1.9.3
+# github.com/spf13/afero v1.9.5
 ## explicit; go 1.16
 github.com/spf13/afero
 github.com/spf13/afero/internal/common
 github.com/spf13/afero/mem
-# github.com/spf13/cast v1.5.0
+# github.com/spf13/cast v1.5.1
 ## explicit; go 1.18
 github.com/spf13/cast
 # github.com/spf13/jwalterweatherman v1.1.0
@@ -419,7 +400,7 @@ github.com/spf13/jwalterweatherman
 # github.com/spf13/pflag v1.0.5
 ## explicit; go 1.12
 github.com/spf13/pflag
-# github.com/spf13/viper v1.15.0
+# github.com/spf13/viper v1.16.0
 ## explicit; go 1.17
 github.com/spf13/viper
 github.com/spf13/viper/internal/encoding
@@ -430,8 +411,8 @@ github.com/spf13/viper/internal/encoding/javaproperties
 github.com/spf13/viper/internal/encoding/json
 github.com/spf13/viper/internal/encoding/toml
 github.com/spf13/viper/internal/encoding/yaml
-# github.com/stretchr/testify v1.8.1
-## explicit; go 1.13
+# github.com/stretchr/testify v1.8.4
+## explicit; go 1.20
 github.com/stretchr/testify/assert
 github.com/stretchr/testify/require
 github.com/stretchr/testify/suite
@@ -459,11 +440,6 @@ github.com/vmihailenco/msgpack/v5/msgpcode
 github.com/vmihailenco/tagparser/v2
 github.com/vmihailenco/tagparser/v2/internal
 github.com/vmihailenco/tagparser/v2/internal/parser
-# github.com/wiggin77/cfg v1.0.2
-## explicit; go 1.12
-github.com/wiggin77/cfg
-github.com/wiggin77/cfg/ini
-github.com/wiggin77/cfg/timeconv
 # github.com/wiggin77/merror v1.0.3
 ## explicit; go 1.15
 github.com/wiggin77/merror
@@ -509,7 +485,7 @@ 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-20230306190159-5caded34a872
+# go.mau.fi/whatsmeow v0.0.0-20230805111647-405414b9b5c0
 ## explicit; go 1.19
 go.mau.fi/whatsmeow
 go.mau.fi/whatsmeow/appstate
@@ -527,21 +503,8 @@ go.mau.fi/whatsmeow/util/gcmutil
 go.mau.fi/whatsmeow/util/hkdfutil
 go.mau.fi/whatsmeow/util/keys
 go.mau.fi/whatsmeow/util/log
-# go.uber.org/atomic v1.9.0
-## explicit; go 1.13
-go.uber.org/atomic
-# go.uber.org/multierr v1.8.0
-## explicit; go 1.14
-go.uber.org/multierr
-# go.uber.org/zap v1.21.0
-## explicit; go 1.13
-go.uber.org/zap
-go.uber.org/zap/buffer
-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.6.0
+go.mau.fi/whatsmeow/util/randbytes
+# golang.org/x/crypto v0.12.0
 ## explicit; go 1.17
 golang.org/x/crypto/acme
 golang.org/x/crypto/acme/autocert
@@ -563,7 +526,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.6.0
+# golang.org/x/image v0.11.0
 ## explicit; go 1.12
 golang.org/x/image/riff
 golang.org/x/image/vp8
@@ -572,7 +535,7 @@ golang.org/x/image/webp
 # golang.org/x/mod v0.8.0
 ## explicit; go 1.17
 golang.org/x/mod/semver
-# golang.org/x/net v0.8.0
+# golang.org/x/net v0.14.0
 ## explicit; go 1.17
 golang.org/x/net/context
 golang.org/x/net/html
@@ -584,13 +547,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.6.0
-## explicit; go 1.17
+# golang.org/x/oauth2 v0.11.0
+## explicit; go 1.18
 golang.org/x/oauth2
 golang.org/x/oauth2/clientcredentials
 golang.org/x/oauth2/internal
 golang.org/x/oauth2/microsoft
-# golang.org/x/sys v0.6.0
+# golang.org/x/sys v0.11.0
 ## explicit; go 1.17
 golang.org/x/sys/cpu
 golang.org/x/sys/execabs
@@ -598,10 +561,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.6.0
+# golang.org/x/term v0.11.0
 ## explicit; go 1.17
 golang.org/x/term
-# golang.org/x/text v0.8.0
+# golang.org/x/text v0.12.0
 ## explicit; go 1.17
 golang.org/x/text/encoding
 golang.org/x/text/encoding/charmap
@@ -657,7 +620,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.29.1
+# google.golang.org/protobuf v1.31.0
 ## explicit; go 1.11
 google.golang.org/protobuf/encoding/prototext
 google.golang.org/protobuf/encoding/protowire
@@ -713,7 +676,7 @@ 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.3
+# modernc.org/libc v1.24.1
 ## explicit; go 1.18
 modernc.org/libc
 modernc.org/libc/errno
@@ -744,13 +707,13 @@ modernc.org/libc/wctype
 # modernc.org/mathutil v1.5.0
 ## explicit; go 1.13
 modernc.org/mathutil
-# modernc.org/memory v1.5.0
+# modernc.org/memory v1.6.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.21.0
+# modernc.org/sqlite v1.25.0
 ## explicit; go 1.18
 modernc.org/sqlite
 modernc.org/sqlite/lib